difftreelog
fix make node build on 0.9.42
in: master
6 files changed
client/rpc/src/pov_estimate.rsdiffbeforeafterboth--- a/client/rpc/src/pov_estimate.rs
+++ b/client/rpc/src/pov_estimate.rs
@@ -213,12 +213,7 @@
let pre_root = *backend.root();
- let executor = NativeElseWasmExecutor::<D>::new(
- exec_params.wasm_method,
- exec_params.default_heap_pages,
- exec_params.max_runtime_instances,
- exec_params.runtime_cache_size,
- );
+ let executor = sc_service::new_native_or_wasm_executor(exec_params);
let execution = ExecutionStrategy::NativeElseWasm;
let mut results = Vec::new();
node/cli/Cargo.tomldiffbeforeafterboth--- a/node/cli/Cargo.toml
+++ b/node/cli/Cargo.toml
@@ -100,30 +100,8 @@
[features]
default = ["opal-runtime"]
-all-runtimes = [
- 'opal-runtime',
- 'quartz-runtime',
- 'unique-runtime',
-]
-pov-estimate = [
- 'opal-runtime/pov-estimate',
- 'quartz-runtime?/pov-estimate',
- 'uc-rpc/pov-estimate',
- 'unique-rpc/pov-estimate',
- 'unique-runtime?/pov-estimate',
-]
-runtime-benchmarks = [
- 'opal-runtime/runtime-benchmarks',
- 'polkadot-cli/runtime-benchmarks',
- 'polkadot-service/runtime-benchmarks',
- 'quartz-runtime?/runtime-benchmarks',
- 'sc-service/runtime-benchmarks',
- 'unique-runtime?/runtime-benchmarks',
-]
+all-runtimes = ['opal-runtime', 'quartz-runtime', 'unique-runtime']
+pov-estimate = ['opal-runtime/pov-estimate', 'quartz-runtime?/pov-estimate', 'uc-rpc/pov-estimate', 'unique-rpc/pov-estimate', 'unique-runtime?/pov-estimate']
+runtime-benchmarks = ['opal-runtime/runtime-benchmarks', 'polkadot-cli/runtime-benchmarks', 'polkadot-service/runtime-benchmarks', 'quartz-runtime?/runtime-benchmarks', 'sc-service/runtime-benchmarks', 'unique-runtime?/runtime-benchmarks']
sapphire-runtime = ['quartz-runtime', 'quartz-runtime/become-sapphire']
-try-runtime = [
- 'opal-runtime?/try-runtime',
- 'quartz-runtime?/try-runtime',
- 'try-runtime-cli/try-runtime',
- 'unique-runtime?/try-runtime',
-]
+try-runtime = ['opal-runtime?/try-runtime', 'quartz-runtime?/try-runtime', 'try-runtime-cli/try-runtime', 'unique-runtime?/try-runtime']
node/cli/src/command.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/>.1617// Original license18// This file is part of Substrate.1920// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.21// SPDX-License-Identifier: Apache-2.02223// Licensed under the Apache License, Version 2.0 (the "License");24// you may not use this file except in compliance with the License.25// You may obtain a copy of the License at26//27// http://www.apache.org/licenses/LICENSE-2.028//29// Unless required by applicable law or agreed to in writing, software30// distributed under the License is distributed on an "AS IS" BASIS,31// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.32// See the License for the specific language governing permissions and33// limitations under the License.3435use crate::{36 chain_spec::{self, RuntimeIdentification, ServiceId, ServiceIdentification},37 cli::{Cli, RelayChainCli, Subcommand},38 service::{new_partial, start_node, start_dev_node},39};40#[cfg(feature = "runtime-benchmarks")]41use crate::chain_spec::default_runtime;4243#[cfg(feature = "unique-runtime")]44use crate::service::UniqueRuntimeExecutor;4546#[cfg(feature = "quartz-runtime")]47use crate::service::QuartzRuntimeExecutor;4849use crate::service::OpalRuntimeExecutor;5051#[cfg(feature = "runtime-benchmarks")]52use crate::service::DefaultRuntimeExecutor;5354use codec::Encode;55use cumulus_primitives_core::ParaId;56use cumulus_client_cli::generate_genesis_block;57use log::info;58use sc_cli::{59 ChainSpec, CliConfiguration, DefaultConfigurationValues, ImportParams, KeystoreParams,60 NetworkParams, Result, RuntimeVersion, SharedParams, SubstrateCli,61};62use sc_service::{63 config::{BasePath, PrometheusConfig},64};65use sp_core::hexdisplay::HexDisplay;66use sp_runtime::traits::{AccountIdConversion, Block as BlockT};67use std::{net::SocketAddr, time::Duration};6869use up_common::types::opaque::{Block, RuntimeId};7071macro_rules! no_runtime_err {72 ($runtime_id:expr) => {73 format!(74 "No runtime valid runtime was found for chain {:#?}",75 $runtime_id76 )77 };78}7980fn load_spec(id: &str) -> std::result::Result<Box<dyn sc_service::ChainSpec>, String> {81 Ok(match id {82 "dev" => Box::new(chain_spec::development_config()),83 "" | "local" => Box::new(chain_spec::local_testnet_config()),84 path => {85 let path = std::path::PathBuf::from(path);86 let chain_spec = Box::new(chain_spec::OpalChainSpec::from_json_file(path.clone())?)87 as Box<dyn sc_service::ChainSpec>;8889 match chain_spec.runtime_id() {90 #[cfg(feature = "unique-runtime")]91 RuntimeId::Unique => Box::new(chain_spec::UniqueChainSpec::from_json_file(path)?),9293 #[cfg(feature = "quartz-runtime")]94 RuntimeId::Quartz => Box::new(chain_spec::QuartzChainSpec::from_json_file(path)?),9596 RuntimeId::Opal => chain_spec,97 runtime_id => return Err(no_runtime_err!(runtime_id)),98 }99 }100 })101}102103impl SubstrateCli for Cli {104 // TODO use args105 fn impl_name() -> String {106 format!("{} Node", Self::node_name())107 }108109 fn impl_version() -> String {110 env!("SUBSTRATE_CLI_IMPL_VERSION").into()111 }112 // TODO use args113 fn description() -> String {114 format!(115 "{} Node\n\nThe command-line arguments provided first will be \116 passed to the parachain node, while the arguments provided after -- will be passed \117 to the relaychain node.\n\n\118 {} [parachain-args] -- [relaychain-args]",119 Self::node_name(),120 Self::executable_name()121 )122 }123124 fn author() -> String {125 env!("CARGO_PKG_AUTHORS").into()126 }127128 //TODO use args129 fn support_url() -> String {130 "support@unique.network".into()131 }132133 fn copyright_start_year() -> i32 {134 2019135 }136137 fn load_spec(&self, id: &str) -> std::result::Result<Box<dyn sc_service::ChainSpec>, String> {138 load_spec(id)139 }140141 fn native_runtime_version(chain_spec: &Box<dyn ChainSpec>) -> &'static RuntimeVersion {142 match chain_spec.runtime_id() {143 #[cfg(feature = "unique-runtime")]144 RuntimeId::Unique => &unique_runtime::VERSION,145146 #[cfg(feature = "quartz-runtime")]147 RuntimeId::Quartz => &quartz_runtime::VERSION,148149 RuntimeId::Opal => &opal_runtime::VERSION,150 runtime_id => panic!("{}", no_runtime_err!(runtime_id)),151 }152 }153}154155impl SubstrateCli for RelayChainCli {156 // TODO use args157 fn impl_name() -> String {158 format!("{} Node", Cli::node_name())159 }160161 fn impl_version() -> String {162 env!("SUBSTRATE_CLI_IMPL_VERSION").into()163 }164 // TODO use args165 fn description() -> String {166 format!(167 "{} Node\n\nThe command-line arguments provided first will be \168 passed to the parachain node, while the arguments provided after -- will be passed \169 to the relaychain node.\n\n\170 parachain-collator [parachain-args] -- [relaychain-args]",171 Cli::node_name()172 )173 }174175 fn author() -> String {176 env!("CARGO_PKG_AUTHORS").into()177 }178 // TODO use args179 fn support_url() -> String {180 "support@unique.network".into()181 }182183 fn copyright_start_year() -> i32 {184 2019185 }186187 fn load_spec(&self, id: &str) -> std::result::Result<Box<dyn sc_service::ChainSpec>, String> {188 polkadot_cli::Cli::from_iter([RelayChainCli::executable_name()].iter()).load_spec(id)189 }190191 fn native_runtime_version(chain_spec: &Box<dyn ChainSpec>) -> &'static RuntimeVersion {192 polkadot_cli::Cli::native_runtime_version(chain_spec)193 }194}195196macro_rules! async_run_with_runtime {197 (198 $runtime_api:path, $executor:path,199 $runner:ident, $components:ident, $cli:ident, $cmd:ident, $config:ident,200 $( $code:tt )*201 ) => {202 $runner.async_run(|$config| {203 let $components = new_partial::<204 $runtime_api, $executor, _205 >(206 &$config,207 crate::service::parachain_build_import_queue,208 )?;209 let task_manager = $components.task_manager;210211 { $( $code )* }.map(|v| (v, task_manager))212 })213 };214}215216macro_rules! construct_async_run {217 (|$components:ident, $cli:ident, $cmd:ident, $config:ident| $( $code:tt )* ) => {{218 let runner = $cli.create_runner($cmd)?;219220 match runner.config().chain_spec.runtime_id() {221 #[cfg(feature = "unique-runtime")]222 RuntimeId::Unique => async_run_with_runtime!(223 unique_runtime::RuntimeApi, UniqueRuntimeExecutor,224 runner, $components, $cli, $cmd, $config, $( $code )*225 ),226227 #[cfg(feature = "quartz-runtime")]228 RuntimeId::Quartz => async_run_with_runtime!(229 quartz_runtime::RuntimeApi, QuartzRuntimeExecutor,230 runner, $components, $cli, $cmd, $config, $( $code )*231 ),232233 RuntimeId::Opal => async_run_with_runtime!(234 opal_runtime::RuntimeApi, OpalRuntimeExecutor,235 runner, $components, $cli, $cmd, $config, $( $code )*236 ),237238 runtime_id => Err(no_runtime_err!(runtime_id).into())239 }240 }}241}242243macro_rules! sync_run_with_runtime {244 (245 $runtime_api:path, $executor:path,246 $runner:ident, $components:ident, $cli:ident, $cmd:ident, $config:ident,247 $( $code:tt )*248 ) => {249 $runner.sync_run(|$config| {250 $( $code )*251 })252 };253}254255macro_rules! construct_sync_run {256 (|$components:ident, $cli:ident, $cmd:ident, $config:ident| $( $code:tt )* ) => {{257 let runner = $cli.create_runner($cmd)?;258259 match runner.config().chain_spec.runtime_id() {260 #[cfg(feature = "unique-runtime")]261 RuntimeId::Unique => sync_run_with_runtime!(262 unique_runtime::RuntimeApi, UniqueRuntimeExecutor,263 runner, $components, $cli, $cmd, $config, $( $code )*264 ),265266 #[cfg(feature = "quartz-runtime")]267 RuntimeId::Quartz => sync_run_with_runtime!(268 quartz_runtime::RuntimeApi, QuartzRuntimeExecutor,269 runner, $components, $cli, $cmd, $config, $( $code )*270 ),271272 RuntimeId::Opal => sync_run_with_runtime!(273 opal_runtime::RuntimeApi, OpalRuntimeExecutor,274 runner, $components, $cli, $cmd, $config, $( $code )*275 ),276277 runtime_id => Err(no_runtime_err!(runtime_id).into())278 }279 }}280}281282macro_rules! start_node_using_chain_runtime {283 ($start_node_fn:ident($config:expr $(, $($args:expr),+)?) $($code:tt)*) => {284 match $config.chain_spec.runtime_id() {285 #[cfg(feature = "unique-runtime")]286 RuntimeId::Unique => $start_node_fn::<287 unique_runtime::Runtime,288 unique_runtime::RuntimeApi,289 UniqueRuntimeExecutor,290 >($config $(, $($args),+)?) $($code)*,291292 #[cfg(feature = "quartz-runtime")]293 RuntimeId::Quartz => $start_node_fn::<294 quartz_runtime::Runtime,295 quartz_runtime::RuntimeApi,296 QuartzRuntimeExecutor,297 >($config $(, $($args),+)?) $($code)*,298299 RuntimeId::Opal => $start_node_fn::<300 opal_runtime::Runtime,301 opal_runtime::RuntimeApi,302 OpalRuntimeExecutor,303 >($config $(, $($args),+)?) $($code)*,304305 runtime_id => Err(no_runtime_err!(runtime_id).into()),306 }307 };308}309310/// Parse command line arguments into service configuration.311pub fn run() -> Result<()> {312 let cli = Cli::from_args();313314 match &cli.subcommand {315 Some(Subcommand::BuildSpec(cmd)) => {316 let runner = cli.create_runner(cmd)?;317 runner.sync_run(|config| cmd.run(config.chain_spec, config.network))318 }319 Some(Subcommand::CheckBlock(cmd)) => {320 construct_async_run!(|components, cli, cmd, config| {321 Ok(cmd.run(components.client, components.import_queue))322 })323 }324 Some(Subcommand::ExportBlocks(cmd)) => {325 construct_async_run!(|components, cli, cmd, config| {326 Ok(cmd.run(components.client, config.database))327 })328 }329 Some(Subcommand::ExportState(cmd)) => {330 construct_async_run!(|components, cli, cmd, config| {331 Ok(cmd.run(components.client, config.chain_spec))332 })333 }334 Some(Subcommand::ImportBlocks(cmd)) => {335 construct_async_run!(|components, cli, cmd, config| {336 Ok(cmd.run(components.client, components.import_queue))337 })338 }339 Some(Subcommand::PurgeChain(cmd)) => {340 let runner = cli.create_runner(cmd)?;341342 runner.sync_run(|config| {343 let polkadot_cli = RelayChainCli::new(344 &config,345 [RelayChainCli::executable_name()]346 .iter()347 .chain(cli.relaychain_args.iter()),348 );349350 let polkadot_config = SubstrateCli::create_configuration(351 &polkadot_cli,352 &polkadot_cli,353 config.tokio_handle.clone(),354 )355 .map_err(|err| format!("Relay chain argument error: {}", err))?;356357 cmd.run(config, polkadot_config)358 })359 }360 Some(Subcommand::Revert(cmd)) => construct_async_run!(|components, cli, cmd, config| {361 Ok(cmd.run(components.client, components.backend, None))362 }),363 Some(Subcommand::ExportGenesisState(cmd)) => {364 construct_sync_run!(|components, cli, cmd, _config| {365 let spec = cli.load_spec(&cmd.shared_params.chain.clone().unwrap_or_default())?;366 let state_version = Cli::native_runtime_version(&spec).state_version();367 cmd.run::<Block>(&*spec, state_version)368 })369 }370 Some(Subcommand::ExportGenesisWasm(cmd)) => {371 construct_sync_run!(|components, cli, cmd, _config| {372 let spec = cli.load_spec(&cmd.shared_params.chain.clone().unwrap_or_default())?;373 cmd.run(&*spec)374 })375 }376 #[cfg(feature = "runtime-benchmarks")]377 Some(Subcommand::Benchmark(cmd)) => {378 use frame_benchmarking_cli::{BenchmarkCmd, SUBSTRATE_REFERENCE_HARDWARE};379 let runner = cli.create_runner(cmd)?;380 // Switch on the concrete benchmark sub-command-381 match cmd {382 BenchmarkCmd::Pallet(cmd) => {383 runner.sync_run(|config| cmd.run::<Block, DefaultRuntimeExecutor>(config))384 }385 BenchmarkCmd::Block(cmd) => runner.sync_run(|config| {386 let partials = new_partial::<387 default_runtime::RuntimeApi,388 DefaultRuntimeExecutor,389 _,390 >(&config, crate::service::parachain_build_import_queue)?;391 cmd.run(partials.client)392 }),393 BenchmarkCmd::Storage(cmd) => runner.sync_run(|config| {394 let partials = new_partial::<395 default_runtime::RuntimeApi,396 DefaultRuntimeExecutor,397 _,398 >(&config, crate::service::parachain_build_import_queue)?;399 let db = partials.backend.expose_db();400 let storage = partials.backend.expose_storage();401402 cmd.run(config, partials.client.clone(), db, storage)403 }),404 BenchmarkCmd::Machine(cmd) => {405 runner.sync_run(|config| cmd.run(&config, SUBSTRATE_REFERENCE_HARDWARE.clone()))406 }407 BenchmarkCmd::Overhead(_) | BenchmarkCmd::Extrinsic(_) => {408 Err("Unsupported benchmarking command".into())409 }410 }411 }412 #[cfg(feature = "try-runtime")]413 Some(Subcommand::TryRuntime(cmd)) => {414 use std::{future::Future, pin::Pin};415 use sc_executor::{sp_wasm_interface::ExtendedHostFunctions, NativeExecutionDispatch};416 use try_runtime_cli::block_building_info::timestamp_with_aura_info;417418 let runner = cli.create_runner(cmd)?;419420 // grab the task manager.421 let registry = &runner422 .config()423 .prometheus_config424 .as_ref()425 .map(|cfg| &cfg.registry);426 let task_manager =427 sc_service::TaskManager::new(runner.config().tokio_handle.clone(), *registry)428 .map_err(|e| format!("Error: {:?}", e))?;429 let info_provider = Some(timestamp_with_aura_info(12000));430431 runner.async_run(|config| -> Result<(Pin<Box<dyn Future<Output = _>>>, _)> {432 Ok((433 match config.chain_spec.runtime_id() {434 #[cfg(feature = "unique-runtime")]435 RuntimeId::Unique => Box::pin(cmd.run::<Block, ExtendedHostFunctions<436 sp_io::SubstrateHostFunctions,437 <UniqueRuntimeExecutor as NativeExecutionDispatch>::ExtendHostFunctions,438 >, _>(info_provider)),439440 #[cfg(feature = "quartz-runtime")]441 RuntimeId::Quartz => Box::pin(cmd.run::<Block, ExtendedHostFunctions<442 sp_io::SubstrateHostFunctions,443 <QuartzRuntimeExecutor as NativeExecutionDispatch>::ExtendHostFunctions,444 >, _>(info_provider)),445446 RuntimeId::Opal => Box::pin(cmd.run::<Block, ExtendedHostFunctions<447 sp_io::SubstrateHostFunctions,448 <OpalRuntimeExecutor as NativeExecutionDispatch>::ExtendHostFunctions,449 >, _>(info_provider)),450 runtime_id => return Err(no_runtime_err!(runtime_id).into()),451 },452 task_manager,453 ))454 })455 }456 #[cfg(not(feature = "try-runtime"))]457 Some(Subcommand::TryRuntime) => {458 Err("Try-runtime must be enabled by `--features try-runtime`.".into())459 }460 None => {461 let runner = cli.create_runner(&cli.run.normalize())?;462 let collator_options = cli.run.collator_options();463464 runner.run_node_until_exit(|config| async move {465 let hwbench = if !cli.no_hardware_benchmarks {466 config.database.path().map(|database_path| {467 let _ = std::fs::create_dir_all(&database_path);468 sc_sysinfo::gather_hwbench(Some(database_path))469 })470 } else {471 None472 };473474 let extensions = chain_spec::Extensions::try_get(&*config.chain_spec);475476 let service_id = config.chain_spec.service_id();477 let relay_chain_id = extensions.map(|e| e.relay_chain.clone());478 let is_dev_service = matches![service_id, ServiceId::Dev]479 || relay_chain_id == Some("dev-service".into());480481 if is_dev_service {482 info!("Running Dev service");483484 let autoseal_interval = Duration::from_millis(cli.idle_autoseal_interval);485486 let mut config = config;487488 config.state_pruning = Some(sc_service::PruningMode::ArchiveAll);489490 return start_node_using_chain_runtime! {491 start_dev_node(config, autoseal_interval).map_err(Into::into)492 };493 };494495 let para_id = extensions496 .map(|e| e.para_id)497 .ok_or("Could not find parachain ID in chain-spec.")?;498499 let polkadot_cli = RelayChainCli::new(500 &config,501 [RelayChainCli::executable_name()]502 .iter()503 .chain(cli.relaychain_args.iter()),504 );505506 let para_id = ParaId::from(para_id);507508 let parachain_account = AccountIdConversion::<polkadot_primitives::v2::AccountId>::into_account_truncating(¶_id);509510 let state_version =511 RelayChainCli::native_runtime_version(&config.chain_spec).state_version();512 let block: Block = generate_genesis_block(&*config.chain_spec, state_version)513 .map_err(|e| format!("{:?}", e))?;514 let genesis_state = format!("0x{:?}", HexDisplay::from(&block.header().encode()));515 let genesis_hash = format!("0x{:?}", HexDisplay::from(&block.header().hash().0));516517 let polkadot_config = SubstrateCli::create_configuration(518 &polkadot_cli,519 &polkadot_cli,520 config.tokio_handle.clone(),521 )522 .map_err(|err| format!("Relay chain argument error: {}", err))?;523524 info!("Parachain id: {:?}", para_id);525 info!("Parachain Account: {}", parachain_account);526 info!("Parachain genesis state: {}", genesis_state);527 info!("Parachain genesis hash: {}", genesis_hash);528 info!(529 "Is collating: {}",530 if config.role.is_authority() {531 "yes"532 } else {533 "no"534 }535 );536537 start_node_using_chain_runtime! {538 start_node(config, polkadot_config, collator_options, para_id, hwbench)539 .await540 .map(|r| r.0)541 .map_err(Into::into)542 }543 })544 }545 }546}547548impl DefaultConfigurationValues for RelayChainCli {549 fn p2p_listen_port() -> u16 {550 30334551 }552553 fn rpc_ws_listen_port() -> u16 {554 9945555 }556557 fn rpc_http_listen_port() -> u16 {558 9934559 }560561 fn prometheus_listen_port() -> u16 {562 9616563 }564}565566impl CliConfiguration<Self> for RelayChainCli {567 fn shared_params(&self) -> &SharedParams {568 self.base.base.shared_params()569 }570571 fn import_params(&self) -> Option<&ImportParams> {572 self.base.base.import_params()573 }574575 fn network_params(&self) -> Option<&NetworkParams> {576 self.base.base.network_params()577 }578579 fn keystore_params(&self) -> Option<&KeystoreParams> {580 self.base.base.keystore_params()581 }582583 fn base_path(&self) -> Result<Option<BasePath>> {584 Ok(self585 .shared_params()586 .base_path()?587 .or_else(|| self.base_path.clone().map(Into::into)))588 }589590 fn rpc_http(&self, default_listen_port: u16) -> Result<Option<SocketAddr>> {591 self.base.base.rpc_http(default_listen_port)592 }593594 fn rpc_ipc(&self) -> Result<Option<String>> {595 self.base.base.rpc_ipc()596 }597598 fn rpc_ws(&self, default_listen_port: u16) -> Result<Option<SocketAddr>> {599 self.base.base.rpc_ws(default_listen_port)600 }601602 fn prometheus_config(603 &self,604 default_listen_port: u16,605 chain_spec: &Box<dyn ChainSpec>,606 ) -> Result<Option<PrometheusConfig>> {607 self.base608 .base609 .prometheus_config(default_listen_port, chain_spec)610 }611612 fn init<F>(613 &self,614 _support_url: &String,615 _impl_version: &String,616 _logger_hook: F,617 _config: &sc_service::Configuration,618 ) -> Result<()> {619 unreachable!("PolkadotCli is never initialized; qed");620 }621622 fn chain_id(&self, is_dev: bool) -> Result<String> {623 let chain_id = self.base.base.chain_id(is_dev)?;624625 Ok(if chain_id.is_empty() {626 self.chain_id.clone().unwrap_or_default()627 } else {628 chain_id629 })630 }631632 fn role(&self, is_dev: bool) -> Result<sc_service::Role> {633 self.base.base.role(is_dev)634 }635636 fn transaction_pool(&self, is_dev: bool) -> Result<sc_service::config::TransactionPoolOptions> {637 self.base.base.transaction_pool(is_dev)638 }639640 fn rpc_methods(&self) -> Result<sc_service::config::RpcMethods> {641 self.base.base.rpc_methods()642 }643644 fn rpc_ws_max_connections(&self) -> Result<Option<usize>> {645 self.base.base.rpc_ws_max_connections()646 }647648 fn rpc_cors(&self, is_dev: bool) -> Result<Option<Vec<String>>> {649 self.base.base.rpc_cors(is_dev)650 }651652 fn default_heap_pages(&self) -> Result<Option<u64>> {653 self.base.base.default_heap_pages()654 }655656 fn force_authoring(&self) -> Result<bool> {657 self.base.base.force_authoring()658 }659660 fn disable_grandpa(&self) -> Result<bool> {661 self.base.base.disable_grandpa()662 }663664 fn max_runtime_instances(&self) -> Result<Option<usize>> {665 self.base.base.max_runtime_instances()666 }667668 fn announce_block(&self) -> Result<bool> {669 self.base.base.announce_block()670 }671672 fn telemetry_endpoints(673 &self,674 chain_spec: &Box<dyn ChainSpec>,675 ) -> Result<Option<sc_telemetry::TelemetryEndpoints>> {676 self.base.base.telemetry_endpoints(chain_spec)677 }678}node/cli/src/service.rsdiffbeforeafterboth--- a/node/cli/src/service.rs
+++ b/node/cli/src/service.rs
@@ -26,6 +26,7 @@
stream::select,
task::{Context, Poll},
};
+use sp_keystore::KeystorePtr;
use tokio::time::Interval;
use unique_rpc::overrides_handle;
@@ -55,7 +56,6 @@
use sc_network_sync::SyncingService;
use sc_service::{BasePath, Configuration, PartialComponents, TaskManager};
use sc_telemetry::{Telemetry, TelemetryHandle, TelemetryWorker, TelemetryWorkerHandle};
-use sp_keystore::SyncCryptoStorePtr;
use sp_runtime::traits::BlakeTwo256;
use substrate_prometheus_endpoint::Registry;
use sc_client_api::BlockchainEvents;
@@ -270,12 +270,7 @@
})
.transpose()?;
- let executor = NativeElseWasmExecutor::<ExecutorDispatch>::new(
- config.wasm_method,
- config.default_heap_pages,
- config.max_runtime_instances,
- config.runtime_cache_size,
- );
+ let executor = sc_service::new_native_or_wasm_executor(config);
let (client, backend, keystore_container, task_manager) =
sc_service::new_full_parts::<Block, RuntimeApi, _>(
@@ -366,6 +361,14 @@
}
}
+macro_rules! clone {
+ ($($i:ident),* $(,)?) => {
+ $(
+ let $i = $i.clone();
+ )*
+ };
+}
+
/// Start a node with the given parachain `Configuration` and relay chain `Configuration`.
///
/// This is the actual implementation that is abstract over the executor and the runtime api.
@@ -422,7 +425,7 @@
Arc<dyn RelayChainInterface>,
Arc<sc_transaction_pool::FullPool<Block, FullClient<RuntimeApi, ExecutorDispatch>>>,
Arc<SyncingService<Block>>,
- SyncCryptoStorePtr,
+ KeystorePtr,
bool,
) -> Result<Box<dyn ParachainConsensus<Block>>, sc_service::Error>,
{
@@ -469,13 +472,7 @@
warp_sync_params: None,
})?;
- let rpc_client = client.clone();
- let rpc_pool = transaction_pool.clone();
let select_chain = params.select_chain.clone();
- let rpc_network = network.clone();
- let rpc_sync_service = sync_service.clone();
-
- let rpc_frontier_backend = frontier_backend.clone();
let block_data_cache = Arc::new(fc_rpc::EthBlockDataCacheTask::new(
task_manager.spawn_handle(),
@@ -485,9 +482,14 @@
prometheus_registry.clone(),
));
+ let pubsub_notification_sinks: fc_mapping_sync::EthereumBlockNotificationSinks<
+ fc_mapping_sync::EthereumBlockNotification<Block>,
+ > = Default::default();
+ let pubsub_notification_sinks = Arc::new(pubsub_notification_sinks);
+
task_manager.spawn_essential_handle().spawn(
"frontier-mapping-sync-worker",
- None,
+ Some("frontier"),
MappingSyncWorker::new(
client.import_notification_stream(),
Duration::new(6, 0),
@@ -498,55 +500,83 @@
3,
0,
SyncStrategy::Normal,
+ sync_service.clone(),
+ pubsub_notification_sinks.clone(),
)
.for_each(|()| futures::future::ready(())),
);
- #[cfg(feature = "pov-estimate")]
- let rpc_backend = backend.clone();
+ let runtime_id = parachain_config.chain_spec.runtime_id();
+
+ let rpc_builder = Box::new({
+ clone!(
+ client,
+ backend,
+ pubsub_notification_sinks,
+ transaction_pool,
+ network,
+ sync_service,
+ frontier_backend,
+ );
+ move |deny_unsafe, subscription_task_executor| {
+ clone!(
+ backend,
+ runtime_id,
+ client,
+ transaction_pool,
+ filter_pool,
+ network,
+ select_chain,
+ block_data_cache,
+ fee_history_cache,
+ pubsub_notification_sinks,
+ frontier_backend,
+ );
- let runtime_id = parachain_config.chain_spec.runtime_id();
+ #[cfg(not(feature = "pov-estimate"))]
+ let _ = backend;
- let rpc_builder = Box::new(move |deny_unsafe, subscription_task_executor| {
- let full_deps = unique_rpc::FullDeps {
- runtime_id: runtime_id.clone(),
+ let full_deps = unique_rpc::FullDeps {
+ runtime_id,
- #[cfg(feature = "pov-estimate")]
- exec_params: uc_rpc::pov_estimate::ExecutorParams {
- wasm_method: parachain_config.wasm_method,
- default_heap_pages: parachain_config.default_heap_pages,
- max_runtime_instances: parachain_config.max_runtime_instances,
- runtime_cache_size: parachain_config.runtime_cache_size,
- },
+ #[cfg(feature = "pov-estimate")]
+ exec_params: uc_rpc::pov_estimate::ExecutorParams {
+ wasm_method: parachain_config.wasm_method,
+ default_heap_pages: parachain_config.default_heap_pages,
+ max_runtime_instances: parachain_config.max_runtime_instances,
+ runtime_cache_size: parachain_config.runtime_cache_size,
+ },
- #[cfg(feature = "pov-estimate")]
- backend: rpc_backend.clone(),
+ #[cfg(feature = "pov-estimate")]
+ backend,
- eth_backend: rpc_frontier_backend.clone(),
- deny_unsafe,
- client: rpc_client.clone(),
- pool: rpc_pool.clone(),
- graph: rpc_pool.pool().clone(),
- // TODO: Unhardcode
- enable_dev_signer: false,
- filter_pool: filter_pool.clone(),
- network: rpc_network.clone(),
- sync: rpc_sync_service.clone(),
- select_chain: select_chain.clone(),
- is_authority: validator,
- // TODO: Unhardcode
- max_past_logs: 10000,
- block_data_cache: block_data_cache.clone(),
- fee_history_cache: fee_history_cache.clone(),
- // TODO: Unhardcode
- fee_history_limit: 2048,
- };
+ eth_backend: frontier_backend,
+ deny_unsafe,
+ client,
+ graph: transaction_pool.pool().clone(),
+ pool: transaction_pool,
+ // TODO: Unhardcode
+ enable_dev_signer: false,
+ filter_pool,
+ network,
+ sync: sync_service.clone(),
+ select_chain,
+ is_authority: validator,
+ // TODO: Unhardcode
+ max_past_logs: 10000,
+ block_data_cache,
+ fee_history_cache,
+ // TODO: Unhardcode
+ fee_history_limit: 2048,
+ pubsub_notification_sinks,
+ };
- unique_rpc::create_full::<_, _, _, _, Runtime, RuntimeApi, _>(
- full_deps,
- subscription_task_executor,
- )
- .map_err(Into::into)
+ unique_rpc::create_full::<_, _, _, _, Runtime, RuntimeApi, _>(
+ full_deps,
+ subscription_task_executor,
+ )
+ .map_err(Into::into)
+ }
});
sc_service::spawn_tasks(sc_service::SpawnTasksParams {
@@ -555,7 +585,7 @@
transaction_pool: transaction_pool.clone(),
task_manager: &mut task_manager,
config: parachain_config,
- keystore: params.keystore_container.sync_keystore(),
+ keystore: params.keystore_container.keystore(),
backend: backend.clone(),
network: network.clone(),
sync_service: sync_service.clone(),
@@ -600,7 +630,7 @@
relay_chain_interface.clone(),
transaction_pool,
sync_service.clone(),
- params.keystore_container.sync_keystore(),
+ params.keystore_container.keystore(),
force_authoring,
)?;
@@ -619,6 +649,7 @@
relay_chain_interface,
relay_chain_slot_duration,
recovery_handle: Box::new(overseer_handle),
+ sync_service,
};
start_collator(params).await?;
@@ -632,6 +663,7 @@
relay_chain_interface,
relay_chain_slot_duration,
recovery_handle: Box::new(overseer_handle),
+ sync_service,
};
start_full_node(params)?;
@@ -897,6 +929,11 @@
prometheus_registry.clone(),
));
+ let pubsub_notification_sinks: fc_mapping_sync::EthereumBlockNotificationSinks<
+ fc_mapping_sync::EthereumBlockNotification<Block>,
+ > = Default::default();
+ let pubsub_notification_sinks = Arc::new(pubsub_notification_sinks);
+
let (network, system_rpc_tx, tx_handler_controller, network_starter, sync_service) =
sc_service::build_network(sc_service::BuildNetworkParams {
config: &config,
@@ -1026,67 +1063,88 @@
3,
0,
SyncStrategy::Normal,
+ sync_service.clone(),
+ pubsub_notification_sinks.clone(),
)
.for_each(|()| futures::future::ready(())),
);
-
- let rpc_client = client.clone();
- let rpc_pool = transaction_pool.clone();
- let rpc_network = network.clone();
- let rpc_sync_service = sync_service.clone();
- let rpc_frontier_backend = frontier_backend.clone();
#[cfg(feature = "pov-estimate")]
let rpc_backend = backend.clone();
let runtime_id = config.chain_spec.runtime_id();
- let rpc_builder = Box::new(move |deny_unsafe, subscription_executor| {
- let full_deps = unique_rpc::FullDeps {
- runtime_id: runtime_id.clone(),
+ let rpc_builder = Box::new({
+ clone!(
+ backend,
+ client,
+ sync_service,
+ frontier_backend,
+ network,
+ transaction_pool,
+ pubsub_notification_sinks
+ );
+ move |deny_unsafe, subscription_executor| {
+ clone!(
+ backend,
+ block_data_cache,
+ client,
+ fee_history_cache,
+ filter_pool,
+ network,
+ pubsub_notification_sinks,
+ );
+
+ #[cfg(not(feature = "pov-estimate"))]
+ let _ = backend;
+
+ let full_deps = unique_rpc::FullDeps {
+ runtime_id: runtime_id.clone(),
- #[cfg(feature = "pov-estimate")]
- exec_params: uc_rpc::pov_estimate::ExecutorParams {
- wasm_method: config.wasm_method,
- default_heap_pages: config.default_heap_pages,
- max_runtime_instances: config.max_runtime_instances,
- runtime_cache_size: config.runtime_cache_size,
- },
+ #[cfg(feature = "pov-estimate")]
+ exec_params: uc_rpc::pov_estimate::ExecutorParams {
+ wasm_method: config.wasm_method,
+ default_heap_pages: config.default_heap_pages,
+ max_runtime_instances: config.max_runtime_instances,
+ runtime_cache_size: config.runtime_cache_size,
+ },
- #[cfg(feature = "pov-estimate")]
- backend: rpc_backend.clone(),
- eth_backend: rpc_frontier_backend.clone(),
- deny_unsafe,
- client: rpc_client.clone(),
- pool: rpc_pool.clone(),
- graph: rpc_pool.pool().clone(),
- // TODO: Unhardcode
- enable_dev_signer: false,
- filter_pool: filter_pool.clone(),
- network: rpc_network.clone(),
- sync: rpc_sync_service.clone(),
- select_chain: select_chain.clone(),
- is_authority: collator,
- // TODO: Unhardcode
- max_past_logs: 10000,
- block_data_cache: block_data_cache.clone(),
- fee_history_cache: fee_history_cache.clone(),
- // TODO: Unhardcode
- fee_history_limit: 2048,
- };
+ #[cfg(feature = "pov-estimate")]
+ backend,
+ eth_backend: frontier_backend.clone(),
+ deny_unsafe,
+ client,
+ pool: transaction_pool.clone(),
+ graph: transaction_pool.pool().clone(),
+ // TODO: Unhardcode
+ enable_dev_signer: false,
+ filter_pool,
+ network,
+ sync: sync_service.clone(),
+ select_chain: select_chain.clone(),
+ is_authority: collator,
+ // TODO: Unhardcode
+ max_past_logs: 10000,
+ block_data_cache,
+ fee_history_cache,
+ // TODO: Unhardcode
+ fee_history_limit: 2048,
+ pubsub_notification_sinks,
+ };
- unique_rpc::create_full::<_, _, _, _, Runtime, RuntimeApi, _>(
- full_deps,
- subscription_executor,
- )
- .map_err(Into::into)
+ unique_rpc::create_full::<_, _, _, _, Runtime, RuntimeApi, _>(
+ full_deps,
+ subscription_executor,
+ )
+ .map_err(Into::into)
+ }
});
sc_service::spawn_tasks(sc_service::SpawnTasksParams {
network,
sync_service,
client,
- keystore: keystore_container.sync_keystore(),
+ keystore: keystore_container.keystore(),
task_manager: &mut task_manager,
transaction_pool,
rpc_builder,
node/rpc/Cargo.tomldiffbeforeafterboth--- a/node/rpc/Cargo.toml
+++ b/node/rpc/Cargo.toml
@@ -30,6 +30,7 @@
fc-db = { workspace = true }
fc-rpc = { workspace = true }
fc-rpc-core = { workspace = true }
+fc-mapping-sync = { workspace = true }
fp-rpc = { workspace = true }
fp-storage = { workspace = true }
node/rpc/src/lib.rsdiffbeforeafterboth--- a/node/rpc/src/lib.rs
+++ b/node/rpc/src/lib.rs
@@ -102,6 +102,12 @@
pub fee_history_cache: FeeHistoryCache,
/// Cache for Ethereum block data.
pub block_data_cache: Arc<EthBlockDataCacheTask<Block>>,
+
+ pub pubsub_notification_sinks: Arc<
+ fc_mapping_sync::EthereumBlockNotificationSinks<
+ fc_mapping_sync::EthereumBlockNotification<Block>,
+ >,
+ >,
}
pub fn overrides_handle<C, BE, R>(client: Arc<C>) -> Arc<OverrideHandle<Block>>
@@ -214,6 +220,7 @@
eth_backend,
max_past_logs,
+ pubsub_notification_sinks,
} = deps;
io.merge(System::new(Arc::clone(&client), Arc::clone(&pool), deny_unsafe).into_rpc())?;
@@ -244,6 +251,7 @@
fee_history_cache,
fee_history_limit,
execute_gas_limit_multiplier,
+ None,
)
.into_rpc(),
)?;
@@ -290,7 +298,17 @@
io.merge(Web3::new(client.clone()).into_rpc())?;
- io.merge(EthPubSub::new(pool, client, sync, subscription_task_executor, overrides).into_rpc())?;
+ io.merge(
+ EthPubSub::new(
+ pool,
+ client,
+ sync,
+ subscription_task_executor,
+ overrides,
+ pubsub_notification_sinks,
+ )
+ .into_rpc(),
+ )?;
Ok(io)
}