diff --git a/CMakeLists.txt b/CMakeLists.txt index efa927266464d79eeb2870df9c064e829285ca8b..db44528f07237480215f6eb1639af18eeab7cb99 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 8) # init CellFrame SDK add_definitions("-DDAP_VERSION=\"${CPACK_PACKAGE_VERSION_MAJOR}\"") diff --git a/cellframe-sdk b/cellframe-sdk index c31d8bcf77805bed319d5a149f3c15a917ba041a..bac9f81308cefec3de19adb92fafb9096e18f7f3 160000 --- a/cellframe-sdk +++ b/cellframe-sdk @@ -1 +1 @@ -Subproject commit c31d8bcf77805bed319d5a149f3c15a917ba041a +Subproject commit bac9f81308cefec3de19adb92fafb9096e18f7f3 diff --git a/dist/etc/network/core-t/chain-0.cfg b/dist/etc/network/core-t/chain-0.cfg index 4e27e94df02cbacec2535147954dd914c7a35e98..d26db0c59413240da03a233dd184878337f5250a 100644 --- a/dist/etc/network/core-t/chain-0.cfg +++ b/dist/etc/network/core-t/chain-0.cfg @@ -5,7 +5,7 @@ name=zerochain load_priority=1 # Possible values [token, emission, transaction] datum_types=[token,emission,shard,ca,transaction] -mempool_auto_types=[] +mempool_auto_types=[emission,transaction] consensus=dag_poa [files] diff --git a/dist/etc/network/kelvin-testnet/chain-0.cfg b/dist/etc/network/kelvin-testnet/chain-0.cfg index c1fb04f080d539d5ac8ef0b684b9ccaaed05e375..83a4e56ecb4430d282aee28045a047c736f7043d 100644 --- a/dist/etc/network/kelvin-testnet/chain-0.cfg +++ b/dist/etc/network/kelvin-testnet/chain-0.cfg @@ -4,8 +4,8 @@ shard_id=0x0000000000000000 name=zerochain load_priority=1 # Possible values [token, emission, transaction] -datum_types=[token,emission,shard,ca] -mempool_auto_types=[] +datum_types=[token,emission,shard,ca,transaction] +mempool_auto_types=[emission] consensus=dag_poa [files] @@ -19,8 +19,13 @@ datum_add_hashes_count=1 # Switched off to false because hash symbols below are not well recognized +<<<<<<< HEAD is_static_genesis_event=false static_genesis_event=0xEB2152E716245D067BEA80E8CB6D7C35859B2E0E91AF4201486BB443F6AEE7FF +======= +is_static_genesis_event=true +static_genesis_event=0x642DEBE847A73FA0505C6648C1086675B6B4ADDDC4A8D333DCCD4169228E1E97 +>>>>>>> features-3927 [dag-poa] auth_certs_prefix=kelvin.testnet.root diff --git a/dist/etc/network/kelvin-testnet/chain-plasma.cfg b/dist/etc/network/kelvin-testnet/chain-plasma.cfg index f01d32514e6a776fab400051e130bae4d7675150..9b47a595e53e428c8c2de41b9e1c0dc99cb95e9e 100644 --- a/dist/etc/network/kelvin-testnet/chain-plasma.cfg +++ b/dist/etc/network/kelvin-testnet/chain-plasma.cfg @@ -12,6 +12,8 @@ is_single_line=false is_celled=true is_add_directly=true datum_add_hashes_count=3 +is_static_genesis_event=true +static_genesis_event=0x8EA91DC2E2E9271ECC8F55EFF610ADA9ED21E4CA44108A67DA11FB93831CABD8 # Proof-of-State consensus config [dag-pos] diff --git a/python-cellframe b/python-cellframe index ce2cc96fe1b6405dada650bb0a992d58ee305a5e..fbb50e65fec326cd6ea2b47ebebbe5aad8feba39 160000 --- a/python-cellframe +++ b/python-cellframe @@ -1 +1 @@ -Subproject commit ce2cc96fe1b6405dada650bb0a992d58ee305a5e +Subproject commit fbb50e65fec326cd6ea2b47ebebbe5aad8feba39