@ichidao/ichi-vaults-sdk 0.1.43 → 2.0.1

package/dist/src/abis/types/common.d.ts

@@ -1,22 +1,50 @@
-import type { Listener } from "@ethersproject/providers";
-import type { Event, EventFilter } from "ethers";
-export interface TypedEvent<TArgsArray extends Array<any> = any, TArgsObject = any> extends Event {
-    args: TArgsArray & TArgsObject;
+import type { FunctionFragment, Typed, EventFragment, ContractTransaction, ContractTransactionResponse, DeferredTopicFilter, EventLog, TransactionRequest, LogDescription } from "ethers";
+export interface TypedDeferredTopicFilter<_TCEvent extends TypedContractEvent> extends DeferredTopicFilter {
 }
-export interface TypedEventFilter<_TEvent extends TypedEvent> extends EventFilter {
+export interface TypedContractEvent<InputTuple extends Array<any> = any, OutputTuple extends Array<any> = any, OutputObject = any> {
+    (...args: Partial<InputTuple>): TypedDeferredTopicFilter<TypedContractEvent<InputTuple, OutputTuple, OutputObject>>;
+    name: string;
+    fragment: EventFragment;
+    getFragment(...args: Partial<InputTuple>): EventFragment;
 }
-export interface TypedListener<TEvent extends TypedEvent> {
-    (...listenerArg: [...__TypechainArgsArray<TEvent>, TEvent]): void;
+type __TypechainAOutputTuple<T> = T extends TypedContractEvent<infer _U, infer W> ? W : never;
+type __TypechainOutputObject<T> = T extends TypedContractEvent<infer _U, infer _W, infer V> ? V : never;
+export interface TypedEventLog<TCEvent extends TypedContractEvent> extends Omit<EventLog, "args"> {
+    args: __TypechainAOutputTuple<TCEvent> & __TypechainOutputObject<TCEvent>;
 }
-type __TypechainArgsArray<T> = T extends TypedEvent<infer U> ? U : never;
-export interface OnEvent<TRes> {
-    <TEvent extends TypedEvent>(eventFilter: TypedEventFilter<TEvent>, listener: TypedListener<TEvent>): TRes;
-    (eventName: string, listener: Listener): TRes;
+export interface TypedLogDescription<TCEvent extends TypedContractEvent> extends Omit<LogDescription, "args"> {
+    args: __TypechainAOutputTuple<TCEvent> & __TypechainOutputObject<TCEvent>;
 }
+export type TypedListener<TCEvent extends TypedContractEvent> = (...listenerArg: [
+    ...__TypechainAOutputTuple<TCEvent>,
+    TypedEventLog<TCEvent>,
+    ...undefined[]
+]) => void;
 export type MinEthersFactory<C, ARGS> = {
     deploy(...a: ARGS[]): Promise<C>;
 };
 export type GetContractTypeFromFactory<F> = F extends MinEthersFactory<infer C, any> ? C : never;
 export type GetARGsTypeFromFactory<F> = F extends MinEthersFactory<any, any> ? Parameters<F["deploy"]> : never;
-export type PromiseOrValue<T> = T | Promise<T>;
+export type StateMutability = "nonpayable" | "payable" | "view";
+export type BaseOverrides = Omit<TransactionRequest, "to" | "data">;
+export type NonPayableOverrides = Omit<BaseOverrides, "value" | "blockTag" | "enableCcipRead">;
+export type PayableOverrides = Omit<BaseOverrides, "blockTag" | "enableCcipRead">;
+export type ViewOverrides = Omit<TransactionRequest, "to" | "data">;
+export type Overrides<S extends StateMutability> = S extends "nonpayable" ? NonPayableOverrides : S extends "payable" ? PayableOverrides : ViewOverrides;
+export type PostfixOverrides<A extends Array<any>, S extends StateMutability> = A | [...A, Overrides<S>];
+export type ContractMethodArgs<A extends Array<any>, S extends StateMutability> = PostfixOverrides<{
+    [I in keyof A]-?: A[I] | Typed;
+}, S>;
+export type DefaultReturnType<R> = R extends Array<any> ? R[0] : R;
+export interface TypedContractMethod<A extends Array<any> = Array<any>, R = any, S extends StateMutability = "payable"> {
+    (...args: ContractMethodArgs<A, S>): S extends "view" ? Promise<DefaultReturnType<R>> : Promise<ContractTransactionResponse>;
+    name: string;
+    fragment: FunctionFragment;
+    getFragment(...args: ContractMethodArgs<A, S>): FunctionFragment;
+    populateTransaction(...args: ContractMethodArgs<A, S>): Promise<ContractTransaction>;
+    staticCall(...args: ContractMethodArgs<A, "view">): Promise<DefaultReturnType<R>>;
+    send(...args: ContractMethodArgs<A, S>): Promise<ContractTransactionResponse>;
+    estimateGas(...args: ContractMethodArgs<A, S>): Promise<bigint>;
+    staticCallResult(...args: ContractMethodArgs<A, "view">): Promise<R>;
+}
 export {};

package/dist/src/abis/types/factories/AlgebraIntegralPool__factory.d.ts

@@ -1,5 +1,4 @@
-import { Signer } from "ethers";
-import type { Provider } from "@ethersproject/providers";
+import { type ContractRunner } from "ethers";
 import type { AlgebraIntegralPool, AlgebraIntegralPoolInterface } from "../AlgebraIntegralPool";
 export declare class AlgebraIntegralPool__factory {
     static readonly abi: readonly [{
@@ -1050,5 +1049,5 @@ export declare class AlgebraIntegralPool__factory {
         readonly type: "function";
     }];
     static createInterface(): AlgebraIntegralPoolInterface;
-    static connect(address: string, signerOrProvider: Signer | Provider): AlgebraIntegralPool;
+    static connect(address: string, runner?: ContractRunner | null): AlgebraIntegralPool;
 }

package/dist/src/abis/types/factories/AlgebraPool__factory.d.ts

@@ -1,5 +1,4 @@
-import { Signer } from "ethers";
-import type { Provider } from "@ethersproject/providers";
+import { type ContractRunner } from "ethers";
 import type { AlgebraPool, AlgebraPoolInterface } from "../AlgebraPool";
 export declare class AlgebraPool__factory {
     static readonly abi: readonly [{
@@ -817,5 +816,5 @@ export declare class AlgebraPool__factory {
         readonly type: "function";
     }];
     static createInterface(): AlgebraPoolInterface;
-    static connect(address: string, signerOrProvider: Signer | Provider): AlgebraPool;
+    static connect(address: string, runner?: ContractRunner | null): AlgebraPool;
 }

package/dist/src/abis/types/factories/ClPool__factory.d.ts

@@ -1,5 +1,4 @@
-import { Signer } from "ethers";
-import type { Provider } from "@ethersproject/providers";
+import { type ContractRunner } from "ethers";
 import type { ClPool, ClPoolInterface } from "../ClPool";
 export declare class ClPool__factory {
     static readonly abi: readonly [{
@@ -1016,5 +1015,5 @@ export declare class ClPool__factory {
         readonly type: "function";
     }];
     static createInterface(): ClPoolInterface;
-    static connect(address: string, signerOrProvider: Signer | Provider): ClPool;
+    static connect(address: string, runner?: ContractRunner | null): ClPool;
 }

package/dist/src/abis/types/factories/DepositGuardWithHtsWrapping__factory.d.ts

@@ -1,5 +1,4 @@
-import { Signer } from "ethers";
-import type { Provider } from "@ethersproject/providers";
+import { type ContractRunner } from "ethers";
 import type { DepositGuardWithHtsWrapping, DepositGuardWithHtsWrappingInterface } from "../DepositGuardWithHtsWrapping";
 export declare class DepositGuardWithHtsWrapping__factory {
     static readonly abi: readonly [{
@@ -406,5 +405,5 @@ export declare class DepositGuardWithHtsWrapping__factory {
         readonly type: "receive";
     }];
     static createInterface(): DepositGuardWithHtsWrappingInterface;
-    static connect(address: string, signerOrProvider: Signer | Provider): DepositGuardWithHtsWrapping;
+    static connect(address: string, runner?: ContractRunner | null): DepositGuardWithHtsWrapping;
 }

package/dist/src/abis/types/factories/DepositGuard__factory.d.ts

@@ -1,5 +1,4 @@
-import { Signer } from "ethers";
-import type { Provider } from "@ethersproject/providers";
+import { type ContractRunner } from "ethers";
 import type { DepositGuard, DepositGuardInterface } from "../DepositGuard";
 export declare class DepositGuard__factory {
     static readonly abi: readonly [{
@@ -255,5 +254,5 @@ export declare class DepositGuard__factory {
         readonly type: "receive";
     }];
     static createInterface(): DepositGuardInterface;
-    static connect(address: string, signerOrProvider: Signer | Provider): DepositGuard;
+    static connect(address: string, runner?: ContractRunner | null): DepositGuard;
 }

package/dist/src/abis/types/factories/ERC20Wrapper__factory.d.ts

@@ -1,5 +1,4 @@
-import { Signer } from "ethers";
-import type { Provider } from "@ethersproject/providers";
+import { type ContractRunner } from "ethers";
 import type { ERC20Wrapper, ERC20WrapperInterface } from "../ERC20Wrapper";
 export declare class ERC20Wrapper__factory {
     static readonly abi: readonly [{
@@ -164,5 +163,5 @@ export declare class ERC20Wrapper__factory {
         readonly stateMutability: "payable";
     }];
     static createInterface(): ERC20WrapperInterface;
-    static connect(address: string, signerOrProvider: Signer | Provider): ERC20Wrapper;
+    static connect(address: string, runner?: ContractRunner | null): ERC20Wrapper;
 }

package/dist/src/abis/types/factories/ERC20__factory.d.ts

@@ -1,5 +1,4 @@
-import { Signer } from "ethers";
-import type { Provider } from "@ethersproject/providers";
+import { type ContractRunner } from "ethers";
 import type { ERC20, ERC20Interface } from "../ERC20";
 export declare class ERC20__factory {
     static readonly abi: readonly [{
@@ -171,5 +170,5 @@ export declare class ERC20__factory {
         readonly type: "event";
     }];
     static createInterface(): ERC20Interface;
-    static connect(address: string, signerOrProvider: Signer | Provider): ERC20;
+    static connect(address: string, runner?: ContractRunner | null): ERC20;
 }

package/dist/src/abis/types/factories/IchiVault__factory.d.ts

@@ -1,5 +1,4 @@
-import { Signer } from "ethers";
-import type { Provider } from "@ethersproject/providers";
+import { type ContractRunner } from "ethers";
 import type { IchiVault, IchiVaultInterface } from "../IchiVault";
 export declare class IchiVault__factory {
     static readonly abi: readonly [{
@@ -895,5 +894,5 @@ export declare class IchiVault__factory {
         readonly type: "function";
     }];
     static createInterface(): IchiVaultInterface;
-    static connect(address: string, signerOrProvider: Signer | Provider): IchiVault;
+    static connect(address: string, runner?: ContractRunner | null): IchiVault;
 }

package/dist/src/abis/types/factories/MultiFeeDistributer__factory.d.ts

@@ -1,5 +1,4 @@
-import { Signer } from "ethers";
-import type { Provider } from "@ethersproject/providers";
+import { type ContractRunner } from "ethers";
 import type { MultiFeeDistributer, MultiFeeDistributerInterface } from "../MultiFeeDistributer";
 export declare class MultiFeeDistributer__factory {
     static readonly abi: readonly [{
@@ -447,5 +446,5 @@ export declare class MultiFeeDistributer__factory {
         readonly type: "function";
     }];
     static createInterface(): MultiFeeDistributerInterface;
-    static connect(address: string, signerOrProvider: Signer | Provider): MultiFeeDistributer;
+    static connect(address: string, runner?: ContractRunner | null): MultiFeeDistributer;
 }

package/dist/src/abis/types/factories/Multicall__factory.d.ts

@@ -1,5 +1,4 @@
-import { Signer } from "ethers";
-import type { Provider } from "@ethersproject/providers";
+import { type ContractRunner } from "ethers";
 import type { Multicall, MulticallInterface } from "../Multicall";
 export declare class Multicall__factory {
     static readonly abi: readonly [{
@@ -72,5 +71,5 @@ export declare class Multicall__factory {
         readonly type: "function";
     }];
     static createInterface(): MulticallInterface;
-    static connect(address: string, signerOrProvider: Signer | Provider): Multicall;
+    static connect(address: string, runner?: ContractRunner | null): Multicall;
 }

package/dist/src/abis/types/factories/UniswapV3Pool__factory.d.ts

@@ -1,5 +1,4 @@
-import { Signer } from "ethers";
-import type { Provider } from "@ethersproject/providers";
+import { type ContractRunner } from "ethers";
 import type { UniswapV3Pool, UniswapV3PoolInterface } from "../UniswapV3Pool";
 export declare class UniswapV3Pool__factory {
     static readonly abi: readonly [{
@@ -777,5 +776,5 @@ export declare class UniswapV3Pool__factory {
         readonly type: "function";
     }];
     static createInterface(): UniswapV3PoolInterface;
-    static connect(address: string, signerOrProvider: Signer | Provider): UniswapV3Pool;
+    static connect(address: string, runner?: ContractRunner | null): UniswapV3Pool;
 }

package/dist/src/contracts/index.d.ts

@@ -1,4 +1,4 @@
-import { JsonRpcProvider } from '@ethersproject/providers';
+import { JsonRpcProvider } from 'ethers';
 import { SignerOrProvider } from '../types';
 import { ERC20, IchiVault, DepositGuard, DepositGuardWithHtsWrapping, ERC20Wrapper, UniswapV3Pool, AlgebraPool, AlgebraIntegralPool, ClPool, MultiFeeDistributer } from '../../abis/types';
 export declare function getERC20Contract(address: string, signerOrProvider: SignerOrProvider): ERC20;

package/dist/src/contracts/index.js

@@ -2,20 +2,20 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getERC20WrapperContract = exports.getDepositGuardWithHtsWrappingContract = exports.getMultiFeeDistributorContract = exports.getClPoolContract = exports.getAlgebraIntegralPoolContract = exports.getAlgebraPoolContract = exports.getUniswapV3PoolContract = exports.getIchiVaultContract = exports.getDepositGuardContract = exports.getERC20Contract = void 0;
 /* eslint-disable camelcase */
-var address_1 = require("@ethersproject/address");
-var types_1 = require("../../abis/types");
+const ethers_1 = require("ethers");
+const types_1 = require("../../abis/types");
 function getERC20Contract(address, signerOrProvider) {
-    (0, address_1.getAddress)(address);
+    (0, ethers_1.getAddress)(address);
     return types_1.ERC20__factory.connect(address, signerOrProvider);
 }
 exports.getERC20Contract = getERC20Contract;
 function getDepositGuardContract(address, signerOrProvider) {
-    (0, address_1.getAddress)(address);
+    (0, ethers_1.getAddress)(address);
     return types_1.DepositGuard__factory.connect(address, signerOrProvider);
 }
 exports.getDepositGuardContract = getDepositGuardContract;
 function getIchiVaultContract(address, signerOrProvider) {
-    (0, address_1.getAddress)(address);
+    (0, ethers_1.getAddress)(address);
     return types_1.IchiVault__factory.connect(address, signerOrProvider);
 }
 exports.getIchiVaultContract = getIchiVaultContract;
@@ -24,7 +24,7 @@ function getUniswapV3PoolContract(address, provider) {
         return types_1.UniswapV3Pool__factory.connect(address, provider);
     }
     catch (e) {
-        console.error("Couldn't create UniswapV3Pool contract with address: ".concat(address));
+        console.error(`Couldn't create UniswapV3Pool contract with address: ${address}`);
         throw e;
     }
 }
@@ -34,7 +34,7 @@ function getAlgebraPoolContract(address, provider) {
         return types_1.AlgebraPool__factory.connect(address, provider);
     }
     catch (e) {
-        console.error("Couldn't create AlgebraPool contract with address: ".concat(address));
+        console.error(`Couldn't create AlgebraPool contract with address: ${address}`);
         throw e;
     }
 }
@@ -44,7 +44,7 @@ function getAlgebraIntegralPoolContract(address, provider) {
         return types_1.AlgebraIntegralPool__factory.connect(address, provider);
     }
     catch (e) {
-        console.error("Couldn't create AlgebraIntegralPool contract with address: ".concat(address));
+        console.error(`Couldn't create AlgebraIntegralPool contract with address: ${address}`);
         throw e;
     }
 }
@@ -54,7 +54,7 @@ function getClPoolContract(address, provider) {
         return types_1.ClPool__factory.connect(address, provider);
     }
     catch (e) {
-        console.error("Couldn't create ClPool contract with address: ".concat(address));
+        console.error(`Couldn't create ClPool contract with address: ${address}`);
         throw e;
     }
 }
@@ -64,18 +64,18 @@ function getMultiFeeDistributorContract(address, signerOrProvider) {
         return types_1.MultiFeeDistributer__factory.connect(address, signerOrProvider);
     }
     catch (e) {
-        console.error("Couldn't create MultiFeeDistributer contract with address: ".concat(address));
+        console.error(`Couldn't create MultiFeeDistributer contract with address: ${address}`);
         throw e;
     }
 }
 exports.getMultiFeeDistributorContract = getMultiFeeDistributorContract;
 function getDepositGuardWithHtsWrappingContract(address, signerOrProvider) {
-    (0, address_1.getAddress)(address);
+    (0, ethers_1.getAddress)(address);
     return types_1.DepositGuardWithHtsWrapping__factory.connect(address, signerOrProvider);
 }
 exports.getDepositGuardWithHtsWrappingContract = getDepositGuardWithHtsWrappingContract;
 function getERC20WrapperContract(address, signerOrProvider) {
-    (0, address_1.getAddress)(address);
+    (0, ethers_1.getAddress)(address);
     return types_1.ERC20Wrapper__factory.connect(address, signerOrProvider);
 }
 exports.getERC20WrapperContract = getERC20WrapperContract;

package/dist/src/contracts/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/contracts/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/contracts/index.ts"],"names":[],"mappings":"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"}

package/dist/src/functions/_totalBalances.d.ts

@@ -1,8 +1,7 @@
-import { JsonRpcProvider } from '@ethersproject/providers';
-import { BigNumber } from 'ethers';
+import { JsonRpcProvider } from 'ethers';
 import { IchiVault, SupportedChainId, TotalAmounts, TotalAmountsBN } from '../types';
 export declare function getTokenDecimals(tokenAddress: string, jsonProvider: JsonRpcProvider, chainId: SupportedChainId): Promise<number>;
 export declare function _getTotalAmounts(vault: IchiVault, jsonProvider: JsonRpcProvider, chainId: SupportedChainId): Promise<TotalAmounts>;
 export declare function _getTotalAmounts(vault: IchiVault, jsonProvider: JsonRpcProvider, chainId: SupportedChainId, raw: true): Promise<TotalAmountsBN>;
 export declare function _getTotalSupply(vaultAddress: string, jsonProvider: JsonRpcProvider): Promise<string>;
-export declare function _getTotalSupply(vaultAddress: string, jsonProvider: JsonRpcProvider, raw: true): Promise<BigNumber>;
+export declare function _getTotalSupply(vaultAddress: string, jsonProvider: JsonRpcProvider, raw: true): Promise<bigint>;

package/dist/src/functions/_totalBalances.js

@@ -2,133 +2,62 @@
 /* eslint-disable no-redeclare */
 /* eslint-disable import/prefer-default-export */
 /* eslint-disable no-underscore-dangle */
-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 __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports._getTotalSupply = exports._getTotalAmounts = exports.getTokenDecimals = void 0;
-var contracts_1 = require("../contracts");
-var types_1 = require("../types");
-var formatBigInt_1 = __importDefault(require("../utils/formatBigInt"));
+const contracts_1 = require("../contracts");
+const types_1 = require("../types");
+const formatBigInt_1 = __importDefault(require("../utils/formatBigInt"));
 // eslint-disable-next-line import/no-cycle
-var cache_1 = __importDefault(require("../utils/cache"));
-function getTokenDecimals(tokenAddress, jsonProvider, chainId) {
-    return __awaiter(this, void 0, void 0, function () {
-        var key, cachedData, ttl, tokenContract, tokenDecimals, error_1;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    key = "token-".concat(chainId, "-").concat(tokenAddress);
-                    cachedData = cache_1.default.get(key);
-                    if (cachedData) {
-                        return [2 /*return*/, cachedData];
-                    }
-                    ttl = 24 * 60 * 60 * 1000;
-                    _a.label = 1;
-                case 1:
-                    _a.trys.push([1, 3, , 4]);
-                    tokenContract = (0, contracts_1.getERC20Contract)(tokenAddress, jsonProvider);
-                    return [4 /*yield*/, tokenContract.decimals()];
-                case 2:
-                    tokenDecimals = _a.sent();
-                    cache_1.default.set(key, tokenDecimals, ttl);
-                    return [2 /*return*/, tokenDecimals];
-                case 3:
-                    error_1 = _a.sent();
-                    console.error(error_1);
-                    throw new Error("Could not get token decimals for ".concat(tokenAddress, " on ").concat(chainId));
-                case 4: return [2 /*return*/];
-            }
-        });
-    });
+const cache_1 = __importDefault(require("../utils/cache"));
+async function getTokenDecimals(tokenAddress, jsonProvider, chainId) {
+    const key = `token-${chainId}-${tokenAddress}`;
+    const cachedData = cache_1.default.get(key);
+    if (cachedData) {
+        return cachedData;
+    }
+    const ttl = 24 * 60 * 60 * 1000;
+    try {
+        const tokenContract = (0, contracts_1.getERC20Contract)(tokenAddress, jsonProvider);
+        const tokenDecimals = Number(await tokenContract.decimals());
+        cache_1.default.set(key, tokenDecimals, ttl);
+        return tokenDecimals;
+    }
+    catch (error) {
+        console.error(error);
+        throw new Error(`Could not get token decimals for ${tokenAddress} on ${chainId}`);
+    }
 }
 exports.getTokenDecimals = getTokenDecimals;
-function _getTotalAmounts(vault, jsonProvider, chainId, raw) {
-    return __awaiter(this, void 0, void 0, function () {
-        var vaultContract, totalAmountsBN, token0Decimals, token1Decimals, totalAmounts;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    vaultContract = (0, contracts_1.getIchiVaultContract)(vault.id, jsonProvider);
-                    return [4 /*yield*/, vaultContract.getTotalAmounts()];
-                case 1:
-                    totalAmountsBN = _a.sent();
-                    if (!!raw) return [3 /*break*/, 4];
-                    return [4 /*yield*/, getTokenDecimals(vault.tokenA, jsonProvider, chainId)];
-                case 2:
-                    token0Decimals = _a.sent();
-                    return [4 /*yield*/, getTokenDecimals(vault.tokenB, jsonProvider, chainId)];
-                case 3:
-                    token1Decimals = _a.sent();
-                    totalAmounts = {
-                        total0: (0, formatBigInt_1.default)(totalAmountsBN.total0, token0Decimals),
-                        total1: (0, formatBigInt_1.default)(totalAmountsBN.total1, token1Decimals),
-                        0: (0, formatBigInt_1.default)(totalAmountsBN.total0, token0Decimals),
-                        1: (0, formatBigInt_1.default)(totalAmountsBN.total1, token1Decimals),
-                    };
-                    return [2 /*return*/, totalAmounts];
-                case 4: return [2 /*return*/, totalAmountsBN];
-            }
-        });
-    });
+async function _getTotalAmounts(vault, jsonProvider, chainId, raw) {
+    const vaultContract = (0, contracts_1.getIchiVaultContract)(vault.id, jsonProvider);
+    const totalAmountsBN = await vaultContract.getTotalAmounts();
+    if (!raw) {
+        const token0Decimals = await getTokenDecimals(vault.tokenA, jsonProvider, chainId);
+        const token1Decimals = await getTokenDecimals(vault.tokenB, jsonProvider, chainId);
+        const totalAmounts = {
+            total0: (0, formatBigInt_1.default)(totalAmountsBN.total0, token0Decimals),
+            total1: (0, formatBigInt_1.default)(totalAmountsBN.total1, token1Decimals),
+            0: (0, formatBigInt_1.default)(totalAmountsBN.total0, token0Decimals),
+            1: (0, formatBigInt_1.default)(totalAmountsBN.total1, token1Decimals),
+        };
+        return totalAmounts;
+    }
+    return totalAmountsBN;
 }
 exports._getTotalAmounts = _getTotalAmounts;
-function _getTotalSupply(vaultAddress, jsonProvider, raw) {
-    return __awaiter(this, void 0, void 0, function () {
-        var vaultContract, totalSupply, error_2;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    _a.trys.push([0, 2, , 3]);
-                    vaultContract = (0, contracts_1.getIchiVaultContract)(vaultAddress, jsonProvider);
-                    return [4 /*yield*/, vaultContract.totalSupply()];
-                case 1:
-                    totalSupply = _a.sent();
-                    return [2 /*return*/, raw ? totalSupply : (0, formatBigInt_1.default)(totalSupply, types_1.ichiVaultDecimals)];
-                case 2:
-                    error_2 = _a.sent();
-                    console.error(error_2);
-                    throw new Error("Could not get total supply for ".concat(vaultAddress));
-                case 3: return [2 /*return*/];
-            }
-        });
-    });
+async function _getTotalSupply(vaultAddress, jsonProvider, raw) {
+    try {
+        const vaultContract = (0, contracts_1.getIchiVaultContract)(vaultAddress, jsonProvider);
+        const totalSupply = await vaultContract.totalSupply();
+        return raw ? totalSupply : (0, formatBigInt_1.default)(totalSupply, types_1.ichiVaultDecimals);
+    }
+    catch (error) {
+        console.error(error);
+        throw new Error(`Could not get total supply for ${vaultAddress}`);
+    }
 }
 exports._getTotalSupply = _getTotalSupply;
 //# sourceMappingURL=_totalBalances.js.map

package/dist/src/functions/_totalBalances.js.map

@@ -1 +1 @@
-{"version":3,"file":"_totalBalances.js","sourceRoot":"","sources":["../../../src/functions/_totalBalances.ts"],"names":[],"mappings":";AAAA,iCAAiC;AACjC,iDAAiD;AACjD,yCAAyC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIzC,0CAAsE;AACtE,kCAAwG;AACxG,uEAAiD;AACjD,2CAA2C;AAC3C,yDAAmC;AAEnC,SAAsB,gBAAgB,CACpC,YAAoB,EACpB,YAA6B,EAC7B,OAAyB;;;;;;oBAEnB,GAAG,GAAG,gBAAS,OAAO,cAAI,YAAY,CAAE,CAAC;oBACzC,UAAU,GAAG,eAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;oBAClC,IAAI,UAAU,EAAE;wBACd,sBAAO,UAAoB,EAAC;qBAC7B;oBACK,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;;;;oBAExB,aAAa,GAAG,IAAA,4BAAgB,EAAC,YAAY,EAAE,YAAY,CAAC,CAAC;oBAC7C,qBAAM,aAAa,CAAC,QAAQ,EAAE,EAAA;;oBAA9C,aAAa,GAAG,SAA8B;oBACpD,eAAK,CAAC,GAAG,CAAC,GAAG,EAAE,aAAa,EAAE,GAAG,CAAC,CAAC;oBACnC,sBAAO,aAAa,EAAC;;;oBAErB,OAAO,CAAC,KAAK,CAAC,OAAK,CAAC,CAAC;oBACrB,MAAM,IAAI,KAAK,CAAC,2CAAoC,YAAY,iBAAO,OAAO,CAAE,CAAC,CAAC;;;;;CAErF;AApBD,4CAoBC;AAeD,SAAsB,gBAAgB,CACpC,KAAgB,EAChB,YAA6B,EAC7B,OAAyB,EACzB,GAAU;;;;;;oBAEJ,aAAa,GAAG,IAAA,gCAAoB,EAAC,KAAK,CAAC,EAAE,EAAE,YAAY,CAAC,CAAC;oBAC5C,qBAAM,aAAa,CAAC,eAAe,EAAE,EAAA;;oBAAtD,cAAc,GAAG,SAAqC;yBAExD,CAAC,GAAG,EAAJ,wBAAI;oBACiB,qBAAM,gBAAgB,CAAC,KAAK,CAAC,MAAM,EAAE,YAAY,EAAE,OAAO,CAAC,EAAA;;oBAA5E,cAAc,GAAG,SAA2D;oBAC3D,qBAAM,gBAAgB,CAAC,KAAK,CAAC,MAAM,EAAE,YAAY,EAAE,OAAO,CAAC,EAAA;;oBAA5E,cAAc,GAAG,SAA2D;oBAC5E,YAAY,GAAG;wBACnB,MAAM,EAAE,IAAA,sBAAY,EAAC,cAAc,CAAC,MAAM,EAAE,cAAc,CAAC;wBAC3D,MAAM,EAAE,IAAA,sBAAY,EAAC,cAAc,CAAC,MAAM,EAAE,cAAc,CAAC;wBAC3D,CAAC,EAAE,IAAA,sBAAY,EAAC,cAAc,CAAC,MAAM,EAAE,cAAc,CAAC;wBACtD,CAAC,EAAE,IAAA,sBAAY,EAAC,cAAc,CAAC,MAAM,EAAE,cAAc,CAAC;qBACvC,CAAC;oBAClB,sBAAO,YAAY,EAAC;wBAGtB,sBAAO,cAAc,EAAC;;;;CACvB;AAtBD,4CAsBC;AAUD,SAAsB,eAAe,CAAC,YAAoB,EAAE,YAA6B,EAAE,GAAU;;;;;;;oBAE3F,aAAa,GAAG,IAAA,gCAAoB,EAAC,YAAY,EAAE,YAAY,CAAC,CAAC;oBACnD,qBAAM,aAAa,CAAC,WAAW,EAAE,EAAA;;oBAA/C,WAAW,GAAG,SAAiC;oBAErD,sBAAO,GAAG,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,IAAA,sBAAY,EAAC,WAAW,EAAE,yBAAiB,CAAC,EAAC;;;oBAExE,OAAO,CAAC,KAAK,CAAC,OAAK,CAAC,CAAC;oBACrB,MAAM,IAAI,KAAK,CAAC,yCAAkC,YAAY,CAAE,CAAC,CAAC;;;;;CAErE;AAVD,0CAUC"}
+{"version":3,"file":"_totalBalances.js","sourceRoot":"","sources":["../../../src/functions/_totalBalances.ts"],"names":[],"mappings":";AAAA,iCAAiC;AACjC,iDAAiD;AACjD,yCAAyC;;;;;;AAGzC,4CAAsE;AACtE,oCAAwG;AACxG,yEAAiD;AACjD,2CAA2C;AAC3C,2DAAmC;AAE5B,KAAK,UAAU,gBAAgB,CACpC,YAAoB,EACpB,YAA6B,EAC7B,OAAyB;IAEzB,MAAM,GAAG,GAAG,SAAS,OAAO,IAAI,YAAY,EAAE,CAAC;IAC/C,MAAM,UAAU,GAAG,eAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAClC,IAAI,UAAU,EAAE;QACd,OAAO,UAAoB,CAAC;KAC7B;IACD,MAAM,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IAChC,IAAI;QACF,MAAM,aAAa,GAAG,IAAA,4BAAgB,EAAC,YAAY,EAAE,YAAY,CAAC,CAAC;QACnE,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,aAAa,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC7D,eAAK,CAAC,GAAG,CAAC,GAAG,EAAE,aAAa,EAAE,GAAG,CAAC,CAAC;QACnC,OAAO,aAAa,CAAC;KACtB;IAAC,OAAO,KAAK,EAAE;QACd,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,oCAAoC,YAAY,OAAO,OAAO,EAAE,CAAC,CAAC;KACnF;AACH,CAAC;AApBD,4CAoBC;AAeM,KAAK,UAAU,gBAAgB,CACpC,KAAgB,EAChB,YAA6B,EAC7B,OAAyB,EACzB,GAAU;IAEV,MAAM,aAAa,GAAG,IAAA,gCAAoB,EAAC,KAAK,CAAC,EAAE,EAAE,YAAY,CAAC,CAAC;IACnE,MAAM,cAAc,GAAG,MAAM,aAAa,CAAC,eAAe,EAAE,CAAC;IAE7D,IAAI,CAAC,GAAG,EAAE;QACR,MAAM,cAAc,GAAG,MAAM,gBAAgB,CAAC,KAAK,CAAC,MAAM,EAAE,YAAY,EAAE,OAAO,CAAC,CAAC;QACnF,MAAM,cAAc,GAAG,MAAM,gBAAgB,CAAC,KAAK,CAAC,MAAM,EAAE,YAAY,EAAE,OAAO,CAAC,CAAC;QACnF,MAAM,YAAY,GAAG;YACnB,MAAM,EAAE,IAAA,sBAAY,EAAC,cAAc,CAAC,MAAM,EAAE,cAAc,CAAC;YAC3D,MAAM,EAAE,IAAA,sBAAY,EAAC,cAAc,CAAC,MAAM,EAAE,cAAc,CAAC;YAC3D,CAAC,EAAE,IAAA,sBAAY,EAAC,cAAc,CAAC,MAAM,EAAE,cAAc,CAAC;YACtD,CAAC,EAAE,IAAA,sBAAY,EAAC,cAAc,CAAC,MAAM,EAAE,cAAc,CAAC;SACvC,CAAC;QAClB,OAAO,YAAY,CAAC;KACrB;IAED,OAAO,cAAc,CAAC;AACxB,CAAC;AAtBD,4CAsBC;AAUM,KAAK,UAAU,eAAe,CAAC,YAAoB,EAAE,YAA6B,EAAE,GAAU;IACnG,IAAI;QACF,MAAM,aAAa,GAAG,IAAA,gCAAoB,EAAC,YAAY,EAAE,YAAY,CAAC,CAAC;QACvE,MAAM,WAAW,GAAG,MAAM,aAAa,CAAC,WAAW,EAAE,CAAC;QAEtD,OAAO,GAAG,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,IAAA,sBAAY,EAAC,WAAW,EAAE,yBAAiB,CAAC,CAAC;KACzE;IAAC,OAAO,KAAK,EAAE;QACd,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,kCAAkC,YAAY,EAAE,CAAC,CAAC;KACnE;AACH,CAAC;AAVD,0CAUC"}