@merkl/api 0.10.170 → 0.10.171

package/dist/src/index.d.ts

@@ -128,7 +128,7 @@ declare const app: Elysia<"", false, {
                                 }[];
                             };
                             id: string;
-                            tokens: {
+                            tokens: ({
                                 symbol: string;
                                 name: string | null;
                                 id: string;
@@ -136,11 +136,11 @@ declare const app: Elysia<"", false, {
                                 address: string;
                                 icon: string;
                                 decimals: number;
-                                displaySymbol: string;
                                 verified: boolean;
                                 isTest: boolean;
-                                price: number | null;
-                            }[];
+                            } & {
+                                price?: number | null | undefined;
+                            })[];
                             chain: {
                                 name: string;
                                 id: number;
@@ -231,7 +231,7 @@ declare const app: Elysia<"", false, {
                                     }[];
                                 };
                                 id: string;
-                                tokens: {
+                                tokens: ({
                                     symbol: string;
                                     name: string | null;
                                     id: string;
@@ -239,11 +239,11 @@ declare const app: Elysia<"", false, {
                                     address: string;
                                     icon: string;
                                     decimals: number;
-                                    displaySymbol: string;
                                     verified: boolean;
                                     isTest: boolean;
-                                    price: number | null;
-                                }[];
+                                } & {
+                                    price?: number | null | undefined;
+                                })[];
                                 chain: {
                                     name: string;
                                     id: number;
@@ -282,10 +282,10 @@ declare const app: Elysia<"", false, {
                                         address: string;
                                         icon: string;
                                         decimals: number;
-                                        displaySymbol: string;
                                         verified: boolean;
                                         isTest: boolean;
-                                        price: number | null;
+                                    } & {
+                                        price?: number | null | undefined;
                                     };
                                     distributionChain: {
                                         name: string;
@@ -392,7 +392,7 @@ declare const app: Elysia<"", false, {
                                 }[];
                             };
                             id: string;
-                            tokens: {
+                            tokens: ({
                                 symbol: string;
                                 name: string | null;
                                 id: string;
@@ -400,11 +400,11 @@ declare const app: Elysia<"", false, {
                                 address: string;
                                 icon: string;
                                 decimals: number;
-                                displaySymbol: string;
                                 verified: boolean;
                                 isTest: boolean;
-                                price: number | null;
-                            }[];
+                            } & {
+                                price?: number | null | undefined;
+                            })[];
                             chain: {
                                 name: string;
                                 id: number;
@@ -488,7 +488,7 @@ declare const app: Elysia<"", false, {
                         headers: unknown;
                         response: {
                             200: {
-                                sum: number | null;
+                                sum: File;
                             };
                         };
                     };
@@ -557,8 +557,8 @@ declare const app: Elysia<"", false, {
                         mainParameter?: string | undefined;
                         campaignId?: string | undefined;
                         opportunityId?: string | undefined;
-                        tokenSymbol?: string | undefined;
                         test?: boolean | undefined;
+                        tokenSymbol?: string | undefined;
                     };
                     headers: unknown;
                     response: {
@@ -577,10 +577,10 @@ declare const app: Elysia<"", false, {
                                 address: string;
                                 icon: string;
                                 decimals: number;
-                                displaySymbol: string;
                                 verified: boolean;
                                 isTest: boolean;
-                                price: number | null;
+                            } & {
+                                price?: number | null | undefined;
                             };
                             distributionChain: {
                                 name: string;
@@ -628,8 +628,8 @@ declare const app: Elysia<"", false, {
                         mainParameter?: string | undefined;
                         campaignId?: string | undefined;
                         opportunityId?: string | undefined;
-                        tokenSymbol?: string | undefined;
                         test?: boolean | undefined;
+                        tokenSymbol?: string | undefined;
                     };
                     headers: unknown;
                     response: {
@@ -783,7 +783,6 @@ declare const app: Elysia<"", false, {
                             address: string;
                             icon: string;
                             decimals: number;
-                            displaySymbol: string;
                             verified: boolean;
                             isTest: boolean;
                             price?: number | null | undefined;
@@ -814,7 +813,6 @@ declare const app: Elysia<"", false, {
                             address: string;
                             icon: string;
                             decimals: number;
-                            displaySymbol: string;
                             verified: boolean;
                             isTest: boolean;
                         } & {
@@ -838,10 +836,11 @@ declare const app: Elysia<"", false, {
                         chainId?: any;
                         address?: string | undefined;
                         verified?: boolean | undefined;
+                        test?: boolean | undefined;
                     };
                     headers: unknown;
                     response: {
-                        200: ({
+                        200: {
                             symbol: string;
                             name: string | null;
                             id: string;
@@ -852,9 +851,8 @@ declare const app: Elysia<"", false, {
                             displaySymbol: string;
                             verified: boolean;
                             isTest: boolean;
-                        } & {
-                            price?: number | null | undefined;
-                        })[];
+                            price: number | null;
+                        }[];
                     };
                 };
             };
@@ -871,6 +869,7 @@ declare const app: Elysia<"", false, {
                         chainId?: any;
                         address?: string | undefined;
                         verified?: boolean | undefined;
+                        test?: boolean | undefined;
                     };
                     headers: unknown;
                     response: {

package/dist/src/libs/campaigns/campaignTypes/ERC20SubTypes/processor/TempestVaultProcessor.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 dataRawTempest;
@@ -23,6 +23,7 @@ type dataRawTempest = callKeysTempest & {
     amount0Invested: string;
     amount1Idle: string;
     amount1Invested: string;
+    amountInQueue?: string;
     decimalsToken0: string;
     decimalsToken1: string;
     positionsReturnData: {
@@ -45,6 +46,7 @@ export declare class TempestVaultProcessor extends GenericProcessor<callKeysTemp
         round4: callType[];
     };
     processingRound2(typeInfo: dataRawTempest): void;
+    computeRound3(index: number, type: tokenType, typeInfo: dataRawTempest, calls: string[]): tokenTypeStruct;
     processingRound5(_index: number, type: tokenType, typeInfo: dataRawTempest, _calls: string[], campaign: CampaignParameters<Campaign.ERC20> | CampaignParameters<Campaign.EULER>, pricer: Pricer): Promise<dataTypeTempest>;
 }
 export {};

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

@@ -1,5 +1,5 @@
 import { generateCardName } from "../../../../../utils/generateCardName";
-import { BN2Number } from "@sdk";
+import { BN2Number, NULL_ADDRESS } from "@sdk";
 import { GenericProcessor } from "./GenericProcessor";
 export class TempestVaultProcessor extends GenericProcessor {
     rounds = {
@@ -9,8 +9,8 @@ export class TempestVaultProcessor extends GenericProcessor {
         ],
         round2: [
             { key: "symbolToken0", call: "symbol", target: "addressToken0" },
-            { key: "symbolToken1", call: "symbol", target: "addressToken1" },
             { key: "decimalsToken0", call: "decimals", target: "addressToken0" },
+            { key: "symbolToken1", call: "symbol", target: "addressToken1" },
             { key: "decimalsToken1", call: "decimals", target: "addressToken1" },
         ],
         round3: [],
@@ -19,17 +19,46 @@ export class TempestVaultProcessor extends GenericProcessor {
     processingRound2(typeInfo) {
         typeInfo.addressToken0 = typeInfo.addressesReturnData[0];
         typeInfo.addressToken1 = typeInfo.addressesReturnData[1];
-        typeInfo.amount0Invested = typeInfo.positionsReturnData[0];
-        typeInfo.amount1Invested = typeInfo.positionsReturnData[1];
-        typeInfo.amount0Idle = typeInfo.positionsReturnData[2];
-        typeInfo.amount1Idle = typeInfo.positionsReturnData[3];
+        typeInfo.amount0Invested = typeInfo.positionsReturnData[0].toString();
+        typeInfo.amount1Invested = typeInfo.positionsReturnData[1].toString();
+        typeInfo.amount0Idle = typeInfo.positionsReturnData[2].toString();
+        typeInfo.amount1Idle = typeInfo.positionsReturnData[3].toString();
+        try {
+            typeInfo.amountInQueue = typeInfo.positionsReturnData[4].toString();
+        }
+        catch { }
+        if (typeInfo.addressToken0 === NULL_ADDRESS) {
+            this.rounds.round2 = this.rounds.round2.filter(call => call.target !== "addressToken0");
+            typeInfo.symbolToken0 = "ETH";
+            typeInfo.decimalsToken0 = "18";
+        }
+        if (typeInfo.addressToken1 === NULL_ADDRESS) {
+            this.rounds.round2 = this.rounds.round2.filter(call => call.target !== "addressToken1");
+            typeInfo.symbolToken1 = "ETH";
+            typeInfo.decimalsToken1 = "18";
+        }
+    }
+    computeRound3(index, type, typeInfo, calls) {
+        if (typeInfo.addressToken0 === NULL_ADDRESS) {
+            this.rounds.round2 = this.rounds.round2.filter(call => call.target !== "addressToken0");
+            typeInfo.symbolToken0 = "ETH";
+            typeInfo.decimalsToken0 = "18";
+        }
+        if (typeInfo.addressToken1 === NULL_ADDRESS) {
+            this.rounds.round2 = this.rounds.round2.filter(call => call.target !== "addressToken1");
+            typeInfo.symbolToken1 = "ETH";
+            typeInfo.decimalsToken1 = "18";
+        }
+        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);
         const decimalsToken1 = Number(typeInfo.decimalsToken1);
         const amount0 = BN2Number(typeInfo.amount0Idle, decimalsToken0) + BN2Number(typeInfo.amount0Invested, decimalsToken0);
-        const amount1 = BN2Number(typeInfo.amount1Idle, decimalsToken1) + BN2Number(typeInfo.amount1Invested, decimalsToken1);
+        const amount1 = BN2Number(typeInfo.amount1Idle, decimalsToken1) +
+            BN2Number(typeInfo.amount1Invested, decimalsToken1) +
+            (!!typeInfo.amountInQueue ? BN2Number(typeInfo.amountInQueue, decimalsToken1) : 0);
         const tokenAPRice = (await pricer.get({ symbol: typeInfo.symbolToken0 })) ?? 0;
         const tokenBPrice = (await pricer.get({ symbol: typeInfo.symbolToken1 })) ?? 0;
         const tvl = tokenAPRice * amount0 + tokenBPrice * amount1;

package/dist/src/libs/campaigns/campaignTypes/ERC20SubTypes/subtypesRound1RefactoFinal.js

@@ -91,7 +91,7 @@ function satisfiesNameConditions(name, type) {
         case tokenType.maha:
             return lowerCaseName.includes("staked") && lowerCaseName.includes("maha");
         case tokenType.tempest:
-            return lowerCaseName.startsWith("ts");
+            return lowerCaseName.startsWith("ts") || lowerCaseName.startsWith("tempest");
         default:
             return false;
     }

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

@@ -71,8 +71,8 @@ export declare const CampaignController: Elysia<"/campaigns", false, {
                     mainParameter?: string | undefined;
                     campaignId?: string | undefined;
                     opportunityId?: string | undefined;
-                    tokenSymbol?: string | undefined;
                     test?: boolean | undefined;
+                    tokenSymbol?: string | undefined;
                 };
                 headers: unknown;
                 response: {
@@ -91,10 +91,10 @@ export declare const CampaignController: Elysia<"/campaigns", false, {
                             address: string;
                             icon: string;
                             decimals: number;
-                            displaySymbol: string;
                             verified: boolean;
                             isTest: boolean;
-                            price: number | null;
+                        } & {
+                            price?: number | null | undefined;
                         };
                         distributionChain: {
                             name: string;
@@ -142,8 +142,8 @@ export declare const CampaignController: Elysia<"/campaigns", false, {
                     mainParameter?: string | undefined;
                     campaignId?: string | undefined;
                     opportunityId?: string | undefined;
-                    tokenSymbol?: string | undefined;
                     test?: boolean | undefined;
+                    tokenSymbol?: string | undefined;
                 };
                 headers: unknown;
                 response: {

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

@@ -26,6 +26,7 @@ export class CampaignRepository {
                 RewardToken: {
                     address: tokenAddress ? tokenAddress : undefined,
                     symbol: tokenSymbol ? tokenSymbol : undefined,
+                    displaySymbol: tokenSymbol ? tokenSymbol : undefined,
                     isTest: !test ? false : undefined,
                 },
             },

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

@@ -43,10 +43,10 @@ export declare abstract class CampaignService {
             address: string;
             icon: string;
             decimals: number;
-            displaySymbol: string;
             verified: boolean;
             isTest: boolean;
-            price: number | null;
+        } & {
+            price?: number | null | undefined;
         };
         distributionChain: {
             name: string;
@@ -177,10 +177,10 @@ export declare abstract class CampaignService {
             address: string;
             icon: string;
             decimals: number;
-            displaySymbol: string;
             verified: boolean;
             isTest: boolean;
-            price: number | null;
+        } & {
+            price?: number | null | undefined;
         };
         distributionChain: {
             name: string;

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

@@ -8,6 +8,7 @@ import { log } from "../../../utils/logger";
 import { NETWORK_LABELS } from "@sdk";
 import moment from "moment";
 import { StatusService } from "../status";
+import { TokenService } from "../token";
 export class CampaignService {
     static hashId(campaign) {
         return Bun.hash(`${campaign.distributionChain}${campaign.campaignId}`).toString();
@@ -169,7 +170,7 @@ export class CampaignService {
             ...c,
             params: params,
             chain: ComputeChain,
-            rewardToken: RewardToken,
+            rewardToken: TokenService.format(RewardToken),
             distributionChain: DistributionChain === null ? undefined : DistributionChain,
             // Todo: need to be change to single 1 to 1 with campaign
             campaignStatus: CampaignStatus?.[0],

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

@@ -101,7 +101,7 @@ export declare const OpportunityController: Elysia<"/opportunities", false, {
                             }[];
                         };
                         id: string;
-                        tokens: {
+                        tokens: ({
                             symbol: string;
                             name: string | null;
                             id: string;
@@ -109,11 +109,11 @@ export declare const OpportunityController: Elysia<"/opportunities", false, {
                             address: string;
                             icon: string;
                             decimals: number;
-                            displaySymbol: string;
                             verified: boolean;
                             isTest: boolean;
-                            price: number | null;
-                        }[];
+                        } & {
+                            price?: number | null | undefined;
+                        })[];
                         chain: {
                             name: string;
                             id: number;
@@ -204,7 +204,7 @@ export declare const OpportunityController: Elysia<"/opportunities", false, {
                                 }[];
                             };
                             id: string;
-                            tokens: {
+                            tokens: ({
                                 symbol: string;
                                 name: string | null;
                                 id: string;
@@ -212,11 +212,11 @@ export declare const OpportunityController: Elysia<"/opportunities", false, {
                                 address: string;
                                 icon: string;
                                 decimals: number;
-                                displaySymbol: string;
                                 verified: boolean;
                                 isTest: boolean;
-                                price: number | null;
-                            }[];
+                            } & {
+                                price?: number | null | undefined;
+                            })[];
                             chain: {
                                 name: string;
                                 id: number;
@@ -255,10 +255,10 @@ export declare const OpportunityController: Elysia<"/opportunities", false, {
                                     address: string;
                                     icon: string;
                                     decimals: number;
-                                    displaySymbol: string;
                                     verified: boolean;
                                     isTest: boolean;
-                                    price: number | null;
+                                } & {
+                                    price?: number | null | undefined;
                                 };
                                 distributionChain: {
                                     name: string;
@@ -365,7 +365,7 @@ export declare const OpportunityController: Elysia<"/opportunities", false, {
                             }[];
                         };
                         id: string;
-                        tokens: {
+                        tokens: ({
                             symbol: string;
                             name: string | null;
                             id: string;
@@ -373,11 +373,11 @@ export declare const OpportunityController: Elysia<"/opportunities", false, {
                             address: string;
                             icon: string;
                             decimals: number;
-                            displaySymbol: string;
                             verified: boolean;
                             isTest: boolean;
-                            price: number | null;
-                        }[];
+                        } & {
+                            price?: number | null | undefined;
+                        })[];
                         chain: {
                             name: string;
                             id: number;
@@ -461,7 +461,7 @@ export declare const OpportunityController: Elysia<"/opportunities", false, {
                     headers: unknown;
                     response: {
                         200: {
-                            sum: number | null;
+                            sum: File;
                         };
                     };
                 };

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

@@ -332,7 +332,110 @@ export declare abstract class OpportunityRepository {
         apr: number;
         dailyRewards: number;
     })[]>;
-    static findMany(query: GetOpportunitiesQueryModel): Promise<{
+    static findMany(query: GetOpportunitiesQueryModel): Promise<({
+        Chain: {
+            name: string;
+            id: number;
+            icon: string;
+        };
+        Tokens: {
+            symbol: string;
+            name: string | null;
+            id: string;
+            chainId: number;
+            address: string;
+            icon: string;
+            decimals: number;
+            displaySymbol: string;
+            verified: boolean;
+            isTest: boolean;
+            price: number | null;
+        }[];
+        Protocols: {
+            name: string;
+            url: string;
+            description: string;
+            id: string;
+            tags: import("../../../../database/api/.generated").$Enums.ProtocolTag[];
+            icon: string;
+        }[];
+        MainProtocol: {
+            name: string;
+            url: string;
+            description: string;
+            id: string;
+            tags: import("../../../../database/api/.generated").$Enums.ProtocolTag[];
+            icon: string;
+        } | null;
+        TvlRecords: ({
+            TvlBreakdown: {
+                type: import("../../../../database/api/.generated").$Enums.TvlType;
+                id: number;
+                identifier: string;
+                value: number;
+                tvlRecordId: string;
+            }[];
+        } & {
+            total: number;
+            id: string;
+            timestamp: bigint;
+            opportunityId: string;
+        })[];
+        AprRecords: ({
+            AprBreakdown: {
+                type: import("../../../../database/api/.generated").$Enums.AprType;
+                id: number;
+                identifier: string;
+                value: number;
+                aprRecordId: string;
+            }[];
+        } & {
+            id: string;
+            timestamp: bigint;
+            opportunityId: string;
+            cumulated: number;
+        })[];
+        DailyRewardsRecords: ({
+            DailyRewardsBreakdown: ({
+                Campaign: {
+                    startTimestamp: bigint;
+                    endTimestamp: bigint;
+                    amount: string;
+                    RewardToken: {
+                        symbol: string;
+                        name: string | null;
+                        id: string;
+                        chainId: number;
+                        address: string;
+                        icon: string;
+                        decimals: number;
+                        displaySymbol: string;
+                        verified: boolean;
+                        isTest: boolean;
+                        price: number | null;
+                    };
+                    CampaignStatus: {
+                        error: string;
+                        details: Prisma.JsonValue;
+                        status: import("../../../../database/api/.generated").$Enums.RunStatus;
+                        campaignId: string;
+                        computedUntil: bigint;
+                        processingStarted: bigint;
+                    }[];
+                };
+            } & {
+                id: number;
+                value: number;
+                campaignId: string;
+                dailyRewardsRecordId: string;
+            })[];
+        } & {
+            total: number;
+            id: string;
+            timestamp: bigint;
+            opportunityId: string;
+        })[];
+    } & {
         name: string;
         type: import("../../../../database/api/.generated").$Enums.CampaignType;
         id: string;
@@ -345,7 +448,7 @@ export declare abstract class OpportunityRepository {
         tvl: number;
         apr: number;
         dailyRewards: number;
-    }[]>;
+    })[]>;
     static findLiveWithFirstCampaign(chainId: MerklChainId): Promise<({
         Chain: {
             name: string;
@@ -599,6 +702,6 @@ export declare abstract class OpportunityRepository {
         dailyRewards: number;
     }>;
     static aggregateSum(field: keyof Prisma.OpportunitySumAggregateInputType, query: GetOpportunitiesQueryModel): Promise<{
-        sum: number | null;
+        sum: never;
     }>;
 }

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

@@ -155,7 +155,7 @@ export class OpportunityRepository {
                             status: !status ? undefined : { in: status },
                         },
                         { mainProtocolId: !protocols ? undefined : { in: protocols } },
-                        test ? undefined : { Campaigns: { some: { RewardToken: { isTest: false } } } },
+                        { Campaigns: test ? undefined : { some: { RewardToken: { isTest: false } } } },
                     ],
                 },
         };