@wildcatfi/wildcat-sdk 3.0.2 → 3.0.4

package/dist/access/access-control.d.ts

@@ -1,6 +1,6 @@
 import { SupportedChainId } from "../constants";
 import { MarketParameters } from "../controller";
-import { SubgraphHooksInstanceDataForMarketFragment, SubgraphHooksTemplateDataForMarketFragment } from "../gql/graphql";
+import { SubgraphHooksInstanceDataFragment, SubgraphHooksTemplateDataFragment } from "../gql/graphql";
 import { TokenAmount } from "../token";
 import { HooksFactory, HooksFactory__factory, HooksInstanceDataStructOutput, HooksTemplateDataStructOutput, IOpenTermHooks, IOpenTermHooks__factory } from "../typechain";
 import { ContractWrapper, DepositAccess, FeeConfigurationV2, HooksKind, MarketHooksInstanceInputs, MarketParameterConstraints, RoleProvider, SignerOrProvider, TransferAccess, WithdrawalAccess } from "../types";
@@ -15,17 +15,19 @@ export declare class OpenTermHooks extends ContractWrapper<IOpenTermHooks> {
     constraints: MarketParameterConstraints;
     _contractAddress: string;
     constructor({ provider, roleProviders, constraints, ...args }: OpenTermHooksArgs);
-    static fromLensData(chainId: SupportedChainId, provider: SignerOrProvider, data: HooksInstanceDataStructOutput): OpenTermHooks;
-    static fromSubgraphData(chainId: SupportedChainId, provider: SignerOrProvider, data: SubgraphHooksInstanceDataForMarketFragment): OpenTermHooks;
+    updateWith(data: HooksInstanceDataStructOutput, signerAddress?: string, isRegisteredBorrower?: boolean): void;
+    static fromLensData(chainId: SupportedChainId, provider: SignerOrProvider, data: HooksInstanceDataStructOutput, signerAddress?: string, isRegisteredBorrower?: boolean): OpenTermHooks;
+    static fromSubgraphData(chainId: SupportedChainId, provider: SignerOrProvider, data: SubgraphHooksInstanceDataFragment, signerAddress?: string, isRegisteredBorrower?: boolean): OpenTermHooks;
 }
 export type OpenTermHooksArgs = {
     chainId: SupportedChainId;
     provider: SignerOrProvider;
-    templateAddress: string;
-    constraints?: MarketParameterConstraints;
     address: string;
+    hooksTemplate: OpenTermHooksTemplate;
+    constraints?: MarketParameterConstraints;
     borrower: string;
     roleProviders?: RoleProvider[];
+    name: string;
 };
 export type OpenTermHooksTemplateArgs = {
     signerAddress?: string;
@@ -45,8 +47,9 @@ export declare class OpenTermHooksTemplate extends ContractWrapper<HooksFactory>
     readonly contractFactory: typeof HooksFactory__factory;
     protected _contractAddress: string;
     constructor(chainId: SupportedChainId, provider: SignerOrProvider, args: OpenTermHooksTemplateArgs);
-    static fromSubgraphData(chainId: SupportedChainId, provider: SignerOrProvider, { feeRecipient, protocolFeeBips, disabled, id, name }: SubgraphHooksTemplateDataForMarketFragment, signerAddress?: string, isRegisteredBorrower?: boolean): OpenTermHooksTemplate;
+    updateWith(data: HooksTemplateDataStructOutput, signerAddress?: string, isRegisteredBorrower?: boolean): void;
     static fromLensData(chainId: SupportedChainId, provider: SignerOrProvider, data: HooksTemplateDataStructOutput, signerAddress?: string, isRegisteredBorrower?: boolean): OpenTermHooksTemplate;
+    static fromSubgraphData(chainId: SupportedChainId, provider: SignerOrProvider, { feeRecipient, protocolFeeBips, disabled, id, name, originationFeeAsset, originationFeeAmount }: SubgraphHooksTemplateDataFragment, signerAddress?: string, isRegisteredBorrower?: boolean): OpenTermHooksTemplate;
     previewDeployMarket({ hooksAddress, hooksInstanceName, existingProviders, newProviderInputs, roleProviderFactory, minimumDeposit, transferAccess, depositAccess, withdrawalAccess, asset, maxTotalSupply, salt, allowForceBuyBacks, ...otherParameters }: OpenTermMarketDeploymentArgs): DeployMarketPreview;
     deployMarket({ ...otherParameters }: OpenTermMarketDeploymentArgs): Promise<ContractTransaction>;
 }

package/dist/access/access-control.d.ts.map

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

package/dist/access/access-control.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.OpenTermHooksTemplate = exports.OpenTermHooks = void 0;
 const utils_1 = require("ethers/lib/utils");
 const constants_1 = require("../constants");
+const token_1 = require("../token");
 const typechain_1 = require("../typechain");
 const types_1 = require("../types");
 const utils_2 = require("../utils");
@@ -20,12 +21,26 @@ class OpenTermHooks extends types_1.ContractWrapper {
         this.roleProviders = roleProviders;
         this.constraints = constraints;
     }
