@merkl/api 0.18.14 → 0.19.1

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

@@ -122,9 +122,9 @@ export declare const OpportunityController: Elysia<"/opportunities", false, {
                     chainId?: string | undefined;
                     mainProtocolId?: string | undefined;
                     campaigns?: boolean | undefined;
+                    test?: boolean | undefined;
                     rewardTokenSymbol?: string | undefined;
                     order?: string | undefined;
-                    test?: boolean | undefined;
                     minimumTvl?: number | undefined;
                 };
                 headers: unknown;
@@ -315,9 +315,9 @@ export declare const OpportunityController: Elysia<"/opportunities", false, {
                     chainId?: string | undefined;
                     mainProtocolId?: string | undefined;
                     campaigns?: boolean | undefined;
+                    test?: boolean | undefined;
                     rewardTokenSymbol?: string | undefined;
                     order?: string | undefined;
-                    test?: boolean | undefined;
                     minimumTvl?: number | undefined;
                 };
                 headers: unknown;
@@ -803,9 +803,9 @@ export declare const OpportunityController: Elysia<"/opportunities", false, {
                         chainId?: string | undefined;
                         mainProtocolId?: string | undefined;
                         campaigns?: boolean | undefined;
+                        test?: boolean | undefined;
                         rewardTokenSymbol?: string | undefined;
                         order?: string | undefined;
-                        test?: boolean | undefined;
                         minimumTvl?: number | undefined;
                     };
                     headers: unknown;
@@ -843,9 +843,9 @@ export declare const OpportunityController: Elysia<"/opportunities", false, {
                             chainId?: string | undefined;
                             mainProtocolId?: string | undefined;
                             campaigns?: boolean | undefined;
+                            test?: boolean | undefined;
                             rewardTokenSymbol?: string | undefined;
                             order?: string | undefined;
-                            test?: boolean | undefined;
                             minimumTvl?: number | undefined;
                         };
                         headers: unknown;
@@ -884,9 +884,9 @@ export declare const OpportunityController: Elysia<"/opportunities", false, {
                             chainId?: string | undefined;
                             mainProtocolId?: string | undefined;
                             campaigns?: boolean | undefined;
+                            test?: boolean | undefined;
                             rewardTokenSymbol?: string | undefined;
                             order?: string | undefined;
-                            test?: boolean | undefined;
                             minimumTvl?: number | undefined;
                         };
                         headers: unknown;

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

