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

build: script for public holesky testnet #578

Merged
merged 6 commits into from
Jun 5, 2024
Merged

build: script for public holesky testnet #578

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f9ade87
build: deploy script for pub testnet
8sunyuan Jun 3, 2024
b427a04
build: update activationDelay
8sunyuan Jun 3, 2024
cc36f5f
feat: deployed to testnet
8sunyuan Jun 4, 2024
b9c977f
docs: readme
8sunyuan Jun 4, 2024
eaa2aeb
chore: readme link
8sunyuan Jun 5, 2024
a2d98ba
chore: make bindings
wadealexc Jun 5, 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
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,7 @@ The current testnet deployment is on holesky, and is from our M2 beta release. Y
| [`EigenPodManager`](https://github.com/Layr-Labs/eigenlayer-contracts/blob/testnet-holesky/src/contracts/pods/EigenPodManager.sol) | [`0x30770d7E3e71112d7A6b7259542D1f680a70e315`](https://holesky.etherscan.io/address/0x30770d7E3e71112d7A6b7259542D1f680a70e315) | [`0x5265...4a7B`](https://holesky.etherscan.io/address/0x5265C162f7d5F3fE3175a78828ab16bf5E324a7B) | Proxy: [`[email protected]`](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v4.7.1/contracts/proxy/transparent/TransparentUpgradeableProxy.sol) |
| [`AVSDirectory`](https://github.com/Layr-Labs/eigenlayer-contracts/blob/testnet-holesky/src/contracts/core/AVSDirectory.sol) | [`0x055733000064333CaDDbC92763c58BF0192fFeBf`](https://holesky.etherscan.io/address/0x055733000064333CaDDbC92763c58BF0192fFeBf) | [`0xEF5B...3e3a`](https://holesky.etherscan.io/address/0xEF5BA995Bc7722fd1e163edF8Dc09375de3d3e3a) | Proxy: [`[email protected]`](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v4.7.1/contracts/proxy/transparent/TransparentUpgradeableProxy.sol) |
| [`Slasher`](https://github.com/Layr-Labs/eigenlayer-contracts/blob/testnet-holesky/src/contracts/core/Slasher.sol) | [`0xcAe751b75833ef09627549868A04E32679386e7C`](https://holesky.etherscan.io/address/0xcAe751b75833ef09627549868A04E32679386e7C) | [`0x9971...345A`](https://holesky.etherscan.io/address/0x99715D255E34a39bE9943b82F281CA734bcF345A) | Proxy: [`[email protected]`](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v4.7.1/contracts/proxy/transparent/TransparentUpgradeableProxy.sol) |
| [`RewardsCoordinator`](https://github.com/Layr-Labs/eigenlayer-contracts/blob/testnet-holesky/src/contracts/core/RewardCoordinator.sol) | [`0xAcc1fb458a1317E886dB376Fc8141540537E68fE`](https://holesky.etherscan.io/address/0xAcc1fb458a1317E886dB376Fc8141540537E68fE) | [`0x123C...3D02`](https://holesky.etherscan.io/address/0x123C1A3543DBCA3f704E703dDda7FAAaA8e43D02) | Proxy: [`[email protected]`](https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v4.7.1/contracts/proxy/transparent/TransparentUpgradeableProxy.sol) |
8sunyuan marked this conversation as resolved.
Show resolved Hide resolved

###### Strategies - ETH

Expand Down
2 changes: 1 addition & 1 deletion script/configs/holesky/Deploy_RewardsCoordinator.holesky.config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"MAX_FUTURE_LENGTH": 2592000,
"GENESIS_REWARDS_TIMESTAMP": 1710979200,
"rewards_updater_address": "0x18a0f92Ad9645385E8A8f3db7d0f6CF7aBBb0aD4",
"activation_delay": 120,
"activation_delay": 7200,
"calculation_interval_seconds": 604800,
"global_operator_commission_bips": 1000
},
Expand Down
7 changes: 3 additions & 4 deletions script/deploy/holesky/Deploy_Test_RewardsCoordinator.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,13 @@ import "../../utils/ExistingDeploymentParser.sol";
* @notice Script used for the first deployment of EigenLayer core contracts to Holesky
* anvil --fork-url $RPC_HOLESKY
* forge script script/deploy/holesky/Deploy_Test_RewardsCoordinator.s.sol --rpc-url http://127.0.0.1:8545 --private-key $PRIVATE_KEY --broadcast -vvvv
* forge script script/deploy/holesky/Deploy_Test_RewardsCoordinator.s.sol --rpc-url $RPC_HOLESKY --private-key $PRIVATE_KEY --broadcast -vvvv
* forge script script/deploy/holesky/Deploy_Test_RewardsCoordinator.s.sol --rpc-url $RPC_HOLESKY --private-key $PRIVATE_KEY --verify --broadcast -vvvv
*
*/
contract Deploy_Test_RewardsCoordinator is ExistingDeploymentParser {

address testAddress = 0xDA29BB71669f46F2a779b4b62f03644A84eE3479;
address initOwner = 0xDA29BB71669f46F2a779b4b62f03644A84eE3479;

function run() external virtual {
_parseInitialDeploymentParams("script/configs/holesky/Deploy_RewardsCoordinator.holesky.config.json");
Expand Down Expand Up @@ -58,7 +59,7 @@ contract Deploy_Test_RewardsCoordinator is ExistingDeploymentParser {
address(eigenLayerProxyAdmin),
abi.encodeWithSelector(
RewardsCoordinator.initialize.selector,
testAddress, // initOwner
executorMultisig,
eigenLayerPauserReg,
REWARDS_COORDINATOR_INIT_PAUSED_STATUS,
REWARDS_COORDINATOR_UPDATER,
Expand All @@ -68,8 +69,6 @@ contract Deploy_Test_RewardsCoordinator is ExistingDeploymentParser {
)
)
);


}

/**
Expand Down
6 changes: 3 additions & 3 deletions script/output/holesky/Deploy_RewardsCoordinator.holesky.config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
"eigenPodManager": "0x30770d7E3e71112d7A6b7259542D1f680a70e315",
"eigenPodManagerImplementation": "0x5265C162f7d5F3fE3175a78828ab16bf5E324a7B",
"emptyContract": "0x9690d52B1Ce155DB2ec5eCbF5a262ccCc7B3A6D2",
"rewardsCoordinator": "0x5fC97864488C2B6fA6E5d2D7730090d7908Db98D",
"rewardsCoordinatorImplementation": "0x4B034d112b8d422665B13F791A4e1104894e0463",
"rewardsCoordinator": "0xAcc1fb458a1317E886dB376Fc8141540537E68fE",
"rewardsCoordinatorImplementation": "0x123C1A3543DBCA3f704E703dDda7FAAaA8e43D02",
"slasher": "0xcAe751b75833ef09627549868A04E32679386e7C",
"slasherImplementation": "0x99715D255E34a39bE9943b82F281CA734bcF345A",
"strategies": "",
Expand All @@ -25,7 +25,7 @@
},
"chainInfo": {
"chainId": 17000,
"deploymentBlock": 1471383
"deploymentBlock": 1671209
},
"parameters": {
"communityMultisig": "0xCb8d2f9e55Bc7B1FA9d089f9aC80C583D2BDD5F7",
Expand Down
11 changes: 10 additions & 1 deletion script/output/holesky/M2_deploy_from_scratch.output.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,16 @@
"strategyManager": "0xdfB5f6CE42aAA7830E94ECFCcAd411beF4d4D5b6",
"strategyManagerImplementation": "0x59f766A603C53f3AC8Be43bBe158c1519b193a18",
"rewardsCoordinator": "0x0000000000000000000000000000000000000000",
"rewardsCoordinatorImplementation": "0x0000000000000000000000000000000000000000"
"rewardsCoordinatorImplementation": "0x0000000000000000000000000000000000000000",
Copy link
Contributor

Choose a reason for hiding this comment

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

?

Copy link
Collaborator

Choose a reason for hiding this comment

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

are you question marking the diff here? the whole line is marked as a diff because a comma was added at the end :D

"token": {
"tokenProxyAdmin": "0x67482666771e82C9a73BB9e9A22B2B597f448BBf",
"EIGEN": "0x3B78576F7D6837500bA3De27A60c7f594934027E",
"bEIGEN": "0x275cCf9Be51f4a6C94aBa6114cdf2a4c45B9cb27",
"EIGENImpl": "0x083bC9e0DCF2C3e13E24686e5202232995578c5a",
"bEIGENImpl": "0x4500927874Ad41538c1bEF2F5278E7a86DF6bce8",
"eigenStrategy": "0x43252609bff8a13dFe5e057097f2f45A24387a84",
"eigenStrategyImpl": "0x94650e09a471CEF96e7966cabf26718FBf352697"
Copy link
Contributor

Choose a reason for hiding this comment

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

why is all of this token stuff added?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

This was needed to fix the deploy scripts since you added the token address checks to the ExistingDeploymentParser script helper

}
},
"chainInfo": {
"chainId": 17000,
Expand Down
8 changes: 4 additions & 4 deletions script/utils/ExistingDeploymentParser.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -551,10 +551,10 @@ contract ExistingDeploymentParser is Script, Test {
rewardsCoordinator.pauserRegistry() == eigenLayerPauserReg,
"rewardsCoordinator: pauser registry not set correctly"
);
// require(
// rewardsCoordinator.owner() == executorMultisig,
// "rewardsCoordinator: owner not set correctly"
// );
require(
rewardsCoordinator.owner() == executorMultisig,
"rewardsCoordinator: owner not set correctly"
);
require(
rewardsCoordinator.paused() == REWARDS_COORDINATOR_INIT_PAUSED_STATUS,
"rewardsCoordinator: init paused status set incorrectly"
Expand Down
Loading