PR comments

AstarNetwork · Nov 13, 2023 · a1132af · a1132af
1 parent 49eb2a5
commit a1132af
Show file tree

Hide file tree

Showing 13 changed files with 26 additions and 41 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bin/collator/Cargo.toml b/bin/collator/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "astar-collator"
-version = "5.25.0"
+version = "5.24.0"
 description = "Astar collator implementation in Rust."
 build = "build.rs"
 default-run = "astar-collator"

diff --git a/bin/collator/src/local/chain_spec.rs b/bin/collator/src/local/chain_spec.rs
@@ -19,10 +19,10 @@
 //! Chain specifications.
 
 use local_runtime::{
-    wasm_binary_unwrap, AccountId, AuraConfig, AuraId, BalancesConfig, BlockRewardConfig, RewardDistributionConfig,
+    wasm_binary_unwrap, AccountId, AuraConfig, AuraId, BalancesConfig, BlockRewardConfig,
     CouncilConfig, DemocracyConfig, EVMConfig, GenesisConfig, GrandpaConfig, GrandpaId,
-    Precompiles, Signature, SudoConfig, SystemConfig, TechnicalCommitteeConfig, TreasuryConfig,
-    VestingConfig,
+    Precompiles, RewardDistributionConfig, Signature, SudoConfig, SystemConfig,
+    TechnicalCommitteeConfig, TreasuryConfig, VestingConfig,
 };
 use sc_service::ChainType;
 use sp_core::{crypto::Ss58Codec, sr25519, Pair, Public};

diff --git a/bin/collator/src/parachain/chain_spec/shibuya.rs b/bin/collator/src/parachain/chain_spec/shibuya.rs
@@ -21,10 +21,11 @@
 use cumulus_primitives_core::ParaId;
 use sc_service::ChainType;
 use shibuya_runtime::{
-    wasm_binary_unwrap, AccountId, AuraConfig, AuraId, Balance, BalancesConfig, BlockRewardConfig, RewardDistributionConfig,
+    wasm_binary_unwrap, AccountId, AuraConfig, AuraId, Balance, BalancesConfig, BlockRewardConfig,
     CollatorSelectionConfig, CouncilConfig, DemocracyConfig, EVMChainIdConfig, EVMConfig,
-    GenesisConfig, ParachainInfoConfig, Precompiles, SessionConfig, SessionKeys, Signature,
-    SudoConfig, SystemConfig, TechnicalCommitteeConfig, TreasuryConfig, VestingConfig, SBY,
+    GenesisConfig, ParachainInfoConfig, Precompiles, RewardDistributionConfig, SessionConfig,
+    SessionKeys, Signature, SudoConfig, SystemConfig, TechnicalCommitteeConfig, TreasuryConfig,
+    VestingConfig, SBY,
 };
 use sp_core::{sr25519, Pair, Public};
 

diff --git a/pallets/block-rewards-hybrid/src/lib.rs b/pallets/block-rewards-hybrid/src/lib.rs
@@ -242,6 +242,7 @@ pub mod pallet {
                 collators_reward,
             }
         }
+
         /// Distribute reward between beneficiaries.
         ///
         /// # Arguments
@@ -348,7 +349,7 @@ impl RewardDistributionConfig {
 /// Represents rewards distribution balances for each beneficiary
 #[derive(PartialEq, Eq, Clone, Encode, Decode, RuntimeDebug, TypeInfo, MaxEncodedLen)]
 #[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize))]
-struct Rewards {
+pub struct Rewards {
     treasury_reward: Balance,
     staker_reward: Balance,
     dapps_reward: Balance,

diff --git a/pallets/block-rewards-hybrid/src/tests.rs b/pallets/block-rewards-hybrid/src/tests.rs
@@ -388,7 +388,7 @@ impl FreeBalanceSnapshot {
             post_reward_state.treasury
         );
         assert_eq!(
-            self.stakers + rewards.base_staker_reward + rewards.adjustable_staker_reward,
+            self.stakers + rewards.staker_reward,
             post_reward_state.stakers
         );
         assert_eq!(
@@ -399,16 +399,6 @@ impl FreeBalanceSnapshot {
     }
 }
 
-/// Represents reward distribution balances for a single distribution.
-#[derive(PartialEq, Eq, Clone, RuntimeDebug)]
-struct Rewards {
-    treasury_reward: Balance,
-    base_staker_reward: Balance,
-    dapps_reward: Balance,
-    collators_reward: Balance,
-    adjustable_staker_reward: Balance,
-}
-
 impl Rewards {
     /// Pre-calculates the reward distribution, using the provided `RewardDistributionConfig`.
     /// Method assumes that total issuance will be increased by `BLOCK_REWARD`.
@@ -439,22 +429,15 @@ impl Rewards {
         // Adjustable reward portions
         let adjustable_staker_reward = factor * adjustable_reward;
 
+        let staker_reward = base_staker_reward + adjustable_staker_reward;
+
         Self {
             treasury_reward,
-            base_staker_reward,
+            staker_reward,
             dapps_reward,
             collators_reward,
-            adjustable_staker_reward,
         }
     }
-
-    fn sum(&self) -> Balance {
-        self.base_staker_reward
-            + self.adjustable_staker_reward
-            + self.collators_reward
-            + self.dapps_reward
-            + self.treasury_reward
-    }
 }
 
 fn adjust_tvl(desired_percent: u128) {

diff --git a/runtime/astar/Cargo.toml b/runtime/astar/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "astar-runtime"
-version = "5.25.0"
+version = "5.24.0"
 build = "build.rs"
 authors.workspace = true
 edition.workspace = true

diff --git a/runtime/astar/src/lib.rs b/runtime/astar/src/lib.rs
@@ -140,7 +140,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
     spec_name: create_runtime_str!("astar"),
     impl_name: create_runtime_str!("astar"),
     authoring_version: 1,
-    spec_version: 72,
+    spec_version: 71,
     impl_version: 0,
     apis: RUNTIME_API_VERSIONS,
     transaction_version: 2,

diff --git a/runtime/local/Cargo.toml b/runtime/local/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "local-runtime"
-version = "5.25.0"
+version = "5.24.0"
 build = "build.rs"
 authors.workspace = true
 edition.workspace = true

diff --git a/runtime/shibuya/Cargo.toml b/runtime/shibuya/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "shibuya-runtime"
-version = "5.25.0"
+version = "5.24.0"
 build = "build.rs"
 authors.workspace = true
 edition.workspace = true

diff --git a/runtime/shibuya/src/lib.rs b/runtime/shibuya/src/lib.rs
@@ -167,7 +167,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
     spec_name: create_runtime_str!("shibuya"),
     impl_name: create_runtime_str!("shibuya"),
     authoring_version: 1,
-    spec_version: 115,
+    spec_version: 114,
     impl_version: 0,
     apis: RUNTIME_API_VERSIONS,
     transaction_version: 2,

diff --git a/runtime/shiden/Cargo.toml b/runtime/shiden/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "shiden-runtime"
-version = "5.25.0"
+version = "5.24.0"
 build = "build.rs"
 authors.workspace = true
 edition.workspace = true

diff --git a/runtime/shiden/src/lib.rs b/runtime/shiden/src/lib.rs
@@ -140,7 +140,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
     spec_name: create_runtime_str!("shiden"),
     impl_name: create_runtime_str!("shiden"),
     authoring_version: 1,
-    spec_version: 112,
+    spec_version: 111,
     impl_version: 0,
     apis: RUNTIME_API_VERSIONS,
     transaction_version: 2,