From 32f8cce147bfbcb739f895ab43ae06eaa4398434 Mon Sep 17 00:00:00 2001 From: Thrilok Kumar Date: Thu, 17 Jun 2021 15:56:17 +0530 Subject: [PATCH 1/3] Added ownable --- contracts/senders/aave-v2-migrator/events.sol | 1 + contracts/senders/aave-v2-migrator/main.sol | 61 ++++++++++++++++--- .../senders/aave-v2-migrator/variables.sol | 4 ++ 3 files changed, 59 insertions(+), 7 deletions(-) diff --git a/contracts/senders/aave-v2-migrator/events.sol b/contracts/senders/aave-v2-migrator/events.sol index 0f06513..4cbf782 100644 --- a/contracts/senders/aave-v2-migrator/events.sol +++ b/contracts/senders/aave-v2-migrator/events.sol @@ -30,4 +30,5 @@ contract Events { event LogVariablesUpdate(uint _safeRatioGap, uint _fee); + event OwnershipTransferred(address indexed previousOwner, address indexed newOwner); } \ No newline at end of file diff --git a/contracts/senders/aave-v2-migrator/main.sol b/contracts/senders/aave-v2-migrator/main.sol index 50f3f16..99c9080 100644 --- a/contracts/senders/aave-v2-migrator/main.sol +++ b/contracts/senders/aave-v2-migrator/main.sol @@ -3,23 +3,71 @@ pragma experimental ABIEncoderV2; import { SafeERC20 } from "@openzeppelin/contracts/token/ERC20/SafeERC20.sol"; import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol"; +import { Context } from "@openzeppelin/contracts/utils/Context.sol"; import { TokenInterface } from "../../common/interfaces.sol"; import { Helpers } from "./helpers.sol"; import { AaveInterface, ATokenInterface, IndexInterface } from "./interfaces.sol"; import { Events } from "./events.sol"; -contract LiquidityResolver is Helpers, Events { +contract LiquidityResolver is Helpers, Events, Context { using SafeERC20 for IERC20; - function updateVariables(uint _safeRatioGap, uint _fee) public { - require(msg.sender == instaIndex.master(), "not-master"); + /** + * @dev Returns the address of the current owner. + */ + function owner() public view virtual returns (address) { + return _owner; + } + + /** + * @dev Throws if called by any account other than the owner. + */ + modifier onlyOwner() { + require(owner() == _msgSender() || instaIndex.master() == _msgSender(), "Ownable: caller is not the owner"); + _; + } + + /** + * @dev Leaves the contract without owner. It will not be possible to call + * `onlyOwner` functions anymore. Can only be called by the current owner. + * + * NOTE: Renouncing ownership will leave the contract without an owner, + * thereby removing any functionality that is only available to the owner. + */ + function renounceOwnership() public virtual onlyOwner { + emit OwnershipTransferred(_owner, address(0)); + _owner = address(0); + } + + /** + * @dev Transfers ownership of the contract to a new account (`newOwner`). + * Can only be called by the current owner. + */ + function transferOwnership(address newOwner) public virtual onlyOwner { + require(newOwner != address(0), "Ownable: new owner is the zero address"); + emit OwnershipTransferred(_owner, newOwner); + _owner = newOwner; + } + + /** + * @dev Transfers ownership of the contract to a new account (`newOwner`). + * Can only be called by the current owner. + */ + function setOwnership(address newOwner) public virtual { + require(instaIndex.master() == _msgSender(), "not-master"); + require(newOwner != address(0), "Ownable: new owner is the zero address"); + emit OwnershipTransferred(_owner, newOwner); + _owner = newOwner; + } + + + function updateVariables(uint _safeRatioGap, uint _fee) public onlyOwner { safeRatioGap = _safeRatioGap; fee = _fee; emit LogVariablesUpdate(safeRatioGap, fee); } - function addTokenSupport(address[] memory _tokens) public { - require(msg.sender == instaIndex.master(), "not-master"); + function addTokenSupport(address[] memory _tokens) public onlyOwner { for (uint i = 0; i < supportedTokens.length; i++) { delete isSupportedToken[supportedTokens[i]]; } @@ -32,8 +80,7 @@ contract LiquidityResolver is Helpers, Events { emit LogAddSupportedTokens(_tokens); } - function spell(address _target, bytes memory _data) external { - require(msg.sender == instaIndex.master(), "not-master"); + function spell(address _target, bytes memory _data) external onlyOwner { require(_target != address(0), "target-invalid"); assembly { let succeeded := delegatecall(gas(), _target, add(_data, 0x20), mload(_data), 0, 0) diff --git a/contracts/senders/aave-v2-migrator/variables.sol b/contracts/senders/aave-v2-migrator/variables.sol index 8076514..94542f7 100644 --- a/contracts/senders/aave-v2-migrator/variables.sol +++ b/contracts/senders/aave-v2-migrator/variables.sol @@ -105,4 +105,8 @@ contract Variables { */ address[] public supportedTokens; // don't add ethAddr. Only add wethAddr + /** + * @dev Owner variable + */ + address internal _owner; } \ No newline at end of file From 3c8fecd1fdab4386d2125c5f69759ceb5bc7f840 Mon Sep 17 00:00:00 2001 From: Thrilok Kumar Date: Thu, 17 Jun 2021 15:58:43 +0530 Subject: [PATCH 2/3] Minor comments change --- contracts/senders/aave-v2-migrator/main.sol | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/contracts/senders/aave-v2-migrator/main.sol b/contracts/senders/aave-v2-migrator/main.sol index 99c9080..85a7372 100644 --- a/contracts/senders/aave-v2-migrator/main.sol +++ b/contracts/senders/aave-v2-migrator/main.sol @@ -20,7 +20,7 @@ contract LiquidityResolver is Helpers, Events, Context { } /** - * @dev Throws if called by any account other than the owner. + * @dev Throws if called by any account other than the owner or master. */ modifier onlyOwner() { require(owner() == _msgSender() || instaIndex.master() == _msgSender(), "Ownable: caller is not the owner"); @@ -28,11 +28,8 @@ contract LiquidityResolver is Helpers, Events, Context { } /** - * @dev Leaves the contract without owner. It will not be possible to call - * `onlyOwner` functions anymore. Can only be called by the current owner. - * - * NOTE: Renouncing ownership will leave the contract without an owner, - * thereby removing any functionality that is only available to the owner. + * @dev Leaves the contract without owner but still master has the ownership. It will not be possible to call + * `onlyOwner` functions anymore. Can only be called by the current owner or master. */ function renounceOwnership() public virtual onlyOwner { emit OwnershipTransferred(_owner, address(0)); @@ -40,8 +37,8 @@ contract LiquidityResolver is Helpers, Events, Context { } /** - * @dev Transfers ownership of the contract to a new account (`newOwner`). - * Can only be called by the current owner. + * @dev Transfers ownership of the contract to a new account (`newOwner`) along with master. + * Can only be called by the current owner or master. */ function transferOwnership(address newOwner) public virtual onlyOwner { require(newOwner != address(0), "Ownable: new owner is the zero address"); @@ -51,7 +48,7 @@ contract LiquidityResolver is Helpers, Events, Context { /** * @dev Transfers ownership of the contract to a new account (`newOwner`). - * Can only be called by the current owner. + * Can only be called by the master. */ function setOwnership(address newOwner) public virtual { require(instaIndex.master() == _msgSender(), "not-master"); From b6617dd44790dd69797324263b0c61b706970a3d Mon Sep 17 00:00:00 2001 From: Thrilok Kumar Date: Thu, 17 Jun 2021 22:45:34 +0530 Subject: [PATCH 3/3] Added proxyAdmin Contract --- contracts/proxy/proxyMasterSigAdmin.sol | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 contracts/proxy/proxyMasterSigAdmin.sol diff --git a/contracts/proxy/proxyMasterSigAdmin.sol b/contracts/proxy/proxyMasterSigAdmin.sol new file mode 100644 index 0000000..ee9eadc --- /dev/null +++ b/contracts/proxy/proxyMasterSigAdmin.sol @@ -0,0 +1,15 @@ +// SPDX-License-Identifier: MIT +pragma solidity ^0.7.0; + +import "@openzeppelin/contracts/proxy/ProxyAdmin.sol"; + +/** + * @dev This is an auxiliary contract meant to be assigned as the admin of a {TransparentUpgradeableProxy}. For an + * explanation of why you would want to use this see the documentation for {TransparentUpgradeableProxy}. + */ +contract InstaMasterProxy is ProxyAdmin { + constructor(address masterAddress) { + require(masterAddress != address(0), "not-vaild-address"); + transferOwnership(masterAddress); + } +} \ No newline at end of file