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
3636
37sc-executor = { workspace = true }37sc-executor = { workspace = true }
3838
39opal-runtime = { workspace = true }39opal-runtime = { workspace = true, optional = true }
40quartz-runtime = { workspace = true, optional = true }40quartz-runtime = { workspace = true, optional = true }
41unique-runtime = { workspace = true, optional = true }41unique-runtime = { workspace = true, optional = true }
4242
43[features]43[features]
44default = ['opal-runtime']
45all-runtimes = [
46 'opal-runtime',
47 'quartz-runtime',
48 'unique-runtime',
49]
44pov-estimate = [50pov-estimate = [
45 'opal-runtime/pov-estimate',51 'opal-runtime/pov-estimate',
46 'quartz-runtime?/pov-estimate',52 'quartz-runtime?/pov-estimate',
modifiednode/cli/Cargo.tomldiffbeforeafterboth
9999
100[features]100[features]
101default = ["opal-runtime"]101default = ["opal-runtime"]
102all-runtimes = [
103 'opal-runtime',
104 'quartz-runtime',
105 'unique-runtime',
106]
102pov-estimate = [107pov-estimate = [
103 'opal-runtime/pov-estimate',108 'opal-runtime/pov-estimate',
104 'quartz-runtime?/pov-estimate',109 'quartz-runtime?/pov-estimate',
modifiednode/cli/src/cli.rsdiffbeforeafterboth
15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
1616
17use crate::chain_spec;17use crate::chain_spec;
18use std::{path::PathBuf, env};18use std::path::PathBuf;
19use clap::Parser;19use clap::Parser;
20
21const NODE_NAME_ENV: &str = "UNIQUE_NODE_NAME";
2220
23/// Sub-commands supported by the collator.21/// Sub-commands supported by the collator.
24#[derive(Debug, Parser)]22#[derive(Debug, Parser)]
9997
100impl Cli {98impl Cli {
101 pub fn node_name() -> String {99 pub fn node_name() -> String {
102 match env::var(NODE_NAME_ENV).ok() {
103 Some(name) => name,
104 None => {
105 if cfg!(feature = "unique-runtime") {
106 "Unique"100 "Unique".into()
107 } else if cfg!(feature = "sapphire-runtime") {
108 "Sapphire"
109 } else if cfg!(feature = "quartz-runtime") {
110 "Quartz"
111 } else {
112 "Opal"
113 }
114 }
115 .into(),
116 }
117 }101 }
118}102}
119103
modifiednode/cli/src/service.rsdiffbeforeafterboth
6868
69use up_common::types::opaque::*;69use up_common::types::opaque::*;
7070
71#[cfg(feature = "pov-estimate")]
72use crate::chain_spec::RuntimeIdentification;71use crate::chain_spec::RuntimeIdentification;
7372
74/// Unique native executor instance.73/// Unique native executor instance.
507 #[cfg(feature = "pov-estimate")]506 #[cfg(feature = "pov-estimate")]
508 let rpc_backend = backend.clone();507 let rpc_backend = backend.clone();
509508
510 #[cfg(feature = "pov-estimate")]
511 let runtime_id = parachain_config.chain_spec.runtime_id();509 let runtime_id = parachain_config.chain_spec.runtime_id();
512510
513 let rpc_builder = Box::new(move |deny_unsafe, subscription_task_executor| {511 let rpc_builder = Box::new(move |deny_unsafe, subscription_task_executor| {
514 let full_deps = unique_rpc::FullDeps {512 let full_deps = unique_rpc::FullDeps {
515 #[cfg(feature = "pov-estimate")]
516 runtime_id: runtime_id.clone(),513 runtime_id: runtime_id.clone(),
517514
518 #[cfg(feature = "pov-estimate")]515 #[cfg(feature = "pov-estimate")]
1040 #[cfg(feature = "pov-estimate")]1037 #[cfg(feature = "pov-estimate")]
1041 let rpc_backend = backend.clone();1038 let rpc_backend = backend.clone();
10421039
1043 #[cfg(feature = "pov-estimate")]
1044 let runtime_id = config.chain_spec.runtime_id();1040 let runtime_id = config.chain_spec.runtime_id();
10451041
1046 let rpc_builder = Box::new(move |deny_unsafe, subscription_executor| {1042 let rpc_builder = Box::new(move |deny_unsafe, subscription_executor| {
1047 let full_deps = unique_rpc::FullDeps {1043 let full_deps = unique_rpc::FullDeps {
1048 #[cfg(feature = "pov-estimate")]
1049 runtime_id: runtime_id.clone(),1044 runtime_id: runtime_id.clone(),
10501045
1051 #[cfg(feature = "pov-estimate")]1046 #[cfg(feature = "pov-estimate")]
modifiednode/rpc/Cargo.tomldiffbeforeafterboth
44default = []44default = []
45pov-estimate = ['uc-rpc/pov-estimate']45pov-estimate = ['uc-rpc/pov-estimate']
46std = []46std = []
47unique-runtime = []
4847
modifiednode/rpc/src/lib.rsdiffbeforeafterboth
80 /// EthFilterApi pool.80 /// EthFilterApi pool.
81 pub filter_pool: Option<FilterPool>,81 pub filter_pool: Option<FilterPool>,
8282
83 #[cfg(feature = "pov-estimate")]83 /// Runtime identification (read from the chain spec)
84 pub runtime_id: RuntimeId,84 pub runtime_id: RuntimeId,
85 /// Executor params for PoV estimating85 /// Executor params for PoV estimating
86 #[cfg(feature = "pov-estimate")]86 #[cfg(feature = "pov-estimate")]
194 deny_unsafe,194 deny_unsafe,
195 filter_pool,195 filter_pool,
196196
197 #[cfg(feature = "pov-estimate")]
198 runtime_id,197 runtime_id: _,
199198
200 #[cfg(feature = "pov-estimate")]199 #[cfg(feature = "pov-estimate")]
201 exec_params,200 exec_params,