RPC: disable EIP-7825 gas limit check for eth_call and ilk (#17169)

yperbasis · web-flow · commit 8625f0654187 · 2025-09-22T14:26:35.000+02:00
See ethereum/go-ethereum#32641 & https://discord.com/channels/595666850260713488/1416131247251521556
diff --git a/core/blockchain.go b/core/blockchain.go
@@ -284,9 +284,11 @@ func SysCallContractWithBlockContext(contract common.Address, data []byte, chain
 		SysCallGasLimit,
 		u256.Num0,
 		nil, nil,
-		data, nil, false,
-		true, // isFree
-		nil,  // maxFeePerBlobGas
+		data, nil,
+		false, // checkNonce
+		false, // checkGas
+		true,  // isFree
+		nil,   // maxFeePerBlobGas
 	)
 	vmConfig := vmCfg
 	vmConfig.NoReceipts = true
@@ -324,9 +326,11 @@ func SysCreate(contract common.Address, data []byte, chainConfig *chain.Config,
 		SysCallGasLimit,
 		u256.Num0,
 		nil, nil,
-		data, nil, false,
-		true, // isFree
-		nil,  // maxFeePerBlobGas
+		data, nil,
+		false, // checkNonce
+		false, // checkGas
+		true,  // isFree
+		nil,   // maxFeePerBlobGas
 	)
 	vmConfig := vm.Config{NoReceipts: true}
 	// Create a new context to be used in the EVM environment
diff --git a/core/state_transition.go b/core/state_transition.go
@@ -109,6 +109,7 @@ type Message interface {
 	FeeCap() *uint256.Int
 	TipCap() *uint256.Int
 	Gas() uint64
+	CheckGas() bool
 	BlobGas() uint64
 	MaxFeePerBlobGas() *uint256.Int
 	Value() *uint256.Int
@@ -339,7 +340,7 @@ func (st *StateTransition) preCheck(gasBailout bool) error {
 	}
 
 	// EIP-7825: Transaction Gas Limit Cap
-	if st.evm.ChainRules().IsOsaka && st.msg.Gas() > params.MaxTxnGasLimit {
+	if st.msg.CheckGas() && st.evm.ChainRules().IsOsaka && st.msg.Gas() > params.MaxTxnGasLimit {
 		return fmt.Errorf("%w: address %v, gas limit %d", ErrGasLimitTooHigh, st.msg.From().Hex(), st.msg.Gas())
 	}
 
diff --git a/execution/abi/bind/backends/simulated.go b/execution/abi/bind/backends/simulated.go
@@ -843,6 +843,7 @@ func (m callMsg) GasPrice() *uint256.Int                { return m.CallMsg.GasPr
 func (m callMsg) FeeCap() *uint256.Int                  { return m.CallMsg.FeeCap }
 func (m callMsg) TipCap() *uint256.Int                  { return m.CallMsg.TipCap }
 func (m callMsg) Gas() uint64                           { return m.CallMsg.Gas }
+func (m callMsg) CheckGas() bool                        { return true }
 func (m callMsg) Value() *uint256.Int                   { return m.CallMsg.Value }
 func (m callMsg) Data() []byte                          { return m.CallMsg.Data }
 func (m callMsg) AccessList() types.AccessList          { return m.CallMsg.AccessList }
diff --git a/execution/tests/testutil/state_test_util.go b/execution/tests/testutil/state_test_util.go
@@ -486,6 +486,7 @@ func toMessage(tx stTransaction, ps stPostState, baseFee *big.Int) (core.Message
 		data,
 		accessList,
 		false, /* checkNonce */
+		true,  /* checkGas */
 		false, /* isFree */
 		uint256.MustFromBig(blobFeeCap),
 	)
diff --git a/execution/types/access_list_tx.go b/execution/types/access_list_tx.go
@@ -423,6 +423,7 @@ func (tx *AccessListTx) AsMessage(s Signer, _ *big.Int, rules *chain.Rules) (*Me
 		data:       tx.Data,
 		accessList: tx.AccessList,
 		checkNonce: true,
+		checkGas:   true,
 	}
 
 	if !rules.IsBerlin {
diff --git a/execution/types/blob_tx.go b/execution/types/blob_tx.go
@@ -60,6 +60,7 @@ func (stx *BlobTx) AsMessage(s Signer, baseFee *big.Int, rules *chain.Rules) (*M
 		data:       stx.Data,
 		accessList: stx.AccessList,
 		checkNonce: true,
+		checkGas:   true,
 	}
 	if !rules.IsCancun {
 		return nil, errors.New("BlobTx transactions require Cancun")
diff --git a/execution/types/dynamic_fee_tx.go b/execution/types/dynamic_fee_tx.go
@@ -344,6 +344,7 @@ func (tx *DynamicFeeTransaction) AsMessage(s Signer, baseFee *big.Int, rules *ch
 		data:       tx.Data,
 		accessList: tx.AccessList,
 		checkNonce: true,
+		checkGas:   true,
 	}
 	if !rules.IsLondon {
 		return nil, errors.New("eip-1559 transactions require London")
diff --git a/execution/types/legacy_tx.go b/execution/types/legacy_tx.go
@@ -358,6 +358,7 @@ func (tx *LegacyTx) AsMessage(s Signer, _ *big.Int, _ *chain.Rules) (*Message, e
 		data:       tx.Data,
 		accessList: nil,
 		checkNonce: true,
+		checkGas:   true,
 	}
 
 	var err error
diff --git a/execution/types/set_code_tx.go b/execution/types/set_code_tx.go
@@ -126,6 +126,7 @@ func (tx *SetCodeTransaction) AsMessage(s Signer, baseFee *big.Int, rules *chain
 		data:       tx.Data,
 		accessList: tx.AccessList,
 		checkNonce: true,
+		checkGas:   true,
 	}
 	if !rules.IsPrague {
 		return nil, errors.New("SetCodeTransaction is only supported in Prague")
diff --git a/execution/types/transaction.go b/execution/types/transaction.go
@@ -374,14 +374,15 @@ type Message struct {
 	data             []byte
 	accessList       AccessList
 	checkNonce       bool
+	checkGas         bool
 	isFree           bool
 	blobHashes       []common.Hash
 	authorizations   []Authorization
 }
 
 func NewMessage(from common.Address, to *common.Address, nonce uint64, amount *uint256.Int, gasLimit uint64,
 	gasPrice *uint256.Int, feeCap, tipCap *uint256.Int, data []byte, accessList AccessList, checkNonce bool,
-	isFree bool, maxFeePerBlobGas *uint256.Int,
+	checkGas bool, isFree bool, maxFeePerBlobGas *uint256.Int,
 ) *Message {
 	m := Message{
 		from:       from,
@@ -392,6 +393,7 @@ func NewMessage(from common.Address, to *common.Address, nonce uint64, amount *u
 		data:       data,
 		accessList: accessList,
 		checkNonce: checkNonce,
+		checkGas:   checkGas,
 		isFree:     isFree,
 	}
 	if gasPrice != nil {
@@ -430,6 +432,10 @@ func (m *Message) CheckNonce() bool { return m.checkNonce }
 func (m *Message) SetCheckNonce(checkNonce bool) {
 	m.checkNonce = checkNonce
 }
+func (m *Message) CheckGas() bool { return m.checkGas }
+func (m *Message) SetCheckGas(checkGas bool) {
+	m.checkGas = checkGas
+}
 func (m *Message) IsFree() bool { return m.isFree }
 func (m *Message) SetIsFree(isFree bool) {
 	m.isFree = isFree
diff --git a/polygon/bor/bor_internal_test.go b/polygon/bor/bor_internal_test.go
@@ -89,8 +89,9 @@ func TestCommitStatesIndore(t *testing.T) {
 				nil,
 				nil,
 				nil,
-				false,
-				false,
+				false, // checkNonce
+				false, // checkGas
+				false, // isFree
 				nil,
 			),
 		}, nil,
diff --git a/polygon/bridge/reader.go b/polygon/bridge/reader.go
@@ -100,8 +100,10 @@ func (r *Reader) EventsWithinTime(ctx context.Context, timeFrom, timeTo time.Tim
 			core.SysCallGasLimit,
 			u256.Num0,
 			nil, nil,
-			event, nil, false,
-			true,
+			event, nil,
+			false, // checkNonce
+			false, // checkGas
+			true,  // isFree
 			nil,
 		)
 
@@ -133,8 +135,10 @@ func (r *Reader) Events(ctx context.Context, blockHash common.Hash, blockNum uin
 			core.SysCallGasLimit,
 			u256.Num0,
 			nil, nil,
-			event, nil, false,
-			true,
+			event, nil,
+			false, // checkNonce
+			false, // checkGas
+			true,  // isFree
 			nil,
 		)
 
@@ -226,8 +230,10 @@ func messageFromData(to common.Address, data []byte) *types.Message {
 		core.SysCallGasLimit,
 		u256.Num0,
 		nil, nil,
-		data, nil, false,
-		true,
+		data, nil,
+		false, // checkNonce
+		false, // checkGas
+		true,  // isFree
 		nil,
 	)
 
@@ -250,6 +256,7 @@ func NewStateSyncEventMessages(stateSyncEvents []rlp.RawValue, stateReceiverCont
 			event,
 			nil,   // accessList
 			false, // checkNonce
+			false, // checkGas
 			true,  // isFree
 			nil,   // maxFeePerBlobGas
 		)
diff --git a/rpc/ethapi/api.go b/rpc/ethapi/api.go
@@ -161,7 +161,7 @@ func (args *CallArgs) ToMessage(globalGasCap uint64, baseFee *uint256.Int) (*typ
 		accessList = *args.AccessList
 	}
 
-	msg := types.NewMessage(addr, args.To, 0, value, gas, gasPrice, gasFeeCap, gasTipCap, data, accessList, false /* checkNonce */, false /* isFree */, maxFeePerBlobGas)
+	msg := types.NewMessage(addr, args.To, 0, value, gas, gasPrice, gasFeeCap, gasTipCap, data, accessList, false /* checkNonce */, false /* checkGas */, false /* isFree */, maxFeePerBlobGas)
 
 	if args.BlobVersionedHashes != nil {
 		msg.SetBlobVersionedHashes(args.BlobVersionedHashes)
diff --git a/rpc/jsonrpc/eth_block.go b/rpc/jsonrpc/eth_block.go
@@ -172,6 +172,7 @@ func (api *APIImpl) CallBundle(ctx context.Context, txHashes []common.Hash, stat
 	for _, txn := range txs {
 		msg, err := txn.AsMessage(*signer, nil, rules)
 		msg.SetCheckNonce(false)
+		msg.SetCheckGas(false)
 		if err != nil {
 			return nil, err
 		}
diff --git a/rpc/jsonrpc/overlay_api.go b/rpc/jsonrpc/overlay_api.go
@@ -210,7 +210,7 @@ func (api *OverlayAPIImpl) CallConstructor(ctx context.Context, address common.A
 	contractAddr := types.CreateAddress(msg.From(), msg.Nonce())
 	if creationTx.GetTo() == nil && contractAddr == address {
 		// CREATE: adapt message with new code so it's replaced instantly
-		msg = types.NewMessage(msg.From(), msg.To(), msg.Nonce(), msg.Value(), api.GasCap, msg.GasPrice(), msg.FeeCap(), msg.TipCap(), *code, msg.AccessList(), msg.CheckNonce(), msg.IsFree(), msg.MaxFeePerBlobGas())
+		msg = types.NewMessage(msg.From(), msg.To(), msg.Nonce(), msg.Value(), api.GasCap, msg.GasPrice(), msg.FeeCap(), msg.TipCap(), *code, msg.AccessList(), msg.CheckNonce(), msg.CheckGas(), msg.IsFree(), msg.MaxFeePerBlobGas())
 	} else {
 		msg.ChangeGas(api.GasCap, api.GasCap)
 	}
diff --git a/rpc/jsonrpc/trace_adhoc.go b/rpc/jsonrpc/trace_adhoc.go
@@ -239,7 +239,7 @@ func (args *TraceCallParam) ToMessage(globalGasCap uint64, baseFee *uint256.Int)
 	if args.AccessList != nil {
 		accessList = *args.AccessList
 	}
-	msg := types.NewMessage(addr, args.To, 0, value, gas, gasPrice, gasFeeCap, gasTipCap, data, accessList, false /* checkNonce */, false /* isFree */, maxFeePerBlobGas)
+	msg := types.NewMessage(addr, args.To, 0, value, gas, gasPrice, gasFeeCap, gasTipCap, data, accessList, false /* checkNonce */, false /* checkGas */, false /* isFree */, maxFeePerBlobGas)
 	return msg, nil
 }
 

Original file line number	Diff line number	Diff line change
`@@ -109,6 +109,7 @@ type Message interface {`
`109`	`109`	`FeeCap() *uint256.Int`
`110`	`110`	`TipCap() *uint256.Int`
`111`	`111`	`Gas() uint64`
	`112`	`+ CheckGas() bool`
`112`	`113`	`BlobGas() uint64`
`113`	`114`	`MaxFeePerBlobGas() *uint256.Int`
`114`	`115`	`Value() *uint256.Int`
`@@ -339,7 +340,7 @@ func (st *StateTransition) preCheck(gasBailout bool) error {`
`339`	`340`	`}`
`340`	`341`
`341`	`342`	`// EIP-7825: Transaction Gas Limit Cap`
`342`		`- if st.evm.ChainRules().IsOsaka && st.msg.Gas() > params.MaxTxnGasLimit {`
	`343`	`+ if st.msg.CheckGas() && st.evm.ChainRules().IsOsaka && st.msg.Gas() > params.MaxTxnGasLimit {`
`343`	`344`	`return fmt.Errorf("%w: address %v, gas limit %d", ErrGasLimitTooHigh, st.msg.From().Hex(), st.msg.Gas())`
`344`	`345`	`}`
`345`	`346`
Original file line number	Diff line number	Diff line change
`@@ -486,6 +486,7 @@ func toMessage(tx stTransaction, ps stPostState, baseFee *big.Int) (core.Message`
`486`	`486`	`data,`
`487`	`487`	`accessList,`
`488`	`488`	`false, /* checkNonce */`
	`489`	`+ true, /* checkGas */`
`489`	`490`	`false, /* isFree */`
`490`	`491`	`uint256.MustFromBig(blobFeeCap),`
`491`	`492`	`)`
Original file line number	Diff line number	Diff line change
`@@ -423,6 +423,7 @@ func (tx AccessListTx) AsMessage(s Signer, _ big.Int, rules chain.Rules) (Me`
`423`	`423`	`data: tx.Data,`
`424`	`424`	`accessList: tx.AccessList,`
`425`	`425`	`checkNonce: true,`
	`426`	`+ checkGas: true,`
`426`	`427`	`}`
`427`	`428`
`428`	`429`	`if !rules.IsBerlin {`
Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,7 @@ func (stx BlobTx) AsMessage(s Signer, baseFee big.Int, rules chain.Rules) (M`
`60`	`60`	`data: stx.Data,`
`61`	`61`	`accessList: stx.AccessList,`
`62`	`62`	`checkNonce: true,`
	`63`	`+ checkGas: true,`
`63`	`64`	`}`
`64`	`65`	`if !rules.IsCancun {`
`65`	`66`	`return nil, errors.New("BlobTx transactions require Cancun")`
Original file line number	Diff line number	Diff line change
`@@ -344,6 +344,7 @@ func (tx DynamicFeeTransaction) AsMessage(s Signer, baseFee big.Int, rules *ch`
`344`	`344`	`data: tx.Data,`
`345`	`345`	`accessList: tx.AccessList,`
`346`	`346`	`checkNonce: true,`
	`347`	`+ checkGas: true,`
`347`	`348`	`}`
`348`	`349`	`if !rules.IsLondon {`
`349`	`350`	`return nil, errors.New("eip-1559 transactions require London")`
Original file line number	Diff line number	Diff line change
`@@ -358,6 +358,7 @@ func (tx LegacyTx) AsMessage(s Signer, _ big.Int, _ chain.Rules) (Message, e`
`358`	`358`	`data: tx.Data,`
`359`	`359`	`accessList: nil,`
`360`	`360`	`checkNonce: true,`
	`361`	`+ checkGas: true,`
`361`	`362`	`}`
`362`	`363`
`363`	`364`	`var err error`
Original file line number	Diff line number	Diff line change
`@@ -126,6 +126,7 @@ func (tx SetCodeTransaction) AsMessage(s Signer, baseFee big.Int, rules *chain`
`126`	`126`	`data: tx.Data,`
`127`	`127`	`accessList: tx.AccessList,`
`128`	`128`	`checkNonce: true,`
	`129`	`+ checkGas: true,`
`129`	`130`	`}`
`130`	`131`	`if !rules.IsPrague {`
`131`	`132`	`return nil, errors.New("SetCodeTransaction is only supported in Prague")`