feat(mainnet): introduce assets

Cargo.toml

@@ -69,12 +69,13 @@ substrate-wasm-builder = { git = "https://github.com/paritytech/polkadot-sdk", b
 # Local
 pallet-api = { path = "pallets/api", default-features = false }
 pallet-nfts = { path = "pallets/nfts", default-features = false }
+pallet-nfts-runtime-api = { path = "pallets/nfts/runtime-api", default-features = false }
 pop-chain-extension = { path = "./extension", default-features = false }
 pop-primitives = { path = "./primitives", default-features = false }
 pop-runtime-common = { path = "runtime/common", default-features = false }
-pop-runtime-devnet = { path = "runtime/devnet", default-features = true }   # default-features=true required for `-p pop-node` builds
-pop-runtime-mainnet = { path = "runtime/mainnet", default-features = true } # default-features=true required for `-p pop-node` builds
-pop-runtime-testnet = { path = "runtime/testnet", default-features = true } # default-features=true required for `-p pop-node` builds
+pop-runtime-devnet = { path = "runtime/devnet", default-features = true }                 # default-features=true required for `-p pop-node` builds
+pop-runtime-mainnet = { path = "runtime/mainnet", default-features = true }               # default-features=true required for `-p pop-node` builds
+pop-runtime-testnet = { path = "runtime/testnet", default-features = true }               # default-features=true required for `-p pop-node` builds
 
 # Substrate
 frame-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2412", default-features = false }
@@ -94,7 +95,6 @@ pallet-contracts = { git = "https://github.com/paritytech/polkadot-sdk", branch
 pallet-message-queue = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2412", default-features = false }
 pallet-multisig = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2412", default-features = false }
 pallet-nft-fractionalization = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2412", default-features = false }
-pallet-nfts-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2412", default-features = false }
 pallet-preimage = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2412", default-features = false }
 pallet-proxy = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2412", default-features = false }
 pallet-revive = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2412", default-features = false }

pallets/nfts/runtime-api/Cargo.toml

@@ -9,9 +9,6 @@ readme = "README.md"
 repository.workspace = true
 version = "23.0.0"
 
-[lints]
-workspace = true
-
 [package.metadata.docs.rs]
 targets = [ "x86_64-unknown-linux-gnu" ]
 

pallets/nfts/runtime-api/src/lib.rs

@@ -22,38 +22,39 @@
 extern crate alloc;
 
 use alloc::vec::Vec;
+
 use codec::{Decode, Encode};
 
 sp_api::decl_runtime_apis! {
 	pub trait NftsApi<AccountId, CollectionId, ItemId>
 	where
 		AccountId: Encode + Decode,
 		CollectionId: Encode,
 		ItemId: Encode,
 	{
 		fn owner(collection: CollectionId, item: ItemId) -> Option<AccountId>;
 
 		fn collection_owner(collection: CollectionId) -> Option<AccountId>;
 
 		fn attribute(
 			collection: CollectionId,
 			item: ItemId,
 			key: Vec<u8>,
 		) -> Option<Vec<u8>>;
 
 		fn custom_attribute(
 			account: AccountId,
 			collection: CollectionId,
 			item: ItemId,
 			key: Vec<u8>,
 		) -> Option<Vec<u8>>;
 
 		fn system_attribute(
 			collection: CollectionId,
 			item: Option<ItemId>,
 			key: Vec<u8>,
 		) -> Option<Vec<u8>>;
 
 		fn collection_attribute(collection: CollectionId, key: Vec<u8>) -> Option<Vec<u8>>;
 	}
 }

runtime/common/src/lib.rs

@@ -1,11 +1,13 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 use frame_support::weights::{constants::WEIGHT_REF_TIME_PER_SECOND, Weight};
 // Cumulus types re-export
 // These types are shared between the devnet and testnet runtimes
 pub use parachains_common::{AccountId, AuraId, Balance, Block, BlockNumber, Hash, Signature};
 pub use polkadot_primitives::MAX_POV_SIZE;
 use sp_runtime::Perbill;
 
+pub mod proxy;
+
 /// Nonce for an account
 pub type Nonce = u32;
 
@@ -73,75 +75,3 @@
 	pub const RELAY_CHAIN_SLOT_DURATION_MILLIS: u32 = 6000;
 }
 pub use async_backing_params::*;
-
-/// Proxy commons for Pop runtimes
-pub mod proxy {
-
-	use codec::{Decode, Encode, MaxEncodedLen};
-	use frame_support::parameter_types;
-	use sp_runtime::RuntimeDebug;
-
-	use super::{deposit, Balance};
-
-	parameter_types! {
-		// One storage item; key size 32, value size 8; .
-		pub const ProxyDepositBase: Balance = deposit(1, 40);
-		// Additional storage item size of 33 bytes.
-		pub const ProxyDepositFactor: Balance = deposit(0, 33);
-		pub const MaxProxies: u16 = 32;
-		// One storage item; key size 32, value size 16
-		pub const AnnouncementDepositBase: Balance = deposit(1, 48);
-		pub const AnnouncementDepositFactor: Balance = deposit(0, 66);
-		pub const MaxPending: u16 = 32;
-	}
-
-	/// The type used to represent the kinds of proxying allowed.
-	#[derive(
-		Copy,
-		Clone,
-		Eq,
-		PartialEq,
-		Ord,
-		PartialOrd,
-		Encode,
-		Decode,
-		RuntimeDebug,
-		MaxEncodedLen,
-		scale_info::TypeInfo,
-	)]
-	pub enum ProxyType {
-		/// Fully permissioned proxy. Can execute any call on behalf of _proxied_.
-		Any,
-		/// Can execute any call that does not transfer funds or assets.
-		NonTransfer,
-		/// Proxy with the ability to reject time-delay proxy announcements.
-		CancelProxy,
-		/// Assets proxy. Can execute any call from `assets`, **including asset transfers**.
-		Assets,
-		/// Owner proxy. Can execute calls related to asset ownership.
-		AssetOwner,
-		/// Asset manager. Can execute calls related to asset management.
-		AssetManager,
-		/// Collator selection proxy. Can execute calls related to collator selection mechanism.
-		Collator,
-	}
-	impl Default for ProxyType {
-		fn default() -> Self {
-			Self::Any
-		}
-	}
-
-	impl ProxyType {
-		pub fn is_superset(s: &ProxyType, o: &ProxyType) -> bool {
-			match (s, o) {
-				(x, y) if x == y => true,
-				(ProxyType::Any, _) => true,
-				(_, ProxyType::Any) => false,
-				(ProxyType::Assets, ProxyType::AssetOwner) => true,
-				(ProxyType::Assets, ProxyType::AssetManager) => true,
-				(ProxyType::NonTransfer, ProxyType::Collator) => true,
-				_ => false,
-			}
-		}
-	}
-}

