Skip to content

chore: bump dep versions for reth upgrade #121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 29, 2025
Merged

chore: bump dep versions for reth upgrade #121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f51dcc5
chore: bump dep versions for reth upgrade
Evalir Sep 27, 2025
e705d68
chore: remove now unnecessary manual `Clone` impl
Evalir Sep 27, 2025
3fae256
mark alloy-core manually
Evalir Sep 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 16 additions & 15 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ members = ["crates/*"]
resolver = "2"

[workspace.package]
version = "0.10.2"
version = "0.11.0"
Copy link
Member

@prestwich prestwich Sep 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this semver breaking?

Copy link
Member Author

@Evalir Evalir Sep 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#116 this is generally how we've done it before, no?

Copy link
Member

@prestwich prestwich Sep 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah I think this is appropriate because downstream crates have relied on specific crate versions

edition = "2021"
rust-version = "1.85"
authors = ["init4"]
Expand Down Expand Up @@ -34,33 +34,34 @@ debug = false
incremental = false

[workspace.dependencies]
signet-bundle = { version = "0.10", path = "crates/bundle" }
signet-constants = { version = "0.10", path = "crates/constants" }
signet-evm = { version = "0.10", path = "crates/evm" }
signet-extract = { version = "0.10", path = "crates/extract" }
signet-journal = { version = "0.10", path = "crates/journal" }
signet-node = { version = "0.10", path = "crates/node" }
signet-sim = { version = "0.10", path = "crates/sim" }
signet-types = { version = "0.10", path = "crates/types" }
signet-tx-cache = { version = "0.10", path = "crates/tx-cache" }
signet-zenith = { version = "0.10", path = "crates/zenith" }
signet-bundle = { version = "0.11", path = "crates/bundle" }
signet-constants = { version = "0.11", path = "crates/constants" }
signet-evm = { version = "0.11", path = "crates/evm" }
signet-extract = { version = "0.11", path = "crates/extract" }
signet-journal = { version = "0.11", path = "crates/journal" }
signet-node = { version = "0.11", path = "crates/node" }
signet-sim = { version = "0.11", path = "crates/sim" }
signet-types = { version = "0.11", path = "crates/types" }
signet-tx-cache = { version = "0.11", path = "crates/tx-cache" }
signet-zenith = { version = "0.11", path = "crates/zenith" }

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

# ajj
ajj = { version = "0.3.4" }

# trevm
trevm = { version = "0.27.8", features = ["full_env_cfg"] }
trevm = { version = "0.29.0", features = ["full_env_cfg"] }

