feat(nfts + nonfungibles): sync polkadot stable2503

pallets/api/src/mock.rs

@@ -167,6 +167,7 @@ type NftsInstance = pallet_nfts::Instance1;
 impl pallet_nfts::Config<NftsInstance> for Test {
 	type ApprovalsLimit = ConstU32<10>;
 	type AttributeDepositBase = ConstU128<1>;
+	type BlockNumberProvider = frame_system::Pallet<Test>;
 	type CollectionApprovalDeposit = ConstU128<1>;
 	type CollectionBalanceDeposit = ConstU128<1>;
 	type CollectionDeposit = ConstU128<2>;

pallets/api/src/nonfungibles/mod.rs

@@ -8,7 +8,6 @@
 	dispatch::WithPostDispatchInfo,
 	traits::{nonfungibles_v2::Inspect, Currency},
 };
-use frame_system::pallet_prelude::BlockNumberFor;
 pub use pallet::*;
 use pallet_nfts::WeightInfo as NftsWeightInfoTrait;
 pub use pallet_nfts::{
@@ -26,6 +25,7 @@
 /// Weights for non-fungibles dispatchables.
 pub mod weights;
 
+type BlockNumberFor<T> = pallet_nfts::BlockNumberFor<T, NftsInstanceOf<T>>;
 type AccountBalanceOf<T> = pallet_nfts::AccountBalance<T, NftsInstanceOf<T>>;
 type AccountIdLookupOf<T> = <<T as frame_system::Config>::Lookup as StaticLookup>::Source;
 type AccountIdOf<T> = <T as frame_system::Config>::AccountId;
@@ -55,7 +55,7 @@
 		pallet_prelude::*,
 		traits::Incrementable,
 	};
-	use frame_system::pallet_prelude::*;
+	use frame_system::{ensure_signed, pallet_prelude::OriginFor};
 	use sp_runtime::BoundedVec;
 
 	use super::*;
