Feature/v0.4.0 merge fraud proof

.gitignore

@@ -14,6 +14,7 @@ yarn-error.log
 package-lock.json
 
 dist
+abi
 artifacts
 cache
 
@@ -56,5 +57,5 @@ mantle.iml
 
 ops/data/**
 dist/
-
+packages/contracts/test/data/
 packages/contracts/abi/

batch-submitter/batch_submitter.go

@@ -2,11 +2,7 @@ package batchsubmitter
 
 import (
 	"context"
-	ethc "github.com/ethereum/go-ethereum/common"
-	"github.com/mantlenetworkio/mantle/l2geth/common"
-	"os"
-	"time"
-
+	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/log"
 	"github.com/getsentry/sentry-go"
 	"github.com/mantlenetworkio/mantle/batch-submitter/drivers/proposer"
@@ -17,6 +13,8 @@ import (
 	"github.com/mantlenetworkio/mantle/bss-core/metrics"
 	"github.com/mantlenetworkio/mantle/bss-core/txmgr"
 	"github.com/urfave/cli"
+	"os"
+	"time"
 )
 
 // Main is the entrypoint into the batch submitter service. This method returns
@@ -135,7 +133,7 @@ func Main(gitVersion string) func(ctx *cli.Context) error {
 				MaxTxSize:             cfg.MaxL1TxSize,
 				MaxPlaintextBatchSize: cfg.MaxPlaintextBatchSize,
 				DaUpgradeBlock:        cfg.DaUpgradeBlock,
-				DAAddr:                ethc.Address(common.HexToAddress(cfg.DAAddress)),
+				DAAddr:                common.Address(common.HexToAddress(cfg.DAAddress)),
 				CTCAddr:               ctcAddress,
 				ChainID:               chainID,
 				PrivKey:               sequencerPrivKey,
@@ -166,8 +164,10 @@ func Main(gitVersion string) func(ctx *cli.Context) error {
 				MaxStateRootElements: cfg.MaxStateRootElements,
 				SCCAddr:              sccAddress,
 				CTCAddr:              ctcAddress,
+				FPRollupAddr:         common.HexToAddress(cfg.FPRollupAddress),
 				ChainID:              chainID,
 				PrivKey:              proposerPrivKey,
+				SccRollback:          cfg.EnableSccRollback,
 			})
 			if err != nil {
 				return err

batch-submitter/config.go

@@ -75,6 +75,9 @@ type Config struct {
 	// SCCAddress is the SCC contract address.
 	SCCAddress string
 
+	// 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
@@ -201,6 +204,8 @@ type Config struct {
 
 	// DisableHTTP2 disables HTTP2 support.
 	DisableHTTP2 bool
+
+	EnableSccRollback bool
 }
 
 // NewConfig parses the Config from the provided flags or environment variables.
@@ -217,6 +222,7 @@ func NewConfig(ctx *cli.Context) (Config, error) {
 		DAAddress:                 ctx.GlobalString(flags.DaAddressFlag.Name),
 		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),
@@ -249,6 +255,7 @@ func NewConfig(ctx *cli.Context) (Config, error) {
 		MetricsHostname:     ctx.GlobalString(flags.MetricsHostnameFlag.Name),
 		MetricsPort:         ctx.GlobalUint64(flags.MetricsPortFlag.Name),
 		DisableHTTP2:        ctx.GlobalBool(flags.HTTP2DisableFlag.Name),
+		EnableSccRollback:   ctx.GlobalBool(flags.SccRollbackFlag.Name),
 	}
 
 	err := ValidateConfig(&cfg)