From 575494d609e47579e63eabeec156e57ca5084148 Mon Sep 17 00:00:00 2001 From: Peter White Date: Mon, 19 Aug 2024 10:22:20 -0600 Subject: [PATCH 1/4] chore(runtime): bump versions to 0.3.0 --- Cargo.lock | 6 +++--- runtime/common/Cargo.toml | 2 +- runtime/devnet/Cargo.toml | 2 +- runtime/devnet/src/lib.rs | 10 +++++----- runtime/testnet/Cargo.toml | 2 +- runtime/testnet/src/lib.rs | 10 +++++----- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 75109c58e..36568149f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -9530,7 +9530,7 @@ dependencies = [ [[package]] name = "pop-runtime-common" -version = "0.0.0" +version = "0.3.0" dependencies = [ "frame-support", "parachains-common", @@ -9543,7 +9543,7 @@ dependencies = [ [[package]] name = "pop-runtime-devnet" -version = "0.1.0" +version = "0.3.0" dependencies = [ "cumulus-pallet-aura-ext", "cumulus-pallet-parachain-system", @@ -9616,7 +9616,7 @@ dependencies = [ [[package]] name = "pop-runtime-testnet" -version = "0.2.0" +version = "0.3.0" dependencies = [ "cumulus-pallet-aura-ext", "cumulus-pallet-parachain-system", diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml index 0cd9aecb4..bed02b7fd 100644 --- a/runtime/common/Cargo.toml +++ b/runtime/common/Cargo.toml @@ -5,7 +5,7 @@ edition.workspace = true license.workspace = true name = "pop-runtime-common" repository.workspace = true -version = "0.0.0" +version = "0.3.0" publish = false [package.metadata.docs.rs] diff --git a/runtime/devnet/Cargo.toml b/runtime/devnet/Cargo.toml index 4f19b6622..4628d0287 100644 --- a/runtime/devnet/Cargo.toml +++ b/runtime/devnet/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pop-runtime-devnet" -version = "0.1.0" +version = "0.3.0" authors.workspace = true description.workspace = true license = "Unlicense" diff --git a/runtime/devnet/src/lib.rs b/runtime/devnet/src/lib.rs index 32da83ff9..c90fd50ab 100644 --- a/runtime/devnet/src/lib.rs +++ b/runtime/devnet/src/lib.rs @@ -178,7 +178,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { impl_name: create_runtime_str!("pop"), authoring_version: 1, #[allow(clippy::zero_prefixed_literal)] - spec_version: 00_01_00, + spec_version: 00_03_00, impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 1, @@ -241,10 +241,10 @@ impl Contains for FilteredCalls { matches!( c, RuntimeCall::Balances( - force_adjust_total_issuance { .. } - | force_set_balance { .. } - | force_transfer { .. } - | force_unreserve { .. } + force_adjust_total_issuance { .. } | + force_set_balance { .. } | + force_transfer { .. } | + force_unreserve { .. } ) ) } diff --git a/runtime/testnet/Cargo.toml b/runtime/testnet/Cargo.toml index 3c584b373..70b155e51 100644 --- a/runtime/testnet/Cargo.toml +++ b/runtime/testnet/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pop-runtime-testnet" -version = "0.2.0" +version = "0.3.0" authors.workspace = true description.workspace = true license = "Unlicense" diff --git a/runtime/testnet/src/lib.rs b/runtime/testnet/src/lib.rs index 52104c434..036697247 100644 --- a/runtime/testnet/src/lib.rs +++ b/runtime/testnet/src/lib.rs @@ -181,7 +181,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { impl_name: create_runtime_str!("pop"), authoring_version: 1, #[allow(clippy::zero_prefixed_literal)] - spec_version: 00_02_00, + spec_version: 00_03_00, impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 1, @@ -244,10 +244,10 @@ impl Contains for FilteredCalls { matches!( c, RuntimeCall::Balances( - force_adjust_total_issuance { .. } - | force_set_balance { .. } - | force_transfer { .. } - | force_unreserve { .. } + force_adjust_total_issuance { .. } | + force_set_balance { .. } | + force_transfer { .. } | + force_unreserve { .. } ) ) } From 95b283284954aa47af56bcaaa78234c67efbb1c8 Mon Sep 17 00:00:00 2001 From: Peter White Date: Mon, 19 Aug 2024 10:29:49 -0600 Subject: [PATCH 2/4] chore(runtime): cargo fmt on stable --- runtime/devnet/src/lib.rs | 8 ++++---- runtime/testnet/src/lib.rs | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/runtime/devnet/src/lib.rs b/runtime/devnet/src/lib.rs index c90fd50ab..833ad2573 100644 --- a/runtime/devnet/src/lib.rs +++ b/runtime/devnet/src/lib.rs @@ -241,10 +241,10 @@ impl Contains for FilteredCalls { matches!( c, RuntimeCall::Balances( - force_adjust_total_issuance { .. } | - force_set_balance { .. } | - force_transfer { .. } | - force_unreserve { .. } + force_adjust_total_issuance { .. } + | force_set_balance { .. } + | force_transfer { .. } + | force_unreserve { .. } ) ) } diff --git a/runtime/testnet/src/lib.rs b/runtime/testnet/src/lib.rs index 036697247..37ec4d295 100644 --- a/runtime/testnet/src/lib.rs +++ b/runtime/testnet/src/lib.rs @@ -244,10 +244,10 @@ impl Contains for FilteredCalls { matches!( c, RuntimeCall::Balances( - force_adjust_total_issuance { .. } | - force_set_balance { .. } | - force_transfer { .. } | - force_unreserve { .. } + force_adjust_total_issuance { .. } + | force_set_balance { .. } + | force_transfer { .. } + | force_unreserve { .. } ) ) } From 4da44a98da94bfd920a1a1812baacc198ef8114b Mon Sep 17 00:00:00 2001 From: Peter White Date: Mon, 19 Aug 2024 10:57:36 -0600 Subject: [PATCH 3/4] chore(runtime): remove collator selection migration --- runtime/testnet/src/lib.rs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/runtime/testnet/src/lib.rs b/runtime/testnet/src/lib.rs index 37ec4d295..f0e8b3a3e 100644 --- a/runtime/testnet/src/lib.rs +++ b/runtime/testnet/src/lib.rs @@ -107,9 +107,6 @@ pub type SignedExtra = ( pub type UncheckedExtrinsic = generic::UncheckedExtrinsic; -/// Migrations to apply on runtime upgrade. -pub type Migrations = (pallet_collator_selection::migration::v2::MigrationToV2,); - /// Executive: handles dispatch to the various modules. pub type Executive = frame_executive::Executive< Runtime, @@ -117,7 +114,6 @@ pub type Executive = frame_executive::Executive< frame_system::ChainContext, Runtime, AllPalletsWithSystem, - Migrations, >; /// Handles converting a weight scalar to a fee value, based on the scale and granularity of the From 873ea1e43a5445ba91f9e14d2b8e882d000c2883 Mon Sep 17 00:00:00 2001 From: Peter White Date: Mon, 19 Aug 2024 11:14:50 -0600 Subject: [PATCH 4/4] revert(runtime): devnet and common version --- Cargo.lock | 4 ++-- runtime/common/Cargo.toml | 2 +- runtime/devnet/Cargo.toml | 2 +- runtime/devnet/src/lib.rs | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 36568149f..d154cbe19 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -9530,7 +9530,7 @@ dependencies = [ [[package]] name = "pop-runtime-common" -version = "0.3.0" +version = "0.0.0" dependencies = [ "frame-support", "parachains-common", @@ -9543,7 +9543,7 @@ dependencies = [ [[package]] name = "pop-runtime-devnet" -version = "0.3.0" +version = "0.1.0" dependencies = [ "cumulus-pallet-aura-ext", "cumulus-pallet-parachain-system", diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml index bed02b7fd..0cd9aecb4 100644 --- a/runtime/common/Cargo.toml +++ b/runtime/common/Cargo.toml @@ -5,7 +5,7 @@ edition.workspace = true license.workspace = true name = "pop-runtime-common" repository.workspace = true -version = "0.3.0" +version = "0.0.0" publish = false [package.metadata.docs.rs] diff --git a/runtime/devnet/Cargo.toml b/runtime/devnet/Cargo.toml index 4628d0287..4f19b6622 100644 --- a/runtime/devnet/Cargo.toml +++ b/runtime/devnet/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pop-runtime-devnet" -version = "0.3.0" +version = "0.1.0" authors.workspace = true description.workspace = true license = "Unlicense" diff --git a/runtime/devnet/src/lib.rs b/runtime/devnet/src/lib.rs index 833ad2573..32da83ff9 100644 --- a/runtime/devnet/src/lib.rs +++ b/runtime/devnet/src/lib.rs @@ -178,7 +178,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { impl_name: create_runtime_str!("pop"), authoring_version: 1, #[allow(clippy::zero_prefixed_literal)] - spec_version: 00_03_00, + spec_version: 00_01_00, impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 1,