Instadapp/smart-contract
1
0
Fork 0
mirror of https://github.com/Instadapp/smart-contract.git synced 2024-07-29 22:08:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug in isExecutable() & build() on deploy

Browse Source
This commit is contained in:
Sowmayjain 2019-03-25 03:19:14 +05:30
parent 87cfe8f4a7
commit 60f66390f5
2 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
contracts/Registry.sol
View File

@ -105,14 +105,14 @@ contract WalletRegistry is LogicRegistry {
event Created(address indexed sender, address indexed owner, address proxy);
mapping(address => UserWallet) public proxies;
mapping(address => InstaWallet) public proxies;
bool public guardianEnabled; // user guardian mechanism enabled in overall system
bool public managerEnabled; // user manager mechanism enabled in overall system
/**
* @dev deploys a new proxy instance and sets msg.sender as owner of proxy
*/
function build() public returns (UserWallet proxy) {
function build() public returns (InstaWallet proxy) {
proxy = build(msg.sender);
}
@ -120,9 +120,9 @@ contract WalletRegistry is LogicRegistry {
* @dev deploys a new proxy instance and sets custom owner of proxy
* Throws if the owner already have a UserWallet
*/
function build(address owner) public returns (UserWallet proxy) {
require(proxies[owner] == UserWallet(0), "multiple-proxy-per-user-not-allowed");
proxy = new UserWallet();
function build(address owner) public returns (InstaWallet proxy) {
require(proxies[owner] == InstaWallet(0), "multiple-proxy-per-user-not-allowed");
proxy = new InstaWallet();
proxy.setOwnerOnce(owner);
emit Created(msg.sender, owner, address(proxy));
proxies[owner] = proxy;
@ -135,7 +135,7 @@ contract WalletRegistry is LogicRegistry {
function updateProxyRecord(address currentOwner, address nextOwner) public {
require(msg.sender == address(proxies[currentOwner]), "invalid-proxy-or-owner");
proxies[nextOwner] = proxies[currentOwner];
proxies[currentOwner] = UserWallet(0);
proxies[currentOwner] = InstaWallet(0);
}
/**
@ -174,6 +174,7 @@ contract InstaRegistry is WalletRegistry {
constructor() public {
registry[keccak256(abi.encodePacked("admin"))] = msg.sender;
registry[keccak256(abi.encodePacked("owner"))] = msg.sender;
build();
}
}

43
contracts/UserWallet.sol
View File

@ -19,8 +19,8 @@ library SafeMath {
interface AddressRegistryInterface {
function isLogicAuth(address logicAddr) external view returns (bool, bool);
function updateProxyRecord(address currentOwner, address nextOwner) external;
function guardianEnabled() external returns (bool);
function managerEnabled() external returns (bool);
function guardianEnabled() external view returns (bool);
function managerEnabled() external view returns (bool);
}
@ -33,7 +33,17 @@ contract AddressRecord {
* @dev address registry of system, logic and wallet addresses
*/
address public registry;
/**
* @param logicAddr is the logic proxy contract address
* @return the true boolean for logic proxy if authorised otherwise false
*/
function isLogicAuthorised(address logicAddr) public view returns (bool, bool) {
AddressRegistryInterface logicProxy = AddressRegistryInterface(registry);
(bool isLogic, bool isDefault) = logicProxy.isLogicAuth(logicAddr);
return (isLogic, isDefault);
}
/**
* @dev this updates the internal proxy ownership on "registry" contract
* @param currentOwner is the current owner
@ -44,15 +54,6 @@ contract AddressRecord {
initCall.updateProxyRecord(currentOwner, nextOwner);
}
/**
* @param logicAddr is the logic proxy contract address
* @return the true boolean for logic proxy if authorised otherwise false
*/
function isLogicAuthorised(address logicAddr) internal view returns (bool, bool) {
AddressRegistryInterface logicProxy = AddressRegistryInterface(registry);
return logicProxy.isLogicAuth(logicAddr);
}
}
@ -127,7 +128,7 @@ contract UserAuth is AddressRecord {
* @dev checks if called by owner or contract itself
* @param src is the address initiating the call
*/
function isAuth(address src) internal view returns (bool) {
function isAuth(address src) public view returns (bool) {
if (src == address(this)) {
return true;
} else if (src == owner) {
@ -170,7 +171,7 @@ contract UserGuardian is UserAuth {
* @param num is the assigned guardian number
*/
function setOwnerViaGuardian(address nextOwner, uint num) public isGuardianEnabled {
require(isGuardian(), "not-guardian");
require(isGuardian(msg.sender), "not-guardian");
require(msg.sender == guardians[num], "permission-denied");
require(block.timestamp > lastActivity.add(activePeriod), "active-period-not-over");
owner = nextOwner;
@ -200,8 +201,8 @@ contract UserGuardian is UserAuth {
/**
* @dev Throws if the msg.sender is not guardian
*/
function isGuardian() internal view returns (bool) {
if (msg.sender == guardians[1] || msg.sender == guardians[2] || msg.sender == guardians[3]) {
function isGuardian(address _guardian) public view returns (bool) {
if (_guardian == guardians[1] || _guardian == guardians[2] || _guardian == guardians[3]) {
return true;
} else {
return false;
@ -245,8 +246,8 @@ contract UserManager is UserGuardian {
/**
* @dev Throws if the msg.sender is not manager
*/
function isManager() internal isManagerEnabled returns (bool) {
if (msg.sender == managers[1] || msg.sender == managers[2] || msg.sender == managers[3]) {
function isManager(address _manager) public view returns (bool) {
if (_manager == managers[1] || _manager == managers[2] || _manager == managers[3]) {
return true;
} else {
return false;
@ -358,13 +359,13 @@ contract InstaWallet is UserManager, UserNote {
* and if the sender is owner or contract itself or manager
* and if manager then Throws if target is default proxy address
*/
function isExecutable(address proxyTarget) internal returns (bool) {
require(proxyTarget != address(0), "user-proxy-target-address-required");
function isExecutable(address proxyTarget) public view returns (bool) {
require(proxyTarget != address(0), "logic-proxy-address-required");
(bool isLogic, bool isDefault) = isLogicAuthorised(proxyTarget);
require(isLogic, "logic-proxy-address-not-allowed");
if (isAuth(msg.sender)) {
return true;
} else if (isManager() && !isDefault) {
} else if (isManager(msg.sender) && !isDefault) {
return true;
} else {
return false;