From 4ffa9b88a34a7d0b4d1feb086176e27eacb766ee Mon Sep 17 00:00:00 2001 From: Egor_P Date: Tue, 30 Jul 2024 14:27:38 +0200 Subject: [PATCH] [Backport] version bumps and the prdocs reordering from stable2407 (#5178) This PR backports regular version bumps and reorganisation of the `prdoc` files from the stable release branch back to master --- cumulus/parachains/runtimes/assets/asset-hub-rococo/src/lib.rs | 2 +- cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs | 2 +- .../runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs | 2 +- .../runtimes/bridge-hubs/bridge-hub-westend/src/lib.rs | 2 +- .../runtimes/collectives/collectives-westend/src/lib.rs | 2 +- .../parachains/runtimes/contracts/contracts-rococo/src/lib.rs | 2 +- cumulus/parachains/runtimes/coretime/coretime-rococo/src/lib.rs | 2 +- .../parachains/runtimes/coretime/coretime-westend/src/lib.rs | 2 +- cumulus/parachains/runtimes/glutton/glutton-westend/src/lib.rs | 2 +- cumulus/parachains/runtimes/people/people-rococo/src/lib.rs | 2 +- cumulus/parachains/runtimes/people/people-westend/src/lib.rs | 2 +- polkadot/node/primitives/src/lib.rs | 2 +- polkadot/runtime/rococo/src/lib.rs | 2 +- polkadot/runtime/westend/src/lib.rs | 2 +- prdoc/{ => 1.15.0}/pr_3286.prdoc | 0 prdoc/{ => 1.15.0}/pr_4097.prdoc | 0 prdoc/{ => 1.15.0}/pr_4522.prdoc | 0 prdoc/{ => 1.15.0}/pr_4563.prdoc | 0 prdoc/{ => 1.15.0}/pr_4566.prdoc | 0 prdoc/{ => 1.15.0}/pr_4663.prdoc | 0 prdoc/{ => 1.15.0}/pr_4738.prdoc | 0 prdoc/{ => 1.15.0}/pr_4755.prdoc | 0 prdoc/{ => 1.15.0}/pr_4777.prdoc | 0 prdoc/{ => 1.15.0}/pr_4839.prdoc | 0 prdoc/{ => 1.15.0}/pr_4840.prdoc | 0 prdoc/{ => 1.15.0}/pr_4848.prdoc | 0 prdoc/{ => 1.15.0}/pr_4863.prdoc | 0 prdoc/{ => 1.15.0}/pr_4871.prdoc | 0 prdoc/{ => 1.15.0}/pr_4885.prdoc | 0 prdoc/{ => 1.15.0}/pr_4888.prdoc | 0 prdoc/{ => 1.15.0}/pr_4902.prdoc | 0 prdoc/{ => 1.15.0}/pr_4912.prdoc | 0 prdoc/{ => 1.15.0}/pr_4922.prdoc | 0 prdoc/{ => 1.15.0}/pr_4932.prdoc | 0 prdoc/{ => 1.15.0}/pr_4935.prdoc | 0 prdoc/{ => 1.15.0}/pr_4943.prdoc | 0 prdoc/{ => 1.15.0}/pr_4972.prdoc | 0 prdoc/{ => 1.15.0}/pr_4978.prdoc | 0 prdoc/{ => 1.15.0}/pr_4997.prdoc | 0 prdoc/{ => 1.15.0}/pr_5011.prdoc | 0 prdoc/{ => 1.15.0}/pr_5040.prdoc | 0 prdoc/{ => 1.15.0}/pr_5103.prdoc | 0 prdoc/{ => 1.15.0}/pr_5153.prdoc | 0 43 files changed, 14 insertions(+), 14 deletions(-) rename prdoc/{ => 1.15.0}/pr_3286.prdoc (100%) rename prdoc/{ => 1.15.0}/pr_4097.prdoc (100%) rename prdoc/{ => 1.15.0}/pr_4522.prdoc (100%) rename prdoc/{ => 1.15.0}/pr_4563.prdoc (100%) rename prdoc/{ => 1.15.0}/pr_4566.prdoc (100%) rename prdoc/{ => 1.15.0}/pr_4663.prdoc (100%) rename prdoc/{ => 1.15.0}/pr_4738.prdoc (100%) rename prdoc/{ => 1.15.0}/pr_4755.prdoc (100%) rename prdoc/{ => 1.15.0}/pr_4777.prdoc (100%) rename prdoc/{ => 1.15.0}/pr_4839.prdoc (100%) rename prdoc/{ => 1.15.0}/pr_4840.prdoc (100%) rename prdoc/{ => 1.15.0}/pr_4848.prdoc (100%) rename prdoc/{ => 1.15.0}/pr_4863.prdoc (100%) rename prdoc/{ => 1.15.0}/pr_4871.prdoc (100%) rename prdoc/{ => 1.15.0}/pr_4885.prdoc (100%) rename prdoc/{ => 1.15.0}/pr_4888.prdoc (100%) rename prdoc/{ => 1.15.0}/pr_4902.prdoc (100%) rename prdoc/{ => 1.15.0}/pr_4912.prdoc (100%) rename prdoc/{ => 1.15.0}/pr_4922.prdoc (100%) rename prdoc/{ => 1.15.0}/pr_4932.prdoc (100%) rename prdoc/{ => 1.15.0}/pr_4935.prdoc (100%) rename prdoc/{ => 1.15.0}/pr_4943.prdoc (100%) rename prdoc/{ => 1.15.0}/pr_4972.prdoc (100%) rename prdoc/{ => 1.15.0}/pr_4978.prdoc (100%) rename prdoc/{ => 1.15.0}/pr_4997.prdoc (100%) rename prdoc/{ => 1.15.0}/pr_5011.prdoc (100%) rename prdoc/{ => 1.15.0}/pr_5040.prdoc (100%) rename prdoc/{ => 1.15.0}/pr_5103.prdoc (100%) rename prdoc/{ => 1.15.0}/pr_5153.prdoc (100%) diff --git a/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/lib.rs b/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/lib.rs index 83bc12cf9b41..7414adacc448 100644 --- a/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/lib.rs +++ b/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/lib.rs @@ -120,7 +120,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("statemine"), impl_name: create_runtime_str!("statemine"), authoring_version: 1, - spec_version: 1_014_000, + spec_version: 1_015_000, impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 16, diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs index 2d9de07f251f..62d3462038c8 100644 --- a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs +++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs @@ -119,7 +119,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("westmint"), impl_name: create_runtime_str!("westmint"), authoring_version: 1, - spec_version: 1_014_000, + spec_version: 1_015_000, impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 16, diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs index 062996ad4115..02ef0b9c0c72 100644 --- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs +++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs @@ -218,7 +218,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("bridge-hub-rococo"), impl_name: create_runtime_str!("bridge-hub-rococo"), authoring_version: 1, - spec_version: 1_014_000, + spec_version: 1_015_000, impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 5, diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/lib.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/lib.rs index 42c768861bde..d9f19afc6296 100644 --- a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/lib.rs +++ b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/lib.rs @@ -191,7 +191,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("bridge-hub-westend"), impl_name: create_runtime_str!("bridge-hub-westend"), authoring_version: 1, - spec_version: 1_014_000, + spec_version: 1_015_000, impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 5, diff --git a/cumulus/parachains/runtimes/collectives/collectives-westend/src/lib.rs b/cumulus/parachains/runtimes/collectives/collectives-westend/src/lib.rs index d843d6f6f776..21206d26dd57 100644 --- a/cumulus/parachains/runtimes/collectives/collectives-westend/src/lib.rs +++ b/cumulus/parachains/runtimes/collectives/collectives-westend/src/lib.rs @@ -125,7 +125,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("collectives-westend"), impl_name: create_runtime_str!("collectives-westend"), authoring_version: 1, - spec_version: 1_014_000, + spec_version: 1_015_000, impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 6, diff --git a/cumulus/parachains/runtimes/contracts/contracts-rococo/src/lib.rs b/cumulus/parachains/runtimes/contracts/contracts-rococo/src/lib.rs index 47ce6f3628ec..bf173fb618af 100644 --- a/cumulus/parachains/runtimes/contracts/contracts-rococo/src/lib.rs +++ b/cumulus/parachains/runtimes/contracts/contracts-rococo/src/lib.rs @@ -144,7 +144,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("contracts-rococo"), impl_name: create_runtime_str!("contracts-rococo"), authoring_version: 1, - spec_version: 1_014_000, + spec_version: 1_015_000, impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 7, diff --git a/cumulus/parachains/runtimes/coretime/coretime-rococo/src/lib.rs b/cumulus/parachains/runtimes/coretime/coretime-rococo/src/lib.rs index 37a6ea1d1c5f..25324bf17764 100644 --- a/cumulus/parachains/runtimes/coretime/coretime-rococo/src/lib.rs +++ b/cumulus/parachains/runtimes/coretime/coretime-rococo/src/lib.rs @@ -146,7 +146,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("coretime-rococo"), impl_name: create_runtime_str!("coretime-rococo"), authoring_version: 1, - spec_version: 1_014_000, + spec_version: 1_015_000, impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 2, diff --git a/cumulus/parachains/runtimes/coretime/coretime-westend/src/lib.rs b/cumulus/parachains/runtimes/coretime/coretime-westend/src/lib.rs index b6847dddb6c0..a3051e4bf271 100644 --- a/cumulus/parachains/runtimes/coretime/coretime-westend/src/lib.rs +++ b/cumulus/parachains/runtimes/coretime/coretime-westend/src/lib.rs @@ -145,7 +145,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("coretime-westend"), impl_name: create_runtime_str!("coretime-westend"), authoring_version: 1, - spec_version: 1_014_000, + spec_version: 1_015_000, impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 2, diff --git a/cumulus/parachains/runtimes/glutton/glutton-westend/src/lib.rs b/cumulus/parachains/runtimes/glutton/glutton-westend/src/lib.rs index 1b505ad3acbf..942e11e0b257 100644 --- a/cumulus/parachains/runtimes/glutton/glutton-westend/src/lib.rs +++ b/cumulus/parachains/runtimes/glutton/glutton-westend/src/lib.rs @@ -102,7 +102,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("glutton-westend"), impl_name: create_runtime_str!("glutton-westend"), authoring_version: 1, - spec_version: 1_014_000, + spec_version: 1_015_000, impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 1, diff --git a/cumulus/parachains/runtimes/people/people-rococo/src/lib.rs b/cumulus/parachains/runtimes/people/people-rococo/src/lib.rs index 4f007c3fc39d..77bfb99669c6 100644 --- a/cumulus/parachains/runtimes/people/people-rococo/src/lib.rs +++ b/cumulus/parachains/runtimes/people/people-rococo/src/lib.rs @@ -134,7 +134,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("people-rococo"), impl_name: create_runtime_str!("people-rococo"), authoring_version: 1, - spec_version: 1_014_000, + spec_version: 1_015_000, impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 1, diff --git a/cumulus/parachains/runtimes/people/people-westend/src/lib.rs b/cumulus/parachains/runtimes/people/people-westend/src/lib.rs index 1378324ce7b0..3343d2be749d 100644 --- a/cumulus/parachains/runtimes/people/people-westend/src/lib.rs +++ b/cumulus/parachains/runtimes/people/people-westend/src/lib.rs @@ -134,7 +134,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("people-westend"), impl_name: create_runtime_str!("people-westend"), authoring_version: 1, - spec_version: 1_014_000, + spec_version: 1_015_000, impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 1, diff --git a/polkadot/node/primitives/src/lib.rs b/polkadot/node/primitives/src/lib.rs index 660b504e97fb..24c69582731b 100644 --- a/polkadot/node/primitives/src/lib.rs +++ b/polkadot/node/primitives/src/lib.rs @@ -59,7 +59,7 @@ pub use disputes::{ /// relatively rare. /// /// The associated worker binaries should use the same version as the node that spawns them. -pub const NODE_VERSION: &'static str = "1.14.0"; +pub const NODE_VERSION: &'static str = "1.15.0"; // For a 16-ary Merkle Prefix Trie, we can expect at most 16 32-byte hashes per node // plus some overhead: diff --git a/polkadot/runtime/rococo/src/lib.rs b/polkadot/runtime/rococo/src/lib.rs index 2a1cb58fc17f..2f23b889916b 100644 --- a/polkadot/runtime/rococo/src/lib.rs +++ b/polkadot/runtime/rococo/src/lib.rs @@ -166,7 +166,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("rococo"), impl_name: create_runtime_str!("parity-rococo-v2.0"), authoring_version: 0, - spec_version: 1_014_000, + spec_version: 1_015_000, impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 26, diff --git a/polkadot/runtime/westend/src/lib.rs b/polkadot/runtime/westend/src/lib.rs index e582598d9d85..eddb7cbd21ea 100644 --- a/polkadot/runtime/westend/src/lib.rs +++ b/polkadot/runtime/westend/src/lib.rs @@ -162,7 +162,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("westend"), impl_name: create_runtime_str!("parity-westend"), authoring_version: 2, - spec_version: 1_014_000, + spec_version: 1_015_000, impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 26, diff --git a/prdoc/pr_3286.prdoc b/prdoc/1.15.0/pr_3286.prdoc similarity index 100% rename from prdoc/pr_3286.prdoc rename to prdoc/1.15.0/pr_3286.prdoc diff --git a/prdoc/pr_4097.prdoc b/prdoc/1.15.0/pr_4097.prdoc similarity index 100% rename from prdoc/pr_4097.prdoc rename to prdoc/1.15.0/pr_4097.prdoc diff --git a/prdoc/pr_4522.prdoc b/prdoc/1.15.0/pr_4522.prdoc similarity index 100% rename from prdoc/pr_4522.prdoc rename to prdoc/1.15.0/pr_4522.prdoc diff --git a/prdoc/pr_4563.prdoc b/prdoc/1.15.0/pr_4563.prdoc similarity index 100% rename from prdoc/pr_4563.prdoc rename to prdoc/1.15.0/pr_4563.prdoc diff --git a/prdoc/pr_4566.prdoc b/prdoc/1.15.0/pr_4566.prdoc similarity index 100% rename from prdoc/pr_4566.prdoc rename to prdoc/1.15.0/pr_4566.prdoc diff --git a/prdoc/pr_4663.prdoc b/prdoc/1.15.0/pr_4663.prdoc similarity index 100% rename from prdoc/pr_4663.prdoc rename to prdoc/1.15.0/pr_4663.prdoc diff --git a/prdoc/pr_4738.prdoc b/prdoc/1.15.0/pr_4738.prdoc similarity index 100% rename from prdoc/pr_4738.prdoc rename to prdoc/1.15.0/pr_4738.prdoc diff --git a/prdoc/pr_4755.prdoc b/prdoc/1.15.0/pr_4755.prdoc similarity index 100% rename from prdoc/pr_4755.prdoc rename to prdoc/1.15.0/pr_4755.prdoc diff --git a/prdoc/pr_4777.prdoc b/prdoc/1.15.0/pr_4777.prdoc similarity index 100% rename from prdoc/pr_4777.prdoc rename to prdoc/1.15.0/pr_4777.prdoc diff --git a/prdoc/pr_4839.prdoc b/prdoc/1.15.0/pr_4839.prdoc similarity index 100% rename from prdoc/pr_4839.prdoc rename to prdoc/1.15.0/pr_4839.prdoc diff --git a/prdoc/pr_4840.prdoc b/prdoc/1.15.0/pr_4840.prdoc similarity index 100% rename from prdoc/pr_4840.prdoc rename to prdoc/1.15.0/pr_4840.prdoc diff --git a/prdoc/pr_4848.prdoc b/prdoc/1.15.0/pr_4848.prdoc similarity index 100% rename from prdoc/pr_4848.prdoc rename to prdoc/1.15.0/pr_4848.prdoc diff --git a/prdoc/pr_4863.prdoc b/prdoc/1.15.0/pr_4863.prdoc similarity index 100% rename from prdoc/pr_4863.prdoc rename to prdoc/1.15.0/pr_4863.prdoc diff --git a/prdoc/pr_4871.prdoc b/prdoc/1.15.0/pr_4871.prdoc similarity index 100% rename from prdoc/pr_4871.prdoc rename to prdoc/1.15.0/pr_4871.prdoc diff --git a/prdoc/pr_4885.prdoc b/prdoc/1.15.0/pr_4885.prdoc similarity index 100% rename from prdoc/pr_4885.prdoc rename to prdoc/1.15.0/pr_4885.prdoc diff --git a/prdoc/pr_4888.prdoc b/prdoc/1.15.0/pr_4888.prdoc similarity index 100% rename from prdoc/pr_4888.prdoc rename to prdoc/1.15.0/pr_4888.prdoc diff --git a/prdoc/pr_4902.prdoc b/prdoc/1.15.0/pr_4902.prdoc similarity index 100% rename from prdoc/pr_4902.prdoc rename to prdoc/1.15.0/pr_4902.prdoc diff --git a/prdoc/pr_4912.prdoc b/prdoc/1.15.0/pr_4912.prdoc similarity index 100% rename from prdoc/pr_4912.prdoc rename to prdoc/1.15.0/pr_4912.prdoc diff --git a/prdoc/pr_4922.prdoc b/prdoc/1.15.0/pr_4922.prdoc similarity index 100% rename from prdoc/pr_4922.prdoc rename to prdoc/1.15.0/pr_4922.prdoc diff --git a/prdoc/pr_4932.prdoc b/prdoc/1.15.0/pr_4932.prdoc similarity index 100% rename from prdoc/pr_4932.prdoc rename to prdoc/1.15.0/pr_4932.prdoc diff --git a/prdoc/pr_4935.prdoc b/prdoc/1.15.0/pr_4935.prdoc similarity index 100% rename from prdoc/pr_4935.prdoc rename to prdoc/1.15.0/pr_4935.prdoc diff --git a/prdoc/pr_4943.prdoc b/prdoc/1.15.0/pr_4943.prdoc similarity index 100% rename from prdoc/pr_4943.prdoc rename to prdoc/1.15.0/pr_4943.prdoc diff --git a/prdoc/pr_4972.prdoc b/prdoc/1.15.0/pr_4972.prdoc similarity index 100% rename from prdoc/pr_4972.prdoc rename to prdoc/1.15.0/pr_4972.prdoc diff --git a/prdoc/pr_4978.prdoc b/prdoc/1.15.0/pr_4978.prdoc similarity index 100% rename from prdoc/pr_4978.prdoc rename to prdoc/1.15.0/pr_4978.prdoc diff --git a/prdoc/pr_4997.prdoc b/prdoc/1.15.0/pr_4997.prdoc similarity index 100% rename from prdoc/pr_4997.prdoc rename to prdoc/1.15.0/pr_4997.prdoc diff --git a/prdoc/pr_5011.prdoc b/prdoc/1.15.0/pr_5011.prdoc similarity index 100% rename from prdoc/pr_5011.prdoc rename to prdoc/1.15.0/pr_5011.prdoc diff --git a/prdoc/pr_5040.prdoc b/prdoc/1.15.0/pr_5040.prdoc similarity index 100% rename from prdoc/pr_5040.prdoc rename to prdoc/1.15.0/pr_5040.prdoc diff --git a/prdoc/pr_5103.prdoc b/prdoc/1.15.0/pr_5103.prdoc similarity index 100% rename from prdoc/pr_5103.prdoc rename to prdoc/1.15.0/pr_5103.prdoc diff --git a/prdoc/pr_5153.prdoc b/prdoc/1.15.0/pr_5153.prdoc similarity index 100% rename from prdoc/pr_5153.prdoc rename to prdoc/1.15.0/pr_5153.prdoc