@wildcatfi/wildcat-sdk 3.0.68-beta → 3.0.69-beta

package/dist/account/index.js

@@ -15,15 +15,18 @@ 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) {
@@ -32,7 +35,7 @@ var LenderRole;
     LenderRole[LenderRole["WithdrawOnly"] = 2] = "WithdrawOnly";
     LenderRole[LenderRole["DepositAndWithdraw"] = 3] = "DepositAndWithdraw";
 })(LenderRole = exports.LenderRole || (exports.LenderRole = {}));
-const NullProviderIndex = ethers_1.BigNumber.from(2).pow(24).sub(1).toNumber();
+const NullProviderIndex = 2 ** 24 - 1;
 const hasUnifiedLatestLensForAccountReads = (chainId) => {
     return (0, constants_1.hasDeploymentAddress)(chainId, "MarketLensV2_5");
 };
@@ -280,110 +283,101 @@ 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`);
-        const iface = typechain_1.IOpenTermHooks__factory.createInterface();
-        return {
-            to: this.market.address,
-            data: iface.encodeFunctionData("setMinimumDeposit", [this.market.address, amount.raw]),
-            value: "0"
-        };
+        return (0, utils_1.prepareTransaction)({
+            to: config.hooksAddress,
+            abi: abi_1.iOpenTermHooksAbi,
+            functionName: "setMinimumDeposit",
+            args: [this.market.address, amount.raw]
+        });
     }
     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`);
-        const iface = typechain_1.IFixedTermHooks__factory.createInterface();
-        return {
-            to: this.market.address,
-            data: iface.encodeFunctionData("setFixedTermEndTime", [this.market.address, endTime]),
-            value: "0"
-        };
+        return (0, utils_1.prepareTransaction)({
+            to: config.hooksAddress,
+            abi: abi_1.iFixedTermHooksAbi,
+            functionName: "setFixedTermEndTime",
+            args: [this.market.address, endTime]
+        });
     }
     async setMinimumDeposit(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);
+        return (0, viem_write_1.submitPreparedTransaction)(this.market.signer, await this.populateSetMinimumDeposit(amount));
     }
     async setFixedTermEndTime(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);
+        return (0, viem_write_1.submitPreparedTransaction)(this.market.signer, await this.populateSetFixedTermEndTime(endTime));
     }
     /* -------------------------------------------------------------------------- */
     /*                             Management Actions                             */
     /* -------------------------------------------------------------------------- */
     async closeMarket() {
-        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();
+        return (0, viem_write_1.submitPreparedTransaction)(this.market.signer, this.populateCloseMarket());
     }
     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 {
-                to: controller.address,
-                data: controller.interface.encodeFunctionData("closeMarket", [this.market.address]),
-                value: "0"
-            };
+            return (0, utils_1.prepareTransaction)({
+                to: this.market.controller,
+                abi: abi_1.wildcatMarketControllerAbi,
+                functionName: "closeMarket",
+                args: [this.market.address]
+            });
         }
-        return {
+        return (0, utils_1.prepareTransaction)({
             to: this.market.address,
-            data: this.market.contract.interface.encodeFunctionData("closeMarket"),
-            value: "0"
-        };
+            abi: abi_1.wildcatMarketV2Abi,
+            functionName: "closeMarket"
+        });
     }
     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");
-            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);
-        }
+            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]
+        }));
     }
     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");
-            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);
-        }
+            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]
+        }));
     }
     /* -------------------------------------------------------------------------- */
     /*                                  Approval                                  */
     /* -------------------------------------------------------------------------- */
     isApprovedFor(amount) {
-        return this.underlyingApproval.gte(amount.raw);
+        return this.underlyingApproval >= amount.raw;
     }
     async approveMarket(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);
