Snowbridge V2

Cargo.toml

@@ -49,18 +49,28 @@ members = [
 	"bridges/snowbridge/pallets/ethereum-client",
 	"bridges/snowbridge/pallets/ethereum-client/fixtures",
 	"bridges/snowbridge/pallets/inbound-queue",
+	"bridges/snowbridge/pallets/inbound-queue-v2",
+	"bridges/snowbridge/pallets/inbound-queue-v2/fixtures",
 	"bridges/snowbridge/pallets/inbound-queue/fixtures",
 	"bridges/snowbridge/pallets/outbound-queue",
-	"bridges/snowbridge/pallets/outbound-queue/merkle-tree",
+	"bridges/snowbridge/pallets/outbound-queue-v2",
+	"bridges/snowbridge/pallets/outbound-queue-v2/runtime-api",
 	"bridges/snowbridge/pallets/outbound-queue/runtime-api",
 	"bridges/snowbridge/pallets/system",
+	"bridges/snowbridge/pallets/system-frontend",
+	"bridges/snowbridge/pallets/system-v2",
+	"bridges/snowbridge/pallets/system-v2/runtime-api",
 	"bridges/snowbridge/pallets/system/runtime-api",
 	"bridges/snowbridge/primitives/beacon",
 	"bridges/snowbridge/primitives/core",
 	"bridges/snowbridge/primitives/ethereum",
-	"bridges/snowbridge/primitives/router",
+	"bridges/snowbridge/primitives/inbound-queue",
+	"bridges/snowbridge/primitives/merkle-tree",
+	"bridges/snowbridge/primitives/outbound-queue",
+	"bridges/snowbridge/primitives/verification",
 	"bridges/snowbridge/runtime/runtime-common",
 	"bridges/snowbridge/runtime/test-common",
+	"bridges/snowbridge/test-utils",
 	"cumulus/bin/pov-validator",
 	"cumulus/client/cli",
 	"cumulus/client/collator",
@@ -823,7 +833,14 @@ http = { version = "1.1" }
 http-body = { version = "1", default-features = false }
 http-body-util = { version = "0.1.2", default-features = false }
 hyper = { version = "1.3.1", default-features = false }
-hyper-rustls = { version = "0.27.3", default-features = false, features = ["http1", "http2", "logging", "ring", "rustls-native-certs", "tls12"] }
+hyper-rustls = { version = "0.27.3", default-features = false, features = [
+	"http1",
+	"http2",
+	"logging",
+	"ring",
+	"rustls-native-certs",
+	"tls12",
+] }
 hyper-util = { version = "0.1.5", default-features = false }
 impl-serde = { version = "0.5.0", default-features = false }
 impl-trait-for-tuples = { version = "0.2.2" }
@@ -1149,7 +1166,12 @@ rstest = { version = "0.18.2" }
 rustc-hash = { version = "1.1.0" }
 rustc-hex = { version = "2.1.0", default-features = false }
 rustix = { version = "0.36.7", default-features = false }
-rustls = { version = "0.23.18", default-features = false, features = ["logging", "ring", "std", "tls12"] }
+rustls = { version = "0.23.18", default-features = false, features = [
+	"logging",
+	"ring",
+	"std",
+	"tls12",
+] }
 rustversion = { version = "1.0.17" }
 rusty-fork = { version = "0.3.0", default-features = false }
 safe-mix = { version = "1.0", default-features = false }
@@ -1235,18 +1257,28 @@ smoldot-light = { version = "0.9.0", default-features = false }
 snowbridge-beacon-primitives = { path = "bridges/snowbridge/primitives/beacon", default-features = false }
 snowbridge-core = { path = "bridges/snowbridge/primitives/core", default-features = false }
 snowbridge-ethereum = { path = "bridges/snowbridge/primitives/ethereum", default-features = false }
-snowbridge-outbound-queue-merkle-tree = { path = "bridges/snowbridge/pallets/outbound-queue/merkle-tree", default-features = false }
+snowbridge-inbound-queue-primitives = { path = "bridges/snowbridge/primitives/inbound-queue", default-features = false }
+snowbridge-merkle-tree = { path = "bridges/snowbridge/primitives/merkle-tree", default-features = false }
+snowbridge-outbound-queue-primitives = { path = "bridges/snowbridge/primitives/outbound-queue", default-features = false }
 snowbridge-outbound-queue-runtime-api = { path = "bridges/snowbridge/pallets/outbound-queue/runtime-api", default-features = false }
+snowbridge-outbound-queue-v2-runtime-api = { path = "bridges/snowbridge/pallets/outbound-queue-v2/runtime-api", default-features = false }
 snowbridge-pallet-ethereum-client = { path = "bridges/snowbridge/pallets/ethereum-client", default-features = false }
 snowbridge-pallet-ethereum-client-fixtures = { path = "bridges/snowbridge/pallets/ethereum-client/fixtures", default-features = false }
 snowbridge-pallet-inbound-queue = { path = "bridges/snowbridge/pallets/inbound-queue", default-features = false }
 snowbridge-pallet-inbound-queue-fixtures = { path = "bridges/snowbridge/pallets/inbound-queue/fixtures", default-features = false }
+snowbridge-pallet-inbound-queue-v2 = { path = "bridges/snowbridge/pallets/inbound-queue-v2", default-features = false }
+snowbridge-pallet-inbound-queue-v2-fixtures = { path = "bridges/snowbridge/pallets/inbound-queue-v2/fixtures", default-features = false }
 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-router-primitives = { path = "bridges/snowbridge/primitives/router", default-features = false }
+snowbridge-pallet-system-frontend = { path = "bridges/snowbridge/pallets/system-frontend", default-features = false }
+snowbridge-pallet-system-v2 = { path = "bridges/snowbridge/pallets/system-v2", 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 }
 snowbridge-system-runtime-api = { path = "bridges/snowbridge/pallets/system/runtime-api", default-features = false }
+snowbridge-system-v2-runtime-api = { path = "bridges/snowbridge/pallets/system-v2/runtime-api", default-features = false }
+snowbridge-test-utils = { path = "bridges/snowbridge/test-utils" }
+snowbridge-verification-primitives = { path = "bridges/snowbridge/primitives/verification", default-features = false }
 soketto = { version = "0.8.0" }
 solochain-template-runtime = { path = "templates/solochain/runtime" }
 sp-api = { path = "substrate/primitives/api", default-features = false }

bridges/chains/chain-asset-hub-rococo/Cargo.toml

@@ -23,6 +23,7 @@ sp-core = { workspace = true }
 
 # Bridge Dependencies
 bp-xcm-bridge-hub-router = { workspace = true }
+testnet-parachains-constants = { features = ["rococo"], workspace = true }
 
 # Polkadot dependencies
 xcm = { workspace = true }
@@ -35,5 +36,6 @@ std = [
 	"frame-support/std",
 	"scale-info/std",
 	"sp-core/std",
+	"testnet-parachains-constants/std",
 	"xcm/std",
 ]

bridges/chains/chain-asset-hub-rococo/src/lib.rs

@@ -24,6 +24,7 @@ use codec::{Decode, Encode};
 use scale_info::TypeInfo;
 
 pub use bp_xcm_bridge_hub_router::XcmBridgeHubRouterCall;
+use testnet_parachains_constants::rococo::currency::UNITS;
 use xcm::latest::prelude::*;
 
 /// `AssetHubRococo` Runtime `Call` enum.
@@ -45,6 +46,8 @@ pub enum Call {
 frame_support::parameter_types! {
 	/// Some sane weight to execute `xcm::Transact(pallet-xcm-bridge-hub-router::Call::report_bridge_status)`.
 	pub const XcmBridgeHubRouterTransactCallMaxWeight: frame_support::weights::Weight = frame_support::weights::Weight::from_parts(200_000_000, 6144);
+	/// Should match the `AssetDeposit` of the `ForeignAssets` pallet on Asset Hub.
+	pub const CreateForeignAssetDeposit: u128 = UNITS / 10;
 }
 
 /// Builds an (un)congestion XCM program with the `report_bridge_status` call for

bridges/chains/chain-asset-hub-westend/Cargo.toml

@@ -23,6 +23,7 @@ sp-core = { workspace = true }
 
 # Bridge Dependencies
 bp-xcm-bridge-hub-router = { workspace = true }
+testnet-parachains-constants = { features = ["westend"], workspace = true }
 
 # Polkadot dependencies
 xcm = { workspace = true }
@@ -35,5 +36,6 @@ std = [
 	"frame-support/std",
 	"scale-info/std",
 	"sp-core/std",
+	"testnet-parachains-constants/std",
 	"xcm/std",
 ]

bridges/chains/chain-asset-hub-westend/src/lib.rs

@@ -24,6 +24,7 @@ use codec::{Decode, Encode};
 use scale_info::TypeInfo;
 
 pub use bp_xcm_bridge_hub_router::XcmBridgeHubRouterCall;
+use testnet_parachains_constants::westend::currency::UNITS;
 use xcm::latest::prelude::*;
 
 /// `AssetHubWestend` Runtime `Call` enum.
@@ -45,6 +46,9 @@ pub enum Call {
 frame_support::parameter_types! {
 	/// Some sane weight to execute `xcm::Transact(pallet-xcm-bridge-hub-router::Call::report_bridge_status)`.
 	pub const XcmBridgeHubRouterTransactCallMaxWeight: frame_support::weights::Weight = frame_support::weights::Weight::from_parts(200_000_000, 6144);
+
+	/// Should match the `AssetDeposit` of the `ForeignAssets` pallet on Asset Hub.
+	pub const CreateForeignAssetDeposit: u128 = UNITS / 10;
 }
 
 /// Builds an (un)congestion XCM program with the `report_bridge_status` call for

bridges/snowbridge/pallets/ethereum-client/Cargo.toml

@@ -14,6 +14,9 @@ workspace = true
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
 
+[package.metadata.polkadot-sdk]
+exclude-from-umbrella = true
+
 [dependencies]
 codec = { features = ["derive"], workspace = true }
 hex-literal = { optional = true, workspace = true, default-features = true }
@@ -34,6 +37,7 @@ pallet-timestamp = { optional = true, workspace = true }
 snowbridge-beacon-primitives = { workspace = true }
 snowbridge-core = { workspace = true }
 snowbridge-ethereum = { workspace = true }
+snowbridge-inbound-queue-primitives = { workspace = true }
 snowbridge-pallet-ethereum-client-fixtures = { optional = true, workspace = true }
 static_assertions = { workspace = true }
 
@@ -60,6 +64,7 @@ std = [
 	"snowbridge-beacon-primitives/std",
 	"snowbridge-core/std",
 	"snowbridge-ethereum/std",
+	"snowbridge-inbound-queue-primitives/std",
 	"snowbridge-pallet-ethereum-client-fixtures/std",
 	"sp-core/std",
 	"sp-io/std",
@@ -74,6 +79,7 @@ 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",
 ]

bridges/snowbridge/pallets/ethereum-client/fixtures/Cargo.toml

@@ -14,10 +14,14 @@ workspace = true
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
 
+[package.metadata.polkadot-sdk]
+exclude-from-umbrella = true
+
 [dependencies]
 hex-literal = { workspace = true, default-features = true }
 snowbridge-beacon-primitives = { workspace = true }
 snowbridge-core = { workspace = true }
+snowbridge-inbound-queue-primitives = { workspace = true }
 sp-core = { workspace = true }
 sp-std = { workspace = true }
 
@@ -26,7 +30,11 @@ default = ["std"]
 std = [
 	"snowbridge-beacon-primitives/std",
 	"snowbridge-core/std",
+	"snowbridge-inbound-queue-primitives/std",
 	"sp-core/std",
 	"sp-std/std",
 ]
-runtime-benchmarks = ["snowbridge-core/runtime-benchmarks"]
+runtime-benchmarks = [
+	"snowbridge-core/runtime-benchmarks",
+	"snowbridge-inbound-queue-primitives/runtime-benchmarks",
+]

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_core::inbound::{InboundQueueFixture, Log, Message, Proof};
+use snowbridge_inbound_queue_primitives::{EventProof, InboundQueueFixture, Log, Proof};
 use sp_core::U256;
 use sp_std::{boxed::Box, vec};
 
@@ -1227,7 +1227,7 @@ pub fn make_execution_proof() -> Box<ExecutionProof> {
 
 pub fn make_inbound_fixture() -> InboundQueueFixture {
 	InboundQueueFixture {
-        message: Message {
+        event: EventProof {
             event_log: 	Log {
                 address: hex!("eda338e4dc46038493b885327842fd3e301cab39").into(),
                 topics: vec![

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

@@ -5,11 +5,11 @@ use frame_support::ensure;
 use snowbridge_beacon_primitives::ExecutionProof;
 
 use snowbridge_beacon_primitives::merkle_proof::{generalized_index_length, subtree_index};
-use snowbridge_core::inbound::{
+use snowbridge_ethereum::Receipt;
+use snowbridge_inbound_queue_primitives::{
 	VerificationError::{self, *},
 	*,
 };
-use snowbridge_ethereum::Receipt;
 
 impl<T: Config> Verifier for Pallet<T> {
 	/// Verify a message by verifying the existence of the corresponding

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_core::inbound::{Log, Proof};
+use snowbridge_inbound_queue_primitives::{Log, Proof};
 use sp_std::default::Default;
 use std::{fs::File, path::PathBuf};
 
@@ -88,7 +88,7 @@ pub fn load_sync_committee_update_period_0_newer_fixture() -> Box<
 
 pub fn get_message_verification_payload() -> (Log, Proof) {
 	let inbound_fixture = snowbridge_pallet_ethereum_client_fixtures::make_inbound_fixture();
-	(inbound_fixture.message.event_log, inbound_fixture.message.proof)
+	(inbound_fixture.event.event_log, inbound_fixture.event.proof)
 }
 
 frame_support::construct_runtime!(

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_core::inbound::{Log, Proof};
+use snowbridge_inbound_queue_primitives::{Log, Proof};
 use sp_std::default::Default;
 use std::{fs::File, path::PathBuf};
 
@@ -68,7 +68,7 @@ pub fn load_other_finalized_header_update_fixture() -> snowbridge_beacon_primiti
 
 pub fn get_message_verification_payload() -> (Log, Proof) {
 	let inbound_fixture = snowbridge_pallet_ethereum_client_fixtures::make_inbound_fixture();
-	(inbound_fixture.message.event_log, inbound_fixture.message.proof)
+	(inbound_fixture.event.event_log, inbound_fixture.event.proof)
 }
 
 frame_support::construct_runtime!(

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

@@ -20,7 +20,7 @@ use snowbridge_beacon_primitives::{
 	types::deneb,
 	Fork, ForkVersions, NextSyncCommitteeUpdate, VersionedExecutionPayloadHeader,
 };
-use snowbridge_core::inbound::{VerificationError, Verifier};
+use snowbridge_inbound_queue_primitives::{VerificationError, Verifier};
 use sp_core::H256;
 use sp_runtime::DispatchError;
 

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_core::inbound::{VerificationError, Verifier};
+use snowbridge_inbound_queue_primitives::{VerificationError, Verifier};
 use sp_core::H256;
 use sp_runtime::DispatchError;