instructions: only add JUMP(I) targets if we are not deploying a cont…

…ract Signed-off-by: Ignacio Hagopian <[email protected]>
gballet · Jan 6, 2025 · f7d80fc · f7d80fc
1 parent 9b476e9
commit f7d80fc
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/core/vm/instructions.go b/core/vm/instructions.go
@@ -584,7 +584,7 @@ func opJump(pc *uint64, interpreter *EVMInterpreter, scope *ScopeContext) ([]byt
 		return nil, errStopToken
 	}
 	pos := scope.Stack.pop()
-	if interpreter.evm.chainRules.IsEIP4762 {
+	if interpreter.evm.chainRules.IsEIP4762 && !scope.Contract.IsDeployment {
 		statelessGas, wanted := interpreter.evm.TxContext.Accesses.TouchCodeChunksRangeAndChargeGas(scope.Contract.CodeAddr[:], pos.Uint64(), 1, uint64(len(scope.Contract.Code)), false, scope.Contract.Gas)
 		scope.Contract.UseGas(statelessGas)
 		if statelessGas < wanted {
@@ -604,7 +604,7 @@ func opJumpi(pc *uint64, interpreter *EVMInterpreter, scope *ScopeContext) ([]by
 	}
 	pos, cond := scope.Stack.pop(), scope.Stack.pop()
 	if !cond.IsZero() {
-		if interpreter.evm.chainRules.IsEIP4762 {
+		if interpreter.evm.chainRules.IsEIP4762 && !scope.Contract.IsDeployment {
 			statelessGas, wanted := interpreter.evm.TxContext.Accesses.TouchCodeChunksRangeAndChargeGas(scope.Contract.CodeAddr[:], pos.Uint64(), 1, uint64(len(scope.Contract.Code)), false, scope.Contract.Gas)
 			scope.Contract.UseGas(statelessGas)
 			if statelessGas < wanted {