Skip to content

Commit 547fee0

Browse files
cody-wang-cbcody-wang-cb
authored
Fix Isthmus request hash; support reth 1.3.11 (#564)
## 📝 Summary Adding reth 1.3.11 for the upcoming op chain sepolia Isthmus hardfork for op-rbuilder flashblock builder Also fixing request hash for Isthmus validity rules https://specs.optimism.io/protocol/isthmus/exec-engine.html#header-validity-rules. Tested deploying on Base devnet, it's able to sync again ## 💡 Motivation and Context <!--- (Optional) Why is this change required? What problem does it solve? Remove this section if not applicable. --> --- ## ✅ I have completed the following steps: * [ ] Run `make lint` * [ ] Run `make test` * [ ] Added tests (if applicable)
1 parent c5b7890 commit 547fee0

File tree

15 files changed

+2048
-1585
lines changed

15 files changed

+2048
-1585
lines changed

‎Cargo.lock

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

‎Cargo.toml

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

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

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

96-
# compatible with reth "v1.3.8" dependencies
97-
revm = { version = "21.0.0", features = [
96+
# compatible with reth "v1.3.11" dependencies
97+
revm = { version = "22.0.1", features = [
9898
"std",
9999
"secp256k1",
100100
"optional_balance_check",
101101
], default-features = false }
102-
revm-inspectors = { version = "0.18.0", default-features = false }
103-
op-revm = { version = "2.0.0", default-features = false }
102+
revm-inspectors = { version = "0.19.0", default-features = false }
103+
op-revm = { version = "3.0.2", default-features = false }
104104

105-
ethereum_ssz_derive = "0.8"
106-
ethereum_ssz = "0.8"
105+
ethereum_ssz_derive = "0.9.0"
106+
ethereum_ssz = "0.9.0"
107107

108-
alloy-primitives = { version = "0.8.25", default-features = false }
108+
alloy-primitives = { version = "1.0.0", default-features = false }
109109
alloy-rlp = "0.3.10"
110-
alloy-chains = "0.1.68"
111-
alloy-evm = { version = "0.3.2", default-features = false }
112-
alloy-provider = { version = "0.13.0", features = ["ipc", "pubsub"] }
113-
alloy-pubsub = { version = "0.13.0" }
114-
alloy-eips = { version = "0.13.0" }
115-
alloy-rpc-types = { version = "0.13.0" }
116-
alloy-json-rpc = { version = "0.13.0" }
117-
alloy-transport-http = { version = "0.13.0" }
118-
alloy-network = { version = "0.13.0" }
119-
alloy-network-primitives = { version = "0.13.0" }
120-
alloy-transport = { version = "0.13.0" }
121-
alloy-node-bindings = { version = "0.13.0" }
122-
alloy-consensus = { version = "0.13.0", features = ["kzg"] }
123-
alloy-serde = { version = "0.13.0" }
124-
alloy-rpc-types-beacon = { version = "0.13.0", features = ["ssz"] }
125-
alloy-rpc-types-engine = { version = "0.13.0", features = ["ssz"] }
126-
alloy-rpc-types-eth = { version = "0.13.0" }
127-
alloy-signer-local = { version = "0.13.0" }
128-
alloy-rpc-client = { version = "0.13.0" }
129-
alloy-genesis = { version = "0.13.0" }
130-
alloy-trie = { version = "0.7.9" }
110+
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" }
130+
alloy-trie = { version = "0.8.1" }
131131

132132
# optimism
133-
alloy-op-evm = { version = "0.3.2", default-features = false }
134-
op-alloy-rpc-types = { version = "0.12", default-features = false }
135-
op-alloy-rpc-types-engine = { version = "0.12", default-features = false }
136-
op-alloy-rpc-jsonrpsee = { version = "0.12", default-features = false }
137-
op-alloy-network = { version = "0.12", default-features = false }
138-
op-alloy-consensus = { version = "0.12", default-features = false }
133+
alloy-op-evm = { version = "0.5.0", default-features = false }
134+
op-alloy-rpc-types = { version = "0.14.1", default-features = false }
135+
op-alloy-rpc-types-engine = { version = "0.14.1", default-features = false }
136+
op-alloy-rpc-jsonrpsee = { version = "0.14.1", default-features = false }
137+
op-alloy-network = { version = "0.14.1", default-features = false }
138+
op-alloy-consensus = { version = "0.14.1", default-features = false }
139139

140140
async-trait = { version = "0.1.83" }
141141
clap = { version = "4.4.3", features = ["derive", "env"] }

‎crates/op-rbuilder/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,11 @@ time = { version = "0.3.36", features = ["macros", "formatting", "parsing"] }
8585
chrono = "0.4"
8686
uuid = { version = "1.6.1", features = ["serde", "v5", "v4"] }
8787
tokio-tungstenite = "0.26.2"
88-
rand = "0.8.5"
88+
rand = "0.9.0"
8989
tracing-subscriber = { version = "0.3.18", features = ["env-filter", "json"] }
9090

9191
# `flashblocks` branch
92-
rollup-boost = { git = "http://github.com/flashbots/rollup-boost", rev = "e20dbc5c3d7b5223fc2a3a6cfe4c99ed9692caf7" }
92+
rollup-boost = { git = "http://github.com/flashbots/rollup-boost", rev = "60885346d4cf7f241de82790478195747433d472" }
9393

9494
[target.'cfg(unix)'.dependencies]
9595
tikv-jemallocator = { version = "0.6", optional = true }

‎crates/op-rbuilder/src/payload_builder.rs

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use alloy_consensus::{
88
constants::EMPTY_WITHDRAWALS, Eip658Value, Header, Transaction, Typed2718,
99
EMPTY_OMMER_ROOT_HASH,
1010
};
11-
use alloy_eips::{merge::BEACON_NONCE, Encodable2718};
11+
use alloy_eips::{eip7685::EMPTY_REQUESTS_HASH, merge::BEACON_NONCE, Encodable2718};
1212
use alloy_op_evm::block::receipt_builder::OpReceiptBuilder;
1313
use alloy_primitives::{map::HashMap, Address, Bytes, B256, U256};
1414
use alloy_rpc_types_engine::PayloadId;
@@ -667,10 +667,14 @@ where
667667
.state_root_calculation_duration
668668
.record(state_root_start_time.elapsed());
669669

670+
let mut requests_hash = None;
670671
let withdrawals_root = if ctx
671672
.chain_spec
672673
.is_isthmus_active_at_timestamp(ctx.attributes().timestamp())
673674
{
675+
// always empty requests hash post isthmus
676+
requests_hash = Some(EMPTY_REQUESTS_HASH);
677+
674678
// withdrawals root field in block header is used for storage root of L2 predeploy
675679
// `l2tol1-message-passer`
676680
Some(
@@ -716,7 +720,7 @@ where
716720
parent_beacon_block_root: ctx.attributes().payload_attributes.parent_beacon_block_root,
717721
blob_gas_used,
718722
excess_blob_gas,
719-
requests_hash: None,
723+
requests_hash,
720724
};
721725

722726
// seal the block
@@ -748,7 +752,7 @@ where
748752
let receipts_with_hash = new_transactions
749753
.iter()
750754
.zip(new_receipts.iter())
751-
.map(|(tx, receipt)| (*tx.tx_hash(), receipt.clone()))
755+
.map(|(tx, receipt)| (tx.tx_hash(), receipt.clone()))
752756
.collect::<HashMap<B256, OpReceipt>>();
753757
let new_account_balances = new_bundle
754758
.state
@@ -1190,7 +1194,7 @@ where
11901194
num_txs_simulated_fail += 1;
11911195
trace!(target: "payload_builder", ?tx, "skipping reverted transaction");
11921196
best_txs.mark_invalid(tx.signer(), tx.nonce());
1193-
info.invalid_tx_hashes.insert(*tx.tx_hash());
1197+
info.invalid_tx_hashes.insert(tx.tx_hash());
11941198
continue;
11951199
}
11961200

‎crates/op-rbuilder/src/payload_builder_vanilla.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1107,7 +1107,7 @@ where
11071107
num_txs_simulated_fail += 1;
11081108
trace!(target: "payload_builder", ?tx, "skipping reverted transaction");
11091109
best_txs.mark_invalid(tx.signer(), tx.nonce());
1110-
info.invalid_tx_hashes.insert(*tx.tx_hash());
1110+
info.invalid_tx_hashes.insert(tx.tx_hash());
11111111
continue;
11121112
}
11131113

‎crates/op-rbuilder/src/tester/mod.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ use reth_node_api::{EngineTypes, PayloadTypes};
1818
use reth_optimism_node::OpEngineTypes;
1919
use reth_payload_builder::PayloadId;
2020
use reth_rpc_layer::{AuthClientLayer, AuthClientService, JwtSecret};
21-
use rollup_boost::{Flashblocks, FlashblocksService};
21+
use rollup_boost::Flashblocks;
22+
use rollup_boost::FlashblocksService;
2223
use serde_json::Value;
2324
use std::{
2425
str::FromStr,

‎crates/op-rbuilder/src/tx_signer.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use std::str::FromStr;
22

33
use alloy_consensus::SignableTransaction;
4-
use alloy_primitives::{Address, PrimitiveSignature as Signature, B256, U256};
4+
use alloy_primitives::{Address, Signature, B256, U256};
55
use op_alloy_consensus::OpTypedTransaction;
66
use reth_optimism_primitives::OpTransactionSigned;
77
use reth_primitives::{public_key_to_address, Recovered};

‎crates/rbuilder/src/backtest/store.rs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -620,7 +620,7 @@ mod test {
620620
},
621621
};
622622
use alloy_consensus::{EthereumTxEnvelope, Signed, TxEip1559};
623-
use alloy_primitives::{hex, Address, PrimitiveSignature, B256, U256, U64};
623+
use alloy_primitives::{hex, Address, Signature, B256, U256, U64};
624624
use alloy_rpc_types::{Block, BlockTransactions, Header, Transaction};
625625
use reth_primitives::Recovered;
626626
use time::OffsetDateTime;
@@ -752,11 +752,7 @@ mod test {
752752
value: U256::from(6),
753753
..Default::default()
754754
};
755-
let tx = Signed::new_unchecked(
756-
inner_tx,
757-
PrimitiveSignature::test_signature(),
758-
B256::default(),
759-
);
755+
let tx = Signed::new_unchecked(inner_tx, Signature::test_signature(), B256::default());
760756
Transaction {
761757
inner: Recovered::new_unchecked(
762758
EthereumTxEnvelope::from(tx),

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -493,7 +493,7 @@ mod tests {
493493
Recovered::new_unchecked(
494494
TransactionSigned::new(
495495
Transaction::Legacy(tx_legacy),
496-
alloy_primitives::PrimitiveSignature::test_signature(),
496+
alloy_primitives::Signature::test_signature(),
497497
self.create_hash(),
498498
),
499499
Address::default(),

‎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
@@ -439,7 +439,7 @@ mod tests {
439439
Recovered::new_unchecked(
440440
TransactionSigned::new(
441441
Transaction::Legacy(TxLegacy::default()),
442-
alloy_primitives::PrimitiveSignature::test_signature(),
442+
alloy_primitives::Signature::test_signature(),
443443
self.create_hash(),
444444
),
445445
Address::default(),

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@ mod tests {
430430
Recovered::new_unchecked(
431431
TransactionSigned::new(
432432
Transaction::Legacy(TxLegacy::default()),
433-
alloy_primitives::PrimitiveSignature::test_signature(),
433+
alloy_primitives::Signature::test_signature(),
434434
self.create_hash(),
435435
),
436436
Address::default(),

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1230,7 +1230,7 @@ fn can_execute_with_block_base_fee<Transaction: AsRef<TransactionSigned>>(
12301230
mod tests {
12311231
use super::*;
12321232
use alloy_consensus::TxLegacy;
1233-
use alloy_primitives::{fixed_bytes, PrimitiveSignature};
1233+
use alloy_primitives::{fixed_bytes, Signature};
12341234
use reth_primitives::{Transaction, TransactionSigned};
12351235
use uuid::uuid;
12361236

@@ -1244,7 +1244,7 @@ mod tests {
12441244
gas_price: needed_base_gas,
12451245
..Default::default()
12461246
}),
1247-
PrimitiveSignature::test_signature(),
1247+
Signature::test_signature(),
12481248
Default::default(),
12491249
),
12501250
Address::default(),

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use super::{
44
TransactionSignedEcRecoveredWithBlobs, TxRevertBehavior, LAST_BUNDLE_VERSION,
55
};
66
use alloy_consensus::TxLegacy;
7-
use alloy_primitives::{PrimitiveSignature, B256};
7+
use alloy_primitives::{Signature, B256};
88
use reth_primitives::{Recovered, Transaction, TransactionSigned};
99
use uuid::Uuid;
1010

@@ -27,7 +27,7 @@ impl TestDataGenerator {
2727
nonce: sender_nonce.nonce,
2828
..TxLegacy::default()
2929
}),
30-
PrimitiveSignature::test_signature(),
30+
Signature::test_signature(),
3131
self.base.create_tx_hash(),
3232
),
3333
sender_nonce.account,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use crate::primitives::{OrderId, TransactionSignedEcRecoveredWithBlobs};
2-
use alloy_primitives::{Address, PrimitiveSignature, B256, I256, U256};
2+
use alloy_primitives::{Address, Signature, B256, I256, U256};
33
use reth_primitives::{Recovered, Transaction, TransactionSigned};
44

55
pub fn order_id(id: u64) -> OrderId {
@@ -26,7 +26,7 @@ pub fn tx(tx_hash: u64) -> TransactionSignedEcRecoveredWithBlobs {
2626
TransactionSignedEcRecoveredWithBlobs::new_for_testing(Recovered::new_unchecked(
2727
TransactionSigned::new(
2828
Transaction::Legacy(Default::default()),
29-
PrimitiveSignature::test_signature(),
29+
Signature::test_signature(),
3030
hash(tx_hash),
3131
),
3232
Address::default(),

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use alloy_consensus::SignableTransaction;
2-
use alloy_primitives::{Address, PrimitiveSignature as Signature, B256, U256};
2+
use alloy_primitives::{Address, Signature, B256, U256};
33
use reth_primitives::{public_key_to_address, Recovered, Transaction, TransactionSigned};
44
use secp256k1::{Message, SecretKey, SECP256K1};
55

0 commit comments

Comments
 (0)