Merge pull request #51 from wildcat-finance/update-fixed-endtime-on-closure

Force useOnCloseMarket enabled for fixed duration markets

Author: laurenceday

src/access/FixedTermLoanHooks.sol

@@ -153,6 +153,7 @@ contract FixedTermLoanHooks is MarketConstraintHooks {
     });
     HooksConfig requiredFlags = EmptyHooksConfig
       .setFlag(Bit_Enabled_SetAnnualInterestAndReserveRatioBips)
+      .setFlag(Bit_Enabled_CloseMarket)
       .setFlag(Bit_Enabled_QueueWithdrawal);
     config = encodeHooksDeploymentConfig(optionalFlags, requiredFlags);
   }
@@ -943,7 +944,13 @@ contract FixedTermLoanHooks is MarketConstraintHooks {
   function onCloseMarket(
     MarketState calldata /* state */,
     bytes calldata /* hooksData */
-  ) external override {}
+  ) external override {
+      HookedMarket memory market = _hookedMarkets[msg.sender];
+      if (!market.isHooked) revert NotHookedMarket();
+      if (market.fixedTermEndTime > block.timestamp) {
+      _hookedMarkets[msg.sender].fixedTermEndTime = uint32(block.timestamp);
+    }
+  }
 
   function onNukeFromOrbit(
     address /* lender */,

test/access/FixedTermLoanHooks.t.sol

@@ -85,7 +85,7 @@ contract FixedTermLoanHooksTest is Test, Assertions, Prankster {
       useOnTransfer: true,
       useOnBorrow: false,
       useOnRepay: false,
-      useOnCloseMarket: false,
+      useOnCloseMarket: true,
       useOnNukeFromOrbit: false,
       useOnSetMaxTotalSupply: false,
       useOnSetAnnualInterestAndReserveRatioBips: true,
@@ -136,7 +136,7 @@ contract FixedTermLoanHooksTest is Test, Assertions, Prankster {
       useOnTransfer: true,
       useOnBorrow: false,
       useOnRepay: false,
-      useOnCloseMarket: false,
+      useOnCloseMarket: true,
       useOnNukeFromOrbit: false,
       useOnSetMaxTotalSupply: false,
       useOnSetAnnualInterestAndReserveRatioBips: true,
@@ -188,6 +188,7 @@ contract FixedTermLoanHooksTest is Test, Assertions, Prankster {
     });
     expectedConfig.required.useOnSetAnnualInterestAndReserveRatioBips = true;
     expectedConfig.required.useOnQueueWithdrawal = true;
+    expectedConfig.required.useOnCloseMarket = true;
     assertEq(hooks.config(), expectedConfig, 'config.');
   }
 
@@ -205,7 +206,7 @@ contract FixedTermLoanHooksTest is Test, Assertions, Prankster {
       useOnExecuteWithdrawal: false,
       useOnBorrow: false,
       useOnRepay: false,
-      useOnCloseMarket: false,
+      useOnCloseMarket: true,
       useOnNukeFromOrbit: false,
       useOnSetMaxTotalSupply: false,
       useOnSetAnnualInterestAndReserveRatioBips: false,
@@ -214,6 +215,7 @@ contract FixedTermLoanHooksTest is Test, Assertions, Prankster {
     StandardHooksConfig memory expectedConfig;
     expectedConfig.hooksAddress = address(hooks);
     expectedConfig.useOnQueueWithdrawal = true;
+    expectedConfig.useOnCloseMarket = true;
     expectedConfig.useOnTransfer = useOnTransfer || useOnQueueWithdrawal;
     expectedConfig.useOnDeposit = useOnDeposit || useOnQueueWithdrawal;
     expectedConfig.useOnSetAnnualInterestAndReserveRatioBips = true;
@@ -919,7 +921,7 @@ contract FixedTermLoanHooksTest is Test, Assertions, Prankster {
       useOnTransfer: true,
       useOnBorrow: false,
       useOnRepay: false,
-      useOnCloseMarket: false,
+      useOnCloseMarket: true,
       useOnNukeFromOrbit: false,
       useOnSetMaxTotalSupply: false,
       useOnSetAnnualInterestAndReserveRatioBips: true,