From ed44835409ffdb7439ec982fbe8fb74ceba2cf70 Mon Sep 17 00:00:00 2001 From: Leonard Mocanu Date: Thu, 25 Jan 2024 22:40:21 +0200 Subject: [PATCH 1/3] chore: fixes taraxa-sign script --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 076909c31b..8e28f32b14 100644 --- a/Dockerfile +++ b/Dockerfile @@ -119,7 +119,7 @@ RUN apt-get update \ && rm -rf /var/lib/apt/lists/* # Install required Python packages -RUN pip3 install click eth-account eth-utils +RUN pip3 install click eth-account eth-utils typing-extensions ARG BUILD_OUTPUT_DIR WORKDIR /root/.taraxa From 587734ae57adb225cd1e5346650eacd267f0c58f Mon Sep 17 00:00:00 2001 From: Matus Kysel Date: Mon, 26 Feb 2024 14:51:03 +0100 Subject: [PATCH 2/3] release v1.7.0 --- CMakeLists.txt | 4 ++-- .../include/cli/config_jsons/devnet/devnet_genesis.json | 8 ++++---- .../include/cli/config_jsons/mainnet/mainnet_genesis.json | 2 +- .../include/cli/config_jsons/testnet/testnet_genesis.json | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-) 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" } From 984827592819f7782612e26175d067878a16abc4 Mon Sep 17 00:00:00 2001 From: Matus Kysel Date: Mon, 26 Feb 2024 19:03:39 +0100 Subject: [PATCH 3/3] chore: fix the test --- submodules/taraxa-evm | 2 +- tests/rewards_stats_test.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/submodules/taraxa-evm b/submodules/taraxa-evm index c012ac920d..c12da5dcc7 160000 --- a/submodules/taraxa-evm +++ b/submodules/taraxa-evm @@ -1 +1 @@ -Subproject commit c012ac920d672219c6ec45342512562c58805ccd +Subproject commit c12da5dcc75e743fefe14aed99b98055695775c1 diff --git a/tests/rewards_stats_test.cpp b/tests/rewards_stats_test.cpp index 03e2ca7a72..73b36efb5f 100644 --- a/tests/rewards_stats_test.cpp +++ b/tests/rewards_stats_test.cpp @@ -235,11 +235,11 @@ TEST_F(RewardsStatsTest, dagBlockRewards) { HardforksConfig hfc; hfc.aspen_hf.block_num_part_two = 4; - // Create two reward stats to test before and after aspen hardfork part 2 - rewards::Stats pre_aspen_reward_stats(100, HardforksConfig{0, 0, {}, {}, MagnoliaHardfork{0, 0}, AspenHardfork{1, 6}}, - db, [](auto) { return 100; }); + // Create two reward stats to test before and after aspen hardfork part 1 + rewards::Stats pre_aspen_reward_stats( + 100, HardforksConfig{0, 0, {}, {}, MagnoliaHardfork{0, 0}, AspenHardfork{6, 999}}, db, [](auto) { return 100; }); rewards::Stats post_aspen_reward_stats( - 100, HardforksConfig{0, 0, {}, {}, MagnoliaHardfork{0, 0}, AspenHardfork{1, 4}}, db, [](auto) { return 100; }); + 100, HardforksConfig{0, 0, {}, {}, MagnoliaHardfork{0, 0}, AspenHardfork{4, 999}}, db, [](auto) { return 100; }); // Create pbft block with 5 dag blocks auto dag_key1 = dev::KeyPair::create();