feat: add gov v3 helpers

README.md

@@ -2,10 +2,14 @@
 
 This package contains various contracts which allow you to streamline testing within the aave protocol in foundry.
 
-## GovHelpers
+## GovHelpers (deprecated)
 
 These helpers allow you to create and execute proposals on L1 so you don't have to care about having enough proposition power, timings, etc.
 
+## GovV3Helpers
+
+These helpers allow the creation of proposal for aave governance v3.
+
 ## ProxyHelpers
 
 These helpers allow you to fetch the current implementation & admin for a specified proxy.
@@ -19,3 +23,7 @@ These helpers allow you to simulate execution of proposals on governance control
 The ProtocolV3TestBase is intended to be used with proposals that alter a V3 pool. While the `helpers` are libraries, you can use from where ever you want `ProtocolV3TestBase` is intended to be inherited from in your test via `is ProtocolV3TestBase`.
 
 When inheriting from `ProtocolV3TestBase` you have access to methods to create readable configuration snapshots of a pool and e2e tests of a pool.
+
+## ProtocolV2TestBase
+
+Analog to ProtocolV3TestBase but for v2 pools.

foundry.toml

@@ -19,6 +19,7 @@ fantom = "${RPC_FANTOM}"
 harmony = "${RPC_HARMONY}"
 metis = "${RPC_METIS}"
 base = "${RPC_BASE}"
+sepolia = "${RPC_SEPOLIA}"
 
 [etherscan]
 mainnet={key="${ETHERSCAN_API_KEY_MAINNET}",chainId=1}
@@ -27,6 +28,7 @@ avalanche={key="${ETHERSCAN_API_KEY_AVALANCHE}",chainId=43114}
 polygon={key="${ETHERSCAN_API_KEY_POLYGON}",chainId=137}
 arbitrum={key="${ETHERSCAN_API_KEY_ARBITRUM}",chainId=42161}
 fantom={key="${ETHERSCAN_API_KEY_FANTOM}",chainId=250}
-base = { key="any", chainId=8453, url='https://basescan.org/' }
+base={key="any",chainId=8453,url='https://basescan.org/'}
+sepolia={key="${ETHERSCAN_API_KEY_MAINNET}",chainId=11155111}
 
 # See more config options https://github.com/gakonst/foundry/tree/master/config

src/ChainIds.sol

@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
+import {Vm} from 'forge-std/Vm.sol';
 
 library ChainIds {
   uint256 internal constant MAINNET = 1;
@@ -16,3 +17,42 @@ library ChainIds {
   uint256 internal constant SEPOLIA = 11155111;
   uint256 internal constant HARMONY = 1666600000;
 }
+
+library ChainHelpers {
+  error UnknownChainId();
+
+  function selectChain(Vm vm, uint256 chainId) internal returns (uint256, uint256) {
+    uint256 previousFork = vm.activeFork();
+    uint256 newFork;
+    if (chainId == ChainIds.MAINNET) {
+      newFork = vm.createFork(vm.rpcUrl('mainnet'));
+    } else if (chainId == ChainIds.OPTIMISM) {
+      newFork = vm.createFork(vm.rpcUrl('optimism'));
+    } else if (chainId == ChainIds.BSC) {
+      newFork = vm.createFork(vm.rpcUrl('bsc'));
+    } else if (chainId == ChainIds.POLYGON) {
+      newFork = vm.createFork(vm.rpcUrl('polygon'));
+    } else if (chainId == ChainIds.FANTOM) {
+      newFork = vm.createFork(vm.rpcUrl('fantom'));
+    } else if (chainId == ChainIds.ZK_SYNC) {
+      newFork = vm.createFork(vm.rpcUrl('tkSync'));
+    } else if (chainId == ChainIds.METIS) {
+      newFork = vm.createFork(vm.rpcUrl('metis'));
+    } else if (chainId == ChainIds.ZK_EVM) {
+      newFork = vm.createFork(vm.rpcUrl('zkEvm'));
+    } else if (chainId == ChainIds.BASE) {
+      newFork = vm.createFork(vm.rpcUrl('base'));
+    } else if (chainId == ChainIds.ARBITRUM) {
+      newFork = vm.createFork(vm.rpcUrl('arbitrum'));
+    } else if (chainId == ChainIds.AVALANCHE) {
+      newFork = vm.createFork(vm.rpcUrl('avalanche'));
+    } else if (chainId == ChainIds.SEPOLIA) {
+      newFork = vm.createFork(vm.rpcUrl('sepolia'));
+    } else if (chainId == ChainIds.HARMONY) {
+      newFork = vm.createFork(vm.rpcUrl('harmony'));
+    } else {
+      revert UnknownChainId();
+    }
+    return (previousFork, newFork);
+  }
+}

src/GovHelpers.sol

@@ -4,6 +4,7 @@ pragma abicoder v2;
 
 import {Vm} from 'forge-std/Vm.sol';
 import {console2} from 'forge-std/console2.sol';
+import {IpfsUtils} from './IpfsUtils.sol';
 import {AaveGovernanceV2, IAaveGovernanceV2, IExecutorWithTimelock} from 'aave-address-book/AaveGovernanceV2.sol';
 import {IPoolAddressesProvider} from 'aave-address-book/AaveV3.sol';
 import {AaveV3Avalanche} from 'aave-address-book/AaveV3Avalanche.sol';
@@ -42,37 +43,8 @@ library GovHelpers {
     bool withDelegatecall;
   }
 
-  function ipfsHashFile(Vm vm, string memory filePath, bool upload) internal returns (bytes32) {
-    string[] memory inputs = new string[](8);
-    inputs[0] = 'npx';
-    inputs[1] = '--yes';
-    inputs[2] = '-s';
-    inputs[3] = '@bgd-labs/aave-cli';
-    inputs[4] = 'ipfs';
-    inputs[5] = filePath;
-    inputs[6] = '-u';
-    inputs[7] = vm.toString(upload);
-    bytes memory bs58Hash = vm.ffi(inputs);
-    // currenty there is no better way as ffi silently fails
-    // revisit once https://github.com/foundry-rs/foundry/pull/4908 progresses
-    require(
-      bs58Hash.length != 0,
-      'CALCULATED_HASH_IS_ZERO_CHECK_IF_YARN_DEPENDENCIES_ARE_INSTALLED'
-    );
-    console2.logString('Info: This preview will only work when the file has been uploaded to ipfs');
-    console2.logString(
-      string(
-        abi.encodePacked(
-          'Preview: https://app.aave.com/governance/ipfs-preview/?ipfsHash=',
-          vm.toString(bs58Hash)
-        )
-      )
-    );
-    return bytes32(bs58Hash);
-  }
-
   function ipfsHashFile(Vm vm, string memory filePath) internal returns (bytes32) {
-    return ipfsHashFile(vm, filePath, false);
+    return IpfsUtils.ipfsHashFile(vm, filePath, false);
   }
 
   function buildMainnet(address payloadAddress) internal pure returns (Payload memory) {