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

added receiver settle and fixes

Browse Source
This commit is contained in:
Samyak Jain 2021-04-09 05:14:37 +05:30
parent 148895b583
commit e6bcc576e8
4 changed files with 70 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -113,7 +113,41 @@ contract MigrateResolver is Helpers, Events {
// Keep flashAmt tokens as ideal
// Object is the decrease the ratio and pay as less interest
function settle() external {
AaveInterface aave = AaveInterface(aaveProvider.getLendingPool());
for (uint i = 0; i < supportedTokens.length; i++) {
for (uint i = 0; i < supportedTokens.length; i++) {
address _token = supportedTokens[i];
if (_token == maticAddr) {
_token = wmaticAddr;
if (address(this).balance > 0) {
TokenInterface(wmaticAddr).deposit{value: address(this).balance}();
}
}
IERC20 _tokenContract = IERC20(_token);
uint _tokenBal = _tokenContract.balanceOf(address(this));
if (_tokenBal > 0) {
_tokenContract.approve(address(this), _tokenBal);
aave.deposit(_token, _tokenBal, address(this), 3288);
}
(
uint supplyBal,,
uint borrowBal,
,,,,,
) = aaveData.getUserReserveData(_token, address(this));
if (supplyBal != 0 && borrowBal != 0) {
uint _withdrawAmt;
if (supplyBal > borrowBal) {
aave.withdraw(_token, borrowBal, address(this)); // TODO: fail because of not enough withdrawing capacity?
IERC20(_token).approve(address(aave), borrowBal);
aave.repay(_token, borrowBal, 2, address(this));
} else {
aave.withdraw(_token, supplyBal, address(this)); // TODO: fail because of not enough withdrawing capacity?
IERC20(_token).approve(address(aave), supplyBal);
aave.repay(_token, supplyBal, 2, address(this));
}
}
}
}
}
}

8
contracts/receivers/aave-v2-receiver/variables.sol
View File

