Remove vesting from testnets (#1214)

darwinia-network · Jul 21, 2023 · 0a1b13d · 0a1b13d
1 parent c4ef814
commit 0a1b13d
Show file tree

Hide file tree

Showing 24 changed files with 3 additions and 653 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/node/src/chain_spec/pangolin.rs b/node/src/chain_spec/pangolin.rs
@@ -166,7 +166,6 @@ pub fn genesis_config() -> ChainSpec {
 					)],
 					..Default::default()
 				},
-				vesting: Default::default(),
 
 				// Consensus stuff.
 				darwinia_staking: DarwiniaStakingConfig {
@@ -294,7 +293,6 @@ fn testnet_genesis(
 			)],
 			..Default::default()
 		},
-		vesting: Default::default(),
 
 		// Consensus stuff.
 		darwinia_staking: DarwiniaStakingConfig {

diff --git a/node/src/chain_spec/pangoro.rs b/node/src/chain_spec/pangoro.rs
@@ -166,7 +166,6 @@ pub fn genesis_config() -> ChainSpec {
 					)],
 					..Default::default()
 				},
-				vesting: Default::default(),
 
 				// Consensus stuff.
 				darwinia_staking: DarwiniaStakingConfig {
@@ -294,7 +293,6 @@ fn testnet_genesis(
 			)],
 			..Default::default()
 		},
