Merge branch 'andrius/fdc-rewarding-fixes' into 'main'

FDC rewarding bugfixes

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

Author: adg-flare

apps/ftso-reward-calculation-process/src/libs/attestation-type-appearances.ts

@@ -22,7 +22,7 @@ export function calculateAttestationTypeAppearances(rewardEpochId: number): void
    const attestationTypeCount = new Map<string, number>();
    for (
       let votingRoundId = rewardEpochInfo.signingPolicy.startVotingRoundId;
-      votingRoundId < rewardEpochInfo.endVotingRoundId;
+      votingRoundId <= rewardEpochInfo.endVotingRoundId;
       votingRoundId++
    ) {
       const currentCalculationData = deserializeDataForRewardCalculation(

libs/fsp-rewards/src/DataManagerForRewarding.ts

@@ -238,7 +238,7 @@ export class DataManagerForRewarding extends DataManager {
     providedMessageHash: MessageHash | undefined = undefined,
     logger: ILogger
   ): Map<MessageHash, GenericSubmissionData<ISignaturePayload>[]> {
-    const signatureMap = new Map<MessageHash, Map<Address, GenericSubmissionData<ISignaturePayload>>>();
+    const signatureMap = new Map<MessageHash, GenericSubmissionData<ISignaturePayload>[]>();
     for (const submission of submissions) {
       for (const message of submission.messages) {
         try {
@@ -300,14 +300,13 @@ export class DataManagerForRewarding extends DataManager {
                 `Critical error: signerToSigningWeight or signerToDelegationAddress is not defined for signer ${signer}`
               );
             }
-            const signatures =
-              signatureMap.get(messageHash) || new Map<Address, GenericSubmissionData<ISignaturePayload>>();
+            const signatures = signatureMap.get(messageHash) || [];
             const submissionData: GenericSubmissionData<ISignaturePayload> = {
               ...submission,
               messages: signaturePayload,
             };
             signatureMap.set(messageHash, signatures);
-            signatures.set(signer, submissionData);
+            signatures.push(submissionData);
           }
         } catch (e) {
           console.log(e)

libs/fsp-rewards/src/reward-calculation/fdc/fdc-utils.ts

@@ -20,7 +20,7 @@ export function uniqueRequestsIndices(attestationRequests: AttestationRequest[])
    const result: number[][] = [];
    for (let i = 0; i < attestationRequests.length; i++) {
       const request = attestationRequests[i];
-      if (!encountered.get(request.data)) {
+      if (encountered.get(request.data) == undefined) {
          encountered.set(request.data, result.length);
          result.push([i]);
       } else {