WIP : arc factory

contracts/controller/Avatar.sol

@@ -1,16 +1,16 @@
 pragma solidity ^0.5.11;
 
-import "@daostack/infra/contracts/Reputation.sol";
+import "@daostack/infra-experimental/contracts/Reputation.sol";
 import "./DAOToken.sol";
-import "openzeppelin-solidity/contracts/ownership/Ownable.sol";
-import "openzeppelin-solidity/contracts/token/ERC20/IERC20.sol";
+import "@openzeppelin/contracts-ethereum-package/contracts/ownership/Ownable.sol";
+import "@openzeppelin/contracts-ethereum-package/contracts/token/ERC20/IERC20.sol";
 import "../libs/SafeERC20.sol";
-
+import "@openzeppelin/upgrades/contracts/Initializable.sol";
 
 /**
  * @title An Avatar holds tokens, reputation and ether for a controller
  */
-contract Avatar is Ownable {
+contract Avatar is Initializable, Ownable {
     using SafeERC20 for address;
 
     string public orgName;
@@ -26,20 +26,26 @@ contract Avatar is Ownable {
     event MetaData(string _metaData);
 
     /**
-    * @dev the constructor takes organization name, native token and reputation system
-    and creates an avatar for a controller
+    * @dev enables an avatar to receive ethers
     */
-    constructor(string memory _orgName, DAOToken _nativeToken, Reputation _nativeReputation) public {
-        orgName = _orgName;
-        nativeToken = _nativeToken;
-        nativeReputation = _nativeReputation;
+    function() external payable {
+        emit ReceiveEther(msg.sender, msg.value);
     }
 
     /**
-    * @dev enables an avatar to receive ethers
+    * @dev initialize takes organization name, native token and reputation system
+    and creates an avatar for a controller
     */
-    function() external payable {
-        emit ReceiveEther(msg.sender, msg.value);
+    function initialize(string calldata _orgName,
+                        DAOToken _nativeToken,
+                        Reputation _nativeReputation,
+                        address _owner)
+    external
+    initializer {
+        orgName = _orgName;
+        nativeToken = _nativeToken;
+        nativeReputation = _nativeReputation;
+        Ownable.initialize(_owner);
     }
 
     /**
@@ -50,8 +56,8 @@ contract Avatar is Ownable {
     * @return bool    success or fail
     *         bytes - the return bytes of the called contract's function.
     */
-    function genericCall(address _contract, bytes memory _data, uint256 _value)
-    public
+    function genericCall(address _contract, bytes calldata _data, uint256 _value)
+    external
     onlyOwner
     returns(bool success, bytes memory returnValue) {
       // solhint-disable-next-line avoid-call-value
@@ -65,7 +71,7 @@ contract Avatar is Ownable {
     * @param _to send the ethers to this address
     * @return bool which represents success
     */
-    function sendEther(uint256 _amountInWei, address payable _to) public onlyOwner returns(bool) {
+    function sendEther(uint256 _amountInWei, address payable _to) external onlyOwner returns(bool) {
         _to.transfer(_amountInWei);
         emit SendEther(_amountInWei, _to);
         return true;
@@ -79,7 +85,7 @@ contract Avatar is Ownable {
     * @return bool which represents success
     */
     function externalTokenTransfer(IERC20 _externalToken, address _to, uint256 _value)
-    public onlyOwner returns(bool)
+    external onlyOwner returns(bool)
     {
         address(_externalToken).safeTransfer(_to, _value);
         emit ExternalTokenTransfer(address(_externalToken), _to, _value);
@@ -100,7 +106,7 @@ contract Avatar is Ownable {
         address _to,
         uint256 _value
     )
-    public onlyOwner returns(bool)
+    external onlyOwner returns(bool)
     {
         address(_externalToken).safeTransferFrom(_from, _to, _value);
         emit ExternalTokenTransferFrom(address(_externalToken), _from, _to, _value);
@@ -116,7 +122,7 @@ contract Avatar is Ownable {
     * @return bool which represents a success
     */
     function externalTokenApproval(IERC20 _externalToken, address _spender, uint256 _value)
-    public onlyOwner returns(bool)
+    external onlyOwner returns(bool)
     {
         address(_externalToken).safeApprove(_spender, _value);
         emit ExternalTokenApproval(address(_externalToken), _spender, _value);
@@ -128,7 +134,7 @@ contract Avatar is Ownable {
     * @param _metaData a string representing a hash of the meta data
     * @return bool which represents a success
     */
-    function metaData(string memory _metaData) public onlyOwner returns(bool) {
+    function metaData(string calldata _metaData) external onlyOwner returns(bool) {
         emit MetaData(_metaData);
         return true;
     }