@defisaver/positions-sdk 2.1.24-dev-savings-3 → 2.1.25-dev-pt-feb-dev

package/esm/contracts.js

@@ -45,22 +45,6 @@ export const createViemContractFromConfigFunc = (name, _address) => (client, net
         client,
     });
 };
-export const getMorphoVaultContractViem = (client, address) => {
-    const abi = getConfigContractAbi('MorphoVault');
-    return getContract({
-        address,
-        abi,
-        client,
-    });
-};
-export const getYearnVaultContractViem = (client, address) => {
-    const abi = getConfigContractAbi('YearnVault');
-    return getContract({
-        address,
-        abi,
-        client,
-    });
-};
 export const MorphoBlueViewContractViem = createViemContractFromConfigFunc('MorphoBlueView');
 export const AaveLoanInfoV2ContractViem = createViemContractFromConfigFunc('AaveLoanInfoV2');
 export const AaveV3ViewContractViem = createViemContractFromConfigFunc('AaveV3View');
@@ -105,5 +89,3 @@ export const SparkRewardsControllerViem = createViemContractFromConfigFunc('Spar
 export const AaveRewardsControllerViem = createViemContractFromConfigFunc('AaveRewardsController');
 export const LiquityV2sBoldVaultViem = createViemContractFromConfigFunc('LiquityV2sBoldVault');
 export const StkAAVEViem = createViemContractFromConfigFunc('StkAAVE');
-export const YearnViewContractViem = createViemContractFromConfigFunc('YearnView');
-export const MakerDsrContractViem = createViemContractFromConfigFunc('MakerDsr');

package/esm/fluid/index.js

@@ -1130,23 +1130,11 @@ export const _getAllFluidMarketDataChunked = (network, provider) => __awaiter(vo
 });
 export const getAllFluidMarketDataChunked = (network, provider) => __awaiter(void 0, void 0, void 0, function* () { return _getAllFluidMarketDataChunked(network, getViemProvider(provider, network, { batch: { multicall: true } })); });
 export const _getFluidTokenData = (provider, network, token) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a, _b;
     const view = FluidViewContractViem(provider, network);
     const fTokenAddress = getFTokenAddress(token, network);
-    const [data, rewardsApiResponse,] = yield Promise.all([
-        yield view.read.getFTokenData([fTokenAddress]),
-        fetch(`https://api.fluid.instadapp.io/v2/lending/${network}/tokens/${fTokenAddress}`),
-    ]);
-    let rewardsData = { rewards: [] };
-    if (!rewardsApiResponse.ok) {
-        console.log('External API Failure: Failed to fetch fluid rewards APY');
-    }
-    else {
-        rewardsData = yield rewardsApiResponse.json();
-    }
-    const supplyRate = new Dec((rewardsData === null || rewardsData === void 0 ? void 0 : rewardsData.supplyRate) || '0').div(100).toString();
-    const rewardRates = ((_a = rewardsData === null || rewardsData === void 0 ? void 0 : rewardsData.rewards) === null || _a === void 0 ? void 0 : _a.reduce((acc, item) => acc.add(new Dec(item.rate || '0').div(100)), new Dec(0))) || '0';
-    const stakeRate = new Dec(((_b = rewardsData === null || rewardsData === void 0 ? void 0 : rewardsData.asset) === null || _b === void 0 ? void 0 : _b.stakingApr) || '0').div(100).toString();
+    const data = yield view.read.getFTokenData([fTokenAddress]);
+    const supplyRate = new Dec(data.supplyRate).div(100).toString();
+    const rewardsRate = new Dec(data.rewardsRate).div(1e12).toString();
     const decimals = data.decimals.toString();
     const depositRate = new Dec(getEthAmountForDecimals(data.convertToShares.toString(), decimals)).toString();
     const withdrawRate = new Dec(getEthAmountForDecimals(data.convertToAssets.toString(), decimals)).toString();
