From 1adaebd6fe409770e3a2d56560e0127df85b3e2e Mon Sep 17 00:00:00 2001
From: Lukas <lukasstrassel@googlemail.com>
Date: Wed, 27 Dec 2023 15:18:27 +0100
Subject: [PATCH] fix: patch usdc & supply cap tests (#208)

---
 src/CommonTestBase.sol         | 13 ++++++++++---
 src/ProtocolV3TestBase.sol     |  2 +-
 tests/ProtocolV3TestBase.t.sol | 28 +++++++++++++++++++++++++++-
 3 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/src/CommonTestBase.sol b/src/CommonTestBase.sol
index d74ce9193..cea93e0b9 100644
--- a/src/CommonTestBase.sol
+++ b/src/CommonTestBase.sol
@@ -10,6 +10,8 @@ import {AaveV3OptimismAssets} from 'aave-address-book/AaveV3Optimism.sol';
 import {AaveV3EthereumAssets} from 'aave-address-book/AaveV3Ethereum.sol';
 import {AaveV3PolygonAssets} from 'aave-address-book/AaveV3Polygon.sol';
 import {AaveV3AvalancheAssets} from 'aave-address-book/AaveV3Avalanche.sol';
+import {AaveV3ArbitrumAssets} from 'aave-address-book/AaveV3Arbitrum.sol';
+import {AaveV3GnosisAssets} from 'aave-address-book/AaveV3Gnosis.sol';
 import {AaveV3BaseAssets} from 'aave-address-book/AaveV3Base.sol';
 import {ChainIds} from './ChainIds.sol';
 import {GovV3Helpers} from './GovV3Helpers.sol';
@@ -103,9 +105,7 @@ contract CommonTestBase is Test {
       }
     }
     if (block.chainid == ChainIds.GNOSIS) {
-      // TODO: import EURs address from address-book once address book is updated
-      // EURs
-      if (asset == 0xcB444e90D8198415266c6a2724b7900fb12FC56E) {
+      if (asset == AaveV3GnosisAssets.EURe_UNDERLYING) {
         vm.startPrank(0xBA12222222228d8Ba445958a75a0704d566BF2C8);
         IERC20(asset).transfer(user, amount);
         return true;
@@ -118,6 +118,13 @@ contract CommonTestBase is Test {
         return true;
       }
     }
+    if (block.chainid == ChainIds.ARBITRUM) {
+      if (asset == AaveV3ArbitrumAssets.USDCn_UNDERLYING) {
+        vm.startPrank(0x47c031236e19d024b42f8AE6780E44A573170703);
+        IERC20(asset).transfer(user, amount);
+        return true;
+      }
+    }
     if (block.chainid == ChainIds.AVALANCHE) {
       if (asset == AaveV3AvalancheAssets.USDC_UNDERLYING) {
         vm.startPrank(0x9f8c163cBA728e99993ABe7495F06c0A3c8Ac8b9);
diff --git a/src/ProtocolV3TestBase.sol b/src/ProtocolV3TestBase.sol
index a12a51cc0..dd0a0bf8e 100644
--- a/src/ProtocolV3TestBase.sol
+++ b/src/ProtocolV3TestBase.sol
@@ -213,7 +213,7 @@ contract ProtocolV3TestBase is CommonTestBase {
     IPoolConfigurator poolConfigurator = IPoolConfigurator(addressesProvider.getPoolConfigurator());
     vm.startPrank(addressesProvider.getACLAdmin());
     if (collateralConfig.supplyCap != 0)
-      poolConfigurator.setSupplyCap(testAssetConfig.underlying, 0);
+      poolConfigurator.setSupplyCap(collateralConfig.underlying, 0);
     if (testAssetConfig.supplyCap != 0)
       poolConfigurator.setSupplyCap(testAssetConfig.underlying, 0);
     if (testAssetConfig.borrowCap != 0)
diff --git a/tests/ProtocolV3TestBase.t.sol b/tests/ProtocolV3TestBase.t.sol
index b5c30dec6..1c1baf2fe 100644
--- a/tests/ProtocolV3TestBase.t.sol
+++ b/tests/ProtocolV3TestBase.t.sol
@@ -6,7 +6,9 @@ import {ProtocolV3LegacyTestBase, ProtocolV3TestBase, ReserveConfig} from '../sr
 import {AaveV3Ethereum} from 'aave-address-book/AaveV3Ethereum.sol';
 import {AaveV3Polygon, AaveV3PolygonAssets} from 'aave-address-book/AaveV3Polygon.sol';
 import {AaveV3Optimism, AaveV3OptimismAssets} from 'aave-address-book/AaveV3Optimism.sol';
+import {AaveV3Arbitrum, AaveV3ArbitrumAssets} from 'aave-address-book/AaveV3Arbitrum.sol';
 import {AaveV3Avalanche, AaveV3AvalancheAssets} from 'aave-address-book/AaveV3Avalanche.sol';
+import {AaveV3Metis} from 'aave-address-book/AaveV3Metis.sol';
 import {PayloadWithEmit} from './mocks/PayloadWithEmit.sol';
 
 contract ProtocolV3TestBaseTest is ProtocolV3TestBase {
@@ -59,7 +61,7 @@ contract ProtocolV3TestE2ETestAsset is ProtocolV3TestBase {
   }
 }
 
-contract ProtocolV3TestE2ETestAll is ProtocolV3TestBase {
+contract ProtocolV3TestE2ETestOptimismAll is ProtocolV3TestBase {
   function setUp() public {
     vm.createSelectFork('optimism', 105213914);
   }
@@ -69,6 +71,16 @@ contract ProtocolV3TestE2ETestAll is ProtocolV3TestBase {
   }
 }
 
+contract ProtocolV3TestE2ETestMetisAll is ProtocolV3TestBase {
+  function setUp() public {
+    vm.createSelectFork('metis', 10115177);
+  }
+
+  function test_e2e() public {
+    e2eTest(AaveV3Metis.POOL);
+  }
+}
+
 contract ProtocolV3TestE2ETestAvalancheAll is ProtocolV3TestBase {
   function setUp() public {
     vm.createSelectFork('avalanche', 38700698);
@@ -83,6 +95,20 @@ contract ProtocolV3TestE2ETestAvalancheAll is ProtocolV3TestBase {
   }
 }
 
+contract ProtocolV3TestE2ETestArbitrumAll is ProtocolV3TestBase {
+  function setUp() public {
+    vm.createSelectFork('arbitrum', 164285417);
+  }
+
+  function test_e2e() public {
+    e2eTest(AaveV3Arbitrum.POOL);
+  }
+
+  function test_deal() public {
+    deal2(AaveV3ArbitrumAssets.USDCn_UNDERLYING, address(this), 1000);
+  }
+}
+
 contract ProtocolV3TestE2ETestAllMainnet is ProtocolV3TestBase {
   function setUp() public {
     vm.createSelectFork('mainnet', 18763779);