-
Notifications
You must be signed in to change notification settings - Fork 228
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into arbitrary-message-bridging-#73
# Conflicts: # contracts/upgradeable_contracts/BasicBridge.sol # contracts/upgradeable_contracts/BasicHomeBridge.sol # contracts/upgradeable_contracts/ERC677Bridge.sol # package-lock.json
- Loading branch information
Showing
71 changed files
with
2,071 additions
and
425 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,6 @@ | ||
{ | ||
"semi": false, | ||
"singleQuote": true, | ||
"printWidth": 120 | ||
"printWidth": 120, | ||
"bracketSpacing": true | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
{ | ||
"extends": "solhint:recommended", | ||
"plugins": ["prettier"], | ||
"rules": { | ||
"prettier/prettier": "error", | ||
"mark-callable-contracts": "off", | ||
"avoid-low-level-calls": "off", | ||
"no-inline-assembly": "off", | ||
"multiple-sends": "off", | ||
"bracket-align": "off", | ||
"compiler-version": ["error", "0.4.24"] | ||
} | ||
} |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -10,5 +10,5 @@ env: | |
- SOLIDITY_COVERAGE=false | ||
- SOLIDITY_COVERAGE=true | ||
script: | ||
- yarn lint:js | ||
- yarn lint | ||
- yarn test |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,23 +1,24 @@ | ||
pragma solidity 0.4.24; | ||
|
||
contract Migrations { | ||
address public owner; | ||
uint public last_completed_migration; | ||
address public owner; | ||
// solhint-disable-next-line var-name-mixedcase | ||
uint256 public last_completed_migration; | ||
|
||
modifier restricted() { | ||
if (msg.sender == owner) _; | ||
} | ||
modifier restricted() { | ||
if (msg.sender == owner) _; | ||
} | ||
|
||
constructor() public { | ||
owner = msg.sender; | ||
} | ||
constructor() public { | ||
owner = msg.sender; | ||
} | ||
|
||
function setCompleted(uint completed) public restricted { | ||
last_completed_migration = completed; | ||
} | ||
function setCompleted(uint256 completed) public restricted { | ||
last_completed_migration = completed; | ||
} | ||
|
||
function upgrade(address new_address) public restricted { | ||
Migrations upgraded = Migrations(new_address); | ||
upgraded.setCompleted(last_completed_migration); | ||
} | ||
function upgrade(address new_address) public restricted { | ||
Migrations upgraded = Migrations(new_address); | ||
upgraded.setCompleted(last_completed_migration); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,9 @@ | ||
pragma solidity 0.4.24; | ||
import "openzeppelin-solidity/contracts/token/ERC20/ERC20.sol"; | ||
|
||
|
||
contract ERC677 is ERC20 { | ||
event Transfer(address indexed from, address indexed to, uint value, bytes data); | ||
event Transfer(address indexed from, address indexed to, uint256 value, bytes data); | ||
|
||
function transferAndCall(address, uint, bytes) external returns (bool); | ||
function transferAndCall(address, uint256, bytes) external returns (bool); | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,5 @@ | ||
pragma solidity 0.4.24; | ||
|
||
|
||
contract ERC677Receiver { | ||
function onTokenTransfer(address _from, uint _value, bytes _data) external returns(bool); | ||
function onTokenTransfer(address _from, uint256 _value, bytes _data) external returns (bool); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,12 +1,11 @@ | ||
pragma solidity 0.4.24; | ||
|
||
|
||
interface IBlockReward { | ||
function addExtraReceiver(uint256 _amount, address _receiver) external; | ||
function mintedTotally() external view returns (uint256); | ||
function mintedTotallyByBridge(address _bridge) external view returns(uint256); | ||
function bridgesAllowedLength() external view returns(uint256); | ||
function mintedTotallyByBridge(address _bridge) external view returns (uint256); | ||
function bridgesAllowedLength() external view returns (uint256); | ||
function addBridgeTokenFeeReceivers(uint256 _amount) external; | ||
function addBridgeNativeFeeReceivers(uint256 _amount) external; | ||
function blockRewardContractId() external pure returns(bytes4); | ||
function blockRewardContractId() external pure returns (bytes4); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,7 @@ | ||
pragma solidity 0.4.24; | ||
|
||
|
||
interface IBridgeValidators { | ||
function isValidator(address _validator) external view returns(bool); | ||
function requiredSignatures() external view returns(uint256); | ||
function owner() external view returns(address); | ||
function isValidator(address _validator) external view returns (bool); | ||
function requiredSignatures() external view returns (uint256); | ||
function owner() external view returns (address); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,12 +1,11 @@ | ||
pragma solidity 0.4.24; | ||
|
||
|
||
interface IRewardableValidators { | ||
function isValidator(address _validator) external view returns(bool); | ||
function requiredSignatures() external view returns(uint256); | ||
function owner() external view returns(address); | ||
function isValidator(address _validator) external view returns (bool); | ||
function requiredSignatures() external view returns (uint256); | ||
function owner() external view returns (address); | ||
function validatorList() external view returns (address[]); | ||
function getValidatorRewardAddress(address _validator) external view returns(address); | ||
function getValidatorRewardAddress(address _validator) external view returns (address); | ||
function validatorCount() external view returns (uint256); | ||
function getNextValidator(address _address) external view returns (address); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,5 @@ | ||
pragma solidity 0.4.24; | ||
|
||
|
||
interface IUpgradeabilityOwnerStorage { | ||
function upgradeabilityOwner() external view returns (address); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,7 @@ | ||
pragma solidity 0.4.24; | ||
|
||
|
||
contract Staking { | ||
constructor() public {} | ||
constructor() public { | ||
// solhint-disable-previous-line no-empty-blocks | ||
} | ||
} |
Oops, something went wrong.