Merge branch 'develop' into arbitrary-message-bridging-#73

# Conflicts: # deploy/src/loadEnv.js # package-lock.json
omni · Jul 17, 2019 · d3e319f · d3e319f
2 parents 0cb5c23 + a747842
commit d3e319f
Show file tree

Hide file tree

Showing 18 changed files with 277 additions and 105 deletions.
diff --git a/contracts/ERC677BridgeToken.sol b/contracts/ERC677BridgeToken.sol
@@ -69,11 +69,8 @@ contract ERC677BridgeToken is
 
     function callAfterTransfer(address _from, address _to, uint256 _value) internal {
         if (isContract(_to) && !contractFallback(_from, _to, _value, new bytes(0))) {
-            if (_to == bridgeContract) {
-                revert();
-            } else {
-                emit ContractFallbackCallFailed(_from, _to, _value);
-            }
+            require(_to != bridgeContract);
+            emit ContractFallbackCallFailed(_from, _to, _value);
         }
     }
 

diff --git a/contracts/libraries/Message.sol b/contracts/libraries/Message.sol
@@ -107,9 +107,7 @@ library Message {
         for (uint256 i = 0; i < requiredSignatures; i++) {
             address recoveredAddress = ecrecover(hash, _vs[i], _rs[i], _ss[i]);
             require(_validatorContract.isValidator(recoveredAddress));
-            if (addressArrayContains(encounteredAddresses, recoveredAddress)) {
-                revert();
-            }
+            require(!addressArrayContains(encounteredAddresses, recoveredAddress));
             encounteredAddresses[i] = recoveredAddress;
         }
     }

