difftreelog
refactor disable contracts in collator
in: master
3 files changed
node/cli/Cargo.tomldiffbeforeafterboth--- a/node/cli/Cargo.toml
+++ b/node/cli/Cargo.toml
@@ -193,17 +193,6 @@
branch = 'polkadot-v0.9.7'
version = '3.0.0'
-[dependencies.pallet-contracts]
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.7'
-version = '3.0.0'
-
-[dependencies.pallet-contracts-rpc]
-git = 'https://github.com/paritytech/substrate.git'
-branch = 'polkadot-v0.9.7'
-version = '3.0.0'
-
-
[dependencies.sc-network]
git = 'https://github.com/paritytech/substrate.git'
branch = 'polkadot-v0.9.7'
node/rpc/Cargo.tomldiffbeforeafterboth--- a/node/rpc/Cargo.toml
+++ b/node/rpc/Cargo.toml
@@ -13,7 +13,7 @@
futures = { version = "0.3.1", features = ["compat"] }
jsonrpc-core = "15.0.0"
jsonrpc-pubsub = "15.0.0"
-pallet-contracts-rpc = { version = "3.0", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.7' }
+# pallet-contracts-rpc = { version = "3.0", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.7' }
pallet-transaction-payment-rpc = { version = "3.0", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.7' }
pallet-transaction-payment-rpc-runtime-api = { version = "3.0", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.7' }
sc-client-api = { version = "3.0", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.7' }
node/rpc/src/lib.rsdiffbeforeafterboth1use nft_runtime::{Hash, AccountId, Index, opaque::Block, BlockNumber, Balance};2use fc_rpc::{OverrideHandle, RuntimeApiStorageOverride, SchemaV1Override, StorageOverride};3use fc_rpc_core::types::{FilterPool, PendingTransactions};4use jsonrpc_pubsub::manager::SubscriptionManager;5use pallet_ethereum::EthereumStorageSchema;6use sc_client_api::{7 backend::{AuxStore, StorageProvider},8 client::BlockchainEvents,9};10use pallet_nft::NftApi;11use sc_finality_grandpa::{12 FinalityProofProvider, GrandpaJustificationStream, SharedAuthoritySet, SharedVoterState,13};14use sc_network::NetworkService;15use sc_rpc::SubscriptionTaskExecutor;16pub use sc_rpc_api::DenyUnsafe;17use sp_api::ProvideRuntimeApi;18use sp_block_builder::BlockBuilder;19use sp_blockchain::{Error as BlockChainError, HeaderBackend, HeaderMetadata};20use sp_consensus::SelectChain;21use sp_transaction_pool::TransactionPool;22use std::{collections::BTreeMap, marker::PhantomData, sync::Arc};2324/// Public io handler for exporting into other modules25pub type IoHandler = jsonrpc_core::IoHandler<sc_rpc::Metadata>;2627/// Light client extra dependencies.28pub struct LightDeps<C, F, P> {29 /// The client instance to use.30 pub client: Arc<C>,31 /// Transaction pool instance.32 pub pool: Arc<P>,33 /// Remote access to the blockchain (async).34 pub remote_blockchain: Arc<dyn sc_client_api::light::RemoteBlockchain<Block>>,35 /// Fetcher instance.36 pub fetcher: Arc<F>,37}3839/// Extra dependencies for GRANDPA40pub struct GrandpaDeps<B> {41 /// Voting round info.42 pub shared_voter_state: SharedVoterState,43 /// Authority set info.44 pub shared_authority_set: SharedAuthoritySet<Hash, BlockNumber>,45 /// Receives notifications about justification events from Grandpa.46 pub justification_stream: GrandpaJustificationStream<Block>,47 /// Executor to drive the subscription manager in the Grandpa RPC handler.48 pub subscription_executor: SubscriptionTaskExecutor,49 /// Finality proof provider.50 pub finality_provider: Arc<FinalityProofProvider<B, Block>>,51}5253/// Full client dependencies.54pub struct FullDeps<C, P, SC> {55 /// The client instance to use.56 pub client: Arc<C>,57 /// Transaction pool instance.58 pub pool: Arc<P>,59 /// The SelectChain Strategy60 pub select_chain: SC,61 /// The Node authority flag62 pub is_authority: bool,63 /// Whether to enable dev signer64 pub enable_dev_signer: bool,65 /// Network service66 pub network: Arc<NetworkService<Block, Hash>>,67 /// Whether to deny unsafe calls68 pub deny_unsafe: DenyUnsafe,69 /// Ethereum pending transactions.70 pub pending_transactions: PendingTransactions,71 /// EthFilterApi pool.72 pub filter_pool: Option<FilterPool>,73 /// Backend.74 pub backend: Arc<fc_db::Backend<Block>>,75 /// Maximum number of logs in a query.76 pub max_past_logs: u32,77}7879struct AccountCodes<C, B> {80 client: Arc<C>,81 _marker: PhantomData<B>,82}8384impl<C, Block> AccountCodes<C, Block>85where86 Block: sp_api::BlockT,87 C: ProvideRuntimeApi<Block>,88{89 fn new(client: Arc<C>) -> Self {90 Self {91 client,92 _marker: PhantomData,93 }94 }95}9697impl<C, Block> fc_rpc::AccountCodeProvider<Block> for AccountCodes<C, Block>98where99 Block: sp_api::BlockT,100 C: ProvideRuntimeApi<Block>,101 C::Api: pallet_nft::NftApi<Block>,102{103 fn code(&self, block: &sp_api::BlockId<Block>, account: sp_core::H160) -> Option<Vec<u8>> {104 self.client105 .runtime_api()106 .eth_contract_code(block, account)107 .ok()108 .flatten()109 }110}111112/// Instantiate all Full RPC extensions.113pub fn create_full<C, P, SC, A, B>(114 deps: FullDeps<C, P, SC>,115 subscription_task_executor: SubscriptionTaskExecutor,116) -> jsonrpc_core::IoHandler<sc_rpc_api::Metadata>117where118 C: ProvideRuntimeApi<Block> + StorageProvider<Block, B> + AuxStore,119 C: HeaderBackend<Block> + HeaderMetadata<Block, Error = BlockChainError> + 'static,120 C: Send + Sync + 'static,121 C: BlockchainEvents<Block>,122 C::Api: substrate_frame_rpc_system::AccountNonceApi<Block, AccountId, Index>,123 C::Api: BlockBuilder<Block>,124 C::Api: pallet_contracts_rpc::ContractsRuntimeApi<Block, AccountId, Balance, BlockNumber, Hash>,125 C::Api: pallet_transaction_payment_rpc::TransactionPaymentRuntimeApi<Block, Balance>,126 C::Api: fp_rpc::EthereumRuntimeRPCApi<Block>,127 C::Api: pallet_nft::NftApi<Block>,128 P: TransactionPool<Block = Block> + 'static,129 SC: SelectChain<Block> + 'static,130 B: sc_client_api::Backend<Block> + Send + Sync + 'static,131 B::State: sc_client_api::backend::StateBackend<sp_runtime::traits::HashFor<Block>>,132{133 use fc_rpc::{134 EthApi, EthApiServer, EthDevSigner, EthFilterApi, EthFilterApiServer, EthPubSubApi,135 EthPubSubApiServer, EthSigner, HexEncodedIdProvider, NetApi, NetApiServer, Web3Api,136 Web3ApiServer,137 };138 use pallet_contracts_rpc::{Contracts, ContractsApi};139 use pallet_transaction_payment_rpc::{TransactionPayment, TransactionPaymentApi};140 use substrate_frame_rpc_system::{FullSystem, SystemApi};141142 let mut io = jsonrpc_core::IoHandler::default();143 let FullDeps {144 client,145 pool,146 select_chain: _,147 enable_dev_signer,148 is_authority,149 network,150 deny_unsafe,151 pending_transactions,152 filter_pool,153 backend,154 max_past_logs,155 } = deps;156157 io.extend_with(SystemApi::to_delegate(FullSystem::new(158 client.clone(),159 pool.clone(),160 deny_unsafe,161 )));162163 io.extend_with(TransactionPaymentApi::to_delegate(TransactionPayment::new(164 client.clone(),165 )));166167 io.extend_with(ContractsApi::to_delegate(Contracts::new(client.clone())));168169 let mut signers = Vec::new();170 if enable_dev_signer {171 signers.push(Box::new(EthDevSigner::new()) as Box<dyn EthSigner>);172 }173 let mut overrides_map = BTreeMap::new();174 overrides_map.insert(175 EthereumStorageSchema::V1,176 Box::new(SchemaV1Override::new_with_code_provider(177 client.clone(),178 Arc::new(AccountCodes::<C, Block>::new(client.clone())),179 )) as Box<dyn StorageOverride<_> + Send + Sync>,180 );181182 let overrides = Arc::new(OverrideHandle {183 schemas: overrides_map,184 fallback: Box::new(RuntimeApiStorageOverride::new(client.clone())),185 });186187 io.extend_with(EthApiServer::to_delegate(EthApi::new(188 client.clone(),189 pool.clone(),190 nft_runtime::TransactionConverter,191 network.clone(),192 pending_transactions,193 signers,194 overrides.clone(),195 backend,196 is_authority,197 max_past_logs,198 )));199200 if let Some(filter_pool) = filter_pool {201 io.extend_with(EthFilterApiServer::to_delegate(EthFilterApi::new(202 client.clone(),203 filter_pool,204 500_usize, // max stored filters205 overrides.clone(),206 max_past_logs,207 )));208 }209210 io.extend_with(NetApiServer::to_delegate(NetApi::new(211 client.clone(),212 network.clone(),213 // Whether to format the `peer_count` response as Hex (default) or not.214 true,215 )));216217 io.extend_with(Web3ApiServer::to_delegate(Web3Api::new(client.clone())));218219 io.extend_with(EthPubSubApiServer::to_delegate(EthPubSubApi::new(220 pool,221 client,222 network,223 SubscriptionManager::<HexEncodedIdProvider>::with_id_provider(224 HexEncodedIdProvider::default(),225 Arc::new(subscription_task_executor),226 ),227 overrides,228 )));229230 io231}232233/// Instantiate all Light RPC extensions.234pub fn create_light<C, P, M, F>(deps: LightDeps<C, F, P>) -> jsonrpc_core::IoHandler<M>235where236 C: sp_blockchain::HeaderBackend<Block>,237 C: Send + Sync + 'static,238 F: sc_client_api::light::Fetcher<Block> + 'static,239 P: TransactionPool + 'static,240 M: jsonrpc_core::Metadata + Default,241{242 use substrate_frame_rpc_system::{LightSystem, SystemApi};243244 let LightDeps {245 client,246 pool,247 remote_blockchain,248 fetcher,249 } = deps;250 let mut io = jsonrpc_core::IoHandler::default();251 io.extend_with(SystemApi::<Hash, AccountId, Index>::to_delegate(252 LightSystem::new(client, remote_blockchain, fetcher, pool),253 ));254255 io256}