diff --git a/lib/aave-v3-origin b/lib/aave-v3-origin
index 083bd38a..5431379f 160000
--- a/lib/aave-v3-origin
+++ b/lib/aave-v3-origin
@@ -1 +1 @@
-Subproject commit 083bd38a137b42b5df04e22ad4c9e72454365d0d
+Subproject commit 5431379f8beb4d7128c84a81ced3917d856efa84
diff --git a/package-lock.json b/package-lock.json
index 749bb383..2b8340a3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -26,7 +26,7 @@
         "tsup": "^8.0.2",
         "tsx": "^4.19.2",
         "typescript": "^5.7.2",
-        "viem": "^2.23.1",
+        "viem": "^2.23.5",
         "vitest": "^2.1.8"
       }
     },
@@ -7665,9 +7665,9 @@
       "dev": true
     },
     "node_modules/viem": {
-      "version": "2.23.1",
-      "resolved": "https://registry.npmjs.org/viem/-/viem-2.23.1.tgz",
-      "integrity": "sha512-c5AyJCTA5LeNI/KCu++vkbqbh7irYjUSHxLIAHPKJ6IEcBNMt8+7sPG7gjMXpqVWnqPMzaW9CA2n+yUsKWttDA==",
+      "version": "2.23.5",
+      "resolved": "https://registry.npmjs.org/viem/-/viem-2.23.5.tgz",
+      "integrity": "sha512-cUfBHdFQHmBlPW0loFXda0uZcoU+uJw3NRYQRwYgkrpH6PgovH8iuVqDn6t1jZk82zny4wQL54c9dCX2W9kLMg==",
       "funding": [
         {
           "type": "github",
diff --git a/package.json b/package.json
index a22754f6..eb051e30 100644
--- a/package.json
+++ b/package.json
@@ -93,7 +93,7 @@
     "tsup": "^8.0.2",
     "tsx": "^4.19.2",
     "typescript": "^5.7.2",
-    "viem": "^2.23.1",
+    "viem": "^2.23.5",
     "vitest": "^2.1.8"
   },
   "packageManager": "^npm@10.0.0",
diff --git a/safe.csv b/safe.csv
index e3e088f8..a1f264b1 100644
--- a/safe.csv
+++ b/safe.csv
@@ -646,7 +646,7 @@ address,name,chainId
 0xe3dFf4052F0bF6134ACb73bEaE8fe2317d71F047,AaveV3Ethereum UI_INCENTIVE_DATA_PROVIDER,1
 0x3F78BBD206e4D3c504Eb854232EdA7e47E9Fd8FC,AaveV3Ethereum UI_POOL_DATA_PROVIDER,1
 0xC7be5307ba715ce89b152f3Df0658295b3dbA8E2,AaveV3Ethereum WALLET_BALANCE_PROVIDER,1
-0xA434D495249abE33E031Fe71a969B81f3c07950D,AaveV3Ethereum WETH_GATEWAY,1
+0xd01607c3C5eCABa394D8be377a08590149325722,AaveV3Ethereum WETH_GATEWAY,1
 0x78F8Bd884C3D738B74B420540659c82f392820e0,AaveV3Ethereum WITHDRAW_SWAP_ADAPTER,1
 0xE7d490885A68f00d9886508DF281D67263ed5758,AaveV3EthereumEtherFi AAVE_PROTOCOL_DATA_PROVIDER,1
 0x5300A1a15135EA4dc7aD5a167152C01EFc9b192A,AaveV3EthereumEtherFi ACL_ADMIN,1
@@ -692,7 +692,7 @@ address,name,chainId
 0xe3dFf4052F0bF6134ACb73bEaE8fe2317d71F047,AaveV3EthereumEtherFi UI_INCENTIVE_DATA_PROVIDER,1
 0x3F78BBD206e4D3c504Eb854232EdA7e47E9Fd8FC,AaveV3EthereumEtherFi UI_POOL_DATA_PROVIDER,1
 0xC7be5307ba715ce89b152f3Df0658295b3dbA8E2,AaveV3EthereumEtherFi WALLET_BALANCE_PROVIDER,1
-0xAB911dFB2bB9e264EE836F30D3367618f8Aef965,AaveV3EthereumEtherFi WETH_GATEWAY,1
+0xf956B38F035dC9067fb827A512D3CF35202AB0Bc,AaveV3EthereumEtherFi WETH_GATEWAY,1
 0x850347E0cF64fd342A3404c1c5DA21Aa0A46c5c6,AaveV3EthereumEtherFi WITHDRAW_SWAP_ADAPTER,1
 0x08795CFE08C7a81dCDFf482BbAAF474B240f31cD,AaveV3EthereumLido AAVE_PROTOCOL_DATA_PROVIDER,1
 0x5300A1a15135EA4dc7aD5a167152C01EFc9b192A,AaveV3EthereumLido ACL_ADMIN,1
@@ -766,7 +766,7 @@ address,name,chainId
 0xe3dFf4052F0bF6134ACb73bEaE8fe2317d71F047,AaveV3EthereumLido UI_INCENTIVE_DATA_PROVIDER,1
 0x3F78BBD206e4D3c504Eb854232EdA7e47E9Fd8FC,AaveV3EthereumLido UI_POOL_DATA_PROVIDER,1
 0xC7be5307ba715ce89b152f3Df0658295b3dbA8E2,AaveV3EthereumLido WALLET_BALANCE_PROVIDER,1
-0x0B8C700917a6991FEa7198dDFC80bc8962b5055D,AaveV3EthereumLido WETH_GATEWAY,1
+0x3167C452fA3fa1e5C16bB83Bc0fde4519C464299,AaveV3EthereumLido WETH_GATEWAY,1
 0x43eDB797834151D041619EEF833Edc784B509dAE,AaveV3EthereumLido WITHDRAW_SWAP_ADAPTER,1
 0x98217A06721Ebf727f2C8d9aD7718ec28b7aAe34,GhoEthereum GHO_AAVE_CORE_STEWARD,1
 0x46Aa1063e5265b43663E81329333B47c517A5409,GhoEthereum GHO_BUCKET_STEWARD,1
@@ -932,7 +932,7 @@ address,name,chainId
 0x5c5228aC8BC1528482514aF3e27E692495148717,AaveV3Optimism UI_INCENTIVE_DATA_PROVIDER,10
 0xE92cd6164CE7DC68e740765BC1f2a091B6CBc3e4,AaveV3Optimism UI_POOL_DATA_PROVIDER,10
 0xBc790382B3686abffE4be14A030A96aC6154023a,AaveV3Optimism WALLET_BALANCE_PROVIDER,10
-0x60eE8b61a13c67d0191c851BEC8F0bc850160710,AaveV3Optimism WETH_GATEWAY,10
+0x5f2508cAE9923b02316254026CD43d7902866725,AaveV3Optimism WETH_GATEWAY,10
 0x78F8Bd884C3D738B74B420540659c82f392820e0,AaveV3Optimism WITHDRAW_SWAP_ADAPTER,10
 0x48A9FE90bce5EEd790f3F4Ce192d1C0B351fd4Ca,GovernanceV3Optimism CROSS_CHAIN_CONTROLLER,10
 0x746c675dAB49Bcd5BB9Dc85161f2d7Eb435009bf,GovernanceV3Optimism EXECUTOR_LVL_1,10
@@ -1023,7 +1023,7 @@ address,name,chainId
 0x5c5228aC8BC1528482514aF3e27E692495148717,AaveV3BNB UI_INCENTIVE_DATA_PROVIDER,56
 0xc0179321f0825c3e0F59Fe7Ca4E40557b97797a3,AaveV3BNB UI_POOL_DATA_PROVIDER,56
 0x36616cf17557639614c1cdDb356b1B83fc0B2132,AaveV3BNB WALLET_BALANCE_PROVIDER,56
-0xe63eAf6DAb1045689BD3a332bC596FfcF54A5C88,AaveV3BNB WETH_GATEWAY,56
+0x0c2C95b24529664fE55D4437D7A31175CFE6c4f7,AaveV3BNB WETH_GATEWAY,56
 0x5E2d083417D12d4B0824E14Ecd48D26831F4Da7D,AaveV3BNB WITHDRAW_SWAP_ADAPTER,56
 0xcabb46FfB38c93348Df16558DF156e9f68F9F7F1,GovernanceV3BNB CL_EMERGENCY_ORACLE,56
 0x9d33ee6543C9b2C8c183b8fb58fB089266cffA19,GovernanceV3BNB CROSS_CHAIN_CONTROLLER,56
@@ -1116,7 +1116,7 @@ address,name,chainId
 0x5d4D4007A4c6336550DdAa2a7c0d5e7972eebd16,AaveV3Gnosis UI_INCENTIVE_DATA_PROVIDER,100
 0x5598BbFA2f4fE8151f45bBA0a3edE1b54B51a0a9,AaveV3Gnosis UI_POOL_DATA_PROVIDER,100
 0x4172E6aAEC070ACB31aaCE343A58c93E4C70f44D,AaveV3Gnosis WALLET_BALANCE_PROVIDER,100
-0x7B9c12915c594a68dE96201Cbdc79147F09da278,AaveV3Gnosis WETH_GATEWAY,100
+0xb85d72EC1EfE48168c4aBC4eB855f8Cbcd05cE38,AaveV3Gnosis WETH_GATEWAY,100
 0xc0179321f0825c3e0F59Fe7Ca4E40557b97797a3,AaveV3Gnosis WITHDRAW_SWAP_ADAPTER,100
 0xF937ffAeA1363e4Fa260760bDFA2aA8Fc911F84D,GovernanceV3Gnosis CL_EMERGENCY_ORACLE,100
 0x8Dc5310fc9D3D7D1Bb3D1F686899c8F082316c9F,GovernanceV3Gnosis CROSS_CHAIN_CONTROLLER,100
@@ -1371,7 +1371,7 @@ address,name,chainId
 0x91E04cf78e53aEBe609e8a7f2003e7EECD743F2B,AaveV3Polygon UI_INCENTIVE_DATA_PROVIDER,137
 0x68100bD5345eA474D93577127C11F39FF8463e93,AaveV3Polygon UI_POOL_DATA_PROVIDER,137
 0xBc790382B3686abffE4be14A030A96aC6154023a,AaveV3Polygon WALLET_BALANCE_PROVIDER,137
-0xF5f61a1ab3488fCB6d86451846bcFa9cdc108eB0,AaveV3Polygon WETH_GATEWAY,137
+0xBC302053db3aA514A3c86B9221082f162B91ad63,AaveV3Polygon WETH_GATEWAY,137
 0x78F8Bd884C3D738B74B420540659c82f392820e0,AaveV3Polygon WITHDRAW_SWAP_ADAPTER,137
 0xDAFA1989A504c48Ee20a582f2891eeB25E2fA23F,GovernanceV3Polygon CL_EMERGENCY_ORACLE,137
 0xF6B99959F0b5e79E1CC7062E12aF632CEb18eF0d,GovernanceV3Polygon CROSS_CHAIN_CONTROLLER,137
@@ -1552,7 +1552,7 @@ address,name,chainId
 0x430Ef10d29237a0f061f9F7753fCe1cd1F5cF0e1,AaveV3ZkSync UI_INCENTIVE_DATA_PROVIDER,324
 0x6fCDa2646d6E4a42b1663d219811fC96AE3A0ec8,AaveV3ZkSync UI_POOL_DATA_PROVIDER,324
 0xcb8Dc3C135e59B1252F057da44A8f43EE6B0dAB0,AaveV3ZkSync WALLET_BALANCE_PROVIDER,324
-0xD5f6c8D402E0a0222f7FA132F9e80fDCC074df5C,AaveV3ZkSync WETH_GATEWAY,324
+0xAE2b00D676130Bdf22582781BbBA8f4F21e8B0ff,AaveV3ZkSync WETH_GATEWAY,324
 0x800813f4714BC7A0a95310e3fB9e4f18872CA92C,GovernanceV3ZkSync CROSS_CHAIN_CONTROLLER,324
 0x04cE39789e11a49595cD0ECEf6f4Bd54ABF4d020,GovernanceV3ZkSync EXECUTOR_LVL_1,324
 0x4257bf0746D783f0D962913d7d8AFA408B62547E,GovernanceV3ZkSync GOVERNANCE_GUARDIAN,324
@@ -1758,7 +1758,7 @@ address,name,chainId
 0x91E04cf78e53aEBe609e8a7f2003e7EECD743F2B,AaveV3Base UI_INCENTIVE_DATA_PROVIDER,8453
 0x68100bD5345eA474D93577127C11F39FF8463e93,AaveV3Base UI_POOL_DATA_PROVIDER,8453
 0x5779b29B0a34577d927E8D511B595ef9abbFAE82,AaveV3Base WALLET_BALANCE_PROVIDER,8453
-0x729b3EA8C005AbC58c9150fb57Ec161296F06766,AaveV3Base WETH_GATEWAY,8453
+0xa0d9C1E9E48Ca30c8d8C3B5D69FF5dc1f6DFfC24,AaveV3Base WETH_GATEWAY,8453
 0x5598BbFA2f4fE8151f45bBA0a3edE1b54B51a0a9,AaveV3Base WITHDRAW_SWAP_ADAPTER,8453
 0xC5BcC58BE6172769ca1a78B8A45752E3C5059c39,GhoBase GHO_AAVE_CORE_STEWARD,8453
 0x3c47237479e7569653eF9beC4a7Cd2ee3F78b396,GhoBase GHO_BUCKET_STEWARD,8453
@@ -1929,7 +1929,7 @@ address,name,chainId
 0x68100bD5345eA474D93577127C11F39FF8463e93,AaveV3Arbitrum UI_INCENTIVE_DATA_PROVIDER,42161
 0x5c5228aC8BC1528482514aF3e27E692495148717,AaveV3Arbitrum UI_POOL_DATA_PROVIDER,42161
 0xBc790382B3686abffE4be14A030A96aC6154023a,AaveV3Arbitrum WALLET_BALANCE_PROVIDER,42161
-0x5760E34c4003752329bC77790B1De44C2799F8C3,AaveV3Arbitrum WETH_GATEWAY,42161
+0x5283BEcEd7ADF6D003225C13896E536f2D4264FF,AaveV3Arbitrum WETH_GATEWAY,42161
 0x5598BbFA2f4fE8151f45bBA0a3edE1b54B51a0a9,AaveV3Arbitrum WITHDRAW_SWAP_ADAPTER,42161
 0xd2D586f849620ef042FE3aF52eAa10e9b78bf7De,GhoArbitrum GHO_AAVE_CORE_STEWARD,42161
 0xa9afaE6A53E90f9E4CE0717162DF5Bc3d9aBe7B2,GhoArbitrum GHO_BUCKET_STEWARD,42161
@@ -2147,7 +2147,7 @@ address,name,chainId
 0x99732D5dA21f44f9e45e36eF9da4B1df2Eb0b28E,AaveV3Avalanche UI_INCENTIVE_DATA_PROVIDER,43114
 0x50B4a66bF4D41e6252540eA7427D7A933Bc3c088,AaveV3Avalanche UI_POOL_DATA_PROVIDER,43114
 0xBc790382B3686abffE4be14A030A96aC6154023a,AaveV3Avalanche WALLET_BALANCE_PROVIDER,43114
-0xCf3045a03F83ADfBCbA1f19Cb2cF4E19075F8668,AaveV3Avalanche WETH_GATEWAY,43114
+0x2825cE5921538d17cc15Ae00a8B24fF759C6CDaE,AaveV3Avalanche WETH_GATEWAY,43114
 0x78F8Bd884C3D738B74B420540659c82f392820e0,AaveV3Avalanche WITHDRAW_SWAP_ADAPTER,43114
 0x41185495Bc8297a65DC46f94001DC7233775EbEe,GovernanceV3Avalanche CL_EMERGENCY_ORACLE,43114
 0x27FC7D54C893dA63C0AE6d57e1B2B13A70690928,GovernanceV3Avalanche CROSS_CHAIN_CONTROLLER,43114
@@ -2221,7 +2221,7 @@ address,name,chainId
 0x117684358D990E42Eb1649E7e8C4691951dc1E71,AaveV3Linea UI_INCENTIVE_DATA_PROVIDER,59144
 0xf751969521E20A972A0776CDB0497Fad0F773F1F,AaveV3Linea UI_POOL_DATA_PROVIDER,59144
 0xff75B6da14FfbbfD355Daf7a2731456b3562Ba6D,AaveV3Linea WALLET_BALANCE_PROVIDER,59144
-0x4758213271BFdC72224A7a8742dC865fC97756e1,AaveV3Linea WETH_GATEWAY,59144
+0x31A239f3e39c5D8BA6B201bA81ed584492Ae960F,AaveV3Linea WETH_GATEWAY,59144
 0x0D3f821e9741C8a8Bcac231162320251Db0cdf52,GovernanceV3Linea CROSS_CHAIN_CONTROLLER,59144
 0x8c2d95FE7aeB57b86961F3abB296A54f0ADb7F88,GovernanceV3Linea EXECUTOR_LVL_1,59144
 0x056E4C4E80D1D14a637ccbD0412CDAAEc5B51F4E,GovernanceV3Linea GOVERNANCE_GUARDIAN,59144
@@ -2284,7 +2284,7 @@ address,name,chainId
 0x5d4D4007A4c6336550DdAa2a7c0d5e7972eebd16,AaveV3Scroll UI_INCENTIVE_DATA_PROVIDER,534352
 0x5598BbFA2f4fE8151f45bBA0a3edE1b54B51a0a9,AaveV3Scroll UI_POOL_DATA_PROVIDER,534352
 0xE51642875Af07Fea1B03d821E41a9DB24bC4447E,AaveV3Scroll WALLET_BALANCE_PROVIDER,534352
-0x31A239f3e39c5D8BA6B201bA81ed584492Ae960F,AaveV3Scroll WETH_GATEWAY,534352
+0xE79Ca44408Dae5a57eA2a9594532f1E84d2edAa4,AaveV3Scroll WETH_GATEWAY,534352
 0x03073D3F4769f6b6604d616238fD6c636C99AD0A,GovernanceV3Scroll CROSS_CHAIN_CONTROLLER,534352
 0xc1ABF87FfAdf4908f4eC8dc54A25DCFEabAE4A24,GovernanceV3Scroll EXECUTOR_LVL_1,534352
 0x1A0581dd5C7C3DA4Ba1CDa7e0BcA7286afc4973b,GovernanceV3Scroll GOVERNANCE_GUARDIAN,534352
diff --git a/scripts/configs/pools/arbitrum.ts b/scripts/configs/pools/arbitrum.ts
index 7227865d..0c9f6655 100644
--- a/scripts/configs/pools/arbitrum.ts
+++ b/scripts/configs/pools/arbitrum.ts
@@ -21,7 +21,7 @@ export const arbitrumProtoV3: PoolConfig = {
     UI_INCENTIVE_DATA_PROVIDER: '0x68100bd5345ea474d93577127c11f39ff8463e93',
     UI_POOL_DATA_PROVIDER: '0x5c5228ac8bc1528482514af3e27e692495148717',
     WALLET_BALANCE_PROVIDER: '0xBc790382B3686abffE4be14A030A96aC6154023a',
-    WETH_GATEWAY: '0x5760E34c4003752329bC77790B1De44C2799F8C3',
+    WETH_GATEWAY: '0x5283BEcEd7ADF6D003225C13896E536f2D4264FF',
     WITHDRAW_SWAP_ADAPTER: '0x5598BbFA2f4fE8151f45bBA0a3edE1b54B51a0a9',
     STATA_FACTORY: '0xd85922fFF51ba4130cEC7c499db4Ac3Eb9981EaD',
   },
diff --git a/scripts/configs/pools/avalanche.ts b/scripts/configs/pools/avalanche.ts
index 91923d8e..bf90947a 100644
--- a/scripts/configs/pools/avalanche.ts
+++ b/scripts/configs/pools/avalanche.ts
@@ -70,7 +70,7 @@ export const avalancheProtoV3: PoolConfig = {
     UI_INCENTIVE_DATA_PROVIDER: '0x99732d5da21f44f9e45e36ef9da4b1df2eb0b28e',
     UI_POOL_DATA_PROVIDER: '0x50b4a66bf4d41e6252540ea7427d7a933bc3c088',
     WALLET_BALANCE_PROVIDER: '0xBc790382B3686abffE4be14A030A96aC6154023a',
-    WETH_GATEWAY: '0xCf3045a03F83ADfBCbA1f19Cb2cF4E19075F8668',
+    WETH_GATEWAY: '0x2825cE5921538d17cc15Ae00a8B24fF759C6CDaE',
     WITHDRAW_SWAP_ADAPTER: '0x78F8Bd884C3D738B74B420540659c82f392820e0',
   },
 };
diff --git a/scripts/configs/pools/base.ts b/scripts/configs/pools/base.ts
index 2d42f854..27bd38ea 100644
--- a/scripts/configs/pools/base.ts
+++ b/scripts/configs/pools/base.ts
@@ -21,7 +21,7 @@ export const baseProtoV3: PoolConfig = {
     UI_INCENTIVE_DATA_PROVIDER: '0x91e04cf78e53aebe609e8a7f2003e7eecd743f2b',
     UI_POOL_DATA_PROVIDER: '0x68100bd5345ea474d93577127c11f39ff8463e93',
     WALLET_BALANCE_PROVIDER: '0x5779b29B0a34577d927E8D511B595ef9abbFAE82',
-    WETH_GATEWAY: '0x729b3EA8C005AbC58c9150fb57Ec161296F06766',
+    WETH_GATEWAY: '0xa0d9C1E9E48Ca30c8d8C3B5D69FF5dc1f6DFfC24',
     STATA_FACTORY: '0x78d33BF0014ab169725F2Ea5a62b200F2977faeE',
   },
 };
