inclde dependency 145

contracts/deploy/DelayedUpdatableInstance.sol

@@ -0,0 +1,77 @@
+pragma solidity ^0.4.21;
+
+import "./DelayedUpdatableInstanceStorage.sol";
+import "./DelegatedCall.sol";
+
+/**
+ * @title DelayedUpdatableInstance
+ * @author Ricardo Guilherme Schmidt (Status Research & Development GmbH) 
+ * @dev Contract that can be updated by a call from itself.
+ */
+contract DelayedUpdatableInstance is DelayedUpdatableInstanceStorage, DelegatedCall {
+
+    event UpdateRequested(address newKernel, uint256 activation);
+    event UpdateCancelled();
+    event UpdateConfirmed(address oldKernel, address newKernel);
+
+    function DelayedUpdatableInstance(address _kernel) public {
+        kernel = _kernel;
+    }
+
+    /**
+     * @dev delegatecall everything (but declared functions) to `_target()`
+     * @notice Verify `kernel()` code to predict behavior
+     */
+    function () 
+        external 
+        delegated 
+    {
+        //all goes to kernel
+    }
+
+    function updateRequestUpdatableInstance(
+        address _kernel
+    ) 
+        external
+    {
+        require(msg.sender == address(this));
+        uint activation = block.timestamp + 30 days;
+        update = Update(_kernel, activation);
+        emit UpdateRequested(_kernel, activation);
+    }
+
+    function updateConfirmUpdatableInstance(
+        address _kernel
+    )
+        external
+    {
+        require(msg.sender == address(this));
+        Update memory pending = update;
+        require(pending.kernel == _kernel);
+        require(pending.activation < block.timestamp);
+        kernel = pending.kernel;
+        delete update;
+        emit UpdateConfirmed(kernel, pending.kernel);
+    }
+
+    function updateCancelUpdatableInstance() 
+        external
+    {
+        require(msg.sender == address(this));
+        delete update;
+    }
+
+    /**
+     * @dev returns configured kernel
+     * @return kernel address
+     */
+    function targetDelegatedCall()
+        internal
+        view
+        returns(address)
+    {
+        return kernel;
+    }
+    
+
+}

contracts/deploy/DelayedUpdatableInstanceStorage.sol

@@ -0,0 +1,20 @@
+pragma solidity ^0.4.17;
+
+/**
+ * @title DelayedUpdatableInstanceStorage
+ * @author Ricardo Guilherme Schmidt (Status Research & Development GmbH) 
+ * @dev Defines kernel vars that Kernel contract share with DelayedUpdatableInstance.
+ *      Important to avoid overwriting wrong storage pointers is that 
+ *      InstanceStorage should be always the first contract at heritance.
+ */
+contract DelayedUpdatableInstanceStorage {    
+    // protected zone start (InstanceStorage vars)
+    address public kernel;
+    Update public update;
+    
+    struct Update {
+        address kernel;
+        uint256 activation;
+    }
+    // protected zone end
+}

contracts/deploy/DelegatedCall.sol

@@ -0,0 +1,35 @@
+pragma solidity ^0.4.21;
+
+
+/**
+ * @title DelegatedCall
+ * @author Ricardo Guilherme Schmidt (Status Research & Development GmbH) 
+ * @dev Abstract contract that delegates calls by `delegated` modifier to result of `targetDelegatedCall()`
+ *      Important to avoid overwriting wrong storage pointers is that never define storage to this contract
+ */
+contract DelegatedCall {
+    /**
+     * @dev delegates the call of this function
+     */
+    modifier delegated {
+        //require successfull delegate call to remote `_target()`
+        require(targetDelegatedCall().delegatecall(msg.data)); 
+        assembly {
+            let outSize := returndatasize 
+            let outDataPtr := mload(0x40) //load memory
+            returndatacopy(outDataPtr, 0, outSize) //copy last return into pointer
+            return(outDataPtr, outSize) 
+        }
+        assert(false); //should never reach here
+        _; //never will execute local logic
+    }
+
+    /**
+     * @dev defines the address for delegation of calls
+     */
+    function targetDelegatedCall()
+        internal
+        view
+        returns(address);
+
+}

contracts/deploy/Factory.sol

@@ -0,0 +1,90 @@
+pragma solidity ^0.4.17;
+
+import "../common/Controlled.sol";
+
+contract Factory is Controlled {
+
+    event NewKernel(address newKernel, bytes32 codeHash);
+
+    struct Version {
+        uint256 blockNumber;
+        uint256 timestamp;
+        address kernel;
+        bytes32 codeHash;
+    }
+
+    mapping (address => uint256) versionMap;
+
+    Version[] versionLog;
+    uint256 latestUpdate;
+    address latestKernel;
+
+    function Factory(address _kernel)
+        public 
+    {
+        _setKernel(_kernel);
+    }
+
+    function setKernel(address _kernel)
+        external 
+        onlyController
+    {
+        _setKernel(_kernel);
+    }
+
+    function getVersion(uint256 index)
+        public
+        view
+        returns(
+            uint256 blockNumber,
+            uint256 timestamp,
+            address kernel,
+            bytes32 codeHash
+        )
+    {
+        return (
+            versionLog[index].blockNumber, 
+            versionLog[index].timestamp, 
+            versionLog[index].kernel, 
+            versionLog[index].codeHash
+        );
+    }
+
+    function getCodeHash(address _addr) 
+        public 
+        view 
+        returns (bytes32 codeHash) 
+    {
+        bytes memory o_code;
+        uint size;
+        assembly {
+            // retrieve the size of the code, this needs assembly
+            size := extcodesize(_addr)
+        }
+        require (size > 0);
+        assembly {
+            // allocate output byte array - this could also be done without assembly
+            // by using o_code = new bytes(size)
+            o_code := mload(0x40)
+            // new "memory end" including padding
+            mstore(0x40, add(o_code, and(add(add(size, 0x20), 0x1f), not(0x1f))))
+            // store length in memory
+            mstore(o_code, size)
+            // actually retrieve the code, this needs assembly
+            extcodecopy(_addr, add(o_code, 0x20), 0, size)
+        }
+        codeHash = keccak256(o_code);
+    }
+
+    function _setKernel(address _kernel) 
+        internal
+    {
+        require(_kernel != latestKernel);
+        bytes32 _codeHash = getCodeHash(_kernel);
+        versionMap[_kernel] = versionLog.length;
+        versionLog.push(Version({blockNumber: block.number, timestamp: block.timestamp, kernel: _kernel, codeHash: _codeHash}));
+        latestUpdate = block.timestamp;
+        latestKernel = _kernel;
+        emit NewKernel(_kernel, _codeHash);
+    }
+}

contracts/deploy/Instance.sol

@@ -0,0 +1,38 @@
+pragma solidity ^0.4.21;
+
+import "./InstanceStorage.sol";
+import "./DelegatedCall.sol";
+
+/**
+ * @title Instance
+ * @author Ricardo Guilherme Schmidt (Status Research & Development GmbH) 
+ * @dev Contract that forward everything through delegatecall to defined kernel
+ */
+contract Instance is InstanceStorage, DelegatedCall {
+
+    function Instance(address _kernel) public {
+        kernel = _kernel;
+    }
+
+    /**
+     * @dev delegatecall everything (but declared functions) to `_target()`
+     * @notice Verify `kernel()` code to predict behavior
+     */
+    function () external delegated {
+        //all goes to kernel
+    }
+
+    /**
+     * @dev returns kernel if kernel that is configured
+     * @return kernel address
+     */
+    function targetDelegatedCall()
+        internal
+        view
+        returns(address)
+    {
+        return kernel;
+    }
+
+
+}

contracts/deploy/InstanceStorage.sol

@@ -0,0 +1,15 @@
+pragma solidity ^0.4.17;
+
+
+/**
+ * @title InstanceStorage
+ * @author Ricardo Guilherme Schmidt (Status Research & Development GmbH) 
+ * @dev Defines kernel vars that Kernel contract share with Instance.
+ *      Important to avoid overwriting wrong storage pointers is that 
+ *      InstanceStorage should be always the first contract at heritance.
+ */
+contract InstanceStorage {    
+    // protected zone start (InstanceStorage vars)
+    address public kernel;
+    // protected zone end
+}

contracts/deploy/UpdatableInstance.sol

@@ -0,0 +1,28 @@
+pragma solidity ^0.4.17;
+
+import "./Instance.sol";
+
+
+/**
+ * @title UpdatableInstance
+ * @author Ricardo Guilherme Schmidt (Status Research & Development GmbH) 
+ * @dev Contract that can be updated by a call from itself.
+ */
+contract UpdatableInstance is Instance {
+
+    event InstanceUpdated(address oldKernel, address newKernel);
+
+    function UpdatableInstance(address _kernel) 
+        Instance(_kernel) 
+        public
+    {
+
+    }
+    
+    function updateUpdatableInstance(address _kernel) external {
+        require(msg.sender == address(this));
+        InstanceUpdated(kernel, _kernel);
+        kernel = _kernel;
+    }
+
+}

contracts/identity/ERC725.sol

