merge 000-bootstrap

This commit is contained in:
Ricardo Guilherme Schmidt 2018-05-13 02:53:50 -03:00
commit 841edfc4d8
7 changed files with 25 additions and 8 deletions

View File

@ -15,6 +15,15 @@
], ],
"gas": "auto", "gas": "auto",
"contracts": { "contracts": {
"Factory": {
"deploy": false
},
"Instance": {
"deploy": false
},
"UpdatableInstance": {
"deploy": false
}
} }
} }
} }

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.21; pragma solidity ^0.4.23;
/** /**
@ -8,6 +8,10 @@ pragma solidity ^0.4.21;
* Important to avoid overwriting wrong storage pointers is that never define storage to this contract * Important to avoid overwriting wrong storage pointers is that never define storage to this contract
*/ */
contract DelegatedCall { contract DelegatedCall {
constructor() internal {
}
/** /**
* @dev delegates the call of this function * @dev delegates the call of this function
*/ */

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.17; pragma solidity ^0.4.23;
import "../common/Controlled.sol"; import "../common/Controlled.sol";
@ -19,7 +19,7 @@ contract Factory is Controlled {
uint256 latestUpdate; uint256 latestUpdate;
address latestKernel; address latestKernel;
function Factory(address _kernel) constructor(address _kernel)
public public
{ {
_setKernel(_kernel); _setKernel(_kernel);

View File

@ -10,7 +10,7 @@ import "./DelegatedCall.sol";
*/ */
contract Instance is InstanceStorage, DelegatedCall { contract Instance is InstanceStorage, DelegatedCall {
function Instance(address _kernel) public { constructor(address _kernel) public {
kernel = _kernel; kernel = _kernel;
} }

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.17; pragma solidity ^0.4.23;
/** /**
@ -12,4 +12,5 @@ contract InstanceStorage {
// protected zone start (InstanceStorage vars) // protected zone start (InstanceStorage vars)
address public kernel; address public kernel;
// protected zone end // protected zone end
constructor() internal { }
} }

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.17; pragma solidity ^0.4.23;
import "./Instance.sol"; import "./Instance.sol";
@ -12,7 +12,7 @@ contract UpdatableInstance is Instance {
event InstanceUpdated(address oldKernel, address newKernel); event InstanceUpdated(address oldKernel, address newKernel);
function UpdatableInstance(address _kernel) constructor(address _kernel)
Instance(_kernel) Instance(_kernel)
public public
{ {

View File

@ -17,6 +17,9 @@
}, },
"homepage": "https://github.com/status-im/contracts#readme", "homepage": "https://github.com/status-im/contracts#readme",
"dependencies": { "dependencies": {
"web3-eth-abi": "^1.0.0-beta.34" "web3-eth-abi": "^1.0.0-beta.34",
"react": "^16.3.2",
"react-bootstrap": "^0.32.1",
"react-dom": "^16.3.2"
} }
} }