Skip to content

Commit 7c4764b

Browse files
authored
chore: bump dep versions for reth upgrade (#121)
* chore: bump dep versions for reth upgrade * chore: remove now unnecessary manual `Clone` impl * mark alloy-core manually
1 parent 7b0b7c0 commit 7c4764b

File tree

5 files changed

+20
-143
lines changed

5 files changed

+20
-143
lines changed

Cargo.toml

Lines changed: 16 additions & 15 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.10.2"
6+
version = "0.11.0"
77
edition = "2021"
88
rust-version = "1.85"
99
authors = ["init4"]
@@ -34,33 +34,34 @@ debug = false
3434
incremental = false
3535

3636
[workspace.dependencies]
37-
signet-bundle = { version = "0.10", path = "crates/bundle" }
38-
signet-constants = { version = "0.10", path = "crates/constants" }
39-
signet-evm = { version = "0.10", path = "crates/evm" }
40-
signet-extract = { version = "0.10", path = "crates/extract" }
41-
signet-journal = { version = "0.10", path = "crates/journal" }
42-
signet-node = { version = "0.10", path = "crates/node" }
43-
signet-sim = { version = "0.10", path = "crates/sim" }
44-
signet-types = { version = "0.10", path = "crates/types" }
45-
signet-tx-cache = { version = "0.10", path = "crates/tx-cache" }
46-
signet-zenith = { version = "0.10", path = "crates/zenith" }
37+
signet-bundle = { version = "0.11", path = "crates/bundle" }
38+
signet-constants = { version = "0.11", path = "crates/constants" }
39+
signet-evm = { version = "0.11", path = "crates/evm" }
40+
signet-extract = { version = "0.11", path = "crates/extract" }
41+
signet-journal = { version = "0.11", path = "crates/journal" }
42+
signet-node = { version = "0.11", path = "crates/node" }
43+
signet-sim = { version = "0.11", path = "crates/sim" }
44+
signet-types = { version = "0.11", path = "crates/types" }
45+
signet-tx-cache = { version = "0.11", path = "crates/tx-cache" }
46+
signet-zenith = { version = "0.11", path = "crates/zenith" }
4747

48-
signet-test-utils = { version = "0.10", path = "crates/test-utils" }
48+
signet-test-utils = { version = "0.11", path = "crates/test-utils" }
4949

5050
# ajj
5151
ajj = { version = "0.3.4" }
5252

5353
# trevm
54-
trevm = { version = "0.27.8", features = ["full_env_cfg"] }
54+
trevm = { version = "0.29.0", features = ["full_env_cfg"] }
5555

5656
# Alloy periphery crates
57-
alloy = { version = "1.0.25", features = [
57+
alloy-core = "1.4"
58+
alloy = { version = "1.0.35", features = [
5859
"full",
5960
"rpc-types-mev",
6061
"genesis",
6162
"arbitrary",
6263
] }
63-
alloy-contract = { version = "1.0.25", features = ["pubsub"] }
64+
alloy-contract = { version = "1.0.35", features = ["pubsub"] }
6465

6566
# Async
6667
tokio = { version = "1.43.0", features = ["macros"] }

crates/test-utils/tests/basic_sim.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ pub async fn test_simulator() {
7272
.build()
7373
.await;
7474

75-
assert!(built.transactions().len() == 10);
75+
assert_eq!(built.transactions().len(), 10);
7676

7777
// This asserts that the builder has sorted the transactions by priority
7878
// fee.

crates/zenith/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ repository.workspace = true
1414
trevm.workspace = true
1515

1616
alloy = { workspace = true, features = ["full", "json-rpc", "signer-aws", "rpc-types-mev", "rlp"] }
17+
alloy-core.workspace = true
1718

1819
serde = { workspace = true, features = ["derive"] }
1920

crates/zenith/src/bindings.rs

Lines changed: 0 additions & 127 deletions
Original file line numberDiff line numberDiff line change
@@ -29,22 +29,6 @@ mod zenith {
2929
impl Copy for Zenith::OnlySequencerAdmin {}
3030
impl Copy for Zenith::IncorrectHostBlock {}
3131

32-
impl Clone for Zenith::ZenithCalls {
33-
fn clone(&self) -> Self {
34-
use self::Zenith::ZenithCalls::*;
35-
match self {
36-
sequencerAdmin(call) => sequencerAdmin(call.clone()),
37-
deployBlockNumber(call) => deployBlockNumber(call.clone()),
38-
lastSubmittedAtBlock(call) => lastSubmittedAtBlock(call.clone()),
39-
isSequencer(call) => isSequencer(call.clone()),
40-
addSequencer(call) => addSequencer(call.clone()),
41-
removeSequencer(call) => removeSequencer(call.clone()),
42-
submitBlock(call) => submitBlock(call.clone()),
43-
blockCommitment(call) => blockCommitment(call.clone()),
44-
}
45-
}
46-
}
47-
4832
impl Zenith::BlockSubmitted {
4933
/// Get the sequencer address that signed the block.
5034
pub const fn sequencer(&self) -> Address {
@@ -144,32 +128,6 @@ mod passage {
144128

145129
impl Copy for Passage::PassageEvents {}
146130

147-
impl Clone for Passage::PassageEvents {
148-
fn clone(&self) -> Self {
149-
*self
150-
}
151-
}
152-
153-
impl Clone for Passage::PassageCalls {
154-
fn clone(&self) -> Self {
155-
use self::Passage::PassageCalls::*;
156-
match self {
157-
canEnter(call) => canEnter(call.clone()),
158-
configureEnter(call) => configureEnter(call.clone()),
159-
defaultRollupChainId(call) => defaultRollupChainId(call.clone()),
160-
enter_0(call) => enter_0(call.clone()),
161-
enter_1(call) => enter_1(call.clone()),
162-
enterToken_0(call) => enterToken_0(call.clone()),
163-
enterToken_1(call) => enterToken_1(call.clone()),
164-
enterTokenPermit2(call) => enterTokenPermit2(call.clone()),
165-
enterWitness(call) => enterWitness(call.clone()),
166-
exitWitness(call) => exitWitness(call.clone()),
167-
tokenAdmin(call) => tokenAdmin(call.clone()),
168-
withdraw(call) => withdraw(call.clone()),
169-
}
170-
}
171-
}
172-
173131
impl Passage::EnterToken {
174132
/// Get the chain ID of the event (discarding high bytes), returns `None`
175133
/// if the event has no associated chain id.
@@ -273,30 +231,6 @@ mod orders {
273231
impl Copy for Orders::OutputMismatch {}
274232
impl Copy for Orders::SafeERC20FailedOperation {}
275233

276-
impl Clone for Orders::OrdersEvents {
277-
fn clone(&self) -> Self {
278-
match self {
279-
Self::Order(event) => Self::Order(event.clone()),
280-
Self::Sweep(event) => Self::Sweep(*event),
281-
Self::Filled(event) => Self::Filled(event.clone()),
282-
}
283-
}
284-
}
285-
286-
impl Clone for Orders::OrdersCalls {
287-
fn clone(&self) -> Self {
288-
use self::Orders::OrdersCalls::*;
289-
match self {
290-
fill(call) => fill(call.clone()),
291-
fillPermit2(call) => fillPermit2(call.clone()),
292-
initiate(call) => initiate(call.clone()),
293-
initiatePermit2(call) => initiatePermit2(call.clone()),
294-
outputWitness(call) => outputWitness(call.clone()),
295-
sweep(call) => sweep(call.clone()),
296-
}
297-
}
298-
}
299-
300234
impl IOrders::Input {
301235
pub const fn token(&self) -> Address {
302236
self.token
@@ -413,37 +347,6 @@ mod transactor {
413347

414348
impl Copy for Transactor::GasConfigured {}
415349

416-
impl Clone for Transactor::TransactorEvents {
417-
fn clone(&self) -> Self {
418-
match self {
419-
Transactor::TransactorEvents::Transact(event) => {
420-
Transactor::TransactorEvents::Transact(event.clone())
421-
}
422-
Transactor::TransactorEvents::GasConfigured(event) => {
423-
Transactor::TransactorEvents::GasConfigured(*event)
424-
}
425-
}
426-
}
427-
}
428-
429-
impl Clone for Transactor::TransactorCalls {
430-
fn clone(&self) -> Self {
431-
use self::Transactor::TransactorCalls::*;
432-
match self {
433-
configureGas(call) => configureGas(call.clone()),
434-
defaultRollupChainId(call) => defaultRollupChainId(call.clone()),
435-
enterTransact(call) => enterTransact(call.clone()),
436-
transact_0(call) => transact_0(call.clone()),
437-
transact_1(call) => transact_1(call.clone()),
438-
gasAdmin(call) => gasAdmin(call.clone()),
439-
passage(call) => passage(call.clone()),
440-
perBlockGasLimit(call) => perBlockGasLimit(call.clone()),
441-
perTransactGasLimit(call) => perTransactGasLimit(call.clone()),
442-
transactGasUsed(call) => transactGasUsed(call.clone()),
443-
}
444-
}
445-
}
446-
447350
impl Transactor::Transact {
448351
pub const fn rollup_chain_id(&self) -> u64 {
449352
self.rollupChainId.as_limbs()[0]
@@ -491,25 +394,6 @@ mod rollup_passage {
491394
impl Copy for RollupPassage::SafeERC20FailedOperation {}
492395

493396
impl Copy for RollupPassage::RollupPassageEvents {}
494-
495-
impl Clone for RollupPassage::RollupPassageEvents {
496-
fn clone(&self) -> Self {
497-
*self
498-
}
499-
}
500-
501-
impl Clone for RollupPassage::RollupPassageCalls {
502-
fn clone(&self) -> Self {
503-
use self::RollupPassage::RollupPassageCalls::*;
504-
match self {
505-
exit(call) => exit(call.clone()),
506-
exitToken(call) => exitToken(call.clone()),
507-
enterWitness(call) => enterWitness(call.clone()),
508-
exitTokenPermit2(call) => exitTokenPermit2(call.clone()),
509-
exitWitness(call) => exitWitness(call.clone()),
510-
}
511-
}
512-
}
513397
}
514398

515399
mod bundle_helper {
@@ -598,17 +482,6 @@ mod bundle_helper {
598482
TokenPermissions { token: perm.token, amount: perm.amount }
599483
}
600484
}
601-
602-
impl Clone for BundleHelper::BundleHelperCalls {
603-
fn clone(&self) -> Self {
604-
use self::BundleHelper::BundleHelperCalls::*;
605-
match self {
606-
submit(call) => submit(call.clone()),
607-
zenith(call) => zenith(call.clone()),
608-
orders(call) => orders(call.clone()),
609-
}
610-
}
611-
}
612485
}
613486

614487
pub use zenith::Zenith;

crates/zenith/src/lib.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ use alloy::{
2727
providers::Provider,
2828
};
2929

30+
use alloy_core as _;
31+
3032
/// System address with permission to mint tokens on pre-deploys.
3133
/// "tokenadmin"
3234
pub const MINTER_ADDRESS: Address = address!("00000000000000000000746f6b656e61646d696e");

0 commit comments

Comments
 (0)