diff --git a/contracts/mainnet/connectors/aave/v3-import/events.sol b/contracts/mainnet/connectors/aave/v3-import/events.sol index 2036cf81..26850be7 100644 --- a/contracts/mainnet/connectors/aave/v3-import/events.sol +++ b/contracts/mainnet/connectors/aave/v3-import/events.sol @@ -2,7 +2,7 @@ pragma solidity ^0.7.0; pragma experimental ABIEncoderV2; contract Events { - event LogAaveImport( + event LogAaveV3Import( address indexed user, address[] ctokens, string[] supplyIds, diff --git a/contracts/mainnet/connectors/aave/v3-import/helpers.sol b/contracts/mainnet/connectors/aave/v3-import/helpers.sol index 41073f7d..157559cd 100644 --- a/contracts/mainnet/connectors/aave/v3-import/helpers.sol +++ b/contracts/mainnet/connectors/aave/v3-import/helpers.sol @@ -7,7 +7,7 @@ import { AaveInterface, AaveLendingPoolProviderInterface, AaveDataProviderInterf import "./events.sol"; import "./interface.sol"; -abstract contract AaveResolver is DSMath, Basic { +abstract contract Helper is DSMath, Basic { /** * @dev Aave referal code */ @@ -57,7 +57,7 @@ abstract contract AaveResolver is DSMath, Basic { } } -contract AaveHelpers is AaveResolver { +contract AaveHelpers is Helper { function getBorrowAmount(address _token, address userAccount) internal view diff --git a/contracts/mainnet/connectors/aave/v3-import/main.sol b/contracts/mainnet/connectors/aave/v3-import/main.sol index 8c0de43f..bc5a4d38 100644 --- a/contracts/mainnet/connectors/aave/v3-import/main.sol +++ b/contracts/mainnet/connectors/aave/v3-import/main.sol @@ -74,12 +74,13 @@ contract AaveV3ImportResolver is AaveHelpers { ); } - _eventName = "LogAaveV2Import(address,bool,address[],address[],uint256[],uint256[],uint256[])"; + _eventName = "LogAaveV3Import(address,bool,address[],address[],uint256[],uint256[],uint256[],uint256[])"; _eventParam = abi.encode( userAccount, inputData.convertStable, inputData.supplyTokens, inputData.borrowTokens, + inputData.flashLoanFees, data.supplyAmts, data.stableBorrowAmts, data.variableBorrowAmts @@ -104,5 +105,5 @@ contract AaveV3ImportResolver is AaveHelpers { } contract ConnectV2AaveV3Import is AaveV3ImportResolver { - string public constant name = "Aave-v3-Import-v2"; + string public constant name = "Aave-v3-import-v1"; }