Fix migrations for pallet-xcm #6148

bkontur · 2024-10-21T08:15:54Z

Relates to: #4826
Relates to: #3214

Description

pallet-xcm stores some operational data that uses Versioned* XCM types. When we add a new XCM version (XV), we deprecate XV-2 and remove XV-3. Without proper migration, this can lead to issues with undecodable storage, as was identified on the XCMv5 branch where XCMv2 was removed.

This PR extends the existing MigrateToLatestXcmVersion to include migration for the Queries, LockedFungibles, and RemoteLockedFungibles storage types. Additionally, more checks were added to try_state for these types.

TODO

create tracking issue for polkadot-fellows Migration for pallet_xcm data: Queries, LockedFungibles, and RemoteLockedFungibles polkadot-fellows/runtimes#492
Add missing MigrateToLatestXcmVersion for westend
fix pallet-xcm Queries
- fails for Westend https://github.com/paritytech/polkadot-sdk/actions/runs/11381324568/job/31662577532?pr=6092
- V2 was removed from Versioned* stuff, but we have a live data with V2 e.g. Queries - e.g. Kusama or Polkadot relay chains

VersionNotifier: {
        origin: {
          V2: {
            parents: 0
            interior: {
              X1: {
                Parachain: 2,124
              }
            }
          }
        }
        isActive: true
      }

fix also for RemoteLockedFungibles
fix also for LockedFungibles

Follow-ups

deploy on Westend chains before XCMv5
[XCM] pallet_xcm internal data changes proposal #6188

# Conflicts: # polkadot/runtime/westend/src/lib.rs

…ersion`

…RemoteLockedFungibles`

…migrations

bkontur · 2024-10-23T09:38:25Z

bot fmt

command-bot · 2024-10-23T09:38:30Z

@bkontur https://gitlab.parity.io/parity/mirrors/polkadot-sdk/-/jobs/7624303 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 29-6fd92f1d-1fe8-4b59-8989-f98e7014a4f5 to cancel this command or bot cancel to cancel all commands in this pull request.

command-bot · 2024-10-23T09:39:12Z

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

bkontur · 2024-10-23T09:48:29Z

/cmd prdoc

polkadot/xcm/pallet-xcm/src/lib.rs

polkadot/xcm/xcm-runtime-apis/tests/mock.rs

Co-authored-by: Francisco Aguirre <franciscoaguirreperez@gmail.com>

acatangiu · 2024-10-25T09:17:20Z

polkadot/xcm/pallet-xcm/src/tests/mod.rs

@@ -1258,6 +1262,168 @@ fn multistage_migration_works() {
 	})
 }

