@defisaver/positions-sdk 2.1.35 → 2.1.37

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/index.d.ts

@@ -5,5 +5,6 @@ import * as yearnVaults from './yearnVaults';
 import * as makerDsr from './makerDsr';
 import * as skyOptions from './skyOptions';
 import * as sparkSavingsVaults from './sparkSavingsVaults';
-export { morphoVaults, yearnVaults, makerDsr, skyOptions, sparkSavingsVaults, };
-export declare const getSavingsData: (provider: EthereumProvider, network: NetworkNumber, accounts: EthAddress[]) => Promise<Partial<Record<MakerDsrType | MorphoVaultType | SkySavingsType | SparkSavingsVaultType | YearnVaultType, import("../types").SavingsVaultData>>>;
+import * as yearnV3Vaults from './yearnV3Vaults';
+export { morphoVaults, yearnVaults, makerDsr, skyOptions, sparkSavingsVaults, yearnV3Vaults, };
+export declare const getSavingsData: (provider: EthereumProvider, network: NetworkNumber, accounts: EthAddress[]) => Promise<Partial<Record<MakerDsrType | MorphoVaultType | SkySavingsType | SparkSavingsVaultType | import("../types").YearnV3VaultType | YearnVaultType, import("../types").SavingsVaultData>>>;

package/cjs/savings/index.js

@@ -42,7 +42,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSavingsData = exports.sparkSavingsVaults = exports.skyOptions = exports.makerDsr = exports.yearnVaults = exports.morphoVaults = void 0;
+exports.getSavingsData = exports.yearnV3Vaults = exports.sparkSavingsVaults = exports.skyOptions = exports.makerDsr = exports.yearnVaults = exports.morphoVaults = void 0;
 const types_1 = require("../types");
 const morphoVaults = __importStar(require("./morphoVaults"));
 exports.morphoVaults = morphoVaults;
@@ -54,6 +54,8 @@ const skyOptions = __importStar(require("./skyOptions"));
 exports.skyOptions = skyOptions;
 const sparkSavingsVaults = __importStar(require("./sparkSavingsVaults"));
 exports.sparkSavingsVaults = sparkSavingsVaults;
