@merkl/api 0.15.42 → 0.15.44

package/dist/src/entities/opportunity.js

@@ -1160,7 +1160,7 @@ export const extractOpportunities = {
         const opportunity = {
             id: `${Campaign.UNISWAP_V4}_${mainParameter}`,
             platform,
-            name: [platform, pair, params.lpFee && `${params.lpFee} %`].join(" "),
+            name: [platform, pair, params.lpFee && `${params.lpFee / 10_000} %`].join(" "),
             chainId: computeChainId ?? chainId,
             distributionChainId: chainId,
             action: "pool",

package/dist/src/jobs/etl/reward-breakdowns.js

@@ -80,7 +80,16 @@ const transform = (rewardBreakdowns) => {
 // ─── Load ────────────────────────────────────────────────────────────────────
 const load = async (rewardBreakdowns) => {
     const count = (await apiDbClient.rewardBreakdown.createMany({
-        data: rewardBreakdowns,
+        data: rewardBreakdowns.map(breakdown => ({
+            id: breakdown.id,
+            protocolId: breakdown.protocolId,
+            reason: breakdown.reason,
+            amount: breakdown.amount,
+            claimed: breakdown.claimed,
+            pending: breakdown.pending,
+            rewardId: breakdown.rewardId,
+            campaignId: breakdown.campaignId,
+        })),
         skipDuplicates: true,
     })).count;
     log.info(`Successfully inserted ${rewardBreakdowns.length} reward breakdown(s).`);
@@ -132,7 +141,7 @@ export const main = async () => {
             log.error("breakdowns", `${failedBatches.length} breakdown(s) failed to insert.`);
             // ─── Push Missing Campaigns To Bucket ────────────────
             const bucket = new BucketService(`merkl-campaigns-lake-${process.env.ENV}`, `merkl-data-${process.env.ENV}`);
-            await bucket.push(`${process.env.CHAIN_ID}_missing_campaigns`, JSON.stringify(missingCampaigns), {
+            await bucket.push(`${process.env.CHAIN_ID}_missing_campaigns.json`, JSON.stringify(missingCampaigns), {
                 type: "application/json",
             });
             process.exit(1);

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

@@ -1,8 +1,47 @@
-import { BN2Number, EAprBreakdownType, NETWORK_LABELS, UniswapV4Addresses, UniswapV4StateViewInterface, getSqrtRatioAtTick, shortenAddress, } from "@sdk";
+import { BucketService } from "../../../modules/v4/bucket/bucket.service";
+import { engineDbClient } from "../../../utils/prisma";
+import { BN2Number, ChainInteractionService, EAprBreakdownType, NETWORK_LABELS, UniswapV4Addresses, UniswapV4StateViewInterface, getSqrtRatioAtTick, shortenAddress, } from "@sdk";
 import moment from "moment";
 import { log } from "../../../utils/logger";
 import { Pricer } from "../../../utils/pricer";
+// Constants
 const CALLS_LENGTH = 2;
+/**
+ * Compute TVL
+ * @dev important: using the most recent state save with current prices
+ *      it's only an estimate
+ */
+async function computeUniV4PoolTVLFromMostRecentStateSave(chainId, poolID, priceCurrency0, priceCurrency1, decimalsCurrency0, decimalsCurrency1) {
+    const currentBlock = await ChainInteractionService(chainId).getBlockNumber();
+    const mostRecentStateSave = await engineDbClient.stateSave.findFirst({
+        where: {
+            id: `UniswapV4_${chainId}_${poolID}`,
+            blockNumber: {
+                lte: currentBlock,
+            },
+        },
+        orderBy: {
+            blockNumber: "desc",
+        },
+    });
+    const stateSave = mostRecentStateSave.state;
+    const blockNumber = mostRecentStateSave?.blockNumber;
+    const states = stateSave.states;
+    // const globalState = stateSave.globalState as { tick: number; liquidity: string };
+    const { fileName, bucketName } = states;
+    // Bucket service
+    const bucket = new BucketService(bucketName, "merkl-production");
+    const storedStates = JSON.parse(await bucket.pull(fileName));
+    let tvl = 0;
+    let amount0 = 0;
+    let amount1 = 0;
+    for (const [_, { value, params }] of Object.entries(storedStates)) {
+        amount0 += BN2Number(value.amount0, decimalsCurrency0);
+        amount1 += BN2Number(value.amount1, decimalsCurrency1);
+    }
+    tvl = amount0 * (priceCurrency0 ?? 0) + amount1 * (priceCurrency1 ?? 0);
+    return { tvl, amount0, amount1, blockNumber: blockNumber };
+}
 export async function UniswapV4DynamicData(chainId, campaigns) {
     const dynamicData = [];
     const pricer = await Pricer.load();
@@ -28,18 +67,7 @@ export async function UniswapV4DynamicData(chainId, campaigns) {
                 allowFailure: true,
                 callData: UniswapV4StateViewInterface.encodeFunctionData("getSlot0", [pool.poolId]),
                 target: UniswapV4Addresses[chainId].StateView,
-            }
-            // {
-            //   allowFailure: true,
-            //   callData: ERC20Interface.encodeFunctionData("balanceOf", [pool.address]),
-            //   target: d.campaignParameters.token0,
-            // },
-            // {
-            //   allowFailure: true,
-            //   callData: ERC20Interface.encodeFunctionData("balanceOf", [pool.address]),
-            //   target: d.campaignParameters.token1,
-            // }
-            );
+            });
         }
         return {
             cached: false,
@@ -54,43 +82,38 @@ export async function UniswapV4DynamicData(chainId, campaigns) {
                             let poolTotalLiquidity;
                             let sqrtPrice;
                             let tick;
-                            const poolBalanceToken0 = 0;
-                            const poolBalanceToken1 = 0;
+                            let poolBalanceToken0 = 0;
+                            let poolBalanceToken1 = 0;
                             const campaignsForPool = campaigns?.filter(campaign => campaign.mainParameter.toLowerCase() === pool.mainParameter.toLowerCase());
-                            //   const decimalsToken0 = d.campaignParameters.decimalsCurrency0;
-                            //   const decimalsToken1 = d.campaignParameters.decimalsCurrency1;
-                            const symbolToken0 = campaignsForPool[0].campaignParameters.symbolCurrency0;
-                            const symbolToken1 = campaignsForPool[0].campaignParameters.symbolCurrency1;
                             const prevI = i;
                             try {
                                 poolTotalLiquidity = UniswapV4StateViewInterface.decodeFunctionResult("getLiquidity", result[i++])[0].toString();
                                 const poolData = UniswapV4StateViewInterface.decodeFunctionResult("getSlot0", result[i++]);
                                 tick = poolData.tick;
                                 sqrtPrice = getSqrtRatioAtTick(tick).toString();
-                                // poolBalanceToken0 = BN2Number(
-                                //   ERC20Interface.decodeFunctionResult("balanceOf", result[i++])[0],
-                                //   decimalsToken0
-                                // );
-                                // poolBalanceToken1 = BN2Number(
-                                //   ERC20Interface.decodeFunctionResult("balanceOf", result[i++])[0],
-                                //   decimalsToken1
-                                // );
                             }
                             catch {
                                 log.warn(`merklDynamic data - failed to decode state of pool ${pool.poolId} on ${NETWORK_LABELS[chainId]}`);
                                 i = prevI + CALLS_LENGTH;
                                 continue;
                             }
+                            const decimalsCurrency0 = campaignsForPool[0].campaignParameters.decimalsCurrency0;
+                            const decimalsCurrency1 = campaignsForPool[0].campaignParameters.decimalsCurrency1;
+                            const symbolCurrency0 = campaignsForPool[0].campaignParameters.symbolCurrency0;
+                            const symbolCurrency1 = campaignsForPool[0].campaignParameters.symbolCurrency1;
                             const priceToken0 = (await pricer.get({
                                 address: campaignsForPool[0].campaignParameters.currency0,
                                 chainId: chainId,
-                                symbol: symbolToken0,
+                                symbol: symbolCurrency0,
                             }));
                             const priceToken1 = (await pricer.get({
                                 address: campaignsForPool[0].campaignParameters.currency1,
                                 chainId: chainId,
-                                symbol: symbolToken1,
+                                symbol: symbolCurrency1,
                             }));
+                            const { tvl, amount0, amount1, blockNumber } = await computeUniV4PoolTVLFromMostRecentStateSave(chainId, pool.poolId, priceToken0, priceToken1, decimalsCurrency0, decimalsCurrency1);
+                            poolBalanceToken0 += amount0;
+                            poolBalanceToken1 += amount1;
                             /** Iterate over distributions to compute APRs */
                             for (const campaign of campaignsForPool) {
                                 const c = campaign;
@@ -135,8 +158,8 @@ export async function UniswapV4DynamicData(chainId, campaigns) {
                                     /**
                                      * General APR (@notice potentially with a boost)
                                      */
-                                    const poolBalanceToken0WithoutBlacklist = 0;
-                                    const poolBalanceToken1WithoutBlacklist = 0;
+                                    const poolBalanceToken0WithoutBlacklist = poolBalanceToken0;
+                                    const poolBalanceToken1WithoutBlacklist = poolBalanceToken1;
                                     //   const poolLiquidityWithoutBlacklist = poolTotalLiquidity - (blacklistedLiquidity ?? 0);
                                     const tvl = poolBalanceToken0WithoutBlacklist * priceToken0 + poolBalanceToken1WithoutBlacklist * priceToken1;
                                     distributionMeanAPR = (yearlyToken0Rewards + yearlyToken1Rewards + yearlyFeeRewards) / tvl;

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

@@ -57,7 +57,7 @@ export class StatusService {
     }
     static async findUpdatesAndDelays() {
         const merklRoots = await MerklRootService.fetchAll();
-        const delayedCampaignPromises = Promise.allSettled(Object.keys(merklRoots).map(chainId => StatusService.findManyDelay({ chainId: Number.parseInt(chainId), delayLowerBound: 8 * HOUR })));
+        const delayedCampaignPromises = Promise.allSettled(Object.keys(merklRoots).map(chainId => StatusService.findManyDelay({ chainId: Number.parseInt(chainId), delayLowerBound: 9 * HOUR })));
         const liveCampaignPromises = await Promise.allSettled(Object.keys(merklRoots).map(chainId => CampaignService.countLives(Number.parseInt(chainId))));
         const delayedCampaignArray = await delayedCampaignPromises;
         const liveCampaignArray = await liveCampaignPromises;