Skip to content

Commit c71d4a1

Browse files
efbigZanCorDX
efbig
and
ZanCorDX
authored
deps: reth 1.4.8 (#640)
## 📝 Summary Bump reth dependencies to `1.4.8`. --------- Co-authored-by: Daniel Xifra <[email protected]>
1 parent 5eaa4ee commit c71d4a1

File tree

11 files changed

+967
-862
lines changed

11 files changed

+967
-862
lines changed

‎Cargo.lock

Lines changed: 878 additions & 779 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml

Lines changed: 64 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -48,85 +48,85 @@ codegen-units = 1
4848
incremental = false
4949

5050
[workspace.dependencies]
51-
reth = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
52-
reth-chain-state = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
53-
reth-cli-util = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
54-
reth-db = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
55-
reth-db-common = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
56-
reth-errors = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
57-
reth-payload-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
58-
reth-node-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
59-
reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
60-
reth-trie = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
61-
reth-trie-parallel = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
62-
reth-basic-payload-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
63-
reth-node-core = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
64-
reth-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
65-
reth-primitives-traits = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
66-
reth-provider = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12", features = [
51+
reth = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" }
52+
reth-chain-state = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" }
53+
reth-cli-util = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" }
54+
reth-db = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" }
55+
reth-db-common = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" }
56+
reth-errors = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" }
57+
reth-payload-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" }
58+
reth-node-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" }
59+
reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" }
60+
reth-trie = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" }
61+
reth-trie-parallel = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" }
62+
reth-basic-payload-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" }
63+
reth-node-core = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" }
64+
reth-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" }
65+
reth-primitives-traits = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" }
66+
reth-provider = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8", features = [
6767
"test-utils",
6868
] }
69-
reth-chainspec = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
70-
reth-evm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
71-
reth-evm-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
72-
reth-execution-errors = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
73-
reth-exex = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
74-
reth-metrics = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
75-
reth-trie-db = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
76-
reth-payload-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
77-
reth-transaction-pool = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
78-
reth-execution-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
79-
reth-revm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
80-
reth-payload-builder-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
81-
reth-payload-util = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
82-
reth-rpc-layer = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
83-
reth-testing-utils = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
69+
reth-chainspec = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" }
70+
reth-evm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" }
71+
reth-evm-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" }
72+
reth-execution-errors = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" }
73+
reth-exex = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" }
74+
reth-metrics = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" }
75+
reth-trie-db = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" }
76+
reth-payload-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" }
77+
reth-transaction-pool = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" }
78+
reth-execution-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" }
79+
reth-revm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" }
80+
reth-payload-builder-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" }
81+
reth-payload-util = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" }
82+
reth-rpc-layer = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" }
83+
reth-testing-utils = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" }
8484

8585
# reth optimism
86-
reth-optimism-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
87-
reth-optimism-consensus = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
88-
reth-optimism-cli = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
89-
reth-optimism-forks = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
90-
reth-optimism-evm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
91-
reth-optimism-node = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
92-
reth-optimism-payload-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
93-
reth-optimism-chainspec = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
94-
reth-optimism-txpool = { git = "https://github.com/paradigmxyz/reth", tag = "v1.3.12" }
86+
reth-optimism-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" }
87+
reth-optimism-consensus = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" }
88+
reth-optimism-cli = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" }
89+
reth-optimism-forks = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" }
90+
reth-optimism-evm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" }
91+
reth-optimism-node = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" }
92+
reth-optimism-payload-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" }
93+
reth-optimism-chainspec = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" }
94+
reth-optimism-txpool = { git = "https://github.com/paradigmxyz/reth", tag = "v1.4.8" }
9595

