[DO NOT MERGE] cherry-picks for polkadot-sdk stable2506

Cargo.toml

@@ -626,6 +626,10 @@ Inflector = { version = "0.11.4" }
 aes-gcm = { version = "0.10" }
 ahash = { version = "0.8.2" }
 alloy-core = { version = "1.1.0", default-features = false }
+# TODO: remove alloy-primitives and alloy-sol-types, they are re-exported in alloy-core
+# but the version is different so it doesnt compile
+alloy-primitives = { version = "0.4.2", default-features = false }
+alloy-sol-types = { version = "0.4.2", default-features = false }
 always-assert = { version = "0.1" }
 anyhow = { version = "1.0.81", default-features = false }
 approx = { version = "0.5.1" }
@@ -643,7 +647,6 @@ ark-ed-on-bls12-377-ext = { version = "0.4.1", default-features = false }
 ark-ed-on-bls12-381-bandersnatch = { version = "0.4.0", default-features = false }
 ark-ed-on-bls12-381-bandersnatch-ext = { version = "0.4.1", default-features = false }
 ark-scale = { version = "0.0.12", default-features = false }
-ark-vrf = { version = "0.1.0", default-features = false }
 array-bytes = { version = "6.2.2", default-features = false }
 arrayvec = { version = "0.7.4" }
 assert_cmd = { version = "2.0.14" }
@@ -671,7 +674,7 @@ blake2 = { version = "0.10.4", default-features = false }
 blake2b_simd = { version = "1.0.2", default-features = false }
 blake3 = { version = "1.5" }
 bn = { package = "substrate-bn", version = "0.6", default-features = false }
-bounded-collections = { version = "0.2.3", default-features = false }
+bounded-collections = { version = "0.3.2", default-features = false }
 bounded-vec = { version = "0.7" }
 bp-asset-hub-rococo = { path = "cumulus/parachains/runtimes/assets/asset-hub-rococo/bridge-primitives", default-features = false }
 bp-asset-hub-westend = { path = "cumulus/parachains/runtimes/assets/asset-hub-westend/bridge-primitives", default-features = false }
@@ -892,7 +895,7 @@ linked-hash-map = { version = "0.5.4" }
 linked_hash_set = { version = "0.1.4" }
 linregress = { version = "0.5.1" }
 lite-json = { version = "0.2.0", default-features = false }
-litep2p = { version = "0.9.5", features = ["websocket"] }
+litep2p = { git = "https://github.com/moondance-labs/litep2p", branch = "girazoki-simple-dns-update-2", features = ["rsa", "websocket"] }
 log = { version = "0.4.22", default-features = false }
 macro_magic = { version = "0.5.1" }
 maplit = { version = "1.0.2" }
@@ -1499,7 +1502,6 @@ overflow-checks = true
 #
 # This list is ordered alphabetically.
 [profile.dev.package]
-ark-vrf = { opt-level = 3 }
 blake2 = { opt-level = 3 }
 blake2b_simd = { opt-level = 3 }
 chacha20poly1305 = { opt-level = 3 }

bridges/primitives/header-chain/src/justification/verification/mod.rs

@@ -306,7 +306,9 @@ trait JustificationVerifier<Header: HeaderT> {
 				justification.round,
 				context.authority_set_id,
 				&mut signature_buffer,
-			) {
+			)
+			.is_valid()
+			{
 				self.process_invalid_signature_vote(precommit_idx).map_err(Error::Precommit)?;
 				continue
 			}

bridges/snowbridge/pallets/ethereum-client/src/benchmarking/mod.rs

