diff --git a/Cargo.lock b/Cargo.lock
index c4bc2168f8ea2802be485eaa0723ab14dd778933..b78f023d9277d2867129da2ec39ebb306c5bd80e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2202,7 +2202,6 @@ version = "0.18.0"
dependencies = [
"bp-asset-hub-rococo",
"bp-asset-hub-westend",
- "bp-bridge-hub-polkadot",
"bp-bridge-hub-rococo",
"bp-bridge-hub-westend",
"bp-header-chain",
@@ -2503,7 +2502,6 @@ dependencies = [
"bp-relayers",
"bp-runtime",
"bp-test-utils",
- "bp-xcm-bridge-hub",
"frame-support",
"frame-system",
"log",
@@ -5518,7 +5516,6 @@ dependencies = [
"asset-test-utils",
"bp-messages",
"bp-xcm-bridge-hub",
- "bridge-runtime-common",
"cumulus-pallet-parachain-system",
"cumulus-pallet-xcmp-queue",
"cumulus-primitives-core",
diff --git a/bridges/bin/runtime-common/Cargo.toml b/bridges/bin/runtime-common/Cargo.toml
index e3b243cd61f756db0bd757f80c5b785da1e5c5eb..c4e97c054bbf90b1c2554e3f877201038a223081 100644
--- a/bridges/bin/runtime-common/Cargo.toml
+++ b/bridges/bin/runtime-common/Cargo.toml
@@ -22,7 +22,6 @@ bp-parachains.workspace = true
bp-polkadot-core.workspace = true
bp-relayers.workspace = true
bp-runtime.workspace = true
-bp-xcm-bridge-hub.workspace = true
pallet-bridge-grandpa.workspace = true
pallet-bridge-messages.workspace = true
pallet-bridge-parachains.workspace = true
@@ -53,7 +52,6 @@ std = [
"bp-polkadot-core/std",
"bp-relayers/std",
"bp-runtime/std",
- "bp-xcm-bridge-hub/std",
"codec/std",
"frame-support/std",
"frame-system/std",
diff --git a/bridges/bin/runtime-common/src/integrity.rs b/bridges/bin/runtime-common/src/integrity.rs
index 535f1a26e5e8989e59b36e65d1c1948111c81b33..a400df1c2a5a074b24476c183ec345ab7c312122 100644
--- a/bridges/bin/runtime-common/src/integrity.rs
+++ b/bridges/bin/runtime-common/src/integrity.rs
@@ -30,7 +30,6 @@ use pallet_bridge_messages::WeightInfoExt as _;
// Re-export to avoid include all dependencies everywhere.
#[doc(hidden)]
pub mod __private {
- pub use bp_xcm_bridge_hub;
pub use static_assertions;
}
@@ -66,9 +65,9 @@ macro_rules! assert_bridge_messages_pallet_types(
with_bridged_chain_messages_instance: $i:path,
this_chain: $this:path,
bridged_chain: $bridged:path,
+ expected_payload_type: $payload:path,
) => {
{
- use $crate::integrity::__private::bp_xcm_bridge_hub::XcmAsPlainPayload;
use $crate::integrity::__private::static_assertions::assert_type_eq_all;
use bp_messages::ChainWithMessages;
use bp_runtime::Chain;
@@ -81,8 +80,8 @@ macro_rules! assert_bridge_messages_pallet_types(
assert_type_eq_all!(<$r as BridgeMessagesConfig<$i>>::ThisChain, $this);
assert_type_eq_all!(<$r as BridgeMessagesConfig<$i>>::BridgedChain, $bridged);
- assert_type_eq_all!(<$r as BridgeMessagesConfig<$i>>::OutboundPayload, XcmAsPlainPayload);
- assert_type_eq_all!(<$r as BridgeMessagesConfig<$i>>::InboundPayload, XcmAsPlainPayload);
+ assert_type_eq_all!(<$r as BridgeMessagesConfig<$i>>::OutboundPayload, $payload);
+ assert_type_eq_all!(<$r as BridgeMessagesConfig<$i>>::InboundPayload, $payload);
}
}
);
@@ -97,6 +96,7 @@ macro_rules! assert_complete_bridge_types(
with_bridged_chain_messages_instance: $mi:path,
this_chain: $this:path,
bridged_chain: $bridged:path,
+ expected_payload_type: $payload:path,
) => {
$crate::assert_chain_types!(runtime: $r, this_chain: $this);
$crate::assert_bridge_messages_pallet_types!(
@@ -104,6 +104,7 @@ macro_rules! assert_complete_bridge_types(
with_bridged_chain_messages_instance: $mi,
this_chain: $this,
bridged_chain: $bridged,
+ expected_payload_type: $payload,
);
}
);
diff --git a/cumulus/parachains/integration-tests/emulated/common/Cargo.toml b/cumulus/parachains/integration-tests/emulated/common/Cargo.toml
index bb142b163a5d8359f4055bfe97399f67381ed98b..1a8ddd4914f77dba0c6638cf178d0c227a3257dd 100644
--- a/cumulus/parachains/integration-tests/emulated/common/Cargo.toml
+++ b/cumulus/parachains/integration-tests/emulated/common/Cargo.toml
@@ -64,5 +64,3 @@ pallet-bridge-messages.workspace = true
pallet-bridge-messages.default-features = true
pallet-xcm-bridge-hub.workspace = true
pallet-xcm-bridge-hub.default-features = true
-bridge-runtime-common.workspace = true
-bridge-runtime-common.default-features = true
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/Cargo.toml b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/Cargo.toml
index d15881de3df904f7d1f5bbf0bc93f25f403a9d69..d7d242b49bbf7d70652d2690dc5fb442948a678f 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/Cargo.toml
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/Cargo.toml
@@ -76,7 +76,6 @@ parachains-common.workspace = true
testnet-parachains-constants = { features = ["rococo"], workspace = true }
bp-asset-hub-rococo.workspace = true
bp-asset-hub-westend.workspace = true
-bp-bridge-hub-polkadot.workspace = true
bp-bridge-hub-rococo.workspace = true
bp-bridge-hub-westend.workspace = true
bp-header-chain.workspace = true
@@ -118,7 +117,6 @@ default = ["std"]
std = [
"bp-asset-hub-rococo/std",
"bp-asset-hub-westend/std",
- "bp-bridge-hub-polkadot/std",
"bp-bridge-hub-rococo/std",
"bp-bridge-hub-westend/std",
"bp-header-chain/std",
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/bridge_to_bulletin_config.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/bridge_to_bulletin_config.rs
index b284fa9e7af7845a3aaa220b037806777faf8a40..aa0555899b7f5372ba3f0d7b5a2d2dac0cbc4d07 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/bridge_to_bulletin_config.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/bridge_to_bulletin_config.rs
@@ -204,6 +204,7 @@ mod tests {
with_bridged_chain_messages_instance: WithRococoBulletinMessagesInstance,
this_chain: bp_bridge_hub_rococo::BridgeHubRococo,
bridged_chain: bp_polkadot_bulletin::PolkadotBulletin,
+ expected_payload_type: XcmAsPlainPayload,
);
// we can't use `assert_complete_bridge_constants` here, because there's a trick with
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/bridge_to_westend_config.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/bridge_to_westend_config.rs
index a14101eb454bda852ec53043655431047e4b5eb3..d394af73e7478facb2b58d620b967829bcac451d 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/bridge_to_westend_config.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/bridge_to_westend_config.rs
@@ -295,6 +295,7 @@ mod tests {
with_bridged_chain_messages_instance: WithBridgeHubWestendMessagesInstance,
this_chain: bp_bridge_hub_rococo::BridgeHubRococo,
bridged_chain: bp_bridge_hub_westend::BridgeHubWestend,
+ expected_payload_type: XcmAsPlainPayload,
);
assert_complete_with_parachain_bridge_constants::<
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/bridge_to_rococo_config.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/bridge_to_rococo_config.rs
index 24e5482b7b097c03bef64b47df2d93b9470080c5..a5fb33cf504d50dccd01ef38d6339341c8362f90 100644
--- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/bridge_to_rococo_config.rs
+++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/bridge_to_rococo_config.rs
@@ -323,6 +323,7 @@ mod tests {
with_bridged_chain_messages_instance: WithBridgeHubRococoMessagesInstance,
this_chain: bp_bridge_hub_westend::BridgeHubWestend,
bridged_chain: bp_bridge_hub_rococo::BridgeHubRococo,
+ expected_payload_type: XcmAsPlainPayload,
);
assert_complete_with_parachain_bridge_constants::<
diff --git a/polkadot/xcm/xcm-builder/src/barriers.rs b/polkadot/xcm/xcm-builder/src/barriers.rs
index adba9a3ef79f14a78d84cd914e65ef3b18c33116..27153a3f441da0a9983bbbedbcaa090cf70bce8c 100644
--- a/polkadot/xcm/xcm-builder/src/barriers.rs
+++ b/polkadot/xcm/xcm-builder/src/barriers.rs
@@ -490,7 +490,7 @@ impl ShouldExecute for DenyReserveTransferToRelayChain {
if matches!(origin, Location { parents: 1, interior: Here }) =>
{
log::warn!(
- target: "xcm::barrier",
+ target: "xcm::barriers",
"Unexpected ReserveAssetDeposited from the Relay Chain",
);
Ok(ControlFlow::Continue(()))
diff --git a/prdoc/pr_7307.prdoc b/prdoc/pr_7307.prdoc
new file mode 100644
index 0000000000000000000000000000000000000000..b27aace0bd1391338477d104ef23772d844881e1
--- /dev/null
+++ b/prdoc/pr_7307.prdoc
@@ -0,0 +1,16 @@
+title: Bridges small nits/improvements
+doc:
+- audience: Runtime Dev
+ description: |
+ This PR introduces a new `expected_payload_type` parameter to the Bridges `assert_complete_bridge_types` macro.
+crates:
+- name: bridge-runtime-common
+ bump: patch
+- name: bridge-hub-rococo-runtime
+ bump: patch
+- name: bridge-hub-westend-runtime
+ bump: patch
+- name: staging-xcm-builder
+ bump: patch
+- name: emulated-integration-tests-common
+ bump: patch