-    static fromLensData(chainId, provider, data) {
+    updateWith(data, signerAddress, isRegisteredBorrower) {
+        this.hooksTemplate.updateWith(data.hooksTemplate, signerAddress, isRegisteredBorrower);
+        this.name = data.name;
+        this.roleProviders = [...data.pullProviders, ...data.pushProviders].map((p) => ({
+            isApproved: true,
+            providerAddress: p.providerAddress,
+            isPullProvider: p.pullProviderIndex !== NullProviderIndex,
+            pullProviderIndex: p.pullProviderIndex,
+            isPushProvider: p.pushProviderIndex !== NullProviderIndex,
+            pushProviderIndex: p.pushProviderIndex,
+            timeToLive: p.timeToLive
+        }));
+    }
+    static fromLensData(chainId, provider, data, signerAddress, isRegisteredBorrower) {
         return new OpenTermHooks({
             chainId,
             provider,
             address: data.hooksAddress,
-            templateAddress: data.hooksTemplate,
+            name: data.name,
+            hooksTemplate: OpenTermHooksTemplate.fromLensData(chainId, provider, data.hooksTemplate, signerAddress, isRegisteredBorrower),
             borrower: data.borrower,
             constraints: data.constraints,
             roleProviders: [...data.pullProviders, ...data.pushProviders].map((p) => ({
@@ -39,13 +54,14 @@ class OpenTermHooks extends types_1.ContractWrapper {
             }))
         });
     }
-    static fromSubgraphData(chainId, provider, data) {
+    static fromSubgraphData(chainId, provider, data, signerAddress, isRegisteredBorrower) {
         return new OpenTermHooks({
             chainId,
             provider,
             address: data.id,
             borrower: data.borrower,
-            templateAddress: data.hooksTemplate.id,
+            hooksTemplate: OpenTermHooksTemplate.fromSubgraphData(chainId, provider, data.hooksTemplate, signerAddress, isRegisteredBorrower),
+            name: data.name,
             roleProviders: data.providers.map((p) => ({
                 isApproved: p.isApproved,
                 providerAddress: p.providerAddress,
@@ -68,21 +84,14 @@ class OpenTermHooksTemplate extends types_1.ContractWrapper {
         Object.assign(this, args);
         this._contractAddress = (0, constants_1.getDeploymentAddress)(chainId, "HooksFactory");
     }
-    static fromSubgraphData(chainId, provider, { feeRecipient, protocolFeeBips, disabled, id, name }, signerAddress, isRegisteredBorrower) {
-        return new OpenTermHooksTemplate(chainId, provider, {
-            hooksTemplate: id,
-            fees: {
-                feeRecipient,
-                protocolFeeBips
-                // originationFeeAmount: rest.ori
-            },
-            enabled: !disabled,
-            index: 0,
-            name,
-            totalMarkets: 0,
-            signerAddress,
-            isRegisteredBorrower
-        });
+    updateWith(data, signerAddress, isRegisteredBorrower) {
+        this.fees = (0, utils_2.parseFeeConfigurationV2)(this.chainId, this.provider, data.fees);
+        this.enabled = data.enabled;
+        this.index = data.index;
+        this.name = data.name;
+        this.totalMarkets = data.totalMarkets.toNumber();
+        this.signerAddress = signerAddress;
+        this.isRegisteredBorrower = isRegisteredBorrower;
     }
     static fromLensData(chainId, provider, data, signerAddress, isRegisteredBorrower) {
         return new OpenTermHooksTemplate(chainId, provider, {
@@ -96,6 +105,30 @@ class OpenTermHooksTemplate extends types_1.ContractWrapper {
             isRegisteredBorrower
         });
     }
+    static fromSubgraphData(chainId, provider, { feeRecipient, protocolFeeBips, disabled, id, name, originationFeeAsset, originationFeeAmount }, signerAddress, isRegisteredBorrower) {
+        const originationFeeToken = originationFeeAsset
+            ? token_1.Token.fromSubgraphToken(chainId, originationFeeAsset, provider)
+            : undefined;
+        return new OpenTermHooksTemplate(chainId, provider, {
+            hooksTemplate: id,
+            fees: {
+                feeRecipient,
+                protocolFeeBips,
+                ...(originationFeeToken
+                    ? {
+                        originationFeeToken,
+                        originationFeeAmount: originationFeeToken.getAmount(originationFeeAmount)
+                    }
+                    : {})
+            },
+            enabled: !disabled,
+            index: 0,
+            name,
+            totalMarkets: 0,
+            signerAddress,
+            isRegisteredBorrower
+        });
+    }
     previewDeployMarket({ hooksAddress, hooksInstanceName, existingProviders, newProviderInputs, roleProviderFactory, minimumDeposit, transferAccess, depositAccess, withdrawalAccess, asset, maxTotalSupply, salt, allowForceBuyBacks, ...otherParameters }) {
         if (this.isRegisteredBorrower !== undefined && !this.isRegisteredBorrower) {
             return { status: validation_1.DeployMarketStatus.NotRegisteredBorrower };

package/dist/access/access-control.js.map

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

package/dist/access/fixed-term.d.ts

@@ -1,6 +1,6 @@
 import { SupportedChainId } from "../constants";
 import { MarketParameters } from "../controller";
-import { SubgraphHooksInstanceDataForMarketFragment, SubgraphHooksTemplateDataForMarketFragment } from "../gql/graphql";
+import { SubgraphHooksInstanceDataFragment, SubgraphHooksTemplateDataFragment } from "../gql/graphql";
 import { TokenAmount } from "../token";
 import { HooksFactory, HooksFactory__factory, HooksInstanceDataStructOutput, HooksTemplateDataStructOutput, IOpenTermHooks, IOpenTermHooks__factory } from "../typechain";
 import { ContractWrapper, DepositAccess, FeeConfigurationV2, HooksKind, MarketHooksInstanceInputs, MarketParameterConstraints, RoleProvider, SignerOrProvider, TransferAccess, WithdrawalAccess } from "../types";
@@ -15,17 +15,19 @@ export declare class FixedTermHooks extends ContractWrapper<IOpenTermHooks> {
     constraints: MarketParameterConstraints;
     _contractAddress: string;
     constructor({ provider, roleProviders, constraints, ...args }: FixedTermHooksArgs);
-    static fromLensData(chainId: SupportedChainId, provider: SignerOrProvider, data: HooksInstanceDataStructOutput): FixedTermHooks;
-    static fromSubgraphData(chainId: SupportedChainId, provider: SignerOrProvider, data: SubgraphHooksInstanceDataForMarketFragment): FixedTermHooks;
+    updateWith(data: HooksInstanceDataStructOutput, signerAddress?: string, isRegisteredBorrower?: boolean): void;
+    static fromLensData(chainId: SupportedChainId, provider: SignerOrProvider, data: HooksInstanceDataStructOutput, signerAddress?: string, isRegisteredBorrower?: boolean): FixedTermHooks;
+    static fromSubgraphData(chainId: SupportedChainId, provider: SignerOrProvider, data: SubgraphHooksInstanceDataFragment, signerAddress?: string, isRegisteredBorrower?: boolean): FixedTermHooks;
 }
 export type FixedTermHooksArgs = {
     chainId: SupportedChainId;
     provider: SignerOrProvider;
-    templateAddress: string;
-    constraints?: MarketParameterConstraints;
     address: string;
+    hooksTemplate: FixedTermHooksTemplate;
+    constraints?: MarketParameterConstraints;
     borrower: string;
     roleProviders?: RoleProvider[];
+    name: string;
 };
 export type FixedTermHooksTemplateArgs = {
     signerAddress?: string;
@@ -45,8 +47,9 @@ export declare class FixedTermHooksTemplate extends ContractWrapper<HooksFactory
     readonly contractFactory: typeof HooksFactory__factory;
     protected _contractAddress: string;
     constructor(chainId: SupportedChainId, provider: SignerOrProvider, args: FixedTermHooksTemplateArgs);
-    static fromSubgraphData(chainId: SupportedChainId, provider: SignerOrProvider, { feeRecipient, protocolFeeBips, disabled, id, name }: SubgraphHooksTemplateDataForMarketFragment, signerAddress?: string, isRegisteredBorrower?: boolean): FixedTermHooksTemplate;
+    updateWith(data: HooksTemplateDataStructOutput, signerAddress?: string, isRegisteredBorrower?: boolean): void;
     static fromLensData(chainId: SupportedChainId, provider: SignerOrProvider, data: HooksTemplateDataStructOutput, signerAddress?: string, isRegisteredBorrower?: boolean): FixedTermHooksTemplate;
+    static fromSubgraphData(chainId: SupportedChainId, provider: SignerOrProvider, { feeRecipient, protocolFeeBips, disabled, id, name, originationFeeAsset, originationFeeAmount }: SubgraphHooksTemplateDataFragment, signerAddress?: string, isRegisteredBorrower?: boolean): FixedTermHooksTemplate;
     previewDeployMarket({ hooksAddress, hooksInstanceName, existingProviders, newProviderInputs, roleProviderFactory, minimumDeposit, transferAccess, depositAccess, withdrawalAccess, asset, maxTotalSupply, salt, fixedTermEndTime, allowClosureBeforeTerm, allowTermReduction, allowForceBuyBacks, ...otherParameters }: FixedTermMarketDeploymentArgs): DeployMarketPreview;
     deployMarket({ ...otherParameters }: FixedTermMarketDeploymentArgs): Promise<ContractTransaction>;
 }

package/dist/access/fixed-term.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fixed-term.d.ts","sourceRoot":"","sources":["../../src/access/fixed-term.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"fixed-term.d.ts","sourceRoot":"","sources":["../../src/access/fixed-term.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,gBAAgB,EACjB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,EACL,iCAAiC,EACjC,iCAAiC,EAClC,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAS,WAAW,EAAE,MAAM,UAAU,CAAC;AAC9C,OAAO,EAEL,YAAY,EACZ,qBAAqB,EACrB,6BAA6B,EAC7B,6BAA6B,EAC7B,cAAc,EACd,uBAAuB,EACxB,MAAM,cAAc,CAAC;AACtB,OAAO,EACL,eAAe,EACf,aAAa,EACb,kBAAkB,EAClB,SAAS,EACT,yBAAyB,EACzB,0BAA0B,EAC1B,YAAY,EACZ,gBAAgB,EAChB,cAAc,EACd,gBAAgB,EACjB,MAAM,UAAU,CAAC;AAElB,OAAO,EAAwB,mBAAmB,EAAE,MAAM,QAAQ,CAAC;AACnE,OAAO,EAAE,mBAAmB,EAAsB,MAAM,cAAc,CAAC;AAIvE,MAAM,WAAW,cAAe,SAAQ,IAAI,CAAC,kBAAkB,EAAE,eAAe,GAAG,aAAa,CAAC;CAAG;AAIpG,qBAAa,cAAe,SAAQ,eAAe,CAAC,cAAc,CAAC;IACjE,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC,SAAS,CAAuB;IACzD,QAAQ,CAAC,eAAe,iCAA2B;IAC5C,aAAa,EAAE,YAAY,EAAE,CAAC;IAC9B,WAAW,EAAE,0BAA0B,CAAC;IACxC,gBAAgB,SAAgB;gBAE3B,EACV,QAAQ,EACR,aAAkB,EAClB,WAA2C,EAC3C,GAAG,IAAI,EACR,EAAE,kBAAkB;IAOrB,UAAU,CACR,IAAI,EAAE,6BAA6B,EACnC,aAAa,CAAC,EAAE,MAAM,EACtB,oBAAoB,CAAC,EAAE,OAAO,GAC7B,IAAI;IAcP,MAAM,CAAC,YAAY,CACjB,OAAO,EAAE,gBAAgB,EACzB,QAAQ,EAAE,gBAAgB,EAC1B,IAAI,EAAE,6BAA6B,EACnC,aAAa,CAAC,EAAE,MAAM,EACtB,oBAAoB,CAAC,EAAE,OAAO,GAC7B,cAAc;IA2BjB,MAAM,CAAC,gBAAgB,CACrB,OAAO,EAAE,gBAAgB,EACzB,QAAQ,EAAE,gBAAgB,EAC1B,IAAI,EAAE,iCAAiC,EACvC,aAAa,CAAC,EAAE,MAAM,EACtB,oBAAoB,CAAC,EAAE,OAAO,GAC7B,cAAc;CAyBlB;AAED,MAAM,MAAM,kBAAkB,GAAG;IAC/B,OAAO,EAAE,gBAAgB,CAAC;IAC1B,QAAQ,EAAE,gBAAgB,CAAC;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,sBAAsB,CAAC;IACtC,WAAW,CAAC,EAAE,0BAA0B,CAAC;IACzC,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,CAAC,EAAE,YAAY,EAAE,CAAC;IAC/B,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAAG;IACvC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,aAAa,EAAE,MAAM,CAAC;IACtB,IAAI,EAAE,kBAAkB,CAAC;IACzB,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAGF,MAAM,WAAW,sBAAuB,SAAQ,0BAA0B;CAAG;AAE7E,qBAAa,sBAAuB,SAAQ,eAAe,CAAC,YAAY,CAAC;IAM9D,OAAO,EAAE,gBAAgB;IALlC,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC,QAAQ,CAAsB;IACvD,QAAQ,CAAC,eAAe,+BAAyB;IACjD,SAAS,CAAC,gBAAgB,EAAE,MAAM,CAAC;gBAG1B,OAAO,EAAE,gBAAgB,EAChC,QAAQ,EAAE,gBAAgB,EAC1B,IAAI,EAAE,0BAA0B;IAOlC,UAAU,CACR,IAAI,EAAE,6BAA6B,EACnC,aAAa,CAAC,EAAE,MAAM,EACtB,oBAAoB,CAAC,EAAE,OAAO,GAC7B,IAAI;IAUP,MAAM,CAAC,YAAY,CACjB,OAAO,EAAE,gBAAgB,EACzB,QAAQ,EAAE,gBAAgB,EAC1B,IAAI,EAAE,6BAA6B,EACnC,aAAa,CAAC,EAAE,MAAM,EACtB,oBAAoB,CAAC,EAAE,OAAO,GAC7B,sBAAsB;IAazB,MAAM,CAAC,gBAAgB,CACrB,OAAO,EAAE,gBAAgB,EACzB,QAAQ,EAAE,gBAAgB,EAC1B,EACE,YAAY,EACZ,eAAe,EACf,QAAQ,EACR,EAAE,EACF,IAAI,EACJ,mBAAmB,EACnB,oBAAoB,EACrB,EAAE,iCAAiC,EACpC,aAAa,CAAC,EAAE,MAAM,EACtB,oBAAoB,CAAC,EAAE,OAAO,GAC7B,sBAAsB;IA0BzB,mBAAmB,CAAC,EAClB,YAAY,EACZ,iBAAiB,EACjB,iBAAiB,EACjB,iBAAiB,EACjB,mBAAmB,EACnB,cAAc,EACd,cAAc,EACd,aAAa,EACb,gBAAgB,EAChB,KAAK,EACL,cAAc,EACd,IAAI,EACJ,gBAAgB,EAChB,sBAAsB,EACtB,kBAAkB,EAClB,kBAAkB,EAClB,GAAG,eAAe,EACnB,EAAE,6BAA6B,GAAG,mBAAmB;IA4EtD,YAAY,CAAC,EACX,GAAG,eAAe,EACnB,EAAE,6BAA6B,GAAG,OAAO,CAAC,mBAAmB,CAAC;CAShE;AAED,MAAM,MAAM,6BAA6B,GAAG,gBAAgB,GAAG;IAC7D,oDAAoD;IACpD,IAAI,EAAE,MAAM,CAAC;IACb,qDAAqD;IACrD,gBAAgB,EAAE,MAAM,CAAC;IACzB,uCAAuC;IACvC,cAAc,CAAC,EAAE,WAAW,CAAC;IAC7B,kEAAkE;IAClE,cAAc,EAAE,cAAc,CAAC;IAC/B,8DAA8D;IAC9D,aAAa,EAAE,aAAa,CAAC;IAC7B,yEAAyE;IACzE,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,oEAAoE;IACpE,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,2DAA2D;IAC3D,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,uDAAuD;IACvD,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B,GAAG,yBAAyB,CAAC"}

package/dist/access/fixed-term.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FixedTermHooksTemplate = exports.FixedTermHooks = void 0;
 const utils_1 = require("ethers/lib/utils");
 const constants_1 = require("../constants");
+const token_1 = require("../token");
 const typechain_1 = require("../typechain");
 const types_1 = require("../types");
 const utils_2 = require("../utils");
@@ -20,12 +21,26 @@ class FixedTermHooks extends types_1.ContractWrapper {
         this.roleProviders = roleProviders;
         this.constraints = constraints;
     }
-    static fromLensData(chainId, provider, data) {
+    updateWith(data, signerAddress, isRegisteredBorrower) {
+        this.hooksTemplate.updateWith(data.hooksTemplate, signerAddress, isRegisteredBorrower);
+        this.name = data.name;
+        this.roleProviders = [...data.pullProviders, ...data.pushProviders].map((p) => ({
+            isApproved: true,
+            providerAddress: p.providerAddress,
+            isPullProvider: p.pullProviderIndex !== NullProviderIndex,
+            pullProviderIndex: p.pullProviderIndex,
+            isPushProvider: p.pushProviderIndex !== NullProviderIndex,
+            pushProviderIndex: p.pushProviderIndex,
+            timeToLive: p.timeToLive
+        }));
+    }
+    static fromLensData(chainId, provider, data, signerAddress, isRegisteredBorrower) {
         return new FixedTermHooks({
             chainId,
             provider,
             address: data.hooksAddress,
-            templateAddress: data.hooksTemplate,
+            name: data.name,
+            hooksTemplate: FixedTermHooksTemplate.fromLensData(chainId, provider, data.hooksTemplate, signerAddress, isRegisteredBorrower),
             borrower: data.borrower,
             constraints: data.constraints,
             roleProviders: [...data.pullProviders, ...data.pushProviders].map((p) => ({
@@ -39,13 +54,14 @@ class FixedTermHooks extends types_1.ContractWrapper {
             }))
         });
     }
-    static fromSubgraphData(chainId, provider, data) {
+    static fromSubgraphData(chainId, provider, data, signerAddress, isRegisteredBorrower) {
         return new FixedTermHooks({
             chainId,
             provider,
-            address: data.id,
             borrower: data.borrower,
-            templateAddress: data.hooksTemplate.id,
+            address: data.id,
+            hooksTemplate: FixedTermHooksTemplate.fromSubgraphData(chainId, provider, data.hooksTemplate, signerAddress, isRegisteredBorrower),
+            name: data.name,
             roleProviders: data.providers.map((p) => ({
                 isApproved: p.isApproved,
                 providerAddress: p.providerAddress,
@@ -68,21 +84,14 @@ class FixedTermHooksTemplate extends types_1.ContractWrapper {
         Object.assign(this, args);
         this._contractAddress = (0, constants_1.getDeploymentAddress)(chainId, "HooksFactory");
     }
-    static fromSubgraphData(chainId, provider, { feeRecipient, protocolFeeBips, disabled, id, name }, signerAddress, isRegisteredBorrower) {
-        return new FixedTermHooksTemplate(chainId, provider, {
-            hooksTemplate: id,
-            fees: {
-                feeRecipient,
-                protocolFeeBips
-                // originationFeeAmount: rest.ori
-            },
-            enabled: !disabled,
-            index: 0,
-            name,
-            totalMarkets: 0,
-            signerAddress,
-            isRegisteredBorrower
-        });
+    updateWith(data, signerAddress, isRegisteredBorrower) {
+        this.fees = (0, utils_2.parseFeeConfigurationV2)(this.chainId, this.provider, data.fees);
+        this.enabled = data.enabled;
+        this.index = data.index;
+        this.name = data.name;
+        this.totalMarkets = data.totalMarkets.toNumber();
+        this.signerAddress = signerAddress;
+        this.isRegisteredBorrower = isRegisteredBorrower;
     }
     static fromLensData(chainId, provider, data, signerAddress, isRegisteredBorrower) {
         return new FixedTermHooksTemplate(chainId, provider, {
@@ -96,6 +105,30 @@ class FixedTermHooksTemplate extends types_1.ContractWrapper {
             isRegisteredBorrower
         });
     }
+    static fromSubgraphData(chainId, provider, { feeRecipient, protocolFeeBips, disabled, id, name, originationFeeAsset, originationFeeAmount }, signerAddress, isRegisteredBorrower) {
+        const originationFeeToken = originationFeeAsset
+            ? token_1.Token.fromSubgraphToken(chainId, originationFeeAsset, provider)
+            : undefined;
+        return new FixedTermHooksTemplate(chainId, provider, {
+            hooksTemplate: id,
+            fees: {
+                feeRecipient,
+                protocolFeeBips,
+                ...(originationFeeToken
+                    ? {
+                        originationFeeToken,
+                        originationFeeAmount: originationFeeToken.getAmount(originationFeeAmount)
+                    }
+                    : {})
+            },
+            enabled: !disabled,
+            index: 0,
+            name,
+            totalMarkets: 0,
+            signerAddress,
+            isRegisteredBorrower
+        });
+    }
     previewDeployMarket({ hooksAddress, hooksInstanceName, existingProviders, newProviderInputs, roleProviderFactory, minimumDeposit, transferAccess, depositAccess, withdrawalAccess, asset, maxTotalSupply, salt, fixedTermEndTime, allowClosureBeforeTerm, allowTermReduction, allowForceBuyBacks, ...otherParameters }) {
         if (this.isRegisteredBorrower !== undefined && !this.isRegisteredBorrower) {
             return { status: validation_1.DeployMarketStatus.NotRegisteredBorrower };

package/dist/access/fixed-term.js.map

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

package/dist/access/index.d.ts

@@ -1,13 +1,16 @@
 import { SupportedChainId } from "../constants";
-import { SubgraphHooksTemplateDataForMarketFragment } from "../gql/graphql";
-import { HooksTemplateDataStructOutput } from "../typechain";
+import { SubgraphHooksInstanceDataFragment, SubgraphHooksTemplateDataFragment } from "../gql/graphql";
+import { HooksInstanceDataStructOutput, HooksTemplateDataStructOutput } from "../typechain";
 import { SignerOrProvider } from "../types";
-import { OpenTermHooksTemplate } from "./access-control";
-import { FixedTermHooksTemplate } from "./fixed-term";
+import { OpenTermHooks, OpenTermHooksTemplate } from "./access-control";
+import { FixedTermHooks, FixedTermHooksTemplate } from "./fixed-term";
 export * from "./access-control";
 export * from "./fixed-term";
 export * from "./validation";
 export type HooksTemplate = OpenTermHooksTemplate | FixedTermHooksTemplate;
-export declare function hooksTemplateFromSubgraph(chainId: SupportedChainId, provider: SignerOrProvider, data: SubgraphHooksTemplateDataForMarketFragment, signerAddress?: string, isRegisteredBorrower?: boolean): HooksTemplate;
+export type HooksInstance = OpenTermHooks | FixedTermHooks;
+export declare function hooksTemplateFromSubgraph(chainId: SupportedChainId, provider: SignerOrProvider, data: SubgraphHooksTemplateDataFragment, signerAddress?: string, isRegisteredBorrower?: boolean): HooksTemplate;
 export declare function hooksTemplateFromLens(chainId: SupportedChainId, provider: SignerOrProvider, data: HooksTemplateDataStructOutput, signerAddress?: string, isRegisteredBorrower?: boolean): HooksTemplate;
+export declare function hooksInstanceFromSubgraph(chainId: SupportedChainId, provider: SignerOrProvider, data: SubgraphHooksInstanceDataFragment, signerAddress?: string, isRegisteredBorrower?: boolean): HooksInstance;
+export declare function hooksInstanceFromLens(chainId: SupportedChainId, provider: SignerOrProvider, data: HooksInstanceDataStructOutput, signerAddress?: string, isRegisteredBorrower?: boolean): HooksInstance;
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/access/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAChD,OAAO,EAAE,0CAA0C,EAAE,MAAM,gBAAgB,CAAC;AAC5E,OAAO,EAAE,6BAA6B,EAAE,MAAM,cAAc,CAAC;AAC7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAC5C,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AAEtD,cAAc,kBAAkB,CAAC;AACjC,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC;AAE7B,MAAM,MAAM,aAAa,GAAG,qBAAqB,GAAG,sBAAsB,CAAC;AAE3E,wBAAgB,yBAAyB,CACvC,OAAO,EAAE,gBAAgB,EACzB,QAAQ,EAAE,gBAAgB,EAC1B,IAAI,EAAE,0CAA0C,EAChD,aAAa,CAAC,EAAE,MAAM,EACtB,oBAAoB,CAAC,EAAE,OAAO,GAC7B,aAAa,CAoBf;AAED,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,gBAAgB,EACzB,QAAQ,EAAE,gBAAgB,EAC1B,IAAI,EAAE,6BAA6B,EACnC,aAAa,CAAC,EAAE,MAAM,EACtB,oBAAoB,CAAC,EAAE,OAAO,GAC7B,aAAa,CAoBf"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/access/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAChD,OAAO,EACL,iCAAiC,EAEjC,iCAAiC,EAClC,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,6BAA6B,EAAE,6BAA6B,EAAE,MAAM,cAAc,CAAC;AAC5F,OAAO,EAAa,gBAAgB,EAAE,MAAM,UAAU,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AACxE,OAAO,EAAE,cAAc,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AAEtE,cAAc,kBAAkB,CAAC;AACjC,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC;AAE7B,MAAM,MAAM,aAAa,GAAG,qBAAqB,GAAG,sBAAsB,CAAC;AAE3E,MAAM,MAAM,aAAa,GAAG,aAAa,GAAG,cAAc,CAAC;AAE3D,wBAAgB,yBAAyB,CACvC,OAAO,EAAE,gBAAgB,EACzB,QAAQ,EAAE,gBAAgB,EAC1B,IAAI,EAAE,iCAAiC,EACvC,aAAa,CAAC,EAAE,MAAM,EACtB,oBAAoB,CAAC,EAAE,OAAO,GAC7B,aAAa,CAoBf;AAED,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,gBAAgB,EACzB,QAAQ,EAAE,gBAAgB,EAC1B,IAAI,EAAE,6BAA6B,EACnC,aAAa,CAAC,EAAE,MAAM,EACtB,oBAAoB,CAAC,EAAE,OAAO,GAC7B,aAAa,CAoBf;AAED,wBAAgB,yBAAyB,CACvC,OAAO,EAAE,gBAAgB,EACzB,QAAQ,EAAE,gBAAgB,EAC1B,IAAI,EAAE,iCAAiC,EACvC,aAAa,CAAC,EAAE,MAAM,EACtB,oBAAoB,CAAC,EAAE,OAAO,GAC7B,aAAa,CAoBf;AAED,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,gBAAgB,EACzB,QAAQ,EAAE,gBAAgB,EAC1B,IAAI,EAAE,6BAA6B,EACnC,aAAa,CAAC,EAAE,MAAM,EACtB,oBAAoB,CAAC,EAAE,OAAO,GAC7B,aAAa,CAcf"}

package/dist/access/index.js

@@ -14,7 +14,8 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.hooksTemplateFromLens = exports.hooksTemplateFromSubgraph = void 0;
+exports.hooksInstanceFromLens = exports.hooksInstanceFromSubgraph = exports.hooksTemplateFromLens = exports.hooksTemplateFromSubgraph = void 0;
+const graphql_1 = require("../gql/graphql");
 const access_control_1 = require("./access-control");
 const fixed_term_1 = require("./fixed-term");
 __exportStar(require("./access-control"), exports);
@@ -44,4 +45,28 @@ function hooksTemplateFromLens(chainId, provider, data, signerAddress, isRegiste
     }
 }
 exports.hooksTemplateFromLens = hooksTemplateFromLens;
+function hooksInstanceFromSubgraph(chainId, provider, data, signerAddress, isRegisteredBorrower) {
+    if (data.kind === graphql_1.SubgraphHooksKind.OpenTerm) {
+        return access_control_1.OpenTermHooks.fromSubgraphData(chainId, provider, data, signerAddress, isRegisteredBorrower);
+    }
+    else if (data.kind === graphql_1.SubgraphHooksKind.FixedTerm) {
+        return fixed_term_1.FixedTermHooks.fromSubgraphData(chainId, provider, data, signerAddress, isRegisteredBorrower);
+    }
+    else {
+        throw Error(`Unknown hooks template: ${name}`);
+    }
+}
+exports.hooksInstanceFromSubgraph = hooksInstanceFromSubgraph;
+function hooksInstanceFromLens(chainId, provider, data, signerAddress, isRegisteredBorrower) {
+    if (data.kind === 1) {
+        return access_control_1.OpenTermHooks.fromLensData(chainId, provider, data, signerAddress, isRegisteredBorrower);
+    }
+    else if (data.kind === 2) {
+        return fixed_term_1.FixedTermHooks.fromLensData(chainId, provider, data, signerAddress, isRegisteredBorrower);
+    }
+    else {
+        throw Error(`Unknown hooks template: ${name}`);
+    }
+}
+exports.hooksInstanceFromLens = hooksInstanceFromLens;
 //# sourceMappingURL=index.js.map

package/dist/access/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/access/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAIA,qDAAyD;AACzD,6CAAsD;AAEtD,mDAAiC;AACjC,+CAA6B;AAC7B,+CAA6B;AAI7B,SAAgB,yBAAyB,CACvC,OAAyB,EACzB,QAA0B,EAC1B,IAAgD,EAChD,aAAsB,EACtB,oBAA8B;IAE9B,IAAI,IAAI,CAAC,IAAI,KAAK,eAAe,EAAE;QACjC,OAAO,sCAAqB,CAAC,gBAAgB,CAC3C,OAAO,EACP,QAAQ,EACR,IAAI,EACJ,aAAa,EACb,oBAAoB,CACrB,CAAC;KACH;SAAM,IAAI,IAAI,CAAC,IAAI,KAAK,gBAAgB,EAAE;QACzC,OAAO,mCAAsB,CAAC,gBAAgB,CAC5C,OAAO,EACP,QAAQ,EACR,IAAI,EACJ,aAAa,EACb,oBAAoB,CACrB,CAAC;KACH;SAAM;QACL,MAAM,KAAK,CAAC,2BAA2B,IAAI,EAAE,CAAC,CAAC;KAChD;AACH,CAAC;AA1BD,8DA0BC;AAED,SAAgB,qBAAqB,CACnC,OAAyB,EACzB,QAA0B,EAC1B,IAAmC,EACnC,aAAsB,EACtB,oBAA8B;IAE9B,IAAI,IAAI,CAAC,IAAI,KAAK,eAAe,EAAE;QACjC,OAAO,sCAAqB,CAAC,YAAY,CACvC,OAAO,EACP,QAAQ,EACR,IAAI,EACJ,aAAa,EACb,oBAAoB,CACrB,CAAC;KACH;SAAM,IAAI,IAAI,CAAC,IAAI,KAAK,gBAAgB,EAAE;QACzC,OAAO,mCAAsB,CAAC,YAAY,CACxC,OAAO,EACP,QAAQ,EACR,IAAI,EACJ,aAAa,EACb,oBAAoB,CACrB,CAAC;KACH;SAAM;QACL,MAAM,KAAK,CAAC,2BAA2B,IAAI,EAAE,CAAC,CAAC;KAChD;AACH,CAAC;AA1BD,sDA0BC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/access/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AACA,4CAIwB;AAGxB,qDAAwE;AACxE,6CAAsE;AAEtE,mDAAiC;AACjC,+CAA6B;AAC7B,+CAA6B;AAM7B,SAAgB,yBAAyB,CACvC,OAAyB,EACzB,QAA0B,EAC1B,IAAuC,EACvC,aAAsB,EACtB,oBAA8B;IAE9B,IAAI,IAAI,CAAC,IAAI,KAAK,eAAe,EAAE;QACjC,OAAO,sCAAqB,CAAC,gBAAgB,CAC3C,OAAO,EACP,QAAQ,EACR,IAAI,EACJ,aAAa,EACb,oBAAoB,CACrB,CAAC;KACH;SAAM,IAAI,IAAI,CAAC,IAAI,KAAK,gBAAgB,EAAE;QACzC,OAAO,mCAAsB,CAAC,gBAAgB,CAC5C,OAAO,EACP,QAAQ,EACR,IAAI,EACJ,aAAa,EACb,oBAAoB,CACrB,CAAC;KACH;SAAM;QACL,MAAM,KAAK,CAAC,2BAA2B,IAAI,EAAE,CAAC,CAAC;KAChD;AACH,CAAC;AA1BD,8DA0BC;AAED,SAAgB,qBAAqB,CACnC,OAAyB,EACzB,QAA0B,EAC1B,IAAmC,EACnC,aAAsB,EACtB,oBAA8B;IAE9B,IAAI,IAAI,CAAC,IAAI,KAAK,eAAe,EAAE;QACjC,OAAO,sCAAqB,CAAC,YAAY,CACvC,OAAO,EACP,QAAQ,EACR,IAAI,EACJ,aAAa,EACb,oBAAoB,CACrB,CAAC;KACH;SAAM,IAAI,IAAI,CAAC,IAAI,KAAK,gBAAgB,EAAE;QACzC,OAAO,mCAAsB,CAAC,YAAY,CACxC,OAAO,EACP,QAAQ,EACR,IAAI,EACJ,aAAa,EACb,oBAAoB,CACrB,CAAC;KACH;SAAM;QACL,MAAM,KAAK,CAAC,2BAA2B,IAAI,EAAE,CAAC,CAAC;KAChD;AACH,CAAC;AA1BD,sDA0BC;AAED,SAAgB,yBAAyB,CACvC,OAAyB,EACzB,QAA0B,EAC1B,IAAuC,EACvC,aAAsB,EACtB,oBAA8B;IAE9B,IAAI,IAAI,CAAC,IAAI,KAAK,2BAAiB,CAAC,QAAQ,EAAE;QAC5C,OAAO,8BAAa,CAAC,gBAAgB,CACnC,OAAO,EACP,QAAQ,EACR,IAAI,EACJ,aAAa,EACb,oBAAoB,CACrB,CAAC;KACH;SAAM,IAAI,IAAI,CAAC,IAAI,KAAK,2BAAiB,CAAC,SAAS,EAAE;QACpD,OAAO,2BAAc,CAAC,gBAAgB,CACpC,OAAO,EACP,QAAQ,EACR,IAAI,EACJ,aAAa,EACb,oBAAoB,CACrB,CAAC;KACH;SAAM;QACL,MAAM,KAAK,CAAC,2BAA2B,IAAI,EAAE,CAAC,CAAC;KAChD;AACH,CAAC;AA1BD,8DA0BC;AAED,SAAgB,qBAAqB,CACnC,OAAyB,EACzB,QAA0B,EAC1B,IAAmC,EACnC,aAAsB,EACtB,oBAA8B;IAE9B,IAAI,IAAI,CAAC,IAAI,KAAK,CAAC,EAAE;QACnB,OAAO,8BAAa,CAAC,YAAY,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,aAAa,EAAE,oBAAoB,CAAC,CAAC;KACjG;SAAM,IAAI,IAAI,CAAC,IAAI,KAAK,CAAC,EAAE;QAC1B,OAAO,2BAAc,CAAC,YAAY,CAChC,OAAO,EACP,QAAQ,EACR,IAAI,EACJ,aAAa,EACb,oBAAoB,CACrB,CAAC;KACH;SAAM;QACL,MAAM,KAAK,CAAC,2BAA2B,IAAI,EAAE,CAAC,CAAC;KAChD;AACH,CAAC;AApBD,sDAoBC"}

package/dist/account/index.d.ts

@@ -61,6 +61,15 @@ export declare class MarketAccount {
     get depositAvailability(): DepositStatus;
     get withdrawalAvailability(): QueueWithdrawalStatus;
     canChangeAPR(apr: number): boolean;
+    /**
+     * Get the amount of the underlying asset needed to close the market, with some
+     * room for the interest that will accrue between now and the market's closure.
+     *
+     * If the amount is being calculated to check if the borrower already has a
+     * sufficient allowance, 10 minutes of interest is added; if it is to actually
+     * set the allowance, 2 hours of interest is added.
+     */
+    getApprovalAmountForCloseMarket(forAllowanceCheck?: boolean): TokenAmount;
     previewCloseMarket(): CloseMarketPreview;
     previewSetAPR(apr: number): SetAprPreview;
     previewSetMaxTotalSupply(amount: TokenAmount): SetMaxTotalSupplyPreview;

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

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

package/dist/account/index.js

@@ -116,9 +116,7 @@ class MarketAccount {
                 return validation_1.QueueWithdrawalStatus.MarketInClosedTerm;
             // Can not withdraw if market requires access and lender has no credential and is not a known lender
             if (config.flags.useOnQueueWithdrawal &&
-                (config.kind === types_1.HooksKind.FixedTerm
-                    ? config.queueWithdrawalRequiresAccess
-                    : config.flags.useOnQueueWithdrawal) &&
+                (config.kind === types_1.HooksKind.OpenTerm || config.queueWithdrawalRequiresAccess) &&
                 !(this.hasValidCredential || this.isKnownLender)) {
                 return validation_1.QueueWithdrawalStatus.RequiresAccess;
             }
@@ -128,6 +126,21 @@ class MarketAccount {
     canChangeAPR(apr) {
         return this.isBorrower && apr > 0 && apr <= 10000 && this.market.canChangeAPR(apr);
     }
+    /**
+     * Get the amount of the underlying asset needed to close the market, with some
+     * room for the interest that will accrue between now and the market's closure.
+     *
+     * If the amount is being calculated to check if the borrower already has a
+     * sufficient allowance, 10 minutes of interest is added; if it is to actually
+     * set the allowance, 2 hours of interest is added.
+     */
+    getApprovalAmountForCloseMarket(forAllowanceCheck) {
+        const baseAmount = this.market.outstandingDebt;
+        const interestForNextHour = this.market.underlyingToken.getAmount(this.market.totalSupply
+            .rayMul(this.market.effectiveBorrowerAPR)
+            .mulDiv(forAllowanceCheck ? 600 : 7200, utils_1.SECONDS_IN_365_DAYS));
+        return baseAmount.add(interestForNextHour);
+    }
     previewCloseMarket() {
         if (!this.isBorrower)
             return { status: validation_1.CloseMarketStatus.NotBorrower };
@@ -140,18 +153,17 @@ class MarketAccount {
                 return { status: validation_1.CloseMarketStatus.EarlyClosureNotAllowed };
             }
         }
-        // add 0.1% to account for interest
-        const amount = this.market.underlyingToken.getAmount((0, utils_1.bipMul)(this.market.outstandingDebt.raw, (0, token_1.toBn)(10010)));
+        // add interest to cover next hour
+        const amount = this.getApprovalAmountForCloseMarket();
         if (amount.gt(this.underlyingBalance)) {
             return { status: validation_1.CloseMarketStatus.InsufficientBalance, outstanding: amount };
         }
         if (this.market.unpaidWithdrawalBatchExpiries.length > 0) {
             return { status: validation_1.CloseMarketStatus.UnpaidWithdrawalBatches };
         }
-        if (
-        // @todo proper calculation
-        !this.isApprovedFor(this.market.underlyingToken.getAmount((0, utils_1.bipMul)(this.market.outstandingDebt.raw, (0, token_1.toBn)(10006))))) {
-            return { status: validation_1.CloseMarketStatus.InsufficientAllowance, outstanding: amount };
+        const minimumAllowance = this.getApprovalAmountForCloseMarket(true);
+        if (!this.isApprovedFor(minimumAllowance)) {
+            return { status: validation_1.CloseMarketStatus.InsufficientAllowance, outstanding: minimumAllowance };
         }
         return { status: validation_1.CloseMarketStatus.Ready };
     }