@merkl/api 0.20.113 → 0.20.114

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

@@ -10,7 +10,7 @@ import { TvlService } from "@/modules/v4/tvl/tvl.service";
 import bigintToString from "@/utils/bigintToString";
 import { log } from "@/utils/logger";
 import { AprType } from "@db/api";
-import { Campaign as CampaignEnum, DAY, NETWORK_LABELS, bigIntToNumber, } from "@sdk";
+import { Campaign as CampaignType, DAY, NETWORK_LABELS, bigIntToNumber, } from "@sdk";
 import moment from "moment";
 import { AprService } from "../apr";
 import { CampaignService } from "../campaign";
@@ -38,7 +38,7 @@ export class DynamicDataService {
             const opportunityIds = new Set(records.map(r => OpportunityService.hashId({
                 chainId,
                 identifier: r.campaign.mainParameter,
-                type: CampaignEnum[+type],
+                type: CampaignType[+type],
             })));
             const now = moment().unix();
             const updates = [];
@@ -46,7 +46,7 @@ export class DynamicDataService {
                 const recordsForOpportunity = records.filter(r => OpportunityService.hashId({
                     chainId,
                     identifier: r.campaign.mainParameter,
-                    type: CampaignEnum[+type],
+                    type: CampaignType[+type],
                 }) === opportunityId);
                 const tvl = {
                     timestamp: BigInt(now),
@@ -96,7 +96,7 @@ export class DynamicDataService {
                         let campaignDailyValue = await TokenService.getValueByTokenId(TokenService.hashId({ address: rewardTokenAddress, chainId: record.campaign.chainId }), dailyAmount);
                         // Fixed APR campaigns
                         if (hasFixedAprConfig(campaignParameters)) {
-                            log.local(`[${NETWORK_LABELS[chainId]}][${CampaignEnum[type]}] calculating fixed APR for ${record.campaign.campaignId}`);
+                            log.local(`[${NETWORK_LABELS[chainId]}][${CampaignType[type]}] calculating fixed APR for ${record.campaign.campaignId}`);
                             const { targetTokenPricing, rewardTokenPricing, apr: fixedApr } = campaignParameters;
                             const targetApr = Number(fixedApr);
                             if (targetTokenPricing && rewardTokenPricing) {
@@ -182,7 +182,7 @@ export class DynamicDataService {
                         });
                     }
                 }
-                log.info(`[${NETWORK_LABELS[chainId]}][${CampaignEnum[type]}] updated ${updates.length}/${campaigns.length} campaigns using campaignTVLBuilder`);
+                log.info(`[${NETWORK_LABELS[chainId]}][${CampaignType[type]}] updated ${updates.length}/${campaigns.length} campaigns using campaignTVLBuilder`);
             }
             return updates;
         }
@@ -192,7 +192,7 @@ export class DynamicDataService {
         for (const data of dynamicData) {
             if (!!data) {
                 // Main Parameter OVERRIDING
-                if (data.campaignType === CampaignEnum.SILO && data.campaignParameters.whitelist?.length === 1)
+                if (data.campaignType === CampaignType.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}`] = {};
@@ -207,7 +207,7 @@ export class DynamicDataService {
             const opportunityId = OpportunityService.hashId({
                 chainId,
                 identifier: mainParameter,
-                type: CampaignEnum[+type],
+                type: CampaignType[+type],
             });
             try {
                 if (!dryRun)
@@ -218,7 +218,7 @@ export class DynamicDataService {
             }
             dynamicDataArray.push(bigintToString({ campaignId: Object.values(entry[1])[0].campaignId, apr, tvl, dailyRewards }));
         }
-        log.info(`[${NETWORK_LABELS[chainId]}][${CampaignEnum[type]}] updated ${dynamicData.length}/${campaigns.length} campaigns`);
+        log.info(`[${NETWORK_LABELS[chainId]}][${CampaignType[type]}] updated ${dynamicData.length}/${campaigns.length} campaigns`);
         return dynamicDataArray;
     }
     /**
@@ -252,11 +252,11 @@ export class DynamicDataService {
                     symbolTargetToken: "EXT",
                     targetToken: tokenAddress,
                 },
-                campaignType: CampaignEnum.ERC20,
+                campaignType: CampaignType.ERC20,
             },
         ];
         log.info(`querying mock campaign on chain: ${NETWORK_LABELS[chainId]}`);
-        const result = await dynamicDataBuilderFactory(CampaignEnum.ERC20).build(Number(chainId), campaigns);
+        const result = await dynamicDataBuilderFactory(CampaignType.ERC20).build(Number(chainId), campaigns);
         return {
             priceTargetToken: result[0]?.typeInfo.priceTargetToken,
             totalSupply: result[0]?.typeInfo.totalSupply,

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

@@ -1,9 +1,9 @@
-import { Campaign as CampaignEnum, type CampaignParameters, type Opportunity as OpportunityV3 } from "@sdk";
+import { type CampaignParameters, Campaign as CampaignType, 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] | Omit<CampaignWithParams<C>, "manualOverrides">, opportunityIdentifier: string): CampaignParameters<C>;
+    static convertV4CampaignToV3<C extends CampaignType>(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

@@ -1,6 +1,6 @@
 import { kebabToPascalCase } from "@/utils/caseChanges";
 import { log } from "@/utils/logger";
-import { Campaign as CampaignEnum, EAprBreakdownType, opportunityActions, } from "@sdk";
+import { Campaign as CampaignType, EAprBreakdownType, opportunityActions, } from "@sdk";
 import moment from "moment";
 import { CacheService } from "../cache";
 import { TTLPresets } from "../cache/cache.model";
@@ -26,7 +26,7 @@ export class OpportunityConvertorService {
     }
     static convertV4toV3(opportunity, withCampaigns = false) {
         const now = moment().unix();
-        const id = `${CampaignEnum[opportunity.type]}_${opportunity.identifier}`; // V3 id
+        const id = `${CampaignType[opportunity.type]}_${opportunity.identifier}`; // V3 id
         // Convert v4 actions to old type
         let action = opportunity.action.toLowerCase();
         if (!opportunityActions.includes(action)) {
@@ -117,17 +117,17 @@ export class OpportunityConvertorService {
                 return acc;
             }, []) ?? [],
             campaigns: {
-                type: CampaignEnum[opportunity.type],
+                type: CampaignType[opportunity.type],
                 ids: opportunity.campaigns?.map(campaign => campaign.campaignId) ?? [],
                 active: withCampaigns
                     ? opportunity.campaigns
                         ?.filter(campaign => campaign.startTimestamp < BigInt(now) && BigInt(now) < campaign.endTimestamp)
-                        .map(campaign => OpportunityConvertorService.convertV4CampaignToV3(CampaignEnum[campaign.type], campaign, opportunity.identifier))
+                        .map(campaign => OpportunityConvertorService.convertV4CampaignToV3(CampaignType[campaign.type], campaign, opportunity.identifier))
                     : undefined,
                 inactive: withCampaigns
                     ? opportunity.campaigns
                         ?.filter(campaign => !(campaign.startTimestamp < BigInt(now) && BigInt(now) < campaign.endTimestamp))
-                        .map(campaign => OpportunityConvertorService.convertV4CampaignToV3(CampaignEnum[campaign.type], campaign, opportunity.identifier))
+                        .map(campaign => OpportunityConvertorService.convertV4CampaignToV3(CampaignType[campaign.type], campaign, opportunity.identifier))
                     : undefined,
             },
         };

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

@@ -7,7 +7,7 @@ import { TokenService } from "@/modules/v4/token/token.service";
 import { UserService } from "@/modules/v4/user/user.service";
 import { log } from "@/utils/logger";
 import { Status } from "@db/api";
-import { Campaign as CampaignEnum } from "@sdk";
+import { Campaign as CampaignType } from "@sdk";
 import moment from "moment";
 import { metadataBuilderFactory } from "../../../engine/metadata/factory";
 import { ProtocolService } from "../protocol/protocol.service";
@@ -43,7 +43,7 @@ export class OpportunityService {
      * @param campaign
      */
     static async #getMetadata(campaign, opportunityIdentifier) {
-        const campaignType = CampaignEnum[campaign.type];
+        const campaignType = CampaignType[campaign.type];
         return await metadataBuilderFactory(campaignType).build(campaign, opportunityIdentifier);
     }
     /**

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

@@ -1,5 +1,5 @@
 import { BadRequestError } from "@/errors";
-import { Campaign as CampaignEnum } from "@sdk";
+import { Campaign as CampaignType } 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(CampaignEnum).includes(type))
-        throw new BadRequestError("Invalid Campaign type", Object.keys(CampaignEnum));
+    if (!Object.values(CampaignType).includes(type))
+        throw new BadRequestError("Invalid Campaign type", Object.keys(CampaignType));
 };

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

@@ -1,6 +1,6 @@
 import type { CacheKeys } from "@/cache/keys";
 import type { Chain } from "@db/api";
-import { type CampaignDynamicData, Campaign as CampaignEnum, type ChainId, type MerklChainId } from "@sdk";
+import { type CampaignDynamicData, Campaign as CampaignType, 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";
@@ -785,5 +785,5 @@ export declare abstract class RewardService {
     /**
      * @deprecated
      */
-    static extractDailyRewardsRecordFromDynamicData<C extends CampaignEnum>(type: C, dynamicData: CampaignDynamicData<C>[], timestamp?: bigint): Promise<DailyRewardsRecord["model"]>;
+    static extractDailyRewardsRecordFromDynamicData<C extends CampaignType>(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 as CampaignEnum, DAY, DistributorService, NETWORK_LABELS, } from "@sdk";
+import { Campaign as CampaignType, DAY, DistributorService, NETWORK_LABELS, } from "@sdk";
 import moment from "moment";
 import { BlacklistService } from "../blacklist";
 import { CacheService } from "../cache";
@@ -358,7 +358,7 @@ export class RewardService {
      * @deprecated
      */
     static async extractDailyRewardsRecordFromDynamicData(type, dynamicData, timestamp = BigInt(moment().unix())) {
-        const typesWithoutApr = [CampaignEnum.INVALID];
+        const typesWithoutApr = [CampaignType.INVALID];
         if (typesWithoutApr.includes(type))
             return { timestamp, total: 0, breakdowns: [] };
         const breakdowns = [];

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

@@ -2,7 +2,7 @@ import { Redis } from "@/cache";
 import { CampaignService } from "@/modules/v4/campaign";
 import { OpportunityConvertorService } from "@/modules/v4/opportunity/opportunity.converter";
 import { UnsupportedNetwork } from "@/utils/error";
-import { ANGLE_NETWORKS, Campaign as CampaignEnum, ChainId, isSupportedChain, registry, } from "@sdk";
+import { ANGLE_NETWORKS, Campaign as CampaignType, ChainId, isSupportedChain, registry, } from "@sdk";
 import { t } from "elysia";
 export const query = t.Object({
     chainIds: t.Optional(t.Union([t.String(), t.Array(t.String())])),
@@ -72,7 +72,7 @@ export default (app) => app.get("/campaigns", async ({ query }) => {
     if (process.env.FF_OPPORTUNITY === "true") {
         const campaigns = await CampaignService.findMany({
             distributionChainIds: chainIds,
-            types: !types.length ? undefined : types.map(type => CampaignEnum[type]),
+            types: !types.length ? undefined : types.map(type => CampaignType[type]),
             status: query.live ? "LIVE" : undefined,
             creatorTag: query.creatorTag,
             test: !hideTestTokens,
@@ -84,7 +84,7 @@ export default (app) => app.get("/campaigns", async ({ query }) => {
                 res[campaign.distributionChainId] = {};
             }
             const opportunityIdentifier = campaign.Opportunity.identifier;
-            const campaignType = CampaignEnum[campaign.type];
+            const campaignType = CampaignType[campaign.type];
             if (!res[campaign.distributionChainId][`${campaignType}_${opportunityIdentifier}`]) {
                 res[campaign.distributionChainId][`${campaignType}_${opportunityIdentifier}`] = {
                     ...OpportunityConvertorService.convertV4CampaignToV3(campaignType, campaign, opportunityIdentifier),

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

@@ -1,6 +1,6 @@
 import { NotFoundError } from "@/errors";
 import { OpportunityService } from "@/modules/v4/opportunity";
-import { BN2Number, Campaign as CampaignEnum } from "@sdk";
+import { BN2Number, Campaign as CampaignType } from "@sdk";
 import { t } from "elysia";
 import checkQueryChainIdValidity from "../../hooks/checkQueryChainIdValidity";
 export const query = t.Object({
@@ -19,7 +19,7 @@ export default (app) => app.use(checkQueryChainIdValidity()).get("/campaignsForM
     return (await OpportunityService.getUniqueWithCampaignsOrThrow(opportunityId))?.campaigns
         ?.map(c => ({
         campaignId: c.campaignId,
-        campaignType: CampaignEnum[c.type],
+        campaignType: CampaignType[c.type],
         rewardToken: c.rewardToken.address,
         rewardTokenSymbol: c.rewardToken.symbol,
         amountDecimal: BN2Number(c.amount, c.rewardToken.decimals),

package/dist/src/scripts/reparse-opportunities.js

@@ -3,7 +3,7 @@ import { metadataBuilderFactory } from "@/engine/metadata/factory";
 import { CampaignService } from "@/modules/v4/campaign";
 import { log } from "@/utils/logger";
 import { apiDbClient } from "@db";
-import { Campaign as CampaignEnum } from "@sdk";
+import { Campaign as CampaignType } from "@sdk";
 const opportunities = await apiDbClient.opportunity.findMany({
     select: {
         id: true,
@@ -41,7 +41,7 @@ const opportunities = await apiDbClient.opportunity.findMany({
 for (const opportunity of opportunities) {
     try {
         const campaign = CampaignService.format(await CampaignService.findUniqueOrThrow(opportunity.Campaigns[0].id));
-        const metadata = await metadataBuilderFactory(CampaignEnum[opportunity.type]).build(campaign, opportunity.identifier);
+        const metadata = await metadataBuilderFactory(CampaignType[opportunity.type]).build(campaign, opportunity.identifier);
         if (!!metadata?.explorerAddress && !opportunity.explorerAddress) {
             await apiDbClient.opportunity.update({
                 where: {