diff --git a/scripts/configs/abis.ts b/scripts/configs/abis.ts
index 9b77739a..310bdfd6 100644
--- a/scripts/configs/abis.ts
+++ b/scripts/configs/abis.ts
@@ -1,5 +1,5 @@
-import {ChainId} from '../generator/chains';
 import {governanceConfigMainnet} from './governance/ethereum';
+import {mainnetProtoV2Pool, mainnetProtoV3Pool} from './pools/ethereum';
 
 export const ABI_INTERFACES = [
   'IAaveGovernanceV2',
@@ -41,4 +41,8 @@ export const DOWNLOAD_ABI_INTERFACES = [
     address: governanceConfigMainnet.ADDRESSES.VM_DATA_HELPER,
     name: 'IVotingMachineDataHelper',
   },
+  {
+    address: mainnetProtoV3Pool.additionalAddresses.UI_POOL_DATA_PROVIDER,
+    name: 'IUiPoolDataProvider',
+  },
 ];
diff --git a/scripts/configs/governance/ethereum.ts b/scripts/configs/governance/ethereum.ts
index 1586b947..71c18ede 100644
--- a/scripts/configs/governance/ethereum.ts
+++ b/scripts/configs/governance/ethereum.ts
@@ -28,6 +28,7 @@ export const governanceConfigGoerli: GovernanceConfig = {
     PC_DATA_HELPER: '0xbd2db358f3C82F2883132A6584e22F38A979e768',
     META_DELEGATE_HELPER: '0x1966133c190475E8385Dc1b4150B5f81c70DC578',
     GOV_DATA_HELPER: '0x160e2d1456B815d6a3d281218538dd6E2e3C841f',
+    GOVERNANCE_POWER_STRATEGY: '0x1ba21Fb1bDF4234CAe0AD1e02cF6750d7938E358',
   },
 };
 
@@ -47,5 +48,6 @@ export const governanceConfigMainnet: GovernanceConfig = {
     VM_DATA_HELPER: '0x77976B51569896523EE215962Ee91ff236Fa50E8',
     META_DELEGATE_HELPER: '0x94363B11b37BC3ffe43AB09cff5A010352FE85dC',
     EMERGENCY_REGISTRY: '0x73C6Fb358dDA8e84D50e98A98F7c0dF32e15C7e9',
+    GOVERNANCE_POWER_STRATEGY: '0xa198Fac58E02A5C5F8F7e877895d50cFa9ad1E04',
   },
 };
