Snowbridge V2 - Unified Rewards

Cargo.toml

@@ -56,6 +56,7 @@ members = [
 	"bridges/snowbridge/pallets/outbound-queue-v2",
 	"bridges/snowbridge/pallets/outbound-queue-v2/runtime-api",
 	"bridges/snowbridge/pallets/outbound-queue/runtime-api",
+	"bridges/snowbridge/pallets/rewards",
 	"bridges/snowbridge/pallets/system",
 	"bridges/snowbridge/pallets/system/runtime-api",
 	"bridges/snowbridge/primitives/beacon",
@@ -1217,6 +1218,7 @@ snowbridge-pallet-inbound-queue-v2 = { path = "bridges/snowbridge/pallets/inboun
 snowbridge-pallet-outbound-queue = { path = "bridges/snowbridge/pallets/outbound-queue", default-features = false }
 snowbridge-pallet-outbound-queue-v2 = { path = "bridges/snowbridge/pallets/outbound-queue-v2", default-features = false }
 snowbridge-pallet-system = { path = "bridges/snowbridge/pallets/system", default-features = false }
+snowbridge-pallet-rewards = { path = "bridges/snowbridge/pallets/rewards", default-features = false }
 snowbridge-router-primitives = { path = "bridges/snowbridge/primitives/router", default-features = false }
 snowbridge-runtime-common = { path = "bridges/snowbridge/runtime/runtime-common", default-features = false }
 snowbridge-runtime-test-common = { path = "bridges/snowbridge/runtime/test-common", default-features = false }

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

@@ -44,6 +44,7 @@ snowbridge-pallet-inbound-queue-fixtures-v2 = { optional = true, workspace = tru
 frame-benchmarking = { workspace = true, default-features = true }
 sp-keyring = { workspace = true, default-features = true }
 snowbridge-pallet-ethereum-client = { workspace = true, default-features = true }
+snowbridge-pallet-rewards = { workspace = true, default-features = true }
 hex-literal = { workspace = true, default-features = true }
 
 [features]

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 <[email protected]>
-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,
 		})
 	}