+const yearnV3Vaults = __importStar(require("./yearnV3Vaults"));
+exports.yearnV3Vaults = yearnV3Vaults;
 const getSavingsData = (provider, network, accounts) => __awaiter(void 0, void 0, void 0, function* () {
     const morphoVaultsList = Object.keys(morphoVaults.morphoVaultsOptions.MORPHO_VAULTS);
     const yearnVaultsList = Object.keys(yearnVaults.yearnVaultsOptions.YEARN_VAULTS);

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/skyOptions/options.js

@@ -8,4 +8,5 @@ exports.SKY_SAVINGS_OPTION = {
     asset: 'USDS',
     address: '0xa3931d71877C0E7a3148CB7Eb4463524FEc27fbD',
     isLegacy: false,
+    deploymentBlock: 20677434,
 };

package/cjs/savings/yearnV3Vaults/index.d.ts

@@ -0,0 +1,7 @@
+import { Client } from 'viem';
+import { SavingsVaultData, YearnV3Vault } from '../../types';
+import { EthAddress, EthereumProvider, NetworkNumber } from '../../types/common';
+import * as yearnV3VaultsOptions from './options';
+export { yearnV3VaultsOptions, };
+export declare const _getYearnV3VaultData: (provider: Client, network: NetworkNumber, yearnV3Vault: YearnV3Vault, accounts: EthAddress[]) => Promise<SavingsVaultData>;
+export declare function getYearnV3VaultData(provider: EthereumProvider, network: NetworkNumber, yearnV3Vault: YearnV3Vault, accounts: EthAddress[]): Promise<SavingsVaultData>;

package/cjs/savings/yearnV3Vaults/index.js

@@ -0,0 +1,97 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+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());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports._getYearnV3VaultData = exports.yearnV3VaultsOptions = void 0;
+exports.getYearnV3VaultData = getYearnV3VaultData;
+const decimal_js_1 = __importDefault(require("decimal.js"));
+const tokens_1 = require("@defisaver/tokens");
+const viem_1 = require("../../services/viem");
+const yearnV3VaultsOptions = __importStar(require("./options"));
+exports.yearnV3VaultsOptions = yearnV3VaultsOptions;
+const contracts_1 = require("../../contracts");
+const _getYearnV3VaultData = (provider, network, yearnV3Vault, accounts) => __awaiter(void 0, void 0, void 0, function* () {
+    const yearnV3VaultContract = (0, contracts_1.getYearnV3VaultContractViem)(provider, yearnV3Vault.address);
+    const shares = {};
+    const [totalAssets, totalSupply, totalDebt] = yield Promise.all([
+        yearnV3VaultContract.read.totalAssets(),
+        yearnV3VaultContract.read.totalSupply(),
+        yearnV3VaultContract.read.totalDebt(),
+        ...accounts.map((account) => __awaiter(void 0, void 0, void 0, function* () {
+            const share = yield yearnV3VaultContract.read.balanceOf([account]);
+            shares[account] = share;
+        })),
+    ]);
+    const poolSize = (0, tokens_1.assetAmountInEth)(totalAssets.toString(), yearnV3Vault.asset);
+    const debt = (0, tokens_1.assetAmountInEth)(totalDebt.toString(), yearnV3Vault.asset);
+    // DEV: Check if true
+    const liquidity = poolSize;
+    const supplied = {};
+    accounts.forEach((account) => {
+        const share = shares[account] || BigInt(0);
+        supplied[account.toLowerCase()] = (0, tokens_1.assetAmountInEth)(new decimal_js_1.default(share).mul(totalAssets).div(totalSupply).toFixed()
+            .toString(), yearnV3Vault.asset);
+    });
+    return {
+        poolSize,
+        supplied,
+        liquidity,
+        asset: yearnV3Vault.asset,
+        optionType: yearnV3Vault.type,
+    };
+});
+exports._getYearnV3VaultData = _getYearnV3VaultData;
+function getYearnV3VaultData(provider, network, yearnV3Vault, accounts) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return (0, exports._getYearnV3VaultData)((0, viem_1.getViemProvider)(provider, network, {
+            batch: {
+                multicall: {
+                    batchSize: 2500000,
+                },
+            },
+        }), network, yearnV3Vault, accounts);
+    });
+}

package/cjs/savings/yearnV3Vaults/options.d.ts

@@ -0,0 +1,8 @@
+import { YearnV3Vault, YearnV3VaultType } from '../../types';
+export declare const YEARN_V3_VAULT_USDC: YearnV3Vault;
+export declare const YEARN_V3_VAULT_USDS: YearnV3Vault;
+export declare const YEARN_V3_VAULT_DAI: YearnV3Vault;
+export declare const YEARN_V3_VAULT_USDT: YearnV3Vault;
+export declare const YEARN_V3_VAULT_WETH_1: YearnV3Vault;
+export declare const YEARN_V3_VAULTS: Record<YearnV3VaultType, YearnV3Vault>;
+export declare const getYearnV3Vault: (type: YearnV3VaultType) => YearnV3Vault;

package/cjs/savings/yearnV3Vaults/options.js