runtime/common/src/proxy.rs

@@ -0,0 +1,72 @@
+/// Proxy commons for Pop runtimes
+use codec::{Decode, Encode, MaxEncodedLen};
+use frame_support::parameter_types;
+use sp_runtime::RuntimeDebug;
+
+use crate::{deposit, Balance};
+
+parameter_types! {
+	// One storage item; key size 32, value size 8; .
+	pub const ProxyDepositBase: Balance = deposit(1, 40);
+	// Additional storage item size of 33 bytes.
+	pub const ProxyDepositFactor: Balance = deposit(0, 33);
+	pub const MaxProxies: u16 = 32;
+	// One storage item; key size 32, value size 16
+	pub const AnnouncementDepositBase: Balance = deposit(1, 48);
+	pub const AnnouncementDepositFactor: Balance = deposit(0, 66);
+	pub const MaxPending: u16 = 32;
+}
+
+/// The type used to represent the kinds of proxying allowed.
+#[derive(
+	Copy,
+	Clone,
+	Eq,
+	PartialEq,
+	Ord,
+	PartialOrd,
+	Encode,
+	Decode,
+	RuntimeDebug,
+	MaxEncodedLen,
+	scale_info::TypeInfo,
+)]
+pub enum ProxyType {
+	/// Fully permissioned proxy. Can execute any call on behalf of _proxied_.
+	Any,
+	/// Can execute any call that does not transfer funds or assets.
+	NonTransfer,
+	/// Proxy with the ability to reject time-delay proxy announcements.
+	CancelProxy,
+	/// Assets proxy. Can execute any call from `assets`, **including asset transfers**.
+	Assets,
+	/// Owner proxy. Can execute calls related to asset ownership.
+	AssetOwner,
+	/// Asset manager. Can execute calls related to asset management.
+	AssetManager,
+	/// Collator selection proxy. Can execute calls related to collator selection mechanism.
+	Collator,
+}
+impl Default for ProxyType {
+	fn default() -> Self {
+		Self::Any
+	}
+}
+
+impl ProxyType {
+	/// Defines proxies permission hierarchy.
+	// Example: A proxy that is not superset of another one won't be able to remove
+	// that proxy relationship
+	// src: https://github.com/paritytech/polkadot-sdk/blob/4cd07c56378291fddb9fceab3b508cf99034126a/substrate/frame/proxy/src/lib.rs#L802
+	pub fn is_superset(s: &ProxyType, o: &ProxyType) -> bool {
+		match (s, o) {
+			(x, y) if x == y => true,
+			(ProxyType::Any, _) => true,
+			(_, ProxyType::Any) => false,
+			(ProxyType::Assets, ProxyType::AssetOwner) => true,
+			(ProxyType::Assets, ProxyType::AssetManager) => true,
+			(ProxyType::NonTransfer, ProxyType::Collator) => true,
+			_ => false,
+		}
+	}
+}

