Merge branch 'bko-bump-to-1.7' into sv-pk-bridge-snowbridge

# Conflicts: # system-parachains/bridge-hubs/bridge-hub-kusama/src/lib.rs # system-parachains/bridge-hubs/bridge-hub-polkadot/src/lib.rs
polkadot-fellows · Feb 21, 2024 · 5d9e08a · 5d9e08a
2 parents 82ddda2 + 24d61eb
commit 5d9e08a
Show file tree

Hide file tree

Showing 23 changed files with 160 additions and 81 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/integration-tests/emulated/assets/asset-hub-kusama/Cargo.toml b/integration-tests/emulated/assets/asset-hub-kusama/Cargo.toml
@@ -21,13 +21,13 @@ pallet-message-queue = { version = "32.0.0" }
 
 # Polkadot
 xcm = { package = "staging-xcm", version = "8.0.0" }
-xcm-executor = { package = "staging-xcm-executor", default-features = false, version = "8.0.0" }
+xcm-executor = { package = "staging-xcm-executor", default-features = false, version = "8.0.1" }
 pallet-xcm = { version = "8.0.0" }
 
 # Cumulus
 parachains-common = { version = "8.0.0" }
 xcm-emulator = { version = "0.6.0" }
-asset-test-utils = { version = "8.0.0" }
+asset-test-utils = { version = "8.0.1" }
 
 # Local
 emulated-chains = { path = "../../chains" }

diff --git a/integration-tests/emulated/assets/asset-hub-polkadot/Cargo.toml b/integration-tests/emulated/assets/asset-hub-polkadot/Cargo.toml
@@ -19,13 +19,13 @@ pallet-message-queue = { version = "32.0.0" }
 
 # Polkadot
 xcm = { package = "staging-xcm", version = "8.0.0" }
-xcm-executor = { package = "staging-xcm-executor", default-features = false, version = "8.0.0" }
+xcm-executor = { package = "staging-xcm-executor", default-features = false, version = "8.0.1" }
 pallet-xcm = { version = "8.0.0" }
 
 # Cumulus
 parachains-common = { version = "8.0.0" }
 xcm-emulator = { version = "0.6.0" }
-asset-test-utils = { version = "8.0.0" }
+asset-test-utils = { version = "8.0.1" }
 
 # Local
 emulated-chains = { path = "../../chains" }

diff --git a/integration-tests/emulated/common/Cargo.toml b/integration-tests/emulated/common/Cargo.toml
@@ -35,7 +35,7 @@ cumulus-primitives-core = { version = "0.8.0" }
 xcm-emulator = { version = "0.6.0" }
 cumulus-pallet-xcmp-queue = { version = "0.8.0" }
 cumulus-pallet-parachain-system = { features = ["parameterized-consensus-hook",] , version = "0.8.0" }
-asset-test-utils = { version = "8.0.0" }
+asset-test-utils = { version = "8.0.1" }
 cumulus-pallet-dmp-queue = { version = "0.8.0" }
 
 # Bridges

