git.delta.rocks / unique-network / refs/commits / 2df4b512774f

difftreelog

Merge pull request #901 from UniqueNetwork/feature/unify-nodes

Yaroslav Bolyukin2023-03-29parents: #cf38322 #2ec63fe.patch.diff
in: master

6 files changed

modifiedclient/rpc/Cargo.tomldiffbeforeafterboth
--- a/client/rpc/Cargo.toml
+++ b/client/rpc/Cargo.toml
@@ -36,11 +36,17 @@
 
 sc-executor = { workspace = true }
 
-opal-runtime = { workspace = true }
+opal-runtime = { workspace = true, optional = true }
 quartz-runtime = { workspace = true, optional = true }
 unique-runtime = { workspace = true, optional = true }
 
 [features]
+default = ['opal-runtime']
+all-runtimes = [
+	'opal-runtime',
+	'quartz-runtime',
+	'unique-runtime',
+]
 pov-estimate = [
 	'opal-runtime/pov-estimate',
 	'quartz-runtime?/pov-estimate',
modifiednode/cli/Cargo.tomldiffbeforeafterboth
before · node/cli/Cargo.toml
1################################################################################2# Package34[package]5authors = ['Unique Network <support@uniquenetwork.io>']6build = 'build.rs'7description = 'Unique Node'8edition = '2021'9homepage = 'https://unique.network'10license = 'GPLv3'11name = 'unique-node'12repository = 'https://github.com/UniqueNetwork/unique-chain'13version.workspace = true1415[[bin]]16name = 'unique-collator'17path = "src/main.rs"1819[package.metadata.docs.rs]20targets = ['x86_64-unknown-linux-gnu']2122[dependencies]23clap = "4.1"24futures = '0.3.17'25tokio = { version = "1.24", features = ["time"] }26serde_json = "1.0"2728log = { workspace = true }2930# Note: `package = "parity-scale-codec"` must be supplied since the `Encode` macro searches for it.31codec = { workspace = true, package = "parity-scale-codec" }3233cumulus-client-cli = { workspace = true }34cumulus-client-consensus-aura = { workspace = true }35cumulus-client-consensus-common = { workspace = true }36cumulus-client-network = { workspace = true }37cumulus-client-service = { workspace = true }38cumulus-primitives-core = { workspace = true }39cumulus-primitives-parachain-inherent = { workspace = true }40cumulus-relay-chain-inprocess-interface = { workspace = true }41cumulus-relay-chain-interface = { workspace = true }42cumulus-relay-chain-minimal-node = { workspace = true }43frame-benchmarking = { workspace = true }44frame-benchmarking-cli = { workspace = true }45opal-runtime = { workspace = true, optional = true }46pallet-transaction-payment-rpc-runtime-api = { workspace = true }47polkadot-cli = { workspace = true }48polkadot-primitives = { workspace = true }49polkadot-service = { workspace = true }50quartz-runtime = { workspace = true, optional = true }51sc-basic-authorship = { workspace = true }52sc-chain-spec = { workspace = true }53sc-cli = { workspace = true }54sc-client-api = { workspace = true }55sc-consensus = { workspace = true }56sc-consensus-manual-seal = { workspace = true }57sc-executor = { workspace = true }58sc-network = { workspace = true }59sc-service = { workspace = true }60sc-sysinfo = { workspace = true }61sc-telemetry = { workspace = true }62sc-tracing = { workspace = true }63sc-transaction-pool = { workspace = true }64serde = { workspace = true }65sp-api = { workspace = true }66sp-block-builder = { workspace = true }67sp-blockchain = { workspace = true }68sp-consensus-aura = { workspace = true }69sp-core = { workspace = true }70sp-io = { workspace = true }71sp-keystore = { workspace = true }72sp-offchain = { workspace = true }73sp-runtime = { workspace = true }74sp-session = { workspace = true }75sp-timestamp = { workspace = true }76sp-transaction-pool = { workspace = true }77substrate-frame-rpc-system = { workspace = true }78substrate-prometheus-endpoint = { workspace = true }79try-runtime-cli = { workspace = true }80unique-runtime = { workspace = true, optional = true }81up-common = { workspace = true }82up-data-structs = { workspace = true }8384fc-consensus = { workspace = true }85fc-db = { workspace = true }86fc-mapping-sync = { workspace = true }87fc-rpc = { workspace = true }88fc-rpc-core = { workspace = true }89fp-rpc = { workspace = true }9091app-promotion-rpc = { workspace = true }92uc-rpc = { workspace = true }93unique-rpc = { workspace = true }94up-pov-estimate-rpc = { workspace = true }95up-rpc = { workspace = true }9697[build-dependencies]98substrate-build-script-utils = { workspace = true }99100[features]101default = ["opal-runtime"]102pov-estimate = [103	'opal-runtime/pov-estimate',104	'quartz-runtime?/pov-estimate',105	'uc-rpc/pov-estimate',106	'unique-rpc/pov-estimate',107	'unique-runtime?/pov-estimate',108]109runtime-benchmarks = [110	'opal-runtime/runtime-benchmarks',111	'polkadot-cli/runtime-benchmarks',112	'polkadot-service/runtime-benchmarks',113	'quartz-runtime?/runtime-benchmarks',114	'sc-service/runtime-benchmarks',115	'unique-runtime?/runtime-benchmarks',116]117sapphire-runtime = ['quartz-runtime', 'quartz-runtime/become-sapphire']118try-runtime = [119	'opal-runtime?/try-runtime',120	'quartz-runtime?/try-runtime',121	'try-runtime-cli/try-runtime',122	'unique-runtime?/try-runtime',123]
after · node/cli/Cargo.toml
1################################################################################2# Package34[package]5authors = ['Unique Network <support@uniquenetwork.io>']6build = 'build.rs'7description = 'Unique Node'8edition = '2021'9homepage = 'https://unique.network'10license = 'GPLv3'11name = 'unique-node'12repository = 'https://github.com/UniqueNetwork/unique-chain'13version.workspace = true1415[[bin]]16name = 'unique-collator'17path = "src/main.rs"1819[package.metadata.docs.rs]20targets = ['x86_64-unknown-linux-gnu']2122[dependencies]23clap = "4.1"24futures = '0.3.17'25tokio = { version = "1.24", features = ["time"] }26serde_json = "1.0"2728log = { workspace = true }2930# Note: `package = "parity-scale-codec"` must be supplied since the `Encode` macro searches for it.31codec = { workspace = true, package = "parity-scale-codec" }3233cumulus-client-cli = { workspace = true }34cumulus-client-consensus-aura = { workspace = true }35cumulus-client-consensus-common = { workspace = true }36cumulus-client-network = { workspace = true }37cumulus-client-service = { workspace = true }38cumulus-primitives-core = { workspace = true }39cumulus-primitives-parachain-inherent = { workspace = true }40cumulus-relay-chain-inprocess-interface = { workspace = true }41cumulus-relay-chain-interface = { workspace = true }42cumulus-relay-chain-minimal-node = { workspace = true }43frame-benchmarking = { workspace = true }44frame-benchmarking-cli = { workspace = true }45opal-runtime = { workspace = true, optional = true }46pallet-transaction-payment-rpc-runtime-api = { workspace = true }47polkadot-cli = { workspace = true }48polkadot-primitives = { workspace = true }49polkadot-service = { workspace = true }50quartz-runtime = { workspace = true, optional = true }51sc-basic-authorship = { workspace = true }52sc-chain-spec = { workspace = true }53sc-cli = { workspace = true }54sc-client-api = { workspace = true }55sc-consensus = { workspace = true }56sc-consensus-manual-seal = { workspace = true }57sc-executor = { workspace = true }58sc-network = { workspace = true }59sc-service = { workspace = true }60sc-sysinfo = { workspace = true }61sc-telemetry = { workspace = true }62sc-tracing = { workspace = true }63sc-transaction-pool = { workspace = true }64serde = { workspace = true }65sp-api = { workspace = true }66sp-block-builder = { workspace = true }67sp-blockchain = { workspace = true }68sp-consensus-aura = { workspace = true }69sp-core = { workspace = true }70sp-io = { workspace = true }71sp-keystore = { workspace = true }72sp-offchain = { workspace = true }73sp-runtime = { workspace = true }74sp-session = { workspace = true }75sp-timestamp = { workspace = true }76sp-transaction-pool = { workspace = true }77substrate-frame-rpc-system = { workspace = true }78substrate-prometheus-endpoint = { workspace = true }79try-runtime-cli = { workspace = true }80unique-runtime = { workspace = true, optional = true }81up-common = { workspace = true }82up-data-structs = { workspace = true }8384fc-consensus = { workspace = true }85fc-db = { workspace = true }86fc-mapping-sync = { workspace = true }87fc-rpc = { workspace = true }88fc-rpc-core = { workspace = true }89fp-rpc = { workspace = true }9091app-promotion-rpc = { workspace = true }92uc-rpc = { workspace = true }93unique-rpc = { workspace = true }94up-pov-estimate-rpc = { workspace = true }95up-rpc = { workspace = true }9697[build-dependencies]98substrate-build-script-utils = { workspace = true }99100[features]101default = ["opal-runtime"]102all-runtimes = [103	'opal-runtime',104	'quartz-runtime',105	'unique-runtime',106]107pov-estimate = [108	'opal-runtime/pov-estimate',109	'quartz-runtime?/pov-estimate',110	'uc-rpc/pov-estimate',111	'unique-rpc/pov-estimate',112	'unique-runtime?/pov-estimate',113]114runtime-benchmarks = [115	'opal-runtime/runtime-benchmarks',116	'polkadot-cli/runtime-benchmarks',117	'polkadot-service/runtime-benchmarks',118	'quartz-runtime?/runtime-benchmarks',119	'sc-service/runtime-benchmarks',120	'unique-runtime?/runtime-benchmarks',121]122sapphire-runtime = ['quartz-runtime', 'quartz-runtime/become-sapphire']123try-runtime = [124	'opal-runtime?/try-runtime',125	'quartz-runtime?/try-runtime',126	'try-runtime-cli/try-runtime',127	'unique-runtime?/try-runtime',128]
modifiednode/cli/src/cli.rsdiffbeforeafterboth
--- a/node/cli/src/cli.rs
+++ b/node/cli/src/cli.rs
@@ -15,11 +15,9 @@
 // along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
 
 use crate::chain_spec;
-use std::{path::PathBuf, env};
+use std::path::PathBuf;
 use clap::Parser;
 
-const NODE_NAME_ENV: &str = "UNIQUE_NODE_NAME";
-
 /// Sub-commands supported by the collator.
 #[derive(Debug, Parser)]
 pub enum Subcommand {
@@ -99,21 +97,7 @@
 
 impl Cli {
 	pub fn node_name() -> String {
-		match env::var(NODE_NAME_ENV).ok() {
-			Some(name) => name,
-			None => {
-				if cfg!(feature = "unique-runtime") {
-					"Unique"
-				} else if cfg!(feature = "sapphire-runtime") {
-					"Sapphire"
-				} else if cfg!(feature = "quartz-runtime") {
-					"Quartz"
-				} else {
-					"Opal"
-				}
-			}
-			.into(),
-		}
+		"Unique".into()
 	}
 }
modifiednode/cli/src/service.rsdiffbeforeafterboth
--- a/node/cli/src/service.rs
+++ b/node/cli/src/service.rs
@@ -68,7 +68,6 @@
 
 use up_common::types::opaque::*;
 
-#[cfg(feature = "pov-estimate")]
 use crate::chain_spec::RuntimeIdentification;
 
 /// Unique native executor instance.
@@ -507,12 +506,10 @@
 	#[cfg(feature = "pov-estimate")]
 	let rpc_backend = backend.clone();
 
-	#[cfg(feature = "pov-estimate")]
 	let runtime_id = parachain_config.chain_spec.runtime_id();
 
 	let rpc_builder = Box::new(move |deny_unsafe, subscription_task_executor| {
 		let full_deps = unique_rpc::FullDeps {
-			#[cfg(feature = "pov-estimate")]
 			runtime_id: runtime_id.clone(),
 
 			#[cfg(feature = "pov-estimate")]
@@ -1040,12 +1037,10 @@
 	#[cfg(feature = "pov-estimate")]
 	let rpc_backend = backend.clone();
 
-	#[cfg(feature = "pov-estimate")]
 	let runtime_id = config.chain_spec.runtime_id();
 
 	let rpc_builder = Box::new(move |deny_unsafe, subscription_executor| {
 		let full_deps = unique_rpc::FullDeps {
-			#[cfg(feature = "pov-estimate")]
 			runtime_id: runtime_id.clone(),
 
 			#[cfg(feature = "pov-estimate")]
modifiednode/rpc/Cargo.tomldiffbeforeafterboth
--- a/node/rpc/Cargo.toml
+++ b/node/rpc/Cargo.toml
@@ -44,4 +44,3 @@
 default = []
 pov-estimate = ['uc-rpc/pov-estimate']
 std = []
-unique-runtime = []
modifiednode/rpc/src/lib.rsdiffbeforeafterboth
--- a/node/rpc/src/lib.rs
+++ b/node/rpc/src/lib.rs
@@ -80,7 +80,7 @@
 	/// EthFilterApi pool.
 	pub filter_pool: Option<FilterPool>,
 
-	#[cfg(feature = "pov-estimate")]
+	/// Runtime identification (read from the chain spec)
 	pub runtime_id: RuntimeId,
 	/// Executor params for PoV estimating
 	#[cfg(feature = "pov-estimate")]
@@ -194,8 +194,7 @@
 		deny_unsafe,
 		filter_pool,
 
-		#[cfg(feature = "pov-estimate")]
-		runtime_id,
+		runtime_id: _,
 
 		#[cfg(feature = "pov-estimate")]
 		exec_params,