@merkl/api 0.20.106 → 0.20.109

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

@@ -13,28 +13,44 @@ export declare const CampaignTestController: Elysia<"/campaigns", false, {
     macroFn: {};
 }, {
     campaigns: {
-        "dry-run": {
+        "dry-runtvl": {
             ":campaignId": {
-                "dynamic-data": {
-                    get: {
-                        body: unknown;
-                        params: {
-                            campaignId: string;
-                        };
-                        query: unknown;
-                        headers: {
-                            authorization: string;
-                        };
-                        response: {
-                            200: unknown[];
-                        };
+                get: {
+                    body: unknown;
+                    params: {
+                        campaignId: string;
+                    };
+                    query: unknown;
+                    headers: {
+                        authorization: string;
+                    };
+                    response: {
+                        200: unknown[];
+                    };
+                };
+            };
+        };
+    } & {
+        "dry-runtvls": {
+            ":opportunityId": {
+                get: {
+                    body: unknown;
+                    params: {
+                        opportunityId: string;
+                    };
+                    query: unknown;
+                    headers: {
+                        authorization: string;
+                    };
+                    response: {
+                        200: unknown[];
                     };
                 };
             };
         };
     } & {
         "dry-run": {
-            "dynamic-data": {
+            tvls: {
                 list: {
                     post: {
                         body: string[];
@@ -52,7 +68,7 @@ export declare const CampaignTestController: Elysia<"/campaigns", false, {
         };
     } & {
         "dry-run": {
-            "dynamic-data": {
+            tvl: {
                 post: {
                     body: {
                         id?: string | undefined;
@@ -79,6 +95,35 @@ export declare const CampaignTestController: Elysia<"/campaigns", false, {
                 };
             };
         };
+    } & {
+        "dry-run": {
+            tvl: {
+                get: {
+                    body: unknown;
+                    params: {};
+                    query: {
+                        decimals?: number | undefined;
+                        chainId: number;
+                        tokenAddress: string;
+                        rewardTokenAddress: string;
+                        symbolRewardToken: string;
+                    };
+                    headers: {
+                        authorization: string;
+                    };
+                    response: {
+                        200: {
+                            tvl: number;
+                            totalSupply: number;
+                            cardName: string;
+                            blacklistedSupply: number;
+                            priceTargetToken: number;
+                            type: string;
+                        };
+                    };
+                };
+            };
+        };
     } & {
         "dry-run": {
             metadata: {
@@ -143,11 +188,11 @@ export declare const CampaignTestController: Elysia<"/campaigns", false, {
                             } & {
                                 price?: number | null | undefined;
                             })[];
-                            mainProtocol: "splice" | "morpho" | "quickswap" | "euler" | "ambient" | "aura" | "poolside" | "gearbox" | "filament" | "fluid" | "compound" | "ionic" | "layerbank" | "moonwell" | "fraxlend" | "fenix" | "ra" | "syncswap" | "beefy" | "aerodrome" | "velodrome" | "curve" | "toros" | "akron" | "enzyme" | "dragonswap" | "koi" | "rfx" | "woofi" | "pendle" | "zkSwapThreePool" | "maha" | "tempest" | "holdstation" | "venus" | "reactor_fusion" | "vicuna" | "curveNPool" | "satlayer" | "veda" | "cian" | "concrete" | "hourglass" | "katana" | "gamma" | "uniswap" | "arthswap" | "base-swap" | "camelot" | "crust" | "horiza" | "izumi" | "kim" | "pancake-swap" | "ramses" | "retro" | "stryke" | "sushi-swap" | "swapr" | "thruster" | "voltage" | "zero" | "supswap" | "zk-swap" | "thirdtrade" | "swap-x" | "balancer" | "cross_curve" | "neptune" | "maverick" | "trader-joe" | "hanji" | "radiant" | "aave" | "ironclad" | "sturdy" | "frax" | "silo" | "dolomite" | "badger" | "ajna" | "ion" | "eigenlayer" | "vest" | "zerolend" | "hyperdrive" | "oku" | "kyo" | "sonex" | "lendle" | "tako-tako" | "equalizer" | "spectra" | "beraborrow" | "superlend" | "avalon" | "iguana" | "xlend" | "sake" | "sonicmarket" | "angles" | "bunni" | "beratrax" | "yei" | "gammaswap" | "uranium" | undefined;
-                            depositUrl: any;
+                            mainProtocol: "splice" | "morpho" | "quickswap" | "euler" | "aura" | "poolside" | "gearbox" | "filament" | "fluid" | "compound" | "ionic" | "layerbank" | "moonwell" | "fraxlend" | "fenix" | "ra" | "syncswap" | "beefy" | "aerodrome" | "velodrome" | "curve" | "toros" | "akron" | "enzyme" | "dragonswap" | "koi" | "rfx" | "woofi" | "pendle" | "zkSwapThreePool" | "maha" | "tempest" | "holdstation" | "venus" | "reactor_fusion" | "vicuna" | "curveNPool" | "satlayer" | "veda" | "cian" | "concrete" | "hourglass" | "katana" | "gamma" | "uniswap" | "ambient" | "arthswap" | "base-swap" | "camelot" | "crust" | "horiza" | "izumi" | "kim" | "pancake-swap" | "ramses" | "retro" | "stryke" | "sushi-swap" | "swapr" | "thruster" | "voltage" | "zero" | "supswap" | "zk-swap" | "thirdtrade" | "swap-x" | "balancer" | "cross_curve" | "neptune" | "maverick" | "trader-joe" | "hanji" | "radiant" | "aave" | "ironclad" | "sturdy" | "frax" | "silo" | "dolomite" | "badger" | "ajna" | "ion" | "eigenlayer" | "vest" | "zerolend" | "lnd" | "hyperdrive" | "oku" | "kyo" | "sonex" | "lendle" | "tako-tako" | "equalizer" | "spectra" | "beraborrow" | "superlend" | "avalon" | "iguana" | "xlend" | "sake" | "sonicmarket" | "angles" | "bunni" | "beratrax" | "yei" | "gammaswap" | "uranium" | undefined;
+                            depositUrl: string | undefined;
                             explorerAddress: string | undefined;
                             tags: string[];
-                        } | null;
+                        } | null | undefined;
                     };
                 };
             };
@@ -206,11 +251,11 @@ export declare const CampaignTestController: Elysia<"/campaigns", false, {
                             } & {
                                 price?: number | null | undefined;
                             })[];
-                            mainProtocol: "splice" | "morpho" | "quickswap" | "euler" | "ambient" | "aura" | "poolside" | "gearbox" | "filament" | "fluid" | "compound" | "ionic" | "layerbank" | "moonwell" | "fraxlend" | "fenix" | "ra" | "syncswap" | "beefy" | "aerodrome" | "velodrome" | "curve" | "toros" | "akron" | "enzyme" | "dragonswap" | "koi" | "rfx" | "woofi" | "pendle" | "zkSwapThreePool" | "maha" | "tempest" | "holdstation" | "venus" | "reactor_fusion" | "vicuna" | "curveNPool" | "satlayer" | "veda" | "cian" | "concrete" | "hourglass" | "katana" | "gamma" | "uniswap" | "arthswap" | "base-swap" | "camelot" | "crust" | "horiza" | "izumi" | "kim" | "pancake-swap" | "ramses" | "retro" | "stryke" | "sushi-swap" | "swapr" | "thruster" | "voltage" | "zero" | "supswap" | "zk-swap" | "thirdtrade" | "swap-x" | "balancer" | "cross_curve" | "neptune" | "maverick" | "trader-joe" | "hanji" | "radiant" | "aave" | "ironclad" | "sturdy" | "frax" | "silo" | "dolomite" | "badger" | "ajna" | "ion" | "eigenlayer" | "vest" | "zerolend" | "hyperdrive" | "oku" | "kyo" | "sonex" | "lendle" | "tako-tako" | "equalizer" | "spectra" | "beraborrow" | "superlend" | "avalon" | "iguana" | "xlend" | "sake" | "sonicmarket" | "angles" | "bunni" | "beratrax" | "yei" | "gammaswap" | "uranium" | undefined;
-                            depositUrl: any;
+                            mainProtocol: "splice" | "morpho" | "quickswap" | "euler" | "aura" | "poolside" | "gearbox" | "filament" | "fluid" | "compound" | "ionic" | "layerbank" | "moonwell" | "fraxlend" | "fenix" | "ra" | "syncswap" | "beefy" | "aerodrome" | "velodrome" | "curve" | "toros" | "akron" | "enzyme" | "dragonswap" | "koi" | "rfx" | "woofi" | "pendle" | "zkSwapThreePool" | "maha" | "tempest" | "holdstation" | "venus" | "reactor_fusion" | "vicuna" | "curveNPool" | "satlayer" | "veda" | "cian" | "concrete" | "hourglass" | "katana" | "gamma" | "uniswap" | "ambient" | "arthswap" | "base-swap" | "camelot" | "crust" | "horiza" | "izumi" | "kim" | "pancake-swap" | "ramses" | "retro" | "stryke" | "sushi-swap" | "swapr" | "thruster" | "voltage" | "zero" | "supswap" | "zk-swap" | "thirdtrade" | "swap-x" | "balancer" | "cross_curve" | "neptune" | "maverick" | "trader-joe" | "hanji" | "radiant" | "aave" | "ironclad" | "sturdy" | "frax" | "silo" | "dolomite" | "badger" | "ajna" | "ion" | "eigenlayer" | "vest" | "zerolend" | "lnd" | "hyperdrive" | "oku" | "kyo" | "sonex" | "lendle" | "tako-tako" | "equalizer" | "spectra" | "beraborrow" | "superlend" | "avalon" | "iguana" | "xlend" | "sake" | "sonicmarket" | "angles" | "bunni" | "beratrax" | "yei" | "gammaswap" | "uranium" | undefined;
+                            depositUrl: string | undefined;
                             explorerAddress: string | undefined;
                             tags: string[];
-                        } | null;
+                        } | null | undefined;
                     };
                 };
             };

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

@@ -2,10 +2,11 @@ import { NotFoundError } from "@/errors";
 import { InvalidParameter } from "@/errors/InvalidParameter.error";
 import { BackOfficeGuard } from "@/guards/BackOffice.guard";
 import { AuthorizationHeadersDto } from "@/guards/Engine.guard";
+import { throwOnUnsupportedChainId } from "@/utils/throw";
 import { Campaign as CampaignEnum } from "@sdk";
 import Elysia from "elysia";
+import { DynamicDataSourceIdentifier } from "../dynamicData/dynamicData.model";
 import { DynamicDataService } from "../dynamicData/dynamicData.service";
-import { OpportunityService } from "../opportunity";
 import { OpportunityConvertorService } from "../opportunity/opportunity.converter";
 import { CampaignConfigMinimal, CampaignUniqueDto, CampaignsDto } from "./campaign.model";
 import { CampaignService } from "./campaign.service";
@@ -18,8 +19,8 @@ export const CampaignTestController = new Elysia({
     headers: AuthorizationHeadersDto,
     beforeHandle: BackOfficeGuard,
 })
-    // ─── Test Dynamic data computation given a campaignId ───────────────────────
-    .get("/:campaignId/dynamic-data", async ({ params }) => {
+    // ─── Test TVL computation given a campaignId ───────────────────────
+    .get("tvl/:campaignId", async ({ params }) => {
     const id = (await CampaignService.findMany({ campaignId: params.campaignId, test: true }))?.[0]?.id;
     if (!id)
         throw new NotFoundError();
@@ -27,8 +28,21 @@ export const CampaignTestController = new Elysia({
     const campaignV3 = OpportunityConvertorService.convertV4CampaignToV3(CampaignEnum[campaign.type], CampaignService.format(campaign), campaign.Opportunity.identifier);
     return await DynamicDataService.update(campaignV3.computeChainId, campaignV3.campaignType, [campaignV3], true);
 })
-    // ─── Test Dynamic data computation with a list of campaignId ───────────────────────
-    .post("/dynamic-data/list", async ({ body }) => {
+    // ─── Test TVL computation given a campaignId ───────────────────────
+    .get("tvls/:opportunityId", async ({ params }) => {
+    const campaigns = (await CampaignService.findMany({
+        opportunityId: params.opportunityId,
+        status: "LIVE",
+        test: true,
+        withOpportunity: true,
+        items: 10_000,
+    })).map(campaign => OpportunityConvertorService.convertV4CampaignToV3(CampaignEnum[campaign.type], campaign, campaign.Opportunity.identifier));
+    if (!campaigns.length)
+        throw new NotFoundError("Opportunity not found");
+    return await DynamicDataService.update(campaigns[0]?.computeChainId, campaigns[0].campaignType, campaigns, true);
+})
+    // ─── Test TVL computation with a list of campaignId ───────────────────────
+    .post("/tvls/list", async ({ body }) => {
     const listCampaigns = [];
     const type = undefined;
     for (const campaignId of body) {
@@ -43,18 +57,27 @@ export const CampaignTestController = new Elysia({
         throw new InvalidParameter("No campaign type found");
     return await DynamicDataService.update(listCampaigns[0].computeChainId, listCampaigns[0].campaignType, listCampaigns, true);
 }, { body: CampaignsDto })
-    // ─── Test Dynamic data computation with campaign config ───────────────────────
-    .post("/dynamic-data", async ({ body }) => {
+    // ─── Test TVL computation with campaign config ───────────────────────
+    .post("/tvl", async ({ body }) => {
     const campaign = CampaignService.createFakeCampaign(body);
     return await DynamicDataService.update(campaign.computeChainId, campaign.campaignType, [campaign], true);
 }, {
     body: CampaignConfigMinimal,
+})
+    // ─── Test TVL computation with campaign config ───────────────────────
+    .get("/tvl", async ({ query }) => await DynamicDataService.queryERC20DynamicData(query.chainId, query.tokenAddress, query.rewardTokenAddress, query.symbolRewardToken, query.decimals), {
+    query: DynamicDataSourceIdentifier,
+    headers: AuthorizationHeadersDto,
+    beforeHandle: async ({ query, headers }) => {
+        await BackOfficeGuard({ headers });
+        throwOnUnsupportedChainId(query.chainId);
+    },
 })
     // ─── Test Opportunity creation through a campaign config ───────────────────────
     // @dev Starts from the engine db to debug opportunity creation failing and preventing the api db to be filled
     .post("/metadata", async ({ body }) => {
     const engineCampaign = CampaignService.createFakeCampaignEngine(body);
-    return await OpportunityService.createFromCampaign(engineCampaign, false, true);
+    return await CampaignService.create(engineCampaign, true);
 }, {
     body: CampaignConfigMinimal,
 })
@@ -69,7 +92,7 @@ export const CampaignTestController = new Elysia({
     ]);
     if (!engineCampaigns.length)
         throw new NotFoundError("Campaign not found in engine db");
-    return await OpportunityService.createFromCampaign(engineCampaigns[0], false, true);
+    return await CampaignService.create(engineCampaigns[0], true);
 }, {
     query: CampaignUniqueDto,
 }));

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

@@ -125,13 +125,15 @@ export declare const ChainController: Elysia<"/chains", false, {
                 };
                 response: {
                     200: {
-                        name: string;
                         Explorer: {
                             id: string;
                             type: import("@db/api").$Enums.ExplorerType;
                             url: string;
                             chainId: number;
                         }[];
+                        id: number;
+                        name: string;
+                        icon: string;
                     };
                 };
             };

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

@@ -63,22 +63,28 @@ export declare class ChainRepository {
      * @returns
      */
     static create(data: CreateChainModel): Promise<{
-        name: string;
         Explorer: {
             id: string;
             type: import("@db/api").$Enums.ExplorerType;
             url: string;
             chainId: number;
         }[];
+    } & {
+        id: number;
+        name: string;
+        icon: string;
     }>;
     static findUniqueOrThrow(id: number): Promise<{
-        name: string;
         Explorer: {
             id: string;
             type: import("@db/api").$Enums.ExplorerType;
             url: string;
             chainId: number;
         }[];
+    } & {
+        id: number;
+        name: string;
+        icon: string;
     }>;
     static update(id: number, data: UpdateChainModel): Promise<{
         id: number;

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

@@ -62,9 +62,8 @@ export class ChainRepository {
             where: {
                 id,
             },
-            select: {
+            include: {
                 Explorer: true,
-                name: true,
             },
         });
     }

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

@@ -24,6 +24,18 @@ export declare abstract class ChainService {
         name: string;
         icon: string;
     })[]>;
+    static findUniqueOrThrow(id: number): Promise<{
+        Explorer: {
+            id: string;
+            type: import("@db/api").$Enums.ExplorerType;
+            url: string;
+            chainId: number;
+        }[];
+    } & {
+        id: number;
+        name: string;
+        icon: string;
+    }>;
     static countMany(query: ChainSearchDto): Promise<number>;
     /** List all chainIds available in the databse
      * @warning some chains may not be fully integrated yet
@@ -35,13 +47,16 @@ export declare abstract class ChainService {
      */
     static getSupportedIds(): Promise<number[]>;
     static create(chain: CreateChainModel): Promise<{
-        name: string;
         Explorer: {
             id: string;
             type: import("@db/api").$Enums.ExplorerType;
             url: string;
             chainId: number;
         }[];
+    } & {
+        id: number;
+        name: string;
+        icon: string;
     }>;
     static update(id: number, data: UpdateChainModel): Promise<{
         id: number;
@@ -53,5 +68,4 @@ export declare abstract class ChainService {
         name: string;
         icon: string;
     }>;
-    static getName(id: number): Promise<string>;
 }

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

@@ -12,6 +12,9 @@ export class ChainService {
             return ChainRepository.findMany(query);
         return await CacheService.wrap(TTLPresets.MIN_10, ChainRepository.findMany, query);
     }
+    static async findUniqueOrThrow(id) {
+        return await ChainRepository.findUniqueOrThrow(id);
+    }
     static async countMany(query) {
         return await ChainRepository.countMany(query);
     }
@@ -47,7 +50,4 @@ export class ChainService {
     static async updateDailyRewards(id, dailyRewards) {
         return await ChainRepository.update(id, { dailyRewards });
     }
-    static async getName(id) {
-        return (await ChainRepository.findUniqueOrThrow(id)).name;
-    }
 }

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

@@ -1,5 +1,6 @@
-import { campaignTVLBuilderFactory } from "@/engine/campaignTVL/factory";
-import { dynamicDataBuilderFactory } from "@/engine/dynamicData/factory";
+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";
 import { OpportunityRepository } from "@/modules/v4/opportunity/opportunity.repository";
@@ -13,6 +14,7 @@ import { Campaign as CampaignEnum, DAY, NETWORK_LABELS, } from "@sdk";
 import moment from "moment";
 import { AprService } from "../apr";
 import { CampaignService } from "../campaign";
+import { ComputedValueService } from "../computedValue/computedValue.service";
 import { TokenService } from "../token/token.service";
 export class DynamicDataService {
     /**
@@ -62,29 +64,52 @@ export class DynamicDataService {
                     breakdowns: [],
                 };
                 for (const record of recordsForOpportunity) {
+                    const { startTimestamp, endTimestamp, rewardToken: rewardTokenAddress, campaignParameters } = record.campaign;
                     // 2.b.1 TVL of the opportunity is the max of all TVLs of the campaigns
                     if (record.tvl > tvl.total) {
                         tvl.total = record.tvl;
                         tvl.breakdowns = record.tvlBreakdown;
                     }
-                    const startTimestamp = record.campaign.startTimestamp;
-                    const endTimestamp = record.campaign.endTimestamp;
-                    const rewardToken = record.campaign.rewardToken;
+                    if (!!record.displayTvl && record.displayTvl > tvl.total) {
+                        tvl.total = record.displayTvl;
+                    }
                     try {
                         // 2.b.2 Daily rewards is the sum of all daily rewards of the campaigns
                         const timespan = endTimestamp - startTimestamp;
                         const isWithinTimespan = moment().unix() > startTimestamp && moment().unix() < endTimestamp;
                         const dayspan = Math.max(1, Math.floor(timespan / DAY));
-                        const dailyAmount = isWithinTimespan ? BigInt(record.campaign.amount) / BigInt(dayspan) : BigInt(0);
-                        let token;
+                        let dailyAmount = isWithinTimespan ? BigInt(record.campaign.amount) / BigInt(dayspan) : BigInt(0);
+                        let rewardToken;
                         try {
-                            token = await TokenService.findUniqueOrThrow({ address: rewardToken, chainId: record.campaign.chainId });
+                            rewardToken = await TokenService.findUniqueOrThrow({
+                                address: rewardTokenAddress,
+                                chainId: record.campaign.chainId,
+                            });
                         }
                         catch {
-                            await TokenService.findManyOrCreate([{ address: rewardToken, chainId: record.campaign.chainId }]);
-                            token = await TokenService.findUniqueOrThrow({ address: rewardToken, chainId: record.campaign.chainId });
+                            await TokenService.findManyOrCreate([{ address: rewardTokenAddress, chainId: record.campaign.chainId }]);
+                            rewardToken = await TokenService.findUniqueOrThrow({
+                                address: rewardTokenAddress,
+                                chainId: record.campaign.chainId,
+                            });
+                        }
+                        let campaignDailyValue = await TokenService.getValueByTokenId(TokenService.hashId({ address: rewardTokenAddress, chainId: record.campaign.chainId }), dailyAmount);
+                        // Fixed APR campaigns
+                        if (hasFixedAprConfig(campaignParameters)) {
+                            const { targetTokenPricing, rewardTokenPricing, apr: fixedApr } = campaignParameters;
+                            const targetApr = Number(fixedApr);
+                            if (targetTokenPricing && rewardTokenPricing) {
+                                // 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
+                                // Return 0 if reward token price is invalid
+                                campaignDailyValue = !rewardToken.price ? 0 : targetApr * rewardToken.price * tvl.total;
+                                dailyAmount = BigInt((campaignDailyValue / (rewardToken.price ?? 1)) * 10 ** rewardToken.decimals);
+                            }
                         }
-                        const campaignDailyValue = await TokenService.getValueByTokenId(TokenService.hashId({ address: rewardToken, chainId: record.campaign.chainId }), dailyAmount);
                         dailyRewards.total += campaignDailyValue;
                         if (campaignDailyValue > 0) {
                             dailyRewards.breakdowns.push({
@@ -94,18 +119,29 @@ export class DynamicDataService {
                                 }),
                                 value: campaignDailyValue,
                                 amount: dailyAmount,
-                                token,
+                                token: rewardToken,
                             });
                         }
                         // 2.b.3 APR is obtained from daily rewards and tvl following the distribution type
                         // TODO: switch on distribution type - dailyRewards can be in token amount
                         let aprCampaignValue;
-                        if (token.isPoint) {
+                        if (rewardToken.isPoint) {
                             aprCampaignValue = campaignDailyValue / record.tvl;
                         }
                         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;
+                        }
+                        aprCampaignValue = aprCampaignValue * lastEligibilityRatio * forfeitingBoost;
                         if (aprCampaignValue === Number.POSITIVE_INFINITY)
                             aprCampaignValue = 10_001;
                         if (aprCampaignValue > 0) {

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

@@ -156,8 +156,8 @@ export declare const OpportunityController: Elysia<"/opportunities", false, {
                             } & {
                                 price?: number | null | undefined;
                             })[];
-                            mainProtocol: "splice" | "morpho" | "quickswap" | "euler" | "ambient" | "aura" | "poolside" | "gearbox" | "filament" | "fluid" | "compound" | "ionic" | "layerbank" | "moonwell" | "fraxlend" | "fenix" | "ra" | "syncswap" | "beefy" | "aerodrome" | "velodrome" | "curve" | "toros" | "akron" | "enzyme" | "dragonswap" | "koi" | "rfx" | "woofi" | "pendle" | "zkSwapThreePool" | "maha" | "tempest" | "holdstation" | "venus" | "reactor_fusion" | "vicuna" | "curveNPool" | "satlayer" | "veda" | "cian" | "concrete" | "hourglass" | "katana" | "gamma" | "uniswap" | "arthswap" | "base-swap" | "camelot" | "crust" | "horiza" | "izumi" | "kim" | "pancake-swap" | "ramses" | "retro" | "stryke" | "sushi-swap" | "swapr" | "thruster" | "voltage" | "zero" | "supswap" | "zk-swap" | "thirdtrade" | "swap-x" | "balancer" | "cross_curve" | "neptune" | "maverick" | "trader-joe" | "hanji" | "radiant" | "aave" | "ironclad" | "sturdy" | "frax" | "silo" | "dolomite" | "badger" | "ajna" | "ion" | "eigenlayer" | "vest" | "zerolend" | "hyperdrive" | "oku" | "kyo" | "sonex" | "lendle" | "tako-tako" | "equalizer" | "spectra" | "beraborrow" | "superlend" | "avalon" | "iguana" | "xlend" | "sake" | "sonicmarket" | "angles" | "bunni" | "beratrax" | "yei" | "gammaswap" | "uranium" | undefined;
-                            depositUrl: any;
+                            mainProtocol: "splice" | "morpho" | "quickswap" | "euler" | "aura" | "poolside" | "gearbox" | "filament" | "fluid" | "compound" | "ionic" | "layerbank" | "moonwell" | "fraxlend" | "fenix" | "ra" | "syncswap" | "beefy" | "aerodrome" | "velodrome" | "curve" | "toros" | "akron" | "enzyme" | "dragonswap" | "koi" | "rfx" | "woofi" | "pendle" | "zkSwapThreePool" | "maha" | "tempest" | "holdstation" | "venus" | "reactor_fusion" | "vicuna" | "curveNPool" | "satlayer" | "veda" | "cian" | "concrete" | "hourglass" | "katana" | "gamma" | "uniswap" | "ambient" | "arthswap" | "base-swap" | "camelot" | "crust" | "horiza" | "izumi" | "kim" | "pancake-swap" | "ramses" | "retro" | "stryke" | "sushi-swap" | "swapr" | "thruster" | "voltage" | "zero" | "supswap" | "zk-swap" | "thirdtrade" | "swap-x" | "balancer" | "cross_curve" | "neptune" | "maverick" | "trader-joe" | "hanji" | "radiant" | "aave" | "ironclad" | "sturdy" | "frax" | "silo" | "dolomite" | "badger" | "ajna" | "ion" | "eigenlayer" | "vest" | "zerolend" | "lnd" | "hyperdrive" | "oku" | "kyo" | "sonex" | "lendle" | "tako-tako" | "equalizer" | "spectra" | "beraborrow" | "superlend" | "avalon" | "iguana" | "xlend" | "sake" | "sonicmarket" | "angles" | "bunni" | "beratrax" | "yei" | "gammaswap" | "uranium" | undefined;
+                            depositUrl: string | undefined;
                             explorerAddress: string | undefined;
                             tags: string[];
                         } | null;
@@ -220,8 +220,8 @@ export declare const OpportunityController: Elysia<"/opportunities", false, {
                         } & {
                             price?: number | null | undefined;
                         })[];
-                        mainProtocol: "splice" | "morpho" | "quickswap" | "euler" | "ambient" | "aura" | "poolside" | "gearbox" | "filament" | "fluid" | "compound" | "ionic" | "layerbank" | "moonwell" | "fraxlend" | "fenix" | "ra" | "syncswap" | "beefy" | "aerodrome" | "velodrome" | "curve" | "toros" | "akron" | "enzyme" | "dragonswap" | "koi" | "rfx" | "woofi" | "pendle" | "zkSwapThreePool" | "maha" | "tempest" | "holdstation" | "venus" | "reactor_fusion" | "vicuna" | "curveNPool" | "satlayer" | "veda" | "cian" | "concrete" | "hourglass" | "katana" | "gamma" | "uniswap" | "arthswap" | "base-swap" | "camelot" | "crust" | "horiza" | "izumi" | "kim" | "pancake-swap" | "ramses" | "retro" | "stryke" | "sushi-swap" | "swapr" | "thruster" | "voltage" | "zero" | "supswap" | "zk-swap" | "thirdtrade" | "swap-x" | "balancer" | "cross_curve" | "neptune" | "maverick" | "trader-joe" | "hanji" | "radiant" | "aave" | "ironclad" | "sturdy" | "frax" | "silo" | "dolomite" | "badger" | "ajna" | "ion" | "eigenlayer" | "vest" | "zerolend" | "hyperdrive" | "oku" | "kyo" | "sonex" | "lendle" | "tako-tako" | "equalizer" | "spectra" | "beraborrow" | "superlend" | "avalon" | "iguana" | "xlend" | "sake" | "sonicmarket" | "angles" | "bunni" | "beratrax" | "yei" | "gammaswap" | "uranium" | undefined;
-                        depositUrl: any;
+                        mainProtocol: "splice" | "morpho" | "quickswap" | "euler" | "aura" | "poolside" | "gearbox" | "filament" | "fluid" | "compound" | "ionic" | "layerbank" | "moonwell" | "fraxlend" | "fenix" | "ra" | "syncswap" | "beefy" | "aerodrome" | "velodrome" | "curve" | "toros" | "akron" | "enzyme" | "dragonswap" | "koi" | "rfx" | "woofi" | "pendle" | "zkSwapThreePool" | "maha" | "tempest" | "holdstation" | "venus" | "reactor_fusion" | "vicuna" | "curveNPool" | "satlayer" | "veda" | "cian" | "concrete" | "hourglass" | "katana" | "gamma" | "uniswap" | "ambient" | "arthswap" | "base-swap" | "camelot" | "crust" | "horiza" | "izumi" | "kim" | "pancake-swap" | "ramses" | "retro" | "stryke" | "sushi-swap" | "swapr" | "thruster" | "voltage" | "zero" | "supswap" | "zk-swap" | "thirdtrade" | "swap-x" | "balancer" | "cross_curve" | "neptune" | "maverick" | "trader-joe" | "hanji" | "radiant" | "aave" | "ironclad" | "sturdy" | "frax" | "silo" | "dolomite" | "badger" | "ajna" | "ion" | "eigenlayer" | "vest" | "zerolend" | "lnd" | "hyperdrive" | "oku" | "kyo" | "sonex" | "lendle" | "tako-tako" | "equalizer" | "spectra" | "beraborrow" | "superlend" | "avalon" | "iguana" | "xlend" | "sake" | "sonicmarket" | "angles" | "bunni" | "beratrax" | "yei" | "gammaswap" | "uranium" | undefined;
+                        depositUrl: string | undefined;
                         explorerAddress: string | undefined;
                         tags: string[];
                     } | null;

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

@@ -1,8 +1,9 @@
 import { Campaign as CampaignEnum, type CampaignParameters, type Opportunity as OpportunityV3 } from "@sdk";
+import type { CampaignWithParams } from "../campaign";
 import { OpportunityService } from "./opportunity.service";
 export declare abstract class OpportunityConvertorService {
     #private;
-    static convertV4CampaignToV3<C extends CampaignEnum>(campaignType: C, campaign: Exclude<Awaited<ReturnType<(typeof OpportunityService)["findMany"]>>[number]["campaigns"], undefined>[number], opportunityIdentifier: string): CampaignParameters<C>;
+    static convertV4CampaignToV3<C extends CampaignEnum>(campaignType: C, campaign: Exclude<Awaited<ReturnType<(typeof OpportunityService)["findMany"]>>[number]["campaigns"], undefined>[number] | Omit<CampaignWithParams<C>, "manualOverrides">, opportunityIdentifier: string): CampaignParameters<C>;
     static convertV4toV3(opportunity: Awaited<ReturnType<(typeof OpportunityService)["findMany"]>>[number], withCampaigns?: boolean): OpportunityV3;
     static setV3Opportunities(showCampaigns: boolean, test: boolean | undefined, identifier: string | undefined, chainId: string | undefined): Promise<{}>;
     static logKeyAndTTLV3Opportunities(showCampaigns: boolean, test: boolean | undefined, identifier: string | undefined, chainId: string | undefined): Promise<void>;

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

@@ -15,7 +15,7 @@ export class OpportunityConvertorService {
             campaignSubType: campaign.subType ?? 0,
             campaignType,
             chainId: campaign.distributionChain?.id ?? 0,
-            creator: campaign.creator.address,
+            creator: campaign.creatorAddress,
             index: 0, // DEPRECATED
             mainParameter: opportunityIdentifier,
             endTimestamp: Number(campaign.endTimestamp),

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

@@ -1,4 +1,4 @@
-import { type CreateCampaignModel, type GetCampaignQueryModel } from "@/modules/v4/campaign";
+import { type CampaignWithParams, type GetCampaignQueryModel } from "@/modules/v4/campaign";
 import { type OpportunityManualOverride, type Prisma } from "@db/api";
 import { type MerklChainId } from "@sdk";
 import type { CreateOpportunityModel, GetOpportunitiesQueryModel, LightOpportunityFromDB, Opportunity, OpportunityOverrideModel, OpportunityResourceModel, OpportunityUnique } from "./opportunity.model";
@@ -64,8 +64,8 @@ export declare abstract class OpportunityService {
         } & {
             price?: number | null | undefined;
         })[];
-        mainProtocol: "splice" | "morpho" | "quickswap" | "euler" | "ambient" | "aura" | "poolside" | "gearbox" | "filament" | "fluid" | "compound" | "ionic" | "layerbank" | "moonwell" | "fraxlend" | "fenix" | "ra" | "syncswap" | "beefy" | "aerodrome" | "velodrome" | "curve" | "toros" | "akron" | "enzyme" | "dragonswap" | "koi" | "rfx" | "woofi" | "pendle" | "zkSwapThreePool" | "maha" | "tempest" | "holdstation" | "venus" | "reactor_fusion" | "vicuna" | "curveNPool" | "satlayer" | "veda" | "cian" | "concrete" | "hourglass" | "katana" | "gamma" | "uniswap" | "arthswap" | "base-swap" | "camelot" | "crust" | "horiza" | "izumi" | "kim" | "pancake-swap" | "ramses" | "retro" | "stryke" | "sushi-swap" | "swapr" | "thruster" | "voltage" | "zero" | "supswap" | "zk-swap" | "thirdtrade" | "swap-x" | "balancer" | "cross_curve" | "neptune" | "maverick" | "trader-joe" | "hanji" | "radiant" | "aave" | "ironclad" | "sturdy" | "frax" | "silo" | "dolomite" | "badger" | "ajna" | "ion" | "eigenlayer" | "vest" | "zerolend" | "hyperdrive" | "oku" | "kyo" | "sonex" | "lendle" | "tako-tako" | "equalizer" | "spectra" | "beraborrow" | "superlend" | "avalon" | "iguana" | "xlend" | "sake" | "sonicmarket" | "angles" | "bunni" | "beratrax" | "yei" | "gammaswap" | "uranium" | undefined;
-        depositUrl: any;
+        mainProtocol: "splice" | "morpho" | "quickswap" | "euler" | "aura" | "poolside" | "gearbox" | "filament" | "fluid" | "compound" | "ionic" | "layerbank" | "moonwell" | "fraxlend" | "fenix" | "ra" | "syncswap" | "beefy" | "aerodrome" | "velodrome" | "curve" | "toros" | "akron" | "enzyme" | "dragonswap" | "koi" | "rfx" | "woofi" | "pendle" | "zkSwapThreePool" | "maha" | "tempest" | "holdstation" | "venus" | "reactor_fusion" | "vicuna" | "curveNPool" | "satlayer" | "veda" | "cian" | "concrete" | "hourglass" | "katana" | "gamma" | "uniswap" | "ambient" | "arthswap" | "base-swap" | "camelot" | "crust" | "horiza" | "izumi" | "kim" | "pancake-swap" | "ramses" | "retro" | "stryke" | "sushi-swap" | "swapr" | "thruster" | "voltage" | "zero" | "supswap" | "zk-swap" | "thirdtrade" | "swap-x" | "balancer" | "cross_curve" | "neptune" | "maverick" | "trader-joe" | "hanji" | "radiant" | "aave" | "ironclad" | "sturdy" | "frax" | "silo" | "dolomite" | "badger" | "ajna" | "ion" | "eigenlayer" | "vest" | "zerolend" | "lnd" | "hyperdrive" | "oku" | "kyo" | "sonex" | "lendle" | "tako-tako" | "equalizer" | "spectra" | "beraborrow" | "superlend" | "avalon" | "iguana" | "xlend" | "sake" | "sonicmarket" | "angles" | "bunni" | "beratrax" | "yei" | "gammaswap" | "uranium" | undefined;
+        depositUrl: string | undefined;
         explorerAddress: string | undefined;
         tags: string[];
     } | null>;
@@ -97,7 +97,7 @@ export declare abstract class OpportunityService {
      * @param dryRun whether to skip the opportunity table interaction and just return the computed opportunity
      * @returns the opportunity entity computed
      */
-    static createFromCampaign(campaign: Omit<CreateCampaignModel, "id">, upsert?: boolean, dryRun?: boolean): Promise<{
+    static createFromCampaign(campaign: Omit<CampaignWithParams, "manualOverrides">, opportunityIdentifier: string, upsert?: boolean, dryRun?: boolean): Promise<{
         id: string;
         name: string;
         type: string;
@@ -137,8 +137,8 @@ export declare abstract class OpportunityService {
         } & {
             price?: number | null | undefined;
         })[];
-        mainProtocol: "splice" | "morpho" | "quickswap" | "euler" | "ambient" | "aura" | "poolside" | "gearbox" | "filament" | "fluid" | "compound" | "ionic" | "layerbank" | "moonwell" | "fraxlend" | "fenix" | "ra" | "syncswap" | "beefy" | "aerodrome" | "velodrome" | "curve" | "toros" | "akron" | "enzyme" | "dragonswap" | "koi" | "rfx" | "woofi" | "pendle" | "zkSwapThreePool" | "maha" | "tempest" | "holdstation" | "venus" | "reactor_fusion" | "vicuna" | "curveNPool" | "satlayer" | "veda" | "cian" | "concrete" | "hourglass" | "katana" | "gamma" | "uniswap" | "arthswap" | "base-swap" | "camelot" | "crust" | "horiza" | "izumi" | "kim" | "pancake-swap" | "ramses" | "retro" | "stryke" | "sushi-swap" | "swapr" | "thruster" | "voltage" | "zero" | "supswap" | "zk-swap" | "thirdtrade" | "swap-x" | "balancer" | "cross_curve" | "neptune" | "maverick" | "trader-joe" | "hanji" | "radiant" | "aave" | "ironclad" | "sturdy" | "frax" | "silo" | "dolomite" | "badger" | "ajna" | "ion" | "eigenlayer" | "vest" | "zerolend" | "hyperdrive" | "oku" | "kyo" | "sonex" | "lendle" | "tako-tako" | "equalizer" | "spectra" | "beraborrow" | "superlend" | "avalon" | "iguana" | "xlend" | "sake" | "sonicmarket" | "angles" | "bunni" | "beratrax" | "yei" | "gammaswap" | "uranium" | undefined;
-        depositUrl: any;
+        mainProtocol: "splice" | "morpho" | "quickswap" | "euler" | "aura" | "poolside" | "gearbox" | "filament" | "fluid" | "compound" | "ionic" | "layerbank" | "moonwell" | "fraxlend" | "fenix" | "ra" | "syncswap" | "beefy" | "aerodrome" | "velodrome" | "curve" | "toros" | "akron" | "enzyme" | "dragonswap" | "koi" | "rfx" | "woofi" | "pendle" | "zkSwapThreePool" | "maha" | "tempest" | "holdstation" | "venus" | "reactor_fusion" | "vicuna" | "curveNPool" | "satlayer" | "veda" | "cian" | "concrete" | "hourglass" | "katana" | "gamma" | "uniswap" | "ambient" | "arthswap" | "base-swap" | "camelot" | "crust" | "horiza" | "izumi" | "kim" | "pancake-swap" | "ramses" | "retro" | "stryke" | "sushi-swap" | "swapr" | "thruster" | "voltage" | "zero" | "supswap" | "zk-swap" | "thirdtrade" | "swap-x" | "balancer" | "cross_curve" | "neptune" | "maverick" | "trader-joe" | "hanji" | "radiant" | "aave" | "ironclad" | "sturdy" | "frax" | "silo" | "dolomite" | "badger" | "ajna" | "ion" | "eigenlayer" | "vest" | "zerolend" | "lnd" | "hyperdrive" | "oku" | "kyo" | "sonex" | "lendle" | "tako-tako" | "equalizer" | "spectra" | "beraborrow" | "superlend" | "avalon" | "iguana" | "xlend" | "sake" | "sonicmarket" | "angles" | "bunni" | "beratrax" | "yei" | "gammaswap" | "uranium" | undefined;
+        depositUrl: string | undefined;
         explorerAddress: string | undefined;
         tags: string[];
     } | null>;
@@ -185,8 +185,8 @@ export declare abstract class OpportunityService {
         } & {
             price?: number | null | undefined;
         })[];
-        mainProtocol: "splice" | "morpho" | "quickswap" | "euler" | "ambient" | "aura" | "poolside" | "gearbox" | "filament" | "fluid" | "compound" | "ionic" | "layerbank" | "moonwell" | "fraxlend" | "fenix" | "ra" | "syncswap" | "beefy" | "aerodrome" | "velodrome" | "curve" | "toros" | "akron" | "enzyme" | "dragonswap" | "koi" | "rfx" | "woofi" | "pendle" | "zkSwapThreePool" | "maha" | "tempest" | "holdstation" | "venus" | "reactor_fusion" | "vicuna" | "curveNPool" | "satlayer" | "veda" | "cian" | "concrete" | "hourglass" | "katana" | "gamma" | "uniswap" | "arthswap" | "base-swap" | "camelot" | "crust" | "horiza" | "izumi" | "kim" | "pancake-swap" | "ramses" | "retro" | "stryke" | "sushi-swap" | "swapr" | "thruster" | "voltage" | "zero" | "supswap" | "zk-swap" | "thirdtrade" | "swap-x" | "balancer" | "cross_curve" | "neptune" | "maverick" | "trader-joe" | "hanji" | "radiant" | "aave" | "ironclad" | "sturdy" | "frax" | "silo" | "dolomite" | "badger" | "ajna" | "ion" | "eigenlayer" | "vest" | "zerolend" | "hyperdrive" | "oku" | "kyo" | "sonex" | "lendle" | "tako-tako" | "equalizer" | "spectra" | "beraborrow" | "superlend" | "avalon" | "iguana" | "xlend" | "sake" | "sonicmarket" | "angles" | "bunni" | "beratrax" | "yei" | "gammaswap" | "uranium" | undefined;
-        depositUrl: any;
+        mainProtocol: "splice" | "morpho" | "quickswap" | "euler" | "aura" | "poolside" | "gearbox" | "filament" | "fluid" | "compound" | "ionic" | "layerbank" | "moonwell" | "fraxlend" | "fenix" | "ra" | "syncswap" | "beefy" | "aerodrome" | "velodrome" | "curve" | "toros" | "akron" | "enzyme" | "dragonswap" | "koi" | "rfx" | "woofi" | "pendle" | "zkSwapThreePool" | "maha" | "tempest" | "holdstation" | "venus" | "reactor_fusion" | "vicuna" | "curveNPool" | "satlayer" | "veda" | "cian" | "concrete" | "hourglass" | "katana" | "gamma" | "uniswap" | "ambient" | "arthswap" | "base-swap" | "camelot" | "crust" | "horiza" | "izumi" | "kim" | "pancake-swap" | "ramses" | "retro" | "stryke" | "sushi-swap" | "swapr" | "thruster" | "voltage" | "zero" | "supswap" | "zk-swap" | "thirdtrade" | "swap-x" | "balancer" | "cross_curve" | "neptune" | "maverick" | "trader-joe" | "hanji" | "radiant" | "aave" | "ironclad" | "sturdy" | "frax" | "silo" | "dolomite" | "badger" | "ajna" | "ion" | "eigenlayer" | "vest" | "zerolend" | "lnd" | "hyperdrive" | "oku" | "kyo" | "sonex" | "lendle" | "tako-tako" | "equalizer" | "spectra" | "beraborrow" | "superlend" | "avalon" | "iguana" | "xlend" | "sake" | "sonicmarket" | "angles" | "bunni" | "beratrax" | "yei" | "gammaswap" | "uranium" | undefined;
+        depositUrl: string | undefined;
         explorerAddress: string | undefined;
         tags: string[];
     } | null>;