Merge branch 'andrius/fdc-reward-sig-fix' into 'main'

Rewards: FDC signature parsing - fix grouping for "wrong" signatures.

See merge request flarenetwork/ftso/ftso-scaling!151

Author: adg-flare

libs/fsp-rewards/src/DataManagerForRewarding.ts

@@ -300,12 +300,12 @@ export class DataManagerForRewarding extends DataManager {
                 `Critical error: signerToSigningWeight or signerToDelegationAddress is not defined for signer ${signer}`
               );
             }
-            const signatures = signatureMap.get(messageHash) || [];
+            const signatures = signatureMap.get(signaturePayload.messageHash) || [];
             const submissionData: GenericSubmissionData<ISignaturePayload> = {
               ...submission,
               messages: signaturePayload,
             };
-            signatureMap.set(messageHash, signatures);
+            signatureMap.set(signaturePayload.messageHash, signatures);
             signatures.push(submissionData);
           }
         } catch (e) {

libs/fsp-rewards/src/reward-calculation/reward-offers.ts

@@ -100,7 +100,7 @@ export function granulatedPartialOfferMapForRandomFeedSelection(
     } else {
       const adaptedCommunityOffer = PartialRewardOffer.fromRewardOffered(rewardOffer);
       adaptCommunityRewardOffer(adaptedCommunityOffer);
-      currencyRewardOffers.set(rewardOffer.feedId, PartialRewardOffer.fromRewardOffered(rewardOffer));
+      currencyRewardOffers.set(rewardOffer.feedId, adaptedCommunityOffer);
     }
   }
   // Create a map of votingRoundId -> feedId -> rewardOffer