chain/ethereum: migrate latest_block_header call to use alloy

Author: incrypto32

chain/ethereum/src/adapter.rs

@@ -26,6 +26,8 @@ use graph::{
     petgraph::{self, graphmap::GraphMap},
 };
 
+use graph::blockchain::BlockPtr;
+
 const COMBINED_FILTER_TYPE_URL: &str =
     "type.googleapis.com/sf.ethereum.transform.v1.CombinedFilter";
 
@@ -1083,10 +1085,7 @@ pub trait EthereumAdapter: Send + Sync + 'static {
     async fn latest_block(&self, logger: &Logger) -> Result<LightEthereumBlock, bc::IngestorError>;
 
     /// Get the latest block, with only the header and transaction hashes.
-    async fn latest_block_header(
-        &self,
-        logger: &Logger,
-    ) -> Result<web3::types::Block<H256>, bc::IngestorError>;
+    async fn latest_block_header(&self, logger: &Logger) -> Result<BlockPtr, bc::IngestorError>;
 
     async fn load_block(
         &self,

chain/ethereum/src/ethereum_adapter.rs

@@ -1303,26 +1303,27 @@ impl EthereumAdapterTrait for EthereumAdapter {
         Ok(ident)
     }
 
-    async fn latest_block_header(
-        &self,
-        logger: &Logger,
-    ) -> Result<web3::types::Block<H256>, IngestorError> {
-        let web3 = self.web3.clone();
+    async fn latest_block_header(&self, logger: &Logger) -> Result<BlockPtr, IngestorError> {
+        let alloy = self.alloy.clone();
         retry("eth_getBlockByNumber(latest) no txs RPC call", logger)
             .redact_log_urls(true)
             .no_limit()
             .timeout_secs(ENV_VARS.json_rpc_timeout.as_secs())
             .run(move || {
-                let web3 = web3.cheap_clone();
+                let alloy = alloy.cheap_clone();
                 async move {
-                    let block_opt = web3
-                        .eth()
-                        .block(Web3BlockNumber::Latest.into())
+                    let block_opt = alloy
+                        .get_block_by_number(alloy::rpc::types::BlockNumberOrTag::Latest)
                         .await
                         .map_err(|e| anyhow!("could not get latest block from Ethereum: {}", e))?;
 
-                    block_opt
-                        .ok_or_else(|| anyhow!("no latest block returned from Ethereum").into())
+                    let block = block_opt
+                        .ok_or_else(|| anyhow!("no latest block returned from Ethereum"))?;
+
+                    Ok(BlockPtr::from((
+                        block.header.hash,
+                        block.header.number as i32,
+                    )))
                 }
             })
             .map_err(move |e| {

chain/ethereum/src/ingestor.rs

@@ -206,10 +206,7 @@ impl PollingBlockIngestor {
         logger: &Logger,
         eth_adapter: &Arc<EthereumAdapter>,
     ) -> Result<BlockPtr, IngestorError> {
-        eth_adapter
-            .latest_block_header(&logger)
-            .await
-            .map(|block| block.into())
+        eth_adapter.latest_block_header(&logger).await
     }
 
     async fn eth_adapter(&self) -> anyhow::Result<Arc<EthereumAdapter>> {