From fc30663dbcf61bb725ec444d33cfff4ad32311b6 Mon Sep 17 00:00:00 2001
From: omahs <73983677+omahs@users.noreply.github.com>
Date: Tue, 1 Aug 2023 10:42:57 +0200
Subject: [PATCH 01/20] [R4R]-{develop}: Fix typos (#1300)
---
CONTRIBUTING.md | 2 +-
gas-oracle/README.md | 4 ++--
l2geth/README.md | 2 +-
ops/README.md | 4 ++--
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 66a38cdba5..f9b7ceaa6d 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -7,7 +7,7 @@ There are plenty of ways to contribute, in particular we appreciate support in t
- Reporting issues. For security issues see [Security policy](https://github.com/mantlenetworkio/mantle/blob/main/SECURITY.md).
- Fixing and responding to existing issues. You can start off with those tagged ["good first issue"](https://github.com/mantlenetworkio/mantle/contribute) which are meant as introductory issues for external contributors.
- Improving the [documentation](https://github.com/mantlenetworkio/documents) and [tutorials](https://docs.mantle.xyz/network/for-devs/tutorials).
-- Become an "Mantler" and answer questions in the [mantle Discord](https://discord.com/invite/0xMantle).
+- Become a "Mantler" and answer questions in the [mantle Discord](https://discord.com/invite/0xMantle).
- Get involved in the protocol design process by proposing changes or new features or write parts of the spec yourself in the [mantle-specs](https://docs.mantle.xyz/network/intro/overview).
Note that we have a [Code of Conduct](https://github.com/mantlenetworkio/.github/blob/main/CODE_OF_CONDUCT.md), please follow it in all your interactions with the project.
diff --git a/gas-oracle/README.md b/gas-oracle/README.md
index cd1eee8cf7..bde2efb7ba 100644
--- a/gas-oracle/README.md
+++ b/gas-oracle/README.md
@@ -35,7 +35,7 @@ $ make gas-oracle
### Running the service
-Use the `--help` flag when running the `gas-oracle` to see it's configuration
+Use the `--help` flag when running the `gas-oracle` to see its configuration
options.
```
@@ -49,7 +49,7 @@ VERSION:
0.0.0-1.10.4-stable
DESCRIPTION:
- Configure with a private key and an Mantle HTTP endpoint to send transactions that update the L2 gas price.
+ Configure with a private key and a Mantle HTTP endpoint to send transactions that update the L2 gas price.
COMMANDS:
help, h Shows a list of commands or help for one command
diff --git a/l2geth/README.md b/l2geth/README.md
index ae1d8778f5..e7478208d8 100644
--- a/l2geth/README.md
+++ b/l2geth/README.md
@@ -178,7 +178,7 @@ configuration file via:
$ geth --config /path/to/your_config.toml
```
-To get an idea how the file should look like you can use the `dumpconfig` subcommand to
+To get an idea of how the file should look like you can use the `dumpconfig` subcommand to
export your existing configuration:
```shell
diff --git a/ops/README.md b/ops/README.md
index 1351ee7a1f..5b1540b250 100644
--- a/ops/README.md
+++ b/ops/README.md
@@ -89,7 +89,7 @@ user: admin
password: mantle
```
-## Data persistance
+## Data persistence
Grafana data is not currently saved. Any modifications or additions will be lost on container restart.
@@ -97,7 +97,7 @@ InfluxDB is persisting data to a Docker volume.
**Stopping the project removing the containers will not clear this volume**
-To remove the influxdb and grafana data, run a commands like
+To remove the influxdb and grafana data, run a command like
```
docker volume rm ops_influxdb_data
docker volume rm ops_grafana_data
From 2b3c9473c7748ab57e36b781d5eb07ff0ea4b62f Mon Sep 17 00:00:00 2001
From: ethan <101823964+Ethanncnm@users.noreply.github.com>
Date: Tue, 1 Aug 2023 16:43:11 +0800
Subject: [PATCH 02/20] [R4R] - {license}: add DA license (#1263)
* add DA license
* add DA license and FraudProof LICENSE
* fix DA proof
---
README.md | 9 ++++++---
fraud-proof/LICENSE | 45 ++++++++++++++++++++++++---------------------
2 files changed, 30 insertions(+), 24 deletions(-)
diff --git a/README.md b/README.md
index 6dff30e3f8..a374659923 100644
--- a/README.md
+++ b/README.md
@@ -48,7 +48,7 @@ Mantle's modular architecture helps achieve greater network efficiency for resou
Different parts of the Mantle tech stack are specialized to tackle specific issues.
-- [**Data Availability**](https://docs.mantle.xyz/introducing-mantle/a-gentle-introduction/solving-data-availability): Implementing EigenDA, an innovative re-staking solution that leverages Ethereum's validator network to bring the security of L1 to L2
+- [**Data Availability**](https://docs.mantle.xyz/introducing-mantle/a-gentle-introduction/solving-data-availability): Data Availability powered by EigenDA technology, an innovative re-staking solution that leverages Ethereum's validator network to bring the security of L1 to L2
- [**EVM-level Fraud Proofs**](https://docs.mantle.xyz/introducing-mantle/a-gentle-introduction/fraud-proofs): Improved fraud proofs that are evaluated using EVM-level instructions
> We encourage you to check out the [**Mantle tech docs**](https://docs.mantle.xyz) to learn more about the inner workings of Mantle.
@@ -149,7 +149,7 @@ root
├── bss-core: Core batch-submitter logic and utilities
├── gas-oracle: Service for updating L1 gas prices on L2
├── integration-tests: Various integration tests for the Mantle network
-├── l2geth: Mantle client software, a fork of geth v1.9.10
+├── l2geth: Mantle client software, a fork of geth v1.9.10 (deprecated for BEDROCK upgrade)
├── l2geth-exporter: A prometheus exporter to collect/serve metrics from an L2 geth node
├── proxyd: Configurable RPC request router and proxy
@@ -165,4 +165,7 @@ Then check out our list of [good first issues](https://github.com/mantlenetworki
## License
-Code forked from [`optimism`](https://github.com/ethereum-optimism) under the name [`optimism`](https://github.com/ethereum-optimism/optimism) is licensed under the [MIT License](https://github.com/git/git-scm.com/blob/main/MIT-LICENSE.txt) in accordance with the [original license](https://github.com/ethereum/go-ethereum/blob/master/COPYING).
+Code forked from [`optimism`](https://github.com/ethereum-optimism/optimism) under the name [`optimism`](https://github.com/mantlenetworkio/bitnetwork/tree/master/l2geth) is licensed under the [GNU GPLv3](https://gist.github.com/kn9ts/cbe95340d29fc1aaeaa5dd5c059d2e60) in accordance with the [original license](https://github.com/ethereum-optimism/optimism/blob/master/COPYING).
+
+
+All other files within this repository are licensed under the [MIT License](https://github.com/mantlenetworkio/bitnetwork/blob/master/LICENSE) unless stated otherwise.
diff --git a/fraud-proof/LICENSE b/fraud-proof/LICENSE
index ec55f3cecb..9bedbe2c35 100644
--- a/fraud-proof/LICENSE
+++ b/fraud-proof/LICENSE
@@ -1,22 +1,25 @@
-(The MIT License)
+// SPDX-License-Identifier: Apache-2.0
-Copyright 2022-2023 Mantle
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+/*
+ * Modifications Copyright 2022, Specular contributors
+ *
+ * This file was changed in accordance to Apache License, Version 2.0.
+ *
+ * Copyright 2021, Offchain Labs, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ * Modifications Copyright 2023, Mantle contributors
+ *
+ * This file was changed in accordance to Apache License, Version 2.0.
+ *
From ba5207734aef62bf863a911d17806f9237e479f0 Mon Sep 17 00:00:00 2001
From: ethan <101823964+Ethanncnm@users.noreply.github.com>
Date: Wed, 2 Aug 2023 19:18:40 +0800
Subject: [PATCH 03/20] [R4R]-{develop}:Optimize the rollup service (#1301)
* add mt-batcher flag
* add mt-batcher params flag.
* finish mt-batcher logic change
* add judge logic
* finish mt-batcher
* add batch_submitter flag config
* finish adding MinRollupTxn and MaxRollupTxn config for limiting rollup txn.
* cancel the limit of requiring 1 deposit tx for rollup submitting
* delete size limit for rollup process
* add rollup timeout config flag.
* fix some error
* delete unnecessary judge logic
* fix bug
* fix bug
* fix PR comments problem
* fix PR comments problem for annotation
* delete unnecessary log info msg
* Add new timeout check logic
* change time check
* fix config error drop
* fix import format
* delete unused import ERC20
---------
Co-authored-by: Shijiang Guo
---
batch-submitter/batch_submitter.go | 85 ++++++-------
batch-submitter/config.go | 88 +++++++------
batch-submitter/drivers/proposer/driver.go | 64 +++++-----
batch-submitter/drivers/sequencer/driver.go | 119 +++++-------------
batch-submitter/drivers/sequencer/encoding.go | 84 +------------
batch-submitter/flags/flags.go | 63 +++++-----
mt-batcher/config.go | 4 +
mt-batcher/flags/flags.go | 17 +++
mt-batcher/mt_batcher.go | 14 ++-
mt-batcher/services/restorer/handle.go | 6 -
mt-batcher/services/sequencer/driver.go | 80 +++++++-----
.../contracts/L2/predeploys/BVM_MANTLE.sol | 1 -
12 files changed, 261 insertions(+), 364 deletions(-)
diff --git a/batch-submitter/batch_submitter.go b/batch-submitter/batch_submitter.go
index 94a18a8fb1..8241e5a978 100644
--- a/batch-submitter/batch_submitter.go
+++ b/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
diff --git a/batch-submitter/config.go b/batch-submitter/config.go
index 836067189c..64e5cb41ee 100644
--- a/batch-submitter/config.go
+++ b/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)
diff --git a/batch-submitter/drivers/proposer/driver.go b/batch-submitter/drivers/proposer/driver.go
index 4a58b4cd36..42180b3c60 100644
--- a/batch-submitter/drivers/proposer/driver.go
+++ b/batch-submitter/drivers/proposer/driver.go
@@ -13,7 +13,6 @@ 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"
@@ -21,7 +20,6 @@ import (
"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
diff --git a/batch-submitter/drivers/sequencer/driver.go b/batch-submitter/drivers/sequencer/driver.go
index 9d71f5a360..a1697bce5f 100644
--- a/batch-submitter/drivers/sequencer/driver.go
+++ b/batch-submitter/drivers/sequencer/driver.go
@@ -4,11 +4,9 @@ import (
"context"
"crypto/ecdsa"
"encoding/hex"
- "fmt"
"math/big"
"strings"
- kms "cloud.google.com/go/kms/apiv1"
"github.com/ethereum/go-ethereum"
"github.com/ethereum/go-ethereum/accounts/abi"
"github.com/ethereum/go-ethereum/accounts/abi/bind"
@@ -17,7 +15,6 @@ import (
"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/da"
@@ -26,6 +23,9 @@ import (
"github.com/mantlenetworkio/mantle/bss-core/metrics"
"github.com/mantlenetworkio/mantle/bss-core/txmgr"
l2ethclient "github.com/mantlenetworkio/mantle/l2geth/ethclient"
+
+ kms "cloud.google.com/go/kms/apiv1"
+ "google.golang.org/api/option"
)
const (
@@ -35,23 +35,22 @@ const (
var bigOne = new(big.Int).SetUint64(1)
type Config struct {
- Name string
- L1Client *ethclient.Client
- L2Client *l2ethclient.Client
- BlockOffset uint64
- MinTxSize uint64
- MaxTxSize uint64
- MaxPlaintextBatchSize uint64
- CTCAddr common.Address
- DaUpgradeBlock uint64
- DAAddr common.Address
- ChainID *big.Int
- PrivKey *ecdsa.PrivateKey
- EnableSequencerHsm bool
- SequencerHsmAddress string
- SequencerHsmAPIName string
- SequencerHsmCreden string
- BatchType BatchType
+ Name string
+ L1Client *ethclient.Client
+ L2Client *l2ethclient.Client
+ BlockOffset uint64
+ CTCAddr common.Address
+ DaUpgradeBlock uint64
+ DAAddr common.Address
+ ChainID *big.Int
+ PrivKey *ecdsa.PrivateKey
+ EnableSequencerHsm bool
+ SequencerHsmAddress string
+ SequencerHsmAPIName string
+ SequencerHsmCreden string
+ BatchType BatchType
+ MaxRollupTxn uint64
+ MinRollupTxn uint64
}
type Driver struct {
@@ -206,9 +205,12 @@ func (d *Driver) GetBatchBlockRange(
return nil, nil, err
}
}
- if start.Cmp(end) > 0 {
- return nil, nil, fmt.Errorf("invalid range, "+
- "end(%v) < start(%v)", end, start)
+ l2Txn := big.NewInt(0).Sub(end, start)
+ if l2Txn.Cmp(big.NewInt(int64(d.cfg.MinRollupTxn))) < 0 {
+ return start, start, nil
+ }
+ if l2Txn.Cmp(big.NewInt(int64(d.cfg.MaxRollupTxn))) > 0 {
+ end = big.NewInt(0).Add(start, big.NewInt(int64(d.cfg.MaxRollupTxn)))
}
return start, end, nil
}
@@ -229,11 +231,8 @@ func (d *Driver) CraftBatchTx(
log.Info(name+" crafting batch tx", "start", start, "end", end,
"nonce", nonce, "type", d.cfg.BatchType.String())
- var (
- batchElements []BatchElement
- totalTxSize uint64
- hasLargeNextTx bool
- )
+ var batchElements []BatchElement
+
for i := new(big.Int).Set(start); i.Cmp(end) < 0; i.Add(i, bigOne) {
block, err := d.cfg.L2Client.BlockByNumber(ctx, i)
if err != nil {
@@ -243,30 +242,10 @@ func (d *Driver) CraftBatchTx(
// For each sequencer transaction, update our running total with the
// size of the transaction.
batchElement := BatchElementFromBlock(block)
- if batchElement.IsSequencerTx() {
- // Abort once the total size estimate is greater than the maximum
- // configured size. This is a conservative estimate, as the total
- // calldata size will be greater when batch contexts are included.
- // Below this set will be further whittled until the raw call data
- // size also adheres to this constraint.
- txLen := batchElement.Tx.Size()
- if totalTxSize+uint64(TxLenSize+txLen) > d.cfg.MaxPlaintextBatchSize {
- // Adding this transaction causes the batch to be too large, but
- // we also record if the batch size without the transaction
- // fails to meet our minimum size constraint. This is used below
- // to determine whether or not to ignore the minimum size check,
- // since in this case it can't be avoided.
- hasLargeNextTx = totalTxSize < d.cfg.MinTxSize
- break
- }
- totalTxSize += uint64(TxLenSize + txLen)
- }
-
batchElements = append(batchElements, batchElement)
}
shouldStartAt := start.Uint64()
- var pruneCount int
for {
batchParams, err := GenSequencerBatchParams(
shouldStartAt, d.cfg.BlockOffset, batchElements,
@@ -285,51 +264,9 @@ func (d *Driver) CraftBatchTx(
calldata := append(appendSequencerBatchID, batchArguments...)
log.Info(name+" testing batch size",
- "calldata_size", len(calldata),
- "min_tx_size", d.cfg.MinTxSize,
- "max_tx_size", d.cfg.MaxTxSize)
-
- // Continue pruning until plaintext calldata size is less than
- // configured max.
- calldataSize := uint64(len(calldata))
- if calldataSize > d.cfg.MaxTxSize {
- oldLen := len(batchElements)
- newBatchElementsLen := (oldLen * 9) / 10
- batchElements = batchElements[:newBatchElementsLen]
- log.Info(name+" pruned batch",
- "old_num_txs", oldLen,
- "new_num_txs", newBatchElementsLen)
- pruneCount++
- continue
- }
-
- // There are two specific cases in which we choose to ignore the minimum
- // L1 tx size. These cases are permitted since they arise from
- // situations where the difference between the configured MinTxSize and
- // MaxTxSize is less than the maximum L2 tx size permitted by the
- // mempool.
- //
- // This configuration is useful when trying to ensure the profitability
- // is sufficient, and we permit batches to be submitted with less than
- // our desired configuration only if it is not possible to construct a
- // batch within the given parameters.
- //
- // The two cases are:
- // 1. When the next elenent is larger than the difference between the
- // min and the max, causing the batch to be too small without the
- // element, and too large with it.
- // 2. When pruning a batch that exceeds the mac size below, and then
- // becomes too small as a result. This is avoided by only applying
- // the min size check when the pruneCount is zero.
- ignoreMinTxSize := pruneCount > 0 || hasLargeNextTx
- if !ignoreMinTxSize && calldataSize < d.cfg.MinTxSize {
- log.Info(name+" batch tx size below minimum",
- "num_txs", len(batchElements))
- return nil, nil
- }
+ "calldata_size", len(calldata))
d.metrics.NumElementsPerBatch().Observe(float64(len(batchElements)))
- d.metrics.BatchPruneCount.Set(float64(pruneCount))
log.Info(name+" batch constructed",
"num_txs", len(batchElements),
diff --git a/batch-submitter/drivers/sequencer/encoding.go b/batch-submitter/drivers/sequencer/encoding.go
index a2544f5c30..af994e9b82 100644
--- a/batch-submitter/drivers/sequencer/encoding.go
+++ b/batch-submitter/drivers/sequencer/encoding.go
@@ -188,7 +188,7 @@ type AppendSequencerBatchParams struct {
Txs []*CachedTx
}
-// Write encodes the AppendSequencerBatchParams using the following format:
+// WriteNoTxn encodes the AppendSequencerBatchParams using the following format:
// - should_start_at_element: 5 bytes
// - total_elements_to_append: 3 bytes
// - num_contexts: 3 bytes
@@ -210,68 +210,6 @@ type AppendSequencerBatchParams struct {
//
// Note that writing to a bytes.Buffer cannot
// error, so errors are ignored here
-func (p *AppendSequencerBatchParams) Write(
- w *bytes.Buffer,
- batchType BatchType,
-) error {
-
- _ = writeUint64(w, p.ShouldStartAtElement, 5)
- _ = writeUint64(w, p.TotalElementsToAppend, 3)
-
- // There must be contexts if there are transactions
- if len(p.Contexts) == 0 && len(p.Txs) != 0 {
- return ErrMalformedBatch
- }
-
- // There must be transactions if there are contexts
- if len(p.Txs) == 0 && len(p.Contexts) != 0 {
- return ErrMalformedBatch
- }
-
- // copy the contexts as to not malleate the struct
- // when it is a typed batch
- contexts := make([]BatchContext, 0, len(p.Contexts)+1)
- // Add the marker context, if any, for non-legacy encodings.
- markerContext := batchType.MarkerContext()
- if markerContext != nil {
- contexts = append(contexts, *markerContext)
- }
- contexts = append(contexts, p.Contexts...)
-
- // Write number of contexts followed by each fixed-size BatchContext.
- _ = writeUint64(w, uint64(len(contexts)), 3)
- for _, context := range contexts {
- context.Write(w)
- }
-
- switch batchType {
- case BatchTypeLegacy:
- // Write each length-prefixed tx.
- for _, tx := range p.Txs {
- _ = writeUint64(w, uint64(tx.Size()), TxLenSize)
- _, _ = w.Write(tx.RawTx()) // can't fail for bytes.Buffer
- }
- case BatchTypeZlib:
- zw := zlib.NewWriter(w)
- for _, tx := range p.Txs {
- if err := writeUint64(zw, uint64(tx.Size()), TxLenSize); err != nil {
- return err
- }
- if _, err := zw.Write(tx.RawTx()); err != nil {
- return err
- }
- }
- if err := zw.Close(); err != nil {
- return err
- }
-
- default:
- return fmt.Errorf("Unknown batch type: %s", batchType)
- }
-
- return nil
-}
-
func (p *AppendSequencerBatchParams) WriteNoTxn(
w *bytes.Buffer,
batchType BatchType,
@@ -279,16 +217,6 @@ func (p *AppendSequencerBatchParams) WriteNoTxn(
_ = writeUint64(w, p.ShouldStartAtElement, 5)
_ = writeUint64(w, p.TotalElementsToAppend, 3)
- // There must be contexts if there are transactions
- if len(p.Contexts) == 0 && len(p.Txs) != 0 {
- return ErrMalformedBatch
- }
-
- // There must be transactions if there are contexts
- if len(p.Txs) == 0 && len(p.Contexts) != 0 {
- return ErrMalformedBatch
- }
-
// copy the contexts as to not malleate the struct
// when it is a typed batch
contexts := make([]BatchContext, 0, len(p.Contexts)+1)
@@ -315,14 +243,8 @@ func (p *AppendSequencerBatchParams) Serialize(
upgradeBlock *big.Int,
) ([]byte, error) {
var buf bytes.Buffer
- if l2BlockNumber.Cmp(upgradeBlock) > 0 {
- if err := p.WriteNoTxn(&buf, batchType); err != nil {
- return nil, err
- }
- } else {
- if err := p.Write(&buf, batchType); err != nil {
- return nil, err
- }
+ if err := p.WriteNoTxn(&buf, batchType); err != nil {
+ return nil, err
}
return buf.Bytes(), nil
}
diff --git a/batch-submitter/flags/flags.go b/batch-submitter/flags/flags.go
index 48ddd5adaa..b743c14fec 100644
--- a/batch-submitter/flags/flags.go
+++ b/batch-submitter/flags/flags.go
@@ -82,27 +82,6 @@ var (
Required: true,
EnvVar: "FP_ROLLUP_ADDRESS",
}
- MinL1TxSizeFlag = cli.Uint64Flag{
- Name: "min-l1-tx-size",
- Usage: "Minimum size in bytes of any L1 transaction that gets " +
- "generated by the batch submitter",
- Required: true,
- EnvVar: prefixEnvVar("MIN_L1_TX_SIZE"),
- }
- MaxL1TxSizeFlag = cli.Uint64Flag{
- Name: "max-l1-tx-size",
- Usage: "Maximum size in bytes of any L1 transaction that gets " +
- "generated by the batch submitter",
- Required: true,
- EnvVar: prefixEnvVar("MAX_L1_TX_SIZE"),
- }
- MaxPlaintextBatchSizeFlag = cli.Uint64Flag{
- Name: "max-plaintext-batch-size",
- Usage: "Maximum size in bytes of of the plaintext tx data " +
- "encoded in batches",
- Required: true,
- EnvVar: prefixEnvVar("MAX_PLAINTEXT_BATCH_SIZE"),
- }
MinStateRootElementsFlag = cli.Uint64Flag{
Name: "min-state-root-elements",
Usage: "Minimum number of elements required to submit a state " +
@@ -117,12 +96,11 @@ var (
Required: true,
EnvVar: prefixEnvVar("MAX_STATE_ROOT_ELEMENTS"),
}
- MaxBatchSubmissionTimeFlag = cli.DurationFlag{
- Name: "max-batch-submission-time",
- Usage: "Maximum amount of time that we will wait before " +
- "submitting an under-sized batch",
+ RollupTimeoutFlag = cli.DurationFlag{
+ Name: "rollup-timeout",
+ Usage: "Delay between rollup timeout transactions ",
Required: true,
- EnvVar: prefixEnvVar("MAX_BATCH_SUBMISSION_TIME"),
+ EnvVar: prefixEnvVar("ROLLUP_TIMEOUT"),
}
PollIntervalFlag = cli.DurationFlag{
Name: "poll-interval",
@@ -343,6 +321,31 @@ var (
Required: false,
EnvVar: "ROLLUP_ALLOW_L2_AUTO_ROLLBACK",
}
+
+ MinRollupTxnFlag = cli.Uint64Flag{
+ Name: "min-rollup-txn",
+ Usage: "Minimum number of transaction from l2geth which is used to submit to rollup",
+ Required: true,
+ Value: 20,
+ EnvVar: prefixEnvVar("MIN_ROLLUP_TXN"),
+ }
+
+ MaxRollupTxnFlag = cli.Uint64Flag{
+ Name: "max-rollup-txn",
+ Usage: "Maximum number of transaction from l2geth which is used to submit to rollup",
+ Required: true,
+ Value: 70,
+ EnvVar: prefixEnvVar("MAX_ROLLUP_TXN"),
+ }
+
+ MinTimeoutStateRootElementsFlag = cli.Uint64Flag{
+ Name: "min-timeout-state-root-elements",
+ Usage: "Minimum number of elements required to submit a state " +
+ "root batch",
+ Required: true,
+ Value: 100,
+ EnvVar: prefixEnvVar("MIN_TIMEOUT_STATE_ROOT_ELEMENTS"),
+ }
)
var requiredFlags = []cli.Flag{
@@ -357,12 +360,9 @@ var requiredFlags = []cli.Flag{
CTCAddressFlag,
SCCAddressFlag,
FPRollupAddressFlag,
- MinL1TxSizeFlag,
- MaxL1TxSizeFlag,
- MaxPlaintextBatchSizeFlag,
MinStateRootElementsFlag,
MaxStateRootElementsFlag,
- MaxBatchSubmissionTimeFlag,
+ RollupTimeoutFlag,
PollIntervalFlag,
NumConfirmationsFlag,
SafeAbortNonceTooLowCountFlag,
@@ -372,6 +372,9 @@ var requiredFlags = []cli.Flag{
RunStateBatchSubmitterFlag,
SafeMinimumEtherBalanceFlag,
ClearPendingTxsFlag,
+ MaxRollupTxnFlag,
+ MinRollupTxnFlag,
+ MinTimeoutStateRootElementsFlag,
}
var optionalFlags = []cli.Flag{
diff --git a/mt-batcher/config.go b/mt-batcher/config.go
index 72c37dea93..ceec8000bf 100644
--- a/mt-batcher/config.go
+++ b/mt-batcher/config.go
@@ -67,6 +67,8 @@ type Config struct {
HsmAddress string
HsmFeeAPIName string
HsmFeeAddress string
+ MinTimeoutRollupTxn uint64
+ RollupTimeout time.Duration
}
func NewConfig(ctx *cli.Context) (Config, error) {
@@ -128,6 +130,8 @@ func NewConfig(ctx *cli.Context) (Config, error) {
HsmCreden: ctx.GlobalString(flags.HsmCredenFlag.Name),
HsmFeeAPIName: ctx.GlobalString(flags.HsmFeeAPINameFlag.Name),
HsmFeeAddress: ctx.GlobalString(flags.HsmFeeAddressFlag.Name),
+ MinTimeoutRollupTxn: ctx.GlobalUint64(flags.MinTimeoutRollupTxnFlag.Name),
+ RollupTimeout: ctx.GlobalDuration(flags.RollupTimeoutFlag.Name),
}
return cfg, nil
}
diff --git a/mt-batcher/flags/flags.go b/mt-batcher/flags/flags.go
index ba62a4e510..c7629f0b9b 100644
--- a/mt-batcher/flags/flags.go
+++ b/mt-batcher/flags/flags.go
@@ -340,6 +340,21 @@ var (
Usage: "the creden of hsm key for mt-batcher",
EnvVar: prefixEnvVar(envVarPrefix, "HSM_CREDEN"),
}
+
+ MinTimeoutRollupTxnFlag = cli.Uint64Flag{
+ Name: "min-timeout-rollup-txn",
+ Usage: "minimum of timeout Rollup transaction amount for mantle da",
+ Value: 500,
+ Required: true,
+ EnvVar: prefixEnvVar(envVarPrefix, "MIN_TIMEOUT_ROLLUP_TXN"),
+ }
+
+ RollupTimeoutFlag = cli.DurationFlag{
+ Name: "rollup-timeout",
+ Usage: "Duration we will wait before rollup batch transaction to Mantle Da",
+ Required: true,
+ EnvVar: prefixEnvVar(envVarPrefix, "ROLLUP_TIMEOUT"),
+ }
)
var requiredFlags = []cli.Flag{
@@ -363,6 +378,8 @@ var requiredFlags = []cli.Flag{
EigenContractAddressFlag,
EigenFeeContractAddressFlag,
BlockOffsetFlag,
+ MinTimeoutRollupTxnFlag,
+ RollupTimeoutFlag,
RollUpMinTxnFlag,
RollUpMaxSizeFlag,
FeeSizeSecFlag,
diff --git a/mt-batcher/mt_batcher.go b/mt-batcher/mt_batcher.go
index f709285495..94befc011d 100644
--- a/mt-batcher/mt_batcher.go
+++ b/mt-batcher/mt_batcher.go
@@ -2,22 +2,24 @@ package mt_batcher
import (
"context"
+ "errors"
"strings"
- "github.com/Layr-Labs/datalayr/common/logging"
"github.com/ethereum/go-ethereum/accounts/abi"
"github.com/ethereum/go-ethereum/accounts/abi/bind"
ethc "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/log"
- "github.com/mantlenetworkio/mantle/l2geth/common"
- "github.com/urfave/cli"
+ "github.com/mantlenetworkio/mantle/l2geth/common"
"github.com/mantlenetworkio/mantle/mt-batcher/bindings"
"github.com/mantlenetworkio/mantle/mt-batcher/l1l2client"
"github.com/mantlenetworkio/mantle/mt-batcher/metrics"
common2 "github.com/mantlenetworkio/mantle/mt-batcher/services/common"
"github.com/mantlenetworkio/mantle/mt-batcher/services/restorer"
"github.com/mantlenetworkio/mantle/mt-batcher/services/sequencer"
+
+ "github.com/Layr-Labs/datalayr/common/logging"
+ "github.com/urfave/cli"
)
func Main(gitVersion string) func(ctx *cli.Context) error {
@@ -176,6 +178,12 @@ func NewMantleBatch(cfg Config) (*MantleBatch, error) {
HsmCreden: cfg.HsmCreden,
HsmFeeAPIName: cfg.HsmFeeAPIName,
HsmFeeAddress: cfg.HsmFeeAddress,
+ MinTimeoutRollupTxn: cfg.MinTimeoutRollupTxn,
+ RollupTimeout: cfg.RollupTimeout,
+ }
+ if cfg.MinTimeoutRollupTxn >= cfg.RollUpMinTxn {
+ log.Error("new driver fail", "err", "config value error : MinTimeoutRollupTxn should less than RollUpMinTxn MinTimeoutRollupTxn(%v)>RollUpMinTxn(%v)", cfg.MinTimeoutRollupTxn, cfg.RollUpMinTxn)
+ return nil, errors.New("config value error : MinTimeoutRollupTxn should less than RollUpMinTxn")
}
log.Info("hsm",
"enablehsm", driverConfig.EnableHsm, "hsmaddress", driverConfig.HsmAddress,
diff --git a/mt-batcher/services/restorer/handle.go b/mt-batcher/services/restorer/handle.go
index 09dd696931..f47d8f3a0c 100644
--- a/mt-batcher/services/restorer/handle.go
+++ b/mt-batcher/services/restorer/handle.go
@@ -4,7 +4,6 @@ import (
"bytes"
"context"
"encoding/json"
-
"math/big"
"net/http"
"strings"
@@ -65,7 +64,6 @@ func (s *DaService) GetLatestTransactionBatchIndex(c gecho.Context) error {
if err != nil {
return c.JSON(http.StatusBadRequest, errors.New("fail to get batch index"))
}
- log.Info("rollup batch index", "batchIndex", batchIndex.Uint64())
return c.JSON(http.StatusOK, batchIndex.Uint64())
}
@@ -84,7 +82,6 @@ func (s *DaService) GetRollupStoreByRollupBatchIndex(c gecho.Context) error {
ConfirmAt: rollupStore.ConfirmAt,
Status: rollupStore.Status,
}
- log.Info("datastore response", "rsRep", rsRep)
return c.JSON(http.StatusOK, rsRep)
}
@@ -94,7 +91,6 @@ func (s *DaService) GetBatchTransactionByDataStoreId(c gecho.Context) error {
log.Error("invalid request params", "err", err)
return c.JSON(http.StatusBadRequest, errors.New("invalid request params"))
}
- log.Info("GetBatchTransactionByDataStoreId Request para", "StoreNumber", txReq.StoreNumber)
conn, err := grpc.Dial(s.Cfg.RetrieverSocket, grpc.WithInsecure())
if err != nil {
log.Error("disperser Cannot connect to", "err", err)
@@ -169,7 +165,6 @@ func (s *DaService) GetDtlBatchTransactionByDataStoreId(c gecho.Context) error {
if err := l2Tx.DecodeRLP(rlpStream); err != nil {
return c.JSON(http.StatusBadRequest, errors.New("Decode RLP fail"))
}
- log.Info("transaction", "hash", l2Tx.Hash().Hex())
newBlockNumber := new(big.Int).SetBytes(newBatchTxn[i].BlockNumber)
var queueOrigin types.QueueOrigin
@@ -288,7 +283,6 @@ func (s *DaService) GetTransactionListByStoreNumber(c gecho.Context) error {
log.Error("Decode RLP fail")
return c.JSON(http.StatusBadRequest, errors.New("Decode RLP fail"))
}
- log.Info("transaction", "hash", l2Tx.Hash().Hex())
newBlockNumber := new(big.Int).SetBytes(newBatchTxn[i].BlockNumber)
txSl := &TransactionListResponse{
BlockNumber: newBlockNumber.String(),
diff --git a/mt-batcher/services/sequencer/driver.go b/mt-batcher/services/sequencer/driver.go
index b1a05f85a4..cc1177d4eb 100644
--- a/mt-batcher/services/sequencer/driver.go
+++ b/mt-batcher/services/sequencer/driver.go
@@ -76,6 +76,8 @@ type DriverConfig struct {
FeeSizeSec string
FeePerBytePerTime uint64
FeeModelEnable bool
+ MinTimeoutRollupTxn uint64
+ RollupTimeout time.Duration
Metrics metrics.MtBatchMetrics
EnableHsm bool
@@ -185,10 +187,10 @@ func (d *Driver) UpdateGasPrice(ctx context.Context, tx *types.Transaction, feeM
opts.NoSend = true
}
if feeModelEnable {
- log.Info("MtBatcher update eigen da use fee", "FeeModelEnable", d.Cfg.FeeModelEnable)
+ log.Debug("MtBatcher update eigen da use fee", "FeeModelEnable", d.Cfg.FeeModelEnable)
finalTx, err = d.Cfg.RawEigenFeeContract.RawTransact(opts, tx.Data())
} else {
- log.Info("MtBatcher rollup data", "FeeModelEnable", d.Cfg.FeeModelEnable)
+ log.Debug("MtBatcher rollup data", "FeeModelEnable", d.Cfg.FeeModelEnable)
finalTx, err = d.Cfg.RawEigenContract.RawTransact(opts, tx.Data())
}
switch {
@@ -199,10 +201,10 @@ func (d *Driver) UpdateGasPrice(ctx context.Context, tx *types.Transaction, feeM
log.Warn("MtBatcher eth_maxPriorityFeePerGas is unsupported by current backend, using fallback gasTipCap")
opts.GasTipCap = common4.FallbackGasTipCap
if feeModelEnable {
- log.Info("update eigen da use fee", "FeeModelEnable", d.Cfg.FeeModelEnable)
+ log.Debug("update eigen da use fee", "FeeModelEnable", d.Cfg.FeeModelEnable)
return d.Cfg.RawEigenFeeContract.RawTransact(opts, tx.Data())
} else {
- log.Info("rollup date", "FeeModelEnable", d.Cfg.FeeModelEnable)
+ log.Debug("rollup date", "FeeModelEnable", d.Cfg.FeeModelEnable)
return d.Cfg.RawEigenContract.RawTransact(opts, tx.Data())
}
default:
@@ -248,7 +250,7 @@ func (d *Driver) TxAggregator(ctx context.Context, start, end *big.Int) (transac
panic(fmt.Sprintf("MtBatcher attempting to create batch element from block %d, "+
"found %d txs instead of 1", block.Number(), len(txs)))
}
- log.Info("MtBatcher origin transactions", "TxHash", txs[0].Hash().String(), "l2BlockNumber", block.Number(), "QueueOrigin", txs[0].QueueOrigin(), "Index", *txs[0].GetMeta().Index, "QueueIndex", txs[0].GetMeta().QueueIndex, "i", i)
+ log.Debug("MtBatcher origin transactions", "TxHash", txs[0].Hash().String(), "l2BlockNumber", block.Number(), "QueueOrigin", txs[0].QueueOrigin(), "Index", *txs[0].GetMeta().Index, "QueueIndex", txs[0].GetMeta().QueueIndex, "i", i)
var txBuf bytes.Buffer
if err := txs[0].EncodeRLP(&txBuf); err != nil {
panic(fmt.Sprintf("MtBatcher Unable to encode tx: %v", err))
@@ -265,7 +267,6 @@ func (d *Driver) TxAggregator(ctx context.Context, start, end *big.Int) (transac
} else {
l1MessageSender = txs[0].GetMeta().L1MessageSender
}
- log.Info("MtBatcher l1 tx origin", "address", l1MessageSender)
txMeta := &common3.TransactionMeta{
L1BlockNumber: txs[0].GetMeta().L1BlockNumber,
L1Timestamp: txs[0].GetMeta().L1Timestamp,
@@ -327,12 +328,10 @@ func (d *Driver) StoreData(ctx context.Context, uploadHeader []byte, duration ui
log.Error("MtBatcher unable to get current balance", "err", err)
return nil, err
}
- log.Info("MtBatcher WalletAddr Balance", "balance", balance)
d.Cfg.Metrics.MtBatchBalanceETH().Set(common4.WeiToEth64(balance))
nonce64, err := d.Cfg.L1Client.NonceAt(
d.Ctx, d.WalletAddr, nil,
)
- log.Info("mtbatcher-account", "walletaddr", d.WalletAddr, "nonce64", nonce64)
if err != nil {
return nil, err
}
@@ -376,7 +375,6 @@ func (d *Driver) ConfirmData(ctx context.Context, callData []byte, searchData rc
log.Error("MtBatcher unable to get current balance", "err", err)
return nil, err
}
- log.Info("MtBatcher wallet address balance", "balance", balance)
d.Cfg.Metrics.MtBatchBalanceETH().Set(common4.WeiToEth64(balance))
nonce64, err := d.Cfg.L1Client.NonceAt(
d.Ctx, d.WalletAddr, nil,
@@ -441,11 +439,9 @@ func (d *Driver) DisperseStoreData(data []byte, startl2BlockNumber *big.Int, end
} else if tx == nil {
return params, nil, errors.New("tx is nil")
}
- log.Info("MtBatcher store data success", "txHash", tx.Hash().String())
updateGasPrice := func(ctx context.Context) (*types.Transaction, error) {
return d.UpdateGasPrice(ctx, tx, false)
}
- log.Info("MtBatcher updateGasPrice", "gasPrice", updateGasPrice)
receipt, err := d.txMgr.Send(
d.Ctx, updateGasPrice, d.SendTransaction,
)
@@ -475,7 +471,7 @@ func (d *Driver) ConfirmStoredData(txHash []byte, params common2.StoreParams, st
log.Error("MtBatcher could not get initDataStore", "ok", ok)
return nil, errors.New("MtBatcher could not get initDataStore")
}
- log.Info("PollingInitDataStore", "MsgHash", event.MsgHash, "StoreNumber", event.StoreNumber)
+ log.Debug("PollingInitDataStore", "MsgHash", event.MsgHash, "StoreNumber", event.StoreNumber)
meta, err := d.callDisperse(
params.HeaderHash,
event.MsgHash[:],
@@ -515,7 +511,6 @@ func (d *Driver) ConfirmStoredData(txHash []byte, params common2.StoreParams, st
}
updateGasPrice := func(ctx context.Context) (*types.Transaction, error) {
- log.Info("MtBatcher ConfirmData update gas price")
return d.UpdateGasPrice(ctx, tx, false)
}
receipt, err := d.txMgr.Send(
@@ -544,12 +539,10 @@ func (d *Driver) callEncode(data []byte) (common2.StoreParams, error) {
}
opt := grpc.MaxCallSendMsgSize(1024 * 1024 * 300)
reply, err := c.EncodeStore(ctx, request, opt)
- log.Info("MtBatcher get store", "reply", reply)
if err != nil {
log.Error("MtBatcher get store err", err)
return common2.StoreParams{}, err
}
- log.Info("MtBatcher get store end")
g := reply.GetStore()
feeBigInt := new(big.Int).SetBytes(g.Fee)
params := common2.StoreParams{
@@ -628,7 +621,6 @@ func (d *Driver) UpdateFee(ctx context.Context, l2Block, daFee *big.Int) (*types
log.Error("MtBatcher unable to get fee wallet address current balance", "err", err)
return nil, err
}
- log.Info("MtBatcher fee wallet address balance", "balance", balance)
d.Cfg.Metrics.MtFeeBalanceETH().Set(common4.WeiToEth64(balance))
nonce64, err := d.Cfg.L1Client.NonceAt(
d.Ctx, d.FeeWalletAddr, nil,
@@ -747,7 +739,6 @@ func (d *Driver) Start() error {
d.Cfg.Metrics.RollupTimeDuration().Set(float64(d.Cfg.MainWorkerPollInterval))
if d.Cfg.CheckerEnable {
batchIndex, ok := d.LevelDBStore.GetReRollupBatchIndex()
- log.Info("get latest batch index", "batchIndex", batchIndex, "ok", ok)
if batchIndex == 0 || !ok {
d.LevelDBStore.SetReRollupBatchIndex(1)
}
@@ -768,6 +759,38 @@ func (d *Driver) Stop() {
d.wg.Wait()
}
+func (d *Driver) GetBatchBlockRangeWithTimeout(ctx context.Context) (*big.Int, *big.Int, error) {
+ log.Debug("RollupTimeInterval start")
+ pollingInterval := 500 * time.Millisecond
+ rollupTimout := d.Cfg.RollupTimeout
+ exit := time.NewTimer(rollupTimout)
+ ticker := time.NewTicker(pollingInterval)
+ for {
+ // normal logic
+ start, end, err := d.GetBatchBlockRange(d.Ctx)
+ if err != nil {
+ return nil, nil, err
+ }
+ if big.NewInt(0).Sub(end, start).Cmp(big.NewInt(int64(d.Cfg.RollUpMinTxn))) >= 0 {
+ return start, end, nil
+ }
+ if start.Cmp(end) == 0 {
+ log.Info("MtBatcher Sequencer no updates", "start", start, "end", end)
+ continue
+ }
+ select {
+
+ case <-exit.C:
+ if big.NewInt(0).Sub(end, start).Cmp(big.NewInt(int64(d.Cfg.MinTimeoutRollupTxn))) >= 0 {
+ return start, end, nil
+ }
+ return nil, nil, errors.Errorf("error: Timeout txn < MinTimeoutRollupTxn")
+ // timeout exit
+ case <-ticker.C:
+ }
+ }
+}
+
func (d *Driver) RollupMainWorker() {
defer d.wg.Done()
ticker := time.NewTicker(d.Cfg.MainWorkerPollInterval)
@@ -775,20 +798,16 @@ func (d *Driver) RollupMainWorker() {
for {
select {
case <-ticker.C:
- log.Info("MtBatcher eigen da sequencer fetching current block range")
- start, end, err := d.GetBatchBlockRange(d.Ctx)
+
+ start, end, err := d.GetBatchBlockRangeWithTimeout(d.Ctx)
if err != nil {
log.Error("MtBatcher Sequencer unable to get block range", "err", err)
continue
}
log.Info("MtBatcher get batch block range", "start", start, "end", end)
- if start.Cmp(end) == 0 {
- log.Info("MtBatcher Sequencer no updates", "start", start, "end", end)
- continue
- }
- rollupMinTransactions := new(big.Int).Sub(end, start)
- if big.NewInt(int64(d.Cfg.RollUpMinTxn)).Cmp(rollupMinTransactions) > 0 {
- log.Info("MtBatcher rollup total transaction less than min transations in config", "RollUpMinTxn", d.Cfg.RollUpMinTxn, "rollupMinTransactions", rollupMinTransactions)
+ waitedRollupTxs := new(big.Int).Sub(end, start)
+ if big.NewInt(int64(d.Cfg.RollUpMinTxn)).Cmp(waitedRollupTxs) > 0 {
+ log.Info("MtBatcher rollup total transaction less than minimum transations in config", "RollUpMinTxn", d.Cfg.RollUpMinTxn, "waitedRollupTxs", waitedRollupTxs)
continue
}
aggregateTxData, startL2BlockNumber, endL2BlockNumber := d.TxAggregator(
@@ -805,7 +824,6 @@ func (d *Driver) RollupMainWorker() {
log.Error("MtBatcher disperse store data fail", "err", err)
continue
}
- log.Info("MtBatcher disperse store data success", "txHash", receipt.TxHash.String())
d.Cfg.Metrics.L2StoredBlockNumber().Set(float64(start.Uint64()))
time.Sleep(10 * time.Second) // sleep for data into graph node
csdReceipt, err := d.ConfirmStoredData(receipt.TxHash.Bytes(), params, startL2BlockNumber, endL2BlockNumber, 0, big.NewInt(0), false)
@@ -813,7 +831,7 @@ func (d *Driver) RollupMainWorker() {
log.Error("MtBatcher confirm store data fail", "err", err)
continue
}
- log.Info("MtBatcher confirm store data success", "txHash", csdReceipt.TxHash.String())
+ log.Debug("MtBatcher confirm store data success", "txHash", csdReceipt.TxHash.String())
d.Cfg.Metrics.L2ConfirmedBlockNumber().Set(float64(start.Uint64()))
if d.Cfg.FeeModelEnable {
daFee, _ := d.CalcUserFeeByRules(big.NewInt(int64(len(aggregateTxData))))
@@ -825,6 +843,7 @@ func (d *Driver) RollupMainWorker() {
}
batchIndex, _ := d.Cfg.EigenDaContract.RollupBatchIndex(&bind.CallOpts{})
d.Cfg.Metrics.RollUpBatchIndex().Set(float64(batchIndex.Uint64()))
+
case err := <-d.Ctx.Done():
log.Error("MtBatcher eigenDa sequencer service shutting down", "err", err)
return
@@ -846,7 +865,7 @@ func (d *Driver) RollUpFeeWorker() {
continue
}
daFee := <-d.FeeCh
- log.Info("MtBatcher RollUpFeeWorker chainFee and daFee", "chainFee", chainFee, "daFee", *daFee)
+ log.Debug("MtBatcher RollUpFeeWorker chainFee and daFee", "chainFee", chainFee, "daFee", *daFee)
if chainFee.Cmp(daFee.RollUpFee) != 0 {
txfRpt, err := d.UpdateUserDaFee(daFee.EndL2BlockNumber, daFee.RollUpFee)
if err != nil {
@@ -854,7 +873,7 @@ func (d *Driver) RollUpFeeWorker() {
continue
}
d.Cfg.Metrics.EigenUserFee().Set(float64(daFee.RollUpFee.Uint64()))
- log.Info("MtBatcher RollUpFeeWorker update user fee success", "Hash", txfRpt.TxHash.String())
+ log.Debug("MtBatcher RollUpFeeWorker update user fee success", "Hash", txfRpt.TxHash.String())
}
}
case err := <-d.Ctx.Done():
@@ -925,7 +944,6 @@ func (d *Driver) CheckConfirmedWorker() {
continue
}
time.Sleep(10 * time.Second) // sleep for data into graph node
- log.Info("MtBatcher disperse re-rollup store data success", "txHash", receipt.TxHash.String())
csdReceipt, err := d.ConfirmStoredData(receipt.TxHash.Bytes(), params, startL2BlockNumber, endL2BlockNumber, rollupStore.DataStoreId, reConfirmedBatchIndex, true)
if err != nil {
log.Error("Checker confirm store data fail", "err", err)
diff --git a/packages/contracts/contracts/L2/predeploys/BVM_MANTLE.sol b/packages/contracts/contracts/L2/predeploys/BVM_MANTLE.sol
index 09c1c69f5e..c0f025b91c 100644
--- a/packages/contracts/contracts/L2/predeploys/BVM_MANTLE.sol
+++ b/packages/contracts/contracts/L2/predeploys/BVM_MANTLE.sol
@@ -6,7 +6,6 @@ import { Lib_PredeployAddresses } from "../../libraries/constants/Lib_PredeployA
/* Contract Imports */
import { L2StandardERC20 } from "../../standards/L2StandardERC20.sol";
-import { ERC20 } from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
From ee604d1deb034f07ba777b372f01db3f9b0db577 Mon Sep 17 00:00:00 2001
From: guoshijiang
Date: Mon, 7 Aug 2023 17:12:35 +0800
Subject: [PATCH 04/20] fix mt-batcher timeout function
---
mt-batcher/flags/flags.go | 1 -
mt-batcher/services/sequencer/driver.go | 32 +++++++++++++------------
2 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/mt-batcher/flags/flags.go b/mt-batcher/flags/flags.go
index c7629f0b9b..f367bbe91d 100644
--- a/mt-batcher/flags/flags.go
+++ b/mt-batcher/flags/flags.go
@@ -344,7 +344,6 @@ var (
MinTimeoutRollupTxnFlag = cli.Uint64Flag{
Name: "min-timeout-rollup-txn",
Usage: "minimum of timeout Rollup transaction amount for mantle da",
- Value: 500,
Required: true,
EnvVar: prefixEnvVar(envVarPrefix, "MIN_TIMEOUT_ROLLUP_TXN"),
}
diff --git a/mt-batcher/services/sequencer/driver.go b/mt-batcher/services/sequencer/driver.go
index cc1177d4eb..9234c93740 100644
--- a/mt-batcher/services/sequencer/driver.go
+++ b/mt-batcher/services/sequencer/driver.go
@@ -40,6 +40,10 @@ import (
"github.com/mantlenetworkio/mantle/mt-batcher/txmgr"
)
+var (
+ pollingInterval = 1000 * time.Millisecond
+)
+
type SignerFn func(context.Context, common.Address, *types.Transaction) (*types.Transaction, error)
type DriverConfig struct {
@@ -761,32 +765,31 @@ func (d *Driver) Stop() {
func (d *Driver) GetBatchBlockRangeWithTimeout(ctx context.Context) (*big.Int, *big.Int, error) {
log.Debug("RollupTimeInterval start")
- pollingInterval := 500 * time.Millisecond
rollupTimout := d.Cfg.RollupTimeout
exit := time.NewTimer(rollupTimout)
ticker := time.NewTicker(pollingInterval)
for {
- // normal logic
start, end, err := d.GetBatchBlockRange(d.Ctx)
if err != nil {
return nil, nil, err
}
- if big.NewInt(0).Sub(end, start).Cmp(big.NewInt(int64(d.Cfg.RollUpMinTxn))) >= 0 {
- return start, end, nil
- }
- if start.Cmp(end) == 0 {
- log.Info("MtBatcher Sequencer no updates", "start", start, "end", end)
- continue
- }
select {
-
+ case <-ticker.C:
+ if big.NewInt(0).Sub(end, start).Cmp(big.NewInt(int64(d.Cfg.RollUpMinTxn))) >= 0 {
+ return start, end, nil
+ }
+ if start.Cmp(end) == 0 {
+ log.Info("MtBatcher Sequencer no updates", "start", start, "end", end)
+ continue
+ }
case <-exit.C:
if big.NewInt(0).Sub(end, start).Cmp(big.NewInt(int64(d.Cfg.MinTimeoutRollupTxn))) >= 0 {
return start, end, nil
}
- return nil, nil, errors.Errorf("error: Timeout txn < MinTimeoutRollupTxn")
- // timeout exit
- case <-ticker.C:
+ return nil, nil, errors.Errorf("error: Timeout txn less than MinTimeoutRollupTxn")
+ case err := <-d.Ctx.Done():
+ log.Error("", "err", err)
+ return nil, nil, errors.New("MtBatcher get block range timeout error")
}
}
}
@@ -798,10 +801,9 @@ func (d *Driver) RollupMainWorker() {
for {
select {
case <-ticker.C:
-
start, end, err := d.GetBatchBlockRangeWithTimeout(d.Ctx)
if err != nil {
- log.Error("MtBatcher Sequencer unable to get block range", "err", err)
+ log.Warn("MtBatcher Sequencer unable to get block range", "err", err)
continue
}
log.Info("MtBatcher get batch block range", "start", start, "end", end)
From 00cd0f73e4e14848dec18ba3b0965c0a2c8eb05a Mon Sep 17 00:00:00 2001
From: guoshijiang
Date: Mon, 7 Aug 2023 17:14:21 +0800
Subject: [PATCH 05/20] fix flag
---
batch-submitter/flags/flags.go | 3 ---
1 file changed, 3 deletions(-)
diff --git a/batch-submitter/flags/flags.go b/batch-submitter/flags/flags.go
index b743c14fec..27a94d1204 100644
--- a/batch-submitter/flags/flags.go
+++ b/batch-submitter/flags/flags.go
@@ -326,7 +326,6 @@ var (
Name: "min-rollup-txn",
Usage: "Minimum number of transaction from l2geth which is used to submit to rollup",
Required: true,
- Value: 20,
EnvVar: prefixEnvVar("MIN_ROLLUP_TXN"),
}
@@ -334,7 +333,6 @@ var (
Name: "max-rollup-txn",
Usage: "Maximum number of transaction from l2geth which is used to submit to rollup",
Required: true,
- Value: 70,
EnvVar: prefixEnvVar("MAX_ROLLUP_TXN"),
}
@@ -343,7 +341,6 @@ var (
Usage: "Minimum number of elements required to submit a state " +
"root batch",
Required: true,
- Value: 100,
EnvVar: prefixEnvVar("MIN_TIMEOUT_STATE_ROOT_ELEMENTS"),
}
)
From 84ad98d8d4654109504edb79c65b0dfd740d9579 Mon Sep 17 00:00:00 2001
From: I know
Date: Fri, 4 Aug 2023 18:17:03 +0800
Subject: [PATCH 06/20] Add Mantle audit report files (#1333)
* Add Mantle audit report files
* Add Mantle audit report files
---
...k (Bridge Contracts) Quantstamp Report.pdf | Bin 0 -> 461468 bytes
...rk (Token Migration) Quantstamp Report.pdf | Bin 0 -> 707297 bytes
audits/Mantle Secure3 Audit Report.pdf | Bin 0 -> 13115033 bytes
audits/Mantle Sigma Prime Review.pdf | Bin 0 -> 539124 bytes
...n and Bridge Audit Report OpenZeppelin.pdf | Bin 0 -> 402532 bytes
audits/Mantle Zellic Audit Report.pdf | Bin 0 -> 1715711 bytes
6 files changed, 0 insertions(+), 0 deletions(-)
create mode 100644 audits/Mantle Network (Bridge Contracts) Quantstamp Report.pdf
create mode 100644 audits/Mantle Network (Token Migration) Quantstamp Report.pdf
create mode 100644 audits/Mantle Secure3 Audit Report.pdf
create mode 100644 audits/Mantle Sigma Prime Review.pdf
create mode 100644 audits/Mantle Token and Bridge Audit Report OpenZeppelin.pdf
create mode 100644 audits/Mantle Zellic Audit Report.pdf
diff --git a/audits/Mantle Network (Bridge Contracts) Quantstamp Report.pdf b/audits/Mantle Network (Bridge Contracts) Quantstamp Report.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..7fc2f08a0e71f031a61aba52ee6d63e3eb13675d
GIT binary patch
literal 461468
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