npm - @merkl/api - Versions diffs - 0.19.8 → 0.19.10 - Mend

@merkl/api 0.19.8 → 0.19.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (17) hide show

package/dist/src/backgroundJobs/index.js CHANGED Viewed

@@ -1,8 +1,8 @@
 // @ts-nocheck
 import { Redis } from "@/cache";
 import { redisClient } from "@/cache/redis";
-import { getEulerV2Vaults, updateEulerVaultsCollatInDatabase } from "@/libs/campaigns/utils/getEulerV2Vaults";
-import { getUniswapV4Pools } from "@/libs/campaigns/utils/getUniswapV4Pools";
+import { getEulerV2Vaults, updateEulerVaultsCollatInDatabase } from "@/engine/dynamicData/utils/getEulerV2Vaults";
+import { getUniswapV4Pools } from "@/engine/dynamicData/utils/getUniswapV4Pools";
 import { log } from "@/utils/logger";
 import { engineDbClient } from "@db";
 import { swagger } from "@elysiajs/swagger";

package/dist/src/engine/dynamicData/implementations/EventBased.js CHANGED Viewed

@@ -42,7 +42,7 @@ async function computeEventBasedPoolTVLFromMostRecentStateSave(chainId, campaign
         const bucket = new BucketService(bucketName, "merkl-production");
         const storedStates = JSON.parse(await bucket.pull(fileName));
         for (const [_, { value, params: _params }] of Object.entries(storedStates)) {
-            tvl += BN2Number(value.allTimeValue, decimalsCurrency);
+            tvl += BN2Number(value.allTimeValue, 18 - decimalsCurrency);
         }
         tvl = tvl * priceCurrency;
         tvl = Math.max(tvl, 1);

package/dist/src/engine/dynamicData/implementations/Hyperdrive.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { type Campaign, type CampaignParameters, type MerklChainId } from "@sdk";
+import { Campaign, type CampaignParameters, type MerklChainId } from "@sdk";
 import type { DynamicDataBuilder } from "../interface";
 type campaignType = Campaign.HYPERDRIVELOGPROCESSOR | Campaign.HYPERDRIVELOGFIXPROCESSOR;
 export declare class HyperdriveDynamicData implements DynamicDataBuilder<campaignType> {

package/dist/src/engine/dynamicData/implementations/Hyperdrive.js CHANGED Viewed

@@ -1,6 +1,6 @@
 import { TokenService } from "@/modules/v4/token/token.service";
 import { Pricer } from "@/utils/pricer";
-import { BN2Number, ChainInteractionService, ETH_ADDRESS, HyperDriveSubCampaignType, HyperdriveTargetInterface, YEAR, } from "@sdk";
+import { BN2Number, Campaign, ChainInteractionService, ETH_ADDRESS, HyperDriveSubCampaignType, HyperdriveTargetInterface, YEAR, } from "@sdk";
 export class HyperdriveDynamicData {
     async build(chainId, campaigns) {
         const pricer = await Pricer.load();
@@ -44,11 +44,21 @@ export class HyperdriveDynamicData {
                         chainId,
                         symbol: campaign.campaignParameters.baseTokenSymbol,
                     })) ?? 0;
+                let multiplier = 1;
+                if (campaign.campaignType === Campaign.HYPERDRIVELOGPROCESSOR) {
+                    const spot_price = ((BN2Number(poolConfig.initialVaultSharePrice, 18) *
+                        (BN2Number(poolInfo.shareReserves, 18) - BN2Number(poolInfo.shareAdjustment, 18))) /
+                        BN2Number(poolInfo.bondReserves)) **
+                        BN2Number(poolConfig.timeStretch);
+                    if (spot_price < 1) {
+                        multiplier = 1 / (1 - spot_price);
+                    }
+                }
                 const tvl = campaign.campaignSubType === HyperDriveSubCampaignType.LP
                     ? priceBaseToken * marketSupply
                     : campaign.campaignSubType === HyperDriveSubCampaignType.LONG
                         ? priceBaseToken * longSupply
-                        : priceBaseToken * shortSupply;
+                        : (priceBaseToken * shortSupply) / multiplier;
                 dynamicData.push({
                     ...campaign,
                     totalSupplyTargetToken: marketSupply,

package/dist/src/engine/opportunityMetadata/implementations/Clamm.d.ts CHANGED Viewed

@@ -9,7 +9,7 @@ export declare class ClammMetadata implements MetadataBuilder<campaignType> {
             chainId: ChainId;
             address: any;
         }[];
-        mainProtocol: string;
+        mainProtocol: string | undefined;
     }>;
 }
 export {};

package/dist/src/engine/opportunityMetadata/implementations/Clamm.js CHANGED Viewed

@@ -44,7 +44,7 @@ export class ClammMetadata {
                 { chainId: computeChainId, address: params.token0 },
                 { chainId: computeChainId, address: params.token1 },
             ],
-            mainProtocol: camelToKebabCase(AMM[params.amm]),
+            mainProtocol: AMM[params.amm] ? camelToKebabCase(AMM[params.amm]) : undefined,
         };
     }
 }

