@merkl/api 0.19.47 → 0.19.49

package/dist/src/engine/dynamicData/implementations/Morpho.d.ts

@@ -1,6 +1,8 @@
 import { type Campaign, type CampaignParameters, type MerklChainId } from "@sdk";
+import { utils } from "ethers";
 import type { DynamicDataBuilder } from "../interface";
 type campaignType = Campaign.MORPHO;
+export declare const MORPHO_INTERFACE: utils.Interface;
 export declare class MorphoDynamicData implements DynamicDataBuilder<campaignType> {
     build(chainId: MerklChainId, campaigns: CampaignParameters<campaignType>[]): Promise<MorphoCampaignDynamicData[]>;
 }

package/dist/src/engine/dynamicData/implementations/Morpho.js

@@ -1,7 +1,15 @@
 import { TokenService } from "@/modules/v4/token/token.service";
-import { BN2Number, ChainInteractionService, MetamorphoInterface, MorphoSubCampaignType, YEAR, } from "@sdk";
+import { BN2Number, ChainInteractionService, MetamorphoInterface, MorphoSubCampaignType, YEAR, morphoAddresses, } from "@sdk";
 import axios from "axios";
+import { utils } from "ethers";
+import { zeroAddress } from "viem";
 import { Pricer } from "../../../utils/pricer";
+// TODO add the ABI
+const MORPHO_ABI = [
+    "function position(bytes32,address) external view returns (uint256,uint128,uint128)",
+    "function market(bytes32) external view returns (uint128,uint128,uint128,uint128,uint128,uint128)",
+];
+export const MORPHO_INTERFACE = new utils.Interface(MORPHO_ABI);
 export class MorphoDynamicData {
     async build(chainId, campaigns) {
         const pricer = await Pricer.load();
@@ -22,6 +30,14 @@ export class MorphoDynamicData {
                     target: campaign.campaignParameters.targetToken,
                 });
             }
+            if (campaign.campaignSubType === MorphoSubCampaignType.BORROWING_BLUE ||
+                campaign.campaignSubType === MorphoSubCampaignType.SUPPLY_BLUE) {
+                calls.push({
+                    allowFailure: true,
+                    callData: MORPHO_INTERFACE.encodeFunctionData("market", [campaign.campaignParameters.marketId]),
+                    target: morphoAddresses[campaign.computeChainId] ?? zeroAddress,
+                });
+            }
         }
         const result = await ChainInteractionService(chainId).fetchState(calls);
         const dynamicData = [];
@@ -45,9 +61,23 @@ export class MorphoDynamicData {
                 tvl = priceAsset * totalAssets;
                 totalSupplyTargetToken = totalSupply;
             }
