Move the MaxTxGas limit enforcement (#3557)

* Revert "Enable ArbOS 50 in system tests (#3550)"

This reverts commit e167107.

* Correctly implement EIP-7825

* Fix tests that need to set max block gas limit

Author: eljobe

arbos/block_processor.go

@@ -348,9 +348,11 @@ func ProduceBlockAdvanced(
 
 			computeGas := tx.Gas() - dataGas
 			// Implements EIP-7825. Check activated after arbos_50
-			if arbState.ArbOSVersion() >= params.ArbosVersion_50 &&
-				computeGas > maxPerTxGasLimit && isUserTx {
-				return nil, nil, fmt.Errorf("%w (cap: %d, tx l2Gas: %d)", core.ErrGasLimitTooHigh, maxPerTxGasLimit, computeGas)
+			if arbState.ArbOSVersion() >= params.ArbosVersion_50 && computeGas > maxPerTxGasLimit && isUserTx {
+				// Cap the compute gas to the maximum per-transaction gas limit
+				// and attempt to apply the transaction, if it runs out, there
+				// will be an error during execution.
+				computeGas = maxPerTxGasLimit
 			}
 			if computeGas < params.TxGas {
 				if hooks.DiscardInvalidTxsEarly {

cmd/chaininfo/arbitrum_chain_info.json

@@ -263,7 +263,8 @@
     "chain-name": "stylus-testnet",
     "sequencer-url": "https://stylus-testnet-sequencer.arbitrum.io/rpc",
     "feed-url": "wss://stylus-testnet.arbitrum.io/feed",
-    "chain-config": {
+    "chain-config":
+    {
       "chainId": 23011913,
       "homesteadBlock": 0,
       "daoForkBlock": null,
@@ -279,11 +280,13 @@
       "muirGlacierBlock": 0,
       "berlinBlock": 0,
       "londonBlock": 0,
-      "clique": {
+      "clique":
+      {
         "period": 0,
         "epoch": 0
       },
-      "arbitrum": {
+      "arbitrum":
+      {
         "EnableArbOS": true,
         "AllowDebugPrecompiles": false,
         "DataAvailabilityCommittee": false,
@@ -292,7 +295,8 @@
         "GenesisBlockNum": 0
       }
     },
-    "rollup": {
+    "rollup":
+    {
       "bridge": "0x35aa95ac4747D928E2Cd42FE4461F6D9d1826346",
       "inbox": "0xe1e3b1CBaCC870cb6e5F4Bdf246feB6eB5cD351B",
       "sequencer-inbox": "0x00A0F15b79d1D3e5991929FaAbCF2AA65623530c",
@@ -302,4 +306,4 @@
       "deployed-at": 1847
     }
   }
-]
+]

system_tests/batch_poster_test.go

@@ -25,7 +25,6 @@ import (
 	"github.com/offchainlabs/nitro/arbnode/dataposter"
 	"github.com/offchainlabs/nitro/arbnode/dataposter/externalsignertest"
 	"github.com/offchainlabs/nitro/solgen/go/bridgegen"
-	pgen "github.com/offchainlabs/nitro/solgen/go/precompilesgen"
 	"github.com/offchainlabs/nitro/solgen/go/upgrade_executorgen"
 	"github.com/offchainlabs/nitro/util/redisutil"
 )
@@ -367,7 +366,6 @@ func TestBatchPosterLargeTx(t *testing.T) {
 	defer cancel()
 
 	builder := NewNodeBuilder(ctx).DefaultConfig(t, true)
-	builder.takeOwnership = true
 	builder.execConfig.Sequencer.MaxTxDataSize = 110000
 	cleanup := builder.Build(t)
 	defer cleanup()
@@ -378,18 +376,9 @@ func TestBatchPosterLargeTx(t *testing.T) {
 	data := make([]byte, 100000)
 	_, err := rand.Read(data)
 	Require(t, err)
-	gas := builder.L2Info.TransferGas + 2000*uint64(len(data))
-
-	auth := builder.L2Info.GetDefaultTransactOpts("Owner", ctx)
-	arbOwner, err := pgen.NewArbOwner(types.ArbOwnerAddress, builder.L2.Client)
-	Require(t, err)
-	tx, err := arbOwner.SetMaxTxGasLimit(&auth, gas)
-	Require(t, err)
-	_, err = EnsureTxSucceeded(ctx, builder.L2.Client, tx)
-	Require(t, err)
-
 	faucetAddr := builder.L2Info.GetAddress("Faucet")
-	tx = builder.L2Info.PrepareTxToCustomGas("Faucet", &faucetAddr, gas, common.Big0, data)
+	gas := builder.L2Info.TransferGas + 20000*uint64(len(data))
+	tx := builder.L2Info.PrepareTxTo("Faucet", &faucetAddr, gas, common.Big0, data)
 	err = builder.L2.Client.SendTransaction(ctx, tx)
 	Require(t, err)
 	receiptA, err := builder.L2.EnsureTxSucceeded(tx)

system_tests/common_test.go

@@ -764,10 +764,6 @@ func (b *NodeBuilder) BuildL2OnL1(t *testing.T) func() {
 		b.addresses,
 	)
 
-	if b.takeOwnership {
-		becomeChainOwner(t, b.ctx, b.L2Info.GetDefaultTransactOpts("Owner", b.ctx), b.L2.Client)
-	}
-
 	return func() {
 		b.L2.cleanup()
 		if b.L1 != nil && b.L1.cleanup != nil {
@@ -822,7 +818,17 @@ func (b *NodeBuilder) BuildL2(t *testing.T) func() {
 	b.L2.Client = ClientForStack(t, b.L2.Stack)
 
 	if b.takeOwnership {
-		becomeChainOwner(t, b.ctx, b.L2Info.GetDefaultTransactOpts("Owner", b.ctx), b.L2.Client)
+		debugAuth := b.L2Info.GetDefaultTransactOpts("Owner", b.ctx)
+
+		// make auth a chain owner
+		arbdebug, err := precompilesgen.NewArbDebug(common.HexToAddress("0xff"), b.L2.Client)
+		Require(t, err, "failed to deploy ArbDebug")
+
+		tx, err := arbdebug.BecomeChainOwner(&debugAuth)
+		Require(t, err, "failed to deploy ArbDebug")
+
+		_, err = EnsureTxSucceeded(b.ctx, b.L2.Client, tx)
+		Require(t, err)
 	}
 
 	StartWatchChanErr(t, b.ctx, fatalErrChan, b.L2.ConsensusNode)
@@ -2119,13 +2125,3 @@ func populateMachineDir(t *testing.T, cr *github.ConsensusRelease) string {
 	Require(t, err)
 	return machineDir
 }
-
-func becomeChainOwner(t *testing.T, ctx context.Context, opts bind.TransactOpts, client *ethclient.Client) {
-	t.Helper()
-	arbdebug, err := precompilesgen.NewArbDebug(types.ArbDebugAddress, client)
-	Require(t, err, "failed to deploy ArbDebug")
-	tx, err := arbdebug.BecomeChainOwner(&opts)
-	Require(t, err, "failed to deploy ArbDebug")
-	_, err = EnsureTxSucceeded(ctx, client, tx)
-	Require(t, err)
-}

system_tests/precompile_test.go

@@ -9,15 +9,13 @@ import (
 	"math/big"
 	"slices"
 	"sort"
-	"strings"
 	"testing"
 	"time"
 
 	"github.com/google/go-cmp/cmp"
 
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/params"
@@ -513,13 +511,6 @@ func TestArbOwnerMaxTxAndBlockGasLimit(t *testing.T) {
 	if haveBlockGasLimitArbGasInfo.Uint64() != wantBlockGasLimit {
 		t.Fatalf("arbGasInfo blockGasLimit mismatch. have: %d want: %d", haveBlockGasLimitArbGasInfo.Uint64(), wantBlockGasLimit)
 	}
-
-	gas := wantTxGasLimit + 1500000 // as txGasLimit is only on computeGas we need to add more for datagas
-	tx := builder.L2Info.PrepareTx("Owner", "Faucet", gas, big.NewInt(1e10), nil)
-	err = builder.L2.Client.SendTransaction(ctx, tx)
-	if err == nil || !strings.Contains(err.Error(), core.ErrGasLimitTooHigh.Error()) {
-		t.Fatalf("expected ErrGasLimitTooHigh error but got: %v", err)
-	}
 }
 
 func TestArbNativeTokenManagerThroughSolidityContract(t *testing.T) {

system_tests/program_test.go

@@ -1093,7 +1093,7 @@ func testMemory(t *testing.T, jit bool) {
 	args := argsForMulticall(vm.CALL, memoryAddr, nil, []byte{126, 50})
 	args = multicallAppend(args, vm.CALL, memoryAddr, []byte{126, 80})
 
-	tx := l2info.PrepareTxToCustomGas("Owner", &multiAddr, 33000000, nil, args)
+	tx := l2info.PrepareTxTo("Owner", &multiAddr, 1e9, nil, args)
 	receipt := ensure(tx, l2client.SendTransaction(ctx, tx))
 	gasCost := receipt.GasUsedForL2()
 	memCost := model.GasCost(128, 0, 0) + model.GasCost(126, 2, 128)

system_tests/retryable_test.go

@@ -581,7 +581,7 @@ func TestSubmitManyRetryableFailThenRetry(t *testing.T) {
 	}
 
 	l2FaucetTxOpts := builder.L2Info.GetDefaultTransactOpts("Faucet", ctx)
-	l2FaucetTxOpts.GasLimit = l2pricing.InitialPerTxGasLimitV50
+	l2FaucetTxOpts.GasLimit = uint64(1e8)
 	l2FaucetAddress := builder.L2Info.GetAddress("Faucet")
 	colors.PrintBlue("L2 Faucet   ", l2FaucetAddress)
 	var addressesToCreate []common.Address

system_tests/storage_trie_test.go

@@ -11,9 +11,7 @@ import (
 	"time"
 
 	"github.com/ethereum/go-ethereum/core/rawdb"
-	"github.com/ethereum/go-ethereum/core/types"
 
-	pgen "github.com/offchainlabs/nitro/solgen/go/precompilesgen"
 	"github.com/offchainlabs/nitro/util/arbmath"
 	"github.com/offchainlabs/nitro/validator/valnode"
 )
@@ -24,7 +22,6 @@ func TestStorageTrie(t *testing.T) {
 
 	var withL1 = true
 	builder := NewNodeBuilder(ctx).DefaultConfig(t, withL1)
-	builder.takeOwnership = true
 
 	// This test tests validates blocks at the end.
 	// For now, validation only works with HashScheme set.
@@ -44,13 +41,6 @@ func TestStorageTrie(t *testing.T) {
 	defer cleanup()
 
 	ownerTxOpts := builder.L2Info.GetDefaultTransactOpts("Owner", ctx)
-	arbOwner, err := pgen.NewArbOwner(types.ArbOwnerAddress, builder.L2.Client)
-	Require(t, err)
-	tx, err := arbOwner.SetMaxTxGasLimit(&ownerTxOpts, 33000000)
-	Require(t, err)
-	_, err = EnsureTxSucceeded(ctx, builder.L2.Client, tx)
-	Require(t, err)
-
 	_, bigMap := builder.L2.DeployBigMap(t, ownerTxOpts)
 
 	// Store enough values to use just over 32M gas
@@ -59,8 +49,7 @@ func TestStorageTrie(t *testing.T) {
 	toClear := big.NewInt(0)
 
 	userTxOpts := builder.L2Info.GetDefaultTransactOpts("Faucet", ctx)
-	userTxOpts.GasMargin = 0
-	tx, err = bigMap.ClearAndAddValues(&userTxOpts, toClear, toAdd)
+	tx, err := bigMap.ClearAndAddValues(&userTxOpts, toClear, toAdd)
 	Require(t, err)
 
 	receipt, err := builder.L2.EnsureTxSucceeded(tx)

system_tests/test_info.go

@@ -227,15 +227,6 @@ func (b *BlockchainTestInfo) PrepareTx(from, to string, gas uint64, value *big.I
 
 func (b *BlockchainTestInfo) PrepareTxTo(
 	from string, to *common.Address, gas uint64, value *big.Int, data []byte,
-) *types.Transaction {
-	// After arbos_50 l2 txs consuming more than 32,000,000 in compute gas are rejected, this makes
-	// sure our current tests pass and we shouldnt reach compute gas consumption of 32,000,000 anyway
-	gas = min(gas, l2pricing.InitialPerTxGasLimitV50)
-	return b.PrepareTxToCustomGas(from, to, gas, value, data)
-}
-
-func (b *BlockchainTestInfo) PrepareTxToCustomGas(
-	from string, to *common.Address, gas uint64, value *big.Int, data []byte,
 ) *types.Transaction {
 	b.T.Helper()
 	info := b.GetInfoWithPrivKey(from)

system_tests/timeboost_test.go

@@ -41,7 +41,6 @@ import (
 	"github.com/offchainlabs/nitro/pubsub"
 	"github.com/offchainlabs/nitro/solgen/go/express_lane_auctiongen"
 	"github.com/offchainlabs/nitro/solgen/go/localgen"
-	pgen "github.com/offchainlabs/nitro/solgen/go/precompilesgen"
 	"github.com/offchainlabs/nitro/timeboost"
 	"github.com/offchainlabs/nitro/timeboost/bindings"
 	"github.com/offchainlabs/nitro/util/arbmath"
@@ -64,16 +63,6 @@ func TestTimeboostTxsTimeoutByBlock(t *testing.T) {
 	seqClient, seqInfo := builderSeq.L2.Client, builderSeq.L2Info
 	defer cleanupSeq()
 	seqInfo.GenerateAccount("User2")
-	builderSeq.L2.TransferBalance(t, "Owner", "User2", big.NewInt(1e18), seqInfo)
-
-	user2Opts := seqInfo.GetDefaultTransactOpts("User2", ctx)
-	becomeChainOwner(t, ctx, user2Opts, seqClient)
-	arbOwner, err := pgen.NewArbOwner(types.ArbOwnerAddress, seqClient)
-	Require(t, err)
-	tx, err := arbOwner.SetMaxTxGasLimit(&user2Opts, 700000000)
-	Require(t, err)
-	_, err = EnsureTxSucceeded(ctx, seqClient, tx)
-	Require(t, err)
 
 	auctionContract, err := express_lane_auctiongen.NewExpressLaneAuction(auctionContractAddr, seqClient)
 	Require(t, err)
@@ -108,8 +97,7 @@ func TestTimeboostTxsTimeoutByBlock(t *testing.T) {
 
 	var txs types.Transactions
 	for i := uint64(0); i < numTxs; i++ {
-		user2 := seqInfo.GetAddress("User2")
-		txs = append(txs, seqInfo.PrepareTxToCustomGas("Owner", &user2, 700000000, big.NewInt(1e8), data)) // this tx should consume one block
+		txs = append(txs, seqInfo.PrepareTx("Owner", "User2", 700000000, big.NewInt(1e8), data)) // this tx should consume one block
 	}
 	// Buffer future sequence numbered txs
 	for seq := uint64(1); seq < numTxs; seq++ {