feat: reading of blockNumber insteadof B2 bool

Author: uri-99

aggregator/cmd/main.go

@@ -49,8 +49,7 @@ func aggregatorMain(ctx *cli.Context) error {
 		return err
 	}
 
-	// Listen for new task created in the ServiceManager contract in a separate goroutine
-	// Both V1 and V2 subscriptions:
+	// Listen for new task created in the ServiceManager contract in a separate goroutine, both V1 and V2 subscriptions:
 	go func() {
 		listenErr := aggregator.SubscribeToNewTasks()
 		if listenErr != nil {

aggregator/internal/pkg/subscriber.go

@@ -10,31 +10,34 @@ func (agg *Aggregator) SubscribeToNewTasks() error {
 		return err
 	}
 
-	V2 := false
+	// V2 := false
+	var redeployBlockNumber = uint32(150)
+
 
 	for {
 		select {
 		case err := <-agg.taskSubscriber:
 			agg.AggregatorConfig.BaseConfig.Logger.Info("Failed to subscribe to new tasks", "err", err)
 
-			if !V2 {
-				err = agg.subscribeToNewTasks()
-				if err != nil {
-					return err
-				}
-			} else {
-				err = agg.subscribeToNewTasksV2()
-				if err != nil {
-					return 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()
+			if err != nil {
+				return err
+			}
+			if errV2 != nil {
+				return err
 			}
 		case newBatch := <-agg.NewBatchChan:
-			if !V2 {
+			if newBatch.TaskCreatedBlock < redeployBlockNumber {
+			// if !V2 {
 				agg.AggregatorConfig.BaseConfig.Logger.Info("Adding new task, V1")
 				agg.AddNewTask(newBatch.BatchMerkleRoot, newBatch.TaskCreatedBlock)
 			}
 		case newBatchV2 := <-agg.NewBatchChanV2:
-			if V2 {
+			if newBatchV2.TaskCreatedBlock > redeployBlockNumber {
+			// if V2 {
 				agg.AggregatorConfig.BaseConfig.Logger.Info("Adding new task, V2")
 				agg.AddNewTaskV2(newBatchV2.BatchMerkleRoot, newBatchV2.SenderAddress, newBatchV2.TaskCreatedBlock)
 			}

operator/pkg/operator.go

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