@merkl/api 0.16.36 → 0.16.38

package/dist/src/backgroundJobs/jobs/opportunityUpdater.js

@@ -54,7 +54,9 @@ export const opportunityUpdater = (app) => {
         await Redis.safeSet("OpportunitiesWithTest", opportunitiesWithTest);
         log.info("✅ opportunity cache updated successfully");
         await OpportunityConvertorService.setV3Opportunities(true, false, undefined, undefined);
+        log.info("✅ opportunity v3 cache updated successfully");
         await OpportunityConvertorService.setV3Opportunities(true, true, undefined, undefined);
+        log.info("✅ opportunity v3 test cache updated successfully");
         return new Response(JSON.stringify({
             status: "success",
             all: getUpdateBreakdown(opportunities),

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";
@@ -130,13 +131,27 @@ export class OpportunityConvertorService {
         };
     }
     static async #extractV3Opportunities(showCampaigns, test, identifier, chainId) {
-        const opportunities = await OpportunityService.findMany({
-            items: 10_000, // HARDCODED LIMIT
-            test,
-            identifier,
-            chainId,
-            campaigns: true,
-        });
+        let opportunities = [];
+        let page = 0;
+        while (true) {
+            try {
+                const opportunitiesPage = await OpportunityService.findMany({
+                    items: 100, // HARDCODED LIMIT
+                    page,
+                    test,
+                    identifier,
+                    chainId,
+                    campaigns: true,
+                });
+                opportunities = opportunities.concat(opportunitiesPage);
+                if (opportunitiesPage.length === 0)
+                    break;
+            }
+            catch {
+                break;
+            }
+            page++;
+        }
         const res = {};
         for (const opportunity of opportunities) {
             const opportunityV3 = OpportunityConvertorService.convertV4toV3(opportunity, showCampaigns);
@@ -147,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/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;
         },