diff --git a/scripts/configs/pools/bnb.ts b/scripts/configs/pools/bnb.ts
index bbf2e9b3..22911f61 100644
--- a/scripts/configs/pools/bnb.ts
+++ b/scripts/configs/pools/bnb.ts
@@ -17,7 +17,7 @@ export const bnbProtoV3: PoolConfig = {
     UI_INCENTIVE_DATA_PROVIDER: '0x5c5228aC8BC1528482514aF3e27E692495148717',
     UI_POOL_DATA_PROVIDER: '0xc0179321f0825c3e0F59Fe7Ca4E40557b97797a3',
     WALLET_BALANCE_PROVIDER: '0x36616cf17557639614c1cdDb356b1B83fc0B2132',
-    WETH_GATEWAY: '0xe63eAf6DAb1045689BD3a332bC596FfcF54A5C88',
+    WETH_GATEWAY: '0x0c2C95b24529664fE55D4437D7A31175CFE6c4f7',
     WITHDRAW_SWAP_ADAPTER: '0x5E2d083417D12d4B0824E14Ecd48D26831F4Da7D',
     LEGACY_STATIC_A_TOKEN_FACTORY: '0x326aB0868bD279382Be2DF5E228Cb8AF38649AB4',
   },
diff --git a/scripts/configs/pools/ethereum.ts b/scripts/configs/pools/ethereum.ts
index 749ef43d..a14b63d6 100644
--- a/scripts/configs/pools/ethereum.ts
+++ b/scripts/configs/pools/ethereum.ts
@@ -79,7 +79,7 @@ export const mainnetProtoV3Pool: PoolConfig = {
     UI_INCENTIVE_DATA_PROVIDER: '0xe3dff4052f0bf6134acb73beae8fe2317d71f047',
     UI_POOL_DATA_PROVIDER: '0x3f78bbd206e4d3c504eb854232eda7e47e9fd8fc',
     WALLET_BALANCE_PROVIDER: '0xC7be5307ba715ce89b152f3Df0658295b3dbA8E2',
-    WETH_GATEWAY: '0xA434D495249abE33E031Fe71a969B81f3c07950D',
+    WETH_GATEWAY: '0xd01607c3C5eCABa394D8be377a08590149325722',
     WITHDRAW_SWAP_ADAPTER: '0x78F8Bd884C3D738B74B420540659c82f392820e0',
     SAVINGS_DAI_TOKEN_WRAPPER: '0xE28E2c8d240dd5eBd0adcab86fbD79df7a052034',
     STATA_FACTORY: '0xCb0b5cA20b6C5C02A9A3B2cE433650768eD2974F',
@@ -98,7 +98,7 @@ export const lidoEthereumMainnetProtoV3Pool: PoolConfig = {
     UI_INCENTIVE_DATA_PROVIDER: '0xe3dff4052f0bf6134acb73beae8fe2317d71f047',
     UI_POOL_DATA_PROVIDER: '0x3f78bbd206e4d3c504eb854232eda7e47e9fd8fc',
     WALLET_BALANCE_PROVIDER: '0xC7be5307ba715ce89b152f3Df0658295b3dbA8E2',
-    WETH_GATEWAY: '0x0B8C700917a6991FEa7198dDFC80bc8962b5055D',
+    WETH_GATEWAY: '0x3167C452fA3fa1e5C16bB83Bc0fde4519C464299',
     CONFIG_ENGINE: '0x1097eDb85392932b7dCB630baDDC8A6D73585218',
     CAPS_PLUS_RISK_STEWARD: '0x3843b29118fFC18d5d12EE079d0324E1bF115e69',
     RISK_STEWARD: '0x30adC2f98ff78fDde12F191Acb82699f640694FB',
@@ -123,7 +123,7 @@ export const etherFiEthereumMainnetProtoV3Pool: PoolConfig = {
     UI_INCENTIVE_DATA_PROVIDER: '0xe3dff4052f0bf6134acb73beae8fe2317d71f047',
     UI_POOL_DATA_PROVIDER: '0x3f78bbd206e4d3c504eb854232eda7e47e9fd8fc',
     WALLET_BALANCE_PROVIDER: '0xC7be5307ba715ce89b152f3Df0658295b3dbA8E2',
-    WETH_GATEWAY: '0xAB911dFB2bB9e264EE836F30D3367618f8Aef965',
+    WETH_GATEWAY: '0xf956B38F035dC9067fb827A512D3CF35202AB0Bc',
     CONFIG_ENGINE: '0x909bA8DA4c826C62013Ce3A30ce1F42943F3b340',
     CAPS_PLUS_RISK_STEWARD: '0x1EBdbE77bbDDD284BdCE8D7981D7eD26D6af58cA',
     RISK_STEWARD: '0xBF79d8339303148E345277a994Eb2cD5d82F0067',
diff --git a/scripts/configs/pools/gnosis.ts b/scripts/configs/pools/gnosis.ts
index cc39faa4..c7c62202 100644
--- a/scripts/configs/pools/gnosis.ts
+++ b/scripts/configs/pools/gnosis.ts
@@ -11,7 +11,7 @@ export const gnosisProtoV3: PoolConfig = {
     UI_INCENTIVE_DATA_PROVIDER: '0x5d4d4007a4c6336550ddaa2a7c0d5e7972eebd16',
     UI_POOL_DATA_PROVIDER: '0x5598bbfa2f4fe8151f45bba0a3ede1b54b51a0a9',
     WALLET_BALANCE_PROVIDER: '0x4172E6aAEC070ACB31aaCE343A58c93E4C70f44D',
-    WETH_GATEWAY: '0x7B9c12915c594a68dE96201Cbdc79147F09da278',
+    WETH_GATEWAY: '0xb85d72EC1EfE48168c4aBC4eB855f8Cbcd05cE38',
     CAPS_PLUS_RISK_STEWARD: '0x33AE1f41546a2e05368Bf789b3d868813c0Ae658',
     RISK_STEWARD: '0x677c9f358dA5DC83aF6760a839E4448D72840d04',
     FREEZING_STEWARD: '0x3Ceaf9b6CAb92dFe6302D0CC3F1BA880C28d35e5',
diff --git a/scripts/configs/pools/linea.ts b/scripts/configs/pools/linea.ts
index 19520904..572ff900 100644
--- a/scripts/configs/pools/linea.ts
+++ b/scripts/configs/pools/linea.ts
@@ -12,6 +12,6 @@ export const lineaProtoV3: PoolConfig = {
     UI_INCENTIVE_DATA_PROVIDER: '0x117684358D990E42Eb1649E7e8C4691951dc1E71',
     UI_POOL_DATA_PROVIDER: '0xf751969521E20A972A0776CDB0497Fad0F773F1F',
     WALLET_BALANCE_PROVIDER: '0xff75B6da14FfbbfD355Daf7a2731456b3562Ba6D',
-    WETH_GATEWAY: '0x4758213271BFdC72224A7a8742dC865fC97756e1',
+    WETH_GATEWAY: '0x31A239f3e39c5D8BA6B201bA81ed584492Ae960F',
   },
 };
diff --git a/scripts/configs/pools/optimism.ts b/scripts/configs/pools/optimism.ts
index a9e812a6..3f0b73b9 100644
--- a/scripts/configs/pools/optimism.ts
+++ b/scripts/configs/pools/optimism.ts
@@ -19,7 +19,7 @@ export const optimismProtoV3: PoolConfig = {
     UI_INCENTIVE_DATA_PROVIDER: '0x5c5228ac8bc1528482514af3e27e692495148717',
     UI_POOL_DATA_PROVIDER: '0xe92cd6164ce7dc68e740765bc1f2a091b6cbc3e4',
     WALLET_BALANCE_PROVIDER: '0xBc790382B3686abffE4be14A030A96aC6154023a',
-    WETH_GATEWAY: '0x60eE8b61a13c67d0191c851BEC8F0bc850160710',
+    WETH_GATEWAY: '0x5f2508cAE9923b02316254026CD43d7902866725',
     WITHDRAW_SWAP_ADAPTER: '0x78F8Bd884C3D738B74B420540659c82f392820e0',
   },
 };
diff --git a/scripts/configs/pools/polygon.ts b/scripts/configs/pools/polygon.ts
index bb2ba357..5c89a5f3 100644
--- a/scripts/configs/pools/polygon.ts
+++ b/scripts/configs/pools/polygon.ts
@@ -37,7 +37,7 @@ export const polygonProtoV3: PoolConfig = {
     UI_INCENTIVE_DATA_PROVIDER: '0x91e04cf78e53aebe609e8a7f2003e7eecd743f2b',
     UI_POOL_DATA_PROVIDER: '0x68100bd5345ea474d93577127c11f39ff8463e93',
     WALLET_BALANCE_PROVIDER: '0xBc790382B3686abffE4be14A030A96aC6154023a',
-    WETH_GATEWAY: '0xF5f61a1ab3488fCB6d86451846bcFa9cdc108eB0',
+    WETH_GATEWAY: '0xBC302053db3aA514A3c86B9221082f162B91ad63',
     WITHDRAW_SWAP_ADAPTER: '0x78F8Bd884C3D738B74B420540659c82f392820e0',
   },
 };
diff --git a/scripts/configs/pools/scroll.ts b/scripts/configs/pools/scroll.ts
index ceac4008..d7584bf7 100644
--- a/scripts/configs/pools/scroll.ts
+++ b/scripts/configs/pools/scroll.ts
@@ -29,13 +29,7 @@ export const scrollProtoV3: PoolConfig = {
     UI_INCENTIVE_DATA_PROVIDER: '0x5d4D4007A4c6336550DdAa2a7c0d5e7972eebd16',
     UI_POOL_DATA_PROVIDER: '0x5598BbFA2f4fE8151f45bBA0a3edE1b54B51a0a9',
     WALLET_BALANCE_PROVIDER: '0xE51642875Af07Fea1B03d821E41a9DB24bC4447E',
-    WETH_GATEWAY: '0x31A239f3e39c5D8BA6B201bA81ed584492Ae960F',
+    WETH_GATEWAY: '0xE79Ca44408Dae5a57eA2a9594532f1E84d2edAa4',
     LEGACY_STATIC_A_TOKEN_FACTORY: '0x970b77b96D94966939a8F867c2BfC2aC0310C0e7',
   },
-  initial: {
-    COLLECTOR: '0x90eB541e1a431D8a30ED85A77675D1F001128cb5',
-    DEFAULT_A_TOKEN_IMPL: '0x92EDe4ABd9df4Bfb49b4d723e4c932e35c47C54C',
-    DEFAULT_VARIABLE_DEBT_TOKEN_IMPL: '0x49bA16C08130FF8cFADE263B49387A8555bc057B',
-    DEFAULT_STABLE_DEBT_TOKEN_IMPL: '0x8Ff5f08EDB2E5e1A51bd14d0494320bdB436a149',
-  },
 };
