Snowbridge - V1 - Adds 2 hop transfer to Rococo

cumulus/parachains/integration-tests/emulated/chains/parachains/assets/asset-hub-rococo/src/genesis.rs

@@ -20,10 +20,12 @@ use sp_keyring::Sr25519Keyring as Keyring;
 
 // Cumulus
 use emulated_integration_tests_common::{
-	accounts, build_genesis_storage, collators, snowbridge::ETHER_MIN_BALANCE,
-	xcm_emulator::ConvertLocation, PenpalASiblingSovereignAccount,
-	PenpalATeleportableAssetLocation, PenpalBSiblingSovereignAccount,
-	PenpalBTeleportableAssetLocation, RESERVABLE_ASSET_ID, SAFE_XCM_VERSION, USDT_ID,
+	accounts, build_genesis_storage, collators,
+	snowbridge::{ETHER_MIN_BALANCE, WETH},
+	xcm_emulator::ConvertLocation,
+	PenpalASiblingSovereignAccount, PenpalATeleportableAssetLocation,
+	PenpalBSiblingSovereignAccount, PenpalBTeleportableAssetLocation, RESERVABLE_ASSET_ID,
+	SAFE_XCM_VERSION, USDT_ID,
 };
 use parachains_common::{AccountId, Balance};
 use testnet_parachains_constants::rococo::snowbridge::EthereumNetwork;
@@ -119,6 +121,19 @@ pub fn genesis() -> Storage {
 					true,
 					ETHER_MIN_BALANCE,
 				),
+				// Weth
+				(
+					xcm::v5::Location::new(
+						2,
+						[
+							GlobalConsensus(EthereumNetwork::get()),
+							AccountKey20 { network: None, key: WETH.into() },
+						],
+					),
+					AssetHubWestendSovereignAccount::get(),
+					true,
+					ETHER_MIN_BALANCE,
+				),
 			],
 			..Default::default()
 		},

cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-rococo/src/tests/asset_transfers.rs

@@ -265,6 +265,12 @@ fn send_back_wnds_usdt_and_weth_from_asset_hub_rococo_to_asset_hub_westend() {
 		ByGenesis(ROCOCO_GENESIS_HASH),
 		AssetHubRococo::para_id(),
 	);
+
+	let sov_ahw_on_ahr = AssetHubRococo::sovereign_account_of_parachain_on_other_global_consensus(
+		ByGenesis(WESTEND_GENESIS_HASH),
+		AssetHubWestend::para_id(),
+	);
+
 	AssetHubWestend::mint_asset(
 		<AssetHubWestend as Chain>::RuntimeOrigin::signed(AssetHubWestendAssetOwner::get()),
 		USDT_ID,
@@ -274,14 +280,25 @@ fn send_back_wnds_usdt_and_weth_from_asset_hub_rococo_to_asset_hub_westend() {
 	AssetHubWestend::mint_foreign_asset(
 		<AssetHubWestend as Chain>::RuntimeOrigin::signed(snowbridge_sovereign()),
 		bridged_weth_at_ah.clone(),
-		sov_ahr_on_ahw,
+		sov_ahr_on_ahw.clone(),
 		amount_to_send * 2,
 	);
+	AssetHubRococo::mint_foreign_asset(
+		<AssetHubRococo as Chain>::RuntimeOrigin::signed(sov_ahw_on_ahr.clone()),
+		bridged_weth_at_ah.clone(),
+		sov_ahr_on_ahw,
+		prefund_amount,
+	);
+	AssetHubRococo::mint_foreign_asset(
+		<AssetHubRococo as Chain>::RuntimeOrigin::signed(sov_ahw_on_ahr),
+		bridged_weth_at_ah.clone(),
+		sender.clone(),
+		prefund_amount,
+	);
 
 	// set up source chain AH Rococo:
 	// create wETH and USDT foreign assets on Rococo and prefund sender's account
 	let prefund_accounts = vec![(sender.clone(), amount_to_send * 2)];
-	create_foreign_on_ah_rococo(bridged_weth_at_ah.clone(), true, prefund_accounts.clone());
 	create_foreign_on_ah_rococo(bridged_usdt_at_asset_hub_rococo.clone(), true, prefund_accounts);
 
 	// check balances before

cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-westend/src/lib.rs

@@ -18,6 +18,7 @@ mod imports {
 	// Substrate
 	pub use codec::Encode;
 	pub use frame_support::{assert_err, assert_ok, pallet_prelude::DispatchResult, BoundedVec};
+	pub use sp_core::H160;
 	pub use sp_runtime::DispatchError;
 
 	// Polkadot

cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-westend/src/tests/asset_transfers.rs

@@ -210,7 +210,6 @@ fn send_wnds_usdt_and_weth_from_asset_hub_westend_to_asset_hub_rococo() {
 		sender.clone(),
 		amount * 2,
 	);
-	create_foreign_on_ah_rococo(bridged_weth_at_ah.clone(), true);
 	create_foreign_on_ah_rococo(bridged_usdt_at_asset_hub_rococo.clone(), true);
 	create_pool_with_native_on!(
 		AssetHubRococo,

cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-westend/src/tests/mod.rs

@@ -44,6 +44,16 @@ pub(crate) fn asset_hub_rococo_location() -> Location {
 	)
 }
 
+pub(crate) fn asset_hub_westend_global_location() -> Location {
+	Location::new(
+		2,
+		[
+			GlobalConsensus(ByGenesis(WESTEND_GENESIS_HASH)),
+			Parachain(AssetHubWestend::para_id().into()),
+		],
+	)
+}
+
 pub(crate) fn bridge_hub_rococo_location() -> Location {
 	Location::new(
 		2,

cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-westend/src/tests/register_bridged_assets.rs

@@ -38,11 +38,12 @@ fn register_westend_asset_on_rah_from_wah() {
 #[test]
 fn register_ethereum_asset_on_rah_from_wah() {
 	// Ethereum asset when bridged to Rococo Asset Hub.
+	let token_id = H160::random();
 	let bridged_asset_at_rah = Location::new(
 		2,
 		[
 			GlobalConsensus(Ethereum { chain_id: SEPOLIA_ID }),
-			AccountKey20 { network: None, key: WETH },
+			AccountKey20 { network: None, key: token_id.into() },
 		],
 	);
 	// Register above asset on Rococo AH from Westend AH.