fix: cleanup generator

src/AaveAddressBook.sol

@@ -58,4 +58,7 @@ import {MiscScroll} from './MiscScroll.sol';
 import {MiscPolygonZkEvm} from './MiscPolygonZkEvm.sol';
 import {MiscSepolia} from './MiscSepolia.sol';
 import {MiscMumbai} from './MiscMumbai.sol';
+import {AaveGovernanceV2, IGovernanceStrategy} from './AaveGovernanceV2.sol';
+import {AaveGovernanceV2} from './AaveGovernanceV2.sol';
+import {AaveGovernanceV2, IGovernanceStrategy} from './AaveGovernanceV2.sol';
 import {AaveSafetyModule} from './AaveSafetyModule.sol';

src/AaveGovernanceV2.sol

@@ -0,0 +1,47 @@
+// AUTOGENERATED - MANUALLY CHANGES WILL BE REVERTED BY THE GENERATOR
+// SPDX-License-Identifier: MIT
+pragma solidity >=0.6.0;
+
+library AaveGovernanceV2 {
+  // https://etherscan.io/address/0xEE56e2B3D491590B5b31738cC34d5232F378a8D5
+  address internal constant SHORT_EXECUTOR = 0xEE56e2B3D491590B5b31738cC34d5232F378a8D5;
+
+  // https://etherscan.io/address/0x79426A1c24B2978D90d7A5070a46C65B07bC4299
+  address internal constant LONG_EXECUTOR = 0x79426A1c24B2978D90d7A5070a46C65B07bC4299;
+
+  // https://etherscan.io/address/0xAce1d11d836cb3F51Ef658FD4D353fFb3c301218
+  address internal constant ARC_TIMELOCK = 0xAce1d11d836cb3F51Ef658FD4D353fFb3c301218;
+
+  // https://polygonscan.com/address/0xdc9A35B16DB4e126cFeDC41322b3a36454B1F772
+  address internal constant POLYGON_BRIDGE_EXECUTOR = 0xdc9A35B16DB4e126cFeDC41322b3a36454B1F772;
+
+  // https://optimistic.etherscan.io/address/0x7d9103572bE58FfE99dc390E8246f02dcAe6f611
+  address internal constant OPTIMISM_BRIDGE_EXECUTOR = 0x7d9103572bE58FfE99dc390E8246f02dcAe6f611;
+
+  // https://arbiscan.io/address/0x7d9103572bE58FfE99dc390E8246f02dcAe6f611
+  address internal constant ARBITRUM_BRIDGE_EXECUTOR = 0x7d9103572bE58FfE99dc390E8246f02dcAe6f611;
+
+  // https://andromeda-explorer.metis.io/address/0x8EC77963068474a45016938Deb95E603Ca82a029
+  address internal constant METIS_BRIDGE_EXECUTOR = 0x8EC77963068474a45016938Deb95E603Ca82a029;
+
+  // https://basescan.org/address/0xA9F30e6ED4098e9439B2ac8aEA2d3fc26BcEbb45
+  address internal constant BASE_BRIDGE_EXECUTOR = 0xA9F30e6ED4098e9439B2ac8aEA2d3fc26BcEbb45;
+
+  // https://etherscan.io/address/0x158a6bC04F0828318821baE797f50B0A1299d45b
+  address internal constant CROSSCHAIN_FORWARDER_POLYGON =
+    0x158a6bC04F0828318821baE797f50B0A1299d45b;
+
+  // https://etherscan.io/address/0x5f5C02875a8e9B5A26fbd09040ABCfDeb2AA6711
+  address internal constant CROSSCHAIN_FORWARDER_OPTIMISM =
+    0x5f5C02875a8e9B5A26fbd09040ABCfDeb2AA6711;
+
+  // https://etherscan.io/address/0xd1B3E25fD7C8AE7CADDC6F71b461b79CD4ddcFa3
+  address internal constant CROSSCHAIN_FORWARDER_ARBITRUM =
+    0xd1B3E25fD7C8AE7CADDC6F71b461b79CD4ddcFa3;
+
+  // https://etherscan.io/address/0x2fE52eF191F0BE1D98459BdaD2F1d3160336C08f
+  address internal constant CROSSCHAIN_FORWARDER_METIS = 0x2fE52eF191F0BE1D98459BdaD2F1d3160336C08f;
+
+  // https://etherscan.io/address/0x3215225538da1546FE0DA88ee13019f402078942
+  address internal constant CROSSCHAIN_FORWARDER_BASE = 0x3215225538da1546FE0DA88ee13019f402078942;
+}

src/ts/AaveAddressBook.ts

@@ -57,7 +57,6 @@ export * as MiscSepolia from './MiscSepolia';
 export * as MiscMumbai from './MiscMumbai';
 export * as AaveGovernanceV2 from './AaveGovernanceV2';
 export * as AaveSafetyModule from './AaveSafetyModule';
-export {IAaveGovernanceV2_ABI} from './abis/IAaveGovernanceV2';
 export {ICollector_ABI} from './abis/ICollector';
 export {AggregatorInterface_ABI} from './abis/AggregatorInterface';
 export {IPayloadsControllerCore_ABI} from './abis/IPayloadsControllerCore';

src/ts/AaveGovernanceV2.ts

@@ -1,10 +1,4 @@
 // AUTOGENERATED - MANUALLY CHANGES WILL BE REVERTED BY THE GENERATOR
-// IAaveGovernanceV2 https://etherscan.io/address/0xEC568fffba86c094cf06b22134B23074DFE2252c
-export const GOV = '0xEC568fffba86c094cf06b22134B23074DFE2252c';
-
-// IGovernanceStrategy https://etherscan.io/address/0xb7e383ef9B1E9189Fc0F71fb30af8aa14377429e
-export const GOV_STRATEGY = '0xb7e383ef9B1E9189Fc0F71fb30af8aa14377429e';
-
 // https://etherscan.io/address/0xEE56e2B3D491590B5b31738cC34d5232F378a8D5
 export const SHORT_EXECUTOR = '0xEE56e2B3D491590B5b31738cC34d5232F378a8D5';
 

src/ts/abis/IExecutorWithTimelock.ts

@@ -205,7 +205,7 @@ export const IExecutorWithTimelock_ABI = [
       {
         name: 'governance',
         type: 'address',
-        internalType: 'contract IAaveGovernanceV2',
+        internalType: 'address',
       },
       {
         name: 'proposalId',