@@ -118,6 +118,7 @@ mod benchmarks {
 			capella: Fork { version: hex!("03000000"), epoch: 0 },
 			deneb: Fork { version: hex!("04000000"), epoch: 0 },
 			electra: Fork { version: hex!("05000000"), epoch: 80000000000 },
+			fulu: Fork { version: hex!("06000000"), epoch: 80000000001 },
 		};
 		let finalized_root_gindex = EthereumBeaconClient::<T>::finalized_root_gindex_at_slot(
 			update.attested_header.slot,

bridges/snowbridge/pallets/ethereum-client/src/lib.rs

@@ -26,7 +26,7 @@ pub mod weights;
 #[cfg(any(test, feature = "fuzzing"))]
 pub mod mock;
 
-#[cfg(test)]
+#[cfg(any(test, feature = "fuzzing"))]
 pub mod mock_electra;
 
 #[cfg(test)]
@@ -633,6 +633,9 @@ pub mod pallet {
 
 		/// Returns the fork version based on the current epoch.
 		pub(super) fn select_fork_version(fork_versions: &ForkVersions, epoch: u64) -> ForkVersion {
+			if epoch >= fork_versions.fulu.epoch {
+				return fork_versions.fulu.version
+			}
 			if epoch >= fork_versions.electra.epoch {
 				return fork_versions.electra.version
 			}

bridges/snowbridge/pallets/ethereum-client/src/mock.rs

@@ -8,6 +8,7 @@ use snowbridge_beacon_primitives::{Fork, ForkVersions};
 use snowbridge_verification_primitives::{Log, Proof};
 use sp_std::default::Default;
 use std::{fs::File, path::PathBuf};
+use hex_literal::hex;
 
 type Block = frame_system::mocking::MockBlock<Test>;
 use frame_support::traits::ConstU32;
@@ -114,28 +115,32 @@ impl pallet_timestamp::Config for Test {
 parameter_types! {
 	pub const ChainForkVersions: ForkVersions = ForkVersions {
 		genesis: Fork {
-			version: [0, 0, 0, 0], // 0x00000000
+			version: hex!("00000000"), // 0x00000000
 			epoch: 0,
 		},
 		altair: Fork {
-			version: [1, 0, 0, 0], // 0x01000000
+			version: hex!("01000000"), // 0x01000000
 			epoch: 0,
 		},
 		bellatrix: Fork {
-			version: [2, 0, 0, 0], // 0x02000000
+			version: hex!("02000000"), // 0x02000000
 			epoch: 0,
 		},
 		capella: Fork {
-			version: [3, 0, 0, 0], // 0x03000000
+			version: hex!("03000000"), // 0x03000000
 			epoch: 0,
 		},
 		deneb: Fork {
-			version: [4, 0, 0, 0], // 0x04000000
+			version: hex!("04000000"), // 0x04000000
 			epoch: 0,
 		},
 		electra: Fork {
-			version: [5, 0, 0, 0], // 0x05000000
-			epoch: 80000000000,
+			version: hex!("05000000"),
+			epoch: 0,
+		},
+		fulu: Fork {
+			version: hex!("06000000"),
+			epoch: 100000000,
 		}
 	};
 }

bridges/snowbridge/pallets/ethereum-client/src/mock_electra.rs

@@ -116,6 +116,10 @@ parameter_types! {
 		electra: Fork {
 			version: [5, 0, 0, 0], // 0x05000000
 			epoch: 0,
+		},
+		fulu: Fork {
+			version: [6, 0, 0, 0],
+			epoch: 800000000000,
 		}
 	};
 }

bridges/snowbridge/pallets/ethereum-client/src/tests.rs

@@ -230,6 +230,7 @@ fn compute_fork_version() {
 		capella: Fork { version: [0, 0, 0, 3], epoch: 30 },
 		deneb: Fork { version: [0, 0, 0, 4], epoch: 40 },
 		electra: Fork { version: [0, 0, 0, 5], epoch: 50 },
+		fulu: Fork { version: [0, 0, 0, 6], epoch: 60 },
 	};
 	new_tester().execute_with(|| {
 		assert_eq!(EthereumBeaconClient::select_fork_version(&mock_fork_versions, 0), [0, 0, 0, 0]);

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

@@ -28,9 +28,10 @@ log = { workspace = true }
 pallet-balances.workspace = true
 scale-info = { features = ["derive"], workspace = true }
 serde = { optional = true, workspace = true, default-features = true }
-snowbridge-beacon-primitives.workspace = true
-snowbridge-core.workspace = true
-snowbridge-inbound-queue-primitives.workspace = true
+
+snowbridge-beacon-primitives = { workspace = true }
+snowbridge-core = { workspace = true }
+snowbridge-inbound-queue-primitives = { workspace = true }
 snowbridge-pallet-inbound-queue-v2-fixtures = { optional = true, workspace = true }
 sp-core.workspace = true
 sp-io.workspace = true
@@ -47,6 +48,9 @@ hex-literal = { workspace = true, default-features = true }
 snowbridge-test-utils = { workspace = true }
 sp-keyring = { default-features = true, workspace = true }
 
+xcm-builder = { workspace = true }
+xcm-executor = { workspace = true }
+
 [features]
 default = ["std"]
 std = [

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

@@ -38,21 +38,21 @@ mod test;
 pub use crate::weights::WeightInfo;
 use bp_relayers::RewardLedger;
 use frame_system::ensure_signed;
+use frame_support::dispatch::PostDispatchInfo;
 use snowbridge_core::{
 	reward::{AddTip, AddTipError},
 	sparse_bitmap::{SparseBitmap, SparseBitmapImpl},
 	BasicOperatingMode,
 };
 use snowbridge_inbound_queue_primitives::{
-	v2::{ConvertMessage, ConvertMessageError, Message},
+	v2::{ConvertMessageError, Message, MessageProcessor, MessageProcessorError},
 	EventProof, VerificationError, Verifier,
 };
 use sp_core::H160;
-use sp_runtime::traits::TryConvert;
 use sp_std::prelude::*;
-use xcm::prelude::{ExecuteXcm, Junction::*, Location, SendXcm, *};
 #[cfg(feature = "runtime-benchmarks")]
 use {snowbridge_beacon_primitives::BeaconHeader, sp_core::H256};
+use xcm::latest::SendError;
 
 pub use pallet::*;
 
@@ -83,17 +83,11 @@ pub mod pallet {
 		type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
 		/// The verifier for inbound messages from Ethereum.
 		type Verifier: Verifier;
-		/// XCM message sender.
-		type XcmSender: SendXcm;
-		/// Handler for XCM fees.
-		type XcmExecutor: ExecuteXcm<Self::RuntimeCall>;
 		/// Address of the Gateway contract.
 		#[pallet::constant]
 		type GatewayAddress: Get<H160>;
-		/// AssetHub parachain ID.
-		type AssetHubParaId: Get<u32>;
-		/// Convert a command from Ethereum to an XCM message.
-		type MessageConverter: ConvertMessage;
+		/// Process the message that was submitted.
+		type MessageProcessor: MessageProcessor<Self::AccountId>;
 		#[cfg(feature = "runtime-benchmarks")]
 		type Helper: BenchmarkHelper<Self>;
 		/// Reward discriminator type.
@@ -103,8 +97,6 @@ pub mod pallet {
 		type DefaultRewardKind: Get<Self::RewardKind>;
 		/// Relayer reward payment.
 		type RewardPayment: RewardLedger<Self::AccountId, Self::RewardKind, u128>;
-		/// AccountId to Location converter
-		type AccountToLocation: for<'a> TryConvert<&'a Self::AccountId, Location>;
 		type WeightInfo: WeightInfo;
 	}
 
@@ -126,22 +118,10 @@ pub mod pallet {
 	pub enum Error<T> {
 		/// Message came from an invalid outbound channel on the Ethereum side.
 		InvalidGateway,
-		/// Account could not be converted to bytes
-		InvalidAccount,
 		/// Message has an invalid envelope.
 		InvalidMessage,
 		/// Message has an unexpected nonce.
 		InvalidNonce,
-		/// Fee provided is invalid.
-		InvalidFee,
-		/// Message has an invalid payload.
-		InvalidPayload,
-		/// Message channel is invalid
-		InvalidChannel,
-		/// The max nonce for the type has been reached
-		MaxNonceReached,
-		/// Cannot convert location
-		InvalidAccountConversion,
 		/// Invalid network specified
 		InvalidNetwork,
 		/// Pallet is halted
@@ -201,8 +181,8 @@ pub mod pallet {
 	impl<T: Config> Pallet<T> {
 		/// Submit an inbound message originating from the Gateway contract on Ethereum
 		#[pallet::call_index(0)]
-		#[pallet::weight(T::WeightInfo::submit())]
-		pub fn submit(origin: OriginFor<T>, event: Box<EventProof>) -> DispatchResult {
+		#[pallet::weight(T::WeightInfo::submit().saturating_add(T::MessageProcessor::worst_case_message_processor_weight()))]
+		pub fn submit(origin: OriginFor<T>, event: Box<EventProof>) -> DispatchResultWithPostInfo {
 			let who = ensure_signed(origin)?;
 			ensure!(!OperatingMode::<T>::get().is_halted(), Error::<T>::Halted);
 
@@ -232,7 +212,7 @@ pub mod pallet {
 	}
 
 	impl<T: Config> Pallet<T> {
-		pub fn process_message(relayer: T::AccountId, message: Message) -> DispatchResult {
+		pub fn process_message(relayer: T::AccountId, message: Message) -> DispatchResultWithPostInfo {
 			// Verify that the message was submitted from the known Gateway contract
 			ensure!(T::GatewayAddress::get() == message.gateway, Error::<T>::InvalidGateway);
 
@@ -241,58 +221,36 @@ pub mod pallet {
 			// Verify the message has not been processed
 			ensure!(!Nonce::<T>::get(nonce), Error::<T>::InvalidNonce);
 
-			let xcm =
-				T::MessageConverter::convert(message).map_err(|error| Error::<T>::from(error))?;
-
-			// Forward XCM to AH
-			let dest = Location::new(1, [Parachain(T::AssetHubParaId::get())]);
-
 			// Mark message as received
 			Nonce::<T>::set(nonce);
 
-			let message_id =
-				Self::send_xcm(dest.clone(), &relayer, xcm.clone()).map_err(|error| {
-					tracing::error!(target: LOG_TARGET, ?error, ?dest, ?xcm, "XCM send failed with error");
-					Error::<T>::from(error)
+			let (message_id, maybe_corrected_weight) = T::MessageProcessor::process_message(relayer.clone(), message)
+				.map_err(|e| match e {
+					MessageProcessorError::ProcessMessage(e) => e,
+					MessageProcessorError::ConvertMessage(e) => Error::<T>::from(e).into(),
+					MessageProcessorError::SendMessage(e) => Error::<T>::from(e).into(),
 				})?;
 
 			// Pay relayer reward
-			if !relayer_fee.is_zero() {
-				T::RewardPayment::register_reward(
-					&relayer,
-					T::DefaultRewardKind::get(),
-					relayer_fee,
-				);
+			let tip = Tips::<T>::take(nonce).unwrap_or_default();
+			let total_tip = relayer_fee.saturating_add(tip);
+			if total_tip > 0 {
+				T::RewardPayment::register_reward(&relayer, T::DefaultRewardKind::get(), total_tip);
 			}
 
+			// Emit event with the message_id
 			Self::deposit_event(Event::MessageReceived { nonce, message_id });
 
-			Ok(())
-		}
-
-		fn send_xcm(
-			dest: Location,
-			fee_payer: &T::AccountId,
-			xcm: Xcm<()>,
-		) -> Result<XcmHash, SendError> {
-			let (ticket, fee) = validate_send::<T::XcmSender>(dest, xcm)?;
-			let fee_payer = T::AccountToLocation::try_convert(fee_payer).map_err(|err| {
-				tracing::error!(
-					target: LOG_TARGET,
-					?err,
-					"Failed to convert account to XCM location",
-				);
-				SendError::NotApplicable
-			})?;
-			T::XcmExecutor::charge_fees(fee_payer.clone(), fee.clone()).map_err(|error| {
-				tracing::error!(
-					target: LOG_TARGET,
-					?error,
-					"Charging fees failed with error",
-				);
-				SendError::Fees
-			})?;
-			T::XcmSender::deliver(ticket)
+			if let Some(corrected_weight) = maybe_corrected_weight {
+				Ok(PostDispatchInfo {
+					actual_weight: Some(corrected_weight.saturating_add(T::WeightInfo::submit())),
+					..Default::default()
+				})
+			}
+			else {
+				// Pays fees and non-corrected-weight
+				Ok(().into())
+			}
 		}
 	}