Skip to content
This repository was archived by the owner on Apr 18, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions bus-mapping/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -48,3 +48,4 @@ test = ["mock", "rand"]
scroll = ["eth-types/scroll", "mock?/scroll"]
# Enable shanghai feature of mock only if mock is enabled (by test).
shanghai = ["eth-types/shanghai", "mock?/shanghai"]
strict-ccc = []
3 changes: 2 additions & 1 deletion bus-mapping/src/evm/opcodes/create.rs
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,8 @@ impl<const IS_CREATE2: bool> Opcode for Create<IS_CREATE2> {
// ErrNonceUintOverflow occurred.
let is_precheck_ok =
depth < 1025 && caller_balance >= callee.value && caller_nonce < u64::MAX;
if !is_precheck_ok {

if cfg!(feature = "strict-ccc") && !is_precheck_ok {
panic!("invalid tx: create is_precheck_ok");
}

Expand Down
1 change: 1 addition & 0 deletions prover/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,5 @@ default = []
parallel_syn = ["halo2_proofs/parallel_syn", "zkevm-circuits/parallel_syn"]
scroll = ["bus-mapping/scroll", "eth-types/scroll", "zkevm-circuits/scroll"]
shanghai = ["bus-mapping/shanghai", "eth-types/shanghai", "zkevm-circuits/shanghai"]
strict-ccc = ["bus-mapping/strict-ccc", "zkevm-circuits/strict-ccc"]
test = []
1 change: 1 addition & 0 deletions zkevm-circuits/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ scroll = ["bus-mapping/scroll", "eth-types/scroll", "mock?/scroll", "zktrie", "p

# Enable shanghai feature of mock only if mock is enabled (by test).
shanghai = ["bus-mapping/shanghai", "eth-types/shanghai", "mock?/shanghai"]
strict-ccc = ["bus-mapping/strict-ccc"]
test-circuits = []
warn-unimplemented = ["eth-types/warn-unimplemented"]
onephase = [] # debug only
Expand Down