Skip to content

Commit 3b393f0

Browse files
committed
Merge remote-tracking branch 'origin/main' into fix-compute-commitment-integrity-check
2 parents 43f1689 + 1f11447 commit 3b393f0

File tree

424 files changed

+4633
-3877
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

424 files changed

+4633
-3877
lines changed

.claude/settings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"Bash(make test-all:*)",
55
"Bash(go test:*)",
66
"Bash(go get:*)",
7-
"Bash(GOEXPERIMENT=synctest go vet:*)",
7+
"Bash(go vet:*)",
88
"Bash(make lint:*)",
99
"Bash(git fetch:*)",
1010
"Bash(go mod tidy:*)"

.github/workflows/kurtosis/pectra.io

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ snooper_enabled: false
2424
assertoor_params:
2525
run_stability_check: true
2626
run_block_proposal_check: true
27+
image: ethpandaops/assertoor:v0.0.17
2728
tests:
2829
- file: https://raw.githubusercontent.com/erigontech/erigon/refs/heads/main/.github/workflows/kurtosis/deposit-request.io
2930
- file: https://raw.githubusercontent.com/erigontech/erigon/refs/heads/main/.github/workflows/kurtosis/el-triggered-consolidations-test.io

.github/workflows/kurtosis/regular-assertoor.io

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ participants_matrix:
22
el:
33
- el_type: erigon
44
el_image: test/erigon:current
5+
el_log_level: "debug"
56
cl:
67
- cl_type: lighthouse
78
cl_image: sigp/lighthouse:v7.0.1
@@ -18,6 +19,7 @@ additional_services:
1819
assertoor_params:
1920
run_stability_check: false
2021
run_block_proposal_check: true
22+
image: ethpandaops/assertoor:v0.0.17
2123
tests:
2224
- https://raw.githubusercontent.com/ethpandaops/assertoor-test/master/assertoor-tests/all-opcodes-test.yaml
2325
- https://raw.githubusercontent.com/ethpandaops/assertoor-test/master/assertoor-tests/blob-transactions-test.yaml

.github/workflows/qa-rpc-integration-tests-latest.yml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ jobs:
6767
--stop-erigon=False \
6868
--erigon-pid=$ERIGON_PID
6969
fi
70+
7071
- name: Pause the Erigon instance dedicated to db maintenance
7172
run: |
7273
python3 $ERIGON_QA_PATH/test_system/db-producer/pause_production.py || true
@@ -107,9 +108,6 @@ jobs:
107108
# Capture monitoring script exit status
108109
test_exit_status=$?
109110
110-
# Save the subsection reached status
111-
echo "test_executed=true" >> $GITHUB_OUTPUT
112-
113111
# Check test runner script exit status
114112
if [ $test_exit_status -eq 0 ]; then
115113
echo "Tip-chasing completed successfully"
@@ -120,6 +118,13 @@ jobs:
120118
exit 1
121119
fi
122120
121+
- name: Upload pre-test logs on failure
122+
if: failure() && steps.pre_test_step.outcome == 'failure'
123+
uses: actions/upload-artifact@v6
124+
with:
125+
name: pre-test-logs
126+
path: ${{ env.ERIGON_TESTBED_DATA_DIR }}/logs/
127+
123128
- name: Run RPC Integration Tests
124129
id: test_step
125130
run: |
@@ -210,7 +215,7 @@ jobs:
210215
db_version="no-version"
211216
fi
212217
213-
python3 $ERIGON_QA_PATH/test_system/qa-tests/uploads/upload_test_results.py --repo erigon --commit $(git rev-parse HEAD) --branch ${{ github.ref_name }} --test_name rpc-integration-tests --chain $CHAIN --runner ${{ runner.name }} --db_version $db_version --outcome $TEST_RESULT #--result_file ${{ github.workspace }}/result-$CHAIN.json
218+
python3 $ERIGON_QA_PATH/test_system/qa-tests/uploads/upload_test_results.py --repo erigon --commit $(git rev-parse HEAD) --branch ${{ github.ref_name }} --test_name rpc-integration-tests-latest --chain $CHAIN --runner ${{ runner.name }} --db_version $db_version --outcome $TEST_RESULT #--result_file ${{ github.workspace }}/result-$CHAIN.json
214219
215220
- name: Delete Erigon Testbed Data Directory
216221
if: always() && steps.save_datadir_step.outputs.datadir_saved == 'true'