+        return (0, viem_write_1.submitPreparedTransaction)(this.market.signer, await this.populateApproveMarket(amount));
     }
     async populateApproveMarket(amount) {
         const token = this.market.underlyingToken;
@@ -391,14 +385,12 @@ class MarketAccount {
         if (signer.toLowerCase() !== this.account.toLowerCase()) {
             throw Error(`MarketAccount signer ${signer} does not match ${this.account}`);
         }
-        return {
+        return (0, utils_1.prepareTransaction)({
             to: token.address,
-            data: token.contract.interface.encodeFunctionData("approve", [
-                this.market.address,
-                amount.raw
-            ]),
-            value: "0"
-        };
+            abi: abi_1.iERC20Abi,
+            functionName: "approve",
+            args: [this.market.address, amount.raw]
+        });
     }
     /* -------------------------------------------------------------------------- */
     /*                                ForceBuyBack                                */
@@ -426,20 +418,17 @@ class MarketAccount {
         };
     }
     async forceBuyBack(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);
+        return (0, viem_write_1.submitPreparedTransaction)(this.market.signer, this.populateForceBuyBack(lender, amount));
     }
     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 {
+        return (0, utils_1.prepareTransaction)({
             to: this.market.address,
-            data: contract.interface.encodeFunctionData("forceBuyBack", [lender, amount.raw]),
-            value: "0"
-        };
+            abi: abi_1.wildcatMarketV2Abi,
+            functionName: "forceBuyBack",
+            args: [lender, amount.raw]
+        });
     }
     /* -------------------------------------------------------------------------- */
     /*                                  Deposits                                  */
@@ -485,20 +474,15 @@ class MarketAccount {
         if (signer.toLowerCase() !== this.account.toLowerCase()) {
             throw Error(`MarketAccount signer ${signer} does not match ${this.account}`);
         }
-        return {
+        return (0, utils_1.prepareTransaction)({
             to: this.market.address,
-            data: this.market.contract.interface.encodeFunctionData("deposit", [amount.raw]),
-            value: "0"
-        };
+            abi: abi_1.wildcatMarketAbi,
+            functionName: "deposit",
+            args: [amount.raw]
+        });
     }
     async deposit(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);
