Merge pull request #2710 from Taraxa-project/master2dev

Master2dev
Taraxa-project · Feb 28, 2024 · e4f9c08 · e4f9c08
2 parents c721fbe + 2e80f95
commit e4f9c08
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 17 deletions.
diff --git 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/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

diff --git 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"
     }
   }
 }
diff --git 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
@@ -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"
     }

diff --git a/submodules/taraxa-evm b/submodules/taraxa-evm
diff --git 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();