.github/workflows/qa-sync-with-externalcl.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
TRACKING_TIME_SECONDS: 3600 # 1 hour
3232
TOTAL_TIME_SECONDS: 28800 # 8 hours
3333
ERIGON_ASSERT: true
34-
LIGHTHOUSE_VERSION: v8.0.1
34+
LIGHTHOUSE_VERSION: v8.1.0
3535

3636
steps:
3737
- name: Check out repository

.github/workflows/qa-tip-tracking-with-load.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ jobs:
244244
branch_name="release"
245245
commit=$(git -C $GETH_INSTALL_DIR rev-parse --short HEAD)
246246
fi
247-
247+
248248
# Detect the pre-built db version
249249
if [ "$client" == "erigon" ]; then
250250
db_version=$(python3 $ERIGON_QA_PATH/test_system/qa-tests/uploads/prod_info.py $ERIGON_REFERENCE_DATA_DIR/../production.ini production erigon_repo_commit)

.github/workflows/scripts/run_rpc_tests_ethereum.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,4 @@ DISABLED_TEST_LIST=(
4343
DISABLED_TESTS=$(IFS=,; echo "${DISABLED_TEST_LIST[*]}")
4444

4545
# Call the main test runner script with the required and optional parameters
46-
"$(dirname "$0")/run_rpc_tests.sh" mainnet v1.118.0 "$DISABLED_TESTS" "$WORKSPACE" "$RESULT_DIR"
46+
"$(dirname "$0")/run_rpc_tests.sh" mainnet v1.119.0 "$DISABLED_TESTS" "$WORKSPACE" "$RESULT_DIR"

.github/workflows/scripts/run_rpc_tests_ethereum_latest.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,4 @@ DISABLED_TEST_LIST=(
3434
DISABLED_TESTS=$(IFS=,; echo "${DISABLED_TEST_LIST[*]}")
3535

3636
# Call the main test runner script with the required and optional parameters
37-
"$(dirname "$0")/run_rpc_tests.sh" mainnet v1.118.0 "$DISABLED_TESTS" "$WORKSPACE" "$RESULT_DIR" "latest" "$REFERENCE_HOST" "do-not-compare-error-message" "$DUMP_RESPONSE"
37+
"$(dirname "$0")/run_rpc_tests.sh" mainnet v1.119.0 "$DISABLED_TESTS" "$WORKSPACE" "$RESULT_DIR" "latest" "$REFERENCE_HOST" "do-not-compare-error-message" "$DUMP_RESPONSE"

.github/workflows/scripts/run_rpc_tests_gnosis.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@ DISABLED_TEST_LIST=(
2222
DISABLED_TESTS=$(IFS=,; echo "${DISABLED_TEST_LIST[*]}")
2323

2424
# Call the main test runner script with the required and optional parameters
25-
"$(dirname "$0")/run_rpc_tests.sh" gnosis v1.118.0 "$DISABLED_TESTS" "$WORKSPACE" "$RESULT_DIR"
25+
"$(dirname "$0")/run_rpc_tests.sh" gnosis v1.119.0 "$DISABLED_TESTS" "$WORKSPACE" "$RESULT_DIR"
2626

.github/workflows/scripts/run_rpc_tests_remote_ethereum.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@ DISABLED_TEST_LIST=(
2828
DISABLED_TESTS=$(IFS=,; echo "${DISABLED_TEST_LIST[*]}")
2929

3030
# Call the main test runner script with the required and optional parameters
31-
"$(dirname "$0")/run_rpc_tests.sh" mainnet v1.118.0 "$DISABLED_TESTS" "$WORKSPACE" "$RESULT_DIR"
31+
"$(dirname "$0")/run_rpc_tests.sh" mainnet v1.119.0 "$DISABLED_TESTS" "$WORKSPACE" "$RESULT_DIR"

0 commit comments

Comments
 (0)