graph, chain, runtime: re export alloy from graph crate and use it

Author: incrypto32

Cargo.lock

@@ -4,8 +4,6 @@ version.workspace = true
 edition.workspace = true
 
 [dependencies]
-alloy.workspace = true
-alloy-rpc-types.workspace = true
 envconfig = "0.11.0"
 jsonrpc-core = "18.0.0"
 graph = { path = "../../graph" }

chain/ethereum/Cargo.toml

@@ -1,5 +1,3 @@
-use alloy::transports::RpcError;
-use alloy::transports::TransportErrorKind;
 use anyhow::Error;
 use graph::abi;
 use graph::blockchain::ChainIdentifier;
@@ -9,6 +7,7 @@ use graph::data_source::common::ContractCall;
 use graph::firehose::CallToFilter;
 use graph::firehose::CombinedFilter;
 use graph::firehose::LogFilter;
+use graph::prelude::alloy::transports::{RpcError, TransportErrorKind};
 use graph::prelude::web3::types::H160;
 use itertools::Itertools;
 use prost::Message;

chain/ethereum/src/adapter.rs

@@ -1,5 +1,3 @@
-use alloy::primitives::B256;
-use alloy::providers::{Provider, ProviderBuilder};
 use futures03::{future::BoxFuture, stream::FuturesUnordered};
 use graph::abi;
 use graph::abi::DynSolValueExt;
@@ -21,6 +19,7 @@ use graph::futures03::future::try_join_all;
 use graph::futures03::{
     self, compat::Future01CompatExt, FutureExt, StreamExt, TryFutureExt, TryStreamExt,
 };
+use graph::prelude::alloy;
 use graph::prelude::tokio::try_join;
 use graph::slog::o;
 use graph::tokio::sync::RwLock;
@@ -78,7 +77,7 @@ pub struct EthereumAdapter {
     logger: Logger,
     provider: String,
     web3: Arc<Web3<Transport>>,
-    alloy: Arc<dyn Provider>,
+    alloy: Arc<dyn alloy::providers::Provider>,
     metrics: Arc<ProviderEthRpcMetrics>,
     supports_eip_1898: bool,
     call_only: bool,
@@ -139,7 +138,12 @@ impl EthereumAdapter {
             Transport::WS(_web_socket) => todo!(),
         };
         let web3 = Arc::new(Web3::new(transport));
-        let alloy = Arc::new(ProviderBuilder::new().connect(&rpc_url).await.unwrap());
+        let alloy = Arc::new(
+            alloy::providers::ProviderBuilder::new()
+                .connect(&rpc_url)
+                .await
+                .unwrap(),
+        );
 
         EthereumAdapter {
             logger,
@@ -520,11 +524,13 @@ impl EthereumAdapter {
         }
     }
 
-    fn block_ptr_to_alloy_block_id(&self, block_ptr: &BlockPtr) -> alloy_rpc_types::BlockId {
+    fn block_ptr_to_alloy_block_id(&self, block_ptr: &BlockPtr) -> alloy::rpc::types::BlockId {
         if !self.supports_eip_1898 {
-            alloy_rpc_types::BlockId::number(block_ptr.number as u64)
+            alloy::rpc::types::BlockId::number(block_ptr.number as u64)
         } else {
-            alloy_rpc_types::BlockId::hash(B256::new(*block_ptr.hash_as_h256().as_fixed_bytes()))
+            alloy::rpc::types::BlockId::hash(alloy::primitives::B256::new(
+                *block_ptr.hash_as_h256().as_fixed_bytes(),
+            ))
         }
     }
 
@@ -838,7 +844,7 @@ impl EthereumAdapter {
 
                         async move {
                             let block_result = alloy
-                                .get_block_by_number(alloy_rpc_types::BlockNumberOrTag::Number(
+                                .get_block_by_number(alloy::rpc::types::BlockNumberOrTag::Number(
                                     number as u64,
                                 ))
                                 .await;
@@ -897,7 +903,7 @@ impl EthereumAdapter {
                     let alloy = alloy.cheap_clone();
                     async move {
                         let block = alloy
-                            .get_block_by_number(alloy_rpc_types::BlockNumberOrTag::Number(
+                            .get_block_by_number(alloy::rpc::types::BlockNumberOrTag::Number(
                                 block_num as u64,
                             ))
                             .await?;
@@ -1509,7 +1515,7 @@ impl EthereumAdapterTrait for EthereumAdapter {
                     let alloy = alloy.cheap_clone();
                     async move {
                         alloy
-                            .get_block_by_number(alloy_rpc_types::BlockNumberOrTag::Number(
+                            .get_block_by_number(alloy::rpc::types::BlockNumberOrTag::Number(
                                 next_number as u64,
                             ))
                             .await

chain/ethereum/src/ethereum_adapter.rs

@@ -23,7 +23,7 @@ use graph::slog::debug;
 use graph::{
     blockchain::{self, BlockPtr, HostFnCtx},
     cheap_clone::CheapClone,
-    prelude::EthereumCallCache,
+    prelude::{alloy, EthereumCallCache},
     runtime::{asc_get, asc_new, AscPtr, HostExportError},
     semver::Version,
     slog::Logger,

chain/ethereum/src/runtime/runtime_adapter.rs

@@ -79,6 +79,7 @@ pub use url;
 /// ```
 pub mod prelude {
     pub use ::anyhow;
+    pub use alloy;
     pub use anyhow::{anyhow, Context as _, Error};
     pub use async_trait::async_trait;
     pub use atty;

graph/src/lib.rs

@@ -4,7 +4,6 @@ version.workspace = true
 edition.workspace = true
 
 [dependencies]
-alloy = { workspace = true }
 async-trait = "0.1.50"
 hex = "0.4.3"
 graph = { path = "../../graph" }

runtime/wasm/Cargo.toml

@@ -8,8 +8,11 @@ use graph::runtime::{
     asc_get, asc_new, AscIndexId, AscPtr, AscType, AscValue, HostExportError, ToAscObj,
 };
 use graph::{data::store, runtime::DeterministicHostError};
-use graph::{prelude::serde_json, runtime::FromAscObj};
 use graph::{prelude::web3::types as web3, runtime::AscHeap};
+use graph::{
+    prelude::{alloy, serde_json},
+    runtime::FromAscObj,
+};
 use graph_runtime_derive::AscType;
 
 use crate::asc_abi::class::*;