[XCMv5]Remove XCM testnet NetworkIds #5390

programskillforverification · 2024-08-16T18:01:49Z

Context

Close #5241, for more detail, please refer to RFC0108

Changes

Remove Rococo and Westend from NetworkId

Add Rococo Genesis Hash and Westend Genesis Hash

acatangiu

You should not change the definition for existing XCM v3 and v4 versions, but instead, remove the test networks ids in the new upcoming XCM v5 version.

There is a PR for XCMv5: #4826

You should also change this PR's base branch to https://github.com/paritytech/polkadot-sdk/tree/xcm-v5 instead of master, to get your changes added to the xcm-v5 branch.

polkadot/xcm/src/v3/junction.rs

polkadot/xcm/src/v4/junction.rs

programskillforverification · 2024-08-19T15:17:25Z

You should not change the definition for existing XCM v3 and v4 versions, but instead, remove the test networks ids in the new upcoming XCM v5 version.

There is a PR for XCMv5: #4826

You should also change this PR's base branch to https://github.com/paritytech/polkadot-sdk/tree/xcm-v5 instead of master, to get your changes added to the xcm-v5 branch.

Oh, I am sorry that I don't know this PR. I will change it.

…block()` (paritytech#5339) There was no need for it to be `&mut self` since block import can happen concurrently for different blocks and in many cases it was `&mut Arc<dyn BlockImport>` anyway 🤷‍♂️ Similar in nature to paritytech#4844

The CI isn't happy with the amount of output: https://gitlab.parity.io/parity/mirrors/polkadot-sdk/-/jobs/7035621/raw --------- Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>

acatangiu

The XCM changes look good 👍

You need to clean up the current PR against xcm-v5 as it also contains unrelated changes coming from other master PRs.

@franciscoaguirre @bkontur besides the foreign assets ids, do we have any other affected storage items?

cumulus/client/consensus/common/src/lib.rs

acatangiu · 2024-08-20T13:03:56Z

cumulus/parachains/runtimes/assets/asset-hub-rococo/tests/tests.rs

+		let foreign_asset_id_location = Location::new(
+			2,
+			[Junction::GlobalConsensus(NetworkId::ByGenesis(WESTEND_GENESIS_HASH))],
+		);


Will also need a migration for the bridged assets registered as foreign assets on Rococo and Westend Asset Hubs.

Their IDs are changing now, storage items need migrating.

Will also need a migration for the bridged assets registered as foreign assets on Rococo and Westend Asset Hubs.

Their IDs are changing now, storage items need migrating.

Migrates storage to v5?

cc @franciscoaguirre since he looked at same migration for v3->v4

@franciscoaguirre pls provide more info or ref about migration

This will need multi-block migrations, which we don't have the setup for now. I need to work on getting that setup done anyway. When I'm done I'll update here.

We're going to merge this as is before the migration. We'll tackle the migration later. Created an issue to track it: #6319

cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs

cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/lib.rs

cumulus/parachains/runtimes/testing/penpal/src/xcm_config.rs

prdoc/pr_5339.prdoc

prdoc/pr_5376.prdoc

substrate/utils/binary-merkle-tree/src/lib.rs

cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs

…lib.rs Co-authored-by: Adrian Catangiu <adrian@parity.io>

paritytech-cicd-pr · 2024-09-05T14:12:57Z

The CI pipeline was cancelled due to failure one of the required jobs.
Job name: test-linux-stable 1/3
Logs: https://gitlab.parity.io/parity/mirrors/polkadot-sdk/-/jobs/7273019

acatangiu

Looks good, we can migrate the storage on testnets in a separate PR

franciscoaguirre · 2024-10-31T17:05:39Z

Agreed, just fixing the conflicts

franciscoaguirre · 2024-10-31T17:18:24Z

@yrong I'm getting an error here "expected primitive_types::H160, found H160" all over the place in bridges/snowbridge/primitives/core/src/outbound.rs. Any idea why?

franciscoaguirre · 2024-11-01T19:45:02Z

@yrong I'm getting an error here "expected primitive_types::H160, found H160" all over the place in bridges/snowbridge/primitives/core/src/outbound.rs. Any idea why?

Turns out the branch had a weird Cargo.lock. I replaced it with the upstream one and that error was gone

# 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>

# Context Close #5241, for more detail, please refer to [RFC0108](polkadot-fellows/RFCs#108) # Changes - Remove `Rococo` and `Westend` from `NetworkId` * Add `Rococo Genesis Hash` and `Westend Genesis Hash` --------- 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: Adrian Catangiu <adrian@parity.io> Co-authored-by: Francisco Aguirre <franciscoaguirreperez@gmail.com>

acatangiu reviewed Aug 19, 2024

View reviewed changes

polkadot/xcm/src/v3/junction.rs Outdated Show resolved Hide resolved

polkadot/xcm/src/v4/junction.rs Outdated Show resolved Hide resolved

programskillforverification changed the base branch from master to xcm-v5 August 19, 2024 15:24

programskillforverification and others added 5 commits August 20, 2024 01:42

initial modifications

cd33e83

binary-merkle-tree: Do not spam test output (paritytech#5376)

e83e8b3

The CI isn't happy with the amount of output: https://gitlab.parity.io/parity/mirrors/polkadot-sdk/-/jobs/7035621/raw --------- Co-authored-by: Shawn Tabrizi <shawntabrizi@gmail.com>

replace all networkids in cumulus and polkadot

856a3fe

remove networkis in xcm-v5

4f16f3c

programskillforverification force-pushed the remove-networkids branch from 9d38797 to 4f16f3c Compare August 19, 2024 18:25

programskillforverification added 2 commits August 20, 2024 15:59

fix From<NewNetworkId>

a43ca9c

make clippy happy

5d15302

programskillforverification force-pushed the remove-networkids branch from ed86293 to 5d15302 Compare August 20, 2024 11:23

programskillforverification marked this pull request as ready for review August 20, 2024 11:35

programskillforverification requested review from sorpaas and a team as code owners August 20, 2024 11:35

paritytech-review-bot bot requested a review from a team August 20, 2024 11:35

acatangiu reviewed Aug 20, 2024

View reviewed changes

programskillforverification changed the title ~~Remove XCM testnet NetworkIds~~ [XCMv5]Remove XCM testnet NetworkIds Aug 20, 2024

programskillforverification added 2 commits August 22, 2024 11:04

Merge branch 'xcm-v5' into remove-networkids

190dca7

fix unrelated pr

d58209c

paritytech-review-bot bot requested a review from a team August 22, 2024 03:32

acatangiu reviewed Aug 22, 2024

View reviewed changes

cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs Outdated Show resolved Hide resolved

Update cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/…

736f2ec

…lib.rs Co-authored-by: Adrian Catangiu <adrian@parity.io>

paritytech-review-bot bot requested a review from a team August 22, 2024 12:34

programskillforverification added 3 commits August 22, 2024 20:40

bridge-hub-westend conditionally import

b22604a

Merge branch 'xcm-v5' into remove-networkids

1d1d7c0

fix a rococo network

9f7dc75

programskillforverification added 2 commits October 18, 2024 15:11

Merge branch 'xcm-v5' into remove-networkids

c046a5c

fix confilct

7ec6498

acatangiu mentioned this pull request Oct 22, 2024

XCM v5 #4826

Merged

10 tasks

Merge branch 'xcm-v5' into remove-networkids

910f4d2

acatangiu approved these changes Oct 31, 2024

View reviewed changes

franciscoaguirre added 2 commits October 31, 2024 14:44

fix: add Cargo.lock

c9c72ff

Merge branch 'xcm-v5' into remove-networkids

5d078b9

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

fix: Cargo.lock issue

6decede

fix: remove crates with publish = false from prdoc

3bbce95

franciscoaguirre approved these changes Nov 1, 2024

View reviewed changes

franciscoaguirre merged commit e21773a into paritytech:xcm-v5 Nov 1, 2024
74 of 109 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[XCMv5]Remove XCM testnet NetworkIds #5390

[XCMv5]Remove XCM testnet NetworkIds #5390

programskillforverification commented Aug 16, 2024

acatangiu left a comment

programskillforverification commented Aug 19, 2024

acatangiu left a comment

acatangiu Aug 20, 2024

programskillforverification Aug 22, 2024

acatangiu Aug 22, 2024

programskillforverification Aug 27, 2024

franciscoaguirre Sep 6, 2024

franciscoaguirre Oct 31, 2024

paritytech-cicd-pr commented Sep 5, 2024

acatangiu left a comment

franciscoaguirre commented Oct 31, 2024

franciscoaguirre commented Oct 31, 2024

franciscoaguirre commented Nov 1, 2024

[XCMv5]Remove XCM testnet NetworkIds #5390

[XCMv5]Remove XCM testnet NetworkIds #5390

Conversation

programskillforverification commented Aug 16, 2024

Context

Changes

acatangiu left a comment

Choose a reason for hiding this comment

programskillforverification commented Aug 19, 2024

acatangiu left a comment

Choose a reason for hiding this comment

acatangiu Aug 20, 2024

Choose a reason for hiding this comment

programskillforverification Aug 22, 2024

Choose a reason for hiding this comment

acatangiu Aug 22, 2024

Choose a reason for hiding this comment

programskillforverification Aug 27, 2024

Choose a reason for hiding this comment

franciscoaguirre Sep 6, 2024

Choose a reason for hiding this comment

franciscoaguirre Oct 31, 2024

Choose a reason for hiding this comment

paritytech-cicd-pr commented Sep 5, 2024

acatangiu left a comment

Choose a reason for hiding this comment

franciscoaguirre commented Oct 31, 2024

franciscoaguirre commented Oct 31, 2024

franciscoaguirre commented Nov 1, 2024