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

package/dist/withdrawal-batch.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WithdrawalBatch = exports.BatchStatus = void 0;
+const ethers_1 = require("ethers");
 const token_1 = require("./token");
 const constants_1 = require("./constants");
-const market_lens_1 = require("./internal/market-lens");
 const withdrawal_status_1 = require("./withdrawal-status");
 const utils_1 = require("./utils");
 const types_1 = require("./types");
@@ -39,19 +39,19 @@ class WithdrawalBatch {
     }
     calculateBatchInterestEarned() {
         if (!this.lastScaleFactor)
-            return 0n;
-        const scaledAmountOwed = this.scaledTotalAmount - this.scaledAmountBurned;
-        if (scaledAmountOwed === 0n || this.lastScaleFactor === this.market.scaleFactor) {
-            return 0n;
+            return ethers_1.BigNumber.from(0);
+        const scaledAmountOwed = this.scaledTotalAmount.sub(this.scaledAmountBurned);
+        if (scaledAmountOwed.eq(0) || this.lastScaleFactor?.eq(this.market.scaleFactor)) {
+            return ethers_1.BigNumber.from(0);
         }
-        const lastBalance = (0, utils_1.rayMulBigint)(scaledAmountOwed, this.lastScaleFactor);
-        const currentBalance = (0, utils_1.rayMulBigint)(scaledAmountOwed, this.market.scaleFactor);
-        return currentBalance - lastBalance;
+        const lastBalance = (0, utils_1.rayMul)(scaledAmountOwed, this.lastScaleFactor);
+        const currentBalance = (0, utils_1.rayMul)(scaledAmountOwed, this.market.scaleFactor);
+        return currentBalance.sub(lastBalance);
     }
     processWithdrawalBatchInterestAccrued() {
         if (!this.lastScaleFactor || !this.totalInterestEarned)
             return;
-        if (this.lastScaleFactor !== this.market.scaleFactor) {
+        if (!this.lastScaleFactor.eq(this.market.scaleFactor)) {
             const interestEarned = this.calculateBatchInterestEarned();
             this.lastScaleFactor = this.market.scaleFactor;
             this.totalInterestEarned = this.totalInterestEarned.add(interestEarned);
@@ -74,34 +74,17 @@ class WithdrawalBatch {
     get isPendingExpired() {
         return this.status === BatchStatus.Pending && this.expiry < Math.floor(Date.now() / 1000);
     }
-    get isConcluded() {
-        if (this.market.isClosed)
-            return true;
-        return this.expiry <= Math.floor(Date.now() / 1000);
-    }
-    // unlike `status` which is purely timestamp-based, this accounts for market
-    // termination
-    // a batch with future expiry in a closed market returns Unpaid/Complete
-    // instead of Pending, since the cycle is effectively over
-    get effectiveStatus() {
-        if (!this.isConcluded) {
-            return BatchStatus.Pending;
-        }
-        return this.scaledAmountBurned === this.scaledTotalAmount
-            ? BatchStatus.Complete
-            : BatchStatus.Unpaid;
-    }
     get normalizedAmountOwed() {
         return this.normalizedTotalAmount.sub(this.normalizedAmountPaid);
     }
     get scaledAmountOwed() {
-        return this.scaledTotalAmount - this.scaledAmountBurned;
+        return this.scaledTotalAmount.sub(this.scaledAmountBurned);
     }
     get availableLiquidityToProcess() {
         if (this.isClosed)
             return this.market.underlyingToken.getAmount(0);
         if (this.expiry === this.market.pendingWithdrawalExpiry) {
-            const priorScaledAmountPending = this.market.scaledPendingWithdrawals - this.scaledAmountOwed;
+            const priorScaledAmountPending = this.market.scaledPendingWithdrawals.sub(this.scaledAmountOwed);
             const unavailableAssets = this.market.normalizedUnclaimedWithdrawals
                 .add(this.market.normalizeAmount(priorScaledAmountPending))
                 .add(this.market.lastAccruedProtocolFees);
@@ -116,19 +99,19 @@ class WithdrawalBatch {
         }
     }
     applyLensUpdate(data) {
-        this.scaledTotalAmount = (0, token_1.toRawAmount)(data.scaledTotalAmount);
-        this.scaledAmountBurned = (0, token_1.toRawAmount)(data.scaledAmountBurned);
+        this.scaledTotalAmount = data.scaledTotalAmount;
+        this.scaledAmountBurned = data.scaledAmountBurned;
         this.normalizedAmountPaid = this.market.underlyingToken.getAmount(data.normalizedAmountPaid);
         this.normalizedTotalAmount = this.market.underlyingToken.getAmount(data.normalizedTotalAmount);
         this.status =
             this.expiry > Math.floor(Date.now() / 1000)
                 ? BatchStatus.Pending
-                : this.scaledAmountBurned === this.scaledTotalAmount
+                : this.scaledAmountBurned.eq(this.scaledTotalAmount)
                     ? BatchStatus.Complete
                     : BatchStatus.Unpaid;
         if (this.status === BatchStatus.Complete) {
-            const scaledTotalFromRecords = this.withdrawals.reduce((total, w) => total + w.scaledAmount, 0n);
-            if (scaledTotalFromRecords === this.scaledTotalAmount &&
+            const scaledTotalFromRecords = this.withdrawals.reduce((total, w) => total.add(w.scaledAmount), ethers_1.BigNumber.from(0));
+            if (scaledTotalFromRecords.eq(this.scaledTotalAmount) &&
                 this.withdrawals.every((w) => w.isCompleted)) {
                 this.isCompleted = true;
             }
@@ -139,38 +122,39 @@ class WithdrawalBatch {
     /*                             Builders / Getters                             */
     /* -------------------------------------------------------------------------- */
     static fromWithdrawalBatchData(market, data) {
-        return new WithdrawalBatch(market, (0, utils_1.toNumber)(data.expiry), (0, utils_1.toNumber)(data.status), (0, token_1.toRawAmount)(data.scaledTotalAmount), (0, token_1.toRawAmount)(data.scaledAmountBurned), market.underlyingToken.getAmount(data.normalizedAmountPaid), market.underlyingToken.getAmount(data.normalizedTotalAmount));
+        return new WithdrawalBatch(market, data.expiry, data.status, data.scaledTotalAmount, data.scaledAmountBurned, market.underlyingToken.getAmount(data.normalizedAmountPaid), market.underlyingToken.getAmount(data.normalizedTotalAmount));
     }
     static fromSubgraphWithdrawalBatch(market, batch) {
-        const scaledTotalAmount = (0, token_1.toRawAmount)(batch.scaledTotalAmount);
-        const scaledAmountBurned = (0, token_1.toRawAmount)(batch.scaledAmountBurned);
+        const scaledTotalAmount = ethers_1.BigNumber.from(batch.scaledTotalAmount);
+        const scaledAmountBurned = ethers_1.BigNumber.from(batch.scaledAmountBurned);
         const normalizedAmountPaid = market.underlyingToken.getAmount(batch.normalizedAmountPaid);
         const expiry = +batch.expiry;
         const status = expiry > Math.floor(Date.now() / 1000)
             ? BatchStatus.Pending
-            : scaledAmountBurned === scaledTotalAmount
+            : scaledAmountBurned.eq(scaledTotalAmount)
                 ? BatchStatus.Complete
                 : BatchStatus.Unpaid;
         let scaledAmountOwed;
         let normalizedAmountOwed;
         let normalizedTotalAmount;
-        if (scaledAmountBurned !== scaledTotalAmount) {
-            scaledAmountOwed = scaledTotalAmount - scaledAmountBurned;
-            normalizedAmountOwed = market.underlyingToken.getAmount((0, utils_1.rayMulBigint)(scaledAmountOwed, market.scaleFactor));
+        if (!scaledAmountBurned.eq(scaledTotalAmount)) {
+            scaledAmountOwed = scaledTotalAmount.sub(scaledAmountBurned);
+            normalizedAmountOwed = market.underlyingToken.getAmount((0, utils_1.rayMul)(scaledAmountOwed, market.scaleFactor));
             normalizedTotalAmount = normalizedAmountPaid.add(normalizedAmountOwed);
         }
         else {
-            scaledAmountOwed = 0n;
+            scaledAmountOwed = ethers_1.BigNumber.from(0);
             normalizedAmountOwed = market.underlyingToken.getAmount(0);
             normalizedTotalAmount = normalizedAmountPaid;
         }
-        return new WithdrawalBatch(market, expiry, status, scaledTotalAmount, scaledAmountBurned, normalizedAmountPaid, normalizedTotalAmount, (0, token_1.toRawAmount)(batch.lastScaleFactor), batch.paymentsCount, batch.lastUpdatedTimestamp, market.underlyingToken.getAmount(batch.totalInterestEarned), batch.isCompleted, batch.payments || undefined, batch.withdrawals || undefined, batch.executions || undefined, batch.requests || undefined);
+        return new WithdrawalBatch(market, expiry, status, scaledTotalAmount, scaledAmountBurned, normalizedAmountPaid, normalizedTotalAmount, ethers_1.BigNumber.from(batch.lastScaleFactor), batch.paymentsCount, batch.lastUpdatedTimestamp, market.underlyingToken.getAmount(batch.totalInterestEarned), batch.isCompleted, batch.payments || undefined, batch.withdrawals || undefined, batch.executions || undefined, batch.requests || undefined);
     }
     static async getWithdrawalBatch(market, expiry) {
-        const useLatestLens = market.version === types_1.MarketVersion.V2 || !(0, constants_1.hasDeploymentAddress)(market.chainId, "MarketLens");
-        const data = useLatestLens
-            ? await (0, market_lens_1.getLatestWithdrawalBatchData)(market.chainId, market.provider, market.address, expiry)
-            : await (0, market_lens_1.getLegacyWithdrawalBatchData)(market.chainId, market.provider, market.address, expiry);
+        const useLensV2 = market.version === types_1.MarketVersion.V2 || !(0, constants_1.hasDeploymentAddress)(market.chainId, "MarketLens");
+        const lens = useLensV2
+            ? (0, constants_1.getLensV2Contract)(market.chainId, market.provider)
+            : (0, constants_1.getLensContract)(market.chainId, market.provider);
+        const data = await lens.getWithdrawalBatchData(market.address, expiry);
         return WithdrawalBatch.fromWithdrawalBatchData(market, data);
     }
 }

package/dist/withdrawal-batch.js.map

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

package/dist/withdrawal-status.d.ts

@@ -1,31 +1,27 @@
+import { BigNumber, ContractTransaction } from "ethers";
 import { Market } from "./market";
 import { TokenAmount } from "./token";
-import { WithdrawalBatchLenderStatusStructOutput, WithdrawalBatchDataWithLenderStatusStructOutput, WithdrawalBatchLenderStatusV2_5StructOutput, WithdrawalBatchDataWithLenderStatusV2_5StructOutput } from "./lens-types";
+import { WithdrawalBatchLenderStatusStructOutput, WithdrawalBatchDataWithLenderStatusStructOutput } from "./typechain";
 import { SupportedChainId } from "./constants";
 import { WithdrawalExecutionRecord, WithdrawalRequestRecord } from "./utils";
 import { WithdrawalBatch, BatchStatus } from "./withdrawal-batch";
-import { TransactionHash } from "./types";
 import { SubgraphLenderWithdrawalPropertiesFragment, SubgraphWithdrawalExecution, SubgraphWithdrawalExecutionPropertiesFragment, SubgraphWithdrawalRequest, SubgraphWithdrawalRequestPropertiesFragment } from "./gql/graphql";
-type WithdrawalBatchLenderStatusOutput = WithdrawalBatchLenderStatusStructOutput | WithdrawalBatchLenderStatusV2_5StructOutput;
-type WithdrawalBatchDataWithLenderStatusOutput = WithdrawalBatchDataWithLenderStatusStructOutput | WithdrawalBatchDataWithLenderStatusV2_5StructOutput;
 export declare class LenderWithdrawalStatus {
     batch: WithdrawalBatch;
     lender: string;
-    scaledAmount: bigint;
+    scaledAmount: BigNumber;
     normalizedAmountWithdrawn: TokenAmount;
     normalizedAmountOwed: TokenAmount;
     isCompleted: boolean;
     executions: WithdrawalExecutionRecord[];
     requests: WithdrawalRequestRecord[];
-    constructor(batch: WithdrawalBatch, lender: string, scaledAmount: bigint, normalizedAmountWithdrawn: TokenAmount, normalizedAmountOwed: TokenAmount, isCompleted: boolean, requests?: SubgraphWithdrawalRequestPropertiesFragment[], executions?: SubgraphWithdrawalExecutionPropertiesFragment[]);
+    constructor(batch: WithdrawalBatch, lender: string, scaledAmount: BigNumber, normalizedAmountWithdrawn: TokenAmount, normalizedAmountOwed: TokenAmount, isCompleted: boolean, requests?: SubgraphWithdrawalRequestPropertiesFragment[], executions?: SubgraphWithdrawalExecutionPropertiesFragment[]);
     get availableWithdrawalAmount(): TokenAmount;
     get chainId(): SupportedChainId;
-    execute(): Promise<TransactionHash>;
+    execute(): Promise<ContractTransaction>;
     get expiry(): number;
     get market(): Market;
     get status(): BatchStatus;
-    get isConcluded(): boolean;
-    get effectiveStatus(): BatchStatus;
     get normalizedTotalAmount(): TokenAmount;
     updateWith(data: WithdrawalBatchLenderStatusStructOutput): void;
     get normalizedUnpaidAmount(): TokenAmount;
@@ -34,8 +30,7 @@ export declare class LenderWithdrawalStatus {
         executions?: SubgraphWithdrawalExecution[];
     }, address?: string): LenderWithdrawalStatus;
     static getWithdrawalForLender(market: Market, expiry: number, lender: string): Promise<LenderWithdrawalStatus>;
-    static fromWithdrawalBatchLenderStatus(market: Market, batch: WithdrawalBatch, data: WithdrawalBatchLenderStatusOutput): LenderWithdrawalStatus;
-    static fromWithdrawalBatchDataWithLenderStatus(market: Market, data: WithdrawalBatchDataWithLenderStatusOutput): LenderWithdrawalStatus;
+    static fromWithdrawalBatchLenderStatus(market: Market, batch: WithdrawalBatch, data: WithdrawalBatchLenderStatusStructOutput): LenderWithdrawalStatus;
+    static fromWithdrawalBatchDataWithLenderStatus(market: Market, data: WithdrawalBatchDataWithLenderStatusStructOutput): LenderWithdrawalStatus;
 }
-export {};
 //# sourceMappingURL=withdrawal-status.d.ts.map

package/dist/withdrawal-status.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"withdrawal-status.d.ts","sourceRoot":"","sources":["../src/withdrawal-status.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,WAAW,EAAe,MAAM,SAAS,CAAC;AACnD,OAAO,EACL,uCAAuC,EACvC,+CAA+C,EAC/C,2CAA2C,EAC3C,mDAAmD,EACpD,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,gBAAgB,EAAwB,MAAM,aAAa,CAAC;AAKrE,OAAO,EACL,yBAAyB,EACzB,uBAAuB,EAGxB,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAClE,OAAO,EAAiB,eAAe,EAAE,MAAM,SAAS,CAAC;AACzD,OAAO,EACL,0CAA0C,EAC1C,2BAA2B,EAC3B,6CAA6C,EAC7C,yBAAyB,EACzB,2CAA2C,EAC5C,MAAM,eAAe,CAAC;AAEvB,KAAK,iCAAiC,GAClC,uCAAuC,GACvC,2CAA2C,CAAC;AAEhD,KAAK,yCAAyC,GAC1C,+CAA+C,GAC/C,mDAAmD,CAAC;AAExD,qBAAa,sBAAsB;IAIxB,KAAK,EAAE,eAAe;IACtB,MAAM,EAAE,MAAM;IACd,YAAY,EAAE,MAAM;IACpB,yBAAyB,EAAE,WAAW;IACtC,oBAAoB,EAAE,WAAW;IACjC,WAAW,EAAE,OAAO;IARtB,UAAU,EAAE,yBAAyB,EAAE,CAAM;IAC7C,QAAQ,EAAE,uBAAuB,EAAE,CAAM;gBAEvC,KAAK,EAAE,eAAe,EACtB,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,EACpB,yBAAyB,EAAE,WAAW,EACtC,oBAAoB,EAAE,WAAW,EACjC,WAAW,EAAE,OAAO,EAC3B,QAAQ,GAAE,2CAA2C,EAAO,EAC5D,UAAU,GAAE,6CAA6C,EAAO;IAMlE,IAAI,yBAAyB,IAAI,WAAW,CAI3C;IAED,IAAI,OAAO,IAAI,gBAAgB,CAE9B;IAEK,OAAO,IAAI,OAAO,CAAC,eAAe,CAAC;IAKzC,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED,IAAI,MAAM,IAAI,WAAW,CAExB;IAED,IAAI,WAAW,IAAI,OAAO,CAEzB;IAED,IAAI,eAAe,IAAI,WAAW,CAEjC;IAED,IAAI,qBAAqB,IAAI,WAAW,CAEvC;IAED,UAAU,CAAC,IAAI,EAAE,uCAAuC,GAAG,IAAI;IAiB/D,IAAI,sBAAsB,IAAI,WAAW,CAExC;IAED,MAAM,CAAC,kCAAkC,CACvC,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,eAAe,EACtB,MAAM,EAAE,0CAA0C,GAAG;QACnD,QAAQ,CAAC,EAAE,yBAAyB,EAAE,CAAC;QACvC,UAAU,CAAC,EAAE,2BAA2B,EAAE,CAAC;KAC5C,EACD,OAAO,CAAC,EAAE,MAAM,GACf,sBAAsB;WAqBZ,sBAAsB,CACjC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,sBAAsB,CAAC;IA0BlC,MAAM,CAAC,+BAA+B,CACpC,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,eAAe,EACtB,IAAI,EAAE,iCAAiC,GACtC,sBAAsB;IAkBzB,MAAM,CAAC,uCAAuC,CAC5C,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,yCAAyC,GAC9C,sBAAsB;CAO1B"}
+{"version":3,"file":"withdrawal-status.d.ts","sourceRoot":"","sources":["../src/withdrawal-status.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,mBAAmB,EAAE,MAAM,QAAQ,CAAC;AACxD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AACtC,OAAO,EACL,uCAAuC,EACvC,+CAA+C,EAChD,MAAM,aAAa,CAAC;AACrB,OAAO,EACL,gBAAgB,EAIjB,MAAM,aAAa,CAAC;AACrB,OAAO,EACL,yBAAyB,EACzB,uBAAuB,EAIxB,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAElE,OAAO,EACL,0CAA0C,EAC1C,2BAA2B,EAC3B,6CAA6C,EAC7C,yBAAyB,EACzB,2CAA2C,EAC5C,MAAM,eAAe,CAAC;AAEvB,qBAAa,sBAAsB;IAIxB,KAAK,EAAE,eAAe;IACtB,MAAM,EAAE,MAAM;IACd,YAAY,EAAE,SAAS;IACvB,yBAAyB,EAAE,WAAW;IACtC,oBAAoB,EAAE,WAAW;IACjC,WAAW,EAAE,OAAO;IARtB,UAAU,EAAE,yBAAyB,EAAE,CAAM;IAC7C,QAAQ,EAAE,uBAAuB,EAAE,CAAM;gBAEvC,KAAK,EAAE,eAAe,EACtB,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,SAAS,EACvB,yBAAyB,EAAE,WAAW,EACtC,oBAAoB,EAAE,WAAW,EACjC,WAAW,EAAE,OAAO,EAC3B,QAAQ,GAAE,2CAA2C,EAAO,EAC5D,UAAU,GAAE,6CAA6C,EAAO;IAMlE,IAAI,yBAAyB,IAAI,WAAW,CAI3C;IAED,IAAI,OAAO,IAAI,gBAAgB,CAE9B;IAEK,OAAO,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAK7C,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED,IAAI,MAAM,IAAI,WAAW,CAExB;IAED,IAAI,qBAAqB,IAAI,WAAW,CAEvC;IAED,UAAU,CAAC,IAAI,EAAE,uCAAuC,GAAG,IAAI;IAQ/D,IAAI,sBAAsB,IAAI,WAAW,CAExC;IAED,MAAM,CAAC,kCAAkC,CACvC,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,eAAe,EACtB,MAAM,EAAE,0CAA0C,GAAG;QACnD,QAAQ,CAAC,EAAE,yBAAyB,EAAE,CAAC;QACvC,UAAU,CAAC,EAAE,2BAA2B,EAAE,CAAC;KAC5C,EACD,OAAO,CAAC,EAAE,MAAM,GACf,sBAAsB;WAuBZ,sBAAsB,CACjC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,sBAAsB,CAAC;IAmBlC,MAAM,CAAC,+BAA+B,CACpC,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,eAAe,EACtB,IAAI,EAAE,uCAAuC,GAC5C,sBAAsB;IAiBzB,MAAM,CAAC,uCAAuC,CAC5C,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,+CAA+C,GACpD,sBAAsB;CAO1B"}

package/dist/withdrawal-status.js

@@ -1,9 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LenderWithdrawalStatus = void 0;
-const token_1 = require("./token");
+const ethers_1 = require("ethers");
 const constants_1 = require("./constants");
-const market_lens_1 = require("./internal/market-lens");
 const utils_1 = require("./utils");
 const withdrawal_batch_1 = require("./withdrawal-batch");
 const types_1 = require("./types");
@@ -30,7 +29,7 @@ class LenderWithdrawalStatus {
     }
     async execute() {
         (0, utils_1.assert)(this.availableWithdrawalAmount.gt(0), "No funds available to withdraw");
-        return this.market.executeWithdrawal(this);
+        return this.market.contract.executeWithdrawal(this.lender, this.expiry);
     }
     get expiry() {
         return this.batch.expiry;
@@ -41,55 +40,39 @@ class LenderWithdrawalStatus {
     get status() {
         return this.batch.status;
     }
-    get isConcluded() {
-        return this.batch.isConcluded;
-    }
-    get effectiveStatus() {
-        return this.batch.effectiveStatus;
-    }
     get normalizedTotalAmount() {
         return this.normalizedAmountOwed.add(this.normalizedAmountWithdrawn);
     }
     updateWith(data) {
-        this.scaledAmount = (0, token_1.toRawAmount)(data.scaledAmount);
+        this.scaledAmount = data.scaledAmount;
         this.normalizedAmountWithdrawn = this.market.underlyingToken.getAmount(data.normalizedAmountWithdrawn);
         this.normalizedAmountOwed = this.market.underlyingToken.getAmount(data.normalizedAmountOwed);
-        // recompute isCompleted based on updated values after a wd that
-        // subgraph may not have updated yet
-        this.isCompleted =
-            this.batch.status === withdrawal_batch_1.BatchStatus.Complete &&
-                this.batch.expiry < Math.floor(Date.now() / 1000) &&
-                this.batch.normalizedAmountPaid
-                    .mulDiv(this.scaledAmount, this.batch.scaledTotalAmount)
-                    .eq(data.normalizedAmountWithdrawn);
     }
     get normalizedUnpaidAmount() {
         return this.batch.normalizedAmountOwed.mulDiv(this.scaledAmount, this.batch.scaledTotalAmount);
     }
     static fromSubgraphLenderWithdrawalStatus(market, batch, status, address) {
-        const scaledAmount = (0, token_1.toRawAmount)(status.scaledAmount);
+        const scaledAmount = ethers_1.BigNumber.from(status.scaledAmount);
         const normalizedAmountWithdrawn = market.underlyingToken.getAmount(status.normalizedAmountWithdrawn);
-        const normalizedAmountOwed = batch.normalizedTotalAmount
-            .mulDiv(scaledAmount, batch.scaledTotalAmount)
-            .sub(normalizedAmountWithdrawn);
+        const normalizedAmountOwed = market.underlyingToken.getAmount((0, utils_1.mulDiv)(batch.normalizedTotalAmount.raw, scaledAmount, batch.scaledTotalAmount).sub(normalizedAmountWithdrawn.raw));
         return new LenderWithdrawalStatus(batch, address ?? status.account.address, scaledAmount, normalizedAmountWithdrawn, normalizedAmountOwed, status.isCompleted, status.requests || undefined, status.executions || undefined);
     }
     static async getWithdrawalForLender(market, expiry, lender) {
-        const useLatestLens = market.version === types_1.MarketVersion.V2 || !(0, constants_1.hasDeploymentAddress)(market.chainId, "MarketLens");
-        const batchData = useLatestLens
-            ? await (0, market_lens_1.getLatestWithdrawalBatchDataWithLenderStatus)(market.chainId, market.provider, market.address, expiry, lender)
-            : await (0, market_lens_1.getLegacyWithdrawalBatchDataWithLenderStatus)(market.chainId, market.provider, market.address, expiry, lender);
+        const useLensV2 = market.version === types_1.MarketVersion.V2 || !(0, constants_1.hasDeploymentAddress)(market.chainId, "MarketLens");
+        const lens = useLensV2
+            ? (0, constants_1.getLensV2Contract)(market.chainId, market.provider)
+            : (0, constants_1.getLensContract)(market.chainId, market.provider);
+        const batchData = await lens.getWithdrawalBatchDataWithLenderStatus(market.address, expiry, lender);
         const batch = withdrawal_batch_1.WithdrawalBatch.fromWithdrawalBatchData(market, batchData.batch);
         return LenderWithdrawalStatus.fromWithdrawalBatchLenderStatus(market, batch, batchData.lenderStatus);
     }
     static fromWithdrawalBatchLenderStatus(market, batch, data) {
-        const scaledAmount = (0, token_1.toRawAmount)(data.scaledAmount);
         const isCompleted = batch.status === withdrawal_batch_1.BatchStatus.Complete &&
             batch.expiry < Math.floor(Date.now() / 1000) &&
             batch.normalizedAmountPaid
-                .mulDiv(scaledAmount, batch.scaledTotalAmount)
+                .mulDiv(data.scaledAmount, batch.scaledTotalAmount)
                 .eq(data.normalizedAmountWithdrawn);
-        return new LenderWithdrawalStatus(batch, data.lender, scaledAmount, market.underlyingToken.getAmount(data.normalizedAmountWithdrawn), market.underlyingToken.getAmount(data.normalizedAmountOwed), isCompleted);
+        return new LenderWithdrawalStatus(batch, data.lender, data.scaledAmount, market.underlyingToken.getAmount(data.normalizedAmountWithdrawn), market.underlyingToken.getAmount(data.normalizedAmountOwed), isCompleted);
     }
     static fromWithdrawalBatchDataWithLenderStatus(market, data) {
         return LenderWithdrawalStatus.fromWithdrawalBatchLenderStatus(market, withdrawal_batch_1.WithdrawalBatch.fromWithdrawalBatchData(market, data.batch), data.lenderStatus);

package/dist/withdrawal-status.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wildcatfi/wildcat-sdk",
-  "version": "3.0.77-beta",
+  "version": "3.1.1-beta",
   "license": "MIT",
   "files": [
     "dist"
@@ -17,6 +17,8 @@
     "@testing-library/jest-dom": "^5.16.4",
     "@testing-library/react": "^13.0.1",
     "@testing-library/user-event": "^14.1.0",
+    "@typechain/ethers-v5": "^10.2.1",
+    "@typechain/hardhat": "^9.1.0",
     "@types/chai": "^4.3.5",
     "@types/dotenv": "^8.2.0",
     "@types/mocha": "^10.0.4",
@@ -30,12 +32,12 @@
     "eslint": "^8.40.0",
     "eslint-config-prettier": "^8.8.0",
     "eslint-plugin-prettier": "^4.2.1",
-    "ethers": "^5.7.2",
     "hardhat": "^2.13.0",
     "mocha": "^10.4.0",
     "prettier": "^2.8.8",
     "ts-morph": "^24.0.0",
     "ts-node": "^10.9.1",
+    "typechain": "^8.1.1",
     "typescript": "^5.0.4"
   },
   "dependencies": {
@@ -46,29 +48,19 @@
     "graphql": "^16.8.1",
     "react": "^18.1.0",
     "react-dom": "^18.1.0",
-    "react-scripts": "5.0.1",
-    "viem": "^2.9.3"
+    "react-scripts": "5.0.1"
   },
   "scripts": {
     "build": "npm run clean && tsc -p ./tsconfig.prod.json",
-    "clean": "rm -rf dist cache",
-    "codegen": "yarn codegen:gql; yarn codegen:artifacts; yarn codegen:abi",
-    "codegen:abi": "node scripts/generate-viem-abis.js",
-    "codegen:artifacts": "hardhat compile",
-    "codegen:gql": "node scripts/should-update-gql && graphql-codegen && node ./scripts/gql-type-cleanup.js && eslint src/gql/ --ext=ts --fix",
+    "clean": "rm -rf dist cache typechain-types",
+    "clean:typechain": "yarn clean; rm -rf src/typechain",
+    "codegen": "yarn codegen:gql && yarn codegen:typechain",
+    "codegen:gql": "node scripts/codegen-gql.js",
+    "codegen:typechain": "yarn clean:typechain; hardhat compile; cp -r typechain-types src/typechain; echo 'compiled & copied'; node scripts/add-typechain-exports.js",
     "lint": "eslint src/ test/ --ext=ts",
     "lint:fix": "eslint src/ test/ --ext=ts --fix",
     "prepublishOnly": "yarn build",
     "test": "react-scripts test",
-    "mocha": "NODE_OPTIONS='--max-old-space-size=2048' mocha",
-    "test:access-preview": "NODE_OPTIONS='--max-old-space-size=2048' mocha --no-config --timeout 0 --require ts-node/register \"./test/access/**/*.spec.ts\"",
-    "test:abi": "NODE_OPTIONS='--max-old-space-size=2048' mocha --no-config --timeout 0 --require ts-node/register \"./test/abi/**/*.spec.ts\"",
-    "test:client": "NODE_OPTIONS='--max-old-space-size=2048' mocha --no-config --timeout 0 --require ts-node/register \"./test/client/**/*.spec.ts\"",
-    "test:market-model": "NODE_OPTIONS='--max-old-space-size=2048' mocha --no-config --timeout 0 --require ts-node/register \"./test/market/**/*.spec.ts\"",
-    "test:read-routing": "NODE_OPTIONS='--max-old-space-size=2048' mocha --no-config --timeout 0 --require ts-node/register \"./test/read/**/*.spec.ts\"",
-    "test:smoke": "NODE_OPTIONS='--max-old-space-size=2048' mocha --no-config --timeout 0 --require ts-node/register \"./test/smoke/**/*.spec.ts\"",
-    "test:transactions": "NODE_OPTIONS='--max-old-space-size=2048' mocha --no-config --timeout 0 --require ts-node/register \"./test/transactions/**/*.spec.ts\"",
-    "test:utils": "NODE_OPTIONS='--max-old-space-size=2048' mocha --no-config --timeout 0 --require ts-node/register \"./test/utils/**/*.spec.ts\""
-  },
-  "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
+    "mocha": "NODE_OPTIONS='--max-old-space-size=2048' mocha"
+  }
 }