Price feed governable addition

solidity/migrations/2_deploy_contracts.js

@@ -18,9 +18,7 @@ const Deposit = artifacts.require("Deposit")
 const VendingMachine = artifacts.require("VendingMachine")
 
 // price feed
-const BTCETHPriceFeed = artifacts.require("BTCETHPriceFeed")
-const BTCUSDPriceFeed = artifacts.require("BTCUSDPriceFeed")
-const ETHUSDPriceFeed = artifacts.require("ETHUSDPriceFeed")
+const MockBTCETHPriceFeed = artifacts.require("BTCETHPriceFeedMock")
 const prices = require("./prices")
 
 const MockRelay = artifacts.require("MockRelay")
@@ -83,18 +81,13 @@ module.exports = (deployer, network, accounts) => {
     let difficultyRelay
     // price feeds
     if (network !== "mainnet") {
-      // On mainnet, we use the MakerDAO-deployed price feeds.
+      // On mainnet, we use the MakerDAO-deployed price feed.
       // See: https://github.com/makerdao/oracles-v2#live-mainnet-oracles
       // Otherwise, we deploy our own mock price feeds, which are simpler
       // to maintain.
-      await deployer.deploy(BTCUSDPriceFeed)
-      await deployer.deploy(ETHUSDPriceFeed)
-
-      const btcPriceFeed = await BTCUSDPriceFeed.deployed()
-      const ethPriceFeed = await ETHUSDPriceFeed.deployed()
-
-      await btcPriceFeed.setValue(web3.utils.toWei(prices.BTCUSD))
-      await ethPriceFeed.setValue(web3.utils.toWei(prices.ETHUSD))
+      await deployer.deploy(MockBTCETHPriceFeed)
+      const btcEthPriceFeed = await MockBTCETHPriceFeed.deployed()
+      await btcEthPriceFeed.setValue(prices.BTCETH)
 
       // On mainnet, we use the Summa-provided relay; see
       // https://github.com/summa-tx/relays . On testnet, we use a local mock.

solidity/migrations/3_initialize.js

@@ -1,8 +1,7 @@
 const TBTCSystem = artifacts.require("TBTCSystem")
 
 const BTCETHPriceFeed = artifacts.require("BTCETHPriceFeed")
-const MockBTCUSDPriceFeed = artifacts.require("BTCUSDPriceFeed")
-const MockETHUSDPriceFeed = artifacts.require("ETHUSDPriceFeed")
+const MockBTCETHPriceFeed = artifacts.require("BTCETHPriceFeedMock")
 
 const DepositFactory = artifacts.require("DepositFactory")
 const Deposit = artifacts.require("Deposit")
@@ -11,11 +10,7 @@ const TBTCDepositToken = artifacts.require("TBTCDepositToken")
 const FeeRebateToken = artifacts.require("FeeRebateToken")
 const VendingMachine = artifacts.require("VendingMachine")
 
-const {
-  BondedECDSAKeepVendorAddress,
-  BTCUSDPriceFeed,
-  ETHUSDPriceFeed,
-} = require("./externals")
+const {BondedECDSAKeepVendorAddress, BTCETHMedianizer} = require("./externals")
 
 module.exports = async function(deployer, network) {
   // Don't enact this setup during unit testing.
@@ -57,19 +52,13 @@ module.exports = async function(deployer, network) {
   const btcEthPriceFeed = await BTCETHPriceFeed.deployed()
   if (network === "mainnet") {
     // Inject mainnet price feeds.
-    await btcEthPriceFeed.initialize(
-      tbtcSystem.address,
-      BTCUSDPriceFeed,
-      ETHUSDPriceFeed,
-    )
+    await btcEthPriceFeed.initialize(tbtcSystem.address, BTCETHMedianizer)
   } else {
     // Inject mock price feeds.
-    const mockBtcPriceFeed = await MockBTCUSDPriceFeed.deployed()
-    const mockEthPriceFeed = await MockETHUSDPriceFeed.deployed()
+    const mockBtcEthPriceFeed = await MockBTCETHPriceFeed.deployed()
     await btcEthPriceFeed.initialize(
       tbtcSystem.address,
-      mockBtcPriceFeed.address,
-      mockEthPriceFeed.address,
+      mockBtcEthPriceFeed.address,
     )
   }
 }

solidity/migrations/externals.js

@@ -5,11 +5,9 @@ const BondedECDSAKeepVendorAddress = "0xZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
 // Medianized price feeds.
 // These are deployed and maintained by Maker.
 // See: https://github.com/makerdao/oracles-v2#live-mainnet-oracles
-const BTCUSDPriceFeed = "0xe0F30cb149fAADC7247E953746Be9BbBB6B5751f"
-const ETHUSDPriceFeed = "0x64de91f5a373cd4c28de3600cb34c7c6ce410c85"
+const BTCETHMedianizer = "0xABCDEABCDEABCDEABCDEABCDEABCDEABCDEABCDE"
 
 module.exports = {
   BondedECDSAKeepVendorAddress,
-  BTCUSDPriceFeed,
-  ETHUSDPriceFeed,
+  BTCETHMedianizer,
 }

solidity/migrations/prices.json

@@ -1,4 +1,3 @@
 {
-    "BTCUSD": "7152.55",
-    "ETHUSD": "142.28"
+    "BTCETH": "502709446162"
 }