Add bridgesAllowedLength method check on setBlockRewardContract

omni · Oct 12, 2018 · 339bd4a · 339bd4a
1 parent 00b4976
commit 339bd4a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 1 deletion.
diff --git a/contracts/IBlockReward.sol b/contracts/IBlockReward.sol
@@ -5,4 +5,5 @@ interface IBlockReward {
     function addExtraReceiver(uint256 _amount, address _receiver) external;
     function mintedTotally() public view returns (uint256);
     function mintedTotallyByBridge(address _bridge) public view returns(uint256);
+    function bridgesAllowedLength() external view returns(uint256);
 }
diff --git a/contracts/test/BlockReward.sol b/contracts/test/BlockReward.sol
@@ -14,6 +14,10 @@ contract BlockReward is IBlockReward {
     function () external payable {
     }
 
+    function bridgesAllowedLength() external view returns(uint256) {
+        return 3;
+    }
+
     function addExtraReceiver(uint256 _amount, address _receiver) external {
         require(_amount > 0);
         require(_receiver != address(0));

diff --git a/contracts/upgradeable_contracts/erc20_to_native/HomeBridgeErcToNative.sol b/contracts/upgradeable_contracts/erc20_to_native/HomeBridgeErcToNative.sol
@@ -66,7 +66,7 @@ contract HomeBridgeErcToNative is EternalStorage, BasicBridge, BasicHomeBridge {
     }
 
     function setBlockRewardContract(address _blockReward) public onlyOwner {
-        require(_blockReward != address(0) && isContract(_blockReward));
+        require(_blockReward != address(0) && isContract(_blockReward) && (IBlockReward(_blockReward).bridgesAllowedLength() != 0));
         addressStorage[keccak256(abi.encodePacked("blockRewardContract"))] = _blockReward;
     }
 

diff --git a/test/erc_to_native/home_bridge.test.js b/test/erc_to_native/home_bridge.test.js
@@ -71,6 +71,9 @@ contract('HomeBridge_ERC20_to_Native', async (accounts) => {
       const notAContract = accounts[5]
       await homeContract.setBlockRewardContract(notAContract).should.be.rejectedWith(ERROR_MSG)
       secondBlockRewardContract.address.should.be.equal(await homeContract.blockRewardContract())
+
+      await homeContract.setBlockRewardContract(validatorContract.address).should.be.rejectedWith(ERROR_MSG)
+      secondBlockRewardContract.address.should.be.equal(await homeContract.blockRewardContract())
     })
 
     it('cant set maxPerTx > dailyLimit', async () => {