@defisaver/positions-sdk 2.1.35 → 2.1.36

package/src/savings/sparkSavingsVaults/index.ts

@@ -1,61 +1,61 @@
-import { Client } from 'viem';
-import Dec from 'decimal.js';
-import { assetAmountInEth, getAssetInfo } from '@defisaver/tokens';
-import { SavingsVaultData, SparkSavingsVault } from '../../types';
-import { EthAddress, EthereumProvider, NetworkNumber } from '../../types/common';
-import * as sparkSavingsVaultsOptions from './options';
-import { getViemProvider } from '../../services/viem';
-import { getErc20ContractViem, getSparkSavingsVaultContractViem } from '../../contracts';
-
-export {
-  sparkSavingsVaultsOptions,
-};
-
-export const _getSparkSavingsVaultData = async (provider: Client, network: NetworkNumber, sparkSavingsVault: SparkSavingsVault, accounts: EthAddress[]): Promise<SavingsVaultData> => {
-  const sparkSavingsVaultContract = getSparkSavingsVaultContractViem(provider, sparkSavingsVault.address);
-  const underlyingAssetContract = getErc20ContractViem(provider, getAssetInfo(sparkSavingsVault.asset, network).address as EthAddress);
-
-  const shares: Record<EthAddress, bigint> = {};
-
-  const [totalAssets, decimals, nowChi, RAY, liquidityWei] = await Promise.all([
-    sparkSavingsVaultContract.read.totalAssets(),
-    sparkSavingsVaultContract.read.decimals(),
-    sparkSavingsVaultContract.read.nowChi(),
-    sparkSavingsVaultContract.read.RAY(),
-    underlyingAssetContract.read.balanceOf([sparkSavingsVault.address]),
-    ...accounts.map(async (account) => {
-      const share = await sparkSavingsVaultContract.read.balanceOf([account]);
-      shares[account] = share;
-    }),
-  ]);
-
-  const poolSize = assetAmountInEth(totalAssets.toString(), sparkSavingsVault.asset);
-  const liquidity = assetAmountInEth(liquidityWei.toString(), sparkSavingsVault.asset);
-
-  const supplied: Record<EthAddress, string> = {};
-  accounts.forEach((account) => {
-    const share = shares[account] || BigInt(0);
-    supplied[account.toLowerCase() as EthAddress] = assetAmountInEth(
-      new Dec(share).mul(nowChi).div(RAY).toFixed(0)
-        .toString(), sparkSavingsVault.asset,
-    );
-  });
-
-  return {
-    poolSize,
-    supplied,
-    liquidity,
-    asset: sparkSavingsVault.asset,
-    optionType: sparkSavingsVault.type,
-  };
-};
-
-export async function getSparkSavingsVaultData(provider: EthereumProvider, network: NetworkNumber, sparkSavingsVault: SparkSavingsVault, accounts: EthAddress[]): Promise<SavingsVaultData> {
-  return _getSparkSavingsVaultData(getViemProvider(provider, network, {
-    batch: {
-      multicall: {
-        batchSize: 2500000,
-      },
-    },
-  }), network, sparkSavingsVault, accounts);
+import { Client } from 'viem';
+import Dec from 'decimal.js';
+import { assetAmountInEth, getAssetInfo } from '@defisaver/tokens';
+import { SavingsVaultData, SparkSavingsVault } from '../../types';
+import { EthAddress, EthereumProvider, NetworkNumber } from '../../types/common';
+import * as sparkSavingsVaultsOptions from './options';
+import { getViemProvider } from '../../services/viem';
+import { getErc20ContractViem, getSparkSavingsVaultContractViem } from '../../contracts';
+
+export {
+  sparkSavingsVaultsOptions,
+};
+
+export const _getSparkSavingsVaultData = async (provider: Client, network: NetworkNumber, sparkSavingsVault: SparkSavingsVault, accounts: EthAddress[]): Promise<SavingsVaultData> => {
+  const sparkSavingsVaultContract = getSparkSavingsVaultContractViem(provider, sparkSavingsVault.address);
+  const underlyingAssetContract = getErc20ContractViem(provider, getAssetInfo(sparkSavingsVault.asset, network).address as EthAddress);
+
+  const shares: Record<EthAddress, bigint> = {};
+
+  const [totalAssets, decimals, nowChi, RAY, liquidityWei] = await Promise.all([
+    sparkSavingsVaultContract.read.totalAssets(),
+    sparkSavingsVaultContract.read.decimals(),
+    sparkSavingsVaultContract.read.nowChi(),
+    sparkSavingsVaultContract.read.RAY(),
+    underlyingAssetContract.read.balanceOf([sparkSavingsVault.address]),
+    ...accounts.map(async (account) => {
+      const share = await sparkSavingsVaultContract.read.balanceOf([account]);
+      shares[account] = share;
+    }),
+  ]);
+
+  const poolSize = assetAmountInEth(totalAssets.toString(), sparkSavingsVault.asset);
+  const liquidity = assetAmountInEth(liquidityWei.toString(), sparkSavingsVault.asset);
+
+  const supplied: Record<EthAddress, string> = {};
+  accounts.forEach((account) => {
+    const share = shares[account] || BigInt(0);
+    supplied[account.toLowerCase() as EthAddress] = assetAmountInEth(
+      new Dec(share).mul(nowChi).div(RAY).toFixed(0)
+        .toString(), sparkSavingsVault.asset,
+    );
+  });
+
+  return {
+    poolSize,
+    supplied,
+    liquidity,
+    asset: sparkSavingsVault.asset,
+    optionType: sparkSavingsVault.type,
+  };
+};
+
+export async function getSparkSavingsVaultData(provider: EthereumProvider, network: NetworkNumber, sparkSavingsVault: SparkSavingsVault, accounts: EthAddress[]): Promise<SavingsVaultData> {
+  return _getSparkSavingsVaultData(getViemProvider(provider, network, {
+    batch: {
+      multicall: {
+        batchSize: 2500000,
+      },
+    },
+  }), network, sparkSavingsVault, accounts);
 }

package/src/savings/sparkSavingsVaults/options.ts

@@ -1,36 +1,36 @@
-import { SparkSavingsVault, SparkSavingsVaultType } from '../../types';
-
-export const SPARK_SAVINGS_VAULT_USDC: SparkSavingsVault = {
-  type: SparkSavingsVaultType.SparkSavingsUSDC,
-  name: 'Spark Savings USDC',
-  address: '0x28B3a8fb53B741A8Fd78c0fb9A6B2393d896a43d',
-  asset: 'USDC',
-  deploymentBlock: 23484422,
-  isLegacy: false,
-};
-
-export const SPARK_SAVINGS_VAULT_USDT: SparkSavingsVault = {
-  type: SparkSavingsVaultType.SparkSavingsUSDT,
-  name: 'Spark Savings USDT',
-  address: '0xe2e7a17dFf93280dec073C995595155283e3C372',
-  asset: 'USDT',
-  deploymentBlock: 23484439,
-  isLegacy: false,
-};
-
-export const SPARK_SAVINGS_VAULT_WETH: SparkSavingsVault = {
-  type: SparkSavingsVaultType.SparkSavingsETH,
-  name: 'Spark Savings WETH',
-  address: '0xfE6eb3b609a7C8352A241f7F3A21CEA4e9209B8f',
-  asset: 'WETH',
-  deploymentBlock: 23484474,
-  isLegacy: false,
-};
-
-export const SPARK_SAVINGS_VAULTS: Record<SparkSavingsVaultType, SparkSavingsVault> = {
-  [SparkSavingsVaultType.SparkSavingsUSDC]: SPARK_SAVINGS_VAULT_USDC,
-  [SparkSavingsVaultType.SparkSavingsUSDT]: SPARK_SAVINGS_VAULT_USDT,
-  [SparkSavingsVaultType.SparkSavingsETH]: SPARK_SAVINGS_VAULT_WETH,
-};
-
+import { SparkSavingsVault, SparkSavingsVaultType } from '../../types';
+
+export const SPARK_SAVINGS_VAULT_USDC: SparkSavingsVault = {
+  type: SparkSavingsVaultType.SparkSavingsUSDC,
+  name: 'Spark Savings USDC',
+  address: '0x28B3a8fb53B741A8Fd78c0fb9A6B2393d896a43d',
+  asset: 'USDC',
+  deploymentBlock: 23484422,
+  isLegacy: false,
+};
+
+export const SPARK_SAVINGS_VAULT_USDT: SparkSavingsVault = {
+  type: SparkSavingsVaultType.SparkSavingsUSDT,
+  name: 'Spark Savings USDT',
+  address: '0xe2e7a17dFf93280dec073C995595155283e3C372',
+  asset: 'USDT',
+  deploymentBlock: 23484439,
+  isLegacy: false,
+};
+
+export const SPARK_SAVINGS_VAULT_WETH: SparkSavingsVault = {
+  type: SparkSavingsVaultType.SparkSavingsETH,
+  name: 'Spark Savings WETH',
+  address: '0xfE6eb3b609a7C8352A241f7F3A21CEA4e9209B8f',
+  asset: 'WETH',
+  deploymentBlock: 23484474,
+  isLegacy: false,
+};
+
+export const SPARK_SAVINGS_VAULTS: Record<SparkSavingsVaultType, SparkSavingsVault> = {
+  [SparkSavingsVaultType.SparkSavingsUSDC]: SPARK_SAVINGS_VAULT_USDC,
+  [SparkSavingsVaultType.SparkSavingsUSDT]: SPARK_SAVINGS_VAULT_USDT,
+  [SparkSavingsVaultType.SparkSavingsETH]: SPARK_SAVINGS_VAULT_WETH,
+};
+
 export const getSparkSavingsVault = (type: SparkSavingsVaultType): SparkSavingsVault => SPARK_SAVINGS_VAULTS[type];

package/src/savings/yearnVaults/index.ts

@@ -1,74 +1,74 @@
-import Dec from 'decimal.js';
-import { Client } from 'viem';
-import { assetAmountInEth } from '@defisaver/tokens';
-import { getViemProvider } from '../../services/viem';
-import { SavingsVaultData, YearnVault } from '../../types';
-import { EthAddress, EthereumProvider, NetworkNumber } from '../../types/common';
-import * as yearnVaultsOptions from './options';
-import { getYearnVaultContractViem, YearnViewContractViem } from '../../contracts';
-
-export {
-  yearnVaultsOptions,
-};
-
-export const _getYearnVaultData = async (provider: Client, network: NetworkNumber, yearnVault: YearnVault, accounts: EthAddress[]): Promise<SavingsVaultData> => {
-  const yearnVaultContract = getYearnVaultContractViem(provider, yearnVault.address);
-  const viewContract = YearnViewContractViem(provider, network);
-
-  const yvAmountsWei: Record<EthAddress, bigint> = {};
-
-  const [tokenSupply, underlyingSupply, poolLiquidity] = await Promise.all([
-    yearnVaultContract.read.totalSupply(),
-    yearnVaultContract.read.totalAssets(),
-    viewContract.read.getPoolLiquidity([yearnVault.address]),
-    ...accounts.map(async (account) => {
-      const yvAmount = await yearnVaultContract.read.balanceOf([account]);
-      yvAmountsWei[account] = yvAmount;
-    }),
-  ]);
-
-  const exchangeRate = new Dec(underlyingSupply).div(tokenSupply).toString();
-  const poolSize = assetAmountInEth(underlyingSupply.toString(), yearnVault.asset);
-  const liquidity = assetAmountInEth(poolLiquidity.toString(), yearnVault.asset);
-
-  const supplied: Record<EthAddress, string> = {};
-  accounts.forEach((account) => {
-    const yvAmountWei = yvAmountsWei[account] || BigInt(0);
-    const underlyingAmountWei = new Dec(yvAmountWei).mul(exchangeRate).toString();
-    supplied[account.toLowerCase() as EthAddress] = assetAmountInEth(underlyingAmountWei, yearnVault.asset);
-  });
-
-  return {
-    poolSize,
-    liquidity,
-    supplied,
-    asset: yearnVault.asset,
-    optionType: yearnVault.type,
-  };
-};
-
-export async function getYearnVaultData(provider: EthereumProvider, network: NetworkNumber, yearnVault: YearnVault, accounts: EthAddress[]): Promise<SavingsVaultData> {
-  return _getYearnVaultData(getViemProvider(provider, network, {
-    batch: {
-      multicall: {
-        batchSize: 2500000,
-      },
-    },
-  }), network, yearnVault, accounts);
-}
-
-export const _getYearnVaultExchangeRate = async (provider: Client, yearnVault: YearnVault): Promise<string> => {
-  const yearnVaultContract = getYearnVaultContractViem(provider, yearnVault.address);
-
-  const [tokenSupply, underlyingSupply] = await Promise.all([
-    yearnVaultContract.read.totalSupply(),
-    yearnVaultContract.read.totalAssets(),
-  ]);
-
-  const exchangeRate = new Dec(underlyingSupply).div(tokenSupply).toString();
-  return exchangeRate;
-};
-
-export async function getYearnVaultExchangeRate(provider: EthereumProvider, network: NetworkNumber, yearnVault: YearnVault): Promise<string> {
-  return _getYearnVaultExchangeRate(getViemProvider(provider, network), yearnVault);
+import Dec from 'decimal.js';
+import { Client } from 'viem';
+import { assetAmountInEth } from '@defisaver/tokens';
+import { getViemProvider } from '../../services/viem';
+import { SavingsVaultData, YearnVault } from '../../types';
+import { EthAddress, EthereumProvider, NetworkNumber } from '../../types/common';
+import * as yearnVaultsOptions from './options';
+import { getYearnVaultContractViem, YearnViewContractViem } from '../../contracts';
+
+export {
+  yearnVaultsOptions,
+};
+
+export const _getYearnVaultData = async (provider: Client, network: NetworkNumber, yearnVault: YearnVault, accounts: EthAddress[]): Promise<SavingsVaultData> => {
+  const yearnVaultContract = getYearnVaultContractViem(provider, yearnVault.address);
+  const viewContract = YearnViewContractViem(provider, network);
+
+  const yvAmountsWei: Record<EthAddress, bigint> = {};
+
+  const [tokenSupply, underlyingSupply, poolLiquidity] = await Promise.all([
+    yearnVaultContract.read.totalSupply(),
+    yearnVaultContract.read.totalAssets(),
+    viewContract.read.getPoolLiquidity([yearnVault.address]),
+    ...accounts.map(async (account) => {
+      const yvAmount = await yearnVaultContract.read.balanceOf([account]);
+      yvAmountsWei[account] = yvAmount;
+    }),
+  ]);
+
+  const exchangeRate = new Dec(underlyingSupply).div(tokenSupply).toString();
+  const poolSize = assetAmountInEth(underlyingSupply.toString(), yearnVault.asset);
+  const liquidity = assetAmountInEth(poolLiquidity.toString(), yearnVault.asset);
+
+  const supplied: Record<EthAddress, string> = {};
+  accounts.forEach((account) => {
+    const yvAmountWei = yvAmountsWei[account] || BigInt(0);
+    const underlyingAmountWei = new Dec(yvAmountWei).mul(exchangeRate).toString();
+    supplied[account.toLowerCase() as EthAddress] = assetAmountInEth(underlyingAmountWei, yearnVault.asset);
+  });
+
+  return {
+    poolSize,
+    liquidity,
+    supplied,
+    asset: yearnVault.asset,
+    optionType: yearnVault.type,
+  };
+};
+
+export async function getYearnVaultData(provider: EthereumProvider, network: NetworkNumber, yearnVault: YearnVault, accounts: EthAddress[]): Promise<SavingsVaultData> {
+  return _getYearnVaultData(getViemProvider(provider, network, {
+    batch: {
+      multicall: {
+        batchSize: 2500000,
+      },
+    },
+  }), network, yearnVault, accounts);
+}
+
+export const _getYearnVaultExchangeRate = async (provider: Client, yearnVault: YearnVault): Promise<string> => {
+  const yearnVaultContract = getYearnVaultContractViem(provider, yearnVault.address);
+
+  const [tokenSupply, underlyingSupply] = await Promise.all([
+    yearnVaultContract.read.totalSupply(),
+    yearnVaultContract.read.totalAssets(),
+  ]);
+
+  const exchangeRate = new Dec(underlyingSupply).div(tokenSupply).toString();
+  return exchangeRate;
+};
+
+export async function getYearnVaultExchangeRate(provider: EthereumProvider, network: NetworkNumber, yearnVault: YearnVault): Promise<string> {
+  return _getYearnVaultExchangeRate(getViemProvider(provider, network), yearnVault);
 }

package/src/savings/yearnVaults/options.ts

@@ -1,33 +1,33 @@
-import { YearnVault, YearnVaultType } from '../../types/savings/yearnVaults';
-
-export const YEARN_VAULT_DAI: YearnVault = {
-  type: YearnVaultType.YearnVaultDAI,
-  address: '0xdA816459F1AB5631232FE5e97a05BBBb94970c95',
-  asset: 'DAI',
-  deploymentBlock: 12796965,
-  isLegacy: false,
-};
-
-export const YEARN_VAULT_USDC: YearnVault = {
-  type: YearnVaultType.YearnVaultUSDC,
-  address: '0xa354F35829Ae975e850e23e9615b11Da1B3dC4DE',
-  asset: 'USDC',
-  deploymentBlock: 13513457,
-  isLegacy: false,
-};
-
-export const YEARN_VAULT_USDT: YearnVault = {
-  type: YearnVaultType.YearnVaultUSDT,
-  address: '0x3B27F92C0e212C671EA351827EDF93DB27cc0c65',
-  asset: 'USDT',
-  deploymentBlock: 14980240,
-  isLegacy: false,
-};
-
-export const YEARN_VAULTS: Record<YearnVaultType, YearnVault> = {
-  [YearnVaultType.YearnVaultDAI]: YEARN_VAULT_DAI,
-  [YearnVaultType.YearnVaultUSDC]: YEARN_VAULT_USDC,
-  [YearnVaultType.YearnVaultUSDT]: YEARN_VAULT_USDT,
-};
-
+import { YearnVault, YearnVaultType } from '../../types/savings/yearnVaults';
+
+export const YEARN_VAULT_DAI: YearnVault = {
+  type: YearnVaultType.YearnVaultDAI,
+  address: '0xdA816459F1AB5631232FE5e97a05BBBb94970c95',
+  asset: 'DAI',
+  deploymentBlock: 12796965,
+  isLegacy: false,
+};
+
+export const YEARN_VAULT_USDC: YearnVault = {
+  type: YearnVaultType.YearnVaultUSDC,
+  address: '0xa354F35829Ae975e850e23e9615b11Da1B3dC4DE',
+  asset: 'USDC',
+  deploymentBlock: 13513457,
+  isLegacy: false,
+};
+
+export const YEARN_VAULT_USDT: YearnVault = {
+  type: YearnVaultType.YearnVaultUSDT,
+  address: '0x3B27F92C0e212C671EA351827EDF93DB27cc0c65',
+  asset: 'USDT',
+  deploymentBlock: 14980240,
+  isLegacy: false,
+};
+
+export const YEARN_VAULTS: Record<YearnVaultType, YearnVault> = {
+  [YearnVaultType.YearnVaultDAI]: YEARN_VAULT_DAI,
+  [YearnVaultType.YearnVaultUSDC]: YEARN_VAULT_USDC,
+  [YearnVaultType.YearnVaultUSDT]: YEARN_VAULT_USDT,
+};
+
 export const getYearnVault = (type: YearnVaultType): YearnVault => YEARN_VAULTS[type];