diff --git a/scripts/configs/types.ts b/scripts/configs/types.ts
index 5697099a..749f3520 100644
--- a/scripts/configs/types.ts
+++ b/scripts/configs/types.ts
@@ -25,6 +25,7 @@ export type GovernanceV3Addresses = {
   PC_DATA_HELPER?: Hex;
   META_DELEGATE_HELPER?: Hex;
   EMERGENCY_REGISTRY?: Hex;
+  GOVERNANCE_POWER_STRATEGY?: Hex;
 };
 
 export interface GovernanceConfig {
diff --git a/scripts/generateABIs.ts b/scripts/generateABIs.ts
index a3fa8300..8ee29c56 100644
--- a/scripts/generateABIs.ts
+++ b/scripts/generateABIs.ts
@@ -6,11 +6,15 @@ import {ABI_INTERFACES, DOWNLOAD_ABI_INTERFACES} from './configs/abis';
 
 const awaitableExec = util.promisify(exec);
 
-export async function generateABIs() {
+export async function generateABIs(removeExisting: boolean) {
   if (existsSync('./src/ts/abis')) {
-    rmSync('./src/ts/abis', {recursive: true});
+    if (removeExisting) {
+      rmSync('./src/ts/abis', {recursive: true});
+      mkdirSync('./src/ts/abis');
+    }
+  } else {
+    mkdirSync('./src/ts/abis');
   }
-  mkdirSync('./src/ts/abis');
   for (const INTERFACE of ABI_INTERFACES) {
     const {stdout, stderr} = await awaitableExec(`forge inspect ${INTERFACE} abi`);
     if (stderr) {
@@ -25,13 +29,18 @@ export async function generateABIs() {
     );
   }
   for (const INTERFACE of DOWNLOAD_ABI_INTERFACES) {
+    const fileName = `./src/ts/abis/${INTERFACE.name}.ts`;
+    if (existsSync(fileName)) {
+      console.log(`skipping download of abi ${INTERFACE.name} as it already exists`);
+      continue;
+    }
     const {stdout, stderr} = await awaitableExec(`cast interface -j ${INTERFACE.address}`);
     if (stderr) {
       throw new Error(`Failed to generate abi for ${INTERFACE.name} from ${INTERFACE.address}`);
     }
     const varName = `${INTERFACE.name}_ABI`;
     writeFileSync(
-      `./src/ts/abis/${INTERFACE.name}.ts`,
+      fileName,
       prefixWithGeneratedWarning(
         `export const ${varName} = ${JSON.stringify(JSON.parse(stdout.trim()), null, 2)} as const;`,
       ),
diff --git a/scripts/generator/governanceV3Generator.ts b/scripts/generator/governanceV3Generator.ts
index 923ce598..bae1ca20 100644
--- a/scripts/generator/governanceV3Generator.ts
+++ b/scripts/generator/governanceV3Generator.ts
@@ -74,10 +74,11 @@ function getGovernancePowerStrategy(governance: Address, publicClient: PublicCli
 async function getGovernanceV3Addresses({CHAIN_ID, ADDRESSES}: GovernanceConfig) {
   let addresses: Addresses = {...ADDRESSES};
   if (ADDRESSES.GOVERNANCE) {
-    addresses.GOVERNANCE_POWER_STRATEGY = await getGovernancePowerStrategy(
-      ADDRESSES.GOVERNANCE,
-      RPC_PROVIDERS[CHAIN_ID],
-    );
+    // TODO: comment back in when governance v3 is live
+    // addresses.GOVERNANCE_POWER_STRATEGY = await getGovernancePowerStrategy(
+    //   ADDRESSES.GOVERNANCE,
+    //   RPC_PROVIDERS[CHAIN_ID],
+    // );
     addresses.GOVERNANCE = {value: addresses.GOVERNANCE, type: 'IGovernanceCore'};
   }
 
diff --git a/scripts/generator/protocolV2Generator.ts b/scripts/generator/protocolV2Generator.ts
index 9864a047..3ef51875 100644
--- a/scripts/generator/protocolV2Generator.ts
+++ b/scripts/generator/protocolV2Generator.ts
@@ -1,6 +1,5 @@
 import {Hex, PublicClient, getContract} from 'viem';
 import {AddressInfo, PoolConfig, ReserveData} from '../configs/types';
-import {UI_POOL_DATA_PROVIDER_ABI} from '../abi/uipooldata_provider';
 import {RPC_PROVIDERS} from './clients';
 import {appendFileSync, writeFileSync} from 'fs';
 import {
@@ -15,6 +14,7 @@ import {LENDING_POOL_V2_ABI} from '../abi/lending_pool_v2_abi';
 import {A_TOKEN_V2_ABI} from '../abi/aToken_v2_abi';
 import {INCENTIVES_CONTROLLER_ABI} from '../abi/incentivesController_abi';
 import {generateAssetsLibrary} from './assetsLibraryGenerator';
+import {IUiPoolDataProvider_ABI} from '../../src/ts/abis/IUiPoolDataProvider';
 
 export interface PoolV2Addresses {
   POOL_ADDRESSES_PROVIDER: AddressInfo;
@@ -106,7 +106,7 @@ export async function getPoolV2Addresses(pool: PoolConfig): Promise<PoolV2Addres
     if (pool.additionalAddresses.UI_POOL_DATA_PROVIDER) {
       const uiPoolDataProvider = getContract({
         address: pool.additionalAddresses.UI_POOL_DATA_PROVIDER,
-        abi: UI_POOL_DATA_PROVIDER_ABI,
+        abi: IUiPoolDataProvider_ABI,
         publicClient,
       });
       reservesData = (
diff --git a/scripts/generator/protocolV3Generator.ts b/scripts/generator/protocolV3Generator.ts
index 0e5d8717..30188acc 100644
--- a/scripts/generator/protocolV3Generator.ts
+++ b/scripts/generator/protocolV3Generator.ts
@@ -2,7 +2,6 @@ import {Hex, PublicClient, getContract, zeroAddress} from 'viem';
 import {AddressInfo, Addresses, PoolConfig, ReserveData} from '../configs/types';
 import {ADDRESS_PROVIDER_V3_ABI} from '../abi/address_provider_v3_abi';
 import {REWARDS_CONTROLLER_ABI} from '../abi/rewardsController_v3_abi';
-import {UI_POOL_DATA_PROVIDER_ABI} from '../abi/uipooldata_provider';
 import {STATIC_A_TOKEN_FACTORY_ABI} from '../abi/static_a_token_factory_abi';
 import {A_TOKEN_V3_ABI} from '../abi/aToken_v3_abi';
 import {VARIABLE_DEBT_TOKEN_ABI} from '../abi/variableDebtToken_v3_abi';
@@ -22,6 +21,7 @@ import {
 } from './utils';
 import {generateAssetsLibrary} from './assetsLibraryGenerator';
 import {ChainId} from './chains';
+import {IUiPoolDataProvider_ABI} from '../../src/ts/abis/IUiPoolDataProvider';
 
 export interface PoolV3Addresses {
   POOL_ADDRESSES_PROVIDER: AddressInfo;
@@ -164,7 +164,7 @@ export async function getPoolV3Addresses(
     if (pool.additionalAddresses.UI_POOL_DATA_PROVIDER) {
       const uiPoolDataProvider = getContract({
         address: pool.additionalAddresses.UI_POOL_DATA_PROVIDER,
-        abi: UI_POOL_DATA_PROVIDER_ABI,
+        abi: IUiPoolDataProvider_ABI,
         publicClient,
       });
       const staticATokenFactoryContract = pool.additionalAddresses.STATIC_A_TOKEN_FACTORY
diff --git a/src/AaveV2Avalanche.sol b/src/AaveV2Avalanche.sol
index 04907e4a..93f105c3 100644
--- a/src/AaveV2Avalanche.sol
+++ b/src/AaveV2Avalanche.sol
@@ -28,8 +28,8 @@ library AaveV2Avalanche {
   IAaveProtocolDataProvider internal constant AAVE_PROTOCOL_DATA_PROVIDER =
     IAaveProtocolDataProvider(0x65285E9dfab318f57051ab2b139ccCf232945451);
 
-  // https://snowtrace.io/address/0xa35b76E4935449E33C56aB24b23fcd3246f13470
-  address internal constant POOL_ADMIN = 0xa35b76E4935449E33C56aB24b23fcd3246f13470;
+  // https://snowtrace.io/address/0x3C06dce358add17aAf230f2234bCCC4afd50d090
+  address internal constant POOL_ADMIN = 0x3C06dce358add17aAf230f2234bCCC4afd50d090;
 
   // https://snowtrace.io/address/0xa35b76E4935449E33C56aB24b23fcd3246f13470
   address internal constant EMERGENCY_ADMIN = 0xa35b76E4935449E33C56aB24b23fcd3246f13470;
diff --git a/src/AaveV2Ethereum.sol b/src/AaveV2Ethereum.sol
index 7c214510..c5719e91 100644
--- a/src/AaveV2Ethereum.sol
+++ b/src/AaveV2Ethereum.sol
@@ -28,8 +28,8 @@ library AaveV2Ethereum {
   IAaveProtocolDataProvider internal constant AAVE_PROTOCOL_DATA_PROVIDER =
     IAaveProtocolDataProvider(0x057835Ad21a177dbdd3090bB1CAE03EaCF78Fc6d);
 
-  // https://etherscan.io/address/0xEE56e2B3D491590B5b31738cC34d5232F378a8D5
-  address internal constant POOL_ADMIN = 0xEE56e2B3D491590B5b31738cC34d5232F378a8D5;
+  // https://etherscan.io/address/0x5300A1a15135EA4dc7aD5a167152C01EFc9b192A
+  address internal constant POOL_ADMIN = 0x5300A1a15135EA4dc7aD5a167152C01EFc9b192A;
 
   // https://etherscan.io/address/0xCA76Ebd8617a03126B6FB84F9b1c1A0fB71C2633
   address internal constant EMERGENCY_ADMIN = 0xCA76Ebd8617a03126B6FB84F9b1c1A0fB71C2633;
diff --git a/src/AaveV2EthereumAMM.sol b/src/AaveV2EthereumAMM.sol
index 2e92cd2a..b3f5a686 100644
--- a/src/AaveV2EthereumAMM.sol
+++ b/src/AaveV2EthereumAMM.sol
@@ -28,8 +28,8 @@ library AaveV2EthereumAMM {
   IAaveProtocolDataProvider internal constant AAVE_PROTOCOL_DATA_PROVIDER =
     IAaveProtocolDataProvider(0x0000000000000000000000000000000000000000);
 
-  // https://etherscan.io/address/0xEE56e2B3D491590B5b31738cC34d5232F378a8D5
-  address internal constant POOL_ADMIN = 0xEE56e2B3D491590B5b31738cC34d5232F378a8D5;
+  // https://etherscan.io/address/0x5300A1a15135EA4dc7aD5a167152C01EFc9b192A
+  address internal constant POOL_ADMIN = 0x5300A1a15135EA4dc7aD5a167152C01EFc9b192A;
 
   // https://etherscan.io/address/0xB9062896ec3A615a4e4444DF183F0531a77218AE
   address internal constant EMERGENCY_ADMIN = 0xB9062896ec3A615a4e4444DF183F0531a77218AE;
diff --git a/src/AaveV2Polygon.sol b/src/AaveV2Polygon.sol
index 2c147069..e150da14 100644
--- a/src/AaveV2Polygon.sol
+++ b/src/AaveV2Polygon.sol
@@ -28,8 +28,8 @@ library AaveV2Polygon {
   IAaveProtocolDataProvider internal constant AAVE_PROTOCOL_DATA_PROVIDER =
     IAaveProtocolDataProvider(0x7551b5D2763519d4e37e8B81929D336De671d46d);
 
-  // https://polygonscan.com/address/0xdc9A35B16DB4e126cFeDC41322b3a36454B1F772
-  address internal constant POOL_ADMIN = 0xdc9A35B16DB4e126cFeDC41322b3a36454B1F772;
+  // https://polygonscan.com/address/0xDf7d0e6454DB638881302729F5ba99936EaAB233
+  address internal constant POOL_ADMIN = 0xDf7d0e6454DB638881302729F5ba99936EaAB233;
 
   // https://polygonscan.com/address/0x1450F2898D6bA2710C98BE9CAF3041330eD5ae58
   address internal constant EMERGENCY_ADMIN = 0x1450F2898D6bA2710C98BE9CAF3041330eD5ae58;
diff --git a/src/AaveV3Arbitrum.sol b/src/AaveV3Arbitrum.sol
index 35213949..e338ed26 100644
--- a/src/AaveV3Arbitrum.sol
+++ b/src/AaveV3Arbitrum.sol
@@ -31,8 +31,8 @@ library AaveV3Arbitrum {
   IACLManager internal constant ACL_MANAGER =
     IACLManager(0xa72636CbcAa8F5FF95B2cc47F3CDEe83F3294a0B);
 
-  // https://arbiscan.io/address/0x7d9103572bE58FfE99dc390E8246f02dcAe6f611
-  address internal constant ACL_ADMIN = 0x7d9103572bE58FfE99dc390E8246f02dcAe6f611;
+  // https://arbiscan.io/address/0xFF1137243698CaA18EE364Cc966CF0e02A4e6327
+  address internal constant ACL_ADMIN = 0xFF1137243698CaA18EE364Cc966CF0e02A4e6327;
 
   // https://arbiscan.io/address/0x053D55f9B5AF8694c503EB288a1B7E552f590710
   ICollector internal constant COLLECTOR = ICollector(0x053D55f9B5AF8694c503EB288a1B7E552f590710);
diff --git a/src/AaveV3Avalanche.sol b/src/AaveV3Avalanche.sol
index 3b91fb3f..5ac52a58 100644
--- a/src/AaveV3Avalanche.sol
+++ b/src/AaveV3Avalanche.sol
@@ -31,8 +31,8 @@ library AaveV3Avalanche {
   IACLManager internal constant ACL_MANAGER =
     IACLManager(0xa72636CbcAa8F5FF95B2cc47F3CDEe83F3294a0B);
 
-  // https://snowtrace.io/address/0xa35b76E4935449E33C56aB24b23fcd3246f13470
-  address internal constant ACL_ADMIN = 0xa35b76E4935449E33C56aB24b23fcd3246f13470;
+  // https://snowtrace.io/address/0x3C06dce358add17aAf230f2234bCCC4afd50d090
+  address internal constant ACL_ADMIN = 0x3C06dce358add17aAf230f2234bCCC4afd50d090;
 
   // https://snowtrace.io/address/0x5ba7fd868c40c16f7aDfAe6CF87121E13FC2F7a0
   ICollector internal constant COLLECTOR = ICollector(0x5ba7fd868c40c16f7aDfAe6CF87121E13FC2F7a0);
diff --git a/src/AaveV3Base.sol b/src/AaveV3Base.sol
index 88ea66e4..c4bbd439 100644
--- a/src/AaveV3Base.sol
+++ b/src/AaveV3Base.sol
@@ -31,8 +31,8 @@ library AaveV3Base {
   IACLManager internal constant ACL_MANAGER =
     IACLManager(0x43955b0899Ab7232E3a454cf84AedD22Ad46FD33);
 
-  // https://basescan.org/address/0xA9F30e6ED4098e9439B2ac8aEA2d3fc26BcEbb45
-  address internal constant ACL_ADMIN = 0xA9F30e6ED4098e9439B2ac8aEA2d3fc26BcEbb45;
+  // https://basescan.org/address/0x9390B1735def18560c509E2d0bc090E9d6BA257a
+  address internal constant ACL_ADMIN = 0x9390B1735def18560c509E2d0bc090E9d6BA257a;
 
   // https://basescan.org/address/0xBA9424d650A4F5c80a0dA641254d1AcCE2A37057
   ICollector internal constant COLLECTOR = ICollector(0xBA9424d650A4F5c80a0dA641254d1AcCE2A37057);
diff --git a/src/AaveV3Ethereum.sol b/src/AaveV3Ethereum.sol
index c0331088..a07c127d 100644
--- a/src/AaveV3Ethereum.sol
+++ b/src/AaveV3Ethereum.sol
@@ -31,8 +31,8 @@ library AaveV3Ethereum {
   IACLManager internal constant ACL_MANAGER =
     IACLManager(0xc2aaCf6553D20d1e9d78E365AAba8032af9c85b0);
 
-  // https://etherscan.io/address/0xEE56e2B3D491590B5b31738cC34d5232F378a8D5
-  address internal constant ACL_ADMIN = 0xEE56e2B3D491590B5b31738cC34d5232F378a8D5;
+  // https://etherscan.io/address/0x5300A1a15135EA4dc7aD5a167152C01EFc9b192A
+  address internal constant ACL_ADMIN = 0x5300A1a15135EA4dc7aD5a167152C01EFc9b192A;
 
   // https://etherscan.io/address/0x464C71f6c2F760DdA6093dCB91C24c39e5d6e18c
   ICollector internal constant COLLECTOR = ICollector(0x464C71f6c2F760DdA6093dCB91C24c39e5d6e18c);
diff --git a/src/AaveV3Metis.sol b/src/AaveV3Metis.sol
index 282d1435..1ef59e69 100644
--- a/src/AaveV3Metis.sol
+++ b/src/AaveV3Metis.sol
@@ -31,8 +31,8 @@ library AaveV3Metis {
   IACLManager internal constant ACL_MANAGER =
     IACLManager(0xcDCb65fc657B701a5100a12eFB663978E7e8fFB8);
 
-  // https://andromeda-explorer.metis.io/address/0x8EC77963068474a45016938Deb95E603Ca82a029
-  address internal constant ACL_ADMIN = 0x8EC77963068474a45016938Deb95E603Ca82a029;
+  // https://andromeda-explorer.metis.io/address/0x6fD45D32375d5aDB8D76275A3932c740F03a8718
+  address internal constant ACL_ADMIN = 0x6fD45D32375d5aDB8D76275A3932c740F03a8718;
 
   // https://andromeda-explorer.metis.io/address/0xB5b64c7E00374e766272f8B442Cd261412D4b118
   ICollector internal constant COLLECTOR = ICollector(0xB5b64c7E00374e766272f8B442Cd261412D4b118);
diff --git a/src/AaveV3Optimism.sol b/src/AaveV3Optimism.sol
index 2c053d5d..e2657b60 100644
--- a/src/AaveV3Optimism.sol
+++ b/src/AaveV3Optimism.sol
@@ -31,8 +31,8 @@ library AaveV3Optimism {
   IACLManager internal constant ACL_MANAGER =
     IACLManager(0xa72636CbcAa8F5FF95B2cc47F3CDEe83F3294a0B);
 
-  // https://explorer.optimism.io/address/0x7d9103572bE58FfE99dc390E8246f02dcAe6f611
-  address internal constant ACL_ADMIN = 0x7d9103572bE58FfE99dc390E8246f02dcAe6f611;
+  // https://explorer.optimism.io/address/0x746c675dAB49Bcd5BB9Dc85161f2d7Eb435009bf
+  address internal constant ACL_ADMIN = 0x746c675dAB49Bcd5BB9Dc85161f2d7Eb435009bf;
 
   // https://explorer.optimism.io/address/0xB2289E329D2F85F1eD31Adbb30eA345278F21bcf
   ICollector internal constant COLLECTOR = ICollector(0xB2289E329D2F85F1eD31Adbb30eA345278F21bcf);
diff --git a/src/AaveV3Polygon.sol b/src/AaveV3Polygon.sol
index acfce3f4..570bb29c 100644
--- a/src/AaveV3Polygon.sol
+++ b/src/AaveV3Polygon.sol
@@ -31,8 +31,8 @@ library AaveV3Polygon {
   IACLManager internal constant ACL_MANAGER =
     IACLManager(0xa72636CbcAa8F5FF95B2cc47F3CDEe83F3294a0B);
 
-  // https://polygonscan.com/address/0xdc9A35B16DB4e126cFeDC41322b3a36454B1F772
-  address internal constant ACL_ADMIN = 0xdc9A35B16DB4e126cFeDC41322b3a36454B1F772;
+  // https://polygonscan.com/address/0xDf7d0e6454DB638881302729F5ba99936EaAB233
+  address internal constant ACL_ADMIN = 0xDf7d0e6454DB638881302729F5ba99936EaAB233;
 
   // https://polygonscan.com/address/0xe8599F3cc5D38a9aD6F3684cd5CEa72f10Dbc383
   ICollector internal constant COLLECTOR = ICollector(0xe8599F3cc5D38a9aD6F3684cd5CEa72f10Dbc383);
diff --git a/src/ts/AaveAddressBook.ts b/src/ts/AaveAddressBook.ts
index 0cbdfddd..520ebcbb 100644
--- a/src/ts/AaveAddressBook.ts
+++ b/src/ts/AaveAddressBook.ts
@@ -73,3 +73,4 @@ export {IPayloadsControllerDataHelper_ABI} from './abis/IPayloadsControllerDataH
 export {IGovernanceDataHelper_ABI} from './abis/IGovernanceDataHelper';
 export {IMetaDelegateHelper_ABI} from './abis/IMetaDelegateHelper';
 export {IVotingMachineDataHelper_ABI} from './abis/IVotingMachineDataHelper';
+export {IUiPoolDataProvider_ABI} from './abis/IUiPoolDataProvider';
diff --git a/src/ts/AaveV2Avalanche.ts b/src/ts/AaveV2Avalanche.ts
index 07332d0d..f3a8de52 100644
--- a/src/ts/AaveV2Avalanche.ts
+++ b/src/ts/AaveV2Avalanche.ts
@@ -17,8 +17,8 @@ export const LENDING_RATE_ORACLE = '0xc34254642B504484465F38Cb1CC396d45a9c7c80';
 // IAaveProtocolDataProvider https://snowtrace.io/address/0x65285E9dfab318f57051ab2b139ccCf232945451
 export const AAVE_PROTOCOL_DATA_PROVIDER = '0x65285E9dfab318f57051ab2b139ccCf232945451';
 
-// https://snowtrace.io/address/0xa35b76E4935449E33C56aB24b23fcd3246f13470
-export const POOL_ADMIN = '0xa35b76E4935449E33C56aB24b23fcd3246f13470';
+// https://snowtrace.io/address/0x3C06dce358add17aAf230f2234bCCC4afd50d090
+export const POOL_ADMIN = '0x3C06dce358add17aAf230f2234bCCC4afd50d090';
 
 // https://snowtrace.io/address/0xa35b76E4935449E33C56aB24b23fcd3246f13470
 export const EMERGENCY_ADMIN = '0xa35b76E4935449E33C56aB24b23fcd3246f13470';
diff --git a/src/ts/AaveV2Ethereum.ts b/src/ts/AaveV2Ethereum.ts
index 4cb4bedb..82b842bd 100644
--- a/src/ts/AaveV2Ethereum.ts
+++ b/src/ts/AaveV2Ethereum.ts
@@ -17,8 +17,8 @@ export const LENDING_RATE_ORACLE = '0x8A32f49FFbA88aba6EFF96F45D8BD1D4b3f35c7D';
 // IAaveProtocolDataProvider https://etherscan.io/address/0x057835Ad21a177dbdd3090bB1CAE03EaCF78Fc6d
 export const AAVE_PROTOCOL_DATA_PROVIDER = '0x057835Ad21a177dbdd3090bB1CAE03EaCF78Fc6d';
 
-// https://etherscan.io/address/0xEE56e2B3D491590B5b31738cC34d5232F378a8D5
-export const POOL_ADMIN = '0xEE56e2B3D491590B5b31738cC34d5232F378a8D5';
+// https://etherscan.io/address/0x5300A1a15135EA4dc7aD5a167152C01EFc9b192A
+export const POOL_ADMIN = '0x5300A1a15135EA4dc7aD5a167152C01EFc9b192A';
 
 // https://etherscan.io/address/0xCA76Ebd8617a03126B6FB84F9b1c1A0fB71C2633
 export const EMERGENCY_ADMIN = '0xCA76Ebd8617a03126B6FB84F9b1c1A0fB71C2633';
diff --git a/src/ts/AaveV2EthereumAMM.ts b/src/ts/AaveV2EthereumAMM.ts
index db5a5594..d1b5e5aa 100644
--- a/src/ts/AaveV2EthereumAMM.ts
+++ b/src/ts/AaveV2EthereumAMM.ts
@@ -17,8 +17,8 @@ export const LENDING_RATE_ORACLE = '0x8A32f49FFbA88aba6EFF96F45D8BD1D4b3f35c7D';
 // IAaveProtocolDataProvider https://etherscan.io/address/0x0000000000000000000000000000000000000000
 export const AAVE_PROTOCOL_DATA_PROVIDER = '0x0000000000000000000000000000000000000000';
 
-// https://etherscan.io/address/0xEE56e2B3D491590B5b31738cC34d5232F378a8D5
-export const POOL_ADMIN = '0xEE56e2B3D491590B5b31738cC34d5232F378a8D5';
+// https://etherscan.io/address/0x5300A1a15135EA4dc7aD5a167152C01EFc9b192A
+export const POOL_ADMIN = '0x5300A1a15135EA4dc7aD5a167152C01EFc9b192A';
 
 // https://etherscan.io/address/0xB9062896ec3A615a4e4444DF183F0531a77218AE
 export const EMERGENCY_ADMIN = '0xB9062896ec3A615a4e4444DF183F0531a77218AE';
diff --git a/src/ts/AaveV2Polygon.ts b/src/ts/AaveV2Polygon.ts
index 88e5ac50..b59c91ea 100644
--- a/src/ts/AaveV2Polygon.ts
+++ b/src/ts/AaveV2Polygon.ts
@@ -17,8 +17,8 @@ export const LENDING_RATE_ORACLE = '0x17F73aEaD876CC4059089ff815EDA37052960dFB';
 // IAaveProtocolDataProvider https://polygonscan.com/address/0x7551b5D2763519d4e37e8B81929D336De671d46d
 export const AAVE_PROTOCOL_DATA_PROVIDER = '0x7551b5D2763519d4e37e8B81929D336De671d46d';
 
-// https://polygonscan.com/address/0xdc9A35B16DB4e126cFeDC41322b3a36454B1F772
-export const POOL_ADMIN = '0xdc9A35B16DB4e126cFeDC41322b3a36454B1F772';
+// https://polygonscan.com/address/0xDf7d0e6454DB638881302729F5ba99936EaAB233
+export const POOL_ADMIN = '0xDf7d0e6454DB638881302729F5ba99936EaAB233';
 
 // https://polygonscan.com/address/0x1450F2898D6bA2710C98BE9CAF3041330eD5ae58
 export const EMERGENCY_ADMIN = '0x1450F2898D6bA2710C98BE9CAF3041330eD5ae58';
diff --git a/src/ts/AaveV3Arbitrum.ts b/src/ts/AaveV3Arbitrum.ts
index 3c801a39..ac2b1970 100644
--- a/src/ts/AaveV3Arbitrum.ts
+++ b/src/ts/AaveV3Arbitrum.ts
@@ -20,8 +20,8 @@ export const AAVE_PROTOCOL_DATA_PROVIDER = '0x6b4E260b765B3cA1514e618C0215A6B783
 // IACLManager https://arbiscan.io/address/0xa72636CbcAa8F5FF95B2cc47F3CDEe83F3294a0B
 export const ACL_MANAGER = '0xa72636CbcAa8F5FF95B2cc47F3CDEe83F3294a0B';
 
-// https://arbiscan.io/address/0x7d9103572bE58FfE99dc390E8246f02dcAe6f611
-export const ACL_ADMIN = '0x7d9103572bE58FfE99dc390E8246f02dcAe6f611';
+// https://arbiscan.io/address/0xFF1137243698CaA18EE364Cc966CF0e02A4e6327
+export const ACL_ADMIN = '0xFF1137243698CaA18EE364Cc966CF0e02A4e6327';
 
 // ICollector https://arbiscan.io/address/0x053D55f9B5AF8694c503EB288a1B7E552f590710
 export const COLLECTOR = '0x053D55f9B5AF8694c503EB288a1B7E552f590710';
diff --git a/src/ts/AaveV3Avalanche.ts b/src/ts/AaveV3Avalanche.ts
index 46ae3d93..d723b91e 100644
--- a/src/ts/AaveV3Avalanche.ts
+++ b/src/ts/AaveV3Avalanche.ts
@@ -20,8 +20,8 @@ export const AAVE_PROTOCOL_DATA_PROVIDER = '0x50ddd0Cd4266299527d25De9CBb55fE0EB
 // IACLManager https://snowtrace.io/address/0xa72636CbcAa8F5FF95B2cc47F3CDEe83F3294a0B
 export const ACL_MANAGER = '0xa72636CbcAa8F5FF95B2cc47F3CDEe83F3294a0B';
 
-// https://snowtrace.io/address/0xa35b76E4935449E33C56aB24b23fcd3246f13470
-export const ACL_ADMIN = '0xa35b76E4935449E33C56aB24b23fcd3246f13470';
+// https://snowtrace.io/address/0x3C06dce358add17aAf230f2234bCCC4afd50d090
+export const ACL_ADMIN = '0x3C06dce358add17aAf230f2234bCCC4afd50d090';
 
 // ICollector https://snowtrace.io/address/0x5ba7fd868c40c16f7aDfAe6CF87121E13FC2F7a0
 export const COLLECTOR = '0x5ba7fd868c40c16f7aDfAe6CF87121E13FC2F7a0';
diff --git a/src/ts/AaveV3Base.ts b/src/ts/AaveV3Base.ts
index 00d032f3..135b49b9 100644
--- a/src/ts/AaveV3Base.ts
+++ b/src/ts/AaveV3Base.ts
@@ -20,8 +20,8 @@ export const AAVE_PROTOCOL_DATA_PROVIDER = '0x2d8A3C5677189723C4cB8873CfC9C8976F
 // IACLManager https://basescan.org/address/0x43955b0899Ab7232E3a454cf84AedD22Ad46FD33
 export const ACL_MANAGER = '0x43955b0899Ab7232E3a454cf84AedD22Ad46FD33';
 
-// https://basescan.org/address/0xA9F30e6ED4098e9439B2ac8aEA2d3fc26BcEbb45
-export const ACL_ADMIN = '0xA9F30e6ED4098e9439B2ac8aEA2d3fc26BcEbb45';
+// https://basescan.org/address/0x9390B1735def18560c509E2d0bc090E9d6BA257a
+export const ACL_ADMIN = '0x9390B1735def18560c509E2d0bc090E9d6BA257a';
 
 // ICollector https://basescan.org/address/0xBA9424d650A4F5c80a0dA641254d1AcCE2A37057
 export const COLLECTOR = '0xBA9424d650A4F5c80a0dA641254d1AcCE2A37057';
diff --git a/src/ts/AaveV3Ethereum.ts b/src/ts/AaveV3Ethereum.ts
index 67ad0dc4..96a844c6 100644
--- a/src/ts/AaveV3Ethereum.ts
+++ b/src/ts/AaveV3Ethereum.ts
@@ -20,8 +20,8 @@ export const AAVE_PROTOCOL_DATA_PROVIDER = '0x7B4EB56E7CD4b454BA8ff71E4518426369
 // IACLManager https://etherscan.io/address/0xc2aaCf6553D20d1e9d78E365AAba8032af9c85b0
 export const ACL_MANAGER = '0xc2aaCf6553D20d1e9d78E365AAba8032af9c85b0';
 
-// https://etherscan.io/address/0xEE56e2B3D491590B5b31738cC34d5232F378a8D5
-export const ACL_ADMIN = '0xEE56e2B3D491590B5b31738cC34d5232F378a8D5';
+// https://etherscan.io/address/0x5300A1a15135EA4dc7aD5a167152C01EFc9b192A
+export const ACL_ADMIN = '0x5300A1a15135EA4dc7aD5a167152C01EFc9b192A';
 
 // ICollector https://etherscan.io/address/0x464C71f6c2F760DdA6093dCB91C24c39e5d6e18c
 export const COLLECTOR = '0x464C71f6c2F760DdA6093dCB91C24c39e5d6e18c';
diff --git a/src/ts/AaveV3Metis.ts b/src/ts/AaveV3Metis.ts
index a90e077d..d9a80117 100644
--- a/src/ts/AaveV3Metis.ts
+++ b/src/ts/AaveV3Metis.ts
@@ -20,8 +20,8 @@ export const AAVE_PROTOCOL_DATA_PROVIDER = '0x99411FC17Ad1B56f49719E3850B2CDcc0f
 // IACLManager https://andromeda-explorer.metis.io/address/0xcDCb65fc657B701a5100a12eFB663978E7e8fFB8
 export const ACL_MANAGER = '0xcDCb65fc657B701a5100a12eFB663978E7e8fFB8';
 
-// https://andromeda-explorer.metis.io/address/0x8EC77963068474a45016938Deb95E603Ca82a029
-export const ACL_ADMIN = '0x8EC77963068474a45016938Deb95E603Ca82a029';
+// https://andromeda-explorer.metis.io/address/0x6fD45D32375d5aDB8D76275A3932c740F03a8718
+export const ACL_ADMIN = '0x6fD45D32375d5aDB8D76275A3932c740F03a8718';
 
 // ICollector https://andromeda-explorer.metis.io/address/0xB5b64c7E00374e766272f8B442Cd261412D4b118
 export const COLLECTOR = '0xB5b64c7E00374e766272f8B442Cd261412D4b118';
diff --git a/src/ts/AaveV3Optimism.ts b/src/ts/AaveV3Optimism.ts
index f6b6b2fd..fb0b5231 100644
--- a/src/ts/AaveV3Optimism.ts
+++ b/src/ts/AaveV3Optimism.ts
@@ -20,8 +20,8 @@ export const AAVE_PROTOCOL_DATA_PROVIDER = '0xd9Ca4878dd38B021583c1B669905592EAe
 // IACLManager https://explorer.optimism.io/address/0xa72636CbcAa8F5FF95B2cc47F3CDEe83F3294a0B
 export const ACL_MANAGER = '0xa72636CbcAa8F5FF95B2cc47F3CDEe83F3294a0B';
 
-// https://explorer.optimism.io/address/0x7d9103572bE58FfE99dc390E8246f02dcAe6f611
-export const ACL_ADMIN = '0x7d9103572bE58FfE99dc390E8246f02dcAe6f611';
+// https://explorer.optimism.io/address/0x746c675dAB49Bcd5BB9Dc85161f2d7Eb435009bf
+export const ACL_ADMIN = '0x746c675dAB49Bcd5BB9Dc85161f2d7Eb435009bf';
 
 // ICollector https://explorer.optimism.io/address/0xB2289E329D2F85F1eD31Adbb30eA345278F21bcf
 export const COLLECTOR = '0xB2289E329D2F85F1eD31Adbb30eA345278F21bcf';
diff --git a/src/ts/AaveV3Polygon.ts b/src/ts/AaveV3Polygon.ts
index c18dd12f..cf6408ac 100644
--- a/src/ts/AaveV3Polygon.ts
+++ b/src/ts/AaveV3Polygon.ts
@@ -20,8 +20,8 @@ export const AAVE_PROTOCOL_DATA_PROVIDER = '0x9441B65EE553F70df9C77d45d3283B6BC2
 // IACLManager https://polygonscan.com/address/0xa72636CbcAa8F5FF95B2cc47F3CDEe83F3294a0B
 export const ACL_MANAGER = '0xa72636CbcAa8F5FF95B2cc47F3CDEe83F3294a0B';
 
-// https://polygonscan.com/address/0xdc9A35B16DB4e126cFeDC41322b3a36454B1F772
-export const ACL_ADMIN = '0xdc9A35B16DB4e126cFeDC41322b3a36454B1F772';
+// https://polygonscan.com/address/0xDf7d0e6454DB638881302729F5ba99936EaAB233
+export const ACL_ADMIN = '0xDf7d0e6454DB638881302729F5ba99936EaAB233';
 
 // ICollector https://polygonscan.com/address/0xe8599F3cc5D38a9aD6F3684cd5CEa72f10Dbc383
 export const COLLECTOR = '0xe8599F3cc5D38a9aD6F3684cd5CEa72f10Dbc383';
diff --git a/scripts/abi/uipooldata_provider.ts b/src/ts/abis/IUiPoolDataProvider.ts
similarity index 68%
rename from scripts/abi/uipooldata_provider.ts
rename to src/ts/abis/IUiPoolDataProvider.ts
index 8fe05a0b..a3505919 100644
--- a/scripts/abi/uipooldata_provider.ts
+++ b/src/ts/abis/IUiPoolDataProvider.ts
@@ -1,40 +1,72 @@
-export const UI_POOL_DATA_PROVIDER_ABI = [
+// AUTOGENERATED - MANUALLY CHANGES WILL BE REVERTED BY THE GENERATOR
+export const IUiPoolDataProvider_ABI = [
   {
     inputs: [
       {
         internalType: 'contract IEACAggregatorProxy',
         name: '_networkBaseTokenPriceInUsdProxyAggregator',
         type: 'address',
+        components: [],
       },
       {
         internalType: 'contract IEACAggregatorProxy',
         name: '_marketReferenceCurrencyPriceInUsdProxyAggregator',
         type: 'address',
+        components: [],
       },
     ],
     stateMutability: 'nonpayable',
     type: 'constructor',
+    outputs: [],
   },
   {
     inputs: [],
-    name: 'ETH_CURRENCY_UNIT',
-    outputs: [{internalType: 'uint256', name: '', type: 'uint256'}],
     stateMutability: 'view',
     type: 'function',
+    name: 'ETH_CURRENCY_UNIT',
+    outputs: [
+      {
+        internalType: 'uint256',
+        name: '',
+        type: 'uint256',
+        components: [],
+      },
+    ],
   },
   {
     inputs: [],
-    name: 'MKR_ADDRESS',
-    outputs: [{internalType: 'address', name: '', type: 'address'}],
     stateMutability: 'view',
     type: 'function',
+    name: 'MKR_ADDRESS',
+    outputs: [
+      {
+        internalType: 'address',
+        name: '',
+        type: 'address',
+        components: [],
+      },
+    ],
   },
   {
-    inputs: [{internalType: 'bytes32', name: '_bytes32', type: 'bytes32'}],
-    name: 'bytes32ToString',
-    outputs: [{internalType: 'string', name: '', type: 'string'}],
+    inputs: [
+      {
+        internalType: 'bytes32',
+        name: '_bytes32',
+        type: 'bytes32',
+        components: [],
+      },
+    ],
     stateMutability: 'pure',
     type: 'function',
+    name: 'bytes32ToString',
+    outputs: [
+      {
+        internalType: 'string',
+        name: '',
+        type: 'string',
+        components: [],
+      },
+    ],
   },
   {
     inputs: [
@@ -42,273 +74,376 @@ export const UI_POOL_DATA_PROVIDER_ABI = [
         internalType: 'contract IPoolAddressesProvider',
         name: 'provider',
         type: 'address',
+        components: [],
       },
     ],
+    stateMutability: 'view',
+    type: 'function',
     name: 'getReservesData',
     outputs: [
       {
+        internalType: 'struct IUiPoolDataProviderV3.AggregatedReserveData[]',
+        name: '',
+        type: 'tuple[]',
         components: [
           {
             internalType: 'address',
             name: 'underlyingAsset',
             type: 'address',
+            components: [],
+          },
+          {
+            internalType: 'string',
+            name: 'name',
+            type: 'string',
+            components: [],
+          },
+          {
+            internalType: 'string',
+            name: 'symbol',
+            type: 'string',
+            components: [],
+          },
+          {
+            internalType: 'uint256',
+            name: 'decimals',
+            type: 'uint256',
+            components: [],
           },
-          {internalType: 'string', name: 'name', type: 'string'},
-          {internalType: 'string', name: 'symbol', type: 'string'},
-          {internalType: 'uint256', name: 'decimals', type: 'uint256'},
           {
             internalType: 'uint256',
             name: 'baseLTVasCollateral',
             type: 'uint256',
+            components: [],
           },
           {
             internalType: 'uint256',
             name: 'reserveLiquidationThreshold',
             type: 'uint256',
+            components: [],
           },
           {
             internalType: 'uint256',
             name: 'reserveLiquidationBonus',
             type: 'uint256',
+            components: [],
           },
           {
             internalType: 'uint256',
             name: 'reserveFactor',
             type: 'uint256',
+            components: [],
           },
           {
             internalType: 'bool',
             name: 'usageAsCollateralEnabled',
             type: 'bool',
+            components: [],
           },
           {
             internalType: 'bool',
             name: 'borrowingEnabled',
             type: 'bool',
+            components: [],
           },
           {
             internalType: 'bool',
             name: 'stableBorrowRateEnabled',
             type: 'bool',
+            components: [],
+          },
+          {
+            internalType: 'bool',
+            name: 'isActive',
+            type: 'bool',
+            components: [],
+          },
+          {
+            internalType: 'bool',
+            name: 'isFrozen',
+            type: 'bool',
+            components: [],
           },
-          {internalType: 'bool', name: 'isActive', type: 'bool'},
-          {internalType: 'bool', name: 'isFrozen', type: 'bool'},
           {
             internalType: 'uint128',
             name: 'liquidityIndex',
             type: 'uint128',
+            components: [],
           },
           {
             internalType: 'uint128',
             name: 'variableBorrowIndex',
             type: 'uint128',
+            components: [],
           },
           {
             internalType: 'uint128',
             name: 'liquidityRate',
             type: 'uint128',
+            components: [],
           },
           {
             internalType: 'uint128',
             name: 'variableBorrowRate',
             type: 'uint128',
+            components: [],
           },
           {
             internalType: 'uint128',
             name: 'stableBorrowRate',
             type: 'uint128',
+            components: [],
           },
           {
             internalType: 'uint40',
             name: 'lastUpdateTimestamp',
             type: 'uint40',
+            components: [],
           },
           {
             internalType: 'address',
             name: 'aTokenAddress',
             type: 'address',
+            components: [],
           },
           {
             internalType: 'address',
             name: 'stableDebtTokenAddress',
             type: 'address',
+            components: [],
           },
           {
             internalType: 'address',
             name: 'variableDebtTokenAddress',
             type: 'address',
+            components: [],
           },
           {
             internalType: 'address',
             name: 'interestRateStrategyAddress',
             type: 'address',
+            components: [],
           },
           {
             internalType: 'uint256',
             name: 'availableLiquidity',
             type: 'uint256',
+            components: [],
           },
           {
             internalType: 'uint256',
             name: 'totalPrincipalStableDebt',
             type: 'uint256',
+            components: [],
           },
           {
             internalType: 'uint256',
             name: 'averageStableRate',
             type: 'uint256',
+            components: [],
           },
           {
             internalType: 'uint256',
             name: 'stableDebtLastUpdateTimestamp',
             type: 'uint256',
+            components: [],
           },
           {
             internalType: 'uint256',
             name: 'totalScaledVariableDebt',
             type: 'uint256',
+            components: [],
           },
           {
             internalType: 'uint256',
             name: 'priceInMarketReferenceCurrency',
             type: 'uint256',
+            components: [],
           },
           {
             internalType: 'address',
             name: 'priceOracle',
             type: 'address',
+            components: [],
           },
           {
             internalType: 'uint256',
             name: 'variableRateSlope1',
             type: 'uint256',
+            components: [],
           },
           {
             internalType: 'uint256',
             name: 'variableRateSlope2',
             type: 'uint256',
+            components: [],
           },
           {
             internalType: 'uint256',
             name: 'stableRateSlope1',
             type: 'uint256',
+            components: [],
           },
           {
             internalType: 'uint256',
             name: 'stableRateSlope2',
             type: 'uint256',
+            components: [],
           },
           {
             internalType: 'uint256',
             name: 'baseStableBorrowRate',
             type: 'uint256',
+            components: [],
           },
           {
             internalType: 'uint256',
             name: 'baseVariableBorrowRate',
             type: 'uint256',
+            components: [],
           },
           {
             internalType: 'uint256',
             name: 'optimalUsageRatio',
             type: 'uint256',
+            components: [],
+          },
+          {
+            internalType: 'bool',
+            name: 'isPaused',
+            type: 'bool',
+            components: [],
           },
-          {internalType: 'bool', name: 'isPaused', type: 'bool'},
           {
             internalType: 'bool',
             name: 'isSiloedBorrowing',
             type: 'bool',
+            components: [],
           },
           {
             internalType: 'uint128',
             name: 'accruedToTreasury',
             type: 'uint128',
+            components: [],
+          },
+          {
+            internalType: 'uint128',
+            name: 'unbacked',
+            type: 'uint128',
+            components: [],
           },
-          {internalType: 'uint128', name: 'unbacked', type: 'uint128'},
           {
             internalType: 'uint128',
             name: 'isolationModeTotalDebt',
             type: 'uint128',
+            components: [],
           },
           {
             internalType: 'bool',
             name: 'flashLoanEnabled',
             type: 'bool',
+            components: [],
           },
           {
             internalType: 'uint256',
             name: 'debtCeiling',
             type: 'uint256',
+            components: [],
           },
           {
             internalType: 'uint256',
             name: 'debtCeilingDecimals',
             type: 'uint256',
+            components: [],
           },
           {
             internalType: 'uint8',
             name: 'eModeCategoryId',
             type: 'uint8',
+            components: [],
+          },
+          {
+            internalType: 'uint256',
+            name: 'borrowCap',
+            type: 'uint256',
+            components: [],
+          },
+          {
+            internalType: 'uint256',
+            name: 'supplyCap',
+            type: 'uint256',
+            components: [],
+          },
+          {
+            internalType: 'uint16',
+            name: 'eModeLtv',
+            type: 'uint16',
+            components: [],
           },
-          {internalType: 'uint256', name: 'borrowCap', type: 'uint256'},
-          {internalType: 'uint256', name: 'supplyCap', type: 'uint256'},
-          {internalType: 'uint16', name: 'eModeLtv', type: 'uint16'},
           {
             internalType: 'uint16',
             name: 'eModeLiquidationThreshold',
             type: 'uint16',
+            components: [],
           },
           {
             internalType: 'uint16',
             name: 'eModeLiquidationBonus',
             type: 'uint16',
+            components: [],
           },
           {
             internalType: 'address',
             name: 'eModePriceSource',
             type: 'address',
+            components: [],
+          },
+          {
+            internalType: 'string',
+            name: 'eModeLabel',
+            type: 'string',
+            components: [],
           },
-          {internalType: 'string', name: 'eModeLabel', type: 'string'},
           {
             internalType: 'bool',
             name: 'borrowableInIsolation',
             type: 'bool',
+            components: [],
           },
         ],
-        internalType: 'struct IUiPoolDataProviderV3.AggregatedReserveData[]',
-        name: '',
-        type: 'tuple[]',
       },
       {
+        internalType: 'struct IUiPoolDataProviderV3.BaseCurrencyInfo',
+        name: '',
+        type: 'tuple',
         components: [
           {
             internalType: 'uint256',
             name: 'marketReferenceCurrencyUnit',
             type: 'uint256',
+            components: [],
           },
           {
             internalType: 'int256',
             name: 'marketReferenceCurrencyPriceInUsd',
             type: 'int256',
+            components: [],
           },
           {
             internalType: 'int256',
             name: 'networkBaseTokenPriceInUsd',
             type: 'int256',
+            components: [],
           },
           {
             internalType: 'uint8',
             name: 'networkBaseTokenPriceDecimals',
             type: 'uint8',
+            components: [],
           },
         ],
-        internalType: 'struct IUiPoolDataProviderV3.BaseCurrencyInfo',
-        name: '',
-        type: 'tuple',
       },
     ],
-    stateMutability: 'view',
-    type: 'function',
   },
   {
     inputs: [
@@ -316,12 +451,20 @@ export const UI_POOL_DATA_PROVIDER_ABI = [
         internalType: 'contract IPoolAddressesProvider',
         name: 'provider',
         type: 'address',
+        components: [],
       },
     ],
-    name: 'getReservesList',
-    outputs: [{internalType: 'address[]', name: '', type: 'address[]'}],
     stateMutability: 'view',
     type: 'function',
+    name: 'getReservesList',
+    outputs: [
+      {
+        internalType: 'address[]',
+        name: '',
+        type: 'address[]',
+        components: [],
+      },
+    ],
   },
   {
     inputs: [
@@ -329,82 +472,102 @@ export const UI_POOL_DATA_PROVIDER_ABI = [
         internalType: 'contract IPoolAddressesProvider',
         name: 'provider',
         type: 'address',
+        components: [],
+      },
+      {
+        internalType: 'address',
+        name: 'user',
+        type: 'address',
+        components: [],
       },
-      {internalType: 'address', name: 'user', type: 'address'},
     ],
+    stateMutability: 'view',
+    type: 'function',
     name: 'getUserReservesData',
     outputs: [
       {
+        internalType: 'struct IUiPoolDataProviderV3.UserReserveData[]',
+        name: '',
+        type: 'tuple[]',
         components: [
           {
             internalType: 'address',
             name: 'underlyingAsset',
             type: 'address',
+            components: [],
           },
           {
             internalType: 'uint256',
             name: 'scaledATokenBalance',
             type: 'uint256',
+            components: [],
           },
           {
             internalType: 'bool',
             name: 'usageAsCollateralEnabledOnUser',
             type: 'bool',
+            components: [],
           },
           {
             internalType: 'uint256',
             name: 'stableBorrowRate',
             type: 'uint256',
+            components: [],
           },
           {
             internalType: 'uint256',
             name: 'scaledVariableDebt',
             type: 'uint256',
+            components: [],
           },
           {
             internalType: 'uint256',
             name: 'principalStableDebt',
             type: 'uint256',
+            components: [],
           },
           {
             internalType: 'uint256',
             name: 'stableBorrowLastUpdateTimestamp',
             type: 'uint256',
+            components: [],
           },
         ],
-        internalType: 'struct IUiPoolDataProviderV3.UserReserveData[]',
+      },
+      {
+        internalType: 'uint8',
         name: '',
-        type: 'tuple[]',
+        type: 'uint8',
+        components: [],
       },
-      {internalType: 'uint8', name: '', type: 'uint8'},
     ],
-    stateMutability: 'view',
-    type: 'function',
   },
   {
     inputs: [],
+    stateMutability: 'view',
+    type: 'function',
     name: 'marketReferenceCurrencyPriceInUsdProxyAggregator',
     outputs: [
       {
         internalType: 'contract IEACAggregatorProxy',
         name: '',
         type: 'address',
+        components: [],
       },
     ],
-    stateMutability: 'view',
-    type: 'function',
   },
   {
     inputs: [],
+    stateMutability: 'view',
+    type: 'function',
     name: 'networkBaseTokenPriceInUsdProxyAggregator',
     outputs: [
       {
         internalType: 'contract IEACAggregatorProxy',
         name: '',
         type: 'address',
+        components: [],
       },
     ],
-    stateMutability: 'view',
-    type: 'function',
   },
 ] as const;