@defisaver/positions-sdk 2.1.153-dev → 2.1.154-shifter-v2-dev

package/src/types/aave.ts

@@ -143,6 +143,8 @@ export interface AavePositionData extends MMPositionData {
   collRatio: string,
   // Safety ratio as evaluated by automation bots (LTV-0 collateral credited at LLTV - 5%). Aave v3 only.
   safetyRatioWithLtvZeroFallback?: string,
+  // Normalised safety ratio (100 = liquidation on every protocol). Aave v3: the LTV-0 fallback ratio, Aave v2: `ratio`.
+  safetyRatio?: string,
   suppliedUsd: string,
   borrowedUsd: string,
   borrowLimitUsd: string,
@@ -177,6 +179,7 @@ export interface AaveV3AggregatedPositionData {
   collRatio: string,
   borrowLimitWithLtvZeroFallbackUsd: string,
   safetyRatioWithLtvZeroFallback: string,
+  safetyRatio: string,
   netApy: string,
   incentiveUsd: string,
   totalInterestUsd: string,

package/src/types/aaveV4.ts

@@ -183,6 +183,7 @@ export interface AaveV4AggregatedPositionData {
   leftToBorrowUsd: string,
   ratio: string,
   collRatio: string,
+  safetyRatio: string,
   liqRatio: string,
   liqPercent: string,
   leveragedType: LeverageType,

package/src/types/claiming.ts

@@ -7,8 +7,6 @@ export enum ClaimType {
   AAVE_MERIT_REWARDS = 'AAVE_MERIT_REWARDS',
   /** Rewards distributed through Merkl across supported protocols */
   MERKL_REWARDS = 'MERKL_REWARDS',
-  /** Rewards from Compound V3 (only in COMP) */
-  COMPOUND_V3_COMP = 'COMPOUND_V3_COMP',
   /** Rewards from Spark (wstETH only for now) */
   SPARK_REWARDS = 'SPARK_REWARDS',
   /** Rewards from King (prev LTR^2 - received for weETH holding) */
@@ -75,13 +73,6 @@ export type KingRewardsClaimableToken = _ClaimableTokenPartial & {
   };
 };
 
-export type CompoundV3CompClaimableToken = _ClaimableTokenPartial & {
-  claimType: ClaimType.COMPOUND_V3_COMP,
-  additionalClaimFields: {
-    marketAddress: EthAddress;
-  }
-};
-
 export enum SparkAirdropType {
   SPARK_IGNITION = 'spark-ignition',
   PRE_FARMING_AND_SOCIAL = 'pre-farming-and-social',
@@ -115,7 +106,6 @@ export type ClaimableToken =
     AaveRewardsClaimableToken
     | AaveMeritRewardsClaimableToken
     | MerklRewardsClaimableToken
-    | CompoundV3CompClaimableToken
     | SparkRewardsClaimableToken
     | KingRewardsClaimableToken
     | SparkAirdropClaimableToken

package/src/types/compound.ts

@@ -112,6 +112,7 @@ export interface CompoundAggregatedPositionData {
   leftToBorrowUsd: string,
   ratio: string,
   collRatio: string,
+  safetyRatio: string,
   netApy: string,
   incentiveUsd: string,
   totalInterestUsd: string,
@@ -132,6 +133,7 @@ export interface CompoundAggregatedPositionData {
 export interface CompoundPositionData extends MMPositionData {
   ratio: string,
   minRatio: string,
+  safetyRatio?: string,
   suppliedUsd: string,
   borrowedUsd: string,
   borrowLimitUsd: string,

package/src/types/fluid.ts

@@ -344,6 +344,7 @@ export interface FluidAggregatedVaultData {
   merklBorrowIncentives: IncentiveData[],
   ratio: string,
   collRatio: string,
+  safetyRatio: string,
   minRatio: string,
   totalInterestUsd: string,
   leveragedType?: LeverageType,

package/src/types/liquity.ts

@@ -26,6 +26,8 @@ export interface LiquityTroveInfo {
   totalETH: string,
   totalLUSD: string,
   minCollateralRatio: number,
+  // Collateral ratio rebased so 100 sits on `minCollateralRatio` (normalised safety ratio).
+  safetyRatio: string,
   priceForRecovery: string,
   debtInFront: string,
   exposure: string,

package/src/types/liquityV2.ts

@@ -104,6 +104,7 @@ export interface LiquityV2AggregatedTroveData {
   liquidationPrice: string,
   ratio: string,
   collRatio: string,
+  safetyRatio: string,
   exposure: string,
 }
 
@@ -112,6 +113,7 @@ export interface LiquityV2TroveData {
   troveId: string,
   ratio: string,
   collRatio: string,
+  safetyRatio?: string,
   liqRatio: string,
   borrowLimitRatio: string,
   interestRate: string,

package/src/types/maker.ts

@@ -47,6 +47,8 @@ export interface CdpData {
   debtAssetMarketPrice: string,
   liquidationPrice: string,
   ratio: string,
+  // Collateral ratio rebased so 100 sits on `liqPercent` (normalised safety ratio).
+  safetyRatio: string,
   liqRatio: string,
   liqPercent: number,
   assetPrice: string,

package/src/types/morphoBlue.ts

@@ -206,6 +206,7 @@ export interface MorphoBlueAggregatedPositionData {
   totalInterestUsd: string,
   ltv: string,
   ratio: string,
+  safetyRatio: string, // borrowLimitUsd / borrowedUsd as a percentage (100 = liquidation)
   leveragedType: LeverageType,
   leveragedAsset?: string,
   currentVolatilePairRatio?: string,
@@ -229,6 +230,7 @@ export interface MorphoBluePositionData {
   totalInterestUsd: string,
   ltv: string,
   ratio: string,
+  safetyRatio?: string,
   leveragedType: LeverageType,
   leveragedAsset?: string,
   currentVolatilePairRatio?: string,

package/src/types/morphoMidnight.ts

@@ -190,6 +190,7 @@ export interface MorphoMidnightAggregatedPositionData {
   ltv: string,
   ratio: string, // health ratio as a percentage (from MidnightView.ratio, 1e18-scaled)
   healthRatio: string, // liquidationLimitUsd / borrowedUsd
+  safetyRatio: string, // borrowLimitUsd / borrowedUsd as a percentage (100 = liquidation)
   leveragedType: LeverageType,
   leveragedAsset?: string,
   currentVolatilePairRatio?: string,

package/src/types/portfolio.ts

@@ -1,16 +1,20 @@
-import { AaveV2PositionData, AaveV3PositionData, AaveVersions } from './aave';
-import { AaveV4AccountData, AaveV4SpokesType } from './aaveV4';
+import {
+  AaveV2MarketData, AaveV2PositionData, AaveV3MarketData, AaveV3PositionData, AaveVersions,
+} from './aave';
+import { AaveV4AccountData, AaveV4SpokeData, AaveV4SpokesType } from './aaveV4';
 import { EthAddress } from './common';
-import { CompoundV2PositionData, CompoundV3PositionData, CompoundVersions } from './compound';
-import { CrvUSDUserData, CrvUSDVersions } from './curveUsd';
-import { FluidVaultData } from './fluid';
+import {
+  CompoundV2MarketsData, CompoundV2PositionData, CompoundV3MarketsData, CompoundV3PositionData, CompoundVersions,
+} from './compound';
+import { CrvUSDGlobalMarketData, CrvUSDUserData, CrvUSDVersions } from './curveUsd';
+import { FluidMarketData, FluidVaultData } from './fluid';
 import { LiquityTroveInfo } from './liquity';
-import { LiquityV2TroveData, LiquityV2Versions } from './liquityV2';
-import { LlamaLendUserData, LlamaLendVersionsType } from './llamaLend';
-import { CdpData } from './maker';
-import { MorphoBluePositionData, MorphoBlueVersions } from './morphoBlue';
-import { MorphoMidnightPositionData, MorphoMidnightVersions } from './morphoMidnight';
-import { SparkPositionData, SparkVersions } from './spark';
+import { LiquityV2MarketData, LiquityV2TroveData, LiquityV2Versions } from './liquityV2';
+import { LlamaLendGlobalMarketData, LlamaLendUserData, LlamaLendVersionsType } from './llamaLend';
+import { CdpData, IlkInfo } from './maker';
+import { MorphoBlueMarketInfo, MorphoBluePositionData, MorphoBlueVersions } from './morphoBlue';
+import { MorphoMidnightMarketInfo, MorphoMidnightPositionData, MorphoMidnightVersions } from './morphoMidnight';
+import { SparkMarketsData, SparkPositionData, SparkVersions } from './spark';
 
 export interface PortfolioProtocolData<T> {
   error: string,
@@ -62,4 +66,19 @@ export interface PortfolioPositionsDataForAddress {
 
 export interface PortfolioPositionsData {
   [key: EthAddress]: PortfolioPositionsDataForAddress;
-}
+}
+export interface PortfolioMarketsData {
+  morphoMarketsData: Record<string, MorphoBlueMarketInfo>;
+  morphoMidnightMarketsData: Record<string, MorphoMidnightMarketInfo>;
+  compoundV3MarketsData: Record<string, CompoundV3MarketsData>;
+  sparkMarketsData: Record<string, SparkMarketsData>;
+  aaveV3MarketsData: Record<string, AaveV3MarketData>;
+  aaveV2MarketsData: Record<string, AaveV2MarketData>;
+  compoundV2MarketsData: Record<string, CompoundV2MarketsData>;
+  crvUsdMarketsData: Record<string, CrvUSDGlobalMarketData>;
+  llamaLendMarketsData: Record<string, LlamaLendGlobalMarketData>;
+  liquityV2MarketsData: Record<string, LiquityV2MarketData>;
+  aaveV4SpokesData: Record<string, AaveV4SpokeData>;
+  fluidMarketsData: Record<string, FluidMarketData>;
+  makerMarketsData: Record<string, IlkInfo>;
+}

package/src/types/spark.ts

@@ -99,6 +99,7 @@ export interface SparkAggregatedPositionData {
   leftToBorrowUsd: string,
   ratio: string,
   collRatio: string,
+  safetyRatio: string,
   netApy: string,
   incentiveUsd: string,
   totalInterestUsd: string,
@@ -119,6 +120,7 @@ export interface SparkPositionData extends MMPositionData {
   ratio: string,
   minRatio: string,
   collRatio: string,
+  safetyRatio?: string,
   suppliedUsd: string,
   borrowedUsd: string,
   borrowLimitUsd: string,

package/cjs/claiming/compV3.d.ts

@@ -1,15 +0,0 @@
-import { Client } from 'viem';
-import { EthAddress, NetworkNumber } from '../types/common';
-import { ClaimType } from '../types/claiming';
-export declare const getCompoundV3Rewards: (provider: Client, network: NetworkNumber, user: EthAddress, market: any) => Promise<{
-    symbol: string;
-    underlyingSymbol: string;
-    tokenAddress: `0x${string}`;
-    amount: string;
-    walletAddress: `0x${string}`;
-    label: string;
-    claimType: ClaimType;
-    additionalClaimFields: {
-        marketAddress: any;
-    };
-}[]>;

package/cjs/claiming/compV3.js

@@ -1,50 +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());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCompoundV3Rewards = void 0;
-const viem_1 = require("viem");
-const tokens_1 = require("@defisaver/tokens");
-const contracts_1 = require("../contracts");
-const claiming_1 = require("../types/claiming");
-// `CometRewards.NotSupported(address)`. CometRewards reverts with it for any Comet that has no
-// `rewardConfig` set - such a market never accrues COMP, so there is nothing to claim.
-// Not decodable by name, since the error lives in CometRewards' ABI and we call through CompV3View.
-const NOT_SUPPORTED_ERROR_SIG = '0x9c58e3b6';
-const isMarketWithoutRewardsConfig = (err) => {
-    var _a;
-    if (!(err instanceof viem_1.BaseError))
-        return false;
-    const revert = err.walk((e) => e instanceof viem_1.ContractFunctionRevertedError);
-    return revert instanceof viem_1.ContractFunctionRevertedError && !!((_a = revert.raw) === null || _a === void 0 ? void 0 : _a.startsWith(NOT_SUPPORTED_ERROR_SIG));
-};
-const getCompoundV3Rewards = (provider, network, user, market) => __awaiter(void 0, void 0, void 0, function* () {
-    const compV3View = (0, contracts_1.CompV3ViewContractViem)(provider, network);
-    const rewards = yield compV3View.read.getRewardsOwed([market, user]).catch((err) => {
-        if (isMarketWithoutRewardsConfig(err))
-            return null;
-        throw err;
-    });
-    if (!rewards || rewards.owed.toString() === '0' || (0, tokens_1.getAssetInfoByAddress)(rewards.token, network).symbol !== 'COMP')
-        return [];
-    return [{
-            symbol: 'COMP',
-            underlyingSymbol: 'COMP',
-            tokenAddress: rewards.token,
-            amount: (0, tokens_1.assetAmountInEth)(rewards.owed.toString() || 0, 'COMP'),
-            walletAddress: user,
-            label: 'Compound V3',
-            claimType: claiming_1.ClaimType.COMPOUND_V3_COMP,
-            additionalClaimFields: {
-                marketAddress: market,
-            },
-        }];
-});
-exports.getCompoundV3Rewards = getCompoundV3Rewards;

package/esm/claiming/compV3.d.ts

@@ -1,15 +0,0 @@
-import { Client } from 'viem';
-import { EthAddress, NetworkNumber } from '../types/common';
-import { ClaimType } from '../types/claiming';
-export declare const getCompoundV3Rewards: (provider: Client, network: NetworkNumber, user: EthAddress, market: any) => Promise<{
-    symbol: string;
-    underlyingSymbol: string;
-    tokenAddress: `0x${string}`;
-    amount: string;
-    walletAddress: `0x${string}`;
-    label: string;
-    claimType: ClaimType;
-    additionalClaimFields: {
-        marketAddress: any;
-    };
-}[]>;

package/esm/claiming/compV3.js

@@ -1,46 +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 { BaseError, ContractFunctionRevertedError } from 'viem';
-import { assetAmountInEth, getAssetInfoByAddress } from '@defisaver/tokens';
-import { CompV3ViewContractViem } from '../contracts';
-import { ClaimType } from '../types/claiming';
-// `CometRewards.NotSupported(address)`. CometRewards reverts with it for any Comet that has no
-// `rewardConfig` set - such a market never accrues COMP, so there is nothing to claim.
-// Not decodable by name, since the error lives in CometRewards' ABI and we call through CompV3View.
-const NOT_SUPPORTED_ERROR_SIG = '0x9c58e3b6';
-const isMarketWithoutRewardsConfig = (err) => {
-    var _a;
-    if (!(err instanceof BaseError))
-        return false;
-    const revert = err.walk((e) => e instanceof ContractFunctionRevertedError);
-    return revert instanceof ContractFunctionRevertedError && !!((_a = revert.raw) === null || _a === void 0 ? void 0 : _a.startsWith(NOT_SUPPORTED_ERROR_SIG));
-};
-export const getCompoundV3Rewards = (provider, network, user, market) => __awaiter(void 0, void 0, void 0, function* () {
-    const compV3View = CompV3ViewContractViem(provider, network);
-    const rewards = yield compV3View.read.getRewardsOwed([market, user]).catch((err) => {
-        if (isMarketWithoutRewardsConfig(err))
-            return null;
-        throw err;
-    });
-    if (!rewards || rewards.owed.toString() === '0' || getAssetInfoByAddress(rewards.token, network).symbol !== 'COMP')
-        return [];
-    return [{
-            symbol: 'COMP',
-            underlyingSymbol: 'COMP',
-            tokenAddress: rewards.token,
-            amount: assetAmountInEth(rewards.owed.toString() || 0, 'COMP'),
-            walletAddress: user,
-            label: 'Compound V3',
-            claimType: ClaimType.COMPOUND_V3_COMP,
-            additionalClaimFields: {
-                marketAddress: market,
-            },
-        }];
-});

package/src/claiming/compV3.ts

@@ -1,37 +0,0 @@
-import { BaseError, Client, ContractFunctionRevertedError } from 'viem';
-import { assetAmountInEth, getAssetInfoByAddress } from '@defisaver/tokens';
-import { EthAddress, NetworkNumber } from '../types/common';
-import { CompV3ViewContractViem } from '../contracts';
-import { ClaimType } from '../types/claiming';
-
-// `CometRewards.NotSupported(address)`. CometRewards reverts with it for any Comet that has no
-// `rewardConfig` set - such a market never accrues COMP, so there is nothing to claim.
-// Not decodable by name, since the error lives in CometRewards' ABI and we call through CompV3View.
-const NOT_SUPPORTED_ERROR_SIG = '0x9c58e3b6';
-
-const isMarketWithoutRewardsConfig = (err: unknown) => {
-  if (!(err instanceof BaseError)) return false;
-  const revert = err.walk((e) => e instanceof ContractFunctionRevertedError);
-  return revert instanceof ContractFunctionRevertedError && !!revert.raw?.startsWith(NOT_SUPPORTED_ERROR_SIG);
-};
-
-export const getCompoundV3Rewards = async (provider: Client, network: NetworkNumber, user: EthAddress, market: any) => {
-  const compV3View = CompV3ViewContractViem(provider, network);
-  const rewards = await compV3View.read.getRewardsOwed([market, user]).catch((err) => {
-    if (isMarketWithoutRewardsConfig(err)) return null;
-    throw err;
-  });
-  if (!rewards || rewards.owed.toString() === '0' || getAssetInfoByAddress(rewards.token, network).symbol !== 'COMP') return [];
-  return [{
-    symbol: 'COMP',
-    underlyingSymbol: 'COMP',
-    tokenAddress: rewards.token,
-    amount: assetAmountInEth(rewards.owed.toString() || 0, 'COMP'),
-    walletAddress: user,
-    label: 'Compound V3',
-    claimType: ClaimType.COMPOUND_V3_COMP,
-    additionalClaimFields: {
-      marketAddress: market,
-    },
-  }];
-};