-            if (campaign.campaignSubType === MorphoSubCampaignType.SUPPLY_BLUE ||
-                campaign.campaignSubType === MorphoSubCampaignType.BORROWING_BLUE ||
-                campaign.campaignSubType === MorphoSubCampaignType.COLLATERAL_BLUE) {
+            if (campaign.campaignSubType === MorphoSubCampaignType.SUPPLY_BLUE) {
+                const totalSupplyAssets = BN2Number(MORPHO_INTERFACE.decodeFunctionResult("market", result[index++].returnData)[0], Number(campaign.campaignParameters.decimalsLoanToken));
+                const priceAsset = (await pricer.get({
+                    symbol: campaign.campaignParameters.symbolLoanToken,
+                })) ?? 0;
+                tvl = priceAsset * totalSupplyAssets;
+                totalSupplyTargetToken = totalSupplyAssets;
+            }
+            if (campaign.campaignSubType === MorphoSubCampaignType.BORROWING_BLUE) {
+                const totalBorrowAssets = BN2Number(MORPHO_INTERFACE.decodeFunctionResult("market", result[index++].returnData)[2], Number(campaign.campaignParameters.decimalsLoanToken));
+                const priceAsset = (await pricer.get({
+                    symbol: campaign.campaignParameters.symbolLoanToken,
+                })) ?? 0;
+                tvl = priceAsset * totalBorrowAssets;
+                totalSupplyTargetToken = totalBorrowAssets;
+            }
+            if (campaign.campaignSubType === MorphoSubCampaignType.COLLATERAL_BLUE) {
                 const graphqlQueryMarket = {
                     query: `query MarketByUniqueKey($uniqueKey: String!, $chainId: Int) {
               marketByUniqueKey(uniqueKey: $uniqueKey, chainId: $chainId) {
@@ -74,18 +104,8 @@ export class MorphoDynamicData {
                         headers: headers,
                         data: graphqlQueryMarket,
                     });
-                    if (campaign.campaignSubType === MorphoSubCampaignType.SUPPLY_BLUE) {
-                        tvl = response.data.data.marketByUniqueKey.state.supplyAssetsUsd;
-                        totalSupplyTargetToken = response.data.data.marketByUniqueKey.state.supplyAssets;
-                    }
-                    if (campaign.campaignSubType === MorphoSubCampaignType.BORROWING_BLUE) {
-                        tvl = response.data.data.marketByUniqueKey.state.borrowAssetsUsd;
-                        totalSupplyTargetToken = response.data.data.marketByUniqueKey.state.borrowAssets;
-                    }
-                    if (campaign.campaignSubType === MorphoSubCampaignType.COLLATERAL_BLUE) {
-                        tvl = response.data.data.marketByUniqueKey.state.collateralAssetsUsd;
-                        totalSupplyTargetToken = response.data.data.marketByUniqueKey.state.collateralAssets;
-                    }
+                    tvl = response.data.data.marketByUniqueKey.state.collateralAssetsUsd;
+                    totalSupplyTargetToken = response.data.data.marketByUniqueKey.state.collateralAssets;
                 }
                 catch (e) {
                     console.log(e);

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

@@ -103,13 +103,13 @@ export const OpportunityController = new Elysia({
     .get("/:id/campaigns", async ({ query, params }) => {
     try {
         if (!params.id.includes("-"))
-            return await OpportunityService.getUniqueWithCampaignsOrThrow(params.id, query.test ?? false);
+            return await OpportunityService.getUniqueWithCampaignsOrThrow(params.id, query.test ?? false, query.point ?? false);
         const [chainId, type, identifier] = params.id.split("-");
         return await OpportunityService.getUniqueWithCampaignsOrThrow({
             chainId: +chainId,
             type: type,
             identifier,
-        }, query.test ?? false);
+        }, query.test ?? false, query.point ?? false);
     }
     catch (err) {
         if (err.code && err.code === "P2025")

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

@@ -151,12 +151,12 @@ export class OpportunityService {
     }
     static async getUniqueWithCampaignsOrThrow(opportunityId, withTest = false, withPoints = false) {
         const id = typeof opportunityId === "string" ? opportunityId : OpportunityService.hashId(opportunityId);
-        const opportunity = await OpportunityRepository.findUniqueOrThrow(id, withTest, withTest ?? withPoints, true);
+        const opportunity = await OpportunityRepository.findUniqueOrThrow(id, withTest, withTest ? withTest : withPoints, true);
         return OpportunityService.formatResponse(opportunity);
     }
     static async getUniqueOrThrow(opportunityId, withTest = false, withPoints = false) {
         const id = typeof opportunityId === "string" ? opportunityId : OpportunityService.hashId(opportunityId);
-        const opportunity = await OpportunityRepository.findUniqueOrThrow(id, withTest, withTest ?? withPoints);
+        const opportunity = await OpportunityRepository.findUniqueOrThrow(id, withTest, withTest ? withTest : withPoints);
         return OpportunityService.formatResponse(opportunity);
     }
     /**

package/dist/src/modules/v4/programPayload/programPayload.repository.d.ts

@@ -25,6 +25,8 @@ export declare enum etherlinkCampaigns {
     Superlend_Supply_USDC_Etherlink = "Superlend Supply USDC Etherlink 0xd03bfdF9B26DB1e6764724d914d7c3d18106a9Fb",
     Superlend_Supply_USDT_Etherlink = "Superlend Supply USDT Etherlink 0x998098A1B2E95e2b8f15360676428EdFd976861f",
     Superlend_Supply_WXTZ_Etherlink = "Superlend Supply WXTZ Etherlink 0x008ae222661B6A42e3A097bd7AAC15412829106b",
+    Superlend_Supply_mTBILL_Etherlink = "Superlend Supply mTBILL Etherlink 0x187B7b83e8CaB442AD0BFEAe38067f3eb38a2d72",
+    Superlend_Supply_mBASIS_Etherlink = "Superlend Supply mBASIS Etherlink 0x660ADeF5993167ACdb490DF287f4Db6Cc226fFeB",
     Iguana_WETH_WXTZ = "Iguana WETH/WXTZ Etherlink 0x478F067b0Ed73d120BBcd8c6f4f33438FC483912",
     Iguana_USDC_USDT = "Iguana USDC/USDT Etherlink 0x86456e2E2A203Da82E61ed34eF4137Fbe545f0DC",
     Iguana_XTZ_USDC = "Iguana XTZ/USDT Etherlink 0x508060A01f11d6a2Eb774B55aEba95931265E0cc",
@@ -231,7 +233,8 @@ export declare enum pufferCampaigns {
     CARROT_USDC = "0xf00032d0F95e8f43E750C51d0188DCa33cC5a8eA",
     sonex_pufETH_USDCe_1 = "0x4A0e0E8d5DF4AEC0a08359e599720628b179F7eD",
     sonex_pufETH_USDCe_5 = "0x2646FAD13ef9BD063790d2719De1da290865D58f",
-    kyo_pufETH_ETH = "0x8C4f743C763aBe5CBAe4E50358b05C7D45921638"
+    kyo_pufETH_ETH = "0x8C4f743C763aBe5CBAe4E50358b05C7D45921638",
+    apufETH = "0x0526CF96Ad808f8E11A5a9F1012edf67F4BAf519"
 }
 export declare enum zkSyncCampaigns {
     Izumi_Finance_Zk_Weth = "Izumi Finance ZK/WETH 0xd62bc9f19bd94fde9c41df4b6eb6419ea6b8e25c",
@@ -592,6 +595,54 @@ declare const EtherlinkInterfaceCampaigns: {
         url: string;
         forwarders: never[];
     };
+    "Superlend Supply mBASIS Etherlink 0x660ADeF5993167ACdb490DF287f4Db6Cc226fFeB": {
+        campaignType: any;
+        computeChainId: any;
+        hooks: {
+            hookType: any;
+            key: string;
+            chainId: any;
+            contractAddress: string;
+            contractState: any;
+            boostForReferrer: any;
+            valueForBoostForReferrer: number;
+            boostForInvited: any;
+            valueForBoostForInvited: number;
+            defaultBoost: any;
+            maximumBoostReferrer: number;
+            maximumBoostInvited: number;
+            cumulativeBoost: boolean;
+        }[];
+        targetToken: string;
+        whitelist: never[];
+        blacklist: string[];
+        url: string;
+        forwarders: never[];
+    };
+    "Superlend Supply mTBILL Etherlink 0x187B7b83e8CaB442AD0BFEAe38067f3eb38a2d72": {
+        campaignType: any;
+        computeChainId: any;
+        hooks: {
+            hookType: any;
+            key: string;
+            chainId: any;
+            contractAddress: string;
+            contractState: any;
+            boostForReferrer: any;
+            valueForBoostForReferrer: number;
+            boostForInvited: any;
+            valueForBoostForInvited: number;
+            defaultBoost: any;
+            maximumBoostReferrer: number;
+            maximumBoostInvited: number;
+            cumulativeBoost: boolean;
+        }[];
+        targetToken: string;
+        whitelist: never[];
+        blacklist: string[];
+        url: string;
+        forwarders: never[];
+    };
     "Uranium Hold xU308 Etherlink 0x79052Ab3C166D4899a1e0DD033aC3b379AF0B1fD": {
         campaignType: any;
         computeChainId: any;

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

@@ -29,6 +29,8 @@ export var etherlinkCampaigns;
     etherlinkCampaigns["Superlend_Supply_USDC_Etherlink"] = "Superlend Supply USDC Etherlink 0xd03bfdF9B26DB1e6764724d914d7c3d18106a9Fb";
     etherlinkCampaigns["Superlend_Supply_USDT_Etherlink"] = "Superlend Supply USDT Etherlink 0x998098A1B2E95e2b8f15360676428EdFd976861f";
     etherlinkCampaigns["Superlend_Supply_WXTZ_Etherlink"] = "Superlend Supply WXTZ Etherlink 0x008ae222661B6A42e3A097bd7AAC15412829106b";
+    etherlinkCampaigns["Superlend_Supply_mTBILL_Etherlink"] = "Superlend Supply mTBILL Etherlink 0x187B7b83e8CaB442AD0BFEAe38067f3eb38a2d72";
+    etherlinkCampaigns["Superlend_Supply_mBASIS_Etherlink"] = "Superlend Supply mBASIS Etherlink 0x660ADeF5993167ACdb490DF287f4Db6Cc226fFeB";
     etherlinkCampaigns["Iguana_WETH_WXTZ"] = "Iguana WETH/WXTZ Etherlink 0x478F067b0Ed73d120BBcd8c6f4f33438FC483912";
     etherlinkCampaigns["Iguana_USDC_USDT"] = "Iguana USDC/USDT Etherlink 0x86456e2E2A203Da82E61ed34eF4137Fbe545f0DC";
     etherlinkCampaigns["Iguana_XTZ_USDC"] = "Iguana XTZ/USDT Etherlink 0x508060A01f11d6a2Eb774B55aEba95931265E0cc";
@@ -65,6 +67,35 @@ const blacklistEtherlink = [
     "0x6c1b204185A55E9DaA0bF026720Fe94458ddd89F",
     "0x56A8b583276278513Eb78c3d132a80c1e81B9405",
     "0x6a2f09Bc9E6b82b38FCa096792B94f36FAd657Ac",
+    "0xf99Fdd1e71838433516DE7aD98aa82BFa3f17AE2",
+    "0xf1fAD4fecd686a79Fd2a4618F657f0BA0332e18A",
+    "0x51832D40579d86fb95Cc843EF32326BD51904956",
+    "0x0D1C515CCb1B723eCBA2Cbb14c458168078529DA",
+    "0x4d6ab6cBd964Fa1D33dA0232DA21fA3E5d23d05D",
+    "0x6ECEc7954b61Da887B8f3e56111D7Dd6bebc3877",
+    "0x41Be85bf6c460b1DC35efBE2C3143F9732CD6496",
+    "0x635518E05BAe895F85680Ce66Fb8EA92EE64FE2f",
+    "0xB05D1019772a14bb8853A94469B45ECfC7A985E8",
+    "0x82DAa20C1781d142295a7cF2a8913798695E50a2",
+    "0xbC086a895F6c1fF7Dd09022cC7fDEd52a2451Be5",
+    "0xFdAD5D95246E8b5B5147bCDE23ddCc6BbF1f7fC0",
+    "0x19f898d95295D072235272C015B80787B177140e",
+    "0xE0133f4027c14eB3D5cD758E052B5AD1bC380C70",
+    "0x05e6e1DF3eA666E1fEa7920026F6Bf1cA1A64F48",
+    "0x45c1FE080f5d38889DAa81614b46DEdBC360A0E6",
+    "0x3f7F401a04564f4789bC8e9b8A1BDe0F44CDc322",
+    "0xbc11274F5779ee4E81b09CCcd4fA4360f7c78F9E",
+    "0x196A8F57ff3AfB509f0014EDBa108A0BFeF0a84a",
+    "0x2366C17D8E825ec799292bBEf04b414938526594",
+    "0x208F27ec5d040618610a536a1f25a93Df6079eb1",
+    "0xE4cC0ceBF07D98f9a6b05E5283cb4d8A53c8beb8",
+    "0xa9D957545BA1AA6582690adbAFCaD12119ce834B",
+    "0xfc03b2f8B4Fb6438cE7d4E4B5F91372157A514cd",
+    "0xa660FA94B26FAA4D20E061D7FCa3d7b1411C30f0",
+    "0x0893cA2b0f0b8B87815B61c7717C25B8Bf834082",
+    "0x9D0E0e95305872E0f8065093b66E5FA224B5826f",
+    "0xa0E147eA78D8d696D73bbd43dE353b3ab076B3a0",
+    "0x196A8F57ff3AfB509f0014EDBa108A0BFeF0a84a",
 ];
 export var swapxCampaigns;
 (function (swapxCampaigns) {
@@ -269,6 +300,7 @@ export var pufferCampaigns;
     pufferCampaigns["sonex_pufETH_USDCe_1"] = "0x4A0e0E8d5DF4AEC0a08359e599720628b179F7eD";
     pufferCampaigns["sonex_pufETH_USDCe_5"] = "0x2646FAD13ef9BD063790d2719De1da290865D58f";
     pufferCampaigns["kyo_pufETH_ETH"] = "0x8C4f743C763aBe5CBAe4E50358b05C7D45921638";
+    pufferCampaigns["apufETH"] = "0x0526CF96Ad808f8E11A5a9F1012edf67F4BAf519";
 })(pufferCampaigns || (pufferCampaigns = {}));
 export var zkSyncCampaigns;
 (function (zkSyncCampaigns) {
@@ -561,6 +593,26 @@ const EtherlinkInterfaceCampaigns = {
         url: "https://markets.superlend.xyz/reserve-overview/?underlyingAsset=0xc9b53ab2679f573e480d01e0f49e2b5cfb7a3eab&marketName=etherlink",
         forwarders: [],
     },
+    [etherlinkCampaigns.Superlend_Supply_mBASIS_Etherlink]: {
+        campaignType: Campaign.ERC20,
+        computeChainId: ChainId.ETHERLINK,
+        hooks: [etherlinkReferralProgram],
+        targetToken: "0x660ADeF5993167ACdb490DF287f4Db6Cc226fFeB",
+        whitelist: [],
+        blacklist: blacklistEtherlink,
+        url: "https://markets.superlend.xyz/reserve-overview/?underlyingAsset=0x2247b5a46bb79421a314ab0f0b67ffd11dd37ee4&marketName=etherlink",
+        forwarders: [],
+    },
+    [etherlinkCampaigns.Superlend_Supply_mTBILL_Etherlink]: {
+        campaignType: Campaign.ERC20,
+        computeChainId: ChainId.ETHERLINK,
+        hooks: [etherlinkReferralProgram],
+        targetToken: "0x187B7b83e8CaB442AD0BFEAe38067f3eb38a2d72",
+        whitelist: [],
+        blacklist: blacklistEtherlink,
+        url: "https://markets.superlend.xyz/reserve-overview/?underlyingAsset=0xdd629e5241cbc5919847783e6c96b2de4754e438&marketName=etherlink",
+        forwarders: [],
+    },
     [etherlinkCampaigns.Uranium_Hold_xU308_Etherlink]: {
         campaignType: Campaign.ERC20,
         computeChainId: ChainId.ETHERLINK,
@@ -5443,6 +5495,16 @@ const PufferInterfaceCampaigns = {
         weightToken0: 5000,
         weightToken1: 5000,
     },
+    [pufferCampaigns.apufETH]: {
+        campaignType: Campaign.ERC20,
+        computeChainId: ChainId.SONEIUM,
+        hooks: [],
+        targetToken: "0x0526CF96Ad808f8E11A5a9F1012edf67F4BAf519",
+        whitelist: [],
+        blacklist: [],
+        url: "https://app.sakefinance.com/market/0x6c460b2c6d6719562d5da43e5152b375e79b9a8b",
+        forwarders: [],
+    },
 };
 export const MerklInterfaceCampaigns = {
     [program.Puffer]: PufferInterfaceCampaigns,

package/dist/src/utils/prices/priceService.js

@@ -1,10 +1,10 @@
+import { getTokensListWithCache } from "@/libs/getTokensList";
 import { PriceService as PriceSourceService } from "@/modules/v4/price";
 import { PriceSourceMethod } from "@db/api";
 import { BN2Number, ChainId, Stable, registry } from "@sdk";
 import axios from "axios";
 import { Contract } from "ethers";
 import { constantChain } from "../../constants";
-import { getTokensListWithCache } from "../../libs/getTokensList";
 import { log } from "../logger";
 import { providers } from "../providers";
 import { getChainlinkLatestPrice } from "./chainlinkRead";