Upgrade to Polkadot stable2506

node/cli/src/command.rs

@@ -627,7 +627,7 @@ pub fn run() -> Result<()> {
 								let db = params.backend.expose_db();
 								let storage = params.backend.expose_storage();
 
-								cmd.run(config, params.client, db, storage)
+								cmd.run(config, params.client, db, storage, None)
 							})
 						}
 						#[cfg(feature = "moonbeam-native")]
@@ -646,7 +646,7 @@ pub fn run() -> Result<()> {
 								let db = params.backend.expose_db();
 								let storage = params.backend.expose_storage();
 
-								cmd.run(config, params.client, db, storage)
+								cmd.run(config, params.client, db, storage, None)
 							})
 						}
 						#[cfg(feature = "moonbase-native")]
@@ -665,7 +665,7 @@ pub fn run() -> Result<()> {
 								let db = params.backend.expose_db();
 								let storage = params.backend.expose_storage();
 
-								cmd.run(config, params.client, db, storage)
+								cmd.run(config, params.client, db, storage, None)
 							})
 						}
 						#[cfg(not(feature = "moonbase-native"))]

node/service/src/lazy_loading/substrate_backend.rs

@@ -33,7 +33,7 @@ use std::{
 };
 
 use sc_client_api::{
-	backend::{self, NewBlockState},
+	backend::{self, NewBlockState, TrieCacheContext},
 	blockchain::{self, BlockStatus, HeaderBackend},
 	leaves::LeafSet,
 	UsageInfo,
@@ -1231,7 +1231,7 @@ impl<Block: BlockT + DeserializeOwned> backend::Backend<Block> for Backend<Block
 	type OffchainStorage = InMemOffchainStorage;
 
 	fn begin_operation(&self) -> sp_blockchain::Result<Self::BlockImportOperation> {
-		let old_state = self.state_at(Default::default())?;
+		let old_state = self.state_at(Default::default(), TrieCacheContext::Untrusted)?;
 		Ok(BlockImportOperation {
 			pending_block: None,
 			old_state,
@@ -1249,7 +1249,7 @@ impl<Block: BlockT + DeserializeOwned> backend::Backend<Block> for Backend<Block
 		operation: &mut Self::BlockImportOperation,
 		block: Block::Hash,
 	) -> sp_blockchain::Result<()> {
-		operation.old_state = self.state_at(block)?;
+		operation.old_state = self.state_at(block, TrieCacheContext::Untrusted)?;
 		Ok(())
 	}
 
@@ -1330,7 +1330,11 @@ impl<Block: BlockT + DeserializeOwned> backend::Backend<Block> for Backend<Block
 		None
 	}
 
-	fn state_at(&self, hash: Block::Hash) -> sp_blockchain::Result<Self::State> {
+	fn state_at(
+		&self,
+		hash: Block::Hash,
+		_cache_context: sc_client_api::backend::TrieCacheContext,
+	) -> sp_blockchain::Result<Self::State> {
 		if hash == Default::default() {
 			return Ok(ForkedLazyBackend::<Block> {
 				rpc_client: self.rpc_client.clone(),
@@ -1359,7 +1363,9 @@ impl<Block: BlockT + DeserializeOwned> backend::Backend<Block> for Backend<Block
 					.map(|header| {
 						let checkpoint = self.fork_checkpoint.clone();
 						let state = if header.number().gt(checkpoint.number()) {
-							let parent = self.state_at(*header.parent_hash()).ok();
+							let parent = self
+								.state_at(*header.parent_hash(), TrieCacheContext::Untrusted)
+								.ok();
 
 							ForkedLazyBackend::<Block> {
 								rpc_client: self.rpc_client.clone(),

node/service/src/lib.rs

@@ -641,7 +641,7 @@ async fn build_relay_chain_interface(
 	Arc<(dyn RelayChainInterface + 'static)>,
 	Option<CollatorPair>,
 )> {
-	if let cumulus_client_cli::RelayChainMode::ExternalRpc(rpc_target_urls) =
+	let result = if let cumulus_client_cli::RelayChainMode::ExternalRpc(rpc_target_urls) =
 		collator_options.relay_chain_mode
 	{
 		build_minimal_relay_chain_node_with_rpc(
@@ -659,7 +659,11 @@ async fn build_relay_chain_interface(
 			task_manager,
 			hwbench,
 		)
-	}
+	};
+
+	// Extract only the first two elements from the 4-tuple
+	result
+		.map(|(relay_chain_interface, collator_pair, _, _)| (relay_chain_interface, collator_pair))
 }
 
 /// Start a node with the given parachain `Configuration` and relay chain `Configuration`.
@@ -736,6 +740,12 @@ where
 			relay_chain_interface: relay_chain_interface.clone(),
 			net_config,
 			sybil_resistance_level: CollatorSybilResistance::Resistant,
+			metrics: Net::register_notification_metrics(
+				parachain_config
+					.prometheus_config
+					.as_ref()
+					.map(|config| &config.registry),
+			),
 		})
 		.await?;
 
@@ -946,6 +956,7 @@ where
 		relay_chain_slot_duration,
 		recovery_handle: Box::new(overseer_handle.clone()),
 		sync_service: sync_service.clone(),
+		prometheus_registry: prometheus_registry.as_ref(),
 	})?;
 
 	let BlockImportPipeline::Parachain(block_import) = block_import else {
@@ -1726,6 +1737,7 @@ mod tests {
 						path: tmp.path().into(),
 						cache_size: 1024,
 					},
+					metrics_registry: None,
 				},
 				u64::MAX,
 			)
@@ -1801,6 +1813,7 @@ mod tests {
 				cache_size: 128,
 			},
 			trie_cache_maximum_size: Some(16777216),
+			warm_up_trie_cache: None,
 			state_pruning: Default::default(),
 			blocks_pruning: sc_service::BlocksPruning::KeepAll,
 			chain_spec: Box::new(spec),

node/service/src/rpc.rs

@@ -273,6 +273,8 @@ where
 				relay_chain_state,
 				downward_messages: Default::default(),
 				horizontal_messages: Default::default(),
+				relay_parent_descendants: Default::default(),
+				collator_peer_id: None,
 			};
 
 			Ok((timestamp, parachain_inherent_data))

pallets/crowdloan-rewards/Cargo.toml

@@ -12,18 +12,18 @@ parity-scale-codec = { version = "3.6.12", default-features = false}
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
 serde = { version = "1.0.188", optional = true, features = ["derive"], default-features = false }
 
-frame-support = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", default-features = false, branch = "moonbeam-polkadot-stable2503" }
-frame-system = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", default-features = false, branch = "moonbeam-polkadot-stable2503" }
-sp-core = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", default-features = false, branch = "moonbeam-polkadot-stable2503" }
-sp-runtime = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", default-features = false, branch = "moonbeam-polkadot-stable2503" }
-sp-std = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", default-features = false, branch = "moonbeam-polkadot-stable2503" }
-sp-io = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", default-features = false, branch = "moonbeam-polkadot-stable2503" }
-frame-benchmarking = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", default-features = false, optional = true, branch = "moonbeam-polkadot-stable2503" }
-sp-trie = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", default-features = false, optional = true, branch = "moonbeam-polkadot-stable2503" }
+frame-support = { workspace = true }
+frame-system = { workspace = true }
+sp-core = { workspace = true }
+sp-runtime = { workspace = true }
+sp-std = { workspace = true }
+sp-io = { workspace = true }
+frame-benchmarking = { workspace = true, optional = true }
+sp-trie = { workspace = true, optional = true }
 
 [dev-dependencies]
-pallet-balances = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", default-features = false, branch = "moonbeam-polkadot-stable2503" }
-pallet-utility = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", default-features = false, branch = "moonbeam-polkadot-stable2503" }
+pallet-balances = { workspace = true, features = ["std"] }
+pallet-utility = { workspace = true, features = ["std"] }
 
 [features]
 default = ["std"]

pallets/crowdloan-rewards/src/lib.rs

@@ -70,9 +70,7 @@ pub mod pallet {
 
 	/// Configuration trait of this pallet.
 	#[pallet::config]
-	pub trait Config: frame_system::Config {
-		/// The overarching event type
-		type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
+	pub trait Config: frame_system::Config<RuntimeEvent: From<Event<Self>>> {
 		/// Checker for the reward vec, is it initalized already?
 		type Initialized: Get<bool>;
 		/// Percentage to be payed at initialization

pallets/crowdloan-rewards/src/mock.rs

@@ -129,7 +129,6 @@ parameter_types! {
 }
 
 impl Config for Test {
-	type RuntimeEvent = RuntimeEvent;
 	type Initialized = Initialized;
 	type InitializationPayment = InitializationPayment;
 	type MaxInitContributors = MaxInitContributors;

pallets/erc20-xcm-bridge/src/mock.rs

@@ -144,7 +144,6 @@ impl pallet_evm::Config for Test {
 	type WithdrawOrigin = EnsureAddressTruncated;
 	type AddressMapping = HashedAddressMapping;
 	type Currency = Balances;
-	type RuntimeEvent = RuntimeEvent;
 	type PrecompilesType = ();
 	type PrecompilesValue = ();
 	type Runner = pallet_evm::runner::stack::Runner<Self>;

pallets/erc20-xcm-bridge/src/xcm_holding_ext.rs

@@ -108,8 +108,9 @@ where
 
 	fn prepare(
 		message: xcm::latest::Xcm<Config::RuntimeCall>,
-	) -> Result<Self::Prepared, xcm::latest::Xcm<Config::RuntimeCall>> {
-		InnerXcmExecutor::prepare(message)
+		weight_limit: Weight,
+	) -> Result<Self::Prepared, xcm::latest::InstructionError> {
+		InnerXcmExecutor::prepare(message, weight_limit)
 	}
 
 	fn execute(

pallets/ethereum-xcm/src/lib.rs

@@ -121,9 +121,9 @@ pub mod pallet {
 	use frame_support::pallet_prelude::*;
 
 	#[pallet::config]
-	pub trait Config: frame_system::Config + pallet_evm::Config {
-		/// The overarching event type.
-		type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
+	pub trait Config:
+		frame_system::Config<RuntimeEvent: From<Event<Self>>> + pallet_evm::Config
+	{
 		/// Invalid transaction error
 		type InvalidEvmTransactionError: From<TransactionValidationError>;
 		/// Handler for applying an already validated transaction

pallets/ethereum-xcm/src/mock.rs

@@ -185,7 +185,6 @@ impl pallet_evm::Config for Test {
 	type WithdrawOrigin = EnsureAddressTruncated;
 	type AddressMapping = HashedAddressMapping;
 	type Currency = Balances;
-	type RuntimeEvent = RuntimeEvent;
 	type PrecompilesType = ();
 	type PrecompilesValue = ();
 	type Runner = pallet_evm::runner::stack::Runner<Self>;
@@ -209,7 +208,6 @@ parameter_types! {
 }
 
 impl pallet_ethereum::Config for Test {
-	type RuntimeEvent = RuntimeEvent;
 	type StateRoot = IntermediateStateRoot<<Test as frame_system::Config>::Version>;
 	type PostLogContent = PostBlockAndTxnHashes;
 	type ExtraDataLength = ConstU32<30>;
@@ -294,7 +292,6 @@ impl xcm_primitives::EnsureProxy<AccountId32> for EthereumXcmEnsureProxy {
 }
 
 impl crate::Config for Test {
-	type RuntimeEvent = RuntimeEvent;
 	type InvalidEvmTransactionError = pallet_ethereum::InvalidTransactionWrapper;
 	type ValidatedTransaction = pallet_ethereum::ValidatedTransaction<Self>;
 	type XcmEthereumOrigin = crate::EnsureXcmEthereumTransaction;

pallets/moonbeam-foreign-assets/src/lib.rs

@@ -184,7 +184,11 @@ pub mod pallet {
 	pub const PALLET_ID: frame_support::PalletId = frame_support::PalletId(*b"forgasst");
 
 	#[pallet::config]
-	pub trait Config: frame_system::Config + pallet_evm::Config + scale_info::TypeInfo {
+	pub trait Config:
+		frame_system::Config<RuntimeEvent: From<Event<Self>>>
+		+ pallet_evm::Config
+		+ scale_info::TypeInfo
+	{
 		// Convert AccountId to H160
 		type AccountIdToH160: Convert<Self::AccountId, H160>;
 
@@ -215,9 +219,6 @@ pub mod pallet {
 		/// Maximum numbers of different foreign assets
 		type MaxForeignAssets: Get<u32>;
 
-		/// The overarching event type.
-		type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
-
 		/// Weight information for extrinsics in this pallet.
 		type WeightInfo: WeightInfo;
 

pallets/moonbeam-foreign-assets/src/mock.rs

@@ -133,7 +133,6 @@ impl pallet_evm::Config for Test {
 	type WithdrawOrigin = pallet_evm::EnsureAddressNever<AccountId>;
 	type AddressMapping = AccountId;
 	type Currency = Balances;
-	type RuntimeEvent = RuntimeEvent;
 	type PrecompilesType = ();
 	type PrecompilesValue = ();
 	type Runner = pallet_evm::runner::stack::Runner<Self>;
@@ -157,7 +156,6 @@ parameter_types! {
 }
 
 impl pallet_ethereum::Config for Test {
-	type RuntimeEvent = RuntimeEvent;
 	type StateRoot = IntermediateStateRoot<<Test as frame_system::Config>::Version>;
 	type PostLogContent = PostBlockAndTxnHashes;
 	type ExtraDataLength = ConstU32<30>;
@@ -269,7 +267,6 @@ impl crate::Config for Test {
 	type ForeignAssetUnfreezerOrigin = ForeignAssetManagerOrigin;
 	type OnForeignAssetCreated = NoteDownHook<Location>;
 	type MaxForeignAssets = ConstU32<3>;
-	type RuntimeEvent = RuntimeEvent;
 	type WeightInfo = ();
 	type XcmLocationToH160 = ();
 	type ForeignAssetCreationDeposit = ForeignAssetCreationDeposit;

pallets/moonbeam-lazy-migrations/src/mock.rs

@@ -133,7 +133,6 @@ impl pallet_evm::Config for Test {
 	type WithdrawOrigin = EnsureAddressNever<AccountId>;
 	type AddressMapping = AccountId;
 	type Currency = Balances;
-	type RuntimeEvent = RuntimeEvent;
 	type Runner = pallet_evm::runner::stack::Runner<Self>;
 	type PrecompilesType = ();
 	type PrecompilesValue = ();

pallets/moonbeam-orbiters/src/lib.rs

@@ -65,10 +65,7 @@ pub mod pallet {
 	>>::ReserveIdentifier;
 
 	#[pallet::config]
-	pub trait Config: frame_system::Config {
-		/// Overarching event type.
-		type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
-
+	pub trait Config: frame_system::Config<RuntimeEvent: From<Event<Self>>> {
 		/// A type to convert between AuthorId and AccountId. This pallet wrap the lookup to allow
 		/// orbiters authoring.
 		type AccountLookup: AccountLookup<Self::AccountId>;

pallets/moonbeam-orbiters/src/mock.rs

@@ -130,7 +130,6 @@ impl AccountLookup<AccountId> for MockAccountLookup {
 }
 
 impl pallet_moonbeam_orbiters::Config for Test {
-	type RuntimeEvent = RuntimeEvent;
 	type AccountLookup = MockAccountLookup;
 	type AddCollatorOrigin = EnsureRoot<AccountId>;
 	type Currency = Balances;

pallets/parachain-staking/src/lib.rs

@@ -119,9 +119,7 @@ pub mod pallet {
 
 	/// Configuration trait of this pallet.
 	#[pallet::config]
-	pub trait Config: frame_system::Config {
-		/// Overarching event type
-		type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
+	pub trait Config: frame_system::Config<RuntimeEvent: From<Event<Self>>> {
 		/// The fungible type for handling balances
 		type Currency: Inspect<Self::AccountId>
 			+ Mutate<Self::AccountId>

pallets/parachain-staking/src/mock.rs

@@ -152,7 +152,6 @@ parameter_types! {
 }
 
 impl Config for Test {
-	type RuntimeEvent = RuntimeEvent;
 	type Currency = Balances;
 	type RuntimeFreezeReason = RuntimeFreezeReason;
 	type MonetaryGovernanceOrigin = frame_system::EnsureRoot<AccountId>;

pallets/xcm-transactor/src/benchmarks.rs

@@ -24,6 +24,13 @@ use sp_std::boxed::Box;
 use sp_std::vec;
 use xcm::latest::prelude::*;
 
+/// Helper function to set up XCM router for benchmarks
+fn setup_xcm_router<T: Config>() {
+	// Ensure the XCM sender is properly configured for benchmarks
+	// This sets up the HostConfiguration for sending messages to the relay chain
+	T::XcmSender::ensure_successful_delivery(Some(Location::parent()));
+}
+
 #[benchmarks(
 	where T::Transactor: Default, T::CurrencyId: From<Location>
 )]
@@ -135,6 +142,9 @@ mod benchmarks {
 	// Worst Case: transacInfo db reads
 	#[benchmark]
 	fn transact_through_derivative() -> Result<(), BenchmarkError> {
+		// Set up XCM router for benchmarks
+		setup_xcm_router::<T>();
+
 		let fee_per_second = 1;
 		let extra_weight: Weight = Weight::from_parts(300000000u64, 0);
 		let max_weight: Weight = Weight::from_parts(20000000000u64, u64::MAX);
@@ -193,6 +203,9 @@ mod benchmarks {
 
 	#[benchmark]
 	fn transact_through_sovereign() -> Result<(), BenchmarkError> {
+		// Set up XCM router for benchmarks
+		setup_xcm_router::<T>();
+
 		let fee_per_second = 1;
 		let extra_weight: Weight = Weight::from_parts(300000000u64, 0);
 		let max_weight: Weight = Weight::from_parts(20000000000u64, u64::MAX);
@@ -251,6 +264,9 @@ mod benchmarks {
 
 	#[benchmark]
 	fn transact_through_signed() -> Result<(), BenchmarkError> {
+		// Set up XCM router for benchmarks
+		setup_xcm_router::<T>();
+
 		let fee_per_second = 1;
 		let extra_weight: Weight = Weight::from_parts(300000000u64, 0);
 		let max_weight: Weight = Weight::from_parts(20000000000u64, u64::MAX);
@@ -298,6 +314,9 @@ mod benchmarks {
 
 	#[benchmark]
 	fn hrmp_manage() -> Result<(), BenchmarkError> {
+		// Set up XCM router for benchmarks
+		setup_xcm_router::<T>();
+
 		let fee_per_second = 1;
 		let extra_weight: Weight = Weight::from_parts(300000000u64, 0);
 		let max_weight: Weight = Weight::from_parts(20000000000u64, u64::MAX);