@@ -15,7 +15,9 @@ export declare enum program {
 export declare enum anglesCampaigns {
     Angles_supply_in_angles_liquid = "0x15E96CDecA34B9DE1B31586c1206206aDb92E69D",
     hold_anS = "0x0C4E186Eae8aCAA7F7de1315D5AD174BE39Ec987",
-    hold_wANS = "0xfA85Fe5A8F5560e9039C04f2b0a90dE1415aBD70"
+    hold_wANS = "0xfA85Fe5A8F5560e9039C04f2b0a90dE1415aBD70",
+    pendle_YT = "0x081424EC3F4BFe0ad829297D6Cb73997656F56ac",
+    pendle_PT = "0x9700C4C218237550EAd3a78022d43215A717e5e7"
 }
 export declare enum etherlinkCampaigns {
     Superlend_Supply_WBTC_Etherlink = "Superlend Supply WBTC Etherlink 0xfCA0802cb10b3b134a91e07f03965f63eF4B23eA",
@@ -26,6 +28,7 @@ export declare enum etherlinkCampaigns {
     Iguana_WETH_WXTZ = "Iguana WETH/WXTZ Etherlink 0x478F067b0Ed73d120BBcd8c6f4f33438FC483912",
     Iguana_USDC_USDT = "Iguana USDC/USDT Etherlink 0x86456e2E2A203Da82E61ed34eF4137Fbe545f0DC",
     Iguana_XTZ_USDC = "Iguana XTZ/USDT Etherlink 0x508060A01f11d6a2Eb774B55aEba95931265E0cc",
+    Iguana_WBTC_XTZ = "Iguana WBTC/XTZ Etherlink 0x8930e315fa6D704A94bE6E14DaD66f6d66FfF7DF",
     Hanji_HJLP = "Hanji HJLP Etherlink 0x1cd88fBD530281Ad6c639E2B897c4E239003A930",
     Uranium_Hold_xU308_Etherlink = "Uranium Hold xU308 Etherlink 0x79052Ab3C166D4899a1e0DD033aC3b379AF0B1fD",
     referral_test = "referral test Etherlink 0x0",
@@ -414,6 +417,26 @@ declare const AnglesInterfaceCampaigns: {
         url: string;
         forwarders: never[];
     };
+    "0x9700C4C218237550EAd3a78022d43215A717e5e7": {
+        campaignType: any;
+        computeChainId: any;
+        hooks: never[];
+        targetToken: string;
+        whitelist: never[];
+        blacklist: never[];
+        url: string;
+        forwarders: never[];
+    };
+    "0x081424EC3F4BFe0ad829297D6Cb73997656F56ac": {
+        campaignType: any;
+        computeChainId: any;
+        hooks: never[];
+        targetToken: string;
+        whitelist: never[];
+        blacklist: never[];
+        url: string;
+        forwarders: never[];
+    };
     "0x0C4E186Eae8aCAA7F7de1315D5AD174BE39Ec987": {
         campaignType: any;
         computeChainId: any;
@@ -694,6 +717,34 @@ declare const EtherlinkInterfaceCampaigns: {
         weightToken0: number;
         weightToken1: number;
     };
+    "Iguana WBTC/XTZ Etherlink 0x8930e315fa6D704A94bE6E14DaD66f6d66FfF7DF": {
+        campaignType: any;
+        computeChainId: any;
+        hooks: {
+            hookType: any;
+            key: string;
+            chainId: any;
+            contractAddress: string;
+            contractState: any;
+            boostForReferrer: any;
+            valueForBoostForReferrer: number;
+            boostForInvited: any;
+            valueForBoostForInvited: number;
+            defaultBoost: any;
+            maximumBoostReferrer: number;
+            maximumBoostInvited: number;
+            cumulativeBoost: boolean;
+        }[];
+        poolAddress: string;
+        whitelist: never[];
+        blacklist: string[];
+        url: string;
+        forwarders: never[];
+        isOutOfRangeIncentivized: boolean;
+        weightFees: number;
+        weightToken0: number;
+        weightToken1: number;
+    };
     "referral test Etherlink 0x0": {
         campaignType: any;
         computeChainId: any;

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

@@ -19,8 +19,8 @@ export var anglesCampaigns;
     anglesCampaigns["Angles_supply_in_angles_liquid"] = "0x15E96CDecA34B9DE1B31586c1206206aDb92E69D";
     anglesCampaigns["hold_anS"] = "0x0C4E186Eae8aCAA7F7de1315D5AD174BE39Ec987";
     anglesCampaigns["hold_wANS"] = "0xfA85Fe5A8F5560e9039C04f2b0a90dE1415aBD70";
-    // pendle_lp =
-    // pendle PT
+    anglesCampaigns["pendle_YT"] = "0x081424EC3F4BFe0ad829297D6Cb73997656F56ac";
+    anglesCampaigns["pendle_PT"] = "0x9700C4C218237550EAd3a78022d43215A717e5e7";
 })(anglesCampaigns || (anglesCampaigns = {}));
 export var etherlinkCampaigns;
 (function (etherlinkCampaigns) {
@@ -32,6 +32,7 @@ export var etherlinkCampaigns;
     etherlinkCampaigns["Iguana_WETH_WXTZ"] = "Iguana WETH/WXTZ Etherlink 0x478F067b0Ed73d120BBcd8c6f4f33438FC483912";
     etherlinkCampaigns["Iguana_USDC_USDT"] = "Iguana USDC/USDT Etherlink 0x86456e2E2A203Da82E61ed34eF4137Fbe545f0DC";
     etherlinkCampaigns["Iguana_XTZ_USDC"] = "Iguana XTZ/USDT Etherlink 0x508060A01f11d6a2Eb774B55aEba95931265E0cc";
+    etherlinkCampaigns["Iguana_WBTC_XTZ"] = "Iguana WBTC/XTZ Etherlink 0x8930e315fa6D704A94bE6E14DaD66f6d66FfF7DF";
     etherlinkCampaigns["Hanji_HJLP"] = "Hanji HJLP Etherlink 0x1cd88fBD530281Ad6c639E2B897c4E239003A930";
     etherlinkCampaigns["Uranium_Hold_xU308_Etherlink"] = "Uranium Hold xU308 Etherlink 0x79052Ab3C166D4899a1e0DD033aC3b379AF0B1fD";
     etherlinkCampaigns["referral_test"] = "referral test Etherlink 0x0";
@@ -449,6 +450,26 @@ const AnglesInterfaceCampaigns = {
         url: "https://sonicscan.org/token/0x15E96CDecA34B9DE1B31586c1206206aDb92E69D#readContract",
         forwarders: [],
     },
+    [anglesCampaigns.pendle_PT]: {
+        campaignType: Campaign.ERC20_FIX_APR,
+        computeChainId: ChainId.SONIC,
+        hooks: [],
+        targetToken: "0x9700C4C218237550EAd3a78022d43215A717e5e7",
+        whitelist: [],
+        blacklist: [],
+        url: "https://app.pendle.finance/trade/pools/0x9700C4C218237550EAd3a78022d43215A717e5e7/zap/in?chain=sonic",
+        forwarders: [],
+    },
+    [anglesCampaigns.pendle_YT]: {
+        campaignType: Campaign.ERC20_FIX_APR,
+        computeChainId: ChainId.SONIC,
+        hooks: [],
+        targetToken: "0x081424EC3F4BFe0ad829297D6Cb73997656F56ac",
+        whitelist: [],
+        blacklist: [],
+        url: "https://app.pendle.finance/trade/pools/0x081424EC3F4BFe0ad829297D6Cb73997656F56ac/zap/in?chain=sonic",
+        forwarders: [],
+    },
     [anglesCampaigns.hold_anS]: {
         campaignType: Campaign.ERC20REBASEFIXAPR,
         computeChainId: ChainId.SONIC,
@@ -557,9 +578,9 @@ const EtherlinkInterfaceCampaigns = {
         url: "https://www.iguanadex.com/info/v3/pairs/0x478f067b0ed73d120bbcd8c6f4f33438fc483912?chain=etherlink",
         forwarders: [],
         isOutOfRangeIncentivized: false,
-        weightFees: 2000,
-        weightToken0: 4000,
-        weightToken1: 4000,
+        weightFees: 6000,
+        weightToken0: 2000,
+        weightToken1: 2000,
     },
     [etherlinkCampaigns.Iguana_USDC_USDT]: {
         campaignType: Campaign.CLAMM,
@@ -571,8 +592,8 @@ const EtherlinkInterfaceCampaigns = {
         url: "https://www.iguanadex.com/info/v3/pairs/0x86456e2e2a203da82e61ed34ef4137fbe545f0dc?chain=etherlink",
         forwarders: [],
         isOutOfRangeIncentivized: false,
-        weightFees: 2000,
-        weightToken0: 4000,
+        weightFees: 6000,
+        weightToken0: 0,
         weightToken1: 4000,
     },
     [etherlinkCampaigns.Iguana_XTZ_USDC]: {
@@ -585,9 +606,23 @@ const EtherlinkInterfaceCampaigns = {
         url: "https://www.iguanadex.com/info/v3/pairs/0x508060A01f11d6a2Eb774B55aEba95931265E0cc?chain=etherlink",
         forwarders: [],
         isOutOfRangeIncentivized: false,
-        weightFees: 2000,
-        weightToken0: 4000,
-        weightToken1: 4000,
+        weightFees: 6000,
+        weightToken0: 2000,
+        weightToken1: 2000,
+    },
+    [etherlinkCampaigns.Iguana_WBTC_XTZ]: {
+        campaignType: Campaign.CLAMM,
+        computeChainId: ChainId.ETHERLINK,
+        hooks: [etherlinkReferralProgram],
+        poolAddress: "0x8930e315fa6D704A94bE6E14DaD66f6d66FfF7DF",
+        whitelist: [],
+        blacklist: blacklistEtherlink,
+        url: "https://www.iguanadex.com/info/v3/pairs/0x8930e315fa6D704A94bE6E14DaD66f6d66FfF7DF?chain=etherlink",
+        forwarders: [],
+        isOutOfRangeIncentivized: false,
+        weightFees: 6000,
+        weightToken0: 2000,
+        weightToken1: 2000,
     },
     [etherlinkCampaigns.referral_test]: {
         campaignType: Campaign.ERC20,
@@ -5001,11 +5036,11 @@ const PufferInterfaceCampaigns = {
         url: "https://app.zircuit.com/stake",
         forwarders: [
             {
-                forwarderType: Forwarder.INCOMING_TRANSFERS,
+                forwarderType: Forwarder.VAULT,
                 priority: 0,
                 sender: "0xF047ab4c75cebf0eB9ed34Ae2c186f3611aEAfa6",
-                token: "0xD9A442856C234a39a81a089C06451EBAa4306a72", // Token to use transfer of. If priority is 0, it is the target token
-                senderType: StandardType.ERC20,
+                balanceCallType: BalanceCallType.ZtakingPool,
+                callDataKey: "0xD9A442856C234a39a81a089C06451EBAa4306a72",
             },
         ],
     },

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

@@ -16,10 +16,11 @@ export declare class ProgramPayloadService {
         safePayload: safePayload;
         nonEncodedConfig: any;
     }>;
-    static createSafePayloadForCampaign(args: CampaignParametersStruct, distributionChainId: ChainId, rewardToken: string, distributionCreator: string, withApproval?: boolean): [approvalTransaction, createCampaignTransaction] | [createCampaignTransaction];
+    static checkMinimumAmount(rewardToken: string, args: CampaignParametersStruct, distributionChainId: ChainId): Promise<boolean>;
+    static createSafePayloadForCampaign(args: CampaignParametersStruct, distributionChainId: ChainId, rewardToken: string, distributionCreator: string, withApproval?: boolean): Promise<[approvalTransaction, createCampaignTransaction] | [createCampaignTransaction]>;
     static initiateSafePayload(distributionChainId: ChainId, distributionCreator: string, rewardToken: string, approvalAmount?: string): safePayload;
-    static buildPayload(query: CampaignPayloadInputModel, initialCampaignPayload?: safePayload | null, totalAmount?: string): safePayload;
-    static buildProgramPayload(query: ProgramPayloadInputModel): safePayload | null;
-    static buildProgramPayloadWithAmounts(query: ProgramPayloadInputModel, body: CampaignAmountsInputModel): safePayload | null;
+    static buildPayload(query: CampaignPayloadInputModel, initialCampaignPayload?: safePayload | null, totalAmount?: string): Promise<safePayload>;
+    static buildProgramPayload(query: ProgramPayloadInputModel): Promise<safePayload | null>;
+    static buildProgramPayloadWithAmounts(query: ProgramPayloadInputModel, body: CampaignAmountsInputModel): Promise<safePayload | null>;
     static buildConfigFromCampaignData(body: CampaignDataDtoModel): Promise<any>;
 }

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

@@ -1,5 +1,6 @@
 import { CampaignTypeConfigResourceMapping, ChainId, NULL_ADDRESS, NULL_ROOT, buildCampaignPayload, encodeForwarderData, parseCampaign, registry, } from "@sdk";
 import _ from "lodash";
+import { TokenService } from "../token/token.service";
 import { safeTemplate, } from "./programPayload.model";
 import { MerklInterfaceCampaigns } from "./programPayload.repository";
 export class ProgramPayloadService {
@@ -70,17 +71,30 @@ export class ProgramPayloadService {
         // Small hack to avoid the need to parse the config again
         const args = buildCampaignPayload(parsedConfig, distributionChainId).args;
         const safePayload = ProgramPayloadService.initiateSafePayload(distributionChainId, distributionCreator, rewardToken);
-        const transactions = ProgramPayloadService.createSafePayloadForCampaign(args, distributionChainId, rewardToken, distributionCreator ?? NULL_ADDRESS);
+        const transactions = await ProgramPayloadService.createSafePayloadForCampaign(args, distributionChainId, rewardToken, distributionCreator ?? NULL_ADDRESS);
         safePayload.transactions.push(...transactions);
         if (debug) {
             return { safePayload, nonEncodedConfig };
         }
         return safePayload;
     }
-    static createSafePayloadForCampaign(args, distributionChainId, rewardToken, distributionCreator, withApproval = true) {
+    static async checkMinimumAmount(rewardToken, args, distributionChainId) {
+        const tokenList = await TokenService.getValidRewardTokens(distributionChainId);
+        const minimumAmountPerHour = tokenList.find(token => token.address.toLowerCase() === rewardToken.toLowerCase())?.minimumAmountPerHour;
+        if (!minimumAmountPerHour) {
+            throw new Error("Token not found");
+        }
+        const tokenAmount = BigInt(args?.amount.toString());
+        const numberOfHours = BigInt(args?.duration.toString()) / 3600n;
+        return tokenAmount / numberOfHours >= BigInt(minimumAmountPerHour);
+    }
+    static async createSafePayloadForCampaign(args, distributionChainId, rewardToken, distributionCreator, withApproval = true) {
         const safePayload = _.cloneDeep(safeTemplate);
         safePayload.chainId = distributionChainId.toString();
         safePayload.createdAt = Math.floor(Date.now() / 1000);
+        if (!(await ProgramPayloadService.checkMinimumAmount(rewardToken, args, distributionChainId))) {
+            throw new Error("Amount is less than minimum");
+        }
         safePayload.transactions[0].to = rewardToken;
         safePayload.transactions[0].contractInputsValues = {
             amount: args?.amount.toString(),
@@ -132,25 +146,25 @@ export class ProgramPayloadService {
         }
         return safePayload;
     }
-    static buildPayload(query, initialCampaignPayload = null, totalAmount = "0") {
+    static async buildPayload(query, initialCampaignPayload = null, totalAmount = "0") {
         const withApproval = Boolean(totalAmount === "0");
         const rewardToken = query.rewardToken;
         const distributionChainId = query.distributionChainId ? query.distributionChainId : ChainId.MAINNET;
         const registryInitialized = registry(distributionChainId);
         const distributionCreator = registryInitialized?.Merkl?.DistributionCreator ?? NULL_ADDRESS;
-        function generatePayloadFile(query, withApproval = true) {
+        async function generatePayloadFile(query, withApproval = true) {
             const args = buildCampaignPayload(ProgramPayloadService.buildConfig(query), distributionChainId).args;
-            const safePayload = ProgramPayloadService.createSafePayloadForCampaign(args, distributionChainId, rewardToken, distributionCreator, withApproval);
+            const safePayload = await ProgramPayloadService.createSafePayloadForCampaign(args, distributionChainId, rewardToken, distributionCreator, withApproval);
             return safePayload;
         }
         const campaignPayloads = initialCampaignPayload === null
             ? ProgramPayloadService.initiateSafePayload(distributionChainId, distributionCreator, rewardToken, totalAmount)
             : initialCampaignPayload;
-        const transactions = generatePayloadFile(query, withApproval);
+        const transactions = await generatePayloadFile(query, withApproval);
         campaignPayloads.transactions.push(...transactions);
         return campaignPayloads;
     }
-    static buildProgramPayload(query) {
+    static async buildProgramPayload(query) {
         let campaignPayloads = null;
         query.amount = query.amount ? query.amount : "0";
         for (const campaign of Object.keys(MerklInterfaceCampaigns[query.program])) {
@@ -159,17 +173,17 @@ export class ProgramPayloadService {
                 campaign,
                 amount: query.amount,
             };
-            campaignPayloads = ProgramPayloadService.buildPayload(queryCampaign, campaignPayloads);
+            campaignPayloads = await ProgramPayloadService.buildPayload(queryCampaign, campaignPayloads);
         }
         return campaignPayloads;
     }
-    static buildProgramPayloadWithAmounts(query, body) {
+    static async buildProgramPayloadWithAmounts(query, body) {
         let campaignPayloads = null;
         const totalAmount = Object.values(body).reduce((sum, amount) => sum + BigInt(amount), 0n);
         for (const [campaign, amount] of Object.entries(body)) {
             if (Object.keys(MerklInterfaceCampaigns[query.program]).includes(campaign)) {
                 const queryCampaign = { ...query, campaign, amount: amount };
-                campaignPayloads = ProgramPayloadService.buildPayload(queryCampaign, campaignPayloads, totalAmount.toString());
+                campaignPayloads = await ProgramPayloadService.buildPayload(queryCampaign, campaignPayloads, totalAmount.toString());
             }
             else {
                 throw new Error(`Campaign ${campaign} not found`);

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

@@ -137,9 +137,9 @@ export declare const v4: Elysia<"/v4", false, {
                         chainId?: string | undefined;
                         mainProtocolId?: string | undefined;
                         campaigns?: boolean | undefined;
+                        test?: boolean | undefined;
                         rewardTokenSymbol?: string | undefined;
                         order?: string | undefined;
-                        test?: boolean | undefined;
                         minimumTvl?: number | undefined;
                     };
                     headers: unknown;
@@ -330,9 +330,9 @@ export declare const v4: Elysia<"/v4", false, {
                         chainId?: string | undefined;
                         mainProtocolId?: string | undefined;
                         campaigns?: boolean | undefined;
+                        test?: boolean | undefined;
                         rewardTokenSymbol?: string | undefined;
                         order?: string | undefined;
-                        test?: boolean | undefined;
                         minimumTvl?: number | undefined;
                     };
                     headers: unknown;
@@ -818,9 +818,9 @@ export declare const v4: Elysia<"/v4", false, {
                             chainId?: string | undefined;
                             mainProtocolId?: string | undefined;
                             campaigns?: boolean | undefined;
+                            test?: boolean | undefined;
                             rewardTokenSymbol?: string | undefined;
                             order?: string | undefined;
-                            test?: boolean | undefined;
                             minimumTvl?: number | undefined;
                         };
                         headers: unknown;
@@ -858,9 +858,9 @@ export declare const v4: Elysia<"/v4", false, {
                                 chainId?: string | undefined;
                                 mainProtocolId?: string | undefined;
                                 campaigns?: boolean | undefined;
+                                test?: boolean | undefined;
                                 rewardTokenSymbol?: string | undefined;
                                 order?: string | undefined;
-                                test?: boolean | undefined;
                                 minimumTvl?: number | undefined;
                             };
                             headers: unknown;
@@ -899,9 +899,9 @@ export declare const v4: Elysia<"/v4", false, {
                                 chainId?: string | undefined;
                                 mainProtocolId?: string | undefined;
                                 campaigns?: boolean | undefined;
+                                test?: boolean | undefined;
                                 rewardTokenSymbol?: string | undefined;
                                 order?: string | undefined;
-                                test?: boolean | undefined;
                                 minimumTvl?: number | undefined;
                             };
                             headers: unknown;
@@ -1773,11 +1773,12 @@ export declare const v4: Elysia<"/v4", false, {
                             address: string;
                             chainId: number;
                             decimals: number;
+                            displaySymbol: string;
                             verified: boolean;
                             isTest: boolean;
                             isPoint: boolean;
                             isNative: boolean;
-                            price?: number | null | undefined;
+                            price: number | null;
                         } | undefined;
                     };
                 };

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

@@ -42,6 +42,7 @@ export class StatusRepository {
             data: {
                 campaignId: CampaignService.hashId(campaign),
                 computedUntil: startTimestamp,
+                processingStarted: startTimestamp,
             },
         });
     }

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

@@ -224,11 +224,12 @@ export declare const TokenController: Elysia<"/tokens", false, {
                         address: string;
                         chainId: number;
                         decimals: number;
+                        displaySymbol: string;
                         verified: boolean;
                         isTest: boolean;
                         isPoint: boolean;
                         isNative: boolean;
-                        price?: number | null | undefined;
+                        price: number | null;
                     } | undefined;
                 };
             };

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

@@ -59,7 +59,21 @@ export declare abstract class TokenRepository {
      * upsert a token on database
      * @param token
      */
-    static upsert(token: Token["model"]): Promise<Token["model"] | undefined>;
+    static upsert(token: Token["model"]): Promise<{
+        symbol: string;
+        id: string;
+        name: string | null;
+        icon: string;
+        address: string;
+        chainId: number;
+        decimals: number;
+        displaySymbol: string;
+        verified: boolean;
+        isTest: boolean;
+        isPoint: boolean;
+        isNative: boolean;
+        price: number | null;
+    }>;
     /**
      * Updates price of tokens that share the same symbol
      * @param symbol

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

@@ -174,7 +174,21 @@ export declare abstract class TokenService {
      * @param chainId
      * @param address
      */
-    static findManyOrCreate(tokens: TokenModel[]): Promise<(Token["model"] | undefined)[]>;
+    static findManyOrCreate(tokens: TokenModel[]): Promise<({
+        symbol: string;
+        id: string;
+        name: string | null;
+        icon: string;
+        address: string;
+        chainId: number;
+        decimals: number;
+        verified: boolean;
+        isTest: boolean;
+        isPoint: boolean;
+        isNative: boolean;
+    } & {
+        price?: number | null | undefined;
+    })[]>;
     static getValidRewardTokens(chainId: number): Promise<{
         minimumAmountPerHour: any;
         symbol: string;
@@ -226,7 +240,7 @@ export declare abstract class TokenService {
      * @param chainId
      * @param address
      */
-    static fillAndCreate(token: CreateTokenModel): Promise<({
+    static fillAndCreate(token: CreateTokenModel): Promise<{
         symbol: string;
         id: string;
         name: string | null;
@@ -234,13 +248,13 @@ export declare abstract class TokenService {
         address: string;
         chainId: number;
         decimals: number;
+        displaySymbol: string;
         verified: boolean;
         isTest: boolean;
         isPoint: boolean;
         isNative: boolean;
-    } & {
-        price?: number | null | undefined;
-    }) | undefined>;
+        price: number | null;
+    } | undefined>;
     /**
      * @deprecated Should be useless now that the token list is not used anymore
      * Get all tokens from https://github.com/AngleProtocol/angle-token-list and override icons from it

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

@@ -52,7 +52,7 @@ export class TokenService {
      */
     static async fetchTokensAndBalances(chainId, userAddress, addresses) {
         const tokens = await TokenService.findManyOrCreate(addresses?.map(address => ({ chainId, address })));
-        return TokenService.fetchBalances(chainId, userAddress, tokens.filter(t => t !== undefined));
+        return TokenService.fetchBalances(chainId, userAddress, tokens);
     }
     /**
      * Fetches balances of verified tokens
@@ -61,13 +61,11 @@ export class TokenService {
      */
     static async fetchVerifiedAndNativeBalances(chainId, userAddress, additionalTokenAddresses) {
         const verifiedTokens = await TokenService.findMany({ chainId: chainId, verified: true });
-        const nativeTokens = await TokenService.findMany({ chainId: chainId, isNative: true });
+        const nativeTokens = (await TokenService.findMany({ chainId: chainId, isNative: true })).filter(t => !!t);
         const additionalTokens = !!additionalTokenAddresses?.length
             ? await TokenService.findManyOrCreate(additionalTokenAddresses?.map(address => ({ chainId, address })))
             : [];
-        const allTokens = verifiedTokens
-            .concat(additionalTokens.filter(t => t !== undefined))
-            .concat(nativeTokens.filter(t => t !== undefined));
+        const allTokens = verifiedTokens.concat(additionalTokens).concat(nativeTokens);
         return TokenService.fetchBalances(chainId, userAddress, allTokens);
     }
     static async fetchOnChain(token) {
@@ -193,9 +191,7 @@ export class TokenService {
     static async getValue(tokenAmounts) {
         const tokens = await TokenService.findManyOrCreate(tokenAmounts.map(({ address, chainId }) => ({ address, chainId })));
         return tokenAmounts.reduce((sum, { amount, address, chainId }) => {
-            const token = tokens
-                .filter(t => t !== undefined)
-                .find(({ address: addr, chainId: chain }) => addr === address && chainId === chain);
+            const token = tokens.find(({ address: addr, chainId: chain }) => addr === address && chainId === chain);
             if (!token)
                 return sum;
             const value = (bigIntToNumber(amount ?? 0n, token.decimals) ?? 0) * (token.price ?? 0);
@@ -241,9 +237,10 @@ export class TokenService {
                     if (!newToken) {
                         throw new HttpError(`Failed to fetch on-chain data for token ${token.address} on chain ${token.chainId}).`);
                     }
-                    return await TokenRepository.upsert(newToken);
+                    return TokenService.format(await TokenRepository.upsert(newToken));
                 }
             }
+            throw new HttpError(`Failed to fetch or create token ${token.address} on chain ${token.chainId}.`);
         }));
     }
     static async getValidRewardTokens(chainId) {
@@ -276,7 +273,7 @@ export class TokenService {
         const displaySymbol = properties.Symbol.rich_text[0]?.plain_text;
         const isVerified = properties.Verified.checkbox;
         const coingeckoApiId = properties["CoinGecko API ID"].rich_text[0]?.plain_text;
-        const byteArray = await iconFile.bytes();
+        const byteArray = await iconFile.bytes(); // Unknown type error here probably due to bun/types
         const [token] = await TokenService.findManyOrCreate([
             {
                 chainId,

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

@@ -27,10 +27,10 @@ export declare const uniswapV4Controller: Elysia<"uniswap-v4", false, {
                             poolId: string;
                             poolKey: {
                                 hooks: string;
-                                fee: number;
-                                tickSpacing: number;
                                 currency0: string;
                                 currency1: string;
+                                fee: number;
+                                tickSpacing: number;
                             };
                             decimalsCurrency0: number;
                             decimalsCurrency1: number;

package/dist/src/modules/v4/uniswapV4/uniswapV4.model.d.ts

@@ -1,3 +1,6 @@
+import type { apiDbClient } from "@db";
+import type { Prisma } from "@db/api";
+import type { MerklChainId, UniswapV4PoolType } from "@sdk";
 export declare const UniswapV4PoolsDto: import("@sinclair/typebox").TRecord<import("@sinclair/typebox").TString, import("@sinclair/typebox").TObject<{
     poolKey: import("@sinclair/typebox").TObject<{
         currency0: import("@sinclair/typebox").TString;
@@ -12,4 +15,10 @@ export declare const UniswapV4PoolsDto: import("@sinclair/typebox").TRecord<impo
     symbolCurrency0: import("@sinclair/typebox").TString;
     symbolCurrency1: import("@sinclair/typebox").TString;
 }>>;
+export type UniswapV4PoolsReturnType = {
+    [chainId in MerklChainId]?: {
+        [poolId: string]: UniswapV4PoolType;
+    };
+};
 export type UniswapV4PoolsEntity = typeof UniswapV4PoolsDto.static;
+export type LoggedCreateBody = Prisma.Args<typeof apiDbClient.logged, "createMany">["data"];

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

@@ -1,2 +1,13 @@
+import type { LoggedCreateBody } from "./uniswapV4.model";
 export declare abstract class UniswapV4Repository {
+    static getStoredPools(): Promise<{
+        id: string;
+        type: import("@db/api").$Enums.LoggedEntityType;
+        address: string | null;
+        chainId: number;
+        fetchAtBlock: number;
+        caughtFromAddress: string;
+        entityData: import("database/api/.generated/runtime/library").JsonValue;
+    }[]>;
+    static createMany(data: LoggedCreateBody): Promise<import("database/api/.generated/runtime/library").GetBatchResult>;
 }

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

@@ -1,2 +1,12 @@
+import { apiDbClient } from "@db";
+import { LoggedEntityType } from "@db/api";
 export class UniswapV4Repository {
+    static async getStoredPools() {
+        return await apiDbClient.logged.findMany({
+            where: { type: LoggedEntityType.UNISWAP_V4 },
+        });
+    }
+    static async createMany(data) {
+        return await apiDbClient.logged.createMany({ data });
+    }
 }