diff --git a/CMakeLists.txt b/CMakeLists.txt index c6fac49e323199088b6cc15706151cbef5ca556f..5f0df2703eb6ecbf86fe1b3d0563715fc3ffa552 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ set(CMAKE_C_STANDARD 11) SET( CPACK_PACKAGE_NAME "${PROJECT_NAME}") SET( CPACK_PACKAGE_VERSION_MAJOR 3) SET( CPACK_PACKAGE_VERSION_MINOR 3) -SET( CPACK_PACKAGE_VERSION_PATCH 5) +SET( CPACK_PACKAGE_VERSION_PATCH 6) # init CellFrame SDK add_definitions("-DDAP_VERSION=\"${CPACK_PACKAGE_VERSION_MAJOR}\"") diff --git a/cellframe-sdk b/cellframe-sdk index d27598edc2acf65938983fb8e5dd38b7e75cc677..e2d905890465186f4b66e01d024a99b40f4908cb 160000 --- a/cellframe-sdk +++ b/cellframe-sdk @@ -1 +1 @@ -Subproject commit d27598edc2acf65938983fb8e5dd38b7e75cc677 +Subproject commit e2d905890465186f4b66e01d024a99b40f4908cb diff --git a/dist/etc/network/core-t/chain-0.cfg b/dist/etc/network/core-t/chain-0.cfg index 9b47dc811d0a2965ef846ac03d4107601fd32ad1..d26db0c59413240da03a233dd184878337f5250a 100644 --- a/dist/etc/network/core-t/chain-0.cfg +++ b/dist/etc/network/core-t/chain-0.cfg @@ -1,27 +1,28 @@ -[chain] -id=0x0000000000000000 -shard_id=0x0000000000000000 -name=zerochain -load_priority=1 -# Possible values [token, emission, transaction] -datum_types=[token,emission,shard,ca,transaction] -consensus=dag_poa - -[files] -storage_dir=/opt/cellframe-node/var/lib/network/core-t/zerochain/ - -[dag] -is_single_line=true -is_celled=false -is_add_directly=true -datum_add_hashes_count=1 - -is_static_genesis_event=true -static_genesis_event=0x65D9E91CD08DBDEFAAF30AEC316DC87F8BEE482843B3EA128FF2566B53E5AFA8 - -[dag-poa] -auth_certs_prefix=core-t -auth_certs_number=3 -auth_certs_number_verify=1 #4 -auth_certs_dir=/opt/cellframe-node/share/ca - +[chain] +id=0x0000000000000000 +shard_id=0x0000000000000000 +name=zerochain +load_priority=1 +# Possible values [token, emission, transaction] +datum_types=[token,emission,shard,ca,transaction] +mempool_auto_types=[emission,transaction] +consensus=dag_poa + +[files] +storage_dir=/opt/cellframe-node/var/lib/network/core-t/zerochain/ + +[dag] +is_single_line=true +is_celled=false +is_add_directly=true +datum_add_hashes_count=1 + +is_static_genesis_event=true +static_genesis_event=0x65D9E91CD08DBDEFAAF30AEC316DC87F8BEE482843B3EA128FF2566B53E5AFA8 + +[dag-poa] +auth_certs_prefix=core-t +auth_certs_number=3 +auth_certs_number_verify=1 #4 +auth_certs_dir=/opt/cellframe-node/share/ca + diff --git a/dist/etc/network/core-t/chain-plasma.cfg b/dist/etc/network/core-t/chain-plasma.cfg index f2340d1eb6ac486d5ce4b551f17a018cbb931b28..ac5824e5256f7549288e68dc4d689bd91ca825c2 100644 --- a/dist/etc/network/core-t/chain-plasma.cfg +++ b/dist/etc/network/core-t/chain-plasma.cfg @@ -1,30 +1,31 @@ -[chain] -id=0x0000000000000001 -name=plasma -load_priority=2 -# Possible values [token, emission, transaction] -datum_types=[transaction,ca] -consensus=dag_pos - -[dag] -is_single_line=false -is_celled=true -is_add_directly=true -datum_add_hashes_count=3 - -is_static_genesis_event=true -static_genesis_event=0x39827168F25185FFBD0A44A41AF43265EB85D6E4A92544E72364E536C9A29D87 - -# Proof-of-State consensus config -[dag-pos] -# Tokens hold and hold_value must be equel size -# KELT - test token, KEL - main tokem -tokens_hold=[CFNT] -# 1000 coins for both -tokens_hold_value=[1000000000000] -# Confirmations minimum -confirmations_minimum=1 - -[files] -storage_dir=/opt/cellframe-node/var/lib/network/core-t/plasma - +[chain] +id=0x0000000000000001 +name=plasma +load_priority=2 +# Possible values [token, emission, transaction] +datum_types=[transaction,ca] +mempool_auto_types=[transaction] +consensus=dag_pos + +[dag] +is_single_line=false +is_celled=true +is_add_directly=true +datum_add_hashes_count=3 + +is_static_genesis_event=true +static_genesis_event=0x39827168F25185FFBD0A44A41AF43265EB85D6E4A92544E72364E536C9A29D87 + +# Proof-of-State consensus config +[dag-pos] +# Tokens hold and hold_value must be equel size +# KELT - test token, KEL - main tokem +tokens_hold=[CFNT] +# 1000 coins for both +tokens_hold_value=[1000000000000] +# Confirmations minimum +confirmations_minimum=1 + +[files] +storage_dir=/opt/cellframe-node/var/lib/network/core-t/plasma + diff --git a/dist/etc/network/kelvin-testnet/chain-0.cfg b/dist/etc/network/kelvin-testnet/chain-0.cfg index c3b23117beb6912f29b1ac8ccd58f2de79397f35..32b50db14bc7857cf417e63f4a9537ee186d5cb9 100644 --- a/dist/etc/network/kelvin-testnet/chain-0.cfg +++ b/dist/etc/network/kelvin-testnet/chain-0.cfg @@ -1,28 +1,29 @@ -[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/cellframe-node/var/lib/network/kelvin-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=kelvin.testnet.root -auth_certs_number=5 -auth_certs_number_verify=1 #4 -auth_certs_dir=/opt/cellframe-node/share/ca +[chain] +id=0x0000000000000000 +shard_id=0x0000000000000000 +name=zerochain +load_priority=1 +# Possible values [token, emission, transaction] +datum_types=[token,emission,shard,ca] +mempool_auto_types=[emission] +consensus=dag_poa + +[files] +storage_dir=/opt/cellframe-node/var/lib/network/kelvin-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=kelvin.testnet.root +auth_certs_number=5 +auth_certs_number_verify=1 #4 +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 fc6d71a5f7071efdf0619df80eb69cd1c784c88b..f01d32514e6a776fab400051e130bae4d7675150 100644 --- a/dist/etc/network/kelvin-testnet/chain-plasma.cfg +++ b/dist/etc/network/kelvin-testnet/chain-plasma.cfg @@ -1,27 +1,28 @@ -[chain] -id=0x0000000000000001 -name=plasma -load_priority=2 -# Possible values [token, emission, transaction] -datum_types=[transaction,ca] -consensus=dag_pos - -[dag] -is_single_line=false -is_celled=true -is_add_directly=true -datum_add_hashes_count=3 - -# Proof-of-State consensus config -[dag-pos] -# Tokens hold and hold_value must be equel size -# KELT - test token, KEL - main tokem -tokens_hold=[KELT,KEL] -# 1000 coins for both -tokens_hold_value=[1000000000,1000000000] -# Confirmations minimum -confirmations_minimum=1 - -[files] -storage_dir=/opt/cellframe-node/var/lib/network/kelvin-testnet/plasma - +[chain] +id=0x0000000000000001 +name=plasma +load_priority=2 +# Possible values [token, emission, transaction] +datum_types=[transaction,ca] +mempool_auto_types=[transaction] +consensus=dag_pos + +[dag] +is_single_line=false +is_celled=true +is_add_directly=true +datum_add_hashes_count=3 + +# Proof-of-State consensus config +[dag-pos] +# Tokens hold and hold_value must be equel size +# KELT - test token, KEL - main tokem +tokens_hold=[KELT,KEL] +# 1000 coins for both +tokens_hold_value=[1000000000,1000000000] +# Confirmations minimum +confirmations_minimum=1 + +[files] +storage_dir=/opt/cellframe-node/var/lib/network/kelvin-testnet/plasma +