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

xcm: fix local/remote exports when inner routers return NotApplicable #6645

Merged
merged 5 commits into from
Nov 26, 2024

Conversation

bkontur
Copy link
Contributor

@bkontur bkontur commented Nov 26, 2024

This PR addresses two small fixes:

  1. Fixed a typo ("as as") found on the way.
  2. Resolved a bug in the local/remote exporters used for bridging. Previously, they consumed dest and msg without returning them when inner routers/exporters failed with NotApplicable. This PR ensures compliance with the SendXcm and ExportXcm traits.

TODO:

@bkontur bkontur added R0-silent Changes should not be mentioned in any release notes T6-XCM This PR/Issue is related to XCM. T15-bridges This PR/Issue is related to bridges. labels Nov 26, 2024
@bkontur bkontur self-assigned this Nov 26, 2024
@bkontur bkontur requested review from a team as code owners November 26, 2024 10:15
@bkontur bkontur added the A4-needs-backport Pull request must be backported to all maintained releases. label Nov 26, 2024
@bkontur
Copy link
Contributor Author

bkontur commented Nov 26, 2024

/cmd fmt

Copy link

Command "fmt" has started 🚀 See logs here

Copy link

Command "fmt" has finished ✅ See logs here

@paritytech-workflow-stopper
Copy link

All GitHub workflows were cancelled due to failure one of the required jobs.
Failed workflow url: https://github.com/paritytech/polkadot-sdk/actions/runs/12028417456
Failed job name: fmt

@bkontur bkontur closed this Nov 26, 2024
@bkontur bkontur reopened this Nov 26, 2024
@bkontur
Copy link
Contributor Author

bkontur commented Nov 26, 2024

/cmd prdoc --audience runtime_dev --bump patch

prdoc/pr_6645.prdoc Outdated Show resolved Hide resolved
@bkontur bkontur added this pull request to the merge queue Nov 26, 2024
Merged via the queue into master with commit 1c0b610 Nov 26, 2024
193 of 198 checks passed
@bkontur bkontur deleted the bko-fix-xcm-exporters branch November 26, 2024 15:44
@paritytech-cmd-bot-polkadot-sdk

Created backport PR for stable2407:

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

git fetch origin backport-6645-to-stable2407
git worktree add --checkout .worktree/backport-6645-to-stable2407 backport-6645-to-stable2407
cd .worktree/backport-6645-to-stable2407
git reset --hard HEAD^
git cherry-pick -x 1c0b610078611dfebc082be52e77109ea4517e48
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-6645-to-stable2409
git worktree add --checkout .worktree/backport-6645-to-stable2409 backport-6645-to-stable2409
cd .worktree/backport-6645-to-stable2409
git reset --hard HEAD^
git cherry-pick -x 1c0b610078611dfebc082be52e77109ea4517e48
git push --force-with-lease

bkontur added a commit that referenced this pull request Nov 26, 2024
…e` (#6645)

This PR addresses two small fixes:  

1. Fixed a typo ("as as") found on the way.  
2. Resolved a bug in the `local/remote exporters` used for bridging.
Previously, they consumed `dest` and `msg` without returning them when
inner routers/exporters failed with `NotApplicable`. This PR ensures
compliance with the
[`SendXcm`](https://github.com/paritytech/polkadot-sdk/blob/master/polkadot/xcm/src/v5/traits.rs#L449-L450)
and
[`ExportXcm`](https://github.com/paritytech/polkadot-sdk/blob/master/polkadot/xcm/xcm-executor/src/traits/export.rs#L44-L45)
traits.

---------

Co-authored-by: GitHub Action <[email protected]>
EgorPopelyaev pushed a commit that referenced this pull request Nov 27, 2024
This PR contains backports of:
- #6465
- #6536
- #6579
- #6645

(when those were merged, bot didn't create backport PRs to stable2412)

---------

Co-authored-by: GitHub Action <[email protected]>
EgorPopelyaev pushed a commit that referenced this pull request Nov 27, 2024
Backport #6645 into `stable2407` from bkontur.

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: Branislav Kontur <[email protected]>
EgorPopelyaev pushed a commit that referenced this pull request Nov 27, 2024
Backport #6645 into `stable2409` from bkontur.

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: Branislav Kontur <[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. R0-silent Changes should not be mentioned in any release notes T6-XCM This PR/Issue is related to XCM. T15-bridges This PR/Issue is related to bridges.
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

4 participants