Update Substrate/Polkadot/Cumulus/Frontier dependency to 0.9.38

client/rpc-core/debug/Cargo.toml

@@ -16,4 +16,4 @@ moonbeam-rpc-core-types = { workspace = true }
 serde = { workspace = true, features = [ "derive" ] }
 serde_json = { workspace = true }
 
-sp-core = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.37" }
+sp-core = { workspace = true, features = [ "std" ] }

client/rpc/debug/Cargo.toml

@@ -35,4 +35,5 @@ ethereum-types = { workspace = true, features = [ "std" ] }
 fc-consensus = { workspace = true }
 fc-db = { workspace = true }
 fc-rpc = { workspace = true, features = [ "rpc-binary-search-estimate" ] }
+fc-storage = { workspace = true }
 fp-rpc = { workspace = true, features = [ "std" ] }

client/rpc/debug/src/lib.rs

@@ -308,7 +308,7 @@ where
 					frontier_backend.as_ref(),
 					eth_hash,
 				) {
-					Ok(Some(id)) => Ok(id),
+					Ok(Some(hash)) => Ok(BlockId::Hash(hash)),
 					Ok(_) => Err(internal_err("Block hash not found".to_string())),
 					Err(e) => Err(e),
 				}
@@ -331,16 +331,13 @@ where
 		// Get parent blockid.
 		let parent_block_id = BlockId::Hash(*header.parent_hash());
 
