Merge branch 'type1-ftso-fix-no-finalizations' into 'main'

no finalizations ftso fix, fdc min conditions

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

Author: adg-flare

libs/fsp-rewards/src/DataManagerForRewarding.ts

@@ -448,18 +448,30 @@ export class DataManagerForRewarding extends DataManager {
         FTSO2_PROTOCOL_ID
       );
       const firstSuccessfulFinalization = finalizations.find(finalization => finalization.successfulOnChain);
-      RelayMessage.augment(firstSuccessfulFinalization.messages);
-      const consensusMessageHashFTSO = firstSuccessfulFinalization.messages.protocolMessageHash;
-
-      const signatures = DataManagerForRewarding.extractSignatures(
-        votingRoundId,
-        rewardEpoch,
-        votingRoundSignatures,
-        FTSO2_PROTOCOL_ID,
-        consensusMessageHashFTSO,
-        this.logger
-      );
-
+      let signatures: Map<MessageHash, GenericSubmissionData<ISignaturePayload>[]> = new Map<
+        MessageHash,
+        GenericSubmissionData<ISignaturePayload>[]
+      >();
+      if (!firstSuccessfulFinalization) {
+        this.logger.warn(`No successful finalization found for voting round ${votingRoundId}`);
+      }
+      if (firstSuccessfulFinalization) {
+        RelayMessage.augment(firstSuccessfulFinalization.messages);
+        if (!firstSuccessfulFinalization.messages.protocolMessageHash) {
+          throw new Error(
+            `Protocol message merkle root is missing for FTSO finalization ${firstSuccessfulFinalization.messages.protocolMessageHash}`
+          );
+        }
+        const consensusMessageHashFTSO = firstSuccessfulFinalization.messages.protocolMessageHash;
+        signatures = DataManagerForRewarding.extractSignatures(
+          votingRoundId,
+          rewardEpoch,
+          votingRoundSignatures,
+          FTSO2_PROTOCOL_ID,
+          consensusMessageHashFTSO,
+          this.logger
+        );
+      }
       let fdcData: FDCDataForVotingRound | undefined;
       let fdcRewardData: FDCRewardData | undefined;
       let consensusBitVoteIndices: number[] = [];

libs/fsp-rewards/src/reward-calculation/minimal-conditions/minimal-conditions.ts

@@ -36,8 +36,6 @@ import {
   StakingConditionSummary,
   ValidatorInfo,
 } from "./minimal-conditions-interfaces";
-// remove this and appearances of this when min conditions for FDC start to get used.
-const FDC_MIN_CONDITIONS_IGNORE = true;
 
 function networkId() {
   if (process.env.NETWORK === "flare") {
@@ -384,7 +382,7 @@ export function calculateMinimalConditions(rewardEpochId: number): DataProviderC
       fastUpdates.conditionMet &&
       staking.conditionMet &&
       !staking.obstructsPass &&
-      (fdc.conditionMet || FDC_MIN_CONDITIONS_IGNORE)
+      fdc.conditionMet
     ) {
       passEarned = true;
     }
@@ -398,7 +396,7 @@ export function calculateMinimalConditions(rewardEpochId: number): DataProviderC
     if (!staking.conditionMet) {
       strikes++;
     }
-    if (!fdc.conditionMet && !FDC_MIN_CONDITIONS_IGNORE) {
+    if (!fdc.conditionMet) {
       strikes++;
     }