updated ve-related addresses

FraxFinance · Jun 16, 2024 · 902df0d · 902df0d
1 parent 2186d9c
commit 902df0d
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 18 deletions.
diff --git a/scripts/constants/fraxtal-l2.ts b/scripts/constants/fraxtal-l2.ts
@@ -26,6 +26,7 @@ export const FRAXSWAP_V2_FRAX_FPI_FRAXTAL = "0x7b8848f10A016341c9B2427e8541C19F3
 export const FRAXSWAP_V2_FRAX_FXS_FRAXTAL = "0x8fE4C7F2eF79AEDd8A6e40398a17ed4DaE18Ee25";
 export const FRAXSWAP_V2_FRAX_SFRXETH_FRAXTAL = "0xe402a39F788f90607A50254fAf56316E6a78231A";
 export const FRAXSWAP_V2_FRAX_WFRXETH_FRAXTAL = "0xfbf1d253FcAA3cE13187dBD5B8610C15Cc8241c7";
+export const FXB_TIMED_LOCKER_20261231 = "0x00a5b34d4b436E3276695a1EaA8242FA2FC11dC5";
 
 // FraxBonds
 export const FXB_20261231 = "0x8e9C334afc76106F08E0383907F4Fca9bB10BA3e";
@@ -96,12 +97,13 @@ export const FRAXSWAP_WFRX_ETH_PAIR = "0x4527bcEd9d41706D1436507e9a6e354d3FF44ff
 // Misc
 export const BALANCE_CHECKER = "0x219356ef2f11a314Dd0D8bfd7f4B0B951Cb16c3a";
 export const DELEGATION_REGISTRY = "0x098c837FeF2e146e96ceAF58A10F68Fc6326DC4C";
-export const FPISLOCKER_UTILS = "0x45DD6dd4b1b0373E6452Edf7c6CC401DFbC7ecb9";
-export const FPISLOCKER_IMPL_V3 = "0x2D895a0d5Ec661028EDeeA8bEEf0Dee09CB1b11f";
-export const FPISLOCKER_IMPL_V2 = "0x36B406A00997E4bd5B9bB3618d832fB88Fb09840";
-export const FPISLOCKER_IMPL_V1 = "0xE91488002186029221EFC2449C19aDdF79E61C01";
-export const FPISLOCKER_PROXY = "0x8773DE100B4932e420896fe06A4DB1cCf2A616dF";
+export const FPIS_LOCKER_PROXY = "0x437E9F65cA234eCfed12149109587139d435AD35";
+export const FPIS_LOCKER_IMPL = "0x2b72DF3116cEb8E8a7391024f69A0BfF2718389D";
+export const FPIS_LOCKER_UTILS = "0x9E461cF6773F168A991A7aD73E2aD89ecD737745";
 export const FRAXTAL_POINTS_FXTL = "0xaB4b7c5C9A7C8EbB97877085A6C3550ad4Ed3f97";
+export const SFRAX_ERC4626_MINT_REDEEMER_PROXY = "0xBFc4D34Db83553725eC6c768da71D2D9c1456B55";
+export const SFRAX_ERC4626_MINT_REDEEMER_IMPL = "0x0aF57786D6B2447EA2E04F9FAB36a239c2E8C9d5";
+
 // Fraxferry
 export const FRAXFERRY_ETHEREUM_FRAX = "0x00160baF84b3D2014837cc12e838ea399f8b8478";
 export const FRAXFERRY_ETHEREUM_FXS = "0x24e927daC110Aab7189a4F864d41680e4F7865FB";
@@ -142,15 +144,22 @@ export const L1VEFXS_PROXY_ADMIN_OWNER = "0xC4EB45d80DC1F079045E75D5d55de8eD1c10
 export const L1VEFXS_PROXY_ADMIN = "0xCDD512227340C20B70aDC37C5Bd1E46F69Bb675F";
 export const L1VEFXS_IMPL_V1 = "0xbdb5088a8e89e9ec83e82caa01ec20ed976459ed";
 export const L1VEFXS_PROXY = "0xCDD512227340C20B70aDC37C5Bd1E46F69Bb675F";
+export const L1VEFXS_TOTAL_SUPPLY_ORACLE = "0xaBBeFFb0d24EAcFFD3Be194471F0FD8aaaa3e5f8";
 
 // FXB AMO
 export const FXB_AMO = "0x55271b0d4DaC2664Fa9d44F8cccd89A3e6342313";
 export const OPTIMISM_MINTABLE_PERMIT_ERC20_FACTORY_IMPL_V1 = "0x111ddab65Af5fF96b674400246699ED40F550De1";
+
+// veFXS Related
 export const VEFXS_YIELD_DISTRIBUTOR_IMPL_V1 = "0x691d1AaFB550c35B24e09bb991AEC9612342eD93";
-export const VEFXS_YIELD_DISTRIBUTOR_PROXY = "0x39333a540bbea6262e405E1A6d435Bd2e776561E";
+export const VEFXS_YIELD_DISTRIBUTOR_PROXY_V1 = "0x39333a540bbea6262e405E1A6d435Bd2e776561E";
+export const YIELD_DISTRIBUTOR_PROXY = "0x2673fD26dD56D22e85A7Cb6A8fDe1dEaB151f93b";
+export const YIELD_DISTRIBUTOR_IMPL = "0x5CA7cc32be0E03fde68057d04c1a7eE8ff379AF3";
 export const VESTEDFXS_UTILS = "0xC540f05BF5a09336078634D65E46242DFBa55030";
 export const VESTEDFXS_IMPL_V1 = "0x54bd5c72645fed784C117cA83533e0584b24Ee5c";
 export const VESTEDFXS_PROXY = "0x007FD070a7E1B0fA1364044a373Ac1339bAD89CF";
+export const VEFXS_AGGREGATOR_PROXY = "0x176A4e081653EbB8a2246BAfbfCf663782426531";
+export const VEFXS_AGGREGATOR_IMPL = "0xF9Ca1Dc83B16C72b3359CEcD1d3Fc96d80dC4Fa6";
 
 // Multisigs
 export const COMPTROLLERS = "0xC4EB45d80DC1F079045E75D5d55de8eD1c1090E6";

diff --git a/src/Constants.sol b/src/Constants.sol
@@ -779,6 +779,7 @@ library FraxtalL2 {
     address internal constant FRAXSWAP_V2_FRAX_FXS_FRAXTAL = 0x8fE4C7F2eF79AEDd8A6e40398a17ed4DaE18Ee25;
     address internal constant FRAXSWAP_V2_FRAX_SFRXETH_FRAXTAL = 0xe402a39F788f90607A50254fAf56316E6a78231A;
     address internal constant FRAXSWAP_V2_FRAX_WFRXETH_FRAXTAL = 0xfbf1d253FcAA3cE13187dBD5B8610C15Cc8241c7;
+    address internal constant FXB_TIMED_LOCKER_20261231 = 0x00a5b34d4b436E3276695a1EaA8242FA2FC11dC5;
     address internal constant FXB_20261231 = 0x8e9C334afc76106F08E0383907F4Fca9bB10BA3e;
     address internal constant FXB_20241231 = 0xa71bB8c79dc8FfA90A6Dd711aA9Fbe5114c19cba;
     address internal constant FXB_20240630 = 0x758094A71a39De49626FE25B86631ED944558653;
@@ -845,12 +846,12 @@ library FraxtalL2 {
     address internal constant FRAXSWAP_WFRX_ETH_PAIR = 0x4527bcEd9d41706D1436507e9a6e354d3FF44ff9;
     address internal constant BALANCE_CHECKER = 0x219356ef2f11a314Dd0D8bfd7f4B0B951Cb16c3a;
     address internal constant DELEGATION_REGISTRY = 0x098c837FeF2e146e96ceAF58A10F68Fc6326DC4C;
-    address internal constant FPISLOCKER_UTILS = 0x45DD6dd4b1b0373E6452Edf7c6CC401DFbC7ecb9;
-    address internal constant FPISLOCKER_IMPL_V3 = 0x2D895a0d5Ec661028EDeeA8bEEf0Dee09CB1b11f;
-    address internal constant FPISLOCKER_IMPL_V2 = 0x36B406A00997E4bd5B9bB3618d832fB88Fb09840;
-    address internal constant FPISLOCKER_IMPL_V1 = 0xE91488002186029221EFC2449C19aDdF79E61C01;
-    address internal constant FPISLOCKER_PROXY = 0x8773DE100B4932e420896fe06A4DB1cCf2A616dF;
+    address internal constant FPIS_LOCKER_PROXY = 0x437E9F65cA234eCfed12149109587139d435AD35;
+    address internal constant FPIS_LOCKER_IMPL = 0x2b72DF3116cEb8E8a7391024f69A0BfF2718389D;
+    address internal constant FPIS_LOCKER_UTILS = 0x9E461cF6773F168A991A7aD73E2aD89ecD737745;
     address internal constant FRAXTAL_POINTS_FXTL = 0xaB4b7c5C9A7C8EbB97877085A6C3550ad4Ed3f97;
+    address internal constant SFRAX_ERC4626_MINT_REDEEMER_PROXY = 0xBFc4D34Db83553725eC6c768da71D2D9c1456B55;
+    address internal constant SFRAX_ERC4626_MINT_REDEEMER_IMPL = 0x0aF57786D6B2447EA2E04F9FAB36a239c2E8C9d5;
     address internal constant FRAXFERRY_ETHEREUM_FRAX = 0x00160baF84b3D2014837cc12e838ea399f8b8478;
     address internal constant FRAXFERRY_ETHEREUM_FXS = 0x24e927daC110Aab7189a4F864d41680e4F7865FB;
     address internal constant FRAXFERRY_ETHEREUM_FPI = 0xEcf63fd1A839fF54949eB786693237bEEC59C6e7;
@@ -878,14 +879,19 @@ library FraxtalL2 {
     address internal constant L1VEFXS_PROXY_ADMIN = 0xCDD512227340C20B70aDC37C5Bd1E46F69Bb675F;
     address internal constant L1VEFXS_IMPL_V1 = 0xBDB5088A8e89e9ec83e82caA01EC20Ed976459eD;
     address internal constant L1VEFXS_PROXY = 0xCDD512227340C20B70aDC37C5Bd1E46F69Bb675F;
+    address internal constant L1VEFXS_TOTAL_SUPPLY_ORACLE = 0xaBBeFFb0d24EAcFFD3Be194471F0FD8aaaa3e5f8;
     address internal constant FXB_AMO = 0x55271b0d4DaC2664Fa9d44F8cccd89A3e6342313;
     address internal constant OPTIMISM_MINTABLE_PERMIT_ERC20_FACTORY_IMPL_V1 =
         0x111ddab65Af5fF96b674400246699ED40F550De1;
     address internal constant VEFXS_YIELD_DISTRIBUTOR_IMPL_V1 = 0x691d1AaFB550c35B24e09bb991AEC9612342eD93;
-    address internal constant VEFXS_YIELD_DISTRIBUTOR_PROXY = 0x39333a540bbea6262e405E1A6d435Bd2e776561E;
+    address internal constant VEFXS_YIELD_DISTRIBUTOR_PROXY_V1 = 0x39333a540bbea6262e405E1A6d435Bd2e776561E;
+    address internal constant YIELD_DISTRIBUTOR_PROXY = 0x2673fD26dD56D22e85A7Cb6A8fDe1dEaB151f93b;
+    address internal constant YIELD_DISTRIBUTOR_IMPL = 0x5CA7cc32be0E03fde68057d04c1a7eE8ff379AF3;
     address internal constant VESTEDFXS_UTILS = 0xC540f05BF5a09336078634D65E46242DFBa55030;
     address internal constant VESTEDFXS_IMPL_V1 = 0x54bd5c72645fed784C117cA83533e0584b24Ee5c;
     address internal constant VESTEDFXS_PROXY = 0x007FD070a7E1B0fA1364044a373Ac1339bAD89CF;
+    address internal constant VEFXS_AGGREGATOR_PROXY = 0x176A4e081653EbB8a2246BAfbfCf663782426531;
+    address internal constant VEFXS_AGGREGATOR_IMPL = 0xF9Ca1Dc83B16C72b3359CEcD1d3Fc96d80dC4Fa6;
     address internal constant COMPTROLLERS = 0xC4EB45d80DC1F079045E75D5d55de8eD1c1090E6;
     address internal constant PROPOSER_MULTI_SIG = 0xc188a8f8066e720D892c0cfAE9B9865e3425fCdE;
     address internal constant GOV_PROPOSER_MSIG = 0xc188a8f8066e720D892c0cfAE9B9865e3425fCdE;
@@ -929,6 +935,7 @@ abstract contract AddressHelperFraxtalL2 is TestBase {
         vm.label(0x8fE4C7F2eF79AEDd8A6e40398a17ed4DaE18Ee25, "Constants.FXTL_FRAXSWAP_V2_FRAX_FXS_FRAXTAL");
         vm.label(0xe402a39F788f90607A50254fAf56316E6a78231A, "Constants.FXTL_FRAXSWAP_V2_FRAX_SFRXETH_FRAXTAL");
         vm.label(0xfbf1d253FcAA3cE13187dBD5B8610C15Cc8241c7, "Constants.FXTL_FRAXSWAP_V2_FRAX_WFRXETH_FRAXTAL");
+        vm.label(0x00a5b34d4b436E3276695a1EaA8242FA2FC11dC5, "Constants.FXTL_FXB_TIMED_LOCKER_20261231");
         vm.label(0x8e9C334afc76106F08E0383907F4Fca9bB10BA3e, "Constants.FXTL_FXB_20261231");
         vm.label(0xa71bB8c79dc8FfA90A6Dd711aA9Fbe5114c19cba, "Constants.FXTL_FXB_20241231");
         vm.label(0x758094A71a39De49626FE25B86631ED944558653, "Constants.FXTL_FXB_20240630");
@@ -1007,12 +1014,12 @@ abstract contract AddressHelperFraxtalL2 is TestBase {
         vm.label(0x4527bcEd9d41706D1436507e9a6e354d3FF44ff9, "Constants.FXTL_FRAXSWAP_WFRX_ETH_PAIR");
         vm.label(0x219356ef2f11a314Dd0D8bfd7f4B0B951Cb16c3a, "Constants.FXTL_BALANCE_CHECKER");
         vm.label(0x098c837FeF2e146e96ceAF58A10F68Fc6326DC4C, "Constants.FXTL_DELEGATION_REGISTRY");
-        vm.label(0x45DD6dd4b1b0373E6452Edf7c6CC401DFbC7ecb9, "Constants.FXTL_FPISLOCKER_UTILS");
-        vm.label(0x2D895a0d5Ec661028EDeeA8bEEf0Dee09CB1b11f, "Constants.FXTL_FPISLOCKER_IMPL_V3");
-        vm.label(0x36B406A00997E4bd5B9bB3618d832fB88Fb09840, "Constants.FXTL_FPISLOCKER_IMPL_V2");
-        vm.label(0xE91488002186029221EFC2449C19aDdF79E61C01, "Constants.FXTL_FPISLOCKER_IMPL_V1");
-        vm.label(0x8773DE100B4932e420896fe06A4DB1cCf2A616dF, "Constants.FXTL_FPISLOCKER_PROXY");
+        vm.label(0x437E9F65cA234eCfed12149109587139d435AD35, "Constants.FXTL_FPIS_LOCKER_PROXY");
+        vm.label(0x2b72DF3116cEb8E8a7391024f69A0BfF2718389D, "Constants.FXTL_FPIS_LOCKER_IMPL");
+        vm.label(0x9E461cF6773F168A991A7aD73E2aD89ecD737745, "Constants.FXTL_FPIS_LOCKER_UTILS");
         vm.label(0xaB4b7c5C9A7C8EbB97877085A6C3550ad4Ed3f97, "Constants.FXTL_FRAXTAL_POINTS_FXTL");
+        vm.label(0xBFc4D34Db83553725eC6c768da71D2D9c1456B55, "Constants.FXTL_SFRAX_ERC4626_MINT_REDEEMER_PROXY");
+        vm.label(0x0aF57786D6B2447EA2E04F9FAB36a239c2E8C9d5, "Constants.FXTL_SFRAX_ERC4626_MINT_REDEEMER_IMPL");
         vm.label(0x00160baF84b3D2014837cc12e838ea399f8b8478, "Constants.FXTL_FRAXFERRY_ETHEREUM_FRAX");
         vm.label(0x24e927daC110Aab7189a4F864d41680e4F7865FB, "Constants.FXTL_FRAXFERRY_ETHEREUM_FXS");
         vm.label(0xEcf63fd1A839fF54949eB786693237bEEC59C6e7, "Constants.FXTL_FRAXFERRY_ETHEREUM_FPI");
@@ -1040,16 +1047,21 @@ abstract contract AddressHelperFraxtalL2 is TestBase {
         vm.label(0xCDD512227340C20B70aDC37C5Bd1E46F69Bb675F, "Constants.FXTL_L1VEFXS_PROXY_ADMIN");
         vm.label(0xBDB5088A8e89e9ec83e82caA01EC20Ed976459eD, "Constants.FXTL_L1VEFXS_IMPL_V1");
         vm.label(0xCDD512227340C20B70aDC37C5Bd1E46F69Bb675F, "Constants.FXTL_L1VEFXS_PROXY");
+        vm.label(0xaBBeFFb0d24EAcFFD3Be194471F0FD8aaaa3e5f8, "Constants.FXTL_L1VEFXS_TOTAL_SUPPLY_ORACLE");
         vm.label(0x55271b0d4DaC2664Fa9d44F8cccd89A3e6342313, "Constants.FXTL_FXB_AMO");
         vm.label(
             0x111ddab65Af5fF96b674400246699ED40F550De1,
             "Constants.FXTL_OPTIMISM_MINTABLE_PERMIT_ERC20_FACTORY_IMPL_V1"
         );
         vm.label(0x691d1AaFB550c35B24e09bb991AEC9612342eD93, "Constants.FXTL_VEFXS_YIELD_DISTRIBUTOR_IMPL_V1");
-        vm.label(0x39333a540bbea6262e405E1A6d435Bd2e776561E, "Constants.FXTL_VEFXS_YIELD_DISTRIBUTOR_PROXY");
+        vm.label(0x39333a540bbea6262e405E1A6d435Bd2e776561E, "Constants.FXTL_VEFXS_YIELD_DISTRIBUTOR_PROXY_V1");
+        vm.label(0x2673fD26dD56D22e85A7Cb6A8fDe1dEaB151f93b, "Constants.FXTL_YIELD_DISTRIBUTOR_PROXY");
+        vm.label(0x5CA7cc32be0E03fde68057d04c1a7eE8ff379AF3, "Constants.FXTL_YIELD_DISTRIBUTOR_IMPL");
         vm.label(0xC540f05BF5a09336078634D65E46242DFBa55030, "Constants.FXTL_VESTEDFXS_UTILS");
         vm.label(0x54bd5c72645fed784C117cA83533e0584b24Ee5c, "Constants.FXTL_VESTEDFXS_IMPL_V1");
         vm.label(0x007FD070a7E1B0fA1364044a373Ac1339bAD89CF, "Constants.FXTL_VESTEDFXS_PROXY");
+        vm.label(0x176A4e081653EbB8a2246BAfbfCf663782426531, "Constants.FXTL_VEFXS_AGGREGATOR_PROXY");
+        vm.label(0xF9Ca1Dc83B16C72b3359CEcD1d3Fc96d80dC4Fa6, "Constants.FXTL_VEFXS_AGGREGATOR_IMPL");
         vm.label(0xC4EB45d80DC1F079045E75D5d55de8eD1c1090E6, "Constants.FXTL_COMPTROLLERS");
         vm.label(0xc188a8f8066e720D892c0cfAE9B9865e3425fCdE, "Constants.FXTL_PROPOSER_MULTI_SIG");
         vm.label(0xc188a8f8066e720D892c0cfAE9B9865e3425fCdE, "Constants.FXTL_GOV_PROPOSER_MSIG");