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

Fixed polygon Aave v2-to-v3 connector

Browse Source
This commit is contained in:
Thrilok Kumar 2022-03-16 16:30:38 +04:00
parent 910973da69
commit cc06a33d17
2 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
contracts/polygon/connectors/aave/v2-to-v3-import/helpers.sol
View File

@ -44,7 +44,9 @@ abstract contract Helper is DSMath, Basic {
struct ImportData { struct ImportData {
address[] _supplyTokens; address[] _supplyTokens;
address[] _supplyTokensV3;
address[] _borrowTokens; address[] _borrowTokens;
address[] _borrowTokensV3;
ATokenV2Interface[] aTokens; ATokenV2Interface[] aTokens;
uint256[] supplyAmts; uint256[] supplyAmts;
uint256[] variableBorrowAmts; uint256[] variableBorrowAmts;
@ -58,7 +60,9 @@ abstract contract Helper is DSMath, Basic {
struct ImportInputData { struct ImportInputData {
address[] supplyTokens; address[] supplyTokens;
address[] supplyTokensV3;
address[] borrowTokens; address[] borrowTokens;
address[] borrowTokensV3;
bool convertStable; bool convertStable;
uint256[] flashLoanFees; uint256[] flashLoanFees;
} }
@ -92,6 +96,7 @@ contract _AaveHelper is Helper {
) internal returns (ImportData memory) { ) internal returns (ImportData memory) {
if (inputData.borrowTokens.length > 0) { if (inputData.borrowTokens.length > 0) {
data._borrowTokens = new address[](inputData.borrowTokens.length); data._borrowTokens = new address[](inputData.borrowTokens.length);
data._borrowTokensV3 = new address[](inputData.borrowTokensV3.length);
data.variableBorrowAmts = new uint256[]( data.variableBorrowAmts = new uint256[](
inputData.borrowTokens.length inputData.borrowTokens.length
); );
@ -114,7 +119,11 @@ contract _AaveHelper is Helper {
address _token = inputData.borrowTokens[i] == maticAddr address _token = inputData.borrowTokens[i] == maticAddr
? wmaticAddr ? wmaticAddr
: inputData.borrowTokens[i]; : inputData.borrowTokens[i];
address _tokenV3 = inputData.borrowTokensV3[i] == maticAddr
? wmaticAddr
: inputData.borrowTokensV3[i];
data._borrowTokens[i] = _token; data._borrowTokens[i] = _token;
data._borrowTokensV3[i] = _tokenV3;
( (
data.stableBorrowAmts[i], data.stableBorrowAmts[i],
@ -159,6 +168,7 @@ contract _AaveHelper is Helper {
) internal view returns (ImportData memory) { ) internal view returns (ImportData memory) {
data.supplyAmts = new uint256[](inputData.supplyTokens.length); data.supplyAmts = new uint256[](inputData.supplyTokens.length);
data._supplyTokens = new address[](inputData.supplyTokens.length); data._supplyTokens = new address[](inputData.supplyTokens.length);
data._supplyTokensV3 = new address[](inputData.supplyTokensV3.length);
data.aTokens = new ATokenV2Interface[](inputData.supplyTokens.length); data.aTokens = new ATokenV2Interface[](inputData.supplyTokens.length);
for (uint256 i = 0; i < inputData.supplyTokens.length; i++) { for (uint256 i = 0; i < inputData.supplyTokens.length; i++) {
@ -175,10 +185,15 @@ contract _AaveHelper is Helper {
address _token = inputData.supplyTokens[i] == maticAddr address _token = inputData.supplyTokens[i] == maticAddr
? wmaticAddr ? wmaticAddr
: inputData.supplyTokens[i]; : inputData.supplyTokens[i];
address _tokenV3 = inputData.supplyTokensV3[i] == maticAddr
? wmaticAddr
: inputData.supplyTokensV3[i];
(address _aToken, , ) = aaveV2Data.getReserveTokensAddresses( (address _aToken, , ) = aaveV2Data.getReserveTokensAddresses(
_token _token
); );
data._supplyTokens[i] = _token; data._supplyTokens[i] = _token;
data._supplyTokensV3[i] = _tokenV3;
data.aTokens[i] = ATokenV2Interface(_aToken); data.aTokens[i] = ATokenV2Interface(_aToken);
data.supplyAmts[i] = data.aTokens[i].balanceOf(userAccount); data.supplyAmts[i] = data.aTokens[i].balanceOf(userAccount);
} }

19
contracts/polygon/connectors/aave/v2-to-v3-import/main.sol
View File

@ -24,6 +24,9 @@ contract _AaveV2ToV3MigrationResolver is _AaveHelper {
ImportInputData memory inputData, ImportInputData memory inputData,
bool doImport bool doImport
) internal returns (string memory _eventName, bytes memory _eventParam) { ) internal returns (string memory _eventName, bytes memory _eventParam) {
require(inputData.borrowTokens.length == inputData.borrowTokensV3.length, "borrow-tokens-len-not-same");
require(inputData.supplyTokens.length == inputData.supplyTokensV3.length, "supply-tokens-len-not-same");
if (doImport) { if (doImport) {
// check only when we are importing from user's address // check only when we are importing from user's address
require( require(
@ -81,31 +84,31 @@ contract _AaveV2ToV3MigrationResolver is _AaveHelper {
); );
// deposit tokens in v3 // deposit tokens in v3
_depositTokensV3( _depositTokensV3(
data._supplyTokens.length, data._supplyTokensV3.length,
aaveV3, aaveV3,
data.supplyAmts, data.supplyAmts,
data._supplyTokens data._supplyTokensV3
); );
// borrow assets in aave v3 after migrating position // borrow assets in aave v3 after migrating position
if (data.convertStable) { if (data.convertStable) {
_BorrowVariableV3( _BorrowVariableV3(
data._borrowTokens.length, data._borrowTokensV3.length,
aaveV3, aaveV3,
data._borrowTokens, data._borrowTokensV3,
data.totalBorrowAmtsWithFee data.totalBorrowAmtsWithFee
); );
} else { } else {
_BorrowStableV3( _BorrowStableV3(
data._borrowTokens.length, data._borrowTokensV3.length,
aaveV3, aaveV3,
data._borrowTokens, data._borrowTokensV3,
data.stableBorrowAmtsWithFee data.stableBorrowAmtsWithFee
); );
_BorrowVariableV3( _BorrowVariableV3(
data._borrowTokens.length, data._borrowTokensV3.length,
aaveV3, aaveV3,
data._borrowTokens, data._borrowTokensV3,
data.variableBorrowAmtsWithFee data.variableBorrowAmtsWithFee
); );
} }