diff --git a/.github/workflows/ci-cd-main-branch-docker-images.yml b/.github/workflows/ci-cd-main-branch-docker-images.yml
index 080440bd4b7..f659295562f 100644
--- a/.github/workflows/ci-cd-main-branch-docker-images.yml
+++ b/.github/workflows/ci-cd-main-branch-docker-images.yml
@@ -3,8 +3,8 @@ run-name: "Commit id ${{ github.sha }}: CI-CD build and deploy docker images bas
env:
APPLICATION: "erigon"
- BUILDER_IMAGE: "golang:1.22.6-alpine3.20"
- TARGET_BASE_IMAGE: "alpine:3.20.2"
+ BUILDER_IMAGE: "golang:1.23.1-alpine3.20"
+ TARGET_BASE_IMAGE: "alpine:3.20.3"
APP_REPO: "erigontech/erigon"
CHECKOUT_REF: "main"
DOCKERHUB_REPOSITORY: "erigontech/erigon"
@@ -33,6 +33,14 @@ jobs:
ref: ${{ env.CHECKOUT_REF }}
path: 'erigon'
+ - name: Setup go env and cache
+ uses: actions/setup-go@v5
+ with:
+ go-version: '>=1.22'
+ go-version-file: 'erigon/go.mod'
+ cache-dependency-path: |
+ erigon/go.sum
+
- name: Get commit id
id: getCommitId
run: |
@@ -53,16 +61,42 @@ jobs:
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@988b5a0280414f521da01fcc63a27aeeb4b104db ## v3.6.1
+ - name: Build arm64
+ run: |
+ docker run --platform linux/arm64 \
+ --rm -v $(pwd)/erigon:/erigon:ro \
+ -v $(pwd)/build-arm64:/erigon-build \
+ -v ${HOME}/.cache/go-build/arm64:/root/.cache/go-build \
+ -v ${HOME}/go/pkg/mod:/go/pkg/mod \
+ -w /erigon --entrypoint /bin/sh \
+ ${{ env.BUILDER_IMAGE }} \
+ -c "apk update; apk add make git gcc libstdc++ build-base linux-headers bash ca-certificates; git config --global --add safe.directory /erigon; make GOARCH=arm64 GOBIN=/erigon-build BUILD_TAGS=nosqlite,noboltdb,nosilkworm erigon integration rpcdaemon"
+
+ - name: Build amd64
+ run: |
+ docker run --platform linux/amd64 \
+ --rm -v $(pwd)/erigon:/erigon:ro \
+ -v $(pwd)/build-amd64:/erigon-build \
+ -v ${HOME}/.cache/go-build/amd64:/root/.cache/go-build \
+ -v ${HOME}/go/pkg/mod:/go/pkg/mod \
+ -w /erigon --entrypoint /bin/sh \
+ ${{ env.BUILDER_IMAGE }} \
+ -c "apk update; apk add make git gcc libstdc++ build-base linux-headers bash ca-certificates; git config --global --add safe.directory /erigon; make GOARCH=amd64 GOAMD64=v2 GOBIN=/erigon-build BUILD_TAGS=nosqlite,noboltdb,nosilkworm erigon integration rpcdaemon"
+
- name: Build and push multi-platform docker image based on the commit id ${{ steps.getCommitId.outputs.short_commit_id }} in the main branch
env:
BUILD_VERSION: "main-${{ steps.getCommitId.outputs.short_commit_id }}"
DOCKER_URL: ${{ env.DOCKERHUB_REPOSITORY }}
DOCKERFILE_PATH: Dockerfile.release
run: |
+ cp -vr build-amd64 erigon/
+ cp -vr build-arm64 erigon/
cd erigon
docker buildx build \
--file ${{ env.DOCKERFILE_PATH }} \
--target ci-cd-main-branch \
+ --attest type=provenance,mode=max \
+ --sbom=true \
--build-arg CI_CD_MAIN_TARGET_BASE_IMAGE=${{ env.TARGET_BASE_IMAGE }} \
--build-arg CI_CD_MAIN_BUILDER_IMAGE=${{ env.BUILDER_IMAGE }} \
--tag ${{ env.DOCKER_URL }}:${{ env.BUILD_VERSION }} \
diff --git a/.github/workflows/ci-cd-main-branch-docker-images2.yml b/.github/workflows/ci-cd-main-branch-docker-images2.yml
new file mode 100644
index 00000000000..b71849b388f
--- /dev/null
+++ b/.github/workflows/ci-cd-main-branch-docker-images2.yml
@@ -0,0 +1,133 @@
+name: 2CI-CD build and deploy docker images based on the last commit in the main branch
+run-name: "Commit id ${{ github.sha }}: CI-CD build and deploy docker images based on the commit id in the main branch"
+
+env:
+ APPLICATION: "erigon"
+ BUILDER_IMAGE: "golang:1.23.1-alpine3.20"
+ TARGET_BASE_IMAGE: "alpine:3.20.3"
+ APP_REPO: "erigontech/erigon"
+ CHECKOUT_REF: "main"
+ DOCKERHUB_REPOSITORY: "erigontech/erigon"
+ LABEL_DESCRIPTION: "[docker image built on a last commit id from the main branch] Erigon is an implementation of Ethereum (execution layer with embeddable consensus layer), on the efficiency frontier. Archive Node by default."
+
+on:
+ push:
+ branches:
+ - 'kurtosis_fix4'
+ workflow_dispatch:
+
+jobs:
+
+ Build:
+ runs-on: ubuntu-22.04
+ timeout-minutes: 45
+
+ steps:
+ - name: Fast checkout git repository
+ uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 ## 4.1.7 release
+ with:
+ repository: ${{ env.APP_REPO }}
+ fetch-depth: 1
+ ref: ${{ env.CHECKOUT_REF }}
+ path: 'erigon'
+
+ - name: Setup go env and cache
+ uses: actions/setup-go@v5
+ with:
+ go-version: '>=1.22'
+ go-version-file: 'erigon/go.mod'
+ cache-dependency-path: |
+ erigon/go.sum
+
+ - name: Get commit id
+ id: getCommitId
+ run: |
+ cd erigon
+ echo "id=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
+ echo "short_commit_id=$(git rev-parse --short=7 HEAD)" >> $GITHUB_OUTPUT
+ cd ..
+
+ - name: Login to Docker Hub
+ uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 ## v3.3.0
+ with:
+ username: ${{ secrets.ORG_DOCKERHUB_ERIGONTECH_USERNAME }}
+ password: ${{ secrets.ORG_DOCKERHUB_ERIGONTECH_TOKEN }}
+
+ - name: Set up QEMU
+ uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf ## v3.2.0
+
+ - name: Set up Docker Buildx
+ uses: docker/setup-buildx-action@988b5a0280414f521da01fcc63a27aeeb4b104db ## v3.6.1
+
+ - name: Build arm64
+ run: |
+ docker run --platform linux/arm64 \
+ --rm -v $(pwd)/erigon:/erigon:ro \
+ -v $(pwd)/build-arm64:/erigon-build \
+ -v ${HOME}/.cache/go-build/arm64:/root/.cache/go-build \
+ -v ${HOME}/go/pkg/mod:/go/pkg/mod \
+ -w /erigon --entrypoint /bin/sh \
+ ${{ env.BUILDER_IMAGE }} \
+ -c "apk update; apk add make git gcc libstdc++ build-base linux-headers bash ca-certificates; git config --global --add safe.directory /erigon; make GOARCH=arm64 GOBIN=/erigon-build BUILD_TAGS=nosqlite,noboltdb,nosilkworm erigon integration rpcdaemon"
+
+ - name: Build amd64
+ run: |
+ docker run --platform linux/amd64 \
+ --rm -v $(pwd)/erigon:/erigon:ro \
+ -v $(pwd)/build-amd64:/erigon-build \
+ -v ${HOME}/.cache/go-build/amd64:/root/.cache/go-build \
+ -v ${HOME}/go/pkg/mod:/go/pkg/mod \
+ -w /erigon --entrypoint /bin/sh \
+ ${{ env.BUILDER_IMAGE }} \
+ -c "apk update; apk add make git gcc libstdc++ build-base linux-headers bash ca-certificates; git config --global --add safe.directory /erigon; make GOARCH=amd64 GOAMD64=v2 GOBIN=/erigon-build BUILD_TAGS=nosqlite,noboltdb,nosilkworm erigon integration rpcdaemon"
+
+ - name: Build and push multi-platform docker image based on the commit id ${{ steps.getCommitId.outputs.short_commit_id }} in the main branch
+ env:
+ BUILD_VERSION: "main-${{ steps.getCommitId.outputs.short_commit_id }}"
+ DOCKER_URL: ${{ env.DOCKERHUB_REPOSITORY }}
+ DOCKERFILE_PATH: Dockerfile.release
+ run: |
+ cp -vr build-amd64 erigon/
+ cp -vr build-arm64 erigon/
+ cd erigon
+ docker buildx build \
+ --file ${{ env.DOCKERFILE_PATH }} \
+ --target ci-cd-main-branch \
+ --attest type=provenance,mode=max \
+ --sbom=true \
+ --build-arg CI_CD_MAIN_TARGET_BASE_IMAGE=${{ env.TARGET_BASE_IMAGE }} \
+ --build-arg CI_CD_MAIN_BUILDER_IMAGE=${{ env.BUILDER_IMAGE }} \
+ --tag ${{ env.DOCKER_URL }}:${{ env.BUILD_VERSION }} \
+ --tag ${{ env.DOCKER_URL }}:main-latest \
+ --label org.opencontainers.image.created=$(date -u +'%Y-%m-%dT%H:%M:%SZ') \
+ --label org.opencontainers.image.authors="https://github.com/erigontech/erigon/graphs/contributors" \
+ --label org.opencontainers.image.url="https://github.com/erigontech/erigon/blob/main/Dockerfile" \
+ --label org.opencontainers.image.documentation="https://github.com/erigontech/erigon/blob/main/Dockerfile" \
+ --label org.opencontainers.image.source="https://github.com/erigontech/erigon/blob/main/Dockerfile" \
+ --label org.opencontainers.image.version=${{ steps.getCommitId.outputs.id }} \
+ --label org.opencontainers.image.revision=${{ steps.getCommitId.outputs.id }} \
+ --label org.opencontainers.image.vcs-ref-short=${{ steps.getCommitId.outputs.short_commit_id }} \
+ --label org.opencontainers.image.vendor="${{ github.repository_owner }}" \
+ --label org.opencontainers.image.description="${{ env.LABEL_DESCRIPTION }}" \
+ --label org.opencontainers.image.base.name="${{ env.TARGET_BASE_IMAGE }}" \
+ --push \
+ --platform linux/amd64,linux/arm64 .
+
+ - name: Print docker images published
+ run: |
+ echo The following docker images have been published:
+ echo "${{ env.DOCKERHUB_REPOSITORY }}:main-${{ steps.getCommitId.outputs.short_commit_id }}"
+ echo "${{ env.DOCKERHUB_REPOSITORY }}:main-latest"
+
+ ## upload commit id for use in test-kurtosis-assertoor.yml
+ ## reference: https://docs.github.com/en/actions/writing-workflows/choosing-when-your-workflow-runs/events-that-trigger-workflows#using-data-from-the-triggering-workflow
+ - name: Save commit id
+ run: |
+ mkdir -p ./COMMIT_ID_DOCKER_BUILD
+ echo "${{ steps.getCommitId.outputs.short_commit_id }}" >> ./COMMIT_ID_DOCKER_BUILD/commit
+
+ - uses: actions/upload-artifact@v4
+ with:
+ name: commit
+ path: COMMIT_ID_DOCKER_BUILD
+
\ No newline at end of file
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9346512b905..7360e1e5889 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -38,7 +38,7 @@ jobs:
fetch-depth: 0
- uses: actions/setup-go@v5
with:
- go-version: '1.21'
+ go-version: '1.22'
- name: Install dependencies on Linux
if: runner.os == 'Linux'
run: sudo apt update && sudo apt install build-essential
@@ -61,7 +61,6 @@ jobs:
uses: golangci/golangci-lint-action@v6
with:
version: v1.59.1
- skip-build-cache: true
args: --help
- name: Lint
@@ -86,15 +85,16 @@ jobs:
# os: [ windows-2022 ]
# runs-on: ${{ matrix.os }}
- # steps:
- # - name: configure Pagefile
- # uses: al-cheb/configure-pagefile-action@v1.3
- # with:
- # minimum-size: 8GB
- # - uses: actions/checkout@v4
- # - uses: actions/setup-go@v5
- # with:
- # go-version: '1.21'
+#
+# steps:
+# - name: configure Pagefile
+# uses: al-cheb/configure-pagefile-action@v1.4
+# with:
+# minimum-size: 8GB
+# - uses: actions/checkout@v4
+# - uses: actions/setup-go@v5
+# with:
+# go-version: '1.22'
# - uses: actions/cache@v4
# with:
@@ -115,31 +115,3 @@ jobs:
# - name: Test erigon-lib
# run: cd erigon-lib && make test-no-fuzz
-
- docker-build-check:
- # don't run this on main - the PR must have run it to be merged and it misleads that this pushes the docker image
- if: (${{ github.event_name == 'push' || !github.event.pull_request.draft }}) && ${{ github.ref != 'refs/heads/main' }}
- runs-on: ubuntu-22.04
-
- steps:
- - uses: AutoModality/action-clean@v1
- - uses: actions/checkout@v4
- with:
- fetch-depth: 0 # fetch git tags for "git describe"
-
- - name: make docker (see dockerhub for image builds)
- run: DOCKER_TAG=thorax/erigon:ci-$GITHUB_SHA DOCKER_UID=$(id -u) DOCKER_GID=$(id -g) make docker
-
- # check with root permissions, should be cached from previous build
- - name: sudo make docker
- run: sudo DOCKER_TAG=thorax/erigon:ci-$GITHUB_SHA DOCKER_UID=$(id -u) DOCKER_GID=$(id -g) make docker
-
-# automated-tests:
-# runs-on:
-# ubuntu-22.04
-# if: ${{ github.event_name == 'push' || !github.event.pull_request.draft }}
-# steps:
-# - uses: actions/checkout@v4
-#
-# - name: run automated testing
-# run: BUILD_ERIGON=1 ./tests/automated-testing/run.sh
diff --git a/.github/workflows/docker-tags.yml b/.github/workflows/docker-tags.yml
index ebfaa441f52..99ed66f921c 100644
--- a/.github/workflows/docker-tags.yml
+++ b/.github/workflows/docker-tags.yml
@@ -32,8 +32,6 @@ jobs:
- run: |
make release-dry-run
docker images
- # docker image push --all-tags thorax/erigon
- # docker image push --all-tags ghcr.io/erigontech/erigon
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
VERSION: ${GITHUB_REF#refs/tags/}
diff --git a/.github/workflows/hive-nightly.yml b/.github/workflows/hive-nightly.yml
index 7fc3e1da203..62641497f93 100644
--- a/.github/workflows/hive-nightly.yml
+++ b/.github/workflows/hive-nightly.yml
@@ -14,17 +14,10 @@ jobs:
with:
fetch-depth: 0 # fetch git tags for "git describe"
- - name: build erigon image
- run: DOCKER_TAG=thorax/erigon:ci-$GITHUB_SHA DOCKER_UID=$(id -u) DOCKER_GID=$(id -g) make docker
-
- # check with root permissions, should be cached from previous build
- - name: build erigon image (root permissions)
- run: sudo DOCKER_TAG=thorax/erigon:ci-$GITHUB_SHA DOCKER_UID=$(id -u) DOCKER_GID=$(id -g) make docker
-
- name: run hive and parse output
run: |
sudo mkdir -p /results-${{ github.run_id }}
- docker run --rm -v /var/run/docker.sock:/var/run/docker.sock -v ${{ github.workspace }}:/work thorax/hive:latest --sim ethereum/engine --results-root=/work/results-${{ github.run_id }} --client erigon_ci-$GITHUB_SHA --exit.fail=false
+ docker run --rm -v /var/run/docker.sock:/var/run/docker.sock -v ${{ github.workspace }}:/work thorax/hive:latest --sim ethereum/engine --results-root=/work/results-${{ github.run_id }} --client erigon --exit.fail=false
docker run --rm --pull always -v /var/run/docker.sock:/var/run/docker.sock -v ${{ github.workspace }}:/work --entrypoint /app/hivecioutput thorax/hive:latest --resultsdir=/work/results-${{ github.run_id }} --outdir=/work/results-${{ github.run_id }} --exclusionsfile=/work/hive/exclusions.json
- name: clean up containers
diff --git a/.github/workflows/qa-constrained-tip-tracking.yml b/.github/workflows/qa-constrained-tip-tracking.yml
new file mode 100644
index 00000000000..41e6297eef7
--- /dev/null
+++ b/.github/workflows/qa-constrained-tip-tracking.yml
@@ -0,0 +1,128 @@
+name: QA - Constrained Tip tracking
+
+on:
+ schedule:
+ - cron: '0 0 * * 1-6' # Run every night at 00:00 AM UTC except Sunday
+ workflow_dispatch: # Run manually
+ pull_request:
+ branches:
+ - qa_tests_contrained_tip_tracking
+ types:
+ - opened
+ - synchronize
+ - ready_for_review
+
+jobs:
+ constrained-tip-tracking-test:
+ runs-on: [self-hosted, Erigon3]
+ timeout-minutes: 600
+ env:
+ ERIGON_REFERENCE_DATA_DIR: /opt/erigon-versions/reference-version/datadir
+ ERIGON_TESTBED_DATA_DIR: /opt/erigon-testbed/datadir
+ ERIGON_QA_PATH: /home/qarunner/erigon-qa
+ TRACKING_TIME_SECONDS: 14400 # 4 hours
+ TOTAL_TIME_SECONDS: 28800 # 8 hours
+ CHAIN: mainnet
+
+ steps:
+ - name: Check out repository
+ uses: actions/checkout@v4
+
+ - name: Clean Erigon Build Directory
+ run: |
+ make clean
+
+ - name: Build Erigon
+ run: |
+ make erigon
+ working-directory: ${{ github.workspace }}
+
+ - name: Pause the Erigon instance dedicated to db maintenance
+ run: |
+ python3 $ERIGON_QA_PATH/test_system/db-producer/pause_production.py || true
+
+ - name: Restore Erigon Testbed Data Directory
+ run: |
+ rsync -a --delete $ERIGON_REFERENCE_DATA_DIR/ $ERIGON_TESTBED_DATA_DIR/
+
+ - name: Run Erigon, wait sync and check ability to maintain sync
+ id: test_step
+ run: |
+ set +e # Disable exit on error
+
+ # 1. Launch the testbed Erigon instance
+ # 2. Allow time for the Erigon to achieve synchronization
+ # 3. Begin timing the duration that Erigon maintains synchronization
+ prlimit --as=17179869184: python3 $ERIGON_QA_PATH/test_system/qa-tests/tip-tracking/run_and_check_tip_tracking.py \
+ ${{ github.workspace }}/build/bin $ERIGON_TESTBED_DATA_DIR $TRACKING_TIME_SECONDS $TOTAL_TIME_SECONDS Erigon3 $CHAIN
+
+ # Capture monitoring script exit status
+ test_exit_status=$?
+
+ # Save the subsection reached status
+ echo "::set-output name=test_executed::true"
+
+ # Clean up Erigon process if it's still running
+ if kill -0 $ERIGON_PID 2> /dev/null; then
+ echo "Terminating Erigon"
+ kill $ERIGON_PID
+ wait $ERIGON_PID
+ fi
+
+ # Check test runner script exit status
+ if [ $test_exit_status -eq 0 ]; then
+ echo "Tests completed successfully"
+ echo "TEST_RESULT=success" >> "$GITHUB_OUTPUT"
+ else
+ echo "Error detected during tests"
+ echo "TEST_RESULT=failure" >> "$GITHUB_OUTPUT"
+ fi
+
+ - name: Save test results
+ if: steps.test_step.outputs.test_executed == 'true'
+ env:
+ TEST_RESULT: ${{ steps.test_step.outputs.TEST_RESULT }}
+ run: |
+ db_version=$(python3 $ERIGON_QA_PATH/test_system/qa-tests/uploads/prod_info.py $ERIGON_REFERENCE_DATA_DIR/../production.ini production erigon_repo_commit)
+ if [ -z "$db_version" ]; then
+ db_version="no-version"
+ fi
+
+ 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 constrained-tip-tracking \
+ --chain $CHAIN \
+ --runner ${{ runner.name }} \
+ --db_version $db_version \
+ --outcome $TEST_RESULT \
+ --result_file ${{ github.workspace }}/result-$CHAIN.json
+
+ - name: Upload test results
+ if: steps.test_step.outputs.test_executed == 'true'
+ uses: actions/upload-artifact@v4
+ with:
+ name: test-results
+ path: |
+ ${{ github.workspace }}/result-${{ env.CHAIN }}.json
+ ${{ env.ERIGON_TESTBED_DATA_DIR }}/logs/erigon.log
+
+ - name: Delete Erigon Testbed Data Directory
+ if: always()
+ run: |
+ rm -rf $ERIGON_TESTBED_DATA_DIR
+
+ - name: Resume the Erigon instance dedicated to db maintenance
+ run: |
+ python3 $ERIGON_QA_PATH/test_system/db-producer/resume_production.py || true
+
+ - name: Action for Success
+ if: steps.test_step.outputs.TEST_RESULT == 'success'
+ run: echo "::notice::Tests completed successfully"
+
+ - name: Action for Not Success
+ if: steps.test_step.outputs.TEST_RESULT != 'success'
+ run: |
+ echo "::error::Error detected during tests"
+ exit 1
\ No newline at end of file
diff --git a/.github/workflows/qa-sync-from-scratch-minimal-node.yml b/.github/workflows/qa-sync-from-scratch-minimal-node.yml
index 0fd0ffb1f0f..c3281c8b27b 100644
--- a/.github/workflows/qa-sync-from-scratch-minimal-node.yml
+++ b/.github/workflows/qa-sync-from-scratch-minimal-node.yml
@@ -17,93 +17,93 @@ jobs:
CHAIN: mainnet
steps:
- - name: Check out repository
- uses: actions/checkout@v4
+ - name: Check out repository
+ uses: actions/checkout@v4
- - name: Clean Erigon Build & Data Directories
- run: |
- make clean
- rm -rf $ERIGON_DATA_DIR
+ - name: Clean Erigon Build & Data Directories
+ run: |
+ make clean
+ rm -rf $ERIGON_DATA_DIR
- - name: Build Erigon
- run: |
- make erigon
- working-directory: ${{ github.workspace }}
+ - name: Build Erigon
+ run: |
+ make erigon
+ working-directory: ${{ github.workspace }}
- - name: Pause the Erigon instance dedicated to db maintenance
- run: |
- python3 $ERIGON_QA_PATH/test_system/db-producer/pause_production.py || true
+ - name: Pause the Erigon instance dedicated to db maintenance
+ run: |
+ python3 $ERIGON_QA_PATH/test_system/db-producer/pause_production.py || true
- - name: Run Erigon and monitor chain sync
- id: test_step
- run: |
- set +e # Disable exit on error
-
- # Run Erigon, wait sync and check ability to maintain sync
- python3 $ERIGON_QA_PATH/test_system/qa-tests/tip-tracking/run_and_check_tip_tracking.py \
- ${{ github.workspace }}/build/bin $ERIGON_DATA_DIR $TRACKING_TIME_SECONDS $TOTAL_TIME_SECONDS Erigon3 $CHAIN minimal_node
-
- # Capture monitoring script exit status
- test_exit_status=$?
-
- # Save the subsection reached status
- echo "::set-output name=test_executed::true"
-
- # Clean up Erigon process if it's still running
- if kill -0 $ERIGON_PID 2> /dev/null; then
- echo "Terminating Erigon"
- kill $ERIGON_PID
- wait $ERIGON_PID
- fi
-
- # Check test runner script exit status
- if [ $test_exit_status -eq 0 ]; then
- echo "Tests completed successfully"
- echo "TEST_RESULT=success" >> "$GITHUB_OUTPUT"
- else
- echo "Error detected during tests"
- echo "TEST_RESULT=failure" >> "$GITHUB_OUTPUT"
- fi
+ - name: Run Erigon and monitor chain sync
+ id: test_step
+ run: |
+ set +e # Disable exit on error
+
+ # Run Erigon, wait sync and check ability to maintain sync
+ python3 $ERIGON_QA_PATH/test_system/qa-tests/tip-tracking/run_and_check_tip_tracking.py \
+ ${{ github.workspace }}/build/bin $ERIGON_DATA_DIR $TRACKING_TIME_SECONDS $TOTAL_TIME_SECONDS Erigon3 $CHAIN minimal_node
+
+ # Capture monitoring script exit status
+ test_exit_status=$?
+
+ # Save the subsection reached status
+ echo "::set-output name=test_executed::true"
+
+ # Clean up Erigon process if it's still running
+ if kill -0 $ERIGON_PID 2> /dev/null; then
+ echo "Terminating Erigon"
+ kill $ERIGON_PID
+ wait $ERIGON_PID
+ fi
+
+ # Check test runner script exit status
+ if [ $test_exit_status -eq 0 ]; then
+ echo "Tests completed successfully"
+ echo "TEST_RESULT=success" >> "$GITHUB_OUTPUT"
+ else
+ echo "Error detected during tests"
+ echo "TEST_RESULT=failure" >> "$GITHUB_OUTPUT"
+ fi
- - name: Save test results
- if: steps.test_step.outputs.test_executed == 'true'
- env:
- TEST_RESULT: ${{ steps.test_step.outputs.TEST_RESULT }}
- run: |
- 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 sync-from-scratch-minimal-node \
- --chain $CHAIN \
- --runner ${{ runner.name }} \
- --outcome $TEST_RESULT \
- --result_file ${{ github.workspace }}/result-$CHAIN.json
+ - name: Save test results
+ if: steps.test_step.outputs.test_executed == 'true'
+ env:
+ TEST_RESULT: ${{ steps.test_step.outputs.TEST_RESULT }}
+ run: |
+ 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 sync-from-scratch-minimal-node \
+ --chain $CHAIN \
+ --runner ${{ runner.name }} \
+ --outcome $TEST_RESULT \
+ --result_file ${{ github.workspace }}/result-$CHAIN.json
- - name: Upload test results
- if: steps.test_step.outputs.test_executed == 'true'
- uses: actions/upload-artifact@v4
- with:
- name: test-results
- path: |
- ${{ github.workspace }}/result-${{ env.CHAIN }}.json
- ${{ github.workspace }}/erigon_data/logs/erigon.log
+ - name: Upload test results
+ if: steps.test_step.outputs.test_executed == 'true'
+ uses: actions/upload-artifact@v4
+ with:
+ name: test-results
+ path: |
+ ${{ github.workspace }}/result-${{ env.CHAIN }}.json
+ ${{ github.workspace }}/erigon_data/logs/erigon.log
- - name: Clean up Erigon data directory
- if: always()
- run: |
- rm -rf $ERIGON_DATA_DIR
+ - name: Clean up Erigon data directory
+ if: always()
+ run: |
+ rm -rf $ERIGON_DATA_DIR
- - name: Resume the Erigon instance dedicated to db maintenance
- run: |
- python3 $ERIGON_QA_PATH/test_system/db-producer/resume_production.py || true
+ - name: Resume the Erigon instance dedicated to db maintenance
+ run: |
+ python3 $ERIGON_QA_PATH/test_system/db-producer/resume_production.py || true
- - name: Action for Success
- if: steps.test_step.outputs.TEST_RESULT == 'success'
- run: echo "::notice::Tests completed successfully"
+ - name: Action for Success
+ if: steps.test_step.outputs.TEST_RESULT == 'success'
+ run: echo "::notice::Tests completed successfully"
- - name: Action for Not Success
- if: steps.test_step.outputs.TEST_RESULT != 'success'
- run: |
- echo "::error::Error detected during tests"
- exit 1
\ No newline at end of file
+ - name: Action for Not Success
+ if: steps.test_step.outputs.TEST_RESULT != 'success'
+ run: |
+ echo "::error::Error detected during tests"
+ exit 1
\ No newline at end of file
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index d7707773d58..3ea90b60a86 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -2,8 +2,8 @@ name: Release
env:
APPLICATION: "erigon"
- BUILDER_IMAGE: "ghcr.io/goreleaser/goreleaser-cross:v1.21.13"
- DOCKER_BASE_IMAGE: "alpine:3.20.2"
+ BUILDER_IMAGE: "ghcr.io/goreleaser/goreleaser-cross:v1.22.7"
+ DOCKER_BASE_IMAGE: "alpine:3.20.3"
APP_REPO: "node-real/bsc-erigon"
PACKAGE: "github.com/node-real/bsc-erigon"
DOCKERHUB_REPOSITORY: "node-real/bsc-erigon"
@@ -32,7 +32,7 @@ on:
release_version:
required: true
type: string
- description: 'Release version number (Pattern - #.#.# , f.e. 2.41.3 or 3.0.0 or 3.0.0-alpha1 for pre-releases. Do not prefix it with "v".)'
+ description: 'Release version number (Pattern - v#.#.# , f.e. v2.60.8 or v3.0.0 or v3.0.0-alpha1 for pre-releases. Prefix it with "v".)'
perform_release:
required: false
type: boolean
@@ -111,7 +111,7 @@ jobs:
-e APPLICATION=${{ env.APPLICATION }} \
-v $(pwd):/${{ env.APPLICATION}} \
-v /var/run/docker.sock:/var/run/docker.sock \
- ${{ env.BUILDER_IMAGE }} release --clean --skip=validate,announce,publish
+ ${{ env.BUILDER_IMAGE }} release --timeout 60m0s --clean --skip=validate,announce,publish
echo "DEBUG: ls -lao in the working directory"
ls -lao
echo "DEBUG: content of the dist/ directory"
@@ -130,6 +130,8 @@ jobs:
--build-arg APPLICATION=${{ env.APPLICATION }} \
--tag ${{ env.DOCKER_URL }}:${{ env.BUILD_VERSION }} \
--target release \
+ --attest type=provenance,mode=max \
+ --sbom=true \
--label org.opencontainers.image.created=$(date -u +'%Y-%m-%dT%H:%M:%SZ') \
--label org.opencontainers.image.authors="https://github.com/erigontech/erigon/graphs/contributors" \
--label org.opencontainers.image.url="https://github.com/erigontech/erigon/blob/main/Dockerfile" \
@@ -142,7 +144,7 @@ jobs:
--label org.opencontainers.image.description="${{ env.LABEL_DESCRIPTION }}" \
--label org.opencontainers.image.base.name="${{ env.DOCKER_BASE_IMAGE }}" \
--push \
- --platform linux/amd64/v2,linux/arm64 .
+ --platform linux/amd64,linux/amd64/v2,linux/arm64 .
- name: Upload artifact -- linux/arm64
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a ## v4.3.6
@@ -162,38 +164,29 @@ jobs:
compression-level: 0
if-no-files-found: error
- - name: Upload artifact -- darwin/arm64
+ - name: Upload artifact -- linux/amd64/v2
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a ## v4.3.6
with:
- name: ${{ env.APPLICATION }}_${{ inputs.release_version }}_darwin_arm64.tar.gz
- path: ./dist/${{ env.APPLICATION }}_${{ inputs.release_version }}_darwin_arm64.tar.gz
+ name: ${{ env.APPLICATION }}_${{ inputs.release_version }}_linux_amd64v2.tar.gz
+ path: ./dist/${{ env.APPLICATION }}_${{ inputs.release_version }}_linux_amd64v2.tar.gz
retention-days: 1
compression-level: 0
if-no-files-found: error
- - name: Upload artifact -- darwin/amd64
- uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a ## v4.3.6
- with:
- name: ${{ env.APPLICATION }}_${{ inputs.release_version }}_darwin_amd64.tar.gz
- path: ./dist/${{ env.APPLICATION }}_${{ inputs.release_version }}_darwin_amd64.tar.gz
- retention-days: 1
- compression-level: 0
- if-no-files-found: error
-
- - name: Upload artifact -- windows/amd64
+ - name: Upload artifact -- darwin/arm64
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a ## v4.3.6
with:
- name: ${{ env.APPLICATION }}_${{ inputs.release_version }}_windows_amd64.zip
- path: ./dist/${{ env.APPLICATION }}_${{ inputs.release_version }}_windows_amd64.zip
+ name: ${{ env.APPLICATION }}_${{ inputs.release_version }}_darwin_arm64.tar.gz
+ path: ./dist/${{ env.APPLICATION }}_${{ inputs.release_version }}_darwin_arm64.tar.gz
retention-days: 1
compression-level: 0
if-no-files-found: error
- - name: Upload artifact -- checksum
+ - name: Upload artifact -- darwin/amd64
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a ## v4.3.6
with:
- name: ${{ env.APPLICATION }}_${{ inputs.release_version }}_checksums.txt
- path: ./dist/${{ env.APPLICATION }}_${{ inputs.release_version }}_checksums.txt
+ name: ${{ env.APPLICATION }}_${{ inputs.release_version }}_darwin_amd64.tar.gz
+ path: ./dist/${{ env.APPLICATION }}_${{ inputs.release_version }}_darwin_amd64.tar.gz
retention-days: 1
compression-level: 0
if-no-files-found: error
@@ -207,7 +200,7 @@ jobs:
# git tag -a ${{ inputs.release_version }} -m "Release ${{ inputs.release_version }}"
# git push origin ${{ inputs.release_version }}
- - name: Publish draft of the Release notes with assets (without windows .zip) in case perform_release is set
+ - name: Publish draft of the Release notes with assets in case perform_release is set
if: ${{ inputs.perform_release }}
env:
GH_TOKEN: ${{ github.token }}
@@ -216,10 +209,12 @@ jobs:
GITHUB_RELEASE_TARGET: ${{ inputs.checkout_ref }}
run: |
cd dist
- gh release create ${{ inputs.release_version }} *.tar.gz *_checksums.txt \
+ sha256sum *.tar.gz > ${HOME}/${{ env.APPLICATION }}_${{ inputs.release_version }}_checksums.txt
+ gh release create \
--generate-notes \
--target ${GITHUB_RELEASE_TARGET} \
--draft=true \
--title "${{ inputs.release_version }}" \
- --notes "**Improvements:**
- ...coming soon
**Bugfixes:**
- ...coming soon
**Docker images:**
Docker image released:
${{ env.DOCKER_TAGS }}
... coming soon
"
-
+ --notes "**Improvements:**
- ...coming soon
**Bugfixes:**
- ...coming soon
**Docker images:**
Docker image released:
${{ env.DOCKER_TAGS }}
... coming soon
" \
+ "${{ inputs.release_version }}" \
+ *.tar.gz ${HOME}/${{ env.APPLICATION }}_${{ inputs.release_version }}_checksums.txt
\ No newline at end of file
diff --git a/.github/workflows/test-erigon-is-library.yml b/.github/workflows/test-erigon-is-library.yml
index f14e324955d..e165dca93b7 100644
--- a/.github/workflows/test-erigon-is-library.yml
+++ b/.github/workflows/test-erigon-is-library.yml
@@ -20,7 +20,7 @@ jobs:
- run: git submodule update --init --recursive --force
- uses: actions/setup-go@v5
with:
- go-version: '1.21'
+ go-version: '1.22'
- name: Install dependencies on Linux
if: runner.os == 'Linux'
run: sudo apt update && sudo apt install build-essential
diff --git a/.github/workflows/test-integration-caplin.yml b/.github/workflows/test-integration-caplin.yml
index c3ad6a11e28..f343012fdea 100644
--- a/.github/workflows/test-integration-caplin.yml
+++ b/.github/workflows/test-integration-caplin.yml
@@ -26,7 +26,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
- go-version: '1.21'
+ go-version: '1.22'
- name: Install dependencies on Linux
if: runner.os == 'Linux'
run: sudo apt update && sudo apt install build-essential
@@ -44,7 +44,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
- go-version: '1.21'
+ go-version: '1.22'
- uses: actions/cache@v4
with:
diff --git a/.github/workflows/test-integration.yml b/.github/workflows/test-integration.yml
index 68719e5f364..c7462a8d262 100644
--- a/.github/workflows/test-integration.yml
+++ b/.github/workflows/test-integration.yml
@@ -31,7 +31,7 @@ jobs:
- run: git submodule update --init --recursive --force
- uses: actions/setup-go@v5
with:
- go-version: '1.21'
+ go-version: '1.22'
- name: Install dependencies on Linux
if: runner.os == 'Linux'
run: sudo apt update && sudo apt install build-essential
@@ -50,7 +50,7 @@ jobs:
- run: git submodule update --init --recursive --force
- uses: actions/setup-go@v5
with:
- go-version: '1.21'
+ go-version: '1.22'
- uses: actions/cache@v4
with:
diff --git a/.github/workflows/test-kurtosis-assertoor.yml b/.github/workflows/test-kurtosis-assertoor.yml
index 123fcd69ea0..dc83533be93 100644
--- a/.github/workflows/test-kurtosis-assertoor.yml
+++ b/.github/workflows/test-kurtosis-assertoor.yml
@@ -1,12 +1,20 @@
name: Kurtosis Assertoor GitHub Action
-on:
-# schedule:
-# - cron: "0 2,14 * * *" # runs at 2am and 2pm UTC
- workflow_dispatch:
+#env:
+# DOCKERHUB_REPOSITORY: "erigontech/erigon"
+# APP_REPO: "erigontech/erigon"
+#
+#on:
+# workflow_run:
+# workflows: ["2CI-CD build and deploy docker images based on the last commit in the main branch"]
+# types:
+# - completed
+ # schedule:
+ # - cron: "0 2,14 * * *" # runs at 2am and 2pm UTC
+ # workflow_dispatch:
# pull_request:
# branches:
- # - sudeep/kurtosis_assertoor
+ # - kurtosis_ci_fix
# types:
# - opened
# - reopened
@@ -14,33 +22,98 @@ on:
# - ready_for_review
# push:
# branches:
- # - sudeep/kurtosis_assertoor
+ # - main
jobs:
+ define_matrix:
+ runs-on: ubuntu-latest
+ outputs:
+ os: ${{ steps.os.outputs.os }}
+
+ steps:
+ - name: Define os
+ id: os
+ run: echo 'os=["ubuntu-latest"]' >> "$GITHUB_OUTPUT"
+
assertoor_test:
+ needs: define_matrix
strategy:
matrix:
# list of os: https://github.com/actions/virtual-environments
os:
- - { id: ubuntu-22.04, name: ubuntu }
- runs-on: ${{ matrix.os.id }}
+ - ${{ fromJSON(needs.define_matrix.outputs.os) }}
+ runs-on: ${{ matrix.os }}
steps:
- - uses: actions/checkout@v4
- - name: make docker (see dockerhub for image builds)
- run: DOCKER_TAG=thorax/erigon:ci-$GITHUB_SHA DOCKER_UID=$(id -u) DOCKER_GID=$(id -g) make docker
+ - name: check failure of docker build workflow
+ if: ${{ github.event.workflow_run.conclusion == 'failure' }}
+ run: exit 1
+
+ - name: 'Download Artifact'
+ uses: actions/github-script@v6
+ with:
+ script: |
+ let allArtifacts = await github.rest.actions.listWorkflowRunArtifacts({
+ owner: context.repo.owner,
+ repo: context.repo.repo,
+ run_id: context.payload.workflow_run.id,
+ });
+ let matchArtifact = allArtifacts.data.artifacts.filter((artifact) => {
+ return artifact.name == "commit"
+ })[0];
+ let download = await github.rest.actions.downloadArtifact({
+ owner: context.repo.owner,
+ repo: context.repo.repo,
+ artifact_id: matchArtifact.id,
+ archive_format: 'zip',
+ });
+ let fs = require('fs');
+ fs.writeFileSync(`${process.env.GITHUB_WORKSPACE}/commit.zip`, Buffer.from(download.data));
+
+ - name: 'Extract commit id from triggering workflow artifact'
+ id: extractCommitId
+ run: |
+ unzip commit.zip
+ echo "commitId=$(cat commit)" >> "$GITHUB_OUTPUT
+
+
+ - name: Fast checkout git repository
+ uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 ## 4.1.7 release
+ with:
+ repository: ${{ env.APP_REPO }}
+ fetch-depth: 1
+ ref: ${{ steps.extractCommitId.outputs.commitId }}
+ path: 'erigon'
+ - name: Setup go env and cache
+ uses: actions/setup-go@v5
+ with:
+ go-version: '>=1.22'
+ go-version-file: 'erigon/go.mod'
+ cache-dependency-path: |
+ erigon/go.sum
+
+ - name: Get commit id
+ id: getCommitId
+ run: |
+ cd erigon
+ echo "id=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
+ echo "short_commit_id=$(git rev-parse --short=7 HEAD)" >> $GITHUB_OUTPUT
+ cd ..
- name: Install dependencies on Linux
if: runner.os == 'Linux'
run: sudo apt update && sudo apt install build-essential
- name: download kurtosis config
+ env:
+ BUILD_VERSION: "main-${{ steps.getCommitId.outputs.short_commit_id }}"
+ DOCKER_URL: ${{ env.DOCKERHUB_REPOSITORY }}
run: |
wget -O kurtosis_config_with_p.yaml https://raw.githubusercontent.com/erigontech/erigon/main/.github/workflows/kurtosis/config.yaml
- sed 's/<>/thorax\/erigon:ci-'$GITHUB_SHA'/' kurtosis_config_with_p.yaml > kurtosis_config.yaml
+ sed 's/<>/${{ env.DOCKER_URL }}:${{ env.BUILD_VERSION }}' kurtosis_config_with_p.yaml > kurtosis_config.yaml
- name: Run Kurtosis + assertoor tests
uses: ethpandaops/kurtosis-assertoor-github-action@v1
@@ -50,6 +123,20 @@ jobs:
#kurtosis_extra_args: --verbosity detailed --cli-log-level trace
enclave_dump: false
+ dnotifications:
+ name: Discord notification
+ needs:
+ - define_matrix
+ - assertoor_test
+ if: ${{ always() }}
+ strategy:
+ matrix:
+ # list of os: https://github.com/actions/virtual-environments
+ os:
+ - ${{ fromJSON(needs.define_matrix.outputs.os) }}
+ runs-on: ${{ matrix.os }}
+
+ steps:
- name: discord notifications push
uses: nobrayner/discord-webhook@v1
with:
diff --git a/.goreleaser.yml b/.goreleaser.yml
index e68ab395e8d..3dac010fa51 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -402,13 +402,14 @@ builds:
## End Darwin ARM64
-## Linux AMD64:
+## Linux AMD64 (v1, v2):
- id: linux-amd64-erigon
main: ./cmd/erigon
binary: erigon
goos: [ linux ]
goarch: [ amd64 ]
goamd64:
+ - v1
- v2
env:
- CC=x86_64-linux-gnu-gcc
@@ -429,6 +430,7 @@ builds:
goos: [ linux ]
goarch: [ amd64 ]
goamd64:
+ - v1
- v2
env:
- CC=x86_64-linux-gnu-gcc
@@ -449,6 +451,7 @@ builds:
goos: [ linux ]
goarch: [ amd64 ]
goamd64:
+ - v1
- v2
env:
- CC=x86_64-linux-gnu-gcc
@@ -469,6 +472,7 @@ builds:
goos: [ linux ]
goarch: [ amd64 ]
goamd64:
+ - v1
- v2
env:
- CC=x86_64-linux-gnu-gcc
@@ -489,6 +493,7 @@ builds:
goos: [ linux ]
goarch: [ amd64 ]
goamd64:
+ - v1
- v2
env:
- CC=x86_64-linux-gnu-gcc
@@ -509,6 +514,7 @@ builds:
goos: [ linux ]
goarch: [ amd64 ]
goamd64:
+ - v1
- v2
env:
- CC=x86_64-linux-gnu-gcc
@@ -529,6 +535,7 @@ builds:
goos: [ linux ]
goarch: [ amd64 ]
goamd64:
+ - v1
- v2
env:
- CC=x86_64-linux-gnu-gcc
@@ -549,6 +556,7 @@ builds:
goos: [ linux ]
goarch: [ amd64 ]
goamd64:
+ - v1
- v2
env:
- CC=x86_64-linux-gnu-gcc
@@ -569,6 +577,7 @@ builds:
goos: [ linux ]
goarch: [ amd64 ]
goamd64:
+ - v1
- v2
env:
- CC=x86_64-linux-gnu-gcc
@@ -589,6 +598,7 @@ builds:
goos: [ linux ]
goarch: [ amd64 ]
goamd64:
+ - v1
- v2
env:
- CC=x86_64-linux-gnu-gcc
@@ -602,7 +612,7 @@ builds:
ldflags:
- -s -w -extldflags "-static"
- -X {{ .Env.PACKAGE }}/params.GitCommit={{ .Env.GIT_COMMIT }} -X {{ .Env.PACKAGE }}/params.GitBranch={{ .Env.GIT_BRANCH }} -X {{ .Env.PACKAGE }}/params.GitTag={{ .Env.GIT_TAG }}
-## End of Linux AMD64
+## End of Linux AMD64 (v1, v2)
## Linux ARM64
@@ -788,242 +798,6 @@ builds:
## End of Linux ARM64
-## Windows AMD64:
- - id: windows-amd64-erigon
- main: ./cmd/erigon
- binary: erigon
- goos: [ windows ]
- goarch: [ amd64 ]
- env:
- - CC=x86_64-w64-mingw32-gcc
- - CXX=x86_64-w64-mingw32-g++
- - CGO_CFLAGS={{ .Env.CGO_CFLAGS_WINDOWS }}
- - CGO_LDFLAGS={{ .Env.CGO_LDFLAGS_DEFAULT }}
- - CMAKE_MDBX_BUILD_SHARED_LIBRARY:BOOL=OFF
- - CMAKE_MDBX_WITHOUT_MSVC_CRT:BOOOL=OFF
- - CMAKE_MDBX_BUILD_TIMESTAMP=unknown
- - CMAKE_MDBX_FORCE_ASSERTIONS:INT=0
- tags: [ nosqlite, noboltdb, nosilkworm ]
- flags:
- - -v
- - -trimpath
- - -buildvcs=false
- ldflags:
- - -s -w -extldflags "-static"
- - -X {{ .Env.PACKAGE }}/params.GitCommit={{ .Env.GIT_COMMIT }} -X {{ .Env.PACKAGE }}/params.GitBranch={{ .Env.GIT_BRANCH }} -X {{ .Env.PACKAGE }}/params.GitTag={{ .Env.GIT_TAG }}
-
- - id: windows-amd64-downloader
- main: ./cmd/downloader
- binary: downloader
- goos: [ windows ]
- goarch: [ amd64 ]
- env:
- - CC=x86_64-w64-mingw32-gcc
- - CXX=x86_64-w64-mingw32-g++
- - CGO_CFLAGS={{ .Env.CGO_CFLAGS_WINDOWS }}
- - CGO_LDFLAGS={{ .Env.CGO_LDFLAGS_DEFAULT }}
- - CMAKE_MDBX_BUILD_SHARED_LIBRARY:BOOL=OFF
- - CMAKE_MDBX_WITHOUT_MSVC_CRT:BOOOL=OFF
- - CMAKE_MDBX_BUILD_TIMESTAMP=unknown
- - CMAKE_MDBX_FORCE_ASSERTIONS:INT=0
- tags: [ nosqlite, noboltdb, nosilkworm ]
- flags:
- - -trimpath
- - -buildvcs=false
- ldflags:
- - -s -w -extldflags "-static"
- - -X {{ .Env.PACKAGE }}/params.GitCommit={{ .Env.GIT_COMMIT }} -X {{ .Env.PACKAGE }}/params.GitBranch={{ .Env.GIT_BRANCH }} -X {{ .Env.PACKAGE }}/params.GitTag={{ .Env.GIT_TAG }}
-
- - id: windows-amd64-devnet
- main: ./cmd/devnet
- binary: devnet
- goos: [ windows ]
- goarch: [ amd64 ]
- env:
- - CC=x86_64-w64-mingw32-gcc
- - CXX=x86_64-w64-mingw32-g++
- - CGO_CFLAGS={{ .Env.CGO_CFLAGS_WINDOWS }}
- - CGO_LDFLAGS={{ .Env.CGO_LDFLAGS_DEFAULT }}
- - CMAKE_MDBX_BUILD_SHARED_LIBRARY:BOOL=OFF
- - CMAKE_MDBX_WITHOUT_MSVC_CRT:BOOOL=OFF
- - CMAKE_MDBX_BUILD_TIMESTAMP=unknown
- - CMAKE_MDBX_FORCE_ASSERTIONS:INT=0
- tags: [ nosqlite, noboltdb, nosilkworm ]
- flags:
- - -trimpath
- - -buildvcs=false
- ldflags:
- - -s -w -extldflags "-static"
- - -X {{ .Env.PACKAGE }}/params.GitCommit={{ .Env.GIT_COMMIT }} -X {{ .Env.PACKAGE }}/params.GitBranch={{ .Env.GIT_BRANCH }} -X {{ .Env.PACKAGE }}/params.GitTag={{ .Env.GIT_TAG }}
-
- - id: windows-amd64-evm
- main: ./cmd/evm
- binary: evm
- goos: [ windows ]
- goarch: [ amd64 ]
- env:
- - CC=x86_64-w64-mingw32-gcc
- - CXX=x86_64-w64-mingw32-g++
- - CGO_CFLAGS={{ .Env.CGO_CFLAGS_WINDOWS }}
- - CGO_LDFLAGS={{ .Env.CGO_LDFLAGS_DEFAULT }}
- - CMAKE_MDBX_BUILD_SHARED_LIBRARY:BOOL=OFF
- - CMAKE_MDBX_WITHOUT_MSVC_CRT:BOOOL=OFF
- - CMAKE_MDBX_BUILD_TIMESTAMP=unknown
- - CMAKE_MDBX_FORCE_ASSERTIONS:INT=0
- tags: [ nosqlite, noboltdb, nosilkworm ]
- flags:
- - -trimpath
- - -buildvcs=false
- ldflags:
- - -s -w -extldflags "-static"
- - -X {{ .Env.PACKAGE }}/params.GitCommit={{ .Env.GIT_COMMIT }} -X {{ .Env.PACKAGE }}/params.GitBranch={{ .Env.GIT_BRANCH }} -X {{ .Env.PACKAGE }}/params.GitTag={{ .Env.GIT_TAG }}
-
- - id: windows-amd64-caplin
- main: ./cmd/caplin
- binary: caplin
- goos: [ windows ]
- goarch: [ amd64 ]
- env:
- - CC=x86_64-w64-mingw32-gcc
- - CXX=x86_64-w64-mingw32-g++
- - CGO_CFLAGS={{ .Env.CGO_CFLAGS_WINDOWS }}
- - CGO_LDFLAGS={{ .Env.CGO_LDFLAGS_DEFAULT }}
- - CMAKE_MDBX_BUILD_SHARED_LIBRARY:BOOL=OFF
- - CMAKE_MDBX_WITHOUT_MSVC_CRT:BOOOL=OFF
- - CMAKE_MDBX_BUILD_TIMESTAMP=unknown
- - CMAKE_MDBX_FORCE_ASSERTIONS:INT=0
- tags: [ nosqlite, noboltdb, nosilkworm ]
- flags:
- - -trimpath
- - -buildvcs=false
- ldflags:
- - -s -w -extldflags "-static"
- - -X {{ .Env.PACKAGE }}/params.GitCommit={{ .Env.GIT_COMMIT }} -X {{ .Env.PACKAGE }}/params.GitBranch={{ .Env.GIT_BRANCH }} -X {{ .Env.PACKAGE }}/params.GitTag={{ .Env.GIT_TAG }}
-
- - id: windows-amd64-diag
- main: ./cmd/diag
- binary: diag
- goos: [ windows ]
- goarch: [ amd64 ]
- env:
- - CC=x86_64-w64-mingw32-gcc
- - CXX=x86_64-w64-mingw32-g++
- - CGO_CFLAGS={{ .Env.CGO_CFLAGS_WINDOWS }}
- - CGO_LDFLAGS={{ .Env.CGO_LDFLAGS_DEFAULT }}
- - CMAKE_MDBX_BUILD_SHARED_LIBRARY:BOOL=OFF
- - CMAKE_MDBX_WITHOUT_MSVC_CRT:BOOOL=OFF
- - CMAKE_MDBX_BUILD_TIMESTAMP=unknown
- - CMAKE_MDBX_FORCE_ASSERTIONS:INT=0
- tags: [ nosqlite, noboltdb, nosilkworm ]
- flags:
- - -trimpath
- - -buildvcs=false
- ldflags:
- - -s -w -extldflags "-static"
- - -X {{ .Env.PACKAGE }}/params.GitCommit={{ .Env.GIT_COMMIT }} -X {{ .Env.PACKAGE }}/params.GitBranch={{ .Env.GIT_BRANCH }} -X {{ .Env.PACKAGE }}/params.GitTag={{ .Env.GIT_TAG }}
-
- - id: windows-amd64-integration
- main: ./cmd/integration
- binary: integration
- goos: [ windows ]
- goarch: [ amd64 ]
- env:
- - CC=x86_64-w64-mingw32-gcc
- - CXX=x86_64-w64-mingw32-g++
- - CGO_CFLAGS={{ .Env.CGO_CFLAGS_WINDOWS }}
- - CGO_LDFLAGS={{ .Env.CGO_LDFLAGS_DEFAULT }}
- - CMAKE_MDBX_BUILD_SHARED_LIBRARY:BOOL=OFF
- - CMAKE_MDBX_WITHOUT_MSVC_CRT:BOOOL=OFF
- - CMAKE_MDBX_BUILD_TIMESTAMP=unknown
- - CMAKE_MDBX_FORCE_ASSERTIONS:INT=0
- tags: [ nosqlite, noboltdb, nosilkworm ]
- flags:
- - -trimpath
- - -buildvcs=false
- ldflags:
- - -s -w -extldflags "-static"
- - -X {{ .Env.PACKAGE }}/params.GitCommit={{ .Env.GIT_COMMIT }} -X {{ .Env.PACKAGE }}/params.GitBranch={{ .Env.GIT_BRANCH }} -X {{ .Env.PACKAGE }}/params.GitTag={{ .Env.GIT_TAG }}
-
- - id: windows-amd64-rpcdaemon
- main: ./cmd/rpcdaemon
- binary: rpcdaemon
- goos: [ windows ]
- goarch: [ amd64 ]
- env:
- - CC=x86_64-w64-mingw32-gcc
- - CXX=x86_64-w64-mingw32-g++
- - CGO_CFLAGS={{ .Env.CGO_CFLAGS_WINDOWS }}
- - CGO_LDFLAGS={{ .Env.CGO_LDFLAGS_DEFAULT }}
- - CMAKE_MDBX_BUILD_SHARED_LIBRARY:BOOL=OFF
- - CMAKE_MDBX_WITHOUT_MSVC_CRT:BOOOL=OFF
- - CMAKE_MDBX_BUILD_TIMESTAMP=unknown
- - CMAKE_MDBX_FORCE_ASSERTIONS:INT=0
- tags: [ nosqlite, noboltdb, nosilkworm ]
- flags:
- - -trimpath
- - -buildvcs=false
- ldflags:
- - -s -w -extldflags "-static"
- - -X {{ .Env.PACKAGE }}/params.GitCommit={{ .Env.GIT_COMMIT }} -X {{ .Env.PACKAGE }}/params.GitBranch={{ .Env.GIT_BRANCH }} -X {{ .Env.PACKAGE }}/params.GitTag={{ .Env.GIT_TAG }}
-
- - id: windows-amd64-sentry
- main: ./cmd/sentry
- binary: sentry
- goos: [ windows ]
- goarch: [ amd64 ]
- env:
- - CC=x86_64-w64-mingw32-gcc
- - CXX=x86_64-w64-mingw32-g++
- - CGO_CFLAGS={{ .Env.CGO_CFLAGS_WINDOWS }}
- - CGO_LDFLAGS={{ .Env.CGO_LDFLAGS_DEFAULT }}
- - CMAKE_MDBX_BUILD_SHARED_LIBRARY:BOOL=OFF
- - CMAKE_MDBX_WITHOUT_MSVC_CRT:BOOOL=OFF
- - CMAKE_MDBX_BUILD_TIMESTAMP=unknown
- - CMAKE_MDBX_FORCE_ASSERTIONS:INT=0
- tags: [ nosqlite, noboltdb, nosilkworm ]
- flags:
- - -trimpath
- - -buildvcs=false
- ldflags:
- - -s -w -extldflags "-static"
- - -X {{ .Env.PACKAGE }}/params.GitCommit={{ .Env.GIT_COMMIT }} -X {{ .Env.PACKAGE }}/params.GitBranch={{ .Env.GIT_BRANCH }} -X {{ .Env.PACKAGE }}/params.GitTag={{ .Env.GIT_TAG }}
-
- - id: windows-amd64-txpool
- main: ./cmd/txpool
- binary: txpool
- goos: [ windows ]
- goarch: [ amd64 ]
- env:
- - CC=x86_64-w64-mingw32-gcc
- - CXX=x86_64-w64-mingw32-g++
- - CGO_CFLAGS={{ .Env.CGO_CFLAGS_WINDOWS }}
- - CGO_LDFLAGS={{ .Env.CGO_LDFLAGS_DEFAULT }}
- - CMAKE_MDBX_BUILD_SHARED_LIBRARY:BOOL=OFF
- - CMAKE_MDBX_WITHOUT_MSVC_CRT:BOOOL=OFF
- - CMAKE_MDBX_BUILD_TIMESTAMP=unknown
- - CMAKE_MDBX_FORCE_ASSERTIONS:INT=0
- tags: [ nosqlite, noboltdb, nosilkworm ]
- flags:
- - -trimpath
- - -buildvcs=false
- ldflags:
- - -s -w -extldflags "-static"
- - -X {{ .Env.PACKAGE }}/params.GitCommit={{ .Env.GIT_COMMIT }} -X {{ .Env.PACKAGE }}/params.GitBranch={{ .Env.GIT_BRANCH }} -X {{ .Env.PACKAGE }}/params.GitTag={{ .Env.GIT_TAG }}
-## Windows AMD64
-
-
-## Checksums
-checksum:
- name_template: "{{ .Env.APPLICATION }}_{{ .Env.BUILD_VERSION }}_checksums.txt"
- algorithm: sha256
- ids:
- - linux-arm64
- - linux-amd64
- - darwin-amd64
- - darwin-arm64
- # - windows-amd64
-
-
archives:
- id: linux-arm64
builds:
@@ -1053,7 +827,7 @@ archives:
- linux-amd64-rpcdaemon
- linux-amd64-sentry
- linux-amd64-txpool
- name_template: "{{ .Env.APPLICATION }}_{{ .Env.BUILD_VERSION }}_{{ .Os }}_{{ .Arch }}"
+ name_template: '{{ .Env.APPLICATION }}_{{ .Env.BUILD_VERSION }}_{{ .Os }}_{{ .Arch }}{{ if not (eq .Amd64 "v1") }}{{ .Amd64 }}{{ end }}'
wrap_in_directory: true
format: tar.gz
@@ -1088,19 +862,3 @@ archives:
name_template: "{{ .Env.APPLICATION }}_{{ .Env.BUILD_VERSION }}_{{ .Os }}_{{ .Arch }}"
wrap_in_directory: true
format: tar.gz
-
- - id: windows-amd64
- builds:
- - windows-amd64-erigon
- - windows-amd64-downloader
- - windows-amd64-devnet
- - windows-amd64-evm
- - windows-amd64-caplin
- - windows-amd64-diag
- - windows-amd64-integration
- - windows-amd64-rpcdaemon
- - windows-amd64-sentry
- - windows-amd64-txpool
- name_template: "{{ .Env.APPLICATION }}_{{ .Env.BUILD_VERSION }}_{{ .Os }}_{{ .Arch }}"
- wrap_in_directory: true
- format: zip
\ No newline at end of file
diff --git a/ChangeLog.md b/ChangeLog.md
new file mode 100644
index 00000000000..03a0d079a2d
--- /dev/null
+++ b/ChangeLog.md
@@ -0,0 +1,12 @@
+ChangeLog
+---------
+
+## v3.0.0-alpha5 (in development)
+
+### TODO
+
+Acknowledgements:
+
+New features:
+
+Fixes:
diff --git a/Dockerfile.release b/Dockerfile.release
index a43ba5ffd0b..f23352ec274 100644
--- a/Dockerfile.release
+++ b/Dockerfile.release
@@ -18,12 +18,13 @@ ARG RELEASE_DOCKER_BASE_IMAGE="alpine:3.20.1" \
### Release Dockerfile
FROM ${RELEASE_DOCKER_BASE_IMAGE} AS temporary
ARG TARGETARCH \
+ TARGETVARIANT \
VERSION=${VERSION} \
APPLICATION
-COPY ./dist/${APPLICATION}_${VERSION}_linux_${TARGETARCH}.tar.gz /tmp/${APPLICATION}.tar.gz
+COPY ./dist/${APPLICATION}_${VERSION}_linux_${TARGETARCH}${TARGETVARIANT}.tar.gz /tmp/${APPLICATION}.tar.gz
RUN tar xzvf /tmp/${APPLICATION}.tar.gz -C /tmp && \
- mv /tmp/${APPLICATION}_${VERSION}_linux_${TARGETARCH} /tmp/${APPLICATION}
+ mv /tmp/${APPLICATION}_${VERSION}_linux_${TARGETARCH}${TARGETVARIANT} /tmp/${APPLICATION}
FROM ${RELEASE_DOCKER_BASE_IMAGE} AS release
@@ -60,35 +61,26 @@ ENTRYPOINT [ "/usr/local/bin/erigon" ]
### CI-CD : main branch docker image publishing for each new commit id
FROM ${CI_CD_MAIN_BUILDER_IMAGE} AS ci-cd-main-branch-builder
-ARG TARGETOS \
- TARGETARCH
+COPY /build-amd64 /build-amd64/
+COPY /build-arm64 /build-arm64/
-ENV GOOS=$TARGETOS \
- GOARCH=$TARGETARCH
+RUN echo "DEBUG: content of build-amd64" && ls -l /build-amd64 && \
+ echo && \
+ echo "DEBUG: content of build-arm64" && ls -l /build-arm64
-COPY . /home/erigon
-WORKDIR /home/erigon
-
-RUN --mount=type=cache,target=/root/.cache/go-build \
- --mount=type=cache,target=/go/pkg \
- apk update && \
- apk add make git gcc libstdc++ build-base linux-headers bash ca-certificates && \
- make BUILD_TAGS=nosqlite,noboltdb,nosilkworm erigon integration rpcdaemon && \
- echo "DEBUG: list of binaries:" && \
- ls -l build/bin/
-
FROM ${CI_CD_MAIN_TARGET_BASE_IMAGE} AS ci-cd-main-branch
ARG USER=erigon \
GROUP=erigon \
+ TARGETARCH \
EXPOSED_PORTS
-RUN --mount=type=bind,from=ci-cd-main-branch-builder,source=/home/erigon,target=/tmp/erigon \
+RUN --mount=type=bind,from=ci-cd-main-branch-builder,source=/build-${TARGETARCH},target=/tmp/erigon \
apk add --no-cache ca-certificates tzdata libstdc++ && \
addgroup ${GROUP} && \
adduser -D -h /home/${USER} -G ${GROUP} ${USER} && \
install -d -o ${USER} -g ${GROUP} /home/${USER}/.local /home/${USER}/.local/share /home/${USER}/.local/share/erigon && \
- install -o ${USER} -g ${GROUP} /tmp/erigon/build/bin/* /usr/local/bin/
+ install -o ${USER} -g ${GROUP} /tmp/erigon/* /usr/local/bin/
VOLUME [ "/home/${USER}" ]
WORKDIR /home/${USER}
diff --git a/Makefile b/Makefile
index 6ef411d2903..d4c10d732be 100644
--- a/Makefile
+++ b/Makefile
@@ -6,12 +6,12 @@ DOCKER := $(shell command -v docker 2> /dev/null)
GIT_COMMIT ?= $(shell git rev-list -1 HEAD)
GIT_BRANCH ?= $(shell git rev-parse --abbrev-ref HEAD)
-GIT_TAG ?= $(shell git describe --tags '--match=v*' --dirty)
+GIT_TAG ?= $(shell git describe --tags '--match=*.*.*' --abbrev=7 --dirty)
ERIGON_USER ?= erigon
# if using volume-mounting data dir, then must exist on host OS
DOCKER_UID ?= $(shell id -u)
DOCKER_GID ?= $(shell id -g)
-DOCKER_TAG ?= thorax/erigon:latest
+DOCKER_TAG ?= erigontech/erigon:latest
# Variables below for building on host OS, and are ignored for docker
#
@@ -55,7 +55,7 @@ GOPRIVATE = github.com/erigontech/silkworm-go
PACKAGE = github.com/node-real/bsc-erigon
-GO_FLAGS += -trimpath -tags $(BUILD_TAGS) -buildvcs=false
+GO_FLAGS += -trimpath -tags $(BUILD_TAGS) -buildvcs=false
GO_FLAGS += -ldflags "-X ${PACKAGE}/params.GitCommit=${GIT_COMMIT} -X ${PACKAGE}/params.GitBranch=${GIT_BRANCH} -X ${PACKAGE}/params.GitTag=${GIT_TAG}"
GOBUILD = CGO_CFLAGS="$(CGO_CFLAGS)" CGO_LDFLAGS="$(CGO_LDFLAGS)" GOPRIVATE="$(GOPRIVATE)" $(GO) build $(GO_FLAGS)
@@ -66,8 +66,8 @@ default: all
## go-version: print and verify go version
go-version:
- @if [ $(shell $(GO) version | cut -c 16-17) -lt 21 ]; then \
- echo "minimum required Golang version is 1.21"; \
+ @if [ $(shell $(GO) version | cut -c 16-17) -lt 20 ]; then \
+ echo "minimum required Golang version is 1.20"; \
exit 1 ;\
fi
@@ -293,20 +293,6 @@ release-dry-run: git-submodules
-w /go/src/$(PACKAGE_NAME) \
ghcr.io/goreleaser/goreleaser-cross:${GOLANG_CROSS_VERSION} \
--clean --skip=validate --skip=publish
-
-.PHONY: release
-release: git-submodules
- @docker run \
- --rm \
- --privileged \
- -e CGO_ENABLED=1 \
- -e GITHUB_TOKEN \
- -v /var/run/docker.sock:/var/run/docker.sock \
- -v `pwd`:/go/src/$(PACKAGE_NAME) \
- -w /go/src/$(PACKAGE_NAME) \
- ghcr.io/goreleaser/goreleaser-cross:${GOLANG_CROSS_VERSION} \
- --clean --skip=validate
-
# since DOCKER_UID, DOCKER_GID are default initialized to the current user uid/gid,
# we need separate envvars to facilitate creation of the erigon user on the host OS.
ERIGON_USER_UID ?= 3473
@@ -336,13 +322,6 @@ user_macos:
sudo dscl . -append /Groups/admin GroupMembership $(ERIGON_USER)
sudo -u $(ERIGON_USER) mkdir -p /Users/$(ERIGON_USER)/.local/share
-## hive: run hive test suite locally using docker e.g. OUTPUT_DIR=~/results/hive SIM=ethereum/engine make hive
-.PHONY: hive
-hive:
- DOCKER_TAG=thorax/erigon:ci-local make docker
- docker pull thorax/hive:latest
- docker run --rm -v /var/run/docker.sock:/var/run/docker.sock -v $(OUTPUT_DIR):/work thorax/hive:latest --sim $(SIM) --results-root=/work/results --client erigon_ci-local # run erigon
-
## automated-tests run automated tests (BUILD_ERIGON=0 to prevent erigon build with local image tag)
.PHONY: automated-tests
automated-tests:
diff --git a/README.md b/README.md
index c397b25baa6..4be5a98a155 100644
--- a/README.md
+++ b/README.md
@@ -595,11 +595,9 @@ In order to configure the ports, use:
| Component | Port | Protocol | Purpose | Should Expose |
|-----------|------|----------|---------|---------------|
| all | 6060 | TCP | pprof | Private |
-| all | 6060 | TCP | metrics | Private |
+| all | 6061 | TCP | metrics | Private |
-Optional flags can be enabled that enable pprof or metrics (or both) - however, they both run on 6060 by default, so
-
-you'll have to change one if you want to run both at the same time. use `--help` with the binary for more info.
+Optional flags can be enabled that enable pprof or metrics (or both). Use `--help` with the binary for more info.
#### `other` ports
diff --git a/accounts/abi/bind/backends/simulated.go b/accounts/abi/bind/backends/simulated.go
index dcc83344cc9..6ad9ce99b9c 100644
--- a/accounts/abi/bind/backends/simulated.go
+++ b/accounts/abi/bind/backends/simulated.go
@@ -317,10 +317,13 @@ func (b *SimulatedBackend) TransactionByHash(ctx context.Context, txHash libcomm
if !ok {
return nil, false, ethereum.NotFound
}
- blockHash, err := b.BlockReader().CanonicalHash(ctx, tx, blockNumber)
+ blockHash, ok, err := b.BlockReader().CanonicalHash(ctx, tx, blockNumber)
if err != nil {
return nil, false, err
}
+ if !ok {
+ return nil, false, ethereum.NotFound
+ }
body, err := b.BlockReader().BodyWithTransactions(ctx, tx, blockHash, blockNumber)
if err != nil {
return nil, false, err
@@ -647,7 +650,7 @@ func (b *SimulatedBackend) EstimateGas(ctx context.Context, call ethereum.CallMs
}
}
gasCap = hi
- b.pendingState.SetTxContext(libcommon.Hash{}, len(b.pendingBlock.Transactions()))
+ b.pendingState.SetTxContext(len(b.pendingBlock.Transactions()), 0)
// Create a helper to check if a gas allowance results in an executable transaction
executable := func(gas uint64) (bool, *evmtypes.ExecutionResult, error) {
@@ -756,7 +759,7 @@ func (b *SimulatedBackend) SendTransaction(ctx context.Context, txn types.Transa
return fmt.Errorf("invalid transaction nonce: got %d, want %d", txn.GetNonce(), nonce)
}
- b.pendingState.SetTxContext(txn.Hash(), len(b.pendingBlock.Transactions()))
+ b.pendingState.SetTxContext(len(b.pendingBlock.Transactions()), 0)
//fmt.Printf("==== Start producing block %d, header: %d\n", b.pendingBlock.NumberU64(), b.pendingHeader.Number.Uint64())
if _, _, err := core.ApplyTransaction(
b.m.ChainConfig, core.GetHashFn(b.pendingHeader, b.getHeader), b.m.Engine,
diff --git a/cl/aggregation/pool_impl.go b/cl/aggregation/pool_impl.go
index 38afe528255..358715ced4c 100644
--- a/cl/aggregation/pool_impl.go
+++ b/cl/aggregation/pool_impl.go
@@ -112,11 +112,7 @@ func (p *aggregationPoolImpl) AddAttestation(inAtt *solid.Attestation) error {
func (p *aggregationPoolImpl) GetAggregatationByRoot(root common.Hash) *solid.Attestation {
p.aggregatesLock.RLock()
defer p.aggregatesLock.RUnlock()
- att := p.aggregates[root]
- if att == nil {
- return nil
- }
- return att.Copy()
+ return p.aggregates[root]
}
func (p *aggregationPoolImpl) sweepStaleAtt(ctx context.Context) {
diff --git a/cl/beacon/builder/client.go b/cl/beacon/builder/client.go
index 510d502bdb5..39b4b69b63b 100644
--- a/cl/beacon/builder/client.go
+++ b/cl/beacon/builder/client.go
@@ -181,7 +181,7 @@ func httpCall[T any](ctx context.Context, client *http.Client, method, url strin
if err != nil {
log.Warn("[mev builder] io.ReadAll failed", "err", err, "url", url, "method", method)
} else {
- log.Debug("[mev builder] httpCall failed", "status", response.Status, "content", string(bytes))
+ log.Warn("[mev builder] httpCall failed", "status", response.Status, "content", string(bytes))
}
return nil, fmt.Errorf("status code: %d", response.StatusCode)
}
diff --git a/cl/beacon/handler/attestation_rewards.go b/cl/beacon/handler/attestation_rewards.go
index a555eb28593..c76a2f25a26 100644
--- a/cl/beacon/handler/attestation_rewards.go
+++ b/cl/beacon/handler/attestation_rewards.go
@@ -227,14 +227,13 @@ func (a *ApiHandler) baseReward(version clparams.StateVersion, effectiveBalance,
func (a *ApiHandler) computeAttestationsRewardsForAltair(validatorSet *solid.ValidatorSet, inactivityScores solid.Uint64ListSSZ, previousParticipation *solid.BitList, inactivityLeak bool, filterIndicies []uint64, epoch uint64) (*beaconhttp.BeaconResponse, error) {
totalActiveBalance := uint64(0)
- flagsUnslashedIndiciesSet := statechange.GetUnslashedIndiciesSet(a.beaconChainCfg, epoch, validatorSet, previousParticipation)
- weights := a.beaconChainCfg.ParticipationWeights()
- flagsTotalBalances := make([]uint64, len(weights))
-
prevEpoch := uint64(0)
if epoch > 0 {
prevEpoch = epoch - 1
}
+ flagsUnslashedIndiciesSet := statechange.GetUnslashedIndiciesSet(a.beaconChainCfg, prevEpoch, validatorSet, previousParticipation)
+ weights := a.beaconChainCfg.ParticipationWeights()
+ flagsTotalBalances := make([]uint64, len(weights))
validatorSet.Range(func(validatorIndex int, v solid.Validator, l int) bool {
if v.Active(epoch) {
diff --git a/cl/beacon/handler/block_production.go b/cl/beacon/handler/block_production.go
index 2b40eed19a1..c995363ad7b 100644
--- a/cl/beacon/handler/block_production.go
+++ b/cl/beacon/handler/block_production.go
@@ -32,6 +32,7 @@ import (
"sync"
"time"
+ "github.com/Giulio2002/bls"
"github.com/go-chi/chi/v5"
"golang.org/x/exp/slices"
@@ -1058,67 +1059,78 @@ type attestationCandidate struct {
func (a *ApiHandler) findBestAttestationsForBlockProduction(
s abstract.BeaconState,
) *solid.ListSSZ[*solid.Attestation] {
-
- ret := solid.NewDynamicListSSZ[*solid.Attestation](int(a.beaconChainCfg.MaxAttestations))
- attestationCandidates := []attestationCandidate{}
-
- for _, attestation := range a.operationsPool.AttestationsPool.Raw() {
- if err := eth2.IsAttestationApplicable(s, attestation); err != nil {
+ // Group attestations by their data root
+ hashToAtts := make(map[libcommon.Hash][]*solid.Attestation)
+ for _, candidate := range a.operationsPool.AttestationsPool.Raw() {
+ if err := eth2.IsAttestationApplicable(s, candidate); err != nil {
continue // attestation not applicable skip
}
- expectedReward, err := computeAttestationReward(s, attestation)
+ dataRoot, err := candidate.AttestantionData().HashSSZ()
if err != nil {
- log.Warn(
- "[Block Production] Could not compute expected attestation reward",
- "reason",
- err,
- )
continue
}
- if expectedReward == 0 {
- continue
- }
- attestationCandidates = append(attestationCandidates, attestationCandidate{
- attestation: attestation,
- reward: expectedReward,
- })
- }
- // Rank by reward in descending order.
- sort.Slice(attestationCandidates, func(i, j int) bool {
- return attestationCandidates[i].reward > attestationCandidates[j].reward
- })
- // Some aggregates can be supersets of existing ones so let's filter out the supersets
- // this MAP is HashTreeRoot(AttestationData) => AggregationBits
- hashToMergedAtt := make(map[libcommon.Hash]*solid.Attestation)
- for _, candidate := range attestationCandidates {
- // Check if it is a superset of a pre-included attestation with higher reward
- attestationDataRoot, err := candidate.attestation.AttestantionData().HashSSZ()
- if err != nil {
- log.Warn("[Block Production] Cannot compute attestation data root", "err", err)
- continue
+ if _, ok := hashToAtts[dataRoot]; !ok {
+ hashToAtts[dataRoot] = []*solid.Attestation{}
}
- if curAtt, exists := hashToMergedAtt[attestationDataRoot]; exists {
+
+ // try to merge the attestation with the existing ones
+ mergeAny := false
+ for _, curAtt := range hashToAtts[dataRoot] {
currAggregationBits := curAtt.AggregationBits()
- if !utils.IsNonStrictSupersetBitlist(
- currAggregationBits,
- candidate.attestation.AggregationBits(),
- ) {
- // merge if not a superset
- utils.MergeBitlists(currAggregationBits, candidate.attestation.AggregationBits())
+ if !utils.IsOverlappingBitlist(currAggregationBits, candidate.AggregationBits()) {
+ // merge signatures
+ candidateSig := candidate.Signature()
+ curSig := curAtt.Signature()
+ mergeSig, err := bls.AggregateSignatures([][]byte{candidateSig[:], curSig[:]})
+ if err != nil {
+ log.Warn("[Block Production] Cannot merge signatures", "err", err)
+ continue
+ }
+ // merge aggregation bits
+ candidateBits := candidate.AggregationBits()
+ for i := 0; i < len(currAggregationBits); i++ {
+ currAggregationBits[i] |= candidateBits[i]
+ }
+ var buf [96]byte
+ copy(buf[:], mergeSig)
+ curAtt.SetSignature(buf)
curAtt.SetAggregationBits(currAggregationBits)
+ mergeAny = true
}
- } else {
- // Update the currently built superset
- hashToMergedAtt[attestationDataRoot] = candidate.attestation.Copy()
}
+ if !mergeAny {
+ // no merge case, just append. It might be merged with other attestation later.
+ hashToAtts[dataRoot] = append(hashToAtts[dataRoot], candidate)
+ }
+ }
- if len(hashToMergedAtt) >= int(a.beaconChainCfg.MaxAttestations) {
- break
+ attestationCandidates := []attestationCandidate{}
+ for _, atts := range hashToAtts {
+ for _, att := range atts {
+ expectedReward, err := computeAttestationReward(s, att)
+ if err != nil {
+ log.Warn("[Block Production] Could not compute expected attestation reward", "reason", err)
+ continue
+ }
+ if expectedReward == 0 {
+ continue
+ }
+ attestationCandidates = append(attestationCandidates, attestationCandidate{
+ attestation: att,
+ reward: expectedReward,
+ })
}
}
- for _, att := range hashToMergedAtt {
- ret.Append(att)
+ sort.Slice(attestationCandidates, func(i, j int) bool {
+ return attestationCandidates[i].reward > attestationCandidates[j].reward
+ })
+ ret := solid.NewDynamicListSSZ[*solid.Attestation](int(a.beaconChainCfg.MaxAttestations))
+ for _, candidate := range attestationCandidates {
+ ret.Append(candidate.attestation)
+ if ret.Len() >= int(a.beaconChainCfg.MaxAttestations) {
+ break
+ }
}
return ret
}
diff --git a/cl/beacon/handler/lighthouse.go b/cl/beacon/handler/lighthouse.go
index 201c98c1c6d..603cb9ca132 100644
--- a/cl/beacon/handler/lighthouse.go
+++ b/cl/beacon/handler/lighthouse.go
@@ -37,18 +37,23 @@ type LighthouseValidatorInclusionGlobal struct {
PreviousEpochHeadAttestingGwei uint64 `json:"previous_epoch_head_attesting_gwei"`
}
+// the block root hash of the highest numbered slot that actually exists
func (a *ApiHandler) findEpochRoot(tx kv.Tx, epoch uint64) (common.Hash, error) {
var currentBlockRoot common.Hash
var err error
- for i := epoch * a.beaconChainCfg.SlotsPerEpoch; i < (epoch+1)*a.beaconChainCfg.SlotsPerEpoch; i++ {
- // read the block root
+ for i := (epoch+1)*a.beaconChainCfg.SlotsPerEpoch - 1; i >= epoch*a.beaconChainCfg.SlotsPerEpoch; i-- {
+ // read the block roots from the back
currentBlockRoot, err = beacon_indicies.ReadCanonicalBlockRoot(tx, i)
if err != nil {
return common.Hash{}, err
}
+ if currentBlockRoot != (common.Hash{}) {
+ // stop at the first valid one
+ return currentBlockRoot, nil
+ }
}
- return currentBlockRoot, nil
-
+ // no non-missed slot was found, return the all zero hash
+ return common.Hash{}, nil
}
func (a *ApiHandler) GetLighthouseValidatorInclusionGlobal(w http.ResponseWriter, r *http.Request) (*beaconhttp.BeaconResponse, error) {
diff --git a/cl/beacon/handler/pool.go b/cl/beacon/handler/pool.go
index 738b5eb149d..184c7f0798f 100644
--- a/cl/beacon/handler/pool.go
+++ b/cl/beacon/handler/pool.go
@@ -96,7 +96,23 @@ func (a *ApiHandler) PostEthV1BeaconPoolAttestations(w http.ResponseWriter, r *h
subnet = subnets.ComputeSubnetForAttestation(committeeCountPerSlot, slot, cIndex, a.beaconChainCfg.SlotsPerEpoch, a.netConfig.AttestationSubnetCount)
)
_ = i
- if err := a.attestationService.ProcessMessage(r.Context(), &subnet, attestation); err != nil {
+
+ encodedSSZ, err := attestation.EncodeSSZ(nil)
+ if err != nil {
+ beaconhttp.NewEndpointError(http.StatusInternalServerError, err).WriteTo(w)
+ return
+ }
+ attestationWithGossipData := &services.AttestationWithGossipData{
+ Attestation: attestation,
+ GossipData: &sentinel.GossipData{
+ Data: encodedSSZ,
+ Name: gossip.TopicNamePrefixBeaconAttestation,
+ SubnetId: &subnet,
+ },
+ ImmediateProcess: true, // we want to process attestation immediately
+ }
+
+ if err := a.attestationService.ProcessMessage(r.Context(), &subnet, attestationWithGossipData); err != nil && !errors.Is(err, services.ErrIgnore) {
log.Warn("[Beacon REST] failed to process attestation in attestation service", "err", err)
failures = append(failures, poolingFailure{
Index: i,
@@ -104,21 +120,6 @@ func (a *ApiHandler) PostEthV1BeaconPoolAttestations(w http.ResponseWriter, r *h
})
continue
}
- if a.sentinel != nil {
- encodedSSZ, err := attestation.EncodeSSZ(nil)
- if err != nil {
- beaconhttp.NewEndpointError(http.StatusInternalServerError, err).WriteTo(w)
- return
- }
- if _, err := a.sentinel.PublishGossip(r.Context(), &sentinel.GossipData{
- Data: encodedSSZ,
- Name: gossip.TopicNamePrefixBeaconAttestation,
- SubnetId: &subnet,
- }); err != nil {
- beaconhttp.NewEndpointError(http.StatusInternalServerError, err).WriteTo(w)
- return
- }
- }
}
if len(failures) > 0 {
errResp := poolingError{
@@ -283,28 +284,27 @@ func (a *ApiHandler) PostEthV1ValidatorAggregatesAndProof(w http.ResponseWriter,
failures := []poolingFailure{}
for _, v := range req {
- if err := a.aggregateAndProofsService.ProcessMessage(r.Context(), nil, v); err != nil && !errors.Is(err, services.ErrIgnore) {
+ encodedSSZ, err := v.EncodeSSZ(nil)
+ if err != nil {
+ http.Error(w, err.Error(), http.StatusInternalServerError)
+ log.Warn("[Beacon REST] failed to encode aggregate and proof", "err", err)
+ return
+ }
+ gossipData := &sentinel.GossipData{
+ Data: encodedSSZ,
+ Name: gossip.TopicNameBeaconAggregateAndProof,
+ }
+
+ // for this service we are not publishing gossipData as the service does it internally, we just pass that data as a parameter.
+ if err := a.aggregateAndProofsService.ProcessMessage(r.Context(), nil, &cltypes.SignedAggregateAndProofData{
+ SignedAggregateAndProof: v,
+ GossipData: gossipData,
+ ImmediateProcess: true, // we want to process aggregate and proof immediately
+ }); err != nil && !errors.Is(err, services.ErrIgnore) {
log.Warn("[Beacon REST] failed to process bls-change", "err", err)
failures = append(failures, poolingFailure{Index: len(failures), Message: err.Error()})
continue
}
- // Broadcast to gossip
- if a.sentinel != nil {
- encodedSSZ, err := v.EncodeSSZ(nil)
- if err != nil {
- http.Error(w, err.Error(), http.StatusInternalServerError)
- log.Warn("[Beacon REST] failed to encode aggregate and proof", "err", err)
- return
- }
- if _, err := a.sentinel.PublishGossip(r.Context(), &sentinel.GossipData{
- Data: encodedSSZ,
- Name: gossip.TopicNameBeaconAggregateAndProof,
- }); err != nil {
- log.Warn("[Beacon REST] failed to publish gossip", "err", err)
- http.Error(w, err.Error(), http.StatusInternalServerError)
- return
- }
- }
}
}
diff --git a/cl/beacon/handler/utils_test.go b/cl/beacon/handler/utils_test.go
index e33799e7d08..e6f037b7151 100644
--- a/cl/beacon/handler/utils_test.go
+++ b/cl/beacon/handler/utils_test.go
@@ -120,8 +120,8 @@ func setupTestingHandler(t *testing.T, v clparams.StateVersion, logger log.Logge
syncContributionService.EXPECT().ProcessMessage(gomock.Any(), gomock.Any(), gomock.Any()).DoAndReturn(func(ctx context.Context, subnetID *uint64, msg *cltypes.SignedContributionAndProof) error {
return h.syncMessagePool.AddSyncContribution(postState, msg.Message.Contribution)
}).AnyTimes()
- aggregateAndProofsService.EXPECT().ProcessMessage(gomock.Any(), gomock.Any(), gomock.Any()).DoAndReturn(func(ctx context.Context, subnetID *uint64, msg *cltypes.SignedAggregateAndProof) error {
- opPool.AttestationsPool.Insert(msg.Message.Aggregate.Signature(), msg.Message.Aggregate)
+ aggregateAndProofsService.EXPECT().ProcessMessage(gomock.Any(), gomock.Any(), gomock.Any()).DoAndReturn(func(ctx context.Context, subnetID *uint64, msg *cltypes.SignedAggregateAndProofData) error {
+ opPool.AttestationsPool.Insert(msg.SignedAggregateAndProof.Message.Aggregate.Signature(), msg.SignedAggregateAndProof.Message.Aggregate)
return nil
}).AnyTimes()
voluntaryExitService.EXPECT().ProcessMessage(gomock.Any(), gomock.Any(), gomock.Any()).DoAndReturn(func(ctx context.Context, subnetID *uint64, msg *cltypes.SignedVoluntaryExit) error {
diff --git a/cl/clparams/config.go b/cl/clparams/config.go
index dd11c6f56af..315fb17a6dd 100644
--- a/cl/clparams/config.go
+++ b/cl/clparams/config.go
@@ -132,9 +132,18 @@ var (
}
SepoliaBootstrapNodes = append(MainnetBootstrapNodes,
"enr:-Iq4QMCTfIMXnow27baRUb35Q8iiFHSIDBJh6hQM5Axohhf4b6Kr_cOCu0htQ5WvVqKvFgY28893DHAg8gnBAXsAVqmGAX53x8JggmlkgnY0gmlwhLKAlv6Jc2VjcDI1NmsxoQK6S-Cii_KmfFdUJL2TANL3ksaKUnNXvTCv1tLwXs0QgIN1ZHCCIyk",
- "enr:-Ly4QFoZTWR8ulxGVsWydTNGdwEESueIdj-wB6UmmjUcm-AOPxnQi7wprzwcdo7-1jBW_JxELlUKJdJES8TDsbl1EdNlh2F0dG5ldHOI__78_v2bsV-EZXRoMpA2-lATkAAAcf__________gmlkgnY0gmlwhBLYJjGJc2VjcDI1NmsxoQI0gujXac9rMAb48NtMqtSTyHIeNYlpjkbYpWJw46PmYYhzeW5jbmV0cw-DdGNwgiMog3VkcIIjKA",
"enr:-KG4QE5OIg5ThTjkzrlVF32WT_-XT14WeJtIz2zoTqLLjQhYAmJlnk4ItSoH41_2x0RX0wTFIe5GgjRzU2u7Q1fN4vADhGV0aDKQqP7o7pAAAHAyAAAAAAAAAIJpZIJ2NIJpcISlFsStiXNlY3AyNTZrMaEC-Rrd_bBZwhKpXzFCrStKp1q_HmGOewxY3KwM8ofAj_ODdGNwgiMog3VkcIIjKA",
- "enr:-L64QC9Hhov4DhQ7mRukTOz4_jHm4DHlGL726NWH4ojH1wFgEwSin_6H95Gs6nW2fktTWbPachHJ6rUFu0iJNgA0SB2CARqHYXR0bmV0c4j__________4RldGgykDb6UBOQAABx__________-CaWSCdjSCaXCEA-2vzolzZWNwMjU2azGhA17lsUg60R776rauYMdrAz383UUgESoaHEzMkvm4K6k6iHN5bmNuZXRzD4N0Y3CCIyiDdWRwgiMo")
+ "enr:-L64QC9Hhov4DhQ7mRukTOz4_jHm4DHlGL726NWH4ojH1wFgEwSin_6H95Gs6nW2fktTWbPachHJ6rUFu0iJNgA0SB2CARqHYXR0bmV0c4j__________4RldGgykDb6UBOQAABx__________-CaWSCdjSCaXCEA-2vzolzZWNwMjU2azGhA17lsUg60R776rauYMdrAz383UUgESoaHEzMkvm4K6k6iHN5bmNuZXRzD4N0Y3CCIyiDdWRwgiMo",
+ // Teku bootnode
+ "enr:-KO4QP7MmB3juk8rUjJHcUoxZDU9Np4FlW0HyDEGIjSO7GD9PbSsabu7713cWSUWKDkxIypIXg1A-6lG7ySRGOMZHeGCAmuEZXRoMpDTH2GRkAAAc___________gmlkgnY0gmlwhBSoyGOJc2VjcDI1NmsxoQNta5b_bexSSwwrGW2Re24MjfMntzFd0f2SAxQtMj3ueYN0Y3CCIyiDdWRwgiMo",
+ // Lodestar bootnode
+ "enr:-KG4QJejf8KVtMeAPWFhN_P0c4efuwu1pZHELTveiXUeim6nKYcYcMIQpGxxdgT2Xp9h-M5pr9gn2NbbwEAtxzu50Y8BgmlkgnY0gmlwhEEVkQCDaXA2kCoBBPnAEJg4AAAAAAAAAAGJc2VjcDI1NmsxoQLEh_eVvk07AQABvLkTGBQTrrIOQkzouMgSBtNHIRUxOIN1ZHCCIyiEdWRwNoIjKA",
+ // EF bootnodes
+ "enr:-Ku4QDZ_rCowZFsozeWr60WwLgOfHzv1Fz2cuMvJqN5iJzLxKtVjoIURY42X_YTokMi3IGstW5v32uSYZyGUXj9Q_IECh2F0dG5ldHOIAAAAAAAAAACEZXRoMpCo_ujukAAAaf__________gmlkgnY0gmlwhIpEe5iJc2VjcDI1NmsxoQNHTpFdaNSCEWiN_QqT396nb0PzcUpLe3OVtLph-AciBYN1ZHCCIy0",
+ "enr:-Ku4QHRyRwEPT7s0XLYzJ_EeeWvZTXBQb4UCGy1F_3m-YtCNTtDlGsCMr4UTgo4uR89pv11uM-xq4w6GKfKhqU31hTgCh2F0dG5ldHOIAAAAAAAAAACEZXRoMpCo_ujukAAAaf__________gmlkgnY0gmlwhIrFM7WJc2VjcDI1NmsxoQI4diTwChN3zAAkarf7smOHCdFb1q3DSwdiQ_Lc_FdzFIN1ZHCCIy0",
+ "enr:-Ku4QOkvvf0u5Hg4-HhY-SJmEyft77G5h3rUM8VF_e-Hag5cAma3jtmFoX4WElLAqdILCA-UWFRN1ZCDJJVuEHrFeLkDh2F0dG5ldHOIAAAAAAAAAACEZXRoMpCo_ujukAAAaf__________gmlkgnY0gmlwhJK-AWeJc2VjcDI1NmsxoQLFcT5VE_NMiIC8Ll7GypWDnQ4UEmuzD7hF_Hf4veDJwIN1ZHCCIy0",
+ "enr:-Ku4QH6tYsHKITYeHUu5kdfXgEZWI18EWk_2RtGOn1jBPlx2UlS_uF3Pm5Dx7tnjOvla_zs-wwlPgjnEOcQDWXey51QCh2F0dG5ldHOIAAAAAAAAAACEZXRoMpCo_ujukAAAaf__________gmlkgnY0gmlwhIs7Mc6Jc2VjcDI1NmsxoQIET4Mlv9YzhrYhX_H9D7aWMemUrvki6W4J2Qo0YmFMp4N1ZHCCIy0",
+ "enr:-Ku4QDmz-4c1InchGitsgNk4qzorWMiFUoaPJT4G0IiF8r2UaevrekND1o7fdoftNucirj7sFFTTn2-JdC2Ej0p1Mn8Ch2F0dG5ldHOIAAAAAAAAAACEZXRoMpCo_ujukAAAaf__________gmlkgnY0gmlwhKpA-liJc2VjcDI1NmsxoQMpHP5U1DK8O_JQU6FadmWbE42qEdcGlllR8HcSkkfWq4N1ZHCCIy0")
GnosisBootstrapNodes = append(MainnetBootstrapNodes, []string{
"enr:-Ly4QIAhiTHk6JdVhCdiLwT83wAolUFo5J4nI5HrF7-zJO_QEw3cmEGxC1jvqNNUN64Vu-xxqDKSM528vKRNCehZAfEBh2F0dG5ldHOIAAAAAAAAAACEZXRoMpCCS-QxAgAAZP__________gmlkgnY0gmlwhEFtZ5SJc2VjcDI1NmsxoQJwgL5C-30E8RJmW8gCb7sfwWvvfre7wGcCeV4X1G2wJYhzeW5jbmV0cwCDdGNwgiMog3VkcIIjKA",
diff --git a/cl/cltypes/aggregate.go b/cl/cltypes/aggregate.go
index be316654005..29920e362a7 100644
--- a/cl/cltypes/aggregate.go
+++ b/cl/cltypes/aggregate.go
@@ -18,6 +18,7 @@ package cltypes
import (
libcommon "github.com/erigontech/erigon-lib/common"
+ sentinel "github.com/erigontech/erigon-lib/gointerfaces/sentinelproto"
"github.com/erigontech/erigon/cl/cltypes/solid"
"github.com/erigontech/erigon/cl/merkle_tree"
ssz2 "github.com/erigontech/erigon/cl/ssz"
@@ -54,6 +55,17 @@ func (a *AggregateAndProof) HashSSZ() ([32]byte, error) {
return merkle_tree.HashTreeRoot(a.AggregatorIndex, a.Aggregate, a.SelectionProof[:])
}
+// SignedAggregateAndProofData is passed to SignedAggregateAndProof service. The service does the signature verification
+// asynchronously. That's why we cannot wait for its ProcessMessage call to finish to check error. The service
+// will do re-publishing of the gossip or banning the peer in case of invalid signature by itself.
+// that's why we are passing sentinel.SentinelClient and *sentinel.GossipData to enable the service
+// to do all of that by itself.
+type SignedAggregateAndProofData struct {
+ SignedAggregateAndProof *SignedAggregateAndProof
+ GossipData *sentinel.GossipData
+ ImmediateProcess bool
+}
+
type SignedAggregateAndProof struct {
Message *AggregateAndProof `json:"message"`
Signature libcommon.Bytes96 `json:"signature"`
@@ -110,7 +122,7 @@ func (agg *SyncAggregate) IsSet(idx uint64) bool {
}
func (agg *SyncAggregate) EncodeSSZ(buf []byte) ([]byte, error) {
- return append(buf, append(agg.SyncCommiteeBits[:], agg.SyncCommiteeSignature[:]...)...), nil
+ return ssz2.MarshalSSZ(buf, agg.SyncCommiteeBits[:], agg.SyncCommiteeSignature[:])
}
func (*SyncAggregate) Static() bool {
diff --git a/cl/phase1/network/gossip_manager.go b/cl/phase1/network/gossip_manager.go
index 8e56bd851b0..8b9e09e9da5 100644
--- a/cl/phase1/network/gossip_manager.go
+++ b/cl/phase1/network/gossip_manager.go
@@ -157,6 +157,27 @@ func (g *GossipManager) isReadyToProcessOperations() bool {
return g.forkChoice.HighestSeen()+8 >= g.ethClock.GetCurrentSlot()
}
+func copyOfSentinelData(in *sentinel.GossipData) *sentinel.GossipData {
+ ret := &sentinel.GossipData{
+ Data: common.Copy(in.Data),
+ Name: in.Name,
+ }
+ if in.SubnetId != nil {
+ ret.SubnetId = new(uint64)
+ *ret.SubnetId = *in.SubnetId
+ }
+ if in.Peer != nil {
+ ret.Peer = new(sentinel.Peer)
+ ret.Peer.State = in.Peer.State
+ ret.Peer.Pid = in.Peer.Pid
+ ret.Peer.Enr = in.Peer.Enr
+ ret.Peer.Direction = in.Peer.Direction
+ ret.Peer.AgentVersion = in.Peer.AgentVersion
+ ret.Peer.Address = in.Peer.Address
+ }
+ return ret
+}
+
func (g *GossipManager) routeAndProcess(ctx context.Context, data *sentinel.GossipData) error {
currentEpoch := g.ethClock.GetCurrentEpoch()
version := g.beaconConfig.GetCurrentStateVersion(currentEpoch)
@@ -201,8 +222,12 @@ func (g *GossipManager) routeAndProcess(ctx context.Context, data *sentinel.Goss
}
return g.blsToExecutionChangeService.ProcessMessage(ctx, data.SubnetId, obj)
case gossip.TopicNameBeaconAggregateAndProof:
- obj := &cltypes.SignedAggregateAndProof{}
- if err := obj.DecodeSSZ(data.Data, int(version)); err != nil {
+ obj := &cltypes.SignedAggregateAndProofData{
+ GossipData: copyOfSentinelData(data),
+ SignedAggregateAndProof: &cltypes.SignedAggregateAndProof{},
+ }
+
+ if err := obj.SignedAggregateAndProof.DecodeSSZ(common.CopyBytes(data.Data), int(version)); err != nil {
return err
}
return g.aggregateAndProofService.ProcessMessage(ctx, data.SubnetId, obj)
@@ -224,11 +249,21 @@ func (g *GossipManager) routeAndProcess(ctx context.Context, data *sentinel.Goss
}
return g.syncCommitteeMessagesService.ProcessMessage(ctx, data.SubnetId, msg)
case gossip.IsTopicBeaconAttestation(data.Name):
- att := &solid.Attestation{}
- if err := att.DecodeSSZ(data.Data, int(version)); err != nil {
+ obj := &services.AttestationWithGossipData{
+ GossipData: copyOfSentinelData(data),
+ Attestation: &solid.Attestation{},
+ ImmediateProcess: false,
+ }
+
+ if err := obj.Attestation.DecodeSSZ(common.CopyBytes(data.Data), int(version)); err != nil {
return err
}
- return g.attestationService.ProcessMessage(ctx, data.SubnetId, att)
+
+ if g.committeeSub.NeedToAggregate(obj.Attestation) {
+ return g.attestationService.ProcessMessage(ctx, data.SubnetId, obj)
+ }
+
+ return nil
default:
return fmt.Errorf("unknown topic %s", data.Name)
}
diff --git a/cl/phase1/network/services/aggregate_and_proof_service.go b/cl/phase1/network/services/aggregate_and_proof_service.go
index 5ed201e0cff..d01355de207 100644
--- a/cl/phase1/network/services/aggregate_and_proof_service.go
+++ b/cl/phase1/network/services/aggregate_and_proof_service.go
@@ -19,6 +19,7 @@ package services
import (
"context"
"errors"
+ "fmt"
"slices"
"sync"
"time"
@@ -30,25 +31,36 @@ import (
"github.com/erigontech/erigon/cl/beacon/synced_data"
"github.com/erigontech/erigon/cl/clparams"
"github.com/erigontech/erigon/cl/cltypes"
+ "github.com/erigontech/erigon/cl/cltypes/solid"
"github.com/erigontech/erigon/cl/fork"
"github.com/erigontech/erigon/cl/merkle_tree"
"github.com/erigontech/erigon/cl/phase1/core/state"
+ "github.com/erigontech/erigon/cl/phase1/core/state/lru"
"github.com/erigontech/erigon/cl/phase1/forkchoice"
"github.com/erigontech/erigon/cl/pool"
"github.com/erigontech/erigon/cl/utils"
)
type aggregateJob struct {
- aggregate *cltypes.SignedAggregateAndProof
+ aggregate *cltypes.SignedAggregateAndProofData
creationTime time.Time
}
+type seenAggregateIndex struct {
+ epoch uint64
+ index uint64
+}
+
+const seenAggregateCacheSize = 10_000
+
type aggregateAndProofServiceImpl struct {
- syncedDataManager *synced_data.SyncedDataManager
- forkchoiceStore forkchoice.ForkChoiceStorage
- beaconCfg *clparams.BeaconChainConfig
- opPool pool.OperationsPool
- test bool
+ syncedDataManager *synced_data.SyncedDataManager
+ forkchoiceStore forkchoice.ForkChoiceStorage
+ beaconCfg *clparams.BeaconChainConfig
+ opPool pool.OperationsPool
+ test bool
+ batchSignatureVerifier *BatchSignatureVerifier
+ seenAggreatorIndexes *lru.Cache[seenAggregateIndex, struct{}]
// set of aggregates that are scheduled for later processing
aggregatesScheduledForLaterExecution sync.Map
@@ -61,13 +73,20 @@ func NewAggregateAndProofService(
beaconCfg *clparams.BeaconChainConfig,
opPool pool.OperationsPool,
test bool,
+ batchSignatureVerifier *BatchSignatureVerifier,
) AggregateAndProofService {
+ seenAggCache, err := lru.New[seenAggregateIndex, struct{}]("seenAggregate", seenAggregateCacheSize)
+ if err != nil {
+ panic(err)
+ }
a := &aggregateAndProofServiceImpl{
- syncedDataManager: syncedDataManager,
- forkchoiceStore: forkchoiceStore,
- beaconCfg: beaconCfg,
- opPool: opPool,
- test: test,
+ syncedDataManager: syncedDataManager,
+ forkchoiceStore: forkchoiceStore,
+ beaconCfg: beaconCfg,
+ opPool: opPool,
+ test: test,
+ batchSignatureVerifier: batchSignatureVerifier,
+ seenAggreatorIndexes: seenAggCache,
}
go a.loop(ctx)
return a
@@ -76,17 +95,17 @@ func NewAggregateAndProofService(
func (a *aggregateAndProofServiceImpl) ProcessMessage(
ctx context.Context,
subnet *uint64,
- aggregateAndProof *cltypes.SignedAggregateAndProof,
+ aggregateAndProof *cltypes.SignedAggregateAndProofData,
) error {
headState := a.syncedDataManager.HeadState()
if headState == nil {
return ErrIgnore
}
- selectionProof := aggregateAndProof.Message.SelectionProof
- aggregateData := aggregateAndProof.Message.Aggregate.AttestantionData()
- target := aggregateAndProof.Message.Aggregate.AttestantionData().Target()
- slot := aggregateAndProof.Message.Aggregate.AttestantionData().Slot()
- committeeIndex := aggregateAndProof.Message.Aggregate.AttestantionData().CommitteeIndex()
+ selectionProof := aggregateAndProof.SignedAggregateAndProof.Message.SelectionProof
+ aggregateData := aggregateAndProof.SignedAggregateAndProof.Message.Aggregate.AttestantionData()
+ target := aggregateAndProof.SignedAggregateAndProof.Message.Aggregate.AttestantionData().Target()
+ slot := aggregateAndProof.SignedAggregateAndProof.Message.Aggregate.AttestantionData().Slot()
+ committeeIndex := aggregateAndProof.SignedAggregateAndProof.Message.Aggregate.AttestantionData().CommitteeIndex()
if aggregateData.Slot() > headState.Slot() {
a.scheduleAggregateForLaterProcessing(aggregateAndProof)
@@ -112,6 +131,15 @@ func (a *aggregateAndProofServiceImpl) ProcessMessage(
return ErrIgnore
}
+ // [IGNORE] The aggregate is the first valid aggregate received for the aggregator with index aggregate_and_proof.aggregator_index for the epoch aggregate.data.target.epoch
+ seenIndex := seenAggregateIndex{
+ epoch: target.Epoch(),
+ index: aggregateAndProof.SignedAggregateAndProof.Message.AggregatorIndex,
+ }
+ if a.seenAggreatorIndexes.Contains(seenIndex) {
+ return ErrIgnore
+ }
+
// [REJECT] The committee index is within the expected range -- i.e. index < get_committee_count_per_slot(state, aggregate.data.target.epoch).
committeeCountPerSlot := headState.CommitteeCount(target.Epoch())
if aggregateData.CommitteeIndex() >= committeeCountPerSlot {
@@ -125,9 +153,17 @@ func (a *aggregateAndProofServiceImpl) ProcessMessage(
if err != nil {
return err
}
+ // [REJECT] The attestation has participants -- that is, len(get_attesting_indices(state, aggregate)) >= 1
+ attestingIndices, err := headState.GetAttestingIndicies(aggregateData, aggregateAndProof.SignedAggregateAndProof.Message.Aggregate.AggregationBits(), false)
+ if err != nil {
+ return err
+ }
+ if len(attestingIndices) == 0 {
+ return errors.New("no attesting indicies")
+ }
// [REJECT] The aggregator's validator index is within the committee -- i.e. aggregate_and_proof.aggregator_index in get_beacon_committee(state, aggregate.data.slot, index).
- if !slices.Contains(committee, aggregateAndProof.Message.AggregatorIndex) {
+ if !slices.Contains(committee, aggregateAndProof.SignedAggregateAndProof.Message.AggregatorIndex) {
return errors.New("committee index not in committee")
}
// [REJECT] The aggregate attestation's target block is an ancestor of the block named in the LMD vote -- i.e. get_checkpoint_block(store, aggregate.data.beacon_block_root, aggregate.data.target.epoch) == aggregate.data.target.root
@@ -147,134 +183,171 @@ func (a *aggregateAndProofServiceImpl) ProcessMessage(
return errors.New("invalid aggregate and proof")
}
attestingIndicies, err := headState.GetAttestingIndicies(
- aggregateAndProof.Message.Aggregate.AttestantionData(),
- aggregateAndProof.Message.Aggregate.AggregationBits(),
+ aggregateAndProof.SignedAggregateAndProof.Message.Aggregate.AttestantionData(),
+ aggregateAndProof.SignedAggregateAndProof.Message.Aggregate.AggregationBits(),
true,
)
if err != nil {
return err
}
- if err := verifySignaturesOnAggregate(headState, aggregateAndProof); err != nil {
- return err
- } // Add to aggregation pool
- a.opPool.AttestationsPool.Insert(
- aggregateAndProof.Message.Aggregate.Signature(),
- aggregateAndProof.Message.Aggregate,
- )
- a.forkchoiceStore.ProcessAttestingIndicies(
- aggregateAndProof.Message.Aggregate,
- attestingIndicies,
- )
- return nil
-}
+ if len(attestingIndicies) == 0 {
+ return errors.New("no attesting indicies")
+ }
-func verifySignaturesOnAggregate(
- s *state.CachingBeaconState,
- aggregateAndProof *cltypes.SignedAggregateAndProof,
-) error {
- aggregationBits := aggregateAndProof.Message.Aggregate.AggregationBits()
- // [REJECT] The aggregate attestation has participants -- that is, len(get_attesting_indices(state, aggregate)) >= 1.
- attestingIndicies, err := s.GetAttestingIndicies(
- aggregateAndProof.Message.Aggregate.AttestantionData(),
- aggregationBits,
- true,
- )
+ // aggregate signatures for later verification
+ aggregateVerificationData, err := GetSignaturesOnAggregate(headState, aggregateAndProof.SignedAggregateAndProof, attestingIndicies)
if err != nil {
return err
}
- if len(attestingIndicies) == 0 {
- return errors.New("no attesting indicies")
+
+ // further processing will be done after async signature verification
+ aggregateVerificationData.F = func() {
+ a.opPool.AttestationsPool.Insert(
+ aggregateAndProof.SignedAggregateAndProof.Message.Aggregate.Signature(),
+ aggregateAndProof.SignedAggregateAndProof.Message.Aggregate,
+ )
+ a.forkchoiceStore.ProcessAttestingIndicies(
+ aggregateAndProof.SignedAggregateAndProof.Message.Aggregate,
+ attestingIndicies,
+ )
+ a.seenAggreatorIndexes.Add(seenIndex, struct{}{})
+ }
+ // for this specific request, collect data for potential peer banning or gossip publishing
+ aggregateVerificationData.GossipData = aggregateAndProof.GossipData
+
+ if aggregateAndProof.ImmediateProcess {
+ return a.batchSignatureVerifier.ImmediateVerification(aggregateVerificationData)
}
+
+ // push the signatures to verify asynchronously and run final functions after that.
+ a.batchSignatureVerifier.AsyncVerifyAggregateProof(aggregateVerificationData)
+
+ // As the logic goes, if we return ErrIgnore there will be no peer banning and further publishing
+ // gossip data into the network by the gossip manager. That's what we want because we will be doing that ourselves
+ // in BatchVerification function. After validating signatures, if they are valid we will publish the
+ // gossip ourselves or ban the peer which sent that particular invalid signature.
+ return ErrIgnore
+}
+
+func GetSignaturesOnAggregate(
+ s *state.CachingBeaconState,
+ aggregateAndProof *cltypes.SignedAggregateAndProof,
+ attestingIndicies []uint64,
+) (*AggregateVerificationData, error) {
// [REJECT] The aggregate_and_proof.selection_proof is a valid signature of the aggregate.data.slot by the validator with index aggregate_and_proof.aggregator_index.
- if err := verifyAggregateAndProofSignature(s, aggregateAndProof.Message); err != nil {
- return err
+ signature1, signatureRoot1, pubKey1, err := AggregateAndProofSignature(s, aggregateAndProof.Message)
+ if err != nil {
+ return nil, err
}
// [REJECT] The aggregator signature, signed_aggregate_and_proof.signature, is valid.
- if err := verifyAggregatorSignature(s, aggregateAndProof); err != nil {
- return err
+ signature2, signatureRoot2, pubKey2, err := AggregatorSignature(s, aggregateAndProof)
+ if err != nil {
+ return nil, err
+ }
+
+ // [REJECT] Verifying here the validator signatures for the aggregate
+ signature3, signatureRoot3, pubKey3, err := AggregateMessageSignature(s, aggregateAndProof, attestingIndicies)
+ if err != nil {
+ return nil, err
}
- return verifyAggregateMessageSignature(s, aggregateAndProof, attestingIndicies)
+ return &AggregateVerificationData{
+ Signatures: [][]byte{signature1, signature2, signature3},
+ SignRoots: [][]byte{signatureRoot1, signatureRoot2, signatureRoot3},
+ Pks: [][]byte{pubKey1, pubKey2, pubKey3},
+ }, nil
}
-func verifyAggregateAndProofSignature(
+func AggregateAndProofSignature(
state *state.CachingBeaconState,
aggregate *cltypes.AggregateAndProof,
-) error {
+) ([]byte, []byte, []byte, error) {
slot := aggregate.Aggregate.AttestantionData().Slot()
publicKey, err := state.ValidatorPublicKey(int(aggregate.AggregatorIndex))
if err != nil {
- return err
+ return nil, nil, nil, err
}
domain, err := state.GetDomain(
state.BeaconConfig().DomainSelectionProof,
slot*state.BeaconConfig().SlotsPerEpoch,
)
if err != nil {
- return err
+ return nil, nil, nil, err
}
signingRoot := utils.Sha256(merkle_tree.Uint64Root(slot).Bytes(), domain)
- valid, err := bls.Verify(aggregate.SelectionProof[:], signingRoot[:], publicKey[:])
- if err != nil {
- return err
- }
- if !valid {
- return errors.New("invalid bls signature on aggregate and proof")
- }
- return nil
+ return aggregate.SelectionProof[:], signingRoot[:], publicKey[:], nil
}
-func verifyAggregatorSignature(
+func AggregatorSignature(
state *state.CachingBeaconState,
aggregate *cltypes.SignedAggregateAndProof,
-) error {
+) ([]byte, []byte, []byte, error) {
publicKey, err := state.ValidatorPublicKey(int(aggregate.Message.AggregatorIndex))
if err != nil {
- return err
+ return nil, nil, nil, err
}
domain, err := state.GetDomain(state.BeaconConfig().DomainAggregateAndProof, state.Slot())
if err != nil {
- return err
+ return nil, nil, nil, err
}
signingRoot, err := fork.ComputeSigningRoot(aggregate.Message, domain)
if err != nil {
- return err
- }
- valid, err := bls.Verify(aggregate.Signature[:], signingRoot[:], publicKey[:])
- if err != nil {
- return err
- }
- if !valid {
- return errors.New("invalid bls signature on aggregate and proof")
+ return nil, nil, nil, err
}
- return nil
+ return aggregate.Signature[:], signingRoot[:], publicKey[:], nil
}
-func verifyAggregateMessageSignature(
+func AggregateMessageSignature(
s *state.CachingBeaconState,
aggregateAndProof *cltypes.SignedAggregateAndProof,
attestingIndicies []uint64,
-) error {
+) ([]byte, []byte, []byte, error) {
indexedAttestation := state.GetIndexedAttestation(
aggregateAndProof.Message.Aggregate,
attestingIndicies,
)
- valid, err := state.IsValidIndexedAttestation(s, indexedAttestation)
+ inds := indexedAttestation.AttestingIndices
+ if inds.Length() == 0 {
+ return nil, nil, nil, errors.New("isValidIndexedAttestation: attesting indices are not sorted or are null")
+ }
+
+ pks := make([][]byte, 0, inds.Length())
+ if err := solid.RangeErr[uint64](inds, func(_ int, v uint64, _ int) error {
+ val, err := s.ValidatorForValidatorIndex(int(v))
+ if err != nil {
+ return err
+ }
+ pk := val.PublicKeyBytes()
+ pks = append(pks, pk)
+ return nil
+ }); err != nil {
+ return nil, nil, nil, err
+ }
+
+ domain, err := s.GetDomain(s.BeaconConfig().DomainBeaconAttester, indexedAttestation.Data.Target().Epoch())
if err != nil {
- return err
+ return nil, nil, nil, fmt.Errorf("unable to get the domain: %v", err)
+ }
+
+ signingRoot, err := fork.ComputeSigningRoot(indexedAttestation.Data, domain)
+ if err != nil {
+ return nil, nil, nil, fmt.Errorf("unable to get signing root: %v", err)
}
- if !valid {
- return errors.New("invalid aggregate signature")
+
+ pubKeys, err := bls.AggregatePublickKeys(pks)
+ if err != nil {
+ return nil, nil, nil, err
}
- return nil
+
+ return indexedAttestation.Signature[:], signingRoot[:], pubKeys, nil
}
func (a *aggregateAndProofServiceImpl) scheduleAggregateForLaterProcessing(
- aggregateAndProof *cltypes.SignedAggregateAndProof,
+ aggregateAndProof *cltypes.SignedAggregateAndProofData,
) {
- key, err := aggregateAndProof.HashSSZ()
+ key, err := aggregateAndProof.SignedAggregateAndProof.HashSSZ()
if err != nil {
panic(err)
}
@@ -305,7 +378,7 @@ func (a *aggregateAndProofServiceImpl) loop(ctx context.Context) {
a.aggregatesScheduledForLaterExecution.Delete(key.([32]byte))
return true
}
- aggregateData := job.aggregate.Message.Aggregate.AttestantionData()
+ aggregateData := job.aggregate.SignedAggregateAndProof.Message.Aggregate.AttestantionData()
if aggregateData.Slot() > headState.Slot() {
return true
}
diff --git a/cl/phase1/network/services/aggregate_and_proof_service_test.go b/cl/phase1/network/services/aggregate_and_proof_service_test.go
index 67847ce4051..27e9db33ec2 100644
--- a/cl/phase1/network/services/aggregate_and_proof_service_test.go
+++ b/cl/phase1/network/services/aggregate_and_proof_service_test.go
@@ -35,24 +35,28 @@ import (
"github.com/erigontech/erigon/cl/pool"
)
-func getAggregateAndProofAndState(t *testing.T) (*cltypes.SignedAggregateAndProof, *state.CachingBeaconState) {
+func getAggregateAndProofAndState(t *testing.T) (*cltypes.SignedAggregateAndProofData, *state.CachingBeaconState) {
_, _, s := tests.GetBellatrixRandom()
br, _ := s.BlockRoot()
checkpoint := s.CurrentJustifiedCheckpoint()
- a := &cltypes.SignedAggregateAndProof{
- Message: &cltypes.AggregateAndProof{
- AggregatorIndex: 141,
- Aggregate: solid.NewAttestionFromParameters([]byte{1, 2}, solid.NewAttestionDataFromParameters(
- s.Slot(),
- 0,
- br,
- checkpoint,
- checkpoint,
- ), common.Bytes96{}),
- SelectionProof: common.Bytes96{},
+ a := &cltypes.SignedAggregateAndProofData{
+ SignedAggregateAndProof: &cltypes.SignedAggregateAndProof{
+ Message: &cltypes.AggregateAndProof{
+ AggregatorIndex: 141,
+ Aggregate: solid.NewAttestionFromParameters([]byte{1, 2}, solid.NewAttestionDataFromParameters(
+ s.Slot(),
+ 0,
+ br,
+ checkpoint,
+ checkpoint,
+ ), common.Bytes96{}),
+ SelectionProof: common.Bytes96{},
+ },
},
+ GossipData: nil,
}
- a.Message.Aggregate.AttestantionData().Target().SetEpoch(s.Slot() / 32)
+
+ a.SignedAggregateAndProof.Message.Aggregate.AttestantionData().Target().SetEpoch(s.Slot() / 32)
return a, s
}
@@ -65,7 +69,9 @@ func setupAggregateAndProofTest(t *testing.T) (AggregateAndProofService, *synced
forkchoiceMock := mock_services.NewForkChoiceStorageMock(t)
p := pool.OperationsPool{}
p.AttestationsPool = pool.NewOperationPool[libcommon.Bytes96, *solid.Attestation](100, "test")
- blockService := NewAggregateAndProofService(ctx, syncedDataManager, forkchoiceMock, cfg, p, true)
+ batchSignatureVerifier := NewBatchSignatureVerifier(context.TODO(), nil)
+ go batchSignatureVerifier.Start()
+ blockService := NewAggregateAndProofService(ctx, syncedDataManager, forkchoiceMock, cfg, p, true, batchSignatureVerifier)
return blockService, syncedDataManager, forkchoiceMock
}
@@ -84,7 +90,7 @@ func TestAggregateAndProofServiceHighSlot(t *testing.T) {
defer ctrl.Finish()
agg, s := getAggregateAndProofAndState(t)
- agg.Message.Aggregate.AttestantionData().SetSlot(9998898)
+ agg.SignedAggregateAndProof.Message.Aggregate.AttestantionData().SetSlot(9998898)
aggService, sd, _ := setupAggregateAndProofTest(t)
sd.OnHeadState(s)
@@ -96,7 +102,7 @@ func TestAggregateAndProofServiceBadEpoch(t *testing.T) {
defer ctrl.Finish()
agg, s := getAggregateAndProofAndState(t)
- agg.Message.Aggregate.AttestantionData().SetSlot(0)
+ agg.SignedAggregateAndProof.Message.Aggregate.AttestantionData().SetSlot(0)
aggService, sd, _ := setupAggregateAndProofTest(t)
sd.OnHeadState(s)
@@ -138,8 +144,8 @@ func TestAggregateAndProofInvalidEpoch(t *testing.T) {
sd.OnHeadState(s)
fcu.FinalizedCheckpointVal = s.FinalizedCheckpoint()
fcu.Ancestors[s.FinalizedCheckpoint().Epoch()*32] = s.FinalizedCheckpoint().BlockRoot()
- fcu.Headers[agg.Message.Aggregate.AttestantionData().BeaconBlockRoot()] = &cltypes.BeaconBlockHeader{}
- agg.Message.Aggregate.AttestantionData().Target().SetEpoch(999999)
+ fcu.Headers[agg.SignedAggregateAndProof.Message.Aggregate.AttestantionData().BeaconBlockRoot()] = &cltypes.BeaconBlockHeader{}
+ agg.SignedAggregateAndProof.Message.Aggregate.AttestantionData().Target().SetEpoch(999999)
require.Error(t, aggService.ProcessMessage(context.Background(), nil, agg))
}
@@ -153,8 +159,8 @@ func TestAggregateAndProofInvalidCommittee(t *testing.T) {
sd.OnHeadState(s)
fcu.FinalizedCheckpointVal = s.FinalizedCheckpoint()
fcu.Ancestors[s.FinalizedCheckpoint().Epoch()*32] = s.FinalizedCheckpoint().BlockRoot()
- fcu.Headers[agg.Message.Aggregate.AttestantionData().BeaconBlockRoot()] = &cltypes.BeaconBlockHeader{}
- agg.Message.AggregatorIndex = 12453224
+ fcu.Headers[agg.SignedAggregateAndProof.Message.Aggregate.AttestantionData().BeaconBlockRoot()] = &cltypes.BeaconBlockHeader{}
+ agg.SignedAggregateAndProof.Message.AggregatorIndex = 12453224
require.Error(t, aggService.ProcessMessage(context.Background(), nil, agg))
}
@@ -168,7 +174,7 @@ func TestAggregateAndProofAncestorMissing(t *testing.T) {
sd.OnHeadState(s)
fcu.FinalizedCheckpointVal = s.FinalizedCheckpoint()
fcu.Ancestors[s.FinalizedCheckpoint().Epoch()*32] = s.FinalizedCheckpoint().BlockRoot()
- fcu.Headers[agg.Message.Aggregate.AttestantionData().BeaconBlockRoot()] = &cltypes.BeaconBlockHeader{}
+ fcu.Headers[agg.SignedAggregateAndProof.Message.Aggregate.AttestantionData().BeaconBlockRoot()] = &cltypes.BeaconBlockHeader{}
require.Error(t, aggService.ProcessMessage(context.Background(), nil, agg))
}
@@ -182,7 +188,7 @@ func TestAggregateAndProofSuccess(t *testing.T) {
sd.OnHeadState(s)
fcu.FinalizedCheckpointVal = s.FinalizedCheckpoint()
fcu.Ancestors[s.FinalizedCheckpoint().Epoch()*32] = s.FinalizedCheckpoint().BlockRoot()
- fcu.Ancestors[agg.Message.Aggregate.AttestantionData().Slot()] = agg.Message.Aggregate.AttestantionData().Target().BlockRoot()
- fcu.Headers[agg.Message.Aggregate.AttestantionData().BeaconBlockRoot()] = &cltypes.BeaconBlockHeader{}
+ fcu.Ancestors[agg.SignedAggregateAndProof.Message.Aggregate.AttestantionData().Slot()] = agg.SignedAggregateAndProof.Message.Aggregate.AttestantionData().Target().BlockRoot()
+ fcu.Headers[agg.SignedAggregateAndProof.Message.Aggregate.AttestantionData().BeaconBlockRoot()] = &cltypes.BeaconBlockHeader{}
require.NoError(t, aggService.ProcessMessage(context.Background(), nil, agg))
}
diff --git a/cl/phase1/network/services/attestation_service.go b/cl/phase1/network/services/attestation_service.go
index 4b7a848c25b..780435a20ce 100644
--- a/cl/phase1/network/services/attestation_service.go
+++ b/cl/phase1/network/services/attestation_service.go
@@ -23,7 +23,7 @@ import (
"sync"
"time"
- "github.com/Giulio2002/bls"
+ sentinel "github.com/erigontech/erigon-lib/gointerfaces/sentinelproto"
"github.com/erigontech/erigon-lib/log/v3"
"github.com/erigontech/erigon/cl/aggregation"
"github.com/erigontech/erigon/cl/beacon/beaconevents"
@@ -37,30 +37,38 @@ import (
"github.com/erigontech/erigon/cl/utils"
"github.com/erigontech/erigon/cl/utils/eth_clock"
"github.com/erigontech/erigon/cl/validator/committee_subscription"
- "github.com/erigontech/erigon/common"
)
var (
computeSubnetForAttestation = subnets.ComputeSubnetForAttestation
computeCommitteeCountPerSlot = subnets.ComputeCommitteeCountPerSlot
computeSigningRoot = fork.ComputeSigningRoot
- blsVerify = bls.Verify
)
type attestationService struct {
- forkchoiceStore forkchoice.ForkChoiceStorage
- committeeSubscribe committee_subscription.CommitteeSubscribe
- ethClock eth_clock.EthereumClock
- syncedDataManager synced_data.SyncedData
- beaconCfg *clparams.BeaconChainConfig
- netCfg *clparams.NetworkConfig
- emitters *beaconevents.EventEmitter
+ ctx context.Context
+ forkchoiceStore forkchoice.ForkChoiceStorage
+ committeeSubscribe committee_subscription.CommitteeSubscribe
+ ethClock eth_clock.EthereumClock
+ syncedDataManager synced_data.SyncedData
+ beaconCfg *clparams.BeaconChainConfig
+ netCfg *clparams.NetworkConfig
+ emitters *beaconevents.EventEmitter
+ batchSignatureVerifier *BatchSignatureVerifier
// validatorAttestationSeen maps from epoch to validator index. This is used to ignore duplicate validator attestations in the same epoch.
validatorAttestationSeen *lru.CacheWithTTL[uint64, uint64] // validator index -> epoch
attestationProcessed *lru.CacheWithTTL[[32]byte, struct{}]
attestationsToBeLaterProcessed sync.Map
}
+// AttestationWithGossipData type represents attestation with the gossip data where it's coming from.
+type AttestationWithGossipData struct {
+ Attestation *solid.Attestation
+ GossipData *sentinel.GossipData
+ // ImmediateProcess indicates whether the attestation should be processed immediately or able to be scheduled for later processing.
+ ImmediateProcess bool
+}
+
func NewAttestationService(
ctx context.Context,
forkchoiceStore forkchoice.ForkChoiceStorage,
@@ -70,9 +78,11 @@ func NewAttestationService(
beaconCfg *clparams.BeaconChainConfig,
netCfg *clparams.NetworkConfig,
emitters *beaconevents.EventEmitter,
+ batchSignatureVerifier *BatchSignatureVerifier,
) AttestationService {
epochDuration := time.Duration(beaconCfg.SlotsPerEpoch*beaconCfg.SecondsPerSlot) * time.Second
a := &attestationService{
+ ctx: ctx,
forkchoiceStore: forkchoiceStore,
committeeSubscribe: committeeSubscribe,
ethClock: ethClock,
@@ -80,26 +90,28 @@ func NewAttestationService(
beaconCfg: beaconCfg,
netCfg: netCfg,
emitters: emitters,
+ batchSignatureVerifier: batchSignatureVerifier,
validatorAttestationSeen: lru.NewWithTTL[uint64, uint64]("validator_attestation_seen", validatorAttestationCacheSize, epochDuration),
attestationProcessed: lru.NewWithTTL[[32]byte, struct{}]("attestation_processed", validatorAttestationCacheSize, epochDuration),
}
+
go a.loop(ctx)
return a
}
-func (s *attestationService) ProcessMessage(ctx context.Context, subnet *uint64, att *solid.Attestation) error {
+func (s *attestationService) ProcessMessage(ctx context.Context, subnet *uint64, att *AttestationWithGossipData) error {
var (
- root = att.AttestantionData().BeaconBlockRoot()
- slot = att.AttestantionData().Slot()
- committeeIndex = att.AttestantionData().CommitteeIndex()
- targetEpoch = att.AttestantionData().Target().Epoch()
+ root = att.Attestation.AttestantionData().BeaconBlockRoot()
+ slot = att.Attestation.AttestantionData().Slot()
+ committeeIndex = att.Attestation.AttestantionData().CommitteeIndex()
+ targetEpoch = att.Attestation.AttestantionData().Target().Epoch()
)
headState := s.syncedDataManager.HeadStateReader()
if headState == nil {
return ErrIgnore
}
- key, err := att.HashSSZ()
+ key, err := att.Attestation.HashSSZ()
if err != nil {
return err
}
@@ -133,7 +145,7 @@ func (s *attestationService) ProcessMessage(ctx context.Context, subnet *uint64,
if err != nil {
return err
}
- bits := att.AggregationBits()
+ bits := att.Attestation.AggregationBits()
expectedAggregationBitsLength := len(beaconCommittee)
actualAggregationBitsLength := utils.GetBitlistLength(bits)
if actualAggregationBitsLength != expectedAggregationBitsLength {
@@ -177,7 +189,7 @@ func (s *attestationService) ProcessMessage(ctx context.Context, subnet *uint64,
s.validatorAttestationSeen.Add(vIndex, targetEpoch)
// [REJECT] The signature of attestation is valid.
- signature := att.Signature()
+ signature := att.Attestation.Signature()
pubKey, err := headState.ValidatorPublicKey(int(beaconCommittee[onBitIndex]))
if err != nil {
return fmt.Errorf("unable to get public key: %v", err)
@@ -186,16 +198,10 @@ func (s *attestationService) ProcessMessage(ctx context.Context, subnet *uint64,
if err != nil {
return fmt.Errorf("unable to get the domain: %v", err)
}
- signingRoot, err := computeSigningRoot(att.AttestantionData(), domain)
+ signingRoot, err := computeSigningRoot(att.Attestation.AttestantionData(), domain)
if err != nil {
return fmt.Errorf("unable to get signing root: %v", err)
}
- if valid, err := blsVerify(signature[:], signingRoot[:], pubKey[:]); err != nil {
- return err
- } else if !valid {
- log.Warn("invalid signature", "signature", common.Bytes2Hex(signature[:]), "signningRoot", common.Bytes2Hex(signingRoot[:]), "pubKey", common.Bytes2Hex(pubKey[:]))
- return errors.New("invalid signature")
- }
// [IGNORE] The block being voted for (attestation.data.beacon_block_root) has been seen (via both gossip and non-gossip sources)
// (a client MAY queue attestations for processing once block is retrieved).
@@ -207,8 +213,8 @@ func (s *attestationService) ProcessMessage(ctx context.Context, subnet *uint64,
// [REJECT] The attestation's target block is an ancestor of the block named in the LMD vote -- i.e.
// get_checkpoint_block(store, attestation.data.beacon_block_root, attestation.data.target.epoch) == attestation.data.target.root
startSlotAtEpoch := targetEpoch * s.beaconCfg.SlotsPerEpoch
- if targetBlock := s.forkchoiceStore.Ancestor(root, startSlotAtEpoch); targetBlock != att.AttestantionData().Target().BlockRoot() {
- return fmt.Errorf("invalid target block. root %v targetEpoch %v attTargetBlockRoot %v targetBlock %v", root.Hex(), targetEpoch, att.AttestantionData().Target().BlockRoot().Hex(), targetBlock.Hex())
+ if targetBlock := s.forkchoiceStore.Ancestor(root, startSlotAtEpoch); targetBlock != att.Attestation.AttestantionData().Target().BlockRoot() {
+ return fmt.Errorf("invalid target block. root %v targetEpoch %v attTargetBlockRoot %v targetBlock %v", root.Hex(), targetEpoch, att.Attestation.AttestantionData().Target().BlockRoot().Hex(), targetBlock.Hex())
}
// [IGNORE] The current finalized_checkpoint is an ancestor of the block defined by attestation.data.beacon_block_root --
// i.e. get_checkpoint_block(store, attestation.data.beacon_block_root, store.finalized_checkpoint.epoch) == store.finalized_checkpoint.root
@@ -217,25 +223,50 @@ func (s *attestationService) ProcessMessage(ctx context.Context, subnet *uint64,
return fmt.Errorf("invalid finalized checkpoint %w", ErrIgnore)
}
- err = s.committeeSubscribe.CheckAggregateAttestation(att)
- if errors.Is(err, aggregation.ErrIsSuperset) {
+ if !s.committeeSubscribe.NeedToAggregate(att.Attestation) {
return ErrIgnore
}
- if err != nil {
- return err
+
+ aggregateVerificationData := &AggregateVerificationData{
+ Signatures: [][]byte{signature[:]},
+ SignRoots: [][]byte{signingRoot[:]},
+ Pks: [][]byte{pubKey[:]},
+ GossipData: att.GossipData,
+ F: func() {
+ err = s.committeeSubscribe.AggregateAttestation(att.Attestation)
+ if errors.Is(err, aggregation.ErrIsSuperset) {
+ return
+ }
+ if err != nil {
+ log.Warn("could not check aggregate attestation", "err", err)
+ return
+ }
+ s.emitters.Operation().SendAttestation(att.Attestation)
+ },
}
- s.emitters.Operation().SendAttestation(att)
- return nil
+
+ if att.ImmediateProcess {
+ return s.batchSignatureVerifier.ImmediateVerification(aggregateVerificationData)
+ }
+
+ // push the signatures to verify asynchronously and run final functions after that.
+ s.batchSignatureVerifier.AsyncVerifyAttestation(aggregateVerificationData)
+
+ // As the logic goes, if we return ErrIgnore there will be no peer banning and further publishing
+ // gossip data into the network by the gossip manager. That's what we want because we will be doing that ourselves
+ // in BatchSignatureVerifier service. After validating signatures, if they are valid we will publish the
+ // gossip ourselves or ban the peer which sent that particular invalid signature.
+ return ErrIgnore
}
type attestationJob struct {
- att *solid.Attestation
+ att *AttestationWithGossipData
creationTime time.Time
subnet uint64
}
-func (a *attestationService) scheduleAttestationForLaterProcessing(att *solid.Attestation) {
- key, err := att.HashSSZ()
+func (a *attestationService) scheduleAttestationForLaterProcessing(att *AttestationWithGossipData) {
+ key, err := att.Attestation.HashSSZ()
if err != nil {
return
}
@@ -263,7 +294,7 @@ func (a *attestationService) loop(ctx context.Context) {
return true
}
- root := v.att.AttestantionData().BeaconBlockRoot()
+ root := v.att.Attestation.AttestantionData().BeaconBlockRoot()
if _, ok := a.forkchoiceStore.GetHeader(root); !ok {
return true
}
diff --git a/cl/phase1/network/services/attestation_service_test.go b/cl/phase1/network/services/attestation_service_test.go
index fc169a15c1e..400a388982c 100644
--- a/cl/phase1/network/services/attestation_service_test.go
+++ b/cl/phase1/network/services/attestation_service_test.go
@@ -20,6 +20,7 @@ import (
"context"
"log"
"testing"
+ "time"
"github.com/stretchr/testify/suite"
"go.uber.org/mock/gomock"
@@ -76,10 +77,12 @@ func (t *attestationTestSuite) SetupTest() {
netConfig := &clparams.NetworkConfig{}
emitters := beaconevents.NewEventEmitter()
computeSigningRoot = func(obj ssz.HashableSSZ, domain []byte) ([32]byte, error) { return [32]byte{}, nil }
- blsVerify = func(sig []byte, msg []byte, pubKeys []byte) (bool, error) { return true, nil }
+ batchCheckInterval = 1 * time.Millisecond
+ batchSignatureVerifier := NewBatchSignatureVerifier(context.TODO(), nil)
+ go batchSignatureVerifier.Start()
ctx, cn := context.WithCancel(context.Background())
cn()
- t.attService = NewAttestationService(ctx, t.mockForkChoice, t.committeeSubscibe, t.ethClock, t.syncedData, t.beaconConfig, netConfig, emitters)
+ t.attService = NewAttestationService(ctx, t.mockForkChoice, t.committeeSubscibe, t.ethClock, t.syncedData, t.beaconConfig, netConfig, emitters, batchSignatureVerifier)
}
func (t *attestationTestSuite) TearDownTest() {
@@ -93,10 +96,9 @@ func (t *attestationTestSuite) TestAttestationProcessMessage() {
msg *solid.Attestation
}
tests := []struct {
- name string
- mock func()
- args args
- wantErr bool
+ name string
+ mock func()
+ args args
}{
{
name: "Test attestation with committee index out of range",
@@ -111,7 +113,6 @@ func (t *attestationTestSuite) TestAttestationProcessMessage() {
subnet: nil,
msg: att,
},
- wantErr: true,
},
{
name: "Test attestation with wrong subnet",
@@ -129,7 +130,6 @@ func (t *attestationTestSuite) TestAttestationProcessMessage() {
subnet: uint64Ptr(1),
msg: att,
},
- wantErr: true,
},
{
name: "Test attestation with wrong slot (current_slot < slot)",
@@ -148,7 +148,6 @@ func (t *attestationTestSuite) TestAttestationProcessMessage() {
subnet: uint64Ptr(1),
msg: att,
},
- wantErr: true,
},
{
name: "Attestation is aggregated",
@@ -171,7 +170,6 @@ func (t *attestationTestSuite) TestAttestationProcessMessage() {
[96]byte{0, 1, 2, 3, 4, 5},
),
},
- wantErr: true,
},
{
name: "Attestation is empty",
@@ -194,7 +192,6 @@ func (t *attestationTestSuite) TestAttestationProcessMessage() {
[96]byte{0, 1, 2, 3, 4, 5},
),
},
- wantErr: true,
},
{
name: "invalid signature",
@@ -212,16 +209,12 @@ func (t *attestationTestSuite) TestAttestationProcessMessage() {
computeSigningRoot = func(obj ssz.HashableSSZ, domain []byte) ([32]byte, error) {
return [32]byte{}, nil
}
- blsVerify = func(sig []byte, msg []byte, pubKeys []byte) (bool, error) {
- return false, nil
- }
},
args: args{
ctx: context.Background(),
subnet: uint64Ptr(1),
msg: att,
},
- wantErr: true,
},
{
name: "block header not found",
@@ -239,16 +232,12 @@ func (t *attestationTestSuite) TestAttestationProcessMessage() {
computeSigningRoot = func(obj ssz.HashableSSZ, domain []byte) ([32]byte, error) {
return [32]byte{}, nil
}
- blsVerify = func(sig []byte, msg []byte, pubKeys []byte) (bool, error) {
- return true, nil
- }
},
args: args{
ctx: context.Background(),
subnet: uint64Ptr(1),
msg: att,
},
- wantErr: true,
},
{
name: "invalid target block",
@@ -266,9 +255,6 @@ func (t *attestationTestSuite) TestAttestationProcessMessage() {
computeSigningRoot = func(obj ssz.HashableSSZ, domain []byte) ([32]byte, error) {
return [32]byte{}, nil
}
- blsVerify = func(sig []byte, msg []byte, pubKeys []byte) (bool, error) {
- return true, nil
- }
t.mockForkChoice.Headers = map[common.Hash]*cltypes.BeaconBlockHeader{
att.AttestantionData().BeaconBlockRoot(): {}, // wrong block root
}
@@ -278,7 +264,6 @@ func (t *attestationTestSuite) TestAttestationProcessMessage() {
subnet: uint64Ptr(1),
msg: att,
},
- wantErr: true,
},
{
name: "invalid finality checkpoint",
@@ -296,9 +281,6 @@ func (t *attestationTestSuite) TestAttestationProcessMessage() {
computeSigningRoot = func(obj ssz.HashableSSZ, domain []byte) ([32]byte, error) {
return [32]byte{}, nil
}
- blsVerify = func(sig []byte, msg []byte, pubKeys []byte) (bool, error) {
- return true, nil
- }
t.mockForkChoice.Headers = map[common.Hash]*cltypes.BeaconBlockHeader{
att.AttestantionData().BeaconBlockRoot(): {},
}
@@ -316,7 +298,6 @@ func (t *attestationTestSuite) TestAttestationProcessMessage() {
subnet: uint64Ptr(1),
msg: att,
},
- wantErr: true,
},
{
name: "success",
@@ -334,7 +315,7 @@ func (t *attestationTestSuite) TestAttestationProcessMessage() {
computeSigningRoot = func(obj ssz.HashableSSZ, domain []byte) ([32]byte, error) {
return [32]byte{}, nil
}
- blsVerify = func(sig []byte, msg []byte, pubKeys []byte) (bool, error) {
+ blsVerifyMultipleSignatures = func(signatures [][]byte, signRoots [][]byte, pks [][]byte) (bool, error) {
return true, nil
}
t.mockForkChoice.Headers = map[common.Hash]*cltypes.BeaconBlockHeader{
@@ -349,7 +330,8 @@ func (t *attestationTestSuite) TestAttestationProcessMessage() {
t.mockForkChoice.FinalizedCheckpointVal = solid.NewCheckpointFromParameters(
mockFinalizedCheckPoint.BlockRoot(),
mockFinalizedCheckPoint.Epoch())
- t.committeeSubscibe.EXPECT().CheckAggregateAttestation(att).Return(nil).Times(1)
+ t.committeeSubscibe.EXPECT().NeedToAggregate(att).Return(true).Times(1)
+ t.committeeSubscibe.EXPECT().AggregateAttestation(att).Return(nil).Times(1)
},
args: args{
ctx: context.Background(),
@@ -363,13 +345,9 @@ func (t *attestationTestSuite) TestAttestationProcessMessage() {
log.Printf("test case: %s", tt.name)
t.SetupTest()
tt.mock()
- err := t.attService.ProcessMessage(tt.args.ctx, tt.args.subnet, tt.args.msg)
- if tt.wantErr {
- log.Printf("err msg: %v", err)
- t.Require().Error(err, err.Error())
- } else {
- t.Require().NoError(err)
- }
+ err := t.attService.ProcessMessage(tt.args.ctx, tt.args.subnet, &AttestationWithGossipData{Attestation: tt.args.msg, GossipData: nil})
+ time.Sleep(time.Millisecond * 60)
+ t.Require().Error(err, ErrIgnore)
t.True(t.gomockCtrl.Satisfied())
}
}
diff --git a/cl/phase1/network/services/batch_signature_verification.go b/cl/phase1/network/services/batch_signature_verification.go
new file mode 100644
index 00000000000..cd262000c50
--- /dev/null
+++ b/cl/phase1/network/services/batch_signature_verification.go
@@ -0,0 +1,176 @@
+package services
+
+import (
+ "context"
+ "errors"
+ "time"
+
+ "github.com/Giulio2002/bls"
+ sentinel "github.com/erigontech/erigon-lib/gointerfaces/sentinelproto"
+ "github.com/erigontech/erigon-lib/log/v3"
+)
+
+const (
+ batchSignatureVerificationThreshold = 300
+ reservedSize = 512
+)
+
+var (
+ batchCheckInterval = 500 * time.Millisecond
+ blsVerifyMultipleSignatures = bls.VerifyMultipleSignatures
+)
+
+type BatchSignatureVerifier struct {
+ sentinel sentinel.SentinelClient
+ attVerifyAndExecute chan *AggregateVerificationData
+ aggregateProofVerify chan *AggregateVerificationData
+ ctx context.Context
+}
+
+// each AggregateVerification request has sentinel.SentinelClient and *sentinel.GossipData
+// to make sure that we can validate it separately and in case of failure we ban corresponding
+// GossipData.Peer or simply run F and publish GossipData in case signature verification succeeds.
+type AggregateVerificationData struct {
+ Signatures [][]byte
+ SignRoots [][]byte
+ Pks [][]byte
+ F func()
+ GossipData *sentinel.GossipData
+}
+
+func NewBatchSignatureVerifier(ctx context.Context, sentinel sentinel.SentinelClient) *BatchSignatureVerifier {
+ return &BatchSignatureVerifier{
+ ctx: ctx,
+ sentinel: sentinel,
+ attVerifyAndExecute: make(chan *AggregateVerificationData, 1024),
+ aggregateProofVerify: make(chan *AggregateVerificationData, 1024),
+ }
+}
+
+// AsyncVerifyAttestation schedules new verification
+func (b *BatchSignatureVerifier) AsyncVerifyAttestation(data *AggregateVerificationData) {
+ b.attVerifyAndExecute <- data
+}
+
+func (b *BatchSignatureVerifier) AsyncVerifyAggregateProof(data *AggregateVerificationData) {
+ b.aggregateProofVerify <- data
+}
+
+func (b *BatchSignatureVerifier) ImmediateVerification(data *AggregateVerificationData) error {
+ return b.processSignatureVerification([]*AggregateVerificationData{data})
+}
+
+func (b *BatchSignatureVerifier) Start() {
+ // separate goroutines for each type of verification
+ go b.start(b.attVerifyAndExecute)
+ go b.start(b.aggregateProofVerify)
+}
+
+// When receiving AggregateVerificationData, we simply collect all the signature verification data
+// and verify them together - running all the final functions afterwards
+func (b *BatchSignatureVerifier) start(incoming chan *AggregateVerificationData) {
+ ticker := time.NewTicker(batchCheckInterval)
+ defer ticker.Stop()
+ aggregateVerificationData := make([]*AggregateVerificationData, 0, reservedSize)
+ for {
+ select {
+ case <-b.ctx.Done():
+ return
+ case verification := <-incoming:
+ aggregateVerificationData = append(aggregateVerificationData, verification)
+ if len(aggregateVerificationData) >= batchSignatureVerificationThreshold {
+ b.processSignatureVerification(aggregateVerificationData)
+ ticker.Reset(batchCheckInterval)
+ // clear the slice
+ aggregateVerificationData = make([]*AggregateVerificationData, 0, reservedSize)
+ }
+ case <-ticker.C:
+ if len(aggregateVerificationData) == 0 {
+ continue
+ }
+ b.processSignatureVerification(aggregateVerificationData)
+ // clear the slice
+ aggregateVerificationData = make([]*AggregateVerificationData, 0, reservedSize)
+ }
+ }
+}
+
+// processSignatureVerification Runs signature verification for all the signatures altogether, if it
+// succeeds we publish all accumulated gossip data. If verification fails, start verifying each AggregateVerificationData one by
+// one, publish corresponding gossip data if verification succeeds, if not ban the corresponding peer that sent it.
+func (b *BatchSignatureVerifier) processSignatureVerification(aggregateVerificationData []*AggregateVerificationData) error {
+ signatures, signRoots, pks, fns :=
+ make([][]byte, 0, reservedSize),
+ make([][]byte, 0, reservedSize),
+ make([][]byte, 0, reservedSize),
+ make([]func(), 0, reservedSize)
+
+ for _, v := range aggregateVerificationData {
+ signatures, signRoots, pks, fns =
+ append(signatures, v.Signatures...),
+ append(signRoots, v.SignRoots...),
+ append(pks, v.Pks...),
+ append(fns, v.F)
+ }
+ if err := b.runBatchVerification(signatures, signRoots, pks, fns); err != nil {
+ b.handleIncorrectSignatures(aggregateVerificationData)
+ log.Warn(err.Error())
+ return err
+ }
+
+ // Everything went well, run corresponding Fs and send all the gossip data to the network
+ for _, v := range aggregateVerificationData {
+ v.F()
+ if b.sentinel != nil && v.GossipData != nil {
+ if _, err := b.sentinel.PublishGossip(b.ctx, v.GossipData); err != nil {
+ log.Warn("failed publish gossip", "err", err)
+ return err
+ }
+ }
+ }
+ return nil
+}
+
+// we could locate failing signature with binary search but for now let's choose simplicity over optimisation.
+func (b *BatchSignatureVerifier) handleIncorrectSignatures(aggregateVerificationData []*AggregateVerificationData) {
+ for _, v := range aggregateVerificationData {
+ valid, err := blsVerifyMultipleSignatures(v.Signatures, v.SignRoots, v.Pks)
+ if err != nil {
+ log.Warn("signature verification failed with the error: " + err.Error())
+ if b.sentinel != nil && v.GossipData != nil && v.GossipData.Peer != nil {
+ b.sentinel.BanPeer(b.ctx, v.GossipData.Peer)
+ }
+ continue
+ }
+
+ if !valid {
+ log.Warn("batch invalid signature")
+ if b.sentinel != nil && v.GossipData != nil && v.GossipData.Peer != nil {
+ b.sentinel.BanPeer(b.ctx, v.GossipData.Peer)
+ }
+ continue
+ }
+
+ // run corresponding function and publish the gossip into the network
+ v.F()
+
+ if b.sentinel != nil && v.GossipData != nil {
+ if _, err := b.sentinel.PublishGossip(b.ctx, v.GossipData); err != nil {
+ log.Warn("failed publish gossip", "err", err)
+ }
+ }
+ }
+}
+
+func (b *BatchSignatureVerifier) runBatchVerification(signatures [][]byte, signRoots [][]byte, pks [][]byte, fns []func()) error {
+ valid, err := blsVerifyMultipleSignatures(signatures, signRoots, pks)
+ if err != nil {
+ return errors.New("batch signature verification failed with the error: " + err.Error())
+ }
+
+ if !valid {
+ return errors.New("batch invalid signature")
+ }
+
+ return nil
+}
diff --git a/cl/phase1/network/services/block_service.go b/cl/phase1/network/services/block_service.go
index 62a225af097..a41699a26bb 100644
--- a/cl/phase1/network/services/block_service.go
+++ b/cl/phase1/network/services/block_service.go
@@ -18,6 +18,7 @@ package services
import (
"context"
+ "errors"
"sync"
"time"
@@ -32,9 +33,14 @@ import (
"github.com/erigontech/erigon/cl/persistence/beacon_indicies"
"github.com/erigontech/erigon/cl/phase1/core/state/lru"
"github.com/erigontech/erigon/cl/phase1/forkchoice"
+ "github.com/erigontech/erigon/cl/transition/impl/eth2"
"github.com/erigontech/erigon/cl/utils/eth_clock"
)
+var (
+ ErrInvalidSignature = errors.New("invalid signature")
+)
+
type proposerIndexAndSlot struct {
proposerIndex uint64
slot uint64
@@ -120,6 +126,12 @@ func (b *blockService) ProcessMessage(ctx context.Context, _ *uint64, msg *cltyp
return ErrIgnore
}
+ if ok, err := eth2.VerifyBlockSignature(headState, msg); err != nil {
+ return err
+ } else if !ok {
+ return ErrInvalidSignature
+ }
+
// [IGNORE] The block's parent (defined by block.parent_root) has been seen (via both gossip and non-gossip sources) (a client MAY queue blocks for processing once the parent block is retrieved).
parentHeader, ok := b.forkchoiceStore.GetHeader(msg.Block.ParentRoot)
if !ok {
diff --git a/cl/phase1/network/services/bls_to_execution_change_service.go b/cl/phase1/network/services/bls_to_execution_change_service.go
index 4b8e20e442a..790d7913231 100644
--- a/cl/phase1/network/services/bls_to_execution_change_service.go
+++ b/cl/phase1/network/services/bls_to_execution_change_service.go
@@ -22,6 +22,7 @@ import (
"errors"
"fmt"
+ "github.com/Giulio2002/bls"
libcommon "github.com/erigontech/erigon-lib/common"
"github.com/erigontech/erigon/cl/beacon/beaconevents"
"github.com/erigontech/erigon/cl/beacon/synced_data"
@@ -32,6 +33,10 @@ import (
"github.com/erigontech/erigon/cl/utils"
)
+var (
+ blsVerify = bls.Verify
+)
+
type blsToExecutionChangeService struct {
operationsPool pool.OperationsPool
emitters *beaconevents.EventEmitter
diff --git a/cl/phase1/network/services/constants.go b/cl/phase1/network/services/constants.go
index 8de33883449..106315bfa24 100644
--- a/cl/phase1/network/services/constants.go
+++ b/cl/phase1/network/services/constants.go
@@ -29,8 +29,8 @@ const (
blobJobsIntervalTick = 5 * time.Millisecond
singleAttestationIntervalTick = 10 * time.Millisecond
attestationJobsIntervalTick = 100 * time.Millisecond
- blockJobExpiry = 24 * time.Second
- blobJobExpiry = 24 * time.Second
+ blockJobExpiry = 4 * time.Second
+ blobJobExpiry = 4 * time.Second
attestationJobExpiry = 30 * time.Minute
singleAttestationJobExpiry = 6 * time.Second
)
diff --git a/cl/phase1/network/services/interface.go b/cl/phase1/network/services/interface.go
index 6d4a005e482..175babb414f 100644
--- a/cl/phase1/network/services/interface.go
+++ b/cl/phase1/network/services/interface.go
@@ -20,7 +20,6 @@ import (
"context"
"github.com/erigontech/erigon/cl/cltypes"
- "github.com/erigontech/erigon/cl/cltypes/solid"
)
// Note: BlobSidecarService and BlockService are tested in spectests
@@ -42,10 +41,10 @@ type SyncCommitteeMessagesService Service[*cltypes.SyncCommitteeMessage]
type SyncContributionService Service[*cltypes.SignedContributionAndProof]
//go:generate mockgen -typed=true -destination=./mock_services/aggregate_and_proof_service_mock.go -package=mock_services . AggregateAndProofService
-type AggregateAndProofService Service[*cltypes.SignedAggregateAndProof]
+type AggregateAndProofService Service[*cltypes.SignedAggregateAndProofData]
//go:generate mockgen -typed=true -destination=./mock_services/attestation_service_mock.go -package=mock_services . AttestationService
-type AttestationService Service[*solid.Attestation]
+type AttestationService Service[*AttestationWithGossipData]
//go:generate mockgen -typed=true -destination=./mock_services/voluntary_exit_service_mock.go -package=mock_services . VoluntaryExitService
type VoluntaryExitService Service[*cltypes.SignedVoluntaryExit]
diff --git a/cl/phase1/network/services/mock_services/aggregate_and_proof_service_mock.go b/cl/phase1/network/services/mock_services/aggregate_and_proof_service_mock.go
index 1d2f4b166de..f579ba0cee0 100644
--- a/cl/phase1/network/services/mock_services/aggregate_and_proof_service_mock.go
+++ b/cl/phase1/network/services/mock_services/aggregate_and_proof_service_mock.go
@@ -41,7 +41,7 @@ func (m *MockAggregateAndProofService) EXPECT() *MockAggregateAndProofServiceMoc
}
// ProcessMessage mocks base method.
-func (m *MockAggregateAndProofService) ProcessMessage(arg0 context.Context, arg1 *uint64, arg2 *cltypes.SignedAggregateAndProof) error {
+func (m *MockAggregateAndProofService) ProcessMessage(arg0 context.Context, arg1 *uint64, arg2 *cltypes.SignedAggregateAndProofData) error {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "ProcessMessage", arg0, arg1, arg2)
ret0, _ := ret[0].(error)
@@ -67,13 +67,13 @@ func (c *MockAggregateAndProofServiceProcessMessageCall) Return(arg0 error) *Moc
}
// Do rewrite *gomock.Call.Do
-func (c *MockAggregateAndProofServiceProcessMessageCall) Do(f func(context.Context, *uint64, *cltypes.SignedAggregateAndProof) error) *MockAggregateAndProofServiceProcessMessageCall {
+func (c *MockAggregateAndProofServiceProcessMessageCall) Do(f func(context.Context, *uint64, *cltypes.SignedAggregateAndProofData) error) *MockAggregateAndProofServiceProcessMessageCall {
c.Call = c.Call.Do(f)
return c
}
// DoAndReturn rewrite *gomock.Call.DoAndReturn
-func (c *MockAggregateAndProofServiceProcessMessageCall) DoAndReturn(f func(context.Context, *uint64, *cltypes.SignedAggregateAndProof) error) *MockAggregateAndProofServiceProcessMessageCall {
+func (c *MockAggregateAndProofServiceProcessMessageCall) DoAndReturn(f func(context.Context, *uint64, *cltypes.SignedAggregateAndProofData) error) *MockAggregateAndProofServiceProcessMessageCall {
c.Call = c.Call.DoAndReturn(f)
return c
}
diff --git a/cl/phase1/stages/forkchoice.go b/cl/phase1/stages/forkchoice.go
index 190453526b0..b72e9530ed7 100644
--- a/cl/phase1/stages/forkchoice.go
+++ b/cl/phase1/stages/forkchoice.go
@@ -16,7 +16,6 @@ import (
"github.com/erigontech/erigon/cl/persistence/beacon_indicies"
state_accessors "github.com/erigontech/erigon/cl/persistence/state"
"github.com/erigontech/erigon/cl/phase1/core/state"
- "github.com/erigontech/erigon/cl/transition"
"github.com/erigontech/erigon/cl/utils"
"github.com/erigontech/erigon/core/types"
"github.com/erigontech/erigon/turbo/engineapi/engine_types"
@@ -217,27 +216,18 @@ func emitHeadEvent(cfg *Cfg, headSlot uint64, headRoot common.Hash, headState *s
func emitNextPaylodAttributesEvent(cfg *Cfg, headSlot uint64, headRoot common.Hash, s *state.CachingBeaconState) error {
headPayloadHeader := s.LatestExecutionPayloadHeader().Copy()
- nextSlotState, err := s.Copy()
- if err != nil {
- log.Warn("failed to copy state", "err", err, "slot", headSlot)
- return err
- }
nextSlot := headSlot + 1
- if err := transition.DefaultMachine.ProcessSlots(nextSlotState, nextSlot); err != nil {
- log.Warn("failed to process slots", "err", err, "next_slot", nextSlot)
- return err
- }
+
epoch := cfg.ethClock.GetEpochAtSlot(nextSlot)
- randaoMix := nextSlotState.GetRandaoMixes(epoch)
+ randaoMix := s.GetRandaoMixes(epoch)
- proposerIndex, err := nextSlotState.GetBeaconProposerIndexForSlot(nextSlot)
+ proposerIndex, err := s.GetBeaconProposerIndexForSlot(nextSlot)
if err != nil {
log.Warn("failed to get proposer index", "err", err)
return err
}
- feeRecipient := nextSlotState.LatestExecutionPayloadHeader().FeeRecipient
withdrawals := []*types.Withdrawal{}
- for _, w := range state.ExpectedWithdrawals(nextSlotState, cfg.ethClock.GetEpochAtSlot(nextSlot)) {
+ for _, w := range state.ExpectedWithdrawals(s, epoch) {
withdrawals = append(withdrawals, &types.Withdrawal{
Amount: w.Amount,
Index: w.Index,
@@ -248,12 +238,12 @@ func emitNextPaylodAttributesEvent(cfg *Cfg, headSlot uint64, headRoot common.Ha
payloadAttributes := engine_types.PayloadAttributes{
Timestamp: hexutil.Uint64(headPayloadHeader.Time + cfg.beaconCfg.SecondsPerSlot),
PrevRandao: randaoMix,
- SuggestedFeeRecipient: feeRecipient,
+ SuggestedFeeRecipient: (common.Address{}), // We can not know this ahead of time
ParentBeaconBlockRoot: &headRoot,
Withdrawals: withdrawals,
}
e := &beaconevents.PayloadAttributesData{
- Version: nextSlotState.Version().String(),
+ Version: cfg.beaconCfg.GetCurrentStateVersion(epoch).String(),
Data: beaconevents.PayloadAttributesContent{
ProposerIndex: proposerIndex,
ProposalSlot: nextSlot,
diff --git a/cl/sentinel/discovery.go b/cl/sentinel/discovery.go
index 02a1fff5db3..384c752dc9a 100644
--- a/cl/sentinel/discovery.go
+++ b/cl/sentinel/discovery.go
@@ -30,14 +30,21 @@ import (
"github.com/erigontech/erigon/cl/clparams"
"github.com/erigontech/erigon/p2p/enode"
"github.com/erigontech/erigon/p2p/enr"
+ "golang.org/x/sync/semaphore"
)
-const peerSubnetTarget = 4
+const (
+ peerSubnetTarget = 4
+ goRoutinesOpeningPeerConnections = 4
+)
// ConnectWithPeer is used to attempt to connect and add the peer to our pool
// it errors when if fail to connect with the peer, for instance, if it fails the handshake
// if it does not return an error, the peer is attempted to be added to the pool
-func (s *Sentinel) ConnectWithPeer(ctx context.Context, info peer.AddrInfo) (err error) {
+func (s *Sentinel) ConnectWithPeer(ctx context.Context, info peer.AddrInfo, sem *semaphore.Weighted) (err error) {
+ if sem != nil {
+ defer sem.Release(1)
+ }
if info.ID == s.host.ID() {
return nil
}
@@ -63,7 +70,7 @@ func (s *Sentinel) connectWithAllPeers(multiAddrs []multiaddr.Multiaddr) error {
}
for _, peerInfo := range addrInfos {
go func(peerInfo peer.AddrInfo) {
- if err := s.ConnectWithPeer(s.ctx, peerInfo); err != nil {
+ if err := s.ConnectWithPeer(s.ctx, peerInfo, nil); err != nil {
log.Trace("[Sentinel] Could not connect with peer", "err", err)
}
}(peerInfo)
@@ -90,6 +97,9 @@ func (s *Sentinel) listenForPeers() {
log.Warn("Could not connect to static peers", "reason", err)
}
+ // limit the number of goroutines opening connection with peers
+ sem := semaphore.NewWeighted(int64(goRoutinesOpeningPeerConnections))
+
iterator := s.listener.RandomNodes()
defer iterator.Close()
for {
@@ -122,8 +132,16 @@ func (s *Sentinel) listenForPeers() {
continue
}
+ if err := sem.Acquire(s.ctx, 1); err != nil {
+ if errors.Is(err, context.Canceled) {
+ break
+ }
+ log.Error("[caplin] Failed to acquire sem for opening peer connection", "err", err)
+ continue
+ }
+
go func() {
- if err := s.ConnectWithPeer(s.ctx, *peerInfo); err != nil {
+ if err := s.ConnectWithPeer(s.ctx, *peerInfo, sem); err != nil {
log.Trace("[Sentinel] Could not connect with peer", "err", err)
}
}()
diff --git a/cl/sentinel/handlers/heartbeats.go b/cl/sentinel/handlers/heartbeats.go
index e5431af9424..431bdb44367 100644
--- a/cl/sentinel/handlers/heartbeats.go
+++ b/cl/sentinel/handlers/heartbeats.go
@@ -54,7 +54,7 @@ func (c *ConsensusHandlers) goodbyeHandler(s network.Stream) error {
if gid.Id > 250 { // 250 is the status code for getting banned due to whatever reason
v, err := c.host.Peerstore().Get("AgentVersion", peerId)
if err == nil {
- log.Debug("Received goodbye message from peer", "v", v)
+ log.Warn("Received goodbye message from peer", "v", v)
}
}
diff --git a/cl/transition/impl/eth2/validation.go b/cl/transition/impl/eth2/validation.go
index 05348d735ec..e8549e4ef7c 100644
--- a/cl/transition/impl/eth2/validation.go
+++ b/cl/transition/impl/eth2/validation.go
@@ -45,7 +45,7 @@ func (I *impl) VerifyBlockSignature(s abstract.BeaconState, block *cltypes.Signe
if !I.FullValidation {
return nil
}
- valid, err := verifyBlockSignature(s, block)
+ valid, err := VerifyBlockSignature(s, block)
if err != nil {
return fmt.Errorf("error validating block signature: %v", err)
}
@@ -55,7 +55,7 @@ func (I *impl) VerifyBlockSignature(s abstract.BeaconState, block *cltypes.Signe
return nil
}
-func verifyBlockSignature(s abstract.BeaconState, block *cltypes.SignedBeaconBlock) (bool, error) {
+func VerifyBlockSignature(s abstract.BeaconState, block *cltypes.SignedBeaconBlock) (bool, error) {
proposer, err := s.ValidatorForValidatorIndex(int(block.Block.ProposerIndex))
if err != nil {
return false, err
diff --git a/cl/utils/bytes.go b/cl/utils/bytes.go
index b9a77940523..f949e4a3685 100644
--- a/cl/utils/bytes.go
+++ b/cl/utils/bytes.go
@@ -143,6 +143,16 @@ func IsNonStrictSupersetBitlist(a, b []byte) bool {
return true
}
+func IsOverlappingBitlist(a, b []byte) bool {
+ length := min(len(a), len(b))
+ for i := range length {
+ if a[i]&b[i] != 0 {
+ return true
+ }
+ }
+ return false
+}
+
func BitsOnCount(b []byte) int {
count := 0
for _, v := range b {
diff --git a/cl/validator/committee_subscription/committee_subscription.go b/cl/validator/committee_subscription/committee_subscription.go
index 5b4a9134443..c1303753fb5 100644
--- a/cl/validator/committee_subscription/committee_subscription.go
+++ b/cl/validator/committee_subscription/committee_subscription.go
@@ -34,6 +34,7 @@ import (
"github.com/erigontech/erigon/cl/gossip"
"github.com/erigontech/erigon/cl/phase1/core/state"
"github.com/erigontech/erigon/cl/phase1/network/subnets"
+ "github.com/erigontech/erigon/cl/utils"
"github.com/erigontech/erigon/cl/utils/eth_clock"
)
@@ -88,9 +89,8 @@ func NewCommitteeSubscribeManagement(
}
type validatorSub struct {
- subnetId uint64
- aggregate bool
- latestTargetSlot uint64
+ aggregate bool
+ largestTargetSlot uint64
}
func (c *CommitteeSubscribeMgmt) AddAttestationSubscription(ctx context.Context, p *cltypes.BeaconCommitteeSubscription) error {
@@ -111,25 +111,24 @@ func (c *CommitteeSubscribeMgmt) AddAttestationSubscription(ctx context.Context,
if _, ok := c.validatorSubs[cIndex]; !ok {
c.validatorSubs[cIndex] = &validatorSub{
- subnetId: subnetId,
- aggregate: p.IsAggregator,
- latestTargetSlot: slot,
+ aggregate: p.IsAggregator,
+ largestTargetSlot: slot,
}
} else {
// set aggregator to true if any validator in the committee is an aggregator
c.validatorSubs[cIndex].aggregate = (c.validatorSubs[cIndex].aggregate || p.IsAggregator)
// update latest target slot
- if c.validatorSubs[cIndex].latestTargetSlot < slot {
- c.validatorSubs[cIndex].latestTargetSlot = slot
+ if c.validatorSubs[cIndex].largestTargetSlot < slot {
+ c.validatorSubs[cIndex].largestTargetSlot = slot
}
}
-
c.validatorSubsMutex.Unlock()
+ epochDuration := time.Duration(c.beaconConfig.SlotsPerEpoch) * time.Duration(c.beaconConfig.SecondsPerSlot) * time.Second
// set sentinel gossip expiration by subnet id
request := sentinel.RequestSubscribeExpiry{
Topic: gossip.TopicNameBeaconAttestation(subnetId),
- ExpiryUnixSecs: uint64(time.Now().Add(30 * time.Minute).Unix()), // temporarily set to 30 minutes
+ ExpiryUnixSecs: uint64(time.Now().Add(epochDuration).Unix()), // expire after epoch
}
if _, err := c.sentinel.SetSubscribeExpiry(ctx, &request); err != nil {
return err
@@ -137,7 +136,7 @@ func (c *CommitteeSubscribeMgmt) AddAttestationSubscription(ctx context.Context,
return nil
}
-func (c *CommitteeSubscribeMgmt) CheckAggregateAttestation(att *solid.Attestation) error {
+func (c *CommitteeSubscribeMgmt) AggregateAttestation(att *solid.Attestation) error {
committeeIndex := att.AttestantionData().CommitteeIndex()
c.validatorSubsMutex.RLock()
defer c.validatorSubsMutex.RUnlock()
@@ -150,6 +149,29 @@ func (c *CommitteeSubscribeMgmt) CheckAggregateAttestation(att *solid.Attestatio
return nil
}
+func (c *CommitteeSubscribeMgmt) NeedToAggregate(att *solid.Attestation) bool {
+ var (
+ committeeIndex = att.AttestantionData().CommitteeIndex()
+ )
+
+ c.validatorSubsMutex.RLock()
+ defer c.validatorSubsMutex.RUnlock()
+ if sub, ok := c.validatorSubs[committeeIndex]; ok && sub.aggregate {
+ root, err := att.AttestantionData().HashSSZ()
+ if err != nil {
+ log.Warn("failed to hash attestation data", "err", err)
+ return false
+ }
+ aggregation := c.aggregationPool.GetAggregatationByRoot(root)
+ if aggregation == nil ||
+ !utils.IsNonStrictSupersetBitlist(aggregation.AggregationBits(), att.AggregationBits()) {
+ // the on bit is not set. need to aggregate
+ return true
+ }
+ }
+ return false
+}
+
func (c *CommitteeSubscribeMgmt) sweepByStaleSlots(ctx context.Context) {
slotIsStale := func(curSlot, targetSlot uint64) bool {
if curSlot <= targetSlot {
@@ -158,8 +180,8 @@ func (c *CommitteeSubscribeMgmt) sweepByStaleSlots(ctx context.Context) {
}
return curSlot-targetSlot > c.netConfig.AttestationPropagationSlotRange
}
- // sweep every minute
- ticker := time.NewTicker(time.Duration(c.beaconConfig.SecondsPerSlot) * time.Second)
+ // sweep every 3 seconds
+ ticker := time.NewTicker(3 * time.Second)
defer ticker.Stop()
for {
select {
@@ -170,11 +192,11 @@ func (c *CommitteeSubscribeMgmt) sweepByStaleSlots(ctx context.Context) {
toRemoves := make([]uint64, 0)
c.validatorSubsMutex.Lock()
for committeeIdx, sub := range c.validatorSubs {
- if slotIsStale(curSlot, sub.latestTargetSlot) {
+ if slotIsStale(curSlot, sub.largestTargetSlot) {
toRemoves = append(toRemoves, committeeIdx)
}
// try remove aggregator flag to avoid unnecessary aggregation
- if curSlot > sub.latestTargetSlot {
+ if curSlot > sub.largestTargetSlot {
sub.aggregate = false
}
}
diff --git a/cl/validator/committee_subscription/interface.go b/cl/validator/committee_subscription/interface.go
index 1c2f3bf0149..7c1982f28b1 100644
--- a/cl/validator/committee_subscription/interface.go
+++ b/cl/validator/committee_subscription/interface.go
@@ -26,5 +26,6 @@ import (
//go:generate mockgen -typed=true -destination=./mock_services/committee_subscribe_mock.go -package=mock_services . CommitteeSubscribe
type CommitteeSubscribe interface {
AddAttestationSubscription(ctx context.Context, p *cltypes.BeaconCommitteeSubscription) error
- CheckAggregateAttestation(att *solid.Attestation) error
+ AggregateAttestation(att *solid.Attestation) error
+ NeedToAggregate(att *solid.Attestation) bool
}
diff --git a/cl/validator/committee_subscription/mock_services/committee_subscribe_mock.go b/cl/validator/committee_subscription/mock_services/committee_subscribe_mock.go
index 58dd1c84e69..b809ec83bed 100644
--- a/cl/validator/committee_subscription/mock_services/committee_subscribe_mock.go
+++ b/cl/validator/committee_subscription/mock_services/committee_subscribe_mock.go
@@ -79,40 +79,78 @@ func (c *MockCommitteeSubscribeAddAttestationSubscriptionCall) DoAndReturn(f fun
return c
}
-// CheckAggregateAttestation mocks base method.
-func (m *MockCommitteeSubscribe) CheckAggregateAttestation(arg0 *solid.Attestation) error {
+// AggregateAttestation mocks base method.
+func (m *MockCommitteeSubscribe) AggregateAttestation(arg0 *solid.Attestation) error {
m.ctrl.T.Helper()
- ret := m.ctrl.Call(m, "CheckAggregateAttestation", arg0)
+ ret := m.ctrl.Call(m, "AggregateAttestation", arg0)
ret0, _ := ret[0].(error)
return ret0
}
-// CheckAggregateAttestation indicates an expected call of CheckAggregateAttestation.
-func (mr *MockCommitteeSubscribeMockRecorder) CheckAggregateAttestation(arg0 any) *MockCommitteeSubscribeCheckAggregateAttestationCall {
+// AggregateAttestation indicates an expected call of AggregateAttestation.
+func (mr *MockCommitteeSubscribeMockRecorder) AggregateAttestation(arg0 any) *MockCommitteeSubscribeAggregateAttestationCall {
mr.mock.ctrl.T.Helper()
- call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CheckAggregateAttestation", reflect.TypeOf((*MockCommitteeSubscribe)(nil).CheckAggregateAttestation), arg0)
- return &MockCommitteeSubscribeCheckAggregateAttestationCall{Call: call}
+ call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AggregateAttestation", reflect.TypeOf((*MockCommitteeSubscribe)(nil).AggregateAttestation), arg0)
+ return &MockCommitteeSubscribeAggregateAttestationCall{Call: call}
}
-// MockCommitteeSubscribeCheckAggregateAttestationCall wrap *gomock.Call
-type MockCommitteeSubscribeCheckAggregateAttestationCall struct {
+// MockCommitteeSubscribeAggregateAttestationCall wrap *gomock.Call
+type MockCommitteeSubscribeAggregateAttestationCall struct {
*gomock.Call
}
// Return rewrite *gomock.Call.Return
-func (c *MockCommitteeSubscribeCheckAggregateAttestationCall) Return(arg0 error) *MockCommitteeSubscribeCheckAggregateAttestationCall {
+func (c *MockCommitteeSubscribeAggregateAttestationCall) Return(arg0 error) *MockCommitteeSubscribeAggregateAttestationCall {
c.Call = c.Call.Return(arg0)
return c
}
// Do rewrite *gomock.Call.Do
-func (c *MockCommitteeSubscribeCheckAggregateAttestationCall) Do(f func(*solid.Attestation) error) *MockCommitteeSubscribeCheckAggregateAttestationCall {
+func (c *MockCommitteeSubscribeAggregateAttestationCall) Do(f func(*solid.Attestation) error) *MockCommitteeSubscribeAggregateAttestationCall {
c.Call = c.Call.Do(f)
return c
}
// DoAndReturn rewrite *gomock.Call.DoAndReturn
-func (c *MockCommitteeSubscribeCheckAggregateAttestationCall) DoAndReturn(f func(*solid.Attestation) error) *MockCommitteeSubscribeCheckAggregateAttestationCall {
+func (c *MockCommitteeSubscribeAggregateAttestationCall) DoAndReturn(f func(*solid.Attestation) error) *MockCommitteeSubscribeAggregateAttestationCall {
+ c.Call = c.Call.DoAndReturn(f)
+ return c
+}
+
+// NeedToAggregate mocks base method.
+func (m *MockCommitteeSubscribe) NeedToAggregate(arg0 *solid.Attestation) bool {
+ m.ctrl.T.Helper()
+ ret := m.ctrl.Call(m, "NeedToAggregate", arg0)
+ ret0, _ := ret[0].(bool)
+ return ret0
+}
+
+// NeedToAggregate indicates an expected call of NeedToAggregate.
+func (mr *MockCommitteeSubscribeMockRecorder) NeedToAggregate(arg0 any) *MockCommitteeSubscribeNeedToAggregateCall {
+ mr.mock.ctrl.T.Helper()
+ call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NeedToAggregate", reflect.TypeOf((*MockCommitteeSubscribe)(nil).NeedToAggregate), arg0)
+ return &MockCommitteeSubscribeNeedToAggregateCall{Call: call}
+}
+
+// MockCommitteeSubscribeNeedToAggregateCall wrap *gomock.Call
+type MockCommitteeSubscribeNeedToAggregateCall struct {
+ *gomock.Call
+}
+
+// Return rewrite *gomock.Call.Return
+func (c *MockCommitteeSubscribeNeedToAggregateCall) Return(arg0 bool) *MockCommitteeSubscribeNeedToAggregateCall {
+ c.Call = c.Call.Return(arg0)
+ return c
+}
+
+// Do rewrite *gomock.Call.Do
+func (c *MockCommitteeSubscribeNeedToAggregateCall) Do(f func(*solid.Attestation) bool) *MockCommitteeSubscribeNeedToAggregateCall {
+ c.Call = c.Call.Do(f)
+ return c
+}
+
+// DoAndReturn rewrite *gomock.Call.DoAndReturn
+func (c *MockCommitteeSubscribeNeedToAggregateCall) DoAndReturn(f func(*solid.Attestation) bool) *MockCommitteeSubscribeNeedToAggregateCall {
c.Call = c.Call.DoAndReturn(f)
return c
}
diff --git a/cmd/caplin/caplin1/run.go b/cmd/caplin/caplin1/run.go
index 0d9dda4d9fe..e8a3e6e02c8 100644
--- a/cmd/caplin/caplin1/run.go
+++ b/cmd/caplin/caplin1/run.go
@@ -308,16 +308,22 @@ func RunCaplinService(ctx context.Context, engine execution_client.ExecutionEngi
}
beaconRpc := rpc.NewBeaconRpcP2P(ctx, sentinel, beaconConfig, ethClock)
committeeSub := committee_subscription.NewCommitteeSubscribeManagement(ctx, indexDB, beaconConfig, networkConfig, ethClock, sentinel, state, aggregationPool, syncedDataManager)
+ batchSignatureVerifier := services.NewBatchSignatureVerifier(ctx, sentinel)
// Define gossip services
blockService := services.NewBlockService(ctx, indexDB, forkChoice, syncedDataManager, ethClock, beaconConfig, emitters)
blobService := services.NewBlobSidecarService(ctx, beaconConfig, forkChoice, syncedDataManager, ethClock, emitters, false)
syncCommitteeMessagesService := services.NewSyncCommitteeMessagesService(beaconConfig, ethClock, syncedDataManager, syncContributionPool, false)
- attestationService := services.NewAttestationService(ctx, forkChoice, committeeSub, ethClock, syncedDataManager, beaconConfig, networkConfig, emitters)
+ attestationService := services.NewAttestationService(ctx, forkChoice, committeeSub, ethClock, syncedDataManager, beaconConfig, networkConfig, emitters, batchSignatureVerifier)
syncContributionService := services.NewSyncContributionService(syncedDataManager, beaconConfig, syncContributionPool, ethClock, emitters, false)
- aggregateAndProofService := services.NewAggregateAndProofService(ctx, syncedDataManager, forkChoice, beaconConfig, pool, false)
+ aggregateAndProofService := services.NewAggregateAndProofService(ctx, syncedDataManager, forkChoice, beaconConfig, pool, false, batchSignatureVerifier)
voluntaryExitService := services.NewVoluntaryExitService(pool, emitters, syncedDataManager, beaconConfig, ethClock)
blsToExecutionChangeService := services.NewBLSToExecutionChangeService(pool, emitters, syncedDataManager, beaconConfig)
proposerSlashingService := services.NewProposerSlashingService(pool, syncedDataManager, beaconConfig, ethClock, emitters)
+
+ {
+ go batchSignatureVerifier.Start()
+ }
+
// Create the gossip manager
gossipManager := network.NewGossipReceiver(sentinel, forkChoice, beaconConfig, networkConfig, ethClock, emitters, committeeSub,
blockService, blobService, syncCommitteeMessagesService, syncContributionService, aggregateAndProofService,
diff --git a/cmd/devnet/README.md b/cmd/devnet/README.md
index b3bb1d7c2f7..aa37f1ac4ec 100644
--- a/cmd/devnet/README.md
+++ b/cmd/devnet/README.md
@@ -16,15 +16,15 @@ The specification of both nodes and scenarios for the devnet is done by specifyi
The devnet runs as a single `go` process which can be started with the following arguments:
| Arg | Required | Default | Description |
-| --- | -------- | ------- | ----------- |
-| datadir | Y | | The data directory for the devnet contains all the devnet nodes data and logs |
-| chain | N | dev | The devnet chain to run currently supported: dev or bor-devnet |
-| bor.withoutheimdall | N | false | Bor specific - tells the devnet to run without a heimdall service. With this flag only a single validator is supported on the devnet |
-| metrics | N | false | Enable metrics collection and reporting from devnet nodes |
-| metrics.node | N | 0 | At the moment only one node on the network can produce metrics. This value specifies index of the node in the cluster to attach to |
-| metrics.port | N | 6060 | The network port of the node to connect to for gather ing metrics |
-| diagnostics.addr | N | | Address of the diagnostics system provided by the support team, include unique session PIN, if this is specified the devnet will start a `support` tunnel and connect to the diagnostics platform to provide metrics from the specified node on the devnet |
-| insecure | N | false | Used if `diagnostics.addr` is set to allow communication with diagnostics system
+| --- | -------- |---------| ----------- |
+| datadir | Y | | The data directory for the devnet contains all the devnet nodes data and logs |
+| chain | N | dev | The devnet chain to run currently supported: dev or bor-devnet |
+| bor.withoutheimdall | N | false | Bor specific - tells the devnet to run without a heimdall service. With this flag only a single validator is supported on the devnet |
+| metrics | N | false | Enable metrics collection and reporting from devnet nodes |
+| metrics.node | N | 0 | At the moment only one node on the network can produce metrics. This value specifies index of the node in the cluster to attach to |
+| metrics.port | N | 6061 | The network port of the node to connect to for gather ing metrics |
+| diagnostics.addr | N | | Address of the diagnostics system provided by the support team, include unique session PIN, if this is specified the devnet will start a `support` tunnel and connect to the diagnostics platform to provide metrics from the specified node on the devnet |
+| insecure | N | false | Used if `diagnostics.addr` is set to allow communication with diagnostics system
## Network Configuration
diff --git a/cmd/devnet/main.go b/cmd/devnet/main.go
index 102d5a3e2be..765366d914f 100644
--- a/cmd/devnet/main.go
+++ b/cmd/devnet/main.go
@@ -32,7 +32,6 @@ import (
"github.com/erigontech/erigon-lib/log/v3"
"github.com/erigontech/erigon-lib/chain/networkname"
- "github.com/erigontech/erigon-lib/common/metrics"
"github.com/erigontech/erigon/cmd/devnet/accounts"
_ "github.com/erigontech/erigon/cmd/devnet/accounts/steps"
_ "github.com/erigontech/erigon/cmd/devnet/admin"
@@ -118,7 +117,7 @@ var (
MetricsPortFlag = cli.IntFlag{
Name: "metrics.port",
Usage: "Metrics HTTP server listening port",
- Value: metrics.DefaultConfig.Port,
+ Value: 6061,
}
DiagnosticsURLFlag = cli.StringFlag{
diff --git a/cmd/devnet/services/polygon/heimdallsim/heimdall_simulator_test.go b/cmd/devnet/services/polygon/heimdallsim/heimdall_simulator_test.go
index 8031a036e19..61dfa5cac0b 100644
--- a/cmd/devnet/services/polygon/heimdallsim/heimdall_simulator_test.go
+++ b/cmd/devnet/services/polygon/heimdallsim/heimdall_simulator_test.go
@@ -94,6 +94,9 @@ func TestSimulatorEvents(t *testing.T) {
t.Skip("fix me on win")
}
+ // the number of events included in v1-000000-000500-borevents.seg
+ eventsCount := 23
+
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
@@ -101,7 +104,7 @@ func TestSimulatorEvents(t *testing.T) {
res, err := sim.FetchStateSyncEvents(ctx, 0, time.Now(), 100)
assert.NoError(t, err)
- assert.Equal(t, 100, len(res))
+ assert.Equal(t, eventsCount, len(res))
resLimit, err := sim.FetchStateSyncEvents(ctx, 0, time.Now(), 2)
assert.NoError(t, err)
@@ -117,7 +120,7 @@ func TestSimulatorEvents(t *testing.T) {
lastTime := res[len(res)-1].Time
resTime, err := sim.FetchStateSyncEvents(ctx, 0, lastTime.Add(-1*time.Second), 100)
assert.NoError(t, err)
- assert.Equal(t, 99, len(resTime))
+ assert.Equal(t, eventsCount-1, len(resTime))
assert.Equal(t, res[:len(res)-1], resTime)
}
diff --git a/cmd/devnet/services/polygon/proofgenerator_test.go b/cmd/devnet/services/polygon/proofgenerator_test.go
index 692d42135e8..37430210769 100644
--- a/cmd/devnet/services/polygon/proofgenerator_test.go
+++ b/cmd/devnet/services/polygon/proofgenerator_test.go
@@ -179,7 +179,7 @@ func (rg *requestGenerator) GetTransactionReceipt(ctx context.Context, hash libc
for i, txn := range block.Transactions() {
- ibs.SetTxContext(txn.Hash(), i)
+ ibs.SetTxContext(i, block.NumberU64())
receipt, _, err := core.ApplyTransaction(chainConfig, core.GetHashFn(header, getHeader), engine, nil, gp, ibs, noopWriter, header, txn, &usedGas, &usedBlobGas, vm.Config{})
diff --git a/cmd/diag/flags/flags.go b/cmd/diag/flags/flags.go
index 7d569b8b4cf..aceea607a6d 100644
--- a/cmd/diag/flags/flags.go
+++ b/cmd/diag/flags/flags.go
@@ -26,7 +26,7 @@ var (
Aliases: []string{"da"},
Usage: "URL to the debug endpoint",
Required: false,
- Value: "localhost:6060",
+ Value: "localhost:6062",
}
OutputFlag = cli.StringFlag{
diff --git a/cmd/downloader/readme.md b/cmd/downloader/readme.md
index ddb6bf10005..88da5cf1551 100644
--- a/cmd/downloader/readme.md
+++ b/cmd/downloader/readme.md
@@ -70,7 +70,7 @@ Flag `--snapshots` is compatible with `--prune` flag
# Create new snapshots (can change snapshot size by: --from=0 --to=1_000_000 --segment.size=500_000)
# It will dump blocks from Database to .seg files:
-erigon snapshots retire --datadir=
+erigon seg retire --datadir=
# Create .torrent files (you can think about them as "checksum")
downloader torrent_create --datadir=
@@ -91,7 +91,7 @@ STOP_AFTER_STAGE=Senders ./build/bin/erigon --snapshots=false --datadir=
+erigon seg index --datadir=
```
## Architecture
diff --git a/cmd/downloader/recompress.sh b/cmd/downloader/recompress.sh
index 4118e47dc40..9d27943197e 100755
--- a/cmd/downloader/recompress.sh
+++ b/cmd/downloader/recompress.sh
@@ -9,7 +9,7 @@ do
to=$dir/snapshots/$file.new
echo "file: $file"
- ./build/bin/erigon_old snapshots uncompress $from | ./build/bin/erigon snapshots compress $to --datadir=$dir
+ ./build/bin/erigon_old snapshots uncompress $from | ./build/bin/erigon seg compress $to --datadir=$dir
a=$(du -h $from | awk '{print $1;}')
b=$(du -h $to | awk '{print $1;}')
echo "size: $a -> $b"
diff --git a/cmd/evm/staterunner.go b/cmd/evm/staterunner.go
index b07f07d021b..866ea000006 100644
--- a/cmd/evm/staterunner.go
+++ b/cmd/evm/staterunner.go
@@ -35,12 +35,10 @@ import (
"github.com/erigontech/erigon-lib/common/datadir"
"github.com/erigontech/erigon-lib/config3"
"github.com/erigontech/erigon-lib/kv/mdbx"
- "github.com/erigontech/erigon-lib/kv/rawdbv3"
"github.com/erigontech/erigon-lib/kv/temporal"
"github.com/erigontech/erigon-lib/log/v3"
libstate "github.com/erigontech/erigon-lib/state"
- "github.com/erigontech/erigon/core/rawdb"
"github.com/erigontech/erigon/core/state"
"github.com/erigontech/erigon/core/vm"
"github.com/erigontech/erigon/eth/tracers/logger"
@@ -144,8 +142,7 @@ func aggregateResultsFromStateTests(
MustOpen()
defer _db.Close()
- cr := rawdb.NewCanonicalReader(rawdbv3.TxNums)
- agg, err := libstate.NewAggregator(context.Background(), dirs, config3.HistoryV3AggregationStep, _db, cr, log.New())
+ agg, err := libstate.NewAggregator(context.Background(), dirs, config3.HistoryV3AggregationStep, _db, log.New())
if err != nil {
return nil, err
}
diff --git a/cmd/hack/hack.go b/cmd/hack/hack.go
index e228ea48299..c63964e0b31 100644
--- a/cmd/hack/hack.go
+++ b/cmd/hack/hack.go
@@ -30,11 +30,8 @@ import (
"path/filepath"
"runtime/pprof"
"slices"
- "sort"
"strings"
- "github.com/erigontech/erigon-lib/kv/dbutils"
-
"github.com/RoaringBitmap/roaring/roaring64"
"github.com/holiman/uint256"
@@ -58,7 +55,6 @@ import (
"github.com/erigontech/erigon/core/types"
"github.com/erigontech/erigon/eth/ethconfig"
"github.com/erigontech/erigon/eth/stagedsync/stages"
- "github.com/erigontech/erigon/ethdb/cbor"
"github.com/erigontech/erigon/params"
"github.com/erigontech/erigon/rlp"
"github.com/erigontech/erigon/turbo/debug"
@@ -227,7 +223,7 @@ func extractHashes(chaindata string, blockStep uint64, blockTotalOrOffset int64,
blockTotal := getBlockTotal(tx, b, blockTotalOrOffset)
// Note: blockTotal used here as block number rather than block count
for b <= blockTotal {
- hash, err := br.CanonicalHash(context.Background(), tx, b)
+ hash, _, err := br.CanonicalHash(context.Background(), tx, b)
if err != nil {
return err
}
@@ -344,7 +340,7 @@ func extractBodies(datadir string) error {
blockNumber := binary.BigEndian.Uint64(k[:8])
blockHash := libcommon.BytesToHash(k[8:])
var hash libcommon.Hash
- if hash, err = br.CanonicalHash(context.Background(), tx, blockNumber); err != nil {
+ if hash, _, err = br.CanonicalHash(context.Background(), tx, blockNumber); err != nil {
return err
}
_, baseTxnID, txCount := rawdb.ReadBody(tx, blockHash, blockNumber)
@@ -703,87 +699,6 @@ func keybytesToHex(str []byte) []byte {
return nibbles
}
-func rmSnKey(chaindata string) error {
- db := mdbx.MustOpen(chaindata)
- defer db.Close()
- return db.Update(context.Background(), func(tx kv.RwTx) error {
- _ = tx.Delete(kv.DatabaseInfo, rawdb.SnapshotsKey)
- _ = tx.Delete(kv.DatabaseInfo, rawdb.SnapshotsHistoryKey)
- return nil
- })
-}
-
-func findLogs(chaindata string, block uint64, blockTotal uint64) error {
- db := mdbx.MustOpen(chaindata)
- defer db.Close()
-
- tx, txErr := db.BeginRo(context.Background())
- if txErr != nil {
- return txErr
- }
- defer tx.Rollback()
- logs, err := tx.Cursor(kv.Log)
- if err != nil {
- return err
- }
- defer logs.Close()
-
- reader := bytes.NewReader(nil)
- addrs := map[libcommon.Address]int{}
- topics := map[string]int{}
-
- for k, v, err := logs.Seek(dbutils.LogKey(block, 0)); k != nil; k, v, err = logs.Next() {
- if err != nil {
- return err
- }
-
- blockNum := binary.BigEndian.Uint64(k[:8])
- if blockNum >= block+blockTotal {
- break
- }
-
- var ll types.Logs
- reader.Reset(v)
- if err := cbor.Unmarshal(&ll, reader); err != nil {
- return fmt.Errorf("receipt unmarshal failed: %w, blocl=%d", err, blockNum)
- }
-
- for _, l := range ll {
- addrs[l.Address]++
- for _, topic := range l.Topics {
- topics[fmt.Sprintf("%x | %x", l.Address, topic)]++
- }
- }
- }
- addrsInv := map[int][]libcommon.Address{}
- topicsInv := map[int][]string{}
- for a, c := range addrs {
- addrsInv[c] = append(addrsInv[c], a)
- }
- counts := make([]int, 0, len(addrsInv))
- for c := range addrsInv {
- counts = append(counts, -c)
- }
- sort.Ints(counts)
- for i := 0; i < 10 && i < len(counts); i++ {
- as := addrsInv[-counts[i]]
- fmt.Printf("%d=%x\n", -counts[i], as)
- }
- for t, c := range topics {
- topicsInv[c] = append(topicsInv[c], t)
- }
- counts = make([]int, 0, len(topicsInv))
- for c := range topicsInv {
- counts = append(counts, -c)
- }
- sort.Ints(counts)
- for i := 0; i < 10 && i < len(counts); i++ {
- as := topicsInv[-counts[i]]
- fmt.Printf("%d=%s\n", -counts[i], as)
- }
- return nil
-}
-
func iterate(filename string, prefix string) error {
pBytes := common.FromHex(prefix)
efFilename := filename + ".ef"
@@ -925,14 +840,10 @@ func main() {
case "devTx":
err = devTx(*chaindata)
- case "chainConfig":
+ case "chainConsfig":
err = chainConfig(*name)
- case "findLogs":
- err = findLogs(*chaindata, uint64(*block), uint64(*blockTotal))
case "iterate":
err = iterate(*chaindata, *account)
- case "rmSnKey":
- err = rmSnKey(*chaindata)
}
if err != nil {
diff --git a/cmd/integration/commands/flags.go b/cmd/integration/commands/flags.go
index 7237b17078d..324f19556e1 100644
--- a/cmd/integration/commands/flags.go
+++ b/cmd/integration/commands/flags.go
@@ -58,8 +58,6 @@ var (
workers, reconWorkers uint64
dbWriteMap bool
-
- squeezeCommitmentFiles, recompressCommitmentFiles bool
)
func must(err error) {
@@ -131,11 +129,6 @@ func withBucket(cmd *cobra.Command) {
cmd.Flags().StringVar(&bucket, "bucket", "", "reset given stage")
}
-func withSqueezeCommitmentFiles(cmd *cobra.Command) {
- cmd.Flags().BoolVar(&squeezeCommitmentFiles, "squeeze", false, "allow to squeeze commitment files on start")
- cmd.Flags().BoolVar(&recompressCommitmentFiles, "recompress", false, "allow to recompress existing .kv files")
-}
-
func withDataDir2(cmd *cobra.Command) {
// --datadir is required, but no --chain flag: read chainConfig from db instead
cmd.Flags().StringVar(&datadirCli, utils.DataDirFlag.Name, "", utils.DataDirFlag.Usage)
@@ -207,3 +200,7 @@ func withCommitment(cmd *cobra.Command) {
cmd.Flags().StringVar(&commitmentTrie, "commitment.trie", "hex", "hex - use Hex Patricia Hashed Trie for commitments, bin - use of binary patricia trie")
cmd.Flags().IntVar(&commitmentFreq, "commitment.freq", 1000000, "how many blocks to skip between calculating commitment")
}
+
+func withUnwindTypes(cmd *cobra.Command) {
+ cmd.Flags().StringSliceVar(&unwindTypes, "unwind.types", nil, "types to unwind for polygon sync")
+}
diff --git a/cmd/integration/commands/stages.go b/cmd/integration/commands/stages.go
index db4afb163bf..03a22602150 100644
--- a/cmd/integration/commands/stages.go
+++ b/cmd/integration/commands/stages.go
@@ -434,8 +434,6 @@ var cmdRunMigrations = &cobra.Command{
Short: "",
Run: func(cmd *cobra.Command, args []string) {
logger := debug.SetupCobra(cmd, "integration")
- migrations.EnableSqueezeCommitmentFiles = squeezeCommitmentFiles
- migrations.EnableRecompressCommitmentFiles = recompressCommitmentFiles
//non-accede and exclusive mode - to apply create new tables if need.
cfg := dbCfg(kv.ChainDB, chaindata).Flags(func(u uint) uint { return u &^ mdbx.Accede }).Exclusive()
db, err := openDB(cfg, true, logger)
@@ -508,6 +506,7 @@ func init() {
withDataDir(cmdStageBorHeimdall)
withReset(cmdStageBorHeimdall)
withUnwind(cmdStageBorHeimdall)
+ withUnwindTypes(cmdStageBorHeimdall)
withChain(cmdStageBorHeimdall)
withHeimdall(cmdStageBorHeimdall)
rootCmd.AddCommand(cmdStageBorHeimdall)
@@ -523,6 +522,7 @@ func init() {
withDataDir(cmdStagePolygon)
withReset(cmdStagePolygon)
withUnwind(cmdStagePolygon)
+ withUnwindTypes(cmdStagePolygon)
withChain(cmdStagePolygon)
withHeimdall(cmdStagePolygon)
rootCmd.AddCommand(cmdStagePolygon)
@@ -589,7 +589,6 @@ func init() {
withConfig(cmdRunMigrations)
withDataDir(cmdRunMigrations)
- withSqueezeCommitmentFiles(cmdRunMigrations)
withChain(cmdRunMigrations)
withHeimdall(cmdRunMigrations)
rootCmd.AddCommand(cmdRunMigrations)
@@ -609,7 +608,6 @@ func init() {
cmdSetPrune.Flags().Uint64Var(&pruneTBefore, "prune.t.before", 0, "")
cmdSetPrune.Flags().Uint64Var(&pruneCBefore, "prune.c.before", 0, "")
cmdSetPrune.Flags().StringSliceVar(&experiments, "experiments", nil, "Storage mode to override database")
- cmdSetPrune.Flags().StringSliceVar(&unwindTypes, "unwind.types", nil, "Types to unwind for bor heimdall")
rootCmd.AddCommand(cmdSetPrune)
}
@@ -749,10 +747,13 @@ func stageHeaders(db kv.RwDB, ctx context.Context, logger log.Logger) error {
if err = rawdb.TruncateTd(tx, progress+1); err != nil {
return err
}
- hash, err := br.CanonicalHash(ctx, tx, progress-1)
+ hash, ok, err := br.CanonicalHash(ctx, tx, progress-1)
if err != nil {
return err
}
+ if !ok {
+ return fmt.Errorf("canonical hash not found: %d", progress-1)
+ }
if err = rawdb.WriteHeadHeaderHash(tx, hash); err != nil {
return err
}
@@ -895,7 +896,7 @@ func stagePolygonSync(db kv.RwDB, ctx context.Context, logger log.Logger) error
}
stageState := stage(stageSync, tx, nil, stages.PolygonSync)
- cfg := stagedsync.NewPolygonSyncStageCfg(logger, chainConfig, nil, heimdallClient, nil, 0, nil, blockReader, nil, 0) // we only need blockReader and blockWriter (blockWriter is constructed in NewPolygonSyncStageCfg)
+ cfg := stagedsync.NewPolygonSyncStageCfg(logger, chainConfig, nil, heimdallClient, nil, 0, nil, blockReader, nil, 0, unwindTypes)
if unwind > 0 {
u := stageSync.NewUnwindState(stageState.ID, stageState.BlockNumber-unwind, stageState.BlockNumber, true, false)
if err := stagedsync.UnwindPolygonSyncStage(ctx, tx, u, cfg); err != nil {
@@ -1049,7 +1050,8 @@ func stageExec(db kv.RwDB, ctx context.Context, logger log.Logger) error {
br, _ := blocksIO(db, logger)
cfg := stagedsync.StageExecuteBlocksCfg(db, pm, batchSize, chainConfig, engine, vmConfig, nil,
/*stateStream=*/ false,
- /*badBlockHalt=*/ true, dirs, br, nil, genesis, syncCfg, nil)
+ /*badBlockHalt=*/ true /*alwaysGenerateChangesets=*/, false,
+ dirs, br, nil, genesis, syncCfg, nil)
if unwind > 0 {
if err := db.View(ctx, func(tx kv.Tx) error {
@@ -1137,14 +1139,7 @@ func stageCustomTrace(db kv.RwDB, ctx context.Context, logger log.Logger) error
var batchSize datasize.ByteSize
must(batchSize.UnmarshalText([]byte(batchSizeStr)))
- s := stage(sync, nil, db, stages.CustomTrace)
-
- logger.Info("Stage", "name", s.ID, "progress", s.BlockNumber)
chainConfig, pm := fromdb.ChainConfig(db), fromdb.PruneMode(db)
- if pruneTo > 0 {
- pm.History = prune.Distance(s.BlockNumber - pruneTo)
- }
-
syncCfg := ethconfig.Defaults.Sync
syncCfg.ExecWorkerCount = int(workers)
syncCfg.ReconWorkerCount = int(reconWorkers)
@@ -1152,56 +1147,7 @@ func stageCustomTrace(db kv.RwDB, ctx context.Context, logger log.Logger) error
genesis := core.GenesisBlockByChainName(chain)
br, _ := blocksIO(db, logger)
cfg := stagedsync.StageCustomTraceCfg(db, pm, dirs, br, chainConfig, engine, genesis, &syncCfg)
-
- if unwind > 0 {
- if err := db.View(ctx, func(tx kv.Tx) error {
- blockNumWithCommitment, ok, err := tx.(libstate.HasAggTx).AggTx().(*libstate.AggregatorRoTx).CanUnwindBeforeBlockNum(s.BlockNumber-unwind, tx)
- if err != nil {
- return err
- }
- if !ok {
- return fmt.Errorf("too deep unwind requested: %d, minimum allowed: %d", s.BlockNumber-unwind, blockNumWithCommitment)
- }
- unwind = s.BlockNumber - blockNumWithCommitment
- return nil
- }); err != nil {
- return err
- }
- }
-
- var tx kv.RwTx //nil - means lower-level code (each stage) will manage transactions
- if noCommit {
- var err error
- tx, err = db.BeginRw(ctx)
- if err != nil {
- return err
- }
- defer tx.Rollback()
- }
- txc := wrap.TxContainer{Tx: tx}
-
- if unwind > 0 {
- u := sync.NewUnwindState(stages.CustomTrace, s.BlockNumber-unwind, s.BlockNumber, true, false)
- err := stagedsync.UnwindCustomTrace(u, s, txc, cfg, ctx, logger)
- if err != nil {
- return err
- }
- return nil
- }
-
- if pruneTo > 0 {
- p, err := sync.PruneStageState(stages.CustomTrace, s.BlockNumber, tx, db, true)
- if err != nil {
- return err
- }
- err = stagedsync.PruneCustomTrace(p, tx, cfg, ctx, logger)
- if err != nil {
- return err
- }
- return nil
- }
-
- err := stagedsync.SpawnCustomTrace(s, txc, cfg, ctx, block, logger)
+ err := stagedsync.SpawnCustomTrace(cfg, ctx, logger)
if err != nil {
return err
}
@@ -1335,7 +1281,8 @@ func allSnapshots(ctx context.Context, db kv.RoDB, logger log.Logger) (*freezebl
openSnapshotOnce.Do(func() {
dirs := datadir.New(datadirCli)
- snapCfg := ethconfig.NewSnapCfg(true, true, true)
+ chainConfig := fromdb.ChainConfig(db)
+ snapCfg := ethconfig.NewSnapCfg(true, true, true, chainConfig.ChainName)
_allSnapshotsSingleton = freezeblocks.NewRoSnapshots(snapCfg, dirs.Snap, 0, logger)
_allBorSnapshotsSingleton = freezeblocks.NewBorRoSnapshots(snapCfg, dirs.Snap, 0, logger)
@@ -1343,8 +1290,8 @@ func allSnapshots(ctx context.Context, db kv.RoDB, logger log.Logger) (*freezebl
var err error
blockReader := freezeblocks.NewBlockReader(_allSnapshotsSingleton, _allBorSnapshotsSingleton, _allBscSnapshotsSingleton)
- cr := rawdb.NewCanonicalReader(rawdbv3.TxNums.WithCustomReadTxNumFunc(freezeblocks.ReadTxNumFuncFromBlockReader(ctx, blockReader)))
- _aggSingleton, err = libstate.NewAggregator(ctx, dirs, config3.HistoryV3AggregationStep, db, cr, logger)
+ txNums := rawdbv3.TxNums.WithCustomReadTxNumFunc(freezeblocks.ReadTxNumFuncFromBlockReader(ctx, blockReader))
+ _aggSingleton, err = libstate.NewAggregator(ctx, dirs, config3.HistoryV3AggregationStep, db, logger)
if err != nil {
panic(err)
}
@@ -1400,7 +1347,7 @@ func allSnapshots(ctx context.Context, db kv.RoDB, logger log.Logger) (*freezebl
ac := _aggSingleton.BeginFilesRo()
defer ac.Close()
ac.LogStats(tx, func(endTxNumMinimax uint64) (uint64, error) {
- _, histBlockNumProgress, err := rawdbv3.TxNums.WithCustomReadTxNumFunc(freezeblocks.ReadTxNumFuncFromBlockReader(ctx, blockReader)).FindBlockNum(tx, endTxNumMinimax)
+ _, histBlockNumProgress, err := txNums.FindBlockNum(tx, endTxNumMinimax)
return histBlockNumProgress, err
})
return nil
@@ -1507,7 +1454,7 @@ func newSync(ctx context.Context, db kv.RwDB, miningConfig *params.MiningConfig,
blobStore = parlia.BlobStore
}
- notifications := &shards.Notifications{}
+ notifications := shards.NewNotifications(nil)
blockRetire := freezeblocks.NewBlockRetire(1, dirs, blockReader, blockWriter, db, blobStore, chainConfig, notifications.Events, blockSnapBuildSema, logger)
stages := stages2.NewDefaultStages(context.Background(), db, snapDb, blobStore, p2p.Config{}, &cfg, sentryControlServer, notifications, nil, blockReader, blockRetire, agg, nil, nil, engine, heimdallClient, recents, signatures, logger)
@@ -1532,9 +1479,10 @@ func newSync(ctx context.Context, db kv.RwDB, miningConfig *params.MiningConfig,
sentryControlServer.ChainConfig,
sentryControlServer.Engine,
&vm.Config{},
- notifications.Accumulator,
+ notifications,
cfg.StateStream,
/*stateStream=*/ false,
+ /*alwaysGenerateChangesets=*/ false,
dirs,
blockReader,
sentryControlServer.Hd,
diff --git a/cmd/integration/commands/state_stages.go b/cmd/integration/commands/state_stages.go
index 13d710ca6e7..66995e9800d 100644
--- a/cmd/integration/commands/state_stages.go
+++ b/cmd/integration/commands/state_stages.go
@@ -180,7 +180,7 @@ func syncBySmallSteps(db kv.RwDB, miningConfig params.MiningConfig, ctx context.
must(batchSize.UnmarshalText([]byte(batchSizeStr)))
stateStages.DisableStages(stages.Snapshots, stages.Headers, stages.BlockHashes, stages.Bodies, stages.Senders)
- changesAcc := shards.NewAccumulator()
+ notifications := shards.NewNotifications(nil)
genesis := core.GenesisBlockByChainName(chain)
syncCfg := ethconfig.Defaults.Sync
@@ -188,7 +188,7 @@ func syncBySmallSteps(db kv.RwDB, miningConfig params.MiningConfig, ctx context.
syncCfg.ReconWorkerCount = int(reconWorkers)
br, _ := blocksIO(db, logger1)
- execCfg := stagedsync.StageExecuteBlocksCfg(db, pm, batchSize, chainConfig, engine, vmConfig, changesAcc, false, true, dirs, br, nil, genesis, syncCfg, nil)
+ execCfg := stagedsync.StageExecuteBlocksCfg(db, pm, batchSize, chainConfig, engine, vmConfig, notifications, false, true, false, dirs, br, nil, genesis, syncCfg, nil)
execUntilFunc := func(execToBlock uint64) stagedsync.ExecFunc {
return func(badBlockUnwind bool, s *stagedsync.StageState, unwinder stagedsync.Unwinder, txc wrap.TxContainer, logger log.Logger) error {
@@ -420,7 +420,7 @@ func loopExec(db kv.RwDB, ctx context.Context, unwind uint64, logger log.Logger)
initialCycle := false
br, _ := blocksIO(db, logger)
- cfg := stagedsync.StageExecuteBlocksCfg(db, pm, batchSize, chainConfig, engine, vmConfig, nil, false, true, dirs, br, nil, genesis, syncCfg, nil)
+ cfg := stagedsync.StageExecuteBlocksCfg(db, pm, batchSize, chainConfig, engine, vmConfig, nil, false, true, false, dirs, br, nil, genesis, syncCfg, nil)
// set block limit of execute stage
sync.MockExecFunc(stages.Execution, func(badBlockUnwind bool, stageState *stagedsync.StageState, unwinder stagedsync.Unwinder, txc wrap.TxContainer, logger log.Logger) error {
diff --git a/cmd/rpcdaemon/cli/config.go b/cmd/rpcdaemon/cli/config.go
index 4760520770b..59d8bc671a4 100644
--- a/cmd/rpcdaemon/cli/config.go
+++ b/cmd/rpcdaemon/cli/config.go
@@ -60,7 +60,6 @@ import (
"github.com/erigontech/erigon-lib/kv/temporal"
"github.com/erigontech/erigon-lib/log/v3"
libstate "github.com/erigontech/erigon-lib/state"
-
"github.com/erigontech/erigon/cmd/rpcdaemon/cli/httpcfg"
"github.com/erigontech/erigon/cmd/rpcdaemon/graphql"
"github.com/erigontech/erigon/cmd/rpcdaemon/health"
@@ -79,6 +78,9 @@ import (
"github.com/erigontech/erigon/node"
"github.com/erigontech/erigon/node/nodecfg"
"github.com/erigontech/erigon/polygon/bor"
+ "github.com/erigontech/erigon/polygon/bor/valset"
+ "github.com/erigontech/erigon/polygon/bridge"
+ "github.com/erigontech/erigon/polygon/heimdall"
"github.com/erigontech/erigon/rpc"
"github.com/erigontech/erigon/rpc/rpccfg"
"github.com/erigontech/erigon/turbo/debug"
@@ -99,8 +101,20 @@ var rootCmd = &cobra.Command{
var (
stateCacheStr string
+ polygonSync bool
)
+type HeimdallReader interface {
+ Producers(ctx context.Context, blockNum uint64) (*valset.ValidatorSet, error)
+ Close()
+}
+
+type BridgeReader interface {
+ Events(ctx context.Context, blockNum uint64) ([]*types.Message, error)
+ EventTxnLookup(ctx context.Context, borTxHash libcommon.Hash) (uint64, bool, error)
+ Close()
+}
+
func RootCommand() (*cobra.Command, *httpcfg.HttpCfg) {
utils.CobraFlags(rootCmd, debug.Flags, utils.MetricFlags, logging.Flags)
@@ -110,6 +124,7 @@ func RootCommand() (*cobra.Command, *httpcfg.HttpCfg) {
rootCmd.PersistentFlags().BoolVar(&cfg.GraphQLEnabled, "graphql", false, "enables graphql endpoint (disabled by default)")
rootCmd.PersistentFlags().Uint64Var(&cfg.Gascap, "rpc.gascap", 50_000_000, "Sets a cap on gas that can be used in eth_call/estimateGas")
rootCmd.PersistentFlags().Uint64Var(&cfg.MaxTraces, "trace.maxtraces", 200, "Sets a limit on traces that can be returned in trace_filter")
+ rootCmd.PersistentFlags().BoolVar(&polygonSync, "polygon.sync", false, "Enable if Erigon has been synced using the new polygon sync component")
rootCmd.PersistentFlags().StringVar(&cfg.RpcAllowListFilePath, utils.RpcAccessListFlag.Name, "", "Specify granular (method-by-method) API allowlist")
rootCmd.PersistentFlags().UintVar(&cfg.RpcBatchConcurrency, utils.RpcBatchConcurrencyFlag.Name, 2, utils.RpcBatchConcurrencyFlag.Usage)
@@ -325,24 +340,26 @@ func EmbeddedServices(ctx context.Context,
func RemoteServices(ctx context.Context, cfg *httpcfg.HttpCfg, logger log.Logger, rootCancel context.CancelFunc) (
db kv.RoDB, eth rpchelper.ApiBackend, txPool txpool.TxpoolClient, mining txpool.MiningClient,
stateCache kvcache.Cache, blockReader services.FullBlockReader, engine consensus.EngineReader,
- ff *rpchelper.Filters, err error) {
+ ff *rpchelper.Filters, bridgeReader BridgeReader, heimdallReader HeimdallReader, err error) {
if !cfg.WithDatadir && cfg.PrivateApiAddr == "" {
- return nil, nil, nil, nil, nil, nil, nil, ff, errors.New("either remote db or local db must be specified")
+ return nil, nil, nil, nil, nil, nil, nil, ff, nil, nil, errors.New("either remote db or local db must be specified")
}
creds, err := grpcutil.TLS(cfg.TLSCACert, cfg.TLSCertfile, cfg.TLSKeyFile)
if err != nil {
- return nil, nil, nil, nil, nil, nil, nil, ff, fmt.Errorf("open tls cert: %w", err)
+ return nil, nil, nil, nil, nil, nil, nil, ff, nil, nil, fmt.Errorf("open tls cert: %w", err)
}
conn, err := grpcutil.Connect(creds, cfg.PrivateApiAddr)
if err != nil {
- return nil, nil, nil, nil, nil, nil, nil, ff, fmt.Errorf("could not connect to execution service privateApi: %w", err)
+ return nil, nil, nil, nil, nil, nil, nil, ff, nil, nil, fmt.Errorf("could not connect to execution service privateApi: %w", err)
}
remoteBackendClient := remote.NewETHBACKENDClient(conn)
+ remoteBridgeClient := remote.NewBridgeBackendClient(conn)
+ remoteHeimdallClient := remote.NewHeimdallBackendClient(conn)
remoteKvClient := remote.NewKVClient(conn)
remoteKv, err := remotedb.NewRemote(gointerfaces.VersionFromProto(remotedbserver.KvServiceAPIVersion), logger, remoteKvClient).Open()
if err != nil {
- return nil, nil, nil, nil, nil, nil, nil, ff, fmt.Errorf("could not connect to remoteKv: %w", err)
+ return nil, nil, nil, nil, nil, nil, nil, ff, nil, nil, fmt.Errorf("could not connect to remoteKv: %w", err)
}
// Configure DB first
@@ -350,6 +367,7 @@ func RemoteServices(ctx context.Context, cfg *httpcfg.HttpCfg, logger log.Logger
var allBorSnapshots *freezeblocks.BorRoSnapshots
var allBscSnapshots *freezeblocks.BscRoSnapshots
onNewSnapshot := func() {}
+ roTxLimit := int64(cfg.DBReadConcurrency)
var cc *chain.Config
@@ -365,13 +383,13 @@ func RemoteServices(ctx context.Context, cfg *httpcfg.HttpCfg, logger log.Logger
// Accede mode will check db existence (may wait with retries). It's ok to fail in this case - some supervisor will restart us.
var rwKv kv.RwDB
logger.Warn("Opening chain db", "path", cfg.Dirs.Chaindata)
- limiter := semaphore.NewWeighted(int64(cfg.DBReadConcurrency))
+ limiter := semaphore.NewWeighted(roTxLimit)
rwKv, err = kv2.NewMDBX(logger).RoTxsLimiter(limiter).Path(cfg.Dirs.Chaindata).Accede().Open(ctx)
if err != nil {
- return nil, nil, nil, nil, nil, nil, nil, ff, err
+ return nil, nil, nil, nil, nil, nil, nil, ff, nil, nil, err
}
if compatErr := checkDbCompatibility(ctx, rwKv); compatErr != nil {
- return nil, nil, nil, nil, nil, nil, nil, ff, compatErr
+ return nil, nil, nil, nil, nil, nil, nil, ff, nil, nil, compatErr
}
db = rwKv
@@ -386,10 +404,10 @@ func RemoteServices(ctx context.Context, cfg *httpcfg.HttpCfg, logger log.Logger
}
return nil
}); err != nil {
- return nil, nil, nil, nil, nil, nil, nil, ff, err
+ return nil, nil, nil, nil, nil, nil, nil, ff, nil, nil, err
}
if cc == nil {
- return nil, nil, nil, nil, nil, nil, nil, ff, errors.New("chain config not found in db. Need start erigon at least once on this db")
+ return nil, nil, nil, nil, nil, nil, nil, ff, nil, nil, errors.New("chain config not found in db. Need start erigon at least once on this db")
}
// Configure sapshots
@@ -398,19 +416,18 @@ func RemoteServices(ctx context.Context, cfg *httpcfg.HttpCfg, logger log.Logger
allBscSnapshots = freezeblocks.NewBscRoSnapshots(cfg.Snap, cfg.Dirs.Snap, 0, logger)
// To povide good UX - immediatly can read snapshots after RPCDaemon start, even if Erigon is down
// Erigon does store list of snapshots in db: means RPCDaemon can read this list now, but read by `remoteKvClient.Snapshots` after establish grpc connection
- allSnapshots.OptimisticReopenWithDB(db)
- allBorSnapshots.OptimisticalyReopenWithDB(db)
- allBscSnapshots.OptimisticalyReopenWithDB(db)
+ allSnapshots.OptimisticalyReopenFolder()
+ allBorSnapshots.OptimisticalyReopenFolder()
+ allBscSnapshots.OptimisticalyReopenFolder()
allSnapshots.LogStat("remote")
allBorSnapshots.LogStat("bor:remote")
allBscSnapshots.LogStat("bsc:remote")
blockReader = freezeblocks.NewBlockReader(allSnapshots, allBorSnapshots, allBscSnapshots)
txNumsReader := rawdbv3.TxNums.WithCustomReadTxNumFunc(freezeblocks.ReadTxNumFuncFromBlockReader(ctx, blockReader))
- cr := rawdb.NewCanonicalReader(txNumsReader)
- agg, err := libstate.NewAggregator(ctx, cfg.Dirs, config3.HistoryV3AggregationStep, db, cr, logger)
+ agg, err := libstate.NewAggregator(ctx, cfg.Dirs, config3.HistoryV3AggregationStep, db, logger)
if err != nil {
- return nil, nil, nil, nil, nil, nil, nil, ff, fmt.Errorf("create aggregator: %w", err)
+ return nil, nil, nil, nil, nil, nil, nil, ff, nil, nil, fmt.Errorf("create aggregator: %w", err)
}
_ = agg.OpenFolder() //TODO: must use analog of `OptimisticReopenWithDB`
@@ -474,7 +491,7 @@ func RemoteServices(ctx context.Context, cfg *httpcfg.HttpCfg, logger log.Logger
db, err = temporal.New(rwKv, agg)
if err != nil {
- return nil, nil, nil, nil, nil, nil, nil, nil, err
+ return nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, err
}
stateCache = kvcache.NewDummy()
}
@@ -498,7 +515,7 @@ func RemoteServices(ctx context.Context, cfg *httpcfg.HttpCfg, logger log.Logger
if cfg.TxPoolApiAddr != cfg.PrivateApiAddr {
txpoolConn, err = grpcutil.Connect(creds, cfg.TxPoolApiAddr)
if err != nil {
- return nil, nil, nil, nil, nil, nil, nil, ff, fmt.Errorf("could not connect to txpool api: %w", err)
+ return nil, nil, nil, nil, nil, nil, nil, ff, nil, nil, fmt.Errorf("could not connect to txpool api: %w", err)
}
}
@@ -516,42 +533,75 @@ func RemoteServices(ctx context.Context, cfg *httpcfg.HttpCfg, logger log.Logger
eth = remoteEth
var remoteCE *remoteConsensusEngine
+ var remoteBridgeReader *bridge.RemoteReader
+ var remoteHeimdallReader *heimdall.RemoteReader
if cfg.WithDatadir {
- switch {
- case cc != nil:
- switch {
- case cc.Bor != nil:
- var borKv kv.RoDB
-
- // bor (consensus) specific db
- borDbPath := filepath.Join(cfg.DataDir, "bor")
- logger.Warn("[rpc] Opening Bor db", "path", borDbPath)
- borKv, err = kv2.NewMDBX(logger).Path(borDbPath).Label(kv.ConsensusDB).Accede().Open(ctx)
+ if cc != nil && cc.Bor != nil {
+ if polygonSync {
+ stateReceiverContractAddress := cc.Bor.GetStateReceiverContract()
+
+ bridgeConfig := bridge.ReaderConfig{
+ Ctx: ctx,
+ DataDir: cfg.DataDir,
+ Logger: logger,
+ StateReceiverContractAddress: stateReceiverContractAddress,
+ RoTxLimit: roTxLimit,
+ }
+ bridgeReader, err = bridge.AssembleReader(bridgeConfig)
if err != nil {
- return nil, nil, nil, nil, nil, nil, nil, ff, err
+ return nil, nil, nil, nil, nil, nil, nil, ff, nil, nil, err
}
- // Skip the compatibility check, until we have a schema in erigon-lib
- engine = bor.NewRo(cc, borKv, blockReader, logger)
- case cc.Parlia != nil:
- var bscKv kv.RoDB
-
- // bsc (consensus) specific db
- bscDbPath := filepath.Join(cfg.DataDir, "parlia")
- logger.Warn("[rpc] Opening Bsc db", "path", bscDbPath)
- bscKv, err = kv2.NewMDBX(logger).Path(bscDbPath).Label(kv.ConsensusDB).Accede().Open(ctx)
+
+ heimdallConfig := heimdall.ReaderConfig{
+ Ctx: ctx,
+ CalculateSprintNumberFn: cc.Bor.CalculateSprintNumber,
+ DataDir: cfg.DataDir,
+ TempDir: cfg.Dirs.Tmp,
+ Logger: logger,
+ RoTxLimit: roTxLimit,
+ }
+ heimdallReader, err = heimdall.AssembleReader(heimdallConfig)
if err != nil {
- return nil, nil, nil, nil, nil, nil, nil, ff, err
+ return nil, nil, nil, nil, nil, nil, nil, ff, nil, nil, err
}
- engine = parlia.NewRo(cc, bscKv, blockReader, logger)
- default:
- engine = ethash.NewFaker()
}
- default:
+ // NOTE: bor_* RPCs are not fully supported when using polygon.sync (https://github.com/erigontech/erigon/issues/11171)
+ var borKv kv.RoDB
+
+ // bor (consensus) specific db
+ borDbPath := filepath.Join(cfg.DataDir, "bor")
+ logger.Warn("[rpc] Opening Bor db", "path", borDbPath)
+ borKv, err = kv2.NewMDBX(logger).Path(borDbPath).Label(kv.ConsensusDB).Accede().Open(ctx)
+ if err != nil {
+ return nil, nil, nil, nil, nil, nil, nil, ff, nil, nil, err
+ }
+ // Skip the compatibility check, until we have a schema in erigon-lib
+ engine = bor.NewRo(cc, borKv, blockReader, logger)
+ } else if cc != nil && cc.Parlia != nil {
+ var bscKv kv.RoDB
+
+ // bsc (consensus) specific db
+ bscDbPath := filepath.Join(cfg.DataDir, "parlia")
+ logger.Warn("[rpc] Opening Bsc db", "path", bscDbPath)
+ bscKv, err = kv2.NewMDBX(logger).Path(bscDbPath).Label(kv.ConsensusDB).Accede().Open(ctx)
+ if err != nil {
+ return nil, nil, nil, nil, nil, nil, nil, ff, nil, nil, err
+ }
+ engine = parlia.NewRo(cc, bscKv, blockReader, logger)
+ } else {
engine = ethash.NewFaker()
}
} else {
+ if polygonSync {
+ remoteBridgeReader = bridge.NewRemoteReader(remoteBridgeClient)
+ bridgeReader = remoteBridgeReader
+
+ remoteHeimdallReader = heimdall.NewRemoteReader(remoteHeimdallClient)
+ heimdallReader = remoteHeimdallReader
+ }
+
remoteCE = &remoteConsensusEngine{}
engine = remoteCE
}
@@ -569,6 +619,12 @@ func RemoteServices(ctx context.Context, cfg *httpcfg.HttpCfg, logger log.Logger
if !txPoolService.EnsureVersionCompatibility() {
rootCancel()
}
+ if remoteBridgeReader != nil && !remoteBridgeReader.EnsureVersionCompatibility() {
+ rootCancel()
+ }
+ if remoteHeimdallReader != nil && !remoteHeimdallReader.EnsureVersionCompatibility() {
+ rootCancel()
+ }
if remoteCE != nil {
if !remoteCE.init(db, blockReader, remoteKvClient, logger) {
rootCancel()
@@ -577,7 +633,7 @@ func RemoteServices(ctx context.Context, cfg *httpcfg.HttpCfg, logger log.Logger
}()
ff = rpchelper.New(ctx, cfg.RpcFiltersConfig, eth, txPool, mining, onNewSnapshot, logger)
- return db, eth, txPool, mining, stateCache, blockReader, engine, ff, err
+ return db, eth, txPool, mining, stateCache, blockReader, engine, ff, bridgeReader, heimdallReader, err
}
func StartRpcServer(ctx context.Context, cfg *httpcfg.HttpCfg, rpcAPI []rpc.API, logger log.Logger) error {
diff --git a/cmd/rpcdaemon/graphql/eip-1767.graphqls.ref b/cmd/rpcdaemon/graphql/eip-1767.graphqls.ref
index 58e6368239b..0ba4cb53eb5 100644
--- a/cmd/rpcdaemon/graphql/eip-1767.graphqls.ref
+++ b/cmd/rpcdaemon/graphql/eip-1767.graphqls.ref
@@ -154,9 +154,6 @@ type Block {
mixHash: Bytes32!
# Difficulty is a measure of the difficulty of mining this block.
difficulty: BigInt!
- # TotalDifficulty is the sum of all difficulty values up to and including
- # this block.
- totalDifficulty: BigInt!
# OmmerCount is the number of ommers (AKA uncles) associated with this
# block. If ommers are unavailable, this field will be null.
ommerCount: Int
diff --git a/cmd/rpcdaemon/graphql/geth-schema.graphqls.ref b/cmd/rpcdaemon/graphql/geth-schema.graphqls.ref
index c0050476691..3eff936fc88 100644
--- a/cmd/rpcdaemon/graphql/geth-schema.graphqls.ref
+++ b/cmd/rpcdaemon/graphql/geth-schema.graphqls.ref
@@ -190,9 +190,6 @@
mixHash: Bytes32!
# Difficulty is a measure of the difficulty of mining this block.
difficulty: BigInt!
- # TotalDifficulty is the sum of all difficulty values up to and including
- # this block.
- totalDifficulty: BigInt!
# OmmerCount is the number of ommers (AKA uncles) associated with this
# block. If ommers are unavailable, this field will be null.
ommerCount: Int
diff --git a/cmd/rpcdaemon/graphql/graph/generated.go b/cmd/rpcdaemon/graphql/graph/generated.go
index df4ac38da32..33c9fb51c94 100644
--- a/cmd/rpcdaemon/graphql/graph/generated.go
+++ b/cmd/rpcdaemon/graphql/graph/generated.go
@@ -87,7 +87,6 @@ type ComplexityRoot struct {
ReceiptsRoot func(childComplexity int) int
StateRoot func(childComplexity int) int
Timestamp func(childComplexity int) int
- TotalDifficulty func(childComplexity int) int
TransactionAt func(childComplexity int, index int) int
TransactionCount func(childComplexity int) int
Transactions func(childComplexity int) int
@@ -476,13 +475,6 @@ func (e *executableSchema) Complexity(typeName, field string, childComplexity in
return e.complexity.Block.Timestamp(childComplexity), true
- case "Block.totalDifficulty":
- if e.complexity.Block.TotalDifficulty == nil {
- break
- }
-
- return e.complexity.Block.TotalDifficulty(childComplexity), true
-
case "Block.transactionAt":
if e.complexity.Block.TransactionAt == nil {
break
@@ -1952,8 +1944,6 @@ func (ec *executionContext) fieldContext_Block_parent(_ context.Context, field g
return ec.fieldContext_Block_mixHash(ctx, field)
case "difficulty":
return ec.fieldContext_Block_difficulty(ctx, field)
- case "totalDifficulty":
- return ec.fieldContext_Block_totalDifficulty(ctx, field)
case "ommerCount":
return ec.fieldContext_Block_ommerCount(ctx, field)
case "ommers":
@@ -2661,50 +2651,6 @@ func (ec *executionContext) fieldContext_Block_difficulty(_ context.Context, fie
return fc, nil
}
-func (ec *executionContext) _Block_totalDifficulty(ctx context.Context, field graphql.CollectedField, obj *model.Block) (ret graphql.Marshaler) {
- fc, err := ec.fieldContext_Block_totalDifficulty(ctx, field)
- if err != nil {
- return graphql.Null
- }
- ctx = graphql.WithFieldContext(ctx, fc)
- defer func() {
- if r := recover(); r != nil {
- ec.Error(ctx, ec.Recover(ctx, r))
- ret = graphql.Null
- }
- }()
- resTmp, err := ec.ResolverMiddleware(ctx, func(rctx context.Context) (interface{}, error) {
- ctx = rctx // use context from middleware stack in children
- return obj.TotalDifficulty, nil
- })
- if err != nil {
- ec.Error(ctx, err)
- return graphql.Null
- }
- if resTmp == nil {
- if !graphql.HasFieldError(ctx, fc) {
- ec.Errorf(ctx, "must not be null")
- }
- return graphql.Null
- }
- res := resTmp.(string)
- fc.Result = res
- return ec.marshalNBigInt2string(ctx, field.Selections, res)
-}
-
-func (ec *executionContext) fieldContext_Block_totalDifficulty(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) {
- fc = &graphql.FieldContext{
- Object: "Block",
- Field: field,
- IsMethod: false,
- IsResolver: false,
- Child: func(ctx context.Context, field graphql.CollectedField) (*graphql.FieldContext, error) {
- return nil, errors.New("field of type BigInt does not have child fields")
- },
- }
- return fc, nil
-}
-
func (ec *executionContext) _Block_ommerCount(ctx context.Context, field graphql.CollectedField, obj *model.Block) (ret graphql.Marshaler) {
fc, err := ec.fieldContext_Block_ommerCount(ctx, field)
if err != nil {
@@ -2818,8 +2764,6 @@ func (ec *executionContext) fieldContext_Block_ommers(_ context.Context, field g
return ec.fieldContext_Block_mixHash(ctx, field)
case "difficulty":
return ec.fieldContext_Block_difficulty(ctx, field)
- case "totalDifficulty":
- return ec.fieldContext_Block_totalDifficulty(ctx, field)
case "ommerCount":
return ec.fieldContext_Block_ommerCount(ctx, field)
case "ommers":
@@ -2925,8 +2869,6 @@ func (ec *executionContext) fieldContext_Block_ommerAt(ctx context.Context, fiel
return ec.fieldContext_Block_mixHash(ctx, field)
case "difficulty":
return ec.fieldContext_Block_difficulty(ctx, field)
- case "totalDifficulty":
- return ec.fieldContext_Block_totalDifficulty(ctx, field)
case "ommerCount":
return ec.fieldContext_Block_ommerCount(ctx, field)
case "ommers":
@@ -4481,8 +4423,6 @@ func (ec *executionContext) fieldContext_Query_block(ctx context.Context, field
return ec.fieldContext_Block_mixHash(ctx, field)
case "difficulty":
return ec.fieldContext_Block_difficulty(ctx, field)
- case "totalDifficulty":
- return ec.fieldContext_Block_totalDifficulty(ctx, field)
case "ommerCount":
return ec.fieldContext_Block_ommerCount(ctx, field)
case "ommers":
@@ -4602,8 +4542,6 @@ func (ec *executionContext) fieldContext_Query_blocks(ctx context.Context, field
return ec.fieldContext_Block_mixHash(ctx, field)
case "difficulty":
return ec.fieldContext_Block_difficulty(ctx, field)
- case "totalDifficulty":
- return ec.fieldContext_Block_totalDifficulty(ctx, field)
case "ommerCount":
return ec.fieldContext_Block_ommerCount(ctx, field)
case "ommers":
@@ -5950,8 +5888,6 @@ func (ec *executionContext) fieldContext_Transaction_block(_ context.Context, fi
return ec.fieldContext_Block_mixHash(ctx, field)
case "difficulty":
return ec.fieldContext_Block_difficulty(ctx, field)
- case "totalDifficulty":
- return ec.fieldContext_Block_totalDifficulty(ctx, field)
case "ommerCount":
return ec.fieldContext_Block_ommerCount(ctx, field)
case "ommers":
@@ -8881,11 +8817,6 @@ func (ec *executionContext) _Block(ctx context.Context, sel ast.SelectionSet, ob
if out.Values[i] == graphql.Null {
out.Invalids++
}
- case "totalDifficulty":
- out.Values[i] = ec._Block_totalDifficulty(ctx, field, obj)
- if out.Values[i] == graphql.Null {
- out.Invalids++
- }
case "ommerCount":
out.Values[i] = ec._Block_ommerCount(ctx, field, obj)
case "ommers":
diff --git a/cmd/rpcdaemon/graphql/graph/model/models_gen.go b/cmd/rpcdaemon/graphql/graph/model/models_gen.go
index 043212b5fbe..157a952141a 100644
--- a/cmd/rpcdaemon/graphql/graph/model/models_gen.go
+++ b/cmd/rpcdaemon/graphql/graph/model/models_gen.go
@@ -34,7 +34,6 @@ type Block struct {
LogsBloom string `json:"logsBloom"`
MixHash string `json:"mixHash"`
Difficulty string `json:"difficulty"`
- TotalDifficulty string `json:"totalDifficulty"`
OmmerCount *int `json:"ommerCount,omitempty"`
Ommers []*Block `json:"ommers,omitempty"`
OmmerAt *Block `json:"ommerAt,omitempty"`
diff --git a/cmd/rpcdaemon/graphql/graph/schema.graphqls b/cmd/rpcdaemon/graphql/graph/schema.graphqls
index 64925dfdc2d..ff0bbb9800c 100644
--- a/cmd/rpcdaemon/graphql/graph/schema.graphqls
+++ b/cmd/rpcdaemon/graphql/graph/schema.graphqls
@@ -192,9 +192,6 @@ type Block {
mixHash: Bytes32!
# Difficulty is a measure of the difficulty of mining this block.
difficulty: BigInt!
- # TotalDifficulty is the sum of all difficulty values up to and including
- # this block.
- totalDifficulty: BigInt!
# OmmerCount is the number of ommers (AKA uncles) associated with this
# block. If ommers are unavailable, this field will be null.
ommerCount: Int
diff --git a/cmd/rpcdaemon/graphql/graph/schema.resolvers.go b/cmd/rpcdaemon/graphql/graph/schema.resolvers.go
index 9932c43bd13..030d9b4f6b2 100644
--- a/cmd/rpcdaemon/graphql/graph/schema.resolvers.go
+++ b/cmd/rpcdaemon/graphql/graph/schema.resolvers.go
@@ -100,7 +100,6 @@ func (r *queryResolver) Block(ctx context.Context, number *string, hash *string)
block.Timestamp = *convertDataToStringP(blk, "timestamp")
block.TransactionCount = convertDataToIntP(blk, "transactionCount")
block.TransactionsRoot = *convertDataToStringP(blk, "transactionsRoot")
- block.TotalDifficulty = *convertDataToStringP(blk, "totalDifficulty")
block.BaseFeePerGas = convertDataToStringP(blk, "baseFeePerGas")
block.Transactions = []*model.Transaction{}
diff --git a/cmd/rpcdaemon/graphql/query_block.graphql b/cmd/rpcdaemon/graphql/query_block.graphql
index cc9b0e9f50d..a71066f1218 100644
--- a/cmd/rpcdaemon/graphql/query_block.graphql
+++ b/cmd/rpcdaemon/graphql/query_block.graphql
@@ -25,7 +25,6 @@
stateRoot
timestamp
transactionsRoot
- totalDifficulty
transactions {
createdContract {
address
diff --git a/cmd/rpcdaemon/main.go b/cmd/rpcdaemon/main.go
index 665327679c9..7f0215a741e 100644
--- a/cmd/rpcdaemon/main.go
+++ b/cmd/rpcdaemon/main.go
@@ -40,7 +40,7 @@ func main() {
cmd.RunE = func(cmd *cobra.Command, args []string) error {
ctx := cmd.Context()
logger := debug.SetupCobra(cmd, "sentry")
- db, backend, txPool, mining, stateCache, blockReader, engine, ff, err := cli.RemoteServices(ctx, cfg, logger, rootCancel)
+ db, backend, txPool, mining, stateCache, blockReader, engine, ff, bridgeReader, heimdallReader, err := cli.RemoteServices(ctx, cfg, logger, rootCancel)
if err != nil {
if !errors.Is(err, context.Canceled) {
logger.Error("Could not connect to DB", "err", err)
@@ -49,8 +49,14 @@ func main() {
}
defer db.Close()
defer engine.Close()
+ if bridgeReader != nil {
+ defer bridgeReader.Close()
+ }
+ if heimdallReader != nil {
+ defer heimdallReader.Close()
+ }
- apiList := jsonrpc.APIList(db, backend, txPool, mining, ff, stateCache, blockReader, cfg, engine, logger, nil)
+ apiList := jsonrpc.APIList(db, backend, txPool, mining, ff, stateCache, blockReader, cfg, engine, logger, bridgeReader, heimdallReader)
rpc.PreAllocateRPCMetricLabels(apiList)
if err := cli.StartRpcServer(ctx, cfg, apiList, logger); err != nil {
logger.Error(err.Error())
diff --git a/cmd/rpcdaemon/postman/RPC_Testing.json b/cmd/rpcdaemon/postman/RPC_Testing.json
index 78d89c9f7a1..6d775bfce63 100644
--- a/cmd/rpcdaemon/postman/RPC_Testing.json
+++ b/cmd/rpcdaemon/postman/RPC_Testing.json
@@ -290,7 +290,6 @@
" \"size\": \"0x3e1\",",
" \"stateRoot\": \"0xb3f9408d80048b6f206951c4e387f8da37fb8510eccc18527865fa746c47bbc5\",",
" \"timestamp\": \"0x56bff9bb\",",
- " \"totalDifficulty\": \"0x6332227c16fd7c67\",",
" \"transactions\": [",
" \"0x730724cb08a6eb17bf6b3296359d261570d343ea7944a17a9d7287d77900db08\",",
" \"0xef2ea39c20ba09553b2f3cf02380406ac766039ca56612937eed5e7f3503fb3a\",",
@@ -336,7 +335,7 @@
"raw": "{{HOST}}",
"host": ["{{HOST}}"]
},
- "description": "Returns information about a block given the block's number.\r\n\r\n**Parameters**\r\n\r\nTAG - Integer block number or one of \"earliest\", \"latest\" or \"pending\"\r\n\r\nBoolean - If true it returns the full transaction objects, if false only the hashes of the transactions\r\n\r\n**Returns**\r\n\r\nObject - An object of type Block defined as:\r\n\r\nnumber: QUANTITY - The block number or null when pending\r\n\r\nhash: DATA, 32 Bytes - Hash of the block or null when pending\r\n\r\nparentHash: DATA, 32 Bytes - Hash of the parent block\r\n\r\nnonce: DATA, 8 bytes - Hash of the proof of work or null when pending\r\n\r\nsha3Uncles: DATA, 32 Bytes - SHA3 of the uncles data in the block\r\n\r\nlogsBloom: DATA, 256 Bytes - The bloom filter for the block's logs or null when pending\r\n\r\ntransactionsRoot: DATA, 32 Bytes - The root of the transaction trie of the block\r\n\r\nstateRoot: DATA, 32 Bytes - The root of the final state trie of the block\r\n\r\nreceiptsRoot: DATA, 32 Bytes - The root of the receipts trie of the block\r\n\r\nminer: DATA, 20 Bytes - The address of the beneficiary to whom the mining rewards were given\r\n\r\ndifficulty: QUANTITY - Integer of the difficulty for this block\r\n\r\ntotalDifficulty: QUANTITY - Integer of the total difficulty of the chain until this block\r\n\r\nextraData: DATA - The extra data field of this block\r\n\r\nsize: QUANTITY - Integer the size of this block in bytes\r\n\r\ngasLimit: QUANTITY - The maximum gas allowed in this block\r\n\r\ngasUsed: QUANTITY - The total used gas by all transactions in this block\r\n\r\ntimestamp: QUANTITY - The unix timestamp for when the block was collated\r\n\r\ntransactions: ARRAY - Array of transaction objects, or 32 Bytes transaction hashes depending on the last given parameter\r\n\r\nuncles: ARRAY - Array of uncle hashes\r\n\r\n"
+ "description": "Returns information about a block given the block's number.\r\n\r\n**Parameters**\r\n\r\nTAG - Integer block number or one of \"earliest\", \"latest\" or \"pending\"\r\n\r\nBoolean - If true it returns the full transaction objects, if false only the hashes of the transactions\r\n\r\n**Returns**\r\n\r\nObject - An object of type Block defined as:\r\n\r\nnumber: QUANTITY - The block number or null when pending\r\n\r\nhash: DATA, 32 Bytes - Hash of the block or null when pending\r\n\r\nparentHash: DATA, 32 Bytes - Hash of the parent block\r\n\r\nnonce: DATA, 8 bytes - Hash of the proof of work or null when pending\r\n\r\nsha3Uncles: DATA, 32 Bytes - SHA3 of the uncles data in the block\r\n\r\nlogsBloom: DATA, 256 Bytes - The bloom filter for the block's logs or null when pending\r\n\r\ntransactionsRoot: DATA, 32 Bytes - The root of the transaction trie of the block\r\n\r\nstateRoot: DATA, 32 Bytes - The root of the final state trie of the block\r\n\r\nreceiptsRoot: DATA, 32 Bytes - The root of the receipts trie of the block\r\n\r\nminer: DATA, 20 Bytes - The address of the beneficiary to whom the mining rewards were given\r\n\r\ndifficulty: QUANTITY - Integer of the difficulty for this block\r\n\r\nextraData: DATA - The extra data field of this block\r\n\r\nsize: QUANTITY - Integer the size of this block in bytes\r\n\r\ngasLimit: QUANTITY - The maximum gas allowed in this block\r\n\r\ngasUsed: QUANTITY - The total used gas by all transactions in this block\r\n\r\ntimestamp: QUANTITY - The unix timestamp for when the block was collated\r\n\r\ntransactions: ARRAY - Array of transaction objects, or 32 Bytes transaction hashes depending on the last given parameter\r\n\r\nuncles: ARRAY - Array of uncle hashes\r\n\r\n"
},
"response": []
},
@@ -368,7 +367,6 @@
" \"size\": \"0x3e1\",",
" \"stateRoot\": \"0xb3f9408d80048b6f206951c4e387f8da37fb8510eccc18527865fa746c47bbc5\",",
" \"timestamp\": \"0x56bff9bb\",",
- " \"totalDifficulty\": \"0x6332227c16fd7c67\",",
" \"transactions\": [",
" \"0x730724cb08a6eb17bf6b3296359d261570d343ea7944a17a9d7287d77900db08\",",
" \"0xef2ea39c20ba09553b2f3cf02380406ac766039ca56612937eed5e7f3503fb3a\",",
@@ -870,7 +868,6 @@
" \"size\": \"0x21a\",",
" \"stateRoot\": \"0x1e6e030581fd1873b4784280859cd3b3c04aa85520f08c304cf5ee63d3935add\",",
" \"timestamp\": \"0x55ba4242\",",
- " \"totalDifficulty\": \"0xffd003ffe\",",
" \"transactionsRoot\": \"0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421\",",
" \"uncles\": []",
" }",
@@ -949,7 +946,6 @@
" \"size\": \"0x21a\",",
" \"stateRoot\": \"0x1e6e030581fd1873b4784280859cd3b3c04aa85520f08c304cf5ee63d3935add\",",
" \"timestamp\": \"0x55ba4242\",",
- " \"totalDifficulty\": \"0xffd003ffe\",",
" \"transactionsRoot\": \"0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421\",",
" \"uncles\": []",
" }",
diff --git a/cmd/rpcdaemon/rpcservices/eth_backend.go b/cmd/rpcdaemon/rpcservices/eth_backend.go
index 549433f338e..e0d87c084d9 100644
--- a/cmd/rpcdaemon/rpcservices/eth_backend.go
+++ b/cmd/rpcdaemon/rpcservices/eth_backend.go
@@ -95,11 +95,11 @@ func (back *RemoteBackend) ReadAncestor(db kv.Getter, hash common.Hash, number,
panic("not implemented")
}
func (back *RemoteBackend) BlockByNumber(ctx context.Context, db kv.Tx, number uint64) (*types.Block, error) {
- hash, err := back.CanonicalHash(ctx, db, number)
+ hash, ok, err := back.CanonicalHash(ctx, db, number)
if err != nil {
return nil, fmt.Errorf("failed ReadCanonicalHash: %w", err)
}
- if hash == (common.Hash{}) {
+ if !ok || hash == (common.Hash{}) {
return nil, nil
}
block, _, err := back.BlockWithSenders(ctx, db, hash, number)
@@ -304,7 +304,7 @@ func (back *RemoteBackend) HeaderByNumber(ctx context.Context, tx kv.Getter, blo
func (back *RemoteBackend) HeaderByHash(ctx context.Context, tx kv.Getter, hash common.Hash) (*types.Header, error) {
return back.blockReader.HeaderByHash(ctx, tx, hash)
}
-func (back *RemoteBackend) CanonicalHash(ctx context.Context, tx kv.Getter, blockNum uint64) (common.Hash, error) {
+func (back *RemoteBackend) CanonicalHash(ctx context.Context, tx kv.Getter, blockNum uint64) (common.Hash, bool, error) {
return back.blockReader.CanonicalHash(ctx, tx, blockNum)
}
func (back *RemoteBackend) HeaderNumber(ctx context.Context, tx kv.Getter, hash common.Hash) (*uint64, error) {
diff --git a/cmd/rpcdaemon/test.http b/cmd/rpcdaemon/test.http
index cc9fa0b30c6..929031c4ead 100644
--- a/cmd/rpcdaemon/test.http
+++ b/cmd/rpcdaemon/test.http
@@ -168,12 +168,13 @@ Content-Type: application/json
"jsonrpc": "2.0",
"method": "eth_getTransactionReceipt",
"params": [
- "0xc05ce241bec59900356ede868d170bc01d743c3cd5ecb129ca99596593022771"
+ "0xd327a9393e89268a7d6e5455ee887a4e8b9ea07ef2e0b913e428902f19aa9eba"
],
"id": 537758
}
+
###
#POST 192.168.255.138:8545
@@ -212,6 +213,7 @@ Content-Type: application/json
}
###
+# 6250464, 6250465, 6250470, 7250471
POST 127.0.0.1:8545
Content-Type: application/json
@@ -221,8 +223,8 @@ Content-Type: application/json
"method": "eth_getLogs",
"params": [
{
- "fromBlock": "0x14ADC0",
- "toBlock": "0x14AEC0"
+ "fromBlock": "0x6EA227",
+ "toBlock": "0x6EA227"
}
],
"id": 537758
diff --git a/cmd/rpctest/rpctest/type.go b/cmd/rpctest/rpctest/type.go
index 765171adebb..e967564cb6c 100644
--- a/cmd/rpctest/rpctest/type.go
+++ b/cmd/rpctest/rpctest/type.go
@@ -326,7 +326,6 @@ type OtsFullBlock struct {
StateRoot string `json:"stateRoot"`
Timestamp string `json:"timestamp"`
- TotalDifficulty hexutil.Big `json:"totalDifficulty"`
TransactionCount uint64 `json:"transactionCount"`
Transactions []OtsTransaction `json:"transactions"`
TxRoot libcommon.Hash `json:"transactionsRoot"`
diff --git a/cmd/state/commands/opcode_tracer.go b/cmd/state/commands/opcode_tracer.go
index 244b568c731..0a7237cca63 100644
--- a/cmd/state/commands/opcode_tracer.go
+++ b/cmd/state/commands/opcode_tracer.go
@@ -730,7 +730,7 @@ func runBlock(engine consensus.Engine, ibs *state.IntraBlockState, txnWriter sta
core.InitializeBlockExecution(engine, nil, header, parent, chainConfig, ibs, logger, nil)
rules := chainConfig.Rules(block.NumberU64(), block.Time())
for i, txn := range block.Transactions() {
- ibs.SetTxContext(txn.Hash(), i)
+ ibs.SetTxContext(i, block.NumberU64())
receipt, _, err := core.ApplyTransaction(chainConfig, core.GetHashFn(header, getHeader), engine, nil, gp, ibs, txnWriter, header, txn, usedGas, usedBlobGas, vmConfig)
if err != nil {
return nil, fmt.Errorf("could not apply txn %d [%x] failed: %w", i, txn.Hash(), err)
diff --git a/cmd/state/exec3/historical_trace_worker.go b/cmd/state/exec3/historical_trace_worker.go
index 39bdccea69d..0fd956b2731 100644
--- a/cmd/state/exec3/historical_trace_worker.go
+++ b/cmd/state/exec3/historical_trace_worker.go
@@ -22,6 +22,7 @@ import (
"github.com/erigontech/erigon/core/systemcontracts"
"sync"
"sync/atomic"
+ "time"
"golang.org/x/sync/errgroup"
@@ -85,6 +86,7 @@ func NewHistoricalTraceWorker(
consumer TraceConsumer,
in *state.QueueWithRetry,
out *state.ResultsQueue,
+ background bool,
ctx context.Context,
execArgs *ExecArgs,
@@ -102,18 +104,18 @@ func NewHistoricalTraceWorker(
evm: vm.NewEVM(evmtypes.BlockContext{}, evmtypes.TxContext{}, nil, execArgs.ChainConfig, vm.Config{}),
vmConfig: &vm.Config{},
ibs: state.New(stateReader),
- background: true,
+ background: background,
ctx: ctx,
logger: logger,
taskGasPool: new(core.GasPool),
}
- ie.taskGasPool.AddBlobGas(execArgs.ChainConfig.GetMaxBlobGasPerBlock())
ie.ibs = state.New(ie.stateReader)
return ie
}
func (rw *HistoricalTraceWorker) Run() error {
+ defer rw.evm.JumpDestCache.LogStats()
for txTask, ok := rw.in.Next(rw.ctx); ok; txTask, ok = rw.in.Next(rw.ctx) {
rw.RunTxTask(txTask)
if err := rw.out.Add(rw.ctx, txTask); err != nil {
@@ -134,9 +136,7 @@ func (rw *HistoricalTraceWorker) RunTxTask(txTask *state.TxTask) {
}
rw.stateReader.SetTxNum(txTask.TxNum)
- //rw.stateWriter.SetTxNum(rw.ctx, txTask.TxNum)
rw.stateReader.ResetReadSet()
- //rw.stateWriter.ResetWriteSet()
rw.stateWriter = state.NewNoopWriter()
rw.ibs.Reset()
@@ -145,7 +145,11 @@ func (rw *HistoricalTraceWorker) RunTxTask(txTask *state.TxTask) {
rules := txTask.Rules
var err error
header := txTask.Header
-
+ var lastBlockTime uint64
+ _, isPoSA := rw.execArgs.Engine.(consensus.PoSA)
+ if isPoSA {
+ lastBlockTime = header.Time - rw.execArgs.ChainConfig.Parlia.Period
+ }
switch {
case txTask.TxIndex == -1:
if txTask.BlockNum == 0 {
@@ -163,23 +167,24 @@ func (rw *HistoricalTraceWorker) RunTxTask(txTask *state.TxTask) {
syscall := func(contract common.Address, data []byte, ibs *state.IntraBlockState, header *types.Header, constCall bool) ([]byte, error) {
return core.SysCallContract(contract, data, rw.execArgs.ChainConfig, ibs, header, rw.execArgs.Engine, constCall /* constCall */)
}
- _, isPoSA := rw.execArgs.Engine.(consensus.PoSA)
if isPoSA && !rw.execArgs.ChainConfig.IsFeynman(header.Number.Uint64(), header.Time) {
- lastBlockTime := header.Time - rw.execArgs.ChainConfig.Parlia.Period
- parent, _ := rw.execArgs.BlockReader.HeaderByHash(rw.ctx, rw.chainTx, header.ParentHash)
- if parent != nil {
- lastBlockTime = parent.Time
- }
systemcontracts.UpgradeBuildInSystemContract(rw.execArgs.ChainConfig, header.Number, lastBlockTime, header.Time, ibs, rw.logger)
}
- rw.execArgs.Engine.Initialize(rw.execArgs.ChainConfig, rw.chain, header, ibs, syscall, rw.logger, nil)
- txTask.Error = ibs.FinalizeTx(rules, noop)
+ if err := rw.execArgs.Engine.Initialize(rw.execArgs.ChainConfig, rw.chain, header, ibs, syscall, rw.logger, nil); err != nil {
+ txTask.Error = err
+ } else {
+ txTask.Error = ibs.FinalizeTx(rules, noop)
+ }
case txTask.Final:
if txTask.BlockNum == 0 {
break
}
if _, isPoSa := rw.execArgs.Engine.(consensus.PoSA); isPoSa {
+ // Is an empty block
+ if rw.execArgs.ChainConfig.IsFeynman(header.Number.Uint64(), header.Time) && txTask.TxIndex == 0 {
+ systemcontracts.UpgradeBuildInSystemContract(rw.execArgs.ChainConfig, header.Number, lastBlockTime, header.Time, ibs, rw.logger)
+ }
break
}
@@ -206,7 +211,7 @@ func (rw *HistoricalTraceWorker) RunTxTask(txTask *state.TxTask) {
}
rw.vmConfig.SkipAnalysis = txTask.SkipAnalysis
msg := txTask.TxAsMessage
- ibs.SetTxContext(txTask.Tx.Hash(), txTask.TxIndex)
+ ibs.SetTxContext(txTask.TxIndex, txTask.BlockNum)
if rw.execArgs.ChainConfig.IsCancun(header.Number.Uint64(), header.Time) {
rules := rw.execArgs.ChainConfig.Rules(header.Number.Uint64(), header.Time)
ibs.Prepare(rules, msg.From(), txTask.EvmBlockContext.Coinbase, msg.To(), vm.ActivePrecompiles(rules), msg.AccessList(), nil)
@@ -230,7 +235,7 @@ func (rw *HistoricalTraceWorker) RunTxTask(txTask *state.TxTask) {
// Update the state with pending changes
ibs.SoftFinalise()
//txTask.Error = ibs.FinalizeTx(rules, noop)
- txTask.Logs = ibs.GetLogs(txTask.Tx.Hash(), rw.blockNum, rw.blockHash)
+ txTask.Logs = ibs.GetRawLogs(txTask.TxIndex)
}
return ret, true, nil
}
@@ -240,18 +245,15 @@ func (rw *HistoricalTraceWorker) RunTxTask(txTask *state.TxTask) {
txTask.Error = err
}
default:
- txHash := txTask.Tx.Hash()
- rw.taskGasPool.Reset(txTask.Tx.GetGas(), rw.execArgs.ChainConfig.GetMaxBlobGasPerBlock())
+ rw.taskGasPool.Reset(txTask.Tx.GetGas(), txTask.Tx.GetBlobGas())
if tracer := rw.consumer.NewTracer(); tracer != nil {
rw.vmConfig.Debug = true
rw.vmConfig.Tracer = tracer
}
rw.vmConfig.SkipAnalysis = txTask.SkipAnalysis
- ibs.SetTxContext(txHash, txTask.TxIndex)
+ ibs.SetTxContext(txTask.TxIndex, txTask.BlockNum)
msg := txTask.TxAsMessage
-
- rw.evm.ResetBetweenBlocks(txTask.EvmBlockContext, core.NewEVMTxContext(msg), ibs, *rw.vmConfig, rules)
-
+ msg.SetCheckNonce(!rw.vmConfig.StatelessExec)
if msg.FeeCap().IsZero() {
// Only zero-gas transactions may be service ones
syscall := func(contract common.Address, data []byte) ([]byte, error) {
@@ -260,6 +262,12 @@ func (rw *HistoricalTraceWorker) RunTxTask(txTask *state.TxTask) {
msg.SetIsFree(rw.execArgs.Engine.IsServiceTransaction(msg.From(), syscall))
}
+ txContext := core.NewEVMTxContext(msg)
+ if rw.vmConfig.TraceJumpDest {
+ txContext.TxHash = txTask.Tx.Hash()
+ }
+ rw.evm.ResetBetweenBlocks(txTask.EvmBlockContext, txContext, ibs, *rw.vmConfig, rules)
+
// MA applytx
applyRes, err := core.ApplyMessage(rw.evm, msg, rw.taskGasPool, true /* refunds */, false /* gasBailout */)
if err != nil {
@@ -269,9 +277,8 @@ func (rw *HistoricalTraceWorker) RunTxTask(txTask *state.TxTask) {
txTask.UsedGas = applyRes.UsedGas
// Update the state with pending changes
ibs.SoftFinalise()
- txTask.Logs = ibs.GetLogs(txHash, rw.blockNum, rw.blockHash)
+ txTask.Logs = ibs.GetRawLogs(txTask.TxIndex)
}
- //txTask.Tracer = tracer
}
}
func (rw *HistoricalTraceWorker) ResetTx(chainTx kv.Tx) {
@@ -299,62 +306,81 @@ type ExecArgs struct {
Workers int
}
-func NewHistoricalTraceWorkers(consumer TraceConsumer, cfg *ExecArgs, ctx context.Context, toTxNum uint64, in *state.QueueWithRetry, workerCount int, outputTxNum *atomic.Uint64, logger log.Logger) (g *errgroup.Group, clearFunc func()) {
+func NewHistoricalTraceWorkers(consumer TraceConsumer, cfg *ExecArgs, ctx context.Context, toTxNum uint64, in *state.QueueWithRetry, workerCount int, outputTxNum *atomic.Uint64, logger log.Logger) (g *errgroup.Group, applyWorker *HistoricalTraceWorker, clearFunc func()) {
workers := make([]*HistoricalTraceWorker, workerCount)
- resultChSize := workerCount * 8
- rws := state.NewResultsQueue(resultChSize, workerCount) // workerCount * 4
- // we all errors in background workers (except ctx.Cancel), because applyLoop will detect this error anyway.
- // and in applyLoop all errors are critical
- ctx, cancel := context.WithCancel(ctx)
- g, ctx = errgroup.WithContext(ctx)
- for i := 0; i < workerCount; i++ {
- workers[i] = NewHistoricalTraceWorker(consumer, in, rws, ctx, cfg, logger)
- }
- for i := 0; i < workerCount; i++ {
- i := i
- g.Go(func() (err error) {
- defer func() {
- if rec := recover(); rec != nil {
- err = fmt.Errorf("%s, %s", rec, dbg.Stack())
- }
- }()
+ // can afford big limits - because historical execution doesn't need conflicts-resolution
+ resultChannelLimit := workerCount * 128
+ heapLimit := workerCount * 128
+ rws := state.NewResultsQueue(resultChannelLimit, heapLimit) // workerCount * 4
- return workers[i].Run()
- })
- }
+ reducerGroup := &errgroup.Group{}
//Reducer
- g.Go(func() (err error) {
+ reducerGroup.Go(func() (err error) {
defer func() {
if rec := recover(); rec != nil {
err = fmt.Errorf("%s, %s", rec, dbg.Stack())
+ log.Warn("[dbg] 'reduce worker' paniced", "err", err)
}
}()
+ logEvery := time.NewTicker(1 * time.Second)
+ defer logEvery.Stop()
+
tx, err := cfg.ChainDB.BeginRo(ctx)
if err != nil {
- return err
+ panic(err)
+ //return err
}
defer tx.Rollback()
+ ttx := tx.(kv.TemporalTx)
- applyWorker := NewHistoricalTraceWorker(consumer, in, rws, ctx, cfg, logger)
- applyWorker.background = false
- applyWorker.ResetTx(tx)
for outputTxNum.Load() <= toTxNum {
- rws.DrainNonBlocking()
+ if err := rws.DrainNonBlocking(ctx); err != nil {
+ return err
+ }
- processedTxNum, _, err := processResultQueueHistorical(consumer, rws, outputTxNum.Load(), applyWorker, true)
+ processedTxNum, _, err := processResultQueueHistorical(consumer, rws, outputTxNum.Load(), ttx, true)
if err != nil {
return fmt.Errorf("processResultQueueHistorical: %w", err)
}
if processedTxNum > 0 {
outputTxNum.Store(processedTxNum)
}
+
+ //select {
+ //case <-logEvery.C:
+ // log.Info("[dbg] rws", "rws_ch_len", rws.ResultChLen(), "rws_q_len", rws.Len())
+ //default:
+ //}
+
}
return nil
})
+ // we all errors in background workers (except ctx.Cancel), because applyLoop will detect this error anyway.
+ // and in applyLoop all errors are critical
+ ctx, cancel := context.WithCancel(ctx)
+ g, ctx = errgroup.WithContext(ctx)
+ for i := 0; i < workerCount; i++ {
+ workers[i] = NewHistoricalTraceWorker(consumer, in, rws, true, ctx, cfg, logger)
+ }
+ applyWorker = NewHistoricalTraceWorker(consumer, in, rws, false, ctx, cfg, logger)
+ for i := 0; i < workerCount; i++ {
+ i := i
+ g.Go(func() (err error) {
+ defer func() {
+ if rec := recover(); rec != nil {
+ err = fmt.Errorf("%s, %s", rec, dbg.Stack())
+ log.Warn("[dbg] 'worker' paniced", "i", i, "err", err)
+ }
+ }()
+
+ return workers[i].Run()
+ })
+ }
+
var clearDone bool
clearFunc = func() {
if clearDone {
@@ -363,51 +389,34 @@ func NewHistoricalTraceWorkers(consumer TraceConsumer, cfg *ExecArgs, ctx contex
clearDone = true
cancel()
g.Wait()
+ rws.Close()
+ reducerGroup.Wait()
for _, w := range workers {
w.ResetTx(nil)
}
}
- return g, clearFunc
+ return g, applyWorker, clearFunc
}
-func processResultQueueHistorical(consumer TraceConsumer, rws *state.ResultsQueue, outputTxNumIn uint64, applyWorker *HistoricalTraceWorker, forceStopAtBlockEnd bool) (outputTxNum uint64, stopedAtBlockEnd bool, err error) {
+func processResultQueueHistorical(consumer TraceConsumer, rws *state.ResultsQueue, outputTxNumIn uint64, tx kv.TemporalTx, forceStopAtBlockEnd bool) (outputTxNum uint64, stopedAtBlockEnd bool, err error) {
rwsIt := rws.Iter()
defer rwsIt.Close()
- var receipts types.Receipts
- var usedGas, blobGasUsed uint64
-
var i int
outputTxNum = outputTxNumIn
for rwsIt.HasNext(outputTxNum) {
txTask := rwsIt.PopNext()
- if txTask.Final {
- txTask.Reset()
- //re-exec right here, because gnosis expecting TxTask.BlockReceipts field - receipts of all
- txTask.BlockReceipts = receipts
- applyWorker.RunTxTask(txTask)
- }
if txTask.Error != nil {
return outputTxNum, false, err
}
- if err := consumer.Reduce(txTask, applyWorker.chainTx); err != nil {
- return outputTxNum, false, err
- }
- if !txTask.Final && txTask.TxIndex >= 0 {
- // if the transaction created a contract, store the creation address in the receipt.
- //if msg.To() == nil {
- // receipt.ContractAddress = crypto.CreateAddress(evm.Origin, tx.GetNonce())
- //}
- // Set the receipt logs and create a bloom for filtering
- //receipt.Bloom = types.CreateBloom(types.Receipts{receipt})
- receipts = append(receipts, txTask.CreateReceipt(usedGas))
+ if txTask.TxIndex >= 0 && !txTask.Final {
+ txTask.CreateReceipt(tx)
}
- usedGas += txTask.UsedGas
- if txTask.Tx != nil {
- blobGasUsed += txTask.Tx.GetBlobGas()
+ if err := consumer.Reduce(txTask, tx); err != nil {
+ return outputTxNum, false, err
}
i++
@@ -421,19 +430,17 @@ func processResultQueueHistorical(consumer TraceConsumer, rws *state.ResultsQueu
}
func CustomTraceMapReduce(fromBlock, toBlock uint64, consumer TraceConsumer, ctx context.Context, tx kv.TemporalTx, cfg *ExecArgs, logger log.Logger) (err error) {
- log.Info("[CustomTraceMapReduce] start", "fromBlock", fromBlock, "toBlock", toBlock, "workers", cfg.Workers)
+ log.Info("[Receipt] batch start", "fromBlock", fromBlock, "toBlock", toBlock, "workers", cfg.Workers)
br := cfg.BlockReader
chainConfig := cfg.ChainConfig
getHeaderFunc := func(hash common.Hash, number uint64) (h *types.Header) {
- var err error
- if err = cfg.ChainDB.View(ctx, func(tx kv.Tx) error {
- h, err = cfg.BlockReader.Header(ctx, tx, hash, number)
- if err != nil {
- return err
- }
- return nil
- }); err != nil {
- panic(err)
+ if tx != nil {
+ h, _ = cfg.BlockReader.Header(ctx, tx, hash, number)
+ } else {
+ cfg.ChainDB.View(ctx, func(tx kv.Tx) error {
+ h, _ = cfg.BlockReader.Header(ctx, tx, hash, number)
+ return nil
+ })
}
return h
}
@@ -454,15 +461,16 @@ func CustomTraceMapReduce(fromBlock, toBlock uint64, consumer TraceConsumer, ctx
in := state.NewQueueWithRetry(100_000)
defer in.Close()
- var WorkerCount = estimate.AlmostAllCPUs() * 2
+ var WorkerCount = estimate.AlmostAllCPUs()
if cfg.Workers > 0 {
WorkerCount = cfg.Workers
}
outTxNum := &atomic.Uint64{}
outTxNum.Store(fromTxNum)
- workers, cleanup := NewHistoricalTraceWorkers(consumer, cfg, ctx, toTxNum, in, WorkerCount, outTxNum, logger)
+ workers, applyWorker, cleanup := NewHistoricalTraceWorkers(consumer, cfg, ctx, toTxNum, in, WorkerCount, outTxNum, logger)
defer workers.Wait()
defer cleanup()
+ applyWorker.ResetTx(tx)
workersExited := &atomic.Bool{}
go func() {
@@ -474,9 +482,11 @@ func CustomTraceMapReduce(fromBlock, toBlock uint64, consumer TraceConsumer, ctx
if err != nil {
return err
}
+ logEvery := time.NewTicker(1 * time.Second)
+ defer logEvery.Stop()
for blockNum := fromBlock; blockNum <= toBlock; blockNum++ {
var b *types.Block
- b, err = blockWithSenders(nil, tx, br, blockNum)
+ b, err = blockWithSenders(ctx, nil, tx, br, blockNum)
if err != nil {
return err
}
@@ -498,7 +508,9 @@ func CustomTraceMapReduce(fromBlock, toBlock uint64, consumer TraceConsumer, ctx
}
blockContext := core.NewEVMBlockContext(header, getHashFn, cfg.Engine, nil /* author */, chainConfig)
+ blockReceipts := make(types.Receipts, len(txs))
rules := chainConfig.Rules(blockNum, b.Time())
+ var systemTxIndex int
for txIndex := -1; txIndex <= len(txs); txIndex++ {
// Do not oversend, wait for the result heap to go under certain size
txTask := &state.TxTask{
@@ -520,6 +532,7 @@ func CustomTraceMapReduce(fromBlock, toBlock uint64, consumer TraceConsumer, ctx
// use history reader instead of state reader to catch up to the tx where we left off
HistoryExecution: true,
+ BlockReceipts: blockReceipts,
}
if txIndex >= 0 && txIndex < len(txs) {
txTask.Tx = txs[txIndex]
@@ -539,11 +552,37 @@ func CustomTraceMapReduce(fromBlock, toBlock uint64, consumer TraceConsumer, ctx
logger.Warn("[Execution] expensive lazy sender recovery", "blockNum", txTask.BlockNum, "txIdx", txTask.TxIndex)
}
}
+ posa, isPoSa := cfg.Engine.(consensus.PoSA)
+ if txIndex >= 0 && !txTask.Final && isPoSa {
+ if isSystemTx, err := posa.IsSystemTransaction(txs[txIndex], header); err != nil {
+ return err
+ } else if isSystemTx {
+ systemTxIndex++
+ txTask.SystemTxIndex = systemTxIndex
+ }
+ }
if workersExited.Load() {
return workers.Wait()
}
- in.Add(ctx, txTask)
+ if WorkerCount == 1 {
+ applyWorker.RunTxTask(txTask)
+ if txTask.TxIndex >= 0 && !txTask.Final {
+ txTask.CreateReceipt(tx)
+ }
+ if err := consumer.Reduce(txTask, tx); err != nil {
+ return err
+ }
+ } else {
+ in.Add(ctx, txTask)
+ }
inputTxNum++
+
+ //select {
+ //case <-logEvery.C:
+ // log.Info("[dbg] in", "in", in.Len())
+ //default:
+ //}
+
}
}
in.Close() //no more work. no retries in map-reduce. means can close here.
@@ -555,7 +594,12 @@ func CustomTraceMapReduce(fromBlock, toBlock uint64, consumer TraceConsumer, ctx
return nil
}
-func blockWithSenders(db kv.RoDB, tx kv.Tx, blockReader services.BlockReader, blockNum uint64) (b *types.Block, err error) {
+func blockWithSenders(ctx context.Context, db kv.RoDB, tx kv.Tx, blockReader services.BlockReader, blockNum uint64) (b *types.Block, err error) {
+ select {
+ case <-ctx.Done():
+ return nil, ctx.Err()
+ default:
+ }
if tx == nil {
tx, err = db.BeginRo(context.Background())
if err != nil {
diff --git a/cmd/state/exec3/state.go b/cmd/state/exec3/state.go
index 97f032b57e9..ab066b81d8d 100644
--- a/cmd/state/exec3/state.go
+++ b/cmd/state/exec3/state.go
@@ -280,7 +280,7 @@ func (rw *Worker) RunTxTaskNoLock(txTask *state.TxTask, isMining bool) {
rw.callTracer.Reset()
rw.vmCfg.SkipAnalysis = txTask.SkipAnalysis
msg := txTask.TxAsMessage
- ibs.SetTxContext(txTask.Tx.Hash(), txTask.TxIndex)
+ ibs.SetTxContext(txTask.TxIndex, txTask.BlockNum)
if rw.chainConfig.IsCancun(header.Number.Uint64(), header.Time) {
rules := rw.chainConfig.Rules(header.Number.Uint64(), header.Time)
ibs.Prepare(rules, msg.From(), txTask.EvmBlockContext.Coinbase, msg.To(), vm.ActivePrecompiles(rules), msg.AccessList(), nil)
@@ -304,7 +304,7 @@ func (rw *Worker) RunTxTaskNoLock(txTask *state.TxTask, isMining bool) {
// Update the state with pending changes
ibs.SoftFinalise()
//txTask.Error = ibs.FinalizeTx(rules, noop)
- txTask.Logs = ibs.GetLogs(txTask.Tx.Hash(), txTask.BlockNum, txTask.BlockHash)
+ txTask.Logs = ibs.GetLogs(txTask.TxIndex, txTask.Tx.Hash(), txTask.BlockNum, txTask.BlockHash)
txTask.TraceFroms = rw.callTracer.Froms()
txTask.TraceTos = rw.callTracer.Tos()
}
@@ -329,15 +329,11 @@ func (rw *Worker) RunTxTaskNoLock(txTask *state.TxTask, isMining bool) {
txTask.Error = err
}
default:
- txHash := txTask.Tx.Hash()
rw.taskGasPool.Reset(txTask.Tx.GetGas(), rw.chainConfig.GetMaxBlobGasPerBlock())
rw.callTracer.Reset()
rw.vmCfg.SkipAnalysis = txTask.SkipAnalysis
- ibs.SetTxContext(txHash, txTask.TxIndex)
+ ibs.SetTxContext(txTask.TxIndex, txTask.BlockNum)
msg := txTask.TxAsMessage
-
- rw.evm.ResetBetweenBlocks(txTask.EvmBlockContext, core.NewEVMTxContext(msg), ibs, rw.vmCfg, rules)
-
if msg.FeeCap().IsZero() && rw.engine != nil {
// Only zero-gas transactions may be service ones
syscall := func(contract libcommon.Address, data []byte) ([]byte, error) {
@@ -346,6 +342,8 @@ func (rw *Worker) RunTxTaskNoLock(txTask *state.TxTask, isMining bool) {
msg.SetIsFree(rw.engine.IsServiceTransaction(msg.From(), syscall))
}
+ rw.evm.ResetBetweenBlocks(txTask.EvmBlockContext, core.NewEVMTxContext(msg), ibs, rw.vmCfg, rules)
+
// MA applytx
applyRes, err := core.ApplyMessage(rw.evm, msg, rw.taskGasPool, true /* refunds */, false /* gasBailout */)
if err != nil {
@@ -356,7 +354,7 @@ func (rw *Worker) RunTxTaskNoLock(txTask *state.TxTask, isMining bool) {
// Update the state with pending changes
ibs.SoftFinalise()
//txTask.Error = ibs.FinalizeTx(rules, noop)
- txTask.Logs = ibs.GetLogs(txHash, txTask.BlockNum, txTask.BlockHash)
+ txTask.Logs = ibs.GetLogs(txTask.TxIndex, txTask.Tx.Hash(), txTask.BlockNum, txTask.BlockHash)
txTask.TraceFroms = rw.callTracer.Froms()
txTask.TraceTos = rw.callTracer.Tos()
}
diff --git a/cmd/state/exec3/state_recon.go b/cmd/state/exec3/state_recon.go
index 70beda9abd7..f6a83213880 100644
--- a/cmd/state/exec3/state_recon.go
+++ b/cmd/state/exec3/state_recon.go
@@ -376,7 +376,7 @@ func (rw *ReconWorker) runTxTask(txTask *state.TxTask) error {
systemCall := func(ibs *state.IntraBlockState, index int) ([]byte, bool, error) {
vmConfig := vm.Config{NoReceipts: true, SkipAnalysis: txTask.SkipAnalysis}
msg := txTask.TxAsMessage
- ibs.SetTxContext(txTask.Tx.Hash(), txTask.TxIndex)
+ ibs.SetTxContext(txTask.TxIndex, txTask.BlockNum)
if rw.chainConfig.IsCancun(header.Number.Uint64(), header.Time) {
rules := rw.chainConfig.Rules(header.Number.Uint64(), header.Time)
ibs.Prepare(rules, msg.From(), txTask.EvmBlockContext.Coinbase, msg.To(), vm.ActivePrecompiles(rules), msg.AccessList(), nil)
@@ -412,12 +412,10 @@ func (rw *ReconWorker) runTxTask(txTask *state.TxTask) error {
}
gp := new(core.GasPool).AddGas(txTask.Tx.GetGas()).AddBlobGas(txTask.Tx.GetBlobGas())
vmConfig := vm.Config{NoReceipts: true, SkipAnalysis: txTask.SkipAnalysis}
- ibs.SetTxContext(txTask.Tx.Hash(), txTask.TxIndex)
+ ibs.SetTxContext(txTask.TxIndex, txTask.BlockNum)
msg := txTask.TxAsMessage
-
- rw.evm.ResetBetweenBlocks(txTask.EvmBlockContext, core.NewEVMTxContext(msg), ibs, vmConfig, txTask.Rules)
- vmenv := rw.evm
- if msg.FeeCap().IsZero() && rw.engine != nil {
+ msg.SetCheckNonce(!vmConfig.StatelessExec)
+ if msg.FeeCap().IsZero() {
// Only zero-gas transactions may be service ones
syscall := func(contract libcommon.Address, data []byte) ([]byte, error) {
return core.SysCallContract(contract, data, rw.chainConfig, ibs, header, rw.engine, true /* constCall */)
@@ -425,8 +423,12 @@ func (rw *ReconWorker) runTxTask(txTask *state.TxTask) error {
msg.SetIsFree(rw.engine.IsServiceTransaction(msg.From(), syscall))
}
- //fmt.Printf("txNum=%d, blockNum=%d, txIndex=%d\n", txTask.TxNum, txTask.BlockNum, txTask.TxIndex)
- _, err = core.ApplyMessage(vmenv, msg, gp, true /* refunds */, false /* gasBailout */)
+ txContext := core.NewEVMTxContext(msg)
+ if vmConfig.TraceJumpDest {
+ txContext.TxHash = txTask.Tx.Hash()
+ }
+ rw.evm.ResetBetweenBlocks(txTask.EvmBlockContext, txContext, ibs, vmConfig, txTask.Rules)
+ _, err = core.ApplyMessage(rw.evm, msg, gp, true /* refunds */, false /* gasBailout */)
if err != nil {
if _, readError := rw.stateReader.ReadError(); !readError {
return fmt.Errorf("could not apply blockNum=%d, txIdx=%d txNum=%d [%x] failed: %w", txTask.BlockNum, txTask.TxIndex, txTask.TxNum, txTask.Tx.Hash(), err)
diff --git a/cmd/state/exec3/trace_worker.go b/cmd/state/exec3/trace_worker.go
index 2c2ae7c7aa6..da73892788f 100644
--- a/cmd/state/exec3/trace_worker.go
+++ b/cmd/state/exec3/trace_worker.go
@@ -18,11 +18,9 @@ package exec3
import (
"fmt"
-
"github.com/erigontech/erigon-lib/chain"
"github.com/erigontech/erigon-lib/common"
"github.com/erigontech/erigon-lib/kv"
-
"github.com/erigontech/erigon/consensus"
"github.com/erigontech/erigon/core"
"github.com/erigontech/erigon/core/state"
@@ -99,21 +97,21 @@ func (e *TraceWorker) ChangeBlock(header *types.Header) {
e.vmConfig.SkipAnalysis = core.SkipAnalysis(e.chainConfig, e.blockNum)
}
-func (e *TraceWorker) GetLogs(txIdx int, txn types.Transaction) types.Logs {
- return e.ibs.GetLogs(txn.Hash(), e.blockNum, e.header.Hash())
+func (e *TraceWorker) GetRawLogs(txIdx int) types.Logs { return e.ibs.GetRawLogs(txIdx) }
+func (e *TraceWorker) GetLogs(txIndex int, txnHash common.Hash, blockNumber uint64, blockHash common.Hash) []*types.Log {
+ return e.ibs.GetLogs(txIndex, txnHash, blockNumber, blockHash)
}
-func (e *TraceWorker) ExecTxn(txNum uint64, txIndex int, txn types.Transaction) (*evmtypes.ExecutionResult, error) {
+func (e *TraceWorker) ExecTxn(txNum, blockNum uint64, txIndex int, txn types.Transaction, gasBailout bool) (*evmtypes.ExecutionResult, error) {
e.stateReader.SetTxNum(txNum)
- txHash := txn.Hash()
e.ibs.Reset()
- e.ibs.SetTxContext(txHash, txIndex)
- gp := new(core.GasPool).AddGas(txn.GetGas()).AddBlobGas(txn.GetBlobGas())
+ e.ibs.SetTxContext(txIndex, blockNum)
+
msg, err := txn.AsMessage(*e.signer, e.header.BaseFee, e.rules)
if err != nil {
return nil, err
}
- e.evm.ResetBetweenBlocks(*e.blockCtx, core.NewEVMTxContext(msg), e.ibs, *e.vmConfig, e.rules)
+ msg.SetCheckNonce(!e.vmConfig.StatelessExec)
if msg.FeeCap().IsZero() {
// Only zero-gas transactions may be service ones
syscall := func(contract common.Address, data []byte) ([]byte, error) {
@@ -121,14 +119,24 @@ func (e *TraceWorker) ExecTxn(txNum uint64, txIndex int, txn types.Transaction)
}
msg.SetIsFree(e.engine.IsServiceTransaction(msg.From(), syscall))
}
- res, err := core.ApplyMessage(e.evm, msg, gp, true /* refunds */, false /* gasBailout */)
+
+ txContext := core.NewEVMTxContext(msg)
+ if e.vmConfig.TraceJumpDest {
+ txContext.TxHash = txn.Hash()
+ }
+ e.evm.ResetBetweenBlocks(*e.blockCtx, txContext, e.ibs, *e.vmConfig, e.rules)
+
+ gp := new(core.GasPool).AddGas(txn.GetGas()).AddBlobGas(txn.GetBlobGas())
+ res, err := core.ApplyMessage(e.evm, msg, gp, true /* refunds */, gasBailout /* gasBailout */)
if err != nil {
return nil, fmt.Errorf("%w: blockNum=%d, txNum=%d, %s", err, e.blockNum, txNum, e.ibs.Error())
}
+ e.ibs.SoftFinalise()
if e.vmConfig.Tracer != nil {
if e.tracer.Found() {
e.tracer.SetTransaction(txn)
}
}
+
return res, nil
}
diff --git a/cmd/state/verify/verify_txlookup.go b/cmd/state/verify/verify_txlookup.go
index ecbba8e89b9..f437821cce0 100644
--- a/cmd/state/verify/verify_txlookup.go
+++ b/cmd/state/verify/verify_txlookup.go
@@ -74,10 +74,14 @@ func ValidateTxLookups(chaindata string, logger log.Logger) error {
if err := libcommon.Stopped(quitCh); err != nil {
return err
}
- blockHash, err := br.CanonicalHash(ctx, tx, blockNum)
+ blockHash, ok, err := br.CanonicalHash(ctx, tx, blockNum)
if err != nil {
return err
}
+ if !ok {
+ logger.Error("no canonnical hash", "blocknum", blockNum)
+ break
+ }
body, err := br.BodyWithTransactions(ctx, tx, blockHash, blockNum)
if err != nil {
return err
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
index 81b023025cb..34ba02b55c7 100644
--- a/cmd/utils/flags.go
+++ b/cmd/utils/flags.go
@@ -31,6 +31,8 @@ import (
"strings"
"time"
+ "github.com/erigontech/erigon-lib/chain/networkid"
+
"github.com/c2h5oh/datasize"
"github.com/spf13/cobra"
"github.com/spf13/pflag"
@@ -1053,7 +1055,7 @@ var (
DiagEndpointPortFlag = cli.UintFlag{
Name: "diagnostics.endpoint.port",
Usage: "Diagnostics HTTP server listening port",
- Value: 6060,
+ Value: 6062,
}
DiagSpeedTestFlag = cli.BoolFlag{
Name: "diagnostics.speedtest",
@@ -1803,7 +1805,13 @@ func SetEthConfig(ctx *cli.Context, nodeConfig *nodecfg.Config, cfg *ethconfig.C
if ctx.IsSet(NetworkIdFlag.Name) {
cfg.NetworkID = ctx.Uint64(NetworkIdFlag.Name)
if cfg.NetworkID != 1 && !ctx.IsSet(ChainFlag.Name) {
- chain = "" // don't default to mainnet if NetworkID != 1
+ chainName, ok := networkid.NetworkNameByID[cfg.NetworkID]
+ if !ok {
+ chain = "" // don't default to mainnet if NetworkID != 1 and it's devchain or smth
+ } else {
+ chain = chainName // fetch network name from id if name wasn't provided
+ }
+
}
} else {
cfg.NetworkID = params.NetworkIDByChainName(chain)
diff --git a/consensus/aura/aura.go b/consensus/aura/aura.go
index ceb00b5231b..6767e3389ff 100644
--- a/consensus/aura/aura.go
+++ b/consensus/aura/aura.go
@@ -228,9 +228,9 @@ func epochTransitionFor(chain consensus.ChainHeaderReader, e *NonTransactionalEp
// AuRa
// nolint
type AuRa struct {
- e *NonTransactionalEpochReader
- exitCh chan struct{}
- lock sync.RWMutex // Protects the signer fields
+ e *NonTransactionalEpochReader
+ exitCh chan struct{}
+ signerMutex sync.RWMutex // Protects the signer fields
step PermissionedStep
// History of step hashes recently received from peers.
@@ -858,8 +858,8 @@ func (c *AuRa) FinalizeAndAssemble(config *chain.Config, header *types.Header, s
// Authorize injects a private key into the consensus engine to mint new blocks
// with.
func (c *AuRa) Authorize(signer libcommon.Address, signFn clique.SignerFn) {
- c.lock.Lock()
- defer c.lock.Unlock()
+ c.signerMutex.Lock()
+ defer c.signerMutex.Unlock()
//c.signer = signer
//c.signFn = signFn
diff --git a/consensus/parlia/feynmanfork.go b/consensus/parlia/feynmanfork.go
index b33d7b7afa4..b09aee685be 100644
--- a/consensus/parlia/feynmanfork.go
+++ b/consensus/parlia/feynmanfork.go
@@ -102,7 +102,8 @@ func (p *Parlia) updateValidatorSetV2(chain consensus.ChainHeaderReader, ibs *st
// 1. get all validators and its voting header.Nu power
parent := chain.GetHeader(header.ParentHash, header.Number.Uint64()-1)
- if validatorItemsCache == nil && maxElectedValidatorsCache == big.NewInt(0) {
+ _, ok := ibs.StateReader.(*state.HistoryReaderV3)
+ if (validatorItemsCache == nil && maxElectedValidatorsCache == big.NewInt(0)) || ok {
stateReader := state.NewHistoryReaderV3()
stateReader.SetTx(tx)
maxTxNum, _ := rawdbv3.TxNums.Max(tx, header.Number.Uint64()-1)
diff --git a/core/blockchain.go b/core/blockchain.go
index b2c991cf8a5..bed26981e7a 100644
--- a/core/blockchain.go
+++ b/core/blockchain.go
@@ -124,7 +124,7 @@ func ExecuteBlockEphemerallyForBSC(
continue
}
}
- ibs.SetTxContext(tx.Hash(), i)
+ ibs.SetTxContext(i, block.NumberU64())
writeTrace := false
if vmConfig.Debug && vmConfig.Tracer == nil {
tracer, err := getTracer(i, tx.Hash())
@@ -256,7 +256,7 @@ func ExecuteBlockEphemerally(
receipts := make(types.Receipts, 0, block.Transactions().Len())
noop := state.NewNoopWriter()
for i, txn := range block.Transactions() {
- ibs.SetTxContext(txn.Hash(), i)
+ ibs.SetTxContext(i, block.NumberU64())
writeTrace := false
if vmConfig.Debug && vmConfig.Tracer == nil {
tracer, err := getTracer(i, txn.Hash())
diff --git a/core/chain_makers.go b/core/chain_makers.go
index 96fba3c5cf9..ce1e6299f69 100644
--- a/core/chain_makers.go
+++ b/core/chain_makers.go
@@ -128,7 +128,7 @@ func (b *BlockGen) AddTxWithChain(getHeader func(hash libcommon.Hash, number uin
if b.gasPool == nil {
b.SetCoinbase(libcommon.Address{})
}
- b.ibs.SetTxContext(txn.Hash(), len(b.txs))
+ b.ibs.SetTxContext(len(b.txs), b.header.Number.Uint64())
receipt, _, err := ApplyTransaction(b.config, GetHashFn(b.header, getHeader), engine, &b.header.Coinbase, b.gasPool, b.ibs, state.NewNoopWriter(), b.header, txn, &b.header.GasUsed, b.header.BlobGasUsed, vm.Config{})
if err != nil {
panic(err)
@@ -144,7 +144,7 @@ func (b *BlockGen) AddFailedTxWithChain(getHeader func(hash libcommon.Hash, numb
if b.gasPool == nil {
b.SetCoinbase(libcommon.Address{})
}
- b.ibs.SetTxContext(txn.Hash(), len(b.txs))
+ b.ibs.SetTxContext(len(b.txs), b.header.Number.Uint64())
receipt, _, err := ApplyTransaction(b.config, GetHashFn(b.header, getHeader), engine, &b.header.Coinbase, b.gasPool, b.ibs, state.NewNoopWriter(), b.header, txn, &b.header.GasUsed, b.header.BlobGasUsed, vm.Config{})
_ = err // accept failed transactions
b.txs = append(b.txs, txn)
diff --git a/core/genesis_write.go b/core/genesis_write.go
index b47c227c9b7..b1138b7ccce 100644
--- a/core/genesis_write.go
+++ b/core/genesis_write.go
@@ -561,8 +561,7 @@ func GenesisToBlock(g *types.Genesis, dirs datadir.Dirs, logger log.Logger) (*ty
genesisTmpDB := mdbx.NewMDBX(logger).InMem(dirs.DataDir).MapSize(2 * datasize.GB).GrowthStep(1 * datasize.MB).MustOpen()
defer genesisTmpDB.Close()
- cr := rawdb.NewCanonicalReader(rawdbv3.TxNums)
- agg, err := state2.NewAggregator(context.Background(), dirs, config3.HistoryV3AggregationStep, genesisTmpDB, cr, logger)
+ agg, err := state2.NewAggregator(context.Background(), dirs, config3.HistoryV3AggregationStep, genesisTmpDB, logger)
if err != nil {
return err
}
diff --git a/core/rawdb/accessors_canonical_reader.go b/core/rawdb/accessors_canonical_reader.go
deleted file mode 100644
index 0f9d4551688..00000000000
--- a/core/rawdb/accessors_canonical_reader.go
+++ /dev/null
@@ -1,266 +0,0 @@
-// Copyright 2024 The Erigon Authors
-// This file is part of Erigon.
-//
-// Erigon is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Erigon is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with Erigon. If not, see .
-
-package rawdb
-
-import (
- "encoding/binary"
- "fmt"
-
- common2 "github.com/erigontech/erigon-lib/common"
- "github.com/erigontech/erigon-lib/common/hexutility"
- "github.com/erigontech/erigon-lib/kv"
- "github.com/erigontech/erigon-lib/kv/order"
- "github.com/erigontech/erigon-lib/kv/rawdbv3"
- "github.com/erigontech/erigon-lib/kv/stream"
-)
-
-type CanonicalTxnIds struct {
- canonicalMarkers stream.KV
- tx kv.Tx
-
- // input params
- fromTxNum, toTxNum int
- orderAscend order.By
- limit int
-
- // private fields
- currentTxNum int
- hasNext bool
- endOfCurrentBlock uint64
-
- txNumsReader rawdbv3.TxNumsReader
-}
-type CanonicalReader struct {
- txNumsReader rawdbv3.TxNumsReader
-}
-
-func NewCanonicalReader(txNumsReader rawdbv3.TxNumsReader) *CanonicalReader {
- return &CanonicalReader{txNumsReader: txNumsReader}
-}
-func (c *CanonicalReader) TxnIdsOfCanonicalBlocks(tx kv.Tx, fromTxNum, toTxNum int, asc order.By, limit int) (stream.U64, error) {
- return TxnIdsOfCanonicalBlocks(tx, c.txNumsReader, fromTxNum, toTxNum, asc, limit)
-}
-func (c *CanonicalReader) TxNum2ID(tx kv.Tx, blockNum uint64, blockHash common2.Hash, txNum uint64) (kv.TxnId, error) {
- if blockNum == 0 {
- return kv.TxnId(txNum), nil
- }
- b, err := readBodyForStorage(tx, blockHash, blockNum)
- if err != nil {
- return 0, err
- }
- if b == nil { // freezed and pruned
- _min, err := c.txNumsReader.Min(tx, blockNum)
- if err != nil {
- return 0, err
- }
- _max, err := c.txNumsReader.Max(tx, blockNum)
- if err != nil {
- return 0, err
- }
- if txNum < _min || txNum > _max {
- return 0, fmt.Errorf("TxNum2ID: txNum=%d out of range: %d, %d", txNum, _min, _max)
- }
- return kv.TxnId(txNum), nil
- }
- return kv.TxnId(b.BaseTxnID), nil
-}
-
-func (c *CanonicalReader) BaseTxnID(tx kv.Tx, blockNum uint64, blockHash common2.Hash) (kv.TxnId, error) {
- if blockNum == 0 {
- return kv.TxnId(0), nil
- }
-
- //TODO: what if body is in db and files?
- b, err := readBodyForStorage(tx, blockHash, blockNum)
- if err != nil {
- return 0, err
- }
- if b == nil { // freezed and pruned
- _min, err := c.txNumsReader.Min(tx, blockNum)
- if err != nil {
- return 0, err
- }
- return kv.TxnId(_min), nil
- }
- return kv.TxnId(b.BaseTxnID), nil
-}
-
-func (c *CanonicalReader) LastFrozenTxNum(tx kv.Tx) (kv.TxnId, error) {
- n, ok, err := ReadFirstNonGenesisHeaderNumber(tx)
- if err != nil {
- return 0, err
- }
- if !ok {
- //seq, err := tx.ReadSequence(kv.EthTx)
- //seq-1
- _, _lastTxNumInFiles, err := c.txNumsReader.Last(tx)
- return kv.TxnId(_lastTxNumInFiles), err
-
- }
- _max, err := c.txNumsReader.Max(tx, n)
- if err != nil {
- return 0, err
- }
- return kv.TxnId(_max), nil
-}
-
-// TxnIdsOfCanonicalBlocks - returns non-canonical txnIds of canonical block range
-// [fromTxNum, toTxNum)
-// To get all canonical blocks, use fromTxNum=0, toTxNum=-1
-// For reverse iteration use order.Desc and fromTxNum=-1, toTxNum=-1
-func TxnIdsOfCanonicalBlocks(tx kv.Tx, txNumsReader rawdbv3.TxNumsReader, fromTxNum, toTxNum int, asc order.By, limit int) (stream.U64, error) {
- if asc && fromTxNum > 0 && toTxNum > 0 && fromTxNum >= toTxNum {
- return nil, fmt.Errorf("fromTxNum >= toTxNum: %d, %d", fromTxNum, toTxNum)
- }
- if !asc && fromTxNum > 0 && toTxNum > 0 && fromTxNum <= toTxNum {
- return nil, fmt.Errorf("fromTxNum <= toTxNum: %d, %d", fromTxNum, toTxNum)
- }
-
- it := &CanonicalTxnIds{tx: tx, txNumsReader: txNumsReader, fromTxNum: fromTxNum, toTxNum: toTxNum, orderAscend: asc, limit: limit, currentTxNum: -1}
- if err := it.init(); err != nil {
- it.Close() //it's responsibility of constructor (our) to close resource on error
- return nil, err
- }
- if !it.HasNext() {
- it.Close()
- return stream.EmptyU64, nil
- }
- return it, nil
-}
-
-func (s *CanonicalTxnIds) init() (err error) {
- tx := s.tx
- var from, to []byte
- if s.fromTxNum >= 0 {
- ok, blockFrom, err := s.txNumsReader.FindBlockNum(tx, uint64(s.fromTxNum))
- if err != nil {
- return err
- }
- if ok {
- from = hexutility.EncodeTs(blockFrom)
- }
- }
-
- if s.toTxNum >= 0 {
- ok, blockTo, err := s.txNumsReader.FindBlockNum(tx, uint64(s.toTxNum))
- if err != nil {
- return err
- }
- if ok {
- to = hexutility.EncodeTs(blockTo + 1)
- }
- }
-
- if s.orderAscend {
- s.canonicalMarkers, err = tx.RangeAscend(kv.HeaderCanonical, from, to, -1)
- if err != nil {
- return err
- }
- } else {
- s.canonicalMarkers, err = tx.RangeDescend(kv.HeaderCanonical, from, to, -1)
- if err != nil {
- return err
- }
- }
- if err := s.advance(); err != nil {
- return err
- }
- return nil
-}
-
-func (s *CanonicalTxnIds) advance() (err error) {
- var endOfBlock bool
- if s.currentTxNum < 0 {
- endOfBlock = true
- } else {
- if s.orderAscend {
- s.currentTxNum++
- endOfBlock = s.currentTxNum >= int(s.endOfCurrentBlock)
- } else {
- s.currentTxNum--
- endOfBlock = s.currentTxNum <= int(s.endOfCurrentBlock)
- }
- }
-
- if !endOfBlock || s.currentTxNum == int(s.endOfCurrentBlock) {
- return nil
- }
-
- if !s.canonicalMarkers.HasNext() {
- s.currentTxNum = -1
- return nil
- }
-
- k, v, err := s.canonicalMarkers.Next()
- if err != nil {
- return err
- }
- blockNum := binary.BigEndian.Uint64(k)
- blockHash := common2.BytesToHash(v)
- body, err := readBodyForStorage(s.tx, blockHash, blockNum)
- if err != nil {
- return err
- }
- if body == nil {
- return fmt.Errorf("body not found: %d, %x", blockNum, blockHash)
- }
-
- if s.orderAscend {
- s.currentTxNum = int(body.BaseTxnID)
- s.endOfCurrentBlock = body.BaseTxnID.LastSystemTx(body.TxCount)
- } else {
- s.currentTxNum = int(body.BaseTxnID.LastSystemTx(body.TxCount))
- s.endOfCurrentBlock = body.BaseTxnID.U64()
- }
- return nil
-}
-
-func (s *CanonicalTxnIds) HasNext() bool {
- if s.limit == 0 { // limit reached
- return false
- }
- if s.currentTxNum < 0 { // EndOfTable
- return false
- }
- if s.toTxNum < 0 { //no boundaries
- return true
- }
-
- //Asc: [from, to) AND from < to
- //Desc: [from, to) AND from > to
- return (bool(s.orderAscend) && s.currentTxNum < s.toTxNum) ||
- (!bool(s.orderAscend) && s.currentTxNum > s.toTxNum)
-}
-
-func (s *CanonicalTxnIds) Next() (uint64, error) {
- s.limit--
- v := uint64(s.currentTxNum)
- if err := s.advance(); err != nil {
- return 0, err
- }
- return v, nil
-}
-
-func (s *CanonicalTxnIds) Close() {
- if s == nil {
- return
- }
- if s.canonicalMarkers != nil {
- s.canonicalMarkers.Close()
- s.canonicalMarkers = nil
- }
-}
diff --git a/core/rawdb/accessors_canonical_reader_test.go b/core/rawdb/accessors_canonical_reader_test.go
deleted file mode 100644
index 48dc9f56bbc..00000000000
--- a/core/rawdb/accessors_canonical_reader_test.go
+++ /dev/null
@@ -1,115 +0,0 @@
-// Copyright 2018 The go-ethereum Authors
-// (original work)
-// Copyright 2024 The Erigon Authors
-// (modifications)
-// This file is part of Erigon.
-//
-// Erigon is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Erigon is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with Erigon. If not, see .
-
-package rawdb_test
-
-import (
- "bytes"
- "sort"
- "testing"
-
- libcommon "github.com/erigontech/erigon-lib/common"
- "github.com/erigontech/erigon-lib/common/u256"
- "github.com/erigontech/erigon-lib/kv/order"
- "github.com/erigontech/erigon-lib/kv/rawdbv3"
- "github.com/erigontech/erigon-lib/kv/stream"
- "github.com/erigontech/erigon/core/rawdb"
- "github.com/erigontech/erigon/core/types"
- "github.com/erigontech/erigon/turbo/stages/mock"
- "github.com/stretchr/testify/require"
-)
-
-// Tests block header storage and retrieval operations.
-func TestCanonicalIter(t *testing.T) {
- t.Parallel()
- m, require := mock.Mock(t), require.New(t)
-
- txn := &types.DynamicFeeTransaction{Tip: u256.N1, FeeCap: u256.N1, ChainID: u256.N1, CommonTx: types.CommonTx{Value: u256.N1, Gas: 1, Nonce: 1}}
- buf := bytes.NewBuffer(nil)
- err := txn.MarshalBinary(buf)
- require.NoError(err)
- rlpTxn := buf.Bytes()
- b := &types.RawBody{Transactions: [][]byte{rlpTxn, rlpTxn, rlpTxn, rlpTxn}}
-
- tx, err := m.DB.BeginRw(m.Ctx)
- require.NoError(err)
- defer tx.Rollback()
-
- // write 2 forks - 3 blocks in each fork
- _, err = rawdb.WriteRawBodyIfNotExists(tx, libcommon.Hash{10}, 0, b)
- require.NoError(err)
- _, err = rawdb.WriteRawBodyIfNotExists(tx, libcommon.Hash{20}, 0, b)
- require.NoError(err)
-
- _, err = rawdb.WriteRawBodyIfNotExists(tx, libcommon.Hash{11}, 1, b)
- require.NoError(err)
- _, err = rawdb.WriteRawBodyIfNotExists(tx, libcommon.Hash{21}, 1, b)
- require.NoError(err)
-
- _, err = rawdb.WriteRawBodyIfNotExists(tx, libcommon.Hash{12}, 2, b)
- require.NoError(err)
- _, err = rawdb.WriteRawBodyIfNotExists(tx, libcommon.Hash{22}, 2, b)
- require.NoError(err)
-
- it, err := rawdb.TxnIdsOfCanonicalBlocks(tx, rawdbv3.TxNums, 0, -1, order.Asc, -1)
- require.NoError(err)
- require.Equal(true, it.HasNext())
-
- // tx already contains genesis block of 2 transactions
- t.Logf("genesis: %v", stream.ToArrU64Must(it))
-
- //mark 3 blocks as canonical
- require.NoError(rawdb.WriteCanonicalHash(tx, libcommon.Hash{10}, 0))
- require.NoError(rawdb.WriteCanonicalHash(tx, libcommon.Hash{11}, 1))
- require.NoError(rawdb.WriteCanonicalHash(tx, libcommon.Hash{12}, 2))
-
- txNumsOfBlock := func(bn uint64) (res []uint64) {
- txns := uint64(types.TxCountToTxAmount(len(b.Transactions)))
- s := uint64(1) // genesis block ends at
- if bn > 0 {
- s += bn * txns
- }
- s++ // system
- for i := uint64(0); i < txns; i++ {
- res = append(res, s+i)
- }
- return res
- }
-
- it, err = rawdb.TxnIdsOfCanonicalBlocks(tx, rawdbv3.TxNums, 0, 2+len(b.Transactions)+2, order.Asc, -1)
- require.NoError(err)
- require.Equal(true, it.HasNext())
- exp := txNumsOfBlock(0)
- t.Logf("expected full block 0: %v", exp)
- require.Equal(exp, stream.ToArrU64Must(it))
-
- it, err = rawdb.TxnIdsOfCanonicalBlocks(tx, rawdbv3.TxNums, 0, -1, order.Asc, -1)
- require.NoError(err)
- require.Equal(true, it.HasNext())
- exp = append(append(txNumsOfBlock(0), txNumsOfBlock(2)...), txNumsOfBlock(4)...)
- t.Logf("expected %v", exp)
- require.Equal(exp, stream.ToArrU64Must(it))
-
- rit, err := rawdb.TxnIdsOfCanonicalBlocks(tx, rawdbv3.TxNums, -1, -1, order.Desc, -1)
- require.NoError(err)
- require.Equal(true, rit.HasNext())
- sort.Slice(exp, func(i, j int) bool { return exp[i] > exp[j] })
- t.Logf("reverse expected %v", exp)
- require.Equal(exp, stream.ToArrU64Must(rit))
-}
diff --git a/core/rawdb/accessors_chain.go b/core/rawdb/accessors_chain.go
index b16eb3e1d29..edebdfe5f4a 100644
--- a/core/rawdb/accessors_chain.go
+++ b/core/rawdb/accessors_chain.go
@@ -23,7 +23,6 @@ import (
"bytes"
"context"
"encoding/binary"
- "encoding/json"
"fmt"
"math"
"math/big"
@@ -1207,43 +1206,6 @@ func IsPosBlock(db kv.Getter, blockHash common.Hash) (trans bool, err error) {
return header.Difficulty.Sign() == 0, nil
}
-var SnapshotsKey = []byte("snapshots")
-var SnapshotsHistoryKey = []byte("snapshots_history")
-
-func ReadSnapshots(tx kv.Tx) ([]string, []string, error) {
- v, err := tx.GetOne(kv.DatabaseInfo, SnapshotsKey)
- if err != nil {
- return nil, nil, err
- }
- var res, resHist []string
- _ = json.Unmarshal(v, &res)
-
- v, err = tx.GetOne(kv.DatabaseInfo, SnapshotsHistoryKey)
- if err != nil {
- return nil, nil, err
- }
- _ = json.Unmarshal(v, &resHist)
- return res, resHist, nil
-}
-
-func WriteSnapshots(tx kv.RwTx, list, histList []string) error {
- res, err := json.Marshal(list)
- if err != nil {
- return err
- }
- if err := tx.Put(kv.DatabaseInfo, SnapshotsKey, res); err != nil {
- return err
- }
- res, err = json.Marshal(histList)
- if err != nil {
- return err
- }
- if err := tx.Put(kv.DatabaseInfo, SnapshotsHistoryKey, res); err != nil {
- return err
- }
- return nil
-}
-
// PruneTable has `limit` parameter to avoid too large data deletes per one sync cycle - better delete by small portions to reduce db.FreeList size
func PruneTable(tx kv.RwTx, table string, pruneTo uint64, ctx context.Context, limit int) error {
c, err := tx.RwCursor(table)
diff --git a/core/rawdb/accessors_chain_test.go b/core/rawdb/accessors_chain_test.go
index 6abd0cef448..115667a89a8 100644
--- a/core/rawdb/accessors_chain_test.go
+++ b/core/rawdb/accessors_chain_test.go
@@ -378,7 +378,7 @@ func TestCanonicalMappingStorage(t *testing.T) {
// Create a test canonical number and assinged hash to move around
hash, number := libcommon.Hash{0: 0xff}, uint64(314)
- entry, err := br.CanonicalHash(m.Ctx, tx, number)
+ entry, _, err := br.CanonicalHash(m.Ctx, tx, number)
if err != nil {
t.Fatalf("ReadCanonicalHash failed: %v", err)
}
@@ -390,7 +390,7 @@ func TestCanonicalMappingStorage(t *testing.T) {
if err != nil {
t.Fatalf("WriteCanoncalHash failed: %v", err)
}
- entry, err = br.CanonicalHash(m.Ctx, tx, number)
+ entry, _, err = br.CanonicalHash(m.Ctx, tx, number)
if err != nil {
t.Fatalf("ReadCanonicalHash failed: %v", err)
}
@@ -404,7 +404,7 @@ func TestCanonicalMappingStorage(t *testing.T) {
if err != nil {
t.Fatalf("DeleteCanonicalHash failed: %v", err)
}
- entry, err = br.CanonicalHash(m.Ctx, tx, number)
+ entry, _, err = br.CanonicalHash(m.Ctx, tx, number)
if err != nil {
t.Error(err)
}
diff --git a/core/rawdb/accessors_indexes_test.go b/core/rawdb/accessors_indexes_test.go
index 7ba5587b2f5..2f0291a4562 100644
--- a/core/rawdb/accessors_indexes_test.go
+++ b/core/rawdb/accessors_indexes_test.go
@@ -122,11 +122,11 @@ func readTransactionByHash(db kv.Tx, hash libcommon.Hash, br services.FullBlockR
if blockNumber == nil {
return nil, libcommon.Hash{}, 0, 0, nil
}
- blockHash, err := br.CanonicalHash(context.Background(), db, *blockNumber)
+ blockHash, ok, err := br.CanonicalHash(context.Background(), db, *blockNumber)
if err != nil {
return nil, libcommon.Hash{}, 0, 0, err
}
- if blockHash == (libcommon.Hash{}) {
+ if !ok || blockHash == (libcommon.Hash{}) {
return nil, libcommon.Hash{}, 0, 0, nil
}
body, _ := br.BodyWithTransactions(context.Background(), db, blockHash, *blockNumber)
diff --git a/core/rawdb/rawdbreset/reset_stages.go b/core/rawdb/rawdbreset/reset_stages.go
index 80957b095ed..f1ed9c9a481 100644
--- a/core/rawdb/rawdbreset/reset_stages.go
+++ b/core/rawdb/rawdbreset/reset_stages.go
@@ -188,8 +188,10 @@ func ResetTxLookup(tx kv.RwTx) error {
}
var Tables = map[stages.SyncStage][]string{
- stages.CustomTrace: {},
- stages.Finish: {},
+ stages.CustomTrace: {
+ kv.TblReceiptVals, kv.TblReceiptHistoryKeys, kv.TblReceiptHistoryVals, kv.TblReceiptIdx,
+ },
+ stages.Finish: {},
}
var stateBuckets = []string{
kv.Epoch, kv.PendingEpoch, kv.BorReceipts,
@@ -208,9 +210,9 @@ var stateHistoryV3Buckets = []string{
kv.TblTracesToKeys, kv.TblTracesToIdx,
}
var stateV3Buckets = []string{
- kv.TblAccountKeys, kv.TblStorageKeys, kv.TblCodeKeys, kv.TblCommitmentKeys,
- kv.TblAccountVals, kv.TblStorageVals, kv.TblCodeVals, kv.TblCommitmentVals,
+ kv.TblAccountVals, kv.TblStorageVals, kv.TblCodeVals, kv.TblCommitmentVals, kv.TblReceiptVals,
kv.TblCommitmentHistoryKeys, kv.TblCommitmentHistoryVals, kv.TblCommitmentIdx,
+ kv.TblReceiptHistoryKeys, kv.TblReceiptHistoryVals, kv.TblReceiptIdx,
kv.TblPruningProgress,
kv.ChangeSets3,
}
diff --git a/core/rawdb/rawtemporaldb/accessors_receipt.go b/core/rawdb/rawtemporaldb/accessors_receipt.go
new file mode 100644
index 00000000000..611a00f37cd
--- /dev/null
+++ b/core/rawdb/rawtemporaldb/accessors_receipt.go
@@ -0,0 +1,111 @@
+package rawtemporaldb
+
+import (
+ "encoding/binary"
+
+ "github.com/erigontech/erigon-lib/common"
+ "github.com/erigontech/erigon-lib/kv"
+ "github.com/erigontech/erigon/core/types"
+)
+
+var (
+ CumulativeGasUsedInBlockKey = []byte{0x0}
+ CumulativeBlobGasUsedInBlockKey = []byte{0x1}
+ FirstLogIndexKey = []byte{0x2}
+)
+
+// `ReadReceipt` does fill `rawLogs` calulated fields. but we don't need it anymore.
+func ReceiptAsOfWithApply(tx kv.TemporalTx, txNum uint64, rawLogs types.Logs, txnIdx int, blockHash common.Hash, blockNum uint64, txn types.Transaction) (*types.Receipt, error) {
+ cumulativeGasUsedBeforeTxn, cumulativeBlobGasUsed, firstLogIndexWithinBlock, err := ReceiptAsOf(tx, txNum+1)
+ if err != nil {
+ return nil, err
+ }
+ //if txnIdx == 0 {
+ //logIndex always 0
+ //}
+
+ r := &types.Receipt{
+ Logs: rawLogs,
+ CumulativeGasUsed: cumulativeGasUsedBeforeTxn,
+ FirstLogIndexWithinBlock: firstLogIndexWithinBlock,
+ }
+ _ = cumulativeBlobGasUsed
+
+ if err := r.DeriveFieldsV3ForSingleReceipt(txnIdx, blockHash, blockNum, txn, cumulativeGasUsedBeforeTxn); err != nil {
+ return nil, err
+ }
+ return r, nil
+}
+
+func ReceiptAsOf(tx kv.TemporalTx, txNum uint64) (cumGasUsed uint64, cumBlobGasused uint64, firstLogIndexWithinBlock uint32, err error) {
+ var v []byte
+ var ok bool
+
+ v, ok, err = tx.DomainGetAsOf(kv.ReceiptDomain, CumulativeGasUsedInBlockKey, nil, txNum)
+ if err != nil {
+ return
+ }
+ if ok && v != nil {
+ cumGasUsed = uvarint(v)
+ }
+
+ v, ok, err = tx.DomainGetAsOf(kv.ReceiptDomain, CumulativeBlobGasUsedInBlockKey, nil, txNum)
+ if err != nil {
+ return
+ }
+ if ok && v != nil {
+ cumBlobGasused = uvarint(v)
+ }
+
+ //if txnIdx == 0 {
+ //logIndex always 0
+ //}
+
+ v, ok, err = tx.DomainGetAsOf(kv.ReceiptDomain, FirstLogIndexKey, nil, txNum)
+ if err != nil {
+ return
+ }
+ if ok && v != nil {
+ firstLogIndexWithinBlock = uint32(uvarint(v))
+ }
+ return
+}
+
+func AppendReceipt(ttx kv.TemporalPutDel, receipt *types.Receipt, cumBlobGasUsed uint64) error {
+ var cumGasUsedInBlock uint64
+ var firstLogIndexWithinBlock uint32
+ if receipt != nil {
+ cumGasUsedInBlock = receipt.CumulativeGasUsed
+ firstLogIndexWithinBlock = receipt.FirstLogIndexWithinBlock
+ }
+
+ {
+ var buf [binary.MaxVarintLen64]byte
+ i := binary.PutUvarint(buf[:], cumGasUsedInBlock)
+ if err := ttx.DomainPut(kv.ReceiptDomain, CumulativeGasUsedInBlockKey, nil, buf[:i], nil, 0); err != nil {
+ return err
+ }
+ }
+
+ {
+ var buf [binary.MaxVarintLen64]byte
+ i := binary.PutUvarint(buf[:], cumBlobGasUsed)
+ if err := ttx.DomainPut(kv.ReceiptDomain, CumulativeBlobGasUsedInBlockKey, nil, buf[:i], nil, 0); err != nil {
+ return err
+ }
+ }
+
+ {
+ var buf [binary.MaxVarintLen64]byte
+ i := binary.PutUvarint(buf[:], uint64(firstLogIndexWithinBlock))
+ if err := ttx.DomainPut(kv.ReceiptDomain, FirstLogIndexKey, nil, buf[:i], nil, 0); err != nil {
+ return err
+ }
+ }
+ return nil
+}
+
+func uvarint(in []byte) (res uint64) {
+ res, _ = binary.Uvarint(in)
+ return res
+}
diff --git a/core/rawdb/rawtemporaldb/accessors_receipt_test.go b/core/rawdb/rawtemporaldb/accessors_receipt_test.go
new file mode 100644
index 00000000000..d96d99e257e
--- /dev/null
+++ b/core/rawdb/rawtemporaldb/accessors_receipt_test.go
@@ -0,0 +1,111 @@
+package rawtemporaldb
+
+import (
+ "context"
+ "testing"
+
+ "github.com/erigontech/erigon-lib/common/datadir"
+ "github.com/erigontech/erigon-lib/kv"
+ "github.com/erigontech/erigon-lib/kv/temporal/temporaltest"
+ "github.com/erigontech/erigon-lib/log/v3"
+ "github.com/erigontech/erigon-lib/state"
+ "github.com/erigontech/erigon/core/types"
+ "github.com/stretchr/testify/require"
+)
+
+func TestAppendReceipt(t *testing.T) {
+ dirs, require := datadir.New(t.TempDir()), require.New(t)
+ db, _ := temporaltest.NewTestDB(t, dirs)
+ tx, err := db.BeginRw(context.Background())
+ require.NoError(err)
+ defer tx.Rollback()
+
+ doms, err := state.NewSharedDomains(tx, log.New())
+ require.NoError(err)
+ defer doms.Close()
+ doms.SetTx(tx)
+
+ doms.SetTxNum(0) // block1
+ err = AppendReceipt(doms, &types.Receipt{CumulativeGasUsed: 10, FirstLogIndexWithinBlock: 0}, 0)
+ require.NoError(err)
+
+ doms.SetTxNum(1) // block1
+ err = AppendReceipt(doms, &types.Receipt{CumulativeGasUsed: 11, FirstLogIndexWithinBlock: 1}, 0)
+ require.NoError(err)
+
+ doms.SetTxNum(2) // block1
+
+ doms.SetTxNum(3) // block2
+ err = AppendReceipt(doms, &types.Receipt{CumulativeGasUsed: 12, FirstLogIndexWithinBlock: 0}, 0)
+ require.NoError(err)
+
+ doms.SetTxNum(4) // block2
+ err = AppendReceipt(doms, &types.Receipt{CumulativeGasUsed: 14, FirstLogIndexWithinBlock: 4}, 0)
+ require.NoError(err)
+
+ doms.SetTxNum(5) // block2
+
+ err = doms.Flush(context.Background(), tx)
+ require.NoError(err)
+
+ ttx := tx.(kv.TemporalTx)
+ v, ok, err := ttx.HistorySeek(kv.ReceiptHistory, FirstLogIndexKey, 0)
+ require.NoError(err)
+ require.True(ok)
+ require.Empty(v)
+
+ v, ok, err = ttx.HistorySeek(kv.ReceiptHistory, FirstLogIndexKey, 1)
+ require.NoError(err)
+ require.True(ok)
+ require.Equal(uint64(0), uvarint(v))
+
+ v, ok, err = ttx.HistorySeek(kv.ReceiptHistory, FirstLogIndexKey, 2)
+ require.NoError(err)
+ require.True(ok)
+ require.Equal(uint64(1), uvarint(v))
+
+ v, ok, err = ttx.HistorySeek(kv.ReceiptHistory, FirstLogIndexKey, 3)
+ require.NoError(err)
+ require.True(ok)
+ require.Equal(uint64(1), uvarint(v))
+
+ v, ok, err = ttx.HistorySeek(kv.ReceiptHistory, FirstLogIndexKey, 4)
+ require.NoError(err)
+ require.True(ok)
+ require.Equal(uint64(0), uvarint(v))
+
+ //block1
+ cumGasUsed, _, firstLogIndex, err := ReceiptAsOf(ttx, 0)
+ require.NoError(err)
+ require.Equal(uint32(0), firstLogIndex)
+ require.Equal(uint64(0), cumGasUsed)
+
+ cumGasUsed, _, firstLogIndex, err = ReceiptAsOf(ttx, 1)
+ require.NoError(err)
+ require.Equal(uint32(0), firstLogIndex)
+ require.Equal(uint64(10), cumGasUsed)
+
+ cumGasUsed, _, firstLogIndex, err = ReceiptAsOf(ttx, 2)
+ require.NoError(err)
+ require.Equal(uint32(1), firstLogIndex)
+ require.Equal(uint64(11), cumGasUsed)
+
+ //block2
+ cumGasUsed, _, firstLogIndex, err = ReceiptAsOf(ttx, 3)
+ require.NoError(err)
+ require.Equal(uint32(1), firstLogIndex)
+ require.Equal(uint64(11), cumGasUsed)
+
+ cumGasUsed, _, firstLogIndex, err = ReceiptAsOf(ttx, 4)
+ require.NoError(err)
+ require.Equal(uint32(0), firstLogIndex)
+ require.Equal(uint64(12), cumGasUsed)
+
+ cumGasUsed, _, firstLogIndex, err = ReceiptAsOf(ttx, 5)
+ require.NoError(err)
+ require.Equal(uint32(4), firstLogIndex)
+ require.Equal(uint64(14), cumGasUsed)
+
+ // reader
+
+}
diff --git a/core/snaptype/bsc_types.go b/core/snaptype/bsc_types.go
index 427b03532cd..0ff3e03d0d7 100644
--- a/core/snaptype/bsc_types.go
+++ b/core/snaptype/bsc_types.go
@@ -46,9 +46,6 @@ var (
LessFalsePositives: true,
}
if err := snaptype.BuildIndex(ctx, info, cfg, log.LvlDebug, p, func(idx *recsplit.RecSplit, i, offset uint64, word []byte) error {
- if i%20_000 == 0 {
- logger.Log(lvl, "Generating idx for %s", info.Type.Name(), "progress", i)
- }
p.Processed.Add(1)
n := binary.PutUvarint(num, i)
if err := idx.AddKey(num[:n], offset); err != nil {
diff --git a/core/state/intra_block_state.go b/core/state/intra_block_state.go
index b0b9a08bbf7..e3936743510 100644
--- a/core/state/intra_block_state.go
+++ b/core/state/intra_block_state.go
@@ -80,10 +80,10 @@ type IntraBlockState struct {
// The refund counter, also used by state transitioning.
refund uint64
- thash libcommon.Hash
- txIndex int
- logs map[libcommon.Hash][]*types.Log
- logSize uint
+ blockNum uint64
+ txIndex int
+ logs []types.Logs
+ logSize uint
// Per-transaction access list
accessList *accessList
@@ -107,11 +107,12 @@ func New(stateReader StateReader) *IntraBlockState {
stateObjects: map[libcommon.Address]*stateObject{},
stateObjectsDirty: map[libcommon.Address]struct{}{},
nilAccounts: map[libcommon.Address]struct{}{},
- logs: map[libcommon.Hash][]*types.Log{},
+ logs: []types.Logs{},
journal: newJournal(),
accessList: newAccessList(),
transientStorage: newTransientStorage(),
balanceInc: map[libcommon.Address]*BalanceIncrease{},
+ txIndex: 0,
//trace: true,
}
}
@@ -155,34 +156,49 @@ func (sdb *IntraBlockState) Reset() {
//clear(sdb.stateObjects)
sdb.stateObjectsDirty = make(map[libcommon.Address]struct{})
//clear(sdb.stateObjectsDirty)
- sdb.logs = make(map[libcommon.Hash][]*types.Log)
+ clear(sdb.logs) // free pointers
+ sdb.logs = sdb.logs[:0]
sdb.balanceInc = make(map[libcommon.Address]*BalanceIncrease)
//clear(sdb.balanceInc)
- sdb.thash = libcommon.Hash{}
sdb.txIndex = 0
sdb.logSize = 0
}
func (sdb *IntraBlockState) AddLog(log2 *types.Log) {
- sdb.journal.append(addLogChange{txhash: sdb.thash})
- log2.TxHash = sdb.thash
+ sdb.journal.append(addLogChange{txIndex: sdb.txIndex})
log2.TxIndex = uint(sdb.txIndex)
log2.Index = sdb.logSize
- sdb.logs[sdb.thash] = append(sdb.logs[sdb.thash], log2)
sdb.logSize++
+ for len(sdb.logs) <= sdb.txIndex {
+ sdb.logs = append(sdb.logs, nil)
+ }
+ sdb.logs[sdb.txIndex] = append(sdb.logs[sdb.txIndex], log2)
}
-func (sdb *IntraBlockState) GetLogs(hash libcommon.Hash, blockNumber uint64, blockHash libcommon.Hash) []*types.Log {
- logs := sdb.logs[hash]
+func (sdb *IntraBlockState) GetLogs(txIndex int, txnHash libcommon.Hash, blockNumber uint64, blockHash libcommon.Hash) types.Logs {
+ if txIndex >= len(sdb.logs) {
+ return nil
+ }
+ logs := sdb.logs[txIndex]
for _, l := range logs {
+ l.TxHash = txnHash
l.BlockNumber = blockNumber
l.BlockHash = blockHash
}
return logs
}
-func (sdb *IntraBlockState) Logs() []*types.Log {
- var logs []*types.Log
+// GetRawLogs - is like GetLogs, but allow postpone calculation of `txn.Hash()`.
+// Example: if you need filter logs and only then set `txn.Hash()` for filtered logs - then no reason to calc for all transactions.
+func (sdb *IntraBlockState) GetRawLogs(txIndex int) types.Logs {
+ if txIndex >= len(sdb.logs) {
+ return nil
+ }
+ return sdb.logs[txIndex]
+}
+
+func (sdb *IntraBlockState) Logs() types.Logs {
+ var logs types.Logs
for _, lgs := range sdb.logs {
logs = append(logs, lgs...)
}
@@ -240,7 +256,7 @@ func (sdb *IntraBlockState) GetNonce(addr libcommon.Address) uint64 {
}
// TxIndex returns the current transaction index set by Prepare.
-func (sdb *IntraBlockState) TxIndex() int {
+func (sdb *IntraBlockState) TxnIndex() int {
return sdb.txIndex
}
@@ -817,12 +833,20 @@ func (sdb *IntraBlockState) Print(chainRules chain.Rules) {
}
}
-// SetTxContext sets the current transaction hash and index and block hash which are
+// SetTxContext sets the current transaction index which
// used when the EVM emits new state logs. It should be invoked before
// transaction execution.
-func (sdb *IntraBlockState) SetTxContext(thash libcommon.Hash, ti int) {
- sdb.thash = thash
+func (sdb *IntraBlockState) SetTxContext(ti int, blockNum uint64) {
+ if len(sdb.logs) > 0 && ti == 0 {
+ err := fmt.Errorf("seems you forgot `ibs.Reset` or `ibs.TxIndex()`. len(sdb.logs)=%d, ti=%d", len(sdb.logs), ti)
+ panic(err)
+ }
+ if sdb.txIndex >= 0 && sdb.txIndex > ti {
+ err := fmt.Errorf("seems you forgot `ibs.Reset` or `ibs.TxIndex()`. sdb.txIndex=%d, ti=%d", sdb.txIndex, ti)
+ panic(err)
+ }
sdb.txIndex = ti
+ sdb.blockNum = blockNum
sdb.accessList = newAccessList()
}
diff --git a/core/state/intra_block_state_test.go b/core/state/intra_block_state_test.go
index ea45a5d21bd..b2c1c5321e6 100644
--- a/core/state/intra_block_state_test.go
+++ b/core/state/intra_block_state_test.go
@@ -44,7 +44,6 @@ import (
"github.com/erigontech/erigon-lib/log/v3"
stateLib "github.com/erigontech/erigon-lib/state"
- "github.com/erigontech/erigon/core/rawdb"
"github.com/erigontech/erigon/core/tracing"
"github.com/erigontech/erigon/core/types"
)
@@ -242,8 +241,7 @@ func (test *snapshotTest) run() bool {
db := memdb.NewStateDB("")
defer db.Close()
- cr := rawdb.NewCanonicalReader(rawdbv3.TxNums)
- agg, err := stateLib.NewAggregator(context.Background(), datadir.New(""), 16, db, cr, log.New())
+ agg, err := stateLib.NewAggregator(context.Background(), datadir.New(""), 16, db, log.New())
if err != nil {
test.err = err
return false
@@ -359,9 +357,9 @@ func (test *snapshotTest) checkEqual(state, checkstate *IntraBlockState) error {
return fmt.Errorf("got GetRefund() == %d, want GetRefund() == %d",
state.GetRefund(), checkstate.GetRefund())
}
- if !reflect.DeepEqual(state.GetLogs(libcommon.Hash{}, 0, libcommon.Hash{}), checkstate.GetLogs(libcommon.Hash{}, 0, libcommon.Hash{})) {
- return fmt.Errorf("got GetLogs(libcommon.Hash{}) == %v, want GetLogs(libcommon.Hash{}) == %v",
- state.GetLogs(libcommon.Hash{}, 0, libcommon.Hash{}), checkstate.GetLogs(libcommon.Hash{}, 0, libcommon.Hash{}))
+ if !reflect.DeepEqual(state.GetRawLogs(0), checkstate.GetRawLogs(0)) {
+ return fmt.Errorf("got GetRawLogs(libcommon.Hash{}) == %v, want GetRawLogs(libcommon.Hash{}) == %v",
+ state.GetRawLogs(0), checkstate.GetRawLogs(0))
}
return nil
}
diff --git a/core/state/journal.go b/core/state/journal.go
index fb5dab3f3b3..663f70baeb9 100644
--- a/core/state/journal.go
+++ b/core/state/journal.go
@@ -144,7 +144,7 @@ type (
prev uint64
}
addLogChange struct {
- txhash libcommon.Hash
+ txIndex int
}
touchChange struct {
account *libcommon.Address
@@ -288,11 +288,10 @@ func (ch refundChange) dirtied() *libcommon.Address {
}
func (ch addLogChange) revert(s *IntraBlockState) {
- logs := s.logs[ch.txhash]
- if len(logs) == 1 {
- delete(s.logs, ch.txhash)
- } else {
- s.logs[ch.txhash] = logs[:len(logs)-1]
+ txnLogs := s.logs[ch.txIndex]
+ s.logs[ch.txIndex] = txnLogs[:len(txnLogs)-1] // revert 1 log
+ if len(s.logs[ch.txIndex]) == 0 {
+ s.logs = s.logs[:len(s.logs)-1] // revert txn
}
s.logSize--
}
diff --git a/core/state/rw_v3.go b/core/state/rw_v3.go
index e1fe99d85bd..e31a3730509 100644
--- a/core/state/rw_v3.go
+++ b/core/state/rw_v3.go
@@ -23,9 +23,8 @@ import (
"sync"
"time"
- "github.com/holiman/uint256"
-
"github.com/erigontech/erigon-lib/log/v3"
+ "github.com/holiman/uint256"
"github.com/erigontech/erigon-lib/common"
"github.com/erigontech/erigon-lib/common/dbg"
diff --git a/core/state/state_object.go b/core/state/state_object.go
index b616bc0a5a4..364ae388817 100644
--- a/core/state/state_object.go
+++ b/core/state/state_object.go
@@ -166,26 +166,32 @@ func (so *stateObject) GetState(key *libcommon.Hash, out *uint256.Int) {
}
type HotFixPattern struct {
- txHash libcommon.Hash
- addr libcommon.Address
- kvList Storage
+ blockNumber uint64
+ txIndex int
+ txHash libcommon.Hash
+ addr libcommon.Address
+ kvList Storage
}
func (so *stateObject) patchGethHotFixMainnet1() {
totalPatches := []HotFixPattern{}
// patch 1: BlockNum 33851236, txIndex 89
patch1 := HotFixPattern{
- txHash: libcommon.HexToHash("0x7eba4edc7c1806d6ee1691d43513838931de5c94f9da56ec865721b402f775b0"),
- addr: libcommon.HexToAddress("0x00000000001f8b68515EfB546542397d3293CCfd"),
- kvList: make(Storage),
+ blockNumber: 33851236,
+ txIndex: 89,
+ txHash: libcommon.HexToHash("0x7eba4edc7c1806d6ee1691d43513838931de5c94f9da56ec865721b402f775b0"),
+ addr: libcommon.HexToAddress("0x00000000001f8b68515EfB546542397d3293CCfd"),
+ kvList: make(Storage),
}
// patch 2: BlockNum 33851236, txIndex 90
patch2 := HotFixPattern{
- txHash: libcommon.HexToHash("0x5217324f0711af744fe8e12d73f13fdb11805c8e29c0c095ac747b7e4563e935"),
- addr: libcommon.HexToAddress("0x00000000001f8b68515EfB546542397d3293CCfd"),
- kvList: make(Storage),
+ blockNumber: 33851236,
+ txIndex: 90,
+ txHash: libcommon.HexToHash("0x5217324f0711af744fe8e12d73f13fdb11805c8e29c0c095ac747b7e4563e935"),
+ addr: libcommon.HexToAddress("0x00000000001f8b68515EfB546542397d3293CCfd"),
+ kvList: make(Storage),
}
- if so.db.thash != patch1.txHash || so.db.thash != patch2.txHash {
+ if so.db.blockNum != patch1.blockNumber {
return
}
@@ -238,7 +244,7 @@ func (so *stateObject) patchGethHotFixMainnet1() {
// apply the patches
for _, patch := range totalPatches {
- if so.db.thash != patch.txHash {
+ if so.db.txIndex != patch.txIndex {
continue
}
if so.address != patch.addr {
@@ -254,11 +260,13 @@ func (so *stateObject) patchGethHotFixChapel1() {
totalPatches := []HotFixPattern{}
// patch 1: BlockNum 35547779, txIndex 196
patch1 := HotFixPattern{
- txHash: libcommon.HexToHash("0x7ce9a3cf77108fcc85c1e84e88e363e3335eca515dfcf2feb2011729878b13a7"),
- addr: libcommon.HexToAddress("0x89791428868131eb109e42340ad01eb8987526b2"),
- kvList: make(Storage),
+ blockNumber: 35547779,
+ txIndex: 196,
+ txHash: libcommon.HexToHash("0x7ce9a3cf77108fcc85c1e84e88e363e3335eca515dfcf2feb2011729878b13a7"),
+ addr: libcommon.HexToAddress("0x89791428868131eb109e42340ad01eb8987526b2"),
+ kvList: make(Storage),
}
- if so.db.thash != patch1.txHash {
+ if so.db.blockNum != patch1.blockNumber && so.db.txIndex != patch1.txIndex {
return
}
patch1KVs := map[string]string{
@@ -271,7 +279,7 @@ func (so *stateObject) patchGethHotFixChapel1() {
// apply the patches
for _, patch := range totalPatches {
- if so.db.thash != patch.txHash {
+ if so.db.txIndex != patch.txIndex {
continue
}
if so.address != patch.addr {
@@ -287,12 +295,14 @@ func (so *stateObject) patchGethHotFixChapel2() {
totalPatches := []HotFixPattern{}
// patch 1: BlockNum 35548081, txIndex 486
patch1 := HotFixPattern{
- txHash: libcommon.HexToHash("0xe3895eb95605d6b43ceec7876e6ff5d1c903e572bf83a08675cb684c047a695c"),
- addr: libcommon.HexToAddress("0x89791428868131eb109e42340ad01eb8987526b2"),
- kvList: make(Storage),
+ blockNumber: 35548081,
+ txIndex: 486,
+ txHash: libcommon.HexToHash("0xe3895eb95605d6b43ceec7876e6ff5d1c903e572bf83a08675cb684c047a695c"),
+ addr: libcommon.HexToAddress("0x89791428868131eb109e42340ad01eb8987526b2"),
+ kvList: make(Storage),
}
- if so.db.thash != patch1.txHash {
+ if so.db.blockNum != patch1.blockNumber && so.db.txIndex != patch1.txIndex {
return
}
@@ -306,7 +316,7 @@ func (so *stateObject) patchGethHotFixChapel2() {
// apply the patches
for _, patch := range totalPatches {
- if so.db.thash != patch.txHash {
+ if so.db.blockNum != patch.blockNumber {
continue
}
if so.address != patch.addr {
diff --git a/core/state/state_test.go b/core/state/state_test.go
index 58c10b4fd3b..e01648f74fa 100644
--- a/core/state/state_test.go
+++ b/core/state/state_test.go
@@ -39,7 +39,6 @@ import (
"github.com/erigontech/erigon-lib/state"
stateLib "github.com/erigontech/erigon-lib/state"
- "github.com/erigontech/erigon/core/rawdb"
"github.com/erigontech/erigon/core/tracing"
"github.com/erigontech/erigon/core/types/accounts"
"github.com/erigontech/erigon/crypto"
@@ -121,8 +120,7 @@ func (s *StateSuite) SetUpTest(c *checker.C) {
db := memdb.NewStateDB("")
defer db.Close()
- cr := rawdb.NewCanonicalReader(rawdbv3.TxNums)
- agg, err := stateLib.NewAggregator(context.Background(), datadir.New(""), 16, db, cr, log.New())
+ agg, err := stateLib.NewAggregator(context.Background(), datadir.New(""), 16, db, log.New())
if err != nil {
panic(err)
}
@@ -379,8 +377,7 @@ func NewTestTemporalDb(tb testing.TB) (kv.RwDB, kv.RwTx, *state.Aggregator) {
db := memdb.NewStateDB(tb.TempDir())
tb.Cleanup(db.Close)
- cr := rawdb.NewCanonicalReader(rawdbv3.TxNums)
- agg, err := state.NewAggregator(context.Background(), datadir.New(tb.TempDir()), 16, db, cr, log.New())
+ agg, err := state.NewAggregator(context.Background(), datadir.New(tb.TempDir()), 16, db, log.New())
if err != nil {
tb.Fatal(err)
}
diff --git a/core/state/txtask.go b/core/state/txtask.go
index d0d0830b0b3..eab6a11f67b 100644
--- a/core/state/txtask.go
+++ b/core/state/txtask.go
@@ -22,6 +22,8 @@ import (
"sync"
"time"
+ "github.com/erigontech/erigon-lib/kv"
+ "github.com/erigontech/erigon/core/rawdb/rawtemporaldb"
"github.com/holiman/uint256"
"github.com/erigontech/erigon-lib/chain"
@@ -84,7 +86,35 @@ type TxTask struct {
Config *chain.Config
}
-func (t *TxTask) CreateReceipt(cumulativeGasUsed uint64) *types.Receipt {
+func (t *TxTask) CreateReceipt(tx kv.Tx) {
+ if t.TxIndex < 0 || t.Final {
+ return
+ }
+
+ var cumulativeGasUsed uint64
+ var firstLogIndex uint32
+ if t.TxIndex > 0 {
+ prevR := t.BlockReceipts[t.TxIndex-1]
+ if prevR != nil {
+ cumulativeGasUsed = prevR.CumulativeGasUsed
+ firstLogIndex = prevR.FirstLogIndexWithinBlock + uint32(len(prevR.Logs))
+ } else {
+ var err error
+ cumulativeGasUsed, _, firstLogIndex, err = rawtemporaldb.ReceiptAsOf(tx.(kv.TemporalTx), t.TxNum)
+ if err != nil {
+ panic(err)
+ }
+ }
+ }
+
+ cumulativeGasUsed += t.UsedGas
+
+ r := t.createReceipt(cumulativeGasUsed)
+ r.FirstLogIndexWithinBlock = firstLogIndex
+ t.BlockReceipts[t.TxIndex] = r
+}
+
+func (t *TxTask) createReceipt(cumulativeGasUsed uint64) *types.Receipt {
receipt := &types.Receipt{
BlockNumber: t.Header.Number,
BlockHash: t.BlockHash,
@@ -95,6 +125,12 @@ func (t *TxTask) CreateReceipt(cumulativeGasUsed uint64) *types.Receipt {
TxHash: t.Tx.Hash(),
Logs: t.Logs,
}
+ blockNum := t.Header.Number.Uint64()
+ for _, l := range receipt.Logs {
+ l.TxHash = receipt.TxHash
+ l.BlockNumber = blockNum
+ l.BlockHash = receipt.BlockHash
+ }
if t.Failed {
receipt.Status = types.ReceiptStatusFailed
} else {
@@ -292,11 +328,11 @@ type ResultsQueue struct {
results *TxTaskQueue
}
-func NewResultsQueue(newTasksLimit, queueLimit int) *ResultsQueue {
+func NewResultsQueue(resultChannelLimit, heapLimit int) *ResultsQueue {
r := &ResultsQueue{
results: &TxTaskQueue{},
- limit: queueLimit,
- resultCh: make(chan *TxTask, newTasksLimit),
+ limit: heapLimit,
+ resultCh: make(chan *TxTask, resultChannelLimit),
ticker: time.NewTicker(2 * time.Second),
}
heap.Init(r.results)
@@ -313,7 +349,7 @@ func (q *ResultsQueue) Add(ctx context.Context, task *TxTask) error {
}
return nil
}
-func (q *ResultsQueue) drainNoBlock(task *TxTask) {
+func (q *ResultsQueue) drainNoBlock(ctx context.Context, task *TxTask) error {
q.Lock()
defer q.Unlock()
if task != nil {
@@ -322,16 +358,21 @@ func (q *ResultsQueue) drainNoBlock(task *TxTask) {
for {
select {
+ case <-ctx.Done():
+ return ctx.Err()
case txTask, ok := <-q.resultCh:
if !ok {
- return
+ return nil
}
- if txTask != nil {
- heap.Push(q.results, txTask)
- q.results.Len()
+ if txTask == nil {
+ continue
+ }
+ heap.Push(q.results, txTask)
+ if q.results.Len() > q.limit {
+ return nil
}
default: // we are inside mutex section, can't block here
- return
+ return nil
}
}
}
@@ -364,7 +405,9 @@ func (q *ResultsQueue) Drain(ctx context.Context) error {
if !ok {
return nil
}
- q.drainNoBlock(txTask)
+ if err := q.drainNoBlock(ctx, txTask); err != nil {
+ return err
+ }
case <-q.ticker.C:
// Corner case: workers processed all new tasks (no more q.resultCh events) when we are inside Drain() func
// it means - naive-wait for new q.resultCh events will not work here (will cause dead-lock)
@@ -378,14 +421,16 @@ func (q *ResultsQueue) Drain(ctx context.Context) error {
return nil
}
-func (q *ResultsQueue) DrainNonBlocking() { q.drainNoBlock(nil) }
+func (q *ResultsQueue) DrainNonBlocking(ctx context.Context) error { return q.drainNoBlock(ctx, nil) }
-func (q *ResultsQueue) DropResults(f func(t *TxTask)) {
+func (q *ResultsQueue) DropResults(ctx context.Context, f func(t *TxTask)) {
q.Lock()
defer q.Unlock()
Loop:
for {
select {
+ case <-ctx.Done():
+ return
case txTask, ok := <-q.resultCh:
if !ok {
break Loop
diff --git a/core/state_processor.go b/core/state_processor.go
index 0ebd3cbafe1..c3865579054 100644
--- a/core/state_processor.go
+++ b/core/state_processor.go
@@ -92,10 +92,10 @@ func applyTransaction(config *chain.Config, engine consensus.EngineReader, gp *G
receipt.ContractAddress = crypto.CreateAddress(evm.Origin, txn.GetNonce())
}
// Set the receipt logs and create a bloom for filtering
- receipt.Logs = ibs.GetLogs(txn.Hash(), blockNum, header.Hash())
+ receipt.Logs = ibs.GetLogs(ibs.TxnIndex(), txn.Hash(), blockNum, header.Hash())
receipt.Bloom = types.CreateBloom(types.Receipts{receipt})
receipt.BlockNumber = header.Number
- receipt.TransactionIndex = uint(ibs.TxIndex())
+ receipt.TransactionIndex = uint(ibs.TxnIndex())
}
return receipt, result.ReturnData, err
diff --git a/core/state_transition.go b/core/state_transition.go
index b82a18eaab7..a8d642ff02d 100644
--- a/core/state_transition.go
+++ b/core/state_transition.go
@@ -369,6 +369,9 @@ func (st *StateTransition) TransitionDb(refunds bool, gasBailout bool) (*evmtype
auths := msg.Authorizations()
verifiedAuthorities := make([]libcommon.Address, 0)
if len(auths) > 0 {
+ if contractCreation {
+ return nil, errors.New("contract creation not allowed with type4 txs")
+ }
var b [33]byte
data := bytes.NewBuffer(nil)
for i, auth := range auths {
@@ -381,6 +384,17 @@ func (st *StateTransition) TransitionDb(refunds bool, gasBailout bool) (*evmtype
}
// 2. authority recover
+
+ // TODO: these signature checks should ideally be in RecoverSigner, a new PR on 7702 should simplify this
+ // adding this to pass tests for now
+ if auth.S.Cmp(crypto.Secp256k1halfN) > 0 {
+ return nil, fmt.Errorf("invalid signature S, skipping, auth index %d", i)
+ }
+
+ if !auth.V.Eq(u256.Num0) && !auth.V.Eq(u256.Num1) {
+ return nil, fmt.Errorf("invalid v value: %d", auth.V.Uint64())
+ }
+
authorityPtr, err := auth.RecoverSigner(data, b[:])
if err != nil {
log.Debug("authority recover failed, skipping", "err", err, "auth index", i)
diff --git a/core/test/domains_restart_test.go b/core/test/domains_restart_test.go
index 788359103aa..1dae41b8675 100644
--- a/core/test/domains_restart_test.go
+++ b/core/test/domains_restart_test.go
@@ -29,8 +29,6 @@ import (
"testing"
"time"
- "github.com/erigontech/erigon/core/rawdb"
-
"github.com/holiman/uint256"
"github.com/stretchr/testify/require"
@@ -71,8 +69,7 @@ func testDbAndAggregatorv3(t *testing.T, fpath string, aggStep uint64) (kv.RwDB,
}).MustOpen()
t.Cleanup(db.Close)
- cr := rawdb.NewCanonicalReader(rawdbv3.TxNums)
- agg, err := state.NewAggregator(context.Background(), dirs, aggStep, db, cr, logger)
+ agg, err := state.NewAggregator(context.Background(), dirs, aggStep, db, logger)
require.NoError(t, err)
t.Cleanup(agg.Close)
err = agg.OpenFolder()
diff --git a/core/types/authorization.go b/core/types/authorization.go
index 0851553fbcc..a4dea12e02b 100644
--- a/core/types/authorization.go
+++ b/core/types/authorization.go
@@ -10,7 +10,9 @@ import (
libcommon "github.com/erigontech/erigon-lib/common"
"github.com/erigontech/erigon-lib/common/length"
+ libcrypto "github.com/erigontech/erigon-lib/crypto"
rlp2 "github.com/erigontech/erigon-lib/rlp"
+
"github.com/erigontech/erigon/common/u256"
"github.com/erigontech/erigon/crypto"
"github.com/erigontech/erigon/params"
@@ -75,7 +77,7 @@ func (ath *Authorization) RecoverSigner(data *bytes.Buffer, b []byte) (*libcommo
return nil, fmt.Errorf("invalid v value: %d", ath.V.Uint64())
}
- if !crypto.ValidateSignatureValues(sig[64], &ath.R, &ath.S, false) {
+ if !libcrypto.TransactionSignatureIsValid(sig[64], &ath.R, &ath.S, false /* allowPreEip2s */) {
return nil, errors.New("invalid signature")
}
diff --git a/core/types/blob_tx_wrapper.go b/core/types/blob_tx_wrapper.go
index 05e5afd6f64..e6446d27d2f 100644
--- a/core/types/blob_tx_wrapper.go
+++ b/core/types/blob_tx_wrapper.go
@@ -19,8 +19,8 @@ package types
import (
"errors"
"fmt"
+ "github.com/erigontech/erigon-lib/common/hexutility"
rlp2 "github.com/erigontech/erigon-lib/rlp"
- "github.com/ethereum/go-ethereum/common/hexutil"
"io"
"math/big"
"math/bits"
@@ -58,32 +58,32 @@ var (
// UnmarshalJSON parses a blob in hex syntax.
func (b *Blob) UnmarshalJSON(input []byte) error {
- return hexutil.UnmarshalFixedJSON(blobT, input, b[:])
+ return hexutility.UnmarshalFixedJSON(blobT, input, b[:])
}
// MarshalText returns the hex representation of b.
func (b *Blob) MarshalText() ([]byte, error) {
- return hexutil.Bytes(b[:]).MarshalText()
+ return hexutility.Bytes(b[:]).MarshalText()
}
// UnmarshalJSON parses a commitment in hex syntax.
func (c *KZGCommitment) UnmarshalJSON(input []byte) error {
- return hexutil.UnmarshalFixedJSON(commitmentT, input, c[:])
+ return hexutility.UnmarshalFixedJSON(commitmentT, input, c[:])
}
// MarshalText returns the hex representation of c.
func (c KZGCommitment) MarshalText() ([]byte, error) {
- return hexutil.Bytes(c[:]).MarshalText()
+ return hexutility.Bytes(c[:]).MarshalText()
}
// UnmarshalJSON parses a proof in hex syntax.
func (p *KZGProof) UnmarshalJSON(input []byte) error {
- return hexutil.UnmarshalFixedJSON(proofT, input, p[:])
+ return hexutility.UnmarshalFixedJSON(proofT, input, p[:])
}
// MarshalText returns the hex representation of p.
func (p KZGProof) MarshalText() ([]byte, error) {
- return hexutil.Bytes(p[:]).MarshalText()
+ return hexutility.Bytes(p[:]).MarshalText()
}
// BlobTxSidecar contains the blobs of a blob transaction.
diff --git a/core/types/block.go b/core/types/block.go
index 7d6ae4bb4c7..095c67de824 100644
--- a/core/types/block.go
+++ b/core/types/block.go
@@ -1460,14 +1460,19 @@ func (b *Block) CleanSidecars() {
b.sidecars = nil
}
-// HashCheck checks that transactions, receipts, uncles and withdrawals hashes are correct.
-func (b *Block) HashCheck() error {
+// HashCheck checks that transactions, receipts, uncles, withdrawals, and requests hashes are correct.
+func (b *Block) HashCheck(fullCheck bool) error {
if hash := DeriveSha(b.Transactions()); hash != b.TxHash() {
return fmt.Errorf("block has invalid transaction hash: have %x, exp: %x", hash, b.TxHash())
}
- if len(b.transactions) > 0 && b.ReceiptHash() == EmptyRootHash {
- return fmt.Errorf("block has empty receipt hash: %x but it includes %x transactions", b.ReceiptHash(), len(b.transactions))
+ if fullCheck {
+ // execution-spec-tests contain such scenarios where block has an invalid tx, but receiptHash is default (=EmptyRootHash)
+ // the test is to see if tx is rejected in EL, but in mock_sentry.go, we have HashCheck() before block execution.
+ // Since we want the tx execution to happen, we skip it here and bypass this guard.
+ if len(b.transactions) > 0 && b.ReceiptHash() == EmptyRootHash {
+ return fmt.Errorf("block has empty receipt hash: %x but it includes %x transactions", b.ReceiptHash(), len(b.transactions))
+ }
}
if len(b.transactions) == 0 && b.ReceiptHash() != EmptyRootHash {
diff --git a/core/types/receipt.go b/core/types/receipt.go
index ed88a6df26e..b9190c24928 100644
--- a/core/types/receipt.go
+++ b/core/types/receipt.go
@@ -71,7 +71,7 @@ type Receipt struct {
BlockNumber *big.Int `json:"blockNumber,omitempty"`
TransactionIndex uint `json:"transactionIndex"`
- FirstLogIndex uint32 `json:"-"` // field which used to store in db and re-calc
+ FirstLogIndexWithinBlock uint32 `json:"-"` // field which used to store in db and re-calc
}
type receiptMarshaling struct {
@@ -333,7 +333,7 @@ func (r *ReceiptForStorage) DecodeRLP(s *rlp.Stream) error {
return err
}
r.CumulativeGasUsed = stored.CumulativeGasUsed
- r.FirstLogIndex = stored.FirstLogIndex
+ r.FirstLogIndexWithinBlock = stored.FirstLogIndex
//r.Logs = make([]*Log, len(stored.Logs))
//for i, log := range stored.Logs {
@@ -438,21 +438,8 @@ func (r Receipts) DeriveFields(hash libcommon.Hash, number uint64, txs Transacti
// DeriveFields fills the receipts with their computed fields based on consensus
// data and contextual infos like containing block and transactions.
-func (rl Receipts) DeriveFieldsV3ForSingleReceipt(i int, blockHash libcommon.Hash, blockNum uint64, txn Transaction) (*Receipt, error) {
- r := rl[i]
- var prevReceipt *Receipt
- if i > 0 {
- prevReceipt = rl[i-1]
- }
- err := r.DeriveFieldsV3ForSingleReceipt(i, blockHash, blockNum, txn, prevReceipt)
- if err != nil {
- return nil, err
- }
- return r, nil
-}
-
-func (r *Receipt) DeriveFieldsV3ForSingleReceipt(txnIdx int, blockHash libcommon.Hash, blockNum uint64, txn Transaction, prevReceipt *Receipt) error {
- logIndex := r.FirstLogIndex // logIdx is unique within the block and starts from 0
+func (r *Receipt) DeriveFieldsV3ForSingleReceipt(txnIdx int, blockHash libcommon.Hash, blockNum uint64, txn Transaction, prevCumulativeGasUsed uint64) error {
+ logIndex := r.FirstLogIndexWithinBlock // logIdx is unique within the block and starts from 0
sender, ok := txn.cachedSender()
if !ok {
@@ -480,7 +467,7 @@ func (r *Receipt) DeriveFieldsV3ForSingleReceipt(txnIdx int, blockHash libcommon
if txnIdx == 0 {
r.GasUsed = r.CumulativeGasUsed
} else {
- r.GasUsed = r.CumulativeGasUsed - prevReceipt.CumulativeGasUsed
+ r.GasUsed = r.CumulativeGasUsed - prevCumulativeGasUsed
}
// The derived log fields can simply be set from the block and transaction
diff --git a/core/types/receipt_test.go b/core/types/receipt_test.go
index c9da6d1cb12..026c90c8ee4 100644
--- a/core/types/receipt_test.go
+++ b/core/types/receipt_test.go
@@ -104,7 +104,7 @@ func TestLegacyReceiptDecoding(t *testing.T) {
if dec.CumulativeGasUsed != receipt.CumulativeGasUsed {
t.Fatalf("Receipt CumulativeGasUsed mismatch, want %v, have %v", receipt.CumulativeGasUsed, dec.CumulativeGasUsed)
}
- assert.Equal(t, uint32(receipt.Logs[0].Index), dec.FirstLogIndex)
+ assert.Equal(t, uint32(receipt.Logs[0].Index), dec.FirstLogIndexWithinBlock)
//if len(dec.Logs) != len(receipt.Logs) {
// t.Fatalf("Receipt log number mismatch, want %v, have %v", len(receipt.Logs), len(dec.Logs))
//}
@@ -178,10 +178,10 @@ func TestDeriveFields(t *testing.T) {
{Address: libcommon.BytesToAddress([]byte{0x11})},
{Address: libcommon.BytesToAddress([]byte{0x01, 0x11})},
},
- TxHash: txs[0].Hash(),
- ContractAddress: libcommon.BytesToAddress([]byte{0x01, 0x11, 0x11}),
- GasUsed: 1,
- FirstLogIndex: 0,
+ TxHash: txs[0].Hash(),
+ ContractAddress: libcommon.BytesToAddress([]byte{0x01, 0x11, 0x11}),
+ GasUsed: 1,
+ FirstLogIndexWithinBlock: 0,
},
&Receipt{
PostState: libcommon.Hash{2}.Bytes(),
@@ -190,10 +190,10 @@ func TestDeriveFields(t *testing.T) {
{Address: libcommon.BytesToAddress([]byte{0x22})},
{Address: libcommon.BytesToAddress([]byte{0x02, 0x22})},
},
- TxHash: txs[1].Hash(),
- ContractAddress: libcommon.BytesToAddress([]byte{0x02, 0x22, 0x22}),
- GasUsed: 2,
- FirstLogIndex: 2,
+ TxHash: txs[1].Hash(),
+ ContractAddress: libcommon.BytesToAddress([]byte{0x02, 0x22, 0x22}),
+ GasUsed: 2,
+ FirstLogIndexWithinBlock: 2,
},
&Receipt{
Type: AccessListTxType,
@@ -203,10 +203,10 @@ func TestDeriveFields(t *testing.T) {
{Address: libcommon.BytesToAddress([]byte{0x33})},
{Address: libcommon.BytesToAddress([]byte{0x03, 0x33})},
},
- TxHash: txs[2].Hash(),
- ContractAddress: libcommon.BytesToAddress([]byte{0x03, 0x33, 0x33}),
- GasUsed: 3,
- FirstLogIndex: 4,
+ TxHash: txs[2].Hash(),
+ ContractAddress: libcommon.BytesToAddress([]byte{0x03, 0x33, 0x33}),
+ GasUsed: 3,
+ FirstLogIndexWithinBlock: 4,
},
}
// Clear all the computed fields and re-derive them
@@ -273,68 +273,68 @@ func TestDeriveFields(t *testing.T) {
}
})
- t.Run("DeriveV3", func(t *testing.T) {
- clearComputedFieldsOnReceipts(t, receipts)
- // Iterate over all the computed fields and check that they're correct
- signer := MakeSigner(params.TestChainConfig, number.Uint64(), 0)
-
- logIndex := uint(0)
- for i := range receipts {
- txs[i].SetSender(libcommon.BytesToAddress([]byte{0x0}))
- r, err := receipts.DeriveFieldsV3ForSingleReceipt(i, hash, number.Uint64(), txs[i])
- if err != nil {
- panic(err)
- }
-
- if r.Type != txs[i].Type() {
- t.Errorf("receipts[%d].Type = %d, want %d", i, r.Type, txs[i].Type())
- }
- if r.TxHash != txs[i].Hash() {
- t.Errorf("receipts[%d].TxHash = %s, want %s", i, r.TxHash.String(), txs[i].Hash().String())
- }
- if r.BlockHash != hash {
- t.Errorf("receipts[%d].BlockHash = %s, want %s", i, r.BlockHash.String(), hash.String())
- }
- if r.BlockNumber.Cmp(number) != 0 {
- t.Errorf("receipts[%c].BlockNumber = %s, want %s", i, r.BlockNumber.String(), number.String())
- }
- if r.TransactionIndex != uint(i) {
- t.Errorf("receipts[%d].TransactionIndex = %d, want %d", i, r.TransactionIndex, i)
- }
- if r.GasUsed != txs[i].GetGas() {
- t.Errorf("receipts[%d].GasUsed = %d, want %d", i, r.GasUsed, txs[i].GetGas())
- }
- if txs[i].GetTo() != nil && r.ContractAddress != (libcommon.Address{}) {
- t.Errorf("receipts[%d].ContractAddress = %s, want %s", i, r.ContractAddress.String(), (libcommon.Address{}).String())
- }
- from, _ := txs[i].Sender(*signer)
- contractAddress := crypto.CreateAddress(from, txs[i].GetNonce())
- if txs[i].GetTo() == nil && r.ContractAddress != contractAddress {
- t.Errorf("receipts[%d].ContractAddress = %s, want %s", i, r.ContractAddress.String(), contractAddress.String())
- }
- for j := range r.Logs {
- if r.Logs[j].BlockNumber != number.Uint64() {
- t.Errorf("receipts[%d].Logs[%d].BlockNumber = %d, want %d", i, j, r.Logs[j].BlockNumber, number.Uint64())
- }
- if r.Logs[j].BlockHash != hash {
- t.Errorf("receipts[%d].Logs[%d].BlockHash = %s, want %s", i, j, r.Logs[j].BlockHash.String(), hash.String())
- }
- if r.Logs[j].TxHash != txs[i].Hash() {
- t.Errorf("receipts[%d].Logs[%d].TxHash = %s, want %s", i, j, r.Logs[j].TxHash.String(), txs[i].Hash().String())
- }
- if r.Logs[j].TxHash != txs[i].Hash() {
- t.Errorf("receipts[%d].Logs[%d].TxHash = %s, want %s", i, j, r.Logs[j].TxHash.String(), txs[i].Hash().String())
- }
- if r.Logs[j].TxIndex != uint(i) {
- t.Errorf("receipts[%d].Logs[%d].TransactionIndex = %d, want %d", i, j, r.Logs[j].TxIndex, i)
- }
- if r.Logs[j].Index != logIndex {
- t.Errorf("receipts[%d].Logs[%d].Index = %d, want %d", i, j, r.Logs[j].Index, logIndex)
- }
- logIndex++
- }
- }
- })
+ //t.Run("DeriveV3", func(t *testing.T) {
+ // clearComputedFieldsOnReceipts(t, receipts)
+ // // Iterate over all the computed fields and check that they're correct
+ // signer := MakeSigner(params.TestChainConfig, number.Uint64(), 0)
+ //
+ // logIndex := uint(0)
+ // for i := range receipts {
+ // txs[i].SetSender(libcommon.BytesToAddress([]byte{0x0}))
+ // r, err := receipts.DeriveFieldsV3ForSingleReceipt(i, hash, number.Uint64(), txs[i])
+ // if err != nil {
+ // panic(err)
+ // }
+ //
+ // if r.Type != txs[i].Type() {
+ // t.Errorf("receipts[%d].Type = %d, want %d", i, r.Type, txs[i].Type())
+ // }
+ // if r.TxHash != txs[i].Hash() {
+ // t.Errorf("receipts[%d].TxHash = %s, want %s", i, r.TxHash.String(), txs[i].Hash().String())
+ // }
+ // if r.BlockHash != hash {
+ // t.Errorf("receipts[%d].BlockHash = %s, want %s", i, r.BlockHash.String(), hash.String())
+ // }
+ // if r.BlockNumber.Cmp(number) != 0 {
+ // t.Errorf("receipts[%c].BlockNumber = %s, want %s", i, r.BlockNumber.String(), number.String())
+ // }
+ // if r.TransactionIndex != uint(i) {
+ // t.Errorf("receipts[%d].TransactionIndex = %d, want %d", i, r.TransactionIndex, i)
+ // }
+ // if r.GasUsed != txs[i].GetGas() {
+ // t.Errorf("receipts[%d].GasUsed = %d, want %d", i, r.GasUsed, txs[i].GetGas())
+ // }
+ // if txs[i].GetTo() != nil && r.ContractAddress != (libcommon.Address{}) {
+ // t.Errorf("receipts[%d].ContractAddress = %s, want %s", i, r.ContractAddress.String(), (libcommon.Address{}).String())
+ // }
+ // from, _ := txs[i].Sender(*signer)
+ // contractAddress := crypto.CreateAddress(from, txs[i].GetNonce())
+ // if txs[i].GetTo() == nil && r.ContractAddress != contractAddress {
+ // t.Errorf("receipts[%d].ContractAddress = %s, want %s", i, r.ContractAddress.String(), contractAddress.String())
+ // }
+ // for j := range r.Logs {
+ // if r.Logs[j].BlockNumber != number.Uint64() {
+ // t.Errorf("receipts[%d].Logs[%d].BlockNumber = %d, want %d", i, j, r.Logs[j].BlockNumber, number.Uint64())
+ // }
+ // if r.Logs[j].BlockHash != hash {
+ // t.Errorf("receipts[%d].Logs[%d].BlockHash = %s, want %s", i, j, r.Logs[j].BlockHash.String(), hash.String())
+ // }
+ // if r.Logs[j].TxHash != txs[i].Hash() {
+ // t.Errorf("receipts[%d].Logs[%d].TxHash = %s, want %s", i, j, r.Logs[j].TxHash.String(), txs[i].Hash().String())
+ // }
+ // if r.Logs[j].TxHash != txs[i].Hash() {
+ // t.Errorf("receipts[%d].Logs[%d].TxHash = %s, want %s", i, j, r.Logs[j].TxHash.String(), txs[i].Hash().String())
+ // }
+ // if r.Logs[j].TxIndex != uint(i) {
+ // t.Errorf("receipts[%d].Logs[%d].TransactionIndex = %d, want %d", i, j, r.Logs[j].TxIndex, i)
+ // }
+ // if r.Logs[j].Index != logIndex {
+ // t.Errorf("receipts[%d].Logs[%d].Index = %d, want %d", i, j, r.Logs[j].Index, logIndex)
+ // }
+ // logIndex++
+ // }
+ // }
+ //})
}
diff --git a/core/types/set_code_tx.go b/core/types/set_code_tx.go
index 80a9de81233..1b93336c204 100644
--- a/core/types/set_code_tx.go
+++ b/core/types/set_code_tx.go
@@ -123,7 +123,11 @@ func (tx *SetCodeTransaction) AsMessage(s Signer, baseFee *big.Int, rules *chain
msg.gasPrice.Set(tx.FeeCap)
}
+ if len(tx.Authorizations) == 0 {
+ return msg, errors.New("SetCodeTransaction without authorizations is invalid")
+ }
msg.authorizations = tx.Authorizations
+
var err error
msg.from, err = tx.Sender(s)
return msg, err
@@ -225,13 +229,11 @@ func (tx *SetCodeTransaction) DecodeRLP(s *rlp.Stream) error {
if b, err = s.Bytes(); err != nil {
return err
}
- if len(b) > 0 && len(b) != 20 {
+ if len(b) != 20 {
return fmt.Errorf("wrong size for To: %d", len(b))
}
- if len(b) > 0 {
- tx.To = &libcommon.Address{}
- copy((*tx.To)[:], b)
- }
+ tx.To = &libcommon.Address{}
+ copy((*tx.To)[:], b)
if b, err = s.Uint256Bytes(); err != nil {
return err
}
diff --git a/core/types/transaction.go b/core/types/transaction.go
index 5e0a44b290c..604bb733468 100644
--- a/core/types/transaction.go
+++ b/core/types/transaction.go
@@ -30,15 +30,14 @@ import (
"github.com/holiman/uint256"
"github.com/protolambda/ztyp/codec"
- "github.com/erigontech/erigon-lib/log/v3"
-
"github.com/erigontech/erigon-lib/chain"
libcommon "github.com/erigontech/erigon-lib/common"
"github.com/erigontech/erigon-lib/common/fixedgas"
+ libcrypto "github.com/erigontech/erigon-lib/crypto"
+ "github.com/erigontech/erigon-lib/log/v3"
types2 "github.com/erigontech/erigon-lib/types"
"github.com/erigontech/erigon/common/math"
- "github.com/erigontech/erigon/crypto"
"github.com/erigontech/erigon/rlp"
)
@@ -284,7 +283,7 @@ func sanityCheckSignature(v *uint256.Int, r *uint256.Int, s *uint256.Int, maybeP
// must already be equal to the recovery id.
plainV = byte(v.Uint64())
}
- if !crypto.ValidateSignatureValues(plainV, r, s, false) {
+ if !libcrypto.TransactionSignatureIsValid(plainV, r, s, true /* allowPreEip2s */) {
return ErrInvalidSig
}
diff --git a/core/types/transaction_signing.go b/core/types/transaction_signing.go
index 8cc8e225cd2..b04364add27 100644
--- a/core/types/transaction_signing.go
+++ b/core/types/transaction_signing.go
@@ -31,6 +31,7 @@ import (
"github.com/erigontech/erigon-lib/chain"
libcommon "github.com/erigontech/erigon-lib/common"
+ libcrypto "github.com/erigontech/erigon-lib/crypto"
"github.com/erigontech/erigon/common/u256"
"github.com/erigontech/erigon/crypto"
@@ -364,7 +365,7 @@ func recoverPlain(context *secp256k1.Context, sighash libcommon.Hash, R, S, Vb *
return libcommon.Address{}, ErrInvalidSig
}
V := byte(Vb.Uint64() - 27)
- if !crypto.ValidateSignatureValues(V, R, S, homestead) {
+ if !libcrypto.TransactionSignatureIsValid(V, R, S, !homestead) {
return libcommon.Address{}, ErrInvalidSig
}
// encode the signature in uncompressed format
diff --git a/core/vm/analysis_test.go b/core/vm/analysis_test.go
index d6441d6c725..f4b3162ae82 100644
--- a/core/vm/analysis_test.go
+++ b/core/vm/analysis_test.go
@@ -94,7 +94,7 @@ func BenchmarkJumpDest(b *testing.B) {
contractRef := dummyContractRef{}
- c := NewJumpDestCache(false)
+ c := NewJumpDestCache()
b.ResetTimer()
for n := 0; n < b.N; n++ {
contract := NewContract(contractRef, libcommon.Address{}, nil, 0, false /* skipAnalysis */, c)
diff --git a/core/vm/contract.go b/core/vm/contract.go
index 6c7547b15fe..1acbd804ce2 100644
--- a/core/vm/contract.go
+++ b/core/vm/contract.go
@@ -82,12 +82,12 @@ var (
jumpDestCacheTrace = dbg.EnvBool("JD_LRU_TRACE", false)
)
-func NewJumpDestCache(trace bool) *JumpDestCache {
+func NewJumpDestCache() *JumpDestCache {
c, err := simplelru.NewLRU[libcommon.Hash, bitvec](jumpDestCacheLimit, nil)
if err != nil {
panic(err)
}
- return &JumpDestCache{LRU: c, trace: trace || jumpDestCacheTrace}
+ return &JumpDestCache{LRU: c, trace: jumpDestCacheTrace}
}
func (c *JumpDestCache) LogStats() {
diff --git a/core/vm/contracts.go b/core/vm/contracts.go
index 9f20d092b3b..a36f4d958d1 100644
--- a/core/vm/contracts.go
+++ b/core/vm/contracts.go
@@ -41,6 +41,7 @@ import (
"github.com/erigontech/erigon-lib/chain"
libcommon "github.com/erigontech/erigon-lib/common"
+ libcrypto "github.com/erigontech/erigon-lib/crypto"
"github.com/erigontech/erigon-lib/crypto/blake2b"
libkzg "github.com/erigontech/erigon-lib/crypto/kzg"
@@ -491,7 +492,7 @@ func (c *ecrecover) Run(input []byte) ([]byte, error) {
v := input[63] - 27
// tighter sig s values input homestead only apply to txn sigs
- if !allZero(input[32:63]) || !crypto.ValidateSignatureValues(v, r, s, false) {
+ if !allZero(input[32:63]) || !libcrypto.TransactionSignatureIsValid(v, r, s, true /* allowPreEip2s */) {
return nil, nil
}
// We must make sure not to modify the 'input', so placing the 'v' along with
diff --git a/core/vm/errors.go b/core/vm/errors.go
index 1706e611447..ce8ff51f1eb 100644
--- a/core/vm/errors.go
+++ b/core/vm/errors.go
@@ -36,6 +36,7 @@ var (
ErrContractAddressCollision = errors.New("contract address collision")
ErrExecutionReverted = errors.New("execution reverted")
ErrMaxCodeSizeExceeded = errors.New("max code size exceeded")
+ ErrMaxInitCodeSizeExceeded = errors.New("max initcode size exceeded")
ErrInvalidJump = errors.New("invalid jump destination")
ErrWriteProtection = errors.New("write protection")
ErrReturnDataOutOfBounds = errors.New("return data out of bounds")
diff --git a/core/vm/evm.go b/core/vm/evm.go
index 7d6c7e8303b..bb38d84e256 100644
--- a/core/vm/evm.go
+++ b/core/vm/evm.go
@@ -140,7 +140,7 @@ func NewEVM(blockCtx evmtypes.BlockContext, txCtx evmtypes.TxContext, state evmt
config: vmConfig,
chainConfig: chainConfig,
chainRules: chainConfig.Rules(blockCtx.BlockNumber, blockCtx.Time),
- JumpDestCache: NewJumpDestCache(false),
+ JumpDestCache: NewJumpDestCache(),
}
evm.interpreter = NewEVMInterpreter(evm, vmConfig)
diff --git a/core/vm/evm_test.go b/core/vm/evm_test.go
index b47791d4271..5436eb54eed 100644
--- a/core/vm/evm_test.go
+++ b/core/vm/evm_test.go
@@ -29,7 +29,7 @@ import (
func TestInterpreterReadonly(t *testing.T) {
t.Parallel()
- c := NewJumpDestCache(false)
+ c := NewJumpDestCache()
rapid.Check(t, func(t *rapid.T) {
env := NewEVM(evmtypes.BlockContext{}, evmtypes.TxContext{}, &dummyStatedb{}, params.TestChainConfig, Config{})
@@ -137,7 +137,7 @@ func TestInterpreterReadonly(t *testing.T) {
func TestReadonlyBasicCases(t *testing.T) {
t.Parallel()
- c := NewJumpDestCache(false)
+ c := NewJumpDestCache()
cases := []struct {
testName string
@@ -405,7 +405,7 @@ func newTestSequential(env *EVM, currentIdx *int, readonlies []bool, isEVMCalled
func (st *testSequential) Run(_ *Contract, _ []byte, _ bool) ([]byte, error) {
*st.currentIdx++
- c := NewJumpDestCache(false)
+ c := NewJumpDestCache()
nextContract := NewContract(
&dummyContractRef{},
libcommon.Address{},
diff --git a/core/vm/gas_table.go b/core/vm/gas_table.go
index c8e4d2d0cfe..ef38856ccfc 100644
--- a/core/vm/gas_table.go
+++ b/core/vm/gas_table.go
@@ -21,6 +21,7 @@ package vm
import (
"errors"
+ "fmt"
"github.com/holiman/uint256"
@@ -297,11 +298,11 @@ func gasCreate2(_ *EVM, contract *Contract, stack *stack.Stack, mem *Memory, mem
if err != nil {
return 0, err
}
- len, overflow := stack.Back(2).Uint64WithOverflow()
+ size, overflow := stack.Back(2).Uint64WithOverflow()
if overflow {
return 0, ErrGasUintOverflow
}
- numWords := ToWordSize(len)
+ numWords := ToWordSize(size)
wordGas, overflow := math.SafeMul(numWords, params.Keccak256WordGas)
if overflow {
return 0, ErrGasUintOverflow
@@ -318,11 +319,14 @@ func gasCreateEip3860(_ *EVM, contract *Contract, stack *stack.Stack, mem *Memor
if err != nil {
return 0, err
}
- len, overflow := stack.Back(2).Uint64WithOverflow()
- if overflow || len > params.MaxInitCodeSize {
+ size, overflow := stack.Back(2).Uint64WithOverflow()
+ if overflow {
return 0, ErrGasUintOverflow
}
- numWords := ToWordSize(len)
+ if size > params.MaxInitCodeSize {
+ return 0, fmt.Errorf("%w: size %d", ErrMaxInitCodeSizeExceeded, size)
+ }
+ numWords := ToWordSize(size)
// Since size <= params.MaxInitCodeSize, this multiplication cannot overflow
wordGas := params.InitCodeWordGas * numWords
gas, overflow = math.SafeAdd(gas, wordGas)
@@ -337,11 +341,14 @@ func gasCreate2Eip3860(_ *EVM, contract *Contract, stack *stack.Stack, mem *Memo
if err != nil {
return 0, err
}
- len, overflow := stack.Back(2).Uint64WithOverflow()
- if overflow || len > params.MaxInitCodeSize {
+ size, overflow := stack.Back(2).Uint64WithOverflow()
+ if overflow {
return 0, ErrGasUintOverflow
}
- numWords := ToWordSize(len)
+ if size > params.MaxInitCodeSize {
+ return 0, fmt.Errorf("%w: size %d", ErrMaxInitCodeSizeExceeded, size)
+ }
+ numWords := ToWordSize(size)
// Since size <= params.MaxInitCodeSize, this multiplication cannot overflow
wordGas := (params.InitCodeWordGas + params.Keccak256WordGas) * numWords
gas, overflow = math.SafeAdd(gas, wordGas)
diff --git a/core/vm/gas_table_test.go b/core/vm/gas_table_test.go
index 04b0c2cbd91..1d74f5945a2 100644
--- a/core/vm/gas_table_test.go
+++ b/core/vm/gas_table_test.go
@@ -34,14 +34,11 @@ import (
"github.com/erigontech/erigon-lib/common/hexutil"
"github.com/erigontech/erigon-lib/kv"
"github.com/erigontech/erigon-lib/kv/memdb"
- "github.com/erigontech/erigon-lib/kv/rawdbv3"
"github.com/erigontech/erigon-lib/kv/temporal"
"github.com/erigontech/erigon-lib/kv/temporal/temporaltest"
"github.com/erigontech/erigon-lib/log/v3"
state3 "github.com/erigontech/erigon-lib/state"
"github.com/erigontech/erigon-lib/wrap"
- "github.com/erigontech/erigon/core/rawdb"
-
"github.com/erigontech/erigon/core/state"
"github.com/erigontech/erigon/core/vm/evmtypes"
"github.com/erigontech/erigon/params"
@@ -103,8 +100,7 @@ func testTemporalDB(t *testing.T) *temporal.DB {
t.Cleanup(db.Close)
- cr := rawdb.NewCanonicalReader(rawdbv3.TxNums)
- agg, err := state3.NewAggregator(context.Background(), datadir.New(t.TempDir()), 16, db, cr, log.New())
+ agg, err := state3.NewAggregator(context.Background(), datadir.New(t.TempDir()), 16, db, log.New())
require.NoError(t, err)
t.Cleanup(agg.Close)
diff --git a/core/vm/instructions_test.go b/core/vm/instructions_test.go
index 8136b51580b..f374a330070 100644
--- a/core/vm/instructions_test.go
+++ b/core/vm/instructions_test.go
@@ -594,7 +594,7 @@ func TestOpTstore(t *testing.T) {
caller = libcommon.Address{}
to = libcommon.Address{1}
contractRef = contractRef{caller}
- contract = NewContract(contractRef, to, u256.Num0, 0, false, NewJumpDestCache(false))
+ contract = NewContract(contractRef, to, u256.Num0, 0, false, NewJumpDestCache())
scopeContext = ScopeContext{mem, stack, contract}
value = libcommon.Hex2Bytes("abcdef00000000000000abba000000000deaf000000c0de00100000000133700")
)
diff --git a/core/vm/interpreter.go b/core/vm/interpreter.go
index a6983ef9d2d..72582ae6a80 100644
--- a/core/vm/interpreter.go
+++ b/core/vm/interpreter.go
@@ -20,6 +20,7 @@
package vm
import (
+ "fmt"
"hash"
"sync"
@@ -177,8 +178,6 @@ func NewEVMInterpreter(evm *EVM, cfg Config) *EVMInterpreter {
}
}
-func (in *EVMInterpreter) decrementDepth() { in.depth-- }
-
// Run loops and evaluates the contract's code with the given input data and returns
// the return byte-slice and an error if one occurred.
//
@@ -298,7 +297,10 @@ func (in *EVMInterpreter) Run(contract *Contract, input []byte, readOnly bool) (
var dynamicCost uint64
dynamicCost, err = operation.dynamicGas(in.evm, contract, locStack, mem, memorySize)
cost += dynamicCost // for tracing
- if err != nil || !contract.UseGas(dynamicCost, tracing.GasChangeIgnored) {
+ if err != nil {
+ return nil, fmt.Errorf("%w: %v", ErrOutOfGas, err)
+ }
+ if !contract.UseGas(dynamicCost, tracing.GasChangeIgnored) {
return nil, ErrOutOfGas
}
// Do tracing before memory expansion
@@ -335,9 +337,6 @@ func (in *EVMInterpreter) Depth() int {
return in.depth
}
-func (vm *VM) disableReadonly() { vm.readOnly = false }
-func (vm *VM) noop() {}
-
func (vm *VM) setReadonly(outerReadonly bool) func() {
if outerReadonly && !vm.readOnly {
vm.readOnly = true
diff --git a/core/vm/runtime/runtime.go b/core/vm/runtime/runtime.go
index e22c4a226f1..db606fd07b7 100644
--- a/core/vm/runtime/runtime.go
+++ b/core/vm/runtime/runtime.go
@@ -37,10 +37,8 @@ import (
"github.com/erigontech/erigon-lib/config3"
"github.com/erigontech/erigon-lib/kv"
"github.com/erigontech/erigon-lib/kv/memdb"
- "github.com/erigontech/erigon-lib/kv/rawdbv3"
"github.com/erigontech/erigon-lib/kv/temporal"
state3 "github.com/erigontech/erigon-lib/state"
- "github.com/erigontech/erigon/core/rawdb"
"github.com/erigontech/erigon/core/state"
"github.com/erigontech/erigon/core/vm"
"github.com/erigontech/erigon/crypto"
@@ -134,8 +132,7 @@ func Execute(code, input []byte, cfg *Config, tempdir string) ([]byte, *state.In
if !externalState {
db := memdb.NewStateDB(tempdir)
defer db.Close()
- cr := rawdb.NewCanonicalReader(rawdbv3.TxNums)
- agg, err := state3.NewAggregator(context.Background(), datadir.New(tempdir), config3.HistoryV3AggregationStep, db, cr, log.New())
+ agg, err := state3.NewAggregator(context.Background(), datadir.New(tempdir), config3.HistoryV3AggregationStep, db, log.New())
if err != nil {
return nil, nil, err
}
@@ -197,8 +194,7 @@ func Create(input []byte, cfg *Config, blockNr uint64) ([]byte, libcommon.Addres
db := memdb.NewStateDB(tmp)
defer db.Close()
- cr := rawdb.NewCanonicalReader(rawdbv3.TxNums)
- agg, err := state3.NewAggregator(context.Background(), datadir.New(tmp), config3.HistoryV3AggregationStep, db, cr, log.New())
+ agg, err := state3.NewAggregator(context.Background(), datadir.New(tmp), config3.HistoryV3AggregationStep, db, log.New())
if err != nil {
return nil, [20]byte{}, 0, err
}
diff --git a/core/vm/runtime/runtime_test.go b/core/vm/runtime/runtime_test.go
index 9673b8df5c5..874b6cbdf91 100644
--- a/core/vm/runtime/runtime_test.go
+++ b/core/vm/runtime/runtime_test.go
@@ -45,7 +45,6 @@ import (
"github.com/erigontech/erigon/consensus"
"github.com/erigontech/erigon/core"
"github.com/erigontech/erigon/core/asm"
- "github.com/erigontech/erigon/core/rawdb"
"github.com/erigontech/erigon/core/state"
"github.com/erigontech/erigon/core/types"
"github.com/erigontech/erigon/core/vm"
@@ -58,8 +57,7 @@ func NewTestTemporalDb(tb testing.TB) (kv.RwDB, kv.RwTx, *stateLib.Aggregator) {
db := memdb.NewStateDB(tb.TempDir())
tb.Cleanup(db.Close)
- cr := rawdb.NewCanonicalReader(rawdbv3.TxNums)
- agg, err := stateLib.NewAggregator(context.Background(), datadir.New(tb.TempDir()), 16, db, cr, log.New())
+ agg, err := stateLib.NewAggregator(context.Background(), datadir.New(tb.TempDir()), 16, db, log.New())
if err != nil {
tb.Fatal(err)
}
@@ -180,8 +178,7 @@ func testTemporalDB(t testing.TB) *temporal.DB {
t.Cleanup(db.Close)
- cr := rawdb.NewCanonicalReader(rawdbv3.TxNums)
- agg, err := stateLib.NewAggregator(context.Background(), datadir.New(t.TempDir()), 16, db, cr, log.New())
+ agg, err := stateLib.NewAggregator(context.Background(), datadir.New(t.TempDir()), 16, db, log.New())
require.NoError(t, err)
t.Cleanup(agg.Close)
diff --git a/crypto/crypto.go b/crypto/crypto.go
index 01cd6c06ae4..ed42a8ed52f 100644
--- a/crypto/crypto.go
+++ b/crypto/crypto.go
@@ -56,7 +56,7 @@ const DigestLength = 32
var (
secp256k1N = new(uint256.Int).SetBytes(hexutil.MustDecode("0xfffffffffffffffffffffffffffffffebaaedce6af48a03bbfd25e8cd0364141"))
secp256k1NBig = secp256k1N.ToBig()
- secp256k1halfN = new(uint256.Int).Div(secp256k1N, u256.Num2)
+ Secp256k1halfN = new(uint256.Int).Div(secp256k1N, u256.Num2)
)
var errInvalidPubkey = errors.New("invalid secp256k1 public key")
@@ -301,21 +301,6 @@ func GenerateKey() (*ecdsa.PrivateKey, error) {
return ecdsa.GenerateKey(S256(), rand.Reader)
}
-// ValidateSignatureValues verifies whether the signature values are valid with
-// the given chain rules. The v value is assumed to be either 0 or 1.
-func ValidateSignatureValues(v byte, r, s *uint256.Int, homestead bool) bool {
- if r.IsZero() || s.IsZero() {
- return false
- }
- // reject upper range of s values (ECDSA malleability)
- // see discussion in secp256k1/libsecp256k1/include/secp256k1.h
- if homestead && s.Gt(secp256k1halfN) {
- return false
- }
- // Frontier: allow s to be in full N range
- return r.Lt(secp256k1N) && s.Lt(secp256k1N) && (v == 0 || v == 1)
-}
-
// DESCRIBED: docs/programmers_guide/guide.md#address---identifier-of-an-account
func PubkeyToAddress(p ecdsa.PublicKey) libcommon.Address {
pubBytes := MarshalPubkey(&p)
diff --git a/crypto/crypto_test.go b/crypto/crypto_test.go
index 0c5dd29aaa6..3544797cf54 100644
--- a/crypto/crypto_test.go
+++ b/crypto/crypto_test.go
@@ -27,14 +27,12 @@ import (
"reflect"
"testing"
- "github.com/holiman/uint256"
"golang.org/x/crypto/sha3"
libcommon "github.com/erigontech/erigon-lib/common"
"github.com/erigontech/erigon-lib/common/hexutil"
"github.com/erigontech/erigon/common"
- "github.com/erigontech/erigon/common/u256"
)
var testAddrHex = "970e8128ab834e8eac17ab8e3812f010678cf791"
@@ -279,52 +277,6 @@ func TestSaveECDSA(t *testing.T) {
}
}
-func TestValidateSignatureValues(t *testing.T) {
- check := func(expected bool, v byte, r, s *uint256.Int) {
- if ValidateSignatureValues(v, r, s, false) != expected {
- t.Errorf("mismatch for v: %d r: %d s: %d want: %v", v, r, s, expected)
- }
- }
- minusOne := uint256.NewInt(0).SetAllOne()
- one := u256.Num1
- zero := u256.Num0
- secp256k1nMinus1 := new(uint256.Int).Sub(secp256k1N, u256.Num1)
-
- // correct v,r,s
- check(true, 0, one, one)
- check(true, 1, one, one)
- // incorrect v, correct r,s,
- check(false, 2, one, one)
- check(false, 3, one, one)
-
- // incorrect v, combinations of incorrect/correct r,s at lower limit
- check(false, 2, zero, zero)
- check(false, 2, zero, one)
- check(false, 2, one, zero)
- check(false, 2, one, one)
-
- // correct v for any combination of incorrect r,s
- check(false, 0, zero, zero)
- check(false, 0, zero, one)
- check(false, 0, one, zero)
-
- check(false, 1, zero, zero)
- check(false, 1, zero, one)
- check(false, 1, one, zero)
-
- // correct sig with max r,s
- check(true, 0, secp256k1nMinus1, secp256k1nMinus1)
- // correct v, combinations of incorrect r,s at upper limit
- check(false, 0, secp256k1N, secp256k1nMinus1)
- check(false, 0, secp256k1nMinus1, secp256k1N)
- check(false, 0, secp256k1N, secp256k1N)
-
- // current callers ensures r,s cannot be negative, but let's test for that too
- // as crypto package could be used stand-alone
- check(false, 0, minusOne, one)
- check(false, 0, one, minusOne)
-}
-
func checkhash(t *testing.T, name string, f func([]byte) []byte, msg, exp []byte) {
sum := f(msg)
if !bytes.Equal(exp, sum) {
diff --git a/diagnostics/profile.go b/diagnostics/profile.go
new file mode 100644
index 00000000000..4a9a16e3bfd
--- /dev/null
+++ b/diagnostics/profile.go
@@ -0,0 +1,53 @@
+// Copyright 2024 The Erigon Authors
+// This file is part of Erigon.
+//
+// Erigon is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Erigon is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with Erigon. If not, see .
+
+package diagnostics
+
+import (
+ "fmt"
+ "net/http"
+ "runtime/pprof"
+ "strings"
+
+ diaglib "github.com/erigontech/erigon-lib/diagnostics"
+)
+
+func SetupProfileAccess(metricsMux *http.ServeMux, diag *diaglib.DiagnosticClient) {
+ if metricsMux == nil {
+ return
+ }
+
+ //handle all pprof, supported: goroutine, threadcreate, heap, allocs, block, mutex
+ metricsMux.HandleFunc("/pprof/", func(w http.ResponseWriter, r *http.Request) {
+ profile := strings.TrimPrefix(r.URL.Path, "/pprof/")
+ writePprofProfile(w, profile)
+ })
+}
+
+func writePprofProfile(w http.ResponseWriter, profile string) {
+ p := pprof.Lookup(profile)
+ if p == nil {
+ http.Error(w, "Unknown profile: "+profile, http.StatusNotFound)
+ return
+ }
+
+ w.Header().Set("Content-Type", "aplication/profile")
+ err := p.WriteTo(w, 0)
+ if err != nil {
+ http.Error(w, fmt.Sprintf("Failed to write profile: %v", err), http.StatusInternalServerError)
+ return
+ }
+}
diff --git a/diagnostics/setup.go b/diagnostics/setup.go
index 934ec963cc6..2462bd0e50e 100644
--- a/diagnostics/setup.go
+++ b/diagnostics/setup.go
@@ -146,4 +146,5 @@ func SetupEndpoints(ctx *cli.Context, node *node.ErigonNode, diagMux *http.Serve
SetupHeadersAccess(diagMux, diagnostic)
SetupBodiesAccess(diagMux, diagnostic)
SetupSysInfoAccess(diagMux, diagnostic)
+ SetupProfileAccess(diagMux, diagnostic)
}
diff --git a/diagnostics/sysinfo.go b/diagnostics/sysinfo.go
index 402eaad688b..571fd0d4ce2 100644
--- a/diagnostics/sysinfo.go
+++ b/diagnostics/sysinfo.go
@@ -18,9 +18,7 @@ package diagnostics
import (
"encoding/json"
- "fmt"
"net/http"
- "runtime/pprof"
diaglib "github.com/erigontech/erigon-lib/diagnostics"
"github.com/erigontech/erigon-lib/sysutils"
@@ -50,19 +48,6 @@ func SetupSysInfoAccess(metricsMux *http.ServeMux, diag *diaglib.DiagnosticClien
w.Header().Set("Content-Type", "application/json")
writeMemoryInfo(w)
})
-
- metricsMux.HandleFunc("/heap-profile", func(w http.ResponseWriter, r *http.Request) {
- w.Header().Set("Content-Type", "aplication/profile")
- writeHeapProfile(w)
- })
-}
-
-func writeHeapProfile(w http.ResponseWriter) {
- err := pprof.Lookup("heap").WriteTo(w, 0)
- if err != nil {
- http.Error(w, fmt.Sprintf("Failed to write profile: %v", err), http.StatusInternalServerError)
- return
- }
}
func writeHardwareInfo(w http.ResponseWriter, diag *diaglib.DiagnosticClient) {
diff --git a/docker-compose.yml b/docker-compose.yml
index 505d585cd83..a59017bba69 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -15,7 +15,7 @@ version: '2.2'
# Basic erigon's service
x-erigon-service: &default-erigon-service
- image: thorax/erigon:${TAG:-latest}
+ image: erigontech/erigon:${TAG:-latest}
pid: service:erigon # Use erigon's PID namespace. It's required to open Erigon's DB from another process (RPCDaemon local-mode)
volumes_from: [ erigon ]
restart: unless-stopped
@@ -24,7 +24,7 @@ x-erigon-service: &default-erigon-service
services:
erigon:
- image: thorax/erigon:${TAG:-latest}
+ image: erigontech/erigon:${TAG:-latest}
build:
args:
UID: ${DOCKER_UID:-1000}
diff --git a/docs/programmers_guide/guide.md b/docs/programmers_guide/guide.md
index 1ad0e5f8fe9..a21749fdc80 100644
--- a/docs/programmers_guide/guide.md
+++ b/docs/programmers_guide/guide.md
@@ -429,7 +429,7 @@ efficiently, the set of keys being resolved will be converted into a sorted list
processes a key, it maintains references to two consecutive keys from that sorted list - one "LTE" (Less Than or Equal
to the currently processed key), and another "GT" (Greater Than the currently processed key). If max common prefix is
also prefix of either LTE or GT, then `BRANCH` opcode is emitted, otherwise, `BRANCHHASH` opcode is emitted. This is
-implemented by the type `RetainList` in [turbo/trie/resolve_set.go](../../turbo/trie/retain_list.go)
+implemented by the type `RetainList` in [turbo/trie/retain_list.go](../../turbo/trie/retain_list.go)
### Extension of the structure to support contracts with contract storage
diff --git a/docs/programmers_guide/witness_formal_spec.md b/docs/programmers_guide/witness_formal_spec.md
deleted file mode 100644
index afe07d07cad..00000000000
--- a/docs/programmers_guide/witness_formal_spec.md
+++ /dev/null
@@ -1,599 +0,0 @@
-# Block Witness Formal Specification
-
-The keywords "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT", "SHOULD", "SHOULD NOT", "RECOMMENDED", "MAY", and "OPTIONAL" in this document are to be interpreted as described in [RFC 2119](https://tools.ietf.org/html/rfc2119).
-
-## Data Types
-
-### Basic
-
-`nil` - an empty value.
-
-`Any` - any data type. MUST NOT be `nil`.
-
-`Int` - an integer value. We treat the domain of integers as infinite,
-the overflow behaviour or mapping to the actual data types is undefined
-in this spec and should be up to implementation.
-
-`Byte` - a single byte.
-
-`Hash` - 32 byte value, representing a result of Keccak256 hashing.
-
-### Composite
-
-`()` - an empty array of arbitrary type.
-
-`(Type...)` - an array of a type `Type`. MUST NOT be empty.
-
-`{field:Type}` - an object with a field `field` of type `Type`.
-
- - full notation: `type T = {field:Type}`
-
- - inline `type TBase = T1{field:Type}|T2{field2:Type2}`
-
-### Type Definitions
-
-The type definitions are a bit similar to [Haskell](https://en.wikibooks.org/wiki/Haskell/Type_declarations).
-The key differences are how the arrays and type fields are defined.
-
-### Nodes
-
-```
-type Node = HashNode{raw_hash:Hash}
- | ValueNode{raw_value:(Byte...)}
- | AccountNode{nonce:Int balance:Int storage:nil|Node code:nil|CodeNode|HashNode}
- | LeafNode{key:(Byte...) value:ValueNode|AccountNode}
- | ExtensionNode{key:(Byte...) child:Node}
- | BranchNode{child0:nil|Node child1:nil|Node child3:nil|Node ... child15:nil|Node}
- | CodeNode{code:(Byte... )}
-```
-
-### Witness
-
-Witness MUST have at least 1 element.
-
-```
-type WitnessHeader = {version:Int}
-type Instruction = {code:Int parameter:Any...}
-type Witness = (Node|Instruction...)
-```
-
-
-## Execution Environment
-
-The witness execution environment MUST contain the following 2 elements:
-
-- **WitnessHeader** -- a header containing the version of the witness. The `version` MUST be 1.
-
-- **Witness** -- a witness to be executed;
-
-- **Substitution Rules** -- a list of all possible substitution rules.
-
-
-## Execution process
-
-Initially, the Witness MUST BE an array of `Instruction`s.
-
-Then, as substitution rules are applied to the witness, some elements of the
-array are replaced with `Node`s.
-
-The execution continues until there are no substitution rules left to execute.
-
-Here is how the execution code might look like in Go for building a single trie.
-
-```go
-witness := GetInitialWitness()
-rules := GetSubstitutionRules()
-numberOfRulesApplied := 1 // initial state
-
-for numberOfRulesApplied > 0 {
- witness, numberOfRulesApplied := ApplyRules(witness, rules)
-}
-
-if len(witness) == 1 {
- trie.root = witness[0]
-} else {
- panic("witness execution failed")
-}
-
-```
-
-
-And here is an example of the execution process (we will use the set of rules
-from the **Substitution Rules** section of this document):
-
-* **Step 1**. Witness: `(HASH h1 HASH h2 BRANCH 0b101 HASH h3 BRANCH 0b11)`
-
-* **Step 2**. Apply `HASH` substitution rules.
-Witness: `(HashNode{h1} HashNode{h2} BRANCH 0b101 HashNode{h3} BRANCH 0b11)`
-
-* **Step 3**. Apply `BRANCH` substitution rules (only once, because `BRANCH 0b11`
-doesn't pass its `GUARD` statements just yet).
-Witness: `(BranchNode{0: HashNode{h1} 2:HashNode{h2}} HashNode{h3} BRANCH 0b11)`
-
-* **Step 4**. Apply `BRANCH` substitution rules again.
-Witness: `(BranchNode{0: BranchNode{0: HashNode{h1} 2:HashNode{h2}} 1:HashNode{h3}})`
-
-* **Step 5**. No more rules are applicable, the witness contains only one
- element, the execution ends successfully.
-
-
-## End Criteria
-
-The execution ends when there are no substitution rules applicable for this
-witness.
-
-### Building a single trie from the witness
-
-If we are building a single trie from the witness, then the only SUCCESS
-execution is when the following are true:
-
-- The execution state MUST match the End Criteria
-- There MUST be only one item left in the witness
-- This item MUST be of the type `Node`
-
-In that case, this last item will be the root of the built trie.
-
-Every other end state is considered a FAILURE.
-
-
-### Building a Forest
-
-We also can build a forest of tries with this approach, by adding a new
-Instruction `NEW_TRIE` and adjusting the success criteria a bit:
-
-- The execution state MUST match the End Criteria;
-- The items that are left in the witness MUST follow this pattern: `(Node
- NEW_TRIE ... Node)`
-- Each `Node` element will be a root of a trie.
-
-Every other end state is considered a FAILURE.
-
-
-## Instructions & Parameters
-
-A single instruction consists of substitution rules and parameters.
-
-Each instruction MAY have one or more parameters.
-The parameters values MUST be encoded in the witness.
-
-That makes it different from the helper function parameters that MAY come from the stack or MAY come from the witness.
-
-
-## Substitution rules
-
-A substitution rule consists of 3 parts:
-
-`[GUARD] PATTERN |=> RESULT`
-
-- to the left of the `|=>` sign:
-
- - optional `GUARD` statements;
-
- - the pattern to match against;
-
-- result, to the right of the `|=>` sign.
-
-
-### `GUARD`s
-
-Each substitution rule can have zero, one or multiple `GUARD` statements.
-Each `GUARD` statement looks like this:
-
-```
-GUARD
-```
-
-For a substitution rule to be applicable, the `` in its `GUARD` statement MUST be true.
-
-If a substitution rule has multiple `GUARD` statements, all of them MUST BE satisfied.
-
-If there are no `GUARD` statements, the substitution rule's applicability is
-only defined by the PATTERN.
-
-Example:
-```
- GUARD NBITSET(mask) == 2
-|---- GUARD STATEMENT ---|
-
- Node(n0) Node(n1) BRANCH(mask) |=>
- BranchNode{MAKE_VALUES_ARRAY(mask, n0, n1)}
-```
-
-For the example rule to be applicable both facts MUST be true:
-
-1. `mask` contains only 2 bits set to 1 (the rest are set to 0);
-
-2. to the left of `BRANCH` instruction there is at least 2 `Node`s.
-
-Fact (1) comes from the `GUARD` statement.
-
-
-### PATTERN
-
-`[NodeType(boundVar1)... NodeType(boundVarN)] Instruction[(param1... paramN)]`
-
-A pattern MUST contain a single instruction.
-A pattern MAY contain one or more `Node`s to the left of the instruction to
-match.
-An instruction MAY have one or more parameters.
-
-Pattern matching is happening by the types. `Node` type means any node is
-matched, some specific node type will require a specific match.
-
-Pattern can have bound variable names for both matched nodes and instruction
-parameters (if present).
-
-Match:
-
-```
-HASH h0 HashNode{h1} HashNode{h2} BRANCH 0b11
- |------------------- MATCH -----------|
-
-HASH h0 BranchNode{0: HashNode{h1} 1: HashNode{h2}}
- |----------- SUBSTITUTED -------------------|
-```
-
-No match (not enough nodes to the left of the instruction):
-
-```
-HASH h0 HASH h1 HashNode{h2} BRANCH 0b11
-```
-
-### Result
-
-`NodeType(HELPER_FUNCTION(arguments))`
-
-The result is a single `Node` statement that replaces the pattern in the
-witness if it matches and the guards are passed.
-
-The result MAY contain helper functions or might have in-line computation.
-The result MUST have a specific node type. No generic `Node` is allowed.
-
-Helper functions or inline computations might use bound variables from the
-pattern.
-
-Example
-
-```
-
-Node(n0) Node(n1) BRANCH(mask) |=>
-BranchNode{MAKE_VALUES_ARRAY(mask, n0, n1)}
- ^ ^-- ^--- BOUND NODES
- |---- BOUND INSTRUCTION PARAM
- |------ HELPER CALL ------------|
-|----------------- RESULT ------------------|
-
-```
-
-### Bringing it all together
-
-
-So the full syntax is this:
-
-```
-[GUARD ...] [ NodeType(bound_variable1)... ] INSTRUCTION[(param1 ...)] |=>
-Node()
-```
-
-`NodeType` is one of the types of nodes to match. Can also be `Node` to match
-any non-nil node.
-
-Substitution rules MUST be non-ambiguous. Even though, there can be multiple
-substitution rules applicable to the whole witness at the same time, there MUST
-be only one rule that is applicable to a certain position in the witness.
-
-So, the minimal substitution rule is the one for the `HASH` instruction that pushes one hash to the stack:
-```
-HASH(hashValue) |=> HashNode{hashValue}
-```
-
-
-## Helper functions
-
-Helper functions are functions that are used in GUARDs or substitution rules.
-
-Helper functions MUST be pure.
-Helper functions MUST have at least one argument.
-Helper functions MAY have variadic parameters: `HELPER_EXAMPLE(arg1, arg2, list...)`.
-Helper functions MAY contain recursion.
-
-## Instructions
-
-### `LEAF key raw_value`
-
-**Substitution rules**
-
-Replaces the instruction with a `ValueNode` wrapped with a `LeafNode`.
-
-```
-LEAF(key, raw_value) |=> LeafNode{key, ValueNode(raw_value)}
-```
-
-### `EXTENSION key`
-
-Wraps a node to the left of the instruction with an `ExtensionNode`.
-
-**Substitution rules**
-
-```
-Node(node) EXTENSION(key) |=> ExtensionNode{key, node}
-```
-
-### `HASH raw_hash`
-
-Replaces the instruction with a `HashNode`.
-
-**Substitution rules**
-
-```
-HASH(hash_value) |=> HashNode{hash_value}
-```
-
-### `CODE raw_code`
-
-Replaces the instruction with a `CodeNode`.
-
-```
-CODE(raw_code) |=> CodeNode{raw_code}
-```
-
-### `ACCOUNT_LEAF key nonce balance has_code has_storage`
-
-Replaces the instruction and, optionally, up to 2 nodes to the left of the
-instruction with a single `AccountNode` wrapped with a `LeafNode`.
-
-**Substitution rules**
-
-```
-GUARD has_code == true
-GUARD has_storage == true
-
-CodeNode(code) Node(storage_hash_node) ACCOUNT_LEAF(key, nonce, balance, has_code, has_storage) |=>
-LeafNode{key, AccountNode{nonce, balance, storage_root, code}}
-
----
-
-GUARD has_code == true
-GUARD has_storage == true
-
-HashNode(code) Node(storage_hash_node) ACCOUNT_LEAF(key, nonce, balance, has_code, has_storage) |=>
-LeafNode{key, AccountNode{nonce, balance, storage_root, code}}
-
----
-
-GUARD has_code == false
-GUARD has_storage == true
-
-Node(storage_root) ACCOUNT_LEAF(key, nonce, balance, has_code, has_storage) |=>
-LeafNode{key, AccountNode{nonce, balance, storage_root, nil}}
-
----
-
-GUARD has_code == true
-GUARD has_storage == false
-
-CodeNode(code) ACCOUNT_LEAF(key, nonce, balance, has_code, has_storage) |=>
-LeafNode{key, AccountNode{nonce, balance, nil, nil, code}}
-
----
-
-GUARD has_code == true
-GUARD has_storage == false
-
-HashNode(code) ACCOUNT_LEAF(key, nonce, balance, has_code, has_storage) |=>
-LeafNode{key, AccountNode{nonce, balance, nil, nil, code}}
-
----
-
-GUARD has_code == false
-GUARD has_storage == false
-
-ACCOUNT_LEAF(key, nonce, balance, has_code, has_storage) |=>
-LeafNode{key, AccountNode{nonce, balance, nil, nil, nil}}
-
-```
-
-### `NEW_TRIE`
-
-No substitution rules. This instruction is used as a "divider" when building
-a forest of tries.
-
-### `BRANCH mask`
-
-Replaces `NBITSET(mask)` `Node`s to the left of the instruction with a single
-`BranchNode` with these nodes as children according to `mask`.
-
-**Substitution rules**
-```
-
-GUARD NBITSET(mask) == 2
-
-Node(n0) Node(n1) BRANCH(mask) |=>
-BranchNode{MAKE_VALUES_ARRAY(mask, n0, n1)}
-
----
-
-GUARD NBITSET(mask) == 3
-
-Node(n0) Node(n1) Node(n2) BRANCH(mask) |=>
-BranchNode{MAKE_VALUES_ARRAY(mask, n0, n1, n2)}
-
----
-
-...
-
----
-
-GUARD NBITSET(mask) == 16
-
-Node(n0) Node(n1) ... Node(n15) BRANCH(mask) |=>
-BranchNode{MAKE_VALUES_ARRAY(mask, n0, n1, ..., n15)}
-```
-
-## Helper functions
-
-### `MAKE_VALUES_ARRAY`
-
-returns an array of 16 elements, where values from `values` are set to the indices where `mask` has bits set to 1. Every other place has `nil` value there.
-
-**Example**: `MAKE_VALUES_ARRAY(5, [a, b])` returns `[a, nil, b, nil, nil, ..., nil]` (binary representation of 5 is `0000000000000101`)
-
-```
-MAKE_VALUES_ARRAY(mask, values...) {
- return MAKE_VALUES_ARRAY(mask, 0, values)
-}
-
-MAKE_VALUES_ARRAY(mask, idx, values...) {
- if idx > 16 {
- return []
- }
-
- if BIT_TEST(mask, idx) {
- return PREPEND(FIRST(values), (MAKE_VALUES_ARRAY mask, INC(idx), REST(values)))
- } else {
- return PREPEND(nil, (MAKE_VALUES_ARRAY mask, INC(idx), values))
- }
-}
-```
-
-
-### `RLP(value)`
-
-returns the RLP encoding of a value
-
-
-### `NBITSET(number)`
-
-returns number of bits set in the binary representation of `number`.
-
-### `BIT_TEST(number, n)`
-
-`n` MUST NOT be negative.
-
-returns `true` if bit `n` in `number` is set, `false` otherwise.
-
-### `PREPEND(value, array)`
-
-returns a new array with the `value` at index 0 and `array` values starting from index 1
-
-### `INC(value)`
-
-increments `value` by 1
-
-### `FIRST(array)`
-
-returns the first value in the specified array
-
-### `REST(array)`
-
-returns the array w/o the first item
-
-### `KECCAK(bytes)`
-
-returns a keccak-256 hash of `bytes`
-
-
-## Serialization
-
-The format for serialization of everything except hashes (that we know the
-length of) is [CBOR](https://cbor.io). It is RFC-specified and concise.
-
-For hashes we use the optimization of knowing the lengths, so we just read 32
-bytes
-
-### Block Witness Format
-
-Each block witness consists of a header followed by a list of instructions.
-
-There is no length of witness specified anywhere, the code expects to just reach `EOF`.
-
-Serialized Witness: `(HEADER, OP1, OP2, ..., OPn-1, OPn, EOF)`
-
-#### Encoding
-
-##### CBOR
-
-The parts of the key that are encoded with CBOR are marked by the `CBOR` function.
-
-##### Keys
-
-Keys are also using custom encryption to make them more compact.
-
-The nibbles of a key are encoded in a following way `[FLAGS NIBBLE1+NIBBLE2 NIBBLE3+NIBBLE4 NIBBLE5... ]`
-
-*FLAGS*
-* bit 0 -- 1 if the number of nibbles were odd
-* bit 1 -- 1 if the nibbles end with 0x10 (the terminator byte)
-
-This is shown later as `ENCODE_KEY` function.
-
-#### Header
-
-format: `version:byte`
-
-encoded as `[ version ]`
-
-the current version is 1.
-
-#### Instructions
-
-Each instruction starts with an opcode (`uint`).
-
-Then it might contain some data.
-
-##### `LEAF`
-
-format: `LEAF key:[]byte value:[]byte`
-
-encoded as `[ 0x00 CBOR(ENCODE_KEY(key))... CBOR(value)... ]`
-
-
-##### `EXTENSION`
-
-format: `EXTENSION key:[]byte`
-
-encoded as `[ 0x01 CBOR(ENCODE_KEY(key))... ]`
-
-
-##### `BRANCH`
-
-format: `BRANCH mask:uint32`
-
-*mask* defines which children are present
-(e.g. `0000000000001011` means that children 0, 1 and 3 are present and the other ones are not)
-
-encoded as `[ 0x02 CBOR(mask)...]`
-
-
-##### `HASH`
-
-format: `HASH hash:[32]byte`
-
-encoded as `[ 0x03 hash_byte_1 ... hash_byte_32 ]`
-
-
-##### `CODE`
-
-format: `CODE code:[]byte`
-
-encoded as `[ 0x04 CBOR(code)... ]`
-
-
-##### `ACCOUNT_LEAF`
-
-format: `ACCOUNT_LEAF key:[]byte flags [nonce:uint64] [balance:[]byte]`
-
-encoded as `[ 0x05 CBOR(ENCODE_KEY(key))... flags /CBOR(nonce).../ /CBOR(balance).../ ]`
-
-*flags* is a bitset encoded in a single bit (see [`witness_operators_test.go`](../../trie/witness_operators_test.go) to see flags in action).
-* bit 0 defines if **code** is present; if set to 1, then `has_code=true`;
-* bit 1 defines if **storage** is present; if set to 1, then `has_storage=true`;
-* bit 2 defines if **nonce** is not 0; if set to 0, *nonce* field is not encoded;
-* bit 3 defines if **balance** is not 0; if set to 0, *balance* field is not encoded;
-
-##### `NEW_TRIE`
-
-format: `NEW_TRIE`
-
-encoded as `[ 0xBB ]`
-
diff --git a/docs/programmers_guide/witness_format.md b/docs/programmers_guide/witness_format.md
deleted file mode 100644
index fe0909f6898..00000000000
--- a/docs/programmers_guide/witness_format.md
+++ /dev/null
@@ -1,96 +0,0 @@
-# Block Witness Format
-
-Each block witness consists of a header followed by a list of operators.
-
-There is no length of witness specified anywhere, the code expects to just reach `EOF`.
-
-Witness: `[HEADER, OP1, OP2, ..., OPn-1, OPn, EOF]`
-
-## Encoding
-
-### Keys
-
-key nibbles are encoded in a following way `[FLAGS NIBBLE1+NIBBLE2 NIBBLE3+NIBBLE4 NIBBLE5... ]`
-
-*FLAGS*
-* bit 0 -- 1 if the number of nibbles were odd
-* bit 1 -- 1 if the nibbles end with 0x10
-
-## Header
-
-format: `version:byte`
-
-encoded as `[ version ]`
-
-the current version is 1.
-
-## Operators
-
-Each operator starts with an opcode (see [`witness_operators.go`](../../trie/witness_operators.go) for exact values).
-
-Then it might contain some data.
-
-### `OpEmptyRoot`
-
-puts empty trie root to on the stack
-
-format: `OpEmptyRoot`
-
-encoded as `[ 0x06 ]`
-
-### `OpHash`
-
-puts a single hash on the stack
-
-format: `OpHash hash:[32]byte`
-
-encoded as `[ 0x03 hash_byte_1 ... hash_byte_32 ]`
-
-### `OpBranch`
-
-pops N values from the stack and adds them as the children; pushes the result to the stack; N is the number of 1's in the *mask* field.
-
-format: `OpBranch mask:uint32`
-
-*mask* defines which children are present
-(e.g. `0000000000001011` means that children 0, 1 and 3 are present and the other ones are not)
-
-encoded as `[ 0x02 CBOR(mask)...]`
-
-### `OpCode`
-
-pushes a code to the stack
-
-format: `OpCode code:[]byte`
-
-encoded as `[ 0x04 CBOR(code)... ]`
-
-### `OpExtension`
-
-pushes an extension node with a specified key on the stack
-
-format: `OpExtension key:[]byte`
-
-encoded as `[ 0x01 CBOR(key)... ]`
-
-### `OpLeaf`
-
-pushes a leaf with specified key and value to the stack
-
-format: `OpLeaf key:[]byte value:[]byte`
-
-encoded as `[ 0x00 CBOR(key)... CBOR(value)... ]`
-
-### `OpAccountLeaf`
-
-pushes a leaf with specified parameters to the stack; if flags show, before that pops 1 or 2 values from the stack;
-
-format: `OpAccountLeaf key:[]byte flags [nonce:uint64] [balance:[]byte]`
-
-encoded as `[ 0x05 CBOR(key|[]byte)... flags /CBOR(nonce).../ /CBOR(balance).../ ]`
-
-*flags* is a bitset encoded in a single bit (see [`witness_operators_test.go`](../../trie/witness_operators_test.go) to see flags in action).
-* bit 0 defines if **code** is present; if set to 1 it assumes that either `OpCode` or `OpHash` already put something on the stack;
-* bit 1 defines if **storage** is present; if set to 1, the operators preceding `OpAccountLeaf` will reconstruct a storage trie;
-* bit 2 defines if **nonce** is not 0; if set to 0, *nonce* field is not encoded;
-* bit 3 defines if **balance** is not 0; if set to 0, *balance* field is not encoded;
diff --git a/docs/readthedocs/source/rpc/index.rst b/docs/readthedocs/source/rpc/index.rst
index ad14711db43..aa9a2ff3fa2 100644
--- a/docs/readthedocs/source/rpc/index.rst
+++ b/docs/readthedocs/source/rpc/index.rst
@@ -265,9 +265,6 @@ Object - An object of type Block defined as:
* - ``QUANTITY``
- ``difficulty``
- Integer of the difficulty for this block
- * - ``QUANTITY``
- - ``totalDifficulty``
- - Integer of the total difficulty of the chain until this block
* - ``DATA``
- ``extraData``
- The extra data field of this block
diff --git a/erigon-lib/Makefile b/erigon-lib/Makefile
index abff3d7e00d..d02cb11a11d 100644
--- a/erigon-lib/Makefile
+++ b/erigon-lib/Makefile
@@ -76,6 +76,8 @@ grpc: protoc-all
--go-grpc_opt=Mremote/kv.proto=./remoteproto \
--go_opt=Mremote/ethbackend.proto=./remoteproto \
--go-grpc_opt=Mremote/ethbackend.proto=./remoteproto \
+ --go_opt=Mremote/bor.proto=./remoteproto \
+ --go-grpc_opt=Mremote/bor.proto=./remoteproto \
--go_opt=Mdownloader/downloader.proto=./downloaderproto \
--go-grpc_opt=Mdownloader/downloader.proto=./downloaderproto \
--go_opt=Mexecution/execution.proto=./executionproto \
@@ -85,7 +87,7 @@ grpc: protoc-all
--go_opt=Mtxpool/mining.proto=./txpoolproto \
--go-grpc_opt=Mtxpool/mining.proto=./txpoolproto \
p2psentry/sentry.proto p2psentinel/sentinel.proto \
- remote/kv.proto remote/ethbackend.proto \
+ remote/bor.proto remote/kv.proto remote/ethbackend.proto \
downloader/downloader.proto execution/execution.proto \
txpool/txpool.proto txpool/mining.proto
rm -rf vendor
diff --git a/erigon-lib/chain/chain_config.go b/erigon-lib/chain/chain_config.go
index b406bf24445..c9cb6cc7560 100644
--- a/erigon-lib/chain/chain_config.go
+++ b/erigon-lib/chain/chain_config.go
@@ -120,6 +120,8 @@ type BorConfig interface {
IsNapoli(num uint64) bool
GetNapoliBlock() *big.Int
IsAhmedabad(number uint64) bool
+ GetStateReceiverContract() string
+ CalculateSprintNumber(number uint64) uint64
}
func (c *Config) String() string {
diff --git a/erigon-lib/chain/networkid/network_id.go b/erigon-lib/chain/networkid/network_id.go
new file mode 100644
index 00000000000..f113fcd020e
--- /dev/null
+++ b/erigon-lib/chain/networkid/network_id.go
@@ -0,0 +1,36 @@
+package networkid
+
+const (
+ MainnetChainID = 1
+ HoleskyChainID = 17000
+ SepoliaChainID = 11155111
+ DevChainName = 1337
+ AmoyChainID = 80002
+ BorMainnetChainID = 137
+ BorDevnetChainID = 1337
+ GnosisChainID = 100
+ ChiadoChainID = 10200
+ TestID = 1337
+)
+
+var All = []uint64{
+ MainnetChainID,
+ HoleskyChainID,
+ SepoliaChainID,
+ AmoyChainID,
+ BorMainnetChainID,
+ BorDevnetChainID,
+ GnosisChainID,
+ ChiadoChainID,
+ TestID,
+}
+
+var NetworkNameByID = map[uint64]string{
+ MainnetChainID: "mainnet",
+ HoleskyChainID: "holesky",
+ SepoliaChainID: "sepolia",
+ AmoyChainID: "amoy",
+ BorMainnetChainID: "bor-mainnet",
+ GnosisChainID: "gnosis",
+ ChiadoChainID: "chiado",
+}
diff --git a/erigon-lib/chain/snapcfg/util.go b/erigon-lib/chain/snapcfg/util.go
index 3e087fba569..97f55f9f8b3 100644
--- a/erigon-lib/chain/snapcfg/util.go
+++ b/erigon-lib/chain/snapcfg/util.go
@@ -19,13 +19,14 @@ package snapcfg
import (
_ "embed"
"encoding/json"
- "github.com/pkg/errors"
"path/filepath"
"slices"
"sort"
"strconv"
"strings"
+ "github.com/pkg/errors"
+
"github.com/pelletier/go-toml/v2"
"github.com/tidwall/btree"
@@ -118,6 +119,9 @@ func (p Preverified) Typed(types []snaptype.Type) Preverified {
//typeName, _ := strings.CutSuffix(parts[2], filepath.Ext(parts[2]))
typeName := name[lastSep+1 : dot]
include := false
+ if strings.Contains(name, "transactions-to-block") { // transactions-to-block should just be "transactions" type
+ typeName = "transactions"
+ }
for _, typ := range types {
if typeName == typ.Name() {
diff --git a/erigon-lib/chain/snapcfg/util_test.go b/erigon-lib/chain/snapcfg/util_test.go
index d169b267683..86b2622c824 100644
--- a/erigon-lib/chain/snapcfg/util_test.go
+++ b/erigon-lib/chain/snapcfg/util_test.go
@@ -1,8 +1,9 @@
package snapcfg
import (
- "github.com/erigontech/erigon-lib/downloader/snaptype"
"testing"
+
+ "github.com/erigontech/erigon-lib/downloader/snaptype"
)
func TestNameToParts(t *testing.T) {
diff --git a/erigon-lib/commitment/commitment_test.go b/erigon-lib/commitment/commitment_test.go
index f75061473ba..02780283385 100644
--- a/erigon-lib/commitment/commitment_test.go
+++ b/erigon-lib/commitment/commitment_test.go
@@ -65,6 +65,7 @@ func generateCellRow(tb testing.TB, size int) (row []*cell, bitmap uint16) {
}
func TestBranchData_MergeHexBranches2(t *testing.T) {
+ t.Parallel()
row, bm := generateCellRow(t, 16)
be := NewBranchEncoder(1024, t.TempDir())
@@ -102,6 +103,8 @@ func TestBranchData_MergeHexBranches2(t *testing.T) {
}
func TestBranchData_MergeHexBranchesEmptyBranches(t *testing.T) {
+ t.Parallel()
+
// Create a BranchMerger instance with sufficient capacity for testing.
merger := NewHexBranchMerger(1024)
@@ -123,6 +126,8 @@ func TestBranchData_MergeHexBranchesEmptyBranches(t *testing.T) {
// Additional tests for error cases, edge cases, and other scenarios can be added here.
func TestBranchData_MergeHexBranches3(t *testing.T) {
+ t.Parallel()
+
encs := "0405040b04080f0b080d030204050b0502090805050d01060e060d070f0903090c04070a0d0a000e090b060b0c040c0700020e0b0c060b0106020c0607050a0b0209070d06040808"
enc, err := hex.DecodeString(encs)
require.NoError(t, err)
@@ -159,6 +164,8 @@ func unfoldBranchDataFromString(tb testing.TB, encs string) (row []*cell, am uin
}
func TestBranchData_ReplacePlainKeys(t *testing.T) {
+ t.Parallel()
+
row, bm := generateCellRow(t, 16)
cells, am := unfoldBranchDataFromString(t, "86e586e5082035e72a782b51d9c98548467e3f868294d923cdbbdf4ce326c867bd972c4a2395090109203b51781a76dc87640aea038e3fdd8adca94049aaa436735b162881ec159f6fb408201aa2fa41b5fb019e8abf8fc32800805a2743cfa15373cf64ba16f4f70e683d8e0404a192d9050404f993d9050404e594d90508208642542ff3ce7d63b9703e85eb924ab3071aa39c25b1651c6dda4216387478f10404bd96d905")
@@ -224,6 +231,8 @@ func TestBranchData_ReplacePlainKeys(t *testing.T) {
}
func TestBranchData_ReplacePlainKeys_WithEmpty(t *testing.T) {
+ t.Parallel()
+
row, bm := generateCellRow(t, 16)
cg := func(nibble int, skip bool) (*cell, error) {
@@ -271,6 +280,8 @@ func TestBranchData_ReplacePlainKeys_WithEmpty(t *testing.T) {
}
func TestNewUpdates(t *testing.T) {
+ t.Parallel()
+
t.Run("ModeUpdate", func(t *testing.T) {
ut := NewUpdates(ModeUpdate, t.TempDir(), keyHasherNoop)
@@ -291,6 +302,8 @@ func TestNewUpdates(t *testing.T) {
}
func TestUpdates_TouchPlainKey(t *testing.T) {
+ t.Parallel()
+
utUpdate := NewUpdates(ModeUpdate, t.TempDir(), keyHasherNoop)
utDirect := NewUpdates(ModeDirect, t.TempDir(), keyHasherNoop)
diff --git a/erigon-lib/commitment/hex_patricia_hashed_test.go b/erigon-lib/commitment/hex_patricia_hashed_test.go
index bf976353a0b..fa31c1b5cbc 100644
--- a/erigon-lib/commitment/hex_patricia_hashed_test.go
+++ b/erigon-lib/commitment/hex_patricia_hashed_test.go
@@ -33,6 +33,8 @@ import (
)
func Test_HexPatriciaHashed_ResetThenSingularUpdates(t *testing.T) {
+ t.Parallel()
+
ctx := context.Background()
ms := NewMockState(t)
hph := NewHexPatriciaHashed(1, ms, ms.TempDir())
@@ -100,6 +102,8 @@ func Test_HexPatriciaHashed_ResetThenSingularUpdates(t *testing.T) {
}
func Test_HexPatriciaHashed_EmptyUpdate(t *testing.T) {
+ t.Parallel()
+
ms := NewMockState(t)
ctx := context.Background()
hph := NewHexPatriciaHashed(1, ms, ms.TempDir())
@@ -143,6 +147,8 @@ func Test_HexPatriciaHashed_EmptyUpdate(t *testing.T) {
}
func Test_HexPatriciaHashed_UniqueRepresentation2(t *testing.T) {
+ t.Parallel()
+
msOne := NewMockState(t)
msTwo := NewMockState(t)
ctx := context.Background()
@@ -260,6 +266,8 @@ func sortUpdatesByHashIncrease(t *testing.T, hph *HexPatriciaHashed, plainKeys [
}
func Test_HexPatriciaHashed_BrokenUniqueRepr(t *testing.T) {
+ t.Parallel()
+
ctx := context.Background()
uniqTest := func(t *testing.T, sortHashedKeys bool, trace bool) {
@@ -416,6 +424,8 @@ func Test_HexPatriciaHashed_UniqueRepresentation(t *testing.T) {
}
func Test_HexPatriciaHashed_Sepolia(t *testing.T) {
+ t.Parallel()
+
state := NewMockState(t)
ctx := context.Background()
@@ -480,6 +490,8 @@ func Test_HexPatriciaHashed_Sepolia(t *testing.T) {
}
func Test_Cell_EncodeDecode(t *testing.T) {
+ t.Parallel()
+
rnd := rand.New(rand.NewSource(time.Now().UnixMilli()))
first := &cell{
hashLen: length.Hash,
@@ -520,6 +532,8 @@ func Test_Cell_EncodeDecode(t *testing.T) {
}
func Test_HexPatriciaHashed_StateEncode(t *testing.T) {
+ t.Parallel()
+
//trie := NewHexPatriciaHashed(length.Hash, nil, nil, nil)
var s state
s.Root = make([]byte, 128)
@@ -566,6 +580,8 @@ func Test_HexPatriciaHashed_StateEncode(t *testing.T) {
}
func Test_HexPatriciaHashed_StateEncodeDecodeSetup(t *testing.T) {
+ t.Parallel()
+
ms := NewMockState(t)
ctx := context.Background()
@@ -629,6 +645,8 @@ func Test_HexPatriciaHashed_StateEncodeDecodeSetup(t *testing.T) {
}
func Test_HexPatriciaHashed_StateRestoreAndContinue(t *testing.T) {
+ t.Parallel()
+
msOne := NewMockState(t)
msTwo := NewMockState(t)
ctx := context.Background()
@@ -716,6 +734,8 @@ func Test_HexPatriciaHashed_StateRestoreAndContinue(t *testing.T) {
}
func Test_HexPatriciaHashed_RestoreAndContinue(t *testing.T) {
+ t.Parallel()
+
ctx := context.Background()
ms := NewMockState(t)
@@ -792,6 +812,8 @@ func Test_HexPatriciaHashed_RestoreAndContinue(t *testing.T) {
}
func Test_HexPatriciaHashed_ProcessUpdates_UniqueRepresentation_AfterStateRestore(t *testing.T) {
+ t.Parallel()
+
ctx := context.Background()
stateSeq := NewMockState(t)
stateBatch := NewMockState(t)
@@ -868,6 +890,8 @@ func Test_HexPatriciaHashed_ProcessUpdates_UniqueRepresentation_AfterStateRestor
}
func Test_HexPatriciaHashed_ProcessUpdates_UniqueRepresentationInTheMiddle(t *testing.T) {
+ t.Parallel()
+
ctx := context.Background()
stateSeq := NewMockState(t)
stateBatch := NewMockState(t)
@@ -974,6 +998,8 @@ func Test_HexPatriciaHashed_ProcessUpdates_UniqueRepresentationInTheMiddle(t *te
}
func TestUpdate_EncodeDecode(t *testing.T) {
+ t.Parallel()
+
updates := []Update{
{Flags: BalanceUpdate, Balance: *uint256.NewInt(123), CodeHash: [32]byte(EmptyCodeHash)},
{Flags: BalanceUpdate | NonceUpdate, Balance: *uint256.NewInt(45639015), Nonce: 123, CodeHash: [32]byte(EmptyCodeHash)},
@@ -1052,6 +1078,8 @@ func TestUpdate_Merge(t *testing.T) {
}
func TestCell_setFromUpdate(t *testing.T) {
+ t.Parallel()
+
rnd := rand.New(rand.NewSource(42))
b := uint256.NewInt(rnd.Uint64())
diff --git a/erigon-lib/common/datadir/dirs.go b/erigon-lib/common/datadir/dirs.go
index 915c5b5b3b9..c0f05d5f6c7 100644
--- a/erigon-lib/common/datadir/dirs.go
+++ b/erigon-lib/common/datadir/dirs.go
@@ -167,32 +167,14 @@ func downloaderV2Migration(dirs Dirs) error {
from, to := filepath.Join(dirs.Snap, "db", "mdbx.dat"), filepath.Join(dirs.Downloader, "mdbx.dat")
if err := os.Rename(from, to); err != nil {
//fall back to copy-file if folders are on different disks
- if err := copyFile(from, to); err != nil {
+ if err := CopyFile(from, to); err != nil {
return err
}
}
return nil
}
-// nolint
-func moveFiles(from, to string, ext string) error {
- files, err := dir.ReadDir(from)
- if err != nil {
- return fmt.Errorf("ReadDir: %w, %s", err, from)
- }
- for _, f := range files {
- if f.Type().IsDir() || !f.Type().IsRegular() {
- continue
- }
- if filepath.Ext(f.Name()) != ext {
- continue
- }
- _ = os.Rename(filepath.Join(from, f.Name()), filepath.Join(to, f.Name()))
- }
- return nil
-}
-
-func copyFile(from, to string) error {
+func CopyFile(from, to string) error {
r, err := os.Open(from)
if err != nil {
return fmt.Errorf("please manually move file: from %s to %s. error: %w", from, to, err)
diff --git a/erigon-lib/common/dbg/dbg_env.go b/erigon-lib/common/dbg/dbg_env.go
index 736c8c8135d..2c2d337ef08 100644
--- a/erigon-lib/common/dbg/dbg_env.go
+++ b/erigon-lib/common/dbg/dbg_env.go
@@ -30,13 +30,13 @@ func EnvString(envVarName string, defaultVal string) string {
v, _ := os.LookupEnv(envVarName)
if v != "" {
log.Warn("[env] please use ERIGON_ prefix for env variables of erigon", "var", envVarName)
- log.Info("[dbg] env", envVarName, v)
+ log.Info("[env]", envVarName, v)
return v
}
v, _ = os.LookupEnv("ERIGON_" + envVarName)
if v != "" {
- log.Info("[dbg] env", envVarName, v)
+ log.Info("[env]", envVarName, v)
return v
}
return defaultVal
@@ -45,22 +45,22 @@ func EnvBool(envVarName string, defaultVal bool) bool {
v, _ := os.LookupEnv(envVarName)
if v == "true" {
log.Warn("[env] please use ERIGON_ prefix for env variables of erigon", "var", envVarName)
- log.Info("[dbg] env", envVarName, true)
+ log.Info("[env]", envVarName, true)
return true
}
if v == "false" {
log.Warn("[env] please use ERIGON_ prefix for env variables of erigon", "var", envVarName)
- log.Info("[dbg] env", envVarName, false)
+ log.Info("[env]", envVarName, false)
return false
}
v, _ = os.LookupEnv("ERIGON_" + envVarName)
if v == "true" {
- log.Info("[dbg] env", envVarName, true)
+ log.Info("[env]", envVarName, true)
return true
}
if v == "false" {
- log.Info("[dbg] env", envVarName, false)
+ log.Info("[env]", envVarName, false)
return false
}
return defaultVal
@@ -73,7 +73,7 @@ func EnvInt(envVarName string, defaultVal int) int {
if err != nil {
panic(err)
}
- log.Info("[dbg] env", envVarName, i)
+ log.Info("[env]", envVarName, i)
return i
}
@@ -83,7 +83,7 @@ func EnvInt(envVarName string, defaultVal int) int {
if err != nil {
panic(err)
}
- log.Info("[dbg] env", envVarName, i)
+ log.Info("[env]", envVarName, i)
return i
}
return defaultVal
@@ -96,7 +96,7 @@ func EnvDataSize(envVarName string, defaultVal datasize.ByteSize) datasize.ByteS
if err != nil {
panic(err)
}
- log.Info("[dbg] env", envVarName, val)
+ log.Info("[env]", envVarName, val)
return val
}
@@ -106,7 +106,7 @@ func EnvDataSize(envVarName string, defaultVal datasize.ByteSize) datasize.ByteS
if err != nil {
panic(err)
}
- log.Info("[dbg] env", envVarName, val)
+ log.Info("[env]", envVarName, val)
return val
}
return defaultVal
@@ -116,7 +116,7 @@ func EnvDuration(envVarName string, defaultVal time.Duration) time.Duration {
v, _ := os.LookupEnv(envVarName)
if v != "" {
log.Warn("[env] please use ERIGON_ prefix for env variables of erigon", "var", envVarName)
- log.Info("[dbg] env", envVarName, v)
+ log.Info("[env]", envVarName, v)
val, err := time.ParseDuration(v)
if err != nil {
panic(err)
@@ -125,7 +125,7 @@ func EnvDuration(envVarName string, defaultVal time.Duration) time.Duration {
}
v, _ = os.LookupEnv("ERIGON_" + envVarName)
if v != "" {
- log.Info("[dbg] env", envVarName, v)
+ log.Info("[env]", envVarName, v)
val, err := time.ParseDuration(v)
if err != nil {
panic(err)
diff --git a/erigon-lib/common/dbg/experiments.go b/erigon-lib/common/dbg/experiments.go
index e2bd92ff76f..744e0c8e753 100644
--- a/erigon-lib/common/dbg/experiments.go
+++ b/erigon-lib/common/dbg/experiments.go
@@ -49,7 +49,7 @@ var (
noMerge = EnvBool("NO_MERGE", false)
discardHistory = EnvBool("DISCARD_HISTORY", false)
discardCommitment = EnvBool("DISCARD_COMMITMENT", false)
- pruneTotalDifficulty = EnvBool("PRUNE_TOTAL_DIFFICULTY", false)
+ pruneTotalDifficulty = EnvBool("PRUNE_TOTAL_DIFFICULTY", true)
// force skipping of any non-Erigon2 .torrent files
DownloaderOnlyBlocks = EnvBool("DOWNLOADER_ONLY_BLOCKS", false)
diff --git a/erigon-lib/common/errors/errors.go b/erigon-lib/common/errors/errors.go
new file mode 100644
index 00000000000..de200b85c42
--- /dev/null
+++ b/erigon-lib/common/errors/errors.go
@@ -0,0 +1,33 @@
+// Copyright 2024 The Erigon Authors
+// This file is part of Erigon.
+//
+// Erigon is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Erigon is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with Erigon. If not, see .
+
+package errors
+
+import "errors"
+
+func IsOneOf(err error, targets []error) bool {
+ if err == nil {
+ return false
+ }
+
+ for _, target := range targets {
+ if errors.Is(err, target) {
+ return true
+ }
+ }
+
+ return false
+}
diff --git a/erigon-lib/common/hexutility/hex.go b/erigon-lib/common/hexutility/hex.go
index d82adf323cd..14bfa3fd0a8 100644
--- a/erigon-lib/common/hexutility/hex.go
+++ b/erigon-lib/common/hexutility/hex.go
@@ -42,9 +42,9 @@ func strip0x(str string) string {
// EncodeTs encodes a TimeStamp (BlockNumber or TxNumber or other uin64) as big endian
func EncodeTs(number uint64) []byte {
- enc := make([]byte, 8)
- binary.BigEndian.PutUint64(enc, number)
- return enc
+ var enc [8]byte
+ binary.BigEndian.PutUint64(enc[:], number)
+ return enc[:]
}
// Encode encodes b as a hex string with 0x prefix.
diff --git a/erigon-lib/common/metrics/block_metrics.go b/erigon-lib/common/metrics/block_metrics.go
index ebabec172bc..a5fa0ba043b 100644
--- a/erigon-lib/common/metrics/block_metrics.go
+++ b/erigon-lib/common/metrics/block_metrics.go
@@ -33,8 +33,8 @@ var (
BlockProducerProductionDelay = metrics.NewSummary(`block_producer_delay{type="production"}`)
)
-func UpdateBlockConsumerHeaderDownloadDelay(parentTime uint64, blockNumber uint64, log log.Logger) {
- t := time.Unix(int64(parentTime), 0)
+func UpdateBlockConsumerHeaderDownloadDelay(blockTime uint64, blockNumber uint64, log log.Logger) {
+ t := time.Unix(int64(blockTime), 0)
BlockConsumerHeaderDownloadDelay.ObserveDuration(t)
if DelayLoggingEnabled {
@@ -42,8 +42,8 @@ func UpdateBlockConsumerHeaderDownloadDelay(parentTime uint64, blockNumber uint6
}
}
-func UpdateBlockConsumerBodyDownloadDelay(parentTime uint64, blockNumber uint64, log log.Logger) {
- t := time.Unix(int64(parentTime), 0)
+func UpdateBlockConsumerBodyDownloadDelay(blockTime uint64, blockNumber uint64, log log.Logger) {
+ t := time.Unix(int64(blockTime), 0)
BlockConsumerBodyDownloadDelay.ObserveDuration(t)
if DelayLoggingEnabled {
@@ -51,8 +51,8 @@ func UpdateBlockConsumerBodyDownloadDelay(parentTime uint64, blockNumber uint64,
}
}
-func UpdateBlockConsumerPreExecutionDelay(parentTime uint64, blockNumber uint64, log log.Logger) {
- t := time.Unix(int64(parentTime), 0)
+func UpdateBlockConsumerPreExecutionDelay(blockTime uint64, blockNumber uint64, log log.Logger) {
+ t := time.Unix(int64(blockTime), 0)
BlockConsumerPreExecutionDelay.ObserveDuration(t)
if DelayLoggingEnabled {
@@ -60,8 +60,8 @@ func UpdateBlockConsumerPreExecutionDelay(parentTime uint64, blockNumber uint64,
}
}
-func UpdateBlockConsumerPostExecutionDelay(parentTime uint64, blockNumber uint64, log log.Logger) {
- t := time.Unix(int64(parentTime), 0)
+func UpdateBlockConsumerPostExecutionDelay(blockTime uint64, blockNumber uint64, log log.Logger) {
+ t := time.Unix(int64(blockTime), 0)
BlockConsumerPostExecutionDelay.ObserveDuration(t)
if DelayLoggingEnabled {
@@ -69,11 +69,11 @@ func UpdateBlockConsumerPostExecutionDelay(parentTime uint64, blockNumber uint64
}
}
-func UpdateBlockProducerProductionDelay(parentTime uint64, blockNumber uint64, log log.Logger) {
- t := time.Unix(int64(parentTime), 0)
+func UpdateBlockProducerProductionDelay(parentBlockTime uint64, producedBlockNum uint64, log log.Logger) {
+ t := time.Unix(int64(parentBlockTime), 0)
BlockProducerProductionDelay.ObserveDuration(t)
if DelayLoggingEnabled {
- log.Info("[producer-delay] Production", "blockNumber", blockNumber, "delay", time.Since(t))
+ log.Info("[producer-delay] Production", "blockNumber", producedBlockNum, "delay", time.Since(t))
}
}
diff --git a/erigon-lib/common/metrics/metrics_enabled.go b/erigon-lib/common/metrics/metrics_enabled.go
index f0e20954f24..bccc97ec5d6 100644
--- a/erigon-lib/common/metrics/metrics_enabled.go
+++ b/erigon-lib/common/metrics/metrics_enabled.go
@@ -29,5 +29,5 @@ var DefaultConfig = Config{
Enabled: false,
EnabledExpensive: false,
HTTP: "127.0.0.1",
- Port: 6060,
+ Port: 6061,
}
diff --git a/erigon-lib/config3/config3.go b/erigon-lib/config3/config3.go
index f5b53fc7d3d..050865ecf1e 100644
--- a/erigon-lib/config3/config3.go
+++ b/erigon-lib/config3/config3.go
@@ -22,6 +22,6 @@ const HistoryV3AggregationStep = 1_562_500 // = 100M / 64. Dividers: 2, 5, 10, 2
const EnableHistoryV4InTest = true
-const MaxReorgDepthV3 = 1024
+const MaxReorgDepthV3 = 512
const DefaultPruneDistance = 100_000
diff --git a/erigon-lib/crypto/secp256k1.go b/erigon-lib/crypto/secp256k1.go
index c80953b004c..c6628fa738c 100644
--- a/erigon-lib/crypto/secp256k1.go
+++ b/erigon-lib/crypto/secp256k1.go
@@ -24,7 +24,7 @@ import (
var (
secp256k1N = new(uint256.Int).SetBytes(hexutility.MustDecodeHex("fffffffffffffffffffffffffffffffebaaedce6af48a03bbfd25e8cd0364141"))
- secp256k1halfN = new(uint256.Int).Rsh(secp256k1N, 1)
+ Secp256k1halfN = new(uint256.Int).Rsh(secp256k1N, 1)
)
// See Appendix F "Signing Transactions" of the Yellow Paper
@@ -34,7 +34,7 @@ func TransactionSignatureIsValid(v byte, r, s *uint256.Int, allowPreEip2s bool)
}
// See EIP-2: Homestead Hard-fork Changes
- if !allowPreEip2s && s.Gt(secp256k1halfN) {
+ if !allowPreEip2s && s.Gt(Secp256k1halfN) {
return false
}
diff --git a/erigon-lib/crypto/secp256k1_test.go b/erigon-lib/crypto/secp256k1_test.go
new file mode 100644
index 00000000000..a093b4a7f25
--- /dev/null
+++ b/erigon-lib/crypto/secp256k1_test.go
@@ -0,0 +1,74 @@
+// Copyright 2014 The go-ethereum Authors
+// (original work)
+// Copyright 2024 The Erigon Authors
+// (modifications)
+// This file is part of Erigon.
+//
+// Erigon is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Erigon is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with Erigon. If not, see .
+
+package crypto
+
+import (
+ "testing"
+
+ "github.com/holiman/uint256"
+
+ "github.com/erigontech/erigon-lib/common/u256"
+)
+
+func TestTransactionSignatureIsValid(t *testing.T) {
+ check := func(expected bool, v byte, r, s *uint256.Int) {
+ if TransactionSignatureIsValid(v, r, s, true) != expected {
+ t.Errorf("mismatch for v: %d r: %d s: %d want: %v", v, r, s, expected)
+ }
+ }
+ minusOne := uint256.NewInt(0).SetAllOne()
+ one := u256.N1
+ zero := u256.N0
+ secp256k1nMinus1 := new(uint256.Int).Sub(secp256k1N, u256.N1)
+
+ // correct v,r,s
+ check(true, 0, one, one)
+ check(true, 1, one, one)
+ // incorrect v, correct r,s,
+ check(false, 2, one, one)
+ check(false, 3, one, one)
+
+ // incorrect v, combinations of incorrect/correct r,s at lower limit
+ check(false, 2, zero, zero)
+ check(false, 2, zero, one)
+ check(false, 2, one, zero)
+ check(false, 2, one, one)
+
+ // correct v for any combination of incorrect r,s
+ check(false, 0, zero, zero)
+ check(false, 0, zero, one)
+ check(false, 0, one, zero)
+
+ check(false, 1, zero, zero)
+ check(false, 1, zero, one)
+ check(false, 1, one, zero)
+
+ // correct sig with max r,s
+ check(true, 0, secp256k1nMinus1, secp256k1nMinus1)
+ // correct v, combinations of incorrect r,s at upper limit
+ check(false, 0, secp256k1N, secp256k1nMinus1)
+ check(false, 0, secp256k1nMinus1, secp256k1N)
+ check(false, 0, secp256k1N, secp256k1N)
+
+ // current callers ensures r,s cannot be negative, but let's test for that too
+ // as crypto package could be used stand-alone
+ check(false, 0, minusOne, one)
+ check(false, 0, one, minusOne)
+}
diff --git a/erigon-lib/direct/bridge_client.go b/erigon-lib/direct/bridge_client.go
new file mode 100644
index 00000000000..26bf141ed6b
--- /dev/null
+++ b/erigon-lib/direct/bridge_client.go
@@ -0,0 +1,31 @@
+package direct
+
+import (
+ "context"
+
+ "google.golang.org/grpc"
+ "google.golang.org/protobuf/types/known/emptypb"
+
+ remote "github.com/erigontech/erigon-lib/gointerfaces/remoteproto"
+ types "github.com/erigontech/erigon-lib/gointerfaces/typesproto"
+)
+
+type BridgeClientDirect struct {
+ server remote.BridgeBackendServer
+}
+
+func NewBridgeClientDirect(server remote.BridgeBackendServer) *BridgeClientDirect {
+ return &BridgeClientDirect{server: server}
+}
+
+func (b *BridgeClientDirect) BorTxnLookup(ctx context.Context, in *remote.BorTxnLookupRequest, opts ...grpc.CallOption) (*remote.BorTxnLookupReply, error) {
+ return b.server.BorTxnLookup(ctx, in)
+}
+
+func (b *BridgeClientDirect) BorEvents(ctx context.Context, in *remote.BorEventsRequest, opts ...grpc.CallOption) (*remote.BorEventsReply, error) {
+ return b.server.BorEvents(ctx, in)
+}
+
+func (b *BridgeClientDirect) Version(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*types.VersionReply, error) {
+ return b.server.Version(ctx, in)
+}
diff --git a/erigon-lib/direct/sentry_client.go b/erigon-lib/direct/sentry_client.go
index 8833b66fc2c..216a97f5322 100644
--- a/erigon-lib/direct/sentry_client.go
+++ b/erigon-lib/direct/sentry_client.go
@@ -26,7 +26,7 @@ import (
"google.golang.org/protobuf/proto"
"google.golang.org/protobuf/types/known/emptypb"
- sentryproto "github.com/erigontech/erigon-lib/gointerfaces/sentryproto"
+ "github.com/erigontech/erigon-lib/gointerfaces/sentryproto"
types "github.com/erigontech/erigon-lib/gointerfaces/typesproto"
libsentry "github.com/erigontech/erigon-lib/p2p/sentry"
)
diff --git a/erigon-lib/diskutils/diskutils.go b/erigon-lib/diskutils/diskutils.go
index 90d97749cbf..e22567b35e8 100644
--- a/erigon-lib/diskutils/diskutils.go
+++ b/erigon-lib/diskutils/diskutils.go
@@ -14,7 +14,7 @@
// You should have received a copy of the GNU Lesser General Public License
// along with Erigon. If not, see .
-//go:build !darwin
+//go:build !darwin && !windows
package diskutils
diff --git a/erigon-lib/diskutils/diskutils_windows.go b/erigon-lib/diskutils/diskutils_windows.go
new file mode 100644
index 00000000000..854ac23ae8e
--- /dev/null
+++ b/erigon-lib/diskutils/diskutils_windows.go
@@ -0,0 +1,105 @@
+// Copyright 2024 The Erigon Authors
+// This file is part of Erigon.
+//
+// Erigon is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Erigon is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with Erigon. If not, see .
+
+//go:build windows
+
+package diskutils
+
+import (
+ "bytes"
+ "fmt"
+ "os/exec"
+ "path/filepath"
+ "strings"
+
+ shortcut "github.com/nyaosorg/go-windows-shortcut"
+)
+
+func MountPointForDirPath(dirPath string) string {
+ mountPoint := "C"
+ actualPath := SmlinkForDirPath(dirPath)
+
+ psCommand := fmt.Sprintf(`(Get-Item -Path "%s").PSDrive.Name`, actualPath)
+ cmd := exec.Command("powershell", "-Command", psCommand)
+ var out bytes.Buffer
+ cmd.Stdout = &out
+ err := cmd.Run()
+ if err == nil {
+ mountPoint = strings.TrimSpace(out.String())
+ }
+
+ mountPoint = mountPoint + ":"
+ return mountPoint
+}
+
+func SmlinkForDirPath(dirPath string) string {
+ if filepath.Ext(dirPath) == ".lnk" {
+ actualPath, _, err := shortcut.Read(dirPath)
+ if err != nil {
+ return dirPath
+ }
+
+ return actualPath
+ } else {
+ return dirPath
+ }
+}
+
+func DiskInfo(disk string) (string, error) {
+ disk = strings.TrimSuffix(disk, ":")
+ // Get the serial number for the disk with the specified drive letter
+ psCommand := fmt.Sprintf(`
+ $volume = Get-Volume -DriveLetter %s
+
+ if ($volume) {
+ # Get the partition associated with this volume
+ $partition = Get-Partition -DriveLetter %s
+
+ if ($partition) {
+ # Get the disk associated with this partition
+ $disk = Get-Disk -Number $partition.DiskNumber
+
+ if ($disk) {
+ Get-PhysicalDisk -SerialNumber $disk.SerialNumber | Select-Object DeviceID, FriendlyName, SerialNumber, MediaType, BusType, FirmwareVersion, Manufacturer, Model, Size, PartitionStyle, OperationalStatus, Usage
+ } else {
+ exit 1
+ }
+ } else {
+ exit 2
+ }
+ } else {
+ exit 3
+ }
+ `, disk, disk)
+ cmd := exec.Command("powershell", "-Command", psCommand)
+ var out bytes.Buffer
+ var stderr bytes.Buffer
+ cmd.Stdout = &out
+ cmd.Stderr = &stderr
+ err := cmd.Run()
+ if err != nil {
+ exitCode := err.(*exec.ExitError).ExitCode()
+ if exitCode == 1 {
+ return "", fmt.Errorf("error getting disk for partition with drive letter: %s", disk)
+ } else if exitCode == 2 {
+ return "", fmt.Errorf("error getting partition for volume with drive letter: %s", disk)
+ } else {
+ return "", fmt.Errorf("error getting volume with drive letter: %s", disk)
+ }
+ }
+
+ return strings.TrimSpace(out.String()), nil
+}
diff --git a/erigon-lib/downloader/README.md b/erigon-lib/downloader/README.md
index 0809ffcb883..0d1d9e2c95e 100644
--- a/erigon-lib/downloader/README.md
+++ b/erigon-lib/downloader/README.md
@@ -31,7 +31,7 @@ The sections below describe the roles of the various control structures shown in
## chain.toml
-This is an embedded file which gets its contents from the [erigon snapshots repository](https://github.com/erigontech/erigon-snapshot) during the erigon build process. It contains
+This is an embedded file which gets its contents from the [erigon seg repository](https://github.com/erigontech/erigon-snapshot) during the erigon build process. It contains
the `well know` hash for a particular segment file in the following format.
```toml
diff --git a/erigon-lib/downloader/snaptype/files.go b/erigon-lib/downloader/snaptype/files.go
index ab66860ff99..85f7cbd34c7 100644
--- a/erigon-lib/downloader/snaptype/files.go
+++ b/erigon-lib/downloader/snaptype/files.go
@@ -206,7 +206,7 @@ func AllV2Extensions() []string {
}
func SeedableV3Extensions() []string {
- return []string{".kv", ".v", ".ef"}
+ return []string{".kv", ".v", ".ef", ".ap"}
}
func AllV3Extensions() []string {
@@ -250,6 +250,9 @@ func (f FileInfo) Name() string { return f.name }
func (f FileInfo) Dir() string { return filepath.Dir(f.Path) }
func (f FileInfo) Len() uint64 { return f.To - f.From }
+func (f FileInfo) GetRange() (from, to uint64) { return f.From, f.To }
+func (f FileInfo) GetType() Type { return f.Type }
+
func (f FileInfo) CompareTo(o FileInfo) int {
if res := cmp.Compare(f.From, o.From); res != 0 {
return res
diff --git a/erigon-lib/etl/etl.go b/erigon-lib/etl/etl.go
index 366d09b88d0..f155e92faa1 100644
--- a/erigon-lib/etl/etl.go
+++ b/erigon-lib/etl/etl.go
@@ -73,7 +73,7 @@ type TransformArgs struct {
ExtractEndKey []byte
BufferType int
BufferSize int
- EmptyVals bool
+ EmptyVals bool // `v=nil` case: `false` means `Del(k)`, `true` means `Put(k, nil)`
}
func Transform(
diff --git a/erigon-lib/go.mod b/erigon-lib/go.mod
index 4b71bc29f59..3349ced41d4 100644
--- a/erigon-lib/go.mod
+++ b/erigon-lib/go.mod
@@ -1,10 +1,10 @@
module github.com/erigontech/erigon-lib
-go 1.21.5
+go 1.22.0
require (
github.com/erigontech/erigon-snapshot v1.3.1-0.20240814160410-2ce37904b978
- github.com/erigontech/interfaces v0.0.0-20240905113027-2c1accea17aa
+ github.com/erigontech/interfaces v0.0.0-20240912071218-97d86b41623a
github.com/erigontech/mdbx-go v0.38.4
github.com/erigontech/secp256k1 v1.1.0
github.com/rs/dnscache v0.0.0-20211102005908-e0241e321417
@@ -25,18 +25,19 @@ require (
github.com/erigontech/speedtest v0.0.2
github.com/go-stack/stack v1.8.1
github.com/gofrs/flock v0.12.1
- github.com/google/btree v1.1.2
+ github.com/google/btree v1.1.3
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0
github.com/hashicorp/go-retryablehttp v0.7.7
github.com/hashicorp/golang-lru/v2 v2.0.7
github.com/holiman/bloomfilter/v2 v2.0.3
github.com/holiman/uint256 v1.3.1
+ github.com/nyaosorg/go-windows-shortcut v0.0.0-20220529122037-8b0c89bca4c4
github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58
- github.com/pelletier/go-toml/v2 v2.2.2
- github.com/prometheus/client_golang v1.19.1
+ github.com/pelletier/go-toml/v2 v2.2.3
+ github.com/prometheus/client_golang v1.20.2
github.com/prometheus/client_model v0.6.1
github.com/quasilyte/go-ruleguard/dsl v0.3.22
- github.com/shirou/gopsutil/v4 v4.24.7
+ github.com/shirou/gopsutil/v4 v4.24.8
github.com/spaolacci/murmur3 v1.1.0
github.com/stretchr/testify v1.9.0
github.com/tidwall/btree v1.6.0
@@ -44,7 +45,7 @@ require (
golang.org/x/crypto v0.26.0
golang.org/x/exp v0.0.0-20231226003508-02704c960a9b
golang.org/x/sync v0.8.0
- golang.org/x/sys v0.23.0
+ golang.org/x/sys v0.24.0
golang.org/x/time v0.6.0
google.golang.org/grpc v1.65.0
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.4.0
@@ -55,6 +56,8 @@ require (
github.com/cespare/xxhash v1.1.0 // indirect
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
github.com/ianlancetaylor/cgosymbolizer v0.0.0-20240503222823-736c933a666d // indirect
+ github.com/klauspost/compress v1.17.9 // indirect
+ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/opencontainers/runtime-spec v1.2.0 // indirect
github.com/pion/udp v0.1.4 // indirect
golang.org/x/mod v0.20.0 // indirect
@@ -129,8 +132,8 @@ require (
github.com/pkg/errors v0.9.1
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
- github.com/prometheus/common v0.48.0 // indirect
- github.com/prometheus/procfs v0.12.0 // indirect
+ github.com/prometheus/common v0.55.0 // indirect
+ github.com/prometheus/procfs v0.15.1 // indirect
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
github.com/rogpeppe/go-internal v1.12.0 // indirect
github.com/shoenig/go-m1cpu v0.1.6 // indirect
diff --git a/erigon-lib/go.sum b/erigon-lib/go.sum
index b089af8c1ea..b8caf472eee 100644
--- a/erigon-lib/go.sum
+++ b/erigon-lib/go.sum
@@ -146,8 +146,8 @@ github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymF
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/erigontech/interfaces v0.0.0-20240905113027-2c1accea17aa h1:iVT7tKZN3L6Jug928bzyAu7peeslHD1QDbdbmyMyUgo=
-github.com/erigontech/interfaces v0.0.0-20240905113027-2c1accea17aa/go.mod h1:N7OUkhkcagp9+7yb4ycHsG2VWCOmuJ1ONBecJshxtLE=
+github.com/erigontech/interfaces v0.0.0-20240912071218-97d86b41623a h1:8SkMr0APaj4LiviMVfXHRqNgWmsl8mVnNb/ioMzRedE=
+github.com/erigontech/interfaces v0.0.0-20240912071218-97d86b41623a/go.mod h1:N7OUkhkcagp9+7yb4ycHsG2VWCOmuJ1ONBecJshxtLE=
github.com/erigontech/mdbx-go v0.38.4 h1:S9T7mTe9KPcFe4dOoOtVdI6gPzht9y7wMnYfUBgrQLo=
github.com/erigontech/mdbx-go v0.38.4/go.mod h1:IcOLQDPw3VM/asP6T5JVPPN4FHHgJtY16XfYjzWKVNI=
github.com/erigontech/secp256k1 v1.1.0 h1:mO3YJMUSoASE15Ya//SoHiisptUhdXExuMUN1M0X9qY=
@@ -219,8 +219,8 @@ github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8l
github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
github.com/google/btree v0.0.0-20180124185431-e89373fe6b4a/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
-github.com/google/btree v1.1.2 h1:xf4v41cLI2Z6FxbKm+8Bu+m8ifhj15JuZ9sa0jZCMUU=
-github.com/google/btree v1.1.2/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4=
+github.com/google/btree v1.1.3 h1:CVpQJjYgC4VbzxeGVHfvZrv1ctoYCAI8vbl07Fcxlyg=
+github.com/google/btree v1.1.3/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4=
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
@@ -274,6 +274,8 @@ github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfV
github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
+github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA=
+github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
@@ -285,6 +287,8 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
+github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
+github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
github.com/leanovate/gopter v0.2.9 h1:fQjYxZaynp97ozCzfOyOuAGOU4aU/z37zf/tOujFk7c=
github.com/leanovate/gopter v0.2.9/go.mod h1:U2L/78B+KVFIx2VmW6onHJQzXtFb+p5y3y2Sh+Jxxv8=
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4=
@@ -305,6 +309,8 @@ github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3Rllmb
github.com/mschoch/smat v0.0.0-20160514031455-90eadee771ae/go.mod h1:qAyveg+e4CE+eKJXWVjKXM4ck2QobLqTDytGJbLLhJg=
github.com/mschoch/smat v0.2.0 h1:8imxQsjDm8yFEAVBe7azKmKSgzSkZXDuKkSq9374khM=
github.com/mschoch/smat v0.2.0/go.mod h1:kc9mz7DoBKqDyiRL7VZN8KvXQMWeTaVnttLRXOlotKw=
+github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
+github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
github.com/ncruces/go-strftime v0.1.9 h1:bY0MQC28UADQmHmaF5dgpLmImcShSi2kHU9XLdhx/f4=
github.com/ncruces/go-strftime v0.1.9/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls=
@@ -312,6 +318,8 @@ github.com/node-real/bsc-erigon-snapshot v1.0.1-0.20240918033952-5d7a08bccf89 h1
github.com/node-real/bsc-erigon-snapshot v1.0.1-0.20240918033952-5d7a08bccf89/go.mod h1:ooHlCl+eEYzebiPu+FP6Q6SpPUeMADn8Jxabv3IKb9M=
github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
+github.com/nyaosorg/go-windows-shortcut v0.0.0-20220529122037-8b0c89bca4c4 h1:+3bXHpIl3RiBuPKlqeCZZeShGHC9RFhR/P2OJfOLRyA=
+github.com/nyaosorg/go-windows-shortcut v0.0.0-20220529122037-8b0c89bca4c4/go.mod h1:9YR30vCq/4djj0WO7AvLm48YvNs7M094LWRieEFDE4A=
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
@@ -327,8 +335,8 @@ github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFSt
github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw=
github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 h1:onHthvaw9LFnH4t2DcNVpwGmV9E1BkGknEliJkfwQj0=
github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58/go.mod h1:DXv8WO4yhMYhSNPKjeNKa5WY9YCIEBRbNzFFPJbWO6Y=
-github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM=
-github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs=
+github.com/pelletier/go-toml/v2 v2.2.3 h1:YmeHyLY8mFWbdkNWwpr+qIL2bEqT0o95WSdkNHvL12M=
+github.com/pelletier/go-toml/v2 v2.2.3/go.mod h1:MfCQTFTvCcUyyvvwm1+G6H/jORL20Xlb6rzQu9GuUkc=
github.com/philhofer/fwd v1.0.0/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU=
github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
github.com/pion/datachannel v1.5.2 h1:piB93s8LGmbECrpO84DnkIVWasRMk3IimbcXkTQLE6E=
@@ -387,8 +395,8 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP
github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs=
github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
github.com/prometheus/client_golang v1.5.1/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU=
-github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE=
-github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho=
+github.com/prometheus/client_golang v1.20.2 h1:5ctymQzZlyOON1666svgwn3s6IKWgfbjsejTMiXIyjg=
+github.com/prometheus/client_golang v1.20.2/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE=
github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
@@ -399,15 +407,15 @@ github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQy
github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4=
-github.com/prometheus/common v0.48.0 h1:QO8U2CdOzSn1BBsmXJXduaaW+dY/5QLjfB8svtSzKKE=
-github.com/prometheus/common v0.48.0/go.mod h1:0/KsvlIEfPQCQ5I2iNSAWKPZziNCvRs5EC6ILDTlAPc=
+github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc=
+github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8=
github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
github.com/prometheus/procfs v0.0.11/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
-github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo=
-github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo=
+github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
+github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
github.com/quasilyte/go-ruleguard/dsl v0.3.22 h1:wd8zkOhSNr+I+8Qeciml08ivDt1pSXe60+5DqOpCjPE=
github.com/quasilyte/go-ruleguard/dsl v0.3.22/go.mod h1:KeCP03KrjuSO0H1kTuZQCWlQPulDV6YMIXmpQss17rU=
github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
@@ -422,8 +430,8 @@ github.com/rs/dnscache v0.0.0-20211102005908-e0241e321417/go.mod h1:qe5TWALJ8/a1
github.com/ryszard/goskiplist v0.0.0-20150312221310-2dfbae5fcf46 h1:GHRpF1pTW19a8tTFrMLUcfWwyC0pnifVo2ClaLq+hP8=
github.com/ryszard/goskiplist v0.0.0-20150312221310-2dfbae5fcf46/go.mod h1:uAQ5PCi+MFsC7HjREoAz1BU+Mq60+05gifQSsHSDG/8=
github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw=
-github.com/shirou/gopsutil/v4 v4.24.7 h1:V9UGTK4gQ8HvcnPKf6Zt3XHyQq/peaekfxpJ2HSocJk=
-github.com/shirou/gopsutil/v4 v4.24.7/go.mod h1:0uW/073rP7FYLOkvxolUQM5rMOLTNmRXnFKafpb71rw=
+github.com/shirou/gopsutil/v4 v4.24.8 h1:pVQjIenQkIhqO81mwTaXjTzOMT7d3TZkf43PlVFHENI=
+github.com/shirou/gopsutil/v4 v4.24.8/go.mod h1:wE0OrJtj4dG+hYkxqDH3QiBICdKSf04/npcvLLc/oRg=
github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM=
github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ=
github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU=
@@ -443,7 +451,6 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
-github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
github.com/stretchr/testify v1.2.1/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
@@ -454,7 +461,6 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
github.com/tinylib/msgp v1.0.2/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE=
@@ -590,8 +596,8 @@ golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM=
-golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg=
+golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
diff --git a/erigon-lib/gointerfaces/downloaderproto/downloader_client_mock.go b/erigon-lib/gointerfaces/downloaderproto/downloader_client_mock.go
index ec5754de89a..031c4de59dd 100644
--- a/erigon-lib/gointerfaces/downloaderproto/downloader_client_mock.go
+++ b/erigon-lib/gointerfaces/downloaderproto/downloader_client_mock.go
@@ -217,7 +217,7 @@ func (c *MockDownloaderClientVerifyCall) DoAndReturn(f func(context.Context, *Ve
return c
}
-//SetLogPrefix mocks base method.
+// SetLogPrefix mocks base method.
func (m *MockDownloaderClient) SetLogPrefix(arg0 context.Context, arg1 *SetLogPrefixRequest, arg2 ...grpc.CallOption) (*emptypb.Empty, error) {
m.ctrl.T.Helper()
varargs := []any{arg0, arg1}
@@ -316,4 +316,4 @@ func (m *MockDownloaderClient) TorrentCompleted(arg0 context.Context, arg1 *Torr
ret0, _ := ret[0].(Downloader_TorrentCompletedClient)
ret1, _ := ret[1].(error)
return ret0, ret1
-}
\ No newline at end of file
+}
diff --git a/erigon-lib/gointerfaces/remoteproto/bor.pb.go b/erigon-lib/gointerfaces/remoteproto/bor.pb.go
new file mode 100644
index 00000000000..a78af319caf
--- /dev/null
+++ b/erigon-lib/gointerfaces/remoteproto/bor.pb.go
@@ -0,0 +1,645 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// protoc-gen-go v1.34.2
+// protoc v5.27.1
+// source: remote/bor.proto
+
+package remoteproto
+
+import (
+ typesproto "github.com/erigontech/erigon-lib/gointerfaces/typesproto"
+ protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+ protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+ emptypb "google.golang.org/protobuf/types/known/emptypb"
+ reflect "reflect"
+ sync "sync"
+)
+
+const (
+ // Verify that this generated code is sufficiently up-to-date.
+ _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
+ // Verify that runtime/protoimpl is sufficiently up-to-date.
+ _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
+)
+
+type BorTxnLookupRequest struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ BorTxHash *typesproto.H256 `protobuf:"bytes,1,opt,name=bor_tx_hash,json=borTxHash,proto3" json:"bor_tx_hash,omitempty"`
+}
+
+func (x *BorTxnLookupRequest) Reset() {
+ *x = BorTxnLookupRequest{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_remote_bor_proto_msgTypes[0]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *BorTxnLookupRequest) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*BorTxnLookupRequest) ProtoMessage() {}
+
+func (x *BorTxnLookupRequest) ProtoReflect() protoreflect.Message {
+ mi := &file_remote_bor_proto_msgTypes[0]
+ if protoimpl.UnsafeEnabled && x != nil {
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ if ms.LoadMessageInfo() == nil {
+ ms.StoreMessageInfo(mi)
+ }
+ return ms
+ }
+ return mi.MessageOf(x)
+}
+
+// Deprecated: Use BorTxnLookupRequest.ProtoReflect.Descriptor instead.
+func (*BorTxnLookupRequest) Descriptor() ([]byte, []int) {
+ return file_remote_bor_proto_rawDescGZIP(), []int{0}
+}
+
+func (x *BorTxnLookupRequest) GetBorTxHash() *typesproto.H256 {
+ if x != nil {
+ return x.BorTxHash
+ }
+ return nil
+}
+
+type BorTxnLookupReply struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Present bool `protobuf:"varint,1,opt,name=present,proto3" json:"present,omitempty"`
+ BlockNumber uint64 `protobuf:"varint,2,opt,name=block_number,json=blockNumber,proto3" json:"block_number,omitempty"`
+}
+
+func (x *BorTxnLookupReply) Reset() {
+ *x = BorTxnLookupReply{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_remote_bor_proto_msgTypes[1]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *BorTxnLookupReply) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*BorTxnLookupReply) ProtoMessage() {}
+
+func (x *BorTxnLookupReply) ProtoReflect() protoreflect.Message {
+ mi := &file_remote_bor_proto_msgTypes[1]
+ if protoimpl.UnsafeEnabled && x != nil {
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ if ms.LoadMessageInfo() == nil {
+ ms.StoreMessageInfo(mi)
+ }
+ return ms
+ }
+ return mi.MessageOf(x)
+}
+
+// Deprecated: Use BorTxnLookupReply.ProtoReflect.Descriptor instead.
+func (*BorTxnLookupReply) Descriptor() ([]byte, []int) {
+ return file_remote_bor_proto_rawDescGZIP(), []int{1}
+}
+
+func (x *BorTxnLookupReply) GetPresent() bool {
+ if x != nil {
+ return x.Present
+ }
+ return false
+}
+
+func (x *BorTxnLookupReply) GetBlockNumber() uint64 {
+ if x != nil {
+ return x.BlockNumber
+ }
+ return 0
+}
+
+type BorEventsRequest struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ BlockNum uint64 `protobuf:"varint,1,opt,name=block_num,json=blockNum,proto3" json:"block_num,omitempty"`
+ BlockHash *typesproto.H256 `protobuf:"bytes,2,opt,name=block_hash,json=blockHash,proto3" json:"block_hash,omitempty"`
+}
+
+func (x *BorEventsRequest) Reset() {
+ *x = BorEventsRequest{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_remote_bor_proto_msgTypes[2]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *BorEventsRequest) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*BorEventsRequest) ProtoMessage() {}
+
+func (x *BorEventsRequest) ProtoReflect() protoreflect.Message {
+ mi := &file_remote_bor_proto_msgTypes[2]
+ if protoimpl.UnsafeEnabled && x != nil {
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ if ms.LoadMessageInfo() == nil {
+ ms.StoreMessageInfo(mi)
+ }
+ return ms
+ }
+ return mi.MessageOf(x)
+}
+
+// Deprecated: Use BorEventsRequest.ProtoReflect.Descriptor instead.
+func (*BorEventsRequest) Descriptor() ([]byte, []int) {
+ return file_remote_bor_proto_rawDescGZIP(), []int{2}
+}
+
+func (x *BorEventsRequest) GetBlockNum() uint64 {
+ if x != nil {
+ return x.BlockNum
+ }
+ return 0
+}
+
+func (x *BorEventsRequest) GetBlockHash() *typesproto.H256 {
+ if x != nil {
+ return x.BlockHash
+ }
+ return nil
+}
+
+type BorEventsReply struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ StateReceiverContractAddress string `protobuf:"bytes,1,opt,name=state_receiver_contract_address,json=stateReceiverContractAddress,proto3" json:"state_receiver_contract_address,omitempty"`
+ EventRlps [][]byte `protobuf:"bytes,2,rep,name=event_rlps,json=eventRlps,proto3" json:"event_rlps,omitempty"`
+}
+
+func (x *BorEventsReply) Reset() {
+ *x = BorEventsReply{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_remote_bor_proto_msgTypes[3]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *BorEventsReply) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*BorEventsReply) ProtoMessage() {}
+
+func (x *BorEventsReply) ProtoReflect() protoreflect.Message {
+ mi := &file_remote_bor_proto_msgTypes[3]
+ if protoimpl.UnsafeEnabled && x != nil {
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ if ms.LoadMessageInfo() == nil {
+ ms.StoreMessageInfo(mi)
+ }
+ return ms
+ }
+ return mi.MessageOf(x)
+}
+
+// Deprecated: Use BorEventsReply.ProtoReflect.Descriptor instead.
+func (*BorEventsReply) Descriptor() ([]byte, []int) {
+ return file_remote_bor_proto_rawDescGZIP(), []int{3}
+}
+
+func (x *BorEventsReply) GetStateReceiverContractAddress() string {
+ if x != nil {
+ return x.StateReceiverContractAddress
+ }
+ return ""
+}
+
+func (x *BorEventsReply) GetEventRlps() [][]byte {
+ if x != nil {
+ return x.EventRlps
+ }
+ return nil
+}
+
+type BorProducersRequest struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ BlockNum uint64 `protobuf:"varint,1,opt,name=block_num,json=blockNum,proto3" json:"block_num,omitempty"`
+}
+
+func (x *BorProducersRequest) Reset() {
+ *x = BorProducersRequest{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_remote_bor_proto_msgTypes[4]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *BorProducersRequest) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*BorProducersRequest) ProtoMessage() {}
+
+func (x *BorProducersRequest) ProtoReflect() protoreflect.Message {
+ mi := &file_remote_bor_proto_msgTypes[4]
+ if protoimpl.UnsafeEnabled && x != nil {
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ if ms.LoadMessageInfo() == nil {
+ ms.StoreMessageInfo(mi)
+ }
+ return ms
+ }
+ return mi.MessageOf(x)
+}
+
+// Deprecated: Use BorProducersRequest.ProtoReflect.Descriptor instead.
+func (*BorProducersRequest) Descriptor() ([]byte, []int) {
+ return file_remote_bor_proto_rawDescGZIP(), []int{4}
+}
+
+func (x *BorProducersRequest) GetBlockNum() uint64 {
+ if x != nil {
+ return x.BlockNum
+ }
+ return 0
+}
+
+type BorProducersResponse struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Proposer *Validator `protobuf:"bytes,1,opt,name=proposer,proto3" json:"proposer,omitempty"`
+ Validators []*Validator `protobuf:"bytes,2,rep,name=validators,proto3" json:"validators,omitempty"`
+}
+
+func (x *BorProducersResponse) Reset() {
+ *x = BorProducersResponse{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_remote_bor_proto_msgTypes[5]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *BorProducersResponse) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*BorProducersResponse) ProtoMessage() {}
+
+func (x *BorProducersResponse) ProtoReflect() protoreflect.Message {
+ mi := &file_remote_bor_proto_msgTypes[5]
+ if protoimpl.UnsafeEnabled && x != nil {
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ if ms.LoadMessageInfo() == nil {
+ ms.StoreMessageInfo(mi)
+ }
+ return ms
+ }
+ return mi.MessageOf(x)
+}
+
+// Deprecated: Use BorProducersResponse.ProtoReflect.Descriptor instead.
+func (*BorProducersResponse) Descriptor() ([]byte, []int) {
+ return file_remote_bor_proto_rawDescGZIP(), []int{5}
+}
+
+func (x *BorProducersResponse) GetProposer() *Validator {
+ if x != nil {
+ return x.Proposer
+ }
+ return nil
+}
+
+func (x *BorProducersResponse) GetValidators() []*Validator {
+ if x != nil {
+ return x.Validators
+ }
+ return nil
+}
+
+type Validator struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Id uint64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"`
+ Address *typesproto.H160 `protobuf:"bytes,2,opt,name=address,proto3" json:"address,omitempty"`
+ VotingPower int64 `protobuf:"varint,3,opt,name=voting_power,json=votingPower,proto3" json:"voting_power,omitempty"`
+ ProposerPriority int64 `protobuf:"varint,4,opt,name=proposer_priority,json=proposerPriority,proto3" json:"proposer_priority,omitempty"`
+}
+
+func (x *Validator) Reset() {
+ *x = Validator{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_remote_bor_proto_msgTypes[6]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *Validator) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*Validator) ProtoMessage() {}
+
+func (x *Validator) ProtoReflect() protoreflect.Message {
+ mi := &file_remote_bor_proto_msgTypes[6]
+ if protoimpl.UnsafeEnabled && x != nil {
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ if ms.LoadMessageInfo() == nil {
+ ms.StoreMessageInfo(mi)
+ }
+ return ms
+ }
+ return mi.MessageOf(x)
+}
+
+// Deprecated: Use Validator.ProtoReflect.Descriptor instead.
+func (*Validator) Descriptor() ([]byte, []int) {
+ return file_remote_bor_proto_rawDescGZIP(), []int{6}
+}
+
+func (x *Validator) GetId() uint64 {
+ if x != nil {
+ return x.Id
+ }
+ return 0
+}
+
+func (x *Validator) GetAddress() *typesproto.H160 {
+ if x != nil {
+ return x.Address
+ }
+ return nil
+}
+
+func (x *Validator) GetVotingPower() int64 {
+ if x != nil {
+ return x.VotingPower
+ }
+ return 0
+}
+
+func (x *Validator) GetProposerPriority() int64 {
+ if x != nil {
+ return x.ProposerPriority
+ }
+ return 0
+}
+
+var File_remote_bor_proto protoreflect.FileDescriptor
+
+var file_remote_bor_proto_rawDesc = []byte{
+ 0x0a, 0x10, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x2f, 0x62, 0x6f, 0x72, 0x2e, 0x70, 0x72, 0x6f,
+ 0x74, 0x6f, 0x12, 0x06, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x1a, 0x1b, 0x67, 0x6f, 0x6f, 0x67,
+ 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x65, 0x6d, 0x70, 0x74,
+ 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x11, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x74,
+ 0x79, 0x70, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x42, 0x0a, 0x13, 0x42, 0x6f,
+ 0x72, 0x54, 0x78, 0x6e, 0x4c, 0x6f, 0x6f, 0x6b, 0x75, 0x70, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
+ 0x74, 0x12, 0x2b, 0x0a, 0x0b, 0x62, 0x6f, 0x72, 0x5f, 0x74, 0x78, 0x5f, 0x68, 0x61, 0x73, 0x68,
+ 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x48,
+ 0x32, 0x35, 0x36, 0x52, 0x09, 0x62, 0x6f, 0x72, 0x54, 0x78, 0x48, 0x61, 0x73, 0x68, 0x22, 0x50,
+ 0x0a, 0x11, 0x42, 0x6f, 0x72, 0x54, 0x78, 0x6e, 0x4c, 0x6f, 0x6f, 0x6b, 0x75, 0x70, 0x52, 0x65,
+ 0x70, 0x6c, 0x79, 0x12, 0x18, 0x0a, 0x07, 0x70, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x74, 0x18, 0x01,
+ 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x70, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x74, 0x12, 0x21, 0x0a,
+ 0x0c, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x02, 0x20,
+ 0x01, 0x28, 0x04, 0x52, 0x0b, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72,
+ 0x22, 0x5b, 0x0a, 0x10, 0x42, 0x6f, 0x72, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x52, 0x65, 0x71,
+ 0x75, 0x65, 0x73, 0x74, 0x12, 0x1b, 0x0a, 0x09, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x6e, 0x75,
+ 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x08, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x4e, 0x75,
+ 0x6d, 0x12, 0x2a, 0x0a, 0x0a, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18,
+ 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x48, 0x32,
+ 0x35, 0x36, 0x52, 0x09, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x48, 0x61, 0x73, 0x68, 0x22, 0x76, 0x0a,
+ 0x0e, 0x42, 0x6f, 0x72, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12,
+ 0x45, 0x0a, 0x1f, 0x73, 0x74, 0x61, 0x74, 0x65, 0x5f, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65,
+ 0x72, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65,
+ 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x1c, 0x73, 0x74, 0x61, 0x74, 0x65, 0x52,
+ 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x41,
+ 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x1d, 0x0a, 0x0a, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x5f,
+ 0x72, 0x6c, 0x70, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0c, 0x52, 0x09, 0x65, 0x76, 0x65, 0x6e,
+ 0x74, 0x52, 0x6c, 0x70, 0x73, 0x22, 0x32, 0x0a, 0x13, 0x42, 0x6f, 0x72, 0x50, 0x72, 0x6f, 0x64,
+ 0x75, 0x63, 0x65, 0x72, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1b, 0x0a, 0x09,
+ 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x6e, 0x75, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52,
+ 0x08, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x4e, 0x75, 0x6d, 0x22, 0x78, 0x0a, 0x14, 0x42, 0x6f, 0x72,
+ 0x50, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x65, 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+ 0x65, 0x12, 0x2d, 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x65, 0x72, 0x18, 0x01, 0x20,
+ 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x2e, 0x56, 0x61, 0x6c,
+ 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x65, 0x72,
+ 0x12, 0x31, 0x0a, 0x0a, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x73, 0x18, 0x02,
+ 0x20, 0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x2e, 0x56, 0x61,
+ 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x52, 0x0a, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74,
+ 0x6f, 0x72, 0x73, 0x22, 0x92, 0x01, 0x0a, 0x09, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f,
+ 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x02, 0x69,
+ 0x64, 0x12, 0x25, 0x0a, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x02, 0x20, 0x01,
+ 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x48, 0x31, 0x36, 0x30, 0x52,
+ 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x21, 0x0a, 0x0c, 0x76, 0x6f, 0x74, 0x69,
+ 0x6e, 0x67, 0x5f, 0x70, 0x6f, 0x77, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b,
+ 0x76, 0x6f, 0x74, 0x69, 0x6e, 0x67, 0x50, 0x6f, 0x77, 0x65, 0x72, 0x12, 0x2b, 0x0a, 0x11, 0x70,
+ 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x65, 0x72, 0x5f, 0x70, 0x72, 0x69, 0x6f, 0x72, 0x69, 0x74, 0x79,
+ 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x10, 0x70, 0x72, 0x6f, 0x70, 0x6f, 0x73, 0x65, 0x72,
+ 0x50, 0x72, 0x69, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x32, 0xce, 0x01, 0x0a, 0x0d, 0x42, 0x72, 0x69,
+ 0x64, 0x67, 0x65, 0x42, 0x61, 0x63, 0x6b, 0x65, 0x6e, 0x64, 0x12, 0x36, 0x0a, 0x07, 0x56, 0x65,
+ 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70,
+ 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x13, 0x2e,
+ 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x70,
+ 0x6c, 0x79, 0x12, 0x46, 0x0a, 0x0c, 0x42, 0x6f, 0x72, 0x54, 0x78, 0x6e, 0x4c, 0x6f, 0x6f, 0x6b,
+ 0x75, 0x70, 0x12, 0x1b, 0x2e, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x2e, 0x42, 0x6f, 0x72, 0x54,
+ 0x78, 0x6e, 0x4c, 0x6f, 0x6f, 0x6b, 0x75, 0x70, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
+ 0x19, 0x2e, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x2e, 0x42, 0x6f, 0x72, 0x54, 0x78, 0x6e, 0x4c,
+ 0x6f, 0x6f, 0x6b, 0x75, 0x70, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x3d, 0x0a, 0x09, 0x42, 0x6f,
+ 0x72, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x12, 0x18, 0x2e, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65,
+ 0x2e, 0x42, 0x6f, 0x72, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
+ 0x74, 0x1a, 0x16, 0x2e, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x2e, 0x42, 0x6f, 0x72, 0x45, 0x76,
+ 0x65, 0x6e, 0x74, 0x73, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x32, 0x91, 0x01, 0x0a, 0x0f, 0x48, 0x65,
+ 0x69, 0x6d, 0x64, 0x61, 0x6c, 0x6c, 0x42, 0x61, 0x63, 0x6b, 0x65, 0x6e, 0x64, 0x12, 0x36, 0x0a,
+ 0x07, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
+ 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79,
+ 0x1a, 0x13, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e,
+ 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x46, 0x0a, 0x09, 0x50, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x65,
+ 0x72, 0x73, 0x12, 0x1b, 0x2e, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x2e, 0x42, 0x6f, 0x72, 0x50,
+ 0x72, 0x6f, 0x64, 0x75, 0x63, 0x65, 0x72, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
+ 0x1c, 0x2e, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x2e, 0x42, 0x6f, 0x72, 0x50, 0x72, 0x6f, 0x64,
+ 0x75, 0x63, 0x65, 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0x16, 0x5a,
+ 0x14, 0x2e, 0x2f, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x3b, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65,
+ 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+}
+
+var (
+ file_remote_bor_proto_rawDescOnce sync.Once
+ file_remote_bor_proto_rawDescData = file_remote_bor_proto_rawDesc
+)
+
+func file_remote_bor_proto_rawDescGZIP() []byte {
+ file_remote_bor_proto_rawDescOnce.Do(func() {
+ file_remote_bor_proto_rawDescData = protoimpl.X.CompressGZIP(file_remote_bor_proto_rawDescData)
+ })
+ return file_remote_bor_proto_rawDescData
+}
+
+var file_remote_bor_proto_msgTypes = make([]protoimpl.MessageInfo, 7)
+var file_remote_bor_proto_goTypes = []any{
+ (*BorTxnLookupRequest)(nil), // 0: remote.BorTxnLookupRequest
+ (*BorTxnLookupReply)(nil), // 1: remote.BorTxnLookupReply
+ (*BorEventsRequest)(nil), // 2: remote.BorEventsRequest
+ (*BorEventsReply)(nil), // 3: remote.BorEventsReply
+ (*BorProducersRequest)(nil), // 4: remote.BorProducersRequest
+ (*BorProducersResponse)(nil), // 5: remote.BorProducersResponse
+ (*Validator)(nil), // 6: remote.Validator
+ (*typesproto.H256)(nil), // 7: types.H256
+ (*typesproto.H160)(nil), // 8: types.H160
+ (*emptypb.Empty)(nil), // 9: google.protobuf.Empty
+ (*typesproto.VersionReply)(nil), // 10: types.VersionReply
+}
+var file_remote_bor_proto_depIdxs = []int32{
+ 7, // 0: remote.BorTxnLookupRequest.bor_tx_hash:type_name -> types.H256
+ 7, // 1: remote.BorEventsRequest.block_hash:type_name -> types.H256
+ 6, // 2: remote.BorProducersResponse.proposer:type_name -> remote.Validator
+ 6, // 3: remote.BorProducersResponse.validators:type_name -> remote.Validator
+ 8, // 4: remote.Validator.address:type_name -> types.H160
+ 9, // 5: remote.BridgeBackend.Version:input_type -> google.protobuf.Empty
+ 0, // 6: remote.BridgeBackend.BorTxnLookup:input_type -> remote.BorTxnLookupRequest
+ 2, // 7: remote.BridgeBackend.BorEvents:input_type -> remote.BorEventsRequest
+ 9, // 8: remote.HeimdallBackend.Version:input_type -> google.protobuf.Empty
+ 4, // 9: remote.HeimdallBackend.Producers:input_type -> remote.BorProducersRequest
+ 10, // 10: remote.BridgeBackend.Version:output_type -> types.VersionReply
+ 1, // 11: remote.BridgeBackend.BorTxnLookup:output_type -> remote.BorTxnLookupReply
+ 3, // 12: remote.BridgeBackend.BorEvents:output_type -> remote.BorEventsReply
+ 10, // 13: remote.HeimdallBackend.Version:output_type -> types.VersionReply
+ 5, // 14: remote.HeimdallBackend.Producers:output_type -> remote.BorProducersResponse
+ 10, // [10:15] is the sub-list for method output_type
+ 5, // [5:10] is the sub-list for method input_type
+ 5, // [5:5] is the sub-list for extension type_name
+ 5, // [5:5] is the sub-list for extension extendee
+ 0, // [0:5] is the sub-list for field type_name
+}
+
+func init() { file_remote_bor_proto_init() }
+func file_remote_bor_proto_init() {
+ if File_remote_bor_proto != nil {
+ return
+ }
+ if !protoimpl.UnsafeEnabled {
+ file_remote_bor_proto_msgTypes[0].Exporter = func(v any, i int) any {
+ switch v := v.(*BorTxnLookupRequest); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_remote_bor_proto_msgTypes[1].Exporter = func(v any, i int) any {
+ switch v := v.(*BorTxnLookupReply); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_remote_bor_proto_msgTypes[2].Exporter = func(v any, i int) any {
+ switch v := v.(*BorEventsRequest); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_remote_bor_proto_msgTypes[3].Exporter = func(v any, i int) any {
+ switch v := v.(*BorEventsReply); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_remote_bor_proto_msgTypes[4].Exporter = func(v any, i int) any {
+ switch v := v.(*BorProducersRequest); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_remote_bor_proto_msgTypes[5].Exporter = func(v any, i int) any {
+ switch v := v.(*BorProducersResponse); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_remote_bor_proto_msgTypes[6].Exporter = func(v any, i int) any {
+ switch v := v.(*Validator); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ }
+ type x struct{}
+ out := protoimpl.TypeBuilder{
+ File: protoimpl.DescBuilder{
+ GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
+ RawDescriptor: file_remote_bor_proto_rawDesc,
+ NumEnums: 0,
+ NumMessages: 7,
+ NumExtensions: 0,
+ NumServices: 2,
+ },
+ GoTypes: file_remote_bor_proto_goTypes,
+ DependencyIndexes: file_remote_bor_proto_depIdxs,
+ MessageInfos: file_remote_bor_proto_msgTypes,
+ }.Build()
+ File_remote_bor_proto = out.File
+ file_remote_bor_proto_rawDesc = nil
+ file_remote_bor_proto_goTypes = nil
+ file_remote_bor_proto_depIdxs = nil
+}
diff --git a/erigon-lib/gointerfaces/remoteproto/bor_grpc.pb.go b/erigon-lib/gointerfaces/remoteproto/bor_grpc.pb.go
new file mode 100644
index 00000000000..1bedc1c5378
--- /dev/null
+++ b/erigon-lib/gointerfaces/remoteproto/bor_grpc.pb.go
@@ -0,0 +1,321 @@
+// Code generated by protoc-gen-go-grpc. DO NOT EDIT.
+// versions:
+// - protoc-gen-go-grpc v1.4.0
+// - protoc v5.27.1
+// source: remote/bor.proto
+
+package remoteproto
+
+import (
+ context "context"
+ typesproto "github.com/erigontech/erigon-lib/gointerfaces/typesproto"
+ grpc "google.golang.org/grpc"
+ codes "google.golang.org/grpc/codes"
+ status "google.golang.org/grpc/status"
+ emptypb "google.golang.org/protobuf/types/known/emptypb"
+)
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the grpc package it is being compiled against.
+// Requires gRPC-Go v1.62.0 or later.
+const _ = grpc.SupportPackageIsVersion8
+
+const (
+ BridgeBackend_Version_FullMethodName = "/remote.BridgeBackend/Version"
+ BridgeBackend_BorTxnLookup_FullMethodName = "/remote.BridgeBackend/BorTxnLookup"
+ BridgeBackend_BorEvents_FullMethodName = "/remote.BridgeBackend/BorEvents"
+)
+
+// BridgeBackendClient is the client API for BridgeBackend service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
+type BridgeBackendClient interface {
+ // Version returns the service version number
+ Version(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*typesproto.VersionReply, error)
+ BorTxnLookup(ctx context.Context, in *BorTxnLookupRequest, opts ...grpc.CallOption) (*BorTxnLookupReply, error)
+ BorEvents(ctx context.Context, in *BorEventsRequest, opts ...grpc.CallOption) (*BorEventsReply, error)
+}
+
+type bridgeBackendClient struct {
+ cc grpc.ClientConnInterface
+}
+
+func NewBridgeBackendClient(cc grpc.ClientConnInterface) BridgeBackendClient {
+ return &bridgeBackendClient{cc}
+}
+
+func (c *bridgeBackendClient) Version(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*typesproto.VersionReply, error) {
+ cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
+ out := new(typesproto.VersionReply)
+ err := c.cc.Invoke(ctx, BridgeBackend_Version_FullMethodName, in, out, cOpts...)
+ if err != nil {
+ return nil, err
+ }
+ return out, nil
+}
+
+func (c *bridgeBackendClient) BorTxnLookup(ctx context.Context, in *BorTxnLookupRequest, opts ...grpc.CallOption) (*BorTxnLookupReply, error) {
+ cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
+ out := new(BorTxnLookupReply)
+ err := c.cc.Invoke(ctx, BridgeBackend_BorTxnLookup_FullMethodName, in, out, cOpts...)
+ if err != nil {
+ return nil, err
+ }
+ return out, nil
+}
+
+func (c *bridgeBackendClient) BorEvents(ctx context.Context, in *BorEventsRequest, opts ...grpc.CallOption) (*BorEventsReply, error) {
+ cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
+ out := new(BorEventsReply)
+ err := c.cc.Invoke(ctx, BridgeBackend_BorEvents_FullMethodName, in, out, cOpts...)
+ if err != nil {
+ return nil, err
+ }
+ return out, nil
+}
+
+// BridgeBackendServer is the server API for BridgeBackend service.
+// All implementations must embed UnimplementedBridgeBackendServer
+// for forward compatibility
+type BridgeBackendServer interface {
+ // Version returns the service version number
+ Version(context.Context, *emptypb.Empty) (*typesproto.VersionReply, error)
+ BorTxnLookup(context.Context, *BorTxnLookupRequest) (*BorTxnLookupReply, error)
+ BorEvents(context.Context, *BorEventsRequest) (*BorEventsReply, error)
+ mustEmbedUnimplementedBridgeBackendServer()
+}
+
+// UnimplementedBridgeBackendServer must be embedded to have forward compatible implementations.
+type UnimplementedBridgeBackendServer struct {
+}
+
+func (UnimplementedBridgeBackendServer) Version(context.Context, *emptypb.Empty) (*typesproto.VersionReply, error) {
+ return nil, status.Errorf(codes.Unimplemented, "method Version not implemented")
+}
+func (UnimplementedBridgeBackendServer) BorTxnLookup(context.Context, *BorTxnLookupRequest) (*BorTxnLookupReply, error) {
+ return nil, status.Errorf(codes.Unimplemented, "method BorTxnLookup not implemented")
+}
+func (UnimplementedBridgeBackendServer) BorEvents(context.Context, *BorEventsRequest) (*BorEventsReply, error) {
+ return nil, status.Errorf(codes.Unimplemented, "method BorEvents not implemented")
+}
+func (UnimplementedBridgeBackendServer) mustEmbedUnimplementedBridgeBackendServer() {}
+
+// UnsafeBridgeBackendServer may be embedded to opt out of forward compatibility for this service.
+// Use of this interface is not recommended, as added methods to BridgeBackendServer will
+// result in compilation errors.
+type UnsafeBridgeBackendServer interface {
+ mustEmbedUnimplementedBridgeBackendServer()
+}
+
+func RegisterBridgeBackendServer(s grpc.ServiceRegistrar, srv BridgeBackendServer) {
+ s.RegisterService(&BridgeBackend_ServiceDesc, srv)
+}
+
+func _BridgeBackend_Version_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+ in := new(emptypb.Empty)
+ if err := dec(in); err != nil {
+ return nil, err
+ }
+ if interceptor == nil {
+ return srv.(BridgeBackendServer).Version(ctx, in)
+ }
+ info := &grpc.UnaryServerInfo{
+ Server: srv,
+ FullMethod: BridgeBackend_Version_FullMethodName,
+ }
+ handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+ return srv.(BridgeBackendServer).Version(ctx, req.(*emptypb.Empty))
+ }
+ return interceptor(ctx, in, info, handler)
+}
+
+func _BridgeBackend_BorTxnLookup_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+ in := new(BorTxnLookupRequest)
+ if err := dec(in); err != nil {
+ return nil, err
+ }
+ if interceptor == nil {
+ return srv.(BridgeBackendServer).BorTxnLookup(ctx, in)
+ }
+ info := &grpc.UnaryServerInfo{
+ Server: srv,
+ FullMethod: BridgeBackend_BorTxnLookup_FullMethodName,
+ }
+ handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+ return srv.(BridgeBackendServer).BorTxnLookup(ctx, req.(*BorTxnLookupRequest))
+ }
+ return interceptor(ctx, in, info, handler)
+}
+
+func _BridgeBackend_BorEvents_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+ in := new(BorEventsRequest)
+ if err := dec(in); err != nil {
+ return nil, err
+ }
+ if interceptor == nil {
+ return srv.(BridgeBackendServer).BorEvents(ctx, in)
+ }
+ info := &grpc.UnaryServerInfo{
+ Server: srv,
+ FullMethod: BridgeBackend_BorEvents_FullMethodName,
+ }
+ handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+ return srv.(BridgeBackendServer).BorEvents(ctx, req.(*BorEventsRequest))
+ }
+ return interceptor(ctx, in, info, handler)
+}
+
+// BridgeBackend_ServiceDesc is the grpc.ServiceDesc for BridgeBackend service.
+// It's only intended for direct use with grpc.RegisterService,
+// and not to be introspected or modified (even as a copy)
+var BridgeBackend_ServiceDesc = grpc.ServiceDesc{
+ ServiceName: "remote.BridgeBackend",
+ HandlerType: (*BridgeBackendServer)(nil),
+ Methods: []grpc.MethodDesc{
+ {
+ MethodName: "Version",
+ Handler: _BridgeBackend_Version_Handler,
+ },
+ {
+ MethodName: "BorTxnLookup",
+ Handler: _BridgeBackend_BorTxnLookup_Handler,
+ },
+ {
+ MethodName: "BorEvents",
+ Handler: _BridgeBackend_BorEvents_Handler,
+ },
+ },
+ Streams: []grpc.StreamDesc{},
+ Metadata: "remote/bor.proto",
+}
+
+const (
+ HeimdallBackend_Version_FullMethodName = "/remote.HeimdallBackend/Version"
+ HeimdallBackend_Producers_FullMethodName = "/remote.HeimdallBackend/Producers"
+)
+
+// HeimdallBackendClient is the client API for HeimdallBackend service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
+type HeimdallBackendClient interface {
+ // Version returns the service version number
+ Version(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*typesproto.VersionReply, error)
+ Producers(ctx context.Context, in *BorProducersRequest, opts ...grpc.CallOption) (*BorProducersResponse, error)
+}
+
+type heimdallBackendClient struct {
+ cc grpc.ClientConnInterface
+}
+
+func NewHeimdallBackendClient(cc grpc.ClientConnInterface) HeimdallBackendClient {
+ return &heimdallBackendClient{cc}
+}
+
+func (c *heimdallBackendClient) Version(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*typesproto.VersionReply, error) {
+ cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
+ out := new(typesproto.VersionReply)
+ err := c.cc.Invoke(ctx, HeimdallBackend_Version_FullMethodName, in, out, cOpts...)
+ if err != nil {
+ return nil, err
+ }
+ return out, nil
+}
+
+func (c *heimdallBackendClient) Producers(ctx context.Context, in *BorProducersRequest, opts ...grpc.CallOption) (*BorProducersResponse, error) {
+ cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
+ out := new(BorProducersResponse)
+ err := c.cc.Invoke(ctx, HeimdallBackend_Producers_FullMethodName, in, out, cOpts...)
+ if err != nil {
+ return nil, err
+ }
+ return out, nil
+}
+
+// HeimdallBackendServer is the server API for HeimdallBackend service.
+// All implementations must embed UnimplementedHeimdallBackendServer
+// for forward compatibility
+type HeimdallBackendServer interface {
+ // Version returns the service version number
+ Version(context.Context, *emptypb.Empty) (*typesproto.VersionReply, error)
+ Producers(context.Context, *BorProducersRequest) (*BorProducersResponse, error)
+ mustEmbedUnimplementedHeimdallBackendServer()
+}
+
+// UnimplementedHeimdallBackendServer must be embedded to have forward compatible implementations.
+type UnimplementedHeimdallBackendServer struct {
+}
+
+func (UnimplementedHeimdallBackendServer) Version(context.Context, *emptypb.Empty) (*typesproto.VersionReply, error) {
+ return nil, status.Errorf(codes.Unimplemented, "method Version not implemented")
+}
+func (UnimplementedHeimdallBackendServer) Producers(context.Context, *BorProducersRequest) (*BorProducersResponse, error) {
+ return nil, status.Errorf(codes.Unimplemented, "method Producers not implemented")
+}
+func (UnimplementedHeimdallBackendServer) mustEmbedUnimplementedHeimdallBackendServer() {}
+
+// UnsafeHeimdallBackendServer may be embedded to opt out of forward compatibility for this service.
+// Use of this interface is not recommended, as added methods to HeimdallBackendServer will
+// result in compilation errors.
+type UnsafeHeimdallBackendServer interface {
+ mustEmbedUnimplementedHeimdallBackendServer()
+}
+
+func RegisterHeimdallBackendServer(s grpc.ServiceRegistrar, srv HeimdallBackendServer) {
+ s.RegisterService(&HeimdallBackend_ServiceDesc, srv)
+}
+
+func _HeimdallBackend_Version_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+ in := new(emptypb.Empty)
+ if err := dec(in); err != nil {
+ return nil, err
+ }
+ if interceptor == nil {
+ return srv.(HeimdallBackendServer).Version(ctx, in)
+ }
+ info := &grpc.UnaryServerInfo{
+ Server: srv,
+ FullMethod: HeimdallBackend_Version_FullMethodName,
+ }
+ handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+ return srv.(HeimdallBackendServer).Version(ctx, req.(*emptypb.Empty))
+ }
+ return interceptor(ctx, in, info, handler)
+}
+
+func _HeimdallBackend_Producers_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+ in := new(BorProducersRequest)
+ if err := dec(in); err != nil {
+ return nil, err
+ }
+ if interceptor == nil {
+ return srv.(HeimdallBackendServer).Producers(ctx, in)
+ }
+ info := &grpc.UnaryServerInfo{
+ Server: srv,
+ FullMethod: HeimdallBackend_Producers_FullMethodName,
+ }
+ handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+ return srv.(HeimdallBackendServer).Producers(ctx, req.(*BorProducersRequest))
+ }
+ return interceptor(ctx, in, info, handler)
+}
+
+// HeimdallBackend_ServiceDesc is the grpc.ServiceDesc for HeimdallBackend service.
+// It's only intended for direct use with grpc.RegisterService,
+// and not to be introspected or modified (even as a copy)
+var HeimdallBackend_ServiceDesc = grpc.ServiceDesc{
+ ServiceName: "remote.HeimdallBackend",
+ HandlerType: (*HeimdallBackendServer)(nil),
+ Methods: []grpc.MethodDesc{
+ {
+ MethodName: "Version",
+ Handler: _HeimdallBackend_Version_Handler,
+ },
+ {
+ MethodName: "Producers",
+ Handler: _HeimdallBackend_Producers_Handler,
+ },
+ },
+ Streams: []grpc.StreamDesc{},
+ Metadata: "remote/bor.proto",
+}
diff --git a/erigon-lib/gointerfaces/remoteproto/ethbackend.pb.go b/erigon-lib/gointerfaces/remoteproto/ethbackend.pb.go
index 0c823fc6d22..5f1d33cad37 100644
--- a/erigon-lib/gointerfaces/remoteproto/ethbackend.pb.go
+++ b/erigon-lib/gointerfaces/remoteproto/ethbackend.pb.go
@@ -1656,210 +1656,6 @@ func (x *EngineGetPayloadBodiesByRangeV1Request) GetCount() uint64 {
return 0
}
-type BorTxnLookupRequest struct {
- state protoimpl.MessageState
- sizeCache protoimpl.SizeCache
- unknownFields protoimpl.UnknownFields
-
- BorTxHash *typesproto.H256 `protobuf:"bytes,1,opt,name=bor_tx_hash,json=borTxHash,proto3" json:"bor_tx_hash,omitempty"`
-}
-
-func (x *BorTxnLookupRequest) Reset() {
- *x = BorTxnLookupRequest{}
- if protoimpl.UnsafeEnabled {
- mi := &file_remote_ethbackend_proto_msgTypes[32]
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- ms.StoreMessageInfo(mi)
- }
-}
-
-func (x *BorTxnLookupRequest) String() string {
- return protoimpl.X.MessageStringOf(x)
-}
-
-func (*BorTxnLookupRequest) ProtoMessage() {}
-
-func (x *BorTxnLookupRequest) ProtoReflect() protoreflect.Message {
- mi := &file_remote_ethbackend_proto_msgTypes[32]
- if protoimpl.UnsafeEnabled && x != nil {
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- if ms.LoadMessageInfo() == nil {
- ms.StoreMessageInfo(mi)
- }
- return ms
- }
- return mi.MessageOf(x)
-}
-
-// Deprecated: Use BorTxnLookupRequest.ProtoReflect.Descriptor instead.
-func (*BorTxnLookupRequest) Descriptor() ([]byte, []int) {
- return file_remote_ethbackend_proto_rawDescGZIP(), []int{32}
-}
-
-func (x *BorTxnLookupRequest) GetBorTxHash() *typesproto.H256 {
- if x != nil {
- return x.BorTxHash
- }
- return nil
-}
-
-type BorTxnLookupReply struct {
- state protoimpl.MessageState
- sizeCache protoimpl.SizeCache
- unknownFields protoimpl.UnknownFields
-
- Present bool `protobuf:"varint,1,opt,name=present,proto3" json:"present,omitempty"`
- BlockNumber uint64 `protobuf:"varint,2,opt,name=block_number,json=blockNumber,proto3" json:"block_number,omitempty"`
-}
-
-func (x *BorTxnLookupReply) Reset() {
- *x = BorTxnLookupReply{}
- if protoimpl.UnsafeEnabled {
- mi := &file_remote_ethbackend_proto_msgTypes[33]
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- ms.StoreMessageInfo(mi)
- }
-}
-
-func (x *BorTxnLookupReply) String() string {
- return protoimpl.X.MessageStringOf(x)
-}
-
-func (*BorTxnLookupReply) ProtoMessage() {}
-
-func (x *BorTxnLookupReply) ProtoReflect() protoreflect.Message {
- mi := &file_remote_ethbackend_proto_msgTypes[33]
- if protoimpl.UnsafeEnabled && x != nil {
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- if ms.LoadMessageInfo() == nil {
- ms.StoreMessageInfo(mi)
- }
- return ms
- }
- return mi.MessageOf(x)
-}
-
-// Deprecated: Use BorTxnLookupReply.ProtoReflect.Descriptor instead.
-func (*BorTxnLookupReply) Descriptor() ([]byte, []int) {
- return file_remote_ethbackend_proto_rawDescGZIP(), []int{33}
-}
-
-func (x *BorTxnLookupReply) GetPresent() bool {
- if x != nil {
- return x.Present
- }
- return false
-}
-
-func (x *BorTxnLookupReply) GetBlockNumber() uint64 {
- if x != nil {
- return x.BlockNumber
- }
- return 0
-}
-
-type BorEventsRequest struct {
- state protoimpl.MessageState
- sizeCache protoimpl.SizeCache
- unknownFields protoimpl.UnknownFields
-
- BlockNum uint64 `protobuf:"varint,1,opt,name=block_num,json=blockNum,proto3" json:"block_num,omitempty"`
- BlockHash *typesproto.H256 `protobuf:"bytes,2,opt,name=block_hash,json=blockHash,proto3" json:"block_hash,omitempty"`
-}
-
-func (x *BorEventsRequest) Reset() {
- *x = BorEventsRequest{}
- if protoimpl.UnsafeEnabled {
- mi := &file_remote_ethbackend_proto_msgTypes[34]
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- ms.StoreMessageInfo(mi)
- }
-}
-
-func (x *BorEventsRequest) String() string {
- return protoimpl.X.MessageStringOf(x)
-}
-
-func (*BorEventsRequest) ProtoMessage() {}
-
-func (x *BorEventsRequest) ProtoReflect() protoreflect.Message {
- mi := &file_remote_ethbackend_proto_msgTypes[34]
- if protoimpl.UnsafeEnabled && x != nil {
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- if ms.LoadMessageInfo() == nil {
- ms.StoreMessageInfo(mi)
- }
- return ms
- }
- return mi.MessageOf(x)
-}
-
-// Deprecated: Use BorEventsRequest.ProtoReflect.Descriptor instead.
-func (*BorEventsRequest) Descriptor() ([]byte, []int) {
- return file_remote_ethbackend_proto_rawDescGZIP(), []int{34}
-}
-
-func (x *BorEventsRequest) GetBlockNum() uint64 {
- if x != nil {
- return x.BlockNum
- }
- return 0
-}
-
-func (x *BorEventsRequest) GetBlockHash() *typesproto.H256 {
- if x != nil {
- return x.BlockHash
- }
- return nil
-}
-
-type BorEventsReply struct {
- state protoimpl.MessageState
- sizeCache protoimpl.SizeCache
- unknownFields protoimpl.UnknownFields
-
- EventRlps [][]byte `protobuf:"bytes,1,rep,name=event_rlps,json=eventRlps,proto3" json:"event_rlps,omitempty"`
-}
-
-func (x *BorEventsReply) Reset() {
- *x = BorEventsReply{}
- if protoimpl.UnsafeEnabled {
- mi := &file_remote_ethbackend_proto_msgTypes[35]
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- ms.StoreMessageInfo(mi)
- }
-}
-
-func (x *BorEventsReply) String() string {
- return protoimpl.X.MessageStringOf(x)
-}
-
-func (*BorEventsReply) ProtoMessage() {}
-
-func (x *BorEventsReply) ProtoReflect() protoreflect.Message {
- mi := &file_remote_ethbackend_proto_msgTypes[35]
- if protoimpl.UnsafeEnabled && x != nil {
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- if ms.LoadMessageInfo() == nil {
- ms.StoreMessageInfo(mi)
- }
- return ms
- }
- return mi.MessageOf(x)
-}
-
-// Deprecated: Use BorEventsReply.ProtoReflect.Descriptor instead.
-func (*BorEventsReply) Descriptor() ([]byte, []int) {
- return file_remote_ethbackend_proto_rawDescGZIP(), []int{35}
-}
-
-func (x *BorEventsReply) GetEventRlps() [][]byte {
- if x != nil {
- return x.EventRlps
- }
- return nil
-}
-
var File_remote_ethbackend_proto protoreflect.FileDescriptor
var file_remote_ethbackend_proto_rawDesc = []byte{
@@ -1868,243 +1664,226 @@ var file_remote_ethbackend_proto_rawDesc = []byte{
0x65, 0x1a, 0x1b, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
0x75, 0x66, 0x2f, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x11,
0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74,
- 0x6f, 0x22, 0x12, 0x0a, 0x10, 0x45, 0x74, 0x68, 0x65, 0x72, 0x62, 0x61, 0x73, 0x65, 0x52, 0x65,
- 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x37, 0x0a, 0x0e, 0x45, 0x74, 0x68, 0x65, 0x72, 0x62, 0x61,
- 0x73, 0x65, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x25, 0x0a, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65,
- 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73,
- 0x2e, 0x48, 0x31, 0x36, 0x30, 0x52, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x22, 0x13,
- 0x0a, 0x11, 0x4e, 0x65, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75,
- 0x65, 0x73, 0x74, 0x22, 0x21, 0x0a, 0x0f, 0x4e, 0x65, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f,
- 0x6e, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
- 0x28, 0x04, 0x52, 0x02, 0x69, 0x64, 0x22, 0x15, 0x0a, 0x13, 0x4e, 0x65, 0x74, 0x50, 0x65, 0x65,
- 0x72, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x29, 0x0a,
- 0x11, 0x4e, 0x65, 0x74, 0x50, 0x65, 0x65, 0x72, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x52, 0x65, 0x70,
- 0x6c, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28,
- 0x04, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x18, 0x0a, 0x16, 0x50, 0x72, 0x6f, 0x74,
- 0x6f, 0x63, 0x6f, 0x6c, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65,
- 0x73, 0x74, 0x22, 0x26, 0x0a, 0x14, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x56, 0x65,
- 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64,
- 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x02, 0x69, 0x64, 0x22, 0x16, 0x0a, 0x14, 0x43, 0x6c,
- 0x69, 0x65, 0x6e, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65,
- 0x73, 0x74, 0x22, 0x31, 0x0a, 0x12, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x56, 0x65, 0x72, 0x73,
- 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x1b, 0x0a, 0x09, 0x6e, 0x6f, 0x64, 0x65,
- 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6e, 0x6f, 0x64,
- 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x22, 0x39, 0x0a, 0x14, 0x43, 0x61, 0x6e, 0x6f, 0x6e, 0x69, 0x63,
- 0x61, 0x6c, 0x48, 0x61, 0x73, 0x68, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x21, 0x0a,
- 0x0c, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x01, 0x20,
- 0x01, 0x28, 0x04, 0x52, 0x0b, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72,
- 0x22, 0x35, 0x0a, 0x12, 0x43, 0x61, 0x6e, 0x6f, 0x6e, 0x69, 0x63, 0x61, 0x6c, 0x48, 0x61, 0x73,
- 0x68, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x1f, 0x0a, 0x04, 0x68, 0x61, 0x73, 0x68, 0x18, 0x01,
- 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x48, 0x32, 0x35,
- 0x36, 0x52, 0x04, 0x68, 0x61, 0x73, 0x68, 0x22, 0x36, 0x0a, 0x13, 0x48, 0x65, 0x61, 0x64, 0x65,
- 0x72, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1f,
- 0x0a, 0x04, 0x68, 0x61, 0x73, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x74,
- 0x79, 0x70, 0x65, 0x73, 0x2e, 0x48, 0x32, 0x35, 0x36, 0x52, 0x04, 0x68, 0x61, 0x73, 0x68, 0x22,
- 0x3b, 0x0a, 0x11, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x52,
- 0x65, 0x70, 0x6c, 0x79, 0x12, 0x1b, 0x0a, 0x06, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x01,
- 0x20, 0x01, 0x28, 0x04, 0x48, 0x00, 0x52, 0x06, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x88, 0x01,
- 0x01, 0x42, 0x09, 0x0a, 0x07, 0x5f, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x22, 0x42, 0x0a, 0x1e,
- 0x43, 0x61, 0x6e, 0x6f, 0x6e, 0x69, 0x63, 0x61, 0x6c, 0x42, 0x6f, 0x64, 0x79, 0x46, 0x6f, 0x72,
- 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x20,
- 0x0a, 0x0b, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x01, 0x20,
- 0x01, 0x28, 0x04, 0x52, 0x0b, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72,
- 0x22, 0x32, 0x0a, 0x1c, 0x43, 0x61, 0x6e, 0x6f, 0x6e, 0x69, 0x63, 0x61, 0x6c, 0x42, 0x6f, 0x64,
- 0x79, 0x46, 0x6f, 0x72, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x52, 0x65, 0x70, 0x6c, 0x79,
- 0x12, 0x12, 0x0a, 0x04, 0x62, 0x6f, 0x64, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04,
- 0x62, 0x6f, 0x64, 0x79, 0x22, 0x35, 0x0a, 0x10, 0x53, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62,
- 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x21, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65,
- 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0d, 0x2e, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x2e,
- 0x45, 0x76, 0x65, 0x6e, 0x74, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x22, 0x47, 0x0a, 0x0e, 0x53,
- 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x21, 0x0a,
- 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0d, 0x2e, 0x72, 0x65,
- 0x6d, 0x6f, 0x74, 0x65, 0x2e, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65,
- 0x12, 0x12, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04,
- 0x64, 0x61, 0x74, 0x61, 0x22, 0xa7, 0x01, 0x0a, 0x11, 0x4c, 0x6f, 0x67, 0x73, 0x46, 0x69, 0x6c,
- 0x74, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x23, 0x0a, 0x0d, 0x61, 0x6c,
- 0x6c, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x65, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28,
- 0x08, 0x52, 0x0c, 0x61, 0x6c, 0x6c, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x65, 0x73, 0x12,
- 0x29, 0x0a, 0x09, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03,
- 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x48, 0x31, 0x36, 0x30, 0x52,
- 0x09, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x65, 0x73, 0x12, 0x1d, 0x0a, 0x0a, 0x61, 0x6c,
- 0x6c, 0x5f, 0x74, 0x6f, 0x70, 0x69, 0x63, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09,
- 0x61, 0x6c, 0x6c, 0x54, 0x6f, 0x70, 0x69, 0x63, 0x73, 0x12, 0x23, 0x0a, 0x06, 0x74, 0x6f, 0x70,
- 0x69, 0x63, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x74, 0x79, 0x70, 0x65,
- 0x73, 0x2e, 0x48, 0x32, 0x35, 0x36, 0x52, 0x06, 0x74, 0x6f, 0x70, 0x69, 0x63, 0x73, 0x22, 0xdf,
- 0x02, 0x0a, 0x12, 0x53, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x4c, 0x6f, 0x67, 0x73,
- 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x25, 0x0a, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73,
+ 0x6f, 0x1a, 0x10, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x2f, 0x62, 0x6f, 0x72, 0x2e, 0x70, 0x72,
+ 0x6f, 0x74, 0x6f, 0x22, 0x12, 0x0a, 0x10, 0x45, 0x74, 0x68, 0x65, 0x72, 0x62, 0x61, 0x73, 0x65,
+ 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x37, 0x0a, 0x0e, 0x45, 0x74, 0x68, 0x65, 0x72,
+ 0x62, 0x61, 0x73, 0x65, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x25, 0x0a, 0x07, 0x61, 0x64, 0x64,
+ 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x74, 0x79, 0x70,
+ 0x65, 0x73, 0x2e, 0x48, 0x31, 0x36, 0x30, 0x52, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73,
+ 0x22, 0x13, 0x0a, 0x11, 0x4e, 0x65, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65,
+ 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x21, 0x0a, 0x0f, 0x4e, 0x65, 0x74, 0x56, 0x65, 0x72, 0x73,
+ 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01,
+ 0x20, 0x01, 0x28, 0x04, 0x52, 0x02, 0x69, 0x64, 0x22, 0x15, 0x0a, 0x13, 0x4e, 0x65, 0x74, 0x50,
+ 0x65, 0x65, 0x72, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22,
+ 0x29, 0x0a, 0x11, 0x4e, 0x65, 0x74, 0x50, 0x65, 0x65, 0x72, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x52,
+ 0x65, 0x70, 0x6c, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20,
+ 0x01, 0x28, 0x04, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x18, 0x0a, 0x16, 0x50, 0x72,
+ 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71,
+ 0x75, 0x65, 0x73, 0x74, 0x22, 0x26, 0x0a, 0x14, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c,
+ 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x0e, 0x0a, 0x02,
+ 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x02, 0x69, 0x64, 0x22, 0x16, 0x0a, 0x14,
+ 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71,
+ 0x75, 0x65, 0x73, 0x74, 0x22, 0x31, 0x0a, 0x12, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x56, 0x65,
+ 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x1b, 0x0a, 0x09, 0x6e, 0x6f,
+ 0x64, 0x65, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6e,
+ 0x6f, 0x64, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x22, 0x39, 0x0a, 0x14, 0x43, 0x61, 0x6e, 0x6f, 0x6e,
+ 0x69, 0x63, 0x61, 0x6c, 0x48, 0x61, 0x73, 0x68, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12,
+ 0x21, 0x0a, 0x0c, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18,
+ 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0b, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x4e, 0x75, 0x6d, 0x62,
+ 0x65, 0x72, 0x22, 0x35, 0x0a, 0x12, 0x43, 0x61, 0x6e, 0x6f, 0x6e, 0x69, 0x63, 0x61, 0x6c, 0x48,
+ 0x61, 0x73, 0x68, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x1f, 0x0a, 0x04, 0x68, 0x61, 0x73, 0x68,
0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x48,
- 0x31, 0x36, 0x30, 0x52, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x2a, 0x0a, 0x0a,
- 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
- 0x32, 0x0b, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x48, 0x32, 0x35, 0x36, 0x52, 0x09, 0x62,
- 0x6c, 0x6f, 0x63, 0x6b, 0x48, 0x61, 0x73, 0x68, 0x12, 0x21, 0x0a, 0x0c, 0x62, 0x6c, 0x6f, 0x63,
- 0x6b, 0x5f, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0b,
- 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x64,
- 0x61, 0x74, 0x61, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12,
- 0x1b, 0x0a, 0x09, 0x6c, 0x6f, 0x67, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x05, 0x20, 0x01,
- 0x28, 0x04, 0x52, 0x08, 0x6c, 0x6f, 0x67, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x23, 0x0a, 0x06,
- 0x74, 0x6f, 0x70, 0x69, 0x63, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x74,
- 0x79, 0x70, 0x65, 0x73, 0x2e, 0x48, 0x32, 0x35, 0x36, 0x52, 0x06, 0x74, 0x6f, 0x70, 0x69, 0x63,
- 0x73, 0x12, 0x36, 0x0a, 0x10, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e,
- 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x74, 0x79,
- 0x70, 0x65, 0x73, 0x2e, 0x48, 0x32, 0x35, 0x36, 0x52, 0x0f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61,
- 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x48, 0x61, 0x73, 0x68, 0x12, 0x2b, 0x0a, 0x11, 0x74, 0x72, 0x61,
- 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x08,
- 0x20, 0x01, 0x28, 0x04, 0x52, 0x10, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f,
- 0x6e, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65,
- 0x64, 0x18, 0x09, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x64,
- 0x22, 0x5d, 0x0a, 0x0c, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
- 0x12, 0x21, 0x0a, 0x0c, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74,
- 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0b, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x48, 0x65, 0x69,
- 0x67, 0x68, 0x74, 0x12, 0x2a, 0x0a, 0x0a, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x68, 0x61, 0x73,
- 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e,
- 0x48, 0x32, 0x35, 0x36, 0x52, 0x09, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x48, 0x61, 0x73, 0x68, 0x22,
- 0x43, 0x0a, 0x0a, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x1b, 0x0a,
- 0x09, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x72, 0x6c, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c,
- 0x52, 0x08, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x6c, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x65,
- 0x6e, 0x64, 0x65, 0x72, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x07, 0x73, 0x65, 0x6e,
- 0x64, 0x65, 0x72, 0x73, 0x22, 0x3a, 0x0a, 0x10, 0x54, 0x78, 0x6e, 0x4c, 0x6f, 0x6f, 0x6b, 0x75,
- 0x70, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x26, 0x0a, 0x08, 0x74, 0x78, 0x6e, 0x5f,
- 0x68, 0x61, 0x73, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x74, 0x79, 0x70,
- 0x65, 0x73, 0x2e, 0x48, 0x32, 0x35, 0x36, 0x52, 0x07, 0x74, 0x78, 0x6e, 0x48, 0x61, 0x73, 0x68,
- 0x22, 0x33, 0x0a, 0x0e, 0x54, 0x78, 0x6e, 0x4c, 0x6f, 0x6f, 0x6b, 0x75, 0x70, 0x52, 0x65, 0x70,
- 0x6c, 0x79, 0x12, 0x21, 0x0a, 0x0c, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x6e, 0x75, 0x6d, 0x62,
- 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0b, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x4e,
- 0x75, 0x6d, 0x62, 0x65, 0x72, 0x22, 0x28, 0x0a, 0x10, 0x4e, 0x6f, 0x64, 0x65, 0x73, 0x49, 0x6e,
- 0x66, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x69, 0x6d,
- 0x69, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x05, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x22,
- 0x22, 0x0a, 0x0e, 0x41, 0x64, 0x64, 0x50, 0x65, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
- 0x74, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x72, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03,
- 0x75, 0x72, 0x6c, 0x22, 0x45, 0x0a, 0x0e, 0x4e, 0x6f, 0x64, 0x65, 0x73, 0x49, 0x6e, 0x66, 0x6f,
- 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x33, 0x0a, 0x0a, 0x6e, 0x6f, 0x64, 0x65, 0x73, 0x5f, 0x69,
- 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x74, 0x79, 0x70, 0x65,
- 0x73, 0x2e, 0x4e, 0x6f, 0x64, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x52,
- 0x09, 0x6e, 0x6f, 0x64, 0x65, 0x73, 0x49, 0x6e, 0x66, 0x6f, 0x22, 0x33, 0x0a, 0x0a, 0x50, 0x65,
- 0x65, 0x72, 0x73, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x25, 0x0a, 0x05, 0x70, 0x65, 0x65, 0x72,
- 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e,
- 0x50, 0x65, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x05, 0x70, 0x65, 0x65, 0x72, 0x73, 0x22,
- 0x28, 0x0a, 0x0c, 0x41, 0x64, 0x64, 0x50, 0x65, 0x65, 0x72, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12,
- 0x18, 0x0a, 0x07, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08,
- 0x52, 0x07, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x22, 0x30, 0x0a, 0x11, 0x50, 0x65, 0x6e,
- 0x64, 0x69, 0x6e, 0x67, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x1b,
- 0x0a, 0x09, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x72, 0x6c, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28,
- 0x0c, 0x52, 0x08, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x6c, 0x70, 0x22, 0x4c, 0x0a, 0x25, 0x45,
+ 0x32, 0x35, 0x36, 0x52, 0x04, 0x68, 0x61, 0x73, 0x68, 0x22, 0x36, 0x0a, 0x13, 0x48, 0x65, 0x61,
+ 0x64, 0x65, 0x72, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+ 0x12, 0x1f, 0x0a, 0x04, 0x68, 0x61, 0x73, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b,
+ 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x48, 0x32, 0x35, 0x36, 0x52, 0x04, 0x68, 0x61, 0x73,
+ 0x68, 0x22, 0x3b, 0x0a, 0x11, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4e, 0x75, 0x6d, 0x62, 0x65,
+ 0x72, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x1b, 0x0a, 0x06, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72,
+ 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x48, 0x00, 0x52, 0x06, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72,
+ 0x88, 0x01, 0x01, 0x42, 0x09, 0x0a, 0x07, 0x5f, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x22, 0x42,
+ 0x0a, 0x1e, 0x43, 0x61, 0x6e, 0x6f, 0x6e, 0x69, 0x63, 0x61, 0x6c, 0x42, 0x6f, 0x64, 0x79, 0x46,
+ 0x6f, 0x72, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+ 0x12, 0x20, 0x0a, 0x0b, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18,
+ 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0b, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x4e, 0x75, 0x6d, 0x62,
+ 0x65, 0x72, 0x22, 0x32, 0x0a, 0x1c, 0x43, 0x61, 0x6e, 0x6f, 0x6e, 0x69, 0x63, 0x61, 0x6c, 0x42,
+ 0x6f, 0x64, 0x79, 0x46, 0x6f, 0x72, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x52, 0x65, 0x70,
+ 0x6c, 0x79, 0x12, 0x12, 0x0a, 0x04, 0x62, 0x6f, 0x64, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c,
+ 0x52, 0x04, 0x62, 0x6f, 0x64, 0x79, 0x22, 0x35, 0x0a, 0x10, 0x53, 0x75, 0x62, 0x73, 0x63, 0x72,
+ 0x69, 0x62, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x21, 0x0a, 0x04, 0x74, 0x79,
+ 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0d, 0x2e, 0x72, 0x65, 0x6d, 0x6f, 0x74,
+ 0x65, 0x2e, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x22, 0x47, 0x0a,
+ 0x0e, 0x53, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12,
+ 0x21, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0d, 0x2e,
+ 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x2e, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x52, 0x04, 0x74, 0x79,
+ 0x70, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c,
+ 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0xa7, 0x01, 0x0a, 0x11, 0x4c, 0x6f, 0x67, 0x73, 0x46,
+ 0x69, 0x6c, 0x74, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x23, 0x0a, 0x0d,
+ 0x61, 0x6c, 0x6c, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x65, 0x73, 0x18, 0x01, 0x20,
+ 0x01, 0x28, 0x08, 0x52, 0x0c, 0x61, 0x6c, 0x6c, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x65,
+ 0x73, 0x12, 0x29, 0x0a, 0x09, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x65, 0x73, 0x18, 0x02,
+ 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x48, 0x31, 0x36,
+ 0x30, 0x52, 0x09, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x65, 0x73, 0x12, 0x1d, 0x0a, 0x0a,
+ 0x61, 0x6c, 0x6c, 0x5f, 0x74, 0x6f, 0x70, 0x69, 0x63, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08,
+ 0x52, 0x09, 0x61, 0x6c, 0x6c, 0x54, 0x6f, 0x70, 0x69, 0x63, 0x73, 0x12, 0x23, 0x0a, 0x06, 0x74,
+ 0x6f, 0x70, 0x69, 0x63, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x74, 0x79,
+ 0x70, 0x65, 0x73, 0x2e, 0x48, 0x32, 0x35, 0x36, 0x52, 0x06, 0x74, 0x6f, 0x70, 0x69, 0x63, 0x73,
+ 0x22, 0xdf, 0x02, 0x0a, 0x12, 0x53, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x4c, 0x6f,
+ 0x67, 0x73, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x25, 0x0a, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65,
+ 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73,
+ 0x2e, 0x48, 0x31, 0x36, 0x30, 0x52, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x2a,
+ 0x0a, 0x0a, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x02, 0x20, 0x01,
+ 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x48, 0x32, 0x35, 0x36, 0x52,
+ 0x09, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x48, 0x61, 0x73, 0x68, 0x12, 0x21, 0x0a, 0x0c, 0x62, 0x6c,
+ 0x6f, 0x63, 0x6b, 0x5f, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x04,
+ 0x52, 0x0b, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x12, 0x0a,
+ 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x64, 0x61, 0x74,
+ 0x61, 0x12, 0x1b, 0x0a, 0x09, 0x6c, 0x6f, 0x67, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x05,
+ 0x20, 0x01, 0x28, 0x04, 0x52, 0x08, 0x6c, 0x6f, 0x67, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x23,
+ 0x0a, 0x06, 0x74, 0x6f, 0x70, 0x69, 0x63, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b,
+ 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x48, 0x32, 0x35, 0x36, 0x52, 0x06, 0x74, 0x6f, 0x70,
+ 0x69, 0x63, 0x73, 0x12, 0x36, 0x0a, 0x10, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69,
+ 0x6f, 0x6e, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e,
+ 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x48, 0x32, 0x35, 0x36, 0x52, 0x0f, 0x74, 0x72, 0x61, 0x6e,
+ 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x48, 0x61, 0x73, 0x68, 0x12, 0x2b, 0x0a, 0x11, 0x74,
+ 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78,
+ 0x18, 0x08, 0x20, 0x01, 0x28, 0x04, 0x52, 0x10, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74,
+ 0x69, 0x6f, 0x6e, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x65, 0x6d, 0x6f,
+ 0x76, 0x65, 0x64, 0x18, 0x09, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x72, 0x65, 0x6d, 0x6f, 0x76,
+ 0x65, 0x64, 0x22, 0x5d, 0x0a, 0x0c, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65,
+ 0x73, 0x74, 0x12, 0x21, 0x0a, 0x0c, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x68, 0x65, 0x69, 0x67,
+ 0x68, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0b, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x48,
+ 0x65, 0x69, 0x67, 0x68, 0x74, 0x12, 0x2a, 0x0a, 0x0a, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x68,
+ 0x61, 0x73, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x74, 0x79, 0x70, 0x65,
+ 0x73, 0x2e, 0x48, 0x32, 0x35, 0x36, 0x52, 0x09, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x48, 0x61, 0x73,
+ 0x68, 0x22, 0x43, 0x0a, 0x0a, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12,
+ 0x1b, 0x0a, 0x09, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x72, 0x6c, 0x70, 0x18, 0x01, 0x20, 0x01,
+ 0x28, 0x0c, 0x52, 0x08, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x6c, 0x70, 0x12, 0x18, 0x0a, 0x07,
+ 0x73, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x07, 0x73,
+ 0x65, 0x6e, 0x64, 0x65, 0x72, 0x73, 0x22, 0x3a, 0x0a, 0x10, 0x54, 0x78, 0x6e, 0x4c, 0x6f, 0x6f,
+ 0x6b, 0x75, 0x70, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x26, 0x0a, 0x08, 0x74, 0x78,
+ 0x6e, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x74,
+ 0x79, 0x70, 0x65, 0x73, 0x2e, 0x48, 0x32, 0x35, 0x36, 0x52, 0x07, 0x74, 0x78, 0x6e, 0x48, 0x61,
+ 0x73, 0x68, 0x22, 0x33, 0x0a, 0x0e, 0x54, 0x78, 0x6e, 0x4c, 0x6f, 0x6f, 0x6b, 0x75, 0x70, 0x52,
+ 0x65, 0x70, 0x6c, 0x79, 0x12, 0x21, 0x0a, 0x0c, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x6e, 0x75,
+ 0x6d, 0x62, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0b, 0x62, 0x6c, 0x6f, 0x63,
+ 0x6b, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x22, 0x28, 0x0a, 0x10, 0x4e, 0x6f, 0x64, 0x65, 0x73,
+ 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x6c,
+ 0x69, 0x6d, 0x69, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x05, 0x6c, 0x69, 0x6d, 0x69,
+ 0x74, 0x22, 0x22, 0x0a, 0x0e, 0x41, 0x64, 0x64, 0x50, 0x65, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75,
+ 0x65, 0x73, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x72, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+ 0x52, 0x03, 0x75, 0x72, 0x6c, 0x22, 0x45, 0x0a, 0x0e, 0x4e, 0x6f, 0x64, 0x65, 0x73, 0x49, 0x6e,
+ 0x66, 0x6f, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x33, 0x0a, 0x0a, 0x6e, 0x6f, 0x64, 0x65, 0x73,
+ 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x74, 0x79,
+ 0x70, 0x65, 0x73, 0x2e, 0x4e, 0x6f, 0x64, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x70, 0x6c,
+ 0x79, 0x52, 0x09, 0x6e, 0x6f, 0x64, 0x65, 0x73, 0x49, 0x6e, 0x66, 0x6f, 0x22, 0x33, 0x0a, 0x0a,
+ 0x50, 0x65, 0x65, 0x72, 0x73, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x25, 0x0a, 0x05, 0x70, 0x65,
+ 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x74, 0x79, 0x70, 0x65,
+ 0x73, 0x2e, 0x50, 0x65, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x05, 0x70, 0x65, 0x65, 0x72,
+ 0x73, 0x22, 0x28, 0x0a, 0x0c, 0x41, 0x64, 0x64, 0x50, 0x65, 0x65, 0x72, 0x52, 0x65, 0x70, 0x6c,
+ 0x79, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01,
+ 0x28, 0x08, 0x52, 0x07, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x22, 0x30, 0x0a, 0x11, 0x50,
+ 0x65, 0x6e, 0x64, 0x69, 0x6e, 0x67, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x70, 0x6c, 0x79,
+ 0x12, 0x1b, 0x0a, 0x09, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x72, 0x6c, 0x70, 0x18, 0x01, 0x20,
+ 0x01, 0x28, 0x0c, 0x52, 0x08, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x6c, 0x70, 0x22, 0x4c, 0x0a,
+ 0x25, 0x45, 0x6e, 0x67, 0x69, 0x6e, 0x65, 0x47, 0x65, 0x74, 0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61,
+ 0x64, 0x42, 0x6f, 0x64, 0x69, 0x65, 0x73, 0x42, 0x79, 0x48, 0x61, 0x73, 0x68, 0x56, 0x31, 0x52,
+ 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x23, 0x0a, 0x06, 0x68, 0x61, 0x73, 0x68, 0x65, 0x73,
+ 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x48,
+ 0x32, 0x35, 0x36, 0x52, 0x06, 0x68, 0x61, 0x73, 0x68, 0x65, 0x73, 0x22, 0x54, 0x0a, 0x26, 0x45,
0x6e, 0x67, 0x69, 0x6e, 0x65, 0x47, 0x65, 0x74, 0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x42,
- 0x6f, 0x64, 0x69, 0x65, 0x73, 0x42, 0x79, 0x48, 0x61, 0x73, 0x68, 0x56, 0x31, 0x52, 0x65, 0x71,
- 0x75, 0x65, 0x73, 0x74, 0x12, 0x23, 0x0a, 0x06, 0x68, 0x61, 0x73, 0x68, 0x65, 0x73, 0x18, 0x01,
- 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x48, 0x32, 0x35,
- 0x36, 0x52, 0x06, 0x68, 0x61, 0x73, 0x68, 0x65, 0x73, 0x22, 0x54, 0x0a, 0x26, 0x45, 0x6e, 0x67,
- 0x69, 0x6e, 0x65, 0x47, 0x65, 0x74, 0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x42, 0x6f, 0x64,
- 0x69, 0x65, 0x73, 0x42, 0x79, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x56, 0x31, 0x52, 0x65, 0x71, 0x75,
- 0x65, 0x73, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x72, 0x74, 0x18, 0x01, 0x20, 0x01,
- 0x28, 0x04, 0x52, 0x05, 0x73, 0x74, 0x61, 0x72, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75,
- 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x22,
- 0x42, 0x0a, 0x13, 0x42, 0x6f, 0x72, 0x54, 0x78, 0x6e, 0x4c, 0x6f, 0x6f, 0x6b, 0x75, 0x70, 0x52,
- 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x2b, 0x0a, 0x0b, 0x62, 0x6f, 0x72, 0x5f, 0x74, 0x78,
- 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x74, 0x79,
- 0x70, 0x65, 0x73, 0x2e, 0x48, 0x32, 0x35, 0x36, 0x52, 0x09, 0x62, 0x6f, 0x72, 0x54, 0x78, 0x48,
- 0x61, 0x73, 0x68, 0x22, 0x50, 0x0a, 0x11, 0x42, 0x6f, 0x72, 0x54, 0x78, 0x6e, 0x4c, 0x6f, 0x6f,
- 0x6b, 0x75, 0x70, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x18, 0x0a, 0x07, 0x70, 0x72, 0x65, 0x73,
- 0x65, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x70, 0x72, 0x65, 0x73, 0x65,
- 0x6e, 0x74, 0x12, 0x21, 0x0a, 0x0c, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x6e, 0x75, 0x6d, 0x62,
- 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0b, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x4e,
- 0x75, 0x6d, 0x62, 0x65, 0x72, 0x22, 0x5b, 0x0a, 0x10, 0x42, 0x6f, 0x72, 0x45, 0x76, 0x65, 0x6e,
- 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1b, 0x0a, 0x09, 0x62, 0x6c, 0x6f,
- 0x63, 0x6b, 0x5f, 0x6e, 0x75, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x08, 0x62, 0x6c,
- 0x6f, 0x63, 0x6b, 0x4e, 0x75, 0x6d, 0x12, 0x2a, 0x0a, 0x0a, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f,
- 0x68, 0x61, 0x73, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x74, 0x79, 0x70,
- 0x65, 0x73, 0x2e, 0x48, 0x32, 0x35, 0x36, 0x52, 0x09, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x48, 0x61,
- 0x73, 0x68, 0x22, 0x2f, 0x0a, 0x0e, 0x42, 0x6f, 0x72, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x52,
- 0x65, 0x70, 0x6c, 0x79, 0x12, 0x1d, 0x0a, 0x0a, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x5f, 0x72, 0x6c,
- 0x70, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0c, 0x52, 0x09, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x52,
- 0x6c, 0x70, 0x73, 0x2a, 0x4a, 0x0a, 0x05, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x0a, 0x0a, 0x06,
- 0x48, 0x45, 0x41, 0x44, 0x45, 0x52, 0x10, 0x00, 0x12, 0x10, 0x0a, 0x0c, 0x50, 0x45, 0x4e, 0x44,
- 0x49, 0x4e, 0x47, 0x5f, 0x4c, 0x4f, 0x47, 0x53, 0x10, 0x01, 0x12, 0x11, 0x0a, 0x0d, 0x50, 0x45,
- 0x4e, 0x44, 0x49, 0x4e, 0x47, 0x5f, 0x42, 0x4c, 0x4f, 0x43, 0x4b, 0x10, 0x02, 0x12, 0x10, 0x0a,
- 0x0c, 0x4e, 0x45, 0x57, 0x5f, 0x53, 0x4e, 0x41, 0x50, 0x53, 0x48, 0x4f, 0x54, 0x10, 0x03, 0x32,
- 0x9a, 0x0a, 0x0a, 0x0a, 0x45, 0x54, 0x48, 0x42, 0x41, 0x43, 0x4b, 0x45, 0x4e, 0x44, 0x12, 0x3d,
- 0x0a, 0x09, 0x45, 0x74, 0x68, 0x65, 0x72, 0x62, 0x61, 0x73, 0x65, 0x12, 0x18, 0x2e, 0x72, 0x65,
- 0x6d, 0x6f, 0x74, 0x65, 0x2e, 0x45, 0x74, 0x68, 0x65, 0x72, 0x62, 0x61, 0x73, 0x65, 0x52, 0x65,
- 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x2e, 0x45,
- 0x74, 0x68, 0x65, 0x72, 0x62, 0x61, 0x73, 0x65, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x40, 0x0a,
- 0x0a, 0x4e, 0x65, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x19, 0x2e, 0x72, 0x65,
- 0x6d, 0x6f, 0x74, 0x65, 0x2e, 0x4e, 0x65, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x52,
- 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x17, 0x2e, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x2e,
- 0x4e, 0x65, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12,
- 0x46, 0x0a, 0x0c, 0x4e, 0x65, 0x74, 0x50, 0x65, 0x65, 0x72, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12,
- 0x1b, 0x2e, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x2e, 0x4e, 0x65, 0x74, 0x50, 0x65, 0x65, 0x72,
- 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x19, 0x2e, 0x72,
- 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x2e, 0x4e, 0x65, 0x74, 0x50, 0x65, 0x65, 0x72, 0x43, 0x6f, 0x75,
- 0x6e, 0x74, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x36, 0x0a, 0x07, 0x56, 0x65, 0x72, 0x73, 0x69,
- 0x6f, 0x6e, 0x12, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
- 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x13, 0x2e, 0x74, 0x79, 0x70,
- 0x65, 0x73, 0x2e, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12,
- 0x4f, 0x0a, 0x0f, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x56, 0x65, 0x72, 0x73, 0x69,
- 0x6f, 0x6e, 0x12, 0x1e, 0x2e, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x74,
- 0x6f, 0x63, 0x6f, 0x6c, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65,
- 0x73, 0x74, 0x1a, 0x1c, 0x2e, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x74,
- 0x6f, 0x63, 0x6f, 0x6c, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x70, 0x6c, 0x79,
- 0x12, 0x49, 0x0a, 0x0d, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f,
- 0x6e, 0x12, 0x1c, 0x2e, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x2e, 0x43, 0x6c, 0x69, 0x65, 0x6e,
- 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
- 0x1a, 0x2e, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x2e, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x56,
- 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x3f, 0x0a, 0x09, 0x53,
- 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x12, 0x18, 0x2e, 0x72, 0x65, 0x6d, 0x6f, 0x74,
- 0x65, 0x2e, 0x53, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65,
- 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x2e, 0x53, 0x75, 0x62, 0x73,
- 0x63, 0x72, 0x69, 0x62, 0x65, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x30, 0x01, 0x12, 0x4a, 0x0a, 0x0d,
- 0x53, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x4c, 0x6f, 0x67, 0x73, 0x12, 0x19, 0x2e,
- 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x2e, 0x4c, 0x6f, 0x67, 0x73, 0x46, 0x69, 0x6c, 0x74, 0x65,
- 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1a, 0x2e, 0x72, 0x65, 0x6d, 0x6f, 0x74,
- 0x65, 0x2e, 0x53, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x4c, 0x6f, 0x67, 0x73, 0x52,
- 0x65, 0x70, 0x6c, 0x79, 0x28, 0x01, 0x30, 0x01, 0x12, 0x31, 0x0a, 0x05, 0x42, 0x6c, 0x6f, 0x63,
- 0x6b, 0x12, 0x14, 0x2e, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x2e, 0x42, 0x6c, 0x6f, 0x63, 0x6b,
- 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x12, 0x2e, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65,
- 0x2e, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x67, 0x0a, 0x17, 0x43,
- 0x61, 0x6e, 0x6f, 0x6e, 0x69, 0x63, 0x61, 0x6c, 0x42, 0x6f, 0x64, 0x79, 0x46, 0x6f, 0x72, 0x53,
- 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x12, 0x26, 0x2e, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x2e,
- 0x43, 0x61, 0x6e, 0x6f, 0x6e, 0x69, 0x63, 0x61, 0x6c, 0x42, 0x6f, 0x64, 0x79, 0x46, 0x6f, 0x72,
- 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x24,
- 0x2e, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x2e, 0x43, 0x61, 0x6e, 0x6f, 0x6e, 0x69, 0x63, 0x61,
- 0x6c, 0x42, 0x6f, 0x64, 0x79, 0x46, 0x6f, 0x72, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x52,
- 0x65, 0x70, 0x6c, 0x79, 0x12, 0x49, 0x0a, 0x0d, 0x43, 0x61, 0x6e, 0x6f, 0x6e, 0x69, 0x63, 0x61,
- 0x6c, 0x48, 0x61, 0x73, 0x68, 0x12, 0x1c, 0x2e, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x2e, 0x43,
- 0x61, 0x6e, 0x6f, 0x6e, 0x69, 0x63, 0x61, 0x6c, 0x48, 0x61, 0x73, 0x68, 0x52, 0x65, 0x71, 0x75,
- 0x65, 0x73, 0x74, 0x1a, 0x1a, 0x2e, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x2e, 0x43, 0x61, 0x6e,
- 0x6f, 0x6e, 0x69, 0x63, 0x61, 0x6c, 0x48, 0x61, 0x73, 0x68, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12,
- 0x46, 0x0a, 0x0c, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x12,
- 0x1b, 0x2e, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4e,
- 0x75, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x19, 0x2e, 0x72,
- 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4e, 0x75, 0x6d, 0x62,
- 0x65, 0x72, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x3d, 0x0a, 0x09, 0x54, 0x78, 0x6e, 0x4c, 0x6f,
- 0x6f, 0x6b, 0x75, 0x70, 0x12, 0x18, 0x2e, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x2e, 0x54, 0x78,
- 0x6e, 0x4c, 0x6f, 0x6f, 0x6b, 0x75, 0x70, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16,
- 0x2e, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x2e, 0x54, 0x78, 0x6e, 0x4c, 0x6f, 0x6f, 0x6b, 0x75,
- 0x70, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x3c, 0x0a, 0x08, 0x4e, 0x6f, 0x64, 0x65, 0x49, 0x6e,
- 0x66, 0x6f, 0x12, 0x18, 0x2e, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x2e, 0x4e, 0x6f, 0x64, 0x65,
- 0x73, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x72,
- 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x2e, 0x4e, 0x6f, 0x64, 0x65, 0x73, 0x49, 0x6e, 0x66, 0x6f, 0x52,
- 0x65, 0x70, 0x6c, 0x79, 0x12, 0x33, 0x0a, 0x05, 0x50, 0x65, 0x65, 0x72, 0x73, 0x12, 0x16, 0x2e,
- 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e,
- 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x12, 0x2e, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x2e, 0x50,
- 0x65, 0x65, 0x72, 0x73, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x37, 0x0a, 0x07, 0x41, 0x64, 0x64,
- 0x50, 0x65, 0x65, 0x72, 0x12, 0x16, 0x2e, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x2e, 0x41, 0x64,
- 0x64, 0x50, 0x65, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x14, 0x2e, 0x72,
- 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x2e, 0x41, 0x64, 0x64, 0x50, 0x65, 0x65, 0x72, 0x52, 0x65, 0x70,
- 0x6c, 0x79, 0x12, 0x41, 0x0a, 0x0c, 0x50, 0x65, 0x6e, 0x64, 0x69, 0x6e, 0x67, 0x42, 0x6c, 0x6f,
- 0x63, 0x6b, 0x12, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
- 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x19, 0x2e, 0x72, 0x65, 0x6d,
- 0x6f, 0x74, 0x65, 0x2e, 0x50, 0x65, 0x6e, 0x64, 0x69, 0x6e, 0x67, 0x42, 0x6c, 0x6f, 0x63, 0x6b,
- 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x46, 0x0a, 0x0c, 0x42, 0x6f, 0x72, 0x54, 0x78, 0x6e, 0x4c,
- 0x6f, 0x6f, 0x6b, 0x75, 0x70, 0x12, 0x1b, 0x2e, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x2e, 0x42,
- 0x6f, 0x72, 0x54, 0x78, 0x6e, 0x4c, 0x6f, 0x6f, 0x6b, 0x75, 0x70, 0x52, 0x65, 0x71, 0x75, 0x65,
- 0x73, 0x74, 0x1a, 0x19, 0x2e, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x2e, 0x42, 0x6f, 0x72, 0x54,
- 0x78, 0x6e, 0x4c, 0x6f, 0x6f, 0x6b, 0x75, 0x70, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x3d, 0x0a,
- 0x09, 0x42, 0x6f, 0x72, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x12, 0x18, 0x2e, 0x72, 0x65, 0x6d,
- 0x6f, 0x74, 0x65, 0x2e, 0x42, 0x6f, 0x72, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x52, 0x65, 0x71,
- 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x2e, 0x42, 0x6f,
- 0x72, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x42, 0x16, 0x5a, 0x14,
- 0x2e, 0x2f, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x3b, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x70,
- 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+ 0x6f, 0x64, 0x69, 0x65, 0x73, 0x42, 0x79, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x56, 0x31, 0x52, 0x65,
+ 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x72, 0x74, 0x18, 0x01,
+ 0x20, 0x01, 0x28, 0x04, 0x52, 0x05, 0x73, 0x74, 0x61, 0x72, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x63,
+ 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e,
+ 0x74, 0x2a, 0x4a, 0x0a, 0x05, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x0a, 0x0a, 0x06, 0x48, 0x45,
+ 0x41, 0x44, 0x45, 0x52, 0x10, 0x00, 0x12, 0x10, 0x0a, 0x0c, 0x50, 0x45, 0x4e, 0x44, 0x49, 0x4e,
+ 0x47, 0x5f, 0x4c, 0x4f, 0x47, 0x53, 0x10, 0x01, 0x12, 0x11, 0x0a, 0x0d, 0x50, 0x45, 0x4e, 0x44,
+ 0x49, 0x4e, 0x47, 0x5f, 0x42, 0x4c, 0x4f, 0x43, 0x4b, 0x10, 0x02, 0x12, 0x10, 0x0a, 0x0c, 0x4e,
+ 0x45, 0x57, 0x5f, 0x53, 0x4e, 0x41, 0x50, 0x53, 0x48, 0x4f, 0x54, 0x10, 0x03, 0x32, 0x9a, 0x0a,
+ 0x0a, 0x0a, 0x45, 0x54, 0x48, 0x42, 0x41, 0x43, 0x4b, 0x45, 0x4e, 0x44, 0x12, 0x3d, 0x0a, 0x09,
+ 0x45, 0x74, 0x68, 0x65, 0x72, 0x62, 0x61, 0x73, 0x65, 0x12, 0x18, 0x2e, 0x72, 0x65, 0x6d, 0x6f,
+ 0x74, 0x65, 0x2e, 0x45, 0x74, 0x68, 0x65, 0x72, 0x62, 0x61, 0x73, 0x65, 0x52, 0x65, 0x71, 0x75,
+ 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x2e, 0x45, 0x74, 0x68,
+ 0x65, 0x72, 0x62, 0x61, 0x73, 0x65, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x40, 0x0a, 0x0a, 0x4e,
+ 0x65, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x19, 0x2e, 0x72, 0x65, 0x6d, 0x6f,
+ 0x74, 0x65, 0x2e, 0x4e, 0x65, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71,
+ 0x75, 0x65, 0x73, 0x74, 0x1a, 0x17, 0x2e, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x2e, 0x4e, 0x65,
+ 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x46, 0x0a,
+ 0x0c, 0x4e, 0x65, 0x74, 0x50, 0x65, 0x65, 0x72, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x1b, 0x2e,
+ 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x2e, 0x4e, 0x65, 0x74, 0x50, 0x65, 0x65, 0x72, 0x43, 0x6f,
+ 0x75, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x19, 0x2e, 0x72, 0x65, 0x6d,
+ 0x6f, 0x74, 0x65, 0x2e, 0x4e, 0x65, 0x74, 0x50, 0x65, 0x65, 0x72, 0x43, 0x6f, 0x75, 0x6e, 0x74,
+ 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x36, 0x0a, 0x07, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e,
+ 0x12, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
+ 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x13, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73,
+ 0x2e, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x4f, 0x0a,
+ 0x0f, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e,
+ 0x12, 0x1e, 0x2e, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63,
+ 0x6f, 0x6c, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+ 0x1a, 0x1c, 0x2e, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63,
+ 0x6f, 0x6c, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x49,
+ 0x0a, 0x0d, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12,
+ 0x1c, 0x2e, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x2e, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x56,
+ 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1a, 0x2e,
+ 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x2e, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x56, 0x65, 0x72,
+ 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x3f, 0x0a, 0x09, 0x53, 0x75, 0x62,
+ 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x12, 0x18, 0x2e, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x2e,
+ 0x53, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+ 0x1a, 0x16, 0x2e, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x2e, 0x53, 0x75, 0x62, 0x73, 0x63, 0x72,
+ 0x69, 0x62, 0x65, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x30, 0x01, 0x12, 0x4a, 0x0a, 0x0d, 0x53, 0x75,
+ 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x4c, 0x6f, 0x67, 0x73, 0x12, 0x19, 0x2e, 0x72, 0x65,
+ 0x6d, 0x6f, 0x74, 0x65, 0x2e, 0x4c, 0x6f, 0x67, 0x73, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x52,
+ 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1a, 0x2e, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x2e,
+ 0x53, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x4c, 0x6f, 0x67, 0x73, 0x52, 0x65, 0x70,
+ 0x6c, 0x79, 0x28, 0x01, 0x30, 0x01, 0x12, 0x31, 0x0a, 0x05, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x12,
+ 0x14, 0x2e, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x2e, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x65,
+ 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x12, 0x2e, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x2e, 0x42,
+ 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x67, 0x0a, 0x17, 0x43, 0x61, 0x6e,
+ 0x6f, 0x6e, 0x69, 0x63, 0x61, 0x6c, 0x42, 0x6f, 0x64, 0x79, 0x46, 0x6f, 0x72, 0x53, 0x74, 0x6f,
+ 0x72, 0x61, 0x67, 0x65, 0x12, 0x26, 0x2e, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x2e, 0x43, 0x61,
+ 0x6e, 0x6f, 0x6e, 0x69, 0x63, 0x61, 0x6c, 0x42, 0x6f, 0x64, 0x79, 0x46, 0x6f, 0x72, 0x53, 0x74,
+ 0x6f, 0x72, 0x61, 0x67, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x24, 0x2e, 0x72,
+ 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x2e, 0x43, 0x61, 0x6e, 0x6f, 0x6e, 0x69, 0x63, 0x61, 0x6c, 0x42,
+ 0x6f, 0x64, 0x79, 0x46, 0x6f, 0x72, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x52, 0x65, 0x70,
+ 0x6c, 0x79, 0x12, 0x49, 0x0a, 0x0d, 0x43, 0x61, 0x6e, 0x6f, 0x6e, 0x69, 0x63, 0x61, 0x6c, 0x48,
+ 0x61, 0x73, 0x68, 0x12, 0x1c, 0x2e, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x2e, 0x43, 0x61, 0x6e,
+ 0x6f, 0x6e, 0x69, 0x63, 0x61, 0x6c, 0x48, 0x61, 0x73, 0x68, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
+ 0x74, 0x1a, 0x1a, 0x2e, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x2e, 0x43, 0x61, 0x6e, 0x6f, 0x6e,
+ 0x69, 0x63, 0x61, 0x6c, 0x48, 0x61, 0x73, 0x68, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x46, 0x0a,
+ 0x0c, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x1b, 0x2e,
+ 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4e, 0x75, 0x6d,
+ 0x62, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x19, 0x2e, 0x72, 0x65, 0x6d,
+ 0x6f, 0x74, 0x65, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72,
+ 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x3d, 0x0a, 0x09, 0x54, 0x78, 0x6e, 0x4c, 0x6f, 0x6f, 0x6b,
+ 0x75, 0x70, 0x12, 0x18, 0x2e, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x2e, 0x54, 0x78, 0x6e, 0x4c,
+ 0x6f, 0x6f, 0x6b, 0x75, 0x70, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x72,
+ 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x2e, 0x54, 0x78, 0x6e, 0x4c, 0x6f, 0x6f, 0x6b, 0x75, 0x70, 0x52,
+ 0x65, 0x70, 0x6c, 0x79, 0x12, 0x3c, 0x0a, 0x08, 0x4e, 0x6f, 0x64, 0x65, 0x49, 0x6e, 0x66, 0x6f,
+ 0x12, 0x18, 0x2e, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x2e, 0x4e, 0x6f, 0x64, 0x65, 0x73, 0x49,
+ 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x72, 0x65, 0x6d,
+ 0x6f, 0x74, 0x65, 0x2e, 0x4e, 0x6f, 0x64, 0x65, 0x73, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x70,
+ 0x6c, 0x79, 0x12, 0x33, 0x0a, 0x05, 0x50, 0x65, 0x65, 0x72, 0x73, 0x12, 0x16, 0x2e, 0x67, 0x6f,
+ 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d,
+ 0x70, 0x74, 0x79, 0x1a, 0x12, 0x2e, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x2e, 0x50, 0x65, 0x65,
+ 0x72, 0x73, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x37, 0x0a, 0x07, 0x41, 0x64, 0x64, 0x50, 0x65,
+ 0x65, 0x72, 0x12, 0x16, 0x2e, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x2e, 0x41, 0x64, 0x64, 0x50,
+ 0x65, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x14, 0x2e, 0x72, 0x65, 0x6d,
+ 0x6f, 0x74, 0x65, 0x2e, 0x41, 0x64, 0x64, 0x50, 0x65, 0x65, 0x72, 0x52, 0x65, 0x70, 0x6c, 0x79,
+ 0x12, 0x41, 0x0a, 0x0c, 0x50, 0x65, 0x6e, 0x64, 0x69, 0x6e, 0x67, 0x42, 0x6c, 0x6f, 0x63, 0x6b,
+ 0x12, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
+ 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x19, 0x2e, 0x72, 0x65, 0x6d, 0x6f, 0x74,
+ 0x65, 0x2e, 0x50, 0x65, 0x6e, 0x64, 0x69, 0x6e, 0x67, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x65,
+ 0x70, 0x6c, 0x79, 0x12, 0x46, 0x0a, 0x0c, 0x42, 0x6f, 0x72, 0x54, 0x78, 0x6e, 0x4c, 0x6f, 0x6f,
+ 0x6b, 0x75, 0x70, 0x12, 0x1b, 0x2e, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x2e, 0x42, 0x6f, 0x72,
+ 0x54, 0x78, 0x6e, 0x4c, 0x6f, 0x6f, 0x6b, 0x75, 0x70, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+ 0x1a, 0x19, 0x2e, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x2e, 0x42, 0x6f, 0x72, 0x54, 0x78, 0x6e,
+ 0x4c, 0x6f, 0x6f, 0x6b, 0x75, 0x70, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x3d, 0x0a, 0x09, 0x42,
+ 0x6f, 0x72, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x12, 0x18, 0x2e, 0x72, 0x65, 0x6d, 0x6f, 0x74,
+ 0x65, 0x2e, 0x42, 0x6f, 0x72, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65,
+ 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x2e, 0x42, 0x6f, 0x72, 0x45,
+ 0x76, 0x65, 0x6e, 0x74, 0x73, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x42, 0x16, 0x5a, 0x14, 0x2e, 0x2f,
+ 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x3b, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x70, 0x72, 0x6f,
+ 0x74, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
@@ -2120,7 +1899,7 @@ func file_remote_ethbackend_proto_rawDescGZIP() []byte {
}
var file_remote_ethbackend_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
-var file_remote_ethbackend_proto_msgTypes = make([]protoimpl.MessageInfo, 36)
+var file_remote_ethbackend_proto_msgTypes = make([]protoimpl.MessageInfo, 32)
var file_remote_ethbackend_proto_goTypes = []any{
(Event)(0), // 0: remote.Event
(*EtherbaseRequest)(nil), // 1: remote.EtherbaseRequest
@@ -2155,79 +1934,77 @@ var file_remote_ethbackend_proto_goTypes = []any{
(*PendingBlockReply)(nil), // 30: remote.PendingBlockReply
(*EngineGetPayloadBodiesByHashV1Request)(nil), // 31: remote.EngineGetPayloadBodiesByHashV1Request
(*EngineGetPayloadBodiesByRangeV1Request)(nil), // 32: remote.EngineGetPayloadBodiesByRangeV1Request
- (*BorTxnLookupRequest)(nil), // 33: remote.BorTxnLookupRequest
- (*BorTxnLookupReply)(nil), // 34: remote.BorTxnLookupReply
- (*BorEventsRequest)(nil), // 35: remote.BorEventsRequest
- (*BorEventsReply)(nil), // 36: remote.BorEventsReply
- (*typesproto.H160)(nil), // 37: types.H160
- (*typesproto.H256)(nil), // 38: types.H256
- (*typesproto.NodeInfoReply)(nil), // 39: types.NodeInfoReply
- (*typesproto.PeerInfo)(nil), // 40: types.PeerInfo
- (*emptypb.Empty)(nil), // 41: google.protobuf.Empty
- (*typesproto.VersionReply)(nil), // 42: types.VersionReply
+ (*typesproto.H160)(nil), // 33: types.H160
+ (*typesproto.H256)(nil), // 34: types.H256
+ (*typesproto.NodeInfoReply)(nil), // 35: types.NodeInfoReply
+ (*typesproto.PeerInfo)(nil), // 36: types.PeerInfo
+ (*emptypb.Empty)(nil), // 37: google.protobuf.Empty
+ (*BorTxnLookupRequest)(nil), // 38: remote.BorTxnLookupRequest
+ (*BorEventsRequest)(nil), // 39: remote.BorEventsRequest
+ (*typesproto.VersionReply)(nil), // 40: types.VersionReply
+ (*BorTxnLookupReply)(nil), // 41: remote.BorTxnLookupReply
+ (*BorEventsReply)(nil), // 42: remote.BorEventsReply
}
var file_remote_ethbackend_proto_depIdxs = []int32{
- 37, // 0: remote.EtherbaseReply.address:type_name -> types.H160
- 38, // 1: remote.CanonicalHashReply.hash:type_name -> types.H256
- 38, // 2: remote.HeaderNumberRequest.hash:type_name -> types.H256
+ 33, // 0: remote.EtherbaseReply.address:type_name -> types.H160
+ 34, // 1: remote.CanonicalHashReply.hash:type_name -> types.H256
+ 34, // 2: remote.HeaderNumberRequest.hash:type_name -> types.H256
0, // 3: remote.SubscribeRequest.type:type_name -> remote.Event
0, // 4: remote.SubscribeReply.type:type_name -> remote.Event
- 37, // 5: remote.LogsFilterRequest.addresses:type_name -> types.H160
- 38, // 6: remote.LogsFilterRequest.topics:type_name -> types.H256
- 37, // 7: remote.SubscribeLogsReply.address:type_name -> types.H160
- 38, // 8: remote.SubscribeLogsReply.block_hash:type_name -> types.H256
- 38, // 9: remote.SubscribeLogsReply.topics:type_name -> types.H256
- 38, // 10: remote.SubscribeLogsReply.transaction_hash:type_name -> types.H256
- 38, // 11: remote.BlockRequest.block_hash:type_name -> types.H256
- 38, // 12: remote.TxnLookupRequest.txn_hash:type_name -> types.H256
- 39, // 13: remote.NodesInfoReply.nodes_info:type_name -> types.NodeInfoReply
- 40, // 14: remote.PeersReply.peers:type_name -> types.PeerInfo
- 38, // 15: remote.EngineGetPayloadBodiesByHashV1Request.hashes:type_name -> types.H256
- 38, // 16: remote.BorTxnLookupRequest.bor_tx_hash:type_name -> types.H256
- 38, // 17: remote.BorEventsRequest.block_hash:type_name -> types.H256
- 1, // 18: remote.ETHBACKEND.Etherbase:input_type -> remote.EtherbaseRequest
- 3, // 19: remote.ETHBACKEND.NetVersion:input_type -> remote.NetVersionRequest
- 5, // 20: remote.ETHBACKEND.NetPeerCount:input_type -> remote.NetPeerCountRequest
- 41, // 21: remote.ETHBACKEND.Version:input_type -> google.protobuf.Empty
- 7, // 22: remote.ETHBACKEND.ProtocolVersion:input_type -> remote.ProtocolVersionRequest
- 9, // 23: remote.ETHBACKEND.ClientVersion:input_type -> remote.ClientVersionRequest
- 17, // 24: remote.ETHBACKEND.Subscribe:input_type -> remote.SubscribeRequest
- 19, // 25: remote.ETHBACKEND.SubscribeLogs:input_type -> remote.LogsFilterRequest
- 21, // 26: remote.ETHBACKEND.Block:input_type -> remote.BlockRequest
- 15, // 27: remote.ETHBACKEND.CanonicalBodyForStorage:input_type -> remote.CanonicalBodyForStorageRequest
- 11, // 28: remote.ETHBACKEND.CanonicalHash:input_type -> remote.CanonicalHashRequest
- 13, // 29: remote.ETHBACKEND.HeaderNumber:input_type -> remote.HeaderNumberRequest
- 23, // 30: remote.ETHBACKEND.TxnLookup:input_type -> remote.TxnLookupRequest
- 25, // 31: remote.ETHBACKEND.NodeInfo:input_type -> remote.NodesInfoRequest
- 41, // 32: remote.ETHBACKEND.Peers:input_type -> google.protobuf.Empty
- 26, // 33: remote.ETHBACKEND.AddPeer:input_type -> remote.AddPeerRequest
- 41, // 34: remote.ETHBACKEND.PendingBlock:input_type -> google.protobuf.Empty
- 33, // 35: remote.ETHBACKEND.BorTxnLookup:input_type -> remote.BorTxnLookupRequest
- 35, // 36: remote.ETHBACKEND.BorEvents:input_type -> remote.BorEventsRequest
- 2, // 37: remote.ETHBACKEND.Etherbase:output_type -> remote.EtherbaseReply
- 4, // 38: remote.ETHBACKEND.NetVersion:output_type -> remote.NetVersionReply
- 6, // 39: remote.ETHBACKEND.NetPeerCount:output_type -> remote.NetPeerCountReply
- 42, // 40: remote.ETHBACKEND.Version:output_type -> types.VersionReply
- 8, // 41: remote.ETHBACKEND.ProtocolVersion:output_type -> remote.ProtocolVersionReply
- 10, // 42: remote.ETHBACKEND.ClientVersion:output_type -> remote.ClientVersionReply
- 18, // 43: remote.ETHBACKEND.Subscribe:output_type -> remote.SubscribeReply
- 20, // 44: remote.ETHBACKEND.SubscribeLogs:output_type -> remote.SubscribeLogsReply
- 22, // 45: remote.ETHBACKEND.Block:output_type -> remote.BlockReply
- 16, // 46: remote.ETHBACKEND.CanonicalBodyForStorage:output_type -> remote.CanonicalBodyForStorageReply
- 12, // 47: remote.ETHBACKEND.CanonicalHash:output_type -> remote.CanonicalHashReply
- 14, // 48: remote.ETHBACKEND.HeaderNumber:output_type -> remote.HeaderNumberReply
- 24, // 49: remote.ETHBACKEND.TxnLookup:output_type -> remote.TxnLookupReply
- 27, // 50: remote.ETHBACKEND.NodeInfo:output_type -> remote.NodesInfoReply
- 28, // 51: remote.ETHBACKEND.Peers:output_type -> remote.PeersReply
- 29, // 52: remote.ETHBACKEND.AddPeer:output_type -> remote.AddPeerReply
- 30, // 53: remote.ETHBACKEND.PendingBlock:output_type -> remote.PendingBlockReply
- 34, // 54: remote.ETHBACKEND.BorTxnLookup:output_type -> remote.BorTxnLookupReply
- 36, // 55: remote.ETHBACKEND.BorEvents:output_type -> remote.BorEventsReply
- 37, // [37:56] is the sub-list for method output_type
- 18, // [18:37] is the sub-list for method input_type
- 18, // [18:18] is the sub-list for extension type_name
- 18, // [18:18] is the sub-list for extension extendee
- 0, // [0:18] is the sub-list for field type_name
+ 33, // 5: remote.LogsFilterRequest.addresses:type_name -> types.H160
+ 34, // 6: remote.LogsFilterRequest.topics:type_name -> types.H256
+ 33, // 7: remote.SubscribeLogsReply.address:type_name -> types.H160
+ 34, // 8: remote.SubscribeLogsReply.block_hash:type_name -> types.H256
+ 34, // 9: remote.SubscribeLogsReply.topics:type_name -> types.H256
+ 34, // 10: remote.SubscribeLogsReply.transaction_hash:type_name -> types.H256
+ 34, // 11: remote.BlockRequest.block_hash:type_name -> types.H256
+ 34, // 12: remote.TxnLookupRequest.txn_hash:type_name -> types.H256
+ 35, // 13: remote.NodesInfoReply.nodes_info:type_name -> types.NodeInfoReply
+ 36, // 14: remote.PeersReply.peers:type_name -> types.PeerInfo
+ 34, // 15: remote.EngineGetPayloadBodiesByHashV1Request.hashes:type_name -> types.H256
+ 1, // 16: remote.ETHBACKEND.Etherbase:input_type -> remote.EtherbaseRequest
+ 3, // 17: remote.ETHBACKEND.NetVersion:input_type -> remote.NetVersionRequest
+ 5, // 18: remote.ETHBACKEND.NetPeerCount:input_type -> remote.NetPeerCountRequest
+ 37, // 19: remote.ETHBACKEND.Version:input_type -> google.protobuf.Empty
+ 7, // 20: remote.ETHBACKEND.ProtocolVersion:input_type -> remote.ProtocolVersionRequest
+ 9, // 21: remote.ETHBACKEND.ClientVersion:input_type -> remote.ClientVersionRequest
+ 17, // 22: remote.ETHBACKEND.Subscribe:input_type -> remote.SubscribeRequest
+ 19, // 23: remote.ETHBACKEND.SubscribeLogs:input_type -> remote.LogsFilterRequest
+ 21, // 24: remote.ETHBACKEND.Block:input_type -> remote.BlockRequest
+ 15, // 25: remote.ETHBACKEND.CanonicalBodyForStorage:input_type -> remote.CanonicalBodyForStorageRequest
+ 11, // 26: remote.ETHBACKEND.CanonicalHash:input_type -> remote.CanonicalHashRequest
+ 13, // 27: remote.ETHBACKEND.HeaderNumber:input_type -> remote.HeaderNumberRequest
+ 23, // 28: remote.ETHBACKEND.TxnLookup:input_type -> remote.TxnLookupRequest
+ 25, // 29: remote.ETHBACKEND.NodeInfo:input_type -> remote.NodesInfoRequest
+ 37, // 30: remote.ETHBACKEND.Peers:input_type -> google.protobuf.Empty
+ 26, // 31: remote.ETHBACKEND.AddPeer:input_type -> remote.AddPeerRequest
+ 37, // 32: remote.ETHBACKEND.PendingBlock:input_type -> google.protobuf.Empty
+ 38, // 33: remote.ETHBACKEND.BorTxnLookup:input_type -> remote.BorTxnLookupRequest
+ 39, // 34: remote.ETHBACKEND.BorEvents:input_type -> remote.BorEventsRequest
+ 2, // 35: remote.ETHBACKEND.Etherbase:output_type -> remote.EtherbaseReply
+ 4, // 36: remote.ETHBACKEND.NetVersion:output_type -> remote.NetVersionReply
+ 6, // 37: remote.ETHBACKEND.NetPeerCount:output_type -> remote.NetPeerCountReply
+ 40, // 38: remote.ETHBACKEND.Version:output_type -> types.VersionReply
+ 8, // 39: remote.ETHBACKEND.ProtocolVersion:output_type -> remote.ProtocolVersionReply
+ 10, // 40: remote.ETHBACKEND.ClientVersion:output_type -> remote.ClientVersionReply
+ 18, // 41: remote.ETHBACKEND.Subscribe:output_type -> remote.SubscribeReply
+ 20, // 42: remote.ETHBACKEND.SubscribeLogs:output_type -> remote.SubscribeLogsReply
+ 22, // 43: remote.ETHBACKEND.Block:output_type -> remote.BlockReply
+ 16, // 44: remote.ETHBACKEND.CanonicalBodyForStorage:output_type -> remote.CanonicalBodyForStorageReply
+ 12, // 45: remote.ETHBACKEND.CanonicalHash:output_type -> remote.CanonicalHashReply
+ 14, // 46: remote.ETHBACKEND.HeaderNumber:output_type -> remote.HeaderNumberReply
+ 24, // 47: remote.ETHBACKEND.TxnLookup:output_type -> remote.TxnLookupReply
+ 27, // 48: remote.ETHBACKEND.NodeInfo:output_type -> remote.NodesInfoReply
+ 28, // 49: remote.ETHBACKEND.Peers:output_type -> remote.PeersReply
+ 29, // 50: remote.ETHBACKEND.AddPeer:output_type -> remote.AddPeerReply
+ 30, // 51: remote.ETHBACKEND.PendingBlock:output_type -> remote.PendingBlockReply
+ 41, // 52: remote.ETHBACKEND.BorTxnLookup:output_type -> remote.BorTxnLookupReply
+ 42, // 53: remote.ETHBACKEND.BorEvents:output_type -> remote.BorEventsReply
+ 35, // [35:54] is the sub-list for method output_type
+ 16, // [16:35] is the sub-list for method input_type
+ 16, // [16:16] is the sub-list for extension type_name
+ 16, // [16:16] is the sub-list for extension extendee
+ 0, // [0:16] is the sub-list for field type_name
}
func init() { file_remote_ethbackend_proto_init() }
@@ -2235,6 +2012,7 @@ func file_remote_ethbackend_proto_init() {
if File_remote_ethbackend_proto != nil {
return
}
+ file_remote_bor_proto_init()
if !protoimpl.UnsafeEnabled {
file_remote_ethbackend_proto_msgTypes[0].Exporter = func(v any, i int) any {
switch v := v.(*EtherbaseRequest); i {
@@ -2620,54 +2398,6 @@ func file_remote_ethbackend_proto_init() {
return nil
}
}
- file_remote_ethbackend_proto_msgTypes[32].Exporter = func(v any, i int) any {
- switch v := v.(*BorTxnLookupRequest); i {
- case 0:
- return &v.state
- case 1:
- return &v.sizeCache
- case 2:
- return &v.unknownFields
- default:
- return nil
- }
- }
- file_remote_ethbackend_proto_msgTypes[33].Exporter = func(v any, i int) any {
- switch v := v.(*BorTxnLookupReply); i {
- case 0:
- return &v.state
- case 1:
- return &v.sizeCache
- case 2:
- return &v.unknownFields
- default:
- return nil
- }
- }
- file_remote_ethbackend_proto_msgTypes[34].Exporter = func(v any, i int) any {
- switch v := v.(*BorEventsRequest); i {
- case 0:
- return &v.state
- case 1:
- return &v.sizeCache
- case 2:
- return &v.unknownFields
- default:
- return nil
- }
- }
- file_remote_ethbackend_proto_msgTypes[35].Exporter = func(v any, i int) any {
- switch v := v.(*BorEventsReply); i {
- case 0:
- return &v.state
- case 1:
- return &v.sizeCache
- case 2:
- return &v.unknownFields
- default:
- return nil
- }
- }
}
file_remote_ethbackend_proto_msgTypes[13].OneofWrappers = []any{}
type x struct{}
@@ -2676,7 +2406,7 @@ func file_remote_ethbackend_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_remote_ethbackend_proto_rawDesc,
NumEnums: 1,
- NumMessages: 36,
+ NumMessages: 32,
NumExtensions: 0,
NumServices: 1,
},
diff --git a/erigon-lib/kv/kv_interface.go b/erigon-lib/kv/kv_interface.go
index c26ff4dc181..862b5fb1928 100644
--- a/erigon-lib/kv/kv_interface.go
+++ b/erigon-lib/kv/kv_interface.go
@@ -557,7 +557,15 @@ type TemporalGetter interface {
type TemporalTx interface {
Tx
TemporalGetter
+
+ // DomainGetAsOf - state as of given `ts`
+ // Example: GetAsOf(Account, key, txNum) - retuns account's value before `txNum` transaction changed it
+ // Means if you want re-execute `txNum` on historical state - do `GetAsOf(key, txNum)` to read state
+ // `ok = false` means: key not found. or "future txNum" passed.
DomainGetAsOf(name Domain, k, k2 []byte, ts uint64) (v []byte, ok bool, err error)
+
+ // HistorySeek - like `DomainGetAsOf` but without latest state - only for `History`
+ // `ok == true && v != nil && len(v) == 0` means key-creation even
HistorySeek(name History, k []byte, ts uint64) (v []byte, ok bool, err error)
// IndexRange - return iterator over range of inverted index for given key `k`
@@ -573,8 +581,6 @@ type TemporalTx interface {
// HistoryRange - producing "state patch" - sorted list of keys updated at [fromTs,toTs) with their most-recent value.
// no duplicates
HistoryRange(name History, fromTs, toTs int, asc order.By, limit int) (it stream.KV, err error)
-
- AppendableGet(name Appendable, ts TxnId) ([]byte, bool, error)
}
type TxnId uint64 // internal auto-increment ID. can't cast to eth-network canonical blocks txNum
@@ -603,10 +609,11 @@ type TemporalPutDel interface {
// - if `val == nil` it will call DomainDel
DomainDel(domain Domain, k1, k2 []byte, prevVal []byte, prevStep uint64) error
DomainDelPrefix(domain Domain, prefix []byte) error
-
- AppendablePut(name Appendable, ts TxnId, v []byte) error
}
type CanWarmupDB interface {
WarmupDB(force bool) error
LockDBInRam() error
}
+type HasSpaceDirty interface {
+ SpaceDirty() (uint64, uint64, error)
+}
diff --git a/erigon-lib/kv/membatchwithdb/memory_mutation.go b/erigon-lib/kv/membatchwithdb/memory_mutation.go
index 61f6ba656eb..70d3df91530 100644
--- a/erigon-lib/kv/membatchwithdb/memory_mutation.go
+++ b/erigon-lib/kv/membatchwithdb/memory_mutation.go
@@ -758,8 +758,3 @@ func (m *MemoryMutation) DomainRange(name kv.Domain, fromKey, toKey []byte, ts u
panic("not supported")
//return m.db.(kv.TemporalTx).DomainRange(name, fromKey, toKey, ts, asc, limit)
}
-
-func (m *MemoryMutation) AppendableGet(name kv.Appendable, ts kv.TxnId) ([]byte, bool, error) {
- panic("not supported")
- //return m.db.(kv.TemporalTx).AppendableGet(name, ts)
-}
diff --git a/erigon-lib/kv/membatchwithdb/memory_mutation_test.go b/erigon-lib/kv/membatchwithdb/memory_mutation_test.go
index f407775f1d1..463d0f67783 100644
--- a/erigon-lib/kv/membatchwithdb/memory_mutation_test.go
+++ b/erigon-lib/kv/membatchwithdb/memory_mutation_test.go
@@ -212,7 +212,7 @@ func NewTestTemporalDb(tb testing.TB) (kv.RwDB, kv.RwTx, *stateLib.Aggregator) {
db := memdb.NewStateDB(tb.TempDir())
tb.Cleanup(db.Close)
- agg, err := stateLib.NewAggregator(context.Background(), datadir.New(tb.TempDir()), 16, db, nil, log.New())
+ agg, err := stateLib.NewAggregator(context.Background(), datadir.New(tb.TempDir()), 16, db, log.New())
if err != nil {
tb.Fatal(err)
}
diff --git a/erigon-lib/kv/rawdbv3/txnum.go b/erigon-lib/kv/rawdbv3/txnum.go
index c4fd1330954..b15919d8cef 100644
--- a/erigon-lib/kv/rawdbv3/txnum.go
+++ b/erigon-lib/kv/rawdbv3/txnum.go
@@ -67,7 +67,7 @@ func DefaultReadTxNumFunc(tx kv.Tx, c kv.Cursor, blockNum uint64) (maxTxNum uint
return 0, false, nil
}
if len(v) != 8 {
- return 0, false, fmt.Errorf("seems broken TxNum value: %x", v)
+ return 0, false, fmt.Errorf("DefaultReadTxNumFunc: seems broken TxNum value: %x", v)
}
return binary.BigEndian.Uint64(v), true, nil
}
@@ -201,7 +201,7 @@ func (t TxNumsReader) FindBlockNum(tx kv.Tx, endTxNumMinimax uint64) (ok bool, b
return false, 0, nil
}
if len(lastK) != 8 {
- return false, 0, fmt.Errorf("seems broken TxNum value: %x", lastK)
+ return false, 0, fmt.Errorf("FindBlockNum: seems broken TxNum value: %x", lastK)
}
lastBlockNum := binary.BigEndian.Uint64(lastK)
@@ -214,10 +214,10 @@ func (t TxNumsReader) FindBlockNum(tx kv.Tx, endTxNumMinimax uint64) (ok bool, b
if err != nil {
return true
}
-
if !ok {
+ _fb, _ft, _ := t.First(tx)
_lb, _lt, _ := t.Last(tx)
- err = fmt.Errorf("FindBlockNum(%d): seems broken TxNum value: %x -> (%x, %x); last in db: (%d, %d)", endTxNumMinimax, seek, i, maxTxNum, _lb, _lt)
+ err = fmt.Errorf("FindBlockNum(%d): seems broken TxNum value: %x -> (%d, %d); db has: (%d-%d, %d-%d)", endTxNumMinimax, seek, i, maxTxNum, _fb, _lb, _ft, _lt)
return true
}
return maxTxNum >= endTxNumMinimax
@@ -237,14 +237,14 @@ func (TxNumsReader) Last(tx kv.Tx) (blockNum, txNum uint64, err error) {
}
defer c.Close()
- lastK, lastV, err := c.Last()
+ k, v, err := c.Last()
if err != nil {
return 0, 0, err
}
- if lastK == nil || lastV == nil {
+ if k == nil || v == nil {
return 0, 0, nil
}
- return binary.BigEndian.Uint64(lastK), binary.BigEndian.Uint64(lastV), nil
+ return binary.BigEndian.Uint64(k), binary.BigEndian.Uint64(v), nil
}
func (TxNumsReader) First(tx kv.Tx) (blockNum, txNum uint64, err error) {
c, err := tx.Cursor(kv.MaxTxNum)
@@ -253,14 +253,14 @@ func (TxNumsReader) First(tx kv.Tx) (blockNum, txNum uint64, err error) {
}
defer c.Close()
- lastK, lastV, err := c.First()
+ k, v, err := c.First()
if err != nil {
return 0, 0, err
}
- if lastK == nil || lastV == nil {
+ if k == nil || v == nil {
return 0, 0, nil
}
- return binary.BigEndian.Uint64(lastK), binary.BigEndian.Uint64(lastV), nil
+ return binary.BigEndian.Uint64(k), binary.BigEndian.Uint64(v), nil
}
// LastKey
@@ -355,7 +355,9 @@ func (i *MapTxNum2BlockNumIter) Next() (txNum, blockNum uint64, txIndex int, isF
return
}
if !ok {
- return txNum, i.blockNum, txIndex, isFinalTxn, blockNumChanged, fmt.Errorf("can't find blockNumber by txnID=%d", txNum)
+ _lb, _lt, _ := i.txNumsReader.Last(i.tx)
+ _fb, _ft, _ := i.txNumsReader.First(i.tx)
+ return txNum, i.blockNum, txIndex, isFinalTxn, blockNumChanged, fmt.Errorf("can't find blockNumber by txnID=%d; last in db: (%d-%d, %d-%d)", txNum, _fb, _lb, _ft, _lt)
}
}
blockNum = i.blockNum
diff --git a/erigon-lib/kv/remotedb/kv_remote.go b/erigon-lib/kv/remotedb/kv_remote.go
index ab511ec51bc..a69a246003f 100644
--- a/erigon-lib/kv/remotedb/kv_remote.go
+++ b/erigon-lib/kv/remotedb/kv_remote.go
@@ -677,9 +677,6 @@ func (tx *tx) IndexRange(name kv.InvertedIdx, k []byte, fromTs, toTs int, asc or
return reply.Timestamps, reply.NextPageToken, nil
}), nil
}
-func (tx *tx) AppendableGet(name kv.Appendable, ts kv.TxnId) ([]byte, bool, error) {
- panic("not implemented yet")
-}
func (tx *tx) Prefix(table string, prefix []byte) (stream.KV, error) {
nextPrefix, ok := kv.NextSubtree(prefix)
diff --git a/erigon-lib/kv/stream/stream.go b/erigon-lib/kv/stream/stream.go
index ca523451e20..4cb5179273e 100644
--- a/erigon-lib/kv/stream/stream.go
+++ b/erigon-lib/kv/stream/stream.go
@@ -66,9 +66,6 @@ func (it *ArrStream[V]) NextBatch() ([]V, error) {
}
func Range[T constraints.Integer](from, to T) *RangeIter[T] {
- if from == to {
- to++
- }
return &RangeIter[T]{i: from, to: to}
}
diff --git a/erigon-lib/kv/stream/stream_test.go b/erigon-lib/kv/stream/stream_test.go
index bc9550390f8..ff6e1f3e708 100644
--- a/erigon-lib/kv/stream/stream_test.go
+++ b/erigon-lib/kv/stream/stream_test.go
@@ -213,7 +213,7 @@ func TestRange(t *testing.T) {
s1 := stream.Range[uint64](1, 1)
res, err := stream.ToArray[uint64](s1)
require.NoError(t, err)
- require.Equal(t, []uint64{1}, res)
+ require.Empty(t, res)
})
}
diff --git a/erigon-lib/kv/tables.go b/erigon-lib/kv/tables.go
index c14bebcd15d..172b99d4381 100644
--- a/erigon-lib/kv/tables.go
+++ b/erigon-lib/kv/tables.go
@@ -371,30 +371,31 @@ const (
// Domains/History/InvertedIndices
// Contants have "Tbl" prefix, to avoid collision with actual Domain names
// This constants is very rarely used in APP, but Domain/History/Idx names are widely used
- TblAccountKeys = "AccountKeys"
TblAccountVals = "AccountVals"
TblAccountHistoryKeys = "AccountHistoryKeys"
TblAccountHistoryVals = "AccountHistoryVals"
TblAccountIdx = "AccountIdx"
- TblStorageKeys = "StorageKeys"
TblStorageVals = "StorageVals"
TblStorageHistoryKeys = "StorageHistoryKeys"
TblStorageHistoryVals = "StorageHistoryVals"
TblStorageIdx = "StorageIdx"
- TblCodeKeys = "CodeKeys"
TblCodeVals = "CodeVals"
TblCodeHistoryKeys = "CodeHistoryKeys"
TblCodeHistoryVals = "CodeHistoryVals"
TblCodeIdx = "CodeIdx"
- TblCommitmentKeys = "CommitmentKeys"
TblCommitmentVals = "CommitmentVals"
TblCommitmentHistoryKeys = "CommitmentHistoryKeys"
TblCommitmentHistoryVals = "CommitmentHistoryVals"
TblCommitmentIdx = "CommitmentIdx"
+ TblReceiptVals = "ReceiptVals"
+ TblReceiptHistoryKeys = "ReceiptHistoryKeys"
+ TblReceiptHistoryVals = "ReceiptHistoryVals"
+ TblReceiptIdx = "ReceiptIdx"
+
TblLogAddressKeys = "LogAddressKeys"
TblLogAddressIdx = "LogAddressIdx"
TblLogTopicsKeys = "LogTopicsKeys"
@@ -570,30 +571,31 @@ var ChaindataTables = []string{
BorCheckpoints,
BorCheckpointEnds,
BorProducerSelections,
- TblAccountKeys,
TblAccountVals,
TblAccountHistoryKeys,
TblAccountHistoryVals,
TblAccountIdx,
- TblStorageKeys,
TblStorageVals,
TblStorageHistoryKeys,
TblStorageHistoryVals,
TblStorageIdx,
- TblCodeKeys,
TblCodeVals,
TblCodeHistoryKeys,
TblCodeHistoryVals,
TblCodeIdx,
- TblCommitmentKeys,
TblCommitmentVals,
TblCommitmentHistoryKeys,
TblCommitmentHistoryVals,
TblCommitmentIdx,
+ TblReceiptVals,
+ TblReceiptHistoryKeys,
+ TblReceiptHistoryVals,
+ TblReceiptIdx,
+
TblLogAddressKeys,
TblLogAddressIdx,
TblLogTopicsKeys,
@@ -738,24 +740,24 @@ var ChaindataTablesCfg = TableCfg{
},
CallTraceSet: {Flags: DupSort},
- TblAccountKeys: {Flags: DupSort},
TblAccountVals: {Flags: DupSort},
TblAccountHistoryKeys: {Flags: DupSort},
TblAccountHistoryVals: {Flags: DupSort},
TblAccountIdx: {Flags: DupSort},
- TblStorageKeys: {Flags: DupSort},
TblStorageVals: {Flags: DupSort},
TblStorageHistoryKeys: {Flags: DupSort},
TblStorageHistoryVals: {Flags: DupSort},
TblStorageIdx: {Flags: DupSort},
- TblCodeKeys: {Flags: DupSort},
TblCodeHistoryKeys: {Flags: DupSort},
TblCodeIdx: {Flags: DupSort},
- TblCommitmentKeys: {Flags: DupSort},
TblCommitmentVals: {Flags: DupSort},
TblCommitmentHistoryKeys: {Flags: DupSort},
TblCommitmentHistoryVals: {Flags: DupSort},
TblCommitmentIdx: {Flags: DupSort},
+ TblReceiptVals: {Flags: DupSort},
+ TblReceiptHistoryKeys: {Flags: DupSort},
+ TblReceiptHistoryVals: {Flags: DupSort},
+ TblReceiptIdx: {Flags: DupSort},
TblLogAddressKeys: {Flags: DupSort},
TblLogAddressIdx: {Flags: DupSort},
TblLogTopicsKeys: {Flags: DupSort},
@@ -881,7 +883,8 @@ const (
StorageDomain Domain = 1
CodeDomain Domain = 2
CommitmentDomain Domain = 3
- DomainLen Domain = 4
+ ReceiptDomain Domain = 4
+ DomainLen Domain = 5
)
const (
@@ -889,6 +892,7 @@ const (
StorageHistory History = "StorageHistory"
CodeHistory History = "CodeHistory"
CommitmentHistory History = "CommitmentHistory"
+ ReceiptHistory History = "ReceiptHistory"
)
const (
@@ -896,6 +900,7 @@ const (
StorageHistoryIdx InvertedIdx = "StorageHistoryIdx"
CodeHistoryIdx InvertedIdx = "CodeHistoryIdx"
CommitmentHistoryIdx InvertedIdx = "CommitmentHistoryIdx"
+ ReceiptHistoryIdx InvertedIdx = "ReceiptHistoryIdx"
LogTopicIdx InvertedIdx = "LogTopicIdx"
LogAddrIdx InvertedIdx = "LogAddrIdx"
@@ -910,9 +915,8 @@ const (
)
const (
- //ReceiptsAppendable Appendable = 0
- //AppendableLen Appendable = 1
- AppendableLen Appendable = 0
+ ReceiptsAppendable Appendable = 0
+ AppendableLen Appendable = 0
)
func (iip InvertedIdxPos) String() string {
@@ -940,6 +944,8 @@ func (d Domain) String() string {
return "code"
case CommitmentDomain:
return "commitment"
+ case ReceiptDomain:
+ return "receipt"
default:
return "unknown domain"
}
@@ -955,6 +961,8 @@ func String2Domain(in string) (Domain, error) {
return CodeDomain, nil
case "commitment":
return CommitmentDomain, nil
+ case "receipt":
+ return ReceiptDomain, nil
default:
return Domain(MaxUint16), fmt.Errorf("unknown history name: %s", in)
}
@@ -964,9 +972,18 @@ const MaxUint16 uint16 = 1<<16 - 1
func (iip Appendable) String() string {
switch iip {
- //case ReceiptsAppendable:
- // return "receipts"
+ case ReceiptsAppendable:
+ return "receipts"
default:
return "unknown Appendable"
}
}
+
+func String2Appendable(in string) (Appendable, error) {
+ switch in {
+ case "receipts":
+ return ReceiptsAppendable, nil
+ default:
+ return Appendable(MaxUint16), fmt.Errorf("unknown Appendable name: %s", in)
+ }
+}
diff --git a/erigon-lib/kv/temporal/kv_temporal.go b/erigon-lib/kv/temporal/kv_temporal.go
index adb5d8464a1..8aecc7565c5 100644
--- a/erigon-lib/kv/temporal/kv_temporal.go
+++ b/erigon-lib/kv/temporal/kv_temporal.go
@@ -242,7 +242,3 @@ func (tx *Tx) HistoryRange(name kv.History, fromTs, toTs int, asc order.By, limi
tx.resourcesToClose = append(tx.resourcesToClose, it)
return it, nil
}
-
-func (tx *Tx) AppendableGet(name kv.Appendable, ts kv.TxnId) ([]byte, bool, error) {
- return tx.filesTx.AppendableGet(name, ts, tx.MdbxTx)
-}
diff --git a/erigon-lib/kv/temporal/temporaltest/kv_temporal_testdb.go b/erigon-lib/kv/temporal/temporaltest/kv_temporal_testdb.go
index 6065614849e..0076d15daac 100644
--- a/erigon-lib/kv/temporal/temporaltest/kv_temporal_testdb.go
+++ b/erigon-lib/kv/temporal/temporaltest/kv_temporal_testdb.go
@@ -42,7 +42,7 @@ func NewTestDB(tb testing.TB, dirs datadir.Dirs) (db kv.RwDB, agg *state.Aggrega
}
var err error
- agg, err = state.NewAggregator(context.Background(), dirs, config3.HistoryV3AggregationStep, db, nil, log.New())
+ agg, err = state.NewAggregator(context.Background(), dirs, config3.HistoryV3AggregationStep, db, log.New())
if err != nil {
panic(err)
}
diff --git a/erigon-lib/p2p/sentry/util_test.go b/erigon-lib/p2p/sentry/util_test.go
index 7a6062a59ee..4f00ef56c7c 100644
--- a/erigon-lib/p2p/sentry/util_test.go
+++ b/erigon-lib/p2p/sentry/util_test.go
@@ -8,7 +8,7 @@ import (
"github.com/erigontech/erigon-lib/gointerfaces"
"github.com/erigontech/erigon-lib/gointerfaces/sentryproto"
"github.com/erigontech/erigon-lib/gointerfaces/typesproto"
- sentry "github.com/erigontech/erigon-lib/p2p/sentry"
+ "github.com/erigontech/erigon-lib/p2p/sentry"
"github.com/stretchr/testify/require"
"go.uber.org/mock/gomock"
"google.golang.org/grpc"
diff --git a/erigon-lib/recsplit/index.go b/erigon-lib/recsplit/index.go
index 32aac96093a..7946c59c011 100644
--- a/erigon-lib/recsplit/index.go
+++ b/erigon-lib/recsplit/index.go
@@ -66,7 +66,7 @@ const (
// SupportedFeaturs - if see feature not from this list (likely after downgrade) - return IncompatibleErr and recommend for user manually delete file
var SupportedFeatures = []Features{Enums, LessFalsePositives}
-var IncompatibleErr = errors.New("incompatible. can re-build such files by command 'erigon snapshots index'")
+var IncompatibleErr = errors.New("incompatible. can re-build such files by command 'erigon seg index'")
// Index implements index lookup from the file created by the RecSplit
type Index struct {
diff --git a/erigon-lib/seg/compress.go b/erigon-lib/seg/compress.go
index 4bbabe7b90e..17bb8ee156b 100644
--- a/erigon-lib/seg/compress.go
+++ b/erigon-lib/seg/compress.go
@@ -179,6 +179,17 @@ func (c *Compressor) WorkersAmount() int { return c.Workers }
func (c *Compressor) Count() int { return int(c.wordsCount) }
+func (c *Compressor) ReadFrom(g *Getter) error {
+ var v []byte
+ for g.HasNext() {
+ v, _ = g.Next(v[:0])
+ if err := c.AddWord(v); err != nil {
+ return err
+ }
+ }
+ return nil
+}
+
func (c *Compressor) AddWord(word []byte) error {
select {
case <-c.ctx.Done():
diff --git a/erigon-lib/seg/seg_auto_rw.go b/erigon-lib/seg/seg_auto_rw.go
index 37ff5bddb21..f16dc073f3e 100644
--- a/erigon-lib/seg/seg_auto_rw.go
+++ b/erigon-lib/seg/seg_auto_rw.go
@@ -141,6 +141,17 @@ func (c *Writer) AddWord(word []byte) error {
return c.Compressor.AddUncompressedWord(word)
}
+func (c *Writer) ReadFrom(r *Reader) error {
+ var v []byte
+ for r.HasNext() {
+ v, _ = r.Next(v[:0])
+ if err := c.AddWord(v); err != nil {
+ return err
+ }
+ }
+ return nil
+}
+
func (c *Writer) Close() {
if c.Compressor != nil {
c.Compressor.Close()
diff --git a/erigon-lib/state/aggregator.go b/erigon-lib/state/aggregator.go
index 8534dfacaa8..4931a5b7f35 100644
--- a/erigon-lib/state/aggregator.go
+++ b/erigon-lib/state/aggregator.go
@@ -17,7 +17,6 @@
package state
import (
- "bytes"
"context"
"encoding/binary"
"errors"
@@ -57,7 +56,6 @@ type Aggregator struct {
db kv.RoDB
d [kv.DomainLen]*Domain
iis [kv.StandaloneIdxLen]*InvertedIndex
- ap [kv.AppendableLen]*Appendable //nolint
dirs datadir.Dirs
tmpdir string
aggregationStep uint64
@@ -82,8 +80,6 @@ type Aggregator struct {
ctx context.Context
ctxCancel context.CancelFunc
- needSaveFilesListInDB atomic.Bool
-
wg sync.WaitGroup // goroutines spawned by Aggregator, to ensure all of them are finish at agg.Close
onFreeze OnFreezeFunc
@@ -102,8 +98,9 @@ type Aggregator struct {
type OnFreezeFunc func(frozenFileNames []string)
const AggregatorSqueezeCommitmentValues = true
+const MaxNonFuriousDirtySpacePerTx = 64 * datasize.MB
-func NewAggregator(ctx context.Context, dirs datadir.Dirs, aggregationStep uint64, db kv.RoDB, iters CanonicalsReader, logger log.Logger) (*Aggregator, error) {
+func NewAggregator(ctx context.Context, dirs datadir.Dirs, aggregationStep uint64, db kv.RoDB, logger log.Logger) (*Aggregator, error) {
tmpdir := dirs.Tmp
salt, err := getStateIndicesSalt(dirs.Snap)
if err != nil {
@@ -181,9 +178,11 @@ func NewAggregator(ctx context.Context, dirs datadir.Dirs, aggregationStep uint6
cfg = domainCfg{
hist: histCfg{
iiCfg: iiCfg{salt: salt, dirs: dirs, db: db},
- withLocalityIndex: false, withExistenceIndex: false, compression: seg.CompressKeys | seg.CompressVals, historyLargeValues: true,
+ withLocalityIndex: false, withExistenceIndex: false, historyLargeValues: true,
+ compression: seg.CompressKeys | seg.CompressVals,
},
largeVals: true,
+ compress: seg.CompressVals, // compress Code with keys doesn't show any profit. compress of values show 4x ratio on eth-mainnet and 2.5x ratio on bor-mainnet
}
if a.d[kv.CodeDomain], err = NewDomain(cfg, aggregationStep, kv.CodeDomain, kv.TblCodeVals, kv.TblCodeHistoryKeys, kv.TblCodeHistoryVals, kv.TblCodeIdx, integrityCheck, logger); err != nil {
return nil, err
@@ -201,12 +200,17 @@ func NewAggregator(ctx context.Context, dirs datadir.Dirs, aggregationStep uint6
if a.d[kv.CommitmentDomain], err = NewDomain(cfg, aggregationStep, kv.CommitmentDomain, kv.TblCommitmentVals, kv.TblCommitmentHistoryKeys, kv.TblCommitmentHistoryVals, kv.TblCommitmentIdx, integrityCheck, logger); err != nil {
return nil, err
}
- //aCfg := AppendableCfg{
- // Salt: salt, Dirs: dirs, DB: db, iters: iters,
- //}
- //if a.ap[kv.ReceiptsAppendable], err = NewAppendable(aCfg, aggregationStep, "receipts", kv.Receipts, nil, logger); err != nil {
- // return nil, err
- //}
+ cfg = domainCfg{
+ hist: histCfg{
+ iiCfg: iiCfg{salt: salt, dirs: dirs, db: db},
+ withLocalityIndex: false, withExistenceIndex: false,
+ compression: seg.CompressNone, historyLargeValues: false,
+ },
+ compress: seg.CompressNone, //seg.CompressKeys | seg.CompressVals,
+ }
+ if a.d[kv.ReceiptDomain], err = NewDomain(cfg, aggregationStep, kv.ReceiptDomain, kv.TblReceiptVals, kv.TblReceiptHistoryKeys, kv.TblReceiptHistoryVals, kv.TblReceiptIdx, integrityCheck, logger); err != nil {
+ return nil, err
+ }
if err := a.registerII(kv.LogAddrIdxPos, salt, dirs, db, aggregationStep, kv.FileLogAddressIdx, kv.TblLogAddressKeys, kv.TblLogAddressIdx, logger); err != nil {
return nil, err
}
@@ -245,22 +249,25 @@ func getStateIndicesSalt(baseDir string) (salt *uint32, err error) {
if saltExists && !saltStateExists {
_ = os.Rename(filepath.Join(baseDir, "salt.txt"), filepath.Join(baseDir, "salt-state.txt"))
}
+
fpath := filepath.Join(baseDir, "salt-state.txt")
fexists, err := dir.FileExist(fpath)
if err != nil {
return nil, err
}
+
+ // Initialize salt if it doesn't exist
if !fexists {
- if salt == nil {
- saltV := rand2.Uint32()
- salt = &saltV
- }
+ saltV := rand2.Uint32()
+ salt = &saltV
saltBytes := make([]byte, 4)
binary.BigEndian.PutUint32(saltBytes, *salt)
if err := dir.WriteFileWithFsync(fpath, saltBytes, os.ModePerm); err != nil {
return nil, err
}
+ return salt, nil // Return the newly created salt directly
}
+
saltBytes, err := os.ReadFile(fpath)
if err != nil {
return nil, err
@@ -349,9 +356,6 @@ func (a *Aggregator) closeDirtyFiles() {
for _, ii := range a.iis {
ii.Close()
}
- for _, ap := range a.ap {
- ap.Close()
- }
}
func (a *Aggregator) SetCollateAndBuildWorkers(i int) { a.collateAndBuildWorkers = i }
@@ -363,9 +367,6 @@ func (a *Aggregator) SetCompressWorkers(i int) {
for _, ii := range a.iis {
ii.compressCfg.Workers = i
}
- for _, ap := range a.ap {
- ap.compressCfg.Workers = i
- }
}
func (a *Aggregator) DiscardHistory(name kv.Domain) *Aggregator {
@@ -392,9 +393,6 @@ func (ac *AggregatorRoTx) Files() []string {
for _, ii := range ac.iis {
res = append(res, ii.Files()...)
}
- for _, ap := range ac.appendable {
- res = append(res, ap.Files()...)
- }
return res
}
func (a *Aggregator) Files() []string {
@@ -425,9 +423,6 @@ func (a *Aggregator) LS() {
for _, d := range a.iis {
doLS(d.dirtyFiles)
}
- for _, d := range a.ap {
- doLS(d.dirtyFiles)
- }
}
func (a *Aggregator) BuildOptionalMissedIndicesInBackground(ctx context.Context, workers int) {
@@ -506,9 +501,6 @@ func (a *Aggregator) BuildMissedIndices(ctx context.Context, workers int) error
for _, ii := range a.iis {
ii.BuildMissedAccessors(ctx, g, ps)
}
- for _, appendable := range a.ap {
- appendable.BuildMissedAccessors(ctx, g, ps)
- }
if err := g.Wait(); err != nil {
return err
@@ -587,9 +579,8 @@ func (c AggV3Collation) Close() {
}
type AggV3StaticFiles struct {
- d [kv.DomainLen]StaticFiles
- ivfs [kv.StandaloneIdxLen]InvertedFiles
- appendable [kv.AppendableLen]AppendableFiles
+ d [kv.DomainLen]StaticFiles
+ ivfs [kv.StandaloneIdxLen]InvertedFiles
}
// CleanupOnError - call it on collation fail. It's closing all files
@@ -600,9 +591,6 @@ func (sf AggV3StaticFiles) CleanupOnError() {
for _, ivf := range sf.ivfs {
ivf.CleanupOnError()
}
- for _, ap := range sf.appendable {
- ap.CleanupOnError()
- }
}
func (a *Aggregator) buildFiles(ctx context.Context, step uint64) error {
@@ -634,6 +622,12 @@ func (a *Aggregator) buildFiles(ctx context.Context, step uint64) error {
g.SetLimit(a.collateAndBuildWorkers)
for _, d := range a.d {
d := d
+ dc := d.BeginFilesRo()
+ firstStepNotInFiles := dc.FirstStepNotInFiles()
+ dc.Close()
+ if step < firstStepNotInFiles {
+ continue
+ }
a.wg.Add(1)
g.Go(func() error {
@@ -670,6 +664,13 @@ func (a *Aggregator) buildFiles(ctx context.Context, step uint64) error {
// indices are built concurrently
for _, ii := range a.iis {
ii := ii
+ dc := ii.BeginFilesRo()
+ firstStepNotInFiles := dc.FirstStepNotInFiles()
+ dc.Close()
+ if step < firstStepNotInFiles {
+ continue
+ }
+
a.wg.Add(1)
g.Go(func() error {
defer a.wg.Done()
@@ -703,32 +704,6 @@ func (a *Aggregator) buildFiles(ctx context.Context, step uint64) error {
return nil
})
}
-
- for name, ap := range a.ap {
- name := name
- ap := ap
- a.wg.Add(1)
- g.Go(func() error {
- defer a.wg.Done()
-
- var collation AppendableCollation
- err := a.db.View(ctx, func(tx kv.Tx) (err error) {
- collation, err = ap.collate(ctx, step, tx)
- return err
- })
- if err != nil {
- return fmt.Errorf("index collation %q has failed: %w", ap.filenameBase, err)
- }
- sf, err := ap.buildFiles(ctx, step, collation, a.ps)
- if err != nil {
- sf.CleanupOnError()
- return err
- }
- static.appendable[name] = sf
- return nil
- })
- }
-
if err := g.Wait(); err != nil {
static.CleanupOnError()
return fmt.Errorf("domain collate-build: %w", err)
@@ -770,7 +745,41 @@ Loop:
return nil
}
-func (a *Aggregator) mergeLoopStep(ctx context.Context) (somethingDone bool, err error) {
+// [from, to)
+func (a *Aggregator) BuildFiles2(ctx context.Context, fromStep, toStep uint64) error {
+ if ok := a.buildingFiles.CompareAndSwap(false, true); !ok {
+ return nil
+ }
+ go func() {
+ defer a.buildingFiles.Store(false)
+ if toStep > fromStep {
+ log.Info("[agg] build", "fromStep", fromStep, "toStep", toStep)
+ }
+ for step := fromStep; step < toStep; step++ { //`step` must be fully-written - means `step+1` records must be visible
+ if err := a.buildFiles(ctx, step); err != nil {
+ if errors.Is(err, context.Canceled) || errors.Is(err, common2.ErrStopped) {
+ panic(err)
+ }
+ a.logger.Warn("[snapshots] buildFilesInBackground", "err", err)
+ panic(err)
+ }
+ }
+
+ if ok := a.mergingFiles.CompareAndSwap(false, true); !ok {
+ return
+ }
+ go func() {
+ defer a.mergingFiles.Store(false)
+ if err := a.MergeLoop(ctx); err != nil {
+ panic(err)
+ }
+ }()
+ }()
+
+ return nil
+}
+
+func (a *Aggregator) mergeLoopStep(ctx context.Context, toTxNum uint64) (somethingDone bool, err error) {
a.logger.Debug("[agg] merge", "collate_workers", a.collateAndBuildWorkers, "merge_workers", a.mergeWorkers, "compress_workers", a.d[kv.AccountsDomain].compressCfg.Workers)
aggTx := a.BeginFilesRo()
@@ -780,7 +789,7 @@ func (a *Aggregator) mergeLoopStep(ctx context.Context) (somethingDone bool, err
closeAll := true
maxSpan := StepsInColdFile * a.StepSize()
- r := aggTx.findMergeRange(a.visibleFilesMinimaxTxNum.Load(), maxSpan)
+ r := aggTx.findMergeRange(toTxNum, maxSpan)
if !r.any() {
return false, nil
}
@@ -808,8 +817,6 @@ func (a *Aggregator) mergeLoopStep(ctx context.Context) (somethingDone bool, err
a.recalcVisibleFiles(a.DirtyFilesEndTxNumMinimax())
a.cleanAfterMerge(in)
- a.needSaveFilesListInDB.Store(true)
-
a.onFreeze(in.FrozenList())
closeAll = false
return true, nil
@@ -817,7 +824,7 @@ func (a *Aggregator) mergeLoopStep(ctx context.Context) (somethingDone bool, err
func (a *Aggregator) MergeLoop(ctx context.Context) error {
for {
- somethingMerged, err := a.mergeLoopStep(ctx)
+ somethingMerged, err := a.mergeLoopStep(ctx, a.visibleFilesMinimaxTxNum.Load())
if err != nil {
return err
}
@@ -828,8 +835,6 @@ func (a *Aggregator) MergeLoop(ctx context.Context) error {
}
func (a *Aggregator) integrateDirtyFiles(sf AggV3StaticFiles, txNumFrom, txNumTo uint64) {
- defer a.needSaveFilesListInDB.Store(true)
-
a.dirtyFilesLock.Lock()
defer a.dirtyFilesLock.Unlock()
@@ -841,13 +846,6 @@ func (a *Aggregator) integrateDirtyFiles(sf AggV3StaticFiles, txNumFrom, txNumTo
}
}
-func (a *Aggregator) HasNewFrozenFiles() bool {
- if a == nil {
- return false
- }
- return a.needSaveFilesListInDB.CompareAndSwap(true, false)
-}
-
type flusher interface {
Flush(ctx context.Context, tx kv.RwTx) error
}
@@ -1025,6 +1023,15 @@ func (ac *AggregatorRoTx) PruneSmallBatches(ctx context.Context, timeout time.Du
fullStat := newAggregatorPruneStat()
for {
+ if sptx, ok := tx.(kv.HasSpaceDirty); ok && !furiousPrune && !aggressivePrune {
+ spaceDirty, _, err := sptx.SpaceDirty()
+ if err != nil {
+ return false, err
+ }
+ if spaceDirty > uint64(MaxNonFuriousDirtySpacePerTx) {
+ return false, nil
+ }
+ }
iterationStarted := time.Now()
// `context.Background()` is important here!
// it allows keep DB consistent - prune all keys-related data or noting
@@ -1082,9 +1089,8 @@ func (a *Aggregator) StepsRangeInDBAsStr(tx kv.Tx) string {
}
type AggregatorPruneStat struct {
- Domains map[string]*DomainPruneStat
- Indices map[string]*InvertedIndexPruneStat
- Appendable map[string]*AppendablePruneStat
+ Domains map[string]*DomainPruneStat
+ Indices map[string]*InvertedIndexPruneStat
}
func (as *AggregatorPruneStat) PrunedNothing() bool {
@@ -1102,7 +1108,7 @@ func (as *AggregatorPruneStat) PrunedNothing() bool {
}
func newAggregatorPruneStat() *AggregatorPruneStat {
- return &AggregatorPruneStat{Domains: make(map[string]*DomainPruneStat), Indices: make(map[string]*InvertedIndexPruneStat), Appendable: make(map[string]*AppendablePruneStat)}
+ return &AggregatorPruneStat{Domains: make(map[string]*DomainPruneStat), Indices: make(map[string]*InvertedIndexPruneStat)}
}
func (as *AggregatorPruneStat) String() string {
@@ -1234,14 +1240,6 @@ func (ac *AggregatorRoTx) Prune(ctx context.Context, tx kv.RwTx, limit uint64, l
aggStat.Indices[ac.iis[i].ii.filenameBase] = stats[i]
}
- for i := 0; i < int(kv.AppendableLen); i++ {
- var err error
- aggStat.Appendable[ac.appendable[i].ap.filenameBase], err = ac.appendable[i].Prune(ctx, tx, txFrom, txTo, limit, logEvery, false, nil)
- if err != nil {
- return nil, err
- }
- }
-
return aggStat, nil
}
@@ -1369,12 +1367,6 @@ func (a *Aggregator) recalcVisibleFiles(toTxNum uint64) {
}
ii.reCalcVisibleFiles(toTxNum)
}
- for _, ap := range a.ap {
- if ap == nil {
- continue
- }
- ap.reCalcVisibleFiles(toTxNum)
- }
}
func (a *Aggregator) recalcVisibleFilesMinimaxTxNum() {
@@ -1386,7 +1378,6 @@ func (a *Aggregator) recalcVisibleFilesMinimaxTxNum() {
type RangesV3 struct {
domain [kv.DomainLen]DomainRanges
invertedIndex [kv.StandaloneIdxLen]*MergeRange
- appendable [kv.AppendableLen]*MergeRange
}
func (r RangesV3) String() string {
@@ -1403,11 +1394,6 @@ func (r RangesV3) String() string {
ss = append(ss, mr.String(kv.InvertedIdxPos(p).String(), aggStep))
}
}
- for p, mr := range r.appendable {
- if mr != nil && mr.needMerge {
- ss = append(ss, mr.String(kv.Appendable(p).String(), aggStep))
- }
- }
return strings.Join(ss, ", ")
}
@@ -1422,11 +1408,6 @@ func (r RangesV3) any() bool {
return true
}
}
- for _, ap := range r.appendable {
- if ap != nil && ap.needMerge {
- return true
- }
- }
return false
}
@@ -1459,7 +1440,7 @@ func (ac *AggregatorRoTx) findMergeRange(maxEndTxNum, maxSpan uint64) RangesV3 {
}
// commitment waits until storage and account are merged so it may be a bit behind (if merge was interrupted before)
if !dr.values.needMerge || cr.values.to < dr.values.from {
- if mf := ac.d[kd].lookupFileByItsRange(cr.values.from, cr.values.to); mf != nil {
+ if mf := ac.d[kd].lookupDirtyFileByItsRange(cr.values.from, cr.values.to); mf != nil {
// file for required range exists, hold this domain from merge but allow to merge comitemnt
r.domain[k].values = MergeRange{}
ac.a.logger.Debug("findMergeRange: commitment range is different but file exists in domain, hold further merge",
@@ -1481,232 +1462,11 @@ func (ac *AggregatorRoTx) findMergeRange(maxEndTxNum, maxSpan uint64) RangesV3 {
for id, ii := range ac.iis {
r.invertedIndex[id] = ii.findMergeRange(maxEndTxNum, maxSpan)
}
- for id, ap := range ac.appendable {
- r.appendable[id] = ap.findMergeRange(maxEndTxNum, maxSpan)
- }
+
//log.Info(fmt.Sprintf("findMergeRange(%d, %d)=%s\n", maxEndTxNum/ac.a.aggregationStep, maxSpan/ac.a.aggregationStep, r))
return r
}
-// SqueezeCommitmentFiles should be called only when NO EXECUTION is running.
-// Removes commitment files and suppose following aggregator shutdown and restart (to integrate new files and rebuild indexes)
-func (ac *AggregatorRoTx) SqueezeCommitmentFiles(mergedAgg *AggregatorRoTx) error {
- if !ac.a.commitmentValuesTransform {
- return nil
- }
-
- commitment := ac.d[kv.CommitmentDomain]
- accounts := ac.d[kv.AccountsDomain]
- storage := ac.d[kv.StorageDomain]
-
- // oh, again accessing domain.files directly, again and again..
- mergedAccountFiles := mergedAgg.d[kv.AccountsDomain].d.dirtyFiles.Items()
- mergedStorageFiles := mergedAgg.d[kv.StorageDomain].d.dirtyFiles.Items()
- mergedCommitFiles := mergedAgg.d[kv.CommitmentDomain].d.dirtyFiles.Items()
-
- for _, f := range accounts.files {
- f.src.decompressor.EnableMadvNormal()
- }
- for _, f := range mergedAccountFiles {
- f.decompressor.EnableMadvNormal()
- }
- for _, f := range storage.files {
- f.src.decompressor.EnableMadvNormal()
- }
- for _, f := range mergedStorageFiles {
- f.decompressor.EnableMadvNormal()
- }
- for _, f := range commitment.files {
- f.src.decompressor.EnableMadvNormal()
- }
- for _, f := range mergedCommitFiles {
- f.decompressor.EnableMadvNormal()
- }
- defer func() {
- for _, f := range accounts.files {
- f.src.decompressor.DisableReadAhead()
- }
- for _, f := range mergedAccountFiles {
- f.decompressor.DisableReadAhead()
- }
- for _, f := range storage.files {
- f.src.decompressor.DisableReadAhead()
- }
- for _, f := range mergedStorageFiles {
- f.decompressor.DisableReadAhead()
- }
- for _, f := range commitment.files {
- f.src.decompressor.DisableReadAhead()
- }
- for _, f := range mergedCommitFiles {
- f.decompressor.DisableReadAhead()
- }
- }()
-
- log.Info("[sqeeze_migration] see target files", "acc", len(mergedAccountFiles), "st", len(mergedStorageFiles), "com", len(mergedCommitFiles))
-
- getSizeDelta := func(a, b string) (datasize.ByteSize, float32, error) {
- ai, err := os.Stat(a)
- if err != nil {
- return 0, 0, err
- }
- bi, err := os.Stat(b)
- if err != nil {
- return 0, 0, err
- }
- return datasize.ByteSize(ai.Size()) - datasize.ByteSize(bi.Size()), 100.0 * (float32(ai.Size()-bi.Size()) / float32(ai.Size())), nil
- }
-
- var (
- obsoleteFiles []string
- temporalFiles []string
- processedFiles int
- ai, si int
- sizeDelta = datasize.B
- sqExt = ".squeezed"
- )
- logEvery := time.NewTicker(30 * time.Second)
- defer logEvery.Stop()
-
- for ci := 0; ci < len(mergedCommitFiles); ci++ {
- cf := mergedCommitFiles[ci]
- for ai = 0; ai < len(mergedAccountFiles); ai++ {
- if mergedAccountFiles[ai].startTxNum == cf.startTxNum && mergedAccountFiles[ai].endTxNum == cf.endTxNum {
- break
- }
- }
- for si = 0; si < len(mergedStorageFiles); si++ {
- if mergedStorageFiles[si].startTxNum == cf.startTxNum && mergedStorageFiles[si].endTxNum == cf.endTxNum {
- break
- }
- }
- if ai == len(mergedAccountFiles) || si == len(mergedStorageFiles) {
- ac.a.logger.Info("[sqeeze_migration] commitment file has no corresponding account or storage file", "commitment", cf.decompressor.FileName())
- continue
- }
-
- err := func() error {
- af, sf := mergedAccountFiles[ai], mergedStorageFiles[si]
-
- steps := cf.endTxNum/ac.a.aggregationStep - cf.startTxNum/ac.a.aggregationStep
- compression := commitment.d.compression
- if steps < DomainMinStepsToCompress {
- compression = seg.CompressNone
- }
- ac.a.logger.Info("[sqeeze_migration] file start", "original", cf.decompressor.FileName(),
- "progress", fmt.Sprintf("%d/%d", ci+1, len(mergedAccountFiles)), "compress_cfg", commitment.d.compressCfg, "compress", compression)
-
- originalPath := cf.decompressor.FilePath()
- squeezedTmpPath := originalPath + sqExt + ".tmp"
-
- squeezedCompr, err := seg.NewCompressor(context.Background(), "squeeze", squeezedTmpPath, ac.a.dirs.Tmp,
- commitment.d.compressCfg, log.LvlInfo, commitment.d.logger)
- if err != nil {
- return err
- }
- defer squeezedCompr.Close()
-
- reader := seg.NewReader(cf.decompressor.MakeGetter(), compression)
- reader.Reset(0)
-
- writer := seg.NewWriter(squeezedCompr, commitment.d.compression)
- rng := MergeRange{needMerge: true, from: af.startTxNum, to: af.endTxNum}
- vt, err := commitment.commitmentValTransformDomain(rng, accounts, storage, af, sf)
- if err != nil {
- return fmt.Errorf("failed to create commitment value transformer: %w", err)
- }
-
- i := 0
- var k, v []byte
- for reader.HasNext() {
- k, _ = reader.Next(k[:0])
- v, _ = reader.Next(v[:0])
- i += 2
-
- if k == nil {
- // nil keys are not supported for domains
- continue
- }
-
- if !bytes.Equal(k, keyCommitmentState) {
- v, err = vt(v, af.startTxNum, af.endTxNum)
- if err != nil {
- return fmt.Errorf("failed to transform commitment value: %w", err)
- }
- }
- if err = writer.AddWord(k); err != nil {
- return fmt.Errorf("write key word: %w", err)
- }
- if err = writer.AddWord(v); err != nil {
- return fmt.Errorf("write value word: %w", err)
- }
-
- select {
- case <-logEvery.C:
- ac.a.logger.Info("[sqeeze_migration]", "file", cf.decompressor.FileName(), "k", fmt.Sprintf("%x", k),
- "progress", fmt.Sprintf("%d/%d", i, cf.decompressor.Count()))
- default:
- }
- }
-
- if err = writer.Compress(); err != nil {
- return err
- }
- writer.Close()
-
- squeezedPath := originalPath + sqExt
- if err = os.Rename(squeezedTmpPath, squeezedPath); err != nil {
- return err
- }
- temporalFiles = append(temporalFiles, squeezedPath)
-
- delta, deltaP, err := getSizeDelta(originalPath, squeezedPath)
- if err != nil {
- return err
- }
- sizeDelta += delta
-
- ac.a.logger.Info("[sqeeze_migration] file done", "original", filepath.Base(originalPath),
- "sizeDelta", fmt.Sprintf("%s (%.1f%%)", delta.HR(), deltaP))
-
- fromStep, toStep := af.startTxNum/ac.a.StepSize(), af.endTxNum/ac.a.StepSize()
-
- // need to remove all indexes for commitment file as well
- obsoleteFiles = append(obsoleteFiles,
- originalPath,
- commitment.d.kvBtFilePath(fromStep, toStep),
- commitment.d.kvAccessorFilePath(fromStep, toStep),
- commitment.d.kvExistenceIdxFilePath(fromStep, toStep),
- )
- processedFiles++
- return nil
- }()
- if err != nil {
- return fmt.Errorf("failed to squeeze commitment file %q: %w", cf.decompressor.FileName(), err)
- }
- }
-
- ac.a.logger.Info("[sqeeze_migration] squeezed files has been produced, removing obsolete files",
- "toRemove", len(obsoleteFiles), "processed", fmt.Sprintf("%d/%d", processedFiles, len(mergedCommitFiles)))
- for _, path := range obsoleteFiles {
- if err := os.Remove(path); err != nil && !errors.Is(err, os.ErrNotExist) {
- return err
- }
- ac.a.logger.Debug("[sqeeze_migration] obsolete file removal", "path", path)
- }
- ac.a.logger.Info("[sqeeze_migration] indices removed, renaming temporal files ")
-
- for _, path := range temporalFiles {
- if err := os.Rename(path, strings.TrimSuffix(path, sqExt)); err != nil {
- return err
- }
- ac.a.logger.Debug("[sqeeze_migration] temporal file renaming", "path", path)
- }
- ac.a.logger.Info("[sqeeze_migration] done", "sizeDelta", sizeDelta.HR(), "files", len(mergedAccountFiles))
-
- return nil
-}
-
func (ac *AggregatorRoTx) RestrictSubsetFileDeletions(b bool) {
ac.a.d[kv.AccountsDomain].restrictSubsetFileDeletions = b
ac.a.d[kv.StorageDomain].restrictSubsetFileDeletions = b
@@ -1779,19 +1539,6 @@ func (ac *AggregatorRoTx) mergeFiles(ctx context.Context, files SelectedStaticFi
})
}
- for id, rng := range r.appendable {
- if !rng.needMerge {
- continue
- }
- id := id
- rng := rng
- g.Go(func() error {
- var err error
- mf.appendable[id], err = ac.appendable[id].mergeFiles(ctx, files.appendable[id], rng.from, rng.to, ac.a.ps)
- return err
- })
- }
-
err := g.Wait()
if err == nil {
closeFiles = false
@@ -1803,8 +1550,6 @@ func (ac *AggregatorRoTx) mergeFiles(ctx context.Context, files SelectedStaticFi
}
func (a *Aggregator) integrateMergedDirtyFiles(outs SelectedStaticFilesV3, in MergedFilesV3) {
- defer a.needSaveFilesListInDB.Store(true)
-
a.dirtyFilesLock.Lock()
defer a.dirtyFilesLock.Unlock()
@@ -1816,9 +1561,6 @@ func (a *Aggregator) integrateMergedDirtyFiles(outs SelectedStaticFilesV3, in Me
ii.integrateMergedDirtyFiles(outs.ii[id], in.iis[id])
}
- for id, ap := range a.ap {
- ap.integrateMergedDirtyFiles(outs.appendable[id], in.appendable[id])
- }
}
func (a *Aggregator) cleanAfterMerge(in MergedFilesV3) {
@@ -1834,9 +1576,6 @@ func (a *Aggregator) cleanAfterMerge(in MergedFilesV3) {
for id, ii := range at.iis {
ii.cleanAfterMerge(in.iis[id])
}
- for id, ap := range at.appendable {
- ap.cleanAfterMerge(in.appendable[id])
- }
}
// KeepRecentTxnsOfHistoriesWithDisabledSnapshots limits amount of recent transactions protected from prune in domains history.
@@ -1958,6 +1697,8 @@ func (ac *AggregatorRoTx) IndexRange(name kv.InvertedIdx, k []byte, fromTs, toTs
return ac.d[kv.CodeDomain].ht.IdxRange(k, fromTs, toTs, asc, limit, tx)
case kv.CommitmentHistoryIdx:
return ac.d[kv.StorageDomain].ht.IdxRange(k, fromTs, toTs, asc, limit, tx)
+ case kv.ReceiptHistoryIdx:
+ return ac.d[kv.ReceiptDomain].ht.IdxRange(k, fromTs, toTs, asc, limit, tx)
//case kv.GasUsedHistoryIdx:
// return ac.d[kv.GasUsedDomain].ht.IdxRange(k, fromTs, toTs, asc, limit, tx)
case kv.LogTopicIdx:
@@ -1992,6 +1733,8 @@ func (ac *AggregatorRoTx) HistorySeek(name kv.History, key []byte, ts uint64, tx
return ac.d[kv.CodeDomain].ht.HistorySeek(key, ts, tx)
case kv.CommitmentHistory:
return ac.d[kv.CommitmentDomain].ht.HistorySeek(key, ts, tx)
+ case kv.ReceiptHistory:
+ return ac.d[kv.ReceiptDomain].ht.HistorySeek(key, ts, tx)
//case kv.GasUsedHistory:
// return ac.d[kv.GasUsedDomain].ht.HistorySeek(key, ts, tx)
default:
@@ -2028,10 +1771,9 @@ func (ac *AggregatorRoTx) HistoryRange(name kv.History, fromTs, toTs int, asc or
// - user will not see "partial writes" or "new files appearance"
// - last reader removing garbage files inside `Close` method
type AggregatorRoTx struct {
- a *Aggregator
- d [kv.DomainLen]*DomainRoTx
- iis [kv.StandaloneIdxLen]*InvertedIndexRoTx
- appendable [kv.AppendableLen]*AppendableRoTx
+ a *Aggregator
+ d [kv.DomainLen]*DomainRoTx
+ iis [kv.StandaloneIdxLen]*InvertedIndexRoTx
id uint64 // auto-increment id of ctx for logs
_leakID uint64 // set only if TRACE_AGG=true
@@ -2051,9 +1793,6 @@ func (a *Aggregator) BeginFilesRo() *AggregatorRoTx {
for id, d := range a.d {
ac.d[id] = d.BeginFilesRo()
}
- for id, ap := range a.ap {
- ac.appendable[id] = ap.BeginFilesRo()
- }
a.visibleFilesLock.RUnlock()
return ac
@@ -2070,8 +1809,7 @@ func (ac *AggregatorRoTx) DomainRangeLatest(tx kv.Tx, domain kv.Domain, from, to
}
func (ac *AggregatorRoTx) DomainGetAsOf(tx kv.Tx, name kv.Domain, key []byte, ts uint64) (v []byte, ok bool, err error) {
- v, err = ac.d[name].GetAsOf(key, ts, tx)
- return v, v != nil, err
+ return ac.d[name].GetAsOf(key, ts, tx)
}
func (ac *AggregatorRoTx) GetLatest(domain kv.Domain, k, k2 []byte, tx kv.Tx) (v []byte, step uint64, ok bool, err error) {
return ac.d[domain].GetLatest(k, k2, tx)
@@ -2114,6 +1852,11 @@ func (ac *AggregatorRoTx) DebugEFAllValuesAreInRange(ctx context.Context, name k
if err != nil {
return err
}
+ case kv.ReceiptHistoryIdx:
+ err := ac.d[kv.ReceiptDomain].ht.iit.DebugEFAllValuesAreInRange(ctx, failFast, fromStep)
+ if err != nil {
+ return err
+ }
//case kv.GasUsedHistoryIdx:
// err := ac.d[kv.GasUsedDomain].ht.iit.DebugEFAllValuesAreInRange(ctx)
// if err != nil {
@@ -2147,14 +1890,6 @@ func (ac *AggregatorRoTx) DebugEFAllValuesAreInRange(ctx context.Context, name k
// --- Domain part END ---
-func (ac *AggregatorRoTx) AppendableGet(name kv.Appendable, ts kv.TxnId, tx kv.Tx) (v []byte, ok bool, err error) {
- return ac.appendable[name].Get(ts, tx)
-}
-
-func (ac *AggregatorRoTx) AppendablePut(name kv.Appendable, txnID kv.TxnId, v []byte, tx kv.RwTx) (err error) {
- return ac.appendable[name].Append(txnID, v, tx)
-}
-
func (ac *AggregatorRoTx) Close() {
if ac == nil || ac.a == nil { // invariant: it's safe to call Close multiple times
return
@@ -2170,9 +1905,6 @@ func (ac *AggregatorRoTx) Close() {
for _, ii := range ac.iis {
ii.Close()
}
- for _, ap := range ac.appendable {
- ap.Close()
- }
}
// Inverted index tables only
diff --git a/erigon-lib/state/aggregator_bench_test.go b/erigon-lib/state/aggregator_bench_test.go
index 7c1be6f6f4b..894563f9eef 100644
--- a/erigon-lib/state/aggregator_bench_test.go
+++ b/erigon-lib/state/aggregator_bench_test.go
@@ -48,7 +48,7 @@ func testDbAndAggregatorBench(b *testing.B, aggStep uint64) (kv.RwDB, *Aggregato
return kv.ChaindataTablesCfg
}).MustOpen()
b.Cleanup(db.Close)
- agg, err := NewAggregator(context.Background(), dirs, aggStep, db, nil, logger)
+ agg, err := NewAggregator(context.Background(), dirs, aggStep, db, logger)
require.NoError(b, err)
b.Cleanup(agg.Close)
return db, agg
diff --git a/erigon-lib/state/aggregator_files.go b/erigon-lib/state/aggregator_files.go
index 9b5ade8b7fb..679b0dae6b6 100644
--- a/erigon-lib/state/aggregator_files.go
+++ b/erigon-lib/state/aggregator_files.go
@@ -27,11 +27,10 @@ import (
)
type SelectedStaticFilesV3 struct {
- d [kv.DomainLen][]*filesItem
- dHist [kv.DomainLen][]*filesItem
- dIdx [kv.DomainLen][]*filesItem
- ii [kv.StandaloneIdxLen][]*filesItem
- appendable [kv.AppendableLen][]*filesItem
+ d [kv.DomainLen][]*filesItem
+ dHist [kv.DomainLen][]*filesItem
+ dIdx [kv.DomainLen][]*filesItem
+ ii [kv.StandaloneIdxLen][]*filesItem
}
func (sf SelectedStaticFilesV3) Close() {
@@ -70,21 +69,14 @@ func (ac *AggregatorRoTx) staticFilesInRange(r RangesV3) (sf SelectedStaticFiles
}
sf.ii[id] = ac.iis[id].staticFilesInRange(rng.from, rng.to)
}
- for id, rng := range r.appendable {
- if rng == nil || !rng.needMerge {
- continue
- }
- sf.appendable[id] = ac.appendable[id].staticFilesInRange(rng.from, rng.to)
- }
return sf, err
}
type MergedFilesV3 struct {
- d [kv.DomainLen]*filesItem
- dHist [kv.DomainLen]*filesItem
- dIdx [kv.DomainLen]*filesItem
- iis [kv.StandaloneIdxLen]*filesItem
- appendable [kv.AppendableLen]*filesItem
+ d [kv.DomainLen]*filesItem
+ dHist [kv.DomainLen]*filesItem
+ dIdx [kv.DomainLen]*filesItem
+ iis [kv.StandaloneIdxLen]*filesItem
}
func (mf MergedFilesV3) FrozenList() (frozen []string) {
diff --git a/erigon-lib/state/aggregator_test.go b/erigon-lib/state/aggregator_test.go
index 7278b2a22cc..f2e1d3c7a9c 100644
--- a/erigon-lib/state/aggregator_test.go
+++ b/erigon-lib/state/aggregator_test.go
@@ -34,10 +34,6 @@ import (
"github.com/erigontech/erigon-lib/common/background"
"github.com/c2h5oh/datasize"
- "github.com/holiman/uint256"
- "github.com/stretchr/testify/require"
- "go.uber.org/mock/gomock"
-
"github.com/erigontech/erigon-lib/common"
"github.com/erigontech/erigon-lib/common/datadir"
"github.com/erigontech/erigon-lib/common/length"
@@ -50,9 +46,12 @@ import (
"github.com/erigontech/erigon-lib/log/v3"
"github.com/erigontech/erigon-lib/seg"
"github.com/erigontech/erigon-lib/types"
+ "github.com/holiman/uint256"
+ "github.com/stretchr/testify/require"
)
func TestAggregatorV3_Merge(t *testing.T) {
+ t.Parallel()
db, agg := testDbAndAggregatorv3(t, 10)
rwTx, err := db.BeginRwNosync(context.Background())
require.NoError(t, err)
@@ -169,6 +168,7 @@ func TestAggregatorV3_Merge(t *testing.T) {
}
func TestAggregatorV3_MergeValTransform(t *testing.T) {
+ t.Parallel()
db, agg := testDbAndAggregatorv3(t, 10)
rwTx, err := db.BeginRwNosync(context.Background())
require.NoError(t, err)
@@ -258,6 +258,7 @@ func TestAggregatorV3_MergeValTransform(t *testing.T) {
}
func TestAggregatorV3_RestartOnDatadir(t *testing.T) {
+ t.Parallel()
//t.Skip()
t.Run("BPlus", func(t *testing.T) {
rc := runCfg{
@@ -361,15 +362,8 @@ func aggregatorV3_RestartOnDatadir(t *testing.T, rc runCfg) {
agg.Close()
- ctrl := gomock.NewController(t)
- defer ctrl.Finish()
- canonicalsReader := NewMockCanonicalsReader(ctrl)
- canonicalsReader.EXPECT().TxnIdsOfCanonicalBlocks(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).
- Return(stream.EmptyU64, nil).
- AnyTimes()
-
// Start another aggregator on same datadir
- anotherAgg, err := NewAggregator(context.Background(), agg.dirs, aggStep, db, canonicalsReader, logger)
+ anotherAgg, err := NewAggregator(context.Background(), agg.dirs, aggStep, db, logger)
require.NoError(t, err)
defer anotherAgg.Close()
@@ -416,6 +410,7 @@ func aggregatorV3_RestartOnDatadir(t *testing.T, rc runCfg) {
}
func TestNewBtIndex(t *testing.T) {
+ t.Parallel()
keyCount := 10000
kvPath := generateKV(t, t.TempDir(), 20, 10, keyCount, log.New(), seg.CompressNone)
@@ -437,6 +432,7 @@ func TestNewBtIndex(t *testing.T) {
}
func TestAggregatorV3_PruneSmallBatches(t *testing.T) {
+ t.Parallel()
aggStep := uint64(10)
db, agg := testDbAndAggregatorv3(t, aggStep)
@@ -755,6 +751,7 @@ func generateSharedDomainsUpdatesForTx(t *testing.T, domains *SharedDomains, txN
}
func TestAggregatorV3_RestartOnFiles(t *testing.T) {
+ t.Parallel()
logger := log.New()
aggStep := uint64(100)
@@ -829,18 +826,7 @@ func TestAggregatorV3_RestartOnFiles(t *testing.T) {
}).MustOpen()
t.Cleanup(newDb.Close)
- ctrl := gomock.NewController(t)
- defer ctrl.Finish()
- canonicalsReader := NewMockCanonicalsReader(ctrl)
- canonicalsReader.EXPECT().TxnIdsOfCanonicalBlocks(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).
- DoAndReturn(func(tx kv.Tx, txFrom, txTo int, by order.By, i3 int) (stream.U64, error) {
- currentStep := uint64(txFrom) / aggStep
- canonicalBlockTxNum := aggStep*currentStep + 1
- it := stream.Array[uint64]([]uint64{canonicalBlockTxNum})
- return it, nil
- }).
- AnyTimes()
- newAgg, err := NewAggregator(context.Background(), agg.dirs, aggStep, newDb, canonicalsReader, logger)
+ newAgg, err := NewAggregator(context.Background(), agg.dirs, aggStep, newDb, logger)
require.NoError(t, err)
require.NoError(t, newAgg.OpenFolder())
@@ -889,6 +875,7 @@ func TestAggregatorV3_RestartOnFiles(t *testing.T) {
}
func TestAggregatorV3_ReplaceCommittedKeys(t *testing.T) {
+ t.Parallel()
ctx := context.Background()
aggStep := uint64(500)
@@ -991,6 +978,7 @@ func TestAggregatorV3_ReplaceCommittedKeys(t *testing.T) {
}
func Test_EncodeCommitmentState(t *testing.T) {
+ t.Parallel()
cs := commitmentState{
txNum: rand.Uint64(),
trieState: make([]byte, 1024),
@@ -1108,14 +1096,7 @@ func testDbAndAggregatorv3(t *testing.T, aggStep uint64) (kv.RwDB, *Aggregator)
}).MustOpen()
t.Cleanup(db.Close)
- ctrl := gomock.NewController(t)
- defer ctrl.Finish()
- canonicalsReader := NewMockCanonicalsReader(ctrl)
- canonicalsReader.EXPECT().TxnIdsOfCanonicalBlocks(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).
- Return(stream.EmptyU64, nil).
- AnyTimes()
-
- agg, err := NewAggregator(context.Background(), dirs, aggStep, db, canonicalsReader, logger)
+ agg, err := NewAggregator(context.Background(), dirs, aggStep, db, logger)
require.NoError(err)
t.Cleanup(agg.Close)
err = agg.OpenFolder()
@@ -1148,6 +1129,7 @@ func generateInputData(tb testing.TB, keySize, valueSize, keyCount int) ([][]byt
}
func TestAggregatorV3_SharedDomains(t *testing.T) {
+ t.Parallel()
db, agg := testDbAndAggregatorv3(t, 20)
ctx := context.Background()
@@ -1275,6 +1257,7 @@ func TestAggregatorV3_SharedDomains(t *testing.T) {
// also useful to decode given input into v3 account
func Test_helper_decodeAccountv3Bytes(t *testing.T) {
+ t.Parallel()
input, err := hex.DecodeString("000114000101")
require.NoError(t, err)
diff --git a/erigon-lib/state/appendable.go b/erigon-lib/state/appendable.go
deleted file mode 100644
index 5413b0e6ca7..00000000000
--- a/erigon-lib/state/appendable.go
+++ /dev/null
@@ -1,830 +0,0 @@
-// Copyright 2022 The Erigon Authors
-// This file is part of Erigon.
-//
-// Erigon is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Erigon is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with Erigon. If not, see .
-
-package state
-
-import (
- "context"
- "encoding/binary"
- "errors"
- "fmt"
- "math"
- "path"
- "path/filepath"
- "reflect"
- "regexp"
- "strconv"
- "sync"
- "time"
-
- "github.com/erigontech/erigon-lib/common"
-
- btree2 "github.com/tidwall/btree"
- "golang.org/x/sync/errgroup"
-
- "github.com/erigontech/erigon-lib/common/assert"
- "github.com/erigontech/erigon-lib/common/hexutility"
- "github.com/erigontech/erigon-lib/kv/order"
- "github.com/erigontech/erigon-lib/log/v3"
- "github.com/erigontech/erigon-lib/seg"
-
- "github.com/erigontech/erigon-lib/common/background"
- "github.com/erigontech/erigon-lib/common/datadir"
- "github.com/erigontech/erigon-lib/common/dir"
- "github.com/erigontech/erigon-lib/etl"
- "github.com/erigontech/erigon-lib/kv"
- "github.com/erigontech/erigon-lib/recsplit"
-)
-
-// Appendable - data type allows store data for different blockchain forks.
-// - It assign new AutoIncrementID to each entity. Example: receipts, logs.
-// - Each record key has `AutoIncrementID` format.
-// - Use external table to refer it.
-// - Only data which belongs to `canonical` block moving from DB to files.
-// - It doesn't need Unwind - because `AutoIncrementID` always-growing
-type Appendable struct {
- cfg AppendableCfg
-
- // dirtyFiles - list of ALL files - including: un-indexed-yet, garbage, merged-into-bigger-one, ...
- // thread-safe, but maybe need 1 RWLock for all trees in Aggregator
- //
- // _visibleFiles derivative from field `file`, but without garbage:
- // - no files with `canDelete=true`
- // - no overlaps
- // - no un-indexed files (`power-off` may happen between .ef and .efi creation)
- //
- // BeginRo() using _visibleFiles in zero-copy way
- dirtyFiles *btree2.BTreeG[*filesItem]
-
- // _visibleFiles - underscore in name means: don't use this field directly, use BeginFilesRo()
- // underlying array is immutable - means it's ready for zero-copy use
- _visibleFiles []visibleFile
-
- table string // txnNum_u64 -> key (k+auto_increment)
- filenameBase string
- aggregationStep uint64
-
- //TODO: re-visit this check - maybe we don't need it. It's abot kill in the middle of merge
- integrityCheck func(fromStep, toStep uint64) bool
-
- // fields for history write
- logger log.Logger
-
- noFsync bool // fsync is enabled by default, but tests can manually disable
-
- compressCfg seg.Cfg
- compression seg.FileCompression
- indexList idxList
-}
-
-type AppendableCfg struct {
- Salt *uint32
- Dirs datadir.Dirs
- DB kv.RoDB // global db pointer. mostly for background warmup.
-
- iters CanonicalsReader
-}
-
-func NewAppendable(cfg AppendableCfg, aggregationStep uint64, filenameBase, table string, integrityCheck func(fromStep uint64, toStep uint64) bool, logger log.Logger) (*Appendable, error) {
- if cfg.Dirs.SnapHistory == "" {
- panic("empty `dirs` varialbe")
- }
- compressCfg := seg.DefaultCfg
- compressCfg.Workers = 1
- ap := Appendable{
- cfg: cfg,
- dirtyFiles: btree2.NewBTreeGOptions[*filesItem](filesItemLess, btree2.Options{Degree: 128, NoLocks: false}),
- aggregationStep: aggregationStep,
- filenameBase: filenameBase,
- table: table,
- compressCfg: compressCfg,
- compression: seg.CompressNone, //CompressKeys | CompressVals,
-
- integrityCheck: integrityCheck,
- logger: logger,
- }
- ap.indexList = withHashMap
- ap._visibleFiles = []visibleFile{}
-
- return &ap, nil
-}
-
-func (ap *Appendable) accessorFilePath(fromStep, toStep uint64) string {
- return filepath.Join(ap.cfg.Dirs.SnapAccessors, fmt.Sprintf("v1-%s.%d-%d.api", ap.filenameBase, fromStep, toStep))
-}
-func (ap *Appendable) apFilePath(fromStep, toStep uint64) string {
- return filepath.Join(ap.cfg.Dirs.SnapHistory, fmt.Sprintf("v1-%s.%d-%d.ap", ap.filenameBase, fromStep, toStep))
-}
-
-func (ap *Appendable) fileNamesOnDisk() ([]string, error) {
- return filesFromDir(ap.cfg.Dirs.SnapHistory)
-}
-
-func (ap *Appendable) openList(fNames []string, readonly bool) error {
- ap.closeWhatNotInList(fNames)
- ap.scanDirtyFiles(fNames)
- if err := ap.openDirtyFiles(); err != nil {
- return fmt.Errorf("NewHistory.openDirtyFiles: %w, %s", err, ap.filenameBase)
- }
- _ = readonly // for future safety features. RPCDaemon must not delte files
- return nil
-}
-
-func (ap *Appendable) openFolder(readonly bool) error {
- files, err := ap.fileNamesOnDisk()
- if err != nil {
- return err
- }
- return ap.openList(files, readonly)
-}
-
-func (ap *Appendable) scanDirtyFiles(fileNames []string) (garbageFiles []*filesItem) {
- re := regexp.MustCompile("^v([0-9]+)-" + ap.filenameBase + ".([0-9]+)-([0-9]+).ap$")
- var err error
- for _, name := range fileNames {
- subs := re.FindStringSubmatch(name)
- if len(subs) != 4 {
- if len(subs) != 0 {
- ap.logger.Warn("File ignored by inverted index scan, more than 3 submatches", "name", name, "submatches", len(subs))
- }
- continue
- }
- var startStep, endStep uint64
- if startStep, err = strconv.ParseUint(subs[2], 10, 64); err != nil {
- ap.logger.Warn("File ignored by inverted index scan, parsing startTxNum", "error", err, "name", name)
- continue
- }
- if endStep, err = strconv.ParseUint(subs[3], 10, 64); err != nil {
- ap.logger.Warn("File ignored by inverted index scan, parsing endTxNum", "error", err, "name", name)
- continue
- }
- if startStep > endStep {
- ap.logger.Warn("File ignored by inverted index scan, startTxNum > endTxNum", "name", name)
- continue
- }
-
- startTxNum, endTxNum := startStep*ap.aggregationStep, endStep*ap.aggregationStep
- var newFile = newFilesItem(startTxNum, endTxNum, ap.aggregationStep)
-
- if ap.integrityCheck != nil && !ap.integrityCheck(startStep, endStep) {
- continue
- }
-
- if _, has := ap.dirtyFiles.Get(newFile); has {
- continue
- }
-
- ap.dirtyFiles.Set(newFile)
- }
- return garbageFiles
-}
-
-func (ap *Appendable) reCalcVisibleFiles(toTxNum uint64) {
- ap._visibleFiles = calcVisibleFiles(ap.dirtyFiles, ap.indexList, false, toTxNum)
-}
-
-func (ap *Appendable) missedAccessors() (l []*filesItem) {
- ap.dirtyFiles.Walk(func(items []*filesItem) bool {
- for _, item := range items {
- fromStep, toStep := item.startTxNum/ap.aggregationStep, item.endTxNum/ap.aggregationStep
- exists, err := dir.FileExist(ap.accessorFilePath(fromStep, toStep))
- if err != nil {
- panic(err)
- }
- if !exists {
- l = append(l, item)
- }
- }
- return true
- })
- return l
-}
-
-func (ap *Appendable) buildAccessor(ctx context.Context, fromStep, toStep uint64, d *seg.Decompressor, ps *background.ProgressSet) error {
- if d == nil {
- return fmt.Errorf("buildAccessor: passed item with nil decompressor %s %d-%d", ap.filenameBase, fromStep, toStep)
- }
- idxPath := ap.accessorFilePath(fromStep, toStep)
- cfg := recsplit.RecSplitArgs{
- Enums: true,
-
- BucketSize: 2000,
- LeafSize: 8,
- TmpDir: ap.cfg.Dirs.Tmp,
- IndexFile: idxPath,
- Salt: ap.cfg.Salt,
- NoFsync: ap.noFsync,
-
- KeyCount: d.Count(),
- }
- _, fileName := filepath.Split(idxPath)
- count := d.Count()
- p := ps.AddNew(fileName, uint64(count))
- defer ps.Delete(p)
-
- num := make([]byte, binary.MaxVarintLen64)
- return buildSimpleMapAccessor(ctx, d, ap.compression, cfg, ap.logger, func(idx *recsplit.RecSplit, i, offset uint64, word []byte) error {
- if p != nil {
- p.Processed.Add(1)
- }
- n := binary.PutUvarint(num, i)
- if err := idx.AddKey(num[:n], offset); err != nil {
- return err
- }
- return nil
- })
-}
-
-func (ap *Appendable) BuildMissedAccessors(ctx context.Context, g *errgroup.Group, ps *background.ProgressSet) {
- for _, item := range ap.missedAccessors() {
- item := item
- g.Go(func() error {
- fromStep, toStep := item.startTxNum/ap.aggregationStep, item.endTxNum/ap.aggregationStep
- return ap.buildAccessor(ctx, fromStep, toStep, item.decompressor, ps)
- })
- }
-}
-
-func (ap *Appendable) openDirtyFiles() error {
- fmt.Printf("[dbg] dirtyFiles.Len() %d\n", ap.dirtyFiles.Len())
-
- var invalidFileItems []*filesItem
- invalidFileItemsLock := sync.Mutex{}
- ap.dirtyFiles.Walk(func(items []*filesItem) bool {
- for _, item := range items {
- item := item
- fromStep, toStep := item.startTxNum/ap.aggregationStep, item.endTxNum/ap.aggregationStep
- if item.decompressor == nil {
- fPath := ap.apFilePath(fromStep, toStep)
- exists, err := dir.FileExist(fPath)
- if err != nil {
- _, fName := filepath.Split(fPath)
- ap.logger.Debug("[agg] Appendable.openDirtyFiles", "err", err, "f", fName)
- invalidFileItemsLock.Lock()
- invalidFileItems = append(invalidFileItems, item)
- invalidFileItemsLock.Unlock()
- continue
- }
- if !exists {
- _, fName := filepath.Split(fPath)
- ap.logger.Debug("[agg] Appendable.openDirtyFiles: file does not exists", "f", fName)
- invalidFileItemsLock.Lock()
- invalidFileItems = append(invalidFileItems, item)
- invalidFileItemsLock.Unlock()
- continue
- }
-
- if item.decompressor, err = seg.NewDecompressor(fPath); err != nil {
- _, fName := filepath.Split(fPath)
- if errors.Is(err, &seg.ErrCompressedFileCorrupted{}) {
- ap.logger.Debug("[agg] Appendable.openDirtyFiles", "err", err, "f", fName)
- } else {
- ap.logger.Warn("[agg] Appendable.openDirtyFiles", "err", err, "f", fName)
- }
- invalidFileItemsLock.Lock()
- invalidFileItems = append(invalidFileItems, item)
- invalidFileItemsLock.Unlock()
- // don't interrupt on error. other files may be good. but skip indices open.
- continue
- }
- }
-
- if item.index == nil {
- fPath := ap.accessorFilePath(fromStep, toStep)
- exists, err := dir.FileExist(fPath)
- if err != nil {
- _, fName := filepath.Split(fPath)
- ap.logger.Warn("[agg] Appendable.openDirtyFiles", "err", err, "f", fName)
- }
- if exists {
- if item.index, err = recsplit.OpenIndex(fPath); err != nil {
- _, fName := filepath.Split(fPath)
- ap.logger.Warn("[agg] Appendable.openDirtyFiles", "err", err, "f", fName)
- // don't interrupt on error. other files may be good
- }
- }
- }
- }
-
- return true
- })
- for _, item := range invalidFileItems {
- item.closeFiles()
- ap.dirtyFiles.Delete(item)
- }
-
- return nil
-}
-
-func (ap *Appendable) closeWhatNotInList(fNames []string) {
- var toClose []*filesItem
- ap.dirtyFiles.Walk(func(items []*filesItem) bool {
- Loop1:
- for _, item := range items {
- for _, protectName := range fNames {
- if item.decompressor != nil && item.decompressor.FileName() == protectName {
- continue Loop1
- }
- }
- toClose = append(toClose, item)
- }
- return true
- })
- for _, item := range toClose {
- item.closeFiles()
- ap.dirtyFiles.Delete(item)
- }
-}
-
-func (ap *Appendable) Close() {
- if ap == nil {
- return
- }
- ap.closeWhatNotInList([]string{})
-}
-
-// DisableFsync - just for tests
-func (ap *Appendable) DisableFsync() { ap.noFsync = true }
-
-func (tx *AppendableRoTx) Files() (res []string) {
- for _, item := range tx.files {
- if item.src.decompressor != nil {
- res = append(res, item.src.decompressor.FileName())
- }
- }
- return res
-}
-
-func (tx *AppendableRoTx) Get(txnID kv.TxnId, dbtx kv.Tx) (v []byte, ok bool, err error) {
- v, ok = tx.getFromFiles(uint64(txnID))
- if ok {
- return v, true, nil
- }
- return tx.ap.getFromDBByTs(uint64(txnID), dbtx)
-}
-func (tx *AppendableRoTx) Append(txnID kv.TxnId, v []byte, dbtx kv.RwTx) error {
- return dbtx.Put(tx.ap.table, hexutility.EncodeTs(uint64(txnID)), v)
-}
-
-func (tx *AppendableRoTx) getFromFiles(ts uint64) (v []byte, ok bool) {
- i, ok := tx.fileByTS(ts)
- if !ok {
- return nil, false
- }
-
- baseTxNum := tx.files[i].startTxNum // we are very lucky: each txNum has 1 appendable
- lookup := ts - baseTxNum
- accessor := tx.files[i].src.index
- if accessor.KeyCount() <= lookup {
- return nil, false
- }
- offset := accessor.OrdinalLookup(lookup)
- g := tx.statelessGetter(i)
- g.Reset(offset)
- k, _ := g.Next(nil)
- return k, true
-}
-
-func (tx *AppendableRoTx) fileByTS(ts uint64) (i int, ok bool) {
- for i = 0; i < len(tx.files); i++ {
- if tx.files[i].hasTS(ts) {
- return i, true
- }
- }
- return 0, false
-}
-
-func (ap *Appendable) getFromDBByTs(ts uint64, dbtx kv.Tx) ([]byte, bool, error) {
- return ap.getFromDB(hexutility.EncodeTs(ts), dbtx)
-}
-func (ap *Appendable) getFromDB(k []byte, dbtx kv.Tx) ([]byte, bool, error) {
- v, err := dbtx.GetOne(ap.table, k)
- if err != nil {
- return nil, false, err
- }
- return v, v != nil, err
-}
-
-func (ap *Appendable) maxTxNumInDB(dbtx kv.Tx) (txNum uint64, err error) { //nolint
- first, err := kv.LastKey(dbtx, ap.table)
- if err != nil {
- return 0, err
- }
- if len(first) == 0 {
- return 0, nil
- }
- return binary.BigEndian.Uint64(first), nil
-}
-
-// Add - !NotThreadSafe. Must use WalRLock/BatchHistoryWriteEnd
-func (w *appendableBufferedWriter) Append(ts kv.TxnId, v []byte) error {
- if w.discard {
- return nil
- }
- if err := w.tableCollector.Collect(hexutility.EncodeTs(uint64(ts)), v); err != nil {
- return err
- }
- return nil
-}
-
-func (tx *AppendableRoTx) NewWriter() *appendableBufferedWriter {
- return tx.newWriter(tx.ap.cfg.Dirs.Tmp, false)
-}
-
-type appendableBufferedWriter struct {
- tableCollector *etl.Collector
- tmpdir string
- discard bool
- filenameBase string
-
- table string
-
- aggregationStep uint64
-}
-
-func (w *appendableBufferedWriter) Flush(ctx context.Context, tx kv.RwTx) error {
- if w.discard {
- return nil
- }
- if err := w.tableCollector.Load(tx, w.table, loadFunc, etl.TransformArgs{Quit: ctx.Done()}); err != nil {
- return err
- }
- w.close()
- return nil
-}
-
-func (w *appendableBufferedWriter) close() {
- if w == nil {
- return
- }
- if w.tableCollector != nil {
- w.tableCollector.Close()
- }
-}
-
-func (tx *AppendableRoTx) newWriter(tmpdir string, discard bool) *appendableBufferedWriter {
- w := &appendableBufferedWriter{
- discard: discard,
- tmpdir: tmpdir,
- filenameBase: tx.ap.filenameBase,
- aggregationStep: tx.ap.aggregationStep,
-
- table: tx.ap.table,
- // etl collector doesn't fsync: means if have enough ram, all files produced by all collectors will be in ram
- tableCollector: etl.NewCollector("flush "+tx.ap.table, tmpdir, etl.NewSortableBuffer(WALCollectorRAM), tx.ap.logger),
- }
- w.tableCollector.LogLvl(log.LvlTrace)
- w.tableCollector.SortAndFlushInBackground(true)
- return w
-}
-
-func (ap *Appendable) BeginFilesRo() *AppendableRoTx {
- files := ap._visibleFiles
- for i := 0; i < len(files); i++ {
- if !files[i].src.frozen {
- files[i].src.refcount.Add(1)
- }
- }
- return &AppendableRoTx{
- ap: ap,
- files: files,
- }
-}
-
-func (tx *AppendableRoTx) Close() {
- if tx.files == nil { // invariant: it's safe to call Close multiple times
- return
- }
- files := tx.files
- tx.files = nil
- for i := range files {
- src := files[i].src
- if src == nil || src.frozen {
- continue
- }
- refCnt := src.refcount.Add(-1)
- //GC: last reader responsible to remove useles files: close it and delete
- if refCnt == 0 && src.canDelete.Load() {
- if traceFileLife != "" && tx.ap.filenameBase == traceFileLife {
- tx.ap.logger.Warn("[agg.dbg] real remove at AppendableRoTx.Close", "file", src.decompressor.FileName())
- }
- src.closeFilesAndRemove()
- }
- }
-
- for _, r := range tx.readers {
- r.Close()
- }
-}
-
-type AppendableRoTx struct {
- ap *Appendable
- files visibleFiles // have no garbage (overlaps, etc...)
- getters []*seg.Reader
- readers []*recsplit.IndexReader
-}
-
-func (tx *AppendableRoTx) statelessGetter(i int) *seg.Reader {
- if tx.getters == nil {
- tx.getters = make([]*seg.Reader, len(tx.files))
- }
- r := tx.getters[i]
- if r == nil {
- g := tx.files[i].src.decompressor.MakeGetter()
- r = seg.NewReader(g, tx.ap.compression)
- tx.getters[i] = r
- }
- return r
-}
-
-func (tx *AppendableRoTx) mainTxNumInDB(dbtx kv.Tx) uint64 {
- fst, _ := kv.FirstKey(dbtx, tx.ap.table)
- if len(fst) > 0 {
- fstInDb := binary.BigEndian.Uint64(fst)
- return min(fstInDb, math.MaxUint64)
- }
- return math.MaxUint64
-}
-
-func (tx *AppendableRoTx) CanPrune(dbtx kv.Tx) bool {
- return tx.mainTxNumInDB(dbtx) < tx.files.EndTxNum()
-}
-func (tx *AppendableRoTx) canBuild(dbtx kv.Tx) (bool, error) { //nolint
- //TODO: support "keep in db" parameter
- //TODO: what if all files are pruned?
- maxTxNumInDB, err := tx.ap.maxTxNumInDB(dbtx)
- if err != nil {
- return false, err
- }
- maxStepInDB := maxTxNumInDB / tx.ap.aggregationStep
- maxStepInFiles := tx.files.EndTxNum() / tx.ap.aggregationStep
- return maxStepInFiles < maxStepInDB, nil
-}
-
-type AppendablePruneStat struct {
- MinTxNum uint64
- MaxTxNum uint64
- PruneCountTx uint64
-}
-
-func (is *AppendablePruneStat) String() string {
- if is.MinTxNum == math.MaxUint64 && is.PruneCountTx == 0 {
- return ""
- }
- return fmt.Sprintf("ap %d txs in %s-%s", is.PruneCountTx, common.PrettyCounter(is.MinTxNum), common.PrettyCounter(is.MaxTxNum))
-}
-
-func (is *AppendablePruneStat) Accumulate(other *AppendablePruneStat) {
- if other == nil {
- return
- }
- is.MinTxNum = min(is.MinTxNum, other.MinTxNum)
- is.MaxTxNum = max(is.MaxTxNum, other.MaxTxNum)
- is.PruneCountTx += other.PruneCountTx
-}
-
-// [txFrom; txTo)
-// forced - prune even if CanPrune returns false, so its true only when we do Unwind.
-func (tx *AppendableRoTx) Prune(ctx context.Context, rwTx kv.RwTx, txFrom, txTo, limit uint64, logEvery *time.Ticker, forced bool, fn func(key []byte, txnum []byte) error) (stat *AppendablePruneStat, err error) {
- stat = &AppendablePruneStat{MinTxNum: math.MaxUint64}
- if !forced && !tx.CanPrune(rwTx) {
- return stat, nil
- }
-
- mxPruneInProgress.Inc()
- defer mxPruneInProgress.Dec()
- defer func(t time.Time) { mxPruneTookIndex.ObserveDuration(t) }(time.Now())
-
- if limit == 0 {
- limit = math.MaxUint64
- }
-
- fromID, toID, ok, err := tx.txNum2id(rwTx, txFrom, txTo)
- if err != nil {
- return nil, err
- }
- if !ok {
- panic(ok)
- }
- // [from:to)
- r, err := rwTx.Range(tx.ap.table, hexutility.EncodeTs(fromID), hexutility.EncodeTs(toID))
- if err != nil {
- return nil, err
- }
- defer r.Close()
- for r.HasNext() {
- k, _, err := r.Next()
- if err != nil {
- return nil, err
- }
- limit--
- if limit == 0 {
- break
- }
- if err = rwTx.Delete(tx.ap.table, k); err != nil {
- return nil, err
- }
- }
-
- return stat, err
-}
-func (tx *AppendableRoTx) txNum2id(rwTx kv.RwTx, txFrom, txTo uint64) (fromID, toID uint64, ok bool, err error) {
- var found1, found2 bool
- it, err := tx.ap.cfg.iters.TxnIdsOfCanonicalBlocks(rwTx, int(txFrom), -1, order.Asc, 1)
- if err != nil {
- return fromID, toID, ok, err
- }
- defer it.Close()
- if it.HasNext() {
- fromID, err = it.Next()
- if err != nil {
- return fromID, toID, ok, err
- }
- found1 = true
- }
- it.Close()
-
- it, err = tx.ap.cfg.iters.TxnIdsOfCanonicalBlocks(rwTx, int(txTo), -1, order.Asc, 1)
- if err != nil {
- return fromID, toID, ok, err
- }
- defer it.Close()
- if it.HasNext() {
- toID, err = it.Next()
- if err != nil {
- return fromID, toID, ok, err
- }
- found2 = true
- }
-
- return fromID, toID, found1 && found2, nil
-}
-
-func (ap *Appendable) collate(ctx context.Context, step uint64, roTx kv.Tx) (AppendableCollation, error) {
- stepTo := step + 1
- txFrom, txTo := step*ap.aggregationStep, stepTo*ap.aggregationStep
- start := time.Now()
- defer mxCollateTookIndex.ObserveDuration(start)
-
- var (
- coll = AppendableCollation{
- iiPath: ap.apFilePath(step, stepTo),
- }
- closeComp bool
- )
- defer func() {
- if closeComp {
- coll.Close()
- }
- }()
-
- comp, err := seg.NewCompressor(ctx, "collate "+ap.filenameBase, coll.iiPath, ap.cfg.Dirs.Tmp, ap.compressCfg, log.LvlTrace, ap.logger)
- if err != nil {
- return coll, fmt.Errorf("create %s compressor: %w", ap.filenameBase, err)
- }
- coll.writer = seg.NewWriter(comp, ap.compression)
-
- it, err := ap.cfg.iters.TxnIdsOfCanonicalBlocks(roTx, int(txFrom), int(txTo), order.Asc, -1)
- if err != nil {
- return coll, fmt.Errorf("collate %s: %w", ap.filenameBase, err)
- }
- defer it.Close()
-
- for it.HasNext() {
- k, err := it.Next()
- if err != nil {
- return coll, fmt.Errorf("collate %s: %w", ap.filenameBase, err)
- }
- v, ok, err := ap.getFromDBByTs(k, roTx)
- if err != nil {
- return coll, fmt.Errorf("collate %s: %w", ap.filenameBase, err)
- }
- if !ok {
- continue
- }
- if err = coll.writer.AddWord(v); err != nil {
- return coll, fmt.Errorf("collate %s: %w", ap.filenameBase, err)
- }
- }
-
- closeComp = false
- return coll, nil
-}
-
-func (ap *Appendable) stepsRangeInDB(tx kv.Tx) (from, to float64) {
- fst, _ := kv.FirstKey(tx, ap.table)
- if len(fst) > 0 {
- from = float64(binary.BigEndian.Uint64(fst)) / float64(ap.aggregationStep)
- }
- lst, _ := kv.LastKey(tx, ap.table)
- if len(lst) > 0 {
- to = float64(binary.BigEndian.Uint64(lst)) / float64(ap.aggregationStep)
- }
- if to == 0 {
- to = from
- }
- return from, to
-}
-
-type AppendableFiles struct {
- decomp *seg.Decompressor
- index *recsplit.Index
-}
-
-func (sf AppendableFiles) CleanupOnError() {
- if sf.decomp != nil {
- sf.decomp.Close()
- }
- if sf.index != nil {
- sf.index.Close()
- }
-}
-
-type AppendableCollation struct {
- iiPath string
- writer *seg.Writer
-}
-
-func (collation AppendableCollation) Close() {
- if collation.writer != nil {
- collation.writer.Close()
- collation.writer = nil //nolint
- }
-}
-
-// buildFiles - `step=N` means build file `[N:N+1)` which is equal to [N:N+1)
-func (ap *Appendable) buildFiles(ctx context.Context, step uint64, coll AppendableCollation, ps *background.ProgressSet) (AppendableFiles, error) {
- var (
- decomp *seg.Decompressor
- index *recsplit.Index
- err error
- )
- mxRunningFilesBuilding.Inc()
- defer mxRunningFilesBuilding.Dec()
- closeComp := true
- defer func() {
- if closeComp {
- coll.Close()
- if decomp != nil {
- decomp.Close()
- }
- if index != nil {
- index.Close()
- }
- }
- }()
-
- if assert.Enable {
- if coll.iiPath == "" && reflect.ValueOf(coll.writer).IsNil() {
- panic("assert: collation is not initialized " + ap.filenameBase)
- }
- }
-
- {
- p := ps.AddNew(path.Base(coll.iiPath), 1)
- if err = coll.writer.Compress(); err != nil {
- ps.Delete(p)
- return AppendableFiles{}, fmt.Errorf("compress %s: %w", ap.filenameBase, err)
- }
- coll.Close()
- ps.Delete(p)
- }
-
- if decomp, err = seg.NewDecompressor(coll.iiPath); err != nil {
- return AppendableFiles{}, fmt.Errorf("open %s decompressor: %w", ap.filenameBase, err)
- }
-
- if err := ap.buildAccessor(ctx, step, step+1, decomp, ps); err != nil {
- return AppendableFiles{}, fmt.Errorf("build %s api: %w", ap.filenameBase, err)
- }
- if index, err = recsplit.OpenIndex(ap.accessorFilePath(step, step+1)); err != nil {
- return AppendableFiles{}, err
- }
-
- closeComp = false
- return AppendableFiles{decomp: decomp, index: index}, nil
-}
-
-func (ap *Appendable) integrateDirtyFiles(sf AppendableFiles, txNumFrom, txNumTo uint64) {
- fi := newFilesItem(txNumFrom, txNumTo, ap.aggregationStep)
- fi.decompressor = sf.decomp
- fi.index = sf.index
- ap.dirtyFiles.Set(fi)
-}
-
-func (tx *AppendableRoTx) Unwind(ctx context.Context, rwTx kv.RwTx, txFrom, txTo, limit uint64, logEvery *time.Ticker, forced bool, fn func(key []byte, txnum []byte) error) error {
- return nil //Appendable type is unwind-less. See docs of Appendable type.
-}
diff --git a/erigon-lib/state/appendable_test.go b/erigon-lib/state/appendable_test.go
deleted file mode 100644
index 705ada71126..00000000000
--- a/erigon-lib/state/appendable_test.go
+++ /dev/null
@@ -1,366 +0,0 @@
-// Copyright 2022 The Erigon Authors
-// This file is part of Erigon.
-//
-// Erigon is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Erigon is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with Erigon. If not, see .
-
-package state
-
-import (
- "context"
- "encoding/binary"
- "math"
- "os"
- "testing"
- "time"
-
- "go.uber.org/mock/gomock"
-
- "github.com/erigontech/erigon-lib/common/hexutility"
- "github.com/erigontech/erigon-lib/kv/order"
- "github.com/erigontech/erigon-lib/kv/stream"
- "github.com/erigontech/erigon-lib/log/v3"
-
- "github.com/stretchr/testify/require"
- btree2 "github.com/tidwall/btree"
-
- "github.com/erigontech/erigon-lib/common/background"
- "github.com/erigontech/erigon-lib/common/datadir"
- "github.com/erigontech/erigon-lib/kv"
- "github.com/erigontech/erigon-lib/kv/mdbx"
- "github.com/erigontech/erigon-lib/seg"
-)
-
-func testDbAndAppendable(tb testing.TB, aggStep uint64, logger log.Logger) (kv.RwDB, *Appendable) {
- tb.Helper()
- dirs := datadir.New(tb.TempDir())
- table := "Appendable"
- db := mdbx.NewMDBX(logger).InMem(dirs.Chaindata).WithTableCfg(func(defaultBuckets kv.TableCfg) kv.TableCfg {
- return kv.TableCfg{
- table: kv.TableCfgItem{Flags: kv.DupSort},
- kv.TblPruningProgress: kv.TableCfgItem{},
- kv.HeaderCanonical: kv.TableCfgItem{},
- }
- }).MustOpen()
- tb.Cleanup(db.Close)
- salt := uint32(1)
- cfg := AppendableCfg{Salt: &salt, Dirs: dirs, DB: db}
- ii, err := NewAppendable(cfg, aggStep, "receipt", table, nil, logger)
- require.NoError(tb, err)
- ii.DisableFsync()
- tb.Cleanup(ii.Close)
- return db, ii
-}
-
-func TestAppendableCollationBuild(t *testing.T) {
- logEvery := time.NewTicker(30 * time.Second)
- defer logEvery.Stop()
- db, ii, txs := filledAppendable(t, log.New())
- ctx := context.Background()
- aggStep := uint64(16)
- steps := txs / aggStep
-
- t.Run("can see own writes", func(t *testing.T) {
- //nonbuf api can see own writes
- require := require.New(t)
-
- tx, err := db.BeginRo(ctx)
- require.NoError(err)
- defer tx.Rollback()
- ic := ii.BeginFilesRo()
- defer ic.Close()
-
- //can see own writes
- v, ok, err := ic.Get(1, tx)
- require.NoError(err)
- require.True(ok)
- require.Equal(1, int(binary.BigEndian.Uint64(v)))
-
- //never existed key
- _, ok, err = ic.Get(kv.TxnId(txs+1), tx)
- require.NoError(err)
- require.False(ok)
-
- //non-canonical key: must exist before collate+prune
- _, ok, err = ic.Get(kv.TxnId(steps+1), tx)
- require.NoError(err)
- require.True(ok)
-
- err = tx.Commit()
- require.NoError(err)
- })
- ctrl := gomock.NewController(t)
- defer ctrl.Finish()
-
- //see only canonical records in files
- iters := NewMockCanonicalsReader(ctrl)
- iters.EXPECT().TxnIdsOfCanonicalBlocks(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).
- DoAndReturn(func(tx kv.Tx, txFrom, txTo int, by order.By, i3 int) (stream.U64, error) {
- currentStep := uint64(txFrom) / aggStep
- canonicalBlockTxNum := aggStep*currentStep + 1
- it := stream.Array[uint64]([]uint64{canonicalBlockTxNum})
- return it, nil
- }).
- AnyTimes()
- ii.cfg.iters = iters
-
- mergeAppendable(t, db, ii, txs)
-
- t.Run("read after collate and prune", func(t *testing.T) {
- require := require.New(t)
-
- ic := ii.BeginFilesRo()
- defer ic.Close()
-
- tx, err := db.BeginRo(ctx)
- require.NoError(err)
- defer tx.Rollback()
-
- checkAppendableGet(t, tx, ic, txs)
- })
-
- t.Run("scan files", func(t *testing.T) {
- require := require.New(t)
-
- require.Equal(5, ii.dirtyFiles.Len())
- require.Equal(5, len(ii._visibleFiles))
-
- // Recreate to scan the files
- ii, err := NewAppendable(ii.cfg, ii.aggregationStep, ii.filenameBase, ii.table, nil, log.New())
- require.NoError(err)
- defer ii.Close()
- err = ii.openFolder(true)
- require.NoError(err)
- require.Equal(5, ii.dirtyFiles.Len())
- require.Equal(0, len(ii._visibleFiles))
- ii.reCalcVisibleFiles(ii.dirtyFilesEndTxNumMinimax())
- require.Equal(5, len(ii._visibleFiles))
-
- ic := ii.BeginFilesRo()
- defer ic.Close()
-
- require.Equal(5, len(ic.files))
-
- tx, err := db.BeginRo(ctx)
- require.NoError(err)
- defer tx.Rollback()
-
- checkAppendableGet(t, tx, ic, txs)
- })
-
- t.Run("open_folder_can_handle_broken_files", func(t *testing.T) {
- require := require.New(t)
-
- list := ii._visibleFiles
- require.NotEmpty(list)
- ff := list[len(list)-1]
- fn := ff.src.decompressor.FilePath()
- ii.Close()
-
- err := os.Remove(fn)
- require.NoError(err)
- err = os.WriteFile(fn, make([]byte, 33), 0644)
- require.NoError(err)
-
- err = ii.openFolder(true)
- require.NoError(err)
- ii.Close()
- })
-
-}
-
-func filledAppendable(tb testing.TB, logger log.Logger) (kv.RwDB, *Appendable, uint64) {
- tb.Helper()
- return filledAppendableOfSize(tb, uint64(1000), 16, logger)
-}
-
-func filledAppendableOfSize(tb testing.TB, txs, aggStep uint64, logger log.Logger) (kv.RwDB, *Appendable, uint64) {
- tb.Helper()
- db, ii := testDbAndAppendable(tb, aggStep, logger)
- ctx, require := context.Background(), require.New(tb)
- tx, err := db.BeginRw(ctx)
- require.NoError(err)
- defer tx.Rollback()
- ic := ii.BeginFilesRo()
- defer ic.Close()
-
- for i := uint64(0); i < txs; i++ {
- err = ic.Append(kv.TxnId(i), hexutility.EncodeTs(i), tx)
- require.NoError(err)
- }
- err = tx.Commit()
- require.NoError(err)
- return db, ii, txs
-}
-
-func checkAppendableGet(t *testing.T, dbtx kv.Tx, tx *AppendableRoTx, txs uint64) {
- t.Helper()
- aggStep := tx.ap.aggregationStep
- steps := txs / aggStep
-
- require := require.New(t)
- //canonical keys
- w, ok, err := tx.Get(0, dbtx)
- require.NoError(err)
- require.True(ok)
- require.Equal(1, int(binary.BigEndian.Uint64(w)))
-
- w, ok, err = tx.Get(1, dbtx)
- require.NoError(err)
- require.True(ok)
- require.Equal(int(aggStep+1), int(binary.BigEndian.Uint64(w)))
-
- //non-canonical key: must exist before collate+prune
- _, ok = tx.getFromFiles(steps + 1)
- require.False(ok)
-
- from, to := tx.ap.stepsRangeInDB(dbtx)
- require.Equal(float64(0), from)
- require.Equal(62.4375, to)
-
- //non-canonical key: must exist before collate+prune
- _, ok, err = tx.Get(kv.TxnId(steps+1), dbtx)
- require.NoError(err)
- require.False(ok)
-
- //non-canonical keys of last step: must exist after collate+prune
- _, ok, err = tx.Get(kv.TxnId(aggStep*steps+2), dbtx)
- require.NoError(err)
- require.True(ok)
-}
-
-func mergeAppendable(tb testing.TB, db kv.RwDB, ii *Appendable, txs uint64) {
- tb.Helper()
- logEvery := time.NewTicker(30 * time.Second)
- defer logEvery.Stop()
- ctx := context.Background()
- // Leave the last 2 aggregation steps un-collated
- tx, err := db.BeginRw(ctx)
- require.NoError(tb, err)
- defer tx.Rollback()
- //panic("implement me")
-
- // Leave the last 2 aggregation steps un-collated
- for step := uint64(0); step < txs/ii.aggregationStep-1; step++ {
- func() {
- bs, err := ii.collate(ctx, step, tx)
- require.NoError(tb, err)
- sf, err := ii.buildFiles(ctx, step, bs, background.NewProgressSet())
- require.NoError(tb, err)
-
- ii.integrateDirtyFiles(sf, step*ii.aggregationStep, (step+1)*ii.aggregationStep)
- ii.reCalcVisibleFiles(ii.dirtyFilesEndTxNumMinimax())
- ic := ii.BeginFilesRo()
- defer ic.Close()
- _, err = ic.Prune(ctx, tx, step*ii.aggregationStep, (step+1)*ii.aggregationStep, math.MaxUint64, logEvery, false, nil)
- require.NoError(tb, err)
- maxSpan := ii.aggregationStep * StepsInColdFile
-
- for {
- if stop := func() bool {
- ic := ii.BeginFilesRo()
- defer ic.Close()
- r := ic.findMergeRange(ic.files.EndTxNum(), maxSpan)
- if !r.needMerge {
- return true
- }
- outs := ic.staticFilesInRange(r.from, r.to)
- in, err := ic.mergeFiles(ctx, outs, r.from, r.to, background.NewProgressSet())
- require.NoError(tb, err)
- ii.integrateMergedDirtyFiles(outs, in)
- ii.reCalcVisibleFiles(ii.dirtyFilesEndTxNumMinimax())
- return false
- }(); stop {
- break
- }
- }
- }()
- }
- err = tx.Commit()
- require.NoError(tb, err)
-
-}
-
-func emptyTestAppendable(aggStep uint64) *Appendable {
- salt := uint32(1)
- logger := log.New()
- return &Appendable{cfg: AppendableCfg{Salt: &salt, DB: nil},
- logger: logger,
- filenameBase: "test", aggregationStep: aggStep, dirtyFiles: btree2.NewBTreeG[*filesItem](filesItemLess)}
-}
-
-func TestAppendableScanStaticFiles(t *testing.T) {
- ii := emptyTestAppendable(1)
- files := []string{
- "v1-test.0-1.ap",
- "v1-test.1-2.ap",
- "v1-test.0-4.ap",
- "v1-test.2-3.ap",
- "v1-test.3-4.ap",
- "v1-test.4-5.ap",
- }
- ii.scanDirtyFiles(files)
- require.Equal(t, 6, ii.dirtyFiles.Len())
-
- //integrity extension case
- ii.dirtyFiles.Clear()
- ii.integrityCheck = func(fromStep, toStep uint64) bool { return false }
- ii.scanDirtyFiles(files)
- require.Equal(t, 0, ii.dirtyFiles.Len())
-}
-
-func TestAppendableCtxFiles(t *testing.T) {
- ii := emptyTestAppendable(1)
- files := []string{
- "v1-test.0-1.ap", // overlap with same `endTxNum=4`
- "v1-test.1-2.ap",
- "v1-test.0-4.ap",
- "v1-test.2-3.ap",
- "v1-test.3-4.ap",
- "v1-test.4-5.ap", // no overlap
- "v1-test.480-484.ap", // overlap with same `startTxNum=480`
- "v1-test.480-488.ap",
- "v1-test.480-496.ap",
- "v1-test.480-512.ap",
- }
- ii.scanDirtyFiles(files)
- require.Equal(t, 10, ii.dirtyFiles.Len())
- ii.dirtyFiles.Scan(func(item *filesItem) bool {
- fName := ii.apFilePath(item.startTxNum/ii.aggregationStep, item.endTxNum/ii.aggregationStep)
- item.decompressor = &seg.Decompressor{FileName1: fName}
- return true
- })
-
- visibleFiles := calcVisibleFiles(ii.dirtyFiles, 0, false, ii.dirtyFilesEndTxNumMinimax())
- for i, item := range visibleFiles {
- if item.src.canDelete.Load() {
- require.Failf(t, "deleted file", "%d-%d", item.startTxNum, item.endTxNum)
- }
- if i == 0 {
- continue
- }
- if item.src.isSubsetOf(visibleFiles[i-1].src) || visibleFiles[i-1].src.isSubsetOf(item.src) {
- require.Failf(t, "overlaping files", "%d-%d, %d-%d", item.startTxNum, item.endTxNum, visibleFiles[i-1].startTxNum, visibleFiles[i-1].endTxNum)
- }
- }
- require.Equal(t, 3, len(visibleFiles))
-
- require.Equal(t, 0, int(visibleFiles[0].startTxNum))
- require.Equal(t, 4, int(visibleFiles[0].endTxNum))
-
- require.Equal(t, 4, int(visibleFiles[1].startTxNum))
- require.Equal(t, 5, int(visibleFiles[1].endTxNum))
-
- require.Equal(t, 480, int(visibleFiles[2].startTxNum))
- require.Equal(t, 512, int(visibleFiles[2].endTxNum))
-}
diff --git a/erigon-lib/state/bps_tree.go b/erigon-lib/state/bps_tree.go
index f332c61bb83..7011530f26e 100644
--- a/erigon-lib/state/bps_tree.go
+++ b/erigon-lib/state/bps_tree.go
@@ -25,11 +25,12 @@ import (
"time"
"unsafe"
+ "github.com/erigontech/erigon-lib/common/dbg"
+
"github.com/c2h5oh/datasize"
"github.com/erigontech/erigon-lib/seg"
"github.com/erigontech/erigon-lib/common"
- "github.com/erigontech/erigon-lib/common/dbg"
"github.com/erigontech/erigon-lib/log/v3"
"github.com/erigontech/erigon-lib/recsplit/eliasfano32"
)
@@ -49,7 +50,7 @@ type indexSeekerIterator interface {
KVFromGetter(g *seg.Reader) ([]byte, []byte, error)
}
-type dataLookupFunc func(di uint64, g *seg.Reader) ([]byte, []byte, error)
+type dataLookupFunc func(di uint64, g *seg.Reader) ([]byte, []byte, uint64, error)
type keyCmpFunc func(k []byte, di uint64, g *seg.Reader, copyBuf []byte) (int, []byte, error)
// M limits amount of child for tree node.
@@ -111,7 +112,7 @@ func (it *BpsTreeIterator) KVFromGetter(g *seg.Reader) ([]byte, []byte, error) {
return nil, nil, errors.New("iterator is nil")
}
//fmt.Printf("kv from %p getter %p tree %p offt %d\n", it, g, it.t, it.i)
- k, v, err := it.t.dataLookupFunc(it.i, g)
+ k, v, _, err := it.t.dataLookupFunc(it.i, g)
if err != nil {
if errors.Is(err, ErrBtIndexLookupBounds) {
return nil, nil, nil
@@ -287,7 +288,7 @@ func (b *BpsTree) Seek(g *seg.Reader, seekKey []byte) (key, value []byte, di uin
fmt.Printf("seek %x\n", seekKey)
}
if len(seekKey) == 0 && b.offt.Count() > 0 {
- key, value, err = b.dataLookupFunc(0, g)
+ key, value, _, err = b.dataLookupFunc(0, g)
if err != nil {
return nil, nil, 0, false, err
}
@@ -348,7 +349,7 @@ func (b *BpsTree) Seek(g *seg.Reader, seekKey []byte) (key, value []byte, di uin
if l == r {
m = l
}
- key, value, err = b.dataLookupFunc(m, g)
+ key, value, _, err = b.dataLookupFunc(m, g)
if err != nil {
return nil, nil, 0, false, err
}
@@ -363,7 +364,7 @@ func (b *BpsTree) Get(g *seg.Reader, key []byte) (k []byte, ok bool, i uint64, e
fmt.Printf("get %x\n", key)
}
if len(key) == 0 && b.offt.Count() > 0 {
- k0, v0, err := b.dataLookupFunc(0, g)
+ k0, v0, _, err := b.dataLookupFunc(0, g)
if err != nil || k0 != nil {
return nil, false, 0, err
}
diff --git a/erigon-lib/state/btree_index.go b/erigon-lib/state/btree_index.go
index 667f53b5539..9aa5c7771af 100644
--- a/erigon-lib/state/btree_index.go
+++ b/erigon-lib/state/btree_index.go
@@ -105,10 +105,6 @@ func (c *Cursor) Di() uint64 {
return c.d
}
-func (c *Cursor) offsetInFile() uint64 {
- return c.btt.ef.Get(c.d)
-}
-
func (c *Cursor) Value() []byte {
return c.value
}
@@ -118,7 +114,7 @@ func (c *Cursor) Next() bool {
return false
}
- key, value, err := c.btt.dataLookup(c.d, c.getter)
+ key, value, _, err := c.btt.dataLookup(c.d, c.getter)
if err != nil {
return false
}
@@ -543,7 +539,7 @@ func (a *btAlloc) WarmUp(gr *seg.Reader) error {
break
}
- kb, v, err := a.dataLookup(s.d, gr)
+ kb, v, _, err := a.dataLookup(s.d, gr)
if err != nil {
fmt.Printf("d %d not found %v\n", s.d, err)
}
@@ -898,23 +894,23 @@ func OpenBtreeIndexWithDecompressor(indexPath string, M uint64, kv *seg.Decompre
// dataLookup fetches key and value from data file by di (data index)
// di starts from 0 so di is never >= keyCount
-func (b *BtIndex) dataLookup(di uint64, g *seg.Reader) ([]byte, []byte, error) {
+func (b *BtIndex) dataLookup(di uint64, g *seg.Reader) (k, v []byte, offset uint64, err error) {
if di >= b.ef.Count() {
- return nil, nil, fmt.Errorf("%w: keyCount=%d, but key %d requested. file: %s", ErrBtIndexLookupBounds, b.ef.Count(), di, b.FileName())
+ return nil, nil, 0, fmt.Errorf("%w: keyCount=%d, but key %d requested. file: %s", ErrBtIndexLookupBounds, b.ef.Count(), di, b.FileName())
}
- offset := b.ef.Get(di)
+ offset = b.ef.Get(di)
g.Reset(offset)
if !g.HasNext() {
- return nil, nil, fmt.Errorf("pair %d/%d key not found, file: %s/%s", di, b.ef.Count(), b.FileName(), g.FileName())
+ return nil, nil, 0, fmt.Errorf("pair %d/%d key not found, file: %s/%s", di, b.ef.Count(), b.FileName(), g.FileName())
}
- k, _ := g.Next(nil)
+ k, _ = g.Next(nil)
if !g.HasNext() {
- return nil, nil, fmt.Errorf("pair %d/%d value not found, file: %s/%s", di, b.ef.Count(), b.FileName(), g.FileName())
+ return nil, nil, 0, fmt.Errorf("pair %d/%d value not found, file: %s/%s", di, b.ef.Count(), b.FileName(), g.FileName())
}
- v, _ := g.Next(nil)
- return k, v, nil
+ v, _ = g.Next(nil)
+ return k, v, offset, nil
}
// comparing `k` with item of index `di`. using buffer `kBuf` to avoid allocations
@@ -988,14 +984,14 @@ func (b *BtIndex) Close() {
}
// Get - exact match of key. `k == nil` - means not found
-func (b *BtIndex) Get(lookup []byte, gr *seg.Reader) (k, v []byte, found bool, err error) {
+func (b *BtIndex) Get(lookup []byte, gr *seg.Reader) (k, v []byte, offsetInFile uint64, found bool, err error) {
// TODO: optimize by "push-down" - instead of using seek+compare, alloc can have method Get which will return nil if key doesn't exists
// alternativaly: can allocate cursor on-stack
// it := Iter{} // allocation on stack
// it.Initialize(file)
if b.Empty() {
- return k, v, false, nil
+ return k, v, 0, false, nil
}
var index uint64
@@ -1015,29 +1011,29 @@ func (b *BtIndex) Get(lookup []byte, gr *seg.Reader) (k, v []byte, found bool, e
k, found, index, err = b.bplus.Get(gr, lookup)
} else {
if b.alloc == nil {
- return k, v, false, err
+ return k, v, 0, false, err
}
k, found, index, err = b.alloc.Get(gr, lookup)
}
if err != nil || !found {
if errors.Is(err, ErrBtIndexLookupBounds) {
- return k, v, false, nil
+ return k, v, offsetInFile, false, nil
}
- return nil, nil, false, err
+ return nil, nil, 0, false, err
}
// this comparation should be done by index get method, and in case of mismatch, key is not found
//if !bytes.Equal(k, lookup) {
// return k, v, false, nil
//}
- k, v, err = b.dataLookup(index, gr)
+ k, v, offsetInFile, err = b.dataLookup(index, gr)
if err != nil {
if errors.Is(err, ErrBtIndexLookupBounds) {
- return k, v, false, nil
+ return k, v, offsetInFile, false, nil
}
- return k, v, false, err
+ return k, v, offsetInFile, false, err
}
- return k, v, true, nil
+ return k, v, offsetInFile, true, nil
}
// Seek moves cursor to position where key >= x.
@@ -1070,7 +1066,7 @@ func (b *BtIndex) Seek(g *seg.Reader, x []byte) (*Cursor, error) {
return nil, err
}
- k, v, err := b.dataLookup(dt, g)
+ k, v, _, err := b.dataLookup(dt, g)
if err != nil {
if errors.Is(err, ErrBtIndexLookupBounds) {
return nil, nil
@@ -1081,7 +1077,7 @@ func (b *BtIndex) Seek(g *seg.Reader, x []byte) (*Cursor, error) {
}
func (b *BtIndex) OrdinalLookup(getter *seg.Reader, i uint64) *Cursor {
- k, v, err := b.dataLookup(i, getter)
+ k, v, _, err := b.dataLookup(i, getter)
if err != nil {
return nil
}
diff --git a/erigon-lib/state/btree_index_test.go b/erigon-lib/state/btree_index_test.go
index d4c8a5f9448..91944b62ef3 100644
--- a/erigon-lib/state/btree_index_test.go
+++ b/erigon-lib/state/btree_index_test.go
@@ -34,6 +34,8 @@ import (
)
func Test_BtreeIndex_Init2(t *testing.T) {
+ t.Parallel()
+
//mainnet: storage.128-160.kv 110mil keys, 100mb bloomfilter of 0.01 (1%) miss-probability
//no much reason to merge bloomfilter - can merge them on startup
//1B keys: 1Gb
@@ -51,6 +53,8 @@ func Test_BtreeIndex_Init2(t *testing.T) {
}
func Test_BtreeIndex_Init(t *testing.T) {
+ t.Parallel()
+
logger := log.New()
tmp := t.TempDir()
@@ -70,6 +74,8 @@ func Test_BtreeIndex_Init(t *testing.T) {
}
func Test_BtreeIndex_Seek(t *testing.T) {
+ t.Parallel()
+
tmp := t.TempDir()
logger := log.New()
keyCount, M := 120, 30
@@ -104,14 +110,14 @@ func Test_BtreeIndex_Seek(t *testing.T) {
getter := seg.NewReader(kv.MakeGetter(), compressFlags)
t.Run("seek beyond the last key", func(t *testing.T) {
- _, _, err := bt.dataLookup(bt.ef.Count()+1, getter)
+ _, _, _, err := bt.dataLookup(bt.ef.Count()+1, getter)
require.ErrorIs(t, err, ErrBtIndexLookupBounds)
- _, _, err = bt.dataLookup(bt.ef.Count(), getter)
+ _, _, _, err = bt.dataLookup(bt.ef.Count(), getter)
require.ErrorIs(t, err, ErrBtIndexLookupBounds)
require.Error(t, err)
- _, _, err = bt.dataLookup(bt.ef.Count()-1, getter)
+ _, _, _, err = bt.dataLookup(bt.ef.Count()-1, getter)
require.NoError(t, err)
cur, err := bt.Seek(getter, common.FromHex("0xffffffffffffff")) //seek beyeon the last key
@@ -152,6 +158,8 @@ func Test_BtreeIndex_Seek(t *testing.T) {
}
func Test_BtreeIndex_Build(t *testing.T) {
+ t.Parallel()
+
tmp := t.TempDir()
logger := log.New()
keyCount, M := 20000, 510
@@ -202,6 +210,8 @@ func buildBtreeIndex(tb testing.TB, dataPath, indexPath string, compressed seg.F
}
func Test_BtreeIndex_Seek2(t *testing.T) {
+ t.Parallel()
+
tmp := t.TempDir()
logger := log.New()
keyCount, M := 1_200_000, 1024
@@ -224,14 +234,14 @@ func Test_BtreeIndex_Seek2(t *testing.T) {
getter := seg.NewReader(kv.MakeGetter(), compressFlags)
t.Run("seek beyond the last key", func(t *testing.T) {
- _, _, err := bt.dataLookup(bt.ef.Count()+1, getter)
+ _, _, _, err := bt.dataLookup(bt.ef.Count()+1, getter)
require.ErrorIs(t, err, ErrBtIndexLookupBounds)
- _, _, err = bt.dataLookup(bt.ef.Count(), getter)
+ _, _, _, err = bt.dataLookup(bt.ef.Count(), getter)
require.ErrorIs(t, err, ErrBtIndexLookupBounds)
require.Error(t, err)
- _, _, err = bt.dataLookup(bt.ef.Count()-1, getter)
+ _, _, _, err = bt.dataLookup(bt.ef.Count()-1, getter)
require.NoError(t, err)
cur, err := bt.Seek(getter, common.FromHex("0xffffffffffffff")) //seek beyeon the last key
@@ -271,6 +281,8 @@ func Test_BtreeIndex_Seek2(t *testing.T) {
}
func TestBpsTree_Seek(t *testing.T) {
+ t.Parallel()
+
keyCount, M := 48, 4
tmp := t.TempDir()
@@ -337,23 +349,23 @@ type mockIndexReader struct {
ef *eliasfano32.EliasFano
}
-func (b *mockIndexReader) dataLookup(di uint64, g *seg.Reader) ([]byte, []byte, error) {
+func (b *mockIndexReader) dataLookup(di uint64, g *seg.Reader) (k, v []byte, offset uint64, err error) {
if di >= b.ef.Count() {
- return nil, nil, fmt.Errorf("%w: keyCount=%d, but key %d requested. file: %s", ErrBtIndexLookupBounds, b.ef.Count(), di, g.FileName())
+ return nil, nil, 0, fmt.Errorf("%w: keyCount=%d, but key %d requested. file: %s", ErrBtIndexLookupBounds, b.ef.Count(), di, g.FileName())
}
- offset := b.ef.Get(di)
+ offset = b.ef.Get(di)
g.Reset(offset)
if !g.HasNext() {
- return nil, nil, fmt.Errorf("pair %d/%d key not found, file: %s", di, b.ef.Count(), g.FileName())
+ return nil, nil, 0, fmt.Errorf("pair %d/%d key not found, file: %s", di, b.ef.Count(), g.FileName())
}
- k, _ := g.Next(nil)
+ k, _ = g.Next(nil)
if !g.HasNext() {
- return nil, nil, fmt.Errorf("pair %d/%d value not found, file: %s", di, b.ef.Count(), g.FileName())
+ return nil, nil, 0, fmt.Errorf("pair %d/%d value not found, file: %s", di, b.ef.Count(), g.FileName())
}
- v, _ := g.Next(nil)
- return k, v, nil
+ v, _ = g.Next(nil)
+ return k, v, offset, nil
}
// comparing `k` with item of index `di`. using buffer `kBuf` to avoid allocations
diff --git a/erigon-lib/state/cache.go b/erigon-lib/state/cache.go
index 08d5c86359e..af76f2cd495 100644
--- a/erigon-lib/state/cache.go
+++ b/erigon-lib/state/cache.go
@@ -18,24 +18,25 @@ type u128 struct{ hi, lo uint64 } //nolint
type u192 struct{ hi, lo, ext uint64 } //nolint
type DomainGetFromFileCache struct {
- *freelru.LRU[u128, domainGetFromFileCacheItem]
+ *freelru.LRU[uint64, domainGetFromFileCacheItem]
enabled, trace bool
}
// nolint
type domainGetFromFileCacheItem struct {
- lvl uint8
- v []byte // pointer to `mmap` - if .kv file is not compressed
+ lvl uint8
+ exists bool
+ offset uint64
}
var (
- domainGetFromFileCacheLimit = uint32(dbg.EnvInt("D_LRU", 4096))
+ domainGetFromFileCacheLimit = uint32(dbg.EnvInt("D_LRU", 10_000))
domainGetFromFileCacheTrace = dbg.EnvBool("D_LRU_TRACE", false)
domainGetFromFileCacheEnabled = dbg.EnvBool("D_LRU_ENABLED", true)
)
func NewDomainGetFromFileCache() *DomainGetFromFileCache {
- c, err := freelru.New[u128, domainGetFromFileCacheItem](domainGetFromFileCacheLimit, u128noHash)
+ c, err := freelru.New[uint64, domainGetFromFileCacheItem](domainGetFromFileCacheLimit, u64noHash)
if err != nil {
panic(err)
}
@@ -76,9 +77,6 @@ func (v *domainVisible) newGetFromFileCache() *DomainGetFromFileCache {
if !domainGetFromFileCacheEnabled {
return nil
}
- if v.name == kv.CommitmentDomain {
- return nil
- }
return v.caches.Get().(*DomainGetFromFileCache)
}
func (v *domainVisible) returnGetFromFileCache(c *DomainGetFromFileCache) {
@@ -90,12 +88,13 @@ func (v *domainVisible) returnGetFromFileCache(c *DomainGetFromFileCache) {
}
var (
- iiGetFromFileCacheLimit = uint32(dbg.EnvInt("II_LRU", 4096))
- iiGetFromFileCacheTrace = dbg.EnvBool("II_LRU_TRACE", false)
+ iiGetFromFileCacheLimit = uint32(dbg.EnvInt("II_LRU", 4096))
+ iiGetFromFileCacheTrace = dbg.EnvBool("II_LRU_TRACE", false)
+ iiGetFromFileCacheEnabled = dbg.EnvBool("II_LRU_ENABLED", true)
)
type IISeekInFilesCache struct {
- *freelru.LRU[u128, iiSeekInFilesCacheItem]
+ *freelru.LRU[uint64, iiSeekInFilesCacheItem]
hit, total int
trace bool
}
@@ -104,7 +103,10 @@ type iiSeekInFilesCacheItem struct {
}
func NewIISeekInFilesCache() *IISeekInFilesCache {
- c, err := freelru.New[u128, iiSeekInFilesCacheItem](iiGetFromFileCacheLimit, u128noHash)
+ if !iiGetFromFileCacheEnabled {
+ return nil
+ }
+ c, err := freelru.New[uint64, iiSeekInFilesCacheItem](iiGetFromFileCacheLimit, u64noHash)
if err != nil {
panic(err)
}
diff --git a/erigon-lib/state/domain.go b/erigon-lib/state/domain.go
index 4c9ef99b85a..7357753f27f 100644
--- a/erigon-lib/state/domain.go
+++ b/erigon-lib/state/domain.go
@@ -127,7 +127,7 @@ var DomainCompressCfg = seg.Cfg{
MinPatternScore: 1000,
DictReducerSoftLimit: 2000000,
MinPatternLen: 20,
- MaxPatternLen: 32,
+ MaxPatternLen: 128,
SamplingFactor: 4,
MaxDictPatterns: 64 * 1024 * 2,
Workers: 1,
@@ -745,7 +745,7 @@ func domainReadMetric(name kv.Domain, level int) metrics.Summary {
return mxsKVGet[name][level]
}
-func (dt *DomainRoTx) getFromFile(i int, filekey []byte) ([]byte, bool, error) {
+func (dt *DomainRoTx) getLatestFromFile(i int, filekey []byte) (v []byte, ok bool, offset uint64, err error) {
if dbg.KVReadLevelledMetrics {
defer domainReadMetric(dt.name, i).ObserveDuration(time.Now())
}
@@ -754,33 +754,33 @@ func (dt *DomainRoTx) getFromFile(i int, filekey []byte) ([]byte, bool, error) {
if !(UseBtree || UseBpsTree) {
reader := dt.statelessIdxReader(i)
if reader.Empty() {
- return nil, false, nil
+ return nil, false, 0, nil
}
offset, ok := reader.Lookup(filekey)
if !ok {
- return nil, false, nil
+ return nil, false, 0, nil
}
g.Reset(offset)
k, _ := g.Next(nil)
if !bytes.Equal(filekey, k) {
- return nil, false, nil
+ return nil, false, 0, nil
}
v, _ := g.Next(nil)
- return v, true, nil
+ return v, true, 0, nil
}
- _, v, ok, err := dt.statelessBtree(i).Get(filekey, g)
+ _, v, offset, ok, err = dt.statelessBtree(i).Get(filekey, g)
if err != nil || !ok {
- return nil, false, err
+ return nil, false, 0, err
}
//fmt.Printf("getLatestFromBtreeColdFiles key %x shard %d %x\n", filekey, exactColdShard, v)
- return v, true, nil
+ return v, true, offset, nil
}
func (dt *DomainRoTx) DebugKVFilesWithKey(k []byte) (res []string, err error) {
for i := len(dt.files) - 1; i >= 0; i-- {
- _, ok, err := dt.getFromFile(i, k)
+ _, ok, _, err := dt.getLatestFromFile(i, k)
if err != nil {
return res, err
}
@@ -1420,21 +1420,29 @@ func (dt *DomainRoTx) getFromFiles(filekey []byte) (v []byte, found bool, fileSt
if len(dt.files) == 0 {
return
}
+ useExistenceFilter := dt.d.indexList&withExistence != 0
+ useCache := dt.name != kv.CommitmentDomain
- hi, lo := dt.ht.iit.hashKey(filekey)
-
- if dt.getFromFileCache == nil {
+ hi, _ := dt.ht.iit.hashKey(filekey)
+ if useCache && dt.getFromFileCache == nil {
dt.getFromFileCache = dt.visible.newGetFromFileCache()
}
if dt.getFromFileCache != nil {
- cv, ok := dt.getFromFileCache.Get(u128{hi: hi, lo: lo})
+ cv, ok := dt.getFromFileCache.Get(hi)
if ok {
- return cv.v, true, dt.files[cv.lvl].startTxNum, dt.files[cv.lvl].endTxNum, nil
+ if !cv.exists {
+ return nil, true, dt.files[cv.lvl].startTxNum, dt.files[cv.lvl].endTxNum, nil
+ }
+ g := dt.statelessGetter(int(cv.lvl))
+ g.Reset(cv.offset)
+ g.Skip()
+ v, _ = g.Next(nil) // can be compressed
+ return v, true, dt.files[cv.lvl].startTxNum, dt.files[cv.lvl].endTxNum, nil
}
}
for i := len(dt.files) - 1; i >= 0; i-- {
- if dt.d.indexList&withExistence != 0 {
+ if useExistenceFilter {
if dt.files[i].src.existence != nil {
if !dt.files[i].src.existence.ContainsHash(hi) {
if traceGetLatest == dt.name {
@@ -1453,7 +1461,8 @@ func (dt *DomainRoTx) getFromFiles(filekey []byte) (v []byte, found bool, fileSt
}
}
- v, found, err = dt.getFromFile(i, filekey)
+ var offset uint64
+ v, found, offset, err = dt.getLatestFromFile(i, filekey)
if err != nil {
return nil, false, 0, 0, err
}
@@ -1468,7 +1477,7 @@ func (dt *DomainRoTx) getFromFiles(filekey []byte) (v []byte, found bool, fileSt
}
if dt.getFromFileCache != nil {
- dt.getFromFileCache.Add(u128{hi: hi, lo: lo}, domainGetFromFileCacheItem{lvl: uint8(i), v: v})
+ dt.getFromFileCache.Add(hi, domainGetFromFileCacheItem{lvl: uint8(i), offset: offset, exists: true})
}
return v, true, dt.files[i].startTxNum, dt.files[i].endTxNum, nil
}
@@ -1477,37 +1486,35 @@ func (dt *DomainRoTx) getFromFiles(filekey []byte) (v []byte, found bool, fileSt
}
if dt.getFromFileCache != nil {
- dt.getFromFileCache.Add(u128{hi: hi, lo: lo}, domainGetFromFileCacheItem{lvl: 0, v: nil})
+ dt.getFromFileCache.Add(hi, domainGetFromFileCacheItem{lvl: 0, offset: 0, exists: false})
}
return nil, false, 0, 0, nil
}
// GetAsOf does not always require usage of roTx. If it is possible to determine
// historical value based only on static files, roTx will not be used.
-func (dt *DomainRoTx) GetAsOf(key []byte, txNum uint64, roTx kv.Tx) ([]byte, error) {
+func (dt *DomainRoTx) GetAsOf(key []byte, txNum uint64, roTx kv.Tx) ([]byte, bool, error) {
v, hOk, err := dt.ht.HistorySeek(key, txNum, roTx)
if err != nil {
- return nil, err
+ return nil, false, err
}
if hOk {
- // if history returned marker of key creation
- // domain must return nil
- if len(v) == 0 {
+ if len(v) == 0 { // if history successfuly found marker of key creation
if traceGetAsOf == dt.d.filenameBase {
fmt.Printf("GetAsOf(%s , %x, %d) -> not found in history\n", dt.d.filenameBase, key, txNum)
}
- return nil, nil
+ return nil, false, nil
}
if traceGetAsOf == dt.d.filenameBase {
fmt.Printf("GetAsOf(%s, %x, %d) -> found in history\n", dt.d.filenameBase, key, txNum)
}
- return v, nil
+ return v, v != nil, nil
}
v, _, _, err = dt.GetLatest(key, nil, roTx)
if err != nil {
- return nil, err
+ return nil, false, err
}
- return v, nil
+ return v, v != nil, nil
}
func (dt *DomainRoTx) Close() {
@@ -1662,10 +1669,6 @@ func (dt *DomainRoTx) GetLatest(key1, key2 []byte, roTx kv.Tx) ([]byte, uint64,
return v, endTxNum / dt.d.aggregationStep, foundInFile, nil
}
-func (dt *DomainRoTx) GetLatestFromFiles(key []byte) (v []byte, found bool, fileStartTxNum uint64, fileEndTxNum uint64, err error) {
- return dt.getFromFiles(key)
-}
-
func (dt *DomainRoTx) DomainRange(ctx context.Context, tx kv.Tx, fromKey, toKey []byte, ts uint64, asc order.By, limit int) (it stream.KV, err error) {
if !asc {
panic("implement me")
diff --git a/erigon-lib/state/domain_committed.go b/erigon-lib/state/domain_committed.go
index 04124120147..3b1d2154faa 100644
--- a/erigon-lib/state/domain_committed.go
+++ b/erigon-lib/state/domain_committed.go
@@ -134,28 +134,20 @@ func (dt *DomainRoTx) findShortenedKey(fullKey []byte, itemGetter *seg.Reader, i
if item.bindex == nil {
dt.d.logger.Warn("[agg] commitment branch key replacement: file doesn't have index", "name", item.decompressor.FileName())
}
- cur, err := item.bindex.Seek(itemGetter, fullKey)
+ _, _, offsetInFile, ok, err := item.bindex.Get(fullKey, itemGetter)
if err != nil {
dt.d.logger.Warn("[agg] commitment branch key replacement seek failed",
"key", fmt.Sprintf("%x", fullKey), "idx", "bt", "err", err, "file", item.decompressor.FileName())
}
-
- if cur == nil || !bytes.Equal(cur.Key(), fullKey) {
- return nil, false
- }
-
- offset := cur.offsetInFile()
- if uint64(itemGetter.Size()) <= offset {
- dt.d.logger.Warn("commitment branch key replacement seek gone too far",
- "key", fmt.Sprintf("%x", fullKey), "offset", offset, "size", itemGetter.Size(), "file", item.decompressor.FileName())
+ if !ok {
return nil, false
}
- return encodeShorterKey(nil, offset), true
+ return encodeShorterKey(nil, offsetInFile), true
}
return nil, false
}
-func (dt *DomainRoTx) lookupFileByItsRange(txFrom uint64, txTo uint64) *filesItem {
+func (dt *DomainRoTx) lookupVisibleFileByItsRange(txFrom uint64, txTo uint64) *filesItem {
var item *filesItem
for _, f := range dt.files {
if f.startTxNum == txFrom && f.endTxNum == txTo {
@@ -163,6 +155,26 @@ func (dt *DomainRoTx) lookupFileByItsRange(txFrom uint64, txTo uint64) *filesIte
break
}
}
+ if item == nil || item.bindex == nil {
+ visibleFiles := ""
+ for _, f := range dt.files {
+ visibleFiles += fmt.Sprintf("%d-%d;", f.startTxNum/dt.d.aggregationStep, f.endTxNum/dt.d.aggregationStep)
+ }
+ dt.d.logger.Warn("[agg] lookupVisibleFileByItsRange: file not found",
+ "stepFrom", txFrom/dt.d.aggregationStep, "stepTo", txTo/dt.d.aggregationStep,
+ "_visible", visibleFiles, "visibleFilesCount", len(dt.files))
+
+ if item != nil && item.bindex == nil {
+ dt.d.logger.Warn("[agg] lookupVisibleFileByItsRange: file found but not indexed", "f", item.decompressor.FileName())
+ }
+
+ return nil
+ }
+ return item
+}
+
+func (dt *DomainRoTx) lookupDirtyFileByItsRange(txFrom uint64, txTo uint64) *filesItem {
+ var item *filesItem
if item == nil {
dt.d.dirtyFiles.Walk(func(files []*filesItem) bool {
for _, f := range files {
@@ -180,17 +192,12 @@ func (dt *DomainRoTx) lookupFileByItsRange(txFrom uint64, txTo uint64) *filesIte
for _, item := range dt.d.dirtyFiles.Items() {
fileStepsss += fmt.Sprintf("%d-%d;", item.startTxNum/dt.d.aggregationStep, item.endTxNum/dt.d.aggregationStep)
}
- visibleFiles := ""
- for _, f := range dt.files {
- visibleFiles += fmt.Sprintf("%d-%d;", f.startTxNum/dt.d.aggregationStep, f.endTxNum/dt.d.aggregationStep)
- }
- dt.d.logger.Warn("[agg] lookupFileByItsRange: file not found",
+ dt.d.logger.Warn("[agg] lookupDirtyFileByItsRange: file not found",
"stepFrom", txFrom/dt.d.aggregationStep, "stepTo", txTo/dt.d.aggregationStep,
- "files", fileStepsss, "_visible", visibleFiles,
- "visibleFilesCount", len(dt.files), "filesCount", dt.d.dirtyFiles.Len())
+ "files", fileStepsss, "filesCount", dt.d.dirtyFiles.Len())
if item != nil && item.bindex == nil {
- dt.d.logger.Warn("[agg] lookupFileByItsRange: file found but not indexed", "f", item.decompressor.FileName())
+ dt.d.logger.Warn("[agg] lookupDirtyFileByItsRange: file found but not indexed", "f", item.decompressor.FileName())
}
return nil
@@ -232,7 +239,7 @@ func (dt *DomainRoTx) lookupByShortenedKey(shortKey []byte, getter *seg.Reader)
func (dt *DomainRoTx) commitmentValTransformDomain(rng MergeRange, accounts, storage *DomainRoTx, mergedAccount, mergedStorage *filesItem) (valueTransformer, error) {
hadToLookupStorage := mergedStorage == nil
if mergedStorage == nil {
- mergedStorage = storage.lookupFileByItsRange(rng.from, rng.to)
+ mergedStorage = storage.lookupVisibleFileByItsRange(rng.from, rng.to)
if mergedStorage == nil {
// TODO may allow to merge, but storage keys will be stored as plainkeys
return nil, fmt.Errorf("merged v1-account.%d-%d.kv file not found", rng.from/dt.d.aggregationStep, rng.to/dt.d.aggregationStep)
@@ -240,7 +247,7 @@ func (dt *DomainRoTx) commitmentValTransformDomain(rng MergeRange, accounts, sto
}
hadToLookupAccount := mergedAccount == nil
if mergedAccount == nil {
- mergedAccount = accounts.lookupFileByItsRange(rng.from, rng.to)
+ mergedAccount = accounts.lookupVisibleFileByItsRange(rng.from, rng.to)
if mergedAccount == nil {
return nil, fmt.Errorf("merged v1-account.%d-%d.kv file not found", rng.from/dt.d.aggregationStep, rng.to/dt.d.aggregationStep)
}
@@ -279,7 +286,7 @@ func (dt *DomainRoTx) commitmentValTransformDomain(rng MergeRange, accounts, sto
}
sig, ok := storageFileMap[keyFromTxNum][keyEndTxNum]
if !ok {
- dirty := storage.lookupFileByItsRange(keyFromTxNum, keyEndTxNum)
+ dirty := storage.lookupDirtyFileByItsRange(keyFromTxNum, keyEndTxNum)
if dirty == nil {
return nil, fmt.Errorf("dirty storage file not found %d-%d", keyFromTxNum/dt.d.aggregationStep, keyEndTxNum/dt.d.aggregationStep)
}
@@ -292,7 +299,7 @@ func (dt *DomainRoTx) commitmentValTransformDomain(rng MergeRange, accounts, sto
}
aig, ok := accountFileMap[keyFromTxNum][keyEndTxNum]
if !ok {
- dirty := accounts.lookupFileByItsRange(keyFromTxNum, keyEndTxNum)
+ dirty := accounts.lookupDirtyFileByItsRange(keyFromTxNum, keyEndTxNum)
if dirty == nil {
return nil, fmt.Errorf("dirty account file not found %d-%d", keyFromTxNum/dt.d.aggregationStep, keyEndTxNum/dt.d.aggregationStep)
}
diff --git a/erigon-lib/state/domain_shared.go b/erigon-lib/state/domain_shared.go
index c121234499b..1aad6334bd6 100644
--- a/erigon-lib/state/domain_shared.go
+++ b/erigon-lib/state/domain_shared.go
@@ -96,9 +96,8 @@ type SharedDomains struct {
domains [kv.DomainLen]map[string]dataWithPrevStep
storage *btree2.Map[string, dataWithPrevStep]
- domainWriters [kv.DomainLen]*domainBufferedWriter
- iiWriters [kv.StandaloneIdxLen]*invertedIndexBufferedWriter
- appendableWriter [kv.AppendableLen]*appendableBufferedWriter
+ domainWriters [kv.DomainLen]*domainBufferedWriter
+ iiWriters [kv.StandaloneIdxLen]*invertedIndexBufferedWriter
currentChangesAccumulator *StateChangeSet
pastChangesAccumulator map[string]*StateChangeSet
@@ -131,10 +130,6 @@ func NewSharedDomains(tx kv.Tx, logger log.Logger) (*SharedDomains, error) {
sd.domainWriters[id] = d.NewWriter()
}
- for id, a := range sd.aggTx.appendable {
- sd.appendableWriter[id] = a.NewWriter()
- }
-
sd.SetTxNum(0)
sd.sdCtx = NewSharedDomainsCommitmentContext(sd, commitment.ModeDirect, commitment.VariantHexPatriciaTrie)
@@ -181,10 +176,6 @@ func (sd *SharedDomains) GetDiffset(tx kv.RwTx, blockHash common.Hash, blockNumb
}
func (sd *SharedDomains) AggTx() any { return sd.aggTx }
-func (sd *SharedDomains) CanonicalReader() CanonicalsReader {
- return nil
- //return sd.aggTx.appendable[kv.ReceiptsAppendable].ap.cfg.iters
-}
// aggregator context should call aggTx.Unwind before this one.
func (sd *SharedDomains) Unwind(ctx context.Context, rwTx kv.RwTx, blockUnwindTo, txUnwindTo uint64, changeset *[kv.DomainLen][]DomainEntryDiff) error {
@@ -212,12 +203,6 @@ func (sd *SharedDomains) Unwind(ctx context.Context, rwTx kv.RwTx, blockUnwindTo
}
}
- for _, ap := range sd.aggTx.appendable {
- if err := ap.Unwind(ctx, rwTx, txUnwindTo, math.MaxUint64, math.MaxUint64, logEvery, true, nil); err != nil {
- return err
- }
- }
-
sd.ClearRam(true)
sd.SetTxNum(txUnwindTo)
sd.SetBlockNum(blockUnwindTo)
@@ -423,12 +408,12 @@ func (sd *SharedDomains) replaceShortenedKeysInBranch(prefix []byte, branch comm
sto := sd.aggTx.d[kv.StorageDomain]
acc := sd.aggTx.d[kv.AccountsDomain]
- storageItem := sto.lookupFileByItsRange(fStartTxNum, fEndTxNum)
+ storageItem := sto.lookupVisibleFileByItsRange(fStartTxNum, fEndTxNum)
if storageItem == nil {
sd.logger.Crit(fmt.Sprintf("storage file of steps %d-%d not found\n", fStartTxNum/sd.aggTx.a.aggregationStep, fEndTxNum/sd.aggTx.a.aggregationStep))
return nil, errors.New("storage file not found")
}
- accountItem := acc.lookupFileByItsRange(fStartTxNum, fEndTxNum)
+ accountItem := acc.lookupVisibleFileByItsRange(fStartTxNum, fEndTxNum)
if accountItem == nil {
sd.logger.Crit(fmt.Sprintf("storage file of steps %d-%d not found\n", fStartTxNum/sd.aggTx.a.aggregationStep, fEndTxNum/sd.aggTx.a.aggregationStep))
return nil, errors.New("account file not found")
@@ -650,9 +635,7 @@ func (sd *SharedDomains) SetTrace(b bool) {
}
func (sd *SharedDomains) ComputeCommitment(ctx context.Context, saveStateAfter bool, blockNum uint64, logPrefix string) (rootHash []byte, err error) {
- sd.aggTx.RestrictSubsetFileDeletions(true)
rootHash, err = sd.sdCtx.ComputeCommitment(ctx, saveStateAfter, blockNum, logPrefix)
- sd.aggTx.RestrictSubsetFileDeletions(false)
return
}
@@ -809,9 +792,6 @@ func (sd *SharedDomains) Close() {
for _, iiWriter := range sd.iiWriters {
iiWriter.close()
}
- for _, a := range sd.appendableWriter {
- a.close()
- }
}
if sd.sdCtx != nil {
@@ -854,14 +834,6 @@ func (sd *SharedDomains) Flush(ctx context.Context, tx kv.RwTx) error {
return err
}
}
- for _, w := range sd.appendableWriter {
- if w == nil {
- continue
- }
- if err := w.Flush(ctx, tx); err != nil {
- return err
- }
- }
if dbg.PruneOnFlushTimeout != 0 {
_, err = sd.aggTx.PruneSmallBatches(ctx, dbg.PruneOnFlushTimeout, tx)
if err != nil {
@@ -881,12 +853,6 @@ func (sd *SharedDomains) Flush(ctx context.Context, tx kv.RwTx) error {
}
w.close()
}
- for _, w := range sd.appendableWriter {
- if w == nil {
- continue
- }
- w.close()
- }
return nil
}
@@ -911,7 +877,7 @@ func (sd *SharedDomains) DomainGet(domain kv.Domain, k, k2 []byte) (v []byte, st
// DomainPut
// Optimizations:
-// - user can prvide `prevVal != nil` - then it will not read prev value from storage
+// - user can provide `prevVal != nil` - then it will not read prev value from storage
// - user can append k2 into k1, then underlying methods will not preform append
// - if `val == nil` it will call DomainDel
func (sd *SharedDomains) DomainPut(domain kv.Domain, k1, k2 []byte, val, prevVal []byte, prevStep uint64) error {
@@ -936,7 +902,13 @@ func (sd *SharedDomains) DomainPut(domain kv.Domain, k1, k2 []byte, val, prevVal
return nil
}
return sd.updateAccountCode(k1, val, prevVal, prevStep)
+ case kv.CommitmentDomain:
+ sd.put(domain, string(append(k1, k2...)), val)
+ return sd.domainWriters[domain].PutWithPrev(k1, k2, val, prevVal, prevStep)
default:
+ if bytes.Equal(prevVal, val) {
+ return nil
+ }
sd.put(domain, string(append(k1, k2...)), val)
return sd.domainWriters[domain].PutWithPrev(k1, k2, val, prevVal, prevStep)
}
@@ -1012,10 +984,6 @@ func (sd *SharedDomains) DomainDelPrefix(domain kv.Domain, prefix []byte) error
}
func (sd *SharedDomains) Tx() kv.Tx { return sd.roTx }
-func (sd *SharedDomains) AppendablePut(name kv.Appendable, ts kv.TxnId, v []byte) error {
- return sd.appendableWriter[name].Append(ts, v)
-}
-
type SharedDomainsCommitmentContext struct {
sharedDomains *SharedDomains
discard bool // could be replaced with using ModeDisabled
diff --git a/erigon-lib/state/domain_shared_test.go b/erigon-lib/state/domain_shared_test.go
index 0c33a6af17d..d9fcbd20201 100644
--- a/erigon-lib/state/domain_shared_test.go
+++ b/erigon-lib/state/domain_shared_test.go
@@ -36,6 +36,8 @@ import (
)
func TestSharedDomain_CommitmentKeyReplacement(t *testing.T) {
+ t.Parallel()
+
stepSize := uint64(100)
db, agg := testDbAndAggregatorv3(t, stepSize)
@@ -109,6 +111,8 @@ func TestSharedDomain_CommitmentKeyReplacement(t *testing.T) {
}
func TestSharedDomain_Unwind(t *testing.T) {
+ t.Parallel()
+
stepSize := uint64(100)
db, agg := testDbAndAggregatorv3(t, stepSize)
@@ -203,6 +207,8 @@ Loop:
}
func TestSharedDomain_IteratePrefix(t *testing.T) {
+ t.Parallel()
+
stepSize := uint64(8)
require := require.New(t)
db, agg := testDbAndAggregatorv3(t, stepSize)
@@ -371,6 +377,8 @@ func TestSharedDomain_IteratePrefix(t *testing.T) {
}
func TestSharedDomain_StorageIter(t *testing.T) {
+ t.Parallel()
+
log.Root().SetHandler(log.LvlFilterHandler(log.LvlWarn, log.StderrHandler))
stepSize := uint64(10)
diff --git a/erigon-lib/state/domain_test.go b/erigon-lib/state/domain_test.go
index d8f2b0fa634..bc8c8956bde 100644
--- a/erigon-lib/state/domain_test.go
+++ b/erigon-lib/state/domain_test.go
@@ -33,22 +33,22 @@ import (
"testing"
"time"
- datadir2 "github.com/erigontech/erigon-lib/common/datadir"
- "github.com/erigontech/erigon-lib/kv/order"
- "github.com/erigontech/erigon-lib/kv/stream"
- "github.com/erigontech/erigon-lib/log/v3"
- "github.com/erigontech/erigon-lib/seg"
- "github.com/erigontech/erigon-lib/types"
-
"github.com/holiman/uint256"
"github.com/stretchr/testify/require"
btree2 "github.com/tidwall/btree"
"github.com/erigontech/erigon-lib/common"
"github.com/erigontech/erigon-lib/common/background"
+ datadir2 "github.com/erigontech/erigon-lib/common/datadir"
+ "github.com/erigontech/erigon-lib/common/hexutility"
"github.com/erigontech/erigon-lib/common/length"
"github.com/erigontech/erigon-lib/kv"
"github.com/erigontech/erigon-lib/kv/mdbx"
+ "github.com/erigontech/erigon-lib/kv/order"
+ "github.com/erigontech/erigon-lib/kv/stream"
+ "github.com/erigontech/erigon-lib/log/v3"
+ "github.com/erigontech/erigon-lib/seg"
+ "github.com/erigontech/erigon-lib/types"
)
func testDbAndDomain(t *testing.T, logger log.Logger) (kv.RwDB, *Domain) {
@@ -93,6 +93,8 @@ func testDbAndDomainOfStep(t *testing.T, aggStep uint64, logger log.Logger) (kv.
}
func TestDomain_CollationBuild(t *testing.T) {
+ t.Parallel()
+
t.Run("compressDomainVals=true", func(t *testing.T) {
testCollationBuild(t, true)
})
@@ -102,6 +104,8 @@ func TestDomain_CollationBuild(t *testing.T) {
}
func TestDomain_OpenFolder(t *testing.T) {
+ t.Parallel()
+
db, d, txs := filledDomain(t, log.New())
collateAndMerge(t, db, nil, d, txs)
@@ -434,7 +438,7 @@ func checkHistory(t *testing.T, db kv.RwDB, d *Domain, txs uint64) {
label := fmt.Sprintf("key %x txNum=%d, keyNum=%d", k, txNum, keyNum)
- val, err := dc.GetAsOf(k[:], txNum+1, roTx)
+ val, _, err := dc.GetAsOf(k[:], txNum+1, roTx)
require.NoError(err, label)
if txNum >= keyNum {
require.Equal(v[:], val, label)
@@ -452,6 +456,8 @@ func checkHistory(t *testing.T, db kv.RwDB, d *Domain, txs uint64) {
}
func TestHistory(t *testing.T) {
+ t.Parallel()
+
logger := log.New()
logEvery := time.NewTicker(30 * time.Second)
defer logEvery.Stop()
@@ -564,6 +570,7 @@ func collateAndMergeOnce(t *testing.T, d *Domain, tx kv.RwTx, step uint64, prune
}
func TestDomain_MergeFiles(t *testing.T) {
+ t.Parallel()
logger := log.New()
db, d, txs := filledDomain(t, logger)
@@ -577,6 +584,7 @@ func TestDomain_MergeFiles(t *testing.T) {
}
func TestDomain_ScanFiles(t *testing.T) {
+ t.Parallel()
logger := log.New()
db, d, txs := filledDomain(t, logger)
@@ -592,6 +600,7 @@ func TestDomain_ScanFiles(t *testing.T) {
}
func TestDomain_Delete(t *testing.T) {
+ t.Parallel()
logger := log.New()
db, d := testDbAndDomain(t, logger)
@@ -635,7 +644,7 @@ func TestDomain_Delete(t *testing.T) {
// require.Nil(val, label)
//}
//if txNum == 976 {
- val, err := dc.GetAsOf([]byte("key2"), txNum+1, tx)
+ val, _, err := dc.GetAsOf([]byte("key2"), txNum+1, tx)
require.NoError(err)
//require.False(ok, label)
require.Nil(val, label)
@@ -648,6 +657,7 @@ func TestDomain_Delete(t *testing.T) {
// then check.
// in real life we periodically do collate-merge-prune without stopping adding data
func TestDomain_Prune_AfterAllWrites(t *testing.T) {
+ t.Parallel()
logger := log.New()
keyCount, txCount := uint64(4), uint64(64)
@@ -689,7 +699,7 @@ func TestDomain_Prune_AfterAllWrites(t *testing.T) {
binary.BigEndian.PutUint64(k[:], keyNum)
binary.BigEndian.PutUint64(v[:], txNum)
- val, err := dc.GetAsOf(k[:], txNum+1, roTx)
+ val, _, err := dc.GetAsOf(k[:], txNum+1, roTx)
// during generation such keys are skipped so value should be nil for this call
require.NoError(t, err, label)
if !data[keyNum][txNum] {
@@ -718,6 +728,7 @@ func TestDomain_Prune_AfterAllWrites(t *testing.T) {
}
func TestDomain_PruneOnWrite(t *testing.T) {
+ t.Parallel()
logger := log.New()
keysCount, txCount := uint64(16), uint64(64)
@@ -789,7 +800,7 @@ func TestDomain_PruneOnWrite(t *testing.T) {
binary.BigEndian.PutUint64(k[:], keyNum)
binary.BigEndian.PutUint64(v[:], valNum)
- val, err := dc.GetAsOf(k[:], txNum+1, tx)
+ val, _, err := dc.GetAsOf(k[:], txNum+1, tx)
require.NoError(t, err)
if keyNum == txNum%d.aggregationStep {
if txNum > 1 {
@@ -827,6 +838,7 @@ func TestDomain_PruneOnWrite(t *testing.T) {
}
func TestDomain_OpenFilesWithDeletions(t *testing.T) {
+ t.Parallel()
logger := log.New()
keyCount, txCount := uint64(4), uint64(125)
db, dom, data := filledDomainFixedSize(t, keyCount, txCount, 16, logger)
@@ -925,6 +937,7 @@ func TestDomain_OpenFilesWithDeletions(t *testing.T) {
}
func TestScanStaticFilesD(t *testing.T) {
+ t.Parallel()
ii := &Domain{History: &History{InvertedIndex: emptyTestInvertedIndex(1)},
dirtyFiles: btree2.NewBTreeG[*filesItem](filesItemLess),
@@ -949,6 +962,8 @@ func TestScanStaticFilesD(t *testing.T) {
}
func TestDomain_CollationBuildInMem(t *testing.T) {
+ t.Parallel()
+
logEvery := time.NewTicker(30 * time.Second)
defer logEvery.Stop()
db, d := testDbAndDomain(t, log.New())
@@ -1036,6 +1051,8 @@ func TestDomain_CollationBuildInMem(t *testing.T) {
}
func TestDomainContext_getFromFiles(t *testing.T) {
+ t.Parallel()
+
db, d := testDbAndDomain(t, log.New())
defer db.Close()
defer d.Close()
@@ -1125,7 +1142,7 @@ func TestDomainContext_getFromFiles(t *testing.T) {
beforeTx := d.aggregationStep
for i = 0; i < len(bufs); i++ {
ks, _ := hex.DecodeString(key)
- val, err := dc.GetAsOf(ks, beforeTx, tx)
+ val, _, err := dc.GetAsOf(ks, beforeTx, tx)
require.NoError(t, err)
require.EqualValuesf(t, bufs[i], val, "key %s, txn %d", key, beforeTx)
beforeTx += d.aggregationStep
@@ -1338,9 +1355,10 @@ func generateRandomTxNum(r *rand.Rand, maxTxNum uint64, usedTxNums map[uint64]bo
func TestDomain_GetAfterAggregation(t *testing.T) {
db, d := testDbAndDomainOfStep(t, 25, log.New())
+ require := require.New(t)
tx, err := db.BeginRw(context.Background())
- require.NoError(t, err)
+ require.NoError(err)
defer tx.Rollback()
d.historyLargeValues = false
@@ -1372,14 +1390,14 @@ func TestDomain_GetAfterAggregation(t *testing.T) {
writer.SetTxNum(totalTx)
err = writer.Flush(context.Background(), tx)
- require.NoError(t, err)
+ require.NoError(err)
// aggregate
collateAndMerge(t, db, tx, d, totalTx)
- require.NoError(t, tx.Commit())
+ require.NoError(tx.Commit())
tx, err = db.BeginRw(context.Background())
- require.NoError(t, err)
+ require.NoError(err)
defer tx.Rollback()
dc.Close()
@@ -1390,21 +1408,24 @@ func TestDomain_GetAfterAggregation(t *testing.T) {
for key, updates := range data {
kc++
for i := 1; i < len(updates); i++ {
- v, err := dc.GetAsOf([]byte(key), updates[i].txNum, tx)
- require.NoError(t, err)
- require.EqualValuesf(t, updates[i-1].value, v, "(%d/%d) key %x, txn %d", kc, len(data), []byte(key), updates[i-1].txNum)
+ v, ok, err := dc.GetAsOf([]byte(key), updates[i].txNum, tx)
+ require.NoError(err)
+ require.True(ok)
+ require.EqualValuesf(updates[i-1].value, v, "(%d/%d) key %x, txn %d", kc, len(data), []byte(key), updates[i-1].txNum)
}
if len(updates) == 0 {
continue
}
v, _, ok, err := dc.GetLatest([]byte(key), nil, tx)
- require.NoError(t, err)
- require.EqualValuesf(t, updates[len(updates)-1].value, v, "key %x latest", []byte(key))
- require.True(t, ok)
+ require.NoError(err)
+ require.EqualValuesf(updates[len(updates)-1].value, v, "key %x latest", []byte(key))
+ require.True(ok)
}
}
func TestDomain_CanPruneAfterAggregation(t *testing.T) {
+ t.Parallel()
+
aggStep := uint64(25)
db, d := testDbAndDomainOfStep(t, aggStep, log.New())
defer db.Close()
@@ -1500,6 +1521,8 @@ func TestDomain_CanPruneAfterAggregation(t *testing.T) {
}
func TestDomain_PruneAfterAggregation(t *testing.T) {
+ t.Parallel()
+
db, d := testDbAndDomainOfStep(t, 25, log.New())
defer db.Close()
defer d.Close()
@@ -1509,8 +1532,8 @@ func TestDomain_PruneAfterAggregation(t *testing.T) {
defer tx.Rollback()
d.historyLargeValues = false
- d.History.compression = seg.CompressKeys | seg.CompressVals
- d.compression = seg.CompressKeys | seg.CompressVals
+ d.History.compression = seg.CompressNone //seg.CompressKeys | seg.CompressVals
+ d.compression = seg.CompressNone //seg.CompressKeys | seg.CompressVals
dc := d.BeginFilesRo()
defer dc.Close()
@@ -1558,7 +1581,7 @@ func TestDomain_PruneAfterAggregation(t *testing.T) {
for key, updates := range data {
kc++
for i := 1; i < len(updates); i++ {
- v, err := dc.GetAsOf([]byte(key), updates[i].txNum, tx)
+ v, _, err := dc.GetAsOf([]byte(key), updates[i].txNum, tx)
require.NoError(t, err)
require.EqualValuesf(t, updates[i-1].value, v, "(%d/%d) key %x, txn %d", kc, len(data), []byte(key), updates[i-1].txNum)
}
@@ -1573,6 +1596,8 @@ func TestDomain_PruneAfterAggregation(t *testing.T) {
}
func TestPruneProgress(t *testing.T) {
+ t.Parallel()
+
db, d := testDbAndDomainOfStep(t, 25, log.New())
defer db.Close()
defer d.Close()
@@ -1583,16 +1608,16 @@ func TestPruneProgress(t *testing.T) {
tx, err := db.BeginRw(context.Background())
require.NoError(t, err)
defer tx.Rollback()
- err = SaveExecV3PruneProgress(tx, kv.TblAccountKeys, latestKey)
+ err = SaveExecV3PruneProgress(tx, kv.TblAccountVals, latestKey)
require.NoError(t, err)
- key, err := GetExecV3PruneProgress(tx, kv.TblAccountKeys)
+ key, err := GetExecV3PruneProgress(tx, kv.TblAccountVals)
require.NoError(t, err)
require.EqualValuesf(t, latestKey, key, "key %x", key)
- err = SaveExecV3PruneProgress(tx, kv.TblAccountKeys, nil)
+ err = SaveExecV3PruneProgress(tx, kv.TblAccountVals, nil)
require.NoError(t, err)
- key, err = GetExecV3PruneProgress(tx, kv.TblAccountKeys)
+ key, err = GetExecV3PruneProgress(tx, kv.TblAccountVals)
require.NoError(t, err)
require.Nil(t, key)
})
@@ -1601,17 +1626,17 @@ func TestPruneProgress(t *testing.T) {
tx, err := db.BeginRw(context.Background())
require.NoError(t, err)
defer tx.Rollback()
- err = SaveExecV3PruneProgress(tx, kv.TblAccountKeys, latestKey)
+ err = SaveExecV3PruneProgress(tx, kv.TblAccountVals, latestKey)
require.NoError(t, err)
- key, err := GetExecV3PruneProgress(tx, kv.TblAccountKeys)
+ key, err := GetExecV3PruneProgress(tx, kv.TblAccountVals)
require.NoError(t, err)
require.EqualValues(t, latestKey, key)
- err = SaveExecV3PruneProgress(tx, kv.TblAccountKeys, nil)
+ err = SaveExecV3PruneProgress(tx, kv.TblAccountVals, nil)
require.NoError(t, err)
- key, err = GetExecV3PruneProgress(tx, kv.TblAccountKeys)
+ key, err = GetExecV3PruneProgress(tx, kv.TblAccountVals)
require.NoError(t, err)
require.Nil(t, key)
})
@@ -1621,17 +1646,17 @@ func TestPruneProgress(t *testing.T) {
require.NoError(t, err)
defer tx.Rollback()
expected := []byte{}
- err = SaveExecV3PruneProgress(tx, kv.TblAccountKeys, expected)
+ err = SaveExecV3PruneProgress(tx, kv.TblAccountVals, expected)
require.NoError(t, err)
- key, err := GetExecV3PruneProgress(tx, kv.TblAccountKeys)
+ key, err := GetExecV3PruneProgress(tx, kv.TblAccountVals)
require.NoError(t, err)
require.EqualValues(t, expected, key)
- err = SaveExecV3PruneProgress(tx, kv.TblAccountKeys, nil)
+ err = SaveExecV3PruneProgress(tx, kv.TblAccountVals, nil)
require.NoError(t, err)
- key, err = GetExecV3PruneProgress(tx, kv.TblAccountKeys)
+ key, err = GetExecV3PruneProgress(tx, kv.TblAccountVals)
require.NoError(t, err)
require.Nil(t, key)
})
@@ -1759,6 +1784,8 @@ func TestDomain_PruneProgress(t *testing.T) {
}
func TestDomain_Unwind(t *testing.T) {
+ t.Parallel()
+
db, d := testDbAndDomain(t, log.New())
defer d.Close()
defer db.Close()
@@ -2273,3 +2300,46 @@ func TestDomainContext_findShortenedKey(t *testing.T) {
ki++
}
}
+
+func TestCanBuild(t *testing.T) {
+ db, d := testDbAndDomain(t, log.New())
+ tx, err := db.BeginRw(context.Background())
+ require.NoError(t, err)
+ defer tx.Rollback()
+
+ d.historyLargeValues = true
+ dc := d.BeginFilesRo()
+ defer dc.Close()
+
+ dc.files = append(dc.files, visibleFile{startTxNum: 0, endTxNum: d.aggregationStep})
+
+ writer := dc.NewWriter()
+ defer writer.close()
+
+ k, v := []byte{1}, []byte{1}
+ // db has data which already in files
+ writer.SetTxNum(0)
+ _ = writer.PutWithPrev(k, nil, v, nil, 0)
+ _ = writer.Flush(context.Background(), tx)
+ canBuild := dc.canBuild(tx)
+ require.NoError(t, err)
+ require.False(t, canBuild)
+
+ // db has data which already in files and next step. still not enough - we need full step in db.
+ writer.SetTxNum(d.aggregationStep)
+ _ = writer.PutWithPrev(k, nil, v, nil, 0)
+ _ = writer.Flush(context.Background(), tx)
+ canBuild = dc.canBuild(tx)
+ require.NoError(t, err)
+ require.False(t, canBuild)
+ _ = writer.PutWithPrev(k, nil, v, nil, 0)
+
+ // db has: 1. data which already in files 2. full next step 3. a bit of next-next step. -> can build
+ writer.SetTxNum(d.aggregationStep * 2)
+ _ = writer.PutWithPrev(k, nil, v, nil, 0)
+ _ = writer.Flush(context.Background(), tx)
+ canBuild = dc.canBuild(tx)
+ require.NoError(t, err)
+ require.True(t, canBuild)
+ _ = writer.PutWithPrev(k, nil, hexutility.EncodeTs(d.aggregationStep*2+1), nil, 0)
+}
diff --git a/erigon-lib/state/files_item.go b/erigon-lib/state/files_item.go
index 451c54d49d4..92ad3220890 100644
--- a/erigon-lib/state/files_item.go
+++ b/erigon-lib/state/files_item.go
@@ -197,7 +197,6 @@ type visibleFile struct {
src *filesItem
}
-func (i *visibleFile) hasTS(ts uint64) bool { return i.startTxNum <= ts && i.endTxNum > ts }
func (i *visibleFile) isSubSetOf(j *visibleFile) bool { return i.src.isSubsetOf(j.src) } //nolint
func (i *visibleFile) isSubsetOf(j *visibleFile) bool { return i.src.isSubsetOf(j.src) } //nolint
diff --git a/erigon-lib/state/history_test.go b/erigon-lib/state/history_test.go
index defb1482bea..ab06cac29c5 100644
--- a/erigon-lib/state/history_test.go
+++ b/erigon-lib/state/history_test.go
@@ -88,6 +88,8 @@ func testDbAndHistory(tb testing.TB, largeValues bool, logger log.Logger) (kv.Rw
}
func TestHistoryCollationsAndBuilds(t *testing.T) {
+ t.Parallel()
+
runTest := func(t *testing.T, largeValues bool) {
t.Helper()
@@ -180,6 +182,8 @@ func TestHistoryCollationsAndBuilds(t *testing.T) {
}
func TestHistoryCollationBuild(t *testing.T) {
+ t.Parallel()
+
logger := log.New()
logEvery := time.NewTicker(30 * time.Second)
defer logEvery.Stop()
@@ -374,6 +378,8 @@ func TestHistoryAfterPrune(t *testing.T) {
}
func TestHistoryCanPrune(t *testing.T) {
+ t.Parallel()
+
logger := log.New()
logEvery := time.NewTicker(30 * time.Second)
defer logEvery.Stop()
@@ -629,6 +635,8 @@ func TestHistoryPruneCorrectnessWithFiles(t *testing.T) {
}
func TestHistoryPruneCorrectness(t *testing.T) {
+ t.Parallel()
+
values := generateTestData(t, length.Addr, length.Addr, 1000, 1000, 1)
db, h := filledHistoryValues(t, true, values, log.New())
defer db.Close()
@@ -943,6 +951,8 @@ func collateAndMergeHistory(tb testing.TB, db kv.RwDB, h *History, txs uint64, d
}
func TestHistoryMergeFiles(t *testing.T) {
+ t.Parallel()
+
logger := log.New()
test := func(t *testing.T, h *History, db kv.RwDB, txs uint64) {
t.Helper()
@@ -961,6 +971,8 @@ func TestHistoryMergeFiles(t *testing.T) {
}
func TestHistoryScanFiles(t *testing.T) {
+ t.Parallel()
+
logger := log.New()
logEvery := time.NewTicker(30 * time.Second)
defer logEvery.Stop()
@@ -990,6 +1002,8 @@ func TestHistoryScanFiles(t *testing.T) {
}
func TestIterateChanged(t *testing.T) {
+ t.Parallel()
+
logger := log.New()
logEvery := time.NewTicker(30 * time.Second)
defer logEvery.Stop()
@@ -1150,6 +1164,8 @@ func TestIterateChanged(t *testing.T) {
}
func TestIterateChanged2(t *testing.T) {
+ t.Parallel()
+
logger := log.New()
logEvery := time.NewTicker(30 * time.Second)
defer logEvery.Stop()
@@ -1370,6 +1386,8 @@ func TestIterateChanged2(t *testing.T) {
}
func TestScanStaticFilesH(t *testing.T) {
+ t.Parallel()
+
h := &History{InvertedIndex: emptyTestInvertedIndex(1),
dirtyFiles: btree2.NewBTreeG[*filesItem](filesItemLess),
}
@@ -1459,6 +1477,8 @@ func writeSomeHistory(tb testing.TB, largeValues bool, logger log.Logger) (kv.Rw
}
func Test_HistoryIterate_VariousKeysLen(t *testing.T) {
+ t.Parallel()
+
logger := log.New()
logEvery := time.NewTicker(30 * time.Second)
defer logEvery.Stop()
@@ -1510,6 +1530,8 @@ func Test_HistoryIterate_VariousKeysLen(t *testing.T) {
}
func TestHistory_OpenFolder(t *testing.T) {
+ t.Parallel()
+
logger := log.New()
db, h, txs := filledHistory(t, true, logger)
collateAndMergeHistory(t, db, h, txs, true)
diff --git a/erigon-lib/state/inverted_index.go b/erigon-lib/state/inverted_index.go
index 52b37f86162..2f3e444ba13 100644
--- a/erigon-lib/state/inverted_index.go
+++ b/erigon-lib/state/inverted_index.go
@@ -30,6 +30,7 @@ import (
"reflect"
"regexp"
"strconv"
+ "strings"
"sync"
"time"
@@ -145,6 +146,9 @@ func filesFromDir(dir string) ([]string, error) {
if f.IsDir() || !f.Type().IsRegular() {
continue
}
+ if strings.HasPrefix(f.Name(), ".") { // hidden files
+ continue
+ }
filtered = append(filtered, f.Name())
}
return filtered, nil
@@ -592,7 +596,7 @@ func (iit *InvertedIndexRoTx) seekInFiles(key []byte, txNum uint64) (found bool,
if iit.seekInFilesCache != nil {
iit.seekInFilesCache.total++
- fromCache, ok := iit.seekInFilesCache.Get(u128{hi: hi, lo: lo})
+ fromCache, ok := iit.seekInFilesCache.Get(hi)
if ok && fromCache.requested <= txNum {
if txNum <= fromCache.found {
iit.seekInFilesCache.hit++
@@ -624,14 +628,14 @@ func (iit *InvertedIndexRoTx) seekInFiles(key []byte, txNum uint64) (found bool,
if found {
if iit.seekInFilesCache != nil {
- iit.seekInFilesCache.Add(u128{hi: hi, lo: lo}, iiSeekInFilesCacheItem{requested: txNum, found: equalOrHigherTxNum})
+ iit.seekInFilesCache.Add(hi, iiSeekInFilesCacheItem{requested: txNum, found: equalOrHigherTxNum})
}
return true, equalOrHigherTxNum
}
}
if iit.seekInFilesCache != nil {
- iit.seekInFilesCache.Add(u128{hi: hi, lo: lo}, iiSeekInFilesCacheItem{requested: txNum, found: 0})
+ iit.seekInFilesCache.Add(hi, iiSeekInFilesCacheItem{requested: txNum, found: 0})
}
return false, 0
}
diff --git a/erigon-lib/state/inverted_index_test.go b/erigon-lib/state/inverted_index_test.go
index 656dfdb4366..c2e9ddcf16e 100644
--- a/erigon-lib/state/inverted_index_test.go
+++ b/erigon-lib/state/inverted_index_test.go
@@ -64,6 +64,8 @@ func testDbAndInvertedIndex(tb testing.TB, aggStep uint64, logger log.Logger) (k
}
func TestInvIndexPruningCorrectness(t *testing.T) {
+ t.Parallel()
+
db, ii, _ := filledInvIndexOfSize(t, 1000, 16, 1, log.New())
defer ii.Close()
@@ -152,6 +154,8 @@ func TestInvIndexPruningCorrectness(t *testing.T) {
}
func TestInvIndexCollationBuild(t *testing.T) {
+ t.Parallel()
+
logger := log.New()
logEvery := time.NewTicker(30 * time.Second)
defer logEvery.Stop()
@@ -228,6 +232,8 @@ func TestInvIndexCollationBuild(t *testing.T) {
}
func TestInvIndexAfterPrune(t *testing.T) {
+ t.Parallel()
+
logger := log.New()
logEvery := time.NewTicker(30 * time.Second)
defer logEvery.Stop()
@@ -500,6 +506,8 @@ func mergeInverted(tb testing.TB, db kv.RwDB, ii *InvertedIndex, txs uint64) {
}
func TestInvIndexRanges(t *testing.T) {
+ t.Parallel()
+
logger := log.New()
logEvery := time.NewTicker(30 * time.Second)
defer logEvery.Stop()
@@ -557,6 +565,8 @@ func TestInvIndexScanFiles(t *testing.T) {
}
func TestChangedKeysIterator(t *testing.T) {
+ t.Parallel()
+
logger := log.New()
db, ii, txs := filledInvIndex(t, logger)
ctx := context.Background()
@@ -619,6 +629,8 @@ func TestChangedKeysIterator(t *testing.T) {
}
func TestScanStaticFiles(t *testing.T) {
+ t.Parallel()
+
ii := emptyTestInvertedIndex(1)
files := []string{
"v1-test.0-1.ef",
@@ -685,6 +697,8 @@ func TestCtxFiles(t *testing.T) {
}
func TestIsSubset(t *testing.T) {
+ t.Parallel()
+
assert := assert.New(t)
assert.True((&filesItem{startTxNum: 0, endTxNum: 1}).isSubsetOf(&filesItem{startTxNum: 0, endTxNum: 2}))
assert.True((&filesItem{startTxNum: 1, endTxNum: 2}).isSubsetOf(&filesItem{startTxNum: 0, endTxNum: 2}))
@@ -696,6 +710,8 @@ func TestIsSubset(t *testing.T) {
}
func TestIsBefore(t *testing.T) {
+ t.Parallel()
+
assert := assert.New(t)
assert.False((&filesItem{startTxNum: 0, endTxNum: 1}).isBefore(&filesItem{startTxNum: 0, endTxNum: 2}))
assert.False((&filesItem{startTxNum: 1, endTxNum: 2}).isBefore(&filesItem{startTxNum: 0, endTxNum: 2}))
@@ -709,6 +725,8 @@ func TestIsBefore(t *testing.T) {
}
func TestInvIndex_OpenFolder(t *testing.T) {
+ t.Parallel()
+
db, ii, txs := filledInvIndex(t, log.New())
mergeInverted(t, db, ii, txs)
diff --git a/erigon-lib/state/iters.go b/erigon-lib/state/iters.go
deleted file mode 100644
index e6b65572144..00000000000
--- a/erigon-lib/state/iters.go
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright 2024 The Erigon Authors
-// This file is part of Erigon.
-//
-// Erigon is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Erigon is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with Erigon. If not, see .
-
-package state
-
-import (
- "github.com/erigontech/erigon-lib/common"
- "github.com/erigontech/erigon-lib/kv"
- "github.com/erigontech/erigon-lib/kv/order"
- "github.com/erigontech/erigon-lib/kv/stream"
-)
-
-//go:generate mockgen -typed=true -destination=./iters_mock.go -package=state . CanonicalsReader
-type CanonicalsReader interface {
- // TxnIdsOfCanonicalBlocks - for given canonical blocks range returns non-canonical txnIds (not txNums)
- // [fromTxNum, toTxNum)
- // To get all canonical blocks, use fromTxNum=0, toTxNum=-1
- // For reverse iteration use order.Desc and fromTxNum=-1, toTxNum=-1
- TxnIdsOfCanonicalBlocks(tx kv.Tx, fromTxNum, toTxNum int, asc order.By, limit int) (stream.U64, error)
- BaseTxnID(tx kv.Tx, blockNum uint64, blockHash common.Hash) (kv.TxnId, error)
- TxNum2ID(tx kv.Tx, blockNum uint64, blockHash common.Hash, txNum uint64) (kv.TxnId, error)
- LastFrozenTxNum(tx kv.Tx) (kv.TxnId, error)
-}
diff --git a/erigon-lib/state/iters_mock.go b/erigon-lib/state/iters_mock.go
deleted file mode 100644
index ee9ab6869e1..00000000000
--- a/erigon-lib/state/iters_mock.go
+++ /dev/null
@@ -1,199 +0,0 @@
-// Code generated by MockGen. DO NOT EDIT.
-// Source: github.com/erigontech/erigon-lib/state (interfaces: CanonicalsReader)
-//
-// Generated by this command:
-//
-// mockgen -typed=true -destination=./iters_mock.go -package=state . CanonicalsReader
-//
-
-// Package state is a generated GoMock package.
-package state
-
-import (
- reflect "reflect"
-
- common "github.com/erigontech/erigon-lib/common"
- kv "github.com/erigontech/erigon-lib/kv"
- order "github.com/erigontech/erigon-lib/kv/order"
- stream "github.com/erigontech/erigon-lib/kv/stream"
- gomock "go.uber.org/mock/gomock"
-)
-
-// MockCanonicalsReader is a mock of CanonicalsReader interface.
-type MockCanonicalsReader struct {
- ctrl *gomock.Controller
- recorder *MockCanonicalsReaderMockRecorder
-}
-
-// MockCanonicalsReaderMockRecorder is the mock recorder for MockCanonicalsReader.
-type MockCanonicalsReaderMockRecorder struct {
- mock *MockCanonicalsReader
-}
-
-// NewMockCanonicalsReader creates a new mock instance.
-func NewMockCanonicalsReader(ctrl *gomock.Controller) *MockCanonicalsReader {
- mock := &MockCanonicalsReader{ctrl: ctrl}
- mock.recorder = &MockCanonicalsReaderMockRecorder{mock}
- return mock
-}
-
-// EXPECT returns an object that allows the caller to indicate expected use.
-func (m *MockCanonicalsReader) EXPECT() *MockCanonicalsReaderMockRecorder {
- return m.recorder
-}
-
-// BaseTxnID mocks base method.
-func (m *MockCanonicalsReader) BaseTxnID(arg0 kv.Tx, arg1 uint64, arg2 common.Hash) (kv.TxnId, error) {
- m.ctrl.T.Helper()
- ret := m.ctrl.Call(m, "BaseTxnID", arg0, arg1, arg2)
- ret0, _ := ret[0].(kv.TxnId)
- ret1, _ := ret[1].(error)
- return ret0, ret1
-}
-
-// BaseTxnID indicates an expected call of BaseTxnID.
-func (mr *MockCanonicalsReaderMockRecorder) BaseTxnID(arg0, arg1, arg2 any) *MockCanonicalsReaderBaseTxnIDCall {
- mr.mock.ctrl.T.Helper()
- call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BaseTxnID", reflect.TypeOf((*MockCanonicalsReader)(nil).BaseTxnID), arg0, arg1, arg2)
- return &MockCanonicalsReaderBaseTxnIDCall{Call: call}
-}
-
-// MockCanonicalsReaderBaseTxnIDCall wrap *gomock.Call
-type MockCanonicalsReaderBaseTxnIDCall struct {
- *gomock.Call
-}
-
-// Return rewrite *gomock.Call.Return
-func (c *MockCanonicalsReaderBaseTxnIDCall) Return(arg0 kv.TxnId, arg1 error) *MockCanonicalsReaderBaseTxnIDCall {
- c.Call = c.Call.Return(arg0, arg1)
- return c
-}
-
-// Do rewrite *gomock.Call.Do
-func (c *MockCanonicalsReaderBaseTxnIDCall) Do(f func(kv.Tx, uint64, common.Hash) (kv.TxnId, error)) *MockCanonicalsReaderBaseTxnIDCall {
- c.Call = c.Call.Do(f)
- return c
-}
-
-// DoAndReturn rewrite *gomock.Call.DoAndReturn
-func (c *MockCanonicalsReaderBaseTxnIDCall) DoAndReturn(f func(kv.Tx, uint64, common.Hash) (kv.TxnId, error)) *MockCanonicalsReaderBaseTxnIDCall {
- c.Call = c.Call.DoAndReturn(f)
- return c
-}
-
-// LastFrozenTxNum mocks base method.
-func (m *MockCanonicalsReader) LastFrozenTxNum(arg0 kv.Tx) (kv.TxnId, error) {
- m.ctrl.T.Helper()
- ret := m.ctrl.Call(m, "LastFrozenTxNum", arg0)
- ret0, _ := ret[0].(kv.TxnId)
- ret1, _ := ret[1].(error)
- return ret0, ret1
-}
-
-// LastFrozenTxNum indicates an expected call of LastFrozenTxNum.
-func (mr *MockCanonicalsReaderMockRecorder) LastFrozenTxNum(arg0 any) *MockCanonicalsReaderLastFrozenTxNumCall {
- mr.mock.ctrl.T.Helper()
- call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LastFrozenTxNum", reflect.TypeOf((*MockCanonicalsReader)(nil).LastFrozenTxNum), arg0)
- return &MockCanonicalsReaderLastFrozenTxNumCall{Call: call}
-}
-
-// MockCanonicalsReaderLastFrozenTxNumCall wrap *gomock.Call
-type MockCanonicalsReaderLastFrozenTxNumCall struct {
- *gomock.Call
-}
-
-// Return rewrite *gomock.Call.Return
-func (c *MockCanonicalsReaderLastFrozenTxNumCall) Return(arg0 kv.TxnId, arg1 error) *MockCanonicalsReaderLastFrozenTxNumCall {
- c.Call = c.Call.Return(arg0, arg1)
- return c
-}
-
-// Do rewrite *gomock.Call.Do
-func (c *MockCanonicalsReaderLastFrozenTxNumCall) Do(f func(kv.Tx) (kv.TxnId, error)) *MockCanonicalsReaderLastFrozenTxNumCall {
- c.Call = c.Call.Do(f)
- return c
-}
-
-// DoAndReturn rewrite *gomock.Call.DoAndReturn
-func (c *MockCanonicalsReaderLastFrozenTxNumCall) DoAndReturn(f func(kv.Tx) (kv.TxnId, error)) *MockCanonicalsReaderLastFrozenTxNumCall {
- c.Call = c.Call.DoAndReturn(f)
- return c
-}
-
-// TxNum2ID mocks base method.
-func (m *MockCanonicalsReader) TxNum2ID(arg0 kv.Tx, arg1 uint64, arg2 common.Hash, arg3 uint64) (kv.TxnId, error) {
- m.ctrl.T.Helper()
- ret := m.ctrl.Call(m, "TxNum2ID", arg0, arg1, arg2, arg3)
- ret0, _ := ret[0].(kv.TxnId)
- ret1, _ := ret[1].(error)
- return ret0, ret1
-}
-
-// TxNum2ID indicates an expected call of TxNum2ID.
-func (mr *MockCanonicalsReaderMockRecorder) TxNum2ID(arg0, arg1, arg2, arg3 any) *MockCanonicalsReaderTxNum2IDCall {
- mr.mock.ctrl.T.Helper()
- call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "TxNum2ID", reflect.TypeOf((*MockCanonicalsReader)(nil).TxNum2ID), arg0, arg1, arg2, arg3)
- return &MockCanonicalsReaderTxNum2IDCall{Call: call}
-}
-
-// MockCanonicalsReaderTxNum2IDCall wrap *gomock.Call
-type MockCanonicalsReaderTxNum2IDCall struct {
- *gomock.Call
-}
-
-// Return rewrite *gomock.Call.Return
-func (c *MockCanonicalsReaderTxNum2IDCall) Return(arg0 kv.TxnId, arg1 error) *MockCanonicalsReaderTxNum2IDCall {
- c.Call = c.Call.Return(arg0, arg1)
- return c
-}
-
-// Do rewrite *gomock.Call.Do
-func (c *MockCanonicalsReaderTxNum2IDCall) Do(f func(kv.Tx, uint64, common.Hash, uint64) (kv.TxnId, error)) *MockCanonicalsReaderTxNum2IDCall {
- c.Call = c.Call.Do(f)
- return c
-}
-
-// DoAndReturn rewrite *gomock.Call.DoAndReturn
-func (c *MockCanonicalsReaderTxNum2IDCall) DoAndReturn(f func(kv.Tx, uint64, common.Hash, uint64) (kv.TxnId, error)) *MockCanonicalsReaderTxNum2IDCall {
- c.Call = c.Call.DoAndReturn(f)
- return c
-}
-
-// TxnIdsOfCanonicalBlocks mocks base method.
-func (m *MockCanonicalsReader) TxnIdsOfCanonicalBlocks(arg0 kv.Tx, arg1, arg2 int, arg3 order.By, arg4 int) (stream.U64, error) {
- m.ctrl.T.Helper()
- ret := m.ctrl.Call(m, "TxnIdsOfCanonicalBlocks", arg0, arg1, arg2, arg3, arg4)
- ret0, _ := ret[0].(stream.U64)
- ret1, _ := ret[1].(error)
- return ret0, ret1
-}
-
-// TxnIdsOfCanonicalBlocks indicates an expected call of TxnIdsOfCanonicalBlocks.
-func (mr *MockCanonicalsReaderMockRecorder) TxnIdsOfCanonicalBlocks(arg0, arg1, arg2, arg3, arg4 any) *MockCanonicalsReaderTxnIdsOfCanonicalBlocksCall {
- mr.mock.ctrl.T.Helper()
- call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "TxnIdsOfCanonicalBlocks", reflect.TypeOf((*MockCanonicalsReader)(nil).TxnIdsOfCanonicalBlocks), arg0, arg1, arg2, arg3, arg4)
- return &MockCanonicalsReaderTxnIdsOfCanonicalBlocksCall{Call: call}
-}
-
-// MockCanonicalsReaderTxnIdsOfCanonicalBlocksCall wrap *gomock.Call
-type MockCanonicalsReaderTxnIdsOfCanonicalBlocksCall struct {
- *gomock.Call
-}
-
-// Return rewrite *gomock.Call.Return
-func (c *MockCanonicalsReaderTxnIdsOfCanonicalBlocksCall) Return(arg0 stream.U64, arg1 error) *MockCanonicalsReaderTxnIdsOfCanonicalBlocksCall {
- c.Call = c.Call.Return(arg0, arg1)
- return c
-}
-
-// Do rewrite *gomock.Call.Do
-func (c *MockCanonicalsReaderTxnIdsOfCanonicalBlocksCall) Do(f func(kv.Tx, int, int, order.By, int) (stream.U64, error)) *MockCanonicalsReaderTxnIdsOfCanonicalBlocksCall {
- c.Call = c.Call.Do(f)
- return c
-}
-
-// DoAndReturn rewrite *gomock.Call.DoAndReturn
-func (c *MockCanonicalsReaderTxnIdsOfCanonicalBlocksCall) DoAndReturn(f func(kv.Tx, int, int, order.By, int) (stream.U64, error)) *MockCanonicalsReaderTxnIdsOfCanonicalBlocksCall {
- c.Call = c.Call.DoAndReturn(f)
- return c
-}
diff --git a/erigon-lib/state/merge.go b/erigon-lib/state/merge.go
index b4fa41e298d..4ade27d1407 100644
--- a/erigon-lib/state/merge.go
+++ b/erigon-lib/state/merge.go
@@ -73,16 +73,6 @@ func (h *History) dirtyFilesEndTxNumMinimax() uint64 {
}
return minimax
}
-func (a *Appendable) dirtyFilesEndTxNumMinimax() uint64 {
- var minimax uint64
- if _max, ok := a.dirtyFiles.Max(); ok {
- endTxNum := _max.endTxNum
- if minimax == 0 || endTxNum < minimax {
- minimax = endTxNum
- }
- }
- return minimax
-}
type DomainRanges struct {
name kv.Domain
@@ -107,6 +97,14 @@ func (r DomainRanges) String() string {
func (r DomainRanges) any() bool { return r.values.needMerge || r.history.any() }
+func (dt *DomainRoTx) FirstStepNotInFiles() uint64 { return dt.files.EndTxNum() / dt.d.aggregationStep }
+func (ht *HistoryRoTx) FirstStepNotInFiles() uint64 {
+ return ht.files.EndTxNum() / ht.h.aggregationStep
+}
+func (iit *InvertedIndexRoTx) FirstStepNotInFiles() uint64 {
+ return iit.files.EndTxNum() / iit.ii.aggregationStep
+}
+
// findMergeRange
// assumes that all fTypes in d.files have items at least as far as maxEndTxNum
// That is why only Values type is inspected
@@ -216,33 +214,6 @@ func (iit *InvertedIndexRoTx) findMergeRange(maxEndTxNum, maxSpan uint64) *Merge
return &MergeRange{minFound, startTxNum, endTxNum}
}
-func (tx *AppendableRoTx) findMergeRange(maxEndTxNum, maxSpan uint64) *MergeRange {
- var minFound bool
- var startTxNum, endTxNum uint64
- for _, item := range tx.files {
- if item.endTxNum > maxEndTxNum {
- continue
- }
- endStep := item.endTxNum / tx.ap.aggregationStep
- spanStep := endStep & -endStep // Extract rightmost bit in the binary representation of endStep, this corresponds to size of maximally possible merge ending at endStep
- span := min(spanStep*tx.ap.aggregationStep, maxSpan)
- start := item.endTxNum - span
- foundSuperSet := startTxNum == item.startTxNum && item.endTxNum >= endTxNum
- if foundSuperSet {
- minFound = false
- startTxNum = start
- endTxNum = item.endTxNum
- } else if start < item.startTxNum {
- if !minFound || start < startTxNum {
- minFound = true
- startTxNum = start
- endTxNum = item.endTxNum
- }
- }
- }
- return &MergeRange{minFound, startTxNum, endTxNum}
-}
-
type HistoryRanges struct {
history MergeRange
index MergeRange
@@ -326,27 +297,6 @@ func (iit *InvertedIndexRoTx) staticFilesInRange(startTxNum, endTxNum uint64) []
return files
}
-func (tx *AppendableRoTx) staticFilesInRange(startTxNum, endTxNum uint64) []*filesItem {
- files := make([]*filesItem, 0, len(tx.files))
-
- for _, item := range tx.files {
- if item.startTxNum < startTxNum {
- continue
- }
- if item.endTxNum > endTxNum {
- break
- }
- files = append(files, item.src)
- }
- for _, f := range files {
- if f == nil {
- panic("must not happen")
- }
- }
-
- return files
-}
-
func (ht *HistoryRoTx) staticFilesInRange(r HistoryRanges) (indexFiles, historyFiles []*filesItem, err error) {
if !r.history.needMerge && r.index.needMerge {
indexFiles = ht.iit.staticFilesInRange(r.index.from, r.index.to)
@@ -988,75 +938,6 @@ func (d *Domain) integrateMergedDirtyFiles(valuesOuts, indexOuts, historyOuts []
}
}
-func (tx *AppendableRoTx) mergeFiles(ctx context.Context, files []*filesItem, startTxNum, endTxNum uint64, ps *background.ProgressSet) (*filesItem, error) {
- for _, h := range files {
- defer h.decompressor.EnableReadAhead().DisableReadAhead()
- }
-
- var outItem *filesItem
- var comp *seg.Compressor
- var err error
- var closeItem = true
- defer func() {
- if closeItem {
- if comp != nil {
- comp.Close()
- }
- if outItem != nil {
- outItem.closeFilesAndRemove()
- }
- }
- }()
- if ctx.Err() != nil {
- return nil, ctx.Err()
- }
- fromStep, toStep := startTxNum/tx.ap.aggregationStep, endTxNum/tx.ap.aggregationStep
-
- datPath := tx.ap.apFilePath(fromStep, toStep)
- if comp, err = seg.NewCompressor(ctx, "merge fk "+tx.ap.filenameBase, datPath, tx.ap.cfg.Dirs.Tmp, tx.ap.compressCfg, log.LvlTrace, tx.ap.logger); err != nil {
- return nil, fmt.Errorf("merge %s inverted index compressor: %w", tx.ap.filenameBase, err)
- }
- defer comp.Close()
- if tx.ap.noFsync {
- comp.DisableFsync()
- }
- write := seg.NewWriter(comp, tx.ap.compression)
- defer write.Close()
- p := ps.AddNew(path.Base(datPath), 1)
- defer ps.Delete(p)
-
- var word = make([]byte, 0, 4096)
-
- for _, item := range files {
- g := seg.NewReader(item.decompressor.MakeGetter(), tx.ap.compression)
- g.Reset(0)
- for g.HasNext() {
- word, _ = g.Next(word[:0])
- if err := write.AddWord(word); err != nil {
- return nil, err
- }
- }
- }
- if err = write.Compress(); err != nil {
- return nil, err
- }
-
- outItem = newFilesItem(startTxNum, endTxNum, tx.ap.aggregationStep)
- if outItem.decompressor, err = seg.NewDecompressor(datPath); err != nil {
- return nil, fmt.Errorf("merge %s decompressor [%d-%d]: %w", tx.ap.filenameBase, startTxNum, endTxNum, err)
- }
- ps.Delete(p)
-
- if err := tx.ap.buildAccessor(ctx, fromStep, toStep, outItem.decompressor, ps); err != nil {
- return nil, fmt.Errorf("merge %s buildIndex [%d-%d]: %w", tx.ap.filenameBase, startTxNum, endTxNum, err)
- }
- if outItem.index, err = recsplit.OpenIndex(tx.ap.accessorFilePath(fromStep, toStep)); err != nil {
- return nil, err
- }
-
- closeItem = false
- return outItem, nil
-}
func (ii *InvertedIndex) integrateMergedDirtyFiles(outs []*filesItem, in *filesItem) {
if in != nil {
ii.dirtyFiles.Set(in)
@@ -1077,26 +958,6 @@ func (ii *InvertedIndex) integrateMergedDirtyFiles(outs []*filesItem, in *filesI
}
deleteMergeFile(ii.dirtyFiles, outs, ii.filenameBase, ii.logger)
}
-func (ap *Appendable) integrateMergedDirtyFiles(outs []*filesItem, in *filesItem) {
- if in != nil {
- ap.dirtyFiles.Set(in)
-
- // `kill -9` may leave some garbage
- // but it still may be useful for merges, until we finish merge frozen file
- if in.frozen {
- ap.dirtyFiles.Walk(func(items []*filesItem) bool {
- for _, item := range items {
- if item.frozen || item.endTxNum > in.endTxNum {
- continue
- }
- outs = append(outs, item)
- }
- return true
- })
- }
- }
- deleteMergeFile(ap.dirtyFiles, outs, ap.filenameBase, ap.logger)
-}
func (h *History) integrateMergedDirtyFiles(indexOuts, historyOuts []*filesItem, indexIn, historyIn *filesItem) {
h.InvertedIndex.integrateMergedDirtyFiles(indexOuts, indexIn)
@@ -1157,17 +1018,6 @@ func (iit *InvertedIndexRoTx) cleanAfterMerge(merged *filesItem) {
deleteMergeFile(iit.ii.dirtyFiles, outs, iit.ii.filenameBase, iit.ii.logger)
}
-func (tx *AppendableRoTx) cleanAfterMerge(merged *filesItem) {
- if merged == nil {
- return
- }
- if merged.endTxNum == 0 {
- return
- }
- outs := garbage(tx.ap.dirtyFiles, tx.files, merged)
- deleteMergeFile(tx.ap.dirtyFiles, outs, tx.ap.filenameBase, tx.ap.logger)
-}
-
// garbage - returns list of garbage files after merge step is done. at startup pass here last frozen file
func (dt *DomainRoTx) garbage(merged *filesItem) (outs []*filesItem) {
if merged == nil {
@@ -1237,3 +1087,6 @@ func hasCoverVisibleFile(visibleFiles []visibleFile, item *filesItem) bool {
}
return false
}
+
+func (ac *AggregatorRoTx) DbgDomain(idx kv.Domain) *DomainRoTx { return ac.d[idx] }
+func (ac *AggregatorRoTx) DbgII(idx kv.InvertedIdxPos) *InvertedIndexRoTx { return ac.iis[idx] }
diff --git a/erigon-lib/state/merge_test.go b/erigon-lib/state/merge_test.go
index d72b3ffd68f..10f35127939 100644
--- a/erigon-lib/state/merge_test.go
+++ b/erigon-lib/state/merge_test.go
@@ -39,6 +39,8 @@ func emptyTestInvertedIndex(aggStep uint64) *InvertedIndex {
filenameBase: "test", aggregationStep: aggStep, dirtyFiles: btree2.NewBTreeG[*filesItem](filesItemLess)}
}
func TestFindMergeRangeCornerCases(t *testing.T) {
+ t.Parallel()
+
t.Run("ii: > 2 unmerged files", func(t *testing.T) {
ii := emptyTestInvertedIndex(1)
ii.scanDirtyFiles([]string{
@@ -494,6 +496,8 @@ func Test_mergeEliasFano(t *testing.T) {
}
func TestMergeFiles(t *testing.T) {
+ t.Parallel()
+
db, d := testDbAndDomain(t, log.New())
defer db.Close()
defer d.Close()
diff --git a/erigon-lib/state/metrics.go b/erigon-lib/state/metrics.go
index 91e1869a106..918ae91f630 100644
--- a/erigon-lib/state/metrics.go
+++ b/erigon-lib/state/metrics.go
@@ -95,5 +95,13 @@ var (
metrics.GetOrCreateSummary(`kv_get{level="L4",domain="commitment"}`),
metrics.GetOrCreateSummary(`kv_get{level="recent",domain="commitment"}`),
},
+ kv.ReceiptDomain: {
+ metrics.GetOrCreateSummary(`kv_get{level="L0",domain="receipt"}`),
+ metrics.GetOrCreateSummary(`kv_get{level="L1",domain="receipt"}`),
+ metrics.GetOrCreateSummary(`kv_get{level="L2",domain="receipt"}`),
+ metrics.GetOrCreateSummary(`kv_get{level="L3",domain="receipt"}`),
+ metrics.GetOrCreateSummary(`kv_get{level="L4",domain="receipt"}`),
+ metrics.GetOrCreateSummary(`kv_get{level="recent",domain="receipt"}`),
+ },
}
)
diff --git a/erigon-lib/state/sqeeze.go b/erigon-lib/state/sqeeze.go
new file mode 100644
index 00000000000..a3067277c63
--- /dev/null
+++ b/erigon-lib/state/sqeeze.go
@@ -0,0 +1,319 @@
+package state
+
+import (
+ "bytes"
+ "context"
+ "errors"
+ "fmt"
+ "os"
+ "path/filepath"
+ "strings"
+ "time"
+
+ "github.com/c2h5oh/datasize"
+ "github.com/erigontech/erigon-lib/common/datadir"
+ "github.com/erigontech/erigon-lib/common/dir"
+ "github.com/erigontech/erigon-lib/kv"
+ "github.com/erigontech/erigon-lib/log/v3"
+ "github.com/erigontech/erigon-lib/seg"
+)
+
+//Sqeeze: ForeignKeys-aware compression of file
+
+// Sqeeze - re-compress file
+// TODO: care of ForeignKeys
+func (a *Aggregator) Sqeeze(ctx context.Context, domain kv.Domain) error {
+ for _, to := range domainFiles(a.dirs, domain) {
+ _, fileName := filepath.Split(to)
+ fromStep, toStep, err := ParseStepsFromFileName(fileName)
+ if err != nil {
+ return err
+ }
+ if toStep-fromStep < DomainMinStepsToCompress {
+ continue
+ }
+
+ tempFileCopy := filepath.Join(a.dirs.Tmp, fileName)
+ if err := datadir.CopyFile(to, tempFileCopy); err != nil {
+ return err
+ }
+
+ if err := a.sqeezeDomainFile(ctx, domain, tempFileCopy, to); err != nil {
+ return err
+ }
+ _ = os.Remove(tempFileCopy)
+ _ = os.Remove(strings.ReplaceAll(to, ".kv", ".bt"))
+ _ = os.Remove(strings.ReplaceAll(to, ".kv", ".bt.torrent"))
+ _ = os.Remove(strings.ReplaceAll(to, ".kv", ".kvei"))
+ _ = os.Remove(strings.ReplaceAll(to, ".kv", ".kvei.torrent"))
+ _ = os.Remove(strings.ReplaceAll(to, ".kv", ".kv.torrent"))
+ }
+ return nil
+}
+
+func (a *Aggregator) sqeezeDomainFile(ctx context.Context, domain kv.Domain, from, to string) error {
+ if domain == kv.CommitmentDomain {
+ panic("please use SqueezeCommitmentFiles func")
+ }
+
+ compression := a.d[domain].compression
+ compressCfg := a.d[domain].compressCfg
+
+ a.logger.Info("[sqeeze] file", "f", to, "cfg", compressCfg, "c", compression)
+ decompressor, err := seg.NewDecompressor(from)
+ if err != nil {
+ return err
+ }
+ defer decompressor.Close()
+ defer decompressor.EnableReadAhead().DisableReadAhead()
+ r := seg.NewReader(decompressor.MakeGetter(), seg.DetectCompressType(decompressor.MakeGetter()))
+
+ c, err := seg.NewCompressor(ctx, "sqeeze", to, a.dirs.Tmp, compressCfg, log.LvlInfo, a.logger)
+ if err != nil {
+ return err
+ }
+ defer c.Close()
+ w := seg.NewWriter(c, compression)
+ if err := w.ReadFrom(r); err != nil {
+ return err
+ }
+ if err := c.Compress(); err != nil {
+ return err
+ }
+
+ return nil
+}
+
+// SqueezeCommitmentFiles should be called only when NO EXECUTION is running.
+// Removes commitment files and suppose following aggregator shutdown and restart (to integrate new files and rebuild indexes)
+func (ac *AggregatorRoTx) SqueezeCommitmentFiles(mergedAgg *AggregatorRoTx) error {
+ if !ac.a.commitmentValuesTransform {
+ return nil
+ }
+
+ commitment := ac.d[kv.CommitmentDomain]
+ accounts := ac.d[kv.AccountsDomain]
+ storage := ac.d[kv.StorageDomain]
+
+ // oh, again accessing domain.files directly, again and again..
+ mergedAccountFiles := mergedAgg.d[kv.AccountsDomain].d.dirtyFiles.Items()
+ mergedStorageFiles := mergedAgg.d[kv.StorageDomain].d.dirtyFiles.Items()
+ mergedCommitFiles := mergedAgg.d[kv.CommitmentDomain].d.dirtyFiles.Items()
+
+ for _, f := range accounts.files {
+ f.src.decompressor.EnableMadvNormal()
+ }
+ for _, f := range mergedAccountFiles {
+ f.decompressor.EnableMadvNormal()
+ }
+ for _, f := range storage.files {
+ f.src.decompressor.EnableMadvNormal()
+ }
+ for _, f := range mergedStorageFiles {
+ f.decompressor.EnableMadvNormal()
+ }
+ for _, f := range commitment.files {
+ f.src.decompressor.EnableMadvNormal()
+ }
+ for _, f := range mergedCommitFiles {
+ f.decompressor.EnableMadvNormal()
+ }
+ defer func() {
+ for _, f := range accounts.files {
+ f.src.decompressor.DisableReadAhead()
+ }
+ for _, f := range mergedAccountFiles {
+ f.decompressor.DisableReadAhead()
+ }
+ for _, f := range storage.files {
+ f.src.decompressor.DisableReadAhead()
+ }
+ for _, f := range mergedStorageFiles {
+ f.decompressor.DisableReadAhead()
+ }
+ for _, f := range commitment.files {
+ f.src.decompressor.DisableReadAhead()
+ }
+ for _, f := range mergedCommitFiles {
+ f.decompressor.DisableReadAhead()
+ }
+ }()
+
+ log.Info("[sqeeze_migration] see target files", "acc", len(mergedAccountFiles), "st", len(mergedStorageFiles), "com", len(mergedCommitFiles))
+
+ getSizeDelta := func(a, b string) (datasize.ByteSize, float32, error) {
+ ai, err := os.Stat(a)
+ if err != nil {
+ return 0, 0, err
+ }
+ bi, err := os.Stat(b)
+ if err != nil {
+ return 0, 0, err
+ }
+ return datasize.ByteSize(ai.Size()) - datasize.ByteSize(bi.Size()), 100.0 * (float32(ai.Size()-bi.Size()) / float32(ai.Size())), nil
+ }
+
+ var (
+ obsoleteFiles []string
+ temporalFiles []string
+ processedFiles int
+ ai, si int
+ sizeDelta = datasize.B
+ sqExt = ".squeezed"
+ )
+ logEvery := time.NewTicker(30 * time.Second)
+ defer logEvery.Stop()
+
+ for ci := 0; ci < len(mergedCommitFiles); ci++ {
+ cf := mergedCommitFiles[ci]
+ for ai = 0; ai < len(mergedAccountFiles); ai++ {
+ if mergedAccountFiles[ai].startTxNum == cf.startTxNum && mergedAccountFiles[ai].endTxNum == cf.endTxNum {
+ break
+ }
+ }
+ for si = 0; si < len(mergedStorageFiles); si++ {
+ if mergedStorageFiles[si].startTxNum == cf.startTxNum && mergedStorageFiles[si].endTxNum == cf.endTxNum {
+ break
+ }
+ }
+ if ai == len(mergedAccountFiles) || si == len(mergedStorageFiles) {
+ ac.a.logger.Info("[sqeeze_migration] commitment file has no corresponding account or storage file", "commitment", cf.decompressor.FileName())
+ continue
+ }
+
+ err := func() error {
+ af, sf := mergedAccountFiles[ai], mergedStorageFiles[si]
+
+ steps := cf.endTxNum/ac.a.aggregationStep - cf.startTxNum/ac.a.aggregationStep
+ compression := commitment.d.compression
+ if steps < DomainMinStepsToCompress {
+ compression = seg.CompressNone
+ }
+ ac.a.logger.Info("[sqeeze_migration] file start", "original", cf.decompressor.FileName(),
+ "progress", fmt.Sprintf("%d/%d", ci+1, len(mergedAccountFiles)), "compress_cfg", commitment.d.compressCfg, "compress", compression)
+
+ originalPath := cf.decompressor.FilePath()
+ squeezedTmpPath := originalPath + sqExt + ".tmp"
+
+ squeezedCompr, err := seg.NewCompressor(context.Background(), "squeeze", squeezedTmpPath, ac.a.dirs.Tmp,
+ commitment.d.compressCfg, log.LvlInfo, commitment.d.logger)
+ if err != nil {
+ return err
+ }
+ defer squeezedCompr.Close()
+
+ reader := seg.NewReader(cf.decompressor.MakeGetter(), compression)
+ reader.Reset(0)
+
+ writer := seg.NewWriter(squeezedCompr, commitment.d.compression)
+ rng := MergeRange{needMerge: true, from: af.startTxNum, to: af.endTxNum}
+ vt, err := commitment.commitmentValTransformDomain(rng, accounts, storage, af, sf)
+ if err != nil {
+ return fmt.Errorf("failed to create commitment value transformer: %w", err)
+ }
+
+ i := 0
+ var k, v []byte
+ for reader.HasNext() {
+ k, _ = reader.Next(k[:0])
+ v, _ = reader.Next(v[:0])
+ i += 2
+
+ if k == nil {
+ // nil keys are not supported for domains
+ continue
+ }
+
+ if !bytes.Equal(k, keyCommitmentState) {
+ v, err = vt(v, af.startTxNum, af.endTxNum)
+ if err != nil {
+ return fmt.Errorf("failed to transform commitment value: %w", err)
+ }
+ }
+ if err = writer.AddWord(k); err != nil {
+ return fmt.Errorf("write key word: %w", err)
+ }
+ if err = writer.AddWord(v); err != nil {
+ return fmt.Errorf("write value word: %w", err)
+ }
+
+ select {
+ case <-logEvery.C:
+ ac.a.logger.Info("[sqeeze_migration]", "file", cf.decompressor.FileName(), "k", fmt.Sprintf("%x", k),
+ "progress", fmt.Sprintf("%d/%d", i, cf.decompressor.Count()))
+ default:
+ }
+ }
+
+ if err = writer.Compress(); err != nil {
+ return err
+ }
+ writer.Close()
+
+ squeezedPath := originalPath + sqExt
+ if err = os.Rename(squeezedTmpPath, squeezedPath); err != nil {
+ return err
+ }
+ temporalFiles = append(temporalFiles, squeezedPath)
+
+ delta, deltaP, err := getSizeDelta(originalPath, squeezedPath)
+ if err != nil {
+ return err
+ }
+ sizeDelta += delta
+
+ ac.a.logger.Info("[sqeeze_migration] file done", "original", filepath.Base(originalPath),
+ "sizeDelta", fmt.Sprintf("%s (%.1f%%)", delta.HR(), deltaP))
+
+ fromStep, toStep := af.startTxNum/ac.a.StepSize(), af.endTxNum/ac.a.StepSize()
+
+ // need to remove all indexes for commitment file as well
+ obsoleteFiles = append(obsoleteFiles,
+ originalPath,
+ commitment.d.kvBtFilePath(fromStep, toStep),
+ commitment.d.kvAccessorFilePath(fromStep, toStep),
+ commitment.d.kvExistenceIdxFilePath(fromStep, toStep),
+ )
+ processedFiles++
+ return nil
+ }()
+ if err != nil {
+ return fmt.Errorf("failed to squeeze commitment file %q: %w", cf.decompressor.FileName(), err)
+ }
+ }
+
+ ac.a.logger.Info("[sqeeze_migration] squeezed files has been produced, removing obsolete files",
+ "toRemove", len(obsoleteFiles), "processed", fmt.Sprintf("%d/%d", processedFiles, len(mergedCommitFiles)))
+ for _, path := range obsoleteFiles {
+ if err := os.Remove(path); err != nil && !errors.Is(err, os.ErrNotExist) {
+ return err
+ }
+ ac.a.logger.Debug("[sqeeze_migration] obsolete file removal", "path", path)
+ }
+ ac.a.logger.Info("[sqeeze_migration] indices removed, renaming temporal files ")
+
+ for _, path := range temporalFiles {
+ if err := os.Rename(path, strings.TrimSuffix(path, sqExt)); err != nil {
+ return err
+ }
+ ac.a.logger.Debug("[sqeeze_migration] temporal file renaming", "path", path)
+ }
+ ac.a.logger.Info("[sqeeze_migration] done", "sizeDelta", sizeDelta.HR(), "files", len(mergedAccountFiles))
+
+ return nil
+}
+
+func domainFiles(dirs datadir.Dirs, domain kv.Domain) []string {
+ files, err := dir.ListFiles(dirs.SnapDomain, ".kv")
+ if err != nil {
+ panic(err)
+ }
+ res := make([]string, 0, len(files))
+ for _, f := range files {
+ if !strings.Contains(f, domain.String()) {
+ continue
+ }
+ res = append(res, f)
+ }
+ return res
+}
diff --git a/erigon-lib/state/state_changeset_test.go b/erigon-lib/state/state_changeset_test.go
index 8f8d7c02e51..4ebba5bd330 100644
--- a/erigon-lib/state/state_changeset_test.go
+++ b/erigon-lib/state/state_changeset_test.go
@@ -24,6 +24,8 @@ import (
)
func TestSerializeDeserializeDiff(t *testing.T) {
+ t.Parallel()
+
var d []DomainEntryDiff
step1, step2, step3 := [8]byte{1}, [8]byte{2}, [8]byte{3}
d = append(d, DomainEntryDiff{Key: []byte("key188888888"), Value: []byte("value1"), PrevStepBytes: step1[:]})
@@ -39,6 +41,8 @@ func TestSerializeDeserializeDiff(t *testing.T) {
}
func TestMergeDiffSet(t *testing.T) {
+ t.Parallel()
+
var d1 []DomainEntryDiff
step1, step2, step3 := [8]byte{1}, [8]byte{2}, [8]byte{3}
d1 = append(d1, DomainEntryDiff{Key: []byte("key188888888"), Value: []byte("value1"), PrevStepBytes: step1[:]})
diff --git a/erigon-lib/state/state_util.go b/erigon-lib/state/state_util.go
index 475c4b17d57..67a6266bbdc 100644
--- a/erigon-lib/state/state_util.go
+++ b/erigon-lib/state/state_util.go
@@ -17,62 +17,11 @@
package state
import (
- "context"
"encoding/binary"
- "fmt"
"github.com/erigontech/erigon-lib/kv"
- "github.com/erigontech/erigon-lib/log/v3"
- "github.com/erigontech/erigon-lib/recsplit"
- "github.com/erigontech/erigon-lib/seg"
)
-func buildSimpleMapAccessor(ctx context.Context, d *seg.Decompressor, compression seg.FileCompression, cfg recsplit.RecSplitArgs, logger log.Logger, walker func(idx *recsplit.RecSplit, i, offset uint64, word []byte) error) error {
- count := d.Count()
-
- defer d.EnableReadAhead().DisableReadAhead()
-
- var rs *recsplit.RecSplit
- var err error
- cfg.KeyCount = count
- if rs, err = recsplit.NewRecSplit(cfg, logger); err != nil {
- return fmt.Errorf("create recsplit: %w", err)
- }
- defer rs.Close()
- rs.LogLvl(log.LvlTrace)
-
- for {
- g := seg.NewReader(d.MakeGetter(), compression)
- var i, offset, nextPos uint64
- word := make([]byte, 0, 256)
- for g.HasNext() {
- word, nextPos = g.Next(word[:0])
- if err := walker(rs, i, offset, word); err != nil {
- return err
- }
- i++
- offset = nextPos
-
- select {
- case <-ctx.Done():
- return ctx.Err()
- default:
- }
- }
- if err = rs.Build(ctx); err != nil {
- if rs.Collision() {
- logger.Info("Building recsplit. Collision happened. It's ok. Restarting...")
- rs.ResetNextSalt()
- } else {
- return fmt.Errorf("build idx: %w", err)
- }
- } else {
- break
- }
- }
- return nil
-}
-
// SaveExecV3PruneProgress saves latest pruned key in given table to the database.
// nil key also allowed and means that latest pruning run has been finished.
func SaveExecV3PruneProgress(db kv.Putter, prunedTblName string, prunedKey []byte) error {
diff --git a/erigon-lib/txpool/pool.go b/erigon-lib/txpool/pool.go
index 552ca73f195..2f3456ca98e 100644
--- a/erigon-lib/txpool/pool.go
+++ b/erigon-lib/txpool/pool.go
@@ -47,6 +47,7 @@ import (
"github.com/erigontech/erigon-lib/common/fixedgas"
"github.com/erigontech/erigon-lib/common/hexutility"
"github.com/erigontech/erigon-lib/common/u256"
+ "github.com/erigontech/erigon-lib/crypto"
libkzg "github.com/erigontech/erigon-lib/crypto/kzg"
"github.com/erigontech/erigon-lib/gointerfaces"
"github.com/erigontech/erigon-lib/gointerfaces/grpcutil"
@@ -772,7 +773,8 @@ func (p *TxPool) best(n uint16, txs *types.TxsRlp, tx kv.Tx, onTopOf, availableG
// make sure we have enough gas in the caller to add this transaction.
// not an exact science using intrinsic gas but as close as we could hope for at
// this stage
- intrinsicGas, _ := txpoolcfg.CalcIntrinsicGas(uint64(mt.Tx.DataLen), uint64(mt.Tx.DataNonZeroLen), uint64(mt.Tx.AuthorizationLen), nil, mt.Tx.Creation, true, true, isShanghai)
+ authorizationLen := uint64(len(mt.Tx.Authorizations))
+ intrinsicGas, _ := txpoolcfg.CalcIntrinsicGas(uint64(mt.Tx.DataLen), uint64(mt.Tx.DataNonZeroLen), authorizationLen, nil, mt.Tx.Creation, true, true, isShanghai)
if intrinsicGas > availableGas {
// we might find another txn with a low enough intrinsic gas to include so carry on
continue
@@ -852,7 +854,7 @@ func (p *TxPool) validateTx(txn *types.TxSlot, isLocal bool, stateCache kvcache.
return txpoolcfg.TypeNotActivated
}
if txn.Creation {
- return txpoolcfg.CreateBlobTxn
+ return txpoolcfg.InvalidCreateTxn
}
blobCount := uint64(len(txn.BlobHashes))
if blobCount == 0 {
@@ -896,10 +898,22 @@ func (p *TxPool) validateTx(txn *types.TxSlot, isLocal bool, stateCache kvcache.
}
}
+ authorizationLen := len(txn.Authorizations)
if txn.Type == types.SetCodeTxType {
if !p.isPrague() {
return txpoolcfg.TypeNotActivated
}
+ if txn.Creation {
+ return txpoolcfg.InvalidCreateTxn
+ }
+ if authorizationLen == 0 {
+ return txpoolcfg.NoAuthorizations
+ }
+ for i := 0; i < authorizationLen; i++ {
+ if txn.Authorizations[i].S.Gt(crypto.Secp256k1halfN) {
+ return txpoolcfg.InvalidAuthorization
+ }
+ }
}
// Drop non-local transactions under our own minimal accepted gas price or tip
@@ -909,7 +923,7 @@ func (p *TxPool) validateTx(txn *types.TxSlot, isLocal bool, stateCache kvcache.
}
return txpoolcfg.UnderPriced
}
- gas, reason := txpoolcfg.CalcIntrinsicGas(uint64(txn.DataLen), uint64(txn.DataNonZeroLen), uint64(txn.AuthorizationLen), nil, txn.Creation, true, true, isShanghai)
+ gas, reason := txpoolcfg.CalcIntrinsicGas(uint64(txn.DataLen), uint64(txn.DataNonZeroLen), uint64(authorizationLen), nil, txn.Creation, true, true, isShanghai)
if txn.Traced {
p.logger.Info(fmt.Sprintf("TX TRACING: validateTx intrinsic gas idHash=%x gas=%d", txn.IDHash, gas))
}
diff --git a/erigon-lib/txpool/txpool_grpc_server.go b/erigon-lib/txpool/txpool_grpc_server.go
index 85f90ef0d43..64e4874f43f 100644
--- a/erigon-lib/txpool/txpool_grpc_server.go
+++ b/erigon-lib/txpool/txpool_grpc_server.go
@@ -240,8 +240,11 @@ func mapDiscardReasonToProto(reason txpoolcfg.DiscardReason) txpool_proto.Import
return txpool_proto.ImportResult_ALREADY_EXISTS
case txpoolcfg.UnderPriced, txpoolcfg.ReplaceUnderpriced, txpoolcfg.FeeTooLow:
return txpool_proto.ImportResult_FEE_TOO_LOW
- case txpoolcfg.InvalidSender, txpoolcfg.NegativeValue, txpoolcfg.OversizedData, txpoolcfg.InitCodeTooLarge, txpoolcfg.RLPTooLong, txpoolcfg.CreateBlobTxn, txpoolcfg.NoBlobs, txpoolcfg.TooManyBlobs, txpoolcfg.TypeNotActivated, txpoolcfg.UnequalBlobTxExt, txpoolcfg.BlobHashCheckFail, txpoolcfg.UnmatchedBlobTxExt:
- // TODO(eip-4844) TypeNotActivated may be transient (e.g. a blob transaction is submitted 1 sec prior to Cancun activation)
+ case txpoolcfg.InvalidSender, txpoolcfg.NegativeValue, txpoolcfg.OversizedData, txpoolcfg.InitCodeTooLarge,
+ txpoolcfg.RLPTooLong, txpoolcfg.InvalidCreateTxn, txpoolcfg.NoBlobs, txpoolcfg.TooManyBlobs,
+ txpoolcfg.TypeNotActivated, txpoolcfg.UnequalBlobTxExt, txpoolcfg.BlobHashCheckFail,
+ txpoolcfg.UnmatchedBlobTxExt, txpoolcfg.NoAuthorizations, txpoolcfg.InvalidAuthorization:
+ // TODO(EIP-7702) TypeNotActivated may be transient (e.g. a set code transaction is submitted 1 sec prior to the Pectra activation)
return txpool_proto.ImportResult_INVALID
default:
return txpool_proto.ImportResult_INTERNAL_ERROR
diff --git a/erigon-lib/txpool/txpoolcfg/txpoolcfg.go b/erigon-lib/txpool/txpoolcfg/txpoolcfg.go
index abab6a87177..a0ee1d67c86 100644
--- a/erigon-lib/txpool/txpoolcfg/txpoolcfg.go
+++ b/erigon-lib/txpool/txpoolcfg/txpoolcfg.go
@@ -86,39 +86,40 @@ var DefaultConfig = Config{
type DiscardReason uint8
const (
- NotSet DiscardReason = 0 // analog of "nil-value", means it will be set in future
- Success DiscardReason = 1
- AlreadyKnown DiscardReason = 2
- Mined DiscardReason = 3
- ReplacedByHigherTip DiscardReason = 4
- UnderPriced DiscardReason = 5
- ReplaceUnderpriced DiscardReason = 6 // if a transaction is attempted to be replaced with a different one without the required price bump.
- FeeTooLow DiscardReason = 7
- OversizedData DiscardReason = 8
- InvalidSender DiscardReason = 9
- NegativeValue DiscardReason = 10 // ensure no one is able to specify a transaction with a negative value.
- Spammer DiscardReason = 11
- PendingPoolOverflow DiscardReason = 12
- BaseFeePoolOverflow DiscardReason = 13
- QueuedPoolOverflow DiscardReason = 14
- GasUintOverflow DiscardReason = 15
- IntrinsicGas DiscardReason = 16
- RLPTooLong DiscardReason = 17
- NonceTooLow DiscardReason = 18
- InsufficientFunds DiscardReason = 19
- NotReplaced DiscardReason = 20 // There was an existing transaction with the same sender and nonce, not enough price bump to replace
- DuplicateHash DiscardReason = 21 // There was an existing transaction with the same hash
- InitCodeTooLarge DiscardReason = 22 // EIP-3860 - transaction init code is too large
- TypeNotActivated DiscardReason = 23 // For example, an EIP-4844 transaction is submitted before Cancun activation
- CreateBlobTxn DiscardReason = 24 // Blob transactions cannot have the form of a create transaction
- NoBlobs DiscardReason = 25 // Blob transactions must have at least one blob
- TooManyBlobs DiscardReason = 26 // There's a limit on how many blobs a block (and thus any transaction) may have
- UnequalBlobTxExt DiscardReason = 27 // blob_versioned_hashes, blobs, commitments and proofs must have equal number
- BlobHashCheckFail DiscardReason = 28 // KZGcommitment's versioned hash has to be equal to blob_versioned_hash at the same index
- UnmatchedBlobTxExt DiscardReason = 29 // KZGcommitments must match the corresponding blobs and proofs
- BlobTxReplace DiscardReason = 30 // Cannot replace type-3 blob txn with another type of txn
- BlobPoolOverflow DiscardReason = 31 // The total number of blobs (through blob txs) in the pool has reached its limit
-
+ NotSet DiscardReason = 0 // analog of "nil-value", means it will be set in future
+ Success DiscardReason = 1
+ AlreadyKnown DiscardReason = 2
+ Mined DiscardReason = 3
+ ReplacedByHigherTip DiscardReason = 4
+ UnderPriced DiscardReason = 5
+ ReplaceUnderpriced DiscardReason = 6 // if a transaction is attempted to be replaced with a different one without the required price bump.
+ FeeTooLow DiscardReason = 7
+ OversizedData DiscardReason = 8
+ InvalidSender DiscardReason = 9
+ NegativeValue DiscardReason = 10 // ensure no one is able to specify a transaction with a negative value.
+ Spammer DiscardReason = 11
+ PendingPoolOverflow DiscardReason = 12
+ BaseFeePoolOverflow DiscardReason = 13
+ QueuedPoolOverflow DiscardReason = 14
+ GasUintOverflow DiscardReason = 15
+ IntrinsicGas DiscardReason = 16
+ RLPTooLong DiscardReason = 17
+ NonceTooLow DiscardReason = 18
+ InsufficientFunds DiscardReason = 19
+ NotReplaced DiscardReason = 20 // There was an existing transaction with the same sender and nonce, not enough price bump to replace
+ DuplicateHash DiscardReason = 21 // There was an existing transaction with the same hash
+ InitCodeTooLarge DiscardReason = 22 // EIP-3860 - transaction init code is too large
+ TypeNotActivated DiscardReason = 23 // For example, an EIP-4844 transaction is submitted before Cancun activation
+ InvalidCreateTxn DiscardReason = 24 // EIP-4844 & 7702 transactions cannot have the form of a create transaction
+ NoBlobs DiscardReason = 25 // Blob transactions must have at least one blob
+ TooManyBlobs DiscardReason = 26 // There's a limit on how many blobs a block (and thus any transaction) may have
+ UnequalBlobTxExt DiscardReason = 27 // blob_versioned_hashes, blobs, commitments and proofs must have equal number
+ BlobHashCheckFail DiscardReason = 28 // KZGcommitment's versioned hash has to be equal to blob_versioned_hash at the same index
+ UnmatchedBlobTxExt DiscardReason = 29 // KZGcommitments must match the corresponding blobs and proofs
+ BlobTxReplace DiscardReason = 30 // Cannot replace type-3 blob txn with another type of txn
+ BlobPoolOverflow DiscardReason = 31 // The total number of blobs (through blob txs) in the pool has reached its limit
+ NoAuthorizations DiscardReason = 32 // EIP-7702 transactions with an empty authorization list are invalid
+ InvalidAuthorization DiscardReason = 33 // Authorization signature is invalid (EIP-7702)
)
func (r DiscardReason) String() string {
@@ -171,8 +172,8 @@ func (r DiscardReason) String() string {
return "initcode too large"
case TypeNotActivated:
return "fork supporting this transaction type is not activated yet"
- case CreateBlobTxn:
- return "blob transactions cannot have the form of a create transaction"
+ case InvalidCreateTxn:
+ return "EIP-4844 & 7702 transactions cannot have the form of a create transaction"
case NoBlobs:
return "blob transactions must have at least one blob"
case TooManyBlobs:
@@ -181,6 +182,10 @@ func (r DiscardReason) String() string {
return "can't replace blob-txn with a non-blob-txn"
case BlobPoolOverflow:
return "blobs limit in txpool is full"
+ case NoAuthorizations:
+ return "EIP-7702 transactions with an empty authorization list are invalid"
+ case InvalidAuthorization:
+ return "Authorization signature is invalid (EIP-7702)"
default:
panic(fmt.Sprintf("discard reason: %d", r))
}
diff --git a/erigon-lib/types/txn.go b/erigon-lib/types/txn.go
index 9c34fcc61a0..30dae970ce8 100644
--- a/erigon-lib/types/txn.go
+++ b/erigon-lib/types/txn.go
@@ -45,18 +45,20 @@ type TxParseConfig struct {
ChainID uint256.Int
}
+type Signature struct {
+ ChainID uint256.Int
+ V uint256.Int
+ R uint256.Int
+ S uint256.Int
+}
+
// TxParseContext is object that is required to parse transactions and turn transaction payload into TxSlot objects
// usage of TxContext helps avoid extra memory allocations
type TxParseContext struct {
+ Signature
Keccak2 hash.Hash
Keccak1 hash.Hash
validateRlp func([]byte) error
- ChainID uint256.Int // Signature values
- R uint256.Int // Signature values
- S uint256.Int // Signature values
- V uint256.Int // Signature values
- ChainIDMul uint256.Int
- DeriveChainID uint256.Int // pre-allocated variable to calculate Sub(&ctx.v, &ctx.chainIDMul)
cfg TxParseConfig
buf [65]byte // buffer needs to be enough for hashes (32 bytes) and for public key (65 bytes)
Sig [65]byte
@@ -64,7 +66,6 @@ type TxParseContext struct {
withSender bool
allowPreEip2s bool // Allow s > secp256k1n/2; see EIP-2
chainIDRequired bool
- IsProtected bool
}
func NewTxParseContext(chainID uint256.Int) *TxParseContext {
@@ -79,7 +80,6 @@ func NewTxParseContext(chainID uint256.Int) *TxParseContext {
// behave as of London enabled
ctx.cfg.ChainID.Set(&chainID)
- ctx.ChainIDMul.Mul(&chainID, u256.N2)
return ctx
}
@@ -111,7 +111,7 @@ type TxSlot struct {
Proofs []gokzg4844.KZGProof
// EIP-7702: set code tx
- AuthorizationLen int
+ Authorizations []Signature
}
const (
@@ -296,6 +296,54 @@ func (ctx *TxParseContext) ParseTransaction(payload []byte, pos int, slot *TxSlo
return p, err
}
+func parseSignature(payload []byte, pos int, legacy bool, cfgChainId *uint256.Int, sig *Signature) (p int, yParity byte, err error) {
+ p = pos
+
+ // Parse V / yParity
+ p, err = rlp.U256(payload, p, &sig.V)
+ if err != nil {
+ return 0, 0, fmt.Errorf("v: %w", err)
+ }
+ if legacy {
+ preEip155 := sig.V.Eq(u256.N27) || sig.V.Eq(u256.N28)
+ // Compute chainId from V
+ if preEip155 {
+ yParity = byte(sig.V.Uint64() - 27)
+ sig.ChainID.Set(cfgChainId)
+ } else {
+ // EIP-155: Simple replay attack protection
+ // V = ChainID * 2 + 35 + yParity
+ if sig.V.LtUint64(35) {
+ return 0, 0, fmt.Errorf("EIP-155 implies V>=35 (was %d)", sig.V.Uint64())
+ }
+ sig.ChainID.Sub(&sig.V, u256.N35)
+ yParity = byte(sig.ChainID.Uint64() % 2)
+ sig.ChainID.Rsh(&sig.ChainID, 1)
+ if !sig.ChainID.Eq(cfgChainId) {
+ return 0, 0, fmt.Errorf("invalid chainID %s (expected %s)", &sig.ChainID, cfgChainId)
+ }
+ }
+ } else {
+ if sig.V.GtUint64(1) {
+ return 0, 0, fmt.Errorf("v is loo large: %s", &sig.V)
+ }
+ yParity = byte(sig.V.Uint64())
+ }
+
+ // Next follows R of the signature
+ p, err = rlp.U256(payload, p, &sig.R)
+ if err != nil {
+ return 0, 0, fmt.Errorf("r: %w", err)
+ }
+ // New follows S of the signature
+ p, err = rlp.U256(payload, p, &sig.S)
+ if err != nil {
+ return 0, 0, fmt.Errorf("s: %w", err)
+ }
+
+ return p, yParity, nil
+}
+
func (ctx *TxParseContext) parseTransactionBody(payload []byte, pos, p0 int, slot *TxSlot, sender []byte, validateHash func([]byte) error) (p int, err error) {
p = p0
legacy := slot.Type == LegacyTxType
@@ -428,19 +476,22 @@ func (ctx *TxParseContext) parseTransactionBody(payload []byte, pos, p0 int, slo
if err != nil {
return 0, fmt.Errorf("%w: storage key list len: %s", ErrParseTxn, err) //nolint
}
- skeyPos := storagePos
- for skeyPos < storagePos+storageLen {
- skeyPos, err = rlp.StringOfLen(payload, skeyPos, 32)
+ sKeyPos := storagePos
+ for sKeyPos < storagePos+storageLen {
+ sKeyPos, err = rlp.StringOfLen(payload, sKeyPos, 32)
if err != nil {
return 0, fmt.Errorf("%w: tuple storage key len: %s", ErrParseTxn, err) //nolint
}
slot.AlStorCount++
- skeyPos += 32
+ sKeyPos += 32
}
- if skeyPos != storagePos+storageLen {
- return 0, fmt.Errorf("%w: extraneous space in the tuple after storage key list", ErrParseTxn)
+ if sKeyPos != storagePos+storageLen {
+ return 0, fmt.Errorf("%w: unexpected storage key items", ErrParseTxn)
}
tuplePos += tupleLen
+ if tuplePos != sKeyPos {
+ return 0, fmt.Errorf("%w: extraneous space in the tuple after storage key list", ErrParseTxn)
+ }
}
if tuplePos != dataPos+dataLen {
return 0, fmt.Errorf("%w: extraneous space in the access list after all tuples", ErrParseTxn)
@@ -453,14 +504,36 @@ func (ctx *TxParseContext) parseTransactionBody(payload []byte, pos, p0 int, slo
return 0, fmt.Errorf("%w: authorizations len: %s", ErrParseTxn, err) //nolint
}
authPos := dataPos
- var authLen int
for authPos < dataPos+dataLen {
+ var authLen int
authPos, authLen, err = rlp.List(payload, authPos)
if err != nil {
return 0, fmt.Errorf("%w: authorization: %s", ErrParseTxn, err) //nolint
}
- slot.AuthorizationLen++
+ var sig Signature
+ p2 := authPos
+ p2, err = rlp.U256(payload, p2, &sig.ChainID)
+ if err != nil {
+ return 0, fmt.Errorf("%w: authorization chainId: %s", ErrParseTxn, err) //nolint
+ }
+ p2, err = rlp.StringOfLen(payload, p2, 20) // address
+ if err != nil {
+ return 0, fmt.Errorf("%w: authorization address: %s", ErrParseTxn, err) //nolint
+ }
+ p2 += 20
+ p2, _, err = rlp.U64(payload, p2) // nonce
+ if err != nil {
+ return 0, fmt.Errorf("%w: authorization nonce: %s", ErrParseTxn, err) //nolint
+ }
+ p2, _, err = parseSignature(payload, p2, false /* legacy */, nil /* cfgChainId */, &sig)
+ if err != nil {
+ return 0, fmt.Errorf("%w: authorization signature: %s", ErrParseTxn, err) //nolint
+ }
+ slot.Authorizations = append(slot.Authorizations, sig)
authPos += authLen
+ if authPos != p2 {
+ return 0, fmt.Errorf("%w: authorization: unexpected list items", ErrParseTxn)
+ }
}
if authPos != dataPos+dataLen {
return 0, fmt.Errorf("%w: extraneous space in the authorizations", ErrParseTxn)
@@ -491,29 +564,19 @@ func (ctx *TxParseContext) parseTransactionBody(payload []byte, pos, p0 int, slo
p = dataPos + dataLen
}
// This is where the data for Sighash ends
- // Next follows V of the signature
+ // Next follows the signature
var vByte byte
sigHashEnd := p
sigHashLen := uint(sigHashEnd - sigHashPos)
var chainIDBits, chainIDLen int
- if legacy {
- p, err = rlp.U256(payload, p, &ctx.V)
- if err != nil {
- return 0, fmt.Errorf("%w: V: %s", ErrParseTxn, err) //nolint
- }
- ctx.IsProtected = ctx.V.Eq(u256.N27) || ctx.V.Eq(u256.N28)
- // Compute chainId from V
- if ctx.IsProtected {
- // Do not add chain id and two extra zeros
- vByte = byte(ctx.V.Uint64() - 27)
- ctx.ChainID.Set(&ctx.cfg.ChainID)
- } else {
- ctx.ChainID.Sub(&ctx.V, u256.N35)
- ctx.ChainID.Rsh(&ctx.ChainID, 1)
- if !ctx.ChainID.Eq(&ctx.cfg.ChainID) {
- return 0, fmt.Errorf("%w: %s, %d (expected %d)", ErrParseTxn, "invalid chainID", ctx.ChainID.Uint64(), ctx.cfg.ChainID.Uint64())
- }
+ p, vByte, err = parseSignature(payload, p, legacy, &ctx.cfg.ChainID, &ctx.Signature)
+ if err != nil {
+ return 0, fmt.Errorf("%w: %s", ErrParseTxn, err) //nolint
+ }
+ if legacy {
+ preEip155 := ctx.V.Eq(u256.N27) || ctx.V.Eq(u256.N28)
+ if !preEip155 {
chainIDBits = ctx.ChainID.BitLen()
if chainIDBits <= 7 {
chainIDLen = 1
@@ -523,32 +586,7 @@ func (ctx *TxParseContext) parseTransactionBody(payload []byte, pos, p0 int, slo
}
sigHashLen += uint(chainIDLen) // For chainId
sigHashLen += 2 // For two extra zeros
-
- ctx.DeriveChainID.Sub(&ctx.V, &ctx.ChainIDMul)
- vByte = byte(ctx.DeriveChainID.Sub(&ctx.DeriveChainID, u256.N8).Uint64() - 27)
- }
- } else {
- var v uint64
- p, v, err = rlp.U64(payload, p)
- if err != nil {
- return 0, fmt.Errorf("%w: V: %s", ErrParseTxn, err) //nolint
- }
- if v > 1 {
- return 0, fmt.Errorf("%w: V is loo large: %d", ErrParseTxn, v)
}
- vByte = byte(v)
- ctx.IsProtected = true
- }
-
- // Next follows R of the signature
- p, err = rlp.U256(payload, p, &ctx.R)
- if err != nil {
- return 0, fmt.Errorf("%w: R: %s", ErrParseTxn, err) //nolint
- }
- // New follows S of the signature
- p, err = rlp.U256(payload, p, &ctx.S)
- if err != nil {
- return 0, fmt.Errorf("%w: S: %s", ErrParseTxn, err) //nolint
}
// For legacy transactions, hash the full payload
diff --git a/erigon-lib/types/txn_test.go b/erigon-lib/types/txn_test.go
index 2539c4551e9..ee8a8e4763b 100644
--- a/erigon-lib/types/txn_test.go
+++ b/erigon-lib/types/txn_test.go
@@ -294,7 +294,7 @@ func TestBlobTxParsing(t *testing.T) {
}
func TestSetCodeTxParsing(t *testing.T) {
- bodyRlxHex := "0x04f902b10188a804b97e55f1619888a08ae04b7dc9b296889262bfb381a9852c88c3ed5816717427719426b97a6e638930cd51d0482d4c3908e171c848ca88e7fcd96deec354e0b8b45c84e7ba97d4d60285eebbf3f7be79aed25dfe2a9f086c69c8ae152aa777b806f45ab602f4b354a6537154e24b4f6b85b58535726876fa885dba96b202417326bb4e4ba5e0bcccd9b4e4df6096401c19e7d38df3599157249a72ac3cf095c39cfde8d4233303823f5341ccaa9ebaf78cd8dd06ec61af9924df9a2f97d13c88ae737a017c914d21d3390984a6102c51293b3b2cec8214e6be2ee033ed4795f1158d9103c9ab5f50786729dd9baf395bb20c71456cf8d5f89b94f8032107975d3fbd90ffa74185a0cb5ab43afe85f884a037e36aea1770355c584876f969c7014017aa51a5e287c9679f4402d1a878b6e3a0be3cdb54e9c5fc3032535d262e6e9ce6a092e068ad0c95f19b4022c1111652b0a0562f7754a0c1d29acfbdaad8ae779125ccc6afec0ec1177056391479b25cee72a069a8be541415e284e16be88ecdb73d5e14ae0e0ade0db635a8d717b70d98293ef794cad5e3980e2d53db6d79d5e6821cff73bef01803e1a0415787a09d11b750dfd34dfe0868ab2c7e6bd8d7ef1a66720f2ea6c7f6e9bb01f8ccf201943d8b4362475b3d0504ccd9e63cddd351b88fa052c088832c50d9581133828864e3d39680cff14988237c283c57f04c54f201940e7ceefb1855e91bd085d85852b2a9df4f9da4f0c088a87ef261eb89b837882d717143b8cb5e718854d879dc9f18304ef2019477be91ff1fb94eb618aebb4d829e9f8eeec4301bc088343c738cf5c7f5b1880521e62bff507ec288ce2f51e36cb6d54ef20194c32daf3ad4597567184d790ab83d7bf34cf0e446c088c04ac61fbe29181988f8c0d967f0799fb988772265a4be2b26ab0188c91023f53ea594d7881c46b9feb3b7cbc6"
+ bodyRlxHex := "0x04f9041701880124ec419e9796da8868b499f209983df888bb35ca86e3d9ea47882486c24309101b0e94e4ec12c49d6bcf7cc1325aa50afff92a561229fe880c716dca0e3e3d28b902b6779e563691f1ca8a86a02efdd93db261215047dad430a475d0e191f66b580d6e759a7c7a739532455e65160acf92dc1e1cc11970e7851277278e9d5d2549e451de8c8dd98ebdd3c55e73cd0b465875b72ea6d54917474f7ddfbd1f66d1a929694becc69bc3064c79c32b2db2a094844b400133724e046d9a96f2b6c7888fe008e6a667a970068487ce9a8e6c1260973956b26c1b78235f3452e21c5ed6d47507023ec4072b9ebea8ea9bde77ea64352ef7a6a8efb2ca61fbd0cf7c31491a4c38e3081dfc7b5e8066fca60d8f57b641032f23119a67a37ad0514529df22ba73b4028dc4a6aef0b26161371d731a81d8ac20ea90515b924f2534e32c240d0b75b5d1683e1bc7ecf8b82b73fb4c40d7cfc38e8c32f2c4d3424a86ba8c6e867f13328be201dd8d5e8ee47e03c1d9096968b71228b068cc21514f6bab7867a0d0a2651f40e927079b008c3ef11d571eb5f71d729ee9cfb3d2a99d258c10371fa1df271f4588e031498b155244295490fd842b3055e240ea89843a188b7f15be53252367761b9a8d21818d2c756822c0383246e167dd645722aefe4ecc5e78608bcc851dc5a51255a3f91e908bb5fa53063596458f45c6e25a712de4b2a5b36eea57f5b772c84f1d0f2f2ae103445fb7f2d38493041ca452f1e846c34331bea7b5b350d02306fa3a15b50e978b4efebccce8a3479479d51c95a08e0cab0732fc4f8095337d7502c6a962199342ed127701a6f5b0e54cbdd88f23556aab406a3a7ef49f848c3efbf4cf62052999bde1940abf4944158aefc5472f4ec9e23308cfb63deedc79e9a4f39d8b353c7e6f15d36f4c63987ae6f32701c6579e68f05f9ae86b6fbbc8d57bc17e5c2f3e5389ea75d102017767205c10d6bf5cf6e33a94ad9e6cfac5accf56d61dcee39f2e954ea89b7241e480e6021fa099a81bc9d28d6ca58a11d36f406b212be70c721bd8a4d1d643fa2bf30ebd59a4f838f794fbba2afaae8cabd778b6e151b0431e3fef0a033ce1a07081820b2a08cc2ed4355811644547f23597f7ebe516538baac51d97cbccee97f8ccf201941d994a07f0b3e925d332d4eae10c9ba474da3d8a8806320d2ae09c60e880887dbf8422d2f6549088321947f20ebcbfeff20194327d773bdc6c27cd28a533e81074372dc33a8afd884ef63dce09c5e56c8088cb702ac89cff765f88d26fe11c3d471949f20194f61ffc773a97207c8124c29526a59e6fa0b34a52880e563a787da952ab808884f2a19b171abfb2882d473907f3ada086f20194c1d608bb39e078a99086e7564e89a7625ed86dca88e8a0ab45821912e88088df6c3d43080350518895a828c35680a0278088e2487fd89ca40b3488689accdbeb8d4d2e"
bodyRlx := hexutility.MustDecodeHex(bodyRlxHex)
hasEnvelope := false
@@ -308,7 +308,7 @@ func TestSetCodeTxParsing(t *testing.T) {
_, err = ctx.ParseTransaction(bodyRlx, 0, &tx, nil, hasEnvelope, false, nil)
require.NoError(t, err)
- assert.Equal(t, 4, tx.AuthorizationLen)
+ assert.Equal(t, 4, len(tx.Authorizations))
assert.Equal(t, SetCodeTxType, tx.Type)
// test empty authorizations
@@ -324,7 +324,7 @@ func TestSetCodeTxParsing(t *testing.T) {
_, err = ctx.ParseTransaction(bodyRlx, 0, &tx2, nil, hasEnvelope, false, nil)
require.NoError(t, err)
- assert.Equal(t, 0, tx2.AuthorizationLen)
+ assert.Equal(t, 0, len(tx2.Authorizations))
assert.Equal(t, SetCodeTxType, tx2.Type)
// generated using this in encdec_test.go
@@ -340,9 +340,10 @@ func TestSetCodeTxParsing(t *testing.T) {
tx.GetChainID().SetUint64(1)
- for _, auth := range tx.(*SetCodeTransaction).GetAuthorizations() {
- auth.ChainID.SetUint64(1)
- auth.V.SetUint64(uint64(randIntInRange(0, 2)))
+ auths := tx.(*SetCodeTransaction).GetAuthorizations()
+ for i := range auths {
+ auths[i].ChainID.SetUint64(1)
+ auths[i].V.SetUint64(uint64(randIntInRange(0, 2)))
}
w := bytes.NewBuffer(nil)
if err := tx.MarshalBinary(w); err != nil {
diff --git a/eth/backend.go b/eth/backend.go
index 4293e86b5ea..ea8b95af45b 100644
--- a/eth/backend.go
+++ b/eth/backend.go
@@ -73,7 +73,6 @@ import (
prototypes "github.com/erigontech/erigon-lib/gointerfaces/typesproto"
"github.com/erigontech/erigon-lib/kv"
"github.com/erigontech/erigon-lib/kv/kvcache"
- "github.com/erigontech/erigon-lib/kv/rawdbv3"
"github.com/erigontech/erigon-lib/kv/remotedbserver"
"github.com/erigontech/erigon-lib/kv/temporal"
"github.com/erigontech/erigon-lib/log/v3"
@@ -190,7 +189,8 @@ type Ethereum struct {
downloaderClient protodownloader.DownloaderClient
- notifications *shards.Notifications
+ notifications *shards.Notifications
+
unsubscribeEthstat func()
waitForStageLoopStop chan struct{}
@@ -221,6 +221,7 @@ type Ethereum struct {
polygonSyncService polygonsync.Service
polygonBridge bridge.PolygonBridge
+ heimdallService heimdall.Service
stopNode func() error
}
@@ -284,11 +285,7 @@ func New(ctx context.Context, stack *node.Node, config *ethconfig.Config, logger
etherbase: config.Miner.Etherbase,
waitForStageLoopStop: make(chan struct{}),
waitForMiningStop: make(chan struct{}),
- notifications: &shards.Notifications{
- Events: shards.NewEvents(),
- Accumulator: shards.NewAccumulator(),
- },
- logger: logger,
+ logger: logger,
stopNode: func() error {
return stack.Close()
},
@@ -366,7 +363,7 @@ func New(ctx context.Context, stack *node.Node, config *ethconfig.Config, logger
}
kvRPC := remotedbserver.NewKvServer(ctx, backend.chainDB, allSnapshots, allBorSnapshots, allBscSnapshots, agg, logger)
- backend.notifications.StateChangesConsumer = kvRPC
+ backend.notifications = shards.NewNotifications(kvRPC)
backend.kvRPC = kvRPC
backend.gasPrice, _ = uint256.FromBig(config.Miner.GasPrice)
@@ -552,6 +549,8 @@ func New(ctx context.Context, stack *node.Node, config *ethconfig.Config, logger
var heimdallClient heimdall.HeimdallClient
var polygonBridge bridge.Service
var heimdallService heimdall.Service
+ var bridgeRPC *bridge.BackendServer
+ var heimdallRPC *heimdall.BackendServer
if chainConfig.Bor != nil {
if !config.WithoutHeimdall {
@@ -559,10 +558,33 @@ func New(ctx context.Context, stack *node.Node, config *ethconfig.Config, logger
}
if config.PolygonSync {
- polygonBridge = bridge.Assemble(config.Dirs.DataDir, logger, consensusConfig.(*borcfg.BorConfig), heimdallClient)
- heimdallService = heimdall.AssembleService(consensusConfig.(*borcfg.BorConfig), config.HeimdallURL, dirs.DataDir, tmpdir, logger)
+ borConfig := consensusConfig.(*borcfg.BorConfig)
+ roTxLimit := int64(stack.Config().Http.DBReadConcurrency)
+
+ bridgeConfig := bridge.Config{
+ DataDir: config.Dirs.DataDir,
+ Logger: logger,
+ BorConfig: borConfig,
+ EventFetcher: heimdallClient,
+ RoTxLimit: roTxLimit,
+ }
+ polygonBridge = bridge.Assemble(bridgeConfig)
+
+ heimdallConfig := heimdall.ServiceConfig{
+ CalculateSprintNumberFn: borConfig.CalculateSprintNumber,
+ HeimdallURL: config.HeimdallURL,
+ DataDir: dirs.DataDir,
+ TempDir: tmpdir,
+ Logger: logger,
+ RoTxLimit: roTxLimit,
+ }
+ heimdallService = heimdall.AssembleService(heimdallConfig)
+
+ bridgeRPC = bridge.NewBackendServer(ctx, polygonBridge)
+ heimdallRPC = heimdall.NewBackendServer(ctx, heimdallService)
backend.polygonBridge = polygonBridge
+ backend.heimdallService = heimdallService
}
flags.Milestone = config.WithHeimdallMilestones
@@ -698,9 +720,10 @@ func New(ctx context.Context, stack *node.Node, config *ethconfig.Config, logger
chainConfig,
backend.engine,
&vm.Config{},
- backend.notifications.Accumulator,
+ backend.notifications,
config.StateStream,
/*stateStream=*/ false,
+ /*alwaysGenerateChangesets=*/ false,
dirs,
blockReader,
backend.sentriesClient.Hd,
@@ -740,9 +763,10 @@ func New(ctx context.Context, stack *node.Node, config *ethconfig.Config, logger
chainConfig,
backend.engine,
&vm.Config{},
- backend.notifications.Accumulator,
+ backend.notifications,
config.StateStream,
/*stateStream=*/ false,
+ /*alwaysGenerateChangesets=*/ false,
dirs,
blockReader,
backend.sentriesClient.Hd,
@@ -785,6 +809,8 @@ func New(ctx context.Context, stack *node.Node, config *ethconfig.Config, logger
ethBackendRPC,
backend.txPoolGrpcServer,
miningRPC,
+ bridgeRPC,
+ heimdallRPC,
stack.Config().PrivateApiAddr,
stack.Config().PrivateApiRateLimit,
creds,
@@ -1034,7 +1060,7 @@ func (s *Ethereum) Init(stack *node.Node, config *ethconfig.Config, chainConfig
}
}
- s.apiList = jsonrpc.APIList(chainKv, ethRpcClient, txPoolRpcClient, miningRpcClient, ff, stateCache, blockReader, &httpRpcCfg, s.engine, s.logger, s.polygonBridge)
+ s.apiList = jsonrpc.APIList(chainKv, ethRpcClient, txPoolRpcClient, miningRpcClient, ff, stateCache, blockReader, &httpRpcCfg, s.engine, s.logger, s.polygonBridge, s.heimdallService)
if config.SilkwormRpcDaemon && httpRpcCfg.Enabled {
interface_log_settings := silkworm.RpcInterfaceLogSettings{
@@ -1495,8 +1521,7 @@ func setUpBlockReader(ctx context.Context, db kv.RwDB, dirs datadir.Dirs, snConf
})
blockReader := freezeblocks.NewBlockReader(allSnapshots, allBorSnapshots, allBscSnapshots)
- cr := rawdb.NewCanonicalReader(rawdbv3.TxNums.WithCustomReadTxNumFunc(freezeblocks.ReadTxNumFuncFromBlockReader(ctx, blockReader)))
- agg, err := libstate.NewAggregator(ctx, dirs, config3.HistoryV3AggregationStep, db, cr, logger)
+ agg, err := libstate.NewAggregator(ctx, dirs, config3.HistoryV3AggregationStep, db, logger)
if err != nil {
return nil, nil, nil, nil, nil, nil, err
}
diff --git a/eth/ethconfig/config.go b/eth/ethconfig/config.go
index 51f015240ab..85e46a108ef 100644
--- a/eth/ethconfig/config.go
+++ b/eth/ethconfig/config.go
@@ -78,7 +78,6 @@ var Defaults = Config{
BodyCacheLimit: 256 * 1024 * 1024,
BodyDownloadTimeoutSeconds: 2,
//LoopBlockLimit: 100_000,
- PruneLimit: 100,
ParallelStateFlushing: true,
},
Ethash: ethashcfg.Config{
@@ -142,6 +141,7 @@ type BlocksFreezing struct {
NoDownloader bool // possible to use snapshots without calling Downloader
Verify bool // verify snapshots on startup
DownloaderAddr string
+ ChainName string
}
func (s BlocksFreezing) String() string {
@@ -161,8 +161,8 @@ var (
FlagSnapStateStop = "snap.state.stop"
)
-func NewSnapCfg(keepBlocks, produceE2, produceE3 bool) BlocksFreezing {
- return BlocksFreezing{KeepBlocks: keepBlocks, ProduceE2: produceE2, ProduceE3: produceE3}
+func NewSnapCfg(keepBlocks, produceE2, produceE3 bool, chainName string) BlocksFreezing {
+ return BlocksFreezing{KeepBlocks: keepBlocks, ProduceE2: produceE2, ProduceE3: produceE3, ChainName: chainName}
}
// Config contains configuration options for ETH protocol.
@@ -272,7 +272,6 @@ type Sync struct {
BodyCacheLimit datasize.ByteSize
BodyDownloadTimeoutSeconds int // TODO: change to duration
- PruneLimit int //the maximum records to delete from the DB during pruning
BreakAfterStage string
LoopBlockLimit uint
ParallelStateFlushing bool
diff --git a/eth/gasprice/feehistory.go b/eth/gasprice/feehistory.go
index a21b5108927..5e65b4ef77b 100644
--- a/eth/gasprice/feehistory.go
+++ b/eth/gasprice/feehistory.go
@@ -44,6 +44,8 @@ const (
// maxFeeHistory is the maximum number of blocks that can be retrieved for a
// fee history request.
maxFeeHistory = 1024
+ // maxQueryLimit is the max number of requested percentiles.
+ maxQueryLimit = 100
)
// blockFees represents a single block for processing
@@ -54,10 +56,12 @@ type blockFees struct {
block *types.Block // only set if reward percentiles are requested
receipts types.Receipts
// filled by processBlock
- reward []*big.Int
- baseFee, nextBaseFee *big.Int
- gasUsedRatio float64
- err error
+ reward []*big.Int
+ baseFee, nextBaseFee *big.Int
+ blobBaseFee, nextBlobBaseFee *big.Int
+ gasUsedRatio float64
+ blobGasUsedRatio float64
+ err error
}
// txGasAndReward is sorted in ascending order based on reward
@@ -90,11 +94,35 @@ func (oracle *Oracle) processBlock(bf *blockFees, percentiles []float64) {
} else {
bf.nextBaseFee = new(big.Int)
}
+
+ // Fill in blob base fee and next blob base fee.
+ if excessBlobGas := bf.header.ExcessBlobGas; excessBlobGas != nil {
+ blobBaseFee256, err := misc.GetBlobGasPrice(chainconfig, *excessBlobGas)
+ if err != nil {
+ bf.err = err
+ return
+ }
+ nextBlobBaseFee256, err := misc.GetBlobGasPrice(chainconfig, misc.CalcExcessBlobGas(chainconfig, bf.header))
+ if err != nil {
+ bf.err = err
+ return
+ }
+ bf.blobBaseFee = blobBaseFee256.ToBig()
+ bf.nextBlobBaseFee = nextBlobBaseFee256.ToBig()
+
+ } else {
+ bf.blobBaseFee = new(big.Int)
+ bf.nextBlobBaseFee = new(big.Int)
+ }
bf.gasUsedRatio = float64(bf.header.GasUsed) / float64(bf.header.GasLimit)
if len(percentiles) == 0 {
// rewards were not requested, return null
return
}
+
+ if blobGasUsed := bf.header.BlobGasUsed; blobGasUsed != nil && chainconfig.MaxBlobGasPerBlock != nil {
+ bf.blobGasUsedRatio = float64(*blobGasUsed) / float64(*chainconfig.MaxBlobGasPerBlock)
+ }
if bf.block == nil || (bf.receipts == nil && len(bf.block.Transactions()) != 0) {
oracle.log.Error("Block or receipts are missing while reward percentiles are requested")
return
@@ -227,20 +255,23 @@ func (oracle *Oracle) resolveBlockRange(ctx context.Context, reqEnd rpc.BlockNum
//
// Note: baseFee includes the next block after the newest of the returned range, because this
// value can be derived from the newest block.
-func (oracle *Oracle) FeeHistory(ctx context.Context, blocks int, unresolvedLastBlock rpc.BlockNumber, rewardPercentiles []float64) (*big.Int, [][]*big.Int, []*big.Int, []float64, error) {
+func (oracle *Oracle) FeeHistory(ctx context.Context, blocks int, unresolvedLastBlock rpc.BlockNumber, rewardPercentiles []float64) (*big.Int, [][]*big.Int, []*big.Int, []float64, []*big.Int, []float64, error) {
if blocks < 1 {
- return libcommon.Big0, nil, nil, nil, nil // returning with no data and no error means there are no retrievable blocks
+ return libcommon.Big0, nil, nil, nil, nil, nil, nil // returning with no data and no error means there are no retrievable blocks
}
if blocks > maxFeeHistory {
oracle.log.Warn("Sanitizing fee history length", "requested", blocks, "truncated", maxFeeHistory)
blocks = maxFeeHistory
}
+ if len(rewardPercentiles) > maxQueryLimit {
+ return libcommon.Big0, nil, nil, nil, nil, nil, fmt.Errorf("%w: over the query limit %d", ErrInvalidPercentile, maxQueryLimit)
+ }
for i, p := range rewardPercentiles {
if p < 0 || p > 100 {
- return libcommon.Big0, nil, nil, nil, fmt.Errorf("%w: %f", ErrInvalidPercentile, p)
+ return libcommon.Big0, nil, nil, nil, nil, nil, fmt.Errorf("%w: %f", ErrInvalidPercentile, p)
}
- if i > 0 && p < rewardPercentiles[i-1] {
- return libcommon.Big0, nil, nil, nil, fmt.Errorf("%w: #%d:%f > #%d:%f", ErrInvalidPercentile, i-1, rewardPercentiles[i-1], i, p)
+ if i > 0 && p <= rewardPercentiles[i-1] {
+ return libcommon.Big0, nil, nil, nil, nil, nil, fmt.Errorf("%w: #%d:%f >= #%d:%f", ErrInvalidPercentile, i-1, rewardPercentiles[i-1], i, p)
}
}
// Only process blocks if reward percentiles were requested
@@ -255,7 +286,7 @@ func (oracle *Oracle) FeeHistory(ctx context.Context, blocks int, unresolvedLast
)
pendingBlock, pendingReceipts, lastBlock, blocks, err := oracle.resolveBlockRange(ctx, unresolvedLastBlock, blocks, maxHistory)
if err != nil || blocks == 0 {
- return libcommon.Big0, nil, nil, nil, err
+ return libcommon.Big0, nil, nil, nil, nil, nil, err
}
oldestBlock := lastBlock + 1 - uint64(blocks)
@@ -263,14 +294,16 @@ func (oracle *Oracle) FeeHistory(ctx context.Context, blocks int, unresolvedLast
next = oldestBlock
)
var (
- reward = make([][]*big.Int, blocks)
- baseFee = make([]*big.Int, blocks+1)
- gasUsedRatio = make([]float64, blocks)
- firstMissing = blocks
+ reward = make([][]*big.Int, blocks)
+ baseFee = make([]*big.Int, blocks+1)
+ gasUsedRatio = make([]float64, blocks)
+ blobGasUsedRatio = make([]float64, blocks)
+ blobBaseFee = make([]*big.Int, blocks+1)
+ firstMissing = blocks
)
for ; blocks > 0; blocks-- {
if err = libcommon.Stopped(ctx.Done()); err != nil {
- return libcommon.Big0, nil, nil, nil, err
+ return libcommon.Big0, nil, nil, nil, nil, nil, err
}
// Retrieve the next block number to fetch with this goroutine
blockNumber := atomic.AddUint64(&next, 1) - 1
@@ -299,11 +332,12 @@ func (oracle *Oracle) FeeHistory(ctx context.Context, blocks int, unresolvedLast
}
if fees.err != nil {
- return libcommon.Big0, nil, nil, nil, fees.err
+ return libcommon.Big0, nil, nil, nil, nil, nil, fees.err
}
i := int(fees.blockNumber - oldestBlock)
if fees.header != nil {
reward[i], baseFee[i], baseFee[i+1], gasUsedRatio[i] = fees.reward, fees.baseFee, fees.nextBaseFee, fees.gasUsedRatio
+ blobGasUsedRatio[i], blobBaseFee[i], blobBaseFee[i+1] = fees.blobGasUsedRatio, fees.blobBaseFee, fees.nextBlobBaseFee
} else {
// getting no block and no error means we are requesting into the future (might happen because of a reorg)
if i < firstMissing {
@@ -312,7 +346,7 @@ func (oracle *Oracle) FeeHistory(ctx context.Context, blocks int, unresolvedLast
}
}
if firstMissing == 0 {
- return libcommon.Big0, nil, nil, nil, nil
+ return libcommon.Big0, nil, nil, nil, nil, nil, nil
}
if len(rewardPercentiles) != 0 {
reward = reward[:firstMissing]
@@ -320,5 +354,5 @@ func (oracle *Oracle) FeeHistory(ctx context.Context, blocks int, unresolvedLast
reward = nil
}
baseFee, gasUsedRatio = baseFee[:firstMissing+1], gasUsedRatio[:firstMissing]
- return new(big.Int).SetUint64(oldestBlock), reward, baseFee, gasUsedRatio, nil
+ return new(big.Int).SetUint64(oldestBlock), reward, baseFee, gasUsedRatio, blobBaseFee, blobGasUsedRatio, nil
}
diff --git a/eth/gasprice/feehistory_test.go b/eth/gasprice/feehistory_test.go
index eab55261fa1..fdd6b8df309 100644
--- a/eth/gasprice/feehistory_test.go
+++ b/eth/gasprice/feehistory_test.go
@@ -35,6 +35,11 @@ import (
func TestFeeHistory(t *testing.T) {
+ overMaxQuery := make([]float64, 101)
+ for i := 0; i < 101; i++ {
+ overMaxQuery[i] = float64(1)
+ }
+
var cases = []struct {
pending bool
maxHeader, maxBlock int
@@ -57,6 +62,7 @@ func TestFeeHistory(t *testing.T) {
{false, 20, 2, 100, 32, []float64{0, 10}, 31, 2, nil},
{false, 0, 0, 1, rpc.PendingBlockNumber, nil, 0, 0, nil},
{false, 0, 0, 2, rpc.PendingBlockNumber, nil, 32, 1, nil},
+ {false, 0, 0, 10, 30, overMaxQuery, 0, 0, gasprice.ErrInvalidPercentile},
//{true, 0, 0, 2, rpc.PendingBlockNumber, nil, 32, 2, nil},
//{true, 0, 0, 2, rpc.PendingBlockNumber, []float64{0, 10}, 32, 2, nil},
}
@@ -77,7 +83,7 @@ func TestFeeHistory(t *testing.T) {
cache := jsonrpc.NewGasPriceCache()
oracle := gasprice.NewOracle(jsonrpc.NewGasPriceOracleBackend(tx, baseApi), config, cache, log.New())
- first, reward, baseFee, ratio, err := oracle.FeeHistory(context.Background(), c.count, c.last, c.percent)
+ first, reward, baseFee, ratio, blobBaseFee, blobBaseFeeRatio, err := oracle.FeeHistory(context.Background(), c.count, c.last, c.percent)
expReward := c.expCount
if len(c.percent) == 0 {
@@ -100,6 +106,12 @@ func TestFeeHistory(t *testing.T) {
if len(ratio) != c.expCount {
t.Fatalf("Test case %d: gasUsedRatio array length mismatch, want %d, got %d", i, c.expCount, len(ratio))
}
+ if c.expCount != 0 && len(blobBaseFee) != c.expCount+1 {
+ t.Fatalf("Test case %d: blobBaseFee array length mismatch, want %d, got %d", i, c.expCount+1, len(blobBaseFee))
+ }
+ if len(blobBaseFeeRatio) != c.expCount {
+ t.Fatalf("Test case %d: blobBaseFeeRatio array length mismatch, want %d, got %d", i, c.expCount, len(blobBaseFeeRatio))
+ }
if err != c.expErr && !errors.Is(err, c.expErr) {
t.Fatalf("Test case %d: error mismatch, want %v, got %v", i, c.expErr, err)
}
diff --git a/eth/integrity/e3_ef_files.go b/eth/integrity/e3_ef_files.go
index 07f8f068b1b..929413725c4 100644
--- a/eth/integrity/e3_ef_files.go
+++ b/eth/integrity/e3_ef_files.go
@@ -34,7 +34,7 @@ func E3EfFiles(ctx context.Context, chainDB kv.RwDB, agg *state.Aggregator, fail
return err
}
g := &errgroup.Group{}
- for _, idx := range []kv.InvertedIdx{kv.AccountsHistoryIdx, kv.StorageHistoryIdx, kv.CodeHistoryIdx, kv.CommitmentHistoryIdx, kv.LogTopicIdx, kv.LogAddrIdx, kv.TracesFromIdx, kv.TracesToIdx} {
+ for _, idx := range []kv.InvertedIdx{kv.AccountsHistoryIdx, kv.StorageHistoryIdx, kv.CodeHistoryIdx, kv.CommitmentHistoryIdx, kv.ReceiptHistoryIdx, kv.LogTopicIdx, kv.LogAddrIdx, kv.TracesFromIdx, kv.TracesToIdx} {
idx := idx
g.Go(func() error {
tx, err := db.BeginTemporalRo(ctx)
diff --git a/eth/integrity/no_gaps_in_canonical_headers.go b/eth/integrity/no_gaps_in_canonical_headers.go
index b9fae306fe8..cbeea4c863f 100644
--- a/eth/integrity/no_gaps_in_canonical_headers.go
+++ b/eth/integrity/no_gaps_in_canonical_headers.go
@@ -45,11 +45,11 @@ func NoGapsInCanonicalHeaders(tx kv.Tx, ctx context.Context, br services.FullBlo
}
for i := firstBlockInDB; i < lastBlockNum; i++ {
- hash, err := br.CanonicalHash(ctx, tx, i)
+ hash, ok, err := br.CanonicalHash(ctx, tx, i)
if err != nil {
panic(err)
}
- if hash == (common.Hash{}) {
+ if !ok || hash == (common.Hash{}) {
err = fmt.Errorf("canonical marker not found: %d", i)
panic(err)
}
diff --git a/eth/protocols/eth/handler_test.go b/eth/protocols/eth/handler_test.go
index a84add90dc8..611f5468ed4 100644
--- a/eth/protocols/eth/handler_test.go
+++ b/eth/protocols/eth/handler_test.go
@@ -23,9 +23,6 @@ import (
"math/big"
"testing"
- "github.com/erigontech/erigon/p2p/sentry/sentry_multi_client"
- "github.com/erigontech/erigon/turbo/jsonrpc/receipts"
-
"github.com/holiman/uint256"
"github.com/stretchr/testify/require"
@@ -39,8 +36,10 @@ import (
"github.com/erigontech/erigon/core/types"
"github.com/erigontech/erigon/crypto"
"github.com/erigontech/erigon/eth/protocols/eth"
+ "github.com/erigontech/erigon/p2p/sentry/sentry_multi_client"
"github.com/erigontech/erigon/params"
"github.com/erigontech/erigon/rlp"
+ "github.com/erigontech/erigon/turbo/jsonrpc/receipts"
"github.com/erigontech/erigon/turbo/stages/mock"
)
diff --git a/eth/stagedsync/README.md b/eth/stagedsync/README.md
index 9918fba09f1..3a706e41348 100644
--- a/eth/stagedsync/README.md
+++ b/eth/stagedsync/README.md
@@ -28,7 +28,7 @@ Here is a pie chart showing the proportional time spent on each stage (it was
taken from the full sync). It is by all means just an estimation, but it gives
an idea.
-
+
## Reorgs / Unwinds
@@ -38,11 +38,11 @@ This happens backward from the last stage to the first one with one caveat that
That is the example of stages order to be unwound (unwind happens from right to left).
-```
+```golang
state.unwindOrder = []*Stage{
- // Unwinding of txn pool (reinjecting transactions into the pool needs to happen after unwinding execution)
- stages[0], stages[1], stages[2], stages[9], stages[3], stages[4], stages[5], stages[6], stages[7], stages[8],
- }
+ // Unwinding of txn pool (reinjecting transactions into the pool needs to happen after unwinding execution)
+ stages[0], stages[1], stages[2], stages[9], stages[3], stages[4], stages[5], stages[6], stages[7], stages[8],
+}
```
## Preprocessing with [ETL](https://github.com/erigontech/erigon/tree/main/erigon-lib/etl)
@@ -61,9 +61,9 @@ This optimization sometimes leads to dramatic (orders of magnitude) write speed
## What happens after the Merge?
In the Proof-of-Stake world staged sync becomes somewhat more complicated, as the following diagram shows.
-
+
-## Stages (for the up to date list see [`stages.go`](/eth/stagedsync/stages/stages.go) and [`stagebuilder.go`](/eth/stagedsync/stagebuilder.go)):
+## Stages (for the up to date list see [`stages.go`](/eth/stagedsync/stages/stages.go) and [`stagebuilder.go`](/eth/stagedsync/stagebuilder.go))
Each stage consists of 2 functions `ExecFunc` that progresses the stage forward and `UnwindFunc` that unwinds the stage backwards.
diff --git a/eth/stagedsync/exec3.go b/eth/stagedsync/exec3.go
index 320b6a321c4..f8a88bf4768 100644
--- a/eth/stagedsync/exec3.go
+++ b/eth/stagedsync/exec3.go
@@ -29,14 +29,11 @@ import (
"sync/atomic"
"time"
- "github.com/erigontech/erigon/eth/ethconfig/estimate"
-
"github.com/c2h5oh/datasize"
+ "github.com/erigontech/erigon/core/rawdb/rawtemporaldb"
"github.com/erigontech/mdbx-go/mdbx"
"golang.org/x/sync/errgroup"
- "github.com/erigontech/erigon-lib/log/v3"
-
"github.com/erigontech/erigon-lib/chain"
"github.com/erigontech/erigon-lib/common"
"github.com/erigontech/erigon-lib/common/cmp"
@@ -49,6 +46,7 @@ import (
"github.com/erigontech/erigon-lib/kv"
kv2 "github.com/erigontech/erigon-lib/kv/mdbx"
"github.com/erigontech/erigon-lib/kv/rawdbv3"
+ "github.com/erigontech/erigon-lib/log/v3"
"github.com/erigontech/erigon-lib/metrics"
state2 "github.com/erigontech/erigon-lib/state"
"github.com/erigontech/erigon-lib/wrap"
@@ -61,6 +59,7 @@ import (
"github.com/erigontech/erigon/core/state"
"github.com/erigontech/erigon/core/types"
"github.com/erigontech/erigon/core/types/accounts"
+ "github.com/erigontech/erigon/eth/ethconfig/estimate"
"github.com/erigontech/erigon/eth/stagedsync/stages"
"github.com/erigontech/erigon/turbo/services"
"github.com/erigontech/erigon/turbo/shards"
@@ -77,8 +76,7 @@ var (
)
const (
- changesetBlockRange = 1_000 // Generate changeset only if execution of blocks <= changesetBlockRange
- changesetSafeRange = 32 // Safety net for long-sync, keep last 32 changesets
+ changesetSafeRange = 32 // Safety net for long-sync, keep last 32 changesets
)
func NewProgress(prevOutputBlockNum, commitThreshold uint64, workersCount int, updateMetrics bool, logPrefix string, logger log.Logger) *Progress {
@@ -120,11 +118,12 @@ func (p *Progress) Log(suffix string, rs *state.StateV3, in *state.QueueWithRetr
gasSec := uint64(float64(gas-p.prevGasUsed) / interval.Seconds())
txSec := uint64(float64(txCount-p.prevTxCount) / interval.Seconds())
+ diffBlocks := max(int(outputBlockNum)-int(p.prevOutputBlockNum)+1, 0)
p.logger.Info(fmt.Sprintf("[%s]"+suffix, p.logPrefix),
"blk", outputBlockNum,
- "blks", outputBlockNum-p.prevOutputBlockNum+1,
- "blk/s", fmt.Sprintf("%.1f", float64(outputBlockNum-p.prevOutputBlockNum+1)/interval.Seconds()),
+ "blks", diffBlocks,
+ "blk/s", fmt.Sprintf("%.1f", float64(diffBlocks)/interval.Seconds()),
"txs", txCount-p.prevTxCount,
"tx/s", common.PrettyCounter(txSec),
"gas/s", common.PrettyCounter(gasSec),
@@ -215,7 +214,6 @@ func ExecV3(ctx context.Context,
}()
}
}
-
agg := cfg.db.(state2.HasAgg).Agg().(*state2.Aggregator)
if initialCycle {
agg.SetCollateAndBuildWorkers(min(2, estimate.StateV3Collate.Workers()))
@@ -281,7 +279,9 @@ func ExecV3(ctx context.Context,
return err
}
if !ok {
- return fmt.Errorf("seems broken TxNums index not filled. can't find blockNum of txNum=%d", inputTxNum)
+ _lb, _lt, _ := txNumsReader.Last(applyTx)
+ _fb, _ft, _ := txNumsReader.First(applyTx)
+ return fmt.Errorf("seems broken TxNums index not filled. can't find blockNum of txNum=%d; in db: (%d-%d, %d-%d)", inputTxNum, _fb, _lb, _ft, _lt)
}
{
_max, _ := txNumsReader.Max(applyTx, _blockNum)
@@ -342,12 +342,16 @@ func ExecV3(ctx context.Context,
blockNum = doms.BlockNum()
outputTxNum.Store(doms.TxNum())
- shouldGenerateChangesets := maxBlockNum-blockNum <= changesetBlockRange
+ if maxBlockNum < blockNum {
+ return nil
+ }
+
+ shouldGenerateChangesets := maxBlockNum-blockNum <= changesetSafeRange || cfg.keepAllChangesets
if blockNum < cfg.blockReader.FrozenBlocks() {
shouldGenerateChangesets = false
}
- if maxBlockNum-blockNum > 16 {
+ if maxBlockNum > blockNum+16 {
log.Info(fmt.Sprintf("[%s] starting", execStage.LogPrefix()),
"from", blockNum, "to", maxBlockNum, "fromTxNum", doms.TxNum(), "offsetFromBlockBeginning", offsetFromBlockBeginning, "initialCycle", initialCycle, "useExternalTx", useExternalTx)
}
@@ -359,10 +363,10 @@ func ExecV3(ctx context.Context,
var count uint64
var lock sync.RWMutex
- shouldReportToTxPool := maxBlockNum-blockNum <= 64
+ shouldReportToTxPool := cfg.notifications != nil && !isMining && maxBlockNum <= blockNum+64
var accumulator *shards.Accumulator
if shouldReportToTxPool {
- accumulator = cfg.accumulator
+ accumulator = cfg.notifications.Accumulator
if accumulator == nil {
accumulator = shards.NewAccumulator()
}
@@ -522,7 +526,7 @@ func ExecV3(ctx context.Context,
if err := func() error {
//Drain results (and process) channel because read sets do not carry over
for !blockComplete.Load() {
- rws.DrainNonBlocking()
+ rws.DrainNonBlocking(ctx)
applyWorker.ResetTx(tx)
processedTxNum, conflicts, triggers, processedBlockNum, stoppedAtBlockEnd, err := processResultQueue(ctx, in, rws, outputTxNum.Load(), rs, agg, tx, nil, applyWorker, false, true, isMining)
@@ -550,7 +554,7 @@ func ExecV3(ctx context.Context,
}
// Drain results channel because read sets do not carry over
- rws.DropResults(func(txTask *state.TxTask) {
+ rws.DropResults(ctx, func(txTask *state.TxTask) {
rs.ReTry(txTask, in)
})
@@ -667,20 +671,24 @@ func ExecV3(ctx context.Context,
// snapshots are often stored on chaper drives. don't expect low-read-latency and manually read-ahead.
// can't use OS-level ReadAhead - because Data >> RAM
// it also warmsup state a bit - by touching senders/coninbase accounts and code
- var clean func()
- readAhead, clean = blocksReadAhead(ctx, &cfg, 4, true)
- defer clean()
- }
+ if !execStage.CurrentSyncCycle.IsInitialCycle {
+ var clean func()
- //fmt.Printf("exec blocks: %d -> %d\n", blockNum, maxBlockNum)
+ readAhead, clean = blocksReadAhead(ctx, &cfg, 4, true)
+ defer clean()
+ }
+ }
var b *types.Block
+ // Only needed by bor chains
+ shouldGenerateChangesetsForLastBlocks := cfg.chainConfig.Bor != nil
+
Loop:
for ; blockNum <= maxBlockNum; blockNum++ {
// set shouldGenerateChangesets=true if we are at last n blocks from maxBlockNum. this is as a safety net in chains
// where during initial sync we can expect bogus blocks to be imported.
- if !shouldGenerateChangesets && blockNum > cfg.blockReader.FrozenBlocks() && blockNum+changesetSafeRange >= maxBlockNum {
+ if !shouldGenerateChangesets && shouldGenerateChangesetsForLastBlocks && blockNum > cfg.blockReader.FrozenBlocks() && blockNum+changesetSafeRange >= maxBlockNum {
aggTx := applyTx.(state2.HasAggTx).AggTx().(*state2.AggregatorRoTx)
aggTx.RestrictSubsetFileDeletions(true)
start := time.Now()
@@ -767,7 +775,7 @@ Loop:
}
rules := chainConfig.Rules(blockNum, b.Time())
- var receipts types.Receipts
+ blockReceipts := make(types.Receipts, len(txs))
// During the first block execution, we may have half-block data in the snapshots.
// Thus, we need to skip the first txs in the block, however, this causes the GasUsed to be incorrect.
// So we skip that check for the first block, if we find half-executed data.
@@ -798,10 +806,16 @@ Loop:
// use history reader instead of state reader to catch up to the tx where we left off
HistoryExecution: offsetFromBlockBeginning > 0 && txIndex < int(offsetFromBlockBeginning),
- BlockReceipts: receipts,
+ BlockReceipts: blockReceipts,
Config: chainConfig,
}
+ if txTask.HistoryExecution && usedGas == 0 {
+ usedGas, blobGasUsed, _, err = rawtemporaldb.ReceiptAsOf(applyTx.(kv.TemporalTx), txTask.TxNum)
+ if err != nil {
+ return err
+ }
+ }
if txIndex >= 0 && !txTask.Final && isPoSa {
if isSystemTx, err := posa.IsSystemTransaction(txs[txIndex], header); err != nil {
@@ -823,9 +837,6 @@ Loop:
doms.SetTxNum(txTask.TxNum)
doms.SetBlockNum(txTask.BlockNum)
- //if txTask.HistoryExecution { // nolint
- // fmt.Printf("[dbg] txNum: %d, hist=%t\n", txTask.TxNum, txTask.HistoryExecution)
- //}
if txIndex >= 0 && txIndex < len(txs) {
txTask.Tx = txs[txIndex]
txTask.TxAsMessage, err = txTask.Tx.AsMessage(signer, header.BaseFee, txTask.Rules)
@@ -880,17 +891,20 @@ Loop:
if txTask.Tx != nil {
blobGasUsed += txTask.Tx.GetBlobGas()
}
+
+ txTask.CreateReceipt(applyTx)
+
if txTask.Final {
- checkReceipts := !cfg.vmConfig.StatelessExec && chainConfig.IsByzantium(txTask.BlockNum) && !cfg.vmConfig.NoReceipts
+ if !isMining && !inMemExec && !execStage.CurrentSyncCycle.IsInitialCycle {
+ cfg.notifications.RecentLogs.Add(blockReceipts)
+ }
+ checkReceipts := !cfg.vmConfig.StatelessExec && chainConfig.IsByzantium(txTask.BlockNum) && !cfg.vmConfig.NoReceipts && !isMining
if txTask.BlockNum > 0 && !skipPostEvaluation { //Disable check for genesis. Maybe need somehow improve it in future - to satisfy TestExecutionSpec
- if err := core.BlockPostValidation(usedGas, blobGasUsed, checkReceipts, receipts, txTask.Header, isMining); err != nil {
+ if err := core.BlockPostValidation(usedGas, blobGasUsed, checkReceipts, txTask.BlockReceipts, txTask.Header, isMining); err != nil {
return fmt.Errorf("%w, txnIdx=%d, %v", consensus.ErrInvalidBlock, txTask.TxIndex, err) //same as in stage_exec.go
}
}
usedGas, blobGasUsed = 0, 0
- receipts = receipts[:0]
- } else if txTask.TxIndex >= 0 {
- receipts = append(receipts, txTask.CreateReceipt(usedGas))
}
return nil
}(); err != nil {
@@ -920,7 +934,18 @@ Loop:
break Loop
}
- if err = rs.ApplyState4(ctx, txTask); err != nil {
+ if !txTask.Final {
+ var receipt *types.Receipt
+ if txTask.TxIndex >= 0 && !txTask.Final {
+ receipt = txTask.BlockReceipts[txTask.TxIndex]
+ }
+ if err := rawtemporaldb.AppendReceipt(doms, receipt, blobGasUsed); err != nil {
+ return err
+ }
+ }
+
+ // MA applystate
+ if err := rs.ApplyState4(ctx, txTask); err != nil {
return err
}
diff --git a/eth/stagedsync/stage_bor_heimdall.go b/eth/stagedsync/stage_bor_heimdall.go
index 661560e662d..57c783c8452 100644
--- a/eth/stagedsync/stage_bor_heimdall.go
+++ b/eth/stagedsync/stage_bor_heimdall.go
@@ -68,7 +68,7 @@ type BorHeimdallCfg struct {
recents *lru.ARCCache[libcommon.Hash, *bor.Snapshot]
signatures *lru.ARCCache[libcommon.Hash, libcommon.Address]
recordWaypoints bool
- unwindTypes []string
+ unwindCfg HeimdallUnwindCfg
}
func StageBorHeimdallCfg(
@@ -83,13 +83,18 @@ func StageBorHeimdallCfg(
recents *lru.ARCCache[libcommon.Hash, *bor.Snapshot],
signatures *lru.ARCCache[libcommon.Hash, libcommon.Address],
recordWaypoints bool,
- unwindTypes []string,
+ userUnwindTypeOverrides []string,
) BorHeimdallCfg {
var borConfig *borcfg.BorConfig
if chainConfig.Bor != nil {
borConfig = chainConfig.Bor.(*borcfg.BorConfig)
}
+ unwindCfg := HeimdallUnwindCfg{} // unwind everything by default
+ if len(userUnwindTypeOverrides) > 0 {
+ unwindCfg.ApplyUserUnwindTypeOverrides(userUnwindTypeOverrides)
+ }
+
return BorHeimdallCfg{
db: db,
snapDb: snapDb,
@@ -103,7 +108,7 @@ func StageBorHeimdallCfg(
recents: recents,
signatures: signatures,
recordWaypoints: recordWaypoints,
- unwindTypes: unwindTypes,
+ unwindCfg: unwindCfg,
}
}
@@ -841,7 +846,7 @@ func BorHeimdallUnwind(u *UnwindState, ctx context.Context, _ *StageState, tx kv
defer tx.Rollback()
}
- if err = UnwindHeimdall(tx, u, cfg.unwindTypes); err != nil {
+ if err = UnwindHeimdall(tx, u, cfg.unwindCfg); err != nil {
return err
}
diff --git a/eth/stagedsync/stage_custom_trace.go b/eth/stagedsync/stage_custom_trace.go
index d7be07cff56..dfd2b80a075 100644
--- a/eth/stagedsync/stage_custom_trace.go
+++ b/eth/stagedsync/stage_custom_trace.go
@@ -19,18 +19,26 @@ package stagedsync
import (
"context"
"fmt"
+ "runtime"
+ "time"
"github.com/erigontech/erigon-lib/chain"
+ libcommon "github.com/erigontech/erigon-lib/common"
"github.com/erigontech/erigon-lib/common/datadir"
+ "github.com/erigontech/erigon-lib/common/dbg"
"github.com/erigontech/erigon-lib/kv"
+ "github.com/erigontech/erigon-lib/kv/rawdbv3"
"github.com/erigontech/erigon-lib/log/v3"
- "github.com/erigontech/erigon-lib/wrap"
+ state2 "github.com/erigontech/erigon-lib/state"
"github.com/erigontech/erigon/cmd/state/exec3"
"github.com/erigontech/erigon/consensus"
+ "github.com/erigontech/erigon/core/rawdb/rawtemporaldb"
+ "github.com/erigontech/erigon/core/state"
"github.com/erigontech/erigon/core/types"
"github.com/erigontech/erigon/eth/ethconfig"
"github.com/erigontech/erigon/ethdb/prune"
"github.com/erigontech/erigon/turbo/services"
+ "github.com/erigontech/erigon/turbo/snapshotsync/freezeblocks"
)
type CustomTraceCfg struct {
@@ -59,131 +67,38 @@ func StageCustomTraceCfg(db kv.RwDB, prune prune.Mode, dirs datadir.Dirs, br ser
}
}
-func SpawnCustomTrace(s *StageState, txc wrap.TxContainer, cfg CustomTraceCfg, ctx context.Context, prematureEndBlock uint64, logger log.Logger) error {
- useExternalTx := txc.Ttx != nil
- var tx kv.TemporalRwTx
- if !useExternalTx {
- _tx, err := cfg.db.BeginRw(ctx)
+func SpawnCustomTrace(cfg CustomTraceCfg, ctx context.Context, logger log.Logger) error {
+ var startBlock, endBlock uint64
+ if err := cfg.db.View(ctx, func(tx kv.Tx) (err error) {
+ txNumsReader := rawdbv3.TxNums.WithCustomReadTxNumFunc(freezeblocks.ReadTxNumFuncFromBlockReader(ctx, cfg.execArgs.BlockReader))
+
+ ac := tx.(state2.HasAggTx).AggTx().(*state2.AggregatorRoTx)
+ txNum := ac.DbgDomain(kv.AccountsDomain).FirstStepNotInFiles() * cfg.db.(state2.HasAgg).Agg().(*state2.Aggregator).StepSize()
+ var ok bool
+ ok, endBlock, err = txNumsReader.FindBlockNum(tx, txNum)
if err != nil {
- return err
+ return fmt.Errorf("getting last executed block: %w", err)
+ }
+ if !ok {
+ panic(ok)
+ }
+
+ txNum = ac.DbgDomain(kv.ReceiptDomain).FirstStepNotInFiles() * cfg.db.(state2.HasAgg).Agg().(*state2.Aggregator).StepSize()
+ ok, startBlock, err = txNumsReader.FindBlockNum(tx, txNum)
+ if err != nil {
+ return fmt.Errorf("getting last executed block: %w", err)
}
- defer _tx.Rollback()
- tx = _tx.(kv.TemporalRwTx)
- } else {
- tx = txc.Ttx.(kv.TemporalRwTx)
+ if !ok {
+ panic(ok)
+ }
+ return nil
+ }); err != nil {
+ return err
}
+ defer cfg.execArgs.BlockReader.Snapshots().(*freezeblocks.RoSnapshots).EnableReadAhead().DisableReadAhead()
- //endBlock, err := s.ExecutionAt(tx)
- //if err != nil {
- // return fmt.Errorf("getting last executed block: %w", err)
- //}
- //if s.BlockNumber > endBlock { // Erigon will self-heal (download missed blocks) eventually
- // return nil
- //}
- //// if prematureEndBlock is nonzero and less than the latest executed block,
- //// then we only run the log index stage until prematureEndBlock
- //if prematureEndBlock != 0 && prematureEndBlock < endBlock {
- // endBlock = prematureEndBlock
- //}
- //// It is possible that prematureEndBlock < s.BlockNumber,
- //// in which case it is important that we skip this stage,
- //// or else we could overwrite stage_at with prematureEndBlock
- //if endBlock <= s.BlockNumber {
- // return nil
- //}
- //
- //startBlock := s.BlockNumber
- //if startBlock > 0 {
- // startBlock++
- //}
- //
- //logEvery := time.NewTicker(10 * time.Second)
- //defer logEvery.Stop()
- //var m runtime.MemStats
- //var prevBlockNumLog uint64 = startBlock
- //
- //doms, err := state2.NewSharedDomains(tx, logger)
- //if err != nil {
- // return err
- //}
- //defer doms.Close()
- //
- //cumulative := uint256.NewInt(0)
- //var lastBlockNum uint64
- //
- //canonicalReader := doms.CanonicalReader()
- //lastFrozenID, err := canonicalReader.LastFrozenTxNum(tx)
- //if err != nil {
- // return err
- //}
- //
- //var baseBlockTxnID, txnID kv.TxnId
- //fmt.Printf("dbg1: %s\n", tx.ViewID())
- ////TODO: new tracer may get tracer from pool, maybe add it to TxTask field
- ///// maybe need startTxNum/endTxNum
- //if err = exec3.CustomTraceMapReduce(startBlock, endBlock, exec3.TraceConsumer{
- // NewTracer: func() exec3.GenericTracer { return nil },
- // Reduce: func(txTask *state.TxTask, tx kv.Tx) error {
- // if txTask.Error != nil {
- // return err
- // }
- //
- // if lastBlockNum != txTask.BlockNum {
- // cumulative.Set(u256.N0)
- // lastBlockNum = txTask.BlockNum
- //
- // if txTask.TxNum < uint64(lastFrozenID) {
- // txnID = kv.TxnId(txTask.TxNum)
- // } else {
- // h, err := rawdb.ReadCanonicalHash(tx, txTask.BlockNum)
- // baseBlockTxnID, err = canonicalReader.BaseTxnID(tx, txTask.BlockNum, h)
- // if err != nil {
- // return err
- // }
- // txnID = baseBlockTxnID
- // }
- // } else {
- // txnID++
- // }
- // cumulative.AddUint64(cumulative, txTask.UsedGas)
- //
- // if txTask.Final || txTask.TxIndex < 0 {
- // return nil
- // }
- // r := txTask.CreateReceipt(cumulative.Uint64())
- // v, err := rlp.EncodeToBytes(r)
- // if err != nil {
- // return err
- // }
- // doms.SetTx(tx)
- // err = doms.AppendablePut(kv.ReceiptsAppendable, txnID, v)
- // if err != nil {
- // return err
- // }
- //
- // select {
- // case <-logEvery.C:
- // dbg.ReadMemStats(&m)
- // log.Info("Scanned", "block", txTask.BlockNum, "blk/sec", float64(txTask.BlockNum-prevBlockNumLog)/10, "alloc", libcommon.ByteCount(m.Alloc), "sys", libcommon.ByteCount(m.Sys))
- // prevBlockNumLog = txTask.BlockNum
- // default:
- // }
- //
- // return nil
- // },
- //}, ctx, tx, cfg.execArgs, logger); err != nil {
- // return err
- //}
- //if err := doms.Flush(ctx, tx); err != nil {
- // return err
- //}
- //
- //if err = s.Update(tx.(kv.RwTx), endBlock); err != nil {
- // return err
- //}
-
- if !useExternalTx {
- if err := tx.Commit(); err != nil {
+ for ; startBlock < endBlock; startBlock += 1_000_000 {
+ if err := customTraceBatchProduce(ctx, cfg.execArgs, cfg.db, startBlock, startBlock+1_000_000, "custom_trace", logger); err != nil {
return err
}
}
@@ -191,31 +106,122 @@ func SpawnCustomTrace(s *StageState, txc wrap.TxContainer, cfg CustomTraceCfg, c
return nil
}
-func UnwindCustomTrace(u *UnwindState, s *StageState, txc wrap.TxContainer, cfg CustomTraceCfg, ctx context.Context, logger log.Logger) (err error) {
- useExternalTx := txc.Ttx != nil
- var tx kv.TemporalTx
- if !useExternalTx {
- _tx, err := cfg.db.BeginRw(ctx)
+func customTraceBatchProduce(ctx context.Context, cfg *exec3.ExecArgs, db kv.RwDB, fromBlock, toBlock uint64, logPrefix string, logger log.Logger) error {
+ var lastTxNum uint64
+ if err := db.Update(ctx, func(tx kv.RwTx) error {
+ ttx := tx.(kv.TemporalRwTx)
+ doms, err := state2.NewSharedDomains(tx, logger)
if err != nil {
return err
}
- defer _tx.Rollback()
- tx = _tx.(kv.TemporalTx)
- } else {
- tx = txc.Ttx
- }
+ defer doms.Close()
- if err := u.Done(tx.(kv.RwTx)); err != nil {
- return fmt.Errorf("%w", err)
- }
- if !useExternalTx {
+ if err := customTraceBatch(ctx, cfg, ttx, doms, fromBlock, toBlock, logPrefix, logger); err != nil {
+ return err
+ }
+ doms.SetTx(tx)
+ if err := doms.Flush(ctx, tx); err != nil {
+ return err
+ }
+ lastTxNum = doms.TxNum()
if err := tx.Commit(); err != nil {
return err
}
+ return nil
+ }); err != nil {
+ return err
+ }
+ agg := db.(state2.HasAgg).Agg().(*state2.Aggregator)
+ var fromStep, toStep uint64
+ if lastTxNum/agg.StepSize() > 0 {
+ toStep = lastTxNum / agg.StepSize()
+ }
+ if err := db.View(ctx, func(tx kv.Tx) error {
+ ac := tx.(state2.HasAggTx).AggTx().(*state2.AggregatorRoTx)
+ fromStep = ac.DbgDomain(kv.ReceiptDomain).FirstStepNotInFiles()
+ return nil
+ }); err != nil {
+ return err
+ }
+ if err := agg.BuildFiles2(ctx, fromStep, toStep); err != nil {
+ return err
+ }
+
+ if err := db.Update(ctx, func(tx kv.RwTx) error {
+ ac := tx.(state2.HasAggTx).AggTx().(*state2.AggregatorRoTx)
+ if _, err := ac.PruneSmallBatches(ctx, 10*time.Hour, tx); err != nil { // prune part of retired data, before commit
+ return err
+ }
+ return nil
+ }); err != nil {
+ return err
}
return nil
}
-func PruneCustomTrace(s *PruneState, tx kv.RwTx, cfg CustomTraceCfg, ctx context.Context, logger log.Logger) (err error) {
+func customTraceBatch(ctx context.Context, cfg *exec3.ExecArgs, tx kv.TemporalRwTx, doms *state2.SharedDomains, fromBlock, toBlock uint64, logPrefix string, logger log.Logger) error {
+ const logPeriod = 5 * time.Second
+ logEvery := time.NewTicker(logPeriod)
+ defer logEvery.Stop()
+
+ var cumulativeBlobGasUsedInBlock uint64
+ //var cumulativeGasUsedTotal = uint256.NewInt(0)
+
+ //TODO: new tracer may get tracer from pool, maybe add it to TxTask field
+ /// maybe need startTxNum/endTxNum
+ var prevTxNumLog = fromBlock
+ var m runtime.MemStats
+ if err := exec3.CustomTraceMapReduce(fromBlock, toBlock, exec3.TraceConsumer{
+ NewTracer: func() exec3.GenericTracer { return nil },
+ Reduce: func(txTask *state.TxTask, tx kv.Tx) (err error) {
+ if txTask.Error != nil {
+ return err
+ }
+
+ if txTask.Tx != nil {
+ cumulativeBlobGasUsedInBlock += txTask.Tx.GetBlobGas()
+ }
+ //if txTask.Final {
+ // cumulativeGasUsedTotal.AddUint64(cumulativeGasUsedTotal, cumulativeGasUsedInBlock)
+ //}
+
+ if txTask.Final { // TODO: move asserts to 1 level higher
+ if txTask.Header.BlobGasUsed != nil && *txTask.Header.BlobGasUsed != cumulativeBlobGasUsedInBlock {
+ err := fmt.Errorf("assert: %d != %d", *txTask.Header.BlobGasUsed, cumulativeBlobGasUsedInBlock)
+ panic(err)
+ }
+ }
+
+ doms.SetTx(tx)
+ doms.SetTxNum(txTask.TxNum)
+ if !txTask.Final {
+ var receipt *types.Receipt
+ if txTask.TxIndex >= 0 && !txTask.Final {
+ receipt = txTask.BlockReceipts[txTask.TxIndex]
+ }
+ if err := rawtemporaldb.AppendReceipt(doms, receipt, cumulativeBlobGasUsedInBlock); err != nil {
+ return err
+ }
+ }
+
+ if txTask.Final { // block changed
+ cumulativeBlobGasUsedInBlock = 0
+ }
+
+ select {
+ case <-logEvery.C:
+ if prevTxNumLog > 0 {
+ dbg.ReadMemStats(&m)
+ log.Info(fmt.Sprintf("[%s] Scanned", logPrefix), "block", txTask.BlockNum, "txs/sec", (txTask.TxNum-prevTxNumLog)/uint64(logPeriod.Seconds()), "alloc", libcommon.ByteCount(m.Alloc), "sys", libcommon.ByteCount(m.Sys))
+ }
+ prevTxNumLog = txTask.TxNum
+ default:
+ }
+ return nil
+ },
+ }, ctx, tx, cfg, logger); err != nil {
+ return err
+ }
+
return nil
}
diff --git a/eth/stagedsync/stage_execute.go b/eth/stagedsync/stage_execute.go
index b6837e5d83f..9a6bdda9dd9 100644
--- a/eth/stagedsync/stage_execute.go
+++ b/eth/stagedsync/stage_execute.go
@@ -65,18 +65,18 @@ type headerDownloader interface {
}
type ExecuteBlockCfg struct {
- db kv.RwDB
- batchSize datasize.ByteSize
- prune prune.Mode
- chainConfig *chain.Config
- engine consensus.Engine
- vmConfig *vm.Config
- badBlockHalt bool
- stateStream bool
- accumulator *shards.Accumulator
- blockReader services.FullBlockReader
- hd headerDownloader
- author *common.Address
+ db kv.RwDB
+ batchSize datasize.ByteSize
+ prune prune.Mode
+ chainConfig *chain.Config
+ notifications *shards.Notifications
+ engine consensus.Engine
+ vmConfig *vm.Config
+ badBlockHalt bool
+ stateStream bool
+ blockReader services.FullBlockReader
+ hd headerDownloader
+ author *common.Address
// last valid number of the stage
dirs datadir.Dirs
@@ -84,8 +84,9 @@ type ExecuteBlockCfg struct {
syncCfg ethconfig.Sync
genesis *types.Genesis
- silkworm *silkworm.Silkworm
- blockProduction bool
+ silkworm *silkworm.Silkworm
+ blockProduction bool
+ keepAllChangesets bool
applyWorker, applyWorkerMining *exec3.Worker
}
@@ -97,9 +98,10 @@ func StageExecuteBlocksCfg(
chainConfig *chain.Config,
engine consensus.Engine,
vmConfig *vm.Config,
- accumulator *shards.Accumulator,
+ notifications *shards.Notifications,
stateStream bool,
badBlockHalt bool,
+ keepAllChangesets bool,
dirs datadir.Dirs,
blockReader services.FullBlockReader,
@@ -120,7 +122,7 @@ func StageExecuteBlocksCfg(
engine: engine,
vmConfig: vmConfig,
dirs: dirs,
- accumulator: accumulator,
+ notifications: notifications,
stateStream: stateStream,
badBlockHalt: badBlockHalt,
blockReader: blockReader,
@@ -131,6 +133,7 @@ func StageExecuteBlocksCfg(
silkworm: silkworm,
applyWorker: exec3.NewWorker(nil, log.Root(), context.Background(), false, db, nil, blockReader, chainConfig, genesis, nil, engine, dirs, false),
applyWorkerMining: exec3.NewWorker(nil, log.Root(), context.Background(), false, db, nil, blockReader, chainConfig, genesis, nil, engine, dirs, true),
+ keepAllChangesets: keepAllChangesets,
}
}
@@ -188,11 +191,13 @@ func unwindExec3(u *UnwindState, s *StageState, txc wrap.TxContainer, ctx contex
t := time.Now()
var changeset *[kv.DomainLen][]libstate.DomainEntryDiff
for currentBlock := u.CurrentBlockNumber; currentBlock > u.UnwindPoint; currentBlock-- {
- currentHash, err := br.CanonicalHash(ctx, txc.Tx, currentBlock)
+ currentHash, ok, err := br.CanonicalHash(ctx, txc.Tx, currentBlock)
if err != nil {
return err
}
- var ok bool
+ if !ok {
+ return fmt.Errorf("canonical hash not found %d", currentBlock)
+ }
var currentKeys [kv.DomainLen][]libstate.DomainEntryDiff
currentKeys, ok, err = domains.GetDiffset(txc.Tx, currentHash, currentBlock)
if !ok {
@@ -357,12 +362,15 @@ func UnwindExecutionStage(u *UnwindState, s *StageState, txc wrap.TxContainer, c
func unwindExecutionStage(u *UnwindState, s *StageState, txc wrap.TxContainer, ctx context.Context, cfg ExecuteBlockCfg, logger log.Logger) error {
var accumulator *shards.Accumulator
if cfg.stateStream && s.BlockNumber-u.UnwindPoint < stateStreamLimit {
- accumulator = cfg.accumulator
+ accumulator = cfg.notifications.Accumulator
- hash, err := cfg.blockReader.CanonicalHash(ctx, txc.Tx, u.UnwindPoint)
+ hash, ok, err := cfg.blockReader.CanonicalHash(ctx, txc.Tx, u.UnwindPoint)
if err != nil {
return fmt.Errorf("read canonical hash of unwind point: %w", err)
}
+ if !ok {
+ return fmt.Errorf("canonical hash not found %d", u.UnwindPoint)
+ }
txs, err := cfg.blockReader.RawTransactions(ctx, txc.Tx, u.UnwindPoint, s.BlockNumber)
if err != nil {
return err
@@ -382,7 +390,7 @@ func PruneExecutionStage(s *PruneState, tx kv.RwTx, cfg ExecuteBlockCfg, ctx con
}
defer tx.Rollback()
}
- if s.ForwardProgress > config3.MaxReorgDepthV3 {
+ if s.ForwardProgress > config3.MaxReorgDepthV3 && !cfg.keepAllChangesets {
// (chunkLen is 8Kb) * (1_000 chunks) = 8mb
// Some blocks on bor-mainnet have 400 chunks of diff = 3mb
var pruneDiffsLimitOnChainTip = 1_000
diff --git a/eth/stagedsync/stage_finish.go b/eth/stagedsync/stage_finish.go
index c0f203e4b53..21be6a5c422 100644
--- a/eth/stagedsync/stage_finish.go
+++ b/eth/stagedsync/stage_finish.go
@@ -17,29 +17,17 @@
package stagedsync
import (
- "bytes"
"context"
"encoding/binary"
- "fmt"
"time"
- "github.com/erigontech/erigon-lib/kv/dbutils"
-
libcommon "github.com/erigontech/erigon-lib/common"
"github.com/erigontech/erigon-lib/common/hexutility"
- "github.com/erigontech/erigon-lib/gointerfaces"
- remote "github.com/erigontech/erigon-lib/gointerfaces/remoteproto"
- types2 "github.com/erigontech/erigon-lib/gointerfaces/typesproto"
"github.com/erigontech/erigon-lib/kv"
"github.com/erigontech/erigon-lib/log/v3"
- bortypes "github.com/erigontech/erigon/polygon/bor/types"
- "github.com/erigontech/erigon/turbo/engineapi/engine_helpers"
- "github.com/erigontech/erigon/turbo/services"
-
"github.com/erigontech/erigon/core/rawdb"
- "github.com/erigontech/erigon/core/types"
- "github.com/erigontech/erigon/ethdb/cbor"
"github.com/erigontech/erigon/params"
+ "github.com/erigontech/erigon/turbo/engineapi/engine_helpers"
)
type FinishCfg struct {
@@ -142,41 +130,24 @@ func PruneFinish(u *PruneState, tx kv.RwTx, cfg FinishCfg, ctx context.Context)
return nil
}
-func NotifyNewHeaders(ctx context.Context, finishStageBeforeSync uint64, finishStageAfterSync uint64, unwindTo *uint64, notifier ChainEventNotifier, tx kv.Tx, logger log.Logger, blockReader services.FullBlockReader) error {
+// [from,to)
+func NotifyNewHeaders(ctx context.Context, notifyFrom, notifyTo uint64, notifier ChainEventNotifier, tx kv.Tx, logger log.Logger) error {
t := time.Now()
if notifier == nil {
logger.Trace("RPC Daemon notification channel not set. No headers notifications will be sent")
return nil
}
// Notify all headers we have (either canonical or not) in a maximum range span of 1024
- var notifyFrom uint64
- var isUnwind bool
- if unwindTo != nil && *unwindTo != 0 && (*unwindTo) < finishStageBeforeSync {
- notifyFrom = *unwindTo
- isUnwind = true
- } else {
- heightSpan := finishStageAfterSync - finishStageBeforeSync
- if heightSpan > 1024 {
- heightSpan = 1024
- }
- notifyFrom = finishStageAfterSync - heightSpan
- }
- notifyFrom++
-
- var notifyTo = notifyFrom
- var notifyToHash libcommon.Hash
var headersRlp [][]byte
if err := tx.ForEach(kv.HeaderCanonical, hexutility.EncodeTs(notifyFrom), func(k, hash []byte) (err error) {
if len(hash) == 0 {
return nil
}
blockNum := binary.BigEndian.Uint64(k)
- if blockNum > finishStageAfterSync { //[from,to)
+ if blockNum >= notifyTo { //[from,to)
return nil
}
- notifyTo = blockNum
- notifyToHash = libcommon.BytesToHash(hash)
- headerRLP := rawdb.ReadHeaderRLP(tx, notifyToHash, notifyTo)
+ headerRLP := rawdb.ReadHeaderRLP(tx, libcommon.BytesToHash(hash), blockNum)
if headerRLP != nil {
headersRlp = append(headersRlp, libcommon.CopyBytes(headerRLP))
}
@@ -189,81 +160,7 @@ func NotifyNewHeaders(ctx context.Context, finishStageBeforeSync uint64, finishS
if len(headersRlp) > 0 {
notifier.OnNewHeader(headersRlp)
headerTiming := time.Since(t)
-
- t = time.Now()
- if notifier.HasLogSubsriptions() {
- logs, err := ReadLogs(tx, notifyFrom, isUnwind, blockReader)
- if err != nil {
- return err
- }
- notifier.OnLogs(logs)
- }
- logTiming := time.Since(t)
- logger.Debug("RPC Daemon notified of new headers", "from", notifyFrom-1, "to", notifyTo, "amount", len(headersRlp), "hash", notifyToHash, "header sending", headerTiming, "log sending", logTiming)
+ logger.Debug("RPC Daemon notified of new headers", "from", notifyFrom-1, "to", notifyTo, "amount", len(headersRlp), "header sending", headerTiming)
}
return nil
}
-
-func ReadLogs(tx kv.Tx, from uint64, isUnwind bool, blockReader services.FullBlockReader) ([]*remote.SubscribeLogsReply, error) {
- logs, err := tx.Cursor(kv.Log)
- if err != nil {
- return nil, err
- }
- defer logs.Close()
- reply := make([]*remote.SubscribeLogsReply, 0)
- reader := bytes.NewReader(nil)
-
- var prevBlockNum uint64
- var block *types.Block
- var logIndex uint64
- for k, v, err := logs.Seek(dbutils.LogKey(from, 0)); k != nil; k, v, err = logs.Next() {
- if err != nil {
- return nil, err
- }
- blockNum := binary.BigEndian.Uint64(k[:8])
- if block == nil || blockNum != prevBlockNum {
- logIndex = 0
- prevBlockNum = blockNum
- if block, err = blockReader.BlockByNumber(context.Background(), tx, blockNum); err != nil {
- return nil, err
- }
- }
-
- txIndex := uint64(binary.BigEndian.Uint32(k[8:]))
-
- var txHash libcommon.Hash
-
- // bor transactions are at the end of the bodies transactions (added manually but not actually part of the block)
- if txIndex == uint64(len(block.Transactions())) {
- txHash = bortypes.ComputeBorTxHash(blockNum, block.Hash())
- } else {
- txHash = block.Transactions()[txIndex].Hash()
- }
-
- var ll types.Logs
- reader.Reset(v)
- if err := cbor.Unmarshal(&ll, reader); err != nil {
- return nil, fmt.Errorf("receipt unmarshal failed: %w, blocl=%d", err, blockNum)
- }
- for _, l := range ll {
- r := &remote.SubscribeLogsReply{
- Address: gointerfaces.ConvertAddressToH160(l.Address),
- BlockHash: gointerfaces.ConvertHashToH256(block.Hash()),
- BlockNumber: blockNum,
- Data: l.Data,
- LogIndex: logIndex,
- Topics: make([]*types2.H256, 0, len(l.Topics)),
- TransactionHash: gointerfaces.ConvertHashToH256(txHash),
- TransactionIndex: txIndex,
- Removed: isUnwind,
- }
- logIndex++
- for _, topic := range l.Topics {
- r.Topics = append(r.Topics, gointerfaces.ConvertHashToH256(topic))
- }
- reply = append(reply, r)
- }
- }
-
- return reply, nil
-}
diff --git a/eth/stagedsync/stage_headers.go b/eth/stagedsync/stage_headers.go
index d0539c2fe2a..d4fff32cf52 100644
--- a/eth/stagedsync/stage_headers.go
+++ b/eth/stagedsync/stage_headers.go
@@ -142,16 +142,16 @@ func HeadersPOW(s *StageState, u Unwinder, ctx context.Context, tx kv.RwTx, cfg
defer logEvery.Stop()
// Check if this is called straight after the unwinds, which means we need to create new canonical markings
- hash, err := cfg.blockReader.CanonicalHash(ctx, tx, startProgress)
+ hash, ok, err := cfg.blockReader.CanonicalHash(ctx, tx, startProgress)
if err != nil {
return err
}
- if hash == (libcommon.Hash{}) { // restore canonical markers after unwind
+ if !ok || hash == (libcommon.Hash{}) { // restore canonical markers after unwind
headHash := rawdb.ReadHeadHeaderHash(tx)
- if _, _, err = fixCanonicalChain(logPrefix, logEvery, startProgress, headHash, tx, cfg.blockReader, logger); err != nil {
+ if err = fixCanonicalChain(logPrefix, logEvery, startProgress, headHash, tx, cfg.blockReader, logger); err != nil {
return err
}
- hash, err = cfg.blockReader.CanonicalHash(ctx, tx, startProgress)
+ hash, _, err = cfg.blockReader.CanonicalHash(ctx, tx, startProgress)
if err != nil {
return err
}
@@ -326,7 +326,7 @@ Loop:
}
if headerInserter.GetHighest() != 0 {
if !headerInserter.Unwind() {
- if _, _, err := fixCanonicalChain(logPrefix, logEvery, headerInserter.GetHighest(), headerInserter.GetHighestHash(), tx, cfg.blockReader, logger); err != nil {
+ if err = fixCanonicalChain(logPrefix, logEvery, headerInserter.GetHighest(), headerInserter.GetHighestHash(), tx, cfg.blockReader, logger); err != nil {
return fmt.Errorf("fix canonical chain: %w", err)
}
}
@@ -369,33 +369,26 @@ Loop:
return nil
}
-type chainNode struct {
- hash libcommon.Hash
- number uint64
-}
-
-func fixCanonicalChain(logPrefix string, logEvery *time.Ticker, height uint64, hash libcommon.Hash, tx kv.StatelessRwTx, headerReader services.FullBlockReader, logger log.Logger) ([]chainNode, []chainNode, error) {
+func fixCanonicalChain(logPrefix string, logEvery *time.Ticker, height uint64, hash libcommon.Hash, tx kv.StatelessRwTx, headerReader services.FullBlockReader, logger log.Logger) error {
if height == 0 {
- return nil, nil, nil
+ return nil
}
ancestorHash := hash
ancestorHeight := height
- var newNodes, badNodes []chainNode
- var emptyHash libcommon.Hash
var ch libcommon.Hash
var err error
- for ch, err = headerReader.CanonicalHash(context.Background(), tx, ancestorHeight); err == nil && ch != ancestorHash; ch, err = headerReader.CanonicalHash(context.Background(), tx, ancestorHeight) {
+ for ch, _, err = headerReader.CanonicalHash(context.Background(), tx, ancestorHeight); err == nil && ch != ancestorHash; ch, _, err = headerReader.CanonicalHash(context.Background(), tx, ancestorHeight) {
if err = rawdb.WriteCanonicalHash(tx, ancestorHash, ancestorHeight); err != nil {
- return nil, nil, fmt.Errorf("marking canonical header %d %x: %w", ancestorHeight, ancestorHash, err)
+ return fmt.Errorf("marking canonical header %d %x: %w", ancestorHeight, ancestorHash, err)
}
ancestor, err := headerReader.Header(context.Background(), tx, ancestorHash, ancestorHeight)
if err != nil {
- return nil, nil, err
+ return err
}
if ancestor == nil {
- return nil, nil, fmt.Errorf("ancestor is nil. height %d, hash %x", ancestorHeight, ancestorHash)
+ return fmt.Errorf("ancestor is nil. height %d, hash %x", ancestorHeight, ancestorHash)
}
select {
@@ -405,26 +398,14 @@ func fixCanonicalChain(logPrefix string, logEvery *time.Ticker, height uint64, h
default:
}
- if ch != emptyHash {
- badNodes = append(badNodes, chainNode{
- hash: ch,
- number: ancestorHeight,
- })
- }
-
- newNodes = append(newNodes, chainNode{
- hash: ancestorHash,
- number: ancestorHeight,
- })
-
ancestorHash = ancestor.ParentHash
ancestorHeight--
}
if err != nil {
- return nil, nil, fmt.Errorf("reading canonical hash for %d: %w", ancestorHeight, err)
+ return fmt.Errorf("reading canonical hash for %d: %w", ancestorHeight, err)
}
- return newNodes, badNodes, nil
+ return nil
}
func HeadersUnwind(ctx context.Context, u *UnwindState, s *StageState, tx kv.RwTx, cfg HeadersCfg, test bool) (err error) {
@@ -517,9 +498,14 @@ func HeadersUnwind(ctx context.Context, u *UnwindState, s *StageState, tx kv.RwT
*/
if maxNum == 0 {
maxNum = u.UnwindPoint
- if maxHash, err = cfg.blockReader.CanonicalHash(ctx, tx, maxNum); err != nil {
+ var ok bool
+ if maxHash, ok, err = cfg.blockReader.CanonicalHash(ctx, tx, maxNum); err != nil {
return err
}
+ if !ok {
+ return fmt.Errorf("not found canonical marker: %d", maxNum)
+ }
+
}
if err = rawdb.WriteHeadHeaderHash(tx, maxHash); err != nil {
return err
diff --git a/eth/stagedsync/stage_mining_exec.go b/eth/stagedsync/stage_mining_exec.go
index a51385e1270..86f9ad10d9a 100644
--- a/eth/stagedsync/stage_mining_exec.go
+++ b/eth/stagedsync/stage_mining_exec.go
@@ -20,7 +20,6 @@ import (
"errors"
"fmt"
"io"
- "math/big"
"sync/atomic"
"time"
@@ -308,7 +307,7 @@ func getNextTransactions(
}
blockNum := executionAt + 1
- txs, err := filterBadTransactions(txs, cfg.chainConfig, blockNum, header.BaseFee, simStateReader, simStateWriter, logger)
+ txs, err := filterBadTransactions(txs, cfg.chainConfig, blockNum, header, simStateReader, simStateWriter, logger)
if err != nil {
return nil, 0, err
}
@@ -316,7 +315,7 @@ func getNextTransactions(
return types.NewTransactionsFixedOrder(txs), count, nil
}
-func filterBadTransactions(transactions []types.Transaction, config chain.Config, blockNumber uint64, baseFee *big.Int, simStateReader state.StateReader, simStateWriter state.StateWriter, logger log.Logger) ([]types.Transaction, error) {
+func filterBadTransactions(transactions []types.Transaction, config chain.Config, blockNumber uint64, header *types.Header, simStateReader state.StateReader, simStateWriter state.StateWriter, logger log.Logger) ([]types.Transaction, error) {
initialCnt := len(transactions)
var filtered []types.Transaction
gasBailout := config.Consensus == chain.ParliaConsensus
@@ -361,15 +360,28 @@ func filterBadTransactions(transactions []types.Transaction, config chain.Config
// Make sure the sender is an EOA (EIP-3607)
if !account.IsEmptyCodeHash() {
- transactions = transactions[1:]
- notEOACnt++
- continue
+ isEoaCodeAllowed := false
+ if config.IsPrague(header.Time) {
+ code, err := simStateReader.ReadAccountCode(sender, account.Incarnation, account.CodeHash)
+ if err != nil {
+ return nil, err
+ }
+
+ _, isDelegated := types.ParseDelegation(code)
+ isEoaCodeAllowed = isDelegated // non-empty code allowed for eoa if it points to delegation
+ }
+
+ if !isEoaCodeAllowed {
+ transactions = transactions[1:]
+ notEOACnt++
+ continue
+ }
}
if config.IsLondon(blockNumber) {
baseFee256 := uint256.NewInt(0)
- if overflow := baseFee256.SetFromBig(baseFee); overflow {
- return nil, fmt.Errorf("bad baseFee %s", baseFee)
+ if overflow := baseFee256.SetFromBig(header.BaseFee); overflow {
+ return nil, fmt.Errorf("bad baseFee %s", header.BaseFee)
}
// Make sure the transaction gasFeeCap is greater than the block's baseFee.
if !transaction.GetFeeCap().IsZero() || !transaction.GetTip().IsZero() {
@@ -438,7 +450,7 @@ func addTransactionsToMiningBlock(logPrefix string, current *MiningBlock, chainC
engine consensus.Engine, txs types.TransactionsStream, coinbase libcommon.Address, ibs *state.IntraBlockState, ctx context.Context,
interrupt *int32, payloadId uint64, logger log.Logger) (types.Logs, bool, error) {
header := current.Header
- tcount := 0
+ txnIdx := ibs.TxnIndex() + 1
gasPool := new(core.GasPool).AddGas(header.GasLimit - header.GasUsed)
if header.BlobGasUsed != nil {
gasPool.AddBlobGas(chainConfig.GetMaxBlobGasPerBlock() - *header.BlobGasUsed)
@@ -449,7 +461,7 @@ func addTransactionsToMiningBlock(logPrefix string, current *MiningBlock, chainC
noop := state.NewNoopWriter()
var miningCommitTx = func(txn types.Transaction, coinbase libcommon.Address, vmConfig *vm.Config, chainConfig chain.Config, ibs *state.IntraBlockState, current *MiningBlock) ([]*types.Log, error) {
- ibs.SetTxContext(txn.Hash(), tcount)
+ ibs.SetTxContext(txnIdx, header.Number.Uint64())
gasSnap := gasPool.Gas()
blobGasSnap := gasPool.BlobGas()
snap := ibs.Snapshot()
@@ -543,7 +555,7 @@ LOOP:
// Everything ok, collect the logs and shift in the next transaction from the same account
logger.Trace(fmt.Sprintf("[%s] Added transaction", logPrefix), "hash", txn.Hash(), "sender", from, "nonce", txn.GetNonce(), "payload", payloadId)
coalescedLogs = append(coalescedLogs, logs...)
- tcount++
+ txnIdx++
txs.Shift()
} else {
// Strange error, discard the transaction and get the next in line (note, the
diff --git a/eth/stagedsync/stage_polygon_sync.go b/eth/stagedsync/stage_polygon_sync.go
index 616ffd8764a..27dce27593a 100644
--- a/eth/stagedsync/stage_polygon_sync.go
+++ b/eth/stagedsync/stage_polygon_sync.go
@@ -64,6 +64,7 @@ func NewPolygonSyncStageCfg(
blockReader services.FullBlockReader,
stopNode func() error,
blockLimit uint,
+ userUnwindTypeOverrides []string,
) PolygonSyncStageCfg {
// using a buffered channel to preserve order of tx actions,
// do not expect to ever have more than 50 goroutines blocking on this channel
@@ -97,7 +98,8 @@ func NewPolygonSyncStageCfg(
txActionStream: txActionStream,
}
borConfig := chainConfig.Bor.(*borcfg.BorConfig)
- heimdallService := heimdall.NewService(borConfig, heimdallClient, heimdallStore, logger)
+ heimdallReader := heimdall.NewReader(borConfig.CalculateSprintNumber, heimdallStore, logger)
+ heimdallService := heimdall.NewService(borConfig.CalculateSprintNumber, heimdallClient, heimdallStore, logger, heimdallReader)
bridgeService := bridge.NewBridge(bridgeStore, logger, borConfig, heimdallClient, nil)
p2pService := p2p.NewService(maxPeers, logger, sentry, statusDataProvider.GetStatusData)
checkpointVerifier := polygonsync.VerifyCheckpointHeaders
@@ -140,11 +142,25 @@ func NewPolygonSyncStageCfg(
txActionStream: txActionStream,
stopNode: stopNode,
}
+
+ unwindCfg := HeimdallUnwindCfg{
+ // we keep finalized data, no point in unwinding it
+ KeepEvents: true,
+ KeepSpans: true,
+ KeepSpanBlockProducerSelections: true,
+ KeepCheckpoints: true,
+ KeepMilestones: true,
+ }
+ if len(userUnwindTypeOverrides) > 0 {
+ unwindCfg.ApplyUserUnwindTypeOverrides(userUnwindTypeOverrides)
+ }
+
return PolygonSyncStageCfg{
db: db,
service: syncService,
blockReader: blockReader,
blockWriter: blockio.NewBlockWriter(),
+ unwindCfg: unwindCfg,
}
}
@@ -153,6 +169,7 @@ type PolygonSyncStageCfg struct {
service *polygonSyncStageService
blockReader services.FullBlockReader
blockWriter *blockio.BlockWriter
+ unwindCfg HeimdallUnwindCfg
}
func ForwardPolygonSyncStage(
@@ -203,10 +220,13 @@ func UnwindPolygonSyncStage(ctx context.Context, tx kv.RwTx, u *UnwindState, cfg
return err
}
- canonicalHash, err := cfg.blockReader.CanonicalHash(ctx, tx, u.UnwindPoint)
+ canonicalHash, ok, err := cfg.blockReader.CanonicalHash(ctx, tx, u.UnwindPoint)
if err != nil {
return err
}
+ if !ok {
+ return fmt.Errorf("canonical marker not found: %d", u.UnwindPoint)
+ }
if err = rawdb.WriteHeadHeaderHash(tx, canonicalHash); err != nil {
return err
@@ -218,7 +238,7 @@ func UnwindPolygonSyncStage(ctx context.Context, tx kv.RwTx, u *UnwindState, cfg
}
// heimdall
- if err = UnwindHeimdall(tx, u, nil); err != nil {
+ if err = UnwindHeimdall(tx, u, cfg.unwindCfg); err != nil {
return err
}
@@ -245,30 +265,105 @@ func UnwindPolygonSyncStage(ctx context.Context, tx kv.RwTx, u *UnwindState, cfg
return nil
}
-func UnwindHeimdall(tx kv.RwTx, u *UnwindState, unwindTypes []string) error {
- if len(unwindTypes) == 0 || slices.Contains(unwindTypes, "events") {
+type HeimdallUnwindCfg struct {
+ KeepEvents bool
+ KeepEventNums bool
+ KeepEventProcessedBlocks bool
+ KeepSpans bool
+ KeepSpanBlockProducerSelections bool
+ KeepCheckpoints bool
+ KeepMilestones bool
+}
+
+func (cfg *HeimdallUnwindCfg) ApplyUserUnwindTypeOverrides(userUnwindTypeOverrides []string) {
+ if len(userUnwindTypeOverrides) > 0 {
+ return
+ }
+
+ // If a user has specified an unwind type override it means we need to unwind all the tables that fall
+ // inside that type but NOT unwind the tables for the types that have not been specified in the overrides.
+ // Our default config value unwinds everything.
+ // If we initialise that and keep track of all the "unseen" unwind type overrides then we can flip our config
+ // to not unwind the tables for the "unseen" types.
+ const events = "events"
+ const spans = "spans"
+ const checkpoints = "checkpoints"
+ const milestones = "milestones"
+ unwindTypes := map[string]struct{}{
+ events: {},
+ spans: {},
+ checkpoints: {},
+ milestones: {},
+ }
+
+ for _, unwindType := range userUnwindTypeOverrides {
+ if _, exists := unwindTypes[unwindType]; !exists {
+ panic("unknown unwindType override " + unwindType)
+ }
+
+ delete(unwindTypes, unwindType)
+ }
+
+ // our config unwinds everything by default
+ defaultCfg := HeimdallUnwindCfg{}
+ // flip the config for the unseen type overrides
+ for unwindType := range unwindTypes {
+ switch unwindType {
+ case events:
+ defaultCfg.KeepEvents = true
+ defaultCfg.KeepEventNums = true
+ defaultCfg.KeepEventProcessedBlocks = true
+ case spans:
+ defaultCfg.KeepSpans = true
+ defaultCfg.KeepSpanBlockProducerSelections = true
+ case checkpoints:
+ defaultCfg.KeepCheckpoints = true
+ case milestones:
+ defaultCfg.KeepMilestones = true
+ default:
+ panic(fmt.Sprintf("missing override logic for unwindType %s, please add it", unwindType))
+ }
+ }
+}
+
+func UnwindHeimdall(tx kv.RwTx, u *UnwindState, unwindCfg HeimdallUnwindCfg) error {
+ if !unwindCfg.KeepEvents {
if err := UnwindEvents(tx, u.UnwindPoint); err != nil {
return err
}
}
- if len(unwindTypes) == 0 || slices.Contains(unwindTypes, "spans") {
+ if !unwindCfg.KeepEventNums {
+ if err := UnwindEventNums(tx, u.UnwindPoint); err != nil {
+ return err
+ }
+ }
+
+ if !unwindCfg.KeepEventProcessedBlocks {
+ if err := UnwindEventProcessedBlocks(tx, u.UnwindPoint); err != nil {
+ return err
+ }
+ }
+
+ if !unwindCfg.KeepSpans {
if err := UnwindSpans(tx, u.UnwindPoint); err != nil {
return err
}
+ }
+ if !unwindCfg.KeepSpanBlockProducerSelections {
if err := UnwindSpanBlockProducerSelections(tx, u.UnwindPoint); err != nil {
return err
}
}
- if borsnaptype.CheckpointsEnabled() && (len(unwindTypes) == 0 || slices.Contains(unwindTypes, "checkpoints")) {
+ if borsnaptype.CheckpointsEnabled() && !unwindCfg.KeepCheckpoints {
if err := UnwindCheckpoints(tx, u.UnwindPoint); err != nil {
return err
}
}
- if borsnaptype.MilestonesEnabled() && (len(unwindTypes) == 0 || slices.Contains(unwindTypes, "milestones")) {
+ if borsnaptype.MilestonesEnabled() && !unwindCfg.KeepMilestones {
if err := UnwindMilestones(tx, u.UnwindPoint); err != nil {
return err
}
@@ -278,73 +373,87 @@ func UnwindHeimdall(tx kv.RwTx, u *UnwindState, unwindTypes []string) error {
}
func UnwindEvents(tx kv.RwTx, unwindPoint uint64) error {
- cursor, err := tx.RwCursor(kv.BorEventNums)
+ eventNumsCursor, err := tx.Cursor(kv.BorEventNums)
if err != nil {
return err
}
- defer cursor.Close()
+ defer eventNumsCursor.Close()
var blockNumBuf [8]byte
binary.BigEndian.PutUint64(blockNumBuf[:], unwindPoint+1)
- _, _, err = cursor.Seek(blockNumBuf[:])
+ _, _, err = eventNumsCursor.Seek(blockNumBuf[:])
if err != nil {
return err
}
- _, prevSprintLastIDBytes, err := cursor.Prev() // last event ID of previous sprint
+ // keep last event ID of previous block with assigned events
+ _, lastEventIdToKeep, err := eventNumsCursor.Prev()
if err != nil {
return err
}
- var prevSprintLastID uint64
- if prevSprintLastIDBytes == nil {
- // we are unwinding the first entry, remove all items from BorEvents
- prevSprintLastID = 0
+ var firstEventIdToRemove uint64
+ if lastEventIdToKeep == nil {
+ // there are no assigned events before the unwind block, remove all items from BorEvents
+ firstEventIdToRemove = 0
} else {
- prevSprintLastID = binary.BigEndian.Uint64(prevSprintLastIDBytes)
+ firstEventIdToRemove = binary.BigEndian.Uint64(lastEventIdToKeep) + 1
}
- eventId := make([]byte, 8) // first event ID for this sprint
- binary.BigEndian.PutUint64(eventId, prevSprintLastID+1)
-
+ from := make([]byte, 8)
+ binary.BigEndian.PutUint64(from, firstEventIdToRemove)
eventCursor, err := tx.RwCursor(kv.BorEvents)
if err != nil {
return err
}
defer eventCursor.Close()
- for eventId, _, err = eventCursor.Seek(eventId); err == nil && eventId != nil; eventId, _, err = eventCursor.Next() {
+ var k []byte
+ for k, _, err = eventCursor.Seek(from); err == nil && k != nil; k, _, err = eventCursor.Next() {
if err = eventCursor.DeleteCurrent(); err != nil {
return err
}
}
- if err != nil {
- return err
- }
- k, _, err := cursor.Next() // move cursor back to this sprint
+ return err
+}
+
+func UnwindEventNums(tx kv.RwTx, unwindPoint uint64) error {
+ c, err := tx.RwCursor(kv.BorEventNums)
if err != nil {
return err
}
- for ; err == nil && k != nil; k, _, err = cursor.Next() {
- if err = cursor.DeleteCurrent(); err != nil {
+ defer c.Close()
+ var blockNumBuf [8]byte
+ binary.BigEndian.PutUint64(blockNumBuf[:], unwindPoint+1)
+ var k []byte
+ for k, _, err = c.Seek(blockNumBuf[:]); err == nil && k != nil; k, _, err = c.Next() {
+ if err = c.DeleteCurrent(); err != nil {
return err
}
}
- epbCursor, err := tx.RwCursor(kv.BorEventProcessedBlocks)
+ return err
+}
+
+func UnwindEventProcessedBlocks(tx kv.RwTx, unwindPoint uint64) error {
+ c, err := tx.RwCursor(kv.BorEventProcessedBlocks)
if err != nil {
return err
}
- defer epbCursor.Close()
- for k, _, err = epbCursor.Seek(blockNumBuf[:]); err == nil && k != nil; k, _, err = epbCursor.Next() {
- if err = epbCursor.DeleteCurrent(); err != nil {
+ defer c.Close()
+ var blockNumBuf [8]byte
+ binary.BigEndian.PutUint64(blockNumBuf[:], unwindPoint+1)
+ var k []byte
+ for k, _, err = c.Seek(blockNumBuf[:]); err == nil && k != nil; k, _, err = c.Next() {
+ if err = c.DeleteCurrent(); err != nil {
return err
}
}
+
return err
}
@@ -1284,6 +1393,11 @@ func (fc polygonSyncStageForkChoice) numNodes() int {
return len(fc.newNodes)
}
+type chainNode struct {
+ hash common.Hash
+ number uint64
+}
+
type polygonSyncStageExecutionEngine struct {
blockReader services.FullBlockReader
txActionStream chan<- polygonSyncStageTxAction
@@ -1318,7 +1432,7 @@ func (e *polygonSyncStageExecutionEngine) InsertBlocks(ctx context.Context, bloc
}
r, err := awaitTxAction(ctx, e.txActionStream, func(tx kv.RwTx, respond func(r response) error) error {
- return respond(response{err: e.insertBlocks(blocks, tx)})
+ return respond(response{err: e.insertBlocks(tx, blocks)})
})
if err != nil {
return err
@@ -1327,25 +1441,28 @@ func (e *polygonSyncStageExecutionEngine) InsertBlocks(ctx context.Context, bloc
return r.err
}
-func (e *polygonSyncStageExecutionEngine) insertBlocks(blocks []*types.Block, tx kv.RwTx) error {
+func (e *polygonSyncStageExecutionEngine) insertBlocks(tx kv.RwTx, blocks []*types.Block) error {
for _, block := range blocks {
height := block.NumberU64()
header := block.Header()
body := block.Body()
- metrics.UpdateBlockConsumerHeaderDownloadDelay(header.Time, height-1, e.logger)
- metrics.UpdateBlockConsumerBodyDownloadDelay(header.Time, height-1, e.logger)
+ e.logger.Trace(e.appendLogPrefix("inserting block"), "blockNum", height, "blockHash", header.Hash())
+
+ metrics.UpdateBlockConsumerHeaderDownloadDelay(header.Time, height, e.logger)
+ metrics.UpdateBlockConsumerBodyDownloadDelay(header.Time, height, e.logger)
var parentTd *big.Int
var err error
if height > 0 {
// Parent's total difficulty
- parentTd, err = rawdb.ReadTd(tx, header.ParentHash, height-1)
+ parentHeight := height - 1
+ parentTd, err = rawdb.ReadTd(tx, header.ParentHash, parentHeight)
if err != nil || parentTd == nil {
return fmt.Errorf(
"parent's total difficulty not found with hash %x and height %d: %v",
header.ParentHash,
- height-1,
+ parentHeight,
err,
)
}
@@ -1376,7 +1493,7 @@ func (e *polygonSyncStageExecutionEngine) UpdateForkChoice(ctx context.Context,
}
r, err := awaitTxAction(ctx, e.txActionStream, func(tx kv.RwTx, respond func(r response) error) error {
- err := e.updateForkChoice(tx, tip)
+ err := e.updateForkChoice(ctx, tx, tip)
if responseErr := respond(response{err: err}); responseErr != nil {
return responseErr
}
@@ -1392,17 +1509,18 @@ func (e *polygonSyncStageExecutionEngine) UpdateForkChoice(ctx context.Context,
return r.err
}
-func (e *polygonSyncStageExecutionEngine) updateForkChoice(tx kv.RwTx, tip *types.Header) error {
+func (e *polygonSyncStageExecutionEngine) updateForkChoice(ctx context.Context, tx kv.RwTx, tip *types.Header) error {
tipBlockNum := tip.Number.Uint64()
tipHash := tip.Hash()
- e.logger.Info(e.appendLogPrefix("update fork choice"), "block", tipBlockNum, "age", common.PrettyAge(time.Unix(int64(tip.Time), 0)), "hash", tipHash)
-
- logPrefix := e.stageState.LogPrefix()
- logTicker := time.NewTicker(logInterval)
- defer logTicker.Stop()
+ e.logger.Info(
+ e.appendLogPrefix("update fork choice"),
+ "block", tipBlockNum,
+ "age", common.PrettyAge(time.Unix(int64(tip.Time), 0)),
+ "hash", tipHash,
+ )
- newNodes, badNodes, err := fixCanonicalChain(logPrefix, logTicker, tipBlockNum, tipHash, tx, e.blockReader, e.logger)
+ newNodes, badNodes, err := e.connectTip(ctx, tx, tip)
if err != nil {
return err
}
@@ -1432,9 +1550,68 @@ func (e *polygonSyncStageExecutionEngine) updateForkChoice(tx kv.RwTx, tip *type
return e.updateForkChoiceForward(tx, newPolygonSyncStageForkChoice(newNodes))
}
+func (e *polygonSyncStageExecutionEngine) connectTip(
+ ctx context.Context,
+ tx kv.RwTx,
+ tip *types.Header,
+) (newNodes []chainNode, badNodes []chainNode, err error) {
+ blockNum := tip.Number.Uint64()
+ blockHash := tip.Hash()
+
+ e.logger.Debug(e.appendLogPrefix("connecting tip"), "blockNum", blockNum, "blockHash", blockHash)
+
+ if blockNum == 0 {
+ return nil, nil, nil
+ }
+
+ var emptyHash common.Hash
+ var ch common.Hash
+ for {
+ ch, _, err = e.blockReader.CanonicalHash(ctx, tx, blockNum)
+ if err != nil {
+ return nil, nil, fmt.Errorf("connectTip reading canonical hash for %d: %w", blockNum, err)
+ }
+ if ch == blockHash {
+ break
+ }
+
+ h, err := e.blockReader.Header(ctx, tx, blockHash, blockNum)
+ if err != nil {
+ return nil, nil, err
+ }
+ if h == nil {
+ return nil, nil, fmt.Errorf("connectTip header is nil. blockNum %d, blockHash %x", blockNum, blockHash)
+ }
+
+ newNodes = append(newNodes, chainNode{
+ hash: blockHash,
+ number: blockNum,
+ })
+
+ if ch != emptyHash {
+ badNodes = append(badNodes, chainNode{
+ hash: ch,
+ number: blockNum,
+ })
+ }
+
+ blockHash = h.ParentHash
+ blockNum--
+ }
+
+ return newNodes, badNodes, nil
+}
+
func (e *polygonSyncStageExecutionEngine) updateForkChoiceForward(tx kv.RwTx, fc *polygonSyncStageForkChoice) error {
tipBlockNum := fc.tipBlockNum()
+ for i := fc.numNodes() - 1; i >= 0; i-- {
+ newNode := fc.newNodes[i]
+ if err := rawdb.WriteCanonicalHash(tx, newNode.hash, newNode.number); err != nil {
+ return err
+ }
+ }
+
if err := rawdb.AppendCanonicalTxNums(tx, fc.oldestNewAncestorBlockNum()); err != nil {
return err
}
diff --git a/eth/stagedsync/stage_snapshots.go b/eth/stagedsync/stage_snapshots.go
index e641540d953..80da4384dc9 100644
--- a/eth/stagedsync/stage_snapshots.go
+++ b/eth/stagedsync/stage_snapshots.go
@@ -462,10 +462,13 @@ func FillDBFromSnapshots(logPrefix string, ctx context.Context, tx kv.RwTx, dirs
if err := h2n.Load(tx, kv.HeaderNumber, etl.IdentityLoadFunc, etl.TransformArgs{}); err != nil {
return err
}
- canonicalHash, err := blockReader.CanonicalHash(ctx, tx, blocksAvailable)
+ canonicalHash, ok, err := blockReader.CanonicalHash(ctx, tx, blocksAvailable)
if err != nil {
return err
}
+ if !ok {
+ return fmt.Errorf("canonical marker not found: %d", blocksAvailable)
+ }
if err = rawdb.WriteHeadHeaderHash(tx, canonicalHash); err != nil {
return err
}
@@ -537,12 +540,6 @@ func FillDBFromSnapshots(logPrefix string, ctx context.Context, tx kv.RwTx, dirs
return err
}
}
- ac := agg.BeginFilesRo()
- defer ac.Close()
- if err := rawdb.WriteSnapshots(tx, blockReader.FrozenFiles(), ac.Files()); err != nil {
- return err
- }
- ac.Close()
default:
diagnostics.Send(diagnostics.SnapshotFillDBStageUpdate{
@@ -569,6 +566,7 @@ func pruneCanonicalMarkers(ctx context.Context, tx kv.RwTx, blockReader services
return err
}
defer c.Close()
+ var tdKey [40]byte
for k, v, err := c.First(); k != nil && err == nil; k, v, err = c.Next() {
blockNum := binary.BigEndian.Uint64(k)
if blockNum == 0 { // Do not prune genesis marker
@@ -580,6 +578,13 @@ func pruneCanonicalMarkers(ctx context.Context, tx kv.RwTx, blockReader services
if err := tx.Delete(kv.HeaderNumber, v); err != nil {
return err
}
+ if dbg.PruneTotalDifficulty() {
+ copy(tdKey[:], k)
+ copy(tdKey[8:], v)
+ if err := tx.Delete(kv.HeaderTD, tdKey[:]); err != nil {
+ return err
+ }
+ }
if err := c.DeleteCurrent(); err != nil {
return err
}
@@ -601,17 +606,6 @@ func SnapshotsPrune(s *PruneState, cfg SnapshotsCfg, ctx context.Context, tx kv.
}
freezingCfg := cfg.blockReader.FreezingCfg()
- if cfg.blockRetire.HasNewFrozenFiles() || cfg.agg.HasNewFrozenFiles() {
- ac := cfg.agg.BeginFilesRo()
- defer ac.Close()
- aggFiles := ac.Files()
- ac.Close()
-
- if err := rawdb.WriteSnapshots(tx, cfg.blockReader.FrozenFiles(), aggFiles); err != nil {
- return err
- }
- }
-
if freezingCfg.ProduceE2 {
//TODO: initialSync maybe save files progress here
@@ -706,7 +700,7 @@ func pruneBlockSnapshots(ctx context.Context, cfg SnapshotsCfg, logger log.Logge
return false, err
}
defer tx.Rollback()
- // Prune snapshots if necessary (remove .segs or idx files appropriatelly)
+ // Prune snapshots if necessary (remove .segs or idx files appropriately)
headNumber := cfg.blockReader.FrozenBlocks()
executionProgress, err := stages.GetStageProgress(tx, stages.Execution)
if err != nil {
diff --git a/eth/tracers/js/tracer_test.go b/eth/tracers/js/tracer_test.go
index 8205aa74492..89ca5461b11 100644
--- a/eth/tracers/js/tracer_test.go
+++ b/eth/tracers/js/tracer_test.go
@@ -69,7 +69,7 @@ func testCtx() *vmContext {
}
func runTrace(tracer tracers.Tracer, vmctx *vmContext, chaincfg *chain.Config, contractCode []byte) (json.RawMessage, error) {
- c := vm.NewJumpDestCache(false)
+ c := vm.NewJumpDestCache()
var (
env = vm.NewEVM(vmctx.blockCtx, vmctx.txCtx, &dummyStatedb{}, chaincfg, vm.Config{Debug: true, Tracer: tracer})
gasLimit uint64 = 31000
@@ -185,7 +185,7 @@ func TestHalt(t *testing.T) {
}
func TestHaltBetweenSteps(t *testing.T) {
- c := vm.NewJumpDestCache(false)
+ c := vm.NewJumpDestCache()
tracer, err := newJsTracer("{step: function() {}, fault: function() {}, result: function() { return null; }}", nil, nil)
if err != nil {
t.Fatal(err)
@@ -270,7 +270,7 @@ func TestIsPrecompile(t *testing.T) {
}
func TestEnterExit(t *testing.T) {
- c := vm.NewJumpDestCache(false)
+ c := vm.NewJumpDestCache()
// test that either both or none of enter() and exit() are defined
if _, err := newJsTracer("{step: function() {}, fault: function() {}, result: function() { return null; }, enter: function() {}}", new(tracers.Context), nil); err == nil {
t.Fatal("tracer creation should've failed without exit() definition")
diff --git a/eth/tracers/logger/logger_test.go b/eth/tracers/logger/logger_test.go
index c991b17c67d..903323e6c6a 100644
--- a/eth/tracers/logger/logger_test.go
+++ b/eth/tracers/logger/logger_test.go
@@ -58,7 +58,7 @@ type dummyStatedb struct {
func (*dummyStatedb) GetRefund() uint64 { return 1337 }
func TestStoreCapture(t *testing.T) {
- c := vm.NewJumpDestCache(false)
+ c := vm.NewJumpDestCache()
var (
env = vm.NewEVM(evmtypes.BlockContext{}, evmtypes.TxContext{}, &dummyStatedb{}, params.TestChainConfig, vm.Config{})
logger = NewStructLogger(nil)
diff --git a/ethdb/privateapi/all.go b/ethdb/privateapi/all.go
index f8091fb1769..06b74f07726 100644
--- a/ethdb/privateapi/all.go
+++ b/ethdb/privateapi/all.go
@@ -22,20 +22,22 @@ import (
"github.com/erigontech/erigon-lib/gointerfaces/grpcutil"
remote "github.com/erigontech/erigon-lib/gointerfaces/remoteproto"
+ "github.com/erigontech/erigon/polygon/bridge"
+ "github.com/erigontech/erigon/polygon/heimdall"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials"
"google.golang.org/grpc/health"
"google.golang.org/grpc/health/grpc_health_v1"
- txpool_proto "github.com/erigontech/erigon-lib/gointerfaces/txpoolproto"
+ "github.com/erigontech/erigon-lib/gointerfaces/txpoolproto"
"github.com/erigontech/erigon-lib/kv/remotedbserver"
"github.com/erigontech/erigon-lib/log/v3"
)
-func StartGrpc(kv *remotedbserver.KvServer, ethBackendSrv *EthBackendServer, txPoolServer txpool_proto.TxpoolServer,
- miningServer txpool_proto.MiningServer, addr string, rateLimit uint32, creds credentials.TransportCredentials,
- healthCheck bool, logger log.Logger) (*grpc.Server, error) {
+func StartGrpc(kv *remotedbserver.KvServer, ethBackendSrv *EthBackendServer, txPoolServer txpoolproto.TxpoolServer,
+ miningServer txpoolproto.MiningServer, bridgeServer *bridge.BackendServer, heimdallServer *heimdall.BackendServer,
+ addr string, rateLimit uint32, creds credentials.TransportCredentials, healthCheck bool, logger log.Logger) (*grpc.Server, error) {
logger.Info("Starting private RPC server", "on", addr)
lis, err := net.Listen("tcp", addr)
if err != nil {
@@ -45,10 +47,16 @@ func StartGrpc(kv *remotedbserver.KvServer, ethBackendSrv *EthBackendServer, txP
grpcServer := grpcutil.NewServer(rateLimit, creds)
remote.RegisterETHBACKENDServer(grpcServer, ethBackendSrv)
if txPoolServer != nil {
- txpool_proto.RegisterTxpoolServer(grpcServer, txPoolServer)
+ txpoolproto.RegisterTxpoolServer(grpcServer, txPoolServer)
}
if miningServer != nil {
- txpool_proto.RegisterMiningServer(grpcServer, miningServer)
+ txpoolproto.RegisterMiningServer(grpcServer, miningServer)
+ }
+ if bridgeServer != nil {
+ remote.RegisterBridgeBackendServer(grpcServer, bridgeServer)
+ }
+ if heimdallServer != nil {
+ remote.RegisterHeimdallBackendServer(grpcServer, heimdallServer)
}
remote.RegisterKVServer(grpcServer, kv)
diff --git a/ethdb/privateapi/ethbackend.go b/ethdb/privateapi/ethbackend.go
index 8b8a0e5ab67..3aaf0c56893 100644
--- a/ethdb/privateapi/ethbackend.go
+++ b/ethdb/privateapi/ethbackend.go
@@ -23,14 +23,13 @@ import (
"google.golang.org/protobuf/types/known/emptypb"
- "github.com/erigontech/erigon-lib/log/v3"
-
libcommon "github.com/erigontech/erigon-lib/common"
"github.com/erigontech/erigon-lib/direct"
"github.com/erigontech/erigon-lib/gointerfaces"
remote "github.com/erigontech/erigon-lib/gointerfaces/remoteproto"
types2 "github.com/erigontech/erigon-lib/gointerfaces/typesproto"
"github.com/erigontech/erigon-lib/kv"
+ "github.com/erigontech/erigon-lib/log/v3"
"github.com/erigontech/erigon/common"
"github.com/erigontech/erigon/params"
@@ -76,7 +75,12 @@ type EthBackend interface {
func NewEthBackendServer(ctx context.Context, eth EthBackend, db kv.RwDB, events *shards.Events, blockReader services.FullBlockReader,
logger log.Logger, latestBlockBuiltStore *builder.LatestBlockBuiltStore,
) *EthBackendServer {
- s := &EthBackendServer{ctx: ctx, eth: eth, events: events, db: db, blockReader: blockReader,
+ s := &EthBackendServer{
+ ctx: ctx,
+ eth: eth,
+ events: events,
+ db: db,
+ blockReader: blockReader,
logsFilter: NewLogsFilterAggregator(events),
logger: logger,
latestBlockBuiltStore: latestBlockBuiltStore,
@@ -280,10 +284,13 @@ func (s *EthBackendServer) CanonicalHash(ctx context.Context, req *remote.Canoni
}
defer tx.Rollback()
- hash, err := s.blockReader.CanonicalHash(ctx, tx, req.BlockNumber)
+ hash, ok, err := s.blockReader.CanonicalHash(ctx, tx, req.BlockNumber)
if err != nil {
return nil, err
}
+ if !ok {
+ return nil, nil
+ }
return &remote.CanonicalHashReply{Hash: gointerfaces.ConvertHashToH256(hash)}, nil
}
@@ -358,8 +365,8 @@ func (s *EthBackendServer) BorEvents(ctx context.Context, req *remote.BorEventsR
}
eventsRaw := make([][]byte, len(events))
- for i, e := range events {
- eventsRaw[i] = e
+ for i, event := range events {
+ eventsRaw[i] = event
}
return &remote.BorEventsReply{
diff --git a/go.mod b/go.mod
index fe16d607dbb..7fbe1064417 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
module github.com/erigontech/erigon
-go 1.21.5
+go 1.22.0
require (
github.com/erigontech/erigonwatch v0.0.0-20240718131902-b6576bde1116
@@ -38,7 +38,6 @@ require (
github.com/edsrzf/mmap-go v1.1.0
github.com/emicklei/dot v1.6.2
github.com/erigontech/erigon-lib v0.0.0-00010101000000-000000000000
- github.com/ethereum/go-ethereum v1.13.5
github.com/fjl/gencodec v0.0.0-20230517082657-f9840df7b83e
github.com/gballet/go-verkle v0.0.0-20230607174250-df487255f46b
github.com/go-chi/chi/v5 v5.1.0
@@ -49,7 +48,7 @@ require (
github.com/gofrs/flock v0.12.1
github.com/golang-jwt/jwt/v4 v4.5.0
github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb
- github.com/google/btree v1.1.2
+ github.com/google/btree v1.1.3
github.com/google/cel-go v0.18.2
github.com/google/gofuzz v1.2.0
github.com/gorilla/websocket v1.5.3
@@ -63,26 +62,26 @@ require (
github.com/jedib0t/go-pretty/v6 v6.5.9
github.com/json-iterator/go v1.1.12
github.com/julienschmidt/httprouter v1.3.0
- github.com/klauspost/compress v1.17.8
- github.com/libp2p/go-libp2p v0.34.0
+ github.com/klauspost/compress v1.17.9
+ github.com/libp2p/go-libp2p v0.35.2
github.com/libp2p/go-libp2p-mplex v0.9.0
github.com/libp2p/go-libp2p-pubsub v0.11.0
github.com/maticnetwork/crand v1.0.2
github.com/multiformats/go-multiaddr v0.12.4
github.com/nxadm/tail v1.4.11
github.com/pelletier/go-toml v1.9.5
- github.com/pelletier/go-toml/v2 v2.2.2
+ github.com/pelletier/go-toml/v2 v2.2.3
github.com/pion/randutil v0.1.0
github.com/pion/stun v0.6.1
github.com/pkg/errors v0.9.1
github.com/protolambda/ztyp v0.2.2
github.com/prysmaticlabs/go-bitfield v0.0.0-20240328144219-a1caa50c3a1e
- github.com/prysmaticlabs/gohashtree v0.0.4-beta
- github.com/prysmaticlabs/prysm/v5 v5.0.3
+ github.com/prysmaticlabs/gohashtree v0.0.4-beta.0.20240624100937-73632381301b
+ github.com/prysmaticlabs/prysm/v5 v5.1.0
github.com/quasilyte/go-ruleguard/dsl v0.3.22
- github.com/rs/cors v1.11.0
+ github.com/rs/cors v1.11.1
github.com/spf13/afero v1.10.0
- github.com/spf13/cobra v1.8.0
+ github.com/spf13/cobra v1.8.1
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.9.0
github.com/tendermint/go-amino v0.16.0
@@ -90,7 +89,7 @@ require (
github.com/thomaso-mirodin/intmath v0.0.0-20160323211736-5dc6d854e46e
github.com/tidwall/btree v1.6.0
github.com/ugorji/go/codec v1.2.12
- github.com/urfave/cli/v2 v2.27.3
+ github.com/urfave/cli/v2 v2.27.4
github.com/valyala/fastjson v1.6.4
github.com/vektah/gqlparser/v2 v2.5.16
github.com/willf/bitset v1.1.10
@@ -101,7 +100,7 @@ require (
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842
golang.org/x/net v0.28.0
golang.org/x/sync v0.8.0
- golang.org/x/sys v0.23.0
+ golang.org/x/sys v0.24.0
golang.org/x/time v0.6.0
google.golang.org/grpc v1.65.0
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.4.0
@@ -120,6 +119,7 @@ require (
github.com/d4l3k/messagediff v1.2.1 // indirect
github.com/elastic/go-freelru v0.13.0 // indirect
github.com/erigontech/speedtest v0.0.2 // indirect
+ github.com/ethereum/go-ethereum v1.13.5 // indirect
github.com/go-kit/kit v0.12.0 // indirect
github.com/go-kit/log v0.2.1 // indirect
github.com/go-logfmt/logfmt v0.5.1 // indirect
@@ -133,8 +133,10 @@ require (
github.com/herumi/bls-eth-go-binary v1.36.1 // indirect
github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0 // indirect
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
+ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
+ github.com/nyaosorg/go-windows-shortcut v0.0.0-20220529122037-8b0c89bca4c4 // indirect
github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect
- github.com/prysmaticlabs/fastssz v0.0.0-20221107182844-78142813af44 // indirect
+ github.com/prysmaticlabs/fastssz v0.0.0-20240620202422-a981b8ef89d3 // indirect
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
github.com/sasha-s/go-deadlock v0.3.1 // indirect
github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c // indirect
@@ -254,7 +256,7 @@ require (
github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect
github.com/pion/datachannel v1.5.6 // indirect
github.com/pion/dtls/v2 v2.2.11 // indirect
- github.com/pion/ice/v2 v2.3.24 // indirect
+ github.com/pion/ice/v2 v2.3.25 // indirect
github.com/pion/interceptor v0.1.29 // indirect
github.com/pion/logging v0.2.2 // indirect
github.com/pion/mdns v0.0.12 // indirect
@@ -268,10 +270,10 @@ require (
github.com/pion/webrtc/v3 v3.2.40 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
- github.com/prometheus/client_golang v1.19.1
+ github.com/prometheus/client_golang v1.20.2
github.com/prometheus/client_model v0.6.1 // indirect
- github.com/prometheus/common v0.48.0 // indirect
- github.com/prometheus/procfs v0.12.0 // indirect
+ github.com/prometheus/common v0.55.0 // indirect
+ github.com/prometheus/procfs v0.15.1 // indirect
github.com/quic-go/qpack v0.4.0 // indirect
github.com/quic-go/quic-go v0.44.0 // indirect
github.com/quic-go/webtransport-go v0.8.0 // indirect
@@ -281,7 +283,7 @@ require (
github.com/rogpeppe/go-internal v1.12.0 // indirect
github.com/rs/dnscache v0.0.0-20211102005908-e0241e321417 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
- github.com/shirou/gopsutil/v4 v4.24.7 // indirect
+ github.com/shirou/gopsutil/v4 v4.24.8 // indirect
github.com/shoenig/go-m1cpu v0.1.6 // indirect
github.com/shopspring/decimal v1.2.0 // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
@@ -295,7 +297,7 @@ require (
go.opentelemetry.io/otel v1.21.0 // indirect
go.opentelemetry.io/otel/trace v1.21.0 // indirect
go.uber.org/dig v1.17.1 // indirect
- go.uber.org/fx v1.21.1 // indirect
+ go.uber.org/fx v1.22.1 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/mod v0.20.0 // indirect
golang.org/x/text v0.17.0 // indirect
diff --git a/go.sum b/go.sum
index 58ed2e2a302..d190920fe34 100644
--- a/go.sum
+++ b/go.sum
@@ -240,7 +240,6 @@ github.com/cosmos/gogoproto v1.4.1 h1:WoyH+0/jbCTzpKNvyav5FL1ZTWsp1im1MxEpJEzKUB
github.com/cosmos/gogoproto v1.4.1/go.mod h1:Ac9lzL4vFpBMcptJROQ6dQ4M3pOEK5Z/l0Q9p+LoCr4=
github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
-github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
github.com/cpuguy83/go-md2man/v2 v2.0.4 h1:wfIWP927BUkWJb2NmU/kNDYIBTh/ziUX91+lVfRxZq4=
github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
github.com/crate-crypto/go-ipa v0.0.0-20230601170251-1830d0757c80 h1:DuBDHVjgGMPki7bAyh91+3cF1Vh34sAEdH8JQgbc2R0=
@@ -447,8 +446,8 @@ github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb/go.mod h1:/XxbfmMg
github.com/google/btree v0.0.0-20180124185431-e89373fe6b4a/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
-github.com/google/btree v1.1.2 h1:xf4v41cLI2Z6FxbKm+8Bu+m8ifhj15JuZ9sa0jZCMUU=
-github.com/google/btree v1.1.2/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4=
+github.com/google/btree v1.1.3 h1:CVpQJjYgC4VbzxeGVHfvZrv1ctoYCAI8vbl07Fcxlyg=
+github.com/google/btree v1.1.3/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4=
github.com/google/cel-go v0.18.2 h1:L0B6sNBSVmt0OyECi8v6VOS74KOc9W/tLiWKfZABvf4=
github.com/google/cel-go v0.18.2/go.mod h1:kWcIzTsPX0zmQ+H3TirHstLLf9ep5QTsZBN9u4dOYLg=
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
@@ -589,8 +588,8 @@ github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8
github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-github.com/klauspost/compress v1.17.8 h1:YcnTYrq7MikUT7k0Yb5eceMmALQPYBW/Xltxn0NAMnU=
-github.com/klauspost/compress v1.17.8/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
+github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA=
+github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
github.com/klauspost/cpuid/v2 v2.2.7 h1:ZWSB3igEs+d0qvnxR/ZBzXVmxkgt8DdzP6m9pfuVLDM=
github.com/klauspost/cpuid/v2 v2.2.7/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
@@ -619,8 +618,8 @@ github.com/libp2p/go-buffer-pool v0.1.0 h1:oK4mSFcQz7cTQIfqbe4MIj9gLW+mnanjyFtc6
github.com/libp2p/go-buffer-pool v0.1.0/go.mod h1:N+vh8gMqimBzdKkSMVuydVDq+UV5QTWy5HSiZacSbPg=
github.com/libp2p/go-flow-metrics v0.1.0 h1:0iPhMI8PskQwzh57jB9WxIuIOQ0r+15PChFGkx3Q3WM=
github.com/libp2p/go-flow-metrics v0.1.0/go.mod h1:4Xi8MX8wj5aWNDAZttg6UPmc0ZrnFNsMtpsYUClFtro=
-github.com/libp2p/go-libp2p v0.34.0 h1:J+SL3DMz+zPz06OHSRt42GKA5n5hmwgY1l7ckLUz3+c=
-github.com/libp2p/go-libp2p v0.34.0/go.mod h1:snyJQix4ET6Tj+LeI0VPjjxTtdWpeOhYt5lEY0KirkQ=
+github.com/libp2p/go-libp2p v0.35.2 h1:287oHbuplkrLdAF+syB0n/qDgd50AUBtEODqS0e0HDs=
+github.com/libp2p/go-libp2p v0.35.2/go.mod h1:RKCDNt30IkFipGL0tl8wQW/3zVWEGFUZo8g2gAKxwjU=
github.com/libp2p/go-libp2p-asn-util v0.4.1 h1:xqL7++IKD9TBFMgnLPZR6/6iYhawHKHl950SO9L6n94=
github.com/libp2p/go-libp2p-asn-util v0.4.1/go.mod h1:d/NI6XZ9qxw67b4e+NgpQexCIiFYJjErASrYW4PFDN8=
github.com/libp2p/go-libp2p-mplex v0.9.0 h1:R58pDRAmuBXkYugbSSXR9wrTX3+1pFM1xP2bLuodIq8=
@@ -727,6 +726,8 @@ github.com/multiformats/go-multistream v0.5.0/go.mod h1:n6tMZiwiP2wUsR8DgfDWw1dy
github.com/multiformats/go-varint v0.0.1/go.mod h1:3Ls8CIEsrijN6+B7PbrXRPxHRPuXSrVKRY101jdMZYE=
github.com/multiformats/go-varint v0.0.7 h1:sWSGR+f/eu5ABZA2ZpYKBILXTTs9JWpdEM/nEGOHFS8=
github.com/multiformats/go-varint v0.0.7/go.mod h1:r8PUYw/fD/SjBCiKOoDlGF6QawOELpZAu9eioSos/OU=
+github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
+github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
github.com/ncruces/go-strftime v0.1.9 h1:bY0MQC28UADQmHmaF5dgpLmImcShSi2kHU9XLdhx/f4=
github.com/ncruces/go-strftime v0.1.9/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls=
@@ -736,6 +737,8 @@ github.com/node-real/bsc-erigon-snapshot v1.0.1-0.20240918033952-5d7a08bccf89 h1
github.com/node-real/bsc-erigon-snapshot v1.0.1-0.20240918033952-5d7a08bccf89/go.mod h1:ooHlCl+eEYzebiPu+FP6Q6SpPUeMADn8Jxabv3IKb9M=
github.com/nxadm/tail v1.4.11 h1:8feyoE3OzPrcshW5/MJ4sGESc5cqmGkGCWlco4l0bqY=
github.com/nxadm/tail v1.4.11/go.mod h1:OTaG3NK980DZzxbRq6lEuzgU+mug70nY11sMd4JXXHc=
+github.com/nyaosorg/go-windows-shortcut v0.0.0-20220529122037-8b0c89bca4c4 h1:+3bXHpIl3RiBuPKlqeCZZeShGHC9RFhR/P2OJfOLRyA=
+github.com/nyaosorg/go-windows-shortcut v0.0.0-20220529122037-8b0c89bca4c4/go.mod h1:9YR30vCq/4djj0WO7AvLm48YvNs7M094LWRieEFDE4A=
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
@@ -755,8 +758,8 @@ github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 h1:onHthvaw9LFnH4t2D
github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58/go.mod h1:DXv8WO4yhMYhSNPKjeNKa5WY9YCIEBRbNzFFPJbWO6Y=
github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=
github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
-github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM=
-github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs=
+github.com/pelletier/go-toml/v2 v2.2.3 h1:YmeHyLY8mFWbdkNWwpr+qIL2bEqT0o95WSdkNHvL12M=
+github.com/pelletier/go-toml/v2 v2.2.3/go.mod h1:MfCQTFTvCcUyyvvwm1+G6H/jORL20Xlb6rzQu9GuUkc=
github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 h1:q2e307iGHPdTGp0hoxKjt1H5pDo6utceo3dQVK3I5XQ=
github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5/go.mod h1:jvVRKCrJTQWu0XVbaOlby/2lO20uSCHEMzzplHXte1o=
github.com/philhofer/fwd v1.0.0/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU=
@@ -766,8 +769,8 @@ github.com/pion/datachannel v1.5.6/go.mod h1:1eKT6Q85pRnr2mHiWHxJwO50SfZRtWHTsNI
github.com/pion/dtls/v2 v2.2.7/go.mod h1:8WiMkebSHFD0T+dIU+UeBaoV7kDhOW5oDCzZ7WZ/F9s=
github.com/pion/dtls/v2 v2.2.11 h1:9U/dpCYl1ySttROPWJgqWKEylUdT0fXp/xst6JwY5Ks=
github.com/pion/dtls/v2 v2.2.11/go.mod h1:d9SYc9fch0CqK90mRk1dC7AkzzpwJj6u2GU3u+9pqFE=
-github.com/pion/ice/v2 v2.3.24 h1:RYgzhH/u5lH0XO+ABatVKCtRd+4U1GEaCXSMjNr13tI=
-github.com/pion/ice/v2 v2.3.24/go.mod h1:KXJJcZK7E8WzrBEYnV4UtqEZsGeWfHxsNqhVcVvgjxw=
+github.com/pion/ice/v2 v2.3.25 h1:M5rJA07dqhi3nobJIg+uPtcVjFECTrhcR3n0ns8kDZs=
+github.com/pion/ice/v2 v2.3.25/go.mod h1:KXJJcZK7E8WzrBEYnV4UtqEZsGeWfHxsNqhVcVvgjxw=
github.com/pion/interceptor v0.1.29 h1:39fsnlP1U8gw2JzOFWdfCU82vHvhW9o0rZnZF56wF+M=
github.com/pion/interceptor v0.1.29/go.mod h1:ri+LGNjRUc5xUNtDEPzfdkmSqISixVTBF/z/Zms/6T4=
github.com/pion/logging v0.2.2 h1:M9+AIj/+pxNsDfAT64+MAVgJO0rsyLnoJKCqf//DoeY=
@@ -821,8 +824,8 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP
github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs=
github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
github.com/prometheus/client_golang v1.5.1/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU=
-github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE=
-github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho=
+github.com/prometheus/client_golang v1.20.2 h1:5ctymQzZlyOON1666svgwn3s6IKWgfbjsejTMiXIyjg=
+github.com/prometheus/client_golang v1.20.2/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE=
github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
@@ -834,28 +837,28 @@ github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e/go.mod h1:daVV7q
github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4=
-github.com/prometheus/common v0.48.0 h1:QO8U2CdOzSn1BBsmXJXduaaW+dY/5QLjfB8svtSzKKE=
-github.com/prometheus/common v0.48.0/go.mod h1:0/KsvlIEfPQCQ5I2iNSAWKPZziNCvRs5EC6ILDTlAPc=
+github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc=
+github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8=
github.com/prometheus/procfs v0.0.0-20180725123919-05ee40e3a273/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
github.com/prometheus/procfs v0.0.11/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
-github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo=
-github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo=
+github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
+github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
github.com/protolambda/ztyp v0.2.2 h1:rVcL3vBu9W/aV646zF6caLS/dyn9BN8NYiuJzicLNyY=
github.com/protolambda/ztyp v0.2.2/go.mod h1:9bYgKGqg3wJqT9ac1gI2hnVb0STQq7p/1lapqrqY1dU=
-github.com/prysmaticlabs/fastssz v0.0.0-20221107182844-78142813af44 h1:c3p3UzV4vFA7xaCDphnDWOjpxcadrQ26l5b+ypsvyxo=
-github.com/prysmaticlabs/fastssz v0.0.0-20221107182844-78142813af44/go.mod h1:MA5zShstUwCQaE9faGHgCGvEWUbG87p4SAXINhmCkvg=
+github.com/prysmaticlabs/fastssz v0.0.0-20240620202422-a981b8ef89d3 h1:0LZAwwHnsZFfXm4IK4rzFV4N5IVSKZKLmuBMA4kAlFk=
+github.com/prysmaticlabs/fastssz v0.0.0-20240620202422-a981b8ef89d3/go.mod h1:h2OlIZD/M6wFvV3YMZbW16lFgh3Rsye00G44J2cwLyU=
github.com/prysmaticlabs/go-bitfield v0.0.0-20240328144219-a1caa50c3a1e h1:ATgOe+abbzfx9kCPeXIW4fiWyDdxlwHw07j8UGhdTd4=
github.com/prysmaticlabs/go-bitfield v0.0.0-20240328144219-a1caa50c3a1e/go.mod h1:wmuf/mdK4VMD+jA9ThwcUKjg3a2XWM9cVfFYjDyY4j4=
-github.com/prysmaticlabs/gohashtree v0.0.4-beta h1:H/EbCuXPeTV3lpKeXGPpEV9gsUpkqOOVnWapUyeWro4=
-github.com/prysmaticlabs/gohashtree v0.0.4-beta/go.mod h1:BFdtALS+Ffhg3lGQIHv9HDWuHS8cTvHZzrHWxwOtGOs=
+github.com/prysmaticlabs/gohashtree v0.0.4-beta.0.20240624100937-73632381301b h1:VK7thFOnhxAZ/5aolr5Os4beiubuD08WiuiHyRqgwks=
+github.com/prysmaticlabs/gohashtree v0.0.4-beta.0.20240624100937-73632381301b/go.mod h1:HRuvtXLZ4WkaB1MItToVH2e8ZwKwZPY5/Rcby+CvvLY=
github.com/prysmaticlabs/protoc-gen-go-cast v0.0.0-20230228205207-28762a7b9294 h1:q9wE0ZZRdTUAAeyFP/w0SwBEnCqlVy2+on6X2/e+eAU=
github.com/prysmaticlabs/protoc-gen-go-cast v0.0.0-20230228205207-28762a7b9294/go.mod h1:ZVEbRdnMkGhp/pu35zq4SXxtvUwWK0J1MATtekZpH2Y=
-github.com/prysmaticlabs/prysm/v5 v5.0.3 h1:hUi0gu6v7aXmMQkl2GbrLoWcMhDNIbkVxRwrZchKbxU=
-github.com/prysmaticlabs/prysm/v5 v5.0.3/go.mod h1:v5Oz4A4cWljfxUmW7SDk/VBzoYnei+lzwJogvSqUZVs=
+github.com/prysmaticlabs/prysm/v5 v5.1.0 h1:TY9A6tm0v7bI1z9YH+xkDh7XH7qm4ZK8sTeyckxbj4A=
+github.com/prysmaticlabs/prysm/v5 v5.1.0/go.mod h1:SWb5kE/FhtQrLS2yt+IDj+leB7IhXrcOv6lhDnU1nBY=
github.com/quasilyte/go-ruleguard/dsl v0.3.22 h1:wd8zkOhSNr+I+8Qeciml08ivDt1pSXe60+5DqOpCjPE=
github.com/quasilyte/go-ruleguard/dsl v0.3.22/go.mod h1:KeCP03KrjuSO0H1kTuZQCWlQPulDV6YMIXmpQss17rU=
github.com/quic-go/qpack v0.4.0 h1:Cr9BXA1sQS2SmDUWjSofMPNKmvF6IiIfDRmgU0w1ZCo=
@@ -880,8 +883,8 @@ github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6po
github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
-github.com/rs/cors v1.11.0 h1:0B9GE/r9Bc2UxRMMtymBkHTenPkHDv0CW4Y98GBY+po=
-github.com/rs/cors v1.11.0/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU=
+github.com/rs/cors v1.11.1 h1:eU3gRzXLRK57F5rKMGMZURNdIG4EoAmX8k94r9wXWHA=
+github.com/rs/cors v1.11.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU=
github.com/rs/dnscache v0.0.0-20211102005908-e0241e321417 h1:Lt9DzQALzHoDwMBGJ6v8ObDPR0dzr2a6sXTB1Fq7IHs=
github.com/rs/dnscache v0.0.0-20211102005908-e0241e321417/go.mod h1:qe5TWALJ8/a1Lqznoc5BDHpYX/8HU60Hm2AwRmqzxqA=
github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
@@ -895,8 +898,8 @@ github.com/sasha-s/go-deadlock v0.3.1/go.mod h1:F73l+cr82YSh10GxyRI6qZiCgK64VaZj
github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
github.com/sergi/go-diff v1.3.1 h1:xkr+Oxo4BOQKmkn/B9eMK0g5Kg/983T9DqqPHwYqD+8=
github.com/sergi/go-diff v1.3.1/go.mod h1:aMJSSKb2lpPvRNec0+w3fl7LP9IOFzdc9Pa4NFbPK1I=
-github.com/shirou/gopsutil/v4 v4.24.7 h1:V9UGTK4gQ8HvcnPKf6Zt3XHyQq/peaekfxpJ2HSocJk=
-github.com/shirou/gopsutil/v4 v4.24.7/go.mod h1:0uW/073rP7FYLOkvxolUQM5rMOLTNmRXnFKafpb71rw=
+github.com/shirou/gopsutil/v4 v4.24.8 h1:pVQjIenQkIhqO81mwTaXjTzOMT7d3TZkf43PlVFHENI=
+github.com/shirou/gopsutil/v4 v4.24.8/go.mod h1:wE0OrJtj4dG+hYkxqDH3QiBICdKSf04/npcvLLc/oRg=
github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM=
github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ=
github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU=
@@ -947,8 +950,8 @@ github.com/spf13/afero v1.10.0/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb
github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w=
github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU=
-github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0=
-github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho=
+github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM=
+github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y=
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
github.com/stoewer/go-strcase v1.2.0 h1:Z2iHWqGXH00XYgqDmNgQbIBxf3wrNq0F3feEy0ainaU=
@@ -994,8 +997,8 @@ github.com/tklauser/numcpus v0.8.0/go.mod h1:ZJZlAY+dmR4eut8epnzf0u/VwodKmryxR8t
github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE=
github.com/ugorji/go/codec v1.2.12/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
github.com/urfave/cli v1.22.2/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
-github.com/urfave/cli/v2 v2.27.3 h1:/POWahRmdh7uztQ3CYnaDddk0Rm90PyOgIxgW2rr41M=
-github.com/urfave/cli/v2 v2.27.3/go.mod h1:m4QzxcD2qpra4z7WhzEGn74WZLViBnMpb1ToCAKdGRQ=
+github.com/urfave/cli/v2 v2.27.4 h1:o1owoI+02Eb+K107p27wEX9Bb8eqIoZCfLXloLUSWJ8=
+github.com/urfave/cli/v2 v2.27.4/go.mod h1:m4QzxcD2qpra4z7WhzEGn74WZLViBnMpb1ToCAKdGRQ=
github.com/valyala/fastjson v1.6.4 h1:uAUNq9Z6ymTgGhcm0UynUAB6tlbakBrz6CQFax3BXVQ=
github.com/valyala/fastjson v1.6.4/go.mod h1:CLCAqky6SMuOcxStkYQvblddUtoRxhYMGLrsQns1aXY=
github.com/vektah/gqlparser/v2 v2.5.16 h1:1gcmLTvs3JLKXckwCwlUagVn/IlV2bwqle0vJ0vy5p8=
@@ -1037,8 +1040,8 @@ go.opentelemetry.io/otel/trace v1.21.0/go.mod h1:LGbsEB0f9LGjN+OZaQQ26sohbOmiMR+
go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
go.uber.org/dig v1.17.1 h1:Tga8Lz8PcYNsWsyHMZ1Vm0OQOUaJNDyvPImgbAu9YSc=
go.uber.org/dig v1.17.1/go.mod h1:Us0rSJiThwCv2GteUN0Q7OKvU7n5J4dxZ9JKUXozFdE=
-go.uber.org/fx v1.21.1 h1:RqBh3cYdzZS0uqwVeEjOX2p73dddLpym315myy/Bpb0=
-go.uber.org/fx v1.21.1/go.mod h1:HT2M7d7RHo+ebKGh9NRcrsrHHfpZ60nW3QRubMRfv48=
+go.uber.org/fx v1.22.1 h1:nvvln7mwyT5s1q201YE29V/BFrGor6vMiDNpU/78Mys=
+go.uber.org/fx v1.22.1/go.mod h1:HT2M7d7RHo+ebKGh9NRcrsrHHfpZ60nW3QRubMRfv48=
go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A=
go.uber.org/goleak v1.1.11-0.20210813005559-691160354723/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
@@ -1274,8 +1277,8 @@ golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM=
-golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg=
+golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
diff --git a/k8s/base/statefulset.yaml b/k8s/base/statefulset.yaml
index 5ff103ab86e..c22c750e62c 100644
--- a/k8s/base/statefulset.yaml
+++ b/k8s/base/statefulset.yaml
@@ -22,7 +22,7 @@ spec:
command:
- erigon
env: []
- image: thorax/erigon
+ image: erigontech/erigon
name: erigon
ports:
- containerPort: 9090
diff --git a/migrations/commitment_recompress.go b/migrations/commitment_recompress.go
deleted file mode 100644
index 0e663fa3f65..00000000000
--- a/migrations/commitment_recompress.go
+++ /dev/null
@@ -1,258 +0,0 @@
-// Copyright 2024 The Erigon Authors
-// This file is part of Erigon.
-//
-// Erigon is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Erigon is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with Erigon. If not, see .
-
-package migrations
-
-import (
- "bufio"
- "context"
- "io"
- "os"
- "os/exec"
- "path/filepath"
- "strings"
- "sync"
- "time"
-
- "github.com/erigontech/erigon-lib/common/datadir"
- "github.com/erigontech/erigon-lib/common/dir"
- "github.com/erigontech/erigon-lib/config3"
- "github.com/erigontech/erigon-lib/kv"
- "github.com/erigontech/erigon-lib/log/v3"
- "github.com/erigontech/erigon-lib/seg"
- "github.com/erigontech/erigon-lib/state"
- "github.com/erigontech/erigon/eth/ethconfig/estimate"
-)
-
-var EnableRecompressCommitmentFiles = false
-
-var RecompressCommitmentFiles = Migration{
- Name: "recompress_commit_files",
- Up: func(db kv.RwDB, dirs datadir.Dirs, progress []byte, BeforeCommit Callback, logger log.Logger) (err error) {
- ctx := context.Background()
-
- if !EnableRecompressCommitmentFiles {
- log.Info("[recompress_migration] disabled")
- return db.Update(ctx, func(tx kv.RwTx) error {
- return BeforeCommit(tx, nil, true)
- })
- }
-
- logEvery := time.NewTicker(10 * time.Second)
- defer logEvery.Stop()
- t := time.Now()
- defer func() {
- log.Info("[recompress_migration] done", "took", time.Since(t))
- }()
-
- log.Info("[recompress_migration] start")
- dirsOld := dirs
- dirsOld.SnapDomain += "_old"
- dir.MustExist(dirsOld.SnapDomain, dirs.SnapDomain+"_backup")
- //TODO: `rclone` func doesn't work for big files. need to debug
- //if err := rclone(logger, dirs.SnapDomain, dirsOld.SnapDomain); err != nil {
- // return err
- //}
- //if err := rclone(logger, dirs.SnapDomain, dirs.SnapDomain+"_backup"); err != nil {
- // return err
- //}
- files, err := storageFiles(dirsOld)
- if err != nil {
- return err
- }
- for _, from := range files {
- _, fromFileName := filepath.Split(from)
- fromStep, toStep, err := state.ParseStepsFromFileName(fromFileName)
- if err != nil {
- return err
- }
- if toStep-fromStep < state.DomainMinStepsToCompress {
- continue
- }
-
- to := filepath.Join(dirs.SnapDomain, fromFileName)
- if err := recompressDomain(ctx, dirs, from, to, logger); err != nil {
- return err
- }
- _ = os.Remove(strings.ReplaceAll(to, ".kv", ".bt"))
- _ = os.Remove(strings.ReplaceAll(to, ".kv", ".kvei"))
- _ = os.Remove(strings.ReplaceAll(to, ".kv", ".bt.torrent"))
- _ = os.Remove(strings.ReplaceAll(to, ".kv", ".kv.torrent"))
- }
-
- agg, err := state.NewAggregator(ctx, dirs, config3.HistoryV3AggregationStep, db, nil, logger)
- if err != nil {
- return err
- }
- defer agg.Close()
- agg.SetCompressWorkers(estimate.CompressSnapshot.Workers())
- if err = agg.OpenFolder(); err != nil {
- return err
- }
- if err := agg.BuildMissedIndices(ctx, estimate.IndexSnapshot.Workers()); err != nil {
- return err
- }
- ac := agg.BeginFilesRo()
- defer ac.Close()
-
- aggOld, err := state.NewAggregator(ctx, dirsOld, config3.HistoryV3AggregationStep, db, nil, logger)
- if err != nil {
- panic(err)
- }
- defer aggOld.Close()
- if err = aggOld.OpenFolder(); err != nil {
- panic(err)
- }
- aggOld.SetCompressWorkers(estimate.CompressSnapshot.Workers())
- if err := aggOld.BuildMissedIndices(ctx, estimate.IndexSnapshot.Workers()); err != nil {
- return err
- }
- if err := agg.BuildMissedIndices(ctx, estimate.IndexSnapshot.Workers()); err != nil {
- return err
- }
-
- acOld := aggOld.BeginFilesRo()
- defer acOld.Close()
-
- if err = acOld.SqueezeCommitmentFiles(ac); err != nil {
- return err
- }
- acOld.Close()
- ac.Close()
- if err := agg.BuildMissedIndices(ctx, estimate.IndexSnapshot.Workers()); err != nil {
- return err
- }
- if err := aggOld.BuildMissedIndices(ctx, estimate.IndexSnapshot.Workers()); err != nil {
- return err
- }
- agg.Close()
- aggOld.Close()
-
- log.Info("[recompress] removing", "dir", dirsOld.SnapDomain)
- _ = os.RemoveAll(dirsOld.SnapDomain)
- log.Info("[recompress] success", "please_remove", dirs.SnapDomain+"_backup")
- return db.Update(ctx, func(tx kv.RwTx) error {
- return BeforeCommit(tx, nil, true)
- })
- },
-}
-
-func recompressDomain(ctx context.Context, dirs datadir.Dirs, from, to string, logger log.Logger) error {
- logger.Info("[recompress] file", "f", to)
- decompressor, err := seg.NewDecompressor(from)
- if err != nil {
- return err
- }
- defer decompressor.Close()
- defer decompressor.EnableReadAhead().DisableReadAhead()
- r := seg.NewReader(decompressor.MakeGetter(), seg.DetectCompressType(decompressor.MakeGetter()))
-
- compressCfg := state.DomainCompressCfg
- compressCfg.Workers = estimate.CompressSnapshot.Workers()
- c, err := seg.NewCompressor(ctx, "recompress", to, dirs.Tmp, compressCfg, log.LvlInfo, logger)
- if err != nil {
- return err
- }
- defer c.Close()
- w := seg.NewWriter(c, seg.CompressKeys)
- var k, v []byte
- var i int
- for r.HasNext() {
- i++
- k, _ = r.Next(k[:0])
- v, _ = r.Next(v[:0])
- if err = w.AddWord(k); err != nil {
- return err
- }
- if err = w.AddWord(v); err != nil {
- return err
- }
- select {
- case <-ctx.Done():
- return ctx.Err()
- default:
- }
- }
- if err := c.Compress(); err != nil {
- return err
- }
-
- return nil
-}
-
-func storageFiles(dirs datadir.Dirs) ([]string, error) {
- files, err := dir.ListFiles(dirs.SnapDomain, ".kv")
- if err != nil {
- return nil, err
- }
- res := make([]string, 0, len(files))
- for _, f := range files {
- if !strings.Contains(f, kv.StorageDomain.String()) {
- continue
- }
- res = append(res, f)
- }
- return res, nil
-}
-
-// nolint
-func rclone(logger log.Logger, from, to string) error {
- cmd := exec.Command("rclone", "sync", "--progress", "--stats-one-line", from, to)
- stdoutPipe, err := cmd.StdoutPipe()
- if err != nil {
- return err
- }
- stderrPipe, err := cmd.StderrPipe()
- if err != nil {
- return err
- }
-
- // Start the command
- if err := cmd.Start(); err != nil {
- return err
- }
-
- // WaitGroup to wait for both goroutines to finish
- var wg sync.WaitGroup
- wg.Add(2)
-
- // Stream stdout
- go func() {
- defer wg.Done()
- streamToLogger(stdoutPipe, logger, "STDOUT")
- }()
-
- // Stream stderr
- go func() {
- defer wg.Done()
- streamToLogger(stderrPipe, logger, "STDERR")
- }()
-
- // Wait for all streams to finish
- wg.Wait()
- return nil
-}
-
-// streamToLogger reads from the provided reader and logs each line
-func streamToLogger(reader io.Reader, logger log.Logger, prefix string) {
- scanner := bufio.NewScanner(reader)
- for scanner.Scan() {
- logger.Info("[recompress] rclone", "out", prefix, "text", scanner.Text())
- }
- if err := scanner.Err(); err != nil {
- logger.Info("[recompress] rclone", "out", prefix, "err", err)
- }
-}
diff --git a/migrations/commitment_squeeze.go b/migrations/commitment_squeeze.go
deleted file mode 100644
index 03cf272ec95..00000000000
--- a/migrations/commitment_squeeze.go
+++ /dev/null
@@ -1,78 +0,0 @@
-// Copyright 2024 The Erigon Authors
-// This file is part of Erigon.
-//
-// Erigon is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Erigon is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with Erigon. If not, see .
-
-package migrations
-
-import (
- "context"
- "time"
-
- "github.com/erigontech/erigon-lib/common/datadir"
- "github.com/erigontech/erigon-lib/config3"
- "github.com/erigontech/erigon-lib/kv"
- "github.com/erigontech/erigon-lib/log/v3"
- libstate "github.com/erigontech/erigon-lib/state"
- "github.com/erigontech/erigon/eth/ethconfig/estimate"
-)
-
-var EnableSqueezeCommitmentFiles = false
-
-var SqueezeCommitmentFiles = Migration{
- Name: "squeeze_commit_files",
- Up: func(db kv.RwDB, dirs datadir.Dirs, progress []byte, BeforeCommit Callback, logger log.Logger) (err error) {
- ctx := context.Background()
-
- if !EnableSqueezeCommitmentFiles {
- log.Info("[sqeeze_migration] disabled")
- return db.Update(ctx, func(tx kv.RwTx) error {
- return BeforeCommit(tx, nil, true)
- })
- }
-
- logEvery := time.NewTicker(10 * time.Second)
- defer logEvery.Stop()
- t := time.Now()
- defer func() {
- log.Info("[sqeeze_migration] done", "took", time.Since(t))
- }()
-
- log.Info("[sqeeze_migration] 'squeeze' mode start")
- agg, err := libstate.NewAggregator(ctx, dirs, config3.HistoryV3AggregationStep, db, nil, logger)
- if err != nil {
- return err
- }
- defer agg.Close()
- agg.SetCompressWorkers(estimate.CompressSnapshot.Workers())
- if err = agg.OpenFolder(); err != nil {
- return err
- }
- if err := agg.BuildMissedIndices(ctx, estimate.IndexSnapshot.Workers()); err != nil {
- return err
- }
- ac := agg.BeginFilesRo()
- defer ac.Close()
- if err = ac.SqueezeCommitmentFiles(ac); err != nil {
- return err
- }
- ac.Close()
- if err := agg.BuildMissedIndices(ctx, estimate.IndexSnapshot.Workers()); err != nil {
- return err
- }
- return db.Update(ctx, func(tx kv.RwTx) error {
- return BeforeCommit(tx, nil, true)
- })
- },
-}
diff --git a/migrations/migrations.go b/migrations/migrations.go
index 10f35c23df3..50850fdd92d 100644
--- a/migrations/migrations.go
+++ b/migrations/migrations.go
@@ -25,6 +25,7 @@ import (
"path/filepath"
"github.com/erigontech/erigon-lib/common"
+ "github.com/erigontech/erigon-lib/common/dir"
"github.com/erigontech/erigon-lib/common/datadir"
"github.com/erigontech/erigon-lib/kv"
@@ -52,8 +53,6 @@ var migrations = map[kv.Label][]Migration{
kv.ChainDB: {
dbSchemaVersion5,
ProhibitNewDownloadsLock,
- SqueezeCommitmentFiles,
- RecompressCommitmentFiles,
ProhibitNewDownloadsLock2,
ClearBorTables,
},
@@ -218,6 +217,7 @@ func (m *Migrator) Apply(db kv.RwDB, dataDir, chaindata string, logger log.Logge
}
dirs.Tmp = filepath.Join(dirs.DataDir, "migrations", v.Name)
+ dir.MustExist(dirs.Tmp)
if err := v.Up(db, dirs, progress, func(tx kv.RwTx, key []byte, isDone bool) error {
if !isDone {
if key != nil {
diff --git a/p2p/sentry/sentry_multi_client/sentry_multi_client.go b/p2p/sentry/sentry_multi_client/sentry_multi_client.go
index 7dc6a584f9f..f143af3cf0e 100644
--- a/p2p/sentry/sentry_multi_client/sentry_multi_client.go
+++ b/p2p/sentry/sentry_multi_client/sentry_multi_client.go
@@ -29,6 +29,7 @@ import (
"github.com/c2h5oh/datasize"
"golang.org/x/sync/semaphore"
+
"google.golang.org/grpc"
"google.golang.org/grpc/backoff"
"google.golang.org/grpc/credentials/insecure"
@@ -414,7 +415,7 @@ func (cs *MultiClient) newBlock66(ctx context.Context, inreq *proto_sentry.Inbou
if err := request.SanityCheck(); err != nil {
return fmt.Errorf("newBlock66: %w", err)
}
- if err := request.Block.HashCheck(); err != nil {
+ if err := request.Block.HashCheck(true); err != nil {
return fmt.Errorf("newBlock66: %w", err)
}
diff --git a/p2p/sentry/simulator/sentry_simulator.go b/p2p/sentry/simulator/sentry_simulator.go
index e7d1f5ddc7e..1912a299296 100644
--- a/p2p/sentry/simulator/sentry_simulator.go
+++ b/p2p/sentry/simulator/sentry_simulator.go
@@ -455,7 +455,7 @@ func (s *server) getHeaderByHash(ctx context.Context, hash common.Hash) (*corety
return s.blockReader.HeaderByHash(ctx, nil, hash)
}
-func (s *server) downloadHeaders(ctx context.Context, header *freezeblocks.Segment) error {
+func (s *server) downloadHeaders(ctx context.Context, header *freezeblocks.VisibleSegment) error {
fileName := snaptype.SegmentFileName(0, header.From(), header.To(), coresnaptype.Enums.Headers)
session := sync.NewTorrentSession(s.downloader, s.chain)
diff --git a/params/chainspecs/amoy.json b/params/chainspecs/amoy.json
index b753f752858..7c15a7cf276 100644
--- a/params/chainspecs/amoy.json
+++ b/params/chainspecs/amoy.json
@@ -39,7 +39,30 @@
"delhiBlock": 73100,
"indoreBlock": 73100,
"agraBlock": 73100,
- "napoliBlock": 5423600
+ "napoliBlock": 5423600,
+ "ahmedabadBlock": 11865856,
+ "blockAlloc": {
+ "11865856": {
+ "0000000000000000000000000000000000001001": {
+ "balance": "0x0",
+ "code": "0x608060405234801561001057600080fd5b50600436106100cf5760003560e01c80635407ca671161008c578063abca220411610066578063abca2204146102fa578063d72a0b6714610302578063ee3a87f21461031f578063f165053614610342576100cf565b80635407ca67146102585780636757e5d914610260578063942af179146102f2576100cf565b806303112a17146100d457806319494a17146100f357806330e69fc31461017e578063318926f7146101985780633434735f146101bc57806351950cd9146101c4575b600080fd5b6100f1600480360360208110156100ea57600080fd5b503561034a565b005b61016a6004803603604081101561010957600080fd5b8135919081019060408101602082013564010000000081111561012b57600080fd5b82018360208201111561013d57600080fd5b8035906020019184600183028401116401000000008311171561015f57600080fd5b50909250905061060d565b604080519115158252519081900360200190f35b61018661093e565b60408051918252519081900360200190f35b6101a0610944565b604080516001600160a01b039092168252519081900360200190f35b6101a0610968565b6100f160048036036102808110156101db57600080fd5b61020082013590610220830135906001600160a01b036102408501351690840184610280810161026082013564010000000081111561021957600080fd5b82018360208201111561022b57600080fd5b8035906020019184600183028401116401000000008311171561024d57600080fd5b509092509050610973565b610186610c78565b61027d6004803603602081101561027657600080fd5b5035610c7e565b6040805160208082528351818301528351919283929083019185019080838360005b838110156102b757818101518382015260200161029f565b50505050905090810190601f1680156102e45780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b610186610d19565b610186610d1f565b61016a6004803603602081101561031857600080fd5b5035610d25565b6100f16004803603604081101561033557600080fd5b5080359060200135610d3a565b610186610db0565b60008181526003602090815260409182902080548351601f60026000196101006001861615020190931692909204918201849004840281018401909452808452606093928301828280156103df5780601f106103b4576101008083540402835291602001916103df565b820191906000526020600020905b8154815290600101906020018083116103c257829003601f168201915b50505050509050805160001415610426576040805162461bcd60e51b815260206004820152600660248201526508599bdd5b9960d21b604482015290519081900360640190fd5b600082815260036020526040812061043d916112bb565b6000606082806020019051604081101561045657600080fd5b81516020830180516040519294929383019291908464010000000082111561047d57600080fd5b90830190602082018581111561049257600080fd5b82516401000000008111828201881017156104ac57600080fd5b82525081516020918201929091019080838360005b838110156104d95781810151838201526020016104c1565b50505050905090810190601f1680156105065780820380516001836020036101000a031916815260200191505b5060405250505091509150837f8797144948782adcede8e04bfa0bd8fd56941e0df7508bd02a629b477f7b073a60405160405180910390a2604080516313629df560e11b815260048101868152602482019283528351604483015283516001600160a01b038616936326c53bea938993879390929160640190602085019080838360005b838110156105a257818101518382015260200161058a565b50505050905090810190601f1680156105cf5780820380516001836020036101000a031916815260200191505b509350505050600060405180830381600087803b1580156105ef57600080fd5b505af1158015610603573d6000803e3d6000fd5b5050505050505050565b6000336002600160a01b031461065f576040805162461bcd60e51b81526020600482015260126024820152714e6f742053797374656d204164646573732160701b604482015290519081900360640190fd5b60606106a86106a385858080601f016020809104026020016040519081016040528093929190818152602001838380828437600092019190915250610db592505050565b610ddb565b905060006106c9826000815181106106bc57fe5b6020026020010151610f14565b90508060005460010114610724576040805162461bcd60e51b815260206004820152601b60248201527f537461746549647320617265206e6f742073657175656e7469616c0000000000604482015290519081900360640190fd5b6000805460019081018255835161074c918591811061073f57fe5b6020026020010151610f62565b9050606061076d8460028151811061076057fe5b6020026020010151610f82565b905061077882610fff565b15610933576000624c4b409050606084836040516024018083815260200180602001828103825283818151815260200191508051906020019080838360005b838110156107cf5781810151838201526020016107b7565b50505050905090810190601f1680156107fc5780820380516001836020036101000a031916815260200191505b5060408051601f198184030181529190526020810180516001600160e01b03166313629df560e11b1781528151919650600095508594509092509050828887f1604080518215158152905191985086917f5a22725590b0a51c923940223f7458512164b1113359a735e86e7f27f44791ee9181900360200190a28661093057838360405160200180836001600160a01b0316815260200180602001828103825283818151815260200191508051906020019080838360005b838110156108cc5781810151838201526020016108b4565b50505050905090810190601f1680156108f95780820380516001836020036101000a031916815260200191505b5060408051601f1981840301815291815260008b815260036020908152919020825161092e9750909550910192509050611302565b505b50505b505050509392505050565b60045481565b7f000000000000000000000000be971fef2bb60f709e1daf3e55d00914e230cd9481565b6002600160a01b0381565b6201000085106109be576040805162461bcd60e51b81526020600482015260116024820152700d2dcecc2d8d2c840d8cac2cc92dcc8caf607b1b604482015290519081900360640190fd5b60045460058054600101908190551115610a05576040805162461bcd60e51b8152602060048201526003602482015262195b9960ea1b604482015290519081900360640190fd5b60015480610a42576040805162461bcd60e51b8152602060048201526005602482015264085c9bdbdd60da1b604482015290519081900360640190fd5b60008585858560405160200180858152602001846001600160a01b0316815260200180602001828103825284848281815260200192508082843760008184015260408051601f19601f909301831690940184810390920184525250805160209091012096507f28cf91ac064e179f8a42e4b7a20ba080187781da55fd4f3f18870b7a25bacb559550505050828414801592509050610aef575060008281526002602052604090205460ff16155b610b29576040805162461bcd60e51b815260206004808301919091526024820152631d5cd95960e21b604482015290519081900360640190fd5b60008281526002602052604090819020805460ff191660011790558051610200818101909252610b74918b9060109083908390808284376000920191909152508b915085905061100b565b8314610bb0576040805162461bcd60e51b815260206004820152600660248201526510b83937b7b360d11b604482015290519081900360640190fd5b60405187907f8797144948782adcede8e04bfa0bd8fd56941e0df7508bd02a629b477f7b073a90600090a2604080516313629df560e11b81526004810189815260248201928352604482018790526001600160a01b038916926326c53bea928b928a928a92606401848480828437600081840152601f19601f820116905080830192505050945050505050600060405180830381600087803b158015610c5557600080fd5b505af1158015610c69573d6000803e3d6000fd5b50505050505050505050505050565b60005481565b60036020908152600091825260409182902080548351601f600260001961010060018616150201909316929092049182018490048402810184019094528084529091830182828015610d115780601f10610ce657610100808354040283529160200191610d11565b820191906000526020600020905b815481529060010190602001808311610cf457829003601f168201915b505050505081565b60055481565b60015481565b60026020526000908152604090205460ff1681565b336001600160a01b037f000000000000000000000000be971fef2bb60f709e1daf3e55d00914e230cd941614610da5576040805162461bcd60e51b815260206004820152600b60248201526a10b937b7ba29b2ba3a32b960a91b604482015290519081900360640190fd5b600191909155600455565b601081565b610dbd611380565b5060408051808201909152815181526020828101908201525b919050565b6060610de6826110b6565b610def57600080fd5b6000610dfa836110f0565b905060608167ffffffffffffffff81118015610e1557600080fd5b50604051908082528060200260200182016040528015610e4f57816020015b610e3c611380565b815260200190600190039081610e345790505b5090506000610e618560200151611148565b60208601510190506000805b84811015610eb857610e7e836111ab565b9150604051806040016040528083815260200184815250848281518110610ea157fe5b602090810291909101015291810191600101610e6d565b5085516020870151830314610f0a576040805162461bcd60e51b81526020600482015260136024820152722bb937b733903a37ba30b6103632b733ba341760691b604482015290519081900360640190fd5b5090949350505050565b805160009015801590610f2957508151602110155b610f3257600080fd5b600080610f3e84611244565b815191935091506020821015610f5a5760208290036101000a90045b949350505050565b8051600090601514610f7357600080fd5b610f7c82610f14565b92915050565b8051606090610f9057600080fd5b600080610f9c84611244565b9150915060608167ffffffffffffffff81118015610fb957600080fd5b506040519080825280601f01601f191660200182016040528015610fe4576020820181803683370190505b50905060208101610ff684828561126a565b50949350505050565b3b63ffffffff16151590565b600081815b6010811015610ff657600185821c8116141561106c5785816010811061103257fe5b60200201518260405160200180838152602001828152602001925050506040516020818303038152906040528051906020012091506110ae565b8186826010811061107957fe5b602002015160405160200180838152602001828152602001925050506040516020818303038152906040528051906020012091505b600101611010565b80516000906110c757506000610dd6565b6020820151805160001a9060c08210156110e657600092505050610dd6565b5060019392505050565b805160009061110157506000610dd6565b6000806111118460200151611148565b602085015185519181019250015b8082101561113f57611130826111ab565b6001909301929091019061111f565b50909392505050565b8051600090811a6080811015611162576000915050610dd6565b60b881108061117d575060c0811080159061117d575060f881105b1561118c576001915050610dd6565b60c08110156111a05760b519019050610dd6565b60f519019050610dd6565b80516000908190811a60808110156111c6576001915061123d565b60b88110156111db57607e198101915061123d565b60c08110156112085760b78103600185019450806020036101000a8551046001820181019350505061123d565b60f881101561121d5760be198101915061123d565b60f78103600185019450806020036101000a855104600182018101935050505b5092915050565b60008060006112568460200151611148565b602085015194519481019594039392505050565b80611274576112b6565b5b60208110611294578251825260209283019290910190601f1901611275565b80156112b6578251825160208390036101000a60001901801990921691161782525b505050565b50805460018160011615610100020316600290046000825580601f106112e157506112ff565b601f0160209004906000526020600020908101906112ff919061139a565b50565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061134357805160ff1916838001178555611370565b82800160010185558215611370579182015b82811115611370578251825591602001919060010190611355565b5061137c92915061139a565b5090565b604051806040016040528060008152602001600081525090565b5b8082111561137c576000815560010161139b56fea164736f6c634300060c000a"
+ },
+ "0000000000000000000000000000000000001010": {
+ "balance": "0x0",
+ "code": "0x6080604052600436106101b75760003560e01c80638da5cb5b116100ec578063b789543c1161008a578063e614d0d611610064578063e614d0d614610695578063ed9ef524146106aa578063f2fde38b146106dd578063fc0c546a14610710576101b7565b8063b789543c14610626578063cc79f97b1461066b578063e306f77914610680576101b7565b806395d89b41116100c657806395d89b41146105a6578063a9059cbb146105bb578063abceeba2146105e7578063acd06cb3146105fc576101b7565b80638da5cb5b146105535780638f32d59b146105685780639025e64c14610591576101b7565b806347e7ef241161015957806370a082311161013357806370a082311461043c578063715018a61461046f578063771282f61461048457806377d32e9414610499576101b7565b806347e7ef24146103b3578063485cc955146103ec57806360f96a8f14610427576101b7565b806319d27d9c1161019557806319d27d9c146102a25780632e1a7d4d14610356578063313ce5671461037357806342fc47fb1461039e576101b7565b806306fdde03146101bc5780631499c5921461024657806318160ddd1461027b575b600080fd5b3480156101c857600080fd5b506101d1610725565b6040805160208082528351818301528351919283929083019185019080838360005b8381101561020b5781810151838201526020016101f3565b50505050905090810190601f1680156102385780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b34801561025257600080fd5b506102796004803603602081101561026957600080fd5b50356001600160a01b031661075c565b005b34801561028757600080fd5b5061029061079c565b60408051918252519081900360200190f35b3480156102ae57600080fd5b5061033a600480360360a08110156102c557600080fd5b8101906020810181356401000000008111156102e057600080fd5b8201836020820111156102f257600080fd5b8035906020019184600183028401116401000000008311171561031457600080fd5b9193509150803590602081013590604081013590606001356001600160a01b03166107ac565b604080516001600160a01b039092168252519081900360200190f35b6102796004803603602081101561036c57600080fd5b50356107ee565b34801561037f57600080fd5b506103886108c6565b6040805160ff9092168252519081900360200190f35b3480156103aa57600080fd5b5061033a6108cb565b3480156103bf57600080fd5b50610279600480360360408110156103d657600080fd5b506001600160a01b0381351690602001356108da565b3480156103f857600080fd5b506102796004803603604081101561040f57600080fd5b506001600160a01b03813581169160200135166109a8565b34801561043357600080fd5b5061033a610a21565b34801561044857600080fd5b506102906004803603602081101561045f57600080fd5b50356001600160a01b0316610a30565b34801561047b57600080fd5b50610279610a3d565b34801561049057600080fd5b50610290610a98565b3480156104a557600080fd5b5061033a600480360360408110156104bc57600080fd5b813591908101906040810160208201356401000000008111156104de57600080fd5b8201836020820111156104f057600080fd5b8035906020019184600183028401116401000000008311171561051257600080fd5b91908080601f016020809104026020016040519081016040528093929190818152602001838380828437600092019190915250929550610a9e945050505050565b34801561055f57600080fd5b5061033a610bc2565b34801561057457600080fd5b5061057d610bd1565b604080519115158252519081900360200190f35b34801561059d57600080fd5b506101d1610be2565b3480156105b257600080fd5b506101d1610c00565b61057d600480360360408110156105d157600080fd5b506001600160a01b038135169060200135610c1d565b3480156105f357600080fd5b50610290610c40565b34801561060857600080fd5b5061057d6004803603602081101561061f57600080fd5b5035610cc9565b34801561063257600080fd5b506102906004803603608081101561064957600080fd5b506001600160a01b038135169060208101359060408101359060600135610cde565b34801561067757600080fd5b50610290610cfd565b34801561068c57600080fd5b50610290610d03565b3480156106a157600080fd5b50610290610d09565b3480156106b657600080fd5b50610279600480360360208110156106cd57600080fd5b50356001600160a01b0316610d53565b3480156106e957600080fd5b506102796004803603602081101561070057600080fd5b50356001600160a01b0316610e05565b34801561071c57600080fd5b5061033a610e22565b60408051808201909152601781527f506f6c79676f6e2045636f73797374656d20546f6b656e000000000000000000602082015290565b6040805162461bcd60e51b815260206004820152601060248201526f44697361626c6564206665617475726560801b604482015290519081900360640190fd5b6b204fce5e3e2502611000000090565b6040805162461bcd60e51b815260206004820152601060248201526f44697361626c6564206665617475726560801b6044820152905160009181900360640190fd5b3360006107fa82610a30565b600654909150610810908463ffffffff610e3116565b600655821580159061082157508234145b610868576040805162461bcd60e51b8152602060048201526013602482015272125b9cdd59999a58da595b9d08185b5bdd5b9d606a1b604482015290519081900360640190fd5b6002546001600160a01b0380841691167febff2602b3f468259e1e99f613fed6691f3a6526effe6ef3e768ba7ae7a36c4f85846108a487610a30565b60408051938452602084019290925282820152519081900360600190a3505050565b601290565b6003546001600160a01b031681565b6108e2610bd1565b6108eb57600080fd5b60008111801561090357506001600160a01b03821615155b61093e5760405162461bcd60e51b815260040180806020018281038252602381526020018061138d6023913960400191505060405180910390fd5b600061094983610a30565b60065490915061095f908363ffffffff610e4616565b60065561096c8383610e58565b6002546001600160a01b0380851691167f4e2ca0515ed1aef1395f66b5303bb5d6f1bf9d61a353fa53f73f8ac9973fa9f684846108a488610a30565b60075460ff16156109ea5760405162461bcd60e51b815260040180806020018281038252602381526020018061136a6023913960400191505060405180910390fd5b6007805460ff19166001179055600280546001600160a01b0383166001600160a01b0319909116179055610a1d82610f17565b5050565b6004546001600160a01b031681565b6001600160a01b03163190565b610a45610bd1565b610a4e57600080fd5b600080546040516001600160a01b03909116907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908390a3600080546001600160a01b0319169055565b60065481565b6000806000808451604114610ab95760009350505050610bbc565b50505060208201516040830151604184015160ff16601b811015610adb57601b015b8060ff16601b14158015610af357508060ff16601c14155b15610b045760009350505050610bbc565b6040805160008152602080820180845289905260ff8416828401526060820186905260808201859052915160019260a0808401939192601f1981019281900390910190855afa158015610b5b573d6000803e3d6000fd5b5050604051601f1901519450506001600160a01b038416610bb8576040805162461bcd60e51b815260206004820152601260248201527122b93937b91034b71032b1b932b1b7bb32b960711b604482015290519081900360640190fd5b5050505b92915050565b6000546001600160a01b031690565b6000546001600160a01b0316331490565b604051806040016040528060028152602001613a9960f01b81525081565b6040805180820190915260038152621413d360ea1b602082015290565b6000813414610c2e57506000610bbc565b610c39338484610f85565b9392505050565b6040518060800160405280605b8152602001611434605b91396040516020018082805190602001908083835b60208310610c8b5780518252601f199092019160209182019101610c6c565b6001836020036101000a0380198251168184511680821785525050505050509050019150506040516020818303038152906040528051906020012081565b60056020526000908152604090205460ff1681565b6000610cf4610cef868686866111d2565b61128b565b95945050505050565b613a9981565b60015481565b6040518060800160405280605281526020016113b06052913960405160200180828051906020019080838360208310610c8b5780518252601f199092019160209182019101610c6c565b610d5b610bd1565b610d6457600080fd5b6001600160a01b038116610da95760405162461bcd60e51b81526004018080602001828103825260328152602001806114026032913960400191505060405180910390fd5b6003546040516001600160a01b038084169216907f1f9f3556dd336016cdf20adaead7d5c73665dba664b60e8c17e9a4eb91ce1d3990600090a3600380546001600160a01b0319166001600160a01b0392909216919091179055565b610e0d610bd1565b610e1657600080fd5b610e1f81610f17565b50565b6002546001600160a01b031681565b600082821115610e4057600080fd5b50900390565b600082820183811015610c3957600080fd5b60085415610e9a576040805162461bcd60e51b815260206004820152600a6024820152697265656e7472616e637960b01b604482015290519081900360640190fd5b6001600855604051611388906000906060906001600160a01b038616908490869085818181858888f193505050503d8060008114610ef4576040519150601f19603f3d011682016040523d82523d6000602084013e610ef9565b606091505b509150915081610f0b57805160208201fd5b50506000600855505050565b6001600160a01b038116610f2a57600080fd5b600080546040516001600160a01b03808516939216917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a3600080546001600160a01b0319166001600160a01b0392909216919091179055565b604080516370a0823160e01b81526001600160a01b03851660048201529051600091829130916370a08231916024808301926020929190829003018186803b158015610fd057600080fd5b505afa158015610fe4573d6000803e3d6000fd5b505050506040513d6020811015610ffa57600080fd5b5051604080516370a0823160e01b81526001600160a01b0387166004820152905191925060009130916370a08231916024808301926020929190829003018186803b15801561104857600080fd5b505afa15801561105c573d6000803e3d6000fd5b505050506040513d602081101561107257600080fd5b50519050611081868686611299565b600254604080516370a0823160e01b81526001600160a01b03898116600483018190529251818a1694909116917fe6497e3ee548a3372136af2fcb0696db31fc6cf20260707645068bd3fe97f3c49189918891889130916370a0823191602480820192602092909190829003018186803b1580156110fe57600080fd5b505afa158015611112573d6000803e3d6000fd5b505050506040513d602081101561112857600080fd5b5051604080516370a0823160e01b81526001600160a01b038f166004820152905130916370a08231916024808301926020929190829003018186803b15801561117057600080fd5b505afa158015611184573d6000803e3d6000fd5b505050506040513d602081101561119a57600080fd5b50516040805195865260208601949094528484019290925260608401526080830152519081900360a00190a450600195945050505050565b6000806040518060800160405280605b8152602001611434605b91396040516020018082805190602001908083835b602083106112205780518252601f199092019160209182019101611201565b51815160209384036101000a60001901801990921691161790526040805192909401828103601f1901835280855282519282019290922082526001600160a01b039b909b169a81019a909a5250880196909652505050606084019190915260808301525060a0902090565b6000610bbc82600154611347565b6001600160a01b0382163014156112ed576040805162461bcd60e51b8152602060048201526013602482015272063616e27742073656e6420746f204d5243323606c1b604482015290519081900360640190fd5b6112f78282610e58565b816001600160a01b0316836001600160a01b03167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef836040518082815260200191505060405180910390a3505050565b60405161190160f01b815260028101919091526022810191909152604290209056fe54686520636f6e747261637420697320616c726561647920696e697469616c697a6564496e73756666696369656e7420616d6f756e74206f7220696e76616c69642075736572454950373132446f6d61696e28737472696e67206e616d652c737472696e672076657273696f6e2c75696e7432353620636861696e49642c6164647265737320766572696679696e67436f6e7472616374294368696c6420746f6b656e3a206e6577206368696c64206164647265737320697320746865207a65726f2061646472657373546f6b656e5472616e736665724f726465722861646472657373207370656e6465722c75696e7432353620746f6b656e49644f72416d6f756e742c6279746573333220646174612c75696e743235362065787069726174696f6e29a265627a7a723158205f23be7574e70cfc01d0cfd6803b871f92465e9ae4a10fe95ed31ccb810bda3e64736f6c63430005110032"
+ },
+ "360ad4f9a9A8EFe9A8DCB5f461c4Cc1047E1Dcf9": {
+ "balance": "0x0",
+ "code": "0x6080604052600436106100af576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806306fdde03146100b9578063095ea7b31461014957806318160ddd146101ae57806323b872dd146101d95780632e1a7d4d1461025e578063313ce5671461028b57806370a08231146102bc57806395d89b4114610313578063a9059cbb146103a3578063d0e30db014610408578063dd62ed3e14610412575b6100b7610489565b005b3480156100c557600080fd5b506100ce610526565b6040518080602001828103825283818151815260200191508051906020019080838360005b8381101561010e5780820151818401526020810190506100f3565b50505050905090810190601f16801561013b5780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b34801561015557600080fd5b50610194600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803590602001909291905050506105c4565b604051808215151515815260200191505060405180910390f35b3480156101ba57600080fd5b506101c36106b6565b6040518082815260200191505060405180910390f35b3480156101e557600080fd5b50610244600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803590602001909291905050506106d5565b604051808215151515815260200191505060405180910390f35b34801561026a57600080fd5b5061028960048036038101908080359060200190929190505050610a22565b005b34801561029757600080fd5b506102a0610b55565b604051808260ff1660ff16815260200191505060405180910390f35b3480156102c857600080fd5b506102fd600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610b68565b6040518082815260200191505060405180910390f35b34801561031f57600080fd5b50610328610b80565b6040518080602001828103825283818151815260200191508051906020019080838360005b8381101561036857808201518184015260208101905061034d565b50505050905090810190601f1680156103955780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b3480156103af57600080fd5b506103ee600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050610c1e565b604051808215151515815260200191505060405180910390f35b610410610489565b005b34801561041e57600080fd5b50610473600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610c33565b6040518082815260200191505060405180910390f35b34600360003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600082825401925050819055503373ffffffffffffffffffffffffffffffffffffffff167fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c346040518082815260200191505060405180910390a2565b60008054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156105bc5780601f10610591576101008083540402835291602001916105bc565b820191906000526020600020905b81548152906001019060200180831161059f57829003601f168201915b505050505081565b600081600460003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925846040518082815260200191505060405180910390a36001905092915050565b60003073ffffffffffffffffffffffffffffffffffffffff1631905090565b600081600360008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015151561072557600080fd5b3373ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff16141580156107fd57507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff600460008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205414155b156109185781600460008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015151561088d57600080fd5b81600460008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600082825403925050819055505b81600360008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206000828254039250508190555081600360008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600082825401925050819055508273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a3600190509392505050565b80600360003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205410151515610a7057600080fd5b80600360003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600082825403925050819055503373ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f19350505050158015610b03573d6000803e3d6000fd5b503373ffffffffffffffffffffffffffffffffffffffff167f7fcf532c15f0a6db0bd6d0e038bea71d30d808c7d98cb3bf7268a95bf5081b65826040518082815260200191505060405180910390a250565b600260009054906101000a900460ff1681565b60036020528060005260406000206000915090505481565b60018054600181600116156101000203166002900480601f016020809104026020016040519081016040528092919081815260200182805460018160011615610100020316600290048015610c165780601f10610beb57610100808354040283529160200191610c16565b820191906000526020600020905b815481529060010190602001808311610bf957829003601f168201915b505050505081565b6000610c2b3384846106d5565b905092915050565b60046020528160005260406000206020528060005260406000206000915091505054815600a165627a7a72305820ea7b3a90a89969eb00d2a56f58b0f80481944475908acf25438759b53be73e5b0029"
+ }
+ },
+ "12121856": {
+ "360ad4f9a9A8EFe9A8DCB5f461c4Cc1047E1Dcf9": {
+ "balance": "0x0",
+ "code": "0x6080604052600436106100af576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806306fdde03146100b9578063095ea7b31461014957806318160ddd146101ae57806323b872dd146101d95780632e1a7d4d1461025e578063313ce5671461028b57806370a08231146102bc57806395d89b4114610313578063a9059cbb146103a3578063d0e30db014610408578063dd62ed3e14610412575b6100b7610489565b005b3480156100c557600080fd5b506100ce610526565b6040518080602001828103825283818151815260200191508051906020019080838360005b8381101561010e5780820151818401526020810190506100f3565b50505050905090810190601f16801561013b5780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b34801561015557600080fd5b50610194600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050610563565b604051808215151515815260200191505060405180910390f35b3480156101ba57600080fd5b506101c3610655565b6040518082815260200191505060405180910390f35b3480156101e557600080fd5b50610244600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050610674565b604051808215151515815260200191505060405180910390f35b34801561026a57600080fd5b50610289600480360381019080803590602001909291905050506109c1565b005b34801561029757600080fd5b506102a0610af4565b604051808260ff1660ff16815260200191505060405180910390f35b3480156102c857600080fd5b506102fd600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610afd565b6040518082815260200191505060405180910390f35b34801561031f57600080fd5b50610328610b15565b6040518080602001828103825283818151815260200191508051906020019080838360005b8381101561036857808201518184015260208101905061034d565b50505050905090810190601f1680156103955780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b3480156103af57600080fd5b506103ee600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050610b52565b604051808215151515815260200191505060405180910390f35b610410610489565b005b34801561041e57600080fd5b50610473600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610b67565b6040518082815260200191505060405180910390f35b34600360003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600082825401925050819055503373ffffffffffffffffffffffffffffffffffffffff167fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c346040518082815260200191505060405180910390a2565b60606040805190810160405280601f81526020017f5772617070656420506f6c79676f6e2045636f73797374656d20546f6b656e00815250905090565b600081600460003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925846040518082815260200191505060405180910390a36001905092915050565b60003073ffffffffffffffffffffffffffffffffffffffff1631905090565b600081600360008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101515156106c457600080fd5b3373ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff161415801561079c57507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff600460008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205414155b156108b75781600460008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015151561082c57600080fd5b81600460008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600082825403925050819055505b81600360008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206000828254039250508190555081600360008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600082825401925050819055508273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a3600190509392505050565b80600360003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205410151515610a0f57600080fd5b80600360003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600082825403925050819055503373ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f19350505050158015610aa2573d6000803e3d6000fd5b503373ffffffffffffffffffffffffffffffffffffffff167f7fcf532c15f0a6db0bd6d0e038bea71d30d808c7d98cb3bf7268a95bf5081b65826040518082815260200191505060405180910390a250565b60006012905090565b60036020528060005260406000206000915090505481565b60606040805190810160405280600481526020017f57504f4c00000000000000000000000000000000000000000000000000000000815250905090565b6000610b5f338484610674565b905092915050565b60046020528160005260406000206020528060005260406000206000915091505054815600a165627a7a723058208d70d8aa2d752533105b5ccda8206dae8b0c1de765f89fb1f0c5727cbac1b40d0029"
+ }
+ }
+ }
}
}
\ No newline at end of file
diff --git a/params/chainspecs/bor-mainnet.json b/params/chainspecs/bor-mainnet.json
index 8bbfccffc6e..792895c4e89 100644
--- a/params/chainspecs/bor-mainnet.json
+++ b/params/chainspecs/bor-mainnet.json
@@ -59,12 +59,27 @@
"balance": "0x0",
"code": "0x608060405234801561001057600080fd5b506004361061005e576000357c01000000000000000000000000000000000000000000000000000000009004806319494a17146100635780633434735f146100fe5780635407ca6714610148575b600080fd5b6100e46004803603604081101561007957600080fd5b8101908080359060200190929190803590602001906401000000008111156100a057600080fd5b8201836020820111156100b257600080fd5b803590602001918460018302840111640100000000831117156100d457600080fd5b9091929391929390505050610166565b604051808215151515815260200191505060405180910390f35b6101066104d3565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b6101506104eb565b6040518082815260200191505060405180910390f35b600073fffffffffffffffffffffffffffffffffffffffe73ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff161461021d576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260128152602001807f4e6f742053797374656d2041646465737321000000000000000000000000000081525060200191505060405180910390fd5b606061027461026f85858080601f016020809104026020016040519081016040528093929190818152602001838380828437600081840152601f19601f820116905080830192505050505050506104f1565b61051f565b905060006102958260008151811061028857fe5b60200260200101516105fc565b90508060016000540114610311576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252601b8152602001807f537461746549647320617265206e6f742073657175656e7469616c000000000081525060200191505060405180910390fd5b600080815480929190600101919050555060006103418360018151811061033457fe5b602002602001015161066d565b905060606103628460028151811061035557fe5b6020026020010151610690565b905061036d8261071c565b156104c8576000624c4b409050606084836040516024018083815260200180602001828103825283818151815260200191508051906020019080838360005b838110156103c75780820151818401526020810190506103ac565b50505050905090810190601f1680156103f45780820380516001836020036101000a031916815260200191505b5093505050506040516020818303038152906040527f26c53bea000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050905060008082516020840160008887f19650847f5a22725590b0a51c923940223f7458512164b1113359a735e86e7f27f44791ee88604051808215151515815260200191505060405180910390a250505b505050509392505050565b73fffffffffffffffffffffffffffffffffffffffe81565b60005481565b6104f961099c565b600060208301905060405180604001604052808451815260200182815250915050919050565b606061052a82610735565b61053357600080fd5b600061053e83610783565b905060608160405190808252806020026020018201604052801561057c57816020015b6105696109b6565b8152602001906001900390816105615790505b509050600061058e85602001516107f4565b8560200151019050600080600090505b848110156105ef576105af8361087d565b91506040518060400160405280838152602001848152508482815181106105d257fe5b60200260200101819052508183019250808060010191505061059e565b5082945050505050919050565b600080826000015111801561061657506021826000015111155b61061f57600080fd5b600061062e83602001516107f4565b9050600081846000015103905060008083866020015101905080519150602083101561066157826020036101000a820491505b81945050505050919050565b6000601582600001511461068057600080fd5b610689826105fc565b9050919050565b606060008260000151116106a357600080fd5b60006106b283602001516107f4565b905060008184600001510390506060816040519080825280601f01601f1916602001820160405280156106f45781602001600182028038833980820191505090505b5090506000816020019050610710848760200151018285610935565b81945050505050919050565b600080823b905060008163ffffffff1611915050919050565b6000808260000151141561074c576000905061077e565b60008083602001519050805160001a915060c060ff168260ff1610156107775760009250505061077e565b6001925050505b919050565b6000808260000151141561079a57600090506107ef565b600080905060006107ae84602001516107f4565b84602001510190506000846000015185602001510190505b808210156107e8576107d78261087d565b8201915082806001019350506107c6565b8293505050505b919050565b600080825160001a9050608060ff16811015610814576000915050610878565b60b860ff16811080610839575060c060ff168110158015610838575060f860ff1681105b5b15610848576001915050610878565b60c060ff168110156108685760018060b80360ff16820301915050610878565b60018060f80360ff168203019150505b919050565b6000806000835160001a9050608060ff1681101561089e576001915061092b565b60b860ff168110156108bb576001608060ff16820301915061092a565b60c060ff168110156108eb5760b78103600185019450806020036101000a85510460018201810193505050610929565b60f860ff1681101561090857600160c060ff168203019150610928565b60f78103600185019450806020036101000a855104600182018101935050505b5b5b5b8192505050919050565b600081141561094357610997565b5b602060ff1681106109735782518252602060ff1683019250602060ff1682019150602060ff1681039050610944565b6000600182602060ff16036101000a03905080198451168184511681811785525050505b505050565b604051806040016040528060008152602001600081525090565b60405180604001604052806000815260200160008152509056fea265627a7a723158208f1ea6fcf63d6911ac5dbfe340be1029614581802c6a750e7d6354b32ce6647c64736f6c63430005110032"
}
+ },
+ "62278656": {
+ "0000000000000000000000000000000000001001": {
+ "balance": "0x0",
+ "code": "0x608060405234801561001057600080fd5b50600436106100cf5760003560e01c80635407ca671161008c578063abca220411610066578063abca2204146102fa578063d72a0b6714610302578063ee3a87f21461031f578063f165053614610342576100cf565b80635407ca67146102585780636757e5d914610260578063942af179146102f2576100cf565b806303112a17146100d457806319494a17146100f357806330e69fc31461017e578063318926f7146101985780633434735f146101bc57806351950cd9146101c4575b600080fd5b6100f1600480360360208110156100ea57600080fd5b503561034a565b005b61016a6004803603604081101561010957600080fd5b8135919081019060408101602082013564010000000081111561012b57600080fd5b82018360208201111561013d57600080fd5b8035906020019184600183028401116401000000008311171561015f57600080fd5b50909250905061060d565b604080519115158252519081900360200190f35b61018661093e565b60408051918252519081900360200190f35b6101a0610944565b604080516001600160a01b039092168252519081900360200190f35b6101a0610968565b6100f160048036036102808110156101db57600080fd5b61020082013590610220830135906001600160a01b036102408501351690840184610280810161026082013564010000000081111561021957600080fd5b82018360208201111561022b57600080fd5b8035906020019184600183028401116401000000008311171561024d57600080fd5b509092509050610973565b610186610c78565b61027d6004803603602081101561027657600080fd5b5035610c7e565b6040805160208082528351818301528351919283929083019185019080838360005b838110156102b757818101518382015260200161029f565b50505050905090810190601f1680156102e45780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b610186610d19565b610186610d1f565b61016a6004803603602081101561031857600080fd5b5035610d25565b6100f16004803603604081101561033557600080fd5b5080359060200135610d3a565b610186610db0565b60008181526003602090815260409182902080548351601f60026000196101006001861615020190931692909204918201849004840281018401909452808452606093928301828280156103df5780601f106103b4576101008083540402835291602001916103df565b820191906000526020600020905b8154815290600101906020018083116103c257829003601f168201915b50505050509050805160001415610426576040805162461bcd60e51b815260206004820152600660248201526508599bdd5b9960d21b604482015290519081900360640190fd5b600082815260036020526040812061043d916112bb565b6000606082806020019051604081101561045657600080fd5b81516020830180516040519294929383019291908464010000000082111561047d57600080fd5b90830190602082018581111561049257600080fd5b82516401000000008111828201881017156104ac57600080fd5b82525081516020918201929091019080838360005b838110156104d95781810151838201526020016104c1565b50505050905090810190601f1680156105065780820380516001836020036101000a031916815260200191505b5060405250505091509150837f8797144948782adcede8e04bfa0bd8fd56941e0df7508bd02a629b477f7b073a60405160405180910390a2604080516313629df560e11b815260048101868152602482019283528351604483015283516001600160a01b038616936326c53bea938993879390929160640190602085019080838360005b838110156105a257818101518382015260200161058a565b50505050905090810190601f1680156105cf5780820380516001836020036101000a031916815260200191505b509350505050600060405180830381600087803b1580156105ef57600080fd5b505af1158015610603573d6000803e3d6000fd5b5050505050505050565b6000336002600160a01b031461065f576040805162461bcd60e51b81526020600482015260126024820152714e6f742053797374656d204164646573732160701b604482015290519081900360640190fd5b60606106a86106a385858080601f016020809104026020016040519081016040528093929190818152602001838380828437600092019190915250610db592505050565b610ddb565b905060006106c9826000815181106106bc57fe5b6020026020010151610f14565b90508060005460010114610724576040805162461bcd60e51b815260206004820152601b60248201527f537461746549647320617265206e6f742073657175656e7469616c0000000000604482015290519081900360640190fd5b6000805460019081018255835161074c918591811061073f57fe5b6020026020010151610f62565b9050606061076d8460028151811061076057fe5b6020026020010151610f82565b905061077882610fff565b15610933576000624c4b409050606084836040516024018083815260200180602001828103825283818151815260200191508051906020019080838360005b838110156107cf5781810151838201526020016107b7565b50505050905090810190601f1680156107fc5780820380516001836020036101000a031916815260200191505b5060408051601f198184030181529190526020810180516001600160e01b03166313629df560e11b1781528151919650600095508594509092509050828887f1604080518215158152905191985086917f5a22725590b0a51c923940223f7458512164b1113359a735e86e7f27f44791ee9181900360200190a28661093057838360405160200180836001600160a01b0316815260200180602001828103825283818151815260200191508051906020019080838360005b838110156108cc5781810151838201526020016108b4565b50505050905090810190601f1680156108f95780820380516001836020036101000a031916815260200191505b5060408051601f1981840301815291815260008b815260036020908152919020825161092e9750909550910192509050611302565b505b50505b505050509392505050565b60045481565b7f000000000000000000000000eb1cd9e44ab6bfe5a55ee96c468086e51b1b873a81565b6002600160a01b0381565b6201000085106109be576040805162461bcd60e51b81526020600482015260116024820152700d2dcecc2d8d2c840d8cac2cc92dcc8caf607b1b604482015290519081900360640190fd5b60045460058054600101908190551115610a05576040805162461bcd60e51b8152602060048201526003602482015262195b9960ea1b604482015290519081900360640190fd5b60015480610a42576040805162461bcd60e51b8152602060048201526005602482015264085c9bdbdd60da1b604482015290519081900360640190fd5b60008585858560405160200180858152602001846001600160a01b0316815260200180602001828103825284848281815260200192508082843760008184015260408051601f19601f909301831690940184810390920184525250805160209091012096507f28cf91ac064e179f8a42e4b7a20ba080187781da55fd4f3f18870b7a25bacb559550505050828414801592509050610aef575060008281526002602052604090205460ff16155b610b29576040805162461bcd60e51b815260206004808301919091526024820152631d5cd95960e21b604482015290519081900360640190fd5b60008281526002602052604090819020805460ff191660011790558051610200818101909252610b74918b9060109083908390808284376000920191909152508b915085905061100b565b8314610bb0576040805162461bcd60e51b815260206004820152600660248201526510b83937b7b360d11b604482015290519081900360640190fd5b60405187907f8797144948782adcede8e04bfa0bd8fd56941e0df7508bd02a629b477f7b073a90600090a2604080516313629df560e11b81526004810189815260248201928352604482018790526001600160a01b038916926326c53bea928b928a928a92606401848480828437600081840152601f19601f820116905080830192505050945050505050600060405180830381600087803b158015610c5557600080fd5b505af1158015610c69573d6000803e3d6000fd5b50505050505050505050505050565b60005481565b60036020908152600091825260409182902080548351601f600260001961010060018616150201909316929092049182018490048402810184019094528084529091830182828015610d115780601f10610ce657610100808354040283529160200191610d11565b820191906000526020600020905b815481529060010190602001808311610cf457829003601f168201915b505050505081565b60055481565b60015481565b60026020526000908152604090205460ff1681565b336001600160a01b037f000000000000000000000000eb1cd9e44ab6bfe5a55ee96c468086e51b1b873a1614610da5576040805162461bcd60e51b815260206004820152600b60248201526a10b937b7ba29b2ba3a32b960a91b604482015290519081900360640190fd5b600191909155600455565b601081565b610dbd611380565b5060408051808201909152815181526020828101908201525b919050565b6060610de6826110b6565b610def57600080fd5b6000610dfa836110f0565b905060608167ffffffffffffffff81118015610e1557600080fd5b50604051908082528060200260200182016040528015610e4f57816020015b610e3c611380565b815260200190600190039081610e345790505b5090506000610e618560200151611148565b60208601510190506000805b84811015610eb857610e7e836111ab565b9150604051806040016040528083815260200184815250848281518110610ea157fe5b602090810291909101015291810191600101610e6d565b5085516020870151830314610f0a576040805162461bcd60e51b81526020600482015260136024820152722bb937b733903a37ba30b6103632b733ba341760691b604482015290519081900360640190fd5b5090949350505050565b805160009015801590610f2957508151602110155b610f3257600080fd5b600080610f3e84611244565b815191935091506020821015610f5a5760208290036101000a90045b949350505050565b8051600090601514610f7357600080fd5b610f7c82610f14565b92915050565b8051606090610f9057600080fd5b600080610f9c84611244565b9150915060608167ffffffffffffffff81118015610fb957600080fd5b506040519080825280601f01601f191660200182016040528015610fe4576020820181803683370190505b50905060208101610ff684828561126a565b50949350505050565b3b63ffffffff16151590565b600081815b6010811015610ff657600185821c8116141561106c5785816010811061103257fe5b60200201518260405160200180838152602001828152602001925050506040516020818303038152906040528051906020012091506110ae565b8186826010811061107957fe5b602002015160405160200180838152602001828152602001925050506040516020818303038152906040528051906020012091505b600101611010565b80516000906110c757506000610dd6565b6020820151805160001a9060c08210156110e657600092505050610dd6565b5060019392505050565b805160009061110157506000610dd6565b6000806111118460200151611148565b602085015185519181019250015b8082101561113f57611130826111ab565b6001909301929091019061111f565b50909392505050565b8051600090811a6080811015611162576000915050610dd6565b60b881108061117d575060c0811080159061117d575060f881105b1561118c576001915050610dd6565b60c08110156111a05760b519019050610dd6565b60f519019050610dd6565b80516000908190811a60808110156111c6576001915061123d565b60b88110156111db57607e198101915061123d565b60c08110156112085760b78103600185019450806020036101000a8551046001820181019350505061123d565b60f881101561121d5760be198101915061123d565b60f78103600185019450806020036101000a855104600182018101935050505b5092915050565b60008060006112568460200151611148565b602085015194519481019594039392505050565b80611274576112b6565b5b60208110611294578251825260209283019290910190601f1901611275565b80156112b6578251825160208390036101000a60001901801990921691161782525b505050565b50805460018160011615610100020316600290046000825580601f106112e157506112ff565b601f0160209004906000526020600020908101906112ff919061139a565b50565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061134357805160ff1916838001178555611370565b82800160010185558215611370579182015b82811115611370578251825591602001919060010190611355565b5061137c92915061139a565b5090565b604051806040016040528060008152602001600081525090565b5b8082111561137c576000815560010161139b56fea164736f6c634300060c000a"
+ },
+ "0000000000000000000000000000000000001010": {
+ "balance": "0x0",
+ "code": "0x6080604052600436106101b75760003560e01c80638da5cb5b116100ec578063b789543c1161008a578063e614d0d611610064578063e614d0d614610695578063ed9ef524146106aa578063f2fde38b146106dd578063fc0c546a14610710576101b7565b8063b789543c14610626578063cc79f97b1461066b578063e306f77914610680576101b7565b806395d89b41116100c657806395d89b41146105a6578063a9059cbb146105bb578063abceeba2146105e7578063acd06cb3146105fc576101b7565b80638da5cb5b146105535780638f32d59b146105685780639025e64c14610591576101b7565b806347e7ef241161015957806370a082311161013357806370a082311461043c578063715018a61461046f578063771282f61461048457806377d32e9414610499576101b7565b806347e7ef24146103b3578063485cc955146103ec57806360f96a8f14610427576101b7565b806319d27d9c1161019557806319d27d9c146102a25780632e1a7d4d14610356578063313ce5671461037357806342fc47fb1461039e576101b7565b806306fdde03146101bc5780631499c5921461024657806318160ddd1461027b575b600080fd5b3480156101c857600080fd5b506101d1610725565b6040805160208082528351818301528351919283929083019185019080838360005b8381101561020b5781810151838201526020016101f3565b50505050905090810190601f1680156102385780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b34801561025257600080fd5b506102796004803603602081101561026957600080fd5b50356001600160a01b031661075c565b005b34801561028757600080fd5b5061029061079c565b60408051918252519081900360200190f35b3480156102ae57600080fd5b5061033a600480360360a08110156102c557600080fd5b8101906020810181356401000000008111156102e057600080fd5b8201836020820111156102f257600080fd5b8035906020019184600183028401116401000000008311171561031457600080fd5b9193509150803590602081013590604081013590606001356001600160a01b03166107ac565b604080516001600160a01b039092168252519081900360200190f35b6102796004803603602081101561036c57600080fd5b50356107ee565b34801561037f57600080fd5b506103886108c6565b6040805160ff9092168252519081900360200190f35b3480156103aa57600080fd5b5061033a6108cb565b3480156103bf57600080fd5b50610279600480360360408110156103d657600080fd5b506001600160a01b0381351690602001356108da565b3480156103f857600080fd5b506102796004803603604081101561040f57600080fd5b506001600160a01b03813581169160200135166109a8565b34801561043357600080fd5b5061033a610a21565b34801561044857600080fd5b506102906004803603602081101561045f57600080fd5b50356001600160a01b0316610a30565b34801561047b57600080fd5b50610279610a3d565b34801561049057600080fd5b50610290610a98565b3480156104a557600080fd5b5061033a600480360360408110156104bc57600080fd5b813591908101906040810160208201356401000000008111156104de57600080fd5b8201836020820111156104f057600080fd5b8035906020019184600183028401116401000000008311171561051257600080fd5b91908080601f016020809104026020016040519081016040528093929190818152602001838380828437600092019190915250929550610a9e945050505050565b34801561055f57600080fd5b5061033a610bc2565b34801561057457600080fd5b5061057d610bd1565b604080519115158252519081900360200190f35b34801561059d57600080fd5b506101d1610be2565b3480156105b257600080fd5b506101d1610c00565b61057d600480360360408110156105d157600080fd5b506001600160a01b038135169060200135610c1d565b3480156105f357600080fd5b50610290610c40565b34801561060857600080fd5b5061057d6004803603602081101561061f57600080fd5b5035610cc9565b34801561063257600080fd5b506102906004803603608081101561064957600080fd5b506001600160a01b038135169060208101359060408101359060600135610cde565b34801561067757600080fd5b50610290610cfd565b34801561068c57600080fd5b50610290610d03565b3480156106a157600080fd5b50610290610d09565b3480156106b657600080fd5b50610279600480360360208110156106cd57600080fd5b50356001600160a01b0316610d53565b3480156106e957600080fd5b506102796004803603602081101561070057600080fd5b50356001600160a01b0316610e05565b34801561071c57600080fd5b5061033a610e22565b60408051808201909152601781527f506f6c79676f6e2045636f73797374656d20546f6b656e000000000000000000602082015290565b6040805162461bcd60e51b815260206004820152601060248201526f44697361626c6564206665617475726560801b604482015290519081900360640190fd5b6b204fce5e3e2502611000000090565b6040805162461bcd60e51b815260206004820152601060248201526f44697361626c6564206665617475726560801b6044820152905160009181900360640190fd5b3360006107fa82610a30565b600654909150610810908463ffffffff610e3116565b600655821580159061082157508234145b610868576040805162461bcd60e51b8152602060048201526013602482015272125b9cdd59999a58da595b9d08185b5bdd5b9d606a1b604482015290519081900360640190fd5b6002546001600160a01b0380841691167febff2602b3f468259e1e99f613fed6691f3a6526effe6ef3e768ba7ae7a36c4f85846108a487610a30565b60408051938452602084019290925282820152519081900360600190a3505050565b601290565b6003546001600160a01b031681565b6108e2610bd1565b6108eb57600080fd5b60008111801561090357506001600160a01b03821615155b61093e5760405162461bcd60e51b815260040180806020018281038252602381526020018061138d6023913960400191505060405180910390fd5b600061094983610a30565b60065490915061095f908363ffffffff610e4616565b60065561096c8383610e58565b6002546001600160a01b0380851691167f4e2ca0515ed1aef1395f66b5303bb5d6f1bf9d61a353fa53f73f8ac9973fa9f684846108a488610a30565b60075460ff16156109ea5760405162461bcd60e51b815260040180806020018281038252602381526020018061136a6023913960400191505060405180910390fd5b6007805460ff19166001179055600280546001600160a01b0383166001600160a01b0319909116179055610a1d82610f17565b5050565b6004546001600160a01b031681565b6001600160a01b03163190565b610a45610bd1565b610a4e57600080fd5b600080546040516001600160a01b03909116907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0908390a3600080546001600160a01b0319169055565b60065481565b6000806000808451604114610ab95760009350505050610bbc565b50505060208201516040830151604184015160ff16601b811015610adb57601b015b8060ff16601b14158015610af357508060ff16601c14155b15610b045760009350505050610bbc565b6040805160008152602080820180845289905260ff8416828401526060820186905260808201859052915160019260a0808401939192601f1981019281900390910190855afa158015610b5b573d6000803e3d6000fd5b5050604051601f1901519450506001600160a01b038416610bb8576040805162461bcd60e51b815260206004820152601260248201527122b93937b91034b71032b1b932b1b7bb32b960711b604482015290519081900360640190fd5b5050505b92915050565b6000546001600160a01b031690565b6000546001600160a01b0316331490565b604051806040016040528060028152602001613a9960f01b81525081565b6040805180820190915260038152621413d360ea1b602082015290565b6000813414610c2e57506000610bbc565b610c39338484610f85565b9392505050565b6040518060800160405280605b8152602001611434605b91396040516020018082805190602001908083835b60208310610c8b5780518252601f199092019160209182019101610c6c565b6001836020036101000a0380198251168184511680821785525050505050509050019150506040516020818303038152906040528051906020012081565b60056020526000908152604090205460ff1681565b6000610cf4610cef868686866111d2565b61128b565b95945050505050565b613a9981565b60015481565b6040518060800160405280605281526020016113b06052913960405160200180828051906020019080838360208310610c8b5780518252601f199092019160209182019101610c6c565b610d5b610bd1565b610d6457600080fd5b6001600160a01b038116610da95760405162461bcd60e51b81526004018080602001828103825260328152602001806114026032913960400191505060405180910390fd5b6003546040516001600160a01b038084169216907f1f9f3556dd336016cdf20adaead7d5c73665dba664b60e8c17e9a4eb91ce1d3990600090a3600380546001600160a01b0319166001600160a01b0392909216919091179055565b610e0d610bd1565b610e1657600080fd5b610e1f81610f17565b50565b6002546001600160a01b031681565b600082821115610e4057600080fd5b50900390565b600082820183811015610c3957600080fd5b60085415610e9a576040805162461bcd60e51b815260206004820152600a6024820152697265656e7472616e637960b01b604482015290519081900360640190fd5b6001600855604051611388906000906060906001600160a01b038616908490869085818181858888f193505050503d8060008114610ef4576040519150601f19603f3d011682016040523d82523d6000602084013e610ef9565b606091505b509150915081610f0b57805160208201fd5b50506000600855505050565b6001600160a01b038116610f2a57600080fd5b600080546040516001600160a01b03808516939216917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e091a3600080546001600160a01b0319166001600160a01b0392909216919091179055565b604080516370a0823160e01b81526001600160a01b03851660048201529051600091829130916370a08231916024808301926020929190829003018186803b158015610fd057600080fd5b505afa158015610fe4573d6000803e3d6000fd5b505050506040513d6020811015610ffa57600080fd5b5051604080516370a0823160e01b81526001600160a01b0387166004820152905191925060009130916370a08231916024808301926020929190829003018186803b15801561104857600080fd5b505afa15801561105c573d6000803e3d6000fd5b505050506040513d602081101561107257600080fd5b50519050611081868686611299565b600254604080516370a0823160e01b81526001600160a01b03898116600483018190529251818a1694909116917fe6497e3ee548a3372136af2fcb0696db31fc6cf20260707645068bd3fe97f3c49189918891889130916370a0823191602480820192602092909190829003018186803b1580156110fe57600080fd5b505afa158015611112573d6000803e3d6000fd5b505050506040513d602081101561112857600080fd5b5051604080516370a0823160e01b81526001600160a01b038f166004820152905130916370a08231916024808301926020929190829003018186803b15801561117057600080fd5b505afa158015611184573d6000803e3d6000fd5b505050506040513d602081101561119a57600080fd5b50516040805195865260208601949094528484019290925260608401526080830152519081900360a00190a450600195945050505050565b6000806040518060800160405280605b8152602001611434605b91396040516020018082805190602001908083835b602083106112205780518252601f199092019160209182019101611201565b51815160209384036101000a60001901801990921691161790526040805192909401828103601f1901835280855282519282019290922082526001600160a01b039b909b169a81019a909a5250880196909652505050606084019190915260808301525060a0902090565b6000610bbc82600154611347565b6001600160a01b0382163014156112ed576040805162461bcd60e51b8152602060048201526013602482015272063616e27742073656e6420746f204d5243323606c1b604482015290519081900360640190fd5b6112f78282610e58565b816001600160a01b0316836001600160a01b03167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef836040518082815260200191505060405180910390a3505050565b60405161190160f01b815260028101919091526022810191909152604290209056fe54686520636f6e747261637420697320616c726561647920696e697469616c697a6564496e73756666696369656e7420616d6f756e74206f7220696e76616c69642075736572454950373132446f6d61696e28737472696e67206e616d652c737472696e672076657273696f6e2c75696e7432353620636861696e49642c6164647265737320766572696679696e67436f6e7472616374294368696c6420746f6b656e3a206e6577206368696c64206164647265737320697320746865207a65726f2061646472657373546f6b656e5472616e736665724f726465722861646472657373207370656e6465722c75696e7432353620746f6b656e49644f72416d6f756e742c6279746573333220646174612c75696e743235362065787069726174696f6e29a265627a7a723158205f23be7574e70cfc01d0cfd6803b871f92465e9ae4a10fe95ed31ccb810bda3e64736f6c63430005110032"
+ },
+ "0d500B1d8E8eF31E21C99d1Db9A6444d3ADf1270": {
+ "balance": "0x0",
+ "code": "0x6080604052600436106100af576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806306fdde03146100b9578063095ea7b31461014957806318160ddd146101ae57806323b872dd146101d95780632e1a7d4d1461025e578063313ce5671461028b57806370a08231146102bc57806395d89b4114610313578063a9059cbb146103a3578063d0e30db014610408578063dd62ed3e14610412575b6100b7610489565b005b3480156100c557600080fd5b506100ce610526565b6040518080602001828103825283818151815260200191508051906020019080838360005b8381101561010e5780820151818401526020810190506100f3565b50505050905090810190601f16801561013b5780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b34801561015557600080fd5b50610194600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050610563565b604051808215151515815260200191505060405180910390f35b3480156101ba57600080fd5b506101c3610655565b6040518082815260200191505060405180910390f35b3480156101e557600080fd5b50610244600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050610674565b604051808215151515815260200191505060405180910390f35b34801561026a57600080fd5b50610289600480360381019080803590602001909291905050506109c1565b005b34801561029757600080fd5b506102a0610af4565b604051808260ff1660ff16815260200191505060405180910390f35b3480156102c857600080fd5b506102fd600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610afd565b6040518082815260200191505060405180910390f35b34801561031f57600080fd5b50610328610b15565b6040518080602001828103825283818151815260200191508051906020019080838360005b8381101561036857808201518184015260208101905061034d565b50505050905090810190601f1680156103955780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b3480156103af57600080fd5b506103ee600480360381019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050610b52565b604051808215151515815260200191505060405180910390f35b610410610489565b005b34801561041e57600080fd5b50610473600480360381019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610b67565b6040518082815260200191505060405180910390f35b34600360003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600082825401925050819055503373ffffffffffffffffffffffffffffffffffffffff167fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c346040518082815260200191505060405180910390a2565b60606040805190810160405280601f81526020017f5772617070656420506f6c79676f6e2045636f73797374656d20546f6b656e00815250905090565b600081600460003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508273ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925846040518082815260200191505060405180910390a36001905092915050565b60003073ffffffffffffffffffffffffffffffffffffffff1631905090565b600081600360008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054101515156106c457600080fd5b3373ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff161415801561079c57507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff600460008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205414155b156108b75781600460008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015151561082c57600080fd5b81600460008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600082825403925050819055505b81600360008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206000828254039250508190555081600360008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600082825401925050819055508273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a3600190509392505050565b80600360003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205410151515610a0f57600080fd5b80600360003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600082825403925050819055503373ffffffffffffffffffffffffffffffffffffffff166108fc829081150290604051600060405180830381858888f19350505050158015610aa2573d6000803e3d6000fd5b503373ffffffffffffffffffffffffffffffffffffffff167f7fcf532c15f0a6db0bd6d0e038bea71d30d808c7d98cb3bf7268a95bf5081b65826040518082815260200191505060405180910390a250565b60006012905090565b60036020528060005260406000206000915090505481565b60606040805190810160405280600481526020017f57504f4c00000000000000000000000000000000000000000000000000000000815250905090565b6000610b5f338484610674565b905092915050565b60046020528160005260406000206020528060005260406000206000915091505054815600a165627a7a723058208d70d8aa2d752533105b5ccda8206dae8b0c1de765f89fb1f0c5727cbac1b40d0029"
+ }
}
},
"jaipurBlock": 23850000,
"delhiBlock": 38189056,
"indoreBlock": 44934656,
"agraBlock": 50523000,
- "napoliBlock": 54876000
+ "napoliBlock": 54876000,
+ "ahmedabadBlock": 62278656
}
}
diff --git a/params/version.go b/params/version.go
index 480441fe0f9..80bd98c4730 100644
--- a/params/version.go
+++ b/params/version.go
@@ -37,7 +37,7 @@ const (
VersionMajor = 1 // Major version component of the current release
VersionMinor = 3 // Minor version component of the current release
VersionMicro = 0 // Patch version component of the current release
- VersionModifier = "alpha3" // Modifier component of the current release
+ VersionModifier = "alpha4" // Modifier component of the current release
VersionKeyCreated = "ErigonVersionCreated"
VersionKeyFinished = "ErigonVersionFinished"
)
diff --git a/polygon/bor/borcfg/bor_config.go b/polygon/bor/borcfg/bor_config.go
index 248d2fbedaf..0509e6a0b4c 100644
--- a/polygon/bor/borcfg/bor_config.go
+++ b/polygon/bor/borcfg/bor_config.go
@@ -167,6 +167,10 @@ func (c *BorConfig) CalculateStateSyncDelay(number uint64) uint64 {
return borKeyValueConfigHelper(c.StateSyncConfirmationDelay, number)
}
+func (c *BorConfig) GetStateReceiverContract() string {
+ return c.StateReceiverContract
+}
+
func borKeyValueConfigHelper[T uint64 | common.Address](field map[string]T, number uint64) T {
fieldUint := make(map[uint64]T)
for k, v := range field {
diff --git a/polygon/bor/valset/validator.go b/polygon/bor/valset/validator.go
index aea5fd48c25..3513915f86d 100644
--- a/polygon/bor/valset/validator.go
+++ b/polygon/bor/valset/validator.go
@@ -91,8 +91,9 @@ func (v *Validator) String() string {
return "nil-Validator"
}
- return fmt.Sprintf("Validator{%v Power:%v Priority:%v}",
+ return fmt.Sprintf("Validator{%v ID: %v Power:%v Priority:%v}",
v.Address.Hex(),
+ v.ID,
v.VotingPower,
v.ProposerPriority)
}
diff --git a/polygon/bridge/bridge.go b/polygon/bridge/bridge.go
index 6f38f651bf1..7d4486b2464 100644
--- a/polygon/bridge/bridge.go
+++ b/polygon/bridge/bridge.go
@@ -31,6 +31,7 @@ import (
"github.com/erigontech/erigon/polygon/polygoncommon"
libcommon "github.com/erigontech/erigon-lib/common"
+ liberrors "github.com/erigontech/erigon-lib/common/errors"
"github.com/erigontech/erigon/core/types"
"github.com/erigontech/erigon/polygon/bor/borcfg"
"github.com/erigontech/erigon/polygon/heimdall"
@@ -40,11 +41,19 @@ type eventFetcher interface {
FetchStateSyncEvents(ctx context.Context, fromId uint64, to time.Time, limit int) ([]*heimdall.EventRecordWithTime, error)
}
-func Assemble(dataDir string, logger log.Logger, borConfig *borcfg.BorConfig, eventFetcher eventFetcher) *Bridge {
- bridgeDB := polygoncommon.NewDatabase(dataDir, kv.PolygonBridgeDB, databaseTablesCfg, logger)
+type Config struct {
+ DataDir string
+ Logger log.Logger
+ BorConfig *borcfg.BorConfig
+ EventFetcher eventFetcher
+ RoTxLimit int64
+}
+
+func Assemble(config Config) *Bridge {
+ bridgeDB := polygoncommon.NewDatabase(config.DataDir, kv.PolygonBridgeDB, databaseTablesCfg, config.Logger, false /* accede */, config.RoTxLimit)
bridgeStore := NewStore(bridgeDB)
- reader := NewReader(bridgeStore, logger, borConfig.StateReceiverContract)
- return NewBridge(bridgeStore, logger, borConfig, eventFetcher, reader)
+ reader := NewReader(bridgeStore, config.Logger, config.BorConfig.StateReceiverContract)
+ return NewBridge(bridgeStore, config.Logger, config.BorConfig, config.EventFetcher, reader)
}
func NewBridge(store Store, logger log.Logger, borConfig *borcfg.BorConfig, eventFetcher eventFetcher, reader *Reader) *Bridge {
@@ -55,6 +64,7 @@ func NewBridge(store Store, logger log.Logger, borConfig *borcfg.BorConfig, even
eventFetcher: eventFetcher,
stateReceiverContractAddress: libcommon.HexToAddress(borConfig.StateReceiverContract),
reader: reader,
+ transientErrors: []error{context.DeadlineExceeded, heimdall.ErrBadGateway},
fetchedEventsSignal: make(chan struct{}),
processedBlocksSignal: make(chan struct{}),
}
@@ -67,6 +77,7 @@ type Bridge struct {
eventFetcher eventFetcher
stateReceiverContractAddress libcommon.Address
reader *Reader
+ transientErrors []error
// internal state
reachedTip atomic.Bool
fetchedEventsSignal chan struct{}
@@ -124,10 +135,22 @@ func (b *Bridge) Run(ctx context.Context) error {
default:
}
- // start scrapping events
+ // start scraping events
+ from := lastFetchedEventID + 1
to := time.Now()
- events, err := b.eventFetcher.FetchStateSyncEvents(ctx, lastFetchedEventID+1, to, heimdall.StateEventsFetchLimit)
+ events, err := b.eventFetcher.FetchStateSyncEvents(ctx, from, to, heimdall.StateEventsFetchLimit)
if err != nil {
+ if liberrors.IsOneOf(err, b.transientErrors) {
+ b.logger.Warn(
+ bridgeLogPrefix("scraper transient err occurred"),
+ "from", from,
+ "to", to.Format(time.RFC3339),
+ "err", err,
+ )
+
+ continue
+ }
+
return err
}
diff --git a/polygon/bridge/bridge_test.go b/polygon/bridge/bridge_test.go
index ca312887e04..89ed7f09ce6 100644
--- a/polygon/bridge/bridge_test.go
+++ b/polygon/bridge/bridge_test.go
@@ -30,7 +30,14 @@ func setup(t *testing.T, borConfig borcfg.BorConfig) (*heimdall.MockHeimdallClie
ctrl := gomock.NewController(t)
logger := testlog.Logger(t, log.LvlDebug)
heimdallClient := heimdall.NewMockHeimdallClient(ctrl)
- b := Assemble(t.TempDir(), logger, &borConfig, heimdallClient)
+ cfg := Config{
+ DataDir: t.TempDir(),
+ Logger: logger,
+ BorConfig: &borConfig,
+ EventFetcher: heimdallClient,
+ RoTxLimit: 1,
+ }
+ b := Assemble(cfg)
t.Cleanup(b.Close)
return heimdallClient, b
}
diff --git a/polygon/bridge/reader.go b/polygon/bridge/reader.go
index c89265bd04e..045ae05bf91 100644
--- a/polygon/bridge/reader.go
+++ b/polygon/bridge/reader.go
@@ -5,15 +5,18 @@ import (
"errors"
"fmt"
+ "google.golang.org/grpc"
+ "google.golang.org/protobuf/types/known/emptypb"
+
libcommon "github.com/erigontech/erigon-lib/common"
+ "github.com/erigontech/erigon-lib/gointerfaces"
+ remote "github.com/erigontech/erigon-lib/gointerfaces/remoteproto"
+ "github.com/erigontech/erigon-lib/kv"
"github.com/erigontech/erigon-lib/log/v3"
"github.com/erigontech/erigon/common/u256"
"github.com/erigontech/erigon/core"
"github.com/erigontech/erigon/core/state"
"github.com/erigontech/erigon/core/types"
- "github.com/erigontech/erigon/polygon/bor/borcfg"
-
- "github.com/erigontech/erigon-lib/kv"
"github.com/erigontech/erigon/polygon/polygoncommon"
)
@@ -23,16 +26,24 @@ type Reader struct {
stateClientAddress libcommon.Address
}
-func AssembleReader(ctx context.Context, dataDir string, logger log.Logger, borConfig *borcfg.BorConfig) (*Reader, error) {
- bridgeDB := polygoncommon.NewDatabase(dataDir, kv.PolygonBridgeDB, databaseTablesCfg, logger)
+type ReaderConfig struct {
+ Ctx context.Context
+ DataDir string
+ Logger log.Logger
+ StateReceiverContractAddress string
+ RoTxLimit int64
+}
+
+func AssembleReader(config ReaderConfig) (*Reader, error) {
+ bridgeDB := polygoncommon.NewDatabase(config.DataDir, kv.PolygonBridgeDB, databaseTablesCfg, config.Logger, true /* accede */, config.RoTxLimit)
bridgeStore := NewStore(bridgeDB)
- err := bridgeStore.Prepare(ctx)
+ err := bridgeStore.Prepare(config.Ctx)
if err != nil {
return nil, err
}
- return NewReader(bridgeStore, logger, borConfig.StateReceiverContract), nil
+ return NewReader(bridgeStore, config.Logger, config.StateReceiverContractAddress), nil
}
func NewReader(store Store, logger log.Logger, stateReceiverContractAddress string) *Reader {
@@ -91,3 +102,84 @@ func (r *Reader) EventTxnLookup(ctx context.Context, borTxHash libcommon.Hash) (
func (r *Reader) Close() {
r.store.Close()
}
+
+type RemoteReader struct {
+ client remote.BridgeBackendClient
+ logger log.Logger
+ version gointerfaces.Version
+}
+
+func NewRemoteReader(client remote.BridgeBackendClient) *RemoteReader {
+ return &RemoteReader{
+ client: client,
+ logger: log.New("remote_service", "bridge"),
+ version: gointerfaces.VersionFromProto(APIVersion),
+ }
+}
+
+func (r *RemoteReader) Events(ctx context.Context, blockNum uint64) ([]*types.Message, error) {
+ reply, err := r.client.BorEvents(ctx, &remote.BorEventsRequest{BlockNum: blockNum})
+ if err != nil {
+ return nil, err
+ }
+ if reply == nil {
+ return nil, nil
+ }
+
+ stateReceiverContractAddress := libcommon.HexToAddress(reply.StateReceiverContractAddress)
+ result := make([]*types.Message, len(reply.EventRlps))
+ for i, event := range reply.EventRlps {
+ result[i] = messageFromData(stateReceiverContractAddress, event)
+ }
+
+ return result, nil
+}
+
+func (r *RemoteReader) EventTxnLookup(ctx context.Context, borTxHash libcommon.Hash) (uint64, bool, error) {
+ reply, err := r.client.BorTxnLookup(ctx, &remote.BorTxnLookupRequest{BorTxHash: gointerfaces.ConvertHashToH256(borTxHash)})
+ if err != nil {
+ return 0, false, err
+ }
+ if reply == nil {
+ return 0, false, nil
+ }
+
+ return reply.BlockNumber, reply.Present, nil
+}
+
+// Close implements bridge.ReaderService. It's a noop as there is no attached store.
+func (r *RemoteReader) Close() {
+ return
+}
+
+func (r *RemoteReader) EnsureVersionCompatibility() bool {
+ versionReply, err := r.client.Version(context.Background(), &emptypb.Empty{}, grpc.WaitForReady(true))
+ if err != nil {
+ r.logger.Error("getting Version", "err", err)
+ return false
+ }
+ if !gointerfaces.EnsureVersion(r.version, versionReply) {
+ r.logger.Error("incompatible interface versions", "client", r.version.String(),
+ "server", fmt.Sprintf("%d.%d.%d", versionReply.Major, versionReply.Minor, versionReply.Patch))
+ return false
+ }
+ r.logger.Info("interfaces compatible", "client", r.version.String(),
+ "server", fmt.Sprintf("%d.%d.%d", versionReply.Major, versionReply.Minor, versionReply.Patch))
+ return true
+}
+
+func messageFromData(to libcommon.Address, data []byte) *types.Message {
+ msg := types.NewMessage(
+ state.SystemAddress,
+ &to,
+ 0, u256.Num0,
+ core.SysCallGasLimit,
+ u256.Num0,
+ nil, nil,
+ data, nil, false,
+ true,
+ nil,
+ )
+
+ return &msg
+}
diff --git a/polygon/bridge/server.go b/polygon/bridge/server.go
new file mode 100644
index 00000000000..5d8cbd1f1e3
--- /dev/null
+++ b/polygon/bridge/server.go
@@ -0,0 +1,66 @@
+package bridge
+
+import (
+ "context"
+
+ "google.golang.org/protobuf/types/known/emptypb"
+
+ libcommon "github.com/erigontech/erigon-lib/common"
+ "github.com/erigontech/erigon-lib/gointerfaces"
+ "github.com/erigontech/erigon-lib/gointerfaces/remoteproto"
+ "github.com/erigontech/erigon-lib/gointerfaces/typesproto"
+ "github.com/erigontech/erigon/core/types"
+)
+
+type bridgeReader interface {
+ Events(ctx context.Context, blockNum uint64) ([]*types.Message, error)
+ EventTxnLookup(ctx context.Context, borTxHash libcommon.Hash) (uint64, bool, error)
+}
+
+var APIVersion = &typesproto.VersionReply{Major: 1, Minor: 0, Patch: 0}
+
+type BackendServer struct {
+ remoteproto.UnimplementedBridgeBackendServer // must be embedded to have forward compatible implementations.
+
+ ctx context.Context
+ bridgeReader bridgeReader
+}
+
+func NewBackendServer(ctx context.Context, bridgeReader bridgeReader) *BackendServer {
+ return &BackendServer{
+ ctx: ctx,
+ bridgeReader: bridgeReader,
+ }
+}
+
+func (b *BackendServer) Version(ctx context.Context, in *emptypb.Empty) (*typesproto.VersionReply, error) {
+ return APIVersion, nil
+}
+
+func (b *BackendServer) BorTxnLookup(ctx context.Context, in *remoteproto.BorTxnLookupRequest) (*remoteproto.BorTxnLookupReply, error) {
+ blockNum, ok, err := b.bridgeReader.EventTxnLookup(ctx, gointerfaces.ConvertH256ToHash(in.BorTxHash))
+ if err != nil {
+ return nil, err
+ }
+
+ return &remoteproto.BorTxnLookupReply{
+ Present: ok,
+ BlockNumber: blockNum,
+ }, nil
+}
+
+func (b *BackendServer) BorEvents(ctx context.Context, in *remoteproto.BorEventsRequest) (*remoteproto.BorEventsReply, error) {
+ events, err := b.bridgeReader.Events(ctx, in.BlockNum)
+ if err != nil {
+ return nil, err
+ }
+
+ eventsRaw := make([][]byte, len(events))
+ for i, event := range events {
+ eventsRaw[i] = event.Data()
+ }
+
+ return &remoteproto.BorEventsReply{
+ EventRlps: eventsRaw,
+ }, nil
+}
diff --git a/polygon/heimdall/reader.go b/polygon/heimdall/reader.go
new file mode 100644
index 00000000000..f423038b976
--- /dev/null
+++ b/polygon/heimdall/reader.go
@@ -0,0 +1,141 @@
+package heimdall
+
+import (
+ "context"
+ "fmt"
+
+ "google.golang.org/grpc"
+ "google.golang.org/protobuf/types/known/emptypb"
+
+ libcommon "github.com/erigontech/erigon-lib/common"
+ "github.com/erigontech/erigon-lib/gointerfaces"
+ remote "github.com/erigontech/erigon-lib/gointerfaces/remoteproto"
+ "github.com/erigontech/erigon-lib/log/v3"
+ "github.com/erigontech/erigon/polygon/bor/valset"
+)
+
+type Reader struct {
+ logger log.Logger
+ store ServiceStore
+ spanBlockProducersTracker *spanBlockProducersTracker
+}
+
+type ReaderConfig struct {
+ Ctx context.Context
+ CalculateSprintNumberFn CalculateSprintNumberFunc
+ DataDir string
+ TempDir string
+ Logger log.Logger
+ RoTxLimit int64
+}
+
+// AssembleReader creates and opens the MDBX store. For use cases where the store is only being read from. Must call Close.
+func AssembleReader(config ReaderConfig) (*Reader, error) {
+ store := NewMdbxServiceStore(config.Logger, config.DataDir, config.TempDir, config.RoTxLimit)
+
+ err := store.Prepare(config.Ctx)
+ if err != nil {
+ return nil, err
+ }
+
+ return NewReader(config.CalculateSprintNumberFn, store, config.Logger), nil
+}
+
+func NewReader(calculateSprintNumber CalculateSprintNumberFunc, store ServiceStore, logger log.Logger) *Reader {
+ return &Reader{
+ logger: logger,
+ store: store,
+ spanBlockProducersTracker: newSpanBlockProducersTracker(logger, calculateSprintNumber, store.SpanBlockProducerSelections()),
+ }
+}
+
+func (r *Reader) Span(ctx context.Context, id uint64) (*Span, bool, error) {
+ return r.store.Spans().Entity(ctx, id)
+}
+
+func (r *Reader) CheckpointsFromBlock(ctx context.Context, startBlock uint64) (Waypoints, error) {
+ entities, err := r.store.Checkpoints().RangeFromBlockNum(ctx, startBlock)
+ return libcommon.SliceMap(entities, castEntityToWaypoint[*Checkpoint]), err
+}
+
+func (r *Reader) MilestonesFromBlock(ctx context.Context, startBlock uint64) (Waypoints, error) {
+ entities, err := r.store.Milestones().RangeFromBlockNum(ctx, startBlock)
+ return libcommon.SliceMap(entities, castEntityToWaypoint[*Milestone]), err
+}
+
+func (r *Reader) Producers(ctx context.Context, blockNum uint64) (*valset.ValidatorSet, error) {
+ return r.spanBlockProducersTracker.Producers(ctx, blockNum)
+}
+
+func (r *Reader) Close() {
+ r.store.Close()
+}
+
+type RemoteReader struct {
+ client remote.HeimdallBackendClient
+ logger log.Logger
+ version gointerfaces.Version
+}
+
+func NewRemoteReader(client remote.HeimdallBackendClient) *RemoteReader {
+ return &RemoteReader{
+ client: client,
+ logger: log.New("remote_service", "heimdall"),
+ version: gointerfaces.VersionFromProto(APIVersion),
+ }
+}
+
+func (r *RemoteReader) Producers(ctx context.Context, blockNum uint64) (*valset.ValidatorSet, error) {
+ reply, err := r.client.Producers(ctx, &remote.BorProducersRequest{BlockNum: blockNum})
+ if err != nil {
+ return nil, err
+ }
+ if reply == nil {
+ return nil, nil
+ }
+
+ validators := reply.Validators
+ proposer := reply.Proposer
+
+ v := make([]*valset.Validator, len(validators))
+ for i, validator := range validators {
+ v[i] = decodeValidator(validator)
+ }
+
+ validatorSet := valset.ValidatorSet{
+ Proposer: decodeValidator(proposer),
+ Validators: v,
+ }
+
+ return &validatorSet, nil
+}
+
+// Close implements bridge.ReaderService. It's a noop as there is no attached store.
+func (r *RemoteReader) Close() {
+ return
+}
+
+func (r *RemoteReader) EnsureVersionCompatibility() bool {
+ versionReply, err := r.client.Version(context.Background(), &emptypb.Empty{}, grpc.WaitForReady(true))
+ if err != nil {
+ r.logger.Error("getting Version", "err", err)
+ return false
+ }
+ if !gointerfaces.EnsureVersion(r.version, versionReply) {
+ r.logger.Error("incompatible interface versions", "client", r.version.String(),
+ "server", fmt.Sprintf("%d.%d.%d", versionReply.Major, versionReply.Minor, versionReply.Patch))
+ return false
+ }
+ r.logger.Info("interfaces compatible", "client", r.version.String(),
+ "server", fmt.Sprintf("%d.%d.%d", versionReply.Major, versionReply.Minor, versionReply.Patch))
+ return true
+}
+
+func decodeValidator(v *remote.Validator) *valset.Validator {
+ return &valset.Validator{
+ ID: v.Id,
+ Address: gointerfaces.ConvertH160toAddress(v.Address),
+ VotingPower: v.VotingPower,
+ ProposerPriority: v.ProposerPriority,
+ }
+}
diff --git a/polygon/heimdall/scraper.go b/polygon/heimdall/scraper.go
index 1b0c0e83bcf..48a765bc565 100644
--- a/polygon/heimdall/scraper.go
+++ b/polygon/heimdall/scraper.go
@@ -18,9 +18,9 @@ package heimdall
import (
"context"
- "errors"
"time"
+ "github.com/erigontech/erigon-lib/common/errors"
"github.com/erigontech/erigon-lib/log/v3"
libcommon "github.com/erigontech/erigon-lib/common"
@@ -69,6 +69,11 @@ func (s *scraper[TEntity]) Run(ctx context.Context) error {
idRange, err := s.fetcher.FetchEntityIdRange(ctx)
if err != nil {
+ if errors.IsOneOf(err, s.transientErrors) {
+ s.logger.Warn(heimdallLogPrefix("scraper transient err occurred when fetching id range"), "err", err)
+ continue
+ }
+
return err
}
@@ -85,12 +90,12 @@ func (s *scraper[TEntity]) Run(ctx context.Context) error {
} else {
entities, err := s.fetcher.FetchEntitiesRange(ctx, idRange)
if err != nil {
- if s.isTransientErr(err) {
+ if errors.IsOneOf(err, s.transientErrors) {
// we do not break the scrapping loop when hitting a transient error
// we persist the partially fetched range entities before it occurred
// and continue scrapping again from there onwards
s.logger.Warn(
- heimdallLogPrefix("scraper transient err occurred"),
+ heimdallLogPrefix("scraper transient err occurred when fetching entities"),
"atId", idRange.Start+uint64(len(entities)),
"rangeStart", idRange.Start,
"rangeEnd", idRange.End,
@@ -120,17 +125,3 @@ func (s *scraper[TEntity]) RegisterObserver(observer func([]TEntity)) polygoncom
func (s *scraper[TEntity]) Synchronize(ctx context.Context) error {
return s.syncEvent.Wait(ctx)
}
-
-func (s *scraper[TEntity]) isTransientErr(err error) bool {
- if err == nil {
- return false
- }
-
- for _, transientErr := range s.transientErrors {
- if errors.Is(err, transientErr) {
- return true
- }
- }
-
- return false
-}
diff --git a/polygon/heimdall/server.go b/polygon/heimdall/server.go
new file mode 100644
index 00000000000..739df9373f6
--- /dev/null
+++ b/polygon/heimdall/server.go
@@ -0,0 +1,62 @@
+package heimdall
+
+import (
+ "context"
+
+ "google.golang.org/protobuf/types/known/emptypb"
+
+ "github.com/erigontech/erigon-lib/gointerfaces"
+ "github.com/erigontech/erigon-lib/gointerfaces/remoteproto"
+ "github.com/erigontech/erigon-lib/gointerfaces/typesproto"
+ "github.com/erigontech/erigon/polygon/bor/valset"
+)
+
+type spanProducersReader interface {
+ Producers(ctx context.Context, blockNum uint64) (*valset.ValidatorSet, error)
+}
+
+var APIVersion = &typesproto.VersionReply{Major: 1, Minor: 0, Patch: 0}
+
+type BackendServer struct {
+ remoteproto.UnimplementedHeimdallBackendServer // must be embedded to have forward compatible implementations.
+
+ ctx context.Context
+ spanProducersReader spanProducersReader
+}
+
+func NewBackendServer(ctx context.Context, spanProducersReader spanProducersReader) *BackendServer {
+ return &BackendServer{
+ ctx: ctx,
+ spanProducersReader: spanProducersReader,
+ }
+}
+
+func (b *BackendServer) Version(ctx context.Context, in *emptypb.Empty) (*typesproto.VersionReply, error) {
+ return APIVersion, nil
+}
+
+func (b *BackendServer) Producers(ctx context.Context, in *remoteproto.BorProducersRequest) (*remoteproto.BorProducersResponse, error) {
+ validatorSet, err := b.spanProducersReader.Producers(ctx, in.BlockNum)
+ if err != nil {
+ return nil, err
+ }
+
+ validators := make([]*remoteproto.Validator, len(validatorSet.Validators))
+ for i, v := range validatorSet.Validators {
+ validators[i] = encodeValidator(v)
+ }
+
+ return &remoteproto.BorProducersResponse{
+ Proposer: encodeValidator(validatorSet.Proposer),
+ Validators: validators,
+ }, nil
+}
+
+func encodeValidator(v *valset.Validator) *remoteproto.Validator {
+ return &remoteproto.Validator{
+ Id: v.ID,
+ Address: gointerfaces.ConvertAddressToH160(v.Address),
+ VotingPower: v.VotingPower,
+ ProposerPriority: v.ProposerPriority,
+ }
+}
diff --git a/polygon/heimdall/service.go b/polygon/heimdall/service.go
index 3f7715698ab..3f66bef9eb3 100644
--- a/polygon/heimdall/service.go
+++ b/polygon/heimdall/service.go
@@ -26,11 +26,19 @@ import (
libcommon "github.com/erigontech/erigon-lib/common"
"github.com/erigontech/erigon-lib/log/v3"
- "github.com/erigontech/erigon/polygon/bor/borcfg"
"github.com/erigontech/erigon/polygon/bor/valset"
"github.com/erigontech/erigon/polygon/polygoncommon"
)
+type ServiceConfig struct {
+ CalculateSprintNumberFn CalculateSprintNumberFunc
+ HeimdallURL string
+ DataDir string
+ TempDir string
+ Logger log.Logger
+ RoTxLimit int64
+}
+
type Service interface {
Span(ctx context.Context, id uint64) (*Span, bool, error)
CheckpointsFromBlock(ctx context.Context, startBlock uint64) (Waypoints, error)
@@ -46,28 +54,33 @@ type Service interface {
type service struct {
logger log.Logger
store ServiceStore
+ reader *Reader
checkpointScraper *scraper[*Checkpoint]
milestoneScraper *scraper[*Milestone]
spanScraper *scraper[*Span]
spanBlockProducersTracker *spanBlockProducersTracker
}
-func AssembleService(borConfig *borcfg.BorConfig, heimdallUrl string, dataDir string, tmpDir string, logger log.Logger) Service {
- store := NewMdbxServiceStore(logger, dataDir, tmpDir)
- client := NewHeimdallClient(heimdallUrl, logger)
- return NewService(borConfig, client, store, logger)
+func AssembleService(config ServiceConfig) Service {
+ store := NewMdbxServiceStore(config.Logger, config.DataDir, config.TempDir, config.RoTxLimit)
+ client := NewHeimdallClient(config.HeimdallURL, config.Logger)
+ reader := NewReader(config.CalculateSprintNumberFn, store, config.Logger)
+ return NewService(config.CalculateSprintNumberFn, client, store, config.Logger, reader)
}
-func NewService(borConfig *borcfg.BorConfig, client HeimdallClient, store ServiceStore, logger log.Logger) Service {
- return newService(borConfig, client, store, logger)
+func NewService(calculateSprintNumberFn CalculateSprintNumberFunc, client HeimdallClient, store ServiceStore, logger log.Logger, reader *Reader) Service {
+ return newService(calculateSprintNumberFn, client, store, logger, reader)
}
-func newService(borConfig *borcfg.BorConfig, client HeimdallClient, store ServiceStore, logger log.Logger) *service {
+func newService(calculateSprintNumberFn CalculateSprintNumberFunc, client HeimdallClient, store ServiceStore, logger log.Logger, reader *Reader) *service {
checkpointFetcher := newCheckpointFetcher(client, logger)
milestoneFetcher := newMilestoneFetcher(client, logger)
spanFetcher := newSpanFetcher(client, logger)
+ commonTransientErrors := []error{
+ ErrBadGateway,
+ context.DeadlineExceeded,
+ }
- commonTransientErrors := []error{ErrBadGateway}
checkpointScraper := newScraper(
store.Checkpoints(),
checkpointFetcher,
@@ -101,10 +114,11 @@ func newService(borConfig *borcfg.BorConfig, client HeimdallClient, store Servic
return &service{
logger: logger,
store: store,
+ reader: reader,
checkpointScraper: checkpointScraper,
milestoneScraper: milestoneScraper,
spanScraper: spanScraper,
- spanBlockProducersTracker: newSpanBlockProducersTracker(logger, borConfig, store.SpanBlockProducerSelections()),
+ spanBlockProducersTracker: newSpanBlockProducersTracker(logger, calculateSprintNumberFn, store.SpanBlockProducerSelections()),
}
}
@@ -164,7 +178,7 @@ func newSpanFetcher(client HeimdallClient, logger log.Logger) entityFetcher[*Spa
}
func (s *service) Span(ctx context.Context, id uint64) (*Span, bool, error) {
- return s.store.Spans().Entity(ctx, id)
+ return s.reader.Span(ctx, id)
}
func castEntityToWaypoint[TEntity Waypoint](entity TEntity) Waypoint {
@@ -220,17 +234,15 @@ func (s *service) synchronizeSpans(ctx context.Context) error {
}
func (s *service) CheckpointsFromBlock(ctx context.Context, startBlock uint64) (Waypoints, error) {
- entities, err := s.store.Checkpoints().RangeFromBlockNum(ctx, startBlock)
- return libcommon.SliceMap(entities, castEntityToWaypoint[*Checkpoint]), err
+ return s.reader.CheckpointsFromBlock(ctx, startBlock)
}
func (s *service) MilestonesFromBlock(ctx context.Context, startBlock uint64) (Waypoints, error) {
- entities, err := s.store.Milestones().RangeFromBlockNum(ctx, startBlock)
- return libcommon.SliceMap(entities, castEntityToWaypoint[*Milestone]), err
+ return s.reader.MilestonesFromBlock(ctx, startBlock)
}
func (s *service) Producers(ctx context.Context, blockNum uint64) (*valset.ValidatorSet, error) {
- return s.spanBlockProducersTracker.Producers(ctx, blockNum)
+ return s.reader.Producers(ctx, blockNum)
}
func (s *service) RegisterMilestoneObserver(callback func(*Milestone), opts ...ObserverOption) polygoncommon.UnregisterFunc {
diff --git a/polygon/heimdall/service_store.go b/polygon/heimdall/service_store.go
index f7e10962275..7982cfe8131 100644
--- a/polygon/heimdall/service_store.go
+++ b/polygon/heimdall/service_store.go
@@ -36,8 +36,8 @@ type ServiceStore interface {
Close()
}
-func NewMdbxServiceStore(logger log.Logger, dataDir string, tmpDir string) *MdbxServiceStore {
- db := polygoncommon.NewDatabase(dataDir, kv.HeimdallDB, databaseTablesCfg, logger)
+func NewMdbxServiceStore(logger log.Logger, dataDir string, tmpDir string, roTxLimit int64) *MdbxServiceStore {
+ db := polygoncommon.NewDatabase(dataDir, kv.HeimdallDB, databaseTablesCfg, logger, false /* accede */, roTxLimit)
blockNumToIdIndexFactory := func(ctx context.Context) (*RangeIndex, error) {
return NewRangeIndex(ctx, tmpDir, logger)
}
diff --git a/polygon/heimdall/service_test.go b/polygon/heimdall/service_test.go
index 7768cfbae70..d8774154cf4 100644
--- a/polygon/heimdall/service_test.go
+++ b/polygon/heimdall/service_test.go
@@ -23,9 +23,9 @@ import (
"fmt"
"math"
"os"
+ "path/filepath"
"regexp"
"slices"
- "sort"
"strconv"
"testing"
@@ -34,6 +34,7 @@ import (
"go.uber.org/mock/gomock"
"golang.org/x/sync/errgroup"
+ "github.com/erigontech/erigon-lib/chain"
"github.com/erigontech/erigon-lib/common"
"github.com/erigontech/erigon-lib/common/dir"
"github.com/erigontech/erigon-lib/log/v3"
@@ -42,42 +43,126 @@ import (
"github.com/erigontech/erigon/turbo/testlog"
)
-const (
- testDataDir = "testdata/amoy"
- spanTestDataDir = testDataDir + "/spans"
- checkpointsTestDataDir = testDataDir + "/checkpoints"
- milestonesTestDataDir = testDataDir + "/milestones"
- proposerSequenceTestDataDir = testDataDir + "/getSnapshotProposerSequence"
-)
+func TestServiceWithAmoyData(t *testing.T) {
+ suite.Run(t, &ServiceTestSuite{
+ testDataDir: "testdata/amoy",
+ chainConfig: params.AmoyChainConfig,
+ expectedLastSpan: 1280,
+ expectedFirstCheckpoint: 1,
+ expectedLastCheckpoint: 150,
+ expectedFirstMilestone: 285542,
+ expectedLastMilestone: 285641,
+ producersApiBlocksToTest: []uint64{
+ // span 0
+ 1, // start
+ 255, // end
+ // span 167
+ 1_062_656, // start
+ 1_069_055, // end
+ // span 168 - first span that has changes to selected producers
+ 1_069_056, // start
+ 1_072_256, // middle
+ 1_075_455, // end
+ // span 169
+ 1_075_456, // start
+ 1_081_855, // end
+ // span 182 - second span that has changes to selected producers
+ 1_158_656, // start
+ 1_165_055, // end
+ // span 1279
+ 8_179_456, // start
+ 8_185_855, // end
+ // span 1280 - span where we discovered the need for this API
+ 8_185_856, // start
+ 8_187_309, // middle where we discovered error
+ 8_192_255, // end
+ },
+ })
+}
-func TestService(t *testing.T) {
- suite.Run(t, new(ServiceTestSuite))
+func TestServiceWithMainnetData(t *testing.T) {
+ suite.Run(t, &ServiceTestSuite{
+ testDataDir: "testdata/mainnet",
+ chainConfig: params.BorMainnetChainConfig,
+ expectedLastSpan: 2344,
+ expectedFirstCheckpoint: 1,
+ expectedLastCheckpoint: 1,
+ expectedFirstMilestone: 453496,
+ expectedLastMilestone: 453496,
+ producersApiBlocksToTest: []uint64{
+ 1,
+ 16,
+ 255,
+ 256,
+ 7_000,
+ 8_173_056,
+ 8_192_255,
+ 10_000_000,
+ 12_000_000,
+ 13_000_000,
+ 14_000_000,
+ 14_250_000,
+ 14_300_000,
+ 14_323_456, // span 2239 start
+ 14_325_000,
+ 14_329_854,
+ 14_329_855, // span 2239 end
+ 14_329_856, // span 2240 start
+ 14_337_500,
+ 14_350_000,
+ 14_375_000,
+ 14_500_000,
+ 15_000_000,
+ },
+ })
}
type ServiceTestSuite struct {
+ // test suite inputs
+ testDataDir string
+ chainConfig *chain.Config
+ expectedFirstSpan uint64
+ expectedLastSpan uint64
+ expectedFirstCheckpoint uint64
+ expectedLastCheckpoint uint64
+ expectedFirstMilestone uint64
+ expectedLastMilestone uint64
+ producersApiBlocksToTest []uint64
+
+ // test suite internals
suite.Suite
- ctx context.Context
- cancel context.CancelFunc
- eg errgroup.Group
- client *MockHeimdallClient
- service *service
- observedMilestones []*Milestone
- observedSpans []*Span
+ ctx context.Context
+ cancel context.CancelFunc
+ eg errgroup.Group
+ client *MockHeimdallClient
+ service *service
+ observedMilestones []*Milestone
+ observedSpans []*Span
+ spansTestDataDir string
+ checkpointsTestDataDir string
+ milestonesTestDataDir string
+ proposerSequencesTestDataDir string
}
func (suite *ServiceTestSuite) SetupSuite() {
+ suite.T().Parallel()
ctrl := gomock.NewController(suite.T())
tempDir := suite.T().TempDir()
dataDir := fmt.Sprintf("%s/datadir", tempDir)
logger := testlog.Logger(suite.T(), log.LvlCrit)
- store := NewMdbxServiceStore(logger, dataDir, tempDir)
- borConfig := params.AmoyChainConfig.Bor.(*borcfg.BorConfig)
+ store := NewMdbxServiceStore(logger, dataDir, tempDir, 1)
+ borConfig := suite.chainConfig.Bor.(*borcfg.BorConfig)
suite.ctx, suite.cancel = context.WithCancel(context.Background())
+ suite.spansTestDataDir = filepath.Join(suite.testDataDir, "spans")
+ suite.checkpointsTestDataDir = filepath.Join(suite.testDataDir, "checkpoints")
+ suite.milestonesTestDataDir = filepath.Join(suite.testDataDir, "milestones")
+ suite.proposerSequencesTestDataDir = filepath.Join(suite.testDataDir, "getSnapshotProposerSequence")
suite.client = NewMockHeimdallClient(ctrl)
suite.setupSpans()
suite.setupCheckpoints()
suite.setupMilestones()
- suite.service = newService(borConfig, suite.client, store, logger)
+ reader := NewReader(borConfig.CalculateSprintNumber, store, logger)
+ suite.service = newService(borConfig.CalculateSprintNumber, suite.client, store, logger, reader)
err := suite.service.store.Prepare(suite.ctx)
require.NoError(suite.T(), err)
@@ -116,9 +201,16 @@ func (suite *ServiceTestSuite) TestMilestones() {
id, ok, err := svc.store.Milestones().LastEntityId(ctx)
require.NoError(t, err)
require.True(t, ok)
- require.Equal(t, uint64(285641), id)
+ require.Equal(t, suite.expectedLastMilestone, id)
- for id := uint64(285542); id <= 285641; id++ {
+ for id := uint64(0); id < suite.expectedFirstMilestone; id++ {
+ entity, ok, err := svc.store.Milestones().Entity(ctx, id)
+ require.NoError(t, err)
+ require.False(t, ok)
+ require.Nil(t, entity)
+ }
+
+ for id := suite.expectedFirstMilestone; id <= suite.expectedLastMilestone; id++ {
entity, ok, err := svc.store.Milestones().Entity(ctx, id)
require.NoError(t, err)
require.True(t, ok)
@@ -127,7 +219,7 @@ func (suite *ServiceTestSuite) TestMilestones() {
}
func (suite *ServiceTestSuite) TestRegisterMilestoneObserver() {
- require.Len(suite.T(), suite.observedMilestones, 100)
+ require.Len(suite.T(), suite.observedMilestones, int(suite.expectedLastMilestone-suite.expectedFirstMilestone+1))
}
func (suite *ServiceTestSuite) TestCheckpoints() {
@@ -138,9 +230,16 @@ func (suite *ServiceTestSuite) TestCheckpoints() {
id, ok, err := svc.store.Checkpoints().LastEntityId(ctx)
require.NoError(t, err)
require.True(t, ok)
- require.Equal(t, uint64(150), id)
+ require.Equal(t, suite.expectedLastCheckpoint, id)
+
+ for id := uint64(0); id < suite.expectedFirstCheckpoint; id++ {
+ entity, ok, err := svc.store.Checkpoints().Entity(ctx, id)
+ require.NoError(t, err)
+ require.False(t, ok)
+ require.Nil(t, entity)
+ }
- for id := uint64(1); id <= 150; id++ {
+ for id := suite.expectedFirstCheckpoint; id <= suite.expectedLastCheckpoint; id++ {
entity, ok, err := svc.store.Checkpoints().Entity(ctx, id)
require.NoError(t, err)
require.True(t, ok)
@@ -156,9 +255,16 @@ func (suite *ServiceTestSuite) TestSpans() {
id, ok, err := svc.store.Spans().LastEntityId(ctx)
require.NoError(t, err)
require.True(t, ok)
- require.Equal(t, uint64(1280), id)
+ require.Equal(t, suite.expectedLastSpan, id)
+
+ for id := uint64(0); id < suite.expectedFirstSpan; id++ {
+ entity, ok, err := svc.store.Spans().Entity(ctx, id)
+ require.NoError(t, err)
+ require.False(t, ok)
+ require.Nil(t, entity)
+ }
- for id := uint64(0); id <= 1280; id++ {
+ for id := suite.expectedFirstSpan; id <= suite.expectedLastSpan; id++ {
entity, ok, err := svc.store.Spans().Entity(ctx, id)
require.NoError(t, err)
require.True(t, ok)
@@ -167,33 +273,13 @@ func (suite *ServiceTestSuite) TestSpans() {
}
func (suite *ServiceTestSuite) TestRegisterSpanObserver() {
- require.Len(suite.T(), suite.observedSpans, 1281)
+ require.Len(suite.T(), suite.observedSpans, int(suite.expectedLastSpan+1)) // +1 for span 0
}
func (suite *ServiceTestSuite) TestProducers() {
- // span 0
- suite.producersSubTest(1) // start
- suite.producersSubTest(255) // end
- // span 167
- suite.producersSubTest(1062656) // start
- suite.producersSubTest(1069055) // end
- // span 168 - first span that has changes to selected producers
- suite.producersSubTest(1069056) // start
- suite.producersSubTest(1072256) // middle
- suite.producersSubTest(1075455) // end
- // span 169
- suite.producersSubTest(1075456) // start
- suite.producersSubTest(1081855) // end
- // span 182 - second span that has changes to selected producers
- suite.producersSubTest(1158656) // start
- suite.producersSubTest(1165055) // end
- // span 1279
- suite.producersSubTest(8179456) // start
- suite.producersSubTest(8185855) // end
- // span 1280 - span where we discovered the need for this API
- suite.producersSubTest(8185856) // start
- suite.producersSubTest(8187309) // middle where we discovered error
- suite.producersSubTest(8192255) // end
+ for _, blockNum := range suite.producersApiBlocksToTest {
+ suite.producersSubTest(blockNum)
+ }
}
func (suite *ServiceTestSuite) producersSubTest(blockNum uint64) {
@@ -202,30 +288,41 @@ func (suite *ServiceTestSuite) producersSubTest(blockNum uint64) {
ctx := suite.ctx
svc := suite.service
- b, err := os.ReadFile(fmt.Sprintf("%s/blockNum_%d.json", proposerSequenceTestDataDir, blockNum))
+ b, err := os.ReadFile(fmt.Sprintf("%s/blockNum_%d.json", suite.proposerSequencesTestDataDir, blockNum))
require.NoError(t, err)
var proposerSequenceResponse getSnapshotProposerSequenceResponse
err = json.Unmarshal(b, &proposerSequenceResponse)
require.NoError(t, err)
- want := proposerSequenceResponse.Result
+ wantProducers := proposerSequenceResponse.Result
- producers, err := svc.Producers(ctx, blockNum)
+ haveProducers, err := svc.Producers(ctx, blockNum)
require.NoError(t, err)
- errInfoMsgArgs := []interface{}{"want: %v\nhave: %v\n", want, producers}
- require.Equal(t, len(want.Signers), len(producers.Validators), errInfoMsgArgs...)
- for _, signer := range want.Signers {
- _, producer := producers.GetByAddress(signer.Signer)
- producerDifficulty, err := producers.Difficulty(producer.Address)
+ errInfoMsgArgs := []interface{}{"wantProducers: %v\nhaveProducers: %v\n", wantProducers, haveProducers}
+ require.Equal(t, len(wantProducers.Signers), len(haveProducers.Validators), errInfoMsgArgs...)
+ for _, signer := range wantProducers.Signers {
+ wantDifficulty := signer.Difficulty
+ _, producer := haveProducers.GetByAddress(signer.Signer)
+ haveDifficulty, err := haveProducers.Difficulty(producer.Address)
require.NoError(t, err)
- require.Equal(t, signer.Difficulty, producerDifficulty, errInfoMsgArgs...)
+
+ errInfoMsgArgs = []interface{}{
+ "signer:%v\nwantDifficulty: %v\nhaveDifficulty: %v\nwantProducers: %v\nhaveProducers: %v",
+ signer,
+ wantDifficulty,
+ haveDifficulty,
+ wantProducers,
+ haveProducers,
+ }
+ require.Equal(t, wantDifficulty, haveDifficulty, errInfoMsgArgs...)
}
})
}
func (suite *ServiceTestSuite) setupSpans() {
- files, err := dir.ReadDir(spanTestDataDir)
+ files, err := dir.ReadDir(suite.spansTestDataDir)
require.NoError(suite.T(), err)
+ require.Greater(suite.T(), len(files), 0)
slices.SortFunc(files, func(a, b os.DirEntry) int {
idA := extractIdFromFileName(suite.T(), a.Name(), "span")
@@ -233,104 +330,95 @@ func (suite *ServiceTestSuite) setupSpans() {
return cmp.Compare(idA, idB)
})
- // leave few files for sequential fetch
- sequentialFetchFileCount := 3
- lastSpanFileNameForSequentialFetch := files[len(files)-1].Name()
- lastSpanFileNameForBatchFetch := files[len(files)-1-sequentialFetchFileCount].Name()
- batchFetchSpanFiles := files[:len(files)-sequentialFetchFileCount]
-
- gomock.InOrder(
- suite.client.EXPECT().
- FetchLatestSpan(gomock.Any()).
- DoAndReturn(func(ctx context.Context) (*Span, error) {
- return readEntityFromFile[Span](
- suite.T(),
- fmt.Sprintf("%s/%s", spanTestDataDir, lastSpanFileNameForBatchFetch),
- ), nil
- }).
- Times(1),
- suite.client.EXPECT().
- FetchLatestSpan(gomock.Any()).
- DoAndReturn(func(ctx context.Context) (*Span, error) {
- return readEntityFromFile[Span](
- suite.T(),
- fmt.Sprintf("%s/%s", spanTestDataDir, lastSpanFileNameForSequentialFetch),
- ), nil
- }).
- AnyTimes(),
- )
+ // leave a few of the last spans for sequential flow, all spans before them for batch flow
+ lastSequentialFetchIdx := len(files) - 1
+ lastBatchFetchIdx := max(0, lastSequentialFetchIdx-2)
+ latestSpanIdx := lastBatchFetchIdx
+ suite.client.EXPECT().
+ FetchLatestSpan(gomock.Any()).
+ DoAndReturn(func(ctx context.Context) (*Span, error) {
+ span := readEntityFromFile[Span](
+ suite.T(),
+ fmt.Sprintf("%s/%s", suite.spansTestDataDir, files[latestSpanIdx].Name()),
+ )
+ latestSpanIdx = lastSequentialFetchIdx
+ return span, nil
+ }).
+ AnyTimes()
suite.client.EXPECT().
FetchSpans(gomock.Any(), gomock.Any(), gomock.Any()).
DoAndReturn(func(ctx context.Context, page, limit uint64) ([]*Span, error) {
spans := make([]*Span, 0, limit)
startIdx := (page - 1) * limit
- endIdx := min(startIdx+limit, uint64(len(batchFetchSpanFiles)))
+ endIdx := min(startIdx+limit, uint64(lastBatchFetchIdx)+1)
for i := startIdx; i < endIdx; i++ {
- span := readEntityFromFile[Span](suite.T(), fmt.Sprintf("%s/span_%d.json", spanTestDataDir, i))
+ span := readEntityFromFile[Span](suite.T(), fmt.Sprintf("%s/span_%d.json", suite.spansTestDataDir, i))
spans = append(spans, span)
}
return spans, nil
}).
- Times(1 + (len(files)+len(files)%SpansFetchLimit)/SpansFetchLimit)
+ AnyTimes()
suite.client.EXPECT().
FetchSpan(gomock.Any(), gomock.Any()).
DoAndReturn(func(ctx context.Context, id uint64) (*Span, error) {
- return readEntityFromFile[Span](suite.T(), fmt.Sprintf("%s/span_%d.json", spanTestDataDir, id)), nil
+ return readEntityFromFile[Span](suite.T(), fmt.Sprintf("%s/span_%d.json", suite.spansTestDataDir, id)), nil
}).
- Times(sequentialFetchFileCount)
+ AnyTimes()
}
func (suite *ServiceTestSuite) setupCheckpoints() {
- files, err := dir.ReadDir(checkpointsTestDataDir)
+ files, err := dir.ReadDir(suite.checkpointsTestDataDir)
require.NoError(suite.T(), err)
+ require.Greater(suite.T(), len(files), 0)
- checkpoints := make(Checkpoints, len(files))
- for i, file := range files {
- checkpoints[i] = readEntityFromFile[Checkpoint](
- suite.T(),
- fmt.Sprintf("%s/%s", checkpointsTestDataDir, file.Name()),
- )
- }
+ // leave a few of the last checkpoints for sequential flow, all spans before them for batch flow
+ lastSequentialFetchIdx := len(files) - 1
+ lastBatchFetchIdx := max(0, lastSequentialFetchIdx-2)
+ checkpointCount := lastBatchFetchIdx + 1
+ suite.client.EXPECT().
+ FetchCheckpointCount(gomock.Any()).
+ DoAndReturn(func(ctx context.Context) (int64, error) {
+ res := int64(checkpointCount)
+ checkpointCount = len(files)
+ return res, nil
+ }).
+ AnyTimes()
- sort.Sort(checkpoints)
-
- // leave few files for sequential fetch
- sequentialFetchCheckpointsCount := 3
- batchFetchCheckpointsCount := len(checkpoints) - sequentialFetchCheckpointsCount
-
- gomock.InOrder(
- suite.client.EXPECT().
- FetchCheckpointCount(gomock.Any()).
- Return(int64(batchFetchCheckpointsCount), nil).
- Times(1),
- suite.client.EXPECT().
- FetchCheckpointCount(gomock.Any()).
- Return(int64(len(files)), nil).
- AnyTimes(),
- )
-
- gomock.InOrder(
- suite.client.EXPECT().
- FetchCheckpoints(gomock.Any(), gomock.Any(), gomock.Any()).
- Return(checkpoints, nil).
- Times(1),
- suite.client.EXPECT().
- FetchCheckpoints(gomock.Any(), gomock.Any(), gomock.Any()).
- Return(nil, nil).
- Times(1),
- )
+ suite.client.EXPECT().
+ FetchCheckpoints(gomock.Any(), gomock.Any(), gomock.Any()).
+ DoAndReturn(func(ctx context.Context, page uint64, limit uint64) ([]*Checkpoint, error) {
+ checkpoints := make([]*Checkpoint, 0, limit)
+ startIdx := (page - 1) * limit
+ endIdx := min(startIdx+limit, uint64(lastBatchFetchIdx)+1)
+ for i := startIdx; i < endIdx; i++ {
+ checkpoint := readEntityFromFile[Checkpoint](
+ suite.T(),
+ fmt.Sprintf("%s/checkpoint_%d.json", suite.checkpointsTestDataDir, i+1),
+ )
+ checkpoints = append(checkpoints, checkpoint)
+ }
+ return checkpoints, nil
+ }).
+ AnyTimes()
suite.client.EXPECT().
FetchCheckpoint(gomock.Any(), gomock.Any()).
- DoAndReturn(func(ctx context.Context, id int64) (*Checkpoint, error) { return checkpoints[id-1], nil }).
- Times(sequentialFetchCheckpointsCount)
+ DoAndReturn(func(ctx context.Context, id int64) (*Checkpoint, error) {
+ checkpoint := readEntityFromFile[Checkpoint](
+ suite.T(),
+ fmt.Sprintf("%s/checkpoint_%d.json", suite.checkpointsTestDataDir, id),
+ )
+ return checkpoint, nil
+ }).
+ AnyTimes()
}
func (suite *ServiceTestSuite) setupMilestones() {
- files, err := dir.ReadDir(milestonesTestDataDir)
+ files, err := dir.ReadDir(suite.milestonesTestDataDir)
require.NoError(suite.T(), err)
+ require.Greater(suite.T(), len(files), 0)
slices.SortFunc(files, func(a, b os.DirEntry) int {
idA := extractIdFromFileName(suite.T(), a.Name(), "milestone")
@@ -356,7 +444,7 @@ func (suite *ServiceTestSuite) setupMilestones() {
DoAndReturn(func(ctx context.Context, id int64) (*Milestone, error) {
milestone := readEntityFromFile[Milestone](
suite.T(),
- fmt.Sprintf("%s/milestone_%d.json", milestonesTestDataDir, id),
+ fmt.Sprintf("%s/milestone_%d.json", suite.milestonesTestDataDir, id),
)
return milestone, nil
}).
diff --git a/polygon/heimdall/span_block_producers_tracker.go b/polygon/heimdall/span_block_producers_tracker.go
index a90e106c841..daa6c65b983 100644
--- a/polygon/heimdall/span_block_producers_tracker.go
+++ b/polygon/heimdall/span_block_producers_tracker.go
@@ -21,33 +21,35 @@ import (
"errors"
"fmt"
"sync/atomic"
+ "time"
"github.com/erigontech/erigon-lib/log/v3"
- "github.com/erigontech/erigon/polygon/bor/borcfg"
"github.com/erigontech/erigon/polygon/bor/valset"
)
+type CalculateSprintNumberFunc func(uint64) uint64
+
func newSpanBlockProducersTracker(
logger log.Logger,
- borConfig *borcfg.BorConfig,
+ calculateSprintNumber CalculateSprintNumberFunc,
store EntityStore[*SpanBlockProducerSelection],
) *spanBlockProducersTracker {
return &spanBlockProducersTracker{
- logger: logger,
- borConfig: borConfig,
- store: store,
- newSpans: make(chan *Span),
- idleSignal: make(chan struct{}),
+ logger: logger,
+ calculateSprintNumber: calculateSprintNumber,
+ store: store,
+ newSpans: make(chan *Span),
+ idleSignal: make(chan struct{}),
}
}
type spanBlockProducersTracker struct {
- logger log.Logger
- borConfig *borcfg.BorConfig
- store EntityStore[*SpanBlockProducerSelection]
- newSpans chan *Span
- queued atomic.Int32
- idleSignal chan struct{}
+ logger log.Logger
+ calculateSprintNumber CalculateSprintNumberFunc
+ store EntityStore[*SpanBlockProducerSelection]
+ newSpans chan *Span
+ queued atomic.Int32
+ idleSignal chan struct{}
}
func (t *spanBlockProducersTracker) Run(ctx context.Context) error {
@@ -111,7 +113,9 @@ func (t *spanBlockProducersTracker) ObserveSpan(ctx context.Context, newSpan *Sp
SpanId: newSpan.Id,
StartBlock: newSpan.StartBlock,
EndBlock: newSpan.EndBlock,
- Producers: valset.NewValidatorSet(newSpan.Producers()),
+ // https://github.com/maticnetwork/genesis-contracts/blob/master/contracts/BorValidatorSet.template#L82-L89
+ // initial producers == initial validators
+ Producers: valset.NewValidatorSet(newSpan.ValidatorSet.Validators),
}
err = t.store.PutEntity(ctx, uint64(newProducerSelection.SpanId), newProducerSelection)
if err != nil {
@@ -141,12 +145,14 @@ func (t *spanBlockProducersTracker) ObserveSpan(ctx context.Context, newSpan *Sp
return err
}
- spanStartSprintNum := t.borConfig.CalculateSprintNumber(lastProducerSelection.StartBlock)
- spanEndSprintNum := t.borConfig.CalculateSprintNumber(lastProducerSelection.EndBlock)
+ spanStartSprintNum := t.calculateSprintNumber(lastProducerSelection.StartBlock)
+ spanEndSprintNum := t.calculateSprintNumber(lastProducerSelection.EndBlock)
increments := int(spanEndSprintNum - spanStartSprintNum)
- if increments > 0 {
- producers.IncrementProposerPriority(increments)
+ for i := 0; i < increments; i++ {
+ producers = valset.GetUpdatedValidatorSet(producers, producers.Validators, t.logger)
+ producers.IncrementProposerPriority(1)
}
+
newProducers := valset.GetUpdatedValidatorSet(producers, newSpan.Producers(), t.logger)
newProducers.IncrementProposerPriority(1)
newProducerSelection := &SpanBlockProducerSelection{
@@ -165,6 +171,7 @@ func (t *spanBlockProducersTracker) ObserveSpan(ctx context.Context, newSpan *Sp
}
func (t *spanBlockProducersTracker) Producers(ctx context.Context, blockNum uint64) (*valset.ValidatorSet, error) {
+ startTime := time.Now()
spanId := SpanIdAt(blockNum)
producerSelection, ok, err := t.store.Entity(ctx, uint64(spanId))
if err != nil {
@@ -181,11 +188,20 @@ func (t *spanBlockProducersTracker) Producers(ctx context.Context, blockNum uint
return nil, err
}
- spanStartSprintNum := t.borConfig.CalculateSprintNumber(producerSelection.StartBlock)
- currentSprintNum := t.borConfig.CalculateSprintNumber(blockNum)
+ spanStartSprintNum := t.calculateSprintNumber(producerSelection.StartBlock)
+ currentSprintNum := t.calculateSprintNumber(blockNum)
increments := int(currentSprintNum - spanStartSprintNum)
- if increments > 0 {
- producers.IncrementProposerPriority(increments)
+ for i := 0; i <