graph, chain/ethereum: migrate ContractCall to use alloy address

Author: incrypto32

chain/ethereum/src/ethereum_adapter.rs

@@ -615,9 +615,7 @@ impl EthereumAdapter {
                         .input(TransactionInput::both(alloy::primitives::Bytes::from(
                             call_data.encoded_call.to_vec(),
                         )))
-                        .to(alloy::primitives::Address::from(
-                            call_data.address.as_fixed_bytes(),
-                        ));
+                        .to(call_data.address);
 
                     if let Some(gas) = gas {
                         req = req.gas_limit(gas as u64);

chain/ethereum/src/runtime/runtime_adapter.rs

@@ -16,7 +16,6 @@ use graph::data::store::scalar::BigInt;
 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::runtime::gas::Gas;
 use graph::runtime::{AscIndexId, IndexForAscTypeId};
 use graph::slog::debug;
@@ -390,7 +389,7 @@ fn eth_call(
 #[derive(Clone, Debug)]
 pub struct UnresolvedContractCall {
     pub contract_name: String,
-    pub contract_address: Address,
+    pub contract_address: alloy::primitives::Address,
     pub function_name: String,
     pub function_signature: Option<String>,
     pub function_args: Vec<abi::DynSolValue>,

graph/src/cheap_clone.rs

@@ -119,3 +119,4 @@ cheap_clone_is_copy!(
     std::time::Duration
 );
 cheap_clone_is_copy!(web3::types::Address);
+cheap_clone_is_copy!(alloy::primitives::Address);

graph/src/data/store/ethereum.rs

@@ -104,15 +104,15 @@ pub mod call {
     /// on the call's return value
     #[derive(Debug, Clone, CheapClone)]
     pub struct Request {
-        pub address: web3::types::Address,
+        pub address: alloy::primitives::Address,
         pub encoded_call: Arc<Bytes>,
         /// The index is set by the caller and is used to identify the
         /// request in related data structures that the caller might have
         pub index: u32,
     }
 
     impl Request {
-        pub fn new(address: web3::types::Address, encoded_call: Vec<u8>, index: u32) -> Self {
+        pub fn new(address: alloy::primitives::Address, encoded_call: Vec<u8>, index: u32) -> Self {
             Request {
                 address,
                 encoded_call: Arc::new(Bytes::from(encoded_call)),

graph/src/data_source/common.rs

@@ -643,7 +643,7 @@ impl DeclaredCall {
         (
             ContractCall {
                 contract_name: self.contract_name,
-                address: self.address,
+                address: alloy::primitives::Address::from(self.address.as_fixed_bytes()),
                 block_ptr,
                 function: self.function,
                 args: self.args,
@@ -656,7 +656,7 @@ impl DeclaredCall {
 #[derive(Clone, Debug)]
 pub struct ContractCall {
     pub contract_name: String,
-    pub address: Address,
+    pub address: alloy::primitives::Address,
     pub block_ptr: BlockPtr,
     pub function: abi::Function,
     pub args: Vec<abi::DynSolValue>,

store/test-store/tests/postgres/chain_head.rs

@@ -9,11 +9,11 @@ use graph::futures03::executor;
 use std::future::Future;
 use std::sync::Arc;
 
+use graph::cheap_clone::CheapClone;
 use graph::prelude::web3::types::H256;
+use graph::prelude::{alloy, serde_json as json, EthereumBlock};
 use graph::prelude::{anyhow::anyhow, anyhow::Error};
-use graph::prelude::{serde_json as json, EthereumBlock};
 use graph::prelude::{BlockNumber, QueryStoreManager, QueryTarget};
-use graph::{cheap_clone::CheapClone, prelude::web3::types::H160};
 use graph::{components::store::BlockStore as _, prelude::DeploymentHash};
 use graph::{
     components::store::ChainHeadStore as _, components::store::ChainStore as _,
@@ -430,7 +430,9 @@ fn eth_call_cache() {
             call::Retval::Value(Bytes::from(value))
         }
 
-        let address = H160([1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1]);
+        let address = alloy::primitives::Address::from_slice(&[
+            1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1,
+        ]);
         let call: [u8; 6] = [1, 2, 3, 4, 5, 6];
         let return_value: [u8; 3] = [7, 8, 9];