difftreelog
style clarify argument names
in: master
3 files changed
node/cli/src/service.rsdiffbeforeafterboth--- a/node/cli/src/service.rs
+++ b/node/cli/src/service.rs
@@ -45,7 +45,7 @@
use cumulus_relay_chain_interface::{RelayChainError, RelayChainInterface, RelayChainResult};
use cumulus_relay_chain_rpc_interface::{RelayChainRpcInterface, create_client_and_start_worker};
-// Substrate ImportsA
+// Substrate Imports
use sp_api::BlockT;
use sc_executor::NativeElseWasmExecutor;
use sc_executor::NativeExecutionDispatch;
node/rpc/src/lib.rsdiffbeforeafterboth1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617use sp_runtime::traits::BlakeTwo256;18use fc_rpc::{19 EthBlockDataCacheTask, OverrideHandle, RuntimeApiStorageOverride, SchemaV1Override,20 StorageOverride, SchemaV2Override, SchemaV3Override,21};22use jsonrpsee::RpcModule;23use fc_rpc_core::types::{FilterPool, FeeHistoryCache};24use fp_storage::EthereumStorageSchema;25use sc_client_api::{26 backend::{AuxStore, StorageProvider},27 client::BlockchainEvents,28 StateBackend, Backend,29};30use sc_finality_grandpa::{31 FinalityProofProvider, GrandpaJustificationStream, SharedAuthoritySet, SharedVoterState,32};33use sc_network::NetworkService;34use sc_rpc::SubscriptionTaskExecutor;35pub use sc_rpc_api::DenyUnsafe;36use sc_transaction_pool::{ChainApi, Pool};37use sp_api::ProvideRuntimeApi;38use sp_block_builder::BlockBuilder;39use sp_blockchain::{Error as BlockChainError, HeaderBackend, HeaderMetadata};40use sc_service::TransactionPool;41use std::{collections::BTreeMap, sync::Arc};4243use up_common::types::opaque::{Hash, AccountId, RuntimeInstance, Index, Block, BlockNumber, Balance};4445// RMRK46use up_data_structs::{47 RmrkCollectionInfo, RmrkInstanceInfo, RmrkResourceInfo, RmrkPropertyInfo, RmrkBaseInfo,48 RmrkPartType, RmrkTheme,49};5051/// Extra dependencies for GRANDPA52pub struct GrandpaDeps<B> {53 /// Voting round info.54 pub shared_voter_state: SharedVoterState,55 /// Authority set info.56 pub shared_authority_set: SharedAuthoritySet<Hash, BlockNumber>,57 /// Receives notifications about justification events from Grandpa.58 pub justification_stream: GrandpaJustificationStream<Block>,59 /// Executor to drive the subscription manager in the Grandpa RPC handler.60 pub subscription_executor: SubscriptionTaskExecutor,61 /// Finality proof provider.62 pub finality_provider: Arc<FinalityProofProvider<B, Block>>,63}6465/// Full client dependencies.66pub struct FullDeps<C, P, SC, CA: ChainApi> {67 /// The client instance to use.68 pub client: Arc<C>,69 /// Transaction pool instance.70 pub pool: Arc<P>,71 /// Graph pool instance.72 pub graph: Arc<Pool<CA>>,73 /// The SelectChain Strategy74 pub select_chain: SC,75 /// The Node authority flag76 pub is_authority: bool,77 /// Whether to enable dev signer78 pub enable_dev_signer: bool,79 /// Network service80 pub network: Arc<NetworkService<Block, Hash>>,81 /// Whether to deny unsafe calls82 pub deny_unsafe: DenyUnsafe,83 /// EthFilterApi pool.84 pub filter_pool: Option<FilterPool>,85 /// Backend.86 pub backend: Arc<fc_db::Backend<Block>>,87 /// Maximum number of logs in a query.88 pub max_past_logs: u32,89 /// Maximum fee history cache size.90 pub fee_history_limit: u64,91 /// Fee history cache.92 pub fee_history_cache: FeeHistoryCache,93 /// Cache for Ethereum block data.94 pub block_data_cache: Arc<EthBlockDataCacheTask<Block>>,95}9697pub fn overrides_handle<C, BE, R>(client: Arc<C>) -> Arc<OverrideHandle<Block>>98where99 C: ProvideRuntimeApi<Block> + StorageProvider<Block, BE> + AuxStore,100 C: HeaderBackend<Block> + HeaderMetadata<Block, Error = BlockChainError>,101 C: Send + Sync + 'static,102 C::Api: fp_rpc::EthereumRuntimeRPCApi<Block>,103 C::Api: up_rpc::UniqueApi<Block, <R as RuntimeInstance>::CrossAccountId, AccountId>,104 BE: Backend<Block> + 'static,105 BE::State: StateBackend<BlakeTwo256>,106 R: RuntimeInstance + Send + Sync + 'static,107{108 let mut overrides_map = BTreeMap::new();109 overrides_map.insert(110 EthereumStorageSchema::V1,111 Box::new(SchemaV1Override::new(client.clone()))112 as Box<dyn StorageOverride<_> + Send + Sync>,113 );114 overrides_map.insert(115 EthereumStorageSchema::V2,116 Box::new(SchemaV2Override::new(client.clone()))117 as Box<dyn StorageOverride<_> + Send + Sync>,118 );119 overrides_map.insert(120 EthereumStorageSchema::V3,121 Box::new(SchemaV3Override::new(client.clone()))122 as Box<dyn StorageOverride<_> + Send + Sync>,123 );124125 Arc::new(OverrideHandle {126 schemas: overrides_map,127 fallback: Box::new(RuntimeApiStorageOverride::new(client)),128 })129}130131/// Instantiate all Full RPC extensions.132pub fn create_full<C, P, SC, CA, R, A, B>(133 deps: FullDeps<C, P, SC, CA>,134 subscription_task_executor: SubscriptionTaskExecutor,135) -> Result<RpcModule<()>, Box<dyn std::error::Error + Send + Sync>>136where137 C: ProvideRuntimeApi<Block> + StorageProvider<Block, B> + AuxStore,138 C: HeaderBackend<Block> + HeaderMetadata<Block, Error = BlockChainError> + 'static,139 C: Send + Sync + 'static,140 C: BlockchainEvents<Block>,141 C::Api: substrate_frame_rpc_system::AccountNonceApi<Block, AccountId, Index>,142 C::Api: BlockBuilder<Block>,143 // C::Api: pallet_contracts_rpc::ContractsRuntimeApi<Block, AccountId, Balance, BlockNumber, Hash>,144 C::Api: pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi<Block, Balance>,145 C::Api: fp_rpc::EthereumRuntimeRPCApi<Block>,146 C::Api: fp_rpc::ConvertTransactionRuntimeApi<Block>,147 C::Api: up_rpc::UniqueApi<Block, <R as RuntimeInstance>::CrossAccountId, AccountId>,148 C::Api: app_promotion_rpc::AppPromotionApi<149 Block,150 BlockNumber,151 <R as RuntimeInstance>::CrossAccountId,152 AccountId,153 >,154 C::Api: rmrk_rpc::RmrkApi<155 Block,156 AccountId,157 RmrkCollectionInfo<AccountId>,158 RmrkInstanceInfo<AccountId>,159 RmrkResourceInfo,160 RmrkPropertyInfo,161 RmrkBaseInfo<AccountId>,162 RmrkPartType,163 RmrkTheme,164 >,165 B: sc_client_api::Backend<Block> + Send + Sync + 'static,166 B::State: sc_client_api::backend::StateBackend<sp_runtime::traits::HashFor<Block>>,167 P: TransactionPool<Block = Block> + 'static,168 CA: ChainApi<Block = Block> + 'static,169 R: RuntimeInstance + Send + Sync + 'static,170 <R as RuntimeInstance>::CrossAccountId: serde::Serialize,171 for<'de> <R as RuntimeInstance>::CrossAccountId: serde::Deserialize<'de>,172{173 use fc_rpc::{174 Eth, EthApiServer, EthDevSigner, EthFilter, EthFilterApiServer, EthPubSub,175 EthPubSubApiServer, EthSigner, Net, NetApiServer, Web3, Web3ApiServer,176 };177 use uc_rpc::{UniqueApiServer, Unique};178179 #[cfg(not(any(feature = "unique-runtime", feature = "quartz-runtime")))]180 use uc_rpc::{AppPromotionApiServer, AppPromotion};181182 #[cfg(not(feature = "unique-runtime"))]183 use uc_rpc::{RmrkApiServer, Rmrk};184185 // use pallet_contracts_rpc::{Contracts, ContractsApi};186 use pallet_transaction_payment_rpc::{TransactionPayment, TransactionPaymentApiServer};187 use substrate_frame_rpc_system::{System, SystemApiServer};188189 let mut io = RpcModule::new(());190 let FullDeps {191 client,192 pool,193 graph,194 select_chain: _,195 fee_history_limit,196 fee_history_cache,197 block_data_cache,198 enable_dev_signer,199 is_authority,200 network,201 deny_unsafe,202 filter_pool,203 backend,204 max_past_logs,205 } = deps;206207 io.merge(System::new(Arc::clone(&client), Arc::clone(&pool), deny_unsafe).into_rpc())?;208 io.merge(TransactionPayment::new(Arc::clone(&client)).into_rpc())?;209210 // io.extend_with(ContractsApi::to_delegate(Contracts::new(client.clone())));211212 let mut signers = Vec::new();213 if enable_dev_signer {214 signers.push(Box::new(EthDevSigner::new()) as Box<dyn EthSigner>);215 }216217 let overrides = overrides_handle::<_, _, R>(client.clone());218219 io.merge(220 Eth::new(221 client.clone(),222 pool.clone(),223 graph,224 Some(<R as RuntimeInstance>::get_transaction_converter()),225 network.clone(),226 signers,227 overrides.clone(),228 backend.clone(),229 is_authority,230 block_data_cache.clone(),231 fee_history_cache,232 fee_history_limit,233 10,234 )235 .into_rpc(),236 )?;237238 io.merge(Unique::new(client.clone()).into_rpc())?;239240 #[cfg(not(any(feature = "unique-runtime", feature = "quartz-runtime")))]241 io.merge(AppPromotion::new(client.clone()).into_rpc())?;242243 #[cfg(not(feature = "unique-runtime"))]244 io.merge(Rmrk::new(client.clone()).into_rpc())?;245246 if let Some(filter_pool) = filter_pool {247 io.merge(248 EthFilter::new(249 client.clone(),250 backend,251 filter_pool,252 500_usize, // max stored filters253 max_past_logs,254 block_data_cache,255 )256 .into_rpc(),257 )?;258 }259260 io.merge(261 Net::new(262 client.clone(),263 network.clone(),264 // Whether to format the `peer_count` response as Hex (default) or not.265 true,266 )267 .into_rpc(),268 )?;269270 io.merge(Web3::new(client.clone()).into_rpc())?;271272 io.merge(273 EthPubSub::new(pool, client, network, subscription_task_executor, overrides).into_rpc(),274 )?;275276 Ok(io)277}1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617use sp_runtime::traits::BlakeTwo256;18use fc_rpc::{19 EthBlockDataCacheTask, OverrideHandle, RuntimeApiStorageOverride, SchemaV1Override,20 StorageOverride, SchemaV2Override, SchemaV3Override,21};22use jsonrpsee::RpcModule;23use fc_rpc_core::types::{FilterPool, FeeHistoryCache};24use fp_storage::EthereumStorageSchema;25use sc_client_api::{26 backend::{AuxStore, StorageProvider},27 client::BlockchainEvents,28 StateBackend, Backend,29};30use sc_finality_grandpa::{31 FinalityProofProvider, GrandpaJustificationStream, SharedAuthoritySet, SharedVoterState,32};33use sc_network::NetworkService;34use sc_rpc::SubscriptionTaskExecutor;35pub use sc_rpc_api::DenyUnsafe;36use sc_transaction_pool::{ChainApi, Pool};37use sp_api::ProvideRuntimeApi;38use sp_block_builder::BlockBuilder;39use sp_blockchain::{Error as BlockChainError, HeaderBackend, HeaderMetadata};40use sc_service::TransactionPool;41use std::{collections::BTreeMap, sync::Arc};4243use up_common::types::opaque::{Hash, AccountId, RuntimeInstance, Index, Block, BlockNumber, Balance};4445// RMRK46use up_data_structs::{47 RmrkCollectionInfo, RmrkInstanceInfo, RmrkResourceInfo, RmrkPropertyInfo, RmrkBaseInfo,48 RmrkPartType, RmrkTheme,49};5051/// Extra dependencies for GRANDPA52pub struct GrandpaDeps<B> {53 /// Voting round info.54 pub shared_voter_state: SharedVoterState,55 /// Authority set info.56 pub shared_authority_set: SharedAuthoritySet<Hash, BlockNumber>,57 /// Receives notifications about justification events from Grandpa.58 pub justification_stream: GrandpaJustificationStream<Block>,59 /// Executor to drive the subscription manager in the Grandpa RPC handler.60 pub subscription_executor: SubscriptionTaskExecutor,61 /// Finality proof provider.62 pub finality_provider: Arc<FinalityProofProvider<B, Block>>,63}6465/// Full client dependencies.66pub struct FullDeps<C, P, SC, CA: ChainApi> {67 /// The client instance to use.68 pub client: Arc<C>,69 /// Transaction pool instance.70 pub pool: Arc<P>,71 /// Graph pool instance.72 pub graph: Arc<Pool<CA>>,73 /// The SelectChain Strategy74 pub select_chain: SC,75 /// The Node authority flag76 pub is_authority: bool,77 /// Whether to enable dev signer78 pub enable_dev_signer: bool,79 /// Network service80 pub network: Arc<NetworkService<Block, Hash>>,81 /// Whether to deny unsafe calls82 pub deny_unsafe: DenyUnsafe,83 /// EthFilterApi pool.84 pub filter_pool: Option<FilterPool>,85 /// Backend.86 pub backend: Arc<fc_db::Backend<Block>>,87 /// Maximum number of logs in a query.88 pub max_past_logs: u32,89 /// Maximum fee history cache size.90 pub fee_history_limit: u64,91 /// Fee history cache.92 pub fee_history_cache: FeeHistoryCache,93 /// Cache for Ethereum block data.94 pub block_data_cache: Arc<EthBlockDataCacheTask<Block>>,95}9697pub fn overrides_handle<C, BE, R>(client: Arc<C>) -> Arc<OverrideHandle<Block>>98where99 C: ProvideRuntimeApi<Block> + StorageProvider<Block, BE> + AuxStore,100 C: HeaderBackend<Block> + HeaderMetadata<Block, Error = BlockChainError>,101 C: Send + Sync + 'static,102 C::Api: fp_rpc::EthereumRuntimeRPCApi<Block>,103 C::Api: up_rpc::UniqueApi<Block, <R as RuntimeInstance>::CrossAccountId, AccountId>,104 BE: Backend<Block> + 'static,105 BE::State: StateBackend<BlakeTwo256>,106 R: RuntimeInstance + Send + Sync + 'static,107{108 let mut overrides_map = BTreeMap::new();109 overrides_map.insert(110 EthereumStorageSchema::V1,111 Box::new(SchemaV1Override::new(client.clone()))112 as Box<dyn StorageOverride<_> + Send + Sync>,113 );114 overrides_map.insert(115 EthereumStorageSchema::V2,116 Box::new(SchemaV2Override::new(client.clone()))117 as Box<dyn StorageOverride<_> + Send + Sync>,118 );119 overrides_map.insert(120 EthereumStorageSchema::V3,121 Box::new(SchemaV3Override::new(client.clone()))122 as Box<dyn StorageOverride<_> + Send + Sync>,123 );124125 Arc::new(OverrideHandle {126 schemas: overrides_map,127 fallback: Box::new(RuntimeApiStorageOverride::new(client)),128 })129}130131/// Instantiate all Full RPC extensions.132pub fn create_full<C, P, SC, CA, R, A, B>(133 deps: FullDeps<C, P, SC, CA>,134 subscription_task_executor: SubscriptionTaskExecutor,135) -> Result<RpcModule<()>, Box<dyn std::error::Error + Send + Sync>>136where137 C: ProvideRuntimeApi<Block> + StorageProvider<Block, B> + AuxStore,138 C: HeaderBackend<Block> + HeaderMetadata<Block, Error = BlockChainError> + 'static,139 C: Send + Sync + 'static,140 C: BlockchainEvents<Block>,141 C::Api: substrate_frame_rpc_system::AccountNonceApi<Block, AccountId, Index>,142 C::Api: BlockBuilder<Block>,143 // C::Api: pallet_contracts_rpc::ContractsRuntimeApi<Block, AccountId, Balance, BlockNumber, Hash>,144 C::Api: pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi<Block, Balance>,145 C::Api: fp_rpc::EthereumRuntimeRPCApi<Block>,146 C::Api: fp_rpc::ConvertTransactionRuntimeApi<Block>,147 C::Api: up_rpc::UniqueApi<Block, <R as RuntimeInstance>::CrossAccountId, AccountId>,148 C::Api: app_promotion_rpc::AppPromotionApi<149 Block,150 BlockNumber,151 <R as RuntimeInstance>::CrossAccountId,152 AccountId,153 >,154 C::Api: rmrk_rpc::RmrkApi<155 Block,156 AccountId,157 RmrkCollectionInfo<AccountId>,158 RmrkInstanceInfo<AccountId>,159 RmrkResourceInfo,160 RmrkPropertyInfo,161 RmrkBaseInfo<AccountId>,162 RmrkPartType,163 RmrkTheme,164 >,165 B: sc_client_api::Backend<Block> + Send + Sync + 'static,166 B::State: sc_client_api::backend::StateBackend<sp_runtime::traits::HashFor<Block>>,167 P: TransactionPool<Block = Block> + 'static,168 CA: ChainApi<Block = Block> + 'static,169 R: RuntimeInstance + Send + Sync + 'static,170 <R as RuntimeInstance>::CrossAccountId: serde::Serialize,171 for<'de> <R as RuntimeInstance>::CrossAccountId: serde::Deserialize<'de>,172{173 use fc_rpc::{174 Eth, EthApiServer, EthDevSigner, EthFilter, EthFilterApiServer, EthPubSub,175 EthPubSubApiServer, EthSigner, Net, NetApiServer, Web3, Web3ApiServer,176 };177 use uc_rpc::{UniqueApiServer, Unique};178179 #[cfg(not(any(feature = "unique-runtime", feature = "quartz-runtime")))]180 use uc_rpc::{AppPromotionApiServer, AppPromotion};181182 #[cfg(not(feature = "unique-runtime"))]183 use uc_rpc::{RmrkApiServer, Rmrk};184185 // use pallet_contracts_rpc::{Contracts, ContractsApi};186 use pallet_transaction_payment_rpc::{TransactionPayment, TransactionPaymentApiServer};187 use substrate_frame_rpc_system::{System, SystemApiServer};188189 let mut io = RpcModule::new(());190 let FullDeps {191 client,192 pool,193 graph,194 select_chain: _,195 fee_history_limit,196 fee_history_cache,197 block_data_cache,198 enable_dev_signer,199 is_authority,200 network,201 deny_unsafe,202 filter_pool,203 backend,204 max_past_logs,205 } = deps;206207 io.merge(System::new(Arc::clone(&client), Arc::clone(&pool), deny_unsafe).into_rpc())?;208 io.merge(TransactionPayment::new(Arc::clone(&client)).into_rpc())?;209210 // io.extend_with(ContractsApi::to_delegate(Contracts::new(client.clone())));211212 let mut signers = Vec::new();213 if enable_dev_signer {214 signers.push(Box::new(EthDevSigner::new()) as Box<dyn EthSigner>);215 }216217 let overrides = overrides_handle::<_, _, R>(client.clone());218219 let execute_gas_limit_multiplier = 10;220 io.merge(221 Eth::new(222 client.clone(),223 pool.clone(),224 graph,225 Some(<R as RuntimeInstance>::get_transaction_converter()),226 network.clone(),227 signers,228 overrides.clone(),229 backend.clone(),230 is_authority,231 block_data_cache.clone(),232 fee_history_cache,233 fee_history_limit,234 execute_gas_limit_multiplier,235 )236 .into_rpc(),237 )?;238239 io.merge(Unique::new(client.clone()).into_rpc())?;240241 #[cfg(not(any(feature = "unique-runtime", feature = "quartz-runtime")))]242 io.merge(AppPromotion::new(client.clone()).into_rpc())?;243244 #[cfg(not(feature = "unique-runtime"))]245 io.merge(Rmrk::new(client.clone()).into_rpc())?;246247 if let Some(filter_pool) = filter_pool {248 io.merge(249 EthFilter::new(250 client.clone(),251 backend,252 filter_pool,253 500_usize, // max stored filters254 max_past_logs,255 block_data_cache,256 )257 .into_rpc(),258 )?;259 }260261 io.merge(262 Net::new(263 client.clone(),264 network.clone(),265 // Whether to format the `peer_count` response as Hex (default) or not.266 true,267 )268 .into_rpc(),269 )?;270271 io.merge(Web3::new(client.clone()).into_rpc())?;272273 io.merge(274 EthPubSub::new(pool, client, network, subscription_task_executor, overrides).into_rpc(),275 )?;276277 Ok(io)278}runtime/common/runtime_apis.rsdiffbeforeafterboth--- a/runtime/common/runtime_apis.rs
+++ b/runtime/common/runtime_apis.rs
@@ -482,6 +482,7 @@
};
let is_transactional = false;
+ let validate = false;
<Runtime as pallet_evm::Config>::Runner::call(
CrossAccountId::from_eth(from),
to,
@@ -493,7 +494,7 @@
nonce,
access_list.unwrap_or_default(),
is_transactional,
- false,
+ validate,
config.as_ref().unwrap_or_else(|| <Runtime as pallet_evm::Config>::config()),
).map_err(|err| err.error.into())
}
@@ -519,6 +520,7 @@
};
let is_transactional = false;
+ let validate = false;
<Runtime as pallet_evm::Config>::Runner::create(
CrossAccountId::from_eth(from),
data,
@@ -529,7 +531,7 @@
nonce,
access_list.unwrap_or_default(),
is_transactional,
- false,
+ validate,
config.as_ref().unwrap_or_else(|| <Runtime as pallet_evm::Config>::config()),
).map_err(|err| err.error.into())
}