diff --git a/CMakeLists.txt b/CMakeLists.txt index 8ed44aeb44d2aa1fb3a1c993a9d7ae6cf9b320e7..267ebe38e6ea6f5b605637e7c0100c696b9d64bb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -46,7 +46,7 @@ SET( CPACK_GENERATOR "DEB") SET( CPACK_PACKAGE_NAME "${PROJECT_NAME}") SET( CPACK_PACKAGE_VERSION_MAJOR 2) SET( CPACK_PACKAGE_VERSION_MINOR 4) -SET( CPACK_PACKAGE_VERSION_PATCH 25) +SET( CPACK_PACKAGE_VERSION_PATCH 26) SET( CPACK_SYSTEM_NAME "debian-9.9-amd64") SET( CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}-${CPACK_PACKAGE_VERSION_PATCH}") diff --git a/dist/etc/network/kelvin-testnet/chain-0.cfg b/dist/etc/network/kelvin-testnet/chain-0.cfg index 1fff26df97d64acf728b4c433de4f916af87cc2b..2f45106bafd6324610552ff4381485b02123bec1 100644 --- a/dist/etc/network/kelvin-testnet/chain-0.cfg +++ b/dist/etc/network/kelvin-testnet/chain-0.cfg @@ -7,16 +7,16 @@ datum_types=[token,emission,shard,ca] consensus=dag_poa [files] -storage_dir=/opt/kelvin-node/var/lib/network/kelvin-testnet/zerochain/ +storage_dir=/opt/cellframe-node/var/lib/network/kelvin-testnet/zerochain/ [dag] is_single_line=true is_celled=false -is_add_directly=false +is_add_directly=true datum_add_hashes_count=1 [dag-poa] auth_certs_prefix=kelvin.testnet.root auth_certs_number=5 auth_certs_number_verify=1 #4 -auth_certs_dir=/opt/kelvin-node/share/ca +auth_certs_dir=/opt/cellframe-node/share/ca diff --git a/dist/etc/network/kelvin-testnet/chain-plasma.cfg b/dist/etc/network/kelvin-testnet/chain-plasma.cfg index 06c681166780e10bd39149f81ed85a7117f0e58c..6eb6bf24d4be07ba66b26dcb23b50623ce18899e 100644 --- a/dist/etc/network/kelvin-testnet/chain-plasma.cfg +++ b/dist/etc/network/kelvin-testnet/chain-plasma.cfg @@ -8,7 +8,7 @@ consensus=dag_pos [dag] is_single_line=false is_celled=true -is_add_directly=false +is_add_directly=true datum_add_hashes_count=3 # Proof-of-State consensus config @@ -20,5 +20,5 @@ tokens_hold=[KELT,KEL] tokens_hold_value=[1000000000000000,1000000000000000] [files] -storage_dir=/opt/kelvin-node/var/lib/network/kelvin-testnet/plasma +storage_dir=/opt/cellframe-node/var/lib/network/kelvin-testnet/plasma diff --git a/libdap-chain b/libdap-chain index 66e9e9a4e4bcd5e4b62197175037071c97a76f3d..d693fe5d8fc0ad3074714a70f4abfe328f9e755a 160000 --- a/libdap-chain +++ b/libdap-chain @@ -1 +1 @@ -Subproject commit 66e9e9a4e4bcd5e4b62197175037071c97a76f3d +Subproject commit d693fe5d8fc0ad3074714a70f4abfe328f9e755a diff --git a/libdap-chain-cs-dag b/libdap-chain-cs-dag index 45dd9baa36330ea679f5cbd3e52b4d8a6ae1679b..0bcfe08e22b221d54c06362ca879e7f118dc7849 160000 --- a/libdap-chain-cs-dag +++ b/libdap-chain-cs-dag @@ -1 +1 @@ -Subproject commit 45dd9baa36330ea679f5cbd3e52b4d8a6ae1679b +Subproject commit 0bcfe08e22b221d54c06362ca879e7f118dc7849 diff --git a/libdap-chain-cs-dag-pos b/libdap-chain-cs-dag-pos index 70546e34bae06f1023dedbc21282be8cf615d75d..c2de2d3e990da68ce7150c1e08c6e3cbc132cb75 160000 --- a/libdap-chain-cs-dag-pos +++ b/libdap-chain-cs-dag-pos @@ -1 +1 @@ -Subproject commit 70546e34bae06f1023dedbc21282be8cf615d75d +Subproject commit c2de2d3e990da68ce7150c1e08c6e3cbc132cb75 diff --git a/libdap-chain-net b/libdap-chain-net index 810dc5ef6961594ddc1d7a79b1533be68d74d88c..c99f93027ead23c1f1136a4305d0ac96e77712bc 160000 --- a/libdap-chain-net +++ b/libdap-chain-net @@ -1 +1 @@ -Subproject commit 810dc5ef6961594ddc1d7a79b1533be68d74d88c +Subproject commit c99f93027ead23c1f1136a4305d0ac96e77712bc diff --git a/libdap-chain-net-srv-vpn b/libdap-chain-net-srv-vpn index 0f72724bd867caa67b10921e4b775a68e27c48fb..148b44a02653e1697c01081abda649903f9eac3a 160000 --- a/libdap-chain-net-srv-vpn +++ b/libdap-chain-net-srv-vpn @@ -1 +1 @@ -Subproject commit 0f72724bd867caa67b10921e4b775a68e27c48fb +Subproject commit 148b44a02653e1697c01081abda649903f9eac3a diff --git a/libdap-client b/libdap-client index 9f4943f40c1150a818e3200d2d6efc235fc4e1c1..b520a4ebbd3912ac99cbd0158f4f9cc001de9a2d 160000 --- a/libdap-client +++ b/libdap-client @@ -1 +1 @@ -Subproject commit 9f4943f40c1150a818e3200d2d6efc235fc4e1c1 +Subproject commit b520a4ebbd3912ac99cbd0158f4f9cc001de9a2d