+        return (0, viem_write_1.submitPreparedTransaction)(this.market.signer, await this.populateDeposit(amount));
     }
     /* ------ Withdrawals ------ */
     previewQueueWithdrawal(amount) {
@@ -517,17 +501,18 @@ class MarketAccount {
         if (signer.toLowerCase() !== this.account.toLowerCase()) {
             throw Error(`MarketAccount signer ${signer} does not match ${this.account}`);
         }
-        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 { hash, receipt } = 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 withdrawal = await withdrawal_status_1.LenderWithdrawalStatus.getWithdrawalForLender(this.market, queuedWithdrawalTransaction.expiry, this.account);
         return {
-            withdrawal,
-            transaction,
-            receipt
+            hash,
+            receipt,
+            result: withdrawal
         };
     }
     async queueFullWithdrawal() {
@@ -537,24 +522,24 @@ class MarketAccount {
         if (signer.toLowerCase() !== this.account.toLowerCase()) {
             throw Error(`MarketAccount signer ${signer} does not match ${this.account}`);
         }
-        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 { hash, receipt } = 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);
         const withdrawal = await withdrawal_status_1.LenderWithdrawalStatus.getWithdrawalForLender(this.market, queuedWithdrawalTransaction.expiry, this.account);
         return {
-            withdrawal,
-            transaction,
-            receipt
+            hash,
+            receipt,
+            result: withdrawal
         };
     }
     /* -------------------------------------------------------------------------- */
@@ -591,13 +576,7 @@ class MarketAccount {
         return { status: validation_1.RepayStatus.Ready };
     }
     async repay(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);
+        return (0, viem_write_1.submitPreparedTransaction)(this.market.signer, await this.populateRepay(amount));
     }
     async populateRepay(amount) {
         const signer = await this.market.signer.getAddress();
@@ -606,23 +585,15 @@ class MarketAccount {
         }
         if (!this.isBorrower)
             throw Error("Only borrower can repay");
-        return {
+        return (0, utils_1.prepareTransaction)({
             to: this.market.address,
-            data: this.market.contract.interface.encodeFunctionData("repay", [amount]),
-            value: "0"
-        };
+            abi: abi_1.wildcatMarketAbi,
+            functionName: "repay",
+            args: [(0, token_1.toRawAmount)(amount)]
+        });
     }
     async repayOutstandingDebt() {
-        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();
+        return (0, viem_write_1.submitPreparedTransaction)(this.market.signer, await this.populateRepayOutstandingDebt());
     }
     async populateRepayOutstandingDebt() {
         if (this.market.version !== types_1.MarketVersion.V1) {
@@ -634,23 +605,14 @@ class MarketAccount {
         if (signer.toLowerCase() !== this.account.toLowerCase()) {
             throw Error(`MarketAccount signer ${signer} does not match ${this.account}`);
         }
-        return {
+        return (0, utils_1.prepareTransaction)({
             to: this.market.address,
-            data: this.market.contract.interface.encodeFunctionData("repayOutstandingDebt"),
-            value: "0"
-        };
+            abi: abi_1.wildcatMarketAbi,
+            functionName: "repayOutstandingDebt"
+        });
     }
     async repayDelinquentDebt() {
-        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();
+        return (0, viem_write_1.submitPreparedTransaction)(this.market.signer, await this.populateRepayDelinquentDebt());
     }
     async populateRepayDelinquentDebt() {
         if (this.market.version !== types_1.MarketVersion.V1) {
@@ -662,11 +624,11 @@ class MarketAccount {
         if (signer.toLowerCase() !== this.account.toLowerCase()) {
             throw Error(`MarketAccount signer ${signer} does not match ${this.account}`);
         }
-        return {
+        return (0, utils_1.prepareTransaction)({
             to: this.market.address,
-            data: this.market.contract.interface.encodeFunctionData("repayDelinquentDebt"),
-            value: "0"
-        };
+            abi: abi_1.wildcatMarketAbi,
+            functionName: "repayDelinquentDebt"
+        });
     }
     /* -------------------------------------------------------------------------- */
     /*                                   Borrow                                   */
@@ -687,64 +649,69 @@ class MarketAccount {
         if (amount.gt(this.market.borrowableAssets)) {
             throw Error("Insufficient borrowable assets");
         }
-        return this.market.contract.borrow(amount.raw);
+        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]
+        }));
     }
     /* -------------------------------------------------------------------------- */
     /*                                   Updates                                  */
     /* -------------------------------------------------------------------------- */
     async update() {
         if (this.market.version === types_1.MarketVersion.V1) {
-            const acccountMarketInfo = await (0, constants_1.getLensContract)(this.chainId, this.market.provider).getMarketLenderStatus(this.account, this.market.address);
+            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, constants_1.getLatestLensContract)(this.chainId, this.market.provider)["getLenderAccountData(address,address)"](this.account, this.market.address);
+        const accountMarketInfo = await (0, market_lens_1.getLatestLenderAccountData)(this.chainId, this.market.provider, this.account, this.market.address);
         this.updateWith(accountMarketInfo);
     }
     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 = info.role;
+            this.role = (0, utils_1.toNumber)(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: info.lastApprovalTimestamp,
+                lastApprovalTimestamp: (0, utils_1.toNumber)(info.lastApprovalTimestamp),
                 lastProvider: {
                     isApproved: true,
                     providerAddress: info.lastProvider.providerAddress,
-                    isPullProvider: info.lastProvider.pullProviderIndex !== NullProviderIndex,
-                    isPushProvider: info.lastProvider.pushProviderIndex !== NullProviderIndex,
-                    pullProviderIndex: info.lastProvider.pullProviderIndex,
-                    pushProviderIndex: info.lastProvider.pushProviderIndex,
-                    timeToLive: info.lastProvider.timeToLive
+                    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)
                 }
             };
             this.isKnownLender = info.isKnownLender;
         }
-        this.scaledMarketBalance = info.scaledBalance;
+        this.scaledMarketBalance = (0, token_1.toRawAmount)(info.scaledBalance);
         this.marketBalance = this.market.marketToken.getAmount(info.normalizedBalance);
         this.underlyingBalance = this.market.underlyingToken.getAmount(info.underlyingBalance);
