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

Merge pull request #7 from Instadapp/flashloan-change

Browse Source 
Flashloan change
This commit is contained in:
Samyak Jain 2021-04-15 09:21:48 +10:00 committed by GitHub
commit 3e4b0bb033
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
contracts/liquidity.sol
View File

@ -3,6 +3,7 @@ pragma experimental ABIEncoderV2;
import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
import "@openzeppelin/contracts/token/ERC20/SafeERC20.sol"; import "@openzeppelin/contracts/token/ERC20/SafeERC20.sol";
import "@openzeppelin/contracts/utils/Address.sol";
import { DSMath } from "./common/math.sol"; import { DSMath } from "./common/math.sol";
interface Account { interface Account {
@ -280,14 +281,14 @@ contract DydxFlashloaner is Setup, ICallee, DydxFlashloanBase, DSMath {
require(sender == address(this), "not-same-sender"); require(sender == address(this), "not-same-sender");
require(msg.sender == soloAddr, "not-solo-dydx-sender"); require(msg.sender == soloAddr, "not-solo-dydx-sender");
(AaveDataRaw memory _data, address dsa, uint ethAmt) = abi.decode( (bytes memory callData, uint ethAmt) = abi.decode(
data, data,
(AaveDataRaw, address, uint) (bytes, uint)
); );
wethContract.transfer(address(migrationAddr), ethAmt); wethContract.transfer(address(migrationAddr), ethAmt);
migrationAddr.migrateFlashCallback(_data, dsa, ethAmt); Address.functionCall(address(migrationAddr), callData);
} }
function initiateFlashLoan(bytes memory data, uint ethAmt) external { function initiateFlashLoan(bytes memory data, uint ethAmt) external {

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

@ -184,7 +184,8 @@ contract MigrateResolver is LiquidityResolver {
} }
function migrateWithFlash(AaveDataRaw calldata _data, uint ethAmt) external { function migrateWithFlash(AaveDataRaw calldata _data, uint ethAmt) external {
bytes memory data = abi.encode(_data, msg.sender, ethAmt); bytes memory callbackData = abi.encodeWithSelector(bytes4(this.migrateFlashCallback.selector), _data, msg.sender, ethAmt);
bytes memory data = abi.encode(callbackData, ethAmt);
flashloanContract.initiateFlashLoan(data, ethAmt); flashloanContract.initiateFlashLoan(data, ethAmt);
} }