@defisaver/positions-sdk 0.0.98 → 0.0.100

package/esm/helpers/morphoBlueHelpers/index.d.ts

@@ -1,7 +1,14 @@
-import { MMUsedAssets } from '../../types/common';
-import { MorphoBlueAggregatedPositionData, MorphoBlueAssetsData, MorphoBlueMarketInfo } from '../../types';
+import Web3 from 'web3';
+import { MMUsedAssets, NetworkNumber } from '../../types/common';
+import { MorphoBlueAggregatedPositionData, MorphoBlueAssetsData, MorphoBlueMarketData, MorphoBlueMarketInfo } from '../../types';
 export declare const getMorphoBlueAggregatedPositionData: ({ usedAssets, assetsData, marketInfo }: {
     usedAssets: MMUsedAssets;
     assetsData: MorphoBlueAssetsData;
     marketInfo: MorphoBlueMarketInfo;
 }) => MorphoBlueAggregatedPositionData;
+export declare const getSupplyRate: (totalSupplyAssets: string, totalBorrowAssets: string, borrowRate: string, fee: string) => string;
+export declare const getBorrowRate: (borrowRate: string, totalBorrowShares: string) => string;
+export declare const getApyAfterValuesEstimation: (selectedMarket: MorphoBlueMarketData, action: string, amount: string, asset: string, web3: Web3, network: NetworkNumber) => Promise<{
+    borrowRate: string;
+    supplyRate: string;
+}>;

package/esm/helpers/morphoBlueHelpers/index.js

@@ -1,6 +1,18 @@
+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 Dec from 'decimal.js';
+import { assetAmountInWei } from '@defisaver/tokens';
 import { calcLeverageLiqPrice, getAssetsTotal, isLeveragedPos } from '../../moneymarket';
 import { calculateNetApy } from '../../staking';