runtime/mainnet/Cargo.toml

@@ -22,6 +22,8 @@ scale-info.workspace = true
 smallvec.workspace = true
 
 # Local
+pallet-nfts.workspace = true
+pallet-nfts-runtime-api.workspace = true
 pop-runtime-common = { workspace = true, default-features = false }
 
 # Substrate
@@ -33,6 +35,7 @@ frame-system.workspace = true
 frame-system-benchmarking.workspace = true
 frame-system-rpc-runtime-api.workspace = true
 frame-try-runtime.workspace = true
+pallet-assets.workspace = true
 pallet-aura.workspace = true
 pallet-authorship.workspace = true
 pallet-balances.workspace = true
@@ -114,12 +117,15 @@ std = [
 	"frame-system-rpc-runtime-api/std",
 	"frame-system/std",
 	"frame-try-runtime/std",
+	"pallet-assets/std",
 	"pallet-aura/std",
 	"pallet-authorship/std",
 	"pallet-balances/std",
 	"pallet-collator-selection/std",
 	"pallet-message-queue/std",
 	"pallet-multisig/std",
+	"pallet-nfts-runtime-api/std",
+	"pallet-nfts/std",
 	"pallet-preimage/std",
 	"pallet-proxy/std",
 	"pallet-revive/std",
@@ -166,10 +172,12 @@ runtime-benchmarks = [
 	"frame-support/runtime-benchmarks",
 	"frame-system-benchmarking/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
+	"pallet-assets/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
 	"pallet-collator-selection/runtime-benchmarks",
 	"pallet-message-queue/runtime-benchmarks",
 	"pallet-multisig/runtime-benchmarks",
+	"pallet-nfts/runtime-benchmarks",
 	"pallet-preimage/runtime-benchmarks",
 	"pallet-proxy/runtime-benchmarks",
 	"pallet-revive/runtime-benchmarks",
@@ -199,12 +207,14 @@ try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
 	"frame-try-runtime/try-runtime",
+	"pallet-assets/try-runtime",
 	"pallet-aura/try-runtime",
 	"pallet-authorship/try-runtime",
 	"pallet-balances/try-runtime",
 	"pallet-collator-selection/try-runtime",
 	"pallet-message-queue/try-runtime",
 	"pallet-multisig/try-runtime",
+	"pallet-nfts/try-runtime",
 	"pallet-preimage/try-runtime",
 	"pallet-proxy/try-runtime",
 	"pallet-revive/try-runtime",

runtime/mainnet/src/apis.rs

@@ -3,7 +3,10 @@
 use codec::Encode;
 use frame_support::{
 	genesis_builder_helper::{build_state, get_preset},
-	traits::tokens::{Fortitude::Polite, Preservation::Preserve},
+	traits::{
+		nonfungibles_v2::Inspect,
+		tokens::{Fortitude::Polite, Preservation::Preserve},
+	},
 	weights::{Weight, WeightToFee as _},
 };
 use pallet_revive::AddressMapper;
@@ -30,9 +33,9 @@
 use super::{
 	config::{monetary::fee::WeightToFee, system::RuntimeBlockWeights, xcm as xcm_config},
 	AccountId, Balance, Balances, Block, BlockNumber, BlockWeights, EventRecord, Executive,
-	ExtrinsicInclusionMode, InherentDataExt, Nonce, OriginCaller, ParachainSystem, PolkadotXcm,
-	Revive, Runtime, RuntimeCall, RuntimeEvent, RuntimeGenesisConfig, RuntimeOrigin, SessionKeys,
-	System, TransactionPayment, UncheckedExtrinsic, VERSION,
+	ExtrinsicInclusionMode, InherentDataExt, Nfts, Nonce, OriginCaller, ParachainSystem,
+	PolkadotXcm, Revive, Runtime, RuntimeCall, RuntimeEvent, RuntimeGenesisConfig, RuntimeOrigin,
+	SessionKeys, System, TransactionPayment, UncheckedExtrinsic, VERSION,
 };
 
 impl_runtime_apis! {
@@ -189,6 +192,50 @@
 		}
 	}
 
+	impl pallet_nfts_runtime_api::NftsApi<Block, AccountId, u32, u32> for Runtime {
+		fn owner(collection: u32, item: u32) -> Option<AccountId> {
+			<Nfts as Inspect<AccountId>>::owner(&collection, &item)
+		}
+
+		fn collection_owner(collection: u32) -> Option<AccountId> {
+			<Nfts as Inspect<AccountId>>::collection_owner(&collection)
+		}
+
+		fn attribute(
+			collection: u32,
+			item: u32,
+			key: Vec<u8>,
+		) -> Option<Vec<u8>> {
+			<Nfts as Inspect<AccountId>>::attribute(&collection, &item, &key)
+		}
+
+		fn custom_attribute(
+			account: AccountId,
+			collection: u32,
+			item: u32,
+			key: Vec<u8>,
+		) -> Option<Vec<u8>> {
+			<Nfts as Inspect<AccountId>>::custom_attribute(
+				&account,
+				&collection,
+				&item,
+				&key,
+			)
+		}
+
+		fn system_attribute(
+			collection: u32,
+			item: Option<u32>,
+			key: Vec<u8>,
+		) -> Option<Vec<u8>> {
+			<Nfts as Inspect<AccountId>>::system_attribute(&collection, item.as_ref(), &key)
+		}
+
+		fn collection_attribute(collection: u32, key: Vec<u8>) -> Option<Vec<u8>> {
+			<Nfts as Inspect<AccountId>>::collection_attribute(&collection, &key)
+		}
+	}
+
 	#[cfg(feature = "try-runtime")]
 	impl frame_try_runtime::TryRuntime<Block> for Runtime {
 		fn on_runtime_upgrade(checks: frame_try_runtime::UpgradeCheckSelect) -> (Weight, Weight) {
@@ -236,7 +283,7 @@
 
 			use frame_system_benchmarking::Pallet as SystemBench;
 
 			impl frame_system_benchmarking::Config for Runtime {
 				fn setup_set_code_requirements(code: &Vec<u8>) -> Result<(), BenchmarkError> {
 					ParachainSystem::initialize_for_set_code_benchmark(code.len() as u32);
 					Ok(())