Fix missing solvers param when deploying LivepeerVerifier. Fix possib…

…le divide by zero in setInflation
livepeer · Dec 13, 2017 · d3edf0c · d3edf0c
1 parent 386affc
commit d3edf0c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/contracts/token/Minter.sol b/contracts/token/Minter.sol
@@ -126,7 +126,12 @@ contract Minter is Manager, IMinter {
      * @dev Set inflation based upon the current bonding rate
      */
     function setInflation() internal {
-        uint256 currentBondingRate = (bondingManager().getTotalBonded() * PERC_DIVISOR) / livepeerToken().totalSupply();
+        uint256 currentBondingRate = 0;
+        uint256 totalSupply = livepeerToken().totalSupply();
+
+        if (totalSupply > 0) {
+            currentBondingRate = (bondingManager().getTotalBonded() * PERC_DIVISOR) / totalSupply;
+        }
 
         if (currentBondingRate < targetBondingRate) {
             // Bonding rate is below the target - increase inflation

diff --git a/migrations/3_deploy_contracts.js b/migrations/3_deploy_contracts.js
@@ -61,7 +61,7 @@ module.exports = function(deployer, network) {
         if (network === "development" || network === "testrpc" || network === "parityDev" || network === "gethDev") {
             await deployAndRegister(deployer, controller, IdentityVerifier, "Verifier", controller.address)
         } else if (network === "lpTestNet") {
-            await deployAndRegister(deployer, controller, LivepeerVerifier, "Verifier", controller.address, config.verifier.verificationCodeHash)
+            await deployAndRegister(deployer, controller, LivepeerVerifier, "Verifier", controller.address, config.verifier.solvers, config.verifier.verificationCodeHash)
         } else {
             await deployAndRegister(deployer, controller, OraclizeVerifier, "Verifier", controller.address, config.verifier.verificationCodeHash, config.verifier.gasPrice, config.verifier.gasLimit)
         }