@merkl/api 0.20.89 → 0.20.90

package/dist/src/engine/dynamicData/implementations/EventBased.js

@@ -75,16 +75,23 @@ export class EventBasedDynamicData {
                 const isLive = moment().unix() > startTimestamp && moment().unix() < endTimestamp;
                 let distributionMeanAPR = 0;
                 const priceRewardToken = await TokenService.getRewardTokenPrice(campaign);
+                const rewardTokens = await TokenService.findManyOrCreate([
+                    { chainId: campaign.chainId, address: campaign.rewardToken },
+                ]);
+                const rewardToken = rewardTokens[0];
                 const tvl = distributedRewards / multiplier;
                 if (isLive) {
                     /** Yearly rewards in $ */
-                    const fixRewardRate = multiplier * priceRewardToken;
-                    distributionMeanAPR = fixRewardRate;
+                    let fixRewardRate = multiplier * priceRewardToken;
                     if (distributedRewards > (amount * (moment().unix() - startTimestamp)) / (endTimestamp - startTimestamp)) {
-                        distributionMeanAPR =
+                        fixRewardRate =
                             (fixRewardRate * amount * (moment().unix() - startTimestamp)) / (endTimestamp - startTimestamp) / tvl;
                     }
+                    distributionMeanAPR = fixRewardRate * 365 * 100;
                     distributionMeanAPR = !distributionMeanAPR || Number.isNaN(distributionMeanAPR) ? 0 : distributionMeanAPR;
+                    if (rewardToken.isPoint) {
+                        distributionMeanAPR = distributionMeanAPR / 365 / 100;
+                    }
                     dynamicData.push({
                         ...campaign,
                         apr: distributionMeanAPR,

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

@@ -280,9 +280,6 @@ export class CampaignService {
     static format(campaign) {
         const { DistributionChain, ComputeChain, Creator, RewardToken, params, CampaignStatus, createdAt, manualOverrides: _, ...c } = campaign;
         const updatedParams = params;
-        if (ComputeChain.name === "Etherlink") {
-            updatedParams.blacklist = [];
-        }
         return {
             ...c,
             params: updatedParams,

package/dist/src/modules/v4/opportunity/opportunity.controller.js

@@ -1,6 +1,7 @@
 import { HttpErrorDto, NotFoundError, NotFoundErrorDto } from "@/errors";
 import { BackOfficeGuard } from "@/guards/BackOffice.guard";
 import { AuthorizationHeadersDto, TokenAuthGuard } from "@/guards/TokenAuth.guard";
+import { ChainId } from "@sdk";
 import Elysia, { t } from "elysia";
 import { GetCampaignQueryDto } from "../campaign";
 import { CreateOpportunityDto, GetOpportunitiesQueryDto, GetOpportunityQueryDto, OpportunityAggregateFieldDto, OpportunityDeleteOverrideDto, OpportunityOverrideDto, OpportunityResourceDto, OpportunityUniqueDto, OpportunityUniqueUpdateDto, OpportunityWithCampaignsResourceDto, } from "./opportunity.model";
@@ -119,11 +120,23 @@ export const OpportunityController = new Elysia({
         if (!params.id.includes("-"))
             return await OpportunityService.getUniqueWithCampaignsOrThrow(params.id, query.test ?? false, query.point ?? false);
         const [chainId, type, identifier] = params.id.split("-");
-        return await OpportunityService.getUniqueWithCampaignsOrThrow({
+        const response = await OpportunityService.getUniqueWithCampaignsOrThrow({
             chainId: +chainId,
             type: type,
             identifier,
         }, query.test ?? false, query.point ?? false);
+        if (response.chainId === ChainId.ETHERLINK) {
+            const campaigns = response.campaigns;
+            for (let campaign of Object.values(campaigns)) {
+                const updatedParams = campaign.params;
+                updatedParams.blacklist = [];
+                campaign = {
+                    ...campaign,
+                    params: updatedParams,
+                };
+            }
+        }
+        return response;
     }
     catch (err) {
         if (err.code && err.code === "P2025")

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

@@ -107,7 +107,7 @@ export class OpportunityService {
         const sortedCampaigns = opportunity?.Campaigns.filter(campaign => campaignId ? campaign.campaignId === campaignId : true).sort((a, b) => Number(b.endTimestamp) - Number(a.endTimestamp));
         let firstCampaign = sortedCampaigns[0];
         const firstCampaigns = sortedCampaigns.filter(campaign => campaign.startTimestamp <= BigInt(moment().unix()));
-        if (firstCampaigns.length >= 0)
+        if (firstCampaigns.length > 0)
             firstCampaign = firstCampaigns[0];
         return await OpportunityService.createFromCampaign({
             ...firstCampaign,