@wildcatfi/wildcat-sdk 1.0.7 → 1.0.8

package/dist/account.d.ts

@@ -1,7 +1,8 @@
 import { BigNumber, ContractTransaction } from "ethers";
 import { TokenAmount } from "./token";
 import { Vault } from "./vault";
-import { AccountVaultInfoStructOutput } from "./typechain";
+import { AccountVaultInfoStructOutput, VaultDataWithAccountStructOutput } from "./typechain";
+import { SignerOrProvider } from "./types";
 export type DepositStatus = {
     status: "InsufficientBalance";
 } | {
@@ -35,6 +36,9 @@ export declare class VaultAccount {
     approveAllowanceRemainder(amount: TokenAmount): Promise<ContractTransaction>;
     deposit(amount: TokenAmount): Promise<ContractTransaction>;
     withdraw(amount: TokenAmount): Promise<ContractTransaction>;
+    repay(amount: BigNumber): Promise<ContractTransaction>;
+    repayOutstandingDebt(): Promise<ContractTransaction>;
+    repayDelinquentDebt(): Promise<ContractTransaction>;
     /**
      * @returns Amount of underlying token borrower can borrow
      */
@@ -72,5 +76,28 @@ export declare class VaultAccount {
      */
     checkDepositStep(amount: TokenAmount): DepositStatus;
     static fromAccountVaultInfoStruct(account: string, info: AccountVaultInfoStructOutput, vault: Vault): VaultAccount;
+    static fromVaultDataWithAccountStruct(provider: SignerOrProvider, account: string, info: VaultDataWithAccountStructOutput): VaultAccount;
+    /**
+     * Get a `VaultAccount` for a given account and existing `Vault` instance.
+     * If `vault` is a string, the vault data will be fetched in the same call as the account data.
+     */
+    static getVaultAccount(provider: SignerOrProvider, account: string, vault: Vault | string): Promise<VaultAccount>;
+    /**
+     * Get multiple `VaultAccount`s given an account and existing list of `Vault`
+     * instances or vault addresses. If `vaults` is an array of strings, the vault
+     * data will be fetched in the same call as the account data.
+     */
+    static getVaultAccounts(provider: SignerOrProvider, account: string, vaults: Vault[] | string[]): Promise<VaultAccount[]>;
+    /**
+     * Get all `VaultAccount`s for a given account.
+     * Fetches the vault data in the same call as the account data.
+     */
+    static getAllVaultAccounts(provider: SignerOrProvider, account: string): Promise<VaultAccount[]>;
+    /**
+     * Get paginated `VaultAccount`s for a given account.
+     * Fetches the vault data in the same call as the account data.
+     * @note Throws an error if `start + count` exceeds the number of vaults.
+     */
+    static getPaginatedVaultAccounts(provider: SignerOrProvider, account: string, start: number | undefined, count: number): Promise<VaultAccount[]>;
 }
 //# sourceMappingURL=account.d.ts.map

package/dist/account.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"account.d.ts","sourceRoot":"","sources":["../src/account.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,mBAAmB,EAAE,MAAM,QAAQ,CAAC;AACxD,OAAO,EAAE,WAAW,EAAkB,MAAM,SAAS,CAAC;AACtD,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,4BAA4B,EAAE,MAAM,aAAa,CAAC;AAI3D,MAAM,MAAM,aAAa,GACrB;IACE,MAAM,EAAE,qBAAqB,CAAC;CAC/B,GACD;IACE,MAAM,EAAE,uBAAuB,CAAC;CACjC,GACD;IACE,MAAM,EAAE,uBAAuB,CAAC;IAChC,SAAS,EAAE,WAAW,CAAC;CACxB,GACD;IACE,MAAM,EAAE,OAAO,CAAC;CACjB,CAAC;AAEN;;;;;;;GAOG;AACH,qBAAa,YAAY;IAEd,OAAO,EAAE,MAAM;IACf,YAAY,EAAE,WAAW;IACzB,iBAAiB,EAAE,WAAW;IAC9B,kBAAkB,EAAE,SAAS;IAC7B,KAAK,EAAE,KAAK;gBAJZ,OAAO,EAAE,MAAM,EACf,YAAY,EAAE,WAAW,EACzB,iBAAiB,EAAE,WAAW,EAC9B,kBAAkB,EAAE,SAAS,EAC7B,KAAK,EAAE,KAAK;IAGrB,MAAM,CAAC,QAAQ,CAAC,aAAa,EAAE,KAAK,CAAC,MAAM,YAAY,CAAC,CAItD;IAEF,IAAI,cAAc,IAAI,OAAO,CAE5B;IAED,IAAI,wBAAwB,IAAI,OAAO,CAEtC;IAED,UAAU,IAAI,OAAO;IAIf,MAAM,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAiBxD,yBAAyB,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAW5E,OAAO,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAW1D,QAAQ,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAQjE;;OAEG;IACH,mBAAmB,CAAC,MAAM,EAAE,WAAW,GAAG,WAAW;IAI/C,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAK7B,WAAW,CAAC,IAAI,EAAE,4BAA4B,GAAG,IAAI;IAKrD;;;OAGG;IACH,IAAI,cAAc,IAAI,WAAW,CAEhC;IAED;;;OAGG;IACH,IAAI,iBAAiB,IAAI,WAAW,CAEnC;IAED;;;OAGG;IACH,gBAAgB,CAAC,MAAM,EAAE,WAAW,GAAG,WAAW;IAIlD;;;OAGG;IACH,mBAAmB,CAAC,MAAM,EAAE,WAAW,GAAG,WAAW;IAIrD,aAAa,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO;IAI3C;;;OAGG;IACH,qBAAqB,CAAC,MAAM,EAAE,WAAW,GAAG,WAAW;IAIvD;;OAEG;IACH,gBAAgB,CAAC,MAAM,EAAE,WAAW,GAAG,aAAa;IAgBpD,MAAM,CAAC,0BAA0B,CAC/B,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,4BAA4B,EAClC,KAAK,EAAE,KAAK,GACX,YAAY;CAShB"}
+{"version":3,"file":"account.d.ts","sourceRoot":"","sources":["../src/account.ts"],"names":[],"mappings":"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"}

package/dist/account.js

@@ -2,8 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VaultAccount = void 0;
 const token_1 = require("./token");
+const vault_1 = require("./vault");
 const misc_1 = require("./misc");
 const constants_1 = require("./constants");
+const isVaultInstanceArray = (vaults) => {
+    return typeof vaults[0] !== "string";
+};
 /**
  * Class to provide information about a vault user's account
  * and to wrap interactions.
@@ -43,7 +47,7 @@ class VaultAccount {
         if (this.vault.controller !== controller.address) {
             throw Error(`Unexpected controller address: ${this.vault.controller}`);
         }
-        return controller.reduceInterestRate(this.vault.address, newAprBips);
+        return controller.setAnnualInterestBips(this.vault.address, newAprBips);
     }
     async approveAllowanceRemainder(amount) {
         const token = this.vault.underlyingToken;
@@ -72,6 +76,36 @@ class VaultAccount {
         }
         return this.vault.contract.withdraw(amount.raw, this.account);
     }
+    async repay(amount) {
+        const signer = await this.vault.signer.getAddress();
+        if (signer !== this.account) {
+            throw Error(`VaultAccount signer ${signer} does not match ${this.account}`);
+        }
+        if (!this.isBorrower) {
+            throw Error("Only borrower can repay");
+        }
+        return this.vault.contract.repay(amount);
+    }
+    async repayOutstandingDebt() {
+        const signer = await this.vault.signer.getAddress();
+        if (signer !== this.account) {
+            throw Error(`VaultAccount signer ${signer} does not match ${this.account}`);
+        }
+        if (!this.isBorrower) {
+            throw Error("Only borrower can repay");
+        }
+        return this.vault.contract.repayOutstandingDebt();
+    }
+    async repayDelinquentDebt() {
+        const signer = await this.vault.signer.getAddress();
+        if (signer !== this.account) {
+            throw Error(`VaultAccount signer ${signer} does not match ${this.account}`);
+        }
+        if (!this.isBorrower) {
+            throw Error("Only borrower can repay");
+        }
+        return this.vault.contract.repayDelinquentDebt();
+    }
     /**
      * @returns Amount of underlying token borrower can borrow
      */
@@ -145,6 +179,68 @@ class VaultAccount {
     static fromAccountVaultInfoStruct(account, info, vault) {
         return new VaultAccount(account, vault.vaultToken.getAmount(info.normalizedBalance), vault.underlyingToken.getAmount(info.underlyingBalance), info.underlyingApproval, vault);
     }
+    static fromVaultDataWithAccountStruct(provider, account, info) {
+        return VaultAccount.fromAccountVaultInfoStruct(account, info.account, vault_1.Vault.fromVaultMetadataStruct(info.vault, provider));
+    }
+    /**
+     * Get a `VaultAccount` for a given account and existing `Vault` instance.
+     * If `vault` is a string, the vault data will be fetched in the same call as the account data.
+     */
+    static async getVaultAccount(provider, account, vault) {
+        const lens = (0, constants_1.getLensContract)(provider);
+        if (vault instanceof vault_1.Vault) {
+            return lens
+                .getAccountVaultInfo(account, vault.address)
+                .then((info) => VaultAccount.fromAccountVaultInfoStruct(account, info, vault));
+        }
+        else {
+            return lens
+                .getVaultDataWithAccount(account, vault)
+                .then((info) => VaultAccount.fromVaultDataWithAccountStruct(provider, account, info));
+        }
+    }
+    /**
+     * Get multiple `VaultAccount`s given an account and existing list of `Vault`
+     * instances or vault addresses. If `vaults` is an array of strings, the vault
+     * data will be fetched in the same call as the account data.
+     */
+    static async getVaultAccounts(provider, account, vaults) {
+        const lens = (0, constants_1.getLensContract)(provider);
+        if (vaults.length === 0) {
+            return [];
+        }
+        if (isVaultInstanceArray(vaults)) {
+            return lens
+                .getAccountVaultsInfo(account, vaults.map((v) => v.address))
+                .then((infos) => infos.map((info, i) => VaultAccount.fromAccountVaultInfoStruct(account, info, vaults[i])));
+        }
+        else {
+            return lens
+                .getVaultsDataWithAccount(account, vaults)
+                .then((infos) => infos.map((info) => VaultAccount.fromVaultDataWithAccountStruct(provider, account, info)));
+        }
+    }
+    /**
+     * Get all `VaultAccount`s for a given account.
+     * Fetches the vault data in the same call as the account data.
+     */
+    static getAllVaultAccounts(provider, account) {
+        const lens = (0, constants_1.getLensContract)(provider);
+        return lens
+            .getAllVaultsDataWithAccount(account)
+            .then((infos) => infos.map((info) => VaultAccount.fromVaultDataWithAccountStruct(provider, account, info)));
+    }
+    /**
+     * Get paginated `VaultAccount`s for a given account.
+     * Fetches the vault data in the same call as the account data.
+     * @note Throws an error if `start + count` exceeds the number of vaults.
+     */
+    static getPaginatedVaultAccounts(provider, account, start = 0, count) {
+        const lens = (0, constants_1.getLensContract)(provider);
+        return lens
+            .getPaginatedVaultsDataWithAccount(account, start, count)
+            .then((infos) => infos.map((info) => VaultAccount.fromVaultDataWithAccountStruct(provider, account, info)));
+    }
 }
 VaultAccount.UpdatableKeys = [
     "vaultBalance",

package/dist/account.js.map

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

package/dist/constants.d.ts

@@ -1,10 +1,10 @@
 import { BigNumber } from "ethers";
 import { VaultLens, WildcatVaultController, WildcatVaultFactory, MockERC20Factory } from "./typechain";
 import { SignerOrProvider } from "./types";
-export declare const LensAddress = "0xD064d1981F721fe35cb45227B9c37b3bd46eAe8d";
+export declare const LensAddress = "0x078BE578bFB8f359399d3FAecb7e8a5583Af9fa2";
 export declare const MockERC20FactoryAddress = "0x7d1d45890c937b260b7345B91d6B457e470B13e4";
-export declare const FactoryAddress = "0x2050084919527BDE33Ff2dc9ef3768B2E335AC71";
-export declare const ControllerAddress = "0x41176b30395e1EeA87dd6deb6d796c56097F6fA0";
+export declare const FactoryAddress = "0xA7F3b0D71E0e526c9fb352725D7121583f18B2FE";
+export declare const ControllerAddress = "0xE05EF4571Dd4b5B94a7104E33283A42FD238Ef6a";
 export declare const getControllerContract: (provider: SignerOrProvider) => WildcatVaultController;
 export declare const getFactoryContract: (provider: SignerOrProvider) => WildcatVaultFactory;
 export declare const getLensContract: (provider: SignerOrProvider) => VaultLens;

package/dist/constants.js

@@ -3,10 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.WAD = exports.RAY = exports.getMockERC20Factory = exports.getLensContract = exports.getFactoryContract = exports.getControllerContract = exports.ControllerAddress = exports.FactoryAddress = exports.MockERC20FactoryAddress = exports.LensAddress = void 0;
 const ethers_1 = require("ethers");
 const typechain_1 = require("./typechain");
-exports.LensAddress = "0xD064d1981F721fe35cb45227B9c37b3bd46eAe8d";
+exports.LensAddress = "0x078BE578bFB8f359399d3FAecb7e8a5583Af9fa2";
 exports.MockERC20FactoryAddress = "0x7d1d45890c937b260b7345B91d6B457e470B13e4";
-exports.FactoryAddress = "0x2050084919527BDE33Ff2dc9ef3768B2E335AC71";
-exports.ControllerAddress = "0x41176b30395e1EeA87dd6deb6d796c56097F6fA0";
+exports.FactoryAddress = "0xA7F3b0D71E0e526c9fb352725D7121583f18B2FE";
+exports.ControllerAddress = "0xE05EF4571Dd4b5B94a7104E33283A42FD238Ef6a";
 const getControllerContract = (provider) => {
     return typechain_1.WildcatVaultController__factory.connect(exports.ControllerAddress, provider);
 };

package/dist/controller.d.ts

@@ -2,6 +2,7 @@ import { WildcatVaultController, WildcatVaultController__factory } from "./typec
 import { ContractWrapper, SignerOrProvider } from "./types";
 import { Vault } from "./vault";
 import { VaultParameters } from "./factory";
+import { MakeOptional } from "./misc";
 export declare class VaultController extends ContractWrapper<WildcatVaultController> {
     address: string;
     readonly contractFactory: typeof WildcatVaultController__factory;
@@ -9,6 +10,6 @@ export declare class VaultController extends ContractWrapper<WildcatVaultControl
     isKnownVault(vault: string): Promise<boolean>;
     getAllVaults(provider: SignerOrProvider): Promise<Vault[]>;
     static getController(provider: SignerOrProvider): Promise<VaultController>;
-    deployVault(params: Omit<VaultParameters, "controller">): Promise<Vault>;
+    deployVault(params: Omit<MakeOptional<VaultParameters, "feeRecipient" | "borrower">, "controller">): Promise<Vault>;
 }
 //# sourceMappingURL=controller.d.ts.map

package/dist/controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"controller.d.ts","sourceRoot":"","sources":["../src/controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,+BAA+B,EAAE,MAAM,aAAa,CAAC;AAEtF,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAC5D,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAgB,eAAe,EAAE,MAAM,WAAW,CAAC;AAE1D,qBAAa,eAAgB,SAAQ,eAAe,CAAC,sBAAsB,CAAC;IAGvD,OAAO,EAAE,MAAM;IAFlC,QAAQ,CAAC,eAAe,yCAAmC;gBAExC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,gBAAgB;IAIxD,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAI7C,YAAY,CAAC,QAAQ,EAAE,gBAAgB,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;WAUnD,aAAa,CAAC,QAAQ,EAAE,gBAAgB,GAAG,OAAO,CAAC,eAAe,CAAC;IAI1E,WAAW,CAAC,MAAM,EAAE,IAAI,CAAC,eAAe,EAAE,YAAY,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC;CAG/E"}
+{"version":3,"file":"controller.d.ts","sourceRoot":"","sources":["../src/controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,+BAA+B,EAAE,MAAM,aAAa,CAAC;AAEtF,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAC5D,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAgB,eAAe,EAAE,MAAM,WAAW,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAEtC,qBAAa,eAAgB,SAAQ,eAAe,CAAC,sBAAsB,CAAC;IAGvD,OAAO,EAAE,MAAM;IAFlC,QAAQ,CAAC,eAAe,yCAAmC;gBAExC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,gBAAgB;IAIxD,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAI7C,YAAY,CAAC,QAAQ,EAAE,gBAAgB,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;WAYnD,aAAa,CAAC,QAAQ,EAAE,gBAAgB,GAAG,OAAO,CAAC,eAAe,CAAC;IAI1E,WAAW,CACf,MAAM,EAAE,IAAI,CAAC,YAAY,CAAC,eAAe,EAAE,cAAc,GAAG,UAAU,CAAC,EAAE,YAAY,CAAC,GACrF,OAAO,CAAC,KAAK,CAAC;CAGlB"}

package/dist/controller.js

@@ -16,17 +16,19 @@ class VaultController extends types_1.ContractWrapper {
         return await this.contract.vaults(vault);
     }
     async getAllVaults(provider) {
-        const factory = (0, constants_1.getFactoryContract)(provider);
-        const vaults = (await this.contract.queryFilter(factory.filters.VaultDeployed(constants_1.ControllerAddress), 3399789)).map(({ args: { vault } }) => vault);
-        console.log("vaults", vaults);
-        const metadatas = await (0, constants_1.getLensContract)(provider).getVaultsMetadata(vaults);
+        /* const factory = getFactoryContract(provider);
+        const vaults = (
+          await this.contract.queryFilter(factory.filters.VaultDeployed(ControllerAddress), 3399789)
+        ).map(({ args: { vault } }) => vault);
+        console.log("vaults", vaults); */
+        const metadatas = (await (0, constants_1.getLensContract)(provider).getAllVaultsData()).filter((x) => x.controller === this.address);
         return metadatas.map((x) => vault_1.Vault.fromVaultMetadataStruct(x, provider));
     }
     static async getController(provider) {
         return new VaultController(constants_1.ControllerAddress, provider);
     }
     async deployVault(params) {
-        return factory_1.VaultFactory.deployVault({ ...params, controller: this.address }, this.provider);
+        return factory_1.VaultFactory.deployVault({ ...params, controller: this.address }, this.signer);
     }
 }
 exports.VaultController = VaultController;

package/dist/controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"controller.js","sourceRoot":"","sources":["../src/controller.ts"],"names":[],"mappings":";;;AAAA,2CAAsF;AACtF,2CAAqF;AACrF,mCAA4D;AAC5D,mCAAgC;AAChC,uCAA0D;AAE1D,MAAa,eAAgB,SAAQ,uBAAuC;IAG1E,YAAmB,OAAe,EAAE,QAA0B;QAC5D,KAAK,CAAC,QAAQ,CAAC,CAAC;QADC,YAAO,GAAP,OAAO,CAAQ;QAFzB,oBAAe,GAAG,2CAA+B,CAAC;IAI3D,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,KAAa;QAC9B,OAAO,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC3C,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,QAA0B;QAC3C,MAAM,OAAO,GAAG,IAAA,8BAAkB,EAAC,QAAQ,CAAC,CAAC;QAC7C,MAAM,MAAM,GAAG,CACb,MAAM,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,6BAAiB,CAAC,EAAE,OAAO,CAAC,CAC3F,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC;QACtC,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QAC9B,MAAM,SAAS,GAAG,MAAM,IAAA,2BAAe,EAAC,QAAQ,CAAC,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;QAC5E,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,aAAK,CAAC,uBAAuB,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC;IAC1E,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,QAA0B;QACnD,OAAO,IAAI,eAAe,CAAC,6BAAiB,EAAE,QAAQ,CAAC,CAAC;IAC1D,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,MAA2C;QAC3D,OAAO,sBAAY,CAAC,WAAW,CAAC,EAAE,GAAG,MAAM,EAAE,UAAU,EAAE,IAAI,CAAC,OAAO,EAAE,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC1F,CAAC;CACF;AA5BD,0CA4BC"}
+{"version":3,"file":"controller.js","sourceRoot":"","sources":["../src/controller.ts"],"names":[],"mappings":";;;AAAA,2CAAsF;AACtF,2CAAiE;AACjE,mCAA4D;AAC5D,mCAAgC;AAChC,uCAA0D;AAG1D,MAAa,eAAgB,SAAQ,uBAAuC;IAG1E,YAAmB,OAAe,EAAE,QAA0B;QAC5D,KAAK,CAAC,QAAQ,CAAC,CAAC;QADC,YAAO,GAAP,OAAO,CAAQ;QAFzB,oBAAe,GAAG,2CAA+B,CAAC;IAI3D,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,KAAa;QAC9B,OAAO,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC3C,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,QAA0B;QAC3C;;;;yCAIiC;QACjC,MAAM,SAAS,GAAG,CAAC,MAAM,IAAA,2BAAe,EAAC,QAAQ,CAAC,CAAC,gBAAgB,EAAE,CAAC,CAAC,MAAM,CAC3E,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,KAAK,IAAI,CAAC,OAAO,CACrC,CAAC;QACF,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,aAAK,CAAC,uBAAuB,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC;IAC1E,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,QAA0B;QACnD,OAAO,IAAI,eAAe,CAAC,6BAAiB,EAAE,QAAQ,CAAC,CAAC;IAC1D,CAAC;IAED,KAAK,CAAC,WAAW,CACf,MAAsF;QAEtF,OAAO,sBAAY,CAAC,WAAW,CAAC,EAAE,GAAG,MAAM,EAAE,UAAU,EAAE,IAAI,CAAC,OAAO,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACxF,CAAC;CACF;AAhCD,0CAgCC"}

package/dist/factory.d.ts

@@ -1,7 +1,8 @@
 import { Token, TokenAmount } from "./token";
 import { WildcatVaultFactory, WildcatVaultFactory__factory } from "./typechain";
-import { ContractWrapper, SignerOrProvider } from "./types";
+import { ContractWrapper, Signer, SignerOrProvider } from "./types";
 import { Vault } from "./vault";
+import { MakeOptional } from "./misc";
 export type VaultParameters = {
     asset: Token;
     namePrefix: string;
@@ -22,6 +23,6 @@ export declare class VaultFactory extends ContractWrapper<WildcatVaultFactory> {
     constructor(address: string, provider: SignerOrProvider);
     static getFactory(provider: SignerOrProvider): VaultFactory;
     deployVault(params: VaultParameters): Promise<Vault>;
-    static deployVault(params: VaultParameters, provider: SignerOrProvider): Promise<Vault>;
+    static deployVault(params: MakeOptional<VaultParameters, "feeRecipient" | "borrower" | "controller">, signer: Signer): Promise<Vault>;
 }
 //# sourceMappingURL=factory.d.ts.map

package/dist/factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAC7C,OAAO,EAAE,mBAAmB,EAAE,4BAA4B,EAAE,MAAM,aAAa,CAAC;AAChF,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAC5D,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAEhC,MAAM,MAAM,eAAe,GAAG;IAC5B,KAAK,EAAE,KAAK,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,WAAW,CAAC;IAC5B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,sBAAsB,EAAE,MAAM,CAAC;IAC/B,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,qBAAa,YAAa,SAAQ,eAAe,CAAC,mBAAmB,CAAC;IAGjD,OAAO,EAAE,MAAM;IAFlC,QAAQ,CAAC,eAAe,sCAAgC;gBAErC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,gBAAgB;IAI9D,MAAM,CAAC,UAAU,CAAC,QAAQ,EAAE,gBAAgB,GAAG,YAAY;IAIrD,WAAW,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,KAAK,CAAC;WAyB7C,WAAW,CAAC,MAAM,EAAE,eAAe,EAAE,QAAQ,EAAE,gBAAgB,GAAG,OAAO,CAAC,KAAK,CAAC;CAI9F"}
+{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAC7C,OAAO,EAAE,mBAAmB,EAAE,4BAA4B,EAAE,MAAM,aAAa,CAAC;AAChF,OAAO,EAAE,eAAe,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AACpE,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAEtC,MAAM,MAAM,eAAe,GAAG;IAC5B,KAAK,EAAE,KAAK,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,WAAW,CAAC;IAC5B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,sBAAsB,EAAE,MAAM,CAAC;IAC/B,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAKF,qBAAa,YAAa,SAAQ,eAAe,CAAC,mBAAmB,CAAC;IAGjD,OAAO,EAAE,MAAM;IAFlC,QAAQ,CAAC,eAAe,sCAAgC;gBAErC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,gBAAgB;IAI9D,MAAM,CAAC,UAAU,CAAC,QAAQ,EAAE,gBAAgB,GAAG,YAAY;IAIrD,WAAW,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,KAAK,CAAC;WAyB7C,WAAW,CAAC,MAAM,EAAE,YAAY,CAAC,eAAe,EAAE,cAAc,GAAG,UAAU,GAAG,YAAY,CAAC,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC;CAS5I"}

package/dist/factory.js

@@ -1,10 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VaultFactory = void 0;
+/* eslint-disable prettier/prettier */
+const utils_1 = require("ethers/lib/utils");
 const constants_1 = require("./constants");
 const typechain_1 = require("./typechain");
 const types_1 = require("./types");
 const vault_1 = require("./vault");
+const DefaultFeeRecipient = (0, utils_1.getAddress)(`0xf335`.padEnd(42, "0"));
 class VaultFactory extends types_1.ContractWrapper {
     constructor(address, provider) {
         super(provider);
@@ -31,11 +34,16 @@ class VaultFactory extends types_1.ContractWrapper {
         });
         await tx.wait();
         const address = await this.contract.computeVaultAddress(params.controller, await this.signer.getAddress(), params.asset.address);
-        return vault_1.Vault.getVault(address, this.provider);
+        return vault_1.Vault.getVaultData(address, this.provider);
     }
-    static async deployVault(params, provider) {
-        const factory = VaultFactory.getFactory(provider);
-        return factory.deployVault(params);
+    static async deployVault(params, signer) {
+        const factory = VaultFactory.getFactory(signer);
+        return factory.deployVault({
+            feeRecipient: DefaultFeeRecipient,
+            controller: constants_1.ControllerAddress,
+            borrower: await signer.getAddress(),
+            ...params
+        });
     }
 }
 exports.VaultFactory = VaultFactory;

package/dist/factory.js.map

@@ -1 +1 @@
-{"version":3,"file":"factory.js","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":";;;AAAA,2CAA6C;AAE7C,2CAAgF;AAChF,mCAA4D;AAC5D,mCAAgC;AAiBhC,MAAa,YAAa,SAAQ,uBAAoC;IAGpE,YAAmB,OAAe,EAAE,QAA0B;QAC5D,KAAK,CAAC,QAAQ,CAAC,CAAC;QADC,YAAO,GAAP,OAAO,CAAQ;QAFzB,oBAAe,GAAG,wCAA4B,CAAC;IAIxD,CAAC;IAED,MAAM,CAAC,UAAU,CAAC,QAA0B;QAC1C,OAAO,IAAI,YAAY,CAAC,0BAAc,EAAE,QAAQ,CAAC,CAAC;IACpD,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,MAAuB;QACvC,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC;YACzC,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,OAAO;YAC3B,UAAU,EAAE,MAAM,CAAC,UAAU;YAC7B,YAAY,EAAE,MAAM,CAAC,YAAY;YACjC,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,UAAU,EAAE,MAAM,CAAC,UAAU;YAC7B,cAAc,EAAE,MAAM,CAAC,cAAc,CAAC,GAAG,CAAC,QAAQ,EAAE;YACpD,kBAAkB,EAAE,MAAM,CAAC,kBAAkB;YAC7C,cAAc,EAAE,MAAM,CAAC,cAAc;YACrC,WAAW,EAAE,MAAM,CAAC,WAAW;YAC/B,sBAAsB,EAAE,MAAM,CAAC,sBAAsB;YACrD,eAAe,EAAE,MAAM,CAAC,eAAe;YACvC,YAAY,EAAE,MAAM,CAAC,YAAY;SAClC,CAAC,CAAC;QAEH,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC;QAChB,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,mBAAmB,CACrD,MAAM,CAAC,UAAU,EACjB,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,EAC9B,MAAM,CAAC,KAAK,CAAC,OAAO,CACrB,CAAC;QACF,OAAO,aAAK,CAAC,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;IAChD,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,MAAuB,EAAE,QAA0B;QAC1E,MAAM,OAAO,GAAG,YAAY,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QAClD,OAAO,OAAO,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IACrC,CAAC;CACF;AAxCD,oCAwCC"}
+{"version":3,"file":"factory.js","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":";;;AAAA,sCAAsC;AACtC,4CAA8C;AAC9C,2CAAgE;AAEhE,2CAAgF;AAChF,mCAAoE;AACpE,mCAAgC;AAmBhC,MAAM,mBAAmB,GAAG,IAAA,kBAAU,EAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC,CAAC;AAEjE,MAAa,YAAa,SAAQ,uBAAoC;IAGpE,YAAmB,OAAe,EAAE,QAA0B;QAC5D,KAAK,CAAC,QAAQ,CAAC,CAAC;QADC,YAAO,GAAP,OAAO,CAAQ;QAFzB,oBAAe,GAAG,wCAA4B,CAAC;IAIxD,CAAC;IAED,MAAM,CAAC,UAAU,CAAC,QAA0B;QAC1C,OAAO,IAAI,YAAY,CAAC,0BAAc,EAAE,QAAQ,CAAC,CAAC;IACpD,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,MAAuB;QACvC,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC;YACzC,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,OAAO;YAC3B,UAAU,EAAE,MAAM,CAAC,UAAU;YAC7B,YAAY,EAAE,MAAM,CAAC,YAAY;YACjC,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,UAAU,EAAE,MAAM,CAAC,UAAU;YAC7B,cAAc,EAAE,MAAM,CAAC,cAAc,CAAC,GAAG,CAAC,QAAQ,EAAE;YACpD,kBAAkB,EAAE,MAAM,CAAC,kBAAkB;YAC7C,cAAc,EAAE,MAAM,CAAC,cAAc;YACrC,WAAW,EAAE,MAAM,CAAC,WAAW;YAC/B,sBAAsB,EAAE,MAAM,CAAC,sBAAsB;YACrD,eAAe,EAAE,MAAM,CAAC,eAAe;YACvC,YAAY,EAAE,MAAM,CAAC,YAAY;SAClC,CAAC,CAAC;QAEH,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC;QAChB,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,mBAAmB,CACrD,MAAM,CAAC,UAAU,EACjB,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,EAC9B,MAAM,CAAC,KAAK,CAAC,OAAO,CACrB,CAAC;QACF,OAAO,aAAK,CAAC,YAAY,CAAC,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;IACpD,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,MAAiF,EAAE,MAAc;QACxH,MAAM,OAAO,GAAG,YAAY,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QAChD,OAAO,OAAO,CAAC,WAAW,CAAC;YACzB,YAAY,EAAE,mBAAmB;YACjC,UAAU,EAAE,6BAAiB;YAC7B,QAAQ,EAAE,MAAM,MAAM,CAAC,UAAU,EAAE;YACnC,GAAG,MAAM;SACV,CAAC,CAAC;IACL,CAAC;CACF;AA7CD,oCA6CC"}

package/dist/index.d.ts

@@ -1,14 +1,17 @@
 import { VaultAccount } from "./account";
 import { VaultFactory } from "./factory";
-import { Signer, SignerOrProvider } from "./types";
+import { Token } from "./token";
 import { Vault } from "./vault";
-export * from "./vault";
-export { Signer, Provider, SignerOrProvider } from "./types";
 export * from "./account";
+export * from "./constants";
 export * from "./controller";
-export * from "./token";
 export * from "./factory";
-export declare const getFactory: typeof VaultFactory.getFactory;
-export declare function getAllVaults(provider: SignerOrProvider): Promise<Vault[]>;
-export declare function getAllVaultAccountsForUser(provider: Signer): Promise<VaultAccount[]>;
+export * from "./mockerc20factory";
+export * from "./token";
+export * from "./types";
+export * from "./vault";
+export declare const getVaultData: typeof Vault.getVaultData, getVaultsData: typeof Vault.getVaultsData, getAllVaultsData: typeof Vault.getAllVaultsData, getVaultsCount: typeof Vault.getVaultsCount, getPaginatedVaultsData: typeof Vault.getPaginatedVaultsData;
+export declare const getFactory: typeof VaultFactory.getFactory, deployVault: typeof VaultFactory.deployVault;
+export declare const getVaultAccount: typeof VaultAccount.getVaultAccount, getVaultAccounts: typeof VaultAccount.getVaultAccounts, getAllVaultAccounts: typeof VaultAccount.getAllVaultAccounts, getPaginatedVaultAccounts: typeof VaultAccount.getPaginatedVaultAccounts;
+export declare const getTokenData: typeof Token.getTokenData, getTokensData: typeof Token.getTokensData;
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAEzC,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAY,MAAM,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAC7D,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,cAAc,SAAS,CAAC;AACxB,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAC7D,cAAc,WAAW,CAAC;AAC1B,cAAc,cAAc,CAAC;AAC7B,cAAc,SAAS,CAAC;AACxB,cAAc,WAAW,CAAC;AAE1B,eAAO,MAAM,UAAU,gCAA0B,CAAC;AAElD,wBAAsB,YAAY,CAAC,QAAQ,EAAE,gBAAgB,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC,CAkB/E;AAED,wBAAsB,0BAA0B,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,CAS1F"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAEhC,cAAc,WAAW,CAAC;AAC1B,cAAc,aAAa,CAAC;AAC5B,cAAc,cAAc,CAAC;AAC7B,cAAc,WAAW,CAAC;AAC1B,cAAc,oBAAoB,CAAC;AACnC,cAAc,SAAS,CAAC;AACxB,cAAc,SAAS,CAAC;AACxB,cAAc,SAAS,CAAC;AAExB,eAAO,MACL,YAAY,6BACZ,aAAa,8BACb,gBAAgB,iCAChB,cAAc,+BACd,sBAAsB,qCACf,CAAC;AAEV,eAAO,MAAQ,UAAU,kCAAE,WAAW,iCAAiB,CAAC;AAExD,eAAO,MAAQ,eAAe,uCAAE,gBAAgB,wCAAE,mBAAmB,2CAAE,yBAAyB,+CAClF,CAAC;AAEf,eAAO,MAAQ,YAAY,6BAAE,aAAa,4BAAU,CAAC"}

package/dist/index.js

@@ -14,43 +14,21 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAllVaultAccountsForUser = exports.getAllVaults = exports.getFactory = exports.Provider = exports.Signer = void 0;
-const constants_1 = require("./constants");
+exports.getTokensData = exports.getTokenData = exports.getPaginatedVaultAccounts = exports.getAllVaultAccounts = exports.getVaultAccounts = exports.getVaultAccount = exports.deployVault = exports.getFactory = exports.getPaginatedVaultsData = exports.getVaultsCount = exports.getAllVaultsData = exports.getVaultsData = exports.getVaultData = void 0;
+const account_1 = require("./account");
 const factory_1 = require("./factory");
-const types_1 = require("./types");
+const token_1 = require("./token");
 const vault_1 = require("./vault");
-__exportStar(require("./vault"), exports);
-var types_2 = require("./types");
-Object.defineProperty(exports, "Signer", { enumerable: true, get: function () { return types_2.Signer; } });
-Object.defineProperty(exports, "Provider", { enumerable: true, get: function () { return types_2.Provider; } });
 __exportStar(require("./account"), exports);
+__exportStar(require("./constants"), exports);
 __exportStar(require("./controller"), exports);
-__exportStar(require("./token"), exports);
 __exportStar(require("./factory"), exports);
-exports.getFactory = factory_1.VaultFactory.getFactory;
-async function getAllVaults(provider) {
-    const factory = (0, constants_1.getFactoryContract)(provider);
-    const currentBlock = await (provider instanceof types_1.Provider
-        ? provider
-        : provider.provider).getBlockNumber();
-    const vaults = [];
-    for (let block = 3399789; block < currentBlock; block += 5000) {
-        const from = block;
-        const to = Math.min(block + 5000, currentBlock);
-        const newVaults = (await factory.queryFilter(factory.filters.VaultDeployed(), from, to)).map(({ args: { vault } }) => vault);
-        vaults.push(...newVaults);
-    }
-    const metadatas = await (0, constants_1.getLensContract)(provider).getVaultsMetadata(vaults);
-    return metadatas.map((x) => vault_1.Vault.fromVaultMetadataStruct(x, provider));
-}
-exports.getAllVaults = getAllVaults;
-async function getAllVaultAccountsForUser(provider) {
-    const account = await provider.getAddress();
-    const vaults = await getAllVaults(provider);
-    const accounts = (await Promise.all(vaults.map((vault) => vault.getAccountInfo(account)))).filter((acct) => {
-        return acct.userHasBalance || acct.userHasUnderlyingBalance || acct.isBorrower;
-    });
-    return accounts;
-}
-exports.getAllVaultAccountsForUser = getAllVaultAccountsForUser;
+__exportStar(require("./mockerc20factory"), exports);
+__exportStar(require("./token"), exports);
+__exportStar(require("./types"), exports);
+__exportStar(require("./vault"), exports);
+exports.getVaultData = vault_1.Vault.getVaultData, exports.getVaultsData = vault_1.Vault.getVaultsData, exports.getAllVaultsData = vault_1.Vault.getAllVaultsData, exports.getVaultsCount = vault_1.Vault.getVaultsCount, exports.getPaginatedVaultsData = vault_1.Vault.getPaginatedVaultsData;
+exports.getFactory = factory_1.VaultFactory.getFactory, exports.deployVault = factory_1.VaultFactory.deployVault;
+exports.getVaultAccount = account_1.VaultAccount.getVaultAccount, exports.getVaultAccounts = account_1.VaultAccount.getVaultAccounts, exports.getAllVaultAccounts = account_1.VaultAccount.getAllVaultAccounts, exports.getPaginatedVaultAccounts = account_1.VaultAccount.getPaginatedVaultAccounts;
+exports.getTokenData = token_1.Token.getTokenData, exports.getTokensData = token_1.Token.getTokensData;
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AACA,2CAAkE;AAClE,uCAAyC;AACzC,mCAA6D;AAC7D,mCAAgC;AAChC,0CAAwB;AACxB,iCAA6D;AAApD,+FAAA,MAAM,OAAA;AAAE,iGAAA,QAAQ,OAAA;AACzB,4CAA0B;AAC1B,+CAA6B;AAC7B,0CAAwB;AACxB,4CAA0B;AAEb,QAAA,UAAU,GAAG,sBAAY,CAAC,UAAU,CAAC;AAE3C,KAAK,UAAU,YAAY,CAAC,QAA0B;IAC3D,MAAM,OAAO,GAAG,IAAA,8BAAkB,EAAC,QAAQ,CAAC,CAAC;IAC7C,MAAM,YAAY,GAAG,MAAM,CAAC,QAAQ,YAAY,gBAAQ;QACtD,CAAC,CAAC,QAAQ;QACV,CAAC,CAAC,QAAQ,CAAC,QAAS,CACrB,CAAC,cAAc,EAAE,CAAC;IACnB,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,KAAK,IAAI,KAAK,GAAG,OAAO,EAAE,KAAK,GAAG,YAAY,EAAE,KAAK,IAAI,IAAI,EAAE;QAC7D,MAAM,IAAI,GAAG,KAAK,CAAC;QACnB,MAAM,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,GAAG,IAAI,EAAE,YAAY,CAAC,CAAC;QAChD,MAAM,SAAS,GAAG,CAAC,MAAM,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,aAAa,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAC1F,CAAC,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,CAAC,KAAK,CAC/B,CAAC;QAEF,MAAM,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,CAAC;KAC3B;IACD,MAAM,SAAS,GAAG,MAAM,IAAA,2BAAe,EAAC,QAAQ,CAAC,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;IAC5E,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,aAAK,CAAC,uBAAuB,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC;AAC1E,CAAC;AAlBD,oCAkBC;AAEM,KAAK,UAAU,0BAA0B,CAAC,QAAgB;IAC/D,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,UAAU,EAAE,CAAC;IAC5C,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,QAAQ,CAAC,CAAC;IAC5C,MAAM,QAAQ,GAAG,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAC/F,CAAC,IAAI,EAAE,EAAE;QACP,OAAO,IAAI,CAAC,cAAc,IAAI,IAAI,CAAC,wBAAwB,IAAI,IAAI,CAAC,UAAU,CAAC;IACjF,CAAC,CACF,CAAC;IACF,OAAO,QAAQ,CAAC;AAClB,CAAC;AATD,gEASC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,uCAAyC;AACzC,uCAAyC;AACzC,mCAAgC;AAChC,mCAAgC;AAEhC,4CAA0B;AAC1B,8CAA4B;AAC5B,+CAA6B;AAC7B,4CAA0B;AAC1B,qDAAmC;AACnC,0CAAwB;AACxB,0CAAwB;AACxB,0CAAwB;AAGtB,oBAAY,GAKV,aAAK,eAJP,qBAAa,GAIX,aAAK,gBAHP,wBAAgB,GAGd,aAAK,mBAFP,sBAAc,GAEZ,aAAK,iBADP,8BAAsB,GACpB,aAAK,wBAAC;AAEK,kBAAU,GAAkB,sBAAY,aAA5B,mBAAW,GAAK,sBAAY,aAAC;AAEzC,uBAAe,GAC5B,sBAAY,kBADkB,wBAAgB,GAC9C,sBAAY,mBADoC,2BAAmB,GACnE,sBAAY,sBADyD,iCAAyB,GAC9F,sBAAY,2BAAC;AAEA,oBAAY,GAAoB,aAAK,eAAvB,qBAAa,GAAK,aAAK,eAAC"}

package/dist/misc.d.ts

@@ -4,4 +4,5 @@ export type OnlyValueFields<C> = {
 export type ValueFields<C, K extends keyof C> = K extends string ? K extends keyof C ? C[K] extends (...args: any[]) => any ? never : K : never : never;
 export declare function updateValue<O, K extends keyof O>(obj: O, otherObj: O, key: K): void;
 export declare function updateObject<O>(obj: O, otherObj: O, keys: Array<keyof O>): void;
+export type MakeOptional<T, K extends keyof T> = Omit<T, K> & Partial<Pick<T, K>>;
 //# sourceMappingURL=misc.d.ts.map

package/dist/misc.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"misc.d.ts","sourceRoot":"","sources":["../src/misc.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,eAAe,CAAC,CAAC,IAAI;KAC9B,CAAC,IAAI,WAAW,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CACrC,CAAC;AAEF,MAAM,MAAM,WAAW,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,CAAC,IAAI,CAAC,SAAS,MAAM,GAC5D,CAAC,SAAS,MAAM,CAAC,GACf,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,GAClC,KAAK,GACL,CAAC,GACH,KAAK,GACP,KAAK,CAAC;AAIV,wBAAgB,WAAW,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,GAAG,IAAI,CAEnF;AAED,wBAAgB,YAAY,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,GAAG,IAAI,CAI/E"}
+{"version":3,"file":"misc.d.ts","sourceRoot":"","sources":["../src/misc.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,eAAe,CAAC,CAAC,IAAI;KAC9B,CAAC,IAAI,WAAW,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CACrC,CAAC;AAEF,MAAM,MAAM,WAAW,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,CAAC,IAAI,CAAC,SAAS,MAAM,GAC5D,CAAC,SAAS,MAAM,CAAC,GACf,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,GAClC,KAAK,GACL,CAAC,GACH,KAAK,GACP,KAAK,CAAC;AAIV,wBAAgB,WAAW,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,GAAG,IAAI,CAEnF;AAED,wBAAgB,YAAY,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,GAAG,IAAI,CAI/E;AAED,MAAM,MAAM,YAAY,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,CAAC,IAAI,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC"}

package/dist/mockerc20factory.d.ts

@@ -1,4 +1,4 @@
-import { ContractWrapper, SignerOrProvider } from "./types";
+import { ContractWrapper, Signer, SignerOrProvider } from "./types";
 import { MockERC20Factory, MockERC20Factory__factory } from "./typechain";
 import { Token } from "./token";
 export declare class TokenFactory extends ContractWrapper<MockERC20Factory> {
@@ -6,6 +6,7 @@ export declare class TokenFactory extends ContractWrapper<MockERC20Factory> {
     readonly contractFactory: typeof MockERC20Factory__factory;
     constructor(address: string, provider: SignerOrProvider);
     static getFactory(provider: SignerOrProvider): TokenFactory;
+    static deployToken(signer: Signer, name: string, symbol: string): Promise<Token>;
     deployToken(name: string, symbol: string): Promise<Token>;
 }
 //# sourceMappingURL=mockerc20factory.d.ts.map

package/dist/mockerc20factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mockerc20factory.d.ts","sourceRoot":"","sources":["../src/mockerc20factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAC5D,OAAO,EAAE,gBAAgB,EAAE,yBAAyB,EAAE,MAAM,aAAa,CAAC;AAE1E,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAGhC,qBAAa,YAAa,SAAQ,eAAe,CAAC,gBAAgB,CAAC;IAG9C,OAAO,EAAE,MAAM;IAFlC,QAAQ,CAAC,eAAe,mCAA6B;gBAElC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,gBAAgB;IAI9D,MAAM,CAAC,UAAU,CAAC,QAAQ,EAAE,gBAAgB,GAAG,YAAY;IAIrD,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC;CAShE"}
+{"version":3,"file":"mockerc20factory.d.ts","sourceRoot":"","sources":["../src/mockerc20factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AACpE,OAAO,EAAE,gBAAgB,EAAE,yBAAyB,EAAE,MAAM,aAAa,CAAC;AAE1E,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAGhC,qBAAa,YAAa,SAAQ,eAAe,CAAC,gBAAgB,CAAC;IAG9C,OAAO,EAAE,MAAM;IAFlC,QAAQ,CAAC,eAAe,mCAA6B;gBAElC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,gBAAgB;IAI9D,MAAM,CAAC,UAAU,CAAC,QAAQ,EAAE,gBAAgB,GAAG,YAAY;WAI9C,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC;IAKhF,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC;CAShE"}

package/dist/mockerc20factory.js

@@ -14,6 +14,10 @@ class TokenFactory extends types_1.ContractWrapper {
     static getFactory(provider) {
         return new TokenFactory(constants_1.MockERC20FactoryAddress, provider);
     }
+    static async deployToken(signer, name, symbol) {
+        const factory = TokenFactory.getFactory(signer);
+        return factory.deployToken(name, symbol);
+    }
     async deployToken(name, symbol) {
         const receipt = await this.contract.deploy(name, symbol).then((r) => r.wait());
         const { args: { token, decimals } } = receipt.events.find((e) => e.event === "NewTokenDeployed");

package/dist/mockerc20factory.js.map

@@ -1 +1 @@
-{"version":3,"file":"mockerc20factory.js","sourceRoot":"","sources":["../src/mockerc20factory.ts"],"names":[],"mappings":";;;AAAA,mCAA4D;AAC5D,2CAA0E;AAE1E,mCAAgC;AAChC,2CAAsD;AAEtD,MAAa,YAAa,SAAQ,uBAAiC;IAGjE,YAAmB,OAAe,EAAE,QAA0B;QAC5D,KAAK,CAAC,QAAQ,CAAC,CAAC;QADC,YAAO,GAAP,OAAO,CAAQ;QAFzB,oBAAe,GAAG,qCAAyB,CAAC;IAIrD,CAAC;IAED,MAAM,CAAC,UAAU,CAAC,QAA0B;QAC1C,OAAO,IAAI,YAAY,CAAC,mCAAuB,EAAE,QAAQ,CAAC,CAAC;IAC7D,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,IAAY,EAAE,MAAc;QAC5C,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;QAE/E,MAAM,EACJ,IAAI,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,EAC1B,GAAG,OAAO,CAAC,MAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,kBAAkB,CAA2B,CAAC;QAE1F,OAAO,IAAI,aAAK,CAAC,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;IACvE,CAAC;CACF;AApBD,oCAoBC"}
+{"version":3,"file":"mockerc20factory.js","sourceRoot":"","sources":["../src/mockerc20factory.ts"],"names":[],"mappings":";;;AAAA,mCAAoE;AACpE,2CAA0E;AAE1E,mCAAgC;AAChC,2CAAsD;AAEtD,MAAa,YAAa,SAAQ,uBAAiC;IAGjE,YAAmB,OAAe,EAAE,QAA0B;QAC5D,KAAK,CAAC,QAAQ,CAAC,CAAC;QADC,YAAO,GAAP,OAAO,CAAQ;QAFzB,oBAAe,GAAG,qCAAyB,CAAC;IAIrD,CAAC;IAED,MAAM,CAAC,UAAU,CAAC,QAA0B;QAC1C,OAAO,IAAI,YAAY,CAAC,mCAAuB,EAAE,QAAQ,CAAC,CAAC;IAC7D,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,MAAc,EAAE,IAAY,EAAE,MAAc;QACnE,MAAM,OAAO,GAAG,YAAY,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QAChD,OAAO,OAAO,CAAC,WAAW,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAC3C,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,IAAY,EAAE,MAAc;QAC5C,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;QAE/E,MAAM,EACJ,IAAI,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,EAC1B,GAAG,OAAO,CAAC,MAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,kBAAkB,CAA2B,CAAC;QAE1F,OAAO,IAAI,aAAK,CAAC,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;IACvE,CAAC;CACF;AAzBD,oCAyBC"}

package/dist/token.d.ts

@@ -35,7 +35,8 @@ export declare class Token extends ContractWrapper<IERC20> {
     getAmount(amount: RhsAmount): TokenAmount;
     parseAmount(amount: number | string): TokenAmount;
     static fromTokenMetadataStruct(metadata: TokenMetadataStructOutput, provider: SignerOrProvider): Token;
-    static getTokenInfo(token: string, provider: SignerOrProvider): Promise<Token>;
+    static getTokenData(token: string, provider: SignerOrProvider): Promise<Token>;
+    static getTokensData(tokens: string[], provider: SignerOrProvider): Promise<Token[]>;
 }
 export {};
 //# sourceMappingURL=token.d.ts.map

package/dist/token.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"token.d.ts","sourceRoot":"","sources":["../src/token.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,QAAQ,CAAC;AAEtE,OAAO,EAAsB,yBAAyB,EAAE,MAAM,aAAa,CAAC;AAC5E,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAE5D,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAEtD,KAAK,SAAS,GAAG,YAAY,GAAG,WAAW,CAAC;AAQ5C,eAAO,MAAM,cAAc,eAAgB,WAAW,EAAE,KAAG,WACtB,CAAC;AAEtC,eAAO,MAAM,cAAc,eAAgB,WAAW,EAAE,KAAG,WACtB,CAAC;AAEtC,qBAAa,WAAW;IACH,GAAG,EAAE,SAAS;IAAS,KAAK,EAAE,KAAK;gBAAnC,GAAG,EAAE,SAAS,EAAS,KAAK,EAAE,KAAK;IAEtD,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED,IAAI,QAAQ,IAAI,MAAM,CAErB;IAED,OAAO,CAAC,MAAM,SAAgB,GAAG,MAAM;IAKvC,MAAM,CAAC,MAAM,SAAgB,EAAE,UAAU,CAAC,EAAE,OAAO,GAAG,MAAM;IAI5D,EAAE,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO;IAK9B,EAAE,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO;IAK9B,GAAG,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO;IAK/B,GAAG,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO;IAK/B,EAAE,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO;IAK9B,GAAG,CAAC,MAAM,EAAE,SAAS,GAAG,WAAW;IAKnC,GAAG,CAAC,MAAM,EAAE,SAAS,GAAG,WAAW;IAKnC,MAAM,CAAC,MAAM,EAAE,SAAS,GAAG,WAAW;CASvC;AAED,qBAAa,KAAM,SAAQ,eAAe,CAAC,MAAM,CAAC;IAIvC,OAAO,EAAE,MAAM;IACf,IAAI,EAAE,MAAM;IACZ,MAAM,EAAE,MAAM;IACd,QAAQ,EAAE,MAAM;IAChB,MAAM,EAAE,OAAO;IAPxB,QAAQ,CAAC,eAAe,yBAAmB;gBAGlC,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,OAAO,EACtB,QAAQ,EAAE,gBAAgB;IAKtB,MAAM,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAO5C,SAAS,CAAC,MAAM,EAAE,SAAS,GAAG,WAAW;IAIzC,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,WAAW;IAKjD,MAAM,CAAC,uBAAuB,CAC5B,QAAQ,EAAE,yBAAyB,EACnC,QAAQ,EAAE,gBAAgB,GACzB,KAAK;WAWK,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,gBAAgB,GAAG,OAAO,CAAC,KAAK,CAAC;CAKrF"}
+{"version":3,"file":"token.d.ts","sourceRoot":"","sources":["../src/token.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,QAAQ,CAAC;AAEtE,OAAO,EAAsB,yBAAyB,EAAE,MAAM,aAAa,CAAC;AAC5E,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAE5D,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAEtD,KAAK,SAAS,GAAG,YAAY,GAAG,WAAW,CAAC;AAQ5C,eAAO,MAAM,cAAc,eAAgB,WAAW,EAAE,KAAG,WACtB,CAAC;AAEtC,eAAO,MAAM,cAAc,eAAgB,WAAW,EAAE,KAAG,WACtB,CAAC;AAEtC,qBAAa,WAAW;IACH,GAAG,EAAE,SAAS;IAAS,KAAK,EAAE,KAAK;gBAAnC,GAAG,EAAE,SAAS,EAAS,KAAK,EAAE,KAAK;IAEtD,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED,IAAI,QAAQ,IAAI,MAAM,CAErB;IAED,OAAO,CAAC,MAAM,SAAgB,GAAG,MAAM;IAKvC,MAAM,CAAC,MAAM,SAAgB,EAAE,UAAU,CAAC,EAAE,OAAO,GAAG,MAAM;IAI5D,EAAE,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO;IAK9B,EAAE,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO;IAK9B,GAAG,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO;IAK/B,GAAG,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO;IAK/B,EAAE,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO;IAK9B,GAAG,CAAC,MAAM,EAAE,SAAS,GAAG,WAAW;IAKnC,GAAG,CAAC,MAAM,EAAE,SAAS,GAAG,WAAW;IAKnC,MAAM,CAAC,MAAM,EAAE,SAAS,GAAG,WAAW;CASvC;AAED,qBAAa,KAAM,SAAQ,eAAe,CAAC,MAAM,CAAC;IAIvC,OAAO,EAAE,MAAM;IACf,IAAI,EAAE,MAAM;IACZ,MAAM,EAAE,MAAM;IACd,QAAQ,EAAE,MAAM;IAChB,MAAM,EAAE,OAAO;IAPxB,QAAQ,CAAC,eAAe,yBAAmB;gBAGlC,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,OAAO,EACtB,QAAQ,EAAE,gBAAgB;IAKtB,MAAM,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAO5C,SAAS,CAAC,MAAM,EAAE,SAAS,GAAG,WAAW;IAIzC,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,WAAW;IAKjD,MAAM,CAAC,uBAAuB,CAC5B,QAAQ,EAAE,yBAAyB,EACnC,QAAQ,EAAE,gBAAgB,GACzB,KAAK;WAWK,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,gBAAgB,GAAG,OAAO,CAAC,KAAK,CAAC;WAMvE,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,QAAQ,EAAE,gBAAgB,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;CAM3F"}

package/dist/token.js

@@ -103,11 +103,17 @@ class Token extends types_1.ContractWrapper {
     static fromTokenMetadataStruct(metadata, provider) {
         return new Token(metadata.token, metadata.name, metadata.symbol, metadata.decimals.toNumber(), metadata.isMock, provider);
     }
-    static async getTokenInfo(token, provider) {
+    static async getTokenData(token, provider) {
         const lens = (0, constants_1.getLensContract)(provider);
         const metadata = await lens.getTokenInfo(token);
         return Token.fromTokenMetadataStruct(metadata, provider);
     }
+    static async getTokensData(tokens, provider) {
+        const lens = (0, constants_1.getLensContract)(provider);
+        return lens
+            .getTokensInfo(tokens)
+            .then((metadata) => metadata.map((m) => Token.fromTokenMetadataStruct(m, provider)));
+    }
 }
 exports.Token = Token;
 //# sourceMappingURL=token.js.map

package/dist/token.js.map

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