Register token with inbound fixture (#106)

* Register token with inbound fixture * Import snowbridge-pallet-inbound-queue-fixtures * Cleanup Cargo.toml * Update emulated test * Fix emulated test * Rename to register_token
Snowfork · Jan 26, 2024 · e151ad1 · e151ad1
1 parent b4f8339
commit e151ad1
Show file tree

Hide file tree

Showing 5 changed files with 70 additions and 43 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cumulus/parachains/integration-tests/emulated/common/src/lib.rs b/cumulus/parachains/integration-tests/emulated/common/src/lib.rs
@@ -100,7 +100,7 @@ pub mod accounts {
 	pub const CHARLIE: &str = "Charlie";
 	pub const DAVE: &str = "Dave";
 	pub const EVE: &str = "Eve";
-	pub const FERDIE: &str = "Ferdei";
+	pub const FERDIE: &str = "Ferdie";
 	pub const ALICE_STASH: &str = "Alice//stash";
 	pub const BOB_STASH: &str = "Bob//stash";
 	pub const CHARLIE_STASH: &str = "Charlie//stash";

diff --git a/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-rococo/Cargo.toml b/cumulus/parachains/integration-tests/emulated/tests/bridges/bridge-hub-rococo/Cargo.toml
@@ -49,5 +49,6 @@ asset-hub-rococo-runtime = { path = "../../../../../runtimes/assets/asset-hub-ro
 snowbridge-core = { path = "../../../../../../../../parachain/primitives/core", default-features = false }
 snowbridge-router-primitives = { path = "../../../../../../../../parachain/primitives/router", default-features = false }
 snowbridge-pallet-system = { path = "../../../../../../../../parachain/pallets/system", default-features = false }
-snowbridge-pallet-inbound-queue = { path = "../../../../../../../../parachain/pallets/inbound-queue", default-features = false }
 snowbridge-pallet-outbound-queue = { path = "../../../../../../../../parachain/pallets/outbound-queue", default-features = false }
+snowbridge-pallet-inbound-queue = { path = "../../../../../../../../parachain/pallets/inbound-queue", default-features = false }
+snowbridge-pallet-inbound-queue-fixtures = { path = "../../../../../../../../parachain/pallets/inbound-queue/fixtures" }
diff --git a/...chains/integration-tests/emulated/tests/bridges/bridge-hub-rococo/src/tests/snowbridge.rs b/...chains/integration-tests/emulated/tests/bridges/bridge-hub-rococo/src/tests/snowbridge.rs
@@ -13,12 +13,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 use crate::*;
+use bridge_hub_rococo_runtime::EthereumBeaconClient;
 use codec::{Decode, Encode};
 use emulated_integration_tests_common::xcm_emulator::ConvertLocation;
 use frame_support::pallet_prelude::TypeInfo;
 use hex_literal::hex;
 use parachains_common::rococo::snowbridge::EthereumNetwork;
+use rococo_westend_system_emulated_network::BridgeHubRococoParaSender as BridgeHubRococoSender;
 use snowbridge_core::outbound::OperatingMode;
+use snowbridge_pallet_inbound_queue_fixtures::{
+	register_token::make_register_token_message, send_token::make_send_token_message,
+};
 use snowbridge_pallet_system;
 use snowbridge_router_primitives::inbound::{
 	Command, Destination, GlobalConsensusEthereumConvertsFor, MessageV1, VersionedMessage,
@@ -187,21 +192,26 @@ fn register_weth_token_from_ethereum_to_asset_hub() {
 	// Fund AssetHub sovereign account so that it can pay execution fees.
 	BridgeHubRococo::fund_para_sovereign(AssetHubRococo::para_id().into(), INITIAL_FUND);
 
-	let message_id: H256 = [1; 32].into();
-
 	BridgeHubRococo::execute_with(|| {
 		type RuntimeEvent = <BridgeHubRococo as Chain>::RuntimeEvent;
+		type RuntimeOrigin = <BridgeHubRococo as Chain>::RuntimeOrigin;
 		type EthereumInboundQueue =
 			<BridgeHubRococo as BridgeHubRococoPallet>::EthereumInboundQueue;
-		let message = VersionedMessage::V1(MessageV1 {
-			chain_id: CHAIN_ID,
-			command: Command::RegisterToken { token: WETH.into(), fee: XCM_FEE },
-		});
-		let (xcm, fee) = EthereumInboundQueue::do_convert(message_id, message).unwrap();
 
-		assert_ok!(EthereumInboundQueue::burn_fees(AssetHubRococo::para_id().into(), fee));
+		let register_asset_message = make_register_token_message();
 
-		let _ = EthereumInboundQueue::send_xcm(xcm, AssetHubRococo::para_id().into()).unwrap();
+		EthereumBeaconClient::store_execution_header(
+			register_asset_message.message.proof.block_hash,
+			register_asset_message.execution_header,
+			0,
+			H256::default(),
+		);
+
+		EthereumInboundQueue::submit(
+			RuntimeOrigin::signed(BridgeHubRococoSender::get()),
+			register_asset_message.message,
+		)
+		.unwrap();
 
 		assert_expected_events!(
 			BridgeHubRococo,
@@ -346,36 +356,42 @@ fn send_token_from_ethereum_to_asset_hub() {
 	// Fund ethereum sovereign on AssetHub
 	AssetHubRococo::fund_accounts(vec![(AssetHubRococoReceiver::get(), INITIAL_FUND)]);
 
-	let message_id: H256 = [1; 32].into();
-
 	BridgeHubRococo::execute_with(|| {
 		type RuntimeEvent = <BridgeHubRococo as Chain>::RuntimeEvent;
+		type RuntimeOrigin = <BridgeHubRococo as Chain>::RuntimeOrigin;
 		type EthereumInboundQueue =
 			<BridgeHubRococo as BridgeHubRococoPallet>::EthereumInboundQueue;
-		// Construct RegisterToken message
-		let message = VersionedMessage::V1(MessageV1 {
-			chain_id: CHAIN_ID,
-			command: Command::RegisterToken { token: WETH.into(), fee: XCM_FEE },
-		});
-		// Convert the message to XCM
-		let (xcm, _) = EthereumInboundQueue::do_convert(message_id, message).unwrap();
-		// Send the XCM
-		let _ = EthereumInboundQueue::send_xcm(xcm, AssetHubRococo::para_id().into()).unwrap();
+
+		let register_asset_message = make_register_token_message();
+
+		EthereumBeaconClient::store_execution_header(
+			register_asset_message.message.proof.block_hash,
+			register_asset_message.execution_header,
+			0,
+			H256::default(),
+		);
+
+		EthereumInboundQueue::submit(
+			RuntimeOrigin::signed(BridgeHubRococoSender::get()),
+			register_asset_message.message,
+		)
+		.unwrap();
 
 		// Construct SendToken message
-		let message = VersionedMessage::V1(MessageV1 {
-			chain_id: CHAIN_ID,
-			command: Command::SendToken {
-				token: WETH.into(),
-				destination: Destination::AccountId32 { id: AssetHubRococoReceiver::get().into() },
-				amount: 1_000_000_000,
-				fee: XCM_FEE,
-			},
-		});
-		// Convert the message to XCM
-		let (xcm, _) = EthereumInboundQueue::do_convert(message_id, message).unwrap();
-		// Send the XCM
-		let _ = EthereumInboundQueue::send_xcm(xcm, AssetHubRococo::para_id().into()).unwrap();
+		let send_token_message = make_send_token_message();
+
+		EthereumBeaconClient::store_execution_header(
+			send_token_message.message.proof.block_hash,
+			send_token_message.execution_header,
+			0,
+			H256::default(),
+		);
+
+		EthereumInboundQueue::submit(
+			RuntimeOrigin::signed(BridgeHubRococoSender::get()),
+			send_token_message.message,
+		)
+		.unwrap();
 
 		// Check that the message was sent
 		assert_expected_events!(
@@ -436,7 +452,8 @@ fn send_weth_asset_from_asset_hub_to_ethereum() {
 			command: Command::RegisterToken { token: WETH.into(), fee: XCM_FEE },
 		});
 		// Converts the versioned message to XCM
-		let (xcm, _) = EthereumInboundQueue::do_convert(message_id_register_token, message).unwrap();
+		let (xcm, _) =
+			EthereumInboundQueue::do_convert(message_id_register_token, message).unwrap();
 		let _ = EthereumInboundQueue::send_xcm(xcm, AssetHubRococo::para_id().into()).unwrap();
 
 		// Check that the register token message was sent using xcm

diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs
@@ -490,13 +490,6 @@ impl pallet_utility::Config for Runtime {
 }
 
 // Ethereum Bridge
-
-#[cfg(not(feature = "runtime-benchmarks"))]
-parameter_types! {
-	pub storage EthereumGatewayAddress: H160 = H160::zero();
-}
-
-#[cfg(feature = "runtime-benchmarks")]
 parameter_types! {
 	pub storage EthereumGatewayAddress: H160 = H160(hex_literal::hex!("EDa338E4dC46038493b885327842fD3E301CaB39"));
 }