@wildcatfi/wildcat-sdk 1.0.15 → 2.0.0

package/README.md

@@ -0,0 +1,88 @@
+# MarketController
+
+## Deploying markets
+
+### 1. Get controller info for borrower
+
+```ts
+import { getController, MarketController, MarketParameters } from '@wildcatfi/wildcat-sdk';
+
+const controller: MarketController = await getController(signer, borrower);
+```
+
+### 2. Get parameter constraints for new markets
+
+`controller.constraints: MarketParameterConstraints` contains the min/max values of 
+- `annualInterestBips`
+- `delinquencyFeeBips`
+- `withdrawalBatchDuration`
+- `reserveRatioBips`
+- `delinquencyGracePeriod`
+
+If provided values are out of this range, market deployment will revert.
+
+
+### 3. Deploying a mock token for new market
+
+```ts
+import { deployToken } from "@wildcatfi/wildcat-sdk";
+
+await deployToken(signer, 'name', 'symbol')
+```
+
+### 4. Deploying new market
+
+```ts
+const marketParameters: MarketParameters = {...}
+
+// 1. Ensure borrower is registered on the arch-controller.
+// For the testnet deployment, anyone can register a borrower
+if (!controller.isRegisteredBorrower) {
+  await controller.registerBorrower()
+}
+// 2. Ensure the `asset, namePrefix, symbolPrefix` are unique.
+if (controller.getExistingMarketForParameters(marketParameters)) {
+  throw Error()
+}
+// 3. Deploy market
+const market: Market = await controller.deployMarket(marketParameters);
+
+```
+
+# Market
+
+## Get market instances
+
+### 1. Get all `Market` instances on Wildcat
+
+```ts
+import { getAllMarkets } from '@wildcatfi/wildcat-sdk';
+
+const markets = getAllMarkets(provider);
+```
+
+### 2. Get all `Market` instances for borrower
+
+```ts
+const controller: MarketController = await getController(signer, borrower);
+// controller.markets has an array of all Market instances for the controller
+```
+
+# MarketAccount
+
+## Get `MarketAccount`
+
+### 1. Get `MarketAccount` for every market
+```ts
+import { getAllMarketAccountsForLender } from '@wildcatfi/wildcat-sdk';
+const accounts = await getAllMarketAccountsForLender(signer, lenderAddress);
+```
+
+## Deposit
+
+### 1. Get underlying assets from mock token
+```ts
+if (market.underlyingToken.isMock) {
+  await market.underlyingToken.faucet();
+}
+```

package/dist/account.d.ts

@@ -1,58 +1,62 @@
 import { BigNumber, ContractTransaction } from "ethers";
 import { TokenAmount } from "./token";
-import { Vault } from "./vault";
-import { AccountVaultInfoStructOutput, VaultDataWithAccountStructOutput } from "./typechain";
+import { Market } from "./market";
+import { MarketLenderStatusStructOutput, MarketDataWithLenderStatusStructOutput } from "./typechain";
 import { SignerOrProvider } from "./types";
+import { LenderWithdrawalStatus } from "./withdrawal-status";
 export type DepositStatus = {
-    status: "InsufficientBalance";
-} | {
-    status: "ExceedsMaximumDeposit";
+    status: "InsufficientBalance" | "ExceedsMaximumDeposit" | "Ready" | "InsufficientRole";
 } | {
     status: "InsufficientAllowance";
     remainder: TokenAmount;
-} | {
-    status: "Ready";
 };
 export type RepayStatus = {
-    status: "InsufficientBalance";
-} | {
-    status: "ExceedsOutstandingDebt";
+    status: "InsufficientBalance" | "ExceedsOutstandingDebt" | "Ready";
 } | {
     status: "InsufficientAllowance";
     remainder: TokenAmount;
-} | {
-    status: "Ready";
 };
