difftreelog
feat add PoV estimate
in: master
19 files changed
Cargo.lockdiffbeforeafterboth--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5362,6 +5362,7 @@
"substrate-wasm-builder",
"up-common",
"up-data-structs",
+ "up-pov-estimate-rpc",
"up-rpc",
"up-sponsorship",
"xcm",
@@ -5806,6 +5807,7 @@
"sp-runtime",
"sp-std",
"up-data-structs",
+ "up-pov-estimate-rpc",
]
[[package]]
@@ -8917,6 +8919,7 @@
"substrate-wasm-builder",
"up-common",
"up-data-structs",
+ "up-pov-estimate-rpc",
"up-rpc",
"up-sponsorship",
"xcm",
@@ -12824,18 +12827,31 @@
dependencies = [
"anyhow",
"app-promotion-rpc",
+ "frame-benchmarking",
"jsonrpsee",
+ "opal-runtime",
"pallet-common",
"pallet-evm",
"parity-scale-codec 3.2.1",
+ "quartz-runtime",
"rmrk-rpc",
+ "sc-client-api",
+ "sc-executor",
+ "sc-rpc-api",
+ "sc-service",
"sp-api",
"sp-blockchain",
"sp-core",
+ "sp-externalities",
"sp-rpc",
"sp-runtime",
+ "sp-state-machine",
+ "unique-runtime",
+ "up-common",
"up-data-structs",
+ "up-pov-estimate-rpc",
"up-rpc",
+ "zstd",
]
[[package]]
@@ -12978,10 +12994,12 @@
"substrate-prometheus-endpoint",
"tokio",
"try-runtime-cli",
+ "uc-rpc",
"unique-rpc",
"unique-runtime",
"up-common",
"up-data-structs",
+ "up-pov-estimate-rpc",
"up-rpc",
]
@@ -13032,6 +13050,7 @@
"uc-rpc",
"up-common",
"up-data-structs",
+ "up-pov-estimate-rpc",
"up-rpc",
]
@@ -13125,6 +13144,7 @@
"substrate-wasm-builder",
"up-common",
"up-data-structs",
+ "up-pov-estimate-rpc",
"up-rpc",
"up-sponsorship",
"xcm",
@@ -13194,6 +13214,19 @@
]
[[package]]
+name = "up-pov-estimate-rpc"
+version = "0.1.0"
+dependencies = [
+ "parity-scale-codec 3.2.1",
+ "scale-info",
+ "serde",
+ "sp-api",
+ "sp-core",
+ "sp-runtime",
+ "sp-std",
+]
+
+[[package]]
name = "up-rpc"
version = "0.1.3"
dependencies = [
client/rpc/Cargo.tomldiffbeforeafterboth--- a/client/rpc/Cargo.toml
+++ b/client/rpc/Cargo.toml
@@ -7,16 +7,40 @@
[dependencies]
pallet-common = { default-features = false, path = '../../pallets/common' }
up-data-structs = { default-features = false, path = '../../primitives/data-structs' }
+up-common = { default-features = false, path = '../../primitives/common' }
up-rpc = { path = "../../primitives/rpc" }
app-promotion-rpc = { path = "../../primitives/app_promotion_rpc" }
rmrk-rpc = { path = "../../primitives/rmrk-rpc" }
+up-pov-estimate-rpc = { path = "../../primitives/pov-estimate-rpc", optional = true }
codec = { package = "parity-scale-codec", version = "3.1.2" }
jsonrpsee = { version = "0.16.2", features = ["server", "macros"] }
anyhow = "1.0.57"
+zstd = { version = "0.11.2", default-features = false }
+sc-rpc-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
+sc-service = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
+sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
+sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
+sp-externalities = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
sp-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
sp-blockchain = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
sp-rpc = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.36" }
+
+frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
+
+sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
+
+unique-runtime = { path = '../../runtime/unique', optional = true }
+quartz-runtime = { path = '../../runtime/quartz', optional = true }
+opal-runtime = { path = '../../runtime/opal' }
+
+[features]
+pov-estimate = [
+ 'up-pov-estimate-rpc',
+ 'unique-runtime?/pov-estimate',
+ 'quartz-runtime?/pov-estimate',
+ 'opal-runtime/pov-estimate',
+]
client/rpc/src/lib.rsdiffbeforeafterboth--- a/client/rpc/src/lib.rs
+++ b/client/rpc/src/lib.rs
@@ -42,6 +42,9 @@
pub use app_promotion_unique_rpc::AppPromotionApiServer;
pub use rmrk_unique_rpc::RmrkApiServer;
+#[cfg(feature = "pov-estimate")]
+pub mod pov_estimate;
+
#[rpc(server)]
#[async_trait]
pub trait UniqueApi<BlockHash, CrossAccountId, AccountId> {
@@ -420,17 +423,18 @@
}
}
+#[macro_export]
macro_rules! define_struct_for_server_api {
- ($name:ident) => {
- pub struct $name<C, P> {
- client: Arc<C>,
- _marker: std::marker::PhantomData<P>,
+ ($name:ident { $($arg:ident: $arg_ty:ty),+ $(,)? }) => {
+ pub struct $name<Client, Block: BlockT> {
+ $($arg: $arg_ty),+,
+ _marker: std::marker::PhantomData<Block>,
}
- impl<C, P> $name<C, P> {
- pub fn new(client: Arc<C>) -> Self {
+ impl<Client, Block: BlockT> $name<Client, Block> {
+ pub fn new($($arg: $arg_ty),+) -> Self {
Self {
- client,
+ $($arg),+,
_marker: Default::default(),
}
}
@@ -438,9 +442,23 @@
};
}
-define_struct_for_server_api!(Unique);
-define_struct_for_server_api!(AppPromotion);
-define_struct_for_server_api!(Rmrk);
+define_struct_for_server_api! {
+ Unique {
+ client: Arc<Client>
+ }
+}
+
+define_struct_for_server_api! {
+ AppPromotion {
+ client: Arc<Client>
+ }
+}
+
+define_struct_for_server_api! {
+ Rmrk {
+ client: Arc<Client>
+ }
+}
macro_rules! pass_method {
(
client/rpc/src/pov_estimate.rsdiffbeforeafterboth--- /dev/null
+++ b/client/rpc/src/pov_estimate.rs
@@ -0,0 +1,205 @@
+// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.
+// This file is part of Unique Network.
+
+// Unique Network is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Unique Network is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
+
+use std::sync::Arc;
+
+use codec::Encode;
+
+use up_pov_estimate_rpc::{PovEstimateApi as PovEstimateRuntimeApi};
+use up_common::types::opaque::RuntimeId;
+
+use sc_service::{NativeExecutionDispatch, config::ExecutionStrategy};
+use sp_state_machine::{StateMachine, TrieBackendBuilder};
+
+use jsonrpsee::{
+ core::RpcResult as Result,
+ proc_macros::rpc,
+};
+use anyhow::anyhow;
+
+use sc_client_api::backend::Backend;
+use sp_blockchain::HeaderBackend;
+use sp_api::{AsTrieBackend, BlockId, BlockT, ProvideRuntimeApi};
+
+use sc_executor::NativeElseWasmExecutor;
+use sc_rpc_api::DenyUnsafe;
+
+use sp_runtime::traits::Header;
+
+use up_pov_estimate_rpc::PovInfo;
+
+use crate::define_struct_for_server_api;
+
+type HasherOf<Block> = <<Block as BlockT>::Header as Header>::Hashing;
+type StateOf<Block> = <sc_service::TFullBackend<Block> as Backend<Block>>::State;
+
+pub struct ExecutorParams {
+ pub wasm_method: sc_service::config::WasmExecutionMethod,
+ pub default_heap_pages: Option<u64>,
+ pub max_runtime_instances: usize,
+ pub runtime_cache_size: u8,
+}
+
+#[cfg(feature = "unique-runtime")]
+pub struct UniqueRuntimeExecutor;
+
+#[cfg(feature = "quartz-runtime")]
+pub struct QuartzRuntimeExecutor;
+
+pub struct OpalRuntimeExecutor;
+
+#[cfg(feature = "unique-runtime")]
+impl NativeExecutionDispatch for UniqueRuntimeExecutor {
+ type ExtendHostFunctions = frame_benchmarking::benchmarking::HostFunctions;
+
+ fn dispatch(method: &str, data: &[u8]) -> Option<Vec<u8>> {
+ unique_runtime::api::dispatch(method, data)
+ }
+
+ fn native_version() -> sc_executor::NativeVersion {
+ unique_runtime::native_version()
+ }
+}
+
+#[cfg(feature = "quartz-runtime")]
+impl NativeExecutionDispatch for QuartzRuntimeExecutor {
+ type ExtendHostFunctions = frame_benchmarking::benchmarking::HostFunctions;
+
+ fn dispatch(method: &str, data: &[u8]) -> Option<Vec<u8>> {
+ quartz_runtime::api::dispatch(method, data)
+ }
+
+ fn native_version() -> sc_executor::NativeVersion {
+ quartz_runtime::native_version()
+ }
+}
+
+impl NativeExecutionDispatch for OpalRuntimeExecutor {
+ type ExtendHostFunctions = frame_benchmarking::benchmarking::HostFunctions;
+
+ fn dispatch(method: &str, data: &[u8]) -> Option<Vec<u8>> {
+ opal_runtime::api::dispatch(method, data)
+ }
+
+ fn native_version() -> sc_executor::NativeVersion {
+ opal_runtime::native_version()
+ }
+}
+
+#[cfg(feature = "pov-estimate")]
+define_struct_for_server_api! {
+ PovEstimate {
+ client: Arc<Client>,
+ backend: Arc<sc_service::TFullBackend<Block>>,
+ deny_unsafe: DenyUnsafe,
+ exec_params: ExecutorParams,
+ runtime_id: RuntimeId,
+ }
+}
+
+#[rpc(server)]
+#[async_trait]
+pub trait PovEstimateApi<BlockHash> {
+ #[method(name = "unique_povEstimate")]
+ fn pov_estimate(&self, encoded_xt: Vec<u8>, at: Option<BlockHash>) -> Result<PovInfo>;
+}
+
+#[allow(deprecated)]
+#[cfg(feature = "pov-estimate")]
+impl<C, Block>
+ PovEstimateApiServer<<Block as BlockT>::Hash> for PovEstimate<C, Block>
+where
+ Block: BlockT,
+ C: 'static + ProvideRuntimeApi<Block> + HeaderBackend<Block>,
+ C::Api: PovEstimateRuntimeApi<Block>,
+{
+ fn pov_estimate(&self, encoded_xt: Vec<u8>, at: Option<<Block as BlockT>::Hash>,) -> Result<PovInfo> {
+ self.deny_unsafe.check_if_safe()?;
+
+ let at = BlockId::<Block>::hash(at.unwrap_or_else(|| self.client.info().best_hash));
+ let state = self.backend.state_at(at).map_err(|_| anyhow!("unable to fetch the state at {at:?}"))?;
+ match &self.runtime_id {
+ #[cfg(feature = "unique-runtime")]
+ RuntimeId::Unique => execute_extrinsic_in_sandbox::<Block, UniqueRuntimeExecutor>(state, &self.exec_params, encoded_xt),
+
+ #[cfg(feature = "quartz-runtime")]
+ RuntimeId::Quartz => execute_extrinsic_in_sandbox::<Block, QuartzRuntimeExecutor>(state, &self.exec_params, encoded_xt),
+
+ RuntimeId::Opal => execute_extrinsic_in_sandbox::<Block, OpalRuntimeExecutor>(state, &self.exec_params, encoded_xt),
+
+ runtime_id => Err(anyhow!("unknown runtime id {:?}", runtime_id).into()),
+ }
+ }
+}
+
+fn execute_extrinsic_in_sandbox<Block, D>(state: StateOf<Block>, exec_params: &ExecutorParams, encoded_xt: Vec<u8>) -> Result<PovInfo>
+where
+ Block: BlockT,
+ D: NativeExecutionDispatch + 'static,
+{
+ let backend = state.as_trie_backend().clone();
+ let mut changes = Default::default();
+ let runtime_code_backend = sp_state_machine::backend::BackendRuntimeCode::new(backend);
+
+ let proving_backend =
+ TrieBackendBuilder::wrap(&backend).with_recorder(Default::default()).build();
+
+ let runtime_code = runtime_code_backend.runtime_code()
+ .map_err(|_| anyhow!("runtime code backend creation failed"))?;
+
+ 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 execution = ExecutionStrategy::NativeElseWasm;
+
+ StateMachine::new(
+ &proving_backend,
+ &mut changes,
+ &executor,
+ "PovEstimateApi_pov_estimate",
+ encoded_xt.as_slice(),
+ sp_externalities::Extensions::default(),
+ &runtime_code,
+ sp_core::testing::TaskExecutor::new(),
+ )
+ .execute(execution.into())
+ .map_err(|e| anyhow!("failed to execute the extrinsic {:?}", e))?;
+
+ let proof = proving_backend
+ .extract_proof()
+ .expect("A recorder was set and thus, a storage proof can be extracted; qed");
+ let proof_size = proof.encoded_size();
+ let compact_proof = proof
+ .clone()
+ .into_compact_proof::<HasherOf<Block>>(pre_root)
+ .map_err(|e| anyhow!("failed to generate compact proof {:?}", e))?;
+ let compact_proof_size = compact_proof.encoded_size();
+
+ let compressed_proof = zstd::stream::encode_all(&compact_proof.encode()[..], 0)
+ .map_err(|e| anyhow!("failed to generate compact proof {:?}", e))?;
+ let compressed_proof_size = compressed_proof.len();
+
+ Ok(PovInfo {
+ proof_size: proof_size as u64,
+ compact_proof_size: compact_proof_size as u64,
+ compressed_proof_size: compressed_proof_size as u64,
+ })
+}
node/cli/Cargo.tomldiffbeforeafterboth--- a/node/cli/Cargo.toml
+++ b/node/cli/Cargo.toml
@@ -319,8 +319,10 @@
pallet-ethereum = { git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.36" }
unique-rpc = { default-features = false, path = "../rpc" }
+uc-rpc = { default-features = false, path = "../../client/rpc" }
app-promotion-rpc = { path = "../../primitives/app_promotion_rpc", default-features = false }
rmrk-rpc = { path = "../../primitives/rmrk-rpc" }
+up-pov-estimate-rpc = { path = "../../primitives/pov-estimate-rpc", default-features = false }
[features]
default = ["opal-runtime"]
@@ -339,3 +341,10 @@
'try-runtime-cli/try-runtime',
]
sapphire-runtime = ['opal-runtime', 'opal-runtime/become-sapphire']
+pov-estimate = [
+ 'unique-runtime?/pov-estimate',
+ 'quartz-runtime?/pov-estimate',
+ 'opal-runtime/pov-estimate',
+ 'uc-rpc/pov-estimate',
+ 'unique-rpc/pov-estimate',
+]
node/cli/src/chain_spec.rsdiffbeforeafterboth--- a/node/cli/src/chain_spec.rs
+++ b/node/cli/src/chain_spec.rs
@@ -54,17 +54,6 @@
#[cfg(all(not(feature = "unique-runtime"), not(feature = "quartz-runtime")))]
pub type DefaultChainSpec = OpalChainSpec;
-pub enum RuntimeId {
- #[cfg(feature = "unique-runtime")]
- Unique,
-
- #[cfg(feature = "quartz-runtime")]
- Quartz,
-
- Opal,
- Unknown(String),
-}
-
#[cfg(not(feature = "unique-runtime"))]
/// PARA_ID for Opal/Sapphire/Quartz
const PARA_ID: u32 = 2095;
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, RuntimeId, 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;7071macro_rules! no_runtime_err {72 ($chain_name:expr) => {73 format!(74 "No runtime valid runtime was found for chain {}",75 $chain_name76 )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 RuntimeId::Unknown(chain) => return Err(no_runtime_err!(chain)),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 RuntimeId::Unknown(chain) => panic!("{}", no_runtime_err!(chain)),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 RuntimeId::Unknown(chain) => Err(no_runtime_err!(chain).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 RuntimeId::Unknown(chain) => Err(no_runtime_err!(chain).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 RuntimeId::Unknown(chain) => Err(no_runtime_err!(chain).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};416417 let runner = cli.create_runner(cmd)?;418419 // grab the task manager.420 let registry = &runner421 .config()422 .prometheus_config423 .as_ref()424 .map(|cfg| &cfg.registry);425 let task_manager =426 sc_service::TaskManager::new(runner.config().tokio_handle.clone(), *registry)427 .map_err(|e| format!("Error: {:?}", e))?;428429 runner.async_run(|config| -> Result<(Pin<Box<dyn Future<Output = _>>>, _)> {430 Ok((431 match config.chain_spec.runtime_id() {432 #[cfg(feature = "unique-runtime")]433 RuntimeId::Unique => Box::pin(cmd.run::<Block, ExtendedHostFunctions<434 sp_io::SubstrateHostFunctions,435 <UniqueRuntimeExecutor as NativeExecutionDispatch>::ExtendHostFunctions,436 >>()),437438 #[cfg(feature = "quartz-runtime")]439 RuntimeId::Quartz => Box::pin(cmd.run::<Block, ExtendedHostFunctions<440 sp_io::SubstrateHostFunctions,441 <QuartzRuntimeExecutor as NativeExecutionDispatch>::ExtendHostFunctions,442 >>()),443444 RuntimeId::Opal => Box::pin(cmd.run::<Block, ExtendedHostFunctions<445 sp_io::SubstrateHostFunctions,446 <OpalRuntimeExecutor as NativeExecutionDispatch>::ExtendHostFunctions,447 >>()),448 RuntimeId::Unknown(chain) => return Err(no_runtime_err!(chain).into()),449 },450 task_manager,451 ))452 })453 }454 #[cfg(not(feature = "try-runtime"))]455 Some(Subcommand::TryRuntime) => {456 Err("Try-runtime must be enabled by `--features try-runtime`.".into())457 }458 None => {459 let runner = cli.create_runner(&cli.run.normalize())?;460 let collator_options = cli.run.collator_options();461462 runner.run_node_until_exit(|config| async move {463 let hwbench = if !cli.no_hardware_benchmarks {464 config.database.path().map(|database_path| {465 let _ = std::fs::create_dir_all(&database_path);466 sc_sysinfo::gather_hwbench(Some(database_path))467 })468 } else {469 None470 };471472 let extensions = chain_spec::Extensions::try_get(&*config.chain_spec);473474 let service_id = config.chain_spec.service_id();475 let relay_chain_id = extensions.map(|e| e.relay_chain.clone());476 let is_dev_service = matches![service_id, ServiceId::Dev]477 || relay_chain_id == Some("dev-service".into());478479 if is_dev_service {480 info!("Running Dev service");481482 let autoseal_interval = Duration::from_millis(cli.idle_autoseal_interval);483484 let mut config = config;485486 config.state_pruning = Some(sc_service::PruningMode::ArchiveAll);487488 return start_node_using_chain_runtime! {489 start_dev_node(config, autoseal_interval).map_err(Into::into)490 };491 };492493 let para_id = extensions494 .map(|e| e.para_id)495 .ok_or("Could not find parachain ID in chain-spec.")?;496497 let polkadot_cli = RelayChainCli::new(498 &config,499 [RelayChainCli::executable_name()]500 .iter()501 .chain(cli.relaychain_args.iter()),502 );503504 let para_id = ParaId::from(para_id);505506 let parachain_account = AccountIdConversion::<polkadot_primitives::v2::AccountId>::into_account_truncating(¶_id);507508 let state_version =509 RelayChainCli::native_runtime_version(&config.chain_spec).state_version();510 let block: Block = generate_genesis_block(&*config.chain_spec, state_version)511 .map_err(|e| format!("{:?}", e))?;512 let genesis_state = format!("0x{:?}", HexDisplay::from(&block.header().encode()));513 let genesis_hash = format!("0x{:?}", HexDisplay::from(&block.header().hash().0));514515 let polkadot_config = SubstrateCli::create_configuration(516 &polkadot_cli,517 &polkadot_cli,518 config.tokio_handle.clone(),519 )520 .map_err(|err| format!("Relay chain argument error: {}", err))?;521522 info!("Parachain id: {:?}", para_id);523 info!("Parachain Account: {}", parachain_account);524 info!("Parachain genesis state: {}", genesis_state);525 info!("Parachain genesis hash: {}", genesis_hash);526 info!(527 "Is collating: {}",528 if config.role.is_authority() {529 "yes"530 } else {531 "no"532 }533 );534535 start_node_using_chain_runtime! {536 start_node(config, polkadot_config, collator_options, para_id, hwbench)537 .await538 .map(|r| r.0)539 .map_err(Into::into)540 }541 })542 }543 }544}545546impl DefaultConfigurationValues for RelayChainCli {547 fn p2p_listen_port() -> u16 {548 30334549 }550551 fn rpc_ws_listen_port() -> u16 {552 9945553 }554555 fn rpc_http_listen_port() -> u16 {556 9934557 }558559 fn prometheus_listen_port() -> u16 {560 9616561 }562}563564impl CliConfiguration<Self> for RelayChainCli {565 fn shared_params(&self) -> &SharedParams {566 self.base.base.shared_params()567 }568569 fn import_params(&self) -> Option<&ImportParams> {570 self.base.base.import_params()571 }572573 fn network_params(&self) -> Option<&NetworkParams> {574 self.base.base.network_params()575 }576577 fn keystore_params(&self) -> Option<&KeystoreParams> {578 self.base.base.keystore_params()579 }580581 fn base_path(&self) -> Result<Option<BasePath>> {582 Ok(self583 .shared_params()584 .base_path()?585 .or_else(|| self.base_path.clone().map(Into::into)))586 }587588 fn rpc_http(&self, default_listen_port: u16) -> Result<Option<SocketAddr>> {589 self.base.base.rpc_http(default_listen_port)590 }591592 fn rpc_ipc(&self) -> Result<Option<String>> {593 self.base.base.rpc_ipc()594 }595596 fn rpc_ws(&self, default_listen_port: u16) -> Result<Option<SocketAddr>> {597 self.base.base.rpc_ws(default_listen_port)598 }599600 fn prometheus_config(601 &self,602 default_listen_port: u16,603 chain_spec: &Box<dyn ChainSpec>,604 ) -> Result<Option<PrometheusConfig>> {605 self.base606 .base607 .prometheus_config(default_listen_port, chain_spec)608 }609610 fn init<F>(611 &self,612 _support_url: &String,613 _impl_version: &String,614 _logger_hook: F,615 _config: &sc_service::Configuration,616 ) -> Result<()> {617 unreachable!("PolkadotCli is never initialized; qed");618 }619620 fn chain_id(&self, is_dev: bool) -> Result<String> {621 let chain_id = self.base.base.chain_id(is_dev)?;622623 Ok(if chain_id.is_empty() {624 self.chain_id.clone().unwrap_or_default()625 } else {626 chain_id627 })628 }629630 fn role(&self, is_dev: bool) -> Result<sc_service::Role> {631 self.base.base.role(is_dev)632 }633634 fn transaction_pool(&self, is_dev: bool) -> Result<sc_service::config::TransactionPoolOptions> {635 self.base.base.transaction_pool(is_dev)636 }637638 fn rpc_methods(&self) -> Result<sc_service::config::RpcMethods> {639 self.base.base.rpc_methods()640 }641642 fn rpc_ws_max_connections(&self) -> Result<Option<usize>> {643 self.base.base.rpc_ws_max_connections()644 }645646 fn rpc_cors(&self, is_dev: bool) -> Result<Option<Vec<String>>> {647 self.base.base.rpc_cors(is_dev)648 }649650 fn default_heap_pages(&self) -> Result<Option<u64>> {651 self.base.base.default_heap_pages()652 }653654 fn force_authoring(&self) -> Result<bool> {655 self.base.base.force_authoring()656 }657658 fn disable_grandpa(&self) -> Result<bool> {659 self.base.base.disable_grandpa()660 }661662 fn max_runtime_instances(&self) -> Result<Option<usize>> {663 self.base.base.max_runtime_instances()664 }665666 fn announce_block(&self) -> Result<bool> {667 self.base.base.announce_block()668 }669670 fn telemetry_endpoints(671 &self,672 chain_spec: &Box<dyn ChainSpec>,673 ) -> Result<Option<sc_telemetry::TelemetryEndpoints>> {674 self.base.base.telemetry_endpoints(chain_spec)675 }676}node/cli/src/service.rsdiffbeforeafterboth--- a/node/cli/src/service.rs
+++ b/node/cli/src/service.rs
@@ -66,9 +66,8 @@
use fc_rpc_core::types::FilterPool;
use fc_mapping_sync::{MappingSyncWorker, SyncStrategy};
-use up_common::types::opaque::{
- AuraId, RuntimeInstance, AccountId, Balance, Index, Hash, Block, BlockNumber,
-};
+use up_common::types::opaque::*;
+use crate::chain_spec::RuntimeIdentification;
// RMRK
use up_data_structs::{
@@ -412,7 +411,8 @@
RmrkBaseInfo<AccountId>,
RmrkPartType,
RmrkTheme,
- > + substrate_frame_rpc_system::AccountNonceApi<Block, AccountId, Index>
+ > + up_pov_estimate_rpc::PovEstimateApi<Block>
+ + substrate_frame_rpc_system::AccountNonceApi<Block, AccountId, Index>
+ sp_api::Metadata<Block>
+ sp_offchain::OffchainWorkerApi<Block>
+ cumulus_primitives_core::CollectCollationInfo<Block>,
@@ -517,9 +517,25 @@
.for_each(|()| futures::future::ready(())),
);
+ let rpc_backend = backend.clone();
+ 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 {
- backend: rpc_frontier_backend.clone(),
+ #[cfg(feature = "pov-estimate")]
+ runtime_id: runtime_id.clone(),
+
+ #[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(),
+
+ eth_backend: rpc_frontier_backend.clone(),
deny_unsafe,
client: rpc_client.clone(),
pool: rpc_pool.clone(),
@@ -720,7 +736,8 @@
RmrkBaseInfo<AccountId>,
RmrkPartType,
RmrkTheme,
- > + substrate_frame_rpc_system::AccountNonceApi<Block, AccountId, Index>
+ > + up_pov_estimate_rpc::PovEstimateApi<Block>
+ + substrate_frame_rpc_system::AccountNonceApi<Block, AccountId, Index>
+ sp_api::Metadata<Block>
+ sp_offchain::OffchainWorkerApi<Block>
+ cumulus_primitives_core::CollectCollationInfo<Block>
@@ -869,7 +886,8 @@
RmrkBaseInfo<AccountId>,
RmrkPartType,
RmrkTheme,
- > + substrate_frame_rpc_system::AccountNonceApi<Block, AccountId, Index>
+ > + up_pov_estimate_rpc::PovEstimateApi<Block>
+ + substrate_frame_rpc_system::AccountNonceApi<Block, AccountId, Index>
+ sp_api::Metadata<Block>
+ sp_offchain::OffchainWorkerApi<Block>
+ cumulus_primitives_core::CollectCollationInfo<Block>
@@ -1040,9 +1058,24 @@
let rpc_pool = transaction_pool.clone();
let rpc_network = network.clone();
let rpc_frontier_backend = frontier_backend.clone();
+ 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 {
- backend: rpc_frontier_backend.clone(),
+ #[cfg(feature = "pov-estimate")]
+ 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")]
+ backend: rpc_backend.clone(),
+ eth_backend: rpc_frontier_backend.clone(),
deny_unsafe,
client: rpc_client.clone(),
pool: rpc_pool.clone(),
node/rpc/Cargo.tomldiffbeforeafterboth--- a/node/rpc/Cargo.toml
+++ b/node/rpc/Cargo.toml
@@ -55,6 +55,7 @@
up-rpc = { path = "../../primitives/rpc" }
app-promotion-rpc = { path = "../../primitives/app_promotion_rpc" }
rmrk-rpc = { path = "../../primitives/rmrk-rpc" }
+up-pov-estimate-rpc = { path = "../../primitives/pov-estimate-rpc" }
up-data-structs = { default-features = false, path = "../../primitives/data-structs" }
[dependencies.serde]
@@ -65,3 +66,4 @@
default = []
std = []
unique-runtime = []
+pov-estimate = ['uc-rpc/pov-estimate']
node/rpc/src/lib.rsdiffbeforeafterboth--- a/node/rpc/src/lib.rs
+++ b/node/rpc/src/lib.rs
@@ -40,7 +40,7 @@
use sc_service::TransactionPool;
use std::{collections::BTreeMap, sync::Arc};
-use up_common::types::opaque::{Hash, AccountId, RuntimeInstance, Index, Block, BlockNumber, Balance};
+use up_common::types::opaque::*;
// RMRK
use up_data_structs::{
@@ -48,6 +48,8 @@
RmrkPartType, RmrkTheme,
};
+type FullBackend = sc_service::TFullBackend<Block>;
+
/// Extra dependencies for GRANDPA
pub struct GrandpaDeps<B> {
/// Voting round info.
@@ -82,8 +84,18 @@
pub deny_unsafe: DenyUnsafe,
/// EthFilterApi pool.
pub filter_pool: Option<FilterPool>,
- /// Backend.
- pub backend: Arc<fc_db::Backend<Block>>,
+
+ #[cfg(feature = "pov-estimate")]
+ pub runtime_id: RuntimeId,
+ /// Executor params for PoV estimating
+ #[cfg(feature = "pov-estimate")]
+ pub exec_params: uc_rpc::pov_estimate::ExecutorParams,
+ /// Substrate Backend.
+ #[cfg(feature = "pov-estimate")]
+ pub backend: Arc<FullBackend>,
+
+ /// Ethereum Backend.
+ pub eth_backend: Arc<fc_db::Backend<Block>>,
/// Maximum number of logs in a query.
pub max_past_logs: u32,
/// Maximum fee history cache size.
@@ -162,6 +174,7 @@
RmrkPartType,
RmrkTheme,
>,
+ C::Api: up_pov_estimate_rpc::PovEstimateApi<Block>,
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,
@@ -182,6 +195,9 @@
#[cfg(not(feature = "unique-runtime"))]
use uc_rpc::{RmrkApiServer, Rmrk};
+ #[cfg(feature = "pov-estimate")]
+ use uc_rpc::pov_estimate::{PovEstimateApiServer, PovEstimate};
+
// use pallet_contracts_rpc::{Contracts, ContractsApi};
use pallet_transaction_payment_rpc::{TransactionPayment, TransactionPaymentApiServer};
use substrate_frame_rpc_system::{System, SystemApiServer};
@@ -200,7 +216,17 @@
network,
deny_unsafe,
filter_pool,
+
+ #[cfg(feature = "pov-estimate")]
+ runtime_id,
+
+ #[cfg(feature = "pov-estimate")]
+ exec_params,
+
+ #[cfg(feature = "pov-estimate")]
backend,
+
+ eth_backend,
max_past_logs,
} = deps;
@@ -226,7 +252,7 @@
network.clone(),
signers,
overrides.clone(),
- backend.clone(),
+ eth_backend.clone(),
is_authority,
block_data_cache.clone(),
fee_history_cache,
@@ -244,11 +270,14 @@
#[cfg(not(feature = "unique-runtime"))]
io.merge(Rmrk::new(client.clone()).into_rpc())?;
+ #[cfg(feature = "pov-estimate")]
+ io.merge(PovEstimate::new(client.clone(), backend, deny_unsafe, exec_params, runtime_id).into_rpc())?;
+
if let Some(filter_pool) = filter_pool {
io.merge(
EthFilter::new(
client.clone(),
- backend,
+ eth_backend,
filter_pool,
500_usize, // max stored filters
max_past_logs,
pallets/common/Cargo.tomldiffbeforeafterboth--- a/pallets/common/Cargo.toml
+++ b/pallets/common/Cargo.toml
@@ -23,6 +23,7 @@
evm-coder = { default-features = false, path = '../../crates/evm-coder' }
ethereum = { version = "0.14.0", default-features = false }
pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.36" }
+up-pov-estimate-rpc = { default-features = false, path = "../../primitives/pov-estimate-rpc" }
serde = { version = "1.0.130", default-features = false }
scale-info = { version = "2.0.1", default-features = false, features = [
@@ -39,6 +40,7 @@
"fp-evm-mapping/std",
"up-data-structs/std",
"pallet-evm/std",
+ "up-pov-estimate-rpc/std",
]
runtime-benchmarks = [
"frame-benchmarking/runtime-benchmarks",
pallets/common/src/lib.rsdiffbeforeafterboth--- a/pallets/common/src/lib.rs
+++ b/pallets/common/src/lib.rs
@@ -115,6 +115,7 @@
RmrkNftChild,
CollectionPermissions,
};
+use up_pov_estimate_rpc::PovInfo;
pub use pallet::*;
use sp_core::H160;
@@ -881,6 +882,8 @@
RmrkPartType,
RmrkBoundedTheme,
RmrkNftChild,
+ // PoV Estimate Info
+ PovInfo,
)>,
),
QueryKind = OptionQuery,
primitives/common/src/types.rsdiffbeforeafterboth--- a/primitives/common/src/types.rs
+++ b/primitives/common/src/types.rs
@@ -29,6 +29,14 @@
pub use super::{BlockNumber, Signature, AccountId, Balance, Index, Hash, AuraId};
+ #[derive(Debug, Clone)]
+ pub enum RuntimeId {
+ Unique,
+ Quartz,
+ Opal,
+ Unknown(sp_std::vec::Vec<u8>),
+ }
+
/// Opaque block header type.
pub type Header = generic::Header<BlockNumber, BlakeTwo256>;
primitives/pov-estimate-rpc/Cargo.tomldiffbeforeafterboth--- /dev/null
+++ b/primitives/pov-estimate-rpc/Cargo.toml
@@ -0,0 +1,28 @@
+[package]
+name = "up-pov-estimate-rpc"
+version = "0.1.0"
+license = "GPLv3"
+edition = "2021"
+
+[dependencies]
+codec = { package = "parity-scale-codec", version = "3.1.2", default-features = false, features = [
+ "derive",
+] }
+serde = { version = "1.0.130", features = ["derive"], default-features = false, optional = true }
+scale-info = { version = "2.0.1", default-features = false, features = ["derive"] }
+sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
+sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
+sp-api = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
+sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.36" }
+
+[features]
+default = ["std"]
+std = [
+ "codec/std",
+ "serde/std",
+ "scale-info/std",
+ "sp-core/std",
+ "sp-std/std",
+ "sp-api/std",
+ "sp-runtime/std",
+]
primitives/pov-estimate-rpc/src/lib.rsdiffbeforeafterboth--- /dev/null
+++ b/primitives/pov-estimate-rpc/src/lib.rs
@@ -0,0 +1,39 @@
+// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.
+// This file is part of Unique Network.
+
+// Unique Network is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Unique Network is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
+
+#![cfg_attr(not(feature = "std"), no_std)]
+
+use codec::{Decode, Encode, MaxEncodedLen};
+use scale_info::TypeInfo;
+
+#[cfg(feature = "std")]
+use serde::Serialize;
+
+use sp_runtime::ApplyExtrinsicResult;
+
+#[cfg_attr(feature = "std", derive(Serialize))]
+#[derive(Encode, Decode, Debug, TypeInfo, MaxEncodedLen)]
+pub struct PovInfo {
+ pub proof_size: u64,
+ pub compact_proof_size: u64,
+ pub compressed_proof_size: u64,
+}
+
+sp_api::decl_runtime_apis! {
+ pub trait PovEstimateApi {
+ fn pov_estimate(uxt: Block::Extrinsic) -> ApplyExtrinsicResult;
+ }
+}
runtime/common/runtime_apis.rsdiffbeforeafterboth--- a/runtime/common/runtime_apis.rs
+++ b/runtime/common/runtime_apis.rs
@@ -39,7 +39,7 @@
use sp_runtime::{
Permill,
traits::Block as BlockT,
- transaction_validity::{TransactionSource, TransactionValidity},
+ transaction_validity::{TransactionSource, TransactionValidity, TransactionValidityError, InvalidTransaction},
ApplyExtrinsicResult, DispatchError,
};
use fp_rpc::TransactionStatus;
@@ -778,6 +778,17 @@
}
}
+ impl up_pov_estimate_rpc::PovEstimateApi<Block> for Runtime {
+ #[allow(unused_variables)]
+ fn pov_estimate(uxt: <Block as BlockT>::Extrinsic) -> ApplyExtrinsicResult {
+ #[cfg(feature = "pov-estimate")]
+ return Executive::apply_extrinsic(uxt);
+
+ #[cfg(not(feature = "pov-estimate"))]
+ return Err(TransactionValidityError::Invalid(InvalidTransaction::Call))
+ }
+ }
+
#[cfg(feature = "try-runtime")]
impl frame_try_runtime::TryRuntime<Block> for Runtime {
fn on_runtime_upgrade(checks: bool) -> (frame_support::pallet_prelude::Weight, frame_support::pallet_prelude::Weight) {
runtime/opal/Cargo.tomldiffbeforeafterboth--- a/runtime/opal/Cargo.toml
+++ b/runtime/opal/Cargo.toml
@@ -127,6 +127,7 @@
'pallet-base-fee/std',
'fp-rpc/std',
'up-rpc/std',
+ 'up-pov-estimate-rpc/std',
'app-promotion-rpc/std',
'fp-evm-mapping/std',
'fp-self-contained/std',
@@ -184,6 +185,7 @@
'pallet-test-utils',
]
become-sapphire = []
+pov-estimate = []
refungible = []
scheduler = []
@@ -468,6 +470,7 @@
derivative = "2.2.0"
pallet-unique = { path = '../../pallets/unique', default-features = false }
up-rpc = { path = "../../primitives/rpc", default-features = false }
+up-pov-estimate-rpc = { path = "../../primitives/pov-estimate-rpc", default-features = false }
app-promotion-rpc = { path = "../../primitives/app_promotion_rpc", default-features = false }
rmrk-rpc = { path = "../../primitives/rmrk-rpc", default-features = false }
fp-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.36" }
runtime/quartz/Cargo.tomldiffbeforeafterboth--- a/runtime/quartz/Cargo.toml
+++ b/runtime/quartz/Cargo.toml
@@ -122,6 +122,7 @@
'pallet-base-fee/std',
'fp-rpc/std',
'up-rpc/std',
+ 'up-pov-estimate-rpc/std',
'app-promotion-rpc/std',
'fp-evm-mapping/std',
'fp-self-contained/std',
@@ -169,6 +170,7 @@
]
limit-testing = ['pallet-unique/limit-testing', 'up-data-structs/limit-testing']
quartz-runtime = ['refungible', 'app-promotion', 'foreign-assets']
+pov-estimate = []
refungible = []
scheduler = []
@@ -461,6 +463,7 @@
derivative = "2.2.0"
pallet-unique = { path = '../../pallets/unique', default-features = false }
up-rpc = { path = "../../primitives/rpc", default-features = false }
+up-pov-estimate-rpc = { path = "../../primitives/pov-estimate-rpc", default-features = false }
app-promotion-rpc = { path = "../../primitives/app_promotion_rpc", default-features = false }
fp-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.36" }
fp-evm-mapping = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.36" }
runtime/unique/Cargo.tomldiffbeforeafterboth--- a/runtime/unique/Cargo.toml
+++ b/runtime/unique/Cargo.toml
@@ -123,6 +123,7 @@
'pallet-base-fee/std',
'fp-rpc/std',
'up-rpc/std',
+ 'up-pov-estimate-rpc/std',
'app-promotion-rpc/std',
'fp-evm-mapping/std',
'fp-self-contained/std',
@@ -170,6 +171,7 @@
]
limit-testing = ['pallet-unique/limit-testing', 'up-data-structs/limit-testing']
unique-runtime = ['foreign-assets']
+pov-estimate = []
stubgen = ["evm-coder/stubgen"]
refungible = []
@@ -454,6 +456,7 @@
derivative = "2.2.0"
pallet-unique = { path = '../../pallets/unique', default-features = false }
up-rpc = { path = "../../primitives/rpc", default-features = false }
+up-pov-estimate-rpc = { path = "../../primitives/pov-estimate-rpc", default-features = false }
app-promotion-rpc = { path = "../../primitives/app_promotion_rpc", default-features = false }
rmrk-rpc = { path = "../../primitives/rmrk-rpc", default-features = false }
pallet-inflation = { path = '../../pallets/inflation', default-features = false }