Merge pull request #953 from qinglin89/fix-evm

correct logic for eip check of NewEVMInterpreter
bnb-chain · Jun 24, 2022 · 128977c · 128977c
2 parents 6ec6eda + 0137f20
commit 128977c
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/core/vm/interpreter.go b/core/vm/interpreter.go
@@ -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)