From f0e26a68bb08c8b3b4a4ecf990055cc67e60c9c2 Mon Sep 17 00:00:00 2001
From: Lukas <lukasstrassel@googlemail.com>
Date: Wed, 24 Jul 2024 23:30:49 +0900
Subject: [PATCH] fix: update tooling to support virtual balance and new ir
 (#34)

---
 .gitignore                                    |   2 +
 bun.lockb                                     | Bin 90020 -> 91091 bytes
 package.json                                  |   4 +-
 tests/mocks/AaveV3TestListing.sol             |   2 +-
 .../AaveV3ConfigEngineTest.t.sol              |  10 +-
 tests/utils/DiffUtils.sol                     |   2 +-
 tests/utils/ProtocolV3TestBase.sol            |  92 +++++++++++-------
 7 files changed, 71 insertions(+), 41 deletions(-)

diff --git a/.gitignore b/.gitignore
index c199a61c..92845bde 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,8 @@ out/
 .env
 .env.bk
 .assets
+
+# artifacts
 reports/
 diffs/
 downloads/
diff --git a/bun.lockb b/bun.lockb
index 512e8aff5322b3c89dec763ded71ada5f5d0ecf5..471ed8580a4fd2c7f70ff7b2a474769a9baa45ce 100755
GIT binary patch
delta 17025
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
DHP8@u

delta 16340
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

diff --git a/package.json b/package.json
index 1ce81992..c151c49a 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,7 @@
     "prettier-plugin-solidity": "^1.1.1"
   },
   "dependencies": {
-    "@bgd-labs/aave-cli": "^0.7.2",
-    "catapulta-verify": "^1.0.6-b4e4af767ca0ef6644d50aeca57aae1a560fe40d.0"
+    "@bgd-labs/aave-cli": "^0.16.2",
+    "catapulta-verify": "^1.1.1"
   }
 }
diff --git a/tests/mocks/AaveV3TestListing.sol b/tests/mocks/AaveV3TestListing.sol
index 2e783855..30751b34 100644
--- a/tests/mocks/AaveV3TestListing.sol
+++ b/tests/mocks/AaveV3TestListing.sol
@@ -5,7 +5,7 @@ import 'aave-v3-periphery/contracts/v3-config-engine/AaveV3Payload.sol';
 import {TestnetERC20} from 'aave-v3-periphery/contracts/mocks/testnet-helpers/TestnetERC20.sol';
 import {MockAggregator} from 'aave-v3-core/contracts/mocks/oracle/CLAggregators/MockAggregator.sol';
 import {ACLManager} from 'aave-v3-core/contracts/protocol/configuration/ACLManager.sol';
