diff --git a/Cargo.toml b/Cargo.toml index 8bfe3bf..078af24 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,7 @@ members = ["crates/*"] resolver = "2" [workspace.package] -version = "0.10.2" +version = "0.11.0" edition = "2021" rust-version = "1.85" authors = ["init4"] @@ -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"] } diff --git a/crates/test-utils/tests/basic_sim.rs b/crates/test-utils/tests/basic_sim.rs index 8653972..eb9e191 100644 --- a/crates/test-utils/tests/basic_sim.rs +++ b/crates/test-utils/tests/basic_sim.rs @@ -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. diff --git a/crates/zenith/Cargo.toml b/crates/zenith/Cargo.toml index 7b7cd22..584b59e 100644 --- a/crates/zenith/Cargo.toml +++ b/crates/zenith/Cargo.toml @@ -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"] } diff --git a/crates/zenith/src/bindings.rs b/crates/zenith/src/bindings.rs index 5f6813b..c696121 100644 --- a/crates/zenith/src/bindings.rs +++ b/crates/zenith/src/bindings.rs @@ -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 { @@ -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. @@ -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 @@ -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] @@ -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 { @@ -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; diff --git a/crates/zenith/src/lib.rs b/crates/zenith/src/lib.rs index 3d78281..0407cec 100644 --- a/crates/zenith/src/lib.rs +++ b/crates/zenith/src/lib.rs @@ -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");