bump v0.9.30-mainnet.171 (#80)

* bump v0.9.30-mainnet.171 * update unit test
uinb · Jun 25, 2023 · be49d50 · be49d50
1 parent f38dc2d
commit be49d50
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v0.9.30-mainnet.171
+
+- change set reward origin
+
 # v0.9.30-mainnet.node.170
 
 - enable amm bot

diff --git a/pallets/reward/src/lib.rs b/pallets/reward/src/lib.rs
@@ -65,6 +65,8 @@ pub mod pallet {
 
         #[pallet::constant]
         type RewardTerminateAt: Get<Self::BlockNumber>;
+
+        type TreasuryOrigin: EnsureOrigin<Self::RuntimeOrigin>;
     }
 
     #[pallet::event]
@@ -182,7 +184,7 @@ pub mod pallet {
             origin: OriginFor<T>,
             era_rewards: Balance<T>,
         ) -> DispatchResultWithPostInfo {
-            let _ = ensure_root(origin)?;
+            let _ = T::TreasuryOrigin::ensure_origin(origin)?;
             EraRewards::<T>::put(era_rewards);
             Self::deposit_event(Event::EraRewardsUpdated(era_rewards));
             Ok(().into())

diff --git a/pallets/reward/src/mock.rs b/pallets/reward/src/mock.rs
@@ -126,6 +126,7 @@ impl pallet_fuso_reward::Config for Test {
     type RewardsPerEra = RewardsPerEra;
     type RuntimeEvent = RuntimeEvent;
     type TimeCoefficientZoom = TimeCoefficientZoom;
+    type TreasuryOrigin = EnsureSignedBy<TreasuryMembers, Self::AccountId>;
 }
 
 // Configure a mock runtime to test the pallet.

diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs
@@ -124,7 +124,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
     //   `spec_version`, and `authoring_version` are the same between Wasm and native.
     // This value is set to 100 to notify Polkadot-JS App (https://polkadot.js.org/apps) to use
     //   the compatible custom types.
-    spec_version: 170,
+    spec_version: 171,
     impl_version: 1,
     apis: RUNTIME_API_VERSIONS,
     transaction_version: 3,
@@ -711,6 +711,14 @@ impl SortedMembers<AccountId> for BridgeAdminMembers {
     }
 }
 
+pub struct TreasuryMembers;
+
+impl SortedMembers<AccountId> for TreasuryMembers {
+    fn sorted_members() -> Vec<AccountId> {
+        vec![TREASURY]
+    }
+}
+
 impl pallet_chainbridge_handler::Config for Runtime {
     type BalanceConversion = Token;
     type BridgeOrigin = pallet_chainbridge::EnsureBridge<Runtime>;
@@ -768,6 +776,7 @@ impl pallet_fuso_reward::Config for Runtime {
     type RewardsPerEra = RewardsPerEra;
     type RuntimeEvent = RuntimeEvent;
     type TimeCoefficientZoom = TimeCoefficientZoom;
+    type TreasuryOrigin = EnsureSignedBy<TreasuryMembers, Self::AccountId>;
 }
 
 parameter_types! {