@defisaver/positions-sdk 2.1.49-aave-v4-dev-1-dev → 2.1.49-aave-v4-dev-2

package/src/savings/index.ts

@@ -1,95 +1,95 @@
-import {
-  MakerDsrType,
-  MorphoVaultType,
-  SavingsData,
-  SkySavingsType,
-  SparkSavingsVaultType,
-  YearnV3VaultType,
-  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';
-import * as skyOptions from './skyOptions';
-import * as sparkSavingsVaults from './sparkSavingsVaults';
-import * as yearnV3Vaults from './yearnV3Vaults';
-
-export {
-  morphoVaults,
-  yearnVaults,
-  makerDsr,
-  skyOptions,
-  sparkSavingsVaults,
-  yearnV3Vaults,
-};
-
-export const getSavingsData = async (
-  provider: EthereumProvider,
-  network: NetworkNumber,
-  accounts: EthAddress[],
-) => {
-  const morphoVaultsList = Object.keys(morphoVaults.morphoVaultsOptions.MORPHO_VAULTS) as MorphoVaultType[];
-  const yearnVaultsList = Object.keys(yearnVaults.yearnVaultsOptions.YEARN_VAULTS) as YearnVaultType[];
-  const sparkSavingsVaultsList = Object.keys(sparkSavingsVaults.sparkSavingsVaultsOptions.SPARK_SAVINGS_VAULTS) as SparkSavingsVaultType[];
-  const yearnV3VaultsList = Object.keys(yearnV3Vaults.yearnV3VaultsOptions.YEARN_V3_VAULTS) as YearnV3VaultType[];
-
-  const savingsData: SavingsData = {};
-
-  await Promise.all([
-    ...morphoVaultsList.map(async (vaultKey) => {
-      try {
-        const vault = morphoVaults.morphoVaultsOptions.getMorphoVault(vaultKey);
-        const data = await morphoVaults.getMorphoVaultData(provider, network, vault, accounts);
-        savingsData[vaultKey] = data;
-      } catch (err) {
-        console.error(`[getSavingsData] Error fetching morpho vault ${vaultKey}:`, err);
-      }
-    }),
-    ...yearnVaultsList.map(async (vaultKey) => {
-      try {
-        const vault = yearnVaults.yearnVaultsOptions.getYearnVault(vaultKey);
-        const data = await yearnVaults.getYearnVaultData(provider, network, vault, accounts);
-        savingsData[vaultKey] = data;
-      } catch (err) {
-        console.error(`[getSavingsData] Error fetching yearn vault ${vaultKey}:`, err);
-      }
-    }),
-    ...sparkSavingsVaultsList.map(async (vaultKey) => {
-      try {
-        const vault = sparkSavingsVaults.sparkSavingsVaultsOptions.getSparkSavingsVault(vaultKey);
-        const data = await sparkSavingsVaults.getSparkSavingsVaultData(provider, network, vault, accounts);
-        savingsData[vaultKey] = data;
-      } catch (err) {
-        console.error(`[getSavingsData] Error fetching yearn vault ${vaultKey}:`, err);
-      }
-    }),
-    ...yearnV3VaultsList.map(async (vaultKey) => {
-      try {
-        const vault = yearnV3Vaults.yearnV3VaultsOptions.getYearnV3Vault(vaultKey);
-        const data = await yearnV3Vaults.getYearnV3VaultData(provider, network, vault, accounts);
-        savingsData[vaultKey] = data;
-      } catch (err) {
-        console.error(`[getSavingsData] Error fetching yearn vault ${vaultKey}:`, err);
-      }
-    }),
-    (async () => {
-      try {
-        const data = await makerDsr.getMakerDsrData(provider, network, accounts);
-        savingsData[MakerDsrType.MakerDsrVault] = data;
-      } catch (err) {
-        console.error('[getSavingsData] Error fetching maker DSR data:', err);
-      }
-    })(),
-    (async () => {
-      try {
-        const data = await skyOptions.getSkyOptionData(provider, network, accounts);
-        savingsData[SkySavingsType.SkySavings] = data;
-      } catch (err) {
-        console.error('[getSavingsData] Error fetching Sky savings data:', err);
-      }
-    })(),
-  ]);
-
-  return savingsData;
-};
+import {
+  MakerDsrType,
+  MorphoVaultType,
+  SavingsData,
+  SkySavingsType,
+  SparkSavingsVaultType,
+  YearnV3VaultType,
+  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';
+import * as skyOptions from './skyOptions';
+import * as sparkSavingsVaults from './sparkSavingsVaults';
+import * as yearnV3Vaults from './yearnV3Vaults';
+
+export {
+  morphoVaults,
+  yearnVaults,
+  makerDsr,
+  skyOptions,
+  sparkSavingsVaults,
+  yearnV3Vaults,
+};
+
+export const getSavingsData = async (
+  provider: EthereumProvider,
+  network: NetworkNumber,
+  accounts: EthAddress[],
+) => {
+  const morphoVaultsList = Object.keys(morphoVaults.morphoVaultsOptions.MORPHO_VAULTS) as MorphoVaultType[];
+  const yearnVaultsList = Object.keys(yearnVaults.yearnVaultsOptions.YEARN_VAULTS) as YearnVaultType[];
+  const sparkSavingsVaultsList = Object.keys(sparkSavingsVaults.sparkSavingsVaultsOptions.SPARK_SAVINGS_VAULTS) as SparkSavingsVaultType[];
+  const yearnV3VaultsList = Object.keys(yearnV3Vaults.yearnV3VaultsOptions.YEARN_V3_VAULTS) as YearnV3VaultType[];
+
+  const savingsData: SavingsData = {};
+
+  await Promise.all([
+    ...morphoVaultsList.map(async (vaultKey) => {
+      try {
+        const vault = morphoVaults.morphoVaultsOptions.getMorphoVault(vaultKey);
+        const data = await morphoVaults.getMorphoVaultData(provider, network, vault, accounts);
+        savingsData[vaultKey] = data;
+      } catch (err) {
+        console.error(`[getSavingsData] Error fetching morpho vault ${vaultKey}:`, err);
+      }
+    }),
+    ...yearnVaultsList.map(async (vaultKey) => {
+      try {
+        const vault = yearnVaults.yearnVaultsOptions.getYearnVault(vaultKey);
+        const data = await yearnVaults.getYearnVaultData(provider, network, vault, accounts);
+        savingsData[vaultKey] = data;
+      } catch (err) {
+        console.error(`[getSavingsData] Error fetching yearn vault ${vaultKey}:`, err);
+      }
+    }),
+    ...sparkSavingsVaultsList.map(async (vaultKey) => {
+      try {
+        const vault = sparkSavingsVaults.sparkSavingsVaultsOptions.getSparkSavingsVault(vaultKey);
+        const data = await sparkSavingsVaults.getSparkSavingsVaultData(provider, network, vault, accounts);
+        savingsData[vaultKey] = data;
+      } catch (err) {
+        console.error(`[getSavingsData] Error fetching yearn vault ${vaultKey}:`, err);
+      }
+    }),
+    ...yearnV3VaultsList.map(async (vaultKey) => {
+      try {
+        const vault = yearnV3Vaults.yearnV3VaultsOptions.getYearnV3Vault(vaultKey);
+        const data = await yearnV3Vaults.getYearnV3VaultData(provider, network, vault, accounts);
+        savingsData[vaultKey] = data;
+      } catch (err) {
+        console.error(`[getSavingsData] Error fetching yearn vault ${vaultKey}:`, err);
+      }
+    }),
+    (async () => {
+      try {
+        const data = await makerDsr.getMakerDsrData(provider, network, accounts);
+        savingsData[MakerDsrType.MakerDsrVault] = data;
+      } catch (err) {
+        console.error('[getSavingsData] Error fetching maker DSR data:', err);
+      }
+    })(),
+    (async () => {
+      try {
+        const data = await skyOptions.getSkyOptionData(provider, network, accounts);
+        savingsData[SkySavingsType.SkySavings] = data;
+      } catch (err) {
+        console.error('[getSavingsData] Error fetching Sky savings data:', err);
+      }
+    })(),
+  ]);
+
+  return savingsData;
+};

package/src/savings/makerDsr/index.ts

@@ -1,54 +1,54 @@
-import { Client } from 'viem';
-import Dec from 'decimal.js';
-import { getViemProvider } from '../../services/viem';
-import { MakerDsrType, SavingsVaultData } from '../../types';
-import { EthAddress, EthereumProvider, NetworkNumber } from '../../types/common';
-import * as makerDsrOptions from './options';
-import { MakerDsrContractViem } from '../../contracts';
-
-export {
-  makerDsrOptions,
-};
-
-export const _getMakerDsrData = async (provider: Client, network: NetworkNumber, accounts: EthAddress[]): Promise<SavingsVaultData> => {
-  const contract = MakerDsrContractViem(provider, network);
-
-  const pieAmounts: Record<EthAddress, bigint> = {};
-
-  const [Pie, chi] = await Promise.all([
-    contract.read.Pie(),
-    contract.read.chi(),
-    ...accounts.map(async (account) => {
-      const pieAmount = await contract.read.pie([account]) as bigint;
-      pieAmounts[account] = pieAmount;
-    }),
-  ]);
-
-  const totalSupplyRad = new Dec(Pie as bigint).mul(chi as bigint).toString();
-  const poolSize = new Dec(totalSupplyRad).div(1e45).toString();
-
-  const supplied: Record<EthAddress, string> = {};
-  accounts.forEach((account) => {
-    const pie = pieAmounts[account] || BigInt(0);
-    const radAmount = new Dec(pie).mul(chi as bigint).toString();
-    supplied[account.toLowerCase() as EthAddress] = new Dec(radAmount).div(1e45).toString();
-  });
-
-  return {
-    poolSize,
-    liquidity: poolSize,
-    supplied,
-    asset: 'DAI',
-    optionType: MakerDsrType.MakerDsrVault,
-  };
-};
-
-export async function getMakerDsrData(provider: EthereumProvider, network: NetworkNumber, accounts: EthAddress[]): Promise<SavingsVaultData> {
-  return _getMakerDsrData(getViemProvider(provider, network, {
-    batch: {
-      multicall: {
-        batchSize: 2500000,
-      },
-    },
-  }), network, accounts);
+import { Client } from 'viem';
+import Dec from 'decimal.js';
+import { getViemProvider } from '../../services/viem';
+import { MakerDsrType, SavingsVaultData } from '../../types';
+import { EthAddress, EthereumProvider, NetworkNumber } from '../../types/common';
+import * as makerDsrOptions from './options';
+import { MakerDsrContractViem } from '../../contracts';
+
+export {
+  makerDsrOptions,
+};
+
+export const _getMakerDsrData = async (provider: Client, network: NetworkNumber, accounts: EthAddress[]): Promise<SavingsVaultData> => {
+  const contract = MakerDsrContractViem(provider, network);
+
+  const pieAmounts: Record<EthAddress, bigint> = {};
+
+  const [Pie, chi] = await Promise.all([
+    contract.read.Pie(),
+    contract.read.chi(),
+    ...accounts.map(async (account) => {
+      const pieAmount = await contract.read.pie([account]) as bigint;
+      pieAmounts[account] = pieAmount;
+    }),
+  ]);
+
+  const totalSupplyRad = new Dec(Pie as bigint).mul(chi as bigint).toString();
+  const poolSize = new Dec(totalSupplyRad).div(1e45).toString();
+
+  const supplied: Record<EthAddress, string> = {};
+  accounts.forEach((account) => {
+    const pie = pieAmounts[account] || BigInt(0);
+    const radAmount = new Dec(pie).mul(chi as bigint).toString();
+    supplied[account.toLowerCase() as EthAddress] = new Dec(radAmount).div(1e45).toString();
+  });
+
+  return {
+    poolSize,
+    liquidity: poolSize,
+    supplied,
+    asset: 'DAI',
+    optionType: MakerDsrType.MakerDsrVault,
+  };
+};
+
+export async function getMakerDsrData(provider: EthereumProvider, network: NetworkNumber, accounts: EthAddress[]): Promise<SavingsVaultData> {
+  return _getMakerDsrData(getViemProvider(provider, network, {
+    batch: {
+      multicall: {
+        batchSize: 2500000,
+      },
+    },
+  }), network, accounts);
 }

package/src/savings/makerDsr/options.ts

@@ -1,10 +1,10 @@
-import { MakerDsrType, MakerDsrVault } from '../../types';
-
-export const MAKER_DSR_VAULT: MakerDsrVault = {
-  type: MakerDsrType.MakerDsrVault,
-  name: 'Maker DSR',
-  address: '0x197e90f9fad81970ba7976f33cbd77088e5d7cf7',
-  asset: 'DAI',
-  deploymentBlock: 8928160,
-  isLegacy: true,
+import { MakerDsrType, MakerDsrVault } from '../../types';
+
+export const MAKER_DSR_VAULT: MakerDsrVault = {
+  type: MakerDsrType.MakerDsrVault,
+  name: 'Maker DSR',
+  address: '0x197e90f9fad81970ba7976f33cbd77088e5d7cf7',
+  asset: 'DAI',
+  deploymentBlock: 8928160,
+  isLegacy: true,
 };

package/src/savings/morphoVaults/index.ts

@@ -1,81 +1,81 @@
-import { Client } from 'viem';
-import Dec from 'decimal.js';
-import { request as graphqlRequest } from 'graphql-request';
-import { assetAmountInEth } from '@defisaver/tokens';
-import * as morphoVaultsOptions from './options';
-import { EthAddress, EthereumProvider, NetworkNumber } from '../../types/common';
-import { getViemProvider } from '../../services/viem';
-import { getMorphoVaultContractViem } from '../../contracts';
-import { MorphoVault, SavingsVaultData } from '../../types';
-
-export {
-  morphoVaultsOptions,
-};
-
-const vaultDataQuery = (vaultAddress: EthAddress) => `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 = async (provider: Client, network: NetworkNumber, morphoVault: MorphoVault, accounts: EthAddress[]): Promise<SavingsVaultData> => {
-  const morphoVaultContract = getMorphoVaultContractViem(provider, morphoVault.address);
-
-  const shares: Record<EthAddress, bigint> = {};
-
-  const [totalAssets, totalSupply, decimals, decimalsOffset, vaultData] = await Promise.all([
-    morphoVaultContract.read.totalAssets(),
-    morphoVaultContract.read.totalSupply(),
-    morphoVaultContract.read.decimals(),
-    morphoVaultContract.read.DECIMALS_OFFSET(),
-    graphqlRequest(MORPHO_BLUE_API, vaultDataQuery(morphoVault.address)),
-    ...accounts.map(async (account) => {
-      const share = await morphoVaultContract.read.balanceOf([account]);
-      shares[account] = share;
-    }),
-  ]);
-
-  const poolSize = assetAmountInEth(totalAssets.toString(), morphoVault.asset);
-  const liquidity = assetAmountInEth((vaultData as any).vaultByAddress.liquidity.underlying, morphoVault.asset);
-
-  const supplied: Record<EthAddress, string> = {};
-  accounts.forEach((account) => {
-    const share = shares[account] || BigInt(0);
-    supplied[account.toLowerCase() as EthAddress] = new Dec(new Dec(share.toString()).mul(new Dec(totalAssets.toString()).add(1)).div(new Dec(totalSupply.toString()).add(10 ** decimalsOffset)).div(10 ** 18)
-      .toFixed(decimals)).mul(10 ** decimalsOffset)
-      .toString();
-  });
-
-  return {
-    poolSize,
-    supplied,
-    liquidity,
-    asset: morphoVault.asset,
-    optionType: morphoVault.type,
-  };
-};
-
-export async function getMorphoVaultData(provider: EthereumProvider, network: NetworkNumber, morphoVault: MorphoVault, accounts: EthAddress[]): Promise<SavingsVaultData> {
-  return _getMorphoVaultData(getViemProvider(provider, network, {
-    batch: {
-      multicall: {
-        batchSize: 2500000,
-      },
-    },
-  }), network, morphoVault, accounts);
+import { Client } from 'viem';
+import Dec from 'decimal.js';
+import { request as graphqlRequest } from 'graphql-request';
+import { assetAmountInEth } from '@defisaver/tokens';
+import * as morphoVaultsOptions from './options';
+import { EthAddress, EthereumProvider, NetworkNumber } from '../../types/common';
+import { getViemProvider } from '../../services/viem';
+import { getMorphoVaultContractViem } from '../../contracts';
+import { MorphoVault, SavingsVaultData } from '../../types';
+
+export {
+  morphoVaultsOptions,
+};
+
+const vaultDataQuery = (vaultAddress: EthAddress) => `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 = async (provider: Client, network: NetworkNumber, morphoVault: MorphoVault, accounts: EthAddress[]): Promise<SavingsVaultData> => {
+  const morphoVaultContract = getMorphoVaultContractViem(provider, morphoVault.address);
+
+  const shares: Record<EthAddress, bigint> = {};
+
+  const [totalAssets, totalSupply, decimals, decimalsOffset, vaultData] = await Promise.all([
+    morphoVaultContract.read.totalAssets(),
+    morphoVaultContract.read.totalSupply(),
+    morphoVaultContract.read.decimals(),
+    morphoVaultContract.read.DECIMALS_OFFSET(),
+    graphqlRequest(MORPHO_BLUE_API, vaultDataQuery(morphoVault.address)),
+    ...accounts.map(async (account) => {
+      const share = await morphoVaultContract.read.balanceOf([account]);
+      shares[account] = share;
+    }),
+  ]);
+
+  const poolSize = assetAmountInEth(totalAssets.toString(), morphoVault.asset);
+  const liquidity = assetAmountInEth((vaultData as any).vaultByAddress.liquidity.underlying, morphoVault.asset);
+
+  const supplied: Record<EthAddress, string> = {};
+  accounts.forEach((account) => {
+    const share = shares[account] || BigInt(0);
+    supplied[account.toLowerCase() as EthAddress] = new Dec(new Dec(share.toString()).mul(new Dec(totalAssets.toString()).add(1)).div(new Dec(totalSupply.toString()).add(10 ** decimalsOffset)).div(10 ** 18)
+      .toFixed(decimals)).mul(10 ** decimalsOffset)
+      .toString();
+  });
+
+  return {
+    poolSize,
+    supplied,
+    liquidity,
+    asset: morphoVault.asset,
+    optionType: morphoVault.type,
+  };
+};
+
+export async function getMorphoVaultData(provider: EthereumProvider, network: NetworkNumber, morphoVault: MorphoVault, accounts: EthAddress[]): Promise<SavingsVaultData> {
+  return _getMorphoVaultData(getViemProvider(provider, network, {
+    batch: {
+      multicall: {
+        batchSize: 2500000,
+      },
+    },
+  }), network, morphoVault, accounts);
 }