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

package/dist/market.js

@@ -1,26 +1,45 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Market = void 0;
-const ethers_1 = require("ethers");
-const abstract_signer_1 = require("@ethersproject/abstract-signer");
-const typechain_1 = require("./typechain");
 const constants_1 = require("./constants");
+const arch_controller_1 = require("./internal/arch-controller");
+const market_lens_1 = require("./internal/market-lens");
 const token_1 = require("./token");
 const types_1 = require("./types");
-const utils_1 = require("ethers/lib/utils");
 const account_1 = require("./account");
-const utils_2 = require("./utils");
+const utils_1 = require("./utils");
 const access_1 = require("./access");
+const abi_1 = require("./abi");
+const viem_write_1 = require("./internal/viem-write");
+const ethers_signer_1 = require("./internal/ethers-signer");
+const ethers_viem_1 = require("./internal/ethers-viem");
+const viem_read_1 = require("./internal/viem-read");
+const getAllowForceBuyBacksFromHookedMarket = (hookedMarket, allowForceBuyBacksIndex) => {
+    return (hookedMarket.allowForceBuyBacks ??
+        Boolean(hookedMarket[allowForceBuyBacksIndex]));
+};
 const hasUnifiedLatestLensForDirectReads = (chainId) => {
     return (0, constants_1.hasDeploymentAddress)(chainId, "MarketLensV2_5");
 };
