From 8acef1aa6b14759de505b6823fbecb7037fded4b Mon Sep 17 00:00:00 2001 From: Thomas Clement Date: Tue, 2 Jul 2024 11:09:23 -0400 Subject: [PATCH 1/2] Update Additional Addresses + Standardize Variable Names --- scripts/constants/fraxtal-l2.ts | 14 ++++++++--- scripts/constants/mainnet.ts | 6 ++--- src/contracts/chain-constants/FraxtalL2.sol | 28 ++++++++++++++++----- src/contracts/chain-constants/Mainnet.sol | 12 ++++----- 4 files changed, 42 insertions(+), 18 deletions(-) diff --git a/scripts/constants/fraxtal-l2.ts b/scripts/constants/fraxtal-l2.ts index 6cd7960..6e921a1 100644 --- a/scripts/constants/fraxtal-l2.ts +++ b/scripts/constants/fraxtal-l2.ts @@ -32,6 +32,9 @@ export const FXB_TIMED_LOCKER_20261231 = "0x00a5b34d4b436E3276695a1EaA8242FA2FC1 export const FXB_20261231 = "0x8e9C334afc76106F08E0383907F4Fca9bB10BA3e"; export const FXB_20241231 = "0xa71bB8c79dc8FfA90A6Dd711aA9Fbe5114c19cba"; export const FXB_20240630 = "0x758094A71a39De49626FE25B86631ED944558653"; +export const FXB_20551231 = "0xc38173d34afaea88bc482813b3cd267bc8a1ea83"; +export const FXB_20291231 = "0xf1e2b576af4c6a7ee966b14c810b772391e92153"; +export const FXB_20251231 = "0xaca9a33698cf96413a40a4eb9e87906ff40fc6ca"; // FraxFerry export const FRAXFERRY_V2__ETHEREUM_FRAXTAL__FRAX__FXTL_SIDE = "0x00160baF84b3D2014837cc12e838ea399f8b8478"; @@ -58,6 +61,9 @@ export const FRXETH_DUAL_ORACLE_REDSTONE = "0x4b0Ca693e29e5FD2AA39332a0387BBCD0f export const FXB_20240630_ORACLE = "0x1A60b40601Bb5AA192389b05F80A7BeAde6d77d7"; export const FXB_20241231_ORACLE = "0x01480a0C134CeCC309015a564C7e292ba6E0F358"; export const FXB_20261231_ORACLE = "0x92e606Fd8b99F99928f690a5bEb20f6f6e3ec0f3"; +export const FXB_20551231_ORACLE = "0x8a081F35aE1cB4314c73CdDE63CC022Ca6AdEAa6"; +export const FXB_20291231_ORACLE = "0x859e3b11d9f8ff5d4c4beA569F76cdD25D5Ffc4b"; +export const FXB_20251231_ORACLE = "0x9c51c8ba9Ce85984C2389e13Fa1b77Cd587A2A18"; export const FXB_VARIABLE_RATE_2 = "0x3FdA3e9E78EAcd7381F1ED2CF145B93537878c1f"; export const FXS_DUAL_ORACLE_REDSTONE = "0xB99c9d329Bd69dDf8AF57110e011F5D81801c6d2"; export const SFRAX_SFRXETH_INVERSE_ORACLE_REDSTONE = "0x1010E24A2F0e6954c6456Bf925764eCc8577Fa2c"; @@ -65,9 +71,11 @@ export const SFRXETH_DUAL_ORACLE_REDSTONE = "0xfbcDf41Cc692ed529b9a8cC1A5867B952 export const TIMELOCK_ADDRESS = "0xc16068d1ca7E24E20e56bB70af4D00D92AA4f0b2"; export const VARIABLE_RATE_2_ADDRESS = "0xFA7207F02ba29Cd122A9d49ce96F6cA7707A1652"; export const VARIABLE_RATE_2_ADDRESS_50 = "0x3Fdb6BC356dAD0D7260E9619efa125409a08C3B2"; -export const FRAXLEND_PAIR_FXB12312026_FRAX = "0x032578d99b1070682a5E171012BE1756a50a17d4"; -export const FRAXLEND_PAIR_FXB12312024_FRAX = "0x6154334A7D0E7f5f0479599D15F462B200C721E1"; -export const FRAXLEND_PAIR_FXB06302024 = "0x57b709e214B239821A78dFCF09c89f52bA3D80aD"; +export const FRAXLEND_PAIR_FXB_20261231_FRAX = "0x032578d99b1070682a5E171012BE1756a50a17d4"; +export const FRAXLEND_PAIR_FXB_20241231_FRAX = "0x6154334A7D0E7f5f0479599D15F462B200C721E1"; +export const FRAXLEND_PAIR_FXB_20240630_FRAX = "0x57b709e214B239821A78dFCF09c89f52bA3D80aD"; +export const FRAXLEND_PAIR_FXB_20291231_FRAX = "0x3e92765eE2B009b104A8A7baf3759B159c19AbA1"; +export const FRAXLEND_PAIR_FXB_20251231_FRAX = "0x1b48c9595385F1780d7Be1aB57f8eAcFeA3A5cE5"; export const FRAXLEND_PAIR_SFRXETH_FRAX = "0x4F968317721B9c300afBff3FD37365637318271D"; export const FRAXLEND_PAIR_FXS_FRAX = "0x8EdA613EC96992D3C42BCd9aC2Ae58a92929Ceb2"; export const FRAXLEND_PAIR_SFRAX_SFRXETH = "0xB71E4829e81f72f7F36A0d858e58109f5948A713"; diff --git a/scripts/constants/mainnet.ts b/scripts/constants/mainnet.ts index c188a0c..c08c631 100644 --- a/scripts/constants/mainnet.ts +++ b/scripts/constants/mainnet.ts @@ -388,9 +388,9 @@ export const FRAXLEND_PAIR_GOHM_FRAX = "0x66bf36dBa79d4606039f04b32946A260BCd3FF export const FRAXLEND_PAIR_MKR_FRAX = "0x82Ec28636B77661a95f021090F6bE0C8d379DD5D"; export const FRAXLEND_PAIR_UNI_FRAX = "0xc6CadA314389430d396C7b0C70c6281e99ca7fe8"; export const FRAXLEND_PAIR_AAVE_FRAX = "0xc779fEE076EB04b9F8EA424ec19DE27Efd17A68d"; -export const FRAXLEND_PAIR_FXB06302024_FRAX = "0x35E08B28d5b01D058cbB1c39dA9188CC521a79aF"; -export const FRAXLEND_PAIR_FXB12312024_FRAX = "0xd1887398f3bbdC9d10D0d5616AD83506DdF5057a"; -export const FRAXLEND_PAIR_FXB12312026_FRAX = "0x1c0C222989a37247D974937782cebc8bF4f25733"; +export const FRAXLEND_PAIR_FXB_20240630_FRAX = "0x35E08B28d5b01D058cbB1c39dA9188CC521a79aF"; +export const FRAXLEND_PAIR_FXB_20241231_FRAX = "0xd1887398f3bbdC9d10D0d5616AD83506DdF5057a"; +export const FRAXLEND_PAIR_FXB_20261231_FRAX = "0x1c0C222989a37247D974937782cebc8bF4f25733"; export const FRAXLEND_PAIR_SFRXETH_USDC = "0xeE847a804b67f4887c9E8fe559A2dA4278deFB52"; export const FRAXLEND_PAIR_LINK_FRAX = "0x7093F6141293F7C4F67E5efD922aC934402E452d"; export const FRAXLEND_PAIR_WSTETH_FRAX = "0xb5a46f712F03808aE5c4B885C6F598fA06442684"; diff --git a/src/contracts/chain-constants/FraxtalL2.sol b/src/contracts/chain-constants/FraxtalL2.sol index a621daa..aff534f 100644 --- a/src/contracts/chain-constants/FraxtalL2.sol +++ b/src/contracts/chain-constants/FraxtalL2.sol @@ -34,6 +34,9 @@ library FraxtalL2 { address internal constant FXB_20261231 = 0x8e9C334afc76106F08E0383907F4Fca9bB10BA3e; address internal constant FXB_20241231 = 0xa71bB8c79dc8FfA90A6Dd711aA9Fbe5114c19cba; address internal constant FXB_20240630 = 0x758094A71a39De49626FE25B86631ED944558653; + address internal constant FXB_20551231 = 0xc38173D34afaEA88Bc482813B3CD267bc8A1EA83; + address internal constant FXB_20291231 = 0xF1e2b576aF4C6a7eE966b14C810b772391e92153; + address internal constant FXB_20251231 = 0xacA9A33698cF96413A40A4eB9E87906ff40fC6CA; address internal constant FRAXFERRY_V2__ETHEREUM_FRAXTAL__FRAX__FXTL_SIDE = 0x00160baF84b3D2014837cc12e838ea399f8b8478; address internal constant FRAXFERRY_V2__ETHEREUM_FRAXTAL__FXS__FXTL_SIDE = @@ -62,6 +65,9 @@ library FraxtalL2 { address internal constant FXB_20240630_ORACLE = 0x1A60b40601Bb5AA192389b05F80A7BeAde6d77d7; address internal constant FXB_20241231_ORACLE = 0x01480a0C134CeCC309015a564C7e292ba6E0F358; address internal constant FXB_20261231_ORACLE = 0x92e606Fd8b99F99928f690a5bEb20f6f6e3ec0f3; + address internal constant FXB_20551231_ORACLE = 0x8a081F35aE1cB4314c73CdDE63CC022Ca6AdEAa6; + address internal constant FXB_20291231_ORACLE = 0x859e3b11d9f8ff5d4c4beA569F76cdD25D5Ffc4b; + address internal constant FXB_20251231_ORACLE = 0x9c51c8ba9Ce85984C2389e13Fa1b77Cd587A2A18; address internal constant FXB_VARIABLE_RATE_2 = 0x3FdA3e9E78EAcd7381F1ED2CF145B93537878c1f; address internal constant FXS_DUAL_ORACLE_REDSTONE = 0xB99c9d329Bd69dDf8AF57110e011F5D81801c6d2; address internal constant SFRAX_SFRXETH_INVERSE_ORACLE_REDSTONE = 0x1010E24A2F0e6954c6456Bf925764eCc8577Fa2c; @@ -69,9 +75,11 @@ library FraxtalL2 { address internal constant TIMELOCK_ADDRESS = 0xc16068d1ca7E24E20e56bB70af4D00D92AA4f0b2; address internal constant VARIABLE_RATE_2_ADDRESS = 0xFA7207F02ba29Cd122A9d49ce96F6cA7707A1652; address internal constant VARIABLE_RATE_2_ADDRESS_50 = 0x3Fdb6BC356dAD0D7260E9619efa125409a08C3B2; - address internal constant FRAXLEND_PAIR_FXB12312026_FRAX = 0x032578d99b1070682a5E171012BE1756a50a17d4; - address internal constant FRAXLEND_PAIR_FXB12312024_FRAX = 0x6154334A7D0E7f5f0479599D15F462B200C721E1; - address internal constant FRAXLEND_PAIR_FXB06302024 = 0x57b709e214B239821A78dFCF09c89f52bA3D80aD; + address internal constant FRAXLEND_PAIR_FXB_20261231_FRAX = 0x032578d99b1070682a5E171012BE1756a50a17d4; + address internal constant FRAXLEND_PAIR_FXB_20241231_FRAX = 0x6154334A7D0E7f5f0479599D15F462B200C721E1; + address internal constant FRAXLEND_PAIR_FXB_20240630_FRAX = 0x57b709e214B239821A78dFCF09c89f52bA3D80aD; + address internal constant FRAXLEND_PAIR_FXB_20291231_FRAX = 0x3e92765eE2B009b104A8A7baf3759B159c19AbA1; + address internal constant FRAXLEND_PAIR_FXB_20251231_FRAX = 0x1b48c9595385F1780d7Be1aB57f8eAcFeA3A5cE5; address internal constant FRAXLEND_PAIR_SFRXETH_FRAX = 0x4F968317721B9c300afBff3FD37365637318271D; address internal constant FRAXLEND_PAIR_FXS_FRAX = 0x8EdA613EC96992D3C42BCd9aC2Ae58a92929Ceb2; address internal constant FRAXLEND_PAIR_SFRAX_SFRXETH = 0xB71E4829e81f72f7F36A0d858e58109f5948A713; @@ -190,6 +198,9 @@ abstract contract AddressHelperFraxtalL2 is TestBase { vm.label(0x8e9C334afc76106F08E0383907F4Fca9bB10BA3e, "Constants.FXTL_FXB_20261231"); vm.label(0xa71bB8c79dc8FfA90A6Dd711aA9Fbe5114c19cba, "Constants.FXTL_FXB_20241231"); vm.label(0x758094A71a39De49626FE25B86631ED944558653, "Constants.FXTL_FXB_20240630"); + vm.label(0xc38173D34afaEA88Bc482813B3CD267bc8A1EA83, "Constants.FXTL_FXB_20551231"); + vm.label(0xF1e2b576aF4C6a7eE966b14C810b772391e92153, "Constants.FXTL_FXB_20291231"); + vm.label(0xacA9A33698cF96413A40A4eB9E87906ff40fC6CA, "Constants.FXTL_FXB_20251231"); vm.label( 0x00160baF84b3D2014837cc12e838ea399f8b8478, "Constants.FXTL_FRAXFERRY_V2__ETHEREUM_FRAXTAL__FRAX__FXTL_SIDE" @@ -230,6 +241,9 @@ abstract contract AddressHelperFraxtalL2 is TestBase { vm.label(0x1A60b40601Bb5AA192389b05F80A7BeAde6d77d7, "Constants.FXTL_FXB_20240630_ORACLE"); vm.label(0x01480a0C134CeCC309015a564C7e292ba6E0F358, "Constants.FXTL_FXB_20241231_ORACLE"); vm.label(0x92e606Fd8b99F99928f690a5bEb20f6f6e3ec0f3, "Constants.FXTL_FXB_20261231_ORACLE"); + vm.label(0x8a081F35aE1cB4314c73CdDE63CC022Ca6AdEAa6, "Constants.FXTL_FXB_20551231_ORACLE"); + vm.label(0x859e3b11d9f8ff5d4c4beA569F76cdD25D5Ffc4b, "Constants.FXTL_FXB_20291231_ORACLE"); + vm.label(0x9c51c8ba9Ce85984C2389e13Fa1b77Cd587A2A18, "Constants.FXTL_FXB_20251231_ORACLE"); vm.label(0x3FdA3e9E78EAcd7381F1ED2CF145B93537878c1f, "Constants.FXTL_FXB_VARIABLE_RATE_2"); vm.label(0xB99c9d329Bd69dDf8AF57110e011F5D81801c6d2, "Constants.FXTL_FXS_DUAL_ORACLE_REDSTONE"); vm.label(0x1010E24A2F0e6954c6456Bf925764eCc8577Fa2c, "Constants.FXTL_SFRAX_SFRXETH_INVERSE_ORACLE_REDSTONE"); @@ -237,9 +251,11 @@ abstract contract AddressHelperFraxtalL2 is TestBase { vm.label(0xc16068d1ca7E24E20e56bB70af4D00D92AA4f0b2, "Constants.FXTL_TIMELOCK_ADDRESS"); vm.label(0xFA7207F02ba29Cd122A9d49ce96F6cA7707A1652, "Constants.FXTL_VARIABLE_RATE_2_ADDRESS"); vm.label(0x3Fdb6BC356dAD0D7260E9619efa125409a08C3B2, "Constants.FXTL_VARIABLE_RATE_2_ADDRESS_50"); - vm.label(0x032578d99b1070682a5E171012BE1756a50a17d4, "Constants.FXTL_FRAXLEND_PAIR_FXB12312026_FRAX"); - vm.label(0x6154334A7D0E7f5f0479599D15F462B200C721E1, "Constants.FXTL_FRAXLEND_PAIR_FXB12312024_FRAX"); - vm.label(0x57b709e214B239821A78dFCF09c89f52bA3D80aD, "Constants.FXTL_FRAXLEND_PAIR_FXB06302024"); + vm.label(0x032578d99b1070682a5E171012BE1756a50a17d4, "Constants.FXTL_FRAXLEND_PAIR_FXB_20261231_FRAX"); + vm.label(0x6154334A7D0E7f5f0479599D15F462B200C721E1, "Constants.FXTL_FRAXLEND_PAIR_FXB_20241231_FRAX"); + vm.label(0x57b709e214B239821A78dFCF09c89f52bA3D80aD, "Constants.FXTL_FRAXLEND_PAIR_FXB_20240630_FRAX"); + vm.label(0x3e92765eE2B009b104A8A7baf3759B159c19AbA1, "Constants.FXTL_FRAXLEND_PAIR_FXB_20291231_FRAX"); + vm.label(0x1b48c9595385F1780d7Be1aB57f8eAcFeA3A5cE5, "Constants.FXTL_FRAXLEND_PAIR_FXB_20251231_FRAX"); vm.label(0x4F968317721B9c300afBff3FD37365637318271D, "Constants.FXTL_FRAXLEND_PAIR_SFRXETH_FRAX"); vm.label(0x8EdA613EC96992D3C42BCd9aC2Ae58a92929Ceb2, "Constants.FXTL_FRAXLEND_PAIR_FXS_FRAX"); vm.label(0xB71E4829e81f72f7F36A0d858e58109f5948A713, "Constants.FXTL_FRAXLEND_PAIR_SFRAX_SFRXETH"); diff --git a/src/contracts/chain-constants/Mainnet.sol b/src/contracts/chain-constants/Mainnet.sol index 6a39e9b..820b43b 100644 --- a/src/contracts/chain-constants/Mainnet.sol +++ b/src/contracts/chain-constants/Mainnet.sol @@ -438,9 +438,9 @@ library Mainnet { address internal constant FRAXLEND_PAIR_MKR_FRAX = 0x82Ec28636B77661a95f021090F6bE0C8d379DD5D; address internal constant FRAXLEND_PAIR_UNI_FRAX = 0xc6CadA314389430d396C7b0C70c6281e99ca7fe8; address internal constant FRAXLEND_PAIR_AAVE_FRAX = 0xc779fEE076EB04b9F8EA424ec19DE27Efd17A68d; - address internal constant FRAXLEND_PAIR_FXB06302024_FRAX = 0x35E08B28d5b01D058cbB1c39dA9188CC521a79aF; - address internal constant FRAXLEND_PAIR_FXB12312024_FRAX = 0xd1887398f3bbdC9d10D0d5616AD83506DdF5057a; - address internal constant FRAXLEND_PAIR_FXB12312026_FRAX = 0x1c0C222989a37247D974937782cebc8bF4f25733; + address internal constant FRAXLEND_PAIR_FXB_20240630_FRAX = 0x35E08B28d5b01D058cbB1c39dA9188CC521a79aF; + address internal constant FRAXLEND_PAIR_FXB_20241231_FRAX = 0xd1887398f3bbdC9d10D0d5616AD83506DdF5057a; + address internal constant FRAXLEND_PAIR_FXB_20261231_FRAX = 0x1c0C222989a37247D974937782cebc8bF4f25733; address internal constant FRAXLEND_PAIR_SFRXETH_USDC = 0xeE847a804b67f4887c9E8fe559A2dA4278deFB52; address internal constant FRAXLEND_PAIR_LINK_FRAX = 0x7093F6141293F7C4F67E5efD922aC934402E452d; address internal constant FRAXLEND_PAIR_WSTETH_FRAX = 0xb5a46f712F03808aE5c4B885C6F598fA06442684; @@ -1647,9 +1647,9 @@ abstract contract AddressHelperMainnet is TestBase { vm.label(0x82Ec28636B77661a95f021090F6bE0C8d379DD5D, "Constants.ETH_FRAXLEND_PAIR_MKR_FRAX"); vm.label(0xc6CadA314389430d396C7b0C70c6281e99ca7fe8, "Constants.ETH_FRAXLEND_PAIR_UNI_FRAX"); vm.label(0xc779fEE076EB04b9F8EA424ec19DE27Efd17A68d, "Constants.ETH_FRAXLEND_PAIR_AAVE_FRAX"); - vm.label(0x35E08B28d5b01D058cbB1c39dA9188CC521a79aF, "Constants.ETH_FRAXLEND_PAIR_FXB06302024_FRAX"); - vm.label(0xd1887398f3bbdC9d10D0d5616AD83506DdF5057a, "Constants.ETH_FRAXLEND_PAIR_FXB12312024_FRAX"); - vm.label(0x1c0C222989a37247D974937782cebc8bF4f25733, "Constants.ETH_FRAXLEND_PAIR_FXB12312026_FRAX"); + vm.label(0x35E08B28d5b01D058cbB1c39dA9188CC521a79aF, "Constants.ETH_FRAXLEND_PAIR_FXB_20240630_FRAX"); + vm.label(0xd1887398f3bbdC9d10D0d5616AD83506DdF5057a, "Constants.ETH_FRAXLEND_PAIR_FXB_20241231_FRAX"); + vm.label(0x1c0C222989a37247D974937782cebc8bF4f25733, "Constants.ETH_FRAXLEND_PAIR_FXB_20261231_FRAX"); vm.label(0xeE847a804b67f4887c9E8fe559A2dA4278deFB52, "Constants.ETH_FRAXLEND_PAIR_SFRXETH_USDC"); vm.label(0x7093F6141293F7C4F67E5efD922aC934402E452d, "Constants.ETH_FRAXLEND_PAIR_LINK_FRAX"); vm.label(0xb5a46f712F03808aE5c4B885C6F598fA06442684, "Constants.ETH_FRAXLEND_PAIR_WSTETH_FRAX"); From 424197a854fae1bcf381ba4c71f16f73e3ffe13b Mon Sep 17 00:00:00 2001 From: Thomas Clement Date: Tue, 2 Jul 2024 11:17:43 -0400 Subject: [PATCH 2/2] Standardize Oracle Variable Names Across Chains --- scripts/constants/mainnet.ts | 4 ++-- src/contracts/chain-constants/Mainnet.sol | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/constants/mainnet.ts b/scripts/constants/mainnet.ts index c08c631..2bb2e38 100644 --- a/scripts/constants/mainnet.ts +++ b/scripts/constants/mainnet.ts @@ -166,13 +166,13 @@ export const ORACLE_20240630 = "0x27F4f8ca2f906B73c5eD8d794d1eA016f2cA0A97"; export const CURVE_20240630_MAINNET_POOL = "0x4ef4c7519023F30A78647EEab321d6cFabC2513c"; export const FXB_20241231 = "0xF8FDe8A259A3698902C88bdB1E13Ff28Cd7f6F09"; export const AUCTION_20241231 = "0xc9aa98788a675FF0846E8856cb83F19452f3b0c8"; -export const ORACLE_20241231 = "0x08a0748cF885F46e20fA30A50a035808eab293D3"; +export const FXB_20241231_ORACLE = "0x08a0748cF885F46e20fA30A50a035808eab293D3"; export const CURVE_20241231_MAINNET_POOL = "0x6307E6688819951Cf8D6B6066018243D2496952F"; export const CURVE_20241231_ARBITRUM_POOL = "0xE920eEdAff6c3BEd1Ef61010B64d46986634E908"; export const CURVE_20241231_ARBITRUM_GAUGE = "0x05824D6D4DE8A0ede4e12b98387A4f035a67ee68"; export const FXB_20261231 = "0x76237BCfDbe8e06FB774663add96216961df4ff3"; export const AUCTION_20261231 = "0x63981f5E690eaF7E8795c42832664e8848F532fB"; -export const ORACLE_20261231 = "0x2ec5D1C13fEF1C7029eE329a1D31B2180c9b3707"; +export const FXB_20261231_ORACLE = "0x2ec5D1C13fEF1C7029eE329a1D31B2180c9b3707"; export const CURVE_20261231_MAINNET_POOL = "0xe035e27A8eD6842b478933820f90093D205F7098"; export const CURVE_20261231_ARBITRUM_POOL = "0x946adc524BD312D036776798c46ceDD948DD0A0f"; export const CURVE_20261231_ARBITRUM_GAUGE = "0xa2617A26f9f528fa7B0E47fc2e66FcC04C6682E9"; diff --git a/src/contracts/chain-constants/Mainnet.sol b/src/contracts/chain-constants/Mainnet.sol index 820b43b..e55164c 100644 --- a/src/contracts/chain-constants/Mainnet.sol +++ b/src/contracts/chain-constants/Mainnet.sol @@ -169,13 +169,13 @@ library Mainnet { address internal constant CURVE_20240630_MAINNET_POOL = 0x4ef4c7519023F30A78647EEab321d6cFabC2513c; address internal constant FXB_20241231 = 0xF8FDe8A259A3698902C88bdB1E13Ff28Cd7f6F09; address internal constant AUCTION_20241231 = 0xc9aa98788a675FF0846E8856cb83F19452f3b0c8; - address internal constant ORACLE_20241231 = 0x08a0748cF885F46e20fA30A50a035808eab293D3; + address internal constant FXB_20241231_ORACLE = 0x08a0748cF885F46e20fA30A50a035808eab293D3; address internal constant CURVE_20241231_MAINNET_POOL = 0x6307E6688819951Cf8D6B6066018243D2496952F; address internal constant CURVE_20241231_ARBITRUM_POOL = 0xE920eEdAff6c3BEd1Ef61010B64d46986634E908; address internal constant CURVE_20241231_ARBITRUM_GAUGE = 0x05824D6D4DE8A0ede4e12b98387A4f035a67ee68; address internal constant FXB_20261231 = 0x76237BCfDbe8e06FB774663add96216961df4ff3; address internal constant AUCTION_20261231 = 0x63981f5E690eaF7E8795c42832664e8848F532fB; - address internal constant ORACLE_20261231 = 0x2ec5D1C13fEF1C7029eE329a1D31B2180c9b3707; + address internal constant FXB_20261231_ORACLE = 0x2ec5D1C13fEF1C7029eE329a1D31B2180c9b3707; address internal constant CURVE_20261231_MAINNET_POOL = 0xe035e27A8eD6842b478933820f90093D205F7098; address internal constant CURVE_20261231_ARBITRUM_POOL = 0x946adc524BD312D036776798c46ceDD948DD0A0f; address internal constant CURVE_20261231_ARBITRUM_GAUGE = 0xa2617A26f9f528fa7B0E47fc2e66FcC04C6682E9; @@ -1236,13 +1236,13 @@ abstract contract AddressHelperMainnet is TestBase { vm.label(0x4ef4c7519023F30A78647EEab321d6cFabC2513c, "Constants.ETH_CURVE_20240630_MAINNET_POOL"); vm.label(0xF8FDe8A259A3698902C88bdB1E13Ff28Cd7f6F09, "Constants.ETH_FXB_20241231"); vm.label(0xc9aa98788a675FF0846E8856cb83F19452f3b0c8, "Constants.ETH_AUCTION_20241231"); - vm.label(0x08a0748cF885F46e20fA30A50a035808eab293D3, "Constants.ETH_ORACLE_20241231"); + vm.label(0x08a0748cF885F46e20fA30A50a035808eab293D3, "Constants.ETH_FXB_20241231_ORACLE"); vm.label(0x6307E6688819951Cf8D6B6066018243D2496952F, "Constants.ETH_CURVE_20241231_MAINNET_POOL"); vm.label(0xE920eEdAff6c3BEd1Ef61010B64d46986634E908, "Constants.ETH_CURVE_20241231_ARBITRUM_POOL"); vm.label(0x05824D6D4DE8A0ede4e12b98387A4f035a67ee68, "Constants.ETH_CURVE_20241231_ARBITRUM_GAUGE"); vm.label(0x76237BCfDbe8e06FB774663add96216961df4ff3, "Constants.ETH_FXB_20261231"); vm.label(0x63981f5E690eaF7E8795c42832664e8848F532fB, "Constants.ETH_AUCTION_20261231"); - vm.label(0x2ec5D1C13fEF1C7029eE329a1D31B2180c9b3707, "Constants.ETH_ORACLE_20261231"); + vm.label(0x2ec5D1C13fEF1C7029eE329a1D31B2180c9b3707, "Constants.ETH_FXB_20261231_ORACLE"); vm.label(0xe035e27A8eD6842b478933820f90093D205F7098, "Constants.ETH_CURVE_20261231_MAINNET_POOL"); vm.label(0x946adc524BD312D036776798c46ceDD948DD0A0f, "Constants.ETH_CURVE_20261231_ARBITRUM_POOL"); vm.label(0xa2617A26f9f528fa7B0E47fc2e66FcC04C6682E9, "Constants.ETH_CURVE_20261231_ARBITRUM_GAUGE");