Fix L2 block gas limit to 2**50 (1125899906842624) (0xPolygonHermez#3219

) * set l2 block gas limit to 2**50 (1125899906842624) * limit L2 block gasLimit in StoreL2Block function
superksx · Feb 6, 2024 · d85d135 · d85d135
1 parent 78ba11d
commit d85d135
Show file tree

Hide file tree

Showing 13 changed files with 25 additions and 16 deletions.
diff --git a/config/config_test.go b/config/config_test.go
@@ -487,7 +487,7 @@ func Test_Defaults(t *testing.T) {
 		},
 		{
 			path:          "State.Batch.Constraints.MaxCumulativeGasUsed",
-			expectedValue: uint64(9223372036854775807),
+			expectedValue: uint64(1125899906842624),
 		},
 		{
 			path:          "State.Batch.Constraints.MaxKeccakHashes",

diff --git a/config/default.go b/config/default.go
@@ -24,7 +24,7 @@ Outputs = ["stderr"]
 		[State.Batch.Constraints]
 		MaxTxsPerBatch = 300
 		MaxBatchBytesSize = 120000
-		MaxCumulativeGasUsed = 9223372036854775807
+		MaxCumulativeGasUsed = 1125899906842624
 		MaxKeccakHashes = 2145
 		MaxPoseidonHashes = 252357
 		MaxPoseidonPaddings = 135191

diff --git a/config/environments/cardona/node.config.toml b/config/environments/cardona/node.config.toml
@@ -16,7 +16,7 @@ Outputs = ["stderr"]
 		[State.Batch.Constraints]
 		MaxTxsPerBatch = 300
 		MaxBatchBytesSize = 120000
-		MaxCumulativeGasUsed = 9223372036854775807
+		MaxCumulativeGasUsed = 1125899906842624
 		MaxKeccakHashes = 2145
 		MaxPoseidonHashes = 252357
 		MaxPoseidonPaddings = 135191

diff --git a/config/environments/local/local.node.config.toml b/config/environments/local/local.node.config.toml
@@ -19,7 +19,7 @@ Outputs = ["stderr"]
 		[State.Batch.Constraints]
 		MaxTxsPerBatch = 300
 		MaxBatchBytesSize = 120000
-		MaxCumulativeGasUsed = 9223372036854775807
+		MaxCumulativeGasUsed = 1125899906842624
 		MaxKeccakHashes = 2145
 		MaxPoseidonHashes = 252357
 		MaxPoseidonPaddings = 135191

diff --git a/config/environments/mainnet/node.config.toml b/config/environments/mainnet/node.config.toml
@@ -16,7 +16,7 @@ Outputs = ["stderr"]
 		[State.Batch.Constraints]
 		MaxTxsPerBatch = 300
 		MaxBatchBytesSize = 120000
-		MaxCumulativeGasUsed = 9223372036854775807
+		MaxCumulativeGasUsed = 1125899906842624
 		MaxKeccakHashes = 2145
 		MaxPoseidonHashes = 252357
 		MaxPoseidonPaddings = 135191

diff --git a/config/environments/testnet/node.config.toml b/config/environments/testnet/node.config.toml
@@ -16,7 +16,7 @@ Outputs = ["stderr"]
 		[State.Batch.Constraints]
 		MaxTxsPerBatch = 300
 		MaxBatchBytesSize = 120000
-		MaxCumulativeGasUsed = 9223372036854775807
+		MaxCumulativeGasUsed = 1125899906842624
 		MaxKeccakHashes = 2145
 		MaxPoseidonHashes = 252357
 		MaxPoseidonPaddings = 135191

diff --git a/docs/config-file/node-config-doc.html b/docs/config-file/node-config-doc.html
diff --git a/docs/config-file/node-config-doc.md b/docs/config-file/node-config-doc.md
@@ -3736,12 +3736,12 @@ MaxBatchBytesSize=120000
 
 **Type:** : `integer`
 
-**Default:** `9223372036854775807`
+**Default:** `1125899906842624`
 
-**Example setting the default value** (9223372036854775807):
+**Example setting the default value** (1125899906842624):
 ```
 [State.Batch.Constraints]
-MaxCumulativeGasUsed=9223372036854775807
+MaxCumulativeGasUsed=1125899906842624
 ```
 
 ##### <a name="State_Batch_Constraints_MaxKeccakHashes"></a>20.9.1.4. `State.Batch.Constraints.MaxKeccakHashes`

diff --git a/docs/config-file/node-config-schema.json b/docs/config-file/node-config-schema.json
@@ -1484,7 +1484,7 @@
 								},
 								"MaxCumulativeGasUsed": {
 									"type": "integer",
-									"default": 9223372036854775807
+									"default": 1125899906842624
 								},
 								"MaxKeccakHashes": {
 									"type": "integer",

diff --git a/state/convertersV2.go b/state/convertersV2.go
@@ -19,6 +19,11 @@ import (
 	"github.com/ethereum/go-ethereum/core/types"
 )
 
+const (
+	// MaxL2BlockGasLimit is the gas limit allowed per L2 block in a batch
+	MaxL2BlockGasLimit = uint64(1125899906842624)
+)
+
 var (
 	errL2BlockInvalid = errors.New("A L2 block fails, that invalidate totally the batch")
 )

diff --git a/state/transaction.go b/state/transaction.go
@@ -209,13 +209,18 @@ func (s *State) StoreL2Block(ctx context.Context, batchNumber uint64, l2Block *P
 		return err
 	}
 
+	gasLimit := l2Block.GasLimit
+	if gasLimit > MaxL2BlockGasLimit {
+		gasLimit = MaxL2BlockGasLimit
+	}
+
 	header := &types.Header{
 		Number:     new(big.Int).SetUint64(l2Block.BlockNumber),
 		ParentHash: prevL2BlockHash,
 		Coinbase:   l2Block.Coinbase,
 		Root:       l2Block.BlockHash, //BlockHash returned by the executor is the StateRoot in Etrog
 		GasUsed:    l2Block.GasUsed,
-		GasLimit:   l2Block.GasLimit,
+		GasLimit:   gasLimit,
 		Time:       l2Block.Timestamp,
 	}
 
@@ -630,7 +635,7 @@ func (s *State) StoreTransaction(ctx context.Context, batchNumber uint64, proces
 		Coinbase:   coinbase,
 		Root:       processedTx.StateRoot,
 		GasUsed:    processedTx.GasUsed,
-		GasLimit:   s.cfg.MaxCumulativeGasUsed,
+		GasLimit:   MaxTxGasLimit,
 		Time:       timestamp,
 	})
 	header.GlobalExitRoot = globalExitRoot

