diff --git a/CMakeLists.txt b/CMakeLists.txt index 9151cd1f412f77612a706ddebf1641183137e5d6..39378e1d2b662e50ce265ecb83ae2f2bd10ee73f 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 1955aad2842cbd7f72137c4fc2b3e97790948f93..0f708da7a57ed6e76cbf9981211bcbfc24c6b599 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 0000000000000000000000000000000000000000..8ede75fbe31e205e8708b5cc74a4863060489cb6 --- /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 7858946c5bce7875203cb3d174dc6d8ae92d47e3..c55fc271b8bd74583db68b1cc386194fa7cabfd6 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 Binary files /dev/null and b/dist/share/ca/dapcash.testnet.master.cell.0.dcert differ 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 Binary files /dev/null and b/dist/share/ca/dapcash.testnet.master.cell.1.dcert differ 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 Binary files /dev/null and b/dist/share/ca/dapcash.testnet.master.cell.2.dcert differ diff --git a/dist/share/configs/dapcash-node.cfg.tpl b/dist/share/configs/dapcash-node.cfg.tpl index 10d985d67004fe5c38460b0d1fb53bea96fb7035..99c0625ba6c2b9fbd61847cdb082bafbad239ee3 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 fb57911a676829f62f84704ad23b8a2d2d27ffbe..2e5fb64ad7eea72e5aef9ad5e207669464038e10 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 f176a522bb3e6550d64798b78463dcfab1439820..1adc05cb0c7fb0a1b0f6af55a4eadb3fad4b1980 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 9ea22d1b113d41545b378df9864a0caba3cf51c4..1e888729d80befec68683762707e62b8e61d2a4d 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 4d3cda376d9fd673ff12d748807fab57709e967b..d591e36646bc90ae433b3090626ae9d52882814b 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 ef0ae6288a55168e8670ea2900e7e40e54acdab2..ef72e3e95eea97d1a17f66c35d184a2ed02e6854 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 3eb6ca1d03cd2e03db9fa8b178eba05c3e1101fe..aa8df1441323850017d0ed5117e6d5e254225054 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 79f1d2fb9f6529fd413feb4f872b59b43c6ef176..979a6477d4c30346db2ff2144b4009fb0b7fc8d4 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 72ad71ba1fe05341a41e40002f37f73e9a911557..d532852fd138e47498e62a16c5b3b7b139bda549 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 7500d54e139a92586b1488edffcb12f4f1c824ec..608ab1c9e0f5dac7b8c4f1abac6aa8f13c48ceaa 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 001748d443a4cf8fef1886a6a9846e712967d0fd..5d522e3397528df51809bca9143a978d2fe62143 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 3c768e4b51cd4dc87893769ee0693992138be675..5ffbfcbd2a475b252938bdd1c793dc7c612b105d 160000 --- a/libdap-stream-ch-chain-net +++ b/libdap-stream-ch-chain-net @@ -1 +1 @@ -Subproject commit 3c768e4b51cd4dc87893769ee0693992138be675 +Subproject commit 5ffbfcbd2a475b252938bdd1c793dc7c612b105d