@@ -0,0 +1,53 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getYearnV3Vault = exports.YEARN_V3_VAULTS = exports.YEARN_V3_VAULT_WETH_1 = exports.YEARN_V3_VAULT_USDT = exports.YEARN_V3_VAULT_DAI = exports.YEARN_V3_VAULT_USDS = exports.YEARN_V3_VAULT_USDC = void 0;
+const types_1 = require("../../types");
+exports.YEARN_V3_VAULT_USDC = {
+    type: types_1.YearnV3VaultType.YearnVaultV3USDC,
+    name: 'Yearn V3 USDC',
+    address: '0xBe53A109B494E5c9f97b9Cd39Fe969BE68BF6204',
+    asset: 'USDC',
+    deploymentBlock: 19419991,
+    isLegacy: false,
+};
+exports.YEARN_V3_VAULT_USDS = {
+    type: types_1.YearnV3VaultType.YearnVaultV3USDS,
+    name: 'Yearn V3 USDS',
+    address: '0x182863131F9a4630fF9E27830d945B1413e347E8',
+    asset: 'USDS',
+    deploymentBlock: 20917639,
+    isLegacy: false,
+};
+exports.YEARN_V3_VAULT_DAI = {
+    type: types_1.YearnV3VaultType.YearnVaultV3DAI,
+    name: 'Yearn V3 DAI',
+    address: '0x028eC7330ff87667b6dfb0D94b954c820195336c',
+    asset: 'DAI',
+    deploymentBlock: 19419991,
+    isLegacy: false,
+};
+exports.YEARN_V3_VAULT_USDT = {
+    type: types_1.YearnV3VaultType.YearnVaultV3USDT,
+    name: 'Yearn V3 USDT',
+    address: '0x310B7Ea7475A0B449Cfd73bE81522F1B88eFAFaa',
+    asset: 'USDT',
+    deploymentBlock: 20369520,
+    isLegacy: false,
+};
+exports.YEARN_V3_VAULT_WETH_1 = {
+    type: types_1.YearnV3VaultType.YearnVaultV3WETH_1,
+    name: 'Yearn V3 WETH',
+    address: '0xc56413869c6CDf96496f2b1eF801fEDBdFA7dDB0',
+    asset: 'WETH',
+    deploymentBlock: 19419991,
+    isLegacy: false,
+};
+exports.YEARN_V3_VAULTS = {
+    [types_1.YearnV3VaultType.YearnVaultV3USDC]: exports.YEARN_V3_VAULT_USDC,
+    [types_1.YearnV3VaultType.YearnVaultV3USDS]: exports.YEARN_V3_VAULT_USDS,
+    [types_1.YearnV3VaultType.YearnVaultV3DAI]: exports.YEARN_V3_VAULT_DAI,
+    [types_1.YearnV3VaultType.YearnVaultV3USDT]: exports.YEARN_V3_VAULT_USDT,
+    [types_1.YearnV3VaultType.YearnVaultV3WETH_1]: exports.YEARN_V3_VAULT_WETH_1,
+};
+const getYearnV3Vault = (type) => exports.YEARN_V3_VAULTS[type];
+exports.getYearnV3Vault = getYearnV3Vault;

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

@@ -3,12 +3,14 @@ import { MakerDsrType } from './makerDsr';
 import { MorphoVaultType } from './morphoVaults';
 import { SkySavingsType } from './sky';
 import { SparkSavingsVaultType } from './sparkSavingsVaults';
+import { YearnV3VaultType } from './yearnV3Vaults';
 import { YearnVaultType } from './yearnVaults';
 export * from './morphoVaults';
 export * from './yearnVaults';
 export * from './makerDsr';
 export * from './sky';
 export * from './sparkSavingsVaults';
