[R4R]-{develop}:Optimize the rollup service

batch-submitter/batch_submitter.go

@@ -7,8 +7,6 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/log"
-	"github.com/getsentry/sentry-go"
-	"github.com/urfave/cli"
 
 	"github.com/mantlenetworkio/mantle/batch-submitter/drivers/proposer"
 	"github.com/mantlenetworkio/mantle/batch-submitter/drivers/sequencer"
@@ -17,6 +15,9 @@ import (
 	"github.com/mantlenetworkio/mantle/bss-core/dial"
 	"github.com/mantlenetworkio/mantle/bss-core/metrics"
 	"github.com/mantlenetworkio/mantle/bss-core/txmgr"
+
+	"github.com/getsentry/sentry-go"
+	"github.com/urfave/cli"
 )
 
 // Main is the entrypoint into the batch submitter service. This method returns
@@ -30,10 +31,6 @@ func Main(gitVersion string) func(ctx *cli.Context) error {
 			return err
 		}
 
-		log.Info("Config parsed",
-			"min_tx_size", cfg.MinL1TxSize,
-			"max_tx_size", cfg.MaxL1TxSize)
-
 		// The call to defer is done here so that any errors logged from
 		// this point on are posted to Sentry before exiting.
 		if cfg.SentryEnable {
@@ -130,23 +127,22 @@ func Main(gitVersion string) func(ctx *cli.Context) error {
 		var services []*bsscore.Service
 		if cfg.RunTxBatchSubmitter {
 			batchTxDriver, err := sequencer.NewDriver(sequencer.Config{
-				Name:                  "Sequencer",
-				L1Client:              l1Client,
-				L2Client:              l2Client,
-				BlockOffset:           cfg.BlockOffset,
-				MinTxSize:             cfg.MinL1TxSize,
-				MaxTxSize:             cfg.MaxL1TxSize,
-				MaxPlaintextBatchSize: cfg.MaxPlaintextBatchSize,
-				DaUpgradeBlock:        cfg.DaUpgradeBlock,
-				DAAddr:                common.Address(common.HexToAddress(cfg.DAAddress)),
-				CTCAddr:               ctcAddress,
-				ChainID:               chainID,
-				PrivKey:               sequencerPrivKey,
-				EnableSequencerHsm:    cfg.EnableSequencerHsm,
-				SequencerHsmAddress:   cfg.SequencerHsmAddress,
-				SequencerHsmAPIName:   cfg.SequencerHsmAPIName,
-				SequencerHsmCreden:    cfg.SequencerHsmCreden,
-				BatchType:             sequencer.BatchTypeFromString(cfg.SequencerBatchType),
+				Name:                "Sequencer",
+				L1Client:            l1Client,
+				L2Client:            l2Client,
+				BlockOffset:         cfg.BlockOffset,
+				DaUpgradeBlock:      cfg.DaUpgradeBlock,
+				DAAddr:              common.Address(common.HexToAddress(cfg.DAAddress)),
+				CTCAddr:             ctcAddress,
+				ChainID:             chainID,
+				PrivKey:             sequencerPrivKey,
+				EnableSequencerHsm:  cfg.EnableSequencerHsm,
+				SequencerHsmAddress: cfg.SequencerHsmAddress,
+				SequencerHsmAPIName: cfg.SequencerHsmAPIName,
+				SequencerHsmCreden:  cfg.SequencerHsmCreden,
+				BatchType:           sequencer.BatchTypeFromString(cfg.SequencerBatchType),
+				MaxRollupTxn:        cfg.MaxRollupTxn,
+				MinRollupTxn:        cfg.MinRollupTxn,
 			})
 			if err != nil {
 				return err
@@ -164,27 +160,28 @@ func Main(gitVersion string) func(ctx *cli.Context) error {
 
 		if cfg.RunStateBatchSubmitter {
 			batchStateDriver, err := proposer.NewDriver(proposer.Config{
-				Name:                   "Proposer",
-				L1Client:               l1Client,
-				L2Client:               l2Client,
-				TssClient:              tssClient,
-				BlockOffset:            cfg.BlockOffset,
-				MinStateRootElements:   cfg.MinStateRootElements,
-				MaxStateRootElements:   cfg.MaxStateRootElements,
-				SCCAddr:                sccAddress,
-				CTCAddr:                ctcAddress,
-				FPRollupAddr:           common.HexToAddress(cfg.FPRollupAddress),
-				ChainID:                chainID,
-				PrivKey:                proposerPrivKey,
-				SccRollback:            cfg.EnableSccRollback,
-				MaxBatchSubmissionTime: cfg.MaxBatchSubmissionTime,
-				PollInterval:           cfg.PollInterval,
-				FinalityConfirmations:  cfg.FinalityConfirmations,
-				EnableProposerHsm:      cfg.EnableProposerHsm,
-				ProposerHsmAddress:     cfg.ProposerHsmAddress,
-				ProposerHsmCreden:      cfg.ProposerHsmCreden,
-				ProposerHsmAPIName:     cfg.ProposerHsmAPIName,
-				AllowL2AutoRollback:    cfg.AllowL2AutoRollback,
+				Name:                        "Proposer",
+				L1Client:                    l1Client,
+				L2Client:                    l2Client,
+				TssClient:                   tssClient,
+				BlockOffset:                 cfg.BlockOffset,
+				MinStateRootElements:        cfg.MinStateRootElements,
+				MaxStateRootElements:        cfg.MaxStateRootElements,
+				SCCAddr:                     sccAddress,
+				CTCAddr:                     ctcAddress,
+				FPRollupAddr:                common.HexToAddress(cfg.FPRollupAddress),
+				ChainID:                     chainID,
+				PrivKey:                     proposerPrivKey,
+				SccRollback:                 cfg.EnableSccRollback,
+				RollupTimeout:               cfg.RollupTimeout,
+				PollInterval:                cfg.PollInterval,
+				FinalityConfirmations:       cfg.FinalityConfirmations,
+				EnableProposerHsm:           cfg.EnableProposerHsm,
+				ProposerHsmAddress:          cfg.ProposerHsmAddress,
+				ProposerHsmCreden:           cfg.ProposerHsmCreden,
+				ProposerHsmAPIName:          cfg.ProposerHsmAPIName,
+				AllowL2AutoRollback:         cfg.AllowL2AutoRollback,
+				MinTimeoutStateRootElements: cfg.MinTimeoutStateRootElements,
 			})
 			if err != nil {
 				return err

batch-submitter/config.go

@@ -81,18 +81,6 @@ type Config struct {
 	// FPRollupAddress is the fraud proof rollup contract address.
 	FPRollupAddress string
 
-	// MinL1TxSize is the minimum size in bytes of any L1 transactions generated
-	// by the batch submitter.
-	MinL1TxSize uint64
-
-	// MaxL1TxSize is the maximum size in bytes of any L1 transactions generated
-	// by the batch submitter.
-	MaxL1TxSize uint64
-
-	// MaxPlaintextL1TxSize is the maximum size in bytes of the plaintext tx
-	// data encoded in batches.
-	MaxPlaintextBatchSize uint64
-
 	// MinStateRootElements is the minimum number of state root elements that
 	// can be submitted in single proposer batch.
 	MinStateRootElements uint64
@@ -105,9 +93,8 @@ type Config struct {
 	// in a batch.
 	MaxTxBatchCount uint64
 
-	// MaxBatchSubmissionTime is the maximum amount of time that we will
-	// wait before submitting an under-sized batch.
-	MaxBatchSubmissionTime time.Duration
+	// RollupTimeout is the criterion which used to determine if the transaction is timeout.
+	RollupTimeout time.Duration
 
 	// PollInterval is the delay between querying L2 for more transaction
 	// and creating a new batch.
@@ -232,6 +219,15 @@ type Config struct {
 
 	// batch submitter rollback
 	AllowL2AutoRollback bool
+
+	// MaxRollupTxn is the maximum length of rollup batch transactions for every round.
+	MaxRollupTxn uint64
+
+	// MinRollupTxn is the minimum length of rollup batch transactions for every round.
+	MinRollupTxn uint64
+
+	// MinTimeoutStateRootElements is the minimum length of timeout rollup batch transactions for every round.
+	MinTimeoutStateRootElements uint64
 }
 
 // NewConfig parses the Config from the provided flags or environment variables.
@@ -250,12 +246,9 @@ func NewConfig(ctx *cli.Context) (Config, error) {
 		CTCAddress:                ctx.GlobalString(flags.CTCAddressFlag.Name),
 		SCCAddress:                ctx.GlobalString(flags.SCCAddressFlag.Name),
 		FPRollupAddress:           ctx.GlobalString(flags.FPRollupAddressFlag.Name),
-		MinL1TxSize:               ctx.GlobalUint64(flags.MinL1TxSizeFlag.Name),
-		MaxL1TxSize:               ctx.GlobalUint64(flags.MaxL1TxSizeFlag.Name),
-		MaxPlaintextBatchSize:     ctx.GlobalUint64(flags.MaxPlaintextBatchSizeFlag.Name),
 		MinStateRootElements:      ctx.GlobalUint64(flags.MinStateRootElementsFlag.Name),
 		MaxStateRootElements:      ctx.GlobalUint64(flags.MaxStateRootElementsFlag.Name),
-		MaxBatchSubmissionTime:    ctx.GlobalDuration(flags.MaxBatchSubmissionTimeFlag.Name),
+		RollupTimeout:             ctx.GlobalDuration(flags.RollupTimeoutFlag.Name),
 		PollInterval:              ctx.GlobalDuration(flags.PollIntervalFlag.Name),
 		NumConfirmations:          ctx.GlobalUint64(flags.NumConfirmationsFlag.Name),
 		SafeAbortNonceTooLowCount: ctx.GlobalUint64(flags.SafeAbortNonceTooLowCountFlag.Name),
@@ -266,33 +259,36 @@ func NewConfig(ctx *cli.Context) (Config, error) {
 		SafeMinimumEtherBalance:   ctx.GlobalUint64(flags.SafeMinimumEtherBalanceFlag.Name),
 		ClearPendingTxs:           ctx.GlobalBool(flags.ClearPendingTxsFlag.Name),
 		/* Optional Flags */
-		LogLevel:            ctx.GlobalString(flags.LogLevelFlag.Name),
-		LogTerminal:         ctx.GlobalBool(flags.LogTerminalFlag.Name),
-		SentryEnable:        ctx.GlobalBool(flags.SentryEnableFlag.Name),
-		SentryDsn:           ctx.GlobalString(flags.SentryDsnFlag.Name),
-		SentryTraceRate:     ctx.GlobalDuration(flags.SentryTraceRateFlag.Name),
-		BlockOffset:         ctx.GlobalUint64(flags.BlockOffsetFlag.Name),
-		SequencerPrivateKey: ctx.GlobalString(flags.SequencerPrivateKeyFlag.Name),
-		ProposerPrivateKey:  ctx.GlobalString(flags.ProposerPrivateKeyFlag.Name),
-		Mnemonic:            ctx.GlobalString(flags.MnemonicFlag.Name),
-		SequencerHDPath:     ctx.GlobalString(flags.SequencerHDPathFlag.Name),
-		ProposerHDPath:      ctx.GlobalString(flags.ProposerHDPathFlag.Name),
-		SequencerBatchType:  ctx.GlobalString(flags.SequencerBatchType.Name),
-		MetricsServerEnable: ctx.GlobalBool(flags.MetricsServerEnableFlag.Name),
-		MetricsHostname:     ctx.GlobalString(flags.MetricsHostnameFlag.Name),
-		MetricsPort:         ctx.GlobalUint64(flags.MetricsPortFlag.Name),
-		DisableHTTP2:        ctx.GlobalBool(flags.HTTP2DisableFlag.Name),
-		EnableSccRollback:   ctx.GlobalBool(flags.SccRollbackFlag.Name),
-		EnableSequencerHsm:  ctx.GlobalBool(flags.EnableSequencerHsmFlag.Name),
-		SequencerHsmAddress: ctx.GlobalString(flags.SequencerHsmAddressFlag.Name),
-		SequencerHsmAPIName: ctx.GlobalString(flags.SequencerHsmAPIName.Name),
-		SequencerHsmCreden:  ctx.GlobalString(flags.SequencerHsmCreden.Name),
-		EnableProposerHsm:   ctx.GlobalBool(flags.EnableProposerHsmFlag.Name),
-		ProposerHsmAddress:  ctx.GlobalString(flags.ProposerHsmAddressFlag.Name),
-		ProposerHsmAPIName:  ctx.GlobalString(flags.ProposerHsmAPIName.Name),
-		ProposerHsmCreden:   ctx.GlobalString(flags.ProposerHsmCreden.Name),
-		RollupClientHttp:    ctx.GlobalString(flags.RollupClientHttpFlag.Name),
-		AllowL2AutoRollback: ctx.GlobalBool(flags.AllowL2AutoRollback.Name),
+		LogLevel:                    ctx.GlobalString(flags.LogLevelFlag.Name),
+		LogTerminal:                 ctx.GlobalBool(flags.LogTerminalFlag.Name),
+		SentryEnable:                ctx.GlobalBool(flags.SentryEnableFlag.Name),
+		SentryDsn:                   ctx.GlobalString(flags.SentryDsnFlag.Name),
+		SentryTraceRate:             ctx.GlobalDuration(flags.SentryTraceRateFlag.Name),
+		BlockOffset:                 ctx.GlobalUint64(flags.BlockOffsetFlag.Name),
+		SequencerPrivateKey:         ctx.GlobalString(flags.SequencerPrivateKeyFlag.Name),
+		ProposerPrivateKey:          ctx.GlobalString(flags.ProposerPrivateKeyFlag.Name),
+		Mnemonic:                    ctx.GlobalString(flags.MnemonicFlag.Name),
+		SequencerHDPath:             ctx.GlobalString(flags.SequencerHDPathFlag.Name),
+		ProposerHDPath:              ctx.GlobalString(flags.ProposerHDPathFlag.Name),
+		SequencerBatchType:          ctx.GlobalString(flags.SequencerBatchType.Name),
+		MetricsServerEnable:         ctx.GlobalBool(flags.MetricsServerEnableFlag.Name),
+		MetricsHostname:             ctx.GlobalString(flags.MetricsHostnameFlag.Name),
+		MetricsPort:                 ctx.GlobalUint64(flags.MetricsPortFlag.Name),
+		DisableHTTP2:                ctx.GlobalBool(flags.HTTP2DisableFlag.Name),
+		EnableSccRollback:           ctx.GlobalBool(flags.SccRollbackFlag.Name),
+		EnableSequencerHsm:          ctx.GlobalBool(flags.EnableSequencerHsmFlag.Name),
+		SequencerHsmAddress:         ctx.GlobalString(flags.SequencerHsmAddressFlag.Name),
+		SequencerHsmAPIName:         ctx.GlobalString(flags.SequencerHsmAPIName.Name),
+		SequencerHsmCreden:          ctx.GlobalString(flags.SequencerHsmCreden.Name),
+		EnableProposerHsm:           ctx.GlobalBool(flags.EnableProposerHsmFlag.Name),
+		ProposerHsmAddress:          ctx.GlobalString(flags.ProposerHsmAddressFlag.Name),
+		ProposerHsmAPIName:          ctx.GlobalString(flags.ProposerHsmAPIName.Name),
+		ProposerHsmCreden:           ctx.GlobalString(flags.ProposerHsmCreden.Name),
+		RollupClientHttp:            ctx.GlobalString(flags.RollupClientHttpFlag.Name),
+		AllowL2AutoRollback:         ctx.GlobalBool(flags.AllowL2AutoRollback.Name),
+		MaxRollupTxn:                ctx.GlobalUint64(flags.MaxRollupTxnFlag.Name),
+		MinRollupTxn:                ctx.GlobalUint64(flags.MinRollupTxnFlag.Name),
+		MinTimeoutStateRootElements: ctx.GlobalUint64(flags.MinTimeoutStateRootElementsFlag.Name),
 	}
 
 	err := ValidateConfig(&cfg)

batch-submitter/drivers/proposer/driver.go

@@ -13,15 +13,13 @@ import (
 	"sync"
 	"time"
 
-	kms "cloud.google.com/go/kms/apiv1"
 	"github.com/ethereum/go-ethereum/accounts/abi"
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/ethclient"
 	"github.com/ethereum/go-ethereum/log"
-	"google.golang.org/api/option"
 
 	"github.com/mantlenetworkio/mantle/batch-submitter/bindings/ctc"
 	"github.com/mantlenetworkio/mantle/batch-submitter/bindings/scc"
@@ -35,6 +33,9 @@ import (
 	l2types "github.com/mantlenetworkio/mantle/l2geth/core/types"
 	l2ethclient "github.com/mantlenetworkio/mantle/l2geth/ethclient"
 	tss_types "github.com/mantlenetworkio/mantle/tss/common"
+
+	kms "cloud.google.com/go/kms/apiv1"
+	"google.golang.org/api/option"
 )
 
 // stateRootSize is the size in bytes of a state root.
@@ -46,27 +47,28 @@ const blockBuffer = 2
 var bigOne = new(big.Int).SetUint64(1) //nolint:unused
 
 type Config struct {
-	Name                   string
-	L1Client               *ethclient.Client
-	L2Client               *l2ethclient.Client
-	TssClient              *tssClient.Client
-	BlockOffset            uint64
-	MaxStateRootElements   uint64
-	MinStateRootElements   uint64
-	SCCAddr                common.Address
-	CTCAddr                common.Address
-	FPRollupAddr           common.Address
-	ChainID                *big.Int
-	PrivKey                *ecdsa.PrivateKey
-	SccRollback            bool
-	MaxBatchSubmissionTime time.Duration
-	PollInterval           time.Duration
-	FinalityConfirmations  uint64
-	EnableProposerHsm      bool
-	ProposerHsmCreden      string
-	ProposerHsmAddress     string
-	ProposerHsmAPIName     string
-	AllowL2AutoRollback    bool
+	Name                        string
+	L1Client                    *ethclient.Client
+	L2Client                    *l2ethclient.Client
+	TssClient                   *tssClient.Client
+	BlockOffset                 uint64
+	MaxStateRootElements        uint64
+	MinStateRootElements        uint64
+	SCCAddr                     common.Address
+	CTCAddr                     common.Address
+	FPRollupAddr                common.Address
+	ChainID                     *big.Int
+	PrivKey                     *ecdsa.PrivateKey
+	SccRollback                 bool
+	RollupTimeout               time.Duration
+	PollInterval                time.Duration
+	FinalityConfirmations       uint64
+	EnableProposerHsm           bool
+	ProposerHsmCreden           string
+	ProposerHsmAddress          string
+	ProposerHsmAPIName          string
+	AllowL2AutoRollback         bool
+	MinTimeoutStateRootElements uint64
 }
 
 type Driver struct {
@@ -242,7 +244,6 @@ func (d *Driver) GetBatchBlockRange(
 		return nil, nil, fmt.Errorf("invalid range, "+
 			"end(%v) < start(%v)", end, start)
 	}
-
 	return start, end, nil
 }
 
@@ -264,19 +265,20 @@ func (d *Driver) CraftBatchTx(
 		d.lastStart = start
 		d.lastCommitTime = time.Now().Add(-d.cfg.PollInterval)
 	}
-
 	//If the waiting time has not been reached, then check whether the minimum stateroot number
 	//is met. if not, return nil
-	if time.Now().Add(-d.cfg.MaxBatchSubmissionTime).Before(d.lastCommitTime) {
-		// Abort if we don't have enough state roots to meet our minimum
-		// requirement.
-		rangeLen := end.Uint64() - start.Uint64()
-		if rangeLen < d.cfg.MinStateRootElements {
+	rollupTxn := end.Uint64() - start.Uint64()
+	if rollupTxn < d.cfg.MinStateRootElements && (d.lastCommitTime.Add(d.cfg.RollupTimeout).After(time.Now()) || rollupTxn < d.cfg.MinTimeoutStateRootElements) {
+		if rollupTxn < d.cfg.MinStateRootElements {
 			log.Info(name+" number of state roots  below minimum",
-				"num_state_roots", rangeLen,
+				"num_state_roots", rollupTxn,
 				"min_state_roots", d.cfg.MinStateRootElements)
 			return nil, nil
 		}
+		log.Info(name+" number of timeout state roots below minimum or timeout can't satisfy the constrain",
+			"num_state_roots", rollupTxn,
+			"min_timeout_state_roots", d.cfg.MinTimeoutStateRootElements)
+		return nil, nil
 	}
 
 	var blocks []*l2types.Block