Skip to content

Commit 0d0a4a5

Browse files
committed
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())
1 parent f5fd628 commit 0d0a4a5

7 files changed

Lines changed: 145 additions & 42 deletions

File tree

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ license = "MIT OR Apache-2.0"
3636

3737
[workspace.dependencies]
3838
alloy = { version = "2.0.0", features = ["dyn-abi", "json-abi", "full", "arbitrary", "json-rpc", "serde"] }
39-
alloy-rpc-types = "1.0.33"
39+
alloy-rpc-types = "2.0.0"
4040
anyhow = "1.0"
4141
async-graphql = { version = "7.2.1", features = ["chrono"] }
4242
async-graphql-axum = "7.2.1"

chain/ethereum/src/codec.rs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,11 @@ impl<'a> TryInto<Transaction<AnyTxEnvelope>> for TransactionTraceAt<'a> {
162162
// Extract data from trace and block
163163
let block_hash = self.block.hash.try_decode_proto("transaction block hash")?;
164164
let block_number = self.block.number;
165+
let block_timestamp = self
166+
.block
167+
.header
168+
.as_ref()
169+
.and_then(|h| h.timestamp.as_ref().map(|t| t.seconds as u64));
165170
let transaction_index = Some(self.trace.index as u64);
166171
let from_address = self
167172
.trace
@@ -241,6 +246,7 @@ impl<'a> TryInto<Transaction<AnyTxEnvelope>> for TransactionTraceAt<'a> {
241246
inner: recovered,
242247
block_hash: Some(block_hash),
243248
block_number: Some(block_number),
249+
block_timestamp,
244250
transaction_index,
245251
effective_gas_price: if gas_price > 0 { Some(gas_price) } else { None },
246252
});
@@ -451,6 +457,7 @@ impl<'a> TryInto<Transaction<AnyTxEnvelope>> for TransactionTraceAt<'a> {
451457
inner: recovered,
452458
block_hash: Some(block_hash),
453459
block_number: Some(block_number),
460+
block_timestamp,
454461
transaction_index,
455462
effective_gas_price: if gas_price > 0 { Some(gas_price) } else { None }, // gas_price already contains effective gas price per protobuf spec
456463
})
@@ -528,6 +535,8 @@ impl TryInto<AnyBlock> for &Block {
528535
} else {
529536
Some(header.requests_hash.try_decode_proto("requests hash")?)
530537
},
538+
block_access_list_hash: None,
539+
slot_number: None,
531540
};
532541

533542
let rpc_header = alloy::rpc::types::Header {

chain/ethereum/src/data_source.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -468,6 +468,7 @@ fn create_dummy_transaction(
468468
inner: recovered,
469469
block_hash: Some(block_hash),
470470
block_number: Some(block_number),
471+
block_timestamp: None,
471472
transaction_index,
472473
effective_gas_price: None,
473474
})

chain/ethereum/src/ethereum_adapter.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -174,21 +174,18 @@ impl EthereumAdapter {
174174
Transport::RPC(client) => Arc::new(
175175
alloy::providers::ProviderBuilder::<_, _, AnyNetworkBare>::default()
176176
.network::<AnyNetworkBare>()
177-
.with_recommended_fillers()
178177
.connect_client(client.clone()),
179178
),
180179
Transport::IPC(ipc_connect) => Arc::new(
181180
alloy::providers::ProviderBuilder::<_, _, AnyNetworkBare>::default()
182181
.network::<AnyNetworkBare>()
183-
.with_recommended_fillers()
184182
.connect_ipc(ipc_connect.clone())
185183
.await
186184
.expect("Failed to connect to Ethereum IPC"),
187185
),
188186
Transport::WS(ws_connect) => Arc::new(
189187
alloy::providers::ProviderBuilder::<_, _, AnyNetworkBare>::default()
190188
.network::<AnyNetworkBare>()
191-
.with_recommended_fillers()
192189
.connect_ws(ws_connect.clone())
193190
.await
194191
.expect("Failed to connect to Ethereum WS"),
@@ -2790,7 +2787,6 @@ mod tests {
27902787
let asserter = Asserter::new();
27912788
let provider = ProviderBuilder::<_, _, AnyNetworkBare>::default()
27922789
.network::<AnyNetworkBare>()
2793-
.with_recommended_fillers()
27942790
.connect_mocked_client(asserter.clone());
27952791

27962792
asserter.push_success(&json_value);

gnd/src/commands/test/trigger.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -446,6 +446,7 @@ fn dummy_transaction(
446446
inner: Recovered::new_unchecked(envelope, Address::ZERO),
447447
block_hash: Some(block_hash),
448448
block_number: Some(block_number),
449+
block_timestamp: None,
449450
transaction_index: Some(transaction_index),
450451
effective_gas_price: None,
451452
}

0 commit comments

Comments
 (0)