git.delta.rocks / unique-network / refs/commits / 5db935735ab9

difftreelog

fix IsReserve

Daniel Shiposha2023-03-27parent: #1e19d54.patch.diff
in: master

6 files changed

modifiedCargo.lockdiffbeforeafterboth
5692 "orml-tokens",5692 "orml-tokens",
5693 "orml-traits",5693 "orml-traits",
5694 "orml-vesting",5694 "orml-vesting",
5695 "orml-xcm-support",
5695 "orml-xtokens",5696 "orml-xtokens",
5696 "pallet-app-promotion",5697 "pallet-app-promotion",
5697 "pallet-aura",5698 "pallet-aura",
9142 "orml-tokens",9143 "orml-tokens",
9143 "orml-traits",9144 "orml-traits",
9144 "orml-vesting",9145 "orml-vesting",
9146 "orml-xcm-support",
9145 "orml-xtokens",9147 "orml-xtokens",
9146 "pallet-app-promotion",9148 "pallet-app-promotion",
9147 "pallet-aura",9149 "pallet-aura",
13418 "orml-tokens",13420 "orml-tokens",
13419 "orml-traits",13421 "orml-traits",
13420 "orml-vesting",13422 "orml-vesting",
13423 "orml-xcm-support",
13421 "orml-xtokens",13424 "orml-xtokens",
13422 "pallet-app-promotion",13425 "pallet-app-promotion",
13423 "pallet-aura",13426 "pallet-aura",
modifiedCargo.tomldiffbeforeafterboth
181orml-traits = { default-features = false , git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.39" }181orml-traits = { default-features = false , git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.39" }
182orml-vesting = { default-features = false , git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.39" }182orml-vesting = { default-features = false , git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.39" }
183orml-xtokens = { default-features = false , git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.39" }183orml-xtokens = { default-features = false , git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.39" }
184orml-xcm-support = { default-features = false , git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v0.9.39" }
184185
185# Other186# Other
186derivative = { version = "2.2.0", features = ["use_core"] }187derivative = { version = "2.2.0", features = ["use_core"] }
modifiedruntime/common/config/xcm/foreignassets.rsdiffbeforeafterboth
15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
1616
17use frame_support::{17use frame_support::{traits::Get, parameter_types};
18 traits::{Get, ContainsPair},
19 parameter_types,
20};
21use sp_runtime::traits::Convert;18use sp_runtime::traits::Convert;
22use xcm::latest::{prelude::*, MultiAsset, MultiLocation};19use xcm::latest::{prelude::*, MultiAsset, MultiLocation};
27 ForeignAssetId, CurrencyId,24 ForeignAssetId, CurrencyId,
28};25};
29use sp_std::{borrow::Borrow, marker::PhantomData};26use sp_std::{borrow::Borrow, marker::PhantomData};
27use orml_traits::location::AbsoluteReserveProvider;
28use orml_xcm_support::MultiNativeAsset;
30use crate::{Runtime, Balances, ParachainInfo, PolkadotXcm, ForeignAssets};29use crate::{Runtime, Balances, ParachainInfo, PolkadotXcm, ForeignAssets};
3130
32use super::{LocationToAccountId, RelayLocation};31use super::{LocationToAccountId, RelayLocation};
169 }168 }
170}169}
171
172pub struct AllAsset;
173impl ContainsPair<MultiAsset, MultiLocation> for AllAsset {
174 fn contains(_asset: &MultiAsset, _origin: &MultiLocation) -> bool {
175 // ? Shouldn't we query foreign-asset pallet here, because of the new non-local mint
176 // location logic?
177 true
178 }
179}
180170
181pub type IsReserve = AllAsset;171pub type IsReserve = MultiNativeAsset<AbsoluteReserveProvider>;
182172
183pub type Trader<T> = FreeForAll<173pub type Trader<T> = FreeForAll<
184 pallet_configuration::WeightToFee<T, Balance>,174 pallet_configuration::WeightToFee<T, Balance>,
modifiedruntime/opal/Cargo.tomldiffbeforeafterboth
130 "orml-traits/std",130 "orml-traits/std",
131 "orml-vesting/std",131 "orml-vesting/std",
132 "orml-xtokens/std",132 "orml-xtokens/std",
133 "orml-xcm-support/std",
133 "pallet-foreign-assets/std",134 "pallet-foreign-assets/std",
134135
135 'pallet-maintenance/std',136 'pallet-maintenance/std',
217orml-traits = { workspace = true }218orml-traits = { workspace = true }
218orml-vesting = { workspace = true }219orml-vesting = { workspace = true }
219orml-xtokens = { workspace = true }220orml-xtokens = { workspace = true }
221orml-xcm-support = { workspace = true }
220pallet-aura = { workspace = true }222pallet-aura = { workspace = true }
221pallet-authorship = { workspace = true }223pallet-authorship = { workspace = true }
222pallet-balances = { workspace = true }224pallet-balances = { workspace = true }
modifiedruntime/quartz/Cargo.tomldiffbeforeafterboth
129 "orml-traits/std",129 "orml-traits/std",
130 "orml-vesting/std",130 "orml-vesting/std",
131 "orml-xtokens/std",131 "orml-xtokens/std",
132 "orml-xcm-support/std",
132 "pallet-foreign-assets/std",133 "pallet-foreign-assets/std",
133 "pallet-maintenance/std",134 "pallet-maintenance/std",
134]135]
209orml-traits = { workspace = true }210orml-traits = { workspace = true }
210orml-vesting = { workspace = true }211orml-vesting = { workspace = true }
211orml-xtokens = { workspace = true }212orml-xtokens = { workspace = true }
213orml-xcm-support = { workspace = true }
212pallet-aura = { workspace = true }214pallet-aura = { workspace = true }
213pallet-authorship = { workspace = true }215pallet-authorship = { workspace = true }
214pallet-balances = { workspace = true }216pallet-balances = { workspace = true }
modifiedruntime/unique/Cargo.tomldiffbeforeafterboth
126 "orml-traits/std",126 "orml-traits/std",
127 "orml-vesting/std",127 "orml-vesting/std",
128 "orml-xtokens/std",128 "orml-xtokens/std",
129 "orml-xcm-support/std",
129 "pallet-foreign-assets/std",130 "pallet-foreign-assets/std",
130 "pallet-maintenance/std",131 "pallet-maintenance/std",
131]132]
208orml-traits = { workspace = true }209orml-traits = { workspace = true }
209orml-vesting = { workspace = true }210orml-vesting = { workspace = true }
210orml-xtokens = { workspace = true }211orml-xtokens = { workspace = true }
212orml-xcm-support = { workspace = true }
211pallet-aura = { workspace = true }213pallet-aura = { workspace = true }
212pallet-authorship = { workspace = true }214pallet-authorship = { workspace = true }
213pallet-balances = { workspace = true }215pallet-balances = { workspace = true }