From 3fb7c8c6d68cbc40134a4fc8f0c8b4de38ec1388 Mon Sep 17 00:00:00 2001
From: Iulian Barbu <14218860+iulianbarbu@users.noreply.github.com>
Date: Tue, 4 Feb 2025 11:29:03 +0200
Subject: [PATCH] Align omni-node and polkadot-parachain versions (#7367)
# Description
Aligned `polkadot-omni-node` & `polkadot-parachain` versions. There is
one `NODE_VERSION` constant, in `polkadot-omni-node-lib`, used by both
binaries.
Closes #7276 .
## Integration
Node operators will know what versions of `polkadot-omni-node` &
`polkadot-parachain` they use since their versions will be kept in sync
with the stable release `polkadot` SemVer version.
## Review Notes
TODO:
- [x] update NODE_VERSION of `polkadot-omni-node-lib` when running
branch off workflow
---------
Signed-off-by: Iulian Barbu <iulian.barbu@parity.io>
---
.github/workflows/release-10_branchoff-stable.yml | 5 ++++-
cumulus/polkadot-omni-node/lib/src/lib.rs | 1 +
cumulus/polkadot-omni-node/lib/src/nodes/mod.rs | 5 +++++
cumulus/polkadot-omni-node/src/main.rs | 5 +++--
cumulus/polkadot-parachain/src/main.rs | 5 +++--
5 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/.github/workflows/release-10_branchoff-stable.yml b/.github/workflows/release-10_branchoff-stable.yml
index adce1b261b7..cfe135ac729 100644
--- a/.github/workflows/release-10_branchoff-stable.yml
+++ b/.github/workflows/release-10_branchoff-stable.yml
@@ -92,8 +92,11 @@ jobs:
. ./.github/scripts/release/release_lib.sh
NODE_VERSION="${{ needs.prepare-tooling.outputs.node_version }}"
- set_version "\(NODE_VERSION[^=]*= \)\".*\"" $NODE_VERSION "polkadot/node/primitives/src/lib.rs"
+ NODE_VERSION_PATTERN="\(NODE_VERSION[^=]*= \)\".*\""
+ set_version $NODE_VERSION_PATTERN $NODE_VERSION "polkadot/node/primitives/src/lib.rs"
commit_with_message "Bump node version to $NODE_VERSION in polkadot-cli"
+ set_version $NODE_VERSION_PATTERN $NODE_VERSION "cumulus/polkadot-omni-node/lib/src/nodes/mod.rs"
+ commit_with_message "Bump node version to $NODE_VERSION in polkadot-omni-node-lib"
SPEC_VERSION=$(get_spec_version $NODE_VERSION)
runtimes_list=$(get_filtered_runtimes_list)
diff --git a/cumulus/polkadot-omni-node/lib/src/lib.rs b/cumulus/polkadot-omni-node/lib/src/lib.rs
index ccc1b542b25..92ea3d7d879 100644
--- a/cumulus/polkadot-omni-node/lib/src/lib.rs
+++ b/cumulus/polkadot-omni-node/lib/src/lib.rs
@@ -26,3 +26,4 @@ mod nodes;
pub use cli::CliConfig;
pub use command::{run, RunConfig};
pub use common::{chain_spec, runtime};
+pub use nodes::NODE_VERSION;
diff --git a/cumulus/polkadot-omni-node/lib/src/nodes/mod.rs b/cumulus/polkadot-omni-node/lib/src/nodes/mod.rs
index ab13322e80a..5570170f90b 100644
--- a/cumulus/polkadot-omni-node/lib/src/nodes/mod.rs
+++ b/cumulus/polkadot-omni-node/lib/src/nodes/mod.rs
@@ -22,6 +22,11 @@ use cumulus_primitives_core::ParaId;
use manual_seal::ManualSealNode;
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";
+
/// Trait that extends the `DynNodeSpec` trait with manual seal related logic.
///
/// We need it in order to be able to access both the `DynNodeSpec` and the manual seal logic
diff --git a/cumulus/polkadot-omni-node/src/main.rs b/cumulus/polkadot-omni-node/src/main.rs
index a6c1dd3cadb..1183f488df8 100644
--- a/cumulus/polkadot-omni-node/src/main.rs
+++ b/cumulus/polkadot-omni-node/src/main.rs
@@ -23,14 +23,15 @@
use polkadot_omni_node_lib::{
chain_spec::DiskChainSpecLoader, run, runtime::DefaultRuntimeResolver, CliConfig as CliConfigT,
- RunConfig,
+ RunConfig, NODE_VERSION,
};
struct CliConfig;
impl CliConfigT for CliConfig {
fn impl_version() -> String {
- env!("SUBSTRATE_CLI_IMPL_VERSION").into()
+ let commit_hash = env!("SUBSTRATE_CLI_COMMIT_HASH");
+ format!("{}-{commit_hash}", NODE_VERSION)
}
fn author() -> String {
diff --git a/cumulus/polkadot-parachain/src/main.rs b/cumulus/polkadot-parachain/src/main.rs
index 61764636a06..a84fb0dfb18 100644
--- a/cumulus/polkadot-parachain/src/main.rs
+++ b/cumulus/polkadot-parachain/src/main.rs
@@ -21,13 +21,14 @@
mod chain_spec;
-use polkadot_omni_node_lib::{run, CliConfig as CliConfigT, RunConfig};
+use polkadot_omni_node_lib::{run, CliConfig as CliConfigT, RunConfig, NODE_VERSION};
struct CliConfig;
impl CliConfigT for CliConfig {
fn impl_version() -> String {
- env!("SUBSTRATE_CLI_IMPL_VERSION").into()
+ let commit_hash = env!("SUBSTRATE_CLI_COMMIT_HASH");
+ format!("{}-{commit_hash}", NODE_VERSION)
}
fn author() -> String {
--
GitLab