@merkl/api 0.16.1 → 0.16.3

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

@@ -9,7 +9,7 @@ export declare abstract class OpportunityRepository {
     #private;
     static create(newOpp: CreateOpportunityModel, upsert?: boolean): Promise<{
         name: string;
-        type: import("../../../../database/api/.generated").$Enums.CampaignType;
+        type: string;
         id: string;
         status: import("../../../../database/api/.generated").$Enums.Status;
         tags: string[];
@@ -43,7 +43,7 @@ export declare abstract class OpportunityRepository {
                 price: number | null;
             };
         } & {
-            type: import("../../../../database/api/.generated").$Enums.CampaignType;
+            type: string;
             id: string;
             params: Prisma.JsonValue;
             subType: number | null;
@@ -156,7 +156,7 @@ export declare abstract class OpportunityRepository {
         })[];
     } & {
         name: string;
-        type: import("../../../../database/api/.generated").$Enums.CampaignType;
+        type: string;
         id: string;
         status: import("../../../../database/api/.generated").$Enums.Status;
         tags: string[];
@@ -274,7 +274,7 @@ export declare abstract class OpportunityRepository {
         })[];
     } & {
         name: string;
-        type: import("../../../../database/api/.generated").$Enums.CampaignType;
+        type: string;
         id: string;
         status: import("../../../../database/api/.generated").$Enums.Status;
         tags: string[];
@@ -309,6 +309,11 @@ export declare abstract class OpportunityRepository {
                 computedUntil: bigint;
                 processingStarted: bigint;
             }[];
+            Creator: {
+                tags: string[];
+                address: string;
+                creatorId: string | null;
+            };
             ComputeChain: {
                 name: string;
                 id: number;
@@ -340,7 +345,7 @@ export declare abstract class OpportunityRepository {
                 price: number | null;
             };
         } & {
-            type: import("../../../../database/api/.generated").$Enums.CampaignType;
+            type: string;
             id: string;
             params: Prisma.JsonValue;
             subType: number | null;
@@ -453,7 +458,7 @@ export declare abstract class OpportunityRepository {
         })[];
     } & {
         name: string;
-        type: import("../../../../database/api/.generated").$Enums.CampaignType;
+        type: string;
         id: string;
         status: import("../../../../database/api/.generated").$Enums.Status;
         tags: string[];
@@ -493,6 +498,11 @@ export declare abstract class OpportunityRepository {
                 computedUntil: bigint;
                 processingStarted: bigint;
             }[];
+            Creator: {
+                tags: string[];
+                address: string;
+                creatorId: string | null;
+            };
             ComputeChain: {
                 name: string;
                 id: number;
@@ -524,7 +534,7 @@ export declare abstract class OpportunityRepository {
                 price: number | null;
             };
         } & {
-            type: import("../../../../database/api/.generated").$Enums.CampaignType;
+            type: string;
             id: string;
             params: Prisma.JsonValue;
             subType: number | null;
@@ -637,7 +647,7 @@ export declare abstract class OpportunityRepository {
         })[];
     } & {
         name: string;
-        type: import("../../../../database/api/.generated").$Enums.CampaignType;
+        type: string;
         id: string;
         status: import("../../../../database/api/.generated").$Enums.Status;
         tags: string[];
@@ -666,7 +676,7 @@ export declare abstract class OpportunityRepository {
                 price: number | null;
             };
         } & {
-            type: import("../../../../database/api/.generated").$Enums.CampaignType;
+            type: string;
             id: string;
             params: Prisma.JsonValue;
             subType: number | null;
@@ -682,7 +692,7 @@ export declare abstract class OpportunityRepository {
         })[];
     } & {
         name: string;
-        type: import("../../../../database/api/.generated").$Enums.CampaignType;
+        type: string;
         id: string;
         status: import("../../../../database/api/.generated").$Enums.Status;
         tags: string[];
@@ -800,7 +810,7 @@ export declare abstract class OpportunityRepository {
         })[];
     } & {
         name: string;
-        type: import("../../../../database/api/.generated").$Enums.CampaignType;
+        type: string;
         id: string;
         status: import("../../../../database/api/.generated").$Enums.Status;
         tags: string[];
@@ -828,6 +838,11 @@ export declare abstract class OpportunityRepository {
                 computedUntil: bigint;
                 processingStarted: bigint;
             }[];
+            Creator: {
+                tags: string[];
+                address: string;
+                creatorId: string | null;
+            };
             ComputeChain: {
                 name: string;
                 id: number;
@@ -852,7 +867,7 @@ export declare abstract class OpportunityRepository {
                 price: number | null;
             };
         } & {
-            type: import("../../../../database/api/.generated").$Enums.CampaignType;
+            type: string;
             id: string;
             params: Prisma.JsonValue;
             subType: number | null;
@@ -965,7 +980,7 @@ export declare abstract class OpportunityRepository {
         })[];
     } & {
         name: string;
-        type: import("../../../../database/api/.generated").$Enums.CampaignType;
+        type: string;
         id: string;
         status: import("../../../../database/api/.generated").$Enums.Status;
         tags: string[];
@@ -1025,7 +1040,7 @@ export declare abstract class OpportunityRepository {
         };
         opportunity: {
             name: string;
-            type: import("../../../../database/api/.generated").$Enums.CampaignType;
+            type: string;
             id: string;
             status: import("../../../../database/api/.generated").$Enums.Status;
             tags: string[];
@@ -1041,7 +1056,7 @@ export declare abstract class OpportunityRepository {
     }>;
     static updateStatus(id: string, status: Status): Promise<{
         name: string;
-        type: import("../../../../database/api/.generated").$Enums.CampaignType;
+        type: string;
         id: string;
         status: import("../../../../database/api/.generated").$Enums.Status;
         tags: string[];
@@ -1056,7 +1071,7 @@ export declare abstract class OpportunityRepository {
     }>;
     static updateName(id: string, name: string): Promise<{
         name: string;
-        type: import("../../../../database/api/.generated").$Enums.CampaignType;
+        type: string;
         id: string;
         status: import("../../../../database/api/.generated").$Enums.Status;
         tags: string[];
@@ -1071,7 +1086,7 @@ export declare abstract class OpportunityRepository {
     }>;
     static updateChainId(id: string, chainId: MerklChainId): Promise<{
         name: string;
-        type: import("../../../../database/api/.generated").$Enums.CampaignType;
+        type: string;
         id: string;
         status: import("../../../../database/api/.generated").$Enums.Status;
         tags: string[];
@@ -1095,7 +1110,7 @@ export declare abstract class OpportunityRepository {
     }>;
     static update(id: string, data: UpdateOpportunityModel): Promise<{
         name: string;
-        type: import("../../../../database/api/.generated").$Enums.CampaignType;
+        type: string;
         id: string;
         status: import("../../../../database/api/.generated").$Enums.Status;
         tags: string[];

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

@@ -164,6 +164,7 @@ export class OpportunityRepository {
                                 Explorer: true,
                             },
                         },
+                        Creator: true,
                         CampaignStatus: true, // [][0]
                     },
                     orderBy: {
@@ -210,6 +211,7 @@ export class OpportunityRepository {
                                 Explorer: true,
                             },
                         },
+                        Creator: true,
                         CampaignStatus: true, // [][0]
                     },
                     orderBy: {
@@ -301,7 +303,13 @@ export class OpportunityRepository {
             include: {
                 ...OpportunityRepository.#getRecordInclusion(),
                 Campaigns: {
-                    include: { RewardToken: true, ComputeChain: true, DistributionChain: true, CampaignStatus: true },
+                    include: {
+                        RewardToken: true,
+                        ComputeChain: true,
+                        DistributionChain: true,
+                        CampaignStatus: true,
+                        Creator: true,
+                    },
                     take: 1,
                     orderBy: { endTimestamp: "desc" },
                 },

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

@@ -1,6 +1,6 @@
 import { type CreateCampaignModel, type GetCampaignQueryModel } from "../campaign";
 import { Prisma } from "../../../../database/api/.generated";
-import type { ChainId, MerklChainId } from "@sdk";
+import { type ChainId, type MerklChainId } from "@sdk";
 import type { CreateOpportunityModel, GetOpportunitiesQueryModel, LightOpportunityFromDB, OpportunityResourceModel, OpportunityUnique, OpportunityWithCampaignsResourceModel, UpdateOpportunityModel } from "./opportunity.model";
 import { OpportunityRepository } from "./opportunity.repository";
 export declare abstract class OpportunityService {
@@ -13,7 +13,7 @@ export declare abstract class OpportunityService {
      */
     static create(newOpp: Omit<CreateOpportunityModel, "id">): Promise<{
         name: string;
-        type: import("../../../../database/api/.generated").$Enums.CampaignType;
+        type: string;
         id: string;
         status: import("../../../../database/api/.generated").$Enums.Status;
         tags: string[];
@@ -29,7 +29,7 @@ export declare abstract class OpportunityService {
     static fakeCreateFromCampaign(campaign: Omit<CreateCampaignModel, "id">): Promise<{
         id: string;
         chainId: number;
-        type: import("../../../../database/api/.generated").$Enums.CampaignType;
+        type: string;
         identifier: string;
         name: string;
         status: "SOON";
@@ -41,7 +41,7 @@ export declare abstract class OpportunityService {
     static createFromCampaign(campaign: Omit<CreateCampaignModel, "id">, upsert?: boolean): Promise<{
         id: string;
         chainId: number;
-        type: import("../../../../database/api/.generated").$Enums.CampaignType;
+        type: string;
         identifier: string;
         name: string;
         status: "PAST" | "LIVE" | "SOON";
@@ -66,7 +66,7 @@ export declare abstract class OpportunityService {
     static updateStatusFromCampaign(campaign: Omit<CreateCampaignModel, "id">, upsert?: boolean): Promise<{
         id: string;
         chainId: number;
-        type: import("../../../../database/api/.generated").$Enums.CampaignType;
+        type: string;
         identifier: string;
         name: string;
         status: "PAST" | "LIVE" | "SOON";
@@ -93,7 +93,7 @@ export declare abstract class OpportunityService {
     static recreate(opportunityId: string | OpportunityUnique, campaignId?: string): Promise<{
         id: string;
         chainId: number;
-        type: import("../../../../database/api/.generated").$Enums.CampaignType;
+        type: string;
         identifier: string;
         name: string;
         status: "PAST" | "LIVE" | "SOON";
@@ -240,12 +240,13 @@ export declare abstract class OpportunityService {
                 computedUntil: bigint;
                 processingStarted: bigint;
             };
+            creatorAddress: string;
             Creator: {
                 tags: string[];
                 address: string;
                 creatorId: string | null;
             };
-            type: import("../../../../database/api/.generated").$Enums.CampaignType;
+            type: string;
             id: string;
             subType: number | null;
             startTimestamp: bigint;
@@ -256,7 +257,6 @@ export declare abstract class OpportunityService {
             rewardTokenId: string;
             amount: string;
             opportunityId: string;
-            creatorAddress: string;
         }[];
     })[]>;
     static getUniqueWithCampaignsOrThrow(opportunityId: string | OpportunityUnique, withTest?: boolean): Promise<OpportunityWithCampaignsResourceModel>;
@@ -345,7 +345,7 @@ export declare abstract class OpportunityService {
             icon: string;
         } | undefined;
         name: string;
-        type: import("../../../../database/api/.generated").$Enums.CampaignType;
+        type: string;
         status: import("../../../../database/api/.generated").$Enums.Status;
         tags: string[];
         identifier: string;
@@ -433,7 +433,7 @@ export declare abstract class OpportunityService {
             icon: string;
         } | undefined;
         name: string;
-        type: import("../../../../database/api/.generated").$Enums.CampaignType;
+        type: string;
         status: import("../../../../database/api/.generated").$Enums.Status;
         tags: string[];
         identifier: string;
@@ -475,12 +475,13 @@ export declare abstract class OpportunityService {
                 computedUntil: bigint;
                 processingStarted: bigint;
             };
+            creatorAddress: string;
             Creator: {
                 tags: string[];
                 address: string;
                 creatorId: string | null;
             };
-            type: import("../../../../database/api/.generated").$Enums.CampaignType;
+            type: string;
             id: string;
             subType: number | null;
             startTimestamp: bigint;
@@ -491,7 +492,6 @@ export declare abstract class OpportunityService {
             rewardTokenId: string;
             amount: string;
             opportunityId: string;
-            creatorAddress: string;
         }[];
     })[]>;
     static getAllIds(): Promise<{
@@ -583,7 +583,7 @@ export declare abstract class OpportunityService {
             icon: string;
         } | undefined;
         name: string;
-        type: import("../../../../database/api/.generated").$Enums.CampaignType;
+        type: string;
         status: import("../../../../database/api/.generated").$Enums.Status;
         tags: string[];
         identifier: string;
@@ -622,7 +622,7 @@ export declare abstract class OpportunityService {
             icon: string;
         } | undefined;
         name: string;
-        type: import("../../../../database/api/.generated").$Enums.CampaignType;
+        type: string;
         status: import("../../../../database/api/.generated").$Enums.Status;
         tags: string[];
         identifier: string;
@@ -643,7 +643,7 @@ export declare abstract class OpportunityService {
     }>;
     static update(id: string, data: UpdateOpportunityModel): Promise<{
         name: string;
-        type: import("../../../../database/api/.generated").$Enums.CampaignType;
+        type: string;
         id: string;
         status: import("../../../../database/api/.generated").$Enums.Status;
         tags: string[];

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

@@ -1,8 +1,9 @@
 import { NotFoundError } from "../../../errors";
-import { CampaignService, campaignTypeToEnumMap, } from "../campaign";
+import { CampaignService } from "../campaign";
 import { log } from "../../../utils/logger";
 import { OpportunityAction, Prisma, Status } from "../../../../database/api/.generated";
 import { record } from "@elysiajs/opentelemetry";
+import { Campaign as CampaignEnum } from "@sdk";
 import moment from "moment";
 import { CacheService } from "../cache";
 import { TTLPresets } from "../cache/cache.model";
@@ -202,7 +203,7 @@ export class OpportunityService {
         const firstCampaign = opportunity?.Campaigns.filter(campaign => campaignId ? campaign.campaignId === campaignId : true)[0];
         return await OpportunityService.createFromCampaign({
             ...firstCampaign,
-            type: campaignTypeToEnumMap[firstCampaign.type],
+            type: CampaignEnum[firstCampaign.type],
             chainId: firstCampaign.distributionChainId,
             computeChainId: firstCampaign.computeChainId,
             creator: firstCampaign.creatorAddress,

package/dist/src/modules/v4/opportunity/subservices/getErc20Metadata.service.d.ts

@@ -1,5 +1,5 @@
 import type { OpportunityMetadata } from "..";
-import type { ChainId, ERC20Campaign } from "@sdk";
+import { type ChainId, type ERC20Campaign } from "@sdk";
 import type { ERC20FixAPRCampaign, ERC20LogCampaign } from "libs/sdk/src/types/merkl/campaignTypes/erc20Log";
 import type { ERC20RebaseLogCampaign } from "libs/sdk/src/types/merkl/campaignTypes/erc20RebaseLog";
 export declare const getErc20Metadata: (computeChainId: ChainId, distributionChainId: ChainId, campaignId: string, rewardToken: string, amount: string, params: ERC20Campaign["campaignParameters"] | ERC20LogCampaign["campaignParameters"] | ERC20RebaseLogCampaign["campaignParameters"] | ERC20FixAPRCampaign["campaignParameters"]) => Promise<OpportunityMetadata>;

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

@@ -1,5 +1,5 @@
 import { log } from "../../../../utils/logger";
-import { CampaignType } from "../../../../../database/api/.generated";
+import { Campaign as CampaignEnum } from "@sdk";
 import { CampaignService } from "../../campaign";
 import { ProtocolService } from "../../protocol";
 export const getErc20Metadata = async (computeChainId, distributionChainId, campaignId, rewardToken, amount, params) => {
@@ -8,7 +8,7 @@ export const getErc20Metadata = async (computeChainId, distributionChainId, camp
     let mainProtocolId = undefined;
     const tokens = [{ chainId: computeChainId, address: params.targetToken }];
     try {
-        const [dynamicData] = await CampaignService.fetchDynamicData(computeChainId, CampaignType.ERC20, [
+        const [dynamicData] = await CampaignService.fetchDynamicData(computeChainId, CampaignEnum[CampaignEnum.ERC20], [
             {
                 campaignId,
                 rewardToken,

package/dist/src/modules/v4/opportunity/subservices/getEulerMetadata.service.d.ts

@@ -1,3 +1,3 @@
-import type { ChainId, EulerCampaign } from "@sdk";
+import { type ChainId, type EulerCampaign } from "@sdk";
 import type { OpportunityMetadata } from "../opportunity.model";
 export declare const getEulerMetadata: (chainId: ChainId, campaignId: string, campaignSubType: EulerCampaign["campaignSubType"], rewardToken: string, amount: string, params: EulerCampaign["campaignParameters"]) => Promise<OpportunityMetadata>;

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

@@ -1,12 +1,13 @@
 import { log } from "../../../../utils/logger";
-import { CampaignType, OpportunityAction } from "../../../../../database/api/.generated";
+import { OpportunityAction } from "../../../../../database/api/.generated";
+import { Campaign as CampaignEnum } from "@sdk";
 import { CampaignService } from "../../campaign";
 export const getEulerMetadata = async (chainId, campaignId, campaignSubType, rewardToken, amount, params
 // campaign: CampaignParameters<ConvertedCampaignType<"EULER">>
 ) => {
     let name = `Hold ${params.symbolTargetToken}`;
     try {
-        const [dynamicData] = await CampaignService.fetchDynamicData(chainId, CampaignType.EULER, [
+        const [dynamicData] = await CampaignService.fetchDynamicData(chainId, CampaignEnum[CampaignEnum.EULER], [
             {
                 campaignSubType,
                 campaignParameters: params,

package/dist/src/modules/v4/opportunity/validate-id.pipe.js

@@ -1,5 +1,5 @@
 import { BadRequestError } from "../../../errors";
-import { CampaignType } from "../../../../database/api/.generated";
+import { Campaign as CampaignEnum } from "@sdk";
 export const validateId = ({ params }) => {
     if (!params.id.includes("-")) {
         if (/[0-9]{1,20}/.test(params.id))
@@ -7,6 +7,6 @@ export const validateId = ({ params }) => {
         throw new BadRequestError("Invalid Opportunity id");
     }
     const [_chainId, type, _campaignId] = params.id.split("-");
-    if (!Object.values(CampaignType).includes(type))
-        throw new BadRequestError("Invalid Campaign type", Object.values(CampaignType));
+    if (!Object.values(CampaignEnum).includes(type))
+        throw new BadRequestError("Invalid Campaign type", Object.keys(CampaignEnum));
 };

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

@@ -28,7 +28,7 @@ export declare abstract class ProtocolRepository {
     static findMany(query: GetProtocolsQueryModel): Promise<({
         MainOpportunities: ({
             Campaigns: {
-                type: import("../../../../database/api/.generated").$Enums.CampaignType;
+                type: string;
                 id: string;
                 params: import("database/api/.generated/runtime/library").JsonValue;
                 subType: number | null;
@@ -44,7 +44,7 @@ export declare abstract class ProtocolRepository {
             }[];
         } & {
             name: string;
-            type: import("../../../../database/api/.generated").$Enums.CampaignType;
+            type: string;
             id: string;
             status: import("../../../../database/api/.generated").$Enums.Status;
             tags: string[];

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

@@ -56,7 +56,7 @@ export declare abstract class RewardRepository {
                     } | null;
                 } & {
                     name: string;
-                    type: import("../../../../database/api/.generated").$Enums.CampaignType;
+                    type: string;
                     id: string;
                     status: import("../../../../database/api/.generated").$Enums.Status;
                     tags: string[];

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

@@ -1,6 +1,6 @@
 import type { CacheKeys } from "../../../cache/keys";
 import type { Chain } from "../../../../database/api/.generated";
-import { Campaign, type CampaignDynamicData, type ChainId, type MerklChainId } from "@sdk";
+import { type CampaignDynamicData, Campaign as CampaignEnum, type ChainId, type MerklChainId } from "@sdk";
 import { type LightOpportunityFromDB, type Opportunity } from "../opportunity";
 import type { CampaignIdModel, CampaignIdWithoutPageModel, CreateManyBreakdownModel, CreateManyRewardModel, DailyRewardsRecord, RegisterClaimsModel, RewardBreakdown, TokenIdModel } from "./reward.model";
 import { RewardRepository } from "./reward.repository";
@@ -52,7 +52,7 @@ export declare abstract class RewardService {
             } | null;
         } & {
             name: string;
-            type: import("../../../../database/api/.generated").$Enums.CampaignType;
+            type: string;
             id: string;
             status: import("../../../../database/api/.generated").$Enums.Status;
             tags: string[];
@@ -128,7 +128,7 @@ export declare abstract class RewardService {
                 } | null;
             } & {
                 name: string;
-                type: import("../../../../database/api/.generated").$Enums.CampaignType;
+                type: string;
                 id: string;
                 status: import("../../../../database/api/.generated").$Enums.Status;
                 tags: string[];
@@ -207,7 +207,7 @@ export declare abstract class RewardService {
                     } | null;
                 } & {
                     name: string;
-                    type: import("../../../../database/api/.generated").$Enums.CampaignType;
+                    type: string;
                     id: string;
                     status: import("../../../../database/api/.generated").$Enums.Status;
                     tags: string[];
@@ -317,7 +317,7 @@ export declare abstract class RewardService {
                     } | null;
                 } & {
                     name: string;
-                    type: import("../../../../database/api/.generated").$Enums.CampaignType;
+                    type: string;
                     id: string;
                     status: import("../../../../database/api/.generated").$Enums.Status;
                     tags: string[];
@@ -408,7 +408,7 @@ export declare abstract class RewardService {
                     } | null;
                 } & {
                     name: string;
-                    type: import("../../../../database/api/.generated").$Enums.CampaignType;
+                    type: string;
                     id: string;
                     status: import("../../../../database/api/.generated").$Enums.Status;
                     tags: string[];
@@ -496,7 +496,7 @@ export declare abstract class RewardService {
                     } | null;
                 } & {
                     name: string;
-                    type: import("../../../../database/api/.generated").$Enums.CampaignType;
+                    type: string;
                     id: string;
                     status: import("../../../../database/api/.generated").$Enums.Status;
                     tags: string[];
@@ -569,5 +569,5 @@ export declare abstract class RewardService {
         claimed: string;
     }[]>;
     static getUnclaimed(x: CampaignIdWithoutPageModel): Promise<Record<string, string>>;
-    static extractDailyRewardsRecordFromDynamicData<C extends Campaign>(type: C, dynamicData: CampaignDynamicData<C>[], timestamp?: bigint): Promise<DailyRewardsRecord["model"]>;
+    static extractDailyRewardsRecordFromDynamicData<C extends CampaignEnum>(type: C, dynamicData: CampaignDynamicData<C>[], timestamp?: bigint): Promise<DailyRewardsRecord["model"]>;
 }

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

@@ -1,5 +1,5 @@
 import { log } from "../../../utils/logger";
-import { Campaign, DAY, DistributorService, NETWORK_LABELS, } from "@sdk";
+import { Campaign as CampaignEnum, DAY, DistributorService, NETWORK_LABELS, } from "@sdk";
 import moment from "moment";
 import { BlacklistService } from "../blacklist";
 import { CacheService } from "../cache";
@@ -301,7 +301,7 @@ export class RewardService {
         }, {});
     }
     static async extractDailyRewardsRecordFromDynamicData(type, dynamicData, timestamp = BigInt(moment().unix())) {
-        const typesWithoutApr = [Campaign.INVALID];
+        const typesWithoutApr = [CampaignEnum.INVALID];
         if (typesWithoutApr.includes(type))
             return { timestamp, total: 0, breakdowns: [] };
         const breakdowns = [];