Assets in pool with native can be used in `query_weight_to_asset_fee` #6080

franciscoaguirre · 2024-10-15T21:35:41Z

A follow-up to #5599. Assets in a pool with the native one are returned from query_acceptable_payment_assets. Now those assets can be used in query_weight_to_asset_fee to get the correct amount that needs to be paid.

cumulus/parachains/runtimes/assets/asset-hub-rococo/src/lib.rs

franciscoaguirre · 2024-10-18T11:48:35Z

bot fmt

command-bot · 2024-10-18T11:48:40Z

@franciscoaguirre https://gitlab.parity.io/parity/mirrors/polkadot-sdk/-/jobs/7599192 was started for your command "$PIPELINE_SCRIPTS_DIR/commands/fmt/fmt.sh". Check out https://gitlab.parity.io/parity/mirrors/polkadot-sdk/-/pipelines?page=1&scope=all&username=group_605_bot to know what else is being executed currently.

Comment bot cancel 22-f59fc7a9-be44-4b58-92bb-90dc4f64603e to cancel this command or bot cancel to cancel all commands in this pull request.

command-bot · 2024-10-18T11:50:28Z

@franciscoaguirre Command "$PIPELINE_SCRIPTS_DIR/commands/fmt/fmt.sh" has finished. Result: https://gitlab.parity.io/parity/mirrors/polkadot-sdk/-/jobs/7599192 has finished. If any artifacts were generated, you can download them from https://gitlab.parity.io/parity/mirrors/polkadot-sdk/-/jobs/7599192/artifacts/download.

cumulus/parachains/runtimes/assets/asset-hub-rococo/src/lib.rs

cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs

cumulus/parachains/runtimes/assets/common/src/lib.rs

acatangiu

looks good modulo this comment which should be fixed

franciscoaguirre · 2024-10-21T18:51:16Z

Addressing

franciscoaguirre · 2024-10-21T20:21:27Z

bot fmt

command-bot · 2024-10-21T20:21:32Z

@franciscoaguirre https://gitlab.parity.io/parity/mirrors/polkadot-sdk/-/jobs/7613871 was started for your command "$PIPELINE_SCRIPTS_DIR/commands/fmt/fmt.sh". Check out https://gitlab.parity.io/parity/mirrors/polkadot-sdk/-/pipelines?page=1&scope=all&username=group_605_bot to know what else is being executed currently.

Comment bot cancel 6-2c36f9b3-5067-496c-98c9-ebddd71d0217 to cancel this command or bot cancel to cancel all commands in this pull request.

…ts_in_pool_with

franciscoaguirre · 2024-10-22T15:24:54Z

bot fmt

command-bot · 2024-10-22T15:25:00Z

@franciscoaguirre https://gitlab.parity.io/parity/mirrors/polkadot-sdk/-/jobs/7620641 was started for your command "$PIPELINE_SCRIPTS_DIR/commands/fmt/fmt.sh". Check out https://gitlab.parity.io/parity/mirrors/polkadot-sdk/-/pipelines?page=1&scope=all&username=group_605_bot to know what else is being executed currently.

Comment bot cancel 22-b28eaba1-7afe-4c72-88e1-20fee5a5055e to cancel this command or bot cancel to cancel all commands in this pull request.

command-bot · 2024-10-22T15:29:00Z

@franciscoaguirre Command "$PIPELINE_SCRIPTS_DIR/commands/fmt/fmt.sh" has finished. Result: https://gitlab.parity.io/parity/mirrors/polkadot-sdk/-/jobs/7620641 has finished. If any artifacts were generated, you can download them from https://gitlab.parity.io/parity/mirrors/polkadot-sdk/-/jobs/7620641/artifacts/download.

cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs

bkontur · 2024-10-22T20:59:47Z

cumulus/parachains/runtimes/assets/asset-hub-rococo/src/lib.rs

