Add fee sum storage

tx-submitter/db/db.go

@@ -0,0 +1,49 @@
+package db
+
+import (
+	"fmt"
+	"strconv"
+
+	"morph-l2/tx-submitter/utils"
+
+	"github.com/morph-l2/go-ethereum/ethdb/leveldb"
+)
+
+var (
+	ErrKeyNotFound = fmt.Errorf("not found")
+)
+
+type Db struct {
+	db *leveldb.Database
+}
+
+func New(pathname string) (*Db, error) {
+	// leveldb
+	ldb, err := leveldb.New(pathname, 0, 0, "tx-submitter", false)
+	if err != nil {
+		return nil, fmt.Errorf("failed to create leveldb: %w", err)
+	}
+	return &Db{db: ldb}, nil
+}
+func (d *Db) GetFloat(key string) (float64, error) {
+	v, err := d.db.Get([]byte(key))
+	if err != nil {
+		return 0, fmt.Errorf("failed get key from leveldb %s: %w", key, err)
+	}
+	res, err := utils.ParseStringToType[float64](string(v))
+	if err != nil {
+		return 0, fmt.Errorf("failed to parse string to float64 %s", err)
+	}
+	return res, nil
+}
+func (d *Db) PutFloat(key string, val float64) error {
+	valStr := strconv.FormatFloat(val, 'f', -1, 64)
+	err := d.db.Put([]byte(key), []byte(valStr))
+	if err != nil {
+		return fmt.Errorf("failed to put key into leveldb %w", err)
+	}
+	return nil
+}
+func (d *Db) Close() error {
+	return d.db.Close()
+}

tx-submitter/db/db_test.go

@@ -0,0 +1,21 @@
+package db
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
+
+func Test_Get_Put(t *testing.T) {
+	db, err := New("test")
+	require.NoError(t, err)
+
+	expect := 1.123456789012345
+	// expectStr := "1.123456789012345"
+
+	err = db.PutFloat("test", expect)
+	require.NoError(t, err)
+	v, err := db.GetFloat("test")
+	require.NoError(t, err)
+	require.Equal(t, expect, v)
+}

tx-submitter/entry.go

@@ -10,8 +10,10 @@ import (
 	"os"
 	"os/signal"
 	"strings"
+	"time"
 
 	"morph-l2/bindings/bindings"
+	"morph-l2/tx-submitter/db"
 	"morph-l2/tx-submitter/event"
 	"morph-l2/tx-submitter/iface"
 	"morph-l2/tx-submitter/metrics"
@@ -65,6 +67,7 @@ func Main() func(ctx *cli.Context) error {
 			"rough_estimate_base_gas", cfg.RollupTxGasBase,
 			"rough_estimate_per_l1_msg", cfg.RollupTxGasPerL1Msg,
 			"log_level", cfg.LogLevel,
+			"leveldb_pathname", cfg.LeveldbPathName,
 		)
 
 		ctx, cancel := context.WithCancel(context.Background())
@@ -96,14 +99,11 @@ func Main() func(ctx *cli.Context) error {
 			}
 			output = io.MultiWriter(output, logFile)
 		}
-
 		logHandler := log.StreamHandler(output, log.TerminalFormat(false))
-
 		logLevel, err := log.LvlFromString(cfg.LogLevel)
 		if err != nil {
 			return err
 		}
-
 		log.Root().SetHandler(log.LvlFilterHandler(logLevel, logHandler))
 
 		l1RpcClient, err := rpc.Dial(cfg.L1EthRpc)