diff --git a/scripts/configs/pools/zksync.ts b/scripts/configs/pools/zksync.ts
index 4496eb27..42eb9dd0 100644
--- a/scripts/configs/pools/zksync.ts
+++ b/scripts/configs/pools/zksync.ts
@@ -11,13 +11,7 @@ export const zkSyncProtoV3: PoolConfig = {
     UI_INCENTIVE_DATA_PROVIDER: '0x430Ef10d29237a0f061f9F7753fCe1cd1F5cF0e1',
     UI_POOL_DATA_PROVIDER: '0x6fCDa2646d6E4a42b1663d219811fC96AE3A0ec8',
     WALLET_BALANCE_PROVIDER: '0xcb8Dc3C135e59B1252F057da44A8f43EE6B0dAB0',
-    WETH_GATEWAY: '0xD5f6c8D402E0a0222f7FA132F9e80fDCC074df5C',
+    WETH_GATEWAY: '0xAE2b00D676130Bdf22582781BbBA8f4F21e8B0ff',
     RISK_STEWARD: '0x05c77Cf62346329a157d7A6F874464D049CECb26',
   },
-  initial: {
-    COLLECTOR: '0xd69Cbda644c6be817AaFb5Fd9174f50C33803B6b',
-    DEFAULT_A_TOKEN_IMPL: '0x34be365Fd01ac224F21490aaC6dFd65D25434bbB',
-    DEFAULT_VARIABLE_DEBT_TOKEN_IMPL: '0x52E97425D1Fa6885fAaC9260B711fA5047A88d06',
-    DEFAULT_STABLE_DEBT_TOKEN_IMPL: '0x4dF950Ff1352B22dA739c33C35C6f0c81B5d9d19',
-  },
 };
