feat: add native token support for fungibles api

Cargo.toml

@@ -20,6 +20,7 @@ members = [
     "runtime/devnet",
     "runtime/testnet",
     "integration-tests",
+    "pallets/*",
     "primitives",
     "scripts/fund-dev-accounts",
 ]
@@ -47,10 +48,11 @@ subxt-signer = "0.34.0"
 tokio = { version = "1.36", features = ["macros", "time", "rt-multi-thread"] }
 
 # Build
-substrate-wasm-builder = "18.0.0"
+substrate-wasm-builder = "18.0.1"
 substrate-build-script-utils = "11.0.0"
 
 # Local
+pallet-api = { path = "pallets/api", default-features = false }
 pop-runtime-devnet = { path = "runtime/devnet", 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-common = { path = "runtime/common", default-features = false }
@@ -76,15 +78,15 @@ sc-transaction-pool-api = "29.0.0"
 frame-benchmarking = { version = "29.0.0", default-features = false }
 frame-benchmarking-cli = "33.0.0"
 frame-executive = { version = "29.0.0", default-features = false }
-frame-support = { version = "29.0.0", default-features = false }
+frame-support = { version = "29.0.2", default-features = false }
 frame-system = { version = "29.0.0", default-features = false }
 frame-system-benchmarking = { version = "29.0.0", default-features = false }
 frame-system-rpc-runtime-api = { version = "27.0.0", default-features = false }
 frame-try-runtime = { version = "0.35.0", default-features = false }
 pallet-aura = { version = "28.0.0", default-features = false }
 pallet-authorship = { version = "29.0.0", default-features = false }
 pallet-assets = { version = "30.0.0", default-features = false }
-pallet-balances = { version = "29.0.0", default-features = false }
+pallet-balances = { version = "29.0.2", default-features = false }
 pallet-contracts = { version = "28.0.0", default-features = false }
 pallet-message-queue = { version = "32.0.0", default-features = false }
 pallet-multisig = { version = "29.0.0", default-features = false }
@@ -97,11 +99,11 @@ pallet-scheduler = { version = "30.0.0", default-features = false }
 pallet-session = { version = "29.0.0", default-features = false }
 pallet-sudo = { version = "29.0.0", default-features = false }
 pallet-timestamp = { version = "28.0.0", default-features = false }
-pallet-transaction-payment = { version = "29.0.0", default-features = false }
+pallet-transaction-payment = { version = "29.0.2", default-features = false }
 pallet-transaction-payment-rpc = "31.0.0"
 pallet-transaction-payment-rpc-runtime-api = { version = "29.0.0", default-features = false }
 pallet-utility = { version = "29.0.0", default-features = false }
-sp-api = { version = "27.0.0", default-features = false }
+sp-api = { version = "27.0.1", default-features = false }
 sp-authority-discovery = { version = "27.0.0", default-features = false }
 sp-block-builder = { version = "27.0.0", default-features = false }
 sp-blockchain = "29.0.0"
@@ -125,20 +127,20 @@ sp-transaction-pool = { version = "27.0.0", default-features = false }
 sp-version = { version = "30.0.0", default-features = false }
 
 # Polkadot
-pallet-xcm = { version = "=8.0.1", default-features = false }
+pallet-xcm = { version = "8.0.5", default-features = false }
 polkadot-cli = "8.0.0"
 polkadot-parachain-primitives = { version = "7.0.0", default-features = false }
-polkadot-runtime-parachains = { version = "8.0.1", default-features = false }
+polkadot-runtime-parachains = { version = "8.0.3", default-features = false }
 polkadot-primitives = { version = "8.0.1", default-features = false }
-polkadot-runtime-common = { version = "8.0.1", default-features = false }
+polkadot-runtime-common = { version = "8.0.3", default-features = false }
 rococo-runtime-constants = { version = "8.0.0", default-features = false }
-rococo-runtime = { version = "8.0.0", default-features = false }
-xcm = { package = "staging-xcm", version = "8.0.1", default-features = false }
-xcm-builder = { package = "staging-xcm-builder", version = "8.0.1", default-features = false }
-xcm-executor = { package = "staging-xcm-executor", version = "8.0.1", default-features = false }
+rococo-runtime = { version = "8.0.1", default-features = false }
+xcm = { version = "8.0.1", package = "staging-xcm", default-features = false }
+xcm-builder = { version = "8.0.3", package = "staging-xcm-builder", default-features = false }
+xcm-executor = { version = "8.0.2", package = "staging-xcm-executor", default-features = false }
 
 # Cumulus
-asset-hub-rococo-runtime = { version = "0.12.0", default-features = false }
+asset-hub-rococo-runtime = { version = "0.12.3", default-features = false }
 asset-test-utils = { version = "8.0.1", default-features = false }
 cumulus-pallet-aura-ext = { version = "0.8.0", default-features = false }
 cumulus-pallet-parachain-system = { version = "0.8.1", default-features = false, features = ["parameterized-consensus-hook"] }
@@ -149,9 +151,9 @@ cumulus-primitives-aura = { version = "0.8.0", default-features = false }
 cumulus-primitives-core = { version = "0.8.0", default-features = false }
 cumulus-primitives-utility = { version = "0.8.1", default-features = false }
 emulated-integration-tests-common = { version = "4.0.0", default-features = false }
-pallet-collator-selection = { version = "10.0.0", default-features = false }
-parachains-common = { version = "8.0.0", default-features = false }
-parachain-info = { package = "staging-parachain-info", version = "0.8.0", default-features = false }
+pallet-collator-selection = { version = "10.0.3", default-features = false }
+parachains-common = { version = "8.0.1", default-features = false }
+parachain-info = { version = "0.8.0", package = "staging-parachain-info", default-features = false }
 cumulus-primitives-parachain-inherent = "0.8.0"
 cumulus-relay-chain-interface = "0.8.0"
 color-print = "0.3.4"
@@ -160,4 +162,4 @@ cumulus-client-collator = "0.8.0"
 cumulus-client-consensus-aura = "0.8.0"
 cumulus-client-consensus-common = "0.8.0"
 cumulus-client-consensus-proposer = "0.8.0"
-cumulus-client-service = "0.8.0"
+cumulus-client-service = "0.8.0"

node/src/command.rs

@@ -64,18 +64,9 @@ impl RuntimeResolver for PathBuf {
 
 fn load_spec(id: &str) -> std::result::Result<Box<dyn ChainSpec>, String> {
 	Ok(match id {
-		#[cfg(not(feature = "paseo"))]
-		"dev-rococo" => Box::new(chain_spec::development_config(Relay::RococoLocal)),
-		#[cfg(feature = "paseo")]
-		"dev-paseo" => Box::new(chain_spec::development_config(Relay::PaseoLocal)),
-		#[cfg(not(feature = "paseo"))]
-		"pop-rococo" => Box::new(chain_spec::testnet_config(Relay::Rococo)),
-		#[cfg(feature = "paseo")]
-		"pop-paseo" => Box::new(chain_spec::testnet_config(Relay::Paseo)),
-		#[cfg(feature = "paseo")]
+		"dev" | "dev-paseo" => Box::new(chain_spec::development_config(Relay::PaseoLocal)),
+		"test" | "pop-paseo" => Box::new(chain_spec::testnet_config(Relay::Paseo)),
 		"" | "local" => Box::new(chain_spec::development_config(Relay::PaseoLocal)),
-		#[cfg(not(feature = "paseo"))]
-		"" | "local" => Box::new(chain_spec::development_config(Relay::RococoLocal)),
 		path => {
 			let path: PathBuf = path.into();
 			match path.runtime() {

pallets/api/Cargo.toml

@@ -0,0 +1,55 @@
+[package]
+name = "pallet-api"
+authors.workspace = true
+description = "Api pallet, enabling smart(er) contracts with the power of Polkadot"
+edition.workspace = true
+license.workspace = true
+version = "0.1.0"
+
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[dependencies]
+codec.workspace = true
+scale-info.workspace = true
+
+# Substrate
+frame-benchmarking.workspace = true
+frame-support.workspace = true
+frame-system.workspace = true
+pallet-assets.workspace = true
+sp-runtime.workspace = true
+sp-std.workspace = true
+
+[dev-dependencies]
+pallet-balances.workspace = true
+sp-core.workspace = true
+sp-io.workspace = true
+
+[features]
+default = ["std"]
+runtime-benchmarks = [
+    "frame-benchmarking/runtime-benchmarks",
+    "frame-support/runtime-benchmarks",
+    "frame-system/runtime-benchmarks",
+    "pallet-assets/runtime-benchmarks",
+    "sp-runtime/runtime-benchmarks",
+]
+std = [
+    "codec/std",
+    "frame-benchmarking/std",
+    "frame-support/std",
+    "frame-system/std",
+    "pallet-assets/std",
+    "pallet-balances/std",
+    "scale-info/std",
+    "sp-core/std",
+    "sp-io/std",
+    "sp-runtime/std",
+    "sp-std/std",
+]
+try-runtime = [
+    "frame-support/try-runtime",
+    "frame-system/try-runtime",
+    "sp-runtime/try-runtime",
+]

pallets/api/src/fungibles/benchmarking.rs

@@ -0,0 +1,106 @@
+//! Benchmarking setup for pallet-api::fungibles
+
+use super::{AccountIdOf, AssetIdOf, AssetsInstanceOf, AssetsOf, BalanceOf, Call, Config, Pallet};
+use frame_benchmarking::{account, v2::*};
+use frame_support::{
+	assert_ok,
+	traits::{
+		fungibles::{
+			approvals::{Inspect as ApprovalInspect, Mutate},
+			Create, Inspect,
+		},
+		Currency,
+	},
+};
+use frame_system::RawOrigin;
+use sp_runtime::traits::Zero;
+
+const SEED: u32 = 1;
+
+// See if `generic_event` has been emitted.
+fn assert_has_event<T: Config>(
+	generic_event: <T as pallet_assets::Config<AssetsInstanceOf<T>>>::RuntimeEvent,
+) {
+	frame_system::Pallet::<T>::assert_has_event(generic_event.into());
+}
+
+#[benchmarks(
+	where
+	<pallet_assets::Pallet<T, AssetsInstanceOf<T>> as Inspect<<T as frame_system::Config>::AccountId>>::AssetId: Zero,
+)]
+mod benchmarks {
+	use super::*;
+
+	// Parameter:
+	// - 'a': whether `approve_transfer` is required.
+	// - 'c': whether `cancel_approval` is required.
+	#[benchmark]
+	fn approve(a: Linear<0, 1>, c: Linear<0, 1>) -> Result<(), BenchmarkError> {
+		let asset_id = AssetIdOf::<T>::zero();
+		let min_balance = <BalanceOf<T>>::from(1u32);
+		let owner: AccountIdOf<T> = account("Alice", 0, SEED);
+		let spender: AccountIdOf<T> = account("Bob", 0, SEED);
+		let current_allowance = <BalanceOf<T>>::from(u32::MAX / 2);
+		T::Currency::make_free_balance_be(&owner, u32::MAX.into());
+		// Set the `current_allowance`.
+		assert_ok!(<AssetsOf<T> as Create<AccountIdOf<T>>>::create(
+			asset_id.clone(),
+			owner.clone(),
+			true,
+			min_balance
+		));
+		assert_ok!(<AssetsOf<T> as Mutate<AccountIdOf<T>>>::approve(
+			asset_id.clone(),
+			&owner,
+			&spender,
+			current_allowance,
+		));
+		let approval_value = match (a, c) {
+			// Equal to the current allowance.
+			(0, 0) => current_allowance,
+			// Greater than the current allowance.
+			(1, 0) => <BalanceOf<T>>::from(u32::MAX),
+			// Zero.
+			(0, 1) => <BalanceOf<T>>::from(0u32),
+			// Smaller than the current allowance.
+			(1, 1) => <BalanceOf<T>>::from(u32::MAX / 4),
+			_ => unreachable!("values can only be 0 or 1"),
+		};
+
+		#[extrinsic_call]
+		_(RawOrigin::Signed(owner.clone()), asset_id.clone(), spender.clone(), approval_value);
+
+		assert_eq!(AssetsOf::<T>::allowance(asset_id.clone(), &owner, &spender), approval_value);
+		if c == 1 {
+			assert_has_event::<T>(
+				pallet_assets::Event::ApprovalCancelled {
+					asset_id: asset_id.clone(),
+					owner: owner.clone(),
+					delegate: spender.clone(),
+				}
+				.into(),
+			);
+		}
+		if a == 1 {
+			let amount = match c {
+				// When the allowance was cancelled and then approved with the new value.
+				1 => approval_value,
+				// When the allowance was increased.
+				0 => approval_value - current_allowance,
+				_ => unreachable!("`c` can only be 0 or 1"),
+			};
+			assert_has_event::<T>(
+				pallet_assets::Event::ApprovedTransfer {
+					asset_id,
+					source: owner,
+					delegate: spender,
+					amount,
+				}
+				.into(),
+			);
+		}
+		Ok(())
+	}
+
+	impl_benchmark_test_suite!(Pallet, crate::mock::new_test_ext(), crate::mock::Test);
+}