feat: support multiple quorums in Aggregator and AlignedLayerServiceManager

JuArce · JuArce · commit aea686a54eef · 2025-05-21T15:39:39.000-03:00
diff --git a/aggregator/pkg/aggregator.go b/aggregator/pkg/aggregator.go
@@ -28,8 +28,14 @@ import (
 )
 
 // FIXME(marian): Read this from Aligned contract directly
-const QUORUM_NUMBER = byte(0)
-const QUORUM_THRESHOLD = byte(67)
+const QuorumThreshold = byte(67)
+
+var QuorumNums = eigentypes.QuorumNums{eigentypes.QuorumNum(0)}
+var QuorumThresholdPercentages = eigentypes.QuorumThresholdPercentages{eigentypes.QuorumThresholdPercentage(QuorumThreshold)}
+
+// TODO: Use these once we have two quorums deployed
+//var QuorumNums = eigentypes.QuorumNums{eigentypes.QuorumNum(0), eigentypes.QuorumNum(1)}
+//var QuorumThresholdPercentages = eigentypes.QuorumThresholdPercentages{eigentypes.QuorumThresholdPercentage(QUORUM_THRESHOLD), eigentypes.QuorumThresholdPercentage(QUORUM_THRESHOLD)}
 
 // Aggregator stores TaskResponse for a task here
 type TaskResponses = []types.SignedTaskResponse
