feat(all): remove gas limit check

.github/workflows/test.yml

@@ -45,7 +45,7 @@ jobs:
         with:
           repository: taikoxyz/taiko-mono
           path: ${{ env.TAIKO_MONO_DIR }}
-          ref: alpha-4
+          ref: remove_gas_limit_check
 
       - name: Install Foundry
         uses: foundry-rs/foundry-toolchain@v1

bindings/.githead

@@ -1 +1 @@
-013912fc7b74e9212dcbd374f47cf6b3e22252d6
+e6eabc9c3b36d8dffdc5f98e7b7c8a9b80064a6e

bindings/encoding/input.go

@@ -25,10 +25,6 @@ var (
 			Name: "beneficiary",
 			Type: "address",
 		},
-		{
-			Name: "gasLimit",
-			Type: "uint32",
-		},
 		{
 			Name: "txListByteStart",
 			Type: "uint24",
@@ -75,10 +71,6 @@ var (
 			Name: "txListByteEnd",
 			Type: "uint24",
 		},
-		{
-			Name: "gasLimit",
-			Type: "uint32",
-		},
 		{
 			Name: "beneficiary",
 			Type: "address",

bindings/encoding/struct.go

@@ -47,7 +47,6 @@ type TaikoL1Evidence struct {
 type TaikoL1BlockMetadataInput struct {
 	TxListHash      [32]byte
 	Beneficiary     common.Address
-	GasLimit        uint32
 	TxListByteStart *big.Int
 	TxListByteEnd   *big.Int
 	CacheTxListInfo uint8

bindings/encoding/struct_test.go

@@ -34,7 +34,6 @@ var (
 	}
 	testMetaInput = TaikoL1BlockMetadataInput{
 		Beneficiary:     common.BytesToAddress(randomHash().Bytes()),
-		GasLimit:        rand.Uint32(),
 		TxListHash:      randomHash(),
 		TxListByteStart: common.Big0,
 		TxListByteEnd:   common.Big0,
@@ -49,7 +48,6 @@ var (
 		TxListHash:        randomHash(),
 		TxListByteStart:   common.Big0,
 		TxListByteEnd:     common.Big256,
-		GasLimit:          rand.Uint32(),
 		Beneficiary:       common.BytesToAddress(randomHash().Bytes()),
 		Treasury:          common.BytesToAddress(randomHash().Bytes()),
 		DepositsProcessed: []bindings.TaikoDataEthDeposit{},

cmd/flags/proposer.go

@@ -51,11 +51,6 @@ var (
 		Usage:    "Time interval to propose empty blocks",
 		Category: proposerCategory,
 	}
-	MinBlockGasLimit = &cli.Uint64Flag{
-		Name:     "minimalBlockGasLimit",
-		Usage:    "Minimal block gasLimit when proposing a block",
-		Category: proposerCategory,
-	}
 	MaxProposedTxListsPerEpoch = &cli.Uint64Flag{
 		Name:     "maxProposedTxListsPerEpoch",
 		Value:    1,
@@ -84,7 +79,6 @@ var ProposerFlags = MergeFlags(CommonFlags, []cli.Flag{
 	TxPoolLocals,
 	TxPoolLocalsOnly,
 	ProposeEmptyBlocksInterval,
-	MinBlockGasLimit,
 	MaxProposedTxListsPerEpoch,
 	ProposeBlockTxGasLimit,
 	ProposeBlockTxReplacementMultiplier,

driver/chain_syncer/calldata/syncer.go

@@ -35,8 +35,9 @@ type Syncer struct {
 	anchorConstructor *anchorTxConstructor.AnchorTxConstructor // TaikoL2.anchor transactions constructor
 	txListValidator   *txListValidator.TxListValidator         // Transactions list validator
 	// Used by BlockInserter
-	lastInsertedBlockID *big.Int
-	reorgDetectedFlag   bool
+	lastInsertedBlockID  *big.Int
+	blockAndTxMaxGasUsed uint32
+	reorgDetectedFlag    bool
 }
 
 // NewSyncer creates a new syncer instance.
@@ -64,11 +65,11 @@ func NewSyncer(
 		progressTracker:   progressTracker,
 		anchorConstructor: constructor,
 		txListValidator: txListValidator.NewTxListValidator(
-			uint64(configs.BlockMaxGasLimit),
 			configs.BlockMaxTransactions,
 			configs.BlockMaxTxListBytes,
 			rpc.L2ChainID,
 		),
+		blockAndTxMaxGasUsed: configs.BlockAndTxMaxGasUsed,
 	}, nil
 }
 
@@ -334,18 +335,17 @@ func (s *Syncer) insertNewHead(
 	baseFee, err := s.rpc.TaikoL2.GetBasefee(
 		&bind.CallOpts{BlockNumber: parent.Number, Context: ctx},
 		uint32(event.Meta.Timestamp-parentTimestamp),
-		event.Meta.GasLimit+uint32(s.anchorConstructor.GasLimit()),
+		s.blockAndTxMaxGasUsed+uint32(s.anchorConstructor.GasLimit()), // TODO: use a correct gas limit
 		uint32(parent.GasUsed),
 	)
 	if err != nil {
 		return nil, fmt.Errorf("failed to get L2 baseFee: %w", encoding.TryParsingCustomError(err))
 	}
 
 	log.Debug(
-		"GetBasefee",
+		"Get base fee",
 		"baseFee", baseFee,
 		"timeSinceParent", uint32(event.Meta.Timestamp-parentTimestamp),
-		"gasLimit", uint64(event.Meta.GasLimit+uint32(s.anchorConstructor.GasLimit())),
 		"parentGasUsed", parent.GasUsed,
 	)
 
@@ -426,11 +426,12 @@ func (s *Syncer) createExecutionPayloads(
 		BlockMetadata: &engine.BlockMetadata{
 			HighestBlockID: headBlockID,
 			Beneficiary:    event.Meta.Beneficiary,
-			GasLimit:       uint64(event.Meta.GasLimit) + s.anchorConstructor.GasLimit(),
+			GasLimit:       uint64(s.blockAndTxMaxGasUsed) + s.anchorConstructor.GasLimit(), // TODO: use a correct gas limit
 			Timestamp:      event.Meta.Timestamp,
 			TxList:         txListBytes,
 			MixHash:        event.Meta.MixHash,
 			ExtraData:      []byte{},
+			GasUsedLimit:   uint64(s.blockAndTxMaxGasUsed),
 		},
 		BaseFeePerGas: baseFeee,
 		L1Origin:      l1Origin,

driver/chain_syncer/calldata/syncer_test.go

@@ -3,7 +3,6 @@ package calldata
 import (
 	"context"
 	"math/big"
-	"math/rand"
 	"os"
 	"testing"
 	"time"
@@ -94,7 +93,6 @@ func (s *CalldataSyncerTestSuite) TestInsertNewHead() {
 				Beneficiary: common.BytesToAddress(testutils.RandomBytes(1024)),
 				TxListHash:  testutils.RandomHash(),
 				MixHash:     testutils.RandomHash(),
-				GasLimit:    rand.Uint32(),
 				Timestamp:   uint64(time.Now().Unix()),
 			},
 		},

go.mod

@@ -81,4 +81,4 @@ require (
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
 
-replace github.com/ethereum/go-ethereum v1.11.5 => github.com/taikoxyz/taiko-geth v0.0.0-20230528194240-f4b7892dc112
+replace github.com/ethereum/go-ethereum v1.11.5 => github.com/taikoxyz/taiko-geth v0.0.0-20230728124813-48bb5d8a8c5f

go.sum

@@ -319,8 +319,8 @@ github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKs
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d h1:vfofYNRScrDdvS342BElfbETmL1Aiz3i2t0zfRj16Hs=
 github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d/go.mod h1:RRCYJbIwD5jmqPI9XoAFR0OcDxqUctll6zUj/+B4S48=
-github.com/taikoxyz/taiko-geth v0.0.0-20230528194240-f4b7892dc112 h1:3A4zdowD7VW+27Wa78jC5n57sTBndkdjhEvROYrddxQ=
-github.com/taikoxyz/taiko-geth v0.0.0-20230528194240-f4b7892dc112/go.mod h1:it7x0DWnTDMfVFdXcU6Ti4KEFQynLHVRarcSlPr0HBo=
+github.com/taikoxyz/taiko-geth v0.0.0-20230728124813-48bb5d8a8c5f h1:cVyewmAdTvKV5hw+WL+N/KW2INPo2UEB0TaeVZsiiE8=
+github.com/taikoxyz/taiko-geth v0.0.0-20230728124813-48bb5d8a8c5f/go.mod h1:it7x0DWnTDMfVFdXcU6Ti4KEFQynLHVRarcSlPr0HBo=
 github.com/thomaso-mirodin/intmath v0.0.0-20160323211736-5dc6d854e46e h1:cR8/SYRgyQCt5cNCMniB/ZScMkhI9nk8U5C7SbISXjo=
 github.com/thomaso-mirodin/intmath v0.0.0-20160323211736-5dc6d854e46e/go.mod h1:Tu4lItkATkonrYuvtVjG0/rhy15qrNGNTjPdaphtZ/8=
 github.com/tklauser/go-sysconf v0.3.11 h1:89WgdJhk5SNwJfu+GKyYveZ4IaJ7xAkecBo+KdJV0CM=

integration_test/nodes/docker-compose.yml

@@ -14,7 +14,7 @@ services:
       - "0.0.0.0"
 
   l2_execution_engine:
-    image: gcr.io/evmchain/taiko-geth:taiko
+    image: gcr.io/evmchain/taiko-geth:txList-with-gasUsed
     restart: unless-stopped
     pull_policy: always
     volumes:

pkg/rpc/methods.go

@@ -28,7 +28,6 @@ var (
 	syncProgressRecheckDelay    = 12 * time.Second
 	waitL1OriginPollingInterval = 3 * time.Second
 	defaultWaitL1OriginTimeout  = 3 * time.Minute
-	minTxGasLimit               = 21000
 )
 
 // ensureGenesisMatched fetches the L2 genesis block from TaikoL1 contract,
@@ -212,8 +211,10 @@ func (c *Client) WaitL1Origin(ctx context.Context, blockID *big.Int) (*rawdb.L1O
 // upper limit.
 func (c *Client) GetPoolContent(
 	ctx context.Context,
+	beneficiary common.Address,
+	baseFee uint64,
 	maxTransactionsPerBlock uint64,
-	blockMaxGasLimit uint32,
+	blockAndTxMaxGasUsed uint64,
 	maxBytesPerTxList uint64,
 	locals []common.Address,
 	maxTransactions uint64,
@@ -228,10 +229,11 @@ func (c *Client) GetPoolContent(
 		ctx,
 		&result,
 		"taiko_txPoolContent",
+		beneficiary.Hex(),
+		baseFee,
 		maxTransactionsPerBlock,
-		blockMaxGasLimit,
+		blockAndTxMaxGasUsed,
 		maxBytesPerTxList,
-		minTxGasLimit,
 		localsArg,
 		maxTransactions,
 	)

pkg/tx_list_validator/tx_list_validator.go

@@ -19,21 +19,18 @@ const (
 )
 
 type TxListValidator struct {
-	blockMaxGasLimit        uint64
-	maxTransactionsPerBlock uint64
-	maxBytesPerTxList       uint64
+	maxTransactionsPerBlock uint32
+	maxBytesPerTxList       uint32
 	chainID                 *big.Int
 }
 
 // NewTxListValidator creates a new TxListValidator instance based on giving configurations.
 func NewTxListValidator(
-	blockMaxGasLimit uint64,
-	maxTransactionsPerBlock uint64,
-	maxBytesPerTxList uint64,
+	maxTransactionsPerBlock uint32,
+	maxBytesPerTxList uint32,
 	chainID *big.Int,
 ) *TxListValidator {
 	return &TxListValidator{
-		blockMaxGasLimit:        blockMaxGasLimit,
 		maxTransactionsPerBlock: maxTransactionsPerBlock,
 		maxBytesPerTxList:       maxBytesPerTxList,
 		chainID:                 chainID,
@@ -81,16 +78,6 @@ func (v *TxListValidator) isTxListValid(blockID *big.Int, txListBytes []byte) (h
 		return HintNone, 0
 	}
 
-	sumGasLimit := uint64(0)
-	for _, tx := range txs {
-		sumGasLimit += tx.Gas()
-	}
-
-	if sumGasLimit > v.blockMaxGasLimit {
-		log.Info("Accumulate gas limit too large", "blockID", blockID, "sumGasLimit", sumGasLimit)
-		return HintNone, 0
-	}
-
 	log.Info("Transaction list is valid", "blockID", blockID)
 	return HintOK, 0
 }

pkg/tx_list_validator/tx_list_validator_test.go

@@ -15,9 +15,9 @@
 )
 
 var (
-	maxBlocksGasLimit = uint64(50)
-	maxBlockNumTxs    = uint64(11)
-	maxTxlistBytes    = uint64(10000)
+	maxBlocksGasLimit = uint32(50)
+	maxBlockNumTxs    = uint32(11)
+	maxTxlistBytes    = uint32(10000)
 	chainID           = genesis.Config.ChainID
 	testKey, _        = crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291")
 	testAddr          = crypto.PubkeyToAddress(testKey.PublicKey)
@@ -32,7 +32,6 @@
 
 func TestValidateTxList(t *testing.T) {
 	v := NewTxListValidator(
-		maxBlocksGasLimit,
 		maxBlockNumTxs,
 		maxTxlistBytes,
 		chainID,
@@ -46,7 +45,6 @@
 
 func TestIsTxListValid(t *testing.T) {
 	v := NewTxListValidator(
-		maxBlocksGasLimit,
 		maxBlockNumTxs,
 		maxTxlistBytes,
 		chainID,
@@ -137,7 +135,7 @@
 	return b
 }
 
-func randBytes(l uint64) []byte {
+func randBytes(l uint32) []byte {
 	b := make([]byte, l)
 	rand.Read(b)
 	return b

proposer/config.go

@@ -25,7 +25,6 @@ type Config struct {
 	LocalAddresses                      []common.Address
 	LocalAddressesOnly                  bool
 	ProposeEmptyBlocksInterval          *time.Duration
-	MinBlockGasLimit                    uint64
 	MaxProposedTxListsPerEpoch          uint64
 	ProposeBlockTxGasLimit              *uint64
 	BackOffRetryInterval                time.Duration
@@ -102,7 +101,6 @@ func NewConfigFromCliContext(c *cli.Context) (*Config, error) {
 		LocalAddresses:                      localAddresses,
 		LocalAddressesOnly:                  c.Bool(flags.TxPoolLocalsOnly.Name),
 		ProposeEmptyBlocksInterval:          proposeEmptyBlocksInterval,
-		MinBlockGasLimit:                    c.Uint64(flags.MinBlockGasLimit.Name),
 		MaxProposedTxListsPerEpoch:          c.Uint64(flags.MaxProposedTxListsPerEpoch.Name),
 		ProposeBlockTxGasLimit:              proposeBlockTxGasLimit,
 		BackOffRetryInterval:                time.Duration(c.Uint64(flags.BackOffRetryInterval.Name)) * time.Second,