@merkl/api 0.17.16 → 0.17.17

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

@@ -1,12 +1,15 @@
+import { HttpError } from "../../../errors";
 import { campaignsDynamicData } from "../../../libs/campaigns/campaignsDynamicData";
-// import { campaignsDynamicData } from "../../../libs/campaigns/campaignsDynamicData";
-import { CampaignRepository } from "../campaign/campaign.repository";
-import { CampaignService } from "../campaign/campaign.service";
 import { OpportunityService } from "../opportunity/opportunity.service";
+import bigintToString from "../../../utils/bigintToString";
 import { executeSimple } from "../../../utils/execute";
 import { log } from "../../../utils/logger";
 import { Campaign, NETWORK_LABELS } from "@sdk";
-import { utils } from "ethers";
+import { Campaign as CampaignEnum } from "@sdk";
+import { AprService } from "../apr";
+import { OpportunityRepository } from "../opportunity/opportunity.repository";
+import { RewardService } from "../reward";
+import { TvlService } from "../tvl";
 export class DynamicDataService {
     static async queryERC20DynamicData(chainId, tokenAddress, decimals = 18) {
         const campaigns = [
@@ -50,88 +53,81 @@ export class DynamicDataService {
             type: result[0]?.type ?? "defaultType",
         };
     }
-    static generateDummyData(campaign) {
-        const campaignParameters = {
-            type: campaign.type,
-            computeChainId: campaign.computeChainId,
-            chainId: campaign.chainId ? campaign.chainId : campaign.computeChainId,
-            subType: campaign.subType,
-            rewardTokenAddress: campaign.rewardTokenAddress ? campaign.rewardTokenAddress : "0xdefault",
-            amount: campaign.amount ? campaign.amount : "1000000000000000000", // 1 EXR in wei
-            startTimestamp: campaign.startTimestamp ? campaign.startTimestamp : Math.floor(Date.now() / 1000).toString(), // current timestamp
-            endTimestamp: campaign.endTimestamp
-                ? campaign.endTimestamp
-                : (Math.floor(Date.now() / 1000) + 30 * 24 * 60 * 60).toString(), // 30 days from now
-            creatorAddress: campaign.creatorAddress ? campaign.creatorAddress : "0xdefaultcreatoraddress",
-            campaignParameters: campaign.params,
-            campaignId: campaign.id ? campaign.id : "0xdefaultid",
-            opportunityIdentifier: "0xdefaultopportunityid",
-            id: campaign.id ? campaign.id : "0xdefaultid",
-            distributionChainId: campaign.distributionChainId ? campaign.distributionChainId : 1,
-            rewardTokenId: campaign.rewardTokenId ? campaign.rewardTokenId : "0xdefaultrewardtokenid",
-            opportunityId: campaign.opportunityId ? campaign.opportunityId : "0xdefaultopportunityid",
-            identifier: campaign.identifier ? campaign.identifier : "defaultidentifier",
-            mainParameter: DynamicDataService.generateMainParameter(campaign),
-        };
-        return campaignParameters;
-    }
-    static generateMainParameter(campaign) {
-        let targetToken;
-        let parsedParams;
-        if (campaign.type === "CLAMM") {
-            parsedParams = campaign.params;
-            targetToken = parsedParams.poolAddress;
-        }
-        else if (campaign.type === Campaign[Campaign.AMBIENTPROCESSOR]) {
-            parsedParams = campaign.params;
-            targetToken = parsedParams.poolId;
-        }
-        else if (campaign.type === Campaign[Campaign.UNISWAP_V4]) {
-            parsedParams = campaign.params;
-            targetToken = `0x${parsedParams.poolId.slice(-40)}`;
-        }
-        else {
-            parsedParams = campaign.params;
-            targetToken = parsedParams.targetToken;
+    static async updateForCampaignType(campaigns, type) {
+        const chainId = campaigns[0].computeChainId;
+        const dynamicDataArray = [];
+        const dynamicData = await executeSimple(chainId, campaignsDynamicData(chainId, campaigns, type));
+        const oppMap = {};
+        for (const data of dynamicData) {
+            if (!!data) {
+                // Main Parameter OVERRIDING
+                if (data.campaignType === CampaignEnum.SILO && data.campaignParameters.whitelist?.length === 1)
+                    data.mainParameter = `${data.mainParameter}-${data.campaignParameters.whitelist[0]}`;
+                if (!oppMap[`${data.campaignType}_${data.mainParameter}`])
+                    oppMap[`${data.campaignType}_${data.mainParameter}`] = {};
+                oppMap[`${data.campaignType}_${data.mainParameter}`][data.campaignId] = data;
+            }
         }
-        if (parsedParams.whitelist.length > 0) {
-            return utils
-                .keccak256(utils.defaultAbiCoder.encode(["string", "address[]"], [targetToken, parsedParams.whitelist.sort()]))
-                .slice(0, 42);
+        for (const entry of Object.entries(oppMap)) {
+            const [type, mainParameter] = entry[0].split("_");
+            const apr = AprService.extractFromDynamicData(+type, Object.values(entry[1]));
+            const tvl = TvlService.extractFromDynamicData(+type, Object.values(entry[1]));
+            const dailyRewards = await RewardService.extractDailyRewardsRecordFromDynamicData(+type, Object.values(entry[1]));
+            const opportunityId = OpportunityService.hashId({
+                chainId,
+                identifier: mainParameter,
+                type: Campaign[+type],
+            });
+            try {
+                await OpportunityRepository.updateRecords(opportunityId, apr, tvl, dailyRewards);
+            }
+            catch (err) {
+                throw new HttpError("Failed to update dynamic data", 500, {
+                    err,
+                    opportunityId,
+                    campaigns: Object.values(entry[1]),
+                    dynamicData: bigintToString({
+                        campaignId: Object.values(entry[1])[0].campaignId,
+                        apr,
+                        tvl,
+                        dailyRewards,
+                    }),
+                });
+            }
+            dynamicDataArray.push(bigintToString({ campaignId: Object.values(entry[1])[0].campaignId, apr, tvl, dailyRewards }));
         }
-        return targetToken;
-    }
-    static async queryDynamicData(campaign) {
-        const campaignParameters = DynamicDataService.generateDummyData(campaign);
-        return await DynamicDataService.#getMultipleDynamicData([campaignParameters]);
-    }
-    static async queryDynamicDataFromCampaignId(query) {
-        const campaigns = await CampaignRepository.findMany(query);
-        const campaign = campaigns[0];
-        return DynamicDataService.queryDynamicData(CampaignService.format(campaign));
+        return dynamicDataArray;
     }
-    static async queryDynamicDataFromManyCampaignId(query) {
-        const campaigns = await CampaignRepository.findMany(query);
-        const formattedCampaigns = campaigns.map(campaign => DynamicDataService.generateDummyData(CampaignService.format(campaign)));
-        return DynamicDataService.#getMultipleDynamicData(formattedCampaigns);
-    }
-    static async #getMultipleDynamicData(campaigns) {
-        const result = [];
-        // const campaignType = DynamicDataService.getV3FromType(campaign.type);
-        const campaign = campaigns[0];
-        const filteredCampaigns = campaigns.filter(c => c.type === campaign.type);
-        if (campaign.type !== Campaign[Campaign.INVALID]) {
-            const resultDynamicData = await CampaignService.fetchDynamicData(campaign.computeChainId, campaign.type, filteredCampaigns);
-            for (const campaign of campaigns) {
-                const resultMetaData = await OpportunityService.fakeCreateFromCampaign({
-                    ...campaign,
-                    type: Campaign[campaign.type],
-                    params: JSON.stringify(campaign.campaignParameters),
-                    creator: campaign.creatorAddress,
+    static async updateForCampaigns(campaigns) {
+        const campaignTypeToCampaigns = new Map();
+        for (const campaign of campaigns) {
+            const type = campaign.campaignType;
+            let campaigns = campaignTypeToCampaigns.get(campaign.campaignType);
+            if (!campaigns)
+                campaigns = [campaign];
+            else
+                campaigns.push(campaign);
+            campaignTypeToCampaigns.set(type, campaigns);
+        }
+        const dynamicDataArray = [];
+        for (const [campaignType, campaigns] of campaignTypeToCampaigns.entries()) {
+            try {
+                log.info(`updating dynamic data for ${campaigns.length} campaigns of type ${CampaignEnum[campaignType]}`);
+                try {
+                    dynamicDataArray.push(await DynamicDataService.updateForCampaignType(campaigns, campaignType));
+                }
+                catch (err) {
+                    console.error(`Failed to update dynamic data for campaign type ${CampaignEnum[campaignType]}`, err);
+                }
+            }
+            catch (err) {
+                throw new HttpError(`Failed to update dynamic data for campaign type ${CampaignEnum[campaignType]}`, 500, {
+                    err: err,
+                    campaigns: campaigns,
                 });
-                result.push({ ...resultDynamicData.find(data => data.campaignId === campaign.campaignId), ...resultMetaData });
             }
+            // 2. Call updateDynamicData with each entries of the map (process by campaign type)
         }
-        return result;
+        return dynamicDataArray.flat();
     }
 }

package/dist/src/modules/v4/router.d.ts

@@ -1015,6 +1015,24 @@ export declare const v4: Elysia<"/v4", false, {
                     };
                 };
             };
+        } & {
+            ":campaignId": {
+                "dynamic-data": {
+                    put: {
+                        body: unknown;
+                        params: {
+                            campaignId: string;
+                        };
+                        query: unknown;
+                        headers: {
+                            authorization: string;
+                        };
+                        response: {
+                            200: unknown[];
+                        };
+                    };
+                };
+            };
         } & {
             index: {
                 get: {
@@ -3183,78 +3201,6 @@ export declare const v4: Elysia<"/v4", false, {
                 };
             };
         };
-    } & {
-        "dynamic-data": {
-            "from-config": {
-                post: {
-                    body: {
-                        id?: string | undefined;
-                        tags?: string[] | undefined;
-                        identifier?: string | undefined;
-                        subType?: number | undefined;
-                        chain?: {} | undefined;
-                        chainId?: number | undefined;
-                        startTimestamp?: string | undefined;
-                        endTimestamp?: string | 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;
-                        opportunityIdentifier?: string | undefined;
-                        type: string;
-                        params: {};
-                        computeChainId: number;
-                    };
-                    params: {};
-                    query: unknown;
-                    headers: {
-                        authorization: string;
-                    };
-                    response: {
-                        200: any[];
-                    };
-                };
-            };
-        };
-    } & {
-        "dynamic-data": {
-            "from-existing": {
-                get: {
-                    body: unknown;
-                    params: {};
-                    query: {
-                        type?: string | undefined;
-                        items?: number | undefined;
-                        subType?: number | undefined;
-                        page?: number | undefined;
-                        chainId?: number | undefined;
-                        startTimestamp?: string | undefined;
-                        endTimestamp?: string | undefined;
-                        tokenAddress?: string | undefined;
-                        campaignId?: string | undefined;
-                        opportunityId?: string | undefined;
-                        creatorAddress?: string | undefined;
-                        creatorId?: string | undefined;
-                        mainParameter?: string | undefined;
-                        test?: boolean | undefined;
-                        creatorTag?: string | undefined;
-                        tokenSymbol?: string | undefined;
-                    };
-                    headers: {
-                        authorization: string;
-                    };
-                    response: {
-                        200: any[];
-                    };
-                };
-            };
-        };
     };
 } & {
     v4: {

package/dist/src/routes/v3/app.d.ts

@@ -1,4 +1,7 @@
 import type Elysia from "elysia";
+/**
+ * @deprecated - can be removed once old apps are not in used anymore
+ */
 export declare const response: import("@sinclair/typebox").TArray<import("@sinclair/typebox").TObject<{
     rate: import("@sinclair/typebox").TNumber;
     token: import("@sinclair/typebox").TString;

package/dist/src/routes/v3/app.js

@@ -1,7 +1,9 @@
 import { getTokensListWithCache } from "../../libs/getTokensList";
 import { Pricer } from "../../utils/pricer";
 import { t } from "elysia";
-// @dev DEPRECATED - can be removed once old apps are not in used anymore
+/**
+ * @deprecated - can be removed once old apps are not in used anymore
+ */
 export const response = t.Array(t.Object({ rate: t.Number(), token: t.String() }));
 export default (app) => app.get("/app", async () => {
     const json = {};

package/dist/src/routes/v3/campaign/delay.d.ts

@@ -1,4 +1,7 @@
 import { type Elysia } from "elysia";
+/**
+ * @deprecated - to remove in favor of new status page
+ */
 export declare const query: import("@sinclair/typebox").TObject<{
     onlyLive: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TBoolean>;
 }>;

package/dist/src/routes/v3/campaign/delay.js

@@ -4,7 +4,9 @@ import { engineDbClient } from "../../../utils/prisma";
 import { ChainId, isSupportedChain } from "@sdk";
 import { t } from "elysia";
 import moment from "moment";
-// @dev DEPRECATED - to remove in favor of new status page
+/**
+ * @deprecated - to remove in favor of new status page
+ */
 export const query = t.Object({
     onlyLive: t.Optional(t.Boolean()),
 });

package/dist/src/routes/v3/campaignUnclaimed.d.ts

@@ -1,4 +1,7 @@
 import { type Elysia } from "elysia";
+/**
+ * @deprecated - conversion to v4 done
+ */
 export declare const query: import("@sinclair/typebox").TObject<{
     campaignIds: import("@sinclair/typebox").TString;
     chainId: import("@sinclair/typebox").TNumber;

package/dist/src/routes/v3/campaignUnclaimed.js

@@ -1,7 +1,9 @@
 import { RewardService } from "../../modules/v4/reward";
 import { t } from "elysia";
 import checkQueryChainIdValidity from "../../hooks/checkQueryChainIdValidity";
-// @dev DEPRECATED - conversion to v4 done
+/**
+ * @deprecated - conversion to v4 done
+ */
 export const query = t.Object({
     campaignIds: t.String(),
     chainId: t.Numeric(),

package/dist/src/routes/v3/campaigns.d.ts

@@ -27,8 +27,8 @@ declare const _default: (app: Elysia) => Elysia<"", false, {
             query: {
                 types?: string | number | string[] | number[] | undefined;
                 chainIds?: string | string[] | undefined;
-                live?: boolean | undefined;
                 creatorTag?: string | undefined;
+                live?: boolean | undefined;
                 hideTestTokens?: string | undefined;
             };
             headers: unknown;

package/dist/src/routes/v3/campaignsForMainParameter.d.ts

@@ -1,4 +1,7 @@
 import { type Elysia } from "elysia";
+/**
+ * @deprecated - conversion to v4 done
+ */
 type CampaignsForMainParameterReturnType = {
     campaignId: string;
     campaignType: number;

package/dist/src/routes/v3/campaignsRewardsReport.d.ts

@@ -1,4 +1,7 @@
 import { type Elysia } from "elysia";
+/**
+ * @deprecated - conversion to v4 done
+ */
 export declare const query: import("@sinclair/typebox").TObject<{
     chain_campaignIds: import("@sinclair/typebox").TArray<import("@sinclair/typebox").TTemplateLiteral<[import("@sinclair/typebox").TUnion<import("elysia").TSchema[]>, import("@sinclair/typebox").TLiteral<"_">, import("@sinclair/typebox").TString]>>;
     from: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TNumber>;

package/dist/src/routes/v3/campaignsRewardsReport.js

@@ -2,7 +2,9 @@ import { RewardService } from "../../modules/v4/reward";
 import { t } from "elysia";
 import { ChainCampaignId } from "../../types/parameters/ChainCampaignId";
 import { Timestamp } from "../../types/parameters/Timestamp";
-// @dev DEPRECATED - conversion to v4 done
+/**
+ * @deprecated - conversion to v4 done
+ */
 export const query = t.Object({
     chain_campaignIds: t.Array(ChainCampaignId.type, {
         style: "pipeDelimited",

package/dist/src/routes/v3/recipients.d.ts

@@ -1,4 +1,7 @@
 import { type Elysia } from "elysia";
+/**
+ * @deprecated - conversion to v4 done
+ */
 declare const _default: (app: Elysia) => Elysia<"", false, {
     decorator: {};
     store: {};

package/dist/src/routes/v3/recipients.js

@@ -1,7 +1,9 @@
 import { RewardService } from "../../modules/v4/reward";
 import { t } from "elysia";
 import checkQueryChainIdValidity from "../../hooks/checkQueryChainIdValidity";
-// @dev DEPRECATED - conversion to v4 done
+/**
+ * @deprecated - conversion to v4 done
+ */
 export default (app) => app.use(checkQueryChainIdValidity()).get("/recipients", async ({ query }) => {
     const campaignId = query.campaignId;
     const chainId = query.chainId;

package/dist/src/routes/v3/rewards.d.ts

@@ -1,4 +1,7 @@
 import type Elysia from "elysia";
+/**
+ * @deprecated - conversion to v4 done
+ */
 export declare const query: import("@sinclair/typebox").TObject<{
     chainIds: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TString, import("@sinclair/typebox").TArray<import("@sinclair/typebox").TString>]>>;
     user: import("@sinclair/typebox").TString;

package/dist/src/routes/v3/rewards.js

@@ -3,7 +3,9 @@ import { RewardConvertorService } from "../../modules/v4/reward/reward.converter
 import { ChainId, isSupportedChain } from "@sdk";
 import { t } from "elysia";
 import checkQueryAddressValidity from "../../hooks/checkQueryAddressValidity";
-// @dev DEPRECATED - conversion to v4 done
+/**
+ * @deprecated - conversion to v4 done
+ */
 export const query = t.Object({
     chainIds: t.Optional(t.Union([t.String(), t.Array(t.String())])),
     user: t.String(),

package/dist/src/routes/v3/rewardsReport.d.ts

@@ -1,4 +1,7 @@
 import { type Elysia } from "elysia";
+/**
+ * @deprecated - conversion to v4 done
+ */
 export declare const query: import("@sinclair/typebox").TObject<{
     campaignId: import("@sinclair/typebox").TString;
     chainId: import("@sinclair/typebox").TNumber;

package/dist/src/routes/v3/rewardsReport.js

@@ -2,7 +2,9 @@ import { RewardService } from "../../modules/v4/reward";
 import { t } from "elysia";
 import checkQueryChainIdValidity from "../../hooks/checkQueryChainIdValidity";
 import { InvalidParameter } from "../../utils/error";
-// @dev DEPRECATED - conversion to v4 done
+/**
+ * @deprecated - conversion to v4 done
+ */
 export const query = t.Object({
     campaignId: t.String(),
     chainId: t.Numeric(),

package/dist/src/routes/v3/router.d.ts

@@ -73,8 +73,8 @@ export declare const v3: Elysia<"/v3", false, {
                 query: {
                     types?: string | number | string[] | number[] | undefined;
                     chainIds?: string | string[] | undefined;
-                    live?: boolean | undefined;
                     creatorTag?: string | undefined;
+                    live?: boolean | undefined;
                     hideTestTokens?: string | undefined;
                 };
                 headers: unknown;
@@ -703,7 +703,7 @@ export declare const v3: Elysia<"/v3", false, {
                     proof?: string | undefined;
                     mainParameter?: string | undefined;
                     reloadChainId?: number | undefined;
-                    chainId: never;
+                    chainId: number;
                     user: string;
                 };
                 headers: unknown;

package/dist/src/routes/v3/updates.d.ts

@@ -1,4 +1,7 @@
 import type Elysia from "elysia";
+/**
+ * @deprecated - to remove in favor of new status page
+ */
 export type UpdatesT = {
     [chainId: number]: {
         [campaignId: string]: number;

package/dist/src/routes/v3/userRewards.d.ts

@@ -1,6 +1,9 @@
 import type Elysia from "elysia";
+/**
+ * @deprecated - conversion to v4 done
+ */
 export declare const query: import("@sinclair/typebox").TObject<{
-    chainId: import("@sinclair/typebox").TUnion<import("elysia").TSchema[]>;
+    chainId: import("@sinclair/typebox").TNumber;
     reloadChainId: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TNumber>;
     mainParameter: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
     proof: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
@@ -29,7 +32,7 @@ declare const _default: (app: Elysia) => Elysia<"", false, {
                 proof?: string | undefined;
                 mainParameter?: string | undefined;
                 reloadChainId?: number | undefined;
-                chainId: never;
+                chainId: number;
                 user: string;
             };
             headers: unknown;

package/dist/src/routes/v3/userRewards.js

@@ -1,15 +1,16 @@
 import checkQueryAddressValidity from "../../hooks/checkQueryAddressValidity";
 import { RewardService, UserRewardV3Dto } from "../../modules/v4/reward";
 import { RewardConvertorService } from "../../modules/v4/reward/reward.converter";
-import param from "../../types/parameters";
 import { InvalidParameter } from "../../utils/error";
 import { throwOnUnsupportedChainId } from "../../utils/throw";
 import { t } from "elysia";
 import { utils } from "ethers";
 import checkQueryChainIdValidity from "../../hooks/checkQueryChainIdValidity";
-// @dev DEPRECATED - conversion to v4 done
+/**
+ * @deprecated - conversion to v4 done
+ */
 export const query = t.Object({
-    chainId: param.Chain.type,
+    chainId: t.Number(),
     reloadChainId: t.Optional(t.Number()),
     mainParameter: t.Optional(t.String()),
     proof: t.Optional(t.String()),

package/dist/src/utils/prices/priceService.js

@@ -263,7 +263,9 @@ export default class PriceService {
             this._prices[`r${xUpper}`] = this._prices[x];
             this._prices[`variableDebt${xUpper}`] = this._prices[x];
         }
-        /** Deprecated - Fill all BorrowStaker prices */
+        /**
+         * @deprecated - Fill all BorrowStaker prices
+         */
         const tokens = await getTokensListWithCache();
         for (const chainIdString of Object.keys(tokens)) {
             const chainId = Number.parseInt(chainIdString);