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

Author: DhairyaSethi

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)