@@ -0,0 +1,29 @@
+pragma solidity ^0.4.21;
+
+contract ERC725 {
+
+    uint256 constant MANAGEMENT_KEY = 1;
+    uint256 constant ACTION_KEY = 2;
+    uint256 constant CLAIM_SIGNER_KEY = 3;
+    uint256 constant ENCRYPTION_KEY = 4;
+    
+    event KeyAdded(bytes32 indexed key, uint256 indexed purpose, uint256 indexed keyType);
+    event KeyRemoved(bytes32 indexed key, uint256 indexed purpose, uint256 indexed keyType);
+    event ExecutionRequested(uint256 indexed executionId, address indexed to, uint256 indexed value, bytes data);
+    event Executed(uint256 indexed executionId, address indexed to, uint256 indexed value, bytes data);
+    event Approved(uint256 indexed executionId, bool approved);
+
+    struct Key {
+        uint256 purpose; //e.g., MANAGEMENT_KEY = 1, ACTION_KEY = 2, etc.
+        uint256 keyType; // e.g. 1 = ECDSA, 2 = RSA, etc.
+        bytes32 key;
+    }
+
+    function getKey(bytes32 _key, uint256 _purpose) public view returns(uint256 purpose, uint256 keyType, bytes32 key);
+    function getKeyPurpose(bytes32 _key) public view returns(uint256[] purpose);
+    function getKeysByPurpose(uint256 _purpose) public view returns(bytes32[] keys);
+    function addKey(bytes32 _key, uint256 _purpose, uint256 _keyType) public returns (bool success);
+    function removeKey(bytes32 _key, uint256 _purpose) public returns (bool success);
+    function execute(address _to, uint256 _value, bytes _data) public returns (uint256 executionId);
+    function approve(uint256 _id, bool _approve) public returns (bool success);
+}

contracts/identity/ERC735.sol

@@ -0,0 +1,23 @@
+pragma solidity ^0.4.21;
+
+contract ERC735 {
+
+    event ClaimRequested(bytes32 indexed claimRequestId, uint256 indexed claimType, uint256 scheme, address indexed issuer, bytes signature, bytes data, string uri);   
+    event ClaimAdded(bytes32 indexed claimId, uint256 indexed claimType, uint256 scheme, address indexed issuer, bytes signature, bytes data, string uri);
+    event ClaimRemoved(bytes32 indexed claimId, uint256 indexed claimType, uint256 scheme, address indexed issuer, bytes signature, bytes data, string uri);
+    event ClaimChanged(bytes32 indexed claimId, uint256 indexed claimType, uint256 scheme, address indexed issuer, bytes signature, bytes data, string uri);
+
+    struct Claim {
+        uint256 claimType;
+        uint256 scheme;
+        address issuer; // msg.sender
+        bytes signature; // this.address + claimType + data
+        bytes data;
+        string uri;
+    }
+
+    function getClaim(bytes32 _claimId) public view returns(uint256 claimType, uint256 scheme, address issuer, bytes signature, bytes data, string uri);
+    function getClaimIdsByType(uint256 _claimType) public view returns(bytes32[] claimIds);
+    function addClaim(uint256 _claimType, uint256 _scheme, address _issuer, bytes _signature, bytes _data, string _uri) public returns (bytes32 claimRequestId);
+    function removeClaim(bytes32 _claimId) public returns (bool success);
+}

contracts/identity/Identity.sol

