diff --git a/scripts/configs/networks/ethereum.ts b/scripts/configs/networks/ethereum.ts
index 6a3cb20a..a266b97a 100644
--- a/scripts/configs/networks/ethereum.ts
+++ b/scripts/configs/networks/ethereum.ts
@@ -28,3 +28,12 @@ export const ethereumAddresses: NetworkAddresses<{
     AAVE_MERKLE_DISTRIBUTOR: '0xa88c6D90eAe942291325f9ae3c66f3563B93FE10',
   },
 };
+
+export const sepoliaAddresses: NetworkAddresses = {
+  name: 'Sepolia',
+  chainId: ChainId.sepolia,
+  addresses: {
+    TRANSPARENT_PROXY_FACTORY: '0x3Bad08c7b17D77cE12A2e1438Db2353b58F7c4a2',
+    PROXY_ADMIN: '0x8dDa7a1E3e96EB13BE50bB59e80485227E3DE2e7',
+  },
+};
diff --git a/scripts/configs/networks/polygon.ts b/scripts/configs/networks/polygon.ts
index 15124b23..b4d75ccb 100644
--- a/scripts/configs/networks/polygon.ts
+++ b/scripts/configs/networks/polygon.ts
@@ -15,3 +15,12 @@ export const polygonAddresses: NetworkAddresses<{AAVE_POL_ETH_BRIDGE: Hex}> = {
     AAVE_MERKLE_DISTRIBUTOR: '0x7A9ff54A6eE4a21223036890bB8c4ea2D62c686b',
   },
 };
+
+export const mumbaiAddresses: NetworkAddresses = {
+  name: 'Mumbai',
+  chainId: ChainId.mumbai,
+  addresses: {
+    TRANSPARENT_PROXY_FACTORY: '0x49A726CC7B438dBc4fB89a9548B5E8691e1C35A6',
+    PROXY_ADMIN: '0xaebfFE29D8E823e8E43695648F418fa8c30AF879',
+  },
+};
diff --git a/scripts/configs/pools/arbitrum.ts b/scripts/configs/pools/arbitrum.ts
index 22096ac0..2b4e84cf 100644
--- a/scripts/configs/pools/arbitrum.ts
+++ b/scripts/configs/pools/arbitrum.ts
@@ -28,7 +28,7 @@ export const arbitrumProtoV3: PoolConfig = {
     POOL_ADDRESSES_PROVIDER_REGISTRY: '0x770ef9f4fe897e59daCc474EF11238303F9552b6',
     RATES_FACTORY: '0xcC47c4Fe1F7f29ff31A8b62197023aC8553C7896',
     REPAY_WITH_COLLATERAL_ADAPTER: '0x28201C152DC5B69A86FA54FCfd21bcA4C0eff3BA',
-    STATIC_A_TOKEN_FACTORY: '0xD9419920a9768d6EdaBbe5b93cB4B5B9F3019823',
+    STATIC_A_TOKEN_FACTORY: '0x411D79b8cC43384FDE66CaBf9b6a17180c842511',
     SWAP_COLLATERAL_ADAPTER: '0xF3C3F14dd7BDb7E03e6EBc3bc5Ffc6D66De12251',
     UI_INCENTIVE_DATA_PROVIDER: '0xDA67AF3403555Ce0AE3ffC22fDb7354458277358',
     UI_POOL_DATA_PROVIDER: '0x145dE30c929a065582da84Cf96F88460dB9745A7',
diff --git a/scripts/configs/pools/avalanche.ts b/scripts/configs/pools/avalanche.ts
index eb7cb226..e3b28ffa 100644
--- a/scripts/configs/pools/avalanche.ts
+++ b/scripts/configs/pools/avalanche.ts
@@ -63,7 +63,7 @@ export const avalancheProtoV3: PoolConfig = {
     PROOF_OF_RESERVE_AGGREGATOR: '0x80f2c02224a2E548FC67c0bF705eBFA825dd5439',
     RATES_FACTORY: '0xDd81E6F85358292075B78fc8D5830BE8434aF8BA',
     REPAY_WITH_COLLATERAL_ADAPTER: '0x49F5B996814fEd1dd39285B92A59CFb2dfd8D4f9',
-    STATIC_A_TOKEN_FACTORY: '0xbD37610BBB1ddc2a22797F7e3f531B59902b7bA7',
+    STATIC_A_TOKEN_FACTORY: '0x691C316b2Eec7e64d17e7E3E01f3dB44c9CcEf19',
     SWAP_COLLATERAL_ADAPTER: '0x2Cf641F7C0eac2788A7924B82d6Ca8EB7bAa4E3A',
     UI_INCENTIVE_DATA_PROVIDER: '0x265d414f80b0fca9505710e6F16dB4b67555D365',
     UI_POOL_DATA_PROVIDER: '0xF71DBe0FAEF1473ffC607d4c555dfF0aEaDb878d',
diff --git a/scripts/configs/pools/base.ts b/scripts/configs/pools/base.ts
index 25d4e825..8419fcf4 100644
--- a/scripts/configs/pools/base.ts
+++ b/scripts/configs/pools/base.ts
@@ -12,6 +12,7 @@ export const baseProtoV3: PoolConfig = {
     WITHDRAW_SWAP_ADAPTER: '0x5598BbFA2f4fE8151f45bBA0a3edE1b54B51a0a9',
     SWAP_COLLATERAL_ADAPTER: '0x2E549104c516b8657A7D888494DfbAbD7C70b464',
     REPAY_WITH_COLLATERAL_ADAPTER: '0x78F8Bd884C3D738B74B420540659c82f392820e0',
+    STATIC_A_TOKEN_FACTORY: '0x940F9a5d5F9ED264990D0eaee1F3DD60B4Cb9A22',
     CONFIG_ENGINE: '0xc7751400F809cdB0C167F87985083C558a0610F7',
     RATES_FACTORY: '0x0D1Fe8eAdb0a3e44C4Cc9D73De8dA50C1E475832',
     L2_ENCODER: '0x39e97c588B2907Fb67F44fea256Ae3BA064207C5',
diff --git a/scripts/configs/pools/ethereum.ts b/scripts/configs/pools/ethereum.ts
index e470bf5c..8fa431e2 100644
--- a/scripts/configs/pools/ethereum.ts
+++ b/scripts/configs/pools/ethereum.ts
@@ -38,6 +38,7 @@ export const sepoliaProtoV3: PoolConfig = {
     UI_POOL_DATA_PROVIDER: '0x69529987FA4A075D0C00B0128fa848dc9ebbE9CE',
     WALLET_BALANCE_PROVIDER: '0xCD4e0d6D2b1252E2A709B8aE97DBA31164C5a709',
     WETH_GATEWAY: '0x387d311e47e80b498169e6fb51d3193167d89F7D',
+    STATIC_A_TOKEN_FACTORY: '0xd210dFB43B694430B8d31762B5199e30c31266C8',
   },
 };
 
@@ -99,7 +100,7 @@ export const mainnetProtoV3Pool: PoolConfig = {
     POOL_ADDRESSES_PROVIDER_REGISTRY: '0xbaA999AC55EAce41CcAE355c77809e68Bb345170',
     RATES_FACTORY: '0xcC47c4Fe1F7f29ff31A8b62197023aC8553C7896',
     REPAY_WITH_COLLATERAL_ADAPTER: '0x02e7B8511831B1b02d9018215a0f8f500Ea5c6B3',
-    STATIC_A_TOKEN_FACTORY: '0x17D0D723a6741C8E154594a8850D29D58Bcc9218',
+    STATIC_A_TOKEN_FACTORY: '0x411D79b8cC43384FDE66CaBf9b6a17180c842511',
     SWAP_COLLATERAL_ADAPTER: '0xADC0A53095A0af87F3aa29FE0715B5c28016364e',
     UI_GHO_DATA_PROVIDER: '0x379c1EDD1A41218bdbFf960a9d5AD2818Bf61aE8',
     UI_INCENTIVE_DATA_PROVIDER: '0x162A7AC02f547ad796CA549f757e2b8d1D9b10a6',
diff --git a/scripts/configs/pools/gnosis.ts b/scripts/configs/pools/gnosis.ts
index 7048e8ff..b86e08f6 100644
--- a/scripts/configs/pools/gnosis.ts
+++ b/scripts/configs/pools/gnosis.ts
@@ -16,5 +16,6 @@ export const gnosisProtoV3: PoolConfig = {
     WETH_GATEWAY: '0xb7E51aA2A5f4dD478F183A593F67637ed6F1d1D9',
     CAPS_PLUS_RISK_STEWARD: '0x33AE1f41546a2e05368Bf789b3d868813c0Ae658',
     FREEZING_STEWARD: '0x3Ceaf9b6CAb92dFe6302D0CC3F1BA880C28d35e5',
+    STATIC_A_TOKEN_FACTORY: '0x02e9b27599C4Bf8f789d34b6E65C51092c3d9FA6',
   },
 };
diff --git a/scripts/configs/pools/metis.ts b/scripts/configs/pools/metis.ts
index 82b687c5..e39e8328 100644
--- a/scripts/configs/pools/metis.ts
+++ b/scripts/configs/pools/metis.ts
@@ -15,5 +15,6 @@ export const metisProtoV3: PoolConfig = {
     UI_INCENTIVE_DATA_PROVIDER: '0x3e7BC5EcE0f22DbB16c3e3EeA288a10A57d68927',
     UI_POOL_DATA_PROVIDER: '0x7dd60bd8507fDC3d300d53427b7AE566701a7320',
     WALLET_BALANCE_PROVIDER: '0x1df710eb1E2FD9C21494aF2BFb1F210a4185885b',
+    STATIC_A_TOKEN_FACTORY: '0x9C62AdC332888F56998542415c38D7CDf3Ff7619',
   },
 };
diff --git a/scripts/configs/pools/optimism.ts b/scripts/configs/pools/optimism.ts
index c76c9761..825a34f9 100644
--- a/scripts/configs/pools/optimism.ts
+++ b/scripts/configs/pools/optimism.ts
@@ -28,7 +28,7 @@ export const optimismProtoV3: PoolConfig = {
     POOL_ADDRESSES_PROVIDER_REGISTRY: '0x770ef9f4fe897e59daCc474EF11238303F9552b6',
     RATES_FACTORY: '0xDd81E6F85358292075B78fc8D5830BE8434aF8BA',
     REPAY_WITH_COLLATERAL_ADAPTER: '0xa12734e64417f61f8442E7D5132EdBFdbDDeF0fa',
-    STATIC_A_TOKEN_FACTORY: '0xD9419920a9768d6EdaBbe5b93cB4B5B9F3019823',
+    STATIC_A_TOKEN_FACTORY: '0x22D76094730fA377184100EFB8CEfC673B89B372',
     SWAP_COLLATERAL_ADAPTER: '0x830C5A67a0C95D69dA5fb7801Ac1773c6fB53857',
     UI_INCENTIVE_DATA_PROVIDER: '0x6F143FE2F7B02424ad3CaD1593D6f36c0Aab69d7',
     UI_POOL_DATA_PROVIDER: '0xbd83DdBE37fc91923d59C8c1E0bDe0CccCa332d5',
diff --git a/scripts/configs/pools/polygon.ts b/scripts/configs/pools/polygon.ts
index 623ec5d4..2e8896b7 100644
--- a/scripts/configs/pools/polygon.ts
+++ b/scripts/configs/pools/polygon.ts
@@ -25,6 +25,7 @@ export const mumbaiProtoV3: PoolConfig = {
     UI_POOL_DATA_PROVIDER: '0xD64dDe119f11C88850FD596BE11CE398CC5893e6',
     WALLET_BALANCE_PROVIDER: '0xD8A70FC58BC069CFE6529EBF0c1Db067f2b5347E',
     WETH_GATEWAY: '0x8dA9412AbB78db20d0B496573D9066C474eA21B8',
+    STATIC_A_TOKEN_FACTORY: '0x4df6bfA5522aAd4C80e6C95b613B92AC019f2d3e',
   },
 };
 
@@ -59,7 +60,7 @@ export const polygonProtoV3: PoolConfig = {
     POOL_ADDRESSES_PROVIDER_REGISTRY: '0x770ef9f4fe897e59daCc474EF11238303F9552b6',
     RATES_FACTORY: '0xcC47c4Fe1F7f29ff31A8b62197023aC8553C7896',
     REPAY_WITH_COLLATERAL_ADAPTER: '0xE3090207A2de94A856EA10a7e1Bd36dD6145712B',
-    STATIC_A_TOKEN_FACTORY: '0x2B218C73f63820CE86655d16A79C333E24fEB0BE',
+    STATIC_A_TOKEN_FACTORY: '0x397202AB0b4E7C954ac0c493c00749C517210953',
     SWAP_COLLATERAL_ADAPTER: '0xC4aff49fCeD8ac1D818a6DCAB063f9f97E66ec5E',
     UI_INCENTIVE_DATA_PROVIDER: '0x874313A46e4957D29FAAC43BF5Eb2B144894f557',
     UI_POOL_DATA_PROVIDER: '0xC69728f11E9E6127733751c8410432913123acf1',
diff --git a/scripts/generateAddresses.ts b/scripts/generateAddresses.ts
index fbae1192..58ce342e 100644
--- a/scripts/generateAddresses.ts
+++ b/scripts/generateAddresses.ts
@@ -49,8 +49,8 @@ import {baseAddresses} from './configs/networks/base';
 import {generateNetworkAddresses} from './generator/networkGenerator';
 import {arbitrumAddresses} from './configs/networks/arbitrum';
 import {avalancheAddresses} from './configs/networks/avalanche';
-import {ethereumAddresses} from './configs/networks/ethereum';
-import {polygonAddresses} from './configs/networks/polygon';
+import {ethereumAddresses, sepoliaAddresses} from './configs/networks/ethereum';
+import {mumbaiAddresses, polygonAddresses} from './configs/networks/polygon';
 import {fantomAddresses} from './configs/networks/fantom';
 import {optimismAddresses} from './configs/networks/optimism';
 import {metisAddresses} from './configs/networks/metis';
@@ -132,7 +132,9 @@ async function main() {
     polygonAddresses,
     metisAddresses,
     gnosisAddresses,
-    bnbAddresses
+    bnbAddresses,
+    sepoliaAddresses,
+    mumbaiAddresses,
   ].map((addresses) => generateNetworkAddresses(addresses));
 
   const govImports = generateGovV2();
diff --git a/scripts/generator/assetsLibraryGenerator.ts b/scripts/generator/assetsLibraryGenerator.ts
index dc0692bb..1b5ad1ae 100644
--- a/scripts/generator/assetsLibraryGenerator.ts
+++ b/scripts/generator/assetsLibraryGenerator.ts
@@ -51,6 +51,7 @@ export function fixSymbol(symbol: string, _underlying: string) {
     case '0x59a19d8c652fa0284f44113d0ff9aba70bd46fb4':
       return 'BPT_BAL_WETH';
     case '0xaf88d065e77c8cc2239327c5edb3a432268e5831':
+    case '0x0b2c639c533813f4aa9d7837caf62653d097ff85':
       return 'USDCn';
   }
   return symbol.replace('-', '_').replace('.', '').replace(' ', '_').replace('1', 'ONE_');
@@ -63,7 +64,7 @@ export function generateAssetsLibrary(
 ) {
   const formattedReservesData = reservesData.map(({symbol: _symbol, ...rest}) => {
     const symbol = fixSymbol(_symbol, rest.UNDERLYING);
-    return {
+    const addresses = {
       [`${symbol}_UNDERLYING`]: rest.UNDERLYING,
       [`${symbol}_DECIMALS`]: {value: rest.decimals, type: 'uint8'},
       [`${symbol}_A_TOKEN`]: rest.A_TOKEN,
@@ -72,6 +73,9 @@ export function generateAssetsLibrary(
       [`${symbol}_ORACLE`]: rest.ORACLE,
       [`${symbol}_INTEREST_RATE_STRATEGY`]: rest.INTEREST_RATE_STRATEGY,
     };
+    if (rest.STATA_TOKEN && rest.STATA_TOKEN != zeroAddress)
+      addresses[`${symbol}_STATA_TOKEN`] = rest.STATA_TOKEN;
+    return addresses;
   });
 
   const innerObject = reservesData.reduce(
diff --git a/scripts/generator/clients.ts b/scripts/generator/clients.ts
index 291c5332..f65d4f2c 100644
--- a/scripts/generator/clients.ts
+++ b/scripts/generator/clients.ts
@@ -168,7 +168,7 @@ export const RPC_PROVIDERS = {
   }),
   [ChainId.gnosis]: createPublicClient({
     chain: gnosis,
-    transport: http(),
+    transport: http(process.env.RPC_GNOSIS),
     batch: {
       multicall: true,
     },
diff --git a/src/AaveAddressBook.sol b/src/AaveAddressBook.sol
index f8e6296e..738e8c1b 100644
--- a/src/AaveAddressBook.sol
+++ b/src/AaveAddressBook.sol
@@ -52,6 +52,8 @@ import {MiscPolygon} from './MiscPolygon.sol';
 import {MiscMetis} from './MiscMetis.sol';
 import {MiscGnosis} from './MiscGnosis.sol';
 import {MiscBNB} from './MiscBNB.sol';
+import {MiscSepolia} from './MiscSepolia.sol';
+import {MiscMumbai} from './MiscMumbai.sol';
 import {AaveGovernanceV2, IGovernanceStrategy} from './AaveGovernanceV2.sol';
 import {AaveGovernanceV2} from './AaveGovernanceV2.sol';
 import {AaveGovernanceV2, IGovernanceStrategy} from './AaveGovernanceV2.sol';
diff --git a/src/AaveV3Arbitrum.sol b/src/AaveV3Arbitrum.sol
index f10c1d3e..f308ed0c 100644
--- a/src/AaveV3Arbitrum.sol
+++ b/src/AaveV3Arbitrum.sol
@@ -81,8 +81,8 @@ library AaveV3Arbitrum {
   address internal constant REPAY_WITH_COLLATERAL_ADAPTER =
     0x28201C152DC5B69A86FA54FCfd21bcA4C0eff3BA;
 
-  // https://arbiscan.io/address/0xD9419920a9768d6EdaBbe5b93cB4B5B9F3019823
-  address internal constant STATIC_A_TOKEN_FACTORY = 0xD9419920a9768d6EdaBbe5b93cB4B5B9F3019823;
+  // https://arbiscan.io/address/0x411D79b8cC43384FDE66CaBf9b6a17180c842511
+  address internal constant STATIC_A_TOKEN_FACTORY = 0x411D79b8cC43384FDE66CaBf9b6a17180c842511;
 
   // https://arbiscan.io/address/0xF3C3F14dd7BDb7E03e6EBc3bc5Ffc6D66De12251
   address internal constant SWAP_COLLATERAL_ADAPTER = 0xF3C3F14dd7BDb7E03e6EBc3bc5Ffc6D66De12251;
@@ -124,6 +124,9 @@ library AaveV3ArbitrumAssets {
   // https://arbiscan.io/address/0xA901Bf68Bebde17ba382e499C3e9EbAe649DF276
   address internal constant DAI_INTEREST_RATE_STRATEGY = 0xA901Bf68Bebde17ba382e499C3e9EbAe649DF276;
 
+  // https://arbiscan.io/address/0xc91c5297d7E161aCC74b482aAfCc75B85cc0bfeD
+  address internal constant DAI_STATA_TOKEN = 0xc91c5297d7E161aCC74b482aAfCc75B85cc0bfeD;
+
   // https://arbiscan.io/address/0xf97f4df75117a78c1A5a0DBb814Af92458539FB4
   address internal constant LINK_UNDERLYING = 0xf97f4df75117a78c1A5a0DBb814Af92458539FB4;
 
@@ -145,6 +148,9 @@ library AaveV3ArbitrumAssets {
   address internal constant LINK_INTEREST_RATE_STRATEGY =
     0x9b34E3e183c9b0d1a08fF57a8fb59c821616295f;
 
+  // https://arbiscan.io/address/0x27dE098EF2772386cBCf1a4c8BEb886368b7F9a9
+  address internal constant LINK_STATA_TOKEN = 0x27dE098EF2772386cBCf1a4c8BEb886368b7F9a9;
+
   // https://arbiscan.io/address/0xFF970A61A04b1cA14834A43f5dE4533eBDDB5CC8
   address internal constant USDC_UNDERLYING = 0xFF970A61A04b1cA14834A43f5dE4533eBDDB5CC8;
 
@@ -166,6 +172,9 @@ library AaveV3ArbitrumAssets {
   address internal constant USDC_INTEREST_RATE_STRATEGY =
     0x53b13a6D43F647D788411Abfd28D229C274AfBF9;
 
+  // https://arbiscan.io/address/0x0Bc9E52051f553E75550CA22C196bf132c52Cf0B
+  address internal constant USDC_STATA_TOKEN = 0x0Bc9E52051f553E75550CA22C196bf132c52Cf0B;
+
   // https://arbiscan.io/address/0x2f2a2543B76A4166549F7aaB2e75Bef0aefC5B0f
   address internal constant WBTC_UNDERLYING = 0x2f2a2543B76A4166549F7aaB2e75Bef0aefC5B0f;
 
@@ -187,6 +196,9 @@ library AaveV3ArbitrumAssets {
   address internal constant WBTC_INTEREST_RATE_STRATEGY =
     0x8F183Ee74C790CB558232a141099b316D6C8Ba6E;
 
+  // https://arbiscan.io/address/0x32B95Fbe04e5a51cF99FeeF4e57Cf7e3FC9c5A93
+  address internal constant WBTC_STATA_TOKEN = 0x32B95Fbe04e5a51cF99FeeF4e57Cf7e3FC9c5A93;
+
   // https://arbiscan.io/address/0x82aF49447D8a07e3bd95BD0d56f35241523fBab1
   address internal constant WETH_UNDERLYING = 0x82aF49447D8a07e3bd95BD0d56f35241523fBab1;
 
@@ -208,6 +220,9 @@ library AaveV3ArbitrumAssets {
   address internal constant WETH_INTEREST_RATE_STRATEGY =
     0x9a158802cD924747EF336cA3F9DE3bdb60Cf43D3;
 
+  // https://arbiscan.io/address/0x352F3475716261dCC991Bd5F2aF973eB3D0F5878
+  address internal constant WETH_STATA_TOKEN = 0x352F3475716261dCC991Bd5F2aF973eB3D0F5878;
+
   // https://arbiscan.io/address/0xFd086bC7CD5C481DCC9C85ebE478A1C0b69FCbb9
   address internal constant USDT_UNDERLYING = 0xFd086bC7CD5C481DCC9C85ebE478A1C0b69FCbb9;
 
@@ -229,6 +244,9 @@ library AaveV3ArbitrumAssets {
   address internal constant USDT_INTEREST_RATE_STRATEGY =
     0xA901Bf68Bebde17ba382e499C3e9EbAe649DF276;
 
+  // https://arbiscan.io/address/0xb165a74407fE1e519d6bCbDeC1Ed3202B35a4140
+  address internal constant USDT_STATA_TOKEN = 0xb165a74407fE1e519d6bCbDeC1Ed3202B35a4140;
+
   // https://arbiscan.io/address/0xba5DdD1f9d7F570dc94a51479a000E3BCE967196
   address internal constant AAVE_UNDERLYING = 0xba5DdD1f9d7F570dc94a51479a000E3BCE967196;
 
@@ -250,6 +268,9 @@ library AaveV3ArbitrumAssets {
   address internal constant AAVE_INTEREST_RATE_STRATEGY =
     0x9b34E3e183c9b0d1a08fF57a8fb59c821616295f;
 
+  // https://arbiscan.io/address/0x1C0c8EcED17aE093b3C1a1a8fFeBE2E9513a9346
+  address internal constant AAVE_STATA_TOKEN = 0x1C0c8EcED17aE093b3C1a1a8fFeBE2E9513a9346;
+
   // https://arbiscan.io/address/0xD22a58f79e9481D1a88e00c343885A588b34b68B
   address internal constant EURS_UNDERLYING = 0xD22a58f79e9481D1a88e00c343885A588b34b68B;
 
@@ -271,6 +292,9 @@ library AaveV3ArbitrumAssets {
   address internal constant EURS_INTEREST_RATE_STRATEGY =
     0xCbDC7D7984D7AD59434f0B1999D2006898C40f9A;
 
+  // https://arbiscan.io/address/0x9a40747BE51185A416B181789B671E78a8d045dD
+  address internal constant EURS_STATA_TOKEN = 0x9a40747BE51185A416B181789B671E78a8d045dD;
+
   // https://arbiscan.io/address/0x5979D7b546E38E414F7E9822514be443A4800529
   address internal constant wstETH_UNDERLYING = 0x5979D7b546E38E414F7E9822514be443A4800529;
 
@@ -292,6 +316,9 @@ library AaveV3ArbitrumAssets {
   address internal constant wstETH_INTEREST_RATE_STRATEGY =
     0x4b8D3277d49E114C8F2D6E0B2eD310e29226fe16;
 
+  // https://arbiscan.io/address/0x7775d4Ae4Dbb79a624fB96AAcDB8Ca74F671c0DF
+  address internal constant wstETH_STATA_TOKEN = 0x7775d4Ae4Dbb79a624fB96AAcDB8Ca74F671c0DF;
+
   // https://arbiscan.io/address/0x3F56e0c36d275367b8C502090EDF38289b3dEa0d
   address internal constant MAI_UNDERLYING = 0x3F56e0c36d275367b8C502090EDF38289b3dEa0d;
 
@@ -312,6 +339,9 @@ library AaveV3ArbitrumAssets {
   // https://arbiscan.io/address/0x588b62C84533232E3A881e096E5D639Fa754F093
   address internal constant MAI_INTEREST_RATE_STRATEGY = 0x588b62C84533232E3A881e096E5D639Fa754F093;
 
+  // https://arbiscan.io/address/0xB4a0a2692D82301703B27082Cda45B083F68CAcE
+  address internal constant MAI_STATA_TOKEN = 0xB4a0a2692D82301703B27082Cda45B083F68CAcE;
+
   // https://arbiscan.io/address/0xEC70Dcb4A1EFa46b8F2D97C310C9c4790ba5ffA8
   address internal constant rETH_UNDERLYING = 0xEC70Dcb4A1EFa46b8F2D97C310C9c4790ba5ffA8;
 
@@ -333,6 +363,9 @@ library AaveV3ArbitrumAssets {
   address internal constant rETH_INTEREST_RATE_STRATEGY =
     0xC82dF96432346cFb632473eB619Db3B8AC280234;
 
+  // https://arbiscan.io/address/0x68235105d6d33A19369D24b746cb7481FB2b34fd
+  address internal constant rETH_STATA_TOKEN = 0x68235105d6d33A19369D24b746cb7481FB2b34fd;
+
   // https://arbiscan.io/address/0x93b346b6BC2548dA6A1E7d98E9a421B42541425b
   address internal constant LUSD_UNDERLYING = 0x93b346b6BC2548dA6A1E7d98E9a421B42541425b;
 
@@ -354,6 +387,9 @@ library AaveV3ArbitrumAssets {
   address internal constant LUSD_INTEREST_RATE_STRATEGY =
     0xaDbdb3d6B51151e4CDF32e4050B6F03D2bfB6477;
 
+  // https://arbiscan.io/address/0xDbB6314b5b07E63B7101844c0346309B79f8C20A
+  address internal constant LUSD_STATA_TOKEN = 0xDbB6314b5b07E63B7101844c0346309B79f8C20A;
+
   // https://arbiscan.io/address/0xaf88d065e77c8cC2239327C5EDb3A432268e5831
   address internal constant USDCn_UNDERLYING = 0xaf88d065e77c8cC2239327C5EDb3A432268e5831;
 
@@ -375,6 +411,9 @@ library AaveV3ArbitrumAssets {
   address internal constant USDCn_INTEREST_RATE_STRATEGY =
     0x44CaDF6E49895640D9De85ac01d97D44429Ad0A4;
 
+  // https://arbiscan.io/address/0x7CFaDFD5645B50bE87d546f42699d863648251ad
+  address internal constant USDCn_STATA_TOKEN = 0x7CFaDFD5645B50bE87d546f42699d863648251ad;
+
   // https://arbiscan.io/address/0x17FC002b466eEc40DaE837Fc4bE5c67993ddBd6F
   address internal constant FRAX_UNDERLYING = 0x17FC002b466eEc40DaE837Fc4bE5c67993ddBd6F;
 
@@ -396,6 +435,9 @@ library AaveV3ArbitrumAssets {
   address internal constant FRAX_INTEREST_RATE_STRATEGY =
     0xA901Bf68Bebde17ba382e499C3e9EbAe649DF276;
 
+  // https://arbiscan.io/address/0x89AEc2023f89E26Dbb7eaa7a98fe3996f9d112A8
+  address internal constant FRAX_STATA_TOKEN = 0x89AEc2023f89E26Dbb7eaa7a98fe3996f9d112A8;
+
   // https://arbiscan.io/address/0x912CE59144191C1204E64559FE8253a0e49E6548
   address internal constant ARB_UNDERLYING = 0x912CE59144191C1204E64559FE8253a0e49E6548;
 
@@ -415,6 +457,9 @@ library AaveV3ArbitrumAssets {
 
   // https://arbiscan.io/address/0xD87974E8ED49AB16d5053ba793F4e17078Be0426
   address internal constant ARB_INTEREST_RATE_STRATEGY = 0xD87974E8ED49AB16d5053ba793F4e17078Be0426;
+
+  // https://arbiscan.io/address/0x9b5637d7952BC9fa2D693aAE51f3103760Bf2693
+  address internal constant ARB_STATA_TOKEN = 0x9b5637d7952BC9fa2D693aAE51f3103760Bf2693;
 }
 
 library AaveV3ArbitrumEModes {
diff --git a/src/AaveV3Avalanche.sol b/src/AaveV3Avalanche.sol
index 362537ca..41aa5102 100644
--- a/src/AaveV3Avalanche.sol
+++ b/src/AaveV3Avalanche.sol
@@ -85,8 +85,8 @@ library AaveV3Avalanche {
   address internal constant REPAY_WITH_COLLATERAL_ADAPTER =
     0x49F5B996814fEd1dd39285B92A59CFb2dfd8D4f9;
 
-  // https://snowtrace.io/address/0xbD37610BBB1ddc2a22797F7e3f531B59902b7bA7
-  address internal constant STATIC_A_TOKEN_FACTORY = 0xbD37610BBB1ddc2a22797F7e3f531B59902b7bA7;
+  // https://snowtrace.io/address/0x691C316b2Eec7e64d17e7E3E01f3dB44c9CcEf19
+  address internal constant STATIC_A_TOKEN_FACTORY = 0x691C316b2Eec7e64d17e7E3E01f3dB44c9CcEf19;
 
   // https://snowtrace.io/address/0x2Cf641F7C0eac2788A7924B82d6Ca8EB7bAa4E3A
   address internal constant SWAP_COLLATERAL_ADAPTER = 0x2Cf641F7C0eac2788A7924B82d6Ca8EB7bAa4E3A;
@@ -129,6 +129,9 @@ library AaveV3AvalancheAssets {
   address internal constant DAIe_INTEREST_RATE_STRATEGY =
     0x04daBC3C1c052AB94AA2ca80140f2b978d2F6E17;
 
+  // https://snowtrace.io/address/0x02F3f6c8A432C1e49f3359d7d36887C25d8A5888
+  address internal constant DAIe_STATA_TOKEN = 0x02F3f6c8A432C1e49f3359d7d36887C25d8A5888;
+
   // https://snowtrace.io/address/0x5947BB275c521040051D82396192181b413227A3
   address internal constant LINKe_UNDERLYING = 0x5947BB275c521040051D82396192181b413227A3;
 
@@ -150,6 +153,9 @@ library AaveV3AvalancheAssets {
   address internal constant LINKe_INTEREST_RATE_STRATEGY =
     0x79a906e8c998d2fb5C5D66d23c4c5416Fe0168D6;
 
+  // https://snowtrace.io/address/0x8B773Ab77Dff01985D438961dBCE58382a70cA52
+  address internal constant LINKe_STATA_TOKEN = 0x8B773Ab77Dff01985D438961dBCE58382a70cA52;
+
   // https://snowtrace.io/address/0xB97EF9Ef8734C71904D8002F8b6Bc66Dd9c48a6E
   address internal constant USDC_UNDERLYING = 0xB97EF9Ef8734C71904D8002F8b6Bc66Dd9c48a6E;
 
@@ -171,6 +177,9 @@ library AaveV3AvalancheAssets {
   address internal constant USDC_INTEREST_RATE_STRATEGY =
     0x3B57B081dA6Af5e2759A57bD3211932Cb6176997;
 
+  // https://snowtrace.io/address/0xC509aB7bB4eDbF193b82264D499a7Fc526Cd01F4
+  address internal constant USDC_STATA_TOKEN = 0xC509aB7bB4eDbF193b82264D499a7Fc526Cd01F4;
+
   // https://snowtrace.io/address/0x50b7545627a5162F82A992c33b87aDc75187B218
   address internal constant WBTCe_UNDERLYING = 0x50b7545627a5162F82A992c33b87aDc75187B218;
 
@@ -192,6 +201,9 @@ library AaveV3AvalancheAssets {
   address internal constant WBTCe_INTEREST_RATE_STRATEGY =
     0x354E84ec43aCD91e1C0135c3e691960E881DB4b7;
 
+  // https://snowtrace.io/address/0xE3C0f42EAF1a4BFe37CbA105e5463564BA7730aE
+  address internal constant WBTCe_STATA_TOKEN = 0xE3C0f42EAF1a4BFe37CbA105e5463564BA7730aE;
+
   // https://snowtrace.io/address/0x49D5c2BdFfac6CE2BFdB6640F4F80f226bc10bAB
   address internal constant WETHe_UNDERLYING = 0x49D5c2BdFfac6CE2BFdB6640F4F80f226bc10bAB;
 
@@ -213,6 +225,9 @@ library AaveV3AvalancheAssets {
   address internal constant WETHe_INTEREST_RATE_STRATEGY =
     0x271f5f8325051f22caDa18FfedD4a805584a232A;
 
+  // https://snowtrace.io/address/0xf8E24175D01653fd6AA203C2C17B1e4Dd1CA2731
+  address internal constant WETHe_STATA_TOKEN = 0xf8E24175D01653fd6AA203C2C17B1e4Dd1CA2731;
+
   // https://snowtrace.io/address/0x9702230A8Ea53601f5cD2dc00fDBc13d4dF4A8c7
   address internal constant USDt_UNDERLYING = 0x9702230A8Ea53601f5cD2dc00fDBc13d4dF4A8c7;
 
@@ -234,6 +249,9 @@ library AaveV3AvalancheAssets {
   address internal constant USDt_INTEREST_RATE_STRATEGY =
     0x04daBC3C1c052AB94AA2ca80140f2b978d2F6E17;
 
+  // https://snowtrace.io/address/0x5525Ee69BC1e354B356864187De486fab5AD67d7
+  address internal constant USDt_STATA_TOKEN = 0x5525Ee69BC1e354B356864187De486fab5AD67d7;
+
   // https://snowtrace.io/address/0x63a72806098Bd3D9520cC43356dD78afe5D386D9
   address internal constant AAVEe_UNDERLYING = 0x63a72806098Bd3D9520cC43356dD78afe5D386D9;
 
@@ -255,6 +273,9 @@ library AaveV3AvalancheAssets {
   address internal constant AAVEe_INTEREST_RATE_STRATEGY =
     0x79a906e8c998d2fb5C5D66d23c4c5416Fe0168D6;
 
+  // https://snowtrace.io/address/0xac0746AfD13DEbe2a43a6c8745Fb83Fd2A2909cA
+  address internal constant AAVEe_STATA_TOKEN = 0xac0746AfD13DEbe2a43a6c8745Fb83Fd2A2909cA;
+
   // https://snowtrace.io/address/0xB31f66AA3C1e785363F0875A1B74E27b85FD66c7
   address internal constant WAVAX_UNDERLYING = 0xB31f66AA3C1e785363F0875A1B74E27b85FD66c7;
 
@@ -276,6 +297,9 @@ library AaveV3AvalancheAssets {
   address internal constant WAVAX_INTEREST_RATE_STRATEGY =
     0xc76EF342898f1AE7E6C4632627Df683FAD8563DD;
 
+  // https://snowtrace.io/address/0x6A02C7a974F1F13A67980C80F774eC1d2eD8f98d
+  address internal constant WAVAX_STATA_TOKEN = 0x6A02C7a974F1F13A67980C80F774eC1d2eD8f98d;
+
   // https://snowtrace.io/address/0x2b2C81e08f1Af8835a78Bb2A90AE924ACE0eA4bE
   address internal constant sAVAX_UNDERLYING = 0x2b2C81e08f1Af8835a78Bb2A90AE924ACE0eA4bE;
 
@@ -297,6 +321,9 @@ library AaveV3AvalancheAssets {
   address internal constant sAVAX_INTEREST_RATE_STRATEGY =
     0x79a906e8c998d2fb5C5D66d23c4c5416Fe0168D6;
 
+  // https://snowtrace.io/address/0x4F059cA8a2a5BF8895Ee731f2E901cCB769FB95f
+  address internal constant sAVAX_STATA_TOKEN = 0x4F059cA8a2a5BF8895Ee731f2E901cCB769FB95f;
+
   // https://snowtrace.io/address/0xD24C2Ad096400B6FBcd2ad8B24E7acBc21A1da64
   address internal constant FRAX_UNDERLYING = 0xD24C2Ad096400B6FBcd2ad8B24E7acBc21A1da64;
 
@@ -318,6 +345,9 @@ library AaveV3AvalancheAssets {
   address internal constant FRAX_INTEREST_RATE_STRATEGY =
     0x04daBC3C1c052AB94AA2ca80140f2b978d2F6E17;
 
+  // https://snowtrace.io/address/0xA3c2ffE702F4cD265B2249AB5f84Fab81FFf6c73
+  address internal constant FRAX_STATA_TOKEN = 0xA3c2ffE702F4cD265B2249AB5f84Fab81FFf6c73;
+
   // https://snowtrace.io/address/0x5c49b268c9841AFF1Cc3B0a418ff5c3442eE3F3b
   address internal constant MAI_UNDERLYING = 0x5c49b268c9841AFF1Cc3B0a418ff5c3442eE3F3b;
 
@@ -338,6 +368,9 @@ library AaveV3AvalancheAssets {
   // https://snowtrace.io/address/0x5f58C25D17C09c9e1892F45DE6dA45ed973A5326
   address internal constant MAI_INTEREST_RATE_STRATEGY = 0x5f58C25D17C09c9e1892F45DE6dA45ed973A5326;
 
+  // https://snowtrace.io/address/0x08cC59E51BB0Bc322B4D251f7262dB864d6150ce
+  address internal constant MAI_STATA_TOKEN = 0x08cC59E51BB0Bc322B4D251f7262dB864d6150ce;
+
   // https://snowtrace.io/address/0x152b9d0FdC40C096757F570A51E494bd4b943E50
   address internal constant BTCb_UNDERLYING = 0x152b9d0FdC40C096757F570A51E494bd4b943E50;
 
@@ -358,6 +391,9 @@ library AaveV3AvalancheAssets {
   // https://snowtrace.io/address/0x79a906e8c998d2fb5C5D66d23c4c5416Fe0168D6
   address internal constant BTCb_INTEREST_RATE_STRATEGY =
     0x79a906e8c998d2fb5C5D66d23c4c5416Fe0168D6;
+
+  // https://snowtrace.io/address/0x34d768cc830c32DcD743321c09A2A702651bF9a2
+  address internal constant BTCb_STATA_TOKEN = 0x34d768cc830c32DcD743321c09A2A702651bF9a2;
 }
 
 library AaveV3AvalancheEModes {
diff --git a/src/AaveV3Base.sol b/src/AaveV3Base.sol
index 8bc86aac..7983af95 100644
--- a/src/AaveV3Base.sol
+++ b/src/AaveV3Base.sol
@@ -74,6 +74,9 @@ library AaveV3Base {
   address internal constant REPAY_WITH_COLLATERAL_ADAPTER =
     0x78F8Bd884C3D738B74B420540659c82f392820e0;
 
+  // https://basescan.org/address/0x940F9a5d5F9ED264990D0eaee1F3DD60B4Cb9A22
+  address internal constant STATIC_A_TOKEN_FACTORY = 0x940F9a5d5F9ED264990D0eaee1F3DD60B4Cb9A22;
+
   // https://basescan.org/address/0xc7751400F809cdB0C167F87985083C558a0610F7
   address internal constant CONFIG_ENGINE = 0xc7751400F809cdB0C167F87985083C558a0610F7;
 
@@ -122,6 +125,9 @@ library AaveV3BaseAssets {
   address internal constant WETH_INTEREST_RATE_STRATEGY =
     0xC1F6588f4A1145D0B7F94c86a773bB47F0eC0759;
 
+  // https://basescan.org/address/0x468973e3264F2aEba0417A8f2cD0Ec397E738898
+  address internal constant WETH_STATA_TOKEN = 0x468973e3264F2aEba0417A8f2cD0Ec397E738898;
+
   // https://basescan.org/address/0x2Ae3F1Ec7F1F5012CFEab0185bfc7aa3cf0DEc22
   address internal constant cbETH_UNDERLYING = 0x2Ae3F1Ec7F1F5012CFEab0185bfc7aa3cf0DEc22;
 
@@ -143,6 +149,9 @@ library AaveV3BaseAssets {
   address internal constant cbETH_INTEREST_RATE_STRATEGY =
     0x05295489b6aE0d97ae7C49a42989497294F7F428;
 
+  // https://basescan.org/address/0x16A004065dfb11276DcB29Dc03fb8A85f9A43C6e
+  address internal constant cbETH_STATA_TOKEN = 0x16A004065dfb11276DcB29Dc03fb8A85f9A43C6e;
+
   // https://basescan.org/address/0xd9aAEc86B65D86f6A7B5B1b0c42FFA531710b6CA
   address internal constant USDbC_UNDERLYING = 0xd9aAEc86B65D86f6A7B5B1b0c42FFA531710b6CA;
 
@@ -163,6 +172,9 @@ library AaveV3BaseAssets {
   // https://basescan.org/address/0x8c63A1b0721D5776Ae5ed1Be8dc7f2A1e7312Ed3
   address internal constant USDbC_INTEREST_RATE_STRATEGY =
     0x8c63A1b0721D5776Ae5ed1Be8dc7f2A1e7312Ed3;
+
+  // https://basescan.org/address/0x6fCe2756794128B1771324caA860965801DCbCdB
+  address internal constant USDbC_STATA_TOKEN = 0x6fCe2756794128B1771324caA860965801DCbCdB;
 }
 
 library AaveV3BaseEModes {
diff --git a/src/AaveV3Ethereum.sol b/src/AaveV3Ethereum.sol
index 35f93f74..2221f6e7 100644
--- a/src/AaveV3Ethereum.sol
+++ b/src/AaveV3Ethereum.sol
@@ -85,8 +85,8 @@ library AaveV3Ethereum {
   address internal constant REPAY_WITH_COLLATERAL_ADAPTER =
     0x02e7B8511831B1b02d9018215a0f8f500Ea5c6B3;
 
-  // https://etherscan.io/address/0x17D0D723a6741C8E154594a8850D29D58Bcc9218
-  address internal constant STATIC_A_TOKEN_FACTORY = 0x17D0D723a6741C8E154594a8850D29D58Bcc9218;
+  // https://etherscan.io/address/0x411D79b8cC43384FDE66CaBf9b6a17180c842511
+  address internal constant STATIC_A_TOKEN_FACTORY = 0x411D79b8cC43384FDE66CaBf9b6a17180c842511;
 
   // https://etherscan.io/address/0xADC0A53095A0af87F3aa29FE0715B5c28016364e
   address internal constant SWAP_COLLATERAL_ADAPTER = 0xADC0A53095A0af87F3aa29FE0715B5c28016364e;
@@ -540,8 +540,8 @@ library AaveV3EthereumAssets {
   // https://etherscan.io/address/0xD110cac5d8682A3b045D5524a9903E031d70FCCd
   address internal constant GHO_ORACLE = 0xD110cac5d8682A3b045D5524a9903E031d70FCCd;
 
-  // https://etherscan.io/address/0xE7C0AE65f7D52E121654eEa0A57b4af0894F6D27
-  address internal constant GHO_INTEREST_RATE_STRATEGY = 0xE7C0AE65f7D52E121654eEa0A57b4af0894F6D27;
+  // https://etherscan.io/address/0xE6e780D77b883E9a5eC84f7baA6BF4DB43177Fa7
+  address internal constant GHO_INTEREST_RATE_STRATEGY = 0xE6e780D77b883E9a5eC84f7baA6BF4DB43177Fa7;
 
   // https://etherscan.io/address/0xD33526068D116cE69F19A9ee46F0bd304F21A51f
   address internal constant RPL_UNDERLYING = 0xD33526068D116cE69F19A9ee46F0bd304F21A51f;
diff --git a/src/AaveV3Gnosis.sol b/src/AaveV3Gnosis.sol
index 00a844be..73645d8b 100644
--- a/src/AaveV3Gnosis.sol
+++ b/src/AaveV3Gnosis.sol
@@ -85,6 +85,9 @@ library AaveV3Gnosis {
 
   // https://blockscout.com/xdai/mainnet/address/0x3Ceaf9b6CAb92dFe6302D0CC3F1BA880C28d35e5
   address internal constant FREEZING_STEWARD = 0x3Ceaf9b6CAb92dFe6302D0CC3F1BA880C28d35e5;
+
+  // https://blockscout.com/xdai/mainnet/address/0x02e9b27599C4Bf8f789d34b6E65C51092c3d9FA6
+  address internal constant STATIC_A_TOKEN_FACTORY = 0x02e9b27599C4Bf8f789d34b6E65C51092c3d9FA6;
 }
 
 library AaveV3GnosisAssets {
@@ -109,6 +112,9 @@ library AaveV3GnosisAssets {
   address internal constant WETH_INTEREST_RATE_STRATEGY =
     0xD84d86083010FB683f1e8fA3809ee8DC90A4C4DB;
 
+  // https://blockscout.com/xdai/mainnet/address/0xD843FB478c5aA9759FeA3f3c98D467e2F136190a
+  address internal constant WETH_STATA_TOKEN = 0xD843FB478c5aA9759FeA3f3c98D467e2F136190a;
+
   // https://blockscout.com/xdai/mainnet/address/0x6C76971f98945AE98dD7d4DFcA8711ebea946eA6
   address internal constant wstETH_UNDERLYING = 0x6C76971f98945AE98dD7d4DFcA8711ebea946eA6;
 
@@ -130,6 +136,9 @@ library AaveV3GnosisAssets {
   address internal constant wstETH_INTEREST_RATE_STRATEGY =
     0x9E57695Dab0DCdb42BC220ff1E9eb2e22a31209b;
 
+  // https://blockscout.com/xdai/mainnet/address/0xECfD0638175e291BA3F784A58FB9D38a25418904
+  address internal constant wstETH_STATA_TOKEN = 0xECfD0638175e291BA3F784A58FB9D38a25418904;
+
   // https://blockscout.com/xdai/mainnet/address/0x9C58BAcC331c9aa871AFD802DB6379a98e80CEdb
   address internal constant GNO_UNDERLYING = 0x9C58BAcC331c9aa871AFD802DB6379a98e80CEdb;
 
@@ -150,6 +159,9 @@ library AaveV3GnosisAssets {
   // https://blockscout.com/xdai/mainnet/address/0x9E57695Dab0DCdb42BC220ff1E9eb2e22a31209b
   address internal constant GNO_INTEREST_RATE_STRATEGY = 0x9E57695Dab0DCdb42BC220ff1E9eb2e22a31209b;
 
+  // https://blockscout.com/xdai/mainnet/address/0x2D737e2B0e175f05D0904C208d6C4e40da570f65
+  address internal constant GNO_STATA_TOKEN = 0x2D737e2B0e175f05D0904C208d6C4e40da570f65;
+
   // https://blockscout.com/xdai/mainnet/address/0xDDAfbb505ad214D7b80b1f830fcCc89B60fb7A83
   address internal constant USDC_UNDERLYING = 0xDDAfbb505ad214D7b80b1f830fcCc89B60fb7A83;
 
@@ -171,6 +183,9 @@ library AaveV3GnosisAssets {
   address internal constant USDC_INTEREST_RATE_STRATEGY =
     0x345f7fcd88207fe060AD03c2656A23A3Ab596479;
 
+  // https://blockscout.com/xdai/mainnet/address/0x270bA1f35D8b87510D24F693fcCc0da02e6E4EeB
+  address internal constant USDC_STATA_TOKEN = 0x270bA1f35D8b87510D24F693fcCc0da02e6E4EeB;
+
   // https://blockscout.com/xdai/mainnet/address/0xe91D153E0b41518A2Ce8Dd3D7944Fa863463a97d
   address internal constant WXDAI_UNDERLYING = 0xe91D153E0b41518A2Ce8Dd3D7944Fa863463a97d;
 
@@ -192,6 +207,9 @@ library AaveV3GnosisAssets {
   address internal constant WXDAI_INTEREST_RATE_STRATEGY =
     0x345f7fcd88207fe060AD03c2656A23A3Ab596479;
 
+  // https://blockscout.com/xdai/mainnet/address/0x7f0EAE87Df30C468E0680c83549D0b3DE7664D4B
+  address internal constant WXDAI_STATA_TOKEN = 0x7f0EAE87Df30C468E0680c83549D0b3DE7664D4B;
+
   // https://blockscout.com/xdai/mainnet/address/0xcB444e90D8198415266c6a2724b7900fb12FC56E
   address internal constant EURe_UNDERLYING = 0xcB444e90D8198415266c6a2724b7900fb12FC56E;
 
@@ -213,6 +231,9 @@ library AaveV3GnosisAssets {
   address internal constant EURe_INTEREST_RATE_STRATEGY =
     0x6c3b7e7B8b9609D57C70C3F630228F979EAbb450;
 
+  // https://blockscout.com/xdai/mainnet/address/0x8418D17640a74F1614AC3E1826F29e78714488a1
+  address internal constant EURe_STATA_TOKEN = 0x8418D17640a74F1614AC3E1826F29e78714488a1;
+
   // https://blockscout.com/xdai/mainnet/address/0xaf204776c7245bF4147c2612BF6e5972Ee483701
   address internal constant sDAI_UNDERLYING = 0xaf204776c7245bF4147c2612BF6e5972Ee483701;
 
@@ -233,6 +254,9 @@ library AaveV3GnosisAssets {
   // https://blockscout.com/xdai/mainnet/address/0x6c3b7e7B8b9609D57C70C3F630228F979EAbb450
   address internal constant sDAI_INTEREST_RATE_STRATEGY =
     0x6c3b7e7B8b9609D57C70C3F630228F979EAbb450;
+
+  // https://blockscout.com/xdai/mainnet/address/0xf3f45960f8dE00D8ED614D445a5a268c6F6Dec4f
+  address internal constant sDAI_STATA_TOKEN = 0xf3f45960f8dE00D8ED614D445a5a268c6F6Dec4f;
 }
 
 library AaveV3GnosisEModes {
diff --git a/src/AaveV3Metis.sol b/src/AaveV3Metis.sol
index 4bdd538a..11508923 100644
--- a/src/AaveV3Metis.sol
+++ b/src/AaveV3Metis.sol
@@ -82,6 +82,9 @@ library AaveV3Metis {
 
   // https://andromeda-explorer.metis.io/address/0x1df710eb1E2FD9C21494aF2BFb1F210a4185885b
   address internal constant WALLET_BALANCE_PROVIDER = 0x1df710eb1E2FD9C21494aF2BFb1F210a4185885b;
+
+  // https://andromeda-explorer.metis.io/address/0x9C62AdC332888F56998542415c38D7CDf3Ff7619
+  address internal constant STATIC_A_TOKEN_FACTORY = 0x9C62AdC332888F56998542415c38D7CDf3Ff7619;
 }
 
 library AaveV3MetisAssets {
@@ -106,6 +109,9 @@ library AaveV3MetisAssets {
   address internal constant mDAI_INTEREST_RATE_STRATEGY =
     0x4a8de3E62B4a63905f62e56292ECdCfD3593d1c9;
 
+  // https://andromeda-explorer.metis.io/address/0x66a2E4cff95BDE6403Ed5541B396aA0B171e5509
+  address internal constant mDAI_STATA_TOKEN = 0x66a2E4cff95BDE6403Ed5541B396aA0B171e5509;
+
   // https://andromeda-explorer.metis.io/address/0xDeadDeAddeAddEAddeadDEaDDEAdDeaDDeAD0000
   address internal constant Metis_UNDERLYING = 0xDeadDeAddeAddEAddeadDEaDDEAdDeaDDeAD0000;
 
@@ -127,6 +133,9 @@ library AaveV3MetisAssets {
   address internal constant Metis_INTEREST_RATE_STRATEGY =
     0xfe8FF9a19E251fe6cf2e8cBf0959ACa9624A97d1;
 
+  // https://andromeda-explorer.metis.io/address/0x5DE732A094A0ceF0eBFEcF0A916bDAB29650a784
+  address internal constant Metis_STATA_TOKEN = 0x5DE732A094A0ceF0eBFEcF0A916bDAB29650a784;
+
   // https://andromeda-explorer.metis.io/address/0xEA32A96608495e54156Ae48931A7c20f0dcc1a21
   address internal constant mUSDC_UNDERLYING = 0xEA32A96608495e54156Ae48931A7c20f0dcc1a21;
 
@@ -148,6 +157,9 @@ library AaveV3MetisAssets {
   address internal constant mUSDC_INTEREST_RATE_STRATEGY =
     0x3B88f83B2b0444F14B6fc904040F648206F551fc;
 
+  // https://andromeda-explorer.metis.io/address/0xb24451C231C6e6A60aC46f45E98a267caae898f4
+  address internal constant mUSDC_STATA_TOKEN = 0xb24451C231C6e6A60aC46f45E98a267caae898f4;
+
   // https://andromeda-explorer.metis.io/address/0xbB06DCA3AE6887fAbF931640f67cab3e3a16F4dC
   address internal constant mUSDT_UNDERLYING = 0xbB06DCA3AE6887fAbF931640f67cab3e3a16F4dC;
 
@@ -169,6 +181,9 @@ library AaveV3MetisAssets {
   address internal constant mUSDT_INTEREST_RATE_STRATEGY =
     0x5A1bdAc4eBa2A70D465ef4aDd2f68dBBae183454;
 
+  // https://andromeda-explorer.metis.io/address/0xAAea6F041425B813760dA201d08d46487034A266
+  address internal constant mUSDT_STATA_TOKEN = 0xAAea6F041425B813760dA201d08d46487034A266;
+
   // https://andromeda-explorer.metis.io/address/0x420000000000000000000000000000000000000A
   address internal constant WETH_UNDERLYING = 0x420000000000000000000000000000000000000A;
 
@@ -189,6 +204,9 @@ library AaveV3MetisAssets {
   // https://andromeda-explorer.metis.io/address/0x83e654d42f437915bf849dE04c19AAd8C5e8c01E
   address internal constant WETH_INTEREST_RATE_STRATEGY =
     0x83e654d42f437915bf849dE04c19AAd8C5e8c01E;
+
+  // https://andromeda-explorer.metis.io/address/0x2f1606864d6322c54b50a1762D4a1ca67f42d23d
+  address internal constant WETH_STATA_TOKEN = 0x2f1606864d6322c54b50a1762D4a1ca67f42d23d;
 }
 
 library AaveV3MetisEModes {
diff --git a/src/AaveV3Mumbai.sol b/src/AaveV3Mumbai.sol
index 2609c2bc..24bb4f3f 100644
--- a/src/AaveV3Mumbai.sol
+++ b/src/AaveV3Mumbai.sol
@@ -69,6 +69,9 @@ library AaveV3Mumbai {
 
   // https://mumbai.polygonscan.com/address/0x8dA9412AbB78db20d0B496573D9066C474eA21B8
   address internal constant WETH_GATEWAY = 0x8dA9412AbB78db20d0B496573D9066C474eA21B8;
+
+  // https://mumbai.polygonscan.com/address/0x4df6bfA5522aAd4C80e6C95b613B92AC019f2d3e
+  address internal constant STATIC_A_TOKEN_FACTORY = 0x4df6bfA5522aAd4C80e6C95b613B92AC019f2d3e;
 }
 
 library AaveV3MumbaiAssets {
@@ -92,6 +95,9 @@ library AaveV3MumbaiAssets {
   // https://mumbai.polygonscan.com/address/0xbE46486f69fc2882e5E4769CFBCe704E3EfecD25
   address internal constant DAI_INTEREST_RATE_STRATEGY = 0xbE46486f69fc2882e5E4769CFBCe704E3EfecD25;
 
+  // https://mumbai.polygonscan.com/address/0xe012Fa4A7CAa676b2587A20650b8358d72984250
+  address internal constant DAI_STATA_TOKEN = 0xe012Fa4A7CAa676b2587A20650b8358d72984250;
+
   // https://mumbai.polygonscan.com/address/0x9DFf9E93B1e513379cf820504D642c6891d8F7CC
   address internal constant LINK_UNDERLYING = 0x9DFf9E93B1e513379cf820504D642c6891d8F7CC;
 
@@ -113,6 +119,9 @@ library AaveV3MumbaiAssets {
   address internal constant LINK_INTEREST_RATE_STRATEGY =
     0x0313912C1C3D946F9253D9b6E9f6aB9137759b4B;
 
+  // https://mumbai.polygonscan.com/address/0xA609025Ee8885C4E557331cCF4e3A1099B182359
+  address internal constant LINK_STATA_TOKEN = 0xA609025Ee8885C4E557331cCF4e3A1099B182359;
+
   // https://mumbai.polygonscan.com/address/0x52D800ca262522580CeBAD275395ca6e7598C014
   address internal constant USDC_UNDERLYING = 0x52D800ca262522580CeBAD275395ca6e7598C014;
 
@@ -134,6 +143,9 @@ library AaveV3MumbaiAssets {
   address internal constant USDC_INTEREST_RATE_STRATEGY =
     0x8d284fE251BB7Fe6B529FC2f27BAb415FcF46B25;
 
+  // https://mumbai.polygonscan.com/address/0x5eF0fbC8cC652e1128ff50fA8473B7E949C9EaC3
+  address internal constant USDC_STATA_TOKEN = 0x5eF0fbC8cC652e1128ff50fA8473B7E949C9EaC3;
+
   // https://mumbai.polygonscan.com/address/0x2Fa2e7a6dEB7bb51B625336DBe1dA23511914a8A
   address internal constant WBTC_UNDERLYING = 0x2Fa2e7a6dEB7bb51B625336DBe1dA23511914a8A;
 
@@ -155,6 +167,9 @@ library AaveV3MumbaiAssets {
   address internal constant WBTC_INTEREST_RATE_STRATEGY =
     0x0313912C1C3D946F9253D9b6E9f6aB9137759b4B;
 
+  // https://mumbai.polygonscan.com/address/0x0693e498eF6D6fb27b57dc3D9e3E0a0f9f2fbeC4
+  address internal constant WBTC_STATA_TOKEN = 0x0693e498eF6D6fb27b57dc3D9e3E0a0f9f2fbeC4;
+
   // https://mumbai.polygonscan.com/address/0xc199807AF4fEDB02EE567Ed0FeB814A077de4802
   address internal constant WETH_UNDERLYING = 0xc199807AF4fEDB02EE567Ed0FeB814A077de4802;
 
@@ -176,6 +191,9 @@ library AaveV3MumbaiAssets {
   address internal constant WETH_INTEREST_RATE_STRATEGY =
     0x0313912C1C3D946F9253D9b6E9f6aB9137759b4B;
 
+  // https://mumbai.polygonscan.com/address/0x666ef6De71Eb3DAd05F996ECAa910360f4e8fD7c
+  address internal constant WETH_STATA_TOKEN = 0x666ef6De71Eb3DAd05F996ECAa910360f4e8fD7c;
+
   // https://mumbai.polygonscan.com/address/0x1fdE0eCc619726f4cD597887C9F3b4c8740e19e2
   address internal constant USDT_UNDERLYING = 0x1fdE0eCc619726f4cD597887C9F3b4c8740e19e2;
 
@@ -197,6 +215,9 @@ library AaveV3MumbaiAssets {
   address internal constant USDT_INTEREST_RATE_STRATEGY =
     0x8d284fE251BB7Fe6B529FC2f27BAb415FcF46B25;
 
+  // https://mumbai.polygonscan.com/address/0x48774b9D6Bd38d6d0CF17D9C6E023b67eDAEeA29
+  address internal constant USDT_STATA_TOKEN = 0x48774b9D6Bd38d6d0CF17D9C6E023b67eDAEeA29;
+
   // https://mumbai.polygonscan.com/address/0x1558c6FadDe1bEaf0f6628BDd1DFf3461185eA24
   address internal constant AAVE_UNDERLYING = 0x1558c6FadDe1bEaf0f6628BDd1DFf3461185eA24;
 
@@ -218,6 +239,9 @@ library AaveV3MumbaiAssets {
   address internal constant AAVE_INTEREST_RATE_STRATEGY =
     0x0313912C1C3D946F9253D9b6E9f6aB9137759b4B;
 
+  // https://mumbai.polygonscan.com/address/0xC19611D616f191dc7dFFAf192c071B8957379585
+  address internal constant AAVE_STATA_TOKEN = 0xC19611D616f191dc7dFFAf192c071B8957379585;
+
   // https://mumbai.polygonscan.com/address/0xaD3C5a67275dE4b5554CdD1d961e957f408eF75a
   address internal constant WMATIC_UNDERLYING = 0xaD3C5a67275dE4b5554CdD1d961e957f408eF75a;
 
@@ -239,6 +263,9 @@ library AaveV3MumbaiAssets {
   address internal constant WMATIC_INTEREST_RATE_STRATEGY =
     0x0313912C1C3D946F9253D9b6E9f6aB9137759b4B;
 
+  // https://mumbai.polygonscan.com/address/0x5C0478fd615e02ecC3BB3fbe2fe6153090031696
+  address internal constant WMATIC_STATA_TOKEN = 0x5C0478fd615e02ecC3BB3fbe2fe6153090031696;
+
   // https://mumbai.polygonscan.com/address/0x2bbF1f48a678d2f7c291dc5F8fD04805D34F485f
   address internal constant CRV_UNDERLYING = 0x2bbF1f48a678d2f7c291dc5F8fD04805D34F485f;
 
@@ -259,6 +286,9 @@ library AaveV3MumbaiAssets {
   // https://mumbai.polygonscan.com/address/0x0313912C1C3D946F9253D9b6E9f6aB9137759b4B
   address internal constant CRV_INTEREST_RATE_STRATEGY = 0x0313912C1C3D946F9253D9b6E9f6aB9137759b4B;
 
+  // https://mumbai.polygonscan.com/address/0x81E7EB2067FDc31308b2dC97A070EDe0634Aa7fd
+  address internal constant CRV_STATA_TOKEN = 0x81E7EB2067FDc31308b2dC97A070EDe0634Aa7fd;
+
   // https://mumbai.polygonscan.com/address/0x3c9F4EEa18B02ee331218646Fea59EE3661d2A61
   address internal constant SUSHI_UNDERLYING = 0x3c9F4EEa18B02ee331218646Fea59EE3661d2A61;
 
@@ -280,6 +310,9 @@ library AaveV3MumbaiAssets {
   address internal constant SUSHI_INTEREST_RATE_STRATEGY =
     0x0313912C1C3D946F9253D9b6E9f6aB9137759b4B;
 
+  // https://mumbai.polygonscan.com/address/0xDEF3d6FcFD68af03cCC4818FFd17F57A54Dd93f8
+  address internal constant SUSHI_STATA_TOKEN = 0xDEF3d6FcFD68af03cCC4818FFd17F57A54Dd93f8;
+
   // https://mumbai.polygonscan.com/address/0x9f86bA35a016acE27BD4C37E42a1940A5b2508EF
   address internal constant GHST_UNDERLYING = 0x9f86bA35a016acE27BD4C37E42a1940A5b2508EF;
 
@@ -301,6 +334,9 @@ library AaveV3MumbaiAssets {
   address internal constant GHST_INTEREST_RATE_STRATEGY =
     0x0313912C1C3D946F9253D9b6E9f6aB9137759b4B;
 
+  // https://mumbai.polygonscan.com/address/0x7f178E419181B8C9CF64fee7D58F24b32ec0F1cc
+  address internal constant GHST_STATA_TOKEN = 0x7f178E419181B8C9CF64fee7D58F24b32ec0F1cc;
+
   // https://mumbai.polygonscan.com/address/0x00DF377c2C82a65A8bAe2Ff04a9434a721Bc5aEB
   address internal constant BAL_UNDERLYING = 0x00DF377c2C82a65A8bAe2Ff04a9434a721Bc5aEB;
 
@@ -321,6 +357,9 @@ library AaveV3MumbaiAssets {
   // https://mumbai.polygonscan.com/address/0x0313912C1C3D946F9253D9b6E9f6aB9137759b4B
   address internal constant BAL_INTEREST_RATE_STRATEGY = 0x0313912C1C3D946F9253D9b6E9f6aB9137759b4B;
 
+  // https://mumbai.polygonscan.com/address/0xb95140824eC44ec97ab10f459aD0768275Eb3e94
+  address internal constant BAL_STATA_TOKEN = 0xb95140824eC44ec97ab10f459aD0768275Eb3e94;
+
   // https://mumbai.polygonscan.com/address/0x55c7852e10fcd07cF63Ad1bb9FC191b6F4d96ebD
   address internal constant DPI_UNDERLYING = 0x55c7852e10fcd07cF63Ad1bb9FC191b6F4d96ebD;
 
@@ -341,6 +380,9 @@ library AaveV3MumbaiAssets {
   // https://mumbai.polygonscan.com/address/0x0313912C1C3D946F9253D9b6E9f6aB9137759b4B
   address internal constant DPI_INTEREST_RATE_STRATEGY = 0x0313912C1C3D946F9253D9b6E9f6aB9137759b4B;
 
+  // https://mumbai.polygonscan.com/address/0x00718266Ae6AbaCe3C14AD0263968eB7F581BC91
+  address internal constant DPI_STATA_TOKEN = 0x00718266Ae6AbaCe3C14AD0263968eB7F581BC91;
+
   // https://mumbai.polygonscan.com/address/0xB516d30421d2A0524769A243BBE5e193E78ab35c
   address internal constant EURS_UNDERLYING = 0xB516d30421d2A0524769A243BBE5e193E78ab35c;
 
@@ -362,6 +404,9 @@ library AaveV3MumbaiAssets {
   address internal constant EURS_INTEREST_RATE_STRATEGY =
     0x8d284fE251BB7Fe6B529FC2f27BAb415FcF46B25;
 
+  // https://mumbai.polygonscan.com/address/0xB5B6c7a13602CF827Cc2F0383E27F8e2DB8dBE64
+  address internal constant EURS_STATA_TOKEN = 0xB5B6c7a13602CF827Cc2F0383E27F8e2DB8dBE64;
+
   // https://mumbai.polygonscan.com/address/0xd409F17095a370800A9C352124C6a1e82695203E
   address internal constant JEUR_UNDERLYING = 0xd409F17095a370800A9C352124C6a1e82695203E;
 
@@ -383,6 +428,9 @@ library AaveV3MumbaiAssets {
   address internal constant JEUR_INTEREST_RATE_STRATEGY =
     0x8d284fE251BB7Fe6B529FC2f27BAb415FcF46B25;
 
+  // https://mumbai.polygonscan.com/address/0xEf6F8a13a8B2098F13D08A95b32191ddE13693eE
+  address internal constant JEUR_STATA_TOKEN = 0xEf6F8a13a8B2098F13D08A95b32191ddE13693eE;
+
   // https://mumbai.polygonscan.com/address/0xcDA8dE50b65cB2Affc8B89f35C40A97Eed4B270F
   address internal constant AGEUR_UNDERLYING = 0xcDA8dE50b65cB2Affc8B89f35C40A97Eed4B270F;
 
@@ -403,6 +451,9 @@ library AaveV3MumbaiAssets {
   // https://mumbai.polygonscan.com/address/0x8d284fE251BB7Fe6B529FC2f27BAb415FcF46B25
   address internal constant AGEUR_INTEREST_RATE_STRATEGY =
     0x8d284fE251BB7Fe6B529FC2f27BAb415FcF46B25;
+
+  // https://mumbai.polygonscan.com/address/0xeF5074Dd60e25F8EFd763068C73d34E05815f41f
+  address internal constant AGEUR_STATA_TOKEN = 0xeF5074Dd60e25F8EFd763068C73d34E05815f41f;
 }
 
 library AaveV3MumbaiEModes {
diff --git a/src/AaveV3Optimism.sol b/src/AaveV3Optimism.sol
index f929a8f0..8ebede0e 100644
--- a/src/AaveV3Optimism.sol
+++ b/src/AaveV3Optimism.sol
@@ -81,8 +81,8 @@ library AaveV3Optimism {
   address internal constant REPAY_WITH_COLLATERAL_ADAPTER =
     0xa12734e64417f61f8442E7D5132EdBFdbDDeF0fa;
 
-  // https://explorer.optimism.io/address/0xD9419920a9768d6EdaBbe5b93cB4B5B9F3019823
-  address internal constant STATIC_A_TOKEN_FACTORY = 0xD9419920a9768d6EdaBbe5b93cB4B5B9F3019823;
+  // https://explorer.optimism.io/address/0x22D76094730fA377184100EFB8CEfC673B89B372
+  address internal constant STATIC_A_TOKEN_FACTORY = 0x22D76094730fA377184100EFB8CEfC673B89B372;
 
   // https://explorer.optimism.io/address/0x830C5A67a0C95D69dA5fb7801Ac1773c6fB53857
   address internal constant SWAP_COLLATERAL_ADAPTER = 0x830C5A67a0C95D69dA5fb7801Ac1773c6fB53857;
@@ -124,6 +124,9 @@ library AaveV3OptimismAssets {
   // https://explorer.optimism.io/address/0x6D6D3b7FC50999bf20dE5CC8e0F63AFD18B95f0e
   address internal constant DAI_INTEREST_RATE_STRATEGY = 0x6D6D3b7FC50999bf20dE5CC8e0F63AFD18B95f0e;
 
+  // https://explorer.optimism.io/address/0x6dDc64289bE8a71A707fB057d5d07Cc756055d6e
+  address internal constant DAI_STATA_TOKEN = 0x6dDc64289bE8a71A707fB057d5d07Cc756055d6e;
+
   // https://explorer.optimism.io/address/0x350a791Bfc2C21F9Ed5d10980Dad2e2638ffa7f6
   address internal constant LINK_UNDERLYING = 0x350a791Bfc2C21F9Ed5d10980Dad2e2638ffa7f6;
 
@@ -145,6 +148,9 @@ library AaveV3OptimismAssets {
   address internal constant LINK_INTEREST_RATE_STRATEGY =
     0xeE1BAc9355EaAfCD1B68d272d640d870bC9b4b5C;
 
+  // https://explorer.optimism.io/address/0x39BCf217ACc4Bf2fCaF7BC8800E69D986912c75e
+  address internal constant LINK_STATA_TOKEN = 0x39BCf217ACc4Bf2fCaF7BC8800E69D986912c75e;
+
   // https://explorer.optimism.io/address/0x7F5c764cBc14f9669B88837ca1490cCa17c31607
   address internal constant USDC_UNDERLYING = 0x7F5c764cBc14f9669B88837ca1490cCa17c31607;
 
@@ -166,6 +172,9 @@ library AaveV3OptimismAssets {
   address internal constant USDC_INTEREST_RATE_STRATEGY =
     0x3832311560d3B457E9cC35e5b8e06EB167D8c17D;
 
+  // https://explorer.optimism.io/address/0x9F281eb58fd98ad98EDe0fc4C553AD4D73e7Ca2C
+  address internal constant USDC_STATA_TOKEN = 0x9F281eb58fd98ad98EDe0fc4C553AD4D73e7Ca2C;
+
   // https://explorer.optimism.io/address/0x68f180fcCe6836688e9084f035309E29Bf0A2095
   address internal constant WBTC_UNDERLYING = 0x68f180fcCe6836688e9084f035309E29Bf0A2095;
 
@@ -187,6 +196,9 @@ library AaveV3OptimismAssets {
   address internal constant WBTC_INTEREST_RATE_STRATEGY =
     0x04daBC3C1c052AB94AA2ca80140f2b978d2F6E17;
 
+  // https://explorer.optimism.io/address/0x6d998FeEFC7B3664eaD09CAf02b5a0fc2E365F18
+  address internal constant WBTC_STATA_TOKEN = 0x6d998FeEFC7B3664eaD09CAf02b5a0fc2E365F18;
+
   // https://explorer.optimism.io/address/0x4200000000000000000000000000000000000006
   address internal constant WETH_UNDERLYING = 0x4200000000000000000000000000000000000006;
 
@@ -208,6 +220,9 @@ library AaveV3OptimismAssets {
   address internal constant WETH_INTEREST_RATE_STRATEGY =
     0x5f58C25D17C09c9e1892F45DE6dA45ed973A5326;
 
+  // https://explorer.optimism.io/address/0x98d69620C31869fD4822ceb6ADAB31180475FD37
+  address internal constant WETH_STATA_TOKEN = 0x98d69620C31869fD4822ceb6ADAB31180475FD37;
+
   // https://explorer.optimism.io/address/0x94b008aA00579c1307B0EF2c499aD98a8ce58e58
   address internal constant USDT_UNDERLYING = 0x94b008aA00579c1307B0EF2c499aD98a8ce58e58;
 
@@ -229,6 +244,9 @@ library AaveV3OptimismAssets {
   address internal constant USDT_INTEREST_RATE_STRATEGY =
     0x6D6D3b7FC50999bf20dE5CC8e0F63AFD18B95f0e;
 
+  // https://explorer.optimism.io/address/0x035c93db04E5aAea54E6cd0261C492a3e0638b37
+  address internal constant USDT_STATA_TOKEN = 0x035c93db04E5aAea54E6cd0261C492a3e0638b37;
+
   // https://explorer.optimism.io/address/0x76FB31fb4af56892A25e32cFC43De717950c9278
   address internal constant AAVE_UNDERLYING = 0x76FB31fb4af56892A25e32cFC43De717950c9278;
 
@@ -250,6 +268,9 @@ library AaveV3OptimismAssets {
   address internal constant AAVE_INTEREST_RATE_STRATEGY =
     0xeE1BAc9355EaAfCD1B68d272d640d870bC9b4b5C;
 
+  // https://explorer.optimism.io/address/0xae0Ca1B1Bc6cac26981B5e2b9c40f8Ce8A9082eE
+  address internal constant AAVE_STATA_TOKEN = 0xae0Ca1B1Bc6cac26981B5e2b9c40f8Ce8A9082eE;
+
   // https://explorer.optimism.io/address/0x8c6f28f2F1A3C87F0f938b96d27520d9751ec8d9
   address internal constant sUSD_UNDERLYING = 0x8c6f28f2F1A3C87F0f938b96d27520d9751ec8d9;
 
@@ -271,6 +292,9 @@ library AaveV3OptimismAssets {
   address internal constant sUSD_INTEREST_RATE_STRATEGY =
     0xD61ca03Eac0352090f45bE50403F7B17d20E11F2;
 
+  // https://explorer.optimism.io/address/0x3A956E2Fcc7e71Ea14b0257d40BEbdB287d19652
+  address internal constant sUSD_STATA_TOKEN = 0x3A956E2Fcc7e71Ea14b0257d40BEbdB287d19652;
+
   // https://explorer.optimism.io/address/0x4200000000000000000000000000000000000042
   address internal constant OP_UNDERLYING = 0x4200000000000000000000000000000000000042;
 
@@ -291,6 +315,9 @@ library AaveV3OptimismAssets {
   // https://explorer.optimism.io/address/0xeE1BAc9355EaAfCD1B68d272d640d870bC9b4b5C
   address internal constant OP_INTEREST_RATE_STRATEGY = 0xeE1BAc9355EaAfCD1B68d272d640d870bC9b4b5C;
 
+  // https://explorer.optimism.io/address/0xd4F1Cf9A038269FE8F03745C2875591Ad6438ab1
+  address internal constant OP_STATA_TOKEN = 0xd4F1Cf9A038269FE8F03745C2875591Ad6438ab1;
+
   // https://explorer.optimism.io/address/0x1F32b1c2345538c0c6f582fCB022739c4A194Ebb
   address internal constant wstETH_UNDERLYING = 0x1F32b1c2345538c0c6f582fCB022739c4A194Ebb;
 
@@ -312,6 +339,9 @@ library AaveV3OptimismAssets {
   address internal constant wstETH_INTEREST_RATE_STRATEGY =
     0x6BA97468e2e6a3711a6DD05F0075d48E878c910e;
 
+  // https://explorer.optimism.io/address/0xb972abef80046A57409e37a7DF5dEf2638917516
+  address internal constant wstETH_STATA_TOKEN = 0xb972abef80046A57409e37a7DF5dEf2638917516;
+
   // https://explorer.optimism.io/address/0xc40F949F8a4e094D1b49a23ea9241D289B7b2819
   address internal constant LUSD_UNDERLYING = 0xc40F949F8a4e094D1b49a23ea9241D289B7b2819;
 
@@ -333,6 +363,9 @@ library AaveV3OptimismAssets {
   address internal constant LUSD_INTEREST_RATE_STRATEGY =
     0x41365f2aC2D19c3B4Bc691007d314aba80af3669;
 
+  // https://explorer.optimism.io/address/0x84648dc3Cefb601bc28a49A07a1A8Bad04D30Ad3
+  address internal constant LUSD_STATA_TOKEN = 0x84648dc3Cefb601bc28a49A07a1A8Bad04D30Ad3;
+
   // https://explorer.optimism.io/address/0xdFA46478F9e5EA86d57387849598dbFB2e964b02
   address internal constant MAI_UNDERLYING = 0xdFA46478F9e5EA86d57387849598dbFB2e964b02;
 
@@ -353,6 +386,9 @@ library AaveV3OptimismAssets {
   // https://explorer.optimism.io/address/0x049E42fe40368384d04bC10f8494Ea6FD164442a
   address internal constant MAI_INTEREST_RATE_STRATEGY = 0x049E42fe40368384d04bC10f8494Ea6FD164442a;
 
+  // https://explorer.optimism.io/address/0x60495bC8D8Baf7E866888ecC00491e37B47dfF24
+  address internal constant MAI_STATA_TOKEN = 0x60495bC8D8Baf7E866888ecC00491e37B47dfF24;
+
   // https://explorer.optimism.io/address/0x9Bcef72be871e61ED4fBbc7630889beE758eb81D
   address internal constant rETH_UNDERLYING = 0x9Bcef72be871e61ED4fBbc7630889beE758eb81D;
 
@@ -373,6 +409,30 @@ library AaveV3OptimismAssets {
   // https://explorer.optimism.io/address/0x3B57B081dA6Af5e2759A57bD3211932Cb6176997
   address internal constant rETH_INTEREST_RATE_STRATEGY =
     0x3B57B081dA6Af5e2759A57bD3211932Cb6176997;
+
+  // https://explorer.optimism.io/address/0xf9ce3c97b4b54F3D16861420f4816D9f68190B7B
+  address internal constant rETH_STATA_TOKEN = 0xf9ce3c97b4b54F3D16861420f4816D9f68190B7B;
+
+  // https://explorer.optimism.io/address/0x0b2C639c533813f4Aa9D7837CAf62653d097Ff85
+  address internal constant USDCn_UNDERLYING = 0x0b2C639c533813f4Aa9D7837CAf62653d097Ff85;
+
+  uint8 internal constant USDCn_DECIMALS = 6;
+
+  // https://explorer.optimism.io/address/0x38d693cE1dF5AaDF7bC62595A37D667aD57922e5
+  address internal constant USDCn_A_TOKEN = 0x38d693cE1dF5AaDF7bC62595A37D667aD57922e5;
+
+  // https://explorer.optimism.io/address/0x5D557B07776D12967914379C71a1310e917C7555
+  address internal constant USDCn_V_TOKEN = 0x5D557B07776D12967914379C71a1310e917C7555;
+
+  // https://explorer.optimism.io/address/0x8a9FdE6925a839F6B1932d16B36aC026F8d3FbdB
+  address internal constant USDCn_S_TOKEN = 0x8a9FdE6925a839F6B1932d16B36aC026F8d3FbdB;
+
+  // https://explorer.optimism.io/address/0x16a9FA2FDa030272Ce99B29CF780dFA30361E0f3
+  address internal constant USDCn_ORACLE = 0x16a9FA2FDa030272Ce99B29CF780dFA30361E0f3;
+
+  // https://explorer.optimism.io/address/0x5eE947d920643cCd3e2c54eAAd8F260FC8Add3b4
+  address internal constant USDCn_INTEREST_RATE_STRATEGY =
+    0x5eE947d920643cCd3e2c54eAAd8F260FC8Add3b4;
 }
 
 library AaveV3OptimismEModes {
diff --git a/src/AaveV3Polygon.sol b/src/AaveV3Polygon.sol
index 1179719b..24c5ed98 100644
--- a/src/AaveV3Polygon.sol
+++ b/src/AaveV3Polygon.sol
@@ -78,8 +78,8 @@ library AaveV3Polygon {
   address internal constant REPAY_WITH_COLLATERAL_ADAPTER =
     0xE3090207A2de94A856EA10a7e1Bd36dD6145712B;
 
-  // https://polygonscan.com/address/0x2B218C73f63820CE86655d16A79C333E24fEB0BE
-  address internal constant STATIC_A_TOKEN_FACTORY = 0x2B218C73f63820CE86655d16A79C333E24fEB0BE;
+  // https://polygonscan.com/address/0x397202AB0b4E7C954ac0c493c00749C517210953
+  address internal constant STATIC_A_TOKEN_FACTORY = 0x397202AB0b4E7C954ac0c493c00749C517210953;
 
   // https://polygonscan.com/address/0xC4aff49fCeD8ac1D818a6DCAB063f9f97E66ec5E
   address internal constant SWAP_COLLATERAL_ADAPTER = 0xC4aff49fCeD8ac1D818a6DCAB063f9f97E66ec5E;
@@ -121,6 +121,9 @@ library AaveV3PolygonAssets {
   // https://polygonscan.com/address/0xdef8F50155A6cf21181E29E400E8CffAE2d50968
   address internal constant DAI_INTEREST_RATE_STRATEGY = 0xdef8F50155A6cf21181E29E400E8CffAE2d50968;
 
+  // https://polygonscan.com/address/0x83c59636e602787A6EEbBdA2915217B416193FcB
+  address internal constant DAI_STATA_TOKEN = 0x83c59636e602787A6EEbBdA2915217B416193FcB;
+
   // https://polygonscan.com/address/0x53E0bca35eC356BD5ddDFebbD1Fc0fD03FaBad39
   address internal constant LINK_UNDERLYING = 0x53E0bca35eC356BD5ddDFebbD1Fc0fD03FaBad39;
 
@@ -142,6 +145,9 @@ library AaveV3PolygonAssets {
   address internal constant LINK_INTEREST_RATE_STRATEGY =
     0x03733F4E008d36f2e37F0080fF1c8DF756622E6F;
 
+  // https://polygonscan.com/address/0x37868a45c6741616F9E5a189dC0481AD70056B6a
+  address internal constant LINK_STATA_TOKEN = 0x37868a45c6741616F9E5a189dC0481AD70056B6a;
+
   // https://polygonscan.com/address/0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174
   address internal constant USDC_UNDERLYING = 0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174;
 
@@ -163,6 +169,9 @@ library AaveV3PolygonAssets {
   address internal constant USDC_INTEREST_RATE_STRATEGY =
     0x9a158802cD924747EF336cA3F9DE3bdb60Cf43D3;
 
+  // https://polygonscan.com/address/0x1017F4a86Fc3A3c824346d0b8C5e96A5029bDAf9
+  address internal constant USDC_STATA_TOKEN = 0x1017F4a86Fc3A3c824346d0b8C5e96A5029bDAf9;
+
   // https://polygonscan.com/address/0x1BFD67037B42Cf73acF2047067bd4F2C47D9BfD6
   address internal constant WBTC_UNDERLYING = 0x1BFD67037B42Cf73acF2047067bd4F2C47D9BfD6;
 
@@ -184,6 +193,9 @@ library AaveV3PolygonAssets {
   address internal constant WBTC_INTEREST_RATE_STRATEGY =
     0x07Fa3744FeC271F80c2EA97679823F65c13CCDf4;
 
+  // https://polygonscan.com/address/0xbC0f50CCB8514Aa7dFEB297521c4BdEBc9C7d22d
+  address internal constant WBTC_STATA_TOKEN = 0xbC0f50CCB8514Aa7dFEB297521c4BdEBc9C7d22d;
+
   // https://polygonscan.com/address/0x7ceB23fD6bC0adD59E62ac25578270cFf1b9f619
   address internal constant WETH_UNDERLYING = 0x7ceB23fD6bC0adD59E62ac25578270cFf1b9f619;
 
@@ -205,6 +217,9 @@ library AaveV3PolygonAssets {
   address internal constant WETH_INTEREST_RATE_STRATEGY =
     0xf6733B9842883BFE0e0a940eA2F572676af31bde;
 
+  // https://polygonscan.com/address/0xb3D5Af0A52a35692D3FcbE37669b3B8C31dddE7D
+  address internal constant WETH_STATA_TOKEN = 0xb3D5Af0A52a35692D3FcbE37669b3B8C31dddE7D;
+
   // https://polygonscan.com/address/0xc2132D05D31c914a87C6611C10748AEb04B58e8F
   address internal constant USDT_UNDERLYING = 0xc2132D05D31c914a87C6611C10748AEb04B58e8F;
 
@@ -226,6 +241,9 @@ library AaveV3PolygonAssets {
   address internal constant USDT_INTEREST_RATE_STRATEGY =
     0xdef8F50155A6cf21181E29E400E8CffAE2d50968;
 
+  // https://polygonscan.com/address/0x87A1fdc4C726c459f597282be639a045062c0E46
+  address internal constant USDT_STATA_TOKEN = 0x87A1fdc4C726c459f597282be639a045062c0E46;
+
   // https://polygonscan.com/address/0xD6DF932A45C0f255f85145f286eA0b292B21C90B
   address internal constant AAVE_UNDERLYING = 0xD6DF932A45C0f255f85145f286eA0b292B21C90B;
 
@@ -247,6 +265,9 @@ library AaveV3PolygonAssets {
   address internal constant AAVE_INTEREST_RATE_STRATEGY =
     0x03733F4E008d36f2e37F0080fF1c8DF756622E6F;
 
+  // https://polygonscan.com/address/0xCA2E1E33E5BCF4978E2d683656E1f5610f8C4A7E
+  address internal constant AAVE_STATA_TOKEN = 0xCA2E1E33E5BCF4978E2d683656E1f5610f8C4A7E;
+
   // https://polygonscan.com/address/0x0d500B1d8E8eF31E21C99d1Db9A6444d3ADf1270
   address internal constant WMATIC_UNDERLYING = 0x0d500B1d8E8eF31E21C99d1Db9A6444d3ADf1270;
 
@@ -268,6 +289,9 @@ library AaveV3PolygonAssets {
   address internal constant WMATIC_INTEREST_RATE_STRATEGY =
     0xD87974E8ED49AB16d5053ba793F4e17078Be0426;
 
+  // https://polygonscan.com/address/0x98254592408E389D1dd2dBa318656C2C5c305b4E
+  address internal constant WMATIC_STATA_TOKEN = 0x98254592408E389D1dd2dBa318656C2C5c305b4E;
+
   // https://polygonscan.com/address/0x172370d5Cd63279eFa6d502DAB29171933a610AF
   address internal constant CRV_UNDERLYING = 0x172370d5Cd63279eFa6d502DAB29171933a610AF;
 
@@ -288,6 +312,9 @@ library AaveV3PolygonAssets {
   // https://polygonscan.com/address/0xBefcd01681224555b74eAC87207eaF9Bc3361F59
   address internal constant CRV_INTEREST_RATE_STRATEGY = 0xBefcd01681224555b74eAC87207eaF9Bc3361F59;
 
+  // https://polygonscan.com/address/0x4356941463eD4d75381AC23C9EF799B5d7C52AD8
+  address internal constant CRV_STATA_TOKEN = 0x4356941463eD4d75381AC23C9EF799B5d7C52AD8;
+
   // https://polygonscan.com/address/0x0b3F868E0BE5597D5DB7fEB59E1CADBb0fdDa50a
   address internal constant SUSHI_UNDERLYING = 0x0b3F868E0BE5597D5DB7fEB59E1CADBb0fdDa50a;
 
@@ -309,6 +336,9 @@ library AaveV3PolygonAssets {
   address internal constant SUSHI_INTEREST_RATE_STRATEGY =
     0x03733F4E008d36f2e37F0080fF1c8DF756622E6F;
 
+  // https://polygonscan.com/address/0xe3eDe71d32240b7EC355F0e5DD1131BBe029F934
+  address internal constant SUSHI_STATA_TOKEN = 0xe3eDe71d32240b7EC355F0e5DD1131BBe029F934;
+
   // https://polygonscan.com/address/0x385Eeac5cB85A38A9a07A70c73e0a3271CfB54A7
   address internal constant GHST_UNDERLYING = 0x385Eeac5cB85A38A9a07A70c73e0a3271CfB54A7;
 
@@ -330,6 +360,9 @@ library AaveV3PolygonAssets {
   address internal constant GHST_INTEREST_RATE_STRATEGY =
     0x03733F4E008d36f2e37F0080fF1c8DF756622E6F;
 
+  // https://polygonscan.com/address/0x123319636A6a9c85D9959399304F4cB23F64327e
+  address internal constant GHST_STATA_TOKEN = 0x123319636A6a9c85D9959399304F4cB23F64327e;
+
   // https://polygonscan.com/address/0x9a71012B13CA4d3D0Cdc72A177DF3ef03b0E76A3
   address internal constant BAL_UNDERLYING = 0x9a71012B13CA4d3D0Cdc72A177DF3ef03b0E76A3;
 
@@ -350,6 +383,9 @@ library AaveV3PolygonAssets {
   // https://polygonscan.com/address/0xCbDC7D7984D7AD59434f0B1999D2006898C40f9A
   address internal constant BAL_INTEREST_RATE_STRATEGY = 0xCbDC7D7984D7AD59434f0B1999D2006898C40f9A;
 
+  // https://polygonscan.com/address/0x1a8969FD39AbaF228e690B172C4C3Eb7c67F95E1
+  address internal constant BAL_STATA_TOKEN = 0x1a8969FD39AbaF228e690B172C4C3Eb7c67F95E1;
+
   // https://polygonscan.com/address/0x85955046DF4668e1DD369D2DE9f3AEB98DD2A369
   address internal constant DPI_UNDERLYING = 0x85955046DF4668e1DD369D2DE9f3AEB98DD2A369;
 
@@ -370,6 +406,9 @@ library AaveV3PolygonAssets {
   // https://polygonscan.com/address/0xd9d85499449f26d2A2c240defd75314f23920089
   address internal constant DPI_INTEREST_RATE_STRATEGY = 0xd9d85499449f26d2A2c240defd75314f23920089;
 
+  // https://polygonscan.com/address/0x73B788ACA5f4F0EeB3c6Da453cDf31041a77b36D
+  address internal constant DPI_STATA_TOKEN = 0x73B788ACA5f4F0EeB3c6Da453cDf31041a77b36D;
+
   // https://polygonscan.com/address/0xE111178A87A3BFf0c8d18DECBa5798827539Ae99
   address internal constant EURS_UNDERLYING = 0xE111178A87A3BFf0c8d18DECBa5798827539Ae99;
 
@@ -391,6 +430,9 @@ library AaveV3PolygonAssets {
   address internal constant EURS_INTEREST_RATE_STRATEGY =
     0x8F183Ee74C790CB558232a141099b316D6C8Ba6E;
 
+  // https://polygonscan.com/address/0x02E26888Ed3240BB38f26A2adF96Af9B52b167ea
+  address internal constant EURS_STATA_TOKEN = 0x02E26888Ed3240BB38f26A2adF96Af9B52b167ea;
+
   // https://polygonscan.com/address/0x4e3Decbb3645551B8A19f0eA1678079FCB33fB4c
   address internal constant jEUR_UNDERLYING = 0x4e3Decbb3645551B8A19f0eA1678079FCB33fB4c;
 
@@ -412,6 +454,9 @@ library AaveV3PolygonAssets {
   address internal constant jEUR_INTEREST_RATE_STRATEGY =
     0x41B66b4b6b4c9dab039d96528D1b88f7BAF8C5A4;
 
+  // https://polygonscan.com/address/0xD992DaC78Ef3F34614E6a7d325b7b6A320FC0AB5
+  address internal constant jEUR_STATA_TOKEN = 0xD992DaC78Ef3F34614E6a7d325b7b6A320FC0AB5;
+
   // https://polygonscan.com/address/0xE0B52e49357Fd4DAf2c15e02058DCE6BC0057db4
   address internal constant agEUR_UNDERLYING = 0xE0B52e49357Fd4DAf2c15e02058DCE6BC0057db4;
 
@@ -433,6 +478,9 @@ library AaveV3PolygonAssets {
   address internal constant agEUR_INTEREST_RATE_STRATEGY =
     0xA9F3C3caE095527061e6d270DBE163693e6fda9D;
 
+  // https://polygonscan.com/address/0xd3eb8796Ed36f58E03B7b4b5AD417FA74931d2c4
+  address internal constant agEUR_STATA_TOKEN = 0xd3eb8796Ed36f58E03B7b4b5AD417FA74931d2c4;
+
   // https://polygonscan.com/address/0xa3Fa99A148fA48D14Ed51d610c367C61876997F1
   address internal constant miMATIC_UNDERLYING = 0xa3Fa99A148fA48D14Ed51d610c367C61876997F1;
 
@@ -454,6 +502,9 @@ library AaveV3PolygonAssets {
   address internal constant miMATIC_INTEREST_RATE_STRATEGY =
     0xA901Bf68Bebde17ba382e499C3e9EbAe649DF276;
 
+  // https://polygonscan.com/address/0x8486B49433cCed038b51d18Ae3772CDB7E31CA5e
+  address internal constant miMATIC_STATA_TOKEN = 0x8486B49433cCed038b51d18Ae3772CDB7E31CA5e;
+
   // https://polygonscan.com/address/0x3A58a54C066FdC0f2D55FC9C89F0415C92eBf3C4
   address internal constant stMATIC_UNDERLYING = 0x3A58a54C066FdC0f2D55FC9C89F0415C92eBf3C4;
 
@@ -475,6 +526,9 @@ library AaveV3PolygonAssets {
   address internal constant stMATIC_INTEREST_RATE_STRATEGY =
     0x03733F4E008d36f2e37F0080fF1c8DF756622E6F;
 
+  // https://polygonscan.com/address/0x867A180B7060fDC27610dC9096E93534F638A315
+  address internal constant stMATIC_STATA_TOKEN = 0x867A180B7060fDC27610dC9096E93534F638A315;
+
   // https://polygonscan.com/address/0xfa68FB4628DFF1028CFEc22b4162FCcd0d45efb6
   address internal constant MaticX_UNDERLYING = 0xfa68FB4628DFF1028CFEc22b4162FCcd0d45efb6;
 
@@ -496,6 +550,9 @@ library AaveV3PolygonAssets {
   address internal constant MaticX_INTEREST_RATE_STRATEGY =
     0x6B434652E4C4e3e972f9F267982F05ae0fcc24b6;
 
+  // https://polygonscan.com/address/0xbcDd5709641Af4BE99b1470A2B3A5203539132Ec
+  address internal constant MaticX_STATA_TOKEN = 0xbcDd5709641Af4BE99b1470A2B3A5203539132Ec;
+
   // https://polygonscan.com/address/0x03b54A6e9a984069379fae1a4fC4dBAE93B3bCCD
   address internal constant wstETH_UNDERLYING = 0x03b54A6e9a984069379fae1a4fC4dBAE93B3bCCD;
 
@@ -516,6 +573,9 @@ library AaveV3PolygonAssets {
   // https://polygonscan.com/address/0xA6459195d60A797D278f58Ffbd2BA62Fb3F7FA1E
   address internal constant wstETH_INTEREST_RATE_STRATEGY =
     0xA6459195d60A797D278f58Ffbd2BA62Fb3F7FA1E;
+
+  // https://polygonscan.com/address/0x5274453F4CD5dD7280011a1Cca3B9e1b78EC59A6
+  address internal constant wstETH_STATA_TOKEN = 0x5274453F4CD5dD7280011a1Cca3B9e1b78EC59A6;
 }
 
 library AaveV3PolygonEModes {
diff --git a/src/AaveV3Sepolia.sol b/src/AaveV3Sepolia.sol
index c5fe297e..917f2bfb 100644
--- a/src/AaveV3Sepolia.sol
+++ b/src/AaveV3Sepolia.sol
@@ -69,6 +69,9 @@ library AaveV3Sepolia {
 
   // https://sepolia.etherscan.io/address/0x387d311e47e80b498169e6fb51d3193167d89F7D
   address internal constant WETH_GATEWAY = 0x387d311e47e80b498169e6fb51d3193167d89F7D;
+
+  // https://sepolia.etherscan.io/address/0xd210dFB43B694430B8d31762B5199e30c31266C8
+  address internal constant STATIC_A_TOKEN_FACTORY = 0xd210dFB43B694430B8d31762B5199e30c31266C8;
 }
 
 library AaveV3SepoliaAssets {
@@ -92,6 +95,9 @@ library AaveV3SepoliaAssets {
   // https://sepolia.etherscan.io/address/0xA813CC4d67821fbAcF24659e414A1Cf6c551373c
   address internal constant DAI_INTEREST_RATE_STRATEGY = 0xA813CC4d67821fbAcF24659e414A1Cf6c551373c;
 
+  // https://sepolia.etherscan.io/address/0xDE46e43F46ff74A23a65EBb0580cbe3dFE684a17
+  address internal constant DAI_STATA_TOKEN = 0xDE46e43F46ff74A23a65EBb0580cbe3dFE684a17;
+
   // https://sepolia.etherscan.io/address/0xf8Fb3713D459D7C1018BD0A49D19b4C44290EBE5
   address internal constant LINK_UNDERLYING = 0xf8Fb3713D459D7C1018BD0A49D19b4C44290EBE5;
 
@@ -113,6 +119,9 @@ library AaveV3SepoliaAssets {
   address internal constant LINK_INTEREST_RATE_STRATEGY =
     0xCA30c502d52F905FB3D04eE60cA48F5A1A89f8dB;
 
+  // https://sepolia.etherscan.io/address/0x8227a989709a757f25dF251C3C3e71CA38627836
+  address internal constant LINK_STATA_TOKEN = 0x8227a989709a757f25dF251C3C3e71CA38627836;
+
   // https://sepolia.etherscan.io/address/0x94a9D9AC8a22534E3FaCa9F4e7F2E2cf85d5E4C8
   address internal constant USDC_UNDERLYING = 0x94a9D9AC8a22534E3FaCa9F4e7F2E2cf85d5E4C8;
 
@@ -134,6 +143,9 @@ library AaveV3SepoliaAssets {
   address internal constant USDC_INTEREST_RATE_STRATEGY =
     0x5CB1008969a2d5FAcE8eF32732e6A306d0D0EF2A;
 
+  // https://sepolia.etherscan.io/address/0x8A88124522dbBF1E56352ba3DE1d9F78C143751e
+  address internal constant USDC_STATA_TOKEN = 0x8A88124522dbBF1E56352ba3DE1d9F78C143751e;
+
   // https://sepolia.etherscan.io/address/0x29f2D40B0605204364af54EC677bD022dA425d03
   address internal constant WBTC_UNDERLYING = 0x29f2D40B0605204364af54EC677bD022dA425d03;
 
@@ -155,6 +167,9 @@ library AaveV3SepoliaAssets {
   address internal constant WBTC_INTEREST_RATE_STRATEGY =
     0xCA30c502d52F905FB3D04eE60cA48F5A1A89f8dB;
 
+  // https://sepolia.etherscan.io/address/0x131a121bda71ED810bCAf2aC9079214925e59C18
+  address internal constant WBTC_STATA_TOKEN = 0x131a121bda71ED810bCAf2aC9079214925e59C18;
+
   // https://sepolia.etherscan.io/address/0xC558DBdd856501FCd9aaF1E62eae57A9F0629a3c
   address internal constant WETH_UNDERLYING = 0xC558DBdd856501FCd9aaF1E62eae57A9F0629a3c;
 
@@ -176,6 +191,9 @@ library AaveV3SepoliaAssets {
   address internal constant WETH_INTEREST_RATE_STRATEGY =
     0xCA30c502d52F905FB3D04eE60cA48F5A1A89f8dB;
 
+  // https://sepolia.etherscan.io/address/0x162B500569F42D9eCe937e6a61EDfef660A12E98
+  address internal constant WETH_STATA_TOKEN = 0x162B500569F42D9eCe937e6a61EDfef660A12E98;
+
   // https://sepolia.etherscan.io/address/0xaA8E23Fb1079EA71e0a56F48a2aA51851D8433D0
   address internal constant USDT_UNDERLYING = 0xaA8E23Fb1079EA71e0a56F48a2aA51851D8433D0;
 
@@ -197,6 +215,9 @@ library AaveV3SepoliaAssets {
   address internal constant USDT_INTEREST_RATE_STRATEGY =
     0x5CB1008969a2d5FAcE8eF32732e6A306d0D0EF2A;
 
+  // https://sepolia.etherscan.io/address/0x978206fAe13faF5a8d293FB614326B237684B750
+  address internal constant USDT_STATA_TOKEN = 0x978206fAe13faF5a8d293FB614326B237684B750;
+
   // https://sepolia.etherscan.io/address/0x88541670E55cC00bEEFD87eB59EDd1b7C511AC9a
   address internal constant AAVE_UNDERLYING = 0x88541670E55cC00bEEFD87eB59EDd1b7C511AC9a;
 
@@ -218,6 +239,9 @@ library AaveV3SepoliaAssets {
   address internal constant AAVE_INTEREST_RATE_STRATEGY =
     0xCA30c502d52F905FB3D04eE60cA48F5A1A89f8dB;
 
+  // https://sepolia.etherscan.io/address/0x56771cEF0cb422e125564CcCC98BB05fdc718E77
+  address internal constant AAVE_STATA_TOKEN = 0x56771cEF0cb422e125564CcCC98BB05fdc718E77;
+
   // https://sepolia.etherscan.io/address/0x6d906e526a4e2Ca02097BA9d0caA3c382F52278E
   address internal constant EURS_UNDERLYING = 0x6d906e526a4e2Ca02097BA9d0caA3c382F52278E;
 
@@ -238,6 +262,9 @@ library AaveV3SepoliaAssets {
   // https://sepolia.etherscan.io/address/0x5CB1008969a2d5FAcE8eF32732e6A306d0D0EF2A
   address internal constant EURS_INTEREST_RATE_STRATEGY =
     0x5CB1008969a2d5FAcE8eF32732e6A306d0D0EF2A;
+
+  // https://sepolia.etherscan.io/address/0x72B49a461900e11632C95dfa563e7173438D4e3E
+  address internal constant EURS_STATA_TOKEN = 0x72B49a461900e11632C95dfa563e7173438D4e3E;
 }
 
 library AaveV3SepoliaEModes {
diff --git a/src/MiscMumbai.sol b/src/MiscMumbai.sol
new file mode 100644
index 00000000..0892b27e
--- /dev/null
+++ b/src/MiscMumbai.sol
@@ -0,0 +1,11 @@
+// AUTOGENERATED - MANUALLY CHANGES WILL BE REVERTED BY THE GENERATOR
+// SPDX-License-Identifier: MIT
+pragma solidity >=0.6.0;
+
+library MiscMumbai {
+  // https://mumbai.polygonscan.com/address/0x49A726CC7B438dBc4fB89a9548B5E8691e1C35A6
+  address internal constant TRANSPARENT_PROXY_FACTORY = 0x49A726CC7B438dBc4fB89a9548B5E8691e1C35A6;
+
+  // https://mumbai.polygonscan.com/address/0xaebfFE29D8E823e8E43695648F418fa8c30AF879
+  address internal constant PROXY_ADMIN = 0xaebfFE29D8E823e8E43695648F418fa8c30AF879;
+}
diff --git a/src/MiscSepolia.sol b/src/MiscSepolia.sol
new file mode 100644
index 00000000..77b0bac8
--- /dev/null
+++ b/src/MiscSepolia.sol
@@ -0,0 +1,11 @@
+// AUTOGENERATED - MANUALLY CHANGES WILL BE REVERTED BY THE GENERATOR
+// SPDX-License-Identifier: MIT
+pragma solidity >=0.6.0;
+
+library MiscSepolia {
+  // https://sepolia.etherscan.io/address/0x3Bad08c7b17D77cE12A2e1438Db2353b58F7c4a2
+  address internal constant TRANSPARENT_PROXY_FACTORY = 0x3Bad08c7b17D77cE12A2e1438Db2353b58F7c4a2;
+
+  // https://sepolia.etherscan.io/address/0x8dDa7a1E3e96EB13BE50bB59e80485227E3DE2e7
+  address internal constant PROXY_ADMIN = 0x8dDa7a1E3e96EB13BE50bB59e80485227E3DE2e7;
+}
diff --git a/src/ts/AaveAddressBook.ts b/src/ts/AaveAddressBook.ts
index 95329952..44f8a859 100644
--- a/src/ts/AaveAddressBook.ts
+++ b/src/ts/AaveAddressBook.ts
@@ -49,6 +49,8 @@ export * as MiscPolygon from './MiscPolygon';
 export * as MiscMetis from './MiscMetis';
 export * as MiscGnosis from './MiscGnosis';
 export * as MiscBNB from './MiscBNB';
+export * as MiscSepolia from './MiscSepolia';
+export * as MiscMumbai from './MiscMumbai';
 export * as AaveGovernanceV2 from './AaveGovernanceV2';
 export * as AaveSafetyModule from './AaveSafetyModule';
 export {IAaveGovernanceV2_ABI} from './abis/IAaveGovernanceV2';
diff --git a/src/ts/AaveV3Arbitrum.ts b/src/ts/AaveV3Arbitrum.ts
index a3501533..9247521a 100644
--- a/src/ts/AaveV3Arbitrum.ts
+++ b/src/ts/AaveV3Arbitrum.ts
@@ -65,8 +65,8 @@ export const RATES_FACTORY = '0xcC47c4Fe1F7f29ff31A8b62197023aC8553C7896';
 // https://arbiscan.io/address/0x28201C152DC5B69A86FA54FCfd21bcA4C0eff3BA
 export const REPAY_WITH_COLLATERAL_ADAPTER = '0x28201C152DC5B69A86FA54FCfd21bcA4C0eff3BA';
 
-// https://arbiscan.io/address/0xD9419920a9768d6EdaBbe5b93cB4B5B9F3019823
-export const STATIC_A_TOKEN_FACTORY = '0xD9419920a9768d6EdaBbe5b93cB4B5B9F3019823';
+// https://arbiscan.io/address/0x411D79b8cC43384FDE66CaBf9b6a17180c842511
+export const STATIC_A_TOKEN_FACTORY = '0x411D79b8cC43384FDE66CaBf9b6a17180c842511';
 
 // https://arbiscan.io/address/0xF3C3F14dd7BDb7E03e6EBc3bc5Ffc6D66De12251
 export const SWAP_COLLATERAL_ADAPTER = '0xF3C3F14dd7BDb7E03e6EBc3bc5Ffc6D66De12251';
@@ -96,7 +96,7 @@ export const ASSETS = {
     V_TOKEN: '0x8619d80FB0141ba7F184CbF22fd724116D9f7ffC',
     INTEREST_RATE_STRATEGY: '0xA901Bf68Bebde17ba382e499C3e9EbAe649DF276',
     ORACLE: '0xc5C8E77B397E531B8EC06BFb0048328B30E9eCfB',
-    STATA_TOKEN: '0x426e8778bf7F54b0e4fc703DccA6f26a4E5B71dE',
+    STATA_TOKEN: '0xc91c5297d7E161aCC74b482aAfCc75B85cc0bfeD',
   },
   LINK: {
     decimals: 18,
@@ -106,7 +106,7 @@ export const ASSETS = {
     V_TOKEN: '0x953A573793604aF8d41F306FEb8274190dB4aE0e',
     INTEREST_RATE_STRATEGY: '0x9b34E3e183c9b0d1a08fF57a8fb59c821616295f',
     ORACLE: '0x86E53CF1B870786351Da77A57575e79CB55812CB',
-    STATA_TOKEN: '0xd9728C510F0CDD72ec4C73336340bEB291c2d9a8',
+    STATA_TOKEN: '0x27dE098EF2772386cBCf1a4c8BEb886368b7F9a9',
   },
   USDC: {
     decimals: 6,
@@ -116,7 +116,7 @@ export const ASSETS = {
     V_TOKEN: '0xFCCf3cAbbe80101232d343252614b6A3eE81C989',
     INTEREST_RATE_STRATEGY: '0x53b13a6D43F647D788411Abfd28D229C274AfBF9',
     ORACLE: '0x50834F3163758fcC1Df9973b6e91f0F0F0434aD3',
-    STATA_TOKEN: '0x3A301e7917689b8E8A19498b8A28fc912583490C',
+    STATA_TOKEN: '0x0Bc9E52051f553E75550CA22C196bf132c52Cf0B',
   },
   WBTC: {
     decimals: 8,
@@ -126,7 +126,7 @@ export const ASSETS = {
     V_TOKEN: '0x92b42c66840C7AD907b4BF74879FF3eF7c529473',
     INTEREST_RATE_STRATEGY: '0x8F183Ee74C790CB558232a141099b316D6C8Ba6E',
     ORACLE: '0x6ce185860a4963106506C203335A2910413708e9',
-    STATA_TOKEN: '0xb289a29Cfe3efc23E46ddca642d4513511dB4f4e',
+    STATA_TOKEN: '0x32B95Fbe04e5a51cF99FeeF4e57Cf7e3FC9c5A93',
   },
   WETH: {
     decimals: 18,
@@ -136,7 +136,7 @@ export const ASSETS = {
     V_TOKEN: '0x0c84331e39d6658Cd6e6b9ba04736cC4c4734351',
     INTEREST_RATE_STRATEGY: '0x9a158802cD924747EF336cA3F9DE3bdb60Cf43D3',
     ORACLE: '0x639Fe6ab55C921f74e7fac1ee960C0B6293ba612',
-    STATA_TOKEN: '0x18468b6eBA332285c6d9BB03Fe7fb52e108c4596',
+    STATA_TOKEN: '0x352F3475716261dCC991Bd5F2aF973eB3D0F5878',
   },
   USDT: {
     decimals: 6,
@@ -146,7 +146,7 @@ export const ASSETS = {
     V_TOKEN: '0xfb00AC187a8Eb5AFAE4eACE434F493Eb62672df7',
     INTEREST_RATE_STRATEGY: '0xA901Bf68Bebde17ba382e499C3e9EbAe649DF276',
     ORACLE: '0x3f3f5dF88dC9F13eac63DF89EC16ef6e7E25DdE7',
-    STATA_TOKEN: '0x8B5541B773DD781852940490b0c3dC1a8CDb6A87',
+    STATA_TOKEN: '0xb165a74407fE1e519d6bCbDeC1Ed3202B35a4140',
   },
   AAVE: {
     decimals: 18,
@@ -156,7 +156,7 @@ export const ASSETS = {
     V_TOKEN: '0xE80761Ea617F66F96274eA5e8c37f03960ecC679',
     INTEREST_RATE_STRATEGY: '0x9b34E3e183c9b0d1a08fF57a8fb59c821616295f',
     ORACLE: '0xaD1d5344AaDE45F43E596773Bcc4c423EAbdD034',
-    STATA_TOKEN: '0xE3274C0cd03D9a539C552162cacB31F5d3dd1A62',
+    STATA_TOKEN: '0x1C0c8EcED17aE093b3C1a1a8fFeBE2E9513a9346',
   },
   EURS: {
     decimals: 2,
@@ -166,7 +166,7 @@ export const ASSETS = {
     V_TOKEN: '0x4a1c3aD6Ed28a636ee1751C69071f6be75DEb8B8',
     INTEREST_RATE_STRATEGY: '0xCbDC7D7984D7AD59434f0B1999D2006898C40f9A',
     ORACLE: '0xA14d53bC1F1c0F31B4aA3BD109344E5009051a84',
-    STATA_TOKEN: '0x0188c850F6b303e221822Dea4aC5A062B970129D',
+    STATA_TOKEN: '0x9a40747BE51185A416B181789B671E78a8d045dD',
   },
   wstETH: {
     decimals: 18,
@@ -176,7 +176,7 @@ export const ASSETS = {
     V_TOKEN: '0x77CA01483f379E58174739308945f044e1a764dc',
     INTEREST_RATE_STRATEGY: '0x4b8D3277d49E114C8F2D6E0B2eD310e29226fe16',
     ORACLE: '0x945fD405773973d286De54E44649cc0d9e264F78',
-    STATA_TOKEN: '0x86c773F93D1efD209023444237d9Cf59E0bC5613',
+    STATA_TOKEN: '0x7775d4Ae4Dbb79a624fB96AAcDB8Ca74F671c0DF',
   },
   MAI: {
     decimals: 18,
@@ -186,7 +186,7 @@ export const ASSETS = {
     V_TOKEN: '0x34e2eD44EF7466D5f9E0b782B5c08b57475e7907',
     INTEREST_RATE_STRATEGY: '0x588b62C84533232E3A881e096E5D639Fa754F093',
     ORACLE: '0x59644ec622243878d1464A9504F9e9a31294128a',
-    STATA_TOKEN: '0x5F756955Fc1a43D658F4291Cf69Af16077b5326C',
+    STATA_TOKEN: '0xB4a0a2692D82301703B27082Cda45B083F68CAcE',
   },
   rETH: {
     decimals: 18,
@@ -196,7 +196,7 @@ export const ASSETS = {
     V_TOKEN: '0xCE186F6Cccb0c955445bb9d10C59caE488Fea559',
     INTEREST_RATE_STRATEGY: '0xC82dF96432346cFb632473eB619Db3B8AC280234',
     ORACLE: '0x04c28D6fE897859153eA753f986cc249Bf064f71',
-    STATA_TOKEN: '0x1FC9680786F12Cb3c0027FD577053B411A6FC70A',
+    STATA_TOKEN: '0x68235105d6d33A19369D24b746cb7481FB2b34fd',
   },
   LUSD: {
     decimals: 18,
@@ -206,7 +206,7 @@ export const ASSETS = {
     V_TOKEN: '0xA8669021776Bc142DfcA87c21b4A52595bCbB40a',
     INTEREST_RATE_STRATEGY: '0xaDbdb3d6B51151e4CDF32e4050B6F03D2bfB6477',
     ORACLE: '0x0411D28c94d85A36bC72Cb0f875dfA8371D8fFfF',
-    STATA_TOKEN: '0x8Ef77cdeEf0e0816fa75FA3E30BD20B9bE704fa2',
+    STATA_TOKEN: '0xDbB6314b5b07E63B7101844c0346309B79f8C20A',
   },
   USDCn: {
     decimals: 6,
@@ -216,7 +216,7 @@ export const ASSETS = {
     V_TOKEN: '0xf611aEb5013fD2c0511c9CD55c7dc5C1140741A6',
     INTEREST_RATE_STRATEGY: '0x44CaDF6E49895640D9De85ac01d97D44429Ad0A4',
     ORACLE: '0x50834F3163758fcC1Df9973b6e91f0F0F0434aD3',
-    STATA_TOKEN: '0xbdE67e089886EC0E615D6f054BC6f746189A3d56',
+    STATA_TOKEN: '0x7CFaDFD5645B50bE87d546f42699d863648251ad',
   },
   FRAX: {
     decimals: 18,
@@ -226,7 +226,7 @@ export const ASSETS = {
     V_TOKEN: '0x5D557B07776D12967914379C71a1310e917C7555',
     INTEREST_RATE_STRATEGY: '0xA901Bf68Bebde17ba382e499C3e9EbAe649DF276',
     ORACLE: '0x0809E3d38d1B4214958faf06D8b1B1a2b73f2ab8',
-    STATA_TOKEN: '0x22739C6915ef610412673A086e683F1EaA1A1C05',
+    STATA_TOKEN: '0x89AEc2023f89E26Dbb7eaa7a98fe3996f9d112A8',
   },
   ARB: {
     decimals: 18,
@@ -236,7 +236,7 @@ export const ASSETS = {
     V_TOKEN: '0x44705f578135cC5d703b4c9c122528C73Eb87145',
     INTEREST_RATE_STRATEGY: '0xD87974E8ED49AB16d5053ba793F4e17078Be0426',
     ORACLE: '0xb2A824043730FE05F3DA2efaFa1CBbe83fa548D6',
-    STATA_TOKEN: '0x0000000000000000000000000000000000000000',
+    STATA_TOKEN: '0x9b5637d7952BC9fa2D693aAE51f3103760Bf2693',
   },
 } as const;
 export const E_MODES = {
diff --git a/src/ts/AaveV3Avalanche.ts b/src/ts/AaveV3Avalanche.ts
index 47817973..f18aa9b8 100644
--- a/src/ts/AaveV3Avalanche.ts
+++ b/src/ts/AaveV3Avalanche.ts
@@ -68,8 +68,8 @@ export const RATES_FACTORY = '0xDd81E6F85358292075B78fc8D5830BE8434aF8BA';
 // https://snowtrace.io/address/0x49F5B996814fEd1dd39285B92A59CFb2dfd8D4f9
 export const REPAY_WITH_COLLATERAL_ADAPTER = '0x49F5B996814fEd1dd39285B92A59CFb2dfd8D4f9';
 
-// https://snowtrace.io/address/0xbD37610BBB1ddc2a22797F7e3f531B59902b7bA7
-export const STATIC_A_TOKEN_FACTORY = '0xbD37610BBB1ddc2a22797F7e3f531B59902b7bA7';
+// https://snowtrace.io/address/0x691C316b2Eec7e64d17e7E3E01f3dB44c9CcEf19
+export const STATIC_A_TOKEN_FACTORY = '0x691C316b2Eec7e64d17e7E3E01f3dB44c9CcEf19';
 
 // https://snowtrace.io/address/0x2Cf641F7C0eac2788A7924B82d6Ca8EB7bAa4E3A
 export const SWAP_COLLATERAL_ADAPTER = '0x2Cf641F7C0eac2788A7924B82d6Ca8EB7bAa4E3A';
@@ -99,7 +99,7 @@ export const ASSETS = {
     V_TOKEN: '0x8619d80FB0141ba7F184CbF22fd724116D9f7ffC',
     INTEREST_RATE_STRATEGY: '0x04daBC3C1c052AB94AA2ca80140f2b978d2F6E17',
     ORACLE: '0x51D7180edA2260cc4F6e4EebB82FEF5c3c2B8300',
-    STATA_TOKEN: '0x234c4B76f749DffFd9C18eA7CC0972206b42D019',
+    STATA_TOKEN: '0x02F3f6c8A432C1e49f3359d7d36887C25d8A5888',
   },
   LINKe: {
     decimals: 18,
@@ -109,7 +109,7 @@ export const ASSETS = {
     V_TOKEN: '0x953A573793604aF8d41F306FEb8274190dB4aE0e',
     INTEREST_RATE_STRATEGY: '0x79a906e8c998d2fb5C5D66d23c4c5416Fe0168D6',
     ORACLE: '0x49ccd9ca821EfEab2b98c60dC60F518E765EDe9a',
-    STATA_TOKEN: '0x9020e690c517D91Dc405772c130F328982150EDb',
+    STATA_TOKEN: '0x8B773Ab77Dff01985D438961dBCE58382a70cA52',
   },
   USDC: {
     decimals: 6,
@@ -119,7 +119,7 @@ export const ASSETS = {
     V_TOKEN: '0xFCCf3cAbbe80101232d343252614b6A3eE81C989',
     INTEREST_RATE_STRATEGY: '0x3B57B081dA6Af5e2759A57bD3211932Cb6176997',
     ORACLE: '0xF096872672F44d6EBA71458D74fe67F9a77a23B9',
-    STATA_TOKEN: '0xE7839ea8eA8543c7F5D9c9d7269C661904729fE7',
+    STATA_TOKEN: '0xC509aB7bB4eDbF193b82264D499a7Fc526Cd01F4',
   },
   WBTCe: {
     decimals: 8,
@@ -129,7 +129,7 @@ export const ASSETS = {
     V_TOKEN: '0x92b42c66840C7AD907b4BF74879FF3eF7c529473',
     INTEREST_RATE_STRATEGY: '0x354E84ec43aCD91e1C0135c3e691960E881DB4b7',
     ORACLE: '0x2779D32d5166BAaa2B2b658333bA7e6Ec0C65743',
-    STATA_TOKEN: '0xb516f74Eb030CebD5f616B1A33F88E1213b93c2C',
+    STATA_TOKEN: '0xE3C0f42EAF1a4BFe37CbA105e5463564BA7730aE',
   },
   WETHe: {
     decimals: 18,
@@ -139,7 +139,7 @@ export const ASSETS = {
     V_TOKEN: '0x0c84331e39d6658Cd6e6b9ba04736cC4c4734351',
     INTEREST_RATE_STRATEGY: '0x271f5f8325051f22caDa18FfedD4a805584a232A',
     ORACLE: '0x976B3D034E162d8bD72D6b9C989d545b839003b0',
-    STATA_TOKEN: '0x41BafE0091d55378Ed921Af3784622923651FDD8',
+    STATA_TOKEN: '0xf8E24175D01653fd6AA203C2C17B1e4Dd1CA2731',
   },
   USDt: {
     decimals: 6,
@@ -149,7 +149,7 @@ export const ASSETS = {
     V_TOKEN: '0xfb00AC187a8Eb5AFAE4eACE434F493Eb62672df7',
     INTEREST_RATE_STRATEGY: '0x04daBC3C1c052AB94AA2ca80140f2b978d2F6E17',
     ORACLE: '0xEBE676ee90Fe1112671f19b6B7459bC678B67e8a',
-    STATA_TOKEN: '0x759a2E28d4c3AD394d3125d5Ab75A6A5D6782Fd9',
+    STATA_TOKEN: '0x5525Ee69BC1e354B356864187De486fab5AD67d7',
   },
   AAVEe: {
     decimals: 18,
@@ -159,7 +159,7 @@ export const ASSETS = {
     V_TOKEN: '0xE80761Ea617F66F96274eA5e8c37f03960ecC679',
     INTEREST_RATE_STRATEGY: '0x79a906e8c998d2fb5C5D66d23c4c5416Fe0168D6',
     ORACLE: '0x3CA13391E9fb38a75330fb28f8cc2eB3D9ceceED',
-    STATA_TOKEN: '0x849526206f40678994b58d5524700248EAa1B75f',
+    STATA_TOKEN: '0xac0746AfD13DEbe2a43a6c8745Fb83Fd2A2909cA',
   },
   WAVAX: {
     decimals: 18,
@@ -169,7 +169,7 @@ export const ASSETS = {
     V_TOKEN: '0x4a1c3aD6Ed28a636ee1751C69071f6be75DEb8B8',
     INTEREST_RATE_STRATEGY: '0xc76EF342898f1AE7E6C4632627Df683FAD8563DD',
     ORACLE: '0x0A77230d17318075983913bC2145DB16C7366156',
-    STATA_TOKEN: '0xA291Ae608d8854CdbF9838E28E9BADCf10181669',
+    STATA_TOKEN: '0x6A02C7a974F1F13A67980C80F774eC1d2eD8f98d',
   },
   sAVAX: {
     decimals: 18,
@@ -179,7 +179,7 @@ export const ASSETS = {
     V_TOKEN: '0x77CA01483f379E58174739308945f044e1a764dc',
     INTEREST_RATE_STRATEGY: '0x79a906e8c998d2fb5C5D66d23c4c5416Fe0168D6',
     ORACLE: '0xc9245871D69BF4c36c6F2D15E0D68Ffa883FE1A7',
-    STATA_TOKEN: '0x491E098e013a88eEb91E57be571bB2BD3B4aec67',
+    STATA_TOKEN: '0x4F059cA8a2a5BF8895Ee731f2E901cCB769FB95f',
   },
   FRAX: {
     decimals: 18,
@@ -189,7 +189,7 @@ export const ASSETS = {
     V_TOKEN: '0x34e2eD44EF7466D5f9E0b782B5c08b57475e7907',
     INTEREST_RATE_STRATEGY: '0x04daBC3C1c052AB94AA2ca80140f2b978d2F6E17',
     ORACLE: '0xbBa56eF1565354217a3353a466edB82E8F25b08e',
-    STATA_TOKEN: '0x318992E104cD645543aD1a0806CD3f06532FC696',
+    STATA_TOKEN: '0xA3c2ffE702F4cD265B2249AB5f84Fab81FFf6c73',
   },
   MAI: {
     decimals: 18,
@@ -199,7 +199,7 @@ export const ASSETS = {
     V_TOKEN: '0xCE186F6Cccb0c955445bb9d10C59caE488Fea559',
     INTEREST_RATE_STRATEGY: '0x5f58C25D17C09c9e1892F45DE6dA45ed973A5326',
     ORACLE: '0x5D1F504211c17365CA66353442a74D4435A8b778',
-    STATA_TOKEN: '0x717F2193a7d94Fce8653E91D097df19E83e79E5D',
+    STATA_TOKEN: '0x08cC59E51BB0Bc322B4D251f7262dB864d6150ce',
   },
   BTCb: {
     decimals: 8,
@@ -209,7 +209,7 @@ export const ASSETS = {
     V_TOKEN: '0xA8669021776Bc142DfcA87c21b4A52595bCbB40a',
     INTEREST_RATE_STRATEGY: '0x79a906e8c998d2fb5C5D66d23c4c5416Fe0168D6',
     ORACLE: '0x2779D32d5166BAaa2B2b658333bA7e6Ec0C65743',
-    STATA_TOKEN: '0x0e3DE807B3B4D65D40dfB7BB908289b227d816c8',
+    STATA_TOKEN: '0x34d768cc830c32DcD743321c09A2A702651bF9a2',
   },
 } as const;
 export const E_MODES = {
diff --git a/src/ts/AaveV3Base.ts b/src/ts/AaveV3Base.ts
index b52da1a6..90a33ab4 100644
--- a/src/ts/AaveV3Base.ts
+++ b/src/ts/AaveV3Base.ts
@@ -59,6 +59,9 @@ export const SWAP_COLLATERAL_ADAPTER = '0x2E549104c516b8657A7D888494DfbAbD7C70b4
 // https://basescan.org/address/0x78F8Bd884C3D738B74B420540659c82f392820e0
 export const REPAY_WITH_COLLATERAL_ADAPTER = '0x78F8Bd884C3D738B74B420540659c82f392820e0';
 
+// https://basescan.org/address/0x940F9a5d5F9ED264990D0eaee1F3DD60B4Cb9A22
+export const STATIC_A_TOKEN_FACTORY = '0x940F9a5d5F9ED264990D0eaee1F3DD60B4Cb9A22';
+
 // https://basescan.org/address/0xc7751400F809cdB0C167F87985083C558a0610F7
 export const CONFIG_ENGINE = '0xc7751400F809cdB0C167F87985083C558a0610F7';
 
@@ -93,6 +96,7 @@ export const ASSETS = {
     V_TOKEN: '0x24e6e0795b3c7c71D965fCc4f371803d1c1DcA1E',
     INTEREST_RATE_STRATEGY: '0xC1F6588f4A1145D0B7F94c86a773bB47F0eC0759',
     ORACLE: '0x71041dddad3595F9CEd3DcCFBe3D1F4b0a16Bb70',
+    STATA_TOKEN: '0x468973e3264F2aEba0417A8f2cD0Ec397E738898',
   },
   cbETH: {
     decimals: 18,
@@ -102,6 +106,7 @@ export const ASSETS = {
     V_TOKEN: '0x1DabC36f19909425f654777249815c073E8Fd79F',
     INTEREST_RATE_STRATEGY: '0x05295489b6aE0d97ae7C49a42989497294F7F428',
     ORACLE: '0x80f2c02224a2E548FC67c0bF705eBFA825dd5439',
+    STATA_TOKEN: '0x16A004065dfb11276DcB29Dc03fb8A85f9A43C6e',
   },
   USDbC: {
     decimals: 6,
@@ -111,6 +116,7 @@ export const ASSETS = {
     V_TOKEN: '0x7376b2F323dC56fCd4C191B34163ac8a84702DAB',
     INTEREST_RATE_STRATEGY: '0x8c63A1b0721D5776Ae5ed1Be8dc7f2A1e7312Ed3',
     ORACLE: '0x7e860098F58bBFC8648a4311b374B1D669a2bc6B',
+    STATA_TOKEN: '0x6fCe2756794128B1771324caA860965801DCbCdB',
   },
 } as const;
 export const E_MODES = {
diff --git a/src/ts/AaveV3Ethereum.ts b/src/ts/AaveV3Ethereum.ts
index 9a752026..974c731b 100644
--- a/src/ts/AaveV3Ethereum.ts
+++ b/src/ts/AaveV3Ethereum.ts
@@ -68,8 +68,8 @@ export const RATES_FACTORY = '0xcC47c4Fe1F7f29ff31A8b62197023aC8553C7896';
 // https://etherscan.io/address/0x02e7B8511831B1b02d9018215a0f8f500Ea5c6B3
 export const REPAY_WITH_COLLATERAL_ADAPTER = '0x02e7B8511831B1b02d9018215a0f8f500Ea5c6B3';
 
-// https://etherscan.io/address/0x17D0D723a6741C8E154594a8850D29D58Bcc9218
-export const STATIC_A_TOKEN_FACTORY = '0x17D0D723a6741C8E154594a8850D29D58Bcc9218';
+// https://etherscan.io/address/0x411D79b8cC43384FDE66CaBf9b6a17180c842511
+export const STATIC_A_TOKEN_FACTORY = '0x411D79b8cC43384FDE66CaBf9b6a17180c842511';
 
 // https://etherscan.io/address/0xADC0A53095A0af87F3aa29FE0715B5c28016364e
 export const SWAP_COLLATERAL_ADAPTER = '0xADC0A53095A0af87F3aa29FE0715B5c28016364e';
@@ -102,7 +102,7 @@ export const ASSETS = {
     V_TOKEN: '0xeA51d7853EEFb32b6ee06b1C12E6dcCA88Be0fFE',
     INTEREST_RATE_STRATEGY: '0xA901Bf68Bebde17ba382e499C3e9EbAe649DF276',
     ORACLE: '0x5f4eC3Df9cbd43714FE2740f5E3616155c5b8419',
-    STATA_TOKEN: '0x03928473f25bb2da6Bc880b07eCBaDC636822264',
+    STATA_TOKEN: '0x0000000000000000000000000000000000000000',
   },
   wstETH: {
     decimals: 18,
@@ -132,7 +132,7 @@ export const ASSETS = {
     V_TOKEN: '0x72E95b8931767C79bA4EeE721354d6E99a61D004',
     INTEREST_RATE_STRATEGY: '0x53b13a6D43F647D788411Abfd28D229C274AfBF9',
     ORACLE: '0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6',
-    STATA_TOKEN: '0x02c2d189b45CE213a40097b62D311cf0dD16eC92',
+    STATA_TOKEN: '0x0000000000000000000000000000000000000000',
   },
   DAI: {
     decimals: 18,
@@ -142,7 +142,7 @@ export const ASSETS = {
     V_TOKEN: '0xcF8d0c70c850859266f5C338b38F9D663181C314',
     INTEREST_RATE_STRATEGY: '0x9a158802cD924747EF336cA3F9DE3bdb60Cf43D3',
     ORACLE: '0xAed0c38402a5d19df6E4c03F4E2DceD6e29c1ee9',
-    STATA_TOKEN: '0xEb708639E8e518B86a916db3685f90216b1C1c67',
+    STATA_TOKEN: '0x0000000000000000000000000000000000000000',
   },
   LINK: {
     decimals: 18,
@@ -182,7 +182,7 @@ export const ASSETS = {
     V_TOKEN: '0x6df1C1E379bC5a00a7b4C6e67A203333772f45A8',
     INTEREST_RATE_STRATEGY: '0x588b62C84533232E3A881e096E5D639Fa754F093',
     ORACLE: '0x3E7d1eAB13ad0104d2750B8863b489D65364e32D',
-    STATA_TOKEN: '0x65799b9fD4206CdaA4A1DB79254FCbc2Fd2fFEe6',
+    STATA_TOKEN: '0x0000000000000000000000000000000000000000',
   },
   rETH: {
     decimals: 18,
@@ -300,7 +300,7 @@ export const ASSETS = {
     A_TOKEN: '0x00907f9921424583e7ffBfEdf84F92B7B2Be4977',
     S_TOKEN: '0x3f3DF7266dA30102344A813F1a3D07f5F041B5AC',
     V_TOKEN: '0x786dBff3f1292ae8F92ea68Cf93c30b34B1ed04B',
-    INTEREST_RATE_STRATEGY: '0xE7C0AE65f7D52E121654eEa0A57b4af0894F6D27',
+    INTEREST_RATE_STRATEGY: '0xE6e780D77b883E9a5eC84f7baA6BF4DB43177Fa7',
     ORACLE: '0xD110cac5d8682A3b045D5524a9903E031d70FCCd',
     STATA_TOKEN: '0x0000000000000000000000000000000000000000',
   },
diff --git a/src/ts/AaveV3Gnosis.ts b/src/ts/AaveV3Gnosis.ts
index 8d01c145..31c47296 100644
--- a/src/ts/AaveV3Gnosis.ts
+++ b/src/ts/AaveV3Gnosis.ts
@@ -71,6 +71,9 @@ export const CAPS_PLUS_RISK_STEWARD = '0x33AE1f41546a2e05368Bf789b3d868813c0Ae65
 // https://blockscout.com/xdai/mainnet/address/0x3Ceaf9b6CAb92dFe6302D0CC3F1BA880C28d35e5
 export const FREEZING_STEWARD = '0x3Ceaf9b6CAb92dFe6302D0CC3F1BA880C28d35e5';
 
+// https://blockscout.com/xdai/mainnet/address/0x02e9b27599C4Bf8f789d34b6E65C51092c3d9FA6
+export const STATIC_A_TOKEN_FACTORY = '0x02e9b27599C4Bf8f789d34b6E65C51092c3d9FA6';
+
 export const CHAIN_ID = 100;
 export const ASSETS = {
   WETH: {
@@ -81,6 +84,7 @@ export const ASSETS = {
     V_TOKEN: '0x0c0fce05F2314540EcB095bF4D069e5E0ED90fF8',
     INTEREST_RATE_STRATEGY: '0xD84d86083010FB683f1e8fA3809ee8DC90A4C4DB',
     ORACLE: '0xa767f745331D267c7751297D982b050c93985627',
+    STATA_TOKEN: '0xD843FB478c5aA9759FeA3f3c98D467e2F136190a',
   },
   wstETH: {
     decimals: 18,
@@ -90,6 +94,7 @@ export const ASSETS = {
     V_TOKEN: '0x9D881f67F20B49243c98f53d2B9E91E39d02Ae09',
     INTEREST_RATE_STRATEGY: '0x9E57695Dab0DCdb42BC220ff1E9eb2e22a31209b',
     ORACLE: '0xcb0670258e5961CCA85D8F71D29C1167Ef20De99',
+    STATA_TOKEN: '0xECfD0638175e291BA3F784A58FB9D38a25418904',
   },
   GNO: {
     decimals: 18,
@@ -99,6 +104,7 @@ export const ASSETS = {
     V_TOKEN: '0xBc59E99198DbA71985A66E1713cC89FFEC53f7FC',
     INTEREST_RATE_STRATEGY: '0x9E57695Dab0DCdb42BC220ff1E9eb2e22a31209b',
     ORACLE: '0x22441d81416430A54336aB28765abd31a792Ad37',
+    STATA_TOKEN: '0x2D737e2B0e175f05D0904C208d6C4e40da570f65',
   },
   USDC: {
     decimals: 6,
@@ -108,6 +114,7 @@ export const ASSETS = {
     V_TOKEN: '0x5F6f7B0a87CA3CF3d0b431Ae03EF3305180BFf4d',
     INTEREST_RATE_STRATEGY: '0x345f7fcd88207fe060AD03c2656A23A3Ab596479',
     ORACLE: '0x26C31ac71010aF62E6B486D1132E266D6298857D',
+    STATA_TOKEN: '0x270bA1f35D8b87510D24F693fcCc0da02e6E4EeB',
   },
   WXDAI: {
     decimals: 18,
@@ -117,6 +124,7 @@ export const ASSETS = {
     V_TOKEN: '0x281963D7471eCdC3A2Bd4503e24e89691cfe420D',
     INTEREST_RATE_STRATEGY: '0x345f7fcd88207fe060AD03c2656A23A3Ab596479',
     ORACLE: '0x678df3415fc31947dA4324eC63212874be5a82f8',
+    STATA_TOKEN: '0x7f0EAE87Df30C468E0680c83549D0b3DE7664D4B',
   },
   EURe: {
     decimals: 18,
@@ -126,6 +134,7 @@ export const ASSETS = {
     V_TOKEN: '0xb96404e475f337A7E98e4a541C9b71309BB66c5A',
     INTEREST_RATE_STRATEGY: '0x6c3b7e7B8b9609D57C70C3F630228F979EAbb450',
     ORACLE: '0xab70BCB260073d036d1660201e9d5405F5829b7a',
+    STATA_TOKEN: '0x8418D17640a74F1614AC3E1826F29e78714488a1',
   },
   sDAI: {
     decimals: 18,
@@ -135,6 +144,7 @@ export const ASSETS = {
     V_TOKEN: '0x8Fe06E1D8Aff42Bf6812CacF7854A2249a00bED7',
     INTEREST_RATE_STRATEGY: '0x6c3b7e7B8b9609D57C70C3F630228F979EAbb450',
     ORACLE: '0x1D0f881Ce1a646E2f27Dec3c57Fa056cB838BCC2',
+    STATA_TOKEN: '0xf3f45960f8dE00D8ED614D445a5a268c6F6Dec4f',
   },
 } as const;
 export const E_MODES = {
diff --git a/src/ts/AaveV3Metis.ts b/src/ts/AaveV3Metis.ts
index 1a2f4f14..ce202fa8 100644
--- a/src/ts/AaveV3Metis.ts
+++ b/src/ts/AaveV3Metis.ts
@@ -68,6 +68,9 @@ export const UI_POOL_DATA_PROVIDER = '0x7dd60bd8507fDC3d300d53427b7AE566701a7320
 // https://andromeda-explorer.metis.io/address/0x1df710eb1E2FD9C21494aF2BFb1F210a4185885b
 export const WALLET_BALANCE_PROVIDER = '0x1df710eb1E2FD9C21494aF2BFb1F210a4185885b';
 
+// https://andromeda-explorer.metis.io/address/0x9C62AdC332888F56998542415c38D7CDf3Ff7619
+export const STATIC_A_TOKEN_FACTORY = '0x9C62AdC332888F56998542415c38D7CDf3Ff7619';
+
 export const CHAIN_ID = 1088;
 export const ASSETS = {
   mDAI: {
@@ -78,6 +81,7 @@ export const ASSETS = {
     V_TOKEN: '0x13Bd89aF338f3c7eAE9a75852fC2F1ca28B4DDbF',
     INTEREST_RATE_STRATEGY: '0x4a8de3E62B4a63905f62e56292ECdCfD3593d1c9',
     ORACLE: '0xe0351cAAE70B5AdBD0107cD5331AD1D79c4c1CA1',
+    STATA_TOKEN: '0x66a2E4cff95BDE6403Ed5541B396aA0B171e5509',
   },
   Metis: {
     decimals: 18,
@@ -87,6 +91,7 @@ export const ASSETS = {
     V_TOKEN: '0x0110174183e13D5Ea59D7512226c5D5A47bA2c40',
     INTEREST_RATE_STRATEGY: '0xfe8FF9a19E251fe6cf2e8cBf0959ACa9624A97d1',
     ORACLE: '0xD4a5Bb03B5D66d9bf81507379302Ac2C2DFDFa6D',
+    STATA_TOKEN: '0x5DE732A094A0ceF0eBFEcF0A916bDAB29650a784',
   },
   mUSDC: {
     decimals: 6,
@@ -96,6 +101,7 @@ export const ASSETS = {
     V_TOKEN: '0x571171a7EF1e3c8c83d47EF1a50E225E9c351380',
     INTEREST_RATE_STRATEGY: '0x3B88f83B2b0444F14B6fc904040F648206F551fc',
     ORACLE: '0x663855969c85F3BE415807250414Ca9129533a5f',
+    STATA_TOKEN: '0xb24451C231C6e6A60aC46f45E98a267caae898f4',
   },
   mUSDT: {
     decimals: 6,
@@ -105,6 +111,7 @@ export const ASSETS = {
     V_TOKEN: '0x6B45DcE8aF4fE5Ab3bFCF030d8fB57718eAB54e5',
     INTEREST_RATE_STRATEGY: '0x5A1bdAc4eBa2A70D465ef4aDd2f68dBBae183454',
     ORACLE: '0x51864b8948Aa5e35aace2BaDaF901D63418A3b9D',
+    STATA_TOKEN: '0xAAea6F041425B813760dA201d08d46487034A266',
   },
   WETH: {
     decimals: 18,
@@ -114,6 +121,7 @@ export const ASSETS = {
     V_TOKEN: '0x8Bb19e3DD277a73D4A95EE434F14cE4B92898421',
     INTEREST_RATE_STRATEGY: '0x83e654d42f437915bf849dE04c19AAd8C5e8c01E',
     ORACLE: '0x3BBe70e2F96c87aEce7F67A2b0178052f62E37fE',
+    STATA_TOKEN: '0x2f1606864d6322c54b50a1762D4a1ca67f42d23d',
   },
 } as const;
 export const E_MODES = {
diff --git a/src/ts/AaveV3Mumbai.ts b/src/ts/AaveV3Mumbai.ts
index 753aa4c0..c58c38b2 100644
--- a/src/ts/AaveV3Mumbai.ts
+++ b/src/ts/AaveV3Mumbai.ts
@@ -56,6 +56,9 @@ export const WALLET_BALANCE_PROVIDER = '0xD8A70FC58BC069CFE6529EBF0c1Db067f2b534
 // https://mumbai.polygonscan.com/address/0x8dA9412AbB78db20d0B496573D9066C474eA21B8
 export const WETH_GATEWAY = '0x8dA9412AbB78db20d0B496573D9066C474eA21B8';
 
+// https://mumbai.polygonscan.com/address/0x4df6bfA5522aAd4C80e6C95b613B92AC019f2d3e
+export const STATIC_A_TOKEN_FACTORY = '0x4df6bfA5522aAd4C80e6C95b613B92AC019f2d3e';
+
 export const CHAIN_ID = 80001;
 export const ASSETS = {
   DAI: {
@@ -66,6 +69,7 @@ export const ASSETS = {
     V_TOKEN: '0x8584Fa491eAF3B959dE0888b5B5b9EF60660eb02',
     INTEREST_RATE_STRATEGY: '0xbE46486f69fc2882e5E4769CFBCe704E3EfecD25',
     ORACLE: '0x685b86a6659a1CbcfE168304386e1b54C543Ce16',
+    STATA_TOKEN: '0xe012Fa4A7CAa676b2587A20650b8358d72984250',
   },
   LINK: {
     decimals: 18,
@@ -75,6 +79,7 @@ export const ASSETS = {
     V_TOKEN: '0xC270C1D7B43eE909e5Cb2B59D25033eE79992581',
     INTEREST_RATE_STRATEGY: '0x0313912C1C3D946F9253D9b6E9f6aB9137759b4B',
     ORACLE: '0xbB96Cf09DaAA98f4dad1f63B0aDeF2C8aaD1BC3E',
+    STATA_TOKEN: '0xA609025Ee8885C4E557331cCF4e3A1099B182359',
   },
   USDC: {
     decimals: 6,
@@ -84,6 +89,7 @@ export const ASSETS = {
     V_TOKEN: '0x90d909005F13D1Dfd2D8Ab62289309C27E1a066d',
     INTEREST_RATE_STRATEGY: '0x8d284fE251BB7Fe6B529FC2f27BAb415FcF46B25',
     ORACLE: '0x465C5251Ec08Ba64dCDC05833d81e086322dE11F',
+    STATA_TOKEN: '0x5eF0fbC8cC652e1128ff50fA8473B7E949C9EaC3',
   },
   WBTC: {
     decimals: 8,
@@ -93,6 +99,7 @@ export const ASSETS = {
     V_TOKEN: '0x4ac5719fbd9986b17911815058d3D4f50E6608eA',
     INTEREST_RATE_STRATEGY: '0x0313912C1C3D946F9253D9b6E9f6aB9137759b4B',
     ORACLE: '0x3E3D70Dc636E98636c68d51Aa4a91D4D1828D277',
+    STATA_TOKEN: '0x0693e498eF6D6fb27b57dc3D9e3E0a0f9f2fbeC4',
   },
   WETH: {
     decimals: 18,
@@ -102,6 +109,7 @@ export const ASSETS = {
     V_TOKEN: '0x6B9f12aD327e2760816A8a6c7A740AeA901fEB21',
     INTEREST_RATE_STRATEGY: '0x0313912C1C3D946F9253D9b6E9f6aB9137759b4B',
     ORACLE: '0xc24df0548a5aa08262bff6c2bb48048348e4E097',
+    STATA_TOKEN: '0x666ef6De71Eb3DAd05F996ECAa910360f4e8fD7c',
   },
   USDT: {
     decimals: 6,
@@ -111,6 +119,7 @@ export const ASSETS = {
     V_TOKEN: '0x04A2bc818911a729460b3FfB4B9ff841CFEC93a1',
     INTEREST_RATE_STRATEGY: '0x8d284fE251BB7Fe6B529FC2f27BAb415FcF46B25',
     ORACLE: '0x17E6574DA37DD6F20d80CBf0d1580a420056413e',
+    STATA_TOKEN: '0x48774b9D6Bd38d6d0CF17D9C6E023b67eDAEeA29',
   },
   AAVE: {
     decimals: 18,
@@ -120,6 +129,7 @@ export const ASSETS = {
     V_TOKEN: '0xe5e880dAd60A9D0f6Cea43a664517F2eb6fe3233',
     INTEREST_RATE_STRATEGY: '0x0313912C1C3D946F9253D9b6E9f6aB9137759b4B',
     ORACLE: '0x1034d6131E0E7F2F47bFAd06597ed97b35aA5492',
+    STATA_TOKEN: '0xC19611D616f191dc7dFFAf192c071B8957379585',
   },
   WMATIC: {
     decimals: 18,
@@ -129,6 +139,7 @@ export const ASSETS = {
     V_TOKEN: '0x4d4ADCd160BFA54B7b288537705434c478843b37',
     INTEREST_RATE_STRATEGY: '0x0313912C1C3D946F9253D9b6E9f6aB9137759b4B',
     ORACLE: '0x365691299B5DCFFEFF045018C4DD97c17f2DF10E',
+    STATA_TOKEN: '0x5C0478fd615e02ecC3BB3fbe2fe6153090031696',
   },
   CRV: {
     decimals: 18,
@@ -138,6 +149,7 @@ export const ASSETS = {
     V_TOKEN: '0xb9bA8eb73F06cC77Ec761485872005b228873DA6',
     INTEREST_RATE_STRATEGY: '0x0313912C1C3D946F9253D9b6E9f6aB9137759b4B',
     ORACLE: '0x44c4c82FEe3d9c5A3A584e87D4c0dAe14c4D880C',
+    STATA_TOKEN: '0x81E7EB2067FDc31308b2dC97A070EDe0634Aa7fd',
   },
   SUSHI: {
     decimals: 18,
@@ -147,6 +159,7 @@ export const ASSETS = {
     V_TOKEN: '0x586Ccc2Ca7840E860d741ddfbFf390da0fB42B95',
     INTEREST_RATE_STRATEGY: '0x0313912C1C3D946F9253D9b6E9f6aB9137759b4B',
     ORACLE: '0x18a8d31dA46eeb9138a16dfC429E74C04ff523F4',
+    STATA_TOKEN: '0xDEF3d6FcFD68af03cCC4818FFd17F57A54Dd93f8',
   },
   GHST: {
     decimals: 18,
@@ -156,6 +169,7 @@ export const ASSETS = {
     V_TOKEN: '0xd8Aab78Fe045D67b463f0361578e01c40CbFb4B7',
     INTEREST_RATE_STRATEGY: '0x0313912C1C3D946F9253D9b6E9f6aB9137759b4B',
     ORACLE: '0x0EFC6aec29cE36fdEB293491f8F77650Eb1A82F4',
+    STATA_TOKEN: '0x7f178E419181B8C9CF64fee7D58F24b32ec0F1cc',
   },
   BAL: {
     decimals: 18,
@@ -165,6 +179,7 @@ export const ASSETS = {
     V_TOKEN: '0x92cCc1f6A3DA79eD405e7b5AFaF3BA54Ba5408F5',
     INTEREST_RATE_STRATEGY: '0x0313912C1C3D946F9253D9b6E9f6aB9137759b4B',
     ORACLE: '0xdBfA358282bf03c67B059063fBc71b40ddFeDf1f',
+    STATA_TOKEN: '0xb95140824eC44ec97ab10f459aD0768275Eb3e94',
   },
   DPI: {
     decimals: 18,
@@ -174,6 +189,7 @@ export const ASSETS = {
     V_TOKEN: '0xf415b985e0CA9850Ae1C04081DF8DeD8bD5ef8e5',
     INTEREST_RATE_STRATEGY: '0x0313912C1C3D946F9253D9b6E9f6aB9137759b4B',
     ORACLE: '0xD5D4f4fe4BfC8e8193f38927EfafDbfbB66dd7e0',
+    STATA_TOKEN: '0x00718266Ae6AbaCe3C14AD0263968eB7F581BC91',
   },
   EURS: {
     decimals: 2,
@@ -183,6 +199,7 @@ export const ASSETS = {
     V_TOKEN: '0x6e87Cad75af55fc5611D3a90d6789B12A87E72e4',
     INTEREST_RATE_STRATEGY: '0x8d284fE251BB7Fe6B529FC2f27BAb415FcF46B25',
     ORACLE: '0x09Bb4317F42FA4eA4d044922f795bf6ccFeAAA4b',
+    STATA_TOKEN: '0xB5B6c7a13602CF827Cc2F0383E27F8e2DB8dBE64',
   },
   JEUR: {
     decimals: 18,
@@ -192,6 +209,7 @@ export const ASSETS = {
     V_TOKEN: '0xaCD2c77bd160297C151CC22eB6A3C1c77723f02c',
     INTEREST_RATE_STRATEGY: '0x8d284fE251BB7Fe6B529FC2f27BAb415FcF46B25',
     ORACLE: '0x67cEB95eCD290A25D017B0f4D345E5F7Ba893B5F',
+    STATA_TOKEN: '0xEf6F8a13a8B2098F13D08A95b32191ddE13693eE',
   },
   AGEUR: {
     decimals: 18,
@@ -201,6 +219,7 @@ export const ASSETS = {
     V_TOKEN: '0x7511Bc35eDfb9513e67a6431826C766c24401AeF',
     INTEREST_RATE_STRATEGY: '0x8d284fE251BB7Fe6B529FC2f27BAb415FcF46B25',
     ORACLE: '0xCf9DADD5cFE871f65D7EeFAEbe44481c8597b26e',
+    STATA_TOKEN: '0xeF5074Dd60e25F8EFd763068C73d34E05815f41f',
   },
 } as const;
 export const E_MODES = {
diff --git a/src/ts/AaveV3Optimism.ts b/src/ts/AaveV3Optimism.ts
index e6ef7435..a61ebdf0 100644
--- a/src/ts/AaveV3Optimism.ts
+++ b/src/ts/AaveV3Optimism.ts
@@ -65,8 +65,8 @@ export const RATES_FACTORY = '0xDd81E6F85358292075B78fc8D5830BE8434aF8BA';
 // https://explorer.optimism.io/address/0xa12734e64417f61f8442E7D5132EdBFdbDDeF0fa
 export const REPAY_WITH_COLLATERAL_ADAPTER = '0xa12734e64417f61f8442E7D5132EdBFdbDDeF0fa';
 
-// https://explorer.optimism.io/address/0xD9419920a9768d6EdaBbe5b93cB4B5B9F3019823
-export const STATIC_A_TOKEN_FACTORY = '0xD9419920a9768d6EdaBbe5b93cB4B5B9F3019823';
+// https://explorer.optimism.io/address/0x22D76094730fA377184100EFB8CEfC673B89B372
+export const STATIC_A_TOKEN_FACTORY = '0x22D76094730fA377184100EFB8CEfC673B89B372';
 
 // https://explorer.optimism.io/address/0x830C5A67a0C95D69dA5fb7801Ac1773c6fB53857
 export const SWAP_COLLATERAL_ADAPTER = '0x830C5A67a0C95D69dA5fb7801Ac1773c6fB53857';
@@ -96,7 +96,7 @@ export const ASSETS = {
     V_TOKEN: '0x8619d80FB0141ba7F184CbF22fd724116D9f7ffC',
     INTEREST_RATE_STRATEGY: '0x6D6D3b7FC50999bf20dE5CC8e0F63AFD18B95f0e',
     ORACLE: '0x8dBa75e83DA73cc766A7e5a0ee71F656BAb470d6',
-    STATA_TOKEN: '0xCBb2B87a9B13C2787A93eaE9dF0e72344b36120A',
+    STATA_TOKEN: '0x6dDc64289bE8a71A707fB057d5d07Cc756055d6e',
   },
   LINK: {
     decimals: 18,
@@ -106,7 +106,7 @@ export const ASSETS = {
     V_TOKEN: '0x953A573793604aF8d41F306FEb8274190dB4aE0e',
     INTEREST_RATE_STRATEGY: '0xeE1BAc9355EaAfCD1B68d272d640d870bC9b4b5C',
     ORACLE: '0xCc232dcFAAE6354cE191Bd574108c1aD03f86450',
-    STATA_TOKEN: '0x8e2154479FAc840Ce4e86ab1B83De589c7a0355C',
+    STATA_TOKEN: '0x39BCf217ACc4Bf2fCaF7BC8800E69D986912c75e',
   },
   USDC: {
     decimals: 6,
@@ -116,7 +116,7 @@ export const ASSETS = {
     V_TOKEN: '0xFCCf3cAbbe80101232d343252614b6A3eE81C989',
     INTEREST_RATE_STRATEGY: '0x3832311560d3B457E9cC35e5b8e06EB167D8c17D',
     ORACLE: '0x16a9FA2FDa030272Ce99B29CF780dFA30361E0f3',
-    STATA_TOKEN: '0x41B75372F734ee9b7792ca5576a40E008C91A098',
+    STATA_TOKEN: '0x9F281eb58fd98ad98EDe0fc4C553AD4D73e7Ca2C',
   },
   WBTC: {
     decimals: 8,
@@ -126,7 +126,7 @@ export const ASSETS = {
     V_TOKEN: '0x92b42c66840C7AD907b4BF74879FF3eF7c529473',
     INTEREST_RATE_STRATEGY: '0x04daBC3C1c052AB94AA2ca80140f2b978d2F6E17',
     ORACLE: '0xD702DD976Fb76Fffc2D3963D037dfDae5b04E593',
-    STATA_TOKEN: '0xB7BA668e5378BA3dbfa252d03E54b62702f79F7e',
+    STATA_TOKEN: '0x6d998FeEFC7B3664eaD09CAf02b5a0fc2E365F18',
   },
   WETH: {
     decimals: 18,
@@ -136,7 +136,7 @@ export const ASSETS = {
     V_TOKEN: '0x0c84331e39d6658Cd6e6b9ba04736cC4c4734351',
     INTEREST_RATE_STRATEGY: '0x5f58C25D17C09c9e1892F45DE6dA45ed973A5326',
     ORACLE: '0x13e3Ee699D1909E989722E753853AE30b17e08c5',
-    STATA_TOKEN: '0x6b1440b08f467A2A68E562aC38bB5e2256d5C60E',
+    STATA_TOKEN: '0x98d69620C31869fD4822ceb6ADAB31180475FD37',
   },
   USDT: {
     decimals: 6,
@@ -146,7 +146,7 @@ export const ASSETS = {
     V_TOKEN: '0xfb00AC187a8Eb5AFAE4eACE434F493Eb62672df7',
     INTEREST_RATE_STRATEGY: '0x6D6D3b7FC50999bf20dE5CC8e0F63AFD18B95f0e',
     ORACLE: '0xECef79E109e997bCA29c1c0897ec9d7b03647F5E',
-    STATA_TOKEN: '0xef30602e3161924672d47D076f093938A33B9600',
+    STATA_TOKEN: '0x035c93db04E5aAea54E6cd0261C492a3e0638b37',
   },
   AAVE: {
     decimals: 18,
@@ -156,7 +156,7 @@ export const ASSETS = {
     V_TOKEN: '0xE80761Ea617F66F96274eA5e8c37f03960ecC679',
     INTEREST_RATE_STRATEGY: '0xeE1BAc9355EaAfCD1B68d272d640d870bC9b4b5C',
     ORACLE: '0x338ed6787f463394D24813b297401B9F05a8C9d1',
-    STATA_TOKEN: '0x776F7111936fdE4305bF449f8b53FB54A1dfE7E2',
+    STATA_TOKEN: '0xae0Ca1B1Bc6cac26981B5e2b9c40f8Ce8A9082eE',
   },
   sUSD: {
     decimals: 18,
@@ -166,7 +166,7 @@ export const ASSETS = {
     V_TOKEN: '0x4a1c3aD6Ed28a636ee1751C69071f6be75DEb8B8',
     INTEREST_RATE_STRATEGY: '0xD61ca03Eac0352090f45bE50403F7B17d20E11F2',
     ORACLE: '0x7f99817d87baD03ea21E05112Ca799d715730efe',
-    STATA_TOKEN: '0x947B28080700a1452C1DAC33755e64749398eDEB',
+    STATA_TOKEN: '0x3A956E2Fcc7e71Ea14b0257d40BEbdB287d19652',
   },
   OP: {
     decimals: 18,
@@ -176,7 +176,7 @@ export const ASSETS = {
     V_TOKEN: '0x77CA01483f379E58174739308945f044e1a764dc',
     INTEREST_RATE_STRATEGY: '0xeE1BAc9355EaAfCD1B68d272d640d870bC9b4b5C',
     ORACLE: '0x0D276FC14719f9292D5C1eA2198673d1f4269246',
-    STATA_TOKEN: '0x1F636CcbC15c94f063B1Ee25B437c520caE10D00',
+    STATA_TOKEN: '0xd4F1Cf9A038269FE8F03745C2875591Ad6438ab1',
   },
   wstETH: {
     decimals: 18,
@@ -186,7 +186,7 @@ export const ASSETS = {
     V_TOKEN: '0x34e2eD44EF7466D5f9E0b782B5c08b57475e7907',
     INTEREST_RATE_STRATEGY: '0x6BA97468e2e6a3711a6DD05F0075d48E878c910e',
     ORACLE: '0x80f2c02224a2E548FC67c0bF705eBFA825dd5439',
-    STATA_TOKEN: '0x15674aE44Af19DD95C4aCfDf0b5e8246179734ae',
+    STATA_TOKEN: '0xb972abef80046A57409e37a7DF5dEf2638917516',
   },
   LUSD: {
     decimals: 18,
@@ -196,7 +196,7 @@ export const ASSETS = {
     V_TOKEN: '0xCE186F6Cccb0c955445bb9d10C59caE488Fea559',
     INTEREST_RATE_STRATEGY: '0x41365f2aC2D19c3B4Bc691007d314aba80af3669',
     ORACLE: '0x9dfc79Aaeb5bb0f96C6e9402671981CdFc424052',
-    STATA_TOKEN: '0x77F53cf28c4116CB80e4F387549c98A252890473',
+    STATA_TOKEN: '0x84648dc3Cefb601bc28a49A07a1A8Bad04D30Ad3',
   },
   MAI: {
     decimals: 18,
@@ -206,7 +206,7 @@ export const ASSETS = {
     V_TOKEN: '0xA8669021776Bc142DfcA87c21b4A52595bCbB40a',
     INTEREST_RATE_STRATEGY: '0x049E42fe40368384d04bC10f8494Ea6FD164442a',
     ORACLE: '0x73A3919a69eFCd5b19df8348c6740bB1446F5ed0',
-    STATA_TOKEN: '0x1aF3854efe7CDece0fb95Bb3a597d0438f9ABB70',
+    STATA_TOKEN: '0x60495bC8D8Baf7E866888ecC00491e37B47dfF24',
   },
   rETH: {
     decimals: 18,
@@ -216,6 +216,16 @@ export const ASSETS = {
     V_TOKEN: '0xf611aEb5013fD2c0511c9CD55c7dc5C1140741A6',
     INTEREST_RATE_STRATEGY: '0x3B57B081dA6Af5e2759A57bD3211932Cb6176997',
     ORACLE: '0x52d5F9f884CA21C27E2100735d793C6771eAB793',
+    STATA_TOKEN: '0xf9ce3c97b4b54F3D16861420f4816D9f68190B7B',
+  },
+  USDCn: {
+    decimals: 6,
+    UNDERLYING: '0x0b2C639c533813f4Aa9D7837CAf62653d097Ff85',
+    A_TOKEN: '0x38d693cE1dF5AaDF7bC62595A37D667aD57922e5',
+    S_TOKEN: '0x8a9FdE6925a839F6B1932d16B36aC026F8d3FbdB',
+    V_TOKEN: '0x5D557B07776D12967914379C71a1310e917C7555',
+    INTEREST_RATE_STRATEGY: '0x5eE947d920643cCd3e2c54eAAd8F260FC8Add3b4',
+    ORACLE: '0x16a9FA2FDa030272Ce99B29CF780dFA30361E0f3',
     STATA_TOKEN: '0x0000000000000000000000000000000000000000',
   },
 } as const;
diff --git a/src/ts/AaveV3Polygon.ts b/src/ts/AaveV3Polygon.ts
index 8b686384..29b4e629 100644
--- a/src/ts/AaveV3Polygon.ts
+++ b/src/ts/AaveV3Polygon.ts
@@ -62,8 +62,8 @@ export const RATES_FACTORY = '0xcC47c4Fe1F7f29ff31A8b62197023aC8553C7896';
 // https://polygonscan.com/address/0xE3090207A2de94A856EA10a7e1Bd36dD6145712B
 export const REPAY_WITH_COLLATERAL_ADAPTER = '0xE3090207A2de94A856EA10a7e1Bd36dD6145712B';
 
-// https://polygonscan.com/address/0x2B218C73f63820CE86655d16A79C333E24fEB0BE
-export const STATIC_A_TOKEN_FACTORY = '0x2B218C73f63820CE86655d16A79C333E24fEB0BE';
+// https://polygonscan.com/address/0x397202AB0b4E7C954ac0c493c00749C517210953
+export const STATIC_A_TOKEN_FACTORY = '0x397202AB0b4E7C954ac0c493c00749C517210953';
 
 // https://polygonscan.com/address/0xC4aff49fCeD8ac1D818a6DCAB063f9f97E66ec5E
 export const SWAP_COLLATERAL_ADAPTER = '0xC4aff49fCeD8ac1D818a6DCAB063f9f97E66ec5E';
@@ -93,7 +93,7 @@ export const ASSETS = {
     V_TOKEN: '0x8619d80FB0141ba7F184CbF22fd724116D9f7ffC',
     INTEREST_RATE_STRATEGY: '0xdef8F50155A6cf21181E29E400E8CffAE2d50968',
     ORACLE: '0x4746DeC9e833A82EC7C2C1356372CcF2cfcD2F3D',
-    STATA_TOKEN: '0xfCF5d4B313E06Bb3628EB4Fe73320E94039DC4b7',
+    STATA_TOKEN: '0x83c59636e602787A6EEbBdA2915217B416193FcB',
   },
   LINK: {
     decimals: 18,
@@ -103,7 +103,7 @@ export const ASSETS = {
     V_TOKEN: '0x953A573793604aF8d41F306FEb8274190dB4aE0e',
     INTEREST_RATE_STRATEGY: '0x03733F4E008d36f2e37F0080fF1c8DF756622E6F',
     ORACLE: '0xd9FFdb71EbE7496cC440152d43986Aae0AB76665',
-    STATA_TOKEN: '0x42427C988195f46E61d8eb57475Db3c369677A11',
+    STATA_TOKEN: '0x37868a45c6741616F9E5a189dC0481AD70056B6a',
   },
   USDC: {
     decimals: 6,
@@ -113,7 +113,7 @@ export const ASSETS = {
     V_TOKEN: '0xFCCf3cAbbe80101232d343252614b6A3eE81C989',
     INTEREST_RATE_STRATEGY: '0x9a158802cD924747EF336cA3F9DE3bdb60Cf43D3',
     ORACLE: '0xfE4A8cc5b5B2366C1B58Bea3858e81843581b2F7',
-    STATA_TOKEN: '0xc04296Aa4534F5A3BaB2d948705bc89317b2f1ed',
+    STATA_TOKEN: '0x1017F4a86Fc3A3c824346d0b8C5e96A5029bDAf9',
   },
   WBTC: {
     decimals: 8,
@@ -123,7 +123,7 @@ export const ASSETS = {
     V_TOKEN: '0x92b42c66840C7AD907b4BF74879FF3eF7c529473',
     INTEREST_RATE_STRATEGY: '0x07Fa3744FeC271F80c2EA97679823F65c13CCDf4',
     ORACLE: '0xc907E116054Ad103354f2D350FD2514433D57F6f',
-    STATA_TOKEN: '0x377660669108baCe49B5E6D8d3544C7a280c8d17',
+    STATA_TOKEN: '0xbC0f50CCB8514Aa7dFEB297521c4BdEBc9C7d22d',
   },
   WETH: {
     decimals: 18,
@@ -133,7 +133,7 @@ export const ASSETS = {
     V_TOKEN: '0x0c84331e39d6658Cd6e6b9ba04736cC4c4734351',
     INTEREST_RATE_STRATEGY: '0xf6733B9842883BFE0e0a940eA2F572676af31bde',
     ORACLE: '0xF9680D99D6C9589e2a93a78A04A279e509205945',
-    STATA_TOKEN: '0xd08B78B11Df105D2861568959FCa28e30c91Cf68',
+    STATA_TOKEN: '0xb3D5Af0A52a35692D3FcbE37669b3B8C31dddE7D',
   },
   USDT: {
     decimals: 6,
@@ -143,7 +143,7 @@ export const ASSETS = {
     V_TOKEN: '0xfb00AC187a8Eb5AFAE4eACE434F493Eb62672df7',
     INTEREST_RATE_STRATEGY: '0xdef8F50155A6cf21181E29E400E8CffAE2d50968',
     ORACLE: '0x0A6513e40db6EB1b165753AD52E80663aeA50545',
-    STATA_TOKEN: '0x31F5aC91804A4c0B54C0243789DF5208993235a1',
+    STATA_TOKEN: '0x87A1fdc4C726c459f597282be639a045062c0E46',
   },
   AAVE: {
     decimals: 18,
@@ -153,7 +153,7 @@ export const ASSETS = {
     V_TOKEN: '0xE80761Ea617F66F96274eA5e8c37f03960ecC679',
     INTEREST_RATE_STRATEGY: '0x03733F4E008d36f2e37F0080fF1c8DF756622E6F',
     ORACLE: '0x72484B12719E23115761D5DA1646945632979bB6',
-    STATA_TOKEN: '0xC83d8847f4A126d18013B5087cAE0b947BAdd17A',
+    STATA_TOKEN: '0xCA2E1E33E5BCF4978E2d683656E1f5610f8C4A7E',
   },
   WMATIC: {
     decimals: 18,
@@ -163,7 +163,7 @@ export const ASSETS = {
     V_TOKEN: '0x4a1c3aD6Ed28a636ee1751C69071f6be75DEb8B8',
     INTEREST_RATE_STRATEGY: '0xD87974E8ED49AB16d5053ba793F4e17078Be0426',
     ORACLE: '0xAB594600376Ec9fD91F8e885dADF0CE036862dE0',
-    STATA_TOKEN: '0x6f3913333F2D4b7B01D17BedbCe1E4c758b94465',
+    STATA_TOKEN: '0x98254592408E389D1dd2dBa318656C2C5c305b4E',
   },
   CRV: {
     decimals: 18,
@@ -173,7 +173,7 @@ export const ASSETS = {
     V_TOKEN: '0x77CA01483f379E58174739308945f044e1a764dc',
     INTEREST_RATE_STRATEGY: '0xBefcd01681224555b74eAC87207eaF9Bc3361F59',
     ORACLE: '0x336584C8E6Dc19637A5b36206B1c79923111b405',
-    STATA_TOKEN: '0x2EcDA7d4aB13e8A2C182D1C8f0a4Cc1C6109f2C9',
+    STATA_TOKEN: '0x4356941463eD4d75381AC23C9EF799B5d7C52AD8',
   },
   SUSHI: {
     decimals: 18,
@@ -183,7 +183,7 @@ export const ASSETS = {
     V_TOKEN: '0x34e2eD44EF7466D5f9E0b782B5c08b57475e7907',
     INTEREST_RATE_STRATEGY: '0x03733F4E008d36f2e37F0080fF1c8DF756622E6F',
     ORACLE: '0x49B0c695039243BBfEb8EcD054EB70061fd54aa0',
-    STATA_TOKEN: '0x1988e5660736B0bBF6D4125DE20297768EA40496',
+    STATA_TOKEN: '0xe3eDe71d32240b7EC355F0e5DD1131BBe029F934',
   },
   GHST: {
     decimals: 18,
@@ -193,7 +193,7 @@ export const ASSETS = {
     V_TOKEN: '0xCE186F6Cccb0c955445bb9d10C59caE488Fea559',
     INTEREST_RATE_STRATEGY: '0x03733F4E008d36f2e37F0080fF1c8DF756622E6F',
     ORACLE: '0xDD229Ce42f11D8Ee7fFf29bDB71C7b81352e11be',
-    STATA_TOKEN: '0x0593dCFFA078706aaFFEf5aF7B6954A707534Fd7',
+    STATA_TOKEN: '0x123319636A6a9c85D9959399304F4cB23F64327e',
   },
   BAL: {
     decimals: 18,
@@ -203,7 +203,7 @@ export const ASSETS = {
     V_TOKEN: '0xA8669021776Bc142DfcA87c21b4A52595bCbB40a',
     INTEREST_RATE_STRATEGY: '0xCbDC7D7984D7AD59434f0B1999D2006898C40f9A',
     ORACLE: '0xD106B538F2A868c28Ca1Ec7E298C3325E0251d66',
-    STATA_TOKEN: '0x6208795EEc3749860574743cF76d200F10363bf7',
+    STATA_TOKEN: '0x1a8969FD39AbaF228e690B172C4C3Eb7c67F95E1',
   },
   DPI: {
     decimals: 18,
@@ -213,7 +213,7 @@ export const ASSETS = {
     V_TOKEN: '0xf611aEb5013fD2c0511c9CD55c7dc5C1140741A6',
     INTEREST_RATE_STRATEGY: '0xd9d85499449f26d2A2c240defd75314f23920089',
     ORACLE: '0x2e48b7924FBe04d575BA229A59b64547d9da16e9',
-    STATA_TOKEN: '0x53E4d0e0923536c3664e7eFaf22d59ed579f7B1e',
+    STATA_TOKEN: '0x73B788ACA5f4F0EeB3c6Da453cDf31041a77b36D',
   },
   EURS: {
     decimals: 2,
@@ -223,7 +223,7 @@ export const ASSETS = {
     V_TOKEN: '0x5D557B07776D12967914379C71a1310e917C7555',
     INTEREST_RATE_STRATEGY: '0x8F183Ee74C790CB558232a141099b316D6C8Ba6E',
     ORACLE: '0x73366Fe0AA0Ded304479862808e02506FE556a98',
-    STATA_TOKEN: '0x171CAC3d7ffa2ac76901699C5633cc3449aD85a7',
+    STATA_TOKEN: '0x02E26888Ed3240BB38f26A2adF96Af9B52b167ea',
   },
   jEUR: {
     decimals: 18,
@@ -233,7 +233,7 @@ export const ASSETS = {
     V_TOKEN: '0x44705f578135cC5d703b4c9c122528C73Eb87145',
     INTEREST_RATE_STRATEGY: '0x41B66b4b6b4c9dab039d96528D1b88f7BAF8C5A4',
     ORACLE: '0x73366Fe0AA0Ded304479862808e02506FE556a98',
-    STATA_TOKEN: '0x38274b3FFe236e12C4578d209b8ee52be970dF07',
+    STATA_TOKEN: '0xD992DaC78Ef3F34614E6a7d325b7b6A320FC0AB5',
   },
   agEUR: {
     decimals: 18,
@@ -243,7 +243,7 @@ export const ASSETS = {
     V_TOKEN: '0x3ca5FA07689F266e907439aFd1fBB59c44fe12f6',
     INTEREST_RATE_STRATEGY: '0xA9F3C3caE095527061e6d270DBE163693e6fda9D',
     ORACLE: '0x73366Fe0AA0Ded304479862808e02506FE556a98',
-    STATA_TOKEN: '0x159474a62Bb53c984c9165a7439da5f28473EbA0',
+    STATA_TOKEN: '0xd3eb8796Ed36f58E03B7b4b5AD417FA74931d2c4',
   },
   miMATIC: {
     decimals: 18,
@@ -253,7 +253,7 @@ export const ASSETS = {
     V_TOKEN: '0x18248226C16BF76c032817854E7C83a2113B4f06',
     INTEREST_RATE_STRATEGY: '0xA901Bf68Bebde17ba382e499C3e9EbAe649DF276',
     ORACLE: '0xd8d483d813547CfB624b8Dc33a00F2fcbCd2D428',
-    STATA_TOKEN: '0x12C4dC692B0f73d96BF3F8961475937b74E681E9',
+    STATA_TOKEN: '0x8486B49433cCed038b51d18Ae3772CDB7E31CA5e',
   },
   stMATIC: {
     decimals: 18,
@@ -263,7 +263,7 @@ export const ASSETS = {
     V_TOKEN: '0x6b030Ff3FB9956B1B69f475B77aE0d3Cf2CC5aFa',
     INTEREST_RATE_STRATEGY: '0x03733F4E008d36f2e37F0080fF1c8DF756622E6F',
     ORACLE: '0xEe96b77129cF54581B5a8FECCcC50A6A067034a1',
-    STATA_TOKEN: '0xc5F7D7A92D28aC4a9e6d064fBDCfC295FB90e50A',
+    STATA_TOKEN: '0x867A180B7060fDC27610dC9096E93534F638A315',
   },
   MaticX: {
     decimals: 18,
@@ -273,7 +273,7 @@ export const ASSETS = {
     V_TOKEN: '0xB5b46F918C2923fC7f26DB76e8a6A6e9C4347Cf9',
     INTEREST_RATE_STRATEGY: '0x6B434652E4C4e3e972f9F267982F05ae0fcc24b6',
     ORACLE: '0x0e1120524e14Bd7aD96Ea76A1b1dD699913e2a45',
-    STATA_TOKEN: '0x867AEeA14Dfd6b9F60d348fe3a2B1B1e956a4bf6',
+    STATA_TOKEN: '0xbcDd5709641Af4BE99b1470A2B3A5203539132Ec',
   },
   wstETH: {
     decimals: 18,
@@ -283,7 +283,7 @@ export const ASSETS = {
     V_TOKEN: '0x77fA66882a8854d883101Fb8501BD3CaD347Fc32',
     INTEREST_RATE_STRATEGY: '0xA6459195d60A797D278f58Ffbd2BA62Fb3F7FA1E',
     ORACLE: '0xe34949A48cd2E6f5CD41753e449bd2d43993C9AC',
-    STATA_TOKEN: '0x89Bd338fa8886bC16C7bBbBD30220c03dBE358A7',
+    STATA_TOKEN: '0x5274453F4CD5dD7280011a1Cca3B9e1b78EC59A6',
   },
 } as const;
 export const E_MODES = {
diff --git a/src/ts/AaveV3Sepolia.ts b/src/ts/AaveV3Sepolia.ts
index ae45fec7..bf87e829 100644
--- a/src/ts/AaveV3Sepolia.ts
+++ b/src/ts/AaveV3Sepolia.ts
@@ -56,6 +56,9 @@ export const WALLET_BALANCE_PROVIDER = '0xCD4e0d6D2b1252E2A709B8aE97DBA31164C5a7
 // https://sepolia.etherscan.io/address/0x387d311e47e80b498169e6fb51d3193167d89F7D
 export const WETH_GATEWAY = '0x387d311e47e80b498169e6fb51d3193167d89F7D';
 
+// https://sepolia.etherscan.io/address/0xd210dFB43B694430B8d31762B5199e30c31266C8
+export const STATIC_A_TOKEN_FACTORY = '0xd210dFB43B694430B8d31762B5199e30c31266C8';
+
 export const CHAIN_ID = 11155111;
 export const ASSETS = {
   DAI: {
@@ -66,6 +69,7 @@ export const ASSETS = {
     V_TOKEN: '0x22675C506A8FC26447aFFfa33640f6af5d4D4cF0',
     INTEREST_RATE_STRATEGY: '0xA813CC4d67821fbAcF24659e414A1Cf6c551373c',
     ORACLE: '0x9aF11c35c5d3Ae182C0050438972aac4376f9516',
+    STATA_TOKEN: '0xDE46e43F46ff74A23a65EBb0580cbe3dFE684a17',
   },
   LINK: {
     decimals: 18,
@@ -75,6 +79,7 @@ export const ASSETS = {
     V_TOKEN: '0x34a4d932E722b9dFb492B9D8131127690CE2430B',
     INTEREST_RATE_STRATEGY: '0xCA30c502d52F905FB3D04eE60cA48F5A1A89f8dB',
     ORACLE: '0x14fC51b7df22b4D393cD45504B9f0A3002A63F3F',
+    STATA_TOKEN: '0x8227a989709a757f25dF251C3C3e71CA38627836',
   },
   USDC: {
     decimals: 6,
@@ -84,6 +89,7 @@ export const ASSETS = {
     V_TOKEN: '0x36B5dE936eF1710E1d22EabE5231b28581a92ECc',
     INTEREST_RATE_STRATEGY: '0x5CB1008969a2d5FAcE8eF32732e6A306d0D0EF2A',
     ORACLE: '0x98458D6A99489F15e6eB5aFa67ACFAcf6F211051',
+    STATA_TOKEN: '0x8A88124522dbBF1E56352ba3DE1d9F78C143751e',
   },
   WBTC: {
     decimals: 8,
@@ -93,6 +99,7 @@ export const ASSETS = {
     V_TOKEN: '0xEB016dFd303F19fbDdFb6300eB4AeB2DA7Ceac37',
     INTEREST_RATE_STRATEGY: '0xCA30c502d52F905FB3D04eE60cA48F5A1A89f8dB',
     ORACLE: '0x784B90bA1E9a8cf3C9939c2e072F058B024C4b8a',
+    STATA_TOKEN: '0x131a121bda71ED810bCAf2aC9079214925e59C18',
   },
   WETH: {
     decimals: 18,
@@ -102,6 +109,7 @@ export const ASSETS = {
     V_TOKEN: '0x22a35DB253f4F6D0029025D6312A3BdAb20C2c6A',
     INTEREST_RATE_STRATEGY: '0xCA30c502d52F905FB3D04eE60cA48F5A1A89f8dB',
     ORACLE: '0xDde0E8E6d3653614878Bf5009EDC317BC129fE2F',
+    STATA_TOKEN: '0x162B500569F42D9eCe937e6a61EDfef660A12E98',
   },
   USDT: {
     decimals: 6,
@@ -111,6 +119,7 @@ export const ASSETS = {
     V_TOKEN: '0x9844386d29EEd970B9F6a2B9a676083b0478210e',
     INTEREST_RATE_STRATEGY: '0x5CB1008969a2d5FAcE8eF32732e6A306d0D0EF2A',
     ORACLE: '0x4e86D3Aa271Fa418F38D7262fdBa2989C94aa5Ba',
+    STATA_TOKEN: '0x978206fAe13faF5a8d293FB614326B237684B750',
   },
   AAVE: {
     decimals: 18,
@@ -120,6 +129,7 @@ export const ASSETS = {
     V_TOKEN: '0xf12fdFc4c631F6D361b48723c2F2800b84B519e6',
     INTEREST_RATE_STRATEGY: '0xCA30c502d52F905FB3D04eE60cA48F5A1A89f8dB',
     ORACLE: '0xda678Ef100c13504edDb8a228A1e8e4CB139f189',
+    STATA_TOKEN: '0x56771cEF0cb422e125564CcCC98BB05fdc718E77',
   },
   EURS: {
     decimals: 2,
@@ -129,6 +139,7 @@ export const ASSETS = {
     V_TOKEN: '0x94482C7A7477196259D8a0f74fB853277Fa5a75b',
     INTEREST_RATE_STRATEGY: '0x5CB1008969a2d5FAcE8eF32732e6A306d0D0EF2A',
     ORACLE: '0xCbE15C1f40f1D7eE1De3756D1557d5Fdc2A50bBD',
+    STATA_TOKEN: '0x72B49a461900e11632C95dfa563e7173438D4e3E',
   },
 } as const;
 export const E_MODES = {
diff --git a/src/ts/MiscMumbai.ts b/src/ts/MiscMumbai.ts
new file mode 100644
index 00000000..e09217cb
--- /dev/null
+++ b/src/ts/MiscMumbai.ts
@@ -0,0 +1,6 @@
+// AUTOGENERATED - MANUALLY CHANGES WILL BE REVERTED BY THE GENERATOR
+// https://mumbai.polygonscan.com/address/0x49A726CC7B438dBc4fB89a9548B5E8691e1C35A6
+export const TRANSPARENT_PROXY_FACTORY = '0x49A726CC7B438dBc4fB89a9548B5E8691e1C35A6';
+
+// https://mumbai.polygonscan.com/address/0xaebfFE29D8E823e8E43695648F418fa8c30AF879
+export const PROXY_ADMIN = '0xaebfFE29D8E823e8E43695648F418fa8c30AF879';
diff --git a/src/ts/MiscSepolia.ts b/src/ts/MiscSepolia.ts
new file mode 100644
index 00000000..351a2d4d
--- /dev/null
+++ b/src/ts/MiscSepolia.ts
@@ -0,0 +1,6 @@
+// AUTOGENERATED - MANUALLY CHANGES WILL BE REVERTED BY THE GENERATOR
+// https://sepolia.etherscan.io/address/0x3Bad08c7b17D77cE12A2e1438Db2353b58F7c4a2
+export const TRANSPARENT_PROXY_FACTORY = '0x3Bad08c7b17D77cE12A2e1438Db2353b58F7c4a2';
+
+// https://sepolia.etherscan.io/address/0x8dDa7a1E3e96EB13BE50bB59e80485227E3DE2e7
+export const PROXY_ADMIN = '0x8dDa7a1E3e96EB13BE50bB59e80485227E3DE2e7';
diff --git a/src/ts/abis/AggregatorInterface.ts b/src/ts/abis/AggregatorInterface.ts
index 323d942a..3b06fdf1 100644
--- a/src/ts/abis/AggregatorInterface.ts
+++ b/src/ts/abis/AggregatorInterface.ts
@@ -1,130 +1,130 @@
 // AUTOGENERATED - MANUALLY CHANGES WILL BE REVERTED BY THE GENERATOR
 export const AggregatorInterface_ABI = [
   {
-    anonymous: false,
+    type: 'function',
+    name: 'getAnswer',
     inputs: [
       {
-        indexed: true,
-        internalType: 'int256',
-        name: 'current',
-        type: 'int256',
-      },
-      {
-        indexed: true,
-        internalType: 'uint256',
         name: 'roundId',
         type: 'uint256',
+        internalType: 'uint256',
       },
+    ],
+    outputs: [
       {
-        indexed: false,
-        internalType: 'uint256',
-        name: 'updatedAt',
-        type: 'uint256',
+        name: '',
+        type: 'int256',
+        internalType: 'int256',
       },
     ],
-    name: 'AnswerUpdated',
-    type: 'event',
+    stateMutability: 'view',
   },
   {
-    anonymous: false,
+    type: 'function',
+    name: 'getTimestamp',
     inputs: [
       {
-        indexed: true,
-        internalType: 'uint256',
         name: 'roundId',
         type: 'uint256',
-      },
-      {
-        indexed: true,
-        internalType: 'address',
-        name: 'startedBy',
-        type: 'address',
-      },
-      {
-        indexed: false,
         internalType: 'uint256',
-        name: 'startedAt',
-        type: 'uint256',
       },
     ],
-    name: 'NewRound',
-    type: 'event',
-  },
-  {
-    inputs: [
+    outputs: [
       {
-        internalType: 'uint256',
-        name: 'roundId',
+        name: '',
         type: 'uint256',
+        internalType: 'uint256',
       },
     ],
-    name: 'getAnswer',
+    stateMutability: 'view',
+  },
+  {
+    type: 'function',
+    name: 'latestAnswer',
+    inputs: [],
     outputs: [
       {
-        internalType: 'int256',
         name: '',
         type: 'int256',
+        internalType: 'int256',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
-    inputs: [
-      {
-        internalType: 'uint256',
-        name: 'roundId',
-        type: 'uint256',
-      },
-    ],
-    name: 'getTimestamp',
+    type: 'function',
+    name: 'latestRound',
+    inputs: [],
     outputs: [
       {
-        internalType: 'uint256',
         name: '',
         type: 'uint256',
+        internalType: 'uint256',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'latestTimestamp',
     inputs: [],
-    name: 'latestAnswer',
     outputs: [
       {
-        internalType: 'int256',
         name: '',
-        type: 'int256',
+        type: 'uint256',
+        internalType: 'uint256',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
-    inputs: [],
-    name: 'latestRound',
-    outputs: [
+    type: 'event',
+    name: 'AnswerUpdated',
+    inputs: [
+      {
+        name: 'current',
+        type: 'int256',
+        indexed: true,
+        internalType: 'int256',
+      },
       {
+        name: 'roundId',
+        type: 'uint256',
+        indexed: true,
         internalType: 'uint256',
-        name: '',
+      },
+      {
+        name: 'updatedAt',
         type: 'uint256',
+        indexed: false,
+        internalType: 'uint256',
       },
     ],
-    stateMutability: 'view',
-    type: 'function',
+    anonymous: false,
   },
   {
-    inputs: [],
-    name: 'latestTimestamp',
-    outputs: [
+    type: 'event',
+    name: 'NewRound',
+    inputs: [
       {
+        name: 'roundId',
+        type: 'uint256',
+        indexed: true,
         internalType: 'uint256',
-        name: '',
+      },
+      {
+        name: 'startedBy',
+        type: 'address',
+        indexed: true,
+        internalType: 'address',
+      },
+      {
+        name: 'startedAt',
         type: 'uint256',
+        indexed: false,
+        internalType: 'uint256',
       },
     ],
-    stateMutability: 'view',
-    type: 'function',
+    anonymous: false,
   },
 ] as const;
diff --git a/src/ts/abis/IAToken.ts b/src/ts/abis/IAToken.ts
index b23f53e9..2c5bb5c7 100644
--- a/src/ts/abis/IAToken.ts
+++ b/src/ts/abis/IAToken.ts
@@ -1,737 +1,737 @@
 // AUTOGENERATED - MANUALLY CHANGES WILL BE REVERTED BY THE GENERATOR
 export const IAToken_ABI = [
   {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: 'address',
-        name: 'owner',
-        type: 'address',
-      },
-      {
-        indexed: true,
-        internalType: 'address',
-        name: 'spender',
-        type: 'address',
-      },
-      {
-        indexed: false,
-        internalType: 'uint256',
-        name: 'value',
-        type: 'uint256',
-      },
-    ],
-    name: 'Approval',
-    type: 'event',
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: 'address',
-        name: 'from',
-        type: 'address',
-      },
-      {
-        indexed: true,
-        internalType: 'address',
-        name: 'to',
-        type: 'address',
-      },
-      {
-        indexed: false,
-        internalType: 'uint256',
-        name: 'value',
-        type: 'uint256',
-      },
-      {
-        indexed: false,
-        internalType: 'uint256',
-        name: 'index',
-        type: 'uint256',
-      },
-    ],
-    name: 'BalanceTransfer',
-    type: 'event',
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: 'address',
-        name: 'from',
-        type: 'address',
-      },
-      {
-        indexed: true,
-        internalType: 'address',
-        name: 'target',
-        type: 'address',
-      },
-      {
-        indexed: false,
-        internalType: 'uint256',
-        name: 'value',
-        type: 'uint256',
-      },
-      {
-        indexed: false,
-        internalType: 'uint256',
-        name: 'balanceIncrease',
-        type: 'uint256',
-      },
-      {
-        indexed: false,
-        internalType: 'uint256',
-        name: 'index',
-        type: 'uint256',
-      },
-    ],
-    name: 'Burn',
-    type: 'event',
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: 'address',
-        name: 'underlyingAsset',
-        type: 'address',
-      },
-      {
-        indexed: true,
-        internalType: 'address',
-        name: 'pool',
-        type: 'address',
-      },
-      {
-        indexed: false,
-        internalType: 'address',
-        name: 'treasury',
-        type: 'address',
-      },
-      {
-        indexed: false,
-        internalType: 'address',
-        name: 'incentivesController',
-        type: 'address',
-      },
-      {
-        indexed: false,
-        internalType: 'uint8',
-        name: 'aTokenDecimals',
-        type: 'uint8',
-      },
-      {
-        indexed: false,
-        internalType: 'string',
-        name: 'aTokenName',
-        type: 'string',
-      },
-      {
-        indexed: false,
-        internalType: 'string',
-        name: 'aTokenSymbol',
-        type: 'string',
-      },
-      {
-        indexed: false,
-        internalType: 'bytes',
-        name: 'params',
-        type: 'bytes',
-      },
-    ],
-    name: 'Initialized',
-    type: 'event',
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: 'address',
-        name: 'caller',
-        type: 'address',
-      },
-      {
-        indexed: true,
-        internalType: 'address',
-        name: 'onBehalfOf',
-        type: 'address',
-      },
-      {
-        indexed: false,
-        internalType: 'uint256',
-        name: 'value',
-        type: 'uint256',
-      },
-      {
-        indexed: false,
-        internalType: 'uint256',
-        name: 'balanceIncrease',
-        type: 'uint256',
-      },
-      {
-        indexed: false,
-        internalType: 'uint256',
-        name: 'index',
-        type: 'uint256',
-      },
-    ],
-    name: 'Mint',
-    type: 'event',
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: 'address',
-        name: 'from',
-        type: 'address',
-      },
-      {
-        indexed: true,
-        internalType: 'address',
-        name: 'to',
-        type: 'address',
-      },
-      {
-        indexed: false,
-        internalType: 'uint256',
-        name: 'value',
-        type: 'uint256',
-      },
-    ],
-    name: 'Transfer',
-    type: 'event',
-  },
-  {
-    inputs: [],
+    type: 'function',
     name: 'DOMAIN_SEPARATOR',
+    inputs: [],
     outputs: [
       {
-        internalType: 'bytes32',
         name: '',
         type: 'bytes32',
+        internalType: 'bytes32',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
-    inputs: [],
+    type: 'function',
     name: 'RESERVE_TREASURY_ADDRESS',
+    inputs: [],
     outputs: [
       {
-        internalType: 'address',
         name: '',
         type: 'address',
+        internalType: 'address',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
-    inputs: [],
+    type: 'function',
     name: 'UNDERLYING_ASSET_ADDRESS',
+    inputs: [],
     outputs: [
       {
-        internalType: 'address',
         name: '',
         type: 'address',
+        internalType: 'address',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'allowance',
     inputs: [
       {
-        internalType: 'address',
         name: 'owner',
         type: 'address',
+        internalType: 'address',
       },
       {
-        internalType: 'address',
         name: 'spender',
         type: 'address',
+        internalType: 'address',
       },
     ],
-    name: 'allowance',
     outputs: [
       {
-        internalType: 'uint256',
         name: '',
         type: 'uint256',
+        internalType: 'uint256',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'approve',
     inputs: [
       {
-        internalType: 'address',
         name: 'spender',
         type: 'address',
+        internalType: 'address',
       },
       {
-        internalType: 'uint256',
         name: 'amount',
         type: 'uint256',
+        internalType: 'uint256',
       },
     ],
-    name: 'approve',
     outputs: [
       {
-        internalType: 'bool',
         name: '',
         type: 'bool',
+        internalType: 'bool',
       },
     ],
     stateMutability: 'nonpayable',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'balanceOf',
     inputs: [
       {
-        internalType: 'address',
         name: 'account',
         type: 'address',
+        internalType: 'address',
       },
     ],
-    name: 'balanceOf',
     outputs: [
       {
-        internalType: 'uint256',
         name: '',
         type: 'uint256',
+        internalType: 'uint256',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'burn',
     inputs: [
       {
-        internalType: 'address',
         name: 'from',
         type: 'address',
+        internalType: 'address',
       },
       {
-        internalType: 'address',
         name: 'receiverOfUnderlying',
         type: 'address',
+        internalType: 'address',
       },
       {
-        internalType: 'uint256',
         name: 'amount',
         type: 'uint256',
+        internalType: 'uint256',
       },
       {
-        internalType: 'uint256',
         name: 'index',
         type: 'uint256',
+        internalType: 'uint256',
       },
     ],
-    name: 'burn',
     outputs: [],
     stateMutability: 'nonpayable',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'getPreviousIndex',
     inputs: [
       {
-        internalType: 'address',
         name: 'user',
         type: 'address',
+        internalType: 'address',
       },
     ],
-    name: 'getPreviousIndex',
     outputs: [
       {
-        internalType: 'uint256',
         name: '',
         type: 'uint256',
+        internalType: 'uint256',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'getScaledUserBalanceAndSupply',
     inputs: [
       {
-        internalType: 'address',
         name: 'user',
         type: 'address',
+        internalType: 'address',
       },
     ],
-    name: 'getScaledUserBalanceAndSupply',
     outputs: [
       {
-        internalType: 'uint256',
         name: '',
         type: 'uint256',
+        internalType: 'uint256',
       },
       {
-        internalType: 'uint256',
         name: '',
         type: 'uint256',
+        internalType: 'uint256',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'handleRepayment',
     inputs: [
       {
-        internalType: 'address',
         name: 'user',
         type: 'address',
+        internalType: 'address',
       },
       {
-        internalType: 'address',
         name: 'onBehalfOf',
         type: 'address',
+        internalType: 'address',
       },
       {
-        internalType: 'uint256',
         name: 'amount',
         type: 'uint256',
+        internalType: 'uint256',
       },
     ],
-    name: 'handleRepayment',
     outputs: [],
     stateMutability: 'nonpayable',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'initialize',
     inputs: [
       {
-        internalType: 'contract IPool',
         name: 'pool',
         type: 'address',
+        internalType: 'contract IPool',
       },
       {
-        internalType: 'address',
         name: 'treasury',
         type: 'address',
+        internalType: 'address',
       },
       {
-        internalType: 'address',
         name: 'underlyingAsset',
         type: 'address',
+        internalType: 'address',
       },
       {
-        internalType: 'contract IAaveIncentivesController',
         name: 'incentivesController',
         type: 'address',
+        internalType: 'contract IAaveIncentivesController',
       },
       {
-        internalType: 'uint8',
         name: 'aTokenDecimals',
         type: 'uint8',
+        internalType: 'uint8',
       },
       {
-        internalType: 'string',
         name: 'aTokenName',
         type: 'string',
+        internalType: 'string',
       },
       {
-        internalType: 'string',
         name: 'aTokenSymbol',
         type: 'string',
+        internalType: 'string',
       },
       {
-        internalType: 'bytes',
         name: 'params',
         type: 'bytes',
+        internalType: 'bytes',
       },
     ],
-    name: 'initialize',
     outputs: [],
     stateMutability: 'nonpayable',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'mint',
     inputs: [
       {
-        internalType: 'address',
         name: 'caller',
         type: 'address',
+        internalType: 'address',
       },
       {
-        internalType: 'address',
         name: 'onBehalfOf',
         type: 'address',
+        internalType: 'address',
       },
       {
-        internalType: 'uint256',
         name: 'amount',
         type: 'uint256',
+        internalType: 'uint256',
       },
       {
-        internalType: 'uint256',
         name: 'index',
         type: 'uint256',
+        internalType: 'uint256',
       },
     ],
-    name: 'mint',
     outputs: [
       {
-        internalType: 'bool',
         name: '',
         type: 'bool',
+        internalType: 'bool',
       },
     ],
     stateMutability: 'nonpayable',
+  },
+  {
     type: 'function',
+    name: 'mintToTreasury',
+    inputs: [
+      {
+        name: 'amount',
+        type: 'uint256',
+        internalType: 'uint256',
+      },
+      {
+        name: 'index',
+        type: 'uint256',
+        internalType: 'uint256',
+      },
+    ],
+    outputs: [],
+    stateMutability: 'nonpayable',
   },
   {
+    type: 'function',
+    name: 'nonces',
     inputs: [
       {
+        name: 'owner',
+        type: 'address',
+        internalType: 'address',
+      },
+    ],
+    outputs: [
+      {
+        name: '',
+        type: 'uint256',
         internalType: 'uint256',
-        name: 'amount',
+      },
+    ],
+    stateMutability: 'view',
+  },
+  {
+    type: 'function',
+    name: 'permit',
+    inputs: [
+      {
+        name: 'owner',
+        type: 'address',
+        internalType: 'address',
+      },
+      {
+        name: 'spender',
+        type: 'address',
+        internalType: 'address',
+      },
+      {
+        name: 'value',
         type: 'uint256',
+        internalType: 'uint256',
       },
       {
+        name: 'deadline',
+        type: 'uint256',
         internalType: 'uint256',
-        name: 'index',
+      },
+      {
+        name: 'v',
+        type: 'uint8',
+        internalType: 'uint8',
+      },
+      {
+        name: 'r',
+        type: 'bytes32',
+        internalType: 'bytes32',
+      },
+      {
+        name: 's',
+        type: 'bytes32',
+        internalType: 'bytes32',
+      },
+    ],
+    outputs: [],
+    stateMutability: 'nonpayable',
+  },
+  {
+    type: 'function',
+    name: 'rescueTokens',
+    inputs: [
+      {
+        name: 'token',
+        type: 'address',
+        internalType: 'address',
+      },
+      {
+        name: 'to',
+        type: 'address',
+        internalType: 'address',
+      },
+      {
+        name: 'amount',
         type: 'uint256',
+        internalType: 'uint256',
       },
     ],
-    name: 'mintToTreasury',
     outputs: [],
     stateMutability: 'nonpayable',
+  },
+  {
+    type: 'function',
+    name: 'scaledBalanceOf',
+    inputs: [
+      {
+        name: 'user',
+        type: 'address',
+        internalType: 'address',
+      },
+    ],
+    outputs: [
+      {
+        name: '',
+        type: 'uint256',
+        internalType: 'uint256',
+      },
+    ],
+    stateMutability: 'view',
+  },
+  {
+    type: 'function',
+    name: 'scaledTotalSupply',
+    inputs: [],
+    outputs: [
+      {
+        name: '',
+        type: 'uint256',
+        internalType: 'uint256',
+      },
+    ],
+    stateMutability: 'view',
+  },
+  {
+    type: 'function',
+    name: 'totalSupply',
+    inputs: [],
+    outputs: [
+      {
+        name: '',
+        type: 'uint256',
+        internalType: 'uint256',
+      },
+    ],
+    stateMutability: 'view',
+  },
+  {
     type: 'function',
+    name: 'transfer',
+    inputs: [
+      {
+        name: 'recipient',
+        type: 'address',
+        internalType: 'address',
+      },
+      {
+        name: 'amount',
+        type: 'uint256',
+        internalType: 'uint256',
+      },
+    ],
+    outputs: [
+      {
+        name: '',
+        type: 'bool',
+        internalType: 'bool',
+      },
+    ],
+    stateMutability: 'nonpayable',
   },
   {
+    type: 'function',
+    name: 'transferFrom',
     inputs: [
       {
+        name: 'sender',
+        type: 'address',
         internalType: 'address',
-        name: 'owner',
+      },
+      {
+        name: 'recipient',
         type: 'address',
+        internalType: 'address',
+      },
+      {
+        name: 'amount',
+        type: 'uint256',
+        internalType: 'uint256',
       },
     ],
-    name: 'nonces',
     outputs: [
       {
-        internalType: 'uint256',
         name: '',
-        type: 'uint256',
+        type: 'bool',
+        internalType: 'bool',
       },
     ],
-    stateMutability: 'view',
-    type: 'function',
+    stateMutability: 'nonpayable',
   },
   {
+    type: 'function',
+    name: 'transferOnLiquidation',
     inputs: [
       {
-        internalType: 'address',
-        name: 'owner',
+        name: 'from',
         type: 'address',
+        internalType: 'address',
       },
       {
-        internalType: 'address',
-        name: 'spender',
+        name: 'to',
         type: 'address',
+        internalType: 'address',
       },
       {
-        internalType: 'uint256',
         name: 'value',
         type: 'uint256',
-      },
-      {
         internalType: 'uint256',
-        name: 'deadline',
-        type: 'uint256',
-      },
-      {
-        internalType: 'uint8',
-        name: 'v',
-        type: 'uint8',
-      },
-      {
-        internalType: 'bytes32',
-        name: 'r',
-        type: 'bytes32',
-      },
-      {
-        internalType: 'bytes32',
-        name: 's',
-        type: 'bytes32',
       },
     ],
-    name: 'permit',
     outputs: [],
     stateMutability: 'nonpayable',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'transferUnderlyingTo',
     inputs: [
       {
-        internalType: 'address',
-        name: 'token',
+        name: 'target',
         type: 'address',
-      },
-      {
         internalType: 'address',
-        name: 'to',
-        type: 'address',
       },
       {
-        internalType: 'uint256',
         name: 'amount',
         type: 'uint256',
+        internalType: 'uint256',
       },
     ],
-    name: 'rescueTokens',
     outputs: [],
     stateMutability: 'nonpayable',
-    type: 'function',
   },
   {
+    type: 'event',
+    name: 'Approval',
     inputs: [
       {
+        name: 'owner',
+        type: 'address',
+        indexed: true,
         internalType: 'address',
-        name: 'user',
+      },
+      {
+        name: 'spender',
         type: 'address',
+        indexed: true,
+        internalType: 'address',
       },
-    ],
-    name: 'scaledBalanceOf',
-    outputs: [
       {
-        internalType: 'uint256',
-        name: '',
+        name: 'value',
         type: 'uint256',
+        indexed: false,
+        internalType: 'uint256',
       },
     ],
-    stateMutability: 'view',
-    type: 'function',
+    anonymous: false,
   },
   {
-    inputs: [],
-    name: 'scaledTotalSupply',
-    outputs: [
+    type: 'event',
+    name: 'BalanceTransfer',
+    inputs: [
       {
-        internalType: 'uint256',
-        name: '',
-        type: 'uint256',
+        name: 'from',
+        type: 'address',
+        indexed: true,
+        internalType: 'address',
+      },
+      {
+        name: 'to',
+        type: 'address',
+        indexed: true,
+        internalType: 'address',
       },
-    ],
-    stateMutability: 'view',
-    type: 'function',
-  },
-  {
-    inputs: [],
-    name: 'totalSupply',
-    outputs: [
       {
+        name: 'value',
+        type: 'uint256',
+        indexed: false,
         internalType: 'uint256',
-        name: '',
+      },
+      {
+        name: 'index',
         type: 'uint256',
+        indexed: false,
+        internalType: 'uint256',
       },
     ],
-    stateMutability: 'view',
-    type: 'function',
+    anonymous: false,
   },
   {
+    type: 'event',
+    name: 'Burn',
     inputs: [
       {
+        name: 'from',
+        type: 'address',
+        indexed: true,
         internalType: 'address',
-        name: 'recipient',
+      },
+      {
+        name: 'target',
         type: 'address',
+        indexed: true,
+        internalType: 'address',
       },
       {
+        name: 'value',
+        type: 'uint256',
+        indexed: false,
         internalType: 'uint256',
-        name: 'amount',
+      },
+      {
+        name: 'balanceIncrease',
         type: 'uint256',
+        indexed: false,
+        internalType: 'uint256',
       },
-    ],
-    name: 'transfer',
-    outputs: [
       {
-        internalType: 'bool',
-        name: '',
-        type: 'bool',
+        name: 'index',
+        type: 'uint256',
+        indexed: false,
+        internalType: 'uint256',
       },
     ],
-    stateMutability: 'nonpayable',
-    type: 'function',
+    anonymous: false,
   },
   {
+    type: 'event',
+    name: 'Initialized',
     inputs: [
       {
+        name: 'underlyingAsset',
+        type: 'address',
+        indexed: true,
         internalType: 'address',
-        name: 'sender',
+      },
+      {
+        name: 'pool',
         type: 'address',
+        indexed: true,
+        internalType: 'address',
       },
       {
+        name: 'treasury',
+        type: 'address',
+        indexed: false,
         internalType: 'address',
-        name: 'recipient',
+      },
+      {
+        name: 'incentivesController',
         type: 'address',
+        indexed: false,
+        internalType: 'address',
       },
       {
-        internalType: 'uint256',
-        name: 'amount',
-        type: 'uint256',
+        name: 'aTokenDecimals',
+        type: 'uint8',
+        indexed: false,
+        internalType: 'uint8',
       },
-    ],
-    name: 'transferFrom',
-    outputs: [
       {
-        internalType: 'bool',
-        name: '',
-        type: 'bool',
+        name: 'aTokenName',
+        type: 'string',
+        indexed: false,
+        internalType: 'string',
+      },
+      {
+        name: 'aTokenSymbol',
+        type: 'string',
+        indexed: false,
+        internalType: 'string',
+      },
+      {
+        name: 'params',
+        type: 'bytes',
+        indexed: false,
+        internalType: 'bytes',
       },
     ],
-    stateMutability: 'nonpayable',
-    type: 'function',
+    anonymous: false,
   },
   {
+    type: 'event',
+    name: 'Mint',
     inputs: [
       {
-        internalType: 'address',
-        name: 'from',
+        name: 'caller',
         type: 'address',
+        indexed: true,
+        internalType: 'address',
       },
       {
-        internalType: 'address',
-        name: 'to',
+        name: 'onBehalfOf',
         type: 'address',
+        indexed: true,
+        internalType: 'address',
       },
       {
-        internalType: 'uint256',
         name: 'value',
         type: 'uint256',
+        indexed: false,
+        internalType: 'uint256',
+      },
+      {
+        name: 'balanceIncrease',
+        type: 'uint256',
+        indexed: false,
+        internalType: 'uint256',
+      },
+      {
+        name: 'index',
+        type: 'uint256',
+        indexed: false,
+        internalType: 'uint256',
       },
     ],
-    name: 'transferOnLiquidation',
-    outputs: [],
-    stateMutability: 'nonpayable',
-    type: 'function',
+    anonymous: false,
   },
   {
+    type: 'event',
+    name: 'Transfer',
     inputs: [
       {
+        name: 'from',
+        type: 'address',
+        indexed: true,
         internalType: 'address',
-        name: 'target',
+      },
+      {
+        name: 'to',
         type: 'address',
+        indexed: true,
+        internalType: 'address',
       },
       {
-        internalType: 'uint256',
-        name: 'amount',
+        name: 'value',
         type: 'uint256',
+        indexed: false,
+        internalType: 'uint256',
       },
     ],
-    name: 'transferUnderlyingTo',
-    outputs: [],
-    stateMutability: 'nonpayable',
-    type: 'function',
+    anonymous: false,
   },
 ] as const;
diff --git a/src/ts/abis/IAaveGovernanceV2.ts b/src/ts/abis/IAaveGovernanceV2.ts
index 8feaa045..6bb18b8b 100644
--- a/src/ts/abis/IAaveGovernanceV2.ts
+++ b/src/ts/abis/IAaveGovernanceV2.ts
@@ -1,664 +1,664 @@
 // AUTOGENERATED - MANUALLY CHANGES WILL BE REVERTED BY THE GENERATOR
 export const IAaveGovernanceV2_ABI = [
   {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: false,
-        internalType: 'address',
-        name: 'executor',
-        type: 'address',
-      },
-    ],
-    name: 'ExecutorAuthorized',
-    type: 'event',
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: false,
-        internalType: 'address',
-        name: 'executor',
-        type: 'address',
-      },
-    ],
-    name: 'ExecutorUnauthorized',
-    type: 'event',
+    type: 'function',
+    name: '__abdicate',
+    inputs: [],
+    outputs: [],
+    stateMutability: 'nonpayable',
   },
   {
-    anonymous: false,
+    type: 'function',
+    name: 'authorizeExecutors',
     inputs: [
       {
-        indexed: true,
-        internalType: 'address',
-        name: 'newStrategy',
-        type: 'address',
-      },
-      {
-        indexed: true,
-        internalType: 'address',
-        name: 'initiatorChange',
-        type: 'address',
+        name: 'executors',
+        type: 'address[]',
+        internalType: 'address[]',
       },
     ],
-    name: 'GovernanceStrategyChanged',
-    type: 'event',
+    outputs: [],
+    stateMutability: 'nonpayable',
   },
   {
-    anonymous: false,
+    type: 'function',
+    name: 'cancel',
     inputs: [
       {
-        indexed: false,
-        internalType: 'uint256',
-        name: 'id',
+        name: 'proposalId',
         type: 'uint256',
+        internalType: 'uint256',
       },
     ],
-    name: 'ProposalCanceled',
-    type: 'event',
+    outputs: [],
+    stateMutability: 'nonpayable',
   },
   {
-    anonymous: false,
+    type: 'function',
+    name: 'create',
     inputs: [
       {
-        indexed: false,
-        internalType: 'uint256',
-        name: 'id',
-        type: 'uint256',
-      },
-      {
-        indexed: true,
-        internalType: 'address',
-        name: 'creator',
-        type: 'address',
-      },
-      {
-        indexed: true,
-        internalType: 'contract IExecutorWithTimelock',
         name: 'executor',
         type: 'address',
+        internalType: 'contract IExecutorWithTimelock',
       },
       {
-        indexed: false,
-        internalType: 'address[]',
         name: 'targets',
         type: 'address[]',
+        internalType: 'address[]',
       },
       {
-        indexed: false,
-        internalType: 'uint256[]',
         name: 'values',
         type: 'uint256[]',
+        internalType: 'uint256[]',
       },
       {
-        indexed: false,
-        internalType: 'string[]',
         name: 'signatures',
         type: 'string[]',
+        internalType: 'string[]',
       },
       {
-        indexed: false,
-        internalType: 'bytes[]',
         name: 'calldatas',
         type: 'bytes[]',
+        internalType: 'bytes[]',
       },
       {
-        indexed: false,
-        internalType: 'bool[]',
         name: 'withDelegatecalls',
         type: 'bool[]',
+        internalType: 'bool[]',
       },
       {
-        indexed: false,
-        internalType: 'uint256',
-        name: 'startBlock',
-        type: 'uint256',
-      },
-      {
-        indexed: false,
-        internalType: 'uint256',
-        name: 'endBlock',
-        type: 'uint256',
-      },
-      {
-        indexed: false,
-        internalType: 'address',
-        name: 'strategy',
-        type: 'address',
-      },
-      {
-        indexed: false,
-        internalType: 'bytes32',
         name: 'ipfsHash',
         type: 'bytes32',
+        internalType: 'bytes32',
       },
     ],
-    name: 'ProposalCreated',
-    type: 'event',
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: false,
-        internalType: 'uint256',
-        name: 'id',
-        type: 'uint256',
-      },
-      {
-        indexed: true,
-        internalType: 'address',
-        name: 'initiatorExecution',
-        type: 'address',
-      },
-    ],
-    name: 'ProposalExecuted',
-    type: 'event',
-  },
-  {
-    anonymous: false,
-    inputs: [
+    outputs: [
       {
-        indexed: false,
-        internalType: 'uint256',
-        name: 'id',
+        name: '',
         type: 'uint256',
-      },
-      {
-        indexed: false,
         internalType: 'uint256',
-        name: 'executionTime',
-        type: 'uint256',
-      },
-      {
-        indexed: true,
-        internalType: 'address',
-        name: 'initiatorQueueing',
-        type: 'address',
       },
     ],
-    name: 'ProposalQueued',
-    type: 'event',
+    stateMutability: 'nonpayable',
   },
   {
-    anonymous: false,
+    type: 'function',
+    name: 'execute',
     inputs: [
       {
-        indexed: false,
-        internalType: 'uint256',
-        name: 'id',
+        name: 'proposalId',
         type: 'uint256',
-      },
-      {
-        indexed: true,
-        internalType: 'address',
-        name: 'voter',
-        type: 'address',
-      },
-      {
-        indexed: false,
-        internalType: 'bool',
-        name: 'support',
-        type: 'bool',
-      },
-      {
-        indexed: false,
         internalType: 'uint256',
-        name: 'votingPower',
-        type: 'uint256',
       },
     ],
-    name: 'VoteEmitted',
-    type: 'event',
+    outputs: [],
+    stateMutability: 'payable',
   },
   {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: false,
-        internalType: 'uint256',
-        name: 'newVotingDelay',
-        type: 'uint256',
-      },
+    type: 'function',
+    name: 'getGovernanceStrategy',
+    inputs: [],
+    outputs: [
       {
-        indexed: true,
-        internalType: 'address',
-        name: 'initiatorChange',
+        name: '',
         type: 'address',
+        internalType: 'address',
       },
     ],
-    name: 'VotingDelayChanged',
-    type: 'event',
+    stateMutability: 'view',
   },
   {
-    inputs: [],
-    name: '__abdicate',
-    outputs: [],
-    stateMutability: 'nonpayable',
     type: 'function',
-  },
-  {
-    inputs: [
+    name: 'getGuardian',
+    inputs: [],
+    outputs: [
       {
-        internalType: 'address[]',
-        name: 'executors',
-        type: 'address[]',
+        name: '',
+        type: 'address',
+        internalType: 'address',
       },
     ],
-    name: 'authorizeExecutors',
-    outputs: [],
-    stateMutability: 'nonpayable',
-    type: 'function',
+    stateMutability: 'view',
   },
   {
+    type: 'function',
+    name: 'getProposalById',
     inputs: [
       {
-        internalType: 'uint256',
         name: 'proposalId',
         type: 'uint256',
+        internalType: 'uint256',
       },
     ],
-    name: 'cancel',
-    outputs: [],
-    stateMutability: 'nonpayable',
-    type: 'function',
-  },
-  {
-    inputs: [
-      {
-        internalType: 'contract IExecutorWithTimelock',
-        name: 'executor',
-        type: 'address',
-      },
-      {
-        internalType: 'address[]',
-        name: 'targets',
-        type: 'address[]',
-      },
-      {
-        internalType: 'uint256[]',
-        name: 'values',
-        type: 'uint256[]',
-      },
+    outputs: [
       {
-        internalType: 'string[]',
-        name: 'signatures',
-        type: 'string[]',
-      },
-      {
-        internalType: 'bytes[]',
-        name: 'calldatas',
-        type: 'bytes[]',
-      },
-      {
-        internalType: 'bool[]',
-        name: 'withDelegatecalls',
-        type: 'bool[]',
-      },
-      {
-        internalType: 'bytes32',
-        name: 'ipfsHash',
-        type: 'bytes32',
-      },
-    ],
-    name: 'create',
-    outputs: [
-      {
-        internalType: 'uint256',
-        name: '',
-        type: 'uint256',
-      },
-    ],
-    stateMutability: 'nonpayable',
-    type: 'function',
-  },
-  {
-    inputs: [
-      {
-        internalType: 'uint256',
-        name: 'proposalId',
-        type: 'uint256',
-      },
-    ],
-    name: 'execute',
-    outputs: [],
-    stateMutability: 'payable',
-    type: 'function',
-  },
-  {
-    inputs: [],
-    name: 'getGovernanceStrategy',
-    outputs: [
-      {
-        internalType: 'address',
         name: '',
-        type: 'address',
-      },
-    ],
-    stateMutability: 'view',
-    type: 'function',
-  },
-  {
-    inputs: [],
-    name: 'getGuardian',
-    outputs: [
-      {
-        internalType: 'address',
-        name: '',
-        type: 'address',
-      },
-    ],
-    stateMutability: 'view',
-    type: 'function',
-  },
-  {
-    inputs: [
-      {
-        internalType: 'uint256',
-        name: 'proposalId',
-        type: 'uint256',
-      },
-    ],
-    name: 'getProposalById',
-    outputs: [
-      {
+        type: 'tuple',
+        internalType: 'struct IAaveGovernanceV2.ProposalWithoutVotes',
         components: [
           {
-            internalType: 'uint256',
             name: 'id',
             type: 'uint256',
+            internalType: 'uint256',
           },
           {
-            internalType: 'address',
             name: 'creator',
             type: 'address',
+            internalType: 'address',
           },
           {
-            internalType: 'contract IExecutorWithTimelock',
             name: 'executor',
             type: 'address',
+            internalType: 'contract IExecutorWithTimelock',
           },
           {
-            internalType: 'address[]',
             name: 'targets',
             type: 'address[]',
+            internalType: 'address[]',
           },
           {
-            internalType: 'uint256[]',
             name: 'values',
             type: 'uint256[]',
+            internalType: 'uint256[]',
           },
           {
-            internalType: 'string[]',
             name: 'signatures',
             type: 'string[]',
+            internalType: 'string[]',
           },
           {
-            internalType: 'bytes[]',
             name: 'calldatas',
             type: 'bytes[]',
+            internalType: 'bytes[]',
           },
           {
-            internalType: 'bool[]',
             name: 'withDelegatecalls',
             type: 'bool[]',
+            internalType: 'bool[]',
           },
           {
-            internalType: 'uint256',
             name: 'startBlock',
             type: 'uint256',
+            internalType: 'uint256',
           },
           {
-            internalType: 'uint256',
             name: 'endBlock',
             type: 'uint256',
+            internalType: 'uint256',
           },
           {
-            internalType: 'uint256',
             name: 'executionTime',
             type: 'uint256',
+            internalType: 'uint256',
           },
           {
-            internalType: 'uint256',
             name: 'forVotes',
             type: 'uint256',
+            internalType: 'uint256',
           },
           {
-            internalType: 'uint256',
             name: 'againstVotes',
             type: 'uint256',
+            internalType: 'uint256',
           },
           {
-            internalType: 'bool',
             name: 'executed',
             type: 'bool',
+            internalType: 'bool',
           },
           {
-            internalType: 'bool',
             name: 'canceled',
             type: 'bool',
+            internalType: 'bool',
           },
           {
-            internalType: 'address',
             name: 'strategy',
             type: 'address',
+            internalType: 'address',
           },
           {
-            internalType: 'bytes32',
             name: 'ipfsHash',
             type: 'bytes32',
+            internalType: 'bytes32',
           },
         ],
-        internalType: 'struct IAaveGovernanceV2.ProposalWithoutVotes',
-        name: '',
-        type: 'tuple',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'getProposalState',
     inputs: [
       {
-        internalType: 'uint256',
         name: 'proposalId',
         type: 'uint256',
+        internalType: 'uint256',
       },
     ],
-    name: 'getProposalState',
     outputs: [
       {
-        internalType: 'enum IAaveGovernanceV2.ProposalState',
         name: '',
         type: 'uint8',
+        internalType: 'enum IAaveGovernanceV2.ProposalState',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
-    inputs: [],
+    type: 'function',
     name: 'getProposalsCount',
+    inputs: [],
     outputs: [
       {
-        internalType: 'uint256',
         name: '',
         type: 'uint256',
+        internalType: 'uint256',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'getVoteOnProposal',
     inputs: [
       {
-        internalType: 'uint256',
         name: 'proposalId',
         type: 'uint256',
+        internalType: 'uint256',
       },
       {
-        internalType: 'address',
         name: 'voter',
         type: 'address',
+        internalType: 'address',
       },
     ],
-    name: 'getVoteOnProposal',
     outputs: [
       {
+        name: '',
+        type: 'tuple',
+        internalType: 'struct IAaveGovernanceV2.Vote',
         components: [
           {
-            internalType: 'bool',
             name: 'support',
             type: 'bool',
+            internalType: 'bool',
           },
           {
-            internalType: 'uint248',
             name: 'votingPower',
             type: 'uint248',
+            internalType: 'uint248',
           },
         ],
-        internalType: 'struct IAaveGovernanceV2.Vote',
-        name: '',
-        type: 'tuple',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
-    inputs: [],
+    type: 'function',
     name: 'getVotingDelay',
+    inputs: [],
     outputs: [
       {
-        internalType: 'uint256',
         name: '',
         type: 'uint256',
+        internalType: 'uint256',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'isExecutorAuthorized',
     inputs: [
       {
-        internalType: 'address',
         name: 'executor',
         type: 'address',
+        internalType: 'address',
       },
     ],
-    name: 'isExecutorAuthorized',
     outputs: [
       {
-        internalType: 'bool',
         name: '',
         type: 'bool',
+        internalType: 'bool',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'queue',
     inputs: [
       {
-        internalType: 'uint256',
         name: 'proposalId',
         type: 'uint256',
+        internalType: 'uint256',
       },
     ],
-    name: 'queue',
     outputs: [],
     stateMutability: 'nonpayable',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'setGovernanceStrategy',
     inputs: [
       {
-        internalType: 'address',
         name: 'governanceStrategy',
         type: 'address',
+        internalType: 'address',
       },
     ],
-    name: 'setGovernanceStrategy',
     outputs: [],
     stateMutability: 'nonpayable',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'setVotingDelay',
     inputs: [
       {
-        internalType: 'uint256',
         name: 'votingDelay',
         type: 'uint256',
+        internalType: 'uint256',
       },
     ],
-    name: 'setVotingDelay',
     outputs: [],
     stateMutability: 'nonpayable',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'submitVote',
     inputs: [
       {
-        internalType: 'uint256',
         name: 'proposalId',
         type: 'uint256',
+        internalType: 'uint256',
       },
       {
-        internalType: 'bool',
         name: 'support',
         type: 'bool',
+        internalType: 'bool',
       },
     ],
-    name: 'submitVote',
     outputs: [],
     stateMutability: 'nonpayable',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'submitVoteBySignature',
     inputs: [
       {
-        internalType: 'uint256',
         name: 'proposalId',
         type: 'uint256',
+        internalType: 'uint256',
       },
       {
-        internalType: 'bool',
         name: 'support',
         type: 'bool',
+        internalType: 'bool',
       },
       {
-        internalType: 'uint8',
         name: 'v',
         type: 'uint8',
+        internalType: 'uint8',
       },
       {
-        internalType: 'bytes32',
         name: 'r',
         type: 'bytes32',
+        internalType: 'bytes32',
       },
       {
-        internalType: 'bytes32',
         name: 's',
         type: 'bytes32',
+        internalType: 'bytes32',
       },
     ],
-    name: 'submitVoteBySignature',
     outputs: [],
     stateMutability: 'nonpayable',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'unauthorizeExecutors',
     inputs: [
       {
-        internalType: 'address[]',
         name: 'executors',
         type: 'address[]',
+        internalType: 'address[]',
       },
     ],
-    name: 'unauthorizeExecutors',
     outputs: [],
     stateMutability: 'nonpayable',
-    type: 'function',
+  },
+  {
+    type: 'event',
+    name: 'ExecutorAuthorized',
+    inputs: [
+      {
+        name: 'executor',
+        type: 'address',
+        indexed: false,
+        internalType: 'address',
+      },
+    ],
+    anonymous: false,
+  },
+  {
+    type: 'event',
+    name: 'ExecutorUnauthorized',
+    inputs: [
+      {
+        name: 'executor',
+        type: 'address',
+        indexed: false,
+        internalType: 'address',
+      },
+    ],
+    anonymous: false,
+  },
+  {
+    type: 'event',
+    name: 'GovernanceStrategyChanged',
+    inputs: [
+      {
+        name: 'newStrategy',
+        type: 'address',
+        indexed: true,
+        internalType: 'address',
+      },
+      {
+        name: 'initiatorChange',
+        type: 'address',
+        indexed: true,
+        internalType: 'address',
+      },
+    ],
+    anonymous: false,
+  },
+  {
+    type: 'event',
+    name: 'ProposalCanceled',
+    inputs: [
+      {
+        name: 'id',
+        type: 'uint256',
+        indexed: false,
+        internalType: 'uint256',
+      },
+    ],
+    anonymous: false,
+  },
+  {
+    type: 'event',
+    name: 'ProposalCreated',
+    inputs: [
+      {
+        name: 'id',
+        type: 'uint256',
+        indexed: false,
+        internalType: 'uint256',
+      },
+      {
+        name: 'creator',
+        type: 'address',
+        indexed: true,
+        internalType: 'address',
+      },
+      {
+        name: 'executor',
+        type: 'address',
+        indexed: true,
+        internalType: 'contract IExecutorWithTimelock',
+      },
+      {
+        name: 'targets',
+        type: 'address[]',
+        indexed: false,
+        internalType: 'address[]',
+      },
+      {
+        name: 'values',
+        type: 'uint256[]',
+        indexed: false,
+        internalType: 'uint256[]',
+      },
+      {
+        name: 'signatures',
+        type: 'string[]',
+        indexed: false,
+        internalType: 'string[]',
+      },
+      {
+        name: 'calldatas',
+        type: 'bytes[]',
+        indexed: false,
+        internalType: 'bytes[]',
+      },
+      {
+        name: 'withDelegatecalls',
+        type: 'bool[]',
+        indexed: false,
+        internalType: 'bool[]',
+      },
+      {
+        name: 'startBlock',
+        type: 'uint256',
+        indexed: false,
+        internalType: 'uint256',
+      },
+      {
+        name: 'endBlock',
+        type: 'uint256',
+        indexed: false,
+        internalType: 'uint256',
+      },
+      {
+        name: 'strategy',
+        type: 'address',
+        indexed: false,
+        internalType: 'address',
+      },
+      {
+        name: 'ipfsHash',
+        type: 'bytes32',
+        indexed: false,
+        internalType: 'bytes32',
+      },
+    ],
+    anonymous: false,
+  },
+  {
+    type: 'event',
+    name: 'ProposalExecuted',
+    inputs: [
+      {
+        name: 'id',
+        type: 'uint256',
+        indexed: false,
+        internalType: 'uint256',
+      },
+      {
+        name: 'initiatorExecution',
+        type: 'address',
+        indexed: true,
+        internalType: 'address',
+      },
+    ],
+    anonymous: false,
+  },
+  {
+    type: 'event',
+    name: 'ProposalQueued',
+    inputs: [
+      {
+        name: 'id',
+        type: 'uint256',
+        indexed: false,
+        internalType: 'uint256',
+      },
+      {
+        name: 'executionTime',
+        type: 'uint256',
+        indexed: false,
+        internalType: 'uint256',
+      },
+      {
+        name: 'initiatorQueueing',
+        type: 'address',
+        indexed: true,
+        internalType: 'address',
+      },
+    ],
+    anonymous: false,
+  },
+  {
+    type: 'event',
+    name: 'VoteEmitted',
+    inputs: [
+      {
+        name: 'id',
+        type: 'uint256',
+        indexed: false,
+        internalType: 'uint256',
+      },
+      {
+        name: 'voter',
+        type: 'address',
+        indexed: true,
+        internalType: 'address',
+      },
+      {
+        name: 'support',
+        type: 'bool',
+        indexed: false,
+        internalType: 'bool',
+      },
+      {
+        name: 'votingPower',
+        type: 'uint256',
+        indexed: false,
+        internalType: 'uint256',
+      },
+    ],
+    anonymous: false,
+  },
+  {
+    type: 'event',
+    name: 'VotingDelayChanged',
+    inputs: [
+      {
+        name: 'newVotingDelay',
+        type: 'uint256',
+        indexed: false,
+        internalType: 'uint256',
+      },
+      {
+        name: 'initiatorChange',
+        type: 'address',
+        indexed: true,
+        internalType: 'address',
+      },
+    ],
+    anonymous: false,
   },
 ] as const;
diff --git a/src/ts/abis/IAaveOracle.ts b/src/ts/abis/IAaveOracle.ts
index 8b28eff4..23e2c3dd 100644
--- a/src/ts/abis/IAaveOracle.ts
+++ b/src/ts/abis/IAaveOracle.ts
@@ -1,194 +1,194 @@
 // AUTOGENERATED - MANUALLY CHANGES WILL BE REVERTED BY THE GENERATOR
 export const IAaveOracle_ABI = [
   {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: 'address',
-        name: 'asset',
-        type: 'address',
-      },
-      {
-        indexed: true,
-        internalType: 'address',
-        name: 'source',
-        type: 'address',
-      },
-    ],
-    name: 'AssetSourceUpdated',
-    type: 'event',
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: 'address',
-        name: 'baseCurrency',
-        type: 'address',
-      },
-      {
-        indexed: false,
-        internalType: 'uint256',
-        name: 'baseCurrencyUnit',
-        type: 'uint256',
-      },
-    ],
-    name: 'BaseCurrencySet',
-    type: 'event',
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: 'address',
-        name: 'fallbackOracle',
-        type: 'address',
-      },
-    ],
-    name: 'FallbackOracleUpdated',
-    type: 'event',
-  },
-  {
-    inputs: [],
+    type: 'function',
     name: 'ADDRESSES_PROVIDER',
+    inputs: [],
     outputs: [
       {
-        internalType: 'contract IPoolAddressesProvider',
         name: '',
         type: 'address',
+        internalType: 'contract IPoolAddressesProvider',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
-    inputs: [],
+    type: 'function',
     name: 'BASE_CURRENCY',
+    inputs: [],
     outputs: [
       {
-        internalType: 'address',
         name: '',
         type: 'address',
+        internalType: 'address',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
-    inputs: [],
+    type: 'function',
     name: 'BASE_CURRENCY_UNIT',
+    inputs: [],
     outputs: [
       {
-        internalType: 'uint256',
         name: '',
         type: 'uint256',
+        internalType: 'uint256',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'getAssetPrice',
     inputs: [
       {
-        internalType: 'address',
         name: 'asset',
         type: 'address',
+        internalType: 'address',
       },
     ],
-    name: 'getAssetPrice',
     outputs: [
       {
-        internalType: 'uint256',
         name: '',
         type: 'uint256',
+        internalType: 'uint256',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'getAssetsPrices',
     inputs: [
       {
-        internalType: 'address[]',
         name: 'assets',
         type: 'address[]',
+        internalType: 'address[]',
       },
     ],
-    name: 'getAssetsPrices',
     outputs: [
       {
-        internalType: 'uint256[]',
         name: '',
         type: 'uint256[]',
+        internalType: 'uint256[]',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
-    inputs: [],
+    type: 'function',
     name: 'getFallbackOracle',
+    inputs: [],
     outputs: [
       {
-        internalType: 'address',
         name: '',
         type: 'address',
+        internalType: 'address',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'getSourceOfAsset',
     inputs: [
       {
-        internalType: 'address',
         name: 'asset',
         type: 'address',
+        internalType: 'address',
       },
     ],
-    name: 'getSourceOfAsset',
     outputs: [
       {
-        internalType: 'address',
         name: '',
         type: 'address',
+        internalType: 'address',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'setAssetSources',
     inputs: [
       {
-        internalType: 'address[]',
         name: 'assets',
         type: 'address[]',
+        internalType: 'address[]',
       },
       {
-        internalType: 'address[]',
         name: 'sources',
         type: 'address[]',
+        internalType: 'address[]',
       },
     ],
-    name: 'setAssetSources',
     outputs: [],
     stateMutability: 'nonpayable',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'setFallbackOracle',
     inputs: [
       {
-        internalType: 'address',
         name: 'fallbackOracle',
         type: 'address',
+        internalType: 'address',
       },
     ],
-    name: 'setFallbackOracle',
     outputs: [],
     stateMutability: 'nonpayable',
-    type: 'function',
+  },
+  {
+    type: 'event',
+    name: 'AssetSourceUpdated',
+    inputs: [
+      {
+        name: 'asset',
+        type: 'address',
+        indexed: true,
+        internalType: 'address',
+      },
+      {
+        name: 'source',
+        type: 'address',
+        indexed: true,
+        internalType: 'address',
+      },
+    ],
+    anonymous: false,
+  },
+  {
+    type: 'event',
+    name: 'BaseCurrencySet',
+    inputs: [
+      {
+        name: 'baseCurrency',
+        type: 'address',
+        indexed: true,
+        internalType: 'address',
+      },
+      {
+        name: 'baseCurrencyUnit',
+        type: 'uint256',
+        indexed: false,
+        internalType: 'uint256',
+      },
+    ],
+    anonymous: false,
+  },
+  {
+    type: 'event',
+    name: 'FallbackOracleUpdated',
+    inputs: [
+      {
+        name: 'fallbackOracle',
+        type: 'address',
+        indexed: true,
+        internalType: 'address',
+      },
+    ],
+    anonymous: false,
   },
 ] as const;
diff --git a/src/ts/abis/ICollector.ts b/src/ts/abis/ICollector.ts
index 32f35b9e..dd414c67 100644
--- a/src/ts/abis/ICollector.ts
+++ b/src/ts/abis/ICollector.ts
@@ -1,403 +1,403 @@
 // AUTOGENERATED - MANUALLY CHANGES WILL BE REVERTED BY THE GENERATOR
 export const ICollector_ABI = [
   {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: 'uint256',
-        name: 'streamId',
-        type: 'uint256',
-      },
-      {
-        indexed: true,
-        internalType: 'address',
-        name: 'sender',
-        type: 'address',
-      },
-      {
-        indexed: true,
-        internalType: 'address',
-        name: 'recipient',
-        type: 'address',
-      },
-      {
-        indexed: false,
-        internalType: 'uint256',
-        name: 'senderBalance',
-        type: 'uint256',
-      },
-      {
-        indexed: false,
-        internalType: 'uint256',
-        name: 'recipientBalance',
-        type: 'uint256',
-      },
-    ],
-    name: 'CancelStream',
-    type: 'event',
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: 'uint256',
-        name: 'streamId',
-        type: 'uint256',
-      },
-      {
-        indexed: true,
-        internalType: 'address',
-        name: 'sender',
-        type: 'address',
-      },
-      {
-        indexed: true,
-        internalType: 'address',
-        name: 'recipient',
-        type: 'address',
-      },
-      {
-        indexed: false,
-        internalType: 'uint256',
-        name: 'deposit',
-        type: 'uint256',
-      },
-      {
-        indexed: false,
-        internalType: 'address',
-        name: 'tokenAddress',
-        type: 'address',
-      },
-      {
-        indexed: false,
-        internalType: 'uint256',
-        name: 'startTime',
-        type: 'uint256',
-      },
-      {
-        indexed: false,
-        internalType: 'uint256',
-        name: 'stopTime',
-        type: 'uint256',
-      },
-    ],
-    name: 'CreateStream',
-    type: 'event',
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: 'address',
-        name: 'fundsAdmin',
-        type: 'address',
-      },
-    ],
-    name: 'NewFundsAdmin',
-    type: 'event',
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: 'uint256',
-        name: 'streamId',
-        type: 'uint256',
-      },
-      {
-        indexed: true,
-        internalType: 'address',
-        name: 'recipient',
-        type: 'address',
-      },
-      {
-        indexed: false,
-        internalType: 'uint256',
-        name: 'amount',
-        type: 'uint256',
-      },
-    ],
-    name: 'WithdrawFromStream',
-    type: 'event',
-  },
-  {
-    inputs: [],
+    type: 'function',
     name: 'ETH_MOCK_ADDRESS',
+    inputs: [],
     outputs: [
       {
-        internalType: 'address',
         name: '',
         type: 'address',
+        internalType: 'address',
       },
     ],
     stateMutability: 'pure',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'approve',
     inputs: [
       {
-        internalType: 'address',
         name: 'token',
         type: 'address',
+        internalType: 'address',
       },
       {
-        internalType: 'address',
         name: 'recipient',
         type: 'address',
+        internalType: 'address',
       },
       {
-        internalType: 'uint256',
         name: 'amount',
         type: 'uint256',
+        internalType: 'uint256',
       },
     ],
-    name: 'approve',
     outputs: [],
     stateMutability: 'nonpayable',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'balanceOf',
     inputs: [
       {
-        internalType: 'uint256',
         name: 'streamId',
         type: 'uint256',
+        internalType: 'uint256',
       },
       {
-        internalType: 'address',
         name: 'who',
         type: 'address',
+        internalType: 'address',
       },
     ],
-    name: 'balanceOf',
     outputs: [
       {
-        internalType: 'uint256',
         name: 'balance',
         type: 'uint256',
+        internalType: 'uint256',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'cancelStream',
     inputs: [
       {
-        internalType: 'uint256',
         name: 'streamId',
         type: 'uint256',
+        internalType: 'uint256',
       },
     ],
-    name: 'cancelStream',
     outputs: [
       {
-        internalType: 'bool',
         name: '',
         type: 'bool',
+        internalType: 'bool',
       },
     ],
     stateMutability: 'nonpayable',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'createStream',
     inputs: [
       {
-        internalType: 'address',
         name: 'recipient',
         type: 'address',
+        internalType: 'address',
       },
       {
-        internalType: 'uint256',
         name: 'deposit',
         type: 'uint256',
+        internalType: 'uint256',
       },
       {
-        internalType: 'address',
         name: 'tokenAddress',
         type: 'address',
+        internalType: 'address',
       },
       {
-        internalType: 'uint256',
         name: 'startTime',
         type: 'uint256',
+        internalType: 'uint256',
       },
       {
-        internalType: 'uint256',
         name: 'stopTime',
         type: 'uint256',
+        internalType: 'uint256',
       },
     ],
-    name: 'createStream',
     outputs: [
       {
-        internalType: 'uint256',
         name: 'streamId',
         type: 'uint256',
+        internalType: 'uint256',
       },
     ],
     stateMutability: 'nonpayable',
-    type: 'function',
   },
   {
-    inputs: [],
+    type: 'function',
     name: 'getFundsAdmin',
+    inputs: [],
     outputs: [
       {
-        internalType: 'address',
         name: '',
         type: 'address',
+        internalType: 'address',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
-    inputs: [],
+    type: 'function',
     name: 'getNextStreamId',
+    inputs: [],
     outputs: [
       {
-        internalType: 'uint256',
         name: '',
         type: 'uint256',
+        internalType: 'uint256',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'getStream',
     inputs: [
       {
-        internalType: 'uint256',
         name: 'streamId',
         type: 'uint256',
+        internalType: 'uint256',
       },
     ],
-    name: 'getStream',
     outputs: [
       {
-        internalType: 'address',
         name: 'sender',
         type: 'address',
+        internalType: 'address',
       },
       {
-        internalType: 'address',
         name: 'recipient',
         type: 'address',
+        internalType: 'address',
       },
       {
-        internalType: 'uint256',
         name: 'deposit',
         type: 'uint256',
+        internalType: 'uint256',
       },
       {
-        internalType: 'address',
         name: 'tokenAddress',
         type: 'address',
+        internalType: 'address',
       },
       {
-        internalType: 'uint256',
         name: 'startTime',
         type: 'uint256',
+        internalType: 'uint256',
       },
       {
-        internalType: 'uint256',
         name: 'stopTime',
         type: 'uint256',
+        internalType: 'uint256',
       },
       {
-        internalType: 'uint256',
         name: 'remainingBalance',
         type: 'uint256',
+        internalType: 'uint256',
       },
       {
-        internalType: 'uint256',
         name: 'ratePerSecond',
         type: 'uint256',
+        internalType: 'uint256',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'initialize',
     inputs: [
       {
-        internalType: 'address',
         name: 'fundsAdmin',
         type: 'address',
+        internalType: 'address',
       },
       {
-        internalType: 'uint256',
         name: 'nextStreamId',
         type: 'uint256',
+        internalType: 'uint256',
       },
     ],
-    name: 'initialize',
     outputs: [],
     stateMutability: 'nonpayable',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'setFundsAdmin',
     inputs: [
       {
-        internalType: 'address',
         name: 'admin',
         type: 'address',
+        internalType: 'address',
       },
     ],
-    name: 'setFundsAdmin',
     outputs: [],
     stateMutability: 'nonpayable',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'transfer',
     inputs: [
       {
-        internalType: 'address',
         name: 'token',
         type: 'address',
+        internalType: 'address',
       },
       {
-        internalType: 'address',
         name: 'recipient',
         type: 'address',
+        internalType: 'address',
       },
       {
-        internalType: 'uint256',
         name: 'amount',
         type: 'uint256',
+        internalType: 'uint256',
       },
     ],
-    name: 'transfer',
     outputs: [],
     stateMutability: 'nonpayable',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'withdrawFromStream',
     inputs: [
       {
-        internalType: 'uint256',
         name: 'streamId',
         type: 'uint256',
+        internalType: 'uint256',
       },
       {
-        internalType: 'uint256',
         name: 'amount',
         type: 'uint256',
+        internalType: 'uint256',
       },
     ],
-    name: 'withdrawFromStream',
     outputs: [
       {
-        internalType: 'bool',
         name: '',
         type: 'bool',
+        internalType: 'bool',
       },
     ],
     stateMutability: 'nonpayable',
-    type: 'function',
+  },
+  {
+    type: 'event',
+    name: 'CancelStream',
+    inputs: [
+      {
+        name: 'streamId',
+        type: 'uint256',
+        indexed: true,
+        internalType: 'uint256',
+      },
+      {
+        name: 'sender',
+        type: 'address',
+        indexed: true,
+        internalType: 'address',
+      },
+      {
+        name: 'recipient',
+        type: 'address',
+        indexed: true,
+        internalType: 'address',
+      },
+      {
+        name: 'senderBalance',
+        type: 'uint256',
+        indexed: false,
+        internalType: 'uint256',
+      },
+      {
+        name: 'recipientBalance',
+        type: 'uint256',
+        indexed: false,
+        internalType: 'uint256',
+      },
+    ],
+    anonymous: false,
+  },
+  {
+    type: 'event',
+    name: 'CreateStream',
+    inputs: [
+      {
+        name: 'streamId',
+        type: 'uint256',
+        indexed: true,
+        internalType: 'uint256',
+      },
+      {
+        name: 'sender',
+        type: 'address',
+        indexed: true,
+        internalType: 'address',
+      },
+      {
+        name: 'recipient',
+        type: 'address',
+        indexed: true,
+        internalType: 'address',
+      },
+      {
+        name: 'deposit',
+        type: 'uint256',
+        indexed: false,
+        internalType: 'uint256',
+      },
+      {
+        name: 'tokenAddress',
+        type: 'address',
+        indexed: false,
+        internalType: 'address',
+      },
+      {
+        name: 'startTime',
+        type: 'uint256',
+        indexed: false,
+        internalType: 'uint256',
+      },
+      {
+        name: 'stopTime',
+        type: 'uint256',
+        indexed: false,
+        internalType: 'uint256',
+      },
+    ],
+    anonymous: false,
+  },
+  {
+    type: 'event',
+    name: 'NewFundsAdmin',
+    inputs: [
+      {
+        name: 'fundsAdmin',
+        type: 'address',
+        indexed: true,
+        internalType: 'address',
+      },
+    ],
+    anonymous: false,
+  },
+  {
+    type: 'event',
+    name: 'WithdrawFromStream',
+    inputs: [
+      {
+        name: 'streamId',
+        type: 'uint256',
+        indexed: true,
+        internalType: 'uint256',
+      },
+      {
+        name: 'recipient',
+        type: 'address',
+        indexed: true,
+        internalType: 'address',
+      },
+      {
+        name: 'amount',
+        type: 'uint256',
+        indexed: false,
+        internalType: 'uint256',
+      },
+    ],
+    anonymous: false,
   },
 ] as const;
diff --git a/src/ts/abis/ICrossChainController.ts b/src/ts/abis/ICrossChainController.ts
index 1b87d47c..be9f3bbf 100644
--- a/src/ts/abis/ICrossChainController.ts
+++ b/src/ts/abis/ICrossChainController.ts
@@ -1,1257 +1,1257 @@
 // AUTOGENERATED - MANUALLY CHANGES WILL BE REVERTED BY THE GENERATOR
 export const ICrossChainController_ABI = [
   {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: 'uint256',
-        name: 'destinationChainId',
-        type: 'uint256',
-      },
-      {
-        indexed: true,
-        internalType: 'address',
-        name: 'bridgeAdapter',
-        type: 'address',
-      },
-      {
-        indexed: false,
-        internalType: 'address',
-        name: 'destinationBridgeAdapter',
-        type: 'address',
-      },
-      {
-        indexed: true,
-        internalType: 'bool',
-        name: 'allowed',
-        type: 'bool',
-      },
-    ],
-    name: 'BridgeAdapterUpdated',
-    type: 'event',
-  },
-  {
-    anonymous: false,
+    type: 'function',
+    name: 'allowReceiverBridgeAdapters',
     inputs: [
       {
-        indexed: false,
-        internalType: 'uint8',
-        name: 'newConfirmations',
-        type: 'uint8',
-      },
-      {
-        indexed: true,
-        internalType: 'uint256',
-        name: 'chainId',
-        type: 'uint256',
+        name: 'bridgeAdaptersInput',
+        type: 'tuple[]',
+        internalType: 'struct ICrossChainReceiver.ReceiverBridgeAdapterConfigInput[]',
+        components: [
+          {
+            name: 'bridgeAdapter',
+            type: 'address',
+            internalType: 'address',
+          },
+          {
+            name: 'chainIds',
+            type: 'uint256[]',
+            internalType: 'uint256[]',
+          },
+        ],
       },
     ],
-    name: 'ConfirmationsUpdated',
-    type: 'event',
+    outputs: [],
+    stateMutability: 'nonpayable',
   },
   {
-    anonymous: false,
+    type: 'function',
+    name: 'approveSenders',
     inputs: [
       {
-        indexed: true,
-        internalType: 'address',
-        name: 'caller',
-        type: 'address',
-      },
-      {
-        indexed: true,
-        internalType: 'address',
-        name: 'token',
-        type: 'address',
-      },
-      {
-        indexed: true,
-        internalType: 'address',
-        name: 'to',
-        type: 'address',
-      },
-      {
-        indexed: false,
-        internalType: 'uint256',
-        name: 'amount',
-        type: 'uint256',
+        name: 'senders',
+        type: 'address[]',
+        internalType: 'address[]',
       },
     ],
-    name: 'ERC20Rescued',
-    type: 'event',
+    outputs: [],
+    stateMutability: 'nonpayable',
   },
   {
-    anonymous: false,
+    type: 'function',
+    name: 'deliverEnvelope',
     inputs: [
       {
-        indexed: false,
-        internalType: 'bytes32',
-        name: 'envelopeId',
-        type: 'bytes32',
-      },
-      {
+        name: 'envelope',
+        type: 'tuple',
+        internalType: 'struct Envelope',
         components: [
           {
-            internalType: 'uint256',
             name: 'nonce',
             type: 'uint256',
+            internalType: 'uint256',
           },
           {
-            internalType: 'address',
             name: 'origin',
             type: 'address',
+            internalType: 'address',
           },
           {
-            internalType: 'address',
             name: 'destination',
             type: 'address',
+            internalType: 'address',
           },
           {
-            internalType: 'uint256',
             name: 'originChainId',
             type: 'uint256',
+            internalType: 'uint256',
           },
           {
-            internalType: 'uint256',
             name: 'destinationChainId',
             type: 'uint256',
+            internalType: 'uint256',
           },
           {
-            internalType: 'bytes',
             name: 'message',
             type: 'bytes',
+            internalType: 'bytes',
           },
         ],
-        indexed: false,
-        internalType: 'struct Envelope',
-        name: 'envelope',
-        type: 'tuple',
-      },
-      {
-        indexed: false,
-        internalType: 'bool',
-        name: 'isDelivered',
-        type: 'bool',
       },
     ],
-    name: 'EnvelopeDeliveryAttempted',
-    type: 'event',
+    outputs: [],
+    stateMutability: 'nonpayable',
   },
   {
-    anonymous: false,
+    type: 'function',
+    name: 'disableBridgeAdapters',
     inputs: [
       {
-        indexed: true,
-        internalType: 'bytes32',
-        name: 'envelopeId',
-        type: 'bytes32',
-      },
-      {
+        name: 'bridgeAdapters',
+        type: 'tuple[]',
+        internalType: 'struct ICrossChainForwarder.BridgeAdapterToDisable[]',
         components: [
           {
-            internalType: 'uint256',
-            name: 'nonce',
-            type: 'uint256',
-          },
-          {
-            internalType: 'address',
-            name: 'origin',
+            name: 'bridgeAdapter',
             type: 'address',
-          },
-          {
             internalType: 'address',
-            name: 'destination',
-            type: 'address',
           },
           {
-            internalType: 'uint256',
-            name: 'originChainId',
-            type: 'uint256',
+            name: 'chainIds',
+            type: 'uint256[]',
+            internalType: 'uint256[]',
           },
+        ],
+      },
+    ],
+    outputs: [],
+    stateMutability: 'nonpayable',
+  },
+  {
+    type: 'function',
+    name: 'disallowReceiverBridgeAdapters',
+    inputs: [
+      {
+        name: 'bridgeAdaptersInput',
+        type: 'tuple[]',
+        internalType: 'struct ICrossChainReceiver.ReceiverBridgeAdapterConfigInput[]',
+        components: [
           {
-            internalType: 'uint256',
-            name: 'destinationChainId',
-            type: 'uint256',
+            name: 'bridgeAdapter',
+            type: 'address',
+            internalType: 'address',
           },
           {
-            internalType: 'bytes',
-            name: 'message',
-            type: 'bytes',
+            name: 'chainIds',
+            type: 'uint256[]',
+            internalType: 'uint256[]',
           },
         ],
-        indexed: false,
-        internalType: 'struct Envelope',
-        name: 'envelope',
-        type: 'tuple',
       },
     ],
-    name: 'EnvelopeRegistered',
-    type: 'event',
+    outputs: [],
+    stateMutability: 'nonpayable',
   },
   {
-    anonymous: false,
+    type: 'function',
+    name: 'emergencyEtherTransfer',
     inputs: [
       {
-        indexed: true,
-        internalType: 'address',
-        name: 'caller',
-        type: 'address',
-      },
-      {
-        indexed: true,
-        internalType: 'address',
         name: 'to',
         type: 'address',
+        internalType: 'address',
       },
       {
-        indexed: false,
-        internalType: 'uint256',
         name: 'amount',
         type: 'uint256',
-      },
-    ],
-    name: 'NativeTokensRescued',
-    type: 'event',
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: false,
-        internalType: 'uint256',
-        name: 'invalidTimestamp',
-        type: 'uint256',
-      },
-      {
-        indexed: true,
         internalType: 'uint256',
-        name: 'chainId',
-        type: 'uint256',
       },
     ],
-    name: 'NewInvalidation',
-    type: 'event',
+    outputs: [],
+    stateMutability: 'nonpayable',
   },
   {
-    anonymous: false,
+    type: 'function',
+    name: 'emergencyTokenTransfer',
     inputs: [
       {
-        indexed: true,
-        internalType: 'address',
-        name: 'bridgeAdapter',
+        name: 'erc20Token',
         type: 'address',
+        internalType: 'address',
       },
       {
-        indexed: true,
-        internalType: 'bool',
-        name: 'allowed',
-        type: 'bool',
+        name: 'to',
+        type: 'address',
+        internalType: 'address',
       },
       {
-        indexed: true,
-        internalType: 'uint256',
-        name: 'chainId',
+        name: 'amount',
         type: 'uint256',
+        internalType: 'uint256',
       },
     ],
-    name: 'ReceiverBridgeAdaptersUpdated',
-    type: 'event',
+    outputs: [],
+    stateMutability: 'nonpayable',
   },
   {
-    anonymous: false,
+    type: 'function',
+    name: 'enableBridgeAdapters',
     inputs: [
       {
-        indexed: true,
-        internalType: 'address',
-        name: 'sender',
-        type: 'address',
-      },
-      {
-        indexed: true,
-        internalType: 'bool',
-        name: 'isApproved',
-        type: 'bool',
+        name: 'bridgeAdapters',
+        type: 'tuple[]',
+        internalType: 'struct ICrossChainForwarder.ForwarderBridgeAdapterConfigInput[]',
+        components: [
+          {
+            name: 'currentChainBridgeAdapter',
+            type: 'address',
+            internalType: 'address',
+          },
+          {
+            name: 'destinationBridgeAdapter',
+            type: 'address',
+            internalType: 'address',
+          },
+          {
+            name: 'destinationChainId',
+            type: 'uint256',
+            internalType: 'uint256',
+          },
+        ],
       },
     ],
-    name: 'SenderUpdated',
-    type: 'event',
+    outputs: [],
+    stateMutability: 'nonpayable',
   },
   {
-    anonymous: false,
+    type: 'function',
+    name: 'forwardMessage',
     inputs: [
       {
-        indexed: false,
-        internalType: 'bytes32',
-        name: 'transactionId',
-        type: 'bytes32',
-      },
-      {
-        indexed: true,
-        internalType: 'bytes32',
-        name: 'envelopeId',
-        type: 'bytes32',
-      },
-      {
-        indexed: false,
-        internalType: 'bytes',
-        name: 'encodedTransaction',
-        type: 'bytes',
-      },
-      {
-        indexed: false,
-        internalType: 'uint256',
         name: 'destinationChainId',
         type: 'uint256',
+        internalType: 'uint256',
       },
       {
-        indexed: true,
-        internalType: 'address',
-        name: 'bridgeAdapter',
+        name: 'destination',
         type: 'address',
-      },
-      {
-        indexed: false,
         internalType: 'address',
-        name: 'destinationBridgeAdapter',
-        type: 'address',
       },
       {
-        indexed: true,
-        internalType: 'bool',
-        name: 'adapterSuccessful',
-        type: 'bool',
+        name: 'gasLimit',
+        type: 'uint256',
+        internalType: 'uint256',
       },
       {
-        indexed: false,
-        internalType: 'bytes',
-        name: 'returnData',
+        name: 'message',
         type: 'bytes',
+        internalType: 'bytes',
       },
     ],
-    name: 'TransactionForwardingAttempted',
-    type: 'event',
-  },
-  {
-    anonymous: false,
-    inputs: [
+    outputs: [
       {
-        indexed: false,
-        internalType: 'bytes32',
-        name: 'transactionId',
+        name: '',
         type: 'bytes32',
+        internalType: 'bytes32',
       },
       {
-        indexed: true,
-        internalType: 'bytes32',
-        name: 'envelopeId',
+        name: '',
         type: 'bytes32',
+        internalType: 'bytes32',
       },
+    ],
+    stateMutability: 'nonpayable',
+  },
+  {
+    type: 'function',
+    name: 'getConfigurationByChain',
+    inputs: [
       {
-        indexed: true,
-        internalType: 'uint256',
-        name: 'originChainId',
+        name: 'chainId',
         type: 'uint256',
+        internalType: 'uint256',
       },
+    ],
+    outputs: [
       {
+        name: '',
+        type: 'tuple',
+        internalType: 'struct ICrossChainReceiver.ReceiverConfiguration',
         components: [
           {
-            internalType: 'uint256',
-            name: 'nonce',
-            type: 'uint256',
+            name: 'requiredConfirmation',
+            type: 'uint8',
+            internalType: 'uint8',
           },
           {
-            internalType: 'bytes',
-            name: 'encodedEnvelope',
-            type: 'bytes',
+            name: 'validityTimestamp',
+            type: 'uint120',
+            internalType: 'uint120',
           },
         ],
-        indexed: false,
-        internalType: 'struct Transaction',
-        name: 'transaction',
-        type: 'tuple',
-      },
-      {
-        indexed: true,
-        internalType: 'address',
-        name: 'bridgeAdapter',
-        type: 'address',
       },
+    ],
+    stateMutability: 'view',
+  },
+  {
+    type: 'function',
+    name: 'getCurrentEnvelopeNonce',
+    inputs: [],
+    outputs: [
       {
-        indexed: false,
-        internalType: 'uint8',
-        name: 'confirmations',
-        type: 'uint8',
+        name: '',
+        type: 'uint256',
+        internalType: 'uint256',
       },
     ],
-    name: 'TransactionReceived',
-    type: 'event',
+    stateMutability: 'view',
   },
   {
-    inputs: [
+    type: 'function',
+    name: 'getCurrentTransactionNonce',
+    inputs: [],
+    outputs: [
       {
-        components: [
-          {
-            internalType: 'address',
-            name: 'bridgeAdapter',
-            type: 'address',
-          },
-          {
-            internalType: 'uint256[]',
-            name: 'chainIds',
-            type: 'uint256[]',
-          },
-        ],
-        internalType: 'struct ICrossChainReceiver.ReceiverBridgeAdapterConfigInput[]',
-        name: 'bridgeAdaptersInput',
-        type: 'tuple[]',
+        name: '',
+        type: 'uint256',
+        internalType: 'uint256',
       },
     ],
-    name: 'allowReceiverBridgeAdapters',
-    outputs: [],
-    stateMutability: 'nonpayable',
-    type: 'function',
+    stateMutability: 'view',
   },
   {
+    type: 'function',
+    name: 'getEnvelopeState',
     inputs: [
       {
-        internalType: 'address[]',
-        name: 'senders',
-        type: 'address[]',
+        name: 'envelopeId',
+        type: 'bytes32',
+        internalType: 'bytes32',
       },
     ],
-    name: 'approveSenders',
-    outputs: [],
-    stateMutability: 'nonpayable',
-    type: 'function',
+    outputs: [
+      {
+        name: '',
+        type: 'uint8',
+        internalType: 'enum ICrossChainReceiver.EnvelopeState',
+      },
+    ],
+    stateMutability: 'view',
   },
   {
+    type: 'function',
+    name: 'getEnvelopeState',
     inputs: [
       {
+        name: 'envelope',
+        type: 'tuple',
+        internalType: 'struct Envelope',
         components: [
           {
-            internalType: 'uint256',
             name: 'nonce',
             type: 'uint256',
+            internalType: 'uint256',
           },
           {
-            internalType: 'address',
             name: 'origin',
             type: 'address',
+            internalType: 'address',
           },
           {
-            internalType: 'address',
             name: 'destination',
             type: 'address',
+            internalType: 'address',
           },
           {
-            internalType: 'uint256',
             name: 'originChainId',
             type: 'uint256',
+            internalType: 'uint256',
           },
           {
-            internalType: 'uint256',
             name: 'destinationChainId',
             type: 'uint256',
+            internalType: 'uint256',
           },
           {
-            internalType: 'bytes',
             name: 'message',
             type: 'bytes',
+            internalType: 'bytes',
           },
         ],
-        internalType: 'struct Envelope',
-        name: 'envelope',
-        type: 'tuple',
       },
     ],
-    name: 'deliverEnvelope',
-    outputs: [],
-    stateMutability: 'nonpayable',
-    type: 'function',
+    outputs: [
+      {
+        name: '',
+        type: 'uint8',
+        internalType: 'enum ICrossChainReceiver.EnvelopeState',
+      },
+    ],
+    stateMutability: 'view',
   },
   {
+    type: 'function',
+    name: 'getForwarderBridgeAdaptersByChain',
     inputs: [
       {
+        name: 'chainId',
+        type: 'uint256',
+        internalType: 'uint256',
+      },
+    ],
+    outputs: [
+      {
+        name: '',
+        type: 'tuple[]',
+        internalType: 'struct ICrossChainForwarder.ChainIdBridgeConfig[]',
         components: [
           {
-            internalType: 'address',
-            name: 'bridgeAdapter',
+            name: 'destinationBridgeAdapter',
             type: 'address',
+            internalType: 'address',
           },
           {
-            internalType: 'uint256[]',
-            name: 'chainIds',
-            type: 'uint256[]',
-          },
-        ],
-        internalType: 'struct ICrossChainForwarder.BridgeAdapterToDisable[]',
-        name: 'bridgeAdapters',
-        type: 'tuple[]',
-      },
-    ],
-    name: 'disableBridgeAdapters',
-    outputs: [],
-    stateMutability: 'nonpayable',
-    type: 'function',
-  },
-  {
-    inputs: [
-      {
-        components: [
-          {
-            internalType: 'address',
-            name: 'bridgeAdapter',
+            name: 'currentChainBridgeAdapter',
             type: 'address',
-          },
-          {
-            internalType: 'uint256[]',
-            name: 'chainIds',
-            type: 'uint256[]',
+            internalType: 'address',
           },
         ],
-        internalType: 'struct ICrossChainReceiver.ReceiverBridgeAdapterConfigInput[]',
-        name: 'bridgeAdaptersInput',
-        type: 'tuple[]',
       },
     ],
-    name: 'disallowReceiverBridgeAdapters',
-    outputs: [],
-    stateMutability: 'nonpayable',
-    type: 'function',
+    stateMutability: 'view',
   },
   {
+    type: 'function',
+    name: 'getReceiverBridgeAdaptersByChain',
     inputs: [
       {
-        internalType: 'address',
-        name: 'to',
-        type: 'address',
+        name: 'chainId',
+        type: 'uint256',
+        internalType: 'uint256',
       },
+    ],
+    outputs: [
       {
-        internalType: 'uint256',
-        name: 'amount',
-        type: 'uint256',
+        name: '',
+        type: 'address[]',
+        internalType: 'address[]',
       },
     ],
-    name: 'emergencyEtherTransfer',
-    outputs: [],
-    stateMutability: 'nonpayable',
-    type: 'function',
+    stateMutability: 'view',
   },
   {
-    inputs: [
-      {
-        internalType: 'address',
-        name: 'erc20Token',
-        type: 'address',
-      },
-      {
-        internalType: 'address',
-        name: 'to',
-        type: 'address',
-      },
+    type: 'function',
+    name: 'getSupportedChains',
+    inputs: [],
+    outputs: [
       {
-        internalType: 'uint256',
-        name: 'amount',
-        type: 'uint256',
+        name: '',
+        type: 'uint256[]',
+        internalType: 'uint256[]',
       },
     ],
-    name: 'emergencyTokenTransfer',
-    outputs: [],
-    stateMutability: 'nonpayable',
-    type: 'function',
+    stateMutability: 'view',
   },
   {
+    type: 'function',
+    name: 'getTransactionState',
     inputs: [
       {
+        name: 'transaction',
+        type: 'tuple',
+        internalType: 'struct Transaction',
         components: [
           {
-            internalType: 'address',
-            name: 'currentChainBridgeAdapter',
-            type: 'address',
-          },
-          {
-            internalType: 'address',
-            name: 'destinationBridgeAdapter',
-            type: 'address',
+            name: 'nonce',
+            type: 'uint256',
+            internalType: 'uint256',
           },
           {
-            internalType: 'uint256',
-            name: 'destinationChainId',
-            type: 'uint256',
+            name: 'encodedEnvelope',
+            type: 'bytes',
+            internalType: 'bytes',
           },
         ],
-        internalType: 'struct ICrossChainForwarder.ForwarderBridgeAdapterConfigInput[]',
-        name: 'bridgeAdapters',
-        type: 'tuple[]',
-      },
-    ],
-    name: 'enableBridgeAdapters',
-    outputs: [],
-    stateMutability: 'nonpayable',
-    type: 'function',
-  },
-  {
-    inputs: [
-      {
-        internalType: 'uint256',
-        name: 'destinationChainId',
-        type: 'uint256',
-      },
-      {
-        internalType: 'address',
-        name: 'destination',
-        type: 'address',
-      },
-      {
-        internalType: 'uint256',
-        name: 'gasLimit',
-        type: 'uint256',
-      },
-      {
-        internalType: 'bytes',
-        name: 'message',
-        type: 'bytes',
       },
     ],
-    name: 'forwardMessage',
     outputs: [
       {
-        internalType: 'bytes32',
-        name: '',
-        type: 'bytes32',
-      },
-      {
-        internalType: 'bytes32',
         name: '',
-        type: 'bytes32',
-      },
-    ],
-    stateMutability: 'nonpayable',
-    type: 'function',
-  },
-  {
-    inputs: [
-      {
-        internalType: 'uint256',
-        name: 'chainId',
-        type: 'uint256',
-      },
-    ],
-    name: 'getConfigurationByChain',
-    outputs: [
-      {
+        type: 'tuple',
+        internalType: 'struct ICrossChainReceiver.TransactionStateWithoutAdapters',
         components: [
           {
-            internalType: 'uint8',
-            name: 'requiredConfirmation',
+            name: 'confirmations',
             type: 'uint8',
+            internalType: 'uint8',
           },
           {
-            internalType: 'uint120',
-            name: 'validityTimestamp',
+            name: 'firstBridgedAt',
             type: 'uint120',
+            internalType: 'uint120',
           },
         ],
-        internalType: 'struct ICrossChainReceiver.ReceiverConfiguration',
-        name: '',
-        type: 'tuple',
-      },
-    ],
-    stateMutability: 'view',
-    type: 'function',
-  },
-  {
-    inputs: [],
-    name: 'getCurrentEnvelopeNonce',
-    outputs: [
-      {
-        internalType: 'uint256',
-        name: '',
-        type: 'uint256',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
-    inputs: [],
-    name: 'getCurrentTransactionNonce',
-    outputs: [
-      {
-        internalType: 'uint256',
-        name: '',
-        type: 'uint256',
-      },
-    ],
-    stateMutability: 'view',
     type: 'function',
-  },
-  {
+    name: 'getTransactionState',
     inputs: [
       {
-        internalType: 'bytes32',
-        name: 'envelopeId',
+        name: 'transactionId',
         type: 'bytes32',
+        internalType: 'bytes32',
       },
     ],
-    name: 'getEnvelopeState',
     outputs: [
       {
-        internalType: 'enum ICrossChainReceiver.EnvelopeState',
         name: '',
-        type: 'uint8',
+        type: 'tuple',
+        internalType: 'struct ICrossChainReceiver.TransactionStateWithoutAdapters',
+        components: [
+          {
+            name: 'confirmations',
+            type: 'uint8',
+            internalType: 'uint8',
+          },
+          {
+            name: 'firstBridgedAt',
+            type: 'uint120',
+            internalType: 'uint120',
+          },
+        ],
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'isEnvelopeRegistered',
     inputs: [
       {
+        name: 'envelope',
+        type: 'tuple',
+        internalType: 'struct Envelope',
         components: [
           {
-            internalType: 'uint256',
             name: 'nonce',
             type: 'uint256',
+            internalType: 'uint256',
           },
           {
-            internalType: 'address',
             name: 'origin',
             type: 'address',
+            internalType: 'address',
           },
           {
-            internalType: 'address',
             name: 'destination',
             type: 'address',
+            internalType: 'address',
           },
           {
-            internalType: 'uint256',
             name: 'originChainId',
             type: 'uint256',
+            internalType: 'uint256',
           },
           {
-            internalType: 'uint256',
             name: 'destinationChainId',
             type: 'uint256',
+            internalType: 'uint256',
           },
           {
-            internalType: 'bytes',
             name: 'message',
             type: 'bytes',
+            internalType: 'bytes',
           },
         ],
-        internalType: 'struct Envelope',
-        name: 'envelope',
-        type: 'tuple',
       },
     ],
-    name: 'getEnvelopeState',
     outputs: [
       {
-        internalType: 'enum ICrossChainReceiver.EnvelopeState',
         name: '',
-        type: 'uint8',
+        type: 'bool',
+        internalType: 'bool',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'isEnvelopeRegistered',
     inputs: [
       {
-        internalType: 'uint256',
-        name: 'chainId',
-        type: 'uint256',
+        name: 'envelopeId',
+        type: 'bytes32',
+        internalType: 'bytes32',
       },
     ],
-    name: 'getForwarderBridgeAdaptersByChain',
     outputs: [
       {
-        components: [
-          {
-            internalType: 'address',
-            name: 'destinationBridgeAdapter',
-            type: 'address',
-          },
-          {
-            internalType: 'address',
-            name: 'currentChainBridgeAdapter',
-            type: 'address',
-          },
-        ],
-        internalType: 'struct ICrossChainForwarder.ChainIdBridgeConfig[]',
-        name: '',
-        type: 'tuple[]',
-      },
-    ],
-    stateMutability: 'view',
-    type: 'function',
-  },
-  {
-    inputs: [
-      {
-        internalType: 'uint256',
-        name: 'chainId',
-        type: 'uint256',
-      },
-    ],
-    name: 'getReceiverBridgeAdaptersByChain',
-    outputs: [
-      {
-        internalType: 'address[]',
-        name: '',
-        type: 'address[]',
-      },
-    ],
-    stateMutability: 'view',
-    type: 'function',
-  },
-  {
-    inputs: [],
-    name: 'getSupportedChains',
-    outputs: [
-      {
-        internalType: 'uint256[]',
-        name: '',
-        type: 'uint256[]',
-      },
-    ],
-    stateMutability: 'view',
-    type: 'function',
-  },
-  {
-    inputs: [
-      {
-        components: [
-          {
-            internalType: 'uint256',
-            name: 'nonce',
-            type: 'uint256',
-          },
-          {
-            internalType: 'bytes',
-            name: 'encodedEnvelope',
-            type: 'bytes',
-          },
-        ],
-        internalType: 'struct Transaction',
-        name: 'transaction',
-        type: 'tuple',
-      },
-    ],
-    name: 'getTransactionState',
-    outputs: [
-      {
-        components: [
-          {
-            internalType: 'uint8',
-            name: 'confirmations',
-            type: 'uint8',
-          },
-          {
-            internalType: 'uint120',
-            name: 'firstBridgedAt',
-            type: 'uint120',
-          },
-        ],
-        internalType: 'struct ICrossChainReceiver.TransactionStateWithoutAdapters',
-        name: '',
-        type: 'tuple',
-      },
-    ],
-    stateMutability: 'view',
-    type: 'function',
-  },
-  {
-    inputs: [
-      {
-        internalType: 'bytes32',
-        name: 'transactionId',
-        type: 'bytes32',
-      },
-    ],
-    name: 'getTransactionState',
-    outputs: [
-      {
-        components: [
-          {
-            internalType: 'uint8',
-            name: 'confirmations',
-            type: 'uint8',
-          },
-          {
-            internalType: 'uint120',
-            name: 'firstBridgedAt',
-            type: 'uint120',
-          },
-        ],
-        internalType: 'struct ICrossChainReceiver.TransactionStateWithoutAdapters',
-        name: '',
-        type: 'tuple',
-      },
-    ],
-    stateMutability: 'view',
-    type: 'function',
-  },
-  {
-    inputs: [
-      {
-        components: [
-          {
-            internalType: 'uint256',
-            name: 'nonce',
-            type: 'uint256',
-          },
-          {
-            internalType: 'address',
-            name: 'origin',
-            type: 'address',
-          },
-          {
-            internalType: 'address',
-            name: 'destination',
-            type: 'address',
-          },
-          {
-            internalType: 'uint256',
-            name: 'originChainId',
-            type: 'uint256',
-          },
-          {
-            internalType: 'uint256',
-            name: 'destinationChainId',
-            type: 'uint256',
-          },
-          {
-            internalType: 'bytes',
-            name: 'message',
-            type: 'bytes',
-          },
-        ],
-        internalType: 'struct Envelope',
-        name: 'envelope',
-        type: 'tuple',
-      },
-    ],
-    name: 'isEnvelopeRegistered',
-    outputs: [
-      {
-        internalType: 'bool',
         name: '',
         type: 'bool',
-      },
-    ],
-    stateMutability: 'view',
-    type: 'function',
-  },
-  {
-    inputs: [
-      {
-        internalType: 'bytes32',
-        name: 'envelopeId',
-        type: 'bytes32',
-      },
-    ],
-    name: 'isEnvelopeRegistered',
-    outputs: [
-      {
         internalType: 'bool',
-        name: '',
-        type: 'bool',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'isReceiverBridgeAdapterAllowed',
     inputs: [
       {
-        internalType: 'address',
         name: 'bridgeAdapter',
         type: 'address',
+        internalType: 'address',
       },
       {
-        internalType: 'uint256',
         name: 'chainId',
         type: 'uint256',
+        internalType: 'uint256',
       },
     ],
-    name: 'isReceiverBridgeAdapterAllowed',
     outputs: [
       {
-        internalType: 'bool',
         name: '',
         type: 'bool',
+        internalType: 'bool',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'isSenderApproved',
     inputs: [
       {
-        internalType: 'address',
         name: 'sender',
         type: 'address',
+        internalType: 'address',
       },
     ],
-    name: 'isSenderApproved',
     outputs: [
       {
-        internalType: 'bool',
         name: '',
         type: 'bool',
+        internalType: 'bool',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'isTransactionForwarded',
     inputs: [
       {
-        internalType: 'bytes32',
         name: 'transactionId',
         type: 'bytes32',
+        internalType: 'bytes32',
       },
     ],
-    name: 'isTransactionForwarded',
     outputs: [
       {
-        internalType: 'bool',
         name: '',
         type: 'bool',
+        internalType: 'bool',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'isTransactionForwarded',
     inputs: [
       {
+        name: 'transaction',
+        type: 'tuple',
+        internalType: 'struct Transaction',
         components: [
           {
-            internalType: 'uint256',
             name: 'nonce',
             type: 'uint256',
+            internalType: 'uint256',
           },
           {
-            internalType: 'bytes',
             name: 'encodedEnvelope',
             type: 'bytes',
+            internalType: 'bytes',
           },
         ],
-        internalType: 'struct Transaction',
-        name: 'transaction',
-        type: 'tuple',
       },
     ],
-    name: 'isTransactionForwarded',
     outputs: [
       {
-        internalType: 'bool',
         name: '',
         type: 'bool',
+        internalType: 'bool',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'isTransactionReceivedByAdapter',
     inputs: [
       {
-        internalType: 'bytes32',
         name: 'transactionId',
         type: 'bytes32',
+        internalType: 'bytes32',
       },
       {
-        internalType: 'address',
         name: 'bridgeAdapter',
         type: 'address',
+        internalType: 'address',
       },
     ],
-    name: 'isTransactionReceivedByAdapter',
     outputs: [
       {
-        internalType: 'bool',
         name: '',
         type: 'bool',
+        internalType: 'bool',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'receiveCrossChainMessage',
     inputs: [
       {
-        internalType: 'bytes',
         name: 'encodedTransaction',
         type: 'bytes',
+        internalType: 'bytes',
       },
       {
-        internalType: 'uint256',
         name: 'originChainId',
         type: 'uint256',
+        internalType: 'uint256',
       },
     ],
-    name: 'receiveCrossChainMessage',
     outputs: [],
     stateMutability: 'nonpayable',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'removeSenders',
     inputs: [
       {
-        internalType: 'address[]',
         name: 'senders',
         type: 'address[]',
+        internalType: 'address[]',
       },
     ],
-    name: 'removeSenders',
     outputs: [],
     stateMutability: 'nonpayable',
-    type: 'function',
   },
   {
-    inputs: [
+    type: 'function',
+    name: 'retryEnvelope',
+    inputs: [
       {
+        name: 'envelope',
+        type: 'tuple',
+        internalType: 'struct Envelope',
         components: [
           {
-            internalType: 'uint256',
             name: 'nonce',
             type: 'uint256',
+            internalType: 'uint256',
           },
           {
-            internalType: 'address',
             name: 'origin',
             type: 'address',
+            internalType: 'address',
           },
           {
-            internalType: 'address',
             name: 'destination',
             type: 'address',
+            internalType: 'address',
           },
           {
-            internalType: 'uint256',
             name: 'originChainId',
             type: 'uint256',
+            internalType: 'uint256',
           },
           {
-            internalType: 'uint256',
             name: 'destinationChainId',
             type: 'uint256',
+            internalType: 'uint256',
           },
           {
-            internalType: 'bytes',
             name: 'message',
             type: 'bytes',
+            internalType: 'bytes',
           },
         ],
-        internalType: 'struct Envelope',
-        name: 'envelope',
-        type: 'tuple',
       },
       {
-        internalType: 'uint256',
         name: 'gasLimit',
         type: 'uint256',
+        internalType: 'uint256',
       },
     ],
-    name: 'retryEnvelope',
     outputs: [
       {
-        internalType: 'bytes32',
         name: '',
         type: 'bytes32',
+        internalType: 'bytes32',
       },
     ],
     stateMutability: 'nonpayable',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'retryTransaction',
     inputs: [
       {
-        internalType: 'bytes',
         name: 'encodedTransaction',
         type: 'bytes',
+        internalType: 'bytes',
       },
       {
-        internalType: 'uint256',
         name: 'gasLimit',
         type: 'uint256',
+        internalType: 'uint256',
       },
       {
-        internalType: 'address[]',
         name: 'bridgeAdaptersToRetry',
         type: 'address[]',
+        internalType: 'address[]',
       },
     ],
-    name: 'retryTransaction',
     outputs: [],
     stateMutability: 'nonpayable',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'updateConfirmations',
     inputs: [
       {
+        name: 'newConfirmations',
+        type: 'tuple[]',
+        internalType: 'struct ICrossChainReceiver.ConfirmationInput[]',
         components: [
           {
-            internalType: 'uint256',
             name: 'chainId',
             type: 'uint256',
+            internalType: 'uint256',
           },
           {
-            internalType: 'uint8',
             name: 'requiredConfirmations',
             type: 'uint8',
+            internalType: 'uint8',
           },
         ],
-        internalType: 'struct ICrossChainReceiver.ConfirmationInput[]',
-        name: 'newConfirmations',
-        type: 'tuple[]',
       },
     ],
-    name: 'updateConfirmations',
     outputs: [],
     stateMutability: 'nonpayable',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'updateMessagesValidityTimestamp',
     inputs: [
       {
+        name: 'newValidityTimestamp',
+        type: 'tuple[]',
+        internalType: 'struct ICrossChainReceiver.ValidityTimestampInput[]',
         components: [
           {
-            internalType: 'uint256',
             name: 'chainId',
             type: 'uint256',
+            internalType: 'uint256',
           },
           {
-            internalType: 'uint120',
             name: 'validityTimestamp',
             type: 'uint120',
+            internalType: 'uint120',
           },
         ],
-        internalType: 'struct ICrossChainReceiver.ValidityTimestampInput[]',
-        name: 'newValidityTimestamp',
-        type: 'tuple[]',
       },
     ],
-    name: 'updateMessagesValidityTimestamp',
     outputs: [],
     stateMutability: 'nonpayable',
-    type: 'function',
   },
   {
-    inputs: [],
+    type: 'function',
     name: 'whoCanRescue',
+    inputs: [],
     outputs: [
       {
-        internalType: 'address',
         name: '',
         type: 'address',
+        internalType: 'address',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
+  },
+  {
+    type: 'event',
+    name: 'BridgeAdapterUpdated',
+    inputs: [
+      {
+        name: 'destinationChainId',
+        type: 'uint256',
+        indexed: true,
+        internalType: 'uint256',
+      },
+      {
+        name: 'bridgeAdapter',
+        type: 'address',
+        indexed: true,
+        internalType: 'address',
+      },
+      {
+        name: 'destinationBridgeAdapter',
+        type: 'address',
+        indexed: false,
+        internalType: 'address',
+      },
+      {
+        name: 'allowed',
+        type: 'bool',
+        indexed: true,
+        internalType: 'bool',
+      },
+    ],
+    anonymous: false,
+  },
+  {
+    type: 'event',
+    name: 'ConfirmationsUpdated',
+    inputs: [
+      {
+        name: 'newConfirmations',
+        type: 'uint8',
+        indexed: false,
+        internalType: 'uint8',
+      },
+      {
+        name: 'chainId',
+        type: 'uint256',
+        indexed: true,
+        internalType: 'uint256',
+      },
+    ],
+    anonymous: false,
+  },
+  {
+    type: 'event',
+    name: 'ERC20Rescued',
+    inputs: [
+      {
+        name: 'caller',
+        type: 'address',
+        indexed: true,
+        internalType: 'address',
+      },
+      {
+        name: 'token',
+        type: 'address',
+        indexed: true,
+        internalType: 'address',
+      },
+      {
+        name: 'to',
+        type: 'address',
+        indexed: true,
+        internalType: 'address',
+      },
+      {
+        name: 'amount',
+        type: 'uint256',
+        indexed: false,
+        internalType: 'uint256',
+      },
+    ],
+    anonymous: false,
+  },
+  {
+    type: 'event',
+    name: 'EnvelopeDeliveryAttempted',
+    inputs: [
+      {
+        name: 'envelopeId',
+        type: 'bytes32',
+        indexed: false,
+        internalType: 'bytes32',
+      },
+      {
+        name: 'envelope',
+        type: 'tuple',
+        indexed: false,
+        internalType: 'struct Envelope',
+        components: [
+          {
+            name: 'nonce',
+            type: 'uint256',
+            internalType: 'uint256',
+          },
+          {
+            name: 'origin',
+            type: 'address',
+            internalType: 'address',
+          },
+          {
+            name: 'destination',
+            type: 'address',
+            internalType: 'address',
+          },
+          {
+            name: 'originChainId',
+            type: 'uint256',
+            internalType: 'uint256',
+          },
+          {
+            name: 'destinationChainId',
+            type: 'uint256',
+            internalType: 'uint256',
+          },
+          {
+            name: 'message',
+            type: 'bytes',
+            internalType: 'bytes',
+          },
+        ],
+      },
+      {
+        name: 'isDelivered',
+        type: 'bool',
+        indexed: false,
+        internalType: 'bool',
+      },
+    ],
+    anonymous: false,
+  },
+  {
+    type: 'event',
+    name: 'EnvelopeRegistered',
+    inputs: [
+      {
+        name: 'envelopeId',
+        type: 'bytes32',
+        indexed: true,
+        internalType: 'bytes32',
+      },
+      {
+        name: 'envelope',
+        type: 'tuple',
+        indexed: false,
+        internalType: 'struct Envelope',
+        components: [
+          {
+            name: 'nonce',
+            type: 'uint256',
+            internalType: 'uint256',
+          },
+          {
+            name: 'origin',
+            type: 'address',
+            internalType: 'address',
+          },
+          {
+            name: 'destination',
+            type: 'address',
+            internalType: 'address',
+          },
+          {
+            name: 'originChainId',
+            type: 'uint256',
+            internalType: 'uint256',
+          },
+          {
+            name: 'destinationChainId',
+            type: 'uint256',
+            internalType: 'uint256',
+          },
+          {
+            name: 'message',
+            type: 'bytes',
+            internalType: 'bytes',
+          },
+        ],
+      },
+    ],
+    anonymous: false,
+  },
+  {
+    type: 'event',
+    name: 'NativeTokensRescued',
+    inputs: [
+      {
+        name: 'caller',
+        type: 'address',
+        indexed: true,
+        internalType: 'address',
+      },
+      {
+        name: 'to',
+        type: 'address',
+        indexed: true,
+        internalType: 'address',
+      },
+      {
+        name: 'amount',
+        type: 'uint256',
+        indexed: false,
+        internalType: 'uint256',
+      },
+    ],
+    anonymous: false,
+  },
+  {
+    type: 'event',
+    name: 'NewInvalidation',
+    inputs: [
+      {
+        name: 'invalidTimestamp',
+        type: 'uint256',
+        indexed: false,
+        internalType: 'uint256',
+      },
+      {
+        name: 'chainId',
+        type: 'uint256',
+        indexed: true,
+        internalType: 'uint256',
+      },
+    ],
+    anonymous: false,
+  },
+  {
+    type: 'event',
+    name: 'ReceiverBridgeAdaptersUpdated',
+    inputs: [
+      {
+        name: 'bridgeAdapter',
+        type: 'address',
+        indexed: true,
+        internalType: 'address',
+      },
+      {
+        name: 'allowed',
+        type: 'bool',
+        indexed: true,
+        internalType: 'bool',
+      },
+      {
+        name: 'chainId',
+        type: 'uint256',
+        indexed: true,
+        internalType: 'uint256',
+      },
+    ],
+    anonymous: false,
+  },
+  {
+    type: 'event',
+    name: 'SenderUpdated',
+    inputs: [
+      {
+        name: 'sender',
+        type: 'address',
+        indexed: true,
+        internalType: 'address',
+      },
+      {
+        name: 'isApproved',
+        type: 'bool',
+        indexed: true,
+        internalType: 'bool',
+      },
+    ],
+    anonymous: false,
+  },
+  {
+    type: 'event',
+    name: 'TransactionForwardingAttempted',
+    inputs: [
+      {
+        name: 'transactionId',
+        type: 'bytes32',
+        indexed: false,
+        internalType: 'bytes32',
+      },
+      {
+        name: 'envelopeId',
+        type: 'bytes32',
+        indexed: true,
+        internalType: 'bytes32',
+      },
+      {
+        name: 'encodedTransaction',
+        type: 'bytes',
+        indexed: false,
+        internalType: 'bytes',
+      },
+      {
+        name: 'destinationChainId',
+        type: 'uint256',
+        indexed: false,
+        internalType: 'uint256',
+      },
+      {
+        name: 'bridgeAdapter',
+        type: 'address',
+        indexed: true,
+        internalType: 'address',
+      },
+      {
+        name: 'destinationBridgeAdapter',
+        type: 'address',
+        indexed: false,
+        internalType: 'address',
+      },
+      {
+        name: 'adapterSuccessful',
+        type: 'bool',
+        indexed: true,
+        internalType: 'bool',
+      },
+      {
+        name: 'returnData',
+        type: 'bytes',
+        indexed: false,
+        internalType: 'bytes',
+      },
+    ],
+    anonymous: false,
+  },
+  {
+    type: 'event',
+    name: 'TransactionReceived',
+    inputs: [
+      {
+        name: 'transactionId',
+        type: 'bytes32',
+        indexed: false,
+        internalType: 'bytes32',
+      },
+      {
+        name: 'envelopeId',
+        type: 'bytes32',
+        indexed: true,
+        internalType: 'bytes32',
+      },
+      {
+        name: 'originChainId',
+        type: 'uint256',
+        indexed: true,
+        internalType: 'uint256',
+      },
+      {
+        name: 'transaction',
+        type: 'tuple',
+        indexed: false,
+        internalType: 'struct Transaction',
+        components: [
+          {
+            name: 'nonce',
+            type: 'uint256',
+            internalType: 'uint256',
+          },
+          {
+            name: 'encodedEnvelope',
+            type: 'bytes',
+            internalType: 'bytes',
+          },
+        ],
+      },
+      {
+        name: 'bridgeAdapter',
+        type: 'address',
+        indexed: true,
+        internalType: 'address',
+      },
+      {
+        name: 'confirmations',
+        type: 'uint8',
+        indexed: false,
+        internalType: 'uint8',
+      },
+    ],
+    anonymous: false,
   },
 ] as const;
diff --git a/src/ts/abis/IDataWarehouse.ts b/src/ts/abis/IDataWarehouse.ts
index fbab0030..219e75d8 100644
--- a/src/ts/abis/IDataWarehouse.ts
+++ b/src/ts/abis/IDataWarehouse.ts
@@ -1,226 +1,226 @@
 // AUTOGENERATED - MANUALLY CHANGES WILL BE REVERTED BY THE GENERATOR
 export const IDataWarehouse_ABI = [
   {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: 'address',
-        name: 'caller',
-        type: 'address',
-      },
-      {
-        indexed: true,
-        internalType: 'address',
-        name: 'account',
-        type: 'address',
-      },
-      {
-        indexed: true,
-        internalType: 'bytes32',
-        name: 'blockHash',
-        type: 'bytes32',
-      },
-    ],
-    name: 'StorageRootProcessed',
-    type: 'event',
-  },
-  {
-    anonymous: false,
+    type: 'function',
+    name: 'getRegisteredSlot',
     inputs: [
       {
-        indexed: true,
-        internalType: 'address',
-        name: 'caller',
-        type: 'address',
-      },
-      {
-        indexed: true,
-        internalType: 'address',
-        name: 'account',
-        type: 'address',
-      },
-      {
-        indexed: true,
-        internalType: 'bytes32',
         name: 'blockHash',
         type: 'bytes32',
-      },
-      {
-        indexed: false,
-        internalType: 'bytes32',
-        name: 'slot',
-        type: 'bytes32',
-      },
-      {
-        indexed: false,
-        internalType: 'uint256',
-        name: 'value',
-        type: 'uint256',
-      },
-    ],
-    name: 'StorageSlotProcessed',
-    type: 'event',
-  },
-  {
-    inputs: [
-      {
         internalType: 'bytes32',
-        name: 'blockHash',
-        type: 'bytes32',
       },
       {
-        internalType: 'address',
         name: 'account',
         type: 'address',
+        internalType: 'address',
       },
       {
-        internalType: 'bytes32',
         name: 'slot',
         type: 'bytes32',
+        internalType: 'bytes32',
       },
     ],
-    name: 'getRegisteredSlot',
     outputs: [
       {
-        internalType: 'uint256',
         name: '',
         type: 'uint256',
+        internalType: 'uint256',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'getStorage',
     inputs: [
       {
-        internalType: 'address',
         name: 'account',
         type: 'address',
+        internalType: 'address',
       },
       {
-        internalType: 'bytes32',
         name: 'blockHash',
         type: 'bytes32',
+        internalType: 'bytes32',
       },
       {
-        internalType: 'bytes32',
         name: 'slot',
         type: 'bytes32',
+        internalType: 'bytes32',
       },
       {
-        internalType: 'bytes',
         name: 'storageProof',
         type: 'bytes',
+        internalType: 'bytes',
       },
     ],
-    name: 'getStorage',
     outputs: [
       {
+        name: '',
+        type: 'tuple',
+        internalType: 'struct IDataWarehouse.SlotValue',
         components: [
           {
-            internalType: 'bool',
             name: 'exists',
             type: 'bool',
+            internalType: 'bool',
           },
           {
-            internalType: 'uint256',
             name: 'value',
             type: 'uint256',
+            internalType: 'uint256',
           },
         ],
-        internalType: 'struct IDataWarehouse.SlotValue',
-        name: '',
-        type: 'tuple',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'getStorageRoots',
     inputs: [
       {
-        internalType: 'address',
         name: 'account',
         type: 'address',
+        internalType: 'address',
       },
       {
-        internalType: 'bytes32',
         name: 'blockHash',
         type: 'bytes32',
+        internalType: 'bytes32',
       },
     ],
-    name: 'getStorageRoots',
     outputs: [
       {
-        internalType: 'bytes32',
         name: '',
         type: 'bytes32',
+        internalType: 'bytes32',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'processStorageRoot',
     inputs: [
       {
-        internalType: 'address',
         name: 'account',
         type: 'address',
+        internalType: 'address',
       },
       {
-        internalType: 'bytes32',
         name: 'blockHash',
         type: 'bytes32',
+        internalType: 'bytes32',
       },
       {
-        internalType: 'bytes',
         name: 'blockHeaderRLP',
         type: 'bytes',
+        internalType: 'bytes',
       },
       {
-        internalType: 'bytes',
         name: 'accountStateProofRLP',
         type: 'bytes',
+        internalType: 'bytes',
       },
     ],
-    name: 'processStorageRoot',
     outputs: [
       {
-        internalType: 'bytes32',
         name: '',
         type: 'bytes32',
+        internalType: 'bytes32',
       },
     ],
     stateMutability: 'nonpayable',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'processStorageSlot',
     inputs: [
       {
-        internalType: 'address',
         name: 'account',
         type: 'address',
+        internalType: 'address',
       },
       {
-        internalType: 'bytes32',
         name: 'blockHash',
         type: 'bytes32',
+        internalType: 'bytes32',
       },
       {
-        internalType: 'bytes32',
         name: 'slot',
         type: 'bytes32',
+        internalType: 'bytes32',
       },
       {
-        internalType: 'bytes',
         name: 'storageProof',
         type: 'bytes',
+        internalType: 'bytes',
       },
     ],
-    name: 'processStorageSlot',
     outputs: [],
     stateMutability: 'nonpayable',
-    type: 'function',
+  },
+  {
+    type: 'event',
+    name: 'StorageRootProcessed',
+    inputs: [
+      {
+        name: 'caller',
+        type: 'address',
+        indexed: true,
+        internalType: 'address',
+      },
+      {
+        name: 'account',
+        type: 'address',
+        indexed: true,
+        internalType: 'address',
+      },
+      {
+        name: 'blockHash',
+        type: 'bytes32',
+        indexed: true,
+        internalType: 'bytes32',
+      },
+    ],
+    anonymous: false,
+  },
+  {
+    type: 'event',
+    name: 'StorageSlotProcessed',
+    inputs: [
+      {
+        name: 'caller',
+        type: 'address',
+        indexed: true,
+        internalType: 'address',
+      },
+      {
+        name: 'account',
+        type: 'address',
+        indexed: true,
+        internalType: 'address',
+      },
+      {
+        name: 'blockHash',
+        type: 'bytes32',
+        indexed: true,
+        internalType: 'bytes32',
+      },
+      {
+        name: 'slot',
+        type: 'bytes32',
+        indexed: false,
+        internalType: 'bytes32',
+      },
+      {
+        name: 'value',
+        type: 'uint256',
+        indexed: false,
+        internalType: 'uint256',
+      },
+    ],
+    anonymous: false,
   },
 ] as const;
diff --git a/src/ts/abis/IDefaultInterestRateStrategy.ts b/src/ts/abis/IDefaultInterestRateStrategy.ts
index f028a57d..4a9f98ca 100644
--- a/src/ts/abis/IDefaultInterestRateStrategy.ts
+++ b/src/ts/abis/IDefaultInterestRateStrategy.ts
@@ -1,248 +1,248 @@
 // AUTOGENERATED - MANUALLY CHANGES WILL BE REVERTED BY THE GENERATOR
 export const IDefaultInterestRateStrategy_ABI = [
   {
-    inputs: [],
+    type: 'function',
     name: 'ADDRESSES_PROVIDER',
+    inputs: [],
     outputs: [
       {
-        internalType: 'contract IPoolAddressesProvider',
         name: '',
         type: 'address',
+        internalType: 'contract IPoolAddressesProvider',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
-    inputs: [],
+    type: 'function',
     name: 'MAX_EXCESS_STABLE_TO_TOTAL_DEBT_RATIO',
+    inputs: [],
     outputs: [
       {
-        internalType: 'uint256',
         name: '',
         type: 'uint256',
+        internalType: 'uint256',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
-    inputs: [],
+    type: 'function',
     name: 'MAX_EXCESS_USAGE_RATIO',
+    inputs: [],
     outputs: [
       {
-        internalType: 'uint256',
         name: '',
         type: 'uint256',
+        internalType: 'uint256',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
-    inputs: [],
+    type: 'function',
     name: 'OPTIMAL_STABLE_TO_TOTAL_DEBT_RATIO',
+    inputs: [],
     outputs: [
       {
-        internalType: 'uint256',
         name: '',
         type: 'uint256',
+        internalType: 'uint256',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
-    inputs: [],
+    type: 'function',
     name: 'OPTIMAL_USAGE_RATIO',
+    inputs: [],
     outputs: [
       {
-        internalType: 'uint256',
         name: '',
         type: 'uint256',
+        internalType: 'uint256',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'calculateInterestRates',
     inputs: [
       {
+        name: 'params',
+        type: 'tuple',
+        internalType: 'struct DataTypes.CalculateInterestRatesParams',
         components: [
           {
-            internalType: 'uint256',
             name: 'unbacked',
             type: 'uint256',
+            internalType: 'uint256',
           },
           {
-            internalType: 'uint256',
             name: 'liquidityAdded',
             type: 'uint256',
+            internalType: 'uint256',
           },
           {
-            internalType: 'uint256',
             name: 'liquidityTaken',
             type: 'uint256',
+            internalType: 'uint256',
           },
           {
-            internalType: 'uint256',
             name: 'totalStableDebt',
             type: 'uint256',
+            internalType: 'uint256',
           },
           {
-            internalType: 'uint256',
             name: 'totalVariableDebt',
             type: 'uint256',
+            internalType: 'uint256',
           },
           {
-            internalType: 'uint256',
             name: 'averageStableBorrowRate',
             type: 'uint256',
+            internalType: 'uint256',
           },
           {
-            internalType: 'uint256',
             name: 'reserveFactor',
             type: 'uint256',
+            internalType: 'uint256',
           },
           {
-            internalType: 'address',
             name: 'reserve',
             type: 'address',
+            internalType: 'address',
           },
           {
-            internalType: 'address',
             name: 'aToken',
             type: 'address',
+            internalType: 'address',
           },
         ],
-        internalType: 'struct DataTypes.CalculateInterestRatesParams',
-        name: 'params',
-        type: 'tuple',
       },
     ],
-    name: 'calculateInterestRates',
     outputs: [
       {
-        internalType: 'uint256',
         name: '',
         type: 'uint256',
+        internalType: 'uint256',
       },
       {
-        internalType: 'uint256',
         name: '',
         type: 'uint256',
+        internalType: 'uint256',
       },
       {
-        internalType: 'uint256',
         name: '',
         type: 'uint256',
+        internalType: 'uint256',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
-    inputs: [],
+    type: 'function',
     name: 'getBaseStableBorrowRate',
+    inputs: [],
     outputs: [
       {
-        internalType: 'uint256',
         name: '',
         type: 'uint256',
+        internalType: 'uint256',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
-    inputs: [],
+    type: 'function',
     name: 'getBaseVariableBorrowRate',
+    inputs: [],
     outputs: [
       {
-        internalType: 'uint256',
         name: '',
         type: 'uint256',
+        internalType: 'uint256',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
-    inputs: [],
+    type: 'function',
     name: 'getMaxVariableBorrowRate',
+    inputs: [],
     outputs: [
       {
-        internalType: 'uint256',
         name: '',
         type: 'uint256',
+        internalType: 'uint256',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
-    inputs: [],
+    type: 'function',
     name: 'getStableRateExcessOffset',
+    inputs: [],
     outputs: [
       {
-        internalType: 'uint256',
         name: '',
         type: 'uint256',
+        internalType: 'uint256',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
-    inputs: [],
+    type: 'function',
     name: 'getStableRateSlope1',
+    inputs: [],
     outputs: [
       {
-        internalType: 'uint256',
         name: '',
         type: 'uint256',
+        internalType: 'uint256',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
-    inputs: [],
+    type: 'function',
     name: 'getStableRateSlope2',
+    inputs: [],
     outputs: [
       {
-        internalType: 'uint256',
         name: '',
         type: 'uint256',
+        internalType: 'uint256',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
-    inputs: [],
+    type: 'function',
     name: 'getVariableRateSlope1',
+    inputs: [],
     outputs: [
       {
-        internalType: 'uint256',
         name: '',
         type: 'uint256',
+        internalType: 'uint256',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
-    inputs: [],
+    type: 'function',
     name: 'getVariableRateSlope2',
+    inputs: [],
     outputs: [
       {
-        internalType: 'uint256',
         name: '',
         type: 'uint256',
+        internalType: 'uint256',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
 ] as const;
diff --git a/src/ts/abis/IERC20.ts b/src/ts/abis/IERC20.ts
index e70e0774..73358b27 100644
--- a/src/ts/abis/IERC20.ts
+++ b/src/ts/abis/IERC20.ts
@@ -1,186 +1,186 @@
 // AUTOGENERATED - MANUALLY CHANGES WILL BE REVERTED BY THE GENERATOR
 export const IERC20_ABI = [
   {
-    anonymous: false,
+    type: 'function',
+    name: 'allowance',
     inputs: [
       {
-        indexed: true,
-        internalType: 'address',
         name: 'owner',
         type: 'address',
-      },
-      {
-        indexed: true,
         internalType: 'address',
-        name: 'spender',
-        type: 'address',
       },
       {
-        indexed: false,
-        internalType: 'uint256',
-        name: 'value',
-        type: 'uint256',
-      },
-    ],
-    name: 'Approval',
-    type: 'event',
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: 'address',
-        name: 'from',
-        type: 'address',
-      },
-      {
-        indexed: true,
-        internalType: 'address',
-        name: 'to',
-        type: 'address',
-      },
-      {
-        indexed: false,
-        internalType: 'uint256',
-        name: 'value',
-        type: 'uint256',
-      },
-    ],
-    name: 'Transfer',
-    type: 'event',
-  },
-  {
-    inputs: [
-      {
-        internalType: 'address',
-        name: 'owner',
-        type: 'address',
-      },
-      {
-        internalType: 'address',
         name: 'spender',
         type: 'address',
+        internalType: 'address',
       },
     ],
-    name: 'allowance',
     outputs: [
       {
-        internalType: 'uint256',
         name: '',
         type: 'uint256',
+        internalType: 'uint256',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'approve',
     inputs: [
       {
-        internalType: 'address',
         name: 'spender',
         type: 'address',
+        internalType: 'address',
       },
       {
-        internalType: 'uint256',
         name: 'amount',
         type: 'uint256',
+        internalType: 'uint256',
       },
     ],
-    name: 'approve',
     outputs: [
       {
-        internalType: 'bool',
         name: '',
         type: 'bool',
+        internalType: 'bool',
       },
     ],
     stateMutability: 'nonpayable',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'balanceOf',
     inputs: [
       {
-        internalType: 'address',
         name: 'account',
         type: 'address',
+        internalType: 'address',
       },
     ],
-    name: 'balanceOf',
     outputs: [
       {
-        internalType: 'uint256',
         name: '',
         type: 'uint256',
+        internalType: 'uint256',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
-    inputs: [],
+    type: 'function',
     name: 'totalSupply',
+    inputs: [],
     outputs: [
       {
-        internalType: 'uint256',
         name: '',
         type: 'uint256',
+        internalType: 'uint256',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'transfer',
     inputs: [
       {
-        internalType: 'address',
         name: 'recipient',
         type: 'address',
+        internalType: 'address',
       },
       {
-        internalType: 'uint256',
         name: 'amount',
         type: 'uint256',
+        internalType: 'uint256',
       },
     ],
-    name: 'transfer',
     outputs: [
       {
-        internalType: 'bool',
         name: '',
         type: 'bool',
+        internalType: 'bool',
       },
     ],
     stateMutability: 'nonpayable',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'transferFrom',
     inputs: [
       {
-        internalType: 'address',
         name: 'sender',
         type: 'address',
+        internalType: 'address',
       },
       {
-        internalType: 'address',
         name: 'recipient',
         type: 'address',
+        internalType: 'address',
       },
       {
-        internalType: 'uint256',
         name: 'amount',
         type: 'uint256',
+        internalType: 'uint256',
       },
     ],
-    name: 'transferFrom',
     outputs: [
       {
-        internalType: 'bool',
         name: '',
         type: 'bool',
+        internalType: 'bool',
       },
     ],
     stateMutability: 'nonpayable',
-    type: 'function',
+  },
+  {
+    type: 'event',
+    name: 'Approval',
+    inputs: [
+      {
+        name: 'owner',
+        type: 'address',
+        indexed: true,
+        internalType: 'address',
+      },
+      {
+        name: 'spender',
+        type: 'address',
+        indexed: true,
+        internalType: 'address',
+      },
+      {
+        name: 'value',
+        type: 'uint256',
+        indexed: false,
+        internalType: 'uint256',
+      },
+    ],
+    anonymous: false,
+  },
+  {
+    type: 'event',
+    name: 'Transfer',
+    inputs: [
+      {
+        name: 'from',
+        type: 'address',
+        indexed: true,
+        internalType: 'address',
+      },
+      {
+        name: 'to',
+        type: 'address',
+        indexed: true,
+        internalType: 'address',
+      },
+      {
+        name: 'value',
+        type: 'uint256',
+        indexed: false,
+        internalType: 'uint256',
+      },
+    ],
+    anonymous: false,
   },
 ] as const;
diff --git a/src/ts/abis/IExecutor.ts b/src/ts/abis/IExecutor.ts
index 2dca985d..7a4ffbee 100644
--- a/src/ts/abis/IExecutor.ts
+++ b/src/ts/abis/IExecutor.ts
@@ -1,91 +1,91 @@
 // AUTOGENERATED - MANUALLY CHANGES WILL BE REVERTED BY THE GENERATOR
 export const IExecutor_ABI = [
   {
-    anonymous: false,
+    type: 'function',
+    name: 'executeTransaction',
     inputs: [
       {
-        indexed: true,
-        internalType: 'address',
         name: 'target',
         type: 'address',
+        internalType: 'address',
       },
       {
-        indexed: false,
-        internalType: 'uint256',
         name: 'value',
         type: 'uint256',
+        internalType: 'uint256',
       },
       {
-        indexed: false,
-        internalType: 'string',
         name: 'signature',
         type: 'string',
+        internalType: 'string',
       },
       {
-        indexed: false,
-        internalType: 'bytes',
         name: 'data',
         type: 'bytes',
+        internalType: 'bytes',
       },
       {
-        indexed: false,
-        internalType: 'uint256',
-        name: 'executionTime',
-        type: 'uint256',
-      },
-      {
-        indexed: false,
-        internalType: 'bool',
         name: 'withDelegatecall',
         type: 'bool',
+        internalType: 'bool',
       },
+    ],
+    outputs: [
       {
-        indexed: false,
-        internalType: 'bytes',
-        name: 'resultData',
+        name: '',
         type: 'bytes',
+        internalType: 'bytes',
       },
     ],
-    name: 'ExecutedAction',
-    type: 'event',
+    stateMutability: 'payable',
   },
   {
+    type: 'event',
+    name: 'ExecutedAction',
     inputs: [
       {
-        internalType: 'address',
         name: 'target',
         type: 'address',
+        indexed: true,
+        internalType: 'address',
       },
       {
-        internalType: 'uint256',
         name: 'value',
         type: 'uint256',
+        indexed: false,
+        internalType: 'uint256',
       },
       {
-        internalType: 'string',
         name: 'signature',
         type: 'string',
+        indexed: false,
+        internalType: 'string',
       },
       {
-        internalType: 'bytes',
         name: 'data',
         type: 'bytes',
+        indexed: false,
+        internalType: 'bytes',
+      },
+      {
+        name: 'executionTime',
+        type: 'uint256',
+        indexed: false,
+        internalType: 'uint256',
       },
       {
-        internalType: 'bool',
         name: 'withDelegatecall',
         type: 'bool',
+        indexed: false,
+        internalType: 'bool',
       },
-    ],
-    name: 'executeTransaction',
-    outputs: [
       {
-        internalType: 'bytes',
-        name: '',
+        name: 'resultData',
         type: 'bytes',
+        indexed: false,
+        internalType: 'bytes',
       },
     ],
-    stateMutability: 'payable',
-    type: 'function',
+    anonymous: false,
   },
 ] as const;
diff --git a/src/ts/abis/IExecutorWithTimelock.ts b/src/ts/abis/IExecutorWithTimelock.ts
index 6ee52f09..0e0aefcb 100644
--- a/src/ts/abis/IExecutorWithTimelock.ts
+++ b/src/ts/abis/IExecutorWithTimelock.ts
@@ -1,461 +1,461 @@
 // AUTOGENERATED - MANUALLY CHANGES WILL BE REVERTED BY THE GENERATOR
 export const IExecutorWithTimelock_ABI = [
   {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: false,
-        internalType: 'bytes32',
-        name: 'actionHash',
-        type: 'bytes32',
-      },
-      {
-        indexed: true,
-        internalType: 'address',
-        name: 'target',
-        type: 'address',
-      },
+    type: 'function',
+    name: 'GRACE_PERIOD',
+    inputs: [],
+    outputs: [
       {
-        indexed: false,
-        internalType: 'uint256',
-        name: 'value',
+        name: '',
         type: 'uint256',
+        internalType: 'uint256',
       },
+    ],
+    stateMutability: 'view',
+  },
+  {
+    type: 'function',
+    name: 'MAXIMUM_DELAY',
+    inputs: [],
+    outputs: [
       {
-        indexed: false,
-        internalType: 'string',
-        name: 'signature',
-        type: 'string',
-      },
-      {
-        indexed: false,
-        internalType: 'bytes',
-        name: 'data',
-        type: 'bytes',
+        name: '',
+        type: 'uint256',
+        internalType: 'uint256',
       },
+    ],
+    stateMutability: 'view',
+  },
+  {
+    type: 'function',
+    name: 'MINIMUM_DELAY',
+    inputs: [],
+    outputs: [
       {
-        indexed: false,
-        internalType: 'uint256',
-        name: 'executionTime',
+        name: '',
         type: 'uint256',
+        internalType: 'uint256',
       },
+    ],
+    stateMutability: 'view',
+  },
+  {
+    type: 'function',
+    name: 'VOTING_DURATION',
+    inputs: [],
+    outputs: [
       {
-        indexed: false,
-        internalType: 'bool',
-        name: 'withDelegatecall',
-        type: 'bool',
+        name: '',
+        type: 'uint256',
+        internalType: 'uint256',
       },
     ],
-    name: 'CancelledAction',
-    type: 'event',
+    stateMutability: 'view',
   },
   {
-    anonymous: false,
+    type: 'function',
+    name: 'cancelTransaction',
     inputs: [
       {
-        indexed: false,
-        internalType: 'bytes32',
-        name: 'actionHash',
-        type: 'bytes32',
-      },
-      {
-        indexed: true,
-        internalType: 'address',
         name: 'target',
         type: 'address',
+        internalType: 'address',
       },
       {
-        indexed: false,
-        internalType: 'uint256',
         name: 'value',
         type: 'uint256',
+        internalType: 'uint256',
       },
       {
-        indexed: false,
-        internalType: 'string',
         name: 'signature',
         type: 'string',
+        internalType: 'string',
       },
       {
-        indexed: false,
-        internalType: 'bytes',
         name: 'data',
         type: 'bytes',
+        internalType: 'bytes',
       },
       {
-        indexed: false,
-        internalType: 'uint256',
         name: 'executionTime',
         type: 'uint256',
+        internalType: 'uint256',
       },
       {
-        indexed: false,
-        internalType: 'bool',
         name: 'withDelegatecall',
         type: 'bool',
-      },
-      {
-        indexed: false,
-        internalType: 'bytes',
-        name: 'resultData',
-        type: 'bytes',
-      },
-    ],
-    name: 'ExecutedAction',
-    type: 'event',
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: false,
-        internalType: 'address',
-        name: 'newAdmin',
-        type: 'address',
-      },
-    ],
-    name: 'NewAdmin',
-    type: 'event',
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: false,
-        internalType: 'uint256',
-        name: 'delay',
-        type: 'uint256',
+        internalType: 'bool',
       },
     ],
-    name: 'NewDelay',
-    type: 'event',
-  },
-  {
-    anonymous: false,
-    inputs: [
+    outputs: [
       {
-        indexed: false,
-        internalType: 'address',
-        name: 'newPendingAdmin',
-        type: 'address',
+        name: '',
+        type: 'bytes32',
+        internalType: 'bytes32',
       },
     ],
-    name: 'NewPendingAdmin',
-    type: 'event',
+    stateMutability: 'nonpayable',
   },
   {
-    anonymous: false,
+    type: 'function',
+    name: 'executeTransaction',
     inputs: [
       {
-        indexed: false,
-        internalType: 'bytes32',
-        name: 'actionHash',
-        type: 'bytes32',
-      },
-      {
-        indexed: true,
-        internalType: 'address',
         name: 'target',
         type: 'address',
+        internalType: 'address',
       },
       {
-        indexed: false,
-        internalType: 'uint256',
         name: 'value',
         type: 'uint256',
+        internalType: 'uint256',
       },
       {
-        indexed: false,
-        internalType: 'string',
         name: 'signature',
         type: 'string',
+        internalType: 'string',
       },
       {
-        indexed: false,
-        internalType: 'bytes',
         name: 'data',
         type: 'bytes',
+        internalType: 'bytes',
       },
       {
-        indexed: false,
-        internalType: 'uint256',
         name: 'executionTime',
         type: 'uint256',
+        internalType: 'uint256',
       },
       {
-        indexed: false,
-        internalType: 'bool',
         name: 'withDelegatecall',
         type: 'bool',
+        internalType: 'bool',
       },
     ],
-    name: 'QueuedAction',
-    type: 'event',
+    outputs: [
+      {
+        name: '',
+        type: 'bytes',
+        internalType: 'bytes',
+      },
+    ],
+    stateMutability: 'payable',
   },
   {
+    type: 'function',
+    name: 'getAdmin',
     inputs: [],
-    name: 'GRACE_PERIOD',
     outputs: [
       {
-        internalType: 'uint256',
         name: '',
-        type: 'uint256',
+        type: 'address',
+        internalType: 'address',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'getDelay',
     inputs: [],
-    name: 'MAXIMUM_DELAY',
     outputs: [
       {
-        internalType: 'uint256',
         name: '',
         type: 'uint256',
+        internalType: 'uint256',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'getPendingAdmin',
     inputs: [],
-    name: 'MINIMUM_DELAY',
     outputs: [
       {
-        internalType: 'uint256',
         name: '',
-        type: 'uint256',
+        type: 'address',
+        internalType: 'address',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
-    inputs: [],
-    name: 'VOTING_DURATION',
+    type: 'function',
+    name: 'isActionQueued',
+    inputs: [
+      {
+        name: 'actionHash',
+        type: 'bytes32',
+        internalType: 'bytes32',
+      },
+    ],
     outputs: [
       {
-        internalType: 'uint256',
         name: '',
-        type: 'uint256',
+        type: 'bool',
+        internalType: 'bool',
       },
     ],
     stateMutability: 'view',
+  },
+  {
     type: 'function',
+    name: 'isProposalOverGracePeriod',
+    inputs: [
+      {
+        name: 'governance',
+        type: 'address',
+        internalType: 'contract IAaveGovernanceV2',
+      },
+      {
+        name: 'proposalId',
+        type: 'uint256',
+        internalType: 'uint256',
+      },
+    ],
+    outputs: [
+      {
+        name: '',
+        type: 'bool',
+        internalType: 'bool',
+      },
+    ],
+    stateMutability: 'view',
   },
   {
+    type: 'function',
+    name: 'queueTransaction',
     inputs: [
       {
-        internalType: 'address',
         name: 'target',
         type: 'address',
+        internalType: 'address',
       },
       {
-        internalType: 'uint256',
         name: 'value',
         type: 'uint256',
+        internalType: 'uint256',
       },
       {
-        internalType: 'string',
         name: 'signature',
         type: 'string',
+        internalType: 'string',
       },
       {
-        internalType: 'bytes',
         name: 'data',
         type: 'bytes',
+        internalType: 'bytes',
       },
       {
-        internalType: 'uint256',
         name: 'executionTime',
         type: 'uint256',
+        internalType: 'uint256',
       },
       {
-        internalType: 'bool',
         name: 'withDelegatecall',
         type: 'bool',
+        internalType: 'bool',
       },
     ],
-    name: 'cancelTransaction',
     outputs: [
       {
-        internalType: 'bytes32',
         name: '',
         type: 'bytes32',
+        internalType: 'bytes32',
       },
     ],
     stateMutability: 'nonpayable',
-    type: 'function',
   },
   {
+    type: 'event',
+    name: 'CancelledAction',
     inputs: [
       {
-        internalType: 'address',
+        name: 'actionHash',
+        type: 'bytes32',
+        indexed: false,
+        internalType: 'bytes32',
+      },
+      {
         name: 'target',
         type: 'address',
+        indexed: true,
+        internalType: 'address',
       },
       {
-        internalType: 'uint256',
         name: 'value',
         type: 'uint256',
+        indexed: false,
+        internalType: 'uint256',
       },
       {
-        internalType: 'string',
         name: 'signature',
         type: 'string',
+        indexed: false,
+        internalType: 'string',
       },
       {
-        internalType: 'bytes',
         name: 'data',
         type: 'bytes',
+        indexed: false,
+        internalType: 'bytes',
       },
       {
-        internalType: 'uint256',
         name: 'executionTime',
         type: 'uint256',
+        indexed: false,
+        internalType: 'uint256',
       },
       {
-        internalType: 'bool',
         name: 'withDelegatecall',
         type: 'bool',
+        indexed: false,
+        internalType: 'bool',
       },
     ],
-    name: 'executeTransaction',
-    outputs: [
-      {
-        internalType: 'bytes',
-        name: '',
-        type: 'bytes',
-      },
-    ],
-    stateMutability: 'payable',
-    type: 'function',
+    anonymous: false,
   },
   {
-    inputs: [],
-    name: 'getAdmin',
-    outputs: [
+    type: 'event',
+    name: 'ExecutedAction',
+    inputs: [
       {
-        internalType: 'address',
-        name: '',
+        name: 'actionHash',
+        type: 'bytes32',
+        indexed: false,
+        internalType: 'bytes32',
+      },
+      {
+        name: 'target',
         type: 'address',
+        indexed: true,
+        internalType: 'address',
       },
-    ],
-    stateMutability: 'view',
-    type: 'function',
-  },
-  {
-    inputs: [],
-    name: 'getDelay',
-    outputs: [
       {
-        internalType: 'uint256',
-        name: '',
+        name: 'value',
         type: 'uint256',
+        indexed: false,
+        internalType: 'uint256',
       },
-    ],
-    stateMutability: 'view',
-    type: 'function',
-  },
-  {
-    inputs: [],
-    name: 'getPendingAdmin',
-    outputs: [
       {
-        internalType: 'address',
-        name: '',
-        type: 'address',
+        name: 'signature',
+        type: 'string',
+        indexed: false,
+        internalType: 'string',
       },
-    ],
-    stateMutability: 'view',
-    type: 'function',
-  },
-  {
-    inputs: [
       {
-        internalType: 'bytes32',
-        name: 'actionHash',
-        type: 'bytes32',
+        name: 'data',
+        type: 'bytes',
+        indexed: false,
+        internalType: 'bytes',
       },
-    ],
-    name: 'isActionQueued',
-    outputs: [
       {
-        internalType: 'bool',
-        name: '',
+        name: 'executionTime',
+        type: 'uint256',
+        indexed: false,
+        internalType: 'uint256',
+      },
+      {
+        name: 'withDelegatecall',
         type: 'bool',
+        indexed: false,
+        internalType: 'bool',
+      },
+      {
+        name: 'resultData',
+        type: 'bytes',
+        indexed: false,
+        internalType: 'bytes',
       },
     ],
-    stateMutability: 'view',
-    type: 'function',
+    anonymous: false,
   },
   {
+    type: 'event',
+    name: 'NewAdmin',
     inputs: [
       {
-        internalType: 'contract IAaveGovernanceV2',
-        name: 'governance',
+        name: 'newAdmin',
         type: 'address',
+        indexed: false,
+        internalType: 'address',
       },
+    ],
+    anonymous: false,
+  },
+  {
+    type: 'event',
+    name: 'NewDelay',
+    inputs: [
       {
-        internalType: 'uint256',
-        name: 'proposalId',
+        name: 'delay',
         type: 'uint256',
+        indexed: false,
+        internalType: 'uint256',
       },
     ],
-    name: 'isProposalOverGracePeriod',
-    outputs: [
+    anonymous: false,
+  },
+  {
+    type: 'event',
+    name: 'NewPendingAdmin',
+    inputs: [
       {
-        internalType: 'bool',
-        name: '',
-        type: 'bool',
+        name: 'newPendingAdmin',
+        type: 'address',
+        indexed: false,
+        internalType: 'address',
       },
     ],
-    stateMutability: 'view',
-    type: 'function',
+    anonymous: false,
   },
   {
+    type: 'event',
+    name: 'QueuedAction',
     inputs: [
       {
-        internalType: 'address',
+        name: 'actionHash',
+        type: 'bytes32',
+        indexed: false,
+        internalType: 'bytes32',
+      },
+      {
         name: 'target',
         type: 'address',
+        indexed: true,
+        internalType: 'address',
       },
       {
-        internalType: 'uint256',
         name: 'value',
         type: 'uint256',
+        indexed: false,
+        internalType: 'uint256',
       },
       {
-        internalType: 'string',
         name: 'signature',
         type: 'string',
+        indexed: false,
+        internalType: 'string',
       },
       {
-        internalType: 'bytes',
         name: 'data',
         type: 'bytes',
+        indexed: false,
+        internalType: 'bytes',
       },
       {
-        internalType: 'uint256',
         name: 'executionTime',
         type: 'uint256',
+        indexed: false,
+        internalType: 'uint256',
       },
       {
-        internalType: 'bool',
         name: 'withDelegatecall',
         type: 'bool',
+        indexed: false,
+        internalType: 'bool',
       },
     ],
-    name: 'queueTransaction',
-    outputs: [
-      {
-        internalType: 'bytes32',
-        name: '',
-        type: 'bytes32',
-      },
-    ],
-    stateMutability: 'nonpayable',
-    type: 'function',
+    anonymous: false,
   },
 ] as const;
diff --git a/src/ts/abis/IGovernanceCore.ts b/src/ts/abis/IGovernanceCore.ts
index a571b946..8ab72fd2 100644
--- a/src/ts/abis/IGovernanceCore.ts
+++ b/src/ts/abis/IGovernanceCore.ts
@@ -1,1032 +1,1032 @@
 // AUTOGENERATED - MANUALLY CHANGES WILL BE REVERTED BY THE GENERATOR
 export const IGovernanceCore_ABI = [
   {
-    anonymous: false,
-    inputs: [
+    type: 'function',
+    name: 'ACHIEVABLE_VOTING_PARTICIPATION',
+    inputs: [],
+    outputs: [
       {
-        indexed: true,
-        internalType: 'uint256',
-        name: 'proposalId',
+        name: '',
         type: 'uint256',
-      },
-      {
-        indexed: true,
-        internalType: 'address',
-        name: 'to',
-        type: 'address',
-      },
-      {
-        indexed: false,
         internalType: 'uint256',
-        name: 'cancellationFee',
-        type: 'uint256',
       },
+    ],
+    stateMutability: 'view',
+  },
+  {
+    type: 'function',
+    name: 'CANCELLATION_FEE_COLLECTOR',
+    inputs: [],
+    outputs: [
       {
-        indexed: true,
-        internalType: 'bool',
-        name: 'success',
-        type: 'bool',
+        name: '',
+        type: 'address',
+        internalType: 'address',
       },
     ],
-    name: 'CancellationFeeRedeemed',
-    type: 'event',
+    stateMutability: 'view',
   },
   {
-    anonymous: false,
-    inputs: [
+    type: 'function',
+    name: 'COOLDOWN_PERIOD',
+    inputs: [],
+    outputs: [
       {
-        indexed: false,
-        internalType: 'uint256',
-        name: 'cancellationFee',
+        name: '',
         type: 'uint256',
+        internalType: 'uint256',
       },
     ],
-    name: 'CancellationFeeUpdated',
-    type: 'event',
+    stateMutability: 'view',
   },
   {
-    anonymous: false,
-    inputs: [
+    type: 'function',
+    name: 'MIN_VOTING_DURATION',
+    inputs: [],
+    outputs: [
       {
-        indexed: true,
-        internalType: 'uint256',
-        name: 'proposalId',
+        name: '',
         type: 'uint256',
+        internalType: 'uint256',
       },
+    ],
+    stateMutability: 'view',
+  },
+  {
+    type: 'function',
+    name: 'NAME',
+    inputs: [],
+    outputs: [
       {
-        indexed: false,
-        internalType: 'uint40',
-        name: 'payloadId',
-        type: 'uint40',
+        name: '',
+        type: 'string',
+        internalType: 'string',
       },
+    ],
+    stateMutability: 'view',
+  },
+  {
+    type: 'function',
+    name: 'PRECISION_DIVIDER',
+    inputs: [],
+    outputs: [
       {
-        indexed: true,
-        internalType: 'address',
-        name: 'payloadsController',
-        type: 'address',
+        name: '',
+        type: 'uint256',
+        internalType: 'uint256',
       },
+    ],
+    stateMutability: 'view',
+  },
+  {
+    type: 'function',
+    name: 'PROPOSAL_EXPIRATION_TIME',
+    inputs: [],
+    outputs: [
       {
-        indexed: true,
-        internalType: 'uint256',
-        name: 'chainId',
+        name: '',
         type: 'uint256',
+        internalType: 'uint256',
       },
+    ],
+    stateMutability: 'view',
+  },
+  {
+    type: 'function',
+    name: 'VOTING_TOKENS_CAP',
+    inputs: [],
+    outputs: [
       {
-        indexed: false,
-        internalType: 'uint256',
-        name: 'payloadNumberOnProposal',
+        name: '',
         type: 'uint256',
+        internalType: 'uint256',
       },
+    ],
+    stateMutability: 'view',
+  },
+  {
+    type: 'function',
+    name: 'activateVoting',
+    inputs: [
       {
-        indexed: false,
-        internalType: 'uint256',
-        name: 'numberOfPayloadsOnProposal',
+        name: 'proposalId',
         type: 'uint256',
+        internalType: 'uint256',
       },
     ],
-    name: 'PayloadSent',
-    type: 'event',
+    outputs: [],
+    stateMutability: 'nonpayable',
   },
   {
-    anonymous: false,
+    type: 'function',
+    name: 'addVotingPortals',
     inputs: [
       {
-        indexed: true,
-        internalType: 'address',
-        name: 'newPowerStrategy',
-        type: 'address',
+        name: 'votingPortals',
+        type: 'address[]',
+        internalType: 'address[]',
       },
     ],
-    name: 'PowerStrategyUpdated',
-    type: 'event',
+    outputs: [],
+    stateMutability: 'nonpayable',
   },
   {
-    anonymous: false,
+    type: 'function',
+    name: 'cancelProposal',
     inputs: [
       {
-        indexed: true,
-        internalType: 'uint256',
         name: 'proposalId',
         type: 'uint256',
+        internalType: 'uint256',
       },
     ],
-    name: 'ProposalCanceled',
-    type: 'event',
+    outputs: [],
+    stateMutability: 'nonpayable',
   },
   {
-    anonymous: false,
+    type: 'function',
+    name: 'createProposal',
     inputs: [
       {
-        indexed: true,
-        internalType: 'uint256',
-        name: 'proposalId',
-        type: 'uint256',
+        name: 'payloads',
+        type: 'tuple[]',
+        internalType: 'struct PayloadsControllerUtils.Payload[]',
+        components: [
+          {
+            name: 'chain',
+            type: 'uint256',
+            internalType: 'uint256',
+          },
+          {
+            name: 'accessLevel',
+            type: 'uint8',
+            internalType: 'enum PayloadsControllerUtils.AccessControl',
+          },
+          {
+            name: 'payloadsController',
+            type: 'address',
+            internalType: 'address',
+          },
+          {
+            name: 'payloadId',
+            type: 'uint40',
+            internalType: 'uint40',
+          },
+        ],
       },
       {
-        indexed: true,
-        internalType: 'address',
-        name: 'creator',
+        name: 'votingPortal',
         type: 'address',
+        internalType: 'address',
       },
       {
-        indexed: true,
-        internalType: 'enum PayloadsControllerUtils.AccessControl',
-        name: 'accessLevel',
-        type: 'uint8',
-      },
-      {
-        indexed: false,
-        internalType: 'bytes32',
         name: 'ipfsHash',
         type: 'bytes32',
+        internalType: 'bytes32',
       },
     ],
-    name: 'ProposalCreated',
-    type: 'event',
-  },
-  {
-    anonymous: false,
-    inputs: [
+    outputs: [
       {
-        indexed: true,
-        internalType: 'uint256',
-        name: 'proposalId',
+        name: '',
         type: 'uint256',
+        internalType: 'uint256',
       },
     ],
-    name: 'ProposalExecuted',
-    type: 'event',
+    stateMutability: 'payable',
   },
   {
-    anonymous: false,
+    type: 'function',
+    name: 'executeProposal',
     inputs: [
       {
-        indexed: true,
-        internalType: 'uint256',
         name: 'proposalId',
         type: 'uint256',
-      },
-      {
-        indexed: false,
-        internalType: 'uint128',
-        name: 'votesFor',
-        type: 'uint128',
-      },
-      {
-        indexed: false,
-        internalType: 'uint128',
-        name: 'votesAgainst',
-        type: 'uint128',
+        internalType: 'uint256',
       },
     ],
-    name: 'ProposalFailed',
-    type: 'event',
+    outputs: [],
+    stateMutability: 'nonpayable',
   },
   {
-    anonymous: false,
-    inputs: [
+    type: 'function',
+    name: 'getCancellationFee',
+    inputs: [],
+    outputs: [
       {
-        indexed: true,
-        internalType: 'uint256',
-        name: 'proposalId',
+        name: '',
         type: 'uint256',
-      },
-      {
-        indexed: false,
-        internalType: 'uint128',
-        name: 'votesFor',
-        type: 'uint128',
-      },
-      {
-        indexed: false,
-        internalType: 'uint128',
-        name: 'votesAgainst',
-        type: 'uint128',
+        internalType: 'uint256',
       },
     ],
-    name: 'ProposalQueued',
-    type: 'event',
+    stateMutability: 'view',
   },
   {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: 'address',
-        name: 'voter',
-        type: 'address',
-      },
+    type: 'function',
+    name: 'getPowerStrategy',
+    inputs: [],
+    outputs: [
       {
-        indexed: true,
-        internalType: 'address',
-        name: 'representative',
+        name: '',
         type: 'address',
-      },
-      {
-        indexed: true,
-        internalType: 'uint256',
-        name: 'chainId',
-        type: 'uint256',
+        internalType: 'contract IGovernancePowerStrategy',
       },
     ],
-    name: 'RepresentativeUpdated',
-    type: 'event',
+    stateMutability: 'view',
   },
   {
-    anonymous: false,
+    type: 'function',
+    name: 'getProposal',
     inputs: [
       {
-        indexed: true,
-        internalType: 'uint256',
         name: 'proposalId',
         type: 'uint256',
+        internalType: 'uint256',
       },
+    ],
+    outputs: [
       {
-        indexed: true,
-        internalType: 'address',
-        name: 'voter',
-        type: 'address',
-      },
-      {
-        indexed: true,
-        internalType: 'bool',
-        name: 'support',
-        type: 'bool',
-      },
-      {
+        name: '',
+        type: 'tuple',
+        internalType: 'struct IGovernanceCore.Proposal',
         components: [
           {
+            name: 'state',
+            type: 'uint8',
+            internalType: 'enum IGovernanceCore.State',
+          },
+          {
+            name: 'accessLevel',
+            type: 'uint8',
+            internalType: 'enum PayloadsControllerUtils.AccessControl',
+          },
+          {
+            name: 'creationTime',
+            type: 'uint40',
+            internalType: 'uint40',
+          },
+          {
+            name: 'votingDuration',
+            type: 'uint24',
+            internalType: 'uint24',
+          },
+          {
+            name: 'votingActivationTime',
+            type: 'uint40',
+            internalType: 'uint40',
+          },
+          {
+            name: 'queuingTime',
+            type: 'uint40',
+            internalType: 'uint40',
+          },
+          {
+            name: 'cancelTimestamp',
+            type: 'uint40',
+            internalType: 'uint40',
+          },
+          {
+            name: 'creator',
+            type: 'address',
             internalType: 'address',
-            name: 'underlyingAsset',
+          },
+          {
+            name: 'votingPortal',
             type: 'address',
+            internalType: 'address',
+          },
+          {
+            name: 'snapshotBlockHash',
+            type: 'bytes32',
+            internalType: 'bytes32',
+          },
+          {
+            name: 'ipfsHash',
+            type: 'bytes32',
+            internalType: 'bytes32',
           },
           {
+            name: 'forVotes',
+            type: 'uint128',
             internalType: 'uint128',
-            name: 'slot',
+          },
+          {
+            name: 'againstVotes',
             type: 'uint128',
+            internalType: 'uint128',
+          },
+          {
+            name: 'cancellationFee',
+            type: 'uint256',
+            internalType: 'uint256',
+          },
+          {
+            name: 'payloads',
+            type: 'tuple[]',
+            internalType: 'struct PayloadsControllerUtils.Payload[]',
+            components: [
+              {
+                name: 'chain',
+                type: 'uint256',
+                internalType: 'uint256',
+              },
+              {
+                name: 'accessLevel',
+                type: 'uint8',
+                internalType: 'enum PayloadsControllerUtils.AccessControl',
+              },
+              {
+                name: 'payloadsController',
+                type: 'address',
+                internalType: 'address',
+              },
+              {
+                name: 'payloadId',
+                type: 'uint40',
+                internalType: 'uint40',
+              },
+            ],
           },
         ],
-        indexed: false,
-        internalType: 'struct IVotingMachineWithProofs.VotingAssetWithSlot[]',
-        name: 'votingAssetsWithSlot',
-        type: 'tuple[]',
       },
     ],
-    name: 'VoteForwarded',
-    type: 'event',
+    stateMutability: 'view',
   },
   {
-    anonymous: false,
+    type: 'function',
+    name: 'getProposalState',
     inputs: [
       {
-        indexed: true,
-        internalType: 'uint256',
         name: 'proposalId',
         type: 'uint256',
+        internalType: 'uint256',
       },
+    ],
+    outputs: [
       {
-        indexed: true,
-        internalType: 'bytes32',
-        name: 'snapshotBlockHash',
-        type: 'bytes32',
-      },
-      {
-        indexed: false,
-        internalType: 'uint24',
-        name: 'votingDuration',
-        type: 'uint24',
+        name: '',
+        type: 'uint8',
+        internalType: 'enum IGovernanceCore.State',
       },
     ],
-    name: 'VotingActivated',
-    type: 'event',
+    stateMutability: 'view',
   },
   {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: 'enum PayloadsControllerUtils.AccessControl',
-        name: 'accessLevel',
-        type: 'uint8',
-      },
-      {
-        indexed: false,
-        internalType: 'uint24',
-        name: 'votingDuration',
-        type: 'uint24',
-      },
-      {
-        indexed: false,
-        internalType: 'uint24',
-        name: 'coolDownBeforeVotingStart',
-        type: 'uint24',
-      },
-      {
-        indexed: false,
-        internalType: 'uint256',
-        name: 'yesThreshold',
-        type: 'uint256',
-      },
+    type: 'function',
+    name: 'getProposalsCount',
+    inputs: [],
+    outputs: [
       {
-        indexed: false,
-        internalType: 'uint256',
-        name: 'yesNoDifferential',
+        name: '',
         type: 'uint256',
-      },
-      {
-        indexed: false,
         internalType: 'uint256',
-        name: 'minPropositionPower',
-        type: 'uint256',
       },
     ],
-    name: 'VotingConfigUpdated',
-    type: 'event',
+    stateMutability: 'view',
   },
   {
-    anonymous: false,
+    type: 'function',
+    name: 'getRepresentativeByChain',
     inputs: [
       {
-        indexed: true,
-        internalType: 'address',
-        name: 'votingPortal',
+        name: 'voter',
         type: 'address',
+        internalType: 'address',
       },
       {
-        indexed: true,
-        internalType: 'bool',
-        name: 'approved',
-        type: 'bool',
+        name: 'chainId',
+        type: 'uint256',
+        internalType: 'uint256',
       },
     ],
-    name: 'VotingPortalUpdated',
-    type: 'event',
-  },
-  {
-    inputs: [],
-    name: 'ACHIEVABLE_VOTING_PARTICIPATION',
     outputs: [
       {
-        internalType: 'uint256',
         name: '',
-        type: 'uint256',
+        type: 'address',
+        internalType: 'address',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
-    inputs: [],
-    name: 'CANCELLATION_FEE_COLLECTOR',
-    outputs: [
+    type: 'function',
+    name: 'getRepresentedVotersByChain',
+    inputs: [
       {
-        internalType: 'address',
-        name: '',
+        name: 'representative',
         type: 'address',
+        internalType: 'address',
       },
-    ],
-    stateMutability: 'view',
-    type: 'function',
-  },
-  {
-    inputs: [],
-    name: 'COOLDOWN_PERIOD',
-    outputs: [
       {
-        internalType: 'uint256',
-        name: '',
+        name: 'chainId',
         type: 'uint256',
+        internalType: 'uint256',
       },
     ],
-    stateMutability: 'view',
-    type: 'function',
-  },
-  {
-    inputs: [],
-    name: 'MIN_VOTING_DURATION',
     outputs: [
       {
-        internalType: 'uint256',
         name: '',
-        type: 'uint256',
+        type: 'address[]',
+        internalType: 'address[]',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
-    inputs: [],
-    name: 'NAME',
+    type: 'function',
+    name: 'getVotingConfig',
+    inputs: [
+      {
+        name: 'accessLevel',
+        type: 'uint8',
+        internalType: 'enum PayloadsControllerUtils.AccessControl',
+      },
+    ],
     outputs: [
       {
-        internalType: 'string',
         name: '',
-        type: 'string',
+        type: 'tuple',
+        internalType: 'struct IGovernanceCore.VotingConfig',
+        components: [
+          {
+            name: 'coolDownBeforeVotingStart',
+            type: 'uint24',
+            internalType: 'uint24',
+          },
+          {
+            name: 'votingDuration',
+            type: 'uint24',
+            internalType: 'uint24',
+          },
+          {
+            name: 'yesThreshold',
+            type: 'uint56',
+            internalType: 'uint56',
+          },
+          {
+            name: 'yesNoDifferential',
+            type: 'uint56',
+            internalType: 'uint56',
+          },
+          {
+            name: 'minPropositionPower',
+            type: 'uint56',
+            internalType: 'uint56',
+          },
+        ],
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'getVotingPortalsCount',
     inputs: [],
-    name: 'PRECISION_DIVIDER',
     outputs: [
       {
-        internalType: 'uint256',
         name: '',
         type: 'uint256',
+        internalType: 'uint256',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
-    inputs: [],
-    name: 'PROPOSAL_EXPIRATION_TIME',
-    outputs: [
+    type: 'function',
+    name: 'isVotingPortalApproved',
+    inputs: [
       {
-        internalType: 'uint256',
-        name: '',
-        type: 'uint256',
+        name: 'votingPortal',
+        type: 'address',
+        internalType: 'address',
       },
     ],
-    stateMutability: 'view',
-    type: 'function',
-  },
-  {
-    inputs: [],
-    name: 'VOTING_TOKENS_CAP',
     outputs: [
       {
-        internalType: 'uint256',
         name: '',
-        type: 'uint256',
+        type: 'bool',
+        internalType: 'bool',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'queueProposal',
     inputs: [
       {
-        internalType: 'uint256',
         name: 'proposalId',
         type: 'uint256',
+        internalType: 'uint256',
+      },
+      {
+        name: 'forVotes',
+        type: 'uint128',
+        internalType: 'uint128',
+      },
+      {
+        name: 'againstVotes',
+        type: 'uint128',
+        internalType: 'uint128',
       },
     ],
-    name: 'activateVoting',
     outputs: [],
     stateMutability: 'nonpayable',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'redeemCancellationFee',
     inputs: [
       {
-        internalType: 'address[]',
-        name: 'votingPortals',
-        type: 'address[]',
+        name: 'proposalIds',
+        type: 'uint256[]',
+        internalType: 'uint256[]',
       },
     ],
-    name: 'addVotingPortals',
     outputs: [],
     stateMutability: 'nonpayable',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'removeVotingPortals',
     inputs: [
       {
-        internalType: 'uint256',
-        name: 'proposalId',
-        type: 'uint256',
+        name: 'votingPortals',
+        type: 'address[]',
+        internalType: 'address[]',
       },
     ],
-    name: 'cancelProposal',
     outputs: [],
     stateMutability: 'nonpayable',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'rescueVotingPortal',
     inputs: [
       {
-        components: [
-          {
-            internalType: 'uint256',
-            name: 'chain',
-            type: 'uint256',
-          },
-          {
-            internalType: 'enum PayloadsControllerUtils.AccessControl',
-            name: 'accessLevel',
-            type: 'uint8',
-          },
-          {
-            internalType: 'address',
-            name: 'payloadsController',
-            type: 'address',
-          },
-          {
-            internalType: 'uint40',
-            name: 'payloadId',
-            type: 'uint40',
-          },
-        ],
-        internalType: 'struct PayloadsControllerUtils.Payload[]',
-        name: 'payloads',
-        type: 'tuple[]',
-      },
-      {
-        internalType: 'address',
         name: 'votingPortal',
         type: 'address',
-      },
-      {
-        internalType: 'bytes32',
-        name: 'ipfsHash',
-        type: 'bytes32',
-      },
-    ],
-    name: 'createProposal',
-    outputs: [
-      {
-        internalType: 'uint256',
-        name: '',
-        type: 'uint256',
-      },
-    ],
-    stateMutability: 'payable',
-    type: 'function',
-  },
-  {
-    inputs: [
-      {
-        internalType: 'uint256',
-        name: 'proposalId',
-        type: 'uint256',
+        internalType: 'address',
       },
     ],
-    name: 'executeProposal',
     outputs: [],
     stateMutability: 'nonpayable',
-    type: 'function',
   },
   {
-    inputs: [],
-    name: 'getCancellationFee',
-    outputs: [
-      {
-        internalType: 'uint256',
-        name: '',
-        type: 'uint256',
-      },
-    ],
-    stateMutability: 'view',
     type: 'function',
-  },
-  {
-    inputs: [],
-    name: 'getPowerStrategy',
-    outputs: [
+    name: 'setPowerStrategy',
+    inputs: [
       {
-        internalType: 'contract IGovernancePowerStrategy',
-        name: '',
+        name: 'newPowerStrategy',
         type: 'address',
+        internalType: 'contract IGovernancePowerStrategy',
       },
     ],
-    stateMutability: 'view',
-    type: 'function',
+    outputs: [],
+    stateMutability: 'nonpayable',
   },
   {
+    type: 'function',
+    name: 'setVotingConfigs',
     inputs: [
       {
-        internalType: 'uint256',
-        name: 'proposalId',
-        type: 'uint256',
-      },
-    ],
-    name: 'getProposal',
-    outputs: [
-      {
+        name: 'votingConfigs',
+        type: 'tuple[]',
+        internalType: 'struct IGovernanceCore.SetVotingConfigInput[]',
         components: [
           {
-            internalType: 'enum IGovernanceCore.State',
-            name: 'state',
-            type: 'uint8',
-          },
-          {
-            internalType: 'enum PayloadsControllerUtils.AccessControl',
             name: 'accessLevel',
             type: 'uint8',
+            internalType: 'enum PayloadsControllerUtils.AccessControl',
           },
           {
-            internalType: 'uint40',
-            name: 'creationTime',
-            type: 'uint40',
+            name: 'coolDownBeforeVotingStart',
+            type: 'uint24',
+            internalType: 'uint24',
           },
           {
-            internalType: 'uint24',
             name: 'votingDuration',
             type: 'uint24',
+            internalType: 'uint24',
           },
           {
-            internalType: 'uint40',
-            name: 'votingActivationTime',
-            type: 'uint40',
-          },
-          {
-            internalType: 'uint40',
-            name: 'queuingTime',
-            type: 'uint40',
+            name: 'yesThreshold',
+            type: 'uint256',
+            internalType: 'uint256',
           },
           {
-            internalType: 'uint40',
-            name: 'cancelTimestamp',
-            type: 'uint40',
+            name: 'yesNoDifferential',
+            type: 'uint256',
+            internalType: 'uint256',
           },
           {
-            internalType: 'address',
-            name: 'creator',
-            type: 'address',
+            name: 'minPropositionPower',
+            type: 'uint256',
+            internalType: 'uint256',
           },
+        ],
+      },
+    ],
+    outputs: [],
+    stateMutability: 'nonpayable',
+  },
+  {
+    type: 'function',
+    name: 'updateCancellationFee',
+    inputs: [
+      {
+        name: 'cancellationFee',
+        type: 'uint256',
+        internalType: 'uint256',
+      },
+    ],
+    outputs: [],
+    stateMutability: 'nonpayable',
+  },
+  {
+    type: 'function',
+    name: 'updateRepresentativesForChain',
+    inputs: [
+      {
+        name: 'representatives',
+        type: 'tuple[]',
+        internalType: 'struct IGovernanceCore.RepresentativeInput[]',
+        components: [
           {
-            internalType: 'address',
-            name: 'votingPortal',
+            name: 'representative',
             type: 'address',
+            internalType: 'address',
           },
           {
-            internalType: 'bytes32',
-            name: 'snapshotBlockHash',
-            type: 'bytes32',
-          },
-          {
-            internalType: 'bytes32',
-            name: 'ipfsHash',
-            type: 'bytes32',
-          },
-          {
-            internalType: 'uint128',
-            name: 'forVotes',
-            type: 'uint128',
-          },
-          {
-            internalType: 'uint128',
-            name: 'againstVotes',
-            type: 'uint128',
-          },
-          {
-            internalType: 'uint256',
-            name: 'cancellationFee',
+            name: 'chainId',
             type: 'uint256',
-          },
-          {
-            components: [
-              {
-                internalType: 'uint256',
-                name: 'chain',
-                type: 'uint256',
-              },
-              {
-                internalType: 'enum PayloadsControllerUtils.AccessControl',
-                name: 'accessLevel',
-                type: 'uint8',
-              },
-              {
-                internalType: 'address',
-                name: 'payloadsController',
-                type: 'address',
-              },
-              {
-                internalType: 'uint40',
-                name: 'payloadId',
-                type: 'uint40',
-              },
-            ],
-            internalType: 'struct PayloadsControllerUtils.Payload[]',
-            name: 'payloads',
-            type: 'tuple[]',
+            internalType: 'uint256',
           },
         ],
-        internalType: 'struct IGovernanceCore.Proposal',
-        name: '',
-        type: 'tuple',
       },
     ],
-    stateMutability: 'view',
-    type: 'function',
+    outputs: [],
+    stateMutability: 'nonpayable',
   },
   {
+    type: 'event',
+    name: 'CancellationFeeRedeemed',
     inputs: [
       {
-        internalType: 'uint256',
         name: 'proposalId',
         type: 'uint256',
+        indexed: true,
+        internalType: 'uint256',
       },
-    ],
-    name: 'getProposalState',
-    outputs: [
       {
-        internalType: 'enum IGovernanceCore.State',
-        name: '',
-        type: 'uint8',
+        name: 'to',
+        type: 'address',
+        indexed: true,
+        internalType: 'address',
+      },
+      {
+        name: 'cancellationFee',
+        type: 'uint256',
+        indexed: false,
+        internalType: 'uint256',
+      },
+      {
+        name: 'success',
+        type: 'bool',
+        indexed: true,
+        internalType: 'bool',
       },
     ],
-    stateMutability: 'view',
-    type: 'function',
+    anonymous: false,
   },
   {
-    inputs: [],
-    name: 'getProposalsCount',
-    outputs: [
+    type: 'event',
+    name: 'CancellationFeeUpdated',
+    inputs: [
       {
-        internalType: 'uint256',
-        name: '',
+        name: 'cancellationFee',
         type: 'uint256',
+        indexed: false,
+        internalType: 'uint256',
       },
     ],
-    stateMutability: 'view',
-    type: 'function',
+    anonymous: false,
   },
   {
+    type: 'event',
+    name: 'PayloadSent',
     inputs: [
       {
-        internalType: 'address',
-        name: 'voter',
-        type: 'address',
-      },
-      {
-        internalType: 'uint256',
-        name: 'chainId',
+        name: 'proposalId',
         type: 'uint256',
+        indexed: true,
+        internalType: 'uint256',
       },
-    ],
-    name: 'getRepresentativeByChain',
-    outputs: [
       {
-        internalType: 'address',
-        name: '',
-        type: 'address',
+        name: 'payloadId',
+        type: 'uint40',
+        indexed: false,
+        internalType: 'uint40',
       },
-    ],
-    stateMutability: 'view',
-    type: 'function',
-  },
-  {
-    inputs: [
       {
-        internalType: 'address',
-        name: 'representative',
+        name: 'payloadsController',
         type: 'address',
+        indexed: true,
+        internalType: 'address',
       },
       {
-        internalType: 'uint256',
         name: 'chainId',
         type: 'uint256',
+        indexed: true,
+        internalType: 'uint256',
+      },
+      {
+        name: 'payloadNumberOnProposal',
+        type: 'uint256',
+        indexed: false,
+        internalType: 'uint256',
       },
-    ],
-    name: 'getRepresentedVotersByChain',
-    outputs: [
       {
-        internalType: 'address[]',
-        name: '',
-        type: 'address[]',
+        name: 'numberOfPayloadsOnProposal',
+        type: 'uint256',
+        indexed: false,
+        internalType: 'uint256',
       },
     ],
-    stateMutability: 'view',
-    type: 'function',
+    anonymous: false,
   },
   {
+    type: 'event',
+    name: 'PowerStrategyUpdated',
     inputs: [
       {
-        internalType: 'enum PayloadsControllerUtils.AccessControl',
-        name: 'accessLevel',
-        type: 'uint8',
-      },
-    ],
-    name: 'getVotingConfig',
-    outputs: [
-      {
-        components: [
-          {
-            internalType: 'uint24',
-            name: 'coolDownBeforeVotingStart',
-            type: 'uint24',
-          },
-          {
-            internalType: 'uint24',
-            name: 'votingDuration',
-            type: 'uint24',
-          },
-          {
-            internalType: 'uint56',
-            name: 'yesThreshold',
-            type: 'uint56',
-          },
-          {
-            internalType: 'uint56',
-            name: 'yesNoDifferential',
-            type: 'uint56',
-          },
-          {
-            internalType: 'uint56',
-            name: 'minPropositionPower',
-            type: 'uint56',
-          },
-        ],
-        internalType: 'struct IGovernanceCore.VotingConfig',
-        name: '',
-        type: 'tuple',
+        name: 'newPowerStrategy',
+        type: 'address',
+        indexed: true,
+        internalType: 'address',
       },
     ],
-    stateMutability: 'view',
-    type: 'function',
+    anonymous: false,
   },
   {
-    inputs: [],
-    name: 'getVotingPortalsCount',
-    outputs: [
+    type: 'event',
+    name: 'ProposalCanceled',
+    inputs: [
       {
-        internalType: 'uint256',
-        name: '',
+        name: 'proposalId',
         type: 'uint256',
+        indexed: true,
+        internalType: 'uint256',
       },
     ],
-    stateMutability: 'view',
-    type: 'function',
+    anonymous: false,
   },
   {
+    type: 'event',
+    name: 'ProposalCreated',
     inputs: [
       {
-        internalType: 'address',
-        name: 'votingPortal',
+        name: 'proposalId',
+        type: 'uint256',
+        indexed: true,
+        internalType: 'uint256',
+      },
+      {
+        name: 'creator',
         type: 'address',
+        indexed: true,
+        internalType: 'address',
+      },
+      {
+        name: 'accessLevel',
+        type: 'uint8',
+        indexed: true,
+        internalType: 'enum PayloadsControllerUtils.AccessControl',
+      },
+      {
+        name: 'ipfsHash',
+        type: 'bytes32',
+        indexed: false,
+        internalType: 'bytes32',
       },
     ],
-    name: 'isVotingPortalApproved',
-    outputs: [
+    anonymous: false,
+  },
+  {
+    type: 'event',
+    name: 'ProposalExecuted',
+    inputs: [
       {
-        internalType: 'bool',
-        name: '',
-        type: 'bool',
+        name: 'proposalId',
+        type: 'uint256',
+        indexed: true,
+        internalType: 'uint256',
       },
     ],
-    stateMutability: 'view',
-    type: 'function',
+    anonymous: false,
   },
   {
+    type: 'event',
+    name: 'ProposalFailed',
     inputs: [
       {
-        internalType: 'uint256',
         name: 'proposalId',
         type: 'uint256',
+        indexed: true,
+        internalType: 'uint256',
       },
       {
-        internalType: 'uint128',
-        name: 'forVotes',
+        name: 'votesFor',
         type: 'uint128',
+        indexed: false,
+        internalType: 'uint128',
       },
       {
-        internalType: 'uint128',
-        name: 'againstVotes',
+        name: 'votesAgainst',
         type: 'uint128',
+        indexed: false,
+        internalType: 'uint128',
       },
     ],
-    name: 'queueProposal',
-    outputs: [],
-    stateMutability: 'nonpayable',
-    type: 'function',
+    anonymous: false,
   },
   {
+    type: 'event',
+    name: 'ProposalQueued',
     inputs: [
       {
-        internalType: 'uint256[]',
-        name: 'proposalIds',
-        type: 'uint256[]',
+        name: 'proposalId',
+        type: 'uint256',
+        indexed: true,
+        internalType: 'uint256',
       },
-    ],
-    name: 'redeemCancellationFee',
-    outputs: [],
-    stateMutability: 'nonpayable',
-    type: 'function',
-  },
-  {
-    inputs: [
       {
-        internalType: 'address[]',
-        name: 'votingPortals',
-        type: 'address[]',
+        name: 'votesFor',
+        type: 'uint128',
+        indexed: false,
+        internalType: 'uint128',
+      },
+      {
+        name: 'votesAgainst',
+        type: 'uint128',
+        indexed: false,
+        internalType: 'uint128',
       },
     ],
-    name: 'removeVotingPortals',
-    outputs: [],
-    stateMutability: 'nonpayable',
-    type: 'function',
+    anonymous: false,
   },
   {
+    type: 'event',
+    name: 'RepresentativeUpdated',
     inputs: [
       {
+        name: 'voter',
+        type: 'address',
+        indexed: true,
         internalType: 'address',
-        name: 'votingPortal',
+      },
+      {
+        name: 'representative',
         type: 'address',
+        indexed: true,
+        internalType: 'address',
+      },
+      {
+        name: 'chainId',
+        type: 'uint256',
+        indexed: true,
+        internalType: 'uint256',
       },
     ],
-    name: 'rescueVotingPortal',
-    outputs: [],
-    stateMutability: 'nonpayable',
-    type: 'function',
+    anonymous: false,
   },
   {
+    type: 'event',
+    name: 'VoteForwarded',
     inputs: [
       {
-        internalType: 'contract IGovernancePowerStrategy',
-        name: 'newPowerStrategy',
+        name: 'proposalId',
+        type: 'uint256',
+        indexed: true,
+        internalType: 'uint256',
+      },
+      {
+        name: 'voter',
         type: 'address',
+        indexed: true,
+        internalType: 'address',
+      },
+      {
+        name: 'support',
+        type: 'bool',
+        indexed: true,
+        internalType: 'bool',
       },
-    ],
-    name: 'setPowerStrategy',
-    outputs: [],
-    stateMutability: 'nonpayable',
-    type: 'function',
-  },
-  {
-    inputs: [
       {
+        name: 'votingAssetsWithSlot',
+        type: 'tuple[]',
+        indexed: false,
+        internalType: 'struct IVotingMachineWithProofs.VotingAssetWithSlot[]',
         components: [
           {
-            internalType: 'enum PayloadsControllerUtils.AccessControl',
-            name: 'accessLevel',
-            type: 'uint8',
-          },
-          {
-            internalType: 'uint24',
-            name: 'coolDownBeforeVotingStart',
-            type: 'uint24',
-          },
-          {
-            internalType: 'uint24',
-            name: 'votingDuration',
-            type: 'uint24',
-          },
-          {
-            internalType: 'uint256',
-            name: 'yesThreshold',
-            type: 'uint256',
-          },
-          {
-            internalType: 'uint256',
-            name: 'yesNoDifferential',
-            type: 'uint256',
+            name: 'underlyingAsset',
+            type: 'address',
+            internalType: 'address',
           },
           {
-            internalType: 'uint256',
-            name: 'minPropositionPower',
-            type: 'uint256',
+            name: 'slot',
+            type: 'uint128',
+            internalType: 'uint128',
           },
         ],
-        internalType: 'struct IGovernanceCore.SetVotingConfigInput[]',
-        name: 'votingConfigs',
-        type: 'tuple[]',
       },
     ],
-    name: 'setVotingConfigs',
-    outputs: [],
-    stateMutability: 'nonpayable',
-    type: 'function',
+    anonymous: false,
   },
   {
+    type: 'event',
+    name: 'VotingActivated',
     inputs: [
       {
+        name: 'proposalId',
+        type: 'uint256',
+        indexed: true,
         internalType: 'uint256',
-        name: 'cancellationFee',
+      },
+      {
+        name: 'snapshotBlockHash',
+        type: 'bytes32',
+        indexed: true,
+        internalType: 'bytes32',
+      },
+      {
+        name: 'votingDuration',
+        type: 'uint24',
+        indexed: false,
+        internalType: 'uint24',
+      },
+    ],
+    anonymous: false,
+  },
+  {
+    type: 'event',
+    name: 'VotingConfigUpdated',
+    inputs: [
+      {
+        name: 'accessLevel',
+        type: 'uint8',
+        indexed: true,
+        internalType: 'enum PayloadsControllerUtils.AccessControl',
+      },
+      {
+        name: 'votingDuration',
+        type: 'uint24',
+        indexed: false,
+        internalType: 'uint24',
+      },
+      {
+        name: 'coolDownBeforeVotingStart',
+        type: 'uint24',
+        indexed: false,
+        internalType: 'uint24',
+      },
+      {
+        name: 'yesThreshold',
+        type: 'uint256',
+        indexed: false,
+        internalType: 'uint256',
+      },
+      {
+        name: 'yesNoDifferential',
+        type: 'uint256',
+        indexed: false,
+        internalType: 'uint256',
+      },
+      {
+        name: 'minPropositionPower',
         type: 'uint256',
+        indexed: false,
+        internalType: 'uint256',
       },
     ],
-    name: 'updateCancellationFee',
-    outputs: [],
-    stateMutability: 'nonpayable',
-    type: 'function',
+    anonymous: false,
   },
   {
+    type: 'event',
+    name: 'VotingPortalUpdated',
     inputs: [
       {
-        components: [
-          {
-            internalType: 'address',
-            name: 'representative',
-            type: 'address',
-          },
-          {
-            internalType: 'uint256',
-            name: 'chainId',
-            type: 'uint256',
-          },
-        ],
-        internalType: 'struct IGovernanceCore.RepresentativeInput[]',
-        name: 'representatives',
-        type: 'tuple[]',
+        name: 'votingPortal',
+        type: 'address',
+        indexed: true,
+        internalType: 'address',
+      },
+      {
+        name: 'approved',
+        type: 'bool',
+        indexed: true,
+        internalType: 'bool',
       },
     ],
-    name: 'updateRepresentativesForChain',
-    outputs: [],
-    stateMutability: 'nonpayable',
-    type: 'function',
+    anonymous: false,
   },
 ] as const;
diff --git a/src/ts/abis/IGovernancePowerStrategy.ts b/src/ts/abis/IGovernancePowerStrategy.ts
index 53341801..59dd711e 100644
--- a/src/ts/abis/IGovernancePowerStrategy.ts
+++ b/src/ts/abis/IGovernancePowerStrategy.ts
@@ -1,41 +1,41 @@
 // AUTOGENERATED - MANUALLY CHANGES WILL BE REVERTED BY THE GENERATOR
 export const IGovernancePowerStrategy_ABI = [
   {
+    type: 'function',
+    name: 'getFullPropositionPower',
     inputs: [
       {
-        internalType: 'address',
         name: 'user',
         type: 'address',
+        internalType: 'address',
       },
     ],
-    name: 'getFullPropositionPower',
     outputs: [
       {
-        internalType: 'uint256',
         name: '',
         type: 'uint256',
+        internalType: 'uint256',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'getFullVotingPower',
     inputs: [
       {
-        internalType: 'address',
         name: 'user',
         type: 'address',
+        internalType: 'address',
       },
     ],
-    name: 'getFullVotingPower',
     outputs: [
       {
-        internalType: 'uint256',
         name: '',
         type: 'uint256',
+        internalType: 'uint256',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
 ] as const;
diff --git a/src/ts/abis/IOwnable.ts b/src/ts/abis/IOwnable.ts
index 9b509bd5..dab5a9c4 100644
--- a/src/ts/abis/IOwnable.ts
+++ b/src/ts/abis/IOwnable.ts
@@ -1,55 +1,55 @@
 // AUTOGENERATED - MANUALLY CHANGES WILL BE REVERTED BY THE GENERATOR
 export const IOwnable_ABI = [
   {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: 'address',
-        name: 'previousOwner',
-        type: 'address',
-      },
-      {
-        indexed: true,
-        internalType: 'address',
-        name: 'newOwner',
-        type: 'address',
-      },
-    ],
-    name: 'OwnershipTransferred',
-    type: 'event',
-  },
-  {
-    inputs: [],
+    type: 'function',
     name: 'owner',
+    inputs: [],
     outputs: [
       {
-        internalType: 'address',
         name: '',
         type: 'address',
+        internalType: 'address',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
-    inputs: [],
+    type: 'function',
     name: 'renounceOwnership',
+    inputs: [],
     outputs: [],
     stateMutability: 'nonpayable',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'transferOwnership',
     inputs: [
       {
-        internalType: 'address',
         name: 'newOwner',
         type: 'address',
+        internalType: 'address',
       },
     ],
-    name: 'transferOwnership',
     outputs: [],
     stateMutability: 'nonpayable',
-    type: 'function',
+  },
+  {
+    type: 'event',
+    name: 'OwnershipTransferred',
+    inputs: [
+      {
+        name: 'previousOwner',
+        type: 'address',
+        indexed: true,
+        internalType: 'address',
+      },
+      {
+        name: 'newOwner',
+        type: 'address',
+        indexed: true,
+        internalType: 'address',
+      },
+    ],
+    anonymous: false,
   },
 ] as const;
diff --git a/src/ts/abis/IPayloadsControllerCore.ts b/src/ts/abis/IPayloadsControllerCore.ts
index 67f95f2d..c1cc95c6 100644
--- a/src/ts/abis/IPayloadsControllerCore.ts
+++ b/src/ts/abis/IPayloadsControllerCore.ts
@@ -1,504 +1,504 @@
 // AUTOGENERATED - MANUALLY CHANGES WILL BE REVERTED BY THE GENERATOR
 export const IPayloadsControllerCore_ABI = [
   {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: 'enum PayloadsControllerUtils.AccessControl',
-        name: 'accessLevel',
-        type: 'uint8',
-      },
-      {
-        indexed: true,
-        internalType: 'address',
-        name: 'executor',
-        type: 'address',
-      },
-      {
-        indexed: false,
-        internalType: 'uint40',
-        name: 'delay',
-        type: 'uint40',
-      },
-    ],
-    name: 'ExecutorSet',
-    type: 'event',
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: false,
-        internalType: 'uint40',
-        name: 'payloadId',
-        type: 'uint40',
-      },
-    ],
-    name: 'PayloadCancelled',
-    type: 'event',
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: 'uint40',
-        name: 'payloadId',
-        type: 'uint40',
-      },
-      {
-        indexed: true,
-        internalType: 'address',
-        name: 'creator',
-        type: 'address',
-      },
-      {
-        components: [
-          {
-            internalType: 'address',
-            name: 'target',
-            type: 'address',
-          },
-          {
-            internalType: 'bool',
-            name: 'withDelegateCall',
-            type: 'bool',
-          },
-          {
-            internalType: 'enum PayloadsControllerUtils.AccessControl',
-            name: 'accessLevel',
-            type: 'uint8',
-          },
-          {
-            internalType: 'uint256',
-            name: 'value',
-            type: 'uint256',
-          },
-          {
-            internalType: 'string',
-            name: 'signature',
-            type: 'string',
-          },
-          {
-            internalType: 'bytes',
-            name: 'callData',
-            type: 'bytes',
-          },
-        ],
-        indexed: false,
-        internalType: 'struct IPayloadsControllerCore.ExecutionAction[]',
-        name: 'actions',
-        type: 'tuple[]',
-      },
-      {
-        indexed: true,
-        internalType: 'enum PayloadsControllerUtils.AccessControl',
-        name: 'maximumAccessLevelRequired',
-        type: 'uint8',
-      },
-    ],
-    name: 'PayloadCreated',
-    type: 'event',
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: false,
-        internalType: 'uint40',
-        name: 'payloadId',
-        type: 'uint40',
-      },
-    ],
-    name: 'PayloadExecuted',
-    type: 'event',
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: 'address',
-        name: 'originSender',
-        type: 'address',
-      },
-      {
-        indexed: true,
-        internalType: 'uint256',
-        name: 'originChainId',
-        type: 'uint256',
-      },
-      {
-        indexed: true,
-        internalType: 'bool',
-        name: 'delivered',
-        type: 'bool',
-      },
-      {
-        indexed: false,
-        internalType: 'bytes',
-        name: 'message',
-        type: 'bytes',
-      },
-      {
-        indexed: false,
-        internalType: 'bytes',
-        name: 'reason',
-        type: 'bytes',
-      },
-    ],
-    name: 'PayloadExecutionMessageReceived',
-    type: 'event',
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: false,
-        internalType: 'uint40',
-        name: 'payloadId',
-        type: 'uint40',
-      },
-    ],
-    name: 'PayloadQueued',
-    type: 'event',
-  },
-  {
-    inputs: [],
+    type: 'function',
     name: 'EXPIRATION_DELAY',
+    inputs: [],
     outputs: [
       {
-        internalType: 'uint40',
         name: '',
         type: 'uint40',
+        internalType: 'uint40',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
-    inputs: [],
+    type: 'function',
     name: 'GRACE_PERIOD',
+    inputs: [],
     outputs: [
       {
-        internalType: 'uint40',
         name: '',
         type: 'uint40',
+        internalType: 'uint40',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
-    inputs: [],
+    type: 'function',
     name: 'MAX_EXECUTION_DELAY',
+    inputs: [],
     outputs: [
       {
-        internalType: 'uint40',
         name: '',
         type: 'uint40',
+        internalType: 'uint40',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
-    inputs: [],
+    type: 'function',
     name: 'MIN_EXECUTION_DELAY',
+    inputs: [],
     outputs: [
       {
-        internalType: 'uint40',
         name: '',
         type: 'uint40',
+        internalType: 'uint40',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'cancelPayload',
     inputs: [
       {
-        internalType: 'uint40',
         name: 'payloadId',
         type: 'uint40',
+        internalType: 'uint40',
       },
     ],
-    name: 'cancelPayload',
     outputs: [],
     stateMutability: 'nonpayable',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'createPayload',
     inputs: [
       {
+        name: 'actions',
+        type: 'tuple[]',
+        internalType: 'struct IPayloadsControllerCore.ExecutionAction[]',
         components: [
           {
-            internalType: 'address',
             name: 'target',
             type: 'address',
+            internalType: 'address',
           },
           {
-            internalType: 'bool',
             name: 'withDelegateCall',
             type: 'bool',
+            internalType: 'bool',
           },
           {
-            internalType: 'enum PayloadsControllerUtils.AccessControl',
             name: 'accessLevel',
             type: 'uint8',
+            internalType: 'enum PayloadsControllerUtils.AccessControl',
           },
           {
-            internalType: 'uint256',
             name: 'value',
             type: 'uint256',
+            internalType: 'uint256',
           },
           {
-            internalType: 'string',
             name: 'signature',
             type: 'string',
+            internalType: 'string',
           },
           {
-            internalType: 'bytes',
             name: 'callData',
             type: 'bytes',
+            internalType: 'bytes',
           },
         ],
-        internalType: 'struct IPayloadsControllerCore.ExecutionAction[]',
-        name: 'actions',
-        type: 'tuple[]',
       },
     ],
-    name: 'createPayload',
     outputs: [
       {
-        internalType: 'uint40',
         name: '',
         type: 'uint40',
+        internalType: 'uint40',
       },
     ],
     stateMutability: 'nonpayable',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'executePayload',
     inputs: [
       {
-        internalType: 'uint40',
         name: 'payloadId',
         type: 'uint40',
+        internalType: 'uint40',
       },
     ],
-    name: 'executePayload',
     outputs: [],
     stateMutability: 'payable',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'getExecutorSettingsByAccessControl',
     inputs: [
       {
-        internalType: 'enum PayloadsControllerUtils.AccessControl',
         name: 'accessControl',
         type: 'uint8',
+        internalType: 'enum PayloadsControllerUtils.AccessControl',
       },
     ],
-    name: 'getExecutorSettingsByAccessControl',
     outputs: [
       {
+        name: '',
+        type: 'tuple',
+        internalType: 'struct IPayloadsControllerCore.ExecutorConfig',
         components: [
           {
-            internalType: 'address',
             name: 'executor',
             type: 'address',
+            internalType: 'address',
           },
           {
-            internalType: 'uint40',
             name: 'delay',
             type: 'uint40',
+            internalType: 'uint40',
           },
         ],
-        internalType: 'struct IPayloadsControllerCore.ExecutorConfig',
-        name: '',
-        type: 'tuple',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'getPayloadById',
     inputs: [
       {
-        internalType: 'uint40',
         name: 'payloadId',
         type: 'uint40',
+        internalType: 'uint40',
       },
     ],
-    name: 'getPayloadById',
     outputs: [
       {
+        name: '',
+        type: 'tuple',
+        internalType: 'struct IPayloadsControllerCore.Payload',
         components: [
           {
-            internalType: 'address',
             name: 'creator',
             type: 'address',
+            internalType: 'address',
           },
           {
-            internalType: 'enum PayloadsControllerUtils.AccessControl',
             name: 'maximumAccessLevelRequired',
             type: 'uint8',
+            internalType: 'enum PayloadsControllerUtils.AccessControl',
           },
           {
-            internalType: 'enum IPayloadsControllerCore.PayloadState',
             name: 'state',
             type: 'uint8',
+            internalType: 'enum IPayloadsControllerCore.PayloadState',
           },
           {
-            internalType: 'uint40',
             name: 'createdAt',
             type: 'uint40',
+            internalType: 'uint40',
           },
           {
-            internalType: 'uint40',
             name: 'queuedAt',
             type: 'uint40',
+            internalType: 'uint40',
           },
           {
-            internalType: 'uint40',
             name: 'executedAt',
             type: 'uint40',
+            internalType: 'uint40',
           },
           {
-            internalType: 'uint40',
             name: 'cancelledAt',
             type: 'uint40',
+            internalType: 'uint40',
           },
           {
-            internalType: 'uint40',
             name: 'expirationTime',
             type: 'uint40',
+            internalType: 'uint40',
           },
           {
-            internalType: 'uint40',
             name: 'delay',
             type: 'uint40',
+            internalType: 'uint40',
           },
           {
-            internalType: 'uint40',
             name: 'gracePeriod',
             type: 'uint40',
+            internalType: 'uint40',
           },
           {
+            name: 'actions',
+            type: 'tuple[]',
+            internalType: 'struct IPayloadsControllerCore.ExecutionAction[]',
             components: [
               {
-                internalType: 'address',
                 name: 'target',
                 type: 'address',
+                internalType: 'address',
               },
               {
-                internalType: 'bool',
                 name: 'withDelegateCall',
                 type: 'bool',
+                internalType: 'bool',
               },
               {
-                internalType: 'enum PayloadsControllerUtils.AccessControl',
                 name: 'accessLevel',
                 type: 'uint8',
+                internalType: 'enum PayloadsControllerUtils.AccessControl',
               },
               {
-                internalType: 'uint256',
                 name: 'value',
                 type: 'uint256',
+                internalType: 'uint256',
               },
               {
-                internalType: 'string',
                 name: 'signature',
                 type: 'string',
+                internalType: 'string',
               },
               {
-                internalType: 'bytes',
                 name: 'callData',
                 type: 'bytes',
+                internalType: 'bytes',
               },
             ],
-            internalType: 'struct IPayloadsControllerCore.ExecutionAction[]',
-            name: 'actions',
-            type: 'tuple[]',
           },
         ],
-        internalType: 'struct IPayloadsControllerCore.Payload',
-        name: '',
-        type: 'tuple',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'getPayloadState',
     inputs: [
       {
-        internalType: 'uint40',
         name: 'payloadId',
         type: 'uint40',
+        internalType: 'uint40',
       },
     ],
-    name: 'getPayloadState',
     outputs: [
       {
-        internalType: 'enum IPayloadsControllerCore.PayloadState',
         name: '',
         type: 'uint8',
+        internalType: 'enum IPayloadsControllerCore.PayloadState',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
-    inputs: [],
+    type: 'function',
     name: 'getPayloadsCount',
+    inputs: [],
     outputs: [
       {
-        internalType: 'uint40',
         name: '',
         type: 'uint40',
+        internalType: 'uint40',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'updateExecutors',
     inputs: [
       {
+        name: 'executors',
+        type: 'tuple[]',
+        internalType: 'struct IPayloadsControllerCore.UpdateExecutorInput[]',
         components: [
           {
-            internalType: 'enum PayloadsControllerUtils.AccessControl',
             name: 'accessLevel',
             type: 'uint8',
+            internalType: 'enum PayloadsControllerUtils.AccessControl',
           },
           {
+            name: 'executorConfig',
+            type: 'tuple',
+            internalType: 'struct IPayloadsControllerCore.ExecutorConfig',
             components: [
               {
-                internalType: 'address',
                 name: 'executor',
                 type: 'address',
+                internalType: 'address',
               },
               {
-                internalType: 'uint40',
                 name: 'delay',
                 type: 'uint40',
+                internalType: 'uint40',
               },
             ],
-            internalType: 'struct IPayloadsControllerCore.ExecutorConfig',
-            name: 'executorConfig',
-            type: 'tuple',
           },
         ],
-        internalType: 'struct IPayloadsControllerCore.UpdateExecutorInput[]',
-        name: 'executors',
-        type: 'tuple[]',
       },
     ],
-    name: 'updateExecutors',
     outputs: [],
     stateMutability: 'nonpayable',
-    type: 'function',
+  },
+  {
+    type: 'event',
+    name: 'ExecutorSet',
+    inputs: [
+      {
+        name: 'accessLevel',
+        type: 'uint8',
+        indexed: true,
+        internalType: 'enum PayloadsControllerUtils.AccessControl',
+      },
+      {
+        name: 'executor',
+        type: 'address',
+        indexed: true,
+        internalType: 'address',
+      },
+      {
+        name: 'delay',
+        type: 'uint40',
+        indexed: false,
+        internalType: 'uint40',
+      },
+    ],
+    anonymous: false,
+  },
+  {
+    type: 'event',
+    name: 'PayloadCancelled',
+    inputs: [
+      {
+        name: 'payloadId',
+        type: 'uint40',
+        indexed: false,
+        internalType: 'uint40',
+      },
+    ],
+    anonymous: false,
+  },
+  {
+    type: 'event',
+    name: 'PayloadCreated',
+    inputs: [
+      {
+        name: 'payloadId',
+        type: 'uint40',
+        indexed: true,
+        internalType: 'uint40',
+      },
+      {
+        name: 'creator',
+        type: 'address',
+        indexed: true,
+        internalType: 'address',
+      },
+      {
+        name: 'actions',
+        type: 'tuple[]',
+        indexed: false,
+        internalType: 'struct IPayloadsControllerCore.ExecutionAction[]',
+        components: [
+          {
+            name: 'target',
+            type: 'address',
+            internalType: 'address',
+          },
+          {
+            name: 'withDelegateCall',
+            type: 'bool',
+            internalType: 'bool',
+          },
+          {
+            name: 'accessLevel',
+            type: 'uint8',
+            internalType: 'enum PayloadsControllerUtils.AccessControl',
+          },
+          {
+            name: 'value',
+            type: 'uint256',
+            internalType: 'uint256',
+          },
+          {
+            name: 'signature',
+            type: 'string',
+            internalType: 'string',
+          },
+          {
+            name: 'callData',
+            type: 'bytes',
+            internalType: 'bytes',
+          },
+        ],
+      },
+      {
+        name: 'maximumAccessLevelRequired',
+        type: 'uint8',
+        indexed: true,
+        internalType: 'enum PayloadsControllerUtils.AccessControl',
+      },
+    ],
+    anonymous: false,
+  },
+  {
+    type: 'event',
+    name: 'PayloadExecuted',
+    inputs: [
+      {
+        name: 'payloadId',
+        type: 'uint40',
+        indexed: false,
+        internalType: 'uint40',
+      },
+    ],
+    anonymous: false,
+  },
+  {
+    type: 'event',
+    name: 'PayloadExecutionMessageReceived',
+    inputs: [
+      {
+        name: 'originSender',
+        type: 'address',
+        indexed: true,
+        internalType: 'address',
+      },
+      {
+        name: 'originChainId',
+        type: 'uint256',
+        indexed: true,
+        internalType: 'uint256',
+      },
+      {
+        name: 'delivered',
+        type: 'bool',
+        indexed: true,
+        internalType: 'bool',
+      },
+      {
+        name: 'message',
+        type: 'bytes',
+        indexed: false,
+        internalType: 'bytes',
+      },
+      {
+        name: 'reason',
+        type: 'bytes',
+        indexed: false,
+        internalType: 'bytes',
+      },
+    ],
+    anonymous: false,
+  },
+  {
+    type: 'event',
+    name: 'PayloadQueued',
+    inputs: [
+      {
+        name: 'payloadId',
+        type: 'uint40',
+        indexed: false,
+        internalType: 'uint40',
+      },
+    ],
+    anonymous: false,
   },
 ] as const;
diff --git a/src/ts/abis/IRescuable.ts b/src/ts/abis/IRescuable.ts
index 42878bc7..fd64f3fe 100644
--- a/src/ts/abis/IRescuable.ts
+++ b/src/ts/abis/IRescuable.ts
@@ -1,113 +1,113 @@
 // AUTOGENERATED - MANUALLY CHANGES WILL BE REVERTED BY THE GENERATOR
 export const IRescuable_ABI = [
   {
-    anonymous: false,
+    type: 'function',
+    name: 'emergencyEtherTransfer',
     inputs: [
       {
-        indexed: true,
-        internalType: 'address',
-        name: 'caller',
-        type: 'address',
-      },
-      {
-        indexed: true,
-        internalType: 'address',
-        name: 'token',
-        type: 'address',
-      },
-      {
-        indexed: true,
-        internalType: 'address',
         name: 'to',
         type: 'address',
+        internalType: 'address',
       },
       {
-        indexed: false,
-        internalType: 'uint256',
         name: 'amount',
         type: 'uint256',
+        internalType: 'uint256',
       },
     ],
-    name: 'ERC20Rescued',
-    type: 'event',
+    outputs: [],
+    stateMutability: 'nonpayable',
   },
   {
-    anonymous: false,
+    type: 'function',
+    name: 'emergencyTokenTransfer',
     inputs: [
       {
-        indexed: true,
-        internalType: 'address',
-        name: 'caller',
+        name: 'erc20Token',
         type: 'address',
+        internalType: 'address',
       },
       {
-        indexed: true,
-        internalType: 'address',
         name: 'to',
         type: 'address',
+        internalType: 'address',
       },
       {
-        indexed: false,
-        internalType: 'uint256',
         name: 'amount',
         type: 'uint256',
+        internalType: 'uint256',
       },
     ],
-    name: 'NativeTokensRescued',
-    type: 'event',
+    outputs: [],
+    stateMutability: 'nonpayable',
   },
   {
-    inputs: [
+    type: 'function',
+    name: 'whoCanRescue',
+    inputs: [],
+    outputs: [
       {
-        internalType: 'address',
-        name: 'to',
+        name: '',
         type: 'address',
-      },
-      {
-        internalType: 'uint256',
-        name: 'amount',
-        type: 'uint256',
+        internalType: 'address',
       },
     ],
-    name: 'emergencyEtherTransfer',
-    outputs: [],
-    stateMutability: 'nonpayable',
-    type: 'function',
+    stateMutability: 'view',
   },
   {
+    type: 'event',
+    name: 'ERC20Rescued',
     inputs: [
       {
-        internalType: 'address',
-        name: 'erc20Token',
+        name: 'caller',
         type: 'address',
+        indexed: true,
+        internalType: 'address',
       },
       {
+        name: 'token',
+        type: 'address',
+        indexed: true,
         internalType: 'address',
+      },
+      {
         name: 'to',
         type: 'address',
+        indexed: true,
+        internalType: 'address',
       },
       {
-        internalType: 'uint256',
         name: 'amount',
         type: 'uint256',
+        indexed: false,
+        internalType: 'uint256',
       },
     ],
-    name: 'emergencyTokenTransfer',
-    outputs: [],
-    stateMutability: 'nonpayable',
-    type: 'function',
+    anonymous: false,
   },
   {
-    inputs: [],
-    name: 'whoCanRescue',
-    outputs: [
+    type: 'event',
+    name: 'NativeTokensRescued',
+    inputs: [
       {
+        name: 'caller',
+        type: 'address',
+        indexed: true,
         internalType: 'address',
-        name: '',
+      },
+      {
+        name: 'to',
         type: 'address',
+        indexed: true,
+        internalType: 'address',
+      },
+      {
+        name: 'amount',
+        type: 'uint256',
+        indexed: false,
+        internalType: 'uint256',
       },
     ],
-    stateMutability: 'view',
-    type: 'function',
+    anonymous: false,
   },
 ] as const;
diff --git a/src/ts/abis/IVotingMachineWithProofs.ts b/src/ts/abis/IVotingMachineWithProofs.ts
index bf701dc6..c75425a3 100644
--- a/src/ts/abis/IVotingMachineWithProofs.ts
+++ b/src/ts/abis/IVotingMachineWithProofs.ts
@@ -1,686 +1,686 @@
 // AUTOGENERATED - MANUALLY CHANGES WILL BE REVERTED BY THE GENERATOR
 export const IVotingMachineWithProofs_ABI = [
   {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: 'uint256',
-        name: 'proposalId',
-        type: 'uint256',
-      },
-      {
-        indexed: false,
-        internalType: 'uint256',
-        name: 'forVotes',
-        type: 'uint256',
-      },
-      {
-        indexed: false,
-        internalType: 'uint256',
-        name: 'againstVotes',
-        type: 'uint256',
-      },
-    ],
-    name: 'ProposalResultsSent',
-    type: 'event',
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: 'uint256',
-        name: 'proposalId',
-        type: 'uint256',
-      },
-      {
-        indexed: true,
-        internalType: 'bytes32',
-        name: 'blockHash',
-        type: 'bytes32',
-      },
-      {
-        indexed: false,
-        internalType: 'uint24',
-        name: 'votingDuration',
-        type: 'uint24',
-      },
-      {
-        indexed: true,
-        internalType: 'bool',
-        name: 'voteCreated',
-        type: 'bool',
-      },
-    ],
-    name: 'ProposalVoteConfigurationBridged',
-    type: 'event',
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: 'uint256',
-        name: 'proposalId',
-        type: 'uint256',
-      },
-      {
-        indexed: true,
-        internalType: 'bytes32',
-        name: 'l1BlockHash',
-        type: 'bytes32',
-      },
-      {
-        indexed: false,
-        internalType: 'uint256',
-        name: 'startTime',
-        type: 'uint256',
-      },
-      {
-        indexed: false,
-        internalType: 'uint256',
-        name: 'endTime',
-        type: 'uint256',
-      },
-    ],
-    name: 'ProposalVoteStarted',
-    type: 'event',
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: 'uint256',
-        name: 'proposalId',
-        type: 'uint256',
-      },
-      {
-        indexed: true,
-        internalType: 'address',
-        name: 'voter',
-        type: 'address',
-      },
-      {
-        indexed: true,
-        internalType: 'bool',
-        name: 'support',
-        type: 'bool',
-      },
-      {
-        indexed: false,
-        internalType: 'uint256',
-        name: 'votingPower',
-        type: 'uint256',
-      },
-    ],
-    name: 'VoteEmitted',
-    type: 'event',
-  },
-  {
-    inputs: [],
+    type: 'function',
     name: 'DATA_WAREHOUSE',
+    inputs: [],
     outputs: [
       {
-        internalType: 'contract IDataWarehouse',
         name: '',
         type: 'address',
+        internalType: 'contract IDataWarehouse',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
-    inputs: [],
+    type: 'function',
     name: 'DOMAIN_SEPARATOR',
+    inputs: [],
     outputs: [
       {
-        internalType: 'bytes32',
         name: '',
         type: 'bytes32',
+        internalType: 'bytes32',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
-    inputs: [],
+    type: 'function',
     name: 'GOVERNANCE',
+    inputs: [],
     outputs: [
       {
-        internalType: 'address',
         name: '',
         type: 'address',
+        internalType: 'address',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
-    inputs: [],
+    type: 'function',
     name: 'NAME',
+    inputs: [],
     outputs: [
       {
-        internalType: 'string',
         name: '',
         type: 'string',
+        internalType: 'string',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
-    inputs: [],
+    type: 'function',
     name: 'REPRESENTATIVES_SLOT',
+    inputs: [],
     outputs: [
       {
-        internalType: 'uint256',
         name: '',
         type: 'uint256',
+        internalType: 'uint256',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
-    inputs: [],
+    type: 'function',
     name: 'VOTE_SUBMITTED_BY_REPRESENTATIVE_TYPEHASH',
+    inputs: [],
     outputs: [
       {
-        internalType: 'bytes32',
         name: '',
         type: 'bytes32',
+        internalType: 'bytes32',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
-    inputs: [],
+    type: 'function',
     name: 'VOTE_SUBMITTED_TYPEHASH',
+    inputs: [],
     outputs: [
       {
-        internalType: 'bytes32',
         name: '',
         type: 'bytes32',
+        internalType: 'bytes32',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
-    inputs: [],
+    type: 'function',
     name: 'VOTING_ASSET_WITH_SLOT_RAW',
+    inputs: [],
     outputs: [
       {
-        internalType: 'string',
         name: '',
         type: 'string',
+        internalType: 'string',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
-    inputs: [],
+    type: 'function',
     name: 'VOTING_ASSET_WITH_SLOT_TYPEHASH',
+    inputs: [],
     outputs: [
       {
-        internalType: 'bytes32',
         name: '',
         type: 'bytes32',
+        internalType: 'bytes32',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
-    inputs: [],
+    type: 'function',
     name: 'VOTING_STRATEGY',
+    inputs: [],
     outputs: [
       {
-        internalType: 'contract IVotingStrategy',
         name: '',
         type: 'address',
+        internalType: 'contract IVotingStrategy',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'closeAndSendVote',
     inputs: [
       {
-        internalType: 'uint256',
         name: 'proposalId',
         type: 'uint256',
+        internalType: 'uint256',
       },
     ],
-    name: 'closeAndSendVote',
     outputs: [],
     stateMutability: 'nonpayable',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'getProposalById',
     inputs: [
       {
-        internalType: 'uint256',
         name: 'proposalId',
         type: 'uint256',
+        internalType: 'uint256',
       },
     ],
-    name: 'getProposalById',
     outputs: [
       {
+        name: '',
+        type: 'tuple',
+        internalType: 'struct IVotingMachineWithProofs.ProposalWithoutVotes',
         components: [
           {
-            internalType: 'uint256',
             name: 'id',
             type: 'uint256',
+            internalType: 'uint256',
           },
           {
-            internalType: 'bool',
             name: 'sentToGovernance',
             type: 'bool',
+            internalType: 'bool',
           },
           {
-            internalType: 'uint40',
             name: 'startTime',
             type: 'uint40',
+            internalType: 'uint40',
           },
           {
-            internalType: 'uint40',
             name: 'endTime',
             type: 'uint40',
+            internalType: 'uint40',
           },
           {
-            internalType: 'uint40',
             name: 'votingClosedAndSentTimestamp',
             type: 'uint40',
+            internalType: 'uint40',
           },
           {
-            internalType: 'uint128',
             name: 'forVotes',
             type: 'uint128',
+            internalType: 'uint128',
           },
           {
-            internalType: 'uint128',
             name: 'againstVotes',
             type: 'uint128',
+            internalType: 'uint128',
           },
           {
-            internalType: 'uint256',
             name: 'creationBlockNumber',
             type: 'uint256',
+            internalType: 'uint256',
           },
           {
-            internalType: 'uint256',
             name: 'votingClosedAndSentBlockNumber',
             type: 'uint256',
+            internalType: 'uint256',
           },
         ],
-        internalType: 'struct IVotingMachineWithProofs.ProposalWithoutVotes',
-        name: '',
-        type: 'tuple',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'getProposalState',
     inputs: [
       {
-        internalType: 'uint256',
         name: 'proposalId',
         type: 'uint256',
+        internalType: 'uint256',
       },
     ],
-    name: 'getProposalState',
     outputs: [
       {
-        internalType: 'enum IVotingMachineWithProofs.ProposalState',
         name: '',
         type: 'uint8',
+        internalType: 'enum IVotingMachineWithProofs.ProposalState',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'getProposalVoteConfiguration',
     inputs: [
       {
-        internalType: 'uint256',
         name: 'proposalId',
         type: 'uint256',
+        internalType: 'uint256',
       },
     ],
-    name: 'getProposalVoteConfiguration',
     outputs: [
       {
+        name: '',
+        type: 'tuple',
+        internalType: 'struct IVotingMachineWithProofs.ProposalVoteConfiguration',
         components: [
           {
-            internalType: 'uint24',
             name: 'votingDuration',
             type: 'uint24',
+            internalType: 'uint24',
           },
           {
-            internalType: 'bytes32',
             name: 'l1ProposalBlockHash',
             type: 'bytes32',
+            internalType: 'bytes32',
           },
         ],
-        internalType: 'struct IVotingMachineWithProofs.ProposalVoteConfiguration',
-        name: '',
-        type: 'tuple',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'getProposalsVoteConfigurationIds',
     inputs: [
       {
-        internalType: 'uint256',
         name: 'skip',
         type: 'uint256',
+        internalType: 'uint256',
       },
       {
-        internalType: 'uint256',
         name: 'size',
         type: 'uint256',
+        internalType: 'uint256',
       },
     ],
-    name: 'getProposalsVoteConfigurationIds',
     outputs: [
       {
-        internalType: 'uint256[]',
         name: '',
         type: 'uint256[]',
+        internalType: 'uint256[]',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'getUserProposalVote',
     inputs: [
       {
-        internalType: 'address',
         name: 'user',
         type: 'address',
+        internalType: 'address',
       },
       {
-        internalType: 'uint256',
         name: 'proposalId',
         type: 'uint256',
+        internalType: 'uint256',
       },
     ],
-    name: 'getUserProposalVote',
     outputs: [
       {
+        name: '',
+        type: 'tuple',
+        internalType: 'struct IVotingMachineWithProofs.Vote',
         components: [
           {
-            internalType: 'bool',
             name: 'support',
             type: 'bool',
+            internalType: 'bool',
           },
           {
-            internalType: 'uint248',
             name: 'votingPower',
             type: 'uint248',
+            internalType: 'uint248',
           },
         ],
-        internalType: 'struct IVotingMachineWithProofs.Vote',
-        name: '',
-        type: 'tuple',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'startProposalVote',
     inputs: [
       {
-        internalType: 'uint256',
         name: 'proposalId',
         type: 'uint256',
+        internalType: 'uint256',
       },
     ],
-    name: 'startProposalVote',
     outputs: [
       {
-        internalType: 'uint256',
         name: '',
         type: 'uint256',
+        internalType: 'uint256',
       },
     ],
     stateMutability: 'nonpayable',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'submitVote',
     inputs: [
       {
-        internalType: 'uint256',
         name: 'proposalId',
         type: 'uint256',
+        internalType: 'uint256',
       },
       {
-        internalType: 'bool',
         name: 'support',
         type: 'bool',
+        internalType: 'bool',
       },
       {
+        name: 'votingBalanceProofs',
+        type: 'tuple[]',
+        internalType: 'struct IVotingMachineWithProofs.VotingBalanceProof[]',
         components: [
           {
-            internalType: 'address',
             name: 'underlyingAsset',
             type: 'address',
+            internalType: 'address',
           },
           {
-            internalType: 'uint128',
             name: 'slot',
             type: 'uint128',
+            internalType: 'uint128',
           },
           {
-            internalType: 'bytes',
             name: 'proof',
             type: 'bytes',
+            internalType: 'bytes',
           },
         ],
-        internalType: 'struct IVotingMachineWithProofs.VotingBalanceProof[]',
-        name: 'votingBalanceProofs',
-        type: 'tuple[]',
       },
     ],
-    name: 'submitVote',
     outputs: [],
     stateMutability: 'nonpayable',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'submitVoteAsRepresentative',
     inputs: [
       {
-        internalType: 'uint256',
         name: 'proposalId',
         type: 'uint256',
+        internalType: 'uint256',
       },
       {
-        internalType: 'bool',
         name: 'support',
         type: 'bool',
+        internalType: 'bool',
       },
       {
-        internalType: 'address',
         name: 'voter',
         type: 'address',
+        internalType: 'address',
       },
       {
-        internalType: 'bytes',
         name: 'proofOfRepresentation',
         type: 'bytes',
+        internalType: 'bytes',
       },
       {
+        name: 'votingBalanceProofs',
+        type: 'tuple[]',
+        internalType: 'struct IVotingMachineWithProofs.VotingBalanceProof[]',
         components: [
           {
-            internalType: 'address',
             name: 'underlyingAsset',
             type: 'address',
+            internalType: 'address',
           },
           {
-            internalType: 'uint128',
             name: 'slot',
             type: 'uint128',
+            internalType: 'uint128',
           },
           {
-            internalType: 'bytes',
             name: 'proof',
             type: 'bytes',
+            internalType: 'bytes',
           },
         ],
-        internalType: 'struct IVotingMachineWithProofs.VotingBalanceProof[]',
-        name: 'votingBalanceProofs',
-        type: 'tuple[]',
       },
     ],
-    name: 'submitVoteAsRepresentative',
     outputs: [],
     stateMutability: 'nonpayable',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'submitVoteAsRepresentativeBySignature',
     inputs: [
       {
-        internalType: 'uint256',
         name: 'proposalId',
         type: 'uint256',
+        internalType: 'uint256',
       },
       {
-        internalType: 'address',
         name: 'voter',
         type: 'address',
+        internalType: 'address',
       },
       {
-        internalType: 'address',
         name: 'representative',
         type: 'address',
+        internalType: 'address',
       },
       {
-        internalType: 'bool',
         name: 'support',
         type: 'bool',
+        internalType: 'bool',
       },
       {
-        internalType: 'bytes',
         name: 'proofOfRepresentation',
         type: 'bytes',
+        internalType: 'bytes',
       },
       {
+        name: 'votingBalanceProofs',
+        type: 'tuple[]',
+        internalType: 'struct IVotingMachineWithProofs.VotingBalanceProof[]',
         components: [
           {
-            internalType: 'address',
             name: 'underlyingAsset',
             type: 'address',
+            internalType: 'address',
           },
           {
-            internalType: 'uint128',
             name: 'slot',
             type: 'uint128',
+            internalType: 'uint128',
           },
           {
-            internalType: 'bytes',
             name: 'proof',
             type: 'bytes',
+            internalType: 'bytes',
           },
         ],
-        internalType: 'struct IVotingMachineWithProofs.VotingBalanceProof[]',
-        name: 'votingBalanceProofs',
-        type: 'tuple[]',
       },
       {
+        name: 'signatureParams',
+        type: 'tuple',
+        internalType: 'struct IVotingMachineWithProofs.SignatureParams',
         components: [
           {
-            internalType: 'uint8',
             name: 'v',
             type: 'uint8',
+            internalType: 'uint8',
           },
           {
-            internalType: 'bytes32',
             name: 'r',
             type: 'bytes32',
+            internalType: 'bytes32',
           },
           {
-            internalType: 'bytes32',
             name: 's',
             type: 'bytes32',
+            internalType: 'bytes32',
           },
         ],
-        internalType: 'struct IVotingMachineWithProofs.SignatureParams',
-        name: 'signatureParams',
-        type: 'tuple',
       },
     ],
-    name: 'submitVoteAsRepresentativeBySignature',
     outputs: [],
     stateMutability: 'nonpayable',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'submitVoteBySignature',
     inputs: [
       {
-        internalType: 'uint256',
         name: 'proposalId',
         type: 'uint256',
+        internalType: 'uint256',
       },
       {
-        internalType: 'address',
         name: 'voter',
         type: 'address',
+        internalType: 'address',
       },
       {
-        internalType: 'bool',
         name: 'support',
         type: 'bool',
+        internalType: 'bool',
       },
       {
+        name: 'votingBalanceProofs',
+        type: 'tuple[]',
+        internalType: 'struct IVotingMachineWithProofs.VotingBalanceProof[]',
         components: [
           {
-            internalType: 'address',
             name: 'underlyingAsset',
             type: 'address',
+            internalType: 'address',
           },
           {
-            internalType: 'uint128',
             name: 'slot',
             type: 'uint128',
+            internalType: 'uint128',
           },
           {
-            internalType: 'bytes',
             name: 'proof',
             type: 'bytes',
+            internalType: 'bytes',
           },
         ],
-        internalType: 'struct IVotingMachineWithProofs.VotingBalanceProof[]',
-        name: 'votingBalanceProofs',
-        type: 'tuple[]',
       },
       {
-        internalType: 'uint8',
         name: 'v',
         type: 'uint8',
+        internalType: 'uint8',
       },
       {
-        internalType: 'bytes32',
         name: 'r',
         type: 'bytes32',
+        internalType: 'bytes32',
       },
       {
-        internalType: 'bytes32',
         name: 's',
         type: 'bytes32',
+        internalType: 'bytes32',
       },
     ],
-    name: 'submitVoteBySignature',
     outputs: [],
     stateMutability: 'nonpayable',
-    type: 'function',
+  },
+  {
+    type: 'event',
+    name: 'ProposalResultsSent',
+    inputs: [
+      {
+        name: 'proposalId',
+        type: 'uint256',
+        indexed: true,
+        internalType: 'uint256',
+      },
+      {
+        name: 'forVotes',
+        type: 'uint256',
+        indexed: false,
+        internalType: 'uint256',
+      },
+      {
+        name: 'againstVotes',
+        type: 'uint256',
+        indexed: false,
+        internalType: 'uint256',
+      },
+    ],
+    anonymous: false,
+  },
+  {
+    type: 'event',
+    name: 'ProposalVoteConfigurationBridged',
+    inputs: [
+      {
+        name: 'proposalId',
+        type: 'uint256',
+        indexed: true,
+        internalType: 'uint256',
+      },
+      {
+        name: 'blockHash',
+        type: 'bytes32',
+        indexed: true,
+        internalType: 'bytes32',
+      },
+      {
+        name: 'votingDuration',
+        type: 'uint24',
+        indexed: false,
+        internalType: 'uint24',
+      },
+      {
+        name: 'voteCreated',
+        type: 'bool',
+        indexed: true,
+        internalType: 'bool',
+      },
+    ],
+    anonymous: false,
+  },
+  {
+    type: 'event',
+    name: 'ProposalVoteStarted',
+    inputs: [
+      {
+        name: 'proposalId',
+        type: 'uint256',
+        indexed: true,
+        internalType: 'uint256',
+      },
+      {
+        name: 'l1BlockHash',
+        type: 'bytes32',
+        indexed: true,
+        internalType: 'bytes32',
+      },
+      {
+        name: 'startTime',
+        type: 'uint256',
+        indexed: false,
+        internalType: 'uint256',
+      },
+      {
+        name: 'endTime',
+        type: 'uint256',
+        indexed: false,
+        internalType: 'uint256',
+      },
+    ],
+    anonymous: false,
+  },
+  {
+    type: 'event',
+    name: 'VoteEmitted',
+    inputs: [
+      {
+        name: 'proposalId',
+        type: 'uint256',
+        indexed: true,
+        internalType: 'uint256',
+      },
+      {
+        name: 'voter',
+        type: 'address',
+        indexed: true,
+        internalType: 'address',
+      },
+      {
+        name: 'support',
+        type: 'bool',
+        indexed: true,
+        internalType: 'bool',
+      },
+      {
+        name: 'votingPower',
+        type: 'uint256',
+        indexed: false,
+        internalType: 'uint256',
+      },
+    ],
+    anonymous: false,
   },
 ] as const;
diff --git a/src/ts/abis/IVotingPortal.ts b/src/ts/abis/IVotingPortal.ts
index 2d562103..8334853a 100644
--- a/src/ts/abis/IVotingPortal.ts
+++ b/src/ts/abis/IVotingPortal.ts
@@ -1,206 +1,206 @@
 // AUTOGENERATED - MANUALLY CHANGES WILL BE REVERTED BY THE GENERATOR
 export const IVotingPortal_ABI = [
   {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: false,
-        internalType: 'uint128',
-        name: 'gasLimit',
-        type: 'uint128',
-      },
-    ],
-    name: 'StartVotingGasLimitUpdated',
-    type: 'event',
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: 'address',
-        name: 'originSender',
-        type: 'address',
-      },
-      {
-        indexed: true,
-        internalType: 'uint256',
-        name: 'originChainId',
-        type: 'uint256',
-      },
-      {
-        indexed: true,
-        internalType: 'bool',
-        name: 'delivered',
-        type: 'bool',
-      },
-      {
-        indexed: false,
-        internalType: 'bytes',
-        name: 'message',
-        type: 'bytes',
-      },
-      {
-        indexed: false,
-        internalType: 'bytes',
-        name: 'reason',
-        type: 'bytes',
-      },
-    ],
-    name: 'VoteMessageReceived',
-    type: 'event',
-  },
-  {
-    inputs: [],
+    type: 'function',
     name: 'CROSS_CHAIN_CONTROLLER',
+    inputs: [],
     outputs: [
       {
-        internalType: 'address',
         name: '',
         type: 'address',
+        internalType: 'address',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
-    inputs: [],
+    type: 'function',
     name: 'GOVERNANCE',
+    inputs: [],
     outputs: [
       {
-        internalType: 'address',
         name: '',
         type: 'address',
+        internalType: 'address',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
-    inputs: [],
+    type: 'function',
     name: 'VOTING_MACHINE',
+    inputs: [],
     outputs: [
       {
-        internalType: 'address',
         name: '',
         type: 'address',
+        internalType: 'address',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
-    inputs: [],
+    type: 'function',
     name: 'VOTING_MACHINE_CHAIN_ID',
+    inputs: [],
     outputs: [
       {
-        internalType: 'uint256',
         name: '',
         type: 'uint256',
+        internalType: 'uint256',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'decodeMessage',
     inputs: [
       {
-        internalType: 'bytes',
         name: 'message',
         type: 'bytes',
+        internalType: 'bytes',
       },
     ],
-    name: 'decodeMessage',
     outputs: [
       {
-        internalType: 'uint256',
         name: '',
         type: 'uint256',
+        internalType: 'uint256',
       },
       {
-        internalType: 'uint128',
         name: '',
         type: 'uint128',
+        internalType: 'uint128',
       },
       {
-        internalType: 'uint128',
         name: '',
         type: 'uint128',
+        internalType: 'uint128',
       },
     ],
     stateMutability: 'pure',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'forwardStartVotingMessage',
     inputs: [
       {
-        internalType: 'uint256',
         name: 'proposalId',
         type: 'uint256',
+        internalType: 'uint256',
       },
       {
-        internalType: 'bytes32',
         name: 'blockHash',
         type: 'bytes32',
+        internalType: 'bytes32',
       },
       {
-        internalType: 'uint24',
         name: 'votingDuration',
         type: 'uint24',
+        internalType: 'uint24',
       },
     ],
-    name: 'forwardStartVotingMessage',
     outputs: [],
     stateMutability: 'nonpayable',
-    type: 'function',
   },
   {
-    inputs: [],
+    type: 'function',
     name: 'getStartVotingGasLimit',
+    inputs: [],
     outputs: [
       {
-        internalType: 'uint128',
         name: '',
         type: 'uint128',
+        internalType: 'uint128',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'receiveCrossChainMessage',
     inputs: [
       {
-        internalType: 'address',
         name: 'originSender',
         type: 'address',
+        internalType: 'address',
       },
       {
-        internalType: 'uint256',
         name: 'originChainId',
         type: 'uint256',
+        internalType: 'uint256',
       },
       {
-        internalType: 'bytes',
         name: 'message',
         type: 'bytes',
+        internalType: 'bytes',
       },
     ],
-    name: 'receiveCrossChainMessage',
     outputs: [],
     stateMutability: 'nonpayable',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'setStartVotingGasLimit',
     inputs: [
       {
-        internalType: 'uint128',
         name: 'gasLimit',
         type: 'uint128',
+        internalType: 'uint128',
       },
     ],
-    name: 'setStartVotingGasLimit',
     outputs: [],
     stateMutability: 'nonpayable',
-    type: 'function',
+  },
+  {
+    type: 'event',
+    name: 'StartVotingGasLimitUpdated',
+    inputs: [
+      {
+        name: 'gasLimit',
+        type: 'uint128',
+        indexed: false,
+        internalType: 'uint128',
+      },
+    ],
+    anonymous: false,
+  },
+  {
+    type: 'event',
+    name: 'VoteMessageReceived',
+    inputs: [
+      {
+        name: 'originSender',
+        type: 'address',
+        indexed: true,
+        internalType: 'address',
+      },
+      {
+        name: 'originChainId',
+        type: 'uint256',
+        indexed: true,
+        internalType: 'uint256',
+      },
+      {
+        name: 'delivered',
+        type: 'bool',
+        indexed: true,
+        internalType: 'bool',
+      },
+      {
+        name: 'message',
+        type: 'bytes',
+        indexed: false,
+        internalType: 'bytes',
+      },
+      {
+        name: 'reason',
+        type: 'bytes',
+        indexed: false,
+        internalType: 'bytes',
+      },
+    ],
+    anonymous: false,
   },
 ] as const;
diff --git a/src/ts/abis/IVotingStrategy.ts b/src/ts/abis/IVotingStrategy.ts
index 76509f60..cae3963e 100644
--- a/src/ts/abis/IVotingStrategy.ts
+++ b/src/ts/abis/IVotingStrategy.ts
@@ -1,102 +1,102 @@
 // AUTOGENERATED - MANUALLY CHANGES WILL BE REVERTED BY THE GENERATOR
 export const IVotingStrategy_ABI = [
   {
-    inputs: [],
+    type: 'function',
     name: 'DATA_WAREHOUSE',
+    inputs: [],
     outputs: [
       {
-        internalType: 'contract IDataWarehouse',
         name: '',
         type: 'address',
+        internalType: 'contract IDataWarehouse',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
-    inputs: [],
+    type: 'function',
     name: 'POWER_SCALE_FACTOR',
+    inputs: [],
     outputs: [
       {
-        internalType: 'uint256',
         name: '',
         type: 'uint256',
+        internalType: 'uint256',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
-    inputs: [],
+    type: 'function',
     name: 'STK_AAVE_SLASHING_EXCHANGE_RATE_PRECISION',
+    inputs: [],
     outputs: [
       {
-        internalType: 'uint256',
         name: '',
         type: 'uint256',
+        internalType: 'uint256',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
-    inputs: [],
+    type: 'function',
     name: 'STK_AAVE_SLASHING_EXCHANGE_RATE_SLOT',
+    inputs: [],
     outputs: [
       {
-        internalType: 'uint256',
         name: '',
         type: 'uint256',
+        internalType: 'uint256',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'getVotingPower',
     inputs: [
       {
-        internalType: 'address',
         name: 'asset',
         type: 'address',
+        internalType: 'address',
       },
       {
-        internalType: 'uint128',
         name: 'storageSlot',
         type: 'uint128',
+        internalType: 'uint128',
       },
       {
-        internalType: 'uint256',
         name: 'power',
         type: 'uint256',
+        internalType: 'uint256',
       },
       {
-        internalType: 'bytes32',
         name: 'blockHash',
         type: 'bytes32',
+        internalType: 'bytes32',
       },
     ],
-    name: 'getVotingPower',
     outputs: [
       {
-        internalType: 'uint256',
         name: '',
         type: 'uint256',
+        internalType: 'uint256',
       },
     ],
     stateMutability: 'view',
-    type: 'function',
   },
   {
+    type: 'function',
+    name: 'hasRequiredRoots',
     inputs: [
       {
-        internalType: 'bytes32',
         name: 'blockHash',
         type: 'bytes32',
+        internalType: 'bytes32',
       },
     ],
-    name: 'hasRequiredRoots',
     outputs: [],
     stateMutability: 'view',
-    type: 'function',
   },
 ] as const;
diff --git a/src/ts/abis/IWithGuardian.ts b/src/ts/abis/IWithGuardian.ts
index 150e157a..25ea642b 100644
--- a/src/ts/abis/IWithGuardian.ts
+++ b/src/ts/abis/IWithGuardian.ts
@@ -1,48 +1,48 @@
 // AUTOGENERATED - MANUALLY CHANGES WILL BE REVERTED BY THE GENERATOR
 export const IWithGuardian_ABI = [
   {
-    anonymous: false,
-    inputs: [
+    type: 'function',
+    name: 'guardian',
+    inputs: [],
+    outputs: [
       {
-        indexed: false,
-        internalType: 'address',
-        name: 'oldGuardian',
+        name: '',
         type: 'address',
-      },
-      {
-        indexed: false,
         internalType: 'address',
-        name: 'newGuardian',
-        type: 'address',
       },
     ],
-    name: 'GuardianUpdated',
-    type: 'event',
+    stateMutability: 'view',
   },
   {
-    inputs: [],
-    name: 'guardian',
-    outputs: [
+    type: 'function',
+    name: 'updateGuardian',
+    inputs: [
       {
-        internalType: 'address',
-        name: '',
+        name: 'newGuardian',
         type: 'address',
+        internalType: 'address',
       },
     ],
-    stateMutability: 'view',
-    type: 'function',
+    outputs: [],
+    stateMutability: 'nonpayable',
   },
   {
+    type: 'event',
+    name: 'GuardianUpdated',
     inputs: [
       {
+        name: 'oldGuardian',
+        type: 'address',
+        indexed: false,
         internalType: 'address',
+      },
+      {
         name: 'newGuardian',
         type: 'address',
+        indexed: false,
+        internalType: 'address',
       },
     ],
-    name: 'updateGuardian',
-    outputs: [],
-    stateMutability: 'nonpayable',
-    type: 'function',
+    anonymous: false,
   },
 ] as const;