difftreelog
Adjust node and rpc to work with different runtimes
in: master
7 files changed
Cargo.lockdiffbeforeafterboth--- a/Cargo.lock
+++ b/Cargo.lock
@@ -11942,6 +11942,7 @@
"opal-runtime",
"pallet-ethereum",
"pallet-transaction-payment-rpc",
+ "pallet-transaction-payment-rpc-runtime-api",
"parity-scale-codec",
"parking_lot 0.11.2",
"polkadot-cli",
@@ -11988,7 +11989,9 @@
"substrate-prometheus-endpoint",
"unique-rpc",
"unique-runtime",
+ "unique-runtime-common",
"up-data-structs",
+ "up-rpc",
]
[[package]]
@@ -12003,12 +12006,11 @@
"futures 0.3.21",
"jsonrpc-core",
"jsonrpc-pubsub",
- "opal-runtime",
+ "pallet-common",
"pallet-ethereum",
"pallet-transaction-payment-rpc",
"pallet-transaction-payment-rpc-runtime-api",
"pallet-unique",
- "quartz-runtime",
"sc-client-api",
"sc-consensus-aura",
"sc-consensus-epochs",
@@ -12020,6 +12022,7 @@
"sc-rpc-api",
"sc-service",
"sc-transaction-pool",
+ "serde",
"sp-api",
"sp-block-builder",
"sp-blockchain",
@@ -12034,7 +12037,7 @@
"substrate-frame-rpc-system",
"tokio 0.2.25",
"uc-rpc",
- "unique-runtime",
+ "unique-runtime-common",
"up-rpc",
]
@@ -12118,10 +12121,13 @@
name = "unique-runtime-common"
version = "0.1.0"
dependencies = [
+ "fp-rpc",
"frame-support",
"frame-system",
+ "pallet-common",
"parity-scale-codec",
"scale-info",
+ "sp-consensus-aura",
"sp-core",
"sp-runtime",
]
node/cli/Cargo.tomldiffbeforeafterboth--- a/node/cli/Cargo.toml
+++ b/node/cli/Cargo.toml
@@ -238,6 +238,10 @@
################################################################################
# Local dependencies
+[dependencies.unique-runtime-common]
+default-features = false
+path = "../../runtime/common"
+
[dependencies.unique-runtime]
path = '../../runtime/unique'
optional = true
@@ -254,6 +258,13 @@
path = "../../primitives/data-structs"
default-features = false
+[dependencies.up-rpc]
+path = "../../primitives/rpc"
+
+[dependencies.pallet-transaction-payment-rpc-runtime-api]
+git = 'https://github.com/paritytech/substrate.git'
+branch = 'polkadot-v0.9.17'
+
################################################################################
# Package
@@ -295,7 +306,7 @@
unique-rpc = { default-features = false, path = "../rpc" }
[features]
-default = ["unique-runtime"]
+default = ["unique-runtime", "quartz-runtime", "opal-runtime"]
runtime-benchmarks = [
'unique-runtime/runtime-benchmarks',
'polkadot-service/runtime-benchmarks',
node/cli/src/chain_spec.rsdiffbeforeafterboth--- a/node/cli/src/chain_spec.rs
+++ b/node/cli/src/chain_spec.rs
@@ -24,20 +24,33 @@
use serde::{Deserialize, Serialize};
use serde_json::map::Map;
-#[cfg(feature = "unique-runtime")]
-use unique_runtime as runtime;
+use unique_runtime_common::types::*;
-#[cfg(feature = "quartz-runtime")]
-use quartz_runtime as runtime;
+/// Specialized `ChainSpec`. This is a specialization of the general Substrate ChainSpec type.
+pub type ChainSpec = sc_service::GenericChainSpec<unique_runtime::GenesisConfig, Extensions>;
-#[cfg(feature = "opal-runtime")]
-use opal_runtime as runtime;
+pub trait RuntimeIdentification {
+ fn is_unique(&self) -> bool;
+
+ fn is_quartz(&self) -> bool;
-use runtime::{*, opaque::*};
+ fn is_opal(&self) -> bool;
+}
-/// Specialized `ChainSpec`. This is a specialization of the general Substrate ChainSpec type.
-pub type ChainSpec = sc_service::GenericChainSpec<runtime::GenesisConfig, Extensions>;
+impl RuntimeIdentification for Box<dyn sc_service::ChainSpec> {
+ fn is_unique(&self) -> bool {
+ self.id().starts_with("unique")
+ }
+ fn is_quartz(&self) -> bool {
+ self.id().starts_with("quartz")
+ }
+
+ fn is_opal(&self) -> bool {
+ self.id().starts_with("opal")
+ }
+}
+
/// Helper function to generate a crypto pair from seed
pub fn get_from_seed<TPublic: Public>(seed: &str) -> <TPublic::Pair as Pair>::Public {
TPublic::Pair::from_string(&format!("//{}", seed), None)
@@ -225,10 +238,12 @@
initial_authorities: Vec<AuraId>,
endowed_accounts: Vec<AccountId>,
id: ParaId,
-) -> GenesisConfig {
+) -> unique_runtime::GenesisConfig {
+ use unique_runtime::*;
+
GenesisConfig {
- system: runtime::SystemConfig {
- code: runtime::WASM_BINARY
+ system: SystemConfig {
+ code: WASM_BINARY
.expect("WASM binary was not build, please build it!")
.to_vec(),
},
@@ -245,9 +260,9 @@
key: Some(root_key),
},
vesting: VestingConfig { vesting: vec![] },
- parachain_info: runtime::ParachainInfoConfig { parachain_id: id },
+ parachain_info: ParachainInfoConfig { parachain_id: id },
parachain_system: Default::default(),
- aura: runtime::AuraConfig {
+ aura: AuraConfig {
authorities: initial_authorities,
},
aura_ext: Default::default(),
node/cli/src/command.rsdiffbeforeafterboth--- a/node/cli/src/command.rs
+++ b/node/cli/src/command.rs
@@ -33,10 +33,20 @@
// limitations under the License.
use crate::{
- chain_spec,
+ chain_spec::{self, RuntimeIdentification},
cli::{Cli, RelayChainCli, Subcommand},
- service::{new_partial, ParachainRuntimeExecutor},
+ service::new_partial,
};
+
+#[cfg(feature = "unique-runtime")]
+use crate::service::UniqueRuntimeExecutor;
+
+#[cfg(feature = "quartz-runtime")]
+use crate::service::QuartzRuntimeExecutor;
+
+#[cfg(feature = "opal-runtime")]
+use crate::service::OpalRuntimeExecutor;
+
use codec::Encode;
use cumulus_primitives_core::ParaId;
use cumulus_client_service::genesis::generate_genesis_block;
@@ -53,16 +63,14 @@
use sp_runtime::traits::Block as BlockT;
use std::{io::Write, net::SocketAddr};
-#[cfg(feature = "unique-runtime")]
-use unique_runtime as runtime;
+use unique_runtime_common::types::Block;
-#[cfg(feature = "quartz-runtime")]
-use quartz_runtime as runtime;
-
-#[cfg(feature = "opal-runtime")]
-use opal_runtime as runtime;
-
-use runtime::Block;
+macro_rules! no_runtime_err {
+ ($chain_spec:expr) => {
+ format!("No runtime valid runtime was found, chain id: {}",
+ $chain_spec.id())
+ };
+}
fn load_spec(id: &str) -> std::result::Result<Box<dyn sc_service::ChainSpec>, String> {
Ok(match id {
@@ -79,7 +87,7 @@
impl SubstrateCli for Cli {
// TODO use args
fn impl_name() -> String {
- format!("{} Node", runtime::RUNTIME_NAME)
+ "Unique Node".into()
}
fn impl_version() -> String {
@@ -88,11 +96,10 @@
// TODO use args
fn description() -> String {
format!(
- "{} Node\n\nThe command-line arguments provided first will be \
+ "Unique Node\n\nThe command-line arguments provided first will be \
passed to the parachain node, while the arguments provided after -- will be passed \
to the relaychain node.\n\n\
{} [parachain-args] -- [relaychain-args]",
- runtime::RUNTIME_NAME,
Self::executable_name()
)
}
@@ -114,15 +121,30 @@
load_spec(id)
}
- fn native_runtime_version(_: &Box<dyn ChainSpec>) -> &'static RuntimeVersion {
- &runtime::VERSION
+ fn native_runtime_version(chain_spec: &Box<dyn ChainSpec>) -> &'static RuntimeVersion {
+ #[cfg(feature = "unique-runtime")]
+ if chain_spec.is_unique() {
+ return &unique_runtime::VERSION;
+ }
+
+ #[cfg(feature = "quartz-runtime")]
+ if chain_spec.is_quartz() {
+ return &quartz_runtime::VERSION;
+ }
+
+ #[cfg(feature = "opal-runtime")]
+ if chain_spec.is_opal() {
+ return &opal_runtime::VERSION;
+ }
+
+ panic!("{}", no_runtime_err!(chain_spec));
}
}
impl SubstrateCli for RelayChainCli {
// TODO use args
fn impl_name() -> String {
- format!("{} Node", runtime::RUNTIME_NAME)
+ "Unique Node".into()
}
fn impl_version() -> String {
@@ -130,13 +152,11 @@
}
// TODO use args
fn description() -> String {
- format!(
- "{} Node\n\nThe command-line arguments provided first will be \
+ "Unique Node\n\nThe command-line arguments provided first will be \
passed to the parachain node, while the arguments provided after -- will be passed \
to the relaychain node.\n\n\
- parachain-collator [parachain-args] -- [relaychain-args]",
- runtime::RUNTIME_NAME
- )
+ parachain-collator [parachain-args] -- [relaychain-args]"
+ .into()
}
fn author() -> String {
@@ -173,16 +193,50 @@
macro_rules! construct_async_run {
(|$components:ident, $cli:ident, $cmd:ident, $config:ident| $( $code:tt )* ) => {{
let runner = $cli.create_runner($cmd)?;
- runner.async_run(|$config| {
- let $components = new_partial::<
- _
- >(
- &$config,
- crate::service::parachain_build_import_queue,
- )?;
- let task_manager = $components.task_manager;
- { $( $code )* }.map(|v| (v, task_manager))
- })
+
+ #[cfg(feature = "unique-runtime")]
+ if runner.config().chain_spec.is_unique() {
+ return runner.async_run(|$config| {
+ let $components = new_partial::<
+ unique_runtime::RuntimeApi, UniqueRuntimeExecutor, _
+ >(
+ &$config,
+ crate::service::parachain_build_import_queue,
+ )?;
+ let task_manager = $components.task_manager;
+ { $( $code )* }.map(|v| (v, task_manager))
+ });
+ }
+
+ #[cfg(feature = "quartz-runtime")]
+ if runner.config().chain_spec.is_quartz() {
+ return runner.async_run(|$config| {
+ let $components = new_partial::<
+ quartz_runtime::RuntimeApi, QuartzRuntimeExecutor, _
+ >(
+ &$config,
+ crate::service::parachain_build_import_queue,
+ )?;
+ let task_manager = $components.task_manager;
+ { $( $code )* }.map(|v| (v, task_manager))
+ });
+ }
+
+ #[cfg(feature = "opal-runtime")]
+ if runner.config().chain_spec.is_opal() {
+ return runner.async_run(|$config| {
+ let $components = new_partial::<
+ opal_runtime::RuntimeApi, OpalRuntimeExecutor, _
+ >(
+ &$config,
+ crate::service::parachain_build_import_queue,
+ )?;
+ let task_manager = $components.task_manager;
+ { $( $code )* }.map(|v| (v, task_manager))
+ });
+ }
+
+ Err(no_runtime_err!(runner.config().chain_spec).into())
}}
}
@@ -286,8 +340,24 @@
Some(Subcommand::Benchmark(cmd)) => {
if cfg!(feature = "runtime-benchmarks") {
let runner = cli.create_runner(cmd)?;
+ runner.sync_run(|config| {
+ #[cfg(feature = "unique-runtime")]
+ if config.chain_spec.is_unique() {
+ return cmd.run::<Block, UniqueRuntimeExecutor>(config);
+ }
+
+ #[cfg(feature = "quartz-runtime")]
+ if config.chain_spec.is_quartz() {
+ return cmd.run::<Block, QuartzRuntimeExecutor>(config);
+ }
+
+ #[cfg(feature = "opal-runtime")]
+ if config.chain_spec.is_opal() {
+ return cmd.run::<Block, OpalRuntimeExecutor>(config);
+ }
- runner.sync_run(|config| cmd.run::<Block, ParachainRuntimeExecutor>(config))
+ Err(no_runtime_err!(config.chain_spec).into())
+ })
} else {
Err("Benchmarking wasn't enabled when building the node. \
You can enable it with `--features runtime-benchmarks`."
@@ -341,10 +411,43 @@
}
);
- crate::service::start_node(config, polkadot_config, id)
+ #[cfg(feature = "unique-runtime")]
+ if config.chain_spec.is_unique() {
+ return crate::service::start_node::<
+ unique_runtime::Runtime,
+ unique_runtime::RuntimeApi,
+ UniqueRuntimeExecutor,
+ >(config, polkadot_config, id)
.await
.map(|r| r.0)
- .map_err(Into::into)
+ .map_err(Into::into);
+ }
+
+ #[cfg(feature = "quartz-runtime")]
+ if config.chain_spec.is_quartz() {
+ return crate::service::start_node::<
+ quartz_runtime::Runtime,
+ quartz_runtime::RuntimeApi,
+ QuartzRuntimeExecutor,
+ >(config, polkadot_config, id)
+ .await
+ .map(|r| r.0)
+ .map_err(Into::into);
+ }
+
+ #[cfg(feature = "opal-runtime")]
+ if config.chain_spec.is_opal() {
+ return crate::service::start_node::<
+ opal_runtime::Runtime,
+ opal_runtime::RuntimeApi,
+ OpalRuntimeExecutor,
+ >(config, polkadot_config, id)
+ .await
+ .map(|r| r.0)
+ .map_err(Into::into);
+ }
+
+ Err(no_runtime_err!(config.chain_spec).into())
})
}
}
node/cli/src/service.rsdiffbeforeafterboth25use futures::StreamExt;25use futures::StreamExt;262627use unique_rpc::overrides_handle;27use unique_rpc::overrides_handle;28// Local Runtime Types29#[cfg(feature = "unique-runtime")]30use unique_runtime as runtime;3132#[cfg(feature = "quartz-runtime")]33use quartz_runtime as runtime;3435#[cfg(feature = "opal-runtime")]36use opal_runtime as runtime;372838use runtime::RuntimeApi;29use serde::{Serialize, Deserialize};393040// Cumulus Imports31// Cumulus Imports41use cumulus_client_consensus_aura::{AuraConsensus, BuildAuraConsensusParams, SlotProportion};32use cumulus_client_consensus_aura::{AuraConsensus, BuildAuraConsensusParams, SlotProportion};71pub type Block = sp_runtime::generic::Block<Header, sp_runtime::OpaqueExtrinsic>;62pub type Block = sp_runtime::generic::Block<Header, sp_runtime::OpaqueExtrinsic>;72type Hash = sp_core::H256;63type Hash = sp_core::H256;6465use unique_runtime_common::types::{AuraId, RuntimeInstance, AccountId, Balance, Index};736674/// Native executor instance.67/// Native executor instance.75pub struct ParachainRuntimeExecutor;68pub struct UniqueRuntimeExecutor;69pub struct QuartzRuntimeExecutor;70pub struct OpalRuntimeExecutor;767177impl NativeExecutionDispatch for ParachainRuntimeExecutor {72impl NativeExecutionDispatch for UniqueRuntimeExecutor {78 type ExtendHostFunctions = frame_benchmarking::benchmarking::HostFunctions;73 type ExtendHostFunctions = frame_benchmarking::benchmarking::HostFunctions;797480 fn dispatch(method: &str, data: &[u8]) -> Option<Vec<u8>> {75 fn dispatch(method: &str, data: &[u8]) -> Option<Vec<u8>> {81 runtime::api::dispatch(method, data)76 unique_runtime::api::dispatch(method, data)82 }77 }837884 fn native_version() -> sc_executor::NativeVersion {79 fn native_version() -> sc_executor::NativeVersion {85 runtime::native_version()80 unique_runtime::native_version()86 }81 }87}82}8384impl NativeExecutionDispatch for QuartzRuntimeExecutor {85 type ExtendHostFunctions = frame_benchmarking::benchmarking::HostFunctions;8687 fn dispatch(method: &str, data: &[u8]) -> Option<Vec<u8>> {88 unique_runtime::api::dispatch(method, data)89 }9091 fn native_version() -> sc_executor::NativeVersion {92 unique_runtime::native_version()93 }94}9596impl NativeExecutionDispatch for OpalRuntimeExecutor {97 type ExtendHostFunctions = frame_benchmarking::benchmarking::HostFunctions;9899 fn dispatch(method: &str, data: &[u8]) -> Option<Vec<u8>> {100 unique_runtime::api::dispatch(method, data)101 }102103 fn native_version() -> sc_executor::NativeVersion {104 unique_runtime::native_version()105 }106}8810789pub fn open_frontier_backend(config: &Configuration) -> Result<Arc<fc_db::Backend<Block>>, String> {108pub fn open_frontier_backend(config: &Configuration) -> Result<Arc<fc_db::Backend<Block>>, String> {90 let config_dir = config109 let config_dir = config106 )?))125 )?))107}126}108109type ExecutorDispatch = ParachainRuntimeExecutor;110127111type FullClient =128type FullClient<RuntimeApi, ExecutorDispatch> =112 sc_service::TFullClient<Block, RuntimeApi, NativeElseWasmExecutor<ExecutorDispatch>>;129 sc_service::TFullClient<Block, RuntimeApi, NativeElseWasmExecutor<ExecutorDispatch>>;113type FullBackend = sc_service::TFullBackend<Block>;130type FullBackend = sc_service::TFullBackend<Block>;114type FullSelectChain = sc_consensus::LongestChain<FullBackend, Block>;131type FullSelectChain = sc_consensus::LongestChain<FullBackend, Block>;118/// Use this macro if you don't actually need the full service, but just the builder in order to135/// Use this macro if you don't actually need the full service, but just the builder in order to119/// be able to perform chain operations.136/// be able to perform chain operations.120#[allow(clippy::type_complexity)]137#[allow(clippy::type_complexity)]121pub fn new_partial<BIQ>(138pub fn new_partial<RuntimeApi, ExecutorDispatch, BIQ>(122 config: &Configuration,139 config: &Configuration,123 build_import_queue: BIQ,140 build_import_queue: BIQ,124) -> Result<141) -> Result<125 PartialComponents<142 PartialComponents<126 FullClient,143 FullClient<RuntimeApi, ExecutorDispatch>,127 FullBackend,144 FullBackend,128 FullSelectChain,145 FullSelectChain,129 sc_consensus::DefaultImportQueue<Block, FullClient>,146 sc_consensus::DefaultImportQueue<Block, FullClient<RuntimeApi, ExecutorDispatch>>,130 sc_transaction_pool::FullPool<Block, FullClient>,147 sc_transaction_pool::FullPool<Block, FullClient<RuntimeApi, ExecutorDispatch>>,131 (148 (132 Option<Telemetry>,149 Option<Telemetry>,133 Option<FilterPool>,150 Option<FilterPool>,140>157>141where158where142 sc_client_api::StateBackendFor<FullBackend, Block>: sp_api::StateBackend<BlakeTwo256>,159 sc_client_api::StateBackendFor<FullBackend, Block>: sp_api::StateBackend<BlakeTwo256>,160 RuntimeApi: sp_api::ConstructRuntimeApi<Block, FullClient<RuntimeApi, ExecutorDispatch>>161 + Send162 + Sync163 + 'static,164 RuntimeApi::RuntimeApi: sp_transaction_pool::runtime_api::TaggedTransactionQueue<Block>,143 ExecutorDispatch: NativeExecutionDispatch + 'static,165 ExecutorDispatch: NativeExecutionDispatch + 'static,144 BIQ: FnOnce(166 BIQ: FnOnce(145 Arc<FullClient>,167 Arc<FullClient<RuntimeApi, ExecutorDispatch>>,146 &Configuration,168 &Configuration,147 Option<TelemetryHandle>,169 Option<TelemetryHandle>,148 &TaskManager,170 &TaskManager,149 ) -> Result<sc_consensus::DefaultImportQueue<Block, FullClient>, sc_service::Error>,171 ) -> Result<172 sc_consensus::DefaultImportQueue<Block, FullClient<RuntimeApi, ExecutorDispatch>>,173 sc_service::Error,174 >,150{175{151 let _telemetry = config176 let _telemetry = config240///265///241/// This is the actual implementation that is abstract over the executor and the runtime api.266/// This is the actual implementation that is abstract over the executor and the runtime api.242#[sc_tracing::logging::prefix_logs_with("Parachain")]267#[sc_tracing::logging::prefix_logs_with("Parachain")]243async fn start_node_impl<BIQ, BIC>(268async fn start_node_impl<Runtime, RuntimeApi, ExecutorDispatch, BIQ, BIC>(244 parachain_config: Configuration,269 parachain_config: Configuration,245 polkadot_config: Configuration,270 polkadot_config: Configuration,246 id: ParaId,271 id: ParaId,247 build_import_queue: BIQ,272 build_import_queue: BIQ,248 build_consensus: BIC,273 build_consensus: BIC,249) -> sc_service::error::Result<(TaskManager, Arc<FullClient>)>274) -> sc_service::error::Result<(TaskManager, Arc<FullClient<RuntimeApi, ExecutorDispatch>>)>250where275where251 sc_client_api::StateBackendFor<FullBackend, Block>: sp_api::StateBackend<BlakeTwo256>,276 sc_client_api::StateBackendFor<FullBackend, Block>: sp_api::StateBackend<BlakeTwo256>,277 Runtime: RuntimeInstance + Send + Sync + 'static,278 <Runtime as RuntimeInstance>::CrossAccountId: Serialize,279 for<'de> <Runtime as RuntimeInstance>::CrossAccountId: Deserialize<'de>,280 RuntimeApi: sp_api::ConstructRuntimeApi<Block, FullClient<RuntimeApi, ExecutorDispatch>>281 + Send282 + Sync283 + 'static,284 RuntimeApi::RuntimeApi: sp_transaction_pool::runtime_api::TaggedTransactionQueue<Block>285 + fp_rpc::EthereumRuntimeRPCApi<Block>286 + sp_session::SessionKeys<Block>287 + sp_block_builder::BlockBuilder<Block>288 + pallet_transaction_payment_rpc_runtime_api::TransactionPaymentApi<Block, Balance>289 + sp_api::ApiExt<Block, StateBackend = sc_client_api::StateBackendFor<FullBackend, Block>>290 + up_rpc::UniqueApi<Block, Runtime::CrossAccountId, AccountId>291 + substrate_frame_rpc_system::AccountNonceApi<Block, AccountId, Index>292 + sp_api::Metadata<Block>293 + sp_offchain::OffchainWorkerApi<Block>294 + cumulus_primitives_core::CollectCollationInfo<Block>,252 ExecutorDispatch: NativeExecutionDispatch + 'static,295 ExecutorDispatch: NativeExecutionDispatch + 'static,253 BIQ: FnOnce(296 BIQ: FnOnce(254 Arc<FullClient>,297 Arc<FullClient<RuntimeApi, ExecutorDispatch>>,255 &Configuration,298 &Configuration,256 Option<TelemetryHandle>,299 Option<TelemetryHandle>,257 &TaskManager,300 &TaskManager,258 ) -> Result<sc_consensus::DefaultImportQueue<Block, FullClient>, sc_service::Error>,301 ) -> Result<302 sc_consensus::DefaultImportQueue<Block, FullClient<RuntimeApi, ExecutorDispatch>>,303 sc_service::Error,304 >,259 BIC: FnOnce(305 BIC: FnOnce(260 Arc<FullClient>,306 Arc<FullClient<RuntimeApi, ExecutorDispatch>>,261 Option<&Registry>,307 Option<&Registry>,262 Option<TelemetryHandle>,308 Option<TelemetryHandle>,263 &TaskManager,309 &TaskManager,264 Arc<dyn RelayChainInterface>,310 Arc<dyn RelayChainInterface>,265 Arc<sc_transaction_pool::FullPool<Block, FullClient>>,311 Arc<sc_transaction_pool::FullPool<Block, FullClient<RuntimeApi, ExecutorDispatch>>>,266 Arc<NetworkService<Block, Hash>>,312 Arc<NetworkService<Block, Hash>>,267 SyncCryptoStorePtr,313 SyncCryptoStorePtr,268 bool,314 bool,275 let parachain_config = prepare_node_config(parachain_config);321 let parachain_config = prepare_node_config(parachain_config);276322277 let params = new_partial::<BIQ>(¶chain_config, build_import_queue)?;323 let params =324 new_partial::<RuntimeApi, ExecutorDispatch, BIQ>(¶chain_config, build_import_queue)?;278 let (mut telemetry, filter_pool, frontier_backend, telemetry_worker_handle, fee_history_cache) =325 let (mut telemetry, filter_pool, frontier_backend, telemetry_worker_handle, fee_history_cache) =279 params.other;326 params.other;280327320367321 let block_data_cache = Arc::new(fc_rpc::EthBlockDataCache::new(368 let block_data_cache = Arc::new(fc_rpc::EthBlockDataCache::new(322 task_manager.spawn_handle(),369 task_manager.spawn_handle(),323 overrides_handle(client.clone()),370 overrides_handle::<_, _, Runtime>(client.clone()),324 50,371 50,325 50,372 50,326 ));373 ));347 };394 };348395349 Ok(unique_rpc::create_full::<_, _, _, _, RuntimeApi, _>(396 Ok(397 unique_rpc::create_full::<_, _, _, _, Runtime, RuntimeApi, _>(350 full_deps,398 full_deps,351 subscription_executor.clone(),399 subscription_executor.clone(),352 ))400 ),401 )353 });402 });354403436}485}437486438/// Build the import queue for the the parachain runtime.487/// Build the import queue for the the parachain runtime.439pub fn parachain_build_import_queue(488pub fn parachain_build_import_queue<RuntimeApi, ExecutorDispatch>(440 client: Arc<FullClient>,489 client: Arc<FullClient<RuntimeApi, ExecutorDispatch>>,441 config: &Configuration,490 config: &Configuration,442 telemetry: Option<TelemetryHandle>,491 telemetry: Option<TelemetryHandle>,443 task_manager: &TaskManager,492 task_manager: &TaskManager,444) -> Result<sc_consensus::DefaultImportQueue<Block, FullClient>, sc_service::Error> {493) -> Result<494 sc_consensus::DefaultImportQueue<Block, FullClient<RuntimeApi, ExecutorDispatch>>,495 sc_service::Error,496>497where498 RuntimeApi: sp_api::ConstructRuntimeApi<Block, FullClient<RuntimeApi, ExecutorDispatch>>499 + Send500 + Sync501 + 'static,502 RuntimeApi::RuntimeApi: sp_transaction_pool::runtime_api::TaggedTransactionQueue<Block>503 + sp_block_builder::BlockBuilder<Block>504 + sp_consensus_aura::AuraApi<Block, AuraId>505 + sp_api::ApiExt<Block, StateBackend = sc_client_api::StateBackendFor<FullBackend, Block>>,506 ExecutorDispatch: NativeExecutionDispatch + 'static,507{445 let slot_duration = cumulus_client_consensus_aura::slot_duration(&*client)?;508 let slot_duration = cumulus_client_consensus_aura::slot_duration(&*client)?;446509475}538}476539477/// Start a normal parachain node.540/// Start a normal parachain node.478pub async fn start_node(541pub async fn start_node<Runtime, RuntimeApi, ExecutorDispatch>(479 parachain_config: Configuration,542 parachain_config: Configuration,480 polkadot_config: Configuration,543 polkadot_config: Configuration,481 id: ParaId,544 id: ParaId,482) -> sc_service::error::Result<(TaskManager, Arc<FullClient>)> {545) -> sc_service::error::Result<(TaskManager, Arc<FullClient<RuntimeApi, ExecutorDispatch>>)>546where547 Runtime: RuntimeInstance + Send + Sync + 'static,548 <Runtime as RuntimeInstance>::CrossAccountId: Serialize,549 for<'de> <Runtime as RuntimeInstance>::CrossAccountId: Deserialize<'de>,550 RuntimeApi: sp_api::ConstructRuntimeApi<Block, FullClient<RuntimeApi, ExecutorDispatch>>551 + Send552 + Sync553 + 'static,554 RuntimeApi::RuntimeApi: sp_transaction_pool::runtime_api::TaggedTransactionQueue<Block>555 + fp_rpc::EthereumRuntimeRPCApi<Block>556 + sp_session::SessionKeys<Block>557 + sp_block_builder::BlockBuilder<Block>558 + pallet_transaction_payment_rpc_runtime_api::TransactionPaymentApi<Block, Balance>559 + sp_api::ApiExt<Block, StateBackend = sc_client_api::StateBackendFor<FullBackend, Block>>560 + up_rpc::UniqueApi<Block, Runtime::CrossAccountId, AccountId>561 + substrate_frame_rpc_system::AccountNonceApi<Block, AccountId, Index>562 + sp_api::Metadata<Block>563 + sp_offchain::OffchainWorkerApi<Block>564 + cumulus_primitives_core::CollectCollationInfo<Block>565 + sp_consensus_aura::AuraApi<Block, AuraId>,566 ExecutorDispatch: NativeExecutionDispatch + 'static,567{483 start_node_impl::<_, _>(568 start_node_impl::<Runtime, RuntimeApi, ExecutorDispatch, _, _>(484 parachain_config,569 parachain_config,485 polkadot_config,570 polkadot_config,486 id,571 id,node/rpc/Cargo.tomldiffbeforeafterboth--- a/node/rpc/Cargo.toml
+++ b/node/rpc/Cargo.toml
@@ -48,13 +48,16 @@
fc-db = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.17" }
fc-mapping-sync = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.17" }
+pallet-common = { default-features = false, path = "../../pallets/common" }
+unique-runtime-common = { default-features = false, path = "../../runtime/common" }
pallet-unique = { path = "../../pallets/unique" }
uc-rpc = { path = "../../client/rpc" }
up-rpc = { path = "../../primitives/rpc" }
-unique-runtime = { path = "../../runtime/unique", optional = true }
-quartz-runtime = { path = "../../runtime/quartz", optional = true }
-opal-runtime = { path = "../../runtime/opal", optional = true }
+[dependencies.serde]
+features = ['derive']
+version = '1.0.130'
+
[features]
-default = ["unique-runtime"]
+default = []
std = []
node/rpc/src/lib.rsdiffbeforeafterboth--- a/node/rpc/src/lib.rs
+++ b/node/rpc/src/lib.rs
@@ -40,16 +40,9 @@
use sc_service::TransactionPool;
use std::{collections::BTreeMap, marker::PhantomData, sync::Arc};
-#[cfg(feature = "unique-runtime")]
-use unique_runtime as runtime;
-
-#[cfg(feature = "quartz-runtime")]
-use quartz_runtime as runtime;
-
-#[cfg(feature = "opal-runtime")]
-use opal_runtime as runtime;
-
-use runtime::opaque::{Hash, AccountId, CrossAccountId, Index, Block, BlockNumber, Balance};
+use unique_runtime_common::types::{
+ Hash, AccountId, RuntimeInstance, Index, Block, BlockNumber, Balance,
+};
/// Public io handler for exporting into other modules
pub type IoHandler = jsonrpc_core::IoHandler<sc_rpc::Metadata>;
@@ -100,29 +93,33 @@
pub block_data_cache: Arc<EthBlockDataCache<Block>>,
}
-struct AccountCodes<C, B> {
+struct AccountCodes<C, B, R> {
client: Arc<C>,
- _marker: PhantomData<B>,
+ _blk_marker: PhantomData<B>,
+ _runtime_marker: PhantomData<R>,
}
-impl<C, Block> AccountCodes<C, Block>
+impl<C, Block, R> AccountCodes<C, Block, R>
where
Block: sp_api::BlockT,
C: ProvideRuntimeApi<Block>,
+ R: RuntimeInstance,
{
fn new(client: Arc<C>) -> Self {
Self {
client,
- _marker: PhantomData,
+ _blk_marker: PhantomData,
+ _runtime_marker: PhantomData,
}
}
}
-impl<C, Block> fc_rpc::AccountCodeProvider<Block> for AccountCodes<C, Block>
+impl<C, Block, Runtime> fc_rpc::AccountCodeProvider<Block> for AccountCodes<C, Block, Runtime>
where
Block: sp_api::BlockT,
C: ProvideRuntimeApi<Block>,
- C::Api: up_rpc::UniqueApi<Block, CrossAccountId, AccountId>,
+ C::Api: up_rpc::UniqueApi<Block, <Runtime as RuntimeInstance>::CrossAccountId, AccountId>,
+ Runtime: RuntimeInstance,
{
fn code(&self, block: &sp_api::BlockId<Block>, account: sp_core::H160) -> Option<Vec<u8>> {
use up_rpc::UniqueApi;
@@ -134,22 +131,23 @@
}
}
-pub fn overrides_handle<C, BE>(client: Arc<C>) -> Arc<OverrideHandle<Block>>
+pub fn overrides_handle<C, BE, R>(client: Arc<C>) -> Arc<OverrideHandle<Block>>
where
C: ProvideRuntimeApi<Block> + StorageProvider<Block, BE> + AuxStore,
C: HeaderBackend<Block> + HeaderMetadata<Block, Error = BlockChainError>,
C: Send + Sync + 'static,
C::Api: fp_rpc::EthereumRuntimeRPCApi<Block>,
- C::Api: up_rpc::UniqueApi<Block, CrossAccountId, AccountId>,
+ C::Api: up_rpc::UniqueApi<Block, <R as RuntimeInstance>::CrossAccountId, AccountId>,
BE: Backend<Block> + 'static,
BE::State: StateBackend<BlakeTwo256>,
+ R: RuntimeInstance + Send + Sync + 'static,
{
let mut overrides_map = BTreeMap::new();
overrides_map.insert(
EthereumStorageSchema::V1,
Box::new(SchemaV1Override::new_with_code_provider(
client.clone(),
- Arc::new(AccountCodes::<C, Block>::new(client.clone())),
+ Arc::new(AccountCodes::<C, Block, R>::new(client.clone())),
)) as Box<dyn StorageOverride<_> + Send + Sync>,
);
overrides_map.insert(
@@ -170,7 +168,7 @@
}
/// Instantiate all Full RPC extensions.
-pub fn create_full<C, P, SC, CA, A, B>(
+pub fn create_full<C, P, SC, CA, R, A, B>(
deps: FullDeps<C, P, SC, CA>,
subscription_task_executor: SubscriptionTaskExecutor,
) -> jsonrpc_core::IoHandler<sc_rpc_api::Metadata>
@@ -184,11 +182,14 @@
// C::Api: pallet_contracts_rpc::ContractsRuntimeApi<Block, AccountId, Balance, BlockNumber, Hash>,
C::Api: pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi<Block, Balance>,
C::Api: fp_rpc::EthereumRuntimeRPCApi<Block>,
- C::Api: up_rpc::UniqueApi<Block, CrossAccountId, AccountId>,
+ C::Api: up_rpc::UniqueApi<Block, <R as RuntimeInstance>::CrossAccountId, AccountId>,
B: sc_client_api::Backend<Block> + Send + Sync + 'static,
B::State: sc_client_api::backend::StateBackend<sp_runtime::traits::HashFor<Block>>,
P: TransactionPool<Block = Block> + 'static,
CA: ChainApi<Block = Block> + 'static,
+ R: RuntimeInstance + Send + Sync + 'static,
+ <R as RuntimeInstance>::CrossAccountId: serde::Serialize,
+ for<'de> <R as RuntimeInstance>::CrossAccountId: serde::Deserialize<'de>,
{
use fc_rpc::{
EthApi, EthApiServer, EthDevSigner, EthFilterApi, EthFilterApiServer, EthPubSubApi,
@@ -235,13 +236,13 @@
signers.push(Box::new(EthDevSigner::new()) as Box<dyn EthSigner>);
}
- let overrides = overrides_handle(client.clone());
+ let overrides = overrides_handle::<_, _, R>(client.clone());
io.extend_with(EthApiServer::to_delegate(EthApi::new(
client.clone(),
pool.clone(),
graph,
- runtime::TransactionConverter,
+ <R as RuntimeInstance>::get_transaction_converter(),
network.clone(),
signers,
overrides.clone(),