npm - @merkl/api - Versions diffs - 0.10.393 → 0.10.396 - Mend

@merkl/api 0.10.393 → 0.10.396

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/index.d.ts CHANGED Viewed

@@ -467,7 +467,6 @@ declare const app: Elysia<"", {
                                 tags: string[];
                                 icon: string;
                             } | null | undefined;
-                            depositUrl?: string | undefined;
                             aprRecord?: {
                                 timestamp: string | bigint;
                                 cumulated: number;
@@ -479,6 +478,7 @@ declare const app: Elysia<"", {
                                     aprRecordId: string;
                                 }[];
                             } | undefined;
+                            depositUrl?: string | undefined;
                             tvlRecord?: {
                                 total: number;
                                 timestamp: string | bigint;
@@ -600,7 +600,6 @@ declare const app: Elysia<"", {
                                 tags: string[];
                                 icon: string;
                             } | null | undefined;
-                            depositUrl?: string | undefined;
                             aprRecord?: {
                                 timestamp: string | bigint;
                                 cumulated: number;
@@ -612,6 +611,7 @@ declare const app: Elysia<"", {
                                     aprRecordId: string;
                                 }[];
                             } | undefined;
+                            depositUrl?: string | undefined;
                             tvlRecord?: {
                                 total: number;
                                 timestamp: string | bigint;
@@ -768,7 +768,6 @@ declare const app: Elysia<"", {
                                     tags: string[];
                                     icon: string;
                                 } | null | undefined;
-                                depositUrl?: string | undefined;
                                 aprRecord?: {
                                     timestamp: string | bigint;
                                     cumulated: number;
@@ -780,6 +779,7 @@ declare const app: Elysia<"", {
                                         aprRecordId: string;
                                     }[];
                                 } | undefined;
+                                depositUrl?: string | undefined;
                                 tvlRecord?: {
                                     total: number;
                                     timestamp: string | bigint;
@@ -1350,10 +1350,10 @@ declare const app: Elysia<"", {
                         response: {
                             200: {
                                 endTimestamp: bigint;
-                                campaignId: string;
                                 CampaignStatus: {
                                     computedUntil: bigint;
                                 }[];
+                                campaignId: string;
                             }[];
                             422: {
                                 type: "validation";
@@ -2028,6 +2028,106 @@ declare const app: Elysia<"", {
                     };
                 };
             };
+        } & {
+            campaign: {
+                ":campaignId": {
+                    index: {
+                        get: {
+                            body: unknown;
+                            params: {
+                                campaignId: string;
+                            };
+                            query: {
+                                items?: number | undefined;
+                                page?: number | undefined;
+                            };
+                            headers: unknown;
+                            response: {
+                                200: {
+                                    amount: string;
+                                    claimed: string;
+                                    pending: string;
+                                    recipient: string;
+                                }[];
+                                422: {
+                                    type: "validation";
+                                    on: string;
+                                    summary?: string;
+                                    message?: string;
+                                    found?: unknown;
+                                    property?: string;
+                                    expected?: string;
+                                };
+                            };
+                        };
+                    };
+                };
+            };
+        } & {
+            campaign: {
+                ":campaignId": {
+                    total: {
+                        get: {
+                            body: unknown;
+                            params: {
+                                campaignId: string;
+                            };
+                            query: {
+                                items?: number | undefined;
+                                page?: number | undefined;
+                            };
+                            headers: unknown;
+                            response: {
+                                200: {
+                                    tokenId: string;
+                                    amount: bigint;
+                                };
+                                422: {
+                                    type: "validation";
+                                    on: string;
+                                    summary?: string;
+                                    message?: string;
+                                    found?: unknown;
+                                    property?: string;
+                                    expected?: string;
+                                };
+                            };
+                        };
+                    };
+                };
+            };
+        } & {
+            campaign: {
+                ":campaignId": {
+                    count: {
+                        get: {
+                            body: unknown;
+                            params: {
+                                campaignId: string;
+                            };
+                            query: {
+                                items?: number | undefined;
+                                page?: number | undefined;
+                            };
+                            headers: unknown;
+                            response: {
+                                200: {
+                                    count: number;
+                                };
+                                422: {
+                                    type: "validation";
+                                    on: string;
+                                    summary?: string;
+                                    message?: string;
+                                    found?: unknown;
+                                    property?: string;
+                                    expected?: string;
+                                };
+                            };
+                        };
+                    };
+                };
+            };
         } & {
             token: {
                 index: {
@@ -2037,12 +2137,18 @@ declare const app: Elysia<"", {
                         query: {
                             items?: number | undefined;
                             page?: number | undefined;
+                            campaignIds?: string[] | undefined;
                             chainId: number;
                             address: string;
                         };
                         headers: unknown;
                         response: {
-                            200: import("./modules/v4/reward").BreakdownForTokenRaw[];
+                            200: {
+                                amount: string;
+                                claimed: string;
+                                pending: string;
+                                recipient: string;
+                            }[];
                             422: {
                                 type: "validation";
                                 on: string;
@@ -2065,6 +2171,7 @@ declare const app: Elysia<"", {
                         query: {
                             items?: number | undefined;
                             page?: number | undefined;
+                            campaignIds?: string[] | undefined;
                             chainId: number;
                             address: string;
                         };
@@ -2096,6 +2203,7 @@ declare const app: Elysia<"", {
                         query: {
                             items?: number | undefined;
                             page?: number | undefined;
+                            campaignIds?: string[] | undefined;
                             chainId: number;
                             address: string;
                         };
@@ -2164,8 +2272,6 @@ declare const app: Elysia<"", {
                             rewardToken: string;
                             breakdowns: {
                                 protocolId?: string | undefined;
-                                auxiliaryData1?: string | undefined;
-                                auxiliaryData2?: string | undefined;
                                 reason: string;
                                 pending: string;
                                 recipient: string;
@@ -2231,8 +2337,6 @@ declare const app: Elysia<"", {
                     post: {
                         body: {
                             data: {
-                                auxiliaryData1?: string | undefined;
-                                auxiliaryData2?: string | undefined;
                                 reason: string;
                                 pending: string;
                                 recipient: string;
@@ -3011,8 +3115,6 @@ declare const app: Elysia<"", {
                                             pending: string;
                                             amount: string;
                                             claimed: string;
-                                            auxiliaryData1: string | null;
-                                            auxiliaryData2: string | null;
                                         }[];
                                         claimed: bigint;
                                         amount: bigint;
@@ -3026,8 +3128,6 @@ declare const app: Elysia<"", {
                                             claimed: bigint;
                                             amount: bigint;
                                             pending: bigint;
-                                            auxiliaryData1: string | null;
-                                            auxiliaryData2: string | null;
                                         }[];
                                     })[];
                                     distributor: string;
@@ -3137,8 +3237,6 @@ declare const app: Elysia<"", {
                                         pending: string;
                                         amount: string;
                                         claimed: string;
-                                        auxiliaryData1: string | null;
-                                        auxiliaryData2: string | null;
                                     }[];
                                     claimed: bigint;
                                     amount: bigint;
@@ -3153,8 +3251,6 @@ declare const app: Elysia<"", {
                                         pending: string;
                                         amount: string;
                                         claimed: string;
-                                        auxiliaryData1: string | null;
-                                        auxiliaryData2: string | null;
                                     }[];
                                 })[];
                             })[];
@@ -3758,13 +3854,13 @@ declare const app: Elysia<"", {
                         chainId?: number | undefined;
                         startTimestamp?: string | undefined;
                         endTimestamp?: string | undefined;
+                        campaignStatus?: {} | undefined;
                         distributionChainId?: number | undefined;
                         campaignId?: string | undefined;
                         rewardTokenId?: string | undefined;
                         amount?: string | undefined;
                         opportunityId?: string | undefined;
                         creatorAddress?: string | undefined;
-                        campaignStatus?: {} | undefined;
                         rewardToken?: {} | undefined;
                         rewardTokenAddress?: string | undefined;
                         distributionChain?: {} | undefined;
@@ -3992,12 +4088,6 @@ declare const app: Elysia<"", {
                                 delayFormatted: string;
                                 startTimestamp: bigint;
                                 endTimestamp: bigint;
-                                computeChainId: number;
-                                distributionChainId: number;
-                                campaignId: string;
-                                Opportunity: {
-                                    name: string;
-                                };
                                 CampaignStatus: {
                                     error: string;
                                     details: import("database/api/.generated/runtime/library").JsonValue;
@@ -4006,6 +4096,12 @@ declare const app: Elysia<"", {
                                     computedUntil: bigint;
                                     processingStarted: bigint;
                                 }[];
+                                Opportunity: {
+                                    name: string;
+                                };
+                                computeChainId: number;
+                                distributionChainId: number;
+                                campaignId: string;
                             }[];
                             422: {
                                 type: "validation";
@@ -5574,8 +5670,6 @@ declare const app: Elysia<"", {
                                         token: string;
                                         mainParameter: string;
                                         decimals: number;
-                                        auxiliaryData1: string;
-                                        auxiliaryData2: string;
                                         unclaimed: string;
                                         accumulated: string;
                                     };

package/dist/src/jobs/etl/reward-breakdowns.js CHANGED Viewed

@@ -56,8 +56,6 @@ const transform = (rewardBreakdowns) => {
             amount: rewardBreakdown.amount,
             claimed: rewardBreakdown.claimed,
             pending: rewardBreakdown.pending,
-            auxiliaryData1: rewardBreakdown.auxiliaryData1 ?? "",
-            auxiliaryData2: rewardBreakdown.auxiliaryData2 ?? "",
         });
     }
     return transformedRewardBreakdowns;

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

@@ -18,6 +18,8 @@ export class CacheService {
         return JSON.parse(decoded);
     }
     static async wrap(ttl, fn, ...args) {
+        if (Bun.env.NODE_ENV === "local")
+            return (await fn(...args));
         const key = CacheService.#hashKey(fn, args);
         const cached = await CacheRepository.get(key);
         if (cached !== null)

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

@@ -268,10 +268,10 @@ export declare const CampaignController: Elysia<"/campaigns", {
                     response: {
                         200: {
                             endTimestamp: bigint;
-                            campaignId: string;
                             CampaignStatus: {
                                 computedUntil: bigint;
                             }[];
+                            campaignId: string;
                         }[];
                         422: {
                             type: "validation";

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

@@ -124,7 +124,7 @@ export declare abstract class CampaignRepository {
         opportunityId: string;
         creatorAddress: string;
     } | null>;
-    static findUniqueOrThrow(campaign: CampaignUnique): Promise<{
+    static findUniqueOrThrow(id: string): Promise<{
         params: Prisma.JsonValue;
         type: import("../../../../database/api/.generated").$Enums.CampaignType;
         id: string;
@@ -141,12 +141,20 @@ export declare abstract class CampaignRepository {
     }>;
     static findCampaignsToProcess(distributionChainId: ChainId): Promise<{
         endTimestamp: bigint;
-        campaignId: string;
         CampaignStatus: {
             computedUntil: bigint;
         }[];
+        campaignId: string;
     }[]>;
     static findMany(query: GetCampaignQueryModel): Promise<({
+        CampaignStatus: {
+            error: string;
+            details: Prisma.JsonValue;
+            status: import("../../../../database/api/.generated").$Enums.RunStatus;
+            campaignId: string;
+            computedUntil: bigint;
+            processingStarted: bigint;
+        }[];
         ComputeChain: {
             name: string;
             id: number;
@@ -170,14 +178,6 @@ export declare abstract class CampaignRepository {
             isTest: boolean;
             price: number | null;
         };
-        CampaignStatus: {
-            error: string;
-            details: Prisma.JsonValue;
-            status: import("../../../../database/api/.generated").$Enums.RunStatus;
-            campaignId: string;
-            computedUntil: bigint;
-            processingStarted: bigint;
-        }[];
     } & {
         params: Prisma.JsonValue;
         type: import("../../../../database/api/.generated").$Enums.CampaignType;

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

@@ -222,10 +222,10 @@ export class CampaignRepository {
             },
         });
     }
-    static async findUniqueOrThrow(campaign) {
+    static async findUniqueOrThrow(id) {
         return await apiDbClient.campaign.findUniqueOrThrow({
             where: {
-                id: CampaignService.hashId(campaign),
+                id,
             },
         });
     }

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

@@ -4,6 +4,7 @@ import type { CampaignType } from "../../../../database/api/.generated";
 import { type CampaignParameters, type Campaign as CampaignTypeV3, type ChainId } from "@sdk";
 export declare abstract class CampaignService {
     static hashId(campaign: CampaignUnique): string;
+    static splitIdOrThrow(chainAndCampaignId: `${number}-${string}` | string): CampaignUnique;
     static create(campaign: Omit<CreateCampaignModel, "id">): Promise<{
         params: import("database/api/.generated/runtime/library").JsonValue;
         type: import("../../../../database/api/.generated").$Enums.CampaignType;
@@ -114,7 +115,7 @@ export declare abstract class CampaignService {
         opportunityId: string;
         creatorAddress: string;
     } | null>;
-    static findUniqueOrThrow(campaign: CampaignUnique): Promise<{
+    static findUniqueOrThrow(campaign: CampaignUnique | string): Promise<{
         params: import("database/api/.generated/runtime/library").JsonValue;
         type: import("../../../../database/api/.generated").$Enums.CampaignType;
         id: string;
@@ -131,10 +132,10 @@ export declare abstract class CampaignService {
     }>;
     static findCampaignsToProcess(distributionChainId: ChainId): Promise<{
         endTimestamp: bigint;
-        campaignId: string;
         CampaignStatus: {
             computedUntil: bigint;
         }[];
+        campaignId: string;
     }[]>;
     static pickCampaignToProcess(chainId: ChainId): Promise<string>;
     static fill(campaigns: CampaignUnique[]): Promise<{

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

@@ -3,6 +3,7 @@ import { campaignsDynamicData } from "../../../libs/campaigns/campaignsDynamicDa
 import { campaignTypeToEnumMap, } from "./";
 import { CampaignRepository } from "./campaign.repository";
 import { OpportunityService } from "../opportunity";
+import { InvalidParameter } from "../../../utils/error";
 import { executeSimple } from "../../../utils/execute";
 import { log } from "../../../utils/logger";
 import { NETWORK_LABELS, } from "@sdk";
@@ -15,6 +16,12 @@ export class CampaignService {
     static hashId(campaign) {
         return Bun.hash(`${campaign.distributionChain}${campaign.campaignId}`).toString();
     }
+    static splitIdOrThrow(chainAndCampaignId) {
+        if (!chainAndCampaignId.includes("-"))
+            throw new InvalidParameter("Campaign id should be formatted as chainId-campaignId");
+        const [chainId, campaignId] = chainAndCampaignId.split("-");
+        return { distributionChain: +chainId, campaignId };
+    }
     static async create(campaign) {
         const id = CampaignService.hashId({ distributionChain: campaign.chainId, campaignId: campaign.campaignId });
         await OpportunityService.createFromCampaign(campaign);
@@ -140,7 +147,8 @@ export class CampaignService {
         return await CampaignRepository.findUnique(campaign);
     }
     static async findUniqueOrThrow(campaign) {
-        return await CampaignRepository.findUniqueOrThrow(campaign);
+        const id = typeof campaign === "string" ? campaign : CampaignService.hashId(campaign);
+        return await CampaignRepository.findUniqueOrThrow(id);
     }
     static async findCampaignsToProcess(distributionChainId) {
         return (await CampaignRepository.findCampaignsToProcess(distributionChainId)).filter(campaign => campaign.endTimestamp > campaign?.CampaignStatus?.[0]?.computedUntil);

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

@@ -61,13 +61,13 @@ export declare const DynamicDataController: Elysia<"/dynamic-data", {
                     chainId?: number | undefined;
                     startTimestamp?: string | undefined;
                     endTimestamp?: string | undefined;
+                    campaignStatus?: {} | undefined;
                     distributionChainId?: number | undefined;
                     campaignId?: string | undefined;
                     rewardTokenId?: string | undefined;
                     amount?: string | undefined;
                     opportunityId?: string | undefined;
                     creatorAddress?: string | undefined;
-                    campaignStatus?: {} | undefined;
                     rewardToken?: {} | undefined;
                     rewardTokenAddress?: string | undefined;
                     distributionChain?: {} | undefined;

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

@@ -303,7 +303,6 @@ export declare const OpportunityController: Elysia<"/opportunities", {
                             tags: string[];
                             icon: string;
                         } | null | undefined;
-                        depositUrl?: string | undefined;
                         aprRecord?: {
                             timestamp: string | bigint;
                             cumulated: number;
@@ -315,6 +314,7 @@ export declare const OpportunityController: Elysia<"/opportunities", {
                                 aprRecordId: string;
                             }[];
                         } | undefined;
+                        depositUrl?: string | undefined;
                         tvlRecord?: {
                             total: number;
                             timestamp: string | bigint;
@@ -436,7 +436,6 @@ export declare const OpportunityController: Elysia<"/opportunities", {
                             tags: string[];
                             icon: string;
                         } | null | undefined;
-                        depositUrl?: string | undefined;
                         aprRecord?: {
                             timestamp: string | bigint;
                             cumulated: number;
@@ -448,6 +447,7 @@ export declare const OpportunityController: Elysia<"/opportunities", {
                                 aprRecordId: string;
                             }[];
                         } | undefined;
+                        depositUrl?: string | undefined;
                         tvlRecord?: {
                             total: number;
                             timestamp: string | bigint;
@@ -604,7 +604,6 @@ export declare const OpportunityController: Elysia<"/opportunities", {
                                 tags: string[];
                                 icon: string;
                             } | null | undefined;
-                            depositUrl?: string | undefined;
                             aprRecord?: {
                                 timestamp: string | bigint;
                                 cumulated: number;
@@ -616,6 +615,7 @@ export declare const OpportunityController: Elysia<"/opportunities", {
                                     aprRecordId: string;
                                 }[];
                             } | undefined;
+                            depositUrl?: string | undefined;
                             tvlRecord?: {
                                 total: number;
                                 timestamp: string | bigint;

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

@@ -165,11 +165,6 @@ export declare const OpportunityWithCampaignsResourceDto: import("@sinclair/type
         icon: import("@sinclair/typebox").TString;
     }>;
     chainId: import("@sinclair/typebox").TNumber;
-    action: import("@sinclair/typebox").TString;
-    depositUrl: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
-    tvl: import("@sinclair/typebox").TNumber;
-    apr: import("@sinclair/typebox").TNumber;
-    dailyRewards: import("@sinclair/typebox").TNumber;
     aprRecord: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TObject<{
         cumulated: import("@sinclair/typebox").TNumber;
         timestamp: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TBigInt, import("@sinclair/typebox").TString]>;
@@ -185,6 +180,11 @@ export declare const OpportunityWithCampaignsResourceDto: import("@sinclair/type
             aprRecordId: import("@sinclair/typebox").TString;
         }>>;
     }>>;
+    action: import("@sinclair/typebox").TString;
+    depositUrl: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+    tvl: import("@sinclair/typebox").TNumber;
+    apr: import("@sinclair/typebox").TNumber;
+    dailyRewards: import("@sinclair/typebox").TNumber;
     tvlRecord: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TObject<{
         total: import("@sinclair/typebox").TNumber;
         timestamp: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TBigInt, import("@sinclair/typebox").TString]>;