@defisaver/positions-sdk 2.1.104 → 2.1.106-sgho-dev

package/src/types/claiming.ts

@@ -9,8 +9,6 @@ export enum ClaimType {
   COMPOUND_V3_COMP = 'COMPOUND_V3_COMP',
   /** Rewards from Spark (wstETH only for now) */
   SPARK_REWARDS = 'SPARK_REWARDS',
-  /** Rewards from Morpho */
-  MORPHO = 'MORPHO',
   /** Rewards from King (prev LTR^2 - received for weETH holding) */
   KING_REWARDS = 'KING_REWARDS',
   /** Spark Airdrop */
@@ -63,18 +61,6 @@ export type KingRewardsClaimableToken = _ClaimableTokenPartial & {
   };
 };
 
-export type MorphoClaimableToken = _ClaimableTokenPartial & {
-  claimType: ClaimType.MORPHO,
-  additionalClaimFields: {
-    originalAmount: string,
-    merkleProofs: string[];
-    distributor: EthAddress;
-    isLegacy: boolean;
-    txData: string;
-  }
-};
-
-
 export type CompoundV3CompClaimableToken = _ClaimableTokenPartial & {
   claimType: ClaimType.COMPOUND_V3_COMP,
   additionalClaimFields: {
@@ -106,7 +92,6 @@ export type ClaimableToken =
     AaveRewardsClaimableToken
     | AaveMeritRewardsClaimableToken
     | CompoundV3CompClaimableToken
-    | MorphoClaimableToken
     | SparkRewardsClaimableToken
     | KingRewardsClaimableToken
     | SparkAirdropClaimableToken

package/src/types/morphoBlue.ts

@@ -206,13 +206,13 @@ export interface MorphoBlueAllocationMarket {
   oracle: { address: string },
   irmAddress: string,
   lltv: string,
-  uniqueKey: string,
+  marketId: string,
 }
 
 export interface MorphoBluePublicAllocatorItem {
   vault: MorphoBlueVault,
   assets: string,
-  allocationMarket: MorphoBlueAllocationMarket,
+  withdrawMarket: MorphoBlueAllocationMarket,
 }
 
 export interface MorphoBlueAllocatorMarketState {
@@ -222,7 +222,6 @@ export interface MorphoBlueAllocatorMarketState {
 
 export interface MorphoBlueRealloactionMarketData {
   reallocatableLiquidityAssets: string,
-  targetBorrowUtilization: string,
   publicAllocatorSharedLiquidity: MorphoBluePublicAllocatorItem[],
   state: MorphoBlueAllocatorMarketState,
 }

package/cjs/claiming/morphoBlue.d.ts

@@ -1,5 +0,0 @@
-import { Client } from 'viem';
-import { ClaimableToken } from '../types/claiming';
-import { EthAddress, NetworkNumber } from '../types/common';
-export declare const getMorphoBlueRewardsInfo: (address: EthAddress) => Promise<any>;
-export declare const fetchMorphoBlueRewards: (provider: Client, network: NetworkNumber, walletAddresses: EthAddress[]) => Promise<Record<string, ClaimableToken[]>>;

package/cjs/claiming/morphoBlue.js

@@ -1,113 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.fetchMorphoBlueRewards = exports.getMorphoBlueRewardsInfo = void 0;
-const tokens_1 = require("@defisaver/tokens");
-const decimal_js_1 = __importDefault(require("decimal.js"));
-const claiming_1 = require("../types/claiming");
-const contracts_1 = require("../contracts");
-const morphoBlueHelpers_1 = require("../helpers/morphoBlueHelpers");
-const MORPHO_ALLOWED_CONTRACTS = [
-    '0x330eefa8a787552DC5cAd3C3cA644844B1E61Ddb',
-    '0x678dDC1d07eaa166521325394cDEb1E4c086DF43',
-    '0x2efd4625d0c149ebadf118ec5446c6de24d916a4',
-];
-const MORPHO_ALLOWED_TOKENS = [
-    'MORPHO',
-    'MORPHO Legacy',
-];
-const getMorphoBlueRewardsInfo = (address) => __awaiter(void 0, void 0, void 0, function* () {
-    if (!address)
-        return { claimable: '0' };
-    try {
-        const res = yield fetch(`https://rewards.morpho.org/v1/users/${address}/distributions`, { signal: AbortSignal.timeout(3000) });
-        if (!res.ok)
-            throw new Error(yield res.text());
-        return yield res.json();
-    }
-    catch (error) {
-        console.error('External API Failure: Morpho Merit', error);
-        return { claimable: '0' };
-    }
-});
-exports.getMorphoBlueRewardsInfo = getMorphoBlueRewardsInfo;
-const fetchMorphoBlueRewards = (provider, network, walletAddresses) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a;
-    // Fetch all API data in parallel (these are external API calls, can't be batched with multicall)
-    const apiDataPromises = walletAddresses.map(address => (0, exports.getMorphoBlueRewardsInfo)(address));
-    const apiDataArray = yield Promise.all(apiDataPromises);
-    // Process API data to get claimable tokens for each wallet
-    const allClaimableTokens = [];
-    const contractCallsData = [];
-    for (let i = 0; i < walletAddresses.length; i++) {
-        const walletAddress = walletAddresses[i];
-        const data = apiDataArray[i];
-        const claimableTokens = ((_a = data === null || data === void 0 ? void 0 : data.data) === null || _a === void 0 ? void 0 : _a.reduce((acc, reward) => {
-            var _a, _b, _c;
-            const token = (0, tokens_1.getAssetInfoByAddress)(reward.asset.address);
-            if (!MORPHO_ALLOWED_CONTRACTS.includes((_a = reward === null || reward === void 0 ? void 0 : reward.distributor) === null || _a === void 0 ? void 0 : _a.address) || !MORPHO_ALLOWED_TOKENS.includes(token.symbol)) {
-                return acc;
-            }
-            // Store contract call data for batching
-            contractCallsData.push({
-                walletAddress,
-                tokenAddress: reward.asset.address,
-                distributor: (_b = reward === null || reward === void 0 ? void 0 : reward.distributor) === null || _b === void 0 ? void 0 : _b.address,
-            });
-            return [
-                ...acc,
-                {
-                    symbol: token.symbol,
-                    underlyingSymbol: (0, morphoBlueHelpers_1.getMorphoUnderlyingSymbol)(token.symbol),
-                    tokenAddress: reward.asset.address,
-                    amount: (0, tokens_1.assetAmountInEth)(reward.claimable, token.symbol),
-                    walletAddress,
-                    label: token.symbol,
-                    claimType: claiming_1.ClaimType.MORPHO,
-                    additionalClaimFields: {
-                        originalAmount: reward.claimable,
-                        distributor: (_c = reward === null || reward === void 0 ? void 0 : reward.distributor) === null || _c === void 0 ? void 0 : _c.address,
-                        merkleProofs: reward === null || reward === void 0 ? void 0 : reward.proof,
-                        isLegacy: token.symbol === 'MORPHO Legacy',
-                        txData: reward === null || reward === void 0 ? void 0 : reward.tx_data,
-                    },
-                }
-            ];
-        }, [])) || [];
-        allClaimableTokens.push({ walletAddress, tokens: claimableTokens });
-    }
-    // Batch all contract calls using multicall
-    const contractPromises = contractCallsData.map(({ walletAddress, tokenAddress, distributor }) => {
-        const distributorContract = (0, contracts_1.createViemContractFromConfigFunc)('MorphoDistributor', distributor)(provider, network);
-        return distributorContract.read.claimed([walletAddress, tokenAddress]);
-    });
-    const contractResults = yield Promise.all(contractPromises);
-    // Process results
-    const results = {};
-    let contractCallIndex = 0;
-    for (const { walletAddress, tokens } of allClaimableTokens) {
-        const updatedTokens = [];
-        for (let i = 0; i < tokens.length; i++) {
-            const claimableToken = tokens[i];
-            const claimed = (0, tokens_1.assetAmountInEth)(contractResults[contractCallIndex].toString(), claimableToken.underlyingSymbol);
-            contractCallIndex++;
-            const updatedToken = Object.assign({}, claimableToken);
-            updatedToken.amount = new decimal_js_1.default(claimableToken.amount).sub(claimed).toString();
-            updatedTokens.push(updatedToken);
-        }
-        results[walletAddress.toLowerCase()] = updatedTokens.filter((claimableToken) => new decimal_js_1.default(claimableToken.amount).gt(0));
-    }
-    return results;
-});
-exports.fetchMorphoBlueRewards = fetchMorphoBlueRewards;

package/esm/claiming/morphoBlue.d.ts

@@ -1,5 +0,0 @@
-import { Client } from 'viem';
-import { ClaimableToken } from '../types/claiming';
-import { EthAddress, NetworkNumber } from '../types/common';
-export declare const getMorphoBlueRewardsInfo: (address: EthAddress) => Promise<any>;
-export declare const fetchMorphoBlueRewards: (provider: Client, network: NetworkNumber, walletAddresses: EthAddress[]) => Promise<Record<string, ClaimableToken[]>>;

package/esm/claiming/morphoBlue.js

@@ -1,105 +0,0 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-import { assetAmountInEth, getAssetInfoByAddress } from '@defisaver/tokens';
-import Dec from 'decimal.js';
-import { ClaimType } from '../types/claiming';
-import { createViemContractFromConfigFunc } from '../contracts';
-import { getMorphoUnderlyingSymbol } from '../helpers/morphoBlueHelpers';
-const MORPHO_ALLOWED_CONTRACTS = [
-    '0x330eefa8a787552DC5cAd3C3cA644844B1E61Ddb',
-    '0x678dDC1d07eaa166521325394cDEb1E4c086DF43',
-    '0x2efd4625d0c149ebadf118ec5446c6de24d916a4',
-];
-const MORPHO_ALLOWED_TOKENS = [
-    'MORPHO',
-    'MORPHO Legacy',
-];
-export const getMorphoBlueRewardsInfo = (address) => __awaiter(void 0, void 0, void 0, function* () {
-    if (!address)
-        return { claimable: '0' };
-    try {
-        const res = yield fetch(`https://rewards.morpho.org/v1/users/${address}/distributions`, { signal: AbortSignal.timeout(3000) });
-        if (!res.ok)
-            throw new Error(yield res.text());
-        return yield res.json();
-    }
-    catch (error) {
-        console.error('External API Failure: Morpho Merit', error);
-        return { claimable: '0' };
-    }
-});
-export const fetchMorphoBlueRewards = (provider, network, walletAddresses) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a;
-    // Fetch all API data in parallel (these are external API calls, can't be batched with multicall)
-    const apiDataPromises = walletAddresses.map(address => getMorphoBlueRewardsInfo(address));
-    const apiDataArray = yield Promise.all(apiDataPromises);
-    // Process API data to get claimable tokens for each wallet
-    const allClaimableTokens = [];
-    const contractCallsData = [];
-    for (let i = 0; i < walletAddresses.length; i++) {
-        const walletAddress = walletAddresses[i];
-        const data = apiDataArray[i];
-        const claimableTokens = ((_a = data === null || data === void 0 ? void 0 : data.data) === null || _a === void 0 ? void 0 : _a.reduce((acc, reward) => {
-            var _a, _b, _c;
-            const token = getAssetInfoByAddress(reward.asset.address);
-            if (!MORPHO_ALLOWED_CONTRACTS.includes((_a = reward === null || reward === void 0 ? void 0 : reward.distributor) === null || _a === void 0 ? void 0 : _a.address) || !MORPHO_ALLOWED_TOKENS.includes(token.symbol)) {
-                return acc;
-            }
-            // Store contract call data for batching
-            contractCallsData.push({
-                walletAddress,
-                tokenAddress: reward.asset.address,
-                distributor: (_b = reward === null || reward === void 0 ? void 0 : reward.distributor) === null || _b === void 0 ? void 0 : _b.address,
-            });
-            return [
-                ...acc,
-                {
-                    symbol: token.symbol,
-                    underlyingSymbol: getMorphoUnderlyingSymbol(token.symbol),
-                    tokenAddress: reward.asset.address,
-                    amount: assetAmountInEth(reward.claimable, token.symbol),
-                    walletAddress,
-                    label: token.symbol,
-                    claimType: ClaimType.MORPHO,
-                    additionalClaimFields: {
-                        originalAmount: reward.claimable,
-                        distributor: (_c = reward === null || reward === void 0 ? void 0 : reward.distributor) === null || _c === void 0 ? void 0 : _c.address,
-                        merkleProofs: reward === null || reward === void 0 ? void 0 : reward.proof,
-                        isLegacy: token.symbol === 'MORPHO Legacy',
-                        txData: reward === null || reward === void 0 ? void 0 : reward.tx_data,
-                    },
-                }
-            ];
-        }, [])) || [];
-        allClaimableTokens.push({ walletAddress, tokens: claimableTokens });
-    }
-    // Batch all contract calls using multicall
-    const contractPromises = contractCallsData.map(({ walletAddress, tokenAddress, distributor }) => {
-        const distributorContract = createViemContractFromConfigFunc('MorphoDistributor', distributor)(provider, network);
-        return distributorContract.read.claimed([walletAddress, tokenAddress]);
-    });
-    const contractResults = yield Promise.all(contractPromises);
-    // Process results
-    const results = {};
-    let contractCallIndex = 0;
-    for (const { walletAddress, tokens } of allClaimableTokens) {
-        const updatedTokens = [];
-        for (let i = 0; i < tokens.length; i++) {
-            const claimableToken = tokens[i];
-            const claimed = assetAmountInEth(contractResults[contractCallIndex].toString(), claimableToken.underlyingSymbol);
-            contractCallIndex++;
-            const updatedToken = Object.assign({}, claimableToken);
-            updatedToken.amount = new Dec(claimableToken.amount).sub(claimed).toString();
-            updatedTokens.push(updatedToken);
-        }
-        results[walletAddress.toLowerCase()] = updatedTokens.filter((claimableToken) => new Dec(claimableToken.amount).gt(0));
-    }
-    return results;
-});

