chain/ethereum: migrate get_code call to use alloy

Author: incrypto32

chain/ethereum/src/adapter.rs

@@ -9,7 +9,6 @@ use graph::data_source::common::ContractCall;
 use graph::firehose::CallToFilter;
 use graph::firehose::CombinedFilter;
 use graph::firehose::LogFilter;
-use graph::prelude::web3::types::Bytes;
 use graph::prelude::web3::types::H160;
 use itertools::Itertools;
 use prost::Message;
@@ -1182,9 +1181,9 @@ pub trait EthereumAdapter: Send + Sync + 'static {
     async fn get_code(
         &self,
         logger: &Logger,
-        address: H160,
+        address: alloy::primitives::Address,
         block_ptr: BlockPtr,
-    ) -> Result<Bytes, EthereumRpcError>;
+    ) -> Result<alloy::primitives::Bytes, EthereumRpcError>;
 }
 
 #[cfg(test)]

chain/ethereum/src/ethereum_adapter.rs

@@ -33,8 +33,8 @@ use graph::{
         web3::{
             self,
             types::{
-                Address, BlockId, BlockNumber as Web3BlockNumber, Bytes, CallRequest, Filter,
-                FilterBuilder, Log, Transaction, TransactionReceipt, H256,
+                BlockId, BlockNumber as Web3BlockNumber, Bytes, CallRequest, Filter, FilterBuilder,
+                Log, Transaction, TransactionReceipt, H256,
             },
         },
         BlockNumber, ChainStore, CheapClone, DynTryFuture, Error, EthereumCallCache, Logger,
@@ -531,13 +531,13 @@ impl EthereumAdapter {
     async fn code(
         &self,
         logger: &Logger,
-        address: Address,
+        address: alloy::primitives::Address,
         block_ptr: BlockPtr,
-    ) -> Result<Bytes, EthereumRpcError> {
-        let web3 = self.web3.clone();
+    ) -> Result<alloy::primitives::Bytes, EthereumRpcError> {
+        let alloy = self.alloy.clone();
         let logger = Logger::new(&logger, o!("provider" => self.provider.clone()));
 
-        let block_id = self.block_ptr_to_id(&block_ptr);
+        let block_id = self.block_ptr_to_alloy_block_id(&block_ptr);
         let retry_log_message = format!("eth_getCode RPC call for block {}", block_ptr);
 
         retry(retry_log_message, &logger)
@@ -549,13 +549,12 @@ impl EthereumAdapter {
             .limit(ENV_VARS.request_retries)
             .timeout_secs(ENV_VARS.json_rpc_timeout.as_secs())
             .run(move || {
-                let web3 = web3.cheap_clone();
+                let alloy = alloy.cheap_clone();
                 async move {
-                    let result: Result<Bytes, web3::Error> =
-                        web3.eth().code(address, Some(block_id)).boxed().await;
+                    let result = alloy.get_code_at(address).block_id(block_id).await;
                     match result {
                         Ok(code) => Ok(code),
-                        Err(err) => Err(EthereumRpcError::Web3Error(err)),
+                        Err(err) => Err(EthereumRpcError::AlloyError(err)),
                     }
                 }
             })
@@ -1513,9 +1512,9 @@ impl EthereumAdapterTrait for EthereumAdapter {
     async fn get_code(
         &self,
         logger: &Logger,
-        address: H160,
+        address: alloy::primitives::Address,
         block_ptr: BlockPtr,
-    ) -> Result<Bytes, EthereumRpcError> {
+    ) -> Result<alloy::primitives::Bytes, EthereumRpcError> {
         debug!(
             logger, "eth_getCode";
             "address" => format!("{}", address),

chain/ethereum/src/runtime/runtime_adapter.rs

@@ -17,7 +17,6 @@ use graph::data::subgraph::API_VERSION_0_0_9;
 use graph::data_source;
 use graph::data_source::common::{ContractCall, MappingABI};
 use graph::prelude::web3::types::Address;
-use graph::prelude::web3::types::H160;
 use graph::runtime::gas::Gas;
 use graph::runtime::{AscIndexId, IndexForAscTypeId};
 use graph::slog::debug;
@@ -259,10 +258,10 @@ fn eth_has_code(
     let logger = &ctx.logger;
     let block_ptr = &ctx.block_ptr;
 
-    let address: H160 = asc_get(ctx.heap, wasm_ptr.into(), &ctx.gas, 0)?;
+    let address: alloy::primitives::Address = asc_get(ctx.heap, wasm_ptr.into(), &ctx.gas, 0)?;
 
     let result = graph::block_on(eth_adapter.get_code(logger, address, block_ptr.clone()))
-        .map(|v| !v.0.is_empty());
+        .map(|v| !v.is_empty());
 
     match result {
         Ok(v) => Ok(asc_new(ctx.heap, &AscWrapped { inner: v }, &ctx.gas)?),