@defisaver/positions-sdk 2.1.29 → 2.1.30

package/esm/contracts.js

@@ -61,6 +61,22 @@ export const getYearnVaultContractViem = (client, address) => {
         client,
     });
 };
+export const getSparkSavingsVaultContractViem = (client, address) => {
+    const abi = getConfigContractAbi('SparkSavingsVault');
+    return getContract({
+        address,
+        abi,
+        client,
+    });
+};
+export const getErc20ContractViem = (client, address) => {
+    const abi = getConfigContractAbi('Erc20');
+    return getContract({
+        address,
+        abi,
+        client,
+    });
+};
 export const MorphoBlueViewContractViem = createViemContractFromConfigFunc('MorphoBlueView');
 export const AaveLoanInfoV2ContractViem = createViemContractFromConfigFunc('AaveLoanInfoV2');
 export const AaveV3ViewContractViem = createViemContractFromConfigFunc('AaveV3View');

package/esm/savings/index.d.ts

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

package/esm/savings/index.js

@@ -11,10 +11,12 @@ import { MakerDsrType, } from '../types';
 import * as morphoVaults from './morphoVaults';
 import * as yearnVaults from './yearnVaults';
 import * as makerDsr from './makerDSR';
-export { morphoVaults, yearnVaults, makerDsr, };
+import * as sparkSavingsVaults from './sparkSavingsVaults';
+export { morphoVaults, yearnVaults, makerDsr, sparkSavingsVaults, };
 export 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 sparkSavingsVaultsList = Object.keys(sparkSavingsVaults.sparkSavingsVaultsOptions.SPARK_SAVINGS_VAULTS);
     const savingsData = {};
     yield Promise.all([
         ...morphoVaultsList.map((vaultKey) => __awaiter(void 0, void 0, void 0, function* () {
@@ -27,6 +29,11 @@ export const getSavingsData = (provider, network, accounts) => __awaiter(void 0,
             const data = yield yearnVaults.getYearnVaultData(provider, network, vault, accounts);
             savingsData[vaultKey] = data;
         })),
+        ...sparkSavingsVaultsList.map((vaultKey) => __awaiter(void 0, void 0, void 0, function* () {
+            const vault = sparkSavingsVaults.sparkSavingsVaultsOptions.getSparkSavingsVault(vaultKey);
+            const data = yield sparkSavingsVaults.getSparkSavingsVaultData(provider, network, vault, accounts);
+            savingsData[vaultKey] = data;
+        })),
         (() => __awaiter(void 0, void 0, void 0, function* () {
             const data = yield makerDsr.getMakerDsrData(provider, network, accounts);
             savingsData[MakerDsrType.MakerDsrVault] = data;

package/esm/savings/sparkSavingsVaults/index.d.ts

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

package/esm/savings/sparkSavingsVaults/index.js

@@ -0,0 +1,57 @@
+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());
+    });
+};
+import Dec from 'decimal.js';
+import { assetAmountInEth, getAssetInfo } from '@defisaver/tokens';
+import * as sparkSavingsVaultsOptions from './options';
+import { getViemProvider } from '../../services/viem';
+import { getErc20ContractViem, getSparkSavingsVaultContractViem } from '../../contracts';
+export { sparkSavingsVaultsOptions, };
+export const _getSparkSavingsVaultData = (provider, network, sparkSavingsVault, accounts) => __awaiter(void 0, void 0, void 0, function* () {
+    const sparkSavingsVaultContract = getSparkSavingsVaultContractViem(provider, sparkSavingsVault.address);
+    const underlyingAssetContract = getErc20ContractViem(provider, getAssetInfo(sparkSavingsVault.asset, network).address);
+    const shares = {};
+    const [totalAssets, decimals, nowChi, RAY, liquidityWei] = yield Promise.all([
+        sparkSavingsVaultContract.read.totalAssets(),
+        sparkSavingsVaultContract.read.decimals(),
+        sparkSavingsVaultContract.read.nowChi(),
+        sparkSavingsVaultContract.read.RAY(),
+        underlyingAssetContract.read.balanceOf([sparkSavingsVault.address]),
+        ...accounts.map((account) => __awaiter(void 0, void 0, void 0, function* () {
+            const share = yield sparkSavingsVaultContract.read.balanceOf([account]);
+            shares[account] = share;
+        })),
+    ]);
+    const poolSize = assetAmountInEth(totalAssets.toString(), sparkSavingsVault.asset);
+    const liquidity = assetAmountInEth(liquidityWei.toString(), sparkSavingsVault.asset);
+    const supplied = {};
+    accounts.forEach((account) => {
+        const share = shares[account] || BigInt(0);
+        supplied[account.toLowerCase()] = assetAmountInEth(new Dec(share).mul(nowChi).div(RAY).toFixed(0)
+            .toString(), sparkSavingsVault.asset);
+    });
+    return {
+        poolSize,
+        supplied,
+        liquidity,
+        asset: sparkSavingsVault.asset,
+        optionType: sparkSavingsVault.type,
+    };
+});
+export function getSparkSavingsVaultData(provider, network, sparkSavingsVault, accounts) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return _getSparkSavingsVaultData(getViemProvider(provider, network, {
+            batch: {
+                multicall: {
+                    batchSize: 2500000,
+                },
+            },
+        }), network, sparkSavingsVault, accounts);
+    });
+}