diff --git a/src/AaveV3Arbitrum.sol b/src/AaveV3Arbitrum.sol
index c33e44ab..be93402b 100644
--- a/src/AaveV3Arbitrum.sol
+++ b/src/AaveV3Arbitrum.sol
@@ -105,8 +105,8 @@ library AaveV3Arbitrum {
   // https://arbiscan.io/address/0xBc790382B3686abffE4be14A030A96aC6154023a
   address internal constant WALLET_BALANCE_PROVIDER = 0xBc790382B3686abffE4be14A030A96aC6154023a;
 
-  // https://arbiscan.io/address/0x5760E34c4003752329bC77790B1De44C2799F8C3
-  address internal constant WETH_GATEWAY = 0x5760E34c4003752329bC77790B1De44C2799F8C3;
+  // https://arbiscan.io/address/0x5283BEcEd7ADF6D003225C13896E536f2D4264FF
+  address internal constant WETH_GATEWAY = 0x5283BEcEd7ADF6D003225C13896E536f2D4264FF;
 
   // https://arbiscan.io/address/0x5598BbFA2f4fE8151f45bBA0a3edE1b54B51a0a9
   address internal constant WITHDRAW_SWAP_ADAPTER = 0x5598BbFA2f4fE8151f45bBA0a3edE1b54B51a0a9;
diff --git a/src/AaveV3Avalanche.sol b/src/AaveV3Avalanche.sol
index 3d48bb10..43ee8f85 100644
--- a/src/AaveV3Avalanche.sol
+++ b/src/AaveV3Avalanche.sol
@@ -99,8 +99,8 @@ library AaveV3Avalanche {
   // https://snowtrace.io/address/0xBc790382B3686abffE4be14A030A96aC6154023a
   address internal constant WALLET_BALANCE_PROVIDER = 0xBc790382B3686abffE4be14A030A96aC6154023a;
 
-  // https://snowtrace.io/address/0xCf3045a03F83ADfBCbA1f19Cb2cF4E19075F8668
-  address internal constant WETH_GATEWAY = 0xCf3045a03F83ADfBCbA1f19Cb2cF4E19075F8668;
+  // https://snowtrace.io/address/0x2825cE5921538d17cc15Ae00a8B24fF759C6CDaE
+  address internal constant WETH_GATEWAY = 0x2825cE5921538d17cc15Ae00a8B24fF759C6CDaE;
 
   // https://snowtrace.io/address/0x78F8Bd884C3D738B74B420540659c82f392820e0
   address internal constant WITHDRAW_SWAP_ADAPTER = 0x78F8Bd884C3D738B74B420540659c82f392820e0;
diff --git a/src/AaveV3BNB.sol b/src/AaveV3BNB.sol
index c8527b60..403e546f 100644
--- a/src/AaveV3BNB.sol
+++ b/src/AaveV3BNB.sol
@@ -88,8 +88,8 @@ library AaveV3BNB {
   // https://bscscan.com/address/0x36616cf17557639614c1cdDb356b1B83fc0B2132
   address internal constant WALLET_BALANCE_PROVIDER = 0x36616cf17557639614c1cdDb356b1B83fc0B2132;
 
-  // https://bscscan.com/address/0xe63eAf6DAb1045689BD3a332bC596FfcF54A5C88
-  address internal constant WETH_GATEWAY = 0xe63eAf6DAb1045689BD3a332bC596FfcF54A5C88;
+  // https://bscscan.com/address/0x0c2C95b24529664fE55D4437D7A31175CFE6c4f7
+  address internal constant WETH_GATEWAY = 0x0c2C95b24529664fE55D4437D7A31175CFE6c4f7;
 
   // https://bscscan.com/address/0x5E2d083417D12d4B0824E14Ecd48D26831F4Da7D
   address internal constant WITHDRAW_SWAP_ADAPTER = 0x5E2d083417D12d4B0824E14Ecd48D26831F4Da7D;
diff --git a/src/AaveV3Base.sol b/src/AaveV3Base.sol
index 7bd227ad..06222591 100644
--- a/src/AaveV3Base.sol
+++ b/src/AaveV3Base.sol
@@ -105,8 +105,8 @@ library AaveV3Base {
   // https://basescan.org/address/0x5779b29B0a34577d927E8D511B595ef9abbFAE82
   address internal constant WALLET_BALANCE_PROVIDER = 0x5779b29B0a34577d927E8D511B595ef9abbFAE82;
 
-  // https://basescan.org/address/0x729b3EA8C005AbC58c9150fb57Ec161296F06766
-  address internal constant WETH_GATEWAY = 0x729b3EA8C005AbC58c9150fb57Ec161296F06766;
+  // https://basescan.org/address/0xa0d9C1E9E48Ca30c8d8C3B5D69FF5dc1f6DFfC24
+  address internal constant WETH_GATEWAY = 0xa0d9C1E9E48Ca30c8d8C3B5D69FF5dc1f6DFfC24;
 
   // https://basescan.org/address/0x78d33BF0014ab169725F2Ea5a62b200F2977faeE
   address internal constant STATA_FACTORY = 0x78d33BF0014ab169725F2Ea5a62b200F2977faeE;
diff --git a/src/AaveV3Ethereum.sol b/src/AaveV3Ethereum.sol
index ee1d861e..4a83a77f 100644
--- a/src/AaveV3Ethereum.sol
+++ b/src/AaveV3Ethereum.sol
@@ -99,8 +99,8 @@ library AaveV3Ethereum {
   // https://etherscan.io/address/0xC7be5307ba715ce89b152f3Df0658295b3dbA8E2
   address internal constant WALLET_BALANCE_PROVIDER = 0xC7be5307ba715ce89b152f3Df0658295b3dbA8E2;
 
-  // https://etherscan.io/address/0xA434D495249abE33E031Fe71a969B81f3c07950D
-  address internal constant WETH_GATEWAY = 0xA434D495249abE33E031Fe71a969B81f3c07950D;
+  // https://etherscan.io/address/0xd01607c3C5eCABa394D8be377a08590149325722
+  address internal constant WETH_GATEWAY = 0xd01607c3C5eCABa394D8be377a08590149325722;
 
   // https://etherscan.io/address/0x78F8Bd884C3D738B74B420540659c82f392820e0
   address internal constant WITHDRAW_SWAP_ADAPTER = 0x78F8Bd884C3D738B74B420540659c82f392820e0;
diff --git a/src/AaveV3EthereumEtherFi.sol b/src/AaveV3EthereumEtherFi.sol
index c9196b3a..20e6aa9e 100644
--- a/src/AaveV3EthereumEtherFi.sol
+++ b/src/AaveV3EthereumEtherFi.sol
@@ -76,8 +76,8 @@ library AaveV3EthereumEtherFi {
   // https://etherscan.io/address/0xC7be5307ba715ce89b152f3Df0658295b3dbA8E2
   address internal constant WALLET_BALANCE_PROVIDER = 0xC7be5307ba715ce89b152f3Df0658295b3dbA8E2;
 
-  // https://etherscan.io/address/0xAB911dFB2bB9e264EE836F30D3367618f8Aef965
-  address internal constant WETH_GATEWAY = 0xAB911dFB2bB9e264EE836F30D3367618f8Aef965;
+  // https://etherscan.io/address/0xf956B38F035dC9067fb827A512D3CF35202AB0Bc
+  address internal constant WETH_GATEWAY = 0xf956B38F035dC9067fb827A512D3CF35202AB0Bc;
 
   // https://etherscan.io/address/0x909bA8DA4c826C62013Ce3A30ce1F42943F3b340
   address internal constant CONFIG_ENGINE = 0x909bA8DA4c826C62013Ce3A30ce1F42943F3b340;
diff --git a/src/AaveV3EthereumLido.sol b/src/AaveV3EthereumLido.sol
index 4b2d00a4..3d84e413 100644
--- a/src/AaveV3EthereumLido.sol
+++ b/src/AaveV3EthereumLido.sol
@@ -76,8 +76,8 @@ library AaveV3EthereumLido {
   // https://etherscan.io/address/0xC7be5307ba715ce89b152f3Df0658295b3dbA8E2
   address internal constant WALLET_BALANCE_PROVIDER = 0xC7be5307ba715ce89b152f3Df0658295b3dbA8E2;
 
-  // https://etherscan.io/address/0x0B8C700917a6991FEa7198dDFC80bc8962b5055D
-  address internal constant WETH_GATEWAY = 0x0B8C700917a6991FEa7198dDFC80bc8962b5055D;
+  // https://etherscan.io/address/0x3167C452fA3fa1e5C16bB83Bc0fde4519C464299
+  address internal constant WETH_GATEWAY = 0x3167C452fA3fa1e5C16bB83Bc0fde4519C464299;
 
   // https://etherscan.io/address/0x1097eDb85392932b7dCB630baDDC8A6D73585218
   address internal constant CONFIG_ENGINE = 0x1097eDb85392932b7dCB630baDDC8A6D73585218;
diff --git a/src/AaveV3Gnosis.sol b/src/AaveV3Gnosis.sol
index 6e643cfa..ab106c3a 100644
--- a/src/AaveV3Gnosis.sol
+++ b/src/AaveV3Gnosis.sol
@@ -69,8 +69,8 @@ library AaveV3Gnosis {
   // https://gnosisscan.io/address/0x4172E6aAEC070ACB31aaCE343A58c93E4C70f44D
   address internal constant WALLET_BALANCE_PROVIDER = 0x4172E6aAEC070ACB31aaCE343A58c93E4C70f44D;
 
-  // https://gnosisscan.io/address/0x7B9c12915c594a68dE96201Cbdc79147F09da278
-  address internal constant WETH_GATEWAY = 0x7B9c12915c594a68dE96201Cbdc79147F09da278;
+  // https://gnosisscan.io/address/0xb85d72EC1EfE48168c4aBC4eB855f8Cbcd05cE38
+  address internal constant WETH_GATEWAY = 0xb85d72EC1EfE48168c4aBC4eB855f8Cbcd05cE38;
 
   // https://gnosisscan.io/address/0x33AE1f41546a2e05368Bf789b3d868813c0Ae658
   address internal constant CAPS_PLUS_RISK_STEWARD = 0x33AE1f41546a2e05368Bf789b3d868813c0Ae658;
diff --git a/src/AaveV3Linea.sol b/src/AaveV3Linea.sol
index bdd559f3..7f5de3e7 100644
--- a/src/AaveV3Linea.sol
+++ b/src/AaveV3Linea.sol
@@ -72,8 +72,8 @@ library AaveV3Linea {
   // https://lineascan.build/address/0xff75B6da14FfbbfD355Daf7a2731456b3562Ba6D
   address internal constant WALLET_BALANCE_PROVIDER = 0xff75B6da14FfbbfD355Daf7a2731456b3562Ba6D;
 
-  // https://lineascan.build/address/0x4758213271BFdC72224A7a8742dC865fC97756e1
-  address internal constant WETH_GATEWAY = 0x4758213271BFdC72224A7a8742dC865fC97756e1;
+  // https://lineascan.build/address/0x31A239f3e39c5D8BA6B201bA81ed584492Ae960F
+  address internal constant WETH_GATEWAY = 0x31A239f3e39c5D8BA6B201bA81ed584492Ae960F;
 }
 library AaveV3LineaAssets {
   // https://lineascan.build/address/0xe5D7C2a44FfDDf6b295A15c148167daaAf5Cf34f
diff --git a/src/AaveV3Optimism.sol b/src/AaveV3Optimism.sol
index d766192d..417b5426 100644
--- a/src/AaveV3Optimism.sol
+++ b/src/AaveV3Optimism.sol
@@ -98,8 +98,8 @@ library AaveV3Optimism {
   // https://optimistic.etherscan.io/address/0xBc790382B3686abffE4be14A030A96aC6154023a
   address internal constant WALLET_BALANCE_PROVIDER = 0xBc790382B3686abffE4be14A030A96aC6154023a;
 
-  // https://optimistic.etherscan.io/address/0x60eE8b61a13c67d0191c851BEC8F0bc850160710
-  address internal constant WETH_GATEWAY = 0x60eE8b61a13c67d0191c851BEC8F0bc850160710;
+  // https://optimistic.etherscan.io/address/0x5f2508cAE9923b02316254026CD43d7902866725
+  address internal constant WETH_GATEWAY = 0x5f2508cAE9923b02316254026CD43d7902866725;
 
   // https://optimistic.etherscan.io/address/0x78F8Bd884C3D738B74B420540659c82f392820e0
   address internal constant WITHDRAW_SWAP_ADAPTER = 0x78F8Bd884C3D738B74B420540659c82f392820e0;
diff --git a/src/AaveV3Polygon.sol b/src/AaveV3Polygon.sol
index a96cfeb6..b8e2412a 100644
--- a/src/AaveV3Polygon.sol
+++ b/src/AaveV3Polygon.sol
@@ -92,8 +92,8 @@ library AaveV3Polygon {
   // https://polygonscan.com/address/0xBc790382B3686abffE4be14A030A96aC6154023a
   address internal constant WALLET_BALANCE_PROVIDER = 0xBc790382B3686abffE4be14A030A96aC6154023a;
 
-  // https://polygonscan.com/address/0xF5f61a1ab3488fCB6d86451846bcFa9cdc108eB0
-  address internal constant WETH_GATEWAY = 0xF5f61a1ab3488fCB6d86451846bcFa9cdc108eB0;
+  // https://polygonscan.com/address/0xBC302053db3aA514A3c86B9221082f162B91ad63
+  address internal constant WETH_GATEWAY = 0xBC302053db3aA514A3c86B9221082f162B91ad63;
 
   // https://polygonscan.com/address/0x78F8Bd884C3D738B74B420540659c82f392820e0
   address internal constant WITHDRAW_SWAP_ADAPTER = 0x78F8Bd884C3D738B74B420540659c82f392820e0;
diff --git a/src/AaveV3Scroll.sol b/src/AaveV3Scroll.sol
index 9e62a6de..c01c225c 100644
--- a/src/AaveV3Scroll.sol
+++ b/src/AaveV3Scroll.sol
@@ -84,8 +84,8 @@ library AaveV3Scroll {
   // https://scrollscan.com/address/0xE51642875Af07Fea1B03d821E41a9DB24bC4447E
   address internal constant WALLET_BALANCE_PROVIDER = 0xE51642875Af07Fea1B03d821E41a9DB24bC4447E;
 
-  // https://scrollscan.com/address/0x31A239f3e39c5D8BA6B201bA81ed584492Ae960F
-  address internal constant WETH_GATEWAY = 0x31A239f3e39c5D8BA6B201bA81ed584492Ae960F;
+  // https://scrollscan.com/address/0xE79Ca44408Dae5a57eA2a9594532f1E84d2edAa4
+  address internal constant WETH_GATEWAY = 0xE79Ca44408Dae5a57eA2a9594532f1E84d2edAa4;
 
   // https://scrollscan.com/address/0x970b77b96D94966939a8F867c2BfC2aC0310C0e7
   address internal constant LEGACY_STATIC_A_TOKEN_FACTORY =
diff --git a/src/AaveV3ZkSync.sol b/src/AaveV3ZkSync.sol
index 6629673c..ecf03749 100644
--- a/src/AaveV3ZkSync.sol
+++ b/src/AaveV3ZkSync.sol
@@ -69,8 +69,8 @@ library AaveV3ZkSync {
   // https://era.zksync.network/address/0xcb8Dc3C135e59B1252F057da44A8f43EE6B0dAB0
   address internal constant WALLET_BALANCE_PROVIDER = 0xcb8Dc3C135e59B1252F057da44A8f43EE6B0dAB0;
 
-  // https://era.zksync.network/address/0xD5f6c8D402E0a0222f7FA132F9e80fDCC074df5C
-  address internal constant WETH_GATEWAY = 0xD5f6c8D402E0a0222f7FA132F9e80fDCC074df5C;
+  // https://era.zksync.network/address/0xAE2b00D676130Bdf22582781BbBA8f4F21e8B0ff
+  address internal constant WETH_GATEWAY = 0xAE2b00D676130Bdf22582781BbBA8f4F21e8B0ff;
 
   // https://era.zksync.network/address/0x05c77Cf62346329a157d7A6F874464D049CECb26
   address internal constant RISK_STEWARD = 0x05c77Cf62346329a157d7A6F874464D049CECb26;
diff --git a/src/ts/AaveV3Arbitrum.ts b/src/ts/AaveV3Arbitrum.ts
index 4d89275f..4d6446eb 100644
--- a/src/ts/AaveV3Arbitrum.ts
+++ b/src/ts/AaveV3Arbitrum.ts
@@ -89,8 +89,8 @@ export const UI_POOL_DATA_PROVIDER = '0x5c5228aC8BC1528482514aF3e27E692495148717
 // https://arbiscan.io/address/0xBc790382B3686abffE4be14A030A96aC6154023a
 export const WALLET_BALANCE_PROVIDER = '0xBc790382B3686abffE4be14A030A96aC6154023a';
 
-// https://arbiscan.io/address/0x5760E34c4003752329bC77790B1De44C2799F8C3
-export const WETH_GATEWAY = '0x5760E34c4003752329bC77790B1De44C2799F8C3';
+// https://arbiscan.io/address/0x5283BEcEd7ADF6D003225C13896E536f2D4264FF
+export const WETH_GATEWAY = '0x5283BEcEd7ADF6D003225C13896E536f2D4264FF';
 
 // https://arbiscan.io/address/0x5598BbFA2f4fE8151f45bBA0a3edE1b54B51a0a9
 export const WITHDRAW_SWAP_ADAPTER = '0x5598BbFA2f4fE8151f45bBA0a3edE1b54B51a0a9';
diff --git a/src/ts/AaveV3Avalanche.ts b/src/ts/AaveV3Avalanche.ts
index eda51a9c..59090980 100644
--- a/src/ts/AaveV3Avalanche.ts
+++ b/src/ts/AaveV3Avalanche.ts
@@ -83,8 +83,8 @@ export const UI_POOL_DATA_PROVIDER = '0x50B4a66bF4D41e6252540eA7427D7A933Bc3c088
 // https://snowtrace.io/address/0xBc790382B3686abffE4be14A030A96aC6154023a
 export const WALLET_BALANCE_PROVIDER = '0xBc790382B3686abffE4be14A030A96aC6154023a';
 
-// https://snowtrace.io/address/0xCf3045a03F83ADfBCbA1f19Cb2cF4E19075F8668
-export const WETH_GATEWAY = '0xCf3045a03F83ADfBCbA1f19Cb2cF4E19075F8668';
+// https://snowtrace.io/address/0x2825cE5921538d17cc15Ae00a8B24fF759C6CDaE
+export const WETH_GATEWAY = '0x2825cE5921538d17cc15Ae00a8B24fF759C6CDaE';
 
 // https://snowtrace.io/address/0x78F8Bd884C3D738B74B420540659c82f392820e0
 export const WITHDRAW_SWAP_ADAPTER = '0x78F8Bd884C3D738B74B420540659c82f392820e0';
diff --git a/src/ts/AaveV3BNB.ts b/src/ts/AaveV3BNB.ts
index caf5b6df..b1253635 100644
--- a/src/ts/AaveV3BNB.ts
+++ b/src/ts/AaveV3BNB.ts
@@ -74,8 +74,8 @@ export const UI_POOL_DATA_PROVIDER = '0xc0179321f0825c3e0F59Fe7Ca4E40557b97797a3
 // https://bscscan.com/address/0x36616cf17557639614c1cdDb356b1B83fc0B2132
 export const WALLET_BALANCE_PROVIDER = '0x36616cf17557639614c1cdDb356b1B83fc0B2132';
 
-// https://bscscan.com/address/0xe63eAf6DAb1045689BD3a332bC596FfcF54A5C88
-export const WETH_GATEWAY = '0xe63eAf6DAb1045689BD3a332bC596FfcF54A5C88';
+// https://bscscan.com/address/0x0c2C95b24529664fE55D4437D7A31175CFE6c4f7
+export const WETH_GATEWAY = '0x0c2C95b24529664fE55D4437D7A31175CFE6c4f7';
 
 // https://bscscan.com/address/0x5E2d083417D12d4B0824E14Ecd48D26831F4Da7D
 export const WITHDRAW_SWAP_ADAPTER = '0x5E2d083417D12d4B0824E14Ecd48D26831F4Da7D';
diff --git a/src/ts/AaveV3Base.ts b/src/ts/AaveV3Base.ts
index a5f8ee65..5906a54b 100644
--- a/src/ts/AaveV3Base.ts
+++ b/src/ts/AaveV3Base.ts
@@ -89,8 +89,8 @@ export const UI_POOL_DATA_PROVIDER = '0x68100bD5345eA474D93577127C11F39FF8463e93
 // https://basescan.org/address/0x5779b29B0a34577d927E8D511B595ef9abbFAE82
 export const WALLET_BALANCE_PROVIDER = '0x5779b29B0a34577d927E8D511B595ef9abbFAE82';
 
-// https://basescan.org/address/0x729b3EA8C005AbC58c9150fb57Ec161296F06766
-export const WETH_GATEWAY = '0x729b3EA8C005AbC58c9150fb57Ec161296F06766';
+// https://basescan.org/address/0xa0d9C1E9E48Ca30c8d8C3B5D69FF5dc1f6DFfC24
+export const WETH_GATEWAY = '0xa0d9C1E9E48Ca30c8d8C3B5D69FF5dc1f6DFfC24';
 
 // https://basescan.org/address/0x78d33BF0014ab169725F2Ea5a62b200F2977faeE
 export const STATA_FACTORY = '0x78d33BF0014ab169725F2Ea5a62b200F2977faeE';
diff --git a/src/ts/AaveV3Ethereum.ts b/src/ts/AaveV3Ethereum.ts
index 8709cdea..ef86a8dd 100644
--- a/src/ts/AaveV3Ethereum.ts
+++ b/src/ts/AaveV3Ethereum.ts
@@ -83,8 +83,8 @@ export const UI_POOL_DATA_PROVIDER = '0x3F78BBD206e4D3c504Eb854232EdA7e47E9Fd8FC
 // https://etherscan.io/address/0xC7be5307ba715ce89b152f3Df0658295b3dbA8E2
 export const WALLET_BALANCE_PROVIDER = '0xC7be5307ba715ce89b152f3Df0658295b3dbA8E2';
 
-// https://etherscan.io/address/0xA434D495249abE33E031Fe71a969B81f3c07950D
-export const WETH_GATEWAY = '0xA434D495249abE33E031Fe71a969B81f3c07950D';
+// https://etherscan.io/address/0xd01607c3C5eCABa394D8be377a08590149325722
+export const WETH_GATEWAY = '0xd01607c3C5eCABa394D8be377a08590149325722';
 
 // https://etherscan.io/address/0x78F8Bd884C3D738B74B420540659c82f392820e0
 export const WITHDRAW_SWAP_ADAPTER = '0x78F8Bd884C3D738B74B420540659c82f392820e0';
diff --git a/src/ts/AaveV3EthereumEtherFi.ts b/src/ts/AaveV3EthereumEtherFi.ts
index 7f18f127..140ece70 100644
--- a/src/ts/AaveV3EthereumEtherFi.ts
+++ b/src/ts/AaveV3EthereumEtherFi.ts
@@ -62,8 +62,8 @@ export const UI_POOL_DATA_PROVIDER = '0x3F78BBD206e4D3c504Eb854232EdA7e47E9Fd8FC
 // https://etherscan.io/address/0xC7be5307ba715ce89b152f3Df0658295b3dbA8E2
 export const WALLET_BALANCE_PROVIDER = '0xC7be5307ba715ce89b152f3Df0658295b3dbA8E2';
 
-// https://etherscan.io/address/0xAB911dFB2bB9e264EE836F30D3367618f8Aef965
-export const WETH_GATEWAY = '0xAB911dFB2bB9e264EE836F30D3367618f8Aef965';
+// https://etherscan.io/address/0xf956B38F035dC9067fb827A512D3CF35202AB0Bc
+export const WETH_GATEWAY = '0xf956B38F035dC9067fb827A512D3CF35202AB0Bc';
 
 // https://etherscan.io/address/0x909bA8DA4c826C62013Ce3A30ce1F42943F3b340
 export const CONFIG_ENGINE = '0x909bA8DA4c826C62013Ce3A30ce1F42943F3b340';
diff --git a/src/ts/AaveV3EthereumLido.ts b/src/ts/AaveV3EthereumLido.ts
index 26228095..78195107 100644
--- a/src/ts/AaveV3EthereumLido.ts
+++ b/src/ts/AaveV3EthereumLido.ts
@@ -62,8 +62,8 @@ export const UI_POOL_DATA_PROVIDER = '0x3F78BBD206e4D3c504Eb854232EdA7e47E9Fd8FC
 // https://etherscan.io/address/0xC7be5307ba715ce89b152f3Df0658295b3dbA8E2
 export const WALLET_BALANCE_PROVIDER = '0xC7be5307ba715ce89b152f3Df0658295b3dbA8E2';
 
-// https://etherscan.io/address/0x0B8C700917a6991FEa7198dDFC80bc8962b5055D
-export const WETH_GATEWAY = '0x0B8C700917a6991FEa7198dDFC80bc8962b5055D';
+// https://etherscan.io/address/0x3167C452fA3fa1e5C16bB83Bc0fde4519C464299
+export const WETH_GATEWAY = '0x3167C452fA3fa1e5C16bB83Bc0fde4519C464299';
 
 // https://etherscan.io/address/0x1097eDb85392932b7dCB630baDDC8A6D73585218
 export const CONFIG_ENGINE = '0x1097eDb85392932b7dCB630baDDC8A6D73585218';
diff --git a/src/ts/AaveV3Gnosis.ts b/src/ts/AaveV3Gnosis.ts
index cce63867..ee8a1963 100644
--- a/src/ts/AaveV3Gnosis.ts
+++ b/src/ts/AaveV3Gnosis.ts
@@ -56,8 +56,8 @@ export const UI_POOL_DATA_PROVIDER = '0x5598BbFA2f4fE8151f45bBA0a3edE1b54B51a0a9
 // https://gnosisscan.io/address/0x4172E6aAEC070ACB31aaCE343A58c93E4C70f44D
 export const WALLET_BALANCE_PROVIDER = '0x4172E6aAEC070ACB31aaCE343A58c93E4C70f44D';
 
-// https://gnosisscan.io/address/0x7B9c12915c594a68dE96201Cbdc79147F09da278
-export const WETH_GATEWAY = '0x7B9c12915c594a68dE96201Cbdc79147F09da278';
+// https://gnosisscan.io/address/0xb85d72EC1EfE48168c4aBC4eB855f8Cbcd05cE38
+export const WETH_GATEWAY = '0xb85d72EC1EfE48168c4aBC4eB855f8Cbcd05cE38';
 
 // https://gnosisscan.io/address/0x33AE1f41546a2e05368Bf789b3d868813c0Ae658
 export const CAPS_PLUS_RISK_STEWARD = '0x33AE1f41546a2e05368Bf789b3d868813c0Ae658';
diff --git a/src/ts/AaveV3Linea.ts b/src/ts/AaveV3Linea.ts
index e36f7bd1..b1d74078 100644
--- a/src/ts/AaveV3Linea.ts
+++ b/src/ts/AaveV3Linea.ts
@@ -59,8 +59,8 @@ export const UI_POOL_DATA_PROVIDER = '0xf751969521E20A972A0776CDB0497Fad0F773F1F
 // https://lineascan.build/address/0xff75B6da14FfbbfD355Daf7a2731456b3562Ba6D
 export const WALLET_BALANCE_PROVIDER = '0xff75B6da14FfbbfD355Daf7a2731456b3562Ba6D';
 
-// https://lineascan.build/address/0x4758213271BFdC72224A7a8742dC865fC97756e1
-export const WETH_GATEWAY = '0x4758213271BFdC72224A7a8742dC865fC97756e1';
+// https://lineascan.build/address/0x31A239f3e39c5D8BA6B201bA81ed584492Ae960F
+export const WETH_GATEWAY = '0x31A239f3e39c5D8BA6B201bA81ed584492Ae960F';
 
 export const CHAIN_ID = 59144;
 export const ASSETS = {
diff --git a/src/ts/AaveV3Optimism.ts b/src/ts/AaveV3Optimism.ts
index cdf07c15..6f9e505f 100644
--- a/src/ts/AaveV3Optimism.ts
+++ b/src/ts/AaveV3Optimism.ts
@@ -83,8 +83,8 @@ export const UI_POOL_DATA_PROVIDER = '0xE92cd6164CE7DC68e740765BC1f2a091B6CBc3e4
 // https://optimistic.etherscan.io/address/0xBc790382B3686abffE4be14A030A96aC6154023a
 export const WALLET_BALANCE_PROVIDER = '0xBc790382B3686abffE4be14A030A96aC6154023a';
 
-// https://optimistic.etherscan.io/address/0x60eE8b61a13c67d0191c851BEC8F0bc850160710
-export const WETH_GATEWAY = '0x60eE8b61a13c67d0191c851BEC8F0bc850160710';
+// https://optimistic.etherscan.io/address/0x5f2508cAE9923b02316254026CD43d7902866725
+export const WETH_GATEWAY = '0x5f2508cAE9923b02316254026CD43d7902866725';
 
 // https://optimistic.etherscan.io/address/0x78F8Bd884C3D738B74B420540659c82f392820e0
 export const WITHDRAW_SWAP_ADAPTER = '0x78F8Bd884C3D738B74B420540659c82f392820e0';
diff --git a/src/ts/AaveV3Polygon.ts b/src/ts/AaveV3Polygon.ts
index ac744e73..f4d49589 100644
--- a/src/ts/AaveV3Polygon.ts
+++ b/src/ts/AaveV3Polygon.ts
@@ -77,8 +77,8 @@ export const UI_POOL_DATA_PROVIDER = '0x68100bD5345eA474D93577127C11F39FF8463e93
 // https://polygonscan.com/address/0xBc790382B3686abffE4be14A030A96aC6154023a
 export const WALLET_BALANCE_PROVIDER = '0xBc790382B3686abffE4be14A030A96aC6154023a';
 
-// https://polygonscan.com/address/0xF5f61a1ab3488fCB6d86451846bcFa9cdc108eB0
-export const WETH_GATEWAY = '0xF5f61a1ab3488fCB6d86451846bcFa9cdc108eB0';
+// https://polygonscan.com/address/0xBC302053db3aA514A3c86B9221082f162B91ad63
+export const WETH_GATEWAY = '0xBC302053db3aA514A3c86B9221082f162B91ad63';
 
 // https://polygonscan.com/address/0x78F8Bd884C3D738B74B420540659c82f392820e0
 export const WITHDRAW_SWAP_ADAPTER = '0x78F8Bd884C3D738B74B420540659c82f392820e0';
diff --git a/src/ts/AaveV3Scroll.ts b/src/ts/AaveV3Scroll.ts
index 78928150..81155f49 100644
--- a/src/ts/AaveV3Scroll.ts
+++ b/src/ts/AaveV3Scroll.ts
@@ -71,8 +71,8 @@ export const UI_POOL_DATA_PROVIDER = '0x5598BbFA2f4fE8151f45bBA0a3edE1b54B51a0a9
 // https://scrollscan.com/address/0xE51642875Af07Fea1B03d821E41a9DB24bC4447E
 export const WALLET_BALANCE_PROVIDER = '0xE51642875Af07Fea1B03d821E41a9DB24bC4447E';
 
-// https://scrollscan.com/address/0x31A239f3e39c5D8BA6B201bA81ed584492Ae960F
-export const WETH_GATEWAY = '0x31A239f3e39c5D8BA6B201bA81ed584492Ae960F';
+// https://scrollscan.com/address/0xE79Ca44408Dae5a57eA2a9594532f1E84d2edAa4
+export const WETH_GATEWAY = '0xE79Ca44408Dae5a57eA2a9594532f1E84d2edAa4';
 
 // https://scrollscan.com/address/0x970b77b96D94966939a8F867c2BfC2aC0310C0e7
 export const LEGACY_STATIC_A_TOKEN_FACTORY = '0x970b77b96D94966939a8F867c2BfC2aC0310C0e7';
diff --git a/src/ts/AaveV3ZkSync.ts b/src/ts/AaveV3ZkSync.ts
index 71f8908d..5463ec0b 100644
--- a/src/ts/AaveV3ZkSync.ts
+++ b/src/ts/AaveV3ZkSync.ts
@@ -56,8 +56,8 @@ export const UI_POOL_DATA_PROVIDER = '0x6fCDa2646d6E4a42b1663d219811fC96AE3A0ec8
 // https://era.zksync.network/address/0xcb8Dc3C135e59B1252F057da44A8f43EE6B0dAB0
 export const WALLET_BALANCE_PROVIDER = '0xcb8Dc3C135e59B1252F057da44A8f43EE6B0dAB0';
 
-// https://era.zksync.network/address/0xD5f6c8D402E0a0222f7FA132F9e80fDCC074df5C
-export const WETH_GATEWAY = '0xD5f6c8D402E0a0222f7FA132F9e80fDCC074df5C';
+// https://era.zksync.network/address/0xAE2b00D676130Bdf22582781BbBA8f4F21e8B0ff
+export const WETH_GATEWAY = '0xAE2b00D676130Bdf22582781BbBA8f4F21e8B0ff';
 
 // https://era.zksync.network/address/0x05c77Cf62346329a157d7A6F874464D049CECb26
 export const RISK_STEWARD = '0x05c77Cf62346329a157d7A6F874464D049CECb26';
diff --git a/src/ts/abis/AggregatorInterface.ts b/src/ts/abis/AggregatorInterface.ts
index 3b06fdf1..77b6a908 100644
--- a/src/ts/abis/AggregatorInterface.ts
+++ b/src/ts/abis/AggregatorInterface.ts
@@ -1,5 +1,31 @@
 // AUTOGENERATED - MANUALLY CHANGES WILL BE REVERTED BY THE GENERATOR
 export const AggregatorInterface_ABI = [
+  {
+    type: 'function',
+    name: 'decimals',
+    inputs: [],
+    outputs: [
+      {
+        name: '',
+        type: 'uint8',
+        internalType: 'uint8',
+      },
+    ],
+    stateMutability: 'view',
+  },
+  {
+    type: 'function',
+    name: 'description',
+    inputs: [],
+    outputs: [
+      {
+        name: '',
+        type: 'string',
+        internalType: 'string',
+      },
+    ],
+    stateMutability: 'view',
+  },
   {
     type: 'function',
     name: 'getAnswer',
@@ -19,6 +45,45 @@ export const AggregatorInterface_ABI = [
     ],
     stateMutability: 'view',
   },
+  {
+    type: 'function',
+    name: 'getRoundData',
+    inputs: [
+      {
+        name: '_roundId',
+        type: 'uint80',
+        internalType: 'uint80',
+      },
+    ],
+    outputs: [
+      {
+        name: 'roundId',
+        type: 'uint80',
+        internalType: 'uint80',
+      },
+      {
+        name: 'answer',
+        type: 'int256',
+        internalType: 'int256',
+      },
+      {
+        name: 'startedAt',
+        type: 'uint256',
+        internalType: 'uint256',
+      },
+      {
+        name: 'updatedAt',
+        type: 'uint256',
+        internalType: 'uint256',
+      },
+      {
+        name: 'answeredInRound',
+        type: 'uint80',
+        internalType: 'uint80',
+      },
+    ],
+    stateMutability: 'view',
+  },
   {
     type: 'function',
     name: 'getTimestamp',
@@ -64,6 +129,39 @@ export const AggregatorInterface_ABI = [
     ],
     stateMutability: 'view',
   },
+  {
+    type: 'function',
+    name: 'latestRoundData',
+    inputs: [],
+    outputs: [
+      {
+        name: 'roundId',
+        type: 'uint80',
+        internalType: 'uint80',
+      },
+      {
+        name: 'answer',
+        type: 'int256',
+        internalType: 'int256',
+      },
+      {
+        name: 'startedAt',
+        type: 'uint256',
+        internalType: 'uint256',
+      },
+      {
+        name: 'updatedAt',
+        type: 'uint256',
+        internalType: 'uint256',
+      },
+      {
+        name: 'answeredInRound',
+        type: 'uint80',
+        internalType: 'uint80',
+      },
+    ],
+    stateMutability: 'view',
+  },
   {
     type: 'function',
     name: 'latestTimestamp',
diff --git a/src/ts/abis/ICrossChainController.ts b/src/ts/abis/ICrossChainController.ts
index 51d50535..7d8eb961 100644
--- a/src/ts/abis/ICrossChainController.ts
+++ b/src/ts/abis/ICrossChainController.ts
@@ -873,19 +873,6 @@ export const ICrossChainController_ABI = [
     outputs: [],
     stateMutability: 'nonpayable',
   },
-  {
-    type: 'function',
-    name: 'whoCanRescue',
-    inputs: [],
-    outputs: [
-      {
-        name: '',
-        type: 'address',
-        internalType: 'address',
-      },
-    ],
-    stateMutability: 'view',
-  },
   {
     type: 'event',
     name: 'BridgeAdapterUpdated',
diff --git a/src/ts/abis/IPool.ts b/src/ts/abis/IPool.ts
index b28a6691..3a4c2c28 100644
--- a/src/ts/abis/IPool.ts
+++ b/src/ts/abis/IPool.ts
@@ -244,6 +244,24 @@ export const IPool_ABI = [
     outputs: [],
     stateMutability: 'nonpayable',
   },
+  {
+    type: 'function',
+    name: 'eliminateReserveDeficit',
+    inputs: [
+      {
+        name: 'asset',
+        type: 'address',
+        internalType: 'address',
+      },
+      {
+        name: 'amount',
+        type: 'uint256',
+        internalType: 'uint256',
+      },
+    ],
+    outputs: [],
+    stateMutability: 'nonpayable',
+  },
   {
     type: 'function',
     name: 'finalizeTransfer',
@@ -592,7 +610,7 @@ export const IPool_ABI = [
         internalType: 'uint40',
       },
     ],
-    stateMutability: 'nonpayable',
+    stateMutability: 'view',
   },
   {
     type: 'function',
@@ -620,6 +638,25 @@ export const IPool_ABI = [
     ],
     stateMutability: 'view',
   },
+  {
+    type: 'function',
+    name: 'getReserveAToken',
+    inputs: [
+      {
+        name: 'asset',
+        type: 'address',
+        internalType: 'address',
+      },
+    ],
+    outputs: [
+      {
+        name: '',
+        type: 'address',
+        internalType: 'address',
+      },
+    ],
+    stateMutability: 'view',
+  },
   {
     type: 'function',
     name: 'getReserveAddressById',
@@ -744,7 +781,7 @@ export const IPool_ABI = [
   },
   {
     type: 'function',
-    name: 'getReserveDataExtended',
+    name: 'getReserveDeficit',
     inputs: [
       {
         name: 'asset',
@@ -755,102 +792,8 @@ export const IPool_ABI = [
     outputs: [
       {
         name: '',
-        type: 'tuple',
-        internalType: 'struct DataTypes.ReserveData',
-        components: [
-          {
-            name: 'configuration',
-            type: 'tuple',
-            internalType: 'struct DataTypes.ReserveConfigurationMap',
-            components: [
-              {
-                name: 'data',
-                type: 'uint256',
-                internalType: 'uint256',
-              },
-            ],
-          },
-          {
-            name: 'liquidityIndex',
-            type: 'uint128',
-            internalType: 'uint128',
-          },
-          {
-            name: 'currentLiquidityRate',
-            type: 'uint128',
-            internalType: 'uint128',
-          },
-          {
-            name: 'variableBorrowIndex',
-            type: 'uint128',
-            internalType: 'uint128',
-          },
-          {
-            name: 'currentVariableBorrowRate',
-            type: 'uint128',
-            internalType: 'uint128',
-          },
-          {
-            name: '__deprecatedStableBorrowRate',
-            type: 'uint128',
-            internalType: 'uint128',
-          },
-          {
-            name: 'lastUpdateTimestamp',
-            type: 'uint40',
-            internalType: 'uint40',
-          },
-          {
-            name: 'id',
-            type: 'uint16',
-            internalType: 'uint16',
-          },
-          {
-            name: 'liquidationGracePeriodUntil',
-            type: 'uint40',
-            internalType: 'uint40',
-          },
-          {
-            name: 'aTokenAddress',
-            type: 'address',
-            internalType: 'address',
-          },
-          {
-            name: '__deprecatedStableDebtTokenAddress',
-            type: 'address',
-            internalType: 'address',
-          },
-          {
-            name: 'variableDebtTokenAddress',
-            type: 'address',
-            internalType: 'address',
-          },
-          {
-            name: 'interestRateStrategyAddress',
-            type: 'address',
-            internalType: 'address',
-          },
-          {
-            name: 'accruedToTreasury',
-            type: 'uint128',
-            internalType: 'uint128',
-          },
-          {
-            name: 'unbacked',
-            type: 'uint128',
-            internalType: 'uint128',
-          },
-          {
-            name: 'isolationModeTotalDebt',
-            type: 'uint128',
-            internalType: 'uint128',
-          },
-          {
-            name: 'virtualUnderlyingBalance',
-            type: 'uint128',
-            internalType: 'uint128',
-          },
-        ],
+        type: 'uint256',
+        internalType: 'uint256',
       },
     ],
     stateMutability: 'view',
@@ -893,6 +836,25 @@ export const IPool_ABI = [
     ],
     stateMutability: 'view',
   },
+  {
+    type: 'function',
+    name: 'getReserveVariableDebtToken',
+    inputs: [
+      {
+        name: 'asset',
+        type: 'address',
+        internalType: 'address',
+      },
+    ],
+    outputs: [
+      {
+        name: '',
+        type: 'address',
+        internalType: 'address',
+      },
+    ],
+    stateMutability: 'view',
+  },
   {
     type: 'function',
     name: 'getReservesCount',
@@ -1629,6 +1591,56 @@ export const IPool_ABI = [
     ],
     anonymous: false,
   },
+  {
+    type: 'event',
+    name: 'DeficitCovered',
+    inputs: [
+      {
+        name: 'reserve',
+        type: 'address',
+        indexed: true,
+        internalType: 'address',
+      },
+      {
+        name: 'caller',
+        type: 'address',
+        indexed: false,
+        internalType: 'address',
+      },
+      {
+        name: 'amountCovered',
+        type: 'uint256',
+        indexed: false,
+        internalType: 'uint256',
+      },
+    ],
+    anonymous: false,
+  },
+  {
+    type: 'event',
+    name: 'DeficitCreated',
+    inputs: [
+      {
+        name: 'user',
+        type: 'address',
+        indexed: true,
+        internalType: 'address',
+      },
+      {
+        name: 'debtAsset',
+        type: 'address',
+        indexed: true,
+        internalType: 'address',
+      },
+      {
+        name: 'amountCreated',
+        type: 'uint256',
+        indexed: false,
+        internalType: 'uint256',
+      },
+    ],
+    anonymous: false,
+  },
   {
     type: 'event',
     name: 'FlashLoan',
diff --git a/src/ts/abis/IRescuable.ts b/src/ts/abis/IRescuable.ts
index 4cbab9d1..c35e9c01 100644
--- a/src/ts/abis/IRescuable.ts
+++ b/src/ts/abis/IRescuable.ts
@@ -60,19 +60,6 @@ export const IRescuable_ABI = [
     ],
     stateMutability: 'view',
   },
-  {
-    type: 'function',
-    name: 'whoCanRescue',
-    inputs: [],
-    outputs: [
-      {
-        name: '',
-        type: 'address',
-        internalType: 'address',
-      },
-    ],
-    stateMutability: 'view',
-  },
   {
     type: 'event',
     name: 'ERC20Rescued',
diff --git a/src/ts/abis/IRewardsController.ts b/src/ts/abis/IRewardsController.ts
index 3b6a4145..e7c62c30 100644
--- a/src/ts/abis/IRewardsController.ts
+++ b/src/ts/abis/IRewardsController.ts
@@ -244,7 +244,7 @@ export const IRewardsController_ABI = [
           {
             name: 'rewardOracle',
             type: 'address',
-            internalType: 'contract IEACAggregatorProxy',
+            internalType: 'contract AggregatorInterface',
           },
         ],
       },
@@ -675,7 +675,7 @@ export const IRewardsController_ABI = [
       {
         name: 'rewardOracle',
         type: 'address',
-        internalType: 'contract IEACAggregatorProxy',
+        internalType: 'contract AggregatorInterface',
       },
     ],
     outputs: [],
diff --git a/src/ts/abis/IStataTokenFactory.ts b/src/ts/abis/IStataTokenFactory.ts
index 41991966..9a4cc174 100644
--- a/src/ts/abis/IStataTokenFactory.ts
+++ b/src/ts/abis/IStataTokenFactory.ts
@@ -1,5 +1,57 @@
 // AUTOGENERATED - MANUALLY CHANGES WILL BE REVERTED BY THE GENERATOR
 export const IStataTokenFactory_ABI = [
+  {
+    type: 'function',
+    name: 'INITIAL_OWNER',
+    inputs: [],
+    outputs: [
+      {
+        name: '',
+        type: 'address',
+        internalType: 'address',
+      },
+    ],
+    stateMutability: 'view',
+  },
+  {
+    type: 'function',
+    name: 'POOL',
+    inputs: [],
+    outputs: [
+      {
+        name: '',
+        type: 'address',
+        internalType: 'contract IPool',
+      },
+    ],
+    stateMutability: 'view',
+  },
+  {
+    type: 'function',
+    name: 'STATA_TOKEN_IMPL',
+    inputs: [],
+    outputs: [
+      {
+        name: '',
+        type: 'address',
+        internalType: 'address',
+      },
+    ],
+    stateMutability: 'view',
+  },
+  {
+    type: 'function',
+    name: 'TRANSPARENT_PROXY_FACTORY',
+    inputs: [],
+    outputs: [
+      {
+        name: '',
+        type: 'address',
+        internalType: 'contract ITransparentProxyFactory',
+      },
+    ],
+    stateMutability: 'view',
+  },
   {
     type: 'function',
     name: 'createStataTokens',
diff --git a/src/ts/abis/IWithGuardian.ts b/src/ts/abis/IWithGuardian.ts
index 25ea642b..6b795b8c 100644
--- a/src/ts/abis/IWithGuardian.ts
+++ b/src/ts/abis/IWithGuardian.ts
@@ -45,4 +45,26 @@ export const IWithGuardian_ABI = [
     ],
     anonymous: false,
   },
+  {
+    type: 'error',
+    name: 'OnlyGuardianInvalidCaller',
+    inputs: [
+      {
+        name: 'account',
+        type: 'address',
+        internalType: 'address',
+      },
+    ],
+  },
+  {
+    type: 'error',
+    name: 'OnlyGuardianOrOwnerInvalidCaller',
+    inputs: [
+      {
+        name: 'account',
+        type: 'address',
+        internalType: 'address',
+      },
+    ],
+  },
 ] as const;
diff --git a/src/ts/abis/IWrappedTokenGatewayV3.ts b/src/ts/abis/IWrappedTokenGatewayV3.ts
index f5ebfea4..300be63e 100644
--- a/src/ts/abis/IWrappedTokenGatewayV3.ts
+++ b/src/ts/abis/IWrappedTokenGatewayV3.ts
@@ -1,5 +1,31 @@
 // AUTOGENERATED - MANUALLY CHANGES WILL BE REVERTED BY THE GENERATOR
 export const IWrappedTokenGatewayV3_ABI = [
+  {
+    type: 'function',
+    name: 'POOL',
+    inputs: [],
+    outputs: [
+      {
+        name: '',
+        type: 'address',
+        internalType: 'contract IPool',
+      },
+    ],
+    stateMutability: 'view',
+  },
+  {
+    type: 'function',
+    name: 'WETH',
+    inputs: [],
+    outputs: [
+      {
+        name: '',
+        type: 'address',
+        internalType: 'contract IWETH',
+      },
+    ],
+    stateMutability: 'view',
+  },
   {
     type: 'function',
     name: 'borrowETH',
diff --git a/tests/cache/verified.json b/tests/cache/verified.json
index a3af0652..fed73bca 100644
--- a/tests/cache/verified.json
+++ b/tests/cache/verified.json
@@ -2388,6 +2388,15 @@
     "0xD1E856a947CdF56b4f000ee29d34F5808E0A6848": {
       "name": "GhoGsmSteward"
     },
+    "0xd01607c3C5eCABa394D8be377a08590149325722": {
+      "name": "WrappedTokenGatewayV3"
+    },
+    "0x3167C452fA3fa1e5C16bB83Bc0fde4519C464299": {
+      "name": "WrappedTokenGatewayV3"
+    },
+    "0xf956B38F035dC9067fb827A512D3CF35202AB0Bc": {
+      "name": "WrappedTokenGatewayV3"
+    },
     "0x2cE01c87Fec1b71A9041c52CaED46Fc5f4807285": {
       "name": "TransparentUpgradeableProxy"
     }
@@ -2854,6 +2863,9 @@
     },
     "0xEB0682d148e874553008730f0686ea89db7DA412": {
       "name": "TransparentProxyFactory"
+    },
+    "0x5f2508cAE9923b02316254026CD43d7902866725": {
+      "name": "WrappedTokenGatewayV3"
     }
   },
   "56": {
@@ -3186,6 +3198,9 @@
     },
     "0xEB0682d148e874553008730f0686ea89db7DA412": {
       "name": "TransparentProxyFactory"
+    },
+    "0x0c2C95b24529664fE55D4437D7A31175CFE6c4f7": {
+      "name": "WrappedTokenGatewayV3"
     }
   },
   "100": {
@@ -3506,6 +3521,9 @@
     },
     "0xEB0682d148e874553008730f0686ea89db7DA412": {
       "name": "TransparentProxyFactory"
+    },
+    "0xb85d72EC1EfE48168c4aBC4eB855f8Cbcd05cE38": {
+      "name": "WrappedTokenGatewayV3"
     }
   },
   "137": {
@@ -4396,6 +4414,9 @@
     },
     "0xEB0682d148e874553008730f0686ea89db7DA412": {
       "name": "TransparentProxyFactory"
+    },
+    "0xBC302053db3aA514A3c86B9221082f162B91ad63": {
+      "name": "WrappedTokenGatewayV3"
     }
   },
   "146": {
@@ -4673,6 +4694,9 @@
     },
     "0x0a902bCd36F128683EAF1eE7001a3ad2E808d93B": {
       "name": "TransparentProxyFactoryZkSync"
+    },
+    "0xAE2b00D676130Bdf22582781BbBA8f4F21e8B0ff": {
+      "name": "WrappedTokenGatewayV3"
     }
   },
   "1088": {
@@ -5503,6 +5527,9 @@
     },
     "0xfc421aD3C883Bf9E7C4f42dE845C4e4405799e73": {
       "name": "GhoOracle"
+    },
+    "0xa0d9C1E9E48Ca30c8d8C3B5D69FF5dc1f6DFfC24": {
+      "name": "WrappedTokenGatewayV3"
     }
   },
   "42161": {
@@ -6045,6 +6072,9 @@
     },
     "0xCd5ab470AaC5c13e1063ee700503f3346b7C90Db": {
       "name": "GhoCcipSteward"
+    },
+    "0x5283BEcEd7ADF6D003225C13896E536f2D4264FF": {
+      "name": "WrappedTokenGatewayV3"
     }
   },
   "42220": {
@@ -6873,6 +6903,9 @@
     },
     "0xEB0682d148e874553008730f0686ea89db7DA412": {
       "name": "TransparentProxyFactory"
+    },
+    "0x2825cE5921538d17cc15Ae00a8B24fF759C6CDaE": {
+      "name": "WrappedTokenGatewayV3"
     }
   },
   "59144": {
@@ -7055,6 +7088,9 @@
     },
     "0x0abf2f5642d945b49B8d2DBC6f85c2D8e0424C85": {
       "name": "CLRatePriceCapAdapter"
+    },
+    "0x31A239f3e39c5D8BA6B201bA81ed584492Ae960F": {
+      "name": "WrappedTokenGatewayV3"
     }
   },
   "84532": {
@@ -7499,6 +7535,9 @@
     },
     "0xEB0682d148e874553008730f0686ea89db7DA412": {
       "name": "TransparentProxyFactory"
+    },
+    "0xE79Ca44408Dae5a57eA2a9594532f1E84d2edAa4": {
+      "name": "WrappedTokenGatewayV3"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/tests/sanity/stataFactory.spec.ts b/tests/sanity/stataFactory.spec.ts
index 49d495b4..ff40e06b 100644
--- a/tests/sanity/stataFactory.spec.ts
+++ b/tests/sanity/stataFactory.spec.ts
@@ -3,27 +3,16 @@ import * as addressBook from '../../src/ts/AaveAddressBook';
 import {getContract} from 'viem';
 import {getClient} from '../../scripts/clients';
 import {getMisc} from '../utils';
+import {IStataTokenFactory_ABI} from '../../src/ts/abis/IStataTokenFactory';
 
 export async function check(addresses: Record<string, any>) {
   const client = getClient(addresses.CHAIN_ID);
   const factory = getContract({
     abi: [
+      ...IStataTokenFactory_ABI,
       {
         type: 'function',
-        name: 'POOL',
-        inputs: [],
-        outputs: [
-          {
-            name: '',
-            type: 'address',
-            internalType: 'address',
-          },
-        ],
-        stateMutability: 'view',
-      },
-      {
-        type: 'function',
-        name: 'PROXY_ADMIN',
+        name: 'PROXY_ADMIN', // legacy for not yet upgraded contracts
         inputs: [],
         outputs: [
           {
diff --git a/tests/sanity/wethGateway.spec.ts b/tests/sanity/wethGateway.spec.ts
index 4031085d..be99fa9c 100644
--- a/tests/sanity/wethGateway.spec.ts
+++ b/tests/sanity/wethGateway.spec.ts
@@ -1,8 +1,9 @@
-import {describe, it} from 'vitest';
+import {describe, it, expect} from 'vitest';
 import * as addressBook from '../../src/ts/AaveAddressBook';
 import {getContract} from 'viem';
 import {getClient} from '../../scripts/clients';
 import {IOwnable_ABI} from '../../src/ts/abis/IOwnable';
+import {IWrappedTokenGatewayV3_ABI} from '../../src/ts/abis/IWrappedTokenGatewayV3';
 import {getGovernance} from '../utils';
 
 export async function check(addresses: Record<string, any>) {
@@ -10,35 +11,40 @@ export async function check(addresses: Record<string, any>) {
   // on testnets owners are usually not governance
   if (!client.chain?.testnet) {
     const gateway = getContract({
-      abi: IOwnable_ABI,
+      abi: [...IOwnable_ABI, ...IWrappedTokenGatewayV3_ABI] as const,
       address: addresses.WETH_GATEWAY,
       client,
     });
     const owner = await gateway.read.owner();
     const governance = getGovernance(addresses.CHAIN_ID);
+    // pools without governance are factually deprecated
     if (!governance) {
       console.log(
         `SANITY_GATEWAY: Skipped due to missing governance on chainId: ${addresses.CHAIN_ID}`,
       );
-    } else {
-      const l1Executor = (governance as any).EXECUTOR_LVL_1;
-      // prettier would be to check against executor lvl_1
-      if (owner !== l1Executor) {
-        throw new Error(
-          `SANITY_GATEWAY: OWNER MISMATCH ${addresses.POOL}.${addresses.WETH_GATEWAY}:${owner} != ${l1Executor}`,
-        );
-      }
+      return;
     }
+
+    const pool = await gateway.read.POOL();
+    expect(pool).toEqual(addresses.POOL);
+
+    const l1Executor = (governance as any).EXECUTOR_LVL_1;
+    expect(owner).toEqual(l1Executor);
+
+    // TODO:
+    // const nativeWrapped = await gateway.read.WETH();
+    // expect(nativeWrapped) - we actually don't store this anywhere yet
   }
 }
 
 describe('weth gateway', () => {
-  it('should reference correct contracts on all getters', async () => {
-    await Promise.all(
-      Object.keys(addressBook).map((library) => {
-        const addresses = addressBook[library];
-        if (addresses.WETH_GATEWAY) return check(addresses);
-      }),
-    );
+  Object.keys(addressBook).map((library) => {
+    const addresses = addressBook[library];
+    if (addresses.WETH_GATEWAY) {
+      const client = getClient(addresses.CHAIN_ID);
+      it(`should reference correct contracts on all getters: ${client.chain!.name}`, async () => {
+        return check(addresses);
+      });
+    }
   });
 });