update inversion logic (#37)

open-dollar · Feb 19, 2024 · 4730d1d · 4730d1d
1 parent 5d64891
commit 4730d1d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/script/Registry.s.sol b/script/Registry.s.sol
@@ -16,7 +16,7 @@ address constant SEPOLIA_WETH = 0x980B62Da83eFf3D4576C647993b0c1D7faf17c73;
 uint256 constant ORACLE_INTERVAL_TEST = 1 minutes;
 uint256 constant MINT_AMOUNT = 1_000_000 ether;
 uint256 constant INIT_WETH_AMOUNT = 1 ether;
-uint256 constant INIT_OD_AMOUNT = 2230 ether;
+uint256 constant INIT_OD_AMOUNT = 2500 ether;
 
 // Members for governance
 address constant H = 0x37c5B029f9c3691B3d47cb024f84E5E257aEb0BB;

diff --git a/src/contracts/oracles/DenominatedOracle.sol b/src/contracts/oracles/DenominatedOracle.sol
@@ -49,7 +49,10 @@ contract DenominatedOracle {
     (uint256 _denominationPriceSourceValue, bool _denominationPriceSourceValidity) =
       denominationPriceSource.getResultWithValidity();
 
-    _priceSourceValue = inverted ? WAD.wdiv(_priceSourceValue) : _priceSourceValue;
+    if (inverted) {
+      if (_priceSourceValue == 0) return (0, false);
+      _priceSourceValue = WAD.wdiv(_priceSourceValue);
+    }
 
     _result = _priceSourceValue.wmul(_denominationPriceSourceValue);
     _validity = _priceSourceValidity && _denominationPriceSourceValidity;
@@ -59,7 +62,10 @@ contract DenominatedOracle {
     uint256 _priceSourceValue = priceSource.read();
     uint256 _denominationPriceSourceValue = denominationPriceSource.read();
 
-    _priceSourceValue = inverted ? WAD.wdiv(_priceSourceValue) : _priceSourceValue;
+    if (inverted) {
+      if (_priceSourceValue == 0) revert('InvalidPriceFeed');
+      _priceSourceValue = WAD.wdiv(_priceSourceValue);
+    }
 
     return _priceSourceValue.wmul(_denominationPriceSourceValue);
   }

diff --git a/test/QMath.t.sol b/test/QMath.t.sol
@@ -17,6 +17,10 @@ import {MintableERC20} from '@contracts/for-test/MintableERC20.sol';
 
 // forge test --match-contract QMath -vvvvv
 
+/**
+ * @dev large price fluctuations in the price of ETH may break these tests
+ * in the case of large price fluctuation, adjust INIT_OD_AMOUNT in the Registry to set OD / ETH price
+ */
 contract QMath is Test {
   using SafeMath for uint256;