-
Notifications
You must be signed in to change notification settings - Fork 331
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* feat: add m2 upgrade output file (#482) * feat: add m2 upgrade output file * fix: consistent writing + reading of deployment params naming should now be consistent, so the ExistingDeploymentParser should work with unmodified script outputs * feat: appropriately parse new implementation addresses `test_queueUpgrade` now more accurately models the upgrade, and no longer simulates implementation deployment * chore: appropriate timelock ETA * chore: add a couple more "sanity" checks these are performed after the upgrade is simulated * chore: minor testing fixes (#486) * chore: filter fork upgrade test out of default `forge t` * chore: fix flaky test this test failed when the fuzzed 'withdrawer' param collided with the sender. by pranking the sender address, the 'assume' statement at the start of the test now has its desired behavior * test: updated fork integration tests (#483) * test: clean pr for fork testing * test: upgrade tests * fix: gh secrets * fix: remove lsts that error * test: clean up fork testing (#487) --------- Co-authored-by: Alex <[email protected]> * chore: fork test via environment and custom foundry profile (#490) * chore: remove parallel tests * feat: trigger fork tests via env var and lower fuzz runs * mainnet fork tests are now triggered by setting the FOUNDRY_PROFILE to forktest * forktest profile uses lower fuzz runs to reduce RPC load * CI workflow is split into unit tests, integration tests, and integration forktests * fix: remove no-match from CI * fix: flaky unit test and also continue running tests if one job fails * fix: try a different job order * test: double the fork test runs since daddy alchemy is serving * docs: update integration test README with fork test info * chore: update the pragma from =0.8.12 to ^0.8.12 (#485) * chore: update the pragma from =0.8.12 to ^0.8.12 * test: add deprecated interface pragmas and fix flaky test --------- Co-authored-by: wadealexc <[email protected]> * docs: fix broken link (#493) * fix: m2_deploy_from_scratch script for devnet (#495) * fix: m2_deploy_from_scratch script for devnet * feat: added github action to make sure deploy script is kept up-to-date * fix(github-action): missing submodules in checkout step * feat: update mainnet implementation addresses (#497) * feat: update mainnet implementation addresses additionally, add the EigenLayerBeaconOracle to table * chore: correct shortened addresses for new implementations * chore: remove duplicate entry, more consistent format * chore: link to correct commit in table * chore: holesky strats * fix: update eigenpod beacon --------- Co-authored-by: 8sunyuan <[email protected]> --------- Co-authored-by: Michael Sun <[email protected]> Co-authored-by: Alex <[email protected]> Co-authored-by: steven <[email protected]> Co-authored-by: wadealexc <[email protected]> Co-authored-by: Samuel Laferriere <[email protected]> Co-authored-by: 8sunyuan <[email protected]>
- Loading branch information
1 parent
4b15d68
commit 9868528
Showing
123 changed files
with
2,492 additions
and
330 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
name: Run Deploy Scripts | ||
# We run the deploy scripts just to make sure they work | ||
|
||
on: | ||
push: | ||
pull_request: | ||
types: [opened, reopened] | ||
|
||
jobs: | ||
prepare: | ||
runs-on: ubuntu-latest | ||
|
||
steps: | ||
- name: Checkout code | ||
uses: actions/checkout@v2 | ||
with: | ||
submodules: true | ||
|
||
# install foundry to run forge script. Should we run forge script in a container instead? | ||
- name: Install Foundry | ||
uses: foundry-rs/foundry-toolchain@v1 | ||
with: | ||
version: nightly | ||
|
||
- name: Start Anvil chain | ||
# need to start Anvil chain with -d to let the container run in the background | ||
# if we start with 'anvil &' instead, the process stops when the step ends | ||
run: docker run -d --rm -p 8545:8545 --entrypoint anvil ghcr.io/foundry-rs/foundry:nightly-5b7e4cb3c882b28f3c32ba580de27ce7381f415a --host 0.0.0.0 | ||
|
||
- name: Wait for Anvil chain to start | ||
run: sleep 3 | ||
|
||
# Run Forge script against the Anvil chain | ||
- name: Run M2_Deploy_From_Scratch | ||
run: | | ||
forge script script/deploy/devnet/M2_Deploy_From_Scratch.s.sol --rpc-url http://localhost:8545 \ | ||
--private-key 0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80 --broadcast \ | ||
--sig "run(string memory configFileName)" -- M2_deploy_from_scratch.anvil.config.json |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
55 changes: 55 additions & 0 deletions
55
script/configs/holesky/Holesky_current_deployment.config.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,55 @@ | ||
{ | ||
"addresses": { | ||
"avsDirectory": "0x055733000064333CaDDbC92763c58BF0192fFeBf", | ||
"avsDirectoryImplementation": "0xEF5BA995Bc7722fd1e163edF8Dc09375de3d3e3a", | ||
"baseStrategyImplementation": "0xFb83e1D133D0157775eC4F19Ff81478Df1103305", | ||
"beaconOracle": "0x4C116BB629bff7A8373c2378bBd919f8349B8f25", | ||
"delayedWithdrawalRouter": "0x642c646053eaf2254f088e9019ACD73d9AE0FA32", | ||
"delayedWithdrawalRouterImplementation": "0xcE8b8D99773a718423F8040a6e52c06a4ce63407", | ||
"delegationManager": "0xA44151489861Fe9e3055d95adC98FbD462B948e7", | ||
"delegationManagerImplementation": "0x83f8F8f0BB125F7870F6bfCf76853f874C330D76", | ||
"eigenLayerPauserReg": "0x85Ef7299F8311B25642679edBF02B62FA2212F06", | ||
"eigenLayerProxyAdmin": "0xDB023566064246399b4AE851197a97729C93A6cf", | ||
"eigenPodBeacon": "0x7261C2bd75a7ACE1762f6d7FAe8F63215581832D", | ||
"eigenPodImplementation": "0xe98f9298344527608A1BCC23907B8145F9Cb641c", | ||
"eigenPodManager": "0x30770d7E3e71112d7A6b7259542D1f680a70e315", | ||
"eigenPodManagerImplementation": "0x5265C162f7d5F3fE3175a78828ab16bf5E324a7B", | ||
"emptyContract": "0x9690d52B1Ce155DB2ec5eCbF5a262ccCc7B3A6D2", | ||
"slasher": "0xcAe751b75833ef09627549868A04E32679386e7C", | ||
"slasherImplementation": "0x99715D255E34a39bE9943b82F281CA734bcF345A", | ||
"strategies": { | ||
"WETH": "0x80528D6e9A2BAbFc766965E0E26d5aB08D9CFaF9", | ||
"rETH": "0x3A8fBdf9e77DFc25d09741f51d3E181b25d0c4E0", | ||
"stETH": "0x7D704507b76571a51d9caE8AdDAbBFd0ba0e63d3", | ||
"lsETH": "0x05037A81BD7B4C9E0F7B430f1F2A22c31a2FD943", | ||
"frxETH": "0x15F70a41Afe34020B3B16079010D3e88c4A85daf", | ||
"ETHx": "0x31B6F59e1627cEfC9fA174aD03859fC337666af7", | ||
"osETH": "0x46281E3B7fDcACdBa44CADf069a94a588Fd4C6Ef", | ||
"cbETH": "0x70EB4D3c164a6B4A5f908D4FBb5a9cAfFb66bAB6" | ||
}, | ||
"strategyAddresses": [ | ||
"0x3A8fBdf9e77DFc25d09741f51d3E181b25d0c4E0", | ||
"0x80528D6e9A2BAbFc766965E0E26d5aB08D9CFaF9", | ||
"0x7D704507b76571a51d9caE8AdDAbBFd0ba0e63d3", | ||
"0x05037A81BD7B4C9E0F7B430f1F2A22c31a2FD943", | ||
"0x15F70a41Afe34020B3B16079010D3e88c4A85daf", | ||
"0x31B6F59e1627cEfC9fA174aD03859fC337666af7", | ||
"0x46281E3B7fDcACdBa44CADf069a94a588Fd4C6Ef", | ||
"0x70EB4D3c164a6B4A5f908D4FBb5a9cAfFb66bAB6" | ||
], | ||
"strategyManager": "0xdfB5f6CE42aAA7830E94ECFCcAd411beF4d4D5b6", | ||
"strategyManagerImplementation": "0x59f766A603C53f3AC8Be43bBe158c1519b193a18" | ||
}, | ||
"numStrategies": 8, | ||
"chainInfo": { | ||
"chainId": 17000, | ||
"deploymentBlock": 1167041 | ||
}, | ||
"parameters": { | ||
"communityMultisig": "0xCb8d2f9e55Bc7B1FA9d089f9aC80C583D2BDD5F7", | ||
"executorMultisig": "0x28Ade60640fdBDb2609D8d8734D1b5cBeFc0C348", | ||
"operationsMultisig": "0xfaEF7338b7490b9E272d80A1a39f4657cAf2b97d", | ||
"pauserMultisig": "0x53410249ec7d3a3F9F1ba3912D50D6A3Df6d10A7", | ||
"timelock": "0xcF19CE0561052a7A7Ff21156730285997B350A7D" | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
63 changes: 63 additions & 0 deletions
63
script/configs/mainnet/Mainnet_current_deployment.config.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,63 @@ | ||
{ | ||
"addresses": { | ||
"avsDirectory": "0x0000000000000000000000000000000000000000", | ||
"avsDirectoryImplementation": "0x0000000000000000000000000000000000000000", | ||
"beaconOracle": "0x343907185b71aDF0eBa9567538314396aa985442", | ||
"baseStrategyImplementation": "0xdfdA04f980bE6A64E3607c95Ca26012Ab9aA46d3", | ||
"delayedWithdrawalRouter": "0x7Fe7E9CC0F274d2435AD5d56D5fa73E47F6A23D8", | ||
"delayedWithdrawalRouterImplementation": "0x44Bcb0E01CD0C5060D4Bb1A07b42580EF983E2AF", | ||
"delegationManager": "0x39053D51B77DC0d36036Fc1fCc8Cb819df8Ef37A", | ||
"delegationManagerImplementation": "0xf97E97649Da958d290e84E6D571c32F4b7F475e4", | ||
"eigenLayerPauserReg": "0x0c431C66F4dE941d089625E5B423D00707977060", | ||
"eigenLayerProxyAdmin": "0x8b9566AdA63B64d1E1dcF1418b43fd1433b72444", | ||
"eigenPodBeacon": "0x5a2a4F2F3C18f09179B6703e63D9eDD165909073", | ||
"eigenPodImplementation": "0x5c86e9609fbBc1B754D0FD5a4963Fdf0F5b99dA7", | ||
"eigenPodManager": "0x91E677b07F7AF907ec9a428aafA9fc14a0d3A338", | ||
"eigenPodManagerImplementation": "0xEB86a5c40FdE917E6feC440aBbCDc80E3862e111", | ||
"emptyContract": "0x1f96861fEFa1065a5A96F20Deb6D8DC3ff48F7f9", | ||
"slasher": "0xD92145c07f8Ed1D392c1B88017934E301CC1c3Cd", | ||
"slasherImplementation": "0xef31c292801f24f16479DD83197F1E6AeBb8d6d8", | ||
"strategyManager": "0x858646372CC42E1A627fcE94aa7A7033e7CF075A", | ||
"strategyManagerImplementation": "0x5d25EEf8CfEdaA47d31fE2346726dE1c21e342Fb", | ||
"strategies": { | ||
"stETH": "0x93c4b944D05dfe6df7645A86cd2206016c51564D", | ||
"rETH": "0x1BeE69b7dFFfA4E2d53C2a2Df135C388AD25dCD2", | ||
"cbETH": "0x54945180dB7943c0ed0FEE7EdaB2Bd24620256bc", | ||
"ETHx": "0x9d7eD45EE2E8FC5482fa2428f15C971e6369011d", | ||
"ankrETH": "0x13760F50a9d7377e4F20CB8CF9e4c26586c658ff", | ||
"oETH": "0xa4C637e0F704745D182e4D38cAb7E7485321d059", | ||
"osETH": "0x57ba429517c3473B6d34CA9aCd56c0e735b94c02", | ||
"swETH": "0x0Fe4F44beE93503346A3Ac9EE5A26b130a5796d6", | ||
"wBETH": "0x7CA911E83dabf90C90dD3De5411a10F1A6112184", | ||
"sfrxETH": "0x8CA7A5d6f3acd3A7A8bC468a8CD0FB14B6BD28b6", | ||
"lsETH": "0xAe60d8180437b5C34bB956822ac2710972584473", | ||
"mETH": "0x298aFB19A105D59E74658C4C334Ff360BadE6dd2" | ||
}, | ||
"strategyAddresses": [ | ||
"0x93c4b944D05dfe6df7645A86cd2206016c51564D", | ||
"0x1BeE69b7dFFfA4E2d53C2a2Df135C388AD25dCD2", | ||
"0x54945180dB7943c0ed0FEE7EdaB2Bd24620256bc", | ||
"0x9d7eD45EE2E8FC5482fa2428f15C971e6369011d", | ||
"0x13760F50a9d7377e4F20CB8CF9e4c26586c658ff", | ||
"0xa4C637e0F704745D182e4D38cAb7E7485321d059", | ||
"0x57ba429517c3473B6d34CA9aCd56c0e735b94c02", | ||
"0x0Fe4F44beE93503346A3Ac9EE5A26b130a5796d6", | ||
"0x7CA911E83dabf90C90dD3De5411a10F1A6112184", | ||
"0x8CA7A5d6f3acd3A7A8bC468a8CD0FB14B6BD28b6", | ||
"0xAe60d8180437b5C34bB956822ac2710972584473", | ||
"0x298aFB19A105D59E74658C4C334Ff360BadE6dd2" | ||
] | ||
}, | ||
"numStrategies": 12, | ||
"chainInfo": { | ||
"chainId": 1, | ||
"deploymentBlock": 17445559 | ||
}, | ||
"parameters": { | ||
"communityMultisig": "0xFEA47018D632A77bA579846c840d5706705Dc598", | ||
"executorMultisig": "0x369e6F597e22EaB55fFb173C6d9cD234BD699111", | ||
"operationsMultisig": "0xBE1685C81aA44FF9FB319dD389addd9374383e90", | ||
"pauserMultisig": "0x5050389572f2d220ad927CcbeA0D406831012390", | ||
"timelock": "0xA6Db1A8C5a981d1536266D2a393c5F8dDb210EAF" | ||
} | ||
} |
46 changes: 46 additions & 0 deletions
46
script/configs/mainnet/Mainnet_current_eigenPods.config.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,46 @@ | ||
{ | ||
"chainInfo": { | ||
"chainId": 1, | ||
"deploymentBlock": 19285000 | ||
}, | ||
"eigenPods": { | ||
"multiValidators": [ | ||
"0x2641c2ded63a0c640629f5edf1189e0f53c06561", | ||
"0xa345dcb63f984ed1c6d1a8901e0cdbd13b2b4d19", | ||
"0x7fb3d3801883341a02ddd1beb2e624a278e87930", | ||
"0x2f5cb052d397d0b628299a9d4cfc49a5019c4170", | ||
"0xdb678e1056acd7db74507b921a6295c3d586ece9" | ||
], | ||
"singleValidators": [ | ||
"0xc149531419db43b8cc0d4f2f2ce1700ae46f4c8a", | ||
"0x61340dcc5aef625ded27f21e5068916ad334dad0", | ||
"0x722e2350a55e6b617e66983b4b91d47fe9e9403e", | ||
"0x49213606dc1953eae3b733187fed9e7307edd55b", | ||
"0xa8fc63e72288b79009f7b5952760114513efc700" | ||
], | ||
"inActive": [ | ||
"0xcbb42f0d320056453c497867119814c59615daeb", | ||
"0xd6e50e7f6250ca26d5d5033138ad09cfe2aaeacb", | ||
"0xe18c1447804563af9647cf8c879f35ced8172c1f", | ||
"0x38de067514c77fed61630bb77ecc24f2adb73ff4", | ||
"0xc3f9bbd74ded6b2bc2ff8b5c693fcbabf2e24efd" | ||
], | ||
"allEigenPods": [ | ||
"0x2641c2ded63a0c640629f5edf1189e0f53c06561", | ||
"0xa345dcb63f984ed1c6d1a8901e0cdbd13b2b4d19", | ||
"0x7fb3d3801883341a02ddd1beb2e624a278e87930", | ||
"0x2f5cb052d397d0b628299a9d4cfc49a5019c4170", | ||
"0xdb678e1056acd7db74507b921a6295c3d586ece9", | ||
"0xc149531419db43b8cc0d4f2f2ce1700ae46f4c8a", | ||
"0x61340dcc5aef625ded27f21e5068916ad334dad0", | ||
"0x722e2350a55e6b617e66983b4b91d47fe9e9403e", | ||
"0x49213606dc1953eae3b733187fed9e7307edd55b", | ||
"0xa8fc63e72288b79009f7b5952760114513efc700", | ||
"0xcbb42f0d320056453c497867119814c59615daeb", | ||
"0xd6e50e7f6250ca26d5d5033138ad09cfe2aaeacb", | ||
"0xe18c1447804563af9647cf8c879f35ced8172c1f", | ||
"0x38de067514c77fed61630bb77ecc24f2adb73ff4", | ||
"0xc3f9bbd74ded6b2bc2ff8b5c693fcbabf2e24efd" | ||
] | ||
} | ||
} |
Oops, something went wrong.