test: fix deployer create prediction, always run in isolate mode

.github/workflows/certora.yml

@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
 

.github/workflows/foundry-gas-diff.yml

@@ -17,14 +17,14 @@ jobs:
   compare_gas_reports:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
 
       - name: Install Foundry
         uses: onbjerg/foundry-toolchain@v1
         with:
-          version: nightly
+          version: stable
 
       # Add any step generating a gas report to a temporary file named gasreport.ansi
       # For example:
@@ -38,7 +38,7 @@ jobs:
           FOUNDRY_FUZZ_SEED: 0x${{ github.event.pull_request.base.sha || github.sha }}
 
       - name: Compare gas reports
-        uses: Rubilmax/foundry-gas-diff@v3.11
+        uses: Rubilmax/foundry-gas-diff@v3.21
         with:
           sortCriteria: avg,max # optionnally sort diff rows by criteria
           sortOrders: desc,asc # and directions
@@ -51,4 +51,4 @@ jobs:
         with:
           # delete the comment in case changes no longer impact gas costs
           delete: ${{ !steps.gas_diff.outputs.markdown }}
-          message: ${{ steps.gas_diff.outputs.markdown }}
+          message: ${{ steps.gas_diff.outputs.markdown }}

.github/workflows/tests.yml

@@ -6,12 +6,12 @@ jobs:
   tests:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Install Foundry
         uses: onbjerg/foundry-toolchain@v1
         with:
-          version: nightly
+          version: stable
 
       - name: Install dependencies
         run: forge install
@@ -23,4 +23,4 @@ jobs:
         env: 
           POLYGON_RPC_URL: ${{ secrets.POLYGON_RPC_URL }}
           AVALANCHE_RPC_URL: ${{ secrets.AVALANCHE_RPC_URL }}
-        run: forge test -vv
+        run: forge test -vvv

foundry.toml

@@ -6,6 +6,7 @@ optimizer-runs = 10_000_000
 via_ir = false
 runs = 256
 gas_reports = ["ATokenVault"]
+isolate = true
 
 [fuzz]
 max_test_rejects = 65536
@@ -20,4 +21,4 @@ polygon = "${POLYGON_RPC_URL}"
 
 [etherscan]
 mumbai = { key = "${ETHERSCAN_API_KEY}" }
-polygon = { key = "${ETHERSCAN_API_KEY}" }
+polygon = { key = "${ETHERSCAN_API_KEY}" }

test/ATokenVaultBaseTest.t.sol

@@ -133,9 +133,10 @@ contract ATokenVaultBaseTest is Test {
             SHARE_SYMBOL,
             _initialLockDeposit
         );
-        address proxyAddr = computeCreateAddress(address(this), vm.getNonce(address(this)));
 
         deal(underlying, address(this), _initialLockDeposit);
+        address proxyAddr = computeCreateAddress(address(this), vm.getNonce(address(this)) + 1);
+
         IERC20Upgradeable(underlying).safeApprove(address(proxyAddr), _initialLockDeposit);
 
         TransparentUpgradeableProxy proxy = new TransparentUpgradeableProxy(address(vault), PROXY_ADMIN, data);

test/ATokenVaultFork.t.sol

@@ -186,9 +186,10 @@ contract ATokenVaultForkTest is ATokenVaultForkBaseTest {
             SHARE_SYMBOL,
             amount
         );
-        address proxyAddr = computeCreateAddress(address(this), vm.getNonce(address(this)));
 
         deal(address(dai), address(this), amount);
+        address proxyAddr = computeCreateAddress(address(this), vm.getNonce(address(this)) + 1);
+
         dai.approve(address(proxyAddr), amount);
 
         TransparentUpgradeableProxy proxy = new TransparentUpgradeableProxy(address(vault), PROXY_ADMIN, data);
@@ -217,9 +218,10 @@ contract ATokenVaultForkTest is ATokenVaultForkBaseTest {
             SHARE_SYMBOL,
             initialLockDeposit
         );
-        address proxyAddr = computeCreateAddress(address(this), vm.getNonce(address(this)));
-
+
         deal(address(dai), address(this), initialLockDeposit);
+        address proxyAddr = computeCreateAddress(address(this), vm.getNonce(address(this)) + 1);
+
         dai.approve(address(proxyAddr), initialLockDeposit);
 
         // no indexed fields, just data check (4th param)