@@ -1156,7 +1144,7 @@ export const _getFluidTokenData = (provider, network, token) => __awaiter(void 0
         decimals,
         totalDeposited: getEthAmountForDecimals(data.totalAssets.toString(), decimals),
         withdrawable: getEthAmountForDecimals(data.withdrawable.toString(), decimals),
-        apy: new Dec(supplyRate).plus(rewardRates).plus(stakeRate).toString(),
+        apy: new Dec(supplyRate).add(rewardsRate).toString(),
         depositRate,
         withdrawRate,
     };

package/esm/index.d.ts

@@ -19,6 +19,5 @@ import * as llamaLend from './llamaLend';
 import * as eulerV2 from './eulerV2';
 import * as portfolio from './portfolio';
 import * as claiming from './claiming';
-import * as savings from './savings';
 export * from './types';
-export { aaveV2, aaveV3, compoundV2, compoundV3, spark, curveUsd, liquity, liquityV2, maker, exchange, staking, moneymarket, markets, helpers, morphoBlue, llamaLend, eulerV2, fluid, portfolio, claiming, savings, };
+export { aaveV2, aaveV3, compoundV2, compoundV3, spark, curveUsd, liquity, liquityV2, maker, exchange, staking, moneymarket, markets, helpers, morphoBlue, llamaLend, eulerV2, fluid, portfolio, claiming, };

package/esm/index.js

@@ -19,6 +19,5 @@ import * as llamaLend from './llamaLend';
 import * as eulerV2 from './eulerV2';
 import * as portfolio from './portfolio';
 import * as claiming from './claiming';
-import * as savings from './savings';
 export * from './types';
-export { aaveV2, aaveV3, compoundV2, compoundV3, spark, curveUsd, liquity, liquityV2, maker, exchange, staking, moneymarket, markets, helpers, morphoBlue, llamaLend, eulerV2, fluid, portfolio, claiming, savings, };
+export { aaveV2, aaveV3, compoundV2, compoundV3, spark, curveUsd, liquity, liquityV2, maker, exchange, staking, moneymarket, markets, helpers, morphoBlue, llamaLend, eulerV2, fluid, portfolio, claiming, };

package/esm/markets/aave/marketAssets.js

