feat: 3.2.0 (#345)

* feat: upgrade to 3.2.0

* feat: upgrade to aave 3.2

* fix: upgrade v3.2.0

* fix: update breaking change

* fix: remove solidity utils

* fix: patch helpers

* fix: bump 3.2.0

* fix: update 3.2.0

* fix: lint code

* fix: update deps

* fix: make it build

* fix: bump deps

* fix: update resetting of key

* fix: update snapshot helper

* fix: inline id

* fix: update zksync

* fix: inline address

* fix: align zksync with upstream

* fix: use correct interface

* fix: bump address book

* fix: compile

* fix: update main

---------

Co-authored-by: Harsh Pandey <harshsatishpandey@gmail.com>

.gitmodules

@@ -1,9 +1,6 @@
 [submodule "lib/forge-std"]
 	path = lib/forge-std
 	url = https://github.com/foundry-rs/forge-std
-[submodule "lib/solidity-utils"]
-	path = lib/solidity-utils
-	url = https://github.com/bgd-labs/solidity-utils
 [submodule "lib/aave-address-book"]
 	path = lib/aave-address-book
 	url = https://github.com/bgd-labs/aave-address-book

package.json

@@ -7,7 +7,7 @@
     "test": "tests"
   },
   "scripts": {
-    "prettier": "prettier --write 'src/**/*.sol'",
+    "lint:fix": "prettier --write 'src/**/*.sol'",
     "prettier:tests": "prettier --write 'tests/**/*.sol'"
   },
   "repository": {
@@ -26,6 +26,6 @@
     "prettier-plugin-solidity": "^1.1.3"
   },
   "dependencies": {
-    "@bgd-labs/aave-cli": "0.16.2"
+    "@bgd-labs/aave-cli": "1.0.0"
   }
 }

remappings.txt

@@ -1,6 +1,5 @@
 aave-address-book/=lib/aave-address-book/src/
 aave-v3-origin/=lib/aave-address-book/lib/aave-v3-origin/src/
-aave-v3-core/=lib/aave-address-book/lib/aave-v3-origin/src/core
-aave-v3-periphery/=lib/aave-address-book/lib/aave-v3-origin/src/periphery
+aave-v3-origin-tests/=lib/aave-address-book/lib/aave-v3-origin/tests
 forge-std/=lib/forge-std/src/
-solidity-utils/=lib/solidity-utils/src/
+solidity-utils/=lib/aave-address-book/lib/aave-v3-origin/lib/solidity-utils/src/

scripts/RiskStewards.s.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.8.0;
 
 import 'solidity-utils/contracts/utils/ScriptUtils.sol';
 import {CapsPlusRiskSteward} from '../src/riskstewards/CapsPlusRiskSteward.sol';
-import {IAaveV3ConfigEngine} from 'aave-v3-origin/periphery/contracts/v3-config-engine/IAaveV3ConfigEngine.sol';
+import {IAaveV3ConfigEngine} from 'aave-v3-origin/contracts/extensions/v3-config-engine/IAaveV3ConfigEngine.sol';
 import {AaveV3Ethereum} from 'aave-address-book/AaveV3Ethereum.sol';
 import {AaveV3Polygon} from 'aave-address-book/AaveV3Polygon.sol';
 import {AaveV3Avalanche} from 'aave-address-book/AaveV3Avalanche.sol';

src/GovV3Helpers.sol

@@ -5,6 +5,7 @@ import {Vm} from 'forge-std/Vm.sol';
 import {ChainIds, ChainHelpers} from 'solidity-utils/contracts/utils/ChainHelpers.sol';
 import {IpfsUtils} from './IpfsUtils.sol';
 import {console2} from 'forge-std/console2.sol';
+import {ProxyHelpers} from 'aave-v3-origin-tests/utils/ProxyHelpers.sol';
 import {PayloadsControllerUtils, IGovernancePowerStrategy, IPayloadsControllerCore, IGovernanceCore} from 'aave-address-book/GovernanceV3.sol';
 import {IVotingMachineWithProofs} from 'aave-address-book/governance-v3/IVotingMachineWithProofs.sol';
 import {IVotingPortal} from 'aave-address-book/governance-v3/IVotingPortal.sol';
@@ -24,7 +25,6 @@ import {MiscEthereum} from 'aave-address-book/MiscEthereum.sol';
 import {Address} from 'solidity-utils/contracts/oz-common/Address.sol';
 import {Create2Utils} from 'solidity-utils/contracts/utils/ScriptUtils.sol';
 import {StorageHelpers} from './StorageHelpers.sol';
