@@ -300,14 +300,16 @@ func (s *SignatureAggregator) selectSigningSubnet(
300300 log logging.Logger ,
301301 unsignedMessage * avalancheWarp.UnsignedMessage ,
302302 inputSigningSubnet ids.ID ,
303- ) (signingSubnetID ids.ID , sourceSubnetID ids.ID , err error ) {
304- sourceSubnetID , err = s .getSubnetID (ctx , log , unsignedMessage .SourceChainID )
303+ ) (ids.ID , ids.ID , error ) {
304+ sourceSubnetID , err : = s .getSubnetID (ctx , log , unsignedMessage .SourceChainID )
305305 if err != nil {
306306 return ids.ID {}, ids.ID {}, fmt .Errorf (
307307 "source message subnet not found for chainID %s" ,
308308 unsignedMessage .SourceChainID ,
309309 )
310310 }
311+
312+ var signingSubnetID ids.ID
311313 if inputSigningSubnet == ids .Empty {
312314 signingSubnetID = sourceSubnetID
313315 } else {
@@ -357,7 +359,7 @@ func (s *SignatureAggregator) collectSignaturesWithRetries(
357359 // Query the validators with retries. On each retry, query one node per unique BLS pubkey
358360 operation := func () error {
359361 // Construct the AppRequest
360- requestID := s .currentRequestID .Add (1 )
362+ requestID := s .currentRequestID .Add (2 )
361363 outMsg , err := s .messageCreator .AppRequest (
362364 unsignedMessage .SourceChainID ,
363365 requestID ,
@@ -591,7 +593,6 @@ func (s *SignatureAggregator) CreateSignedMessage(
591593 // For L1s, we must take care to *not* include inactive validators in the signature map.
592594 // Inactive validator's stake weight still contributes to the total weight, but the verifying
593595 // node will not be able to verify the aggregate signature if it includes an inactive validator.
594- signatureMap := make (map [int ][bls .SignatureLen ]byte )
595596 var excludedValidators set.Set [int ]
596597
597598 // Fetch L1 validators and find the node IDs with Balance < minimumL1ValidatorBalance
0 commit comments