@merkl/api 0.21.18 → 0.21.20

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

@@ -256,6 +256,7 @@ export declare const CampaignController: Elysia<"/campaigns", false, {
                 query: {
                     status?: "NONE" | "PAST" | "LIVE" | "SOON" | undefined;
                     type?: string | undefined;
+                    id?: string | undefined;
                     items?: number | undefined;
                     subType?: number | undefined;
                     page?: number | undefined;
@@ -483,7 +484,7 @@ export declare const CampaignController: Elysia<"/campaigns", false, {
                                 timestamp: bigint;
                                 walletCount: number;
                             }[];
-                            tvlInflowPerDollar: bigint;
+                            tvlInflowPerDollar: number;
                         };
                     };
                 };
@@ -577,6 +578,7 @@ export declare const CampaignController: Elysia<"/campaigns", false, {
                 query: {
                     status?: "NONE" | "PAST" | "LIVE" | "SOON" | undefined;
                     type?: string | undefined;
+                    id?: string | undefined;
                     items?: number | undefined;
                     subType?: number | undefined;
                     page?: number | undefined;
@@ -694,6 +696,7 @@ export declare const CampaignController: Elysia<"/campaigns", false, {
                 query: {
                     status?: "NONE" | "PAST" | "LIVE" | "SOON" | undefined;
                     type?: string | undefined;
+                    id?: string | undefined;
                     items?: number | undefined;
                     subType?: number | undefined;
                     page?: number | undefined;
@@ -733,6 +736,7 @@ export declare const CampaignController: Elysia<"/campaigns", false, {
                 query: {
                     status?: "NONE" | "PAST" | "LIVE" | "SOON" | undefined;
                     type?: string | undefined;
+                    id?: string | undefined;
                     items?: number | undefined;
                     subType?: number | undefined;
                     page?: number | undefined;
@@ -777,6 +781,7 @@ export declare const CampaignController: Elysia<"/campaigns", false, {
                     query: {
                         status?: "NONE" | "PAST" | "LIVE" | "SOON" | undefined;
                         type?: string | undefined;
+                        id?: string | undefined;
                         items?: number | undefined;
                         subType?: number | undefined;
                         page?: number | undefined;
@@ -822,6 +827,7 @@ export declare const CampaignController: Elysia<"/campaigns", false, {
                     query: {
                         status?: "NONE" | "PAST" | "LIVE" | "SOON" | undefined;
                         type?: string | undefined;
+                        id?: string | undefined;
                         items?: number | undefined;
                         subType?: number | undefined;
                         page?: number | undefined;
@@ -872,6 +878,7 @@ export declare const CampaignController: Elysia<"/campaigns", false, {
         query: {
             status?: "NONE" | "PAST" | "LIVE" | "SOON" | undefined;
             type?: string | undefined;
+            id?: string | undefined;
             items?: number | undefined;
             subType?: number | undefined;
             page?: number | undefined;

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

@@ -145,6 +145,7 @@ export declare const UpdateMetaDataCampaignDto: import("@sinclair/typebox").TObj
     url: import("@sinclair/typebox").TString;
 }>;
 export declare const GetCampaignQueryDto: import("@sinclair/typebox").TObject<{
+    id: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
     creatorTag: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
     creatorAddress: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
     creatorId: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;

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

@@ -90,6 +90,7 @@ export const UpdateMetaDataCampaignDto = t.Object({
     url: t.String(),
 });
 export const GetCampaignQueryDto = t.Object({
+    id: t.Optional(t.String()),
     creatorTag: t.Optional(t.String({ description: "Filter campaigns created by a user who has a specific tag" })),
     creatorAddress: t.Optional(t.String()),
     creatorId: t.Optional(t.String({ description: "Filter campaigns created by a user who is registered as a merkl creator" })),

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

@@ -24,6 +24,9 @@ export declare abstract class CampaignRepository {
                 gt?: undefined;
                 gte?: undefined;
             };
+            OR: {
+                id: string;
+            }[] | undefined;
             distributionChainId: {
                 in: number[];
             } | undefined;
@@ -101,6 +104,9 @@ export declare abstract class CampaignRepository {
                 gte?: undefined;
             };
             startTimestamp?: undefined;
+            OR: {
+                id: string;
+            }[] | undefined;
             distributionChainId: {
                 in: number[];
             } | undefined;
@@ -179,6 +185,9 @@ export declare abstract class CampaignRepository {
                 gte?: undefined;
             };
             endTimestamp?: undefined;
+            OR: {
+                id: string;
+            }[] | undefined;
             distributionChainId: {
                 in: number[];
             } | undefined;
@@ -260,6 +269,9 @@ export declare abstract class CampaignRepository {
                 lte?: undefined;
                 gt?: undefined;
             } | undefined;
+            OR: {
+                id: string;
+            }[] | undefined;
             distributionChainId: {
                 in: number[];
             } | undefined;
@@ -871,6 +883,12 @@ export declare abstract class CampaignRepository {
         total: number;
         timestamp: bigint;
     }[]>;
+    static getWalletCount(campaign: {
+        id: string;
+        opportunityId: string;
+        startTimestamp: bigint;
+        endTimestamp: bigint;
+    }): Promise<number>;
     static getWalletCountOverTime(campaign: {
         id: string;
         opportunityId: string;

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

@@ -7,7 +7,7 @@ import { MAX_COMPUTE_JOB_TIME } from "@sdk";
 import moment from "moment";
 export class CampaignRepository {
     static transformQueryToPrismaFilters(query) {
-        const { creatorTag, creatorId, creatorAddress, chainId, distributionChainIds, endTimestamp, opportunityId, mainParameter, campaignId, startTimestamp, status, subType, type, types, tokenAddress, tokenSymbol, test, createdAfter, point, rootCampaignId, parentCampaignId, } = query;
+        const { id, creatorTag, creatorId, creatorAddress, chainId, distributionChainIds, endTimestamp, opportunityId, mainParameter, campaignId, startTimestamp, status, subType, type, types, tokenAddress, tokenSymbol, test, createdAfter, point, rootCampaignId, parentCampaignId, } = query;
         const getTagFilter = () => {
             if (creatorTag && creatorId)
                 return {
@@ -38,6 +38,7 @@ export class CampaignRepository {
                     };
         return {
             where: {
+                OR: id ? id.split(",").map(id => ({ id: id })) : undefined,
                 distributionChainId: !!distributionChainIds
                     ? {
                         in: distributionChainIds,
@@ -495,6 +496,19 @@ export class CampaignRepository {
             select: { timestamp: true, total: true },
         });
     }
+    static async getWalletCount(campaign) {
+        const rewardBreakdowns = await apiDbClient.rewardBreakdown.findMany({
+            where: {
+                campaignId: campaign.id,
+                Reward: { MerklRoot: { timestamp: { gte: campaign.startTimestamp, lte: campaign.endTimestamp } } },
+            },
+            select: { Reward: { select: { recipient: true, MerklRoot: { select: { timestamp: true } } } } },
+        });
+        const walletCount = new Set();
+        for (const { Reward } of rewardBreakdowns)
+            walletCount.add(Reward.recipient);
+        return walletCount.size;
+    }
     static async getWalletCountOverTime(campaign) {
         const rewardBreakdowns = await apiDbClient.rewardBreakdown.findMany({
             where: {

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

@@ -963,6 +963,7 @@ export declare abstract class CampaignService {
         endTimestamp: any;
         params: string;
     };
+    static getWalletCount(campaignId: CampaignUnique | string): Promise<number>;
     static getMetrics(campaignId: CampaignUnique | string): Promise<{
         tvlRecords: {
             total: number;
@@ -980,6 +981,6 @@ export declare abstract class CampaignService {
             timestamp: bigint;
             walletCount: number;
         }[];
-        tvlInflowPerDollar: bigint;
+        tvlInflowPerDollar: number;
     }>;
 }

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

@@ -387,6 +387,11 @@ export class CampaignService {
             params: JSON.stringify(fakeCampaign.campaignParameters),
         };
     }
+    static async getWalletCount(campaignId) {
+        const id = typeof campaignId === "string" ? campaignId : CampaignService.hashId(campaignId);
+        const campaign = await CampaignRepository.findUniqueOrThrow(id, false);
+        return await CampaignRepository.getWalletCount(campaign);
+    }
     static async getMetrics(campaignId) {
         const id = typeof campaignId === "string" ? campaignId : CampaignService.hashId(campaignId);
         const campaign = await CampaignRepository.findUniqueOrThrow(id, false);
@@ -396,16 +401,16 @@ export class CampaignService {
             CampaignRepository.getDailyRewardsRecords(campaign),
             CampaignRepository.getWalletCountOverTime(campaign),
         ]);
+        console.log("tvlRecords", tvlRecords);
         return {
             tvlRecords,
             aprRecords,
             dailyRewardsRecords,
             walletCount,
             tvlInflowPerDollar: tvlRecords.length > 1
-                ? (BigInt(tvlRecords[tvlRecords.length - 1].total) - BigInt(tvlRecords[0].total)) /
-                    ((BigInt(campaign.amount) / BigInt(10 ** campaign.RewardToken.decimals)) *
-                        BigInt(campaign.RewardToken.price ?? 1))
-                : 0n,
+                ? (tvlRecords[tvlRecords.length - 1].total - tvlRecords[0].total) /
+                    ((Number(campaign.amount) / 10 ** campaign.RewardToken.decimals) * (campaign.RewardToken.price ?? 1))
+                : 0,
         };
     }
 }

package/dist/src/modules/v4/creator/creator.controller.d.ts

@@ -157,7 +157,8 @@ export declare const CreatorController: Elysia<"/creators", false, {
                             pastCampaigns: number;
                             liveCampaigns: number;
                             futureCampaigns: number;
-                            incentivizedTvl: number;
+                            totalTvl: number;
+                            totalWallets: number;
                             totalCampaigns: number;
                             creatorId: string | null;
                         };
@@ -334,7 +335,7 @@ export declare const CreatorController: Elysia<"/creators", false, {
                                 timestamp: bigint;
                                 walletCount: number;
                             }[];
-                            tvlInflowPerDollar: bigint;
+                            tvlInflowPerDollar: number;
                         };
                     };
                 };

package/dist/src/modules/v4/creator/creator.service.d.ts

@@ -66,7 +66,8 @@ export declare abstract class CreatorService {
         pastCampaigns: number;
         liveCampaigns: number;
         futureCampaigns: number;
-        incentivizedTvl: number;
+        totalTvl: number;
+        totalWallets: number;
         totalCampaigns: number;
         creatorId: string | null;
     }>;
@@ -207,7 +208,7 @@ export declare abstract class CreatorService {
             timestamp: bigint;
             walletCount: number;
         }[];
-        tvlInflowPerDollar: bigint;
+        tvlInflowPerDollar: number;
     }>;
     static updateRebate(id: Creator["model"]["id"], rebate: UpdateCreatorRebateDto["rebate"]): Promise<{
         name: string;

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

@@ -54,12 +54,19 @@ export class CreatorService {
             CampaignService.getFutureCampaigns({ creatorAddress }),
             CreatorService.getCreatorIdFromAddress(creatorAddress),
         ]);
-        const incentivizedTvl = liveCampaigns.reduce((acc, campaign) => acc + campaign.Opportunity.tvl, 0);
+        const totalTvl = liveCampaigns.reduce((acc, campaign) => acc + campaign.Opportunity.tvl, 0);
+        // let totalWallets = 0;
+        const promises = [];
+        for (const campaign of liveCampaigns)
+            promises.push(CampaignService.getWalletCount(campaign.id));
+        const results = await Promise.all(promises);
+        const totalWallets = results.reduce((acc, walletCount) => acc + walletCount, 0);
         return {
             pastCampaigns: pastCampaigns.length,
             liveCampaigns: liveCampaigns.length,
             futureCampaigns: futureCampaigns.length,
-            incentivizedTvl,
+            totalTvl,
+            totalWallets,
             totalCampaigns: pastCampaigns.length + liveCampaigns.length + futureCampaigns.length,
             creatorId,
         };

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

@@ -145,16 +145,8 @@ export class DynamicDataService {
                         else {
                             aprCampaignValue = (campaignDailyValue * 365 * 100) / record.tvl;
                         }
-                        let lastEligibilityRatio = 1;
-                        if (!!campaignParameters.hooks?.length) {
-                            lastEligibilityRatio =
-                                (await ComputedValueService.findCampaignValue(Bun.hash(`${record.campaign.chainId}${record.campaign.campaignId}`).toString(), "averageBoost"))?.averageBoost ?? 1;
-                        }
-                        const forfeitingBoost = 1;
-                        if (!!campaignParameters.hooks?.length) {
-                            lastEligibilityRatio =
-                                (await ComputedValueService.findCampaignValue(Bun.hash(`${record.campaign.chainId}${record.campaign.campaignId}`).toString(), "forfeitingBoost"))?.forfeitingBoost ?? 1;
-                        }
+                        const lastEligibilityRatio = (await ComputedValueService.findCampaignValue(Bun.hash(`${record.campaign.chainId}${record.campaign.campaignId}`).toString(), "averageBoost"))?.averageBoost ?? 1;
+                        const forfeitingBoost = (await ComputedValueService.findCampaignValue(Bun.hash(`${record.campaign.chainId}${record.campaign.campaignId}`).toString(), "forfeitingBoost"))?.forfeitingBoost ?? 1;
                         aprCampaignValue = aprCampaignValue * lastEligibilityRatio * forfeitingBoost;
                         if (aprCampaignValue === Number.POSITIVE_INFINITY)
                             aprCampaignValue = 10_001;