feat: v3.2 avax fuji contracts (#611)

bgd-labs · Oct 1, 2024 · ded4b64 · ded4b64
1 parent e1861d9
commit ded4b64
Show file tree

Hide file tree

Showing 6 changed files with 120 additions and 334 deletions.
diff --git a/scripts/configs/networks/avalanche.ts b/scripts/configs/networks/avalanche.ts
@@ -20,5 +20,7 @@ export const avalancheFujiAddresses: NetworkAddresses = {
   chainId: ChainId.fuji,
   addresses: {
     GHO_TOKEN: '0x9c04928Cc678776eC1C1C0E46ecC03a5F47A7723',
+    TRANSPARENT_PROXY_FACTORY: '0x5B8D7e59DbEC5804e4A096FF548ACea83E4615a9',
+    PROXY_ADMIN: '0x440F1b750Cbc7DDd2Bd9Af279Afe422EaeE58b41',
   },
 };
diff --git a/scripts/configs/pools/avalanche.ts b/scripts/configs/pools/avalanche.ts
@@ -18,13 +18,15 @@ export const fujiProtoV2: PoolConfig = {
 export const fujiProtoV3: PoolConfig = {
   name: 'Fuji',
   chainId: ChainId.fuji,
-  POOL_ADDRESSES_PROVIDER: '0xfb87056c0587923f15EB0aABc7d0572450Cc8003',
+  POOL_ADDRESSES_PROVIDER: '0x07D04EfAAA0Ac69D19d107795aF247C42Eb50F1C',
   additionalAddresses: {
-    FAUCET: '0xBCcD21ae43139bEF545e72e20E78f039A3Ac1b96',
-    UI_INCENTIVE_DATA_PROVIDER: '0x1EFf285a4E34217495b5531151bffa222A94A4F9',
-    UI_POOL_DATA_PROVIDER: '0x279c790Afcd547e2f20d896c5DDEe3846b9790B5',
-    WALLET_BALANCE_PROVIDER: '0xfFE3778c51e93EBf68f5d0a83c794E7f623024dd',
-    WETH_GATEWAY: '0x8A007E495449ffeda4C2d65f14eE31f8Bcb022CF',
+    CONFIG_ENGINE: '0x4058FE01Aa090E0841F4E08f79D2607C4861142E',
+    POOL_ADDRESSES_PROVIDER_REGISTRY: '0x9E7DF170E44093d6738057157CA048794B02555d',
+    STATIC_A_TOKEN_FACTORY: '0xc344A904BFd1E11AD58a18847940637C35f28ce4',
+    UI_INCENTIVE_DATA_PROVIDER: '0x9Ba30437Ba63AA2902319DE1B3f0E25a18826842',
+    // UI_POOL_DATA_PROVIDER: '0x67F521ca716dD9413fd2D2AfdEbEE9285289d2cB',
+    WALLET_BALANCE_PROVIDER: '0x43fAE24bd7eA952B4000Ea3A2e0D8B50CA64EBbA',
+    WETH_GATEWAY: '0x3d2ee1AB8C3a597cDf80273C684dE0036481bE3a'
   },
 };
 

diff --git a/src/AaveV3Fuji.sol b/src/AaveV3Fuji.sol
@@ -6,245 +6,89 @@ import {IPoolAddressesProvider, IPool, IPoolConfigurator, IAaveOracle, IPoolData
 import {ICollector} from './common/ICollector.sol';
 
 library AaveV3Fuji {
-  // https://testnet.snowtrace.io/address/0xfb87056c0587923f15EB0aABc7d0572450Cc8003
+  // https://testnet.snowtrace.io/address/0x07D04EfAAA0Ac69D19d107795aF247C42Eb50F1C
   IPoolAddressesProvider internal constant POOL_ADDRESSES_PROVIDER =
-    IPoolAddressesProvider(0xfb87056c0587923f15EB0aABc7d0572450Cc8003);
+    IPoolAddressesProvider(0x07D04EfAAA0Ac69D19d107795aF247C42Eb50F1C);
 
-  // https://testnet.snowtrace.io/address/0xccEa5C65f6d4F465B71501418b88FBe4e7071283
-  IPool internal constant POOL = IPool(0xccEa5C65f6d4F465B71501418b88FBe4e7071283);
+  // https://testnet.snowtrace.io/address/0x8B9b2AF4afB389b4a70A474dfD4AdCD4a302bb40
+  IPool internal constant POOL = IPool(0x8B9b2AF4afB389b4a70A474dfD4AdCD4a302bb40);
 
-  // https://testnet.snowtrace.io/address/0x987F9410f61c56F0d0D2F44B783d7E1B75141249
-  address internal constant POOL_IMPL = 0x987F9410f61c56F0d0D2F44B783d7E1B75141249;
+  // https://testnet.snowtrace.io/address/0xff1DB744F1275f8e04A62A7E5D663575F3a774B6
+  address internal constant POOL_IMPL = 0xff1DB744F1275f8e04A62A7E5D663575F3a774B6;
 
-  // https://testnet.snowtrace.io/address/0x34b80e82dFa833D65ef7618Cfc22bb1F359adce7
+  // https://testnet.snowtrace.io/address/0xF9f36C15fBddAF0B64E0D16E4D6852B433a86cbE
   IPoolConfigurator internal constant POOL_CONFIGURATOR =
-    IPoolConfigurator(0x34b80e82dFa833D65ef7618Cfc22bb1F359adce7);
+    IPoolConfigurator(0xF9f36C15fBddAF0B64E0D16E4D6852B433a86cbE);
 
-  // https://testnet.snowtrace.io/address/0x892E31b5a218879C9dbe258f691897AC28c5e061
-  address internal constant POOL_CONFIGURATOR_IMPL = 0x892E31b5a218879C9dbe258f691897AC28c5e061;
+  // https://testnet.snowtrace.io/address/0x782559e349b084bB7C07c08404aE6E3436cDAE2E
+  address internal constant POOL_CONFIGURATOR_IMPL = 0x782559e349b084bB7C07c08404aE6E3436cDAE2E;
 
-  // https://testnet.snowtrace.io/address/0x4DaE2f0f4Db78115eF114F1Dfef426ef2A4fC318
-  IAaveOracle internal constant ORACLE = IAaveOracle(0x4DaE2f0f4Db78115eF114F1Dfef426ef2A4fC318);
+  // https://testnet.snowtrace.io/address/0xd36338d0F231446b36008310f1DE0812784ADeBC
+  IAaveOracle internal constant ORACLE = IAaveOracle(0xd36338d0F231446b36008310f1DE0812784ADeBC);
 
-  // https://testnet.snowtrace.io/address/0x544b4e38fC2E74DAd9a3C2f783A15776C0C25c51
+  // https://testnet.snowtrace.io/address/0xC65cbd1e309Bf0e841Ee6f6E786480598e6a4014
   IPoolDataProvider internal constant AAVE_PROTOCOL_DATA_PROVIDER =
-    IPoolDataProvider(0x544b4e38fC2E74DAd9a3C2f783A15776C0C25c51);
+    IPoolDataProvider(0xC65cbd1e309Bf0e841Ee6f6E786480598e6a4014);
 
-  // https://testnet.snowtrace.io/address/0x4f2344ACBEfAe1aD87F41B84691E2552C719f723
+  // https://testnet.snowtrace.io/address/0xa411Accec7000c52feE9bFeDaDc53E1CEF72d6d4
   IACLManager internal constant ACL_MANAGER =
-    IACLManager(0x4f2344ACBEfAe1aD87F41B84691E2552C719f723);
+    IACLManager(0xa411Accec7000c52feE9bFeDaDc53E1CEF72d6d4);
 
-  // https://testnet.snowtrace.io/address/0x9973Ce75946D56fA3B0C6aa3647d67D440BDAec8
-  address internal constant ACL_ADMIN = 0x9973Ce75946D56fA3B0C6aa3647d67D440BDAec8;
+  // https://testnet.snowtrace.io/address/0x6ec33534BE07d45cc4E02Fbd127F8ed2aE919a6b
+  address internal constant ACL_ADMIN = 0x6ec33534BE07d45cc4E02Fbd127F8ed2aE919a6b;
 
-  // https://testnet.snowtrace.io/address/0xB847a72802E43dF643ceC66315B58832Af724Efa
-  ICollector internal constant COLLECTOR = ICollector(0xB847a72802E43dF643ceC66315B58832Af724Efa);
-
-  // https://testnet.snowtrace.io/address/0x25f130Df328c8c2f2C0270377D0e7a984E96ce56
+  // https://testnet.snowtrace.io/address/0x03aFC1Dfb53eae8eB7BE0E8CB6524aa79C3F8578
   address internal constant DEFAULT_INCENTIVES_CONTROLLER =
-    0x25f130Df328c8c2f2C0270377D0e7a984E96ce56;
-
-  // https://testnet.snowtrace.io/address/0xDB8266d95Bc9E1b4C1440501Fae90838381a9156
-  address internal constant DEFAULT_A_TOKEN_IMPL_REV_1 = 0xDB8266d95Bc9E1b4C1440501Fae90838381a9156;
+    0x03aFC1Dfb53eae8eB7BE0E8CB6524aa79C3F8578;
 
-  // https://testnet.snowtrace.io/address/0x4e38efc0097D11bc2926b02D4d6D8FB7057EA7a2
-  address internal constant DEFAULT_VARIABLE_DEBT_TOKEN_IMPL_REV_1 =
-    0x4e38efc0097D11bc2926b02D4d6D8FB7057EA7a2;
+  // https://testnet.snowtrace.io/address/0xa46F32c76cAE9Fd34afB8029dE9c30b7F86bFA58
+  address internal constant EMISSION_MANAGER = 0xa46F32c76cAE9Fd34afB8029dE9c30b7F86bFA58;
 
-  // https://testnet.snowtrace.io/address/0x2Cc2d88880Bbc779bD31eC8c72f8f879f8046a80
-  address internal constant DEFAULT_STABLE_DEBT_TOKEN_IMPL_REV_1 =
-    0x2Cc2d88880Bbc779bD31eC8c72f8f879f8046a80;
+  // https://testnet.snowtrace.io/address/0x4058FE01Aa090E0841F4E08f79D2607C4861142E
+  address internal constant CONFIG_ENGINE = 0x4058FE01Aa090E0841F4E08f79D2607C4861142E;
 
-  // https://testnet.snowtrace.io/address/0x94D29389b874E6B5b7190dd891E7360827c0E3B4
-  address internal constant EMISSION_MANAGER = 0x94D29389b874E6B5b7190dd891E7360827c0E3B4;
+  // https://testnet.snowtrace.io/address/0x9E7DF170E44093d6738057157CA048794B02555d
+  address internal constant POOL_ADDRESSES_PROVIDER_REGISTRY =
+    0x9E7DF170E44093d6738057157CA048794B02555d;
 
-  // https://testnet.snowtrace.io/address/0xBCcD21ae43139bEF545e72e20E78f039A3Ac1b96
-  address internal constant FAUCET = 0xBCcD21ae43139bEF545e72e20E78f039A3Ac1b96;
+  // https://testnet.snowtrace.io/address/0xc344A904BFd1E11AD58a18847940637C35f28ce4
+  address internal constant STATIC_A_TOKEN_FACTORY = 0xc344A904BFd1E11AD58a18847940637C35f28ce4;
 
-  // https://testnet.snowtrace.io/address/0x1EFf285a4E34217495b5531151bffa222A94A4F9
-  address internal constant UI_INCENTIVE_DATA_PROVIDER = 0x1EFf285a4E34217495b5531151bffa222A94A4F9;
+  // https://testnet.snowtrace.io/address/0x9Ba30437Ba63AA2902319DE1B3f0E25a18826842
+  address internal constant UI_INCENTIVE_DATA_PROVIDER = 0x9Ba30437Ba63AA2902319DE1B3f0E25a18826842;
 
-  // https://testnet.snowtrace.io/address/0x279c790Afcd547e2f20d896c5DDEe3846b9790B5
-  address internal constant UI_POOL_DATA_PROVIDER = 0x279c790Afcd547e2f20d896c5DDEe3846b9790B5;
+  // https://testnet.snowtrace.io/address/0x43fAE24bd7eA952B4000Ea3A2e0D8B50CA64EBbA
+  address internal constant WALLET_BALANCE_PROVIDER = 0x43fAE24bd7eA952B4000Ea3A2e0D8B50CA64EBbA;
 
-  // https://testnet.snowtrace.io/address/0xfFE3778c51e93EBf68f5d0a83c794E7f623024dd
-  address internal constant WALLET_BALANCE_PROVIDER = 0xfFE3778c51e93EBf68f5d0a83c794E7f623024dd;
-
-  // https://testnet.snowtrace.io/address/0x8A007E495449ffeda4C2d65f14eE31f8Bcb022CF
-  address internal constant WETH_GATEWAY = 0x8A007E495449ffeda4C2d65f14eE31f8Bcb022CF;
+  // https://testnet.snowtrace.io/address/0x3d2ee1AB8C3a597cDf80273C684dE0036481bE3a
+  address internal constant WETH_GATEWAY = 0x3d2ee1AB8C3a597cDf80273C684dE0036481bE3a;
 }
 
-library AaveV3FujiAssets {
-  // https://testnet.snowtrace.io/address/0x676bD5B5d0955925aeCe653C50426940c58036c8
-  address internal constant DAI_UNDERLYING = 0x676bD5B5d0955925aeCe653C50426940c58036c8;
-
-  uint8 internal constant DAI_DECIMALS = 18;
-
-  // https://testnet.snowtrace.io/address/0xc2E0542ae75DF6ceC02fea12972918a5D18Eb956
-  address internal constant DAI_A_TOKEN = 0xc2E0542ae75DF6ceC02fea12972918a5D18Eb956;
-
-  // https://testnet.snowtrace.io/address/0x070fF79b060C14284754e8d575d2B96eCd2Fb15F
-  address internal constant DAI_V_TOKEN = 0x070fF79b060C14284754e8d575d2B96eCd2Fb15F;
-
-  // https://testnet.snowtrace.io/address/0x713106F071747aa337F40A52dc66D5aF0caB4510
-  address internal constant DAI_S_TOKEN = 0x713106F071747aa337F40A52dc66D5aF0caB4510;
-
-  // https://testnet.snowtrace.io/address/0xA99a7aCefb0a5Cc5152f27814A95c2D914e2f6e5
-  address internal constant DAI_ORACLE = 0xA99a7aCefb0a5Cc5152f27814A95c2D914e2f6e5;
-
-  // https://testnet.snowtrace.io/address/0x056e5A5ad84607fa7d9abaAe8464adE9D2020a7c
-  address internal constant DAI_INTEREST_RATE_STRATEGY = 0x056e5A5ad84607fa7d9abaAe8464adE9D2020a7c;
-
-  // https://testnet.snowtrace.io/address/0x3A38c4d0444b5fFcc5323b2e86A21aBaaf5FbF26
-  address internal constant LINK_UNDERLYING = 0x3A38c4d0444b5fFcc5323b2e86A21aBaaf5FbF26;
-
-  uint8 internal constant LINK_DECIMALS = 18;
-
-  // https://testnet.snowtrace.io/address/0x6cC4457C7547E6995ba7bA000851182F94658A51
-  address internal constant LINK_A_TOKEN = 0x6cC4457C7547E6995ba7bA000851182F94658A51;
-
-  // https://testnet.snowtrace.io/address/0x03578922eD24B3B07525D12464e69646551fd58E
-  address internal constant LINK_V_TOKEN = 0x03578922eD24B3B07525D12464e69646551fd58E;
-
-  // https://testnet.snowtrace.io/address/0xD79D85ce953266ef3c7f218c4b9F081b663566fC
-  address internal constant LINK_S_TOKEN = 0xD79D85ce953266ef3c7f218c4b9F081b663566fC;
-
-  // https://testnet.snowtrace.io/address/0x97cd7dc7DAA77E577C544Da7131e466952a72e9D
-  address internal constant LINK_ORACLE = 0x97cd7dc7DAA77E577C544Da7131e466952a72e9D;
-
-  // https://testnet.snowtrace.io/address/0xeA461FF7c4e89150348b363F886b72c4E4d30Bd9
-  address internal constant LINK_INTEREST_RATE_STRATEGY =
-    0xeA461FF7c4e89150348b363F886b72c4E4d30Bd9;
-
-  // https://testnet.snowtrace.io/address/0xCaC7Ffa82c0f43EBB0FC11FCd32123EcA46626cf
-  address internal constant USDC_UNDERLYING = 0xCaC7Ffa82c0f43EBB0FC11FCd32123EcA46626cf;
-
-  uint8 internal constant USDC_DECIMALS = 6;
-
-  // https://testnet.snowtrace.io/address/0xb1c85310a1b809C70fA6806d27Da425C1261F801
-  address internal constant USDC_A_TOKEN = 0xb1c85310a1b809C70fA6806d27Da425C1261F801;
-
-  // https://testnet.snowtrace.io/address/0xaEF614b7ab1e50A919A181623E0888452c5139e5
-  address internal constant USDC_V_TOKEN = 0xaEF614b7ab1e50A919A181623E0888452c5139e5;
-
-  // https://testnet.snowtrace.io/address/0x37258ee15dE91909Ff2EF9e17ED3568196a6B62F
-  address internal constant USDC_S_TOKEN = 0x37258ee15dE91909Ff2EF9e17ED3568196a6B62F;
-
-  // https://testnet.snowtrace.io/address/0x5Ce12885EFe9fc9E3D710F4e729D53BEBBf32a8E
-  address internal constant USDC_ORACLE = 0x5Ce12885EFe9fc9E3D710F4e729D53BEBBf32a8E;
-
-  // https://testnet.snowtrace.io/address/0x58f262FBAE3a3F91db894E726ee35394b5649593
-  address internal constant USDC_INTEREST_RATE_STRATEGY =
-    0x58f262FBAE3a3F91db894E726ee35394b5649593;
-
-  // https://testnet.snowtrace.io/address/0x0EFD8Ad2231c0B9C4d63F892E0a0a59a626Ce88d
-  address internal constant WBTC_UNDERLYING = 0x0EFD8Ad2231c0B9C4d63F892E0a0a59a626Ce88d;
-
-  uint8 internal constant WBTC_DECIMALS = 8;
-
-  // https://testnet.snowtrace.io/address/0x3d1F7da320eFDE834Cb7974d68591ca65de92FDC
-  address internal constant WBTC_A_TOKEN = 0x3d1F7da320eFDE834Cb7974d68591ca65de92FDC;
-
-  // https://testnet.snowtrace.io/address/0xbbBe736E39FC0a74C110869f837089fA5e57Ec04
-  address internal constant WBTC_V_TOKEN = 0xbbBe736E39FC0a74C110869f837089fA5e57Ec04;
-
-  // https://testnet.snowtrace.io/address/0xA782143aBAC80aA3fB265c10dA31eaeCD84f82c4
-  address internal constant WBTC_S_TOKEN = 0xA782143aBAC80aA3fB265c10dA31eaeCD84f82c4;
-
-  // https://testnet.snowtrace.io/address/0xBc251DE443F7Db3921e0cBC0d55c45336c646F7c
-  address internal constant WBTC_ORACLE = 0xBc251DE443F7Db3921e0cBC0d55c45336c646F7c;
+library AaveV3FujiAssets {}
 
-  // https://testnet.snowtrace.io/address/0xeA461FF7c4e89150348b363F886b72c4E4d30Bd9
-  address internal constant WBTC_INTEREST_RATE_STRATEGY =
-    0xeA461FF7c4e89150348b363F886b72c4E4d30Bd9;
-
-  // https://testnet.snowtrace.io/address/0xf97b6C636167B529B6f1D729Bd9bC0e2Bd491848
-  address internal constant WETH_UNDERLYING = 0xf97b6C636167B529B6f1D729Bd9bC0e2Bd491848;
-
-  uint8 internal constant WETH_DECIMALS = 18;
-
-  // https://testnet.snowtrace.io/address/0x812664237ad3DfdaA697B77b7919bBde7486D90E
-  address internal constant WETH_A_TOKEN = 0x812664237ad3DfdaA697B77b7919bBde7486D90E;
-
-  // https://testnet.snowtrace.io/address/0xEBaC3ae7bFC81C4e05Ad65a69aD69673B1b53a0f
-  address internal constant WETH_V_TOKEN = 0xEBaC3ae7bFC81C4e05Ad65a69aD69673B1b53a0f;
-
-  // https://testnet.snowtrace.io/address/0x4921c29cb9f79eB7Bf1e7B16836F2984ef569B38
-  address internal constant WETH_S_TOKEN = 0x4921c29cb9f79eB7Bf1e7B16836F2984ef569B38;
-
-  // https://testnet.snowtrace.io/address/0x3A19706EC161e02917f056F0c2a91961d2Cf32a0
-  address internal constant WETH_ORACLE = 0x3A19706EC161e02917f056F0c2a91961d2Cf32a0;
-
-  // https://testnet.snowtrace.io/address/0xeA461FF7c4e89150348b363F886b72c4E4d30Bd9
-  address internal constant WETH_INTEREST_RATE_STRATEGY =
-    0xeA461FF7c4e89150348b363F886b72c4E4d30Bd9;
-
-  // https://testnet.snowtrace.io/address/0xBDE7fbbb1DC89E74B73C54Ad911A1C9685caCD83
-  address internal constant USDT_UNDERLYING = 0xBDE7fbbb1DC89E74B73C54Ad911A1C9685caCD83;
-
-  uint8 internal constant USDT_DECIMALS = 6;
-
-  // https://testnet.snowtrace.io/address/0x13f2B2AFCbe58e72b3d275aC197c3f602CC57735
-  address internal constant USDT_A_TOKEN = 0x13f2B2AFCbe58e72b3d275aC197c3f602CC57735;
-
-  // https://testnet.snowtrace.io/address/0xa09275Af89b16036944a48F82D9980C55B950162
-  address internal constant USDT_V_TOKEN = 0xa09275Af89b16036944a48F82D9980C55B950162;
-
-  // https://testnet.snowtrace.io/address/0x663Fe6EF3Ce8330c9f9494f933FBb426553F4F12
-  address internal constant USDT_S_TOKEN = 0x663Fe6EF3Ce8330c9f9494f933FBb426553F4F12;
-
-  // https://testnet.snowtrace.io/address/0x58D19E04fAfC6aC17c01B5667aF137431d9CaAF4
-  address internal constant USDT_ORACLE = 0x58D19E04fAfC6aC17c01B5667aF137431d9CaAF4;
-
-  // https://testnet.snowtrace.io/address/0x58f262FBAE3a3F91db894E726ee35394b5649593
-  address internal constant USDT_INTEREST_RATE_STRATEGY =
-    0x58f262FBAE3a3F91db894E726ee35394b5649593;
-
-  // https://testnet.snowtrace.io/address/0xfB4CeA030Fa61FC435E922CFDc4bF9C80456E19b
-  address internal constant AAVE_UNDERLYING = 0xfB4CeA030Fa61FC435E922CFDc4bF9C80456E19b;
-
-  uint8 internal constant AAVE_DECIMALS = 18;
-
-  // https://testnet.snowtrace.io/address/0x8419b35fA4AE8105d3241687a6421abA7303E642
-  address internal constant AAVE_A_TOKEN = 0x8419b35fA4AE8105d3241687a6421abA7303E642;
-
-  // https://testnet.snowtrace.io/address/0x202AB06b46b0b37804753CF8B2bC0C750b6d6A35
-  address internal constant AAVE_V_TOKEN = 0x202AB06b46b0b37804753CF8B2bC0C750b6d6A35;
-
-  // https://testnet.snowtrace.io/address/0x38BcB6c581EEF8F6Ec545989B04973dC31252fA2
-  address internal constant AAVE_S_TOKEN = 0x38BcB6c581EEF8F6Ec545989B04973dC31252fA2;
-
-  // https://testnet.snowtrace.io/address/0xe19ee4B292a3c52A5089e0f84b5874ee29005895
-  address internal constant AAVE_ORACLE = 0xe19ee4B292a3c52A5089e0f84b5874ee29005895;
-
-  // https://testnet.snowtrace.io/address/0xeA461FF7c4e89150348b363F886b72c4E4d30Bd9
-  address internal constant AAVE_INTEREST_RATE_STRATEGY =
-    0xeA461FF7c4e89150348b363F886b72c4E4d30Bd9;
-
-  // https://testnet.snowtrace.io/address/0x2f6179f64FFe203899600Ba26d10979B314eA13D
-  address internal constant WAVAX_UNDERLYING = 0x2f6179f64FFe203899600Ba26d10979B314eA13D;
+library AaveV3FujiEModes {
+  uint8 internal constant NONE = 0;
+}
 
-  uint8 internal constant WAVAX_DECIMALS = 18;
+library AaveV3FujiExternalLibraries {
+  // https://testnet.snowtrace.io/address/0xb32381feFFF45eE9F47fD2f2cF83C832637d6EF0
+  address internal constant FLASHLOAN_LOGIC = 0xb32381feFFF45eE9F47fD2f2cF83C832637d6EF0;
 
-  // https://testnet.snowtrace.io/address/0x339f50bCbd874A892fb2c6A56Cf8D85Dd215Bf8e
-  address internal constant WAVAX_A_TOKEN = 0x339f50bCbd874A892fb2c6A56Cf8D85Dd215Bf8e;
+  // https://testnet.snowtrace.io/address/0x4c52FE2162200bf26c314d7bbd8611699139d553
+  address internal constant BORROW_LOGIC = 0x4c52FE2162200bf26c314d7bbd8611699139d553;
 
-  // https://testnet.snowtrace.io/address/0xDB40902115B5eEBe5810AfB469A32b66c8258c9E
-  address internal constant WAVAX_V_TOKEN = 0xDB40902115B5eEBe5810AfB469A32b66c8258c9E;
+  // https://testnet.snowtrace.io/address/0x97dCbFaE5372A63128F141E8C0BC2c871Ca5F604
+  address internal constant BRIDGE_LOGIC = 0x97dCbFaE5372A63128F141E8C0BC2c871Ca5F604;
 
-  // https://testnet.snowtrace.io/address/0xeea401488B4752969cD67E325f818d657a0Ea9a5
-  address internal constant WAVAX_S_TOKEN = 0xeea401488B4752969cD67E325f818d657a0Ea9a5;
+  // https://testnet.snowtrace.io/address/0x88F864670De467aA73CD45325F9652C578C8AB85
+  address internal constant E_MODE_LOGIC = 0x88F864670De467aA73CD45325F9652C578C8AB85;
 
-  // https://testnet.snowtrace.io/address/0xA575a92bdEDe1740eF4De70F304A1288AD6E1fb8
-  address internal constant WAVAX_ORACLE = 0xA575a92bdEDe1740eF4De70F304A1288AD6E1fb8;
+  // https://testnet.snowtrace.io/address/0x80d16970B31243Fe67DaB028115f3E4c3E3510Ad
+  address internal constant LIQUIDATION_LOGIC = 0x80d16970B31243Fe67DaB028115f3E4c3E3510Ad;
 
-  // https://testnet.snowtrace.io/address/0xeA461FF7c4e89150348b363F886b72c4E4d30Bd9
-  address internal constant WAVAX_INTEREST_RATE_STRATEGY =
-    0xeA461FF7c4e89150348b363F886b72c4E4d30Bd9;
-}
-
-library AaveV3FujiEModes {
-  uint8 internal constant NONE = 0;
+  // https://testnet.snowtrace.io/address/0xA58FB47bE9074828215A173564C0CD10f6F249bf
+  address internal constant POOL_LOGIC = 0xA58FB47bE9074828215A173564C0CD10f6F249bf;
 
-  uint8 internal constant STABLECOINS = 1;
+  // https://testnet.snowtrace.io/address/0x2b22E425C1322fbA0DbF17bb1dA25d71811EE7ba
+  address internal constant SUPPLY_LOGIC = 0x2b22E425C1322fbA0DbF17bb1dA25d71811EE7ba;
 }
diff --git a/src/MiscFuji.sol b/src/MiscFuji.sol
@@ -5,4 +5,10 @@ pragma solidity >=0.6.0;
 library MiscFuji {
   // https://testnet.snowtrace.io/address/0x9c04928Cc678776eC1C1C0E46ecC03a5F47A7723
   address internal constant GHO_TOKEN = 0x9c04928Cc678776eC1C1C0E46ecC03a5F47A7723;
+
+  // https://testnet.snowtrace.io/address/0x5B8D7e59DbEC5804e4A096FF548ACea83E4615a9
+  address internal constant TRANSPARENT_PROXY_FACTORY = 0x5B8D7e59DbEC5804e4A096FF548ACea83E4615a9;
+
+  // https://testnet.snowtrace.io/address/0x440F1b750Cbc7DDd2Bd9Af279Afe422EaeE58b41
+  address internal constant PROXY_ADMIN = 0x440F1b750Cbc7DDd2Bd9Af279Afe422EaeE58b41;
 }