Skip to content
This repository was archived by the owner on May 21, 2024. It is now read-only.

change "Rockimine" for "AssetHub" #271

Merged
hbulgarini merged 1 commit into from
Aug 29, 2023
Merged

change "Rockimine" for "AssetHub" #271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions runtime/stout/src/xcm_config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,10 +213,10 @@ pub type Barrier = DenyThenTry<
>;

parameter_types! {
pub RockmineLocation: MultiLocation = MultiLocation::new(1, X1(Parachain(1000)));
pub AssetHubLocation: MultiLocation = MultiLocation::new(1, X1(Parachain(1000)));
// ALWAYS ensure that the index in PalletInstance stays up-to-date with
// Rockmine's Assets pallet index
pub RockmineAssetsPalletLocation: MultiLocation =
// AssetHub's Assets pallet index
pub AssetHubAssetsPalletLocation: MultiLocation =
MultiLocation::new(1, X2(Parachain(1000), PalletInstance(50)));
pub RUsdPerSecond: (xcm::v3::AssetId, u128, u128) = (
MultiLocation::new(1, X3(Parachain(1000), PalletInstance(50), GeneralIndex(1984))).into(),
Expand Down
4 changes: 2 additions & 2 deletions runtime/trappist/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1102,7 +1102,7 @@ impl_runtime_apis! {
impl cumulus_pallet_session_benchmarking::Config for Runtime {}

use xcm::latest::prelude::*;
use xcm_config::{RelayLocation, SelfReserve, RockmineLocation};
use xcm_config::{RelayLocation, SelfReserve, AssetHubLocation};
use pallet_xcm_benchmarks::asset_instance_from;

impl pallet_xcm_benchmarks::Config for Runtime {
Expand Down Expand Up @@ -1140,7 +1140,7 @@ impl_runtime_apis! {

parameter_types! {
pub TrustedTeleporter: Option<(MultiLocation, MultiAsset)> = Some((
RockmineLocation::get(),
AssetHubLocation::get(),
MultiAsset { fun: Fungible(1 * UNITS), id: Concrete(SelfReserve::get()) },
));
pub const CheckedAccount: Option<(AccountId, xcm_builder::MintLocation)> = None;
Expand Down
12 changes: 6 additions & 6 deletions runtime/trappist/src/xcm_config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ match_types! {
};
}
match_types! {
pub type Rockmine: impl Contains<MultiLocation> = {
pub type AssetHub: impl Contains<MultiLocation> = {
MultiLocation { parents: 1, interior: X1(Parachain(1000)) }
};
}
Expand All @@ -216,10 +216,10 @@ pub type Barrier = DenyThenTry<
>;

parameter_types! {
pub RockmineLocation: MultiLocation = MultiLocation::new(1, X1(Parachain(1000)));
pub AssetHubLocation: MultiLocation = MultiLocation::new(1, X1(Parachain(1000)));
// ALWAYS ensure that the index in PalletInstance stays up-to-date with
// Rockmine's Assets pallet index
pub RockmineAssetsPalletLocation: MultiLocation =
// AssetHub's Assets pallet index
pub AssetHubAssetsPalletLocation: MultiLocation =
MultiLocation::new(1, X2(Parachain(1000), PalletInstance(50)));
pub RUsdPerSecond: (xcm::v3::AssetId, u128, u128) = (
MultiLocation::new(1, X3(Parachain(1000), PalletInstance(50), GeneralIndex(1984))).into(),
Expand All @@ -232,7 +232,7 @@ parameter_types! {

parameter_types! {
pub const TrappistNative: MultiAssetFilter = Wild(AllOf { fun: WildFungible, id: Concrete(MultiLocation::here()) });
pub AssetHubTrustedTeleporter: (MultiAssetFilter, MultiLocation) = (TrappistNative::get(), RockmineLocation::get());
pub AssetHubTrustedTeleporter: (MultiAssetFilter, MultiLocation) = (TrappistNative::get(), AssetHubLocation::get());
}

pub struct ReserveAssetsFrom<T>(PhantomData<T>);
Expand Down Expand Up @@ -273,7 +273,7 @@ pub type Traders = (
UsingComponents<WeightToFee, SelfReserve, AccountId, Balances, ToAuthor<Runtime>>,
);

pub type Reserves = (NativeAsset, ReserveAssetsFrom<RockmineLocation>);
pub type Reserves = (NativeAsset, ReserveAssetsFrom<AssetHubLocation>);
pub type TrustedTeleporters = (xcm_builder::Case<AssetHubTrustedTeleporter>,);

pub struct XcmConfig;
Expand Down