@merkl/api 0.10.275 → 0.10.277

package/dist/src/entities/opportunity.js

@@ -191,10 +191,9 @@ export const extractOpportunities = {
         };
         return opportunity;
     },
-    [Campaign.ERC20]: (campaign, campaigns, prices) => {
+    [Campaign.ERC20 | Campaign.ERC20LOGPROCESSOR | Campaign.ERC20REBASELOGPROCESSOR]: (campaign, campaigns, prices) => {
         const { chainId, tvl, campaignParameters: params, typeInfo, computeChainId, mainParameter } = campaign;
         const { active, all } = campaigns;
-        // DEPRECATED!!!!
         const map = {
             actions: {
                 pool: [

package/dist/src/libs/positions/prepareFetch.js

@@ -385,8 +385,6 @@ campaign //FIXME
             return prepareCompoundFetch(previous, campaign);
         case Campaign.EIGENLAYER:
             return prepareEigenLayerFetch(previous, campaign);
-        case Campaign.VEST:
-            return prepareEigenLayerFetch(previous, campaign);
         default:
             return previous;
     }

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

@@ -137,7 +137,7 @@ export class CampaignService {
      */
     static splitOnStatus(campaigns, timestamp = moment().unix()) {
         const past = campaigns.filter(({ endTimestamp: end }) => end <= timestamp);
-        const live = campaigns.filter(({ startTimestamp: start, endTimestamp: end }) => start >= timestamp && timestamp < end);
+        const live = campaigns.filter(({ startTimestamp: start, endTimestamp: end }) => timestamp >= start && timestamp < end);
         const soon = campaigns.filter(({ startTimestamp: start }) => start > timestamp);
         return { past, live, soon };
     }

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

@@ -22,7 +22,7 @@ import { getJsonAirdropMetadata } from "./subservices/getJsonAirDropMetadata.ser
 import { getMorphoMetadata } from "./subservices/getMorphoMetadata.service";
 import { getRadiantMetadata } from "./subservices/getRadiantMetadata.service";
 import { getSiloMetadata } from "./subservices/getSiloMetadata.service";
-import { getVestMetaData } from "./subservices/getVestMetaData";
+import { getVestMetaData } from "./subservices/getVestMetaData.service";
 export class OpportunityService {
     static hashId(opportunity) {
         return Bun.hash(`${opportunity.chainId}${opportunity.type}${opportunity.identifier}`).toString();
@@ -109,7 +109,7 @@ export class OpportunityService {
             type: campaignType,
             identifier: campaign.opportunityIdentifier, // mainParameter
             name: metadata.name,
-            status: +campaign.startTimestamp >= now && now < +campaign.endTimestamp
+            status: now >= +campaign.startTimestamp && now < +campaign.endTimestamp
                 ? Status.LIVE
                 : now > +campaign.endTimestamp
                     ? Status.PAST

package/dist/src/modules/v4/reward/reward.model.d.ts

@@ -225,6 +225,7 @@ export type UserRewardV3Model = typeof UserRewardV3Dto.static;
 export type RewardV3Model = typeof RewardV3Dto.static;
 export type BreakdownForCampaignsRaw = {
     amount: string;
+    pending: string;
     claimed: string;
     recipient: string;
     campaignId: string;

package/dist/src/modules/v4/reward/reward.repository.js

@@ -208,6 +208,7 @@ export class RewardRepository {
         rb."amount",
         rb."reason",
         rb."claimed",
+        rb."pending",
         r."recipient",
         t."address" as "rewardTokenAddress"
       FROM 
@@ -219,7 +220,7 @@ export class RewardRepository {
       WHERE 
         r."root" = $1 AND rb."campaignId" = $2
       ORDER BY 
-        rb."amount"::numeric DESC
+        (rb."amount"::numeric + rb."pending"::numeric) DESC
       LIMIT $3
       OFFSET $4
     `, root, id, items, items * page);
@@ -235,11 +236,12 @@ export class RewardRepository {
             },
             select: {
                 amount: true,
+                pending: true,
                 campaignId: true,
             },
         });
-        const reducedData = totalAmount.reduce((acc, { amount }) => {
-            acc.amount += BigInt(amount);
+        const reducedData = totalAmount.reduce((acc, { amount, pending }) => {
+            acc.amount += BigInt(amount) + BigInt(pending ?? 0);
             return acc;
         }, { campaignId, amount: 0n });
         return reducedData;