refactor(aggregator): move timeToExpiry task to config file (#1399)

Author: MarcosNicolau

aggregator/internal/pkg/aggregator.go

@@ -215,8 +215,6 @@ func (agg *Aggregator) Start(ctx context.Context) error {
 
 const MaxSentTxRetries = 5
 
-const BLS_AGG_SERVICE_TIMEOUT = 100 * time.Second
-
 func (agg *Aggregator) handleBlsAggServiceResponse(blsAggServiceResp blsagg.BlsAggregationServiceResponse) {
 	agg.taskMutex.Lock()
 	agg.AggregatorConfig.BaseConfig.Logger.Info("- Locked Resources: Fetching task data")
@@ -375,7 +373,7 @@ func (agg *Aggregator) AddNewTask(batchMerkleRoot [32]byte, senderAddress [20]by
 	quorumNums := eigentypes.QuorumNums{eigentypes.QuorumNum(QUORUM_NUMBER)}
 	quorumThresholdPercentages := eigentypes.QuorumThresholdPercentages{eigentypes.QuorumThresholdPercentage(QUORUM_THRESHOLD)}
 
-	err := agg.blsAggregationService.InitializeNewTask(batchIndex, taskCreatedBlock, quorumNums, quorumThresholdPercentages, BLS_AGG_SERVICE_TIMEOUT)
+	err := agg.blsAggregationService.InitializeNewTask(batchIndex, taskCreatedBlock, quorumNums, quorumThresholdPercentages, agg.AggregatorConfig.Aggregator.BlsServiceTaskTimeout)
 	// FIXME(marian): When this errors, should we retry initializing new task? Logging fatal for now.
 	if err != nil {
 		agg.logger.Fatalf("BLS aggregation service error when initializing new task: %s", err)

config-files/config-aggregator-docker.yaml

@@ -29,4 +29,5 @@ aggregator:
   telemetry_ip_port_address: localhost:4001
   garbage_collector_period: 2m #The period of the GC process. Suggested value for Prod: '168h' (7 days)
   garbage_collector_tasks_age: 20 #The age of tasks that will be removed by the GC, in blocks. Suggested value for prod: '216000' (30 days)
-  garbage_collector_tasks_interval: 10 #The interval of queried blocks to get an old batch. Suggested value for prod: '900' (3 hours)
+  garbage_collector_tasks_interval: 10 #The interval of queried blocks to get an old batch. Suggested value for prod: '900' (3 hours)
+  bls_service_task_timeout: 168h # The timeout of bls aggregation service tasks. Suggested value for prod '168h' (7 days)

config-files/config-aggregator.yaml

@@ -37,6 +37,7 @@ aggregator:
   garbage_collector_period: 2m #The period of the GC process. Suggested value for Prod: '168h' (7 days)
   garbage_collector_tasks_age: 20 #The age of tasks that will be removed by the GC, in blocks. Suggested value for prod: '216000' (30 days)
   garbage_collector_tasks_interval: 10 #The interval of queried blocks to get an old batch. Suggested value for prod: '900' (3 hours)
+  bls_service_task_timeout: 168h # The timeout of bls aggregation service tasks. Suggested value for prod '168h' (7 days)
 
 ## Operator Configurations
 # operator:

config-files/config.yaml

@@ -35,6 +35,7 @@ aggregator:
   avs_service_manager_address: 0xc3e53F4d16Ae77Db1c982e75a937B9f60FE63690
   enable_metrics: true
   metrics_ip_port_address: localhost:9091
+  bls_service_task_timeout: 168h # The timeout of bls aggregation service tasks. Suggested value for prod '168h' (7 days)
 
 ## Operator Configurations
 operator:

core/config/aggregator.go

@@ -24,6 +24,7 @@ type AggregatorConfig struct {
 		GarbageCollectorPeriod        time.Duration
 		GarbageCollectorTasksAge      uint64
 		GarbageCollectorTasksInterval uint64
+		BlsServiceTaskTimeout         time.Duration
 	}
 }
 
@@ -38,6 +39,7 @@ type AggregatorConfigFromYaml struct {
 		GarbageCollectorPeriod        time.Duration  `yaml:"garbage_collector_period"`
 		GarbageCollectorTasksAge      uint64         `yaml:"garbage_collector_tasks_age"`
 		GarbageCollectorTasksInterval uint64         `yaml:"garbage_collector_tasks_interval"`
+		BlsServiceTaskTimeout         time.Duration  `yaml:"bls_service_task_timeout"`
 	} `yaml:"aggregator"`
 }
 
@@ -82,6 +84,7 @@ func NewAggregatorConfig(configFilePath string) *AggregatorConfig {
 			GarbageCollectorPeriod        time.Duration
 			GarbageCollectorTasksAge      uint64
 			GarbageCollectorTasksInterval uint64
+			BlsServiceTaskTimeout         time.Duration
 		}(aggregatorConfigFromYaml.Aggregator),
 	}
 }