fix: add list of verified (#840)

bgd-labs · Feb 11, 2025 · 4e7fbac · 4e7fbac
1 parent b8d3726
commit 4e7fbac
Show file tree

Hide file tree

Showing 46 changed files with 605 additions and 93 deletions.
diff --git a/safe.csv b/safe.csv
diff --git a/scripts/configs/pools/arbitrum.ts b/scripts/configs/pools/arbitrum.ts
@@ -15,8 +15,8 @@ export const arbitrumProtoV3: PoolConfig = {
     POOL_ADDRESSES_PROVIDER_REGISTRY: '0x770ef9f4fe897e59daCc474EF11238303F9552b6',
     RATES_FACTORY: '0xcC47c4Fe1F7f29ff31A8b62197023aC8553C7896',
     REPAY_WITH_COLLATERAL_ADAPTER: '0xE28E2c8d240dd5eBd0adcab86fbD79df7a052034',
-    STATIC_A_TOKEN_FACTORY: '0x411D79b8cC43384FDE66CaBf9b6a17180c842511',
-    STATIC_A_TOKEN_ORACLE: '0xD61BF98649EA8F8D09e184184777b1867F00E5CB',
+    LEGACY_STATIC_A_TOKEN_FACTORY: '0x411D79b8cC43384FDE66CaBf9b6a17180c842511',
+    LEGACY_STATIC_A_TOKEN_ORACLE: '0xD61BF98649EA8F8D09e184184777b1867F00E5CB',
     SWAP_COLLATERAL_ADAPTER: '0xF3C3F14dd7BDb7E03e6EBc3bc5Ffc6D66De12251',
     UI_INCENTIVE_DATA_PROVIDER: '0x68100bd5345ea474d93577127c11f39ff8463e93',
     UI_POOL_DATA_PROVIDER: '0x5c5228ac8bc1528482514af3e27e692495148717',

diff --git a/scripts/configs/pools/avalanche.ts b/scripts/configs/pools/avalanche.ts
@@ -65,7 +65,7 @@ export const avalancheProtoV3: PoolConfig = {
     PROOF_OF_RESERVE: '0xab22988D93d5F942fC6B6c6Ea285744809D1d9Cc',
     PROOF_OF_RESERVE_AGGREGATOR: '0x80f2c02224a2E548FC67c0bF705eBFA825dd5439',
     REPAY_WITH_COLLATERAL_ADAPTER: '0x5d4D4007A4c6336550DdAa2a7c0d5e7972eebd16',
-    STATIC_A_TOKEN_FACTORY: '0x691C316b2Eec7e64d17e7E3E01f3dB44c9CcEf19',
+    LEGACY_STATIC_A_TOKEN_FACTORY: '0x691C316b2Eec7e64d17e7E3E01f3dB44c9CcEf19',
     SWAP_COLLATERAL_ADAPTER: '0x2Cf641F7C0eac2788A7924B82d6Ca8EB7bAa4E3A',
     UI_INCENTIVE_DATA_PROVIDER: '0x99732d5da21f44f9e45e36ef9da4b1df2eb0b28e',
     UI_POOL_DATA_PROVIDER: '0x50b4a66bf4d41e6252540ea7427d7a933bc3c088',

diff --git a/scripts/configs/pools/base.ts b/scripts/configs/pools/base.ts
@@ -13,8 +13,8 @@ export const baseProtoV3: PoolConfig = {
     WITHDRAW_SWAP_ADAPTER: '0x5598BbFA2f4fE8151f45bBA0a3edE1b54B51a0a9',
     SWAP_COLLATERAL_ADAPTER: '0x2E549104c516b8657A7D888494DfbAbD7C70b464',
     REPAY_WITH_COLLATERAL_ADAPTER: '0x63dfa7c09Dc2Ff4030d6B8Dc2ce6262BF898C8A4',
-    STATIC_A_TOKEN_FACTORY: '0x940F9a5d5F9ED264990D0eaee1F3DD60B4Cb9A22',
-    STATIC_A_TOKEN_ORACLE: '0xe63eAf6DAb1045689BD3a332bC596FfcF54A5C88',
+    LEGACY_STATIC_A_TOKEN_FACTORY: '0x940F9a5d5F9ED264990D0eaee1F3DD60B4Cb9A22',
+    LEGACY_STATIC_A_TOKEN_ORACLE: '0xe63eAf6DAb1045689BD3a332bC596FfcF54A5C88',
     CONFIG_ENGINE: '0xD828E29E2268f56309dDbbAB697ae85DCEb43B9d',
     L2_ENCODER: '0x39e97c588B2907Fb67F44fea256Ae3BA064207C5',
     POOL_ADDRESSES_PROVIDER_REGISTRY: '0x2f6571d3Eb9a4e350C68C36bCD2afe39530078E2',

diff --git a/scripts/configs/pools/bnb.ts b/scripts/configs/pools/bnb.ts
@@ -19,12 +19,6 @@ export const bnbProtoV3: PoolConfig = {
     WALLET_BALANCE_PROVIDER: '0x36616cf17557639614c1cdDb356b1B83fc0B2132',
     WETH_GATEWAY: '0xe63eAf6DAb1045689BD3a332bC596FfcF54A5C88',
     WITHDRAW_SWAP_ADAPTER: '0x5E2d083417D12d4B0824E14Ecd48D26831F4Da7D',
-    STATIC_A_TOKEN_FACTORY: '0x326aB0868bD279382Be2DF5E228Cb8AF38649AB4',
-  },
-  initial: {
-    COLLECTOR: '0x25Ec457d1778b0E5316e7f38f3c22baF413F1A8C',
-    DEFAULT_A_TOKEN_IMPL: '0x6c23bAF050ec192afc0B967a93b83e6c5405df43',
-    DEFAULT_VARIABLE_DEBT_TOKEN_IMPL: '0x777fBA024bA1228fDa76149A4ff8B23475ed057D',
-    DEFAULT_STABLE_DEBT_TOKEN_IMPL: '0xb172a90A7C238969CE9B27cc19D13b60A91e7F00',
+    LEGACY_STATIC_A_TOKEN_FACTORY: '0x326aB0868bD279382Be2DF5E228Cb8AF38649AB4',
   },
 };
diff --git a/scripts/configs/pools/ethereum.ts b/scripts/configs/pools/ethereum.ts
@@ -11,7 +11,7 @@ export const sepoliaProtoV3: PoolConfig = {
     UI_POOL_DATA_PROVIDER: '0x69529987FA4A075D0C00B0128fa848dc9ebbE9CE',
     WALLET_BALANCE_PROVIDER: '0xCD4e0d6D2b1252E2A709B8aE97DBA31164C5a709',
     WETH_GATEWAY: '0x387d311e47e80b498169e6fb51d3193167d89F7D',
-    STATIC_A_TOKEN_FACTORY: '0xd210dFB43B694430B8d31762B5199e30c31266C8',
+    LEGACY_STATIC_A_TOKEN_FACTORY: '0xd210dFB43B694430B8d31762B5199e30c31266C8',
     UI_GHO_DATA_PROVIDER: '0x69B9843A16a6E9933125EBD97659BA3CCbE2Ef8A',
   },
 };
@@ -73,7 +73,7 @@ export const mainnetProtoV3Pool: PoolConfig = {
     CONFIG_ENGINE: '0xA8e351C7Ab1b75A2134A418701919c462932DF79',
     POOL_ADDRESSES_PROVIDER_REGISTRY: '0xbaA999AC55EAce41CcAE355c77809e68Bb345170',
     REPAY_WITH_COLLATERAL_ADAPTER: '0x35bb522b102326ea3F1141661dF4626C87000e3E',
-    STATIC_A_TOKEN_FACTORY: '0x411D79b8cC43384FDE66CaBf9b6a17180c842511',
+    LEGACY_STATIC_A_TOKEN_FACTORY: '0x411D79b8cC43384FDE66CaBf9b6a17180c842511',
     SWAP_COLLATERAL_ADAPTER: '0xADC0A53095A0af87F3aa29FE0715B5c28016364e',
     UI_GHO_DATA_PROVIDER: '0x379c1EDD1A41218bdbFf960a9d5AD2818Bf61aE8',
     UI_INCENTIVE_DATA_PROVIDER: '0xe3dff4052f0bf6134acb73beae8fe2317d71f047',

diff --git a/scripts/configs/pools/gnosis.ts b/scripts/configs/pools/gnosis.ts
@@ -15,7 +15,7 @@ export const gnosisProtoV3: PoolConfig = {
     CAPS_PLUS_RISK_STEWARD: '0x33AE1f41546a2e05368Bf789b3d868813c0Ae658',
     RISK_STEWARD: '0x677c9f358dA5DC83aF6760a839E4448D72840d04',
     FREEZING_STEWARD: '0x3Ceaf9b6CAb92dFe6302D0CC3F1BA880C28d35e5',
-    STATIC_A_TOKEN_FACTORY: '0x02e9b27599C4Bf8f789d34b6E65C51092c3d9FA6',
+    LEGACY_STATIC_A_TOKEN_FACTORY: '0x02e9b27599C4Bf8f789d34b6E65C51092c3d9FA6',
     STATA_FACTORY: '0x33992721c565dA3248bd3af80524e054F5F05b42',
     REPAY_WITH_COLLATERAL_ADAPTER: '0x86b0521f92a554057e54B93098BA2A6Aaa2F4ACB',
     SWAP_COLLATERAL_ADAPTER: '0x63dfa7c09Dc2Ff4030d6B8Dc2ce6262BF898C8A4',

diff --git a/scripts/configs/pools/linea.ts b/scripts/configs/pools/linea.ts
@@ -13,11 +13,6 @@ export const lineaProtoV3: PoolConfig = {
     UI_POOL_DATA_PROVIDER: '0xf751969521E20A972A0776CDB0497Fad0F773F1F',
     WALLET_BALANCE_PROVIDER: '0xff75B6da14FfbbfD355Daf7a2731456b3562Ba6D',
     WETH_GATEWAY: '0x4758213271BFdC72224A7a8742dC865fC97756e1',
-    STATIC_A_TOKEN_FACTORY: '0x28ad75CA21793835b975130e9FdA149A476a2b7c'
-  },
-  initial: {
-    COLLECTOR: '0x86E2938daE289763D4e09a7e42c5cCcA62Cf9809',
-    DEFAULT_A_TOKEN_IMPL: '0x589750BA8aF186cE5B55391B0b7148cAD43a1619',
-    DEFAULT_VARIABLE_DEBT_TOKEN_IMPL: '0xBeC519531F0E78BcDdB295242fA4EC5251B38574'
+    STATA_FACTORY: '0x28ad75CA21793835b975130e9FdA149A476a2b7c',
   },
 };
diff --git a/scripts/configs/pools/metis.ts b/scripts/configs/pools/metis.ts
@@ -15,6 +15,6 @@ export const metisProtoV3: PoolConfig = {
     UI_INCENTIVE_DATA_PROVIDER: '0xE92cd6164CE7DC68e740765BC1f2a091B6CBc3e4',
     UI_POOL_DATA_PROVIDER: '0xc0179321f0825c3e0F59Fe7Ca4E40557b97797a3',
     WALLET_BALANCE_PROVIDER: '0x1df710eb1E2FD9C21494aF2BFb1F210a4185885b',
-    STATIC_A_TOKEN_FACTORY: '0x9C62AdC332888F56998542415c38D7CDf3Ff7619',
+    LEGACY_STATIC_A_TOKEN_FACTORY: '0x9C62AdC332888F56998542415c38D7CDf3Ff7619',
   },
 };
diff --git a/scripts/configs/pools/optimism.ts b/scripts/configs/pools/optimism.ts
@@ -14,7 +14,7 @@ export const optimismProtoV3: PoolConfig = {
     CONFIG_ENGINE: '0x1aa25fdd7d55fa8a401d6efba8e48874ef730e55',
     POOL_ADDRESSES_PROVIDER_REGISTRY: '0x770ef9f4fe897e59daCc474EF11238303F9552b6',
     REPAY_WITH_COLLATERAL_ADAPTER: '0x5d4D4007A4c6336550DdAa2a7c0d5e7972eebd16',
-    STATIC_A_TOKEN_FACTORY: '0x22D76094730fA377184100EFB8CEfC673B89B372',
+    LEGACY_STATIC_A_TOKEN_FACTORY: '0x22D76094730fA377184100EFB8CEfC673B89B372',
     SWAP_COLLATERAL_ADAPTER: '0x830C5A67a0C95D69dA5fb7801Ac1773c6fB53857',
     UI_INCENTIVE_DATA_PROVIDER: '0x5c5228ac8bc1528482514af3e27e692495148717',
     UI_POOL_DATA_PROVIDER: '0xe92cd6164ce7dc68e740765bc1f2a091b6cbc3e4',

diff --git a/scripts/configs/pools/polygon.ts b/scripts/configs/pools/polygon.ts
@@ -32,7 +32,7 @@ export const polygonProtoV3: PoolConfig = {
     CONFIG_ENGINE: '0x43632469e02cdaaeb4de3dcbfcaabef310975729',
     POOL_ADDRESSES_PROVIDER_REGISTRY: '0x770ef9f4fe897e59daCc474EF11238303F9552b6',
     REPAY_WITH_COLLATERAL_ADAPTER: '0x5d4D4007A4c6336550DdAa2a7c0d5e7972eebd16',
-    STATIC_A_TOKEN_FACTORY: '0x397202AB0b4E7C954ac0c493c00749C517210953',
+    LEGACY_STATIC_A_TOKEN_FACTORY: '0x397202AB0b4E7C954ac0c493c00749C517210953',
     SWAP_COLLATERAL_ADAPTER: '0xC4aff49fCeD8ac1D818a6DCAB063f9f97E66ec5E',
     UI_INCENTIVE_DATA_PROVIDER: '0x91e04cf78e53aebe609e8a7f2003e7eecd743f2b',
     UI_POOL_DATA_PROVIDER: '0x68100bd5345ea474d93577127c11f39ff8463e93',

diff --git a/scripts/configs/pools/scroll.ts b/scripts/configs/pools/scroll.ts
@@ -30,7 +30,7 @@ export const scrollProtoV3: PoolConfig = {
     UI_POOL_DATA_PROVIDER: '0x5598BbFA2f4fE8151f45bBA0a3edE1b54B51a0a9',
     WALLET_BALANCE_PROVIDER: '0xE51642875Af07Fea1B03d821E41a9DB24bC4447E',
     WETH_GATEWAY: '0x31A239f3e39c5D8BA6B201bA81ed584492Ae960F',
-    STATIC_A_TOKEN_FACTORY: '0x970b77b96D94966939a8F867c2BfC2aC0310C0e7',
+    LEGACY_STATIC_A_TOKEN_FACTORY: '0x970b77b96D94966939a8F867c2BfC2aC0310C0e7',
   },
   initial: {
     COLLECTOR: '0x90eB541e1a431D8a30ED85A77675D1F001128cb5',

diff --git a/scripts/configs/pools/zksync.ts b/scripts/configs/pools/zksync.ts
@@ -12,7 +12,7 @@ export const zkSyncProtoV3: PoolConfig = {
     UI_POOL_DATA_PROVIDER: '0x6fCDa2646d6E4a42b1663d219811fC96AE3A0ec8',
     WALLET_BALANCE_PROVIDER: '0xcb8Dc3C135e59B1252F057da44A8f43EE6B0dAB0',
     WETH_GATEWAY: '0xD5f6c8D402E0a0222f7FA132F9e80fDCC074df5C',
-    STATIC_A_TOKEN_FACTORY: '0x1Bc8dbF1f5aF8094Aa166098131116CaAd6B22F9',
+    LEGACY_STATIC_A_TOKEN_FACTORY: '0x1Bc8dbF1f5aF8094Aa166098131116CaAd6B22F9',
     RISK_STEWARD: '0x05c77Cf62346329a157d7A6F874464D049CECb26',
   },
   initial: {

diff --git a/scripts/configs/types.ts b/scripts/configs/types.ts
@@ -57,9 +57,9 @@ export interface PoolConfig {
     PROOF_OF_RESERVE?: Hex;
     PROOF_OF_RESERVE_AGGREGATOR?: Hex;
     DELEGATION_AWARE_A_TOKEN_IMPL_REV_1?: Hex;
-    STATIC_A_TOKEN_FACTORY?: Hex; // deprecated
+    LEGACY_STATIC_A_TOKEN_FACTORY?: Hex; // deprecated
+    LEGACY_STATIC_A_TOKEN_ORACLE?: Hex; // deprecated
     STATA_FACTORY?: Hex;
-    STATIC_A_TOKEN_ORACLE?: Hex;
     CAPS_PLUS_RISK_STEWARD?: Hex;
     RISK_STEWARD?: Hex;
     EDGE_RISK_STEWARD?: Hex;

diff --git a/scripts/generator/assetsLibraryGenerator.ts b/scripts/generator/assetsLibraryGenerator.ts
@@ -54,7 +54,13 @@ export function fixSymbol(symbol: string, _underlying: string) {
     case '0x3c499c542cef5e3811e1192ce70d8cc03d5c3359': // polygon
       return 'USDCn';
   }
-  return symbol.replace('-', '_').replace('.', '').replace(' ', '_').replace('1', 'ONE_').replace('USD₮0', 'USDT');
+  if (symbol === 'USD₮0' || symbol === 'fUSDT') return 'USDT';
+  return symbol
+    .replace('-', '_')
+    .replace('.', '')
+    .replace(' ', '_')
+    .replace('1', 'ONE_')
+    .replace('USD₮0', 'USDT');
 }
 
 export function generateAssetsLibrary(

diff --git a/scripts/generator/protocol-v3-generator/fetchTokens.ts b/scripts/generator/protocol-v3-generator/fetchTokens.ts
@@ -14,9 +14,9 @@ export async function fetchTokens(
   poolConfig: PoolConfig,
   poolAddresses: Awaited<ReturnType<typeof fetchPoolAddresses>>,
 ) {
-  const staticATokenFactoryContract = poolConfig.additionalAddresses.STATIC_A_TOKEN_FACTORY
+  const staticATokenFactoryContract = poolConfig.additionalAddresses.LEGACY_STATIC_A_TOKEN_FACTORY
     ? getContract({
-        address: poolConfig.additionalAddresses.STATIC_A_TOKEN_FACTORY,
+        address: poolConfig.additionalAddresses.LEGACY_STATIC_A_TOKEN_FACTORY,
         abi: IStaticATokenFactory_ABI,
         client,
       })

diff --git a/src/AaveV3Arbitrum.sol b/src/AaveV3Arbitrum.sol
@@ -86,10 +86,12 @@ library AaveV3Arbitrum {
     0xE28E2c8d240dd5eBd0adcab86fbD79df7a052034;
 
   // https://arbiscan.io/address/0x411D79b8cC43384FDE66CaBf9b6a17180c842511
-  address internal constant STATIC_A_TOKEN_FACTORY = 0x411D79b8cC43384FDE66CaBf9b6a17180c842511;
+  address internal constant LEGACY_STATIC_A_TOKEN_FACTORY =
+    0x411D79b8cC43384FDE66CaBf9b6a17180c842511;
 
   // https://arbiscan.io/address/0xD61BF98649EA8F8D09e184184777b1867F00E5CB
-  address internal constant STATIC_A_TOKEN_ORACLE = 0xD61BF98649EA8F8D09e184184777b1867F00E5CB;
+  address internal constant LEGACY_STATIC_A_TOKEN_ORACLE =
+    0xD61BF98649EA8F8D09e184184777b1867F00E5CB;
 
   // https://arbiscan.io/address/0xF3C3F14dd7BDb7E03e6EBc3bc5Ffc6D66De12251
   address internal constant SWAP_COLLATERAL_ADAPTER = 0xF3C3F14dd7BDb7E03e6EBc3bc5Ffc6D66De12251;

diff --git a/src/AaveV3Avalanche.sol b/src/AaveV3Avalanche.sol
@@ -84,7 +84,8 @@ library AaveV3Avalanche {
     0x5d4D4007A4c6336550DdAa2a7c0d5e7972eebd16;
 
   // https://snowtrace.io/address/0x691C316b2Eec7e64d17e7E3E01f3dB44c9CcEf19
-  address internal constant STATIC_A_TOKEN_FACTORY = 0x691C316b2Eec7e64d17e7E3E01f3dB44c9CcEf19;
+  address internal constant LEGACY_STATIC_A_TOKEN_FACTORY =
+    0x691C316b2Eec7e64d17e7E3E01f3dB44c9CcEf19;
 
   // https://snowtrace.io/address/0x2Cf641F7C0eac2788A7924B82d6Ca8EB7bAa4E3A
   address internal constant SWAP_COLLATERAL_ADAPTER = 0x2Cf641F7C0eac2788A7924B82d6Ca8EB7bAa4E3A;

diff --git a/src/AaveV3BNB.sol b/src/AaveV3BNB.sol
@@ -95,7 +95,8 @@ library AaveV3BNB {
   address internal constant WITHDRAW_SWAP_ADAPTER = 0x5E2d083417D12d4B0824E14Ecd48D26831F4Da7D;
 
   // https://bscscan.com/address/0x326aB0868bD279382Be2DF5E228Cb8AF38649AB4
-  address internal constant STATIC_A_TOKEN_FACTORY = 0x326aB0868bD279382Be2DF5E228Cb8AF38649AB4;
+  address internal constant LEGACY_STATIC_A_TOKEN_FACTORY =
+    0x326aB0868bD279382Be2DF5E228Cb8AF38649AB4;
 }
 library AaveV3BNBAssets {
   // https://bscscan.com/address/0x0E09FaBB73Bd3Ade0a17ECC321fD13a19e81cE82

diff --git a/src/AaveV3Base.sol b/src/AaveV3Base.sol
@@ -79,10 +79,12 @@ library AaveV3Base {
     0x63dfa7c09Dc2Ff4030d6B8Dc2ce6262BF898C8A4;
 
   // https://basescan.org/address/0x940F9a5d5F9ED264990D0eaee1F3DD60B4Cb9A22
-  address internal constant STATIC_A_TOKEN_FACTORY = 0x940F9a5d5F9ED264990D0eaee1F3DD60B4Cb9A22;
+  address internal constant LEGACY_STATIC_A_TOKEN_FACTORY =
+    0x940F9a5d5F9ED264990D0eaee1F3DD60B4Cb9A22;
 
   // https://basescan.org/address/0xe63eAf6DAb1045689BD3a332bC596FfcF54A5C88
-  address internal constant STATIC_A_TOKEN_ORACLE = 0xe63eAf6DAb1045689BD3a332bC596FfcF54A5C88;
+  address internal constant LEGACY_STATIC_A_TOKEN_ORACLE =
+    0xe63eAf6DAb1045689BD3a332bC596FfcF54A5C88;
 
   // https://basescan.org/address/0xD828E29E2268f56309dDbbAB697ae85DCEb43B9d
   address internal constant CONFIG_ENGINE = 0xD828E29E2268f56309dDbbAB697ae85DCEb43B9d;

diff --git a/src/AaveV3Ethereum.sol b/src/AaveV3Ethereum.sol
@@ -81,7 +81,8 @@ library AaveV3Ethereum {
     0x35bb522b102326ea3F1141661dF4626C87000e3E;
 
   // https://etherscan.io/address/0x411D79b8cC43384FDE66CaBf9b6a17180c842511
-  address internal constant STATIC_A_TOKEN_FACTORY = 0x411D79b8cC43384FDE66CaBf9b6a17180c842511;
+  address internal constant LEGACY_STATIC_A_TOKEN_FACTORY =
+    0x411D79b8cC43384FDE66CaBf9b6a17180c842511;
 
   // https://etherscan.io/address/0xADC0A53095A0af87F3aa29FE0715B5c28016364e
   address internal constant SWAP_COLLATERAL_ADAPTER = 0xADC0A53095A0af87F3aa29FE0715B5c28016364e;

diff --git a/src/AaveV3Fantom.sol b/src/AaveV3Fantom.sol
@@ -165,21 +165,21 @@ library AaveV3FantomAssets {
   address internal constant ETH_INTEREST_RATE_STRATEGY = 0x4aa694e6c06D6162d95BE98a2Df6a521d5A7b521;
 
   // https://ftmscan.com/address/0x049d68029688eAbF473097a2fC38ef61633A3C7A
-  address internal constant fUSDT_UNDERLYING = 0x049d68029688eAbF473097a2fC38ef61633A3C7A;
+  address internal constant USDT_UNDERLYING = 0x049d68029688eAbF473097a2fC38ef61633A3C7A;
 
-  uint8 internal constant fUSDT_DECIMALS = 6;
+  uint8 internal constant USDT_DECIMALS = 6;
 
   // https://ftmscan.com/address/0x6ab707Aca953eDAeFBc4fD23bA73294241490620
-  address internal constant fUSDT_A_TOKEN = 0x6ab707Aca953eDAeFBc4fD23bA73294241490620;
+  address internal constant USDT_A_TOKEN = 0x6ab707Aca953eDAeFBc4fD23bA73294241490620;
 
   // https://ftmscan.com/address/0xfb00AC187a8Eb5AFAE4eACE434F493Eb62672df7
-  address internal constant fUSDT_V_TOKEN = 0xfb00AC187a8Eb5AFAE4eACE434F493Eb62672df7;
+  address internal constant USDT_V_TOKEN = 0xfb00AC187a8Eb5AFAE4eACE434F493Eb62672df7;
 
   // https://ftmscan.com/address/0xF64b636c5dFe1d3555A847341cDC449f612307d0
-  address internal constant fUSDT_ORACLE = 0xF64b636c5dFe1d3555A847341cDC449f612307d0;
+  address internal constant USDT_ORACLE = 0xF64b636c5dFe1d3555A847341cDC449f612307d0;
 
   // https://ftmscan.com/address/0xf4a0039F2d4a2EaD5216AbB6Ae4C4C3AA2dB9b82
-  address internal constant fUSDT_INTEREST_RATE_STRATEGY =
+  address internal constant USDT_INTEREST_RATE_STRATEGY =
     0xf4a0039F2d4a2EaD5216AbB6Ae4C4C3AA2dB9b82;
 
   // https://ftmscan.com/address/0x6a07A792ab2965C72a5B8088d3a069A7aC3a993B

diff --git a/src/AaveV3Gnosis.sol b/src/AaveV3Gnosis.sol
@@ -82,7 +82,8 @@ library AaveV3Gnosis {
   address internal constant FREEZING_STEWARD = 0x3Ceaf9b6CAb92dFe6302D0CC3F1BA880C28d35e5;
 
   // https://gnosisscan.io/address/0x02e9b27599C4Bf8f789d34b6E65C51092c3d9FA6
-  address internal constant STATIC_A_TOKEN_FACTORY = 0x02e9b27599C4Bf8f789d34b6E65C51092c3d9FA6;
+  address internal constant LEGACY_STATIC_A_TOKEN_FACTORY =
+    0x02e9b27599C4Bf8f789d34b6E65C51092c3d9FA6;
 
   // https://gnosisscan.io/address/0x33992721c565dA3248bd3af80524e054F5F05b42
   address internal constant STATA_FACTORY = 0x33992721c565dA3248bd3af80524e054F5F05b42;