feat: finalize v2 addresses (#103)

* feat: finalize v2 addresses * fix: finalize v2 rates
bgd-labs · Jun 8, 2023 · 1371a7c · 1371a7c
1 parent 691f48c
commit 1371a7c
Show file tree

Hide file tree

Showing 16 changed files with 25 additions and 214 deletions.
diff --git a/.assets/0372907d0b2f3da48f7adcaed3b1452230cd5c2b.svg b/.assets/0372907d0b2f3da48f7adcaed3b1452230cd5c2b.svg
diff --git a/.assets/2c7dedb9c0cda4f69d46743b5137df8d3fa9ce57.svg b/.assets/2c7dedb9c0cda4f69d46743b5137df8d3fa9ce57.svg
diff --git a/.assets/ae5f4984ec6d1aad35594fe55bd4718cc49196da.svg b/.assets/ae5f4984ec6d1aad35594fe55bd4718cc49196da.svg
diff --git a/.assets/ecca0fc5726ac8611b08586ad4640ef858267770.svg b/.assets/ecca0fc5726ac8611b08586ad4640ef858267770.svg
diff --git a/lib/aave-address-book b/lib/aave-address-book
diff --git a/lib/forge-std b/lib/forge-std
diff --git a/package.json b/package.json
@@ -26,6 +26,6 @@
     "prettier-plugin-solidity": "^1.1.3"
   },
   "dependencies": {
-    "@bgd-labs/aave-cli": "^0.0.8"
+    "@bgd-labs/aave-cli": "^0.0.9"
   }
 }
