@defisaver/positions-sdk 0.0.201-fluid-dev-6 → 0.0.201-fluid-dev-8

package/.mocharc.json

@@ -1,4 +1,4 @@
-{
-    "require": "ts-node/register",
-    "extension": ["ts"]
-}
+{
+    "require": "ts-node/register",
+    "extension": ["ts"]
+}

package/.nvmrc

@@ -1 +1 @@
-v20.17.0
+v20.17.0

package/README.md

@@ -1,69 +1,69 @@
-# DeFi Saver Positions SDK
-
-Supported protocols: 
-- [Maker](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/maker)
-- [Spark](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/spark)
-- [CrvUSD](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/curveUsd)
-- [Aave V2](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/aaveV2)
-- [Aave V3](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/aaveV3)
-- [Morpho Aave V2](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/morphoAaveV2)
-- [Morpho Aave V3](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/morphoAaveV3)
-- [Compound V2](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/compoundV2)
-- [Compound V3](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/compoundV3)
-- [Liquity](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/liquity)
-- [Chicken Bonds](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/chickenBonds)
-
-## Setup
-Supported Node version is v10.
-
-- run `npm install` (first time)
-- run `npm run build`
-
-`build` command will generate contracts and build ejs and esm folders
-
-## How to use
-[All available imports](https://github.com/defisaver/defisaver-positions-sdk/blob/main/src/index.ts)
-
-This is a Compound V3 example, and every other protocol is similar
-```js
-import Web3 from 'web3';
-import { compoundV3 } from '@defisaver/positions-sdk';
-
-
-// every protocol has market data and user data getters
-const {
-    getCompoundV3MarketsData,
-    getCompoundV3AccountData,
-} = compoundV3;
-
-const provider = 'Your RPC provider';
-const web3 = new Web3(provider);
-
-const user = '0x123...';
-
-const { assetsData } = await getCompoundV3MarketsData(
-    web3, // rpc for the network you are using (note: can be tenderly or any other testnet rpc)
-    1, // network
-    selectedMarket, // market object like in /src/markets/compound/index.ts
-    web3, // this must be mainnet rpc - used for getting prices onchain and calculating apys
-);
-
-const userData = await getCompoundV3AccountData(
-    web3,
-    1, // network
-    userAddress, // EOA or DSProxy
-    '', // proxy address of the user, or just empty string if checking for EOA
-    {
-        selectedMarket, // market object as in /src/markets/compound/index.ts
-        assetsData,
-    }
-);
-```
-
-More examples found [here](https://github.com/defisaver/defisaver-positions-sdk/tree/main/tests)
-
-## Testing
-
-`npm run test` - Run all tests
-
-`npm run test-single --name=your_test_name` - Run single test for specified name e.g. for MyTest.js test name is MyTest
+# DeFi Saver Positions SDK
+
+Supported protocols: 
+- [Maker](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/maker)
+- [Spark](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/spark)
+- [CrvUSD](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/curveUsd)
+- [Aave V2](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/aaveV2)
+- [Aave V3](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/aaveV3)
+- [Morpho Aave V2](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/morphoAaveV2)
+- [Morpho Aave V3](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/morphoAaveV3)
+- [Compound V2](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/compoundV2)
+- [Compound V3](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/compoundV3)
+- [Liquity](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/liquity)
+- [Chicken Bonds](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/chickenBonds)
+
+## Setup
+Supported Node version is v10.
+
+- run `npm install` (first time)
+- run `npm run build`
+
+`build` command will generate contracts and build ejs and esm folders
+
+## How to use
+[All available imports](https://github.com/defisaver/defisaver-positions-sdk/blob/main/src/index.ts)
+
+This is a Compound V3 example, and every other protocol is similar
+```js
+import Web3 from 'web3';
+import { compoundV3 } from '@defisaver/positions-sdk';
+
+
+// every protocol has market data and user data getters
+const {
+    getCompoundV3MarketsData,
+    getCompoundV3AccountData,
+} = compoundV3;
+
+const provider = 'Your RPC provider';
+const web3 = new Web3(provider);
+
+const user = '0x123...';
+
+const { assetsData } = await getCompoundV3MarketsData(
+    web3, // rpc for the network you are using (note: can be tenderly or any other testnet rpc)
+    1, // network
+    selectedMarket, // market object like in /src/markets/compound/index.ts
+    web3, // this must be mainnet rpc - used for getting prices onchain and calculating apys
+);
+
+const userData = await getCompoundV3AccountData(
+    web3,
+    1, // network
+    userAddress, // EOA or DSProxy
+    '', // proxy address of the user, or just empty string if checking for EOA
+    {
+        selectedMarket, // market object as in /src/markets/compound/index.ts
+        assetsData,
+    }
+);
+```
+
+More examples found [here](https://github.com/defisaver/defisaver-positions-sdk/tree/main/tests)
+
+## Testing
+
+`npm run test` - Run all tests
+
+`npm run test-single --name=your_test_name` - Run single test for specified name e.g. for MyTest.js test name is MyTest

package/cjs/fluid/index.d.ts

@@ -59,3 +59,7 @@ export declare const getFluidDepositData: (web3: Web3, network: NetworkNumber, t
     deposited: string;
     depositedShares: string;
 }>;
+export declare const getUserPositions: (web3: Web3, network: NetworkNumber, user: EthAddress) => Promise<{
+    marketData: FluidMarketData;
+    userData: FluidVaultData;
+}[]>;

package/cjs/fluid/index.js

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFluidDepositData = exports.getFluidTokenData = exports.getAllFluidMarketDataChunked = exports.getFluidPositionWithMarket = exports.getFluidPosition = exports.getFluidVaultIdsForUser = exports.getFluidMarketData = exports.EMPTY_FLUID_DATA = exports.EMPTY_USED_ASSET = void 0;
+exports.getUserPositions = exports.getFluidDepositData = exports.getFluidTokenData = exports.getAllFluidMarketDataChunked = exports.getFluidPositionWithMarket = exports.getFluidPosition = exports.getFluidVaultIdsForUser = exports.getFluidMarketData = exports.EMPTY_FLUID_DATA = exports.EMPTY_USED_ASSET = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const tokens_1 = require("@defisaver/tokens");
 const common_1 = require("../types/common");
@@ -261,3 +261,14 @@ const getFluidDepositData = (web3, network, token, address) => __awaiter(void 0,
     };
 });
 exports.getFluidDepositData = getFluidDepositData;
+const getUserPositions = (web3, network, user) => __awaiter(void 0, void 0, void 0, function* () {
+    const view = (0, contracts_1.FluidViewContract)(web3, network);
+    const data = yield view.methods.getUserPositions(user).call();
+    const parsedMarketData = yield Promise.all(data.vaults.map((vaultData) => __awaiter(void 0, void 0, void 0, function* () { return parseMarketData(web3, vaultData, network); })));
+    const userData = data.positions.map((position, i) => parseUserData(position, parsedMarketData[i]));
+    return parsedMarketData.map((market, i) => ({
+        marketData: market,
+        userData: userData[i],
+    }));
+});
+exports.getUserPositions = getUserPositions;

package/cjs/helpers/morphoBlueHelpers/index.js

@@ -115,73 +115,73 @@ const getApyAfterValuesEstimation = (selectedMarket, actions, web3, network) =>
 });
 exports.getApyAfterValuesEstimation = getApyAfterValuesEstimation;
 const API_URL = 'https://blue-api.morpho.org/graphql';
