status-im/visual-identity
2
0
Fork 0
mirror of https://github.com/status-im/visual-identity.git synced 2025-02-13 04:57:03 +00:00
Code Issues Projects Releases Wiki Activity

merge 000-instance-factory

Browse Source
This commit is contained in:
Ricardo Guilherme Schmidt 2018-05-22 07:44:49 -03:00
commit f021b36058
7 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -15,3 +15,5 @@ Usage:
| -------------------------------------- | ------ | ---- | --- |
| token/TestToken | Yes | Yes | Yes |
| token/ERC20Token | No | Yes | Yes |
| deploy/Instance | No | No | No |
| deploy/Factory | No | No | No |

9
config/contracts.json
View File

@ -23,6 +23,15 @@
},
"MiniMeTokenFactory": {
"deploy": true
},
"Factory": {
"deploy": false
},
"Instance": {
"deploy": false
},
"UpdatableInstance": {
"deploy": false
}
}
}

6
contracts/deploy/DelegatedCall.sol
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
*/
contract DelegatedCall {
constructor() internal {
}
/**
* @dev delegates the call of this function
*/

4
contracts/deploy/Factory.sol
View File

@ -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);

2
contracts/deploy/Instance.sol
View File

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

3
contracts/deploy/InstanceStorage.sol
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)
address public kernel;
// protected zone end
constructor() internal { }
}

6
contracts/deploy/UpdatableInstance.sol
View File

@ -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
{
@ -21,7 +21,7 @@ contract UpdatableInstance is Instance {
function updateUpdatableInstance(address _kernel) external {
require(msg.sender == address(this));
InstanceUpdated(kernel, _kernel);
emit InstanceUpdated(kernel, _kernel);
kernel = _kernel;
}