wip

Signed-off-by: Nikolay Nedkov <[email protected]>

config/config_test.go

@@ -63,7 +63,7 @@ func Test_Defaults(t *testing.T) {
 		},
 		{
 			path:          "Sequencer.MaxBatchBytesSize",
-			expectedValue: uint64(150000),
+			expectedValue: uint64(112640),
 		},
 		{
 			path:          "Sequencer.BlocksAmountForTxsToBeDeleted",
@@ -245,6 +245,10 @@ func Test_Defaults(t *testing.T) {
 			path:          "Pool.FreeClaimGasLimit",
 			expectedValue: uint64(150000),
 		},
+		{
+			path:          "Pool.MaxTxBytesSize",
+			expectedValue: uint64(102400),
+		},
 		{
 			path:          "Pool.DB.User",
 			expectedValue: "pool_user",

config/default.go

@@ -20,6 +20,7 @@ MaxConns = 200
 
 [Pool]
 FreeClaimGasLimit = 150000
+MaxTxBytesSize=102400
 	[Pool.DB]
 	User = "pool_user"
 	Password = "pool_password"
@@ -69,7 +70,7 @@ LastBatchVirtualizationTimeMaxWaitPeriod = "5s"
 BlocksAmountForTxsToBeDeleted = 100
 FrequencyToCheckTxsForDelete = "12h"
 MaxTxsPerBatch = 150
-MaxBatchBytesSize = 150000
+MaxBatchBytesSize = 112640
 MaxCumulativeGasUsed = 30000000
 MaxKeccakHashes = 468
 MaxPoseidonHashes = 279620

config/environments/local/local.node.config.toml

@@ -16,6 +16,7 @@ MaxConns = 200
 
 [Pool]
 FreeClaimGasLimit = 1500000
+MaxTxBytesSize=102400
 	[Pool.DB]
 	User = "pool_user"
 	Password = "pool_password"
@@ -60,7 +61,7 @@ LastBatchVirtualizationTimeMaxWaitPeriod = "5s"
 BlocksAmountForTxsToBeDeleted = 100
 FrequencyToCheckTxsForDelete = "12h"
 MaxTxsPerBatch = 150
-MaxBatchBytesSize = 150000
+MaxBatchBytesSize = 112640
 MaxCumulativeGasUsed = 30000000
 MaxKeccakHashes = 468
 MaxPoseidonHashes = 279620

config/environments/public/public.node.config.toml

@@ -14,6 +14,7 @@ MaxConns = 200
 
 [Pool]
 FreeClaimGasLimit = 1500000
+MaxTxBytesSize=102400
 	[Pool.DB]
 	User = "pool_user"
 	Password = "pool_password"

pool/config.go

@@ -6,5 +6,6 @@ import "github.com/0xPolygonHermez/zkevm-node/db"
 type Config struct {
 	// FreeClaimGasLimit is the max gas allowed use to do a free claim
 	FreeClaimGasLimit uint64    `mapstructure:"FreeClaimGasLimit"`
+	MaxTxBytesSize    uint64    `mapstructure:"MaxTxBytesSize"`
 	DB                db.Config `mapstructure:"DB"`
 }

pool/pool.go

@@ -15,18 +15,6 @@ import (
 )
 
 const (
-	// txSlotSize is used to calculate how many data slots a single transaction
-	// takes up based on its size. The slots are used as DoS protection, ensuring
-	// that validating a new transaction remains a constant operation (in reality
-	// O(maxslots), where max slots are 4 currently).
-	txSlotSize = 32 * 1024
-
-	// txMaxSize is the maximum size a single transaction can have. This field has
-	// non-trivial consequences: larger transactions are significantly harder and
-	// more expensive to propagate; larger transactions also take more resources
-	// to validate whether they fit into the pool or not.
-	txMaxSize = 4 * txSlotSize // 128KB
-
 	// bridgeClaimMethodSignature for tracking bridgeClaimMethodSignature method
 	bridgeClaimMethodSignature = "0x2cffd02e"
 )
@@ -180,7 +168,7 @@ func (p *Pool) validateTx(ctx context.Context, tx types.Transaction) error {
 		return ErrTxTypeNotSupported
 	}
 	// Reject transactions over defined size to prevent DOS attacks
-	if uint64(tx.Size()) > txMaxSize {
+	if uint64(tx.Size()) > p.cfg.MaxTxBytesSize {
 		return ErrOversizedData
 	}
 	// Transactions can't be negative. This may never happen using RLP decoded

sequencer/closingsignalsmanager_test.go

@@ -55,7 +55,7 @@ func setupTest(t *testing.T) {
 
 	batchConstraints := batchConstraints{
 		MaxTxsPerBatch:       150,
-		MaxBatchBytesSize:    150000,
+		MaxBatchBytesSize:    112640,
 		MaxCumulativeGasUsed: 30000000,
 		MaxKeccakHashes:      468,
 		MaxPoseidonHashes:    279620,

sequencer/dbmanager_test.go

@@ -78,7 +78,7 @@ func setupDBManager() {
 
 	batchConstraints := batchConstraints{
 		MaxTxsPerBatch:       150,
-		MaxBatchBytesSize:    150000,
+		MaxBatchBytesSize:    112640,
 		MaxCumulativeGasUsed: 30000000,
 		MaxKeccakHashes:      468,
 		MaxPoseidonHashes:    279620,

sequencer/finalizer_test.go

@@ -28,7 +28,7 @@ var (
 	dbTxMock      = new(DbTxMock)
 	bc            = batchConstraints{
 		MaxTxsPerBatch:       150,
-		MaxBatchBytesSize:    150000,
+		MaxBatchBytesSize:    112640,
 		MaxCumulativeGasUsed: 30000000,
 		MaxKeccakHashes:      468,
 		MaxPoseidonHashes:    279620,

sequencer/sequencesender_test.go

@@ -0,0 +1,86 @@
+package sequencer
+
+import (
+	"bytes"
+	"context"
+	"log"
+	"math/big"
+	"os"
+	"testing"
+	"time"
+
+	ethermanTypes "github.com/0xPolygonHermez/zkevm-node/etherman/types"
+	"github.com/0xPolygonHermez/zkevm-node/state"
+	"github.com/0xPolygonHermez/zkevm-node/test/operations"
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/stretchr/testify/require"
+)
+
+var (
+	s *Sequencer
+)
+
+func captureLogOutput(f func()) string {
+	var buf bytes.Buffer
+	log.SetOutput(&buf)
+	f()
+	log.SetOutput(os.Stderr)
+	return buf.String()
+}
+
+// Test_getSequencesToSend_OversizedDataError tests the error when the data is oversized
+func Test_getSequencesToSend_OversizedDataError(t *testing.T) {
+	stateMock := NewStateMock(t)
+	ethermanMock := NewEthermanMock(t)
+	s = &Sequencer{
+		state:    stateMock,
+		etherman: ethermanMock,
+	}
+	ctx := context.Background()
+	toAddress := common.HexToAddress(operations.DefaultSequencerAddress)
+	// data is 250 kilobytes
+	data := make([]byte, txMaxSize+1)
+	tx := types.NewTransaction(1, toAddress, big.NewInt(1), 21000, big.NewInt(30), data)
+	batchL2Data, err := state.EncodeTransaction(*tx)
+	batch := &state.Batch{
+		BatchNumber:    1,
+		BatchL2Data:    batchL2Data,
+		Timestamp:      time.Now(),
+		Transactions:   []types.Transaction{*tx},
+		GlobalExitRoot: common.HexToHash("0x1"),
+	}
+	sequences := []ethermanTypes.Sequence{
+		{
+			GlobalExitRoot: batch.GlobalExitRoot,
+			Timestamp:      batch.Timestamp.Unix(),
+			BatchL2Data:    batch.BatchL2Data,
+			BatchNumber:    batch.BatchNumber,
+		},
+	}
+	stateMock.On("GetLastVirtualBatchNum", ctx, nil).Return(uint64(0), nil)
+	stateMock.On("IsBatchClosed", ctx, uint64(1), nil).Return(true, nil).Once()
+	stateMock.On("GetBatchByNumber", ctx, uint64(1), nil).Return(batch, nil)
+	ethermanMock.On("EstimateGasSequenceBatches", common.HexToAddress("0x0000000000000000000000000000000000000000"), sequences).Return(tx, nil)
+	stateMock.On("IsBatchClosed", ctx, uint64(2), nil).Return(false, nil).Once()
+	stateMock.On("GetTimeForLatestBatchVirtualization", ctx, nil).Return(batch.Timestamp, nil)
+	defer func() {
+		if r := recover(); r == nil {
+			t.Error("The code did not panic")
+		}
+	}()
+
+	var (
+		seq []ethermanTypes.Sequence
+	)
+	logOutput := captureLogOutput(func() {
+		seq, err = s.getSequencesToSend(ctx)
+	})
+	require.Empty(t, seq)
+	require.Error(t, err)
+	if logOutput == "" {
+		t.Error("Expected fatal error did not occur")
+	} else if !bytes.Contains([]byte(logOutput), []byte("Expected fatal error occurred")) {
+		t.Error("Expected fatal error did not contain the correct message")
+	}
+}

sequencer/txtracker.go

@@ -48,7 +48,7 @@ func newTxTracker(tx types.Transaction, isClaim bool, counters state.ZKCounters,
 
 	txTracker.IsClaim = isClaim
 	txTracker.BatchResources.zKCounters = counters
-	txTracker.BatchResources.bytes = uint64(tx.Size())
+	txTracker.BatchResources.bytes = tx.Size()
 	txTracker.HashStr = txTracker.Hash.String()
 	txTracker.FromStr = txTracker.From.String()
 	txTracker.Benefit = new(big.Int).Mul(new(big.Int).SetUint64(txTracker.Gas), txTracker.GasPrice)

test/Makefile

@@ -445,6 +445,7 @@ generate-mocks: ## Generates mocks for the tests, using mockery tool
 	mockery --name=dbManagerInterface --dir=../sequencer --output=../sequencer --outpkg=sequencer --inpackage  --structname=DbManagerMock --filename=mock_db_manager.go
 	mockery --name=etherman --dir=../sequencer --output=../sequencer --outpkg=sequencer --inpackage --structname=EthermanMock --filename=mock_etherman.go
 	mockery --name=stateInterface --dir=../sequencer/broadcast --output=../sequencer/broadcast/mocks --outpkg=mocks --structname=StateMock --filename=mock_state.go
+	mockery --name=etherman --dir=../sequencer --output=../sequencer --outpkg=sequencer --structname=EthermanMock --filename=mock_etherman.go
 
 	mockery --name=ethermanInterface --dir=../synchronizer --output=../synchronizer --outpkg=synchronizer --structname=ethermanMock --filename=mock_etherman.go
 	mockery --name=stateInterface --dir=../synchronizer --output=../synchronizer --outpkg=synchronizer --structname=stateMock --filename=mock_state.go

test/config/debug.node.config.toml

@@ -16,6 +16,7 @@ MaxConns = 10
 
 [Pool]
 FreeClaimGasLimit = 1500000
+MaxTxBytesSize=102400
 	[Pool.DB]
 	User = "pool_user"
 	Password = "pool_password"
@@ -60,7 +61,7 @@ LastBatchVirtualizationTimeMaxWaitPeriod = "5s"
 BlocksAmountForTxsToBeDeleted = 100
 FrequencyToCheckTxsForDelete = "12h"
 MaxTxsPerBatch = 150
-MaxBatchBytesSize = 150000
+MaxBatchBytesSize = 112640
 MaxCumulativeGasUsed = 30000000
 MaxKeccakHashes = 468
 MaxPoseidonHashes = 279620

test/config/test.node.config.toml

@@ -16,6 +16,7 @@ MaxConns = 200
 
 [Pool]
 FreeClaimGasLimit = 1500000
+MaxTxBytesSize=102400
 	[Pool.DB]
 	User = "pool_user"
 	Password = "pool_password"
@@ -60,7 +61,7 @@ LastBatchVirtualizationTimeMaxWaitPeriod = "10s"
 BlocksAmountForTxsToBeDeleted = 100
 FrequencyToCheckTxsForDelete = "12h"
 MaxTxsPerBatch = 150
-MaxBatchBytesSize = 150000
+MaxBatchBytesSize = 112640
 MaxCumulativeGasUsed = 30000000
 MaxKeccakHashes = 468
 MaxPoseidonHashes = 279620