Skip to content
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.

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

Remove redundant XCMs from dry run's forwarded xcms #5913

Merged
merged 17 commits into from
Oct 10, 2024

Conversation

franciscoaguirre
Copy link
Contributor

@franciscoaguirre franciscoaguirre commented Oct 3, 2024

Description

This PR addresses #5878.

After dry running an xcm on asset hub, we had redundant xcms showing up in the forwarded_xcms field of the dry run effects returned.
These were caused by two things:

  • The UpwardMessageSender router always added an element even if there were no messages.
  • The two routers on asset hub westend related to bridging (to rococo and sepolia) getting the message from their queues when their queues is actually the same xcmp queue that was already contemplated.

In order to fix this, we check for no messages in UMP and clear the implementation of InspectMessageQueues for these bridging routers.
Keep in mind that the bridged message is still sent, as normal via the xcmp-queue to Bridge Hub.
To keep on dry-running the journey of the message, the next hop to dry-run is Bridge Hub.
That'll be tackled in a different PR.

Added a test in bridge-hub-westend-integration-tests and bridge-hub-rococo-integration-tests that show that dry-running a transfer across the bridge from asset hub results in one and only one message sent to bridge hub.

TODO

  • Functionality
  • Test

@franciscoaguirre franciscoaguirre added the T6-XCM This PR/Issue is related to XCM. label Oct 3, 2024
@franciscoaguirre franciscoaguirre requested a review from a team as a code owner October 3, 2024 11:03
@franciscoaguirre franciscoaguirre changed the title Remove redundant XCMs from dry ran forwarded xcms Remove redundant XCMs from dry run's forwarded xcms Oct 3, 2024
@paritytech-review-bot paritytech-review-bot bot requested review from a team October 3, 2024 11:04
@acatangiu acatangiu added the A4-needs-backport Pull request must be backported to all maintained releases. label Oct 3, 2024
@franciscoaguirre
Copy link
Contributor Author

bot fmt

@command-bot
Copy link

command-bot bot commented Oct 4, 2024

@franciscoaguirre https://gitlab.parity.io/parity/mirrors/polkadot-sdk/-/jobs/7502715 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 13-38347683-8f6c-42d5-bf57-7291f131f911 to cancel this command or bot cancel to cancel all commands in this pull request.

@command-bot
Copy link

command-bot bot commented Oct 4, 2024

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

@acatangiu acatangiu enabled auto-merge October 10, 2024 07:45
@acatangiu
Copy link
Contributor

there are a few failing tests (pallet-xcm-bridge-hub-router tests::get_messages_works) that need updating, otherwise this is good to go 🚀

@acatangiu acatangiu added this pull request to the merge queue Oct 10, 2024
Merged via the queue into master with commit 4a70b2c Oct 10, 2024
199 of 200 checks passed
@acatangiu acatangiu deleted the xcm-dry-run-redundant-forwarded-xcms branch October 10, 2024 09:23
@paritytech-cmd-bot-polkadot-sdk

Created backport PR for stable2407:

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

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

@paritytech-cmd-bot-polkadot-sdk

Created backport PR for stable2409:

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

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

ordian added a commit that referenced this pull request Oct 11, 2024
* master: (28 commits)
  `substrate-node`: removed excessive polkadot-sdk features (#5925)
  Rename QueueEvent::StartWork (#6015)
  [ci] Remove quick-benchmarks-omni from GitLab (#6014)
  Set larger timeout for cmd.yml (#6006)
  Fix `0003-beefy-and-mmr` test (#6003)
  Remove redundant XCMs from dry run's forwarded xcms (#5913)
  Add RadiumBlock bootnodes to Coretime Polkadot Chain spec (#5967)
  Bump strum from 0.26.2 to 0.26.3 (#5943)
  Add PVF execution priority (#4837)
  Snowbridge V2 docs (#5902)
  Fix u256 conversion in BABE (#5994)
  [ci] Move test-linux-stable-no-try-runtime to GHA (#5979)
  Bump PoV request timeout (#5924)
  [Release/CI] Github flow to build `polkadot`/`polkadot-parachain` rc binaries and deb package (#5963)
  [ci] Remove short-benchmarks from Gitlab (#5988)
  Disable flaky tests reported in 5972/5973/5974 (#5976)
  Bump some dependencies (#5886)
  bump zombienet version and set request for k8s (#5968)
  [omni-bencher] Make all runtimes work (#5872)
  Omni-Node renamings (#5915)
  ...
franciscoaguirre added a commit that referenced this pull request Oct 15, 2024
Backport #5913 into `stable2409` from franciscoaguirre.

See the
[documentation](https://github.com/paritytech/polkadot-sdk/blob/master/docs/BACKPORT.md)
on how to use this bot.

<!--
  # To be used by other automation, do not modify:
  original-pr-number: #${pull_number}
-->

---------

Co-authored-by: Francisco Aguirre <[email protected]>
franciscoaguirre added a commit that referenced this pull request Oct 15, 2024
Backport #5913 into `stable2407` from franciscoaguirre.

See the
[documentation](https://github.com/paritytech/polkadot-sdk/blob/master/docs/BACKPORT.md)
on how to use this bot.

<!--
  # To be used by other automation, do not modify:
  original-pr-number: #${pull_number}
-->

---------

Co-authored-by: Francisco Aguirre <[email protected]>
Co-authored-by: Egor_P <[email protected]>
franciscoaguirre added a commit that referenced this pull request Oct 25, 2024
Backport #5913 into `stable2407` from franciscoaguirre.

See the
[documentation](https://github.com/paritytech/polkadot-sdk/blob/master/docs/BACKPORT.md)
on how to use this bot.

<!--
  # To be used by other automation, do not modify:
  original-pr-number: #${pull_number}
-->

---------

Co-authored-by: Francisco Aguirre <[email protected]>
Co-authored-by: Egor_P <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A4-needs-backport Pull request must be backported to all maintained releases. T6-XCM This PR/Issue is related to XCM.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants