Merge pull request #24 from FraxFinance/travis

misc missing Fraxtal addrs
FraxFinance · May 23, 2024 · 52275a8 · 52275a8
2 parents 45f3e2a + 4517fc5
commit 52275a8
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 12 deletions.
diff --git a/scripts/constants/fraxtal-l2.ts b/scripts/constants/fraxtal-l2.ts
@@ -2,7 +2,7 @@ export const CHAIN_ID = 252;
 
 export const PROXY_ADMIN = "0xfC00000000000000000000000000000000000009";
 export const COMPTROLLER = "0xC4EB45d80DC1F079045E75D5d55de8eD1c1090E6";
-export const OPTIMISM_MINTABLE_PERMIT_ERC20_FACTORY_IMPLEMENTATION = "0x111ddab65Af5fF96b674400246699ED40F550De1";
+export const OPTIMISM_MINTABLE_PERMIT_ERC20_FACTORY_IMPL_V1 = "0x111ddab65Af5fF96b674400246699ED40F550De1";
 
 // Fraxlend Admin Addresses
 export const TIMELOCK_ADDRESS = "0xc16068d1ca7E24E20e56bB70af4D00D92AA4f0b2";
@@ -55,7 +55,7 @@ export const CHAINLINK_MERKLE_PRICE_SOURCE = "0x4AD728706bFe28A3F090b3f1D8Ac3A85
 export const L1VEFXS_IMPLEMENTATION_OWNER = COMPTROLLER;
 export const L1VEFXS_PROXY_ADMIN_OWNER = COMPTROLLER;
 export const L1VEFXS_PROXY_ADMIN = "0xCDD512227340C20B70aDC37C5Bd1E46F69Bb675F";
-export const L1VEFXS_IMPLEMENTATION = "0xbdb5088a8e89e9ec83e82caa01ec20ed976459ed";
+export const L1VEFXS_IMPL_V1 = "0xbdb5088a8e89e9ec83e82caa01ec20ed976459ed";
 export const L1VEFXS_PROXY = "0xCDD512227340C20B70aDC37C5Bd1E46F69Bb675F";
 
 // FXB AMO

