feat: define state related eth_* rpc endpoints (#1366)

ethereum · Aug 8, 2024 · 928459b · 928459b
1 parent 57bb4b5
commit 928459b
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 11 deletions.
diff --git a/ethportal-api/src/eth.rs b/ethportal-api/src/eth.rs
@@ -1,6 +1,6 @@
-use alloy_primitives::{B256, U256};
+use alloy_primitives::{Address, Bytes, B256, U256};
 use jsonrpsee::{core::RpcResult, proc_macros::rpc};
-use reth_rpc_types::Block;
+use reth_rpc_types::{Block, BlockId};
 
 /// Web3 JSON-RPC endpoints
 #[rpc(client, server, namespace = "eth")]
@@ -14,4 +14,18 @@ pub trait EthApi {
         block_hash: B256,
         hydrated_transactions: bool,
     ) -> RpcResult<Block>;
+
+    #[method(name = "getBalance")]
+    async fn get_balance(&self, address: Address, block: BlockId) -> RpcResult<U256>;
+
+    #[method(name = "getCode")]
+    async fn get_code(&self, address: Address, block: BlockId) -> RpcResult<Bytes>;
+
+    #[method(name = "getStorageAt")]
+    async fn get_storage_at(
+        &self,
+        address: Address,
+        slot: U256,
+        block: BlockId,
+    ) -> RpcResult<Bytes>;
 }
diff --git a/rpc/src/builder.rs b/rpc/src/builder.rs
@@ -412,7 +412,8 @@ impl RpcModuleBuilder {
                                 .history_tx
                                 .clone()
                                 .expect("History protocol not initialized");
-                            EthApi::new(history_tx).into_rpc().into()
+                            let state_tx = self.state_tx.clone();
+                            EthApi::new(history_tx, state_tx).into_rpc().into()
                         }
                         PortalRpcModule::History => {
                             let history_tx = self

diff --git a/rpc/src/eth_rpc.rs b/rpc/src/eth_rpc.rs
@@ -1,9 +1,12 @@
-use alloy_primitives::{B256, U256};
-use reth_rpc_types::{other::OtherFields, Block, BlockTransactions};
+use alloy_primitives::{Address, Bytes, B256, U256};
+use reth_rpc_types::{other::OtherFields, Block, BlockId, BlockTransactions};
 use tokio::sync::mpsc;
 
 use ethportal_api::{
-    types::{execution::block_body::BlockBody, jsonrpc::request::HistoryJsonRpcRequest},
+    types::{
+        execution::block_body::BlockBody,
+        jsonrpc::request::{HistoryJsonRpcRequest, StateJsonRpcRequest},
+    },
     EthApiServer,
 };
 use trin_validation::constants::CHAIN_ID;
@@ -15,12 +18,19 @@ use crate::{
 };
 
 pub struct EthApi {
-    network: mpsc::UnboundedSender<HistoryJsonRpcRequest>,
+    history_network: mpsc::UnboundedSender<HistoryJsonRpcRequest>,
+    _state_network: Option<mpsc::UnboundedSender<StateJsonRpcRequest>>,
 }
 
 impl EthApi {
-    pub fn new(network: mpsc::UnboundedSender<HistoryJsonRpcRequest>) -> Self {
-        Self { network }
+    pub fn new(
+        history_network: mpsc::UnboundedSender<HistoryJsonRpcRequest>,
+        state_network: Option<mpsc::UnboundedSender<StateJsonRpcRequest>>,
+    ) -> Self {
+        Self {
+            history_network,
+            _state_network: state_network,
+        }
     }
 }
 
@@ -42,8 +52,8 @@ impl EthApiServer for EthApi {
             .into());
         }
 
-        let header = find_header_by_hash(&self.network, block_hash).await?;
-        let body = find_block_body_by_hash(&self.network, block_hash).await?;
+        let header = find_header_by_hash(&self.history_network, block_hash).await?;
+        let body = find_block_body_by_hash(&self.history_network, block_hash).await?;
         let transactions = match body {
             BlockBody::Legacy(body) => body.txs,
             BlockBody::Merge(body) => body.txs,
@@ -67,6 +77,23 @@ impl EthApiServer for EthApi {
         };
         Ok(block)
     }
+
+    async fn get_balance(&self, _address: Address, _block: BlockId) -> RpcResult<U256> {
+        todo!()
+    }
+
+    async fn get_code(&self, _address: Address, _block: BlockId) -> RpcResult<Bytes> {
+        todo!()
+    }
+
+    async fn get_storage_at(
+        &self,
+        _address: Address,
+        _slot: U256,
+        _block: BlockId,
+    ) -> RpcResult<Bytes> {
+        todo!()
+    }
 }
 
 impl std::fmt::Debug for EthApi {