Merge pull request #850 from ava-labs/signature-aggregator-requestnum

Signature aggregator requestnum

Author: anviimishra

signature-aggregator/aggregator/aggregator.go

@@ -108,7 +108,8 @@ func NewSignatureAggregator(
 		pChainClientOptions:      pChainClientOptions,
 		currentL1ValidatorsCache: cache.NewTTLCache[ids.ID, []platformvmapi.APIL1Validator](l1ValidatorBalanceTTL),
 	}
-	sa.currentRequestID.Store(rand.Uint32())
+	// invariant: requestIDs for AppRequests must be odd numbered
+	sa.currentRequestID.Store(rand.Uint32() | 1)
 	return &sa, nil
 }
 
@@ -354,7 +355,8 @@ func (s *SignatureAggregator) CreateSignedMessage(
 	// Query the validators with retries. On each retry, query one node per unique BLS pubkey
 	operation := func() error {
 		// Construct the AppRequest
-		requestID := s.currentRequestID.Add(1)
+		// Increments by two to keep the requestID odd
+		requestID := s.currentRequestID.Add(2)
 		outMsg, err := s.messageCreator.AppRequest(
 			unsignedMessage.SourceChainID,
 			requestID,

signature-aggregator/aggregator/aggregator_test.go

@@ -239,7 +239,7 @@ func TestCreateSignedMessageRetriesAndFailsWithoutP2PResponses(t *testing.T) {
 
 	var (
 		connectedValidators, _ = makeConnectedValidators(2)
-		requestID              = aggregator.currentRequestID.Load() + 1
+		requestID              = aggregator.currentRequestID.Load() + 2
 	)
 
 	chainID := ids.GenerateTestID()
@@ -266,14 +266,14 @@ func TestCreateSignedMessageRetriesAndFailsWithoutP2PResponses(t *testing.T) {
 		// Expect at most one call to RegisterAppRequest per node per retry for up to [maxAppRequestRetries] retries
 		for i := uint32(0); i < maxAppRequestRetries; i++ {
 			appRequestCopy := appRequest
-			appRequestCopy.RequestID = appRequest.RequestID + i
+			appRequestCopy.RequestID = appRequest.RequestID + i*2
 			mockNetwork.EXPECT().RegisterAppRequest(appRequestCopy).MaxTimes(1)
 		}
 	}
 
 	for i := uint32(0); i < maxAppRequestRetries; i++ {
 		mockNetwork.EXPECT().RegisterRequestID(
-			requestID+i,
+			requestID+i*2,
 			nodeIDs,
 		).Return(
 			make(chan message.InboundMessage, len(appRequests)),
@@ -357,7 +357,7 @@ func TestCreateSignedMessageSucceeds(t *testing.T) {
 
 			// prime the signers' responses:
 
-			requestID := aggregator.currentRequestID.Load() + 1
+			requestID := aggregator.currentRequestID.Load() + 2
 
 			appRequests := makeAppRequests(chainID, requestID, connectedValidators)
 			for _, appRequest := range appRequests {