Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Fractal Rate Oracle Addresses + Proofing Contracts #26

Merged
merged 3 commits into from
Jun 7, 2024
Merged

Add Fractal Rate Oracle Addresses + Proofing Contracts #26

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3ffe388
Bring in L2 Rate Contract Addresses
tom2o17 Jun 5, 2024
46c6727
Update fraxtal-l2.ts
tom2o17 Jun 6, 2024
40fe38c
Update Constants.sol
tom2o17 Jun 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions scripts/constants/fraxtal-l2.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,26 @@ export const STATE_ROOT_ORACLE = "0xeD403d48e2bC946438B5686AA1AD65056Ccf9512";
export const MERKLE_PRICE_SOURCE = "0x9990eb28E58380122AA3AdF64ea6f874df51114C";
export const CHAINLINK_MERKLE_PRICE_SOURCE = "0x4AD728706bFe28A3F090b3f1D8Ac3A8515805B41";

// RateTransport Oracles
export const SFRXETH_L2_RATE_ORACLE = "0xEE095b7d9191603126Da584a1179BB403a027c3A";
export const SFRAX_L2_RATE_ORACLE = "0x0D7888e8aC9e5D0915148E0F871a3893aF3d2aaF";
export const SDAI_L2_RATE_ORACLE = "0xfdE8C36F32Bf32e73A1bdeb4ef3E17709674a838";
export const SUSDE_L2_RATE_ORACLE = "0xd295936C8Bb465ADd1eC756a51698127CB4F4910";

// RateTransport Oracles Old
export const SFRXETH_L2_RATE_ORACLE_OLD = "0x8865435777730eAAbAAF2d1F55F115a87AbCf91A";
export const SFRAX_L2_RATE_ORACLE_OLD = "0xF750636E1df115e3B334eD06E5b45c375107FC60";

// ERC4626 Rate Oracle Proover
export const FRAXTAL_SDAI_MERKLE_PRICE_SOURCE = "0xf3E3E2a376939bfF87e9cac84e0E5A35e495417a";
export const FRAXTAL_SFRAX_MERKLE_PRICE_SOURCE = "0xE25D8aaa6dF41B94A415EE39cCEE0DF6673B9bDb";
export const FRAXTAL_SFRXETH_MERKLE_PRICE_SOURCE = "0xabca0b314d15B3e28F24AC0ee84A63001d1b44Db";
export const FRAXTAL_SUSDE_MERKLE_PRICE_SOURCE = "0xc2B984E37D1CAf5Eef82D9D892287361058955E9";

// ERC4626 Rate Oracle Proover Old
export const FRAXTAL_SFRAX_MERKLE_PRICE_SOURCE_OLD = "0xe7C6385Cf5d4Ea61774A56E3aeaf60a09fC8E1d5";
export const FRAXTAL_SFRXETH_MERKLE_PRICE_SOURCE_OLD = "0xa560E014501f96752726f65c27E96C3e9127Ce32";

