fixes: fix

Author: uri-99

aggregator/internal/pkg/aggregator.go

@@ -43,7 +43,7 @@ type BatchData struct {
 type Aggregator struct {
 	AggregatorConfig      *config.AggregatorConfig
 	NewBatchChan          chan *servicemanager.ContractAlignedLayerServiceManagerNewBatch
-	NewBatchChanV2          chan *servicemanager.ContractAlignedLayerServiceManagerNewBatchV2
+	NewBatchChanV2        chan *servicemanager.ContractAlignedLayerServiceManagerNewBatchV2
 	avsReader             *chainio.AvsReader
 	avsSubscriber         *chainio.AvsSubscriber
 	avsWriter             *chainio.AvsWriter
@@ -93,6 +93,7 @@ type Aggregator struct {
 
 func NewAggregator(aggregatorConfig config.AggregatorConfig) (*Aggregator, error) {
 	newBatchChan := make(chan *servicemanager.ContractAlignedLayerServiceManagerNewBatch)
+	newBatchChanV2 := make(chan *servicemanager.ContractAlignedLayerServiceManagerNewBatchV2)
 
 	avsReader, err := chainio.NewAvsReaderFromConfig(aggregatorConfig.BaseConfig, aggregatorConfig.EcdsaConfig)
 	if err != nil {
@@ -163,6 +164,7 @@ func NewAggregator(aggregatorConfig config.AggregatorConfig) (*Aggregator, error
 		avsSubscriber:    avsSubscriber,
 		avsWriter:        avsWriter,
 		NewBatchChan:     newBatchChan,
+		NewBatchChanV2:   newBatchChanV2,
 
 		batchesIdentifierHashByIdx: batchesIdentifierHashByIdx,
 		batchesIdxByIdentifierHash: batchesIdxByIdentifierHash,
@@ -279,7 +281,8 @@ func (agg *Aggregator) handleBlsAggServiceResponse(blsAggServiceResp blsagg.BlsA
 		"batchIdentifierHash", "0x"+hex.EncodeToString(batchIdentifierHash[:]))
 
 	for i := 0; i < MaxSentTxRetries; i++ {
-		if true { //V1
+		if false { //V1
+			agg.logger.Info("agg if V1")
 			_, err = agg.sendAggregatedResponse(batchData.BatchMerkleRoot, nonSignerStakesAndSignature)
 			if err == nil {
 				agg.logger.Info("Aggregator successfully responded to task",
@@ -293,6 +296,7 @@ func (agg *Aggregator) handleBlsAggServiceResponse(blsAggServiceResp blsagg.BlsA
 			time.Sleep(2 * time.Second)
 
 		} else { //V2
+			agg.logger.Info("agg if V2")
 			_, err = agg.sendAggregatedResponseV2(batchData.BatchMerkleRoot, batchData.SenderAddress, nonSignerStakesAndSignature)
 			if err == nil {
 				agg.logger.Info("Aggregator successfully responded to task",

contracts/scripts/anvil/state/alignedlayer-deployed-anvil-state.json

@@ -83,7 +83,7 @@ defmodule AlignedLayerServiceManager do
 
   def get_new_batch_events(%{fromBlock: fromBlock, toBlock: toBlock}) do
     events =
-      AlignedLayerServiceManager.EventFilters.new_batch(nil)
+      AlignedLayerServiceManager.EventFilters.new_batch_v2(nil)
       |> Ethers.get_logs(fromBlock: fromBlock, toBlock: toBlock)
 
     case events do

explorer/lib/abi/AlignedLayerServiceManager.json

@@ -137,6 +137,10 @@ func (o *Operator) Start(ctx context.Context) error {
 	if err != nil {
 		log.Fatal("Could not subscribe to new tasks")
 	}
+	subV2, err := o.SubscribeToNewTasksV2()
+	if err != nil {
+		log.Fatal("Could not subscribe to new tasks")
+	}
 
 	var metricsErrChan <-chan error
 	if o.Config.Operator.EnableMetrics {
@@ -158,7 +162,14 @@ func (o *Operator) Start(ctx context.Context) error {
 			if err != nil {
 				o.Logger.Fatal("Could not subscribe to new tasks")
 			}
+		case err := <-subV2:
+			o.Logger.Infof("Error in websocket subscription", "err", err)
+			sub, err = o.SubscribeToNewTasks()
+			if err != nil {
+				o.Logger.Fatal("Could not subscribe to new tasks")
+			}
 		case newBatchLog := <-o.NewTaskCreatedChan:
+			o.Logger.Infof("Received new batch log: V1")
 			err := o.ProcessNewBatchLog(newBatchLog)
 			if err != nil {
 				o.Logger.Infof("batch %x did not verify. Err: %v", newBatchLog.BatchMerkleRoot, err)
@@ -178,6 +189,7 @@ func (o *Operator) Start(ctx context.Context) error {
 			)
 			go o.aggRpcClient.SendSignedTaskResponseToAggregator(&signedTaskResponse)
 		case newBatchLogV2 := <-o.NewTaskCreatedChanV2:
+			o.Logger.Infof("Received new batch log: V2")
 			err := o.ProcessNewBatchLogV2(newBatchLogV2)
 			if err != nil {
 				o.Logger.Infof("batch %x did not verify. Err: %v", newBatchLogV2.BatchMerkleRoot, err)