96-
# compatible with reth "v1.3.12 dependencies
97-
revm = { version = "22.0.1", features = [
96+
# compatible with reth v1.4.8 dependencies
97+
revm = { version = "24.0.1", features = [
9898
"std",
9999
"secp256k1",
100100
"optional_balance_check",
101101
], default-features = false }
102-
revm-inspectors = { version = "0.19.0", default-features = false }
103-
op-revm = { version = "3.0.2", default-features = false }
102+
revm-inspectors = { version = "0.23.0", default-features = false }
103+
op-revm = { version = "5.0.0", default-features = false }
104104

105105
ethereum_ssz_derive = "0.9.0"
106106
ethereum_ssz = "0.9.0"
107107

108-
alloy-primitives = { version = "1.0.0", default-features = false }
108+
alloy-primitives = { version = "1.1.0", default-features = false }
109109
alloy-rlp = "0.3.10"
110110
alloy-chains = "0.2.0"
111-
alloy-evm = { version = "0.5.0", default-features = false }
112-
alloy-provider = { version = "0.14.0", features = ["ipc", "pubsub"] }
113-
alloy-pubsub = { version = "0.14.0" }
114-
alloy-eips = { version = "0.14.0" }
115-
alloy-rpc-types = { version = "0.14.0" }
116-
alloy-json-rpc = { version = "0.14.0" }
117-
alloy-transport-http = { version = "0.14.0" }
118-
alloy-network = { version = "0.14.0" }
119-
alloy-network-primitives = { version = "0.14.0" }
120-
alloy-transport = { version = "0.14.0" }
121-
alloy-node-bindings = { version = "0.14.0" }
122-
alloy-consensus = { version = "0.14.0", features = ["kzg"] }
123-
alloy-serde = { version = "0.14.0" }
124-
alloy-rpc-types-beacon = { version = "0.14.0", features = ["ssz"] }
125-
alloy-rpc-types-engine = { version = "0.14.0", features = ["ssz"] }
126-
alloy-rpc-types-eth = { version = "0.14.0" }
127-
alloy-signer-local = { version = "0.14.0" }
128-
alloy-rpc-client = { version = "0.14.0" }
129-
alloy-genesis = { version = "0.14.0" }
111+
alloy-evm = { version = "0.10", default-features = false }
112+
alloy-provider = { version = "1.0.9", features = ["ipc", "pubsub"] }
113+
alloy-pubsub = { version = "1.0.9" }
114+
alloy-eips = { version = "1.0.9" }
115+
alloy-rpc-types = { version = "1.0.9" }
116+
alloy-json-rpc = { version = "1.0.9" }
117+
alloy-transport-http = { version = "1.0.9" }
118+
alloy-network = { version = "1.0.9" }
119+
alloy-network-primitives = { version = "1.0.9" }
120+
alloy-transport = { version = "1.0.9" }
121+
alloy-node-bindings = { version = "1.0.9" }
122+
alloy-consensus = { version = "1.0.9", features = ["kzg"] }
123+
alloy-serde = { version = "1.0.9" }
124+
alloy-rpc-types-beacon = { version = "1.0.9", features = ["ssz"] }
125+
alloy-rpc-types-engine = { version = "1.0.9", features = ["ssz"] }
126+
alloy-rpc-types-eth = { version = "1.0.9" }
127+
alloy-signer-local = { version = "1.0.9" }
128+
alloy-rpc-client = { version = "1.0.9" }
129+
alloy-genesis = { version = "1.0.9" }
130130
alloy-trie = { version = "0.8.1" }
131131

132132
# optimism

‎crates/rbuilder/src/building/block_orders/prioritized_order_store.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ use super::{OrderPriority, SimulatedOrderSink};
1616
/// Order must implement BlockOrdersOrder which has priority(). This priority is used to sort the simulated orders.
1717
/// Usage:
1818
/// - Add new order (a little bit complex):
19-
/// ALWAYS BE SURE THAT YOU CALLED update_onchain_nonces and updated the current state of all the needed nonces by the order
20-
/// call insert_order
19+
/// ALWAYS BE SURE THAT YOU CALLED update_onchain_nonces and updated the current state of all the needed nonces by the order
20+
/// call insert_order
2121
/// - Get best order to execute
22-
/// call pop_order to get the best order
23-
/// if the order is executed call update_onchain_nonces to update all the changed nonces.
22+
/// call pop_order to get the best order
23+
/// if the order is executed call update_onchain_nonces to update all the changed nonces.
2424
/// - Remove orders: remove_orders. This is useful if we think this orders are no really good (failed to execute to often)
2525
#[derive(Debug, Clone)]
2626
pub struct PrioritizedOrderStore<OrderPriorityType> {

‎crates/rbuilder/src/building/builders/parallel_builder/conflict_task_generator.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ impl ConflictTaskGenerator {
6868
self.add_processed_groups(&new_group, &mut processed_groups);
6969

7070
// Remove all subset groups
71-
if new_group.conflicting_group_ids.len() > 0 {
71+
if !new_group.conflicting_group_ids.is_empty() {
7272
self.remove_conflicting_subset_groups(&new_group);
7373
}
7474
}

‎crates/rbuilder/src/building/precompile_cache.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ impl<CTX: ContextTr, P: PrecompileProvider<CTX, Output = InterpreterResult>> Pre
6161
is_static: bool,
6262
gas_limit: u64,
6363
) -> Result<Option<Self::Output>, String> {
64-
let key = (self.spec, inputs.input.clone(), gas_limit);
64+
let key = (self.spec, inputs.input.bytes(context), gas_limit);
6565

6666
// get the result if it exists
6767
if let Some(precompiles) = self.cache.lock().get_mut(address) {

‎crates/rbuilder/src/live_builder/order_input/txpool_fetcher.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ pub async fn subscribe_to_txpool_with_blobs(
3131
let provider = match mempool {
3232
MempoolSource::Ipc(path) => {
3333
let ipc = IpcConnect::new(path);
34-
ProviderBuilder::new().on_ipc(ipc).await?
34+
ProviderBuilder::new().connect_ipc(ipc).await?
3535
}
3636
MempoolSource::Ws(url) => {
3737
let ws_conn = alloy_provider::WsConnect::new(url);
38-
ProviderBuilder::new().on_ws(ws_conn).await?
38+
ProviderBuilder::new().connect_ws(ws_conn).await?
3939
}
4040
};
4141

‎crates/rbuilder/src/primitives/mod.rs

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ use reth_primitives::{
2626
kzg::{BYTES_PER_BLOB, BYTES_PER_COMMITMENT, BYTES_PER_PROOF},
2727
PooledTransaction, Recovered, Transaction, TransactionSigned,
2828
};
29+
use reth_primitives_traits::SignerRecoverable;
2930
use serde::{Deserialize, Serialize};
3031
use sha2::{Digest, Sha256};
3132
use std::{cmp::Ordering, collections::HashMap, fmt::Display, hash::Hash, str::FromStr, sync::Arc};
@@ -704,10 +705,10 @@ impl TransactionSignedEcRecoveredWithBlobs {
704705
metadata: Option<Metadata>,
705706
) -> Result<Self, TxWithBlobsCreateError> {
706707
// Check for an eip4844 tx passed without blobs
707-
if tx.transaction().blob_versioned_hashes().is_some() && blob_sidecar.is_none() {
708+
if tx.inner().blob_versioned_hashes().is_some() && blob_sidecar.is_none() {
708709
Err(TxWithBlobsCreateError::Eip4844MissingBlobSidecar)
709710
// Check for a non-eip4844 tx passed with blobs
710-
} else if blob_sidecar.is_some() && tx.transaction().blob_versioned_hashes().is_none() {
711+
} else if blob_sidecar.is_some() && tx.inner().blob_versioned_hashes().is_none() {
711712
Err(TxWithBlobsCreateError::BlobsMissingEip4844)
712713
// Groovy!
713714
} else {
@@ -741,7 +742,9 @@ impl TransactionSignedEcRecoveredWithBlobs {
741742
T: TransactionOrdering<Transaction = <V as TransactionValidator>::Transaction>,
742743
S: BlobStore,
743744
{
744-
let blob_sidecar = pool.get_blob(*tx.inner().hash())?.map(|b| (*b).clone());
745+
let blob_sidecar = pool
746+
.get_blob(*tx.inner().hash())?
747+
.and_then(|b| b.as_eip4844().cloned());
745748
Self::new(tx, blob_sidecar, None)
746749
}
747750

@@ -814,8 +817,11 @@ impl TransactionSignedEcRecoveredWithBlobs {
814817
PooledTransaction::Eip4844(blob_tx) => {
815818
let (blob_tx, signature, hash) = blob_tx.into_parts();
816819
let (blob_tx, sidecar) = blob_tx.into_parts();
817-
let tx_signed =
818-
TransactionSigned::new(Transaction::Eip4844(blob_tx), signature, hash);
820+
let tx_signed = TransactionSigned::new_unchecked(
821+
Transaction::Eip4844(blob_tx),
822+
signature,
823+
hash,
824+
);
819825
Ok(TransactionSignedEcRecoveredWithBlobs {
820826
tx: tx_signed.with_signer(signer),
821827
blobs_sidecar: Arc::new(sidecar),
@@ -830,8 +836,7 @@ impl TransactionSignedEcRecoveredWithBlobs {
830836
) -> Result<TransactionSignedEcRecoveredWithBlobs, TxWithBlobsCreateError> {
831837
let decoded = TransactionSigned::decode_2718(&mut raw_tx.as_ref())
832838
.map_err(TxWithBlobsCreateError::FailedToDecodeTransaction)?;
833-
let tx = decoded
834-
.try_into_recovered()
839+
let tx = SignerRecoverable::try_into_recovered(decoded)
835840
.map_err(|_| TxWithBlobsCreateError::InvalidTransactionSignature)?;
836841
let mut fake_sidecar = BlobTransactionSidecar::default();
837842
for _ in 0..tx.blob_versioned_hashes().map_or(0, |hashes| hashes.len()) {

‎crates/rbuilder/src/primitives/test_data_generator.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ impl TestDataGenerator {
2222

2323
pub fn create_tx_nonce(&mut self, sender_nonce: AccountNonce) -> Recovered<TransactionSigned> {
2424
Recovered::new_unchecked(
25-
TransactionSigned::new(
25+
TransactionSigned::new_unchecked(
2626
Transaction::Legacy(TxLegacy {
2727
nonce: sender_nonce.nonce,
2828
..TxLegacy::default()

‎crates/rbuilder/src/telemetry/servers/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
//! Telemetry contains two servers.
22
//!
33
//! - [full]: verbose server exposing detailed operational information about the
4-
//! builder.
4+
//! builder.
55
//! - [redacted]: deliberately redacted server serves information suitable for
6-
//! tdx builders to expose in real-time.
6+
//! tdx builders to expose in real-time.
77
//!
88
//! The redacted server is seperate from the debug server because it may be desirable
99
//! to expose debug and redacted data differently in tdx builders. e.g. redacted data

‎crates/rbuilder/src/utils/tx_signer.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ mod test {
5353
use alloy_consensus::TxEip1559;
5454
use alloy_primitives::{address, fixed_bytes, TxKind as TransactionKind};
5555
use reth_node_core::primitives::SignedTransaction;
56+
use reth_primitives_traits::SignerRecoverable;
5657
#[test]
5758
fn test_sign_transaction() {
5859
let secret =

‎rust-toolchain.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[toolchain]
2-
channel = "1.85.0"
2+
channel = "1.86.0"
33
components = ["rustfmt", "clippy"]

0 commit comments

Comments
 (0)