diff --git a/reports/postTestV2RatesUpdates.md b/reports/postTestV2RatesUpdates.md
diff --git a/reports/preTestV2RatesUpdates.md b/reports/preTestV2RatesUpdates.md
diff --git a/src/test/mocks/AaveV2EthereumRatesUpdate.sol b/src/test/mocks/AaveV2EthereumRatesUpdate.sol
@@ -12,7 +12,12 @@ import {AaveV2EthereumAssets} from 'aave-address-book/AaveV2Ethereum.sol';
 contract AaveV2EthereumRatesUpdate is AaveV2PayloadBase {
   constructor(IEngine customEngine) AaveV2PayloadBase(customEngine) {}
 
-  function rateStrategiesUpdates() public pure override returns (IEngine.RateStrategyUpdate[] memory) {
+  function rateStrategiesUpdates()
+    public
+    pure
+    override
+    returns (IEngine.RateStrategyUpdate[] memory)
+  {
     IEngine.RateStrategyUpdate[] memory rateStrategy = new IEngine.RateStrategyUpdate[](1);
 
     rateStrategy[0] = IEngine.RateStrategyUpdate({
@@ -29,8 +34,4 @@ contract AaveV2EthereumRatesUpdate is AaveV2PayloadBase {
 
     return rateStrategy;
   }
-
-  function getPoolContext() public pure override returns (IEngine.PoolContext memory) {
-    return IEngine.PoolContext({networkName: 'Ethereum', networkAbbreviation: 'Eth'});
-  }
 }
diff --git a/src/v2-config-engine/AaveV2PayloadAvalanche.sol b/src/v2-config-engine/AaveV2PayloadAvalanche.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import {AaveV2Avalanche, AaveV2AvalancheAssets} from 'aave-address-book/AaveV2Avalanche.sol';
+import {AaveV2Avalanche} from 'aave-address-book/AaveV2Avalanche.sol';
 import './AaveV2PayloadBase.sol';
 
 /**
@@ -10,9 +10,7 @@ import './AaveV2PayloadBase.sol';
  */
 // TODO: Add rates factory address after deploying
 abstract contract AaveV2PayloadAvalanche is
-  AaveV2PayloadBase(IEngine(address(0)))
+  AaveV2PayloadBase(IEngine(AaveV2Avalanche.LISTING_ENGINE))
 {
-  function getPoolContext() public pure override returns (IEngine.PoolContext memory) {
-    return IEngine.PoolContext({networkName: 'Avalanche', networkAbbreviation: 'Ava'});
-  }
+
 }
diff --git a/src/v2-config-engine/AaveV2PayloadBase.sol b/src/v2-config-engine/AaveV2PayloadBase.sol
@@ -59,8 +59,4 @@ abstract contract AaveV2PayloadBase {
     virtual
     returns (IEngine.RateStrategyUpdate[] memory)
   {}
-
-  /// @dev the lack of support for immutable strings kinds of forces for this
-  /// Besides that, it can actually be useful being able to change the naming, but remote
-  function getPoolContext() public view virtual returns (IEngine.PoolContext memory);
 }
diff --git a/src/v2-config-engine/AaveV2PayloadEthereum.sol b/src/v2-config-engine/AaveV2PayloadEthereum.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import {AaveV2Ethereum, AaveV2EthereumAssets} from 'aave-address-book/AaveV2Ethereum.sol';
+import {AaveV2Ethereum} from 'aave-address-book/AaveV2Ethereum.sol';
 import './AaveV2PayloadBase.sol';
 
 /**
@@ -10,9 +10,7 @@ import './AaveV2PayloadBase.sol';
  */
 // TODO: Add rates factory address after deploying
 abstract contract AaveV2PayloadEthereum is
-  AaveV2PayloadBase(IEngine(address(0)))
+  AaveV2PayloadBase(IEngine(AaveV2Ethereum.LISTING_ENGINE))
 {
-  function getPoolContext() public pure override returns (IEngine.PoolContext memory) {
-    return IEngine.PoolContext({networkName: 'Ethereum', networkAbbreviation: 'Eth'});
-  }
+
 }
diff --git a/src/v2-config-engine/AaveV2PayloadEthereumAMM.sol b/src/v2-config-engine/AaveV2PayloadEthereumAMM.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import {AaveV2EthereumAMM, AaveV2EthereumAMMAssets} from 'aave-address-book/AaveV2EthereumAMM.sol';
+import {AaveV2EthereumAMM} from 'aave-address-book/AaveV2EthereumAMM.sol';
 import './AaveV2PayloadBase.sol';
 
 /**
@@ -10,9 +10,7 @@ import './AaveV2PayloadBase.sol';
  */
 // TODO: Add rates factory address after deploying
 abstract contract AaveV2PayloadEthereumAMM is
-  AaveV2PayloadBase(IEngine(address(0)))
+  AaveV2PayloadBase(IEngine(AaveV2EthereumAMM.LISTING_ENGINE))
 {
-  function getPoolContext() public pure override returns (IEngine.PoolContext memory) {
-    return IEngine.PoolContext({networkName: 'Ethereum', networkAbbreviation: 'Eth'});
-  }
+
 }
diff --git a/src/v2-config-engine/AaveV2PayloadPolygon.sol b/src/v2-config-engine/AaveV2PayloadPolygon.sol
@@ -1,18 +1,14 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import {AaveV2Polygon, AaveV2PolygonAssets} from 'aave-address-book/AaveV2Polygon.sol';
+import {AaveV2Polygon} from 'aave-address-book/AaveV2Polygon.sol';
 import './AaveV2PayloadBase.sol';
 
 /**
  * @dev Base smart contract for an Aave v2 rates update on Avalanche.
  * @author BGD Labs
  */
 // TODO: Add rates factory address after deploying
-abstract contract AaveV2PayloadPolygon is
-  AaveV2PayloadBase(IEngine(address(0)))
-{
-  function getPoolContext() public pure override returns (IEngine.PoolContext memory) {
-    return IEngine.PoolContext({networkName: 'Polygon', networkAbbreviation: 'Pol'});
-  }
+abstract contract AaveV2PayloadPolygon is AaveV2PayloadBase(IEngine(AaveV2Polygon.LISTING_ENGINE)) {
+
 }
diff --git a/yarn.lock b/yarn.lock
@@ -38,10 +38,10 @@
   resolved "https://registry.yarnpkg.com/@bgd-labs/aave-address-book/-/aave-address-book-1.24.0.tgz#c6396651f82492d69e5b0c83a6131aeebb3c9d95"
   integrity sha512-9tD2TIntIo6AD+4ima6RyQGAE/8hHwf4j9Gls+tQZhLKhVlebp3Ecotv3KWzMeNqrKF6TNghCaVAEFPW04wIyQ==
 
-"@bgd-labs/aave-cli@^0.0.8":
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/@bgd-labs/aave-cli/-/aave-cli-0.0.8.tgz#f7f34c1fafe0767c694b4eb99fa5b339c3255919"
-  integrity sha512-3HrtBvwRC3hqe++Pb1ddkktQlqFrZAjWJEIQR72PX1TvLeyimbbHOjX/chG06gSsNnov5n6x9FTpbJu9FwCFTQ==
+"@bgd-labs/aave-cli@^0.0.9":
+  version "0.0.9"
+  resolved "https://registry.yarnpkg.com/@bgd-labs/aave-cli/-/aave-cli-0.0.9.tgz#5024f07094e2bd465be46fb270550357815cda1f"
+  integrity sha512-r4toS6nPuxTzy6/RBJ821cHlVM/YqB1ifJvB8s8q/6D/z5LiqZ83U35B0BzsQ5K7wBKy5ijIKhkpcb+VTxpIyQ==
   dependencies:
     "@bgd-labs/aave-address-book" "^1.23.1"
     bs58 "^5.0.0"
+8 −0		scripts/config.ts
+4 −0		src/AaveV2Avalanche.sol
+4 −0		src/AaveV2Ethereum.sol
+4 −0		src/AaveV2EthereumAMM.sol
+4 −0		src/AaveV2Polygon.sol
+2 −2		src/AaveV3Avalanche.sol
+2 −0		src/ts/AaveV2Avalanche.ts
+2 −0		src/ts/AaveV2Ethereum.ts
+2 −0		src/ts/AaveV2EthereumAMM.ts
+2 −0		src/ts/AaveV2Polygon.ts