Update Polkadot stable2506 (#2917)

* update polkadot-stable2506

* update orml

* update stable-asset

* fix

* fix

* fix

Author: zjb0807

Cargo.lock

@@ -214,92 +214,92 @@ module-evm-utility-macro = { path = "modules/evm-utility/macro" }
 orml-build-script-utils = { path = "orml/build-script-utils" }
 
 # polkadot-sdk (wasm)
-cumulus-pallet-aura-ext = { version = "0.20.0", default-features = false }
-cumulus-pallet-parachain-system = { version = "0.20.0", default-features = false }
-cumulus-pallet-xcm = { version = "0.19.1", default-features = false }
-cumulus-pallet-xcmp-queue = { version = "0.20.0", default-features = false }
-cumulus-primitives-core = { version = "0.18.1", default-features = false }
-cumulus-primitives-parachain-inherent = { version = "0.18.1", default-features = false }
-cumulus-primitives-timestamp = { version = "0.19.0", default-features = false }
-cumulus-primitives-utility = { version = "0.20.0", default-features = false }
-cumulus-test-relay-sproof-builder = { version = "0.19.0", default-features = false }
-frame-benchmarking = { version = "40.0.0", default-features = false }
-frame-executive = { version = "40.0.0", default-features = false }
-frame-metadata-hash-extension = { version = "0.8.0", default-features = false }
-frame-support = { version = "40.1.0", default-features = false }
-frame-system = { version = "40.1.0", default-features = false }
-frame-system-rpc-runtime-api = { version = "36.0.0", default-features = false }
-frame-try-runtime = { version = "0.46.0", default-features = false }
-pallet-aura = { version = "39.0.0", default-features = false }
-pallet-authority-discovery = { version = "40.0.0", default-features = false }
-pallet-authorship = { version = "40.0.0", default-features = false }
-pallet-balances = { version = "41.1.0", default-features = false }
-pallet-bounties = { version = "39.0.0", default-features = false }
-pallet-collective = { version = "40.1.0", default-features = false }
-pallet-democracy = { version = "40.1.0", default-features = false }
-pallet-elections-phragmen = { version = "41.1.0", default-features = false }
-pallet-indices = { version = "40.0.0", default-features = false }
-pallet-membership = { version = "40.0.0", default-features = false }
-pallet-message-queue = { version = "43.1.0", default-features = false }
-pallet-multisig = { version = "40.1.0", default-features = false }
-pallet-preimage = { version = "40.0.0", default-features = false }
-pallet-proxy = { version = "40.1.0", default-features = false }
-pallet-recovery = { 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-session = { version = "40.0.0", default-features = false }
-pallet-state-trie-migration = { version = "44.1.0", default-features = false }
-pallet-sudo = { version = "40.0.0", default-features = false }
-pallet-timestamp = { version = "39.0.0", default-features = false }
-pallet-tips = { version = "39.0.0", default-features = false }
-pallet-transaction-payment = { version = "40.0.0", default-features = false }
-pallet-transaction-payment-rpc-runtime-api = { version = "40.0.0", default-features = false }
-pallet-treasury = { version = "39.0.0", default-features = false }
-pallet-utility = { version = "40.0.0", default-features = false }
-pallet-xcm = { version = "19.1.0", default-features = false }
-pallet-xcm-benchmarks = { version = "20.0.0", default-features = false }
-parachain-info = { version = "0.20.0", package = "staging-parachain-info", default-features = false }
-parachains-common = { version = "21.0.0", default-features = false }
-polkadot-core-primitives = { version = "17.1.0", default-features = false }
-polkadot-parachain-primitives = { version = "16.1.0", default-features = false }
-polkadot-primitives = { version = "18.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-block-builder = { version = "36.0.0", default-features = false }
-sp-blockchain = { version = "39.0.0", default-features = false }
-sp-consensus = { version = "0.42.0", default-features = false }
-sp-consensus-aura = { version = "0.42.0", default-features = false }
-sp-consensus-slots = { version = "0.42.1", default-features = false }
-sp-core = { version = "36.1.0", default-features = false }
+cumulus-pallet-aura-ext = { version = "0.21.0", default-features = false }
+cumulus-pallet-parachain-system = { version = "0.21.0", default-features = false }
+cumulus-pallet-xcm = { version = "0.20.0", default-features = false }
+cumulus-pallet-xcmp-queue = { version = "0.21.0", default-features = false }
+cumulus-primitives-core = { version = "0.19.0", default-features = false }
+cumulus-primitives-parachain-inherent = { version = "0.19.0", default-features = false }
+cumulus-primitives-timestamp = { version = "0.20.0", default-features = false }
+cumulus-primitives-utility = { version = "0.21.0", default-features = false }
+cumulus-test-relay-sproof-builder = { version = "0.20.0", default-features = false }
+frame-benchmarking = { version = "41.0.0", default-features = false }
+frame-executive = { version = "41.0.0", default-features = false }
+frame-metadata-hash-extension = { version = "0.9.0", default-features = false }
+frame-support = { version = "41.0.0", default-features = false }
+frame-system = { version = "41.0.0", default-features = false }
+frame-system-rpc-runtime-api = { version = "37.0.0", default-features = false }
+frame-try-runtime = { version = "0.47.0", default-features = false }
+pallet-aura = { version = "40.0.0", default-features = false }
+pallet-authority-discovery = { version = "41.0.0", default-features = false }
+pallet-authorship = { version = "41.0.0", default-features = false }
+pallet-balances = { version = "42.0.0", default-features = false }
+pallet-bounties = { version = "40.0.0", default-features = false }
+pallet-collective = { version = "41.0.0", default-features = false }
+pallet-democracy = { version = "41.0.0", default-features = false }
+pallet-elections-phragmen = { version = "42.0.0", default-features = false }
+pallet-indices = { version = "41.0.0", default-features = false }
+pallet-membership = { version = "41.0.0", default-features = false }
+pallet-message-queue = { version = "44.0.0", default-features = false }
+pallet-multisig = { version = "41.0.0", default-features = false }
+pallet-preimage = { version = "41.0.0", default-features = false }
+pallet-proxy = { version = "41.0.0", default-features = false }
+pallet-recovery = { 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-session = { version = "41.0.0", default-features = false }
+pallet-state-trie-migration = { version = "46.0.0", default-features = false }
+pallet-sudo = { version = "41.0.0", default-features = false }
+pallet-timestamp = { version = "40.0.0", default-features = false }
+pallet-tips = { version = "40.0.0", default-features = false }
+pallet-transaction-payment = { version = "41.0.0", default-features = false }
+pallet-transaction-payment-rpc-runtime-api = { version = "41.0.0", default-features = false }
+pallet-treasury = { version = "40.0.0", default-features = false }
+pallet-utility = { version = "41.0.0", default-features = false }
+pallet-xcm = { version = "20.1.0", default-features = false }
+pallet-xcm-benchmarks = { version = "21.0.0", default-features = false }
+parachain-info = { version = "0.21.0", package = "staging-parachain-info", default-features = false }
+parachains-common = { version = "22.0.0", default-features = false }
+polkadot-core-primitives = { version = "18.0.0", default-features = false }
+polkadot-parachain-primitives = { version = "17.0.0", default-features = false }
+polkadot-primitives = { version = "19.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-block-builder = { version = "37.0.0", default-features = false }
+sp-blockchain = { version = "40.0.0", default-features = false }
+sp-consensus = { version = "0.43.0", default-features = false }
+sp-consensus-aura = { version = "0.43.0", default-features = false }
+sp-consensus-slots = { version = "0.43.0", default-features = false }
+sp-core = { version = "37.0.0", default-features = false }
 sp-debug-derive = { version = "14.0.0", default-features = false }
 sp-externalities = { version = "0.30.0", default-features = false }
-sp-genesis-builder = { version = "0.17.0", default-features = false }
-sp-inherents = { version = "36.0.0", default-features = false }
-sp-io = { version = "40.0.0", default-features = false }
-sp-keyring = { version = "41.0.0", default-features = false }
-sp-keystore = { version = "0.42.0", default-features = false }
-sp-offchain = { version = "36.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-session = { version = "38.1.0", default-features = false }
-sp-staking = { version = "38.0.0", default-features = false }
-sp-state-machine = { version = "0.45.0", default-features = false }
+sp-genesis-builder = { version = "0.18.0", default-features = false }
+sp-inherents = { version = "37.0.0", default-features = false }
+sp-io = { version = "41.0.1", default-features = false }
+sp-keyring = { version = "42.0.0", default-features = false }
+sp-keystore = { version = "0.43.0", default-features = false }
+sp-offchain = { version = "37.0.0", default-features = false }
+sp-runtime = { version = "42.0.0", default-features = false }
+sp-runtime-interface = { version = "30.0.0", default-features = false }
+sp-session = { version = "39.0.0", default-features = false }
+sp-staking = { version = "39.0.0", default-features = false }
+sp-state-machine = { version = "0.46.0", default-features = false }
 sp-std = { version = "14.0.0", default-features = false }
 sp-storage = { version = "22.0.0", default-features = false }
-sp-timestamp = { version = "36.0.0", default-features = false }
+sp-timestamp = { version = "37.0.0", default-features = false }
 sp-tracing = { version = "17.1.0", default-features = false }
-sp-transaction-pool = { version = "36.0.0", default-features = false }
-sp-trie = { version = "39.1.0", default-features = false }
-sp-version = { version = "39.0.0", default-features = false }
-sp-wasm-interface = { version = "21.0.1", default-features = false }
-sp-weights = { version = "31.1.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 }
+sp-transaction-pool = { version = "37.0.0", default-features = false }
+sp-trie = { version = "40.0.0", default-features = false }
+sp-version = { version = "40.0.0", default-features = false }
+sp-wasm-interface = { version = "22.0.0", default-features = false }
+sp-weights = { version = "32.0.0", 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 }
 
 # polkadot-sdk (client)
-substrate-wasm-builder = { version = "26.0.0", features = ["metadata-hash"] }
-xcm-simulator = { version = "20.0.0" }
+substrate-wasm-builder = { version = "27.0.0", features = ["metadata-hash"] }
+xcm-simulator = { version = "21.0.0" }

Cargo.toml

@@ -51,9 +51,9 @@ check-runtimes:
 .PHONY: check-benchmarks
 check-benchmarks:
 	SKIP_WASM_BUILD= cargo check --features wasm-bench --package module-evm
-	SKIP_WASM_BUILD= cargo check --features runtime-benchmarks --no-default-features --target=wasm32v1-none -p mandala-runtime
-	SKIP_WASM_BUILD= cargo check --features runtime-benchmarks --no-default-features --target=wasm32v1-none -p karura-runtime
-	SKIP_WASM_BUILD= cargo check --features runtime-benchmarks --no-default-features --target=wasm32v1-none -p acala-runtime
+	RUSTFLAGS="${RUSTFLAGS:-} --cfg substrate_runtime" SKIP_WASM_BUILD= cargo check --features runtime-benchmarks --no-default-features --target=wasm32v1-none -p mandala-runtime
+	RUSTFLAGS="${RUSTFLAGS:-} --cfg substrate_runtime" SKIP_WASM_BUILD= cargo check --features runtime-benchmarks --no-default-features --target=wasm32v1-none -p karura-runtime
+	RUSTFLAGS="${RUSTFLAGS:-} --cfg substrate_runtime" SKIP_WASM_BUILD= cargo check --features runtime-benchmarks --no-default-features --target=wasm32v1-none -p acala-runtime
 
 .PHONY: check-integration-tests
 check-integration-tests:

Makefile

@@ -62,7 +62,6 @@ parameter_type_with_key! {
 }
 
 impl orml_tokens::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
 	type Balance = Balance;
 	type Amount = Amount;
 	type CurrencyId = CurrencyId;
@@ -87,7 +86,6 @@ parameter_types! {
 }
 
 impl module_dex::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
 	type Currency = Tokens;
 	type GetExchangeFee = GetExchangeFee;
 	type TradingPathLimit = ConstU32<4>;
@@ -152,7 +150,6 @@ parameter_types! {
 }
 
 impl nutsfinance_stable_asset::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
 	type AssetId = CurrencyId;
 	type Balance = Balance;
 	type Assets = RebaseTokens;

ecosystem-modules/stable-asset

@@ -65,9 +65,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>;
-
 		/// Currency type for withdraw and balance storage.
 		type Currency: Currency<Self::AccountId>;
 

evm-tests

@@ -87,7 +87,6 @@ impl module_evm::Config for Runtime {
 	type NewContractExtraBytes = ConstU32<1>;
 	type StorageDepositPerByte = StorageDepositPerByte;
 	type TxFeePerGas = ConstU128<10>;
-	type RuntimeEvent = RuntimeEvent;
 	type PrecompilesType = ();
 	type PrecompilesValue = ();
 	type GasToWeight = ();
@@ -116,7 +115,6 @@ parameter_types! {
 	pub const KSMCurrencyId: CurrencyId = CurrencyId::Token(TokenSymbol::KSM);
 }
 impl asset_registry::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
 	type Currency = Balances;
 	type StakingCurrencyId = KSMCurrencyId;
 	type EVMBridge = module_evm_bridge::EVMBridge<Runtime>;

modules/aggregated-dex/src/mock.rs

@@ -32,7 +32,7 @@
 
 use frame_support::{pallet_prelude::*, traits::ExistenceRequirement, transactional};
 use frame_system::{
-	offchain::{CreateInherent, SubmitTransaction},
+	offchain::{CreateBare, SubmitTransaction},
 	pallet_prelude::*,
 };
 use module_support::{
@@ -133,9 +133,7 @@ pub mod module {
 	use super::*;
 
 	#[pallet::config]
-	pub trait Config: frame_system::Config + CreateInherent<Call<Self>> {
-		type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
-
+	pub trait Config: frame_system::Config + CreateBare<Call<Self>> {
 		/// The minimum increment size of each bid compared to the previous one
 		#[pallet::constant]
 		type MinimumIncrementSize: Get<Rate>;
@@ -336,7 +334,7 @@ impl<T: Config> Pallet<T> {
 
 	fn submit_cancel_auction_tx(auction_id: AuctionId) {
 		let call = Call::<T>::cancel { id: auction_id };
-		let xt = T::create_inherent(call.into());
+		let xt = T::create_bare(call.into());
 		if let Err(err) = SubmitTransaction::<T, Call<T>>::submit_transaction(xt) {
 			log::info!(
 				target: "auction-manager",

modules/asset-registry/src/lib.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;
@@ -83,7 +82,6 @@ impl orml_tokens::Config for Runtime {
 }
 
 impl orml_auction::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
 	type Balance = Balance;
 	type AuctionId = AuctionId;
 	type Handler = AuctionManagerModule;
@@ -105,7 +103,6 @@ parameter_types! {
 }
 
 impl module_cdp_treasury::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
 	type Currency = Tokens;
 	type GetStableCurrencyId = GetStableCurrencyId;
 	type AuctionManagerHandler = AuctionManagerModule;
@@ -151,7 +148,6 @@ parameter_types! {
 }
 
 impl module_dex::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
 	type Currency = Tokens;
 	type GetExchangeFee = GetExchangeFee;
 	type TradingPathLimit = ConstU32<4>;
@@ -185,7 +181,6 @@ parameter_types! {
 }
 
 impl Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
 	type Currency = Tokens;
 	type Auction = AuctionModule;
 	type MinimumIncrementSize = MinimumIncrementSize;
@@ -223,11 +218,11 @@ where
 	type Extrinsic = Extrinsic;
 }
 
-impl<LocalCall> frame_system::offchain::CreateInherent<LocalCall> for Runtime
+impl<LocalCall> frame_system::offchain::CreateBare<LocalCall> for Runtime
 where
 	RuntimeCall: From<LocalCall>,
 {
-	fn create_inherent(call: Self::RuntimeCall) -> Self::Extrinsic {
+	fn create_bare(call: Self::RuntimeCall) -> Self::Extrinsic {
 		Extrinsic::new_bare(call)
 	}
 }