all: Fix compilation for alloy 2.0.0 upgrade

- Add AnyTransactionRequest newtype for split TransactionBuilder traits
- Bump alloy-rpc-types to 2.0.0
- Add block_timestamp field to Transaction struct literals
- Add Amsterdam hardfork header fields (block_access_list_hash, slot_number)
- Remove .with_recommended_fillers() (now handled by .network())

Author: incrypto32

Cargo.toml

@@ -36,7 +36,7 @@ license = "MIT OR Apache-2.0"
 
 [workspace.dependencies]
 alloy = { version = "2.0.0", features = ["dyn-abi", "json-abi", "full", "arbitrary", "json-rpc", "serde"] }
-alloy-rpc-types = "1.0.33"
+alloy-rpc-types = "2.0.0"
 anyhow = "1.0"
 async-graphql = { version = "7.2.1", features = ["chrono"] }
 async-graphql-axum = "7.2.1"

chain/ethereum/src/codec.rs

@@ -162,6 +162,11 @@ impl<'a> TryInto<Transaction<AnyTxEnvelope>> for TransactionTraceAt<'a> {
         // Extract data from trace and block
         let block_hash = self.block.hash.try_decode_proto("transaction block hash")?;
         let block_number = self.block.number;
+        let block_timestamp = self
+            .block
+            .header
+            .as_ref()
+            .and_then(|h| h.timestamp.as_ref().map(|t| t.seconds as u64));
         let transaction_index = Some(self.trace.index as u64);
         let from_address = self
             .trace
@@ -241,6 +246,7 @@ impl<'a> TryInto<Transaction<AnyTxEnvelope>> for TransactionTraceAt<'a> {
                 inner: recovered,
                 block_hash: Some(block_hash),
                 block_number: Some(block_number),
+                block_timestamp,
                 transaction_index,
                 effective_gas_price: if gas_price > 0 { Some(gas_price) } else { None },
             });
@@ -451,6 +457,7 @@ impl<'a> TryInto<Transaction<AnyTxEnvelope>> for TransactionTraceAt<'a> {
             inner: recovered,
             block_hash: Some(block_hash),
             block_number: Some(block_number),
+            block_timestamp,
             transaction_index,
             effective_gas_price: if gas_price > 0 { Some(gas_price) } else { None }, // gas_price already contains effective gas price per protobuf spec
         })
@@ -528,6 +535,8 @@ impl TryInto<AnyBlock> for &Block {
             } else {
                 Some(header.requests_hash.try_decode_proto("requests hash")?)
             },
+            block_access_list_hash: None,
+            slot_number: None,
         };
 
         let rpc_header = alloy::rpc::types::Header {

chain/ethereum/src/data_source.rs

@@ -468,6 +468,7 @@ fn create_dummy_transaction(
         inner: recovered,
         block_hash: Some(block_hash),
         block_number: Some(block_number),
+        block_timestamp: None,
         transaction_index,
         effective_gas_price: None,
     })

chain/ethereum/src/ethereum_adapter.rs

@@ -173,21 +173,18 @@ impl EthereumAdapter {
             Transport::RPC(client) => Arc::new(
                 alloy::providers::ProviderBuilder::<_, _, AnyNetworkBare>::default()
                     .network::<AnyNetworkBare>()
-                    .with_recommended_fillers()
                     .connect_client(client.clone()),
             ),
             Transport::IPC(ipc_connect) => Arc::new(
                 alloy::providers::ProviderBuilder::<_, _, AnyNetworkBare>::default()
                     .network::<AnyNetworkBare>()
-                    .with_recommended_fillers()
                     .connect_ipc(ipc_connect.clone())
                     .await
                     .expect("Failed to connect to Ethereum IPC"),
             ),
             Transport::WS(ws_connect) => Arc::new(
                 alloy::providers::ProviderBuilder::<_, _, AnyNetworkBare>::default()
                     .network::<AnyNetworkBare>()
-                    .with_recommended_fillers()
                     .connect_ws(ws_connect.clone())
                     .await
                     .expect("Failed to connect to Ethereum WS"),
@@ -2779,7 +2776,6 @@ mod tests {
             let asserter = Asserter::new();
             let provider = ProviderBuilder::<_, _, AnyNetworkBare>::default()
                 .network::<AnyNetworkBare>()
-                .with_recommended_fillers()
                 .connect_mocked_client(asserter.clone());
 
             asserter.push_success(&json_value);

gnd/src/commands/test/trigger.rs

@@ -450,6 +450,7 @@ fn dummy_transaction(
         inner: Recovered::new_unchecked(envelope, Address::ZERO),
         block_hash: Some(block_hash),
         block_number: Some(block_number),
+        block_timestamp: None,
         transaction_index: Some(transaction_index),
         effective_gas_price: None,
     }