paritytech · paritytech-release-backport-bot · Mar 31, 2025
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bridges/snowbridge/pallets/ethereum-client/Cargo.toml b/bridges/snowbridge/pallets/ethereum-client/Cargo.toml
@@ -32,17 +32,28 @@ sp-io = { optional = true, workspace = true }
 sp-runtime.workspace = true
 sp-std.workspace = true
 pallet-timestamp = { optional = true, workspace = true }
+<<<<<<< HEAD
 snowbridge-beacon-primitives.workspace = true
 snowbridge-core.workspace = true
 snowbridge-ethereum.workspace = true
 snowbridge-inbound-queue-primitives.workspace = true
+=======
+snowbridge-beacon-primitives = { workspace = true }
+snowbridge-core = { workspace = true }
+snowbridge-ethereum = { workspace = true }
+>>>>>>> 0f3f611 (Snowbridge - Various minor improvements (#8020))
 snowbridge-pallet-ethereum-client-fixtures = { optional = true, workspace = true }
+snowbridge-verification-primitives = { workspace = true }
 static_assertions = { workspace = true }
 
 [dev-dependencies]
 hex-literal = { workspace = true, default-features = true }
+<<<<<<< HEAD
 pallet-timestamp = { default-features = true, path = "../../../../substrate/frame/timestamp" }
 rand = { workspace = true, default-features = true }
+=======
+pallet-timestamp = { workspace = true, default-features = true }
+>>>>>>> 0f3f611 (Snowbridge - Various minor improvements (#8020))
 serde = { workspace = true, default-features = true }
 serde_json = { workspace = true, default-features = true }
 snowbridge-pallet-ethereum-client-fixtures = { default-features = true, path = "fixtures" }
@@ -62,8 +73,8 @@ std = [
 	"snowbridge-beacon-primitives/std",
 	"snowbridge-core/std",
 	"snowbridge-ethereum/std",
-	"snowbridge-inbound-queue-primitives/std",
 	"snowbridge-pallet-ethereum-client-fixtures/std",
+	"snowbridge-verification-primitives/std",
 	"sp-core/std",
 	"sp-io/std",
 	"sp-runtime/std",
@@ -77,7 +88,6 @@ runtime-benchmarks = [
 	"hex-literal",
 	"pallet-timestamp?/runtime-benchmarks",
 	"snowbridge-core/runtime-benchmarks",
-	"snowbridge-inbound-queue-primitives/runtime-benchmarks",
 	"snowbridge-pallet-ethereum-client-fixtures/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
 ]

diff --git a/bridges/snowbridge/pallets/ethereum-client/fixtures/Cargo.toml b/bridges/snowbridge/pallets/ethereum-client/fixtures/Cargo.toml
@@ -19,22 +19,29 @@ exclude-from-umbrella = true
 
 [dependencies]
 hex-literal = { workspace = true, default-features = true }
+<<<<<<< HEAD
 snowbridge-beacon-primitives.workspace = true
 snowbridge-core.workspace = true
 snowbridge-inbound-queue-primitives.workspace = true
 sp-core.workspace = true
 sp-std.workspace = true
+=======
+snowbridge-beacon-primitives = { workspace = true }
+snowbridge-core = { workspace = true }
+snowbridge-verification-primitives = { workspace = true }
+sp-core = { workspace = true }
+sp-std = { workspace = true }
+>>>>>>> 0f3f611 (Snowbridge - Various minor improvements (#8020))
 
 [features]
 default = ["std"]
 std = [
 	"snowbridge-beacon-primitives/std",
 	"snowbridge-core/std",
-	"snowbridge-inbound-queue-primitives/std",
+	"snowbridge-verification-primitives/std",
 	"sp-core/std",
 	"sp-std/std",
 ]
 runtime-benchmarks = [
 	"snowbridge-core/runtime-benchmarks",
-	"snowbridge-inbound-queue-primitives/runtime-benchmarks",
 ]
diff --git a/bridges/snowbridge/pallets/ethereum-client/fixtures/src/lib.rs b/bridges/snowbridge/pallets/ethereum-client/fixtures/src/lib.rs
@@ -9,7 +9,7 @@ use snowbridge_beacon_primitives::{
 	types::deneb, AncestryProof, BeaconHeader, ExecutionProof, NextSyncCommitteeUpdate,
 	SyncAggregate, SyncCommittee, VersionedExecutionPayloadHeader,
 };
-use snowbridge_inbound_queue_primitives::{EventProof, InboundQueueFixture, Log, Proof};
+use snowbridge_verification_primitives::{EventFixture, EventProof, Log, Proof};
 use sp_core::U256;
 use sp_std::{boxed::Box, vec};
 
@@ -1225,8 +1225,8 @@ pub fn make_execution_proof() -> Box<ExecutionProof> {
     })
 }
 
-pub fn make_inbound_fixture() -> InboundQueueFixture {
-	InboundQueueFixture {
+pub fn make_inbound_fixture() -> EventFixture {
+	EventFixture {
         event: EventProof {
             event_log: 	Log {
                 address: hex!("eda338e4dc46038493b885327842fd3e301cab39").into(),

diff --git a/bridges/snowbridge/pallets/ethereum-client/src/impls.rs b/bridges/snowbridge/pallets/ethereum-client/src/impls.rs
@@ -6,9 +6,9 @@ use snowbridge_beacon_primitives::ExecutionProof;
 
 use snowbridge_beacon_primitives::merkle_proof::{generalized_index_length, subtree_index};
 use snowbridge_ethereum::Receipt;
-use snowbridge_inbound_queue_primitives::{
+use snowbridge_verification_primitives::{
 	VerificationError::{self, *},
-	*,
+	Verifier, *,
 };
 
 impl<T: Config> Verifier for Pallet<T> {

diff --git a/bridges/snowbridge/pallets/ethereum-client/src/mock.rs b/bridges/snowbridge/pallets/ethereum-client/src/mock.rs
@@ -5,7 +5,7 @@ use crate::config;
 use frame_support::{derive_impl, dispatch::DispatchResult, parameter_types};
 use pallet_timestamp;
 use snowbridge_beacon_primitives::{Fork, ForkVersions};
-use snowbridge_inbound_queue_primitives::{Log, Proof};
+use snowbridge_verification_primitives::{Log, Proof};
 use sp_std::default::Default;
 use std::{fs::File, path::PathBuf};
 

diff --git a/bridges/snowbridge/pallets/ethereum-client/src/mock_electra.rs b/bridges/snowbridge/pallets/ethereum-client/src/mock_electra.rs
@@ -5,7 +5,7 @@ use crate::config;
 use frame_support::{derive_impl, dispatch::DispatchResult, parameter_types};
 use pallet_timestamp;
 use snowbridge_beacon_primitives::{Fork, ForkVersions};
-use snowbridge_inbound_queue_primitives::{Log, Proof};
+use snowbridge_verification_primitives::{Log, Proof};
 use sp_std::default::Default;
 use std::{fs::File, path::PathBuf};
 

diff --git a/bridges/snowbridge/pallets/ethereum-client/src/tests.rs b/bridges/snowbridge/pallets/ethereum-client/src/tests.rs
@@ -20,7 +20,7 @@ use snowbridge_beacon_primitives::{
 	types::deneb,
 	Fork, ForkVersions, NextSyncCommitteeUpdate, VersionedExecutionPayloadHeader,
 };
-use snowbridge_inbound_queue_primitives::{VerificationError, Verifier};
+use snowbridge_verification_primitives::{VerificationError, Verifier};
 use sp_core::H256;
 use sp_runtime::DispatchError;
 

diff --git a/bridges/snowbridge/pallets/ethereum-client/src/tests_electra.rs b/bridges/snowbridge/pallets/ethereum-client/src/tests_electra.rs
@@ -19,7 +19,7 @@ use snowbridge_beacon_primitives::{
 	types::deneb,
 	Fork, ForkVersions, NextSyncCommitteeUpdate, VersionedExecutionPayloadHeader,
 };
-use snowbridge_inbound_queue_primitives::{VerificationError, Verifier};
+use snowbridge_verification_primitives::{VerificationError, Verifier};
 use sp_core::H256;
 use sp_runtime::DispatchError;
 

diff --git a/bridges/snowbridge/pallets/inbound-queue-v2/Cargo.toml b/bridges/snowbridge/pallets/inbound-queue-v2/Cargo.toml
@@ -50,7 +50,6 @@ bp-relayers = { workspace = true }
 frame-benchmarking = { workspace = true, default-features = true }
 hex = { workspace = true, default-features = true }
 hex-literal = { workspace = true, default-features = true }
-snowbridge-pallet-ethereum-client = { workspace = true, default-features = true }
 snowbridge-test-utils = { workspace = true }
 sp-keyring = { workspace = true, default-features = true }
 
@@ -89,7 +88,6 @@ runtime-benchmarks = [
 	"pallet-balances/runtime-benchmarks",
 	"snowbridge-core/runtime-benchmarks",
 	"snowbridge-inbound-queue-primitives/runtime-benchmarks",
-	"snowbridge-pallet-ethereum-client/runtime-benchmarks",
 	"snowbridge-pallet-inbound-queue-v2-fixtures/runtime-benchmarks",
 	"snowbridge-test-utils/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
@@ -101,6 +99,5 @@ try-runtime = [
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
 	"pallet-balances/try-runtime",
-	"snowbridge-pallet-ethereum-client/try-runtime",
 	"sp-runtime/try-runtime",
 ]
diff --git a/bridges/snowbridge/pallets/inbound-queue-v2/fixtures/src/register_token.rs b/bridges/snowbridge/pallets/inbound-queue-v2/fixtures/src/register_token.rs
@@ -7,12 +7,12 @@ use hex_literal::hex;
 use snowbridge_beacon_primitives::{
 	types::deneb, AncestryProof, BeaconHeader, ExecutionProof, VersionedExecutionPayloadHeader,
 };
-use snowbridge_inbound_queue_primitives::{EventProof, InboundQueueFixture, Log, Proof};
+use snowbridge_inbound_queue_primitives::{EventFixture, EventProof, Log, Proof};
 use sp_core::U256;
 use sp_std::vec;
 
-pub fn make_register_token_message() -> InboundQueueFixture {
-	InboundQueueFixture {
+pub fn make_register_token_message() -> EventFixture {
+	EventFixture {
         event: EventProof {
             event_log: 	Log {
                 address: hex!("b1185ede04202fe62d38f5db72f71e38ff3e8305").into(),

diff --git a/bridges/snowbridge/pallets/inbound-queue-v2/src/lib.rs b/bridges/snowbridge/pallets/inbound-queue-v2/src/lib.rs
@@ -36,13 +36,6 @@ mod mock;
 mod test;
 
 pub use crate::weights::WeightInfo;
-use frame_support::{
-	traits::{
-		fungible::{Inspect, Mutate},
-		tokens::Balance,
-	},
-	weights::WeightToFee,
-};
 use frame_system::ensure_signed;
 use snowbridge_core::{
 	sparse_bitmap::{SparseBitmap, SparseBitmapImpl},
@@ -66,8 +59,6 @@ pub use pallet::*;
 pub const LOG_TARGET: &str = "snowbridge-pallet-inbound-queue-v2";
 
 pub type AccountIdOf<T> = <T as frame_system::Config>::AccountId;
-type BalanceOf<T> =
-	<<T as pallet::Config>::Token as Inspect<<T as frame_system::Config>::AccountId>>::Balance;
 
 pub type Nonce<T> = SparseBitmapImpl<crate::NonceBitmap<T>>;
 
@@ -95,8 +86,6 @@ pub mod pallet {
 		type XcmSender: SendXcm;
 		/// Handler for XCM fees.
 		type XcmExecutor: ExecuteXcm<Self::RuntimeCall>;
-		/// Ethereum NetworkId
-		type EthereumNetwork: Get<NetworkId>;
 		/// Address of the Gateway contract.
 		#[pallet::constant]
 		type GatewayAddress: Get<H160>;
@@ -106,21 +95,16 @@ pub mod pallet {
 		type MessageConverter: ConvertMessage;
 		#[cfg(feature = "runtime-benchmarks")]
 		type Helper: BenchmarkHelper<Self>;
-		/// Used for the dry run API implementation.
-		type Balance: Balance + From<u128>;
 		/// Reward discriminator type.
 		type RewardKind: Parameter + MaxEncodedLen + Send + Sync + Copy + Clone;
 		/// The default RewardKind discriminator for rewards allocated to relayers from this pallet.
 		#[pallet::constant]
 		type DefaultRewardKind: Get<Self::RewardKind>;
 		/// Relayer reward payment.
 		type RewardPayment: RewardLedger<Self::AccountId, Self::RewardKind, u128>;
-		type WeightInfo: WeightInfo;
-		/// Convert a weight value into deductible balance type.
-		type WeightToFee: WeightToFee<Balance = BalanceOf<Self>>;
-		type Token: Mutate<Self::AccountId> + Inspect<Self::AccountId>;
 		/// AccountId to Location converter
 		type AccountToLocation: for<'a> TryConvert<&'a Self::AccountId, Location>;
+		type WeightInfo: WeightInfo;
 	}
 
 	#[pallet::event]
@@ -135,8 +119,6 @@ pub mod pallet {
 		},
 		/// Set OperatingMode
 		OperatingModeChanged { mode: BasicOperatingMode },
-		/// XCM delivery fees were paid.
-		FeesPaid { paying: Location, fees: Assets },
 	}
 
 	#[pallet::error]
@@ -264,7 +246,13 @@ pub mod pallet {
 				})?;
 
 			// Pay relayer reward
-			T::RewardPayment::register_reward(&relayer, T::DefaultRewardKind::get(), relayer_fee);
+			if !relayer_fee.is_zero() {
+				T::RewardPayment::register_reward(
+					&relayer,
+					T::DefaultRewardKind::get(),
+					relayer_fee,
+				);
+			}
 
 			// Mark message as received
 			Nonce::<T>::set(nonce.into());
@@ -296,7 +284,6 @@ pub mod pallet {
 				);
 				SendError::Fees
 			})?;
-			Self::deposit_event(Event::FeesPaid { paying: fee_payer, fees: fee });
 			T::XcmSender::deliver(ticket)
 		}
 	}