chain/ethereum: Add alloy provider to ethereum adapter

Author: incrypto32

chain/ethereum/src/ethereum_adapter.rs

@@ -1,3 +1,5 @@
+use alloy::primitives::B256;
+use alloy::providers::{Provider, ProviderBuilder};
 use futures03::{future::BoxFuture, stream::FuturesUnordered};
 use graph::abi;
 use graph::abi::DynSolValueExt;
@@ -72,23 +74,40 @@ use crate::{
     ENV_VARS,
 };
 
-#[derive(Debug, Clone)]
+#[derive(Clone)]
 pub struct EthereumAdapter {
     logger: Logger,
     provider: String,
     web3: Arc<Web3<Transport>>,
+    alloy: Arc<dyn Provider>,
     metrics: Arc<ProviderEthRpcMetrics>,
     supports_eip_1898: bool,
     call_only: bool,
     supports_block_receipts: Arc<RwLock<Option<bool>>>,
 }
 
+impl std::fmt::Debug for EthereumAdapter {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("EthereumAdapter")
+            .field("logger", &self.logger)
+            .field("provider", &self.provider)
+            .field("web3", &self.web3)
+            .field("alloy", &"<Provider>")
+            .field("metrics", &self.metrics)
+            .field("supports_eip_1898", &self.supports_eip_1898)
+            .field("call_only", &self.call_only)
+            .field("supports_block_receipts", &self.supports_block_receipts)
+            .finish()
+    }
+}
+
 impl CheapClone for EthereumAdapter {
     fn cheap_clone(&self) -> Self {
         Self {
             logger: self.logger.clone(),
             provider: self.provider.clone(),
             web3: self.web3.cheap_clone(),
+            alloy: self.alloy.clone(),
             metrics: self.metrics.cheap_clone(),
             supports_eip_1898: self.supports_eip_1898,
             call_only: self.call_only,
@@ -238,12 +257,24 @@ impl EthereumAdapter {
         supports_eip_1898: bool,
         call_only: bool,
     ) -> Self {
+        let rpc_url = match &transport {
+            Transport::RPC {
+                client: _,
+                metrics: _,
+                provider: _,
+                rpc_url,
+            } => rpc_url.clone(),
+            Transport::IPC(_ipc) => todo!(),
+            Transport::WS(_web_socket) => todo!(),
+        };
         let web3 = Arc::new(Web3::new(transport));
+        let alloy = Arc::new(ProviderBuilder::new().connect(&rpc_url).await.unwrap());
 
         EthereumAdapter {
             logger,
             provider,
             web3,
+            alloy,
             metrics: provider_metrics,
             supports_eip_1898,
             call_only,

chain/ethereum/src/transport.rs

@@ -17,6 +17,7 @@ pub enum Transport {
         client: http::Http,
         metrics: Arc<EndpointMetrics>,
         provider: ProviderName,
+        url: String,
     },
     IPC(ipc::Ipc),
     WS(ws::WebSocket),
@@ -56,10 +57,13 @@ impl Transport {
             .build()
             .unwrap();
 
+        let rpc_url = rpc.to_string();
+
         Transport::RPC {
             client: http::Http::with_client(client, rpc),
             metrics,
             provider: provider.as_ref().into(),
+            url: rpc_url,
         }
     }
 }
@@ -73,6 +77,7 @@ impl web3::Transport for Transport {
                 client,
                 metrics: _,
                 provider: _,
+                url: _,
             } => client.prepare(method, params),
             Transport::IPC(ipc) => ipc.prepare(method, params),
             Transport::WS(ws) => ws.prepare(method, params),
@@ -85,6 +90,7 @@ impl web3::Transport for Transport {
                 client,
                 metrics,
                 provider,
+                url: _,
             } => {
                 let metrics = metrics.cheap_clone();
                 let client = client.clone();
@@ -132,6 +138,7 @@ impl web3::BatchTransport for Transport {
                 client,
                 metrics: _,
                 provider: _,
+                url: _,
             } => Box::new(client.send_batch(requests)),
             Transport::IPC(ipc) => Box::new(ipc.send_batch(requests)),
             Transport::WS(ws) => Box::new(ws.send_batch(requests)),