poanetwork
/
tokenbridge-contracts
mirror of https://github.com/poanetwork/tokenbridge-contracts.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove duplicated checks of contracts (#225)

This commit is contained in:
Gerardo Nardelli 2019-07-03 13:19:01 -03:00 committed by Alexander Kolotov
parent b65ae7572e
commit 4ae49f1cba
11 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contracts/ERC677BridgeToken.sol
View File

@ -24,7 +24,7 @@ contract ERC677BridgeToken is
public DetailedERC20(_name, _symbol, _decimals) {}
function setBridgeContract(address _bridgeContract) onlyOwner public {
require(_bridgeContract != address(0) && isContract(_bridgeContract));
require(isContract(_bridgeContract));
bridgeContract = _bridgeContract;
}

4
contracts/ERC677BridgeTokenRewardable.sol
View File

@ -15,12 +15,12 @@ contract ERC677BridgeTokenRewardable is ERC677BridgeToken {
) public ERC677BridgeToken(_name, _symbol, _decimals) {}
function setBlockRewardContract(address _blockRewardContract) onlyOwner public {
require(_blockRewardContract != address(0) && isContract(_blockRewardContract));
require(isContract(_blockRewardContract));
blockRewardContract = _blockRewardContract;
}
function setStakingContract(address _stakingContract) onlyOwner public {
require(_stakingContract != address(0) && isContract(_stakingContract));
require(isContract(_stakingContract));
stakingContract = _stakingContract;
}

2
contracts/upgradeable_contracts/ERC677Bridge.sol
View File

@ -10,7 +10,7 @@ contract ERC677Bridge is BasicBridge {
}
function setErc677token(address _token) internal {
require(_token != address(0) && isContract(_token));
require(isContract(_token));
addressStorage[keccak256(abi.encodePacked("erc677token"))] = _token;
}

2
contracts/upgradeable_contracts/erc20_to_erc20/BasicForeignBridgeErcToErc.sol
View File

@ -17,7 +17,7 @@ contract BasicForeignBridgeErcToErc is BasicForeignBridge {
address _owner
) internal {
require(!isInitialized());
require(_validatorContract != address(0) && isContract(_validatorContract));
require(isContract(_validatorContract));
require(_requiredBlockConfirmations != 0);
require(_gasPrice > 0);
require(_homeMaxPerTx < _homeDailyLimit);

2
contracts/upgradeable_contracts/erc20_to_erc20/FeeManagerErcToErcPOSDAO.sol
View File

@ -13,7 +13,7 @@ contract FeeManagerErcToErcPOSDAO is BlockRewardFeeManager {
}
function setBlockRewardContract(address _blockReward) external {
require(_blockReward != address(0) && isContract(_blockReward));
require(isContract(_blockReward));
// Before store the contract we need to make sure that it is the block reward contract in actual fact,
// call a specific method from the contract that should return a specific value

2
contracts/upgradeable_contracts/erc20_to_erc20/ForeignBridgeErcToErc.sol
View File

@ -33,7 +33,7 @@ contract ForeignBridgeErcToErc is BasicForeignBridgeErcToErc {
}
function setErc20token(address _token) internal {
require(_token != address(0) && isContract(_token));
require(isContract(_token));
addressStorage[keccak256(abi.encodePacked("erc20token"))] = _token;
}
}

2
contracts/upgradeable_contracts/erc20_to_erc20/HomeBridgeErcToErc.sol
View File

@ -130,7 +130,7 @@ contract HomeBridgeErcToErc is ERC677Receiver, EternalStorage, BasicHomeBridge,
) internal
{
require(!isInitialized());
require(_validatorContract != address(0) && isContract(_validatorContract));
require(isContract(_validatorContract));
require(_homeGasPrice > 0);
require(_requiredBlockConfirmations > 0);
require(_minPerTx > 0 && _maxPerTx > _minPerTx && _dailyLimit > _maxPerTx);

4
contracts/upgradeable_contracts/erc20_to_native/ForeignBridgeErcToNative.sol
View File

@ -20,7 +20,7 @@ contract ForeignBridgeErcToNative is BasicForeignBridge {
address _owner
) public returns(bool) {
require(!isInitialized());
require(_validatorContract != address(0) && isContract(_validatorContract));
require(isContract(_validatorContract));
require(_requiredBlockConfirmations != 0);
require(_gasPrice > 0);
require(_homeMaxPerTx < _homeDailyLimit);
@ -57,7 +57,7 @@ contract ForeignBridgeErcToNative is BasicForeignBridge {
}
function setErc20token(address _token) private {
require(_token != address(0) && isContract(_token));
require(isContract(_token));
addressStorage[keccak256(abi.encodePacked("erc20token"))] = _token;
}

4
contracts/upgradeable_contracts/erc20_to_native/HomeBridgeErcToNative.sol
View File

@ -119,7 +119,7 @@ contract HomeBridgeErcToNative is EternalStorage, BasicHomeBridge, OverdrawManag
}
function setBlockRewardContract(address _blockReward) public onlyOwner {
require(_blockReward != address(0) && isContract(_blockReward));
require(isContract(_blockReward));
// Before store the contract we need to make sure that it is the block reward contract in actual fact,
// call a specific method from the contract that should return a specific value
@ -147,7 +147,7 @@ contract HomeBridgeErcToNative is EternalStorage, BasicHomeBridge, OverdrawManag
) internal
{
require(!isInitialized());
require(_validatorContract != address(0) && isContract(_validatorContract));
require(isContract(_validatorContract));
require(_requiredBlockConfirmations > 0);
require(_minPerTx > 0 && _maxPerTx > _minPerTx && _dailyLimit > _maxPerTx);
require(_blockReward == address(0) || isContract(_blockReward));

2
contracts/upgradeable_contracts/native_to_erc20/ForeignBridgeNativeToErc.sol
View File

@ -95,7 +95,7 @@ contract ForeignBridgeNativeToErc is ERC677Receiver, BasicForeignBridge, ERC677B
address _owner
) internal {
require(!isInitialized());
require(_validatorContract != address(0) && isContract(_validatorContract));
require(isContract(_validatorContract));
require(_minPerTx > 0 && _maxPerTx > _minPerTx && _dailyLimit > _maxPerTx);
require(_foreignGasPrice > 0);
require(_homeMaxPerTx < _homeDailyLimit);

2
contracts/upgradeable_contracts/native_to_erc20/HomeBridgeNativeToErc.sol
View File

@ -105,7 +105,7 @@ contract HomeBridgeNativeToErc is EternalStorage, BasicHomeBridge, RewardableHom
) internal
{
require(!isInitialized());
require(_validatorContract != address(0) && isContract(_validatorContract));
require(isContract(_validatorContract));
require(_homeGasPrice > 0);
require(_requiredBlockConfirmations > 0);
require(_minPerTx > 0 && _maxPerTx > _minPerTx && _dailyLimit > _maxPerTx);