Skip to content

Commit 029b445

Browse files
authored
chore(deps): bump to rc 6 (#69)
* chore(deps): bump to rc 6 * rc6 * nice.
1 parent aa98623 commit 029b445

File tree

7 files changed

+47
-56
lines changed

7 files changed

+47
-56
lines changed

Cargo.toml

Lines changed: 41 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ members = ["crates/*"]
33
resolver = "2"
44

55
[workspace.package]
6-
version = "0.16.0-rc.5"
6+
version = "0.16.0-rc.6"
77
edition = "2024"
88
rust-version = "1.88"
99
authors = ["init4"]
@@ -34,34 +34,34 @@ debug = false
3434
incremental = false
3535

3636
[workspace.dependencies]
37-
signet-blobber = { version = "0.16.0-rc.5", path = "crates/blobber" }
38-
signet-block-processor = { version = "0.16.0-rc.5", path = "crates/block-processor" }
39-
signet-db = { version = "0.16.0-rc.5", path = "crates/db" }
40-
signet-genesis = { version = "0.16.0-rc.5", path = "crates/genesis" }
41-
signet-node = { version = "0.16.0-rc.5", path = "crates/node" }
42-
signet-node-config = { version = "0.16.0-rc.5", path = "crates/node-config" }
43-
signet-node-tests = { version = "0.16.0-rc.5", path = "crates/node-tests" }
44-
signet-node-types = { version = "0.16.0-rc.5", path = "crates/node-types" }
45-
signet-rpc = { version = "0.16.0-rc.5", path = "crates/rpc" }
37+
signet-blobber = { version = "0.16.0-rc.6", path = "crates/blobber" }
38+
signet-block-processor = { version = "0.16.0-rc.6", path = "crates/block-processor" }
39+
signet-db = { version = "0.16.0-rc.6", path = "crates/db" }
40+
signet-genesis = { version = "0.16.0-rc.6", path = "crates/genesis" }
41+
signet-node = { version = "0.16.0-rc.6", path = "crates/node" }
42+
signet-node-config = { version = "0.16.0-rc.6", path = "crates/node-config" }
43+
signet-node-tests = { version = "0.16.0-rc.6", path = "crates/node-tests" }
44+
signet-node-types = { version = "0.16.0-rc.6", path = "crates/node-types" }
45+
signet-rpc = { version = "0.16.0-rc.6", path = "crates/rpc" }
4646

4747
init4-bin-base = { version = "0.18.0-rc.1", features = ["alloy"] }
4848

49-
signet-bundle = "0.16.0-rc.5"
50-
signet-constants = "0.16.0-rc.5"
51-
signet-evm = "0.16.0-rc.5"
52-
signet-extract = "0.16.0-rc.5"
53-
signet-test-utils = "0.16.0-rc.5"
54-
signet-tx-cache = "0.16.0-rc.5"
55-
signet-types = "0.16.0-rc.5"
56-
signet-zenith = "0.16.0-rc.5"
57-
signet-journal = "0.16.0-rc.5"
49+
signet-bundle = "0.16.0-rc.8"
50+
signet-constants = "0.16.0-rc.8"
51+
signet-evm = "0.16.0-rc.8"
52+
signet-extract = "0.16.0-rc.8"
53+
signet-test-utils = "0.16.0-rc.8"
54+
signet-tx-cache = "0.16.0-rc.8"
55+
signet-types = "0.16.0-rc.8"
56+
signet-zenith = "0.16.0-rc.8"
57+
signet-journal = "0.16.0-rc.8"
5858

5959
# ajj
6060
ajj = { version = "0.3.4" }
6161

6262
# trevm
63-
trevm = { version = "0.33.0", features = ["full_env_cfg"] }
64-
revm-inspectors = "0.33.0" # should be 1 more than trevm version, usually
63+
trevm = { version = "0.34.0", features = ["full_env_cfg"] }
64+
revm-inspectors = "0.34.0" # should be 1 more than trevm version, usually
6565

6666
# Alloy periphery crates
6767
alloy = { version = "1.4.0", features = [
@@ -74,29 +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.10.0" }
78-
reth-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v1.10.0" }
79-
reth-chainspec = { git = "https://github.com/paradigmxyz/reth", tag = "v1.10.0" }
80-
reth-codecs = { git = "https://github.com/paradigmxyz/reth", tag = "v1.10.0" }
81-
reth-db = { git = "https://github.com/paradigmxyz/reth", tag = "v1.10.0" }
82-
reth-db-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.10.0" }
83-
reth-db-common = { git = "https://github.com/paradigmxyz/reth", tag = "v1.10.0" }
84-
reth-eth-wire-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.10.0" }
85-
reth-evm-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v1.10.0" }
86-
reth-exex = { git = "https://github.com/paradigmxyz/reth", tag = "v1.10.0" }
87-
reth-exex-test-utils = { git = "https://github.com/paradigmxyz/reth", tag = "v1.10.0" }
88-
reth-libmdbx = { git = "https://github.com/paradigmxyz/reth", tag = "v1.10.0" }
89-
reth-network-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.10.0" }
90-
reth-network-peers = { git = "https://github.com/paradigmxyz/reth", tag = "v1.10.0" }
91-
reth-node-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.10.0" }
92-
reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v1.10.0" }
93-
reth-prune-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.10.0" }
94-
reth-rpc-eth-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.10.0" }
95-
reth-stages-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.10.0" }
96-
reth-transaction-pool = { git = "https://github.com/paradigmxyz/reth", tag = "v1.10.0" }
97-
98-
# need to pin vergen to avoid multiple versions of virgen-lib
99-
vergen = "=9.0.6"
77+
reth = { git = "https://github.com/paradigmxyz/reth", tag = "v1.10.2" }
78+
reth-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v1.10.2" }
79+
reth-chainspec = { git = "https://github.com/paradigmxyz/reth", tag = "v1.10.2" }
80+
reth-codecs = { git = "https://github.com/paradigmxyz/reth", tag = "v1.10.2" }
81+
reth-db = { git = "https://github.com/paradigmxyz/reth", tag = "v1.10.2" }
82+
reth-db-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.10.2" }
83+
reth-db-common = { git = "https://github.com/paradigmxyz/reth", tag = "v1.10.2" }
84+
reth-eth-wire-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.10.2" }
85+
reth-evm-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v1.10.2" }
86+
reth-exex = { git = "https://github.com/paradigmxyz/reth", tag = "v1.10.2" }
87+
reth-exex-test-utils = { git = "https://github.com/paradigmxyz/reth", tag = "v1.10.2" }
88+
reth-libmdbx = { git = "https://github.com/paradigmxyz/reth", tag = "v1.10.2" }
89+
reth-network-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.10.2" }
90+
reth-network-peers = { git = "https://github.com/paradigmxyz/reth", tag = "v1.10.2" }
91+
reth-node-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.10.2" }
92+
reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v1.10.2" }
93+
reth-prune-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.10.2" }
94+
reth-rpc-eth-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.10.2" }
95+
reth-stages-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.10.2" }
96+
reth-transaction-pool = { git = "https://github.com/paradigmxyz/reth", tag = "v1.10.2" }
10097

10198
# Foundry periphery
10299
foundry-blob-explorers = "0.17"

crates/block-processor/src/v1/processor.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,6 @@ where
216216
provider.recovered_block_range(start..=current)?,
217217
net_outcome,
218218
Default::default(),
219-
Default::default(),
220219
);
221220

222221
Ok(Some(RuChain { inner, ru_info }))

crates/db/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ tracing.workspace = true
3131
futures-util = "0.3.31"
3232
tokio.workspace = true
3333
auto_impl = "1.3.0"
34-
vergen.workspace = true
3534

3635
[dev-dependencies]
3736
serde_json.workspace = true

crates/db/src/lib.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,3 @@ pub use tables::{
3535

3636
mod traits;
3737
pub use traits::{DbProviderExt, RuWriter};
38-
39-
// TEMP: remove when reth @ 1.10.1 is released
40-
use vergen as _;

crates/db/src/provider.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ use reth::{
1212
providers::{
1313
BlockBodyIndicesProvider, BlockNumReader, BlockReader, BlockWriter, Chain, DBProvider,
1414
HistoryWriter, OriginalValuesKnown, ProviderError, ProviderResult, StageCheckpointWriter,
15-
StateWriter, StaticFileProviderFactory, StaticFileWriter,
15+
StateWriteConfig, StateWriter, StaticFileProviderFactory, StaticFileWriter,
1616
},
1717
};
1818
use reth_db::{
@@ -481,7 +481,7 @@ where
481481
// Update pipeline stages
482482
self.update_pipeline_stages(target, true)?;
483483

484-
let chain = Chain::new(blocks, execution_state, Default::default(), Default::default());
484+
let chain = Chain::new(blocks, execution_state, Default::default());
485485

486486
debug!("Succesfully reverted blocks and updated pipeline stages");
487487

@@ -560,7 +560,7 @@ where
560560
let (plain_state, reverts) =
561561
execution_outcome.bundle().to_plain_state_and_reverts(is_value_known);
562562

563-
self.write_state_reverts(reverts, first_block)?;
563+
self.write_state_reverts(reverts, first_block, StateWriteConfig::default())?;
564564
self.write_state_changes(plain_state)?;
565565

566566
// Fetch the first transaction number for each block in the range

crates/node-tests/src/convert.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ impl ToRethPrimitive for signet_test_utils::chain::Chain {
7171
self.blocks.to_reth(),
7272
self.execution_outcome.to_reth(),
7373
Default::default(),
74-
Default::default(),
7574
)
7675
}
7776
}

crates/rpc/src/ctx/fee_hist.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ fn strip_block(block: RecoveredBlock<Block>) -> RecoveredBlock<Block> {
3030
/// instance.
3131
fn strip_chain(chain: &Chain) -> Arc<Chain> {
3232
// Takes the contents out, replacing with default
33-
let (blocks, outcome, trie, hashed) = chain.clone().into_inner();
33+
let (blocks, outcome, trie) = chain.clone().into_inner();
3434

3535
// Strip each block
3636
let blocks: Vec<RecoveredBlock<Block>> = blocks.into_blocks().map(strip_block).collect();
3737

3838
// Replace the original chain with the stripped version
39-
Arc::new(Chain::new(blocks, outcome, trie, hashed))
39+
Arc::new(Chain::new(blocks, outcome, trie))
4040
}
4141

4242
/// Strips Signet system transactions from the `CanonStateNotification`.
@@ -110,7 +110,7 @@ mod test {
110110

111111
fn test_chain(count: u64) -> Arc<Chain> {
112112
let blocks = (0..count).map(test_block);
113-
Arc::new(Chain::new(blocks, Default::default(), Default::default(), Default::default()))
113+
Arc::new(Chain::new(blocks, Default::default(), Default::default()))
114114
}
115115

116116
#[test]

0 commit comments

Comments
 (0)