diff --git a/contracts/upgradeable_contracts/BaseBridgeValidators.sol b/contracts/upgradeable_contracts/BaseBridgeValidators.sol
@@ -9,6 +9,7 @@ contract BaseBridgeValidators is EternalStorage, Ownable {
     using SafeMath for uint256;
 
     address public constant F_ADDR = 0xFFfFfFffFFfffFFfFFfFFFFFffFFFffffFfFFFfF;
+    uint256 internal constant MAX_VALIDATORS = 100;
 
     event ValidatorAdded (address indexed validator);
     event ValidatorRemoved (address indexed validator);
@@ -43,9 +44,7 @@ contract BaseBridgeValidators is EternalStorage, Ownable {
             nextValidator = getNextValidator(nextValidator);
             counter++;
 
-            if (nextValidator == address(0) ) {
-                revert();
-            }
+            require(nextValidator != address(0));
         }
 
         return list;
@@ -74,9 +73,7 @@ contract BaseBridgeValidators is EternalStorage, Ownable {
             index = next;
             next = getNextValidator(index);
 
-            if (next == F_ADDR || next == address(0) ) {
-                revert();
-            }
+            require(next != F_ADDR && next != address(0));
         }
 
         setNextValidator(index, validatorsNext);

diff --git a/contracts/upgradeable_contracts/BridgeValidators.sol b/contracts/upgradeable_contracts/BridgeValidators.sol
@@ -18,6 +18,7 @@ contract BridgeValidators is BaseBridgeValidators {
         setOwner(_owner);
         require(_requiredSignatures != 0);
         require(_initialValidators.length >= _requiredSignatures);
+        require(_initialValidators.length <= MAX_VALIDATORS);
 
         for (uint256 i = 0; i < _initialValidators.length; i++) {
             require(_initialValidators[i] != address(0) && _initialValidators[i] != F_ADDR);

diff --git a/contracts/upgradeable_contracts/RewardableValidators.sol b/contracts/upgradeable_contracts/RewardableValidators.sol
@@ -19,6 +19,7 @@ contract RewardableValidators is BaseBridgeValidators {
         setOwner(_owner);
         require(_requiredSignatures != 0);
         require(_initialValidators.length >= _requiredSignatures);
+        require(_initialValidators.length <= MAX_VALIDATORS);
         require(_initialValidators.length == _initialRewards.length);
 
         for (uint256 i = 0; i < _initialValidators.length; i++) {

diff --git a/contracts/upgradeable_contracts/erc20_to_erc20/HomeBridgeErcToErc.sol b/contracts/upgradeable_contracts/erc20_to_erc20/HomeBridgeErcToErc.sol
@@ -131,7 +131,6 @@ contract HomeBridgeErcToErc is ERC677Receiver, EternalStorage, BasicHomeBridge,
     {
         require(!isInitialized());
         require(isContract(_validatorContract));
-        require(_homeGasPrice > 0);
         require(_requiredBlockConfirmations > 0);
         require(_minPerTx > 0 && _maxPerTx > _minPerTx && _dailyLimit > _maxPerTx);
         require(_foreignMaxPerTx < _foreignDailyLimit);

diff --git a/deploy/deploy.js b/deploy/deploy.js
@@ -7,9 +7,10 @@ const { BRIDGE_MODE, ERC20_TOKEN_ADDRESS } = env
 const deployResultsPath = path.join(__dirname, './bridgeDeploymentResults.json')
 
 async function deployNativeToErc() {
+  const preDeploy = require('./src/native_to_erc/preDeploy')
   const deployHome = require('./src/native_to_erc/home')
   const deployForeign = require('./src/native_to_erc/foreign')
-
+  await preDeploy()
   const { homeBridge } = await deployHome()
   const { foreignBridge, erc677 } = await deployForeign()
   console.log('\nDeployment has been completed.\n\n')
@@ -79,9 +80,10 @@ async function deployErcToErc() {
 }
 
 async function deployErcToNative() {
+  const preDeploy = require('./src/erc_to_native/preDeploy')
   const deployHome = require('./src/erc_to_native/home')
   const deployForeign = require('./src/erc_to_native/foreign')
-
+  await preDeploy()
   const { homeBridge } = await deployHome()
   const { foreignBridge } = await deployForeign()
   console.log('\nDeployment has been completed.\n\n')

diff --git a/deploy/src/deploymentUtils.js b/deploy/src/deploymentUtils.js
@@ -296,6 +296,11 @@ function getSendTxMethod(url) {
   return url === HOME_RPC_URL ? sendRawTxHome : sendRawTxForeign
 }
 
+async function isContract(web3, address) {
+  const code = await web3.eth.getCode(address)
+  return code !== '0x' && code !== '0x0'
+}
+
 module.exports = {
   deployContract,
   sendRawTxHome,
@@ -307,5 +312,6 @@ module.exports = {
   transferProxyOwnership,
   transferOwnership,
   setBridgeContract,
-  assertStateWithRetry
+  assertStateWithRetry,
+  isContract
 }
diff --git a/deploy/src/erc_to_erc/preDeploy.js b/deploy/src/erc_to_erc/preDeploy.js
@@ -1,12 +1,39 @@
-const { web3Foreign } = require('../web3')
-const { ERC20_TOKEN_ADDRESS, ERC20_EXTENDED_BY_ERC677 } = require('../loadEnv')
+const { web3Home, web3Foreign } = require('../web3')
+const {
+  ERC20_TOKEN_ADDRESS,
+  ERC20_EXTENDED_BY_ERC677,
+  HOME_REWARDABLE,
+  BLOCK_REWARD_ADDRESS,
+  DEPLOY_REWARDABLE_TOKEN,
+  DPOS_STAKING_ADDRESS
+} = require('../loadEnv')
+const { isContract } = require('../deploymentUtils')
 const {
   foreignContracts: {
     ERC677BridgeToken: { abi }
   }
 } = require('../loadContracts')
 
 async function preDeploy() {
+  const isERC20AContract = await isContract(web3Foreign, ERC20_TOKEN_ADDRESS)
+  if (!isERC20AContract) {
+    throw new Error(`ERC20_TOKEN_ADDRESS should be a contract address`)
+  }
+
+  if (DEPLOY_REWARDABLE_TOKEN) {
+    const isDPOSStakingAContract = await isContract(web3Foreign, DPOS_STAKING_ADDRESS)
+    if (!isDPOSStakingAContract) {
+      throw new Error(`DPOS_STAKING_ADDRESS should be a contract address`)
+    }
+  }
+
+  if (HOME_REWARDABLE === 'BOTH_DIRECTIONS') {
+    const isBlockRewardAContract = await isContract(web3Home, BLOCK_REWARD_ADDRESS)
+    if (!isBlockRewardAContract) {
+      throw new Error(`BLOCK_REWARD_ADDRESS should be a contract address`)
+    }
+  }
+
   if (ERC20_EXTENDED_BY_ERC677) {
     const tokenContract = new web3Foreign.eth.Contract(abi, ERC20_TOKEN_ADDRESS)
     try {

diff --git a/deploy/src/erc_to_native/preDeploy.js b/deploy/src/erc_to_native/preDeploy.js
@@ -0,0 +1,12 @@
+const { web3Foreign } = require('../web3')
+const { ERC20_TOKEN_ADDRESS } = require('../loadEnv')
+const { isContract } = require('../deploymentUtils')
+
+async function preDeploy() {
+  const isERC20AContract = await isContract(web3Foreign, ERC20_TOKEN_ADDRESS)
+  if (!isERC20AContract) {
+    throw new Error(`ERC20_TOKEN_ADDRESS should be a contract address`)
+  }
+}
+
+module.exports = preDeploy