package/esm/savings/sparkSavingsVaults/options.d.ts

@@ -0,0 +1,6 @@
+import { SparkSavingsVault, SparkSavingsVaultType } from '../../types';
+export declare const SPARK_SAVINGS_VAULT_USDC: SparkSavingsVault;
+export declare const SPARK_SAVINGS_VAULT_USDT: SparkSavingsVault;
+export declare const SPARK_SAVINGS_VAULT_WETH: SparkSavingsVault;
+export declare const SPARK_SAVINGS_VAULTS: Record<SparkSavingsVaultType, SparkSavingsVault>;
+export declare const getSparkSavingsVault: (type: SparkSavingsVaultType) => SparkSavingsVault;

package/esm/savings/sparkSavingsVaults/options.js

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

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

@@ -1,10 +1,12 @@
 import { EthAddress } from '../common';
 import { MakerDsrType } from './makerDsr';
 import { MorphoVaultType } from './morphoVaults';
+import { SparkSavingsVaultType } from './sparkSavingsVaults';
 import { YearnVaultType } from './yearnVaults';
 export * from './morphoVaults';
 export * from './yearnVaults';
 export * from './makerDsr';
+export * from './sparkSavingsVaults';
 export interface SavingsVaultData {
     poolSize: string;
     liquidity: string;
@@ -12,4 +14,4 @@ export interface SavingsVaultData {
     asset: string;
     optionType: string;
 }
-export type SavingsData = Partial<Record<MorphoVaultType | YearnVaultType | MakerDsrType, SavingsVaultData>>;
+export type SavingsData = Partial<Record<MorphoVaultType | YearnVaultType | MakerDsrType | SparkSavingsVaultType, SavingsVaultData>>;

package/esm/types/savings/index.js

@@ -1,3 +1,4 @@
 export * from './morphoVaults';
 export * from './yearnVaults';
 export * from './makerDsr';
+export * from './sparkSavingsVaults';

package/esm/types/savings/sparkSavingsVaults.d.ts

@@ -0,0 +1,14 @@
+import { EthAddress } from '../common';
+export declare enum SparkSavingsVaultType {
+    SparkSavingsUSDC = "spark_savings_usdc",
+    SparkSavingsUSDT = "spark_savings_usdt",
+    SparkSavingsETH = "spark_savings_eth"
+}
+export interface SparkSavingsVault {
+    type: SparkSavingsVaultType;
+    name: string;
+    address: EthAddress;
+    asset: string;
+    deploymentBlock: number;
+    isLegacy: boolean;
+}

package/esm/types/savings/sparkSavingsVaults.js

@@ -0,0 +1,6 @@
+export var SparkSavingsVaultType;
+(function (SparkSavingsVaultType) {
+    SparkSavingsVaultType["SparkSavingsUSDC"] = "spark_savings_usdc";
+    SparkSavingsVaultType["SparkSavingsUSDT"] = "spark_savings_usdt";
+    SparkSavingsVaultType["SparkSavingsETH"] = "spark_savings_eth";
+})(SparkSavingsVaultType || (SparkSavingsVaultType = {}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/positions-sdk",
-  "version": "2.1.29",
+  "version": "2.1.30",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",

package/src/config/contracts.ts

@@ -1279,4 +1279,7 @@ export const MakerDsr = {
       "address": "0x197e90f9fad81970ba7976f33cbd77088e5d7cf7",
     }
   }
-}
+}
+export const SparkSavingsVault = {
+  "abi": [{"inputs":[{"internalType":"address","name":"","type":"address"}],"name":"balanceOf","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":"nowChi","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"RAY","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"totalAssets","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"}]
+} as const;

