From 2b4f09586a2c4bfd77314fc45ec2a55c63fd3134 Mon Sep 17 00:00:00 2001 From: Mubaris NK Date: Fri, 9 Oct 2020 12:10:30 +0530 Subject: [PATCH 1/9] Add methods for sell/buy via given path for Uniswap v2 --- contracts/connectors/uniswap.sol | 153 ++++++++++++++++++++++++++++++- 1 file changed, 152 insertions(+), 1 deletion(-) diff --git a/contracts/connectors/uniswap.sol b/contracts/connectors/uniswap.sol index 8c5eacd..bc92103 100644 --- a/contracts/connectors/uniswap.sol +++ b/contracts/connectors/uniswap.sol @@ -113,7 +113,7 @@ contract UniswapHelpers is Stores, DSMath { sellAmt, paths ); - buyAmt = amts[1]; + buyAmt = amts[amts.length - 1]; } function getExpectedSellAmt( @@ -136,6 +136,17 @@ contract UniswapHelpers is Stores, DSMath { require(pair != address(0), "No-exchange-address"); } + function checkPaths( + IUniswapV2Router02 router, + address[] memory paths + ) internal view { + for (uint i; i < paths.length - 1; i++) { + require(paths[i] != paths[i + 1], "Wrong-path"); + address pair = IUniswapV2Factory(router.factory()).getPair(paths[i], paths[i + 1]); + require(pair != address(0), "No-exchange-address"); + } + } + function getPaths( address buyAddr, address sellAddr @@ -416,6 +427,58 @@ contract UniswapResolver is UniswapLiquidity { uint256 setId ); + event LogBuyPath( + address indexed buyToken, + address indexed sellToken, + uint256 buyAmt, + uint256 sellAmt, + address[] path, + uint256 getId, + uint256 setId + ); + + event LogSellPath( + address indexed buyToken, + address indexed sellToken, + uint256 buyAmt, + uint256 sellAmt, + address[] path, + uint256 getId, + uint256 setId + ); + + function emitLogBuyPath( + address buyToken, + address sellToken, + uint256 buyAmt, + uint256 sellAmt, + address[] memory path, + uint256 getId, + uint256 setId + ) internal { + emit LogBuyPath(buyToken, sellToken, buyAmt, sellAmt, path, getId, setId); + bytes32 _eventCode = keccak256("LogBuyPath(address,address,uint256,uint256,address[],uint256,uint256)"); + bytes memory _eventParam = abi.encode(buyToken, sellToken, buyAmt, sellAmt, path, getId, setId); + (uint _type, uint _id) = connectorID(); + EventInterface(getEventAddr()).emitEvent(_type, _id, _eventCode, _eventParam); + } + + function emitLogSellPath( + address buyToken, + address sellToken, + uint256 buyAmt, + uint256 sellAmt, + address[] memory path, + uint256 getId, + uint256 setId + ) internal { + emit LogSellPath(buyToken, sellToken, buyAmt, sellAmt, path, getId, setId); + bytes32 _eventCode = keccak256("LogSellPath(address,address,uint256,uint256,address[],uint256,uint256)"); + bytes memory _eventParam = abi.encode(buyToken, sellToken, buyAmt, sellAmt, path, getId, setId); + (uint _type, uint _id) = connectorID(); + EventInterface(getEventAddr()).emitEvent(_type, _id, _eventCode, _eventParam); + } + /** * @dev Buy ETH/ERC20_Token. * @param buyAddr buying token address.(For ETH: 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE) @@ -523,6 +586,94 @@ contract UniswapResolver is UniswapLiquidity { (uint _type, uint _id) = connectorID(); EventInterface(getEventAddr()).emitEvent(_type, _id, _eventCode, _eventParam); } + + function buyViaPath( + address buyAddr, + address sellAddr, + uint buyAmt, + uint unitAmt, + address[] calldata paths, + uint getId, + uint setId + ) external payable { + + uint _buyAmt = getUint(getId, buyAmt); + + (TokenInterface _buyAddr, TokenInterface _sellAddr) = changeEthAddress(buyAddr, sellAddr); + + IUniswapV2Router02 router = IUniswapV2Router02(getUniswapAddr()); + + uint _slippageAmt = convert18ToDec(_sellAddr.decimals(), + wmul(unitAmt, convertTo18(_buyAddr.decimals(), _buyAmt))); + + checkPaths(router, paths); + + uint _expectedAmt = getExpectedSellAmt(router, paths, _buyAmt); + require(_slippageAmt >= _expectedAmt, "Too much slippage"); + + convertEthToWeth(_sellAddr, _expectedAmt); + _sellAddr.approve(address(router), _expectedAmt); + + uint _sellAmt = router.swapTokensForExactTokens( + buyAmt, + _expectedAmt, + paths, + address(this), + now + 1 + )[0]; + + convertWethToEth(_buyAddr, buyAmt); + + setUint(setId, _sellAmt); + + emitLogBuyPath(buyAddr, sellAddr, _buyAmt, _sellAmt, paths, getId, setId); + } + + function sellViaPath( + address buyAddr, + address sellAddr, + uint sellAmt, + uint unitAmt, + address[] calldata paths, + uint getId, + uint setId + ) external payable { + + uint _sellAmt = getUint(getId, sellAmt); + + (TokenInterface _buyAddr, TokenInterface _sellAddr) = changeEthAddress(buyAddr, sellAddr); + + if (_sellAmt == uint(-1)) { + _sellAmt = sellAddr == getEthAddr() ? address(this).balance : _sellAddr.balanceOf(address(this)); + } + + uint _slippageAmt = convert18ToDec(_buyAddr.decimals(), + wmul(unitAmt, convertTo18(_sellAddr.decimals(), _sellAmt))); + + IUniswapV2Router02 router = IUniswapV2Router02(getUniswapAddr()); + + checkPaths(router, paths); + + uint _expectedAmt = getExpectedBuyAmt(router, paths, _sellAmt); + require(_slippageAmt <= _expectedAmt, "Too much slippage"); + + convertEthToWeth(_sellAddr, _sellAmt); + _sellAddr.approve(address(router), _sellAmt); + + uint _buyAmt = router.swapExactTokensForTokens( + _sellAmt, + _expectedAmt, + paths, + address(this), + now + 1 + )[1]; + + convertWethToEth(_buyAddr, _buyAmt); + + setUint(setId, _buyAmt); + + emitLogSellPath(buyAddr, sellAddr, _buyAmt, _sellAmt, paths, getId, setId); + } } From c7c5a0e8a46d02904630a952afc4341223795583 Mon Sep 17 00:00:00 2001 From: Mubaris NK Date: Sun, 15 Nov 2020 14:41:37 +0530 Subject: [PATCH 2/9] Aave v2 connector [untested] --- contracts/connectors/aave_v2.sol | 219 +++++++++++++++++++++++++++++++ 1 file changed, 219 insertions(+) create mode 100644 contracts/connectors/aave_v2.sol diff --git a/contracts/connectors/aave_v2.sol b/contracts/connectors/aave_v2.sol new file mode 100644 index 0000000..84eb614 --- /dev/null +++ b/contracts/connectors/aave_v2.sol @@ -0,0 +1,219 @@ +pragma solidity ^0.6.0; +pragma experimental ABIEncoderV2; + +// import files from common directory +import { TokenInterface , MemoryInterface, EventInterface} from "../common/interfaces.sol"; +import { Stores } from "../common/stores.sol"; +import { DSMath } from "../common/math.sol"; + +interface AaveInterface { + function deposit(address _asset, uint256 _amount, address _onBehalfOf, uint16 _referralCode) external; + function withdraw(address _asset, uint256 _amount, address _to) external; + function borrow( + address _asset, + uint256 _amount, + uint256 _interestRateMode, + uint16 _referralCode, + address _onBehalfOf + ) external; + function repay(address _asset, uint256 _amount, uint256 _rateMode, address _onBehalfOf) external; + function setUserUseReserveAsCollateral(address _asset, bool _useAsCollateral) external; + function getUserAccountData(address user) external view returns ( + uint256 totalCollateralETH, + uint256 totalDebtETH, + uint256 availableBorrowsETH, + uint256 currentLiquidationThreshold, + uint256 ltv, + uint256 healthFactor + ); +} + +interface AaveLendingPoolProviderInterface { + function getLendingPool() external view returns (address); +} + +// Aave Protocol Data Provider +interface AaveDataProviderInterface { + function getReserveTokensAddresses(address _asset) external view returns ( + address aTokenAddress, + address stableDebtTokenAddress, + address variableDebtTokenAddress + ); + function getUserReserveData(address _asset, address _user) external view returns ( + uint256 currentATokenBalance, + uint256 currentStableDebt, + uint256 currentVariableDebt, + uint256 principalStableDebt, + uint256 scaledVariableDebt, + uint256 stableBorrowRate, + uint256 liquidityRate, + uint40 stableRateLastUpdated, + bool usageAsCollateralEnabled + ); +} + +interface AaveAddressProviderRegistryInterface { + function getAddressesProvidersList() external view returns (address[] memory); +} + +interface ATokenInterface { + function scaledBalanceOf(address _user) external view returns (uint256); + function isTransferAllowed(address _user, uint256 _amount) external view returns (bool); + function balanceOf(address _user) external view returns(uint256); +} + +contract AaveHelpers is DSMath, Stores { + /** + * @dev get Aave Lending Pool Provider + */ + function getAaveProvider() internal pure returns (AaveLendingPoolProviderInterface) { + // return AaveLendingPoolProviderInterface(0x24a42fD28C976A61Df5D00D0599C34c4f90748c8); //mainnet + return AaveLendingPoolProviderInterface(0x652B2937Efd0B5beA1c8d54293FC1289672AFC6b); //kovan + } + + /** + * @dev get Aave Protocol Data Provider + */ + function getAaveDataProvider() internal pure returns (AaveDataProviderInterface) { + // return AaveProtocolDataProviderInterface(0x24a42fD28C976A61Df5D00D0599C34c4f90748c8); //mainnet + return AaveDataProviderInterface(0x744C1aaA95232EeF8A9994C4E0b3a89659D9AB79); //kovan + } + + /** + * @dev Return ethereum address + */ + function getWethAddr() internal pure returns (address) { + return 0xd0A1E359811322d97991E03f863a0C30C2cF029C; // Kovan WETH Address + } + + /** + * @dev get Referral Code + */ + function getReferralCode() internal pure returns (uint16) { + return 0; + } + + function getIsColl(AaveDataProviderInterface aaveData, address token, address user) internal view returns (bool isCol) { + (, , , , , , , , isCol) = aaveData.getUserReserveData(token, user); + } + + function convertEthToWeth(TokenInterface token, uint amount) internal { + if(address(token) == getWethAddr()) token.deposit.value(amount)(); + } + + function convertWethToEth(TokenInterface token, uint amount) internal { + if(address(token) == getWethAddr()) { + token.approve(getWethAddr(), amount); + token.withdraw(amount); + } + } +} + +contract BasicResolver is AaveHelpers { + event LogDeposit(address indexed token, uint256 tokenAmt, uint256 getId, uint256 setId); + event LogWithdraw(address indexed token, uint256 tokenAmt, uint256 getId, uint256 setId); + event LogBorrow(address indexed token, uint256 tokenAmt, uint256 rateMode, uint256 getId, uint256 setId); + event LogPayback(address indexed token, uint256 tokenAmt, uint256 rateMode, uint256 getId, uint256 setId); + + function deposit(address token, uint amt, uint getId, uint setId) external payable { + // uint _amt = getUint(getId, amt); + uint _amt = amt; + AaveInterface aave = AaveInterface(getAaveProvider().getLendingPool()); + AaveDataProviderInterface aaveData = getAaveDataProvider(); + + if (token == getEthAddr()) { + _amt = _amt == uint(-1) ? address(this).balance : _amt; + TokenInterface tokenContract = TokenInterface(getWethAddr()); + convertEthToWeth(tokenContract, _amt); + _token = getWethAddr(); + } else { + TokenInterface tokenContract = TokenInterface(token); + _amt = _amt == uint(-1) ? tokenContract.balanceOf(address(this)) : _amt; + } + + tokenContract.approve(getAaveProvider().getLendingPoolCore(), _amt); + + aave.deposit(_token, _amt, address(this), getReferralCode()); + + if (!getIsColl(aaveData, _token, address(0))) { + aave.setUserUseReserveAsCollateral(_token, true); + } + + // setUint(setId, _amt); + + emit LogDeposit(token, _amt, getId, setId); + bytes32 _eventCode = keccak256("LogDeposit(address,uint256,uint256,uint256)"); + bytes memory _eventParam = abi.encode(token, _amt, getId, setId); + emitEvent(_eventCode, _eventParam); + } + + function withdraw(address token, uint amt, uint getId, uint setId) external { + // uint _amt = getUint(getId, amt); + uint _amt = amt; + AaveInterface aave = AaveInterface(getAaveProvider().getLendingPool()); + address _token = token == getEthAddr() ? getWethAddr() : token; + TokenInterface tokenContract = token == getEthAddr() ? TokenInterface(getWethAddr()) : TokenInterface(token); + + uint initialBal = token == getEthAddr() ? address(this).balance : tokenContract.balanceOf(address(this)); + aave.withdraw(_token, _amt, address(this)); + uint wethBal = token == getEthAddr() ? tokenContract.balanceOf(address(this)) : 0; + convertWethToEth(tokenContract, wethBal); + uint finalBal = token == getEthAddr() ? address(this).balance : tokenContract.balanceOf(address(this)); + + _amt = sub(finalBal, initialBal); + // setUint(setId, _amt); + + emit LogWithdraw(token, _amt, getId, setId); + bytes32 _eventCode = keccak256("LogWithdraw(address,uint256,uint256,uint256)"); + bytes memory _eventParam = abi.encode(token, _amt, getId, setId); + emitEvent(_eventCode, _eventParam); + } + + function borrow(address token, uint amt, uint rateMode, uint getId, uint setId) external { + // uint _amt = getUint(getId, amt); + uint _amt = amt; + AaveInterface aave = AaveInterface(getAaveProvider().getLendingPool()); + address _token = token == getEthAddr() ? getWethAddr() : token; + TokenInterface tokenContract = token == getEthAddr() ? TokenInterface(getWethAddr()) : TokenInterface(token); + + aave.borrow(_token, _amt, rateMode, getReferralCode(), address(this)); + convertWethToEth(tokenContract, _amt); + + // setUint(setId, _amt); + emit LogBorrow(token, _amt, rateMode, getId, setId); + bytes32 _eventCode = keccak256("LogBorrow(address,uint256,uint256,uint256,uint256)"); + bytes memory _eventParam = abi.encode(token, _amt, rateMode, getId, setId); + emitEvent(_eventCode, _eventParam); + } + + function payback(address token, uint amt, uint rateMode, uint getId, uint setId) external payable { + // uint _amt = getUint(getId, amt); + uint _amt = amt; + AaveInterface aave = AaveInterface(getAaveProvider().getLendingPool()); + + if (token == getEthAddr()) { + _amt = _amt == uint(-1) ? address(this).balance : _amt; + TokenInterface tokenContract = TokenInterface(getWethAddr()); + convertEthToWeth(tokenContract, _amt); + _token = getWethAddr(); + } else { + TokenInterface tokenContract = TokenInterface(token); + _amt = _amt == uint(-1) ? tokenContract.balanceOf(address(this)) : _amt; + } + + tokenContract.approve(getAaveProvider().getLendingPoolCore(), _amt); + + aave.repay(_token, _amt, rateMode, address(this)); + + // setUint(setId, _amt); + + emit LogPayback(token, _amt, rateMode, getId, setId); + bytes32 _eventCode = keccak256("LogPayback(address,uint256,uint256,uint256,uint256)"); + bytes memory _eventParam = abi.encode(token, _amt, rateMode, getId, setId); + emitEvent(_eventCode, _eventParam); + } +} + +contract ConnectAaveV2 is BasicResolver { + string public name = "Aave-v2"; +} \ No newline at end of file From bde193b6e7787091c0cf7bab30662fd1ef34a613 Mon Sep 17 00:00:00 2001 From: Mubaris NK Date: Mon, 16 Nov 2020 01:05:00 +0530 Subject: [PATCH 3/9] fix issues --- contracts/connectors/aave_v2.sol | 19 +++--- package-lock.json | 104 ++++++++++++++++++++----------- 2 files changed, 79 insertions(+), 44 deletions(-) diff --git a/contracts/connectors/aave_v2.sol b/contracts/connectors/aave_v2.sol index 84eb614..7d2ab06 100644 --- a/contracts/connectors/aave_v2.sol +++ b/contracts/connectors/aave_v2.sol @@ -120,22 +120,25 @@ contract BasicResolver is AaveHelpers { uint _amt = amt; AaveInterface aave = AaveInterface(getAaveProvider().getLendingPool()); AaveDataProviderInterface aaveData = getAaveDataProvider(); + address _token = token == getEthAddr() ? getWethAddr() : token; + + TokenInterface tokenContract; if (token == getEthAddr()) { _amt = _amt == uint(-1) ? address(this).balance : _amt; - TokenInterface tokenContract = TokenInterface(getWethAddr()); + tokenContract = TokenInterface(getWethAddr()); convertEthToWeth(tokenContract, _amt); _token = getWethAddr(); } else { - TokenInterface tokenContract = TokenInterface(token); + tokenContract = TokenInterface(token); _amt = _amt == uint(-1) ? tokenContract.balanceOf(address(this)) : _amt; } - tokenContract.approve(getAaveProvider().getLendingPoolCore(), _amt); + tokenContract.approve(getAaveProvider().getLendingPool(), _amt); aave.deposit(_token, _amt, address(this), getReferralCode()); - if (!getIsColl(aaveData, _token, address(0))) { + if (!getIsColl(aaveData, _token, address(this))) { aave.setUserUseReserveAsCollateral(_token, true); } @@ -190,18 +193,20 @@ contract BasicResolver is AaveHelpers { // uint _amt = getUint(getId, amt); uint _amt = amt; AaveInterface aave = AaveInterface(getAaveProvider().getLendingPool()); + address _token = token == getEthAddr() ? getWethAddr() : token; + TokenInterface tokenContract; if (token == getEthAddr()) { _amt = _amt == uint(-1) ? address(this).balance : _amt; - TokenInterface tokenContract = TokenInterface(getWethAddr()); + tokenContract = TokenInterface(getWethAddr()); convertEthToWeth(tokenContract, _amt); _token = getWethAddr(); } else { - TokenInterface tokenContract = TokenInterface(token); + tokenContract = TokenInterface(token); _amt = _amt == uint(-1) ? tokenContract.balanceOf(address(this)) : _amt; } - tokenContract.approve(getAaveProvider().getLendingPoolCore(), _amt); + tokenContract.approve(getAaveProvider().getLendingPool(), _amt); aave.repay(_token, _amt, rateMode, address(this)); diff --git a/package-lock.json b/package-lock.json index 10ff3aa..a0f28f7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1230,6 +1230,21 @@ "resolved": "https://registry.npmjs.org/scrypt-js/-/scrypt-js-2.0.4.tgz", "integrity": "sha512-4KsaGcPnuhtCZQCxFxN3GVYIhKFPTdLd8PLC552XwbMndtD0cjRFAhDuuydXQ0h08ZfPgzqe6EKHozpuH74iDw==" }, + "scrypt-shim": { + "version": "github:web3-js/scrypt-shim#aafdadda13e660e25e1c525d1f5b2443f5eb1ebb", + "from": "github:web3-js/scrypt-shim#aafdadda13e660e25e1c525d1f5b2443f5eb1ebb", + "requires": { + "scryptsy": "^2.1.0", + "semver": "^6.3.0" + }, + "dependencies": { + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + } + } + }, "setimmediate": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.4.tgz", @@ -1427,7 +1442,6 @@ "eth-lib": "0.2.7", "ethereumjs-common": "^1.3.2", "ethereumjs-tx": "^2.1.1", - "scrypt-shim": "github:web3-js/scrypt-shim#aafdadda13e660e25e1c525d1f5b2443f5eb1ebb", "underscore": "1.9.1", "uuid": "3.3.2", "web3-core": "1.2.2", @@ -1531,8 +1545,20 @@ "integrity": "sha512-Wb1mrWTGMTXOpJkL0yGvL/WYLt8fUIXx8k/l52QB2IiKzvyd42dTWn4+j8IKXGSYYzOm7NMqv6nhA5VDk12VfA==", "requires": { "underscore": "1.9.1", - "web3-core-helpers": "1.2.2", - "websocket": "github:web3-js/WebSocket-Node#ef5ea2f41daf4a2113b80c9223df884b4d56c400" + "web3-core-helpers": "1.2.2" + }, + "dependencies": { + "websocket": { + "version": "github:web3-js/WebSocket-Node#ef5ea2f41daf4a2113b80c9223df884b4d56c400", + "from": "github:web3-js/WebSocket-Node#ef5ea2f41daf4a2113b80c9223df884b4d56c400", + "requires": { + "debug": "^2.2.0", + "es5-ext": "^0.10.50", + "nan": "^2.14.0", + "typedarray-to-buffer": "^3.1.5", + "yaeti": "^0.0.6" + } + } } }, "web3-shh": { @@ -1663,9 +1689,9 @@ "integrity": "sha512-kUVUvrqttndeprLoXjI5arWHeiP3uh4XODAKbG+ZaWHCVQeelxCbnXBeWxZ2BPHdXgH0xR9dU1b916JhDhbgAA==" }, "@studydefi/money-legos": { - "version": "2.3.5", - "resolved": "https://registry.npmjs.org/@studydefi/money-legos/-/money-legos-2.3.5.tgz", - "integrity": "sha512-Whfsw+Ka5PCX8u7za0DOnb3j7DqPQ0QW2SjtjrC4drP+MRpq6ANdxTLgAqYU2e5BZ3/DrDZ6MGTajMCPKXoxZw==", + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/@studydefi/money-legos/-/money-legos-2.4.1.tgz", + "integrity": "sha512-60LErLtI+q0bCuwnhGQxK2pdsKPrwMYeQaIekXP2FOBUm6+k0qGl3Q5tly0eX2PkdC8ycxWeQSUvTIAHhmr4aQ==", "dev": true, "requires": { "@openzeppelin/contracts": "^2.5.0" @@ -4958,7 +4984,8 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "aproba": { "version": "1.2.0", @@ -4979,12 +5006,14 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -4999,17 +5028,20 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -5126,7 +5158,8 @@ "inherits": { "version": "2.0.4", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -5138,6 +5171,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -5152,6 +5186,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -5159,12 +5194,14 @@ "minimist": { "version": "1.2.5", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.9.0", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -5183,6 +5220,7 @@ "version": "0.5.3", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "^1.2.5" } @@ -5244,7 +5282,8 @@ "npm-normalize-package-bin": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "npm-packlist": { "version": "1.4.8", @@ -5272,7 +5311,8 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -5284,6 +5324,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -5361,7 +5402,8 @@ "safe-buffer": { "version": "5.1.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "safer-buffer": { "version": "2.1.2", @@ -5397,6 +5439,7 @@ "version": "1.0.2", "bundled": true, "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -5416,6 +5459,7 @@ "version": "3.0.1", "bundled": true, "dev": true, + "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -5459,12 +5503,14 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "yallist": { "version": "3.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true } } }, @@ -9365,21 +9411,6 @@ "resolved": "https://registry.npmjs.org/scrypt-js/-/scrypt-js-2.0.3.tgz", "integrity": "sha1-uwBAvgMEPamgEqLOqfyfhSz8h9Q=" }, - "scrypt-shim": { - "version": "github:web3-js/scrypt-shim#aafdadda13e660e25e1c525d1f5b2443f5eb1ebb", - "from": "github:web3-js/scrypt-shim", - "requires": { - "scryptsy": "^2.1.0", - "semver": "^6.3.0" - }, - "dependencies": { - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" - } - } - }, "scryptsy": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/scryptsy/-/scryptsy-2.1.0.tgz", @@ -9840,7 +9871,7 @@ "integrity": "sha1-gewXhBRUkfLqqJVbMcBgSeB8Xn0=", "dev": true, "requires": { - "bignumber.js": "git+https://github.com/debris/bignumber.js.git#94d7146671b9719e00a09c29b01a691bc85048c2", + "bignumber.js": "bignumber.js@git+https://github.com/debris/bignumber.js.git#94d7146671b9719e00a09c29b01a691bc85048c2", "crypto-js": "^3.1.4", "utf8": "^2.1.1", "xhr2": "*", @@ -11657,8 +11688,7 @@ "integrity": "sha512-oqsQXzu+ejJACVHy864WwIyw+oB21nw/pI65/sD95Zi98+/HQzFfNcIFneF1NC4bVF3VNX4YHTNq2I2o97LAiA==", "requires": { "underscore": "1.9.1", - "web3-core-helpers": "1.2.1", - "websocket": "github:web3-js/WebSocket-Node#905deb4812572b344f5801f8c9ce8bb02799d82e" + "web3-core-helpers": "1.2.1" }, "dependencies": { "debug": { @@ -11676,7 +11706,7 @@ }, "websocket": { "version": "github:web3-js/WebSocket-Node#905deb4812572b344f5801f8c9ce8bb02799d82e", - "from": "github:web3-js/WebSocket-Node#polyfill/globalThis", + "from": "github:web3-js/WebSocket-Node#905deb4812572b344f5801f8c9ce8bb02799d82e", "requires": { "debug": "^2.2.0", "es5-ext": "^0.10.50", From 0f96ba6b5bf28a8b3f9994078245dc17c328777a Mon Sep 17 00:00:00 2001 From: Mubaris NK Date: Mon, 16 Nov 2020 12:41:08 +0530 Subject: [PATCH 4/9] Enable instamemory --- contracts/connectors/aave_v2.sol | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/contracts/connectors/aave_v2.sol b/contracts/connectors/aave_v2.sol index 7d2ab06..e571ca4 100644 --- a/contracts/connectors/aave_v2.sol +++ b/contracts/connectors/aave_v2.sol @@ -116,7 +116,7 @@ contract BasicResolver is AaveHelpers { event LogPayback(address indexed token, uint256 tokenAmt, uint256 rateMode, uint256 getId, uint256 setId); function deposit(address token, uint amt, uint getId, uint setId) external payable { - // uint _amt = getUint(getId, amt); + uint _amt = getUint(getId, amt); uint _amt = amt; AaveInterface aave = AaveInterface(getAaveProvider().getLendingPool()); AaveDataProviderInterface aaveData = getAaveDataProvider(); @@ -142,7 +142,7 @@ contract BasicResolver is AaveHelpers { aave.setUserUseReserveAsCollateral(_token, true); } - // setUint(setId, _amt); + setUint(setId, _amt); emit LogDeposit(token, _amt, getId, setId); bytes32 _eventCode = keccak256("LogDeposit(address,uint256,uint256,uint256)"); @@ -151,7 +151,7 @@ contract BasicResolver is AaveHelpers { } function withdraw(address token, uint amt, uint getId, uint setId) external { - // uint _amt = getUint(getId, amt); + uint _amt = getUint(getId, amt); uint _amt = amt; AaveInterface aave = AaveInterface(getAaveProvider().getLendingPool()); address _token = token == getEthAddr() ? getWethAddr() : token; @@ -164,7 +164,7 @@ contract BasicResolver is AaveHelpers { uint finalBal = token == getEthAddr() ? address(this).balance : tokenContract.balanceOf(address(this)); _amt = sub(finalBal, initialBal); - // setUint(setId, _amt); + setUint(setId, _amt); emit LogWithdraw(token, _amt, getId, setId); bytes32 _eventCode = keccak256("LogWithdraw(address,uint256,uint256,uint256)"); @@ -173,7 +173,7 @@ contract BasicResolver is AaveHelpers { } function borrow(address token, uint amt, uint rateMode, uint getId, uint setId) external { - // uint _amt = getUint(getId, amt); + uint _amt = getUint(getId, amt); uint _amt = amt; AaveInterface aave = AaveInterface(getAaveProvider().getLendingPool()); address _token = token == getEthAddr() ? getWethAddr() : token; @@ -182,7 +182,7 @@ contract BasicResolver is AaveHelpers { aave.borrow(_token, _amt, rateMode, getReferralCode(), address(this)); convertWethToEth(tokenContract, _amt); - // setUint(setId, _amt); + setUint(setId, _amt); emit LogBorrow(token, _amt, rateMode, getId, setId); bytes32 _eventCode = keccak256("LogBorrow(address,uint256,uint256,uint256,uint256)"); bytes memory _eventParam = abi.encode(token, _amt, rateMode, getId, setId); @@ -190,7 +190,7 @@ contract BasicResolver is AaveHelpers { } function payback(address token, uint amt, uint rateMode, uint getId, uint setId) external payable { - // uint _amt = getUint(getId, amt); + uint _amt = getUint(getId, amt); uint _amt = amt; AaveInterface aave = AaveInterface(getAaveProvider().getLendingPool()); address _token = token == getEthAddr() ? getWethAddr() : token; @@ -210,7 +210,7 @@ contract BasicResolver is AaveHelpers { aave.repay(_token, _amt, rateMode, address(this)); - // setUint(setId, _amt); + setUint(setId, _amt); emit LogPayback(token, _amt, rateMode, getId, setId); bytes32 _eventCode = keccak256("LogPayback(address,uint256,uint256,uint256,uint256)"); From 795f3ca027618f5ffdbd05b17527d52720dbb99b Mon Sep 17 00:00:00 2001 From: Mubaris NK Date: Mon, 16 Nov 2020 17:15:30 +0530 Subject: [PATCH 5/9] Revert "Add methods for sell/buy via given path for Uniswap v2" This reverts commit 2b4f09586a2c4bfd77314fc45ec2a55c63fd3134. --- contracts/connectors/uniswap.sol | 153 +------------------------------ 1 file changed, 1 insertion(+), 152 deletions(-) diff --git a/contracts/connectors/uniswap.sol b/contracts/connectors/uniswap.sol index bc92103..8c5eacd 100644 --- a/contracts/connectors/uniswap.sol +++ b/contracts/connectors/uniswap.sol @@ -113,7 +113,7 @@ contract UniswapHelpers is Stores, DSMath { sellAmt, paths ); - buyAmt = amts[amts.length - 1]; + buyAmt = amts[1]; } function getExpectedSellAmt( @@ -136,17 +136,6 @@ contract UniswapHelpers is Stores, DSMath { require(pair != address(0), "No-exchange-address"); } - function checkPaths( - IUniswapV2Router02 router, - address[] memory paths - ) internal view { - for (uint i; i < paths.length - 1; i++) { - require(paths[i] != paths[i + 1], "Wrong-path"); - address pair = IUniswapV2Factory(router.factory()).getPair(paths[i], paths[i + 1]); - require(pair != address(0), "No-exchange-address"); - } - } - function getPaths( address buyAddr, address sellAddr @@ -427,58 +416,6 @@ contract UniswapResolver is UniswapLiquidity { uint256 setId ); - event LogBuyPath( - address indexed buyToken, - address indexed sellToken, - uint256 buyAmt, - uint256 sellAmt, - address[] path, - uint256 getId, - uint256 setId - ); - - event LogSellPath( - address indexed buyToken, - address indexed sellToken, - uint256 buyAmt, - uint256 sellAmt, - address[] path, - uint256 getId, - uint256 setId - ); - - function emitLogBuyPath( - address buyToken, - address sellToken, - uint256 buyAmt, - uint256 sellAmt, - address[] memory path, - uint256 getId, - uint256 setId - ) internal { - emit LogBuyPath(buyToken, sellToken, buyAmt, sellAmt, path, getId, setId); - bytes32 _eventCode = keccak256("LogBuyPath(address,address,uint256,uint256,address[],uint256,uint256)"); - bytes memory _eventParam = abi.encode(buyToken, sellToken, buyAmt, sellAmt, path, getId, setId); - (uint _type, uint _id) = connectorID(); - EventInterface(getEventAddr()).emitEvent(_type, _id, _eventCode, _eventParam); - } - - function emitLogSellPath( - address buyToken, - address sellToken, - uint256 buyAmt, - uint256 sellAmt, - address[] memory path, - uint256 getId, - uint256 setId - ) internal { - emit LogSellPath(buyToken, sellToken, buyAmt, sellAmt, path, getId, setId); - bytes32 _eventCode = keccak256("LogSellPath(address,address,uint256,uint256,address[],uint256,uint256)"); - bytes memory _eventParam = abi.encode(buyToken, sellToken, buyAmt, sellAmt, path, getId, setId); - (uint _type, uint _id) = connectorID(); - EventInterface(getEventAddr()).emitEvent(_type, _id, _eventCode, _eventParam); - } - /** * @dev Buy ETH/ERC20_Token. * @param buyAddr buying token address.(For ETH: 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE) @@ -586,94 +523,6 @@ contract UniswapResolver is UniswapLiquidity { (uint _type, uint _id) = connectorID(); EventInterface(getEventAddr()).emitEvent(_type, _id, _eventCode, _eventParam); } - - function buyViaPath( - address buyAddr, - address sellAddr, - uint buyAmt, - uint unitAmt, - address[] calldata paths, - uint getId, - uint setId - ) external payable { - - uint _buyAmt = getUint(getId, buyAmt); - - (TokenInterface _buyAddr, TokenInterface _sellAddr) = changeEthAddress(buyAddr, sellAddr); - - IUniswapV2Router02 router = IUniswapV2Router02(getUniswapAddr()); - - uint _slippageAmt = convert18ToDec(_sellAddr.decimals(), - wmul(unitAmt, convertTo18(_buyAddr.decimals(), _buyAmt))); - - checkPaths(router, paths); - - uint _expectedAmt = getExpectedSellAmt(router, paths, _buyAmt); - require(_slippageAmt >= _expectedAmt, "Too much slippage"); - - convertEthToWeth(_sellAddr, _expectedAmt); - _sellAddr.approve(address(router), _expectedAmt); - - uint _sellAmt = router.swapTokensForExactTokens( - buyAmt, - _expectedAmt, - paths, - address(this), - now + 1 - )[0]; - - convertWethToEth(_buyAddr, buyAmt); - - setUint(setId, _sellAmt); - - emitLogBuyPath(buyAddr, sellAddr, _buyAmt, _sellAmt, paths, getId, setId); - } - - function sellViaPath( - address buyAddr, - address sellAddr, - uint sellAmt, - uint unitAmt, - address[] calldata paths, - uint getId, - uint setId - ) external payable { - - uint _sellAmt = getUint(getId, sellAmt); - - (TokenInterface _buyAddr, TokenInterface _sellAddr) = changeEthAddress(buyAddr, sellAddr); - - if (_sellAmt == uint(-1)) { - _sellAmt = sellAddr == getEthAddr() ? address(this).balance : _sellAddr.balanceOf(address(this)); - } - - uint _slippageAmt = convert18ToDec(_buyAddr.decimals(), - wmul(unitAmt, convertTo18(_sellAddr.decimals(), _sellAmt))); - - IUniswapV2Router02 router = IUniswapV2Router02(getUniswapAddr()); - - checkPaths(router, paths); - - uint _expectedAmt = getExpectedBuyAmt(router, paths, _sellAmt); - require(_slippageAmt <= _expectedAmt, "Too much slippage"); - - convertEthToWeth(_sellAddr, _sellAmt); - _sellAddr.approve(address(router), _sellAmt); - - uint _buyAmt = router.swapExactTokensForTokens( - _sellAmt, - _expectedAmt, - paths, - address(this), - now + 1 - )[1]; - - convertWethToEth(_buyAddr, _buyAmt); - - setUint(setId, _buyAmt); - - emitLogSellPath(buyAddr, sellAddr, _buyAmt, _sellAmt, paths, getId, setId); - } } From 4fdc139b3834518003958a026b03594700e26e88 Mon Sep 17 00:00:00 2001 From: Mubaris NK Date: Mon, 16 Nov 2020 17:16:12 +0530 Subject: [PATCH 6/9] Fix comment --- contracts/connectors/aave_v2.sol | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contracts/connectors/aave_v2.sol b/contracts/connectors/aave_v2.sol index e571ca4..e25d6dc 100644 --- a/contracts/connectors/aave_v2.sol +++ b/contracts/connectors/aave_v2.sol @@ -80,7 +80,7 @@ contract AaveHelpers is DSMath, Stores { } /** - * @dev Return ethereum address + * @dev Return Weth address */ function getWethAddr() internal pure returns (address) { return 0xd0A1E359811322d97991E03f863a0C30C2cF029C; // Kovan WETH Address From b4ee90707d2b97b677dd2e054042948f1e2e9a61 Mon Sep 17 00:00:00 2001 From: Thrilok Kumar Date: Tue, 17 Nov 2020 00:56:30 +0530 Subject: [PATCH 7/9] Code refactored --- contracts/connectors/aave_v2.sol | 101 ++++++++++++++++--------------- 1 file changed, 52 insertions(+), 49 deletions(-) diff --git a/contracts/connectors/aave_v2.sol b/contracts/connectors/aave_v2.sol index e25d6dc..fc1ad35 100644 --- a/contracts/connectors/aave_v2.sol +++ b/contracts/connectors/aave_v2.sol @@ -97,13 +97,13 @@ contract AaveHelpers is DSMath, Stores { (, , , , , , , , isCol) = aaveData.getUserReserveData(token, user); } - function convertEthToWeth(TokenInterface token, uint amount) internal { - if(address(token) == getWethAddr()) token.deposit.value(amount)(); + function convertEthToWeth(bool isEth, TokenInterface token, uint amount) internal { + if(isEth) token.deposit.value(amount)(); } - function convertWethToEth(TokenInterface token, uint amount) internal { - if(address(token) == getWethAddr()) { - token.approve(getWethAddr(), amount); + function convertWethToEth(bool isEth, TokenInterface token, uint amount) internal { + if(isEth) { + token.approve(address(token), amount); token.withdraw(amount); } } @@ -112,29 +112,28 @@ contract AaveHelpers is DSMath, Stores { contract BasicResolver is AaveHelpers { event LogDeposit(address indexed token, uint256 tokenAmt, uint256 getId, uint256 setId); event LogWithdraw(address indexed token, uint256 tokenAmt, uint256 getId, uint256 setId); - event LogBorrow(address indexed token, uint256 tokenAmt, uint256 rateMode, uint256 getId, uint256 setId); - event LogPayback(address indexed token, uint256 tokenAmt, uint256 rateMode, uint256 getId, uint256 setId); + event LogBorrow(address indexed token, uint256 tokenAmt, uint256 indexed rateMode, uint256 getId, uint256 setId); + event LogPayback(address indexed token, uint256 tokenAmt, uint256 indexed rateMode, uint256 getId, uint256 setId); function deposit(address token, uint amt, uint getId, uint setId) external payable { uint _amt = getUint(getId, amt); - uint _amt = amt; + AaveInterface aave = AaveInterface(getAaveProvider().getLendingPool()); AaveDataProviderInterface aaveData = getAaveDataProvider(); - address _token = token == getEthAddr() ? getWethAddr() : token; - TokenInterface tokenContract; + bool isEth = token == getEthAddr(); + address _token = isEth ? getWethAddr() : token; - if (token == getEthAddr()) { + TokenInterface tokenContract = TokenInterface(_token); + + if (isEth) { _amt = _amt == uint(-1) ? address(this).balance : _amt; - tokenContract = TokenInterface(getWethAddr()); - convertEthToWeth(tokenContract, _amt); - _token = getWethAddr(); + convertEthToWeth(isEth, tokenContract, _amt); } else { - tokenContract = TokenInterface(token); _amt = _amt == uint(-1) ? tokenContract.balanceOf(address(this)) : _amt; } - tokenContract.approve(getAaveProvider().getLendingPool(), _amt); + tokenContract.approve(address(aave), _amt); aave.deposit(_token, _amt, address(this), getReferralCode()); @@ -145,77 +144,81 @@ contract BasicResolver is AaveHelpers { setUint(setId, _amt); emit LogDeposit(token, _amt, getId, setId); - bytes32 _eventCode = keccak256("LogDeposit(address,uint256,uint256,uint256)"); - bytes memory _eventParam = abi.encode(token, _amt, getId, setId); - emitEvent(_eventCode, _eventParam); + // bytes32 _eventCode = keccak256("LogDeposit(address,uint256,uint256,uint256)"); + // bytes memory _eventParam = abi.encode(token, _amt, getId, setId); + // emitEvent(_eventCode, _eventParam); } function withdraw(address token, uint amt, uint getId, uint setId) external { uint _amt = getUint(getId, amt); - uint _amt = amt; + AaveInterface aave = AaveInterface(getAaveProvider().getLendingPool()); - address _token = token == getEthAddr() ? getWethAddr() : token; - TokenInterface tokenContract = token == getEthAddr() ? TokenInterface(getWethAddr()) : TokenInterface(token); + bool isEth = token == getEthAddr(); + address _token = isEth ? getWethAddr() : token; - uint initialBal = token == getEthAddr() ? address(this).balance : tokenContract.balanceOf(address(this)); + TokenInterface tokenContract = TokenInterface(_token); + + uint initialBal = tokenContract.balanceOf(address(this)); aave.withdraw(_token, _amt, address(this)); - uint wethBal = token == getEthAddr() ? tokenContract.balanceOf(address(this)) : 0; - convertWethToEth(tokenContract, wethBal); - uint finalBal = token == getEthAddr() ? address(this).balance : tokenContract.balanceOf(address(this)); + uint finalBal = tokenContract.balanceOf(address(this)); + convertWethToEth(isEth, tokenContract, finalBal); + _amt = sub(finalBal, initialBal); setUint(setId, _amt); emit LogWithdraw(token, _amt, getId, setId); - bytes32 _eventCode = keccak256("LogWithdraw(address,uint256,uint256,uint256)"); - bytes memory _eventParam = abi.encode(token, _amt, getId, setId); - emitEvent(_eventCode, _eventParam); + // bytes32 _eventCode = keccak256("LogWithdraw(address,uint256,uint256,uint256)"); + // bytes memory _eventParam = abi.encode(token, _amt, getId, setId); + // emitEvent(_eventCode, _eventParam); } function borrow(address token, uint amt, uint rateMode, uint getId, uint setId) external { uint _amt = getUint(getId, amt); - uint _amt = amt; + AaveInterface aave = AaveInterface(getAaveProvider().getLendingPool()); - address _token = token == getEthAddr() ? getWethAddr() : token; - TokenInterface tokenContract = token == getEthAddr() ? TokenInterface(getWethAddr()) : TokenInterface(token); + + bool isEth = token == getEthAddr(); + address _token = isEth ? getWethAddr() : token; aave.borrow(_token, _amt, rateMode, getReferralCode(), address(this)); - convertWethToEth(tokenContract, _amt); + convertWethToEth(isEth, TokenInterface(_token), _amt); setUint(setId, _amt); + emit LogBorrow(token, _amt, rateMode, getId, setId); - bytes32 _eventCode = keccak256("LogBorrow(address,uint256,uint256,uint256,uint256)"); - bytes memory _eventParam = abi.encode(token, _amt, rateMode, getId, setId); - emitEvent(_eventCode, _eventParam); + // bytes32 _eventCode = keccak256("LogBorrow(address,uint256,uint256,uint256,uint256)"); + // bytes memory _eventParam = abi.encode(token, _amt, rateMode, getId, setId); + // emitEvent(_eventCode, _eventParam); } function payback(address token, uint amt, uint rateMode, uint getId, uint setId) external payable { uint _amt = getUint(getId, amt); - uint _amt = amt; - AaveInterface aave = AaveInterface(getAaveProvider().getLendingPool()); - address _token = token == getEthAddr() ? getWethAddr() : token; - TokenInterface tokenContract; - if (token == getEthAddr()) { + AaveInterface aave = AaveInterface(getAaveProvider().getLendingPool()); + + bool isEth = token == getEthAddr(); + address _token = isEth ? getWethAddr() : token; + + TokenInterface tokenContract = TokenInterface(_token); + + if (isEth) { _amt = _amt == uint(-1) ? address(this).balance : _amt; - tokenContract = TokenInterface(getWethAddr()); - convertEthToWeth(tokenContract, _amt); - _token = getWethAddr(); + convertEthToWeth(isEth, tokenContract, _amt); } else { - tokenContract = TokenInterface(token); _amt = _amt == uint(-1) ? tokenContract.balanceOf(address(this)) : _amt; } - tokenContract.approve(getAaveProvider().getLendingPool(), _amt); + tokenContract.approve(address(aave), _amt); aave.repay(_token, _amt, rateMode, address(this)); setUint(setId, _amt); emit LogPayback(token, _amt, rateMode, getId, setId); - bytes32 _eventCode = keccak256("LogPayback(address,uint256,uint256,uint256,uint256)"); - bytes memory _eventParam = abi.encode(token, _amt, rateMode, getId, setId); - emitEvent(_eventCode, _eventParam); + // bytes32 _eventCode = keccak256("LogPayback(address,uint256,uint256,uint256,uint256)"); + // bytes memory _eventParam = abi.encode(token, _amt, rateMode, getId, setId); + // emitEvent(_eventCode, _eventParam); } } From 5b93c3285658c1a7123f6e16b85bd12cb6892cf7 Mon Sep 17 00:00:00 2001 From: Mubaris NK Date: Tue, 17 Nov 2020 10:50:39 +0530 Subject: [PATCH 8/9] Payback max --- contracts/connectors/aave_v2.sol | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/contracts/connectors/aave_v2.sol b/contracts/connectors/aave_v2.sol index fc1ad35..baf6fbb 100644 --- a/contracts/connectors/aave_v2.sol +++ b/contracts/connectors/aave_v2.sol @@ -107,6 +107,16 @@ contract AaveHelpers is DSMath, Stores { token.withdraw(amount); } } + + function getPaybackBalance(AaveDataProviderInterface aaveData, address token, uint rateMode) internal view returns (uint) { + uint stableDebt; + uint variableDebt; + (, stableDebt, variableDebt, , , , , , ) = aaveData.getUserReserveData(token, address(this)); + if (rateMode == 1) { + return stableDebt; + } + return variableDebt; + } } contract BasicResolver is AaveHelpers { @@ -196,17 +206,20 @@ contract BasicResolver is AaveHelpers { uint _amt = getUint(getId, amt); AaveInterface aave = AaveInterface(getAaveProvider().getLendingPool()); + AaveDataProviderInterface aaveData = getAaveDataProvider(); bool isEth = token == getEthAddr(); address _token = isEth ? getWethAddr() : token; TokenInterface tokenContract = TokenInterface(_token); + uint debtPayback = getPaybackBalance(aaveData, _token, rateMode); + if (isEth) { - _amt = _amt == uint(-1) ? address(this).balance : _amt; + _amt = _amt == uint(-1) ? debtPayback : _amt; convertEthToWeth(isEth, tokenContract, _amt); } else { - _amt = _amt == uint(-1) ? tokenContract.balanceOf(address(this)) : _amt; + _amt = _amt == uint(-1) ? debtPayback : _amt; } tokenContract.approve(address(aave), _amt); From ad141f0e4a8144342546d6595dd079dbe9e1bf86 Mon Sep 17 00:00:00 2001 From: Thrilok Kumar Date: Tue, 17 Nov 2020 21:38:09 +0530 Subject: [PATCH 9/9] Code refactoring --- contracts/connectors/aave_v2.sol | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/contracts/connectors/aave_v2.sol b/contracts/connectors/aave_v2.sol index baf6fbb..c4be801 100644 --- a/contracts/connectors/aave_v2.sol +++ b/contracts/connectors/aave_v2.sol @@ -109,13 +109,8 @@ contract AaveHelpers is DSMath, Stores { } function getPaybackBalance(AaveDataProviderInterface aaveData, address token, uint rateMode) internal view returns (uint) { - uint stableDebt; - uint variableDebt; - (, stableDebt, variableDebt, , , , , , ) = aaveData.getUserReserveData(token, address(this)); - if (rateMode == 1) { - return stableDebt; - } - return variableDebt; + (, uint stableDebt, uint variableDebt, , , , , , ) = aaveData.getUserReserveData(token, address(this)); + return rateMode == 1 ? stableDebt : variableDebt; } } @@ -213,14 +208,9 @@ contract BasicResolver is AaveHelpers { TokenInterface tokenContract = TokenInterface(_token); - uint debtPayback = getPaybackBalance(aaveData, _token, rateMode); + _amt = _amt == uint(-1) ? getPaybackBalance(aaveData, _token, rateMode) : _amt; - if (isEth) { - _amt = _amt == uint(-1) ? debtPayback : _amt; - convertEthToWeth(isEth, tokenContract, _amt); - } else { - _amt = _amt == uint(-1) ? debtPayback : _amt; - } + if (isEth) convertEthToWeth(isEth, tokenContract, _amt); tokenContract.approve(address(aave), _amt);