Merge branch 'master' into ilan/updateStepSetterContract

Author: ilanDoron

web3deployment/compileContracts.js

@@ -4,6 +4,7 @@ const solc = require('solc');
 const contractPath = path.join(__dirname, "../contracts/");
 const input = {
     "ConversionRates.sol" : fs.readFileSync(contractPath + 'reserves/fprConversionRate/ConversionRates.sol','utf8'),
+    "VolumeImbalanceRecorder.sol" : fs.readFileSync(contractPath + 'reserves/VolumeImbalanceRecorder.sol', 'utf8'),
     "ConversionRatesInterface.sol" : fs.readFileSync(contractPath + 'ConversionRatesInterface.sol', 'utf8'),
     "PermissionGroups.sol" : fs.readFileSync(contractPath + 'PermissionGroups.sol', 'utf8'),
     "ERC20Interface.sol" : fs.readFileSync(contractPath + 'ERC20Interface.sol', 'utf8'),
@@ -35,14 +36,17 @@ const input = {
     "Utils.sol" : fs.readFileSync(contractPath + 'Utils.sol', 'utf8'),
     "Utils2.sol" : fs.readFileSync(contractPath + 'Utils2.sol', 'utf8'),
     "Utils3.sol" : fs.readFileSync(contractPath + 'Utils3.sol', 'utf8'),
-    "VolumeImbalanceRecorder.sol" : fs.readFileSync(contractPath + 'reserves/VolumeImbalanceRecorder.sol', 'utf8'),
+    "reserves/fprConversionRate/ConversionRates.sol" : fs.readFileSync(contractPath + 'reserves/fprConversionRate/ConversionRates.sol','utf8'),
+    "reserves/VolumeImbalanceRecorder.sol" : fs.readFileSync(contractPath + 'reserves/VolumeImbalanceRecorder.sol', 'utf8'),
     "Withdrawable.sol" : fs.readFileSync(contractPath + 'Withdrawable.sol', 'utf8'),
     "WhiteList.sol" : fs.readFileSync(contractPath + 'WhiteList.sol', 'utf8'),
     "WhiteListInterface.sol" : fs.readFileSync(contractPath + 'WhiteListInterface.sol', 'utf8'),
     "WrapFeeBurner.sol" : fs.readFileSync(contractPath + 'wrappers/WrapFeeBurner.sol', 'utf8'),
     "KyberUniswapReserve.sol" : fs.readFileSync(contractPath + 'reserves/bridgeReserves/uniswap/KyberUniswapReserve.sol', 'utf8'),
     "WrapperBase.sol" : fs.readFileSync(contractPath + 'wrappers/WrapperBase.sol', 'utf8'),
     "SetStepFunctionWrapper.sol" : fs.readFileSync(contractPath + 'wrappers/SetStepFunctionWrapper.sol', 'utf8')
+    "WrapConversionRate.sol" : fs.readFileSync(contractPath + 'wrappers/WrapConversionRate.sol', 'utf8'),
+    "WrapReadTokenData.sol" : fs.readFileSync(contractPath + 'wrappers/WrapReadTokenData.sol', 'utf8')
   };
 
 module.exports.compileContracts = async function() {

web3deployment/liquidityReserveDeployer.js

@@ -72,7 +72,11 @@ async function sendTx(txObject) {
   // don't wait for confirmation
   signedTxs.push(signedTx.rawTransaction)
   if (!dontSendTx) {
-    web3.eth.sendSignedTransaction(signedTx.rawTransaction, {from:sender});
+    try {
+      web3.eth.sendSignedTransaction(signedTx.rawTransaction, {from:sender});
+    } catch (e) {
+      console.error(e);
+    }
   }
 }
 
@@ -105,9 +109,9 @@ const input = {
   "Utils.sol" : fs.readFileSync(contractPath + 'Utils.sol', 'utf8'),
   "KyberReserveInterface.sol" : fs.readFileSync(contractPath + 'KyberReserveInterface.sol', 'utf8'),
   "Withdrawable.sol" : fs.readFileSync(contractPath + 'Withdrawable.sol', 'utf8'),
-  "KyberReserve.sol" : fs.readFileSync(contractPath + 'KyberReserve.sol', 'utf8'),
-  "LiquidityConversionRates.sol" : fs.readFileSync(contractPath + 'LiquidityConversionRates.sol', 'utf8'),
-  "LiquidityFormula.sol" : fs.readFileSync(contractPath + 'LiquidityFormula.sol', 'utf8'),
+  "KyberReserve.sol" : fs.readFileSync(contractPath + 'reserves/KyberReserve.sol', 'utf8'),
+  "LiquidityConversionRates.sol" : fs.readFileSync(contractPath + '/reserves/aprConversionRate/LiquidityConversionRates.sol', 'utf8'),
+  "LiquidityFormula.sol" : fs.readFileSync(contractPath + '/reserves/aprConversionRate/LiquidityFormula.sol', 'utf8'),
 };
 
 let reserveAddress;