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

package/dist/constants.js

@@ -1,9 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DefaultV2ParameterConstraints = exports.getSubgraphClient = exports.SubgraphUrls = exports.getWrapperFactoryContract = exports.getCollateralFactoryContract = exports.getMockArchControllerOwnerContract = exports.getMockERC20Factory = exports.getLensV2Contract = exports.getHooksFactoryContract = exports.getCollateralLensContract = exports.getLensContract = exports.getArchControllerContract = exports.getControllerFactoryContract = exports.getControllerContract = exports.getDeploymentAddress = exports.Deployments = exports.hasDeploymentAddress = exports.isSupportedChainId = exports.SupportedChainIds = exports.SupportedChainId = void 0;
+exports.DefaultV2ParameterConstraints = exports.getSubgraphClient = exports.SubgraphUrls = exports.getWrapperFactoryContract = exports.getCollateralFactoryContract = exports.getMockArchControllerOwnerContract = exports.getMockERC20Factory = exports.getLatestLensContract = exports.getLensV2_5Contract = exports.getLensV2Contract = exports.getHooksFactoryContractForMarketType = exports.getHooksFactoryRevolvingContract = exports.getHooksFactoryContract = exports.getCollateralLensContract = exports.getLensContract = exports.getArchControllerContract = exports.getControllerFactoryContract = exports.getControllerContract = exports.getLatestLensAddress = exports.getLatestLensDeploymentName = exports.getMarketTypeForHooksFactory = exports.getHooksFactoryAddressForMarketType = exports.hasHooksFactoryDeployment = exports.getHooksFactoryDeploymentName = exports.getDeploymentAddress = exports.Deployments = exports.hasDeploymentAddress = exports.isSupportedChainId = exports.SupportedChainIds = exports.SupportedChainId = void 0;
 const typechain_1 = require("./typechain");
 const client_1 = require("@apollo/client");
 const utils_1 = require("./utils");