// L1VeFXS
export const L1VEFXS_IMPLEMENTATION_OWNER = COMPTROLLER;
export const L1VEFXS_PROXY_ADMIN_OWNER = COMPTROLLER;
Expand Down
16 changes: 14 additions & 2 deletions src/Constants.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ library Mainnet {
address internal constant WBTC_FRAX_PAIR_ADDRESS = 0x32467a5fc2d72D21E8DCe990906547A2b012f382;
address internal constant WETH_FRAX_PAIR_ADDRESS = 0x794F6B13FBd7EB7ef10d1ED205c9a416910207Ff;
address internal constant SLIPPAGE_AUCTION_FACTORY = 0xc9268c7F59850B26567b0f5d3Dcc317cEDC43490;
address internal constant FXB_FACTORY = 0xa8478781D9605E17c3b4c9C79e7127c4597116E4;
address internal constant FXB_FACTORY = 0x7a07D606c87b7251c2953A30Fa445d8c5F856C7A;
address internal constant FXB_AMO = 0x452420df4AC1e3db5429b5FD629f3047482C543C;
address internal constant FXB_AMO_TIMELOCK = 0x831822660572bd54ebaa065C2acef662a6277D40;
address internal constant FXB_20240630 = 0x0dE54CFdfeD8005176f8b7A9D5438B45c4F1df1e;
Expand Down Expand Up @@ -210,7 +210,7 @@ abstract contract Helper is TestBase {
vm.label(0x32467a5fc2d72D21E8DCe990906547A2b012f382, "Constants.WBTC_FRAX_PAIR_ADDRESS");
vm.label(0x794F6B13FBd7EB7ef10d1ED205c9a416910207Ff, "Constants.WETH_FRAX_PAIR_ADDRESS");
vm.label(0xc9268c7F59850B26567b0f5d3Dcc317cEDC43490, "Constants.SLIPPAGE_AUCTION_FACTORY");
vm.label(0xa8478781D9605E17c3b4c9C79e7127c4597116E4, "Constants.FXB_FACTORY");
vm.label(0x7a07D606c87b7251c2953A30Fa445d8c5F856C7A, "Constants.FXB_FACTORY");
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cc @pegahcarter

Curious which is current

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The change you made here to 0x7a07 is proper.

Confirmation link.

vm.label(0x452420df4AC1e3db5429b5FD629f3047482C543C, "Constants.FXB_AMO");
vm.label(0x831822660572bd54ebaa065C2acef662a6277D40, "Constants.FXB_AMO_TIMELOCK");
vm.label(0x0dE54CFdfeD8005176f8b7A9D5438B45c4F1df1e, "Constants.FXB_20240630");
Expand Down Expand Up @@ -314,6 +314,18 @@ library FraxtalL2 {
address internal constant STATE_ROOT_ORACLE = 0xeD403d48e2bC946438B5686AA1AD65056Ccf9512;
address internal constant MERKLE_PRICE_SOURCE = 0x9990eb28E58380122AA3AdF64ea6f874df51114C;
address internal constant CHAINLINK_MERKLE_PRICE_SOURCE = 0x4AD728706bFe28A3F090b3f1D8Ac3A8515805B41;
address internal constant SFRXETH_L2_RATE_ORACLE = 0xEE095b7d9191603126Da584a1179BB403a027c3A;
address internal constant SFRAX_L2_RATE_ORACLE = 0x0D7888e8aC9e5D0915148E0F871a3893aF3d2aaF;
address internal constant SDAI_L2_RATE_ORACLE = 0xfdE8C36F32Bf32e73A1bdeb4ef3E17709674a838;
address internal constant SUSDE_L2_RATE_ORACLE = 0xd295936C8Bb465ADd1eC756a51698127CB4F4910;
address internal constant SFRXETH_L2_RATE_ORACLE_OLD = 0x8865435777730eAAbAAF2d1F55F115a87AbCf91A;
pegahcarter marked this conversation as resolved.
Show resolved Hide resolved
address internal constant SFRAX_L2_RATE_ORACLE_OLD = 0xF750636E1df115e3B334eD06E5b45c375107FC60;
address internal constant FRAXTAL_SDAI_MERKLE_PRICE_SOURCE = 0xf3E3E2a376939bfF87e9cac84e0E5A35e495417a;
address internal constant FRAXTAL_SFRAX_MERKLE_PRICE_SOURCE = 0xE25D8aaa6dF41B94A415EE39cCEE0DF6673B9bDb;
address internal constant FRAXTAL_SFRXETH_MERKLE_PRICE_SOURCE = 0xabca0b314d15B3e28F24AC0ee84A63001d1b44Db;
address internal constant FRAXTAL_SUSDE_MERKLE_PRICE_SOURCE = 0xc2B984E37D1CAf5Eef82D9D892287361058955E9;
address internal constant FRAXTAL_SFRAX_MERKLE_PRICE_SOURCE_OLD = 0xe7C6385Cf5d4Ea61774A56E3aeaf60a09fC8E1d5;
address internal constant FRAXTAL_SFRXETH_MERKLE_PRICE_SOURCE_OLD = 0xa560E014501f96752726f65c27E96C3e9127Ce32;
address internal constant L1VEFXS_IMPLEMENTATION_OWNER = 0xC4EB45d80DC1F079045E75D5d55de8eD1c1090E6;
address internal constant L1VEFXS_PROXY_ADMIN_OWNER = 0xC4EB45d80DC1F079045E75D5d55de8eD1c1090E6;
address internal constant L1VEFXS_PROXY_ADMIN = 0xCDD512227340C20B70aDC37C5Bd1E46F69Bb675F;
Expand Down
Loading