@defisaver/positions-sdk 0.0.201-fluid-dev-7 → 0.0.201-fluid-dev-9

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/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) => ({
@@ -1249,7 +1257,7 @@ const WBTC_USDC_12_ARB = (networkId = common_1.NetworkNumber.Eth) => ({
     chainIds: [common_1.NetworkNumber.Arb],
     label: 'WBTC / USDC Market 12',
     shortLabel: 'WBTC/USDC',
-    value: types_1.FluidArbitrumVersion.ARB_USDT_11_ARB,
+    value: types_1.FluidArbitrumVersion.WBTC_USDC_12_ARB,
     url: 'wbtc_usdc_12_arb',
     marketAddress: '0xE16A6f5359ABB1f61cE71e25dD0932e3E00B00eB',
     hasSmartCollateral: false,
@@ -1268,7 +1276,7 @@ const WBTC_USDT_13_ARB = (networkId = common_1.NetworkNumber.Eth) => ({
     chainIds: [common_1.NetworkNumber.Arb],
     label: 'WBTC / USDT Market 13',
     shortLabel: 'WBTC/USDT',
-    value: types_1.FluidArbitrumVersion.ARB_USDT_11_ARB,
+    value: types_1.FluidArbitrumVersion.WBTC_USDT_13_ARB,
     url: 'wbtc_usdc_13_arb',
     marketAddress: '0x82B27fA821419F5689381b565a8B0786aA2548De',
     hasSmartCollateral: false,
@@ -1325,7 +1333,7 @@ const WBTC_ETH_18_ARB = (networkId = common_1.NetworkNumber.Eth) => ({
     chainIds: [common_1.NetworkNumber.Arb],
     label: 'WBTC / ETH Market 18',
     shortLabel: 'WBTC/ETH',
-    value: types_1.FluidArbitrumVersion.WEETH_ETH_WSTETH_17_ARB,
+    value: types_1.FluidArbitrumVersion.WBTC_ETH_18_ARB,
     url: 'wbtc_eth_18_arb',
     marketAddress: '0xBc345229C1b52e4c30530C614BB487323BA38Da5',
     hasSmartCollateral: false,
@@ -1344,7 +1352,7 @@ const ETH_WBTC_19_ARB = (networkId = common_1.NetworkNumber.Eth) => ({
     chainIds: [common_1.NetworkNumber.Arb],
     label: 'ETH / WBTC Market 19',
     shortLabel: 'ETH/WBTC',
-    value: types_1.FluidArbitrumVersion.WEETH_ETH_WSTETH_17_ARB,
+    value: types_1.FluidArbitrumVersion.ETH_WBTC_19_ARB,
     url: 'eth_wbtc_19_arb',
     marketAddress: '0xF2c8F54447cbd591C396b0Dd7ac15FAF552d0FA4',
     hasSmartCollateral: false,
@@ -1363,7 +1371,7 @@ const WSTETH_WBTC_20_ARB = (networkId = common_1.NetworkNumber.Eth) => ({
     chainIds: [common_1.NetworkNumber.Arb],
     label: 'wstETH / WBTC Market 20',
     shortLabel: 'wstETH/WBTC',
-    value: types_1.FluidArbitrumVersion.WEETH_ETH_WSTETH_17_ARB,
+    value: types_1.FluidArbitrumVersion.WSTETH_WBTC_20_ARB,
     url: 'wsteth_wbtc_20_arb',
     marketAddress: '0x92643E964CA4b2c165a95CA919b0A819acA6D5F1',
     hasSmartCollateral: false,
@@ -1382,7 +1390,7 @@ const WEETH_WBTC_21_ARB = (networkId = common_1.NetworkNumber.Eth) => ({
     chainIds: [common_1.NetworkNumber.Arb],
     label: 'weETH / WBTC Market 21',
     shortLabel: 'weETH/WBTC',
-    value: types_1.FluidArbitrumVersion.WEETH_ETH_WSTETH_17_ARB,
+    value: types_1.FluidArbitrumVersion.WEETH_WBTC_21_ARB,
     url: 'weeth_wbtc_21_arb',
     marketAddress: '0x6F72895Cf6904489Bcd862c941c3D02a3eE4f03e',
     hasSmartCollateral: false,
@@ -1401,7 +1409,7 @@ const USDC_ETH_USDC_ETH_22_ARB = (networkId = common_1.NetworkNumber.Eth) => ({
     chainIds: [common_1.NetworkNumber.Arb],
     label: 'weETH / WBTC Market 22',
     shortLabel: 'weETH/WBTC',
-    value: types_1.FluidArbitrumVersion.WEETH_ETH_WSTETH_17_ARB,
+    value: types_1.FluidArbitrumVersion.USDC_ETH_USDC_ETH_22_ARB,
     url: 'usdc_eth_usdc_eth_22_arb',
     marketAddress: '0x3A0b7c8840D74D39552EF53F586dD8c3d1234C40',
     hasSmartCollateral: false,
@@ -1420,7 +1428,7 @@ const ETH_USDC_USDT_23_ARB = (networkId = common_1.NetworkNumber.Eth) => ({
     chainIds: [common_1.NetworkNumber.Arb],
     label: 'ETH / USDC-USDT Market 23',
     shortLabel: 'ETH/USDC-USDT',
-    value: types_1.FluidArbitrumVersion.WEETH_ETH_WSTETH_17_ARB,
+    value: types_1.FluidArbitrumVersion.ETH_USDC_USDT_23_ARB,
     url: 'eth_usdc_usdt_23_arb',
     marketAddress: '0xaD439b9D61b25af1ca4Cd211E3eCb9AfBaAEd84a',
     hasSmartCollateral: false,
@@ -1439,7 +1447,7 @@ const WSTETH_USDC_USDT_24_ARB = (networkId = common_1.NetworkNumber.Eth) => ({
     chainIds: [common_1.NetworkNumber.Arb],
     label: 'wstETH / USDC-USDT Market 23',
     shortLabel: 'wstETH/USDC-USDT',
-    value: types_1.FluidArbitrumVersion.WEETH_ETH_WSTETH_17_ARB,
+    value: types_1.FluidArbitrumVersion.WSTETH_USDC_USDT_24_ARB,
     url: 'wsteth_usdc_usdt_23_arb',
     marketAddress: '0x991416539E9DA46db233bCcbaEA38C4f852776D4',
     hasSmartCollateral: false,
@@ -1458,7 +1466,7 @@ const WEETH_USDC_USDT_25_ARB = (networkId = common_1.NetworkNumber.Eth) => ({
     chainIds: [common_1.NetworkNumber.Arb],
     label: 'weETH / USDC-USDT Market 25',
     shortLabel: 'weETH/USDC-USDT',
-    value: types_1.FluidArbitrumVersion.WEETH_ETH_WSTETH_17_ARB,
+    value: types_1.FluidArbitrumVersion.WEETH_USDC_USDT_25_ARB,
     url: 'weeth_usdc_usdt_25_arb',
     marketAddress: '0x03271C337c86a6Fd89625A2820e48621DC2a128b',
     hasSmartCollateral: false,
@@ -1477,7 +1485,7 @@ const WBTC_USDC_USDT_26_ARB = (networkId = common_1.NetworkNumber.Eth) => ({
     chainIds: [common_1.NetworkNumber.Arb],
     label: 'WBTC / USDC-USDT Market 26',
     shortLabel: 'WBTC/USDC-USDT',
-    value: types_1.FluidArbitrumVersion.WEETH_ETH_WSTETH_17_ARB,
+    value: types_1.FluidArbitrumVersion.WBTC_USDC_USDT_26_ARB,
     url: 'wbtc_usdc_usdt_26_arb',
     marketAddress: '0xF74cb9D69ada3559903149CFD60fD57cEAF95F30',
     hasSmartCollateral: false,

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/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