@defisaver/positions-sdk 2.1.27 → 2.1.28

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,64 +1,64 @@
-# 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)
-- [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)
-
-## 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 { compoundV3 } from '@defisaver/positions-sdk';
-
-
-// every protocol has market data and user data getters
-const {
-    getCompoundV3MarketsData,
-    getCompoundV3AccountData,
-} = compoundV3;
-
-const provider = 'Your RPC provider';
-
-const user = '0x123...';
-
-const { assetsData } = await getCompoundV3MarketsData(
-    provider, // 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
-    provider, // this must be mainnet rpc - used for getting prices onchain and calculating apys
-);
-
-const userData = await getCompoundV3AccountData(
-    provider,
-    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)
+- [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)
+
+## 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 { compoundV3 } from '@defisaver/positions-sdk';
+
+
+// every protocol has market data and user data getters
+const {
+    getCompoundV3MarketsData,
+    getCompoundV3AccountData,
+} = compoundV3;
+
+const provider = 'Your RPC provider';
+
+const user = '0x123...';
+
+const { assetsData } = await getCompoundV3MarketsData(
+    provider, // 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
+    provider, // this must be mainnet rpc - used for getting prices onchain and calculating apys
+);
+
+const userData = await getCompoundV3AccountData(
+    provider,
+    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

@@ -128,73 +128,73 @@ const getApyAfterValuesEstimation = (selectedMarket, actions, provider, 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/savings/makerDSR/options.js

@@ -8,4 +8,5 @@ exports.MAKER_DSR_VAULT = {
     address: '0x197e90f9fad81970ba7976f33cbd77088e5d7cf7',
     asset: 'DAI',
     deploymentBlock: 8928160,
+    isLegacy: true,
 };

package/cjs/savings/morphoVaults/index.js

@@ -54,23 +54,23 @@ const morphoVaultsOptions = __importStar(require("./options"));
 exports.morphoVaultsOptions = morphoVaultsOptions;
 const viem_1 = require("../../services/viem");
 const contracts_1 = require("../../contracts");
-const vaultDataQuery = (vaultAddress) => `query vaultByAddress {
-vaultByAddress(chainId: 1, address: "${vaultAddress}") {
-    id,
-    dailyApy,
-    dailyApys {
-    apy, netApy
-    },
-    monthlyApys {
-    apy, netApy
-    },
-    liquidity {
-    underlying, usd,
-    },
-    asset {
-    priceUsd
-    }
-}
+const vaultDataQuery = (vaultAddress) => `query vaultByAddress {
+vaultByAddress(chainId: 1, address: "${vaultAddress}") {
+    id,
+    dailyApy,
+    dailyApys {
+    apy, netApy
+    },
+    monthlyApys {
+    apy, netApy
+    },
+    liquidity {
+    underlying, usd,
+    },
+    asset {
+    priceUsd
+    }
+}
 }`;
 const MORPHO_BLUE_API = 'https://blue-api.morpho.org/graphql';
 const _getMorphoVaultData = (provider, network, morphoVault, accounts) => __awaiter(void 0, void 0, void 0, function* () {

package/cjs/savings/morphoVaults/options.js

@@ -8,6 +8,7 @@ exports.MORPHO_VAULT_FLAGSHIP_ETH = {
     address: '0x38989BBA00BDF8181F4082995b3DEAe96163aC5D',
     asset: 'WETH',
     deploymentBlock: 18927491,
+    isLegacy: true,
 };
 exports.MORPHO_VAULT_GAUNTLET_USDC_CORE = {
     type: types_1.MorphoVaultType.MorphoVaultGauntletUSDCCore,
@@ -15,6 +16,7 @@ exports.MORPHO_VAULT_GAUNTLET_USDC_CORE = {
     address: '0x8eB67A509616cd6A7c1B3c8C21D48FF57df3d458',
     asset: 'USDC',
     deploymentBlock: 19777569,
+    isLegacy: true,
 };
 exports.MORPHO_VAULT_GAUNTLET_USDC_PRIME = {
     type: types_1.MorphoVaultType.MorphoVaultGauntletUSDCPrime,
@@ -22,6 +24,7 @@ exports.MORPHO_VAULT_GAUNTLET_USDC_PRIME = {
     address: '0xdd0f28e19C1780eb6396170735D45153D261490d',
     asset: 'USDC',
     deploymentBlock: 19777569,
+    isLegacy: true,
 };
 exports.MORPHO_VAULT_RE7_WETH = {
     type: types_1.MorphoVaultType.MorphoVaultRe7Weth,
@@ -29,6 +32,7 @@ exports.MORPHO_VAULT_RE7_WETH = {
     address: '0x78Fc2c2eD1A4cDb5402365934aE5648aDAd094d0',
     asset: 'WETH',
     deploymentBlock: 19121118,
+    isLegacy: true,
 };
 exports.MORPHO_VAULT_GAUNTLET_WETH_CORE = {
     type: types_1.MorphoVaultType.MorphoVaultGauntletWETHCore,
@@ -36,6 +40,7 @@ exports.MORPHO_VAULT_GAUNTLET_WETH_CORE = {
     address: '0x4881Ef0BF6d2365D3dd6499ccd7532bcdBCE0658',
     asset: 'WETH',
     deploymentBlock: 19541126,
+    isLegacy: true,
 };
 exports.MORPHO_VAULT_GAUNTLET_WETH_PRIME = {
     type: types_1.MorphoVaultType.MorphoVaultGauntletWETHPrime,
@@ -43,6 +48,7 @@ exports.MORPHO_VAULT_GAUNTLET_WETH_PRIME = {
     address: '0x2371e134e3455e0593363cBF89d3b6cf53740618',
     asset: 'WETH',
     deploymentBlock: 19372149,
+    isLegacy: true,
 };
 exports.MORPHO_VAULT_BOOSTED_USDC = {
     type: types_1.MorphoVaultType.MorphoVaultBoostedUSDC,
@@ -50,6 +56,7 @@ exports.MORPHO_VAULT_BOOSTED_USDC = {
     address: '0xd63070114470f685b75B74D60EEc7c1113d33a3D',
     asset: 'USDC',
     deploymentBlock: 20377233,
+    isLegacy: true,
 };
 exports.MORPHO_VAULT_STEAKHOUSE_PYUSD = {
     type: types_1.MorphoVaultType.MorphoVaultSteakhousePYUSD,
@@ -57,6 +64,7 @@ exports.MORPHO_VAULT_STEAKHOUSE_PYUSD = {
     address: '0xbEEF02e5E13584ab96848af90261f0C8Ee04722a',
     asset: 'PYUSD',
     deploymentBlock: 19043398,
+    isLegacy: false,
 };
 exports.MORPHO_VAULT_FLAGSHIP_USDT = {
     type: types_1.MorphoVaultType.MorphoVaultFlagshipUSDT,
@@ -64,6 +72,7 @@ exports.MORPHO_VAULT_FLAGSHIP_USDT = {
     address: '0x2C25f6C25770fFEC5959D34B94Bf898865e5D6b1',
     asset: 'USDT',
     deploymentBlock: 19127039,
+    isLegacy: true,
 };
 exports.MORPHO_VAULT_STEAKHOUSE_USDT = {
     type: types_1.MorphoVaultType.MorphoVaultSteakhouseUSDT,
@@ -71,6 +80,7 @@ exports.MORPHO_VAULT_STEAKHOUSE_USDT = {
     address: '0xbEef047a543E45807105E51A8BBEFCc5950fcfBa',
     asset: 'USDT',
     deploymentBlock: 19043398,
+    isLegacy: false,
 };
 exports.MORPHO_VAULT_GAUNTLET_USDA_CORE = {
     type: types_1.MorphoVaultType.MorphoVaultGauntletUSDACore,
@@ -78,6 +88,7 @@ exports.MORPHO_VAULT_GAUNTLET_USDA_CORE = {
     address: '0x125D41A6e5dbf455cD9Df8F80BCC6fd172D52Cc6',
     asset: 'USDA',
     deploymentBlock: 19633608,
+    isLegacy: true,
 };
 exports.MORPHO_VAULT_GAUNTLET_USDT_PRIME = {
     type: types_1.MorphoVaultType.MorphoVaultGauntletUSDTPrime,
@@ -85,6 +96,7 @@ exports.MORPHO_VAULT_GAUNTLET_USDT_PRIME = {
     address: '0x8CB3649114051cA5119141a34C200D65dc0Faa73',
     asset: 'USDT',
     deploymentBlock: 19486541,
+    isLegacy: true,
 };
 exports.MORPHO_VAULT_GAUNTLET_RESOLV_USDC = {
     type: types_1.MorphoVaultType.MorphoVaultGauntletResolvUSDC,
@@ -92,6 +104,7 @@ exports.MORPHO_VAULT_GAUNTLET_RESOLV_USDC = {
     address: '0x132E6C9C33A62D7727cd359b1f51e5B566E485Eb',
     asset: 'USDC',
     deploymentBlock: 21487882,
+    isLegacy: true,
 };
 exports.MORPHO_VAULTS = {
     [types_1.MorphoVaultType.MorphoVaultFlagshipEth]: exports.MORPHO_VAULT_FLAGSHIP_ETH,

package/cjs/savings/yearnVaults/options.js

@@ -7,18 +7,21 @@ exports.YEARN_VAULT_DAI = {
     address: '0xdA816459F1AB5631232FE5e97a05BBBb94970c95',
     asset: 'DAI',
     deploymentBlock: 12796965,
+    isLegacy: false,
 };
 exports.YEARN_VAULT_USDC = {
     type: yearnVaults_1.YearnVaultType.YearnVaultUSDC,
     address: '0xa354F35829Ae975e850e23e9615b11Da1B3dC4DE',
     asset: 'USDC',
     deploymentBlock: 13513457,
+    isLegacy: false,
 };
 exports.YEARN_VAULT_USDT = {
     type: yearnVaults_1.YearnVaultType.YearnVaultUSDT,
     address: '0x3B27F92C0e212C671EA351827EDF93DB27cc0c65',
     asset: 'USDT',
     deploymentBlock: 14980240,
+    isLegacy: false,
 };
 exports.YEARN_VAULTS = {
     [yearnVaults_1.YearnVaultType.YearnVaultDAI]: exports.YEARN_VAULT_DAI,

package/cjs/types/savings/makerDsr.d.ts

@@ -8,4 +8,5 @@ export interface MakerDsrVault {
     address: EthAddress;
     asset: string;
     deploymentBlock: number;
+    isLegacy: boolean;
 }

package/cjs/types/savings/morphoVaults.d.ts

@@ -20,4 +20,5 @@ export interface MorphoVault {
     address: EthAddress;
     asset: string;
     deploymentBlock: number;
+    isLegacy: boolean;
 }

package/cjs/types/savings/yearnVaults.d.ts

@@ -9,4 +9,5 @@ export interface YearnVault {
     address: EthAddress;
     asset: string;
     deploymentBlock: number;
+    isLegacy: boolean;
 }

package/esm/helpers/morphoBlueHelpers/index.js

@@ -118,73 +118,73 @@ export const getApyAfterValuesEstimation = (selectedMarket, actions, provider, n
     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/savings/makerDSR/options.js

@@ -5,4 +5,5 @@ export const MAKER_DSR_VAULT = {
     address: '0x197e90f9fad81970ba7976f33cbd77088e5d7cf7',
     asset: 'DAI',
     deploymentBlock: 8928160,
+    isLegacy: true,
 };

package/esm/savings/morphoVaults/index.js

@@ -14,23 +14,23 @@ import * as morphoVaultsOptions from './options';
 import { getViemProvider } from '../../services/viem';
 import { getMorphoVaultContractViem } from '../../contracts';
 export { morphoVaultsOptions, };
-const vaultDataQuery = (vaultAddress) => `query vaultByAddress {
-vaultByAddress(chainId: 1, address: "${vaultAddress}") {
-    id,
-    dailyApy,
-    dailyApys {
-    apy, netApy
-    },
-    monthlyApys {
-    apy, netApy
-    },
-    liquidity {
-    underlying, usd,
-    },
-    asset {
-    priceUsd
-    }
-}
+const vaultDataQuery = (vaultAddress) => `query vaultByAddress {
+vaultByAddress(chainId: 1, address: "${vaultAddress}") {
+    id,
+    dailyApy,
+    dailyApys {
+    apy, netApy
+    },
+    monthlyApys {
+    apy, netApy
+    },
+    liquidity {
+    underlying, usd,
+    },
+    asset {
+    priceUsd
+    }
+}
 }`;
 const MORPHO_BLUE_API = 'https://blue-api.morpho.org/graphql';
 export const _getMorphoVaultData = (provider, network, morphoVault, accounts) => __awaiter(void 0, void 0, void 0, function* () {