Merge pull request #64 from usmfum/feat/twap

Trim unused code
usmfum · Dec 2, 2020 · 77f45a7 · 77f45a7
2 parents 8a3a47c + 97440c8
commit 77f45a7
Show file tree

Hide file tree

Showing 20 changed files with 75 additions and 696 deletions.
diff --git a/contracts/mocks/GasMeasuredChainlinkOracle.sol b/contracts/mocks/GasMeasuredChainlinkOracle.sol
diff --git a/contracts/mocks/GasMeasuredCompoundOpenOracle.sol b/contracts/mocks/GasMeasuredCompoundOpenOracle.sol
diff --git a/contracts/mocks/GasMeasuredMakerOracle.sol b/contracts/mocks/GasMeasuredMakerOracle.sol
diff --git a/contracts/mocks/GasMeasuredMedianOracle.sol b/contracts/mocks/GasMeasuredMedianOracle.sol
diff --git a/contracts/mocks/GasMeasuredOracle.sol b/contracts/mocks/GasMeasuredOracle.sol
diff --git a/contracts/mocks/GasMeasuredOracleWrapper.sol b/contracts/mocks/GasMeasuredOracleWrapper.sol
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+pragma solidity ^0.6.6;
+
+import "@openzeppelin/contracts/math/SafeMath.sol";
+import "../oracles/Oracle.sol";
+import "@nomiclabs/buidler/console.sol";
+
+contract GasMeasuredOracleWrapper is Oracle {
+    using SafeMath for uint;
+
+    Oracle internal immutable measuredOracle;
+    string internal oracleName;
+
+    constructor(Oracle oracle, string memory name) public {
+        measuredOracle = oracle;
+        oracleName = name;
+    }
+
+    function latestPrice() public virtual override view returns (uint price) {
+        uint gasStart = gasleft();
+        price = measuredOracle.latestPrice();
+        uint gasEnd = gasleft();
+        console.log("        ", oracleName, "oracle.latestPrice() cost: ", gasStart.sub(gasEnd));
+    }
+
+    function cacheLatestPrice() public virtual override returns (uint price) {
+        uint gasStart = gasleft();
+        price = measuredOracle.cacheLatestPrice();
+        uint gasEnd = gasleft();
+        console.log("        ", oracleName, "oracle.cacheLatestPrice() cost: ", gasStart.sub(gasEnd));
+    }
+}
diff --git a/contracts/mocks/GasMeasuredOurUniswapV2SpotOracle.sol b/contracts/mocks/GasMeasuredOurUniswapV2SpotOracle.sol
diff --git a/contracts/mocks/GasMeasuredOurUniswapV2TWAPOracle.sol b/contracts/mocks/GasMeasuredOurUniswapV2TWAPOracle.sol
diff --git a/contracts/mocks/GasMeasuredUniswapMedianSpotOracle.sol b/contracts/mocks/GasMeasuredUniswapMedianSpotOracle.sol
diff --git a/contracts/mocks/GasMeasuredUniswapMedianTWAPOracle.sol b/contracts/mocks/GasMeasuredUniswapMedianTWAPOracle.sol
diff --git a/contracts/mocks/MockMakerMedianizer.sol b/contracts/mocks/MockMakerMedianizer.sol
diff --git a/contracts/mocks/TestOracle.sol b/contracts/mocks/TestOracle.sol
@@ -1,11 +1,10 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity ^0.6.6;
 
-import "./GasMeasuredOracle.sol";
 import "./SettableOracle.sol";
 import "@openzeppelin/contracts/access/Ownable.sol";
 
-contract TestOracle is GasMeasuredOracle("test"), SettableOracle, Ownable {
+contract TestOracle is SettableOracle, Ownable {
     uint internal savedPrice;
 
     constructor(uint p) public {

diff --git a/contracts/oracles/MakerOracle.sol b/contracts/oracles/MakerOracle.sol
diff --git a/contracts/oracles/OurUniswapV2SpotOracle.sol b/contracts/oracles/OurUniswapV2SpotOracle.sol
diff --git a/contracts/oracles/OurUniswapV2TWAPOracle.sol b/contracts/oracles/OurUniswapV2TWAPOracle.sol
@@ -43,7 +43,10 @@ contract OurUniswapV2TWAPOracle is Oracle {
     CumulativePrice private storedPriceB;
 
     /**
-     * See OurUniswapV2SpotOracle for example pairs to pass in.
+     * Example pairs to pass in:
+     * ETH/USDT: 0x0d4a11d5eeaac28ec3f61d100daf4d40471f1852, false, 18, 6 (WETH reserve is stored w/ 18 dec places, USDT w/ 18)
+     * USDC/ETH: 0xb4e16d0168e52d35cacd2c6185b44281ec28c9dc, true, 6, 18 (USDC reserve is stored w/ 6 dec places, WETH w/ 18)
+     * DAI/ETH: 0xa478c2975ab1ea89e8196811f51a7b7ade33eb11, true, 18, 18 (DAI reserve is stored w/ 18 dec places, WETH w/ 18)
      */
     constructor(IUniswapV2Pair uniswapPair, uint token0Decimals, uint token1Decimals, bool tokensInReverseOrder) public {
         pair = OurUniswap.createPair(uniswapPair, token0Decimals, token1Decimals, tokensInReverseOrder);

diff --git a/contracts/oracles/UniswapMedianSpotOracle.sol b/contracts/oracles/UniswapMedianSpotOracle.sol