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

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

@@ -2,10 +2,12 @@ import { SupportedChainId } from "../constants";
 import { MarketParameters } from "../controller";
 import { SubgraphHooksInstanceDataFragment, SubgraphHooksTemplateDataFragment } from "../gql/graphql";
 import { TokenAmount } from "../token";
-import { HooksFactory, HooksFactory__factory, HooksInstanceDataStructOutput, HooksTemplateDataStructOutput, IPeriodicTermHooks, IPeriodicTermHooks__factory } from "../typechain";
+import { HooksFactory, HooksFactory__factory, HooksInstanceDataStructOutput, HooksInstanceDataV21StructOutput, HooksTemplateDataStructOutput, HooksTemplateDataV21StructOutput, IPeriodicTermHooks, IPeriodicTermHooks__factory } from "../typechain";
 import { AddLenderInput, ContractWrapper, DepositAccess, FeeConfigurationV2, HooksKind, MarketHooksInstanceInputs, MarketParameterConstraints, PartialTransaction, RoleProvider, SignerOrProvider, TransferAccess, WithdrawalAccess } from "../types";
 import { ContractTransaction } from "ethers";
 import { ChangeLenderRolePreview, DeployMarketPreview } from "./validation";
+type HooksInstanceData = HooksInstanceDataStructOutput | HooksInstanceDataV21StructOutput;
+type HooksTemplateData = HooksTemplateDataStructOutput | HooksTemplateDataV21StructOutput;
 export interface PeriodicTermHooks extends Omit<PeriodicTermHooksArgs, "roleProviders" | "constraints"> {
 }
 export declare class PeriodicTermHooks extends ContractWrapper<IPeriodicTermHooks> {
@@ -15,7 +17,7 @@ export declare class PeriodicTermHooks extends ContractWrapper<IPeriodicTermHook
     constraints: MarketParameterConstraints;
     protected get _contractAddress(): string;
     constructor({ provider, roleProviders, constraints, ...args }: PeriodicTermHooksArgs);
-    updateWith(data: HooksInstanceDataStructOutput, signerAddress?: string, isRegisteredBorrower?: boolean): void;
+    updateWith(data: HooksInstanceData, signerAddress?: string, isRegisteredBorrower?: boolean): void;
     previewAddLenders(_: AddLenderInput[]): ChangeLenderRolePreview;
     populateAddLenders(inputs: AddLenderInput[]): PartialTransaction;
     addLenders(inputs: AddLenderInput[]): Promise<ContractTransaction>;
@@ -24,7 +26,7 @@ export declare class PeriodicTermHooks extends ContractWrapper<IPeriodicTermHook
     previewUnblockLender(): ChangeLenderRolePreview;
     blockLenders(lenders: string[]): Promise<ContractTransaction>;
     populateUnblockLender(lender: string): PartialTransaction;
-    static fromLensData(chainId: SupportedChainId, provider: SignerOrProvider, data: HooksInstanceDataStructOutput, signerAddress?: string, isRegisteredBorrower?: boolean): PeriodicTermHooks;
+    static fromLensData(chainId: SupportedChainId, provider: SignerOrProvider, data: HooksInstanceData, signerAddress?: string, isRegisteredBorrower?: boolean): PeriodicTermHooks;
     static fromSubgraphData(chainId: SupportedChainId, provider: SignerOrProvider, data: SubgraphHooksInstanceDataFragment, signerAddress?: string, isRegisteredBorrower?: boolean): PeriodicTermHooks;
 }
 export type PeriodicTermHooksArgs = {
@@ -57,8 +59,8 @@ export declare class PeriodicTermHooksTemplate extends ContractWrapper<HooksFact
     readonly contractFactory: typeof HooksFactory__factory;
     protected _contractAddress: string;
     constructor(chainId: SupportedChainId, provider: SignerOrProvider, args: PeriodicTermHooksTemplateArgs);
-    updateWith(data: HooksTemplateDataStructOutput, signerAddress?: string, isRegisteredBorrower?: boolean): void;
-    static fromLensData(chainId: SupportedChainId, provider: SignerOrProvider, data: HooksTemplateDataStructOutput, signerAddress?: string, isRegisteredBorrower?: boolean): PeriodicTermHooksTemplate;
+    updateWith(data: HooksTemplateData, signerAddress?: string, isRegisteredBorrower?: boolean): void;
+    static fromLensData(chainId: SupportedChainId, provider: SignerOrProvider, data: HooksTemplateData, signerAddress?: string, isRegisteredBorrower?: boolean): PeriodicTermHooksTemplate;
     static fromSubgraphData(chainId: SupportedChainId, provider: SignerOrProvider, { feeRecipient, protocolFeeBips, disabled, id, name, originationFeeAsset, originationFeeAmount }: SubgraphHooksTemplateDataFragment, signerAddress?: string, isRegisteredBorrower?: boolean): PeriodicTermHooksTemplate;
     previewDeployMarket({ hooksAddress, hooksInstanceName, existingProviders, newProviderInputs, roleProviderFactory, minimumDeposit, transferAccess, depositAccess, withdrawalAccess, asset, maxTotalSupply, salt, firstWithdrawalWindowStart, periodDuration, withdrawalWindowDuration, ...otherParameters }: PeriodicTermMarketDeploymentArgs): DeployMarketPreview;
     deployMarket({ ...otherParameters }: PeriodicTermMarketDeploymentArgs): Promise<ContractTransaction>;
@@ -66,11 +68,11 @@ export declare class PeriodicTermHooksTemplate extends ContractWrapper<HooksFact
 export type PeriodicTermMarketDeploymentArgs = MarketParameters & {
     /** Create2 salt to use for the market deployment */
     salt: string;
-    /** Start time for the first withdrawal window */
+    /** First timestamp at which lenders can queue withdrawals */
     firstWithdrawalWindowStart: number;
-    /** Seconds between the start of each withdrawal window */
+    /** Length of each repeating withdrawal period in seconds */
     periodDuration: number;
-    /** Seconds each withdrawal window remains open */
+    /** Length of the withdrawal window inside each period in seconds */
     withdrawalWindowDuration: number;
     /** Minimum deposit lenders can make */
     minimumDeposit?: TokenAmount;
@@ -81,4 +83,5 @@ export type PeriodicTermMarketDeploymentArgs = MarketParameters & {
     /** Level of access required for a lender to make a withdrawal request */
     withdrawalAccess: WithdrawalAccess;
 } & MarketHooksInstanceInputs;
+export {};
 //# sourceMappingURL=periodic-term.d.ts.map

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

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

package/dist/access/periodic-term.js

@@ -36,16 +36,11 @@ class PeriodicTermHooks extends types_1.ContractWrapper {
             timeToLive: p.timeToLive
         }));
     }