-        this.underlyingApproval = info.underlyingApproval;
+        this.underlyingApproval = (0, token_1.toRawAmount)(info.underlyingApproval);
         this.processInterestAccrued();
     }
     calculateInterestEarned() {
         if (!this.lastScaleFactor)
-            return ethers_1.BigNumber.from(0);
-        if (this.scaledMarketBalance.eq(0) || this.lastScaleFactor?.eq(this.market.scaleFactor)) {
-            return ethers_1.BigNumber.from(0);
+            return 0n;
+        if (this.scaledMarketBalance === 0n || this.lastScaleFactor === this.market.scaleFactor) {
+            return 0n;
         }
-        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);
+        const lastBalance = (0, utils_1.rayMulBigint)(this.scaledMarketBalance, this.lastScaleFactor);
+        const currentBalance = (0, utils_1.rayMulBigint)(this.scaledMarketBalance, this.market.scaleFactor);
+        return currentBalance - lastBalance;
     }
     processInterestAccrued() {
         if (!this.lastScaleFactor || !this.totalInterestEarned)
             return;
-        if (!this.lastScaleFactor.eq(this.market.scaleFactor)) {
+        if (this.lastScaleFactor !== this.market.scaleFactor) {
             const interestEarned = this.calculateInterestEarned();
             this.lastScaleFactor = this.market.scaleFactor;
             this.totalInterestEarned = this.totalInterestEarned.add(interestEarned);
@@ -757,19 +724,19 @@ class MarketAccount {
     /*                             Builders / Getters                             */
     /* -------------------------------------------------------------------------- */
     static fromSubgraphAccountData(market, data) {
-        const scaledBalance = ethers_1.BigNumber.from(data.scaledBalance);
+        const scaledBalance = (0, token_1.toRawAmount)(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.rayMul)(scaledBalance, market.scaleFactor)),
+            marketBalance: market.marketToken.getAmount((0, utils_1.rayMulBigint)(scaledBalance, market.scaleFactor)),
             underlyingBalance: market.underlyingToken.getAmount(0),
-            underlyingApproval: ethers_1.BigNumber.from(0),
+            underlyingApproval: 0n,
             market,
             deposits: data.deposits,
             totalDeposited: market.underlyingToken.getAmount(data.totalDeposited),
-            lastScaleFactor: ethers_1.BigNumber.from(data.lastScaleFactor),
+            lastScaleFactor: (0, token_1.toRawAmount)(data.lastScaleFactor),
             lastUpdatedTimestamp: data.lastUpdatedTimestamp,
             totalInterestEarned: market.underlyingToken.getAmount(data.totalInterestEarned),
             numPendingWithdrawalBatches: data.numPendingWithdrawalBatches,
@@ -785,10 +752,10 @@ class MarketAccount {
             account,
             isAuthorizedOnController: info.isAuthorizedOnController,
             role: info.role,
-            scaledMarketBalance: info.scaledBalance,
+            scaledMarketBalance: (0, token_1.toRawAmount)(info.scaledBalance),
             marketBalance: market.marketToken.getAmount(info.normalizedBalance),
             underlyingBalance: market.underlyingToken.getAmount(info.underlyingBalance),
-            underlyingApproval: info.underlyingApproval,
+            underlyingApproval: (0, token_1.toRawAmount)(info.underlyingApproval),
             market
         });
     }
@@ -798,23 +765,23 @@ class MarketAccount {
             market,
             role: LenderRole.Null,
             marketBalance: market.marketToken.getAmount(data.normalizedBalance),
-            scaledMarketBalance: data.scaledBalance,
-            underlyingApproval: data.underlyingApproval,
+            scaledMarketBalance: (0, token_1.toRawAmount)(data.scaledBalance),
+            underlyingApproval: (0, token_1.toRawAmount)(data.underlyingApproval),
             underlyingBalance: market.underlyingToken.getAmount(data.underlyingBalance),
             isAuthorizedOnController: false,
             isKnownLender: data.isKnownLender,
             credential: {
                 canRefresh: data.canRefresh,
                 isBlockedFromDeposits: data.isBlockedFromDeposits,
-                lastApprovalTimestamp: data.lastApprovalTimestamp,
+                lastApprovalTimestamp: (0, utils_1.toNumber)(data.lastApprovalTimestamp),
                 lastProvider: {
                     isApproved: true,
                     providerAddress: data.lastProvider.providerAddress,
-                    isPullProvider: data.lastProvider.pullProviderIndex !== NullProviderIndex,
-                    pullProviderIndex: data.lastProvider.pullProviderIndex,
-                    isPushProvider: data.lastProvider.pushProviderIndex !== NullProviderIndex,
-                    pushProviderIndex: data.lastProvider.pushProviderIndex,
-                    timeToLive: data.lastProvider.timeToLive
+                    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)
                 }
             }
         });