@ -3,6 +3,7 @@ pragma solidity ^0.7.0;
import {
TokenMappingInterface,
AaveLendingPoolProviderInterface,
AaveDataProviderInterface,
IndexInterface
} from "./interfaces.sol";
@ -21,6 +22,13 @@ contract Variables {
AaveLendingPoolProviderInterface constant internal aaveProvider = AaveLendingPoolProviderInterface(0xd05e3E715d945B59290df0ae8eF85c1BdB684744);
/**
* @dev Aave Data Provider
*/
// TODO: add L2 Data provider address
AaveDataProviderInterface constant internal aaveData = AaveDataProviderInterface(address(0));
// dsa => position
mapping(uint => bytes) public positions;
mapping(address => mapping(address => uint)) public deposits;

53
contracts/senders/aave-v2-migrator/main.sol
View File

@ -128,14 +128,14 @@ contract LiquidityResolver is Helpers, Events {
* @param _tokens - array of tokens to transfer to L2 receiver's contract
* @param _amts - array of token amounts to transfer to L2 receiver's contract
*/
function settle(address[] calldata _tokens, uint[] _amts) external {
function settle(address[] calldata _tokens, uint[] calldata _amts) external {
AaveInterface aave = AaveInterface(aaveProvider.getLendingPool());
for (uint i = 0; i < supportedTokens.length; i++) {
address _token = supportedTokens[i];
if (_token == ethAddr) {
_token = wethAddr;
if (address(this).balance > 0) {
TokenInterface(wethAddr).deposit(address(this).balance);
TokenInterface(wethAddr).deposit{value: address(this).balance}();
}
}
IERC20 _tokenContract = IERC20(_token);
@ -189,18 +189,18 @@ contract MigrateResolver is LiquidityResolver {
(,,,,,uint healthFactor) = aave.getUserAccountData(sourceDsa);
require(healthFactor > 1e18, "position-not-safe");
(uint[] stableBorrows, uint[] variableBorrows, uint[] totalBorrows) = _PaybackCalculate(aave, _data, sourceDsa);
(uint[] memory stableBorrows, uint[] memory variableBorrows, uint[] memory totalBorrows) = _PaybackCalculate(aave, _data, sourceDsa);
_PaybackStable(_data.borrowTokens.length, aave, _data.borrowTokens, stableBorrows, sourceDsa);
_PaybackVariable(_data.borrowTokens.length, aave, _data.borrowTokens, variableBorrows, sourceDsa);
(uint[] totalSupplies) = _getAtokens(sourceDsa, aave, _data.supplyTokens, _data.supplyAmts, fee);
(uint[] memory totalSupplies) = _getAtokens(sourceDsa, aave, _data.supplyTokens, _data.supplyAmts);
// Aave on Polygon doesn't have stable borrowing so we'll borrow all the debt in variable
AaveData memory data;
data.borrowTokens = _data.borrowTokens;
data.stableBorrowAmts = _data.stableBorrowAmts;
data.borrowAmts = _data.stableBorrowAmts;
data.supplyAmts = totalSupplies;
data.supplyTokens = _data.supplyTokens;
data.targetDsa = _data.targetDsa;
@ -212,17 +212,16 @@ contract MigrateResolver is LiquidityResolver {
isPositionSafe();
bytes memory positionData = data; // TODO: @everyone Can we do anything else to make the data more secure? (It's secure already)
stateSender.syncState(polygonReceiver, positionData);
stateSender.syncState(polygonReceiver, abi.encode(data));
emit LogAaveV2Migrate(
sourceDsa,
data.targetDsa,
data.supplyTokens,
data.borrowTokens,
data.supplyAmts,
data.variableBorrowAmts,
data.stableBorrowAmts
totalSupplies,
variableBorrows,
stableBorrows
);
}
@ -231,7 +230,7 @@ contract MigrateResolver is LiquidityResolver {
}
function migrateWithFlash(AaveDataRaw calldata _data, uint ethAmt) external {
bytes data = abi.encode(_data, msg.sender, ethAmt);
bytes memory data = abi.encode(_data, msg.sender, ethAmt);
// TODO: @everyone integrate dydx flashloan and borrow "ethAmt" and transfer ETH to this address
// Should we create a new contract for flashloan or interact directly from this contract? Mainly to resolve 2 WEI bug of dydx flashloan
@ -239,21 +238,21 @@ contract MigrateResolver is LiquidityResolver {
}
// TODO: @everyone
function callFunction(
address sender,
Account.Info memory account,
bytes memory data
) public override {
require(sender == address(this), "wrong-sender");
// require(msg.sender == dydxFlash, "wrong-sender"); // TODO: msg.sender should be flashloan contract
(address l2DSA, AaveDataRaw memory _data, address sourceDsa, uint ethAmt) = abi.decode(
data,
(address, AaveDataRaw, address, uint)
);
// TODO: deposit WETH "ethAmt" in Aave
_migrate(l2DSA, _data, sourceDsa);
// TODO: withdraw WETH "ethAmt" from Aave
// TODO: approve WETH "ethAmt + 2" to dydx
}
// function callFunction(
// address sender,
// Account.Info memory account,
// bytes memory data
// ) public override {
// require(sender == address(this), "wrong-sender");
// // require(msg.sender == dydxFlash, "wrong-sender"); // TODO: msg.sender should be flashloan contract
// (address l2DSA, AaveDataRaw memory _data, address sourceDsa, uint ethAmt) = abi.decode(
// data,
// (address, AaveDataRaw, address, uint)
// );
// // TODO: deposit WETH "ethAmt" in Aave
// _migrate(l2DSA, _data, sourceDsa);
// // TODO: withdraw WETH "ethAmt" from Aave
// // TODO: approve WETH "ethAmt + 2" to dydx
// }
}

2
contracts/senders/aave-v2-migrator/variables.sol
View File

@ -31,7 +31,7 @@ contract Variables {
*/
uint16 constant internal referralCode = 3228;
address constant internal polygonReceiver = address(0); // Replace this
address constant internal polygonReceiver = address(0); // TODO: Replace this
// This will be used to have debt/collateral ratio always 20% less than liquidation
// TODO: Is this number correct for it?