@@ -0,0 +1,620 @@
+pragma solidity ^0.4.21;
+
+import "./ERC725.sol";
+import "./ERC735.sol";
+
+
+contract Identity is ERC725, ERC735 {
+
+    mapping (bytes32 => Key) keys;
+    mapping (uint256 => bytes32[]) keysByPurpose;
+    mapping (bytes32 => Claim) claims;
+    mapping (uint256 => bytes32[]) claimsByType;
+
+    mapping (bytes32 => uint256) indexes;
+    mapping (uint256 => Transaction) txx;
+    mapping (uint256 => uint256) purposeThreshold;
+    
+    uint256 nonce;
+    address recoveryContract;
+    address recoveryManager;
+
+    struct Transaction {
+        bool valid;
+        address to;
+        uint256 value;
+        bytes data;
+        uint256 nonce;
+        uint256 approverCount;
+        mapping(bytes32 => bool) approvals;
+    }
+
+    modifier managerOnly {
+        require(
+            isKeyPurpose(bytes32(msg.sender), MANAGEMENT_KEY)
+        );
+        _;
+    }
+
+    modifier managementOnly {
+        if(msg.sender == address(this)) {
+            _;
+        } else {
+            require(isKeyPurpose(bytes32(msg.sender), MANAGEMENT_KEY));
+            if (purposeThreshold[MANAGEMENT_KEY] == 1) {
+                _;
+            } else {
+                execute(address(this), 0, msg.data);
+            }
+        }
+    }
+    modifier recoveryOnly {
+        require(
+            recoveryContract != address(0) && 
+            msg.sender == address(recoveryContract)
+        );
+        _;
+    }
+
+    modifier keyPurposeOnly(bytes32 _key, uint256 _purpose) {
+        require(isKeyPurpose(_key, _purpose));
+        _;
+    }
+    
+    modifier managerOrActor(bytes32 _key) {
+        require(
+            isKeyPurpose(_key, MANAGEMENT_KEY) || 
+            isKeyPurpose(_key, ACTION_KEY)
+        );
+        _;
+    }
+    
+    modifier validECDSAKey (
+        bytes32 _key, 
+        bytes32 _signHash, 
+        uint8 _v, 
+        bytes32 _r,
+        bytes32 _s
+    ) 
+    {
+        require(
+            address(_key) == ecrecover(
+                keccak256("\x19Ethereum Signed Message:\n32", _signHash),
+                _v,
+                _r,
+                _s
+                )
+            );
+        require(keys[_key].purpose != 0);
+        _;
+    }
+
+    function Identity() public {
+        _constructIdentity(msg.sender);
+    }    
+
+    function () 
+        public 
+        payable 
+    {
+
+    }
+
+    function managerReset(address _newKey) 
+        public 
+        recoveryOnly
+    {
+        recoveryManager = _newKey;
+        _addKey(bytes32(recoveryManager), MANAGEMENT_KEY, 0);
+        purposeThreshold[MANAGEMENT_KEY] = keysByPurpose[MANAGEMENT_KEY].length;
+    }
+    
+    function processManagerReset(uint256 _limit) 
+        public 
+    {
+        require(recoveryManager != address(0));
+        uint256 limit = _limit;
+        bytes32 newKey = bytes32(recoveryManager);
+        bytes32[] memory managers = keysByPurpose[MANAGEMENT_KEY];
+        uint256 totalManagers = managers.length;
+        
+        if (limit == 0) {
+            limit = totalManagers;
+        }
+
+        purposeThreshold[MANAGEMENT_KEY] = totalManagers - limit + 1;
+        for (uint256 i = 0; i < limit; i++) {
+            bytes32 manager = managers[i];
+            if (manager != newKey) {
+                _removeKey(manager, MANAGEMENT_KEY);
+                totalManagers--;
+            }
+        }
+
+        if (totalManagers == 1) {
+            recoveryManager = address(0);
+        }
+    }
+
+    function addKey(
+        bytes32 _key,
+        uint256 _purpose,
+        uint256 _type
+    )
+        public
+        managementOnly
+        returns (bool success)
+    {   
+        _addKey(_key, _purpose, _type);
+        return true;
+    }
+
+    function replaceKey(
+        bytes32 _oldKey,
+        bytes32 _newKey,
+        uint256 _newType
+    )
+        public
+        managementOnly
+        returns (bool success)
+    {
+        uint256 purpose = keys[_oldKey].purpose;
+        _addKey(_newKey, purpose, _newType);
+        _removeKey(_oldKey, purpose);
+        return true;
+    } 
+
+    function removeKey(
+        bytes32 _key,
+        uint256 _purpose
+    )
+        public
+        managementOnly
+        returns (bool success)
+    {
+        _removeKey(_key, _purpose);
+        return true;
+    }
+
+    function execute(
+        address _to,
+        uint256 _value,
+        bytes _data
+    ) 
+        public 
+        returns (uint256 executionId)
+    {
+        uint256 requiredKey = _to == address(this) ? MANAGEMENT_KEY : ACTION_KEY;
+        if (purposeThreshold[requiredKey] == 1) {
+            executionId = nonce; //(?) useless in this case
+            nonce++; //(?) should increment
+            require(isKeyPurpose(bytes32(msg.sender), requiredKey));
+            _to.call.value(_value)(_data); //(?) success not used
+            emit Executed(executionId, _to, _value, _data); //no information on success
+        } else {
+            executionId = _execute(_to, _value, _data);
+            approve(executionId, true);
+        }
+        
+    }
+
+    function approve(uint256 _id, bool _approval) 
+        public 
+        managerOrActor(bytes32(msg.sender))
+        returns (bool success)
+    {   
+        return _approve(bytes32(msg.sender), _id, _approval);
+    }
+
+    function setMinimumApprovalsByKeyType(
+        uint256 _purpose,
+        uint256 _minimumApprovals
+    ) 
+        public 
+        managementOnly
+    {
+        require(_minimumApprovals > 0);
+        require(_minimumApprovals <= keysByPurpose[_purpose].length);
+        purposeThreshold[_purpose] = _minimumApprovals;
+    }
+    
+    
+    function addClaim(
+        uint256 _claimType,
+        uint256 _scheme,
+        address _issuer,
+        bytes _signature,
+        bytes _data,
+        string _uri
+    ) 
+        public 
+        returns (bytes32 claimHash)
+    {
+        claimHash = keccak256(_issuer, _claimType);
+        if (msg.sender == address(this)) {
+            if (claims[claimHash].claimType > 0) {
+                _modifyClaim(claimHash, _claimType, _scheme, _issuer, _signature, _data, _uri);
+            } else {
+                _includeClaim(claimHash, _claimType, _scheme, _issuer, _signature, _data, _uri);
+            }
+        } else {
+            require(_issuer == msg.sender);
+            require(isKeyPurpose(bytes32(msg.sender), CLAIM_SIGNER_KEY));
+            _execute(address(this), 0, msg.data);
+            emit ClaimRequested(
+                claimHash,
+                _claimType,
+                _scheme,
+                _issuer,
+                _signature,
+                _data,
+                _uri
+            );
+        }
+    }
+    
+    function removeClaim(bytes32 _claimId) 
+        public 
+        returns (bool success) 
+    {
+        Claim memory c = claims[_claimId];
+        
+        require(
+            msg.sender == c.issuer ||
+            msg.sender == address(this)
+            );
+        
+        // MUST only be done by the issuer of the claim, or KEYS OF PURPOSE 1, or the identity itself.
+        // TODO If its the identity itself, the approval process will determine its approval.
+        
+        uint256 claimIdTypePos = indexes[_claimId];
+        delete indexes[_claimId];
+        bytes32[] storage claimsTypeArr = claimsByType[c.claimType];
+        bytes32 replacer = claimsTypeArr[claimsTypeArr.length-1];
+        claimsTypeArr[claimIdTypePos] = replacer;
+        indexes[replacer] = claimIdTypePos;
+        delete claims[_claimId];
+        claimsTypeArr.length--;
+        return true;
+    }
+
+    function getKey(
+        bytes32 _key,
+        uint256 _purpose
+    ) 
+        public 
+        view 
+        returns(uint256 purpose, uint256 keyType, bytes32 key) 
+    {
+        Key storage myKey = keys[keccak256(_key, _purpose)];
+        return (myKey.purpose, myKey.keyType, myKey.key);
+    }
+    
+    function isKeyPurpose(bytes32 _key, uint256 _purpose) 
+        public
+        view 
+        returns (bool)
+    {
+        return keys[keccak256(_key, _purpose)].purpose == _purpose;
+    }
+
+    function getKeyPurpose(bytes32 _key)
+        public 
+        view 
+        returns(uint256[] purpose)
+    {
+        
+        uint256[] memory purposeHolder = new uint256[](4);
+        uint8 counter = 0;
+        
+        if (isKeyPurpose(_key, MANAGEMENT_KEY)) {
+            purposeHolder[counter] = MANAGEMENT_KEY;
+            counter++;
+        }
+        
+        if (isKeyPurpose(_key, ACTION_KEY)) {
+            purposeHolder[counter] = ACTION_KEY;
+            counter++;
+        }
+            
+        if (isKeyPurpose(_key, CLAIM_SIGNER_KEY)) {
+            purposeHolder[counter] = CLAIM_SIGNER_KEY;
+            counter++;
+        }
+            
+        if (isKeyPurpose(_key, ENCRYPTION_KEY)) {
+            purposeHolder[counter] = ENCRYPTION_KEY;
+            counter++;
+        }
+        
+        uint256[] memory result = new uint256[](counter);
+        for (uint8 i = 0; i < counter; i++) {
+            result[i] = purposeHolder[i];
+        }
+        
+        return result;
+    }
+    
+    function getKeysByPurpose(uint256 _purpose)
+        public
+        view
+        returns(bytes32[])
+    {
+        return keysByPurpose[_purpose];
+    }
+    
+    function getClaim(bytes32 _claimId)
+        public
+        view 
+        returns(
+            uint256 claimType,
+            uint256 scheme,
+            address issuer,
+            bytes signature,
+            bytes data,
+            string uri
+            ) 
+    {
+        Claim memory _claim = claims[_claimId];
+        return (_claim.claimType, _claim.scheme, _claim.issuer, _claim.signature, _claim.data, _claim.uri);
+    }
+    
+    function getClaimIdsByType(uint256 _claimType)
+        public
+        view
+        returns(bytes32[] claimIds)
+    {
+        return claimsByType[_claimType];
+    }
+
+    function approveECDSA(
+        uint256 _id,
+        bool _approval,
+        bytes32 _key, 
+        uint8 _v, 
+        bytes32 _r, 
+        bytes32 _s
+    ) 
+        public 
+        validECDSAKey(
+            _key,
+            keccak256(
+                address(this),
+                bytes4(keccak256("approve(uint256,bool)")),
+                _id,
+                _approval
+                ),
+            _v,
+            _r,
+            _s
+        )
+        managerOrActor(_key)
+        returns (bool success)
+    {   
+        return _approve(_key, _id, _approval);
+    }
+    
+    function executeECDSA(
+        address _to,
+        uint256 _value,
+        bytes _data,
+        uint256 _nonce,
+        bytes32 _key, 
+        uint8 _v, 
+        bytes32 _r, 
+        bytes32 _s
+    ) 
+        public 
+        validECDSAKey(
+            _key,
+            keccak256(
+                address(this), 
+                bytes4(keccak256("execute(address,uint256,bytes)")), 
+                _to,
+                _value,
+                _data,
+                _nonce
+            ),
+            _v,
+            _r,
+            _s
+        )
+        managerOrActor(_key)
+        returns (uint256 executionId)
+    {
+        executionId = _execute(_to, _value, _data);
+        _approve(_key, executionId, true);
+    }
+
+    function setupRecovery(address _recoveryContract) 
+        public
+        managementOnly
+    {
+        require(recoveryContract == address(0));
+        recoveryContract = _recoveryContract;
+    }
+    
+    function _constructIdentity(address _manager)
+        internal 
+    {
+        require(keysByPurpose[MANAGEMENT_KEY].length == 0);
+        require(purposeThreshold[MANAGEMENT_KEY] == 0);
+        _addKey(bytes32(_manager), MANAGEMENT_KEY, 0);
+        _addKey(bytes32(_manager), ACTION_KEY, 0);
+
+        purposeThreshold[MANAGEMENT_KEY] = 1;
+        purposeThreshold[ACTION_KEY] = 1;
+    }
+
+    function _execute(
+        address _to,
+        uint256 _value,
+        bytes _data
+    ) 
+        private
+        returns (uint256 executionId)
+    {
+        executionId = nonce;
+        nonce++;
+        txx[executionId] = Transaction({
+            valid: true,
+            to: _to,
+            value: _value,
+            data: _data,
+            nonce: nonce,
+            approverCount: 0
+        });            
+        emit ExecutionRequested(executionId, _to, _value, _data);
+    }
+    
+    function _approve(
+        bytes32 _key,
+        uint256 _id,
+        bool _approval
+    ) 
+        private 
+        returns(bool success) //(?) should return approved instead of success?
+    {
+        
+        Transaction memory trx = txx[_id];
+        require(trx.valid);
+        uint256 requiredKeyPurpose = trx.to == address(this) ? MANAGEMENT_KEY : ACTION_KEY;
+        require(isKeyPurpose(_key, requiredKeyPurpose));
+        bytes32 keyHash = keccak256(_key, requiredKeyPurpose);
+        require(txx[_id].approvals[keyHash] != _approval);
+        
+        if (_approval) {
+            trx.approverCount++;
+        } else {
+            trx.approverCount--;
+        }
+    
+        emit Approved(_id, _approval);
+
+        if (trx.approverCount < purposeThreshold[requiredKeyPurpose]) {
+            txx[_id].approvals[keyHash] = _approval;
+            txx[_id] = trx;
+        } else {
+            delete txx[_id];
+            //(?) success should be included in event?
+            success = address(trx.to).call.value(trx.value)(trx.data);
+            emit Executed(_id, trx.to, trx.value, trx.data);
+            
+        }
+    }
+
+    function _addKey(
+        bytes32 _key,
+        uint256 _purpose,
+        uint256 _type
+    ) 
+        private
+    {
+        bytes32 keyHash = keccak256(_key, _purpose);
+        
+        require(keys[keyHash].purpose == 0);
+        require(
+            _purpose == MANAGEMENT_KEY ||
+            _purpose == ACTION_KEY ||
+            _purpose == CLAIM_SIGNER_KEY ||
+            _purpose == ENCRYPTION_KEY
+        );
+        keys[keyHash] = Key(_purpose, _type, _key);
+        indexes[keyHash] = keysByPurpose[_purpose].push(_key) - 1;
+        emit KeyAdded(_key, _purpose, _type);
+    }
+
+    function _removeKey(
+        bytes32 _key,
+        uint256 _purpose
+    )
+        private 
+    {
+        if (_purpose == MANAGEMENT_KEY) {
+            require(keysByPurpose[MANAGEMENT_KEY].length > purposeThreshold[MANAGEMENT_KEY]);
+        }
+
+        bytes32 keyHash = keccak256(_key, _purpose);
+        Key memory myKey = keys[keyHash];
+        uint256 index = indexes[keyHash];
+        bytes32 indexReplacer = keysByPurpose[_purpose][keysByPurpose[_purpose].length - 1];
+        
+        keysByPurpose[_purpose][index] = indexReplacer;
+        indexes[keccak256(indexReplacer, _purpose)] = index;
+        keysByPurpose[_purpose].length--;
+
+        delete indexes[keyHash];
+        delete keys[keyHash];
+
+        emit KeyRemoved(myKey.key, myKey.purpose, myKey.keyType);
+    }
+
+    function _includeClaim(
+        bytes32 _claimHash,
+        uint256 _claimType,
+        uint256 _scheme,
+        address _issuer,
+        bytes _signature,
+        bytes _data,
+        string _uri
+    ) 
+        private
+    {
+        claims[_claimHash] = Claim(
+            {
+            claimType: _claimType,
+            scheme: _scheme,
+            issuer: _issuer,
+            signature: _signature,
+            data: _data,
+            uri: _uri
+            }
+        );
+        indexes[_claimHash] = claimsByType[_claimType].length;
+        claimsByType[_claimType].push(_claimHash);
+        emit ClaimAdded(
+            _claimHash,
+            _claimType,
+            _scheme,
+            _issuer,
+            _signature,
+            _data,
+            _uri
+        );
+    }
+
+
+    function _modifyClaim(
+        bytes32 _claimHash,
+        uint256 _claimType,
+        uint256 _scheme,
+        address _issuer,
+        bytes _signature,
+        bytes _data,
+        string _uri
+    ) 
+        private
+    {
+        require(msg.sender == _issuer);
+        claims[_claimHash] = Claim({
+            claimType: _claimType,
+            scheme: _scheme,
+            issuer: _issuer,
+            signature: _signature,
+            data: _data,
+            uri: _uri
+        });
+        emit ClaimChanged(
+            _claimHash,
+            _claimType,
+            _scheme,
+            _issuer,
+            _signature,
+            _data,
+            _uri
+        );
+    }
+
+
+}
+

