Merge branch 'staging' into 1401-1414-aggregator-retry-improvements

Author: PatStiles

Makefile

@@ -6,7 +6,7 @@ OS := $(shell uname -s)
 CONFIG_FILE?=config-files/config.yaml
 AGG_CONFIG_FILE?=config-files/config-aggregator.yaml
 
-OPERATOR_VERSION=v0.10.3
+OPERATOR_VERSION=v0.11.1
 
 ifeq ($(OS),Linux)
 	BUILD_ALL_FFI = $(MAKE) build_all_ffi_linux

aggregator/pkg/server.go

@@ -6,11 +6,8 @@ import (
 	"fmt"
 	"net/http"
 	"net/rpc"
-	"strings"
 	"time"
 
-	"github.com/Layr-Labs/eigensdk-go/crypto/bls"
-	eigentypes "github.com/Layr-Labs/eigensdk-go/types"
 	retry "github.com/yetanotherco/aligned_layer/core"
 	"github.com/yetanotherco/aligned_layer/core/types"
 )
@@ -72,7 +69,7 @@ func (agg *Aggregator) ProcessOperatorSignedTaskResponseV2(signedTaskResponse *t
 
 	agg.logger.Info("Starting bls signature process")
 	go func() {
-		err := agg.ProcessNewSignatureRetryable(
+		err := agg.blsAggregationService.ProcessNewSignature(
 			context.Background(), taskIndex, signedTaskResponse.BatchIdentifierHash,
 			&signedTaskResponse.BlsSignature, signedTaskResponse.OperatorId,
 		)
@@ -99,9 +96,6 @@ func (agg *Aggregator) ProcessOperatorSignedTaskResponseV2(signedTaskResponse *t
 		*reply = 0
 	}
 
-	agg.AggregatorConfig.BaseConfig.Logger.Info("- Unlocked Resources: Task response processing finished")
-	agg.taskMutex.Unlock()
-
 	return nil
 }
 
@@ -112,48 +106,12 @@ func (agg *Aggregator) ServerRunning(_ *struct{}, reply *int64) error {
 	return nil
 }
 
-// |---RETRYABLE---|
-
-func ProcessNewSignatureFunc(agg *Aggregator, ctx context.Context, taskIndex uint32, taskResponse interface{}, blsSignature *bls.Signature, operatorId eigentypes.Bytes32) func() error {
-
-	processNewSignature_func := func() error {
-		err := agg.blsAggregationService.ProcessNewSignature(
-			ctx, taskIndex, taskResponse,
-			blsSignature, operatorId,
-		)
-		if err != nil {
-			if strings.Contains(err.Error(), "Failed to verify signature") {
-				err = retry.PermanentError{Inner: err}
-			}
-		}
-		return err
-	}
-	return processNewSignature_func
-}
-
-/*
-  - Errors:
-    Permanent:
-  - SignatureVerificationError: Verification of the sigature within the BLS Aggregation Service failed. (https://github.com/Layr-Labs/eigensdk-go/blob/dev/services/bls_aggregation/blsagg.go#L42).
-    Transient:
-  - All others.
-  - Retry times (3 retries): 12 sec (1 Blocks), 24 sec (2 Blocks), 48 sec (4 Blocks)
-  - NOTE: TaskNotFound errors from the BLS Aggregation service are Transient errors as block reorg's may lead to these errors being thrown.
-*/
-func (agg *Aggregator) ProcessNewSignatureRetryable(ctx context.Context, taskIndex uint32, taskResponse interface{}, blsSignature *bls.Signature, operatorId eigentypes.Bytes32) error {
-
-	return retry.Retry(ProcessNewSignatureFunc(agg, ctx, taskIndex, taskResponse, blsSignature, operatorId), retry.ChainRetryConfig())
-}
-
-func GetTaskIndexFunc(agg *Aggregator, batchIdentifierHash [32]byte) func() (uint32, error) {
-
+func (agg *Aggregator) GetTaskIndex(batchIdentifierHash [32]byte) (uint32, error) {
 	getTaskIndex_func := func() (uint32, error) {
 		agg.taskMutex.Lock()
-		agg.AggregatorConfig.BaseConfig.Logger.Info("- Locked Resources: Starting processing of Response")
 		taskIndex, ok := agg.batchesIdxByIdentifierHash[batchIdentifierHash]
+		agg.taskMutex.Unlock()
 		if !ok {
-			agg.taskMutex.Unlock()
-			agg.logger.Info("- Unlocked Resources: Task not found in the internal map")
 			return taskIndex, fmt.Errorf("Task not found in the internal map")
 		} else {
 			return taskIndex, nil

batcher/Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "aligned"
-version = "0.10.3"
+version = "0.11.1"
 edition = "2021"
 
 [dependencies]

batcher/aligned/Cargo.toml

@@ -2,7 +2,7 @@
   "addresses": {
     "alignedLayerProxyAdmin": "0x3eb924d928c138898FC089328f840105969bD6a0",
     "alignedLayerServiceManager": "0x58F280BeBE9B34c9939C3C39e0890C81f163B623",
-    "alignedLayerServiceManagerImplementation": "0x24F764c18609D5e92fC5646Ff0725280144E644b",
+    "alignedLayerServiceManagerImplementation": "0x48d70037cC01c31039d476CbbbAe2Aa36F86Ef16",
     "blsApkRegistry": "0xD0A725d82649f9e4155D7A60B638Fe33b3F25e3b",
     "blsApkRegistryImplementation": "0xB05BB98a966F58aDAB8dF58350b77fF2131A3b87",
     "indexRegistry": "0x4A7DE0a9fBBAa4fF0270d31852B363592F68B81F",
@@ -14,7 +14,8 @@
     "stakeRegistry": "0x51462D5511563A0F97Bb3Ce5475E1c3905b83F4b",
     "stakeRegistryImplementation": "0xd1555Be14931C061E06D3CE1D1Daadc1B3c6F8c7",
     "batcherPaymentService": "0x815aeCA64a974297942D2Bbf034ABEe22a38A003",
-    "batcherPaymentServiceImplementation": "0x07802Aa18a16E6F4d1a3411657a0f6b0a9Cb8Ea1"
+    "batcherPaymentServiceImplementation": "0x07802Aa18a16E6F4d1a3411657a0f6b0a9Cb8Ea1",
+    "pauserRegistry": "0x0CBc10A1142465B2042f3804107A7283044dC6eD"
   },
   "chainInfo": {
     "chainId": 17000,
@@ -26,6 +27,7 @@
     "alignedLayerEjector": "0x97aEC5F28181abe5d2aD40dBe7FbaEe014529b7D",
     "alignedLayerOwner": "0x97aEC5F28181abe5d2aD40dBe7FbaEe014529b7D",
     "alignedLayerUpgrader": "0x97aEC5F28181abe5d2aD40dBe7FbaEe014529b7D",
-    "pauserRegistry": "0x85Ef7299F8311B25642679edBF02B62FA2212F06"
+    "pauserRegistry": "0x85Ef7299F8311B25642679edBF02B62FA2212F06",
+    "alignedLayerPauser": "0x97aEC5F28181abe5d2aD40dBe7FbaEe014529b7D"
   }
 }

contracts/script/output/holesky/alignedlayer_deployment_output.json

@@ -15,6 +15,7 @@
     "stakeRegistryImplementation": "0x52A9e264b98fe2d53805937Bc094a981E7eB6BeE",
     "batcherPaymentService": "0x7577Ec4ccC1E6C529162ec8019A49C13F6DAd98b",
     "batcherPaymentServiceImplementation": "0x230FF8F073C188732856990b070485FD1A9b1039"
+    "pauserRegistry": "0xBCd09a605906a13F917230F82BdAC15B778A5B03"
   },
   "chainInfo": {
     "chainId": 17000,
@@ -25,7 +26,7 @@
     "alignedLayerEjector": "0xE3C695b73dbe27106aF4530b152de3e57456B385",
     "alignedLayerOwner": "0xE3C695b73dbe27106aF4530b152de3e57456B385",
     "alignedLayerUpgrader": "0xE3C695b73dbe27106aF4530b152de3e57456B385",
-    "pauserRegistry": "0x85Ef7299F8311B25642679edBF02B62FA2212F06",
-    "alignedLayerAggregator": "0x2855F89C56d3C94e98F61A3Dea5E9Ca0AA2FA946"
+    "alignedLayerAggregator": "0x2855F89C56d3C94e98F61A3Dea5E9Ca0AA2FA946",
+    "alignedLayerPauser": "0xE3C695b73dbe27106aF4530b152de3e57456B385"
   }
 }

contracts/script/output/holesky/alignedlayer_deployment_output.stage.json

@@ -12,7 +12,7 @@ To use this SDK in your Rust project, add the following to your `Cargo.toml`:
 
 ```toml
 [dependencies]
-aligned-sdk = { git = "https://github.com/yetanotherco/aligned_layer", tag="v0.10.3" }
+aligned-sdk = { git = "https://github.com/yetanotherco/aligned_layer", tag="v0.11.1" }
 ```
 
 To find the latest release tag go to [releases](https://github.com/yetanotherco/aligned_layer/releases) and copy the

docs/3_guides/1_SDK_how_to.md

@@ -1,7 +1,7 @@
 # Register as an Aligned operator in testnet
 
 > **CURRENT VERSION:**
-> Aligned Operator [v0.10.3](https://github.com/yetanotherco/aligned_layer/releases/tag/v0.10.3)
+> Aligned Operator [v0.11.1](https://github.com/yetanotherco/aligned_layer/releases/tag/v0.11.1)
 
 > **IMPORTANT:** 
 > You must be [whitelisted](https://docs.google.com/forms/d/e/1FAIpQLSdH9sgfTz4v33lAvwj6BvYJGAeIshQia3FXz36PFfF-WQAWEQ/viewform) to become an Aligned operator.
@@ -26,7 +26,7 @@ Minimum hardware requirements:
 To start with, clone the Aligned repository and move inside it
 
 ```bash
-git clone https://github.com/yetanotherco/aligned_layer.git --branch v0.10.3
+git clone https://github.com/yetanotherco/aligned_layer.git --branch v0.11.1
 cd aligned_layer
 ```