-		let schema = frontier_backend_client::onchain_storage_schema::<B, C, BE>(
-			client.as_ref(),
-			reference_id,
-		);
+		let schema = fc_storage::onchain_storage_schema::<B, C, BE>(client.as_ref(), hash);
 
 		// Using storage overrides we align with `:ethereum_schema` which will result in proper
 		// SCALE decoding in case of migration.
 		let statuses = match overrides.schemas.get(&schema) {
 			Some(schema) => schema
-				.current_transaction_statuses(&reference_id)
+				.current_transaction_statuses(hash)
 				.unwrap_or_default(),
 			_ => {
 				return Err(internal_err(format!(
@@ -446,7 +443,7 @@ where
 			frontier_backend.as_ref(),
 			hash,
 		) {
-			Ok(Some(hash)) => hash,
+			Ok(Some(hash)) => BlockId::Hash(hash),
 			Ok(_) => return Err(internal_err("Block hash not found".to_string())),
 			Err(e) => return Err(e),
 		};
@@ -482,19 +479,17 @@ where
 			));
 		};
 
-		let schema = frontier_backend_client::onchain_storage_schema::<B, C, BE>(
-			client.as_ref(),
-			reference_id,
-		);
+		let schema =
+			fc_storage::onchain_storage_schema::<B, C, BE>(client.as_ref(), reference_hash);
 
 		// Get the block that contains the requested transaction. Using storage overrides we align
 		// with `:ethereum_schema` which will result in proper SCALE decoding in case of migration.
 		let reference_block = match overrides.schemas.get(&schema) {
-			Some(schema) => schema.current_block(&reference_id),
+			Some(schema) => schema.current_block(reference_hash),
 			_ => {
 				return Err(internal_err(format!(
 					"No storage override at {:?}",
-					reference_id
+					reference_hash
 				)))
 			}
 		};

client/rpc/finality/src/lib.rs

@@ -20,7 +20,6 @@ use std::{marker::PhantomData, sync::Arc};
 //TODO ideally we wouldn't depend on BlockId here. Can we change frontier
 // so it's load_hash helper returns an H256 instead of wrapping it in a BlockId?
 use fc_db::Backend as FrontierBackend;
-use sp_api::BlockId;
 use sp_blockchain::HeaderBackend;
 use sp_runtime::traits::Block;
 
@@ -90,8 +89,7 @@ fn is_block_finalized_inner<B: Block<Hash = H256>, C: HeaderBackend<B> + 'static
 	let substrate_hash =
 		match frontier_backend_client::load_hash::<B, C>(client, backend, raw_hash)? {
 			// If we find this hash in the frontier data base, we know it is an eth hash
-			Some(BlockId::Hash(hash)) => hash,
-			Some(BlockId::Number(_)) => panic!("is_canon test only works with hashes."),
+			Some(hash) => hash,
 			// Otherwise, we assume this is a Substrate hash.
 			None => raw_hash,
 		};

client/rpc/manual-xcm/src/lib.rs

@@ -18,6 +18,7 @@ use cumulus_primitives_core::XcmpMessageFormat;
 use jsonrpsee::{core::RpcResult, proc_macros::rpc};
 use parity_scale_codec::Encode;
 use xcm::latest::prelude::*;
+use xcm::opaque::lts::Weight;
 
 /// This RPC interface is used to manually submit XCM messages that will be injected into a
 /// parachain-enabled runtime. This allows testing XCM logic in a controlled way in integration
@@ -57,20 +58,19 @@ impl ManualXcmApiServer for ManualXcm {
 		let downward_message_channel = self.downward_message_channel.clone();
 		// If no message is supplied, inject a default one.
 		let msg = if msg.is_empty() {
-			xcm::VersionedXcm::<()>::V2(Xcm(vec![
-				ReserveAssetDeposited((Parent, 10000000000000).into()),
+			xcm::VersionedXcm::<()>::V3(Xcm(vec![
+				ReserveAssetDeposited((Parent, 10000000000000u128).into()),
 				ClearOrigin,
 				BuyExecution {
-					fees: (Parent, 10000000000000).into(),
-					weight_limit: Limited(4_000_000_000),
+					fees: (Parent, 10000000000000u128).into(),
+					weight_limit: Limited(Weight::from_parts(4_000_000_000u64, 64 * 1024)),
 				},
 				DepositAsset {
 					assets: All.into(),
-					max_assets: 1,
 					beneficiary: MultiLocation::new(
 						0,
 						X1(AccountKey20 {
-							network: Any,
+							network: None,
 							key: hex_literal::hex!("f24FF3a9CF04c71Dbc94D0b566f7A27B94566cac"),
 						}),
 					),
@@ -98,22 +98,21 @@ impl ManualXcmApiServer for ManualXcm {
 		let msg = if msg.is_empty() {
 			let mut mes = XcmpMessageFormat::ConcatenatedVersionedXcm.encode();
 			mes.append(
-				&mut (xcm::VersionedXcm::<()>::V2(Xcm(vec![
+				&mut (xcm::VersionedXcm::<()>::V3(Xcm(vec![
 					ReserveAssetDeposited(
-						((Parent, Parachain(sender.into())), 10000000000000).into(),
+						((Parent, Parachain(sender.into())), 10000000000000u128).into(),
 					),
 					ClearOrigin,
 					BuyExecution {
-						fees: ((Parent, Parachain(sender.into())), 10000000000000).into(),
-						weight_limit: Limited(4_000_000_000),
+						fees: ((Parent, Parachain(sender.into())), 10000000000000u128).into(),
+						weight_limit: Limited(Weight::from_parts(4_000_000_000u64, 64 * 1024)),
 					},
 					DepositAsset {
 						assets: All.into(),
-						max_assets: 1,
 						beneficiary: MultiLocation::new(
 							0,
 							X1(AccountKey20 {
-								network: Any,
+								network: None,
 								key: hex_literal::hex!("f24FF3a9CF04c71Dbc94D0b566f7A27B94566cac"),
 							}),
 						),

client/rpc/trace/Cargo.toml

@@ -39,4 +39,5 @@ sp-transaction-pool = { workspace = true }
 fc-consensus = { workspace = true }
 fc-rpc = { workspace = true, features = [ "rpc-binary-search-estimate" ] }
 fc-rpc-core = { workspace = true }
+fc-storage = { workspace = true }
 fp-rpc = { workspace = true }

client/rpc/trace/src/lib.rs

@@ -42,7 +42,7 @@ use sp_blockchain::{
 use sp_runtime::traits::{BlakeTwo256, Block as BlockT};
 
 use ethereum_types::H256;
-use fc_rpc::{frontier_backend_client, OverrideHandle};
+use fc_rpc::OverrideHandle;
 use fp_rpc::EthereumRuntimeRPCApi;
 
 use moonbeam_client_evm_tracing::{
@@ -774,8 +774,6 @@ where
 		substrate_hash: H256,
 		overrides: Arc<OverrideHandle<B>>,
 	) -> TxsTraceRes {
-		let substrate_block_id = BlockId::Hash(substrate_hash);
-
 		// Get Subtrate block data.
 		let api = client.runtime_api();
 		let block_header = client
@@ -786,31 +784,29 @@ where
 					substrate_hash, e
 				)
 			})?
-			.ok_or_else(|| format!("Subtrate block {} don't exist", substrate_block_id))?;
+			.ok_or_else(|| format!("Subtrate block {} don't exist", substrate_hash))?;
 
 		let height = *block_header.number();
 		let substrate_parent_id = BlockId::<B>::Hash(*block_header.parent_hash());
 
-		let schema = frontier_backend_client::onchain_storage_schema::<B, C, BE>(
-			client.as_ref(),
-			substrate_block_id,
-		);
+		let schema =
+			fc_storage::onchain_storage_schema::<B, C, BE>(client.as_ref(), substrate_hash);
 
 		// Get Ethereum block data.
 		let (eth_block, eth_transactions) = match overrides.schemas.get(&schema) {
 			Some(schema) => match (
-				schema.current_block(&substrate_block_id),
-				schema.current_transaction_statuses(&substrate_block_id),
+				schema.current_block(substrate_hash),
+				schema.current_transaction_statuses(substrate_hash),
 			) {
 				(Some(a), Some(b)) => (a, b),
 				_ => {
 					return Err(format!(
 						"Failed to get Ethereum block data for Substrate block {}",
-						substrate_block_id
+						substrate_hash
 					))
 				}
 			},
-			_ => return Err(format!("No storage override at {:?}", substrate_block_id)),
+			_ => return Err(format!("No storage override at {:?}", substrate_hash)),
 		};
 
 		let eth_block_hash = eth_block.header.hash();

node/service/src/client.rs

@@ -320,7 +320,7 @@ impl sc_client_api::StorageProvider<Block, crate::FullBackend> for Client {
 		prefix: Option<&'a StorageKey>,
 		start_key: Option<&StorageKey>,
 	) -> sp_blockchain::Result<
-		KeyIterator<'a, <crate::FullBackend as sc_client_api::Backend<Block>>::State, Block>,
+		KeyIterator<<crate::FullBackend as sc_client_api::Backend<Block>>::State, Block>,
 	> {
 		match_client!(self, storage_keys_iter(hash, prefix, start_key))
 	}
@@ -350,7 +350,7 @@ impl sc_client_api::StorageProvider<Block, crate::FullBackend> for Client {
 		prefix: Option<&'a StorageKey>,
 		start_key: Option<&StorageKey>,
 	) -> sp_blockchain::Result<
-		KeyIterator<'a, <crate::FullBackend as sc_client_api::Backend<Block>>::State, Block>,
+		KeyIterator<<crate::FullBackend as sc_client_api::Backend<Block>>::State, Block>,
 	> {
 		match_client!(
 			self,

node/service/src/lib.rs

@@ -30,7 +30,7 @@ use cumulus_client_network::BlockAnnounceValidator;
 use cumulus_client_service::{
 	prepare_node_config, start_collator, start_full_node, StartCollatorParams, StartFullNodeParams,
 };
-use cumulus_primitives_core::relay_chain::v2::CollatorPair;
+use cumulus_primitives_core::relay_chain::CollatorPair;
 use cumulus_primitives_core::ParaId;
 use cumulus_primitives_parachain_inherent::{
 	MockValidationDataInherentDataProvider, MockXcmConfig,

node/service/src/rpc.rs

@@ -121,30 +121,26 @@ pub struct TracingConfig {
 	pub trace_filter_max_count: u32,
 }
 
-pub fn overrides_handle<C, BE>(client: Arc<C>) -> Arc<OverrideHandle<Block>>
+pub fn overrides_handle<B, C, BE>(client: Arc<C>) -> Arc<OverrideHandle<B>>
 where
-	C: ProvideRuntimeApi<Block> + StorageProvider<Block, BE> + AuxStore,
-	C: HeaderBackend<Block> + HeaderMetadata<Block, Error = BlockChainError>,
-	C: Send + Sync + 'static,
-	C::Api: fp_rpc::EthereumRuntimeRPCApi<Block>,
-	BE: Backend<Block> + 'static,
-	BE::State: StateBackend<BlakeTwo256>,
+	B: BlockT,
+	C: ProvideRuntimeApi<B>,
+	C::Api: EthereumRuntimeRPCApi<B>,
+	C: HeaderBackend<B> + StorageProvider<B, BE> + 'static,
+	BE: Backend<B> + 'static,
 {
 	let mut overrides_map = BTreeMap::new();
 	overrides_map.insert(
 		EthereumStorageSchema::V1,
-		Box::new(SchemaV1Override::new(client.clone()))
-			as Box<dyn StorageOverride<_> + Send + Sync>,
+		Box::new(SchemaV1Override::new(client.clone())) as Box<dyn StorageOverride<_>>,
 	);
 	overrides_map.insert(
 		EthereumStorageSchema::V2,
-		Box::new(SchemaV2Override::new(client.clone()))
-			as Box<dyn StorageOverride<_> + Send + Sync>,
+		Box::new(SchemaV2Override::new(client.clone())) as Box<dyn StorageOverride<_>>,
 	);
 	overrides_map.insert(
 		EthereumStorageSchema::V3,
-		Box::new(SchemaV3Override::new(client.clone()))
-			as Box<dyn StorageOverride<_> + Send + Sync>,
+		Box::new(SchemaV3Override::new(client.clone())) as Box<dyn StorageOverride<_>>,
 	);
 
 	Arc::new(OverrideHandle {

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

@@ -101,7 +101,7 @@ mod tests {
 				PalletInstance(42u8),
 				AccountKey20 {
 					key: [0; 20],
-					network: NetworkId::Any,
+					network: None,
 				},
 			),
 		};

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

@@ -26,6 +26,7 @@ impl<AssetTrap: DropAssets, T: crate::Config> DropAssets for AssetTrapWrapper<As
 	fn drop_assets(
 		origin: &xcm::latest::MultiLocation,
 		mut assets: xcm_executor::Assets,
+		context: &XcmContext,
 	) -> xcm::latest::Weight {
 		// Remove all erc20 assets
 		let assets_to_remove: Vec<_> = assets
@@ -42,6 +43,6 @@ impl<AssetTrap: DropAssets, T: crate::Config> DropAssets for AssetTrapWrapper<As
 				},
 			));
 		}
-		AssetTrap::drop_assets(origin, assets)
+		AssetTrap::drop_assets(origin, assets, context)
 	}
 }

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

@@ -29,7 +29,6 @@ use frame_support::pallet;
 pub use erc20_trap::AssetTrapWrapper;
 pub use pallet::*;
 pub use xcm_exec_filter::XcmExecuteFilterWrapper;
-pub use xcm_holding_ext::XcmExecutorWrapper;
 
 #[pallet]
 pub mod pallet {
@@ -43,7 +42,9 @@ pub mod pallet {
 	use pallet_evm::Runner;
 	use sp_core::{H160, H256, U256};
 	use sp_std::vec::Vec;
-	use xcm::latest::{Error as XcmError, MultiAsset, MultiLocation, Result as XcmResult};
+	use xcm::latest::{
+		Error as XcmError, MultiAsset, MultiLocation, Result as XcmResult, XcmContext,
+	};
 	use xcm_executor::traits::{Convert, Error as MatchError, MatchesFungibles};
 	use xcm_executor::Assets;
 
@@ -126,7 +127,11 @@ pub mod pallet {
 		// For optimization reasons, the asset we want to deposit has not really been withdrawn,
 		// we have just traced from which account it should have been withdrawn.
 		// So we will retrieve these information and make the transfer from the origin account.
-		fn deposit_asset(what: &MultiAsset, who: &MultiLocation) -> XcmResult {
+		fn deposit_asset(
+			what: &MultiAsset,
+			who: &MultiLocation,
+			_context: &XcmContext,
+		) -> XcmResult {
 			let (contract_address, amount) =
 				Erc20Matcher::<T::Erc20MultilocationPrefix>::matches_fungibles(what)?;
 
@@ -164,6 +169,7 @@ pub mod pallet {
 			asset: &MultiAsset,
 			from: &MultiLocation,
 			to: &MultiLocation,
+			_context: &XcmContext,
 		) -> Result<Assets, XcmError> {
 			let (contract_address, amount) =
 				Erc20Matcher::<T::Erc20MultilocationPrefix>::matches_fungibles(asset)?;
@@ -190,7 +196,11 @@ pub mod pallet {
 		// one (1 to withdraw the asset and a second one to deposit it).
 		// In order to perform only one evm call, we just trace the origin of the asset,
 		// and then the transfer will only really be performed in the deposit instruction.
-		fn withdraw_asset(what: &MultiAsset, who: &MultiLocation) -> Result<Assets, XcmError> {
+		fn withdraw_asset(
+			what: &MultiAsset,
+			who: &MultiLocation,
+			_context: Option<&XcmContext>,
+		) -> Result<Assets, XcmError> {
 			let (contract_address, amount) =
 				Erc20Matcher::<T::Erc20MultilocationPrefix>::matches_fungibles(what)?;
 			let who = T::AccountIdConverter::convert_ref(who)

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

@@ -76,6 +76,8 @@ where
 						fun: WildNonFungible,
 						..
 					}) => {}
+					MultiAssetFilter::Wild(AllCounted(_amount)) => {}
+					MultiAssetFilter::Wild(AllOfCounted { .. }) => {}
 					MultiAssetFilter::Definite(_assets) => {
 						// If we wanted a perfect simulation, we would have to remove the assets
 						//  defined according to their amounts, but this would involve calculations
@@ -107,6 +109,8 @@ where
 						fun: WildNonFungible,
 						..
 					}) => {}
+					MultiAssetFilter::Wild(AllCounted(_amount)) => {}
+					MultiAssetFilter::Wild(AllOfCounted { .. }) => {}
 					MultiAssetFilter::Definite(assets) => {
 						for asset in assets.inner() {
 							if erc20_assets.contains(&asset.id) {