difftreelog
Merge pull request #901 from UniqueNetwork/feature/unify-nodes
in: master
6 files changed
client/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',
node/cli/Cargo.tomldiffbeforeafterboth--- a/node/cli/Cargo.toml
+++ b/node/cli/Cargo.toml
@@ -99,6 +99,11 @@
[features]
default = ["opal-runtime"]
+all-runtimes = [
+ 'opal-runtime',
+ 'quartz-runtime',
+ 'unique-runtime',
+]
pov-estimate = [
'opal-runtime/pov-estimate',
'quartz-runtime?/pov-estimate',
node/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()
}
}
node/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")]
node/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 = []
node/rpc/src/lib.rsdiffbeforeafterboth1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617use sp_runtime::traits::BlakeTwo256;18use fc_rpc::{19 EthBlockDataCacheTask, OverrideHandle, RuntimeApiStorageOverride, SchemaV1Override,20 StorageOverride, SchemaV2Override, SchemaV3Override,21};22use jsonrpsee::RpcModule;23use fc_rpc_core::types::{FilterPool, FeeHistoryCache};24use fp_storage::EthereumStorageSchema;25use sc_client_api::{26 backend::{AuxStore, StorageProvider},27 client::BlockchainEvents,28 StateBackend, Backend,29};30use sc_finality_grandpa::{31 FinalityProofProvider, GrandpaJustificationStream, SharedAuthoritySet, SharedVoterState,32};33use sc_network::NetworkService;34use sc_rpc::SubscriptionTaskExecutor;35pub use sc_rpc_api::DenyUnsafe;36use sc_transaction_pool::{ChainApi, Pool};37use sp_api::ProvideRuntimeApi;38use sp_block_builder::BlockBuilder;39use sp_blockchain::{Error as BlockChainError, HeaderBackend, HeaderMetadata};40use sc_service::TransactionPool;41use std::{collections::BTreeMap, sync::Arc};4243use up_common::types::opaque::*;4445#[cfg(feature = "pov-estimate")]46type FullBackend = sc_service::TFullBackend<Block>;4748/// Extra dependencies for GRANDPA49pub struct GrandpaDeps<B> {50 /// Voting round info.51 pub shared_voter_state: SharedVoterState,52 /// Authority set info.53 pub shared_authority_set: SharedAuthoritySet<Hash, BlockNumber>,54 /// Receives notifications about justification events from Grandpa.55 pub justification_stream: GrandpaJustificationStream<Block>,56 /// Executor to drive the subscription manager in the Grandpa RPC handler.57 pub subscription_executor: SubscriptionTaskExecutor,58 /// Finality proof provider.59 pub finality_provider: Arc<FinalityProofProvider<B, Block>>,60}6162/// Full client dependencies.63pub struct FullDeps<C, P, SC, CA: ChainApi> {64 /// The client instance to use.65 pub client: Arc<C>,66 /// Transaction pool instance.67 pub pool: Arc<P>,68 /// Graph pool instance.69 pub graph: Arc<Pool<CA>>,70 /// The SelectChain Strategy71 pub select_chain: SC,72 /// The Node authority flag73 pub is_authority: bool,74 /// Whether to enable dev signer75 pub enable_dev_signer: bool,76 /// Network service77 pub network: Arc<NetworkService<Block, Hash>>,78 /// Whether to deny unsafe calls79 pub deny_unsafe: DenyUnsafe,80 /// EthFilterApi pool.81 pub filter_pool: Option<FilterPool>,8283 #[cfg(feature = "pov-estimate")]84 pub runtime_id: RuntimeId,85 /// Executor params for PoV estimating86 #[cfg(feature = "pov-estimate")]87 pub exec_params: uc_rpc::pov_estimate::ExecutorParams,88 /// Substrate Backend.89 #[cfg(feature = "pov-estimate")]90 pub backend: Arc<FullBackend>,9192 /// Ethereum Backend.93 pub eth_backend: Arc<fc_db::Backend<Block>>,94 /// Maximum number of logs in a query.95 pub max_past_logs: u32,96 /// Maximum fee history cache size.97 pub fee_history_limit: u64,98 /// Fee history cache.99 pub fee_history_cache: FeeHistoryCache,100 /// Cache for Ethereum block data.101 pub block_data_cache: Arc<EthBlockDataCacheTask<Block>>,102}103104pub fn overrides_handle<C, BE, R>(client: Arc<C>) -> Arc<OverrideHandle<Block>>105where106 C: ProvideRuntimeApi<Block> + StorageProvider<Block, BE> + AuxStore,107 C: HeaderBackend<Block> + HeaderMetadata<Block, Error = BlockChainError>,108 C: Send + Sync + 'static,109 C::Api: fp_rpc::EthereumRuntimeRPCApi<Block>,110 C::Api: up_rpc::UniqueApi<Block, <R as RuntimeInstance>::CrossAccountId, AccountId>,111 BE: Backend<Block> + 'static,112 BE::State: StateBackend<BlakeTwo256>,113 R: RuntimeInstance + Send + Sync + 'static,114{115 let mut overrides_map = BTreeMap::new();116 overrides_map.insert(117 EthereumStorageSchema::V1,118 Box::new(SchemaV1Override::new(client.clone())) as Box<dyn StorageOverride<_> + 'static>,119 );120 overrides_map.insert(121 EthereumStorageSchema::V2,122 Box::new(SchemaV2Override::new(client.clone())) as Box<dyn StorageOverride<_> + 'static>,123 );124 overrides_map.insert(125 EthereumStorageSchema::V3,126 Box::new(SchemaV3Override::new(client.clone())) as Box<dyn StorageOverride<_> + 'static>,127 );128129 Arc::new(OverrideHandle {130 schemas: overrides_map,131 fallback: Box::new(RuntimeApiStorageOverride::new(client)),132 })133}134135/// Instantiate all Full RPC extensions.136pub fn create_full<C, P, SC, CA, R, A, B>(137 deps: FullDeps<C, P, SC, CA>,138 subscription_task_executor: SubscriptionTaskExecutor,139) -> Result<RpcModule<()>, Box<dyn std::error::Error + Send + Sync>>140where141 C: ProvideRuntimeApi<Block> + StorageProvider<Block, B> + AuxStore,142 C: HeaderBackend<Block> + HeaderMetadata<Block, Error = BlockChainError> + 'static,143 C: Send + Sync + 'static,144 C: BlockchainEvents<Block>,145 C::Api: substrate_frame_rpc_system::AccountNonceApi<Block, AccountId, Index>,146 C::Api: BlockBuilder<Block>,147 // C::Api: pallet_contracts_rpc::ContractsRuntimeApi<Block, AccountId, Balance, BlockNumber, Hash>,148 C::Api: pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi<Block, Balance>,149 C::Api: fp_rpc::EthereumRuntimeRPCApi<Block>,150 C::Api: fp_rpc::ConvertTransactionRuntimeApi<Block>,151 C::Api: up_rpc::UniqueApi<Block, <R as RuntimeInstance>::CrossAccountId, AccountId>,152 C::Api: app_promotion_rpc::AppPromotionApi<153 Block,154 BlockNumber,155 <R as RuntimeInstance>::CrossAccountId,156 AccountId,157 >,158 C::Api: up_pov_estimate_rpc::PovEstimateApi<Block>,159 B: sc_client_api::Backend<Block> + Send + Sync + 'static,160 B::State: sc_client_api::backend::StateBackend<sp_runtime::traits::HashFor<Block>>,161 P: TransactionPool<Block = Block> + 'static,162 CA: ChainApi<Block = Block> + 'static,163 R: RuntimeInstance + Send + Sync + 'static,164 <R as RuntimeInstance>::CrossAccountId: serde::Serialize,165 for<'de> <R as RuntimeInstance>::CrossAccountId: serde::Deserialize<'de>,166{167 use fc_rpc::{168 Eth, EthApiServer, EthDevSigner, EthFilter, EthFilterApiServer, EthPubSub,169 EthPubSubApiServer, EthSigner, Net, NetApiServer, Web3, Web3ApiServer,170 };171 use uc_rpc::{UniqueApiServer, Unique};172173 use uc_rpc::{AppPromotionApiServer, AppPromotion};174175 #[cfg(feature = "pov-estimate")]176 use uc_rpc::pov_estimate::{PovEstimateApiServer, PovEstimate};177178 // use pallet_contracts_rpc::{Contracts, ContractsApi};179 use pallet_transaction_payment_rpc::{TransactionPayment, TransactionPaymentApiServer};180 use substrate_frame_rpc_system::{System, SystemApiServer};181182 let mut io = RpcModule::new(());183 let FullDeps {184 client,185 pool,186 graph,187 select_chain: _,188 fee_history_limit,189 fee_history_cache,190 block_data_cache,191 enable_dev_signer,192 is_authority,193 network,194 deny_unsafe,195 filter_pool,196197 #[cfg(feature = "pov-estimate")]198 runtime_id,199200 #[cfg(feature = "pov-estimate")]201 exec_params,202203 #[cfg(feature = "pov-estimate")]204 backend,205206 eth_backend,207 max_past_logs,208 } = deps;209210 io.merge(System::new(Arc::clone(&client), Arc::clone(&pool), deny_unsafe).into_rpc())?;211 io.merge(TransactionPayment::new(Arc::clone(&client)).into_rpc())?;212213 // io.extend_with(ContractsApi::to_delegate(Contracts::new(client.clone())));214215 let mut signers = Vec::new();216 if enable_dev_signer {217 signers.push(Box::new(EthDevSigner::new()) as Box<dyn EthSigner>);218 }219220 let overrides = overrides_handle::<_, _, R>(client.clone());221222 let execute_gas_limit_multiplier = 10;223 io.merge(224 Eth::new(225 client.clone(),226 pool.clone(),227 graph,228 Some(<R as RuntimeInstance>::get_transaction_converter()),229 network.clone(),230 signers,231 overrides.clone(),232 eth_backend.clone(),233 is_authority,234 block_data_cache.clone(),235 fee_history_cache,236 fee_history_limit,237 execute_gas_limit_multiplier,238 )239 .into_rpc(),240 )?;241242 io.merge(Unique::new(client.clone()).into_rpc())?;243244 io.merge(AppPromotion::new(client.clone()).into_rpc())?;245246 #[cfg(feature = "pov-estimate")]247 io.merge(248 PovEstimate::new(249 client.clone(),250 backend,251 deny_unsafe,252 exec_params,253 runtime_id,254 )255 .into_rpc(),256 )?;257258 if let Some(filter_pool) = filter_pool {259 io.merge(260 EthFilter::new(261 client.clone(),262 eth_backend,263 filter_pool,264 500_usize, // max stored filters265 max_past_logs,266 block_data_cache,267 )268 .into_rpc(),269 )?;270 }271272 io.merge(273 Net::new(274 client.clone(),275 network.clone(),276 // Whether to format the `peer_count` response as Hex (default) or not.277 true,278 )279 .into_rpc(),280 )?;281282 io.merge(Web3::new(client.clone()).into_rpc())?;283284 io.merge(285 EthPubSub::new(pool, client, network, subscription_task_executor, overrides).into_rpc(),286 )?;287288 Ok(io)289}