diff --git a/package.json b/package.json
index d390b07c..b9fa03d2 100644
--- a/package.json
+++ b/package.json
@@ -47,6 +47,7 @@
   },
   "homepage": "https://github.com/bgd-labs/aave-address-book#readme",
   "devDependencies": {
+    "@bgd-labs/js-utils": "^1.0.6",
     "@types/node": "^20.10.5",
     "esbuild-plugin-file-path-extensions": "^2.0.0",
     "prettier": "^3.0.3",
@@ -54,6 +55,6 @@
     "tsup": "^8.0.1",
     "tsx": "^4.7.0",
     "typescript": "^5.3.3",
-    "viem": "^1.20.3"
+    "viem": "^2.0.10"
   }
 }
diff --git a/scripts/configs/governance/arbitrum.ts b/scripts/configs/governance/arbitrum.ts
index f2d95e5c..61af7b1d 100644
--- a/scripts/configs/governance/arbitrum.ts
+++ b/scripts/configs/governance/arbitrum.ts
@@ -1,4 +1,4 @@
-import {ChainId} from '../../generator/chains';
+import {ChainId} from '@bgd-labs/js-utils';
 import {GovernanceConfig} from '../types';
 
 export const governanceConfigArbitrum: GovernanceConfig = {
diff --git a/scripts/configs/governance/avalanche.ts b/scripts/configs/governance/avalanche.ts
index 6f41173f..62c19894 100644
--- a/scripts/configs/governance/avalanche.ts
+++ b/scripts/configs/governance/avalanche.ts
@@ -1,4 +1,4 @@
-import {ChainId} from '../../generator/chains';
+import {ChainId} from '@bgd-labs/js-utils';
 import {GovernanceConfig} from '../types';
 
 export const governanceConfigFuji: GovernanceConfig = {
diff --git a/scripts/configs/governance/base.ts b/scripts/configs/governance/base.ts
index a0e33bee..9f3c443b 100644
--- a/scripts/configs/governance/base.ts
+++ b/scripts/configs/governance/base.ts
@@ -1,5 +1,5 @@
 import {GovernanceConfig} from '../types';
-import {ChainId} from '../../generator/chains';
+import {ChainId} from '@bgd-labs/js-utils';
 
 export const governanceConfigBase: GovernanceConfig = {
   name: 'Base',
diff --git a/scripts/configs/governance/bnb.ts b/scripts/configs/governance/bnb.ts
index a34a8cb9..ba35e3c0 100644
--- a/scripts/configs/governance/bnb.ts
+++ b/scripts/configs/governance/bnb.ts
@@ -1,5 +1,5 @@
 import {GovernanceConfig} from '../types';
-import {ChainId} from '../../generator/chains';
+import {ChainId} from '@bgd-labs/js-utils';
 
 export const governanceConfigBNB: GovernanceConfig = {
   name: 'BNB',
diff --git a/scripts/configs/governance/ethereum.ts b/scripts/configs/governance/ethereum.ts
index 71c18ede..a24fdfd8 100644
--- a/scripts/configs/governance/ethereum.ts
+++ b/scripts/configs/governance/ethereum.ts
@@ -1,4 +1,4 @@
-import {ChainId} from '../../generator/chains';
+import {ChainId} from '@bgd-labs/js-utils';
 import {GovernanceConfig} from '../types';
 
 // OUTDATED ABI
diff --git a/scripts/configs/governance/gnosis.ts b/scripts/configs/governance/gnosis.ts
index b4d3bc56..4420723a 100644
--- a/scripts/configs/governance/gnosis.ts
+++ b/scripts/configs/governance/gnosis.ts
@@ -1,5 +1,5 @@
 import {GovernanceConfig} from '../types';
-import {ChainId} from '../../generator/chains';
+import {ChainId} from '@bgd-labs/js-utils';
 
 export const governanceConfigGnosis: GovernanceConfig = {
   name: 'Gnosis',
diff --git a/scripts/configs/governance/metis.ts b/scripts/configs/governance/metis.ts
index 026532d0..e868b1da 100644
--- a/scripts/configs/governance/metis.ts
+++ b/scripts/configs/governance/metis.ts
@@ -1,5 +1,5 @@
 import {GovernanceConfig} from '../types';
-import {ChainId} from '../../generator/chains';
+import {ChainId} from '@bgd-labs/js-utils';
 
 export const governanceConfigMetis: GovernanceConfig = {
   name: 'Metis',
diff --git a/scripts/configs/governance/optimism.ts b/scripts/configs/governance/optimism.ts
index c277786f..6e3a7288 100644
--- a/scripts/configs/governance/optimism.ts
+++ b/scripts/configs/governance/optimism.ts
@@ -1,4 +1,4 @@
-import {ChainId} from '../../generator/chains';
+import {ChainId} from '@bgd-labs/js-utils';
 import {GovernanceConfig} from '../types';
 
 export const governanceConfigOptimism: GovernanceConfig = {
diff --git a/scripts/configs/governance/polygon.ts b/scripts/configs/governance/polygon.ts
index b33c18b5..14ac568b 100644
--- a/scripts/configs/governance/polygon.ts
+++ b/scripts/configs/governance/polygon.ts
@@ -1,4 +1,4 @@
-import {ChainId} from '../../generator/chains';
+import {ChainId} from '@bgd-labs/js-utils';
 import {GovernanceConfig} from '../types';
 
 export const governanceConfigMumbai: GovernanceConfig = {
diff --git a/scripts/configs/governance/polygonZkEvm.ts b/scripts/configs/governance/polygonZkEvm.ts
index c9db3fa5..cb04f265 100644
--- a/scripts/configs/governance/polygonZkEvm.ts
+++ b/scripts/configs/governance/polygonZkEvm.ts
@@ -1,9 +1,9 @@
-import {ChainId} from '../../generator/chains';
+import {ChainId} from '@bgd-labs/js-utils';
 import {GovernanceConfig} from '../types';
 
 export const governanceConfigPolygonZkEvm: GovernanceConfig = {
   name: 'PolygonZkEvm',
-  CHAIN_ID: ChainId.zkevm,
+  CHAIN_ID: ChainId.zkEVM,
   ADDRESSES: {
     CROSS_CHAIN_CONTROLLER: '0xed7e0874526B9BB9E36C7e9472ed7ed324CEeE3B',
     PAYLOADS_CONTROLLER: '0xa2d22795E0D85D4Cb14Cbb14Df7bb8fec1016615',
diff --git a/scripts/configs/governance/scroll.ts b/scripts/configs/governance/scroll.ts
index d318e3a4..efd32299 100644
--- a/scripts/configs/governance/scroll.ts
+++ b/scripts/configs/governance/scroll.ts
@@ -1,4 +1,4 @@
-import {ChainId} from '../../generator/chains';
+import {ChainId} from '@bgd-labs/js-utils';
 import {GovernanceConfig} from '../types';
 
 export const governanceConfigScroll: GovernanceConfig = {
diff --git a/scripts/configs/networks/arbitrum.ts b/scripts/configs/networks/arbitrum.ts
index f0f00278..c4d987bc 100644
--- a/scripts/configs/networks/arbitrum.ts
+++ b/scripts/configs/networks/arbitrum.ts
@@ -1,4 +1,4 @@
-import {ChainId} from '../../generator/chains';
+import {ChainId} from '@bgd-labs/js-utils';
 import {NetworkAddresses} from '../types';
 
 export const arbitrumAddresses: NetworkAddresses = {
diff --git a/scripts/configs/networks/avalanche.ts b/scripts/configs/networks/avalanche.ts
index 6e9f470b..5049e4c5 100644
--- a/scripts/configs/networks/avalanche.ts
+++ b/scripts/configs/networks/avalanche.ts
@@ -1,4 +1,4 @@
-import {ChainId} from '../../generator/chains';
+import {ChainId} from '@bgd-labs/js-utils';
 import {NetworkAddresses} from '../types';
 
 export const avalancheAddresses: NetworkAddresses = {
diff --git a/scripts/configs/networks/base.ts b/scripts/configs/networks/base.ts
index 3fa3b3e0..9d2a96ac 100644
--- a/scripts/configs/networks/base.ts
+++ b/scripts/configs/networks/base.ts
@@ -1,4 +1,4 @@
-import {ChainId} from '../../generator/chains';
+import {ChainId} from '@bgd-labs/js-utils';
 import {NetworkAddresses} from '../types';
 
 export const baseAddresses: NetworkAddresses = {
diff --git a/scripts/configs/networks/bnb.ts b/scripts/configs/networks/bnb.ts
index 5a1986ed..5b3b3256 100644
--- a/scripts/configs/networks/bnb.ts
+++ b/scripts/configs/networks/bnb.ts
@@ -1,4 +1,4 @@
-import {ChainId} from '../../generator/chains';
+import {ChainId} from '@bgd-labs/js-utils';
 import {NetworkAddresses} from '../types';
 
 export const bnbAddresses: NetworkAddresses = {
diff --git a/scripts/configs/networks/ethereum.ts b/scripts/configs/networks/ethereum.ts
index a266b97a..1e67be72 100644
--- a/scripts/configs/networks/ethereum.ts
+++ b/scripts/configs/networks/ethereum.ts
@@ -1,5 +1,5 @@
 import {Hex} from 'viem';
-import {ChainId} from '../../generator/chains';
+import {ChainId} from '@bgd-labs/js-utils';
 import {AddressInfo, NetworkAddresses} from '../types';
 
 export const ethereumAddresses: NetworkAddresses<{
diff --git a/scripts/configs/networks/fantom.ts b/scripts/configs/networks/fantom.ts
index e8d5de1f..8cb75944 100644
--- a/scripts/configs/networks/fantom.ts
+++ b/scripts/configs/networks/fantom.ts
@@ -1,4 +1,4 @@
-import {ChainId} from '../../generator/chains';
+import {ChainId} from '@bgd-labs/js-utils';
 import {NetworkAddresses} from '../types';
 
 export const fantomAddresses: NetworkAddresses = {
diff --git a/scripts/configs/networks/gnosis.ts b/scripts/configs/networks/gnosis.ts
index 3216db0e..34c61994 100644
--- a/scripts/configs/networks/gnosis.ts
+++ b/scripts/configs/networks/gnosis.ts
@@ -1,4 +1,4 @@
-import {ChainId} from '../../generator/chains';
+import {ChainId} from '@bgd-labs/js-utils';
 import {NetworkAddresses} from '../types';
 
 export const gnosisAddresses: NetworkAddresses = {
diff --git a/scripts/configs/networks/metis.ts b/scripts/configs/networks/metis.ts
index 69b54ce2..8635227c 100644
--- a/scripts/configs/networks/metis.ts
+++ b/scripts/configs/networks/metis.ts
@@ -1,4 +1,4 @@
-import {ChainId} from '../../generator/chains';
+import {ChainId} from '@bgd-labs/js-utils';
 import {NetworkAddresses} from '../types';
 
 export const metisAddresses: NetworkAddresses = {
diff --git a/scripts/configs/networks/optimism.ts b/scripts/configs/networks/optimism.ts
index ee8d9230..f0c1fe85 100644
--- a/scripts/configs/networks/optimism.ts
+++ b/scripts/configs/networks/optimism.ts
@@ -1,4 +1,4 @@
-import {ChainId} from '../../generator/chains';
+import {ChainId} from '@bgd-labs/js-utils';
 import {NetworkAddresses} from '../types';
 
 export const optimismAddresses: NetworkAddresses = {
diff --git a/scripts/configs/networks/polygon.ts b/scripts/configs/networks/polygon.ts
index b4d75ccb..4fe6fe1f 100644
--- a/scripts/configs/networks/polygon.ts
+++ b/scripts/configs/networks/polygon.ts
@@ -1,5 +1,5 @@
 import {Hex} from 'viem';
-import {ChainId} from '../../generator/chains';
+import {ChainId} from '@bgd-labs/js-utils';
 import {NetworkAddresses} from '../types';
 
 export const polygonAddresses: NetworkAddresses<{AAVE_POL_ETH_BRIDGE: Hex}> = {
diff --git a/scripts/configs/networks/polygonZkEvm.ts b/scripts/configs/networks/polygonZkEvm.ts
index ba319642..55ea22d7 100644
--- a/scripts/configs/networks/polygonZkEvm.ts
+++ b/scripts/configs/networks/polygonZkEvm.ts
@@ -1,9 +1,9 @@
 import {NetworkAddresses} from '../types';
-import {ChainId} from '../../generator/chains';
+import {ChainId} from '@bgd-labs/js-utils';
 
 export const polygonZkEvmAddresses: NetworkAddresses = {
   name: 'PolygonZkEvm',
-  chainId: ChainId.zkevm,
+  chainId: ChainId.zkEVM,
   addresses: {
     PARASWAP_FEE_CLAIMER: '0xAe940e61E9863178b71500c9B5faE2a04Da361a1',
     TRANSPARENT_PROXY_FACTORY: '0x8B6851156023f4f5A66F68BEA80851c3D905Ac93',
diff --git a/scripts/configs/networks/scroll.ts b/scripts/configs/networks/scroll.ts
index ebd16835..0cb836cb 100644
--- a/scripts/configs/networks/scroll.ts
+++ b/scripts/configs/networks/scroll.ts
@@ -1,4 +1,4 @@
-import {ChainId} from '../../generator/chains';
+import {ChainId} from '@bgd-labs/js-utils';
 import {NetworkAddresses} from '../types';
 
 export const scrollAddresses: NetworkAddresses = {
diff --git a/scripts/configs/pools/arbitrum.ts b/scripts/configs/pools/arbitrum.ts
index d723aa28..a2794bc3 100644
--- a/scripts/configs/pools/arbitrum.ts
+++ b/scripts/configs/pools/arbitrum.ts
@@ -1,4 +1,4 @@
-import {ChainId} from '../../generator/chains';
+import {ChainId} from '@bgd-labs/js-utils';
 import {PoolConfig} from '../types';
 
 export const arbitrumGoerliProtoV3: PoolConfig = {
diff --git a/scripts/configs/pools/avalanche.ts b/scripts/configs/pools/avalanche.ts
index f6e8bf9c..212e228a 100644
--- a/scripts/configs/pools/avalanche.ts
+++ b/scripts/configs/pools/avalanche.ts
@@ -1,4 +1,4 @@
-import {ChainId} from '../../generator/chains';
+import {ChainId} from '@bgd-labs/js-utils';
 import {PoolConfig} from '../types';
 
 export const fujiProtoV2: PoolConfig = {
diff --git a/scripts/configs/pools/base.ts b/scripts/configs/pools/base.ts
index a1c9e9a1..047b2de0 100644
--- a/scripts/configs/pools/base.ts
+++ b/scripts/configs/pools/base.ts
@@ -1,4 +1,4 @@
-import {ChainId} from '../../generator/chains';
+import {ChainId} from '@bgd-labs/js-utils';
 import {PoolConfig} from '../types';
 
 export const baseProtoV3: PoolConfig = {
diff --git a/scripts/configs/pools/bnb.ts b/scripts/configs/pools/bnb.ts
index e63d51b4..b312ba10 100644
--- a/scripts/configs/pools/bnb.ts
+++ b/scripts/configs/pools/bnb.ts
@@ -1,4 +1,4 @@
-import {ChainId} from '../../generator/chains';
+import {ChainId} from '@bgd-labs/js-utils';
 import {PoolConfig} from '../types';
 
 export const bnbProtoV3: PoolConfig = {
diff --git a/scripts/configs/pools/ethereum.ts b/scripts/configs/pools/ethereum.ts
index 1bdc2b84..b6a279f5 100644
--- a/scripts/configs/pools/ethereum.ts
+++ b/scripts/configs/pools/ethereum.ts
@@ -1,4 +1,4 @@
-import {ChainId} from '../../generator/chains';
+import {ChainId} from '@bgd-labs/js-utils';
 import {PoolConfig} from '../types';
 
 export const goerliProtoV2Pool: PoolConfig = {
diff --git a/scripts/configs/pools/fantom.ts b/scripts/configs/pools/fantom.ts
index a3bd9dbc..7c0fa88f 100644
--- a/scripts/configs/pools/fantom.ts
+++ b/scripts/configs/pools/fantom.ts
@@ -1,4 +1,4 @@
-import {ChainId} from '../../generator/chains';
+import {ChainId} from '@bgd-labs/js-utils';
 import {PoolConfig} from '../types';
 
 export const fantomTestnetProtoV3: PoolConfig = {
diff --git a/scripts/configs/pools/gnosis.ts b/scripts/configs/pools/gnosis.ts
index 5cfb5ee5..adaf4789 100644
--- a/scripts/configs/pools/gnosis.ts
+++ b/scripts/configs/pools/gnosis.ts
@@ -1,4 +1,4 @@
-import {ChainId} from '../../generator/chains';
+import {ChainId} from '@bgd-labs/js-utils';
 import {PoolConfig} from '../types';
 
 export const gnosisProtoV3: PoolConfig = {
diff --git a/scripts/configs/pools/harmony.ts b/scripts/configs/pools/harmony.ts
index 189d77be..ed285e8c 100644
--- a/scripts/configs/pools/harmony.ts
+++ b/scripts/configs/pools/harmony.ts
@@ -1,4 +1,4 @@
-import {ChainId} from '../../generator/chains';
+import {ChainId} from '@bgd-labs/js-utils';
 import {PoolConfig} from '../types';
 
 export const harmonyProtoV3: PoolConfig = {
diff --git a/scripts/configs/pools/metis.ts b/scripts/configs/pools/metis.ts
index e39e8328..fb6fcf97 100644
--- a/scripts/configs/pools/metis.ts
+++ b/scripts/configs/pools/metis.ts
@@ -1,4 +1,4 @@
-import {ChainId} from '../../generator/chains';
+import {ChainId} from '@bgd-labs/js-utils';
 import {PoolConfig} from '../types';
 
 export const metisProtoV3: PoolConfig = {
diff --git a/scripts/configs/pools/optimism.ts b/scripts/configs/pools/optimism.ts
index 5d5f6a18..c6348257 100644
--- a/scripts/configs/pools/optimism.ts
+++ b/scripts/configs/pools/optimism.ts
@@ -1,4 +1,4 @@
-import {ChainId} from '../../generator/chains';
+import {ChainId} from '@bgd-labs/js-utils';
 import {PoolConfig} from '../types';
 
 export const optimismGoerliProtoV3: PoolConfig = {
diff --git a/scripts/configs/pools/polygon.ts b/scripts/configs/pools/polygon.ts
index e86a87b5..ae24f573 100644
--- a/scripts/configs/pools/polygon.ts
+++ b/scripts/configs/pools/polygon.ts
@@ -1,4 +1,4 @@
-import {ChainId} from '../../generator/chains';
+import {ChainId} from '@bgd-labs/js-utils';
 import {PoolConfig} from '../types';
 
 export const mumbaiProtoV2: PoolConfig = {
diff --git a/scripts/configs/pools/polygonZkEvm.ts b/scripts/configs/pools/polygonZkEvm.ts
index 2f5d4f74..18fd2939 100644
--- a/scripts/configs/pools/polygonZkEvm.ts
+++ b/scripts/configs/pools/polygonZkEvm.ts
@@ -1,9 +1,9 @@
-import {ChainId} from '../../generator/chains';
+import {ChainId} from '@bgd-labs/js-utils';
 import {PoolConfig} from '../types';
 
 export const polygonZkEvmProtoV3: PoolConfig = {
   name: 'PolygonZkEvm',
-  chainId: ChainId.zkevm,
+  chainId: ChainId.zkEVM,
   POOL_ADDRESSES_PROVIDER: '0x36616cf17557639614c1cdDb356b1B83fc0B2132',
   additionalAddresses: {
     L2_ENCODER: '0x777fBA024bA1228fDa76149A4ff8B23475ed057D',
diff --git a/scripts/configs/pools/scroll.ts b/scripts/configs/pools/scroll.ts
index 7e1765e3..f6494e27 100644
--- a/scripts/configs/pools/scroll.ts
+++ b/scripts/configs/pools/scroll.ts
@@ -1,20 +1,6 @@
-import {ChainId} from '../../generator/chains';
+import {ChainId} from '@bgd-labs/js-utils';
 import {PoolConfig} from '../types';
 
-export const scrollAlphaProtoV3: PoolConfig = {
-  name: 'ScrollAlpha',
-  chainId: ChainId.scroll_alpha,
-  POOL_ADDRESSES_PROVIDER: '0x52A27dC690F8652288194Dd2bc523863eBdEa236',
-  additionalAddresses: {
-    FAUCET: '0x357A307A8036D54b454BD15B3B1A0fE4B9e8A561',
-    L2_ENCODER: '0x3Bb33c67908D0d58F8d7349cBe726ff3b059e0fC',
-    UI_INCENTIVE_DATA_PROVIDER: '0xBf67A725F976d4A7C1fa9ea5303FD57D13CA0A37',
-    UI_POOL_DATA_PROVIDER: '0xDC55BcFC0963608401A4bA6298624E5895f8250a',
-    WALLET_BALANCE_PROVIDER: '0x6c68e975764a56e62AF3d1C8209F789779Eb763B',
-    WETH_GATEWAY: '0x57ce905CfD7f986A929A26b006f797d181dB706e',
-  },
-};
-
 export const scrollSepoliaProtoV3: PoolConfig = {
   name: 'ScrollSepolia',
   chainId: ChainId.scroll_sepolia,
@@ -43,7 +29,7 @@ export const scrollProtoV3: PoolConfig = {
     UI_INCENTIVE_DATA_PROVIDER: '0x9E7DF170E44093d6738057157CA048794B02555d',
     UI_POOL_DATA_PROVIDER: '0x29CF7aC4Fc122085c0D4DE8894f878F0b141F799',
     WALLET_BALANCE_PROVIDER: '0x07D04EfAAA0Ac69D19d107795aF247C42Eb50F1C',
-    WETH_GATEWAY: '0x93c597e5229f76679d7646cC9161B59Cc0DE78B9'
+    WETH_GATEWAY: '0x93c597e5229f76679d7646cC9161B59Cc0DE78B9',
   },
   initial: {
     COLLECTOR: '0x83a9EFE0485e7C227F29fe376132EfF746B45E96',
diff --git a/scripts/configs/types.ts b/scripts/configs/types.ts
index c5649cfc..d3a23548 100644
--- a/scripts/configs/types.ts
+++ b/scripts/configs/types.ts
@@ -1,5 +1,5 @@
 import {Hex} from 'viem';
-import {ChainId} from '../generator/chains';
+import {ChainId} from '@bgd-labs/js-utils';
 
 interface KnownInterfaces<T extends number | Hex = any> {
   value: T;
diff --git a/scripts/generateAddresses.ts b/scripts/generateAddresses.ts
index abd53195..da10d1e6 100644
--- a/scripts/generateAddresses.ts
+++ b/scripts/generateAddresses.ts
@@ -30,7 +30,7 @@ import {
   polygonProtoV2,
   polygonProtoV3,
 } from './configs/pools/polygon';
-import {scrollAlphaProtoV3, scrollSepoliaProtoV3, scrollProtoV3} from './configs/pools/scroll';
+import {scrollSepoliaProtoV3, scrollProtoV3} from './configs/pools/scroll';
 import {generateGovernanceLibrary} from './generator/governanceV3Generator';
 import {generateProtocolV2Library} from './generator/protocolV2Generator';
 import {generateProtocolV3Library} from './generator/protocolV3Generator';
@@ -67,7 +67,7 @@ async function main() {
   if (existsSync('./src/ts')) {
     const files = readdirSync('./src/ts');
     for (const file of files) {
-      if (file !== 'abis') rmSync(`./src/ts/${file}`);
+      if (file !== 'abis' && file !== 'AaveV3Harmony.ts') rmSync(`./src/ts/${file}`);
     }
   } else {
     mkdirSync('./src/ts');
@@ -123,11 +123,10 @@ async function main() {
       optimismGoerliProtoV3,
       optimismProtoV3,
       scrollProtoV3,
-      scrollAlphaProtoV3,
       scrollSepoliaProtoV3,
       fantomTestnetProtoV3,
       fantomProtoV3,
-      harmonyProtoV3,
+      // harmonyProtoV3,
     ].map((config) => generateProtocolV3Library(config)),
   );
 
@@ -164,7 +163,10 @@ async function main() {
     abis,
   ].flat();
 
-  const jsExports = imports.map((f) => f.js).flat();
+  const jsExports = [
+    ...imports.map((f) => f.js).flat(),
+    "export * as AaveV3Harmony from './AaveV3Harmony';",
+  ];
   writeFileSync(`./src/ts/AaveAddressBook.ts`, prefixWithGeneratedWarning(''));
   jsExports.map((jsExport) => appendFileSync('./src/ts/AaveAddressBook.ts', `${jsExport}\n`));
 
diff --git a/scripts/generator/assetsLibraryGenerator.ts b/scripts/generator/assetsLibraryGenerator.ts
index afa15135..bc278f7a 100644
--- a/scripts/generator/assetsLibraryGenerator.ts
+++ b/scripts/generator/assetsLibraryGenerator.ts
@@ -1,7 +1,7 @@
 import {Hex, zeroAddress} from 'viem';
 import {ReserveData} from '../configs/types';
 import {generateSolidityConstants, wrapIntoSolidityLibrary} from './utils';
-import {ChainId} from './chains';
+import {ChainId} from '@bgd-labs/js-utils';
 
 /**
  * As symbols are used as variable name in Solidity and Javascript there are certain characters that are not allowed and should be replaced.
diff --git a/scripts/generator/chains.ts b/scripts/generator/chains.ts
deleted file mode 100644
index a0bddc88..00000000
--- a/scripts/generator/chains.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-export enum ChainId {
-  mainnet = 1,
-  ropsten = 3,
-  rinkeby = 4,
-  goerli = 5,
-  xdai = 100,
-  polygon = 137,
-  mumbai = 80001,
-  avalanche = 43114,
-  fuji = 43113,
-  arbitrum_one = 42161,
-  arbitrum_goerli = 421613,
-  fantom = 250,
-  fantom_testnet = 4002,
-  optimism = 10,
-  optimism_goerli = 420,
-  harmony = 1666600000,
-  sepolia = 11155111,
-  scroll = 534352,
-  scroll_alpha = 534353,
-  scroll_sepolia = 534351,
-  metis = 1088,
-  base = 8453,
-  bnb = 56,
-  gnosis = 100,
-  zkevm = 1101,
-}
diff --git a/scripts/generator/clients.ts b/scripts/generator/clients.ts
deleted file mode 100644
index 776f8d0b..00000000
--- a/scripts/generator/clients.ts
+++ /dev/null
@@ -1,186 +0,0 @@
-import {createPublicClient, fallback, http} from 'viem';
-import {
-  mainnet,
-  goerli,
-  polygonMumbai,
-  polygon,
-  avalancheFuji,
-  arbitrum,
-  arbitrumGoerli,
-  harmonyOne,
-  optimism,
-  optimismGoerli,
-  fantom,
-  fantomTestnet,
-  scroll,
-  scrollTestnet,
-  scrollSepolia,
-  metis,
-  sepolia,
-  avalanche,
-  base,
-  bsc,
-  gnosis,
-  polygonZkEvm,
-} from 'viem/chains';
-import {ChainId} from './chains';
-
-export const RPC_PROVIDERS = {
-  [ChainId.mainnet]: createPublicClient({
-    chain: mainnet,
-    transport: http(process.env.RPC_MAINNET),
-    batch: {
-      multicall: true,
-    },
-  }),
-  [ChainId.goerli]: createPublicClient({
-    chain: goerli,
-    transport: http(),
-    batch: {
-      multicall: true,
-    },
-  }),
-  [ChainId.mumbai]: createPublicClient({
-    chain: polygonMumbai,
-    transport: fallback([
-      http('https://endpoints.omniatech.io/v1/matic/mumbai/public'),
-      http('https://polygon-mumbai-bor.publicnode.com'),
-    ]),
-    batch: {
-      multicall: true,
-    },
-  }),
-  [ChainId.polygon]: createPublicClient({
-    chain: polygon,
-    transport: http(process.env.RPC_POLYGON),
-    batch: {
-      multicall: true,
-    },
-  }),
-  [ChainId.fuji]: createPublicClient({
-    chain: avalancheFuji,
-    transport: http(),
-    batch: {
-      multicall: true,
-    },
-  }),
-  [ChainId.avalanche]: createPublicClient({
-    chain: avalanche,
-    transport: http(process.env.RPC_AVALANCHE),
-    batch: {
-      multicall: true,
-    },
-  }),
-  [ChainId.arbitrum_one]: createPublicClient({
-    chain: arbitrum,
-    transport: http(process.env.RPC_ARBITRUM),
-    batch: {
-      multicall: true,
-    },
-  }),
-  [ChainId.arbitrum_goerli]: createPublicClient({
-    chain: arbitrumGoerli,
-    transport: http(),
-    batch: {
-      multicall: true,
-    },
-  }),
-  [ChainId.harmony]: createPublicClient({
-    chain: harmonyOne,
-    transport: http(),
-    batch: {
-      multicall: true,
-    },
-  }),
-  [ChainId.optimism]: createPublicClient({
-    chain: optimism,
-    transport: http(process.env.RPC_OPTIMISM),
-    batch: {
-      multicall: true,
-    },
-  }),
-  [ChainId.optimism_goerli]: createPublicClient({
-    chain: optimismGoerli,
-    transport: http('https://optimism-goerli.publicnode.com	'),
-    batch: {
-      multicall: true,
-    },
-  }),
-  [ChainId.fantom]: createPublicClient({
-    chain: fantom,
-    transport: http(),
-    batch: {
-      multicall: true,
-    },
-  }),
-  [ChainId.fantom_testnet]: createPublicClient({
-    chain: fantomTestnet,
-    transport: http(),
-    batch: {
-      multicall: true,
-    },
-  }),
-  [ChainId.sepolia]: createPublicClient({
-    chain: sepolia,
-    transport: http('https://ethereum-sepolia.publicnode.com'),
-    batch: {
-      multicall: true,
-    },
-  }),
-  [ChainId.scroll_alpha]: createPublicClient({
-    chain: scrollTestnet,
-    transport: http(),
-    batch: {
-      multicall: true,
-    },
-  }),
-  [ChainId.scroll_sepolia]: createPublicClient({
-    chain: scrollSepolia,
-    transport: http(),
-    batch: {
-      multicall: true,
-    },
-  }),
-  [ChainId.metis]: createPublicClient({
-    chain: metis,
-    transport: http(),
-    batch: {
-      multicall: true,
-    },
-  }),
-  [ChainId.base]: createPublicClient({
-    chain: base,
-    transport: http(),
-    batch: {
-      multicall: true,
-    },
-  }),
-  [ChainId.bnb]: createPublicClient({
-    chain: bsc,
-    transport: http(),
-    batch: {
-      multicall: true,
-    },
-  }),
-  [ChainId.gnosis]: createPublicClient({
-    chain: gnosis,
-    transport: http(process.env.RPC_GNOSIS),
-    batch: {
-      multicall: true,
-    },
-  }),
-  [ChainId.scroll]: createPublicClient({
-    chain: scroll,
-    transport: http(process.env.RPC_SCROLL),
-    batch: {
-      multicall: true,
-    },
-  }),
-  [ChainId.zkevm]: createPublicClient({
-    chain: polygonZkEvm,
-    transport: http(),
-    batch: {
-      multicall: true,
-    },
-  }),
-} as const;
diff --git a/scripts/generator/governanceV2Generator.ts b/scripts/generator/governanceV2Generator.ts
index 6c67604c..743939c6 100644
--- a/scripts/generator/governanceV2Generator.ts
+++ b/scripts/generator/governanceV2Generator.ts
@@ -7,7 +7,7 @@ import {
   prefixWithPragma,
   wrapIntoSolidityLibrary,
 } from './utils';
-import {ChainId} from './chains';
+import {ChainId} from '@bgd-labs/js-utils';
 
 const govV2Addresses: Addresses = {
   GOV: {value: '0xEC568fffba86c094cf06b22134B23074DFE2252c', type: 'IAaveGovernanceV2'},
diff --git a/scripts/generator/governanceV3Generator.ts b/scripts/generator/governanceV3Generator.ts
index bae1ca20..9c2cbfd6 100644
--- a/scripts/generator/governanceV3Generator.ts
+++ b/scripts/generator/governanceV3Generator.ts
@@ -1,7 +1,6 @@
 import {writeFileSync} from 'fs';
 import {Hex, PublicClient, getContract, Address} from 'viem';
 import {Addresses, GovernanceConfig} from '../configs/types';
-import {RPC_PROVIDERS} from './clients';
 import {
   generateJsConstants,
   generateSolidityConstants,
@@ -13,6 +12,7 @@ import {IGovernanceCore_ABI} from '../../src/ts/abis/IGovernanceCore';
 import {IPayloadsControllerCore_ABI} from '../../src/ts/abis/IPayloadsControllerCore';
 import {IVotingStrategy_ABI} from '../../src/ts/abis/IVotingStrategy';
 import {IVotingMachineWithProofs_ABI} from '../../src/ts/abis/IVotingMachineWithProofs';
+import {CHAIN_ID_CLIENT_MAP} from '@bgd-labs/js-utils';
 
 type ExecutorsV3 = {
   EXECUTOR_LVL_1: Hex;
@@ -20,13 +20,13 @@ type ExecutorsV3 = {
 };
 
 async function fetchV3ExecutorAddresses(
-  publicClient: PublicClient,
+  client: PublicClient,
   payloadsController: Hex,
 ): Promise<ExecutorsV3> {
   const payloadsControllerContract = getContract({
     address: payloadsController,
     abi: IPayloadsControllerCore_ABI,
-    publicClient,
+    client,
   });
 
   const [executorLvl1, executorLvl2] = await Promise.all([
@@ -39,18 +39,18 @@ async function fetchV3ExecutorAddresses(
   };
 }
 
-async function getVotingStrategyAndWarehouse(votingMachine: Address, publicClient: PublicClient) {
+async function getVotingStrategyAndWarehouse(votingMachine: Address, client: PublicClient) {
   const votingMachineContract = getContract({
     address: votingMachine,
     abi: IVotingMachineWithProofs_ABI,
-    publicClient,
+    client,
   });
 
   const votingStrategy = await votingMachineContract.read.VOTING_STRATEGY();
   const votingStrategyContract = getContract({
     address: votingStrategy,
     abi: IVotingStrategy_ABI,
-    publicClient,
+    client,
   });
   const warehouse = await votingStrategyContract.read.DATA_WAREHOUSE();
   return {
@@ -59,13 +59,13 @@ async function getVotingStrategyAndWarehouse(votingMachine: Address, publicClien
   };
 }
 
-function getGovernancePowerStrategy(governance: Address, publicClient: PublicClient) {
+function getGovernancePowerStrategy(governance: Address, client: PublicClient) {
   if (!governance) throw new Error('trying to fetch power strategy from address 0');
 
   const governanceContract = getContract({
     address: governance,
     abi: IGovernanceCore_ABI,
-    publicClient,
+    client,
   });
 
   return governanceContract.read.getPowerStrategy();
@@ -74,17 +74,16 @@ function getGovernancePowerStrategy(governance: Address, publicClient: PublicCli
 async function getGovernanceV3Addresses({CHAIN_ID, ADDRESSES}: GovernanceConfig) {
   let addresses: Addresses = {...ADDRESSES};
   if (ADDRESSES.GOVERNANCE) {
-    // TODO: comment back in when governance v3 is live
-    // addresses.GOVERNANCE_POWER_STRATEGY = await getGovernancePowerStrategy(
-    //   ADDRESSES.GOVERNANCE,
-    //   RPC_PROVIDERS[CHAIN_ID],
-    // );
+    addresses.GOVERNANCE_POWER_STRATEGY = await getGovernancePowerStrategy(
+      ADDRESSES.GOVERNANCE,
+      CHAIN_ID_CLIENT_MAP[CHAIN_ID],
+    );
     addresses.GOVERNANCE = {value: addresses.GOVERNANCE, type: 'IGovernanceCore'};
   }
 
   if (ADDRESSES.PAYLOADS_CONTROLLER) {
     const executors = await fetchV3ExecutorAddresses(
-      RPC_PROVIDERS[CHAIN_ID],
+      CHAIN_ID_CLIENT_MAP[CHAIN_ID],
       ADDRESSES.PAYLOADS_CONTROLLER,
     );
     addresses.PAYLOADS_CONTROLLER = {
@@ -96,7 +95,7 @@ async function getGovernanceV3Addresses({CHAIN_ID, ADDRESSES}: GovernanceConfig)
   if (ADDRESSES.VOTING_MACHINE) {
     const strategyAndWareHouse = await getVotingStrategyAndWarehouse(
       ADDRESSES.VOTING_MACHINE,
-      RPC_PROVIDERS[CHAIN_ID],
+      CHAIN_ID_CLIENT_MAP[CHAIN_ID],
     );
     addresses = {...addresses, ...strategyAndWareHouse};
   }
diff --git a/scripts/generator/protocolV2Generator.ts b/scripts/generator/protocolV2Generator.ts
index 59ec96c5..cfe4351a 100644
--- a/scripts/generator/protocolV2Generator.ts
+++ b/scripts/generator/protocolV2Generator.ts
@@ -1,6 +1,6 @@
 import {Hex, PublicClient, getContract} from 'viem';
 import {AddressInfo, PoolConfig, ReserveData} from '../configs/types';
-import {RPC_PROVIDERS} from './clients';
+import {CHAIN_ID_CLIENT_MAP} from '@bgd-labs/js-utils';
 import {appendFileSync, writeFileSync} from 'fs';
 import {
   generateJsConstants,
@@ -34,7 +34,7 @@ export interface PoolV2Addresses {
 }
 
 async function getAdditionalTokenInfo(
-  publicClient: PublicClient,
+  client: PublicClient,
   pool: Hex,
   reservesData: PoolV2Addresses['reservesData'],
 ): Promise<{
@@ -47,7 +47,7 @@ async function getAdditionalTokenInfo(
     const aTokenContract = getContract({
       address: reservesData[0].A_TOKEN,
       abi: A_TOKEN_V2_ABI,
-      publicClient,
+      client,
     });
     const COLLECTOR = await aTokenContract.read.RESERVE_TREASURY_ADDRESS();
 
@@ -58,14 +58,14 @@ async function getAdditionalTokenInfo(
     const lendingPoolContract = getContract({
       address: pool,
       abi: LENDING_POOL_V2_ABI,
-      publicClient,
+      client,
     });
     const reserves = await lendingPoolContract.read.getReservesList();
     const data = await lendingPoolContract.read.getReserveData([reserves[0]]);
     const aTokenContract = getContract({
       address: data.aTokenAddress,
       abi: A_TOKEN_V2_ABI,
-      publicClient,
+      client,
     });
     const collector = await aTokenContract.read.RESERVE_TREASURY_ADDRESS();
     return {
@@ -75,11 +75,11 @@ async function getAdditionalTokenInfo(
 }
 
 export async function getPoolV2Addresses(pool: PoolConfig): Promise<PoolV2Addresses> {
-  const publicClient = RPC_PROVIDERS[pool.chainId] as PublicClient;
+  const client = CHAIN_ID_CLIENT_MAP[pool.chainId] as PublicClient;
   const addressProviderContract = getContract({
     address: pool.POOL_ADDRESSES_PROVIDER,
     abi: ADDRESS_PROVIDER_V2_ABI,
-    publicClient,
+    client,
   });
   try {
     const [
@@ -113,7 +113,7 @@ export async function getPoolV2Addresses(pool: PoolConfig): Promise<PoolV2Addres
       const uiPoolDataProvider = getContract({
         address: pool.additionalAddresses.UI_POOL_DATA_PROVIDER,
         abi: IUiPoolDataProvider_ABI,
-        publicClient,
+        client,
       });
       reservesData = (
         await uiPoolDataProvider.read.getReservesData([pool.POOL_ADDRESSES_PROVIDER])
@@ -131,13 +131,13 @@ export async function getPoolV2Addresses(pool: PoolConfig): Promise<PoolV2Addres
       });
     }
 
-    const {COLLECTOR, ...rest} = await getAdditionalTokenInfo(publicClient, POOL, reservesData);
+    const {COLLECTOR, ...rest} = await getAdditionalTokenInfo(client, POOL, reservesData);
 
     // Note: needed as i didn't find an upto date uipooldataprovider for arc
     const lendingPoolContract = getContract({
       address: POOL,
       abi: LENDING_POOL_V2_ABI,
-      publicClient,
+      client,
     });
     const reserves = await lendingPoolContract.read.getReservesList();
     const data = await lendingPoolContract.read.getReserveData([reserves[0]]);
@@ -148,7 +148,7 @@ export async function getPoolV2Addresses(pool: PoolConfig): Promise<PoolV2Addres
     const aTokenContract = getContract({
       address: data.aTokenAddress,
       abi: A_TOKEN_V2_ABI,
-      publicClient,
+      client,
     });
 
     const DEFAULT_INCENTIVES_CONTROLLER = await aTokenContract.read.getIncentivesController();
@@ -158,7 +158,7 @@ export async function getPoolV2Addresses(pool: PoolConfig): Promise<PoolV2Addres
       const incentivesControllerContract = getContract({
         address: DEFAULT_INCENTIVES_CONTROLLER,
         abi: INCENTIVES_CONTROLLER_ABI,
-        publicClient,
+        client,
       });
       EMISSION_MANAGER = await incentivesControllerContract.read.EMISSION_MANAGER();
     } catch (e) {
diff --git a/scripts/generator/protocolV3Generator.ts b/scripts/generator/protocolV3Generator.ts
index 30188acc..164019d5 100644
--- a/scripts/generator/protocolV3Generator.ts
+++ b/scripts/generator/protocolV3Generator.ts
@@ -6,7 +6,7 @@ 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';
 import {STABLE_DEBT_TOKEN_ABI} from '../abi/stableDebtToken_v3_abi';
-import {RPC_PROVIDERS} from './clients';
+import {CHAIN_ID_CLIENT_MAP, ChainId} from '@bgd-labs/js-utils';
 import {appendFileSync, writeFileSync} from 'fs';
 import {
   addressOrZero,
@@ -20,7 +20,6 @@ import {
   wrapIntoSolidityLibrary,
 } from './utils';
 import {generateAssetsLibrary} from './assetsLibraryGenerator';
-import {ChainId} from './chains';
 import {IUiPoolDataProvider_ABI} from '../../src/ts/abis/IUiPoolDataProvider';
 
 export interface PoolV3Addresses {
@@ -42,7 +41,7 @@ export interface PoolV3Addresses {
 }
 
 async function getAdditionalTokenInfo(
-  publicClient: PublicClient,
+  client: PublicClient,
   pool: PoolConfig,
   reservesData: PoolV3Addresses['reservesData'],
 ): Promise<{
@@ -55,26 +54,26 @@ async function getAdditionalTokenInfo(
     const aTokenContract = getContract({
       address: reservesData[0].A_TOKEN,
       abi: A_TOKEN_V3_ABI,
-      publicClient,
+      client,
     });
     const variableDebtTokenContract = getContract({
       address: reservesData[0].V_TOKEN,
       abi: VARIABLE_DEBT_TOKEN_ABI,
-      publicClient,
+      client,
     });
     const stableDebtTokenContract = getContract({
       address: reservesData[0].S_TOKEN,
       abi: STABLE_DEBT_TOKEN_ABI,
-      publicClient,
+      client,
     });
 
     const [COLLECTOR, aTokenImplSlot, aTokenImplRevision, vTokenImplSlot, sTokenImplSlot] =
       await Promise.all([
         aTokenContract.read.RESERVE_TREASURY_ADDRESS(),
-        getImplementationStorageSlot(publicClient, reservesData[0].A_TOKEN),
+        getImplementationStorageSlot(client, reservesData[0].A_TOKEN),
         aTokenContract.read.ATOKEN_REVISION(),
-        getImplementationStorageSlot(publicClient, reservesData[0].V_TOKEN),
-        getImplementationStorageSlot(publicClient, reservesData[0].S_TOKEN),
+        getImplementationStorageSlot(client, reservesData[0].V_TOKEN),
+        getImplementationStorageSlot(client, reservesData[0].S_TOKEN),
       ]);
     const defaultATokenImplementation = bytes32toAddress(aTokenImplSlot);
 
@@ -116,12 +115,13 @@ async function getAdditionalTokenInfo(
 export async function getPoolV3Addresses(
   pool: PoolConfig,
 ): Promise<PoolV3Addresses & {eModes: Map<number, string>}> {
-  const publicClient: PublicClient = RPC_PROVIDERS[pool.chainId];
+  const client: PublicClient = CHAIN_ID_CLIENT_MAP[pool.chainId];
   const addressProviderContract = getContract({
     address: pool.POOL_ADDRESSES_PROVIDER,
     abi: ADDRESS_PROVIDER_V3_ABI,
-    publicClient,
+    client,
   });
+  if (!client) console.log(client, pool.chainId, pool.POOL_ADDRESSES_PROVIDER);
   try {
     const [
       POOL,
@@ -150,7 +150,7 @@ export async function getPoolV3Addresses(
       const incentivesControllerContract = getContract({
         address: DEFAULT_INCENTIVES_CONTROLLER,
         abi: REWARDS_CONTROLLER_ABI,
-        publicClient,
+        client,
       });
       EMISSION_MANAGER = await incentivesControllerContract.read.getEmissionManager();
     } catch (e) {
@@ -165,13 +165,13 @@ export async function getPoolV3Addresses(
       const uiPoolDataProvider = getContract({
         address: pool.additionalAddresses.UI_POOL_DATA_PROVIDER,
         abi: IUiPoolDataProvider_ABI,
-        publicClient,
+        client,
       });
       const staticATokenFactoryContract = pool.additionalAddresses.STATIC_A_TOKEN_FACTORY
         ? getContract({
             address: pool.additionalAddresses.STATIC_A_TOKEN_FACTORY,
             abi: STATIC_A_TOKEN_FACTORY_ABI,
-            publicClient,
+            client,
           })
         : null;
       const data = (
@@ -199,7 +199,7 @@ export async function getPoolV3Addresses(
       );
     }
 
-    const {COLLECTOR, ...rest} = await getAdditionalTokenInfo(publicClient, pool, reservesData);
+    const {COLLECTOR, ...rest} = await getAdditionalTokenInfo(client, pool, reservesData);
 
     return {
       eModes,
diff --git a/scripts/generator/safetyModuleGenerator.ts b/scripts/generator/safetyModuleGenerator.ts
index fd8f0475..3e1a9066 100644
--- a/scripts/generator/safetyModuleGenerator.ts
+++ b/scripts/generator/safetyModuleGenerator.ts
@@ -6,7 +6,7 @@ import {
   prefixWithPragma,
   wrapIntoSolidityLibrary,
 } from './utils';
-import {ChainId} from './chains';
+import {ChainId} from '@bgd-labs/js-utils';
 
 const SAFETY_MODULE = {
   STK_AAVE: '0x4da27a545c0c5B758a6BA100e3a049001de870f5',
diff --git a/scripts/generator/utils.ts b/scripts/generator/utils.ts
index b018377d..1b9c572e 100644
--- a/scripts/generator/utils.ts
+++ b/scripts/generator/utils.ts
@@ -1,11 +1,10 @@
 import {Hex, PublicClient, getAddress, zeroAddress} from 'viem';
 import {AddressInfo, Addresses} from '../configs/types';
-import {ChainId} from './chains';
-import {RPC_PROVIDERS} from './clients';
+import {CHAIN_ID_CLIENT_MAP, ChainId} from '@bgd-labs/js-utils';
 
 function getExplorerLink(chainId: ChainId, address: Hex) {
-  const publicClient = RPC_PROVIDERS[chainId];
-  return `${publicClient.chain?.blockExplorers?.default.url}/address/${getAddress(address)}`;
+  const client = CHAIN_ID_CLIENT_MAP[chainId];
+  return `${client.chain?.blockExplorers?.default.url}/address/${getAddress(address)}`;
 }
 
 export function prefixWithPragma(code: string) {
diff --git a/src/AaveAddressBook.sol b/src/AaveAddressBook.sol
index bee7d33f..49208bd8 100644
--- a/src/AaveAddressBook.sol
+++ b/src/AaveAddressBook.sol
@@ -41,11 +41,9 @@ import {AaveV3Arbitrum} from './AaveV3Arbitrum.sol';
 import {AaveV3OptimismGoerli} from './AaveV3OptimismGoerli.sol';
 import {AaveV3Optimism} from './AaveV3Optimism.sol';
 import {AaveV3Scroll} from './AaveV3Scroll.sol';
-import {AaveV3ScrollAlpha} from './AaveV3ScrollAlpha.sol';
 import {AaveV3ScrollSepolia} from './AaveV3ScrollSepolia.sol';
 import {AaveV3FantomTestnet} from './AaveV3FantomTestnet.sol';
 import {AaveV3Fantom} from './AaveV3Fantom.sol';
-import {AaveV3Harmony} from './AaveV3Harmony.sol';
 import {MiscArbitrum} from './MiscArbitrum.sol';
 import {MiscAvalanche} from './MiscAvalanche.sol';
 import {MiscBase} from './MiscBase.sol';
diff --git a/src/AaveGovernanceV2.sol b/src/AaveGovernanceV2.sol
index 12fbbf27..3c92c7db 100644
--- a/src/AaveGovernanceV2.sol
+++ b/src/AaveGovernanceV2.sol
@@ -26,7 +26,7 @@ library AaveGovernanceV2 {
   // https://polygonscan.com/address/0xdc9A35B16DB4e126cFeDC41322b3a36454B1F772
   address internal constant POLYGON_BRIDGE_EXECUTOR = 0xdc9A35B16DB4e126cFeDC41322b3a36454B1F772;
 
-  // https://explorer.optimism.io/address/0x7d9103572bE58FfE99dc390E8246f02dcAe6f611
+  // https://optimistic.etherscan.io/address/0x7d9103572bE58FfE99dc390E8246f02dcAe6f611
   address internal constant OPTIMISM_BRIDGE_EXECUTOR = 0x7d9103572bE58FfE99dc390E8246f02dcAe6f611;
 
   // https://arbiscan.io/address/0x7d9103572bE58FfE99dc390E8246f02dcAe6f611
diff --git a/src/AaveV2Avalanche.sol b/src/AaveV2Avalanche.sol
index c439bef6..ec13736d 100644
--- a/src/AaveV2Avalanche.sol
+++ b/src/AaveV2Avalanche.sol
@@ -130,9 +130,9 @@ library AaveV2AvalancheAssets {
   // https://snowtrace.io/address/0x51D7180edA2260cc4F6e4EebB82FEF5c3c2B8300
   address internal constant DAIe_ORACLE = 0x51D7180edA2260cc4F6e4EebB82FEF5c3c2B8300;
 
-  // https://snowtrace.io/address/0x116EFD5652A9993A5984055B2da7eb9acfB48Fd2
+  // https://snowtrace.io/address/0xa7C0f85c626761eDD0875549aD09E8d3f5446695
   address internal constant DAIe_INTEREST_RATE_STRATEGY =
-    0x116EFD5652A9993A5984055B2da7eb9acfB48Fd2;
+    0xa7C0f85c626761eDD0875549aD09E8d3f5446695;
 
   // https://snowtrace.io/address/0xc7198437980c041c805A1EDcbA50c1Ce5db95118
   address internal constant USDTe_UNDERLYING = 0xc7198437980c041c805A1EDcbA50c1Ce5db95118;
@@ -151,9 +151,9 @@ library AaveV2AvalancheAssets {
   // https://snowtrace.io/address/0xEBE676ee90Fe1112671f19b6B7459bC678B67e8a
   address internal constant USDTe_ORACLE = 0xEBE676ee90Fe1112671f19b6B7459bC678B67e8a;
 
-  // https://snowtrace.io/address/0x116EFD5652A9993A5984055B2da7eb9acfB48Fd2
+  // https://snowtrace.io/address/0xa7C0f85c626761eDD0875549aD09E8d3f5446695
   address internal constant USDTe_INTEREST_RATE_STRATEGY =
-    0x116EFD5652A9993A5984055B2da7eb9acfB48Fd2;
+    0xa7C0f85c626761eDD0875549aD09E8d3f5446695;
 
   // https://snowtrace.io/address/0xA7D7079b0FEaD91F3e65f86E8915Cb59c1a4C664
   address internal constant USDCe_UNDERLYING = 0xA7D7079b0FEaD91F3e65f86E8915Cb59c1a4C664;
@@ -172,9 +172,9 @@ library AaveV2AvalancheAssets {
   // https://snowtrace.io/address/0xF096872672F44d6EBA71458D74fe67F9a77a23B9
   address internal constant USDCe_ORACLE = 0xF096872672F44d6EBA71458D74fe67F9a77a23B9;
 
-  // https://snowtrace.io/address/0x116EFD5652A9993A5984055B2da7eb9acfB48Fd2
+  // https://snowtrace.io/address/0xa7C0f85c626761eDD0875549aD09E8d3f5446695
   address internal constant USDCe_INTEREST_RATE_STRATEGY =
-    0x116EFD5652A9993A5984055B2da7eb9acfB48Fd2;
+    0xa7C0f85c626761eDD0875549aD09E8d3f5446695;
 
   // https://snowtrace.io/address/0x63a72806098Bd3D9520cC43356dD78afe5D386D9
   address internal constant AAVEe_UNDERLYING = 0x63a72806098Bd3D9520cC43356dD78afe5D386D9;
diff --git a/src/AaveV2Polygon.sol b/src/AaveV2Polygon.sol
index 477a330b..2160d0ba 100644
--- a/src/AaveV2Polygon.sol
+++ b/src/AaveV2Polygon.sol
@@ -102,8 +102,8 @@ library AaveV2PolygonAssets {
   // https://polygonscan.com/address/0xFC539A559e170f848323e19dfD66007520510085
   address internal constant DAI_ORACLE = 0xFC539A559e170f848323e19dfD66007520510085;
 
-  // https://polygonscan.com/address/0x283Df7893eF10F729890017F57d76B8D78e18915
-  address internal constant DAI_INTEREST_RATE_STRATEGY = 0x283Df7893eF10F729890017F57d76B8D78e18915;
+  // https://polygonscan.com/address/0xa966adA364E0491520a1235aAA9cf15E08c1Db05
+  address internal constant DAI_INTEREST_RATE_STRATEGY = 0xa966adA364E0491520a1235aAA9cf15E08c1Db05;
 
   // https://polygonscan.com/address/0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174
   address internal constant USDC_UNDERLYING = 0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174;
@@ -122,9 +122,9 @@ library AaveV2PolygonAssets {
   // https://polygonscan.com/address/0xefb7e6be8356cCc6827799B6A7348eE674A80EaE
   address internal constant USDC_ORACLE = 0xefb7e6be8356cCc6827799B6A7348eE674A80EaE;
 
-  // https://polygonscan.com/address/0xc7008Df6B900b41CD528ceb23283Cf4BBCd0ac6E
+  // https://polygonscan.com/address/0x2ad5a608a920E7061ccE38955C89A7c3F4c0aba7
   address internal constant USDC_INTEREST_RATE_STRATEGY =
-    0xc7008Df6B900b41CD528ceb23283Cf4BBCd0ac6E;
+    0x2ad5a608a920E7061ccE38955C89A7c3F4c0aba7;
 
   // https://polygonscan.com/address/0xc2132D05D31c914a87C6611C10748AEb04B58e8F
   address internal constant USDT_UNDERLYING = 0xc2132D05D31c914a87C6611C10748AEb04B58e8F;
@@ -143,9 +143,9 @@ library AaveV2PolygonAssets {
   // https://polygonscan.com/address/0xf9d5AAC6E5572AEFa6bd64108ff86a222F69B64d
   address internal constant USDT_ORACLE = 0xf9d5AAC6E5572AEFa6bd64108ff86a222F69B64d;
 
-  // https://polygonscan.com/address/0x8D6dA015e69A84644BFc7455F871bDe2A7Fedf39
+  // https://polygonscan.com/address/0x7892E4Db4C172e7Af389677c04c42eE3F8Fd5447
   address internal constant USDT_INTEREST_RATE_STRATEGY =
-    0x8D6dA015e69A84644BFc7455F871bDe2A7Fedf39;
+    0x7892E4Db4C172e7Af389677c04c42eE3F8Fd5447;
 
   // https://polygonscan.com/address/0x1BFD67037B42Cf73acF2047067bd4F2C47D9BfD6
   address internal constant WBTC_UNDERLYING = 0x1BFD67037B42Cf73acF2047067bd4F2C47D9BfD6;
diff --git a/src/AaveV3Arbitrum.sol b/src/AaveV3Arbitrum.sol
index 2426b79d..61e72e02 100644
--- a/src/AaveV3Arbitrum.sol
+++ b/src/AaveV3Arbitrum.sol
@@ -121,8 +121,8 @@ library AaveV3ArbitrumAssets {
   // https://arbiscan.io/address/0xc5C8E77B397E531B8EC06BFb0048328B30E9eCfB
   address internal constant DAI_ORACLE = 0xc5C8E77B397E531B8EC06BFb0048328B30E9eCfB;
 
-  // https://arbiscan.io/address/0xA901Bf68Bebde17ba382e499C3e9EbAe649DF276
-  address internal constant DAI_INTEREST_RATE_STRATEGY = 0xA901Bf68Bebde17ba382e499C3e9EbAe649DF276;
+  // https://arbiscan.io/address/0x2402C25e7E45b1466c53Ef7766AAd878A4CbC237
+  address internal constant DAI_INTEREST_RATE_STRATEGY = 0x2402C25e7E45b1466c53Ef7766AAd878A4CbC237;
 
   // https://arbiscan.io/address/0xc91c5297d7E161aCC74b482aAfCc75B85cc0bfeD
   address internal constant DAI_STATA_TOKEN = 0xc91c5297d7E161aCC74b482aAfCc75B85cc0bfeD;
@@ -240,9 +240,9 @@ library AaveV3ArbitrumAssets {
   // https://arbiscan.io/address/0x3f3f5dF88dC9F13eac63DF89EC16ef6e7E25DdE7
   address internal constant USDT_ORACLE = 0x3f3f5dF88dC9F13eac63DF89EC16ef6e7E25DdE7;
 
-  // https://arbiscan.io/address/0xA901Bf68Bebde17ba382e499C3e9EbAe649DF276
+  // https://arbiscan.io/address/0x2402C25e7E45b1466c53Ef7766AAd878A4CbC237
   address internal constant USDT_INTEREST_RATE_STRATEGY =
-    0xA901Bf68Bebde17ba382e499C3e9EbAe649DF276;
+    0x2402C25e7E45b1466c53Ef7766AAd878A4CbC237;
 
   // https://arbiscan.io/address/0xb165a74407fE1e519d6bCbDeC1Ed3202B35a4140
   address internal constant USDT_STATA_TOKEN = 0xb165a74407fE1e519d6bCbDeC1Ed3202B35a4140;
@@ -336,8 +336,8 @@ library AaveV3ArbitrumAssets {
   // https://arbiscan.io/address/0x59644ec622243878d1464A9504F9e9a31294128a
   address internal constant MAI_ORACLE = 0x59644ec622243878d1464A9504F9e9a31294128a;
 
-  // https://arbiscan.io/address/0x588b62C84533232E3A881e096E5D639Fa754F093
-  address internal constant MAI_INTEREST_RATE_STRATEGY = 0x588b62C84533232E3A881e096E5D639Fa754F093;
+  // https://arbiscan.io/address/0xc77576b02D74BBF9CdC26F3B86FD09d134416df2
+  address internal constant MAI_INTEREST_RATE_STRATEGY = 0xc77576b02D74BBF9CdC26F3B86FD09d134416df2;
 
   // https://arbiscan.io/address/0xB4a0a2692D82301703B27082Cda45B083F68CAcE
   address internal constant MAI_STATA_TOKEN = 0xB4a0a2692D82301703B27082Cda45B083F68CAcE;
@@ -383,9 +383,9 @@ library AaveV3ArbitrumAssets {
   // https://arbiscan.io/address/0x0411D28c94d85A36bC72Cb0f875dfA8371D8fFfF
   address internal constant LUSD_ORACLE = 0x0411D28c94d85A36bC72Cb0f875dfA8371D8fFfF;
 
-  // https://arbiscan.io/address/0xaDbdb3d6B51151e4CDF32e4050B6F03D2bfB6477
+  // https://arbiscan.io/address/0xC0B875907514131C2Fd43f0FBf59EdaB84C7e260
   address internal constant LUSD_INTEREST_RATE_STRATEGY =
-    0xaDbdb3d6B51151e4CDF32e4050B6F03D2bfB6477;
+    0xC0B875907514131C2Fd43f0FBf59EdaB84C7e260;
 
   // https://arbiscan.io/address/0xDbB6314b5b07E63B7101844c0346309B79f8C20A
   address internal constant LUSD_STATA_TOKEN = 0xDbB6314b5b07E63B7101844c0346309B79f8C20A;
@@ -407,9 +407,9 @@ library AaveV3ArbitrumAssets {
   // https://arbiscan.io/address/0x50834F3163758fcC1Df9973b6e91f0F0F0434aD3
   address internal constant USDCn_ORACLE = 0x50834F3163758fcC1Df9973b6e91f0F0F0434aD3;
 
-  // https://arbiscan.io/address/0x44CaDF6E49895640D9De85ac01d97D44429Ad0A4
+  // https://arbiscan.io/address/0x06B1Ec378618EA736a65395eA5CAB69A2410493B
   address internal constant USDCn_INTEREST_RATE_STRATEGY =
-    0x44CaDF6E49895640D9De85ac01d97D44429Ad0A4;
+    0x06B1Ec378618EA736a65395eA5CAB69A2410493B;
 
   // https://arbiscan.io/address/0x7CFaDFD5645B50bE87d546f42699d863648251ad
   address internal constant USDCn_STATA_TOKEN = 0x7CFaDFD5645B50bE87d546f42699d863648251ad;
@@ -431,9 +431,9 @@ library AaveV3ArbitrumAssets {
   // https://arbiscan.io/address/0x0809E3d38d1B4214958faf06D8b1B1a2b73f2ab8
   address internal constant FRAX_ORACLE = 0x0809E3d38d1B4214958faf06D8b1B1a2b73f2ab8;
 
-  // https://arbiscan.io/address/0xA901Bf68Bebde17ba382e499C3e9EbAe649DF276
+  // https://arbiscan.io/address/0x2402C25e7E45b1466c53Ef7766AAd878A4CbC237
   address internal constant FRAX_INTEREST_RATE_STRATEGY =
-    0xA901Bf68Bebde17ba382e499C3e9EbAe649DF276;
+    0x2402C25e7E45b1466c53Ef7766AAd878A4CbC237;
 
   // https://arbiscan.io/address/0x89AEc2023f89E26Dbb7eaa7a98fe3996f9d112A8
   address internal constant FRAX_STATA_TOKEN = 0x89AEc2023f89E26Dbb7eaa7a98fe3996f9d112A8;
diff --git a/src/AaveV3Avalanche.sol b/src/AaveV3Avalanche.sol
index 1ff79ec8..baef68bf 100644
--- a/src/AaveV3Avalanche.sol
+++ b/src/AaveV3Avalanche.sol
@@ -125,9 +125,9 @@ library AaveV3AvalancheAssets {
   // https://snowtrace.io/address/0x51D7180edA2260cc4F6e4EebB82FEF5c3c2B8300
   address internal constant DAIe_ORACLE = 0x51D7180edA2260cc4F6e4EebB82FEF5c3c2B8300;
 
-  // https://snowtrace.io/address/0x04daBC3C1c052AB94AA2ca80140f2b978d2F6E17
+  // https://snowtrace.io/address/0x6D6D3b7FC50999bf20dE5CC8e0F63AFD18B95f0e
   address internal constant DAIe_INTEREST_RATE_STRATEGY =
-    0x04daBC3C1c052AB94AA2ca80140f2b978d2F6E17;
+    0x6D6D3b7FC50999bf20dE5CC8e0F63AFD18B95f0e;
 
   // https://snowtrace.io/address/0x02F3f6c8A432C1e49f3359d7d36887C25d8A5888
   address internal constant DAIe_STATA_TOKEN = 0x02F3f6c8A432C1e49f3359d7d36887C25d8A5888;
@@ -173,9 +173,9 @@ library AaveV3AvalancheAssets {
   // https://snowtrace.io/address/0xF096872672F44d6EBA71458D74fe67F9a77a23B9
   address internal constant USDC_ORACLE = 0xF096872672F44d6EBA71458D74fe67F9a77a23B9;
 
-  // https://snowtrace.io/address/0x3B57B081dA6Af5e2759A57bD3211932Cb6176997
+  // https://snowtrace.io/address/0x3832311560d3B457E9cC35e5b8e06EB167D8c17D
   address internal constant USDC_INTEREST_RATE_STRATEGY =
-    0x3B57B081dA6Af5e2759A57bD3211932Cb6176997;
+    0x3832311560d3B457E9cC35e5b8e06EB167D8c17D;
 
   // https://snowtrace.io/address/0xC509aB7bB4eDbF193b82264D499a7Fc526Cd01F4
   address internal constant USDC_STATA_TOKEN = 0xC509aB7bB4eDbF193b82264D499a7Fc526Cd01F4;
@@ -245,9 +245,9 @@ library AaveV3AvalancheAssets {
   // https://snowtrace.io/address/0xEBE676ee90Fe1112671f19b6B7459bC678B67e8a
   address internal constant USDt_ORACLE = 0xEBE676ee90Fe1112671f19b6B7459bC678B67e8a;
 
-  // https://snowtrace.io/address/0x04daBC3C1c052AB94AA2ca80140f2b978d2F6E17
+  // https://snowtrace.io/address/0x6D6D3b7FC50999bf20dE5CC8e0F63AFD18B95f0e
   address internal constant USDt_INTEREST_RATE_STRATEGY =
-    0x04daBC3C1c052AB94AA2ca80140f2b978d2F6E17;
+    0x6D6D3b7FC50999bf20dE5CC8e0F63AFD18B95f0e;
 
   // https://snowtrace.io/address/0x5525Ee69BC1e354B356864187De486fab5AD67d7
   address internal constant USDt_STATA_TOKEN = 0x5525Ee69BC1e354B356864187De486fab5AD67d7;
@@ -341,9 +341,9 @@ library AaveV3AvalancheAssets {
   // https://snowtrace.io/address/0xbBa56eF1565354217a3353a466edB82E8F25b08e
   address internal constant FRAX_ORACLE = 0xbBa56eF1565354217a3353a466edB82E8F25b08e;
 
-  // https://snowtrace.io/address/0x04daBC3C1c052AB94AA2ca80140f2b978d2F6E17
+  // https://snowtrace.io/address/0x6D6D3b7FC50999bf20dE5CC8e0F63AFD18B95f0e
   address internal constant FRAX_INTEREST_RATE_STRATEGY =
-    0x04daBC3C1c052AB94AA2ca80140f2b978d2F6E17;
+    0x6D6D3b7FC50999bf20dE5CC8e0F63AFD18B95f0e;
 
   // https://snowtrace.io/address/0xA3c2ffE702F4cD265B2249AB5f84Fab81FFf6c73
   address internal constant FRAX_STATA_TOKEN = 0xA3c2ffE702F4cD265B2249AB5f84Fab81FFf6c73;
@@ -365,8 +365,8 @@ library AaveV3AvalancheAssets {
   // https://snowtrace.io/address/0x5D1F504211c17365CA66353442a74D4435A8b778
   address internal constant MAI_ORACLE = 0x5D1F504211c17365CA66353442a74D4435A8b778;
 
-  // https://snowtrace.io/address/0x5f58C25D17C09c9e1892F45DE6dA45ed973A5326
-  address internal constant MAI_INTEREST_RATE_STRATEGY = 0x5f58C25D17C09c9e1892F45DE6dA45ed973A5326;
+  // https://snowtrace.io/address/0xD61ca03Eac0352090f45bE50403F7B17d20E11F2
+  address internal constant MAI_INTEREST_RATE_STRATEGY = 0xD61ca03Eac0352090f45bE50403F7B17d20E11F2;
 
   // https://snowtrace.io/address/0x08cC59E51BB0Bc322B4D251f7262dB864d6150ce
   address internal constant MAI_STATA_TOKEN = 0x08cC59E51BB0Bc322B4D251f7262dB864d6150ce;
diff --git a/src/AaveV3Base.sol b/src/AaveV3Base.sol
index 27ba7df5..c62a18af 100644
--- a/src/AaveV3Base.sol
+++ b/src/AaveV3Base.sol
@@ -214,9 +214,9 @@ library AaveV3BaseAssets {
   // https://basescan.org/address/0x7e860098F58bBFC8648a4311b374B1D669a2bc6B
   address internal constant USDC_ORACLE = 0x7e860098F58bBFC8648a4311b374B1D669a2bc6B;
 
-  // https://basescan.org/address/0x50eC656Ba67885D0937b5f549f3104ea15E75588
+  // https://basescan.org/address/0x136848FdaedEB56245bE0e61E28A3CB8c0B45CaA
   address internal constant USDC_INTEREST_RATE_STRATEGY =
-    0x50eC656Ba67885D0937b5f549f3104ea15E75588;
+    0x136848FdaedEB56245bE0e61E28A3CB8c0B45CaA;
 }
 
 library AaveV3BaseEModes {
diff --git a/src/AaveV3Gnosis.sol b/src/AaveV3Gnosis.sol
index 84cb928e..fdd55491 100644
--- a/src/AaveV3Gnosis.sol
+++ b/src/AaveV3Gnosis.sol
@@ -179,9 +179,9 @@ library AaveV3GnosisAssets {
   // https://blockscout.com/xdai/mainnet/address/0x26C31ac71010aF62E6B486D1132E266D6298857D
   address internal constant USDC_ORACLE = 0x26C31ac71010aF62E6B486D1132E266D6298857D;
 
-  // https://blockscout.com/xdai/mainnet/address/0x345f7fcd88207fe060AD03c2656A23A3Ab596479
+  // https://blockscout.com/xdai/mainnet/address/0xE74CD4ADF9103370144c327457bd294753E2E856
   address internal constant USDC_INTEREST_RATE_STRATEGY =
-    0x345f7fcd88207fe060AD03c2656A23A3Ab596479;
+    0xE74CD4ADF9103370144c327457bd294753E2E856;
 
   // https://blockscout.com/xdai/mainnet/address/0x270bA1f35D8b87510D24F693fcCc0da02e6E4EeB
   address internal constant USDC_STATA_TOKEN = 0x270bA1f35D8b87510D24F693fcCc0da02e6E4EeB;
@@ -203,9 +203,9 @@ library AaveV3GnosisAssets {
   // https://blockscout.com/xdai/mainnet/address/0x678df3415fc31947dA4324eC63212874be5a82f8
   address internal constant WXDAI_ORACLE = 0x678df3415fc31947dA4324eC63212874be5a82f8;
 
-  // https://blockscout.com/xdai/mainnet/address/0x345f7fcd88207fe060AD03c2656A23A3Ab596479
+  // https://blockscout.com/xdai/mainnet/address/0xE74CD4ADF9103370144c327457bd294753E2E856
   address internal constant WXDAI_INTEREST_RATE_STRATEGY =
-    0x345f7fcd88207fe060AD03c2656A23A3Ab596479;
+    0xE74CD4ADF9103370144c327457bd294753E2E856;
 
   // https://blockscout.com/xdai/mainnet/address/0x7f0EAE87Df30C468E0680c83549D0b3DE7664D4B
   address internal constant WXDAI_STATA_TOKEN = 0x7f0EAE87Df30C468E0680c83549D0b3DE7664D4B;
diff --git a/src/AaveV3Metis.sol b/src/AaveV3Metis.sol
index 5fdc6116..bc53827b 100644
--- a/src/AaveV3Metis.sol
+++ b/src/AaveV3Metis.sol
@@ -153,9 +153,9 @@ library AaveV3MetisAssets {
   // https://andromeda-explorer.metis.io/address/0x663855969c85F3BE415807250414Ca9129533a5f
   address internal constant mUSDC_ORACLE = 0x663855969c85F3BE415807250414Ca9129533a5f;
 
-  // https://andromeda-explorer.metis.io/address/0x3c8DF161A59F2a3ed4D40F073395d6a0f14290C0
+  // https://andromeda-explorer.metis.io/address/0x463F3F7F0eD356703A9bF2Da3FB95AECBEfe60ce
   address internal constant mUSDC_INTEREST_RATE_STRATEGY =
-    0x3c8DF161A59F2a3ed4D40F073395d6a0f14290C0;
+    0x463F3F7F0eD356703A9bF2Da3FB95AECBEfe60ce;
 
   // https://andromeda-explorer.metis.io/address/0xb24451C231C6e6A60aC46f45E98a267caae898f4
   address internal constant mUSDC_STATA_TOKEN = 0xb24451C231C6e6A60aC46f45E98a267caae898f4;
@@ -177,9 +177,9 @@ library AaveV3MetisAssets {
   // https://andromeda-explorer.metis.io/address/0x51864b8948Aa5e35aace2BaDaF901D63418A3b9D
   address internal constant mUSDT_ORACLE = 0x51864b8948Aa5e35aace2BaDaF901D63418A3b9D;
 
-  // https://andromeda-explorer.metis.io/address/0x082612269926F85741E6c2B0447D000469880c1C
+  // https://andromeda-explorer.metis.io/address/0xEDeA87920826abfE28C2D57AC7665B7031f64EfF
   address internal constant mUSDT_INTEREST_RATE_STRATEGY =
-    0x082612269926F85741E6c2B0447D000469880c1C;
+    0xEDeA87920826abfE28C2D57AC7665B7031f64EfF;
 
   // https://andromeda-explorer.metis.io/address/0xAAea6F041425B813760dA201d08d46487034A266
   address internal constant mUSDT_STATA_TOKEN = 0xAAea6F041425B813760dA201d08d46487034A266;
diff --git a/src/AaveV3Optimism.sol b/src/AaveV3Optimism.sol
index 5805f652..f5b4e5ec 100644
--- a/src/AaveV3Optimism.sol
+++ b/src/AaveV3Optimism.sol
@@ -6,433 +6,433 @@ import {IPoolAddressesProvider, IPool, IPoolConfigurator, IAaveOracle, IPoolData
 import {ICollector} from './common/ICollector.sol';
 
 library AaveV3Optimism {
-  // https://explorer.optimism.io/address/0xa97684ead0e402dC232d5A977953DF7ECBaB3CDb
+  // https://optimistic.etherscan.io/address/0xa97684ead0e402dC232d5A977953DF7ECBaB3CDb
   IPoolAddressesProvider internal constant POOL_ADDRESSES_PROVIDER =
     IPoolAddressesProvider(0xa97684ead0e402dC232d5A977953DF7ECBaB3CDb);
 
-  // https://explorer.optimism.io/address/0x794a61358D6845594F94dc1DB02A252b5b4814aD
+  // https://optimistic.etherscan.io/address/0x794a61358D6845594F94dc1DB02A252b5b4814aD
   IPool internal constant POOL = IPool(0x794a61358D6845594F94dc1DB02A252b5b4814aD);
 
-  // https://explorer.optimism.io/address/0x8145eddDf43f50276641b55bd3AD95944510021E
+  // https://optimistic.etherscan.io/address/0x8145eddDf43f50276641b55bd3AD95944510021E
   IPoolConfigurator internal constant POOL_CONFIGURATOR =
     IPoolConfigurator(0x8145eddDf43f50276641b55bd3AD95944510021E);
 
-  // https://explorer.optimism.io/address/0xD81eb3728a631871a7eBBaD631b5f424909f0c77
+  // https://optimistic.etherscan.io/address/0xD81eb3728a631871a7eBBaD631b5f424909f0c77
   IAaveOracle internal constant ORACLE = IAaveOracle(0xD81eb3728a631871a7eBBaD631b5f424909f0c77);
 
-  // https://explorer.optimism.io/address/0xE229d5DE4BD5beEAf12d427B5B57BFe66abD2c3b
+  // https://optimistic.etherscan.io/address/0xE229d5DE4BD5beEAf12d427B5B57BFe66abD2c3b
   address internal constant PRICE_ORACLE_SENTINEL = 0xE229d5DE4BD5beEAf12d427B5B57BFe66abD2c3b;
 
-  // https://explorer.optimism.io/address/0xd9Ca4878dd38B021583c1B669905592EAe76E044
+  // https://optimistic.etherscan.io/address/0xd9Ca4878dd38B021583c1B669905592EAe76E044
   IPoolDataProvider internal constant AAVE_PROTOCOL_DATA_PROVIDER =
     IPoolDataProvider(0xd9Ca4878dd38B021583c1B669905592EAe76E044);
 
-  // https://explorer.optimism.io/address/0xa72636CbcAa8F5FF95B2cc47F3CDEe83F3294a0B
+  // https://optimistic.etherscan.io/address/0xa72636CbcAa8F5FF95B2cc47F3CDEe83F3294a0B
   IACLManager internal constant ACL_MANAGER =
     IACLManager(0xa72636CbcAa8F5FF95B2cc47F3CDEe83F3294a0B);
 
-  // https://explorer.optimism.io/address/0x746c675dAB49Bcd5BB9Dc85161f2d7Eb435009bf
+  // https://optimistic.etherscan.io/address/0x746c675dAB49Bcd5BB9Dc85161f2d7Eb435009bf
   address internal constant ACL_ADMIN = 0x746c675dAB49Bcd5BB9Dc85161f2d7Eb435009bf;
 
-  // https://explorer.optimism.io/address/0xB2289E329D2F85F1eD31Adbb30eA345278F21bcf
+  // https://optimistic.etherscan.io/address/0xB2289E329D2F85F1eD31Adbb30eA345278F21bcf
   ICollector internal constant COLLECTOR = ICollector(0xB2289E329D2F85F1eD31Adbb30eA345278F21bcf);
 
-  // https://explorer.optimism.io/address/0x929EC64c34a17401F460460D4B9390518E5B473e
+  // https://optimistic.etherscan.io/address/0x929EC64c34a17401F460460D4B9390518E5B473e
   address internal constant DEFAULT_INCENTIVES_CONTROLLER =
     0x929EC64c34a17401F460460D4B9390518E5B473e;
 
-  // https://explorer.optimism.io/address/0xbCb167bDCF14a8F791d6f4A6EDd964aed2F8813B
+  // https://optimistic.etherscan.io/address/0xbCb167bDCF14a8F791d6f4A6EDd964aed2F8813B
   address internal constant DEFAULT_A_TOKEN_IMPL_REV_2 = 0xbCb167bDCF14a8F791d6f4A6EDd964aed2F8813B;
 
-  // https://explorer.optimism.io/address/0x04a8D477eE202aDCE1682F5902e1160455205b12
+  // https://optimistic.etherscan.io/address/0x04a8D477eE202aDCE1682F5902e1160455205b12
   address internal constant DEFAULT_VARIABLE_DEBT_TOKEN_IMPL_REV_2 =
     0x04a8D477eE202aDCE1682F5902e1160455205b12;
 
-  // https://explorer.optimism.io/address/0x69713dA5fDfacf77E80C31F9B928Ec0Fc3716384
+  // https://optimistic.etherscan.io/address/0x69713dA5fDfacf77E80C31F9B928Ec0Fc3716384
   address internal constant DEFAULT_STABLE_DEBT_TOKEN_IMPL_REV_3 =
     0x69713dA5fDfacf77E80C31F9B928Ec0Fc3716384;
 
-  // https://explorer.optimism.io/address/0x048f2228D7Bf6776f99aB50cB1b1eaB4D1d4cA73
+  // https://optimistic.etherscan.io/address/0x048f2228D7Bf6776f99aB50cB1b1eaB4D1d4cA73
   address internal constant EMISSION_MANAGER = 0x048f2228D7Bf6776f99aB50cB1b1eaB4D1d4cA73;
 
-  // https://explorer.optimism.io/address/0x5E76E98E0963EcDC6A065d1435F84065b7523f39
+  // https://optimistic.etherscan.io/address/0x5E76E98E0963EcDC6A065d1435F84065b7523f39
   address internal constant CAPS_PLUS_RISK_STEWARD = 0x5E76E98E0963EcDC6A065d1435F84065b7523f39;
 
-  // https://explorer.optimism.io/address/0x3829943c53F2d00e20B58475aF19716724bF90Ba
+  // https://optimistic.etherscan.io/address/0x3829943c53F2d00e20B58475aF19716724bF90Ba
   address internal constant FREEZING_STEWARD = 0x3829943c53F2d00e20B58475aF19716724bF90Ba;
 
-  // https://explorer.optimism.io/address/0xcFaE0D8c5707FCc6478D6a65fFA31efADeF8b8EC
+  // https://optimistic.etherscan.io/address/0xcFaE0D8c5707FCc6478D6a65fFA31efADeF8b8EC
   address internal constant DEBT_SWAP_ADAPTER = 0xcFaE0D8c5707FCc6478D6a65fFA31efADeF8b8EC;
 
-  // https://explorer.optimism.io/address/0x9abADECD08572e0eA5aF4d47A9C7984a5AA503dC
+  // https://optimistic.etherscan.io/address/0x9abADECD08572e0eA5aF4d47A9C7984a5AA503dC
   address internal constant L2_ENCODER = 0x9abADECD08572e0eA5aF4d47A9C7984a5AA503dC;
 
-  // https://explorer.optimism.io/address/0x893411580e590D62dDBca8a703d61Cc4A8c7b2b9
+  // https://optimistic.etherscan.io/address/0x893411580e590D62dDBca8a703d61Cc4A8c7b2b9
   address internal constant CONFIG_ENGINE = 0x893411580e590D62dDBca8a703d61Cc4A8c7b2b9;
 
-  // https://explorer.optimism.io/address/0x770ef9f4fe897e59daCc474EF11238303F9552b6
+  // https://optimistic.etherscan.io/address/0x770ef9f4fe897e59daCc474EF11238303F9552b6
   address internal constant POOL_ADDRESSES_PROVIDER_REGISTRY =
     0x770ef9f4fe897e59daCc474EF11238303F9552b6;
 
-  // https://explorer.optimism.io/address/0xDd81E6F85358292075B78fc8D5830BE8434aF8BA
+  // https://optimistic.etherscan.io/address/0xDd81E6F85358292075B78fc8D5830BE8434aF8BA
   address internal constant RATES_FACTORY = 0xDd81E6F85358292075B78fc8D5830BE8434aF8BA;
 
-  // https://explorer.optimism.io/address/0xa12734e64417f61f8442E7D5132EdBFdbDDeF0fa
+  // https://optimistic.etherscan.io/address/0xa12734e64417f61f8442E7D5132EdBFdbDDeF0fa
   address internal constant REPAY_WITH_COLLATERAL_ADAPTER =
     0xa12734e64417f61f8442E7D5132EdBFdbDDeF0fa;
 
-  // https://explorer.optimism.io/address/0x22D76094730fA377184100EFB8CEfC673B89B372
+  // https://optimistic.etherscan.io/address/0x22D76094730fA377184100EFB8CEfC673B89B372
   address internal constant STATIC_A_TOKEN_FACTORY = 0x22D76094730fA377184100EFB8CEfC673B89B372;
 
-  // https://explorer.optimism.io/address/0x830C5A67a0C95D69dA5fb7801Ac1773c6fB53857
+  // https://optimistic.etherscan.io/address/0x830C5A67a0C95D69dA5fb7801Ac1773c6fB53857
   address internal constant SWAP_COLLATERAL_ADAPTER = 0x830C5A67a0C95D69dA5fb7801Ac1773c6fB53857;
 
-  // https://explorer.optimism.io/address/0x6F143FE2F7B02424ad3CaD1593D6f36c0Aab69d7
+  // https://optimistic.etherscan.io/address/0x6F143FE2F7B02424ad3CaD1593D6f36c0Aab69d7
   address internal constant UI_INCENTIVE_DATA_PROVIDER = 0x6F143FE2F7B02424ad3CaD1593D6f36c0Aab69d7;
 
-  // https://explorer.optimism.io/address/0xbd83DdBE37fc91923d59C8c1E0bDe0CccCa332d5
+  // https://optimistic.etherscan.io/address/0xbd83DdBE37fc91923d59C8c1E0bDe0CccCa332d5
   address internal constant UI_POOL_DATA_PROVIDER = 0xbd83DdBE37fc91923d59C8c1E0bDe0CccCa332d5;
 
-  // https://explorer.optimism.io/address/0xBc790382B3686abffE4be14A030A96aC6154023a
+  // https://optimistic.etherscan.io/address/0xBc790382B3686abffE4be14A030A96aC6154023a
   address internal constant WALLET_BALANCE_PROVIDER = 0xBc790382B3686abffE4be14A030A96aC6154023a;
 
-  // https://explorer.optimism.io/address/0xe9E52021f4e11DEAD8661812A0A6c8627abA2a54
+  // https://optimistic.etherscan.io/address/0xe9E52021f4e11DEAD8661812A0A6c8627abA2a54
   address internal constant WETH_GATEWAY = 0xe9E52021f4e11DEAD8661812A0A6c8627abA2a54;
 
-  // https://explorer.optimism.io/address/0x78F8Bd884C3D738B74B420540659c82f392820e0
+  // https://optimistic.etherscan.io/address/0x78F8Bd884C3D738B74B420540659c82f392820e0
   address internal constant WITHDRAW_SWAP_ADAPTER = 0x78F8Bd884C3D738B74B420540659c82f392820e0;
 }
 
 library AaveV3OptimismAssets {
-  // https://explorer.optimism.io/address/0xDA10009cBd5D07dd0CeCc66161FC93D7c9000da1
+  // https://optimistic.etherscan.io/address/0xDA10009cBd5D07dd0CeCc66161FC93D7c9000da1
   address internal constant DAI_UNDERLYING = 0xDA10009cBd5D07dd0CeCc66161FC93D7c9000da1;
 
   uint8 internal constant DAI_DECIMALS = 18;
 
-  // https://explorer.optimism.io/address/0x82E64f49Ed5EC1bC6e43DAD4FC8Af9bb3A2312EE
+  // https://optimistic.etherscan.io/address/0x82E64f49Ed5EC1bC6e43DAD4FC8Af9bb3A2312EE
   address internal constant DAI_A_TOKEN = 0x82E64f49Ed5EC1bC6e43DAD4FC8Af9bb3A2312EE;
 
-  // https://explorer.optimism.io/address/0x8619d80FB0141ba7F184CbF22fd724116D9f7ffC
+  // https://optimistic.etherscan.io/address/0x8619d80FB0141ba7F184CbF22fd724116D9f7ffC
   address internal constant DAI_V_TOKEN = 0x8619d80FB0141ba7F184CbF22fd724116D9f7ffC;
 
-  // https://explorer.optimism.io/address/0xd94112B5B62d53C9402e7A60289c6810dEF1dC9B
+  // https://optimistic.etherscan.io/address/0xd94112B5B62d53C9402e7A60289c6810dEF1dC9B
   address internal constant DAI_S_TOKEN = 0xd94112B5B62d53C9402e7A60289c6810dEF1dC9B;
 
-  // https://explorer.optimism.io/address/0x8dBa75e83DA73cc766A7e5a0ee71F656BAb470d6
+  // https://optimistic.etherscan.io/address/0x8dBa75e83DA73cc766A7e5a0ee71F656BAb470d6
   address internal constant DAI_ORACLE = 0x8dBa75e83DA73cc766A7e5a0ee71F656BAb470d6;
 
-  // https://explorer.optimism.io/address/0x6D6D3b7FC50999bf20dE5CC8e0F63AFD18B95f0e
-  address internal constant DAI_INTEREST_RATE_STRATEGY = 0x6D6D3b7FC50999bf20dE5CC8e0F63AFD18B95f0e;
+  // https://optimistic.etherscan.io/address/0xd5CA18a70189309664e34FB8150799ff13722308
+  address internal constant DAI_INTEREST_RATE_STRATEGY = 0xd5CA18a70189309664e34FB8150799ff13722308;
 
-  // https://explorer.optimism.io/address/0x6dDc64289bE8a71A707fB057d5d07Cc756055d6e
+  // https://optimistic.etherscan.io/address/0x6dDc64289bE8a71A707fB057d5d07Cc756055d6e
   address internal constant DAI_STATA_TOKEN = 0x6dDc64289bE8a71A707fB057d5d07Cc756055d6e;
 
-  // https://explorer.optimism.io/address/0x350a791Bfc2C21F9Ed5d10980Dad2e2638ffa7f6
+  // https://optimistic.etherscan.io/address/0x350a791Bfc2C21F9Ed5d10980Dad2e2638ffa7f6
   address internal constant LINK_UNDERLYING = 0x350a791Bfc2C21F9Ed5d10980Dad2e2638ffa7f6;
 
   uint8 internal constant LINK_DECIMALS = 18;
 
-  // https://explorer.optimism.io/address/0x191c10Aa4AF7C30e871E70C95dB0E4eb77237530
+  // https://optimistic.etherscan.io/address/0x191c10Aa4AF7C30e871E70C95dB0E4eb77237530
   address internal constant LINK_A_TOKEN = 0x191c10Aa4AF7C30e871E70C95dB0E4eb77237530;
 
-  // https://explorer.optimism.io/address/0x953A573793604aF8d41F306FEb8274190dB4aE0e
+  // https://optimistic.etherscan.io/address/0x953A573793604aF8d41F306FEb8274190dB4aE0e
   address internal constant LINK_V_TOKEN = 0x953A573793604aF8d41F306FEb8274190dB4aE0e;
 
-  // https://explorer.optimism.io/address/0x89D976629b7055ff1ca02b927BA3e020F22A44e4
+  // https://optimistic.etherscan.io/address/0x89D976629b7055ff1ca02b927BA3e020F22A44e4
   address internal constant LINK_S_TOKEN = 0x89D976629b7055ff1ca02b927BA3e020F22A44e4;
 
-  // https://explorer.optimism.io/address/0xCc232dcFAAE6354cE191Bd574108c1aD03f86450
+  // https://optimistic.etherscan.io/address/0xCc232dcFAAE6354cE191Bd574108c1aD03f86450
   address internal constant LINK_ORACLE = 0xCc232dcFAAE6354cE191Bd574108c1aD03f86450;
 
-  // https://explorer.optimism.io/address/0xeE1BAc9355EaAfCD1B68d272d640d870bC9b4b5C
+  // https://optimistic.etherscan.io/address/0xeE1BAc9355EaAfCD1B68d272d640d870bC9b4b5C
   address internal constant LINK_INTEREST_RATE_STRATEGY =
     0xeE1BAc9355EaAfCD1B68d272d640d870bC9b4b5C;
 
-  // https://explorer.optimism.io/address/0x39BCf217ACc4Bf2fCaF7BC8800E69D986912c75e
+  // https://optimistic.etherscan.io/address/0x39BCf217ACc4Bf2fCaF7BC8800E69D986912c75e
   address internal constant LINK_STATA_TOKEN = 0x39BCf217ACc4Bf2fCaF7BC8800E69D986912c75e;
 
-  // https://explorer.optimism.io/address/0x7F5c764cBc14f9669B88837ca1490cCa17c31607
+  // https://optimistic.etherscan.io/address/0x7F5c764cBc14f9669B88837ca1490cCa17c31607
   address internal constant USDC_UNDERLYING = 0x7F5c764cBc14f9669B88837ca1490cCa17c31607;
 
   uint8 internal constant USDC_DECIMALS = 6;
 
-  // https://explorer.optimism.io/address/0x625E7708f30cA75bfd92586e17077590C60eb4cD
+  // https://optimistic.etherscan.io/address/0x625E7708f30cA75bfd92586e17077590C60eb4cD
   address internal constant USDC_A_TOKEN = 0x625E7708f30cA75bfd92586e17077590C60eb4cD;
 
-  // https://explorer.optimism.io/address/0xFCCf3cAbbe80101232d343252614b6A3eE81C989
+  // https://optimistic.etherscan.io/address/0xFCCf3cAbbe80101232d343252614b6A3eE81C989
   address internal constant USDC_V_TOKEN = 0xFCCf3cAbbe80101232d343252614b6A3eE81C989;
 
-  // https://explorer.optimism.io/address/0x307ffe186F84a3bc2613D1eA417A5737D69A7007
+  // https://optimistic.etherscan.io/address/0x307ffe186F84a3bc2613D1eA417A5737D69A7007
   address internal constant USDC_S_TOKEN = 0x307ffe186F84a3bc2613D1eA417A5737D69A7007;
 
-  // https://explorer.optimism.io/address/0x16a9FA2FDa030272Ce99B29CF780dFA30361E0f3
+  // https://optimistic.etherscan.io/address/0x16a9FA2FDa030272Ce99B29CF780dFA30361E0f3
   address internal constant USDC_ORACLE = 0x16a9FA2FDa030272Ce99B29CF780dFA30361E0f3;
 
-  // https://explorer.optimism.io/address/0x769EbC5106bF09D9A665CCb691e1907612b57F16
+  // https://optimistic.etherscan.io/address/0x769EbC5106bF09D9A665CCb691e1907612b57F16
   address internal constant USDC_INTEREST_RATE_STRATEGY =
     0x769EbC5106bF09D9A665CCb691e1907612b57F16;
 
-  // https://explorer.optimism.io/address/0x9F281eb58fd98ad98EDe0fc4C553AD4D73e7Ca2C
+  // https://optimistic.etherscan.io/address/0x9F281eb58fd98ad98EDe0fc4C553AD4D73e7Ca2C
   address internal constant USDC_STATA_TOKEN = 0x9F281eb58fd98ad98EDe0fc4C553AD4D73e7Ca2C;
 
-  // https://explorer.optimism.io/address/0x68f180fcCe6836688e9084f035309E29Bf0A2095
+  // https://optimistic.etherscan.io/address/0x68f180fcCe6836688e9084f035309E29Bf0A2095
   address internal constant WBTC_UNDERLYING = 0x68f180fcCe6836688e9084f035309E29Bf0A2095;
 
   uint8 internal constant WBTC_DECIMALS = 8;
 
-  // https://explorer.optimism.io/address/0x078f358208685046a11C85e8ad32895DED33A249
+  // https://optimistic.etherscan.io/address/0x078f358208685046a11C85e8ad32895DED33A249
   address internal constant WBTC_A_TOKEN = 0x078f358208685046a11C85e8ad32895DED33A249;
 
-  // https://explorer.optimism.io/address/0x92b42c66840C7AD907b4BF74879FF3eF7c529473
+  // https://optimistic.etherscan.io/address/0x92b42c66840C7AD907b4BF74879FF3eF7c529473
   address internal constant WBTC_V_TOKEN = 0x92b42c66840C7AD907b4BF74879FF3eF7c529473;
 
-  // https://explorer.optimism.io/address/0x633b207Dd676331c413D4C013a6294B0FE47cD0e
+  // https://optimistic.etherscan.io/address/0x633b207Dd676331c413D4C013a6294B0FE47cD0e
   address internal constant WBTC_S_TOKEN = 0x633b207Dd676331c413D4C013a6294B0FE47cD0e;
 
-  // https://explorer.optimism.io/address/0xD702DD976Fb76Fffc2D3963D037dfDae5b04E593
+  // https://optimistic.etherscan.io/address/0xD702DD976Fb76Fffc2D3963D037dfDae5b04E593
   address internal constant WBTC_ORACLE = 0xD702DD976Fb76Fffc2D3963D037dfDae5b04E593;
 
-  // https://explorer.optimism.io/address/0x04daBC3C1c052AB94AA2ca80140f2b978d2F6E17
+  // https://optimistic.etherscan.io/address/0x04daBC3C1c052AB94AA2ca80140f2b978d2F6E17
   address internal constant WBTC_INTEREST_RATE_STRATEGY =
     0x04daBC3C1c052AB94AA2ca80140f2b978d2F6E17;
 
-  // https://explorer.optimism.io/address/0x6d998FeEFC7B3664eaD09CAf02b5a0fc2E365F18
+  // https://optimistic.etherscan.io/address/0x6d998FeEFC7B3664eaD09CAf02b5a0fc2E365F18
   address internal constant WBTC_STATA_TOKEN = 0x6d998FeEFC7B3664eaD09CAf02b5a0fc2E365F18;
 
-  // https://explorer.optimism.io/address/0x4200000000000000000000000000000000000006
+  // https://optimistic.etherscan.io/address/0x4200000000000000000000000000000000000006
   address internal constant WETH_UNDERLYING = 0x4200000000000000000000000000000000000006;
 
   uint8 internal constant WETH_DECIMALS = 18;
 
-  // https://explorer.optimism.io/address/0xe50fA9b3c56FfB159cB0FCA61F5c9D750e8128c8
+  // https://optimistic.etherscan.io/address/0xe50fA9b3c56FfB159cB0FCA61F5c9D750e8128c8
   address internal constant WETH_A_TOKEN = 0xe50fA9b3c56FfB159cB0FCA61F5c9D750e8128c8;
 
-  // https://explorer.optimism.io/address/0x0c84331e39d6658Cd6e6b9ba04736cC4c4734351
+  // https://optimistic.etherscan.io/address/0x0c84331e39d6658Cd6e6b9ba04736cC4c4734351
   address internal constant WETH_V_TOKEN = 0x0c84331e39d6658Cd6e6b9ba04736cC4c4734351;
 
-  // https://explorer.optimism.io/address/0xD8Ad37849950903571df17049516a5CD4cbE55F6
+  // https://optimistic.etherscan.io/address/0xD8Ad37849950903571df17049516a5CD4cbE55F6
   address internal constant WETH_S_TOKEN = 0xD8Ad37849950903571df17049516a5CD4cbE55F6;
 
-  // https://explorer.optimism.io/address/0x13e3Ee699D1909E989722E753853AE30b17e08c5
+  // https://optimistic.etherscan.io/address/0x13e3Ee699D1909E989722E753853AE30b17e08c5
   address internal constant WETH_ORACLE = 0x13e3Ee699D1909E989722E753853AE30b17e08c5;
 
-  // https://explorer.optimism.io/address/0x5f58C25D17C09c9e1892F45DE6dA45ed973A5326
+  // https://optimistic.etherscan.io/address/0x5f58C25D17C09c9e1892F45DE6dA45ed973A5326
   address internal constant WETH_INTEREST_RATE_STRATEGY =
     0x5f58C25D17C09c9e1892F45DE6dA45ed973A5326;
 
-  // https://explorer.optimism.io/address/0x98d69620C31869fD4822ceb6ADAB31180475FD37
+  // https://optimistic.etherscan.io/address/0x98d69620C31869fD4822ceb6ADAB31180475FD37
   address internal constant WETH_STATA_TOKEN = 0x98d69620C31869fD4822ceb6ADAB31180475FD37;
 
-  // https://explorer.optimism.io/address/0x94b008aA00579c1307B0EF2c499aD98a8ce58e58
+  // https://optimistic.etherscan.io/address/0x94b008aA00579c1307B0EF2c499aD98a8ce58e58
   address internal constant USDT_UNDERLYING = 0x94b008aA00579c1307B0EF2c499aD98a8ce58e58;
 
   uint8 internal constant USDT_DECIMALS = 6;
 
-  // https://explorer.optimism.io/address/0x6ab707Aca953eDAeFBc4fD23bA73294241490620
+  // https://optimistic.etherscan.io/address/0x6ab707Aca953eDAeFBc4fD23bA73294241490620
   address internal constant USDT_A_TOKEN = 0x6ab707Aca953eDAeFBc4fD23bA73294241490620;
 
-  // https://explorer.optimism.io/address/0xfb00AC187a8Eb5AFAE4eACE434F493Eb62672df7
+  // https://optimistic.etherscan.io/address/0xfb00AC187a8Eb5AFAE4eACE434F493Eb62672df7
   address internal constant USDT_V_TOKEN = 0xfb00AC187a8Eb5AFAE4eACE434F493Eb62672df7;
 
-  // https://explorer.optimism.io/address/0x70eFfc565DB6EEf7B927610155602d31b670e802
+  // https://optimistic.etherscan.io/address/0x70eFfc565DB6EEf7B927610155602d31b670e802
   address internal constant USDT_S_TOKEN = 0x70eFfc565DB6EEf7B927610155602d31b670e802;
 
-  // https://explorer.optimism.io/address/0xECef79E109e997bCA29c1c0897ec9d7b03647F5E
+  // https://optimistic.etherscan.io/address/0xECef79E109e997bCA29c1c0897ec9d7b03647F5E
   address internal constant USDT_ORACLE = 0xECef79E109e997bCA29c1c0897ec9d7b03647F5E;
 
-  // https://explorer.optimism.io/address/0x6D6D3b7FC50999bf20dE5CC8e0F63AFD18B95f0e
+  // https://optimistic.etherscan.io/address/0xd5CA18a70189309664e34FB8150799ff13722308
   address internal constant USDT_INTEREST_RATE_STRATEGY =
-    0x6D6D3b7FC50999bf20dE5CC8e0F63AFD18B95f0e;
+    0xd5CA18a70189309664e34FB8150799ff13722308;
 
-  // https://explorer.optimism.io/address/0x035c93db04E5aAea54E6cd0261C492a3e0638b37
+  // https://optimistic.etherscan.io/address/0x035c93db04E5aAea54E6cd0261C492a3e0638b37
   address internal constant USDT_STATA_TOKEN = 0x035c93db04E5aAea54E6cd0261C492a3e0638b37;
 
-  // https://explorer.optimism.io/address/0x76FB31fb4af56892A25e32cFC43De717950c9278
+  // https://optimistic.etherscan.io/address/0x76FB31fb4af56892A25e32cFC43De717950c9278
   address internal constant AAVE_UNDERLYING = 0x76FB31fb4af56892A25e32cFC43De717950c9278;
 
   uint8 internal constant AAVE_DECIMALS = 18;
 
-  // https://explorer.optimism.io/address/0xf329e36C7bF6E5E86ce2150875a84Ce77f477375
+  // https://optimistic.etherscan.io/address/0xf329e36C7bF6E5E86ce2150875a84Ce77f477375
   address internal constant AAVE_A_TOKEN = 0xf329e36C7bF6E5E86ce2150875a84Ce77f477375;
 
-  // https://explorer.optimism.io/address/0xE80761Ea617F66F96274eA5e8c37f03960ecC679
+  // https://optimistic.etherscan.io/address/0xE80761Ea617F66F96274eA5e8c37f03960ecC679
   address internal constant AAVE_V_TOKEN = 0xE80761Ea617F66F96274eA5e8c37f03960ecC679;
 
-  // https://explorer.optimism.io/address/0xfAeF6A702D15428E588d4C0614AEFb4348D83D48
+  // https://optimistic.etherscan.io/address/0xfAeF6A702D15428E588d4C0614AEFb4348D83D48
   address internal constant AAVE_S_TOKEN = 0xfAeF6A702D15428E588d4C0614AEFb4348D83D48;
 
-  // https://explorer.optimism.io/address/0x338ed6787f463394D24813b297401B9F05a8C9d1
+  // https://optimistic.etherscan.io/address/0x338ed6787f463394D24813b297401B9F05a8C9d1
   address internal constant AAVE_ORACLE = 0x338ed6787f463394D24813b297401B9F05a8C9d1;
 
-  // https://explorer.optimism.io/address/0xeE1BAc9355EaAfCD1B68d272d640d870bC9b4b5C
+  // https://optimistic.etherscan.io/address/0xeE1BAc9355EaAfCD1B68d272d640d870bC9b4b5C
   address internal constant AAVE_INTEREST_RATE_STRATEGY =
     0xeE1BAc9355EaAfCD1B68d272d640d870bC9b4b5C;
 
-  // https://explorer.optimism.io/address/0xae0Ca1B1Bc6cac26981B5e2b9c40f8Ce8A9082eE
+  // https://optimistic.etherscan.io/address/0xae0Ca1B1Bc6cac26981B5e2b9c40f8Ce8A9082eE
   address internal constant AAVE_STATA_TOKEN = 0xae0Ca1B1Bc6cac26981B5e2b9c40f8Ce8A9082eE;
 
-  // https://explorer.optimism.io/address/0x8c6f28f2F1A3C87F0f938b96d27520d9751ec8d9
+  // https://optimistic.etherscan.io/address/0x8c6f28f2F1A3C87F0f938b96d27520d9751ec8d9
   address internal constant sUSD_UNDERLYING = 0x8c6f28f2F1A3C87F0f938b96d27520d9751ec8d9;
 
   uint8 internal constant sUSD_DECIMALS = 18;
 
-  // https://explorer.optimism.io/address/0x6d80113e533a2C0fe82EaBD35f1875DcEA89Ea97
+  // https://optimistic.etherscan.io/address/0x6d80113e533a2C0fe82EaBD35f1875DcEA89Ea97
   address internal constant sUSD_A_TOKEN = 0x6d80113e533a2C0fe82EaBD35f1875DcEA89Ea97;
 
-  // https://explorer.optimism.io/address/0x4a1c3aD6Ed28a636ee1751C69071f6be75DEb8B8
+  // https://optimistic.etherscan.io/address/0x4a1c3aD6Ed28a636ee1751C69071f6be75DEb8B8
   address internal constant sUSD_V_TOKEN = 0x4a1c3aD6Ed28a636ee1751C69071f6be75DEb8B8;
 
-  // https://explorer.optimism.io/address/0xF15F26710c827DDe8ACBA678682F3Ce24f2Fb56E
+  // https://optimistic.etherscan.io/address/0xF15F26710c827DDe8ACBA678682F3Ce24f2Fb56E
   address internal constant sUSD_S_TOKEN = 0xF15F26710c827DDe8ACBA678682F3Ce24f2Fb56E;
 
-  // https://explorer.optimism.io/address/0x7f99817d87baD03ea21E05112Ca799d715730efe
+  // https://optimistic.etherscan.io/address/0x7f99817d87baD03ea21E05112Ca799d715730efe
   address internal constant sUSD_ORACLE = 0x7f99817d87baD03ea21E05112Ca799d715730efe;
 
-  // https://explorer.optimism.io/address/0xD61ca03Eac0352090f45bE50403F7B17d20E11F2
+  // https://optimistic.etherscan.io/address/0x424883C7dD9Bd129BC346A65E8455CDe9fC0c43C
   address internal constant sUSD_INTEREST_RATE_STRATEGY =
-    0xD61ca03Eac0352090f45bE50403F7B17d20E11F2;
+    0x424883C7dD9Bd129BC346A65E8455CDe9fC0c43C;
 
-  // https://explorer.optimism.io/address/0x3A956E2Fcc7e71Ea14b0257d40BEbdB287d19652
+  // https://optimistic.etherscan.io/address/0x3A956E2Fcc7e71Ea14b0257d40BEbdB287d19652
   address internal constant sUSD_STATA_TOKEN = 0x3A956E2Fcc7e71Ea14b0257d40BEbdB287d19652;
 
-  // https://explorer.optimism.io/address/0x4200000000000000000000000000000000000042
+  // https://optimistic.etherscan.io/address/0x4200000000000000000000000000000000000042
   address internal constant OP_UNDERLYING = 0x4200000000000000000000000000000000000042;
 
   uint8 internal constant OP_DECIMALS = 18;
 
-  // https://explorer.optimism.io/address/0x513c7E3a9c69cA3e22550eF58AC1C0088e918FFf
+  // https://optimistic.etherscan.io/address/0x513c7E3a9c69cA3e22550eF58AC1C0088e918FFf
   address internal constant OP_A_TOKEN = 0x513c7E3a9c69cA3e22550eF58AC1C0088e918FFf;
 
-  // https://explorer.optimism.io/address/0x77CA01483f379E58174739308945f044e1a764dc
+  // https://optimistic.etherscan.io/address/0x77CA01483f379E58174739308945f044e1a764dc
   address internal constant OP_V_TOKEN = 0x77CA01483f379E58174739308945f044e1a764dc;
 
-  // https://explorer.optimism.io/address/0x08Cb71192985E936C7Cd166A8b268035e400c3c3
+  // https://optimistic.etherscan.io/address/0x08Cb71192985E936C7Cd166A8b268035e400c3c3
   address internal constant OP_S_TOKEN = 0x08Cb71192985E936C7Cd166A8b268035e400c3c3;
 
-  // https://explorer.optimism.io/address/0x0D276FC14719f9292D5C1eA2198673d1f4269246
+  // https://optimistic.etherscan.io/address/0x0D276FC14719f9292D5C1eA2198673d1f4269246
   address internal constant OP_ORACLE = 0x0D276FC14719f9292D5C1eA2198673d1f4269246;
 
-  // https://explorer.optimism.io/address/0xeE1BAc9355EaAfCD1B68d272d640d870bC9b4b5C
+  // https://optimistic.etherscan.io/address/0xeE1BAc9355EaAfCD1B68d272d640d870bC9b4b5C
   address internal constant OP_INTEREST_RATE_STRATEGY = 0xeE1BAc9355EaAfCD1B68d272d640d870bC9b4b5C;
 
-  // https://explorer.optimism.io/address/0xd4F1Cf9A038269FE8F03745C2875591Ad6438ab1
+  // https://optimistic.etherscan.io/address/0xd4F1Cf9A038269FE8F03745C2875591Ad6438ab1
   address internal constant OP_STATA_TOKEN = 0xd4F1Cf9A038269FE8F03745C2875591Ad6438ab1;
 
-  // https://explorer.optimism.io/address/0x1F32b1c2345538c0c6f582fCB022739c4A194Ebb
+  // https://optimistic.etherscan.io/address/0x1F32b1c2345538c0c6f582fCB022739c4A194Ebb
   address internal constant wstETH_UNDERLYING = 0x1F32b1c2345538c0c6f582fCB022739c4A194Ebb;
 
   uint8 internal constant wstETH_DECIMALS = 18;
 
-  // https://explorer.optimism.io/address/0xc45A479877e1e9Dfe9FcD4056c699575a1045dAA
+  // https://optimistic.etherscan.io/address/0xc45A479877e1e9Dfe9FcD4056c699575a1045dAA
   address internal constant wstETH_A_TOKEN = 0xc45A479877e1e9Dfe9FcD4056c699575a1045dAA;
 
-  // https://explorer.optimism.io/address/0x34e2eD44EF7466D5f9E0b782B5c08b57475e7907
+  // https://optimistic.etherscan.io/address/0x34e2eD44EF7466D5f9E0b782B5c08b57475e7907
   address internal constant wstETH_V_TOKEN = 0x34e2eD44EF7466D5f9E0b782B5c08b57475e7907;
 
-  // https://explorer.optimism.io/address/0x78246294a4c6fBf614Ed73CcC9F8b875ca8eE841
+  // https://optimistic.etherscan.io/address/0x78246294a4c6fBf614Ed73CcC9F8b875ca8eE841
   address internal constant wstETH_S_TOKEN = 0x78246294a4c6fBf614Ed73CcC9F8b875ca8eE841;
 
-  // https://explorer.optimism.io/address/0x80f2c02224a2E548FC67c0bF705eBFA825dd5439
+  // https://optimistic.etherscan.io/address/0x80f2c02224a2E548FC67c0bF705eBFA825dd5439
   address internal constant wstETH_ORACLE = 0x80f2c02224a2E548FC67c0bF705eBFA825dd5439;
 
-  // https://explorer.optimism.io/address/0x6BA97468e2e6a3711a6DD05F0075d48E878c910e
+  // https://optimistic.etherscan.io/address/0x6BA97468e2e6a3711a6DD05F0075d48E878c910e
   address internal constant wstETH_INTEREST_RATE_STRATEGY =
     0x6BA97468e2e6a3711a6DD05F0075d48E878c910e;
 
-  // https://explorer.optimism.io/address/0xb972abef80046A57409e37a7DF5dEf2638917516
+  // https://optimistic.etherscan.io/address/0xb972abef80046A57409e37a7DF5dEf2638917516
   address internal constant wstETH_STATA_TOKEN = 0xb972abef80046A57409e37a7DF5dEf2638917516;
 
-  // https://explorer.optimism.io/address/0xc40F949F8a4e094D1b49a23ea9241D289B7b2819
+  // https://optimistic.etherscan.io/address/0xc40F949F8a4e094D1b49a23ea9241D289B7b2819
   address internal constant LUSD_UNDERLYING = 0xc40F949F8a4e094D1b49a23ea9241D289B7b2819;
 
   uint8 internal constant LUSD_DECIMALS = 18;
 
-  // https://explorer.optimism.io/address/0x8Eb270e296023E9D92081fdF967dDd7878724424
+  // https://optimistic.etherscan.io/address/0x8Eb270e296023E9D92081fdF967dDd7878724424
   address internal constant LUSD_A_TOKEN = 0x8Eb270e296023E9D92081fdF967dDd7878724424;
 
-  // https://explorer.optimism.io/address/0xCE186F6Cccb0c955445bb9d10C59caE488Fea559
+  // https://optimistic.etherscan.io/address/0xCE186F6Cccb0c955445bb9d10C59caE488Fea559
   address internal constant LUSD_V_TOKEN = 0xCE186F6Cccb0c955445bb9d10C59caE488Fea559;
 
-  // https://explorer.optimism.io/address/0x3EF10DFf4928279c004308EbADc4Db8B7620d6fc
+  // https://optimistic.etherscan.io/address/0x3EF10DFf4928279c004308EbADc4Db8B7620d6fc
   address internal constant LUSD_S_TOKEN = 0x3EF10DFf4928279c004308EbADc4Db8B7620d6fc;
 
-  // https://explorer.optimism.io/address/0x9dfc79Aaeb5bb0f96C6e9402671981CdFc424052
+  // https://optimistic.etherscan.io/address/0x9dfc79Aaeb5bb0f96C6e9402671981CdFc424052
   address internal constant LUSD_ORACLE = 0x9dfc79Aaeb5bb0f96C6e9402671981CdFc424052;
 
-  // https://explorer.optimism.io/address/0x41365f2aC2D19c3B4Bc691007d314aba80af3669
+  // https://optimistic.etherscan.io/address/0x5F58C62077b667370879D6580a59f47C30f96a74
   address internal constant LUSD_INTEREST_RATE_STRATEGY =
-    0x41365f2aC2D19c3B4Bc691007d314aba80af3669;
+    0x5F58C62077b667370879D6580a59f47C30f96a74;
 
-  // https://explorer.optimism.io/address/0x84648dc3Cefb601bc28a49A07a1A8Bad04D30Ad3
+  // https://optimistic.etherscan.io/address/0x84648dc3Cefb601bc28a49A07a1A8Bad04D30Ad3
   address internal constant LUSD_STATA_TOKEN = 0x84648dc3Cefb601bc28a49A07a1A8Bad04D30Ad3;
 
-  // https://explorer.optimism.io/address/0xdFA46478F9e5EA86d57387849598dbFB2e964b02
+  // https://optimistic.etherscan.io/address/0xdFA46478F9e5EA86d57387849598dbFB2e964b02
   address internal constant MAI_UNDERLYING = 0xdFA46478F9e5EA86d57387849598dbFB2e964b02;
 
   uint8 internal constant MAI_DECIMALS = 18;
 
-  // https://explorer.optimism.io/address/0x8ffDf2DE812095b1D19CB146E4c004587C0A0692
+  // https://optimistic.etherscan.io/address/0x8ffDf2DE812095b1D19CB146E4c004587C0A0692
   address internal constant MAI_A_TOKEN = 0x8ffDf2DE812095b1D19CB146E4c004587C0A0692;
 
-  // https://explorer.optimism.io/address/0xA8669021776Bc142DfcA87c21b4A52595bCbB40a
+  // https://optimistic.etherscan.io/address/0xA8669021776Bc142DfcA87c21b4A52595bCbB40a
   address internal constant MAI_V_TOKEN = 0xA8669021776Bc142DfcA87c21b4A52595bCbB40a;
 
-  // https://explorer.optimism.io/address/0xa5e408678469d23efDB7694b1B0A85BB0669e8bd
+  // https://optimistic.etherscan.io/address/0xa5e408678469d23efDB7694b1B0A85BB0669e8bd
   address internal constant MAI_S_TOKEN = 0xa5e408678469d23efDB7694b1B0A85BB0669e8bd;
 
-  // https://explorer.optimism.io/address/0x73A3919a69eFCd5b19df8348c6740bB1446F5ed0
+  // https://optimistic.etherscan.io/address/0x73A3919a69eFCd5b19df8348c6740bB1446F5ed0
   address internal constant MAI_ORACLE = 0x73A3919a69eFCd5b19df8348c6740bB1446F5ed0;
 
-  // https://explorer.optimism.io/address/0x049E42fe40368384d04bC10f8494Ea6FD164442a
-  address internal constant MAI_INTEREST_RATE_STRATEGY = 0x049E42fe40368384d04bC10f8494Ea6FD164442a;
+  // https://optimistic.etherscan.io/address/0x8e3dC8151C46e0547045Ef57a82798CDF91adB4A
+  address internal constant MAI_INTEREST_RATE_STRATEGY = 0x8e3dC8151C46e0547045Ef57a82798CDF91adB4A;
 
-  // https://explorer.optimism.io/address/0x60495bC8D8Baf7E866888ecC00491e37B47dfF24
+  // https://optimistic.etherscan.io/address/0x60495bC8D8Baf7E866888ecC00491e37B47dfF24
   address internal constant MAI_STATA_TOKEN = 0x60495bC8D8Baf7E866888ecC00491e37B47dfF24;
 
-  // https://explorer.optimism.io/address/0x9Bcef72be871e61ED4fBbc7630889beE758eb81D
+  // https://optimistic.etherscan.io/address/0x9Bcef72be871e61ED4fBbc7630889beE758eb81D
   address internal constant rETH_UNDERLYING = 0x9Bcef72be871e61ED4fBbc7630889beE758eb81D;
 
   uint8 internal constant rETH_DECIMALS = 18;
 
-  // https://explorer.optimism.io/address/0x724dc807b04555b71ed48a6896b6F41593b8C637
+  // https://optimistic.etherscan.io/address/0x724dc807b04555b71ed48a6896b6F41593b8C637
   address internal constant rETH_A_TOKEN = 0x724dc807b04555b71ed48a6896b6F41593b8C637;
 
-  // https://explorer.optimism.io/address/0xf611aEb5013fD2c0511c9CD55c7dc5C1140741A6
+  // https://optimistic.etherscan.io/address/0xf611aEb5013fD2c0511c9CD55c7dc5C1140741A6
   address internal constant rETH_V_TOKEN = 0xf611aEb5013fD2c0511c9CD55c7dc5C1140741A6;
 
-  // https://explorer.optimism.io/address/0xDC1fad70953Bb3918592b6fCc374fe05F5811B6a
+  // https://optimistic.etherscan.io/address/0xDC1fad70953Bb3918592b6fCc374fe05F5811B6a
   address internal constant rETH_S_TOKEN = 0xDC1fad70953Bb3918592b6fCc374fe05F5811B6a;
 
-  // https://explorer.optimism.io/address/0x52d5F9f884CA21C27E2100735d793C6771eAB793
+  // https://optimistic.etherscan.io/address/0x52d5F9f884CA21C27E2100735d793C6771eAB793
   address internal constant rETH_ORACLE = 0x52d5F9f884CA21C27E2100735d793C6771eAB793;
 
-  // https://explorer.optimism.io/address/0x3B57B081dA6Af5e2759A57bD3211932Cb6176997
+  // https://optimistic.etherscan.io/address/0x3B57B081dA6Af5e2759A57bD3211932Cb6176997
   address internal constant rETH_INTEREST_RATE_STRATEGY =
     0x3B57B081dA6Af5e2759A57bD3211932Cb6176997;
 
-  // https://explorer.optimism.io/address/0xf9ce3c97b4b54F3D16861420f4816D9f68190B7B
+  // https://optimistic.etherscan.io/address/0xf9ce3c97b4b54F3D16861420f4816D9f68190B7B
   address internal constant rETH_STATA_TOKEN = 0xf9ce3c97b4b54F3D16861420f4816D9f68190B7B;
 
-  // https://explorer.optimism.io/address/0x0b2C639c533813f4Aa9D7837CAf62653d097Ff85
+  // https://optimistic.etherscan.io/address/0x0b2C639c533813f4Aa9D7837CAf62653d097Ff85
   address internal constant USDCn_UNDERLYING = 0x0b2C639c533813f4Aa9D7837CAf62653d097Ff85;
 
   uint8 internal constant USDCn_DECIMALS = 6;
 
-  // https://explorer.optimism.io/address/0x38d693cE1dF5AaDF7bC62595A37D667aD57922e5
+  // https://optimistic.etherscan.io/address/0x38d693cE1dF5AaDF7bC62595A37D667aD57922e5
   address internal constant USDCn_A_TOKEN = 0x38d693cE1dF5AaDF7bC62595A37D667aD57922e5;
 
-  // https://explorer.optimism.io/address/0x5D557B07776D12967914379C71a1310e917C7555
+  // https://optimistic.etherscan.io/address/0x5D557B07776D12967914379C71a1310e917C7555
   address internal constant USDCn_V_TOKEN = 0x5D557B07776D12967914379C71a1310e917C7555;
 
-  // https://explorer.optimism.io/address/0x8a9FdE6925a839F6B1932d16B36aC026F8d3FbdB
+  // https://optimistic.etherscan.io/address/0x8a9FdE6925a839F6B1932d16B36aC026F8d3FbdB
   address internal constant USDCn_S_TOKEN = 0x8a9FdE6925a839F6B1932d16B36aC026F8d3FbdB;
 
-  // https://explorer.optimism.io/address/0x16a9FA2FDa030272Ce99B29CF780dFA30361E0f3
+  // https://optimistic.etherscan.io/address/0x16a9FA2FDa030272Ce99B29CF780dFA30361E0f3
   address internal constant USDCn_ORACLE = 0x16a9FA2FDa030272Ce99B29CF780dFA30361E0f3;
 
-  // https://explorer.optimism.io/address/0xB57Ff919A953424d6B143ABfD6740A225eab953e
+  // https://optimistic.etherscan.io/address/0xb83d1B74e1D917d4a95C1e9392f6c639932F444C
   address internal constant USDCn_INTEREST_RATE_STRATEGY =
-    0xB57Ff919A953424d6B143ABfD6740A225eab953e;
+    0xb83d1B74e1D917d4a95C1e9392f6c639932F444C;
 }
 
 library AaveV3OptimismEModes {
diff --git a/src/AaveV3Polygon.sol b/src/AaveV3Polygon.sol
index 1abcf31b..ed6483f0 100644
--- a/src/AaveV3Polygon.sol
+++ b/src/AaveV3Polygon.sol
@@ -118,8 +118,8 @@ library AaveV3PolygonAssets {
   // https://polygonscan.com/address/0x4746DeC9e833A82EC7C2C1356372CcF2cfcD2F3D
   address internal constant DAI_ORACLE = 0x4746DeC9e833A82EC7C2C1356372CcF2cfcD2F3D;
 
-  // https://polygonscan.com/address/0xdef8F50155A6cf21181E29E400E8CffAE2d50968
-  address internal constant DAI_INTEREST_RATE_STRATEGY = 0xdef8F50155A6cf21181E29E400E8CffAE2d50968;
+  // https://polygonscan.com/address/0xaDbdb3d6B51151e4CDF32e4050B6F03D2bfB6477
+  address internal constant DAI_INTEREST_RATE_STRATEGY = 0xaDbdb3d6B51151e4CDF32e4050B6F03D2bfB6477;
 
   // https://polygonscan.com/address/0x83c59636e602787A6EEbBdA2915217B416193FcB
   address internal constant DAI_STATA_TOKEN = 0x83c59636e602787A6EEbBdA2915217B416193FcB;
@@ -237,9 +237,9 @@ library AaveV3PolygonAssets {
   // https://polygonscan.com/address/0x0A6513e40db6EB1b165753AD52E80663aeA50545
   address internal constant USDT_ORACLE = 0x0A6513e40db6EB1b165753AD52E80663aeA50545;
 
-  // https://polygonscan.com/address/0xdef8F50155A6cf21181E29E400E8CffAE2d50968
+  // https://polygonscan.com/address/0xaDbdb3d6B51151e4CDF32e4050B6F03D2bfB6477
   address internal constant USDT_INTEREST_RATE_STRATEGY =
-    0xdef8F50155A6cf21181E29E400E8CffAE2d50968;
+    0xaDbdb3d6B51151e4CDF32e4050B6F03D2bfB6477;
 
   // https://polygonscan.com/address/0x87A1fdc4C726c459f597282be639a045062c0E46
   address internal constant USDT_STATA_TOKEN = 0x87A1fdc4C726c459f597282be639a045062c0E46;
@@ -498,9 +498,9 @@ library AaveV3PolygonAssets {
   // https://polygonscan.com/address/0xd8d483d813547CfB624b8Dc33a00F2fcbCd2D428
   address internal constant miMATIC_ORACLE = 0xd8d483d813547CfB624b8Dc33a00F2fcbCd2D428;
 
-  // https://polygonscan.com/address/0xA901Bf68Bebde17ba382e499C3e9EbAe649DF276
+  // https://polygonscan.com/address/0x44CaDF6E49895640D9De85ac01d97D44429Ad0A4
   address internal constant miMATIC_INTEREST_RATE_STRATEGY =
-    0xA901Bf68Bebde17ba382e499C3e9EbAe649DF276;
+    0x44CaDF6E49895640D9De85ac01d97D44429Ad0A4;
 
   // https://polygonscan.com/address/0x8486B49433cCed038b51d18Ae3772CDB7E31CA5e
   address internal constant miMATIC_STATA_TOKEN = 0x8486B49433cCed038b51d18Ae3772CDB7E31CA5e;
@@ -594,9 +594,9 @@ library AaveV3PolygonAssets {
   // https://polygonscan.com/address/0xfE4A8cc5b5B2366C1B58Bea3858e81843581b2F7
   address internal constant USDCn_ORACLE = 0xfE4A8cc5b5B2366C1B58Bea3858e81843581b2F7;
 
-  // https://polygonscan.com/address/0x53b13a6D43F647D788411Abfd28D229C274AfBF9
+  // https://polygonscan.com/address/0x642a8DAcC59b73491Dcaa3BCeF046D660901fCc1
   address internal constant USDCn_INTEREST_RATE_STRATEGY =
-    0x53b13a6D43F647D788411Abfd28D229C274AfBF9;
+    0x642a8DAcC59b73491Dcaa3BCeF046D660901fCc1;
 }
 
 library AaveV3PolygonEModes {
diff --git a/src/AaveV3Sepolia.sol b/src/AaveV3Sepolia.sol
index 917f2bfb..cd5ba525 100644
--- a/src/AaveV3Sepolia.sol
+++ b/src/AaveV3Sepolia.sol
@@ -265,6 +265,26 @@ library AaveV3SepoliaAssets {
 
   // https://sepolia.etherscan.io/address/0x72B49a461900e11632C95dfa563e7173438D4e3E
   address internal constant EURS_STATA_TOKEN = 0x72B49a461900e11632C95dfa563e7173438D4e3E;
+
+  // https://sepolia.etherscan.io/address/0xc4bF5CbDaBE595361438F8c6a187bDc330539c60
+  address internal constant GHO_UNDERLYING = 0xc4bF5CbDaBE595361438F8c6a187bDc330539c60;
+
+  uint8 internal constant GHO_DECIMALS = 18;
+
+  // https://sepolia.etherscan.io/address/0xd190eF37dB51Bb955A680fF1A85763CC72d083D4
+  address internal constant GHO_A_TOKEN = 0xd190eF37dB51Bb955A680fF1A85763CC72d083D4;
+
+  // https://sepolia.etherscan.io/address/0x67ae46EF043F7A4508BD1d6B94DB6c33F0915844
+  address internal constant GHO_V_TOKEN = 0x67ae46EF043F7A4508BD1d6B94DB6c33F0915844;
+
+  // https://sepolia.etherscan.io/address/0xdCA691FB9609aB814E59c62d70783da1c056A9b6
+  address internal constant GHO_S_TOKEN = 0xdCA691FB9609aB814E59c62d70783da1c056A9b6;
+
+  // https://sepolia.etherscan.io/address/0x00f7fecFAEbEd9499e1f3f9d04E755a21E5fc47C
+  address internal constant GHO_ORACLE = 0x00f7fecFAEbEd9499e1f3f9d04E755a21E5fc47C;
+
+  // https://sepolia.etherscan.io/address/0x521247B4d0a51E71DE580dA2cBF99EB40a44b3Bf
+  address internal constant GHO_INTEREST_RATE_STRATEGY = 0x521247B4d0a51E71DE580dA2cBF99EB40a44b3Bf;
 }
 
 library AaveV3SepoliaEModes {
diff --git a/src/GovernanceV3Optimism.sol b/src/GovernanceV3Optimism.sol
index 1ca42441..7f615dbc 100644
--- a/src/GovernanceV3Optimism.sol
+++ b/src/GovernanceV3Optimism.sol
@@ -5,19 +5,19 @@ pragma solidity >=0.6.0;
 import {IGovernanceCore, IPayloadsControllerCore, IDataWarehouse, IVotingStrategy} from './GovernanceV3.sol';
 
 library GovernanceV3Optimism {
-  // https://explorer.optimism.io/address/0x48A9FE90bce5EEd790f3F4Ce192d1C0B351fd4Ca
+  // https://optimistic.etherscan.io/address/0x48A9FE90bce5EEd790f3F4Ce192d1C0B351fd4Ca
   address internal constant CROSS_CHAIN_CONTROLLER = 0x48A9FE90bce5EEd790f3F4Ce192d1C0B351fd4Ca;
 
-  // https://explorer.optimism.io/address/0x0E1a3Af1f9cC76A62eD31eDedca291E63632e7c4
+  // https://optimistic.etherscan.io/address/0x0E1a3Af1f9cC76A62eD31eDedca291E63632e7c4
   IPayloadsControllerCore internal constant PAYLOADS_CONTROLLER =
     IPayloadsControllerCore(0x0E1a3Af1f9cC76A62eD31eDedca291E63632e7c4);
 
-  // https://explorer.optimism.io/address/0xE3B770Dc4ae3f8bECaB3Ed12dE692c741603e16A
+  // https://optimistic.etherscan.io/address/0xE3B770Dc4ae3f8bECaB3Ed12dE692c741603e16A
   address internal constant PC_DATA_HELPER = 0xE3B770Dc4ae3f8bECaB3Ed12dE692c741603e16A;
 
-  // https://explorer.optimism.io/address/0x746c675dAB49Bcd5BB9Dc85161f2d7Eb435009bf
+  // https://optimistic.etherscan.io/address/0x746c675dAB49Bcd5BB9Dc85161f2d7Eb435009bf
   address internal constant EXECUTOR_LVL_1 = 0x746c675dAB49Bcd5BB9Dc85161f2d7Eb435009bf;
 
-  // https://explorer.optimism.io/address/0x0000000000000000000000000000000000000000
+  // https://optimistic.etherscan.io/address/0x0000000000000000000000000000000000000000
   address internal constant EXECUTOR_LVL_2 = 0x0000000000000000000000000000000000000000;
 }
diff --git a/src/MiscOptimism.sol b/src/MiscOptimism.sol
index 85f4b374..dda806ba 100644
--- a/src/MiscOptimism.sol
+++ b/src/MiscOptimism.sol
@@ -3,21 +3,21 @@
 pragma solidity >=0.6.0;
 
 library MiscOptimism {
-  // https://explorer.optimism.io/address/0x9abf798f5314BFd793A9E57A654BEd35af4A1D60
+  // https://optimistic.etherscan.io/address/0x9abf798f5314BFd793A9E57A654BEd35af4A1D60
   address internal constant PARASWAP_FEE_CLAIMER = 0x9abf798f5314BFd793A9E57A654BEd35af4A1D60;
 
-  // https://explorer.optimism.io/address/0xB4e496f70602fE2AC6Ae511D028BA4D194773B29
+  // https://optimistic.etherscan.io/address/0xB4e496f70602fE2AC6Ae511D028BA4D194773B29
   address internal constant TRANSPARENT_PROXY_FACTORY = 0xB4e496f70602fE2AC6Ae511D028BA4D194773B29;
 
-  // https://explorer.optimism.io/address/0xD3cF979e676265e4f6379749DECe4708B9A22476
+  // https://optimistic.etherscan.io/address/0xD3cF979e676265e4f6379749DECe4708B9A22476
   address internal constant PROXY_ADMIN = 0xD3cF979e676265e4f6379749DECe4708B9A22476;
 
-  // https://explorer.optimism.io/address/0x3b56998Ec06477704622ca8e2eA1b4db134cec32
+  // https://optimistic.etherscan.io/address/0x3b56998Ec06477704622ca8e2eA1b4db134cec32
   address internal constant CREATE_3_FACTORY = 0x3b56998Ec06477704622ca8e2eA1b4db134cec32;
 
-  // https://explorer.optimism.io/address/0xE50c8C619d05ff98b22Adf991F17602C774F785c
+  // https://optimistic.etherscan.io/address/0xE50c8C619d05ff98b22Adf991F17602C774F785c
   address internal constant PROTOCOL_GUARDIAN = 0xE50c8C619d05ff98b22Adf991F17602C774F785c;
 
-  // https://explorer.optimism.io/address/0x1685D81212580DD4cDA287616C2f6F4794927e18
+  // https://optimistic.etherscan.io/address/0x1685D81212580DD4cDA287616C2f6F4794927e18
   address internal constant AAVE_MERKLE_DISTRIBUTOR = 0x1685D81212580DD4cDA287616C2f6F4794927e18;
 }
diff --git a/src/ts/AaveAddressBook.ts b/src/ts/AaveAddressBook.ts
index 08955ad2..9d1662ba 100644
--- a/src/ts/AaveAddressBook.ts
+++ b/src/ts/AaveAddressBook.ts
@@ -38,11 +38,9 @@ export * as AaveV3Arbitrum from './AaveV3Arbitrum';
 export * as AaveV3OptimismGoerli from './AaveV3OptimismGoerli';
 export * as AaveV3Optimism from './AaveV3Optimism';
 export * as AaveV3Scroll from './AaveV3Scroll';
-export * as AaveV3ScrollAlpha from './AaveV3ScrollAlpha';
 export * as AaveV3ScrollSepolia from './AaveV3ScrollSepolia';
 export * as AaveV3FantomTestnet from './AaveV3FantomTestnet';
 export * as AaveV3Fantom from './AaveV3Fantom';
-export * as AaveV3Harmony from './AaveV3Harmony';
 export * as MiscArbitrum from './MiscArbitrum';
 export * as MiscAvalanche from './MiscAvalanche';
 export * as MiscBase from './MiscBase';
@@ -84,3 +82,4 @@ export {IGovernanceDataHelper_ABI} from './abis/IGovernanceDataHelper';
 export {IMetaDelegateHelper_ABI} from './abis/IMetaDelegateHelper';
 export {IVotingMachineDataHelper_ABI} from './abis/IVotingMachineDataHelper';
 export {IUiPoolDataProvider_ABI} from './abis/IUiPoolDataProvider';
+export * as AaveV3Harmony from './AaveV3Harmony';
diff --git a/src/ts/AaveGovernanceV2.ts b/src/ts/AaveGovernanceV2.ts
index 25f286fe..9f1c6a79 100644
--- a/src/ts/AaveGovernanceV2.ts
+++ b/src/ts/AaveGovernanceV2.ts
@@ -17,7 +17,7 @@ export const ARC_TIMELOCK = '0xAce1d11d836cb3F51Ef658FD4D353fFb3c301218';
 // address https://polygonscan.com/address/0xdc9A35B16DB4e126cFeDC41322b3a36454B1F772
 export const POLYGON_BRIDGE_EXECUTOR = '0xdc9A35B16DB4e126cFeDC41322b3a36454B1F772';
 
-// address https://explorer.optimism.io/address/0x7d9103572bE58FfE99dc390E8246f02dcAe6f611
+// address https://optimistic.etherscan.io/address/0x7d9103572bE58FfE99dc390E8246f02dcAe6f611
 export const OPTIMISM_BRIDGE_EXECUTOR = '0x7d9103572bE58FfE99dc390E8246f02dcAe6f611';
 
 // address https://arbiscan.io/address/0x7d9103572bE58FfE99dc390E8246f02dcAe6f611
diff --git a/src/ts/AaveV2Avalanche.ts b/src/ts/AaveV2Avalanche.ts
index 9f33e993..399daa72 100644
--- a/src/ts/AaveV2Avalanche.ts
+++ b/src/ts/AaveV2Avalanche.ts
@@ -91,7 +91,7 @@ export const ASSETS = {
     A_TOKEN: '0x47AFa96Cdc9fAb46904A55a6ad4bf6660B53c38a',
     S_TOKEN: '0x3676E4EE689D527dDb89812B63fAD0B7501772B3',
     V_TOKEN: '0x1852DC24d1a8956a0B356AA18eDe954c7a0Ca5ae',
-    INTEREST_RATE_STRATEGY: '0x116EFD5652A9993A5984055B2da7eb9acfB48Fd2',
+    INTEREST_RATE_STRATEGY: '0xa7C0f85c626761eDD0875549aD09E8d3f5446695',
     ORACLE: '0x51D7180edA2260cc4F6e4EebB82FEF5c3c2B8300',
   },
   USDTe: {
@@ -100,7 +100,7 @@ export const ASSETS = {
     A_TOKEN: '0x532E6537FEA298397212F09A61e03311686f548e',
     S_TOKEN: '0x9c7B81A867499B7387ed05017a13d4172a0c17bF',
     V_TOKEN: '0xfc1AdA7A288d6fCe0d29CcfAAa57Bc9114bb2DbE',
-    INTEREST_RATE_STRATEGY: '0x116EFD5652A9993A5984055B2da7eb9acfB48Fd2',
+    INTEREST_RATE_STRATEGY: '0xa7C0f85c626761eDD0875549aD09E8d3f5446695',
     ORACLE: '0xEBE676ee90Fe1112671f19b6B7459bC678B67e8a',
   },
   USDCe: {
@@ -109,7 +109,7 @@ export const ASSETS = {
     A_TOKEN: '0x46A51127C3ce23fb7AB1DE06226147F446e4a857',
     S_TOKEN: '0x5B14679135dbE8B02015ec3Ca4924a12E4C6C85a',
     V_TOKEN: '0x848c080d2700CBE1B894a3374AD5E887E5cCb89c',
-    INTEREST_RATE_STRATEGY: '0x116EFD5652A9993A5984055B2da7eb9acfB48Fd2',
+    INTEREST_RATE_STRATEGY: '0xa7C0f85c626761eDD0875549aD09E8d3f5446695',
     ORACLE: '0xF096872672F44d6EBA71458D74fe67F9a77a23B9',
   },
   AAVEe: {
diff --git a/src/ts/AaveV2Polygon.ts b/src/ts/AaveV2Polygon.ts
index 5c114119..2e917ae5 100644
--- a/src/ts/AaveV2Polygon.ts
+++ b/src/ts/AaveV2Polygon.ts
@@ -76,7 +76,7 @@ export const ASSETS = {
     A_TOKEN: '0x27F8D03b3a2196956ED754baDc28D73be8830A6e',
     S_TOKEN: '0x2238101B7014C279aaF6b408A284E49cDBd5DB55',
     V_TOKEN: '0x75c4d1Fb84429023170086f06E682DcbBF537b7d',
-    INTEREST_RATE_STRATEGY: '0x283Df7893eF10F729890017F57d76B8D78e18915',
+    INTEREST_RATE_STRATEGY: '0xa966adA364E0491520a1235aAA9cf15E08c1Db05',
     ORACLE: '0xFC539A559e170f848323e19dfD66007520510085',
   },
   USDC: {
@@ -85,7 +85,7 @@ export const ASSETS = {
     A_TOKEN: '0x1a13F4Ca1d028320A707D99520AbFefca3998b7F',
     S_TOKEN: '0xdeb05676dB0DB85cecafE8933c903466Bf20C572',
     V_TOKEN: '0x248960A9d75EdFa3de94F7193eae3161Eb349a12',
-    INTEREST_RATE_STRATEGY: '0xc7008Df6B900b41CD528ceb23283Cf4BBCd0ac6E',
+    INTEREST_RATE_STRATEGY: '0x2ad5a608a920E7061ccE38955C89A7c3F4c0aba7',
     ORACLE: '0xefb7e6be8356cCc6827799B6A7348eE674A80EaE',
   },
   USDT: {
@@ -94,7 +94,7 @@ export const ASSETS = {
     A_TOKEN: '0x60D55F02A771d515e077c9C2403a1ef324885CeC',
     S_TOKEN: '0xe590cfca10e81FeD9B0e4496381f02256f5d2f61',
     V_TOKEN: '0x8038857FD47108A07d1f6Bf652ef1cBeC279A2f3',
-    INTEREST_RATE_STRATEGY: '0x8D6dA015e69A84644BFc7455F871bDe2A7Fedf39',
+    INTEREST_RATE_STRATEGY: '0x7892E4Db4C172e7Af389677c04c42eE3F8Fd5447',
     ORACLE: '0xf9d5AAC6E5572AEFa6bd64108ff86a222F69B64d',
   },
   WBTC: {
diff --git a/src/ts/AaveV3Arbitrum.ts b/src/ts/AaveV3Arbitrum.ts
index b93b5653..bf523093 100644
--- a/src/ts/AaveV3Arbitrum.ts
+++ b/src/ts/AaveV3Arbitrum.ts
@@ -94,7 +94,7 @@ export const ASSETS = {
     A_TOKEN: '0x82E64f49Ed5EC1bC6e43DAD4FC8Af9bb3A2312EE',
     S_TOKEN: '0xd94112B5B62d53C9402e7A60289c6810dEF1dC9B',
     V_TOKEN: '0x8619d80FB0141ba7F184CbF22fd724116D9f7ffC',
-    INTEREST_RATE_STRATEGY: '0xA901Bf68Bebde17ba382e499C3e9EbAe649DF276',
+    INTEREST_RATE_STRATEGY: '0x2402C25e7E45b1466c53Ef7766AAd878A4CbC237',
     ORACLE: '0xc5C8E77B397E531B8EC06BFb0048328B30E9eCfB',
     STATA_TOKEN: '0xc91c5297d7E161aCC74b482aAfCc75B85cc0bfeD',
   },
@@ -144,7 +144,7 @@ export const ASSETS = {
     A_TOKEN: '0x6ab707Aca953eDAeFBc4fD23bA73294241490620',
     S_TOKEN: '0x70eFfc565DB6EEf7B927610155602d31b670e802',
     V_TOKEN: '0xfb00AC187a8Eb5AFAE4eACE434F493Eb62672df7',
-    INTEREST_RATE_STRATEGY: '0xA901Bf68Bebde17ba382e499C3e9EbAe649DF276',
+    INTEREST_RATE_STRATEGY: '0x2402C25e7E45b1466c53Ef7766AAd878A4CbC237',
     ORACLE: '0x3f3f5dF88dC9F13eac63DF89EC16ef6e7E25DdE7',
     STATA_TOKEN: '0xb165a74407fE1e519d6bCbDeC1Ed3202B35a4140',
   },
@@ -184,7 +184,7 @@ export const ASSETS = {
     A_TOKEN: '0xc45A479877e1e9Dfe9FcD4056c699575a1045dAA',
     S_TOKEN: '0x78246294a4c6fBf614Ed73CcC9F8b875ca8eE841',
     V_TOKEN: '0x34e2eD44EF7466D5f9E0b782B5c08b57475e7907',
-    INTEREST_RATE_STRATEGY: '0x588b62C84533232E3A881e096E5D639Fa754F093',
+    INTEREST_RATE_STRATEGY: '0xc77576b02D74BBF9CdC26F3B86FD09d134416df2',
     ORACLE: '0x59644ec622243878d1464A9504F9e9a31294128a',
     STATA_TOKEN: '0xB4a0a2692D82301703B27082Cda45B083F68CAcE',
   },
@@ -204,7 +204,7 @@ export const ASSETS = {
     A_TOKEN: '0x8ffDf2DE812095b1D19CB146E4c004587C0A0692',
     S_TOKEN: '0xa5e408678469d23efDB7694b1B0A85BB0669e8bd',
     V_TOKEN: '0xA8669021776Bc142DfcA87c21b4A52595bCbB40a',
-    INTEREST_RATE_STRATEGY: '0xaDbdb3d6B51151e4CDF32e4050B6F03D2bfB6477',
+    INTEREST_RATE_STRATEGY: '0xC0B875907514131C2Fd43f0FBf59EdaB84C7e260',
     ORACLE: '0x0411D28c94d85A36bC72Cb0f875dfA8371D8fFfF',
     STATA_TOKEN: '0xDbB6314b5b07E63B7101844c0346309B79f8C20A',
   },
@@ -214,7 +214,7 @@ export const ASSETS = {
     A_TOKEN: '0x724dc807b04555b71ed48a6896b6F41593b8C637',
     S_TOKEN: '0xDC1fad70953Bb3918592b6fCc374fe05F5811B6a',
     V_TOKEN: '0xf611aEb5013fD2c0511c9CD55c7dc5C1140741A6',
-    INTEREST_RATE_STRATEGY: '0x44CaDF6E49895640D9De85ac01d97D44429Ad0A4',
+    INTEREST_RATE_STRATEGY: '0x06B1Ec378618EA736a65395eA5CAB69A2410493B',
     ORACLE: '0x50834F3163758fcC1Df9973b6e91f0F0F0434aD3',
     STATA_TOKEN: '0x7CFaDFD5645B50bE87d546f42699d863648251ad',
   },
@@ -224,7 +224,7 @@ export const ASSETS = {
     A_TOKEN: '0x38d693cE1dF5AaDF7bC62595A37D667aD57922e5',
     S_TOKEN: '0x8a9FdE6925a839F6B1932d16B36aC026F8d3FbdB',
     V_TOKEN: '0x5D557B07776D12967914379C71a1310e917C7555',
-    INTEREST_RATE_STRATEGY: '0xA901Bf68Bebde17ba382e499C3e9EbAe649DF276',
+    INTEREST_RATE_STRATEGY: '0x2402C25e7E45b1466c53Ef7766AAd878A4CbC237',
     ORACLE: '0x0809E3d38d1B4214958faf06D8b1B1a2b73f2ab8',
     STATA_TOKEN: '0x89AEc2023f89E26Dbb7eaa7a98fe3996f9d112A8',
   },
diff --git a/src/ts/AaveV3Avalanche.ts b/src/ts/AaveV3Avalanche.ts
index d943b2ff..958d8a87 100644
--- a/src/ts/AaveV3Avalanche.ts
+++ b/src/ts/AaveV3Avalanche.ts
@@ -97,7 +97,7 @@ export const ASSETS = {
     A_TOKEN: '0x82E64f49Ed5EC1bC6e43DAD4FC8Af9bb3A2312EE',
     S_TOKEN: '0xd94112B5B62d53C9402e7A60289c6810dEF1dC9B',
     V_TOKEN: '0x8619d80FB0141ba7F184CbF22fd724116D9f7ffC',
-    INTEREST_RATE_STRATEGY: '0x04daBC3C1c052AB94AA2ca80140f2b978d2F6E17',
+    INTEREST_RATE_STRATEGY: '0x6D6D3b7FC50999bf20dE5CC8e0F63AFD18B95f0e',
     ORACLE: '0x51D7180edA2260cc4F6e4EebB82FEF5c3c2B8300',
     STATA_TOKEN: '0x02F3f6c8A432C1e49f3359d7d36887C25d8A5888',
   },
@@ -117,7 +117,7 @@ export const ASSETS = {
     A_TOKEN: '0x625E7708f30cA75bfd92586e17077590C60eb4cD',
     S_TOKEN: '0x307ffe186F84a3bc2613D1eA417A5737D69A7007',
     V_TOKEN: '0xFCCf3cAbbe80101232d343252614b6A3eE81C989',
-    INTEREST_RATE_STRATEGY: '0x3B57B081dA6Af5e2759A57bD3211932Cb6176997',
+    INTEREST_RATE_STRATEGY: '0x3832311560d3B457E9cC35e5b8e06EB167D8c17D',
     ORACLE: '0xF096872672F44d6EBA71458D74fe67F9a77a23B9',
     STATA_TOKEN: '0xC509aB7bB4eDbF193b82264D499a7Fc526Cd01F4',
   },
@@ -147,7 +147,7 @@ export const ASSETS = {
     A_TOKEN: '0x6ab707Aca953eDAeFBc4fD23bA73294241490620',
     S_TOKEN: '0x70eFfc565DB6EEf7B927610155602d31b670e802',
     V_TOKEN: '0xfb00AC187a8Eb5AFAE4eACE434F493Eb62672df7',
-    INTEREST_RATE_STRATEGY: '0x04daBC3C1c052AB94AA2ca80140f2b978d2F6E17',
+    INTEREST_RATE_STRATEGY: '0x6D6D3b7FC50999bf20dE5CC8e0F63AFD18B95f0e',
     ORACLE: '0xEBE676ee90Fe1112671f19b6B7459bC678B67e8a',
     STATA_TOKEN: '0x5525Ee69BC1e354B356864187De486fab5AD67d7',
   },
@@ -187,7 +187,7 @@ export const ASSETS = {
     A_TOKEN: '0xc45A479877e1e9Dfe9FcD4056c699575a1045dAA',
     S_TOKEN: '0x78246294a4c6fBf614Ed73CcC9F8b875ca8eE841',
     V_TOKEN: '0x34e2eD44EF7466D5f9E0b782B5c08b57475e7907',
-    INTEREST_RATE_STRATEGY: '0x04daBC3C1c052AB94AA2ca80140f2b978d2F6E17',
+    INTEREST_RATE_STRATEGY: '0x6D6D3b7FC50999bf20dE5CC8e0F63AFD18B95f0e',
     ORACLE: '0xbBa56eF1565354217a3353a466edB82E8F25b08e',
     STATA_TOKEN: '0xA3c2ffE702F4cD265B2249AB5f84Fab81FFf6c73',
   },
@@ -197,7 +197,7 @@ export const ASSETS = {
     A_TOKEN: '0x8Eb270e296023E9D92081fdF967dDd7878724424',
     S_TOKEN: '0x3EF10DFf4928279c004308EbADc4Db8B7620d6fc',
     V_TOKEN: '0xCE186F6Cccb0c955445bb9d10C59caE488Fea559',
-    INTEREST_RATE_STRATEGY: '0x5f58C25D17C09c9e1892F45DE6dA45ed973A5326',
+    INTEREST_RATE_STRATEGY: '0xD61ca03Eac0352090f45bE50403F7B17d20E11F2',
     ORACLE: '0x5D1F504211c17365CA66353442a74D4435A8b778',
     STATA_TOKEN: '0x08cC59E51BB0Bc322B4D251f7262dB864d6150ce',
   },
diff --git a/src/ts/AaveV3Base.ts b/src/ts/AaveV3Base.ts
index 886d29e1..8eac1cf9 100644
--- a/src/ts/AaveV3Base.ts
+++ b/src/ts/AaveV3Base.ts
@@ -134,7 +134,7 @@ export const ASSETS = {
     A_TOKEN: '0x4e65fE4DbA92790696d040ac24Aa414708F5c0AB',
     S_TOKEN: '0x03506214379aA86ad1176af71c260278cfa10B38',
     V_TOKEN: '0x59dca05b6c26dbd64b5381374aAaC5CD05644C28',
-    INTEREST_RATE_STRATEGY: '0x50eC656Ba67885D0937b5f549f3104ea15E75588',
+    INTEREST_RATE_STRATEGY: '0x136848FdaedEB56245bE0e61E28A3CB8c0B45CaA',
     ORACLE: '0x7e860098F58bBFC8648a4311b374B1D669a2bc6B',
     STATA_TOKEN: '0x0000000000000000000000000000000000000000',
   },
diff --git a/src/ts/AaveV3Gnosis.ts b/src/ts/AaveV3Gnosis.ts
index 3a87fa1a..13b84f15 100644
--- a/src/ts/AaveV3Gnosis.ts
+++ b/src/ts/AaveV3Gnosis.ts
@@ -112,7 +112,7 @@ export const ASSETS = {
     A_TOKEN: '0xc6B7AcA6DE8a6044E0e32d0c841a89244A10D284',
     S_TOKEN: '0x8220133C3a631de3C7A5B679A2417BD61431FEcf',
     V_TOKEN: '0x5F6f7B0a87CA3CF3d0b431Ae03EF3305180BFf4d',
-    INTEREST_RATE_STRATEGY: '0x345f7fcd88207fe060AD03c2656A23A3Ab596479',
+    INTEREST_RATE_STRATEGY: '0xE74CD4ADF9103370144c327457bd294753E2E856',
     ORACLE: '0x26C31ac71010aF62E6B486D1132E266D6298857D',
     STATA_TOKEN: '0x270bA1f35D8b87510D24F693fcCc0da02e6E4EeB',
   },
@@ -122,7 +122,7 @@ export const ASSETS = {
     A_TOKEN: '0xd0Dd6cEF72143E22cCED4867eb0d5F2328715533',
     S_TOKEN: '0xaC8b1cE0548C69318920C3e0b21Db296d5770D57',
     V_TOKEN: '0x281963D7471eCdC3A2Bd4503e24e89691cfe420D',
-    INTEREST_RATE_STRATEGY: '0x345f7fcd88207fe060AD03c2656A23A3Ab596479',
+    INTEREST_RATE_STRATEGY: '0xE74CD4ADF9103370144c327457bd294753E2E856',
     ORACLE: '0x678df3415fc31947dA4324eC63212874be5a82f8',
     STATA_TOKEN: '0x7f0EAE87Df30C468E0680c83549D0b3DE7664D4B',
   },
diff --git a/src/ts/AaveV3Metis.ts b/src/ts/AaveV3Metis.ts
index 692520b2..420d2056 100644
--- a/src/ts/AaveV3Metis.ts
+++ b/src/ts/AaveV3Metis.ts
@@ -99,7 +99,7 @@ export const ASSETS = {
     A_TOKEN: '0x885C8AEC5867571582545F894A5906971dB9bf27',
     S_TOKEN: '0x81aC531A7CA8Bdaeb571d8d948e29481A35495C8',
     V_TOKEN: '0x571171a7EF1e3c8c83d47EF1a50E225E9c351380',
-    INTEREST_RATE_STRATEGY: '0x3c8DF161A59F2a3ed4D40F073395d6a0f14290C0',
+    INTEREST_RATE_STRATEGY: '0x463F3F7F0eD356703A9bF2Da3FB95AECBEfe60ce',
     ORACLE: '0x663855969c85F3BE415807250414Ca9129533a5f',
     STATA_TOKEN: '0xb24451C231C6e6A60aC46f45E98a267caae898f4',
   },
@@ -109,7 +109,7 @@ export const ASSETS = {
     A_TOKEN: '0xd9fa75D14c26720d5ce7eE2530793a823e8f07b9',
     S_TOKEN: '0xb4984c08984776074fB9BB78fFE24e9F1E97CD3F',
     V_TOKEN: '0x6B45DcE8aF4fE5Ab3bFCF030d8fB57718eAB54e5',
-    INTEREST_RATE_STRATEGY: '0x082612269926F85741E6c2B0447D000469880c1C',
+    INTEREST_RATE_STRATEGY: '0xEDeA87920826abfE28C2D57AC7665B7031f64EfF',
     ORACLE: '0x51864b8948Aa5e35aace2BaDaF901D63418A3b9D',
     STATA_TOKEN: '0xAAea6F041425B813760dA201d08d46487034A266',
   },
diff --git a/src/ts/AaveV3Optimism.ts b/src/ts/AaveV3Optimism.ts
index 34512bec..00ba30ff 100644
--- a/src/ts/AaveV3Optimism.ts
+++ b/src/ts/AaveV3Optimism.ts
@@ -1,89 +1,89 @@
 // AUTOGENERATED - MANUALLY CHANGES WILL BE REVERTED BY THE GENERATOR
-// IPoolAddressesProvider https://explorer.optimism.io/address/0xa97684ead0e402dC232d5A977953DF7ECBaB3CDb
+// IPoolAddressesProvider https://optimistic.etherscan.io/address/0xa97684ead0e402dC232d5A977953DF7ECBaB3CDb
 export const POOL_ADDRESSES_PROVIDER = '0xa97684ead0e402dC232d5A977953DF7ECBaB3CDb';
 
-// IPool https://explorer.optimism.io/address/0x794a61358D6845594F94dc1DB02A252b5b4814aD
+// IPool https://optimistic.etherscan.io/address/0x794a61358D6845594F94dc1DB02A252b5b4814aD
 export const POOL = '0x794a61358D6845594F94dc1DB02A252b5b4814aD';
 
-// IPoolConfigurator https://explorer.optimism.io/address/0x8145eddDf43f50276641b55bd3AD95944510021E
+// IPoolConfigurator https://optimistic.etherscan.io/address/0x8145eddDf43f50276641b55bd3AD95944510021E
 export const POOL_CONFIGURATOR = '0x8145eddDf43f50276641b55bd3AD95944510021E';
 
-// IAaveOracle https://explorer.optimism.io/address/0xD81eb3728a631871a7eBBaD631b5f424909f0c77
+// IAaveOracle https://optimistic.etherscan.io/address/0xD81eb3728a631871a7eBBaD631b5f424909f0c77
 export const ORACLE = '0xD81eb3728a631871a7eBBaD631b5f424909f0c77';
 
-// https://explorer.optimism.io/address/0xE229d5DE4BD5beEAf12d427B5B57BFe66abD2c3b
+// https://optimistic.etherscan.io/address/0xE229d5DE4BD5beEAf12d427B5B57BFe66abD2c3b
 export const PRICE_ORACLE_SENTINEL = '0xE229d5DE4BD5beEAf12d427B5B57BFe66abD2c3b';
 
-// IPoolDataProvider https://explorer.optimism.io/address/0xd9Ca4878dd38B021583c1B669905592EAe76E044
+// IPoolDataProvider https://optimistic.etherscan.io/address/0xd9Ca4878dd38B021583c1B669905592EAe76E044
 export const AAVE_PROTOCOL_DATA_PROVIDER = '0xd9Ca4878dd38B021583c1B669905592EAe76E044';
 
-// IACLManager https://explorer.optimism.io/address/0xa72636CbcAa8F5FF95B2cc47F3CDEe83F3294a0B
+// IACLManager https://optimistic.etherscan.io/address/0xa72636CbcAa8F5FF95B2cc47F3CDEe83F3294a0B
 export const ACL_MANAGER = '0xa72636CbcAa8F5FF95B2cc47F3CDEe83F3294a0B';
 
-// https://explorer.optimism.io/address/0x746c675dAB49Bcd5BB9Dc85161f2d7Eb435009bf
+// https://optimistic.etherscan.io/address/0x746c675dAB49Bcd5BB9Dc85161f2d7Eb435009bf
 export const ACL_ADMIN = '0x746c675dAB49Bcd5BB9Dc85161f2d7Eb435009bf';
 
-// ICollector https://explorer.optimism.io/address/0xB2289E329D2F85F1eD31Adbb30eA345278F21bcf
+// ICollector https://optimistic.etherscan.io/address/0xB2289E329D2F85F1eD31Adbb30eA345278F21bcf
 export const COLLECTOR = '0xB2289E329D2F85F1eD31Adbb30eA345278F21bcf';
 
-// https://explorer.optimism.io/address/0x929EC64c34a17401F460460D4B9390518E5B473e
+// https://optimistic.etherscan.io/address/0x929EC64c34a17401F460460D4B9390518E5B473e
 export const DEFAULT_INCENTIVES_CONTROLLER = '0x929EC64c34a17401F460460D4B9390518E5B473e';
 
-// https://explorer.optimism.io/address/0xbCb167bDCF14a8F791d6f4A6EDd964aed2F8813B
+// https://optimistic.etherscan.io/address/0xbCb167bDCF14a8F791d6f4A6EDd964aed2F8813B
 export const DEFAULT_A_TOKEN_IMPL_REV_2 = '0xbCb167bDCF14a8F791d6f4A6EDd964aed2F8813B';
 
-// https://explorer.optimism.io/address/0x04a8D477eE202aDCE1682F5902e1160455205b12
+// https://optimistic.etherscan.io/address/0x04a8D477eE202aDCE1682F5902e1160455205b12
 export const DEFAULT_VARIABLE_DEBT_TOKEN_IMPL_REV_2 = '0x04a8D477eE202aDCE1682F5902e1160455205b12';
 
-// https://explorer.optimism.io/address/0x69713dA5fDfacf77E80C31F9B928Ec0Fc3716384
+// https://optimistic.etherscan.io/address/0x69713dA5fDfacf77E80C31F9B928Ec0Fc3716384
 export const DEFAULT_STABLE_DEBT_TOKEN_IMPL_REV_3 = '0x69713dA5fDfacf77E80C31F9B928Ec0Fc3716384';
 
-// https://explorer.optimism.io/address/0x048f2228D7Bf6776f99aB50cB1b1eaB4D1d4cA73
+// https://optimistic.etherscan.io/address/0x048f2228D7Bf6776f99aB50cB1b1eaB4D1d4cA73
 export const EMISSION_MANAGER = '0x048f2228D7Bf6776f99aB50cB1b1eaB4D1d4cA73';
 
-// https://explorer.optimism.io/address/0x5E76E98E0963EcDC6A065d1435F84065b7523f39
+// https://optimistic.etherscan.io/address/0x5E76E98E0963EcDC6A065d1435F84065b7523f39
 export const CAPS_PLUS_RISK_STEWARD = '0x5E76E98E0963EcDC6A065d1435F84065b7523f39';
 
-// https://explorer.optimism.io/address/0x3829943c53F2d00e20B58475aF19716724bF90Ba
+// https://optimistic.etherscan.io/address/0x3829943c53F2d00e20B58475aF19716724bF90Ba
 export const FREEZING_STEWARD = '0x3829943c53F2d00e20B58475aF19716724bF90Ba';
 
-// https://explorer.optimism.io/address/0xcFaE0D8c5707FCc6478D6a65fFA31efADeF8b8EC
+// https://optimistic.etherscan.io/address/0xcFaE0D8c5707FCc6478D6a65fFA31efADeF8b8EC
 export const DEBT_SWAP_ADAPTER = '0xcFaE0D8c5707FCc6478D6a65fFA31efADeF8b8EC';
 
-// https://explorer.optimism.io/address/0x9abADECD08572e0eA5aF4d47A9C7984a5AA503dC
+// https://optimistic.etherscan.io/address/0x9abADECD08572e0eA5aF4d47A9C7984a5AA503dC
 export const L2_ENCODER = '0x9abADECD08572e0eA5aF4d47A9C7984a5AA503dC';
 
-// https://explorer.optimism.io/address/0x893411580e590D62dDBca8a703d61Cc4A8c7b2b9
+// https://optimistic.etherscan.io/address/0x893411580e590D62dDBca8a703d61Cc4A8c7b2b9
 export const CONFIG_ENGINE = '0x893411580e590D62dDBca8a703d61Cc4A8c7b2b9';
 
-// https://explorer.optimism.io/address/0x770ef9f4fe897e59daCc474EF11238303F9552b6
+// https://optimistic.etherscan.io/address/0x770ef9f4fe897e59daCc474EF11238303F9552b6
 export const POOL_ADDRESSES_PROVIDER_REGISTRY = '0x770ef9f4fe897e59daCc474EF11238303F9552b6';
 
-// https://explorer.optimism.io/address/0xDd81E6F85358292075B78fc8D5830BE8434aF8BA
+// https://optimistic.etherscan.io/address/0xDd81E6F85358292075B78fc8D5830BE8434aF8BA
 export const RATES_FACTORY = '0xDd81E6F85358292075B78fc8D5830BE8434aF8BA';
 
-// https://explorer.optimism.io/address/0xa12734e64417f61f8442E7D5132EdBFdbDDeF0fa
+// https://optimistic.etherscan.io/address/0xa12734e64417f61f8442E7D5132EdBFdbDDeF0fa
 export const REPAY_WITH_COLLATERAL_ADAPTER = '0xa12734e64417f61f8442E7D5132EdBFdbDDeF0fa';
 
-// https://explorer.optimism.io/address/0x22D76094730fA377184100EFB8CEfC673B89B372
+// https://optimistic.etherscan.io/address/0x22D76094730fA377184100EFB8CEfC673B89B372
 export const STATIC_A_TOKEN_FACTORY = '0x22D76094730fA377184100EFB8CEfC673B89B372';
 
-// https://explorer.optimism.io/address/0x830C5A67a0C95D69dA5fb7801Ac1773c6fB53857
+// https://optimistic.etherscan.io/address/0x830C5A67a0C95D69dA5fb7801Ac1773c6fB53857
 export const SWAP_COLLATERAL_ADAPTER = '0x830C5A67a0C95D69dA5fb7801Ac1773c6fB53857';
 
-// https://explorer.optimism.io/address/0x6F143FE2F7B02424ad3CaD1593D6f36c0Aab69d7
+// https://optimistic.etherscan.io/address/0x6F143FE2F7B02424ad3CaD1593D6f36c0Aab69d7
 export const UI_INCENTIVE_DATA_PROVIDER = '0x6F143FE2F7B02424ad3CaD1593D6f36c0Aab69d7';
 
-// https://explorer.optimism.io/address/0xbd83DdBE37fc91923d59C8c1E0bDe0CccCa332d5
+// https://optimistic.etherscan.io/address/0xbd83DdBE37fc91923d59C8c1E0bDe0CccCa332d5
 export const UI_POOL_DATA_PROVIDER = '0xbd83DdBE37fc91923d59C8c1E0bDe0CccCa332d5';
 
-// https://explorer.optimism.io/address/0xBc790382B3686abffE4be14A030A96aC6154023a
+// https://optimistic.etherscan.io/address/0xBc790382B3686abffE4be14A030A96aC6154023a
 export const WALLET_BALANCE_PROVIDER = '0xBc790382B3686abffE4be14A030A96aC6154023a';
 
-// https://explorer.optimism.io/address/0xe9E52021f4e11DEAD8661812A0A6c8627abA2a54
+// https://optimistic.etherscan.io/address/0xe9E52021f4e11DEAD8661812A0A6c8627abA2a54
 export const WETH_GATEWAY = '0xe9E52021f4e11DEAD8661812A0A6c8627abA2a54';
 
-// https://explorer.optimism.io/address/0x78F8Bd884C3D738B74B420540659c82f392820e0
+// https://optimistic.etherscan.io/address/0x78F8Bd884C3D738B74B420540659c82f392820e0
 export const WITHDRAW_SWAP_ADAPTER = '0x78F8Bd884C3D738B74B420540659c82f392820e0';
 
 export const CHAIN_ID = 10;
@@ -94,7 +94,7 @@ export const ASSETS = {
     A_TOKEN: '0x82E64f49Ed5EC1bC6e43DAD4FC8Af9bb3A2312EE',
     S_TOKEN: '0xd94112B5B62d53C9402e7A60289c6810dEF1dC9B',
     V_TOKEN: '0x8619d80FB0141ba7F184CbF22fd724116D9f7ffC',
-    INTEREST_RATE_STRATEGY: '0x6D6D3b7FC50999bf20dE5CC8e0F63AFD18B95f0e',
+    INTEREST_RATE_STRATEGY: '0xd5CA18a70189309664e34FB8150799ff13722308',
     ORACLE: '0x8dBa75e83DA73cc766A7e5a0ee71F656BAb470d6',
     STATA_TOKEN: '0x6dDc64289bE8a71A707fB057d5d07Cc756055d6e',
   },
@@ -144,7 +144,7 @@ export const ASSETS = {
     A_TOKEN: '0x6ab707Aca953eDAeFBc4fD23bA73294241490620',
     S_TOKEN: '0x70eFfc565DB6EEf7B927610155602d31b670e802',
     V_TOKEN: '0xfb00AC187a8Eb5AFAE4eACE434F493Eb62672df7',
-    INTEREST_RATE_STRATEGY: '0x6D6D3b7FC50999bf20dE5CC8e0F63AFD18B95f0e',
+    INTEREST_RATE_STRATEGY: '0xd5CA18a70189309664e34FB8150799ff13722308',
     ORACLE: '0xECef79E109e997bCA29c1c0897ec9d7b03647F5E',
     STATA_TOKEN: '0x035c93db04E5aAea54E6cd0261C492a3e0638b37',
   },
@@ -164,7 +164,7 @@ export const ASSETS = {
     A_TOKEN: '0x6d80113e533a2C0fe82EaBD35f1875DcEA89Ea97',
     S_TOKEN: '0xF15F26710c827DDe8ACBA678682F3Ce24f2Fb56E',
     V_TOKEN: '0x4a1c3aD6Ed28a636ee1751C69071f6be75DEb8B8',
-    INTEREST_RATE_STRATEGY: '0xD61ca03Eac0352090f45bE50403F7B17d20E11F2',
+    INTEREST_RATE_STRATEGY: '0x424883C7dD9Bd129BC346A65E8455CDe9fC0c43C',
     ORACLE: '0x7f99817d87baD03ea21E05112Ca799d715730efe',
     STATA_TOKEN: '0x3A956E2Fcc7e71Ea14b0257d40BEbdB287d19652',
   },
@@ -194,7 +194,7 @@ export const ASSETS = {
     A_TOKEN: '0x8Eb270e296023E9D92081fdF967dDd7878724424',
     S_TOKEN: '0x3EF10DFf4928279c004308EbADc4Db8B7620d6fc',
     V_TOKEN: '0xCE186F6Cccb0c955445bb9d10C59caE488Fea559',
-    INTEREST_RATE_STRATEGY: '0x41365f2aC2D19c3B4Bc691007d314aba80af3669',
+    INTEREST_RATE_STRATEGY: '0x5F58C62077b667370879D6580a59f47C30f96a74',
     ORACLE: '0x9dfc79Aaeb5bb0f96C6e9402671981CdFc424052',
     STATA_TOKEN: '0x84648dc3Cefb601bc28a49A07a1A8Bad04D30Ad3',
   },
@@ -204,7 +204,7 @@ export const ASSETS = {
     A_TOKEN: '0x8ffDf2DE812095b1D19CB146E4c004587C0A0692',
     S_TOKEN: '0xa5e408678469d23efDB7694b1B0A85BB0669e8bd',
     V_TOKEN: '0xA8669021776Bc142DfcA87c21b4A52595bCbB40a',
-    INTEREST_RATE_STRATEGY: '0x049E42fe40368384d04bC10f8494Ea6FD164442a',
+    INTEREST_RATE_STRATEGY: '0x8e3dC8151C46e0547045Ef57a82798CDF91adB4A',
     ORACLE: '0x73A3919a69eFCd5b19df8348c6740bB1446F5ed0',
     STATA_TOKEN: '0x60495bC8D8Baf7E866888ecC00491e37B47dfF24',
   },
@@ -224,7 +224,7 @@ export const ASSETS = {
     A_TOKEN: '0x38d693cE1dF5AaDF7bC62595A37D667aD57922e5',
     S_TOKEN: '0x8a9FdE6925a839F6B1932d16B36aC026F8d3FbdB',
     V_TOKEN: '0x5D557B07776D12967914379C71a1310e917C7555',
-    INTEREST_RATE_STRATEGY: '0xB57Ff919A953424d6B143ABfD6740A225eab953e',
+    INTEREST_RATE_STRATEGY: '0xb83d1B74e1D917d4a95C1e9392f6c639932F444C',
     ORACLE: '0x16a9FA2FDa030272Ce99B29CF780dFA30361E0f3',
     STATA_TOKEN: '0x0000000000000000000000000000000000000000',
   },
diff --git a/src/ts/AaveV3Polygon.ts b/src/ts/AaveV3Polygon.ts
index 3d34bf63..5726b5c7 100644
--- a/src/ts/AaveV3Polygon.ts
+++ b/src/ts/AaveV3Polygon.ts
@@ -91,7 +91,7 @@ export const ASSETS = {
     A_TOKEN: '0x82E64f49Ed5EC1bC6e43DAD4FC8Af9bb3A2312EE',
     S_TOKEN: '0xd94112B5B62d53C9402e7A60289c6810dEF1dC9B',
     V_TOKEN: '0x8619d80FB0141ba7F184CbF22fd724116D9f7ffC',
-    INTEREST_RATE_STRATEGY: '0xdef8F50155A6cf21181E29E400E8CffAE2d50968',
+    INTEREST_RATE_STRATEGY: '0xaDbdb3d6B51151e4CDF32e4050B6F03D2bfB6477',
     ORACLE: '0x4746DeC9e833A82EC7C2C1356372CcF2cfcD2F3D',
     STATA_TOKEN: '0x83c59636e602787A6EEbBdA2915217B416193FcB',
   },
@@ -141,7 +141,7 @@ export const ASSETS = {
     A_TOKEN: '0x6ab707Aca953eDAeFBc4fD23bA73294241490620',
     S_TOKEN: '0x70eFfc565DB6EEf7B927610155602d31b670e802',
     V_TOKEN: '0xfb00AC187a8Eb5AFAE4eACE434F493Eb62672df7',
-    INTEREST_RATE_STRATEGY: '0xdef8F50155A6cf21181E29E400E8CffAE2d50968',
+    INTEREST_RATE_STRATEGY: '0xaDbdb3d6B51151e4CDF32e4050B6F03D2bfB6477',
     ORACLE: '0x0A6513e40db6EB1b165753AD52E80663aeA50545',
     STATA_TOKEN: '0x87A1fdc4C726c459f597282be639a045062c0E46',
   },
@@ -251,7 +251,7 @@ export const ASSETS = {
     A_TOKEN: '0xeBe517846d0F36eCEd99C735cbF6131e1fEB775D',
     S_TOKEN: '0x687871030477bf974725232F764aa04318A8b9c8',
     V_TOKEN: '0x18248226C16BF76c032817854E7C83a2113B4f06',
-    INTEREST_RATE_STRATEGY: '0xA901Bf68Bebde17ba382e499C3e9EbAe649DF276',
+    INTEREST_RATE_STRATEGY: '0x44CaDF6E49895640D9De85ac01d97D44429Ad0A4',
     ORACLE: '0xd8d483d813547CfB624b8Dc33a00F2fcbCd2D428',
     STATA_TOKEN: '0x8486B49433cCed038b51d18Ae3772CDB7E31CA5e',
   },
@@ -291,7 +291,7 @@ export const ASSETS = {
     A_TOKEN: '0xA4D94019934D8333Ef880ABFFbF2FDd611C762BD',
     S_TOKEN: '0xc889e9f8370D14A428a9857205d99BFdB400b757',
     V_TOKEN: '0xE701126012EC0290822eEA17B794454d1AF8b030',
-    INTEREST_RATE_STRATEGY: '0x53b13a6D43F647D788411Abfd28D229C274AfBF9',
+    INTEREST_RATE_STRATEGY: '0x642a8DAcC59b73491Dcaa3BCeF046D660901fCc1',
     ORACLE: '0xfE4A8cc5b5B2366C1B58Bea3858e81843581b2F7',
     STATA_TOKEN: '0x0000000000000000000000000000000000000000',
   },
diff --git a/src/ts/AaveV3ScrollAlpha.ts b/src/ts/AaveV3ScrollAlpha.ts
deleted file mode 100644
index ab48a38f..00000000
--- a/src/ts/AaveV3ScrollAlpha.ts
+++ /dev/null
@@ -1,140 +0,0 @@
-// AUTOGENERATED - MANUALLY CHANGES WILL BE REVERTED BY THE GENERATOR
-// IPoolAddressesProvider https://blockscout.scroll.io/address/0x52A27dC690F8652288194Dd2bc523863eBdEa236
-export const POOL_ADDRESSES_PROVIDER = '0x52A27dC690F8652288194Dd2bc523863eBdEa236';
-
-// IPool https://blockscout.scroll.io/address/0x48914C788295b5db23aF2b5F0B3BE775C4eA9440
-export const POOL = '0x48914C788295b5db23aF2b5F0B3BE775C4eA9440';
-
-// IPoolConfigurator https://blockscout.scroll.io/address/0x63BB78Fbac521998BD6E33f1a960677c7a1d4F10
-export const POOL_CONFIGURATOR = '0x63BB78Fbac521998BD6E33f1a960677c7a1d4F10';
-
-// IAaveOracle https://blockscout.scroll.io/address/0x4B7C7D2EbcDc1015D35F617596318C15d9d24e59
-export const ORACLE = '0x4B7C7D2EbcDc1015D35F617596318C15d9d24e59';
-
-// https://blockscout.scroll.io/address/0x0000000000000000000000000000000000000000
-export const PRICE_ORACLE_SENTINEL = '0x0000000000000000000000000000000000000000';
-
-// IPoolDataProvider https://blockscout.scroll.io/address/0xaE58b3Be9E159bDEc67Ada8507CA3001c80725Ee
-export const AAVE_PROTOCOL_DATA_PROVIDER = '0xaE58b3Be9E159bDEc67Ada8507CA3001c80725Ee';
-
-// IACLManager https://blockscout.scroll.io/address/0x166601A0Cc6Cf979e2f0eF94EC5363B6BC24061C
-export const ACL_MANAGER = '0x166601A0Cc6Cf979e2f0eF94EC5363B6BC24061C';
-
-// https://blockscout.scroll.io/address/0xA5bf8BC3c35D9F92b038254B9B8675266f6b62c0
-export const ACL_ADMIN = '0xA5bf8BC3c35D9F92b038254B9B8675266f6b62c0';
-
-// ICollector https://blockscout.scroll.io/address/0x104Cd7695C9247096F7AD37d3258B63c9675A00e
-export const COLLECTOR = '0x104Cd7695C9247096F7AD37d3258B63c9675A00e';
-
-// https://blockscout.scroll.io/address/0xa76F05D0cdf599E0186dec880F2FA480fd0c5280
-export const DEFAULT_INCENTIVES_CONTROLLER = '0xa76F05D0cdf599E0186dec880F2FA480fd0c5280';
-
-// https://blockscout.scroll.io/address/0x0Eae78c97347bf6FCF784Aa91CABC4aCdB5cc2dd
-export const DEFAULT_A_TOKEN_IMPL_REV_1 = '0x0Eae78c97347bf6FCF784Aa91CABC4aCdB5cc2dd';
-
-// https://blockscout.scroll.io/address/0xAb8eaAE8383Abe28203cB6e6FAa0477B2fb97f07
-export const DEFAULT_VARIABLE_DEBT_TOKEN_IMPL_REV_1 = '0xAb8eaAE8383Abe28203cB6e6FAa0477B2fb97f07';
-
-// https://blockscout.scroll.io/address/0xC696d1c66Aa9F42764eE44fCc454a07a24aCe256
-export const DEFAULT_STABLE_DEBT_TOKEN_IMPL_REV_1 = '0xC696d1c66Aa9F42764eE44fCc454a07a24aCe256';
-
-// https://blockscout.scroll.io/address/0x01dd3Ad7D942406C47acd5b70cBad28fd377c6f2
-export const EMISSION_MANAGER = '0x01dd3Ad7D942406C47acd5b70cBad28fd377c6f2';
-
-// https://blockscout.scroll.io/address/0x357A307A8036D54b454BD15B3B1A0fE4B9e8A561
-export const FAUCET = '0x357A307A8036D54b454BD15B3B1A0fE4B9e8A561';
-
-// https://blockscout.scroll.io/address/0x3Bb33c67908D0d58F8d7349cBe726ff3b059e0fC
-export const L2_ENCODER = '0x3Bb33c67908D0d58F8d7349cBe726ff3b059e0fC';
-
-// https://blockscout.scroll.io/address/0xBf67A725F976d4A7C1fa9ea5303FD57D13CA0A37
-export const UI_INCENTIVE_DATA_PROVIDER = '0xBf67A725F976d4A7C1fa9ea5303FD57D13CA0A37';
-
-// https://blockscout.scroll.io/address/0xDC55BcFC0963608401A4bA6298624E5895f8250a
-export const UI_POOL_DATA_PROVIDER = '0xDC55BcFC0963608401A4bA6298624E5895f8250a';
-
-// https://blockscout.scroll.io/address/0x6c68e975764a56e62AF3d1C8209F789779Eb763B
-export const WALLET_BALANCE_PROVIDER = '0x6c68e975764a56e62AF3d1C8209F789779Eb763B';
-
-// https://blockscout.scroll.io/address/0x57ce905CfD7f986A929A26b006f797d181dB706e
-export const WETH_GATEWAY = '0x57ce905CfD7f986A929A26b006f797d181dB706e';
-
-export const CHAIN_ID = 534353;
-export const ASSETS = {
-  DAI: {
-    decimals: 18,
-    UNDERLYING: '0x7984E363c38b590bB4CA35aEd5133Ef2c6619C40',
-    A_TOKEN: '0x99Cb50E6bE36C8096e6731ED7738d93090B710DD',
-    S_TOKEN: '0x94Bb76d2420C1F083c53061CA862619D6056fdFE',
-    V_TOKEN: '0x09F9A7cd11BE8468064b06FF20Dce43E0A434a2A',
-    INTEREST_RATE_STRATEGY: '0x85AD5a4a0974b6092d1F7369eC39c8b2255b8e6f',
-    ORACLE: '0x58A5C0E02CF344c538F4Cf8d3EFC51e7c134B31A',
-  },
-  LINK: {
-    decimals: 18,
-    UNDERLYING: '0x279cBF5B7e3651F03CB9b71A9E7A3c924b267801',
-    A_TOKEN: '0x55DD1cDFE13fCa68F6D14D452E2a20cABe191841',
-    S_TOKEN: '0x89Bb2A2904E89A90559e423Ec8ec00cc2E127146',
-    V_TOKEN: '0x2f42470c67aA2f6D7d2855FBB691179a6Dba4822',
-    INTEREST_RATE_STRATEGY: '0x9a8D012c2e26cE911AD211976aa06Ca020487389',
-    ORACLE: '0x01BdbF85210e113db2216e837D9b1e401eb7003e',
-  },
-  USDC: {
-    decimals: 6,
-    UNDERLYING: '0x2C9678042D52B97D27f2bD2947F7111d93F3dD0D',
-    A_TOKEN: '0x6E4A1BcBd3C3038e6957207cadC1A17092DC7ba3',
-    S_TOKEN: '0x307a974951cb1a06635432c40C8efDbc5C67446D',
-    V_TOKEN: '0x6ED2eB0A4141975A8A33558234137265f36055f7',
-    INTEREST_RATE_STRATEGY: '0x9c41A3E545126Cc2c160634405E00461Ec30F709',
-    ORACLE: '0xB1732127A07B05e6Ea1FA53c8B791560Ff768439',
-  },
-  WBTC: {
-    decimals: 8,
-    UNDERLYING: '0x5EA79f3190ff37418d42F9B2618688494dBD9693',
-    A_TOKEN: '0x43AE2a14AD923915aa85d683D1b7d0d320ae87B2',
-    S_TOKEN: '0x0e78aC6Bf2a391bbBD15C3DEFadeC7B5d9f00343',
-    V_TOKEN: '0x52a011bF32a85D952aa259D85b705b7cF040836f',
-    INTEREST_RATE_STRATEGY: '0x9a8D012c2e26cE911AD211976aa06Ca020487389',
-    ORACLE: '0xb09f1850207Af7AFcd564632bB541B7b3c776006',
-  },
-  WETH: {
-    decimals: 18,
-    UNDERLYING: '0xb123dCe044EdF0a755505d9623Fba16C0F41cae9',
-    A_TOKEN: '0x9E8CEC4F2F4596141B62e88966D7167E9db555aD',
-    S_TOKEN: '0xeab312503904945BfeC5d56dFaC03d69Ef11DdE5',
-    V_TOKEN: '0xD502CD7A595ec36992b0601fae0A4b50A88084D4',
-    INTEREST_RATE_STRATEGY: '0x9a8D012c2e26cE911AD211976aa06Ca020487389',
-    ORACLE: '0xA0579Ea869d26CE4dfED0b65b54A08A4BdF3F5A8',
-  },
-  USDT: {
-    decimals: 6,
-    UNDERLYING: '0x186C0C26c45A8DA1Da34339ee513624a9609156d',
-    A_TOKEN: '0x54Cb3ba40705d7CCB18c1C24edD8B602a88eF4CE',
-    S_TOKEN: '0x197E7980a9A5b2BE23345A492612FBb53317fb1D',
-    V_TOKEN: '0x4cB0Dd10789208630F4def0DAAB4161f4Bb7b09D',
-    INTEREST_RATE_STRATEGY: '0x9c41A3E545126Cc2c160634405E00461Ec30F709',
-    ORACLE: '0x2d00F2DBA40e677E23AC442B5ab932Ce699d163e',
-  },
-  AAVE: {
-    decimals: 18,
-    UNDERLYING: '0xfc2921bE7B2762F0E87039905d6019B0fF5978a8',
-    A_TOKEN: '0xC5209E1325A0DBeb28143D82e7E1DE709456Fc8a',
-    S_TOKEN: '0xD6CB6AE9f09eD5ffE6e0374482F9D64707Df061C',
-    V_TOKEN: '0x7AE95AD823943283c3D5b7E9bE5E24414ba980cD',
-    INTEREST_RATE_STRATEGY: '0x9a8D012c2e26cE911AD211976aa06Ca020487389',
-    ORACLE: '0x79fb53cF4Ba1B59E07Eeed92D641F8374DaAFC8f',
-  },
-  EURS: {
-    decimals: 2,
-    UNDERLYING: '0xDf40f3a3566b4271450083f1Ad5732590BA47575',
-    A_TOKEN: '0xD49d1CF2886B1c95A94e8a9066E8b298646716b6',
-    S_TOKEN: '0x5D77C7207385a3D2A731f13E555066B209a2b9fc',
-    V_TOKEN: '0x2160F75FB89A6C35Bd59Ecf120B26f459956c925',
-    INTEREST_RATE_STRATEGY: '0x9c41A3E545126Cc2c160634405E00461Ec30F709',
-    ORACLE: '0xC6C58919440AD9daBF04D85b29820477AE7E808E',
-  },
-} as const;
-export const E_MODES = {
-  NONE: 0,
-  STABLECOINS: 1,
-} as const;
diff --git a/src/ts/AaveV3Sepolia.ts b/src/ts/AaveV3Sepolia.ts
index bf87e829..8c63ff42 100644
--- a/src/ts/AaveV3Sepolia.ts
+++ b/src/ts/AaveV3Sepolia.ts
@@ -141,6 +141,16 @@ export const ASSETS = {
     ORACLE: '0xCbE15C1f40f1D7eE1De3756D1557d5Fdc2A50bBD',
     STATA_TOKEN: '0x72B49a461900e11632C95dfa563e7173438D4e3E',
   },
+  GHO: {
+    decimals: 18,
+    UNDERLYING: '0xc4bF5CbDaBE595361438F8c6a187bDc330539c60',
+    A_TOKEN: '0xd190eF37dB51Bb955A680fF1A85763CC72d083D4',
+    S_TOKEN: '0xdCA691FB9609aB814E59c62d70783da1c056A9b6',
+    V_TOKEN: '0x67ae46EF043F7A4508BD1d6B94DB6c33F0915844',
+    INTEREST_RATE_STRATEGY: '0x521247B4d0a51E71DE580dA2cBF99EB40a44b3Bf',
+    ORACLE: '0x00f7fecFAEbEd9499e1f3f9d04E755a21E5fc47C',
+    STATA_TOKEN: '0x0000000000000000000000000000000000000000',
+  },
 } as const;
 export const E_MODES = {
   NONE: 0,
diff --git a/src/ts/GovernanceV3Optimism.ts b/src/ts/GovernanceV3Optimism.ts
index cc743646..600c7525 100644
--- a/src/ts/GovernanceV3Optimism.ts
+++ b/src/ts/GovernanceV3Optimism.ts
@@ -1,14 +1,14 @@
-// https://explorer.optimism.io/address/0x48A9FE90bce5EEd790f3F4Ce192d1C0B351fd4Ca
+// https://optimistic.etherscan.io/address/0x48A9FE90bce5EEd790f3F4Ce192d1C0B351fd4Ca
 export const CROSS_CHAIN_CONTROLLER = '0x48A9FE90bce5EEd790f3F4Ce192d1C0B351fd4Ca';
 
-// IPayloadsControllerCore https://explorer.optimism.io/address/0x0E1a3Af1f9cC76A62eD31eDedca291E63632e7c4
+// IPayloadsControllerCore https://optimistic.etherscan.io/address/0x0E1a3Af1f9cC76A62eD31eDedca291E63632e7c4
 export const PAYLOADS_CONTROLLER = '0x0E1a3Af1f9cC76A62eD31eDedca291E63632e7c4';
 
-// https://explorer.optimism.io/address/0xE3B770Dc4ae3f8bECaB3Ed12dE692c741603e16A
+// https://optimistic.etherscan.io/address/0xE3B770Dc4ae3f8bECaB3Ed12dE692c741603e16A
 export const PC_DATA_HELPER = '0xE3B770Dc4ae3f8bECaB3Ed12dE692c741603e16A';
 
-// https://explorer.optimism.io/address/0x746c675dAB49Bcd5BB9Dc85161f2d7Eb435009bf
+// https://optimistic.etherscan.io/address/0x746c675dAB49Bcd5BB9Dc85161f2d7Eb435009bf
 export const EXECUTOR_LVL_1 = '0x746c675dAB49Bcd5BB9Dc85161f2d7Eb435009bf';
 
-// https://explorer.optimism.io/address/0x0000000000000000000000000000000000000000
+// https://optimistic.etherscan.io/address/0x0000000000000000000000000000000000000000
 export const EXECUTOR_LVL_2 = '0x0000000000000000000000000000000000000000';
diff --git a/src/ts/MiscOptimism.ts b/src/ts/MiscOptimism.ts
index 388071e3..ef23f77c 100644
--- a/src/ts/MiscOptimism.ts
+++ b/src/ts/MiscOptimism.ts
@@ -1,18 +1,18 @@
 // AUTOGENERATED - MANUALLY CHANGES WILL BE REVERTED BY THE GENERATOR
-// https://explorer.optimism.io/address/0x9abf798f5314BFd793A9E57A654BEd35af4A1D60
+// https://optimistic.etherscan.io/address/0x9abf798f5314BFd793A9E57A654BEd35af4A1D60
 export const PARASWAP_FEE_CLAIMER = '0x9abf798f5314BFd793A9E57A654BEd35af4A1D60';
 
-// https://explorer.optimism.io/address/0xB4e496f70602fE2AC6Ae511D028BA4D194773B29
+// https://optimistic.etherscan.io/address/0xB4e496f70602fE2AC6Ae511D028BA4D194773B29
 export const TRANSPARENT_PROXY_FACTORY = '0xB4e496f70602fE2AC6Ae511D028BA4D194773B29';
 
-// https://explorer.optimism.io/address/0xD3cF979e676265e4f6379749DECe4708B9A22476
+// https://optimistic.etherscan.io/address/0xD3cF979e676265e4f6379749DECe4708B9A22476
 export const PROXY_ADMIN = '0xD3cF979e676265e4f6379749DECe4708B9A22476';
 
-// https://explorer.optimism.io/address/0x3b56998Ec06477704622ca8e2eA1b4db134cec32
+// https://optimistic.etherscan.io/address/0x3b56998Ec06477704622ca8e2eA1b4db134cec32
 export const CREATE_3_FACTORY = '0x3b56998Ec06477704622ca8e2eA1b4db134cec32';
 
-// https://explorer.optimism.io/address/0xE50c8C619d05ff98b22Adf991F17602C774F785c
+// https://optimistic.etherscan.io/address/0xE50c8C619d05ff98b22Adf991F17602C774F785c
 export const PROTOCOL_GUARDIAN = '0xE50c8C619d05ff98b22Adf991F17602C774F785c';
 
-// https://explorer.optimism.io/address/0x1685D81212580DD4cDA287616C2f6F4794927e18
+// https://optimistic.etherscan.io/address/0x1685D81212580DD4cDA287616C2f6F4794927e18
 export const AAVE_MERKLE_DISTRIBUTOR = '0x1685D81212580DD4cDA287616C2f6F4794927e18';
diff --git a/yarn.lock b/yarn.lock
index 6bafa7e8..c7599fce 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7,6 +7,15 @@
   resolved "https://registry.yarnpkg.com/@adraffy/ens-normalize/-/ens-normalize-1.10.0.tgz#d2a39395c587e092d77cbbc80acf956a54f38bf7"
   integrity sha512-nA9XHtlAkYfJxY7bce8DcN7eKxWWCWkU+1GR9d+U6MbNpfwQp8TI7vqOsBsMcHoT4mBu2kypKoSKnghEzOOq5Q==
 
+"@bgd-labs/js-utils@^1.0.6":
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/@bgd-labs/js-utils/-/js-utils-1.0.6.tgz#45245ada271541aa0f5a70f389f1471182bea42b"
+  integrity sha512-aS1/wJdIvqhs9CPo6juEGyluQw9+k0m3HMQvLKpjyUrlqHHvN9mr2szQOEZhLzHFdhghOQHS9+KWvYnwsDv17A==
+  dependencies:
+    bs58 "^5.0.0"
+    gray-matter "^4.0.3"
+    tsx "^4.4.0"
+
 "@esbuild/aix-ppc64@0.19.10":
   version "0.19.10"
   resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.19.10.tgz#fb3922a0183d27446de00cf60d4f7baaadf98d84"
@@ -293,10 +302,10 @@
   dependencies:
     undici-types "~5.26.4"
 
-abitype@0.9.8:
-  version "0.9.8"
-  resolved "https://registry.yarnpkg.com/abitype/-/abitype-0.9.8.tgz#1f120b6b717459deafd213dfbf3a3dd1bf10ae8c"
-  integrity sha512-puLifILdm+8sjyss4S+fsUN09obiT1g2YW6CtcQF+QDzxR0euzgEB29MZujC6zMk2a6SVmtttq1fc6+YFA7WYQ==
+abitype@0.10.0:
+  version "0.10.0"
+  resolved "https://registry.yarnpkg.com/abitype/-/abitype-0.10.0.tgz#d3504747cc81df2acaa6c460250ef7bc9219a77c"
+  integrity sha512-QvMHEUzgI9nPj9TWtUGnS2scas80/qaL5PBxGdwWhhvzqXfOph+IEiiiWrzuisu3U3JgDQVruW9oLbJoQ3oZ3A==
 
 antlr4ts@^0.5.0-alpha.4:
   version "0.5.0-alpha.4"
@@ -316,6 +325,13 @@ anymatch@~3.1.2:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
 
+argparse@^1.0.7:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
+  integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
+  dependencies:
+    sprintf-js "~1.0.2"
+
 array-union@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
@@ -326,6 +342,11 @@ balanced-match@^1.0.0:
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
   integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
+base-x@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/base-x/-/base-x-4.0.0.tgz#d0e3b7753450c73f8ad2389b5c018a4af7b2224a"
+  integrity sha512-FuwxlW4H5kh37X/oW59pwTzzTKRzfrrQwhmyspRM7swOEZcHtDZSCt45U6oKgtuFE+WYPblePMVIPR4RZrh/hw==
+
 binary-extensions@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
@@ -346,6 +367,13 @@ braces@^3.0.2, braces@~3.0.2:
   dependencies:
     fill-range "^7.0.1"
 
+bs58@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/bs58/-/bs58-5.0.0.tgz#865575b4d13c09ea2a84622df6c8cbeb54ffc279"
+  integrity sha512-r+ihvQJvahgYT50JD05dyJNKlmmSlMoOGwn1lCcEzanPglg7TxYjioQUYehQ9mAR/+hOSd2jRc/Z2y5UxBymvQ==
+  dependencies:
+    base-x "^4.0.0"
+
 bundle-require@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/bundle-require/-/bundle-require-4.0.1.tgz#2cc1ad76428043d15e0e7f30990ee3d5404aa2e3"
@@ -440,6 +468,11 @@ esbuild@^0.19.2, esbuild@~0.19.10:
     "@esbuild/win32-ia32" "0.19.10"
     "@esbuild/win32-x64" "0.19.10"
 
+esprima@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
+  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
+
 execa@^5.0.0:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd"
@@ -455,6 +488,13 @@ execa@^5.0.0:
     signal-exit "^3.0.3"
     strip-final-newline "^2.0.0"
 
+extend-shallow@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
+  integrity sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==
+  dependencies:
+    is-extendable "^0.1.0"
+
 fast-glob@^3.2.9:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.1.tgz#784b4e897340f3dbbef17413b3f11acf03c874c4"
@@ -533,6 +573,16 @@ globby@^11.0.3:
     merge2 "^1.4.1"
     slash "^3.0.0"
 
+gray-matter@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/gray-matter/-/gray-matter-4.0.3.tgz#e893c064825de73ea1f5f7d88c7a9f7274288798"
+  integrity sha512-5v6yZd4JK3eMI3FqqCouswVqwugaA9r4dNZB1wwcmrD02QkV5H0y7XBQW8QwQqEaZY1pM9aqORSORhJRdNK44Q==
+  dependencies:
+    js-yaml "^3.13.1"
+    kind-of "^6.0.2"
+    section-matter "^1.0.0"
+    strip-bom-string "^1.0.0"
+
 human-signals@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0"
@@ -563,6 +613,11 @@ is-binary-path@~2.1.0:
   dependencies:
     binary-extensions "^2.0.0"
 
+is-extendable@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
+  integrity sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==
+
 is-extglob@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
@@ -600,6 +655,19 @@ joycon@^3.0.1:
   resolved "https://registry.yarnpkg.com/joycon/-/joycon-3.1.1.tgz#bce8596d6ae808f8b68168f5fc69280996894f03"
   integrity sha512-34wB/Y7MW7bzjKRjUKTa46I2Z7eV62Rkhva+KkopW7Qvv/OSWBqvkSY7vusOPrNuZcUG3tApvdVgNB8POj3SPw==
 
+js-yaml@^3.13.1:
+  version "3.14.1"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
+  integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
+  dependencies:
+    argparse "^1.0.7"
+    esprima "^4.0.0"
+
+kind-of@^6.0.0, kind-of@^6.0.2:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
+  integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
+
 lilconfig@^2.0.5:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.1.0.tgz#78e23ac89ebb7e1bfbf25b18043de756548e7f52"
@@ -808,6 +876,14 @@ run-parallel@^1.1.9:
   dependencies:
     queue-microtask "^1.2.2"
 
+section-matter@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/section-matter/-/section-matter-1.0.0.tgz#e9041953506780ec01d59f292a19c7b850b84167"
+  integrity sha512-vfD3pmTzGpufjScBh50YHKzEu2lxBWhVEHsNGoEXmCmn2hKGfeNLYMzCJpe8cD7gqX7TJluOVpBkAequ6dgMmA==
+  dependencies:
+    extend-shallow "^2.0.1"
+    kind-of "^6.0.0"
+
 semver@^7.3.8:
   version "7.5.4"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
@@ -849,6 +925,16 @@ source-map@0.8.0-beta.0:
   dependencies:
     whatwg-url "^7.0.0"
 
+sprintf-js@~1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
+  integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==
+
+strip-bom-string@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/strip-bom-string/-/strip-bom-string-1.0.0.tgz#e5211e9224369fbb81d633a2f00044dc8cedad92"
+  integrity sha512-uCC2VHvQRYu+lMh4My/sFNmF2klFymLX1wHJeXnbEJERpV/ZsVuonzerjfrGpIGF7LBVa1O7i9kjiWvJiFck8g==
+
 strip-final-newline@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
@@ -925,7 +1011,7 @@ tsup@^8.0.1:
     sucrase "^3.20.3"
     tree-kill "^1.2.2"
 
-tsx@^4.7.0:
+tsx@^4.4.0, tsx@^4.7.0:
   version "4.7.0"
   resolved "https://registry.yarnpkg.com/tsx/-/tsx-4.7.0.tgz#1689cfe7dda495ca1f9a66d4cad79cb57b9f6f4a"
   integrity sha512-I+t79RYPlEYlHn9a+KzwrvEwhJg35h/1zHsLC2JXvhC2mdynMv6Zxzvhv5EMV6VF5qJlLlkSnMVvdZV3PSIGcg==
@@ -945,17 +1031,17 @@ undici-types@~5.26.4:
   resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
   integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
 
-viem@^1.20.3:
-  version "1.20.3"
-  resolved "https://registry.yarnpkg.com/viem/-/viem-1.20.3.tgz#8b8360daee622295f5385949c02c86d943d14e0f"
-  integrity sha512-7CrmeCb2KYkeCgUmUyb1hsf+IX/PLwi+Np+Vm4YUTPeG82y3HRSgGHSaCOp3d0YtR2kXD3nv9y5kE7LBFE+wWw==
+viem@^2.0.10:
+  version "2.0.10"
+  resolved "https://registry.yarnpkg.com/viem/-/viem-2.0.10.tgz#a3671e8a70d9f665259b7b0f1575d76db6b054e2"
+  integrity sha512-ncdvXJ0v8Qc83qQaPzPG7pTr7gbg9hRUCNL7n/1b5ZFE17YIeQVtGTx6zqg4zdjTXlTKPrecKvqeKUUjKrmnYg==
   dependencies:
     "@adraffy/ens-normalize" "1.10.0"
     "@noble/curves" "1.2.0"
     "@noble/hashes" "1.3.2"
     "@scure/bip32" "1.3.2"
     "@scure/bip39" "1.2.1"
-    abitype "0.9.8"
+    abitype "0.10.0"
     isows "1.0.3"
     ws "8.13.0"