From 2b6b8946054db3cbd343db9c1e1496bf455f56aa Mon Sep 17 00:00:00 2001 From: Mauro Toscano <12560266+MauroToscano@users.noreply.github.com> Date: Wed, 20 Nov 2024 19:23:48 -0300 Subject: [PATCH 1/3] Add missing unlock (#1450) --- aggregator/pkg/server.go | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/aggregator/pkg/server.go b/aggregator/pkg/server.go index 0c3ee5c8b..fa27c141c 100644 --- a/aggregator/pkg/server.go +++ b/aggregator/pkg/server.go @@ -99,9 +99,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 } @@ -143,11 +140,9 @@ func (agg *Aggregator) ProcessNewSignature(ctx context.Context, taskIndex uint32 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 From 8f2e471184cf0478dd626460012d7eb229ac3c34 Mon Sep 17 00:00:00 2001 From: Mauro Toscano <12560266+MauroToscano@users.noreply.github.com> Date: Wed, 20 Nov 2024 19:38:03 -0300 Subject: [PATCH 2/3] Remove retry on signature (#1451) --- aggregator/pkg/server.go | 33 +-------------------------------- 1 file changed, 1 insertion(+), 32 deletions(-) diff --git a/aggregator/pkg/server.go b/aggregator/pkg/server.go index fa27c141c..1eccfeb78 100644 --- a/aggregator/pkg/server.go +++ b/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.ProcessNewSignature( + err := agg.blsAggregationService.ProcessNewSignature( context.Background(), taskIndex, signedTaskResponse.BatchIdentifierHash, &signedTaskResponse.BlsSignature, signedTaskResponse.OperatorId, ) @@ -109,34 +106,6 @@ func (agg *Aggregator) ServerRunning(_ *struct{}, reply *int64) error { return nil } -// |---RETRYABLE---| - -/* - - 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) ProcessNewSignature(ctx context.Context, taskIndex uint32, taskResponse interface{}, blsSignature *bls.Signature, operatorId eigentypes.Bytes32) 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 retry.Retry(processNewSignature_func, retry.MinDelayChain, retry.RetryFactor, retry.NumRetries, retry.MaxIntervalChain, retry.MaxElapsedTime) -} - func (agg *Aggregator) GetTaskIndex(batchIdentifierHash [32]byte) (uint32, error) { getTaskIndex_func := func() (uint32, error) { agg.taskMutex.Lock() From cfd61ace269eaa7bf2776f38c4aeed13bc65afaf Mon Sep 17 00:00:00 2001 From: Julian Arce <52429267+JuArce@users.noreply.github.com> Date: Wed, 20 Nov 2024 19:47:16 -0300 Subject: [PATCH 3/3] update version (#1453) --- Makefile | 2 +- batcher/Cargo.lock | 2 +- batcher/aligned/Cargo.toml | 2 +- .../output/holesky/alignedlayer_deployment_output.json | 8 +++++--- .../holesky/alignedlayer_deployment_output.stage.json | 5 +++-- docs/3_guides/1_SDK_how_to.md | 2 +- docs/operator_guides/0_running_an_operator.md | 4 ++-- 7 files changed, 14 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 213ef2979..83546f6ec 100644 --- a/Makefile +++ b/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 diff --git a/batcher/Cargo.lock b/batcher/Cargo.lock index 6155d4b03..3eacd7766 100644 --- a/batcher/Cargo.lock +++ b/batcher/Cargo.lock @@ -72,7 +72,7 @@ dependencies = [ [[package]] name = "aligned" -version = "0.10.3" +version = "0.11.1" dependencies = [ "aligned-sdk", "clap", diff --git a/batcher/aligned/Cargo.toml b/batcher/aligned/Cargo.toml index 97ad2787c..0119bc852 100644 --- a/batcher/aligned/Cargo.toml +++ b/batcher/aligned/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "aligned" -version = "0.10.3" +version = "0.11.1" edition = "2021" [dependencies] diff --git a/contracts/script/output/holesky/alignedlayer_deployment_output.json b/contracts/script/output/holesky/alignedlayer_deployment_output.json index b4baa08b4..663f7695b 100644 --- a/contracts/script/output/holesky/alignedlayer_deployment_output.json +++ b/contracts/script/output/holesky/alignedlayer_deployment_output.json @@ -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" } } diff --git a/contracts/script/output/holesky/alignedlayer_deployment_output.stage.json b/contracts/script/output/holesky/alignedlayer_deployment_output.stage.json index a1f728aff..fd1fa126c 100644 --- a/contracts/script/output/holesky/alignedlayer_deployment_output.stage.json +++ b/contracts/script/output/holesky/alignedlayer_deployment_output.stage.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" } } diff --git a/docs/3_guides/1_SDK_how_to.md b/docs/3_guides/1_SDK_how_to.md index a42dcd090..ef16af8ac 100644 --- a/docs/3_guides/1_SDK_how_to.md +++ b/docs/3_guides/1_SDK_how_to.md @@ -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 diff --git a/docs/operator_guides/0_running_an_operator.md b/docs/operator_guides/0_running_an_operator.md index 6a4296263..cfdcbaddb 100644 --- a/docs/operator_guides/0_running_an_operator.md +++ b/docs/operator_guides/0_running_an_operator.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 ```