Skip to content

Commit 27ccec2

Browse files
prestwichclaude
andauthored
chore: bump reth v1.11.0 → v1.11.3 (ENG-2030) (#109)
Update all 20 reth workspace dependencies to v1.11.3 and fix breaking changes from signet-extract and signet-test-utils: - blobber shim: return BlockAndReceipts struct instead of tuple - node-tests convert: adapt to new SealedBlock/RecoveredBlock APIs and private Chain fields - node-tests context: use Chain accessor methods Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent 7829e19 commit 27ccec2

4 files changed

Lines changed: 39 additions & 44 deletions

File tree

Cargo.toml

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -74,26 +74,26 @@ alloy = { version = "1.4.0", features = [
7474
alloy-contract = { version = "1.4.0", features = ["pubsub"] }
7575

7676
# Reth
77-
reth = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0" }
78-
reth-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0" }
79-
reth-chainspec = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0" }
80-
reth-codecs = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0" }
81-
reth-db = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0" }
82-
reth-db-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0" }
83-
reth-db-common = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0" }
84-
reth-eth-wire-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0" }
85-
reth-evm-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0" }
86-
reth-exex = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0" }
87-
reth-exex-test-utils = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0" }
88-
reth-libmdbx = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0" }
89-
reth-network-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0" }
90-
reth-network-peers = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0" }
91-
reth-node-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0" }
92-
reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0" }
93-
reth-prune-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0" }
94-
reth-rpc-eth-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0" }
95-
reth-stages-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0" }
96-
reth-transaction-pool = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.0" }
77+
reth = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.3" }
78+
reth-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.3" }
79+
reth-chainspec = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.3" }
80+
reth-codecs = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.3" }
81+
reth-db = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.3" }
82+
reth-db-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.3" }
83+
reth-db-common = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.3" }
84+
reth-eth-wire-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.3" }
85+
reth-evm-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.3" }
86+
reth-exex = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.3" }
87+
reth-exex-test-utils = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.3" }
88+
reth-libmdbx = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.3" }
89+
reth-network-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.3" }
90+
reth-network-peers = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.3" }
91+
reth-node-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.3" }
92+
reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.3" }
93+
reth-prune-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.3" }
94+
reth-rpc-eth-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.3" }
95+
reth-stages-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.3" }
96+
reth-transaction-pool = { git = "https://github.com/paradigmxyz/reth", tag = "v1.11.3" }
9797

9898
# Foundry periphery
9999
foundry-blob-explorers = "0.17"

crates/blobber/src/shim.rs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
33
use alloy::consensus::Block;
44
use reth::providers::Chain;
5-
use signet_extract::{Extractable, HasTxns};
5+
use signet_extract::{BlockAndReceipts, Extractable, HasTxns};
66
use signet_types::primitives::TransactionSigned;
77

88
/// A type alias for Reth's recovered block with a signed transaction.
@@ -32,14 +32,16 @@ impl<'a> Extractable for ExtractableChainShim<'a> {
3232
type Block = RecoveredBlockShim;
3333
type Receipt = reth::primitives::Receipt;
3434

35-
fn blocks_and_receipts(&self) -> impl Iterator<Item = (&Self::Block, &Vec<Self::Receipt>)> {
35+
fn blocks_and_receipts(
36+
&self,
37+
) -> impl Iterator<Item = BlockAndReceipts<'_, Self::Block, Self::Receipt>> {
3638
self.chain.blocks_and_receipts().map(|(block, receipts)| {
3739
// SAFETY: because the shim is repr(transparent), the memory layout
3840
// of `RecoveredBlockShim` is the same as `RethRecovered`, so we
3941
// can safely transmute the reference.
4042
let block =
4143
unsafe { std::mem::transmute::<&'a RethRecovered, &RecoveredBlockShim>(block) };
42-
(block, receipts)
44+
BlockAndReceipts { block, receipts }
4345
})
4446
}
4547
}

crates/node-tests/src/context.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,10 +224,10 @@ impl SignetTestContext {
224224
// the expected height is either the last committed block, or the
225225
// first reverted block - 1, or 0 if neither exist
226226
let expected_height = committed_chain
227-
.and_then(|c| c.blocks.last().map(|b| b.number()))
227+
.and_then(|c| c.blocks().last().map(|b| b.number()))
228228
.or_else(|| {
229229
reverted_chain
230-
.and_then(|c| c.blocks.first().map(|b| b.number().saturating_sub(1)))
230+
.and_then(|c| c.blocks().first().map(|b| b.number().saturating_sub(1)))
231231
})
232232
.unwrap_or(0)
233233
.saturating_sub(self.constants().host_deploy_height());

crates/node-tests/src/convert.rs

Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,9 @@ impl ToRethPrimitive for SealedBlock {
4646
type RethPrimitive = reth::primitives::SealedBlock<reth::primitives::Block>;
4747

4848
fn to_reth(self) -> Self::RethPrimitive {
49-
let (header, hash) = self.header.into_parts();
50-
let body = alloy::consensus::BlockBody {
49+
let hash = self.header.hash();
50+
let header = self.header.into_inner();
51+
let body = reth::primitives::BlockBody {
5152
transactions: self.transactions,
5253
ommers: vec![],
5354
withdrawals: None,
@@ -63,21 +64,13 @@ impl ToRethPrimitive for RecoveredBlock {
6364
type RethPrimitive = reth::primitives::RecoveredBlock<reth::primitives::Block>;
6465

6566
fn to_reth(self) -> Self::RethPrimitive {
66-
let (header, hash) = self.header.into_parts();
67-
let (senders, transactions): (Vec<_>, Vec<_>) = self
68-
.transactions
69-
.into_iter()
70-
.map(|r| {
71-
let (tx, sender) = r.into_parts();
72-
(sender, tx)
73-
})
74-
.unzip();
75-
let body = alloy::consensus::BlockBody { transactions, ommers: vec![], withdrawals: None };
76-
reth::primitives::RecoveredBlock::new(
77-
reth::primitives::Block::new(header, body),
78-
senders,
79-
hash,
80-
)
67+
let hash = self.header.hash();
68+
let senders: Vec<_> = self.senders().collect();
69+
let header = self.header.into_inner();
70+
let transactions = self.transactions.into_iter().map(|r| r.into_inner()).collect();
71+
let body = reth::primitives::BlockBody { transactions, ommers: vec![], withdrawals: None };
72+
let block = reth::primitives::Block::new(header, body);
73+
reth::primitives::RecoveredBlock::new(block, senders, hash)
8174
}
8275
}
8376

@@ -86,8 +79,8 @@ impl ToRethPrimitive for signet_test_utils::chain::Chain {
8679

8780
fn to_reth(self) -> Self::RethPrimitive {
8881
reth::providers::Chain::new(
89-
self.blocks.to_reth(),
90-
self.execution_outcome.to_reth(),
82+
self.blocks().to_vec().to_reth(),
83+
self.execution_outcome().clone().to_reth(),
9184
Default::default(),
9285
)
9386
}

0 commit comments

Comments
 (0)