@merkl/api 0.16.37 → 0.16.39

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

@@ -3,6 +3,7 @@ export declare abstract class CacheService {
     private static encoder;
     private static decoder;
     static wrap<Fn extends (...args: Args) => Promise<unknown>, Args extends unknown[], T extends Awaited<ReturnType<Fn>>>(ttl: number, fn: Fn, ...args: Args): Promise<T>;
+    static keyAndTTL<Fn extends (...args: Args) => Promise<unknown>, Args extends unknown[], T extends Awaited<ReturnType<Fn>>>(fn: Fn, ...args: Args): Promise<[string, number]>;
     static set<Fn extends (...args: Args) => Promise<unknown>, Args extends unknown[], T extends Awaited<ReturnType<Fn>>>(ttl: number, fn: Fn, ...args: Args): Promise<T>;
     static get<Fn extends (...args: Args) => Promise<unknown>, Args extends unknown[], T extends Awaited<ReturnType<Fn>>>(fn: Fn, args: Args): Promise<T | null>;
 }

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

@@ -29,6 +29,10 @@ export class CacheService {
         await CacheRepository.set(ttl, key, compressed);
         return result;
     }
+    static async keyAndTTL(fn, ...args) {
+        const key = CacheService.#hashKey(fn, args);
+        return [key, await CacheRepository.ttl(key)];
+    }
     static async set(ttl, fn, ...args) {
         const key = CacheService.#hashKey(fn, args);
         const result = await fn(...args);

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

@@ -5,5 +5,6 @@ export declare abstract class OpportunityConvertorService {
     static convertV4CampaignToV3<C extends ValidCampaign>(campaignType: C, campaign: Awaited<ReturnType<(typeof OpportunityService)["findMany"]>>[number]["campaigns"][number], opportunity: Awaited<ReturnType<(typeof OpportunityService)["findMany"]>>[number]): 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>;
     static wrapV3Opportunities(showCampaigns: boolean, test: boolean | undefined, identifier: string | undefined, chainId: string | undefined): Promise<{}>;
 }

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

@@ -1,4 +1,5 @@
 import { kebabToPascalCase } from "../../../utils/camelToKebabCase";
+import { log } from "../../../utils/logger";
 import { Campaign as CampaignEnum, EAprBreakdownType, opportunityActions, } from "@sdk";
 import moment from "moment";
 import { CacheService } from "../cache";
@@ -142,7 +143,6 @@ export class OpportunityConvertorService {
                     chainId,
                     campaigns: true,
                 });
-                console.log(page, opportunitiesPage.length);
                 opportunities = opportunities.concat(opportunitiesPage);
                 if (opportunitiesPage.length === 0)
                     break;
