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

Remove deployed at block information in mediators contracts (#292)

This commit is contained in:
Gerardo Nardelli 2019-09-27 16:05:46 -03:00 committed by Alexander Kolotov
parent 5ca35e5cdc
commit f4ebf8b053
6 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contracts/upgradeable_contracts/BaseBridgeValidators.sol
View File

@ -2,9 +2,9 @@ pragma solidity 0.4.24;
import "./Ownable.sol";
import "openzeppelin-solidity/contracts/math/SafeMath.sol";
import "./Initializable.sol";
import "./InitializableBridge.sol";
contract BaseBridgeValidators is Initializable, Ownable {
contract BaseBridgeValidators is InitializableBridge, Ownable {
using SafeMath for uint256;
address public constant F_ADDR = 0xFFfFfFffFFfffFFfFFfFFFFFffFFFffffFfFFFfF;

4
contracts/upgradeable_contracts/BasicBridge.sol
View File

@ -1,14 +1,14 @@
pragma solidity 0.4.24;
import "./Upgradeable.sol";
import "./Initializable.sol";
import "./InitializableBridge.sol";
import "openzeppelin-solidity/contracts/AddressUtils.sol";
import "./Validatable.sol";
import "./Ownable.sol";
import "./Claimable.sol";
import "./VersionableBridge.sol";
contract BasicBridge is Initializable, Validatable, Ownable, Upgradeable, Claimable, VersionableBridge {
contract BasicBridge is InitializableBridge, Validatable, Ownable, Upgradeable, Claimable, VersionableBridge {
event GasPriceChanged(uint256 gasPrice);
event RequiredBlockConfirmationChanged(uint256 requiredBlockConfirmations);

5
contracts/upgradeable_contracts/Initializable.sol
View File

@ -4,7 +4,6 @@ import "../upgradeability/EternalStorage.sol";
contract Initializable is EternalStorage {
bytes32 internal constant INITIALIZED = keccak256(abi.encodePacked("isInitialized"));
bytes32 internal constant DEPLOYED_AT_BLOCK = keccak256(abi.encodePacked("deployedAtBlock"));
function setInitialize() internal {
boolStorage[INITIALIZED] = true;
@ -13,8 +12,4 @@ contract Initializable is EternalStorage {
function isInitialized() public view returns (bool) {
return boolStorage[INITIALIZED];
}
function deployedAtBlock() external view returns (uint256) {
return uintStorage[DEPLOYED_AT_BLOCK];
}
}

11
contracts/upgradeable_contracts/InitializableBridge.sol Normal file
View File

@ -0,0 +1,11 @@
pragma solidity 0.4.24;
import "./Initializable.sol";
contract InitializableBridge is Initializable {
bytes32 internal constant DEPLOYED_AT_BLOCK = keccak256(abi.encodePacked("deployedAtBlock"));
function deployedAtBlock() external view returns (uint256) {
return uintStorage[DEPLOYED_AT_BLOCK];
}
}

1
contracts/upgradeable_contracts/amb_erc677_to_erc677/BasicAMBErc677ToErc677.sol
View File

@ -47,7 +47,6 @@ contract BasicAMBErc677ToErc677 is
);
require(_executionDailyLimitExecutionMaxPerTxArray[1] < _executionDailyLimitExecutionMaxPerTxArray[0]); // _executionMaxPerTx < _executionDailyLimit
uintStorage[DEPLOYED_AT_BLOCK] = block.number;
_setBridgeContract(_bridgeContract);
_setMediatorContractOnOtherSide(_mediatorContract);
setErc677token(_erc677token);

2
test/amb_erc677_to_erc677/AMBErc677ToErc677Behavior.test.js
View File

@ -45,7 +45,6 @@ function shouldBehaveLikeBasicAMBErc677ToErc677(otherSideMediatorContract, accou
expect(await contract.executionMaxPerTx()).to.be.bignumber.equal(ZERO)
expect(await contract.requestGasLimit()).to.be.bignumber.equal(ZERO)
expect(await contract.owner()).to.be.equal(ZERO_ADDRESS)
expect(await contract.deployedAtBlock()).to.be.bignumber.equal(ZERO)
// not valid bridge contract
await contract
@ -167,7 +166,6 @@ function shouldBehaveLikeBasicAMBErc677ToErc677(otherSideMediatorContract, accou
expect(await contract.executionMaxPerTx()).to.be.bignumber.equal(executionMaxPerTx)
expect(await contract.requestGasLimit()).to.be.bignumber.equal(maxGasPerTx)
expect(await contract.owner()).to.be.equal(owner)
expect(await contract.deployedAtBlock()).to.be.bignumber.above(ZERO)
expectEventInLogs(logs, 'ExecutionDailyLimitChanged', { newLimit: executionDailyLimit })
expectEventInLogs(logs, 'DailyLimitChanged', { newLimit: dailyLimit })