@merkl/api 0.17.4 → 0.17.5

package/dist/src/jobs/etl/update-dynamic-data.js

@@ -15,6 +15,18 @@ if (!chainId)
 // ─── Update Dynamic Data (APR / TVL / Daily Rewards) ─────────────────────────
 async function updateDynamicData(liveCampaigns, campaignType) {
     try {
+        // Input: list of campaigns of same type
+        // Output: for each campaign, APR, TVL, Daily Rewards
+        // Constraint: needs to use multicalls to reduce RPC calls and speed
+        // - Needs to be robust to a single campaign's call failing
+        // - Needs to be quite easy for the engine team to setup new campaign types
+        // abstract GenericDynamicDataComputer
+        // compute(chainId, type, campaigns) => { apr, tvl, dailyRewards } with breakdowns
+        // UNISWAP V4
+        // Round 1 - (chainId, type, campaigns) -> tokens of the pools
+        // Round 2 - (chainId, type, campaigns, output of previous round) -> balance in tokens of forwarders
+        // Round 3 - ...
+        // Round Final - (chainId, type, campaigns, output of previous round) -> { apr, tvl, dailyRewards }
         const dynamicData = await executeSimple(chainId, campaignsDynamicData(chainId, liveCampaigns, campaignType));
         const oppMap = {};
         for (const data of dynamicData) {

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

@@ -2,7 +2,7 @@ import { type CampaignParameters, type Opportunity as OpportunityV3, type ValidC
 import { OpportunityService } from "./opportunity.service";
 export declare abstract class OpportunityConvertorService {
     #private;
-    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 convertV4CampaignToV3<C extends ValidCampaign>(campaignType: C, campaign: Exclude<Awaited<ReturnType<(typeof OpportunityService)["findMany"]>>[number]["campaigns"], undefined>[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>;

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

@@ -108,23 +108,23 @@ export class OpportunityConvertorService {
                 : undefined,
             tags: opportunity.tags,
             rewardTokenIcons: opportunity.campaigns
-                .map(campaign => campaign.rewardToken.symbol)
+                ?.map(campaign => campaign.rewardToken.symbol)
                 .reduce((acc, curr) => {
                 if (!acc.includes(curr))
                     acc.push(curr);
                 return acc;
-            }, []),
+            }, []) ?? [],
             campaigns: {
                 type: CampaignEnum[opportunity.type],
-                ids: opportunity.campaigns.map(campaign => campaign.campaignId),
+                ids: opportunity.campaigns?.map(campaign => campaign.campaignId) ?? [],
                 active: withCampaigns
                     ? opportunity.campaigns
-                        .filter(campaign => campaign.startTimestamp < BigInt(now) && BigInt(now) < campaign.endTimestamp)
+                        ?.filter(campaign => campaign.startTimestamp < BigInt(now) && BigInt(now) < campaign.endTimestamp)
                         .map(campaign => OpportunityConvertorService.convertV4CampaignToV3(CampaignEnum[campaign.type], campaign, opportunity))
                     : undefined,
                 inactive: withCampaigns
                     ? opportunity.campaigns
-                        .filter(campaign => !(campaign.startTimestamp < BigInt(now) && BigInt(now) < campaign.endTimestamp))
+                        ?.filter(campaign => !(campaign.startTimestamp < BigInt(now) && BigInt(now) < campaign.endTimestamp))
                         .map(campaign => OpportunityConvertorService.convertV4CampaignToV3(CampaignEnum[campaign.type], campaign, opportunity))
                     : undefined,
             },
@@ -160,13 +160,13 @@ export class OpportunityConvertorService {
         return res;
     }
     static async setV3Opportunities(showCampaigns, test, identifier, chainId) {
-        return await CacheService.set(TTLPresets.MIN_5, OpportunityConvertorService.#extractV3Opportunities, showCampaigns, test, identifier, chainId);
+        return await CacheService.set(TTLPresets.MIN_30, 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(`Args: ${showCampaigns}, ${test}, ${identifier}, ${chainId}, Key: ${key}, TTL: ${ttl}`);
     }
     static async wrapV3Opportunities(showCampaigns, test, identifier, chainId) {
-        return await CacheService.wrap(TTLPresets.MIN_30, OpportunityConvertorService.#extractV3Opportunities, showCampaigns, test, identifier, chainId);
+        return await CacheService.wrap(TTLPresets.MIN_5, OpportunityConvertorService.#extractV3Opportunities, showCampaigns, test, identifier, chainId);
     }
 }

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

@@ -50,7 +50,9 @@ export class TokenRepository {
                             { displaySymbol: { equals: query.displaySymbol, mode: "insensitive" } },
                             ...ids,
                         ]
-                        : [...ids],
+                        : ids.length
+                            ? [...ids]
+                            : undefined,
                 address: query.address ? { equals: query.address, mode: "insensitive" } : undefined,
                 chainId: query.chainId ? { equals: query.chainId } : undefined,
                 name: query.name ? { contains: query.name, mode: "insensitive" } : undefined,