+export * from './yearnV3Vaults';
 export interface SavingsVaultData {
     poolSize: string;
     liquidity: string;
@@ -16,4 +18,4 @@ export interface SavingsVaultData {
     asset: string;
     optionType: string;
 }
-export type SavingsData = Partial<Record<MorphoVaultType | YearnVaultType | MakerDsrType | SkySavingsType | SparkSavingsVaultType, SavingsVaultData>>;
+export type SavingsData = Partial<Record<MorphoVaultType | YearnVaultType | MakerDsrType | SkySavingsType | SparkSavingsVaultType | YearnV3VaultType, SavingsVaultData>>;

package/cjs/types/savings/index.js

@@ -19,3 +19,4 @@ __exportStar(require("./yearnVaults"), exports);
 __exportStar(require("./makerDsr"), exports);
 __exportStar(require("./sky"), exports);
 __exportStar(require("./sparkSavingsVaults"), exports);
+__exportStar(require("./yearnV3Vaults"), exports);

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

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

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

@@ -0,0 +1,16 @@
+import { EthAddress } from '../common';
+export declare enum YearnV3VaultType {
+    YearnVaultV3USDC = "yearn_v3_vault_usdc",
+    YearnVaultV3USDS = "yearn_v3_vault_usds",
+    YearnVaultV3USDT = "yearn_v3_vault_usdt",
+    YearnVaultV3DAI = "yearn_v3_vault_dai",
+    YearnVaultV3WETH_1 = "yearn_v3_vault_weth_1"
+}
+export interface YearnV3Vault {
+    type: YearnV3VaultType;
+    address: EthAddress;
+    asset: string;
+    name: string;
+    deploymentBlock: number;
+    isLegacy: boolean;
+}

package/cjs/types/savings/yearnV3Vaults.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.YearnV3VaultType = void 0;
+var YearnV3VaultType;
+(function (YearnV3VaultType) {
+    YearnV3VaultType["YearnVaultV3USDC"] = "yearn_v3_vault_usdc";
+    YearnV3VaultType["YearnVaultV3USDS"] = "yearn_v3_vault_usds";
+    YearnV3VaultType["YearnVaultV3USDT"] = "yearn_v3_vault_usdt";
+    YearnV3VaultType["YearnVaultV3DAI"] = "yearn_v3_vault_dai";
+    YearnV3VaultType["YearnVaultV3WETH_1"] = "yearn_v3_vault_weth_1";
+})(YearnV3VaultType || (exports.YearnV3VaultType = YearnV3VaultType = {}));

package/esm/config/contracts.d.ts

@@ -85483,3 +85483,45 @@ export declare const SkySavings: {
         };
     };
 };
+export declare const YearnV3Vault: {
+    readonly abi: readonly [{
+        readonly stateMutability: "view";
+        readonly type: "function";
+        readonly name: "balanceOf";
+        readonly inputs: readonly [{
+            readonly name: "addr";
+            readonly type: "address";
+        }];
+        readonly outputs: readonly [{
+            readonly name: "";
+            readonly type: "uint256";
+        }];
+    }, {
+        readonly stateMutability: "view";
+        readonly type: "function";
+        readonly name: "totalAssets";
+        readonly inputs: readonly [];
+        readonly outputs: readonly [{
+            readonly name: "";
+            readonly type: "uint256";
+        }];
+    }, {
+        readonly stateMutability: "view";
+        readonly type: "function";
+        readonly name: "totalDebt";
+        readonly inputs: readonly [];
+        readonly outputs: readonly [{
+            readonly name: "";
+            readonly type: "uint256";
+        }];
+    }, {
+        readonly stateMutability: "view";
+        readonly type: "function";
+        readonly name: "totalSupply";
+        readonly inputs: readonly [];
+        readonly outputs: readonly [{
+            readonly name: "";
+            readonly type: "uint256";
+        }];
+    }];
+};

package/esm/config/contracts.js

@@ -1289,3 +1289,6 @@ export const SkySavings = {
         }
     }
 };
+export const YearnV3Vault = {
+    "abi": [{ "stateMutability": "view", "type": "function", "name": "balanceOf", "inputs": [{ "name": "addr", "type": "address" }], "outputs": [{ "name": "", "type": "uint256" }] }, { "stateMutability": "view", "type": "function", "name": "totalAssets", "inputs": [], "outputs": [{ "name": "", "type": "uint256" }] }, { "stateMutability": "view", "type": "function", "name": "totalDebt", "inputs": [], "outputs": [{ "name": "", "type": "uint256" }] }, { "stateMutability": "view", "type": "function", "name": "totalSupply", "inputs": [], "outputs": [{ "name": "", "type": "uint256" }] }]
+};