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

package/dist/access/utils.d.ts

@@ -1,3 +1,4 @@
+import { type Hex } from "viem";
 import { MarketHooksInstanceInputs } from "../types";
-export declare function encodeMarketHooksInstanceInputs(args: MarketHooksInstanceInputs): string;
+export declare function encodeMarketHooksInstanceInputs(args: MarketHooksInstanceInputs): Hex;
 //# sourceMappingURL=utils.d.ts.map

package/dist/access/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/access/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,yBAAyB,EAAE,MAAM,UAAU,CAAC;AAMrD,wBAAgB,+BAA+B,CAAC,IAAI,EAAE,yBAAyB,GAAG,MAAM,CAyBvF"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/access/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkD,KAAK,GAAG,EAAE,MAAM,MAAM,CAAC;AAChF,OAAO,EAAE,yBAAyB,EAAE,MAAM,UAAU,CAAC;AAGrD,wBAAgB,+BAA+B,CAAC,IAAI,EAAE,yBAAyB,GAAG,GAAG,CAyDpF"}

package/dist/access/utils.js

@@ -1,22 +1,52 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.encodeMarketHooksInstanceInputs = void 0;
-const utils_1 = require("ethers/lib/utils");
-const utils_2 = require("../utils");
-const ethers_1 = require("ethers");
-const NameAndProviderInputsSignature = `tuple(string name, address roleProviderFactory, tuple(uint32 timeToLive, bytes providerFactoryCalldata)[] newProviderInputs, tuple(address providerAddress, uint32 timeToLive)[] existingProviders)`;
+const viem_1 = require("viem");
+const utils_1 = require("../utils");
 function encodeMarketHooksInstanceInputs(args) {
-    (0, utils_2.assert)(args.hooksAddress === undefined, `Can not encode hooks instance constructor parameters when hooks address already provided`);
+    (0, utils_1.assert)(args.hooksAddress === undefined, `Can not encode hooks instance constructor parameters when hooks address already provided`);
     const { newProviderInputs = [], existingProviders = [], roleProviderFactory, hooksInstanceName = "" } = args;
     if (newProviderInputs.length) {
-        (0, utils_2.assert)(roleProviderFactory !== undefined, `Can not create new providers without a factory`);
+        (0, utils_1.assert)(roleProviderFactory !== undefined, `Can not create new providers without a factory`);
     }
-    return utils_1.defaultAbiCoder.encode([NameAndProviderInputsSignature], [
+    const encodedNewProviderInputs = newProviderInputs.map(({ data, timeToLive }) => ({
+        timeToLive,
+        providerFactoryCalldata: data
+    }));
+    const encodedExistingProviders = existingProviders.map(({ providerAddress, timeToLive }) => ({
+        providerAddress: providerAddress,
+        timeToLive
+    }));
+    return (0, viem_1.encodeAbiParameters)([
+        {
+            type: "tuple",
+            components: [
+                { name: "name", type: "string" },
+                { name: "roleProviderFactory", type: "address" },
+                {
+                    name: "newProviderInputs",
+                    type: "tuple[]",
+                    components: [
+                        { name: "timeToLive", type: "uint32" },
+                        { name: "providerFactoryCalldata", type: "bytes" }
+                    ]
+                },
+                {
+                    name: "existingProviders",
+                    type: "tuple[]",
+                    components: [
+                        { name: "providerAddress", type: "address" },
+                        { name: "timeToLive", type: "uint32" }
+                    ]
+                }
+            ]
+        }
+    ], [
         {
             name: hooksInstanceName,
-            roleProviderFactory: roleProviderFactory || ethers_1.constants.AddressZero,
-            newProviderInputs,
-            existingProviders
+            roleProviderFactory: (roleProviderFactory || viem_1.zeroAddress),
+            newProviderInputs: encodedNewProviderInputs,
+            existingProviders: encodedExistingProviders
         }
     ]);
 }

package/dist/access/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/access/utils.ts"],"names":[],"mappings":";;;AAAA,4CAAmD;AAEnD,oCAAkC;AAClC,mCAAmC;AAEnC,MAAM,8BAA8B,GAAG,qMAAqM,CAAC;AAE7O,SAAgB,+BAA+B,CAAC,IAA+B;IAC7E,IAAA,cAAM,EACJ,IAAI,CAAC,YAAY,KAAK,SAAS,EAC/B,0FAA0F,CAC3F,CAAC;IACF,MAAM,EACJ,iBAAiB,GAAG,EAAE,EACtB,iBAAiB,GAAG,EAAE,EACtB,mBAAmB,EACnB,iBAAiB,GAAG,EAAE,EACvB,GAAG,IAAI,CAAC;IACT,IAAI,iBAAiB,CAAC,MAAM,EAAE;QAC5B,IAAA,cAAM,EAAC,mBAAmB,KAAK,SAAS,EAAE,gDAAgD,CAAC,CAAC;KAC7F;IACD,OAAO,uBAAe,CAAC,MAAM,CAC3B,CAAC,8BAA8B,CAAC,EAChC;QACE;YACE,IAAI,EAAE,iBAAiB;YACvB,mBAAmB,EAAE,mBAAmB,IAAI,kBAAS,CAAC,WAAW;YACjE,iBAAiB;YACjB,iBAAiB;SAClB;KACF,CACF,CAAC;AACJ,CAAC;AAzBD,0EAyBC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/access/utils.ts"],"names":[],"mappings":";;;AAAA,+BAAgF;AAEhF,oCAAkC;AAElC,SAAgB,+BAA+B,CAAC,IAA+B;IAC7E,IAAA,cAAM,EACJ,IAAI,CAAC,YAAY,KAAK,SAAS,EAC/B,0FAA0F,CAC3F,CAAC;IACF,MAAM,EACJ,iBAAiB,GAAG,EAAE,EACtB,iBAAiB,GAAG,EAAE,EACtB,mBAAmB,EACnB,iBAAiB,GAAG,EAAE,EACvB,GAAG,IAAI,CAAC;IACT,IAAI,iBAAiB,CAAC,MAAM,EAAE;QAC5B,IAAA,cAAM,EAAC,mBAAmB,KAAK,SAAS,EAAE,gDAAgD,CAAC,CAAC;KAC7F;IACD,MAAM,wBAAwB,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,CAAC;QAChF,UAAU;QACV,uBAAuB,EAAE,IAAW;KACrC,CAAC,CAAC,CAAC;IACJ,MAAM,wBAAwB,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC,EAAE,eAAe,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,CAAC;QAC3F,eAAe,EAAE,eAA0B;QAC3C,UAAU;KACX,CAAC,CAAC,CAAC;IACJ,OAAO,IAAA,0BAAmB,EACxB;QACE;YACE,IAAI,EAAE,OAAO;YACb,UAAU,EAAE;gBACV,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE;gBAChC,EAAE,IAAI,EAAE,qBAAqB,EAAE,IAAI,EAAE,SAAS,EAAE;gBAChD;oBACE,IAAI,EAAE,mBAAmB;oBACzB,IAAI,EAAE,SAAS;oBACf,UAAU,EAAE;wBACV,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,QAAQ,EAAE;wBACtC,EAAE,IAAI,EAAE,yBAAyB,EAAE,IAAI,EAAE,OAAO,EAAE;qBACnD;iBACF;gBACD;oBACE,IAAI,EAAE,mBAAmB;oBACzB,IAAI,EAAE,SAAS;oBACf,UAAU,EAAE;wBACV,EAAE,IAAI,EAAE,iBAAiB,EAAE,IAAI,EAAE,SAAS,EAAE;wBAC5C,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,QAAQ,EAAE;qBACvC;iBACF;aACF;SACF;KACF,EACD;QACE;YACE,IAAI,EAAE,iBAAiB;YACvB,mBAAmB,EAAE,CAAC,mBAAmB,IAAI,kBAAW,CAAY;YACpE,iBAAiB,EAAE,wBAAwB;YAC3C,iBAAiB,EAAE,wBAAwB;SAC5C;KACF,CACF,CAAC;AACJ,CAAC;AAzDD,0EAyDC"}

package/dist/access/validation.d.ts

@@ -1,24 +1,25 @@
-import { HooksFactory, HooksFactoryRevolving } from "../typechain";
+import type { LegacyDeployMarketAndHooksArgs, LegacyDeployMarketArgs, RevolvingDeployMarketAndHooksArgs, RevolvingDeployMarketArgs } from "../lens-types";
 export declare enum DeployMarketStatus {
     Ready = "Ready",
     InsufficientBalance = "InsufficientBalance",
     InsufficientAllowance = "InsufficientAllowance",
     NotRegisteredBorrower = "NotRegisteredBorrower",
-    CreateProviderInputsWithoutFactory = "CreateProviderInputsWithoutFactory"
+    CreateProviderInputsWithoutFactory = "CreateProviderInputsWithoutFactory",
+    WrongHooksFactory = "WrongHooksFactory"
 }
 type LegacyDeployMarketCallPreview = {
     fn: "deployMarket";
-    args: Parameters<HooksFactory["deployMarket"]>;
+    args: LegacyDeployMarketArgs;
 } | {
     fn: "deployMarketAndHooks";
-    args: Parameters<HooksFactory["deployMarketAndHooks"]>;
+    args: LegacyDeployMarketAndHooksArgs;
 };
 type RevolvingDeployMarketCallPreview = {
     fn: "deployMarket";
-    args: Parameters<HooksFactoryRevolving["deployMarket"]>;
+    args: RevolvingDeployMarketArgs;
 } | {
     fn: "deployMarketAndHooks";
-    args: Parameters<HooksFactoryRevolving["deployMarketAndHooks"]>;
+    args: RevolvingDeployMarketAndHooksArgs;
 };
 export type LegacyReadyDeployMarketPreview = {
     status: DeployMarketStatus.Ready;

package/dist/access/validation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../../src/access/validation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAEnE,oBAAY,kBAAkB;IAC5B,KAAK,UAAU;IACf,mBAAmB,wBAAwB;IAC3C,qBAAqB,0BAA0B;IAC/C,qBAAqB,0BAA0B;IAC/C,kCAAkC,uCAAuC;CAC1E;AAED,KAAK,6BAA6B,GAC9B;IACE,EAAE,EAAE,cAAc,CAAC;IACnB,IAAI,EAAE,UAAU,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC,CAAC;CAChD,GACD;IACE,EAAE,EAAE,sBAAsB,CAAC;IAC3B,IAAI,EAAE,UAAU,CAAC,YAAY,CAAC,sBAAsB,CAAC,CAAC,CAAC;CACxD,CAAC;AAEN,KAAK,gCAAgC,GACjC;IACE,EAAE,EAAE,cAAc,CAAC;IACnB,IAAI,EAAE,UAAU,CAAC,qBAAqB,CAAC,cAAc,CAAC,CAAC,CAAC;CACzD,GACD;IACE,EAAE,EAAE,sBAAsB,CAAC;IAC3B,IAAI,EAAE,UAAU,CAAC,qBAAqB,CAAC,sBAAsB,CAAC,CAAC,CAAC;CACjE,CAAC;AAEN,MAAM,MAAM,8BAA8B,GAAG;IAC3C,MAAM,EAAE,kBAAkB,CAAC,KAAK,CAAC;IACjC,UAAU,EAAE,QAAQ,CAAC;CACtB,GAAG,6BAA6B,CAAC;AAElC,MAAM,MAAM,iCAAiC,GAAG;IAC9C,MAAM,EAAE,kBAAkB,CAAC,KAAK,CAAC;IACjC,UAAU,EAAE,WAAW,CAAC;CACzB,GAAG,gCAAgC,CAAC;AAErC,KAAK,2BAA2B,GAAG;IACjC,MAAM,EAAE,OAAO,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,KAAK,CAAC,CAAC;CAC/D,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAChC,8BAA8B,GAC9B,iCAAiC,CAAC;AAEtC,MAAM,MAAM,yBAAyB,GACjC,8BAA8B,GAC9B;IACE,MAAM,EAAE,OAAO,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,KAAK,CAAC,CAAC;CAC/D,CAAC;AAEN,MAAM,MAAM,4BAA4B,GACpC,iCAAiC,GACjC,2BAA2B,CAAC;AAEhC,MAAM,MAAM,mBAAmB,GAAG,wBAAwB,GAAG,2BAA2B,CAAC;AAEzF,eAAO,MAAM,8BAA8B,YAChC,6BAA6B,KACrC,8BAMF,CAAC;AAEF,eAAO,MAAM,iCAAiC,YACnC,gCAAgC,KACxC,iCAMF,CAAC;AAEF,oBAAY,sBAAsB;IAChC,KAAK,UAAU;IACf,WAAW,gBAAgB;CAC5B;AAED,MAAM,MAAM,uBAAuB,GAAG;IACpC,MAAM,EAAE,sBAAsB,CAAC;CAChC,CAAC"}
+{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../../src/access/validation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,8BAA8B,EAC9B,sBAAsB,EACtB,iCAAiC,EACjC,yBAAyB,EAC1B,MAAM,eAAe,CAAC;AAEvB,oBAAY,kBAAkB;IAC5B,KAAK,UAAU;IACf,mBAAmB,wBAAwB;IAC3C,qBAAqB,0BAA0B;IAC/C,qBAAqB,0BAA0B;IAC/C,kCAAkC,uCAAuC;IACzE,iBAAiB,sBAAsB;CACxC;AAED,KAAK,6BAA6B,GAC9B;IACE,EAAE,EAAE,cAAc,CAAC;IACnB,IAAI,EAAE,sBAAsB,CAAC;CAC9B,GACD;IACE,EAAE,EAAE,sBAAsB,CAAC;IAC3B,IAAI,EAAE,8BAA8B,CAAC;CACtC,CAAC;AAEN,KAAK,gCAAgC,GACjC;IACE,EAAE,EAAE,cAAc,CAAC;IACnB,IAAI,EAAE,yBAAyB,CAAC;CACjC,GACD;IACE,EAAE,EAAE,sBAAsB,CAAC;IAC3B,IAAI,EAAE,iCAAiC,CAAC;CACzC,CAAC;AAEN,MAAM,MAAM,8BAA8B,GAAG;IAC3C,MAAM,EAAE,kBAAkB,CAAC,KAAK,CAAC;IACjC,UAAU,EAAE,QAAQ,CAAC;CACtB,GAAG,6BAA6B,CAAC;AAElC,MAAM,MAAM,iCAAiC,GAAG;IAC9C,MAAM,EAAE,kBAAkB,CAAC,KAAK,CAAC;IACjC,UAAU,EAAE,WAAW,CAAC;CACzB,GAAG,gCAAgC,CAAC;AAErC,KAAK,2BAA2B,GAAG;IACjC,MAAM,EAAE,OAAO,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,KAAK,CAAC,CAAC;CAC/D,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAChC,8BAA8B,GAC9B,iCAAiC,CAAC;AAEtC,MAAM,MAAM,yBAAyB,GACjC,8BAA8B,GAC9B;IACE,MAAM,EAAE,OAAO,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,KAAK,CAAC,CAAC;CAC/D,CAAC;AAEN,MAAM,MAAM,4BAA4B,GACpC,iCAAiC,GACjC,2BAA2B,CAAC;AAEhC,MAAM,MAAM,mBAAmB,GAAG,wBAAwB,GAAG,2BAA2B,CAAC;AAEzF,eAAO,MAAM,8BAA8B,YAChC,6BAA6B,KACrC,8BAMF,CAAC;AAEF,eAAO,MAAM,iCAAiC,YACnC,gCAAgC,KACxC,iCAMF,CAAC;AAEF,oBAAY,sBAAsB;IAChC,KAAK,UAAU;IACf,WAAW,gBAAgB;CAC5B;AAED,MAAM,MAAM,uBAAuB,GAAG;IACpC,MAAM,EAAE,sBAAsB,CAAC;CAChC,CAAC"}

package/dist/access/validation.js

@@ -8,6 +8,7 @@ var DeployMarketStatus;
     DeployMarketStatus["InsufficientAllowance"] = "InsufficientAllowance";
     DeployMarketStatus["NotRegisteredBorrower"] = "NotRegisteredBorrower";
     DeployMarketStatus["CreateProviderInputsWithoutFactory"] = "CreateProviderInputsWithoutFactory";
+    DeployMarketStatus["WrongHooksFactory"] = "WrongHooksFactory";
 })(DeployMarketStatus = exports.DeployMarketStatus || (exports.DeployMarketStatus = {}));
 const readyLegacyDeployMarketPreview = (preview) => {
     return {

package/dist/access/validation.js.map

@@ -1 +1 @@
-{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../src/access/validation.ts"],"names":[],"mappings":";;;AAEA,IAAY,kBAMX;AAND,WAAY,kBAAkB;IAC5B,qCAAe,CAAA;IACf,iEAA2C,CAAA;IAC3C,qEAA+C,CAAA;IAC/C,qEAA+C,CAAA;IAC/C,+FAAyE,CAAA;AAC3E,CAAC,EANW,kBAAkB,GAAlB,0BAAkB,KAAlB,0BAAkB,QAM7B;AAoDM,MAAM,8BAA8B,GAAG,CAC5C,OAAsC,EACN,EAAE;IAClC,OAAO;QACL,MAAM,EAAE,kBAAkB,CAAC,KAAK;QAChC,UAAU,EAAE,QAAQ;QACpB,GAAG,OAAO;KACX,CAAC;AACJ,CAAC,CAAC;AARW,QAAA,8BAA8B,kCAQzC;AAEK,MAAM,iCAAiC,GAAG,CAC/C,OAAyC,EACN,EAAE;IACrC,OAAO;QACL,MAAM,EAAE,kBAAkB,CAAC,KAAK;QAChC,UAAU,EAAE,WAAW;QACvB,GAAG,OAAO;KACX,CAAC;AACJ,CAAC,CAAC;AARW,QAAA,iCAAiC,qCAQ5C;AAEF,IAAY,sBAGX;AAHD,WAAY,sBAAsB;IAChC,yCAAe,CAAA;IACf,qDAA2B,CAAA;AAC7B,CAAC,EAHW,sBAAsB,GAAtB,8BAAsB,KAAtB,8BAAsB,QAGjC"}
+{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../src/access/validation.ts"],"names":[],"mappings":";;;AAOA,IAAY,kBAOX;AAPD,WAAY,kBAAkB;IAC5B,qCAAe,CAAA;IACf,iEAA2C,CAAA;IAC3C,qEAA+C,CAAA;IAC/C,qEAA+C,CAAA;IAC/C,+FAAyE,CAAA;IACzE,6DAAuC,CAAA;AACzC,CAAC,EAPW,kBAAkB,GAAlB,0BAAkB,KAAlB,0BAAkB,QAO7B;AAoDM,MAAM,8BAA8B,GAAG,CAC5C,OAAsC,EACN,EAAE;IAClC,OAAO;QACL,MAAM,EAAE,kBAAkB,CAAC,KAAK;QAChC,UAAU,EAAE,QAAQ;QACpB,GAAG,OAAO;KACX,CAAC;AACJ,CAAC,CAAC;AARW,QAAA,8BAA8B,kCAQzC;AAEK,MAAM,iCAAiC,GAAG,CAC/C,OAAyC,EACN,EAAE;IACrC,OAAO;QACL,MAAM,EAAE,kBAAkB,CAAC,KAAK;QAChC,UAAU,EAAE,WAAW;QACvB,GAAG,OAAO;KACX,CAAC;AACJ,CAAC,CAAC;AARW,QAAA,iCAAiC,qCAQ5C;AAEF,IAAY,sBAGX;AAHD,WAAY,sBAAsB;IAChC,yCAAe,CAAA;IACf,qDAA2B,CAAA;AAC7B,CAAC,EAHW,sBAAsB,GAAtB,8BAAsB,KAAtB,8BAAsB,QAGjC"}

package/dist/account/index.d.ts

@@ -1,10 +1,9 @@
-import { BigNumber, ContractReceipt, ContractTransaction } from "ethers";
 import { TokenAmount } from "../token";
 import { Market } from "../market";
-import { MarketLenderStatusStructOutput, MarketDataWithLenderStatusStructOutput, LenderAccountDataStructOutput, MarketDataWithLenderStatusV2StructOutput, LenderAccountDataV2_5StructOutput, MarketDataWithLenderStatusV2_5StructOutput } from "../typechain";
-import { DepositRecord } from "../utils";
+import { MarketLenderStatusStructOutput, MarketDataWithLenderStatusStructOutput, LenderAccountDataStructOutput, MarketDataWithLenderStatusV2StructOutput, LenderAccountDataV2_5StructOutput, MarketDataWithLenderStatusV2_5StructOutput } from "../lens-types";
+import { DepositRecord, type BigintNumberish } from "../utils";
 import { SupportedChainId } from "../constants";
-import { HooksCredential, PartialTransaction, SignerOrProvider } from "../types";
+import { HooksCredential, PartialTransaction, SignerOrProvider, SubmittedTransactionResult, TransactionHash } from "../types";
 import { LenderWithdrawalStatus } from "../withdrawal-status";
 import { SubgraphAccountDataForLenderViewFragment, SubgraphDepositDataFragment } from "../gql/graphql";
 import { DepositStatus, CloseMarketPreview, SetAprPreview, QueueWithdrawalStatus, SetMaxTotalSupplyPreview, DepositPreview, QueueWithdrawalPreview, RepayPreview, ForceBuyBackPreview, SetMinimumDepositPreview, SetFixedTermEndTimePreview } from "./validation";
@@ -27,14 +26,14 @@ export type MarketAccountArgs = {
     isKnownLender?: boolean;
     /** For V1 markets - access level enum */
     role: LenderRole;
-    scaledMarketBalance: BigNumber;
+    scaledMarketBalance: bigint;
     marketBalance: TokenAmount;
     underlyingBalance: TokenAmount;
-    underlyingApproval: BigNumber;
+    underlyingApproval: bigint;
     market: Market;
     deposits?: SubgraphDepositDataFragment[];
     totalDeposited?: TokenAmount;
-    lastScaleFactor?: BigNumber;
+    lastScaleFactor?: bigint;
     lastUpdatedTimestamp?: number;
     totalInterestEarned?: TokenAmount;
     numPendingWithdrawalBatches?: number;
@@ -85,17 +84,17 @@ export declare class MarketAccount {
     previewSetFixedTermEndTime(endTime: number): SetFixedTermEndTimePreview;
     populateSetMinimumDeposit(amount: TokenAmount): Promise<PartialTransaction>;
     populateSetFixedTermEndTime(endTime: number): Promise<PartialTransaction>;
-    setMinimumDeposit(amount: TokenAmount): Promise<ContractTransaction>;
-    setFixedTermEndTime(endTime: number): Promise<ContractTransaction>;
-    closeMarket(): Promise<ContractTransaction>;
+    setMinimumDeposit(amount: TokenAmount): Promise<TransactionHash>;
+    setFixedTermEndTime(endTime: number): Promise<TransactionHash>;
+    closeMarket(): Promise<TransactionHash>;
     populateCloseMarket(): PartialTransaction;
-    setMaxTotalSupply(amount: TokenAmount): Promise<ContractTransaction>;
-    setAnnualInterestBips(newAprBips: number): Promise<ContractTransaction>;
+    setMaxTotalSupply(amount: TokenAmount): Promise<TransactionHash>;
+    setAnnualInterestBips(newAprBips: number): Promise<TransactionHash>;
     isApprovedFor(amount: TokenAmount): boolean;
-    approveMarket(amount: TokenAmount): Promise<ContractTransaction>;
+    approveMarket(amount: TokenAmount): Promise<TransactionHash>;
     populateApproveMarket(amount: TokenAmount): Promise<PartialTransaction>;
     previewForceBuyBack(lender: string, amount: TokenAmount): ForceBuyBackPreview;
-    forceBuyBack(lender: string, amount: TokenAmount): Promise<ContractTransaction>;
+    forceBuyBack(lender: string, amount: TokenAmount): Promise<TransactionHash>;
     populateForceBuyBack(lender: string, amount: TokenAmount): PartialTransaction;
     /**
      * @returns Maximum amount of underlying token user can deposit
@@ -109,18 +108,10 @@ export declare class MarketAccount {
     getDepositAmount(amount: TokenAmount): TokenAmount;
     previewDeposit(amount: TokenAmount): DepositPreview;
     populateDeposit(amount: TokenAmount): Promise<PartialTransaction>;
-    deposit(amount: TokenAmount): Promise<ContractTransaction>;
+    deposit(amount: TokenAmount): Promise<TransactionHash>;
     previewQueueWithdrawal(amount: TokenAmount): QueueWithdrawalPreview;
-    queueWithdrawal(amount: TokenAmount): Promise<{
-        withdrawal: LenderWithdrawalStatus;
-        transaction: ContractTransaction;
-        receipt: ContractReceipt;
-    }>;
-    queueFullWithdrawal(): Promise<{
-        withdrawal: LenderWithdrawalStatus;
-        transaction: ContractTransaction;
-        receipt: ContractReceipt;
-    }>;
+    queueWithdrawal(amount: TokenAmount): Promise<SubmittedTransactionResult<LenderWithdrawalStatus>>;
+    queueFullWithdrawal(): Promise<SubmittedTransactionResult<LenderWithdrawalStatus>>;
     get maximumRepay(): TokenAmount;
     get canRepayDelinquent(): boolean;
     get canRepayOutstanding(): boolean;
@@ -130,17 +121,17 @@ export declare class MarketAccount {
      */
     getRepayAmount(amount: TokenAmount): TokenAmount;
     previewRepay(amount: TokenAmount): RepayPreview;
-    repay(amount: BigNumber): Promise<ContractTransaction>;
-    populateRepay(amount: BigNumber): Promise<PartialTransaction>;
-    repayOutstandingDebt(): Promise<ContractTransaction>;
+    repay(amount: TokenAmount | BigintNumberish): Promise<TransactionHash>;
+    populateRepay(amount: TokenAmount | BigintNumberish): Promise<PartialTransaction>;
+    repayOutstandingDebt(): Promise<TransactionHash>;
     populateRepayOutstandingDebt(): Promise<PartialTransaction>;
-    repayDelinquentDebt(): Promise<ContractTransaction>;
+    repayDelinquentDebt(): Promise<TransactionHash>;
     populateRepayDelinquentDebt(): Promise<PartialTransaction>;
     /**
      * @returns Amount of underlying token borrower can borrow
      */
     getBorrowableAmount(amount: TokenAmount): TokenAmount;
-    borrow(amount: TokenAmount): Promise<ContractTransaction>;
+    borrow(amount: TokenAmount): Promise<TransactionHash>;
     update(): Promise<void>;
     updateWith(info: MarketLenderStatusStructOutput | LatestLenderAccountDataStructOutput): void;
     private calculateInterestEarned;

package/dist/account/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/account/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,mBAAmB,EAAE,MAAM,QAAQ,CAAC;AACzE,OAAO,EAAS,WAAW,EAAkB,MAAM,UAAU,CAAC;AAC9D,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EACL,8BAA8B,EAC9B,sCAAsC,EAEtC,6BAA6B,EAC7B,wCAAwC,EACxC,iCAAiC,EACjC,0CAA0C,EAG3C,MAAM,cAAc,CAAC;AAEtB,OAAO,EAEL,aAAa,EAMd,MAAM,UAAU,CAAC;AAClB,OAAO,EACL,gBAAgB,EAMjB,MAAM,cAAc,CAAC;AACtB,OAAO,EACL,eAAe,EAGf,kBAAkB,EAClB,gBAAgB,EACjB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAC9D,OAAO,EACL,wCAAwC,EACxC,2BAA2B,EAC5B,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,aAAa,EAEb,kBAAkB,EAClB,aAAa,EACb,qBAAqB,EAIrB,wBAAwB,EAExB,cAAc,EACd,sBAAsB,EACtB,YAAY,EACZ,mBAAmB,EAEnB,wBAAwB,EAGxB,0BAA0B,EAC3B,MAAM,cAAc,CAAC;AACtB,cAAc,cAAc,CAAC;AAE7B,oBAAY,UAAU;IACpB,IAAI,IAAI;IACR,OAAO,IAAI;IACX,YAAY,IAAI;IAChB,kBAAkB,IAAI;CACvB;AAOD,KAAK,mCAAmC,GACpC,6BAA6B,GAC7B,iCAAiC,CAAC;AAEtC,KAAK,gCAAgC,GACjC,sCAAsC,GACtC,wCAAwC,GACxC,0CAA0C,CAAC;AAE/C,MAAM,MAAM,iBAAiB,GAAG;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,gFAAgF;IAChF,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC,4DAA4D;IAC5D,UAAU,CAAC,EAAE,eAAe,CAAC;IAC7B,2EAA2E;IAC3E,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,yCAAyC;IACzC,IAAI,EAAE,UAAU,CAAC;IACjB,mBAAmB,EAAE,SAAS,CAAC;IAC/B,aAAa,EAAE,WAAW,CAAC;IAC3B,iBAAiB,EAAE,WAAW,CAAC;IAC/B,kBAAkB,EAAE,SAAS,CAAC;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,2BAA2B,EAAE,CAAC;IACzC,cAAc,CAAC,EAAE,WAAW,CAAC;IAC7B,eAAe,CAAC,EAAE,SAAS,CAAC;IAC5B,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,mBAAmB,CAAC,EAAE,WAAW,CAAC;IAClC,2BAA2B,CAAC,EAAE,MAAM,CAAC;IACrC,+DAA+D;IAC/D,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B,CAAC;AAGF,MAAM,WAAW,aAAc,SAAQ,IAAI,CAAC,iBAAiB,EAAE,UAAU,GAAG,kBAAkB,CAAC;CAAG;AAElG;;;;;;;GAOG;AACH,qBAAa,aAAa;IACjB,cAAc,EAAE,aAAa,EAAE,CAAC;IAEvC,+DAA+D;IAC/D,SAAS,CAAC,gBAAgB,CAAC,EAAE,OAAO,CAAC;gBAEzB,IAAI,EAAE,iBAAiB;IAOnC,+DAA+D;IAC/D,IAAI,iBAAiB,IAAI,OAAO,CAS/B;IAED,IAAI,OAAO,IAAI,gBAAgB,CAE9B;IAED,IAAI,cAAc,IAAI,OAAO,CAE5B;IAED,IAAI,wBAAwB,IAAI,OAAO,CAEtC;IAED,IAAI,UAAU,IAAI,OAAO,CAExB;IAED,IAAI,gBAAgB,IAAI,MAAM,GAAG,SAAS,CAKzC;IAED,IAAI,kBAAkB,IAAI,OAAO,CAGhC;IAED,qDAAqD;IACrD,IAAI,YAAY,IAAI,UAAU,GAAG,SAAS,CAWzC;IAED,IAAI,mBAAmB,IAAI,aAAa,CAwBvC;IAED,IAAI,sBAAsB,IAAI,qBAAqB,CA2BlD;IAED,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IAIlC;;;;;;;OAOG;IACH,+BAA+B,CAAC,iBAAiB,CAAC,EAAE,OAAO,GAAG,WAAW;IAUzE,kBAAkB,IAAI,kBAAkB;IAwCxC,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,aAAa;IAiDzC,wBAAwB,CAAC,MAAM,EAAE,WAAW,GAAG,wBAAwB;IAQvE,wBAAwB,CAAC,CAAC,EAAE,WAAW,GAAG,wBAAwB;IAOlE,0BAA0B,CAAC,OAAO,EAAE,MAAM,GAAG,0BAA0B;IAkBjE,yBAAyB,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAa3E,2BAA2B,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAazE,iBAAiB,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,mBAAmB,CAAC;IASpE,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAalE,WAAW,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAWjD,mBAAmB,IAAI,kBAAkB;IAoBnC,iBAAiB,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAYpE,qBAAqB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAuB7E,aAAa,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO;IAIrC,aAAa,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAShE,qBAAqB,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAoB7E,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,GAAG,mBAAmB;IAsBvE,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAOrF,oBAAoB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,GAAG,kBAAkB;IAgB7E;;;OAGG;IACH,IAAI,cAAc,IAAI,WAAW,CAEhC;IAED;;;OAGG;IACH,gBAAgB,CAAC,MAAM,EAAE,WAAW,GAAG,WAAW;IAIlD,cAAc,CAAC,MAAM,EAAE,WAAW,GAAG,cAAc;IAsB7C,eAAe,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAgBjE,OAAO,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAYhE,sBAAsB,CAAC,MAAM,EAAE,WAAW,GAAG,sBAAsB;IAS7D,eAAe,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC;QAClD,UAAU,EAAE,sBAAsB,CAAC;QACnC,WAAW,EAAE,mBAAmB,CAAC;QACjC,OAAO,EAAE,eAAe,CAAC;KAC1B,CAAC;IA6BI,mBAAmB,IAAI,OAAO,CAAC;QACnC,UAAU,EAAE,sBAAsB,CAAC;QACnC,WAAW,EAAE,mBAAmB,CAAC;QACjC,OAAO,EAAE,eAAe,CAAC;KAC1B,CAAC;IAuCF,IAAI,YAAY,IAAI,WAAW,CAE9B;IAED,IAAI,kBAAkB,IAAI,OAAO,CAEhC;IAED,IAAI,mBAAmB,IAAI,OAAO,CAEjC;IAED;;;OAGG;IACH,cAAc,CAAC,MAAM,EAAE,WAAW,GAAG,WAAW;IAIhD,YAAY,CAAC,MAAM,EAAE,WAAW,GAAG,YAAY;IAczC,KAAK,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAUtD,aAAa,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAc7D,oBAAoB,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAapD,4BAA4B,IAAI,OAAO,CAAC,kBAAkB,CAAC;IAiB3D,mBAAmB,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAanD,2BAA2B,IAAI,OAAO,CAAC,kBAAkB,CAAC;IAqBhE;;OAEG;IACH,mBAAmB,CAAC,MAAM,EAAE,WAAW,GAAG,WAAW;IAI/C,MAAM,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAgBzD,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAe7B,UAAU,CAAC,IAAI,EAAE,8BAA8B,GAAG,mCAAmC,GAAG,IAAI;IAoC5F,OAAO,CAAC,uBAAuB;IAU/B,sBAAsB,IAAI,IAAI;IAgB9B,MAAM,CAAC,uBAAuB,CAC5B,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,wCAAwC,GAC7C,aAAa;IA0BhB,MAAM,CAAC,sBAAsB,CAC3B,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,8BAA8B,EACpC,MAAM,EAAE,MAAM,GACb,aAAa;IAahB,MAAM,CAAC,qBAAqB,CAC1B,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,mCAAmC,GACxC,aAAa;WA4BH,8BAA8B,CACzC,OAAO,EAAE,gBAAgB,EACzB,QAAQ,EAAE,gBAAgB,EAC1B,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,gCAAgC,GACrC,OAAO,CAAC,aAAa,CAAC;WAqBZ,qBAAqB,CAChC,OAAO,EAAE,gBAAgB,EACzB,QAAQ,EAAE,gBAAgB,EAC1B,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,gCAAgC,EAAE,GACxC,OAAO,CAAC,aAAa,EAAE,CAAC;IAQ3B,MAAM,CAAC,kBAAkB,CACvB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,EACf,wBAAwB,EAAE,OAAO,GAChC,aAAa;IAahB;;;OAGG;WACU,gBAAgB,CAC3B,OAAO,EAAE,gBAAgB,EACzB,QAAQ,EAAE,gBAAgB,EAC1B,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,GAAG,MAAM,GACtB,OAAO,CAAC,aAAa,CAAC;IA0BzB;;;OAGG;WACU,kBAAkB,CAC7B,OAAO,EAAE,gBAAgB,EACzB,QAAQ,EAAE,gBAAgB,EAC1B,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,GAAG,MAAM,GACtB,OAAO,CAAC,aAAa,CAAC;IAazB;;;;OAIG;WACU,0BAA0B,CACrC,OAAO,EAAE,gBAAgB,EACzB,QAAQ,EAAE,gBAAgB,EAC1B,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,GAC3B,OAAO,CAAC,aAAa,EAAE,CAAC;IA8D3B;;;OAGG;WACU,6BAA6B,CACxC,OAAO,EAAE,gBAAgB,EACzB,QAAQ,EAAE,gBAAgB,EAC1B,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,aAAa,EAAE,CAAC;IAoB3B;;;;OAIG;WACU,0BAA0B,CACrC,OAAO,EAAE,gBAAgB,EACzB,QAAQ,EAAE,gBAAgB,EAC1B,OAAO,EAAE,MAAM,EACf,KAAK,oBAAI,EACT,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,aAAa,EAAE,CAAC;CA4B5B"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/account/index.ts"],"names":[],"mappings":"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"}