@merkl/api 0.17.11 → 0.17.13

package/dist/src/libs/campaigns/campaignTypes/CLAMMDynamicData.js

@@ -614,9 +614,7 @@ export async function CLAMMDynamicData(chainId, campaigns) {
                                         }
                                         positions?.[pool.amm]?.forEach(pos => {
                                             if (pos.pool.id === pool.address.toLowerCase() &&
-                                                (isWhitelisted(pos.owner, c.campaignParameters.whitelist) || isStrykeCampaign(pool.amm))
-                                            // pool.alms.filter(a => a.owner === pos.owner || a.address === pos.owner).length > 0) // should be removed
-                                            ) {
+                                                (isWhitelisted(pos.owner, c.campaignParameters.whitelist) || isStrykeCampaign(pool.amm))) {
                                                 let [amount0, amount1] = [BigNumber.from(0), BigNumber.from(0)];
                                                 try {
                                                     [amount0, amount1] = getAmountsForLiquidity(sqrtPrice, Number.parseInt(pos.tickLower), Number.parseInt(pos.tickUpper), BigNumber.from(pos.liquidity));
@@ -631,6 +629,38 @@ export async function CLAMMDynamicData(chainId, campaigns) {
                                                     : BN2Number(amount0, decimalsToken0) > 0 && BN2Number(amount1, decimalsToken1) > 0)
                                                     blacklistedLiquidity -= BN2Number(pos.liquidity);
                                             }
+                                            // Handling the case of a ALM of priority 2 being whitelisted
+                                            else if (pos.pool.id === pool.address.toLowerCase() &&
+                                                almDetails.map(a => a.target.toLowerCase()).includes(pos.owner.toLowerCase()) // If pos owner is an ALM
+                                            ) {
+                                                // If we're in this branch it means the ALM owning the position is not whitelisted
+                                                const almHolding = almDetails.filter(a => a.almAddress.toLowerCase() === pos.owner.toLowerCase())[0];
+                                                for (const whitelistedAddress of c.campaignParameters.whitelist) {
+                                                    const forwarderIndex = distributionForwarders.findIndex(f => utils.getAddress(f.almAddress) === utils.getAddress(whitelistedAddress));
+                                                    if (forwarderIndex !== -1 &&
+                                                        almHolding.almAddress.toLowerCase() ===
+                                                            distributionForwarders[forwarderIndex].target.toLowerCase()) {
+                                                        // If we are here it means one of the ALM whitelisted is a "child" of the ALM holding the position
+                                                        const childALM = distributionForwarders[forwarderIndex];
+                                                        let [amount0, amount1] = [BigNumber.from(0), BigNumber.from(0)];
+                                                        try {
+                                                            [amount0, amount1] = getAmountsForLiquidity(sqrtPrice, Number.parseInt(pos.tickLower), Number.parseInt(pos.tickUpper), BigNumber.from(pos.liquidity));
+                                                        }
+                                                        catch {
+                                                            log.warn(`merklDynamic data - failed to handle whitelisted positions of pool ${pool.address} on ${NETWORK_LABELS[chainId]} - ${pos.owner} ${pos.tickLower} ${pos.tickUpper} ${pos.liquidity}`);
+                                                        }
+                                                        blacklistedBalance0 -=
+                                                            (BN2Number(amount0, decimalsToken0) * childALM.almBalance0) / almHolding.almBalance0;
+                                                        blacklistedBalance1 -=
+                                                            (BN2Number(amount1, decimalsToken1) * childALM.almBalance1) / almHolding.almBalance1;
+                                                        if (c.campaignParameters.isOutOfRangeIncentivized
+                                                            ? BN2Number(amount0, decimalsToken0) > 0 || BN2Number(amount1, decimalsToken1) > 0
+                                                            : BN2Number(amount0, decimalsToken0) > 0 && BN2Number(amount1, decimalsToken1) > 0)
+                                                            blacklistedLiquidity -=
+                                                                (BN2Number(pos.liquidity) * childALM.almTotalLiquidity) / almHolding.almTotalLiquidity;
+                                                    }
+                                                }
+                                            }
                                         });
                                     }
                                     else if (c.campaignParameters.blacklist.length > 0) {

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

@@ -3,7 +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 keyAndTTL<Fn extends (...args: Args) => Promise<unknown>, Args extends unknown[]>(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/opportunity/opportunity.converter.js

@@ -15,7 +15,7 @@ export class OpportunityConvertorService {
             campaignSubType: campaign.subType ?? 0,
             campaignType,
             chainId: campaign.distributionChain?.id ?? 0,
-            creator: campaign.Creator.address,
+            creator: campaign.creator.address,
             index: 0, // DEPRECATED
             mainParameter: opportunity.identifier,
             endTimestamp: Number(campaign.endTimestamp),