diff --git a/CMakeLists.txt b/CMakeLists.txt index 89db54c184..3ebce283ed 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,8 +2,8 @@ cmake_minimum_required(VERSION 3.20) # Set current version of the project set(TARAXA_MAJOR_VERSION 1) -set(TARAXA_MINOR_VERSION 6) -set(TARAXA_PATCH_VERSION 1) +set(TARAXA_MINOR_VERSION 7) +set(TARAXA_PATCH_VERSION 0) set(TARAXA_VERSION ${TARAXA_MAJOR_VERSION}.${TARAXA_MINOR_VERSION}.${TARAXA_PATCH_VERSION}) # Any time a change in the network protocol is introduced this version should be increased diff --git a/libraries/cli/include/cli/config_jsons/devnet/devnet_genesis.json b/libraries/cli/include/cli/config_jsons/devnet/devnet_genesis.json index 8122807c5b..4b3eb14830 100644 --- a/libraries/cli/include/cli/config_jsons/devnet/devnet_genesis.json +++ b/libraries/cli/include/cli/config_jsons/devnet/devnet_genesis.json @@ -265,7 +265,7 @@ }, "hardforks": { "fix_redelegate_block_num": 0, - "phalaenopsis_hf_block_num": 1000, + "phalaenopsis_hf_block_num": 0, "rewards_distribution_frequency": { "0": 100 }, @@ -274,10 +274,10 @@ "jail_time": 1000 }, "aspen_hf" : { - "block_num_part_one" : 1000, - "block_num_part_two" : 2000, + "block_num_part_one" : 0, + "block_num_part_two" : 0, "max_supply": "0x26C62AD77DC602DAE0000000", - "generated_rewards": "0x16E59F7481A7EC1F60" + "generated_rewards": "0" } } } \ No newline at end of file diff --git a/libraries/cli/include/cli/config_jsons/mainnet/mainnet_genesis.json b/libraries/cli/include/cli/config_jsons/mainnet/mainnet_genesis.json index 9450fa64cb..42049da382 100644 --- a/libraries/cli/include/cli/config_jsons/mainnet/mainnet_genesis.json +++ b/libraries/cli/include/cli/config_jsons/mainnet/mainnet_genesis.json @@ -1643,7 +1643,7 @@ "jail_time": 163459 }, "aspen_hf" : { - "block_num_part_one" : -1, + "block_num_part_one" : 8118000, "block_num_part_two" : -1, "max_supply": "0x26C62AD77DC602DAE0000000", "generated_rewards": "0x0" diff --git a/libraries/cli/include/cli/config_jsons/testnet/testnet_genesis.json b/libraries/cli/include/cli/config_jsons/testnet/testnet_genesis.json index 31fa3f15fc..137195e825 100644 --- a/libraries/cli/include/cli/config_jsons/testnet/testnet_genesis.json +++ b/libraries/cli/include/cli/config_jsons/testnet/testnet_genesis.json @@ -136,15 +136,15 @@ "phalaenopsis_hf_block_num": 0, "redelegations": [], "rewards_distribution_frequency": { - "297000": 100 + "0": 100 }, "magnolia_hf": { - "block_num": 297000, + "block_num": 0, "jail_time": 163459 }, "aspen_hf": { - "block_num_part_one": 1000, - "block_num_part_two": -1, + "block_num_part_one": 0, + "block_num_part_two": 0, "max_supply": "0x26C62AD77DC602DAE0000000", "generated_rewards": "0x0" }