Skip to content

update_orml #1983

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

Merged
zqhxuyuan merged 3 commits into from
Mar 23, 2022
Merged

update_orml #1983

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f633379
add fiter with Everything
zqhxuyuan Mar 21, 2022
2aa5c8b
add reserve provider
zqhxuyuan Mar 21, 2022
b1d61e7
update import
zqhxuyuan Mar 21, 2022
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
2 changes: 1 addition & 1 deletion orml
Open in desktop
Submodule orml updated 8 files
+46 −9 traits/src/location.rs
+6 −3 xcm-support/src/lib.rs
+4 −4 xcm-support/src/tests.rs
+45 −7 xtokens/src/lib.rs
+23 −1 xtokens/src/mock/mod.rs
+17 −3 xtokens/src/mock/para.rs
+409 −0 xtokens/src/mock/para_relative_view.rs
+261 −0 xtokens/src/tests.rs
6 changes: 4 additions & 2 deletions runtime/acala/src/xcm_config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ pub use frame_support::{
traits::{Everything, Get, Nothing},
weights::Weight,
};
use orml_traits::{parameter_type_with_key, MultiCurrency};
use orml_traits::{location::AbsoluteReserveProvider, parameter_type_with_key, MultiCurrency};
use orml_xcm_support::{DepositToAlternative, IsNativeConcrete, MultiCurrencyAdapter, MultiNativeAsset};
use pallet_xcm::XcmPassthrough;
use polkadot_parachain::primitives::Sibling;
Expand Down Expand Up @@ -150,7 +150,7 @@ impl xcm_executor::Config for XcmConfig {
// How to withdraw and deposit an asset.
type AssetTransactor = LocalAssetTransactor;
type OriginConverter = XcmOriginToCallOrigin;
type IsReserve = MultiNativeAsset;
type IsReserve = MultiNativeAsset<AbsoluteReserveProvider>;
// Teleporting is disabled.
type IsTeleporter = ();
type LocationInverter = LocationInverter<Ancestry>;
Expand Down Expand Up @@ -355,4 +355,6 @@ impl orml_xtokens::Config for Runtime {
type LocationInverter = LocationInverter<Ancestry>;
type MaxAssetsForTransfer = MaxAssetsForTransfer;
type MinXcmFee = ParachainMinFee;
type MultiLocationsFilter = Everything;
type ReserveProvider = AbsoluteReserveProvider;
}
6 changes: 4 additions & 2 deletions runtime/karura/src/xcm_config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ pub use frame_support::{
weights::Weight,
};
use module_support::HomaSubAccountXcm;
use orml_traits::{parameter_type_with_key, MultiCurrency};
use orml_traits::{location::AbsoluteReserveProvider, parameter_type_with_key, MultiCurrency};
use orml_xcm_support::{DepositToAlternative, IsNativeConcrete, MultiCurrencyAdapter, MultiNativeAsset};
use pallet_xcm::XcmPassthrough;
use polkadot_parachain::primitives::Sibling;
Expand Down Expand Up @@ -212,7 +212,7 @@ impl xcm_executor::Config for XcmConfig {
// How to withdraw and deposit an asset.
type AssetTransactor = LocalAssetTransactor;
type OriginConverter = XcmOriginToCallOrigin;
type IsReserve = MultiNativeAsset;
type IsReserve = MultiNativeAsset<AbsoluteReserveProvider>;
// Teleporting is disabled.
type IsTeleporter = ();
type LocationInverter = LocationInverter<Ancestry>;
Expand Down Expand Up @@ -328,6 +328,8 @@ impl orml_xtokens::Config for Runtime {
type LocationInverter = LocationInverter<Ancestry>;
type MaxAssetsForTransfer = MaxAssetsForTransfer;
type MinXcmFee = ParachainMinFee;
type MultiLocationsFilter = Everything;
type ReserveProvider = AbsoluteReserveProvider;
}

pub type LocalAssetTransactor = MultiCurrencyAdapter<
Expand Down
6 changes: 4 additions & 2 deletions runtime/mandala/src/xcm_config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ pub use frame_support::{
traits::{Everything, Get, Nothing},
weights::Weight,
};
use orml_traits::{parameter_type_with_key, MultiCurrency};
use orml_traits::{location::AbsoluteReserveProvider, parameter_type_with_key, MultiCurrency};
use orml_xcm_support::{DepositToAlternative, IsNativeConcrete, MultiCurrencyAdapter, MultiNativeAsset};
use pallet_xcm::XcmPassthrough;
use polkadot_parachain::primitives::Sibling;
Expand Down Expand Up @@ -141,7 +141,7 @@ impl xcm_executor::Config for XcmConfig {
// How to withdraw and deposit an asset.
type AssetTransactor = LocalAssetTransactor;
type OriginConverter = XcmOriginToCallOrigin;
type IsReserve = MultiNativeAsset;
type IsReserve = MultiNativeAsset<AbsoluteReserveProvider>;
// Teleporting is disabled.
type IsTeleporter = ();
type LocationInverter = LocationInverter<Ancestry>;
Expand Down Expand Up @@ -345,4 +345,6 @@ impl orml_xtokens::Config for Runtime {
type LocationInverter = LocationInverter<Ancestry>;
type MaxAssetsForTransfer = MaxAssetsForTransfer;
type MinXcmFee = ParachainMinFee;
type MultiLocationsFilter = Everything;
type ReserveProvider = AbsoluteReserveProvider;
}