Merge remote-tracking branch 'origin/master' into add-vesting-benchmarks

zjb0807 · zjb0807 · commit ae891f13f9ae · 2025-10-30T08:34:56.000+08:00
diff --git a/Cargo.dev.toml b/Cargo.dev.toml
@@ -31,10 +31,14 @@ resolver = "2"
 split-debuginfo = "unpacked"
 
 [workspace.dependencies]
+hex-literal = { version = "1.0.0" }
 log = { version = "0.4.25", default-features = false }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
 serde = { version = "1.0.214" }
 parity-scale-codec = { version = "3.6.12", default-features = false, features = ["max-encoded-len"] }
+num-traits = { version = "0.2.14", default-features = false }
+impl-trait-for-tuples = "0.2.2"
+paste = "1.0"
 
 cumulus-pallet-xcm = { version = "0.22.0", default-features = false }
 cumulus-primitives-core = { version = "0.21.0", default-features = false }
diff --git a/asset-registry/Cargo.toml b/asset-registry/Cargo.toml
@@ -78,6 +78,7 @@ std = [
 runtime-benchmarks = [
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
+	"orml-tokens/runtime-benchmarks",
 	"pallet-xcm/runtime-benchmarks",
 	"polkadot-runtime-common/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
diff --git a/asset-registry/src/mock/para.rs b/asset-registry/src/mock/para.rs
@@ -77,6 +77,8 @@ impl orml_tokens::Config for Runtime {
 	type MaxReserves = ();
 	type MaxLocks = ConstU32<50>;
 	type DustRemovalWhitelist = Nothing;
+	#[cfg(feature = "runtime-benchmarks")]
+	type BenchmarkHelper = ();
 }
 
 #[derive(scale_info::TypeInfo, Encode, Decode, Clone, Eq, PartialEq, Debug, MaxEncodedLen, DecodeWithMemTracking)]
diff --git a/authority/Cargo.toml b/authority/Cargo.toml
@@ -10,7 +10,7 @@ edition = "2021"
 [dependencies]
 parity-scale-codec = { workspace = true }
 scale-info = { workspace = true }
-serde = { version = "1.0.145", optional = true }
+serde = { workspace = true, optional = true }
 
 frame-support = { workspace = true }
 frame-system = { workspace = true }
diff --git a/benchmarking/Cargo.toml b/benchmarking/Cargo.toml
@@ -25,7 +25,7 @@ sp-std = { workspace = true }
 sp-storage = { workspace = true }
 
 [dev-dependencies]
-hex-literal = "1.0.0"
+hex-literal = { workspace = true }
 
 frame-system = { workspace = true, features = ["std"] }
 
diff --git a/currencies/Cargo.toml b/currencies/Cargo.toml
@@ -25,7 +25,7 @@ orml-utilities = { path = "../utilities", version = "1.5.0", default-features =
 pallet-balances = { workspace = true, features = ["std"] }
 sp-core = { workspace = true, features = ["std"] }
 
-orml_tokens = { package = "orml-tokens", path = "../tokens" }
+orml-tokens = { path = "../tokens", features = ["std"] }
 
 [features]
 default = [ "std" ]
@@ -41,6 +41,12 @@ std = [
 	"sp-runtime/std",
 	"sp-std/std",
 ]
+runtime-benchmarks = [
+	"frame-support/runtime-benchmarks",
+	"frame-system/runtime-benchmarks",
+	"orml-tokens/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
+]
 try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
diff --git a/currencies/src/mock.rs b/currencies/src/mock.rs
@@ -85,6 +85,8 @@ impl orml_tokens::Config for Runtime {
 	type MaxReserves = ConstU32<100_000>;
 	type ReserveIdentifier = ReserveIdentifier;
 	type DustRemovalWhitelist = Nothing;
+	#[cfg(feature = "runtime-benchmarks")]
+	type BenchmarkHelper = ();
 }
 
 pub const NATIVE_CURRENCY_ID: CurrencyId = 1;
diff --git a/nft/Cargo.toml b/nft/Cargo.toml
@@ -8,7 +8,7 @@ authors = ["Acala Developers"]
 edition = "2021"
 
 [dependencies]
-parity-scale-codec = {  version = "3.0.0", default-features = false, features = ["max-encoded-len"] }
+parity-scale-codec = { workspace = true }
 scale-info = { workspace = true }
 serde = { workspace = true, optional = true }
 
diff --git a/oracle/src/benchmarking.rs b/oracle/src/benchmarking.rs
@@ -1,10 +1,25 @@
 pub use crate::*;
 
-use frame_benchmarking::v2::{impl_test_function, instance_benchmarks, whitelisted_caller};
-
+use frame_benchmarking::v2::*;
 use frame_support::assert_ok;
 use frame_system::{Pallet as System, RawOrigin};
 
+/// Helper trait for benchmarking.
+pub trait BenchmarkHelper<OracleKey, OracleValue, L: Get<u32>> {
+	/// Returns a list of `(oracle_key, oracle_value)` pairs to be used for
+	/// benchmarking.
+	///
+	/// NOTE: User should ensure to at least submit two values, otherwise the
+	/// benchmark linear analysis might fail.
+	fn get_currency_id_value_pairs() -> BoundedVec<(OracleKey, OracleValue), L>;
+}
+
+impl<OracleKey, OracleValue, L: Get<u32>> BenchmarkHelper<OracleKey, OracleValue, L> for () {
+	fn get_currency_id_value_pairs() -> BoundedVec<(OracleKey, OracleValue), L> {
+		BoundedVec::default()
+	}
+}
+
 #[instance_benchmarks]
 mod benchmarks {
 	use super::*;
diff --git a/oracle/src/lib.rs b/oracle/src/lib.rs
@@ -43,34 +43,18 @@ use sp_std::{prelude::*, vec};
 pub use crate::default_combine_data::DefaultCombineData;
 
 #[cfg(feature = "runtime-benchmarks")]
-pub mod benchmarking;
+mod benchmarking;
 
 mod default_combine_data;
 mod mock;
 mod tests;
 mod weights;
 
+#[cfg(feature = "runtime-benchmarks")]
+pub use benchmarking::BenchmarkHelper;
 pub use module::*;
 pub use weights::WeightInfo;
 
-#[cfg(feature = "runtime-benchmarks")]
-/// Helper trait for benchmarking.
-pub trait BenchmarkHelper<OracleKey, OracleValue, L: Get<u32>> {
-	/// Returns a list of `(oracle_key, oracle_value)` pairs to be used for
-	/// benchmarking.
-	///
-	/// NOTE: User should ensure to at least submit two values, otherwise the
-	/// benchmark linear analysis might fail.
-	fn get_currency_id_value_pairs() -> BoundedVec<(OracleKey, OracleValue), L>;
-}
-
-#[cfg(feature = "runtime-benchmarks")]
-impl<OracleKey, OracleValue, L: Get<u32>> BenchmarkHelper<OracleKey, OracleValue, L> for () {
-	fn get_currency_id_value_pairs() -> BoundedVec<(OracleKey, OracleValue), L> {
-		BoundedVec::default()
-	}
-}
-
 #[frame_support::pallet]
 pub mod module {
 	use super::*;
diff --git a/parameters/Cargo.toml b/parameters/Cargo.toml
@@ -8,8 +8,8 @@ authors = ["Acala Developers"]
 edition = "2021"
 
 [dependencies]
-parity-scale-codec = { workspace = true, default-features = false, features = ["max-encoded-len"] }
-scale-info = { version = "2.1.2", default-features = false, features = ["derive"] }
+parity-scale-codec = { workspace = true }
+scale-info = { workspace = true }
 serde = { workspace = true, optional = true }
 
 frame-support = { workspace = true }
diff --git a/payments/Cargo.toml b/payments/Cargo.toml
@@ -26,7 +26,7 @@ orml-traits = {path = "../traits", version = "1.5.0", default-features = false }
 sp-core = { workspace = true }
 sp-io = { workspace = true }
 
-orml-tokens = { path = "../tokens" }
+orml-tokens = { path = "../tokens", features = ["std"] }
 
 [features]
 default = [ 'std' ]
@@ -41,6 +41,12 @@ std = [
 	'sp-runtime/std',
 	'sp-std/std',
 ]
+runtime-benchmarks = [
+	"frame-support/runtime-benchmarks",
+	"frame-system/runtime-benchmarks",
+	"orml-tokens/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
+]
 try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
diff --git a/payments/src/mock.rs b/payments/src/mock.rs
@@ -74,6 +74,8 @@ impl orml_tokens::Config for Test {
 	type DustRemovalWhitelist = MockDustRemovalWhitelist;
 	type MaxReserves = ConstU32<2>;
 	type ReserveIdentifier = ReserveIdentifier;
+	#[cfg(feature = "runtime-benchmarks")]
+	type BenchmarkHelper = ();
 }
 
 pub struct MockDisputeResolver;
diff --git a/tokens/Cargo.toml b/tokens/Cargo.toml
@@ -13,6 +13,7 @@ log = { workspace = true }
 scale-info = { workspace = true }
 serde = { workspace = true, optional = true }
 
+frame-benchmarking = { workspace = true, optional = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
 sp-arithmetic = { workspace = true }
@@ -31,6 +32,7 @@ sp-staking = { workspace = true, features = ["std"] }
 [features]
 default = [ "std" ]
 std = [
+	"frame-benchmarking?/std",
 	"frame-support/std",
 	"frame-system/std",
 	"log/std",
@@ -43,8 +45,10 @@ std = [
 	"sp-std/std",
 ]
 runtime-benchmarks = [
+	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
+	"pallet-treasury/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
 ]
 try-runtime = [
diff --git a/tokens/src/benchmarking.rs b/tokens/src/benchmarking.rs
@@ -0,0 +1,139 @@
+pub use crate::*;
+
+use frame_benchmarking::v2::*;
+use frame_support::assert_ok;
+use frame_system::RawOrigin;
+use sp_runtime::traits::SaturatedConversion;
+
+/// Helper trait for benchmarking.
+pub trait BenchmarkHelper<CurrencyId, Balance> {
+	/// Returns a currency id and amount to be used in benchmarking.
+	fn get_currency_id_and_amount() -> Option<(CurrencyId, Balance)>;
+}
+
+impl<CurrencyId, Balance> BenchmarkHelper<CurrencyId, Balance> for () {
+	fn get_currency_id_and_amount() -> Option<(CurrencyId, Balance)> {
+		None
+	}
+}
+
+#[benchmarks]
+mod benchmarks {
+	use super::*;
+
+	#[benchmark]
+	fn transfer() {
+		let from: T::AccountId = account("from", 0, 0);
+
+		let (currency_id, amount) = T::BenchmarkHelper::get_currency_id_and_amount().unwrap();
+
+		assert_ok!(<Pallet::<T> as MultiCurrencyExtended<_>>::update_balance(
+			currency_id,
+			&from,
+			amount.saturated_into()
+		));
+
+		let to: T::AccountId = account("to", 0, 0);
+		let to_lookup = <T as frame_system::Config>::Lookup::unlookup(to.clone());
+
+		#[extrinsic_call]
+		_(RawOrigin::Signed(from), to_lookup, currency_id, amount);
+
+		assert_eq!(Pallet::<T>::total_balance(currency_id, &to), amount);
+	}
+
+	#[benchmark]
+	fn transfer_all() {
+		let from: T::AccountId = account("from", 0, 0);
+
+		let (currency_id, amount) = T::BenchmarkHelper::get_currency_id_and_amount().unwrap();
+
+		assert_ok!(<Pallet::<T> as MultiCurrencyExtended<_>>::update_balance(
+			currency_id,
+			&from,
+			amount.saturated_into()
+		));
+
+		let to: T::AccountId = account("to", 0, 0);
+		let to_lookup = <T as frame_system::Config>::Lookup::unlookup(to.clone());
+
+		#[extrinsic_call]
+		_(RawOrigin::Signed(from.clone()), to_lookup, currency_id, false);
+
+		assert_eq!(
+			<Pallet::<T> as MultiCurrency<_>>::total_balance(currency_id, &from),
+			0u32.into()
+		);
+	}
+
+	#[benchmark]
+	fn transfer_keep_alive() {
+		let from: T::AccountId = account("from", 0, 0);
+
+		let (currency_id, amount) = T::BenchmarkHelper::get_currency_id_and_amount().unwrap();
+
+		assert_ok!(<Pallet::<T> as MultiCurrencyExtended<_>>::update_balance(
+			currency_id,
+			&from,
+			amount.saturating_mul(2u32.into()).saturated_into()
+		));
+
+		let to: T::AccountId = account("to", 0, 0);
+		let to_lookup = <T as frame_system::Config>::Lookup::unlookup(to.clone());
+
+		#[extrinsic_call]
+		_(RawOrigin::Signed(from), to_lookup, currency_id, amount);
+
+		assert_eq!(
+			<Pallet::<T> as MultiCurrency<_>>::total_balance(currency_id, &to),
+			amount
+		);
+	}
+
+	#[benchmark]
+	fn force_transfer() {
+		let from: T::AccountId = account("from", 0, 0);
+		let from_lookup = <T as frame_system::Config>::Lookup::unlookup(from.clone());
+
+		let (currency_id, amount) = T::BenchmarkHelper::get_currency_id_and_amount().unwrap();
+
+		assert_ok!(<Pallet::<T> as MultiCurrencyExtended<_>>::update_balance(
+			currency_id,
+			&from,
+			amount.saturated_into()
+		));
+
+		let to: T::AccountId = account("to", 0, 0);
+		let to_lookup = <T as frame_system::Config>::Lookup::unlookup(to.clone());
+
+		#[extrinsic_call]
+		_(RawOrigin::Root, from_lookup, to_lookup, currency_id, amount);
+
+		assert_eq!(
+			<Pallet::<T> as MultiCurrency<_>>::total_balance(currency_id, &to),
+			amount
+		);
+	}
+
+	#[benchmark]
+	fn set_balance() {
+		let who: T::AccountId = account("who", 0, 0);
+		let who_lookup = <T as frame_system::Config>::Lookup::unlookup(who.clone());
+
+		let (currency_id, amount) = T::BenchmarkHelper::get_currency_id_and_amount().unwrap();
+
+		#[extrinsic_call]
+		_(RawOrigin::Root, who_lookup, currency_id, amount, amount);
+
+		assert_eq!(
+			<Pallet::<T> as MultiCurrency<_>>::total_balance(currency_id, &who),
+			amount.saturating_mul(2u32.into())
+		);
+	}
+
+	impl_benchmark_test_suite! {
+		Pallet,
+		crate::mock::ExtBuilder::default().build(),
+		crate::mock::Runtime,
+	}
+}
diff --git a/tokens/src/lib.rs b/tokens/src/lib.rs
@@ -71,6 +71,8 @@ use orml_traits::{
 	MultiReservableCurrency, NamedMultiReservableCurrency,
 };
 
+#[cfg(feature = "runtime-benchmarks")]
+mod benchmarking;
 mod imbalances;
 mod impls;
 mod mock;
@@ -82,6 +84,8 @@ mod tests_multicurrency;
 
 mod weights;
 
+#[cfg(feature = "runtime-benchmarks")]
+pub use benchmarking::BenchmarkHelper;
 pub use impls::*;
 pub use weights::WeightInfo;
 
@@ -226,6 +230,10 @@ pub mod module {
 		// The whitelist of accounts that will not be reaped even if its total
 		// is zero or below ED.
 		type DustRemovalWhitelist: Contains<Self::AccountId>;
+
+		/// The benchmarks need a way to provide currency id.
+		#[cfg(feature = "runtime-benchmarks")]
+		type BenchmarkHelper: BenchmarkHelper<Self::CurrencyId, Self::Balance>;
 	}
 
 	#[pallet::error]
diff --git a/tokens/src/mock.rs b/tokens/src/mock.rs
diff --git a/traits/Cargo.toml b/traits/Cargo.toml
diff --git a/unknown-tokens/Cargo.toml b/unknown-tokens/Cargo.toml
diff --git a/utilities/Cargo.toml b/utilities/Cargo.toml
diff --git a/xtokens/Cargo.toml b/xtokens/Cargo.toml
diff --git a/xtokens/src/mock/para.rs b/xtokens/src/mock/para.rs
diff --git a/xtokens/src/mock/para_relative_view.rs b/xtokens/src/mock/para_relative_view.rs
diff --git a/xtokens/src/mock/para_teleport.rs b/xtokens/src/mock/para_teleport.rs

Original file line number	Diff line number	Diff line change
`@@ -77,6 +77,8 @@ impl orml_tokens::Config for Runtime {`
`77`	`77`	`type MaxReserves = ();`
`78`	`78`	`type MaxLocks = ConstU32<50>;`
`79`	`79`	`type DustRemovalWhitelist = Nothing;`
	`80`	`+ #[cfg(feature = "runtime-benchmarks")]`
	`81`	`+ type BenchmarkHelper = ();`
`80`	`82`	`}`
`81`	`83`
`82`	`84`	`#[derive(scale_info::TypeInfo, Encode, Decode, Clone, Eq, PartialEq, Debug, MaxEncodedLen, DecodeWithMemTracking)]`
Original file line number	Diff line number	Diff line change
`@@ -85,6 +85,8 @@ impl orml_tokens::Config for Runtime {`
`85`	`85`	`type MaxReserves = ConstU32<100_000>;`
`86`	`86`	`type ReserveIdentifier = ReserveIdentifier;`
`87`	`87`	`type DustRemovalWhitelist = Nothing;`
	`88`	`+ #[cfg(feature = "runtime-benchmarks")]`
	`89`	`+ type BenchmarkHelper = ();`
`88`	`90`	`}`
`89`	`91`
`90`	`92`	`pub const NATIVE_CURRENCY_ID: CurrencyId = 1;`