paritytech · serban300 · Oct 8, 2024 · Oct 7, 2024 · Oct 7, 2024 · Oct 3, 2024
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -133,8 +133,9 @@ members = [
 	"cumulus/parachains/runtimes/test-utils",
 	"cumulus/parachains/runtimes/testing/penpal",
 	"cumulus/parachains/runtimes/testing/rococo-parachain",
+	"cumulus/polkadot-omni-node",
+	"cumulus/polkadot-omni-node/lib",
 	"cumulus/polkadot-parachain",
-	"cumulus/polkadot-parachain/polkadot-parachain-lib",
 	"cumulus/primitives/aura",
 	"cumulus/primitives/core",
 	"cumulus/primitives/parachain-inherent",
@@ -541,6 +542,7 @@ members = [
 ]
 
 default-members = [
+	"cumulus/polkadot-omni-node",
 	"cumulus/polkadot-parachain",
 	"polkadot",
 	"substrate/bin/node/cli",
@@ -1052,8 +1054,9 @@ polkadot-node-subsystem = { path = "polkadot/node/subsystem", default-features =
 polkadot-node-subsystem-test-helpers = { path = "polkadot/node/subsystem-test-helpers" }
 polkadot-node-subsystem-types = { path = "polkadot/node/subsystem-types", default-features = false }
 polkadot-node-subsystem-util = { path = "polkadot/node/subsystem-util", default-features = false }
+polkadot-omni-node = { path = "cumulus/polkadot-omni-node", default-features = false }
+polkadot-omni-node-lib = { path = "cumulus/polkadot-omni-node/lib", default-features = false }
 polkadot-overseer = { path = "polkadot/node/overseer", default-features = false }
-polkadot-parachain-lib = { path = "cumulus/polkadot-parachain/polkadot-parachain-lib", default-features = false }
 polkadot-parachain-primitives = { path = "polkadot/parachain", default-features = false }
 polkadot-primitives = { path = "polkadot/primitives", default-features = false }
 polkadot-primitives-test-helpers = { path = "polkadot/primitives/test-helpers" }

diff --git a/cumulus/polkadot-omni-node/Cargo.toml b/cumulus/polkadot-omni-node/Cargo.toml
@@ -0,0 +1,29 @@
+[package]
+name = "polkadot-omni-node"
+version = "0.1.0"
+authors.workspace = true
+edition.workspace = true
+build = "build.rs"
+description = "Generic binary that can run a parachain node with u32 block number and Aura consensus"
+license = "Apache-2.0"
+
+[lints]
+workspace = true
+
+[dependencies]
+color-eyre = { workspace = true }
+
+# Local
+polkadot-omni-node-lib = { workspace = true }
+
+[build-dependencies]
+substrate-build-script-utils = { workspace = true, default-features = true }
+
+[features]
+default = []
+runtime-benchmarks = [
+	"polkadot-omni-node-lib/runtime-benchmarks",
+]
+try-runtime = [
+	"polkadot-omni-node-lib/try-runtime",
+]
diff --git a/cumulus/polkadot-omni-node/build.rs b/cumulus/polkadot-omni-node/build.rs
@@ -0,0 +1,22 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// This file is part of Cumulus.
+
+// Cumulus is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Cumulus is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Cumulus.  If not, see <http://www.gnu.org/licenses/>.
+
+use substrate_build_script_utils::{generate_cargo_keys, rerun_if_git_head_changed};
+
+fn main() {
+	generate_cargo_keys();
+	rerun_if_git_head_changed();
+}
diff --git a/...rachain/polkadot-parachain-lib/Cargo.toml → cumulus/polkadot-omni-node/lib/Cargo.toml b/...rachain/polkadot-parachain-lib/Cargo.toml → cumulus/polkadot-omni-node/lib/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "polkadot-parachain-lib"
+name = "polkadot-omni-node-lib"
 version = "0.1.0"
 authors.workspace = true
 edition.workspace = true

diff --git a/...rachain/polkadot-parachain-lib/src/cli.rs → cumulus/polkadot-omni-node/lib/src/cli.rs b/...rachain/polkadot-parachain-lib/src/cli.rs → cumulus/polkadot-omni-node/lib/src/cli.rs
diff --git a/...ain/polkadot-parachain-lib/src/command.rs → ...lus/polkadot-omni-node/lib/src/command.rs b/...ain/polkadot-parachain-lib/src/command.rs → ...lus/polkadot-omni-node/lib/src/command.rs
diff --git a/...polkadot-parachain-lib/src/common/aura.rs → ...polkadot-omni-node/lib/src/common/aura.rs b/...polkadot-parachain-lib/src/common/aura.rs → ...polkadot-omni-node/lib/src/common/aura.rs
diff --git a/...ot-parachain-lib/src/common/chain_spec.rs → ...ot-omni-node/lib/src/common/chain_spec.rs b/...ot-parachain-lib/src/common/chain_spec.rs → ...ot-omni-node/lib/src/common/chain_spec.rs
diff --git a/...kadot-parachain-lib/src/common/command.rs → ...kadot-omni-node/lib/src/common/command.rs b/...kadot-parachain-lib/src/common/command.rs → ...kadot-omni-node/lib/src/common/command.rs
diff --git a/.../polkadot-parachain-lib/src/common/mod.rs → .../polkadot-omni-node/lib/src/common/mod.rs b/.../polkadot-parachain-lib/src/common/mod.rs → .../polkadot-omni-node/lib/src/common/mod.rs
diff --git a/.../polkadot-parachain-lib/src/common/rpc.rs → .../polkadot-omni-node/lib/src/common/rpc.rs b/.../polkadot-parachain-lib/src/common/rpc.rs → .../polkadot-omni-node/lib/src/common/rpc.rs
diff --git a/...kadot-parachain-lib/src/common/runtime.rs → ...kadot-omni-node/lib/src/common/runtime.rs b/...kadot-parachain-lib/src/common/runtime.rs → ...kadot-omni-node/lib/src/common/runtime.rs
diff --git a/...polkadot-parachain-lib/src/common/spec.rs → ...polkadot-omni-node/lib/src/common/spec.rs b/...polkadot-parachain-lib/src/common/spec.rs → ...polkadot-omni-node/lib/src/common/spec.rs
diff --git a/...olkadot-parachain-lib/src/common/types.rs → ...olkadot-omni-node/lib/src/common/types.rs b/...olkadot-parachain-lib/src/common/types.rs → ...olkadot-omni-node/lib/src/common/types.rs
diff --git a/...parachain-lib/src/fake_runtime_api/mod.rs → ...omni-node/lib/src/fake_runtime_api/mod.rs b/...parachain-lib/src/fake_runtime_api/mod.rs → ...omni-node/lib/src/fake_runtime_api/mod.rs
diff --git a/...rachain-lib/src/fake_runtime_api/utils.rs → ...ni-node/lib/src/fake_runtime_api/utils.rs b/...rachain-lib/src/fake_runtime_api/utils.rs → ...ni-node/lib/src/fake_runtime_api/utils.rs
diff --git a/...rachain/polkadot-parachain-lib/src/lib.rs → cumulus/polkadot-omni-node/lib/src/lib.rs b/...rachain/polkadot-parachain-lib/src/lib.rs → cumulus/polkadot-omni-node/lib/src/lib.rs
diff --git a/.../polkadot-parachain-lib/src/nodes/aura.rs → .../polkadot-omni-node/lib/src/nodes/aura.rs b/.../polkadot-parachain-lib/src/nodes/aura.rs → .../polkadot-omni-node/lib/src/nodes/aura.rs
diff --git a/...ot-parachain-lib/src/nodes/manual_seal.rs → ...ot-omni-node/lib/src/nodes/manual_seal.rs b/...ot-parachain-lib/src/nodes/manual_seal.rs → ...ot-omni-node/lib/src/nodes/manual_seal.rs
diff --git a/...n/polkadot-parachain-lib/src/nodes/mod.rs → ...s/polkadot-omni-node/lib/src/nodes/mod.rs b/...n/polkadot-parachain-lib/src/nodes/mod.rs → ...s/polkadot-omni-node/lib/src/nodes/mod.rs
diff --git a/...-lib/src/tests/benchmark_storage_works.rs → .../lib/src/tests/benchmark_storage_works.rs b/...-lib/src/tests/benchmark_storage_works.rs → .../lib/src/tests/benchmark_storage_works.rs
diff --git a/...olkadot-parachain-lib/src/tests/common.rs → ...olkadot-omni-node/lib/src/tests/common.rs b/...olkadot-parachain-lib/src/tests/common.rs → ...olkadot-omni-node/lib/src/tests/common.rs
diff --git a/...ib/src/tests/polkadot_argument_parsing.rs → ...ib/src/tests/polkadot_argument_parsing.rs b/...ib/src/tests/polkadot_argument_parsing.rs → ...ib/src/tests/polkadot_argument_parsing.rs
diff --git a/...hain-lib/src/tests/polkadot_mdns_issue.rs → ...node/lib/src/tests/polkadot_mdns_issue.rs b/...hain-lib/src/tests/polkadot_mdns_issue.rs → ...node/lib/src/tests/polkadot_mdns_issue.rs
diff --git a/...achain-lib/src/tests/purge_chain_works.rs → ...i-node/lib/src/tests/purge_chain_works.rs b/...achain-lib/src/tests/purge_chain_works.rs → ...i-node/lib/src/tests/purge_chain_works.rs
diff --git a/...c/tests/running_the_node_and_interrupt.rs → ...c/tests/running_the_node_and_interrupt.rs b/...c/tests/running_the_node_and_interrupt.rs → ...c/tests/running_the_node_and_interrupt.rs
diff --git a/cumulus/polkadot-omni-node/src/main.rs b/cumulus/polkadot-omni-node/src/main.rs
@@ -0,0 +1,60 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// This file is part of Cumulus.
+
+// Cumulus is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Cumulus is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Cumulus.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Basic polkadot omni-node.
+//!
+//! It can be used to start a parachain node from a provided chain spec file.
+//! It is only compatible with runtimes that use block number `u32` and `Aura` consensus.
+//!
+//! Example: `polkadot-omni-node --chain [chain_spec.json]`
+
+#![warn(missing_docs)]
+#![warn(unused_extern_crates)]
+
+use polkadot_omni_node_lib::{
+	chain_spec::DiskChainSpecLoader, run, runtime::DefaultRuntimeResolver, CliConfig as CliConfigT,
+	RunConfig,
+};
+
+struct CliConfig;
+
+impl CliConfigT for CliConfig {
+	fn impl_version() -> String {
+		env!("SUBSTRATE_CLI_IMPL_VERSION").into()
+	}
+
+	fn author() -> String {
+		env!("CARGO_PKG_AUTHORS").into()
+	}
+
+	fn support_url() -> String {
+		"https://github.com/paritytech/polkadot-sdk/issues/new".into()
+	}
+
+	fn copyright_start_year() -> u16 {
+		2017
+	}
+}
+
+fn main() -> color_eyre::eyre::Result<()> {
+	color_eyre::install()?;
+
+	let config = RunConfig {
+		chain_spec_loader: Box::new(DiskChainSpecLoader),
+		runtime_resolver: Box::new(DefaultRuntimeResolver),
+	};
+	Ok(run::<CliConfig>(config)?)
+}
diff --git a/cumulus/polkadot-parachain/Cargo.toml b/cumulus/polkadot-parachain/Cargo.toml
@@ -22,7 +22,7 @@ serde = { features = ["derive"], workspace = true, default-features = true }
 serde_json = { workspace = true, default-features = true }
 
 # Local
-polkadot-parachain-lib = { features = ["rococo-native", "westend-native"], workspace = true }
+polkadot-omni-node-lib = { features = ["rococo-native", "westend-native"], workspace = true }
 rococo-parachain-runtime = { workspace = true }
 glutton-westend-runtime = { workspace = true }
 asset-hub-rococo-runtime = { workspace = true, default-features = true }
@@ -37,10 +37,6 @@ penpal-runtime = { workspace = true }
 people-rococo-runtime = { workspace = true }
 people-westend-runtime = { workspace = true }
 parachains-common = { workspace = true, default-features = true }
-testnet-parachains-constants = { features = [
-	"rococo",
-	"westend",
-], workspace = true }
 
 # Substrate
 sp-core = { workspace = true, default-features = true }
@@ -55,9 +51,6 @@ xcm = { workspace = true, default-features = true }
 # Cumulus
 cumulus-primitives-core = { workspace = true, default-features = true }
 
-# Bridges
-bp-messages = { workspace = true, default-features = true }
-
 [build-dependencies]
 substrate-build-script-utils = { workspace = true, default-features = true }
 
@@ -66,7 +59,7 @@ default = []
 runtime-benchmarks = [
 	"cumulus-primitives-core/runtime-benchmarks",
 	"parachains-common/runtime-benchmarks",
-	"polkadot-parachain-lib/runtime-benchmarks",
+	"polkadot-omni-node-lib/runtime-benchmarks",
 	"sc-service/runtime-benchmarks",
 
 	"asset-hub-rococo-runtime/runtime-benchmarks",
@@ -84,7 +77,7 @@ runtime-benchmarks = [
 	"rococo-parachain-runtime/runtime-benchmarks",
 ]
 try-runtime = [
-	"polkadot-parachain-lib/try-runtime",
+	"polkadot-omni-node-lib/try-runtime",
 
 	"asset-hub-rococo-runtime/try-runtime",
 	"asset-hub-westend-runtime/try-runtime",

diff --git a/cumulus/polkadot-parachain/src/chain_spec/asset_hubs.rs b/cumulus/polkadot-parachain/src/chain_spec/asset_hubs.rs
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Cumulus.  If not, see <http://www.gnu.org/licenses/>.
 
-use polkadot_parachain_lib::chain_spec::{Extensions, GenericChainSpec};
+use polkadot_omni_node_lib::chain_spec::{Extensions, GenericChainSpec};
 use sc_service::ChainType;
 
 pub fn asset_hub_westend_development_config() -> GenericChainSpec {

diff --git a/cumulus/polkadot-parachain/src/chain_spec/bridge_hubs.rs b/cumulus/polkadot-parachain/src/chain_spec/bridge_hubs.rs
@@ -15,7 +15,7 @@
 // along with Cumulus.  If not, see <http://www.gnu.org/licenses/>.
 
 use cumulus_primitives_core::ParaId;
-use polkadot_parachain_lib::chain_spec::GenericChainSpec;
+use polkadot_omni_node_lib::chain_spec::GenericChainSpec;
 use sc_chain_spec::{ChainSpec, ChainType};
 use std::str::FromStr;
 
@@ -127,7 +127,7 @@ fn ensure_id(id: &str) -> Result<&str, String> {
 /// Sub-module for Rococo setup
 pub mod rococo {
 	use super::{ChainType, ParaId};
-	use polkadot_parachain_lib::chain_spec::{Extensions, GenericChainSpec};
+	use polkadot_omni_node_lib::chain_spec::{Extensions, GenericChainSpec};
 
 	pub(crate) const BRIDGE_HUB_ROCOCO: &str = "bridge-hub-rococo";
 	pub(crate) const BRIDGE_HUB_ROCOCO_LOCAL: &str = "bridge-hub-rococo-local";
@@ -175,7 +175,7 @@ pub mod kusama {
 /// Sub-module for Westend setup.
 pub mod westend {
 	use super::{ChainType, ParaId};
-	use polkadot_parachain_lib::chain_spec::{Extensions, GenericChainSpec};
+	use polkadot_omni_node_lib::chain_spec::{Extensions, GenericChainSpec};
 
 	pub(crate) const BRIDGE_HUB_WESTEND: &str = "bridge-hub-westend";
 	pub(crate) const BRIDGE_HUB_WESTEND_LOCAL: &str = "bridge-hub-westend-local";

diff --git a/cumulus/polkadot-parachain/src/chain_spec/collectives.rs b/cumulus/polkadot-parachain/src/chain_spec/collectives.rs
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Cumulus.  If not, see <http://www.gnu.org/licenses/>.
 
-use polkadot_parachain_lib::chain_spec::{Extensions, GenericChainSpec};
+use polkadot_omni_node_lib::chain_spec::{Extensions, GenericChainSpec};
 use sc_service::ChainType;
 
 /// Collectives Westend Development Config.