package/src/contracts.ts

@@ -85,6 +85,24 @@ export const getYearnVaultContractViem = (client: Client, address: HexString) =>
   });
 };
 
+export const getSparkSavingsVaultContractViem = (client: Client, address: HexString) => {
+  const abi = getConfigContractAbi('SparkSavingsVault') as typeof configRaw['SparkSavingsVault']['abi'];
+  return getContract({
+    address,
+    abi,
+    client,
+  });
+};
+
+export const getErc20ContractViem = (client: Client, address: HexString) => {
+  const abi = getConfigContractAbi('Erc20') as typeof configRaw['Erc20']['abi'];
+  return getContract({
+    address,
+    abi,
+    client,
+  });
+};
+
 export const MorphoBlueViewContractViem = createViemContractFromConfigFunc('MorphoBlueView');
 export const AaveLoanInfoV2ContractViem = createViemContractFromConfigFunc('AaveLoanInfoV2');
 export const AaveV3ViewContractViem = createViemContractFromConfigFunc('AaveV3View');

package/src/savings/index.ts

@@ -2,17 +2,20 @@ import {
   MakerDsrType,
   MorphoVaultType,
   SavingsData,
+  SparkSavingsVaultType,
   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 sparkSavingsVaults from './sparkSavingsVaults';
 
 export {
   morphoVaults,
   yearnVaults,
   makerDsr,
+  sparkSavingsVaults,
 };
 
 export const getSavingsData = async (
@@ -22,6 +25,7 @@ export const getSavingsData = async (
 ) => {
   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 savingsData: SavingsData = {};
 
@@ -36,6 +40,11 @@ export const getSavingsData = async (
       const data = await yearnVaults.getYearnVaultData(provider, network, vault, accounts);
       savingsData[vaultKey] = data;
     }),
+    ...sparkSavingsVaultsList.map(async (vaultKey) => {
+      const vault = sparkSavingsVaults.sparkSavingsVaultsOptions.getSparkSavingsVault(vaultKey);
+      const data = await sparkSavingsVaults.getSparkSavingsVaultData(provider, network, vault, accounts);
+      savingsData[vaultKey] = data;
+    }),
     (async () => {
       const data = await makerDsr.getMakerDsrData(provider, network, accounts);
       savingsData[MakerDsrType.MakerDsrVault] = data;

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

@@ -1,11 +1,13 @@
 import { EthAddress } from '../common';
 import { MakerDsrType } from './makerDsr';
 import { MorphoVaultType } from './morphoVaults';
+import { SparkSavingsVaultType } from './sparkSavingsVaults';
 import { YearnVaultType } from './yearnVaults';
 
 export * from './morphoVaults';
 export * from './yearnVaults';
 export * from './makerDsr';
+export * from './sparkSavingsVaults';
 
 export interface SavingsVaultData {
   poolSize: string,
@@ -15,4 +17,4 @@ export interface SavingsVaultData {
   optionType: string,
 }
 
-export type SavingsData = Partial<Record<MorphoVaultType | YearnVaultType | MakerDsrType, SavingsVaultData>>;
+export type SavingsData = Partial<Record<MorphoVaultType | YearnVaultType | MakerDsrType | SparkSavingsVaultType, SavingsVaultData>>;

package/src/types/savings/sparkSavingsVaults.ts

@@ -0,0 +1,16 @@
+import { EthAddress } from '../common';
+
+export enum SparkSavingsVaultType {
+  SparkSavingsUSDC = 'spark_savings_usdc',
+  SparkSavingsUSDT = 'spark_savings_usdt',
+  SparkSavingsETH = 'spark_savings_eth',
+}
+
+export interface SparkSavingsVault {
+  type: SparkSavingsVaultType;
+  name: string;
+  address: EthAddress;
+  asset: string;
+  deploymentBlock: number;
+  isLegacy: boolean;
+}