bug fix when merging branch

Author: sh-cha

executor/batch/batch.go

@@ -3,6 +3,7 @@ package batch
 import (
 	"context"
 	"errors"
+	"fmt"
 	"io"
 	"os"
 	"sync"
@@ -136,8 +137,15 @@ func (bs *BatchSubmitter) Initialize(host hostNode, da executortypes.DANode, bri
 	return nil
 }
 
-func (bs *BatchSubmitter) Start(ctx context.Context) {
-	bs.node.Start(ctx, nodetypes.PROCESS_TYPE_RAW)
+func (bs *BatchSubmitter) Start(ctx context.Context, errCh chan error) {
+	defer func() {
+		if r := recover(); r != nil {
+			bs.logger.Error("batch panic", zap.Any("recover", r))
+			errCh <- fmt.Errorf("batch panic: %v", r)
+		}
+	}()
+
+	bs.node.Start(ctx, errCh, nodetypes.PROCESS_TYPE_RAW)
 }
 
 func (bs *BatchSubmitter) SetBridgeInfo(bridgeInfo opchildtypes.BridgeInfo) {
@@ -156,8 +164,8 @@ func (bs *BatchSubmitter) LoadSubmissionInfo() error {
 	return nil
 }
 
-func (bs *BatchSubmitter) RawKVSubmissionInfo(timestamp int64) types.KV {
-	return types.KV{
+func (bs *BatchSubmitter) SubmissionInfoToRawKV(timestamp int64) types.RawKV {
+	return types.RawKV{
 		Key:   bs.db.PrefixedKey(SubmissionKey),
 		Value: dbtypes.FromInt64(timestamp),
 	}

executor/batch/handler.go

@@ -44,15 +44,15 @@ func (bs *BatchSubmitter) rawBlockHandler(args nodetypes.RawBlockArgs) error {
 		return err
 	}
 
-	batchKVs := make([]types.KV, 0)
-	batchKVs = append(batchKVs, bs.node.RawKVSyncInfo(args.BlockHeight))
-	batchMsgkvs, err := bs.da.RawKVProcessedData(bs.processedMsgs, false)
+	batchKVs := make([]types.RawKV, 0)
+	batchKVs = append(batchKVs, bs.node.SyncInfoToRawKV(args.BlockHeight))
+	batchMsgkvs, err := bs.da.ProcessedMsgsToRawKV(bs.processedMsgs, false)
 	if err != nil {
 		return err
 	}
 	batchKVs = append(batchKVs, batchMsgkvs...)
 	if len(batchMsgkvs) > 0 {
-		batchKVs = append(batchKVs, bs.RawKVSubmissionInfo(pbb.Header.Time.UnixNano()))
+		batchKVs = append(batchKVs, bs.SubmissionInfoToRawKV(pbb.Header.Time.UnixNano()))
 	}
 	err = bs.db.RawBatchSet(batchKVs...)
 	if err != nil {

executor/child/child.go

@@ -115,7 +115,7 @@ func (ch *Child) Start(ctx context.Context, errCh chan error) {
 		}
 	}()
 
-	ch.node.Start(ctx, errCh)
+	ch.node.Start(ctx, errCh, nodetypes.PROCESS_TYPE_DEFAULT)
 }
 
 func (ch *Child) registerHandlers() {

executor/executor.go

@@ -53,7 +53,7 @@ func NewExecutor(cfg *executortypes.Config, db types.DB, sv *server.Server, logg
 			db.WithPrefix([]byte(executortypes.ChildNodeName)),
 			logger.Named(executortypes.ChildNodeName), cdc, txConfig,
 		),
-		batch: batch.NewBatchSubmitter(cfg.Version, cfg.DANodeConfig(), cfg.DANodeConfig(), db.WithPrefix([]byte(executortypes.BatchNodeName)), logger.Named(executortypes.BatchNodeName), cdc, txConfig, homePath),
+		batch: batch.NewBatchSubmitter(cfg.Version, cfg.DANodeConfig(), cfg.BatchConfig(), db.WithPrefix([]byte(executortypes.BatchNodeName)), logger.Named(executortypes.BatchNodeName), cdc, txConfig, homePath),
 
 		cfg:    cfg,
 		db:     db,

executor/host/query.go

@@ -52,6 +52,7 @@ func (h Host) QueryBatchInfos() (*ophosttypes.QueryBatchInfosResponse, error) {
 	req := &ophosttypes.QueryBatchInfosRequest{
 		BridgeId: uint64(h.bridgeId),
 	}
-	ctx := node.GetQueryContext(0)
+	ctx, cancel := node.GetQueryContext(0)
+	defer cancel()
 	return h.ophostQueryClient.BatchInfos(ctx, req)
 }

executor/types/batch.go

@@ -9,7 +9,7 @@ type DANode interface {
 	GetAddressStr() (string, error)
 	HasKey() bool
 	BroadcastMsgs(nodetypes.ProcessedMsgs)
-	RawKVProcessedData([]nodetypes.ProcessedMsgs, bool) ([]types.KV, error)
+	ProcessedMsgsToRawKV([]nodetypes.ProcessedMsgs, bool) ([]types.RawKV, error)
 }
 
 type BatchHeader struct {

executor/types/config.go

@@ -37,6 +37,10 @@ type Config struct {
 	// If you don't want to use the bridge executor feature, you can leave it empty.
 	BridgeExecutorMnemonic string `json:"bridge_executor_mnemonic"`
 
+	// BatchSubmitterMnemonic is the mnemonic phrase for the batch submitter,
+	// which is used to relay the batch of blocks from l2 to da.
+	//
+	// If you don't want to use the batch submitter feature, you can leave it empty.
 	BatchSubmitterMnemonic string `json:"batch_submitter_mnemonic"`
 
 	// RelayOracle is the flag to enable the oracle relay feature.
@@ -59,15 +63,19 @@ func DefaultConfig() *Config {
 
 		L1RPCAddress: "tcp://localhost:26657",
 		L2RPCAddress: "tcp://localhost:27657",
+		DARPCAddress: "tcp://localhost:28657",
 
 		L1GasPrice: "0.15uinit",
 		L2GasPrice: "",
+		DAGasPrice: "",
 
 		L1ChainID: "testnet-l1-1",
 		L2ChainID: "testnet-l2-1",
+		DAChainID: "testnet-l3-1",
 
 		OutputSubmitterMnemonic: "",
 		BridgeExecutorMnemonic:  "",
+		BatchSubmitterMnemonic:  "",
 	}
 }
 
@@ -125,8 +133,15 @@ func (cfg Config) DANodeConfig() nodetypes.NodeConfig {
 	}
 }
 
+func (cfg Config) BatchConfig() BatchConfig {
+	return BatchConfig{
+		MaxChunks:         cfg.MaxChunks,
+		MaxChunkSize:      cfg.MaxChunkSize,
+		MaxSubmissionTime: cfg.MaxSubmissionTime,
+	}
+}
+
 type BatchConfig struct {
-	nodetypes.NodeConfig
 	MaxChunks         int64 `json:"max_chunks"`
 	MaxChunkSize      int64 `json:"max_chunk_size"`
 	MaxSubmissionTime int64 `json:"max_submission_time"` // seconds

go.mod

@@ -44,7 +44,6 @@ require (
 	github.com/gogo/googleapis v1.4.1 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/mock v1.6.0 // indirect
-	github.com/google/brotli/go/cbrotli v0.0.0-20240715182736-39bcecf4559f // indirect
 	github.com/google/orderedcode v0.0.1 // indirect
 	github.com/google/s2a-go v0.1.7 // indirect
 	github.com/google/uuid v1.6.0 // indirect

go.sum

@@ -561,8 +561,6 @@ github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEW
 github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb h1:PBC98N2aIaM3XXiurYmW7fx4GZkL8feAMVq7nEjURHk=
 github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/google/brotli/go/cbrotli v0.0.0-20240715182736-39bcecf4559f h1:gMt4P0lp6wvToXa3UD8JocJxpt0yyXdG8SLfLMxkpKM=
-github.com/google/brotli/go/cbrotli v0.0.0-20240715182736-39bcecf4559f/go.mod h1:nOPhAkwVliJdNTkj3gXpljmWhjc4wCaVqbMJcPKWP4s=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/btree v1.1.2 h1:xf4v41cLI2Z6FxbKm+8Bu+m8ifhj15JuZ9sa0jZCMUU=

node/db.go

@@ -7,25 +7,12 @@ import (
 	"go.uber.org/zap"
 )
 
-<<<<<<< HEAD
-// should use safely
 func (n *Node) SetSyncInfo(height uint64) {
 	n.lastProcessedBlockHeight = height
 }
 
 func (n *Node) SaveSyncInfo(height uint64) error {
 	return n.db.Set(nodetypes.LastProcessedBlockHeightKey, dbtypes.FromUint64(height))
-||||||| 222d087
-func (n *Node) SaveSyncInfo() error {
-	return n.db.Set(nodetypes.LastProcessedBlockHeightKey, dbtypes.FromUint64(n.lastProcessedBlockHeight))
-=======
-//////////////
-// SyncInfo //
-//////////////
-
-func (n *Node) SaveSyncInfo() error {
-	return n.db.Set(nodetypes.LastProcessedBlockHeightKey, dbtypes.FromUint64(n.lastProcessedBlockHeight))
->>>>>>> feat/executor
 }
 
 func (n *Node) SyncInfoToRawKV(height uint64) types.RawKV {
@@ -108,19 +95,6 @@ func (n *Node) PendingTxsToRawKV(txInfos []nodetypes.PendingTxInfo, delete bool)
 	return kvs, nil
 }
 
-<<<<<<< HEAD
-func (n *Node) RawKVProcessedData(processedData []nodetypes.ProcessedMsgs, delete bool) ([]types.KV, error) {
-	kvs := make([]types.KV, 0, len(processedData))
-	for _, processedMsgs := range processedData {
-||||||| 222d087
-func (n *Node) RawKVProcessedData(processedData []nodetypes.ProcessedMsgs, delete bool) ([]types.KV, error) {
-	kvs := make([]types.KV, 0, len(processedData))
-	for _, processedMsgs := range processedData {
-		if !processedMsgs.Save {
-			continue
-		}
-
-=======
 ///////////////////
 // ProcessedMsgs //
 ///////////////////
@@ -130,24 +104,11 @@ func (n *Node) RawKVProcessedData(processedData []nodetypes.ProcessedMsgs, delet
 func (n *Node) ProcessedMsgsToRawKV(ProcessedMsgs []nodetypes.ProcessedMsgs, delete bool) ([]types.RawKV, error) {
 	kvs := make([]types.RawKV, 0, len(ProcessedMsgs))
 	for _, processedMsgs := range ProcessedMsgs {
-		if !processedMsgs.Save {
-			continue
-		}
-
->>>>>>> feat/executor
 		var data []byte
 		var err error
 
-<<<<<<< HEAD
 		if !delete && processedMsgs.Save {
-			data, err = processedMsgs.Marshal()
-||||||| 222d087
-		if !delete {
-			data, err = processedMsgs.Marshal()
-=======
-		if !delete {
 			data, err = processedMsgs.MarshalInterfaceJSON(n.cdc)
->>>>>>> feat/executor
 			if err != nil {
 				return nil, err
 			}