+const HooksFactoryDeploymentNamesByMarketType = {
+    legacy: "HooksFactory",
+    revolving: "HooksFactoryRevolving"
+};
 var SupportedChainId;
 (function (SupportedChainId) {
     SupportedChainId[SupportedChainId["Mainnet"] = 1] = "Mainnet";
@@ -42,9 +46,11 @@ exports.Deployments = {
         Wildcat4626WrapperFactory: "0xEA6DE11f8F3F83c79bD9d8Db5517fCFDf2Bb148a"
     },
     [SupportedChainId.Sepolia]: {
-        HooksFactory: "0x10A64ABa0159720F8a23E1A552800CA4eb21576C",
+        HooksFactory: "0xE3e4B7C9E0Ab4ccbC70e0583Dca7B4Db9B4CFD88",
+        HooksFactoryRevolving: "0xF4564015E524cf5629828E61F45ed339D998D85f",
         MarketLens: "0xb3925B31A8AeDCE8CFc885e0D5DAa057A1EA8A72",
         MarketLensV2: "0x5D8cEacEe19c06C3b4108b8Ae5B881eb0240B9c7",
+        MarketLensV2_5: "0x434Dc43a513b954C3A4D180abFCBe750c7A2c991",
         MockArchControllerOwner: "0xa476920af80B587f696734430227869795E2Ea78",
         MockChainalysis: "0x9d1060f8DEE8CBCf5eC772C51Ec671f70Cc7f8d9",
         MockERC20Factory: "0x54A3103904977DCb3C2fB782059F5431db90C96e",
@@ -85,6 +91,38 @@ const getDeploymentAddress = (chainId, name) => {
     return address;
 };
 exports.getDeploymentAddress = getDeploymentAddress;
+const getHooksFactoryDeploymentName = (marketType) => {
+    return HooksFactoryDeploymentNamesByMarketType[marketType];
+};
+exports.getHooksFactoryDeploymentName = getHooksFactoryDeploymentName;
+const hasHooksFactoryDeployment = (chainId, marketType) => {
+    return (0, exports.hasDeploymentAddress)(chainId, (0, exports.getHooksFactoryDeploymentName)(marketType));
+};
+exports.hasHooksFactoryDeployment = hasHooksFactoryDeployment;
+const getHooksFactoryAddressForMarketType = (chainId, marketType) => {
+    return (0, exports.getDeploymentAddress)(chainId, (0, exports.getHooksFactoryDeploymentName)(marketType));
+};
+exports.getHooksFactoryAddressForMarketType = getHooksFactoryAddressForMarketType;
+const getMarketTypeForHooksFactory = (chainId, hooksFactoryAddress) => {
+    const normalizedAddress = hooksFactoryAddress.toLowerCase();
+    for (const marketType of Object.keys(HooksFactoryDeploymentNamesByMarketType)) {
+        const deploymentName = (0, exports.getHooksFactoryDeploymentName)(marketType);
+        const deploymentAddress = exports.Deployments[chainId][deploymentName];
+        if (deploymentAddress?.toLowerCase() === normalizedAddress) {
+            return marketType;
+        }
+    }
+    return undefined;
+};
+exports.getMarketTypeForHooksFactory = getMarketTypeForHooksFactory;
+const getLatestLensDeploymentName = (chainId) => {
+    return (0, exports.hasDeploymentAddress)(chainId, "MarketLensV2_5") ? "MarketLensV2_5" : "MarketLensV2";
+};
+exports.getLatestLensDeploymentName = getLatestLensDeploymentName;
+const getLatestLensAddress = (chainId) => {
+    return (0, exports.getDeploymentAddress)(chainId, (0, exports.getLatestLensDeploymentName)(chainId));
+};
+exports.getLatestLensAddress = getLatestLensAddress;
 const getControllerContract = (provider, address) => {
     return typechain_1.WildcatMarketController__factory.connect(address, provider);
 };
@@ -109,10 +147,33 @@ const getHooksFactoryContract = (chainId, provider) => {
     return typechain_1.HooksFactory__factory.connect((0, exports.getDeploymentAddress)(chainId, "HooksFactory"), provider);
 };
 exports.getHooksFactoryContract = getHooksFactoryContract;
+const getHooksFactoryRevolvingContract = (chainId, provider) => {
+    return typechain_1.HooksFactoryRevolving__factory.connect((0, exports.getDeploymentAddress)(chainId, "HooksFactoryRevolving"), provider);
+};
+exports.getHooksFactoryRevolvingContract = getHooksFactoryRevolvingContract;
+const getHooksFactoryContractForMarketType = (chainId, marketType, provider) => {
+    if (marketType === "legacy") {
+        return (0, exports.getHooksFactoryContract)(chainId, provider);
+    }
+    return (0, exports.getHooksFactoryRevolvingContract)(chainId, provider);
+};
+exports.getHooksFactoryContractForMarketType = getHooksFactoryContractForMarketType;
 const getLensV2Contract = (chainId, provider) => {
     return typechain_1.MarketLensV2__factory.connect((0, exports.getDeploymentAddress)(chainId, "MarketLensV2"), provider);
 };
 exports.getLensV2Contract = getLensV2Contract;
+const getLensV2_5Contract = (chainId, provider) => {
+    return typechain_1.MarketLensV2_5__factory.connect((0, exports.getDeploymentAddress)(chainId, "MarketLensV2_5"), provider);
+};
+exports.getLensV2_5Contract = getLensV2_5Contract;
+const getLatestLensContract = (chainId, provider) => {
+    const deploymentName = (0, exports.getLatestLensDeploymentName)(chainId);
+    if (deploymentName === "MarketLensV2_5") {
+        return typechain_1.MarketLensV2_5__factory.connect((0, exports.getDeploymentAddress)(chainId, deploymentName), provider);
+    }
+    return typechain_1.MarketLensV2__factory.connect((0, exports.getDeploymentAddress)(chainId, deploymentName), provider);
+};
+exports.getLatestLensContract = getLatestLensContract;
 const getMockERC20Factory = (chainId, provider) => {
     return typechain_1.MockERC20Factory__factory.connect((0, exports.getDeploymentAddress)(chainId, "MockERC20Factory"), provider);
 };
@@ -130,7 +191,7 @@ const getWrapperFactoryContract = (chainId, provider) => {
 };
 exports.getWrapperFactoryContract = getWrapperFactoryContract;
 exports.SubgraphUrls = {
-    [SupportedChainId.Sepolia]: `https://api.goldsky.com/api/public/project_cmheai1ym00jyx7p27qn46qtm/subgraphs/sepolia/v2.0.23/gn`,
+    [SupportedChainId.Sepolia]: `https://api.goldsky.com/api/public/project_cmheai1ym00jyx7p27qn46qtm/subgraphs/sepolia/v2.0.28/gn`,
     [SupportedChainId.Mainnet]: "https://api.goldsky.com/api/public/project_cmheai1ym00jyx7p27qn46qtm/subgraphs/mainnet/v2.0.22/gn",
     [SupportedChainId.PlasmaTestnet]: "https://api.goldsky.com/api/public/project_cmheai1ym00jyx7p27qn46qtm/subgraphs/plasma-testnet/v2.0.22/gn",
     [SupportedChainId.PlasmaMainnet]: "https://api.goldsky.com/api/public/project_cmheai1ym00jyx7p27qn46qtm/subgraphs/plasma-mainnet/v2.0.22/gn"

package/dist/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":";;;AAAA,2CAqBqB;AAErB,2CAAoF;AACpF,mCAAiC;AAoBjC,IAAY,gBAKX;AALD,WAAY,gBAAgB;IAC1B,6DAAW,CAAA;IACX,oEAAkB,CAAA;IAClB,4EAAoB,CAAA;IACpB,4EAAoB,CAAA;AACtB,CAAC,EALW,gBAAgB,GAAhB,wBAAgB,KAAhB,wBAAgB,QAK3B;AAEY,QAAA,iBAAiB,GAAG;IAC/B,gBAAgB,CAAC,OAAO;IACxB,gBAAgB,CAAC,OAAO;IACxB,gBAAgB,CAAC,aAAa;IAC9B,gBAAgB,CAAC,aAAa;CAC/B,CAAC;AAEK,MAAM,kBAAkB,GAAG,CAAC,OAAe,EAA+B,EAAE;IACjF,OAAO,yBAAiB,CAAC,QAAQ,CAAC,OAA2B,CAAC,CAAC;AACjE,CAAC,CAAC;AAFW,QAAA,kBAAkB,sBAE7B;AAEK,MAAM,oBAAoB,GAAG,CAClC,OAAyB,EACzB,IAA8B,EACrB,EAAE;IACX,MAAM,WAAW,GAAG,mBAAW,CAAC,OAAO,CAAC,CAAC;IACzC,OAAO,WAAW,CAAC,IAAI,CAAC,KAAK,SAAS,CAAC;AACzC,CAAC,CAAC;AANW,QAAA,oBAAoB,wBAM/B;AAEW,QAAA,WAAW,GAAiD;IACvE,CAAC,gBAAgB,CAAC,OAAO,CAAC,EAAE;QAC1B,YAAY,EAAE,4CAA4C;QAC1D,UAAU,EAAE,4CAA4C;QACxD,YAAY,EAAE,4CAA4C;QAC1D,qBAAqB,EAAE,4CAA4C;QACnE,8BAA8B,EAAE,4CAA4C;QAC5E,wBAAwB,EAAE,4CAA4C;QACtE,WAAW,EAAE,4CAA4C;QACzD,sBAAsB,EAAE,4CAA4C;QACpE,uBAAuB,EAAE,4CAA4C;QACrE,wBAAwB,EAAE,4CAA4C;QACtE,cAAc,EAAE,4CAA4C;QAC5D,yBAAyB,EAAE,4CAA4C;KACxE;IACD,CAAC,gBAAgB,CAAC,OAAO,CAAC,EAAE;QAC1B,YAAY,EAAE,4CAA4C;QAC1D,UAAU,EAAE,4CAA4C;QACxD,YAAY,EAAE,4CAA4C;QAC1D,uBAAuB,EAAE,4CAA4C;QACrE,eAAe,EAAE,4CAA4C;QAC7D,gBAAgB,EAAE,4CAA4C;QAC9D,qBAAqB,EAAE,4CAA4C;QACnE,8BAA8B,EAAE,4CAA4C;QAC5E,wBAAwB,EAAE,4CAA4C;QACtE,WAAW,EAAE,4CAA4C;QACzD,sBAAsB,EAAE,4CAA4C;QACpE,wBAAwB,EAAE,4CAA4C;QACtE,uBAAuB,EAAE,4CAA4C;QACrE,cAAc,EAAE,4CAA4C;QAC5D,yBAAyB,EAAE,4CAA4C;KACxE;IACD,CAAC,gBAAgB,CAAC,aAAa,CAAC,EAAE;QAChC,YAAY,EAAE,4CAA4C;QAC1D,YAAY,EAAE,4CAA4C;QAC1D,uBAAuB,EAAE,4CAA4C;QACrE,eAAe,EAAE,4CAA4C;QAC7D,gBAAgB,EAAE,4CAA4C;QAC9D,qBAAqB,EAAE,4CAA4C;QACnE,wBAAwB,EAAE,4CAA4C;QACtE,WAAW,EAAE,4CAA4C;QACzD,sBAAsB,EAAE,4CAA4C;KACrE;IACD,CAAC,gBAAgB,CAAC,aAAa,CAAC,EAAE;QAChC,YAAY,EAAE,4CAA4C;QAC1D,YAAY,EAAE,4CAA4C;QAC1D,qBAAqB,EAAE,4CAA4C;QACnE,WAAW,EAAE,4CAA4C;QACzD,sBAAsB,EAAE,4CAA4C;QACpE,wBAAwB,EAAE,4CAA4C;KACvE;CACF,CAAC;AAEK,MAAM,oBAAoB,GAAG,CAClC,OAAyB,EACzB,IAA8B,EACtB,EAAE;IACV,MAAM,WAAW,GAAG,mBAAW,CAAC,OAAO,CAAC,CAAC;IACzC,MAAM,OAAO,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC;IAClC,IAAA,cAAM,EAAC,OAAO,KAAK,SAAS,EAAE,cAAc,IAAI,wBAAwB,OAAO,EAAE,CAAC,CAAC;IACnF,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC;AARW,QAAA,oBAAoB,wBAQ/B;AAEK,MAAM,qBAAqB,GAAG,CACnC,QAA0B,EAC1B,OAAe,EACU,EAAE;IAC3B,OAAO,4CAAgC,CAAC,OAAO,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;AACrE,CAAC,CAAC;AALW,QAAA,qBAAqB,yBAKhC;AAEK,MAAM,4BAA4B,GAAG,CAC1C,OAAyB,EACzB,QAA0B,EACM,EAAE;IAClC,OAAO,mDAAuC,CAAC,OAAO,CACpD,IAAA,4BAAoB,EAAC,OAAO,EAAE,gCAAgC,CAAC,EAC/D,QAAQ,CACT,CAAC;AACJ,CAAC,CAAC;AARW,QAAA,4BAA4B,gCAQvC;AAEK,MAAM,yBAAyB,GAAG,CACvC,OAAyB,EACzB,QAA0B,EACH,EAAE;IACzB,OAAO,0CAA8B,CAAC,OAAO,CAC3C,IAAA,4BAAoB,EAAC,OAAO,EAAE,uBAAuB,CAAC,EACtD,QAAQ,CACT,CAAC;AACJ,CAAC,CAAC;AARW,QAAA,yBAAyB,6BAQpC;AAEK,MAAM,eAAe,GAAG,CAC7B,OAAyB,EACzB,QAA0B,EACd,EAAE;IACd,OAAO,+BAAmB,CAAC,OAAO,CAAC,IAAA,4BAAoB,EAAC,OAAO,EAAE,YAAY,CAAC,EAAE,QAAQ,CAAC,CAAC;AAC5F,CAAC,CAAC;AALW,QAAA,eAAe,mBAK1B;AAEK,MAAM,yBAAyB,GAAG,CACvC,OAAyB,EACzB,QAA0B,EACV,EAAE;IAClB,OAAO,mCAAuB,CAAC,OAAO,CAAC,IAAA,4BAAoB,EAAC,OAAO,EAAE,gBAAgB,CAAC,EAAE,QAAQ,CAAC,CAAC;AACpG,CAAC,CAAC;AALW,QAAA,yBAAyB,6BAKpC;AAEK,MAAM,uBAAuB,GAAG,CACrC,OAAyB,EACzB,QAA0B,EACZ,EAAE;IAChB,OAAO,iCAAqB,CAAC,OAAO,CAAC,IAAA,4BAAoB,EAAC,OAAO,EAAE,cAAc,CAAC,EAAE,QAAQ,CAAC,CAAC;AAChG,CAAC,CAAC;AALW,QAAA,uBAAuB,2BAKlC;AAEK,MAAM,iBAAiB,GAAG,CAC/B,OAAyB,EACzB,QAA0B,EACZ,EAAE;IAChB,OAAO,iCAAqB,CAAC,OAAO,CAAC,IAAA,4BAAoB,EAAC,OAAO,EAAE,cAAc,CAAC,EAAE,QAAQ,CAAC,CAAC;AAChG,CAAC,CAAC;AALW,QAAA,iBAAiB,qBAK5B;AAEK,MAAM,mBAAmB,GAAG,CACjC,OAAyB,EACzB,QAA0B,EACR,EAAE;IACpB,OAAO,qCAAyB,CAAC,OAAO,CACtC,IAAA,4BAAoB,EAAC,OAAO,EAAE,kBAAkB,CAAC,EACjD,QAAQ,CACT,CAAC;AACJ,CAAC,CAAC;AARW,QAAA,mBAAmB,uBAQ9B;AAEK,MAAM,kCAAkC,GAAG,CAChD,OAAyB,EACzB,QAA0B,EACH,EAAE;IACzB,OAAO,0CAA8B,CAAC,OAAO,CAC3C,IAAA,4BAAoB,EAAC,OAAO,EAAE,yBAAyB,CAAC,EACxD,QAAQ,CACT,CAAC;AACJ,CAAC,CAAC;AARW,QAAA,kCAAkC,sCAQ7C;AAEK,MAAM,4BAA4B,GAAG,CAC1C,OAAyB,EACzB,QAA0B,EACA,EAAE;IAC5B,OAAO,6CAAiC,CAAC,OAAO,CAC9C,IAAA,4BAAoB,EAAC,OAAO,EAAE,0BAA0B,CAAC,EACzD,QAAQ,CACT,CAAC;AACJ,CAAC,CAAC;AARW,QAAA,4BAA4B,gCAQvC;AAEK,MAAM,yBAAyB,GAAG,CACvC,OAAyB,EACzB,QAA0B,EACC,EAAE;IAC7B,OAAO,8CAAkC,CAAC,OAAO,CAC/C,IAAA,4BAAoB,EAAC,OAAO,EAAE,2BAA2B,CAAC,EAC1D,QAAQ,CACT,CAAC;AACJ,CAAC,CAAC;AARW,QAAA,yBAAyB,6BAQpC;AAEW,QAAA,YAAY,GAAG;IAC1B,CAAC,gBAAgB,CAAC,OAAO,CAAC,EAAE,mGAAmG;IAC/H,CAAC,gBAAgB,CAAC,OAAO,CAAC,EACxB,mGAAmG;IACrG,CAAC,gBAAgB,CAAC,aAAa,CAAC,EAC9B,0GAA0G;IAC5G,CAAC,gBAAgB,CAAC,aAAa,CAAC,EAC9B,0GAA0G;CAC7G,CAAC;AAEK,MAAM,iBAAiB,GAAG,CAAC,OAAyB,EAAuC,EAAE,CAClG,IAAI,qBAAY,CAAC;IACf,KAAK,EAAE,IAAI,sBAAa,EAAE;IAC1B,GAAG,EAAE,oBAAY,CAAC,OAAO,CAAC;CAC3B,CAAC,CAAC;AAJQ,QAAA,iBAAiB,qBAIzB;AAEL,MAAM,GAAG,GAAG,KAAM,CAAC;AAEN,QAAA,6BAA6B,GAA+B;IACvE,6BAA6B,EAAE,CAAC;IAChC,6BAA6B,EAAE,EAAE,GAAG,GAAG;IACvC,uBAAuB,EAAE,CAAC;IAC1B,uBAAuB,EAAE,KAAM;IAC/B,yBAAyB,EAAE,CAAC;IAC5B,yBAAyB,EAAE,KAAM;IACjC,8BAA8B,EAAE,CAAC;IACjC,8BAA8B,EAAE,GAAG,GAAG,GAAG;IACzC,yBAAyB,EAAE,CAAC;IAC5B,yBAAyB,EAAE,KAAM;CAClC,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"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"}

package/dist/index.d.ts

@@ -19,10 +19,11 @@ export * from "./utils";
 export * as typechain from "./typechain";
 export * from "./gql";
 export * from "./wrapper";
-export declare const getMarket: typeof Market.getMarket, getMarkets: typeof Market.getMarkets, getAllMarkets: typeof Market.getAllMarkets, getMarketsCount: typeof Market.getMarketsCount, getPaginatedMarkets: typeof Market.getPaginatedMarkets;
+export { getBorrowerHooksData, type BorrowerHooksDataResult } from "./access";
+export declare const getMarket: typeof Market.getMarket, getMarketV2: typeof Market.getMarketV2, getMarkets: typeof Market.getMarkets, getAllMarkets: typeof Market.getAllMarkets, getMarketsCount: typeof Market.getMarketsCount, getPaginatedMarkets: typeof Market.getPaginatedMarkets;
 export declare const getWithdrawalBatch: typeof WithdrawalBatch.getWithdrawalBatch;
 export declare const getWithdrawalForLender: typeof LenderWithdrawalStatus.getWithdrawalForLender;
-export declare const getMarketAccount: typeof MarketAccount.getMarketAccount, getMarketAccountsForLender: typeof MarketAccount.getMarketAccountsForLender, getAllMarketAccountsForLender: typeof MarketAccount.getAllMarketAccountsForLender, getPaginatedMarketAccounts: typeof MarketAccount.getPaginatedMarketAccounts;
+export declare const getMarketAccount: typeof MarketAccount.getMarketAccount, getMarketAccountV2: typeof MarketAccount.getMarketAccountV2, getMarketAccountsForLender: typeof MarketAccount.getMarketAccountsForLender, getAllMarketAccountsForLender: typeof MarketAccount.getAllMarketAccountsForLender, getPaginatedMarketAccounts: typeof MarketAccount.getPaginatedMarketAccounts;
 export declare const getTokenData: typeof Token.getTokenData, getTokensData: typeof Token.getTokensData;
 export declare const deployToken: typeof TokenFactory.deployToken, populateDeployToken: typeof TokenFactory.populateDeployToken, getNextTokenAddress: typeof TokenFactory.getNextTokenAddress;
 export declare const getController: typeof MarketController.getController;

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAEhD,cAAc,WAAW,CAAC;AAC1B,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,cAAc,CAAC;AAC7B,cAAc,UAAU,CAAC;AACzB,cAAc,oBAAoB,CAAC;AACnC,cAAc,SAAS,CAAC;AACxB,cAAc,SAAS,CAAC;AACxB,cAAc,oBAAoB,CAAC;AACnC,cAAc,qBAAqB,CAAC;AACpC,cAAc,SAAS,CAAC;AACxB,OAAO,KAAK,SAAS,MAAM,aAAa,CAAC;AACzC,cAAc,OAAO,CAAC;AACtB,cAAc,WAAW,CAAC;AAE1B,eAAO,MAAQ,SAAS,2BAAE,UAAU,4BAAE,aAAa,+BAAE,eAAe,iCAAE,mBAAmB,mCACjF,CAAC;AAET,eAAO,MAAQ,kBAAkB,2CAAoB,CAAC;AAEtD,eAAO,MAAQ,sBAAsB,sDAA2B,CAAC;AAEjE,eAAO,MACL,gBAAgB,yCAChB,0BAA0B,mDAC1B,6BAA6B,sDAC7B,0BAA0B,iDACX,CAAC;AAElB,eAAO,MAAQ,YAAY,6BAAE,aAAa,4BAAU,CAAC;AAErD,eAAO,MAAQ,WAAW,mCAAE,mBAAmB,2CAAE,mBAAmB,yCAAiB,CAAC;AAEtF,eAAO,MAAQ,aAAa,uCAAqB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAEhD,cAAc,WAAW,CAAC;AAC1B,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,cAAc,CAAC;AAC7B,cAAc,UAAU,CAAC;AACzB,cAAc,oBAAoB,CAAC;AACnC,cAAc,SAAS,CAAC;AACxB,cAAc,SAAS,CAAC;AACxB,cAAc,oBAAoB,CAAC;AACnC,cAAc,qBAAqB,CAAC;AACpC,cAAc,SAAS,CAAC;AACxB,OAAO,KAAK,SAAS,MAAM,aAAa,CAAC;AACzC,cAAc,OAAO,CAAC;AACtB,cAAc,WAAW,CAAC;AAC1B,OAAO,EAAE,oBAAoB,EAAE,KAAK,uBAAuB,EAAE,MAAM,UAAU,CAAC;AAE9E,eAAO,MACL,SAAS,2BACT,WAAW,6BACX,UAAU,4BACV,aAAa,+BACb,eAAe,iCACf,mBAAmB,mCACX,CAAC;AAEX,eAAO,MAAQ,kBAAkB,2CAAoB,CAAC;AAEtD,eAAO,MAAQ,sBAAsB,sDAA2B,CAAC;AAEjE,eAAO,MACL,gBAAgB,yCAChB,kBAAkB,2CAClB,0BAA0B,mDAC1B,6BAA6B,sDAC7B,0BAA0B,iDACX,CAAC;AAElB,eAAO,MAAQ,YAAY,6BAAE,aAAa,4BAAU,CAAC;AAErD,eAAO,MAAQ,WAAW,mCAAE,mBAAmB,2CAAE,mBAAmB,yCAAiB,CAAC;AAEtF,eAAO,MAAQ,aAAa,uCAAqB,CAAC"}

package/dist/index.js

@@ -26,7 +26,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getController = exports.getNextTokenAddress = exports.populateDeployToken = exports.deployToken = exports.getTokensData = exports.getTokenData = exports.getPaginatedMarketAccounts = exports.getAllMarketAccountsForLender = exports.getMarketAccountsForLender = exports.getMarketAccount = exports.getWithdrawalForLender = exports.getWithdrawalBatch = exports.getPaginatedMarkets = exports.getMarketsCount = exports.getAllMarkets = exports.getMarkets = exports.getMarket = exports.typechain = void 0;
+exports.getController = exports.getNextTokenAddress = exports.populateDeployToken = exports.deployToken = exports.getTokensData = exports.getTokenData = exports.getPaginatedMarketAccounts = exports.getAllMarketAccountsForLender = exports.getMarketAccountsForLender = exports.getMarketAccountV2 = exports.getMarketAccount = exports.getWithdrawalForLender = exports.getWithdrawalBatch = exports.getPaginatedMarkets = exports.getMarketsCount = exports.getAllMarkets = exports.getMarkets = exports.getMarketV2 = exports.getMarket = exports.getBorrowerHooksData = exports.typechain = void 0;
 const account_1 = require("./account");
 const token_1 = require("./token");
 const market_1 = require("./market");
@@ -48,10 +48,12 @@ __exportStar(require("./utils"), exports);
 exports.typechain = __importStar(require("./typechain"));
 __exportStar(require("./gql"), exports);
 __exportStar(require("./wrapper"), exports);
-exports.getMarket = market_1.Market.getMarket, exports.getMarkets = market_1.Market.getMarkets, exports.getAllMarkets = market_1.Market.getAllMarkets, exports.getMarketsCount = market_1.Market.getMarketsCount, exports.getPaginatedMarkets = market_1.Market.getPaginatedMarkets;
+var access_1 = require("./access");
+Object.defineProperty(exports, "getBorrowerHooksData", { enumerable: true, get: function () { return access_1.getBorrowerHooksData; } });
+exports.getMarket = market_1.Market.getMarket, exports.getMarketV2 = market_1.Market.getMarketV2, exports.getMarkets = market_1.Market.getMarkets, exports.getAllMarkets = market_1.Market.getAllMarkets, exports.getMarketsCount = market_1.Market.getMarketsCount, exports.getPaginatedMarkets = market_1.Market.getPaginatedMarkets;
 exports.getWithdrawalBatch = withdrawal_batch_1.WithdrawalBatch.getWithdrawalBatch;
 exports.getWithdrawalForLender = withdrawal_status_1.LenderWithdrawalStatus.getWithdrawalForLender;
-exports.getMarketAccount = account_1.MarketAccount.getMarketAccount, exports.getMarketAccountsForLender = account_1.MarketAccount.getMarketAccountsForLender, exports.getAllMarketAccountsForLender = account_1.MarketAccount.getAllMarketAccountsForLender, exports.getPaginatedMarketAccounts = account_1.MarketAccount.getPaginatedMarketAccounts;
+exports.getMarketAccount = account_1.MarketAccount.getMarketAccount, exports.getMarketAccountV2 = account_1.MarketAccount.getMarketAccountV2, exports.getMarketAccountsForLender = account_1.MarketAccount.getMarketAccountsForLender, exports.getAllMarketAccountsForLender = account_1.MarketAccount.getAllMarketAccountsForLender, exports.getPaginatedMarketAccounts = account_1.MarketAccount.getPaginatedMarketAccounts;
 exports.getTokenData = token_1.Token.getTokenData, exports.getTokensData = token_1.Token.getTokensData;
 exports.deployToken = mockerc20factory_1.TokenFactory.deployToken, exports.populateDeployToken = mockerc20factory_1.TokenFactory.populateDeployToken, exports.getNextTokenAddress = mockerc20factory_1.TokenFactory.getNextTokenAddress;
 exports.getController = controller_1.MarketController.getController;

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAA0C;AAC1C,mCAAgC;AAChC,qCAAkC;AAClC,yDAAkD;AAClD,yDAAqD;AACrD,2DAA6D;AAC7D,6CAAgD;AAEhD,4CAA0B;AAC1B,+CAA6B;AAC7B,8CAA4B;AAC5B,+CAA6B;AAC7B,2CAAyB;AACzB,qDAAmC;AACnC,0CAAwB;AACxB,0CAAwB;AACxB,qDAAmC;AACnC,sDAAoC;AACpC,0CAAwB;AACxB,yDAAyC;AACzC,wCAAsB;AACtB,4CAA0B;AAEX,iBAAS,GACtB,eAAM,YADkB,kBAAU,GAClC,eAAM,aAD8B,qBAAa,GACjD,eAAM,gBAD6C,uBAAe,GAClE,eAAM,kBAD8D,2BAAmB,GACvF,eAAM,qBAAC;AAEM,0BAAkB,GAAK,kCAAe,oBAAC;AAEvC,8BAAsB,GAAK,0CAAsB,wBAAC;AAG/D,wBAAgB,GAId,uBAAa,mBAHf,kCAA0B,GAGxB,uBAAa,6BAFf,qCAA6B,GAE3B,uBAAa,gCADf,kCAA0B,GACxB,uBAAa,4BAAC;AAEH,oBAAY,GAAoB,aAAK,eAAvB,qBAAa,GAAK,aAAK,eAAC;AAEtC,mBAAW,GAA+C,+BAAY,cAAzD,2BAAmB,GAA0B,+BAAY,sBAApC,2BAAmB,GAAK,+BAAY,qBAAC;AAEvE,qBAAa,GAAK,6BAAgB,eAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAA0C;AAC1C,mCAAgC;AAChC,qCAAkC;AAClC,yDAAkD;AAClD,yDAAqD;AACrD,2DAA6D;AAC7D,6CAAgD;AAEhD,4CAA0B;AAC1B,+CAA6B;AAC7B,8CAA4B;AAC5B,+CAA6B;AAC7B,2CAAyB;AACzB,qDAAmC;AACnC,0CAAwB;AACxB,0CAAwB;AACxB,qDAAmC;AACnC,sDAAoC;AACpC,0CAAwB;AACxB,yDAAyC;AACzC,wCAAsB;AACtB,4CAA0B;AAC1B,mCAA8E;AAArE,8GAAA,oBAAoB,OAAA;AAG3B,iBAAS,GAMP,eAAM,YALR,mBAAW,GAKT,eAAM,cAJR,kBAAU,GAIR,eAAM,aAHR,qBAAa,GAGX,eAAM,gBAFR,uBAAe,GAEb,eAAM,kBADR,2BAAmB,GACjB,eAAM,qBAAC;AAEI,0BAAkB,GAAK,kCAAe,oBAAC;AAEvC,8BAAsB,GAAK,0CAAsB,wBAAC;AAG/D,wBAAgB,GAKd,uBAAa,mBAJf,0BAAkB,GAIhB,uBAAa,qBAHf,kCAA0B,GAGxB,uBAAa,6BAFf,qCAA6B,GAE3B,uBAAa,gCADf,kCAA0B,GACxB,uBAAa,4BAAC;AAEH,oBAAY,GAAoB,aAAK,eAAvB,qBAAa,GAAK,aAAK,eAAC;AAEtC,mBAAW,GAA+C,+BAAY,cAAzD,2BAAmB,GAA0B,+BAAY,sBAApC,2BAAmB,GAAK,+BAAY,qBAAC;AAEvE,qBAAa,GAAK,6BAAgB,eAAC"}

package/dist/market.d.ts

@@ -1,8 +1,8 @@
 import { BigNumber, ContractTransaction } from "ethers";
-import { MarketDataStructOutput, MarketDataV2StructOutput, WildcatMarket, WildcatMarket__factory } from "./typechain";
+import { MarketDataBaseV2_5StructOutput, MarketDataStructOutput, MarketDataV2StructOutput, WildcatMarket, WildcatMarket__factory } from "./typechain";
 import { SupportedChainId } from "./constants";
 import { TokenAmount, Token } from "./token";
-import { SignerOrProvider, ContractWrapper, PartialTransaction, MarketVersion, HooksKind, HooksConfig } from "./types";
+import { SignerOrProvider, ContractWrapper, PartialTransaction, MarketVersion, MarketType, HooksKind, HooksConfig } from "./types";
 import { MarketAccount } from "./account";
 import { LenderWithdrawalStatus } from "./withdrawal-status";
 import { SubgraphBorrowDataFragment, SubgraphDepositDataFragment, SubgraphFeesCollectedDataFragment, SubgraphMarketDataWithEventsFragment, SubgraphMarketDeployedEventFragment, SubgraphRepaymentDataFragment } from "./gql/graphql";
@@ -34,6 +34,8 @@ export type MarketArgs = {
     version: MarketVersion;
     marketToken: Token;
     underlyingToken: Token;
+    hooksFactory?: string;
+    marketType?: MarketType;
     hooksConfig?: HooksConfig;
     borrower: string;
     controller?: string;
@@ -167,10 +169,13 @@ export declare class Market extends ContractWrapper<WildcatMarket> {
      */
     getAccount(account?: string): Promise<MarketAccount>;
     update(): Promise<void>;
-    updateWith(data: MarketDataStructOutput | MarketDataV2StructOutput): void;
+    updateWith(data: MarketDataStructOutput | MarketDataV2StructOutput | MarketDataBaseV2_5StructOutput): void;
     static fromSubgraphMarketData(chainId: SupportedChainId, provider: SignerOrProvider, data: MakeOptional<SubgraphMarketDataWithEventsFragment, "depositRecords" | "repaymentRecords" | "borrowRecords" | "feeCollectionRecords">, signerAddress?: string): Market;
     static fromMarketData(chainId: SupportedChainId, data: MarketDataStructOutput, provider: SignerOrProvider, signerAddress?: string): Market;
-    static fromMarketDataV2(chainId: SupportedChainId, provider: SignerOrProvider, { hooks, hooksConfig: hooksConfigData, ...data }: MarketDataV2StructOutput): Market;
+    static fromMarketDataV2(chainId: SupportedChainId, provider: SignerOrProvider, { hooks, hooksConfig: hooksConfigData, ...data }: MarketDataV2StructOutput, signerAddress?: string): Market;
+    static fromMarketDataV2_5(chainId: SupportedChainId, provider: SignerOrProvider, { hooks, hooksConfig: hooksConfigData, ...data }: MarketDataBaseV2_5StructOutput, allowForceBuyBacks: boolean, signerAddress?: string): Market;
+    static resolveAllowForceBuyBacks(provider: SignerOrProvider, marketAddress: string, data: MarketDataBaseV2_5StructOutput): Promise<boolean>;
+    static fromUnifiedMarketData(chainId: SupportedChainId, provider: SignerOrProvider, data: MarketDataBaseV2_5StructOutput, signerAddress?: string): Promise<Market>;
     /**
      * @returns `Market` instance for `market`
      */

package/dist/market.d.ts.map

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

package/dist/market.js

@@ -11,6 +11,9 @@ const utils_1 = require("ethers/lib/utils");
 const account_1 = require("./account");
 const utils_2 = require("./utils");
 const access_1 = require("./access");
+const hasUnifiedLatestLensForDirectReads = (chainId) => {
+    return (0, constants_1.hasDeploymentAddress)(chainId, "MarketLensV2_5");
+};
 class Market extends types_1.ContractWrapper {
     get _contractAddress() {
         return this.address;
@@ -373,6 +376,21 @@ class Market extends types_1.ContractWrapper {
     /*                                   Updates                                  */
     /* -------------------------------------------------------------------------- */
     async update() {
+        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);
+                    this.updateWith(market);
+                    return;
+                }
+                catch (_) {
+                    // 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);
+            this.updateWith(market);
+            return;
+        }
         const market = await (0, constants_1.getLensContract)(this.chainId, this.provider).getMarketData(this.address);
         this.updateWith(market);
     }
@@ -417,6 +435,10 @@ class Market extends types_1.ContractWrapper {
         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!`);
             const config = this.hooksConfig;
@@ -447,7 +469,20 @@ class Market extends types_1.ContractWrapper {
         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`);
-            const { __typename: _, minimumDeposit: _minimumDeposit, depositRequiresAccess, transferRequiresAccess, queueWithdrawalRequiresAccess, allowClosureBeforeTerm, allowForceBuyBacks, allowTermReduction, fixedTermEndTime, transfersDisabled, ...flags } = data.hooksConfig;
+            const { minimumDeposit: _minimumDeposit, depositRequiresAccess, transferRequiresAccess, queueWithdrawalRequiresAccess, allowClosureBeforeTerm, allowForceBuyBacks, allowTermReduction, fixedTermEndTime, transfersDisabled } = data.hooksConfig;
+            const flags = {
+                useOnDeposit: data.hooksConfig.useOnDeposit,
+                useOnQueueWithdrawal: data.hooksConfig.useOnQueueWithdrawal,
+                useOnExecuteWithdrawal: data.hooksConfig.useOnExecuteWithdrawal,
+                useOnTransfer: data.hooksConfig.useOnTransfer,
+                useOnBorrow: data.hooksConfig.useOnBorrow,
+                useOnRepay: data.hooksConfig.useOnRepay,
+                useOnCloseMarket: data.hooksConfig.useOnCloseMarket,
+                useOnNukeFromOrbit: data.hooksConfig.useOnNukeFromOrbit,
+                useOnSetMaxTotalSupply: data.hooksConfig.useOnSetMaxTotalSupply,
+                useOnSetAnnualInterestAndReserveRatioBips: data.hooksConfig.useOnSetAnnualInterestAndReserveRatioBips,
+                useOnSetProtocolFeeBips: data.hooksConfig.useOnSetProtocolFeeBips
+            };
             const { id, hooksTemplate: hooksTemplateData } = data.hooks;
             const template = (0, access_1.hooksTemplateFromSubgraph)(chainId, provider, hooksTemplateData);
             const minimumDeposit = _minimumDeposit
@@ -587,7 +622,7 @@ class Market extends types_1.ContractWrapper {
             signerAddress: signerAddress
         });
     }
-    static fromMarketDataV2(chainId, provider, { hooks, hooksConfig: hooksConfigData, ...data }) {
+    static fromMarketDataV2(chainId, provider, { hooks, hooksConfig: hooksConfigData, ...data }, signerAddress) {
         const marketToken = token_1.Token.fromTokenMetadata(chainId, data.marketToken, provider);
         const underlyingToken = token_1.Token.fromTokenMetadata(chainId, data.underlyingToken, provider);
         const { hooksAddress } = hooks;
@@ -625,6 +660,8 @@ class Market extends types_1.ContractWrapper {
         }
         return new Market({
             provider,
+            hooksFactory: data.hooksFactory,
+            marketType: (0, constants_1.getMarketTypeForHooksFactory)(chainId, data.hooksFactory),
             hooksConfig,
             version: types_1.MarketVersion.V2,
             chainId: chainId,
@@ -656,10 +693,101 @@ class Market extends types_1.ContractWrapper {
             timeDelinquent: data.timeDelinquent.toNumber(),
             lastInterestAccruedTimestamp: data.lastInterestAccruedTimestamp.toNumber(),
             unpaidWithdrawalBatchExpiries: data.unpaidWithdrawalBatchExpiries,
-            coverageLiquidity: underlyingToken.getAmount(data.coverageLiquidity)
+            coverageLiquidity: underlyingToken.getAmount(data.coverageLiquidity),
+            signerAddress
             // borrowableAssets: underlyingToken.getAmount(data.borrowableAssets)
         });
     }
+    static fromMarketDataV2_5(chainId, provider, { hooks, hooksConfig: hooksConfigData, ...data }, allowForceBuyBacks, signerAddress) {
+        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) {
+            hooksConfig = {
+                kind: types_1.HooksKind.OpenTerm,
+                hooksAddress,
+                flags: { ...hooksConfigData.flags },
+                depositRequiresAccess: hooksConfigData.depositRequiresAccess,
+                transferRequiresAccess: hooksConfigData.transferRequiresAccess,
+                transfersDisabled: hooksConfigData.transfersDisabled,
+                minimumDeposit: underlyingToken.getAmount(hooksConfigData.minimumDeposit),
+                allowForceBuyBacks
+            };
+        }
+        else if (hooksConfigData.kind === 2) {
+            hooksConfig = {
+                kind: types_1.HooksKind.FixedTerm,
+                hooksAddress,
+                flags: { ...hooksConfigData.flags },
+                depositRequiresAccess: hooksConfigData.depositRequiresAccess,
+                transferRequiresAccess: hooksConfigData.transferRequiresAccess,
+                transfersDisabled: hooksConfigData.transfersDisabled,
+                minimumDeposit: underlyingToken.getAmount(hooksConfigData.minimumDeposit),
+                fixedTermEndTime: hooksConfigData.fixedTermEndTime,
+                queueWithdrawalRequiresAccess: hooksConfigData.withdrawalRequiresAccess,
+                allowTermReduction: hooksConfigData.allowTermReduction,
+                allowClosureBeforeTerm: hooksConfigData.allowClosureBeforeTerm,
+                allowForceBuyBacks
+            };
+        }
+        else {
+            throw Error(`Unknown hooks kind: ${hooks.hooksTemplate.name}, version #${hooksConfigData.kind}`);
+        }
+        return new Market({
+            provider,
+            hooksFactory: data.hooksFactory,
+            marketType: (0, constants_1.getMarketTypeForHooksFactory)(chainId, data.hooksFactory),
+            hooksConfig,
+            version: types_1.MarketVersion.V2,
+            chainId,
+            marketToken,
+            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(),
+            temporaryReserveRatio: data.temporaryReserveRatio,
+            originalAnnualInterestBips: data.originalAnnualInterestBips.toNumber(),
+            originalReserveRatioBips: data.originalReserveRatioBips.toNumber(),
+            temporaryReserveRatioExpiry: data.temporaryReserveRatioExpiry.toNumber(),
+            isClosed: data.isClosed,
+            scaleFactor: data.scaleFactor,
+            totalSupply: marketToken.getAmount(data.totalSupply),
+            maxTotalSupply: marketToken.getAmount(data.maxTotalSupply),
+            scaledTotalSupply: data.scaledTotalSupply,
+            totalAssets: underlyingToken.getAmount(data.totalAssets),
+            lastAccruedProtocolFees: underlyingToken.getAmount(data.lastAccruedProtocolFees),
+            normalizedUnclaimedWithdrawals: underlyingToken.getAmount(data.normalizedUnclaimedWithdrawals),
+            scaledPendingWithdrawals: data.scaledPendingWithdrawals,
+            pendingWithdrawalExpiry: data.pendingWithdrawalExpiry.toNumber(),
+            isDelinquent: data.isDelinquent,
+            timeDelinquent: data.timeDelinquent.toNumber(),
+            lastInterestAccruedTimestamp: data.lastInterestAccruedTimestamp.toNumber(),
+            unpaidWithdrawalBatchExpiries: data.unpaidWithdrawalBatchExpiries,
+            coverageLiquidity: underlyingToken.getAmount(data.coverageLiquidity),
+            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;
+        }
+        if (data.hooksConfig.kind === 2) {
+            const hookedMarket = await typechain_1.IFixedTermHooks__factory.connect(data.hooksConfig.hooksAddress, provider).getHookedMarket(marketAddress);
+            return hookedMarket.allowForceBuyBacks;
+        }
+        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);
+    }
     /* -------------------------------------------------------------------------- */
     /*                               Static Queries                               */
     /* -------------------------------------------------------------------------- */
@@ -667,53 +795,92 @@ 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;
+        if (hasUnifiedLatestLensForDirectReads(chainId)) {
+            try {
+                const data = await (0, constants_1.getLensV2_5Contract)(chainId, provider).getMarketData(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);
-        return Market.fromMarketData(chainId, data, provider, abstract_signer_1.Signer.isSigner(provider) ? await provider.getAddress() : undefined);
+        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;
+        if (hasUnifiedLatestLensForDirectReads(chainId)) {
+            try {
+                const data = await (0, constants_1.getLensV2_5Contract)(chainId, provider).getMarketData(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);
-        return Market.fromMarketDataV2(chainId, provider, data);
+        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;
+        if (hasUnifiedLatestLensForDirectReads(chainId)) {
+            try {
+                const data = await (0, constants_1.getLensV2_5Contract)(chainId, provider).getMarketsData(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 signerAddress = abstract_signer_1.Signer.isSigner(provider) ? await provider.getAddress() : undefined;
         return data.map((market) => Market.fromMarketData(chainId, market, provider, signerAddress));
     }
     /**
      * @return All deployed markets
      */
     static async getAllMarkets(chainId, provider) {
-        const lens = (0, constants_1.getLensContract)(chainId, provider);
-        const signerAddress = abstract_signer_1.Signer.isSigner(provider) ? await provider.getAddress() : undefined;
-        return lens
-            .getAllMarketsData()
-            .then((data) => data.map((market) => Market.fromMarketData(chainId, market, provider, signerAddress)));
+        const archController = (0, constants_1.getArchControllerContract)(chainId, provider);
+        const markets = await archController["getRegisteredMarkets()"]();
+        if (!markets.length) {
+            return [];
+        }
+        return Market.getMarkets(chainId, markets, provider);
     }
     /**
      * @dev Get a paginated list of deployed markets.
      */
     static async getPaginatedMarkets(chainId, provider, start = 0, count) {
-        const signerAddress = abstract_signer_1.Signer.isSigner(provider) ? await provider.getAddress() : undefined;
-        const lens = (0, constants_1.getLensContract)(chainId, provider);
-        return lens
-            .getPaginatedMarketsData(start, count)
-            .then((data) => data.map((market) => Market.fromMarketData(chainId, market, provider, signerAddress)));
+        if (count <= 0) {
+            return [];
+        }
+        const archController = (0, constants_1.getArchControllerContract)(chainId, provider);
+        const totalMarkets = (await archController.getRegisteredMarketsCount()).toNumber();
+        if (start >= totalMarkets) {
+            return [];
+        }
+        const end = Math.min(start + count, totalMarkets);
+        const markets = await archController["getRegisteredMarkets(uint256,uint256)"](start, end);
+        if (!markets.length) {
+            return [];
+        }
+        return Market.getMarkets(chainId, markets, provider);
     }
     /**
      * @return Total number of deployed markets.
      */
     static async getMarketsCount(chainId, provider) {
-        const lens = (0, constants_1.getLensContract)(chainId, provider);
-        return lens.getMarketsCount().then((count) => count.toNumber());
+        const archController = (0, constants_1.getArchControllerContract)(chainId, provider);
+        return archController.getRegisteredMarketsCount().then((count) => count.toNumber());
     }
 }
 exports.Market = Market;