Refactor indices pallet to use fungible traits

cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs

@@ -1292,7 +1292,7 @@ parameter_types! {
 
 impl pallet_indices::Config for Runtime {
 	type AccountIndex = AccountIndex;
-	type Currency = Balances;
+	type NativeBalance = Balances;
 	type Deposit = IndexDeposit;
 	type RuntimeEvent = RuntimeEvent;
 	type WeightInfo = weights::pallet_indices::WeightInfo<Runtime>;

cumulus/parachains/runtimes/assets/asset-hub-westend/src/weights/pallet_indices.rs

@@ -127,4 +127,20 @@ impl<T: frame_system::Config> pallet_indices::WeightInfo for WeightInfo<T> {
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
+	/// Storage: UNKNOWN KEY `0x1a736d37504c2e3fb73dad160c55b2915c858e3f3bd0a1a1c78c656baa95f5b5` (r:2 w:0)
+	/// Proof: UNKNOWN KEY `0x1a736d37504c2e3fb73dad160c55b2915c858e3f3bd0a1a1c78c656baa95f5b5` (r:2 w:0)
+	/// Storage: `Balances::Holds` (r:1 w:1)
+	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(85), added: 2560, mode: `MaxEncodedLen`)
+	/// Storage: `Indices::Accounts` (r:0 w:1)
+	/// Proof: `Indices::Accounts` (`max_values`: None, `max_size`: Some(69), added: 2544, mode: `MaxEncodedLen`)
+	fn migrate_account_step() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `138`
+		//  Estimated: `6078`
+		// Minimum execution time: 38_131_000 picoseconds.
+		Weight::from_parts(38_749_000, 0)
+			.saturating_add(Weight::from_parts(0, 6078))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
 }

polkadot/runtime/rococo/src/lib.rs

@@ -392,7 +392,7 @@ parameter_types! {
 
 impl pallet_indices::Config for Runtime {
 	type AccountIndex = AccountIndex;
-	type Currency = Balances;
+	type NativeBalance = Balances;
 	type Deposit = IndexDeposit;
 	type RuntimeEvent = RuntimeEvent;
 	type WeightInfo = weights::pallet_indices::WeightInfo<Runtime>;

polkadot/runtime/rococo/src/weights/pallet_indices.rs

@@ -127,4 +127,20 @@ impl<T: frame_system::Config> pallet_indices::WeightInfo for WeightInfo<T> {
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
+	/// Storage: UNKNOWN KEY `0x1a736d37504c2e3fb73dad160c55b2915c858e3f3bd0a1a1c78c656baa95f5b5` (r:2 w:0)
+	/// Proof: UNKNOWN KEY `0x1a736d37504c2e3fb73dad160c55b2915c858e3f3bd0a1a1c78c656baa95f5b5` (r:2 w:0)
+	/// Storage: `Balances::Holds` (r:1 w:1)
+	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(85), added: 2560, mode: `MaxEncodedLen`)
+	/// Storage: `Indices::Accounts` (r:0 w:1)
+	/// Proof: `Indices::Accounts` (`max_values`: None, `max_size`: Some(69), added: 2544, mode: `MaxEncodedLen`)
+	fn migrate_account_step() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `138`
+		//  Estimated: `6078`
+		// Minimum execution time: 38_131_000 picoseconds.
+		Weight::from_parts(38_749_000, 0)
+			.saturating_add(Weight::from_parts(0, 6078))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
 }

polkadot/runtime/test-runtime/src/lib.rs

@@ -248,7 +248,7 @@ parameter_types! {
 
 impl pallet_indices::Config for Runtime {
 	type AccountIndex = AccountIndex;
-	type Currency = Balances;
+	type NativeBalance = Balances;
 	type Deposit = IndexDeposit;
 	type RuntimeEvent = RuntimeEvent;
 	type WeightInfo = ();

polkadot/runtime/westend/src/lib.rs

@@ -381,7 +381,7 @@ parameter_types! {
 
 impl pallet_indices::Config for Runtime {
 	type AccountIndex = AccountIndex;
-	type Currency = Balances;
+	type NativeBalance = Balances;
 	type Deposit = IndexDeposit;
 	type RuntimeEvent = RuntimeEvent;
 	type WeightInfo = weights::pallet_indices::WeightInfo<Runtime>;

polkadot/runtime/westend/src/weights/pallet_indices.rs

@@ -127,4 +127,20 @@ impl<T: frame_system::Config> pallet_indices::WeightInfo for WeightInfo<T> {
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
+	/// Storage: UNKNOWN KEY `0x1a736d37504c2e3fb73dad160c55b2915c858e3f3bd0a1a1c78c656baa95f5b5` (r:2 w:0)
+	/// Proof: UNKNOWN KEY `0x1a736d37504c2e3fb73dad160c55b2915c858e3f3bd0a1a1c78c656baa95f5b5` (r:2 w:0)
+	/// Storage: `Balances::Holds` (r:1 w:1)
+	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(85), added: 2560, mode: `MaxEncodedLen`)
+	/// Storage: `Indices::Accounts` (r:0 w:1)
+	/// Proof: `Indices::Accounts` (`max_values`: None, `max_size`: Some(69), added: 2544, mode: `MaxEncodedLen`)
+	fn migrate_account_step() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `138`
+		//  Estimated: `6078`
+		// Minimum execution time: 38_131_000 picoseconds.
+		Weight::from_parts(38_749_000, 0)
+			.saturating_add(Weight::from_parts(0, 6078))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
 }

substrate/bin/node/runtime/src/lib.rs

@@ -569,7 +569,7 @@ parameter_types! {
 
 impl pallet_indices::Config for Runtime {
 	type AccountIndex = AccountIndex;
-	type Currency = Balances;
+	type NativeBalance = Balances;
 	type Deposit = IndexDeposit;
 	type RuntimeEvent = RuntimeEvent;
 	type WeightInfo = pallet_indices::weights::SubstrateWeight<Runtime>;

substrate/frame/indices/Cargo.toml

@@ -20,6 +20,7 @@ codec = { features = ["derive"], workspace = true }
 frame-benchmarking = { optional = true, workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
+log = { workspace = true }
 scale-info = { features = ["derive"], workspace = true }
 sp-core = { workspace = true }
 sp-io = { workspace = true }
@@ -35,6 +36,7 @@ std = [
 	"frame-benchmarking?/std",
 	"frame-support/std",
 	"frame-system/std",
+	"log/std",
 	"pallet-balances/std",
 	"scale-info/std",
 	"sp-core/std",

substrate/frame/indices/src/benchmarking.rs

@@ -23,19 +23,37 @@ use crate::*;
 use frame_benchmarking::v2::*;
 use frame_support::traits::Get;
 use frame_system::RawOrigin;
-use sp_runtime::traits::Bounded;
 
 const SEED: u32 = 0;
 
-#[benchmarks]
+#[benchmarks(
+	where
+		// For the migration benchmark, T::NativeBalance needs to implement the old Currency traits
+		// to set up the pre-migration state.
+		T::NativeBalance: Currency<T::AccountId, Balance = BalanceOf<T>>
+			+ ReservableCurrency<T::AccountId>,
+)]
 mod benchmarks {
 	use super::*;
+	use crate::migration::v1::MigrateCurrencyToFungibles;
+	use frame_support::{
+		migrations::SteppedMigration,
+		traits::{
+			fungible::{Inspect as FungibleInspect, Mutate as FungibleMutate},
+			Currency, ReservableCurrency,
+		},
+		weights::WeightMeter,
+	};
 
 	#[benchmark]
 	fn claim() {
 		let account_index = T::AccountIndex::from(SEED);
 		let caller: T::AccountId = whitelisted_caller();
-		T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
+		<T::NativeBalance as FungibleMutate<T::AccountId>>::set_balance(
+			&caller,
+			<T::NativeBalance as FungibleInspect<T::AccountId>>::minimum_balance() +
+				T::Deposit::get(),
+		);
 
 		#[extrinsic_call]
 		_(RawOrigin::Signed(caller.clone()), account_index);
@@ -48,10 +66,18 @@ mod benchmarks {
 		let account_index = T::AccountIndex::from(SEED);
 		// Setup accounts
 		let caller: T::AccountId = whitelisted_caller();
-		T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
+		<T::NativeBalance as FungibleMutate<T::AccountId>>::set_balance(
+			&caller,
+			<T::NativeBalance as FungibleInspect<T::AccountId>>::minimum_balance() +
+				T::Deposit::get(),
+		);
 		let recipient: T::AccountId = account("recipient", 0, SEED);
 		let recipient_lookup = T::Lookup::unlookup(recipient.clone());
-		T::Currency::make_free_balance_be(&recipient, BalanceOf::<T>::max_value());
+		<T::NativeBalance as FungibleMutate<T::AccountId>>::set_balance(
+			&recipient,
+			<T::NativeBalance as FungibleInspect<T::AccountId>>::minimum_balance() +
+				T::Deposit::get(),
+		);
 		// Claim the index
 		Pallet::<T>::claim(RawOrigin::Signed(caller.clone()).into(), account_index)?;
 
@@ -67,7 +93,11 @@ mod benchmarks {
 		let account_index = T::AccountIndex::from(SEED);
 		// Setup accounts
 		let caller: T::AccountId = whitelisted_caller();
-		T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
+		<T::NativeBalance as FungibleMutate<T::AccountId>>::set_balance(
+			&caller,
+			<T::NativeBalance as FungibleInspect<T::AccountId>>::minimum_balance() +
+				T::Deposit::get(),
+		);
 		// Claim the index
 		Pallet::<T>::claim(RawOrigin::Signed(caller.clone()).into(), account_index)?;
 
@@ -83,10 +113,18 @@ mod benchmarks {
 		let account_index = T::AccountIndex::from(SEED);
 		// Setup accounts
 		let original: T::AccountId = account("original", 0, SEED);
-		T::Currency::make_free_balance_be(&original, BalanceOf::<T>::max_value());
+		<T::NativeBalance as FungibleMutate<T::AccountId>>::set_balance(
+			&original,
+			<T::NativeBalance as FungibleInspect<T::AccountId>>::minimum_balance() +
+				T::Deposit::get(),
+		);
 		let recipient: T::AccountId = account("recipient", 0, SEED);
 		let recipient_lookup = T::Lookup::unlookup(recipient.clone());
-		T::Currency::make_free_balance_be(&recipient, BalanceOf::<T>::max_value());
+		<T::NativeBalance as FungibleMutate<T::AccountId>>::set_balance(
+			&recipient,
+			<T::NativeBalance as FungibleInspect<T::AccountId>>::minimum_balance() +
+				T::Deposit::get(),
+		);
 		// Claim the index
 		Pallet::<T>::claim(RawOrigin::Signed(original).into(), account_index)?;
 
@@ -102,7 +140,11 @@ mod benchmarks {
 		let account_index = T::AccountIndex::from(SEED);
 		// Setup accounts
 		let caller: T::AccountId = whitelisted_caller();
-		T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
+		<T::NativeBalance as FungibleMutate<T::AccountId>>::set_balance(
+			&caller,
+			<T::NativeBalance as FungibleInspect<T::AccountId>>::minimum_balance() +
+				T::Deposit::get(),
+		);
 		// Claim the index
 		Pallet::<T>::claim(RawOrigin::Signed(caller.clone()).into(), account_index)?;
 
@@ -118,26 +160,35 @@ mod benchmarks {
 		let account_index = T::AccountIndex::from(SEED);
 		// Setup accounts
 		let caller: T::AccountId = whitelisted_caller();
-		T::Currency::make_free_balance_be(&caller, BalanceOf::<T>::max_value());
+
+		// The additional amount we'll add to the deposit for the index
+		let additional_amount = 2u32.into();
+
+		<T::NativeBalance as FungibleMutate<T::AccountId>>::set_balance(
+			&caller,
+			<T::NativeBalance as FungibleInspect<T::AccountId>>::minimum_balance() +
+				T::Deposit::get() +
+				additional_amount,
+		);
 
 		let original_deposit = T::Deposit::get();
 
 		// Claim the index
 		Pallet::<T>::claim(RawOrigin::Signed(caller.clone()).into(), account_index)?;
 
-		// Verify the initial deposit amount in storage and reserved balance
+		// Verify the initial deposit amount in storage and held balance
 		assert_eq!(Accounts::<T>::get(account_index).unwrap().1, original_deposit);
-		assert_eq!(T::Currency::reserved_balance(&caller), original_deposit);
-
-		// The additional amount we'll add to the deposit for the index
-		let additional_amount = 2u32.into();
+		assert_eq!(
+			T::NativeBalance::balance_on_hold(&HoldReason::DepositForIndex.into(), &caller),
+			original_deposit
+		);
 
-		// Reserve the additional amount from the caller's balance
-		T::Currency::reserve(&caller, additional_amount)?;
+		// Hold the additional amount from the caller's balance
+		T::NativeBalance::hold(&HoldReason::DepositForIndex.into(), &caller, additional_amount)?;
 
-		// Verify the additional amount was reserved
+		// Verify the additional amount was held
 		assert_eq!(
-			T::Currency::reserved_balance(&caller),
+			T::NativeBalance::balance_on_hold(&HoldReason::DepositForIndex.into(), &caller),
 			original_deposit.saturating_add(additional_amount)
 		);
 
@@ -162,7 +213,57 @@ mod benchmarks {
 		assert!(Accounts::<T>::contains_key(account_index));
 		assert_eq!(Accounts::<T>::get(account_index).unwrap().0, caller);
 		assert_eq!(Accounts::<T>::get(account_index).unwrap().1, original_deposit);
-		assert_eq!(T::Currency::reserved_balance(&caller), original_deposit);
+		assert_eq!(
+			T::NativeBalance::balance_on_hold(&HoldReason::DepositForIndex.into(), &caller),
+			original_deposit
+		);
+		Ok(())
+	}
+
+	#[benchmark(extra)]
+	fn migrate_account_step() -> Result<(), BenchmarkError> {
+		use crate::migration::v1::v0;
+
+		// Setup: Create an account in the OLD currency system that needs migration
+		let account_index = T::AccountIndex::from(SEED);
+		let caller: T::AccountId = whitelisted_caller();
+		let deposit = T::Deposit::get();
+
+		// Give the account some balance (enough for deposit + existential deposit)
+		<T::NativeBalance as FungibleMutate<T::AccountId>>::set_balance(
+			&caller,
+			<T::NativeBalance as FungibleInspect<T::AccountId>>::minimum_balance() +
+				deposit + deposit,
+		);
+
+		// Reserve funds using the old Currency system
+		<T::NativeBalance as ReservableCurrency<T::AccountId>>::reserve(&caller, deposit)?;
+
+		// Insert into the OLD storage (v0) to simulate pre-migration state
+		v0::OldAccounts::<T>::insert(account_index, (caller.clone(), deposit, false));
+
+		#[block]
+		{
+			let _ = MigrateCurrencyToFungibles::<T, T::NativeBalance>::step(
+				None,
+				&mut WeightMeter::new(),
+			);
+		}
+
+		// Verify the account was migrated to the new storage
+		assert!(Accounts::<T>::contains_key(account_index));
+		let (migrated_account, migrated_deposit, frozen) =
+			Accounts::<T>::get(account_index).unwrap();
+		assert_eq!(migrated_account, caller);
+		assert_eq!(migrated_deposit, deposit);
+		assert_eq!(frozen, false);
+
+		// Verify the hold was created in the new fungible system
+		assert_eq!(
+			T::NativeBalance::balance_on_hold(&HoldReason::DepositForIndex.into(), &caller),
+			deposit
+		);
+
 		Ok(())
 	}