@merkl/api 0.20.90 → 0.20.92

package/dist/src/modules/v4/dynamicData/dynamicData.service.js

@@ -86,33 +86,38 @@ export class DynamicDataService {
                         }
                         const campaignDailyValue = await TokenService.getValueByTokenId(TokenService.hashId({ address: rewardToken, chainId }), dailyAmount);
                         dailyRewards.total += campaignDailyValue;
-                        dailyRewards.breakdowns.push({
-                            campaignId: CampaignService.hashId({
-                                campaignId: record.campaign.campaignId,
-                                distributionChain: record.campaign.chainId,
-                            }),
-                            value: campaignDailyValue,
-                            amount: dailyAmount,
-                            token,
-                        });
+                        if (campaignDailyValue > 0) {
+                            dailyRewards.breakdowns.push({
+                                campaignId: CampaignService.hashId({
+                                    campaignId: record.campaign.campaignId,
+                                    distributionChain: record.campaign.chainId,
+                                }),
+                                value: campaignDailyValue,
+                                amount: dailyAmount,
+                                token,
+                            });
+                        }
                         // 2.b.3 APR is obtained from daily rewards and tvl following the distribution type
                         // TODO: switch on distribution type - dailyRewards can be in token amount
-                        apr.cumulated += campaignDailyValue / record.tvl;
-                        apr.breakdowns.push({
-                            identifier: record.campaign.campaignId,
-                            type: AprType.CAMPAIGN,
-                            value: campaignDailyValue / record.tvl,
-                        });
+                        let aprCampaignValue;
+                        if (token.isPoint) {
+                            aprCampaignValue = campaignDailyValue / record.tvl;
+                        }
+                        else {
+                            aprCampaignValue = (campaignDailyValue * 365 * 100) / record.tvl;
+                        }
+                        if (aprCampaignValue > 0) {
+                            apr.cumulated += aprCampaignValue;
+                            apr.breakdowns.push({
+                                identifier: record.campaign.campaignId,
+                                type: AprType.CAMPAIGN,
+                                value: aprCampaignValue,
+                            });
+                        }
                     }
                     catch (_err) {
                         log.warn(`token ${rewardToken} not found`);
                     }
-                    updates.push({
-                        opportunityId,
-                        tvl,
-                        apr,
-                        dailyRewards,
-                    });
                 }
                 updates.push({
                     opportunityId,
@@ -122,66 +127,67 @@ export class DynamicDataService {
                 });
             }
             // 2.c - Update the records