-    /* ========================================================================== */
-    /*                                 addLenders                                 */
-    /* ========================================================================== */
     previewAddLenders(_) {
         if (this.signerAddress?.toLowerCase() !== this.borrower.toLowerCase()) {
             return { status: validation_1.ChangeLenderRoleStatus.NotBorrower };
         }
-        return {
-            status: validation_1.ChangeLenderRoleStatus.Ready
-        };
+        return { status: validation_1.ChangeLenderRoleStatus.Ready };
     }
     populateAddLenders(inputs) {
         const lenders = inputs.map((input) => input.lender);
@@ -73,16 +68,11 @@ class PeriodicTermHooks extends types_1.ContractWrapper {
             ? this.contract.grantRole(lenders[0], credentialTimestamps[0])
             : this.contract.grantRoles(lenders, credentialTimestamps);
     }
-    /* ========================================================================== */
-    /*                                blockLenders                                */
-    /* ========================================================================== */
     previewBlockLenders(_) {
         if (this.signerAddress?.toLowerCase() !== this.borrower.toLowerCase()) {
             return { status: validation_1.ChangeLenderRoleStatus.NotBorrower };
         }
-        return {
-            status: validation_1.ChangeLenderRoleStatus.Ready
-        };
+        return { status: validation_1.ChangeLenderRoleStatus.Ready };
     }
     populateBlockLenders(lenders) {
         return {
@@ -97,9 +87,7 @@ class PeriodicTermHooks extends types_1.ContractWrapper {
         if (this.signerAddress?.toLowerCase() !== this.borrower.toLowerCase()) {
             return { status: validation_1.ChangeLenderRoleStatus.NotBorrower };
         }
-        return {
-            status: validation_1.ChangeLenderRoleStatus.Ready
-        };
+        return { status: validation_1.ChangeLenderRoleStatus.Ready };
     }
     blockLenders(lenders) {
         const result = this.previewBlockLenders(lenders);
@@ -115,9 +103,6 @@ class PeriodicTermHooks extends types_1.ContractWrapper {
             value: "0"
         };
     }
-    /* ========================================================================== */
-    /*                               static builders                              */
-    /* ========================================================================== */
     static fromLensData(chainId, provider, data, signerAddress, isRegisteredBorrower) {
         return new PeriodicTermHooks({
             chainId,
@@ -143,10 +128,10 @@ class PeriodicTermHooks extends types_1.ContractWrapper {
         return new PeriodicTermHooks({
             chainId,
             provider,
-            address: data.id,
             borrower: data.borrower,
-            signerAddress,
+            address: data.id,
             hooksTemplate: PeriodicTermHooksTemplate.fromSubgraphData(chainId, provider, data.hooksTemplate, signerAddress, isRegisteredBorrower),
+            signerAddress,
             name: data.name,
             roleProviders: data.providers.map((p) => ({
                 isApproved: p.isApproved,
@@ -235,7 +220,7 @@ class PeriodicTermHooksTemplate extends types_1.ContractWrapper {
             return { status: validation_1.DeployMarketStatus.CreateProviderInputsWithoutFactory };
         }
         const hooksConfig = (0, utils_2.encodeHooksConfig)({
-            hooksAddress: hooksAddress,
+            hooksAddress,
             useOnDeposit: depositAccess === types_1.DepositAccess.RequiresCredential,
             useOnQueueWithdrawal: withdrawalAccess === types_1.WithdrawalAccess.RequiresCredential,
             useOnTransfer: transferAccess === types_1.TransferAccess.RequiresCredential
@@ -262,26 +247,24 @@ class PeriodicTermHooksTemplate extends types_1.ContractWrapper {
                 args: [parameters, hooksData, salt, originationFeeToken, originationFeeAmount]
             };
         }
-        else {
-            return {
-                status: validation_1.DeployMarketStatus.Ready,
-                fn: "deployMarketAndHooks",
-                args: [
-                    this.hooksTemplate,
-                    (0, utils_3.encodeMarketHooksInstanceInputs)({
-                        existingProviders,
-                        newProviderInputs,
-                        hooksInstanceName,
-                        roleProviderFactory
-                    }),
-                    parameters,
-                    hooksData,
-                    salt,
-                    originationFeeToken,
-                    originationFeeAmount
-                ]
-            };
-        }
+        return {
+            status: validation_1.DeployMarketStatus.Ready,
+            fn: "deployMarketAndHooks",
+            args: [
+                this.hooksTemplate,
+                (0, utils_3.encodeMarketHooksInstanceInputs)({
+                    existingProviders,
+                    newProviderInputs,
+                    hooksInstanceName,
+                    roleProviderFactory
+                }),
+                parameters,
+                hooksData,
+                salt,
+                originationFeeToken,
+                originationFeeAmount
+            ]
+        };
     }
     deployMarket({ ...otherParameters }) {
         const result = this.previewDeployMarket(otherParameters);
@@ -289,9 +272,7 @@ class PeriodicTermHooksTemplate extends types_1.ContractWrapper {
         if (result.fn === "deployMarket") {
             return this.contract.deployMarket(...result.args);
         }
-        else {
-            return this.contract.deployMarketAndHooks(...result.args);
-        }
+        return this.contract.deployMarketAndHooks(...result.args);
     }
 }
 exports.PeriodicTermHooksTemplate = PeriodicTermHooksTemplate;

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

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

package/dist/account/index.d.ts

@@ -1,13 +1,13 @@
 import { BigNumber, ContractReceipt, ContractTransaction } from "ethers";
 import { TokenAmount } from "../token";
 import { Market } from "../market";
-import { MarketLenderStatusStructOutput, MarketDataWithLenderStatusStructOutput, LenderAccountDataStructOutput, MarketDataWithLenderStatusV2StructOutput } from "../typechain";
+import { MarketLenderStatusStructOutput, MarketDataWithLenderStatusStructOutput, LenderAccountDataStructOutput, MarketDataWithLenderStatusV2StructOutput, LenderAccountDataV21StructOutput, MarketDataWithLenderStatusV21StructOutput } from "../typechain";
 import { DepositRecord } from "../utils";
 import { SupportedChainId } from "../constants";
 import { HooksCredential, PartialTransaction, SignerOrProvider } from "../types";
 import { LenderWithdrawalStatus } from "../withdrawal-status";
 import { SubgraphAccountDataForLenderViewFragment, SubgraphDepositDataFragment } from "../gql/graphql";
-import { DepositStatus, CloseMarketPreview, SetAprPreview, QueueWithdrawalStatus, SetMaxTotalSupplyPreview, DepositPreview, QueueWithdrawalPreview, RepayPreview, ForceBuyBackPreview, SetMinimumDepositPreview, ProposeAnnualInterestBipsPreview, SetFixedTermEndTimePreview } from "./validation";
+import { DepositStatus, CloseMarketPreview, SetAprPreview, QueueWithdrawalStatus, SetMaxTotalSupplyPreview, DepositPreview, QueueWithdrawalPreview, RepayPreview, ForceBuyBackPreview, SetMinimumDepositPreview, SetFixedTermEndTimePreview, ProposeAnnualInterestBipsPreview } from "./validation";
 export * from "./validation";
 export declare enum LenderRole {
     Null = 0,
@@ -78,16 +78,16 @@ export declare class MarketAccount {
     getApprovalAmountForCloseMarket(forAllowanceCheck?: boolean): TokenAmount;
     previewCloseMarket(): CloseMarketPreview;
     previewSetAPR(apr: number): SetAprPreview;
+    previewProposeAnnualInterestBips(apr: number): ProposeAnnualInterestBipsPreview;
     previewSetMaxTotalSupply(amount: TokenAmount): SetMaxTotalSupplyPreview;
     previewSetMinimumDeposit(_: TokenAmount): SetMinimumDepositPreview;
-    previewProposeAnnualInterestBips(apr: number): ProposeAnnualInterestBipsPreview;
     previewSetFixedTermEndTime(endTime: number): SetFixedTermEndTimePreview;
     populateSetMinimumDeposit(amount: TokenAmount): Promise<PartialTransaction>;
-    populateProposeAnnualInterestBips(apr: number): Promise<PartialTransaction>;
     populateSetFixedTermEndTime(endTime: number): Promise<PartialTransaction>;
     setMinimumDeposit(amount: TokenAmount): Promise<ContractTransaction>;
-    proposeAnnualInterestBips(apr: number): Promise<ContractTransaction>;
     setFixedTermEndTime(endTime: number): Promise<ContractTransaction>;
+    populateProposeAnnualInterestBips(apr: number): PartialTransaction;
+    proposeAnnualInterestBips(apr: number): Promise<ContractTransaction>;
     closeMarket(): Promise<ContractTransaction>;
     populateCloseMarket(): PartialTransaction;
     setMaxTotalSupply(amount: TokenAmount): Promise<ContractTransaction>;
@@ -143,13 +143,13 @@ export declare class MarketAccount {
     getBorrowableAmount(amount: TokenAmount): TokenAmount;
     borrow(amount: TokenAmount): Promise<ContractTransaction>;
     update(): Promise<void>;
-    updateWith(info: MarketLenderStatusStructOutput | LenderAccountDataStructOutput): void;
+    updateWith(info: MarketLenderStatusStructOutput | LenderAccountDataStructOutput | LenderAccountDataV21StructOutput): void;
     private calculateInterestEarned;
     processInterestAccrued(): void;
     static fromSubgraphAccountData(market: Market, data: SubgraphAccountDataForLenderViewFragment): MarketAccount;
     static fromMarketLenderStatus(account: string, info: MarketLenderStatusStructOutput, market: Market): MarketAccount;
-    static fromLenderAccountData(market: Market, data: LenderAccountDataStructOutput): MarketAccount;
-    static fromMarketDataWithLenderStatus(chainId: SupportedChainId, provider: SignerOrProvider, account: string, info: MarketDataWithLenderStatusStructOutput | MarketDataWithLenderStatusV2StructOutput): MarketAccount;
+    static fromLenderAccountData(market: Market, data: LenderAccountDataStructOutput | LenderAccountDataV21StructOutput): MarketAccount;
+    static fromMarketDataWithLenderStatus(chainId: SupportedChainId, provider: SignerOrProvider, account: string, info: MarketDataWithLenderStatusStructOutput | MarketDataWithLenderStatusV2StructOutput | MarketDataWithLenderStatusV21StructOutput): MarketAccount;
     static fromMarketDataOnly(market: Market, account: string, isAuthorizedOnController: boolean): MarketAccount;
     /**
      * Get a `MarketAccount` for a given account and existing `Market` instance.

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

@@ -137,7 +137,7 @@ class MarketAccount {
             if (this.market.isInFixedTerm)
                 return validation_1.QueueWithdrawalStatus.MarketInClosedTerm;
             if (config.kind === types_1.HooksKind.PeriodicTerm && !this.market.isPeriodicWithdrawalWindowOpen) {
-                return validation_1.QueueWithdrawalStatus.OutsideWithdrawalWindow;
+                return validation_1.QueueWithdrawalStatus.WithdrawalWindowClosed;
             }
             // Can not withdraw if market requires access and lender has no credential and is not a known lender
             if (config.flags.useOnQueueWithdrawal &&
@@ -204,17 +204,15 @@ class MarketAccount {
             return { status: validation_1.SetAprStatus.NotBorrower };
         if (!(apr > 0 && apr <= 10000))
             return { status: validation_1.SetAprStatus.InvalidApr };
-        if (this.market.version === types_1.MarketVersion.V2 &&
-            this.market.hooksConfig?.kind === types_1.HooksKind.PeriodicTerm &&
-            apr < this.market.annualInterestBips) {
-            const config = this.market.hooksConfig;
-            if (config.pendingAnnualInterestProposalTimestamp === 0) {
-                return { status: validation_1.SetAprStatus.NoPendingAprChange };
+        const config = this.market.hooksConfig;
+        if (config?.kind === types_1.HooksKind.PeriodicTerm && apr < this.market.annualInterestBips) {
+            if (config.pendingAprChangeProposalTimestamp === 0) {
+                return { status: validation_1.SetAprStatus.AprReductionNotProposed };
             }
-            if (config.pendingAnnualInterestBips !== apr) {
+            if (config.pendingAprChangeAnnualInterestBips !== apr) {
                 return { status: validation_1.SetAprStatus.AprChangeDoesNotMatchProposal };
             }
-            if (Math.floor(Date.now() / 1000) < config.pendingAnnualInterestResponseWindowEnd) {
+            if (Math.floor(Date.now() / 1000) < config.pendingAprChangeResponseWindowEnd) {
                 return { status: validation_1.SetAprStatus.AprChangeNotReady };
             }
             if (!this.market.scaledPendingWithdrawals.isZero()) {
@@ -262,33 +260,19 @@ class MarketAccount {
             };
         }
     }
-    previewSetMaxTotalSupply(amount) {
-        if (!this.isBorrower)
-            return { status: validation_1.SetMaxTotalSupplyStatus.NotBorrower };
-        if (this.market.version === types_1.MarketVersion.V1 && amount.lt(this.market.totalSupply)) {
-            return { status: validation_1.SetMaxTotalSupplyStatus.BelowCurrentSupply };
-        }
-        return { status: validation_1.SetMaxTotalSupplyStatus.Ready };
-    }
-    previewSetMinimumDeposit(_) {
-        if (this.market.version !== types_1.MarketVersion.V2)
-            return { status: validation_1.SetMinimumDepositStatus.NotV2Market };
-        if (!this.isBorrower)
-            return { status: validation_1.SetMinimumDepositStatus.NotBorrower };
-        return { status: validation_1.SetMinimumDepositStatus.Ready };
-    }
     previewProposeAnnualInterestBips(apr) {
         if (this.market.version !== types_1.MarketVersion.V2) {
             return { status: validation_1.ProposeAnnualInterestBipsStatus.NotV2Market };
         }
         if (!this.isBorrower)
             return { status: validation_1.ProposeAnnualInterestBipsStatus.NotBorrower };
-        if (this.market.hooksConfig?.kind !== types_1.HooksKind.PeriodicTerm) {
-            return { status: validation_1.ProposeAnnualInterestBipsStatus.NotPeriodicTermMarket };
-        }
         if (!(apr > 0 && apr <= 10000)) {
             return { status: validation_1.ProposeAnnualInterestBipsStatus.InvalidApr };
         }
+        const config = this.market.hooksConfig;
+        if (config?.kind !== types_1.HooksKind.PeriodicTerm) {
+            return { status: validation_1.ProposeAnnualInterestBipsStatus.NotPeriodicTermMarket };
+        }
         if (apr >= this.market.annualInterestBips) {
             return { status: validation_1.ProposeAnnualInterestBipsStatus.NotReduction };
         }
@@ -297,6 +281,21 @@ class MarketAccount {
         }
         return { status: validation_1.ProposeAnnualInterestBipsStatus.Ready };
     }
+    previewSetMaxTotalSupply(amount) {
+        if (!this.isBorrower)
+            return { status: validation_1.SetMaxTotalSupplyStatus.NotBorrower };
+        if (this.market.version === types_1.MarketVersion.V1 && amount.lt(this.market.totalSupply)) {
+            return { status: validation_1.SetMaxTotalSupplyStatus.BelowCurrentSupply };
+        }
+        return { status: validation_1.SetMaxTotalSupplyStatus.Ready };
+    }
+    previewSetMinimumDeposit(_) {
+        if (this.market.version !== types_1.MarketVersion.V2)
+            return { status: validation_1.SetMinimumDepositStatus.NotV2Market };
+        if (!this.isBorrower)
+            return { status: validation_1.SetMinimumDepositStatus.NotBorrower };
+        return { status: validation_1.SetMinimumDepositStatus.Ready };
+    }
     previewSetFixedTermEndTime(endTime) {
         if (this.market.version !== types_1.MarketVersion.V2)
             return { status: validation_1.SetFixedTermEndTimeStatus.NotV2Market };
@@ -328,18 +327,6 @@ class MarketAccount {
             value: "0"
         };
     }
-    async populateProposeAnnualInterestBips(apr) {
-        const { status } = this.previewProposeAnnualInterestBips(apr);
-        (0, utils_1.assert)(status === validation_1.ProposeAnnualInterestBipsStatus.Ready, `Cannot propose APR reduction: ${status}`);
-        const config = this.market.hooksConfig;
-        (0, utils_1.assert)(config !== undefined, `V2 market missing hooksConfig`);
-        const iface = typechain_1.IPeriodicTermHooks__factory.createInterface();
-        return {
-            to: config.hooksAddress,
-            data: iface.encodeFunctionData("proposeAnnualInterestBips", [this.market.address, apr]),
-            value: "0"
-        };
-    }
     async populateSetFixedTermEndTime(endTime) {
         const { status } = this.previewSetFixedTermEndTime(endTime);
         (0, utils_1.assert)(status === validation_1.SetFixedTermEndTimeStatus.Ready, `Cannot set fixed term end time: ${status}`);
@@ -360,14 +347,6 @@ class MarketAccount {
         const contract = typechain_1.IOpenTermHooks__factory.connect(config.hooksAddress, this.market.signer);
         return contract.setMinimumDeposit(this.market.address, amount.raw);
     }
-    async proposeAnnualInterestBips(apr) {
-        const { status } = this.previewProposeAnnualInterestBips(apr);
-        (0, utils_1.assert)(status === validation_1.ProposeAnnualInterestBipsStatus.Ready, `Cannot propose APR reduction: ${status}`);
-        const config = this.market.hooksConfig;
-        (0, utils_1.assert)(config !== undefined, `V2 market missing hooksConfig`);
-        const contract = typechain_1.IPeriodicTermHooks__factory.connect(config.hooksAddress, this.market.signer);
-        return contract.proposeAnnualInterestBips(this.market.address, apr);
-    }
     async setFixedTermEndTime(endTime) {
         const { status } = this.previewSetFixedTermEndTime(endTime);
         (0, utils_1.assert)(status === validation_1.SetFixedTermEndTimeStatus.Ready, `Cannot set fixed term end time: ${status}`);
@@ -376,6 +355,26 @@ class MarketAccount {
         const contract = typechain_1.IFixedTermHooks__factory.connect(config.hooksAddress, this.market.signer);
         return contract.setFixedTermEndTime(this.market.address, endTime);
     }
+    populateProposeAnnualInterestBips(apr) {
+        const { status } = this.previewProposeAnnualInterestBips(apr);
+        (0, utils_1.assert)(status === validation_1.ProposeAnnualInterestBipsStatus.Ready, `Cannot propose annual interest bips: ${status}`);
+        const config = this.market.hooksConfig;
+        (0, utils_1.assert)(config?.kind === types_1.HooksKind.PeriodicTerm, `Market is not periodic term`);
+        const iface = typechain_1.IPeriodicTermHooks__factory.createInterface();
+        return {
+            to: config.hooksAddress,
+            data: iface.encodeFunctionData("proposeAnnualInterestBips", [this.market.address, apr]),
+            value: "0"
+        };
+    }
+    async proposeAnnualInterestBips(apr) {
+        const { status } = this.previewProposeAnnualInterestBips(apr);
+        (0, utils_1.assert)(status === validation_1.ProposeAnnualInterestBipsStatus.Ready, `Cannot propose annual interest bips: ${status}`);
+        const config = this.market.hooksConfig;
+        (0, utils_1.assert)(config?.kind === types_1.HooksKind.PeriodicTerm, `Market is not periodic term`);
+        const contract = typechain_1.IPeriodicTermHooks__factory.connect(config.hooksAddress, this.market.signer);
+        return contract.proposeAnnualInterestBips(this.market.address, apr);
+    }
     /* -------------------------------------------------------------------------- */
     /*                             Management Actions                             */
     /* -------------------------------------------------------------------------- */