@@ -7,7 +7,7 @@ export const aaveV1AssetsDefaultMarket = [
 export const aaveV2AssetsDefaultMarket = ['USDT', 'WBTC', 'ETH', 'YFI', 'ZRX', 'UNI', 'AAVE', 'BAT', 'BUSD', 'DAI', 'ENJ', 'KNCL', 'LINK', 'MANA', 'MKR', 'REN', 'SNX', 'SUSD', 'TUSD', 'USDC', 'CRV', 'GUSD', 'BAL', 'xSUSHI', 'RENFIL', 'RAI', 'AMPL', 'USDP', 'DPI', 'FRAX', 'FEI', 'stETH', 'ENS', 'UST', 'CVX', '1INCH', 'LUSD'];
 export const aaveV3AssetsDefaultMarketEth = [
     'ETH', 'wstETH', 'WBTC', 'USDC', 'DAI', 'LINK', 'AAVE', 'cbETH', 'USDT', 'rETH', 'LUSD', 'CRV', 'MKR', 'SNX', 'BAL', 'UNI', 'LDO', 'ENS', '1INCH', 'FRAX', 'GHO', 'RPL', 'sDAI', 'STG', 'KNC', 'FXS', 'crvUSD', 'PYUSD', 'weETH', 'osETH', 'USDe', 'ETHx', 'sUSDe', 'tBTC', 'cbBTC', 'USDS', 'rsETH', 'LBTC', 'eBTC', 'RLUSD', 'PT eUSDe May', 'PT sUSDe July', 'USDtb',
-    'eUSDe', 'PT USDe July', 'PT eUSDe Aug', 'EURC', 'FBTC', 'PT sUSDe Sep', 'PT USDe Sep', 'tETH', 'ezETH', 'XAUt', 'PT sUSDe Nov', 'PT USDe Nov',
+    'eUSDe', 'PT USDe July', 'PT eUSDe Aug', 'EURC', 'FBTC', 'PT sUSDe Sep', 'PT USDe Sep', 'tETH', 'ezETH', 'XAUt', 'PT sUSDe Nov', 'PT USDe Nov', 'PT sUSDe Feb', 'PT USDe Feb',
 ];
 export const aaveV3AssetsDefaultMarketOpt = [
     'DAI', 'USDC.e', 'USDT', 'SUSD', 'AAVE', 'LINK', 'WBTC', 'ETH', 'OP', 'wstETH', 'LUSD', 'MAI', 'rETH', 'USDC',

package/esm/moneymarket/moneymarketCommonService.js

@@ -20,6 +20,7 @@ export const STABLE_ASSETS = [
     'DAI', 'USDC', 'USDT', 'TUSD', 'USDP', 'GUSD', 'BUSD', 'SUSD', 'FRAX', 'LUSD', 'USDC.e', 'GHO', 'sDAI', 'USDA',
     'USDe', 'sUSDe', 'USDS', 'sUSDS', 'USR', 'EURC', 'BOLD', 'BOLD Legacy', 'RLUSD', 'PT sUSDe July', 'PT eUSDe May',
     'USDtb', 'eUSDe', 'PT USDe July', 'PT eUSDe Aug', 'PT sUSDe Sep', 'PT USDe Sep', 'PT sUSDe Nov', 'PT USDe Nov', 'PT sUSDe Jan', 'PT USDe Jan',
+    'PT sUSDe Feb', 'PT USDe Feb',
 ];
 export const isLeveragedPos = (usedAssets, dustLimit = 5) => {
     let borrowUnstable = 0;

package/esm/staking/staking.js

@@ -66,6 +66,7 @@ export const STAKING_ASSETS = [
     'cbETH', 'wstETH', 'cbETH', 'rETH', 'sDAI', 'weETH', 'sUSDe', 'osETH',
     'ezETH', 'ETHx', 'rsETH', 'pufETH', 'wrsETH', 'wsuperOETHb', 'sUSDS', 'tETH', 'PT sUSDe Sep', 'PT USDe Sep',
     'PT sUSDe Nov', 'PT USDe Nov', 'PT USDe Jan', 'PT sUSDe Jan', 'wrsETH', 'wstETH', 'syrupUSDT', 'syrupUSDC', 'wstUSR',
+    'PT sUSDe Feb', 'PT USDe Feb',
 ];
 export const getStakingApy = memoize((asset_1, ...args_1) => __awaiter(void 0, [asset_1, ...args_1], void 0, function* (asset, network = NetworkNumber.Eth) {
     try {
@@ -125,6 +126,10 @@ export const getStakingApy = memoize((asset_1, ...args_1) => __awaiter(void 0, [
             return yield getApyFromDfsApi('syrupUSDC');
         if (asset === 'wstUSR')
             return yield getApyFromDfsApi('wstUSR');
+        if (asset === 'PT sUSDe Feb')
+            return yield getApyFromDfsApi('PT sUSDe Feb', network);
+        if (asset === 'PT USDe Feb')
+            return yield getApyFromDfsApi('PT USDe Feb', network);
     }
     catch (e) {
         console.error(`Failed to fetch APY for ${asset}`);

package/esm/types/index.d.ts

@@ -12,4 +12,3 @@ export * from './fluid';
 export * from './portfolio';
 export * from './merit';
 export * from './merkl';
-export * from './savings';

package/esm/types/index.js

@@ -12,4 +12,3 @@ export * from './fluid';
 export * from './portfolio';
 export * from './merit';
 export * from './merkl';
-export * from './savings';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/positions-sdk",
-  "version": "2.1.24-dev-savings-3",
+  "version": "2.1.25-dev-pt-feb-dev",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",
@@ -21,14 +21,13 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@defisaver/tokens": "^1.7.12",
+    "@defisaver/tokens": "1.7.13-dev-pt-feb-dev",
     "@types/lodash": "^4.17.15",
     "@types/memoizee": "^0.4.12",
     "decimal.js": "^10.6.0",
     "lodash": "^4.17.21",
     "memoizee": "^0.4.17",
-    "viem": "^2.37.9",
-    "graphql-request": "^1.8.2"
+    "viem": "^2.37.9"
   },
   "devDependencies": {
     "@defisaver/eslint-config": "^1.0.1",

package/src/config/contracts.ts

@@ -1257,26 +1257,4 @@ export const StkAAVE = {
       "address": "0x4da27a545c0c5B758a6BA100e3a049001de870f5",
     }
   }
-} as const;
-export const MorphoVault = {
-  "abi": [{"inputs":[],"name":"acceptTimelock","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"account","type":"address"}],"name":"balanceOf","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"shares","type":"uint256"}],"name":"convertToAssets","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"decimals","outputs":[{"internalType":"uint8","name":"","type":"uint8"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"DECIMALS_OFFSET","outputs":[{"internalType":"uint8","name":"","type":"uint8"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"shares","type":"uint256"}],"name":"previewRedeem","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"totalAssets","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"totalSupply","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"}],
-} as const;
-export const YearnVault = {
-  "abi": [{"stateMutability":"view","type":"function","name":"balanceOf","inputs":[{"name":"arg0","type":"address"}],"outputs":[{"name":"","type":"uint256"}],"gas":3923},{"stateMutability":"view","type":"function","name":"totalAssets","inputs":[],"outputs":[{"name":"","type":"uint256"}],"gas":8698},{"stateMutability":"view","type":"function","name":"totalSupply","inputs":[],"outputs":[{"name":"","type":"uint256"}],"gas":3768}]
-} as const;
-export const YearnView = {
-  "abi": [{"inputs":[{"internalType":"address","name":"_vault","type":"address"}],"name":"getPoolLiquidity","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"}],
-  "networks": {
-    "1": {
-      "address": "0x36314D468E1da48Fb637fFB7c7DBDF222eC3FFe7",
-    }
-  }
-} as const;
-export const MakerDsr = {
-  "abi": [{"constant":true,"inputs":[],"name":"chi","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"internalType":"address","name":"","type":"address"}],"name":"pie","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"Pie","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"}],
-  "networks": {
-    "1": {
-      "address": "0x197e90f9fad81970ba7976f33cbd77088e5d7cf7",
-    }
-  }
-}
+} as const;

package/src/contracts.ts

@@ -67,24 +67,6 @@ export const createViemContractFromConfigFunc = <TKey extends ConfigKey>(name: T
   });
 };
 
-export const getMorphoVaultContractViem = (client: Client, address: HexString) => {
-  const abi = getConfigContractAbi('MorphoVault') as typeof configRaw['MorphoVault']['abi'];
-  return getContract({
-    address,
-    abi,
-    client,
-  });
-};
-
-export const getYearnVaultContractViem = (client: Client, address: HexString) => {
-  const abi = getConfigContractAbi('YearnVault') as typeof configRaw['YearnVault']['abi'];
-  return getContract({
-    address,
-    abi,
-    client,
-  });
-};
-
 export const MorphoBlueViewContractViem = createViemContractFromConfigFunc('MorphoBlueView');
 export const AaveLoanInfoV2ContractViem = createViemContractFromConfigFunc('AaveLoanInfoV2');
 export const AaveV3ViewContractViem = createViemContractFromConfigFunc('AaveV3View');
@@ -136,8 +118,4 @@ export const SparkRewardsControllerViem = createViemContractFromConfigFunc('Spar
 
 export const AaveRewardsControllerViem = createViemContractFromConfigFunc('AaveRewardsController');
 export const LiquityV2sBoldVaultViem = createViemContractFromConfigFunc('LiquityV2sBoldVault');
-export const StkAAVEViem = createViemContractFromConfigFunc('StkAAVE');
-
-export const YearnViewContractViem = createViemContractFromConfigFunc('YearnView');
-
-export const MakerDsrContractViem = createViemContractFromConfigFunc('MakerDsr');
+export const StkAAVEViem = createViemContractFromConfigFunc('StkAAVE');

package/src/fluid/index.ts

@@ -1526,22 +1526,9 @@ export const getAllFluidMarketDataChunked = async (
 export const _getFluidTokenData = async (provider: Client, network: NetworkNumber, token: string) => {
   const view = FluidViewContractViem(provider, network);
   const fTokenAddress = getFTokenAddress(token, network);
-  const [
-    data,
-    rewardsApiResponse,
-  ] = await Promise.all([
-    await view.read.getFTokenData([fTokenAddress]),
-    fetch(`https://api.fluid.instadapp.io/v2/lending/${network}/tokens/${fTokenAddress}`),
-  ]);
-  let rewardsData = { rewards: [] } as any;
-  if (!rewardsApiResponse.ok) {
-    console.log('External API Failure: Failed to fetch fluid rewards APY');
-  } else {
-    rewardsData = await rewardsApiResponse.json();
-  }
-  const supplyRate = new Dec(rewardsData?.supplyRate || '0').div(100).toString();
-  const rewardRates = rewardsData?.rewards?.reduce((acc: Dec, item: any) => acc.add(new Dec(item.rate || '0').div(100)), new Dec(0)) || '0';
-  const stakeRate = new Dec(rewardsData?.asset?.stakingApr || '0').div(100).toString();
+  const data = await view.read.getFTokenData([fTokenAddress]);
+  const supplyRate = new Dec(data.supplyRate).div(100).toString();
+  const rewardsRate = new Dec(data.rewardsRate).div(1e12).toString();
   const decimals = data.decimals.toString();
 
   const depositRate = new Dec(getEthAmountForDecimals(data.convertToShares.toString(), decimals)).toString();
@@ -1553,7 +1540,7 @@ export const _getFluidTokenData = async (provider: Client, network: NetworkNumbe
     decimals,
     totalDeposited: getEthAmountForDecimals(data.totalAssets.toString(), decimals),
     withdrawable: getEthAmountForDecimals(data.withdrawable.toString(), decimals),
-    apy: new Dec(supplyRate).plus(rewardRates).plus(stakeRate).toString(),
+    apy: new Dec(supplyRate).add(rewardsRate).toString(),
     depositRate,
     withdrawRate,
   };

package/src/index.ts

@@ -20,7 +20,6 @@ import * as llamaLend from './llamaLend';
 import * as eulerV2 from './eulerV2';
 import * as portfolio from './portfolio';
 import * as claiming from './claiming';
-import * as savings from './savings';
 
 export * from './types';
 
@@ -45,5 +44,4 @@ export {
   fluid,
   portfolio,
   claiming,
-  savings,
 };

package/src/markets/aave/marketAssets.ts

@@ -10,7 +10,7 @@ export const aaveV2AssetsDefaultMarket = ['USDT', 'WBTC', 'ETH', 'YFI', 'ZRX', '
 
 export const aaveV3AssetsDefaultMarketEth = [
   'ETH', 'wstETH', 'WBTC', 'USDC', 'DAI', 'LINK', 'AAVE', 'cbETH', 'USDT', 'rETH', 'LUSD', 'CRV', 'MKR', 'SNX', 'BAL', 'UNI', 'LDO', 'ENS', '1INCH', 'FRAX', 'GHO', 'RPL', 'sDAI', 'STG', 'KNC', 'FXS', 'crvUSD', 'PYUSD', 'weETH', 'osETH', 'USDe', 'ETHx', 'sUSDe', 'tBTC', 'cbBTC', 'USDS', 'rsETH', 'LBTC', 'eBTC', 'RLUSD', 'PT eUSDe May', 'PT sUSDe July', 'USDtb',
-  'eUSDe', 'PT USDe July', 'PT eUSDe Aug', 'EURC', 'FBTC', 'PT sUSDe Sep', 'PT USDe Sep', 'tETH', 'ezETH', 'XAUt', 'PT sUSDe Nov', 'PT USDe Nov',
+  'eUSDe', 'PT USDe July', 'PT eUSDe Aug', 'EURC', 'FBTC', 'PT sUSDe Sep', 'PT USDe Sep', 'tETH', 'ezETH', 'XAUt', 'PT sUSDe Nov', 'PT USDe Nov', 'PT sUSDe Feb', 'PT USDe Feb',
 ];
 export const aaveV3AssetsDefaultMarketOpt = [
   'DAI', 'USDC.e', 'USDT', 'SUSD', 'AAVE', 'LINK', 'WBTC', 'ETH', 'OP', 'wstETH', 'LUSD', 'MAI', 'rETH', 'USDC',

package/src/moneymarket/moneymarketCommonService.ts

@@ -24,6 +24,7 @@ export const STABLE_ASSETS = [
   'DAI', 'USDC', 'USDT', 'TUSD', 'USDP', 'GUSD', 'BUSD', 'SUSD', 'FRAX', 'LUSD', 'USDC.e', 'GHO', 'sDAI', 'USDA',
   'USDe', 'sUSDe', 'USDS', 'sUSDS', 'USR', 'EURC', 'BOLD', 'BOLD Legacy', 'RLUSD', 'PT sUSDe July', 'PT eUSDe May',
   'USDtb', 'eUSDe', 'PT USDe July', 'PT eUSDe Aug', 'PT sUSDe Sep', 'PT USDe Sep', 'PT sUSDe Nov', 'PT USDe Nov', 'PT sUSDe Jan', 'PT USDe Jan',
+  'PT sUSDe Feb', 'PT USDe Feb',
 ];
 
 export const isLeveragedPos = (usedAssets: MMUsedAssets, dustLimit = 5) => {

package/src/staking/staking.ts

@@ -64,6 +64,7 @@ export const STAKING_ASSETS = [
   'cbETH', 'wstETH', 'cbETH', 'rETH', 'sDAI', 'weETH', 'sUSDe', 'osETH',
   'ezETH', 'ETHx', 'rsETH', 'pufETH', 'wrsETH', 'wsuperOETHb', 'sUSDS', 'tETH', 'PT sUSDe Sep', 'PT USDe Sep',
   'PT sUSDe Nov', 'PT USDe Nov', 'PT USDe Jan', 'PT sUSDe Jan', 'wrsETH', 'wstETH', 'syrupUSDT', 'syrupUSDC', 'wstUSR',
+  'PT sUSDe Feb', 'PT USDe Feb',
 ];
 
 export const getStakingApy = memoize(async (asset: string, network: number = NetworkNumber.Eth) => {
@@ -96,6 +97,8 @@ export const getStakingApy = memoize(async (asset: string, network: number = Net
     if (asset === 'syrupUSDT') return await getApyFromDfsApi('syrupUSDT');
     if (asset === 'syrupUSDC') return await getApyFromDfsApi('syrupUSDC');
     if (asset === 'wstUSR') return await getApyFromDfsApi('wstUSR');
+    if (asset === 'PT sUSDe Feb') return await getApyFromDfsApi('PT sUSDe Feb', network);
+    if (asset === 'PT USDe Feb') return await getApyFromDfsApi('PT USDe Feb', network);
   } catch (e) {
     console.error(`Failed to fetch APY for ${asset}`);
   }

package/src/types/index.ts

@@ -11,5 +11,4 @@ export * from './euler';
 export * from './fluid';
 export * from './portfolio';
 export * from './merit';
-export * from './merkl';
-export * from './savings';
+export * from './merkl';

package/cjs/savings/index.d.ts

@@ -1,7 +0,0 @@
-import { MakerDsrType, MorphoVaultType, YearnVaultType } from '../types';
-import { EthAddress, EthereumProvider, NetworkNumber } from '../types/common';
-import * as morphoVaults from './morphoVaults';
-import * as yearnVaults from './yearnVaults';
-import * as makerDsr from './makerDSR';
-export { morphoVaults, yearnVaults, makerDsr, };
-export declare const getSavingsData: (provider: EthereumProvider, network: NetworkNumber, accounts: EthAddress[]) => Promise<Partial<Record<MakerDsrType | MorphoVaultType | YearnVaultType, import("../types").SavingsVaultData>>>;

package/cjs/savings/index.js

@@ -1,75 +0,0 @@
-"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());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSavingsData = exports.makerDsr = exports.yearnVaults = exports.morphoVaults = void 0;
-const types_1 = require("../types");
-const morphoVaults = __importStar(require("./morphoVaults"));
-exports.morphoVaults = morphoVaults;
-const yearnVaults = __importStar(require("./yearnVaults"));
-exports.yearnVaults = yearnVaults;
-const makerDsr = __importStar(require("./makerDSR"));
-exports.makerDsr = makerDsr;
-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);
-    const savingsData = {};
-    yield Promise.all([
-        ...morphoVaultsList.map((vaultKey) => __awaiter(void 0, void 0, void 0, function* () {
-            const vault = morphoVaults.morphoVaultsOptions.getMorphoVault(vaultKey);
-            const data = yield morphoVaults.getMorphoVaultData(provider, network, vault, accounts);
-            savingsData[vaultKey] = data;
-        })),
-        ...yearnVaultsList.map((vaultKey) => __awaiter(void 0, void 0, void 0, function* () {
-            const vault = yearnVaults.yearnVaultsOptions.getYearnVault(vaultKey);
-            const data = yield yearnVaults.getYearnVaultData(provider, network, vault, accounts);
-            savingsData[vaultKey] = data;
-        })),
-        (() => __awaiter(void 0, void 0, void 0, function* () {
-            const data = yield makerDsr.getMakerDsrData(provider, network, accounts);
-            savingsData[types_1.MakerDsrType.MakerDsrVault] = data;
-        }))(),
-    ]);
-    return savingsData;
-});
-exports.getSavingsData = getSavingsData;

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

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

package/cjs/savings/makerDSR/index.js

@@ -1,94 +0,0 @@
-"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._getMakerDsrData = exports.makerDsrOptions = void 0;
-exports.getMakerDsrData = getMakerDsrData;
-const decimal_js_1 = __importDefault(require("decimal.js"));
-const viem_1 = require("../../services/viem");
-const types_1 = require("../../types");
-const makerDsrOptions = __importStar(require("./options"));
-exports.makerDsrOptions = makerDsrOptions;
-const contracts_1 = require("../../contracts");
-const _getMakerDsrData = (provider, network, accounts) => __awaiter(void 0, void 0, void 0, function* () {
-    const contract = (0, contracts_1.MakerDsrContractViem)(provider, network);
-    const pieAmounts = {};
-    const [Pie, chi] = yield Promise.all([
-        contract.read.Pie(),
-        contract.read.chi(),
-        ...accounts.map((account) => __awaiter(void 0, void 0, void 0, function* () {
-            const pieAmount = yield contract.read.pie([account]);
-            pieAmounts[account] = pieAmount;
-        })),
-    ]);
-    const totalSupplyRad = new decimal_js_1.default(Pie).mul(chi).toString();
-    const poolSize = new decimal_js_1.default(totalSupplyRad).div(1e45).toString();
-    const supplied = {};
-    accounts.forEach((account) => {
-        const pie = pieAmounts[account] || BigInt(0);
-        const radAmount = new decimal_js_1.default(pie).mul(chi).toString();
-        supplied[account.toLowerCase()] = new decimal_js_1.default(radAmount).div(1e45).toString();
-    });
-    return {
-        poolSize,
-        liquidity: poolSize,
-        supplied,
-        asset: 'DAI',
-        optionType: types_1.MakerDsrType.MakerDsrVault,
-    };
-});
-exports._getMakerDsrData = _getMakerDsrData;
-function getMakerDsrData(provider, network, accounts) {
-    return __awaiter(this, void 0, void 0, function* () {
-        return (0, exports._getMakerDsrData)((0, viem_1.getViemProvider)(provider, network, {
-            batch: {
-                multicall: {
-                    batchSize: 2500000,
-                },
-            },
-        }), network, accounts);
-    });
-}

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

@@ -1,2 +0,0 @@
-import { MakerDsrVault } from '../../types';
-export declare const MAKER_DSR_VAULT: MakerDsrVault;

package/cjs/savings/makerDSR/options.js

@@ -1,11 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MAKER_DSR_VAULT = void 0;
-const types_1 = require("../../types");
-exports.MAKER_DSR_VAULT = {
-    type: types_1.MakerDsrType.MakerDsrVault,
-    name: 'Maker DSR',
-    address: '0x197e90f9fad81970ba7976f33cbd77088e5d7cf7',
-    asset: 'DAI',
-    deploymentBlock: 8928160,
-};

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

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