From ad0a32e4a01770380d9ceb0b1d58a928da4eb823 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, 22 Oct 2019 23:24:10 +0500 Subject: [PATCH] fixed chain-*.cfg files updated modules updated ver. to 2.4.26 --- CMakeLists.txt | 2 +- dist/etc/network/kelvin-testnet/chain-0.cfg | 6 +++--- dist/etc/network/kelvin-testnet/chain-plasma.cfg | 4 ++-- libdap-chain | 2 +- libdap-chain-cs-dag | 2 +- libdap-chain-cs-dag-pos | 2 +- libdap-chain-net | 2 +- libdap-chain-net-srv-vpn | 2 +- libdap-client | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8ed44aeb..267ebe38 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 1fff26df..2f45106b 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 06c68116..6eb6bf24 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 66e9e9a4..d693fe5d 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 45dd9baa..0bcfe08e 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 70546e34..c2de2d3e 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 810dc5ef..c99f9302 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 0f72724b..148b44a0 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 9f4943f4..b520a4eb 160000 --- a/libdap-client +++ b/libdap-client @@ -1 +1 @@ -Subproject commit 9f4943f40c1150a818e3200d2d6efc235fc4e1c1 +Subproject commit b520a4ebbd3912ac99cbd0158f4f9cc001de9a2d -- GitLab