@@ -162,6 +162,10 @@ export class OpportunityConvertorService {
     static async setV3Opportunities(showCampaigns, test, identifier, chainId) {
         return await CacheService.set(TTLPresets.MIN_5, OpportunityConvertorService.#extractV3Opportunities, showCampaigns, test, identifier, chainId);
     }
+    static async logKeyAndTTLV3Opportunities(showCampaigns, test, identifier, chainId) {
+        const [key, ttl] = await CacheService.keyAndTTL(OpportunityConvertorService.#extractV3Opportunities, showCampaigns, test, identifier, chainId);
+        log.info(`Key: ${key}, TTL: ${ttl}`);
+    }
     static async wrapV3Opportunities(showCampaigns, test, identifier, chainId) {
         return await CacheService.wrap(TTLPresets.MIN_30, OpportunityConvertorService.#extractV3Opportunities, showCampaigns, test, identifier, chainId);
     }

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

@@ -155,7 +155,12 @@ export declare enum vicunaCampaigns {
     wETH_Variable_Debt_Vicuna_Sonic = "wETH Variable Debt Vicuna Sonic 0x50b547B44182973066607fA030cE9B8C7CE05A80",
     USDTe_Variable_Debt_Vicuna_Sonic = "USDT.e Variable Debt Vicuna Sonic 0x7e5EC2B98691d20FfDf4d1F37c7B1733a03C3a84",
     wOS_Variable_Debt_Vicuna_Sonic = "wOS Variable Debt Vicuna Sonic 0xcbf8f9bA27a1377CDEa79457EE7Df8fe66f21F55",
-    stS_Variable_Debt_Vicuna_Sonic = "stS Variable Debt Vicuna Sonic 0x7E82597B158663ECA96f9C65DeFCB02d55c3BC1f"
+    stS_Variable_Debt_Vicuna_Sonic = "stS Variable Debt Vicuna Sonic 0x7E82597B158663ECA96f9C65DeFCB02d55c3BC1f",
+    Vicuna_Sonic_WS_Sonic_Market_Vicuna = "Vicuna Sonic WS (Sonic Market) Vicuna 0x9e07EF144325DAe02ff92910aDd1FE91581D4798",
+    Vicuna_Sonic_stS_Sonic_Market_Vicuna = "Vicuna Sonic stS (Sonic Market) Vicuna 0xFB56Cd34244985222068ae1C384ecE4215528D04",
+    Vicuna_Sonic_USDCe_Stable_Market_Vicuna = "Vicuna Sonic USDC.E (Stable Market) Vicuna 0x0127C186D905Ddaf323e76c4f6AB41cDD66619e5",
+    Vicuna_Sonic_SCUSD_Stable_Market_Vicuna = "Vicuna Sonic SCUSD (Stable Market) Vicuna 0xfb2e5Fd5de4E0757062363dfA44dF2e3654A35A5",
+    Vicuna_Sonic_USDTe_Stable_Market_Vicuna = "Vicuna Sonic USDT.E (Stable Market) Vicuna 0x11054544BEbab950B3B2F88fBb73B10550d4FF5c"
 }
 export declare enum pufferCampaigns {
     Zircuit_Restaking_Pool = "0xF047ab4c75cebf0eB9ed34Ae2c186f3611aEAfa6",

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

@@ -164,6 +164,11 @@ export var vicunaCampaigns;
     vicunaCampaigns["USDTe_Variable_Debt_Vicuna_Sonic"] = "USDT.e Variable Debt Vicuna Sonic 0x7e5EC2B98691d20FfDf4d1F37c7B1733a03C3a84";
     vicunaCampaigns["wOS_Variable_Debt_Vicuna_Sonic"] = "wOS Variable Debt Vicuna Sonic 0xcbf8f9bA27a1377CDEa79457EE7Df8fe66f21F55";
     vicunaCampaigns["stS_Variable_Debt_Vicuna_Sonic"] = "stS Variable Debt Vicuna Sonic 0x7E82597B158663ECA96f9C65DeFCB02d55c3BC1f";
+    vicunaCampaigns["Vicuna_Sonic_WS_Sonic_Market_Vicuna"] = "Vicuna Sonic WS (Sonic Market) Vicuna 0x9e07EF144325DAe02ff92910aDd1FE91581D4798";
+    vicunaCampaigns["Vicuna_Sonic_stS_Sonic_Market_Vicuna"] = "Vicuna Sonic stS (Sonic Market) Vicuna 0xFB56Cd34244985222068ae1C384ecE4215528D04";
+    vicunaCampaigns["Vicuna_Sonic_USDCe_Stable_Market_Vicuna"] = "Vicuna Sonic USDC.E (Stable Market) Vicuna 0x0127C186D905Ddaf323e76c4f6AB41cDD66619e5";
+    vicunaCampaigns["Vicuna_Sonic_SCUSD_Stable_Market_Vicuna"] = "Vicuna Sonic SCUSD (Stable Market) Vicuna 0xfb2e5Fd5de4E0757062363dfA44dF2e3654A35A5";
+    vicunaCampaigns["Vicuna_Sonic_USDTe_Stable_Market_Vicuna"] = "Vicuna Sonic USDT.E (Stable Market) Vicuna 0x11054544BEbab950B3B2F88fBb73B10550d4FF5c";
 })(vicunaCampaigns || (vicunaCampaigns = {}));
 export var pufferCampaigns;
 (function (pufferCampaigns) {
@@ -2174,6 +2179,56 @@ const VicunaInterfaceCampaigns = {
         url: "https://vicunafinance.com/markets",
         forwarders: [],
     },
+    [vicunaCampaigns.Vicuna_Sonic_WS_Sonic_Market_Vicuna]: {
+        campaignType: Campaign.ERC20,
+        computeChainId: ChainId.SONIC,
+        hooks: [],
+        targetToken: "0x9e07EF144325DAe02ff92910aDd1FE91581D4798",
+        whitelist: [],
+        blacklist: ["0xad1bB693975C16eC2cEEF65edD540BC735F8608B"],
+        url: "https://vicunafinance.com/markets",
+        forwarders: [],
+    },
+    [vicunaCampaigns.Vicuna_Sonic_stS_Sonic_Market_Vicuna]: {
+        campaignType: Campaign.ERC20,
+        computeChainId: ChainId.SONIC,
+        hooks: [],
+        targetToken: "0xFB56Cd34244985222068ae1C384ecE4215528D04",
+        whitelist: [],
+        blacklist: ["0xad1bB693975C16eC2cEEF65edD540BC735F8608B"],
+        url: "https://vicunafinance.com/markets",
+        forwarders: [],
+    },
+    [vicunaCampaigns.Vicuna_Sonic_USDCe_Stable_Market_Vicuna]: {
+        campaignType: Campaign.ERC20,
+        computeChainId: ChainId.SONIC,
+        hooks: [],
+        targetToken: "0x0127C186D905Ddaf323e76c4f6AB41cDD66619e5",
+        whitelist: [],
+        blacklist: ["0xad1bB693975C16eC2cEEF65edD540BC735F8608B"],
+        url: "https://vicunafinance.com/markets",
+        forwarders: [],
+    },
+    [vicunaCampaigns.Vicuna_Sonic_SCUSD_Stable_Market_Vicuna]: {
+        campaignType: Campaign.ERC20,
+        computeChainId: ChainId.SONIC,
+        hooks: [],
+        targetToken: "0xfb2e5Fd5de4E0757062363dfA44dF2e3654A35A5",
+        whitelist: [],
+        blacklist: ["0xad1bB693975C16eC2cEEF65edD540BC735F8608B"],
+        url: "https://vicunafinance.com/markets",
+        forwarders: [],
+    },
+    [vicunaCampaigns.Vicuna_Sonic_USDTe_Stable_Market_Vicuna]: {
+        campaignType: Campaign.ERC20,
+        computeChainId: ChainId.SONIC,
+        hooks: [],
+        targetToken: "0x11054544BEbab950B3B2F88fBb73B10550d4FF5c",
+        whitelist: [],
+        blacklist: ["0xad1bB693975C16eC2cEEF65edD540BC735F8608B"],
+        url: "https://vicunafinance.com/markets",
+        forwarders: [],
+    },
 };
 const ModeInterfaceCampaigns = {
     [modeCampaigns.Steer_EES_V2_Weth_USDC_Kim_Mode]: {

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

@@ -27,6 +27,7 @@ export const response = t.Record(t.TemplateLiteral([param.Type.type, t.Literal("
 export default (app) => {
     return app.get("/opportunity", async ({ query: { campaigns: showCampaigns, ...filters } }) => {
         if (process.env.FF_OPPORTUNITY === "true" || !!filters.testTokens) {
+            await OpportunityConvertorService.logKeyAndTTLV3Opportunities(showCampaigns ?? false, !!filters.testTokens ? filters.testTokens : undefined, !!filters.mainParameter ? filters.mainParameter : undefined, !!filters.chainId ? filters.chainId.toString() : undefined);
             return await OpportunityConvertorService.wrapV3Opportunities(showCampaigns ?? false, !!filters.testTokens ? filters.testTokens : undefined, !!filters.mainParameter ? filters.mainParameter : undefined, !!filters.chainId ? filters.chainId.toString() : undefined);
         }
         const opportunities = await Redis.get(filters?.testTokens ? "OpportunitiesWithTest" : "Opportunities");
@@ -57,7 +58,8 @@ export default (app) => {
         transform({ query }) {
             query.chainId = !query.chainId ? undefined : Number.parseInt(query.chainId.toString());
             query.type = !query.type ? undefined : Number.parseInt(query.type.toString());
-            query.campaigns = query.campaigns === false ? false : !!query.campaigns;
+            query.campaigns =
+                query.campaigns === false || query.testTokens?.toString() === "false" ? false : !!query.campaigns;
             query.testTokens =
                 query.testTokens === false || query.testTokens?.toString() === "false" ? false : !!query.testTokens;
         },