-            for (const update of updates) {
-                try {
-                    if (!dryRun)
+            if (!dryRun) {
+                for (const update of updates) {
+                    try {
                         await OpportunityRepository.updateDynamicData(update.opportunityId, update.apr, update.tvl, update.dailyRewards);
+                    }
+                    catch (err) {
+                        throw new HttpError("Failed to update dynamic data", 500, {
+                            err,
+                            chainId,
+                            type,
+                        });
+                    }
                 }
-                catch (err) {
-                    throw new HttpError("Failed to update dynamic data", 500, {
-                        err,
-                        chainId,
-                        type,
-                    });
-                }
+                log.info(`[${NETWORK_LABELS[chainId]}][${CampaignEnum[type]}] updated ${updates.length}/${campaigns.length} campaigns using campaignTVLBuilder`);
             }
+            return updates;
         }
-        else {
-            const dynamicDataArray = [];
-            const dynamicData = await DynamicDataService.fetchWithRecursiveErrorHandling(dynamicDataBuilderFactory(type).build, campaigns, chainId);
-            const oppMap = {};
-            for (const data of dynamicData) {
-                if (!!data) {
-                    // Main Parameter OVERRIDING
-                    if (data.campaignType === CampaignEnum.SILO && data.campaignParameters.whitelist?.length === 1)
-                        data.mainParameter = `${data.mainParameter}-${data.campaignParameters.whitelist[0]}`;
-                    if (!oppMap[`${data.campaignType}_${data.mainParameter}`])
-                        oppMap[`${data.campaignType}_${data.mainParameter}`] = {};
-                    oppMap[`${data.campaignType}_${data.mainParameter}`][data.campaignId] = data;
-                }
+        const dynamicDataArray = [];
+        const dynamicData = await DynamicDataService.fetchWithRecursiveErrorHandling(dynamicDataBuilderFactory(type).build, campaigns, chainId);
+        const oppMap = {};
+        for (const data of dynamicData) {
+            if (!!data) {
+                // Main Parameter OVERRIDING
+                if (data.campaignType === CampaignEnum.SILO && data.campaignParameters.whitelist?.length === 1)
+                    data.mainParameter = `${data.mainParameter}-${data.campaignParameters.whitelist[0]}`;
+                if (!oppMap[`${data.campaignType}_${data.mainParameter}`])
+                    oppMap[`${data.campaignType}_${data.mainParameter}`] = {};
+                oppMap[`${data.campaignType}_${data.mainParameter}`][data.campaignId] = data;
             }
-            for (const entry of Object.entries(oppMap)) {
-                const [type, mainParameter] = entry[0].split("_");
-                const apr = AprService.extractFromDynamicData(+type, Object.values(entry[1]));
-                const tvl = TvlService.extractFromDynamicData(+type, Object.values(entry[1]));
-                const dailyRewards = await RewardService.extractDailyRewardsRecordFromDynamicData(+type, Object.values(entry[1]));
-                const opportunityId = OpportunityService.hashId({
-                    chainId,
-                    identifier: mainParameter,
-                    type: CampaignEnum[+type],
+        }
+        for (const entry of Object.entries(oppMap)) {
+            const [type, mainParameter] = entry[0].split("_");
+            const apr = AprService.extractFromDynamicData(+type, Object.values(entry[1]));
+            const tvl = TvlService.extractFromDynamicData(+type, Object.values(entry[1]));
+            const dailyRewards = await RewardService.extractDailyRewardsRecordFromDynamicData(+type, Object.values(entry[1]));
+            const opportunityId = OpportunityService.hashId({
+                chainId,
+                identifier: mainParameter,
+                type: CampaignEnum[+type],
+            });
+            try {
+                if (!dryRun)
+                    await OpportunityRepository.updateDynamicData(opportunityId, apr, tvl, dailyRewards);
+            }
+            catch (err) {
+                throw new HttpError("Failed to update dynamic data", 500, {
+                    err,
+                    opportunityId,
+                    campaigns: Object.values(entry[1]),
+                    dynamicData: bigintToString({
+                        campaignId: Object.values(entry[1])[0].campaignId,
+                        apr,
+                        tvl,
+                        dailyRewards,
+                    }),
                 });
-                try {
-                    if (!dryRun)
-                        await OpportunityRepository.updateDynamicData(opportunityId, apr, tvl, dailyRewards);
-                }
-                catch (err) {
-                    throw new HttpError("Failed to update dynamic data", 500, {
-                        err,
-                        opportunityId,
-                        campaigns: Object.values(entry[1]),
-                        dynamicData: bigintToString({
-                            campaignId: Object.values(entry[1])[0].campaignId,
-                            apr,
-                            tvl,
-                            dailyRewards,
-                        }),
-                    });
-                }
-                dynamicDataArray.push(bigintToString({ campaignId: Object.values(entry[1])[0].campaignId, apr, tvl, dailyRewards }));
             }
-            log.info(`[${NETWORK_LABELS[chainId]}][${CampaignEnum[type]}] updated ${dynamicData.length}/${campaigns.length} campaigns`);
-            return dynamicDataArray;
+            dynamicDataArray.push(bigintToString({ campaignId: Object.values(entry[1])[0].campaignId, apr, tvl, dailyRewards }));
         }
+        log.info(`[${NETWORK_LABELS[chainId]}][${CampaignEnum[type]}] updated ${dynamicData.length}/${campaigns.length} campaigns`);
+        return dynamicDataArray;
     }
     /**
      * @dev Test function used to create mock ERC20 static campaigns and check tvl and metadata

package/dist/src/modules/v4/router.d.ts

@@ -1197,7 +1197,7 @@ export declare const v4: Elysia<"/v4", false, {
                             authorization: string;
                         };
                         response: {
-                            200: unknown[] | undefined;
+                            200: unknown[];
                         };
                     };
                 };
@@ -1764,7 +1764,7 @@ export declare const v4: Elysia<"/v4", false, {
                                 authorization: string;
                             };
                             response: {
-                                200: unknown[] | undefined;
+                                200: unknown[];
                             };
                         };
                     };
@@ -1782,7 +1782,7 @@ export declare const v4: Elysia<"/v4", false, {
                                 authorization: string;
                             };
                             response: {
-                                200: unknown[] | undefined;
+                                200: unknown[];
                             };
                         };
                     };
@@ -1812,7 +1812,7 @@ export declare const v4: Elysia<"/v4", false, {
                             authorization: string;
                         };
                         response: {
-                            200: unknown[] | undefined;
+                            200: unknown[];
                         };
                     };
                 };