Update polkadot-stable2506 (#1030)

zjb0807 · web-flow · commit ff056c127f3e · 2025-09-18T10:01:33.000+12:00
* update polkadot-stable2506

* update

* merge

* add RUSTFLAGS substrate_runtime

* fix

* fix
diff --git a/Cargo.dev.toml b/Cargo.dev.toml
@@ -36,35 +36,35 @@ 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"] }
 
-cumulus-pallet-xcm = { version = "0.19.1", default-features = false }
-cumulus-primitives-core = { version = "0.18.1", default-features = false }
-frame-benchmarking = { version = "40.0.0", default-features = false }
-frame-support = { version = "40.1.0", default-features = false }
-frame-system = { version = "40.1.0", default-features = false }
-pallet-balances = { version = "41.1.0", default-features = false }
-pallet-elections-phragmen = { version = "41.1.0", default-features = false }
-pallet-message-queue = { version = "43.1.0", default-features = false }
-pallet-preimage = { version = "40.0.0", default-features = false }
-pallet-root-testing = { version = "16.0.0", default-features = false }
-pallet-scheduler = { version = "41.0.0", default-features = false }
-pallet-timestamp = { version = "39.0.0", default-features = false }
-pallet-treasury = { version = "39.0.0", default-features = false }
-pallet-xcm = { version = "19.1.0", default-features = false }
-polkadot-parachain-primitives = { version = "16.1.0", default-features = false }
-polkadot-runtime-common = { version = "19.1.0", default-features = false }
-polkadot-runtime-parachains = { version = "19.1.0", default-features = false }
-sp-api = { version = "36.0.1", default-features = false }
-sp-application-crypto = { version = "40.1.0", default-features = false }
-sp-arithmetic = { version = "26.1.0", default-features = false }
-sp-core = { version = "36.1.0", default-features = false }
-sp-io = { version = "40.0.0", default-features = false }
-sp-runtime = { version = "41.1.0", default-features = false }
-sp-runtime-interface = { version = "29.0.1", default-features = false }
-sp-staking = { version = "38.0.0", default-features = false }
+cumulus-pallet-xcm = { version = "0.20.0", default-features = false }
+cumulus-primitives-core = { version = "0.19.0", default-features = false }
+frame-benchmarking = { version = "41.0.0", default-features = false }
+frame-support = { version = "41.0.0", default-features = false }
+frame-system = { version = "41.0.0", default-features = false }
+pallet-balances = { version = "42.0.0", default-features = false }
+pallet-elections-phragmen = { version = "42.0.0", default-features = false }
+pallet-message-queue = { version = "44.0.0", default-features = false }
+pallet-preimage = { version = "41.0.0", default-features = false }
+pallet-root-testing = { version = "17.0.0", default-features = false }
+pallet-scheduler = { version = "42.0.0", default-features = false }
+pallet-timestamp = { version = "40.0.0", default-features = false }
+pallet-treasury = { version = "40.0.0", default-features = false }
+pallet-xcm = { version = "20.1.0", default-features = false }
+polkadot-parachain-primitives = { version = "17.0.0", default-features = false }
+polkadot-runtime-common = { version = "20.0.0", default-features = false }
+polkadot-runtime-parachains = { version = "20.0.1", default-features = false }
+sp-api = { version = "37.0.0", default-features = false }
+sp-application-crypto = { version = "41.0.0", default-features = false }
+sp-arithmetic = { version = "27.0.0", default-features = false }
+sp-core = { version = "37.0.0", default-features = false }
+sp-io = { version = "41.0.1", default-features = false }
+sp-runtime = { version = "42.0.0", default-features = false }
+sp-runtime-interface = { version = "30.0.0", default-features = false }
+sp-staking = { version = "39.0.0", default-features = false }
 sp-std = { version = "14.0.0", default-features = false }
 sp-storage = { version = "22.0.0", default-features = false }
-xcm = { version = "16.1.0", package = "staging-xcm", default-features = false }
-xcm-builder = { version = "20.0.0", package = "staging-xcm-builder", default-features = false }
-xcm-executor = { version = "19.1.0", package = "staging-xcm-executor", default-features = false }
+xcm = { version = "17.0.0", package = "staging-xcm", default-features = false }
+xcm-builder = { version = "21.0.0", package = "staging-xcm-builder", default-features = false }
+xcm-executor = { version = "20.0.0", package = "staging-xcm-executor", default-features = false }
 
-xcm-simulator = { version = "20.0.0" }
+xcm-simulator = { version = "21.0.0" }
diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 check: githooks
-	./scripts/run.sh check --no-default-features --target=wasm32v1-none
+	RUSTFLAGS="${RUSTFLAGS:-} --cfg substrate_runtime" ./scripts/run.sh check --no-default-features --target=wasm32v1-none
 
 check-tests: githooks
 	./scripts/run.sh check --tests
diff --git a/asset-registry/src/lib.rs b/asset-registry/src/lib.rs
@@ -34,8 +34,6 @@ pub mod module {
 
 	#[pallet::config]
 	pub trait Config: frame_system::Config {
-		type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
-
 		/// Additional non-standard metadata to store for each asset
 		type CustomMetadata: Parameter + Member + TypeInfo + MaxEncodedLen;
 
diff --git a/asset-registry/src/mock/para.rs b/asset-registry/src/mock/para.rs
@@ -69,7 +69,6 @@ parameter_type_with_key! {
 }
 
 impl orml_tokens::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
 	type Balance = Balance;
 	type Amount = Amount;
 	type CurrencyId = CurrencyId;
@@ -124,7 +123,6 @@ parameter_types! {
 }
 
 impl orml_asset_registry::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
 	type Balance = Balance;
 	type AssetId = ParaAssetId;
 	type AuthorityOrigin = AssetAuthority;
@@ -319,7 +317,6 @@ parameter_type_with_key! {
 }
 
 impl orml_xtokens::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
 	type Balance = Balance;
 	type CurrencyId = CurrencyId;
 	type CurrencyIdConvert = CurrencyIdConvert;
@@ -338,12 +335,10 @@ impl orml_xtokens::Config for Runtime {
 }
 
 impl orml_xcm::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
 	type SovereignOrigin = EnsureRoot<AccountId>;
 }
 
 impl orml_xcm_mock_message_queue::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
 	type XcmExecutor = XcmExecutor<XcmConfig>;
 }
 
diff --git a/auction/src/lib.rs b/auction/src/lib.rs
@@ -35,8 +35,6 @@ pub mod module {
 
 	#[pallet::config]
 	pub trait Config: frame_system::Config {
-		type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
-
 		/// The balance type for bidding.
 		type Balance: Parameter
 			+ Member
diff --git a/auction/src/mock.rs b/auction/src/mock.rs
@@ -48,7 +48,6 @@ impl AuctionHandler<AccountId, Balance, BlockNumber, AuctionId> for Handler {
 }
 
 impl Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
 	type Balance = Balance;
 	type AuctionId = AuctionId;
 	type Handler = Handler;
diff --git a/authority/src/lib.rs b/authority/src/lib.rs
@@ -205,9 +205,6 @@ pub mod module {
 
 	#[pallet::config]
 	pub trait Config: frame_system::Config {
-		/// The overarching event type.
-		type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
-
 		/// The outer origin type.
 		type RuntimeOrigin: From<DelayedOrigin<BlockNumberFor<Self>, <Self as Config>::PalletsOrigin>>
 			+ IsType<<Self as frame_system::Config>::RuntimeOrigin>
diff --git a/authority/src/mock.rs b/authority/src/mock.rs
@@ -138,7 +138,6 @@ impl AsOriginId<RuntimeOrigin, OriginCaller> for MockAsOriginId {
 }
 
 impl Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
 	type RuntimeOrigin = RuntimeOrigin;
 	type PalletsOrigin = OriginCaller;
 	type Scheduler = Scheduler;
diff --git a/benchmarking/src/lib.rs b/benchmarking/src/lib.rs
@@ -6,7 +6,7 @@
 mod tests;
 
 pub use frame_benchmarking::{
-	benchmarking, whitelisted_caller, BenchmarkBatch, BenchmarkConfig, BenchmarkError, BenchmarkList,
+	benchmarking, current_time, whitelisted_caller, BenchmarkBatch, BenchmarkConfig, BenchmarkError, BenchmarkList,
 	BenchmarkMetadata, BenchmarkParameter, BenchmarkRecording, BenchmarkResult, Benchmarking, BenchmarkingSetup,
 	Recording,
 };
@@ -836,9 +836,9 @@ macro_rules! impl_benchmark {
 					);
 
 					// Time the storage root recalculation.
-					let start_storage_root = $crate::benchmarking::current_time();
+					let start_storage_root = $crate::current_time();
 					$crate::storage_root($crate::StateVersion::V0);
-					let finish_storage_root = $crate::benchmarking::current_time();
+					let finish_storage_root = $crate::current_time();
 					let elapsed_storage_root = finish_storage_root - start_storage_root;
 
 					let skip_meta = [ $( stringify!($name_skip_meta).as_ref() ),* ];
diff --git a/currencies/src/mock.rs b/currencies/src/mock.rs
@@ -75,7 +75,6 @@ where
 }
 
 impl orml_tokens::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
 	type Balance = Balance;
 	type Amount = i64;
 	type CurrencyId = CurrencyId;
diff --git a/gradually-update/src/lib.rs b/gradually-update/src/lib.rs
@@ -69,8 +69,6 @@ pub mod module {
 
 	#[pallet::config]
 	pub trait Config: frame_system::Config {
-		type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
-
 		/// The frequency of updating values between blocks
 		#[pallet::constant]
 		type UpdateFrequency: Get<BlockNumberFor<Self>>;
diff --git a/gradually-update/src/mock.rs b/gradually-update/src/mock.rs
@@ -22,7 +22,6 @@ impl frame_system::Config for Runtime {
 }
 
 impl Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
 	type UpdateFrequency = ConstU64<10>;
 	type DispatchOrigin = frame_system::EnsureRoot<AccountId>;
 	type WeightInfo = ();
diff --git a/oracle/src/lib.rs b/oracle/src/lib.rs
@@ -100,8 +100,6 @@ pub mod module {
 
 	#[pallet::config]
 	pub trait Config<I: 'static = ()>: frame_system::Config {
-		type RuntimeEvent: From<Event<Self, I>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
-
 		/// Hook on new data received
 		type OnNewData: OnNewData<Self::AccountId, Self::OracleKey, Self::OracleValue>;
 
diff --git a/oracle/src/mock.rs b/oracle/src/mock.rs
@@ -64,7 +64,6 @@ impl SortedMembers<AccountId> for Members {
 }
 
 impl Config for Test {
-	type RuntimeEvent = RuntimeEvent;
 	type OnNewData = ();
 	type CombineData = DefaultCombineData<Self, ConstU32<3>, ConstU32<600>>;
 	type Time = Timestamp;
diff --git a/parameters/src/lib.rs b/parameters/src/lib.rs
@@ -23,8 +23,6 @@ pub mod module {
 
 	#[pallet::config]
 	pub trait Config: frame_system::Config {
-		type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
-
 		/// The key value type for parameters. Usually created by
 		/// orml_traits::parameters::define_aggregrated_parameters
 		type AggregratedKeyValue: AggregratedKeyValue;
diff --git a/parameters/src/mock.rs b/parameters/src/mock.rs
@@ -68,7 +68,6 @@ impl EnsureOriginWithArg<RuntimeOrigin, RuntimeParametersKey> for EnsureOriginIm
 }
 
 impl Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
 	type AggregratedKeyValue = RuntimeParameters;
 	type AdminOrigin = EnsureOriginImpl;
 	type WeightInfo = ();
diff --git a/payments/src/lib.rs b/payments/src/lib.rs
@@ -110,9 +110,6 @@ pub mod pallet {
 
 	#[pallet::config]
 	pub trait Config: frame_system::Config {
-		/// Because this pallet emits events, it depends on the runtime's
-		/// definition of an event.
-		type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
 		/// the type of assets this pallet can hold in payment
 		type Asset: MultiReservableCurrency<Self::AccountId>;
 		/// Dispute resolution account
diff --git a/payments/src/mock.rs b/payments/src/mock.rs
@@ -67,7 +67,6 @@ impl orml_tokens::Config for Test {
 	type Amount = i64;
 	type Balance = Balance;
 	type CurrencyId = u32;
-	type RuntimeEvent = RuntimeEvent;
 	type ExistentialDeposits = ExistentialDeposits;
 	type CurrencyHooks = ();
 	type WeightInfo = ();
@@ -107,7 +106,6 @@ parameter_types! {
 }
 
 impl payment::Config for Test {
-	type RuntimeEvent = RuntimeEvent;
 	type Asset = Tokens;
 	type DisputeResolver = MockDisputeResolver;
 	type IncentivePercentage = IncentivePercentage;
diff --git a/rate-limit/src/lib.rs b/rate-limit/src/lib.rs
@@ -92,8 +92,6 @@ pub mod module {
 
 	#[pallet::config]
 	pub trait Config: frame_system::Config {
-		type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
-
 		/// Origin represented Governance.
 		type GovernanceOrigin: EnsureOrigin<Self::RuntimeOrigin>;
 
diff --git a/rate-limit/src/mock.rs b/rate-limit/src/mock.rs
@@ -44,7 +44,6 @@ impl pallet_timestamp::Config for Runtime {
 }
 
 impl Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
 	type GovernanceOrigin = EnsureRoot<AccountId>;
 	type RateLimiterId = RateLimiterId;
 	type MaxWhitelistFilterCount = ConstU32<3>;
diff --git a/tokens/src/lib.rs b/tokens/src/lib.rs
@@ -181,8 +181,6 @@ pub mod module {
 
 	#[pallet::config]
 	pub trait Config: frame_system::Config {
-		type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
-
 		/// The balance type
 		type Balance: frame_support::traits::tokens::Balance;
 
diff --git a/tokens/src/mock.rs b/tokens/src/mock.rs
@@ -376,7 +376,6 @@ where
 }
 
 impl Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
 	type Balance = Balance;
 	type Amount = i64;
 	type CurrencyId = CurrencyId;
diff --git a/unknown-tokens/src/lib.rs b/unknown-tokens/src/lib.rs
@@ -17,9 +17,7 @@ pub mod module {
 	use super::*;
 
 	#[pallet::config]
-	pub trait Config: frame_system::Config {
-		type RuntimeEvent: From<Event> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
-	}
+	pub trait Config: frame_system::Config {}
 
 	#[pallet::event]
 	#[pallet::generate_deposit(pub(crate) fn deposit_event)]
diff --git a/unknown-tokens/src/mock.rs b/unknown-tokens/src/mock.rs
@@ -17,9 +17,7 @@ impl frame_system::Config for Runtime {
 	type Block = Block;
 }
 
-impl Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-}
+impl Config for Runtime {}
 
 type Block = frame_system::mocking::MockBlock<Runtime>;
 
diff --git a/vesting/src/lib.rs b/vesting/src/lib.rs
@@ -126,8 +126,6 @@ pub mod module {
 
 	#[pallet::config]
 	pub trait Config: frame_system::Config {
-		type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
-
 		type Currency: LockableCurrency<Self::AccountId, Moment = BlockNumberFor<Self>>;
 
 		#[pallet::constant]
diff --git a/vesting/src/mock.rs b/vesting/src/mock.rs
@@ -74,7 +74,6 @@ impl BlockNumberProvider for MockBlockNumberProvider {
 }
 
 impl Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
 	type Currency = PalletBalances;
 	type MinVestedTransfer = ConstU64<5>;
 	type VestedTransferOrigin = EnsureAliceOrBob;
diff --git a/xcm-mock-message-queue/src/lib.rs b/xcm-mock-message-queue/src/lib.rs
@@ -22,7 +22,6 @@ pub mod module {
 
 	#[pallet::config]
 	pub trait Config: frame_system::Config {
-		type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
 		type XcmExecutor: ExecuteXcm<Self::RuntimeCall>;
 	}
 
@@ -96,11 +95,14 @@ pub mod module {
 						max_weight,
 						Weight::zero(),
 					) {
-						Outcome::Error { error } => (Err(error), Event::Fail(Some(hash), error)),
+						Outcome::Error(InstructionError { error, .. }) => (Err(error), Event::Fail(Some(hash), error)),
 						Outcome::Complete { used } => (Ok(used), Event::Success(Some(hash))),
 						// As far as the caller is concerned, this was dispatched without error, so
 						// we just report the weight used.
-						Outcome::Incomplete { used, error } => (Ok(used), Event::Fail(Some(hash), error)),
+						Outcome::Incomplete {
+							used,
+							error: InstructionError { error, .. },
+						} => (Ok(used), Event::Fail(Some(hash), error)),
 					}
 				}
 				Err(()) => (Err(XcmError::UnhandledXcmVersion), Event::BadVersion(Some(hash))),
diff --git a/xcm/src/lib.rs b/xcm/src/lib.rs
@@ -16,8 +16,6 @@ pub mod module {
 
 	#[pallet::config]
 	pub trait Config: frame_system::Config + pallet_xcm::Config {
-		type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
-
 		/// The required origin for sending XCM as parachain sovereign.
 		///
 		/// Typically root or the majority of collective.
diff --git a/xtokens/src/lib.rs b/xtokens/src/lib.rs
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
`@@ -69,7 +69,6 @@ parameter_type_with_key! {`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`impl orml_tokens::Config for Runtime {`
`72`		`- type RuntimeEvent = RuntimeEvent;`
`73`	`72`	`type Balance = Balance;`
`74`	`73`	`type Amount = Amount;`
`75`	`74`	`type CurrencyId = CurrencyId;`
`@@ -124,7 +123,6 @@ parameter_types! {`
`124`	`123`	`}`
`125`	`124`
`126`	`125`	`impl orml_asset_registry::Config for Runtime {`
`127`		`- type RuntimeEvent = RuntimeEvent;`
`128`	`126`	`type Balance = Balance;`
`129`	`127`	`type AssetId = ParaAssetId;`
`130`	`128`	`type AuthorityOrigin = AssetAuthority;`
`@@ -319,7 +317,6 @@ parameter_type_with_key! {`
`319`	`317`	`}`
`320`	`318`
`321`	`319`	`impl orml_xtokens::Config for Runtime {`
`322`		`- type RuntimeEvent = RuntimeEvent;`
`323`	`320`	`type Balance = Balance;`
`324`	`321`	`type CurrencyId = CurrencyId;`
`325`	`322`	`type CurrencyIdConvert = CurrencyIdConvert;`
`@@ -338,12 +335,10 @@ impl orml_xtokens::Config for Runtime {`
`338`	`335`	`}`
`339`	`336`
`340`	`337`	`impl orml_xcm::Config for Runtime {`
`341`		`- type RuntimeEvent = RuntimeEvent;`
`342`	`338`	`type SovereignOrigin = EnsureRoot<AccountId>;`
`343`	`339`	`}`
`344`	`340`
`345`	`341`	`impl orml_xcm_mock_message_queue::Config for Runtime {`
`346`		`- type RuntimeEvent = RuntimeEvent;`
`347`	`342`	`type XcmExecutor = XcmExecutor<XcmConfig>;`
`348`	`343`	`}`
`349`	`344`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,6 @@ impl AuctionHandler<AccountId, Balance, BlockNumber, AuctionId> for Handler {`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`impl Config for Runtime {`
`51`		`- type RuntimeEvent = RuntimeEvent;`
`52`	`51`	`type Balance = Balance;`
`53`	`52`	`type AuctionId = AuctionId;`
`54`	`53`	`type Handler = Handler;`
Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,6 @@ impl AsOriginId<RuntimeOrigin, OriginCaller> for MockAsOriginId {`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`impl Config for Runtime {`
`141`		`- type RuntimeEvent = RuntimeEvent;`
`142`	`141`	`type RuntimeOrigin = RuntimeOrigin;`
`143`	`142`	`type PalletsOrigin = OriginCaller;`
`144`	`143`	`type Scheduler = Scheduler;`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,6 @@ where`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`impl orml_tokens::Config for Runtime {`
`78`		`- type RuntimeEvent = RuntimeEvent;`
`79`	`78`	`type Balance = Balance;`
`80`	`79`	`type Amount = i64;`
`81`	`80`	`type CurrencyId = CurrencyId;`