fix: Adjust treasury contracts to reflect mainnet deployment

aave · Oct 21, 2022 · e0580a8 · e0580a8
1 parent 16313e2
commit e0580a8
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 102 deletions.
diff --git a/contracts/ecosystem/AaveEcosystemReserveV2.sol b/contracts/ecosystem/AaveEcosystemReserveV2.sol
@@ -1,13 +1,11 @@
 // SPDX-License-Identifier: GPL-3.0
-pragma solidity 0.8.11;
+pragma solidity ^0.8.10;
 
+import {IERC20} from '@aave/core-v3/contracts/dependencies/openzeppelin/contracts/IERC20.sol';
 import {IStreamable} from './interfaces/IStreamable.sol';
-import {IERC20} from './interfaces/IERC20.sol';
-
-import './libs/ReentrancyGuard.sol';
-import './libs/SafeERC20.sol';
-
-import './AdminControlledEcosystemReserve.sol';
+import {AdminControlledEcosystemReserve} from './AdminControlledEcosystemReserve.sol';
+import {ReentrancyGuard} from './libs/ReentrancyGuard.sol';
+import {SafeERC20} from './libs/SafeERC20.sol';
 
 /**
  * @title AaveEcosystemReserve v2

diff --git a/contracts/ecosystem/AdminControlledEcosystemReserve.sol b/contracts/ecosystem/AdminControlledEcosystemReserve.sol
@@ -1,17 +1,12 @@
-/**
- *Submitted for verification at Etherscan.io on 2022-05-02
- */
-
 // SPDX-License-Identifier: GPL-3.0
-pragma solidity 0.8.11;
-
-import './interfaces/IStreamable.sol';
-import './interfaces/IERC20.sol';
-import './interfaces/IAdminControlledEcosystemReserve.sol';
+pragma solidity ^0.8.10;
 
-import './libs/VersionedInitializable.sol';
-import './libs/Address.sol';
-import './libs/SafeERC20.sol';
+import {IERC20} from '@aave/core-v3/contracts/dependencies/openzeppelin/contracts/IERC20.sol';
+import {IAdminControlledEcosystemReserve} from './interfaces/IAdminControlledEcosystemReserve.sol';
+import {VersionedInitializable} from './libs/VersionedInitializable.sol';
+import {SafeERC20} from './libs/SafeERC20.sol';
+import {ReentrancyGuard} from './libs/ReentrancyGuard.sol';
+import {Address} from './libs/Address.sol';
 
 /**
  * @title AdminControlledEcosystemReserve

diff --git a/contracts/ecosystem/interfaces/IAdminControlledEcosystemReserve.sol b/contracts/ecosystem/interfaces/IAdminControlledEcosystemReserve.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0
-pragma solidity 0.8.11;
+pragma solidity ^0.8.10;
 
-import {IERC20} from '../interfaces/IERC20.sol';
+import {IERC20} from '@aave/core-v3/contracts/dependencies/openzeppelin/contracts/IERC20.sol';
 
 interface IAdminControlledEcosystemReserve {
   /** @notice Emitted when the funds admin changes

diff --git a/contracts/ecosystem/interfaces/IERC20.sol b/contracts/ecosystem/interfaces/IERC20.sol
diff --git a/contracts/ecosystem/interfaces/IStreamable.sol b/contracts/ecosystem/interfaces/IStreamable.sol
@@ -1,5 +1,5 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity 0.8.11;
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.10;
 
 interface IStreamable {
   struct Stream {

diff --git a/contracts/ecosystem/libs/SafeERC20.sol b/contracts/ecosystem/libs/SafeERC20.sol
@@ -3,7 +3,7 @@
 
 pragma solidity ^0.8.0;
 
-import {IERC20} from '../interfaces/IERC20.sol';
+import {IERC20} from '@aave/core-v3/contracts/dependencies/openzeppelin/contracts/IERC20.sol';
 import {Address} from './Address.sol';
 
 /**

diff --git a/contracts/ecosystem/libs/VersionedInitializable.sol b/contracts/ecosystem/libs/VersionedInitializable.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity 0.8.11;
+pragma solidity ^0.8.10;
 
 /**
  * @title VersionedInitializable