From 1ae9d6ec6f1c9ebdd5a1b3d6db210ab35ea06527 Mon Sep 17 00:00:00 2001 From: sendra Date: Thu, 22 Dec 2022 13:01:39 +0100 Subject: [PATCH] Fix/backwards compatibility (#51) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: add core as library * fix: removed custom interface for rate strategy in favor of aave-v3-core * fix: adds v3 ethereum protocol addresses. adds patch to take into acc… (#49) * fix: adds v3 ethereum protocol addresses. adds patch to take into account pools that have no reserves * fix: added extra addresses * fix: added extra addresses for v3 ethereum * fix: correct checksummed addresses * fix: added draft * fix: added castings and struct for backwards compatibility * forge install: aave-v3-core v1.16.2 * fix: updated lib and toml * fix: removed TokenData as its not usable * fix: removed unneeded remapping Co-authored-by: Lukas --- lib/aave-v3-core | 2 +- src/AaveV3.sol | 2 ++ src/test/AaveV3Avalanche.t.sol | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/aave-v3-core b/lib/aave-v3-core index a00dda8f..b34d6a44 160000 --- a/lib/aave-v3-core +++ b/lib/aave-v3-core @@ -1 +1 @@ -Subproject commit a00dda8faf464f6b0d338cf7e902e5931e0edbea +Subproject commit b34d6a445e92bfe54e53565a029bfbed12d85516 diff --git a/src/AaveV3.sol b/src/AaveV3.sol index fec1179d..3d175678 100644 --- a/src/AaveV3.sol +++ b/src/AaveV3.sol @@ -12,6 +12,8 @@ import {IACLManager} from 'aave-v3-core/contracts/interfaces/IACLManager.sol'; import {IPoolDataProvider} from 'aave-v3-core/contracts/interfaces/IPoolDataProvider.sol'; import {IDefaultInterestRateStrategy} from "aave-v3-core/contracts/interfaces/IDefaultInterestRateStrategy.sol"; import {IReserveInterestRateStrategy} from "aave-v3-core/contracts/interfaces/IReserveInterestRateStrategy.sol"; +import {IDefaultInterestRateStrategy as IInterestRateStrategy} from "aave-v3-core/contracts/interfaces/IDefaultInterestRateStrategy.sol"; +import {IPoolDataProvider as IAaveProtocolDataProvider} from 'aave-v3-core/contracts/interfaces/IPoolDataProvider.sol'; /** * @title ICollector diff --git a/src/test/AaveV3Avalanche.t.sol b/src/test/AaveV3Avalanche.t.sol index 78b8bfcd..c96ee1ab 100644 --- a/src/test/AaveV3Avalanche.t.sol +++ b/src/test/AaveV3Avalanche.t.sol @@ -3,6 +3,7 @@ pragma solidity >=0.6.0; import 'forge-std/Test.sol'; import {AaveV3Avalanche} from '../AaveAddressBook.sol'; +import {IInterestRateStrategy, IAaveProtocolDataProvider, IPoolDataProvider, IDefaultInterestRateStrategy} from '../AaveV3.sol'; contract AaveAddressBookTest is Test { function setUp() public {}