+						.into_iter()
+						.map(|asset_id| asset_id.0)
+						.any(|location| location == native_asset) {


not sure if this compiles like this or maybe &native_asset

Suggested change

.into_iter()

.map(|asset_id| asset_id.0)

.any(|location| location == native_asset) {

.iter()

.any(|asset_id| asset_id.0 == native_asset) {

bkontur · 2024-10-22T21:00:32Z

cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs

+						.into_iter()
+						.map(|asset_id| asset_id.0)
+						.any(|location| location == native_asset) {


Suggested change

.into_iter()

.map(|asset_id| asset_id.0)

.any(|location| location == native_asset) {

.iter()

.any(|asset_id| asset_id.0 == native_asset) {

bkontur · 2024-10-22T21:00:59Z

cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs

+			let assets_in_pool_with_native = assets_common::get_assets_in_pool_with::<
+				Runtime,
+				xcm::v4::Location
+			>(&native_token).map_err(|()| XcmPaymentApiError::VersionedConversionFailed)?.into_iter();


I think .into_iter() is not needed now

Suggested change

>(&native_token).map_err(|()| XcmPaymentApiError::VersionedConversionFailed)?.into_iter();

>(&native_token).map_err(|()| XcmPaymentApiError::VersionedConversionFailed)?;

bkontur · 2024-10-22T21:01:28Z

cumulus/parachains/runtimes/assets/asset-hub-rococo/src/lib.rs

+			let assets_in_pool_with_native = assets_common::get_assets_in_pool_with::<
+				Runtime,
+				xcm::v4::Location
+			>(&native_token).map_err(|()| XcmPaymentApiError::VersionedConversionFailed)?.into_iter();


Suggested change

>(&native_token).map_err(|()| XcmPaymentApiError::VersionedConversionFailed)?.into_iter();

>(&native_token).map_err(|()| XcmPaymentApiError::VersionedConversionFailed)?;

paritytech-cmd-bot-polkadot-sdk · 2024-10-22T22:29:43Z

Created backport PR for stable2407:

[stable2407] Backport #6080 #6180 with remaining conflicts!

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin backport-6080-to-stable2407
git worktree add --checkout .worktree/backport-6080-to-stable2407 backport-6080-to-stable2407
cd .worktree/backport-6080-to-stable2407
git reset --hard HEAD^
git cherry-pick -x b4732add46910370443d092a3f479986060f6df5
git push --force-with-lease

paritytech-cmd-bot-polkadot-sdk · 2024-10-22T22:29:48Z

Created backport PR for stable2409:

[stable2409] Backport #6080 #6181 with remaining conflicts!

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin backport-6080-to-stable2409
git worktree add --checkout .worktree/backport-6080-to-stable2409 backport-6080-to-stable2409
cd .worktree/backport-6080-to-stable2409
git reset --hard HEAD^
git cherry-pick -x b4732add46910370443d092a3f479986060f6df5
git push --force-with-lease

…paritytech#6080) A follow-up to paritytech#5599. Assets in a pool with the native one are returned from `query_acceptable_payment_assets`. Now those assets can be used in `query_weight_to_asset_fee` to get the correct amount that needs to be paid. --------- Co-authored-by: command-bot <>

…#6080) A follow-up to #5599. Assets in a pool with the native one are returned from `query_acceptable_payment_assets`. Now those assets can be used in `query_weight_to_asset_fee` to get the correct amount that needs to be paid. --------- Co-authored-by: command-bot <> (cherry picked from commit b4732ad)

Backport #6080 into `stable2409` from franciscoaguirre. See the [documentation](https://github.com/paritytech/polkadot-sdk/blob/master/docs/BACKPORT.md) on how to use this bot.  --------- Co-authored-by: Francisco Aguirre <[email protected]> Co-authored-by: Egor_P <[email protected]>

fix: assets in pool with native can be used to query for fees

17b080b

franciscoaguirre mentioned this pull request Oct 15, 2024

Add assets in pool with native to query_acceptable_payment_assets's return #5599

Merged

bkontur reviewed Oct 16, 2024

View reviewed changes

cumulus/parachains/runtimes/assets/asset-hub-rococo/src/lib.rs Outdated Show resolved Hide resolved

bkontur reviewed Oct 16, 2024

View reviewed changes

cumulus/parachains/runtimes/assets/asset-hub-rococo/src/lib.rs Outdated Show resolved Hide resolved

franciscoaguirre added T6-XCM This PR/Issue is related to XCM. A4-needs-backport Pull request must be backported to all maintained releases. labels Oct 16, 2024

franciscoaguirre added 6 commits October 18, 2024 08:23

chore: refactor pools helper function to assets-common

375908a

test(asset-hub-westend-integration-tests): XcmPaymentApi

aec5b5b

chore: move test to macro and use in both asset hubs

dcbb796

chore: remove comment

30cf711

doc: add prdoc

a4e80ac

Merge branch 'master' into query-weight-to-asset-fee-multiple-assets

e4e1ca0

franciscoaguirre marked this pull request as ready for review October 18, 2024 11:48

franciscoaguirre requested review from bkontur and acatangiu October 18, 2024 11:48

franciscoaguirre self-assigned this Oct 18, 2024

".git/.scripts/commands/fmt/fmt.sh"

9121790

franciscoaguirre added 2 commits October 18, 2024 08:52

fix: used invalid character in prdoc

9b1f15b

Merge branch 'master' into query-weight-to-asset-fee-multiple-assets

932becb

bkontur reviewed Oct 21, 2024

View reviewed changes

cumulus/parachains/runtimes/assets/asset-hub-rococo/src/lib.rs Outdated Show resolved Hide resolved

cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs Outdated Show resolved Hide resolved

cumulus/parachains/runtimes/assets/common/src/lib.rs Outdated Show resolved Hide resolved

acatangiu approved these changes Oct 21, 2024

View reviewed changes

franciscoaguirre added 2 commits October 21, 2024 16:08

Merge branch 'master' into query-weight-to-asset-fee-multiple-assets

86b9da8

chore(assets-common): make get_assets_in_pool_with more generic

860856b

Merge branch 'master' into query-weight-to-asset-fee-multiple-assets

4b01538

franciscoaguirre added 3 commits October 22, 2024 11:34

Merge branch 'master' into query-weight-to-asset-fee-multiple-assets

2ff5cf7

chore(assets-common): return a vec instead of an iterator in get_asse…

db4040b

…ts_in_pool_with

fix(asset-hub-rococo): update get_assets_in_pool_with

88d2f2d

".git/.scripts/commands/fmt/fmt.sh"

14eb027

bkontur reviewed Oct 22, 2024

View reviewed changes

cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs Outdated Show resolved Hide resolved

franciscoaguirre added 3 commits October 22, 2024 13:14

fix: fmt

e650905

chore: get_asset_in_pool_with returns asset id instead of location

82ada8a

chore: any() instead of find().is_some()

010299d

bkontur approved these changes Oct 22, 2024

View reviewed changes

franciscoaguirre added this pull request to the merge queue Oct 22, 2024

Merged via the queue into master with commit b4732ad Oct 22, 2024
193 of 197 checks passed

franciscoaguirre deleted the query-weight-to-asset-fee-multiple-assets branch October 22, 2024 22:29

paritytech-cmd-bot-polkadot-sdk bot mentioned this pull request Oct 22, 2024

[stable2407] Backport #6080 #6180

Open

paritytech-cmd-bot-polkadot-sdk bot mentioned this pull request Oct 22, 2024

[stable2409] Backport #6080 #6181

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Assets in pool with native can be used in `query_weight_to_asset_fee` #6080

Assets in pool with native can be used in `query_weight_to_asset_fee` #6080

franciscoaguirre commented Oct 15, 2024

franciscoaguirre commented Oct 18, 2024

command-bot bot commented Oct 18, 2024 •

edited

Loading

command-bot bot commented Oct 18, 2024

acatangiu left a comment

franciscoaguirre commented Oct 21, 2024

franciscoaguirre commented Oct 21, 2024

command-bot bot commented Oct 21, 2024 •

edited

Loading

franciscoaguirre commented Oct 22, 2024

command-bot bot commented Oct 22, 2024 •

edited

Loading

command-bot bot commented Oct 22, 2024

bkontur Oct 22, 2024

bkontur Oct 22, 2024

bkontur Oct 22, 2024

bkontur Oct 22, 2024

paritytech-cmd-bot-polkadot-sdk bot commented Oct 22, 2024

paritytech-cmd-bot-polkadot-sdk bot commented Oct 22, 2024

	>(&native_token).map_err(\|()\| XcmPaymentApiError::VersionedConversionFailed)?.into_iter();
	>(&native_token).map_err(\|()\| XcmPaymentApiError::VersionedConversionFailed)?;

Assets in pool with native can be used in query_weight_to_asset_fee #6080

Assets in pool with native can be used in query_weight_to_asset_fee #6080

Conversation

franciscoaguirre commented Oct 15, 2024

franciscoaguirre commented Oct 18, 2024

command-bot bot commented Oct 18, 2024 • edited Loading

command-bot bot commented Oct 18, 2024

acatangiu left a comment

Choose a reason for hiding this comment

franciscoaguirre commented Oct 21, 2024

franciscoaguirre commented Oct 21, 2024

command-bot bot commented Oct 21, 2024 • edited Loading

franciscoaguirre commented Oct 22, 2024

command-bot bot commented Oct 22, 2024 • edited Loading

command-bot bot commented Oct 22, 2024

bkontur Oct 22, 2024

Choose a reason for hiding this comment

bkontur Oct 22, 2024

Choose a reason for hiding this comment

bkontur Oct 22, 2024

Choose a reason for hiding this comment

bkontur Oct 22, 2024

Choose a reason for hiding this comment

paritytech-cmd-bot-polkadot-sdk bot commented Oct 22, 2024

paritytech-cmd-bot-polkadot-sdk bot commented Oct 22, 2024

Assets in pool with native can be used in `query_weight_to_asset_fee` #6080

Assets in pool with native can be used in `query_weight_to_asset_fee` #6080

command-bot bot commented Oct 18, 2024 •

edited

Loading

command-bot bot commented Oct 21, 2024 •

edited

Loading

command-bot bot commented Oct 22, 2024 •

edited

Loading