merge 000-bootstrap
This commit is contained in:
commit
841edfc4d8
|
@ -15,6 +15,15 @@
|
|||
],
|
||||
"gas": "auto",
|
||||
"contracts": {
|
||||
"Factory": {
|
||||
"deploy": false
|
||||
},
|
||||
"Instance": {
|
||||
"deploy": false
|
||||
},
|
||||
"UpdatableInstance": {
|
||||
"deploy": false
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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
|
||||
*/
|
||||
contract DelegatedCall {
|
||||
|
||||
constructor() internal {
|
||||
|
||||
}
|
||||
/**
|
||||
* @dev delegates the call of this function
|
||||
*/
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
pragma solidity ^0.4.17;
|
||||
pragma solidity ^0.4.23;
|
||||
|
||||
import "../common/Controlled.sol";
|
||||
|
||||
|
@ -19,7 +19,7 @@ contract Factory is Controlled {
|
|||
uint256 latestUpdate;
|
||||
address latestKernel;
|
||||
|
||||
function Factory(address _kernel)
|
||||
constructor(address _kernel)
|
||||
public
|
||||
{
|
||||
_setKernel(_kernel);
|
||||
|
|
|
@ -10,7 +10,7 @@ import "./DelegatedCall.sol";
|
|||
*/
|
||||
contract Instance is InstanceStorage, DelegatedCall {
|
||||
|
||||
function Instance(address _kernel) public {
|
||||
constructor(address _kernel) public {
|
||||
kernel = _kernel;
|
||||
}
|
||||
|
||||
|
|
|
@ -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)
|
||||
address public kernel;
|
||||
// protected zone end
|
||||
constructor() internal { }
|
||||
}
|
|
@ -1,4 +1,4 @@
|
|||
pragma solidity ^0.4.17;
|
||||
pragma solidity ^0.4.23;
|
||||
|
||||
import "./Instance.sol";
|
||||
|
||||
|
@ -12,7 +12,7 @@ contract UpdatableInstance is Instance {
|
|||
|
||||
event InstanceUpdated(address oldKernel, address newKernel);
|
||||
|
||||
function UpdatableInstance(address _kernel)
|
||||
constructor(address _kernel)
|
||||
Instance(_kernel)
|
||||
public
|
||||
{
|
||||
|
|
|
@ -17,6 +17,9 @@
|
|||
},
|
||||
"homepage": "https://github.com/status-im/contracts#readme",
|
||||
"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"
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue