From b486d20015814106971000784a0e51c193460d64 Mon Sep 17 00:00:00 2001 From: Daniel Shiposha Date: Wed, 25 Jan 2023 13:52:52 +0000 Subject: [PATCH] fix: RelayNetwork for Quartz --- --- a/runtime/common/config/xcm/mod.rs +++ b/runtime/common/config/xcm/mod.rs @@ -21,7 +21,7 @@ use frame_system::EnsureRoot; use pallet_xcm::XcmPassthrough; use polkadot_parachain::primitives::Sibling; -use xcm::latest::{prelude::*, Weight, MultiLocation, NetworkId}; +use xcm::latest::{prelude::*, Weight, MultiLocation}; use xcm_builder::{ AccountId32Aliases, EnsureXcmOrigin, FixedWeightBounds, LocationInverter, ParentAsSuperuser, RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia, @@ -31,7 +31,7 @@ use sp_std::{marker::PhantomData, vec::Vec}; use crate::{ Runtime, RuntimeCall, RuntimeEvent, RuntimeOrigin, ParachainInfo, ParachainSystem, PolkadotXcm, - XcmpQueue, xcm_barrier::Barrier, + XcmpQueue, xcm_barrier::Barrier, RelayNetwork, }; use up_common::types::AccountId; @@ -52,7 +52,6 @@ parameter_types! { pub const RelayLocation: MultiLocation = MultiLocation::parent(); - pub const RelayNetwork: NetworkId = NetworkId::Polkadot; pub RelayOrigin: RuntimeOrigin = cumulus_pallet_xcm::Origin::Relay.into(); pub Ancestry: MultiLocation = Parachain(ParachainInfo::parachain_id().into()).into(); pub SelfLocation: MultiLocation = MultiLocation::new(1, X1(Parachain(ParachainInfo::get().into()))); --- a/runtime/opal/src/lib.rs +++ b/runtime/opal/src/lib.rs @@ -34,6 +34,8 @@ use up_common::types::*; +use ::xcm::latest::NetworkId; + #[path = "../../common/mod.rs"] mod runtime_common; @@ -63,6 +65,7 @@ pub const Version: RuntimeVersion = VERSION; pub const SS58Prefix: u16 = 42; pub const ChainId: u64 = 8882; + pub const RelayNetwork: NetworkId = NetworkId::Kusama; } construct_runtime!(); --- a/runtime/quartz/src/lib.rs +++ b/runtime/quartz/src/lib.rs @@ -34,6 +34,8 @@ use up_common::types::*; +use ::xcm::latest::NetworkId; + #[path = "../../common/mod.rs"] mod runtime_common; @@ -64,6 +66,7 @@ parameter_types! { pub const Version: RuntimeVersion = VERSION; + pub const RelayNetwork: NetworkId = NetworkId::Kusama; } #[cfg(feature = "become-sapphire")] parameter_types! { --- a/runtime/unique/src/lib.rs +++ b/runtime/unique/src/lib.rs @@ -34,6 +34,8 @@ use up_common::types::*; +use ::xcm::latest::NetworkId; + #[path = "../../common/mod.rs"] mod runtime_common; @@ -63,6 +65,7 @@ pub const Version: RuntimeVersion = VERSION; pub const SS58Prefix: u16 = 7391; pub const ChainId: u64 = 8880; + pub const RelayNetwork: NetworkId = NetworkId::Polkadot; } construct_runtime!(); -- gitstuff