Skip to content

fix: post-euclid block tracing #1119

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 5 commits into from
Feb 21, 2025
Merged

fix: post-euclid block tracing #1119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b12fc63
fix: post euclid debugs tracers
omerfirmak Feb 19, 2025
a83f43b
fix: disallow tracing post-euclid blocks with scroll specific RPC met…
omerfirmak Feb 19, 2025
51f3ab9
fix panic when tracing pre-euclid blocks on mpt nodes
omerfirmak Feb 19, 2025
8bae826
fix: scroll tracing on mpt nodes
omerfirmak Feb 19, 2025
543ed19
chore: auto version bump [bot]
omerfirmak Feb 19, 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
10 changes: 8 additions & 2 deletions core/vm/logger_trace.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,16 @@ func traceLastNAddressCode(n int) traceFunc {

func traceCodeWithAddress(l *StructLogger, address common.Address) {
code := l.env.StateDB.GetCode(address)

keccakCodeHash := l.env.StateDB.GetKeccakCodeHash(address)
poseidonCodeHash := l.env.StateDB.GetPoseidonCodeHash(address)
codeHash := keccakCodeHash
poseidonCodeHash := common.Hash{}
if !l.env.chainRules.IsEuclid && l.env.chainConfig.Scroll.UseZktrie {
poseidonCodeHash = l.env.StateDB.GetPoseidonCodeHash(address)
codeHash = poseidonCodeHash
}
codeSize := l.env.StateDB.GetCodeSize(address)
l.bytecodes[poseidonCodeHash] = CodeInfo{
l.bytecodes[codeHash] = CodeInfo{
codeSize,
keccakCodeHash,
poseidonCodeHash,
Expand Down
2 changes: 1 addition & 1 deletion params/version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
const (
VersionMajor = 5 // Major version component of the current release
VersionMinor = 8 // Minor version component of the current release
VersionPatch = 8 // Patch version component of the current release
VersionPatch = 9 // Patch version component of the current release
VersionMeta = "mainnet" // Version metadata to append to the version string
)

Expand Down
8 changes: 8 additions & 0 deletions rollup/tracing/tracing.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,14 @@ func CreateTraceEnv(chainConfig *params.ChainConfig, chainContext core.ChainCont
}

func (env *TraceEnv) GetBlockTrace(block *types.Block) (*types.BlockTrace, error) {
if !env.chainConfig.Scroll.UseZktrie {
return nil, errors.New("scroll tracing methods are not available on MPT-enabled nodes")
}

if env.chainConfig.IsEuclid(block.Time()) {
return nil, errors.New("cannot trace post euclid blocks with scroll specific RPC methods")
}

// Execute all the transaction contained within the block concurrently
var (
txs = block.Transactions()
Expand Down