-import {ProxyHelpers} from './ProxyHelpers.sol';
 import {Create2UtilsZkSync} from 'solidity-utils/../zksync/src/contracts/utils/ScriptUtilsZkSync.sol';
 
 interface IGovernance_V2_5 {
@@ -232,10 +232,19 @@ library GovV3Helpers {
     return buildAction(payloadAddress);
   }
 
-  function _getBytecodeHashFromArtifacts(Vm vm, string memory contractName) private view returns (bytes32 bytecodeHash) {
-    string memory artifactPath = string.concat('zkout/', contractName, '.sol/', contractName, '.json');
+  function _getBytecodeHashFromArtifacts(
+    Vm vm,
+    string memory contractName
+  ) private view returns (bytes32 bytecodeHash) {
+    string memory artifactPath = string.concat(
+      'zkout/',
+      contractName,
+      '.sol/',
+      contractName,
+      '.json'
+    );
     string memory artifact = vm.readFile(artifactPath);
-    bytecodeHash = vm.parseJsonBytes32(artifact, ".hash");
+    bytecodeHash = vm.parseJsonBytes32(artifact, '.hash');
 
     require(bytecodeHash != (bytes32(0)), 'Unable to fetch bytecodeHash from the zkout artifacts');
     return bytecodeHash;

src/ProtocolV2TestBase.sol

@@ -13,7 +13,7 @@ import {ChainIds} from 'solidity-utils/contracts/utils/ChainHelpers.sol';
 import {IInitializableAdminUpgradeabilityProxy} from './interfaces/IInitializableAdminUpgradeabilityProxy.sol';
 import {ExtendedAggregatorV2V3Interface} from './interfaces/ExtendedAggregatorV2V3Interface.sol';
 import {CommonTestBase, ReserveTokens} from './CommonTestBase.sol';
-import {ProxyHelpers} from './ProxyHelpers.sol';
+import {ProxyHelpers} from 'aave-v3-origin/../tests/utils/ProxyHelpers.sol';
 
 struct ReserveConfig {
   string symbol;

src/ProtocolV3TestBase.sol

@@ -6,14 +6,13 @@ import {IAaveOracle, IPool, IPoolAddressesProvider, IPoolDataProvider, IReserveI
 import {IERC20} from 'solidity-utils/contracts/oz-common/interfaces/IERC20.sol';
 import {IERC20Metadata} from 'solidity-utils/contracts/oz-common/interfaces/IERC20Metadata.sol';
 import {SafeERC20} from 'solidity-utils/contracts/oz-common/SafeERC20.sol';
-import {ReserveConfiguration} from 'aave-v3-origin/core/contracts/protocol/libraries/configuration/ReserveConfiguration.sol';
-import {IDefaultInterestRateStrategyV2} from 'aave-v3-origin/core/contracts/interfaces/IDefaultInterestRateStrategyV2.sol';
+import {ReserveConfiguration} from 'aave-v3-origin/contracts/protocol/libraries/configuration/ReserveConfiguration.sol';
+import {IDefaultInterestRateStrategyV2} from 'aave-v3-origin/contracts/interfaces/IDefaultInterestRateStrategyV2.sol';
 import {AaveV3EthereumAssets} from 'aave-address-book/AaveV3Ethereum.sol';
-import {DiffUtils} from 'aave-v3-origin/../tests/utils/DiffUtils.sol';
-import {ProtocolV3TestBase as RawProtocolV3TestBase, ReserveConfig} from 'aave-v3-origin/../tests/utils/ProtocolV3TestBase.sol';
+import {DiffUtils} from 'aave-v3-origin-tests/utils/DiffUtils.sol';
+import {ProtocolV3TestBase as RawProtocolV3TestBase, ReserveConfig} from 'aave-v3-origin-tests/utils/ProtocolV3TestBase.sol';
 import {IInitializableAdminUpgradeabilityProxy} from './interfaces/IInitializableAdminUpgradeabilityProxy.sol';
 import {ExtendedAggregatorV2V3Interface} from './interfaces/ExtendedAggregatorV2V3Interface.sol';
-import {ProxyHelpers} from './ProxyHelpers.sol';
 import {CommonTestBase, ReserveTokens} from './CommonTestBase.sol';
 import {ILegacyDefaultInterestRateStrategy} from './dependencies/ILegacyDefaultInterestRateStrategy.sol';
 
@@ -317,35 +316,57 @@ contract ProtocolV3TestBase is RawProtocolV3TestBase, CommonTestBase {
     return configuration.getIsVirtualAccActive();
   }
 
-  function _logReserveConfig(ReserveConfig memory config) internal pure {
-    console.log('Symbol ', config.symbol);
-    console.log('Underlying address ', config.underlying);
-    console.log('AToken address ', config.aToken);
-    console.log('Stable debt token address ', config.stableDebtToken);
-    console.log('Variable debt token address ', config.variableDebtToken);
-    console.log('Decimals ', config.decimals);
-    console.log('LTV ', config.ltv);
-    console.log('Liquidation Threshold ', config.liquidationThreshold);
-    console.log('Liquidation Bonus ', config.liquidationBonus);
-    console.log('Liquidation protocol fee ', config.liquidationProtocolFee);
-    console.log('Reserve Factor ', config.reserveFactor);
-    console.log('Usage as collateral enabled ', (config.usageAsCollateralEnabled) ? 'Yes' : 'No');
-    console.log('Borrowing enabled ', (config.borrowingEnabled) ? 'Yes' : 'No');
-    console.log('Stable borrow rate enabled ', (config.stableBorrowRateEnabled) ? 'Yes' : 'No');
-    console.log('Supply cap ', config.supplyCap);
-    console.log('Borrow cap ', config.borrowCap);
-    console.log('Debt ceiling ', config.debtCeiling);
-    console.log('eMode category ', config.eModeCategory);
-    console.log('Interest rate strategy ', config.interestRateStrategy);
-    console.log('Is active ', (config.isActive) ? 'Yes' : 'No');
-    console.log('Is frozen ', (config.isFrozen) ? 'Yes' : 'No');
-    console.log('Is siloed ', (config.isSiloed) ? 'Yes' : 'No');
-    console.log('Is borrowable in isolation ', (config.isBorrowableInIsolation) ? 'Yes' : 'No');
-    console.log('Is flashloanable ', (config.isFlashloanable) ? 'Yes' : 'No');
-    console.log('Is virtual accounting active ', (config.virtualAccActive) ? 'Yes' : 'No');
-    console.log('Virtual balance ', config.virtualBalance);
-    console.log('-----');
-    console.log('-----');
+  function _writeEModeConfigs(string memory path, IPool pool) internal virtual override {
+    // keys for json stringification
+    string memory eModesKey = 'emodes';
+    string memory content = '{}';
+    vm.serializeJson(eModesKey, '{}');
+    uint8 emptyCounter = 0;
+    for (uint8 i = 0; i < 256; i++) {
+      try pool.getEModeCategoryCollateralConfig(i) returns (DataTypes.CollateralConfig memory cfg) {
+        if (cfg.liquidationThreshold == 0) {
+          if (++emptyCounter > 2) break;
+        } else {
+          string memory key = vm.toString(i);
+          vm.serializeJson(key, '{}');
+          vm.serializeUint(key, 'eModeCategory', i);
+          vm.serializeString(key, 'label', pool.getEModeCategoryLabel(i));
+          vm.serializeUint(key, 'ltv', cfg.ltv);
+          vm.serializeString(
+            key,
+            'collateralBitmap',
+            vm.toString(pool.getEModeCategoryCollateralBitmap(i))
+          );
+          vm.serializeString(
+            key,
+            'borrowableBitmap',
+            vm.toString(pool.getEModeCategoryBorrowableBitmap(i))
+          );
+          vm.serializeUint(key, 'liquidationThreshold', cfg.liquidationThreshold);
+          string memory object = vm.serializeUint(key, 'liquidationBonus', cfg.liquidationBonus);
+          content = vm.serializeString(eModesKey, key, object);
+          emptyCounter = 0;
+        }
+      } catch {
+        DataTypes.EModeCategoryLegacy memory category = pool.getEModeCategoryData(i);
+        if (category.liquidationThreshold == 0) {
+          if (++emptyCounter > 2) break;
+        } else {
+          string memory key = vm.toString(i);
+          vm.serializeJson(key, '{}');
+          vm.serializeUint(key, 'eModeCategory', i);
+          vm.serializeString(key, 'label', category.label);
+          vm.serializeUint(key, 'ltv', category.ltv);
+          vm.serializeUint(key, 'liquidationThreshold', category.liquidationThreshold);
+          vm.serializeUint(key, 'liquidationBonus', category.liquidationBonus);
+          string memory object = vm.serializeAddress(key, 'priceSource', category.priceSource);
+          content = vm.serializeString(eModesKey, key, object);
+          emptyCounter = 0;
+        }
+      }
+    }
+    string memory output = vm.serializeString('root', 'eModes', content);
+    vm.writeJson(output, path);
   }
 
   function _writeStrategyConfigs(

src/asset-manager/AaveWstethWithdrawer.sol

@@ -22,6 +22,7 @@ import {SafeERC20} from 'solidity-utils/contracts/oz-common/SafeERC20.sol';
 import {OwnableWithGuardian} from 'solidity-utils/contracts/access-control/OwnableWithGuardian.sol';
 import {Initializable} from 'solidity-utils/contracts/transparent-proxy/Initializable.sol';
 import {Rescuable721, Rescuable} from 'solidity-utils/contracts/utils/Rescuable721.sol';
+import {RescuableBase, IRescuableBase} from 'solidity-utils/contracts/utils/RescuableBase.sol';
 import {AaveV3Ethereum, AaveV3EthereumAssets} from 'aave-address-book/AaveV3Ethereum.sol';
 import {GovernanceV3Ethereum} from 'aave-address-book/GovernanceV3Ethereum.sol';
 import {IAaveWstethWithdrawer, IWithdrawalQueueERC721, IWETH} from './interfaces/IAaveWstethWithdrawer.sol';
@@ -31,7 +32,12 @@ import {IAaveWstethWithdrawer, IWithdrawalQueueERC721, IWETH} from './interfaces
  * @author defijesus.eth
  * @notice Helper contract to natively withdraw wstETH to the collector
  */
-contract AaveWstethWithdrawer is Initializable, OwnableWithGuardian, Rescuable721, IAaveWstethWithdrawer {
+contract AaveWstethWithdrawer is
+  Initializable,
+  OwnableWithGuardian,
+  Rescuable721,
+  IAaveWstethWithdrawer
+{
   using SafeERC20 for IERC20;
 
   /// auto incrementing index to store requestIds of withdrawals
@@ -58,7 +64,10 @@ contract AaveWstethWithdrawer is Initializable, OwnableWithGuardian, Rescuable72
   /// @inheritdoc IAaveWstethWithdrawer
   function startWithdraw(uint256[] calldata amounts) external onlyOwnerOrGuardian {
     uint256 index = nextIndex++;
-    uint256[] memory rIds = WSTETH_WITHDRAWAL_QUEUE.requestWithdrawalsWstETH(amounts, address(this));
+    uint256[] memory rIds = WSTETH_WITHDRAWAL_QUEUE.requestWithdrawalsWstETH(
+      amounts,
+      address(this)
+    );
 
     requestIds[index] = rIds;
     emit StartedWithdrawal(amounts, index);
@@ -92,6 +101,14 @@ contract AaveWstethWithdrawer is Initializable, OwnableWithGuardian, Rescuable72
     return owner();
   }
 
+  /// @inheritdoc IRescuableBase
+  function maxRescue(
+    address erc20Token
+  ) public view override(RescuableBase, IRescuableBase) returns (uint256) {
+    return type(uint256).max;
+  }
+
   fallback() external payable {}
+
   receive() external payable {}
 }

src/asset-manager/interfaces/IAaveWstethWithdrawer.sol

@@ -22,7 +22,6 @@ interface IAaveWstethWithdrawer {
 }
 
 interface IWithdrawalQueueERC721 {
-
   /// @notice Request the batch of wstETH for withdrawal. Approvals for the passed amounts should be done before.
   /// @param _amounts an array of wstETH amount values.
   ///  The standalone withdrawal request will be created for each item in the passed list.
@@ -72,4 +71,4 @@ interface IWithdrawalQueueERC721 {
 
 interface IWETH {
   function deposit() external payable;
-}
+}

src/bridges/arbitrum/AaveArbEthERC20Bridge.sol

@@ -6,6 +6,7 @@ import {IERC20} from 'solidity-utils/contracts/oz-common/interfaces/IERC20.sol';
 import {SafeERC20} from 'solidity-utils/contracts/oz-common/SafeERC20.sol';
 import {Ownable} from 'solidity-utils/contracts/oz-common/Ownable.sol';
 import {Rescuable} from 'solidity-utils/contracts/utils/Rescuable.sol';
+import {RescuableBase, IRescuableBase} from 'solidity-utils/contracts/utils/RescuableBase.sol';
 import {AaveV3Ethereum} from 'aave-address-book/AaveV3Ethereum.sol';
 import {ChainIds} from 'solidity-utils/contracts/utils/ChainHelpers.sol';
 
@@ -113,4 +114,11 @@ contract AaveArbEthERC20Bridge is Ownable, Rescuable, IAaveArbEthERC20Bridge {
   function whoCanRescue() public view override returns (address) {
     return owner();
   }
+
+  /// @inheritdoc IRescuableBase
+  function maxRescue(
+    address erc20Token
+  ) public view override(RescuableBase, IRescuableBase) returns (uint256) {
+    return type(uint256).max;
+  }
 }

src/bridges/optimism/AaveOpEthERC20Bridge.sol

@@ -6,6 +6,7 @@ import {IERC20} from 'solidity-utils/contracts/oz-common/interfaces/IERC20.sol';
 import {SafeERC20} from 'solidity-utils/contracts/oz-common/SafeERC20.sol';
 import {Ownable} from 'solidity-utils/contracts/oz-common/Ownable.sol';
 import {Rescuable} from 'solidity-utils/contracts/utils/Rescuable.sol';
+import {RescuableBase, IRescuableBase} from 'solidity-utils/contracts/utils/RescuableBase.sol';
 import {AaveV3Ethereum} from 'aave-address-book/AaveV3Ethereum.sol';
 import {ChainIds} from 'solidity-utils/contracts/utils/ChainHelpers.sol';
 
@@ -54,4 +55,11 @@ contract AaveOpEthERC20Bridge is Ownable, Rescuable, IAaveOpEthERC20Bridge {
   function whoCanRescue() public view override returns (address) {
     return owner();
   }
+
+  /// @inheritdoc IRescuableBase
+  function maxRescue(
+    address erc20Token
+  ) public view override(RescuableBase, IRescuableBase) returns (uint256) {
+    return type(uint256).max;
+  }
 }

src/bridges/polygon/AavePolEthERC20Bridge.sol

@@ -6,6 +6,7 @@ import {IERC20} from 'solidity-utils/contracts/oz-common/interfaces/IERC20.sol';
 import {SafeERC20} from 'solidity-utils/contracts/oz-common/SafeERC20.sol';
 import {Ownable} from 'solidity-utils/contracts/oz-common/Ownable.sol';
 import {Rescuable} from 'solidity-utils/contracts/utils/Rescuable.sol';
+import {RescuableBase, IRescuableBase} from 'solidity-utils/contracts/utils/RescuableBase.sol';
 import {AaveV3Ethereum} from 'aave-address-book/AaveV3Ethereum.sol';
 import {AaveV2Polygon} from 'aave-address-book/AaveV2Polygon.sol';
 import {ChainIds} from 'solidity-utils/contracts/utils/ChainHelpers.sol';
@@ -97,6 +98,13 @@ contract AavePolEthERC20Bridge is Ownable, Rescuable, IAavePolEthERC20Bridge {
     return owner();
   }
 
+  /// @inheritdoc IRescuableBase
+  function maxRescue(
+    address erc20Token
+  ) public view override(RescuableBase, IRescuableBase) returns (uint256) {
+    return type(uint256).max;
+  }
+
   receive() external payable {
     if (block.chainid != ChainIds.MAINNET) revert InvalidChain();
 

src/bridges/polygon/AavePolEthPlasmaBridge.sol

@@ -6,6 +6,7 @@ import {IERC20} from 'solidity-utils/contracts/oz-common/interfaces/IERC20.sol';
 import {SafeERC20} from 'solidity-utils/contracts/oz-common/SafeERC20.sol';
 import {Ownable} from 'solidity-utils/contracts/oz-common/Ownable.sol';
 import {Rescuable} from 'solidity-utils/contracts/utils/Rescuable.sol';
+import {RescuableBase, IRescuableBase} from 'solidity-utils/contracts/utils/RescuableBase.sol';
 import {AaveV3Ethereum} from 'aave-address-book/AaveV3Ethereum.sol';
 import {ChainIds} from 'solidity-utils/contracts/utils/ChainHelpers.sol';
 
@@ -102,6 +103,13 @@ contract AavePolEthPlasmaBridge is Ownable, Rescuable, IAavePolEthPlasmaBridge {
     return owner();
   }
 
+  /// @inheritdoc IRescuableBase
+  function maxRescue(
+    address erc20Token
+  ) public view override(RescuableBase, IRescuableBase) returns (uint256) {
+    return type(uint256).max;
+  }
+
   /// @dev Allows the contract to receive Matic on Polygon
   receive() external payable {
     if (block.chainid != ChainIds.POLYGON) revert InvalidChain();