diff --git a/relay/kusama/Cargo.toml b/relay/kusama/Cargo.toml
@@ -111,7 +111,7 @@ runtime-parachains = { package = "polkadot-runtime-parachains", default-features
 primitives = { package = "polkadot-primitives", default-features = false , version = "8.0.0" }
 
 xcm = { package = "staging-xcm", default-features = false , version = "8.0.0" }
-xcm-executor = { package = "staging-xcm-executor", default-features = false , version = "8.0.0" }
+xcm-executor = { package = "staging-xcm-executor", default-features = false , version = "8.0.1" }
 xcm-builder = { package = "staging-xcm-builder", default-features = false , version = "8.0.0" }
 
 sp-debug-derive = { default-features = false, version = "14.0.0" }

diff --git a/relay/kusama/src/lib.rs b/relay/kusama/src/lib.rs
@@ -1676,7 +1676,7 @@ impl Get<Perbill> for NominationPoolsMigrationV4OldPallet {
 ///
 /// This contains the combined migrations of the last 10 releases. It allows to skip runtime
 /// upgrades in case governance decides to do so. THE ORDER IS IMPORTANT.
-pub type Migrations = migrations::Unreleased;
+pub type Migrations = (migrations::Unreleased, migrations::Permanent);
 
 /// The runtime migrations per release.
 #[allow(deprecated, missing_docs)]
@@ -1701,6 +1701,9 @@ pub mod migrations {
 		// this comment!
 		parachains_scheduler::migration::MigrateV1ToV2<Runtime>,
 	);
+
+	/// Migrations/checks that do not need to be versioned and can run on every update.
+	pub type Permanent = (pallet_xcm::migration::MigrateToLatestXcmVersion<Runtime>,);
 }
 
 /// Unchecked extrinsic type as expected by this runtime.

diff --git a/relay/polkadot/Cargo.toml b/relay/polkadot/Cargo.toml
@@ -107,7 +107,7 @@ runtime-parachains = { package = "polkadot-runtime-parachains", default-features
 primitives = { package = "polkadot-primitives", default-features = false , version = "8.0.0" }
 
 xcm = { package = "staging-xcm", default-features = false , version = "8.0.0" }
-xcm-executor = { package = "staging-xcm-executor", default-features = false , version = "8.0.0" }
+xcm-executor = { package = "staging-xcm-executor", default-features = false , version = "8.0.1" }
 xcm-builder = { package = "staging-xcm-builder", default-features = false , version = "8.0.0" }
 
 sp-debug-derive = { default-features = false, version = "14.0.0" }

diff --git a/relay/polkadot/src/lib.rs b/relay/polkadot/src/lib.rs
@@ -1697,7 +1697,7 @@ impl Get<Perbill> for NominationPoolsMigrationV4OldPallet {
 ///
 /// This contains the combined migrations of the last 10 releases. It allows to skip runtime
 /// upgrades in case governance decides to do so. THE ORDER IS IMPORTANT.
-pub type Migrations = migrations::Unreleased;
+pub type Migrations = (migrations::Unreleased, migrations::Permanent);
 
 /// The runtime migrations per release.
 #[allow(deprecated, missing_docs)]
@@ -1734,6 +1734,9 @@ pub mod migrations {
 		// this comment!
 		parachains_scheduler::migration::MigrateV1ToV2<Runtime>,
 	);
+
+	/// Migrations/checks that do not need to be versioned and can run on every update.
+	pub type Permanent = (pallet_xcm::migration::MigrateToLatestXcmVersion<Runtime>,);
 }
 
 /// Unchecked extrinsic type as expected by this runtime.

diff --git a/system-parachains/asset-hubs/asset-hub-kusama/Cargo.toml b/system-parachains/asset-hubs/asset-hub-kusama/Cargo.toml
@@ -74,7 +74,7 @@ polkadot-parachain-primitives = { default-features = false, version = "7.0.0" }
 polkadot-runtime-common = { default-features = false, version = "8.0.0" }
 xcm = { package = "staging-xcm", default-features = false, version = "8.0.0" }
 xcm-builder = { package = "staging-xcm-builder", default-features = false, version = "8.0.0" }
-xcm-executor = { package = "staging-xcm-executor", default-features = false, version = "8.0.0" }
+xcm-executor = { package = "staging-xcm-executor", default-features = false, version = "8.0.1" }
 
 # Cumulus
 cumulus-pallet-aura-ext = { default-features = false , version = "0.8.0" }
@@ -96,7 +96,7 @@ pallet-xcm-bridge-hub-router = { default-features = false , version = "0.6.0" }
 snowbridge-router-primitives = { default-features = false , version = "0.1.0" }
 
 [dev-dependencies]
-asset-test-utils = { version = "8.0.0" }
+asset-test-utils = { version = "8.0.1" }
 parachains-runtimes-test-utils = { version = "8.0.0" }
 sp-io = { version = "31.0.0" }
 

diff --git a/system-parachains/asset-hubs/asset-hub-kusama/primitives/src/lib.rs b/system-parachains/asset-hubs/asset-hub-kusama/primitives/src/lib.rs
@@ -19,7 +19,6 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 
 use codec::{Decode, Encode};
-use frame_support::weights::Weight;
 use scale_info::TypeInfo;
 use xcm::prelude::*;
 

diff --git a/system-parachains/asset-hubs/asset-hub-kusama/src/lib.rs b/system-parachains/asset-hubs/asset-hub-kusama/src/lib.rs
@@ -990,6 +990,8 @@ pub type UncheckedExtrinsic =
 pub type Migrations = (
 	// unreleased
 	cumulus_pallet_xcmp_queue::migration::v4::MigrationToV4<Runtime>,
+	// permanent
+	pallet_xcm::migration::MigrateToLatestXcmVersion<Runtime>,
 );
 
 /// Executive: handles dispatch to the various modules.