contracts/identity/IdentityFactory.sol

@@ -0,0 +1,35 @@
+pragma solidity ^0.4.17;
+
+import "../deploy/Factory.sol";
+import "../deploy/DelayedUpdatableInstance.sol";
+import "./IdentityKernel.sol";
+
+
+contract IdentityFactory is Factory {
+
+    event IdentityCreated(address instance);
+
+    function IdentityFactory(bytes _infohash) 
+        public
+        Factory(new IdentityKernel())
+    {
+    }
+
+    function createIdentity() 
+        external 
+        returns (address)
+    {
+        return createIdentity(msg.sender);
+    }
+
+    function createIdentity(address _idOwner) 
+        public 
+        returns (address)
+    {
+        IdentityKernel instance = IdentityKernel(new DelayedUpdatableInstance(address(latestKernel)));
+        instance.initIdentity(_idOwner);
+        emit IdentityCreated(address(instance));
+        return instance;
+    }
+
+}

contracts/identity/IdentityKernel.sol

@@ -0,0 +1,11 @@
+pragma solidity ^0.4.17;
+
+import "../deploy/DelayedUpdatableInstanceStorage.sol";
+import "./Identity.sol";
+
+contract IdentityKernel is DelayedUpdatableInstanceStorage, Identity {
+
+    function initIdentity(address _caller) external {
+        _constructIdentity(_caller);
+    }
+}

contracts/tests/TestContract.sol

@@ -0,0 +1,33 @@
+pragma solidity ^0.4.17;
+
+
+contract TestContract {
+
+    event TestFunctionExecuted();
+
+    function test() public {
+        TestFunctionExecuted();
+    }   
+
+    /*
+    Helper function to be used in unit testing due to error in web3
+    web3.utils.soliditySha3([1, 2, 3])
+    Error: Autodetection of array types is not supported.
+    at _processSoliditySha3Args (node_modules/web3-utils/src/soliditySha3.js:176:15)
+    */
+    function hash(
+        address identity,
+        bytes32 _revealedSecret,
+        address _dest,
+        bytes _data,
+        bytes32 _newSecret,
+        bytes32[] _newFriendsHashes)
+        public
+        pure
+        returns(bytes32)
+    {
+        return keccak256(identity, _revealedSecret, _dest, _data, _newSecret, _newFriendsHashes);
+        
+    }
+
+}

contracts/tests/UpdatedIdentityKernel.sol

@@ -0,0 +1,13 @@
+pragma solidity ^0.4.17;
+
+import "../identity/IdentityKernel.sol";
+
+
+contract UpdatedIdentityKernel is IdentityKernel {
+
+    event TestFunctionExecuted(uint256 minApprovalsByManagementKeys);
+
+    function test() public {
+        TestFunctionExecuted(purposeThreshold[MANAGEMENT_KEY]);
+    }   
+}

docs/Identity.md

