feat: add enable to chain-monitor config (#942)

Co-authored-by: HAOYUatHZ <haoyu@protonmail.com>
Co-authored-by: HAOYUatHZ <HAOYUatHZ@users.noreply.github.com>

common/version/version.go

@@ -5,7 +5,7 @@ import (
 	"runtime/debug"
 )
 
-var tag = "v4.3.4"
+var tag = "v4.3.5"
 
 var commit = func() string {
 	if info, ok := debug.ReadBuildInfo(); ok {

rollup/conf/config.json

@@ -54,6 +54,7 @@
         "gas_price_diff": 50000
       },
       "chain_monitor": {
+        "enabled": false,
         "timeout": 3,
         "try_times": 5,
         "base_url": "http://localhost:8750"

rollup/internal/config/relayer.go

@@ -39,6 +39,7 @@ type SenderConfig struct {
 
 // ChainMonitor this config is used to get batch status from chain_monitor API.
 type ChainMonitor struct {
+	Enabled  bool   `json:"enabled"`
 	TimeOut  int    `json:"timeout"`
 	TryTimes int    `json:"try_times"`
 	BaseURL  string `json:"base_url"`
@@ -56,7 +57,7 @@ type RelayerConfig struct {
 	// gas oracle config
 	GasOracleConfig *GasOracleConfig `json:"gas_oracle_config"`
 	// ChainMonitor config of monitoring service
-	ChainMonitor *ChainMonitor `json:"chain_monitor,omitempty"`
+	ChainMonitor *ChainMonitor `json:"chain_monitor"`
 	// L1CommitGasLimitMultiplier multiplier for fallback gas limit in commitBatch txs
 	L1CommitGasLimitMultiplier float64 `json:"l1_commit_gas_limit_multiplier,omitempty"`
 	// The private key of the relayer

rollup/internal/controller/relayer/l2_relayer.go

@@ -98,11 +98,6 @@ func NewLayer2Relayer(ctx context.Context, l2Client *ethclient.Client, db *gorm.
 		gasPriceDiff = defaultGasPriceDiff
 	}
 
-	// chain_monitor client
-	chainMonitorClient := resty.New()
-	chainMonitorClient.SetRetryCount(cfg.ChainMonitor.TryTimes)
-	chainMonitorClient.SetTimeout(time.Duration(cfg.ChainMonitor.TimeOut) * time.Second)
-
 	layer2Relayer := &Layer2Relayer{
 		ctx: ctx,
 		db:  db,
@@ -126,7 +121,13 @@ func NewLayer2Relayer(ctx context.Context, l2Client *ethclient.Client, db *gorm.
 		cfg:                    cfg,
 		processingCommitment:   sync.Map{},
 		processingFinalization: sync.Map{},
-		chainMonitorClient:     chainMonitorClient,
+	}
+
+	// chain_monitor client
+	if cfg.ChainMonitor.Enabled {
+		layer2Relayer.chainMonitorClient = resty.New()
+		layer2Relayer.chainMonitorClient.SetRetryCount(cfg.ChainMonitor.TryTimes)
+		layer2Relayer.chainMonitorClient.SetTimeout(time.Duration(cfg.ChainMonitor.TimeOut) * time.Second)
 	}
 
 	// Initialize genesis before we do anything else
@@ -433,17 +434,20 @@ func (r *Layer2Relayer) ProcessCommittedBatches() {
 		r.metrics.rollupL2RelayerProcessCommittedBatchesFinalizedTotal.Inc()
 
 		// Check batch status before send `finalizeBatchWithProof` tx.
-		//batchStatus, err := r.getBatchStatusByIndex(batch.Index)
-		//if err != nil {
-		//	r.metrics.rollupL2ChainMonitorLatestFailedCall.Inc()
-		//	log.Warn("failed to get batch status, please check chain_monitor api server", "batch_index", batch.Index, "err", err)
-		//	return
-		//}
-		//if !batchStatus {
-		//	r.metrics.rollupL2ChainMonitorLatestFailedBatchStatus.Inc()
-		//	log.Error("the batch status is not right, stop finalize batch and check the reason", "batch_index", batch.Index)
-		//	return
-		//}
+		if r.cfg.ChainMonitor.Enabled {
+			var batchStatus bool
+			batchStatus, err = r.getBatchStatusByIndex(batch.Index)
+			if err != nil {
+				r.metrics.rollupL2ChainMonitorLatestFailedCall.Inc()
+				log.Warn("failed to get batch status, please check chain_monitor api server", "batch_index", batch.Index, "err", err)
+				return
+			}
+			if !batchStatus {
+				r.metrics.rollupL2ChainMonitorLatestFailedBatchStatus.Inc()
+				log.Error("the batch status is not right, stop finalize batch and check the reason", "batch_index", batch.Index)
+				return
+			}
+		}
 
 		var parentBatchStateRoot string
 		if batch.Index > 0 {

rollup/internal/controller/relayer/l2_relayer_test.go

@@ -392,6 +392,7 @@ func testGetBatchStatusByIndex(t *testing.T) {
 	db := setupL2RelayerDB(t)
 	defer database.CloseDB(db)
 
+	cfg.L2Config.RelayerConfig.ChainMonitor.Enabled = true
 	relayer, err := NewLayer2Relayer(context.Background(), l2Cli, db, cfg.L2Config.RelayerConfig, false, nil)
 	assert.NoError(t, err)
 	assert.NotNil(t, relayer)