@merkl/api 0.10.273 → 0.10.275

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 && end > timestamp);
+        const live = campaigns.filter(({ startTimestamp: start, endTimestamp: end }) => start >= timestamp && timestamp < end);
         const soon = campaigns.filter(({ startTimestamp: start }) => start > timestamp);
         return { past, live, soon };
     }

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

@@ -3,6 +3,7 @@ import { CampaignService, campaignTypeToEnumMap } from "../campaign";
 import { log } from "../../../utils/logger";
 import { OpportunityAction, Prisma, Status } from "../../../../database/api/.generated";
 import { record } from "@elysiajs/opentelemetry";
+import moment from "moment";
 import { CacheService } from "../cache";
 import { TTLPresets } from "../cache/cache.model";
 import { TokenService } from "../token";
@@ -101,15 +102,16 @@ export class OpportunityService {
         });
         const tokens = (await TokenService.getManyOrCreate(metadata.tokens)).filter(t => t !== undefined);
         const params = JSON.parse(campaign.params);
+        const now = moment().unix();
         const opportunity = {
             id: opportunityId,
             chainId: campaign.computeChainId,
             type: campaignType,
             identifier: campaign.opportunityIdentifier, // mainParameter
             name: metadata.name,
-            status: +campaign.startTimestamp >= new Date().getTime() * 1000
+            status: +campaign.startTimestamp >= now && now < +campaign.endTimestamp
                 ? Status.LIVE
-                : +campaign.endTimestamp < new Date().getTime() * 1000
+                : now > +campaign.endTimestamp
                     ? Status.PAST
                     : Status.SOON,
             action: metadata.action,
@@ -224,8 +226,10 @@ export class OpportunityService {
                 }))?.[0] ?? undefined)
                 : {
                     cumulated: 0,
-                    timestamp: AprRecords[0].timestamp,
-                    breakdowns: [{ ...AprRecords[0].AprBreakdown[0], value: 0 }],
+                    timestamp: AprRecords?.[0]?.timestamp ?? 0n,
+                    breakdowns: !AprRecords?.[0]?.AprBreakdown?.[0]
+                        ? []
+                        : [{ ...AprRecords?.[0]?.AprBreakdown?.[0], value: 0 }],
                 },
             tvlRecord: TvlRecords?.map(({ id, total, timestamp, TvlBreakdown: breakdowns }) => ({
                 id,

package/dist/src/modules/v4/programPayload/programPayload.repository.d.ts

@@ -80,7 +80,7 @@ export declare enum zkSyncCampaigns {
     SyncSwap_ZK_ETH = "SyncSwap WBTC-M-BTC Stable Pool v2.1 0x45856bd6bb9f076f4c558a4d5932c6c8d832b0d0",
     SyncSwap_USDCe_ETH = "SyncSwap WBTC-M-BTC Stable Pool v2.1 0x80115c708e12edd42e504c1cd52aea96c547c05c",
     Woofi_ETH = "Woofi ETH 0x1d686250bbffa9fe120b591f5992dd7fc0fd99a4",
-    Woofi_USDC = "Woofi USDC 0xa8bbab0ac88382a0f507b9e93cdbe65ffa1f50d1",
+    Woofi_USDC = "Woofi USDC 0xDCA324bdD4eBB6b8a1802959324Ce125b5D57921",
     ZKSwap_wrsETH_ETH = "ZKSwap Finance wrsETH/ETH v2 0.1pct 0xeb9fd198b20dc73e63668b89a735b7dc84e13ea0",
     ZKSwap_ETH_USDCe = "ZKSwap Finance ETH/USDC.e v2 0.1pct 0x7642e38867860d4512fcce1116e2fb539c5cdd21",
     ZKSwap_USDC_USDCe_USDT = "ZKSwap Finance USDC/USDC.e/USDT Stable 0.01pct 0x15309aaf4fedf346e5204331027b4ef7b75b1dd7",

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

@@ -83,7 +83,7 @@ export var zkSyncCampaigns;
     zkSyncCampaigns["SyncSwap_ZK_ETH"] = "SyncSwap WBTC-M-BTC Stable Pool v2.1 0x45856bd6bb9f076f4c558a4d5932c6c8d832b0d0";
     zkSyncCampaigns["SyncSwap_USDCe_ETH"] = "SyncSwap WBTC-M-BTC Stable Pool v2.1 0x80115c708e12edd42e504c1cd52aea96c547c05c";
     zkSyncCampaigns["Woofi_ETH"] = "Woofi ETH 0x1d686250bbffa9fe120b591f5992dd7fc0fd99a4";
-    zkSyncCampaigns["Woofi_USDC"] = "Woofi USDC 0xa8bbab0ac88382a0f507b9e93cdbe65ffa1f50d1";
+    zkSyncCampaigns["Woofi_USDC"] = "Woofi USDC 0xDCA324bdD4eBB6b8a1802959324Ce125b5D57921";
     zkSyncCampaigns["ZKSwap_wrsETH_ETH"] = "ZKSwap Finance wrsETH/ETH v2 0.1pct 0xeb9fd198b20dc73e63668b89a735b7dc84e13ea0";
     zkSyncCampaigns["ZKSwap_ETH_USDCe"] = "ZKSwap Finance ETH/USDC.e v2 0.1pct 0x7642e38867860d4512fcce1116e2fb539c5cdd21";
     zkSyncCampaigns["ZKSwap_USDC_USDCe_USDT"] = "ZKSwap Finance USDC/USDC.e/USDT Stable 0.01pct 0x15309aaf4fedf346e5204331027b4ef7b75b1dd7";
@@ -733,7 +733,7 @@ const ZkSyncInterfaceCampaigns = {
             {
                 forwarderType: Forwarder.MASTERCHEF,
                 priority: 0,
-                sender: "0x940350023026b52ae8b1997f15166b2060e04940",
+                sender: "0x9F9D043fB77A194b4216784Eb5985c471b979D67",
                 poolID: 28,
             },
         ],
@@ -750,7 +750,7 @@ const ZkSyncInterfaceCampaigns = {
             {
                 forwarderType: Forwarder.MASTERCHEF,
                 priority: 0,
-                sender: "0x940350023026b52ae8b1997f15166b2060e04940",
+                sender: "0x9F9D043fB77A194b4216784Eb5985c471b979D67",
                 poolID: 2,
             },
         ],
@@ -767,7 +767,7 @@ const ZkSyncInterfaceCampaigns = {
             {
                 forwarderType: Forwarder.MASTERCHEF,
                 priority: 0,
-                sender: "0x940350023026b52ae8b1997f15166b2060e04940",
+                sender: "0x9F9D043fB77A194b4216784Eb5985c471b979D67",
                 poolID: 31,
             },
         ],
@@ -784,7 +784,7 @@ const ZkSyncInterfaceCampaigns = {
             {
                 forwarderType: Forwarder.MASTERCHEF,
                 priority: 0,
-                sender: "0x940350023026b52ae8b1997f15166b2060e04940",
+                sender: "0x9F9D043fB77A194b4216784Eb5985c471b979D67",
                 poolID: 19,
             },
         ],
@@ -801,7 +801,7 @@ const ZkSyncInterfaceCampaigns = {
             {
                 forwarderType: Forwarder.MASTERCHEF,
                 priority: 0,
-                sender: "0x940350023026b52ae8b1997f15166b2060e04940",
+                sender: "0x9F9D043fB77A194b4216784Eb5985c471b979D67",
                 poolID: 30,
             },
         ],
@@ -819,7 +819,7 @@ const ZkSyncInterfaceCampaigns = {
     [zkSyncCampaigns.Woofi_USDC]: {
         campaignType: Campaign.ERC20,
         computeChainId: ChainId.ZKSYNC,
-        targetToken: "0xa8bbab0ac88382a0f507b9e93cdbe65ffa1f50d1",
+        targetToken: "0xDCA324bdD4eBB6b8a1802959324Ce125b5D57921",
         hooks: [],
         whitelist: [],
         blacklist: [],

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

@@ -1,5 +1,5 @@
 import { log } from "../../../utils/logger";
-import { Campaign, DistributorService, NETWORK_LABELS, } from "@sdk";
+import { Campaign, DAY, DistributorService, NETWORK_LABELS, } from "@sdk";
 import moment from "moment";
 import { BlacklistService } from "../blacklist";
 import { CacheService } from "../cache";
@@ -313,11 +313,12 @@ export class RewardService {
         for (const { amount, rewardToken: address, chainId, startTimestamp: start, endTimestamp: end, campaignId, } of dynamicData) {
             const timespan = Math.abs(end - start);
             const isWithinTimespan = moment().unix() > start && moment().unix() < end;
-            const dayspan = Math.max(1, Math.floor(timespan / (60 * 60 * 24)));
+            const dayspan = Math.max(1, Math.floor(timespan / DAY));
             const dailyAmount = isWithinTimespan ? BigInt(amount) / BigInt(dayspan) : BigInt(0);
+            const campaignIdInDb = CampaignService.hashId({ campaignId, distributionChain: chainId });
             const campaignDailyValue = await TokenService.getValue([{ amount: dailyAmount, address, chainId }]);
             breakdowns.push({
-                campaignId: CampaignService.hashId({ campaignId, distributionChain: chainId }),
+                campaignId: campaignIdInDb,
                 value: campaignDailyValue,
                 amount: dailyAmount,
                 token: await TokenService.findUniqueOrThrow({