adjust syscalls

Author: taratorio

execution/protocol/block_exec.go

@@ -21,6 +21,7 @@ package protocol
 
 import (
 	"cmp"
+	"errors"
 	"fmt"
 	"slices"
 	"time"
@@ -35,6 +36,7 @@ import (
 	"github.com/erigontech/erigon/common/u256"
 	"github.com/erigontech/erigon/diagnostics/metrics"
 	"github.com/erigontech/erigon/execution/chain"
+	"github.com/erigontech/erigon/execution/protocol/fixedgas"
 	"github.com/erigontech/erigon/execution/protocol/params"
 	"github.com/erigontech/erigon/execution/protocol/rules"
 	"github.com/erigontech/erigon/execution/rlp"
@@ -273,10 +275,24 @@ func SysCallContractWithBlockContext(contract accounts.Address, data []byte, cha
 		txContext = NewEVMTxContext(msg)
 	}
 	evm := vm.NewEVM(blockContext, txContext, ibs, chainConfig, vmConfig)
-	mdGas := evmtypes.MdGas{
-		Regular: msg.Gas(),
-		State:   math.MaxUint64,
+	rules := evm.ChainRules()
+	igasCalcRes, overflow := fixedgas.IntrinsicGas(fixedgas.IntrinsicGasCalcArgs{
+		Data:               data,
+		IsContractCreation: msg.To().IsNil(),
+		IsEIP2:             rules.IsHomestead,
+		IsEIP2028:          rules.IsIstanbul,
+		IsEIP3860:          vmConfig.HasEip3860(rules),
+		IsEIP7623:          rules.IsPrague,
+		IsEIP8037:          rules.IsAmsterdam,
+	})
+	if overflow {
+		return nil, errors.New("intrinsic gas calculation overflow in sys call")
 	}
+	igas := evmtypes.MdGas{
+		Regular: igasCalcRes.RegularGas,
+		State:   igasCalcRes.StateGas,
+	}
+	mdGas := SplitIntoMdGas(msg.Gas(), SysCallGasLimit, igas, rules)
 	ret, _, err := evm.Call(
 		msg.From(),
 		msg.To(),
@@ -314,10 +330,24 @@ func SysCreate(contract accounts.Address, data []byte, chainConfig *chain.Config
 	txContext := NewEVMTxContext(msg)
 	blockContext := NewEVMBlockContext(header, GetHashFn(header, nil), nil, author, chainConfig)
 	evm := vm.NewEVM(blockContext, txContext, ibs, chainConfig, vmConfig)
-	mdGas := evmtypes.MdGas{
-		Regular: msg.Gas(),
-		State:   math.MaxUint64,
+	rules := evm.ChainRules()
+	igasCalcRes, overflow := fixedgas.IntrinsicGas(fixedgas.IntrinsicGasCalcArgs{
+		Data:               data,
+		IsContractCreation: msg.To().IsNil(),
+		IsEIP2:             rules.IsHomestead,
+		IsEIP2028:          rules.IsIstanbul,
+		IsEIP3860:          vmConfig.HasEip3860(rules),
+		IsEIP7623:          rules.IsPrague,
+		IsEIP8037:          rules.IsAmsterdam,
+	})
+	if overflow {
+		return nil, errors.New("intrinsic gas calculation overflow in sys create")
+	}
+	igas := evmtypes.MdGas{
+		Regular: igasCalcRes.RegularGas,
+		State:   igasCalcRes.StateGas,
 	}
+	mdGas := SplitIntoMdGas(msg.Gas(), SysCallGasLimit, igas, rules)
 	ret, _, err := evm.SysCreate(
 		msg.From(),
 		msg.Data(),

execution/protocol/md_gas.go

@@ -18,11 +18,10 @@ package protocol
 
 import (
 	"github.com/erigontech/erigon/execution/chain"
-	"github.com/erigontech/erigon/execution/protocol/params"
 	"github.com/erigontech/erigon/execution/vm/evmtypes"
 )
 
-func SplitIntoMdGas(txnGasLimit uint64, intrinsicGas evmtypes.MdGas, rules *chain.Rules) evmtypes.MdGas {
+func SplitIntoMdGas(txnGasLimit uint64, maxTxnGasLimit uint64, intrinsicGas evmtypes.MdGas, rules *chain.Rules) evmtypes.MdGas {
 	if rules.IsAmsterdam {
 		//intrinsic_gas = intrinsic_regular_gas + intrinsic_state_gas
 		//execution_gas = tx.gas - intrinsic_gas
@@ -31,7 +30,7 @@ func SplitIntoMdGas(txnGasLimit uint64, intrinsicGas evmtypes.MdGas, rules *chai
 		//state_gas_reservoir = execution_gas - gas_left
 		intrinsicGas := intrinsicGas.Regular + intrinsicGas.State
 		executionGas := txnGasLimit - intrinsicGas
-		regularGasBudget := params.MaxTxnGasLimit - intrinsicGas
+		regularGasBudget := maxTxnGasLimit - intrinsicGas
 		gasLeft := min(regularGasBudget, executionGas)
 		stateGasReservoir := executionGas - gasLeft
 		return evmtypes.MdGas{Regular: gasLeft, State: stateGasReservoir}

execution/protocol/state_transition.go

@@ -396,7 +396,7 @@ func (st *StateTransition) ApplyFrame() (*evmtypes.ExecutionResult, error) {
 		Regular: intrinsicGasResult.RegularGas,
 		State:   intrinsicGasResult.StateGas,
 	}
-	st.gasRemaining = SplitIntoMdGas(st.msg.Gas(), imdGas, rules)
+	st.gasRemaining = SplitIntoMdGas(st.msg.Gas(), params.MaxTxnGasLimit, imdGas, rules)
 	st.initialGas = st.gasRemaining.Plus(imdGas)
 
 	// Execute the preparatory steps for state transition which includes:
@@ -532,7 +532,7 @@ func (st *StateTransition) TransitionDb(refunds bool, gasBailout bool) (result *
 		Regular: intrinsicGasResult.RegularGas,
 		State:   intrinsicGasResult.StateGas,
 	}
-	st.gasRemaining = SplitIntoMdGas(st.msg.Gas(), imdGas, rules)
+	st.gasRemaining = SplitIntoMdGas(st.msg.Gas(), params.MaxTxnGasLimit, imdGas, rules)
 	st.initialGas = st.gasRemaining.Plus(imdGas)
 
 	verifiedAuthorities, err := st.verifyAuthorities(auths, contractCreation, rules.ChainID.String())

execution/vm/runtime/runtime.go

@@ -36,6 +36,7 @@ import (
 	"github.com/erigontech/erigon/db/state/execctx"
 	"github.com/erigontech/erigon/execution/chain"
 	"github.com/erigontech/erigon/execution/protocol"
+	"github.com/erigontech/erigon/execution/protocol/params"
 	"github.com/erigontech/erigon/execution/state"
 	"github.com/erigontech/erigon/execution/tracing"
 	"github.com/erigontech/erigon/execution/types"
@@ -155,7 +156,7 @@ func Execute(code, input []byte, cfg *Config, tempdir string) ([]byte, *state.In
 		sender,
 		contractAsAddress,
 		input,
-		protocol.SplitIntoMdGas(cfg.GasLimit, evmtypes.MdGas{}, rules),
+		protocol.SplitIntoMdGas(cfg.GasLimit, params.MaxTxnGasLimit, evmtypes.MdGas{}, rules),
 		cfg.Value,
 		false, /* bailout */
 	)
@@ -208,7 +209,7 @@ func Create(input []byte, cfg *Config, blockNr uint64) ([]byte, common.Address,
 	code, address, leftOverGas, err := vmenv.Create(
 		sender,
 		input,
-		protocol.SplitIntoMdGas(cfg.GasLimit, evmtypes.MdGas{}, rules),
+		protocol.SplitIntoMdGas(cfg.GasLimit, params.MaxTxnGasLimit, evmtypes.MdGas{}, rules),
 		cfg.Value,
 		false,
 	)
@@ -242,7 +243,7 @@ func Call(address accounts.Address, input []byte, cfg *Config) ([]byte, evmtypes
 		sender.Address(),
 		address,
 		input,
-		protocol.SplitIntoMdGas(cfg.GasLimit, evmtypes.MdGas{}, rules),
+		protocol.SplitIntoMdGas(cfg.GasLimit, params.MaxTxnGasLimit, evmtypes.MdGas{}, rules),
 		cfg.Value,
 		false, /* bailout */
 	)