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

Update deposit and withdraw in migrator and receiver

Browse Source
This commit is contained in:
Mubaris NK 2021-04-04 09:44:05 +05:30
parent c46d2b4d86
commit 00ab0f7bff
No known key found for this signature in database
GPG Key ID: 9AC09AD0F8D68561
2 changed files with 65 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,9 +4,10 @@ pragma experimental ABIEncoderV2;
import { SafeERC20 } from "@openzeppelin/contracts/token/ERC20/SafeERC20.sol"; import { SafeERC20 } from "@openzeppelin/contracts/token/ERC20/SafeERC20.sol";
import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol"; import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
import { DSMath } from "../../common/math.sol";
import { AccountInterface } from "./interfaces.sol"; import { AccountInterface } from "./interfaces.sol";
contract MigrateResolver { contract MigrateResolver is DSMath {
using SafeERC20 for IERC20; using SafeERC20 for IERC20;
struct AaveData { struct AaveData {
@ -21,6 +22,7 @@ contract MigrateResolver {
uint private lastStateId; uint private lastStateId;
mapping (address => AaveData) public positions; mapping (address => AaveData) public positions;
mapping(address => mapping(address => uint)) deposits;
function _migratePosition(address owner) internal { function _migratePosition(address owner) internal {
AaveData storage data = positions[owner]; AaveData storage data = positions[owner];
@ -33,6 +35,40 @@ contract MigrateResolver {
data.isFinal = true; data.isFinal = true;
} }
function deposit(address[] calldata tokens, uint[] calldata amts) external {
uint _length = tokens.length;
require(_length == amts.length, "invalid-length");
for (uint256 i = 0; i < _length; i++) {
address _token = tokens[i];
IERC20 tokenContract = IERC20(_token);
uint _amt = amts[i] == uint(-1) ? tokenContract.balanceOf(msg.sender) : amts[i];
tokenContract.safeTransferFrom(msg.sender, address(this), _amt);
deposits[msg.sender][_token] = _amt;
}
}
function withdraw(address[] calldata tokens, uint[] calldata amts) external {
uint _length = tokens.length;
require(_length == amts.length, "invalid-length");
for (uint256 i = 0; i < _length; i++) {
uint _amt = amts[i];
address _token = tokens[i];
uint maxAmt = deposits[msg.sender][_token];
if (_amt > maxAmt) {
_amt = maxAmt;
}
IERC20(_token).safeTransfer(msg.sender, _amt);
deposits[msg.sender][_token] = sub(maxAmt, _amt);
}
}
function onStateReceive(uint256 stateId, bytes calldata receivedData) external { function onStateReceive(uint256 stateId, bytes calldata receivedData) external {
// require(stateId > lastStateId, "wrong-data"); // require(stateId > lastStateId, "wrong-data");
lastStateId = stateId; lastStateId = stateId;

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

@ -4,6 +4,7 @@ pragma experimental ABIEncoderV2;
import { SafeERC20 } from "@openzeppelin/contracts/token/ERC20/SafeERC20.sol"; import { SafeERC20 } from "@openzeppelin/contracts/token/ERC20/SafeERC20.sol";
import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol"; import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
import { TokenInterface } from "../../common/interfaces.sol";
import { Helpers } from "./helpers.sol"; import { Helpers } from "./helpers.sol";
import { AaveInterface, ATokenInterface } from "./interfaces.sol"; import { AaveInterface, ATokenInterface } from "./interfaces.sol";
@ -22,13 +23,39 @@ contract LiquidityResolver is Helpers {
if (_token == ethAddr) { if (_token == ethAddr) {
require(msg.value == amts[i]); require(msg.value == amts[i]);
_amt = msg.value; _amt = msg.value;
TokenInterface(wethAddr).deposit{value: msg.value}();
} else { } else {
IERC20 tokenContract = IERC20(_token); IERC20 tokenContract = IERC20(_token);
_amt = amts[i] == uint(-1) ? tokenContract.balanceOf(msg.sender) : amts[i]; _amt = amts[i] == uint(-1) ? tokenContract.balanceOf(msg.sender) : amts[i];
tokenContract.safeTransferFrom(msg.sender, address(this), _amt); tokenContract.safeTransferFrom(msg.sender, address(this), _amt);
} }
deposits[_token][msg.sender] = _amt; deposits[msg.sender][_token] = _amt;
}
}
function withdraw(address[] calldata tokens, uint[] calldata amts) external {
uint _length = tokens.length;
require(_length == amts.length, "invalid-length");
for (uint256 i = 0; i < _length; i++) {
uint _amt = amts[i];
address _token = tokens[i];
uint maxAmt = deposits[msg.sender][_token];
if (_amt > maxAmt) {
_amt = maxAmt;
}
if (_token == ethAddr) {
TokenInterface(wethAddr).withdraw(_amt);
msg.sender.call{value: _amt}("");
} else {
IERC20(_token).safeTransfer(msg.sender, _amt);
}
deposits[msg.sender][_token] = sub(maxAmt, _amt);
} }
} }
} }