XCM v5

bridges/modules/xcm-bridge-hub-router/src/mock.rs

@@ -141,8 +141,8 @@ impl InspectMessageQueues for TestToBridgeHubSender {
 				.iter()
 				.map(|(location, message)| {
 					(
-						VersionedLocation::V4(location.clone()),
-						vec![VersionedXcm::V4(message.clone())],
+						VersionedLocation::from(location.clone()),
+						vec![VersionedXcm::from(message.clone())],
 					)
 				})
 				.collect()

bridges/modules/xcm-bridge-hub/src/mock.rs

@@ -38,7 +38,7 @@ use sp_runtime::{
 	AccountId32, BuildStorage, StateVersion,
 };
 use sp_std::cell::RefCell;
-use xcm::prelude::*;
+use xcm::{latest::ROCOCO_GENESIS_HASH, prelude::*};
 use xcm_builder::{
 	AllowUnpaidExecutionFrom, DispatchBlob, DispatchBlobError, FixedWeightBounds,
 	InspectMessageQueues, NetworkExportTable, NetworkExportTableItem, ParentIsPreset,
@@ -160,7 +160,7 @@ parameter_types! {
 	pub BridgedRelayNetworkLocation: Location = (Parent, GlobalConsensus(BridgedRelayNetwork::get())).into();
 	pub BridgedRelativeDestination: InteriorLocation = [Parachain(BRIDGED_ASSET_HUB_ID)].into();
 	pub BridgedUniversalDestination: InteriorLocation = [GlobalConsensus(BridgedRelayNetwork::get()), Parachain(BRIDGED_ASSET_HUB_ID)].into();
-	pub const NonBridgedRelayNetwork: NetworkId = NetworkId::Rococo;
+	pub const NonBridgedRelayNetwork: NetworkId = NetworkId::ByGenesis(ROCOCO_GENESIS_HASH);
 
 	pub const BridgeDeposit: Balance = 100_000;
 

bridges/primitives/messages/src/lane.rs

@@ -108,8 +108,8 @@ impl TypeId for LegacyLaneId {
 /// concatenation (separated by some binary data). I.e.:
 ///
 /// ```nocompile
-/// let endpoint1 = X2(GlobalConsensus(NetworkId::Rococo), Parachain(42));
-/// let endpoint2 = X2(GlobalConsensus(NetworkId::Wococo), Parachain(777));
+/// let endpoint1 = X2(GlobalConsensus(NetworkId::ByGenesis(ROCOCO_GENESIS_HASH)), Parachain(42));
+/// let endpoint2 = X2(GlobalConsensus(NetworkId::ByGenesis(WOCOCO_GENESIS_HASH)), Parachain(777));
 ///
 /// let final_lane_key = if endpoint1 < endpoint2 {
 ///     (endpoint1, VALUES_SEPARATOR, endpoint2)

bridges/primitives/xcm-bridge-hub/src/lib.rs

@@ -359,10 +359,11 @@ impl BridgeLocations {
 #[cfg(test)]
 mod tests {
 	use super::*;
+	use xcm::latest::ROCOCO_GENESIS_HASH;
 
 	const LOCAL_NETWORK: NetworkId = Kusama;
 	const REMOTE_NETWORK: NetworkId = Polkadot;
-	const UNREACHABLE_NETWORK: NetworkId = Rococo;
+	const UNREACHABLE_NETWORK: NetworkId = NetworkId::ByGenesis(ROCOCO_GENESIS_HASH);
 	const SIBLING_PARACHAIN: u32 = 1000;
 	const LOCAL_BRIDGE_HUB: u32 = 1001;
 	const REMOTE_PARACHAIN: u32 = 2000;

bridges/snowbridge/pallets/inbound-queue/src/mock.rs

@@ -19,7 +19,7 @@ use sp_runtime::{
 	BuildStorage, FixedU128, MultiSignature,
 };
 use sp_std::{convert::From, default::Default};
-use xcm::{latest::SendXcm, prelude::*};
+use xcm::{latest::{SendXcm, WESTEND_GENESIS_HASH}, prelude::*};
 use xcm_executor::AssetsInHolding;
 
 use crate::{self as inbound_queue};
@@ -113,8 +113,8 @@ parameter_types! {
 	pub const InitialFund: u128 = 1_000_000_000_000;
 	pub const InboundQueuePalletInstance: u8 = 80;
 	pub UniversalLocation: InteriorLocation =
-		[GlobalConsensus(Westend), Parachain(1002)].into();
-	pub AssetHubFromEthereum: Location = Location::new(1,[GlobalConsensus(Westend),Parachain(1000)]);
+		[GlobalConsensus(ByGenesis(WESTEND_GENESIS_HASH)), Parachain(1002)].into();
+	pub AssetHubFromEthereum: Location = Location::new(1,[GlobalConsensus(ByGenesis(WESTEND_GENESIS_HASH)),Parachain(1000)]);
 }
 
 #[cfg(feature = "runtime-benchmarks")]

bridges/snowbridge/pallets/inbound-queue/src/test.rs

@@ -40,8 +40,8 @@ fn test_submit_happy_path() {
 				.into(),
 			nonce: 1,
 			message_id: [
-				255, 125, 48, 71, 174, 185, 100, 26, 159, 43, 108, 6, 116, 218, 55, 155, 223, 143,
-				141, 22, 124, 110, 241, 18, 122, 217, 130, 29, 139, 76, 97, 201,
+				174, 194, 98, 92, 98, 143, 193, 182, 195, 116, 216, 64, 223, 69, 20, 231, 217, 71,
+				255, 119, 96, 203, 117, 105, 208, 227, 39, 38, 67, 124, 223, 180,
 			],
 			fee_burned: 110000000000,
 		}

bridges/snowbridge/pallets/system/src/benchmarking.rs

@@ -169,7 +169,7 @@ mod benchmarks {
 		T::Token::mint_into(&caller, amount)?;
 
 		let relay_token_asset_id: Location = Location::parent();
-		let asset = Box::new(VersionedLocation::V4(relay_token_asset_id));
+		let asset = Box::new(VersionedLocation::from(relay_token_asset_id));
 		let asset_metadata = AssetMetadata {
 			name: "wnd".as_bytes().to_vec().try_into().unwrap(),
 			symbol: "wnd".as_bytes().to_vec().try_into().unwrap(),

bridges/snowbridge/pallets/system/src/lib.rs

@@ -269,12 +269,12 @@ pub mod pallet {
 	/// Lookup table for foreign token ID to native location relative to ethereum
 	#[pallet::storage]
 	pub type ForeignToNativeId<T: Config> =
-		StorageMap<_, Blake2_128Concat, TokenId, xcm::v4::Location, OptionQuery>;
+		StorageMap<_, Blake2_128Concat, TokenId, xcm::v5::Location, OptionQuery>;
 
 	/// Lookup table for native location relative to ethereum to foreign token ID
 	#[pallet::storage]
 	pub type NativeToForeignId<T: Config> =
-		StorageMap<_, Blake2_128Concat, xcm::v4::Location, TokenId, OptionQuery>;
+		StorageMap<_, Blake2_128Concat, xcm::v5::Location, TokenId, OptionQuery>;
 
 	#[pallet::genesis_config]
 	#[derive(frame_support::DefaultNoBound)]

bridges/snowbridge/primitives/core/src/location.rs

@@ -98,27 +98,28 @@ impl DescribeLocation for DescribeTokenTerminal {
 mod tests {
 	use crate::TokenIdOf;
 	use xcm::prelude::{
-		GeneralIndex, GeneralKey, GlobalConsensus, Junction::*, Location, NetworkId::*,
+		GeneralIndex, GeneralKey, GlobalConsensus, Junction::*, Location, NetworkId::ByGenesis,
 		PalletInstance, Parachain,
 	};
 	use xcm_executor::traits::ConvertLocation;
+	use xcm::latest::WESTEND_GENESIS_HASH;
 
 	#[test]
 	fn test_token_of_id() {
 		let token_locations = [
 			// Relay Chain cases
 			// Relay Chain relative to Ethereum
-			Location::new(1, [GlobalConsensus(Westend)]),
+			Location::new(1, [GlobalConsensus(ByGenesis(WESTEND_GENESIS_HASH))]),
 			// Parachain cases
 			// Parachain relative to Ethereum
-			Location::new(1, [GlobalConsensus(Westend), Parachain(2000)]),
+			Location::new(1, [GlobalConsensus(ByGenesis(WESTEND_GENESIS_HASH)), Parachain(2000)]),
 			// Parachain general index
-			Location::new(1, [GlobalConsensus(Westend), Parachain(2000), GeneralIndex(1)]),
+			Location::new(1, [GlobalConsensus(ByGenesis(WESTEND_GENESIS_HASH)), Parachain(2000), GeneralIndex(1)]),
 			// Parachain general key
 			Location::new(
 				1,
 				[
-					GlobalConsensus(Westend),
+					GlobalConsensus(ByGenesis(WESTEND_GENESIS_HASH)),
 					Parachain(2000),
 					GeneralKey { length: 32, data: [0; 32] },
 				],
@@ -127,7 +128,7 @@ mod tests {
 			Location::new(
 				1,
 				[
-					GlobalConsensus(Westend),
+					GlobalConsensus(ByGenesis(WESTEND_GENESIS_HASH)),
 					Parachain(2000),
 					AccountKey20 { network: None, key: [0; 20] },
 				],
@@ -136,24 +137,24 @@ mod tests {
 			Location::new(
 				1,
 				[
-					GlobalConsensus(Westend),
+					GlobalConsensus(ByGenesis(WESTEND_GENESIS_HASH)),
 					Parachain(2000),
 					AccountId32 { network: None, id: [0; 32] },
 				],
 			),
 			// Parchain Pallet instance cases
 			// Parachain pallet instance
-			Location::new(1, [GlobalConsensus(Westend), Parachain(2000), PalletInstance(8)]),
+			Location::new(1, [GlobalConsensus(ByGenesis(WESTEND_GENESIS_HASH)), Parachain(2000), PalletInstance(8)]),
 			// Parachain Pallet general index
 			Location::new(
 				1,
-				[GlobalConsensus(Westend), Parachain(2000), PalletInstance(8), GeneralIndex(1)],
+				[GlobalConsensus(ByGenesis(WESTEND_GENESIS_HASH)), Parachain(2000), PalletInstance(8), GeneralIndex(1)],
 			),
 			// Parachain Pallet general key
 			Location::new(
 				1,
 				[
-					GlobalConsensus(Westend),
+					GlobalConsensus(ByGenesis(WESTEND_GENESIS_HASH)),
 					Parachain(2000),
 					PalletInstance(8),
 					GeneralKey { length: 32, data: [0; 32] },
@@ -163,7 +164,7 @@ mod tests {
 			Location::new(
 				1,
 				[
-					GlobalConsensus(Westend),
+					GlobalConsensus(ByGenesis(WESTEND_GENESIS_HASH)),
 					Parachain(2000),
 					PalletInstance(8),
 					AccountKey20 { network: None, key: [0; 20] },
@@ -173,7 +174,7 @@ mod tests {
 			Location::new(
 				1,
 				[
-					GlobalConsensus(Westend),
+					GlobalConsensus(ByGenesis(WESTEND_GENESIS_HASH)),
 					Parachain(2000),
 					PalletInstance(8),
 					AccountId32 { network: None, id: [0; 32] },

bridges/snowbridge/primitives/router/src/inbound/mod.rs

@@ -7,7 +7,7 @@ mod tests;
 
 use codec::{Decode, Encode};
 use core::marker::PhantomData;
-use frame_support::{traits::tokens::Balance as BalanceT, weights::Weight, PalletError};
+use frame_support::{traits::tokens::Balance as BalanceT, PalletError};
 use scale_info::TypeInfo;
 use snowbridge_core::TokenId;
 use sp_core::{Get, RuntimeDebug, H160, H256};
@@ -279,7 +279,6 @@ where
 			// Call create_asset on foreign assets pallet.
 			Transact {
 				origin_kind: OriginKind::Xcm,
-				require_weight_at_most: Weight::from_parts(400_000_000, 8_000),
 				call: (
 					create_call_index,
 					asset_id,
@@ -461,8 +460,10 @@ where
 {
 	fn convert_location(location: &Location) -> Option<AccountId> {
 		match location.unpack() {
-			(_, [GlobalConsensus(Ethereum { chain_id })]) =>
+			(2, [GlobalConsensus(Ethereum { chain_id })]) =>
 				Some(Self::from_chain_id(chain_id).into()),
+			(2, [GlobalConsensus(Ethereum { chain_id }), AccountKey20 { network: _, key }]) =>
+				Some(Self::from_chain_id_with_key(chain_id, *key).into()),
 			_ => None,
 		}
 	}
@@ -472,4 +473,7 @@ impl<AccountId> GlobalConsensusEthereumConvertsFor<AccountId> {
 	pub fn from_chain_id(chain_id: &u64) -> [u8; 32] {
 		(b"ethereum-chain", chain_id).using_encoded(blake2_256)
 	}
+	pub fn from_chain_id_with_key(chain_id: &u64, key: [u8; 20]) -> [u8; 32] {
+		(b"ethereum-chain", chain_id, key).using_encoded(blake2_256)
+	}
 }

bridges/snowbridge/primitives/router/src/outbound/tests.rs

@@ -6,6 +6,7 @@ use snowbridge_core::{
 };
 use sp_std::default::Default;
 use xcm::prelude::SendError as XcmSendError;
+use xcm::latest::{ROCOCO_GENESIS_HASH, WESTEND_GENESIS_HASH};
 
 use super::*;
 
@@ -61,7 +62,7 @@ impl SendMessageFeeProvider for MockErrOutboundQueue {
 pub struct MockTokenIdConvert;
 impl MaybeEquivalence<TokenId, Location> for MockTokenIdConvert {
 	fn convert(_id: &TokenId) -> Option<Location> {
-		Some(Location::new(1, [GlobalConsensus(Westend)]))
+		Some(Location::new(1, [GlobalConsensus(ByGenesis(WESTEND_GENESIS_HASH))]))
 	}
 	fn convert_back(_loc: &Location) -> Option<TokenId> {
 		None
@@ -1109,7 +1110,7 @@ fn xcm_converter_transfer_native_token_success() {
 	let beneficiary_address: [u8; 20] = hex!("2000000000000000000000000000000000000000");
 
 	let amount = 1000000;
-	let asset_location = Location::new(1, [GlobalConsensus(Westend)]);
+	let asset_location = Location::new(1, [GlobalConsensus(ByGenesis(WESTEND_GENESIS_HASH))]);
 	let token_id = TokenIdOf::convert_location(&asset_location).unwrap();
 
 	let assets: Assets = vec![Asset { id: AssetId(asset_location), fun: Fungible(amount) }].into();
@@ -1142,7 +1143,7 @@ fn xcm_converter_transfer_native_token_with_invalid_location_will_fail() {
 
 	let amount = 1000000;
 	// Invalid asset location from a different consensus
-	let asset_location = Location { parents: 2, interior: [GlobalConsensus(Rococo)].into() };
+	let asset_location = Location { parents: 2, interior: [GlobalConsensus(ByGenesis(ROCOCO_GENESIS_HASH))].into() };
 
 	let assets: Assets = vec![Asset { id: AssetId(asset_location), fun: Fungible(amount) }].into();
 	let filter: AssetFilter = assets.clone().into();
@@ -1221,7 +1222,7 @@ fn exporter_validate_with_invalid_universal_source_does_not_alter_universal_sour
 	let network = BridgedNetwork::get();
 	let destination: InteriorLocation = Here.into();
 
-	let universal_source: InteriorLocation = [GlobalConsensus(Westend), Parachain(1000)].into();
+	let universal_source: InteriorLocation = [GlobalConsensus(ByGenesis(WESTEND_GENESIS_HASH)), Parachain(1000)].into();
 
 	let token_address: [u8; 20] = hex!("1000000000000000000000000000000000000000");
 	let beneficiary_address: [u8; 20] = hex!("2000000000000000000000000000000000000000");

bridges/snowbridge/runtime/test-common/src/lib.rs

@@ -15,10 +15,7 @@ use snowbridge_pallet_ethereum_client_fixtures::*;
 use sp_core::{Get, H160, U256};
 use sp_keyring::AccountKeyring::*;
 use sp_runtime::{traits::Header, AccountId32, DigestItem, SaturatedConversion, Saturating};
-use xcm::{
-	latest::prelude::*,
-	v3::Error::{self, Barrier},
-};
+use xcm::latest::prelude::*;
 use xcm_executor::XcmExecutor;
 
 type RuntimeHelper<Runtime, AllPalletsWithoutSystem = ()> =
@@ -374,7 +371,7 @@ pub fn send_unpaid_transfer_token_message<Runtime, XcmConfig>(
 				Weight::zero(),
 			);
 			// check error is barrier
-			assert_err!(outcome.ensure_complete(), Barrier);
+			assert_err!(outcome.ensure_complete(), XcmError::Barrier);
 		});
 }
 
@@ -388,7 +385,7 @@ pub fn send_transfer_token_message_failure<Runtime, XcmConfig>(
 	weth_contract_address: H160,
 	destination_address: H160,
 	fee_amount: u128,
-	expected_error: Error,
+	expected_error: XcmError,
 ) where
 	Runtime: frame_system::Config
 		+ pallet_balances::Config

cumulus/pallets/xcmp-queue/src/lib.rs

@@ -1036,7 +1036,7 @@ impl<T: Config> InspectMessageQueues for Pallet<T> {
 				}
 
 				(
-					VersionedLocation::V4((Parent, Parachain(para_id.into())).into()),
+					VersionedLocation::from(Location::new(1, Parachain(para_id.into()))),
 					decoded_messages,
 				)
 			})