+export declare enum LenderRole {
+    Null = 0,
+    Blocked = 1,
+    WithdrawOnly = 2,
+    DepositAndWithdraw = 3
+}
 /**
- * Class to provide information about a vault user's account
+ * Class to provide information about a market user's account
  * and to wrap interactions.
  *
  * Use `update()` to update the account's state.
  *
  *
  */
-export declare class VaultAccount {
+export declare class MarketAccount {
     account: string;
-    vaultBalance: TokenAmount;
+    isAuthorizedOnController: boolean;
+    role: LenderRole;
+    scaledMarketBalance: BigNumber;
+    marketBalance: TokenAmount;
     underlyingBalance: TokenAmount;
     underlyingApproval: BigNumber;
-    vault: Vault;
-    constructor(account: string, vaultBalance: TokenAmount, underlyingBalance: TokenAmount, underlyingApproval: BigNumber, vault: Vault);
-    static readonly UpdatableKeys: Array<keyof VaultAccount>;
+    market: Market;
+    constructor(account: string, isAuthorizedOnController: boolean, role: LenderRole, scaledMarketBalance: BigNumber, marketBalance: TokenAmount, underlyingBalance: TokenAmount, underlyingApproval: BigNumber, market: Market);
+    static readonly UpdatableKeys: Array<keyof MarketAccount>;
     get userHasBalance(): boolean;
     get userHasUnderlyingBalance(): boolean;
     get isBorrower(): boolean;
+    get canDeposit(): boolean;
+    get canWithdraw(): boolean;
     setAPR(newAprBips: number): Promise<ContractTransaction>;
     isApprovedFor(amount: TokenAmount): boolean;
     /**
      * @returns Remaining amount of underlying token user must approve
-     *          vault to spend to make a deposit.
+     *          market to spend to make a deposit.
      */
     getAllowanceRemainder(amount: TokenAmount): TokenAmount;
     approveAllowanceRemainder(amount: TokenAmount): Promise<ContractTransaction>;
     /**
      * @returns Maximum amount of underlying token user can deposit
-     *          given their underlying balance and the vault's max supply
+     *          given their underlying balance and the market's max supply
      */
     get maximumDeposit(): TokenAmount;
     /**
@@ -67,15 +71,10 @@ export declare class VaultAccount {
     deposit(amount: TokenAmount): Promise<ContractTransaction>;
     /**
      * @returns Amount of underlying token user can withdraw
-     *          given their vault balance and the vault's assets.
+     *          given their market balance and the market's assets.
      */
     get maximumWithdrawal(): TokenAmount;
-    /**
-     * @returns Amount of underlying token user can actually withdraw
-     *          given a target amount.
-     */
-    getWithdrawalAmount(amount: TokenAmount): TokenAmount;
-    withdraw(amount: TokenAmount): Promise<ContractTransaction>;
+    queueWithdrawal(amount: TokenAmount): Promise<LenderWithdrawalStatus>;
     get maximumRepay(): TokenAmount;
     get canRepayDelinquent(): boolean;
     get canRepayOutstanding(): boolean;
@@ -97,30 +96,30 @@ export declare class VaultAccount {
     getBorrowableAmount(amount: TokenAmount): TokenAmount;
     borrow(amount: TokenAmount): Promise<ContractTransaction>;
     update(): Promise<void>;
-    applyUpdate(info: AccountVaultInfoStructOutput): void;
-    static fromAccountVaultInfoStruct(account: string, info: AccountVaultInfoStructOutput, vault: Vault): VaultAccount;
-    static fromVaultDataWithAccountStruct(provider: SignerOrProvider, account: string, info: VaultDataWithAccountStructOutput): VaultAccount;
+    applyUpdate(info: MarketLenderStatusStructOutput): void;
+    static fromMarketLenderStatus(account: string, info: MarketLenderStatusStructOutput, market: Market): MarketAccount;
+    static fromMarketDataWithLenderStatus(provider: SignerOrProvider, account: string, info: MarketDataWithLenderStatusStructOutput): MarketAccount;
     /**
-     * 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.
+     * Get a `MarketAccount` for a given account and existing `Market` instance.
+     * If `market` is a string, the market data will be fetched in the same call as the account data.
      */
-    static getVaultAccount(provider: SignerOrProvider, account: string, vault: Vault | string): Promise<VaultAccount>;
+    static getMarketAccount(provider: SignerOrProvider, account: string, market: Market | string): Promise<MarketAccount>;
     /**
-     * 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
+     * Get multiple `MarketAccount`s given an account and existing list of `Market`
+     * instances or market addresses. If `markets` is an array of strings, the market
      * data will be fetched in the same call as the account data.
      */
-    static getVaultAccounts(provider: SignerOrProvider, account: string, vaults: Vault[] | string[]): Promise<VaultAccount[]>;
+    static getMarketAccountsForLender(provider: SignerOrProvider, account: string, markets: Market[] | string[]): Promise<MarketAccount[]>;
     /**
-     * Get all `VaultAccount`s for a given account.
-     * Fetches the vault data in the same call as the account data.
+     * Get all `MarketAccount`s for a given account.
+     * Fetches the market data in the same call as the account data.
      */
-    static getAllVaultAccounts(provider: SignerOrProvider, account: string): Promise<VaultAccount[]>;
+    static getAllMarketAccountsForLender(provider: SignerOrProvider, account: string): Promise<MarketAccount[]>;
     /**
-     * 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.
+     * Get paginated `MarketAccount`s for a given account.
+     * Fetches the market data in the same call as the account data.
+     * @note Throws an error if `start + count` exceeds the number of markets.
      */
-    static getPaginatedVaultAccounts(provider: SignerOrProvider, account: string, start: number | undefined, count: number): Promise<VaultAccount[]>;
+    static getPaginatedMarketAccounts(provider: SignerOrProvider, account: string, start: number | undefined, count: number): Promise<MarketAccount[]>;
 }
 //# 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":"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"}
+{"version":3,"file":"account.d.ts","sourceRoot":"","sources":["../src/account.ts"],"names":[],"mappings":"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"}

package/dist/account.js

@@ -1,37 +1,57 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.VaultAccount = void 0;
+exports.MarketAccount = exports.LenderRole = void 0;
 const token_1 = require("./token");
-const vault_1 = require("./vault");
-const misc_1 = require("./misc");
+const market_1 = require("./market");
+const utils_1 = require("./utils");
 const constants_1 = require("./constants");
-const isVaultInstanceArray = (vaults) => {
-    return typeof vaults[0] !== "string";
+const withdrawal_status_1 = require("./withdrawal-status");
+var LenderRole;
+(function (LenderRole) {
+    LenderRole[LenderRole["Null"] = 0] = "Null";
+    LenderRole[LenderRole["Blocked"] = 1] = "Blocked";
+    LenderRole[LenderRole["WithdrawOnly"] = 2] = "WithdrawOnly";
+    LenderRole[LenderRole["DepositAndWithdraw"] = 3] = "DepositAndWithdraw";
+})(LenderRole = exports.LenderRole || (exports.LenderRole = {}));
+const isMarketInstanceArray = (markets) => {
+    return typeof markets[0] !== "string";
 };
 /**
- * Class to provide information about a vault user's account
+ * Class to provide information about a market user's account
  * and to wrap interactions.
  *
  * Use `update()` to update the account's state.
  *
  *
  */
-class VaultAccount {
-    constructor(account, vaultBalance, underlyingBalance, underlyingApproval, vault) {
+class MarketAccount {
+    constructor(account, isAuthorizedOnController, role, scaledMarketBalance, marketBalance, underlyingBalance, underlyingApproval, market) {
         this.account = account;
-        this.vaultBalance = vaultBalance;
+        this.isAuthorizedOnController = isAuthorizedOnController;
+        this.role = role;
+        this.scaledMarketBalance = scaledMarketBalance;
+        this.marketBalance = marketBalance;
         this.underlyingBalance = underlyingBalance;
         this.underlyingApproval = underlyingApproval;
-        this.vault = vault;
+        this.market = market;
     }
     get userHasBalance() {
-        return this.vaultBalance.gt(0);
+        return this.marketBalance.gt(0);
     }
     get userHasUnderlyingBalance() {
         return this.underlyingBalance.gt(0);
     }
     get isBorrower() {
-        return this.vault.borrower.toLowerCase() === this.account.toLowerCase();
+        return this.market.borrower.toLowerCase() === this.account.toLowerCase();
+    }
+    get canDeposit() {
+        return (this.role === LenderRole.DepositAndWithdraw ||
+            (this.role === LenderRole.Null && this.isAuthorizedOnController));
+    }
+    get canWithdraw() {
+        return (this.role === LenderRole.WithdrawOnly ||
+            this.role === LenderRole.DepositAndWithdraw ||
+            (this.role === LenderRole.Null && this.isAuthorizedOnController));
     }
     async setAPR(newAprBips) {
         if (!this.isBorrower) {
@@ -40,11 +60,11 @@ class VaultAccount {
         if (newAprBips > 10000) {
             throw Error("APR must be less than 100% (10000 BIPS)");
         }
-        const controller = (0, constants_1.getControllerContract)(this.vault.provider);
-        if (this.vault.controller !== controller.address) {
-            throw Error(`Unexpected controller address: ${this.vault.controller}`);
+        const controller = (0, constants_1.getControllerContract)(this.market.provider, this.market.controller);
+        if (this.market.controller !== controller.address) {
+            throw Error(`Unexpected controller address: ${this.market.controller}`);
         }
-        return controller.setAnnualInterestBips(this.vault.address, newAprBips);
+        return controller.setAnnualInterestBips(this.market.address, newAprBips);
     }
     /* ------ Approval ------ */
     isApprovedFor(amount) {
@@ -52,27 +72,27 @@ class VaultAccount {
     }
     /**
      * @returns Remaining amount of underlying token user must approve
-     *          vault to spend to make a deposit.
+     *          market to spend to make a deposit.
      */
     getAllowanceRemainder(amount) {
         return amount.satsub(this.underlyingApproval);
     }
     async approveAllowanceRemainder(amount) {
-        const token = this.vault.underlyingToken;
+        const token = this.market.underlyingToken;
         const signer = await token.signer.getAddress();
         if (signer !== this.account) {
-            throw Error(`VaultAccount signer ${signer} does not match ${this.account}`);
+            throw Error(`MarketAccount signer ${signer} does not match ${this.account}`);
         }
         amount = this.getAllowanceRemainder(amount);
-        return token.contract.approve(this.vault.address, amount.raw);
+        return token.contract.approve(this.market.address, amount.raw);
     }
     /* ------ Deposits ------ */
     /**
      * @returns Maximum amount of underlying token user can deposit
-     *          given their underlying balance and the vault's max supply
+     *          given their underlying balance and the market's max supply
      */
     get maximumDeposit() {
-        return (0, token_1.minTokenAmount)(this.vault.maximumDeposit, this.underlyingBalance);
+        return (0, token_1.minTokenAmount)(this.market.maximumDeposit, this.underlyingBalance);
     }
     /**
      * @returns Amount of underlying token user can actually deposit
@@ -85,7 +105,10 @@ class VaultAccount {
      * @returns Status for deposit
      */
     checkDepositStep(amount) {
-        if (amount.gt(this.vault.maximumDeposit)) {
+        if (!this.canDeposit) {
+            return { status: "InsufficientRole" };
+        }
+        if (amount.gt(this.market.maximumDeposit)) {
             return { status: "ExceedsMaximumDeposit" };
         }
         if (amount.gt(this.underlyingBalance)) {
@@ -101,46 +124,48 @@ class VaultAccount {
     }
     // TODO: Add support for depositUpTo
     async deposit(amount) {
-        const signer = await this.vault.signer.getAddress();
+        const signer = await this.market.signer.getAddress();
         if (signer !== this.account) {
-            throw Error(`VaultAccount signer ${signer} does not match ${this.account}`);
+            throw Error(`MarketAccount signer ${signer} does not match ${this.account}`);
         }
         if (amount.gt(this.underlyingBalance)) {
             throw Error("Insufficient balance");
         }
-        return this.vault.contract.deposit(amount.raw, this.account);
+        return this.market.contract.deposit(amount.raw);
     }
     /* ------ Withdrawals ------ */
     /**
      * @returns Amount of underlying token user can withdraw
-     *          given their vault balance and the vault's assets.
+     *          given their market balance and the market's assets.
      */
     get maximumWithdrawal() {
-        return (0, token_1.minTokenAmount)(this.vault.totalAssets, this.vaultBalance);
+        return (0, token_1.minTokenAmount)(this.market.totalAssets, this.marketBalance);
     }
-    /**
-     * @returns Amount of underlying token user can actually withdraw
-     *          given a target amount.
-     */
-    getWithdrawalAmount(amount) {
-        return (0, token_1.minTokenAmount)(amount, this.maximumWithdrawal);
-    }
-    async withdraw(amount) {
-        const signer = await this.vault.signer.getAddress();
+    async queueWithdrawal(amount) {
+        if (!this.canWithdraw) {
+            throw Error(`Lender role insufficient to withdraw`);
+        }
+        const signer = await this.market.signer.getAddress();
         if (signer !== this.account) {
-            throw Error(`VaultAccount signer ${signer} does not match ${this.account}`);
+            throw Error(`MarketAccount signer ${signer} does not match ${this.account}`);
+        }
+        const tx = await this.market.contract.queueWithdrawal(amount.raw).then((tx) => tx.wait());
+        const queuedWithdrawalTopic = this.market.contract.interface.getEventTopic("QueuedWithdrawal");
+        const queuedWithdrawalTransaction = (0, withdrawal_status_1.toQueueWithdrawalTransaction)(this.market.underlyingToken, tx.events.find((e) => e.topics[0] === queuedWithdrawalTopic));
+        if (!queuedWithdrawalTransaction) {
+            throw Error("No queued withdrawal event found");
         }
-        return this.vault.contract.withdraw(amount.raw, this.account);
+        return withdrawal_status_1.LenderWithdrawalStatus.getWithdrawalForLender(this.market, queuedWithdrawalTransaction.expiry, this.account);
     }
     /* ------ Repaying ------ */
     get maximumRepay() {
-        return (0, token_1.minTokenAmount)(this.vault.outstandingDebt, this.underlyingBalance);
+        return (0, token_1.minTokenAmount)(this.market.outstandingDebt, this.underlyingBalance);
     }
     get canRepayDelinquent() {
-        return this.vault.delinquentDebt.lt(this.maximumRepay) && this.isBorrower;
+        return this.market.delinquentDebt.lt(this.maximumRepay) && this.isBorrower;
     }
     get canRepayOutstanding() {
-        return this.vault.outstandingDebt.lt(this.maximumRepay) && this.isBorrower;
+        return this.market.outstandingDebt.lt(this.maximumRepay) && this.isBorrower;
     }
     /**
      * @returns Amount of underlying token user can actually repay
@@ -165,135 +190,135 @@ class VaultAccount {
         return { status: "Ready" };
     }
     async repay(amount) {
-        const signer = await this.vault.signer.getAddress();
+        const signer = await this.market.signer.getAddress();
         if (signer !== this.account) {
-            throw Error(`VaultAccount signer ${signer} does not match ${this.account}`);
+            throw Error(`MarketAccount signer ${signer} does not match ${this.account}`);
         }
         if (!this.isBorrower) {
             throw Error("Only borrower can repay");
         }
-        return this.vault.contract.repay(amount);
+        return this.market.contract.repay(amount);
     }
     async repayOutstandingDebt() {
-        const signer = await this.vault.signer.getAddress();
+        const signer = await this.market.signer.getAddress();
         if (signer !== this.account) {
-            throw Error(`VaultAccount signer ${signer} does not match ${this.account}`);
+            throw Error(`MarketAccount signer ${signer} does not match ${this.account}`);
         }
         if (!this.isBorrower) {
             throw Error("Only borrower can repay");
         }
-        return this.vault.contract.repayOutstandingDebt();
+        return this.market.contract.repayOutstandingDebt();
     }
     async repayDelinquentDebt() {
-        const signer = await this.vault.signer.getAddress();
+        const signer = await this.market.signer.getAddress();
         if (signer !== this.account) {
-            throw Error(`VaultAccount signer ${signer} does not match ${this.account}`);
+            throw Error(`MarketAccount signer ${signer} does not match ${this.account}`);
         }
         if (!this.isBorrower) {
             throw Error("Only borrower can repay");
         }
-        return this.vault.contract.repayDelinquentDebt();
+        return this.market.contract.repayDelinquentDebt();
     }
     /* ------ Borrowing ------ */
     /**
      * @returns Amount of underlying token borrower can borrow
      */
     getBorrowableAmount(amount) {
-        return (0, token_1.minTokenAmount)(amount, this.vault.borrowableAssets);
+        return (0, token_1.minTokenAmount)(amount, this.market.borrowableAssets);
     }
     async borrow(amount) {
-        const signer = await this.vault.signer.getAddress();
+        const signer = await this.market.signer.getAddress();
         if (signer !== this.account) {
-            throw Error(`VaultAccount signer ${signer} does not match ${this.account}`);
+            throw Error(`MarketAccount signer ${signer} does not match ${this.account}`);
         }
         if (!this.isBorrower) {
             throw Error("Only borrower can borrow");
         }
-        if (amount.gt(this.vault.borrowableAssets)) {
+        if (amount.gt(this.market.borrowableAssets)) {
             throw Error("Insufficient borrowable assets");
         }
-        return this.vault.contract.borrow(amount.raw);
+        return this.market.contract.borrow(amount.raw);
     }
     /* ------ Updates ------ */
     async update() {
-        const acccountVaultInfo = await this.vault.getAccountInfo();
-        (0, misc_1.updateObject)(this, acccountVaultInfo, VaultAccount.UpdatableKeys);
+        const acccountMarketInfo = await MarketAccount.getMarketAccount(this.market.provider, this.account, this.market);
+        (0, utils_1.updateObject)(this, acccountMarketInfo, MarketAccount.UpdatableKeys);
     }
     applyUpdate(info) {
-        const account = VaultAccount.fromAccountVaultInfoStruct(this.account, info, this.vault);
-        (0, misc_1.updateObject)(this, account, VaultAccount.UpdatableKeys);
+        const account = MarketAccount.fromMarketLenderStatus(this.account, info, this.market);
+        (0, utils_1.updateObject)(this, account, MarketAccount.UpdatableKeys);
     }
     /* ------ Builders / Getters ------ */
-    static fromAccountVaultInfoStruct(account, info, vault) {
-        return new VaultAccount(account, vault.vaultToken.getAmount(info.normalizedBalance), vault.underlyingToken.getAmount(info.underlyingBalance), info.underlyingApproval, vault);
+    static fromMarketLenderStatus(account, info, market) {
+        return new MarketAccount(account, info.isAuthorizedOnController, info.role, info.scaledBalance, market.marketToken.getAmount(info.normalizedBalance), market.underlyingToken.getAmount(info.underlyingBalance), info.underlyingApproval, market);
     }
-    static fromVaultDataWithAccountStruct(provider, account, info) {
-        return VaultAccount.fromAccountVaultInfoStruct(account, info.account, vault_1.Vault.fromVaultMetadataStruct(info.vault, provider));
+    static fromMarketDataWithLenderStatus(provider, account, info) {
+        return MarketAccount.fromMarketLenderStatus(account, info.lenderStatus, market_1.Market.fromMarketData(info.market, 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.
+     * Get a `MarketAccount` for a given account and existing `Market` instance.
+     * If `market` is a string, the market data will be fetched in the same call as the account data.
      */
-    static async getVaultAccount(provider, account, vault) {
+    static async getMarketAccount(provider, account, market) {
         const lens = (0, constants_1.getLensContract)(provider);
-        if (vault instanceof vault_1.Vault) {
+        if (market instanceof market_1.Market) {
             return lens
-                .getAccountVaultInfo(account, vault.address)
-                .then((info) => VaultAccount.fromAccountVaultInfoStruct(account, info, vault));
+                .getMarketLenderStatus(account, market.address)
+                .then((info) => MarketAccount.fromMarketLenderStatus(account, info, market));
         }
         else {
             return lens
-                .getVaultDataWithAccount(account, vault)
-                .then((info) => VaultAccount.fromVaultDataWithAccountStruct(provider, account, info));
+                .getMarketDataWithLenderStatus(account, market)
+                .then((info) => MarketAccount.fromMarketDataWithLenderStatus(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
+     * Get multiple `MarketAccount`s given an account and existing list of `Market`
+     * instances or market addresses. If `markets` is an array of strings, the market
      * data will be fetched in the same call as the account data.
      */
-    static async getVaultAccounts(provider, account, vaults) {
+    static async getMarketAccountsForLender(provider, account, markets) {
         const lens = (0, constants_1.getLensContract)(provider);
-        if (vaults.length === 0) {
+        if (markets.length === 0) {
             return [];
         }
-        if (isVaultInstanceArray(vaults)) {
+        if (isMarketInstanceArray(markets)) {
             return lens
-                .getAccountVaultsInfo(account, vaults.map((v) => v.address))
-                .then((infos) => infos.map((info, i) => VaultAccount.fromAccountVaultInfoStruct(account, info, vaults[i])));
+                .getMarketsLenderStatus(account, markets.map((v) => v.address))
+                .then((infos) => infos.map((info, i) => MarketAccount.fromMarketLenderStatus(account, info, markets[i])));
         }
         else {
             return lens
-                .getVaultsDataWithAccount(account, vaults)
-                .then((infos) => infos.map((info) => VaultAccount.fromVaultDataWithAccountStruct(provider, account, info)));
+                .getMarketsDataWithLenderStatus(account, markets)
+                .then((infos) => infos.map((info) => MarketAccount.fromMarketDataWithLenderStatus(provider, account, info)));
         }
     }
     /**
-     * Get all `VaultAccount`s for a given account.
-     * Fetches the vault data in the same call as the account data.
+     * Get all `MarketAccount`s for a given account.
+     * Fetches the market data in the same call as the account data.
      */
-    static getAllVaultAccounts(provider, account) {
+    static getAllMarketAccountsForLender(provider, account) {
         const lens = (0, constants_1.getLensContract)(provider);
         return lens
-            .getAllVaultsDataWithAccount(account)
-            .then((infos) => infos.map((info) => VaultAccount.fromVaultDataWithAccountStruct(provider, account, info)));
+            .getAllMarketsDataWithLenderStatus(account)
+            .then((infos) => infos.map((info) => MarketAccount.fromMarketDataWithLenderStatus(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.
+     * Get paginated `MarketAccount`s for a given account.
+     * Fetches the market data in the same call as the account data.
+     * @note Throws an error if `start + count` exceeds the number of markets.
      */
-    static getPaginatedVaultAccounts(provider, account, start = 0, count) {
+    static getPaginatedMarketAccounts(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)));
+            .getPaginatedMarketsDataWithLenderStatus(account, start, count)
+            .then((infos) => infos.map((info) => MarketAccount.fromMarketDataWithLenderStatus(provider, account, info)));
     }
 }
-VaultAccount.UpdatableKeys = [
-    "vaultBalance",
+MarketAccount.UpdatableKeys = [
+    "marketBalance",
     "underlyingBalance",
     "underlyingApproval"
 ];
-exports.VaultAccount = VaultAccount;
+exports.MarketAccount = MarketAccount;
 //# sourceMappingURL=account.js.map