@@ -149,7 +149,7 @@
 			.max(NftsWeightInfoOf::<T>::cancel_approval())
 			.max(NftsWeightInfoOf::<T>::cancel_collection_approval()))
 		]
 		pub fn approve(
 			origin: OriginFor<T>,
 			collection: CollectionIdOf<T>,
 			operator: AccountIdOf<T>,
@@ -230,7 +230,7 @@
     		witness.item_configs,
     		witness.attributes,
 		))]
 		pub fn destroy(
 			origin: OriginFor<T>,
 			collection: CollectionIdOf<T>,
 			witness: DestroyWitness,
@@ -425,7 +425,7 @@
 		/// - `limit` - The number of collection approvals that will be cleared.
 		#[pallet::call_index(19)]
 		#[pallet::weight(NftsWeightInfoOf::<T>::clear_collection_approvals(*limit))]
 		pub fn clear_collection_approvals(
 			origin: OriginFor<T>,
 			collection: CollectionIdOf<T>,
 			limit: u32,

pallets/api/src/nonfungibles/weights.rs

@@ -1,25 +1,27 @@
 
 //! Autogenerated weights for `nonfungibles`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 45.0.0
-//! DATE: 2025-01-28, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 47.0.0
+//! DATE: 2025-05-05, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! HOSTNAME: `R0GUE`, CPU: `<UNKNOWN>`
-//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("pop-devnet-dev")`, DB CACHE: `1024`
 
 // Executed Command:
 // ./target/production/pop-node
 // benchmark
 // pallet
-// --chain=dev
-// --wasm-execution=compiled
-// --pallet=nonfungibles
+// --chain=pop-devnet-dev
 // --steps=50
 // --repeat=20
-// --json
-// --template
-// ./scripts/pallet-weights-template.hbs
+// --pallet=nonfungibles
+// --no-storage-info
+// --no-median-slopes
+// --no-min-squares
+// --wasm-execution=compiled
+// --heap-pages=4096
 // --output=./pallets/api/src/nonfungibles/weights.rs
+// --template=./scripts/templates/pallet-weight-template.hbs
 // --extrinsic=
 
 #![cfg_attr(rustfmt, rustfmt_skip)]

pallets/nfts/Cargo.toml

@@ -7,7 +7,7 @@ license.workspace = true
 name = "pallet-nfts"
 readme = "README.md"
 repository.workspace = true
-version = "31.0.0"
+version = "34.1.0"
 
 [package.metadata.docs.rs]
 targets = [ "x86_64-unknown-linux-gnu" ]

pallets/nfts/runtime-api/Cargo.toml

@@ -14,9 +14,8 @@ targets = [ "x86_64-unknown-linux-gnu" ]
 
 [dependencies]
 codec = { features = [ "derive" ], workspace = true }
-pallet-nfts.workspace = true
 sp-api.workspace = true
 
 [features]
 default = [ "std" ]
-std = [ "codec/std", "pallet-nfts/std", "sp-api/std" ]
+std = [ "codec/std", "sp-api/std" ]

pallets/nfts/src/benchmarking.rs

@@ -26,8 +26,8 @@ use frame_support::{
 	traits::{EnsureOrigin, Get, UnfilteredDispatchable},
 	BoundedVec,
 };
-use frame_system::{pallet_prelude::BlockNumberFor, RawOrigin as SystemOrigin};
-use sp_runtime::traits::{Bounded, One};
+use frame_system::RawOrigin as SystemOrigin;
+use sp_runtime::traits::{Bounded, One, Zero};
 
 use super::*;
 use crate::Pallet as Nfts;
@@ -579,7 +579,7 @@ benchmarks_instance_pallet! {
 		let (item, ..) = mint_item::<T, I>(0);
 		let delegate: T::AccountId = account("delegate", 0, SEED);
 		let delegate_lookup = T::Lookup::unlookup(delegate.clone());
-		let deadline = BlockNumberFor::<T>::max_value();
+		let deadline = BlockNumberFor::<T, I>::max_value();
 	}: _(SystemOrigin::Signed(caller.clone()), collection, item, delegate_lookup, Some(deadline))
 	verify {
 		assert_last_event::<T, I>(Event::TransferApproved { collection, item: Some(item), owner: caller, delegate, deadline: Some(deadline) }.into());
@@ -591,7 +591,7 @@ benchmarks_instance_pallet! {
 		let delegate: T::AccountId = account("delegate", 0, SEED);
 		let delegate_lookup = T::Lookup::unlookup(delegate.clone());
 		let origin = SystemOrigin::Signed(caller.clone()).into();
-		let deadline = BlockNumberFor::<T>::max_value();
+		let deadline = BlockNumberFor::<T, I>::max_value();
 		Nfts::<T, I>::approve_transfer(origin, collection, item, delegate_lookup.clone(), Some(deadline))?;
 	}: _(SystemOrigin::Signed(caller.clone()), collection, item, delegate_lookup)
 	verify {
@@ -604,7 +604,7 @@ benchmarks_instance_pallet! {
 		let delegate: T::AccountId = account("delegate", 0, SEED);
 		let delegate_lookup = T::Lookup::unlookup(delegate.clone());
 		let origin = SystemOrigin::Signed(caller.clone()).into();
-		let deadline = BlockNumberFor::<T>::max_value();
+		let deadline = BlockNumberFor::<T, I>::max_value();
 		Nfts::<T, I>::approve_transfer(origin, collection, item, delegate_lookup.clone(), Some(deadline))?;
 	}: _(SystemOrigin::Signed(caller.clone()), collection, item)
 	verify {
@@ -717,7 +717,7 @@ benchmarks_instance_pallet! {
 		frame_system::Pallet::<T>::set_block_number(One::one());
 	}: _(SystemOrigin::Signed(caller.clone()), collection, item1, collection, Some(item2), Some(price_with_direction.clone()), duration)
 	verify {
-		let current_block = frame_system::Pallet::<T>::block_number();
+		let current_block = T::BlockNumberProvider::current_block_number();
 		assert_last_event::<T, I>(Event::SwapCreated {
 			offered_collection: collection,
 			offered_item: item1,
@@ -885,7 +885,7 @@ benchmarks_instance_pallet! {
 		mint_item::<T, I>(0);
 		let delegate: T::AccountId = account("delegate", 0, SEED);
 		let delegate_lookup = T::Lookup::unlookup(delegate.clone());
-		let deadline = BlockNumberFor::<T>::max_value();
+		let deadline = BlockNumberFor::<T, I>::max_value();
 	}: _(SystemOrigin::Signed(caller.clone()), collection, delegate_lookup, Some(deadline))
 	verify {
 		assert_last_event::<T, I>(Event::TransferApproved { collection, item: None, owner: caller, delegate, deadline: Some(deadline) }.into());
@@ -896,7 +896,7 @@ benchmarks_instance_pallet! {
 		mint_item::<T, I>(0);
 		let delegate: T::AccountId = account("delegate", 0, SEED);
 		let delegate_lookup = T::Lookup::unlookup(delegate.clone());
-		let deadline = BlockNumberFor::<T>::max_value();
+		let deadline = BlockNumberFor::<T, I>::max_value();
 	}: _(SystemOrigin::Root, caller_lookup, collection, delegate_lookup, Some(deadline))
 	verify {
 		assert_last_event::<T, I>(Event::TransferApproved { collection, item: None, owner: caller, delegate, deadline: Some(deadline) }.into());
@@ -908,7 +908,7 @@ benchmarks_instance_pallet! {
 		let delegate: T::AccountId = account("delegate", 0, SEED);
 		let delegate_lookup = T::Lookup::unlookup(delegate.clone());
 		let origin = SystemOrigin::Signed(caller.clone()).into();
-		let deadline = BlockNumberFor::<T>::max_value();
+		let deadline = BlockNumberFor::<T, I>::max_value();
 		Nfts::<T, I>::approve_collection_transfer(origin, collection, delegate_lookup.clone(), Some(deadline))?;
 	}: _(SystemOrigin::Signed(caller.clone()), collection, delegate_lookup)
 	verify {
@@ -920,7 +920,7 @@ benchmarks_instance_pallet! {
 		mint_item::<T, I>(0);
 		let delegate: T::AccountId = account("delegate", 0, SEED);
 		let delegate_lookup = T::Lookup::unlookup(delegate.clone());
-		let deadline = BlockNumberFor::<T>::max_value();
+		let deadline = BlockNumberFor::<T, I>::max_value();
 		Nfts::<T, I>::approve_collection_transfer(SystemOrigin::Signed(caller.clone()).into(), collection, delegate_lookup.clone(), Some(deadline))?;
 	}: _(SystemOrigin::Root, caller_lookup, collection, delegate_lookup)
 	verify {
@@ -937,7 +937,7 @@ benchmarks_instance_pallet! {
 				SystemOrigin::Signed(caller.clone()).into(),
 				collection,
 				T::Lookup::unlookup(delegate),
-				Some(BlockNumberFor::<T>::max_value()),
+				Some(BlockNumberFor::<T, I>::max_value()),
 			)?;
 		}
 	}: _(SystemOrigin::Signed(caller.clone()), collection, n)
@@ -956,7 +956,7 @@ benchmarks_instance_pallet! {
 				SystemOrigin::Signed(caller.clone()).into(),
 				collection,
 				T::Lookup::unlookup(delegate),
-				Some(BlockNumberFor::<T>::max_value()),
+				Some(BlockNumberFor::<T, I>::max_value()),
 			)?;
 		}
 	}: _(SystemOrigin::Root, caller_lookup, collection, n)

pallets/nfts/src/features/approvals.rs

@@ -20,7 +20,6 @@
 //! to have the functionality defined in this module.
 
 use frame_support::pallet_prelude::*;
-use frame_system::pallet_prelude::BlockNumberFor;
 
 use crate::*;
 
@@ -48,7 +47,7 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 		collection: T::CollectionId,
 		item: T::ItemId,
 		delegate: T::AccountId,
-		maybe_deadline: Option<BlockNumberFor<T>>,
+		maybe_deadline: Option<BlockNumberFor<T, I>>,
 	) -> DispatchResult {
 		ensure!(
 			Self::is_pallet_feature_enabled(PalletFeature::Approvals),
@@ -66,8 +65,8 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 			ensure!(check_origin == details.owner, Error::<T, I>::NoPermission);
 		}
 
-		let deadline =
-			maybe_deadline.map(|d| d.saturating_add(frame_system::Pallet::<T>::block_number()));
+		let now = T::BlockNumberProvider::current_block_number();
+		let deadline = maybe_deadline.map(|d| d.saturating_add(now));
 
 		details
 			.approvals
@@ -110,7 +109,7 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 		let maybe_deadline = details.approvals.get(&delegate).ok_or(Error::<T, I>::NotDelegate)?;
 
 		let is_past_deadline = if let Some(deadline) = maybe_deadline {
-			let now = frame_system::Pallet::<T>::block_number();
+			let now = T::BlockNumberProvider::current_block_number();
 			now > *deadline
 		} else {
 			false
@@ -212,7 +211,7 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 		collection: T::CollectionId,
 		delegate: T::AccountId,
 		deposit: DepositBalanceOf<T, I>,
-		maybe_deadline: Option<BlockNumberFor<T>>,
+		maybe_deadline: Option<BlockNumberFor<T, I>>,
 	) -> DispatchResult {
 		ensure!(
 			Self::is_pallet_feature_enabled(PalletFeature::Approvals),
@@ -230,8 +229,8 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 			collection_config.is_setting_enabled(CollectionSetting::TransferableItems),
 			Error::<T, I>::ItemsNonTransferable
 		);
-		let deadline =
-			maybe_deadline.map(|d| d.saturating_add(frame_system::Pallet::<T>::block_number()));
+		let now = T::BlockNumberProvider::current_block_number();
+		let deadline = maybe_deadline.map(|d| d.saturating_add(now));
 
 		CollectionApprovals::<T, I>::try_mutate_exists(
 			(&collection, &owner, &delegate),
@@ -330,7 +329,7 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 			CollectionApprovals::<T, I>::get((&collection, &owner, &delegate))
 				.ok_or(Error::<T, I>::NoPermission)?;
 		if let Some(deadline) = maybe_deadline {
-			let block_number = frame_system::Pallet::<T>::block_number();
+			let block_number = T::BlockNumberProvider::current_block_number();
 			ensure!(block_number <= deadline, Error::<T, I>::ApprovalExpired);
 		}
 		Ok(())
@@ -365,7 +364,7 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 			let maybe_deadline =
 				details.approvals.get(delegate).ok_or(Error::<T, I>::NoPermission)?;
 			if let Some(deadline) = maybe_deadline {
-				let block_number = frame_system::Pallet::<T>::block_number();
+				let block_number = T::BlockNumberProvider::current_block_number();
 				ensure!(block_number <= *deadline, Error::<T, I>::ApprovalExpired);
 			}
 			return Ok(());

pallets/nfts/src/features/atomic_swap.rs

@@ -54,7 +54,7 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 		desired_collection_id: T::CollectionId,
 		maybe_desired_item_id: Option<T::ItemId>,
 		maybe_price: Option<PriceWithDirection<ItemPrice<T, I>>>,
-		duration: frame_system::pallet_prelude::BlockNumberFor<T>,
+		duration: BlockNumberFor<T, I>,
 	) -> DispatchResult {
 		ensure!(
 			Self::is_pallet_feature_enabled(PalletFeature::Swaps),
@@ -77,7 +77,8 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 			),
 		};
 
-		let deadline = duration.saturating_add(frame_system::Pallet::<T>::block_number());
+		let now = T::BlockNumberProvider::current_block_number();
+		let deadline = duration.saturating_add(now);
 
 		PendingSwapOf::<T, I>::insert(
 			offered_collection_id,
@@ -120,7 +121,7 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 		let swap = PendingSwapOf::<T, I>::get(offered_collection_id, offered_item_id)
 			.ok_or(Error::<T, I>::UnknownSwap)?;
 
-		let now = frame_system::Pallet::<T>::block_number();
+		let now = T::BlockNumberProvider::current_block_number();
 		if swap.deadline > now {
 			let item = Item::<T, I>::get(offered_collection_id, offered_item_id)
 				.ok_or(Error::<T, I>::UnknownItem)?;
@@ -188,7 +189,7 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 			ensure!(desired_item == send_item_id, Error::<T, I>::UnknownSwap);
 		}
 
-		let now = frame_system::Pallet::<T>::block_number();
+		let now = T::BlockNumberProvider::current_block_number();
 		ensure!(now <= swap.deadline, Error::<T, I>::DeadlineExpired);
 
 		if let Some(ref price) = swap.price {

pallets/nfts/src/features/attributes.rs

@@ -225,7 +225,7 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 			Error::<T, I>::MaxAttributesLimitReached
 		);
 
-		let now = frame_system::Pallet::<T>::block_number();
+		let now = T::BlockNumberProvider::current_block_number();
 		ensure!(deadline >= now, Error::<T, I>::DeadlineExpired);
 
 		let item_details = Item::<T, I>::get(collection, item).ok_or(Error::<T, I>::UnknownItem)?;

pallets/nfts/src/features/create_delete_item.rs

@@ -148,7 +148,7 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 			ensure!(account == mint_to, Error::<T, I>::WrongOrigin);
 		}
 
-		let now = frame_system::Pallet::<T>::block_number();
+		let now = T::BlockNumberProvider::current_block_number();
 		ensure!(deadline >= now, Error::<T, I>::DeadlineExpired);
 
 		ensure!(

pallets/nfts/src/features/settings.rs

@@ -97,11 +97,7 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 	pub(crate) fn do_update_mint_settings(
 		maybe_check_origin: Option<T::AccountId>,
 		collection: T::CollectionId,
-		mint_settings: MintSettings<
-			BalanceOf<T, I>,
-			frame_system::pallet_prelude::BlockNumberFor<T>,
-			T::CollectionId,
-		>,
+		mint_settings: MintSettings<BalanceOf<T, I>, BlockNumberFor<T, I>, T::CollectionId>,
 	) -> DispatchResult {
 		if let Some(check_origin) = &maybe_check_origin {
 			ensure!(