@merkl/api 0.10.261 → 0.10.263

package/dist/src/eden/index.d.ts

@@ -233,11 +233,13 @@ declare const eden: {
                 };
             }>>;
             campaigns: {
-                get: (options?: {
+                get: (options: {
                     headers?: Record<string, unknown> | undefined;
-                    query?: Record<string, unknown> | undefined;
+                    query: {
+                        test?: boolean | undefined;
+                    };
                     fetch?: RequestInit | undefined;
-                } | undefined) => Promise<import("@elysiajs/eden").Treaty.TreatyResponse<{
+                }) => Promise<import("@elysiajs/eden").Treaty.TreatyResponse<{
                     200: {
                         protocol?: {
                             name: string;
@@ -549,21 +551,6 @@ declare const eden: {
                         identifier: string;
                         chainId: number;
                         action: import("../../database/api/.generated").$Enums.OpportunityAction;
-                        Campaigns: {
-                            type: import("../../database/api/.generated").$Enums.CampaignType;
-                            id: string;
-                            params: import("database/api/.generated/runtime/library").JsonValue;
-                            subType: number | null;
-                            startTimestamp: bigint;
-                            endTimestamp: bigint;
-                            computeChainId: number;
-                            distributionChainId: number;
-                            campaignId: string;
-                            rewardTokenId: string;
-                            amount: string;
-                            opportunityId: string;
-                            creatorAddress: string;
-                        }[];
                         tvl: number;
                         apr: number;
                         dailyRewards: number;
@@ -3152,21 +3139,6 @@ export declare const MerklApi: (domain: string | import("elysia").default<"", fa
                             identifier: string;
                             chainId: number;
                             action: import("../../database/api/.generated").$Enums.OpportunityAction;
-                            Campaigns: {
-                                type: import("../../database/api/.generated").$Enums.CampaignType;
-                                id: string;
-                                params: import("database/api/.generated/runtime/library").JsonValue;
-                                subType: number | null;
-                                startTimestamp: bigint;
-                                endTimestamp: bigint;
-                                computeChainId: number;
-                                distributionChainId: number;
-                                campaignId: string;
-                                rewardTokenId: string;
-                                amount: string;
-                                opportunityId: string;
-                                creatorAddress: string;
-                            }[];
                             tvl: number;
                             apr: number;
                             dailyRewards: number;
@@ -3324,7 +3296,9 @@ export declare const MerklApi: (domain: string | import("elysia").default<"", fa
                         params: {
                             id: string;
                         };
-                        query: unknown;
+                        query: {
+                            test?: boolean | undefined;
+                        };
                         headers: unknown;
                         response: {
                             200: {
@@ -6578,11 +6552,13 @@ export declare const MerklApi: (domain: string | import("elysia").default<"", fa
                 };
             }>>;
             campaigns: {
-                get: (options?: {
+                get: (options: {
                     headers?: Record<string, unknown> | undefined;
-                    query?: Record<string, unknown> | undefined;
+                    query: {
+                        test?: boolean | undefined;
+                    };
                     fetch?: RequestInit | undefined;
-                } | undefined) => Promise<import("@elysiajs/eden").Treaty.TreatyResponse<{
+                }) => Promise<import("@elysiajs/eden").Treaty.TreatyResponse<{
                     200: {
                         protocol?: {
                             name: string;
@@ -6894,21 +6870,6 @@ export declare const MerklApi: (domain: string | import("elysia").default<"", fa
                         identifier: string;
                         chainId: number;
                         action: import("../../database/api/.generated").$Enums.OpportunityAction;
-                        Campaigns: {
-                            type: import("../../database/api/.generated").$Enums.CampaignType;
-                            id: string;
-                            params: import("database/api/.generated/runtime/library").JsonValue;
-                            subType: number | null;
-                            startTimestamp: bigint;
-                            endTimestamp: bigint;
-                            computeChainId: number;
-                            distributionChainId: number;
-                            campaignId: string;
-                            rewardTokenId: string;
-                            amount: string;
-                            opportunityId: string;
-                            creatorAddress: string;
-                        }[];
                         tvl: number;
                         apr: number;
                         dailyRewards: number;

package/dist/src/index.d.ts

@@ -337,21 +337,6 @@ declare const app: Elysia<"", false, {
                             identifier: string;
                             chainId: number;
                             action: import("../database/api/.generated").$Enums.OpportunityAction;
-                            Campaigns: {
-                                type: import("../database/api/.generated").$Enums.CampaignType;
-                                id: string;
-                                params: import("database/api/.generated/runtime/library").JsonValue;
-                                subType: number | null;
-                                startTimestamp: bigint;
-                                endTimestamp: bigint;
-                                computeChainId: number;
-                                distributionChainId: number;
-                                campaignId: string;
-                                rewardTokenId: string;
-                                amount: string;
-                                opportunityId: string;
-                                creatorAddress: string;
-                            }[];
                             tvl: number;
                             apr: number;
                             dailyRewards: number;
@@ -509,7 +494,9 @@ declare const app: Elysia<"", false, {
                         params: {
                             id: string;
                         };
-                        query: unknown;
+                        query: {
+                            test?: boolean | undefined;
+                        };
                         headers: unknown;
                         response: {
                             200: {

package/dist/src/libs/campaigns/campaignTypes/ERC20SubTypes/processor/UniswapProcessor.d.ts

@@ -1,6 +1,6 @@
 import type { Pricer } from "../../../../../utils/pricer";
 import { type Campaign, type CampaignParameters } from "@sdk";
-import type { tokenType } from "../helpers/tokenType";
+import type { tokenType, tokenTypeStruct } from "../helpers/tokenType";
 import { GenericProcessor, type dataType, type mandatoryCallKeys } from "./GenericProcessor";
 type callType = {
     key: keyof dataRawUni;
@@ -37,6 +37,8 @@ export declare class UniswapProcessor extends GenericProcessor<callKeysUni, data
         round3: callType[];
         round4: callType[];
     };
+    processingRound2(typeInfo: dataRawUni): void;
+    computeRound3(index: number, type: tokenType, typeInfo: dataRawUni, calls: string[]): tokenTypeStruct;
     processingRound5(_index: number, type: tokenType, typeInfo: dataRawUni, _calls: string[], campaign: CampaignParameters<Campaign.ERC20> | CampaignParameters<Campaign.EULER>, pricer: Pricer): Promise<dataTypeUni>;
 }
 export {};

package/dist/src/libs/campaigns/campaignTypes/ERC20SubTypes/processor/UniswapProcessor.js

@@ -1,4 +1,5 @@
 import { generateCardName } from "../../../../../utils/generateCardName";
+import { log } from "../../../../../utils/logger";
 import { BN2Number } from "@sdk";
 import { GenericProcessor } from "./GenericProcessor";
 export class UniswapProcessor extends GenericProcessor {
@@ -18,6 +19,21 @@ export class UniswapProcessor extends GenericProcessor {
         round3: [],
         round4: [{ key: "totalSupply", call: "totalSupply", target: "tokenAddress" }],
     };
+    processingRound2(typeInfo) {
+        if (typeInfo.tokenAddress === "0x45856bD6Bb9f076F4C558A4D5932c6c8d832b0d0") {
+            log.local("Processing round 2 for UniswapProcessor on classic pools");
+            this.rounds.round2[4] = { key: "balanceToken0", call: "reserve0", target: "tokenAddress" };
+            this.rounds.round2[5] = { key: "balanceToken1", call: "reserve1", target: "tokenAddress" };
+        }
+    }
+    computeRound3(index, type, typeInfo, calls) {
+        if (typeInfo.tokenAddress === "0x45856bD6Bb9f076F4C558A4D5932c6c8d832b0d0") {
+            log.local("Computing round 3 for UniswapProcessor on classic pools");
+            this.rounds.round2[4] = { key: "balanceToken0", call: "reserve0", target: "tokenAddress" };
+            this.rounds.round2[5] = { key: "balanceToken1", call: "reserve1", target: "tokenAddress" };
+        }
+        return super.computeRound3(index, type, typeInfo, calls);
+    }
     async processingRound5(_index, type, typeInfo, _calls, campaign, pricer) {
         const { whitelistedSupplyTargetToken, totalSupply, blacklistedSupply } = this.handleWhiteListBlacklistRound5(typeInfo, campaign);
         const decimalsToken0 = Number(typeInfo.decimalsToken0);

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

@@ -206,21 +206,6 @@ export declare const OpportunityController: Elysia<"/opportunities", false, {
                         identifier: string;
                         chainId: number;
                         action: import("../../../../database/api/.generated").$Enums.OpportunityAction;
-                        Campaigns: {
-                            type: import("../../../../database/api/.generated").$Enums.CampaignType;
-                            id: string;
-                            params: import("database/api/.generated/runtime/library").JsonValue;
-                            subType: number | null;
-                            startTimestamp: bigint;
-                            endTimestamp: bigint;
-                            computeChainId: number;
-                            distributionChainId: number;
-                            campaignId: string;
-                            rewardTokenId: string;
-                            amount: string;
-                            opportunityId: string;
-                            creatorAddress: string;
-                        }[];
                         tvl: number;
                         apr: number;
                         dailyRewards: number;
@@ -378,7 +363,9 @@ export declare const OpportunityController: Elysia<"/opportunities", false, {
                     params: {
                         id: string;
                     };
-                    query: unknown;
+                    query: {
+                        test?: boolean | undefined;
+                    };
                     headers: unknown;
                     response: {
                         200: {

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

@@ -88,7 +88,7 @@ export const OpportunityController = new Elysia({
     detail: { description: "Get a unique opportunity." },
 })
     // ─── Get An Opportunity By Id With Related Campaigns ─────────────────
-    .get("/:id/campaigns", async ({ params }) => {
+    .get("/:id/campaigns", async ({ query, params }) => {
     try {
         if (!params.id.includes("-"))
             return await OpportunityService.getUniqueWithCampaignsOrThrow(params.id);
@@ -97,7 +97,7 @@ export const OpportunityController = new Elysia({
             chainId: +chainId,
             type: type,
             identifier,
-        });
+        }, query.test ?? false);
         // Todo: need to be refactor Parsing issue
         const campaignsFormatted = oppWithCampaigns.campaigns.map(campaign => {
             if (!campaign.distributionChain)
@@ -114,6 +114,7 @@ export const OpportunityController = new Elysia({
         throw err;
     }
 }, {
+    query: GetOpportunityQueryDto,
     params: OpportunityUniqueDto,
     transform: transformId,
     beforeHandle: validateId,

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

@@ -174,21 +174,6 @@ export declare abstract class OpportunityRepository {
             id: number;
             icon: string;
         };
-        Campaigns: {
-            type: import("../../../../database/api/.generated").$Enums.CampaignType;
-            id: string;
-            params: Prisma.JsonValue;
-            subType: number | null;
-            startTimestamp: bigint;
-            endTimestamp: bigint;
-            computeChainId: number;
-            distributionChainId: number;
-            campaignId: string;
-            rewardTokenId: string;
-            amount: string;
-            opportunityId: string;
-            creatorAddress: string;
-        }[];
         Tokens: {
             symbol: string;
             name: string | null;
@@ -301,7 +286,7 @@ export declare abstract class OpportunityRepository {
         apr: number;
         dailyRewards: number;
     }>;
-    static findUniqueOrThrowWithCampaigns(id: string): Promise<{
+    static findUniqueOrThrowWithCampaigns(id: string, withTest: boolean): Promise<{
         Chain: {
             Explorer: {
                 type: import("../../../../database/api/.generated").$Enums.ExplorerType;

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

@@ -133,20 +133,11 @@ export class OpportunityRepository {
                 MainProtocol: true,
                 Protocols: true,
                 Tokens: true,
-                Campaigns: withTest
-                    ? undefined
-                    : {
-                        where: {
-                            RewardToken: {
-                                isTest: false,
-                            },
-                        },
-                    },
             },
             where: { id },
         });
     }
-    static async findUniqueOrThrowWithCampaigns(id) {
+    static async findUniqueOrThrowWithCampaigns(id, withTest) {
         const b = await apiDbClient.opportunity.findUniqueOrThrow({
             include: {
                 ...OpportunityRepository.#getRecordInclusion(),
@@ -156,6 +147,13 @@ export class OpportunityRepository {
                     },
                 },
                 Campaigns: {
+                    where: withTest
+                        ? undefined
+                        : {
+                            RewardToken: {
+                                isTest: false,
+                            },
+                        },
                     include: {
                         RewardToken: true,
                         ComputeChain: true,

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

@@ -80,7 +80,7 @@ export declare abstract class OpportunityService {
         tags: string[];
     }>;
     static updateMetadata(chain: ChainId): Promise<void>;
-    static getUniqueWithCampaignsOrThrow(opportunityId: string | OpportunityUnique): Promise<OpportunityWithCampaignsResourceModel>;
+    static getUniqueWithCampaignsOrThrow(opportunityId: string | OpportunityUnique, withTest?: boolean): Promise<OpportunityWithCampaignsResourceModel>;
     static getUniqueOrThrow(opportunityId: string | OpportunityUnique, withTest?: boolean): Promise<OpportunityResourceModel>;
     /**
      * Get the list of opportunities satisfying the query
@@ -171,21 +171,6 @@ export declare abstract class OpportunityService {
         identifier: string;
         chainId: number;
         action: import("../../../../database/api/.generated").$Enums.OpportunityAction;
-        Campaigns: {
-            type: import("../../../../database/api/.generated").$Enums.CampaignType;
-            id: string;
-            params: Prisma.JsonValue;
-            subType: number | null;
-            startTimestamp: bigint;
-            endTimestamp: bigint;
-            computeChainId: number;
-            distributionChainId: number;
-            campaignId: string;
-            rewardTokenId: string;
-            amount: string;
-            opportunityId: string;
-            creatorAddress: string;
-        }[];
         tvl: number;
         apr: number;
         dailyRewards: number;
@@ -274,21 +259,6 @@ export declare abstract class OpportunityService {
         identifier: string;
         chainId: number;
         action: import("../../../../database/api/.generated").$Enums.OpportunityAction;
-        Campaigns: {
-            type: import("../../../../database/api/.generated").$Enums.CampaignType;
-            id: string;
-            params: Prisma.JsonValue;
-            subType: number | null;
-            startTimestamp: bigint;
-            endTimestamp: bigint;
-            computeChainId: number;
-            distributionChainId: number;
-            campaignId: string;
-            rewardTokenId: string;
-            amount: string;
-            opportunityId: string;
-            creatorAddress: string;
-        }[];
         tvl: number;
         apr: number;
         dailyRewards: number;
@@ -434,21 +404,6 @@ export declare abstract class OpportunityService {
         identifier: string;
         chainId: number;
         action: import("../../../../database/api/.generated").$Enums.OpportunityAction;
-        Campaigns: {
-            type: import("../../../../database/api/.generated").$Enums.CampaignType;
-            id: string;
-            params: Prisma.JsonValue;
-            subType: number | null;
-            startTimestamp: bigint;
-            endTimestamp: bigint;
-            computeChainId: number;
-            distributionChainId: number;
-            campaignId: string;
-            rewardTokenId: string;
-            amount: string;
-            opportunityId: string;
-            creatorAddress: string;
-        }[];
         tvl: number;
         apr: number;
         dailyRewards: number;
@@ -489,21 +444,6 @@ export declare abstract class OpportunityService {
         identifier: string;
         chainId: number;
         action: import("../../../../database/api/.generated").$Enums.OpportunityAction;
-        Campaigns: {
-            type: import("../../../../database/api/.generated").$Enums.CampaignType;
-            id: string;
-            params: Prisma.JsonValue;
-            subType: number | null;
-            startTimestamp: bigint;
-            endTimestamp: bigint;
-            computeChainId: number;
-            distributionChainId: number;
-            campaignId: string;
-            rewardTokenId: string;
-            amount: string;
-            opportunityId: string;
-            creatorAddress: string;
-        }[];
         tvl: number;
         apr: number;
         dailyRewards: number;

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

@@ -157,9 +157,9 @@ export class OpportunityService {
             throw err;
         }
     }
-    static async getUniqueWithCampaignsOrThrow(opportunityId) {
+    static async getUniqueWithCampaignsOrThrow(opportunityId, withTest = false) {
         const id = typeof opportunityId === "string" ? opportunityId : OpportunityService.hashId(opportunityId);
-        const { Campaigns, ...opportunity } = await OpportunityRepository.findUniqueOrThrowWithCampaigns(id);
+        const { Campaigns, ...opportunity } = await OpportunityRepository.findUniqueOrThrowWithCampaigns(id, withTest);
         const formatted = OpportunityService.formatResponse(opportunity);
         return Object.assign(formatted, { campaigns: Campaigns.map(CampaignService.format) });
     }

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

@@ -215,21 +215,6 @@ export declare const v4: Elysia<"/v4", false, {
                             identifier: string;
                             chainId: number;
                             action: import("../../../database/api/.generated").$Enums.OpportunityAction;
-                            Campaigns: {
-                                type: import("../../../database/api/.generated").$Enums.CampaignType;
-                                id: string;
-                                params: import("database/api/.generated/runtime/library").JsonValue;
-                                subType: number | null;
-                                startTimestamp: bigint;
-                                endTimestamp: bigint;
-                                computeChainId: number;
-                                distributionChainId: number;
-                                campaignId: string;
-                                rewardTokenId: string;
-                                amount: string;
-                                opportunityId: string;
-                                creatorAddress: string;
-                            }[];
                             tvl: number;
                             apr: number;
                             dailyRewards: number;
@@ -387,7 +372,9 @@ export declare const v4: Elysia<"/v4", false, {
                         params: {
                             id: string;
                         };
-                        query: unknown;
+                        query: {
+                            test?: boolean | undefined;
+                        };
                         headers: unknown;
                         response: {
                             200: {

package/dist/src/utils/decodeCalls.js

@@ -1,4 +1,5 @@
 import { AaveInterface, AccountantWithRateProvidersInterface, AuraInterface, AuraOperatorInterface, BalancerGaugeInterface, BalancerPoolInterface, BalancerVaultInterface, BeefyInterface, CPMMGammaPoolMainInterface, CompoundInterface, CurveInterface, CurveStableSwapNGInterface, DefutureVaultInterface, ERC20Interface, EnzymeInterface, EulerInterface, FactoryInterface, FluidInterface, FraxlendInterface, GearboxVaultInterface, IonicInterface, LayerBankInterface, MaverickBPLensInterface, MetamorphoInterface, MoonwellInterface, OneInchStakingInterface, PendleInterface, PendleYTInterface, RadiantInterface, RfxInterface, RswEthStrategyInterface, SturdyInterface, SymetricAmbientStrategyInterface, TorosInterface, UniswapV2PoolInterface, VePufferInterface, ZFStableLPINterface, ZFStableSwapThreePoolInterface, } from "@sdk";
+import { SyncSwapClassicPoolInterface } from "libs/sdk/src/merkl/interface";
 import { tokenType } from "../libs/campaigns/campaignTypes/ERC20SubTypes/helpers/tokenType";
 export function decodeCall(calls, index, key, type) {
     const returnData = calls[index];
@@ -229,6 +230,10 @@ export function decodeCall(calls, index, key, type) {
             ];
         case "tokenBalances":
             return CPMMGammaPoolMainInterface.decodeFunctionResult("getLatestCFMMBalances", returnData)[0];
+        case "reserve0":
+            return SyncSwapClassicPoolInterface.decodeFunctionResult("reserve0", returnData)[0];
+        case "reserve1":
+            return SyncSwapClassicPoolInterface.decodeFunctionResult("reserve1", returnData)[0];
         default:
             throw new Error(`Key not recognized for ${key}`);
     }

package/dist/src/utils/encodeCalls.js

@@ -1,5 +1,6 @@
 import { tokenType } from "../libs/campaigns/campaignTypes/ERC20SubTypes/helpers/tokenType";
 import { AaveInterface, AccountantWithRateProvidersInterface, AuraInterface, AuraOperatorInterface, BalancerGaugeInterface, BalancerPoolInterface, BalancerVaultInterface, BeefyInterface, CPMMGammaPoolMainInterface, CompoundInterface, CurveInterface, CurveStableSwapNGInterface, DefutureVaultInterface, ERC20Interface, EnzymeInterface, EulerInterface, FactoryInterface, FluidInterface, FraxlendInterface, GearboxVaultInterface, IonicInterface, LayerBankInterface, MaverickBPLensInterface, MetamorphoInterface, MoonwellInterface, OneInchStakingInterface, PendleInterface, PendleYTInterface, RadiantInterface, RfxDatastoreInterface, RswEthStrategyInterface, SturdyInterface, SymetricAmbientStrategyInterface, TorosInterface, UniswapV2PoolInterface, VePufferInterface, ZFStableLPINterface, } from "@sdk";
+import { SyncSwapClassicPoolInterface } from "libs/sdk/src/merkl/interface";
 export function createCall(target, key, type, metaData) {
     switch (key) {
         case "SY":
@@ -350,6 +351,18 @@ export function createCall(target, key, type, metaData) {
                 callData: UniswapV2PoolInterface.encodeFunctionData("getReserves"),
                 target: target,
             };
+        case "reserve0":
+            return {
+                allowFailure: true,
+                callData: SyncSwapClassicPoolInterface.encodeFunctionData("reserve0"),
+                target: target,
+            };
+        case "reserve1":
+            return {
+                allowFailure: true,
+                callData: SyncSwapClassicPoolInterface.encodeFunctionData("reserve1"),
+                target: target,
+            };
         default:
             throw new Error(`Unknown key ${key}`);
     }