diff --git a/bridges/bin/runtime-common/src/messages_benchmarking.rs b/bridges/bin/runtime-common/src/messages_benchmarking.rs
index e7e7891461b2160a3d51b7731b300af58b80b2d6..0c7a9ad1a83d6a83e0c9fe1f5e77ba2c4cefc17d 100644
--- a/bridges/bin/runtime-common/src/messages_benchmarking.rs
+++ b/bridges/bin/runtime-common/src/messages_benchmarking.rs
@@ -38,7 +38,7 @@ use frame_support::weights::Weight;
use pallet_bridge_messages::benchmarking::{MessageDeliveryProofParams, MessageProofParams};
use sp_runtime::traits::{Header, Zero};
use sp_std::prelude::*;
-use xcm::v3::prelude::*;
+use xcm::latest::prelude::*;
/// Prepare inbound bridge message according to given message proof parameters.
fn prepare_inbound_message(
@@ -266,19 +266,19 @@ where
/// Returns callback which generates `BridgeMessage` from Polkadot XCM builder based on
/// `expected_message_size` for benchmark.
pub fn generate_xcm_builder_bridge_message_sample(
- destination: InteriorMultiLocation,
+ destination: InteriorLocation,
) -> impl Fn(usize) -> MessagePayload {
move |expected_message_size| -> MessagePayload {
// For XCM bridge hubs, it is the message that
// will be pushed further to some XCM queue (XCMP/UMP)
- let location = xcm::VersionedInteriorMultiLocation::V3(destination);
+ let location = xcm::VersionedInteriorLocation::V4(destination.clone());
let location_encoded_size = location.encoded_size();
// we don't need to be super-precise with `expected_size` here
let xcm_size = expected_message_size.saturating_sub(location_encoded_size);
let xcm_data_size = xcm_size.saturating_sub(
// minus empty instruction size
- xcm::v3::Instruction::<()>::ExpectPallet {
+ Instruction::<()>::ExpectPallet {
index: 0,
name: vec![],
module_name: vec![],
@@ -294,8 +294,8 @@ pub fn generate_xcm_builder_bridge_message_sample(
expected_message_size, location_encoded_size, xcm_size, xcm_data_size,
);
- let xcm = xcm::VersionedXcm::<()>::V3(
- vec![xcm::v3::Instruction::<()>::ExpectPallet {
+ let xcm = xcm::VersionedXcm::<()>::V4(
+ vec![Instruction::<()>::ExpectPallet {
index: 0,
name: vec![42; xcm_data_size],
module_name: vec![],
diff --git a/bridges/bin/runtime-common/src/messages_xcm_extension.rs b/bridges/bin/runtime-common/src/messages_xcm_extension.rs
index 4892297a3dfdfb88e92ede25f667a26696fdfcd1..e3da6155f08a198d5469adbfc64e40213eddf8eb 100644
--- a/bridges/bin/runtime-common/src/messages_xcm_extension.rs
+++ b/bridges/bin/runtime-common/src/messages_xcm_extension.rs
@@ -126,14 +126,14 @@ impl<
#[cfg_attr(feature = "std", derive(Debug, Eq, PartialEq))]
pub struct SenderAndLane {
/// Sending chain relative location.
- pub location: MultiLocation,
+ pub location: Location,
/// Message lane, used by the sending chain.
pub lane: LaneId,
}
impl SenderAndLane {
/// Create new object using provided location and lane.
- pub fn new(location: MultiLocation, lane: LaneId) -> Self {
+ pub fn new(location: Location, lane: LaneId) -> Self {
SenderAndLane { location, lane }
}
}
@@ -171,7 +171,7 @@ pub struct XcmBlobHaulerAdapter<XcmBlobHauler, Lanes>(
impl<
H: XcmBlobHauler,
- Lanes: Get<sp_std::vec::Vec<(SenderAndLane, (NetworkId, InteriorMultiLocation))>>,
+ Lanes: Get<sp_std::vec::Vec<(SenderAndLane, (NetworkId, InteriorLocation))>>,
> OnMessagesDelivered for XcmBlobHaulerAdapter<H, Lanes>
{
fn on_messages_delivered(lane: LaneId, enqueued_messages: MessageNonce) {
@@ -291,7 +291,7 @@ impl<H: XcmBlobHauler> LocalXcmQueueManager<H> {
/// Send congested signal to the `sending_chain_location`.
fn send_congested_signal(sender_and_lane: &SenderAndLane) -> Result<(), SendError> {
if let Some(msg) = H::CongestedMessage::get() {
- send_xcm::<H::ToSourceChainSender>(sender_and_lane.location, msg)?;
+ send_xcm::<H::ToSourceChainSender>(sender_and_lane.location.clone(), msg)?;
OutboundLanesCongestedSignals::<H::Runtime, H::MessagesInstance>::insert(
sender_and_lane.lane,
true,
@@ -303,7 +303,7 @@ impl<H: XcmBlobHauler> LocalXcmQueueManager<H> {
/// Send `uncongested` signal to the `sending_chain_location`.
fn send_uncongested_signal(sender_and_lane: &SenderAndLane) -> Result<(), SendError> {
if let Some(msg) = H::UncongestedMessage::get() {
- send_xcm::<H::ToSourceChainSender>(sender_and_lane.location, msg)?;
+ send_xcm::<H::ToSourceChainSender>(sender_and_lane.location.clone(), msg)?;
OutboundLanesCongestedSignals::<H::Runtime, H::MessagesInstance>::remove(
sender_and_lane.lane,
);
@@ -318,10 +318,10 @@ impl<H: XcmBlobHauler> LocalXcmQueueManager<H> {
pub struct XcmVersionOfDestAndRemoteBridge<Version, RemoteBridge>(
sp_std::marker::PhantomData<(Version, RemoteBridge)>,
);
-impl<Version: GetVersion, RemoteBridge: Get<MultiLocation>> GetVersion
+impl<Version: GetVersion, RemoteBridge: Get<Location>> GetVersion
for XcmVersionOfDestAndRemoteBridge<Version, RemoteBridge>
{
- fn get_version_for(dest: &MultiLocation) -> Option<XcmVersion> {
+ fn get_version_for(dest: &Location) -> Option<XcmVersion> {
let dest_version = Version::get_version_for(dest);
let bridge_hub_version = Version::get_version_for(&RemoteBridge::get());
@@ -345,11 +345,11 @@ mod tests {
parameter_types! {
pub TestSenderAndLane: SenderAndLane = SenderAndLane {
- location: MultiLocation::new(1, X1(Parachain(1000))),
+ location: Location::new(1, [Parachain(1000)]),
lane: TEST_LANE_ID,
};
- pub TestLanes: sp_std::vec::Vec<(SenderAndLane, (NetworkId, InteriorMultiLocation))> = sp_std::vec![
- (TestSenderAndLane::get(), (NetworkId::ByGenesis([0; 32]), InteriorMultiLocation::Here))
+ pub TestLanes: sp_std::vec::Vec<(SenderAndLane, (NetworkId, InteriorLocation))> = sp_std::vec![
+ (TestSenderAndLane::get(), (NetworkId::ByGenesis([0; 32]), InteriorLocation::Here))
];
pub DummyXcmMessage: Xcm<()> = Xcm::new();
}
@@ -366,7 +366,7 @@ mod tests {
type Ticket = ();
fn validate(
- _destination: &mut Option<MultiLocation>,
+ _destination: &mut Option<Location>,
_message: &mut Option<Xcm<()>>,
) -> SendResult<Self::Ticket> {
Ok(((), Default::default()))
diff --git a/bridges/modules/parachains/src/lib.rs b/bridges/modules/parachains/src/lib.rs
index 9adeacb0eb882de419d3048211ad716278e8d410..87c57e84622aa7cb5eb1019ec88a680dc06fd8ee 100644
--- a/bridges/modules/parachains/src/lib.rs
+++ b/bridges/modules/parachains/src/lib.rs
@@ -1494,7 +1494,7 @@ pub(crate) mod tests {
);
// then if someone is pretending to provide updated head#10 of parachain#1 at relay
- // block#30, and actualy provides it
+ // block#30, and actually provides it
//
// => we'll update value
proceed(30, state_root_10_at_30);
diff --git a/bridges/modules/relayers/src/benchmarking.rs b/bridges/modules/relayers/src/benchmarking.rs
index 2d74ab38f9dbd1711b62df5e6bebd697fda1b988..00c3814a4c38d9bf0f18b70c0eedc75c239b8ad0 100644
--- a/bridges/modules/relayers/src/benchmarking.rs
+++ b/bridges/modules/relayers/src/benchmarking.rs
@@ -104,7 +104,7 @@ benchmarks! {
// create slash destination account
let lane = LaneId([0, 0, 0, 0]);
let slash_destination = RewardsAccountParams::new(lane, *b"test", RewardsAccountOwner::ThisChain);
- T::prepare_rewards_account(slash_destination.clone(), Zero::zero());
+ T::prepare_rewards_account(slash_destination, Zero::zero());
}: {
crate::Pallet::<T>::slash_and_deregister(&relayer, slash_destination)
}
@@ -121,7 +121,7 @@ benchmarks! {
let account_params =
RewardsAccountParams::new(lane, *b"test", RewardsAccountOwner::ThisChain);
}: {
- crate::Pallet::<T>::register_relayer_reward(account_params.clone(), &relayer, One::one());
+ crate::Pallet::<T>::register_relayer_reward(account_params, &relayer, One::one());
}
verify {
assert_eq!(RelayerRewards::<T>::get(relayer, &account_params), Some(One::one()));
diff --git a/bridges/modules/xcm-bridge-hub-router/src/benchmarking.rs b/bridges/modules/xcm-bridge-hub-router/src/benchmarking.rs
index 922e4bf94ba8a947f1fcc2f83db675f539cfc295..c4f9f534c1a479cd7dc4ba545353b9d92c45d2c8 100644
--- a/bridges/modules/xcm-bridge-hub-router/src/benchmarking.rs
+++ b/bridges/modules/xcm-bridge-hub-router/src/benchmarking.rs
@@ -37,10 +37,10 @@ pub trait Config<I: 'static>: crate::Config<I> {
/// Returns destination which is valid for this router instance.
/// (Needs to pass `T::Bridges`)
/// Make sure that `SendXcm` will pass.
- fn ensure_bridged_target_destination() -> Result<MultiLocation, BenchmarkError> {
- Ok(MultiLocation::new(
+ fn ensure_bridged_target_destination() -> Result<Location, BenchmarkError> {
+ Ok(Location::new(
Self::UniversalLocation::get().len() as u8,
- X1(GlobalConsensus(Self::BridgedNetworkId::get().unwrap())),
+ [GlobalConsensus(Self::BridgedNetworkId::get().unwrap())],
))
}
}
diff --git a/bridges/modules/xcm-bridge-hub-router/src/lib.rs b/bridges/modules/xcm-bridge-hub-router/src/lib.rs
index 229628aedcb8a67f1bc8b652a55fc967f106dbe0..f219be78f9e1b5469fb752eed3f662c954d0ec42 100644
--- a/bridges/modules/xcm-bridge-hub-router/src/lib.rs
+++ b/bridges/modules/xcm-bridge-hub-router/src/lib.rs
@@ -80,7 +80,7 @@ pub mod pallet {
type WeightInfo: WeightInfo;
/// Universal location of this runtime.
- type UniversalLocation: Get<InteriorMultiLocation>;
+ type UniversalLocation: Get<InteriorLocation>;
/// The bridged network that this config is for if specified.
/// Also used for filtering `Bridges` by `BridgedNetworkId`.
/// If not specified, allows all networks pass through.
@@ -235,9 +235,9 @@ type ViaBridgeHubExporter<T, I> = SovereignPaidRemoteExporter<
impl<T: Config<I>, I: 'static> ExporterFor for Pallet<T, I> {
fn exporter_for(
network: &NetworkId,
- remote_location: &InteriorMultiLocation,
+ remote_location: &InteriorLocation,
message: &Xcm<()>,
- ) -> Option<(MultiLocation, Option<MultiAsset>)> {
+ ) -> Option<(Location, Option<Asset>)> {
// ensure that the message is sent to the expected bridged network (if specified).
if let Some(bridged_network) = T::BridgedNetworkId::get() {
if *network != bridged_network {
@@ -268,7 +268,7 @@ impl<T: Config<I>, I: 'static> ExporterFor for Pallet<T, I> {
// take `base_fee` from `T::Brides`, but it has to be the same `T::FeeAsset`
let base_fee = match maybe_payment {
Some(payment) => match payment {
- MultiAsset { fun: Fungible(amount), id } if id.eq(&T::FeeAsset::get()) => amount,
+ Asset { fun: Fungible(amount), id } if id.eq(&T::FeeAsset::get()) => amount,
invalid_asset => {
log::error!(
target: LOG_TARGET,
@@ -318,7 +318,7 @@ impl<T: Config<I>, I: 'static> SendXcm for Pallet<T, I> {
type Ticket = (u32, <T::ToBridgeHubSender as SendXcm>::Ticket);
fn validate(
- dest: &mut Option<MultiLocation>,
+ dest: &mut Option<Location>,
xcm: &mut Option<Xcm<()>>,
) -> SendResult<Self::Ticket> {
// `dest` and `xcm` are required here
@@ -446,7 +446,7 @@ mod tests {
run_test(|| {
assert_eq!(
send_xcm::<XcmBridgeHubRouter>(
- MultiLocation::new(2, X2(GlobalConsensus(Rococo), Parachain(1000))),
+ Location::new(2, [GlobalConsensus(Rococo), Parachain(1000)]),
vec![].into(),
),
Err(SendError::NotApplicable),
@@ -459,7 +459,7 @@ mod tests {
run_test(|| {
assert_eq!(
send_xcm::<XcmBridgeHubRouter>(
- MultiLocation::new(2, X2(GlobalConsensus(Rococo), Parachain(1000))),
+ Location::new(2, [GlobalConsensus(Rococo), Parachain(1000)]),
vec![ClearOrigin; HARD_MESSAGE_SIZE_LIMIT as usize].into(),
),
Err(SendError::ExceedsMaxMessageSize),
@@ -483,14 +483,14 @@ mod tests {
#[test]
fn returns_proper_delivery_price() {
run_test(|| {
- let dest = MultiLocation::new(2, X1(GlobalConsensus(BridgedNetworkId::get())));
+ let dest = Location::new(2, [GlobalConsensus(BridgedNetworkId::get())]);
let xcm: Xcm<()> = vec![ClearOrigin].into();
let msg_size = xcm.encoded_size();
// initially the base fee is used: `BASE_FEE + BYTE_FEE * msg_size + HRMP_FEE`
let expected_fee = BASE_FEE + BYTE_FEE * (msg_size as u128) + HRMP_FEE;
assert_eq!(
- XcmBridgeHubRouter::validate(&mut Some(dest), &mut Some(xcm.clone()))
+ XcmBridgeHubRouter::validate(&mut Some(dest.clone()), &mut Some(xcm.clone()))
.unwrap()
.1
.get(0),
@@ -518,10 +518,7 @@ mod tests {
run_test(|| {
let old_bridge = XcmBridgeHubRouter::bridge();
assert_ok!(send_xcm::<XcmBridgeHubRouter>(
- MultiLocation::new(
- 2,
- X2(GlobalConsensus(BridgedNetworkId::get()), Parachain(1000))
- ),
+ Location::new(2, [GlobalConsensus(BridgedNetworkId::get()), Parachain(1000)]),
vec![ClearOrigin].into(),
)
.map(drop));
@@ -538,10 +535,7 @@ mod tests {
let old_bridge = XcmBridgeHubRouter::bridge();
assert_ok!(send_xcm::<XcmBridgeHubRouter>(
- MultiLocation::new(
- 2,
- X2(GlobalConsensus(BridgedNetworkId::get()), Parachain(1000))
- ),
+ Location::new(2, [GlobalConsensus(BridgedNetworkId::get()), Parachain(1000)]),
vec![ClearOrigin].into(),
)
.map(drop));
@@ -560,10 +554,7 @@ mod tests {
let old_bridge = XcmBridgeHubRouter::bridge();
assert_ok!(send_xcm::<XcmBridgeHubRouter>(
- MultiLocation::new(
- 2,
- X2(GlobalConsensus(BridgedNetworkId::get()), Parachain(1000))
- ),
+ Location::new(2, [GlobalConsensus(BridgedNetworkId::get()), Parachain(1000)]),
vec![ClearOrigin].into(),
)
.map(drop));
diff --git a/bridges/modules/xcm-bridge-hub-router/src/mock.rs b/bridges/modules/xcm-bridge-hub-router/src/mock.rs
index 9079f4b9c4c64e980f5be66e9cd99fe8dd7e20fa..6dbfba5f6fdc1f521fb2fdf000ffb778740435e6 100644
--- a/bridges/modules/xcm-bridge-hub-router/src/mock.rs
+++ b/bridges/modules/xcm-bridge-hub-router/src/mock.rs
@@ -49,9 +49,9 @@ construct_runtime! {
parameter_types! {
pub ThisNetworkId: NetworkId = Polkadot;
pub BridgedNetworkId: NetworkId = Kusama;
- pub UniversalLocation: InteriorMultiLocation = X2(GlobalConsensus(ThisNetworkId::get()), Parachain(1000));
- pub SiblingBridgeHubLocation: MultiLocation = ParentThen(X1(Parachain(1002))).into();
- pub BridgeFeeAsset: AssetId = MultiLocation::parent().into();
+ pub UniversalLocation: InteriorLocation = [GlobalConsensus(ThisNetworkId::get()), Parachain(1000)].into();
+ pub SiblingBridgeHubLocation: Location = ParentThen([Parachain(1002)].into()).into();
+ pub BridgeFeeAsset: AssetId = Location::parent().into();
pub BridgeTable: Vec<NetworkExportTableItem>
= vec![
NetworkExportTableItem::new(
@@ -61,7 +61,7 @@ parameter_types! {
Some((BridgeFeeAsset::get(), BASE_FEE).into())
)
];
- pub UnknownXcmVersionLocation: MultiLocation = MultiLocation::new(2, X2(GlobalConsensus(BridgedNetworkId::get()), Parachain(9999)));
+ pub UnknownXcmVersionLocation: Location = Location::new(2, [GlobalConsensus(BridgedNetworkId::get()), Parachain(9999)]);
}
#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
@@ -87,11 +87,11 @@ impl pallet_xcm_bridge_hub_router::Config<()> for TestRuntime {
}
pub struct LatestOrNoneForLocationVersionChecker<Location>(sp_std::marker::PhantomData<Location>);
-impl<Location: Contains<MultiLocation>> GetVersion
- for LatestOrNoneForLocationVersionChecker<Location>
+impl<LocationValue: Contains<Location>> GetVersion
+ for LatestOrNoneForLocationVersionChecker<LocationValue>
{
- fn get_version_for(dest: &MultiLocation) -> Option<XcmVersion> {
- if Location::contains(dest) {
+ fn get_version_for(dest: &Location) -> Option<XcmVersion> {
+ if LocationValue::contains(dest) {
return None
}
Some(XCM_VERSION)
@@ -110,7 +110,7 @@ impl SendXcm for TestToBridgeHubSender {
type Ticket = ();
fn validate(
- _destination: &mut Option<MultiLocation>,
+ _destination: &mut Option<Location>,
_message: &mut Option<Xcm<()>>,
) -> SendResult<Self::Ticket> {
Ok(((), (BridgeFeeAsset::get(), HRMP_FEE).into()))
diff --git a/bridges/modules/xcm-bridge-hub/src/exporter.rs b/bridges/modules/xcm-bridge-hub/src/exporter.rs
index 4e899dfa0113969a7134d2ea85c71a9bb0b48fc5..94ec8b5f106fdb9ce5e229a41579d26e789b5673 100644
--- a/bridges/modules/xcm-bridge-hub/src/exporter.rs
+++ b/bridges/modules/xcm-bridge-hub/src/exporter.rs
@@ -53,10 +53,10 @@ where
fn validate(
network: NetworkId,
channel: u32,
- universal_source: &mut Option<InteriorMultiLocation>,
- destination: &mut Option<InteriorMultiLocation>,
+ universal_source: &mut Option<InteriorLocation>,
+ destination: &mut Option<InteriorLocation>,
message: &mut Option<Xcm<()>>,
- ) -> Result<(Self::Ticket, MultiAssets), SendError> {
+ ) -> Result<(Self::Ticket, Assets), SendError> {
// Find supported lane_id.
let sender_and_lane = Self::lane_for(
universal_source.as_ref().ok_or(SendError::MissingArgument)?,
@@ -134,11 +134,11 @@ mod tests {
use frame_support::assert_ok;
use xcm_executor::traits::export_xcm;
- fn universal_source() -> InteriorMultiLocation {
- X2(GlobalConsensus(RelayNetwork::get()), Parachain(SIBLING_ASSET_HUB_ID))
+ fn universal_source() -> InteriorLocation {
+ [GlobalConsensus(RelayNetwork::get()), Parachain(SIBLING_ASSET_HUB_ID)].into()
}
- fn universal_destination() -> InteriorMultiLocation {
+ fn universal_destination() -> InteriorLocation {
BridgedDestination::get()
}
diff --git a/bridges/modules/xcm-bridge-hub/src/lib.rs b/bridges/modules/xcm-bridge-hub/src/lib.rs
index 44f6903b018b839fa3f4c97a0ba2c84c7d239c89..60b988497fc59e94cbfe1a6e30cd6f3039d8c331 100644
--- a/bridges/modules/xcm-bridge-hub/src/lib.rs
+++ b/bridges/modules/xcm-bridge-hub/src/lib.rs
@@ -45,25 +45,25 @@ pub mod pallet {
BridgeMessagesConfig<Self::BridgeMessagesPalletInstance>
{
/// Runtime's universal location.
- type UniversalLocation: Get<InteriorMultiLocation>;
+ type UniversalLocation: Get<InteriorLocation>;
// TODO: https://github.com/paritytech/parity-bridges-common/issues/1666 remove `ChainId` and
// replace it with the `NetworkId` - then we'll be able to use
// `T as pallet_bridge_messages::Config<T::BridgeMessagesPalletInstance>::BridgedChain::NetworkId`
/// Bridged network as relative location of bridged `GlobalConsensus`.
#[pallet::constant]
- type BridgedNetwork: Get<MultiLocation>;
+ type BridgedNetwork: Get<Location>;
/// Associated messages pallet instance that bridges us with the
/// `BridgedNetworkId` consensus.
type BridgeMessagesPalletInstance: 'static;
/// Price of single message export to the bridged consensus (`Self::BridgedNetworkId`).
- type MessageExportPrice: Get<MultiAssets>;
+ type MessageExportPrice: Get<Assets>;
/// Checks the XCM version for the destination.
type DestinationVersion: GetVersion;
/// Get point-to-point links with bridged consensus (`Self::BridgedNetworkId`).
/// (this will be replaced with dynamic on-chain bridges - `Bridges V2`)
- type Lanes: Get<sp_std::vec::Vec<(SenderAndLane, (NetworkId, InteriorMultiLocation))>>;
+ type Lanes: Get<sp_std::vec::Vec<(SenderAndLane, (NetworkId, InteriorLocation))>>;
/// Support for point-to-point links
/// (this will be replaced with dynamic on-chain bridges - `Bridges V2`)
type LanesSupport: XcmBlobHauler;
@@ -86,10 +86,10 @@ pub mod pallet {
impl<T: Config<I>, I: 'static> Pallet<T, I> {
/// Returns dedicated/configured lane identifier.
pub(crate) fn lane_for(
- source: &InteriorMultiLocation,
- dest: (&NetworkId, &InteriorMultiLocation),
+ source: &InteriorLocation,
+ dest: (&NetworkId, &InteriorLocation),
) -> Option<SenderAndLane> {
- let source = source.relative_to(&T::UniversalLocation::get());
+ let source = source.clone().relative_to(&T::UniversalLocation::get());
// Check that we have configured a point-to-point lane for 'source' and `dest`.
T::Lanes::get()
diff --git a/bridges/modules/xcm-bridge-hub/src/mock.rs b/bridges/modules/xcm-bridge-hub/src/mock.rs
index 97fc7741e4058583283b5332f443bb1a49cb4f84..e40e1f9fb65157feffebeaa53e16c7def2ad22e0 100644
--- a/bridges/modules/xcm-bridge-hub/src/mock.rs
+++ b/bridges/modules/xcm-bridge-hub/src/mock.rs
@@ -154,16 +154,13 @@ impl pallet_bridge_messages::WeightInfoExt for TestMessagesWeights {
parameter_types! {
pub const RelayNetwork: NetworkId = NetworkId::Kusama;
pub const BridgedRelayNetwork: NetworkId = NetworkId::Polkadot;
- pub const BridgedRelayNetworkLocation: MultiLocation = MultiLocation {
- parents: 1,
- interior: X1(GlobalConsensus(BridgedRelayNetwork::get()))
- };
+ pub BridgedRelayNetworkLocation: Location = (Parent, GlobalConsensus(BridgedRelayNetwork::get())).into();
pub const NonBridgedRelayNetwork: NetworkId = NetworkId::Rococo;
pub const BridgeReserve: Balance = 100_000;
- pub UniversalLocation: InteriorMultiLocation = X2(
+ pub UniversalLocation: InteriorLocation = [
GlobalConsensus(RelayNetwork::get()),
Parachain(THIS_BRIDGE_HUB_ID),
- );
+ ].into();
pub const Penalty: Balance = 1_000;
}
@@ -181,13 +178,13 @@ impl pallet_xcm_bridge_hub::Config for TestRuntime {
parameter_types! {
pub TestSenderAndLane: SenderAndLane = SenderAndLane {
- location: MultiLocation::new(1, X1(Parachain(SIBLING_ASSET_HUB_ID))),
+ location: Location::new(1, [Parachain(SIBLING_ASSET_HUB_ID)]),
lane: TEST_LANE_ID,
};
- pub const BridgedDestination: InteriorMultiLocation = X1(
+ pub BridgedDestination: InteriorLocation = [
Parachain(BRIDGED_ASSET_HUB_ID)
- );
- pub TestLanes: sp_std::vec::Vec<(SenderAndLane, (NetworkId, InteriorMultiLocation))> = sp_std::vec![
+ ].into();
+ pub TestLanes: sp_std::vec::Vec<(SenderAndLane, (NetworkId, InteriorLocation))> = sp_std::vec![
(TestSenderAndLane::get(), (BridgedRelayNetwork::get(), BridgedDestination::get()))
];
}
diff --git a/bridges/primitives/runtime/src/chain.rs b/bridges/primitives/runtime/src/chain.rs
index 7ca956e2670137c274b8733b800fa978098868bd..9ba21a1cddf13896b21494045cea7fdd92259ce8 100644
--- a/bridges/primitives/runtime/src/chain.rs
+++ b/bridges/primitives/runtime/src/chain.rs
@@ -203,7 +203,7 @@ pub trait Chain: Send + Sync + 'static {
}
/// A trait that provides the type of the underlying chain.
-pub trait UnderlyingChainProvider {
+pub trait UnderlyingChainProvider: Send + Sync + 'static {
/// Underlying chain type.
type Chain: Chain;
}
diff --git a/bridges/relays/client-substrate/src/calls.rs b/bridges/relays/client-substrate/src/calls.rs
index 4e0ae9d99d2e6905a55e06646e2cc515d0e96768..71b9ec84aca30cc2384b50d4c99466798f46d72f 100644
--- a/bridges/relays/client-substrate/src/calls.rs
+++ b/bridges/relays/client-substrate/src/calls.rs
@@ -20,7 +20,7 @@ use codec::{Decode, Encode};
use scale_info::TypeInfo;
use sp_std::{boxed::Box, vec::Vec};
-use xcm::{VersionedMultiLocation, VersionedXcm};
+use xcm::{VersionedLocation, VersionedXcm};
/// A minimized version of `frame-system::Call` that can be used without a runtime.
#[derive(Encode, Decode, Debug, PartialEq, Eq, Clone, TypeInfo)]
@@ -55,5 +55,5 @@ pub enum SudoCall<Call> {
pub enum XcmCall {
/// `pallet-xcm::Call::send`
#[codec(index = 0)]
- send(Box<VersionedMultiLocation>, Box<VersionedXcm<()>>),
+ send(Box<VersionedLocation>, Box<VersionedXcm<()>>),
}