Merge pull request #122 from Convexity-Research/fix/missing-redemptio…

…n-oracle-check

fix: missing commit for checking observable price at redeem

src/Pool.sol

@@ -5,6 +5,7 @@ import {Utils} from "./lib/Utils.sol";
 import {Auction} from "./Auction.sol";
 import {BondToken} from "./BondToken.sol";
 import {Decimals} from "./lib/Decimals.sol";
+import {OracleFeeds} from "./OracleFeeds.sol";
 import {Distributor} from "./Distributor.sol";
 import {PoolFactory} from "./PoolFactory.sol";
 import {Validator} from "./utils/Validator.sol";
@@ -437,14 +438,27 @@ contract Pool is Initializable, PausableUpgradeable, ReentrancyGuardUpgradeable,
       depositAmount = depositAmount.normalizeTokenAmount(address(bondToken), COMMON_DECIMALS);
     }
 
+    uint8 oracleDecimals = getOracleDecimals(reserveToken, USD);
+
+    uint256 marketRate;
+    address feed = OracleFeeds(oracleFeeds).priceFeeds(address(bondToken), USD);
+    if (feed != address(0)) {
+      marketRate = getOraclePrice(address(bondToken), USD)
+        .normalizeAmount(
+          getOracleDecimals(address(bondToken), USD), 
+          oracleDecimals // this is the decimals of the reserve token chainlink feed
+        );
+    }
+
     return getRedeemAmount(
       tokenType,
       depositAmount,
       bondSupply,
       levSupply,
       poolReserves,
       getOraclePrice(reserveToken, USD),
-      getOracleDecimals(reserveToken, USD)
+      oracleDecimals,
+      marketRate
     ).normalizeAmount(COMMON_DECIMALS, IERC20(reserveToken).safeDecimals());
   }
 
@@ -457,6 +471,7 @@ contract Pool is Initializable, PausableUpgradeable, ReentrancyGuardUpgradeable,
    * @param poolReserves The total amount of reserve tokens in the pool.
    * @param ethPrice The current ETH price from the oracle.
    * @param oracleDecimals The number of decimals used by the oracle.
+   * @param marketRate The current market rate of the bond token.
    * @return amount of reserve tokens to be redeemed.
    */
   function getRedeemAmount(
@@ -466,7 +481,8 @@ contract Pool is Initializable, PausableUpgradeable, ReentrancyGuardUpgradeable,
     uint256 levSupply,
     uint256 poolReserves,
     uint256 ethPrice,
-    uint8 oracleDecimals
+    uint8 oracleDecimals,
+    uint256 marketRate
   ) public pure returns(uint256) {
     if (bondSupply == 0) {
       revert ZeroDebtSupply();
@@ -499,6 +515,10 @@ contract Pool is Initializable, PausableUpgradeable, ReentrancyGuardUpgradeable,
     } else {
       redeemRate = BOND_TARGET_PRICE * PRECISION;
     }
+
+    if (marketRate != 0 && marketRate < redeemRate) {
+      redeemRate = marketRate;
+    }
 
     // Calculate and return the final redeem amount
     return ((depositAmount * redeemRate).fromBaseUnit(oracleDecimals) / ethPrice) / PRECISION;

test/Pool.t.sol

@@ -428,7 +428,8 @@ contract PoolTest is Test, TestCases {
         calcTestCases[i].LeverageAssets, 
         calcTestCases[i].TotalUnderlyingAssets, 
         calcTestCases[i].ethPrice * CHAINLINK_DECIMAL_PRECISION,
-        CHAINLINK_DECIMAL
+        CHAINLINK_DECIMAL,
+        0
       );
       assertEq(amount, calcTestCases[i].expectedRedeem);