Inbound queue v2

Cargo.toml

@@ -51,6 +51,7 @@ members = [
 	"bridges/snowbridge/pallets/inbound-queue",
 	"bridges/snowbridge/pallets/inbound-queue-v2",
 	"bridges/snowbridge/pallets/inbound-queue-v2/fixtures",
+	"bridges/snowbridge/pallets/inbound-queue-v2/runtime-api",
 	"bridges/snowbridge/pallets/inbound-queue/fixtures",
 	"bridges/snowbridge/pallets/outbound-queue",
 	"bridges/snowbridge/pallets/outbound-queue-v2",

bridges/snowbridge/pallets/inbound-queue-v2/Cargo.toml

@@ -45,6 +45,7 @@ frame-benchmarking = { workspace = true, default-features = true }
 sp-keyring = { workspace = true, default-features = true }
 snowbridge-pallet-ethereum-client = { workspace = true, default-features = true }
 hex-literal = { workspace = true, default-features = true }
+hex = { workspace = true, default-features = true }
 
 [features]
 default = ["std"]

bridges/snowbridge/pallets/inbound-queue-v2/runtime-api/Cargo.toml

@@ -0,0 +1,32 @@
+[package]
+name = "snowbridge-inbound-queue-v2-runtime-api"
+description = "Snowbridge Inbound Queue V2 Runtime API"
+version = "0.2.0"
+authors = ["Snowfork <contact@snowfork.com>"]
+edition.workspace = true
+repository.workspace = true
+license = "Apache-2.0"
+categories = ["cryptography::cryptocurrencies"]
+
+[lints]
+workspace = true
+
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[dependencies]
+sp-api = { workspace = true }
+snowbridge-merkle-tree = { workspace = true }
+snowbridge-core = { workspace = true }
+snowbridge-router-primitives = { workspace = true }
+xcm = { workspace = true }
+
+[features]
+default = ["std"]
+std = [
+	"snowbridge-core/std",
+	"snowbridge-merkle-tree/std",
+	"snowbridge-router-primitives/std",
+	"sp-api/std",
+	"xcm/std",
+]

bridges/snowbridge/pallets/inbound-queue-v2/runtime-api/README.md

@@ -0,0 +1,3 @@
+# Ethereum Inbound Queue V2 Runtime API
+
+Provides an API to dry-run inbound messages to get the XCM (and its execution cost) that will be executed on AssetHub.

bridges/snowbridge/pallets/inbound-queue-v2/runtime-api/src/lib.rs

@@ -0,0 +1,15 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: 2023 Snowfork <hello@snowfork.com>
+#![cfg_attr(not(feature = "std"), no_std)]
+
+use snowbridge_core::inbound::Proof;
+use snowbridge_router_primitives::inbound::v2::Message;
+use xcm::latest::Xcm;
+
+sp_api::decl_runtime_apis! {
+	pub trait InboundQueueApiV2
+	{
+		/// Dry runs the provided message on AH to provide the XCM payload and execution cost.
+		fn dry_run(message: Message, proof: Proof) -> (Xcm<()>, u128);
+	}
+}

bridges/snowbridge/pallets/inbound-queue-v2/src/api.rs

@@ -0,0 +1,16 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: 2023 Snowfork <hello@snowfork.com>
+//! Implements the dry-run API.
+
+use crate::{Config, Error};
+use snowbridge_core::inbound::Proof;
+use snowbridge_router_primitives::inbound::v2::{ConvertMessage, Message};
+use xcm::latest::Xcm;
+
+pub fn dry_run<T>(message: Message, _proof: Proof) -> Result<Xcm<()>, Error<T>>
+where
+	T: Config,
+{
+	let xcm = T::MessageConverter::convert(message).map_err(|e| Error::<T>::ConvertMessage(e))?;
+	Ok(xcm)
+}

bridges/snowbridge/pallets/inbound-queue-v2/src/benchmarking/mod.rs

@@ -23,21 +23,6 @@ mod benchmarks {
 			create_message.block_roots_root,
 		);
 
-		let sovereign_account = sibling_sovereign_account::<T>(1000u32.into());
-
-		let minimum_balance = T::Token::minimum_balance();
-
-		// So that the receiving account exists
-		assert_ok!(T::Token::mint_into(&caller, minimum_balance));
-		// Fund the sovereign account (parachain sovereign account) so it can transfer a reward
-		// fee to the caller account
-		assert_ok!(T::Token::mint_into(
-			&sovereign_account,
-			3_000_000_000_000u128
-				.try_into()
-				.unwrap_or_else(|_| panic!("unable to cast sovereign account balance")),
-		));
-
 		#[block]
 		{
 			assert_ok!(InboundQueue::<T>::submit(

bridges/snowbridge/pallets/inbound-queue-v2/src/envelope.rs

@@ -1,28 +1,26 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023 Snowfork <hello@snowfork.com>
-use snowbridge_core::{inbound::Log, ChannelId};
+use snowbridge_core::inbound::Log;
 
-use sp_core::{RuntimeDebug, H160, H256};
+use sp_core::{RuntimeDebug, H160};
 use sp_std::prelude::*;
 
 use alloy_primitives::B256;
 use alloy_sol_types::{sol, SolEvent};
 
 sol! {
-	event OutboundMessageAccepted(bytes32 indexed channel_id, uint64 nonce, bytes32 indexed message_id, bytes payload);
+	event OutboundMessageAccepted(uint64 indexed nonce, uint128 fee, bytes payload);
 }
 
 /// An inbound message that has had its outer envelope decoded.
 #[derive(Clone, RuntimeDebug)]
 pub struct Envelope {
 	/// The address of the outbound queue on Ethereum that emitted this message as an event log
 	pub gateway: H160,
-	/// The message Channel
-	pub channel_id: ChannelId,
 	/// A nonce for enforcing replay protection and ordering.
 	pub nonce: u64,
-	/// An id for tracing the message on its route (has no role in bridge consensus)
-	pub message_id: H256,
+	/// Total fee paid in Ether on Ethereum, should cover all the cost
+	pub fee: u128,
 	/// The inner payload generated from the source application.
 	pub payload: Vec<u8>,
 }
@@ -41,9 +39,8 @@ impl TryFrom<&Log> for Envelope {
 
 		Ok(Self {
 			gateway: log.address,
-			channel_id: ChannelId::from(event.channel_id.as_ref()),
 			nonce: event.nonce,
-			message_id: H256::from(event.message_id.as_ref()),
+			fee: event.fee,
 			payload: event.payload,
 		})
 	}