-const MARKET_QUERY = `
-  query MarketByUniqueKey($uniqueKey: String!, $chainId: Int!) {
-      marketByUniqueKey(uniqueKey: $uniqueKey, chainId: $chainId) {
-        reallocatableLiquidityAssets
-        targetBorrowUtilization
-        loanAsset {
-          address
-          decimals
-          priceUsd
-        }
-        state {
-          liquidityAssets
-          borrowAssets
-          supplyAssets
-        }
-        publicAllocatorSharedLiquidity {
-          assets
-          vault {
-            address
-            name
-          }
-          allocationMarket {
-            uniqueKey
-            loanAsset {
-              address
-            }
-            collateralAsset {
-              address
-            }
-            irmAddress
-            oracle {
-              address
-            }
-            lltv
-          }
-        }
-        loanAsset {
-          address
-        }
-        collateralAsset {
-          address
-        }
-        oracle {
-          address
-        }
-        irmAddress
-        lltv  
-      }
-    }
+const MARKET_QUERY = `
+  query MarketByUniqueKey($uniqueKey: String!, $chainId: Int!) {
+      marketByUniqueKey(uniqueKey: $uniqueKey, chainId: $chainId) {
+        reallocatableLiquidityAssets
+        targetBorrowUtilization
+        loanAsset {
+          address
+          decimals
+          priceUsd
+        }
+        state {
+          liquidityAssets
+          borrowAssets
+          supplyAssets
+        }
+        publicAllocatorSharedLiquidity {
+          assets
+          vault {
+            address
+            name
+          }
+          allocationMarket {
+            uniqueKey
+            loanAsset {
+              address
+            }
+            collateralAsset {
+              address
+            }
+            irmAddress
+            oracle {
+              address
+            }
+            lltv
+          }
+        }
+        loanAsset {
+          address
+        }
+        collateralAsset {
+          address
+        }
+        oracle {
+          address
+        }
+        irmAddress
+        lltv  
+      }
+    }
 `;
-const REWARDS_QUERY = `
-  query MarketByUniqueKey($uniqueKey: String!, $chainId: Int!) {
-      marketByUniqueKey(uniqueKey: $uniqueKey, chainId: $chainId) {
-      uniqueKey
-      state {
-        rewards {
-          amountPerSuppliedToken
-          supplyApr
-          amountPerBorrowedToken
-          borrowApr
-          asset {
-            address
-          }
-        }
-      }
-    }
-    }
+const REWARDS_QUERY = `
+  query MarketByUniqueKey($uniqueKey: String!, $chainId: Int!) {
+      marketByUniqueKey(uniqueKey: $uniqueKey, chainId: $chainId) {
+      uniqueKey
+      state {
+        rewards {
+          amountPerSuppliedToken
+          supplyApr
+          amountPerBorrowedToken
+          borrowApr
+          asset {
+            address
+          }
+        }
+      }
+    }
+    }
 `;
 /**
  * Get reallocatable liquidity to a given market and target borrow utilization

package/cjs/markets/fluid/index.js

@@ -21,6 +21,7 @@ const ETH_USDC_1 = (networkId = common_1.NetworkNumber.Eth) => ({
     collateralAsset: 'ETH',
     debtAsset: 'USDC',
     type: types_1.FluidVaultType.T1,
+    isDeprecatingSoon: true,
 });
 exports.ETH_USDC_1 = ETH_USDC_1;
 const ETH_USDT_2 = (networkId = common_1.NetworkNumber.Eth) => ({
@@ -40,6 +41,7 @@ const ETH_USDT_2 = (networkId = common_1.NetworkNumber.Eth) => ({
     collateralAsset: 'ETH',
     debtAsset: 'USDT',
     type: types_1.FluidVaultType.T1,
+    isDeprecatingSoon: true,
 });
 exports.ETH_USDT_2 = ETH_USDT_2;
 const WSTETH_ETH_3 = (networkId = common_1.NetworkNumber.Eth) => ({
@@ -59,6 +61,7 @@ const WSTETH_ETH_3 = (networkId = common_1.NetworkNumber.Eth) => ({
     collateralAsset: 'wstETH',
     debtAsset: 'ETH',
     type: types_1.FluidVaultType.T1,
+    isDeprecatingSoon: true,
 });
 exports.WSTETH_ETH_3 = WSTETH_ETH_3;
 const WSTETH_USDC_4 = (networkId = common_1.NetworkNumber.Eth) => ({
@@ -78,6 +81,7 @@ const WSTETH_USDC_4 = (networkId = common_1.NetworkNumber.Eth) => ({
     collateralAsset: 'wstETH',
     debtAsset: 'USDC',
     type: types_1.FluidVaultType.T1,
+    isDeprecatingSoon: true,
 });
 exports.WSTETH_USDC_4 = WSTETH_USDC_4;
 const WSTETH_USDT_5 = (networkId = common_1.NetworkNumber.Eth) => ({
@@ -97,6 +101,7 @@ const WSTETH_USDT_5 = (networkId = common_1.NetworkNumber.Eth) => ({
     collateralAsset: 'wstETH',
     debtAsset: 'USDT',
     type: types_1.FluidVaultType.T1,
+    isDeprecatingSoon: true,
 });
 exports.WSTETH_USDT_5 = WSTETH_USDT_5;
 const WEETH_WSTETH_6 = (networkId = common_1.NetworkNumber.Eth) => ({
@@ -116,6 +121,7 @@ const WEETH_WSTETH_6 = (networkId = common_1.NetworkNumber.Eth) => ({
     collateralAsset: 'weETH',
     debtAsset: 'wstETH',
     type: types_1.FluidVaultType.T1,
+    isDeprecatingSoon: true,
 });
 exports.WEETH_WSTETH_6 = WEETH_WSTETH_6;
 const WEETH_USDC_9 = (networkId = common_1.NetworkNumber.Eth) => ({
@@ -135,6 +141,7 @@ const WEETH_USDC_9 = (networkId = common_1.NetworkNumber.Eth) => ({
     debtAsset: 'USDC',
     type: types_1.FluidVaultType.T1,
     wstETHBased: false,
+    isDeprecatingSoon: true,
 });
 exports.WEETH_USDC_9 = WEETH_USDC_9;
 const WEETH_USDT_10 = (networkId = common_1.NetworkNumber.Eth) => ({
@@ -154,6 +161,7 @@ const WEETH_USDT_10 = (networkId = common_1.NetworkNumber.Eth) => ({
     hasSmartDebt: false,
     collateralAsset: 'weETH',
     debtAsset: 'USDT',
+    isDeprecatingSoon: true,
 });
 exports.WEETH_USDT_10 = WEETH_USDT_10;
 const ETH_USDC_11 = (networkId = common_1.NetworkNumber.Eth) => ({

package/cjs/types/fluid.d.ts

@@ -16,6 +16,7 @@ export interface FluidMarketInfo {
     wstETHBased?: boolean;
     stableBased?: boolean;
     type: FluidVaultType;
+    isDeprecatingSoon?: boolean;
 }
 export declare enum FluidMainnetVersion {
     ETH_USDC_1 = "ETH_USDC_1",

package/esm/fluid/index.d.ts

@@ -59,3 +59,7 @@ export declare const getFluidDepositData: (web3: Web3, network: NetworkNumber, t
     deposited: string;
     depositedShares: string;
 }>;
+export declare const getUserPositions: (web3: Web3, network: NetworkNumber, user: EthAddress) => Promise<{
+    marketData: FluidMarketData;
+    userData: FluidVaultData;
+}[]>;

package/esm/fluid/index.js

@@ -248,3 +248,13 @@ export const getFluidDepositData = (web3, network, token, address) => __awaiter(
         depositedShares: getEthAmountForDecimals(userPosition.fTokenShares, decimals),
     };
 });
+export const getUserPositions = (web3, network, user) => __awaiter(void 0, void 0, void 0, function* () {
+    const view = FluidViewContract(web3, network);
+    const data = yield view.methods.getUserPositions(user).call();
+    const parsedMarketData = yield Promise.all(data.vaults.map((vaultData) => __awaiter(void 0, void 0, void 0, function* () { return parseMarketData(web3, vaultData, network); })));
+    const userData = data.positions.map((position, i) => parseUserData(position, parsedMarketData[i]));
+    return parsedMarketData.map((market, i) => ({
+        marketData: market,
+        userData: userData[i],
+    }));
+});

package/esm/helpers/morphoBlueHelpers/index.js

@@ -105,73 +105,73 @@ export const getApyAfterValuesEstimation = (selectedMarket, actions, web3, netwo
     return { borrowRate, supplyRate };
 });
 const API_URL = 'https://blue-api.morpho.org/graphql';
-const MARKET_QUERY = `
-  query MarketByUniqueKey($uniqueKey: String!, $chainId: Int!) {
-      marketByUniqueKey(uniqueKey: $uniqueKey, chainId: $chainId) {
-        reallocatableLiquidityAssets
-        targetBorrowUtilization
-        loanAsset {
-          address
-          decimals
-          priceUsd
-        }
-        state {
-          liquidityAssets
-          borrowAssets
-          supplyAssets
-        }
-        publicAllocatorSharedLiquidity {
-          assets
-          vault {
-            address
-            name
-          }
-          allocationMarket {
-            uniqueKey
-            loanAsset {
-              address
-            }
-            collateralAsset {
-              address
-            }
-            irmAddress
-            oracle {
-              address
-            }
-            lltv
-          }
-        }
-        loanAsset {
-          address
-        }
-        collateralAsset {
-          address
-        }
-        oracle {
-          address
-        }
-        irmAddress
-        lltv  
-      }
-    }
+const MARKET_QUERY = `
+  query MarketByUniqueKey($uniqueKey: String!, $chainId: Int!) {
+      marketByUniqueKey(uniqueKey: $uniqueKey, chainId: $chainId) {
+        reallocatableLiquidityAssets
+        targetBorrowUtilization
+        loanAsset {
+          address
+          decimals
+          priceUsd
+        }
+        state {
+          liquidityAssets
+          borrowAssets
+          supplyAssets
+        }
+        publicAllocatorSharedLiquidity {
+          assets
+          vault {
+            address
+            name
+          }
+          allocationMarket {
+            uniqueKey
+            loanAsset {
+              address
+            }
+            collateralAsset {
+              address
+            }
+            irmAddress
+            oracle {
+              address
+            }
+            lltv
+          }
+        }
+        loanAsset {
+          address
+        }
+        collateralAsset {
+          address
+        }
+        oracle {
+          address
+        }
+        irmAddress
+        lltv  
+      }
+    }
 `;
-const REWARDS_QUERY = `
-  query MarketByUniqueKey($uniqueKey: String!, $chainId: Int!) {
-      marketByUniqueKey(uniqueKey: $uniqueKey, chainId: $chainId) {
-      uniqueKey
-      state {
-        rewards {
-          amountPerSuppliedToken
-          supplyApr
-          amountPerBorrowedToken
-          borrowApr
-          asset {
-            address
-          }
-        }
-      }
-    }
-    }
+const REWARDS_QUERY = `
+  query MarketByUniqueKey($uniqueKey: String!, $chainId: Int!) {
+      marketByUniqueKey(uniqueKey: $uniqueKey, chainId: $chainId) {
+      uniqueKey
+      state {
+        rewards {
+          amountPerSuppliedToken
+          supplyApr
+          amountPerBorrowedToken
+          borrowApr
+          asset {
+            address
+          }
+        }
+      }
+    }
+    }
 `;
 /**
  * Get reallocatable liquidity to a given market and target borrow utilization

package/esm/markets/fluid/index.js

@@ -17,6 +17,7 @@ export const ETH_USDC_1 = (networkId = NetworkNumber.Eth) => ({
     collateralAsset: 'ETH',
     debtAsset: 'USDC',
     type: FluidVaultType.T1,
+    isDeprecatingSoon: true,
 });
 export const ETH_USDT_2 = (networkId = NetworkNumber.Eth) => ({
     btcBased: false,
@@ -35,6 +36,7 @@ export const ETH_USDT_2 = (networkId = NetworkNumber.Eth) => ({
     collateralAsset: 'ETH',
     debtAsset: 'USDT',
     type: FluidVaultType.T1,
+    isDeprecatingSoon: true,
 });
 export const WSTETH_ETH_3 = (networkId = NetworkNumber.Eth) => ({
     stableBased: false,
@@ -53,6 +55,7 @@ export const WSTETH_ETH_3 = (networkId = NetworkNumber.Eth) => ({
     collateralAsset: 'wstETH',
     debtAsset: 'ETH',
     type: FluidVaultType.T1,
+    isDeprecatingSoon: true,
 });
 export const WSTETH_USDC_4 = (networkId = NetworkNumber.Eth) => ({
     btcBased: false,
@@ -71,6 +74,7 @@ export const WSTETH_USDC_4 = (networkId = NetworkNumber.Eth) => ({
     collateralAsset: 'wstETH',
     debtAsset: 'USDC',
     type: FluidVaultType.T1,
+    isDeprecatingSoon: true,
 });
 export const WSTETH_USDT_5 = (networkId = NetworkNumber.Eth) => ({
     btcBased: false,
@@ -89,6 +93,7 @@ export const WSTETH_USDT_5 = (networkId = NetworkNumber.Eth) => ({
     collateralAsset: 'wstETH',
     debtAsset: 'USDT',
     type: FluidVaultType.T1,
+    isDeprecatingSoon: true,
 });
 export const WEETH_WSTETH_6 = (networkId = NetworkNumber.Eth) => ({
     btcBased: false,
@@ -107,6 +112,7 @@ export const WEETH_WSTETH_6 = (networkId = NetworkNumber.Eth) => ({
     collateralAsset: 'weETH',
     debtAsset: 'wstETH',
     type: FluidVaultType.T1,
+    isDeprecatingSoon: true,
 });
 export const WEETH_USDC_9 = (networkId = NetworkNumber.Eth) => ({
     btcBased: false,
@@ -125,6 +131,7 @@ export const WEETH_USDC_9 = (networkId = NetworkNumber.Eth) => ({
     debtAsset: 'USDC',
     type: FluidVaultType.T1,
     wstETHBased: false,
+    isDeprecatingSoon: true,
 });
 export const WEETH_USDT_10 = (networkId = NetworkNumber.Eth) => ({
     btcBased: false,
@@ -143,6 +150,7 @@ export const WEETH_USDT_10 = (networkId = NetworkNumber.Eth) => ({
     hasSmartDebt: false,
     collateralAsset: 'weETH',
     debtAsset: 'USDT',
+    isDeprecatingSoon: true,
 });
 export const ETH_USDC_11 = (networkId = NetworkNumber.Eth) => ({
     btcBased: false,

package/esm/types/fluid.d.ts

@@ -16,6 +16,7 @@ export interface FluidMarketInfo {
     wstETHBased?: boolean;
     stableBased?: boolean;
     type: FluidVaultType;
+    isDeprecatingSoon?: boolean;
 }
 export declare enum FluidMainnetVersion {
     ETH_USDC_1 = "ETH_USDC_1",