From f17cfdddfa0f9435090c00b3af096d9e7c5433ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Al=D0=B5x=D0=B0nder=20Lysik=D0=BEv?= <alexander.lysikov@demlabs.net> Date: Tue, 31 Mar 2020 18:30:01 +0500 Subject: [PATCH 1/5] update modules --- libdap | 2 +- libdap-app-cli | 2 +- libdap-chain | 2 +- libdap-chain-global-db | 2 +- libdap-chain-mempool | 2 +- libdap-chain-net | 2 +- libdap-chain-net-srv-vpn | 2 +- libdap-chain-wallet | 2 +- libdap-client | 2 +- libdap-crypto | 2 +- libdap-server-core | 2 +- libdap-stream-ch-chain | 2 +- libdap-stream-ch-chain-net-srv | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/libdap b/libdap index 214f324..a479b3c 160000 --- a/libdap +++ b/libdap @@ -1 +1 @@ -Subproject commit 214f324f5faa30ca6b00bfedae1104b09a0c1e30 +Subproject commit a479b3c1e56ece208e00c7a75a0cf656e6310dbb diff --git a/libdap-app-cli b/libdap-app-cli index 2838682..9ea22d1 160000 --- a/libdap-app-cli +++ b/libdap-app-cli @@ -1 +1 @@ -Subproject commit 2838682b96e477d3767b263d1db303e11ef4b7fa +Subproject commit 9ea22d1b113d41545b378df9864a0caba3cf51c4 diff --git a/libdap-chain b/libdap-chain index b11de78..447ea8c 160000 --- a/libdap-chain +++ b/libdap-chain @@ -1 +1 @@ -Subproject commit b11de781617e3137875fbdab281f26a796474657 +Subproject commit 447ea8c22eb5059f2f5688884406ed13ee9c37c9 diff --git a/libdap-chain-global-db b/libdap-chain-global-db index 0edf531..902f9ac 160000 --- a/libdap-chain-global-db +++ b/libdap-chain-global-db @@ -1 +1 @@ -Subproject commit 0edf531dd6e4e56521222e1ac73905a03e139a95 +Subproject commit 902f9ac862bdf484de9399db3987d49d7dadf5c0 diff --git a/libdap-chain-mempool b/libdap-chain-mempool index 6115762..ee7139d 160000 --- a/libdap-chain-mempool +++ b/libdap-chain-mempool @@ -1 +1 @@ -Subproject commit 61157623dc77de04628dcca6dae39536f1be10de +Subproject commit ee7139d8f6cb50122334b5edbe0d5a02aca367d6 diff --git a/libdap-chain-net b/libdap-chain-net index 5a2f860..3eb6ca1 160000 --- a/libdap-chain-net +++ b/libdap-chain-net @@ -1 +1 @@ -Subproject commit 5a2f860accd8036d0ca2f9daca0a0be6dab10630 +Subproject commit 3eb6ca1d03cd2e03db9fa8b178eba05c3e1101fe diff --git a/libdap-chain-net-srv-vpn b/libdap-chain-net-srv-vpn index e0f74db..77c26fa 160000 --- a/libdap-chain-net-srv-vpn +++ b/libdap-chain-net-srv-vpn @@ -1 +1 @@ -Subproject commit e0f74dbc745a65bb040a41e99460b21b14406a1d +Subproject commit 77c26fa2203149bb8fc4f40e42eed83c5e41887d diff --git a/libdap-chain-wallet b/libdap-chain-wallet index 03f7bab..4a3ca1c 160000 --- a/libdap-chain-wallet +++ b/libdap-chain-wallet @@ -1 +1 @@ -Subproject commit 03f7babcb4376b21580b8109f811f5b2511b6cf0 +Subproject commit 4a3ca1c4e8799f38cd1adb792f117bfe3027b0c0 diff --git a/libdap-client b/libdap-client index d8713a6..f7dbe9d 160000 --- a/libdap-client +++ b/libdap-client @@ -1 +1 @@ -Subproject commit d8713a616f0824ff40236ec43cfc50c3d1220a94 +Subproject commit f7dbe9db19e6f87c6fe5bb5abf004cde162ed3dd diff --git a/libdap-crypto b/libdap-crypto index 77f0dd9..d30f768 160000 --- a/libdap-crypto +++ b/libdap-crypto @@ -1 +1 @@ -Subproject commit 77f0dd9d161ac902f28d5d64b3451d7ab50fe186 +Subproject commit d30f7681997fd3f1126d667ae36674521c79a329 diff --git a/libdap-server-core b/libdap-server-core index dd803b2..3f0e758 160000 --- a/libdap-server-core +++ b/libdap-server-core @@ -1 +1 @@ -Subproject commit dd803b2e03007c74c792b35a319fd7f9b6e73078 +Subproject commit 3f0e7584a16b035b0f64820a61ad08d1c179c410 diff --git a/libdap-stream-ch-chain b/libdap-stream-ch-chain index 429013c..001748d 160000 --- a/libdap-stream-ch-chain +++ b/libdap-stream-ch-chain @@ -1 +1 @@ -Subproject commit 429013c8e58d4bc4f8dcc765832fad7c6604fc71 +Subproject commit 001748d443a4cf8fef1886a6a9846e712967d0fd diff --git a/libdap-stream-ch-chain-net-srv b/libdap-stream-ch-chain-net-srv index 51c0148..26b14c8 160000 --- a/libdap-stream-ch-chain-net-srv +++ b/libdap-stream-ch-chain-net-srv @@ -1 +1 @@ -Subproject commit 51c01481f87f3ffc1fdad3054292bf910d2c5f31 +Subproject commit 26b14c86f7008d44086ef8cf72b4ba780462dbc2 -- GitLab From fb3e3b3548f63480d341bd6c265c6ba8f352f15e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Al=D0=B5x=D0=B0nder=20Lysik=D0=BEv?= <alexander.lysikov@demlabs.net> Date: Thu, 2 Apr 2020 21:47:47 +0500 Subject: [PATCH 2/5] update modules --- libdap-chain | 2 +- libdap-chain-global-db | 2 +- libdap-chain-net-srv | 2 +- libdap-chain-net-srv-vpn | 2 +- libdap-server-core | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libdap-chain b/libdap-chain index 447ea8c..4d3cda3 160000 --- a/libdap-chain +++ b/libdap-chain @@ -1 +1 @@ -Subproject commit 447ea8c22eb5059f2f5688884406ed13ee9c37c9 +Subproject commit 4d3cda376d9fd673ff12d748807fab57709e967b diff --git a/libdap-chain-global-db b/libdap-chain-global-db index 902f9ac..ef0ae62 160000 --- a/libdap-chain-global-db +++ b/libdap-chain-global-db @@ -1 +1 @@ -Subproject commit 902f9ac862bdf484de9399db3987d49d7dadf5c0 +Subproject commit ef0ae6288a55168e8670ea2900e7e40e54acdab2 diff --git a/libdap-chain-net-srv b/libdap-chain-net-srv index 05cd294..79f1d2f 160000 --- a/libdap-chain-net-srv +++ b/libdap-chain-net-srv @@ -1 +1 @@ -Subproject commit 05cd2947d6e3547e3e111b53befeff4b043cb16a +Subproject commit 79f1d2fb9f6529fd413feb4f872b59b43c6ef176 diff --git a/libdap-chain-net-srv-vpn b/libdap-chain-net-srv-vpn index 77c26fa..72ad71b 160000 --- a/libdap-chain-net-srv-vpn +++ b/libdap-chain-net-srv-vpn @@ -1 +1 @@ -Subproject commit 77c26fa2203149bb8fc4f40e42eed83c5e41887d +Subproject commit 72ad71ba1fe05341a41e40002f37f73e9a911557 diff --git a/libdap-server-core b/libdap-server-core index 3f0e758..9fdcdcb 160000 --- a/libdap-server-core +++ b/libdap-server-core @@ -1 +1 @@ -Subproject commit 3f0e7584a16b035b0f64820a61ad08d1c179c410 +Subproject commit 9fdcdcb45d041e63a3a4b575424a6f3de7e68ca1 -- GitLab From 949d5f81dda59576457d40529b116cae09d661c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Al=D0=B5x=D0=B0nder=20Lysik=D0=BEv?= <alexander.lysikov@demlabs.net> Date: Mon, 6 Apr 2020 21:36:05 +0500 Subject: [PATCH 3/5] update modules and dist --- CMakeLists.txt | 2 +- dist/etc/network/dapcash-testnet/bronze.cfg | 6 ++-- dist/etc/network/dapcash-testnet/chain-0.cfg | 28 ++++++++++++++++++ dist/etc/network/kelvin-testnet/chain-0.cfg | 1 + .../ca/dapcash.testnet.master.cell.0.dcert | Bin 0 -> 1573 bytes .../ca/dapcash.testnet.master.cell.1.dcert | Bin 0 -> 1573 bytes .../ca/dapcash.testnet.master.cell.2.dcert | Bin 0 -> 1573 bytes dist/share/configs/dapcash-node.cfg.tpl | 2 -- .../configs/network/dapcash-testnet.cfg.tpl | 2 ++ .../configs/network/kelvin-testnet.cfg.tpl | 2 ++ libdap-app-cli | 2 +- libdap-chain | 2 +- libdap-chain-global-db | 2 +- libdap-chain-net | 2 +- libdap-chain-net-srv | 2 +- libdap-chain-net-srv-vpn | 2 +- libdap-server-udp | 2 +- libdap-stream-ch-chain | 2 +- libdap-stream-ch-chain-net | 2 +- 19 files changed, 46 insertions(+), 15 deletions(-) create mode 100644 dist/etc/network/dapcash-testnet/chain-0.cfg create mode 100644 dist/share/ca/dapcash.testnet.master.cell.0.dcert create mode 100644 dist/share/ca/dapcash.testnet.master.cell.1.dcert create mode 100644 dist/share/ca/dapcash.testnet.master.cell.2.dcert diff --git a/CMakeLists.txt b/CMakeLists.txt index 9151cd1..39378e1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -52,7 +52,7 @@ SET( CPACK_GENERATOR "DEB") SET( CPACK_PACKAGE_NAME "${PROJECT_NAME}") SET( CPACK_PACKAGE_VERSION_MAJOR 0) SET( CPACK_PACKAGE_VERSION_MINOR 10) -SET( CPACK_PACKAGE_VERSION_PATCH 2) +SET( CPACK_PACKAGE_VERSION_PATCH 3) SET( CPACK_SYSTEM_NAME "debian-10.0-amd64") SET( CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}-${CPACK_PACKAGE_VERSION_PATCH}") diff --git a/dist/etc/network/dapcash-testnet/bronze.cfg b/dist/etc/network/dapcash-testnet/bronze.cfg index 1955aad..0f708da 100644 --- a/dist/etc/network/dapcash-testnet/bronze.cfg +++ b/dist/etc/network/dapcash-testnet/bronze.cfg @@ -10,7 +10,7 @@ consensus=dag_pos is_single_line=false is_celled=true is_add_directly=true -datum_add_hashes_count=3 +datum_add_hashes_count=1 # Proof-of-State consensus config [dag-pos] @@ -20,8 +20,8 @@ tokens_hold=[DAPT,DAPS,DAPG] # 1000 coins for DAPT, 100 for DAPS and 10 for DAPG tokens_hold_value=[1000000000,100000000,10000000] # Confirmations minimum -confirmations_minimum=3 +confirmations_minimum=1 [files] -storage_dir=/opt/dapcash-node/var/lib/network/dapcash-testnet/plasma +storage_dir=/opt/dapcash-node/var/lib/network/dapcash-testnet/bronze diff --git a/dist/etc/network/dapcash-testnet/chain-0.cfg b/dist/etc/network/dapcash-testnet/chain-0.cfg new file mode 100644 index 0000000..8ede75f --- /dev/null +++ b/dist/etc/network/dapcash-testnet/chain-0.cfg @@ -0,0 +1,28 @@ +[chain] +id=0x0000000000000000 +shard_id=0x0000000000000000 +name=zerochain +load_priority=1 +# Possible values [token, emission, transaction] +datum_types=[token,emission,shard,ca] +consensus=dag_poa + +[files] +storage_dir=/opt/dapcash-node/var/lib/network/dapcash-testnet/zerochain/ + +[dag] +is_single_line=true +is_celled=false +is_add_directly=true +datum_add_hashes_count=1 + +# Switched off to false because hash symbols below are not well recognized + +is_static_genesis_event=false +static_genesis_event=0xEB2152E716245D067BEA80E8CB6D7C35859B2E0E91AF4201486BB443F6AEE7FF + +[dag-poa] +auth_certs_prefix=dapcash.testnet.master.cell +auth_certs_number=3 +auth_certs_number_verify=1 #4 +auth_certs_dir=/opt/cellframe-node/share/ca diff --git a/dist/etc/network/kelvin-testnet/chain-0.cfg b/dist/etc/network/kelvin-testnet/chain-0.cfg index 7858946..c55fc27 100644 --- a/dist/etc/network/kelvin-testnet/chain-0.cfg +++ b/dist/etc/network/kelvin-testnet/chain-0.cfg @@ -7,6 +7,7 @@ load_priority=1 datum_types=[token,emission,shard,ca] consensus=dag_poa + [files] storage_dir=/opt/dapcash-node/var/lib/network/kelvin-testnet/zerochain/ diff --git a/dist/share/ca/dapcash.testnet.master.cell.0.dcert b/dist/share/ca/dapcash.testnet.master.cell.0.dcert new file mode 100644 index 0000000000000000000000000000000000000000..ccea3e2838259eda5f2112a61749b5c545ca397c GIT binary patch literal 1573 zcmV+=2HN?6lj0Fa3@{G?0002+0s#O3%mn}d000000000000000000000000000000 z00000WMOb)VRL9MbY*jNZe?^XZDDhCWpXZKWo&FNFaQ7m0000000000%mn}d00000 z0ssI2lEQtytdryjoe(eUu_%C<@H5%Ai_upF_{Ce;yc>~K#G)$!LP_%7g3|R}2Q@wQ zSL}rrnWl}ya7tfgb*!B!uz<&qZ?Bqsa5Q}VMz_S>TOX!GhL8UdiLyke{er0(p#Bv> z>uikQ>qQp=k`9+DQF5%XL+GQd6)T9chg(w`wgHD#32x~Bg$1%Jllh$<Z3VO3pB$k# zlQFA=gj}3(75~BRIMX^AofGN3bTzWx$VG|$=`sn&IlQ-llq5MMJk(TU#>NQVq3rUa z?VU(LNp!TQP0w)kQ87B-+~umetS3S5EoJE2*5u&zxBB^hRp8N~?7DiDr><N)N6b1m z!#RfKm^bt_bA`SI)0Fgux?LUr>YA7b6}Y#lf#Ki%%1?Xe2on~`$Sg)mv0Eq_52Klb zeDH}e3ZgX7SnCj$wxsg9`^d!2bzW@U)UR18s-1D3@XP0#B#oKnu8CNcAwk-}VbP8@ z;a1PK0Zg=+lyGQ*WZA8U;#+9i<aLJbcFEa+yO`w!qL!zGEed*S*Q%w*8Y1$roPg|0 zCLuMWy2A_kiY;@XD_FlYr9i+7166vtOHWps?}C*r8~hD~zQ@azRD$cqxu@*UR+qR0 zc2!o@UzaqwAB2j3A!8;SSLNCU<}42pfpXBK8{#6fMhf8w&W?`WJl}PHg@o+>tp!py zMhr;=NZ!wzlTC}MpozNtW+|N*uDT?|2GGQFtYS)q&)p)896G4u%y*$nb1MHhHopdS zGzBJ85SrRxxEXxze<)3IBca3@L{AOlNl175yqTxZ_PJs-*^&l@9DB{=imoJ5x?~I0 zyJ!xF68{+WS_MDwdPfgncR`V7CAJTZXzm{4-%=(zl#P2TbbEe|_$pbAuN76=2=MNV z@6>Q$Sp<Z0N>3hFvdXiIU{E>^*4H{E4VN`zs7m1Oy|l4p{-lXGo3RZ4&>w3hYt=;{ zqqnpGS;bD)CNob7YT}OLC*!?w1<JdWHX8)L>m^W`eMF}E#%25|ZyCbwIam;<TPalc z+DV`aCW4if{t8&=>P?Y$%@{pS0nvAQwULvxv1Sbm83xU1I+pdKZE=dv-Yo({IIR&J zY)qUtJ6$Rnm{aygk}C9!{4|h`_Y4#qF(R>A#8we`UvsTM1ygmSQ=c%h@AHv@7wQq( z;GV3PnxXVfC_&PL=xyt~daO^j{4cp%7GF%9YKTgi=v|WCgTwGxyaiK|`4~}b?Ek-b zOW@}7@-c%i8ojvJhkHxkxlFSinmoespr#2LCo(W(czH04@zeqE<>e2CX2R|mQV=eR zmD_$>%lq$MGu?JIY9C~r1}>hy;<I$r%a?Q_b%{55Jn4DU#FdJke=;JWU=CYhj2%^A zqWysvR_eSL*S~ci8gMMuNSVZGb3T0`ixXgA(xATyg7-y9vj$b3DA^vu8P{s$h4FwD zf_IElp1I#HGT9tWUc10yd>3gCEy2dG;VfUQV)rS8V0KerT=e0%uIJb;PNxmIxAeo4 z`r?ZwB^%w-Y8nz36<r6)&La^lHK!IUL^i>cS|Il{&S5}KJ>wP^BJ8dxJUsm%A@C;C zIAu9=dLWZChhTa%tF;XCo2r^(QY?!J@~REHyA3!GZRxn226q-=K~^>^BnF%$DK7!u z?Zg2PLO=nd%?QK*re5B7GWz~^_$D{PyGX<8>kuFIo%Q%QV%7xy{u?hU*aK=1?K$jO zb$Sjp(NC!{(H~^wuZPC%J`RxSw#6VHP^0x~*;4po8N;Rb&$q||w`PSvq6oYZ_T8Xr zQ`KKt8_|}2kUlcpN(3BGAS}eBH9ouri$dw?_WO^G0vzsNHhP35rqQenJYa!iqNpOE z2ocvD*%v@rW>k@yE&o!1<kVaQ%cP9t?95X3Cqq;0de+5O&w=_aY&pMnPIrVA{U8#T XomzIPOfx3d_$ETEwTv`zMfGKYIbG?Z literal 0 HcmV?d00001 diff --git a/dist/share/ca/dapcash.testnet.master.cell.1.dcert b/dist/share/ca/dapcash.testnet.master.cell.1.dcert new file mode 100644 index 0000000000000000000000000000000000000000..771da5bd4bce340d1bcbdb1e9cf4777b53bfd63a GIT binary patch literal 1573 zcmV+=2HN?6lj0Fa3@{G?0002+0s#O3%mn}d000000000000000000000000000000 z00000WMOb)VRL9MbY*jNZe?^XZDDhCWpXZKWo&FNF#rGn0000000000%mn}d00000 z0ssI2MpLMwxf98kI}7yuWc`t+y(q=13)D!SJG|`{x8D<Px3nNur}pJ>zF}&imOyjq zzyb?x(VgT1tYRO{gzre0j|d;;6a@So-W^>sb<ujeQiXs#9aszu)5n06Bz}hj2MNw~ zn(!l0v|n&%#YCq#K6Wm*$0zEvXJ|I4f<Euip-7om$zu6UmYWrNfC8ifK`Djt*VPZM zy|SQHk;0BOIi4#xc)t*cW)1DkjD!4Z%Fu0bhl02^L<SN)^lwZy3{kAjW*Wsfl$;0Y zx92UfxL!m~R}o_IkY@myhV{-}=C%cD(FzI}TSO|wPoS7RC5Mjj)cVLYz+;1SOoJ}g zS4h*6UpYLAHk&t|cO)#-ofzD#x?hW?L>*H<fAgsHucdEIKn}~re4O}77wH^+Lo7R# zRQgP~Z~FaA_;?fXBQp4iG#7Oq!qa&vQY@P}RBGF6hQZ{9sykJHCC_QHRe%g1jvgX! zwDKJ<c9g3sO;-Dvm~3-(=U5zD1oT*!aBUHE0Rp%lW=t_~2CNc}!@W>XBrDz82=!F? zUhv)zZ}8ul7{Tc>8~({!eu4dPx(EqDN<xa>R3n`TB#QJhPNLb1(LSd148|>)CY<Dp z1{nO&!`U)v7HfssKJT^XJgnhN@{{sKnmHf6`Oo(njzNGC=*R)AeI%FE&h~<{;S|n; zk`dLadite5+Ba%6jsMj?NMm>!WZ;HCx({}H1rw;}M6PnZjUQQH@|*X0Psk$p&DNo4 zqeb6JEJDqSg#36ZFm+3=lWcUY_~P*-9&W;g%1jUdiyk(}y|Qea-ZBkRd`oUJRT@35 zC5R)2l>o={O%KB_L5K70NSq4mTK;pM)sQRO;|@c+9)GM(Z@)r*l&L4^_JN+|jvcj# z(S?o^^lU{;?pho_HGAU(0En*2YD{<RrF+G)?51n=t$MEob!7yLxz4Qj?_v4EBFx=5 z6*5N&Nm}%}O;^evb@R`AL2F7(c7fe8mJSlIxW{*q%H~$E4Io|<Uq8Kj%hga18e&zM zbB-3P4d@6m`R*qPlrM6CWjF?jz=G@-+|0N~oFh_ZR*Mn}x*!`;o2o~s%pd|;Xu73; zfix^=s9%$sPwPqJ+5x*<wdU;AwAeLzy!rDmRI}4OF=_69IsOGZ%G~U$m=&OhLMrmq z#BWleTnvh;5CH^Q`ij^x4HzfZ&7^n4Xm?oeE!K%wE}!T78%Yk-a!;sP+@{<xY~Z*; z(&yjqnkWsSrsfRt3TU)Gp2b8rz}(D6WvGKtsGi|^mRQxCrP0nPZduHd<VtB>lwVzy zc1%Co7T2E_x@Kz1@nt$uJ-Isy?Qj~3yZppK1)vy3b)!ZKbEv!s%T7)=y=F|KOQ#yo z#cqFjSj%00td9PbavoGIFs#ktuB~m@oVXVRzZ~)f8aXXQiHZF;%OJst@;&;P30QTu z&-mTAwN`PjfNI^_#O!a-O^ixzm^wuk3;-L5iOU=QYzc%lnuUp3V_T>0);iI+FtR(1 zJ$z43GyrDqvj2U#Kc@dW6hlLNwA>%vie}|;(@ss!@|#rmx%Q|4Zbpj)6^ia?`<D-F z>JFEi+v5(~a@=<udBMb3vIz3Kmwf?d)-!KJ3gL=>U{)Bd4WUgLxi5;}Y7F*+3FGU# zAdGrHVL+M}Z$@zuJLnDz$r%Tc(HFzZ1TOfq|Kng=7m|yD5)xw`zZU#iR@q>X2-O^| zbWBapboMJUR<XgjrkJ7N=<Gj|T<B-C)xRuHLeLSV)iL|*7b;9W$Vb9=`gID{uy+!r zk8n&L>;%9{fj(+R_$V8rTn1&6_<o&FC=*o4t_HQV2zN2C1>iTGg?&d065coSv^jP; z$-z!YBYc2n!R6DK5lI9bg6GIkWZ6R>a#?`fZb>!@jegJs9wrti$g&W9C~QvOa?uNT Xd;*J{Lfd<>t>w-@%oc5pM$__xg*@Ky literal 0 HcmV?d00001 diff --git a/dist/share/ca/dapcash.testnet.master.cell.2.dcert b/dist/share/ca/dapcash.testnet.master.cell.2.dcert new file mode 100644 index 0000000000000000000000000000000000000000..781d83db33f24f83fc08ea60cfe7ef78fb090a36 GIT binary patch literal 1573 zcmV+=2HN?6lj0Fa3@{G?0002+0s#O3%mn}d000000000000000000000000000000 z00000WMOb)VRL9MbY*jNZe?^XZDDhCWpXZKWo&FNG5`Po0000000000%mn}d00000 z0ssI2)Tn&FcI4)(Zwvsy+leQyC&Ta{pe@IONUrv?SujRTO7KE^HcMmqz)8=(?&(t+ z1w$vT7(^qC-da)U3cjXK&5IiuyNN&Ak)W1sLp&Dc!w$cM+)w+l9-ViV50KqcHo>O* zntMe!J@=~*DAIWj3f7)EoT)ztcF?E2rT_n50ISdM0$B^|X2H_aI%fPt0d*>nCgXJA z#@jXFls8vD_JnyK8yJcPoHBf6%69qdT7O(b-0Q+zd`ZIzUkAB|oV|$!VZ4~eMA)}) zY?VLE;DhbDm6%@u#s2F``4Q}v!zy5B#Ke<SO`QV!B*d6q54Jt{&ay_t#-csiCkeEF zZ|~Qj=zS`&wluGRASo@%TcPz;lwYKj#Px_UTCYdg%0VIrtzV@5DNaDg9y^VSn-{R% zy2P7B0!)Fq?v*3Jg(9*?MZG_v8Eu1(UNA#|*<odaFwQu-VoldUAb3iHjy<{Stg)O$ zD?oQ)Ly*vBfDn`iI&{n8QB5WNaC9hK^d4~prW^FU##04Hns;f6s$wV)49YIHj%)|+ zm)Qt-QD#xRXc=oX-{Vdw!VcinC9SpDPIGBKMJO(?gVy_BNU9m_%2C8mDDf&2)tP}F zTXOZ=vf=FhGzd?!l^f^!49pQr&@h#%`P2_SH<rfx5_03EBy68mP2MfJVm(IMA#Dr% z{3tZL*c9{3S0mQg>b93c;0)ocvUcHSjNMuKUZELO8r^tx$Od#ZjJh3V07QV}6B{s8 zKe`LluWql@<)p|ghm7bhMa2r=f0|B3B53+D$+h>hlq6n5Eta<SZ)NRZ8)(ujE&?f| zWG{3D*09BeI|vJ%6$P{o6iKpl$PfDxld9W%h02;^wv?C`7!P25XlDGm7T#`Uox{K~ z&b@u|*@J0_u@~lX%lVL6O^<9+Ht1VD3G-zF!B-37OfmCq;h?{}?-#_u4YQNp;lC9o zsqLLjdaV^HiFtW}*Ns$bL!c%?RYGM<bzDn2SQRmyl(iLF(%vHt(TXNd@SAyQzIH#8 zKj66}>;vHdGeD^!@6FLP<T)qHPb_9>Q`AS6&S|$frad~fl6=`UMyl+xRSi<)qGLwE zawN}@fj{f7(swfnBN@*VcnVyT)V3=67LgT&Vm``PhRvL<C5F++x>qm_!A%8^(9+!% zGPI4Y%q!RCQIevHwFYo-K3BU3Kex)U52-PLuw+~80xg>P%!}8?FO@S74CO!9idDck zGc7h-akjRlDSoU=;Y9-VR5zGy`hXYk=?W}W=G)dV6&8nMX-d;MO`jQWjZzM_D$vFx zKIt0t8-&sLd@>!FKGlskO-g6;B<o9D53+~Mu=fk*Zll)l5O>VL!Bk5qI{&i!9nZq6 z#p9m~<jC4xDL{*~^$82g(@dyY0>rGZ7^^M+{_EC(P8JAX4H^5JjMO6`fe7(S_ARPa zL-q8$>Q!Ct{r5p!C&g2}7di;nJI1d&qFtHL-t<wLer@AxEy>maBWO$QHDdpE)_%o} zv~9?5p$`bV$gWrxG6W3*rMj#ODW3=Yn|7+#(bBBY3T2OV>L?q;S&H2ts+-=(90yc% z0WK+Co@bZ<V%0`L$?L+a+f!fI&j@R5(>j%$od>v*J6QnvA-#bq*Z$aJwQehSgZ#-I zLCxDt@1lhbe+50ssxUHl57V@u+MJ|%k5pRVduq%D!!H!8NL*w+8l4NV85oBhCifRy zADedF5)chkQhBqHpV%P&ia*P40Pe9Z{l6DDnx8f4d9*OTP;oSHb8!PYvREO8W!&S1 zpg6G%<LDWImUbe-pW1`X;@N0My3-CxkAMpEK7D+6(1aXzzL<}}vCE?M8S+_$S(lCR zn&|^R?s8ptlK7TLkm{`}YPw%wr9Z61=$$v$n%R&Ki9-UG%rNFfJr1r2c>O1%a^UL& XvuM^vgPB3F9BMWzaB0i#$0@@!elh1R literal 0 HcmV?d00001 diff --git a/dist/share/configs/dapcash-node.cfg.tpl b/dist/share/configs/dapcash-node.cfg.tpl index 10d985d..99c0625 100644 --- a/dist/share/configs/dapcash-node.cfg.tpl +++ b/dist/share/configs/dapcash-node.cfg.tpl @@ -6,8 +6,6 @@ wallets_default=default # seed mode. WARNING. Used true only when you start the new network #seed_mode=false auto_online={AUTO_ONLINE} -# type of node addr [auto, static, dinamic] -node_addr_type=auto # Console diff --git a/dist/share/configs/network/dapcash-testnet.cfg.tpl b/dist/share/configs/network/dapcash-testnet.cfg.tpl index fb57911..2e5fb64 100644 --- a/dist/share/configs/network/dapcash-testnet.cfg.tpl +++ b/dist/share/configs/network/dapcash-testnet.cfg.tpl @@ -12,6 +12,8 @@ gdb_groups_prefix=dapcash-testnet # node addr exired time in hours (168h=1w 720h=1m 8760h=1y), by default 720h(1week) #node-addr=0x10 node-addr-expired=168 +# type of node addr [auto, static, dinamic] +node_addr_type=auto seed_nodes_hostnames=[0.root.testnet.dapcash.org,1.root.testnet.dapcash.org,2.root.testnet.dapcash.org,3.root.testnet.dapcash.org,4.root.testnet.dapcash.org] seed_nodes_aliases=[dapcash.testnet.root.0,dapcash.testnet.root.1,dapcash.testnet.root.2,dapcash.testnet.root.3,dapcash.testnet.root.4] diff --git a/dist/share/configs/network/kelvin-testnet.cfg.tpl b/dist/share/configs/network/kelvin-testnet.cfg.tpl index f176a52..1adc05c 100644 --- a/dist/share/configs/network/kelvin-testnet.cfg.tpl +++ b/dist/share/configs/network/kelvin-testnet.cfg.tpl @@ -12,6 +12,8 @@ gdb_groups_prefix=kelvin-testnet # node addr exired time in hours (168h=1w 720h=1m 8760h=1y), by default 720h(1week) #node-addr=0x10 node-addr-expired=168 +# type of node addr [auto, static, dinamic] +node_addr_type=auto seed_nodes_hostnames=[0.root.testnet.klvn.io,1.root.testnet.klvn.io,2.root.testnet.klvn.io,3.root.testnet.klvn.io,4.root.testnet.klvn.io] seed_nodes_aliases=[kelvin.testnet.root.0,kelvin.testnet.root.1,kelvin.testnet.root.2,kelvin.testnet.root.3,kelvin.testnet.root.4] diff --git a/libdap-app-cli b/libdap-app-cli index 9ea22d1..1e88872 160000 --- a/libdap-app-cli +++ b/libdap-app-cli @@ -1 +1 @@ -Subproject commit 9ea22d1b113d41545b378df9864a0caba3cf51c4 +Subproject commit 1e888729d80befec68683762707e62b8e61d2a4d diff --git a/libdap-chain b/libdap-chain index 4d3cda3..d591e36 160000 --- a/libdap-chain +++ b/libdap-chain @@ -1 +1 @@ -Subproject commit 4d3cda376d9fd673ff12d748807fab57709e967b +Subproject commit d591e36646bc90ae433b3090626ae9d52882814b diff --git a/libdap-chain-global-db b/libdap-chain-global-db index ef0ae62..ef72e3e 160000 --- a/libdap-chain-global-db +++ b/libdap-chain-global-db @@ -1 +1 @@ -Subproject commit ef0ae6288a55168e8670ea2900e7e40e54acdab2 +Subproject commit ef72e3e95eea97d1a17f66c35d184a2ed02e6854 diff --git a/libdap-chain-net b/libdap-chain-net index 3eb6ca1..aa8df14 160000 --- a/libdap-chain-net +++ b/libdap-chain-net @@ -1 +1 @@ -Subproject commit 3eb6ca1d03cd2e03db9fa8b178eba05c3e1101fe +Subproject commit aa8df1441323850017d0ed5117e6d5e254225054 diff --git a/libdap-chain-net-srv b/libdap-chain-net-srv index 79f1d2f..979a647 160000 --- a/libdap-chain-net-srv +++ b/libdap-chain-net-srv @@ -1 +1 @@ -Subproject commit 79f1d2fb9f6529fd413feb4f872b59b43c6ef176 +Subproject commit 979a6477d4c30346db2ff2144b4009fb0b7fc8d4 diff --git a/libdap-chain-net-srv-vpn b/libdap-chain-net-srv-vpn index 72ad71b..d532852 160000 --- a/libdap-chain-net-srv-vpn +++ b/libdap-chain-net-srv-vpn @@ -1 +1 @@ -Subproject commit 72ad71ba1fe05341a41e40002f37f73e9a911557 +Subproject commit d532852fd138e47498e62a16c5b3b7b139bda549 diff --git a/libdap-server-udp b/libdap-server-udp index 7500d54..608ab1c 160000 --- a/libdap-server-udp +++ b/libdap-server-udp @@ -1 +1 @@ -Subproject commit 7500d54e139a92586b1488edffcb12f4f1c824ec +Subproject commit 608ab1c9e0f5dac7b8c4f1abac6aa8f13c48ceaa diff --git a/libdap-stream-ch-chain b/libdap-stream-ch-chain index 001748d..5d522e3 160000 --- a/libdap-stream-ch-chain +++ b/libdap-stream-ch-chain @@ -1 +1 @@ -Subproject commit 001748d443a4cf8fef1886a6a9846e712967d0fd +Subproject commit 5d522e3397528df51809bca9143a978d2fe62143 diff --git a/libdap-stream-ch-chain-net b/libdap-stream-ch-chain-net index 3c768e4..5ffbfcb 160000 --- a/libdap-stream-ch-chain-net +++ b/libdap-stream-ch-chain-net @@ -1 +1 @@ -Subproject commit 3c768e4b51cd4dc87893769ee0693992138be675 +Subproject commit 5ffbfcbd2a475b252938bdd1c793dc7c612b105d -- GitLab From dd59149e1db4bc8da52a8c64683e41ddeec37f0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Al=D0=B5x=D0=B0nder=20Lysik=D0=BEv?= <alexander.lysikov@demlabs.net> Date: Mon, 6 Apr 2020 21:55:33 +0500 Subject: [PATCH 4/5] update version --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 39378e1..7619691 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -50,9 +50,9 @@ SET(DESTDIR "/opt/${PROJECT_NAME}") SET( CPACK_GENERATOR "DEB") SET( CPACK_PACKAGE_NAME "${PROJECT_NAME}") -SET( CPACK_PACKAGE_VERSION_MAJOR 0) -SET( CPACK_PACKAGE_VERSION_MINOR 10) -SET( CPACK_PACKAGE_VERSION_PATCH 3) +SET( CPACK_PACKAGE_VERSION_MAJOR 1) +SET( CPACK_PACKAGE_VERSION_MINOR 0) +SET( CPACK_PACKAGE_VERSION_PATCH 2) SET( CPACK_SYSTEM_NAME "debian-10.0-amd64") SET( CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}-${CPACK_PACKAGE_VERSION_PATCH}") -- GitLab From dd4a5d5a16cf4282bbcc35e9512f5df54157081f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Al=D0=B5x=D0=B0nder=20Lysik=D0=BEv?= <alexander.lysikov@demlabs.net> Date: Mon, 6 Apr 2020 22:12:15 +0500 Subject: [PATCH 5/5] update modules --- dist/etc/network/dapcash-testnet/chain-0.cfg | 28 ++++++++++++++++++++ libdap-chain-net-srv-vpn | 2 +- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 dist/etc/network/dapcash-testnet/chain-0.cfg diff --git a/dist/etc/network/dapcash-testnet/chain-0.cfg b/dist/etc/network/dapcash-testnet/chain-0.cfg new file mode 100644 index 0000000..8ede75f --- /dev/null +++ b/dist/etc/network/dapcash-testnet/chain-0.cfg @@ -0,0 +1,28 @@ +[chain] +id=0x0000000000000000 +shard_id=0x0000000000000000 +name=zerochain +load_priority=1 +# Possible values [token, emission, transaction] +datum_types=[token,emission,shard,ca] +consensus=dag_poa + +[files] +storage_dir=/opt/dapcash-node/var/lib/network/dapcash-testnet/zerochain/ + +[dag] +is_single_line=true +is_celled=false +is_add_directly=true +datum_add_hashes_count=1 + +# Switched off to false because hash symbols below are not well recognized + +is_static_genesis_event=false +static_genesis_event=0xEB2152E716245D067BEA80E8CB6D7C35859B2E0E91AF4201486BB443F6AEE7FF + +[dag-poa] +auth_certs_prefix=dapcash.testnet.master.cell +auth_certs_number=3 +auth_certs_number_verify=1 #4 +auth_certs_dir=/opt/cellframe-node/share/ca diff --git a/libdap-chain-net-srv-vpn b/libdap-chain-net-srv-vpn index d532852..a35aeb7 160000 --- a/libdap-chain-net-srv-vpn +++ b/libdap-chain-net-srv-vpn @@ -1 +1 @@ -Subproject commit d532852fd138e47498e62a16c5b3b7b139bda549 +Subproject commit a35aeb7f095fb314d6bcc46331d5721c30c00473 -- GitLab