From 34f4f1028886c57334d01f116d0afe04d5721001 Mon Sep 17 00:00:00 2001 From: Mubaris NK Date: Fri, 16 Apr 2021 22:27:18 +0530 Subject: [PATCH 1/2] cleanup --- contracts/receivers/aave-v2-receiver/events.sol | 12 ------------ contracts/receivers/aave-v2-receiver/helpers.sol | 13 ++++++------- contracts/senders/aave-v2-migrator/events.sol | 12 ------------ contracts/senders/aave-v2-migrator/helpers.sol | 3 +-- contracts/senders/aave-v2-migrator/variables.sol | 6 ++---- 5 files changed, 9 insertions(+), 37 deletions(-) diff --git a/contracts/receivers/aave-v2-receiver/events.sol b/contracts/receivers/aave-v2-receiver/events.sol index 6f71257..a0efe72 100644 --- a/contracts/receivers/aave-v2-receiver/events.sol +++ b/contracts/receivers/aave-v2-receiver/events.sol @@ -2,18 +2,6 @@ pragma solidity >=0.7.0; pragma experimental ABIEncoderV2; contract Events { - event LogDeposit( - address owner, - address[] tokens, - uint[] amts - ); - - event LogWithdraw( - address owner, - address[] tokens, - uint[] amts - ); - event LogUpdateSafeRatioGap( uint256 oldSafeRatioGap, uint256 newSafeRatioGap diff --git a/contracts/receivers/aave-v2-receiver/helpers.sol b/contracts/receivers/aave-v2-receiver/helpers.sol index b90d939..4b64602 100644 --- a/contracts/receivers/aave-v2-receiver/helpers.sol +++ b/contracts/receivers/aave-v2-receiver/helpers.sol @@ -68,9 +68,9 @@ abstract contract Helpers is Stores, DSMath, Variables { if (data.atokenBal < data.supplyAmt) { uint _reqAmt = data.supplyAmt - data.atokenBal; - uint num = _reqAmt/data.tokenLiq + 1; // TODO: Is this right - uint splitAmt = _reqAmt/num; // TODO: Check decimal - uint finalSplit = _reqAmt - (splitAmt * (num - 1)); // TODO: to resolve upper decimal error + uint num = _reqAmt/data.tokenLiq + 1; + uint splitAmt = _reqAmt/num; + uint finalSplit = _reqAmt - (splitAmt * (num - 1)); _tokenContract.approve(address(aave), _reqAmt); for (uint j = 0; j < num; j++) { @@ -97,10 +97,9 @@ abstract contract Helpers is Stores, DSMath, Variables { (data.tokenLiq,,,,,,,,,) = aaveData.getReserveData(data.token); data.borrowAmt = borrowAmts[i]; - // TODO: Check number of loops needed. Borrow and supply on user's account. - uint num = data.borrowAmt/data.tokenLiq + 1; // TODO: Is this right - uint splitAmt = data.borrowAmt/num; // TODO: Check decimal - uint finalSplit = data.borrowAmt - (splitAmt * (num - 1)); // TODO: to resolve upper decimal error + uint num = data.borrowAmt/data.tokenLiq + 1; + uint splitAmt = data.borrowAmt/num; + uint finalSplit = data.borrowAmt - (splitAmt * (num - 1)); uint spellsAmt = num <= 1 ? (2 * (num + 1)) : (2 * (num + 1)) + 1; string[] memory targets = new string[](spellsAmt); diff --git a/contracts/senders/aave-v2-migrator/events.sol b/contracts/senders/aave-v2-migrator/events.sol index 0496a36..0f06513 100644 --- a/contracts/senders/aave-v2-migrator/events.sol +++ b/contracts/senders/aave-v2-migrator/events.sol @@ -2,18 +2,6 @@ pragma solidity >=0.7.0; pragma experimental ABIEncoderV2; contract Events { - event LogDeposit( - address owner, - address[] tokens, - uint256[] amts - ); - - event LogWithdraw( - address owner, - address[] tokens, - uint256[] amts - ); - event LogSettle( address[] tokens, uint256[] amts diff --git a/contracts/senders/aave-v2-migrator/helpers.sol b/contracts/senders/aave-v2-migrator/helpers.sol index 9090f3f..42671bc 100644 --- a/contracts/senders/aave-v2-migrator/helpers.sol +++ b/contracts/senders/aave-v2-migrator/helpers.sol @@ -144,10 +144,9 @@ abstract contract Helpers is DSMath, Stores, Variables { } function convertTo18(uint amount, uint decimal) internal pure returns (uint) { - return amount * (10 ** (18 - decimal)); // TODO: verify this + return amount * (10 ** (18 - decimal)); } - // TODO: need to verify this throughly /* * Checks the position to migrate should have a safe gap from liquidation */ diff --git a/contracts/senders/aave-v2-migrator/variables.sol b/contracts/senders/aave-v2-migrator/variables.sol index 70ce5ee..f91b242 100644 --- a/contracts/senders/aave-v2-migrator/variables.sol +++ b/contracts/senders/aave-v2-migrator/variables.sol @@ -88,14 +88,12 @@ contract Variables { /** * @dev This will be used to have debt/collateral ratio always 20% less than liquidation */ - // TODO @KaymasJain: Is this number correct for it? - uint public safeRatioGap = 800000000000000000; // 20%? + uint public safeRatioGap = 800000000000000000; // 20% /** * @dev fee on collateral */ - // TODO @KaymasJain: Is this number correct for it? - uint public fee = 998000000000000000; // 0.2% (99.8%) on collateral? TODO: Is this right? + uint public fee = 998000000000000000; // 0.2% (99.8%) on collateral /** * @dev Mapping of supported token From 9ccf4acb3a8a6692b840adfca3134563dc34cd93 Mon Sep 17 00:00:00 2001 From: Mubaris NK Date: Fri, 16 Apr 2021 22:28:12 +0530 Subject: [PATCH 2/2] minor change --- contracts/senders/aave-v2-migrator/variables.sol | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contracts/senders/aave-v2-migrator/variables.sol b/contracts/senders/aave-v2-migrator/variables.sol index f91b242..b2e5110 100644 --- a/contracts/senders/aave-v2-migrator/variables.sol +++ b/contracts/senders/aave-v2-migrator/variables.sol @@ -88,7 +88,7 @@ contract Variables { /** * @dev This will be used to have debt/collateral ratio always 20% less than liquidation */ - uint public safeRatioGap = 800000000000000000; // 20% + uint public safeRatioGap = 800000000000000000; // 80% /** * @dev fee on collateral