# Alloy periphery crates
alloy = { version = "1.0.25", features = [
alloy-core = "1.4"
alloy = { version = "1.0.35", features = [
"full",
"rpc-types-mev",
"genesis",
"arbitrary",
] }
alloy-contract = { version = "1.0.25", features = ["pubsub"] }
alloy-contract = { version = "1.0.35", features = ["pubsub"] }

# Async
tokio = { version = "1.43.0", features = ["macros"] }
Expand Down
2 changes: 1 addition & 1 deletion crates/test-utils/tests/basic_sim.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ pub async fn test_simulator() {
.build()
.await;

assert!(built.transactions().len() == 10);
assert_eq!(built.transactions().len(), 10);

// This asserts that the builder has sorted the transactions by priority
// fee.
Expand Down
1 change: 1 addition & 0 deletions crates/zenith/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ repository.workspace = true
trevm.workspace = true

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

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

Expand Down
127 changes: 0 additions & 127 deletions crates/zenith/src/bindings.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,22 +29,6 @@ mod zenith {
impl Copy for Zenith::OnlySequencerAdmin {}
impl Copy for Zenith::IncorrectHostBlock {}

impl Clone for Zenith::ZenithCalls {
fn clone(&self) -> Self {
use self::Zenith::ZenithCalls::*;
match self {
sequencerAdmin(call) => sequencerAdmin(call.clone()),
deployBlockNumber(call) => deployBlockNumber(call.clone()),
lastSubmittedAtBlock(call) => lastSubmittedAtBlock(call.clone()),
isSequencer(call) => isSequencer(call.clone()),
addSequencer(call) => addSequencer(call.clone()),
removeSequencer(call) => removeSequencer(call.clone()),
submitBlock(call) => submitBlock(call.clone()),
blockCommitment(call) => blockCommitment(call.clone()),
}
}
}

impl Zenith::BlockSubmitted {
/// Get the sequencer address that signed the block.
pub const fn sequencer(&self) -> Address {
Expand Down Expand Up @@ -144,32 +128,6 @@ mod passage {

impl Copy for Passage::PassageEvents {}

impl Clone for Passage::PassageEvents {
fn clone(&self) -> Self {
*self
}
}

impl Clone for Passage::PassageCalls {
fn clone(&self) -> Self {
use self::Passage::PassageCalls::*;
match self {
canEnter(call) => canEnter(call.clone()),
configureEnter(call) => configureEnter(call.clone()),
defaultRollupChainId(call) => defaultRollupChainId(call.clone()),
enter_0(call) => enter_0(call.clone()),
enter_1(call) => enter_1(call.clone()),
enterToken_0(call) => enterToken_0(call.clone()),
enterToken_1(call) => enterToken_1(call.clone()),
enterTokenPermit2(call) => enterTokenPermit2(call.clone()),
enterWitness(call) => enterWitness(call.clone()),
exitWitness(call) => exitWitness(call.clone()),
tokenAdmin(call) => tokenAdmin(call.clone()),
withdraw(call) => withdraw(call.clone()),
}
}
}

impl Passage::EnterToken {
/// Get the chain ID of the event (discarding high bytes), returns `None`
/// if the event has no associated chain id.
Expand Down Expand Up @@ -273,30 +231,6 @@ mod orders {
impl Copy for Orders::OutputMismatch {}
impl Copy for Orders::SafeERC20FailedOperation {}

impl Clone for Orders::OrdersEvents {
fn clone(&self) -> Self {
match self {
Self::Order(event) => Self::Order(event.clone()),
Self::Sweep(event) => Self::Sweep(*event),
Self::Filled(event) => Self::Filled(event.clone()),
}
}
}

impl Clone for Orders::OrdersCalls {
fn clone(&self) -> Self {
use self::Orders::OrdersCalls::*;
match self {
fill(call) => fill(call.clone()),
fillPermit2(call) => fillPermit2(call.clone()),
initiate(call) => initiate(call.clone()),
initiatePermit2(call) => initiatePermit2(call.clone()),
outputWitness(call) => outputWitness(call.clone()),
sweep(call) => sweep(call.clone()),
}
}
}

impl IOrders::Input {
pub const fn token(&self) -> Address {
self.token
Expand Down Expand Up @@ -413,37 +347,6 @@ mod transactor {

impl Copy for Transactor::GasConfigured {}

impl Clone for Transactor::TransactorEvents {
fn clone(&self) -> Self {
match self {
Transactor::TransactorEvents::Transact(event) => {
Transactor::TransactorEvents::Transact(event.clone())
}
Transactor::TransactorEvents::GasConfigured(event) => {
Transactor::TransactorEvents::GasConfigured(*event)
}
}
}
}

impl Clone for Transactor::TransactorCalls {
fn clone(&self) -> Self {
use self::Transactor::TransactorCalls::*;
match self {
configureGas(call) => configureGas(call.clone()),
defaultRollupChainId(call) => defaultRollupChainId(call.clone()),
enterTransact(call) => enterTransact(call.clone()),
transact_0(call) => transact_0(call.clone()),
transact_1(call) => transact_1(call.clone()),
gasAdmin(call) => gasAdmin(call.clone()),
passage(call) => passage(call.clone()),
perBlockGasLimit(call) => perBlockGasLimit(call.clone()),
perTransactGasLimit(call) => perTransactGasLimit(call.clone()),
transactGasUsed(call) => transactGasUsed(call.clone()),
}
}
}

impl Transactor::Transact {
pub const fn rollup_chain_id(&self) -> u64 {
self.rollupChainId.as_limbs()[0]
Expand Down Expand Up @@ -491,25 +394,6 @@ mod rollup_passage {
impl Copy for RollupPassage::SafeERC20FailedOperation {}

impl Copy for RollupPassage::RollupPassageEvents {}

impl Clone for RollupPassage::RollupPassageEvents {
fn clone(&self) -> Self {
*self
}
}

impl Clone for RollupPassage::RollupPassageCalls {
fn clone(&self) -> Self {
use self::RollupPassage::RollupPassageCalls::*;
match self {
exit(call) => exit(call.clone()),
exitToken(call) => exitToken(call.clone()),
enterWitness(call) => enterWitness(call.clone()),
exitTokenPermit2(call) => exitTokenPermit2(call.clone()),
exitWitness(call) => exitWitness(call.clone()),
}
}
}
}

mod bundle_helper {
Expand Down Expand Up @@ -598,17 +482,6 @@ mod bundle_helper {
TokenPermissions { token: perm.token, amount: perm.amount }
}
}

impl Clone for BundleHelper::BundleHelperCalls {
fn clone(&self) -> Self {
use self::BundleHelper::BundleHelperCalls::*;
match self {
submit(call) => submit(call.clone()),
zenith(call) => zenith(call.clone()),
orders(call) => orders(call.clone()),
}
}
}
}

pub use zenith::Zenith;
Expand Down
2 changes: 2 additions & 0 deletions crates/zenith/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ use alloy::{
providers::Provider,
};

use alloy_core as _;

/// System address with permission to mint tokens on pre-deploys.
/// "tokenadmin"
pub const MINTER_ADDRESS: Address = address!("00000000000000000000746f6b656e61646d696e");
Expand Down
Loading