mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-08-05 16:05:40 +00:00
Francisco Aguirre
8428f678fe
# Note for reviewer
Most changes are just syntax changes necessary for the new version.
Most important files should be the ones under the `xcm` folder.
# Description
Added XCMv4.
## Removed `Multi` prefix
The following types have been renamed:
- MultiLocation -> Location
- MultiAsset -> Asset
- MultiAssets -> Assets
- InteriorMultiLocation -> InteriorLocation
- MultiAssetFilter -> AssetFilter
- VersionedMultiAsset -> VersionedAsset
- WildMultiAsset -> WildAsset
- VersionedMultiLocation -> VersionedLocation
In order to fix a name conflict, the `Assets` in `xcm-executor` were
renamed to `HoldingAssets`, as they represent assets in holding.
## Removed `Abstract` asset id
It was not being used anywhere and this simplifies the code.
Now assets are just constructed as follows:
```rust
let asset: Asset = (AssetId(Location::new(1, Here)), 100u128).into();
```
No need for specifying `Concrete` anymore.
## Outcome is now a named fields struct
Instead of
```rust
pub enum Outcome {
Complete(Weight),
Incomplete(Weight, Error),
Error(Error),
}
```
we now have
```rust
pub enum Outcome {
Complete { used: Weight },
Incomplete { used: Weight, error: Error },
Error { error: Error },
}
```
## Added Reanchorable trait
Now both locations and assets implement this trait, making it easier to
reanchor both.
## New syntax for building locations and junctions
Now junctions are built using the following methods:
```rust
let location = Location {
parents: 1,
interior: [Parachain(1000), PalletInstance(50), GeneralIndex(1984)].into()
};
```
or
```rust
let location = Location::new(1, [Parachain(1000), PalletInstance(50), GeneralIndex(1984)]);
```
And they are matched like so:
```rust
match location.unpack() {
(1, [Parachain(id)]) => ...
(0, Here) => ...,
(1, [_]) => ...,
}
```
This syntax is mandatory in v4, and has been also implemented for v2 and
v3 for easier migration.
This was needed to make all sizes smaller.
# TODO
- [x] Scaffold v4
- [x] Port github.com/paritytech/polkadot/pull/7236
- [x] Remove `Multi` prefix
- [x] Remove `Abstract` asset id
---------
Co-authored-by: command-bot <>
Co-authored-by: Keith Yeung <kungfukeith11@gmail.com>
108 lines
3.8 KiB
Rust
108 lines
3.8 KiB
Rust
// Copyright (C) Parity Technologies (UK) Ltd.
|
|
// This file is part of Polkadot.
|
|
|
|
// Polkadot is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
|
|
// Polkadot is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU General Public License for more details.
|
|
|
|
// You should have received a copy of the GNU General Public License
|
|
// along with Polkadot. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
use sp_std::result;
|
|
use xcm::latest::prelude::*;
|
|
|
|
pub trait MatchesFungible<Balance> {
|
|
fn matches_fungible(a: &Asset) -> Option<Balance>;
|
|
}
|
|
|
|
#[impl_trait_for_tuples::impl_for_tuples(30)]
|
|
impl<Balance> MatchesFungible<Balance> for Tuple {
|
|
fn matches_fungible(a: &Asset) -> Option<Balance> {
|
|
for_tuples!( #(
|
|
match Tuple::matches_fungible(a) { o @ Some(_) => return o, _ => () }
|
|
)* );
|
|
log::trace!(target: "xcm::matches_fungible", "did not match fungible asset: {:?}", &a);
|
|
None
|
|
}
|
|
}
|
|
|
|
pub trait MatchesNonFungible<Instance> {
|
|
fn matches_nonfungible(a: &Asset) -> Option<Instance>;
|
|
}
|
|
|
|
#[impl_trait_for_tuples::impl_for_tuples(30)]
|
|
impl<Instance> MatchesNonFungible<Instance> for Tuple {
|
|
fn matches_nonfungible(a: &Asset) -> Option<Instance> {
|
|
for_tuples!( #(
|
|
match Tuple::matches_nonfungible(a) { o @ Some(_) => return o, _ => () }
|
|
)* );
|
|
log::trace!(target: "xcm::matches_non_fungible", "did not match non-fungible asset: {:?}", &a);
|
|
None
|
|
}
|
|
}
|
|
|
|
/// Errors associated with [`MatchesFungibles`] operation.
|
|
#[derive(Debug, PartialEq, Eq)]
|
|
pub enum Error {
|
|
/// The given asset is not handled. (According to [`XcmError::AssetNotFound`])
|
|
AssetNotHandled,
|
|
/// `Location` to `AccountId` conversion failed.
|
|
AccountIdConversionFailed,
|
|
/// `u128` amount to currency `Balance` conversion failed.
|
|
AmountToBalanceConversionFailed,
|
|
/// `Location` to `AssetId`/`ClassId` conversion failed.
|
|
AssetIdConversionFailed,
|
|
/// `AssetInstance` to non-fungibles instance ID conversion failed.
|
|
InstanceConversionFailed,
|
|
}
|
|
|
|
impl From<Error> for XcmError {
|
|
fn from(e: Error) -> Self {
|
|
use XcmError::FailedToTransactAsset;
|
|
match e {
|
|
Error::AssetNotHandled => XcmError::AssetNotFound,
|
|
Error::AccountIdConversionFailed => FailedToTransactAsset("AccountIdConversionFailed"),
|
|
Error::AmountToBalanceConversionFailed =>
|
|
FailedToTransactAsset("AmountToBalanceConversionFailed"),
|
|
Error::AssetIdConversionFailed => FailedToTransactAsset("AssetIdConversionFailed"),
|
|
Error::InstanceConversionFailed => FailedToTransactAsset("InstanceConversionFailed"),
|
|
}
|
|
}
|
|
}
|
|
|
|
pub trait MatchesFungibles<AssetId, Balance> {
|
|
fn matches_fungibles(a: &Asset) -> result::Result<(AssetId, Balance), Error>;
|
|
}
|
|
|
|
#[impl_trait_for_tuples::impl_for_tuples(30)]
|
|
impl<AssetId, Balance> MatchesFungibles<AssetId, Balance> for Tuple {
|
|
fn matches_fungibles(a: &Asset) -> result::Result<(AssetId, Balance), Error> {
|
|
for_tuples!( #(
|
|
match Tuple::matches_fungibles(a) { o @ Ok(_) => return o, _ => () }
|
|
)* );
|
|
log::trace!(target: "xcm::matches_fungibles", "did not match fungibles asset: {:?}", &a);
|
|
Err(Error::AssetNotHandled)
|
|
}
|
|
}
|
|
|
|
pub trait MatchesNonFungibles<AssetId, Instance> {
|
|
fn matches_nonfungibles(a: &Asset) -> result::Result<(AssetId, Instance), Error>;
|
|
}
|
|
|
|
#[impl_trait_for_tuples::impl_for_tuples(30)]
|
|
impl<AssetId, Instance> MatchesNonFungibles<AssetId, Instance> for Tuple {
|
|
fn matches_nonfungibles(a: &Asset) -> result::Result<(AssetId, Instance), Error> {
|
|
for_tuples!( #(
|
|
match Tuple::matches_nonfungibles(a) { o @ Ok(_) => return o, _ => () }
|
|
)* );
|
|
log::trace!(target: "xcm::matches_non_fungibles", "did not match fungibles asset: {:?}", &a);
|
|
Err(Error::AssetNotHandled)
|
|
}
|
|
}
|