diff --git a/Makefile b/Makefile index 6b7fba5c..3cac422c 100644 --- a/Makefile +++ b/Makefile @@ -17,6 +17,9 @@ DEPLOYMENT_FILES_DIR=contracts/script/output/${CHAINID} ___CONTRACTS___: ## +anvil: ## starts anvil + anvil + build-contracts: ## builds all contracts cd contracts && forge build @@ -28,8 +31,8 @@ deploy-incredible-squaring-contracts-to-anvil-and-save-state: ## Deploy avs deploy-all-to-anvil-and-save-state: deploy-eigenlayer-contracts-to-anvil-and-save-state deploy-incredible-squaring-contracts-to-anvil-and-save-state ## deploy eigenlayer, shared avs contracts, and inc-sq contracts -start-anvil-chain-with-el-and-avs-deployed: ## starts anvil from a saved state file (with el and avs contracts deployed) - ./tests/anvil/start-anvil-chain-with-el-and-avs-deployed.sh +deploy-eigenlayer-and-avs: ## starts anvil from a saved state file (with el and avs contracts deployed) + ./tests/anvil/deploy-eigenlayer-and-avs.sh bindings: ## generates contract bindings cd contracts && ./generate-go-bindings.sh diff --git a/README.md b/README.md index aded9ac5..130eb918 100644 --- a/README.md +++ b/README.md @@ -28,9 +28,11 @@ make bindings This simple session illustrates the basic flow of the AVS. The makefile commands are hardcoded for a single operator, but it's however easy to create new operator config files, and start more operators manually (see the actual commands that the makefile calls). Start anvil in a separate terminal: - ```bash -make start-anvil-chain-with-el-and-avs-deployed +make anvil +``` +```bash +make deploy-eigenlayer-and-avs ``` The above command starts a local anvil chain from a [saved state](./tests/anvil/avs-and-eigenlayer-deployed-anvil-state.json) with eigenlayer and incredible-squaring contracts already deployed (but no operator registered). diff --git a/contracts/script/output/31337/credible_squaring_avs_deployment_output.json b/contracts/script/output/31337/credible_squaring_avs_deployment_output.json index 057df0e1..7fffcc8c 100644 --- a/contracts/script/output/31337/credible_squaring_avs_deployment_output.json +++ b/contracts/script/output/31337/credible_squaring_avs_deployment_output.json @@ -1,13 +1,13 @@ { "addresses": { - "credibleSquaringServiceManager": "0xD84379CEae14AA33C123Af12424A37803F885889", - "credibleSquaringServiceManagerImplementation": "0x5c74c94173F05dA1720953407cbb920F3DF9f887", - "credibleSquaringTaskManager": "0x2B0d36FACD61B71CC05ab8F3D2355ec3631C0dd5", - "credibleSquaringTaskManagerImplementation": "0xe8D2A1E88c91DCd5433208d4152Cc4F399a7e91d", - "erc20Mock": "0x0355B7B8cb128fA5692729Ab3AAa199C1753f726", - "erc20MockStrategy": "0x202CCe504e04bEd6fC0521238dDf04Bc9E8E15aB", - "operatorStateRetriever": "0x367761085BF3C12e5DA2Df99AC6E1a824612b8fb", - "registryCoordinator": "0xfbC22278A96299D91d41C453234d97b4F5Eb9B2d", - "registryCoordinatorImplementation": "0xf953b3A269d80e3eB0F2947630Da976B896A8C5b" + "credibleSquaringServiceManager": "0xd6e1afe5cA8D00A2EFC01B89997abE2De47fdfAf", + "credibleSquaringServiceManagerImplementation": "0x6C2d83262fF84cBaDb3e416D527403135D757892", + "credibleSquaringTaskManager": "0x99dBE4AEa58E518C50a1c04aE9b48C9F6354612f", + "credibleSquaringTaskManagerImplementation": "0xa6e99A4ED7498b3cdDCBB61a6A607a4925Faa1B7", + "erc20Mock": "0xB82008565FdC7e44609fA118A4a681E92581e680", + "erc20MockStrategy": "0x2a810409872AfC346F9B5b26571Fd6eC42EA4849", + "operatorStateRetriever": "0x976fcd02f7C4773dd89C309fBF55D5923B4c98a1", + "registryCoordinator": "0x6F6f570F45833E249e27022648a26F4076F48f78", + "registryCoordinatorImplementation": "0x02b0B4EFd909240FCB2Eb5FAe060dC60D112E3a4" } } \ No newline at end of file diff --git a/contracts/script/output/31337/eigenlayer_deployment_output.json b/contracts/script/output/31337/eigenlayer_deployment_output.json index 15277343..45178ac2 100644 --- a/contracts/script/output/31337/eigenlayer_deployment_output.json +++ b/contracts/script/output/31337/eigenlayer_deployment_output.json @@ -1,28 +1,28 @@ { "addresses": { - "avsDirectory": "0x7969c5eD335650692Bc04293B07F5BF2e7A673C0", - "avsDirectoryImplementation": "0x922D6956C99E12DFeB3224DEA977D0939758A1Fe", - "baseStrategyImplementation": "0x51A1ceB83B83F1985a81C295d1fF28Afef186E02", - "delegation": "0x82e01223d51Eb87e16A03E24687EDF0F294da6f1", - "delegationImplementation": "0xB0D4afd8879eD9F52b28595d31B441D079B2Ca07", - "eigenLayerPauserReg": "0xb7278A61aa25c888815aFC32Ad3cC52fF24fE575", - "eigenLayerProxyAdmin": "0x5f3f1dBD7B74C6B46e8c44f98792A1dAf8d69154", - "eigenPodBeacon": "0x1429859428C0aBc9C2C47C8Ee9FBaf82cFA0F20f", - "eigenPodImplementation": "0xcbEAF3BDe82155F56486Fb5a1072cb8baAf547cc", - "eigenPodManager": "0xc351628EB244ec633d5f21fBD6621e1a683B1181", - "eigenPodManagerImplementation": "0x1fA02b2d6A771842690194Cf62D91bdd92BfE28d", - "emptyContract": "0xCD8a1C3ba11CF5ECfa6267617243239504a98d90", - "rewardsCoordinator": "0xFD471836031dc5108809D173A067e8486B9047A3", - "rewardsCoordinatorImplementation": "0xdbC43Ba45381e02825b14322cDdd15eC4B3164E6", - "slasher": "0x7bc06c482DEAd17c0e297aFbC32f6e63d3846650", - "slasherImplementation": "0x5081a39b8A5f0E35a8D959395a630b68B74Dd30f", + "avsDirectory": "0xc0F115A19107322cFBf1cDBC7ea011C19EbDB4F8", + "avsDirectoryImplementation": "0x276C216D241856199A83bf27b2286659e5b877D3", + "baseStrategyImplementation": "0x525C7063E7C20997BaaE9bDa922159152D0e8417", + "delegation": "0xD5ac451B0c50B9476107823Af206eD814a2e2580", + "delegationImplementation": "0xA7c59f010700930003b33aB25a7a0679C860f29c", + "eigenLayerPauserReg": "0x4b6aB5F819A515382B0dEB6935D793817bB4af28", + "eigenLayerProxyAdmin": "0x18E317A7D70d8fBf8e6E893616b52390EbBdb629", + "eigenPodBeacon": "0x22753E4264FDDc6181dc7cce468904A80a363E44", + "eigenPodImplementation": "0x07882Ae1ecB7429a84f1D53048d35c4bB2056877", + "eigenPodManager": "0x34B40BA116d5Dec75548a9e9A8f15411461E8c70", + "eigenPodManagerImplementation": "0x3155755b79aA083bd953911C92705B7aA82a18F9", + "emptyContract": "0xCace1b78160AE76398F486c8a18044da0d66d86D", + "rewardsCoordinator": "0xD0141E899a65C95a556fE2B27e5982A6DE7fDD7A", + "rewardsCoordinatorImplementation": "0x5bf5b11053e734690269C6B9D438F8C9d48F528A", + "slasher": "0xc96304e3c037f81dA488ed9dEa1D8F2a48278a75", + "slasherImplementation": "0x3347B4d90ebe72BeFb30444C9966B2B990aE9FcB", "strategies": "", - "strategyManager": "0x2bdCC0de6bE1f7D2ee689a0342D76F52E8EFABa3", - "strategyManagerImplementation": "0x162A433068F51e18b7d13932F27e66a3f99E6890" + "strategyManager": "0xF8e31cb472bc70500f08Cd84917E5A1912Ec8397", + "strategyManagerImplementation": "0xfaAddC93baf78e89DCf37bA67943E1bE8F37Bb8c" }, "chainInfo": { "chainId": 31337, - "deploymentBlock": 40 + "deploymentBlock": 83 }, "parameters": { "executorMultisig": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266", diff --git a/tests/anvil/start-anvil-chain-with-el-and-avs-deployed.sh b/tests/anvil/deploy-eigenlayer-and-avs.sh similarity index 100% rename from tests/anvil/start-anvil-chain-with-el-and-avs-deployed.sh rename to tests/anvil/deploy-eigenlayer-and-avs.sh