npm - @merkl/api - Versions diffs - 0.20.114 → 0.20.116 - Mend

@merkl/api 0.20.114 → 0.20.116

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (58) hide show

package/dist/src/modules/v4/campaign/campaign.controller.d.ts CHANGED Viewed

@@ -73,6 +73,7 @@ export declare const CampaignController: Elysia<"/campaigns", false, {
                             verified: boolean;
                             isTest: boolean;
                             isPoint: boolean;
+                            isPreTGE: boolean;
                             isNative: boolean;
                         } & {
                             price?: number | null | undefined;
@@ -243,6 +244,7 @@ export declare const CampaignController: Elysia<"/campaigns", false, {
                             verified: boolean;
                             isTest: boolean;
                             isPoint: boolean;
+                            isPreTGE: boolean;
                             isNative: boolean;
                         } & {
                             price?: number | null | undefined;
@@ -329,6 +331,7 @@ export declare const CampaignController: Elysia<"/campaigns", false, {
                             verified: boolean;
                             isTest: boolean;
                             isPoint: boolean;
+                            isPreTGE: boolean;
                             isNative: boolean;
                         } & {
                             price?: number | null | undefined;
@@ -516,6 +519,7 @@ export declare const CampaignController: Elysia<"/campaigns", false, {
                             verified: boolean;
                             isTest: boolean;
                             isPoint: boolean;
+                            isPreTGE: boolean;
                             isNative: boolean;
                         } & {
                             price?: number | null | undefined;

package/dist/src/modules/v4/campaign/campaign.model.d.ts CHANGED Viewed

@@ -63,6 +63,8 @@ export declare const CampaignResourceDto: import("@sinclair/typebox").TObject<{
         icon: import("@sinclair/typebox").TString;
         verified: import("@sinclair/typebox").TBoolean;
         isTest: import("@sinclair/typebox").TBoolean;
+        isPoint: import("@sinclair/typebox").TBoolean;
+        isPreTGE: import("@sinclair/typebox").TBoolean;
         price: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TNumber, import("@sinclair/typebox").TNull]>>;
         symbol: import("@sinclair/typebox").TString;
     }>;

package/dist/src/modules/v4/campaign/campaign.repository.d.ts CHANGED Viewed

@@ -411,6 +411,7 @@ export declare abstract class CampaignRepository {
             verified: boolean;
             isTest: boolean;
             isPoint: boolean;
+            isPreTGE: boolean;
             isNative: boolean;
             price: number | null;
         };
@@ -536,6 +537,7 @@ export declare abstract class CampaignRepository {
             verified: boolean;
             isTest: boolean;
             isPoint: boolean;
+            isPreTGE: boolean;
             isNative: boolean;
             price: number | null;
         };
@@ -593,6 +595,7 @@ export declare abstract class CampaignRepository {
             verified: boolean;
             isTest: boolean;
             isPoint: boolean;
+            isPreTGE: boolean;
             isNative: boolean;
             price: number | null;
         };
@@ -677,6 +680,7 @@ export declare abstract class CampaignRepository {
             verified: boolean;
             isTest: boolean;
             isPoint: boolean;
+            isPreTGE: boolean;
             isNative: boolean;
             price: number | null;
         };

package/dist/src/modules/v4/campaign/campaign.service.d.ts CHANGED Viewed

@@ -103,6 +103,7 @@ export declare abstract class CampaignService {
             verified: boolean;
             isTest: boolean;
             isPoint: boolean;
+            isPreTGE: boolean;
             isNative: boolean;
             price: number | null;
         };
@@ -183,6 +184,7 @@ export declare abstract class CampaignService {
             verified: boolean;
             isTest: boolean;
             isPoint: boolean;
+            isPreTGE: boolean;
             isNative: boolean;
         } & {
             price?: number | null | undefined;
@@ -247,6 +249,7 @@ export declare abstract class CampaignService {
             verified: boolean;
             isTest: boolean;
             isPoint: boolean;
+            isPreTGE: boolean;
             isNative: boolean;
         } & {
             price?: number | null | undefined;
@@ -320,6 +323,7 @@ export declare abstract class CampaignService {
             verified: boolean;
             isTest: boolean;
             isPoint: boolean;
+            isPreTGE: boolean;
             isNative: boolean;
         } & {
             price?: number | null | undefined;
@@ -394,6 +398,7 @@ export declare abstract class CampaignService {
             verified: boolean;
             isTest: boolean;
             isPoint: boolean;
+            isPreTGE: boolean;
             isNative: boolean;
         } & {
             price?: number | null | undefined;
@@ -468,6 +473,7 @@ export declare abstract class CampaignService {
             verified: boolean;
             isTest: boolean;
             isPoint: boolean;
+            isPreTGE: boolean;
             isNative: boolean;
         } & {
             price?: number | null | undefined;
@@ -554,6 +560,7 @@ export declare abstract class CampaignService {
             verified: boolean;
             isTest: boolean;
             isPoint: boolean;
+            isPreTGE: boolean;
             isNative: boolean;
             price: number | null;
         };
@@ -611,6 +618,7 @@ export declare abstract class CampaignService {
             verified: boolean;
             isTest: boolean;
             isPoint: boolean;
+            isPreTGE: boolean;
             isNative: boolean;
             price: number | null;
         };
@@ -749,6 +757,7 @@ export declare abstract class CampaignService {
             verified: boolean;
             isTest: boolean;
             isPoint: boolean;
+            isPreTGE: boolean;
             isNative: boolean;
         } & {
             price?: number | null | undefined;

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

@@ -4,6 +4,7 @@ import { StatusService } from "@/modules/v4/status/status.service";
 import { TokenService } from "@/modules/v4/token/token.service";
 import { CannotParseOpportunity, InvalidParameter } from "@/utils/error";
 import { log } from "@/utils/logger";
+import { parseDistributionType } from "@/utils/parseDistributionType";
 import { Campaign as CampaignType, NETWORK_LABELS, } from "@sdk";
 import { utils } from "ethers";
 import moment from "moment";
@@ -42,6 +43,7 @@ export class CampaignService {
             throw new Error(`unable to fetch data for token ${body.rewardTokenAddress}`);
         }
         const chain = await ChainService.findUniqueOrThrow(body.chainId);
+        const params = JSON.parse(body.params);
         const campaign = {
             distributionChainId: body.chainId,
             computeChainId: body.computeChainId,
@@ -50,12 +52,12 @@ export class CampaignService {
             type: campaignType,
             subType: body.subType ?? null,
             rewardToken,
-            params: JSON.parse(body.params),
+            params,
             endTimestamp: Number(body.endTimestamp),
             startTimestamp: Number(body.startTimestamp),
+            distributionType: parseDistributionType(params),
             amount: body.amount,
             creatorAddress: body.creator,
-            distributionType: "DUTCH_AUCTION",
             createdAt: new Date().toISOString(),
             chain,
         };

package/dist/src/modules/v4/campaign/campaign.test.controller.d.ts CHANGED Viewed

@@ -184,6 +184,7 @@ export declare const CampaignTestController: Elysia<"/campaigns", false, {
                                 verified: boolean;
                                 isTest: boolean;
                                 isPoint: boolean;
+                                isPreTGE: boolean;
                                 isNative: boolean;
                             } & {
                                 price?: number | null | undefined;
@@ -204,8 +205,8 @@ export declare const CampaignTestController: Elysia<"/campaigns", false, {
                     body: unknown;
                     params: {};
                     query: {
+                        distributionChain?: number | undefined;
                         campaignId: string;
-                        distributionChain: number;
                     };
                     headers: {
                         authorization: string;
@@ -247,6 +248,7 @@ export declare const CampaignTestController: Elysia<"/campaigns", false, {
                                 verified: boolean;
                                 isTest: boolean;
                                 isPoint: boolean;
+                                isPreTGE: boolean;
                                 isNative: boolean;
                             } & {
                                 price?: number | null | undefined;

package/dist/src/modules/v4/campaign/campaign.test.controller.js CHANGED Viewed

@@ -4,11 +4,11 @@ import { BackOfficeGuard } from "@/guards/BackOffice.guard";
 import { AuthorizationHeadersDto } from "@/guards/Engine.guard";
 import { throwOnUnsupportedChainId } from "@/utils/throw";
 import { Campaign as CampaignType } from "@sdk";
-import Elysia from "elysia";
+import Elysia, { t } from "elysia";
 import { DynamicDataSourceIdentifier } from "../dynamicData/dynamicData.model";
 import { DynamicDataService } from "../dynamicData/dynamicData.service";
 import { OpportunityConvertorService } from "../opportunity/opportunity.converter";
-import { CampaignConfigMinimal, CampaignUniqueDto, CampaignsDto } from "./campaign.model";
+import { CampaignConfigMinimal, CampaignsDto } from "./campaign.model";
 import { CampaignService } from "./campaign.service";
 // ─── Routes for dev and test only ──────────────────────────────────────────────
 export const CampaignTestController = new Elysia({
@@ -84,6 +84,14 @@ export const CampaignTestController = new Elysia({
     // ─── Test Opportunity creation through a campaign Id and a chain ───────────────────────
     // @dev Starts from the engine db to debug opportunity creation failing and preventing the api db to be filled
     .get("/metadata", async ({ query }) => {
+    if (!query.distributionChain) {
+        try {
+            query.distributionChain = (await CampaignService.findMany({ campaignId: query.campaignId, test: true }))?.[0]?.distributionChainId;
+        }
+        catch {
+            throw new NotFoundError("Campaign not found");
+        }
+    }
     const engineCampaigns = await CampaignService.findEngineCampaigns([
         {
             distributionChain: query.distributionChain,
@@ -94,5 +102,8 @@ export const CampaignTestController = new Elysia({
         throw new NotFoundError("Campaign not found in engine db");
     return await CampaignService.create(engineCampaigns[0], true);
 }, {
-    query: CampaignUniqueDto,
+    query: t.Object({
+        distributionChain: t.Optional(t.Numeric()),
+        campaignId: t.String(),
+    }),
 }));

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

@@ -1,5 +1,4 @@
 import { dynamicDataBuilderFactory } from "@/engine/deprecated/dynamicData/factory";
-import { hasFixedAprConfig } from "@/engine/deprecated/dynamicData/utils/getFixedApr";
 import { campaignTVLBuilderFactory } from "@/engine/tvl/factory";
 import { HttpError } from "@/errors";
 import { InvalidParameter } from "@/errors/InvalidParameter.error";
@@ -9,7 +8,8 @@ import { RewardService } from "@/modules/v4/reward/reward.service";
 import { TvlService } from "@/modules/v4/tvl/tvl.service";
 import bigintToString from "@/utils/bigintToString";
 import { log } from "@/utils/logger";
-import { AprType } from "@db/api";
+import { parseDistributionType } from "@/utils/parseDistributionType";
+import { AprType, DistributionType } from "@db/api";
 import { Campaign as CampaignType, DAY, NETWORK_LABELS, bigIntToNumber, } from "@sdk";
 import moment from "moment";
 import { AprService } from "../apr";
@@ -95,17 +95,17 @@ export class DynamicDataService {
                         }
                         let campaignDailyValue = await TokenService.getValueByTokenId(TokenService.hashId({ address: rewardTokenAddress, chainId: record.campaign.chainId }), dailyAmount);
                         // Fixed APR campaigns
-                        if (hasFixedAprConfig(campaignParameters)) {
+                        const distributionType = parseDistributionType(campaignParameters);
+                        if (distributionType !== DistributionType.DUTCH_AUCTION) {
                             log.local(`[${NETWORK_LABELS[chainId]}][${CampaignType[type]}] calculating fixed APR for ${record.campaign.campaignId}`);
-                            const { targetTokenPricing, rewardTokenPricing, apr: fixedApr } = campaignParameters;
+                            const { apr: fixedApr } = campaignParameters;
                             const targetApr = Number(fixedApr);
-                            if (targetTokenPricing && rewardTokenPricing) {
+                            if (distributionType === DistributionType.FIX_REWARD_VALUE_PER_LIQUIDITY_VALUE) {
                                 // Case 1: Fixed $ amount of reward per $ of liquidity
                                 campaignDailyValue = targetApr * tvl.total;
                                 dailyAmount = BigInt((campaignDailyValue / (rewardToken.price ?? 1)) * 10 ** rewardToken.decimals);
                             }
-                            if (targetTokenPricing && !rewardTokenPricing) {
-                                // Case 2: Fixed # amount of reward per $ of liquidity
+                            if (distributionType === DistributionType.FIX_REWARD_AMOUNT_PER_LIQUIDITY_VALUE) {
                                 // Return 0 if reward token price is invalid
                                 // targetApr represents a yearly # amount of reward per $ of liquidity
                                 dailyAmount =

package/dist/src/modules/v4/opportunity/opportunity.controller.d.ts CHANGED Viewed

@@ -152,6 +152,7 @@ export declare const OpportunityController: Elysia<"/opportunities", false, {
                                 verified: boolean;
                                 isTest: boolean;
                                 isPoint: boolean;
+                                isPreTGE: boolean;
                                 isNative: boolean;
                             } & {
                                 price?: number | null | undefined;
@@ -216,6 +217,7 @@ export declare const OpportunityController: Elysia<"/opportunities", false, {
                             verified: boolean;
                             isTest: boolean;
                             isPoint: boolean;
+                            isPreTGE: boolean;
                             isNative: boolean;
                         } & {
                             price?: number | null | undefined;
@@ -306,6 +308,7 @@ export declare const OpportunityController: Elysia<"/opportunities", false, {
                                     verified: boolean;
                                     isTest: boolean;
                                     isPoint: boolean;
+                                    isPreTGE: boolean;
                                     isNative: boolean;
                                     price: number | null;
                                 };
@@ -333,6 +336,7 @@ export declare const OpportunityController: Elysia<"/opportunities", false, {
                                 verified: boolean;
                                 isTest: boolean;
                                 isPoint: boolean;
+                                isPreTGE: boolean;
                                 isNative: boolean;
                             } & {
                                 price?: number | null | undefined;
@@ -401,6 +405,7 @@ export declare const OpportunityController: Elysia<"/opportunities", false, {
                             verified: boolean;
                             isTest: boolean;
                             isPoint: boolean;
+                            isPreTGE: boolean;
                             isNative: boolean;
                         } & {
                             price?: number | null | undefined;
@@ -533,6 +538,8 @@ export declare const OpportunityController: Elysia<"/opportunities", false, {
                                     decimals: number;
                                     verified: boolean;
                                     isTest: boolean;
+                                    isPoint: boolean;
+                                    isPreTGE: boolean;
                                 };
                                 value: number;
                                 campaignId: string;
@@ -555,6 +562,8 @@ export declare const OpportunityController: Elysia<"/opportunities", false, {
                             decimals: number;
                             verified: boolean;
                             isTest: boolean;
+                            isPoint: boolean;
+                            isPreTGE: boolean;
                         }[];
                         tags: string[];
                         identifier: string;
@@ -666,6 +675,8 @@ export declare const OpportunityController: Elysia<"/opportunities", false, {
                                     decimals: number;
                                     verified: boolean;
                                     isTest: boolean;
+                                    isPoint: boolean;
+                                    isPreTGE: boolean;
                                 };
                                 value: number;
                                 campaignId: string;
@@ -688,6 +699,8 @@ export declare const OpportunityController: Elysia<"/opportunities", false, {
                             decimals: number;
                             verified: boolean;
                             isTest: boolean;
+                            isPoint: boolean;
+                            isPreTGE: boolean;
                         }[];
                         tags: string[];
                         identifier: string;
@@ -751,6 +764,8 @@ export declare const OpportunityController: Elysia<"/opportunities", false, {
                                 decimals: number;
                                 verified: boolean;
                                 isTest: boolean;
+                                isPoint: boolean;
+                                isPreTGE: boolean;
                             };
                         }[];
                     }[];
@@ -833,6 +848,8 @@ export declare const OpportunityController: Elysia<"/opportunities", false, {
                                         decimals: number;
                                         verified: boolean;
                                         isTest: boolean;
+                                        isPoint: boolean;
+                                        isPreTGE: boolean;
                                     };
                                     value: number;
                                     campaignId: string;
@@ -855,6 +872,8 @@ export declare const OpportunityController: Elysia<"/opportunities", false, {
                                 decimals: number;
                                 verified: boolean;
                                 isTest: boolean;
+                                isPoint: boolean;
+                                isPreTGE: boolean;
                             }[];
                             tags: string[];
                             identifier: string;
@@ -918,6 +937,8 @@ export declare const OpportunityController: Elysia<"/opportunities", false, {
                                     decimals: number;
                                     verified: boolean;
                                     isTest: boolean;
+                                    isPoint: boolean;
+                                    isPreTGE: boolean;
                                 };
                             }[];
                         };

package/dist/src/modules/v4/opportunity/opportunity.model.d.ts CHANGED Viewed

@@ -61,6 +61,8 @@ export declare const OpportunityResourceDto: import("@sinclair/typebox").TObject
         icon: import("@sinclair/typebox").TString;
         verified: import("@sinclair/typebox").TBoolean;
         isTest: import("@sinclair/typebox").TBoolean;
+        isPoint: import("@sinclair/typebox").TBoolean;
+        isPreTGE: import("@sinclair/typebox").TBoolean;
         price: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TNumber, import("@sinclair/typebox").TNull]>>;
         symbol: import("@sinclair/typebox").TString;
     }>>;
@@ -116,6 +118,8 @@ export declare const OpportunityResourceDto: import("@sinclair/typebox").TObject
                 icon: import("@sinclair/typebox").TString;
                 verified: import("@sinclair/typebox").TBoolean;
                 isTest: import("@sinclair/typebox").TBoolean;
+                isPoint: import("@sinclair/typebox").TBoolean;
+                isPreTGE: import("@sinclair/typebox").TBoolean;
                 price: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TNumber, import("@sinclair/typebox").TNull]>>;
                 symbol: import("@sinclair/typebox").TString;
             }>;
@@ -154,6 +158,8 @@ export declare const OpportunityWithCampaignsResourceDto: import("@sinclair/type
         icon: import("@sinclair/typebox").TString;
         verified: import("@sinclair/typebox").TBoolean;
         isTest: import("@sinclair/typebox").TBoolean;
+        isPoint: import("@sinclair/typebox").TBoolean;
+        isPreTGE: import("@sinclair/typebox").TBoolean;
         price: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TNumber, import("@sinclair/typebox").TNull]>>;
         symbol: import("@sinclair/typebox").TString;
     }>>;
@@ -226,6 +232,8 @@ export declare const OpportunityWithCampaignsResourceDto: import("@sinclair/type
                 icon: import("@sinclair/typebox").TString;
                 verified: import("@sinclair/typebox").TBoolean;
                 isTest: import("@sinclair/typebox").TBoolean;
+                isPoint: import("@sinclair/typebox").TBoolean;
+                isPreTGE: import("@sinclair/typebox").TBoolean;
                 price: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TNumber, import("@sinclair/typebox").TNull]>>;
                 symbol: import("@sinclair/typebox").TString;
             }>;
@@ -265,6 +273,8 @@ export declare const OpportunityWithCampaignsResourceDto: import("@sinclair/type
             icon: import("@sinclair/typebox").TString;
             verified: import("@sinclair/typebox").TBoolean;
             isTest: import("@sinclair/typebox").TBoolean;
+            isPoint: import("@sinclair/typebox").TBoolean;
+            isPreTGE: import("@sinclair/typebox").TBoolean;
             price: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TNumber, import("@sinclair/typebox").TNull]>>;
             symbol: import("@sinclair/typebox").TString;
         }>;

package/dist/src/modules/v4/opportunity/opportunity.repository.d.ts CHANGED Viewed

@@ -46,6 +46,7 @@ export declare abstract class OpportunityRepository {
                 verified: boolean;
                 isTest: boolean;
                 isPoint: boolean;
+                isPreTGE: boolean;
                 isNative: boolean;
                 price: number | null;
             };
@@ -79,6 +80,7 @@ export declare abstract class OpportunityRepository {
             verified: boolean;
             isTest: boolean;
             isPoint: boolean;
+            isPreTGE: boolean;
             isNative: boolean;
             price: number | null;
         }[];
@@ -145,6 +147,7 @@ export declare abstract class OpportunityRepository {
                         verified: boolean;
                         isTest: boolean;
                         isPoint: boolean;
+                        isPreTGE: boolean;
                         isNative: boolean;
                         price: number | null;
                     };
@@ -223,6 +226,7 @@ export declare abstract class OpportunityRepository {
             verified: boolean;
             isTest: boolean;
             isPoint: boolean;
+            isPreTGE: boolean;
             isNative: boolean;
             price: number | null;
         }[];
@@ -289,6 +293,7 @@ export declare abstract class OpportunityRepository {
                         verified: boolean;
                         isTest: boolean;
                         isPoint: boolean;
+                        isPreTGE: boolean;
                         isNative: boolean;
                         price: number | null;
                     };
@@ -379,6 +384,7 @@ export declare abstract class OpportunityRepository {
                 verified: boolean;
                 isTest: boolean;
                 isPoint: boolean;
+                isPreTGE: boolean;
                 isNative: boolean;
                 price: number | null;
             };
@@ -425,6 +431,7 @@ export declare abstract class OpportunityRepository {
             verified: boolean;
             isTest: boolean;
             isPoint: boolean;
+            isPreTGE: boolean;
             isNative: boolean;
             price: number | null;
         }[];
@@ -491,6 +498,7 @@ export declare abstract class OpportunityRepository {
                         verified: boolean;
                         isTest: boolean;
                         isPoint: boolean;
+                        isPreTGE: boolean;
                         isNative: boolean;
                         price: number | null;
                     };
@@ -576,6 +584,7 @@ export declare abstract class OpportunityRepository {
             verified: boolean;
             isTest: boolean;
             isPoint: boolean;
+            isPreTGE: boolean;
             isNative: boolean;
             price: number | null;
         }[];
@@ -642,6 +651,7 @@ export declare abstract class OpportunityRepository {
                         verified: boolean;
                         isTest: boolean;
                         isPoint: boolean;
+                        isPreTGE: boolean;
                         isNative: boolean;
                         price: number | null;
                     };
@@ -734,6 +744,7 @@ export declare abstract class OpportunityRepository {
                 verified: boolean;
                 isTest: boolean;
                 isPoint: boolean;
+                isPreTGE: boolean;
                 isNative: boolean;
                 price: number | null;
             };
@@ -780,6 +791,7 @@ export declare abstract class OpportunityRepository {
             verified: boolean;
             isTest: boolean;
             isPoint: boolean;
+            isPreTGE: boolean;
             isNative: boolean;
             price: number | null;
         }[];
@@ -846,6 +858,7 @@ export declare abstract class OpportunityRepository {
                         verified: boolean;
                         isTest: boolean;
                         isPoint: boolean;
+                        isPreTGE: boolean;
                         isNative: boolean;
                         price: number | null;
                     };