@wildcatfi/wildcat-sdk 3.0.77-beta → 3.1.1-beta

package/dist/account/index.js

@@ -15,18 +15,15 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MarketAccount = exports.LenderRole = void 0;
+const ethers_1 = require("ethers");
 const token_1 = require("../token");
 const market_1 = require("../market");
+const typechain_1 = require("../typechain");
 const utils_1 = require("../utils");
 const constants_1 = require("../constants");
-const arch_controller_1 = require("../internal/arch-controller");
-const market_lens_1 = require("../internal/market-lens");
 const types_1 = require("../types");
 const withdrawal_status_1 = require("../withdrawal-status");
 const validation_1 = require("./validation");
-const abi_1 = require("../abi");
-const viem_write_1 = require("../internal/viem-write");
-const viem_1 = require("viem");
 __exportStar(require("./validation"), exports);
 var LenderRole;
 (function (LenderRole) {
@@ -35,18 +32,7 @@ var LenderRole;
     LenderRole[LenderRole["WithdrawOnly"] = 2] = "WithdrawOnly";
     LenderRole[LenderRole["DepositAndWithdraw"] = 3] = "DepositAndWithdraw";
 })(LenderRole = exports.LenderRole || (exports.LenderRole = {}));
-const NullProviderIndex = 2 ** 24 - 1;
-const ZERO_ADDRESS = "0x0000000000000000000000000000000000000000";
-const hasUnifiedLatestLensForAccountReads = (chainId) => {
-    return (0, constants_1.hasDeploymentAddress)(chainId, "MarketLensV2_5");
-};
-const zeroLenderBalances = (info) => ({
-    ...info,
-    scaledBalance: 0n,
-    normalizedBalance: 0n,
-    underlyingBalance: 0n,
-    underlyingApproval: 0n
-});
+const NullProviderIndex = ethers_1.BigNumber.from(2).pow(24).sub(1).toNumber();
 /**
  * Class to provide information about a market user's account
  * and to wrap interactions.
@@ -150,6 +136,9 @@ class MarketAccount {
             // Can not withdraw if market in fixed term
             if (this.market.isInFixedTerm)
                 return validation_1.QueueWithdrawalStatus.MarketInClosedTerm;
+            if (config.kind === types_1.HooksKind.PeriodicTerm && !this.market.isPeriodicWithdrawalWindowOpen) {
+                return validation_1.QueueWithdrawalStatus.OutsideWithdrawalWindow;
+            }
             // Can not withdraw if market requires access and lender has no credential and is not a known lender
             if (config.flags.useOnQueueWithdrawal &&
                 (config.kind === types_1.HooksKind.OpenTerm || config.queueWithdrawalRequiresAccess) &&
@@ -215,6 +204,27 @@ class MarketAccount {
             return { status: validation_1.SetAprStatus.NotBorrower };
         if (!(apr > 0 && apr <= 10000))
             return { status: validation_1.SetAprStatus.InvalidApr };
+        if (this.market.version === types_1.MarketVersion.V2 &&
+            this.market.hooksConfig?.kind === types_1.HooksKind.PeriodicTerm &&
+            apr < this.market.annualInterestBips) {
+            const config = this.market.hooksConfig;
+            if (config.pendingAnnualInterestProposalTimestamp === 0) {
+                return { status: validation_1.SetAprStatus.NoPendingAprChange };
+            }
+            if (config.pendingAnnualInterestBips !== apr) {
+                return { status: validation_1.SetAprStatus.AprChangeDoesNotMatchProposal };
+            }
+            if (Math.floor(Date.now() / 1000) < config.pendingAnnualInterestResponseWindowEnd) {
+                return { status: validation_1.SetAprStatus.AprChangeNotReady };
+            }
+            if (!this.market.scaledPendingWithdrawals.isZero()) {
+                return { status: validation_1.SetAprStatus.UnpaidWithdrawalsExist };
+            }
+            return {
+                status: validation_1.SetAprStatus.Ready,
+                willChangeReserveRatio: false
+            };
+        }
         const [originalReserveRatioBips, originalAnnualInterestBips] = this.market.originalReserveRatioAndAnnualInterestBips;
         const newReserveRatioBips = this.market.getReserveRatioForNewAPR(apr);
         const willChangeReserveRatio = newReserveRatioBips !== this.market.reserveRatioBips;
@@ -267,6 +277,26 @@ class MarketAccount {
             return { status: validation_1.SetMinimumDepositStatus.NotBorrower };
         return { status: validation_1.SetMinimumDepositStatus.Ready };
     }
+    previewProposeAnnualInterestBips(apr) {
+        if (this.market.version !== types_1.MarketVersion.V2) {
+            return { status: validation_1.ProposeAnnualInterestBipsStatus.NotV2Market };
+        }
+        if (!this.isBorrower)
+            return { status: validation_1.ProposeAnnualInterestBipsStatus.NotBorrower };
+        if (this.market.hooksConfig?.kind !== types_1.HooksKind.PeriodicTerm) {
+            return { status: validation_1.ProposeAnnualInterestBipsStatus.NotPeriodicTermMarket };
+        }
+        if (!(apr > 0 && apr <= 10000)) {
+            return { status: validation_1.ProposeAnnualInterestBipsStatus.InvalidApr };
+        }
+        if (apr >= this.market.annualInterestBips) {
+            return { status: validation_1.ProposeAnnualInterestBipsStatus.NotReduction };
+        }
+        if (this.market.isPeriodicWithdrawalWindowOpen) {
+            return { status: validation_1.ProposeAnnualInterestBipsStatus.WithdrawalWindowOpen };
+        }
+        return { status: validation_1.ProposeAnnualInterestBipsStatus.Ready };
+    }
     previewSetFixedTermEndTime(endTime) {
         if (this.market.version !== types_1.MarketVersion.V2)
             return { status: validation_1.SetFixedTermEndTimeStatus.NotV2Market };
@@ -291,101 +321,130 @@ class MarketAccount {
         (0, utils_1.assert)(status === validation_1.SetMinimumDepositStatus.Ready, `Cannot set minimum deposit: ${status}`);
         const config = this.market.hooksConfig;
         (0, utils_1.assert)(config !== undefined, `V2 market missing hooksConfig`);
-        return (0, utils_1.prepareTransaction)({
+        const iface = typechain_1.IOpenTermHooks__factory.createInterface();
+        return {
             to: config.hooksAddress,
-            abi: abi_1.iOpenTermHooksAbi,
-            functionName: "setMinimumDeposit",
-            args: [this.market.address, amount.raw]
-        });
+            data: iface.encodeFunctionData("setMinimumDeposit", [this.market.address, amount.raw]),
+            value: "0"
+        };
+    }
+    async populateProposeAnnualInterestBips(apr) {
+        const { status } = this.previewProposeAnnualInterestBips(apr);
+        (0, utils_1.assert)(status === validation_1.ProposeAnnualInterestBipsStatus.Ready, `Cannot propose APR reduction: ${status}`);
+        const config = this.market.hooksConfig;
+        (0, utils_1.assert)(config !== undefined, `V2 market missing hooksConfig`);
+        const iface = typechain_1.IPeriodicTermHooks__factory.createInterface();
+        return {
+            to: config.hooksAddress,
+            data: iface.encodeFunctionData("proposeAnnualInterestBips", [this.market.address, apr]),
+            value: "0"
+        };
     }
     async populateSetFixedTermEndTime(endTime) {
         const { status } = this.previewSetFixedTermEndTime(endTime);
         (0, utils_1.assert)(status === validation_1.SetFixedTermEndTimeStatus.Ready, `Cannot set fixed term end time: ${status}`);
         const config = this.market.hooksConfig;
         (0, utils_1.assert)(config !== undefined, `V2 market missing hooksConfig`);
-        return (0, utils_1.prepareTransaction)({
+        const iface = typechain_1.IFixedTermHooks__factory.createInterface();
+        return {
             to: config.hooksAddress,
-            abi: abi_1.iFixedTermHooksAbi,
-            functionName: "setFixedTermEndTime",
-            args: [this.market.address, endTime]
-        });
+            data: iface.encodeFunctionData("setFixedTermEndTime", [this.market.address, endTime]),
+            value: "0"
+        };
     }
     async setMinimumDeposit(amount) {
-        return (0, viem_write_1.submitPreparedTransaction)(this.market.signer, await this.populateSetMinimumDeposit(amount));
+        const { status } = this.previewSetMinimumDeposit(amount);
+        (0, utils_1.assert)(status === validation_1.SetMinimumDepositStatus.Ready, `Cannot set minimum deposit: ${status}`);
+        const config = this.market.hooksConfig;
+        (0, utils_1.assert)(config !== undefined, `V2 market missing hooksConfig`);
+        const contract = typechain_1.IOpenTermHooks__factory.connect(config.hooksAddress, this.market.signer);
+        return contract.setMinimumDeposit(this.market.address, amount.raw);
+    }
+    async proposeAnnualInterestBips(apr) {
+        const { status } = this.previewProposeAnnualInterestBips(apr);
+        (0, utils_1.assert)(status === validation_1.ProposeAnnualInterestBipsStatus.Ready, `Cannot propose APR reduction: ${status}`);
+        const config = this.market.hooksConfig;
+        (0, utils_1.assert)(config !== undefined, `V2 market missing hooksConfig`);
+        const contract = typechain_1.IPeriodicTermHooks__factory.connect(config.hooksAddress, this.market.signer);
+        return contract.proposeAnnualInterestBips(this.market.address, apr);
     }
     async setFixedTermEndTime(endTime) {
-        return (0, viem_write_1.submitPreparedTransaction)(this.market.signer, await this.populateSetFixedTermEndTime(endTime));
+        const { status } = this.previewSetFixedTermEndTime(endTime);
+        (0, utils_1.assert)(status === validation_1.SetFixedTermEndTimeStatus.Ready, `Cannot set fixed term end time: ${status}`);
+        const config = this.market.hooksConfig;
+        (0, utils_1.assert)(config !== undefined, `V2 market missing hooksConfig`);
+        const contract = typechain_1.IFixedTermHooks__factory.connect(config.hooksAddress, this.market.signer);
+        return contract.setFixedTermEndTime(this.market.address, endTime);
     }
     /* -------------------------------------------------------------------------- */
     /*                             Management Actions                             */
     /* -------------------------------------------------------------------------- */
     async closeMarket() {
-        return (0, viem_write_1.submitPreparedTransaction)(this.market.signer, this.populateCloseMarket());
+        const { status } = this.previewCloseMarket();
+        (0, utils_1.assert)(status === validation_1.CloseMarketStatus.Ready, `Cannot close market: ${status}`);
+        if (this.market.version === types_1.MarketVersion.V1) {
+            (0, utils_1.assert)(this.market.controller !== undefined, "Controller address is required for V1 markets");
+            const controller = (0, constants_1.getControllerContract)(this.market.signer, this.market.controller);
+            return controller.closeMarket(this.market.address);
+        }
+        return this.market.contract.closeMarket();
     }
     populateCloseMarket() {
         const { status } = this.previewCloseMarket();
         (0, utils_1.assert)(status === validation_1.CloseMarketStatus.Ready, `Cannot close market: ${status}`);
         if (this.market.version === types_1.MarketVersion.V1) {
             (0, utils_1.assert)(this.market.controller !== undefined, "Controller address is required for V1 markets");
-            return (0, utils_1.prepareTransaction)({
-                to: this.market.controller,
-                abi: abi_1.wildcatMarketControllerAbi,
-                functionName: "closeMarket",
-                args: [this.market.address]
-            });
-        }
-        return (0, utils_1.prepareTransaction)({
+            const controller = (0, constants_1.getControllerContract)(this.market.signer, this.market.controller);
+            return {
+                to: controller.address,
+                data: controller.interface.encodeFunctionData("closeMarket", [this.market.address]),
+                value: "0"
+            };
+        }
+        return {
             to: this.market.address,
-            abi: abi_1.wildcatMarketV2Abi,
-            functionName: "closeMarket"
-        });
+            data: this.market.contract.interface.encodeFunctionData("closeMarket"),
+            value: "0"
+        };
     }
     async setMaxTotalSupply(amount) {
         const { status } = this.previewSetMaxTotalSupply(amount);
         (0, utils_1.assert)(status === validation_1.SetMaxTotalSupplyStatus.Ready, `Cannot close market: ${status}`);
         if (this.market.version === types_1.MarketVersion.V1) {
             (0, utils_1.assert)(this.market.controller !== undefined, "Controller address is required for V1 markets");
-            return (0, viem_write_1.submitPreparedTransaction)(this.market.signer, (0, utils_1.prepareTransaction)({
-                to: this.market.controller,
-                abi: abi_1.wildcatMarketControllerAbi,
-                functionName: "setMaxTotalSupply",
-                args: [this.market.address, amount.raw]
-            }));
-        }
-        return (0, viem_write_1.submitPreparedTransaction)(this.market.signer, (0, utils_1.prepareTransaction)({
-            to: this.market.address,
-            abi: abi_1.wildcatMarketV2Abi,
-            functionName: "setMaxTotalSupply",
-            args: [amount.raw]
-        }));
+            const controller = (0, constants_1.getControllerContract)(this.market.signer, this.market.controller);
+            return controller.setMaxTotalSupply(this.market.address, amount.raw);
+        }
+        else {
+            return this.market.contract.setMaxTotalSupply(amount.raw);
+        }
     }
     async setAnnualInterestBips(newAprBips) {
         const { status } = this.previewSetAPR(newAprBips);
         (0, utils_1.assert)(status === validation_1.SetAprStatus.Ready, `Cannot set new APR of ${newAprBips / 10000}%: ${status}`);
         if (this.market.version === types_1.MarketVersion.V1) {
             (0, utils_1.assert)(this.market.controller !== undefined, "Controller address is required for V1 markets");
-            return (0, viem_write_1.submitPreparedTransaction)(this.market.signer, (0, utils_1.prepareTransaction)({
-                to: this.market.controller,
-                abi: abi_1.wildcatMarketControllerAbi,
-                functionName: "setAnnualInterestBips",
-                args: [this.market.address, newAprBips]
-            }));
-        }
-        return (0, viem_write_1.submitPreparedTransaction)(this.market.signer, (0, utils_1.prepareTransaction)({
-            to: this.market.address,
-            abi: abi_1.wildcatMarketV2Abi,
-            functionName: "setAnnualInterestAndReserveRatioBips",
-            args: [newAprBips, this.market.reserveRatioBips]
-        }));
+            const controller = (0, constants_1.getControllerContract)(this.market.provider, this.market.controller);
+            return controller.setAnnualInterestBips(this.market.address, newAprBips);
+        }
+        else {
+            const contract = typechain_1.WildcatMarketV2__factory.connect(this.market.address, this.market.signer);
+            return contract.setAnnualInterestAndReserveRatioBips(newAprBips, this.market.reserveRatioBips);
+        }
     }
     /* -------------------------------------------------------------------------- */
     /*                                  Approval                                  */
     /* -------------------------------------------------------------------------- */
     isApprovedFor(amount) {
-        return this.underlyingApproval >= amount.raw;
+        return this.underlyingApproval.gte(amount.raw);
     }
     async approveMarket(amount) {
-        return (0, viem_write_1.submitPreparedTransaction)(this.market.signer, await this.populateApproveMarket(amount));
+        const token = this.market.underlyingToken;
+        const signer = await token.signer.getAddress();
+        if (signer.toLowerCase() !== this.account.toLowerCase()) {
+            throw Error(`MarketAccount signer ${signer} does not match ${this.account}`);
+        }
+        return token.contract.approve(this.market.address, amount.raw);
     }
     async populateApproveMarket(amount) {
         const token = this.market.underlyingToken;
@@ -393,12 +452,14 @@ class MarketAccount {
         if (signer.toLowerCase() !== this.account.toLowerCase()) {
             throw Error(`MarketAccount signer ${signer} does not match ${this.account}`);
         }
-        return (0, utils_1.prepareTransaction)({
+        return {
             to: token.address,
-            abi: abi_1.iERC20Abi,
-            functionName: "approve",
-            args: [this.market.address, amount.raw]
-        });
+            data: token.contract.interface.encodeFunctionData("approve", [
+                this.market.address,
+                amount.raw
+            ]),
+            value: "0"
+        };
     }
     /* -------------------------------------------------------------------------- */
     /*                                ForceBuyBack                                */
@@ -412,9 +473,6 @@ class MarketAccount {
         if (this.market.chainId !== constants_1.SupportedChainId.Sepolia) {
             return { status: validation_1.ForceBuyBackStatus.MainnetNotSupported };
         }
-        if (!this.market.hooksConfig?.allowForceBuyBacks) {
-            return { status: validation_1.ForceBuyBackStatus.HooksNotSupported };
-        }
         if (amount.gt(this.underlyingBalance)) {
             return { status: validation_1.ForceBuyBackStatus.InsufficientBalance };
         }
@@ -429,17 +487,20 @@ class MarketAccount {
         };
     }
     async forceBuyBack(lender, amount) {
-        return (0, viem_write_1.submitPreparedTransaction)(this.market.signer, this.populateForceBuyBack(lender, amount));
+        const { status } = this.previewForceBuyBack(lender, amount);
+        (0, utils_1.assert)(status === validation_1.ForceBuyBackStatus.Ready, `Cannot force buy back: ${status}`);
+        const contract = typechain_1.WildcatMarketV2__factory.connect(this.market.address, this.market.signer);
+        return await contract.forceBuyBack(lender, amount.raw);
     }
     populateForceBuyBack(lender, amount) {
         const { status } = this.previewForceBuyBack(lender, amount);
         (0, utils_1.assert)(status === validation_1.ForceBuyBackStatus.Ready, `Cannot force buy back: ${status}`);
-        return (0, utils_1.prepareTransaction)({
+        const contract = typechain_1.WildcatMarketV2__factory.connect(this.market.address, this.market.signer);
+        return {
             to: this.market.address,
-            abi: abi_1.wildcatMarketV2Abi,
-            functionName: "forceBuyBack",
-            args: [lender, amount.raw]
-        });
+            data: contract.interface.encodeFunctionData("forceBuyBack", [lender, amount.raw]),
+            value: "0"
+        };
     }
     /* -------------------------------------------------------------------------- */
     /*                                  Deposits                                  */
@@ -485,15 +546,20 @@ class MarketAccount {
         if (signer.toLowerCase() !== this.account.toLowerCase()) {
             throw Error(`MarketAccount signer ${signer} does not match ${this.account}`);
         }
-        return (0, utils_1.prepareTransaction)({
+        return {
             to: this.market.address,
-            abi: abi_1.wildcatMarketAbi,
-            functionName: "deposit",
-            args: [amount.raw]
-        });
+            data: this.market.contract.interface.encodeFunctionData("deposit", [amount.raw]),
+            value: "0"
+        };
     }
     async deposit(amount) {
-        return (0, viem_write_1.submitPreparedTransaction)(this.market.signer, await this.populateDeposit(amount));
+        const { status } = this.previewDeposit(amount);
+        (0, utils_1.assert)(status === validation_1.DepositStatus.Ready, `Cannot deposit: ${status}`);
+        const signer = await this.market.signer.getAddress();
+        if (signer.toLowerCase() !== this.account.toLowerCase()) {
+            throw Error(`MarketAccount signer ${signer} does not match ${this.account}`);
+        }
+        return this.market.contract.deposit(amount.raw);
     }
     /* ------ Withdrawals ------ */
     previewQueueWithdrawal(amount) {
@@ -512,19 +578,17 @@ class MarketAccount {
         if (signer.toLowerCase() !== this.account.toLowerCase()) {
             throw Error(`MarketAccount signer ${signer} does not match ${this.account}`);
         }
-        const { hash, receipt, transaction } = await (0, viem_write_1.submitPreparedTransactionAndWait)(this.market.provider, this.market.signer, (0, utils_1.prepareTransaction)({
-            to: this.market.address,
-            abi: abi_1.wildcatMarketAbi,
-            functionName: "queueWithdrawal",
-            args: [amount.raw]
-        }));
-        const queuedWithdrawalTransaction = toQueueWithdrawalTransaction(this.market.underlyingToken, receipt, this.market.address);
+        const transaction = await this.market.contract.queueWithdrawal(amount.raw);
+        const receipt = await transaction.wait();
+        const queuedWithdrawalTopic = this.market.contract.interface.getEventTopic("WithdrawalQueued");
+        const queuedWithdrawalTransaction = toQueueWithdrawalTransaction(this.market.underlyingToken, receipt.events.find((e) => e.topics[0] === queuedWithdrawalTopic));
+        if (!queuedWithdrawalTransaction)
+            throw Error("No queued withdrawal event found");
         const withdrawal = await withdrawal_status_1.LenderWithdrawalStatus.getWithdrawalForLender(this.market, queuedWithdrawalTransaction.expiry, this.account);
         return {
-            hash,
-            receipt,
+            withdrawal,
             transaction,
-            result: withdrawal
+            receipt
         };
     }
     async queueFullWithdrawal() {
@@ -534,25 +598,24 @@ class MarketAccount {
         if (signer.toLowerCase() !== this.account.toLowerCase()) {
             throw Error(`MarketAccount signer ${signer} does not match ${this.account}`);
         }
-        const { hash, receipt, transaction } = await (0, viem_write_1.submitPreparedTransactionAndWait)(this.market.provider, this.market.signer, this.market.version === types_1.MarketVersion.V2
-            ? (0, utils_1.prepareTransaction)({
-                to: this.market.address,
-                abi: abi_1.wildcatMarketV2Abi,
-                functionName: "queueFullWithdrawal"
-            })
-            : (0, utils_1.prepareTransaction)({
-                to: this.market.address,
-                abi: abi_1.wildcatMarketAbi,
-                functionName: "queueWithdrawal",
-                args: [this.marketBalance.raw]
-            }));
-        const queuedWithdrawalTransaction = toQueueWithdrawalTransaction(this.market.underlyingToken, receipt, this.market.address);
+        let transaction;
+        if (this.market.version === types_1.MarketVersion.V2) {
+            const contract = typechain_1.WildcatMarketV2__factory.connect(this.market.address, this.market.signer);
+            transaction = await contract.queueFullWithdrawal();
+        }
+        else {
+            transaction = await this.market.contract.queueWithdrawal(this.marketBalance.raw);
+        }
+        const receipt = await transaction.wait();
+        const queuedWithdrawalTopic = this.market.contract.interface.getEventTopic("WithdrawalQueued");
+        const queuedWithdrawalTransaction = toQueueWithdrawalTransaction(this.market.underlyingToken, receipt.events.find((e) => e.topics[0] === queuedWithdrawalTopic));
+        if (!queuedWithdrawalTransaction)
+            throw Error("No queued withdrawal event found");
         const withdrawal = await withdrawal_status_1.LenderWithdrawalStatus.getWithdrawalForLender(this.market, queuedWithdrawalTransaction.expiry, this.account);
         return {
-            hash,
-            receipt,
+            withdrawal,
             transaction,
-            result: withdrawal
+            receipt
         };
     }
     /* -------------------------------------------------------------------------- */
@@ -589,7 +652,13 @@ class MarketAccount {
         return { status: validation_1.RepayStatus.Ready };
     }
     async repay(amount) {
-        return (0, viem_write_1.submitPreparedTransaction)(this.market.signer, await this.populateRepay(amount));
+        const signer = await this.market.signer.getAddress();
+        if (signer.toLowerCase() !== this.account.toLowerCase()) {
+            throw Error(`MarketAccount signer ${signer} does not match ${this.account}`);
+        }
+        if (!this.isBorrower)
+            throw Error("Only borrower can repay");
+        return this.market.contract.repay(amount);
     }
     async populateRepay(amount) {
         const signer = await this.market.signer.getAddress();
@@ -598,15 +667,23 @@ class MarketAccount {
         }
         if (!this.isBorrower)
             throw Error("Only borrower can repay");
-        return (0, utils_1.prepareTransaction)({
+        return {
             to: this.market.address,
-            abi: abi_1.wildcatMarketAbi,
-            functionName: "repay",
-            args: [(0, token_1.toRawAmount)(amount)]
-        });
+            data: this.market.contract.interface.encodeFunctionData("repay", [amount]),
+            value: "0"
+        };
     }
     async repayOutstandingDebt() {
-        return (0, viem_write_1.submitPreparedTransaction)(this.market.signer, await this.populateRepayOutstandingDebt());
+        if (this.market.version !== types_1.MarketVersion.V1) {
+            throw Error(`Only V1 supports repayOutstandingDebt`);
+        }
+        if (!this.isBorrower)
+            throw Error("Only borrower can repay");
+        const signer = await this.market.signer.getAddress();
+        if (signer.toLowerCase() !== this.account.toLowerCase()) {
+            throw Error(`MarketAccount signer ${signer} does not match ${this.account}`);
+        }
+        return this.market.contract.repayOutstandingDebt();
     }
     async populateRepayOutstandingDebt() {
         if (this.market.version !== types_1.MarketVersion.V1) {
@@ -618,14 +695,23 @@ class MarketAccount {
         if (signer.toLowerCase() !== this.account.toLowerCase()) {
             throw Error(`MarketAccount signer ${signer} does not match ${this.account}`);
         }
-        return (0, utils_1.prepareTransaction)({
+        return {
             to: this.market.address,
-            abi: abi_1.wildcatMarketAbi,
-            functionName: "repayOutstandingDebt"
-        });
+            data: this.market.contract.interface.encodeFunctionData("repayOutstandingDebt"),
+            value: "0"
+        };
     }
     async repayDelinquentDebt() {
-        return (0, viem_write_1.submitPreparedTransaction)(this.market.signer, await this.populateRepayDelinquentDebt());
+        if (this.market.version !== types_1.MarketVersion.V1) {
+            throw Error(`Only V1 supports repayDelinquentDebt`);
+        }
+        if (!this.isBorrower)
+            throw Error("Only borrower can repay");
+        const signer = await this.market.signer.getAddress();
+        if (signer.toLowerCase() !== this.account.toLowerCase()) {
+            throw Error(`MarketAccount signer ${signer} does not match ${this.account}`);
+        }
+        return this.market.contract.repayDelinquentDebt();
     }
     async populateRepayDelinquentDebt() {
         if (this.market.version !== types_1.MarketVersion.V1) {
@@ -637,11 +723,11 @@ class MarketAccount {
         if (signer.toLowerCase() !== this.account.toLowerCase()) {
             throw Error(`MarketAccount signer ${signer} does not match ${this.account}`);
         }
-        return (0, utils_1.prepareTransaction)({
+        return {
             to: this.market.address,
-            abi: abi_1.wildcatMarketAbi,
-            functionName: "repayDelinquentDebt"
-        });
+            data: this.market.contract.interface.encodeFunctionData("repayDelinquentDebt"),
+            value: "0"
+        };
     }
     /* -------------------------------------------------------------------------- */
     /*                                   Borrow                                   */
@@ -662,69 +748,59 @@ class MarketAccount {
         if (amount.gt(this.market.borrowableAssets)) {
             throw Error("Insufficient borrowable assets");
         }
-        return (0, viem_write_1.submitPreparedTransaction)(this.market.signer, (0, utils_1.prepareTransaction)({
-            to: this.market.address,
-            abi: abi_1.wildcatMarketAbi,
-            functionName: "borrow",
-            args: [amount.raw]
-        }));
+        return this.market.contract.borrow(amount.raw);
     }
     /* -------------------------------------------------------------------------- */
     /*                                   Updates                                  */
     /* -------------------------------------------------------------------------- */
     async update() {
-        if (this.market.version === types_1.MarketVersion.V1) {
-            const acccountMarketInfo = await (0, market_lens_1.getLegacyMarketLenderStatus)(this.chainId, this.market.provider, this.account, this.market.address);
-            this.updateWith(acccountMarketInfo);
-            return;
-        }
-        const accountMarketInfo = await (0, market_lens_1.getLatestLenderAccountData)(this.chainId, this.market.provider, this.account, this.market.address);
-        this.updateWith(accountMarketInfo);
+        const acccountMarketInfo = await (0, constants_1.getLensContract)(this.chainId, this.market.provider).getMarketLenderStatus(this.account, this.market.address);
+        this.updateWith(acccountMarketInfo);
     }
     updateWith(info) {
         if ("isAuthorizedOnController" in info) {
             (0, utils_1.assert)(this.market.version === types_1.MarketVersion.V1, "V2 market can not be updated with V1 lens data");
             this.isAuthorizedOnController = info.isAuthorizedOnController;
-            this.role = (0, utils_1.toNumber)(info.role);
+            this.role = info.role;
         }
         else {
             (0, utils_1.assert)(this.market.version === types_1.MarketVersion.V2, "V1 market can not be updated with V2 lens data");
             this.credential = {
                 canRefresh: info.canRefresh,
                 isBlockedFromDeposits: info.isBlockedFromDeposits,
-                lastApprovalTimestamp: (0, utils_1.toNumber)(info.lastApprovalTimestamp),
+                lastApprovalTimestamp: info.lastApprovalTimestamp,
                 lastProvider: {
                     isApproved: true,
                     providerAddress: info.lastProvider.providerAddress,
-                    isPullProvider: (0, utils_1.toNumber)(info.lastProvider.pullProviderIndex) !== NullProviderIndex,
-                    isPushProvider: (0, utils_1.toNumber)(info.lastProvider.pushProviderIndex) !== NullProviderIndex,
-                    pullProviderIndex: (0, utils_1.toNumber)(info.lastProvider.pullProviderIndex),
-                    pushProviderIndex: (0, utils_1.toNumber)(info.lastProvider.pushProviderIndex),
-                    timeToLive: (0, utils_1.toNumber)(info.lastProvider.timeToLive)
+                    isPullProvider: info.lastProvider.pullProviderIndex !== NullProviderIndex,
+                    isPushProvider: info.lastProvider.pushProviderIndex !== NullProviderIndex,
+                    pullProviderIndex: info.lastProvider.pullProviderIndex,
+                    pushProviderIndex: info.lastProvider.pushProviderIndex,
+                    timeToLive: info.lastProvider.timeToLive
                 }
             };
             this.isKnownLender = info.isKnownLender;
         }
-        this.scaledMarketBalance = (0, token_1.toRawAmount)(info.scaledBalance);
+        this.scaledMarketBalance = info.scaledBalance;
         this.marketBalance = this.market.marketToken.getAmount(info.normalizedBalance);
         this.underlyingBalance = this.market.underlyingToken.getAmount(info.underlyingBalance);
-        this.underlyingApproval = (0, token_1.toRawAmount)(info.underlyingApproval);
+        this.underlyingApproval = info.underlyingApproval;
         this.processInterestAccrued();
     }
     calculateInterestEarned() {
         if (!this.lastScaleFactor)
-            return 0n;
-        if (this.scaledMarketBalance === 0n || this.lastScaleFactor === this.market.scaleFactor) {
-            return 0n;
+            return ethers_1.BigNumber.from(0);
+        if (this.scaledMarketBalance.eq(0) || this.lastScaleFactor?.eq(this.market.scaleFactor)) {
+            return ethers_1.BigNumber.from(0);
         }
-        const lastBalance = (0, utils_1.rayMulBigint)(this.scaledMarketBalance, this.lastScaleFactor);
-        const currentBalance = (0, utils_1.rayMulBigint)(this.scaledMarketBalance, this.market.scaleFactor);
-        return currentBalance - lastBalance;
+        const lastBalance = (0, utils_1.rayMul)(this.scaledMarketBalance, this.lastScaleFactor);
+        const currentBalance = (0, utils_1.rayMul)(this.scaledMarketBalance, this.market.scaleFactor);
+        return currentBalance.sub(lastBalance);
     }
     processInterestAccrued() {
         if (!this.lastScaleFactor || !this.totalInterestEarned)
             return;
-        if (this.lastScaleFactor !== this.market.scaleFactor) {
+        if (!this.lastScaleFactor.eq(this.market.scaleFactor)) {
             const interestEarned = this.calculateInterestEarned();
             this.lastScaleFactor = this.market.scaleFactor;
             this.totalInterestEarned = this.totalInterestEarned.add(interestEarned);
@@ -737,19 +813,19 @@ class MarketAccount {
     /*                             Builders / Getters                             */
     /* -------------------------------------------------------------------------- */
     static fromSubgraphAccountData(market, data) {
-        const scaledBalance = (0, token_1.toRawAmount)(data.scaledBalance);
+        const scaledBalance = ethers_1.BigNumber.from(data.scaledBalance);
         const account = new MarketAccount({
             account: data.address,
             isAuthorizedOnController: data.controllerAuthorization?.authorized ?? false,
             role: (0, utils_1.parseSubgraphLenderStatus)(data.role),
             scaledMarketBalance: scaledBalance,
-            marketBalance: market.marketToken.getAmount((0, utils_1.rayMulBigint)(scaledBalance, market.scaleFactor)),
+            marketBalance: market.marketToken.getAmount((0, utils_1.rayMul)(scaledBalance, market.scaleFactor)),
             underlyingBalance: market.underlyingToken.getAmount(0),
-            underlyingApproval: 0n,
+            underlyingApproval: ethers_1.BigNumber.from(0),
             market,
-            deposits: "deposits" in data ? data.deposits : undefined,
+            deposits: data.deposits,
             totalDeposited: market.underlyingToken.getAmount(data.totalDeposited),
-            lastScaleFactor: (0, token_1.toRawAmount)(data.lastScaleFactor),
+            lastScaleFactor: ethers_1.BigNumber.from(data.lastScaleFactor),
             lastUpdatedTimestamp: data.lastUpdatedTimestamp,
             totalInterestEarned: market.underlyingToken.getAmount(data.totalInterestEarned),
             numPendingWithdrawalBatches: data.numPendingWithdrawalBatches,
@@ -765,10 +841,10 @@ class MarketAccount {
             account,
             isAuthorizedOnController: info.isAuthorizedOnController,
             role: info.role,
-            scaledMarketBalance: (0, token_1.toRawAmount)(info.scaledBalance),
+            scaledMarketBalance: info.scaledBalance,
             marketBalance: market.marketToken.getAmount(info.normalizedBalance),
             underlyingBalance: market.underlyingToken.getAmount(info.underlyingBalance),
-            underlyingApproval: (0, token_1.toRawAmount)(info.underlyingApproval),
+            underlyingApproval: info.underlyingApproval,
             market
         });
     }
@@ -778,52 +854,46 @@ class MarketAccount {
             market,
             role: LenderRole.Null,
             marketBalance: market.marketToken.getAmount(data.normalizedBalance),
-            scaledMarketBalance: (0, token_1.toRawAmount)(data.scaledBalance),
-            underlyingApproval: (0, token_1.toRawAmount)(data.underlyingApproval),
+            scaledMarketBalance: data.scaledBalance,
+            underlyingApproval: data.underlyingApproval,
             underlyingBalance: market.underlyingToken.getAmount(data.underlyingBalance),
             isAuthorizedOnController: false,
             isKnownLender: data.isKnownLender,
             credential: {
                 canRefresh: data.canRefresh,
                 isBlockedFromDeposits: data.isBlockedFromDeposits,
-                lastApprovalTimestamp: (0, utils_1.toNumber)(data.lastApprovalTimestamp),
+                lastApprovalTimestamp: data.lastApprovalTimestamp,
                 lastProvider: {
                     isApproved: true,
                     providerAddress: data.lastProvider.providerAddress,
-                    isPullProvider: (0, utils_1.toNumber)(data.lastProvider.pullProviderIndex) !== NullProviderIndex,
-                    pullProviderIndex: (0, utils_1.toNumber)(data.lastProvider.pullProviderIndex),
-                    isPushProvider: (0, utils_1.toNumber)(data.lastProvider.pushProviderIndex) !== NullProviderIndex,
-                    pushProviderIndex: (0, utils_1.toNumber)(data.lastProvider.pushProviderIndex),
-                    timeToLive: (0, utils_1.toNumber)(data.lastProvider.timeToLive)
+                    isPullProvider: data.lastProvider.pullProviderIndex !== NullProviderIndex,
+                    pullProviderIndex: data.lastProvider.pullProviderIndex,
+                    isPushProvider: data.lastProvider.pushProviderIndex !== NullProviderIndex,
+                    pushProviderIndex: data.lastProvider.pushProviderIndex,
+                    timeToLive: data.lastProvider.timeToLive
                 }
             }
         });
     }
-    static async fromMarketDataWithLenderStatus(chainId, provider, account, info) {
+    static fromMarketDataWithLenderStatus(chainId, provider, account, info) {
         if ("controller" in info.market) {
             info = info;
             return MarketAccount.fromMarketLenderStatus(account, info.lenderStatus, market_1.Market.fromMarketData(chainId, info.market, provider));
         }
-        if ("allowForceBuyBacks" in info.market.hooksConfig) {
-            const infoV2 = info;
-            return MarketAccount.fromLenderAccountData(market_1.Market.fromMarketDataV2(chainId, provider, infoV2.market), infoV2.lenderStatus);
+        else {
+            info = info;
+            return MarketAccount.fromLenderAccountData(market_1.Market.fromMarketDataV2(chainId, provider, info.market), info.lenderStatus);
         }
-        const infoV2_5 = info;
-        const market = await market_1.Market.fromUnifiedMarketData(chainId, provider, infoV2_5.market);
-        return MarketAccount.fromLenderAccountData(market, infoV2_5.lenderStatus);
-    }
-    static async hydrateMarketAccounts(chainId, provider, account, infos) {
-        return Promise.all(infos.map((info) => MarketAccount.fromMarketDataWithLenderStatus(chainId, provider, account, info)));
     }
     static fromMarketDataOnly(market, account, isAuthorizedOnController) {
         return new MarketAccount({
             account,
             isAuthorizedOnController,
             role: LenderRole.Null,
-            scaledMarketBalance: 0n,
+            scaledMarketBalance: ethers_1.BigNumber.from(0),
             marketBalance: market.marketToken.getAmount(0),
             underlyingBalance: market.underlyingToken.getAmount(0),
-            underlyingApproval: 0n,
+            underlyingApproval: ethers_1.BigNumber.from(0),
             market
         });
     }
@@ -832,19 +902,16 @@ class MarketAccount {
      * If `market` is a string, the market data will be fetched in the same call as the account data.
      */
     static async getMarketAccount(chainId, provider, account, market) {
+        const lens = (0, constants_1.getLensContract)(chainId, provider);
         if (market instanceof market_1.Market) {
-            if (market.version === types_1.MarketVersion.V1) {
-                return (0, market_lens_1.getLegacyMarketLenderStatus)(chainId, provider, account, market.address).then((info) => MarketAccount.fromMarketLenderStatus(account, info, market));
-            }
-            return (0, market_lens_1.getLatestLenderAccountData)(chainId, provider, account, market.address).then((info) => MarketAccount.fromLenderAccountData(market, info));
-        }
-        try {
-            const info = await (0, market_lens_1.getLatestMarketDataWithLenderStatus)(chainId, provider, account, market);
-            return MarketAccount.fromMarketDataWithLenderStatus(chainId, provider, account, info);
+            return lens
+                .getMarketLenderStatus(account, market.address)
+                .then((info) => MarketAccount.fromMarketLenderStatus(account, info, market));
         }
-        catch (_) {
-            const info = await (0, market_lens_1.getLegacyMarketDataWithLenderStatus)(chainId, provider, account, market);
-            return MarketAccount.fromMarketDataWithLenderStatus(chainId, provider, account, info);
+        else {
+            return lens
+                .getMarketDataWithLenderStatus(account, market)
+                .then((info) => MarketAccount.fromMarketDataWithLenderStatus(chainId, provider, account, info));
         }
     }
     /**
@@ -852,10 +919,17 @@ class MarketAccount {
      * If `market` is a string, the market data will be fetched in the same call as the account data.
      */
     static async getMarketAccountV2(chainId, provider, account, market) {
+        const lens = (0, constants_1.getLensV2Contract)(chainId, provider);
         if (market instanceof market_1.Market) {
-            return (0, market_lens_1.getLatestLenderAccountData)(chainId, provider, account, market.address).then((info) => MarketAccount.fromLenderAccountData(market, info));
+            return lens
+                .getMarketDataWithLenderStatus(account, market.address)
+                .then((info) => MarketAccount.fromMarketDataWithLenderStatus(chainId, provider, account, info));
+        }
+        else {
+            return lens
+                .getMarketDataWithLenderStatus(account, market)
+                .then((info) => MarketAccount.fromMarketDataWithLenderStatus(chainId, provider, account, info));
         }
-        return (0, market_lens_1.getLatestMarketDataWithLenderStatus)(chainId, provider, account, market).then((info) => MarketAccount.fromMarketDataWithLenderStatus(chainId, provider, account, info));
     }
     /**
      * Get multiple `MarketAccount`s given an account and existing list of `Market`
@@ -863,139 +937,51 @@ class MarketAccount {
      * data will be fetched in the same call as the account data.
      */
     static async getMarketAccountsForLender(chainId, provider, account, markets) {
+        const lens = (0, constants_1.getLensContract)(chainId, provider);
         if (markets.length === 0) {
             return [];
         }
         if ((0, validation_1.isMarketInstanceArray)(markets)) {
-            const results = new Array(markets.length);
-            const legacyIndexes = [];
-            const latestIndexes = [];
-            markets.forEach((market, index) => {
-                if (market.version === types_1.MarketVersion.V1) {
-                    legacyIndexes.push(index);
-                }
-                else {
-                    latestIndexes.push(index);
-                }
-            });
-            if (legacyIndexes.length > 0) {
-                const legacyMarkets = legacyIndexes.map((index) => markets[index]);
-                const infos = await (0, market_lens_1.getLegacyMarketsLenderStatus)(chainId, provider, account, legacyMarkets.map((market) => market.address));
-                infos.forEach((info, i) => {
-                    results[legacyIndexes[i]] = MarketAccount.fromMarketLenderStatus(account, info, legacyMarkets[i]);
-                });
-            }
-            if (latestIndexes.length > 0) {
-                const latestMarkets = latestIndexes.map((index) => markets[index]);
-                const infos = await (0, market_lens_1.getLatestLenderAccountsData)(chainId, provider, account, latestMarkets.map((market) => market.address));
-                infos.forEach((info, i) => {
-                    results[latestIndexes[i]] = MarketAccount.fromLenderAccountData(latestMarkets[i], info);
-                });
-            }
-            return results;
-        }
-        try {
-            const infos = await (0, market_lens_1.getLatestMarketsDataWithLenderStatus)(chainId, provider, account, markets);
-            return MarketAccount.hydrateMarketAccounts(chainId, provider, account, infos);
+            return lens
+                .getMarketsLenderStatus(account, markets.map((v) => v.address))
+                .then((infos) => infos.map((info, i) => MarketAccount.fromMarketLenderStatus(account, info, markets[i])));
         }
-        catch (_) {
-            const infos = await (0, market_lens_1.getLegacyMarketsDataWithLenderStatus)(chainId, provider, account, markets);
-            return MarketAccount.hydrateMarketAccounts(chainId, provider, account, infos);
+        else {
+            return lens
+                .getMarketsDataWithLenderStatus(account, markets)
+                .then((infos) => infos.map((info) => MarketAccount.fromMarketDataWithLenderStatus(chainId, provider, account, info)));
         }
     }
-    /**
-     * Refresh existing V2 lender market accounts using the focused live lens surface when available.
-     * Falls back to existing broad V2 market reads plus lender-account reads.
-     */
-    static async refreshMarketAccountsV2LiveData(chainId, provider, account, marketAccounts) {
-        if (marketAccounts.length === 0) {
-            return marketAccounts;
-        }
-        const lender = account ?? ZERO_ADDRESS;
-        const shouldZeroBalances = !account;
-        const marketAddresses = marketAccounts.map((marketAccount) => marketAccount.market.address);
-        if (hasUnifiedLatestLensForAccountReads(chainId)) {
-            try {
-                const updates = await (0, market_lens_1.getUnifiedMarketsLiveDataWithLenderStatusV2)(chainId, provider, lender, marketAddresses);
-                updates.forEach((update, i) => {
-                    marketAccounts[i].market.updateWithLiveData(update.market);
-                    marketAccounts[i].updateWith(shouldZeroBalances ? zeroLenderBalances(update.lenderStatus) : update.lenderStatus);
-                });
-                return marketAccounts;
-            }
-            catch (_) {
-                // Fall back to existing reads for older unified lens deployments.
-            }
-        }
-        const [refreshedMarkets, lenderStatuses] = await Promise.all([
-            market_1.Market.getMarketsV2(chainId, marketAddresses, provider),
-            (0, market_lens_1.getLatestLenderAccountsData)(chainId, provider, lender, marketAddresses)
-        ]);
-        marketAccounts.forEach((marketAccount, i) => {
-            Object.assign(marketAccount.market, refreshedMarkets[i]);
-            marketAccount.updateWith(shouldZeroBalances ? zeroLenderBalances(lenderStatuses[i]) : lenderStatuses[i]);
-        });
-        return marketAccounts;
-    }
     /**
      * Get all `MarketAccount`s for a given account.
      * Fetches the market data in the same call as the account data.
      */
-    static async getAllMarketAccountsForLender(chainId, provider, account) {
-        if (hasUnifiedLatestLensForAccountReads(chainId)) {
-            const markets = await (0, arch_controller_1.getRegisteredMarkets)(chainId, provider);
-            if (markets.length === 0) {
-                return [];
-            }
-            const infos = await (0, market_lens_1.getLatestMarketsDataWithLenderStatus)(chainId, provider, account, markets);
-            return MarketAccount.hydrateMarketAccounts(chainId, provider, account, infos);
-        }
-        const infos = await (0, market_lens_1.getLegacyAllMarketsDataWithLenderStatus)(chainId, provider, account);
-        return MarketAccount.hydrateMarketAccounts(chainId, provider, account, infos);
+    static getAllMarketAccountsForLender(chainId, provider, account) {
+        const lens = (0, constants_1.getLensContract)(chainId, provider);
+        return lens
+            .getAllMarketsDataWithLenderStatus(account)
+            .then((infos) => infos.map((info) => MarketAccount.fromMarketDataWithLenderStatus(chainId, provider, account, info)));
     }
     /**
      * 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 async getPaginatedMarketAccounts(chainId, provider, account, start = 0, count) {
-        if (hasUnifiedLatestLensForAccountReads(chainId)) {
-            if (count <= 0) {
-                return [];
-            }
-            const totalMarkets = await (0, arch_controller_1.getRegisteredMarketsCount)(chainId, provider);
-            if (start >= totalMarkets) {
-                return [];
-            }
-            const end = Math.min(start + count, totalMarkets);
-            const markets = await (0, arch_controller_1.getRegisteredMarketsPage)(chainId, provider, start, end);
-            if (markets.length === 0) {
-                return [];
-            }
-            const infos = await (0, market_lens_1.getLatestMarketsDataWithLenderStatus)(chainId, provider, account, markets);
-            return MarketAccount.hydrateMarketAccounts(chainId, provider, account, infos);
-        }
-        const infos = await (0, market_lens_1.getLegacyPaginatedMarketsDataWithLenderStatus)(chainId, provider, account, start, count);
-        return MarketAccount.hydrateMarketAccounts(chainId, provider, account, infos);
+    static getPaginatedMarketAccounts(chainId, provider, account, start = 0, count) {
+        const lens = (0, constants_1.getLensContract)(chainId, provider);
+        return lens
+            .getPaginatedMarketsDataWithLenderStatus(account, start, count)
+            .then((infos) => infos.map((info) => MarketAccount.fromMarketDataWithLenderStatus(chainId, provider, account, info)));
     }
 }
 exports.MarketAccount = MarketAccount;
-const toQueueWithdrawalTransaction = (underlyingToken, receipt, marketAddress) => {
-    const event = (0, viem_1.parseEventLogs)({
-        abi: abi_1.wildcatMarketAbi,
-        eventName: "WithdrawalQueued",
-        logs: receipt.logs
-    })[0];
-    if (!event)
-        throw Error("No queued withdrawal event found");
-    return {
-        transactionHash: receipt.transactionHash,
-        blockNumber: Number(receipt.blockNumber),
-        expiry: Number(event.args.expiry),
-        lender: event.args.account,
-        market: marketAddress,
-        scaledAmount: (0, token_1.toRawAmount)(event.args.scaledAmount),
-        originalAmount: underlyingToken.getAmount(event.args.normalizedAmount)
-    };
-};
+const toQueueWithdrawalTransaction = (underlyingToken, log) => ({
+    transactionHash: log.transactionHash,
+    blockNumber: log.blockNumber,
+    expiry: log.args.expiry.toNumber(),
+    lender: log.args.account,
+    market: log.address,
+    scaledAmount: log.args.scaledAmount,
+    originalAmount: underlyingToken.getAmount(log.args.normalizedAmount)
+});
 //# sourceMappingURL=index.js.map