feat: expand config

aggsender/aggsender.go

@@ -44,18 +44,17 @@ type AggSender struct {
 
 // New returns a new AggSender
 func New(
-	originNetwork uint32,
+	cfg Config,
 	reorgDetector localbridgesync.ReorgDetector,
 	aggLayerClient agglayer.AggLayerClient,
-	l2Client localbridgesync.EthClienter,
-	syncerCfg localbridgesync.LocalBridgeSyncerConfig) (*AggSender, error) {
-	syncer, err := localbridgesync.New(syncerCfg, reorgDetector, l2Client)
+	l2Client localbridgesync.EthClienter) (*AggSender, error) {
+	syncer, err := localbridgesync.New(cfg.LocalBridgeSyncer, reorgDetector, l2Client)
 	if err != nil {
 		return nil, err
 	}
 
 	db, err := mdbx.NewMDBX(nil).
-		Path(filepath.Join(syncerCfg.DBPath, aggSenderDBFolder)).
+		Path(filepath.Join(cfg.LocalBridgeSyncer.DBPath, aggSenderDBFolder)).
 		WithTableCfg(tableCfgFunc).
 		Open()
 	if err != nil {
@@ -66,8 +65,8 @@ func New(
 		db:             db,
 		syncer:         syncer,
 		client:         l2Client,
-		originNetwork:  originNetwork,
 		aggLayerClient: aggLayerClient,
+		originNetwork:  cfg.OriginNetwork,
 	}, nil
 }
 

aggsender/config.go

@@ -0,0 +1,10 @@
+package aggsender
+
+import "github.com/0xPolygon/cdk/localbridgesync"
+
+// Config is the configuration for the AggSender
+type Config struct {
+	OriginNetwork     uint32                 `mapstructure:"OriginNetwork"`
+	AggLayerUrl       string                 `mapstructure:"AggLayerUrl"`
+	LocalBridgeSyncer localbridgesync.Config `mapstructure:"LocalBridgeSyncer"`
+}

config/config.go

@@ -6,6 +6,7 @@ import (
 	"strings"
 
 	"github.com/0xPolygon/cdk/aggregator"
+	"github.com/0xPolygon/cdk/aggsender"
 	"github.com/0xPolygon/cdk/common"
 	ethermanconfig "github.com/0xPolygon/cdk/etherman/config"
 	"github.com/0xPolygon/cdk/log"
@@ -69,6 +70,8 @@ type Config struct {
 	SequenceSender sequencesender.Config
 	// Common Config that affects all the services
 	Common common.Config
+	// Configuration of the agg sender service
+	AggSender aggsender.Config
 }
 
 // Default parses the default configuration values.

config/default.go

@@ -118,4 +118,13 @@ SequencerPrivateKey = {}
 		[Aggregator.Synchronizer.Etherman]
 			[Aggregator.Synchronizer.Etherman.Validium]
 				Enabled = false
+
+[AggSender]
+OriginNetwork = 0
+AggLayerUrl = ""
+	[AggSender.LocalBridgeSyncer]
+		DBPath = "./db"
+		BridgeAddr = ""
+		SyncBlockChunkSize = "10"
+		BlockFinalityType = "finalized"
 `

localbridgesync/config.go

@@ -0,0 +1,14 @@
+package localbridgesync
+
+import (
+	"github.com/0xPolygon/cdk/etherman"
+	"github.com/ethereum/go-ethereum/common"
+)
+
+// Config struct for local bridge syncer
+type Config struct {
+	DBPath             string                       `mapstructure:"DBPath"`
+	BridgeAddr         common.Address               `mapstructure:"BridgeAddr"`
+	SyncBlockChunkSize uint64                       `mapstructure:"SyncBlockChunkSize"`
+	BlockFinalityType  etherman.BlockNumberFinality `mapstructure:"BlockFinalityType"`
+}

localbridgesync/localbridgesync.go

@@ -26,15 +26,15 @@ type LocalBridgeSync struct {
 }
 
 func New(
-	cfg LocalBridgeSyncerConfig,
+	cfg Config,
 	rd ReorgDetector,
 	l2Client EthClienter,
 ) (*LocalBridgeSync, error) {
 	p, err := newProcessor(cfg.DBPath)
 	if err != nil {
 		return nil, err
 	}
-	dwn, err := newDownloader(cfg.Bridge, l2Client, cfg.SyncBlockChunkSize, cfg.BlockFinalityType)
+	dwn, err := newDownloader(cfg.BridgeAddr, l2Client, cfg.SyncBlockChunkSize, cfg.BlockFinalityType)
 	if err != nil {
 		return nil, err
 	}