fix: if conditions and switchBlockNumber

Author: uri-99

aggregator/internal/pkg/aggregator.go

@@ -218,8 +218,7 @@ func (agg *Aggregator) Start(ctx context.Context) error {
 
 const MaxSentTxRetries = 5
 
-// const V2 = false
-var redeployBlockNumber = uint64(100)
+var switchBlockNumber = uint64(100)
 
 func (agg *Aggregator) handleBlsAggServiceResponse(blsAggServiceResp blsagg.BlsAggregationServiceResponse) {
 	if blsAggServiceResp.Err != nil {
@@ -284,8 +283,7 @@ func (agg *Aggregator) handleBlsAggServiceResponse(blsAggServiceResp blsagg.BlsA
 		"batchIdentifierHash", "0x"+hex.EncodeToString(batchIdentifierHash[:]))
 	current_task_block := agg.batchCreatedBlockByIdx[blsAggServiceResp.TaskIndex]
 	for i := 0; i < MaxSentTxRetries; i++ {
-		if current_task_block < redeployBlockNumber {
-		// if !V2 { //V1
+		if current_task_block < switchBlockNumber {
 			agg.logger.Info("agg if V1")
 			_, err = agg.sendAggregatedResponse(batchData.BatchMerkleRoot, nonSignerStakesAndSignature)
 			if err == nil {
@@ -299,8 +297,7 @@ func (agg *Aggregator) handleBlsAggServiceResponse(blsAggServiceResp blsagg.BlsA
 			// Sleep for a bit before retrying
 			time.Sleep(2 * time.Second)
 
-		} else if current_task_block > redeployBlockNumber {
-		// } else { //V2
+		} else {
 			agg.logger.Info("agg if V2")
 			_, err = agg.sendAggregatedResponseV2(batchData.BatchMerkleRoot, batchData.SenderAddress, nonSignerStakesAndSignature)
 			if err == nil {

aggregator/internal/pkg/subscriber.go

@@ -10,16 +10,13 @@ func (agg *Aggregator) SubscribeToNewTasks() error {
 		return err
 	}
 
-	// V2 := false
-	var redeployBlockNumber = uint32(100)
-
+	var switchBlockNumber = uint32(100)
 
 	for {
 		select {
 		case err := <-agg.taskSubscriber:
 			agg.AggregatorConfig.BaseConfig.Logger.Info("Failed to subscribe to new tasks", "err", err)
 
-			// if !V2 {
 			// TODO not sure if this is the best way, but no way to calculate blocknumber from here
 			err = agg.subscribeToNewTasks()
 			errV2 := agg.subscribeToNewTasksV2()
@@ -30,14 +27,12 @@ func (agg *Aggregator) SubscribeToNewTasks() error {
 				return err
 			}
 		case newBatch := <-agg.NewBatchChan:
-			if newBatch.TaskCreatedBlock < redeployBlockNumber {
-			// if !V2 {
+			if newBatch.TaskCreatedBlock < switchBlockNumber {
 				agg.AggregatorConfig.BaseConfig.Logger.Info("Adding new task, V1")
 				agg.AddNewTask(newBatch.BatchMerkleRoot, newBatch.TaskCreatedBlock)
 			}
 		case newBatchV2 := <-agg.NewBatchChanV2:
-			if newBatchV2.TaskCreatedBlock > redeployBlockNumber {
-			// if V2 {
+			if newBatchV2.TaskCreatedBlock >= switchBlockNumber {
 				agg.AggregatorConfig.BaseConfig.Logger.Info("Adding new task, V2")
 				agg.AddNewTaskV2(newBatchV2.BatchMerkleRoot, newBatchV2.SenderAddress, newBatchV2.TaskCreatedBlock)
 			}

operator/pkg/operator.go

@@ -149,10 +149,7 @@ func (o *Operator) Start(ctx context.Context) error {
 		metricsErrChan = make(chan error, 1)
 	}
 
-	var redeployBlockNumber = uint32(100)
-
-	// var V2 = false
-
+	var switchBlockNumber = uint32(100)
 
 	for {
 		select {
@@ -174,8 +171,7 @@ func (o *Operator) Start(ctx context.Context) error {
 				o.Logger.Fatal("Could not subscribe to new tasks")
 			}
 		case newBatchLog := <-o.NewTaskCreatedChan:
-			if newBatchLog.TaskCreatedBlock < redeployBlockNumber {
-			// if !V2 {
+			if newBatchLog.TaskCreatedBlock < switchBlockNumber {
 				o.Logger.Infof("Received new batch log: V1")
 				err := o.ProcessNewBatchLog(newBatchLog)
 				if err != nil {
@@ -198,8 +194,7 @@ func (o *Operator) Start(ctx context.Context) error {
 			} 
 
 		case newBatchLogV2 := <-o.NewTaskCreatedChanV2:
-			if newBatchLogV2.TaskCreatedBlock > redeployBlockNumber {
-			// if V2 {
+			if newBatchLogV2.TaskCreatedBlock >= switchBlockNumber {
 				o.Logger.Infof("Received new batch log: V2")
 				err := o.ProcessNewBatchLogV2(newBatchLogV2)
 				if err != nil {