@@ -189,6 +189,11 @@ func Main() func(ctx *cli.Context) error {
 		// start rorator event indexer
 		rotator.StartEventIndexer()
 
+		ldb, err := db.New(cfg.LeveldbPathName)
+		if err != nil {
+			return fmt.Errorf("failed to connect leveldb: %w", err)
+		}
+
 		// new rollup service
 		sr := services.NewRollup(
 			ctx,
@@ -205,11 +210,9 @@ func Main() func(ctx *cli.Context) error {
 			cfg,
 			rsaPriv,
 			rotator,
+			ldb,
 		)
-		// init rollup service
-		if err := sr.PreCheck(); err != nil {
-			return err
-		}
+
 		// metrics
 		{
 			if cfg.MetricsServerEnable {
@@ -223,11 +226,6 @@ func Main() func(ctx *cli.Context) error {
 			log.Info("metrics server enabled", "host", cfg.MetricsHostname, "port", cfg.MetricsPort)
 		}
 
-		// log external sign info
-		if cfg.ExternalSign {
-
-		}
-
 		log.Info("external sign info",
 			"external_sign", cfg.ExternalSign,
 			"appid", cfg.ExternalSignAppid,
@@ -236,7 +234,12 @@ func Main() func(ctx *cli.Context) error {
 			"url", cfg.ExternalSignUrl,
 		)
 
-		sr.Start()
+		err = sr.Start()
+		for err != nil {
+			log.Error("rollup service start failed", "error", err)
+			time.Sleep(time.Second * 5)
+			err = sr.Start()
+		}
 
 		// Catch CTRL-C to ensure a graceful shutdown.
 		interrupt := make(chan os.Signal, 1)

tx-submitter/flags/flags.go

@@ -292,6 +292,12 @@ var (
 		Value:  100,
 		EnvVar: prefixEnvVar("EVENT_INDEX_STEP"),
 	}
+	LeveldbPathNameFlag = cli.StringFlag{
+		Name:   "leveldb_path_name",
+		Usage:  "The path name of the leveldb",
+		EnvVar: prefixEnvVar("LEVELDB_PATH_NAME"),
+		Value:  "submitter-leveldb",
+	}
 )
 
 var requiredFlags = []cli.Flag{
@@ -345,6 +351,7 @@ var optionalFlags = []cli.Flag{
 	RotatorBufferFlag,
 	StakingEventStoreFileFlag,
 	EventIndexStepFlag,
+	LeveldbPathNameFlag,
 }
 
 // Flags contains the list of configuration options available to the binary.

tx-submitter/metrics/metrics.go

@@ -19,8 +19,8 @@ type Metrics struct {
 	FinalizeCostSum       prometheus.Counter
 	RollupCost            prometheus.Gauge
 	FinalizeCost          prometheus.Gauge
-	L1FeeCollectionSum    prometheus.Counter
-	L1FeeCollection       prometheus.Gauge
+	CollectedL1FeeSum     prometheus.Counter
+	CollectedL1Fee        prometheus.Gauge
 	IndexerBlockProcessed prometheus.Gauge
 }
 
@@ -57,14 +57,14 @@ func NewMetrics() *Metrics {
 			Help:      "Finalize cost",
 			Namespace: metricsNamespace,
 		}),
-		L1FeeCollection: promauto.NewGauge(prometheus.GaugeOpts{
-			Name:      "submitter_l1_fee_collection",
-			Help:      "L1 fee collection",
+		CollectedL1Fee: promauto.NewGauge(prometheus.GaugeOpts{
+			Name:      "submitter_collected_l1_fee",
+			Help:      "Collected L1 fee for every batch",
 			Namespace: metricsNamespace,
 		}),
-		L1FeeCollectionSum: promauto.NewCounter(prometheus.CounterOpts{
-			Name:      "submitter_l1_fee_collection_sum",
-			Help:      "L1 fee collection",
+		CollectedL1FeeSum: promauto.NewCounter(prometheus.CounterOpts{
+			Name:      "submitter_collected_l1_fee_sum",
+			Help:      "Collected L1 fee for all batches committed ",
 			Namespace: metricsNamespace,
 		}),
 
@@ -101,12 +101,12 @@ func (m *Metrics) SetRollupCost(cost float64) {
 
 func (m *Metrics) SetFinalizeCost(cost float64) {
 	m.FinalizeCostSum.Add(cost)
-	m.RollupCost.Set(cost)
+	m.FinalizeCost.Set(cost)
 }
 
 func (m *Metrics) SetCollectedL1Fee(cost float64) {
-	m.L1FeeCollectionSum.Add(cost)
-	m.L1FeeCollection.Set(cost)
+	m.CollectedL1FeeSum.Add(cost)
+	m.CollectedL1Fee.Set(cost)
 }
 
 func (m *Metrics) SetIndexerBlockProcessed(blockNumber uint64) {