Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove duplicated checks of contracts #225

Merged
merged 1 commit into from Jul 3, 2019
Merged

Remove duplicated checks of contracts #225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion contracts/ERC677BridgeToken.sol
View file
Open in desktop
Expand Up @@ -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;
}

Expand Down
4 changes: 2 additions & 2 deletions contracts/ERC677BridgeTokenRewardable.sol
View file
Open in desktop
Expand Up @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion contracts/upgradeable_contracts/ERC677Bridge.sol
View file
Open in desktop
Expand Up @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion contracts/upgradeable_contracts/erc20_to_erc20/BasicForeignBridgeErcToErc.sol
View file
Open in desktop
Expand Up @@ -18,7 +18,7 @@ contract BasicForeignBridgeErcToErc is BasicBridge, BasicForeignBridge {
address _owner
) internal {
require(!isInitialized());
require(_validatorContract != address(0) && isContract(_validatorContract));
require(isContract(_validatorContract));
require(_requiredBlockConfirmations != 0);
require(_gasPrice > 0);
require(_homeMaxPerTx < _homeDailyLimit);
Expand Down
2 changes: 1 addition & 1 deletion contracts/upgradeable_contracts/erc20_to_erc20/FeeManagerErcToErcPOSDAO.sol
View file
Open in desktop
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion contracts/upgradeable_contracts/erc20_to_erc20/ForeignBridgeErcToErc.sol
View file
Open in desktop
Expand Up @@ -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 changes: 1 addition & 1 deletion contracts/upgradeable_contracts/erc20_to_erc20/HomeBridgeErcToErc.sol
View file
Open in desktop
Expand Up @@ -131,7 +131,7 @@ contract HomeBridgeErcToErc is ERC677Receiver, EternalStorage, BasicBridge, Basi
) 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);
Expand Down
4 changes: 2 additions & 2 deletions contracts/upgradeable_contracts/erc20_to_native/ForeignBridgeErcToNative.sol
View file
Open in desktop
Expand Up @@ -21,7 +21,7 @@ contract ForeignBridgeErcToNative is BasicBridge, 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);
Expand Down Expand Up @@ -58,7 +58,7 @@ contract ForeignBridgeErcToNative is BasicBridge, BasicForeignBridge {
}

function setErc20token(address _token) private {
require(_token != address(0) && isContract(_token));
require(isContract(_token));
addressStorage[keccak256(abi.encodePacked("erc20token"))] = _token;
}

Expand Down
4 changes: 2 additions & 2 deletions contracts/upgradeable_contracts/erc20_to_native/HomeBridgeErcToNative.sol
View file
Open in desktop
Expand Up @@ -120,7 +120,7 @@ contract HomeBridgeErcToNative is EternalStorage, BasicBridge, BasicHomeBridge,
}

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
Expand Down Expand Up @@ -148,7 +148,7 @@ contract HomeBridgeErcToNative is EternalStorage, BasicBridge, BasicHomeBridge,
) 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));
Expand Down
2 changes: 1 addition & 1 deletion contracts/upgradeable_contracts/native_to_erc20/ForeignBridgeNativeToErc.sol
View file
Open in desktop
Expand Up @@ -96,7 +96,7 @@ contract ForeignBridgeNativeToErc is ERC677Receiver, BasicBridge, BasicForeignBr
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);
Expand Down
2 changes: 1 addition & 1 deletion contracts/upgradeable_contracts/native_to_erc20/HomeBridgeNativeToErc.sol
View file
Open in desktop
Expand Up @@ -106,7 +106,7 @@ contract HomeBridgeNativeToErc is EternalStorage, BasicBridge, 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);
Expand Down