@@ -337,6 +343,7 @@ func (agg *Aggregator) sendAggregatedResponse(batchIdentifierHash [32]byte, batc
 		batchIdentifierHash,
 		batchMerkleRoot,
 		senderAddress,
+		QuorumNums,
 		nonSignerStakesAndSignature,
 		agg.AggregatorConfig.Aggregator.GasBaseBumpPercentage,
 		agg.AggregatorConfig.Aggregator.GasBumpIncrementalPercentage,
@@ -407,10 +414,7 @@ func (agg *Aggregator) AddNewTask(batchMerkleRoot [32]byte, senderAddress [20]by
 	)
 	agg.nextBatchIndex += 1
 
-	quorumNums := eigentypes.QuorumNums{eigentypes.QuorumNum(QUORUM_NUMBER)}
-	quorumThresholdPercentages := eigentypes.QuorumThresholdPercentages{eigentypes.QuorumThresholdPercentage(QUORUM_THRESHOLD)}
-
-	err := agg.blsAggregationService.InitializeNewTaskWithWindow(batchIndex, taskCreatedBlock, quorumNums, quorumThresholdPercentages, agg.AggregatorConfig.Aggregator.BlsServiceTaskTimeout, 15*time.Second)
+	err := agg.blsAggregationService.InitializeNewTaskWithWindow(batchIndex, taskCreatedBlock, QuorumNums, QuorumThresholdPercentages, agg.AggregatorConfig.Aggregator.BlsServiceTaskTimeout, 15*time.Second)
 	if err != nil {
 		agg.logger.Fatalf("BLS aggregation service error when initializing new task: %s", err)
 	}
diff --git a/contracts/bindings/AlignedLayerServiceManager/binding.go b/contracts/bindings/AlignedLayerServiceManager/binding.go
diff --git a/contracts/bindings/ERC20Mock/binding.go b/contracts/bindings/ERC20Mock/binding.go
diff --git a/contracts/lib/eigenlayer-middleware b/contracts/lib/eigenlayer-middleware
@@ -1 +1 @@
-Subproject commit c0863c378974f92e6cc5030c24aa0aecb5c5b7c5
+Subproject commit c2db0b8c11a7ce46848d95e4c37b45b1b2ddafc0
diff --git a/contracts/scripts/anvil/state/alignedlayer-deployed-anvil-state.json b/contracts/scripts/anvil/state/alignedlayer-deployed-anvil-state.json
diff --git a/contracts/src/core/AlignedLayerServiceManager.sol b/contracts/src/core/AlignedLayerServiceManager.sol
@@ -156,6 +156,7 @@ contract AlignedLayerServiceManager is
         // (batchMerkleRoot,senderAddress) is signed as a way to verify the batch was right
         bytes32 batchMerkleRoot,
         address senderAddress,
+        bytes calldata quorumNumbers,
         NonSignerStakesAndSignature memory nonSignerStakesAndSignature
     ) external onlyAggregator onlyWhenNotPaused(1) {
         uint256 initialGasLeft = gasleft();
@@ -194,22 +195,26 @@ contract AlignedLayerServiceManager is
         // check that aggregated BLS signature is valid
         (QuorumStakeTotals memory quorumStakeTotals, ) = checkSignatures(
             batchIdentifierHash,
+            quorumNumbers,
             currentBatch.taskCreatedBlock,
             nonSignerStakesAndSignature
         );
 
         // check that signatories own at least a threshold percentage of each quourm
-        if (
-            quorumStakeTotals.signedStakeForQuorum[0] * THRESHOLD_DENOMINATOR <
-            quorumStakeTotals.totalStakeForQuorum[0] *
-                QUORUM_THRESHOLD_PERCENTAGE
-        ) {
-            revert InvalidQuorumThreshold(
-                quorumStakeTotals.signedStakeForQuorum[0] *
-                    THRESHOLD_DENOMINATOR,
-                quorumStakeTotals.totalStakeForQuorum[0] *
+        for (uint256 i = 0; i < quorumStakeTotals.signedStakeForQuorum.length; i++) {
+            if (
+                quorumStakeTotals.signedStakeForQuorum[i] *
+                    THRESHOLD_DENOMINATOR <
+                quorumStakeTotals.totalStakeForQuorum[i] *
                     QUORUM_THRESHOLD_PERCENTAGE
-            );
+            ) {
+                revert InvalidQuorumThreshold(
+                    quorumStakeTotals.signedStakeForQuorum[i] *
+                        THRESHOLD_DENOMINATOR,
+                    quorumStakeTotals.totalStakeForQuorum[i] *
+                        QUORUM_THRESHOLD_PERCENTAGE
+                );
+            }
         }
 
         emit BatchVerified(batchMerkleRoot, senderAddress);
diff --git a/contracts/src/core/IAlignedLayerServiceManager.sol b/contracts/src/core/IAlignedLayerServiceManager.sol
@@ -46,6 +46,7 @@ interface IAlignedLayerServiceManager {
     function respondToTaskV2(
         bytes32 batchMerkleRoot,
         address senderAddress,
+        bytes calldata quorumNumbers,
         IBLSSignatureChecker.NonSignerStakesAndSignature
             memory nonSignerStakesAndSignature
     ) external;
diff --git a/core/chainio/avs_writer.go b/core/chainio/avs_writer.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/hex"
 	"fmt"
+	eigentypes "github.com/Layr-Labs/eigensdk-go/types"
 	"math/big"
 	"time"
 
@@ -89,10 +90,10 @@ func NewAvsWriterFromConfig(baseConfig *config.BaseConfig, ecdsaConfig *config.E
 //   - If no receipt is found, but the batch state indicates the response has already been processed, it exits
 //     without an error (returning `nil, nil`).
 //   - An error if the process encounters a fatal issue (e.g., permanent failure in verifying balances or state).
-func (w *AvsWriter) SendAggregatedResponse(batchIdentifierHash [32]byte, batchMerkleRoot [32]byte, senderAddress [20]byte, nonSignerStakesAndSignature servicemanager.IBLSSignatureCheckerNonSignerStakesAndSignature, gasBumpPercentage uint, gasBumpIncrementalPercentage uint, gasBumpPercentageLimit uint, timeToWaitBeforeBump time.Duration, metrics *metrics.Metrics, onSetGasPrice func(*big.Int)) (*types.Receipt, error) {
+func (w *AvsWriter) SendAggregatedResponse(batchIdentifierHash [32]byte, batchMerkleRoot [32]byte, senderAddress [20]byte, quorumNums eigentypes.QuorumNums, nonSignerStakesAndSignature servicemanager.IBLSSignatureCheckerNonSignerStakesAndSignature, gasBumpPercentage uint, gasBumpIncrementalPercentage uint, gasBumpPercentageLimit uint, timeToWaitBeforeBump time.Duration, metrics *metrics.Metrics, onSetGasPrice func(*big.Int)) (*types.Receipt, error) {
 	txOpts := *w.Signer.GetTxOpts()
 	txOpts.NoSend = true // simulate the transaction
-	simTx, err := w.RespondToTaskV2Retryable(&txOpts, batchMerkleRoot, senderAddress, nonSignerStakesAndSignature, retry.SendToChainRetryParams())
+	simTx, err := w.RespondToTaskV2Retryable(&txOpts, batchMerkleRoot, senderAddress, quorumNums, nonSignerStakesAndSignature, retry.SendToChainRetryParams())
 	if err != nil {
 		return nil, err
 	}
@@ -175,7 +176,7 @@ func (w *AvsWriter) SendAggregatedResponse(batchIdentifierHash [32]byte, batchMe
 		}
 
 		w.logger.Infof("Sending RespondToTask transaction with a gas price of %v", txOpts.GasPrice, "merkle root", batchMerkleRootHashString)
-		realTx, err := w.RespondToTaskV2Retryable(&txOpts, batchMerkleRoot, senderAddress, nonSignerStakesAndSignature, retry.SendToChainRetryParams())
+		realTx, err := w.RespondToTaskV2Retryable(&txOpts, batchMerkleRoot, senderAddress, quorumNums, nonSignerStakesAndSignature, retry.SendToChainRetryParams())
 		if err != nil {
 			w.logger.Errorf("Respond to task transaction err, %v", err, "merkle root", batchMerkleRootHashString)
 			return nil, err
diff --git a/core/chainio/retryable.go b/core/chainio/retryable.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"math/big"
 
+	eigentypes "github.com/Layr-Labs/eigensdk-go/types"
 	"github.com/ethereum/go-ethereum"
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/common"
@@ -22,13 +23,13 @@ Send a transaction to the AVS contract to respond to a task.
 - Retry times (3 retries): 12 sec (1 Blocks), 24 sec (2 Blocks), 48 sec (4 Blocks)
 - NOTE: Contract call reverts are not considered `PermanentError`'s as block reorg's may lead to contract call revert in which case the aggregator should retry.
 */
-func (w *AvsWriter) RespondToTaskV2Retryable(opts *bind.TransactOpts, batchMerkleRoot [32]byte, senderAddress common.Address, nonSignerStakesAndSignature servicemanager.IBLSSignatureCheckerNonSignerStakesAndSignature, config *retry.RetryParams) (*types.Transaction, error) {
+func (w *AvsWriter) RespondToTaskV2Retryable(opts *bind.TransactOpts, batchMerkleRoot [32]byte, senderAddress common.Address, quorumNums eigentypes.QuorumNums, nonSignerStakesAndSignature servicemanager.IBLSSignatureCheckerNonSignerStakesAndSignature, config *retry.RetryParams) (*types.Transaction, error) {
 	respondToTaskV2_func := func() (*types.Transaction, error) {
 		// Try with main connection
-		tx, err := w.AvsContractBindings.ServiceManager.RespondToTaskV2(opts, batchMerkleRoot, senderAddress, nonSignerStakesAndSignature)
+		tx, err := w.AvsContractBindings.ServiceManager.RespondToTaskV2(opts, batchMerkleRoot, senderAddress, quorumNums.UnderlyingType(), nonSignerStakesAndSignature)
 		if err != nil {
 			// If error try with fallback
-			tx, err = w.AvsContractBindings.ServiceManagerFallback.RespondToTaskV2(opts, batchMerkleRoot, senderAddress, nonSignerStakesAndSignature)
+			tx, err = w.AvsContractBindings.ServiceManagerFallback.RespondToTaskV2(opts, batchMerkleRoot, senderAddress, quorumNums.UnderlyingType(), nonSignerStakesAndSignature)
 		}
 
 		return tx, err
