parachain id use parachain info

Signed-off-by: zqhxuyuan <zqhxuyuan@gmail.com>
Manta-Network · Apr 6, 2023 · c9b119f · c9b119f
1 parent 09938af
commit c9b119f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/runtime/calamari/src/lib.rs b/runtime/calamari/src/lib.rs
@@ -1171,7 +1171,7 @@ impl_runtime_apis! {
                 ));
                 pub const CheckedAccount: Option<AccountId> = None;
                 pub const KsmLocation: MultiLocation = MultiLocation::parent();
-                pub KmaLocation: MultiLocation = MultiLocation::new(1, X1(Parachain(2084)));
+                pub KmaLocation: MultiLocation = MultiLocation::new(1, X1(Parachain(ParachainInfo::parachain_id().into())));
             }
 
             impl pallet_xcm_benchmarks::Config for Runtime {

diff --git a/runtime/manta/src/assets_config.rs b/runtime/manta/src/assets_config.rs
@@ -29,7 +29,6 @@ use manta_primitives::{
 };
 
 use frame_support::{pallet_prelude::DispatchResult, parameter_types, traits::ConstU32, PalletId};
-
 use frame_system::EnsureRoot;
 
 use xcm::VersionedMultiLocation;

diff --git a/runtime/manta/src/lib.rs b/runtime/manta/src/lib.rs
@@ -829,7 +829,7 @@ impl_runtime_apis! {
                 ));
                 pub const CheckedAccount: Option<AccountId> = None;
                 pub const DotLocation: MultiLocation = MultiLocation::parent();
-                pub MantaLocation: MultiLocation = MultiLocation::new(1, X1(Parachain(2104)));
+                pub MantaLocation: MultiLocation = MultiLocation::new(1, X1(Parachain(ParachainInfo::parachain_id().into())));
             }
 
             impl pallet_xcm_benchmarks::Config for Runtime {

diff --git a/runtime/manta/src/xcm_config.rs b/runtime/manta/src/xcm_config.rs
@@ -76,6 +76,7 @@ parameter_types! {
     pub SelfReserve: MultiLocation = MultiLocation::new(1, X1(Parachain(ParachainInfo::parachain_id().into())));
     pub CheckingAccount: AccountId = PolkadotXcm::check_account();
 }
+
 /// Type for specifying how a `MultiLocation` can be converted into an `AccountId`. This is used
 /// when determining ownership of accounts for asset transacting and when attempting to use XCM
 /// `Transact` in order to determine the dispatch Origin.
@@ -265,6 +266,7 @@ impl cumulus_pallet_xcm::Config for Runtime {
     type Event = Event;
     type XcmExecutor = XcmExecutor<XcmExecutorConfig>;
 }
+
 impl cumulus_pallet_xcmp_queue::Config for Runtime {
     type Event = Event;
     type XcmExecutor = XcmExecutor<XcmExecutorConfig>;
@@ -305,6 +307,7 @@ parameter_types! {
     pub const BaseXcmWeight: Weight = 100_000_000;
     pub const MaxAssetsForTransfer: usize = 2;
 }
+
 // The XCM message wrapper wrapper
 impl orml_xtokens::Config for Runtime {
     type Event = Event;