git.delta.rocks / unique-network / refs/commits / b486d2001581

difftreelog

fix RelayNetwork for Quartz

Daniel Shiposha2023-01-25parent: #2477690.patch.diff
in: master

4 files changed

modifiedruntime/common/config/xcm/mod.rsdiffbeforeafterboth
21use frame_system::EnsureRoot;21use frame_system::EnsureRoot;
22use pallet_xcm::XcmPassthrough;22use pallet_xcm::XcmPassthrough;
23use polkadot_parachain::primitives::Sibling;23use polkadot_parachain::primitives::Sibling;
24use xcm::latest::{prelude::*, Weight, MultiLocation, NetworkId};24use xcm::latest::{prelude::*, Weight, MultiLocation};
25use xcm_builder::{25use xcm_builder::{
26 AccountId32Aliases, EnsureXcmOrigin, FixedWeightBounds, LocationInverter, ParentAsSuperuser,26 AccountId32Aliases, EnsureXcmOrigin, FixedWeightBounds, LocationInverter, ParentAsSuperuser,
27 RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia,27 RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia,
31use sp_std::{marker::PhantomData, vec::Vec};31use sp_std::{marker::PhantomData, vec::Vec};
32use crate::{32use crate::{
33 Runtime, RuntimeCall, RuntimeEvent, RuntimeOrigin, ParachainInfo, ParachainSystem, PolkadotXcm,33 Runtime, RuntimeCall, RuntimeEvent, RuntimeOrigin, ParachainInfo, ParachainSystem, PolkadotXcm,
34 XcmpQueue, xcm_barrier::Barrier,34 XcmpQueue, xcm_barrier::Barrier, RelayNetwork,
35};35};
3636
37use up_common::types::AccountId;37use up_common::types::AccountId;
5252
53parameter_types! {53parameter_types! {
54 pub const RelayLocation: MultiLocation = MultiLocation::parent();54 pub const RelayLocation: MultiLocation = MultiLocation::parent();
55 pub const RelayNetwork: NetworkId = NetworkId::Polkadot;
56 pub RelayOrigin: RuntimeOrigin = cumulus_pallet_xcm::Origin::Relay.into();55 pub RelayOrigin: RuntimeOrigin = cumulus_pallet_xcm::Origin::Relay.into();
57 pub Ancestry: MultiLocation = Parachain(ParachainInfo::parachain_id().into()).into();56 pub Ancestry: MultiLocation = Parachain(ParachainInfo::parachain_id().into()).into();
58 pub SelfLocation: MultiLocation = MultiLocation::new(1, X1(Parachain(ParachainInfo::get().into())));57 pub SelfLocation: MultiLocation = MultiLocation::new(1, X1(Parachain(ParachainInfo::get().into())));
modifiedruntime/opal/src/lib.rsdiffbeforeafterboth
3434
35use up_common::types::*;35use up_common::types::*;
36
37use ::xcm::latest::NetworkId;
3638
37#[path = "../../common/mod.rs"]39#[path = "../../common/mod.rs"]
38mod runtime_common;40mod runtime_common;
63 pub const Version: RuntimeVersion = VERSION;65 pub const Version: RuntimeVersion = VERSION;
64 pub const SS58Prefix: u16 = 42;66 pub const SS58Prefix: u16 = 42;
65 pub const ChainId: u64 = 8882;67 pub const ChainId: u64 = 8882;
68 pub const RelayNetwork: NetworkId = NetworkId::Kusama;
66}69}
6770
68construct_runtime!();71construct_runtime!();
modifiedruntime/quartz/src/lib.rsdiffbeforeafterboth
3434
35use up_common::types::*;35use up_common::types::*;
36
37use ::xcm::latest::NetworkId;
3638
37#[path = "../../common/mod.rs"]39#[path = "../../common/mod.rs"]
38mod runtime_common;40mod runtime_common;
6466
65parameter_types! {67parameter_types! {
66 pub const Version: RuntimeVersion = VERSION;68 pub const Version: RuntimeVersion = VERSION;
69 pub const RelayNetwork: NetworkId = NetworkId::Kusama;
67}70}
68#[cfg(feature = "become-sapphire")]71#[cfg(feature = "become-sapphire")]
69parameter_types! {72parameter_types! {
modifiedruntime/unique/src/lib.rsdiffbeforeafterboth
3434
35use up_common::types::*;35use up_common::types::*;
36
37use ::xcm::latest::NetworkId;
3638
37#[path = "../../common/mod.rs"]39#[path = "../../common/mod.rs"]
38mod runtime_common;40mod runtime_common;
63 pub const Version: RuntimeVersion = VERSION;65 pub const Version: RuntimeVersion = VERSION;
64 pub const SS58Prefix: u16 = 7391;66 pub const SS58Prefix: u16 = 7391;
65 pub const ChainId: u64 = 8880;67 pub const ChainId: u64 = 8880;
68 pub const RelayNetwork: NetworkId = NetworkId::Polkadot;
66}69}
6770
68construct_runtime!();71construct_runtime!();