-		vesting: Default::default(),
 
 		// Consensus stuff.
 		darwinia_staking: DarwiniaStakingConfig {

diff --git a/pallet/account-migration/Cargo.toml b/pallet/account-migration/Cargo.toml
@@ -23,7 +23,6 @@ frame-system    = { workspace = true }
 pallet-assets   = { workspace = true }
 pallet-balances = { workspace = true }
 pallet-identity = { workspace = true }
-pallet-vesting  = { workspace = true }
 sp-core         = { workspace = true }
 sp-io           = { workspace = true }
 sp-runtime      = { workspace = true }
@@ -54,7 +53,6 @@ std = [
 	"pallet-assets/std",
 	"pallet-balances/std",
 	"pallet-identity/std",
-	"pallet-vesting/std",
 	"sp-core/std",
 	"sp-io/std",
 	"sp-runtime/std",

diff --git a/pallet/account-migration/src/benchmarking.rs b/pallet/account-migration/src/benchmarking.rs
@@ -66,13 +66,6 @@ mod benchmarks {
 				extra: Default::default(),
 			},
 		);
-		<Vestings<T>>::insert(
-			from,
-			vec![
-				VestingInfo::new(1, Default::default(), Default::default());
-				<T as pallet_vesting::Config>::MAX_VESTING_SCHEDULES as usize
-			],
-		);
 		<Identities<T>>::insert(
 			from,
 			Registration {

diff --git a/pallet/account-migration/src/lib.rs b/pallet/account-migration/src/lib.rs
@@ -63,13 +63,12 @@ use dc_primitives::{AccountId as AccountId20, AssetId, Balance, BlockNumber, Ind
 use frame_support::{
 	migration,
 	pallet_prelude::*,
-	traits::{Currency, ExistenceRequirement::AllowDeath, LockableCurrency, WithdrawReasons},
+	traits::{Currency, ExistenceRequirement::AllowDeath},
 	StorageHasher,
 };
 use frame_system::{pallet_prelude::*, AccountInfo, RawOrigin};
 use pallet_balances::AccountData;
 use pallet_identity::{Judgement, Registration};
-use pallet_vesting::VestingInfo;
 use sp_core::{
 	ed25519::{Public as Ep, Signature as Es},
 	sr25519::{Public as Sp, Signature as Ss},
@@ -111,7 +110,6 @@ pub mod pallet {
 			Lookup = IdentityLookup<AccountId20>,
 		> + pallet_assets::Config<Balance = Balance, AssetId = AssetId>
 		+ pallet_balances::Config<Balance = Balance>
-		+ pallet_vesting::Config<Currency = pallet_balances::Pallet<Self>>
 		+ pallet_identity::Config<Currency = pallet_balances::Pallet<Self>>
 		+ darwinia_deposit::Config
 		+ darwinia_staking::Config
@@ -160,15 +158,6 @@ pub mod pallet {
 	#[pallet::getter(fn kton_account_of)]
 	pub type KtonAccounts<T: Config> = StorageMap<_, Blake2_128Concat, AccountId32, AssetAccount>;
 
-	/// [`pallet_vesting::Vesting`] data.
-	///
-	/// <https://github.dev/paritytech/substrate/blob/19162e43be45817b44c7d48e50d03f074f60fbf4/frame/vesting/src/lib.rs#L188>
-	#[pallet::storage]
-	#[pallet::unbounded]
-	#[pallet::getter(fn vesting_of)]
-	pub type Vestings<T: Config> =
-		StorageMap<_, Blake2_128Concat, AccountId32, Vec<VestingInfo<Balance, BlockNumber>>>;
-
 	/// [`darwinia_deposit::Deposits`] data.
 	#[pallet::storage]
 	#[pallet::unbounded]
@@ -448,20 +437,6 @@ pub mod pallet {
 					);
 				}
 			}
-			if let Some(v) = <Vestings<T>>::take(from) {
-				let locked = v.iter().map(|v| v.locked()).sum();
-
-				<pallet_vesting::Vesting<T>>::insert(
-					to,
-					BoundedVec::try_from(v).map_err(|_| <Error<T>>::ExceedMaxVestings)?,
-				);
-
-				// https://github.dev/paritytech/substrate/blob/19162e43be45817b44c7d48e50d03f074f60fbf4/frame/vesting/src/lib.rs#L248
-				let reasons = WithdrawReasons::TRANSFER | WithdrawReasons::RESERVE;
-
-				// https://github.dev/paritytech/substrate/blob/19162e43be45817b44c7d48e50d03f074f60fbf4/frame/vesting/src/lib.rs#L86
-				<pallet_balances::Pallet<T>>::set_lock(*b"vesting ", to, locked, reasons);
-			}
 			if let Some(mut i) = <Identities<T>>::take(from) {
 				i.deposit = 0;
 				i.judgements.iter_mut().for_each(|(_, j)| {

diff --git a/pallet/account-migration/src/mock.rs b/pallet/account-migration/src/mock.rs
@@ -159,16 +159,6 @@ frame_support::parameter_types! {
 			frame_support::traits::WithdrawReasons::TRANSFER | frame_support::traits::WithdrawReasons::RESERVE
 		);
 }
-impl pallet_vesting::Config for Runtime {
-	type BlockNumberToBalance = sp_runtime::traits::ConvertInto;
-	type Currency = Balances;
-	type MinVestedTransfer = ();
-	type RuntimeEvent = RuntimeEvent;
-	type UnvestedFundsAllowedWithdrawReasons = UnvestedFundsAllowedWithdrawReasons;
-	type WeightInfo = ();
-
-	const MAX_VESTING_SCHEDULES: u32 = 1;
-}
 
 impl darwinia_deposit::Config for Runtime {
 	type Kton = Dummy;
@@ -226,7 +216,6 @@ frame_support::construct_runtime! {
 		Timestamp: pallet_timestamp,
 		Balances: pallet_balances,
 		Assets: pallet_assets,
-		Vesting: pallet_vesting,
 		Deposit: darwinia_deposit,
 		Staking: darwinia_staking,
 		Identity: pallet_identity,

diff --git a/runtime/common/src/test.rs b/runtime/common/src/test.rs
@@ -95,14 +95,6 @@ macro_rules! impl_account_migration_tests {
 				Destroying,
 			}
 
-			// This struct is private in `pallet-vesting`.
-			#[derive(Encode)]
-			struct VestingInfo {
-				locked: u128,
-				per_block: u128,
-				starting_block: u32,
-			}
-
 			fn alice() -> (Pair, AccountId32) {
 				let pair = Keyring::Alice.pair();
 				let public_key = AccountId32::new(pair.public().0);
@@ -281,32 +273,6 @@ macro_rules! impl_account_migration_tests {
 				});
 			}
 
-			#[test]
-			fn vesting_should_work() {
-				let (from, from_pk) = alice();
-				let to = H160::from_low_u64_be(255).into();
-
-				ExtBuilder::default().build().execute_with(|| {
-					preset_state_of(&from);
-
-					migration::put_storage_value(
-						b"AccountMigration",
-						b"Vestings",
-						&Blake2_128Concat::hash(from_pk.as_ref()),
-						vec![
-							VestingInfo { locked: 100, per_block: 5, starting_block: 0 },
-							VestingInfo { locked: 100, per_block: 5, starting_block: 0 },
-						],
-					);
-					assert!(Vesting::vesting(to).is_none());
-					assert!(Balances::locks(to).is_empty());
-
-					assert_ok!(migrate(from, to));
-					assert_eq!(Vesting::vesting(to).unwrap().len(), 2);
-					assert_eq!(Balances::locks(to).len(), 1);
-				});
-			}
-
 			#[test]
 			fn staking_should_work() {
 				let (from, from_pk) = alice();

diff --git a/runtime/pangolin/Cargo.toml b/runtime/pangolin/Cargo.toml
@@ -110,7 +110,6 @@ pallet-transaction-payment                 = { workspace = true }
 pallet-transaction-payment-rpc-runtime-api = { workspace = true }
 pallet-treasury                            = { workspace = true }
 pallet-utility                             = { workspace = true }
-pallet-vesting                             = { workspace = true }
 sp-api                                     = { workspace = true }
 sp-block-builder                           = { workspace = true }
 sp-consensus-aura                          = { workspace = true }
@@ -237,7 +236,6 @@ std = [
 	"pallet-transaction-payment/std",
 	"pallet-treasury/std",
 	"pallet-utility/std",
-	"pallet-vesting/std",
 	"sp-api/std",
 	"sp-block-builder/std",
 	"sp-consensus-aura/std",
@@ -329,7 +327,6 @@ runtime-benchmarks = [
 	"pallet-tips/runtime-benchmarks",
 	"pallet-treasury/runtime-benchmarks",
 	"pallet-utility/runtime-benchmarks",
-	"pallet-vesting/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
 	# substrate optional
 	"frame-benchmarking/runtime-benchmarks",
@@ -395,7 +392,6 @@ try-runtime = [
 	"pallet-transaction-payment/try-runtime",
 	"pallet-treasury/try-runtime",
 	"pallet-utility/try-runtime",
-	"pallet-vesting/try-runtime",
 	"sp-runtime/try-runtime",
 	# substrate optional
 	"frame-try-runtime/try-runtime",

diff --git a/runtime/pangolin/src/lib.rs b/runtime/pangolin/src/lib.rs
@@ -131,7 +131,7 @@ frame_support::construct_runtime! {
 		Balances: pallet_balances = 5,
 		TransactionPayment: pallet_transaction_payment = 6,
 		Assets: pallet_assets = 7,
-		Vesting: pallet_vesting = 8,
+		// Vesting: pallet_vesting = 8,
 		Deposit: darwinia_deposit = 9,
 		AccountMigration: darwinia_account_migration = 10,
 
@@ -211,7 +211,6 @@ frame_benchmarking::define_benchmarks! {
 	[pallet_tips, Tips]
 	[pallet_treasury, Treasury]
 	[pallet_utility, Utility]
-	[pallet_vesting, Vesting]
 	[pallet_session, SessionBench::<Runtime>]
 	[pallet_timestamp, Timestamp]
 }

diff --git a/runtime/pangolin/src/pallets.rs b/runtime/pangolin/src/pallets.rs
@@ -42,8 +42,6 @@ mod transaction_payment;
 mod assets;
 pub use assets::*;
 
-mod vesting;
-
 mod deposit;
 #[cfg(feature = "runtime-benchmarks")]
 pub use deposit::*;

diff --git a/runtime/pangolin/src/pallets/evm.rs b/runtime/pangolin/src/pallets/evm.rs
@@ -188,7 +188,6 @@ impl DispatchValidateT<AccountId, RuntimeCall> for DarwiniaDispatchValidator {
 		if matches!(
 			call,
 			RuntimeCall::Assets(..)
-				| RuntimeCall::Vesting(..)
 				| RuntimeCall::Ethereum(..)
 				| RuntimeCall::EVM(..)
 				| RuntimeCall::MessageTransact(..)

diff --git a/runtime/pangolin/src/pallets/proxy.rs b/runtime/pangolin/src/pallets/proxy.rs
@@ -55,7 +55,6 @@ impl frame_support::traits::InstanceFilter<RuntimeCall> for ProxyType {
 				c,
 				RuntimeCall::Balances(..)
 					| RuntimeCall::Assets(..)
-					| RuntimeCall::Vesting(pallet_vesting::Call::vested_transfer { .. })
 					| RuntimeCall::Deposit(..)
 					| RuntimeCall::DarwiniaStaking(..)
 					// Might contains transfer {

diff --git a/runtime/pangolin/src/pallets/vesting.rs b/runtime/pangolin/src/pallets/vesting.rs
diff --git a/runtime/pangolin/src/weights.rs b/runtime/pangolin/src/weights.rs
@@ -50,4 +50,3 @@ pub mod pallet_timestamp;
 pub mod pallet_tips;
 pub mod pallet_treasury;
 pub mod pallet_utility;
-pub mod pallet_vesting;