diff --git a/src/Constants.sol b/src/Constants.sol
@@ -279,7 +279,7 @@ library FraxtalL2 {
     uint256 internal constant CHAIN_ID = 252;
     address internal constant PROXY_ADMIN = 0xfC00000000000000000000000000000000000009;
     address internal constant COMPTROLLER = 0xC4EB45d80DC1F079045E75D5d55de8eD1c1090E6;
-    address internal constant OPTIMISM_MINTABLE_PERMIT_ERC20_FACTORY_IMPLEMENTATION =
+    address internal constant OPTIMISM_MINTABLE_PERMIT_ERC20_FACTORY_IMPL_V1 =
         0x111ddab65Af5fF96b674400246699ED40F550De1;
     address internal constant TIMELOCK_ADDRESS = 0xc16068d1ca7E24E20e56bB70af4D00D92AA4f0b2;
     address internal constant CIRCUIT_BREAKER_ADDRESS = 0x0eD01ea3B95e0f68DF2c9CD67F138ff3547b311C;
@@ -317,7 +317,7 @@ library FraxtalL2 {
     address internal constant L1VEFXS_IMPLEMENTATION_OWNER = 0xC4EB45d80DC1F079045E75D5d55de8eD1c1090E6;
     address internal constant L1VEFXS_PROXY_ADMIN_OWNER = 0xC4EB45d80DC1F079045E75D5d55de8eD1c1090E6;
     address internal constant L1VEFXS_PROXY_ADMIN = 0xCDD512227340C20B70aDC37C5Bd1E46F69Bb675F;
-    address internal constant L1VEFXS_IMPLEMENTATION = 0xBDB5088A8e89e9ec83e82caA01EC20Ed976459eD;
+    address internal constant L1VEFXS_IMPL_V1 = 0xBDB5088A8e89e9ec83e82caA01EC20Ed976459eD;
     address internal constant L1VEFXS_PROXY = 0xCDD512227340C20B70aDC37C5Bd1E46F69Bb675F;
     address internal constant FXB_AMO = 0x55271b0d4DaC2664Fa9d44F8cccd89A3e6342313;
 }

diff --git a/src/addresses/Ethereum.sol b/src/addresses/Ethereum.sol
@@ -886,17 +886,44 @@ library Fraxswap {
 
 library FraxtalL1 {
     address internal constant ADDRESS_MANAGER = 0x8c5D64d10394cFa070066e70Ec19E67398b4dABE;
+    address internal constant BASE_FEE_VAULT_RECIPIENT = 0xB1748C79709f4Ba2Dd82834B8c82D4a505003f27;
+    address internal constant BATCH_INBOX = 0xfF000000000000000000000000000000000420fC;
+    address internal constant BATCH_SENDER = 0x6017f75108f251a488B045A7ce2a7C15b179d1f2;
+    address internal constant DEPLOYER = 0xe0d7755252873c4eF5788f7f45764E0e17610508;
     address internal constant FRAXTAL_COMPTROLLER = 0xe0d7755252873c4eF5788f7f45764E0e17610508;
+    address internal constant FINAL_SYSTEM_OWNER = 0xe0d7755252873c4eF5788f7f45764E0e17610508;
     address internal constant DISPUTE_GAME_FACTORY_PROXY = 0x3AA7e876880CB34371c01f1510B1e0A932dCb8C1;
+    address internal constant L1_CROSS_DOMAIN_MESSENGER_IMPL_V2 = 0xC6e4ECE5576dC96846bb11eD8910f3dF3CE516b8;
+    address internal constant L1_CROSS_DOMAIN_MESSENGER__IMPL_V1 = 0x31c25985E6b10CF335FC01cf9790aF4890d0505c;
     address internal constant L1_CROSS_DOMAIN_MESSENGER_PROXY = 0x126bcc31Bc076B3d515f60FBC81FddE0B0d542Ed;
     address internal constant L1_ERC721_BRIDGE_PROXY = 0xa9B5Fb84B7aeAF0D51C95DB04a76B1D4738D0eC5;
+    address internal constant L1_ERC721_BRIDGE__IMPL_V1 = 0x23A0478996241F9f966b7054c06FdeB96Ddf3475;
+    address internal constant L1_ERC721_BRIDGE_IMPL_V2 = 0x7eE1637C33Ed0DFEE6403f3301B6d404106018e4;
     address internal constant L1_STANDARD_BRIDGE_PROXY = 0x34C0bD5877A5Ee7099D0f5688D65F4bB9158BDE2;
+    address internal constant L1_STANDARD_BRIDGE__IMPL_V1_ADDR = 0xCC26248B71284B812Ff7825e005560DB01a874C7;
+    address internal constant L1_STANDARD_BRIDGE_IMPL_V2_ADDR = 0x30Cd695249394eED44C576f2caEC5304be6455F9;
+    address internal constant L2_OUTPUT_ORACLE_CHALLENGER = 0xe0d7755252873c4eF5788f7f45764E0e17610508;
+    address internal constant L2_OUTPUT_ORACLE_PROPOSER = 0xFb90465f3064fF63FC460F01A6307eC73d64bc50;
     address internal constant L2_OUTPUT_ORACLE_PROXY = 0x66CC916Ed5C6C2FA97014f7D1cD141528Ae171e4;
+    address internal constant L2_OUTPUT_ORACLE__IMPL_V1 = 0xA30ADd78D5be6B2B55C934666bb4fF2C4429d800;
+    address internal constant L2_OUTPUT_ORACLE_IMPL_V2 = 0x6f3CcC8C9DAf8B9b39aDe481213Ff7A626a42B65;
     address internal constant OPTIMISM_MINTABLE_ERC20_FACTORY_PROXY = 0x11FE3be54aC01C13Dd985cE2BdD10eD77e1376cc;
     address internal constant OPTIMISM_PORTAL_PROXY = 0x36cb65c1967A0Fb0EEE11569C51C2f2aA1Ca6f6D;
+    address internal constant OPTIMISM_PORTAL__IMPL_V1_ADDR = 0x59B6903044Fa9439a5D621D3605789A6E654b1D6;
+    address internal constant OPTIMISM_PORTAL_IMPL_V2_ADDR = 0x47Ec03B67ba4f3C71a4320D2947f2173E0B45a23;
+    address internal constant P2P_SEQUENCER_ADDRESS = 0xc88138f5c82DD1bD327708C7F1c15E44Ce7FdA0C;
+    address internal constant PORTAL_GUARDIAN = 0xe0d7755252873c4eF5788f7f45764E0e17610508;
+    address internal constant PROTOCOL_VERSIONS_IMPL_V2 = 0xeE1d28b0FB299BcE1E164aCc001c15e283082bA2;
     address internal constant PROTOCOL_VERSIONS_PROXY = 0x3c7EA1c10Eb783fE86e4eEd202324dCFEEca9043;
     address internal constant PROXY_ADMIN = 0x13Fe62cB24aEa5afd179F20D362c056c3881ABcA;
+    address internal constant PROXY_ADMIN_OWNER = 0xe0d7755252873c4eF5788f7f45764E0e17610508;
+    address internal constant STORAGE_SETTER = 0x7a6b7F35D032c9b122C69F01EA4523e028f6ef4A;
+    address internal constant SUPERCHAIN_CONFIG_GUARDIAN = 0xe0d7755252873c4eF5788f7f45764E0e17610508;
+    address internal constant SUPERCHAIN_CONFIG_IMPL_V2 = 0x0d9C39c64CF8eDA1EdFeBD78AFa895bAA797eFc4;
     address internal constant SUPERCHAIN_CONFIG_PROXY = 0x61ca43CB037aC9181d8Fa5CD0073dC314065Ccc4;
+    address internal constant SYSTEM_OWNER_SAFE = 0xe0d7755252873c4eF5788f7f45764E0e17610508;
+    address internal constant SYSTEM_CONFIG__IMPL_V1_ADDR = 0x22052c592f763CA14a090D9974c5Bf9Fd3a44b8c;
+    address internal constant SYSTEM_CONFIG_IMPL_V2_ADDR = 0x4D7A1a16d0DA89B50FBd8b524508FC393A6Dc367;
     address internal constant SYSTEM_CONFIG_PROXY = 0x34a9f273cbD847d49c3De015FC26c3E66825f8b2;
 }
 
@@ -911,7 +938,7 @@ library Misc {
     address internal constant CONVEX_AMO_ADMIN = 0xE53d45ABe10Ce20427D20c5a1b6360Fa5BA0cE0A;
     address internal constant CRVFRAX_VAULT = 0xB4AdA607B9d6b2c9Ee07A275e9616B84AC560139;
     address internal constant CURVE_AMO = 0x72170Cdc48C33a6AE6B3E83CD387ca3Fb9105da2; // Impl: 0xC3204838aF4CE0597476aDF367B4C9a3cf9a1B51
-    address internal constant CURVE_AMO_IMPL = 0x5840Db064e17480f8e8E74fD6714C9c316f7DdFE; // Old2: 0xbd061885260F176e05699fED9C5a4604fc7F2BDC, Old1: 0x77746DC37Deae008c7149EDc1b1A8D6d63e08Be5, Old2: 0x25e9702359bAf56E505F0BA981eeBFA23ceB030A, Old3: 0x19a47F38D39692617C9D9012eC0176C9ead00a5e
+    address internal constant CURVE_AMO_IMPL_V1 = 0x5840Db064e17480f8e8E74fD6714C9c316f7DdFE; // Old2: 0xbd061885260F176e05699fED9C5a4604fc7F2BDC, Old1: 0x77746DC37Deae008c7149EDc1b1A8D6d63e08Be5, Old2: 0x25e9702359bAf56E505F0BA981eeBFA23ceB030A, Old3: 0x19a47F38D39692617C9D9012eC0176C9ead00a5e
     address internal constant CURVE_AMO_V1 = 0xbd061885260F176e05699fED9C5a4604fc7F2BDC;
     address internal constant CURVE_AMO_V2 = 0xD103FEf74D05FbC20B5184FE85c7187735355DB3; // 0xeF8c0b4902b985bF64B8cfF6BbCD0AC1FDc8d5d3, // Proxy: 0x7e983e4f98b16cee76f8f9a6a1e87b5861de8769
     address internal constant CURVE_AMO_V5 = 0xf8a4ffe7C980fD50B160b7B86dCd5e9eb7E281a9;
@@ -935,12 +962,12 @@ library Misc {
     address internal constant FXS_1559_AMO = 0x9C6a04871D11b33645ab592f68C41bb2B41F51EE; // Old1: 0xaf02be5968D8Fe9536e24E4c7e888C59A58Bc077
     address internal constant FXS_1559_AMO_V2 = 0xC80C48862E4254F37047235298eDb6AA35717C24; // Proxy
     address internal constant FXS_1559_AMO_V2_ADMIN = 0xCaa487D113ad1C34Ce128c4f3a2A437614C6a692; // Proxy admin
-    address internal constant FXS_1559_AMO_V2_IMPL = 0xCDe9A4e885B87a893b8817D136FD2F404B54294f;
+    address internal constant FXS_1559_AMO_V2_IMPL_V1 = 0xCDe9A4e885B87a893b8817D136FD2F404B54294f;
     address internal constant FXS_1559_AMO_V3 = 0xb524622901b3f7b5DeA6501E9830700C847C7DC5; // Old: 0x7301BB959ee286D8ABC46f341144afE443CEdAe5
     address internal constant INVESTOR_AMO = 0xB8315Af919729c823B2d996B1A6DDE381E7444f1; // Old proxy: 0x2B4d259a8f6E765AD881C4C1D04045D629dA01b4
     address internal constant INVESTOR_AMO_V1 = 0xEE5825d5185a1D512706f9068E69146A54B6e076;
     address internal constant INVESTOR_AMO_ADMIN = 0x069c24600c2A03147D4E1D9b04d193151676F577;
-    address internal constant INVESTOR_AMO_IMPL = 0xdE3C8aA7f53a69c595b7720045000A68Cb9CB341; // Old V3: 0xEccA5a27B4f8f92a2bFFd006F20168A7188C0A0C, Old V2: 0xEE5825d5185a1D512706f9068E69146A54B6e076, // Old: 0xe09394AE14d7c3b1798e4dbEa4c280973B2689A4
+    address internal constant INVESTOR_AMO_IMPL_V1 = 0xdE3C8aA7f53a69c595b7720045000A68Cb9CB341; // Old V3: 0xEccA5a27B4f8f92a2bFFd006F20168A7188C0A0C, Old V2: 0xEE5825d5185a1D512706f9068E69146A54B6e076, // Old: 0xe09394AE14d7c3b1798e4dbEa4c280973B2689A4
     address internal constant LENDING_AMO = 0x9507189f5B6D820cd93d970d67893006968825ef; // Old: 0xDA9d06166c2085988920Fb35EB2d322B4aaDF1EE
     address internal constant MANUAL_TOKEN_TRACKER_AMO = 0xEc8672dd770D59FaD9a811591a5Edd40e8F6A413;
     address internal constant MIGRATION_BUNDLE_UTILS = 0x239c957d42343B3d91FABc7c16E7F1e30Bc32E5B; // same bytecode: 0x2fFFFbA4F562569bec2D4FC1c36F7797ffb173Cd

diff --git a/src/addresses/Fraxtal_Mainnet.sol b/src/addresses/Fraxtal_Mainnet.sol
@@ -96,17 +96,17 @@ library Misc {
     address internal constant BALANCE_CHECKER = 0x219356ef2f11a314Dd0D8bfd7f4B0B951Cb16c3a;
     address internal constant DELEGATION_REGISTRY = 0x098c837FeF2e146e96ceAF58A10F68Fc6326DC4C;
     address internal constant FPISLOCKER_UTILS = 0x858aFbE668F4f562900Bae3e2DAed65D88027aEA;
-    address internal constant FPISLOCKER_IMPLEMENTATION = 0x36B406A00997E4bd5B9bB3618d832fB88Fb09840;
-    address internal constant FPISLOCKER_OLD_IMPLEMENTATION = 0xE91488002186029221EFC2449C19aDdF79E61C01;
+    address internal constant FPISLOCKER_IMPL_V2 = 0x36B406A00997E4bd5B9bB3618d832fB88Fb09840;
+    address internal constant FPISLOCKER_IMPL_V1 = 0xE91488002186029221EFC2449C19aDdF79E61C01;
     address internal constant FPISLOCKER_PROXY = 0x2c0A04219f744355e10C1F9B8Fc93719b3546705;
     address internal constant FRAXTAL_POINTS_FXTL = 0xaB4b7c5C9A7C8EbB97877085A6C3550ad4Ed3f97;
-    address internal constant L1VEFXS_IMPLEMENTATION = 0xBDB5088A8e89e9ec83e82caA01EC20Ed976459eD;
+    address internal constant L1VEFXS_IMPL_V1 = 0xBDB5088A8e89e9ec83e82caA01EC20Ed976459eD;
     address internal constant L1VEFXS_PROXY = 0x942f912c9295b774d4ca36BABee1f114d3d6B4a5;
     address internal constant L1VEFXS_PROXY_ADMIN = 0xCDD512227340C20B70aDC37C5Bd1E46F69Bb675F;
-    address internal constant VEFXS_YIELD_DISTRIBUTOR_IMPLEMENTATION = 0x691d1AaFB550c35B24e09bb991AEC9612342eD93;
+    address internal constant VEFXS_YIELD_DISTRIBUTOR_IMPL_V1 = 0x691d1AaFB550c35B24e09bb991AEC9612342eD93;
     address internal constant VEFXS_YIELD_DISTRIBUTOR_PROXY = 0x39333a540bbea6262e405E1A6d435Bd2e776561E;
     address internal constant VESTEDFXS_UTILS = 0xC540f05BF5a09336078634D65E46242DFBa55030;
-    address internal constant VESTEDFXS_IMPLEMENTATION = 0x54bd5c72645fed784C117cA83533e0584b24Ee5c;
+    address internal constant VESTEDFXS_IMPL_V1 = 0x54bd5c72645fed784C117cA83533e0584b24Ee5c;
     address internal constant VESTEDFXS_PROXY = 0x007FD070a7E1B0fA1364044a373Ac1339bAD89CF;
 }