2019-03-11 12:30:45 +00:00
|
|
|
pragma solidity ^0.5.0;
|
2019-03-09 20:42:05 +00:00
|
|
|
|
2019-03-10 08:38:03 +00:00
|
|
|
|
2019-03-10 19:38:53 +00:00
|
|
|
library SafeMath {
|
|
|
|
function add(uint256 a, uint256 b) internal pure returns (uint256) {
|
|
|
|
uint256 c = a + b;
|
|
|
|
require(c >= a, "math-not-safe");
|
|
|
|
return c;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-03-18 21:14:58 +00:00
|
|
|
/**
|
|
|
|
* @title ProxyRegistry Interface
|
|
|
|
*/
|
|
|
|
interface ProxyRegistryInterface {
|
|
|
|
function updateProxyRecord(address currentOwner, address nextOwner) external;
|
|
|
|
function guardianEnabled() external returns (bool);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @title AddressRegistryInterface Interface
|
|
|
|
*/
|
|
|
|
interface AddressRegistryInterface {
|
|
|
|
function getLogic(address logicAddr) external view returns (bool);
|
|
|
|
function getAddress(string calldata name) external view returns(address);
|
|
|
|
}
|
|
|
|
|
2019-03-10 19:38:53 +00:00
|
|
|
|
2019-03-18 21:14:58 +00:00
|
|
|
/**
|
|
|
|
* @title Proxy Record
|
|
|
|
*/
|
|
|
|
contract ProxyRecord {
|
|
|
|
|
2019-03-18 21:49:39 +00:00
|
|
|
address public proxyRegistryContract;
|
2019-03-18 21:14:58 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* @dev this updates the internal proxy ownership on "proxy registry" contract
|
|
|
|
* @param currentOwner is the current owner
|
|
|
|
* @param nextOwner is the new assigned owner
|
|
|
|
*/
|
|
|
|
function setProxyRecordOwner(address currentOwner, address nextOwner) internal {
|
2019-03-18 21:49:39 +00:00
|
|
|
ProxyRegistryInterface initCall = ProxyRegistryInterface(proxyRegistryContract);
|
2019-03-18 21:14:58 +00:00
|
|
|
initCall.updateProxyRecord(currentOwner, nextOwner);
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @title User Auth
|
|
|
|
*/
|
|
|
|
contract UserAuth is ProxyRecord {
|
2019-03-10 19:38:53 +00:00
|
|
|
using SafeMath for uint;
|
|
|
|
using SafeMath for uint256;
|
2019-03-11 12:30:45 +00:00
|
|
|
|
2019-03-18 21:14:58 +00:00
|
|
|
event LogSetOwner(address indexed owner, address setter);
|
|
|
|
event LogSetPendingOwner(address indexed pendingOwner, address setter);
|
2019-03-10 11:23:11 +00:00
|
|
|
address public owner;
|
2019-03-18 21:14:58 +00:00
|
|
|
address public pendingOwner;
|
2019-03-18 22:12:36 +00:00
|
|
|
uint public claimOnwershipTime; // now + 7 days
|
|
|
|
uint public gracePeriod; // to set the new owner
|
2019-03-09 20:42:05 +00:00
|
|
|
|
2019-03-18 21:14:58 +00:00
|
|
|
/**
|
|
|
|
* @dev defines the "proxy registry" contract and sets the owner
|
|
|
|
*/
|
2019-03-09 20:42:05 +00:00
|
|
|
constructor() public {
|
2019-03-18 21:49:39 +00:00
|
|
|
proxyRegistryContract = msg.sender;
|
2019-03-18 22:12:36 +00:00
|
|
|
gracePeriod = 3 days;
|
2019-03-09 20:42:05 +00:00
|
|
|
}
|
|
|
|
|
2019-03-18 21:14:58 +00:00
|
|
|
/**
|
|
|
|
* @dev Throws if not called by owner or contract itself
|
|
|
|
*/
|
2019-03-09 20:42:05 +00:00
|
|
|
modifier auth {
|
2019-03-10 11:23:11 +00:00
|
|
|
require(isAuth(msg.sender), "permission-denied");
|
2019-03-09 20:42:05 +00:00
|
|
|
_;
|
|
|
|
}
|
|
|
|
|
2019-03-18 21:14:58 +00:00
|
|
|
/**
|
2019-03-18 22:12:36 +00:00
|
|
|
* @dev sets the "pending owner" and provide 3 days grace period to set the new owner via setOwner()
|
|
|
|
* Throws if called before 10 (i.e. 7 + 3) day after assigning "pending owner"
|
2019-03-18 21:14:58 +00:00
|
|
|
* @param nextOwner is the assigned "pending owner"
|
|
|
|
*/
|
|
|
|
function setPendingOwner(address nextOwner) public auth {
|
2019-03-18 22:12:36 +00:00
|
|
|
require(block.timestamp > claimOnwershipTime.add(gracePeriod), "owner-is-still-pending");
|
2019-03-18 21:14:58 +00:00
|
|
|
pendingOwner = nextOwner;
|
|
|
|
claimOnwershipTime = block.timestamp.add(7 days);
|
|
|
|
emit LogSetPendingOwner(nextOwner, msg.sender);
|
2019-03-10 11:23:11 +00:00
|
|
|
}
|
|
|
|
|
2019-03-18 21:14:58 +00:00
|
|
|
/**
|
|
|
|
* @dev sets "pending owner" as real owner
|
2019-03-18 22:12:36 +00:00
|
|
|
* Throws if no "pending owner"
|
2019-03-18 21:14:58 +00:00
|
|
|
* Throws if called before 7 day after assigning "pending owner"
|
|
|
|
*/
|
|
|
|
function setOwner() public {
|
|
|
|
require(pendingOwner != address(0), "no-pending-address");
|
2019-03-18 22:12:36 +00:00
|
|
|
require(block.timestamp > claimOnwershipTime, "owner-is-still-pending");
|
2019-03-18 21:14:58 +00:00
|
|
|
setProxyRecordOwner(owner, pendingOwner);
|
|
|
|
owner = pendingOwner;
|
|
|
|
pendingOwner = address(0);
|
|
|
|
emit LogSetOwner(owner, msg.sender);
|
2019-03-10 11:23:11 +00:00
|
|
|
}
|
|
|
|
|
2019-03-18 21:14:58 +00:00
|
|
|
/**
|
|
|
|
* @dev checks if called by owner or contract itself
|
|
|
|
* @param src is the address initiating the call
|
|
|
|
*/
|
2019-03-11 12:30:45 +00:00
|
|
|
function isAuth(address src) internal view returns (bool) {
|
|
|
|
if (src == address(this)) {
|
|
|
|
return true;
|
|
|
|
} else if (src == owner) {
|
|
|
|
return true;
|
|
|
|
} else {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
2019-03-18 21:14:58 +00:00
|
|
|
|
2019-03-09 20:42:05 +00:00
|
|
|
}
|
|
|
|
|
2019-03-18 21:14:58 +00:00
|
|
|
/**
|
|
|
|
* @title User Guardians
|
|
|
|
*/
|
|
|
|
contract UserGuardian is UserAuth {
|
|
|
|
|
|
|
|
event LogSetGuardian(address indexed guardian);
|
|
|
|
event LogNewActivePeriod(uint newActivePeriod);
|
|
|
|
event LogSetOwnerViaGuardian(address nextOwner, address indexed guardian);
|
|
|
|
|
|
|
|
mapping(uint => address) public guardians;
|
|
|
|
uint public lastActivity; // time when called "execute" last time
|
|
|
|
uint public activePeriod; // the period over lastActivity when guardians have no rights
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @dev Throws if guardians not enabled by system admin
|
|
|
|
*/
|
|
|
|
modifier guard() {
|
2019-03-18 21:49:39 +00:00
|
|
|
ProxyRegistryInterface initCall = ProxyRegistryInterface(proxyRegistryContract);
|
2019-03-18 21:14:58 +00:00
|
|
|
require(initCall.guardianEnabled());
|
|
|
|
_;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @dev guardians can set "owner" after owner stay inactive for minimum "activePeriod"
|
|
|
|
* @param nextOwner is the new owner
|
|
|
|
* @param num is the assigned guardian number
|
|
|
|
*/
|
|
|
|
function setOwnerViaGuardian(address nextOwner, uint num) public guard {
|
|
|
|
require(msg.sender == guardians[num], "permission-denied");
|
|
|
|
require(block.timestamp > lastActivity.add(activePeriod), "active-period-not-over");
|
|
|
|
owner = nextOwner;
|
|
|
|
emit LogSetOwnerViaGuardian(nextOwner, guardians[num]);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @dev sets the guardian with assigned number (upto 3)
|
|
|
|
* @param num is the guardian assigned number
|
|
|
|
* @param _guardian is the new guardian address
|
|
|
|
*/
|
|
|
|
function setGuardian(uint num, address _guardian) public auth guard {
|
|
|
|
require(num > 0 && num < 4, "guardians-cant-exceed-three");
|
|
|
|
guardians[num] = _guardian;
|
|
|
|
emit LogSetGuardian(_guardian);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @dev sets the guardian with assigned number (upto 3)
|
2019-03-18 21:49:39 +00:00
|
|
|
* @param _activePeriod is the period when guardians have no rights to dethrone the owner
|
2019-03-18 21:14:58 +00:00
|
|
|
*/
|
|
|
|
function updateActivePeriod(uint _activePeriod) public auth guard {
|
|
|
|
activePeriod = _activePeriod;
|
|
|
|
emit LogNewActivePeriod(_activePeriod);
|
|
|
|
}
|
2019-03-10 11:23:11 +00:00
|
|
|
|
2019-03-18 21:14:58 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @dev logging the execute events
|
|
|
|
*/
|
2019-03-10 07:40:51 +00:00
|
|
|
contract UserNote {
|
2019-03-11 22:28:00 +00:00
|
|
|
event LogNote(
|
|
|
|
bytes4 indexed sig,
|
|
|
|
address indexed guy,
|
|
|
|
bytes32 indexed foo,
|
|
|
|
bytes32 bar,
|
|
|
|
uint wad,
|
|
|
|
bytes fax
|
|
|
|
);
|
2019-03-09 20:42:05 +00:00
|
|
|
|
|
|
|
modifier note {
|
|
|
|
bytes32 foo;
|
|
|
|
bytes32 bar;
|
|
|
|
assembly {
|
|
|
|
foo := calldataload(4)
|
|
|
|
bar := calldataload(36)
|
|
|
|
}
|
2019-03-11 12:30:45 +00:00
|
|
|
emit LogNote(
|
|
|
|
msg.sig,
|
|
|
|
msg.sender,
|
|
|
|
foo,
|
|
|
|
bar,
|
|
|
|
msg.value,
|
|
|
|
msg.data
|
|
|
|
);
|
2019-03-09 20:42:05 +00:00
|
|
|
_;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-03-11 12:30:45 +00:00
|
|
|
|
2019-03-18 21:49:39 +00:00
|
|
|
/**
|
|
|
|
* @title User Proxy Logic
|
|
|
|
*/
|
2019-03-10 19:41:29 +00:00
|
|
|
contract UserLogic {
|
2019-03-18 21:49:39 +00:00
|
|
|
address public logicRegistryAddr;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @param logicAddr is the logic proxy contract address
|
|
|
|
* @return the true boolean for logic proxy if authorised otherwise false
|
|
|
|
*/
|
2019-03-11 22:52:48 +00:00
|
|
|
function isLogicAuthorised(address logicAddr) internal view returns (bool) {
|
2019-03-18 21:49:39 +00:00
|
|
|
AddressRegistryInterface logicProxy = AddressRegistryInterface(logicRegistryAddr);
|
2019-03-10 08:38:03 +00:00
|
|
|
return logicProxy.getLogic(logicAddr);
|
|
|
|
}
|
2019-03-18 21:49:39 +00:00
|
|
|
|
2019-03-10 08:38:03 +00:00
|
|
|
}
|
|
|
|
|
2019-03-11 12:30:45 +00:00
|
|
|
|
2019-03-18 21:14:58 +00:00
|
|
|
contract UserProxy is UserGuardian, UserNote, UserLogic {
|
2019-03-11 12:30:45 +00:00
|
|
|
|
2019-03-18 21:49:39 +00:00
|
|
|
event LogExecute(address target, uint srcNum, uint sessionNum);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @dev sets the "address registry", owner's last activity, owner's active period and initial owner
|
|
|
|
* @param _owner initial owner of the contract
|
|
|
|
* @param _logicRegistryAddr address registry address which have logic proxy registry
|
|
|
|
*/
|
|
|
|
constructor(address _owner, address _logicRegistryAddr) public {
|
|
|
|
logicRegistryAddr = _logicRegistryAddr;
|
|
|
|
owner = _owner;
|
2019-03-10 11:23:11 +00:00
|
|
|
lastActivity = block.timestamp;
|
2019-03-18 21:14:58 +00:00
|
|
|
activePeriod = 30 days; // default and changeable
|
2019-03-09 20:42:05 +00:00
|
|
|
}
|
|
|
|
|
2019-03-10 08:38:03 +00:00
|
|
|
function() external payable {}
|
2019-03-09 20:42:05 +00:00
|
|
|
|
2019-03-18 21:49:39 +00:00
|
|
|
/**
|
|
|
|
* @dev execute authorised calls via delegate call
|
|
|
|
* @param _target logic proxy address
|
|
|
|
* @param _data delegate call data
|
|
|
|
* @param srcNum to find the source
|
|
|
|
* @param sessionNum to find the session
|
|
|
|
*/
|
|
|
|
function execute(
|
|
|
|
address _target,
|
|
|
|
bytes memory _data,
|
|
|
|
uint srcNum,
|
|
|
|
uint sessionNum
|
|
|
|
)
|
|
|
|
public
|
|
|
|
payable
|
|
|
|
auth
|
|
|
|
note
|
|
|
|
returns (bytes memory response)
|
|
|
|
{
|
2019-03-10 08:38:03 +00:00
|
|
|
require(_target != address(0), "user-proxy-target-address-required");
|
2019-03-11 22:52:48 +00:00
|
|
|
require(isLogicAuthorised(_target), "logic-proxy-address-not-allowed");
|
2019-03-10 19:38:53 +00:00
|
|
|
lastActivity = block.timestamp;
|
2019-03-18 21:49:39 +00:00
|
|
|
emit LogExecute(_target, srcNum, sessionNum);
|
|
|
|
|
2019-03-09 20:42:05 +00:00
|
|
|
// call contract in current context
|
|
|
|
assembly {
|
|
|
|
let succeeded := delegatecall(sub(gas, 5000), _target, add(_data, 0x20), mload(_data), 0, 0)
|
|
|
|
let size := returndatasize
|
|
|
|
|
|
|
|
response := mload(0x40)
|
|
|
|
mstore(0x40, add(response, and(add(add(size, 0x20), 0x1f), not(0x1f))))
|
|
|
|
mstore(response, size)
|
|
|
|
returndatacopy(add(response, 0x20), 0, size)
|
|
|
|
|
|
|
|
switch iszero(succeeded)
|
2019-03-11 12:30:45 +00:00
|
|
|
case 1 {
|
|
|
|
// throw if delegatecall failed
|
|
|
|
revert(add(response, 0x20), size)
|
|
|
|
}
|
2019-03-09 20:42:05 +00:00
|
|
|
}
|
|
|
|
}
|
2019-03-18 21:14:58 +00:00
|
|
|
|
2019-03-11 12:30:45 +00:00
|
|
|
}
|