From c3d2e053fcc604ee871938d7b2abced3ba3fa834 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Gr=C3=BCner?= <47506558+MegaRedHand@users.noreply.github.com> Date: Tue, 18 Feb 2025 11:13:23 -0300 Subject: [PATCH 1/5] ci: print logs after running example --- .github/workflows/ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6cce29b..e24966b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -69,6 +69,10 @@ jobs: - name: Check example is still running if: matrix.example != 'kurtosis_hello_world' run: make check_devnet + + - name: Print logs + if: always() + run: kurtosis service logs devnet kurtosis_lint: runs-on: ubuntu-latest From 6f4705e6a6d5af2eaf27ab294cb214da5323f5d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Gr=C3=BCner?= <47506558+MegaRedHand@users.noreply.github.com> Date: Tue, 18 Feb 2025 11:39:17 -0300 Subject: [PATCH 2/5] fix: enable the optimizer in hello-world example --- .github/workflows/ci.yml | 2 +- Makefile | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e24966b..22c2694 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -69,7 +69,7 @@ jobs: - name: Check example is still running if: matrix.example != 'kurtosis_hello_world' run: make check_devnet - + - name: Print logs if: always() run: kurtosis service logs devnet diff --git a/Makefile b/Makefile index 2351542..03986b6 100644 --- a/Makefile +++ b/Makefile @@ -113,6 +113,8 @@ examples/hello-world-avs: git fetch --depth 1 origin $(HELLO_WORLD_REF) && \ git checkout FETCH_HEAD && \ git submodule update --init --recursive --depth 1 + # Enable the solc optimizer + sed -i '' 's/via-ir = true/optimizer = true\nvia-ir = true/' $@/contracts/foundry.toml build_hello_world_image: examples/hello-world-avs @echo "Building hello_world docker image..." From 1cadb3dd4de1dba9608fb2a649ee1d2a3f9c93df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Gr=C3=BCner?= <47506558+MegaRedHand@users.noreply.github.com> Date: Tue, 18 Feb 2025 11:54:36 -0300 Subject: [PATCH 3/5] fix: update hello-world commit to fix PR --- Makefile | 6 ++---- examples/hello_world.yaml | 8 +++++--- examples/hello_world_local.yaml | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 03986b6..2537708 100644 --- a/Makefile +++ b/Makefile @@ -101,8 +101,8 @@ check_devnet: # hello-world-avs example -# Version from 2025-01-04 -HELLO_WORLD_REF:=4626e206fd119b26ebe98935b256daa7256e863b +# Version from 2025-02-18 (PR #108) +HELLO_WORLD_REF:=f2e76cf710c3492cc1db16b3cef2f3a5adf502f4 examples/hello-world-avs: @echo "Cloning hello-world-avs repo..." @@ -113,8 +113,6 @@ examples/hello-world-avs: git fetch --depth 1 origin $(HELLO_WORLD_REF) && \ git checkout FETCH_HEAD && \ git submodule update --init --recursive --depth 1 - # Enable the solc optimizer - sed -i '' 's/via-ir = true/optimizer = true\nvia-ir = true/' $@/contracts/foundry.toml build_hello_world_image: examples/hello-world-avs @echo "Building hello_world docker image..." diff --git a/examples/hello_world.yaml b/examples/hello_world.yaml index f4764c6..7fabd3a 100644 --- a/examples/hello_world.yaml +++ b/examples/hello_world.yaml @@ -4,9 +4,10 @@ deployments: - name: EigenLayer repo: "https://github.com/Layr-Labs/hello-world-avs.git" - ref: "001dc6e944280559dfb44f75faf5102349a61d8e" + # Version from 2025-02-18 (PR #108) + ref: "f2e76cf710c3492cc1db16b3cef2f3a5adf502f4" contracts_path: "contracts" - script: script/DeployEigenLayerCore.s.sol + script: script/DeployEigenLayerCore.s.sol:DeployEigenlayerCore env: # NOTE: this is used inside the deployer script PRIVATE_KEY: "{{.deployer_private_key}}" @@ -19,7 +20,8 @@ deployments: - name: hello-world-avs repo: "https://github.com/Layr-Labs/hello-world-avs.git" - ref: "001dc6e944280559dfb44f75faf5102349a61d8e" + # Version from 2025-02-18 (PR #108) + ref: "f2e76cf710c3492cc1db16b3cef2f3a5adf502f4" contracts_path: "contracts" script: script/HelloWorldDeployer.s.sol env: diff --git a/examples/hello_world_local.yaml b/examples/hello_world_local.yaml index 5cb9e0b..84054fc 100644 --- a/examples/hello_world_local.yaml +++ b/examples/hello_world_local.yaml @@ -15,7 +15,7 @@ deployments: - name: EigenLayer repo: "." contracts_path: "contracts" - script: script/DeployEigenLayerCore.s.sol + script: script/DeployEigenLayerCore.s.sol:DeployEigenlayerCore env: # NOTE: this is used inside the deployer script PRIVATE_KEY: "{{.deployer_private_key}}" From 53740f43461d24bf3ceac8b5764430f8a9b77d37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Gr=C3=BCner?= <47506558+MegaRedHand@users.noreply.github.com> Date: Tue, 18 Feb 2025 15:56:52 -0300 Subject: [PATCH 4/5] fix: update hello-world-avs config example --- examples/hello_world.yaml | 13 +++++++++++++ examples/hello_world_local.yaml | 13 +++++++++++++ 2 files changed, 26 insertions(+) diff --git a/examples/hello_world.yaml b/examples/hello_world.yaml index 7fabd3a..f15b878 100644 --- a/examples/hello_world.yaml +++ b/examples/hello_world.yaml @@ -15,6 +15,8 @@ deployments: HOLESKY_PRIVATE_KEY: "" HOLESKY_RPC_URL: "" ETHERSCAN_API_KEY: "" + input: + config/core/: core_deployment_config output: eigenlayer_addresses: "deployments/core/31337.json" @@ -33,6 +35,7 @@ deployments: ETHERSCAN_API_KEY: "" input: deployments/core/: eigenlayer_addresses + config/hello-world/: avs_deployment_config output: avs_addresses: "deployments/hello-world/31337.json" @@ -67,6 +70,16 @@ keys: - name: traffic_generator_ecdsa_keys type: ecdsa +artifacts: + core_deployment_config: + files: + 31337.json: + static_file: "https://raw.githubusercontent.com/Layr-Labs/hello-world-avs/f2e76cf710c3492cc1db16b3cef2f3a5adf502f4/contracts/config/core/31337.json" + avs_deployment_config: + files: + 31337.json: + static_file: "https://raw.githubusercontent.com/Layr-Labs/hello-world-avs/f2e76cf710c3492cc1db16b3cef2f3a5adf502f4/contracts/config/hello-world/31337.json" + ethereum_package: additional_services: - blockscout diff --git a/examples/hello_world_local.yaml b/examples/hello_world_local.yaml index 84054fc..1241d0d 100644 --- a/examples/hello_world_local.yaml +++ b/examples/hello_world_local.yaml @@ -23,6 +23,8 @@ deployments: HOLESKY_PRIVATE_KEY: "" HOLESKY_RPC_URL: "" ETHERSCAN_API_KEY: "" + input: + config/core/: core_deployment_config output: eigenlayer_addresses: "deployments/core/31337.json" @@ -39,6 +41,7 @@ deployments: ETHERSCAN_API_KEY: "" input: deployments/core/: eigenlayer_addresses + config/hello-world/: avs_deployment_config output: avs_addresses: "deployments/hello-world/31337.json" @@ -73,6 +76,16 @@ keys: - name: traffic_generator_ecdsa_keys type: ecdsa +artifacts: + core_deployment_config: + files: + 31337.json: + static_file: "contracts/config/core/31337.json" + avs_deployment_config: + files: + 31337.json: + static_file: "contracts/config/hello-world/31337.json" + ethereum_package: additional_services: - blockscout From 66f4da0e782294fef33ddd1e74ae21bd96d92465 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Gr=C3=BCner?= <47506558+MegaRedHand@users.noreply.github.com> Date: Tue, 18 Feb 2025 16:20:55 -0300 Subject: [PATCH 5/5] ci: remove hello-world-avs skip --- .github/workflows/ci.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 22c2694..f5ae817 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -60,14 +60,10 @@ jobs: with: key: docker-${{ runner.os }}-${{ hashFiles('Makefile', 'examples', 'src/config/default_config.yaml') }} - # TODO: fix the hello-world example - name: Run example '${{ matrix.example }}' - if: matrix.example != 'kurtosis_hello_world' run: make ${{ matrix.example }} - # TODO: fix the hello-world example - name: Check example is still running - if: matrix.example != 'kurtosis_hello_world' run: make check_devnet - name: Print logs