+#[test]
+fn migrate_data_to_xcm_version_works() {


nice test! 👍

paritytech-cmd-bot-polkadot-sdk · 2024-10-25T10:22:16Z

Created backport PR for stable2407:

[stable2407] Backport #6148 #6232 with remaining conflicts!

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

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

paritytech-cmd-bot-polkadot-sdk · 2024-10-25T10:22:22Z

Created backport PR for stable2409:

[stable2409] Backport #6148 #6233 with remaining conflicts!

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

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

Relates to: #4826 Relates to: #3214 `pallet-xcm` stores some operational data that uses `Versioned*` XCM types. When we add a new XCM version (XV), we deprecate XV-2 and remove XV-3. Without proper migration, this can lead to issues with [undecodable storage](https://github.com/paritytech/polkadot-sdk/actions/runs/11381324568/job/31662577532?pr=6092), as was identified on the XCMv5 branch where XCMv2 was removed. This PR extends the existing `MigrateToLatestXcmVersion` to include migration for the `Queries`, `LockedFungibles`, and `RemoteLockedFungibles` storage types. Additionally, more checks were added to `try_state` for these types. - [x] create tracking issue for `polkadot-fellows` polkadot-fellows/runtimes#492 - [x] Add missing `MigrateToLatestXcmVersion` for westend - [x] fix pallet-xcm `Queries` - fails for Westend https://github.com/paritytech/polkadot-sdk/actions/runs/11381324568/job/31662577532?pr=6092 - `V2` was removed from `Versioned*` stuff, but we have a live data with V2 e.g. Queries - e.g. Kusama or Polkadot relay chains ``` VersionNotifier: { origin: { V2: { parents: 0 interior: { X1: { Parachain: 2,124 } } } } isActive: true } ``` ![image](https://github.com/user-attachments/assets/f59f761b-46a7-4def-8aea-45c4e41c0a00) - [x] fix also for `RemoteLockedFungibles` - [x] fix also for `LockedFungibles` - [ ] deploy on Westend chains before XCMv5 - [ ] #6188 --------- Co-authored-by: command-bot <> Co-authored-by: GitHub Action <action@github.com> Co-authored-by: Francisco Aguirre <franciscoaguirreperez@gmail.com> (cherry picked from commit efd6603)

Relates to: paritytech#4826 Relates to: paritytech#3214 ## Description `pallet-xcm` stores some operational data that uses `Versioned*` XCM types. When we add a new XCM version (XV), we deprecate XV-2 and remove XV-3. Without proper migration, this can lead to issues with [undecodable storage](https://github.com/paritytech/polkadot-sdk/actions/runs/11381324568/job/31662577532?pr=6092), as was identified on the XCMv5 branch where XCMv2 was removed. This PR extends the existing `MigrateToLatestXcmVersion` to include migration for the `Queries`, `LockedFungibles`, and `RemoteLockedFungibles` storage types. Additionally, more checks were added to `try_state` for these types. ## TODO - [x] create tracking issue for `polkadot-fellows` polkadot-fellows/runtimes#492 - [x] Add missing `MigrateToLatestXcmVersion` for westend - [x] fix pallet-xcm `Queries` - fails for Westend https://github.com/paritytech/polkadot-sdk/actions/runs/11381324568/job/31662577532?pr=6092 - `V2` was removed from `Versioned*` stuff, but we have a live data with V2 e.g. Queries - e.g. Kusama or Polkadot relay chains ``` VersionNotifier: { origin: { V2: { parents: 0 interior: { X1: { Parachain: 2,124 } } } } isActive: true } ``` ![image](https://github.com/user-attachments/assets/f59f761b-46a7-4def-8aea-45c4e41c0a00) - [x] fix also for `RemoteLockedFungibles` - [x] fix also for `LockedFungibles` ## Follow-ups - [ ] deploy on Westend chains before XCMv5 - [ ] paritytech#6188 --------- Co-authored-by: command-bot <> Co-authored-by: GitHub Action <action@github.com> Co-authored-by: Francisco Aguirre <franciscoaguirreperez@gmail.com>

Backport #6148 into `stable2409` from bkontur. See the [documentation](https://github.com/paritytech/polkadot-sdk/blob/master/docs/BACKPORT.md) on how to use this bot.  --------- Co-authored-by: Branislav Kontur <bkontur@gmail.com>

# Context This PR aims to introduce XCMv5, for now it's in progress and will be updated over time. This branch will serve as a milestone branch for merging in all features we want to add to XCM, roughly outlined [here](polkadot-fellows/xcm-format#60). More features could be added. ## TODO - [x] Migrate foreign assets from v3 to v4 - [x] Setup v5 skeleton - [x] Remove XCMv2 - [x] #5390 - [x] #5585 - [x] #5420 - [x] #5876 - [x] #5971 - [x] #6148 - [x] #6228 Fixes #3434 Fixes #4190 Fixes #5209 Fixes #5241 Fixes #4284 --------- Signed-off-by: Adrian Catangiu <adrian@parity.io> Co-authored-by: Adrian Catangiu <adrian@parity.io> Co-authored-by: Andrii <ndk@parity.io> Co-authored-by: Branislav Kontur <bkontur@gmail.com> Co-authored-by: Joseph Zhao <65984904+programskillforverification@users.noreply.github.com> Co-authored-by: Nazar Mokrynskyi <nazar@mokrynskyi.com> Co-authored-by: Bastian Köcher <git@kchr.de> Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com> Co-authored-by: command-bot <> Co-authored-by: GitHub Action <action@github.com> Co-authored-by: Serban Iorga <serban@parity.io>

Backport #6148 into `stable2407` from bkontur. See the [documentation](https://github.com/paritytech/polkadot-sdk/blob/master/docs/BACKPORT.md) on how to use this bot.  --------- Co-authored-by: Branislav Kontur <bkontur@gmail.com>

Missing MigrateToLatestXcmVersion for westend

d53700a

# Conflicts: # polkadot/runtime/westend/src/lib.rs

This was referenced Oct 21, 2024

Fix migrations for pallet-xcm #6099

Closed

XCM v5 #4826

Merged

bkontur added 8 commits October 21, 2024 14:18

Align everywhere `type AdvertisedXcmVersion = pallet_xcm::CurrentXcmV…

2cf2ad7

…ersion`

very nits

c7d9771

Add Queries to the try-state

5667031

WIP: try_state for Queries and LockedFungibles

6dc9179

Merge branch 'master' into bko-fix-pallet-xcm-migrations

3ed12cf

typo

64eaf49

Adds migration for pallet_xcm data: Queries, LockedFungibles, `…

0105b4a

…RemoteLockedFungibles`

Merge remote-tracking branch 'origin/master' into bko-fix-pallet-xcm-…

b97964c

…migrations

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

e2b1bd3

bkontur mentioned this pull request Oct 23, 2024

[XCM] pallet_xcm internal data changes proposal #6188

Open

5 tasks

bkontur added the T6-XCM This PR/Issue is related to XCM. label Oct 23, 2024

Update from bkontur running command 'prdoc'

e408d3f

bkontur added the A3-backport Pull request is already reviewed well in another branch. label Oct 23, 2024

fixed prdoc

6b8a0eb

bkontur mentioned this pull request Oct 23, 2024

Migration for pallet_xcm data: Queries, LockedFungibles, and RemoteLockedFungibles polkadot-fellows/runtimes#492

Open

2 tasks

bkontur marked this pull request as ready for review October 23, 2024 10:07

bkontur requested a review from a team as a code owner October 23, 2024 10:07

bkontur requested a review from franciscoaguirre October 23, 2024 10:15

bkontur added A4-needs-backport Pull request must be backported to all maintained releases. and removed A3-backport Pull request is already reviewed well in another branch. labels Oct 23, 2024

Merge branch 'master' into bko-fix-pallet-xcm-migrations

879d253

bkontur self-assigned this Oct 23, 2024

franciscoaguirre reviewed Oct 23, 2024

View reviewed changes

polkadot/xcm/pallet-xcm/src/lib.rs Outdated Show resolved Hide resolved

polkadot/xcm/xcm-runtime-apis/tests/mock.rs Show resolved Hide resolved

Update polkadot/xcm/pallet-xcm/src/lib.rs

a3fc9af

Co-authored-by: Francisco Aguirre <franciscoaguirreperez@gmail.com>

franciscoaguirre approved these changes Oct 23, 2024

View reviewed changes

Merge branch 'master' into bko-fix-pallet-xcm-migrations

dc8e41a

acatangiu approved these changes Oct 25, 2024

View reviewed changes

acatangiu added this pull request to the merge queue Oct 25, 2024

Merged via the queue into master with commit efd6603 Oct 25, 2024
188 of 196 checks passed

acatangiu deleted the bko-fix-pallet-xcm-migrations branch October 25, 2024 10:21

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

[stable2407] Backport #6148 #6232

Merged

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

[stable2409] Backport #6148 #6233

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix migrations for pallet-xcm #6148

Fix migrations for pallet-xcm #6148

bkontur commented Oct 21, 2024 •

edited

Loading

bkontur commented Oct 23, 2024

command-bot bot commented Oct 23, 2024 •

edited

Loading

command-bot bot commented Oct 23, 2024

bkontur commented Oct 23, 2024

acatangiu Oct 25, 2024

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

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

Fix migrations for pallet-xcm #6148

Fix migrations for pallet-xcm #6148

Conversation

bkontur commented Oct 21, 2024 • edited Loading

Description

TODO

Follow-ups

bkontur commented Oct 23, 2024

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

command-bot bot commented Oct 23, 2024

bkontur commented Oct 23, 2024

acatangiu Oct 25, 2024

Choose a reason for hiding this comment

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

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

bkontur commented Oct 21, 2024 •

edited

Loading

command-bot bot commented Oct 23, 2024 •

edited

Loading