-import {MarketReport} from 'src/deployments/interfaces/IMarketReportTypes.sol';
+import {MarketReport} from '../../src/deployments/interfaces/IMarketReportTypes.sol';
 
 /**
  * @dev Smart contract for token listing, for testing purposes
diff --git a/tests/periphery/v3-config-engine/AaveV3ConfigEngineTest.t.sol b/tests/periphery/v3-config-engine/AaveV3ConfigEngineTest.t.sol
index 0454771d..e73843f7 100644
--- a/tests/periphery/v3-config-engine/AaveV3ConfigEngineTest.t.sol
+++ b/tests/periphery/v3-config-engine/AaveV3ConfigEngineTest.t.sol
@@ -100,7 +100,10 @@ contract AaveV3ConfigEngineTest is TestnetProcedures, ProtocolV3TestBase {
       supplyCap: 85_000,
       borrowCap: 60_000,
       debtCeiling: 0,
-      eModeCategory: 0
+      eModeCategory: 0,
+      virtualAccActive: true,
+      virtualBalance: 0,
+      aTokenUnderlyingBalance: 0
     });
 
     _validateReserveConfig(expectedAssetConfig, allConfigsAfter);
@@ -200,7 +203,10 @@ contract AaveV3ConfigEngineTest is TestnetProcedures, ProtocolV3TestBase {
       supplyCap: 85_000,
       borrowCap: 60_000,
       debtCeiling: 0,
-      eModeCategory: 0
+      eModeCategory: 0,
+      virtualAccActive: true,
+      virtualBalance: 0,
+      aTokenUnderlyingBalance: 0
     });
 
     _validateReserveConfig(expectedAssetConfig, allConfigsAfter);
diff --git a/tests/utils/DiffUtils.sol b/tests/utils/DiffUtils.sol
index 6ed13480..a5e7577d 100644
--- a/tests/utils/DiffUtils.sol
+++ b/tests/utils/DiffUtils.sol
@@ -22,7 +22,7 @@ contract DiffUtils is Test {
 
     string[] memory inputs = new string[](7);
     inputs[0] = 'npx';
-    inputs[1] = '@bgd-labs/aave-cli@^0.7.2';
+    inputs[1] = '@bgd-labs/aave-cli@^0.16.2';
     inputs[2] = 'diff-snapshots';
     inputs[3] = beforePath;
     inputs[4] = afterPath;
diff --git a/tests/utils/ProtocolV3TestBase.sol b/tests/utils/ProtocolV3TestBase.sol
index efe4b083..faf3436e 100644
--- a/tests/utils/ProtocolV3TestBase.sol
+++ b/tests/utils/ProtocolV3TestBase.sol
@@ -103,6 +103,9 @@ struct ReserveConfig {
   uint256 borrowCap;
   uint256 debtCeiling;
   uint256 eModeCategory;
+  bool virtualAccActive;
+  uint256 virtualBalance;
+  uint256 aTokenUnderlyingBalance;
 }
 
 struct LocalVars {
@@ -187,42 +190,43 @@ contract ProtocolV3TestBase is DiffUtils {
     // keys for json stringification
     string memory strategiesKey = 'stategies';
     string memory content = '{}';
+    vm.serializeJson(strategiesKey, '{}');
 
-    address[] memory usedStrategies = new address[](configs.length);
     for (uint256 i = 0; i < configs.length; i++) {
-      if (!_isInAddressArray(usedStrategies, configs[i].interestRateStrategy)) {
-        usedStrategies[i] = configs[i].interestRateStrategy;
-        IDefaultInterestRateStrategyV2 strategy = IDefaultInterestRateStrategyV2(
-          configs[i].interestRateStrategy
-        );
-        string memory key = vm.toString(address(strategy));
-        vm.serializeString(
-          key,
-          'baseVariableBorrowRate',
-          vm.toString(strategy.getBaseVariableBorrowRate(configs[i].underlying))
-        );
-        vm.serializeString(
-          key,
-          'variableRateSlope1',
-          vm.toString(strategy.getVariableRateSlope1(configs[i].underlying))
-        );
-        vm.serializeString(
-          key,
-          'variableRateSlope2',
-          vm.toString(strategy.getVariableRateSlope2(configs[i].underlying))
-        );
-        vm.serializeString(
-          key,
-          'maxVariableBorrowRate',
-          vm.toString(strategy.getMaxVariableBorrowRate(configs[i].underlying))
-        );
-        string memory object = vm.serializeString(
-          key,
-          'optimalUsageRatio',
-          vm.toString(strategy.getOptimalUsageRatio(configs[i].underlying))
-        );
-        content = vm.serializeString(strategiesKey, key, object);
-      }
+      address asset = configs[i].underlying;
+      string memory key = vm.toString(asset);
+      vm.serializeJson(key, '{}');
+      vm.serializeString(key, 'address', vm.toString(configs[i].interestRateStrategy));
+      IDefaultInterestRateStrategyV2 strategy = IDefaultInterestRateStrategyV2(
+        configs[i].interestRateStrategy
+      );
+      vm.serializeString(
+        key,
+        'baseVariableBorrowRate',
+        vm.toString(strategy.getBaseVariableBorrowRate(asset))
+      );
+      vm.serializeString(
+        key,
+        'variableRateSlope1',
+        vm.toString(strategy.getVariableRateSlope1(asset))
+      );
+      vm.serializeString(
+        key,
+        'variableRateSlope2',
+        vm.toString(strategy.getVariableRateSlope2(asset))
+      );
+      vm.serializeString(
+        key,
+        'maxVariableBorrowRate',
+        vm.toString(strategy.getMaxVariableBorrowRate(asset))
+      );
+      string memory object = vm.serializeString(
+        key,
+        'optimalUsageRatio',
+        vm.toString(strategy.getOptimalUsageRatio(asset))
+      );
+
+      content = vm.serializeString(strategiesKey, key, object);
     }
     string memory output = vm.serializeString('root', 'strategies', content);
     vm.writeJson(output, path);
@@ -327,6 +331,11 @@ contract ProtocolV3TestBase is DiffUtils {
           } catch {}
         }
       }
+
+      vm.serializeBool(key, 'virtualAccountingActive', config.virtualAccActive);
+      vm.serializeUint(key, 'virtualBalance', config.virtualBalance);
+      vm.serializeUint(key, 'aTokenUnderlyingBalance', config.aTokenUnderlyingBalance);
+
       string memory out = vm.serializeUint(
         key,
         'oracleLatestAnswer',
@@ -450,6 +459,16 @@ contract ProtocolV3TestBase is DiffUtils {
 
     localConfig.isFlashloanable = configuration.getFlashLoanEnabled();
 
+    // 3.1 configurations
+    localConfig.virtualAccActive = configuration.getIsVirtualAccActive();
+
+    if (localConfig.virtualAccActive) {
+      localConfig.virtualBalance = pool.getVirtualUnderlyingBalance(reserve.tokenAddress);
+      localConfig.aTokenUnderlyingBalance = IERC20Detailed(reserve.tokenAddress).balanceOf(
+        localConfig.aToken
+      );
+    }
+
     return localConfig;
   }
 
@@ -481,7 +500,10 @@ contract ProtocolV3TestBase is DiffUtils {
         supplyCap: config.supplyCap,
         borrowCap: config.borrowCap,
         debtCeiling: config.debtCeiling,
-        eModeCategory: config.eModeCategory
+        eModeCategory: config.eModeCategory,
+        virtualAccActive: config.virtualAccActive,
+        virtualBalance: config.virtualBalance,
+        aTokenUnderlyingBalance: config.aTokenUnderlyingBalance
       });
   }