@merkl/api 0.10.237 → 0.10.239

package/dist/src/eden/index.d.ts

@@ -8919,5 +8919,5 @@ export type Campaign<C extends CampaignType = CampaignType> = CampaignResource<C
 export type Chain = FromPromise<Api["v4"]["chains"]["index"]["get"]>;
 export type Explorer = FromPromise<Api["v4"]["chains"]["index"]["get"]>["explorers"][number];
 export type Token = FromPromise<Api["v4"]["tokens"]["index"]["get"]>;
-export type Reward = NonNullable<Awaited<ReturnType<ReturnType<Api["v4"]["users"]>["rewards"]["full"]["get"]>>["data"]>[number];
+export type Reward = NonNullable<Awaited<ReturnType<ReturnType<Api["v4"]["users"]>["rewards"]["breakdowns"]["get"]>>["data"]>[number];
 export {};

package/dist/src/entities/campaign.js

@@ -91,8 +91,9 @@ export function getRewardTokens(campaigns) {
     const rewardTokens = {};
     campaigns.forEach(({ amount, rewardToken, campaignParameters: { symbolRewardToken: symbol }, ...c }) => {
         const timespan = Math.abs(c.endTimestamp - c.startTimestamp);
+        const isWithinTimespan = moment().unix() > c.startTimestamp && moment().unix() < c.endTimestamp;
         const dayspan = Math.max(Math.floor(timespan / (60 * 60 * 24)), 1);
-        const dailyAmount = BigInt(amount) / BigInt(dayspan);
+        const dailyAmount = isWithinTimespan ? BigInt(amount) / BigInt(dayspan) : 0n;
         if (!rewardTokens[symbol])
             rewardTokens[symbol] = { amount: dailyAmount, address: rewardToken };
         else

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

@@ -206,8 +206,9 @@ export class CampaignService {
      */
     static getDailyAmount(start, end, amount) {
         const timespan = Math.abs(Number(end - start));
+        const isWithinTimespan = moment().unix() > start && moment().unix() < end;
         const dayspan = Math.max(1, Math.floor(timespan / (60 * 60 * 24)));
-        const dailyAmount = BigInt(amount) / BigInt(dayspan);
+        const dailyAmount = isWithinTimespan ? BigInt(amount) / BigInt(dayspan) : 0n;
         return dailyAmount;
     }
 }

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

@@ -1,7 +1,7 @@
 export declare const slugToProtocolId: {
     readonly "uniswap-v2": "uniswap-v2";
-    readonly "aave-v2": "aave";
     readonly "aave-v3": "aave";
+    readonly "aave-v2": "aave";
     readonly "aave-static-atokens": "aave";
     readonly "camelot-v2": "camelot";
     readonly "meta-morpho": "morpho";

package/dist/src/modules/v4/enso/enso.model.js

@@ -1,8 +1,8 @@
 import { t } from "elysia";
 export const slugToProtocolId = {
     "uniswap-v2": "uniswap-v2",
-    "aave-v2": "aave",
     "aave-v3": "aave",
+    "aave-v2": "aave",
     "aave-static-atokens": "aave",
     "camelot-v2": "camelot",
     "meta-morpho": "morpho",

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

@@ -28,7 +28,7 @@ export declare const apiTypes: {
             amountIn: import("@sinclair/typebox").TString;
             feeAddress: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
             feePcm: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TNumber>;
-            sipplage: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TNumber>;
+            slippage: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TNumber>;
         }>;
         readonly response: import("@sinclair/typebox").TObject<{
             message: import("@sinclair/typebox").TString;

package/dist/src/modules/v4/kyberzap/kyberzap.model.js

@@ -40,7 +40,7 @@ export const apiTypes = {
             amountIn: t.String(),
             feeAddress: t.Optional(t.String()),
             feePcm: t.Optional(t.Number()),
-            sipplage: t.Optional(t.Number()),
+            slippage: t.Optional(t.Number()),
         }),
         response: t.Object({
             message: t.String({ example: "OK" }),

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

@@ -56,7 +56,7 @@ export class KyberZapService {
                 "position.tickUpper": upper?.toString(),
                 dex: KyberZapService.getDexId(protocol),
                 //TODO: add a lesser value here (2% by default)
-                sipplage: slippage ?? 200,
+                slippage: slippage ?? 200,
             },
             chainId,
         });

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

@@ -312,8 +312,9 @@ export class RewardService {
         const breakdowns = [];
         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 dailyAmount = moment().unix() <= end && moment().unix() >= start ? BigInt(amount) / BigInt(dayspan) : BigInt(0);
+            const dailyAmount = isWithinTimespan ? BigInt(amount) / BigInt(dayspan) : BigInt(0);
             const campaignDailyValue = await TokenService.getValue([{ amount: dailyAmount, address, chainId }]);
             breakdowns.push({
                 campaignId: CampaignService.hashId({ campaignId, distributionChain: chainId }),