From 84b3ae9be5fdd52f99506c34a5f0e640023e3f04 Mon Sep 17 00:00:00 2001
From: Egor_P <egor@parity.io>
Date: Thu, 27 Feb 2025 13:18:33 +0100
Subject: [PATCH] [Backport] Version bumps form stable2412-2 (#7744)
This PR backports version bumps and prdocs reorg from the latest stable
branch back to master
---
cumulus/polkadot-omni-node/lib/src/nodes/mod.rs | 2 +-
polkadot/node/primitives/src/lib.rs | 2 +-
prdoc/{ => stable2412-2}/pr_7243.prdoc | 0
prdoc/{ => stable2412-2}/pr_7307.prdoc | 0
prdoc/{ => stable2412-2}/pr_7365.prdoc | 0
prdoc/stable2412-2/pr_7367.prdoc | 8 ++++++++
prdoc/{ => stable2412-2}/pr_7383.prdoc | 0
prdoc/{ => stable2412-2}/pr_7451.prdoc | 0
prdoc/{ => stable2412-2}/pr_7488.prdoc | 0
prdoc/{ => stable2412-2}/pr_7504.prdoc | 0
prdoc/stable2412-2/pr_7605.prdoc | 17 +++++++++++++++++
prdoc/{ => stable2412-2}/pr_7640.prdoc | 0
12 files changed, 27 insertions(+), 2 deletions(-)
rename prdoc/{ => stable2412-2}/pr_7243.prdoc (100%)
rename prdoc/{ => stable2412-2}/pr_7307.prdoc (100%)
rename prdoc/{ => stable2412-2}/pr_7365.prdoc (100%)
create mode 100644 prdoc/stable2412-2/pr_7367.prdoc
rename prdoc/{ => stable2412-2}/pr_7383.prdoc (100%)
rename prdoc/{ => stable2412-2}/pr_7451.prdoc (100%)
rename prdoc/{ => stable2412-2}/pr_7488.prdoc (100%)
rename prdoc/{ => stable2412-2}/pr_7504.prdoc (100%)
create mode 100644 prdoc/stable2412-2/pr_7605.prdoc
rename prdoc/{ => stable2412-2}/pr_7640.prdoc (100%)
diff --git a/cumulus/polkadot-omni-node/lib/src/nodes/mod.rs b/cumulus/polkadot-omni-node/lib/src/nodes/mod.rs
index de27ce3704f..468f285b8fa 100644
--- a/cumulus/polkadot-omni-node/lib/src/nodes/mod.rs
+++ b/cumulus/polkadot-omni-node/lib/src/nodes/mod.rs
@@ -25,7 +25,7 @@ use sc_service::{Configuration, TaskManager};
/// The current node version for cumulus official binaries, which takes the basic
/// SemVer form `<major>.<minor>.<patch>`. It should correspond to the latest
/// `polkadot` version of a stable release.
-pub const NODE_VERSION: &'static str = "1.17.1";
+pub const NODE_VERSION: &'static str = "1.17.2";
/// Trait that extends the `DynNodeSpec` trait with manual seal related logic.
///
diff --git a/polkadot/node/primitives/src/lib.rs b/polkadot/node/primitives/src/lib.rs
index 845daa26798..26ec2d88378 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.17.1";
+pub const NODE_VERSION: &'static str = "1.17.2";
// For a 16-ary Merkle Prefix Trie, we can expect at most 16 32-byte hashes per node
// plus some overhead:
diff --git a/prdoc/pr_7243.prdoc b/prdoc/stable2412-2/pr_7243.prdoc
similarity index 100%
rename from prdoc/pr_7243.prdoc
rename to prdoc/stable2412-2/pr_7243.prdoc
diff --git a/prdoc/pr_7307.prdoc b/prdoc/stable2412-2/pr_7307.prdoc
similarity index 100%
rename from prdoc/pr_7307.prdoc
rename to prdoc/stable2412-2/pr_7307.prdoc
diff --git a/prdoc/pr_7365.prdoc b/prdoc/stable2412-2/pr_7365.prdoc
similarity index 100%
rename from prdoc/pr_7365.prdoc
rename to prdoc/stable2412-2/pr_7365.prdoc
diff --git a/prdoc/stable2412-2/pr_7367.prdoc b/prdoc/stable2412-2/pr_7367.prdoc
new file mode 100644
index 00000000000..cfbfb2a703c
--- /dev/null
+++ b/prdoc/stable2412-2/pr_7367.prdoc
@@ -0,0 +1,8 @@
+title: Align omni-node and polkadot-parachain versions
+doc:
+- audience: [ Runtime Dev, Node Dev, Node Operator ]
+ description: |-
+ Aligned polkadot-omni-node & polkadot-parachain versions. There is one NODE_VERSION constant, in polkadot-omni-node-lib, used by both binaries.
+crates:
+- name: polkadot-omni-node-lib
+ bump: patch
diff --git a/prdoc/pr_7383.prdoc b/prdoc/stable2412-2/pr_7383.prdoc
similarity index 100%
rename from prdoc/pr_7383.prdoc
rename to prdoc/stable2412-2/pr_7383.prdoc
diff --git a/prdoc/pr_7451.prdoc b/prdoc/stable2412-2/pr_7451.prdoc
similarity index 100%
rename from prdoc/pr_7451.prdoc
rename to prdoc/stable2412-2/pr_7451.prdoc
diff --git a/prdoc/pr_7488.prdoc b/prdoc/stable2412-2/pr_7488.prdoc
similarity index 100%
rename from prdoc/pr_7488.prdoc
rename to prdoc/stable2412-2/pr_7488.prdoc
diff --git a/prdoc/pr_7504.prdoc b/prdoc/stable2412-2/pr_7504.prdoc
similarity index 100%
rename from prdoc/pr_7504.prdoc
rename to prdoc/stable2412-2/pr_7504.prdoc
diff --git a/prdoc/stable2412-2/pr_7605.prdoc b/prdoc/stable2412-2/pr_7605.prdoc
new file mode 100644
index 00000000000..30e22a7ccf8
--- /dev/null
+++ b/prdoc/stable2412-2/pr_7605.prdoc
@@ -0,0 +1,17 @@
+title: Fix issue with InitiateTransfer and UnpaidExecution
+doc:
+- audience: Runtime Dev
+ description:
+ Fix issue where setting the `remote_fees` field of `InitiateTransfer` to `None` could lead to unintended bypassing of fees in certain conditions.
+ `UnpaidExecution` is now appended **after** origin alteration.
+ If planning to use `UnpaidExecution`, you need to set `preserve_origin = true`.
+
+ The `AllowExplicitUnpaidExecutionFrom` barrier now allows instructions for receiving funds before origin altering instructions before
+ the actual `UnpaidExecution`.
+ It takes a new generic, `Aliasers`, needed for executing `AliasOrigin` to see if the effective origin is allowed to use `UnpaidExecution`.
+ This should be set to the same value as `Aliasers` in the XCM configuration.
+crates:
+- name: staging-xcm-builder
+ bump: patch
+- name: staging-xcm-executor
+ bump: patch
diff --git a/prdoc/pr_7640.prdoc b/prdoc/stable2412-2/pr_7640.prdoc
similarity index 100%
rename from prdoc/pr_7640.prdoc
rename to prdoc/stable2412-2/pr_7640.prdoc
--
GitLab