Skip to content

[WIP] Non-teleportable Foreign Assets on Asset Hub - Option 1 - new pallet-assets-reserves #9934

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
+1,300 −55
Draft

[WIP] Non-teleportable Foreign Assets on Asset Hub - Option 1 - new pallet-assets-reserves #9934

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
20 changes: 20 additions & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -955,6 +955,7 @@ pallet-assets = { path = "substrate/frame/assets", default-features = false }
pallet-assets-freezer = { path = "substrate/frame/assets-freezer", default-features = false }
pallet-assets-holder = { path = "substrate/frame/assets-holder", default-features = false }
pallet-assets-precompiles = { path = "substrate/frame/assets/precompiles", default-features = false }
pallet-assets-reserves = { path = "substrate/frame/assets-reserves", default-features = false }
pallet-atomic-swap = { default-features = false, path = "substrate/frame/atomic-swap" }
pallet-aura = { path = "substrate/frame/aura", default-features = false }
pallet-authority-discovery = { path = "substrate/frame/authority-discovery", default-features = false }
Expand Down
6 changes: 6 additions & 0 deletions ...hains/integration-tests/emulated/chains/parachains/assets/asset-hub-rococo/src/genesis.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,12 @@ pub fn genesis() -> Storage {
],
..Default::default()
},
assets_reserves: asset_hub_rococo_runtime::AssetsReservesConfig {
reserves: vec![
(PenpalATeleportableAssetLocation::get(), vec![xcm::v5::Location::here()]),
(PenpalBTeleportableAssetLocation::get(), vec![xcm::v5::Location::here()]),
],
},
..Default::default()
};

Expand Down
1 change: 1 addition & 0 deletions ...arachains/integration-tests/emulated/chains/parachains/assets/asset-hub-rococo/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ decl_test_parachains! {
PolkadotXcm: asset_hub_rococo_runtime::PolkadotXcm,
Assets: asset_hub_rococo_runtime::Assets,
ForeignAssets: asset_hub_rococo_runtime::ForeignAssets,
AssetsReserves: asset_hub_rococo_runtime::AssetsReserves,
PoolAssets: asset_hub_rococo_runtime::PoolAssets,
AssetConversion: asset_hub_rococo_runtime::AssetConversion,
Balances: asset_hub_rococo_runtime::Balances,
Expand Down
6 changes: 6 additions & 0 deletions ...ains/integration-tests/emulated/chains/parachains/assets/asset-hub-westend/src/genesis.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,12 @@ pub fn genesis() -> Storage {
],
..Default::default()
},
assets_reserves: asset_hub_westend_runtime::AssetsReservesConfig {
reserves: vec![
(PenpalATeleportableAssetLocation::get(), vec![xcm::v5::Location::here()]),
(PenpalBTeleportableAssetLocation::get(), vec![xcm::v5::Location::here()]),
],
},
..Default::default()
};

Expand Down
1 change: 1 addition & 0 deletions ...rachains/integration-tests/emulated/chains/parachains/assets/asset-hub-westend/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ decl_test_parachains! {
Balances: asset_hub_westend_runtime::Balances,
Assets: asset_hub_westend_runtime::Assets,
ForeignAssets: asset_hub_westend_runtime::ForeignAssets,
AssetsReserves: asset_hub_westend_runtime::AssetsReserves,
PoolAssets: asset_hub_westend_runtime::PoolAssets,
AssetConversion: asset_hub_westend_runtime::AssetConversion,
SnowbridgeSystemFrontend: asset_hub_westend_runtime::SnowbridgeSystemFrontend,
Expand Down
5 changes: 3 additions & 2 deletions ...lus/parachains/integration-tests/emulated/tests/assets/asset-hub-rococo/src/tests/swap.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,9 @@ fn swap_locally_on_chain_using_local_assets() {
#[test]
fn swap_locally_on_chain_using_foreign_assets() {
let asset_native = Box::new(Location::try_from(RelayLocation::get()).unwrap());
let asset_location_on_penpal =
Location::try_from(PenpalLocalTeleportableToAssetHub::get()).unwrap();
let asset_location_on_penpal = PenpalA::execute_with(|| {
Location::try_from(PenpalLocalTeleportableToAssetHub::get()).unwrap()
});
let foreign_asset_at_asset_hub_rococo =
Location::new(1, [Junction::Parachain(PenpalA::para_id().into())])
.appended_with(asset_location_on_penpal)
Expand Down
3 changes: 2 additions & 1 deletion ...parachains/integration-tests/emulated/tests/assets/asset-hub-rococo/src/tests/teleport.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,8 @@ pub fn do_bidirectional_teleport_foreign_assets_between_para_and_asset_hub_using
) {
// Init values for Parachain
let fee_amount_to_send: Balance = ASSET_HUB_ROCOCO_ED * 10000;
let asset_location_on_penpal = PenpalLocalTeleportableToAssetHub::get();
let asset_location_on_penpal =
PenpalA::execute_with(|| PenpalLocalTeleportableToAssetHub::get());
let asset_id_on_penpal = match asset_location_on_penpal.last() {
Some(Junction::GeneralIndex(id)) => *id as u32,
_ => unreachable!(),
Expand Down
Loading
Loading