diff --git a/test/benchmarks/sequencer/common/setup/setup.go b/test/benchmarks/sequencer/common/setup/setup.go
@@ -3,7 +3,6 @@ package setup
 import (
 	"context"
 	"fmt"
-	"math"
 	"math/big"
 	"testing"
 	"time"
@@ -32,7 +31,7 @@ var (
 	bc = state.BatchConstraintsCfg{
 		MaxTxsPerBatch:       300,
 		MaxBatchBytesSize:    120000,
-		MaxCumulativeGasUsed: uint64(math.MaxInt64),
+		MaxCumulativeGasUsed: uint64(1125899906842624),
 		MaxKeccakHashes:      2145,
 		MaxPoseidonHashes:    252357,
 		MaxPoseidonPaddings:  135191,

diff --git a/test/config/test.node.config.toml b/test/config/test.node.config.toml
@@ -18,7 +18,7 @@ Outputs = ["stderr"]
 		[State.Batch.Constraints]
 		MaxTxsPerBatch = 300
 		MaxBatchBytesSize = 120000
-		MaxCumulativeGasUsed = 9223372036854775807
+		MaxCumulativeGasUsed = 1125899906842624
 		MaxKeccakHashes = 2145
 		MaxPoseidonHashes = 252357
 		MaxPoseidonPaddings = 135191