Simplify Crab token system (#1310)

* Stash * Simplify Crab token system * Doc * Fix benchmarks * Emit an event instead of a log * Add more tests
darwinia-network · Nov 8, 2023 · 989beb8 · 989beb8
1 parent df16a59
commit 989beb8
Show file tree

Hide file tree

Showing 14 changed files with 442 additions and 189 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/pallet/account-migration/src/mock.rs b/pallet/account-migration/src/mock.rs
@@ -47,11 +47,6 @@ impl darwinia_staking::Stake for Dummy {
 		Ok(())
 	}
 }
-impl frame_support::traits::UnixTime for Dummy {
-	fn now() -> core::time::Duration {
-		core::time::Duration::new(0, 0)
-	}
-}
 
 #[sp_version::runtime_version]
 pub const VERSION: sp_version::RuntimeVersion = sp_version::RuntimeVersion {
@@ -171,12 +166,9 @@ impl darwinia_staking::Config for Runtime {
 	type MaxDeposits = ();
 	type MaxUnstakings = ();
 	type MinStakingDuration = ();
-	type PayoutFraction = ();
-	type RewardRemainder = ();
+	type OnSessionEnd = ();
 	type Ring = Dummy;
-	type RingCurrency = Balances;
 	type RuntimeEvent = RuntimeEvent;
-	type UnixTime = Dummy;
 	type WeightInfo = ();
 }
 #[cfg(not(feature = "runtime-benchmarks"))]

diff --git a/pallet/staking/Cargo.toml b/pallet/staking/Cargo.toml
@@ -13,7 +13,6 @@ scale-info = { workspace = true }
 
 # darwinia
 darwinia-staking-traits = { workspace = true }
-dc-inflation            = { workspace = true }
 dc-types                = { workspace = true }
 # darwinia optional
 darwinia-deposit = { workspace = true, optional = true }
@@ -36,10 +35,12 @@ pretty_env_logger = { version = "0.4" }
 darwinia-deposit = { workspace = true, features = ["std"] }
 
 # substrate
+dc-inflation         = { workspace = true, features = ["std"] }
 pallet-assets        = { workspace = true, features = ["std"] }
 pallet-balances      = { workspace = true, features = ["std"] }
 pallet-session       = { workspace = true, features = ["std"] }
 pallet-timestamp     = { workspace = true, features = ["std"] }
+pallet-treasury      = { workspace = true, features = ["std"] }
 sp-core              = { workspace = true, features = ["std"] }
 sp-io                = { workspace = true, features = ["std"] }
 substrate-test-utils = { workspace = true }
@@ -53,7 +54,6 @@ std = [
 
 	# darwinia
 	"darwinia-staking-traits/std",
-	"dc-inflation/std",
 	# darwinia optional
 	"darwinia-deposit?/std",
 

diff --git a/pallet/staking/src/benchmarking.rs b/pallet/staking/src/benchmarking.rs
@@ -29,6 +29,8 @@ use sp_std::prelude::*;
 mod benchmarks {
 	// darwinia
 	use super::*;
+	// substrate
+	use frame_support::traits::Currency;
 
 	fn deposit_for<T>(who: &T::AccountId, count: u32) -> Vec<DepositId<T>>
 	where
@@ -53,7 +55,7 @@ mod benchmarks {
 		let a = frame_benchmarking::whitelisted_caller();
 
 		// Remove `+ 1` after https://github.com/paritytech/substrate/pull/13655.
-		T::RingCurrency::make_free_balance_be(&a, 1_024 * UNIT + 1);
+		<T as darwinia_deposit::Config>::Ring::make_free_balance_be(&a, 1_024 * UNIT + 1);
 		<T as darwinia_deposit::Config>::Kton::mint(&a, UNIT).unwrap();
 
 		let deposits = deposit_for::<T>(&a, x);
@@ -70,7 +72,7 @@ mod benchmarks {
 		let a = frame_benchmarking::whitelisted_caller();
 
 		// Remove `+ 1` after https://github.com/paritytech/substrate/pull/13655.
-		T::RingCurrency::make_free_balance_be(&a, 1_024 * UNIT + 1);
+		<T as darwinia_deposit::Config>::Ring::make_free_balance_be(&a, 1_024 * UNIT + 1);
 		<T as darwinia_deposit::Config>::Kton::mint(&a, UNIT).unwrap();
 
 		let deposits = deposit_for::<T>(&a, x);
@@ -90,7 +92,7 @@ mod benchmarks {
 		let a = frame_benchmarking::whitelisted_caller();
 
 		// Remove `+ 1` after https://github.com/paritytech/substrate/pull/13655.
-		T::RingCurrency::make_free_balance_be(&a, 1_024 * UNIT + 1);
+		<T as darwinia_deposit::Config>::Ring::make_free_balance_be(&a, 1_024 * UNIT + 1);
 		<T as darwinia_deposit::Config>::Kton::mint(&a, UNIT).unwrap();
 
 		let deposits = deposit_for::<T>(&a, x);
@@ -112,7 +114,7 @@ mod benchmarks {
 		let a = frame_benchmarking::whitelisted_caller();
 
 		// Remove `+ 1` after https://github.com/paritytech/substrate/pull/13655.
-		T::RingCurrency::make_free_balance_be(&a, 1_024 * UNIT + 1);
+		<T as darwinia_deposit::Config>::Ring::make_free_balance_be(&a, 1_024 * UNIT + 1);
 		<T as darwinia_deposit::Config>::Kton::mint(&a, UNIT).unwrap();
 
 		let deposits = deposit_for::<T>(&a, <T as Config>::MaxUnstakings::get());
@@ -154,7 +156,7 @@ mod benchmarks {
 		let a_cloned = a.clone();
 
 		// Remove `+ 1` after https://github.com/paritytech/substrate/pull/13655.
-		T::RingCurrency::make_free_balance_be(&a, UNIT + 1);
+		<T as darwinia_deposit::Config>::Ring::make_free_balance_be(&a, UNIT + 1);
 
 		<Pallet<T>>::stake(
 			RawOrigin::Signed(a.clone()).into(),
@@ -177,7 +179,7 @@ mod benchmarks {
 		let a = frame_benchmarking::whitelisted_caller::<T::AccountId>();
 
 		// Remove `+ 1` after https://github.com/paritytech/substrate/pull/13655.
-		T::RingCurrency::make_free_balance_be(&a, UNIT + 1);
+		<T as darwinia_deposit::Config>::Ring::make_free_balance_be(&a, UNIT + 1);
 
 		<Pallet<T>>::stake(
 			RawOrigin::Signed(a.clone()).into(),