+const toUnifiedMarketDataV2 = (data) => {
+    if ("market" in data) {
+        return data;
+    }
+    return {
+        market: data,
+        commitmentFeeBips: {
+            isPresent: false,
+            value: 0n
+        },
+        drawnAmount: {
+            isPresent: false,
+            value: 0n
+        }
+    };
+};
 class Market extends types_1.ContractWrapper {
-    get _contractAddress() {
-        return this.address;
-    }
     constructor({ provider, ...args }) {
         super(provider);
-        this.contractFactory = typechain_1.WildcatMarket__factory;
         const { address, name, symbol, decimals } = args.marketToken;
         Object.assign(this, {
             address,
@@ -29,9 +48,9 @@ class Market extends types_1.ContractWrapper {
             decimals
         });
         Object.assign(this, args);
-        this.depositRecords = (args.depositRecords ?? []).map((log) => (0, utils_2.parseMarketRecord)(this.underlyingToken, log));
-        this.repaymentRecords = (args.repaymentRecords ?? []).map((log) => (0, utils_2.parseMarketRecord)(this.underlyingToken, log));
-        this.borrowRecords = (args.borrowRecords ?? []).map((log) => (0, utils_2.parseMarketRecord)(this.underlyingToken, log));
+        this.depositRecords = (args.depositRecords ?? []).map((log) => (0, utils_1.parseMarketRecord)(this.underlyingToken, log));
+        this.repaymentRecords = (args.repaymentRecords ?? []).map((log) => (0, utils_1.parseMarketRecord)(this.underlyingToken, log));
+        this.borrowRecords = (args.borrowRecords ?? []).map((log) => (0, utils_1.parseMarketRecord)(this.underlyingToken, log));
         this.feeCollectionRecords = (args.feeCollectionRecords ?? []).map(({ feesCollected, __typename, ...rest }) => ({
             ...rest,
             __typename: "FeesCollected",
@@ -56,12 +75,50 @@ class Market extends types_1.ContractWrapper {
     /** @returns Percentage growth of the market since it was created */
     get allTimeGrowth() {
         // 27 - 2 to convert to percentage
-        return +(0, utils_1.formatUnits)(this.scaleFactor, 25);
+        return +(0, utils_1.formatFixedBigint)(this.scaleFactor, 25, 25);
     }
     /** @returns Maximum amount of underlying token that can be deposited */
     get maximumDeposit() {
         return this.underlyingToken.getAmount(this.maxTotalSupply.satsub(this.totalSupply.raw));
     }
+    get currentRevolvingAprMetrics() {
+        const commitmentFeeBips = this.commitmentFeeBips;
+        const drawnAmount = this.drawnAmount;
+        if (commitmentFeeBips == null || drawnAmount == null) {
+            return undefined;
+        }
+        const totalSupply = this.totalSupply.raw;
+        const drawnAmountRaw = drawnAmount.raw > totalSupply ? totalSupply : drawnAmount.raw;
+        const utilizationBips = totalSupply > 0n ? Number((drawnAmountRaw * utils_1.BIP_BIGINT) / totalSupply) : 0;
+        const utilizationAprBips = totalSupply > 0n
+            ? Number((drawnAmountRaw * BigInt(this.annualInterestBips)) / totalSupply)
+            : 0;
+        const blendedBaseAprBips = commitmentFeeBips + utilizationAprBips;
+        const protocolAprBips = Number((BigInt(blendedBaseAprBips) * BigInt(this.protocolFeeBips)) / utils_1.BIP_BIGINT);
+        const penaltyAprBips = this.isIncurringPenalties ? this.delinquencyFeeBips : 0;
+        return {
+            commitmentFeeBips,
+            drawnAmount,
+            utilizationBips,
+            utilizationAprBips,
+            blendedBaseAprBips,
+            protocolAprBips,
+            penaltyAprBips,
+            effectiveLenderAprBips: blendedBaseAprBips + penaltyAprBips
+        };
+    }
+    get currentBaseLenderAprBips() {
+        return this.currentRevolvingAprMetrics?.blendedBaseAprBips ?? this.annualInterestBips;
+    }
+    get currentBaseLenderAPR() {
+        return (0, utils_1.bipToRayBigint)(this.currentBaseLenderAprBips);
+    }
+    get currentPenaltyAPR() {
+        return this.isIncurringPenalties ? (0, utils_1.bipToRayBigint)(this.delinquencyFeeBips) : 0n;
+    }
+    get currentProtocolAPR() {
+        return (0, utils_1.bipMulBigint)(this.currentBaseLenderAPR, this.protocolFeeBips);
+    }
     /** @returns Whether the borrower is in penalized delinquency */
     get isIncurringPenalties() {
         return this.timeDelinquent > this.delinquencyGracePeriod;
@@ -107,7 +164,7 @@ class Market extends types_1.ContractWrapper {
         const targetRatio = this.reserveRatioBips / 100;
         const actualRatio = this.totalSupply.eq(0)
             ? 100
-            : +(0, utils_1.formatUnits)(this.totalAssets.raw.mul(utils_2.RAY).div(this.totalSupply.raw), 25);
+            : +(0, utils_1.formatFixedBigint)((this.totalAssets.raw * utils_1.RAY_BIGINT) / this.totalSupply.raw, 25, 25);
         if (this.temporaryReserveRatio) {
             return {
                 targetRatio,
@@ -120,7 +177,7 @@ class Market extends types_1.ContractWrapper {
         return { targetRatio, actualRatio };
     }
     get normalizedPendingWithdrawals() {
-        return this.underlyingToken.getAmount((0, utils_2.rayMul)(this.scaledPendingWithdrawals, this.scaleFactor));
+        return this.underlyingToken.getAmount((0, utils_1.rayMulBigint)(this.scaledPendingWithdrawals, this.scaleFactor));
     }
     /** @returns Whether the borrower can change the APR */
     get canReduceAPR() {
@@ -136,7 +193,7 @@ class Market extends types_1.ContractWrapper {
         return this.totalAssets.satsub(unavailableAssets);
     }
     get minimumReserves() {
-        return this.underlyingToken.getAmount((0, utils_2.bipMul)(this.outstandingTotalSupply.raw, ethers_1.BigNumber.from(this.reserveRatioBips)));
+        return this.outstandingTotalSupply.bipMul(this.reserveRatioBips);
     }
     get borrowableAssets() {
         return this.totalAssets.satsub(this.coverageLiquidity);
@@ -174,63 +231,59 @@ class Market extends types_1.ContractWrapper {
         };
     }
     normalizeAmount(amount) {
-        return (0, utils_2.rayMul)(amount, this.scaleFactor);
+        return (0, utils_1.rayMulBigint)(amount, this.scaleFactor);
     }
     scaleAmount(amount) {
-        return (0, utils_2.rayDiv)(amount, this.scaleFactor);
+        return (0, utils_1.rayDivBigint)(amount, this.scaleFactor);
     }
     get secondsBeforeDelinquency() {
         if (this.willBeDelinquent || this.totalDebts.eq(0))
             return 0;
         const scaledBase = this.scaledTotalSupply;
-        const basePrincipal = this.underlyingToken.getAmount((0, utils_2.rayMul)(scaledBase, this.scaleFactor));
-        const baseAPRRay = (0, utils_2.bipToRay)(this.annualInterestBips);
-        const protocolFeeAPRRay = (0, utils_2.bipMul)(baseAPRRay, ethers_1.BigNumber.from(this.protocolFeeBips));
-        const delinquencyFeeAPRRay = this.timeDelinquent > this.delinquencyGracePeriod
-            ? (0, utils_2.bipToRay)(this.delinquencyFeeBips)
-            : ethers_1.BigNumber.from(0);
+        const basePrincipal = this.underlyingToken.getAmount((0, utils_1.rayMulBigint)(scaledBase, this.scaleFactor));
+        const baseAPRRay = this.currentBaseLenderAPR;
+        const protocolFeeAPRRay = this.currentProtocolAPR;
+        const delinquencyFeeAPRRay = this.currentPenaltyAPR;
         // lender APR portion
         const lenderRequirementGrowthPerSecond = basePrincipal
-            .rayMul(baseAPRRay.add(delinquencyFeeAPRRay))
-            .div(utils_2.SECONDS_IN_365_DAYS)
+            .rayMul(baseAPRRay + delinquencyFeeAPRRay)
+            .div(utils_1.SECONDS_IN_365_DAYS)
             .bipMul(this.reserveRatioBips);
         // protocol fee portion
         const protocolRequirementGrowthPerSecond = basePrincipal
             .rayMul(protocolFeeAPRRay)
-            .div(utils_2.SECONDS_IN_365_DAYS);
+            .div(utils_1.SECONDS_IN_365_DAYS);
         const totalRequirementGrowthPerSecond = lenderRequirementGrowthPerSecond.add(protocolRequirementGrowthPerSecond.raw);
         // essentially if  apr=0 and rr=0 then bips alone wont move us to delinquency
-        if (totalRequirementGrowthPerSecond.raw.isZero())
+        if (totalRequirementGrowthPerSecond.raw === 0n)
             return Number.MAX_SAFE_INTEGER;
         const buffer = this.liquidReserves.sub(this.minimumReserves);
-        if (buffer.raw.lte(0))
+        if (buffer.raw <= 0n)
             return 0; // we are delinquent
-        return buffer.div(totalRequirementGrowthPerSecond, true).raw.toNumber(); // seconds until the party
+        return Number(buffer.div(totalRequirementGrowthPerSecond, true).raw); // seconds until the party
     }
     getSecondsBeforeDelinquencyForBorrowedAmount(borrowAmount) {
         if (this.isDelinquent || this.totalDebts.eq(0))
             return 0;
         const scaledBase = this.scaledTotalSupply;
-        const basePrincipal = this.underlyingToken.getAmount((0, utils_2.rayMul)(scaledBase, this.scaleFactor));
-        const baseAPRRay = (0, utils_2.bipToRay)(this.annualInterestBips);
-        const protocolFeeAPRRay = (0, utils_2.bipMul)(baseAPRRay, ethers_1.BigNumber.from(this.protocolFeeBips));
-        const delinquencyFeeAPRRay = this.timeDelinquent > this.delinquencyGracePeriod
-            ? (0, utils_2.bipToRay)(this.delinquencyFeeBips)
-            : ethers_1.BigNumber.from(0);
+        const basePrincipal = this.underlyingToken.getAmount((0, utils_1.rayMulBigint)(scaledBase, this.scaleFactor));
+        const baseAPRRay = this.currentBaseLenderAPR;
+        const protocolFeeAPRRay = this.currentProtocolAPR;
+        const delinquencyFeeAPRRay = this.currentPenaltyAPR;
         const lenderRequirementGrowthPerSecond = basePrincipal
-            .rayMul(baseAPRRay.add(delinquencyFeeAPRRay))
-            .div(utils_2.SECONDS_IN_365_DAYS)
+            .rayMul(baseAPRRay + delinquencyFeeAPRRay)
+            .div(utils_1.SECONDS_IN_365_DAYS)
             .bipMul(this.reserveRatioBips);
         const protocolRequirementGrowthPerSecond = basePrincipal
             .rayMul(protocolFeeAPRRay)
-            .div(utils_2.SECONDS_IN_365_DAYS);
+            .div(utils_1.SECONDS_IN_365_DAYS);
         const totalRequirementGrowthPerSecond = lenderRequirementGrowthPerSecond.add(protocolRequirementGrowthPerSecond.raw);
-        if (totalRequirementGrowthPerSecond.raw.isZero())
+        if (totalRequirementGrowthPerSecond.raw === 0n)
             return Number.MAX_SAFE_INTEGER;
         const postBorrowBuffer = this.liquidReserves.sub(this.minimumReserves).sub(borrowAmount);
-        if (postBorrowBuffer.raw.lte(0))
+        if (postBorrowBuffer.raw <= 0n)
             return 0;
-        return postBorrowBuffer.div(totalRequirementGrowthPerSecond, true).raw.toNumber();
+        return Number(postBorrowBuffer.div(totalRequirementGrowthPerSecond, true).raw);
     }
     /**
      * @dev Calculate token amount to be repayed by borrower for a given duration
@@ -238,22 +291,20 @@ class Market extends types_1.ContractWrapper {
      * @return token amount to be repayed
      **/
     repayRequiredForDuration(timeToPayInSeconds) {
-        const scaledBase = this.scaledTotalSupply.sub(this.scaledPendingWithdrawals);
-        if (scaledBase.lte(0))
+        const scaledBase = this.scaledTotalSupply - this.scaledPendingWithdrawals;
+        if (scaledBase <= 0n)
             return this.underlyingToken.getAmount(0);
-        const basePrincipal = this.underlyingToken.getAmount((0, utils_2.rayMul)(scaledBase, this.scaleFactor));
-        const baseAPRRay = (0, utils_2.bipToRay)(this.annualInterestBips);
-        const protocolFeeAPRRay = (0, utils_2.bipMul)(baseAPRRay, ethers_1.BigNumber.from(this.protocolFeeBips));
-        const delinquencyFeeAPRRay = this.timeDelinquent > this.delinquencyGracePeriod
-            ? (0, utils_2.bipToRay)(this.delinquencyFeeBips)
-            : ethers_1.BigNumber.from(0);
+        const basePrincipal = this.underlyingToken.getAmount((0, utils_1.rayMulBigint)(scaledBase, this.scaleFactor));
+        const baseAPRRay = this.currentBaseLenderAPR;
+        const protocolFeeAPRRay = this.currentProtocolAPR;
+        const delinquencyFeeAPRRay = this.currentPenaltyAPR;
         const lenderRequirementGrowthPerSecond = basePrincipal
-            .rayMul(baseAPRRay.add(delinquencyFeeAPRRay))
-            .div(utils_2.SECONDS_IN_365_DAYS)
+            .rayMul(baseAPRRay + delinquencyFeeAPRRay)
+            .div(utils_1.SECONDS_IN_365_DAYS)
             .bipMul(this.reserveRatioBips);
         const protocolRequirementGrowthPerSecond = basePrincipal
             .rayMul(protocolFeeAPRRay)
-            .div(utils_2.SECONDS_IN_365_DAYS);
+            .div(utils_1.SECONDS_IN_365_DAYS);
         const totalRequirementGrowthPerSecond = lenderRequirementGrowthPerSecond.add(protocolRequirementGrowthPerSecond.raw);
         return totalRequirementGrowthPerSecond.mul(timeToPayInSeconds);
     }
@@ -265,12 +316,8 @@ class Market extends types_1.ContractWrapper {
      * @return apr paid by borrower in ray
      */
     get effectiveBorrowerAPR() {
-        // apr + (apr * protocolFee)
-        let apr = (0, utils_2.bipMul)((0, utils_2.bipToRay)(this.annualInterestBips), utils_2.BIP.add(this.protocolFeeBips));
-        if (this.timeDelinquent > this.delinquencyGracePeriod) {
-            apr = apr.add((0, utils_2.bipToRay)(this.delinquencyFeeBips));
-        }
-        return apr;
+        return ((0, utils_1.bipMulBigint)(this.currentBaseLenderAPR, utils_1.BIP_BIGINT + BigInt(this.protocolFeeBips)) +
+            this.currentPenaltyAPR);
     }
     /**
      * @dev Calculate effective interest rate currently earned by lenders.
@@ -279,35 +326,39 @@ class Market extends types_1.ContractWrapper {
      * @return apr earned by lender in ray
      */
     get effectiveLenderAPR() {
-        let apr = this.annualInterestBips;
-        if (this.timeDelinquent > this.delinquencyGracePeriod) {
-            apr += this.delinquencyFeeBips;
-        }
-        return (0, utils_2.bipToRay)(apr);
+        return this.currentBaseLenderAPR + this.currentPenaltyAPR;
     }
     /* -------------------------------------------------------------------------- */
     /*                            Withdrawal Execution                            */
     /* -------------------------------------------------------------------------- */
     async executeWithdrawal({ lender, expiry }) {
-        return this.contract.executeWithdrawal(lender, expiry);
+        return (0, viem_write_1.submitPreparedTransaction)(this.signer, (0, utils_1.prepareTransaction)({
+            to: this.address,
+            abi: abi_1.wildcatMarketAbi,
+            functionName: "executeWithdrawal",
+            args: [lender, expiry]
+        }));
     }
     async executeWithdrawals(withdrawals) {
         const lenders = withdrawals.map((w) => w.lender);
         const expiries = withdrawals.map((w) => w.expiry);
-        return this.contract.executeWithdrawals(lenders, expiries);
+        return (0, viem_write_1.submitPreparedTransaction)(this.signer, (0, utils_1.prepareTransaction)({
+            to: this.address,
+            abi: abi_1.wildcatMarketAbi,
+            functionName: "executeWithdrawals",
+            args: [lenders, expiries]
+        }));
     }
     populateRepayAndProcessUnpaidWithdrawalBatches(amount, maxBatches = 10) {
-        return {
+        return (0, utils_1.prepareTransaction)({
             to: this.address,
-            data: this.contract.interface.encodeFunctionData("repayAndProcessUnpaidWithdrawalBatches", [
-                amount.raw,
-                maxBatches
-            ]),
-            value: "0"
-        };
+            abi: abi_1.wildcatMarketAbi,
+            functionName: "repayAndProcessUnpaidWithdrawalBatches",
+            args: [amount.raw, maxBatches]
+        });
     }
     async repayAndProcessUnpaidWithdrawalBatches(amount, maxBatches = 10) {
-        return this.contract.repayAndProcessUnpaidWithdrawalBatches(amount.raw, maxBatches);
+        return (0, viem_write_1.submitPreparedTransaction)(this.signer, this.populateRepayAndProcessUnpaidWithdrawalBatches(amount, maxBatches));
     }
     /* -------------------------------------------------------------------------- */
     /*                                   Set APR                                  */
@@ -323,7 +374,8 @@ class Market extends types_1.ContractWrapper {
         if (annualInterestBips < originalAnnualInterestBips) {
             let doubleRelativeDiff;
             if (this.version === types_1.MarketVersion.V2) {
-                const relativeDiff = (0, utils_2.mulDiv)((0, token_1.toBn)(10000), (0, token_1.toBn)(originalAnnualInterestBips - annualInterestBips), (0, token_1.toBn)(originalAnnualInterestBips)).toNumber();
+                const relativeDiff = Number((10000n * BigInt(originalAnnualInterestBips - annualInterestBips)) /
+                    BigInt(originalAnnualInterestBips));
                 if (relativeDiff <= 2500) {
                     // In v2, if the relative diff is 25% or less, the reserve ratio is not changed
                     return originalReserveRatioBips;
@@ -331,7 +383,8 @@ class Market extends types_1.ContractWrapper {
                 doubleRelativeDiff = 2 * relativeDiff;
             }
             else {
-                doubleRelativeDiff = (0, utils_2.mulDiv)((0, token_1.toBn)(20000), (0, token_1.toBn)(originalAnnualInterestBips - annualInterestBips), (0, token_1.toBn)(originalAnnualInterestBips)).toNumber();
+                doubleRelativeDiff = Number((20000n * BigInt(originalAnnualInterestBips - annualInterestBips)) /
+                    BigInt(originalAnnualInterestBips));
             }
             const boundRelativeDiff = Math.min(10000, doubleRelativeDiff);
             return Math.max(boundRelativeDiff, originalReserveRatioBips);
@@ -343,10 +396,11 @@ class Market extends types_1.ContractWrapper {
         return originalReserveRatioBips;
     }
     calculateLiquidityCoverageForReserveRatio(reserveRatio) {
-        const scaledRequiredReserves = (0, utils_2.bipMul)(this.scaledTotalSupply.sub(this.scaledPendingWithdrawals), (0, token_1.toBn)(reserveRatio)).add(this.scaledPendingWithdrawals);
-        return this.underlyingToken.getAmount((0, utils_2.rayMul)(scaledRequiredReserves, this.scaleFactor)
-            .add(this.lastAccruedProtocolFees.raw)
-            .add(this.normalizedUnclaimedWithdrawals.raw));
+        const scaledRequiredReserves = (0, utils_1.bipMulBigint)(this.scaledTotalSupply - this.scaledPendingWithdrawals, reserveRatio) +
+            this.scaledPendingWithdrawals;
+        return this.underlyingToken.getAmount((0, utils_1.rayMulBigint)(scaledRequiredReserves, this.scaleFactor) +
+            this.lastAccruedProtocolFees.raw +
+            this.normalizedUnclaimedWithdrawals.raw);
     }
     canChangeAPR(annualInterestBips) {
         const originalAnnualInterestBips = this.temporaryReserveRatio
@@ -379,7 +433,7 @@ class Market extends types_1.ContractWrapper {
         if (this.version === types_1.MarketVersion.V2) {
             if (hasUnifiedLatestLensForDirectReads(this.chainId)) {
                 try {
-                    const market = await (0, constants_1.getLensV2_5Contract)(this.chainId, this.provider).getMarketData(this.address);
+                    const market = await (0, market_lens_1.getUnifiedMarketDataV2)(this.chainId, this.provider, this.address);
                     this.updateWith(market);
                     return;
                 }
@@ -387,69 +441,86 @@ class Market extends types_1.ContractWrapper {
                     // Fall back to the pre-2.5 V2 lens until unified lens deployment is reliable.
                 }
             }
-            const market = await (0, constants_1.getLensV2Contract)(this.chainId, this.provider).getMarketData(this.address);
+            const market = await (0, market_lens_1.getV2MarketData)(this.chainId, this.provider, this.address);
             this.updateWith(market);
             return;
         }
-        const market = await (0, constants_1.getLensContract)(this.chainId, this.provider).getMarketData(this.address);
+        const market = await (0, market_lens_1.getLegacyMarketData)(this.chainId, this.provider, this.address);
         this.updateWith(market);
     }
     updateWith(data) {
+        const baseData = "market" in data ? data.market : data;
+        const nextScaleFactor = (0, token_1.toRawAmount)(baseData.scaleFactor);
+        const nextScaledTotalSupply = (0, token_1.toRawAmount)(baseData.scaledTotalSupply);
+        const nextScaledPendingWithdrawals = (0, token_1.toRawAmount)(baseData.scaledPendingWithdrawals);
+        const nextLastAccruedProtocolFees = (0, token_1.toRawAmount)(baseData.lastAccruedProtocolFees);
         // Note: this adds all the interest accrued to the base interest accrued, since the lens
         // doesn't give us any way to distinguish between base interest and delinquency fees.
-        if (this.scaledTotalSupply.eq(data.scaledTotalSupply) &&
-            data.scaleFactor.gt(this.scaleFactor) &&
+        if (this.scaledTotalSupply === nextScaledTotalSupply &&
+            nextScaleFactor > this.scaleFactor &&
             this.totalBaseInterestAccrued) {
-            const lastTotalValue = (0, utils_2.rayMul)(this.scaledTotalSupply, this.scaleFactor);
-            const currentTotalValue = (0, utils_2.rayMul)(this.scaledTotalSupply, data.scaleFactor);
-            const baseInterestAccrued = currentTotalValue.sub(lastTotalValue);
+            const lastTotalValue = (0, utils_1.rayMulBigint)(this.scaledTotalSupply, this.scaleFactor);
+            const currentTotalValue = (0, utils_1.rayMulBigint)(this.scaledTotalSupply, nextScaleFactor);
+            const baseInterestAccrued = currentTotalValue - lastTotalValue;
             this.totalBaseInterestAccrued = this.totalBaseInterestAccrued.add(baseInterestAccrued);
         }
-        if (data.lastAccruedProtocolFees.gt(this.lastAccruedProtocolFees.raw) &&
+        if (nextLastAccruedProtocolFees > this.lastAccruedProtocolFees.raw &&
             this.totalProtocolFeesAccrued) {
-            this.totalProtocolFeesAccrued = this.totalProtocolFeesAccrued.add(data.lastAccruedProtocolFees.sub(this.lastAccruedProtocolFees.raw));
-        }
-        this.feeRecipient = data.feeRecipient;
-        this.protocolFeeBips = data.protocolFeeBips.toNumber();
-        this.delinquencyFeeBips = data.delinquencyFeeBips.toNumber();
-        this.delinquencyGracePeriod = data.delinquencyGracePeriod.toNumber();
-        this.withdrawalBatchDuration = data.withdrawalBatchDuration.toNumber();
-        this.reserveRatioBips = data.reserveRatioBips.toNumber();
-        this.annualInterestBips = data.annualInterestBips.toNumber();
-        this.temporaryReserveRatio = data.temporaryReserveRatio;
-        this.originalAnnualInterestBips = data.originalAnnualInterestBips.toNumber();
-        this.originalReserveRatioBips = data.originalReserveRatioBips.toNumber();
-        this.temporaryReserveRatioExpiry = data.temporaryReserveRatioExpiry.toNumber();
-        this.isClosed = data.isClosed;
-        this.scaleFactor = data.scaleFactor;
-        this.totalSupply = this.marketToken.getAmount(data.totalSupply);
-        this.maxTotalSupply = this.marketToken.getAmount(data.maxTotalSupply);
-        this.scaledTotalSupply = data.scaledTotalSupply;
-        this.totalAssets = this.underlyingToken.getAmount(data.totalAssets);
-        this.lastAccruedProtocolFees = this.underlyingToken.getAmount(data.lastAccruedProtocolFees);
-        this.normalizedUnclaimedWithdrawals = this.underlyingToken.getAmount(data.normalizedUnclaimedWithdrawals);
-        this.scaledPendingWithdrawals = data.scaledPendingWithdrawals;
-        this.pendingWithdrawalExpiry = data.pendingWithdrawalExpiry.toNumber();
-        this.isDelinquent = data.isDelinquent;
-        this.timeDelinquent = data.timeDelinquent.toNumber();
-        this.lastInterestAccruedTimestamp = data.lastInterestAccruedTimestamp.toNumber();
-        this.unpaidWithdrawalBatchExpiries = data.unpaidWithdrawalBatchExpiries;
-        this.coverageLiquidity = this.underlyingToken.getAmount(data.coverageLiquidity);
-        if ("hooksFactory" in data) {
-            this.hooksFactory = data.hooksFactory;
-            this.marketType = (0, constants_1.getMarketTypeForHooksFactory)(this.chainId, data.hooksFactory);
-        }
-        if ("hooksConfig" in data) {
-            (0, utils_2.assert)(this.version === types_1.MarketVersion.V2, `Can not push V2 lens data to V1 market!`);
+            this.totalProtocolFeesAccrued = this.totalProtocolFeesAccrued.add(nextLastAccruedProtocolFees - this.lastAccruedProtocolFees.raw);
+        }
+        this.feeRecipient = baseData.feeRecipient;
+        this.protocolFeeBips = (0, utils_1.toNumber)(baseData.protocolFeeBips);
+        this.delinquencyFeeBips = (0, utils_1.toNumber)(baseData.delinquencyFeeBips);
+        this.delinquencyGracePeriod = (0, utils_1.toNumber)(baseData.delinquencyGracePeriod);
+        this.withdrawalBatchDuration = (0, utils_1.toNumber)(baseData.withdrawalBatchDuration);
+        this.reserveRatioBips = (0, utils_1.toNumber)(baseData.reserveRatioBips);
+        this.annualInterestBips = (0, utils_1.toNumber)(baseData.annualInterestBips);
+        this.temporaryReserveRatio = baseData.temporaryReserveRatio;
+        this.originalAnnualInterestBips = (0, utils_1.toNumber)(baseData.originalAnnualInterestBips);
+        this.originalReserveRatioBips = (0, utils_1.toNumber)(baseData.originalReserveRatioBips);
+        this.temporaryReserveRatioExpiry = (0, utils_1.toNumber)(baseData.temporaryReserveRatioExpiry);
+        this.isClosed = baseData.isClosed;
+        this.scaleFactor = nextScaleFactor;
+        this.totalSupply = this.marketToken.getAmount(baseData.totalSupply);
+        this.maxTotalSupply = this.marketToken.getAmount(baseData.maxTotalSupply);
+        this.scaledTotalSupply = nextScaledTotalSupply;
+        this.totalAssets = this.underlyingToken.getAmount(baseData.totalAssets);
+        this.lastAccruedProtocolFees = this.underlyingToken.getAmount(baseData.lastAccruedProtocolFees);
+        this.normalizedUnclaimedWithdrawals = this.underlyingToken.getAmount(baseData.normalizedUnclaimedWithdrawals);
+        this.scaledPendingWithdrawals = nextScaledPendingWithdrawals;
+        this.pendingWithdrawalExpiry = (0, utils_1.toNumber)(baseData.pendingWithdrawalExpiry);
+        this.isDelinquent = baseData.isDelinquent;
+        this.timeDelinquent = (0, utils_1.toNumber)(baseData.timeDelinquent);
+        this.lastInterestAccruedTimestamp = (0, utils_1.toNumber)(baseData.lastInterestAccruedTimestamp);
+        this.unpaidWithdrawalBatchExpiries = baseData.unpaidWithdrawalBatchExpiries.map(utils_1.toNumber);
+        this.coverageLiquidity = this.underlyingToken.getAmount(baseData.coverageLiquidity);
+        if ("hooksFactory" in baseData) {
+            this.hooksFactory = baseData.hooksFactory;
+            this.marketType = (0, constants_1.getMarketTypeForHooksFactory)(this.chainId, baseData.hooksFactory);
+        }
+        if ("hooksConfig" in baseData) {
+            (0, utils_1.assert)(this.version === types_1.MarketVersion.V2, `Can not push V2 lens data to V1 market!`);
             const config = this.hooksConfig;
-            (0, utils_2.assert)(config !== undefined, `V2 market has no hooksConfig!`);
-            config.minimumDeposit = this.underlyingToken.getAmount(data.hooksConfig.minimumDeposit);
+            (0, utils_1.assert)(config !== undefined, `V2 market has no hooksConfig!`);
+            config.minimumDeposit = this.underlyingToken.getAmount(baseData.hooksConfig.minimumDeposit);
             if (config.kind === types_1.HooksKind.FixedTerm) {
-                config.fixedTermEndTime = data.hooksConfig.fixedTermEndTime;
+                config.fixedTermEndTime = (0, utils_1.toNumber)(baseData.hooksConfig.fixedTermEndTime);
             }
         }
         else {
-            (0, utils_2.assert)(this.version === types_1.MarketVersion.V1, `Can not push V1 lens data to V2 market!`);
+            (0, utils_1.assert)(this.version === types_1.MarketVersion.V1, `Can not push V1 lens data to V2 market!`);
+        }
+        if ("market" in data) {
+            this.commitmentFeeBips = data.commitmentFeeBips.isPresent
+                ? (0, utils_1.toNumber)(data.commitmentFeeBips.value)
+                : undefined;
+            this.drawnAmount = data.drawnAmount.isPresent
+                ? this.underlyingToken.getAmount(data.drawnAmount.value)
+                : undefined;
+        }
+        else {
+            this.commitmentFeeBips = undefined;
+            this.drawnAmount = undefined;
         }
     }
     /* -------------------------------------------------------------------------- */
@@ -458,17 +529,18 @@ class Market extends types_1.ContractWrapper {
     static fromSubgraphMarketData(chainId, provider, data, signerAddress) {
         const underlyingToken = token_1.Token.fromSubgraphToken(chainId, data._asset, provider);
         const marketToken = token_1.Token.fromSubgraphMarketData(chainId, data, provider);
-        const scaledTotalSupply = ethers_1.BigNumber.from(data.scaledTotalSupply);
-        const scaleFactor = ethers_1.BigNumber.from(data.scaleFactor);
-        const scaledWithdrawals = ethers_1.BigNumber.from(data.scaledPendingWithdrawals);
-        const scaledRequiredReserves = (0, utils_2.bipMul)(scaledTotalSupply.sub(scaledWithdrawals), ethers_1.BigNumber.from(data.reserveRatioBips)).add(scaledWithdrawals);
-        const coverageLiquidity = (0, utils_2.rayMul)(scaledRequiredReserves, scaleFactor)
-            .add(data.pendingProtocolFees)
-            .add(data.normalizedUnclaimedWithdrawals);
+        const scaledTotalSupply = (0, token_1.toRawAmount)(data.scaledTotalSupply);
+        const scaleFactor = (0, token_1.toRawAmount)(data.scaleFactor);
+        const scaledWithdrawals = (0, token_1.toRawAmount)(data.scaledPendingWithdrawals);
+        const scaledRequiredReserves = (0, utils_1.bipMulBigint)(scaledTotalSupply - scaledWithdrawals, data.reserveRatioBips) +
+            scaledWithdrawals;
+        const coverageLiquidity = (0, utils_1.rayMulBigint)(scaledRequiredReserves, scaleFactor) +
+            (0, token_1.toRawAmount)(data.pendingProtocolFees) +
+            (0, token_1.toRawAmount)(data.normalizedUnclaimedWithdrawals);
         let hooksConfig;
         if (data.version === types_1.MarketVersion.V2) {
-            (0, utils_2.assert)(!!data.hooks, `V2 markets require hooks`);
-            (0, utils_2.assert)(!!data.hooksConfig, `V2 markets require hooksConfig`);
+            (0, utils_1.assert)(!!data.hooks, `V2 markets require hooks`);
+            (0, utils_1.assert)(!!data.hooksConfig, `V2 markets require hooksConfig`);
             const { minimumDeposit: _minimumDeposit, depositRequiresAccess, transferRequiresAccess, queueWithdrawalRequiresAccess, allowClosureBeforeTerm, allowForceBuyBacks, allowTermReduction, fixedTermEndTime, transfersDisabled } = data.hooksConfig;
             const flags = {
                 useOnDeposit: data.hooksConfig.useOnDeposit,
@@ -540,20 +612,22 @@ class Market extends types_1.ContractWrapper {
             originalReserveRatioBips: data.originalReserveRatioBips,
             temporaryReserveRatioExpiry: data.temporaryReserveRatioExpiry,
             isClosed: data.isClosed,
-            scaleFactor: ethers_1.BigNumber.from(data.scaleFactor),
-            totalSupply: marketToken.getAmount((0, utils_2.rayMul)(scaledTotalSupply, scaleFactor)),
+            scaleFactor,
+            totalSupply: marketToken.getAmount((0, utils_1.rayMulBigint)(scaledTotalSupply, scaleFactor)),
             maxTotalSupply: marketToken.getAmount(data.maxTotalSupply),
             scaledTotalSupply: scaledTotalSupply,
             totalAssets: underlyingToken.getAmount(0),
             lastAccruedProtocolFees: underlyingToken.getAmount(data.pendingProtocolFees),
             normalizedUnclaimedWithdrawals: underlyingToken.getAmount(data.normalizedUnclaimedWithdrawals),
-            scaledPendingWithdrawals: ethers_1.BigNumber.from(data.scaledPendingWithdrawals),
+            scaledPendingWithdrawals: scaledWithdrawals,
             pendingWithdrawalExpiry: +data.pendingWithdrawalExpiry,
             isDelinquent: data.isDelinquent,
             timeDelinquent: data.timeDelinquent,
             lastInterestAccruedTimestamp: data.lastInterestAccruedTimestamp,
             unpaidWithdrawalBatchExpiries: [] /* data.unpaidWithdrawalBatchExpiries */,
             coverageLiquidity: underlyingToken.getAmount(coverageLiquidity),
+            commitmentFeeBips: data.commitmentFeeBips != null ? Number(data.commitmentFeeBips) : undefined,
+            drawnAmount: data.drawnAmount != null ? underlyingToken.getAmount(data.drawnAmount) : undefined,
             totalBorrowed: underlyingToken.getAmount(data.totalBorrowed),
             totalRepaid: underlyingToken.getAmount(data.totalRepaid),
             totalBaseInterestAccrued: underlyingToken.getAmount(data.totalBaseInterestAccrued),
@@ -582,30 +656,30 @@ class Market extends types_1.ContractWrapper {
             borrower: data.borrower,
             controller: data.controller,
             feeRecipient: data.feeRecipient,
-            protocolFeeBips: data.protocolFeeBips.toNumber(),
-            delinquencyFeeBips: data.delinquencyFeeBips.toNumber(),
-            delinquencyGracePeriod: data.delinquencyGracePeriod.toNumber(),
-            withdrawalBatchDuration: data.withdrawalBatchDuration.toNumber(),
-            reserveRatioBips: data.reserveRatioBips.toNumber(),
-            annualInterestBips: data.annualInterestBips.toNumber(),
+            protocolFeeBips: (0, utils_1.toNumber)(data.protocolFeeBips),
+            delinquencyFeeBips: (0, utils_1.toNumber)(data.delinquencyFeeBips),
+            delinquencyGracePeriod: (0, utils_1.toNumber)(data.delinquencyGracePeriod),
+            withdrawalBatchDuration: (0, utils_1.toNumber)(data.withdrawalBatchDuration),
+            reserveRatioBips: (0, utils_1.toNumber)(data.reserveRatioBips),
+            annualInterestBips: (0, utils_1.toNumber)(data.annualInterestBips),
             temporaryReserveRatio: data.temporaryReserveRatio,
-            originalAnnualInterestBips: data.originalAnnualInterestBips.toNumber(),
-            originalReserveRatioBips: data.originalReserveRatioBips.toNumber(),
-            temporaryReserveRatioExpiry: data.temporaryReserveRatioExpiry.toNumber(),
+            originalAnnualInterestBips: (0, utils_1.toNumber)(data.originalAnnualInterestBips),
+            originalReserveRatioBips: (0, utils_1.toNumber)(data.originalReserveRatioBips),
+            temporaryReserveRatioExpiry: (0, utils_1.toNumber)(data.temporaryReserveRatioExpiry),
             isClosed: data.isClosed,
-            scaleFactor: data.scaleFactor,
+            scaleFactor: (0, token_1.toRawAmount)(data.scaleFactor),
             totalSupply: marketToken.getAmount(data.totalSupply),
             maxTotalSupply: marketToken.getAmount(data.maxTotalSupply),
-            scaledTotalSupply: data.scaledTotalSupply,
+            scaledTotalSupply: (0, token_1.toRawAmount)(data.scaledTotalSupply),
             totalAssets: underlyingToken.getAmount(data.totalAssets),
             lastAccruedProtocolFees: underlyingToken.getAmount(data.lastAccruedProtocolFees),
             normalizedUnclaimedWithdrawals: underlyingToken.getAmount(data.normalizedUnclaimedWithdrawals),
-            scaledPendingWithdrawals: data.scaledPendingWithdrawals,
-            pendingWithdrawalExpiry: data.pendingWithdrawalExpiry.toNumber(),
+            scaledPendingWithdrawals: (0, token_1.toRawAmount)(data.scaledPendingWithdrawals),
+            pendingWithdrawalExpiry: (0, utils_1.toNumber)(data.pendingWithdrawalExpiry),
             isDelinquent: data.isDelinquent,
-            timeDelinquent: data.timeDelinquent.toNumber(),
-            lastInterestAccruedTimestamp: data.lastInterestAccruedTimestamp.toNumber(),
-            unpaidWithdrawalBatchExpiries: data.unpaidWithdrawalBatchExpiries,
+            timeDelinquent: (0, utils_1.toNumber)(data.timeDelinquent),
+            lastInterestAccruedTimestamp: (0, utils_1.toNumber)(data.lastInterestAccruedTimestamp),
+            unpaidWithdrawalBatchExpiries: data.unpaidWithdrawalBatchExpiries.map(utils_1.toNumber),
             coverageLiquidity: underlyingToken.getAmount(data.coverageLiquidity),
             totalBorrowed: undefined,
             totalRepaid: undefined,
@@ -627,7 +701,8 @@ class Market extends types_1.ContractWrapper {
         const underlyingToken = token_1.Token.fromTokenMetadata(chainId, data.underlyingToken, provider);
         const { hooksAddress } = hooks;
         let hooksConfig;
-        if (hooksConfigData.kind === 1) {
+        const hooksKind = (0, utils_1.toNumber)(hooksConfigData.kind);
+        if (hooksKind === 1) {
             hooksConfig = {
                 kind: types_1.HooksKind.OpenTerm,
                 hooksAddress: hooksAddress,
@@ -639,7 +714,7 @@ class Market extends types_1.ContractWrapper {
                 allowForceBuyBacks: hooksConfigData.allowForceBuyBacks
             };
         }
-        else if (hooksConfigData.kind === 2) {
+        else if (hooksKind === 2) {
             hooksConfig = {
                 kind: types_1.HooksKind.FixedTerm,
                 hooksAddress: hooksAddress,
@@ -648,7 +723,7 @@ class Market extends types_1.ContractWrapper {
                 transferRequiresAccess: hooksConfigData.transferRequiresAccess,
                 transfersDisabled: hooksConfigData.transfersDisabled,
                 minimumDeposit: underlyingToken.getAmount(hooksConfigData.minimumDeposit),
-                fixedTermEndTime: hooksConfigData.fixedTermEndTime,
+                fixedTermEndTime: (0, utils_1.toNumber)(hooksConfigData.fixedTermEndTime),
                 queueWithdrawalRequiresAccess: hooksConfigData.withdrawalRequiresAccess,
                 allowTermReduction: hooksConfigData.allowTermReduction,
                 allowClosureBeforeTerm: hooksConfigData.allowClosureBeforeTerm,
@@ -656,7 +731,7 @@ class Market extends types_1.ContractWrapper {
             };
         }
         else {
-            throw Error(`Unknown hooks kind: ${hooks.hooksTemplate.name}, version #${hooksConfigData.kind}`);
+            throw Error(`Unknown hooks kind: ${hooks.hooksTemplate.name}, version #${hooksKind}`);
         }
         return new Market({
             provider,
@@ -669,41 +744,43 @@ class Market extends types_1.ContractWrapper {
             underlyingToken: underlyingToken,
             borrower: data.borrower,
             feeRecipient: data.feeRecipient,
-            protocolFeeBips: data.protocolFeeBips.toNumber(),
-            delinquencyFeeBips: data.delinquencyFeeBips.toNumber(),
-            delinquencyGracePeriod: data.delinquencyGracePeriod.toNumber(),
-            withdrawalBatchDuration: data.withdrawalBatchDuration.toNumber(),
-            reserveRatioBips: data.reserveRatioBips.toNumber(),
-            annualInterestBips: data.annualInterestBips.toNumber(),
+            protocolFeeBips: (0, utils_1.toNumber)(data.protocolFeeBips),
+            delinquencyFeeBips: (0, utils_1.toNumber)(data.delinquencyFeeBips),
+            delinquencyGracePeriod: (0, utils_1.toNumber)(data.delinquencyGracePeriod),
+            withdrawalBatchDuration: (0, utils_1.toNumber)(data.withdrawalBatchDuration),
+            reserveRatioBips: (0, utils_1.toNumber)(data.reserveRatioBips),
+            annualInterestBips: (0, utils_1.toNumber)(data.annualInterestBips),
             temporaryReserveRatio: data.temporaryReserveRatio,
-            originalAnnualInterestBips: data.originalAnnualInterestBips.toNumber(),
-            originalReserveRatioBips: data.originalReserveRatioBips.toNumber(),
-            temporaryReserveRatioExpiry: data.temporaryReserveRatioExpiry.toNumber(),
+            originalAnnualInterestBips: (0, utils_1.toNumber)(data.originalAnnualInterestBips),
+            originalReserveRatioBips: (0, utils_1.toNumber)(data.originalReserveRatioBips),
+            temporaryReserveRatioExpiry: (0, utils_1.toNumber)(data.temporaryReserveRatioExpiry),
             isClosed: data.isClosed,
-            scaleFactor: data.scaleFactor,
+            scaleFactor: (0, token_1.toRawAmount)(data.scaleFactor),
             totalSupply: marketToken.getAmount(data.totalSupply),
             maxTotalSupply: marketToken.getAmount(data.maxTotalSupply),
-            scaledTotalSupply: data.scaledTotalSupply,
+            scaledTotalSupply: (0, token_1.toRawAmount)(data.scaledTotalSupply),
             totalAssets: underlyingToken.getAmount(data.totalAssets),
             lastAccruedProtocolFees: underlyingToken.getAmount(data.lastAccruedProtocolFees),
             normalizedUnclaimedWithdrawals: underlyingToken.getAmount(data.normalizedUnclaimedWithdrawals),
-            scaledPendingWithdrawals: data.scaledPendingWithdrawals,
-            pendingWithdrawalExpiry: data.pendingWithdrawalExpiry.toNumber(),
+            scaledPendingWithdrawals: (0, token_1.toRawAmount)(data.scaledPendingWithdrawals),
+            pendingWithdrawalExpiry: (0, utils_1.toNumber)(data.pendingWithdrawalExpiry),
             isDelinquent: data.isDelinquent,
-            timeDelinquent: data.timeDelinquent.toNumber(),
-            lastInterestAccruedTimestamp: data.lastInterestAccruedTimestamp.toNumber(),
-            unpaidWithdrawalBatchExpiries: data.unpaidWithdrawalBatchExpiries,
+            timeDelinquent: (0, utils_1.toNumber)(data.timeDelinquent),
+            lastInterestAccruedTimestamp: (0, utils_1.toNumber)(data.lastInterestAccruedTimestamp),
+            unpaidWithdrawalBatchExpiries: data.unpaidWithdrawalBatchExpiries.map(utils_1.toNumber),
             coverageLiquidity: underlyingToken.getAmount(data.coverageLiquidity),
             signerAddress
             // borrowableAssets: underlyingToken.getAmount(data.borrowableAssets)
         });
     }
-    static fromMarketDataV2_5(chainId, provider, { hooks, hooksConfig: hooksConfigData, ...data }, allowForceBuyBacks, signerAddress) {
+    static fromMarketDataV2_5(chainId, provider, { market, commitmentFeeBips, drawnAmount }, allowForceBuyBacks, signerAddress) {
+        const { hooks, hooksConfig: hooksConfigData, ...data } = market;
         const marketToken = token_1.Token.fromTokenMetadata(chainId, data.marketToken, provider);
         const underlyingToken = token_1.Token.fromTokenMetadata(chainId, data.underlyingToken, provider);
         const { hooksAddress } = hooks;
         let hooksConfig;
-        if (hooksConfigData.kind === 1) {
+        const hooksKind = (0, utils_1.toNumber)(hooksConfigData.kind);
+        if (hooksKind === 1) {
             hooksConfig = {
                 kind: types_1.HooksKind.OpenTerm,
                 hooksAddress,
@@ -715,7 +792,7 @@ class Market extends types_1.ContractWrapper {
                 allowForceBuyBacks
             };
         }
-        else if (hooksConfigData.kind === 2) {
+        else if (hooksKind === 2) {
             hooksConfig = {
                 kind: types_1.HooksKind.FixedTerm,
                 hooksAddress,
@@ -724,7 +801,7 @@ class Market extends types_1.ContractWrapper {
                 transferRequiresAccess: hooksConfigData.transferRequiresAccess,
                 transfersDisabled: hooksConfigData.transfersDisabled,
                 minimumDeposit: underlyingToken.getAmount(hooksConfigData.minimumDeposit),
-                fixedTermEndTime: hooksConfigData.fixedTermEndTime,
+                fixedTermEndTime: (0, utils_1.toNumber)(hooksConfigData.fixedTermEndTime),
                 queueWithdrawalRequiresAccess: hooksConfigData.withdrawalRequiresAccess,
                 allowTermReduction: hooksConfigData.allowTermReduction,
                 allowClosureBeforeTerm: hooksConfigData.allowClosureBeforeTerm,
@@ -732,7 +809,7 @@ class Market extends types_1.ContractWrapper {
             };
         }
         else {
-            throw Error(`Unknown hooks kind: ${hooks.hooksTemplate.name}, version #${hooksConfigData.kind}`);
+            throw Error(`Unknown hooks kind: ${hooks.hooksTemplate.name}, version #${hooksKind}`);
         }
         return new Market({
             provider,
@@ -745,48 +822,54 @@ class Market extends types_1.ContractWrapper {
             underlyingToken,
             borrower: data.borrower,
             feeRecipient: data.feeRecipient,
-            protocolFeeBips: data.protocolFeeBips.toNumber(),
-            delinquencyFeeBips: data.delinquencyFeeBips.toNumber(),
-            delinquencyGracePeriod: data.delinquencyGracePeriod.toNumber(),
-            withdrawalBatchDuration: data.withdrawalBatchDuration.toNumber(),
-            reserveRatioBips: data.reserveRatioBips.toNumber(),
-            annualInterestBips: data.annualInterestBips.toNumber(),
+            protocolFeeBips: (0, utils_1.toNumber)(data.protocolFeeBips),
+            delinquencyFeeBips: (0, utils_1.toNumber)(data.delinquencyFeeBips),
+            delinquencyGracePeriod: (0, utils_1.toNumber)(data.delinquencyGracePeriod),
+            withdrawalBatchDuration: (0, utils_1.toNumber)(data.withdrawalBatchDuration),
+            reserveRatioBips: (0, utils_1.toNumber)(data.reserveRatioBips),
+            annualInterestBips: (0, utils_1.toNumber)(data.annualInterestBips),
             temporaryReserveRatio: data.temporaryReserveRatio,
-            originalAnnualInterestBips: data.originalAnnualInterestBips.toNumber(),
-            originalReserveRatioBips: data.originalReserveRatioBips.toNumber(),
-            temporaryReserveRatioExpiry: data.temporaryReserveRatioExpiry.toNumber(),
+            originalAnnualInterestBips: (0, utils_1.toNumber)(data.originalAnnualInterestBips),
+            originalReserveRatioBips: (0, utils_1.toNumber)(data.originalReserveRatioBips),
+            temporaryReserveRatioExpiry: (0, utils_1.toNumber)(data.temporaryReserveRatioExpiry),
             isClosed: data.isClosed,
-            scaleFactor: data.scaleFactor,
+            scaleFactor: (0, token_1.toRawAmount)(data.scaleFactor),
             totalSupply: marketToken.getAmount(data.totalSupply),
             maxTotalSupply: marketToken.getAmount(data.maxTotalSupply),
-            scaledTotalSupply: data.scaledTotalSupply,
+            scaledTotalSupply: (0, token_1.toRawAmount)(data.scaledTotalSupply),
             totalAssets: underlyingToken.getAmount(data.totalAssets),
             lastAccruedProtocolFees: underlyingToken.getAmount(data.lastAccruedProtocolFees),
             normalizedUnclaimedWithdrawals: underlyingToken.getAmount(data.normalizedUnclaimedWithdrawals),
-            scaledPendingWithdrawals: data.scaledPendingWithdrawals,
-            pendingWithdrawalExpiry: data.pendingWithdrawalExpiry.toNumber(),
+            scaledPendingWithdrawals: (0, token_1.toRawAmount)(data.scaledPendingWithdrawals),
+            pendingWithdrawalExpiry: (0, utils_1.toNumber)(data.pendingWithdrawalExpiry),
             isDelinquent: data.isDelinquent,
-            timeDelinquent: data.timeDelinquent.toNumber(),
-            lastInterestAccruedTimestamp: data.lastInterestAccruedTimestamp.toNumber(),
-            unpaidWithdrawalBatchExpiries: data.unpaidWithdrawalBatchExpiries,
+            timeDelinquent: (0, utils_1.toNumber)(data.timeDelinquent),
+            lastInterestAccruedTimestamp: (0, utils_1.toNumber)(data.lastInterestAccruedTimestamp),
+            unpaidWithdrawalBatchExpiries: data.unpaidWithdrawalBatchExpiries.map(utils_1.toNumber),
             coverageLiquidity: underlyingToken.getAmount(data.coverageLiquidity),
+            commitmentFeeBips: commitmentFeeBips.isPresent
+                ? (0, utils_1.toNumber)(commitmentFeeBips.value)
+                : undefined,
+            drawnAmount: drawnAmount.isPresent ? underlyingToken.getAmount(drawnAmount.value) : undefined,
             signerAddress
         });
     }
     static async resolveAllowForceBuyBacks(provider, marketAddress, data) {
-        if (data.hooksConfig.kind === 1) {
-            const hookedMarket = await typechain_1.IOpenTermHooks__factory.connect(data.hooksConfig.hooksAddress, provider).getHookedMarket(marketAddress);
-            return hookedMarket.allowForceBuyBacks;
+        const marketData = "market" in data ? data.market : data;
+        if (marketData.hooksConfig.kind === 1) {
+            const hookedMarket = await (0, viem_read_1.readViemContract)((0, ethers_viem_1.getViemPublicClientFromEthers)(provider), marketData.hooksConfig.hooksAddress, abi_1.iOpenTermHooksAbi, "getHookedMarket", [marketAddress]);
+            return getAllowForceBuyBacksFromHookedMarket(hookedMarket, 5);
         }
-        if (data.hooksConfig.kind === 2) {
-            const hookedMarket = await typechain_1.IFixedTermHooks__factory.connect(data.hooksConfig.hooksAddress, provider).getHookedMarket(marketAddress);
-            return hookedMarket.allowForceBuyBacks;
+        if (marketData.hooksConfig.kind === 2) {
+            const hookedMarket = await (0, viem_read_1.readViemContract)((0, ethers_viem_1.getViemPublicClientFromEthers)(provider), marketData.hooksConfig.hooksAddress, abi_1.iFixedTermHooksAbi, "getHookedMarket", [marketAddress]);
+            return getAllowForceBuyBacksFromHookedMarket(hookedMarket, 9);
         }
         return false;
     }
     static async fromUnifiedMarketData(chainId, provider, data, signerAddress) {
-        const allowForceBuyBacks = await Market.resolveAllowForceBuyBacks(provider, data.marketToken.token, data);
-        return Market.fromMarketDataV2_5(chainId, provider, data, allowForceBuyBacks, signerAddress);
+        const marketData = toUnifiedMarketDataV2(data);
+        const allowForceBuyBacks = await Market.resolveAllowForceBuyBacks(provider, marketData.market.marketToken.token, marketData);
+        return Market.fromMarketDataV2_5(chainId, provider, marketData, allowForceBuyBacks, signerAddress);
     }
     /* -------------------------------------------------------------------------- */
     /*                               Static Queries                               */
@@ -795,62 +878,58 @@ class Market extends types_1.ContractWrapper {
      * @returns `Market` instance for `market`
      */
     static async getMarket(chainId, market, provider) {
-        const signerAddress = abstract_signer_1.Signer.isSigner(provider) ? await provider.getAddress() : undefined;
+        const signerAddress = await (0, ethers_signer_1.getEthersSignerAddress)(provider);
         if (hasUnifiedLatestLensForDirectReads(chainId)) {
             try {
-                const data = await (0, constants_1.getLensV2_5Contract)(chainId, provider).getMarketData(market);
+                const data = await (0, market_lens_1.getUnifiedMarketDataV2)(chainId, provider, market);
                 return Market.fromUnifiedMarketData(chainId, provider, data, signerAddress);
             }
             catch (_) {
                 // Fall back to the legacy lens for V1 markets and pre-unified deployments.
             }
         }
-        const lens = (0, constants_1.getLensContract)(chainId, provider);
-        const data = await lens.getMarketData(market);
+        const data = await (0, market_lens_1.getLegacyMarketData)(chainId, provider, market);
         return Market.fromMarketData(chainId, data, provider, signerAddress);
     }
     /**
      * @returns `Market` instance for `market`
      */
     static async getMarketV2(chainId, market, provider) {
-        const signerAddress = abstract_signer_1.Signer.isSigner(provider) ? await provider.getAddress() : undefined;
+        const signerAddress = await (0, ethers_signer_1.getEthersSignerAddress)(provider);
         if (hasUnifiedLatestLensForDirectReads(chainId)) {
             try {
-                const data = await (0, constants_1.getLensV2_5Contract)(chainId, provider).getMarketData(market);
+                const data = await (0, market_lens_1.getUnifiedMarketDataV2)(chainId, provider, market);
                 return Market.fromUnifiedMarketData(chainId, provider, data, signerAddress);
             }
             catch (_) {
                 // Fall back to the pre-2.5 V2 lens for chains that have not fully migrated.
             }
         }
-        const lens = (0, constants_1.getLensV2Contract)(chainId, provider);
-        const data = await lens.getMarketData(market);
+        const data = await (0, market_lens_1.getV2MarketData)(chainId, provider, market);
         return Market.fromMarketDataV2(chainId, provider, data, signerAddress);
     }
     /**
      * @returns `Market` instances for `markets`
      */
     static async getMarkets(chainId, markets, provider) {
-        const signerAddress = abstract_signer_1.Signer.isSigner(provider) ? await provider.getAddress() : undefined;
+        const signerAddress = await (0, ethers_signer_1.getEthersSignerAddress)(provider);
         if (hasUnifiedLatestLensForDirectReads(chainId)) {
             try {
-                const data = await (0, constants_1.getLensV2_5Contract)(chainId, provider).getMarketsData(markets);
+                const data = await (0, market_lens_1.getUnifiedMarketsDataV2)(chainId, provider, markets);
                 return Promise.all(data.map((market) => Market.fromUnifiedMarketData(chainId, provider, market, signerAddress)));
             }
             catch (_) {
                 return Promise.all(markets.map((market) => Market.getMarket(chainId, market, provider)));
             }
         }
-        const lens = (0, constants_1.getLensContract)(chainId, provider);
-        const data = await lens.getMarketsData(markets);
+        const data = await (0, market_lens_1.getLegacyMarketsData)(chainId, provider, markets);
         return data.map((market) => Market.fromMarketData(chainId, market, provider, signerAddress));
     }
     /**
      * @return All deployed markets
      */
     static async getAllMarkets(chainId, provider) {
-        const archController = (0, constants_1.getArchControllerContract)(chainId, provider);
-        const markets = await archController["getRegisteredMarkets()"]();
+        const markets = await (0, arch_controller_1.getRegisteredMarkets)(chainId, provider);
         if (!markets.length) {
             return [];
         }
@@ -863,13 +942,12 @@ class Market extends types_1.ContractWrapper {
         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) {
             return [];
         }
@@ -879,8 +957,7 @@ class Market extends types_1.ContractWrapper {
      * @return Total number of deployed markets.
      */
     static async getMarketsCount(chainId, provider) {
-        const archController = (0, constants_1.getArchControllerContract)(chainId, provider);
-        return archController.getRegisteredMarketsCount().then((count) => count.toNumber());
+        return (0, arch_controller_1.getRegisteredMarketsCount)(chainId, provider);
     }
 }
 exports.Market = Market;