Merge pull request #343 from tranchess/dev-terry-redeem-br

Fix equivalent total supplies in MaturityFund
tranchess · Apr 7, 2024 · ebe30ad · ebe30ad
2 parents 8b72821 + 329d317
commit ebe30ad
Showing 1 changed file with 18 additions and 3 deletions.
diff --git a/contracts/fund/MaturityFund.sol b/contracts/fund/MaturityFund.sol
@@ -275,18 +275,33 @@ contract MaturityFund is
     }
 
     /// @notice Equivalent ROOK supply, as if all QUEEN are split.
-    function getEquivalentTotalR() public view override returns (uint256) {
+    function getEquivalentTotalR() public view override onlyNotFrozen returns (uint256) {
         return _totalSupplies[TRANCHE_Q].multiplyDecimal(splitRatio).add(_totalSupplies[TRANCHE_R]);
     }
 
     /// @notice Equivalent BISHOP supply, as if all QUEEN are split.
-    function getEquivalentTotalB() public view override returns (uint256) {
+    function getEquivalentTotalB() public view override onlyNotFrozen returns (uint256) {
         return getEquivalentTotalR().mul(weightB);
     }
 
     /// @notice Equivalent QUEEN supply, as if all BISHOP and ROOK are merged.
     function getEquivalentTotalQ() public view override returns (uint256) {
-        return _totalSupplies[TRANCHE_R].divideDecimal(splitRatio).add(_totalSupplies[TRANCHE_Q]);
+        if (!frozen) {
+            return
+                _totalSupplies[TRANCHE_R].divideDecimal(splitRatio).add(_totalSupplies[TRANCHE_Q]);
+        } else {
+            uint256 settledDay = getSettledDay();
+            uint256 navB = _historicalNavB[settledDay];
+            uint256 navR = _historicalNavR[settledDay];
+            uint256 navSum = navB.mul(weightB).add(navR);
+            uint256 amountQFromB = _totalSupplies[TRANCHE_B].mul(navB).div(navSum).divideDecimal(
+                splitRatio
+            );
+            uint256 amountQFromR = _totalSupplies[TRANCHE_R].mul(navR).div(navSum).divideDecimal(
+                splitRatio
+            );
+            return _totalSupplies[TRANCHE_Q].add(amountQFromB).add(amountQFromR);
+        }
     }
 
     /// @notice Return the rebalance matrix at a given index. A zero struct is returned