+import { SECONDS_PER_YEAR, WAD } from '../../constants';
+import { MorphoBlueViewContract } from '../../contracts';
 export const getMorphoBlueAggregatedPositionData = ({ usedAssets, assetsData, marketInfo }) => {
     var _a, _b, _c, _d, _e, _f;
     const payload = {};
@@ -39,3 +51,53 @@ export const getMorphoBlueAggregatedPositionData = ({ usedAssets, assetsData, ma
     }
     return payload;
 };
+const compound = (ratePerSeconds) => {
+    const compounding = new Dec(ratePerSeconds).mul(SECONDS_PER_YEAR).toString();
+    const apyNumber = Math.expm1(new Dec(compounding).div(WAD).toNumber());
+    return new Dec(apyNumber).mul(WAD).floor().toString();
+};
+export const getSupplyRate = (totalSupplyAssets, totalBorrowAssets, borrowRate, fee) => {
+    if (totalBorrowAssets === '0' || totalSupplyAssets === '0') {
+        return '0';
+    }
+    const utillization = new Dec(totalBorrowAssets).mul(WAD).div(totalSupplyAssets).ceil()
+        .toString();
+    const supplyRate = new Dec(utillization).mul(borrowRate).div(WAD).ceil()
+        .toString();
+    const ratePerSecond = new Dec(supplyRate).mul(new Dec(WAD).minus(fee)).div(WAD).ceil()
+        .toString();
+    return new Dec(compound(ratePerSecond)).div(1e18).mul(100).toString();
+};
+export const getBorrowRate = (borrowRate, totalBorrowShares) => {
+    if (totalBorrowShares === '0') {
+        return '0';
+    }
+    return new Dec(compound(borrowRate)).div(1e18).mul(100).toString();
+};
+const borrowOperations = ['borrow', 'payback'];
+export const getApyAfterValuesEstimation = (selectedMarket, action, amount, asset, web3, network) => __awaiter(void 0, void 0, void 0, function* () {
+    const morphoBlueViewContract = MorphoBlueViewContract(web3, network);
+    const lltvInWei = assetAmountInWei(selectedMarket.lltv, 'ETH');
+    const marketData = [selectedMarket.loanToken, selectedMarket.collateralToken, selectedMarket.oracle, selectedMarket.irm, lltvInWei];
+    const isBorrowOperation = borrowOperations.includes(action);
+    const amountInWei = assetAmountInWei(amount, asset);
+    let liquidityAdded;
+    let liquidityRemoved;
+    if (isBorrowOperation) {
+        liquidityAdded = action === 'payback' ? amountInWei : '0';
+        liquidityRemoved = action === 'borrow' ? amountInWei : '0';
+    }
+    else {
+        liquidityAdded = action === 'collateral' ? amountInWei : '0';
+        liquidityRemoved = action === 'withdraw' ? amountInWei : '0';
+    }
+    const data = yield morphoBlueViewContract.methods.getApyAfterValuesEstimation([
+        marketData,
+        isBorrowOperation,
+        liquidityAdded,
+        liquidityRemoved,
+    ]).call();
+    const borrowRate = getBorrowRate(data.borrowRate, data.market.totalBorrowShares);
+    const supplyRate = getSupplyRate(data.market.totalSupplyAssets, data.market.totalBorrowAssets, data.borrowRate, data.market.fee);
+    return { borrowRate, supplyRate };
+});

package/esm/maker/index.js

@@ -23,7 +23,7 @@ export const getMakerAccountBalances = (web3, network, block, addressMapping, cd
     }
     const viewContract = McdViewContract(web3, network, block);
     let ilk;
-    const needsIlk = new Dec(block).lt(14410792) && new Dec(block).gte(14384301);
+    const needsIlk = block !== 'latest' && new Dec(block).lt(14410792) && new Dec(block).gte(14384301);
     if (needsIlk) {
         ilk = (yield viewContract.methods.getUrnAndIlk(managerAddress, cdpId).call({}, block)).ilk;
     }

package/esm/morphoBlue/index.js

@@ -11,33 +11,10 @@ import Dec from 'decimal.js';
 import { assetAmountInEth, getAssetInfo, getAssetInfoByAddress } from '@defisaver/tokens';
 import { NetworkNumber, } from '../types/common';
 import { FeedRegistryContract, MorphoBlueViewContract, } from '../contracts';
-import { WAD, SECONDS_PER_YEAR, USD_QUOTE } from '../constants';
+import { WAD, USD_QUOTE } from '../constants';
 import { getStakingApy, STAKING_ASSETS } from '../staking';
 import { wethToEth } from '../services/utils';
-import { getMorphoBlueAggregatedPositionData } from '../helpers/morphoBlueHelpers';
-const compound = (ratePerSeconds) => {
-    const compounding = new Dec(ratePerSeconds).mul(SECONDS_PER_YEAR).toString();
-    const apyNumber = Math.expm1(new Dec(compounding).div(WAD).toNumber());
-    return new Dec(apyNumber).mul(WAD).floor().toString();
-};
-const getSupplyRate = (totalSupplyAssets, totalBorrowAssets, borrowRate, fee) => {
-    if (totalBorrowAssets === '0' || totalSupplyAssets === '0') {
-        return 0;
-    }
-    const utillization = new Dec(totalBorrowAssets).mul(WAD).div(totalSupplyAssets).ceil()
-        .toString();
-    const supplyRate = new Dec(utillization).mul(borrowRate).div(WAD).ceil()
-        .toString();
-    const ratePerSecond = new Dec(supplyRate).mul(new Dec(WAD).minus(fee)).div(WAD).ceil()
-        .toString();
-    return compound(ratePerSecond);
-};
-const getBorrowRate = (borrowRate, totalBorrowShares) => {
-    if (totalBorrowShares === '0') {
-        return 0;
-    }
-    return compound(borrowRate);
-};
+import { getBorrowRate, getMorphoBlueAggregatedPositionData, getSupplyRate } from '../helpers/morphoBlueHelpers';
 export function getMorphoBlueMarketData(web3, network, selectedMarket, mainnetWeb3) {
     return __awaiter(this, void 0, void 0, function* () {
         const { loanToken, collateralToken, oracle, irm, lltv, oracleType, } = selectedMarket;
@@ -67,8 +44,8 @@ export function getMorphoBlueMarketData(web3, network, selectedMarket, mainnetWe
             symbol: wethToEth(loanTokenInfo.symbol),
             address: loanToken,
             price: new Dec(loanTokenPrice).div(1e8).toString(),
-            supplyRate: new Dec(supplyRate).div(WAD).mul(100).toString(),
-            borrowRate: new Dec(compoundedBorrowRate).div(WAD).mul(100).toString(),
+            supplyRate,
+            borrowRate: compoundedBorrowRate,
             totalSupply: new Dec(marketInfo.totalSupplyAssets).div(scale).toString(),
             totalBorrow: new Dec(marketInfo.totalBorrowAssets).div(scale).toString(),
             canBeSupplied: true,

package/esm/types/contracts/generated/AaveV3View.d.ts

@@ -10,6 +10,30 @@ export interface EventOptions {
     topics?: string[];
 }
 export declare namespace AaveV3View {
+    type LiquidityChangeParamsStruct = [string, number | string | BN, number | string | BN] | {
+        reserveAddress: string;
+        liquidityAdded: number | string | BN;
+        liquidityTaken: number | string | BN;
+    };
+    type LiquidityChangeParamsStructOutputArray = [string, string, string];
+    type LiquidityChangeParamsStructOutputStruct = {
+        reserveAddress: string;
+        liquidityAdded: string;
+        liquidityTaken: string;
+    };
+    type LiquidityChangeParamsStructOutput = LiquidityChangeParamsStructOutputArray & LiquidityChangeParamsStructOutputStruct;
+    type EstimatedRatesStruct = [string, number | string | BN, number | string | BN] | {
+        reserveAddress: string;
+        supplyRate: number | string | BN;
+        variableBorrowRate: number | string | BN;
+    };
+    type EstimatedRatesStructOutputArray = [string, string, string];
+    type EstimatedRatesStructOutputStruct = {
+        reserveAddress: string;
+        supplyRate: string;
+        variableBorrowRate: string;
+    };
+    type EstimatedRatesStructOutput = EstimatedRatesStructOutputArray & EstimatedRatesStructOutputStruct;
     type TokenInfoFullStruct = [
         string,
         string,
@@ -159,6 +183,7 @@ export declare namespace AaveV3View {
         number | string | BN,
         number | string | BN,
         string[],
+        boolean[],
         string[],
         number | string | BN[],
         number | string | BN[],
@@ -173,6 +198,7 @@ export declare namespace AaveV3View {
         ratio: number | string | BN;
         eMode: number | string | BN;
         collAddr: string[];
+        enabledAsColl: boolean[];
         borrowAddr: string[];
         collAmounts: number | string | BN[];
         borrowStableAmounts: number | string | BN[];
@@ -188,6 +214,7 @@ export declare namespace AaveV3View {
         string,
         string,
         string[],
+        boolean[],
         string[],
         string[],
         string[],
@@ -203,6 +230,7 @@ export declare namespace AaveV3View {
         ratio: string;
         eMode: string;
         collAddr: string[];
+        enabledAsColl: boolean[];
         borrowAddr: string[];
         collAmounts: string[];
         borrowStableAmounts: string[];
@@ -276,8 +304,7 @@ export interface AaveV3View extends BaseContract {
     clone(): AaveV3View;
     methods: {
         AAVE_REFERRAL_CODE(): NonPayableTransactionObject<string>;
-        STABLE_ID(): NonPayableTransactionObject<string>;
-        VARIABLE_ID(): NonPayableTransactionObject<string>;
+        getApyAfterValuesEstimation(_market: string, _reserveParams: AaveV3View.LiquidityChangeParamsStruct[]): NonPayableTransactionObject<AaveV3View.EstimatedRatesStructOutput[]>;
         getAssetPrice(_market: string, _tokenAddr: string): NonPayableTransactionObject<string>;
         getCollFactors(_market: string, _tokens: string[]): NonPayableTransactionObject<string[]>;
         getEModeCollateralFactor(emodeCategory: number | string | BN, lendingPool: string): NonPayableTransactionObject<string>;

package/esm/types/contracts/generated/MorphoBlueView.d.ts

@@ -31,7 +31,58 @@ export type MarketParamsStructOutputStruct = {
     lltv: string;
 };
 export type MarketParamsStructOutput = MarketParamsStructOutputArray & MarketParamsStructOutputStruct;
+export type MarketStruct = [
+    number | string | BN,
+    number | string | BN,
+    number | string | BN,
+    number | string | BN,
+    number | string | BN,
+    number | string | BN
+] | {
+    totalSupplyAssets: number | string | BN;
+    totalSupplyShares: number | string | BN;
+    totalBorrowAssets: number | string | BN;
+    totalBorrowShares: number | string | BN;
+    lastUpdate: number | string | BN;
+    fee: number | string | BN;
+};
+export type MarketStructOutputArray = [
+    string,
+    string,
+    string,
+    string,
+    string,
+    string
+];
+export type MarketStructOutputStruct = {
+    totalSupplyAssets: string;
+    totalSupplyShares: string;
+    totalBorrowAssets: string;
+    totalBorrowShares: string;
+    lastUpdate: string;
+    fee: string;
+};
+export type MarketStructOutput = MarketStructOutputArray & MarketStructOutputStruct;
 export declare namespace MorphoBlueView {
+    type LiquidityChangeParamsStruct = [MarketParamsStruct, boolean, number | string | BN, number | string | BN] | {
+        marketParams: MarketParamsStruct;
+        isBorrowOperation: boolean;
+        liquidityAdded: number | string | BN;
+        liquidityRemoved: number | string | BN;
+    };
+    type LiquidityChangeParamsStructOutputArray = [
+        MarketParamsStructOutput,
+        boolean,
+        string,
+        string
+    ];
+    type LiquidityChangeParamsStructOutputStruct = {
+        marketParams: MarketParamsStructOutput;
+        isBorrowOperation: boolean;
+        liquidityAdded: string;
+        liquidityRemoved: string;
+    };
+    type LiquidityChangeParamsStructOutput = LiquidityChangeParamsStructOutputArray & LiquidityChangeParamsStructOutputStruct;
     type MarketInfoStruct = [
         string | number[],
         number | string | BN,
@@ -110,9 +161,19 @@ export interface MorphoBlueView extends BaseContract {
     clone(): MorphoBlueView;
     methods: {
         MORPHO_BLUE_ADDRESS(): NonPayableTransactionObject<string>;
+        getApyAfterValuesEstimation(params: MorphoBlueView.LiquidityChangeParamsStruct): NonPayableTransactionObject<[
+            string,
+            MarketStructOutput
+        ] & {
+            borrowRate: string;
+            market: MarketStructOutput;
+        }>;
         getMarketId(marketParams: MarketParamsStruct): NonPayableTransactionObject<string>;
         getMarketInfo(marketParams: MarketParamsStruct): NonPayableTransactionObject<MorphoBlueView.MarketInfoStructOutput>;
         getMarketInfoNotTuple(loanToken: string, collToken: string, oracle: string, irm: string, lltv: number | string | BN): NonPayableTransactionObject<MorphoBlueView.MarketInfoStructOutput>;
+        getRatio(marketId: string | number[], marketParams: MarketParamsStruct, owner: string): NonPayableTransactionObject<string>;
+        getRatioUsingId(marketId: string | number[], owner: string): NonPayableTransactionObject<string>;
+        getRatioUsingParams(marketParams: MarketParamsStruct, owner: string): NonPayableTransactionObject<string>;
         getUserInfo(marketParams: MarketParamsStruct, owner: string): NonPayableTransactionObject<MorphoBlueView.PositionInfoStructOutput>;
         morphoBlue(): NonPayableTransactionObject<string>;
     };

package/esm/types/contracts/generated/SparkView.d.ts

@@ -10,6 +10,30 @@ export interface EventOptions {
     topics?: string[];
 }
 export declare namespace SparkView {
+    type LiquidityChangeParamsStruct = [string, number | string | BN, number | string | BN] | {
+        reserveAddress: string;
+        liquidityAdded: number | string | BN;
+        liquidityTaken: number | string | BN;
+    };
+    type LiquidityChangeParamsStructOutputArray = [string, string, string];
+    type LiquidityChangeParamsStructOutputStruct = {
+        reserveAddress: string;
+        liquidityAdded: string;
+        liquidityTaken: string;
+    };
+    type LiquidityChangeParamsStructOutput = LiquidityChangeParamsStructOutputArray & LiquidityChangeParamsStructOutputStruct;
+    type EstimatedRatesStruct = [string, number | string | BN, number | string | BN] | {
+        reserveAddress: string;
+        supplyRate: number | string | BN;
+        variableBorrowRate: number | string | BN;
+    };
+    type EstimatedRatesStructOutputArray = [string, string, string];
+    type EstimatedRatesStructOutputStruct = {
+        reserveAddress: string;
+        supplyRate: string;
+        variableBorrowRate: string;
+    };
+    type EstimatedRatesStructOutput = EstimatedRatesStructOutputArray & EstimatedRatesStructOutputStruct;
     type TokenInfoFullStruct = [
         string,
         string,
@@ -159,6 +183,7 @@ export declare namespace SparkView {
         number | string | BN,
         number | string | BN,
         string[],
+        boolean[],
         string[],
         number | string | BN[],
         number | string | BN[],
@@ -173,6 +198,7 @@ export declare namespace SparkView {
         ratio: number | string | BN;
         eMode: number | string | BN;
         collAddr: string[];
+        enabledAsColl: boolean[];
         borrowAddr: string[];
         collAmounts: number | string | BN[];
         borrowStableAmounts: number | string | BN[];
@@ -188,6 +214,7 @@ export declare namespace SparkView {
         string,
         string,
         string[],
+        boolean[],
         string[],
         string[],
         string[],
@@ -203,6 +230,7 @@ export declare namespace SparkView {
         ratio: string;
         eMode: string;
         collAddr: string[];
+        enabledAsColl: boolean[];
         borrowAddr: string[];
         collAmounts: string[];
         borrowStableAmounts: string[];
@@ -276,8 +304,7 @@ export interface SparkView extends BaseContract {
     clone(): SparkView;
     methods: {
         SPARK_REFERRAL_CODE(): NonPayableTransactionObject<string>;
-        STABLE_ID(): NonPayableTransactionObject<string>;
-        VARIABLE_ID(): NonPayableTransactionObject<string>;
+        getApyAfterValuesEstimation(_market: string, _reserveParams: SparkView.LiquidityChangeParamsStruct[]): NonPayableTransactionObject<SparkView.EstimatedRatesStructOutput[]>;
         getAssetPrice(_market: string, _tokenAddr: string): NonPayableTransactionObject<string>;
         getCollFactors(_market: string, _tokens: string[]): NonPayableTransactionObject<string[]>;
         getEModeCollateralFactor(emodeCategory: number | string | BN, lendingPool: string): NonPayableTransactionObject<string>;

package/package.json

@@ -1,40 +1,41 @@
-{
-  "name": "@defisaver/positions-sdk",
-  "version": "0.0.98",
-  "description": "",
-  "main": "./cjs/index.js",
-  "module": "./esm/index.js",
-  "types": "./esm/index.d.ts",
-  "scripts": {
-    "build:esm": "rm -rf esm && tsc -p tsconfig.json",
-    "build:cjs": "rm -rf cjs && tsc -p tsconfig.cjs.json",
-    "build": "npm run generate-contracts && npm run build:cjs && npm run build:esm",
-    "dev": "npm run generate-contracts && tsc -p tsconfig.cjs.json --watch",
-    "lint": "eslint src/ --fix",
-    "generate-contracts": "node scripts/generateContracts.js",
-    "test": "mocha tests/*",
-    "build-test": "npm run build && mocha tests/*"
-  },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "dependencies": {
-    "@defisaver/tokens": "^1.5.26",
-    "@ethersproject/bignumber": "^5.7.0",
-    "@morpho-org/morpho-aave-v3-sdk": "^1.5.3",
-    "decimal.js": "^10.4.3"
-  },
-  "devDependencies": {
-    "@defisaver/eslint-config": "^1.0.1",
-    "chai": "^4.3.8",
-    "dotenv": "^16.3.1",
-    "eslint": "^8.49.0",
-    "mocha": "^10.2.0",
-    "typechain": "^8.3.1",
-    "typechain-target-web3-v1-3mihai3": "^6.0.2",
-    "typescript": "^5.2.2"
-  },
-  "peerDependencies": {
-    "web3": "^1.10.2"
-  }
-}
+{
+  "name": "@defisaver/positions-sdk",
+  "version": "0.0.100",
+  "description": "",
+  "main": "./cjs/index.js",
+  "module": "./esm/index.js",
+  "types": "./esm/index.d.ts",
+  "scripts": {
+    "build:esm": "rm -rf esm && tsc -p tsconfig.json",
+    "build:cjs": "rm -rf cjs && tsc -p tsconfig.cjs.json",
+    "build": "npm run generate-contracts && npm run build:cjs && npm run build:esm",
+    "dev": "npm run generate-contracts && tsc -p tsconfig.cjs.json --watch",
+    "lint": "eslint src/ --fix",
+    "generate-contracts": "node scripts/generateContracts.js",
+    "test": "mocha tests/*",
+    "test:debugger": "mocha --inspect-brk tests/*",
+    "build-test": "npm run build && mocha tests/*"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "@defisaver/tokens": "^1.5.27",
+    "@ethersproject/bignumber": "^5.7.0",
+    "@morpho-org/morpho-aave-v3-sdk": "^1.5.3",
+    "decimal.js": "^10.4.3"
+  },
+  "devDependencies": {
+    "@defisaver/eslint-config": "^1.0.1",
+    "chai": "^4.3.8",
+    "dotenv": "^16.3.1",
+    "eslint": "^8.49.0",
+    "mocha": "^10.2.0",
+    "typechain": "^8.3.1",
+    "typechain-target-web3-v1-3mihai3": "^6.0.2",
+    "typescript": "^5.2.2"
+  },
+  "peerDependencies": {
+    "web3": "^1.10.2"
+  }
+}