package/dist/src/engine/opportunityMetadata/implementations/EventBased.js CHANGED Viewed

@@ -30,7 +30,7 @@ export class EventBasedMetadata {
                 action,
                 name,
                 tokens,
-                mainProtocol: mainProtocolId,
+                mainProtocol: mainProtocolId.toLowerCase(),
             };
         }
         catch {

package/dist/src/libs/positions/prepareFetch.js CHANGED Viewed

@@ -1,7 +1,7 @@
 // @ts-nocheck
+import { VEST_TOKEN } from "@/engine/dynamicData/implementations/Vest";
 import { Campaign, Forwarder, MorphoSubCampaignType, } from "@sdk";
 import { utils } from "ethers";
-import { VEST_TOKEN } from "../campaigns/campaignTypes/VestDynamicData";
 function prepareClammFetch(previous, campaign) {
     if (campaign.campaignType !== Campaign.CLAMM) {
         return previous;

package/dist/src/modules/v4/enso/enso.model.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 export declare const slugToProtocolId: {
-    "uniswap-v2": "uniswap-v2";
+    "uniswap-v2": "uniswap";
     "aave-v3": "aave";
     "aave-v2": "aave";
     "aave-static-atokens": "aave";

package/dist/src/modules/v4/enso/enso.model.js CHANGED Viewed

@@ -1,6 +1,6 @@
 import { t } from "elysia";
 export const slugToProtocolId = {
-    "uniswap-v2": "uniswap-v2",
+    "uniswap-v2": "uniswap",
     "aave-v3": "aave",
     "aave-v2": "aave",
     "aave-static-atokens": "aave",

package/dist/src/modules/v4/kyberzap/kyberzap.model.d.ts CHANGED Viewed

@@ -1,6 +1,6 @@
 export declare const dexIdToProtocolId: {
-    DEX_UNISWAPV3: "uniswap-v3";
-    DEX_UNISWAPV2: "uniswap-v2";
+    DEX_UNISWAPV3: "uniswap";
+    DEX_UNISWAPV2: "uniswap";
     DEX_PANCAKESWAPV3: "pancakeswap-v3";
     DEX_SUSHISWAPV3: "sushiswap-v3";
     DEX_CURVE: "curve";

package/dist/src/modules/v4/kyberzap/kyberzap.model.js CHANGED Viewed

@@ -1,8 +1,8 @@
 import { ChainId } from "@sdk";
 import { t } from "elysia";
 export const dexIdToProtocolId = {
-    DEX_UNISWAPV3: "uniswap-v3",
-    DEX_UNISWAPV2: "uniswap-v2",
+    DEX_UNISWAPV3: "uniswap",
+    DEX_UNISWAPV2: "uniswap",
     DEX_PANCAKESWAPV3: "pancakeswap-v3",
     DEX_SUSHISWAPV3: "sushiswap-v3",
     DEX_CURVE: "curve",

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

@@ -654,7 +654,7 @@ const EtherlinkInterfaceCampaigns = {
         campaignType: Campaign.EVENT_BASED,
         contract: "0xd0bc067cf877f7b76ceb331891331d9e6acda1a7",
         eventID: id("OrderPlaced(address,uint64,bool,uint128,uint72,uint128,uint128,uint128,uint128,uint128,bool,bool)"),
-        topicToData: [{ topicIndex: 1, decodeKeyTopic: "address", dataIndex: 7, multiplier: (10n ** 12n).toString() }],
+        topicToData: [{ topicIndex: 1, decodeKeyTopic: "address", dataIndex: 7, multiplier: (3n ** 10n).toString() }],
         computeScoreParameters: {
             computeMethod: ComputeScoreMethod.cappedScorePercentageHistorical,
             computeSettings: {
@@ -694,7 +694,7 @@ const EtherlinkInterfaceCampaigns = {
         campaignType: Campaign.EVENT_BASED,
         contract: "0x65ea4dd7f789c71c0f57ed84b3bdc3062898d3cb",
         eventID: id("OrderPlaced(address,uint64,bool,uint128,uint72,uint128,uint128,uint128,uint128,uint128,bool,bool)"),
-        topicToData: [{ topicIndex: 1, decodeKeyTopic: "address", dataIndex: 7, multiplier: (10n ** 12n).toString() }],
+        topicToData: [{ topicIndex: 1, decodeKeyTopic: "address", dataIndex: 7, multiplier: (3n ** 10n).toString() }],
         computeScoreParameters: {
             computeMethod: ComputeScoreMethod.cappedScorePercentageHistorical,
             computeSettings: {
@@ -734,7 +734,7 @@ const EtherlinkInterfaceCampaigns = {
         campaignType: Campaign.EVENT_BASED,
         contract: "0xbb6b01d94e3f6ebae8647cb56d544f57928ab758",
         eventID: id("OrderPlaced(address,uint64,bool,uint128,uint72,uint128,uint128,uint128,uint128,uint128,bool,bool)"),
-        topicToData: [{ topicIndex: 1, decodeKeyTopic: "address", dataIndex: 7, multiplier: (10n ** 12n).toString() }],
+        topicToData: [{ topicIndex: 1, decodeKeyTopic: "address", dataIndex: 7, multiplier: (3n ** 10n).toString() }],
         computeScoreParameters: {
             computeMethod: ComputeScoreMethod.cappedScorePercentageHistorical,
             computeSettings: {

package/dist/src/modules/v4/protocol/protocol.model.d.ts CHANGED Viewed

@@ -9,7 +9,7 @@ export type Protocol = Resource<"Protocol", undefined, {
     numberOfLiveCampaigns?: number;
     opportunityLiveTags?: string[];
 }>;
-declare const protocolTypes: readonly ["ambient", "arthswap", "baseswap", "camelot", "crust", "fenix", "horiza", "izumi", "kim", "pancakeswap-v3", "quickswap-algebra", "quickswap-uni", "ramses", "retro", "stryke", "stryke-pcs", "stryke-sushi", "sushiswap-v3", "swapr", "thruster", "uniswap-v3", "voltage", "zero", "koi", "supswap-v3", "zkswap", "thirdtrade", "uniswapv4", "uniswap-v2", "velodrome", "aerodrome", "balancer", "curve", "cross_curve", "curveNPool", "aura", "akron", "beefy", "dragonswap", "poolside", "koi", "syncswap-v3", "neptune", "zkSwapThreePool", "syncswap", "rfx", "radiant", "aave", "euler", "gearbox", "compound", "sturdy", "frax", "ionic", "moonwell", "fluid", "silo", "morpho", "coumpound", "dolomite", "badger", "ajna", "layerbank", "ion", "venus", "woofi", "reactor_fusion", "eigenlayer", "vest", "zerolend", "hyperdrive", "gamma", "oku", "hourglass", "veda", "kyo", "sonex", "quickswap-algebra", "velodrome"];
+declare const protocolTypes: readonly ["uniswap", "ambient", "arthswap", "baseswap", "camelot", "crust", "fenix", "horiza", "izumi", "kim", "pancakeswap-v3", "quickswap-algebra", "quickswap-uni", "ramses", "retro", "stryke", "stryke-pcs", "stryke-sushi", "sushiswap-v3", "swapr", "thruster", "voltage", "zero", "koi", "supswap-v3", "zkswap", "thirdtrade", "velodrome", "aerodrome", "balancer", "curve", "cross_curve", "curveNPool", "aura", "akron", "beefy", "dragonswap", "poolside", "koi", "syncswap-v3", "neptune", "zkSwapThreePool", "syncswap", "rfx", "radiant", "aave", "euler", "gearbox", "compound", "sturdy", "frax", "ionic", "moonwell", "fluid", "silo", "morpho", "coumpound", "dolomite", "badger", "ajna", "layerbank", "ion", "venus", "woofi", "reactor_fusion", "eigenlayer", "vest", "zerolend", "hyperdrive", "gamma", "oku", "hourglass", "veda", "kyo", "sonex", "quickswap-algebra", "velodrome"];
 export type ProtocolId = (typeof protocolTypes)[number];
 export declare const ProtocolResourceDto: import("@sinclair/typebox").TObject<{
     id: import("@sinclair/typebox").TString;

package/dist/src/modules/v4/protocol/protocol.model.js CHANGED Viewed

@@ -1,6 +1,7 @@
 import { t } from "elysia";
 const protocolTypes = [
     // ─── AMM ─────────────────────────────────────────────────────────────
+    "uniswap",
     "ambient",
     "arthswap",
     "baseswap",
@@ -21,16 +22,13 @@ const protocolTypes = [
     "sushiswap-v3",
     "swapr",
     "thruster",
-    "uniswap-v3",
     "voltage",
     "zero",
     "koi",
     "supswap-v3",
     "zkswap",
     "thirdtrade",
-    "uniswapv4",
     // ─── LP DEX ──────────────────────────────────────────────────────────
-    "uniswap-v2",
     "velodrome",
     "aerodrome",
     "balancer",