@@ -0,0 +1,144 @@
+# Identity contracts
+
+# Table of content
+- [Summary](#summary)
+- [Smart Contracts Overview](#smart-contracts-overview)
+- [Tutorials](#tutorials)
+- - [Identity Creation](#identity-creation)
+- - [Executions and Approvals](#executions-and-approvals)
+- - [Management Activities](#management-activities)
+- - [Constants / View functions](#constants--view-functions)
+- - [Adding new functionality to identitities](#adding-new-functionality-to-identitities)
+- - [Upgrade an `IdentityKernel` instance](#upgrade-an-identitykernel-instance)
+- - [Setting up Identity Recovery contract](#setting-up-identity-recovery-contract)
+- - [Recovering an Identity](#recovering-an-identity)
+## Summary
+This is a proposed proof of concept for the implementation of interfaces [ERC-725](https://github.com/ethereum/EIPs/issues/725) and [ERC735](https://github.com/ethereum/EIPs/issues/725), providing the following functionality:
+- Public key register, composed of Ethereum Addresses and ECDSA keys. These keys can perform management activities over the identity itself, as well as performing operations in other contracts and transfer of ether.
+- Claim holding, that can be used to add / verify claims against an identity.
+- Identity factory to simplify the process of instantiating an Identity contract, as well as handling the upgrade process of this instance, assuming there's a new version of this contract.
+- Identity recovery process that can be initiated using a shared secret among keys related to the identity.
+
+## Smart Contracts Overview
+- `Controlled`. Keeps tracks of the controller or owner of the contract. Provides the modifier `onlyController` which can be used in child contracts.
+- `DelegatedCall`. Abstract contract that delegates calls using the `delegated` modifier to the result of `targetDelegatedCall()` function.
+- `InstanceStorage`. 
+Defines kernel vars that an `IdentityKernel` contract share with a `Instance` contract. If you wish to reuse this contract, it is important to avoid overwriting wrong storage pointers, so `InstanceStorage` should be always the first contract to be inherited.
+- `Instance`. Contract that forwards everything through `delegatecall` to a defined `IdentityKernel`. This contracts inherits from `InstanceStorage` and `DelegatedCall`
+- `UpdatableInstance`. A contract that can be updated, if the contract itself calls `updateUpdatableInstance()`. This contract inherits from `Instance`
+- `DelayedUpdatableInstanceStorage`. This contract defines kernel vars that an `IdentityKernel` contract shares with and `Instance`. See `InstanceStorage` fro restrictions in case of reuse. This contract inherits from `InstanceStorage`
+- `DelayedUpdatableInstance`. Extending the functionality of `UpdatableInstance`, this contract introduces a delay functionality based in the `block.timestamp` in order to limit updates with a 30 days lock. 
+- `Factory`. Contract used as a version control for child factories contracts
+- `ERC725` and `ERC735`. Interfaces based on EIPs [ERC-725: Identity](https://github.com/ethereum/EIPs/issues/725) and [ERC735: Claims Holder](https://github.com/ethereum/EIPs/issues/725)
+- `Identity`. Implementation of ERC725 and ERC735. Includes additional management functions to handle minimum required approvals for execution of transactions, as well as recovery related functions.
+- `IdentityKernel`. Represents a version of the identity contract that can be created with the `IdentityFactory`, as well as be updated with calls to itself. This contract inherits from `DelayedUpdatableInstanceStorage` and `Identity`
+- `FriendsRecovery`. Contract that handles the recovery process of an `Identity` in case the management keys are lost, or were compromised. A `FriendsRecovery` contract instance has an 1:1 association with an `Identity`
+- `IdentityFactory`. Deploys `DelayedUpdatableInstanceStorage` configured to a deployed `IdentityKernel` and initializes the Instance with `initIdentity` function from kernel.  
+
+## Tutorials
+
+### Identity Creation
+We recommend to not create `Identity` instances directly, but create them through the `IdentityFactory` which is deployed in: `0x000000000000000000000000`, and provides the following functions:
+- `createIdentity()` - will create a new instance of an `IdentityKernel`, with `msg.sender` as a management key.
+- `createIdentity(address _idOwner)` - used to specify the owner / management key of a new identity.
+
+The event `IdentityCreated` is triggered when the new identity is created successfully.
+
+### Executions and Approvals
+Identities can perform management activities on themselves, as well as performing actions in other contracts. These operations are performed with the `execute()` and `approve()` functions.
+
+`execute(address _to, uint256 _value, bytes _data)` is called when you wish to perform an operation. This function may be called by a management key or by an action key and triggers an `ExecutionRequested` event. Management keys are required when `_to` refers to the identity itself, otherwise, action keys are required.
+
+The `_value` parameters refer to the amount in ether that this transaction will send to the contract/wallet address specified in `_to`. The identity contract should have funds if the value is greater than `0`.
+
+`_data` refers to the byte encoding of the operations and parameters to be executed.  `web3.eth.abi.encodeFunctionCall` is useful to generate the bytecode to be sent in this function. Here's an example on how to use it to call the `addKey` function of the identity contract: 
+
+```
+const web3EthAbi = require("web3-eth-abi");
+let data = web3EthAbi.encodeFunctionCall({
+    name: 'addKey',
+    type: 'function',
+    inputs: [{
+        type: 'bytes32',
+        name: '_key'
+    },{
+        type: 'uint256',
+        name: '_purpose'
+    },{
+        type: 'uint256',
+        name: '_type'
+    }]
+}, ["0x1234567", 1, 1]);
+
+let receipt = await identityContractInstance.execute(identityContractInstance.address, 0, data).send({from: accounts[0]});
+```
+A javascript utils library is provided in `utils/identityUtils.js` which can be used to generate the payloads used in the `_data` parameter of the `execute` function
+
+Once the `execute` function is executed, if the minimum required approvals by key purpose is one, the transaction is executed immediatly (Triggering the `Approved` and `Executed` events).
+
+In case the minimum required approvals are greater than 1, `approve(uint256 _id, bool _approval)` needs to be called by N management or action keys depending on the operation to perform, each call triggering an `Approved` event. Once the minimum approvals required is reached, the transaction will be executed immediatly. This `approve` function requires an transaction execution id, which can be obtained by the `ExecutionRequested` event triggered by the `execute` function.
+
+### Management Activities
+Identity management is limited to the addition, removal and setting of the minimum required approvals to perform a transaction. These activities will fall into the approval process requiring that N managers approve their execution before it is performed.
+- `addKey(bytes32 _key, uint256 _purpose, uint256 _type)`. Registers a key in the identity. Keys should have a defined purpose and type. The `_purpose` of a key can be `1` - Management keys, used only to perform management activities; `2` - Action keys, used only to perform calls to external contracts and sending ether; `3` - Claim signer key, which are keys that can add claims to the identity; and `4` - Encryption keys, at the moment used only for information purposes. The `_type` of keys supported at the moment are `0` for ethereum addresses, `1` for ECDSA. Keys are stored as a bytes32 value. Both `_purpose` and `_type` accepts `uint256` types, so they're not limited to the values described in here. It is worth mentioning that keys can have more than one purpose and `addKey` can be called for the same key more than once, assuming the purpose is different each time it is called. Triggers a `KeyAdded` event.
+- `removeKey(bytes32 _key, uint256 _purpose)`. Used to remove an existing key-purpose pair. It will fail if you're removing a management key, and there is only one management key registered in the identity. Triggers a `KeyRemoved` event.
+- `replaceKey(bytes32 _oldKey, bytes32 _newKey, uint256 _newType)`. Used to replace an existing key, for a new one that can have a different type. Triggers both a `KeyRemoved` and `KeyAdded` event.
+- `setMinimumApprovalsByKeyType(uint256 _purpose, uint256 _minimumApprovals)`. By default, an `Identity` has only one management key registered (the owner of the identity), however it is possible to have more than one management key registered with `addKey`, and require a N of M approvals (both for Management and Action keys). This is done with this function, where you have to specify number of minimum approvals required by key purpose.
+
+### Claims
+Lorem Ipsum
+
+### Constants / View functions
+The following functions are provided to access information about an identity:
+- `getKey(bytes32 _key, uint256 _purpose)`. Returns the key type, purpose and key for a given key-purpose pair
+- `isKeyPurpose(bytes32 _key, uint256 _purpose)` returns if a given key-purpose exists, and if it's purpose is actually what was specified.
+- `getKeyPurpose(bytes32 _key)` returns an array of purposes for a given key.
+- `function getKeysByPurpose(uint256 _purpose)` returns an array of keys for a given purpose.
+- `getClaim(bytes32 _claimId)` returns the claim information registered for a given claim Id.
+- `getClaimIdsByType(uint256 _claimType)` returns an array of claim Ids for a given claim type.
+
+### Adding new functionality to identitities
+New versions of identities should extend from `IdentityKernel` and need to be registered in the `IdentityFactory`. This is done by creating a new instance of the new contract which inherits from `IdentityKernel`, and then calling the `setKernel` function of the `IdentityFactory` specifiying the address of the updated identity kernel, and a `bytes32` info hash with the description of the new version.
+Once updated, a `NewKernel` event is triggered.
+
+### Upgrade an `IdentityKernel` instance 
+When an identity instance needs to be upgraded, we can use the execute/approve process to upgrade it to an specific version. This upgrade process requires using `execute` to call two functions
+- `updateRequestUpdatableInstance(address _newKernel)`. This will generate a pending request for upgrading an instance `30 days` later and trigger an UpdateRequested event. 
+- `updateConfirmUpdatableInstance(address _newKernel)`. After `30 days` pass, this function needs to be invoked to confirm the update process. Once the update process is completed a UpdateConfirmed event is triggered.
+- An request for update can be cancelled if it hasn't been approved yet. This is done using the function `updateCancelUpdatableInstance()` with the same execute/approve process 
+
+Kernel addresses could be obtained using the `getVersion` function of the `IdentityFactory`
+
+### Setting up Identity Recovery contract
+After creating an identity with the `IdentityFactory`, an instance of `FriendsRecovery` need to be created. The constructor of this contract expects the following parameters:
+- `_identity`: The identity contract address
+- `_setupDelay`: Time for users to be able to change the selected friends for recovery.
+- `_threshold`: Minimum number of friends required to recover an identity
+- `_secret`: sha3 of the identity address + a secret word
+- `friendHashes`: an array of sha3 hashes compossed of the identity address + secret word + friend ethereum address.
+
+Once this recovery contract is created, we need to associate it with the identity. This is done through the execute/approve mechanism of the identity, sending a payload to invoke the `setupRecovery` function of the identity, passing the recovery contract address as a parameter.
+
+
+### Recovering an Identity
+Recovery of an identity happens when you lose access to the management key(s) or Identity. The recovery is done having the friends sign a message. This message is a sha3 hash compossed of:
+
+```
+recovery address + secret word + contract to invoke (identity) +  the function and parameters of the function to invoke encoded (recover function of identity) + 
+new secret word hash + new friend hashes. 
+```
+
+Where new `new secret word hash` is a sha3 of the identity address + secret word; and `new friend hashes` is an array of sha3 hashes compossed of the identity address + secret word + friend ethereum address).
+
+Normally the function that is going to be encoded should be the identity `managerReset` with the address of the new management key.
+
+A minimum of (threshold) friends should approve this recovery attempt, and this can be done by them spending gas, calling the `approve` function of the recovery contract; or by having a single address (probably the identity owner) calling `approvePreSigned`.
+
+`approve` could be called sending the sha3 hashed message described previously through a regular transaction , and `approvePreSigned` needs gathering the signatures of the hashed message into different arrays (for v, r, and s)
+
+To enhance privacy, any account can approve anything, however only revealed addresses will be used.
+
+Once the approvation is complete, the `execute` function of the recovery contract needs to be called, with the parameters used to generate the hashed message, and after the recovery is completed, `processManagerReset` needs to be executedn on the identity to remove all the management keys different from the new management key used for the recovery
+
+An example of how to use the recovery contract is available in `test/friendsRecovery.js`.
+

test/factory.js

@@ -0,0 +1,136 @@
+const assert = require('assert');
+const Embark = require('embark');
+let EmbarkSpec = Embark.initTests();
+let web3 = EmbarkSpec.web3;
+
+const identityJson = require('../dist/contracts/Identity.json');
+const updatedIdentityKernelJson = require('../dist/contracts/UpdatedIdentityKernel.json');
+
+const TestUtils = require("../utils/testUtils.js")
+const idUtils = require("../utils/identityUtils.js")
+
+describe('IdentityFactory', function(accounts) {
+
+    let identityFactory;
+    let identity;
+    let updatedIdentity;
+    let updatedIdentityKernel;
+
+    before( function(done) {
+        this.timeout(0);
+        
+        EmbarkSpec = Embark.initTests();
+        web3 = EmbarkSpec.web3;
+
+        EmbarkSpec.deployAll({
+            "IdentityFactory": {
+                args: ["0xaaaa"],
+                gas: 5000000
+            },
+            "Identity": {},
+            "UpdatedIdentityKernel": {}
+        }, (_accounts) => { 
+            accounts = _accounts;  
+            done();          
+        });
+    });
+
+
+    it("Creates a new identity", async () => {
+        let tx = await IdentityFactory.methods.createIdentity().send({from: accounts[0]});
+
+        const logEntry = tx.events.IdentityCreated;
+
+        assert(logEntry !== undefined, "IdentityCreated was not triggered");
+
+        let identity = new web3.eth.Contract(identityJson.abi, logEntry.returnValues.instance, {from: accounts[0]});
+        
+        assert.equal(
+            await identity.methods.getKeyPurpose(TestUtils.addressToBytes32(accounts[0])).call(),
+            idUtils.purposes.MANAGEMENT,
+            identity.address + ".getKeyPurpose("+accounts[0]+") is not MANAGEMENT_KEY")
+    });
+
+
+    it("Registers a updated identity contract", async() => {
+        const infoHash = "0xbbbb";
+        let receipt = await IdentityFactory.methods.setKernel(UpdatedIdentityKernel.address, infoHash).send({from: accounts[0]});
+        
+        const newKernel = TestUtils.eventValues(receipt, "NewKernel");
+        assert(newKernel.infohash, infoHash, "Infohash is not correct");
+    });
+
+    
+    it("Creates a new identity using latest version", async() => {
+        let tx = await IdentityFactory.methods.createIdentity().send({from: accounts[0]});
+
+        assert.notEqual(tx.events.IdentityCreated, undefined, "IdentityCreated wasn't triggered");
+
+        const contractAddress = tx.events.IdentityCreated.returnValues.instance;
+
+        
+        let updatedIdentity = new web3.eth.Contract(updatedIdentityKernelJson.abi, contractAddress, {from: accounts[0]});
+        
+        tx = await updatedIdentity.methods.test().send({from: accounts[0]});
+        assert.notEqual(tx.events.TestFunctionExecuted, undefined, "TestFunctionExecuted wasn't triggered");
+        
+        // Test if it still executes identity functions as expected
+        let baseIdentity = new web3.eth.Contract(identityJson.abi, contractAddress, {from: accounts[0]});
+        
+        assert.equal(
+            await baseIdentity.methods.getKeyPurpose(TestUtils.addressToBytes32(accounts[0])).call(),
+            1,
+            baseIdentity.address + ".getKeyPurpose("+accounts[0]+") is not MANAGEMENT_KEY")
+    });
+
+
+    it("Updates an identity to the latest version", async() => {
+        let tx1 = await Identity.methods.execute(
+            Identity.address, 
+            0, 
+            idUtils.encode.updateRequestUpdatableInstance(UpdatedIdentityKernel.address))
+            .send({from: accounts[0]});
+
+        assert.notEqual(tx1.events.Executed, undefined, "Executed wasn't triggered");
+
+        // Updating EVM timestamp to test delay
+        const plus31days = 60 * 60 * 24 * 31;
+
+        /*
+        // @rramos - The following code is supposed to increase by 31 days the evm date,
+        // and mine one block. It is commented because it seems to not be working on web3 1.0.
+        // Also, sendAsync is supposed to be named send in this version, yet it shows an error
+        // that it does not support synchronous executions. (?)
+        // TODO: figure it out!
+
+        web3.currentProvider.send({jsonrpc: "2.0", method: "evm_increaseTime", params: [plus31days], id: 0}, function(){console.log(1);});
+        web3.currentProvider.send({jsonrpc: "2.0", method: "evm_mine", params: [], id: 0}, function(){console.log(2);})
+        
+
+        
+        // Confirm update
+        let tx2 = await Identity.methods.execute(
+            Identity.address, 
+            0, 
+            idUtils.encode.updateConfirmUpdatableInstance(UpdatedIdentityKernel.address))
+            .send({from: accounts[0]});
+
+        assert.notEqual(tx2.events.Executed, undefined, "Executed wasn't triggered");
+
+
+        let updatedIdentity1 = new web3.eth.Contract(updatedIdentityKernelJson.abi, Identity.address, {from: accounts[0]});
+      
+        // Calling 
+        let tx3 = await updatedIdentity1.methods.test().send({from: accounts[0]});
+        assert.notEqual(tx3.events.TestFunctionExecuted, undefined, "TestFunctionExecuted wasn't triggered");
+        assert.equal(
+            tx3.events.TestFunctionExecuted.returnValues.minApprovalsByManagementKeys.toString(10),
+            1,
+            Identity.address + " wasn't updated to last version");
+        
+        */
+    })
+    
+
+});
+

test/identity.js

@@ -0,0 +1,497 @@
+
+const assert = require('assert');
+const Embark = require('embark');
+let EmbarkSpec = Embark.initTests();
+let web3 = EmbarkSpec.web3;
+const TestUtils = require("../utils/testUtils.js");
+const idUtils = require('../utils/identityUtils.js');
+
+describe("Identity", function() {
+    this.timeout(0);
+
+    let accounts;
+
+    beforeEach( function(done) {
+        this.timeout(0);
+        
+        EmbarkSpec = Embark.initTests();
+        web3 = EmbarkSpec.web3;
+
+        EmbarkSpec.deployAll({ 
+                "Identity": {},
+                "TestContract": {}
+            }, (_accounts) => { 
+            accounts = _accounts;  
+            done();          
+        });
+    });
+
+    describe("Identity()", () => {
+        it("initialize with msg.sender as management key", async () => {
+            assert.equal(
+                await Identity.methods.getKeyPurpose(TestUtils.addressToBytes32(accounts[0])).call(),
+                idUtils.purposes.MANAGEMENT,
+                Identity.address + ".getKeyPurpose("+accounts[0]+") is not MANAGEMENT_KEY");
+
+        });
+    });
+
+
+    describe("addKey(address _key, uint256 _type)", () => {
+        it("MANAGEMENT_KEY add a new address as ACTION_KEY", async () => {
+            await Identity.methods.execute(
+                Identity.address, 
+                0, 
+                idUtils.encode.addKey(accounts[1], idUtils.purposes.ACTION, idUtils.types.ADDRESS)
+            ).send({from: accounts[0]});
+
+            assert.equal(
+                await Identity.methods.getKeyPurpose(TestUtils.addressToBytes32(accounts[1])).call(),
+                idUtils.purposes.ACTION,
+                Identity.address+".getKeyPurpose("+accounts[1]+") is not ACTION_KEY");
+        });
+
+        it("should not add key by non manager", async () => {            
+            try {
+                await Identity.methods.execute(
+                    Identity.address, 
+                    0, 
+                    idUtils.encode.addKey(accounts[1], idUtils.purposes.MANAGEMENT, idUtils.types.ADDRESS))
+                    .send({from: accounts[2]});
+                assert.fail('should have reverted before');
+            } catch(error) {
+                TestUtils.assertJump(error);
+            }
+            
+            assert.equal(
+                await Identity.methods.getKeyPurpose(TestUtils.addressToBytes32(accounts[1])).call(),
+                idUtils.purposes.NONE,
+                Identity.address+".getKeyPurpose("+accounts[1]+") is not correct");
+
+        });
+
+        it("should not add key type 1 by actor", async () => {  
+            await Identity.methods.execute(
+                Identity.address, 
+                0, 
+                idUtils.encode.addKey(accounts[2], idUtils.purposes.ACTION, idUtils.types.ADDRESS))
+                .send({from: accounts[0]});
+            
+            try {
+                await Identity.methods.execute(
+                    Identity.address, 
+                    0, 
+                    idUtils.encode.addKey(accounts[1], idUtils.purposes.MANAGEMENT, idUtils.types.ADDRESS))
+                    .send({from: accounts[2]});
+                assert.fail('should have reverted before');
+            } catch(error) {
+                TestUtils.assertJump(error);
+            }
+                
+            assert.equal(
+                await Identity.methods.getKeyPurpose(TestUtils.addressToBytes32(accounts[1])).call(),
+                idUtils.purposes.NONE,
+                Identity.address+".getKeyType("+accounts[1]+") is not correct");
+        });
+
+        it("fire KeyAdded(address indexed key, uint256 indexed type)", async () => {
+            let receipt = await Identity.methods.execute(
+                Identity.address, 
+                0, 
+                idUtils.encode.addKey(accounts[1], idUtils.purposes.MANAGEMENT, idUtils.types.ADDRESS))
+            .send({from: accounts[0]});
+            
+            const keyAdded = TestUtils.eventValues(receipt, "KeyAdded");
+            assert(keyAdded.key, TestUtils.addressToBytes32(accounts[1]), "Key is not correct")
+            assert(keyAdded.keyType, idUtils.types.ADDRESS, "Type is not correct")
+        });
+    });
+
+
+    describe("removeKey(address _key, uint256 _type)", () => {
+        it("MANAGEMENT_KEY should remove a key", async () => {
+            await Identity.methods.execute(
+                Identity.address, 
+                0, 
+                idUtils.encode.addKey(accounts[1], idUtils.purposes.MANAGEMENT, idUtils.types.ADDRESS)) 
+                .send({from: accounts[0]});
+
+            await Identity.methods.execute(
+                Identity.address, 
+                0, 
+                idUtils.encode.removeKey(accounts[1], idUtils.purposes.MANAGEMENT))
+                .send({from: accounts[0]});
+            
+            assert.equal(
+                await Identity.methods.getKeyPurpose(TestUtils.addressToBytes32(accounts[1])).call(),
+                idUtils.purposes.NONE,
+                Identity.address+".getKeyPurpose("+accounts[1]+") is not 0")
+        });
+
+        it("other key should not remove a key", async () => {
+            await Identity.methods.execute(
+                Identity.address, 
+                0, 
+                idUtils.encode.addKey(accounts[1], idUtils.purposes.MANAGEMENT, idUtils.types.ADDRESS))
+                .send({from: accounts[0]});
+
+            try {
+                await Identity.methods.execute(
+                    Identity.address, 
+                    0, 
+                    idUtils.encode.removeKey(accounts[1], idUtils.purposes.MANAGEMENT))
+                    .send({from: accounts[2]});
+                assert.fail('should have reverted before');
+            } catch(error) {
+                TestUtils.assertJump(error);
+            }
+            
+            assert.equal(
+                await Identity.methods.getKeyPurpose(TestUtils.addressToBytes32(accounts[1])).call(),
+                idUtils.purposes.MANAGEMENT,
+                Identity.address+".getKeyPurpose("+accounts[1]+") is not 0")
+        });
+
+        it("actor key should not remove key", async () => {
+            await Identity.methods.execute(
+                Identity.address, 
+                0, 
+                idUtils.encode.addKey(accounts[1], idUtils.purposes.ACTION, idUtils.types.ADDRESS))
+                .send({from: accounts[0]});
+
+            await Identity.methods.execute(
+                Identity.address, 
+                0, 
+                idUtils.encode.addKey(accounts[2], idUtils.purposes.ACTION, idUtils.types.ADDRESS)) 
+                .send({from: accounts[0]});
+
+            try {
+                await Identity.methods.execute(
+                    Identity.address, 
+                    0, 
+                    idUtils.encode.removeKey(accounts[1], idUtils.purposes.ACTION))
+                    .send({from: accounts[2]});
+
+                assert.fail('should have reverted before');
+            } catch(error) {
+                TestUtils.assertJump(error);
+            }
+
+            assert.equal(
+                await Identity.methods.getKeyPurpose(TestUtils.addressToBytes32(accounts[1])).call(),
+                idUtils.purposes.ACTION,
+                Identity.address+".getKeyType("+accounts[1]+") is not 0")
+        });
+        
+        it("MANAGEMENT_KEY should not remove itself MANAGEMENT_KEY when there is no other MANAGEMENT_KEY", async () => {
+            await Identity.methods.execute(
+                Identity.address, 
+                0, 
+                idUtils.encode.removeKey(accounts[0], idUtils.purposes.MANAGEMENT))
+                .send({from: accounts[0]});
+
+            assert.equal(
+                await Identity.methods.getKeyPurpose(TestUtils.addressToBytes32(accounts[0])).call(),
+                idUtils.purposes.MANAGEMENT,
+                Identity.address+".getKeyType("+accounts[0]+") is not 1")
+        });
+
+        it("fire KeyRemoved(address indexed key, uint256 indexed type)", async () => {
+            await Identity.methods.execute(
+                Identity.address, 
+                0, 
+                idUtils.encode.addKey(accounts[1], idUtils.purposes.ACTION, idUtils.types.ADDRESS))
+                .send({from: accounts[0]});
+            
+            let receipt = await Identity.methods.execute(
+                Identity.address, 
+                0, 
+                idUtils.encode.removeKey(accounts[1], idUtils.purposes.ACTION))
+                .send({from: accounts[0]});
+
+            const keyRemoved = TestUtils.eventValues(receipt, "KeyRemoved");
+            assert(keyRemoved.key, TestUtils.addressToBytes32(accounts[1]), "Key is not correct");
+            assert(keyRemoved.keyType, idUtils.types.ADDRESS, "Type is not correct");
+        });
+    });
+
+
+    describe("getKeyPurpose(address _key)", () => {
+
+        it("should start only with initializer as only key", async () => {
+            assert.equal(
+                await Identity.methods.getKeyPurpose(TestUtils.addressToBytes32(accounts[0])).call(),
+                idUtils.purposes.MANAGEMENT,
+                Identity.address+".getKeyPurpose("+accounts[0]+") is not correct")
+
+            assert.equal(
+                await Identity.methods.getKeyPurpose(TestUtils.addressToBytes32(accounts[1])).call(),
+                idUtils.purposes.NONE,
+                Identity.address+".getKeyPurpose("+accounts[1]+") is not correct")
+        });
+
+        it("should get type 2 after addKey type 2", async () => {
+            await Identity.methods.execute(
+                Identity.address, 
+                0, 
+                idUtils.encode.addKey(accounts[1], idUtils.purposes.ACTION, idUtils.types.ADDRESS))
+                .send({from: accounts[0]});
+            
+            assert.equal(
+                await Identity.methods.getKeyPurpose(TestUtils.addressToBytes32(accounts[1])).call(),
+                idUtils.purposes.ACTION,
+                Identity.address+".getKeyPurpose("+accounts[1]+") is not correct")
+            });
+            
+        it("should get type 3 after addKey type 3", async () => {       
+            await Identity.methods.execute(
+                Identity.address, 
+                0, 
+                idUtils.encode.addKey(accounts[1], idUtils.purposes.CLAIM_SIGNER, idUtils.types.ADDRESS))
+                .send({from: accounts[0]});
+
+            assert.equal(
+                await Identity.methods.getKeyPurpose(TestUtils.addressToBytes32(accounts[1])).call(),
+                idUtils.purposes.CLAIM_SIGNER,
+                Identity.address+".getKeyPurpose("+accounts[1]+") is not correct")
+        });
+
+    });
+
+   /*
+    describe("getKeysByType(uint256 _type)", () => {
+
+        it("at initialization", async () => {
+            
+        });
+
+        it("after addKey", async () => {
+            
+        });
+
+        it("after removeKey", async () => {
+            
+        });
+    });
+    */
+
+    describe("execute(address _to, uint256 _value, bytes _data)", () => {
+        let functionPayload;
+
+        it("Identity should receive ether", async() => {
+
+            const amountToSend = web3.utils.toWei('0.05', "ether");
+
+            let idBalance0 = await web3.eth.getBalance(Identity.address);
+
+            await web3.eth.sendTransaction({from:accounts[0], to:Identity.address, value: amountToSend}) 
+
+            let idBalance1 = await web3.eth.getBalance(Identity.address);
+
+            assert.equal(web3.utils.toBN(idBalance0).add(web3.utils.toBN(amountToSend)).toString(), web3.utils.toBN(idBalance1).toString(), Identity.address + " did not receive ether");
+        });
+
+        it("ACTOR_KEY execute arbitrary transaction", async () => {
+            await Identity.methods.execute(
+                Identity.address, 
+                0, 
+                idUtils.encode.addKey(accounts[1], idUtils.purposes.ACTION, idUtils.types.ADDRESS))
+                .send({from: accounts[0]});
+
+            
+            functionPayload = web3.eth.abi.encodeFunctionCall({
+                name: 'test',
+                type: 'function',
+                inputs: []
+            }, []);
+
+            let receipt = await Identity.methods.execute(
+                TestContract.address, 
+                0, 
+                functionPayload)
+                .send({from: accounts[1]});
+
+            // @rramos - Commented because of error:
+            // The current provider doesn't support subscriptions: Provider
+            /*assert.notEqual(
+                await TestUtils.listenForEvent(TestContract.events.TestFunctionExecuted),
+                undefined,
+                "Test function was not executed");  */
+           
+        });
+        
+        it("MANAGEMENT_KEY cannot execute arbitrary transaction", async () => {
+            try {
+                await Identity.methods.execute(
+                    TestContract.address, 
+                    0, 
+                    functionPayload)
+                    .send({from: accounts[0]});
+            } catch(error) {
+                TestUtils.assertJump(error);
+            }
+        });
+
+        it("Other keys NOT execute arbitrary transaction", async () => {
+            try {
+                await Identity.methods.execute(
+                    TestContract.address, 
+                    0, 
+                    functionPayload)
+                    .send({from: accounts[3]});
+                assert.fail('should have reverted before');
+            } catch(error) {
+                TestUtils.assertJump(error);
+            }
+        });
+
+
+        it("ACTION_KEY should send ether from contract", async () => {
+            await Identity.methods.execute(
+                Identity.address, 
+                0, 
+                idUtils.encode.addKey(accounts[1], idUtils.purposes.ACTION, idUtils.types.ADDRESS))
+                .send({from: accounts[0]});
+
+            // Adding funds to contract
+            await web3.eth.sendTransaction({from:accounts[0], to:Identity.address, value: web3.utils.toWei('0.05', "ether")}) 
+
+            const amountToSend = web3.utils.toWei('0.01', "ether");
+
+            let idBalance0 = await web3.eth.getBalance(Identity.address);
+            let a2Balance0 = await web3.eth.getBalance(accounts[2]);
+
+            await Identity.methods.execute(
+                accounts[2], 
+                amountToSend, 
+                '0x')
+                .send({from: accounts[1]});
+
+            let idBalance1 = await web3.eth.getBalance(Identity.address);
+            let a2Balance1 = await web3.eth.getBalance(accounts[2]);
+
+            assert(web3.utils.toBN(idBalance1).toString(), web3.utils.toBN(idBalance0).sub(web3.utils.toBN(amountToSend)).toString(), "Contract did not send ether");
+            assert(web3.utils.toBN(a2Balance1).toString(), web3.utils.toBN(a2Balance0).add(web3.utils.toBN(amountToSend)).toString(), accounts[2] + " did not receive ether");
+        });
+
+        it("fire ExecutionRequested(uint256 indexed executionId, address indexed to, uint256 indexed value, bytes data)", async () => {
+            await Identity.methods.execute(
+                Identity.address, 
+                0, 
+                idUtils.encode.addKey(accounts[1], idUtils.purposes.ACTION, idUtils.types.ADDRESS))
+                .send({from: accounts[0]});
+            
+            let receipt = await Identity.methods.execute(
+                TestContract.address, 
+                0, 
+                functionPayload)
+                .send({from: accounts[1]});
+
+            const executionRequested = TestUtils.eventValues(receipt, "ExecutionRequested");
+            assert(executionRequested.to, TestContract.address, "To is not correct");
+            assert(executionRequested.value, 0, "Value is not correct");
+            assert(executionRequested.data, functionPayload, "Data is not correct");
+        });
+
+        it("fire Executed(uint256 indexed executionId, address indexed to, uint256 indexed value, bytes data)", async () => {
+            await Identity.methods.execute(
+                Identity.address, 
+                0, 
+                idUtils.encode.addKey(accounts[1], idUtils.purposes.ACTION, idUtils.types.ADDRESS))
+                .send({from: accounts[0]});
+            
+            let receipt = await Identity.methods.execute(
+                TestContract.address, 
+                0, 
+                functionPayload)
+                .send({from: accounts[1]});
+            
+            const executed = TestUtils.eventValues(receipt, "Executed")
+            assert(executed.to, TestContract.address, "To is not correct");
+            assert(executed.value, 0, "Value is not correct");
+            assert(executed.data, functionPayload, "Data is not correct");
+        });
+    });
+
+
+    /*
+    describe("setMinimumApprovalsByKeyPurpose(uint256 _type, uint8 _minimumApprovals)", () => {
+        it("MANAGEMENT_KEY should set minimum approvals for MANAGEMENT_KEYs", async () => {
+            
+        });
+
+        it("MANAGEMENT_KEY should set minimum approvals for ACTION_KEYs", async () => {
+            
+        });
+
+        it("ACTION_KEY should not be able to set minimum approvals", async () => {
+            
+        });
+
+        it("Other keys should not be able to set minimum approvals", async () => {
+            
+        });
+    });
+
+    describe("approve(bytes32 _id, bool _approve)", () => {
+
+        it("MANAGEMENT_KEY should approve a claim", async () => {
+            
+        });
+
+        it("MANAGEMENT_KEY should approve a transaction", async () => {
+            
+        });
+
+        it("2 out of 3 MANAGEMENT_KEY should approve a transaction and execute it", async () => {
+            
+        });
+
+        it("fire Approved(uint256 indexed executionId, bool approved)", async () => {
+            
+        });
+
+    });
+
+    
+    describe("getClaim(bytes32 _claimId)", () => {
+
+        it("Returns a claim by ID.", async () => {
+            
+        });
+
+    });
+            
+    describe("getClaimIdsByType(uint256 _claimType)", () => {
+        it("Returns an array of claim IDs by type.", async () => {
+            
+        });
+    });
+                        
+    describe("addClaim(uint256 _claimType, address issuer, uint256 signatureType, bytes _signature, bytes _data, string _uri)", () => {
+        it("Requests the ADDITION of a claim from an issuer", async () => {
+            
+        });
+
+        it("Requests the CHANGE of a claim from an issuer", async () => {
+            
+        });
+
+    });
+
+    describe("removeClaim(bytes32 _claimId)", () => {
+        it("Requests the DELETION of a claim from an issuer", async () => {
+            
+        });
+
+        it("Requests the DELETION of a claim from identity", async () => {
+            
+        });
+    });
+    */
+
+
+});
+
+
+

test/identityExtended.js

@@ -0,0 +1,68 @@
+/*
+COMMENTED TEMPORARLY WHILE PROJECT IS MIGRATED TO EMBARK - @rramos
+
+const TestUtils = require("../utils/testUtils.js")
+var ethUtils = require('ethereumjs-util')
+
+const Identity = artifacts.require("./identity/Identity.sol");
+
+contract('Identity - Extended Functionality', function(accounts) {
+
+    let identity;
+
+    beforeEach(async () => {
+        identity = await Identity.new({from: accounts[0]});     
+    })
+
+
+    describe("Identity()", () => {
+        
+        let privateKey = new Buffer('61bffea9215f65164ad18b45aff1436c0c165d0d5dd2087ef61b4232ba6d2c1a', 'hex')
+        let publicKey = ethUtils.privateToPublic(privateKey);
+        let pkSha = web3.sha3(publicKey.toString('hex'), {encoding: 'hex'}); 
+        
+        it("Add ECDSA Management Key", async () => {
+
+          await identity.addKey(pkSha, 2, 1, {from: accounts[0]})
+          
+          await identity.addPublicKey(pkSha, '0x' + publicKey.toString('hex'), {from: accounts[0]});
+       
+          assert.equal(
+            await identity.getPublicKey(pkSha, {from: accounts[0]}),
+            '0x' + publicKey.toString('hex'),
+            identity.address+".getPublicKey("+pkSha+") is not correct");
+
+        });
+
+
+        it("Test Execution", async () => {
+
+            let to = accounts[1];
+            let value = 100;
+            let data = '';
+            
+            let message = ethUtils.toBuffer("SignedMessage");
+            let msgHash = ethUtils.hashPersonalMessage(message);
+            let sig = ethUtils.ecsign(msgHash, privateKey);
+          
+            let r = '0x' + sig.r.toString('hex');
+            let s = '0x' + sig.s.toString('hex');
+            let v = sig.v;
+
+
+            await identity.addKey(pkSha, 2, 1, {from: accounts[0]})
+            
+            await identity.addPublicKey(pkSha, '0x' + publicKey.toString('hex'), {from: accounts[0]});
+         
+            let tx = await identity.executeECDSA(to, value, data, pkSha, '0x' + msgHash.toString('hex'), v, r, s, {from: accounts[0]});
+            
+            // TODO Assert ExecutionRequested Event
+            console.log(tx)
+        
+        });
+    });
+
+
+
+});
+*/

utils/identityUtils.js

@@ -0,0 +1,190 @@
+const web3EthAbi = require("web3-eth-abi");
+
+const _types = {
+    ADDRESS: 0,
+    ECDSA: 1,
+    RSA: 2
+}
+
+const _purposes = {
+    MANAGEMENT: 1,
+    ACTION: 2,
+    CLAIM_SIGNER: 3,
+    ENCRYPTION: 4,
+
+    NONE: 0
+}
+
+const hexToBytes32 = (input) => {
+    input = input.replace(/^0x/i,'');
+    const stringed = "0000000000000000000000000000000000000000000000000000000000000000" + input;
+    return "0x" + stringed.substring(stringed.length - 64, stringed.length); 
+}
+
+const _addKey = function(key, purpose, type){
+    if(!/^(0x)?[0-9a-f]{0,64}$/i.test(key))
+        throw new Error('Key "'+ key +'" is not a valid hex string');
+
+    if (Object.values(_purposes).indexOf(purpose) == -1) 
+        throw new Error('Purpose "'+ purpose +'" is not a valid purpose');
+
+    if (Object.values(_types).indexOf(type) == -1) 
+        throw new Error('Type "'+ type +'" is not a valid type');
+
+    return web3EthAbi.encodeFunctionCall({
+        name: 'addKey',
+        type: 'function',
+        inputs: [{
+            type: 'bytes32',
+            name: '_key'
+        },{
+            type: 'uint256',
+            name: '_purpose'
+        },{
+            type: 'uint256',
+            name: '_type'
+        }]
+    }, [hexToBytes32(key), purpose, type]);
+}
+
+const _removeKey = function(key, purpose){
+    if(!/^(0x)?[0-9a-f]{0,64}$/i.test(key))
+        throw new Error('Key "'+ key +'" is not a valid hex string');
+
+    if (Object.values(_purposes).indexOf(purpose) == -1) 
+        throw new Error('Purpose "'+ purpose +'" is not a valid purpose');
+
+    return web3EthAbi.encodeFunctionCall({
+        name: 'removeKey',
+        type: 'function',
+        inputs: [{
+            type: 'bytes32',
+            name: '_key'
+        },{
+            type: 'uint256',
+            name: '_purpose'
+        }]
+    }, [hexToBytes32(key), purpose]);
+}
+
+
+const _setMinimumApprovalsByKeyType = function(type, minimumApprovals) {
+
+    if (Object.values(_types).indexOf(type) == -1) 
+        throw new Error('Type "'+ type +'" is not a valid type');
+
+    // TODO valdate minimumApprovals
+
+    return web3EthAbi.encodeFunctionCall({
+        name: 'setMinimumApprovalsByKeyType',
+        type: 'function',
+        inputs: [{
+            type: 'uint256',
+            name: '_type'
+        },{
+            type: 'uint8',
+            name: '_minimumApprovals'
+        }]
+    }, arguments);
+}
+
+
+const _setupRecovery = function(address){
+    if(!/^(0x)?[0-9a-f]{0,40}$/i.test(address))
+        throw new Error('Address "'+ address +'" is not a valid Ethereum address.');
+
+    return web3EthAbi.encodeFunctionCall({
+        name: 'setupRecovery',
+        type: 'function',
+        inputs: [{
+            type: 'address',
+            name: '_recoveryContract'
+        }]
+    }, [address]);
+}
+
+const _managerReset = function(address){
+    if(!/^(0x)?[0-9a-f]{0,40}$/i.test(address))
+        throw new Error('Address "'+ address +'" is not a valid Ethereum address.');
+
+    return web3EthAbi.encodeFunctionCall({
+        name: 'managerReset',
+        type: 'function',
+        inputs: [{
+            type: 'address',
+            name: '_newKey'
+        }]
+    }, [address]);
+}
+
+const _updateUpdatableInstance = function(address){
+    if(!/^(0x)?[0-9a-f]{0,40}$/i.test(address))
+        throw new Error('Address "'+ address +'" is not a valid Ethereum address.');
+
+    return web3EthAbi.encodeFunctionCall({
+        name: 'updateUpdatableInstance',
+        type: 'function',
+        inputs: [{
+            type: 'address',
+            name: '_kernel'
+        }]
+    }, [address]);
+}
+
+const _updateRequestUpdatableInstance = function(address){
+    if(!/^(0x)?[0-9a-f]{0,40}$/i.test(address))
+        throw new Error('Address "'+ address +'" is not a valid Ethereum address.');
+
+    return web3EthAbi.encodeFunctionCall({
+        name: 'updateRequestUpdatableInstance',
+        type: 'function',
+        inputs: [{
+            type: 'address',
+            name: '_kernel'
+        }]
+    }, [address]);
+}
+
+const _updateConfirmUpdatableInstance = function(address){
+    if(!/^(0x)?[0-9a-f]{0,40}$/i.test(address))
+        throw new Error('Address "'+ address +'" is not a valid Ethereum address.');
+
+    return web3EthAbi.encodeFunctionCall({
+        name: 'updateConfirmUpdatableInstance',
+        type: 'function',
+        inputs: [{
+            type: 'address',
+            name: '_kernel'
+        }]
+    }, [address]);
+}
+
+const _updateCancelUpdatableInstance = function(address){
+    if(!/^(0x)?[0-9a-f]{0,40}$/i.test(address))
+        throw new Error('Address "'+ address +'" is not a valid Ethereum address.');
+
+    return web3EthAbi.encodeFunctionCall({
+        name: 'updateCancelUpdatableInstance',
+        type: 'function',
+        inputs: []
+    }, []);
+}
+
+
+
+
+module.exports = {
+    types: _types,
+    purposes: _purposes,
+    encode: {
+        addKey: _addKey,
+        removeKey: _removeKey,
+        setMinimumApprovalsByKeyType: _setMinimumApprovalsByKeyType,
+        setupRecovery: _setupRecovery,
+        managerReset: _managerReset,
+        updateUpdatableInstance: _updateUpdatableInstance,
+        updateRequestUpdatableInstance: _updateRequestUpdatableInstance,
+        updateConfirmUpdatableInstance: _updateConfirmUpdatableInstance,
+        updateCancelUpdatableInstance: _updateCancelUpdatableInstance
+    }
+}