Merge branch 'main' into reward-publication-204

flare-foundation · Jul 9, 2024 · 5e6605f · 5e6605f
2 parents bce6a21 + 2af75ae
commit 5e6605f
Show file tree

Hide file tree

Showing 31 changed files with 183 additions and 508 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -13,6 +13,7 @@ COPY --from=nodemodules /app/node_modules /app/node_modules
 COPY . ./
 
 RUN yarn build
+RUN yarn build ftso-reward-calculation-process
 
 FROM node:18-slim as runtime
 

diff --git a/apps/ftso-reward-calculation-process/src/libs/claim-utils.ts b/apps/ftso-reward-calculation-process/src/libs/claim-utils.ts
@@ -8,22 +8,30 @@ import {
 import { fixOffersForRandomFeedSelection } from "../../../../libs/ftso-core/src/reward-calculation/reward-offers";
 import { RewardEpochDuration } from "../../../../libs/ftso-core/src/utils/RewardEpochDuration";
 import { sleepFor } from "../../../../libs/ftso-core/src/utils/retry";
-import { getIncrementalCalculationsTempRewards, serializeIncrementalCalculationsTempRewards } from "../../../../libs/ftso-core/src/utils/stat-info/incremental-calculation-temp-rewards";
+import {
+  getIncrementalCalculationsTempRewards,
+  serializeIncrementalCalculationsTempRewards,
+} from "../../../../libs/ftso-core/src/utils/stat-info/incremental-calculation-temp-rewards";
 import { recordProgress } from "../../../../libs/ftso-core/src/utils/stat-info/progress";
 import { IncrementalCalculationState } from "../interfaces/IncrementalCalculationState";
 import { OptionalCommandOptions } from "../interfaces/OptionalCommandOptions";
 import { extractRandomNumbers, processRandomNumberFixingRange } from "./random-number-fixing-utils";
 
 // claims
 
-export function claimAggregation(rewardEpochDuration: RewardEpochDuration, votingRoundId: number, logger: Logger, recordTempIncrementalRewards = false) {
+export function claimAggregation(
+  rewardEpochDuration: RewardEpochDuration,
+  votingRoundId: number,
+  logger: Logger,
+  recordTempIncrementalRewards = false
+) {
   logger.log(`Aggregating claims for voting round: ${votingRoundId}`);
   if (votingRoundId === rewardEpochDuration.startVotingRoundId) {
     aggregateRewardClaimsInStorage(rewardEpochDuration.rewardEpochId, votingRoundId, votingRoundId, true);
   } else {
     aggregateRewardClaimsInStorage(rewardEpochDuration.rewardEpochId, votingRoundId - 1, votingRoundId, false);
   }
-  if(recordTempIncrementalRewards) {
+  if (recordTempIncrementalRewards) {
     const data = getIncrementalCalculationsTempRewards(rewardEpochDuration.rewardEpochId, votingRoundId);
     serializeIncrementalCalculationsTempRewards(data);
   }
@@ -99,7 +107,8 @@ export function fixRandomNumbersAndOffers(state: IncrementalCalculationState, lo
       randomNumbers
     );
     logger.log(
-      `Offers fixed for reward epoch ${state.rewardEpochId + 1
+      `Offers fixed for reward epoch ${
+        state.rewardEpochId + 1
       } from voting rounds ${lastNextVotingRoundIdWithNoSecureRandom}-${state.nextVotingRoundIdWithNoSecureRandom - 1}.`
     );
   }
@@ -132,7 +141,6 @@ export async function calculateAndAggregateRemainingClaims(
       logger,
       false //options.useFastUpdatesData
     );
-
 
     logger.log(`Claims calculated for voting round ${tmpVotingRoundId}.`);
     recordProgress(state.rewardEpochId);

diff --git a/apps/ftso-reward-calculator/src/README.md b/apps/ftso-reward-calculator/src/README.md
diff --git a/apps/ftso-reward-calculator/src/config/configuration.ts b/apps/ftso-reward-calculator/src/config/configuration.ts
diff --git a/apps/ftso-reward-calculator/src/controllers/common/base-controller.ts b/apps/ftso-reward-calculator/src/controllers/common/base-controller.ts
diff --git a/apps/ftso-reward-calculator/src/controllers/ftso/ftso-reward.controller.ts b/apps/ftso-reward-calculator/src/controllers/ftso/ftso-reward.controller.ts
diff --git a/apps/ftso-reward-calculator/src/docs/reward-calculation-service-API.md b/apps/ftso-reward-calculator/src/docs/reward-calculation-service-API.md
diff --git a/apps/ftso-reward-calculator/src/dto/reward-claim.dto.ts b/apps/ftso-reward-calculator/src/dto/reward-claim.dto.ts
diff --git a/apps/ftso-reward-calculator/src/ftso-reward-calculator.module.ts b/apps/ftso-reward-calculator/src/ftso-reward-calculator.module.ts
diff --git a/apps/ftso-reward-calculator/src/main.ts b/apps/ftso-reward-calculator/src/main.ts
diff --git a/apps/ftso-reward-calculator/src/protocol-services/common/base.service.ts b/apps/ftso-reward-calculator/src/protocol-services/common/base.service.ts
diff --git a/apps/ftso-reward-calculator/src/protocol-services/ftso/ftso-reward.service.ts b/apps/ftso-reward-calculator/src/protocol-services/ftso/ftso-reward.service.ts
diff --git a/apps/ftso-reward-calculator/tsconfig.app.json b/apps/ftso-reward-calculator/tsconfig.app.json
diff --git a/libs/fsp-utils/src/SignaturePayload.ts b/libs/fsp-utils/src/SignaturePayload.ts
@@ -16,11 +16,6 @@ export interface ISignaturePayload {
   weight?: number;
 }
 
-export interface DepositSignatureData {
-  message: string;
-  additionalData: string;
-}
-
 export namespace SignaturePayload {
   /**
    * Encodes signature payload into byte encoding, represented by 0x-prefixed hex string

diff --git a/libs/ftso-core/src/configs/networks.ts b/libs/ftso-core/src/configs/networks.ts
@@ -141,7 +141,6 @@ const contracts = () => {
 export const CONTRACTS = contracts();
 
 export const ZERO_BYTES32 = "0x0000000000000000000000000000000000000000000000000000000000000000";
-export const ZERO_ADDRESS = "0x0000000000000000000000000000000000000000";
 
 // State names in indexer database
 export const LAST_CHAIN_INDEX_STATE = "last_chain_block";

diff --git a/libs/ftso-core/src/orm/entities.ts b/libs/ftso-core/src/orm/entities.ts
@@ -87,9 +87,6 @@ export class TLPEvents {
   block_number: number;
 }
 
-export type ITLPTransaction = new () => TLPTransaction;
-export type ITLPEvents = new () => TLPEvents;
-
 @Entity("states")
 export class TLPState {
   @PrimaryColumn()
@@ -108,5 +105,3 @@ export class TLPState {
   @Column({ type: "datetime", precision: 3, nullable: true })
   updated: Date = new Date();
 }
-
-export type ITPLState = new () => TLPState;