Merge pull request #2662 from Taraxa-project/fix-commission-rewards

chore: fix commision rewards
Taraxa-project · Jan 19, 2024 · 2baad7f · 2baad7f
2 parents 0e96e5b + f96e3b7
commit 2baad7f
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 9 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 5)
-set(TARAXA_PATCH_VERSION 3)
+set(TARAXA_MINOR_VERSION 6)
+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
@@ -63,7 +63,7 @@ RUN ln -s /usr/bin/clang-${LLVM_VERSION} /usr/bin/clang
 RUN ln -s /usr/bin/clang++-${LLVM_VERSION} /usr/bin/clang++
 
 # Install conan
-RUN pip3 install conan==1.59.0
+RUN pip3 install conan==1.60.0
 
 ENV CONAN_REVISIONS_ENABLED=1
 

diff --git a/libraries/cli/include/cli/config_jsons/default/default_genesis.json b/libraries/cli/include/cli/config_jsons/default/default_genesis.json
@@ -99,6 +99,7 @@
   },
   "hardforks": {
     "fix_redelegate_block_num": 0,
+    "phalaenopsis_hf_block_num": 0,
     "rewards_distribution_frequency": {
       "0" : 100
     },

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,6 +265,7 @@
   },
   "hardforks": {
     "fix_redelegate_block_num": 0,
+    "phalaenopsis_hf_block_num": 1000,
     "rewards_distribution_frequency": {
       "0": 100
     },

diff --git a/libraries/cli/include/cli/config_jsons/mainnet/mainnet_genesis.json b/libraries/cli/include/cli/config_jsons/mainnet/mainnet_genesis.json
@@ -1627,6 +1627,7 @@
   },
   "hardforks": {
     "fix_redelegate_block_num": 3091000,
+    "phalaenopsis_hf_block_num": 6943000,
     "redelegations": [
       {
         "validator": "0x6671df8b597c0A14a9361b4B98F97AF1360e4352",
@@ -1635,10 +1636,10 @@
       }
     ],
     "rewards_distribution_frequency": {
-      "5730000" : 100
+      "5730000": 100
     },
-    "magnolia_hf" : {
-      "block_num" : 5730000,
+    "magnolia_hf": {
+      "block_num": 5730000,
       "jail_time": 163459
     }
   }

diff --git a/libraries/cli/include/cli/config_jsons/testnet/testnet_genesis.json b/libraries/cli/include/cli/config_jsons/testnet/testnet_genesis.json
@@ -133,6 +133,7 @@
   },
   "hardforks": {
     "fix_redelegate_block_num": 0,
+    "phalaenopsis_hf_block_num": 0,
     "redelegations": [],
     "rewards_distribution_frequency": {
       "297000": 100

diff --git a/libraries/config/include/config/hardfork.hpp b/libraries/config/include/config/hardfork.hpp
@@ -26,6 +26,8 @@ void dec_json(const Json::Value& json, MagnoliaHardfork& obj);
 struct HardforksConfig {
   // disable it by default (set to max uint64)
   uint64_t fix_redelegate_block_num = -1;
+  // disable it by default (set to max uint64)
+  uint64_t phalaenopsis_hf_block_num = -1;
   std::vector<Redelegation> redelegations;
   /*
    * @brief key is block number at which change is applied and value is new distribution interval.

diff --git a/libraries/config/src/hardfork.cpp b/libraries/config/src/hardfork.cpp
@@ -32,6 +32,7 @@ RLP_FIELDS_DEFINE(MagnoliaHardfork, block_num, jail_time)
 Json::Value enc_json(const HardforksConfig& obj) {
   Json::Value json(Json::objectValue);
   json["fix_redelegate_block_num"] = dev::toJS(obj.fix_redelegate_block_num);
+  json["phalaenopsis_hf_block_num"] = dev::toJS(obj.phalaenopsis_hf_block_num);
   json["initial_validators"] = Json::Value(Json::arrayValue);
   for (const auto& v : obj.redelegations) {
     json["redelegations"].append(enc_json(v));
@@ -50,6 +51,7 @@ Json::Value enc_json(const HardforksConfig& obj) {
 
 void dec_json(const Json::Value& json, HardforksConfig& obj) {
   obj.fix_redelegate_block_num = dev::getUInt(json["fix_redelegate_block_num"]);
+  obj.phalaenopsis_hf_block_num = dev::getUInt(json["phalaenopsis_hf_block_num"]);
 
   const auto& redelegations_json = json["redelegations"];
   obj.redelegations = std::vector<Redelegation>(redelegations_json.size());
@@ -70,4 +72,5 @@ void dec_json(const Json::Value& json, HardforksConfig& obj) {
   }
 }
 
-RLP_FIELDS_DEFINE(HardforksConfig, fix_redelegate_block_num, redelegations, rewards_distribution_frequency, magnolia_hf)
+RLP_FIELDS_DEFINE(HardforksConfig, fix_redelegate_block_num, phalaenopsis_hf_block_num, redelegations,
+                  rewards_distribution_frequency, magnolia_hf)
diff --git a/submodules/taraxa-evm b/submodules/taraxa-evm
diff --git a/tests/rewards_stats_test.cpp b/tests/rewards_stats_test.cpp
@@ -20,7 +20,7 @@ struct RewardsStatsTest : NodesTest {};
 class TestableRewardsStats : public rewards::Stats {
  public:
   TestableRewardsStats(const HardforksConfig::RewardsDistributionMap& rdm, std::shared_ptr<DB> db)
-      : rewards::Stats(100, HardforksConfig{0, {}, rdm, MagnoliaHardfork{0, 0}}, db, [](auto) { return 100; }) {}
+      : rewards::Stats(100, HardforksConfig{0, 0, {}, rdm, MagnoliaHardfork{0, 0}}, db, [](auto) { return 100; }) {}
   auto getStats() { return blocks_stats_; }
 };
+5 −1		accounts/abi/abi.go
+5 −0		taraxa/state/chain_config/chain_config.go
+19 −0		taraxa/state/contracts/dpos/precompiled/dpos_contract.go
+25 −38		taraxa/state/contracts/dpos/solidity/dpos_contract_interface.sol
+1 −1		taraxa/state/contracts/dpos/solidity/dpos_contract_solidity_structs.go
+24 −3		taraxa/state/contracts/tests/dpos/dpos_test.go