@@ -840,10 +807,10 @@ class MarketAccount {
             account,
             isAuthorizedOnController,
             role: LenderRole.Null,
-            scaledMarketBalance: ethers_1.BigNumber.from(0),
+            scaledMarketBalance: 0n,
             marketBalance: market.marketToken.getAmount(0),
             underlyingBalance: market.underlyingToken.getAmount(0),
-            underlyingApproval: ethers_1.BigNumber.from(0),
+            underlyingApproval: 0n,
             market
         });
     }
@@ -854,19 +821,16 @@ class MarketAccount {
     static async getMarketAccount(chainId, provider, account, market) {
         if (market instanceof market_1.Market) {
             if (market.version === types_1.MarketVersion.V1) {
-                return (0, constants_1.getLensContract)(chainId, provider)
-                    .getMarketLenderStatus(account, market.address)
-                    .then((info) => MarketAccount.fromMarketLenderStatus(account, info, market));
+                return (0, market_lens_1.getLegacyMarketLenderStatus)(chainId, provider, account, market.address).then((info) => MarketAccount.fromMarketLenderStatus(account, info, market));
             }
-            return (0, constants_1.getLatestLensContract)(chainId, provider)["getLenderAccountData(address,address)"](account, market.address)
-                .then((info) => MarketAccount.fromLenderAccountData(market, info));
+            return (0, market_lens_1.getLatestLenderAccountData)(chainId, provider, account, market.address).then((info) => MarketAccount.fromLenderAccountData(market, info));
         }
         try {
-            const info = await (0, constants_1.getLatestLensContract)(chainId, provider).getMarketDataWithLenderStatus(account, market);
+            const info = await (0, market_lens_1.getLatestMarketDataWithLenderStatus)(chainId, provider, account, market);
             return MarketAccount.fromMarketDataWithLenderStatus(chainId, provider, account, info);
         }
         catch (_) {
-            const info = await (0, constants_1.getLensContract)(chainId, provider).getMarketDataWithLenderStatus(account, market);
+            const info = await (0, market_lens_1.getLegacyMarketDataWithLenderStatus)(chainId, provider, account, market);
             return MarketAccount.fromMarketDataWithLenderStatus(chainId, provider, account, info);
         }
     }
@@ -876,12 +840,9 @@ class MarketAccount {
      */
     static async getMarketAccountV2(chainId, provider, account, market) {
         if (market instanceof market_1.Market) {
-            return (0, constants_1.getLatestLensContract)(chainId, provider)["getLenderAccountData(address,address)"](account, market.address)
-                .then((info) => MarketAccount.fromLenderAccountData(market, info));
+            return (0, market_lens_1.getLatestLenderAccountData)(chainId, provider, account, market.address).then((info) => MarketAccount.fromLenderAccountData(market, info));
         }
-        return (0, constants_1.getLatestLensContract)(chainId, provider)
-            .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`
@@ -906,14 +867,14 @@ class MarketAccount {
             });
             if (legacyIndexes.length > 0) {
                 const legacyMarkets = legacyIndexes.map((index) => markets[index]);
-                const infos = await (0, constants_1.getLensContract)(chainId, provider).getMarketsLenderStatus(account, legacyMarkets.map((market) => market.address));
+                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, constants_1.getLatestLensContract)(chainId, provider)["getLenderAccountData(address,address[])"](account, latestMarkets.map((market) => market.address));
+                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);
                 });
@@ -921,11 +882,11 @@ class MarketAccount {
             return results;
         }
         try {
-            const infos = await (0, constants_1.getLatestLensContract)(chainId, provider).getMarketsDataWithLenderStatus(account, markets);
+            const infos = await (0, market_lens_1.getLatestMarketsDataWithLenderStatus)(chainId, provider, account, markets);
             return MarketAccount.hydrateMarketAccounts(chainId, provider, account, infos);
         }
         catch (_) {
-            const infos = await (0, constants_1.getLensContract)(chainId, provider).getMarketsDataWithLenderStatus(account, markets);
+            const infos = await (0, market_lens_1.getLegacyMarketsDataWithLenderStatus)(chainId, provider, account, markets);
             return MarketAccount.hydrateMarketAccounts(chainId, provider, account, infos);
         }
     }
@@ -935,14 +896,14 @@ class MarketAccount {
      */
     static async getAllMarketAccountsForLender(chainId, provider, account) {
         if (hasUnifiedLatestLensForAccountReads(chainId)) {
-            const markets = await (0, constants_1.getArchControllerContract)(chainId, provider)["getRegisteredMarkets()"]();
+            const markets = await (0, arch_controller_1.getRegisteredMarkets)(chainId, provider);
             if (markets.length === 0) {
                 return [];
             }
-            const infos = await (0, constants_1.getLatestLensContract)(chainId, provider).getMarketsDataWithLenderStatus(account, markets);
+            const infos = await (0, market_lens_1.getLatestMarketsDataWithLenderStatus)(chainId, provider, account, markets);
             return MarketAccount.hydrateMarketAccounts(chainId, provider, account, infos);
         }
-        const infos = await (0, constants_1.getLensContract)(chainId, provider).getAllMarketsDataWithLenderStatus(account);
+        const infos = await (0, market_lens_1.getLegacyAllMarketsDataWithLenderStatus)(chainId, provider, account);
         return MarketAccount.hydrateMarketAccounts(chainId, provider, account, infos);
     }
     /**
@@ -955,31 +916,39 @@ class MarketAccount {
             if (count <= 0) {
                 return [];
             }
-            const archController = (0, constants_1.getArchControllerContract)(chainId, provider);
-            const totalMarkets = (await archController.getRegisteredMarketsCount()).toNumber();
+            const totalMarkets = await (0, arch_controller_1.getRegisteredMarketsCount)(chainId, provider);
             if (start >= totalMarkets) {
                 return [];
             }
             const end = Math.min(start + count, totalMarkets);
-            const markets = await archController["getRegisteredMarkets(uint256,uint256)"](start, end);
+            const markets = await (0, arch_controller_1.getRegisteredMarketsPage)(chainId, provider, start, end);
             if (markets.length === 0) {
                 return [];
             }
-            const infos = await (0, constants_1.getLatestLensContract)(chainId, provider).getMarketsDataWithLenderStatus(account, markets);
+            const infos = await (0, market_lens_1.getLatestMarketsDataWithLenderStatus)(chainId, provider, account, markets);
             return MarketAccount.hydrateMarketAccounts(chainId, provider, account, infos);
         }
-        const infos = await (0, constants_1.getLensContract)(chainId, provider).getPaginatedMarketsDataWithLenderStatus(account, start, count);
+        const infos = await (0, market_lens_1.getLegacyPaginatedMarketsDataWithLenderStatus)(chainId, provider, account, start, count);
         return MarketAccount.hydrateMarketAccounts(chainId, provider, account, infos);
     }
 }
 exports.MarketAccount = MarketAccount;
-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)
-});
+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)
+    };
+};
 //# sourceMappingURL=index.js.map