@defisaver/positions-sdk 2.1.29 → 2.1.31-syrup-dev

package/src/savings/morphoVaults/options.ts

@@ -1,204 +1,204 @@
-import { MorphoVault, MorphoVaultType } from '../../types';
-
-export const MORPHO_VAULT_FLAGSHIP_ETH: MorphoVault = {
-  type: MorphoVaultType.MorphoVaultFlagshipEth,
-  name: 'Flagship ETH',
-  address: '0x38989BBA00BDF8181F4082995b3DEAe96163aC5D',
-  asset: 'WETH',
-  deploymentBlock: 18927491,
-  isLegacy: true,
-};
-
-export const MORPHO_VAULT_GAUNTLET_USDC_CORE: MorphoVault = {
-  type: MorphoVaultType.MorphoVaultGauntletUSDCCore,
-  name: 'Gauntlet USDC Core',
-  address: '0x8eB67A509616cd6A7c1B3c8C21D48FF57df3d458',
-  asset: 'USDC',
-  deploymentBlock: 19777569,
-  isLegacy: true,
-};
-
-export const MORPHO_VAULT_GAUNTLET_USDC_PRIME: MorphoVault = {
-  type: MorphoVaultType.MorphoVaultGauntletUSDCPrime,
-  name: 'Gauntlet USDC Prime',
-  address: '0xdd0f28e19C1780eb6396170735D45153D261490d',
-  asset: 'USDC',
-  deploymentBlock: 19777569,
-  isLegacy: true,
-};
-
-export const MORPHO_VAULT_RE7_WETH: MorphoVault = {
-  type: MorphoVaultType.MorphoVaultRe7Weth,
-  name: 'RE7 WETH',
-  address: '0x78Fc2c2eD1A4cDb5402365934aE5648aDAd094d0',
-  asset: 'WETH',
-  deploymentBlock: 19121118,
-  isLegacy: true,
-};
-
-export const MORPHO_VAULT_GAUNTLET_WETH_CORE: MorphoVault = {
-  type: MorphoVaultType.MorphoVaultGauntletWETHCore,
-  name: 'Gauntlet WETH Core',
-  address: '0x4881Ef0BF6d2365D3dd6499ccd7532bcdBCE0658',
-  asset: 'WETH',
-  deploymentBlock: 19541126,
-  isLegacy: true,
-};
-
-export const MORPHO_VAULT_GAUNTLET_WETH_PRIME: MorphoVault = {
-  type: MorphoVaultType.MorphoVaultGauntletWETHPrime,
-  name: 'Gauntlet WETH Prime',
-  address: '0x2371e134e3455e0593363cBF89d3b6cf53740618',
-  asset: 'WETH',
-  deploymentBlock: 19372149,
-  isLegacy: true,
-};
-
-export const MORPHO_VAULT_BOOSTED_USDC: MorphoVault = {
-  type: MorphoVaultType.MorphoVaultBoostedUSDC,
-  name: 'Boosted USDC',
-  address: '0xd63070114470f685b75B74D60EEc7c1113d33a3D',
-  asset: 'USDC',
-  deploymentBlock: 20377233,
-  isLegacy: true,
-};
-
-export const MORPHO_VAULT_FLAGSHIP_USDT: MorphoVault = {
-  type: MorphoVaultType.MorphoVaultFlagshipUSDT,
-  name: 'Flagship USDT',
-  address: '0x2C25f6C25770fFEC5959D34B94Bf898865e5D6b1',
-  asset: 'USDT',
-  deploymentBlock: 19127039,
-  isLegacy: true,
-};
-
-export const MORPHO_VAULT_GAUNTLET_USDA_CORE: MorphoVault = {
-  type: MorphoVaultType.MorphoVaultGauntletUSDACore,
-  name: 'Gauntlet USDA Core',
-  address: '0x125D41A6e5dbf455cD9Df8F80BCC6fd172D52Cc6',
-  asset: 'USDA',
-  deploymentBlock: 19633608,
-  isLegacy: true,
-};
-
-export const MORPHO_VAULT_GAUNTLET_USDT_PRIME: MorphoVault = {
-  type: MorphoVaultType.MorphoVaultGauntletUSDTPrime,
-  name: 'Gauntlet USDT Prime',
-  address: '0x8CB3649114051cA5119141a34C200D65dc0Faa73',
-  asset: 'USDT',
-  deploymentBlock: 19486541,
-  isLegacy: true,
-};
-
-export const MORPHO_VAULT_GAUNTLET_RESOLV_USDC: MorphoVault = {
-  type: MorphoVaultType.MorphoVaultGauntletResolvUSDC,
-  name: 'Gauntlet Resolv USDC',
-  address: '0x132E6C9C33A62D7727cd359b1f51e5B566E485Eb',
-  asset: 'USDC',
-  deploymentBlock: 21487882,
-  isLegacy: true,
-};
-
-// Steakhouse
-
-export const MORPHO_VAULT_STEAKHOUSE_USDT: MorphoVault = {
-  type: MorphoVaultType.MorphoVaultSteakhouseUSDT,
-  name: 'Steakhouse USDT',
-  address: '0xbEef047a543E45807105E51A8BBEFCc5950fcfBa',
-  asset: 'USDT',
-  deploymentBlock: 19043398,
-  isLegacy: false,
-};
-
-export const MORPHO_VAULT_STEAKHOUSE_USDC: MorphoVault = {
-  type: MorphoVaultType.MorphoVaultSteakhouseUSDC,
-  name: 'Steakhouse USDC',
-  address: '0xbEef047a543E45807105E51A8BBEFCc5950fcfBa',
-  asset: 'USDC',
-  deploymentBlock: 18928285,
-  isLegacy: false,
-};
-
-export const MORPHO_VAULT_STEAKHOUSE_ETH: MorphoVault = {
-  type: MorphoVaultType.MorphoVaultSteakhouseETH,
-  name: 'Steakhouse WETH',
-  address: '0xBEEf050ecd6a16c4e7bfFbB52Ebba7846C4b8cD4',
-  asset: 'WETH',
-  deploymentBlock: 19380443,
-  isLegacy: false,
-};
-
-export const MORPHO_VAULT_STEAKHOUSE_PYUSD: MorphoVault = {
-  type: MorphoVaultType.MorphoVaultSteakhousePYUSD,
-  name: 'Steakhouse PYUSD',
-  address: '0xBEEF01735c132Ada46AA9aA4c54623cAA92A64CB',
-  asset: 'PYUSD',
-  deploymentBlock: 19043398,
-  isLegacy: false,
-};
-
-// Smokehouse
-
-export const MORPHO_VAULT_SMOKEHOUSE_USDT: MorphoVault = {
-  type: MorphoVaultType.MorphoVaultSmokehouseUSDT,
-  name: 'Smokehouse USDT',
-  address: '0xA0804346780b4c2e3bE118ac957D1DB82F9d7484',
-  asset: 'USDT',
-  deploymentBlock: 21522238,
-  isLegacy: false,
-};
-
-export const MORPHO_VAULT_SMOKEHOUSE_USDC: MorphoVault = {
-  type: MorphoVaultType.MorphoVaultSmokehouseUSDC,
-  name: 'Smokehouse USDC',
-  address: '0xBEeFFF209270748ddd194831b3fa287a5386f5bC',
-  asset: 'USDC',
-  deploymentBlock: 21337719,
-  isLegacy: false,
-};
-
-export const MORPHO_VAULT_SMOKEHOUSE_DAI: MorphoVault = {
-  type: MorphoVaultType.MorphoVaultSmokehouseDAI,
-  name: 'Smokehouse DAI',
-  address: '0xbeeFfF68CC520D68f82641EFF84330C631E2490E',
-  asset: 'DAI',
-  deploymentBlock: 21343808,
-  isLegacy: false,
-};
-
-export const MORPHO_VAULT_SMOKEHOUSE_WSTETH: MorphoVault = {
-  type: MorphoVaultType.MorphoVaultSmokehouseWstEth,
-  name: 'Smokehouse wstETH',
-  address: '0x833AdaeF212c5cD3f78906B44bBfb18258F238F0',
-  asset: 'wstETH',
-  deploymentBlock: 21521419,
-  isLegacy: false,
-};
-
-export const MORPHO_VAULTS: Record<MorphoVaultType, MorphoVault> = {
-  [MorphoVaultType.MorphoVaultFlagshipEth]: MORPHO_VAULT_FLAGSHIP_ETH,
-  [MorphoVaultType.MorphoVaultGauntletUSDCCore]: MORPHO_VAULT_GAUNTLET_USDC_CORE,
-  [MorphoVaultType.MorphoVaultGauntletUSDCPrime]: MORPHO_VAULT_GAUNTLET_USDC_PRIME,
-  [MorphoVaultType.MorphoVaultRe7Weth]: MORPHO_VAULT_RE7_WETH,
-  [MorphoVaultType.MorphoVaultGauntletWETHCore]: MORPHO_VAULT_GAUNTLET_WETH_CORE,
-  [MorphoVaultType.MorphoVaultGauntletWETHPrime]: MORPHO_VAULT_GAUNTLET_WETH_PRIME,
-  [MorphoVaultType.MorphoVaultBoostedUSDC]: MORPHO_VAULT_BOOSTED_USDC,
-  [MorphoVaultType.MorphoVaultFlagshipUSDT]: MORPHO_VAULT_FLAGSHIP_USDT,
-  [MorphoVaultType.MorphoVaultGauntletUSDACore]: MORPHO_VAULT_GAUNTLET_USDA_CORE,
-  [MorphoVaultType.MorphoVaultGauntletUSDTPrime]: MORPHO_VAULT_GAUNTLET_USDT_PRIME,
-  [MorphoVaultType.MorphoVaultGauntletResolvUSDC]: MORPHO_VAULT_GAUNTLET_RESOLV_USDC,
-
-  // Steakhouse
-  [MorphoVaultType.MorphoVaultSteakhouseUSDT]: MORPHO_VAULT_STEAKHOUSE_USDT,
-  [MorphoVaultType.MorphoVaultSteakhousePYUSD]: MORPHO_VAULT_STEAKHOUSE_PYUSD,
-  [MorphoVaultType.MorphoVaultSteakhouseUSDC]: MORPHO_VAULT_STEAKHOUSE_USDC,
-  [MorphoVaultType.MorphoVaultSteakhouseETH]: MORPHO_VAULT_STEAKHOUSE_ETH,
-
-  // Smokehouse
-  [MorphoVaultType.MorphoVaultSmokehouseUSDT]: MORPHO_VAULT_SMOKEHOUSE_USDT,
-  [MorphoVaultType.MorphoVaultSmokehouseUSDC]: MORPHO_VAULT_SMOKEHOUSE_USDC,
-  [MorphoVaultType.MorphoVaultSmokehouseDAI]: MORPHO_VAULT_SMOKEHOUSE_DAI,
-  [MorphoVaultType.MorphoVaultSmokehouseWstEth]: MORPHO_VAULT_SMOKEHOUSE_WSTETH,
-};
-
+import { MorphoVault, MorphoVaultType } from '../../types';
+
+export const MORPHO_VAULT_FLAGSHIP_ETH: MorphoVault = {
+  type: MorphoVaultType.MorphoVaultFlagshipEth,
+  name: 'Flagship ETH',
+  address: '0x38989BBA00BDF8181F4082995b3DEAe96163aC5D',
+  asset: 'WETH',
+  deploymentBlock: 18927491,
+  isLegacy: true,
+};
+
+export const MORPHO_VAULT_GAUNTLET_USDC_CORE: MorphoVault = {
+  type: MorphoVaultType.MorphoVaultGauntletUSDCCore,
+  name: 'Gauntlet USDC Core',
+  address: '0x8eB67A509616cd6A7c1B3c8C21D48FF57df3d458',
+  asset: 'USDC',
+  deploymentBlock: 19777569,
+  isLegacy: true,
+};
+
+export const MORPHO_VAULT_GAUNTLET_USDC_PRIME: MorphoVault = {
+  type: MorphoVaultType.MorphoVaultGauntletUSDCPrime,
+  name: 'Gauntlet USDC Prime',
+  address: '0xdd0f28e19C1780eb6396170735D45153D261490d',
+  asset: 'USDC',
+  deploymentBlock: 19777569,
+  isLegacy: true,
+};
+
+export const MORPHO_VAULT_RE7_WETH: MorphoVault = {
+  type: MorphoVaultType.MorphoVaultRe7Weth,
+  name: 'RE7 WETH',
+  address: '0x78Fc2c2eD1A4cDb5402365934aE5648aDAd094d0',
+  asset: 'WETH',
+  deploymentBlock: 19121118,
+  isLegacy: true,
+};
+
+export const MORPHO_VAULT_GAUNTLET_WETH_CORE: MorphoVault = {
+  type: MorphoVaultType.MorphoVaultGauntletWETHCore,
+  name: 'Gauntlet WETH Core',
+  address: '0x4881Ef0BF6d2365D3dd6499ccd7532bcdBCE0658',
+  asset: 'WETH',
+  deploymentBlock: 19541126,
+  isLegacy: true,
+};
+
+export const MORPHO_VAULT_GAUNTLET_WETH_PRIME: MorphoVault = {
+  type: MorphoVaultType.MorphoVaultGauntletWETHPrime,
+  name: 'Gauntlet WETH Prime',
+  address: '0x2371e134e3455e0593363cBF89d3b6cf53740618',
+  asset: 'WETH',
+  deploymentBlock: 19372149,
+  isLegacy: true,
+};
+
+export const MORPHO_VAULT_BOOSTED_USDC: MorphoVault = {
+  type: MorphoVaultType.MorphoVaultBoostedUSDC,
+  name: 'Boosted USDC',
+  address: '0xd63070114470f685b75B74D60EEc7c1113d33a3D',
+  asset: 'USDC',
+  deploymentBlock: 20377233,
+  isLegacy: true,
+};
+
+export const MORPHO_VAULT_FLAGSHIP_USDT: MorphoVault = {
+  type: MorphoVaultType.MorphoVaultFlagshipUSDT,
+  name: 'Flagship USDT',
+  address: '0x2C25f6C25770fFEC5959D34B94Bf898865e5D6b1',
+  asset: 'USDT',
+  deploymentBlock: 19127039,
+  isLegacy: true,
+};
+
+export const MORPHO_VAULT_GAUNTLET_USDA_CORE: MorphoVault = {
+  type: MorphoVaultType.MorphoVaultGauntletUSDACore,
+  name: 'Gauntlet USDA Core',
+  address: '0x125D41A6e5dbf455cD9Df8F80BCC6fd172D52Cc6',
+  asset: 'USDA',
+  deploymentBlock: 19633608,
+  isLegacy: true,
+};
+
+export const MORPHO_VAULT_GAUNTLET_USDT_PRIME: MorphoVault = {
+  type: MorphoVaultType.MorphoVaultGauntletUSDTPrime,
+  name: 'Gauntlet USDT Prime',
+  address: '0x8CB3649114051cA5119141a34C200D65dc0Faa73',
+  asset: 'USDT',
+  deploymentBlock: 19486541,
+  isLegacy: true,
+};
+
+export const MORPHO_VAULT_GAUNTLET_RESOLV_USDC: MorphoVault = {
+  type: MorphoVaultType.MorphoVaultGauntletResolvUSDC,
+  name: 'Gauntlet Resolv USDC',
+  address: '0x132E6C9C33A62D7727cd359b1f51e5B566E485Eb',
+  asset: 'USDC',
+  deploymentBlock: 21487882,
+  isLegacy: true,
+};
+
+// Steakhouse
+
+export const MORPHO_VAULT_STEAKHOUSE_USDT: MorphoVault = {
+  type: MorphoVaultType.MorphoVaultSteakhouseUSDT,
+  name: 'Steakhouse USDT',
+  address: '0xbEef047a543E45807105E51A8BBEFCc5950fcfBa',
+  asset: 'USDT',
+  deploymentBlock: 19043398,
+  isLegacy: false,
+};
+
+export const MORPHO_VAULT_STEAKHOUSE_USDC: MorphoVault = {
+  type: MorphoVaultType.MorphoVaultSteakhouseUSDC,
+  name: 'Steakhouse USDC',
+  address: '0xbEef047a543E45807105E51A8BBEFCc5950fcfBa',
+  asset: 'USDC',
+  deploymentBlock: 18928285,
+  isLegacy: false,
+};
+
+export const MORPHO_VAULT_STEAKHOUSE_ETH: MorphoVault = {
+  type: MorphoVaultType.MorphoVaultSteakhouseETH,
+  name: 'Steakhouse WETH',
+  address: '0xBEEf050ecd6a16c4e7bfFbB52Ebba7846C4b8cD4',
+  asset: 'WETH',
+  deploymentBlock: 19380443,
+  isLegacy: false,
+};
+
+export const MORPHO_VAULT_STEAKHOUSE_PYUSD: MorphoVault = {
+  type: MorphoVaultType.MorphoVaultSteakhousePYUSD,
+  name: 'Steakhouse PYUSD',
+  address: '0xBEEF01735c132Ada46AA9aA4c54623cAA92A64CB',
+  asset: 'PYUSD',
+  deploymentBlock: 19043398,
+  isLegacy: false,
+};
+
+// Smokehouse
+
+export const MORPHO_VAULT_SMOKEHOUSE_USDT: MorphoVault = {
+  type: MorphoVaultType.MorphoVaultSmokehouseUSDT,
+  name: 'Smokehouse USDT',
+  address: '0xA0804346780b4c2e3bE118ac957D1DB82F9d7484',
+  asset: 'USDT',
+  deploymentBlock: 21522238,
+  isLegacy: false,
+};
+
+export const MORPHO_VAULT_SMOKEHOUSE_USDC: MorphoVault = {
+  type: MorphoVaultType.MorphoVaultSmokehouseUSDC,
+  name: 'Smokehouse USDC',
+  address: '0xBEeFFF209270748ddd194831b3fa287a5386f5bC',
+  asset: 'USDC',
+  deploymentBlock: 21337719,
+  isLegacy: false,
+};
+
+export const MORPHO_VAULT_SMOKEHOUSE_DAI: MorphoVault = {
+  type: MorphoVaultType.MorphoVaultSmokehouseDAI,
+  name: 'Smokehouse DAI',
+  address: '0xbeeFfF68CC520D68f82641EFF84330C631E2490E',
+  asset: 'DAI',
+  deploymentBlock: 21343808,
+  isLegacy: false,
+};
+
+export const MORPHO_VAULT_SMOKEHOUSE_WSTETH: MorphoVault = {
+  type: MorphoVaultType.MorphoVaultSmokehouseWstEth,
+  name: 'Smokehouse wstETH',
+  address: '0x833AdaeF212c5cD3f78906B44bBfb18258F238F0',
+  asset: 'wstETH',
+  deploymentBlock: 21521419,
+  isLegacy: false,
+};
+
+export const MORPHO_VAULTS: Record<MorphoVaultType, MorphoVault> = {
+  [MorphoVaultType.MorphoVaultFlagshipEth]: MORPHO_VAULT_FLAGSHIP_ETH,
+  [MorphoVaultType.MorphoVaultGauntletUSDCCore]: MORPHO_VAULT_GAUNTLET_USDC_CORE,
+  [MorphoVaultType.MorphoVaultGauntletUSDCPrime]: MORPHO_VAULT_GAUNTLET_USDC_PRIME,
+  [MorphoVaultType.MorphoVaultRe7Weth]: MORPHO_VAULT_RE7_WETH,
+  [MorphoVaultType.MorphoVaultGauntletWETHCore]: MORPHO_VAULT_GAUNTLET_WETH_CORE,
+  [MorphoVaultType.MorphoVaultGauntletWETHPrime]: MORPHO_VAULT_GAUNTLET_WETH_PRIME,
+  [MorphoVaultType.MorphoVaultBoostedUSDC]: MORPHO_VAULT_BOOSTED_USDC,
+  [MorphoVaultType.MorphoVaultFlagshipUSDT]: MORPHO_VAULT_FLAGSHIP_USDT,
+  [MorphoVaultType.MorphoVaultGauntletUSDACore]: MORPHO_VAULT_GAUNTLET_USDA_CORE,
+  [MorphoVaultType.MorphoVaultGauntletUSDTPrime]: MORPHO_VAULT_GAUNTLET_USDT_PRIME,
+  [MorphoVaultType.MorphoVaultGauntletResolvUSDC]: MORPHO_VAULT_GAUNTLET_RESOLV_USDC,
+
+  // Steakhouse
+  [MorphoVaultType.MorphoVaultSteakhouseUSDT]: MORPHO_VAULT_STEAKHOUSE_USDT,
+  [MorphoVaultType.MorphoVaultSteakhousePYUSD]: MORPHO_VAULT_STEAKHOUSE_PYUSD,
+  [MorphoVaultType.MorphoVaultSteakhouseUSDC]: MORPHO_VAULT_STEAKHOUSE_USDC,
+  [MorphoVaultType.MorphoVaultSteakhouseETH]: MORPHO_VAULT_STEAKHOUSE_ETH,
+
+  // Smokehouse
+  [MorphoVaultType.MorphoVaultSmokehouseUSDT]: MORPHO_VAULT_SMOKEHOUSE_USDT,
+  [MorphoVaultType.MorphoVaultSmokehouseUSDC]: MORPHO_VAULT_SMOKEHOUSE_USDC,
+  [MorphoVaultType.MorphoVaultSmokehouseDAI]: MORPHO_VAULT_SMOKEHOUSE_DAI,
+  [MorphoVaultType.MorphoVaultSmokehouseWstEth]: MORPHO_VAULT_SMOKEHOUSE_WSTETH,
+};
+
 export const getMorphoVault = (type: MorphoVaultType): MorphoVault => MORPHO_VAULTS[type];

package/src/savings/sparkSavingsVaults/index.ts

@@ -0,0 +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);
+}

package/src/savings/sparkSavingsVaults/options.ts

@@ -0,0 +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,
+};
+
+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);
 }