From 6109d0c003c0720e356a0ec12fdac17a1b897e8d Mon Sep 17 00:00:00 2001 From: Thrilok Kumar Date: Wed, 26 Aug 2020 22:16:39 +0530 Subject: [PATCH 01/13] Added more auth check in token pool --- contracts/tokenPool.sol | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/contracts/tokenPool.sol b/contracts/tokenPool.sol index 5faac78..85525df 100644 --- a/contracts/tokenPool.sol +++ b/contracts/tokenPool.sol @@ -10,6 +10,7 @@ import { DSMath } from "./libs/safeMath.sol"; interface AccountInterface { function enable(address authority) external; + function isAuth(address) external view returns(bool); function cast(address[] calldata _targets, bytes[] calldata _datas, address _origin) external payable; } @@ -66,7 +67,9 @@ contract PoolToken is ReentrancyGuard, DSMath, ERC20Pausable { function deploy(address _dsa, uint amount) public isChief { require(registry.isDsa(address(this), _dsa), "not-autheticated-dsa"); + require(AccountInterface(_dsa).isAuth(address(this)), "token-pool-not-auth"); baseToken.safeTransfer(_dsa, amount); + emit LogDeploy(amount); } @@ -93,9 +96,12 @@ contract PoolToken is ReentrancyGuard, DSMath, ERC20Pausable { function settle(address _dsa, address[] calldata _targets, bytes[] calldata _datas, address _origin) external isChief { require(registry.isDsa(address(this), _dsa), "not-autheticated-dsa"); + AccountInterface dsaWallet = AccountInterface(_dsa); if (_targets.length > 0 && _datas.length > 0) { - AccountInterface(_dsa).cast(_targets, _datas, _origin); + dsaWallet.cast(_targets, _datas, _origin); } + require(dsaWallet.isAuth(address(this)), "token-pool-not-auth"); + setExchangeRate(); emit LogSettle(block.timestamp); } From 4e423adf1a6f527af8ad016cdcafb916b936ab49 Mon Sep 17 00:00:00 2001 From: Thrilok Kumar Date: Wed, 26 Aug 2020 22:16:54 +0530 Subject: [PATCH 02/13] addDsa will create new DSA and add it --- contracts/registry.sol | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/contracts/registry.sol b/contracts/registry.sol index fdde657..d54dd96 100644 --- a/contracts/registry.sol +++ b/contracts/registry.sol @@ -5,6 +5,7 @@ pragma experimental ABIEncoderV2; interface IndexInterface { function master() external view returns (address); + function build(address _owner, uint accountVersion, address _origin) external returns (address _account); } contract Registry { @@ -19,6 +20,8 @@ contract Registry { event LogUpdateInsureFee(address pool, uint newFee); event LogAddPool(address indexed token, address indexed pool); event LogRemovePool(address indexed token, address indexed pool); + event LogNewDSA(address indexed pool, address indexed dsa); + event LogRemoveDSA(address indexed pool, address indexed dsa); IndexInterface public constant instaIndex = IndexInterface(0x2971AdFa57b20E5a416aE5a708A8655A9c74f723); @@ -134,13 +137,18 @@ contract Registry { emit LogUpdateInsureFee(_pool, _newFee); } - function enableDsa(address _pool, address _dsa) external isMaster { + function addDsa(address _pool) external isMaster { require(isPool[_pool], "not-pool"); + address _dsa = instaIndex.build(_pool, 1, address(this)); isDsa[_pool][_dsa] = true; + emit LogNewDSA(_pool, _dsa); } - function disableDsa(address _pool, address _dsa) external isMaster { + function removeDsa(address _pool, address _dsa) external isMaster { + require(isPool[_pool], "not-pool"); + require(isDsa[_pool][_dsa], "not-dsa-for-pool"); delete isDsa[_pool][_dsa]; + emit LogRemoveDSA(_pool, _dsa); } constructor(address _chief) public { From e7e13bf44d208bebeef8c4fc5d92cfb72d05f1ee Mon Sep 17 00:00:00 2001 From: Sowmay Jain Date: Thu, 27 Aug 2020 16:56:36 +1000 Subject: [PATCH 03/13] removed an extra parameter from event --- contracts/flusher.sol | 30 ++++++------------------------ 1 file changed, 6 insertions(+), 24 deletions(-) diff --git a/contracts/flusher.sol b/contracts/flusher.sol index 3ca6504..29beaab 100644 --- a/contracts/flusher.sol +++ b/contracts/flusher.sol @@ -37,27 +37,9 @@ contract Flusher { event LogInit(address indexed owner); event LogSwitch(bool indexed shieldState); - - event LogDeposit( - address indexed caller, - address indexed token, - address indexed tokenPool, - uint amount - ); - - event LogWithdraw( - address indexed caller, - address indexed token, - address indexed tokenPool, - uint amount - ); - - event LogWithdrawToOwner( - address indexed caller, - address indexed token, - address indexed owner, - uint amount - ); + event LogDeposit(address indexed token, address indexed tokenPool, uint amount); + event LogWithdraw(address indexed token, address indexed tokenPool,uint amount); + event LogWithdrawToOwner(address indexed token, address indexed owner, uint amount); function deposit(address token) public payable isSigner { require(address(token) != address(0), "invalid-token"); @@ -82,7 +64,7 @@ contract Flusher { } else { uint amt = tokenContract.balanceOf(address(this)); tokenContract.safeTransfer(owner, amt); - emit LogWithdrawToOwner(msg.sender, token, owner, amt); + emit LogWithdrawToOwner(token, owner, amt); } } @@ -92,7 +74,7 @@ contract Flusher { require(poolToken != address(0), "invalid-pool"); _amount = YieldPool(poolToken).withdraw(amount, owner); - emit LogWithdraw(msg.sender, token, poolToken, _amount); + emit LogWithdraw(token, poolToken, _amount); } /** @@ -110,7 +92,7 @@ contract Flusher { amount = tokenContract.balanceOf(address(this)); tokenContract.safeTransfer(address(owner), amount); } - emit LogWithdrawToOwner(msg.sender, token, owner, amount); + emit LogWithdrawToOwner(token, owner, amount); } function setBasic(address newOwner, address token) external { From 85bd5774b84fb3314e041b69a454e7438b2164e7 Mon Sep 17 00:00:00 2001 From: Sowmay Jain Date: Thu, 27 Aug 2020 16:57:27 +1000 Subject: [PATCH 04/13] removed "withdraw to owner" from deposit() method --- contracts/flusher.sol | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/contracts/flusher.sol b/contracts/flusher.sol index 29beaab..73ce97e 100644 --- a/contracts/flusher.sol +++ b/contracts/flusher.sol @@ -46,26 +46,20 @@ contract Flusher { address poolToken = registry.poolToken(token); IERC20 tokenContract = IERC20(token); - - if (poolToken != address(0)) { - YieldPool poolContract = YieldPool(poolToken); - uint amt; - if (address(tokenContract) == address(0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE)) { - amt = address(this).balance; - poolContract.deposit{value: amt}(amt); - } else { - amt = tokenContract.balanceOf(address(this)); - if (tokenContract.allowance(address(this), address(poolContract)) == 0) - tokenContract.approve(address(poolContract), uint(-1)); - poolContract.deposit(amt); - } - emit LogDeposit(msg.sender, token, address(poolContract), amt); + YieldPool poolContract = YieldPool(poolToken); + uint amt; + if (address(tokenContract) == address(0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE)) { + amt = address(this).balance; + poolContract.deposit{value: amt}(amt); } else { - uint amt = tokenContract.balanceOf(address(this)); - tokenContract.safeTransfer(owner, amt); - emit LogWithdrawToOwner(token, owner, amt); + amt = tokenContract.balanceOf(address(this)); + if (tokenContract.allowance(address(this), address(poolContract)) == 0) + tokenContract.approve(address(poolContract), uint(-1)); + + poolContract.deposit(amt); } + emit LogDeposit(msg.sender, token, address(poolContract), amt); } function withdraw(address token, uint amount) external isSigner returns (uint _amount) { From 51f2867cf1c15327e949f33d0b21eff52d33c4c3 Mon Sep 17 00:00:00 2001 From: Sowmay Jain Date: Thu, 27 Aug 2020 16:57:57 +1000 Subject: [PATCH 05/13] an open end to change owner via spell() --- contracts/flusher.sol | 2 -- 1 file changed, 2 deletions(-) diff --git a/contracts/flusher.sol b/contracts/flusher.sol index 73ce97e..e0b1a91 100644 --- a/contracts/flusher.sol +++ b/contracts/flusher.sol @@ -116,7 +116,6 @@ contract Flusher { require(_target != address(0), "target-invalid"); require(_data.length > 0, "data-invalid"); bytes memory _callData = _data; - address _owner = owner; assembly { let succeeded := delegatecall(gas(), _target, add(_callData, 0x20), mload(_callData), 0, 0) switch iszero(succeeded) @@ -127,7 +126,6 @@ contract Flusher { revert(0x00, size) } } - require(_owner == owner, "owner-change-denied"); } receive() external payable {} From 3582cf30ec5dd566fe6772b4473b94382905edb7 Mon Sep 17 00:00:00 2001 From: Sowmay Jain Date: Thu, 27 Aug 2020 17:00:02 +1000 Subject: [PATCH 06/13] revert: can't change flusher owner in any case --- contracts/flusher.sol | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contracts/flusher.sol b/contracts/flusher.sol index e0b1a91..73ce97e 100644 --- a/contracts/flusher.sol +++ b/contracts/flusher.sol @@ -116,6 +116,7 @@ contract Flusher { require(_target != address(0), "target-invalid"); require(_data.length > 0, "data-invalid"); bytes memory _callData = _data; + address _owner = owner; assembly { let succeeded := delegatecall(gas(), _target, add(_callData, 0x20), mload(_callData), 0, 0) switch iszero(succeeded) @@ -126,6 +127,7 @@ contract Flusher { revert(0x00, size) } } + require(_owner == owner, "owner-change-denied"); } receive() external payable {} From 56bfe94a643920a6fdc2d189161d6e68bd4e8305 Mon Sep 17 00:00:00 2001 From: Thrilok Kumar Date: Thu, 27 Aug 2020 12:33:44 +0530 Subject: [PATCH 07/13] Added more require statement in `setBasic()` func --- contracts/flusher.sol | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contracts/flusher.sol b/contracts/flusher.sol index e0b1a91..d93636b 100644 --- a/contracts/flusher.sol +++ b/contracts/flusher.sol @@ -91,6 +91,8 @@ contract Flusher { function setBasic(address newOwner, address token) external { require(owner == address(0), "already-an-owner"); + require(newOwner != address(0), "not-vaild-owner-address"); + require(token != address(0), "not-vaild-token-address"); owner = payable(newOwner); deposit(token); emit LogInit(newOwner); From 1964045812a38555db9379385576bdb3e5f8a68e Mon Sep 17 00:00:00 2001 From: Thrilok Kumar Date: Thu, 27 Aug 2020 12:34:30 +0530 Subject: [PATCH 08/13] Fixed deposit event error --- contracts/flusher.sol | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contracts/flusher.sol b/contracts/flusher.sol index 6412226..875ed82 100644 --- a/contracts/flusher.sol +++ b/contracts/flusher.sol @@ -59,7 +59,7 @@ contract Flusher { poolContract.deposit(amt); } - emit LogDeposit(msg.sender, token, address(poolContract), amt); + emit LogDeposit(token, address(poolContract), amt); } function withdraw(address token, uint amount) external isSigner returns (uint _amount) { From 66bee61f9f0a3ba564f051c47657c1b334318aaa Mon Sep 17 00:00:00 2001 From: Thrilok Kumar Date: Thu, 27 Aug 2020 12:35:41 +0530 Subject: [PATCH 09/13] checking is there is token pool or not --- contracts/flusher.sol | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contracts/flusher.sol b/contracts/flusher.sol index 875ed82..9da72af 100644 --- a/contracts/flusher.sol +++ b/contracts/flusher.sol @@ -45,6 +45,8 @@ contract Flusher { require(address(token) != address(0), "invalid-token"); address poolToken = registry.poolToken(token); + require(poolToken != address(0), "invalid-pool"); + IERC20 tokenContract = IERC20(token); YieldPool poolContract = YieldPool(poolToken); From 3d2868bfbd18c446bf2e96655c7e5bd08d3caabf Mon Sep 17 00:00:00 2001 From: Thrilok kumar Date: Thu, 27 Aug 2020 14:05:26 +0530 Subject: [PATCH 10/13] Delete dai.sol --- contracts/rateLogics/dai.sol | 36 ------------------------------------ 1 file changed, 36 deletions(-) delete mode 100644 contracts/rateLogics/dai.sol diff --git a/contracts/rateLogics/dai.sol b/contracts/rateLogics/dai.sol deleted file mode 100644 index 0928393..0000000 --- a/contracts/rateLogics/dai.sol +++ /dev/null @@ -1,36 +0,0 @@ -// SPDX-License-Identifier: MIT -pragma solidity ^0.6.8; - -import { DSMath } from "../libs/safeMath.sol"; - -interface PoolTokenInterface { - function totalBalance() external view returns (uint); - function dsaAmount() external view returns (uint); - function totalSupply() external view returns (uint); - -} - -interface ATokenInterface { - function balanceOf(address) external view returns (uint); -} - -interface CTokenInterface { - function getExchangeRate() external view returns (uint); - function balanceOf(address) external view returns (uint); -} - -contract RateLogic is DSMath { - PoolTokenInterface poolToken = PoolTokenInterface(address(0)); - ATokenInterface atoken = ATokenInterface(address(0)); - CTokenInterface ctoken = CTokenInterface(address(0)); - CTokenInterface token = CTokenInterface(address(0)); - - function getTotalToken() public view returns (uint) { - address _dsa; - uint abal = atoken.balanceOf(_dsa); - uint cbal = wmul(ctoken.balanceOf(_dsa), ctoken.getExchangeRate()); - uint dsaBal = token.balanceOf(_dsa); - uint poolBal = token.balanceOf(address(poolToken)); - return add(add(abal, poolBal) , add(cbal, dsaBal)); - } -} From 1589018a854f3b5fcaf280fbb2a63792bd2e1a86 Mon Sep 17 00:00:00 2001 From: Samyak Jain <34437877+KaymasJain@users.noreply.github.com> Date: Thu, 27 Aug 2020 18:35:33 +1000 Subject: [PATCH 11/13] Update registry.sol Update in addDsa to add any DSA. --- contracts/registry.sol | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/contracts/registry.sol b/contracts/registry.sol index d54dd96..9570d5d 100644 --- a/contracts/registry.sol +++ b/contracts/registry.sol @@ -137,9 +137,11 @@ contract Registry { emit LogUpdateInsureFee(_pool, _newFee); } - function addDsa(address _pool) external isMaster { + function addDsa(address _pool, address _dsa) external isMaster { require(isPool[_pool], "not-pool"); - address _dsa = instaIndex.build(_pool, 1, address(this)); + if (_dsa == address(0)) { + _dsa = instaIndex.build(_pool, 1, address(this)); + } isDsa[_pool][_dsa] = true; emit LogNewDSA(_pool, _dsa); } From 9c8e40658b2215674a0548015fff7c035b7574ea Mon Sep 17 00:00:00 2001 From: Thrilok kumar Date: Thu, 27 Aug 2020 14:05:42 +0530 Subject: [PATCH 12/13] Delete batchingProxy.sol --- contracts/batchingProxy.sol | 63 ------------------------------------- 1 file changed, 63 deletions(-) delete mode 100644 contracts/batchingProxy.sol diff --git a/contracts/batchingProxy.sol b/contracts/batchingProxy.sol deleted file mode 100644 index 7fc5768..0000000 --- a/contracts/batchingProxy.sol +++ /dev/null @@ -1,63 +0,0 @@ -// SPDX-License-Identifier: MIT - -pragma solidity ^0.6.8; -pragma experimental ABIEncoderV2; - -interface IndexInterface { - function master() external view returns (address); -} - -contract Registry { - - event LogAddSigner(address indexed signer); - event LogRemoveSigner(address indexed signer); - - event LogSuccess(address indexed flusher, bytes callData); - event LogFailed(address indexed flusher, bytes callData); - - - IndexInterface public constant instaIndex = IndexInterface(0x2971AdFa57b20E5a416aE5a708A8655A9c74f723); - - mapping (address => bool) public signer; - - modifier isMaster() { - require(msg.sender == instaIndex.master(), "not-master"); - _; - } - - modifier isSigner() { - require(signer[msg.sender], "not-chief"); - _; - } - - /** - * @dev Enable New Signer. - * @param _signer Address of the new signer. - */ - function enableSigner(address _signer) external isMaster { - require(_signer != address(0), "invalid-address"); - require(!signer[_signer], "signer-already-enabled"); - signer[_signer] = true; - emit LogAddSigner(_signer); - } - - /** - * @dev Disable Signer. - * @param _signer Address of the existing signer. - */ - function disableSigner(address _signer) external isMaster { - require(_signer != address(0), "invalid-address"); - require(signer[_signer], "signer-already-disabled"); - delete signer[_signer]; - emit LogRemoveSigner(_signer); - } - - function batchTx(address[] memory flushers, bytes[] memory calldatas) external isSigner { - require(flushers.length == calldatas.length, "not-same-length"); - for (uint i = 0; i < flushers.length; i++) { - (bool status, ) = payable(flushers[i]).call(calldatas[i]); - if (status) emit LogSuccess(flushers[i], calldatas[i]); - else emit LogFailed(flushers[i], calldatas[i]); - } - } -} From 0f3a6e95d09769f983cc009f78c36984be1e84ed Mon Sep 17 00:00:00 2001 From: Sowmay Jain Date: Thu, 27 Aug 2020 18:50:44 +1000 Subject: [PATCH 13/13] added name to event parameter --- contracts/registry.sol | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contracts/registry.sol b/contracts/registry.sol index 9570d5d..9c0ac4e 100644 --- a/contracts/registry.sol +++ b/contracts/registry.sol @@ -14,7 +14,7 @@ contract Registry { event LogRemoveChief(address indexed chief); event LogAddSigner(address indexed signer); event LogRemoveSigner(address indexed signer); - event LogSwitchPool(address pool, bool); + event LogSwitchPool(address pool, bool poolState); event LogUpdatePoolCap(address pool, uint newCap); event LogUpdatePoolLogic(address pool, address newLogic); event LogUpdateInsureFee(address pool, uint newFee);