Instadapp/dsa-polygon-migration
1
0
Fork 0
mirror of https://github.com/Instadapp/dsa-polygon-migration.git synced 2024-07-29 22:27:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed allowance and spell encoding issue

Browse Source
This commit is contained in:
Thrilok Kumar 2021-04-16 04:08:01 +05:30
parent 1cc999a995
commit 8829dd0168
2 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
contracts/receivers/aave-v2-receiver/helpers.sol
View File

@ -49,7 +49,12 @@ abstract contract Helpers is Stores, DSMath, Variables {
return data; return data;
} }
function isPositionSafe() internal returns (bool isOk) { function getCollateralStatus(address token, address user) internal view returns (bool enabled) {
(uint bal, , , , , , , , bool isCol) = aaveData.getUserReserveData(token, user);
enabled = bal > 0 && !isCol;
}
function isPositionSafe() internal view returns (bool isOk) {
AaveInterface aave = AaveInterface(aaveProvider.getLendingPool()); AaveInterface aave = AaveInterface(aaveProvider.getLendingPool());
(,,,,,uint healthFactor) = aave.getUserAccountData(address(this)); (,,,,,uint healthFactor) = aave.getUserAccountData(address(this));
uint minLimit = wdiv(1e18, safeRatioGap); uint minLimit = wdiv(1e18, safeRatioGap);
@ -90,6 +95,7 @@ abstract contract Helpers is Stores, DSMath, Variables {
if (j < num - 1) { if (j < num - 1) {
aave.borrow(data.token, splitAmt, 2, 3288, address(this)); aave.borrow(data.token, splitAmt, 2, 3288, address(this));
aave.deposit(data.token, splitAmt, address(this), 3288); aave.deposit(data.token, splitAmt, address(this), 3288);
if (j == 0) aave.setUserUseReserveAsCollateral(data.token, true);
} else { } else {
aave.borrow(data.token, finalSplit, 2, 3288, address(this)); aave.borrow(data.token, finalSplit, 2, 3288, address(this));
aave.deposit(data.token, finalSplit, address(this), 3288); aave.deposit(data.token, finalSplit, address(this), 3288);
@ -105,7 +111,7 @@ abstract contract Helpers is Stores, DSMath, Variables {
} }
} }
function borrowAndTransferSpells(AaveInterface aave, address dsa, address[] memory borrowTokens, uint[] memory borrowAmts) internal { function borrowAndTransferSpells(AaveInterface aave, address dsa, address[] memory supplyTokens, address[] memory borrowTokens, uint[] memory borrowAmts) internal {
for (uint i = 0; i < borrowTokens.length; i++) { for (uint i = 0; i < borrowTokens.length; i++) {
SpellHelperData memory data; SpellHelperData memory data;
data.token = borrowTokens[i] == maticAddr ? wmaticAddr : borrowTokens[i]; data.token = borrowTokens[i] == maticAddr ? wmaticAddr : borrowTokens[i];
@ -124,16 +130,24 @@ abstract contract Helpers is Stores, DSMath, Variables {
uint splitAmt = data.borrowAmt/num; // TODO: Check decimal uint splitAmt = data.borrowAmt/num; // TODO: Check decimal
uint finalSplit = data.borrowAmt - (splitAmt * (num - 1)); // TODO: to resolve upper decimal error uint finalSplit = data.borrowAmt - (splitAmt * (num - 1)); // TODO: to resolve upper decimal error
uint spellsAmt = (2 * num) + 1; // uint spellsAmt = num <= 1 ? (2 * num) + 1 : (2 * num) + 2;
uint spellsAmt = (2 * num) + 2;
string[] memory targets = new string[](spellsAmt); string[] memory targets = new string[](spellsAmt);
bytes[] memory castData = new bytes[](spellsAmt); bytes[] memory castData = new bytes[](spellsAmt);
targets[0] = "AAVE-V2-A";
castData[0] = abi.encodeWithSignature("enableCollateral(address[])", supplyTokens);
for (uint j = 0; j < num; j++) { for (uint j = 0; j < num; j++) {
uint k = j * 2; uint k = j * 2 + 1;
// uint skip = 0;
if (i < num - 1) { if (i < num - 1) {
targets[k] = "AAVE-V2-A"; targets[k] = "AAVE-V2-A";
castData[k] = abi.encodeWithSignature("borrow(address,uint256,uint256,uint256,uint256)", data.token, splitAmt, 2, 0, 0); castData[k] = abi.encodeWithSignature("borrow(address,uint256,uint256,uint256,uint256)", data.token, splitAmt, 2, 0, 0);
targets[k+1] = "AAVE-V2-A"; targets[k+1] = "AAVE-V2-A";
castData[k+1] = abi.encodeWithSignature("deposit(address,uint256,uint256,uint256)", data.token, splitAmt, 0, 0); castData[k+1] = abi.encodeWithSignature("deposit(address,uint256,uint256,uint256)", data.token, splitAmt, 0, 0);
// targets[k+1] = "AAVE-V2-A"; // TODO : enableCollateral
// castData[k+1] = abi.encodeWithSignature("enableCollateral(address[])", data.token, splitAmt, 0, 0);
} else { } else {
targets[k] = "AAVE-V2-A"; targets[k] = "AAVE-V2-A";
castData[k] = abi.encodeWithSignature("borrow(address,uint256,uint256,uint256,uint256)", data.token, finalSplit, 2, 0, 0); castData[k] = abi.encodeWithSignature("borrow(address,uint256,uint256,uint256,uint256)", data.token, finalSplit, 2, 0, 0);
@ -146,8 +160,8 @@ abstract contract Helpers is Stores, DSMath, Variables {
aave.withdraw(data.token, data.flashAmt, address(this)); aave.withdraw(data.token, data.flashAmt, address(this));
} }
targets[spellsAmt] = "BASIC-A"; // TODO: right spell? targets[spellsAmt - 1] = "BASIC-A"; // TODO: right spell?
castData[spellsAmt] = abi.encode("withdraw(address,uint256,address,uint256,uint256)", data.atoken, data.borrowAmt, address(this), 0, 0); // encode the data of atoken withdrawal castData[spellsAmt - 1] = abi.encodeWithSignature("withdraw(address,uint256,address,uint256,uint256)", data.atoken, data.borrowAmt, address(this), 0, 0); // encode the data of atoken withdrawal
AccountInterface(dsa).castMigrate(targets, castData, address(this)); AccountInterface(dsa).castMigrate(targets, castData, address(this));
} }

4
contracts/receivers/aave-v2-receiver/main.sol
View File

@ -56,7 +56,7 @@ contract MigrateResolver is Helpers, Events {
IERC20 _tokenContract = IERC20(_token); IERC20 _tokenContract = IERC20(_token);
uint _tokenBal = _tokenContract.balanceOf(address(this)); uint _tokenBal = _tokenContract.balanceOf(address(this));
if (_tokenBal > 0) { if (_tokenBal > 0) {
_tokenContract.approve(address(this), _tokenBal); _tokenContract.approve(address(aave), _tokenBal);
aave.deposit(_token, _tokenBal, address(this), 3288); aave.deposit(_token, _tokenBal, address(this), 3288);
} }
( (
@ -129,4 +129,6 @@ contract AaveV2Migrator is MigrateResolver {
delete positions[_id]; delete positions[_id];
} }
receive() external payable {}
} }