Skip to content
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

[R4R] correct logic for eip check of NewEVMInterpreter #953

Merged
merged 2 commits into from
Jun 24, 2022
Merged

[R4R] correct logic for eip check of NewEVMInterpreter #953

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ebceb25
fix:correct logic for eip check of NewEVMInterpreter
qinglin89 Jun 20, 2022
0137f20
refactor: cuncurrency safe for state_prefetcher
qinglin89 Jun 21, 2022
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
7 changes: 5 additions & 2 deletions core/vm/interpreter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,13 +122,16 @@ func NewEVMInterpreter(evm *EVM, cfg Config) *EVMInterpreter {
default:
jt = frontierInstructionSet
}
for i, eip := range cfg.ExtraEips {
var extraEips []int
for _, eip := range cfg.ExtraEips {
if err := EnableEIP(eip, &jt); err != nil {
// Disable it, so caller can check if it's activated or not
cfg.ExtraEips = append(cfg.ExtraEips[:i], cfg.ExtraEips[i+1:]...)
log.Error("EIP activation failed", "eip", eip, "error", err)
} else {
extraEips = append(extraEips, eip)
}
}
cfg.ExtraEips = extraEips
cfg.JumpTable = jt
}
evmInterpreter := EVMInterpreterPool.Get().(*EVMInterpreter)
Expand Down