Script: Adjusted deployment script + .env.example

Author: craterface77

.env.example

@@ -7,3 +7,4 @@ VERSION_SALT=0xYourSalt
 AAVE_POOL=0x6Ae43d3271ff6888e7Fc43Fd7321a503ff738951
 AAVE_DATA_PROVIDER=0x3e9708d80f7B3e43118013075F7e95CE3AB31F31
 UNDERLYING_TOKEN=0xFF34B3d4Aee8ddCd6F9AFFFB6Fe49bD371b8a357
+IS_L2=IS_L2_OR_NOT

script/deployChainAbstractionSetup.s.sol

@@ -15,6 +15,7 @@ import {VaultManager} from "../src/vaults/VaultManager.sol";
 import {CABPaymaster} from "../src/paymasters/CABPaymaster.sol";
 import {InvoiceManager} from "../src/core/InvoiceManager.sol";
 import {IPool} from "aave-v3-origin/core/contracts/interfaces/IPool.sol";
+import {L2Encoder} from "aave-v3-origin/core/contracts/misc/L2Encoder.sol";
 
 import {ICrossL2Prover} from "@vibc-core-smart-contracts/contracts/interfaces/ICrossL2Prover.sol";
 
@@ -29,8 +30,10 @@ contract DeployChainAbstractionSetup is Script, CheckOrDeployEntryPoint, CheckAa
     address internal verifyingSigner = vm.envAddress("VERIFYING_SIGNER");
     bytes32 internal versionSalt = vm.envBytes32("VERSION_SALT");
 
+    address internal l2Encoder;
     address internal aavePool = vm.envAddress("AAVE_POOL");
     address internal protocolDataProvider = vm.envAddress("AAVE_DATA_PROVIDER");
+    bool internal isL2 = vm.envBool("IS_L2");
 
     function run(address[] calldata tokens) public {
         if (tokens.length == 0) {
@@ -84,6 +87,11 @@ contract DeployChainAbstractionSetup is Script, CheckOrDeployEntryPoint, CheckAa
             vaultManager.addVault(baseVault);
 
             if (isAaveToken(protocolDataProvider, token)) {
+                if(isL2) {
+                    l2Encoder = address(new L2Encoder(IPool(aavePool)));
+                } else {
+                    l2Encoder = address(0);
+                }
                 address aTokenAddress = getATokenAddress(protocolDataProvider, address(token));
                 AaveVault aaveVault = AaveVault(
                     payable(
@@ -94,7 +102,9 @@ contract DeployChainAbstractionSetup is Script, CheckOrDeployEntryPoint, CheckAa
                                 IVaultManager(address(vaultManager)),
                                 IERC20(token),
                                 IERC20(aTokenAddress),
-                                IPool(aavePool)
+                                IPool(aavePool),
+                                isL2,
+                                l2Encoder
                             )
                         )
                     )

test/AaveVault/AaveVaultFork.t.sol

@@ -53,7 +53,7 @@ contract DeployAndTestAaveVaults is Test, Script, CheckAaveTokenStatus {
                             underlyingToken,
                             aToken,
                             IPool(aavePool),
-                            isL2,
+                            false,
                             address(0)
                         )
                     )