From 31cead282bfcbd4b0b153de462a3876cf613a9e2 Mon Sep 17 00:00:00 2001 From: Rodrigo Oliveri Date: Thu, 30 Jan 2025 16:54:11 -0300 Subject: [PATCH 01/11] properly structure assertoor execution confis --- .../config/assertoor/el-stability-check.yml | 50 +++++++++++++++++++ .github/config/assertoor/network-params.yml | 34 +++++++++++++ .github/workflows/assertoor.yml | 4 +- assertoor-config.yml | 23 --------- 4 files changed, 86 insertions(+), 25 deletions(-) create mode 100644 .github/config/assertoor/el-stability-check.yml create mode 100644 .github/config/assertoor/network-params.yml delete mode 100644 assertoor-config.yml diff --git a/.github/config/assertoor/el-stability-check.yml b/.github/config/assertoor/el-stability-check.yml new file mode 100644 index 000000000..7ae56a27a --- /dev/null +++ b/.github/config/assertoor/el-stability-check.yml @@ -0,0 +1,50 @@ +# This file is mix and match based upon the basic `assertoor-tests` playbooks: +# - https://github.com/ethpandaops/assertoor-test/blob/master/assertoor-tests/stability-check.yaml +# - https://github.com/ethpandaops/assertoor-test/blob/master/assertoor-tests/block-proposal-check.yaml +# +# For reference on each individual check see: https://github.com/ethpandaops/assertoor/wiki#supported-tasks-in-assertoor + +id: el-stability-check +name: "Check Execution Stability" +timeout: 18m +tasks: +- name: check_clients_are_healthy + title: "Check if all clients are ready" + timeout: 1m + +- name: run_tasks_concurrent + title: "Check if all EL & CL clients are synced and the tx spammer is working" + timeout: 5m + config: + tasks: + - name: check_consensus_sync_status + title: "Check if CL clients are synced" + - name: check_execution_sync_status + title: "Check if EL clients are synced" + +- name: run_task_matrix + title: "Check block proposals from all client pairs" + timeout: 4m + configVars: + matrixValues: "validatorPairNames" + config: + runConcurrent: true + matrixVar: "validatorPairName" + task: + name: check_consensus_block_proposals + title: "Wait for block proposal from ${validatorPairName}" + configVars: + validatorNamePattern: "validatorPairName" + config: + config: + minTransactionCount: 240 + +- name: run_tasks_concurrent + title: "Check chain stability (reorgs and forks)" + timeout: 7m + config: + tasks: + - name: check_consensus_reorgs + title: "Check consensus reorgs" + - name: check_consensus_forks + title: "Check consensus forks" \ No newline at end of file diff --git a/.github/config/assertoor/network-params.yml b/.github/config/assertoor/network-params.yml new file mode 100644 index 000000000..2819c35e9 --- /dev/null +++ b/.github/config/assertoor/network-params.yml @@ -0,0 +1,34 @@ +participants: + - el_type: geth + el_image: ethereum/client-go:v1.14.12 + cl_type: lighthouse + cl_image: sigp/lighthouse:v5.3.0 + validator_count: 32 + - el_type: geth + el_image: ethereum/client-go:v1.14.12 + cl_type: lighthouse + cl_image: sigp/lighthouse:v5.3.0 + validator_count: 32 + - el_type: geth + el_image: ethereum/client-go:v1.14.12 + cl_type: lambda + cl_image: lambda_ethereum_consensus:latest + use_separate_vc: false + count: 1 + validator_count: 32 + cl_max_mem: 4096 + keymanager_enabled: true + +additional_services: + - assertoor + - tx_spammer + - dora + +assertoor_params: + run_stability_check: false + run_block_proposal_check: false + tests: + - https://raw.githubusercontent.com/lambdaclass/ethrex/refs/heads/main/.github/config/assertoor/el-stability-check.yaml + +tx_spammer_params: + tx_spammer_extra_args: ["--txcount=3", "--accounts=80"] \ No newline at end of file diff --git a/.github/workflows/assertoor.yml b/.github/workflows/assertoor.yml index 211f0574b..8d4db53a7 100644 --- a/.github/workflows/assertoor.yml +++ b/.github/workflows/assertoor.yml @@ -28,8 +28,8 @@ jobs: - name: Setup kurtosis testnet and run assertoor tests uses: ethpandaops/kurtosis-assertoor-github-action@v1 with: + enclave_name: "elixir-consensus-assertoor" kurtosis_version: "1.4.2" ethereum_package_url: 'github.com/lambdaclass/ethereum-package' ethereum_package_branch: 'lecc-integration-and-assertoor' - ethereum_package_args: './assertoor-config.yml' - # Additional configurations as needed + ethereum_package_args: './.github/assertoor/network-params.yml' diff --git a/assertoor-config.yml b/assertoor-config.yml deleted file mode 100644 index 6ae1474d3..000000000 --- a/assertoor-config.yml +++ /dev/null @@ -1,23 +0,0 @@ -participants: - - el_type: geth - el_image: ethereum/client-go:v1.14.12 - cl_type: lighthouse - cl_image: sigp/lighthouse:v5.3.0 - - el_type: geth - el_image: ethereum/client-go:v1.14.12 - cl_type: lambda - cl_image: lambda_ethereum_consensus:latest - use_separate_vc: false - count: 1 - cl_max_mem: 4096 - keymanager_enabled: true -additional_services: [] -# - assertoor -# assertoor_params: -# run_stability_check: false -# run_block_proposal_check: false -# run_transaction_test: false -# run_blob_transaction_test: false -# run_opcodes_transaction_test: false -# run_lifecycle_test: false -# test: [] From 6fc6807ac09b637612a94f4eb0493e19afa2918e Mon Sep 17 00:00:00 2001 From: Rodrigo Oliveri Date: Thu, 30 Jan 2025 16:57:55 -0300 Subject: [PATCH 02/11] change el for cl in naming --- .../{el-stability-check.yml => cl-stability-check.yml} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename .github/config/assertoor/{el-stability-check.yml => cl-stability-check.yml} (98%) diff --git a/.github/config/assertoor/el-stability-check.yml b/.github/config/assertoor/cl-stability-check.yml similarity index 98% rename from .github/config/assertoor/el-stability-check.yml rename to .github/config/assertoor/cl-stability-check.yml index 7ae56a27a..d493e5ebf 100644 --- a/.github/config/assertoor/el-stability-check.yml +++ b/.github/config/assertoor/cl-stability-check.yml @@ -4,7 +4,7 @@ # # For reference on each individual check see: https://github.com/ethpandaops/assertoor/wiki#supported-tasks-in-assertoor -id: el-stability-check +id: cl-stability-check name: "Check Execution Stability" timeout: 18m tasks: From 8dd6624fd40c414d215ed4b29c0bfdb7a372f0f5 Mon Sep 17 00:00:00 2001 From: Rodrigo Oliveri Date: Thu, 30 Jan 2025 17:43:56 -0300 Subject: [PATCH 03/11] Fixed reference and moved config --- .github/config/assertoor/cl-stability-check.yml | 4 +--- .github/config/assertoor/network-params.yml | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/config/assertoor/cl-stability-check.yml b/.github/config/assertoor/cl-stability-check.yml index d493e5ebf..20f5f0244 100644 --- a/.github/config/assertoor/cl-stability-check.yml +++ b/.github/config/assertoor/cl-stability-check.yml @@ -34,10 +34,8 @@ tasks: name: check_consensus_block_proposals title: "Wait for block proposal from ${validatorPairName}" configVars: - validatorNamePattern: "validatorPairName" - config: - config: minTransactionCount: 240 + validatorNamePattern: "validatorPairName" - name: run_tasks_concurrent title: "Check chain stability (reorgs and forks)" diff --git a/.github/config/assertoor/network-params.yml b/.github/config/assertoor/network-params.yml index 2819c35e9..2e4522b7e 100644 --- a/.github/config/assertoor/network-params.yml +++ b/.github/config/assertoor/network-params.yml @@ -28,7 +28,7 @@ assertoor_params: run_stability_check: false run_block_proposal_check: false tests: - - https://raw.githubusercontent.com/lambdaclass/ethrex/refs/heads/main/.github/config/assertoor/el-stability-check.yaml + - https://raw.githubusercontent.com/lambdaclass/lambda_ethereum_consensus/6fc6807ac09b637612a94f4eb0493e19afa2918e/.github/config/assertoor/cl-stability-check.yml tx_spammer_params: tx_spammer_extra_args: ["--txcount=3", "--accounts=80"] \ No newline at end of file From fe5b4e1619169a0ded55c73aa4be538c71a3e299 Mon Sep 17 00:00:00 2001 From: Rodrigo Oliveri Date: Thu, 30 Jan 2025 17:51:24 -0300 Subject: [PATCH 04/11] Small fix to config --- .github/config/assertoor/cl-stability-check.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/config/assertoor/cl-stability-check.yml b/.github/config/assertoor/cl-stability-check.yml index 20f5f0244..38f2039b4 100644 --- a/.github/config/assertoor/cl-stability-check.yml +++ b/.github/config/assertoor/cl-stability-check.yml @@ -33,8 +33,9 @@ tasks: task: name: check_consensus_block_proposals title: "Wait for block proposal from ${validatorPairName}" - configVars: + config: minTransactionCount: 240 + configVars: validatorNamePattern: "validatorPairName" - name: run_tasks_concurrent From 07844d37b1afa7c1b394d9f90a75124ed25bb12d Mon Sep 17 00:00:00 2001 From: Rodrigo Oliveri Date: Thu, 30 Jan 2025 18:08:08 -0300 Subject: [PATCH 05/11] Fix branch isntead fo commit in file url --- .github/config/assertoor/network-params.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/config/assertoor/network-params.yml b/.github/config/assertoor/network-params.yml index 2e4522b7e..db33bada5 100644 --- a/.github/config/assertoor/network-params.yml +++ b/.github/config/assertoor/network-params.yml @@ -28,7 +28,7 @@ assertoor_params: run_stability_check: false run_block_proposal_check: false tests: - - https://raw.githubusercontent.com/lambdaclass/lambda_ethereum_consensus/6fc6807ac09b637612a94f4eb0493e19afa2918e/.github/config/assertoor/cl-stability-check.yml + - https://raw.githubusercontent.com/lambdaclass/lambda_ethereum_consensus/refs/heads/assertoor-structure-setup/.github/config/assertoor/cl-stability-check.yml tx_spammer_params: tx_spammer_extra_args: ["--txcount=3", "--accounts=80"] \ No newline at end of file From b1e4ea0ac5beed050ad5e702424b3330c4f31388 Mon Sep 17 00:00:00 2001 From: Rodrigo Oliveri Date: Thu, 30 Jan 2025 18:11:31 -0300 Subject: [PATCH 06/11] Fix line feed --- .github/config/assertoor/cl-stability-check.yml | 2 +- .github/config/assertoor/network-params.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/config/assertoor/cl-stability-check.yml b/.github/config/assertoor/cl-stability-check.yml index 38f2039b4..0ec2d019c 100644 --- a/.github/config/assertoor/cl-stability-check.yml +++ b/.github/config/assertoor/cl-stability-check.yml @@ -46,4 +46,4 @@ tasks: - name: check_consensus_reorgs title: "Check consensus reorgs" - name: check_consensus_forks - title: "Check consensus forks" \ No newline at end of file + title: "Check consensus forks" diff --git a/.github/config/assertoor/network-params.yml b/.github/config/assertoor/network-params.yml index db33bada5..685a57237 100644 --- a/.github/config/assertoor/network-params.yml +++ b/.github/config/assertoor/network-params.yml @@ -31,4 +31,4 @@ assertoor_params: - https://raw.githubusercontent.com/lambdaclass/lambda_ethereum_consensus/refs/heads/assertoor-structure-setup/.github/config/assertoor/cl-stability-check.yml tx_spammer_params: - tx_spammer_extra_args: ["--txcount=3", "--accounts=80"] \ No newline at end of file + tx_spammer_extra_args: ["--txcount=3", "--accounts=80"] From b528460f0fb5d62504bf918956fcaaccbb48cee0 Mon Sep 17 00:00:00 2001 From: Rodrigo Oliveri Date: Thu, 30 Jan 2025 18:18:04 -0300 Subject: [PATCH 07/11] Commented for now the tests given taht they depend on #1324 --- .github/config/assertoor/network-params.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/config/assertoor/network-params.yml b/.github/config/assertoor/network-params.yml index 685a57237..9ffb959f0 100644 --- a/.github/config/assertoor/network-params.yml +++ b/.github/config/assertoor/network-params.yml @@ -27,8 +27,8 @@ additional_services: assertoor_params: run_stability_check: false run_block_proposal_check: false - tests: - - https://raw.githubusercontent.com/lambdaclass/lambda_ethereum_consensus/refs/heads/assertoor-structure-setup/.github/config/assertoor/cl-stability-check.yml + tests: [] + # - https://raw.githubusercontent.com/lambdaclass/lambda_ethereum_consensus/refs/heads/main/.github/config/assertoor/cl-stability-check.yml tx_spammer_params: tx_spammer_extra_args: ["--txcount=3", "--accounts=80"] From 44a8afd65e5926d3cbbad1e00dced19f50f5acb7 Mon Sep 17 00:00:00 2001 From: Rodrigo Oliveri Date: Fri, 31 Jan 2025 12:25:34 -0300 Subject: [PATCH 08/11] fixed the filepath of the assertoor network params --- .github/workflows/assertoor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/assertoor.yml b/.github/workflows/assertoor.yml index 8d4db53a7..5fe76ddda 100644 --- a/.github/workflows/assertoor.yml +++ b/.github/workflows/assertoor.yml @@ -32,4 +32,4 @@ jobs: kurtosis_version: "1.4.2" ethereum_package_url: 'github.com/lambdaclass/ethereum-package' ethereum_package_branch: 'lecc-integration-and-assertoor' - ethereum_package_args: './.github/assertoor/network-params.yml' + ethereum_package_args: './.github/config/assertoor/network-params.yml' From 2e42ed5cd37f03e6419d5b7189ae4681fc645965 Mon Sep 17 00:00:00 2001 From: Rodrigo Oliveri Date: Fri, 31 Jan 2025 13:56:58 -0300 Subject: [PATCH 09/11] made false every check for now --- .github/config/assertoor/network-params.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/config/assertoor/network-params.yml b/.github/config/assertoor/network-params.yml index 9ffb959f0..7d6f25c7f 100644 --- a/.github/config/assertoor/network-params.yml +++ b/.github/config/assertoor/network-params.yml @@ -27,6 +27,10 @@ additional_services: assertoor_params: run_stability_check: false run_block_proposal_check: false + run_transaction_test: false + run_blob_transaction_test: false + run_opcodes_transaction_test: false + run_lifecycle_test: false tests: [] # - https://raw.githubusercontent.com/lambdaclass/lambda_ethereum_consensus/refs/heads/main/.github/config/assertoor/cl-stability-check.yml From 6f3c2306845c0737ad66cbc5e90d0474c657cfd5 Mon Sep 17 00:00:00 2001 From: Rodrigo Oliveri Date: Fri, 31 Jan 2025 14:09:34 -0300 Subject: [PATCH 10/11] remove assertoor up until we have the missing endpoints --- .github/config/assertoor/network-params.yml | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/.github/config/assertoor/network-params.yml b/.github/config/assertoor/network-params.yml index 7d6f25c7f..ccacbff5b 100644 --- a/.github/config/assertoor/network-params.yml +++ b/.github/config/assertoor/network-params.yml @@ -20,18 +20,14 @@ participants: keymanager_enabled: true additional_services: - - assertoor +# - assertoor - tx_spammer - dora -assertoor_params: - run_stability_check: false - run_block_proposal_check: false - run_transaction_test: false - run_blob_transaction_test: false - run_opcodes_transaction_test: false - run_lifecycle_test: false - tests: [] +#assertoor_params: +# run_stability_check: false +# run_block_proposal_check: false +# tests: [] # - https://raw.githubusercontent.com/lambdaclass/lambda_ethereum_consensus/refs/heads/main/.github/config/assertoor/cl-stability-check.yml tx_spammer_params: From 847f5b7acfb3e67e79f4d34e987286a2490e2377 Mon Sep 17 00:00:00 2001 From: Rodrigo Oliveri Date: Fri, 31 Jan 2025 14:11:14 -0300 Subject: [PATCH 11/11] make the timeout for block proposals 6m --- .github/config/assertoor/cl-stability-check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/config/assertoor/cl-stability-check.yml b/.github/config/assertoor/cl-stability-check.yml index 0ec2d019c..8336f71a3 100644 --- a/.github/config/assertoor/cl-stability-check.yml +++ b/.github/config/assertoor/cl-stability-check.yml @@ -24,7 +24,7 @@ tasks: - name: run_task_matrix title: "Check block proposals from all client pairs" - timeout: 4m + timeout: 6m configVars: matrixValues: "validatorPairNames" config: