fix(hubble): support arbitrum transaction types

Author: qlp

hubble/src/indexer/eth/block_handle.rs

@@ -1,4 +1,4 @@
-use alloy::rpc::types::Block;
+use alloy::network::AnyRpcBlock;
 use axum::async_trait;
 use color_eyre::eyre::Report;
 use futures::{stream::FuturesOrdered, Stream};
@@ -21,7 +21,7 @@ use crate::{
 
 #[derive(Clone)]
 pub enum BlockDetails {
-    Lazy(Block),
+    Lazy(AnyRpcBlock),
     Eager(Option<BlockInsert>),
 }
 
@@ -30,7 +30,7 @@ pub enum BlockDetails {
 pub struct BlockInsert {
     pub chain_id: ChainId,
     pub hash: String,
-    pub header: Block,
+    pub header: AnyRpcBlock,
     pub height: i32,
     pub time: OffsetDateTime,
     pub transactions: Vec<TransactionInsert>,

hubble/src/indexer/eth/fetcher_client.rs

@@ -2,8 +2,9 @@ use std::{collections::HashMap, fmt::Display};
 
 use alloy::{
     eips::BlockId,
+    network::AnyRpcBlock,
     primitives::{Address, BloomInput, FixedBytes},
-    rpc::types::{Block, BlockTransactionsKind, Filter, Log},
+    rpc::types::{BlockTransactionsKind, Filter, Log},
 };
 use axum::async_trait;
 use color_eyre::eyre::Report;
@@ -45,7 +46,7 @@ trait BlockReferenceProvider {
     fn block_reference(&self) -> Result<BlockReference, Report>;
 }
 
-impl BlockReferenceProvider for Block {
+impl BlockReferenceProvider for AnyRpcBlock {
     fn block_reference(&self) -> Result<BlockReference, Report> {
         Ok(BlockReference {
             height: self.header.number,
@@ -110,6 +111,8 @@ impl EthFetcherClient {
             )
             .await;
 
+        info!("block: {block:?}");
+
         match block {
             Ok(rpc_result) => match rpc_result {
                 Some(result) => {
@@ -147,7 +150,7 @@ impl EthFetcherClient {
 
     pub async fn fetch_details(
         &self,
-        block: &Block,
+        block: &AnyRpcBlock,
         provider_id: RpcProviderId,
     ) -> Result<Option<BlockInsert>, IndexerError> {
         let block_reference = block.block_reference()?;

hubble/src/indexer/eth/postgres.rs

@@ -1,4 +1,4 @@
-use alloy::rpc::types::Block;
+use alloy::network::AnyRpcBlock;
 use itertools::Itertools;
 use serde::{Deserialize, Serialize};
 use sqlx::{PgPool, Postgres, Transaction};
@@ -26,7 +26,7 @@ pub struct PgLog {
 #[derive(Serialize, Deserialize)]
 pub struct PgLogData {
     pub transactions: Vec<TransactionInsert>,
-    pub header: Block,
+    pub header: AnyRpcBlock,
 }
 
 impl From<BlockInsert> for PgLog {

hubble/src/indexer/eth/provider.rs

@@ -1,9 +1,9 @@
 use alloy::{
     eips::BlockId,
-    network::{Ethereum, Network},
+    network::{AnyNetwork, AnyRpcBlock, Network},
     primitives::TxHash,
     providers::{Provider as AlloyProvider, ProviderBuilder, RootProvider},
-    rpc::types::{Block, BlockTransactionsKind, Filter, Log},
+    rpc::types::{BlockTransactionsKind, Filter, Log},
     transports::{
         http::{Client, Http},
         RpcError, TransportErrorKind,
@@ -15,7 +15,7 @@ use crate::race_client::{RaceClient, RaceClientId, RaceClientResponse};
 
 #[derive(Clone, Debug)]
 pub struct Provider {
-    pub rpc_client: RaceClient<RootProvider<Http<Client>>>,
+    pub rpc_client: RaceClient<RootProvider<Http<Client>, AnyNetwork>>,
 }
 
 #[derive(Clone, Debug, Copy)]
@@ -56,7 +56,7 @@ impl Provider {
             rpc_client: RaceClient::new(
                 rpc_urls
                     .into_iter()
-                    .map(|url| ProviderBuilder::new().on_http(url))
+                    .map(|url| ProviderBuilder::new().network::<AnyNetwork>().on_http(url))
                     .collect(),
             ),
         }
@@ -77,7 +77,7 @@ impl Provider {
         id: BlockId,
         kind: BlockTransactionsKind,
         provider_id: Option<RpcProviderId>,
-    ) -> Result<Option<RpcResult<Block>>, RpcError<TransportErrorKind>> {
+    ) -> Result<Option<RpcResult<AnyRpcBlock>>, RpcError<TransportErrorKind>> {
         self.rpc_client
             .race_some(provider_id.map(Into::into), |c| c.get_block(id, kind))
             .await
@@ -100,7 +100,7 @@ impl Provider {
         tx_hash: TxHash,
         provider_id: Option<RpcProviderId>,
     ) -> Result<
-        Option<RpcResult<<Ethereum as Network>::TransactionResponse>>,
+        Option<RpcResult<<AnyNetwork as Network>::TransactionResponse>>,
         RpcError<TransportErrorKind>,
     > {
         self.rpc_client