From d290857680ec3f91aef1fded1856c1121379408b Mon Sep 17 00:00:00 2001
From: tgmichel <telmo@purestake.com>
Date: Thu, 4 Jun 2020 13:02:52 +0200
Subject: [PATCH] Add StorageProvider trait bound to Client (#24)

---
 rpc/Cargo.toml           |  3 +++
 rpc/src/lib.rs           | 16 ++++++++++------
 template/node/src/rpc.rs |  8 ++++++--
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml
index f16ae4300..170b94cae 100644
--- a/rpc/Cargo.toml
+++ b/rpc/Cargo.toml
@@ -17,6 +17,9 @@ sp-runtime = { path = "../vendor/substrate/primitives/runtime" }
 sp-api = { path = "../vendor/substrate/primitives/api" }
 sp-consensus = { path = "../vendor/substrate/primitives/consensus/common" }
 sp-transaction-pool = { path = "../vendor/substrate/primitives/transaction-pool" }
+sp-storage = { path = "../vendor/substrate/primitives/storage" } 
+sc-service = { path = "../vendor/substrate/client/service" }
+sc-client-api = { path = "../vendor/substrate/client/api" }
 ethereum = { version = "0.2", features = ["codec"] }
 codec = { package = "parity-scale-codec", version = "1.0.0" }
 rlp = "0.4"
diff --git a/rpc/src/lib.rs b/rpc/src/lib.rs
index 7bac0bbd8..fbfe6fe3b 100644
--- a/rpc/src/lib.rs
+++ b/rpc/src/lib.rs
@@ -23,7 +23,9 @@ use sp_runtime::transaction_validity::TransactionSource;
 use sp_api::{ProvideRuntimeApi, BlockId};
 use sp_consensus::SelectChain;
 use sp_transaction_pool::TransactionPool;
+use sc_client_api::backend::{StorageProvider, Backend, StateBackend};
 use sha3::{Keccak256, Digest};
+use sp_runtime::traits::BlakeTwo256;
 
 use frontier_rpc_core::EthApi as EthApiT;
 use frontier_rpc_core::types::{
@@ -42,15 +44,15 @@ fn internal_err(message: &str) -> Error {
 	}
 }
 
-pub struct EthApi<B: BlockT, C, SC, P, CT> {
+pub struct EthApi<B: BlockT, C, SC, P, CT, BE> {
 	pool: Arc<P>,
 	client: Arc<C>,
 	select_chain: SC,
 	convert_transaction: CT,
-	_marker: PhantomData<B>,
+	_marker: PhantomData<(B,BE)>,
 }
 
-impl<B: BlockT, C, SC, P, CT> EthApi<B, C, SC, P, CT> {
+impl<B: BlockT, C, SC, P, CT, BE> EthApi<B, C, SC, P, CT, BE> {
 	pub fn new(
 		client: Arc<C>,
 		select_chain: SC,
@@ -61,10 +63,12 @@ impl<B: BlockT, C, SC, P, CT> EthApi<B, C, SC, P, CT> {
 	}
 }
 
-impl<B, C, SC, P, CT> EthApiT for EthApi<B, C, SC, P, CT> where
-	C: ProvideRuntimeApi<B>,
+impl<B, C, SC, P, CT, BE> EthApiT for EthApi<B, C, SC, P, CT, BE> where
+	C: ProvideRuntimeApi<B> + StorageProvider<B,BE>,
 	C::Api: EthereumRuntimeApi<B>,
-	B: BlockT + Send + Sync + 'static,
+	BE: Backend<B> + 'static,
+	BE::State: StateBackend<BlakeTwo256>,
+	B: BlockT<Hash=H256> + Send + Sync + 'static,
 	C: Send + Sync + 'static,
 	SC: SelectChain<B> + Clone + 'static,
 	P: TransactionPool<Block=B> + Send + Sync + 'static,
diff --git a/template/node/src/rpc.rs b/template/node/src/rpc.rs
index 3ca45ee28..11ffc96f9 100644
--- a/template/node/src/rpc.rs
+++ b/template/node/src/rpc.rs
@@ -25,6 +25,8 @@ use sp_transaction_pool::TransactionPool;
 use sp_blockchain::{Error as BlockChainError, HeaderMetadata, HeaderBackend};
 use sp_consensus::SelectChain;
 use sc_rpc_api::DenyUnsafe;
+use sc_client_api::backend::{StorageProvider, Backend, StateBackend};
+use sp_runtime::traits::BlakeTwo256;
 
 /// Light client extra dependencies.
 pub struct LightDeps<C, F, P> {
@@ -51,10 +53,12 @@ pub struct FullDeps<C, P, SC> {
 }
 
 /// Instantiate all Full RPC extensions.
-pub fn create_full<C, P, M, SC>(
+pub fn create_full<C, P, M, SC, BE>(
 	deps: FullDeps<C, P, SC>,
 ) -> jsonrpc_core::IoHandler<M> where
-	C: ProvideRuntimeApi<Block>,
+	BE: Backend<Block> + 'static,
+	BE::State: StateBackend<BlakeTwo256>,
+	C: ProvideRuntimeApi<Block> + StorageProvider<Block, BE>,
 	C: HeaderBackend<Block> + HeaderMetadata<Block, Error=BlockChainError> + 'static,
 	C: Send + Sync + 'static,
 	C::Api: substrate_frame_rpc_system::AccountNonceApi<Block, AccountId, Index>,