Skip to content

Merge release/2.64 into zkevm#2094

Open
IvanBelyakoff wants to merge 28 commits intozkevmfrom
backport/release-2.64
Open

Merge release/2.64 into zkevm#2094
IvanBelyakoff wants to merge 28 commits intozkevmfrom
backport/release-2.64

Conversation

@IvanBelyakoff
Copy link
Copy Markdown
Collaborator

This PR merges the entire release/2.64 branch into zkevm, covering all missing commits up to v2.64.2. Conflicts in gas tracking and sequence execution were resolved while keeping zkevm logic intact.

elliothllm and others added 27 commits October 15, 2025 10:06
feat(blobrecovery): added basefee to blob recovery mode
fix(ci): add write perms for google oidc
don't pull GCR images in CI for kurtosis
turn off hive tests for release/* branches
…ind-pmt-2.64

unwind to correct block when unwinding pmt on rpc
fix: gas price tracker crash on race
The debug_traceCall RPC method was crashing with "method handler crashed"
when called with a tracer config that didn't include the Reexec field.

Root cause: In TraceCall(), the code checked `if config == nil || isLatest`
before using CreateStateReader, but the else branch dereferenced
`*config.Reexec` without checking if Reexec was nil.

Fix: Add `|| config.Reexec == nil` to the condition to use the current
state reader when Reexec is not provided.

Also includes defensive checks in the call tracer:
- Check for empty callstack in CaptureState before accessing it
- Check for empty callstack in CaptureExit before appending
- Bounds check in fixLogIndexGap to prevent out-of-bounds access
- Added tests for these edge cases
…ase-2.64

# Conflicts:
#	turbo/jsonrpc/eth_system_gas_tracking.go
#	zk/stages/stage_sequence_execute_blocks.go
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants