[XCM] Multiple `FungiblesAdapter`s support + `WeightTrader::buy_weight` more accurate error #6739

bkontur · 2023-02-17T11:23:19Z

Motivation:
Allow AssetTransactor to work with multiple FungiblesAdapter for multiple pallet_assets instances. E.g. in Statemine/t we need to have multiple instances of pallet_assets (TrustBackedAssets + ForeignAssets):
pub type AssetTransactors = (CurrencyTransactor, FungiblesTransactor, ForeignFungiblesTransactor);
e.g. https://github.com/paritytech/cumulus/pull/2167/files#diff-07287c62dd91150d975f7504bd14cc62d9889c44f7ba8ca44c30c03b05d5b071R141

Problem:
Combination (FungiblesAdapter<Assets1, ConvertedConcreteId<..>, ...>, FungiblesAdapter<Assets2, ConvertedConcreteId<..>, ...>) with ConvertedConcreteId for ConvertAssetId returns AssetIdConversionFailed (which is mapped to XcmError::FailedToTransactAsset("AssetIdConversionFailed")) does not work.
Because [impl TransactAsset for Tuple {] does continuation only for cases: Err(XcmError::AssetNotFound) | Err(XcmError::Unimplemented) => (),
so if first [(FungiblesAdapter<Assets1, ConvertedConcreteId<..>, ...>] fails on [AssetIdConversionFailed], then we dont give chance to other Adapter/FungiblesAdapter in tuple chain
so it is not possible to have multiple pallet_assets instances with its own FungiblesAdapter.

For example 1 CurrencyAdapter works in TransactAsset tuple chain, because it does Matcher::matches_fungible(what).ok_or(Error::AssetNotFound)?
For example 2 Cumulus's TakeFirstAssetTrader https://github.com/paritytech/cumulus/blob/master/primitives/utility/src/lib.rs#L168 does the same: Matcher::matches_fungibles(&first).map_err(|_| XcmError::AssetNotFound)?;

So, as a temporary hack to pass, I created wrapping matcher which converts MatcherError::AssetIdConversionFailed -> MatcherError::AssetNotFound
https://github.com/paritytech/cumulus/pull/2167/files#diff-aa9ec9164c4412c613444721bada9490dd697084f621658cba0a8db2ae360a13R33-R46
https://github.com/paritytech/cumulus/pull/2167/files#diff-07287c62dd91150d975f7504bd14cc62d9889c44f7ba8ca44c30c03b05d5b071L94-R107

Possible solutions:

simpliest - proposed in this PR - just to change mapping Error::AssetIdConversionFailed => XcmError::AssetNotFound
change impl ConvertedConcreteId here

MatchError::AssetIdConversionFailed -> MatchError::AssetNotFound
potentialy, then we dont need AssetIdConversionFailed
and all Matcher::matches_fungible will be aligned and mapped to the AssetNotFound

write new ConvertedConcreteId with fix from 2.
extend TransactAsset tuple hanlding with XcmError::FailedToTransactAsset("AssetIdConversionFailed"), but this does not seem a good solution
other solutions?

…t` more accurate error

bkontur · 2023-02-22T08:38:54Z

bot rebase

…apter-weight-trader

paritytech-processbot · 2023-02-22T08:39:00Z

Rebased

xcm/xcm-builder/src/asset_conversion.rs

xcm/xcm-executor/src/traits/token_matching.rs

KiChjang · 2023-02-27T06:50:08Z

xcm/xcm-executor/src/traits/weight.rs

+
+		// if we have multiple traders, and first one returns `TooExpensive` and others fail e.g. `AssetNotFound`
+		// then it is more accurate to return `TooExpensive` then `AssetNotFound`
+		Err(if too_expensive_error_found {


Code like this is why we should actually figure out a better error reporting system for XCM, such as using anyhow or failure, because IIRC both of these crates allow chaining of errors, so you may chain errors together and have the ability to look into errors and see what the root cause is.

@KiChjang
This buy_weight returns v3::XcmError, so we probably shouldnt modify it now, right?
Do you want to change error handling here or you mean it like future improvement, e.g. for v4?

If this change for buy_weight is blocking this PR, I can extract it to separate PR

Oh, no changes are necessary, I was making a general comment actually, but is definitely something that we should look into soon (one of the new hires can look into this).

xcm/xcm-executor/src/traits/token_matching.rs

bkontur · 2023-02-28T09:06:23Z

bot rebase

…apter-weight-trader

paritytech-processbot · 2023-02-28T09:06:31Z

Rebased

KiChjang · 2023-02-28T23:56:41Z

xcm/xcm-simulator/example/src/parachain.rs

@@ -49,7 +49,7 @@ use xcm_executor::{
 };

 pub type SovereignAccountOf = (
-	SiblingParachainConvertsVia<ParaId, AccountId>,
+	SiblingParachainConvertsVia<Sibling, AccountId>,


Is this intended?

yes, ParaId has different encoding then Sibling,
and e.g. everywhere in Cumulus there is used SiblingParachainConvertsVia<Sibling, and also everywhere ParaId is used by relaychain cfg like ChildParachainConvertsVia<ParaId,

I found it just by accident because of: https://github.com/paritytech/cumulus/pull/2167/files#diff-07287c62dd91150d975f7504bd14cc62d9889c44f7ba8ca44c30c03b05d5b071L389-R421 and I guess this was inspired by this example

yes, ParaId has different encoding then Sibling,

It doesn't. But the change is ok - just slightly more explicit about the intent.

#[derive( Clone, Copy, Default, Encode, Decode, Eq, PartialEq, Ord, PartialOrd, RuntimeDebug, TypeInfo, )] pub struct Sibling(pub Id);

(Id is imported as ParaId)

acatangiu

Looks good to me

bkontur · 2023-03-02T09:58:49Z

bot rebase

…apter-weight-trader

paritytech-processbot · 2023-03-02T09:58:56Z

Rebased

* master: (27 commits) bump `zombienet` version to v1.3.37 (#6773) Bump `blake2b_simd` to 1.0.1 (#6829) changelog: update template for new label behavior (E3/E4) (#6804) Companion for paritytech/substrate#12828 (#6380) Don't send `ActiveLeaves` from leaves in db on startup in Overseer (#6727) Polkadot XCM Body constants (#6788) Decrease expected peer count in zombinenet tests (#6826) Additional tracing in `provisioner`, `vote_selection` and `dispute-coordinator` (#6775) Change node-key for bootnodes (#6772) Change handle_import_statements to FatalResult (#6820) Introduce XCM matcher for writing barriers (#6756) Freeze note on `SessionInfo`. (#6818) Bump parity-db (#6816) Removing Outdated References to Misbehavior Arbitration Subsystem (#6814) Forgotten re-export for `MatchedConvertedConcreteId` (#6815) Companion for substrate#13509: bump API versions of {Beefy,Mmr}Api (#6809) Migrate to `Weight::from_parts` (#6794) [XCM] Multiple `FungiblesAdapter`s support + `WeightTrader::buy_weight` more accurate error (#6739) Get rid of unnecessary cloning and work. (#6808) changelog: fix migration listing (#6806) ...

bkontur added 2 commits February 17, 2023 12:18

Change ParaId->Sibling for SiblingParachainConvertsVia

b5945ee

[XCM] Multiple FungiblesAdapters support + `WeightTrader::buy_weigh…

ea32b57

…t` more accurate error

bkontur requested review from gavofyork and KiChjang February 17, 2023 11:23

bkontur added A0-please_review Pull request needs code review. B0-silent Changes should not be mentioned in any release notes C1-low PR touches the given topic and has a low impact on builders. T6-XCM This PR/Issue is related to XCM. labels Feb 17, 2023

bkontur mentioned this pull request Feb 17, 2023

Assets/ForeignAssets tests and fixes paritytech/cumulus#2167

Merged

6 tasks

Merge remote-tracking branch 'origin/master' into bko-xcm-fungible-ad…

9dc8504

…apter-weight-trader

bkontur added 2 commits February 23, 2023 22:03

Added test for ConvertedConcreteId with AsPrefixedGeneralIndex

a50366f

Solution 3. - new MatchedConvertedConcreteId with matching capabilities

b1858f8

KiChjang reviewed Feb 24, 2023

View reviewed changes

xcm/xcm-builder/src/asset_conversion.rs Outdated Show resolved Hide resolved

KiChjang reviewed Feb 24, 2023

View reviewed changes

xcm/xcm-executor/src/traits/token_matching.rs Outdated Show resolved Hide resolved

Review fixes

b43f230

bkontur requested a review from KiChjang February 26, 2023 20:00

KiChjang reviewed Feb 27, 2023

View reviewed changes

KiChjang reviewed Feb 28, 2023

View reviewed changes

xcm/xcm-executor/src/traits/token_matching.rs Show resolved Hide resolved

Renamed AssetNotFound -> AssetNotHandled

4d83269

bkontur requested a review from KiChjang February 28, 2023 09:05

Merge remote-tracking branch 'origin/master' into bko-xcm-fungible-ad…

66de9cb

…apter-weight-trader

bkontur mentioned this pull request Feb 28, 2023

[xcm] ConvertedConcreteId convert to MultiAsset (fungible) back-and-forth #6760

Closed

KiChjang reviewed Feb 28, 2023

View reviewed changes

KiChjang approved these changes Feb 28, 2023

View reviewed changes

acatangiu approved these changes Mar 1, 2023

View reviewed changes

Merge remote-tracking branch 'origin/master' into bko-xcm-fungible-ad…

b47f25b

…apter-weight-trader

bkontur merged commit 3dd8331 into master Mar 2, 2023

bkontur deleted the bko-xcm-fungible-adapter-weight-trader branch March 2, 2023 15:50

kiltbot mentioned this pull request Apr 3, 2023

3️⃣ [AUTOMATIC] Update Polkadot dependencies from 0.9.39 to 0.9.40 KILTprotocol/kilt-node#496

Closed

librelois mentioned this pull request Apr 6, 2023

Update substrate/polkadot/cumulus from v0.9.38 to v0.9.40 moonbeam-foundation/moonbeam#2200

Closed

nbaztec mentioned this pull request Apr 25, 2023

Dependency (Substrate/Polkadot/Frontier/Cumulus/...) update to v0.9.40 moonbeam-foundation/moonbeam#2202

Merged

energyGiver mentioned this pull request May 25, 2023

Feature/teleport an asset between parachains(statemint <-> parachain template node) InfraBlockchain/infra-cumulus#47

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[XCM] Multiple `FungiblesAdapter`s support + `WeightTrader::buy_weight` more accurate error #6739

[XCM] Multiple `FungiblesAdapter`s support + `WeightTrader::buy_weight` more accurate error #6739

bkontur commented Feb 17, 2023

bkontur commented Feb 22, 2023

paritytech-processbot bot commented Feb 22, 2023

KiChjang Feb 27, 2023 •

edited

Loading

bkontur Feb 27, 2023

KiChjang Feb 28, 2023

bkontur commented Feb 28, 2023

paritytech-processbot bot commented Feb 28, 2023

KiChjang Feb 28, 2023

bkontur Mar 1, 2023 •

edited

Loading

gavofyork Mar 3, 2023 •

edited

Loading

acatangiu left a comment

bkontur commented Mar 2, 2023

paritytech-processbot bot commented Mar 2, 2023

[XCM] Multiple FungiblesAdapters support + WeightTrader::buy_weight more accurate error #6739

[XCM] Multiple FungiblesAdapters support + WeightTrader::buy_weight more accurate error #6739

Conversation

bkontur commented Feb 17, 2023

bkontur commented Feb 22, 2023

paritytech-processbot bot commented Feb 22, 2023

KiChjang Feb 27, 2023 • edited Loading

Choose a reason for hiding this comment

bkontur Feb 27, 2023

Choose a reason for hiding this comment

KiChjang Feb 28, 2023

Choose a reason for hiding this comment

bkontur commented Feb 28, 2023

paritytech-processbot bot commented Feb 28, 2023

KiChjang Feb 28, 2023

Choose a reason for hiding this comment

bkontur Mar 1, 2023 • edited Loading

Choose a reason for hiding this comment

gavofyork Mar 3, 2023 • edited Loading

Choose a reason for hiding this comment

acatangiu left a comment

Choose a reason for hiding this comment

bkontur commented Mar 2, 2023

paritytech-processbot bot commented Mar 2, 2023

[XCM] Multiple `FungiblesAdapter`s support + `WeightTrader::buy_weight` more accurate error #6739

[XCM] Multiple `FungiblesAdapter`s support + `WeightTrader::buy_weight` more accurate error #6739

KiChjang Feb 27, 2023 •

edited

Loading

bkontur Mar 1, 2023 •

edited

Loading

gavofyork Mar 3, 2023 •

edited

Loading