package/src/claiming/morphoBlue.ts

@@ -1,119 +0,0 @@
-import { assetAmountInEth, getAssetInfoByAddress } from '@defisaver/tokens';
-import { Client } from 'viem';
-import Dec from 'decimal.js';
-import { ClaimableToken, ClaimType } from '../types/claiming';
-import { EthAddress, NetworkNumber } from '../types/common';
-import { createViemContractFromConfigFunc } from '../contracts';
-import { getMorphoUnderlyingSymbol } from '../helpers/morphoBlueHelpers';
-
-const MORPHO_ALLOWED_CONTRACTS = [
-  '0x330eefa8a787552DC5cAd3C3cA644844B1E61Ddb',
-  '0x678dDC1d07eaa166521325394cDEb1E4c086DF43',
-  '0x2efd4625d0c149ebadf118ec5446c6de24d916a4',
-];
-
-const MORPHO_ALLOWED_TOKENS = [
-  'MORPHO',
-  'MORPHO Legacy',
-];
-
-
-export const getMorphoBlueRewardsInfo = async (address: EthAddress) => {
-  if (!address) return { claimable: '0' };
-
-  try {
-    const res = await fetch(`https://rewards.morpho.org/v1/users/${address}/distributions`,
-      { signal: AbortSignal.timeout(3000) });
-
-    if (!res.ok) throw new Error(await res.text());
-    return await res.json();
-  } catch (error) {
-    console.error('External API Failure: Morpho Merit', error);
-    return { claimable: '0' };
-  }
-};
-
-export const fetchMorphoBlueRewards = async (
-  provider: Client,
-  network: NetworkNumber,
-  walletAddresses: EthAddress[],
-): Promise<Record<string, ClaimableToken[]>> => {
-  // Fetch all API data in parallel (these are external API calls, can't be batched with multicall)
-  const apiDataPromises = walletAddresses.map(address => getMorphoBlueRewardsInfo(address));
-  const apiDataArray = await Promise.all(apiDataPromises);
-
-  // Process API data to get claimable tokens for each wallet
-  const allClaimableTokens: Array<{ walletAddress: EthAddress; tokens: ClaimableToken[] }> = [];
-  const contractCallsData: Array<{ walletAddress: EthAddress; tokenAddress: EthAddress; distributor: EthAddress }> = [];
-
-  for (let i = 0; i < walletAddresses.length; i++) {
-    const walletAddress = walletAddresses[i];
-    const data = apiDataArray[i];
-
-    const claimableTokens = data?.data?.reduce((acc: ClaimableToken[], reward: any) => {
-      const token = getAssetInfoByAddress(reward.asset.address);
-      if (!MORPHO_ALLOWED_CONTRACTS.includes(reward?.distributor?.address) || !MORPHO_ALLOWED_TOKENS.includes(token.symbol)) {
-        return acc;
-      }
-
-      // Store contract call data for batching
-      contractCallsData.push({
-        walletAddress,
-        tokenAddress: reward.asset.address,
-        distributor: reward?.distributor?.address,
-      });
-
-      return [
-        ...acc,
-        {
-          symbol: token.symbol,
-          underlyingSymbol: getMorphoUnderlyingSymbol(token.symbol),
-          tokenAddress: reward.asset.address,
-          amount: assetAmountInEth(reward.claimable, token.symbol),
-          walletAddress,
-          label: token.symbol,
-          claimType: ClaimType.MORPHO,
-          additionalClaimFields: {
-            originalAmount: reward.claimable,
-            distributor: reward?.distributor?.address,
-            merkleProofs: reward?.proof,
-            isLegacy: token.symbol === 'MORPHO Legacy',
-            txData: reward?.tx_data,
-          },
-        }];
-    }, []) || [];
-
-    allClaimableTokens.push({ walletAddress, tokens: claimableTokens });
-  }
-
-  // Batch all contract calls using multicall
-  const contractPromises = contractCallsData.map(({ walletAddress, tokenAddress, distributor }) => {
-    const distributorContract = createViemContractFromConfigFunc('MorphoDistributor', distributor)(provider, network);
-    return distributorContract.read.claimed([walletAddress, tokenAddress]);
-  });
-  const contractResults = await Promise.all(contractPromises);
-
-  // Process results
-  const results: Record<string, ClaimableToken[]> = {};
-  let contractCallIndex = 0;
-
-  for (const { walletAddress, tokens } of allClaimableTokens) {
-    const updatedTokens: ClaimableToken[] = [];
-
-    for (let i = 0; i < tokens.length; i++) {
-      const claimableToken = tokens[i];
-      const claimed = assetAmountInEth(contractResults[contractCallIndex].toString(), claimableToken.underlyingSymbol);
-      contractCallIndex++;
-
-      const updatedToken = { ...claimableToken };
-      updatedToken.amount = new Dec(claimableToken.amount).sub(claimed).toString();
-      updatedTokens.push(updatedToken);
-    }
-
-    results[walletAddress.toLowerCase() as EthAddress] = updatedTokens.filter(
-      (claimableToken) => new Dec(claimableToken.amount).gt(0),
-    );
-  }
-
-  return results;
-};