Skip to content

Commit

Permalink
Merging tag v3.0.0-alpha1 into upstream-v3.0.0. Incomplete merge - se…
Browse files Browse the repository at this point in the history
…e status_merge.txt for merging status
  • Loading branch information
mininny committed Aug 3, 2024
2 parents a02e8eb + 6df3f87 commit 245d355
Show file tree
Hide file tree
Showing 2,435 changed files with 1,211,397 additions and 153,564 deletions.
2 changes: 1 addition & 1 deletion .buildkite/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ steps:
- command: './nightly.sh'
label: 'build & run geth'
env:
BUILDKITE_GOLANG_IMPORT_PATH: "github.com/ledgerwatch/erigon"
BUILDKITE_GOLANG_IMPORT_PATH: "github.com/erigontech/erigon"
8 changes: 4 additions & 4 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ smallest of fixes!
If you'd like to contribute to Erigon, please fork, fix, commit and send a
pull request for the maintainers to review and merge into the main code base. If
you wish to submit more complex changes though, please check up with the core
devs first on [Discord server](https://github.com/ledgerwatch/erigon#erigon-discord-server) to
devs first on [Discord server](https://github.com/erigontech/erigon#erigon-discord-server) to
ensure those changes are in line with the general philosophy of the project
and/or get some early feedback which can make both your efforts much lighter as
well as our review and merge procedures quick and simple.
Expand All @@ -21,7 +21,7 @@ Please make sure your contributions adhere to our coding guidelines:
(i.e. uses [gofmt](https://golang.org/cmd/gofmt/)).
* Code must be documented adhering to the official Go
[commentary](https://golang.org/doc/effective_go.html#commentary) guidelines.
* Pull requests need to be based on and opened against the `devel` branch.
* Pull requests need to be based on and opened against the `main` branch.
* Commit messages should be prefixed with the package(s) they modify.
* E.g. "eth, rpc: make trace configs optional"

Expand All @@ -30,11 +30,11 @@ Please make sure your contributions adhere to our coding guidelines:
Before you submit a feature request, please check and make sure that it isn't
possible through some other means. The JavaScript-enabled console is a powerful
feature in the right hands. Please check our
[Wiki page](https://github.com/ledgerwatch/erigon/wiki) for more info
[Wiki page](https://github.com/erigontech/erigon/wiki) for more info
and help.

## Configuration, dependencies, and tests

Please see the [Readme](https://github.com/ledgerwatch/erigon#readme) file
Please see the [Readme](https://github.com/erigontech/erigon#readme) file
for more details on configuring your environment, managing project dependencies
and testing procedures.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/question.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ labels: 'type:docs'
assignees: ''
---

This should only be used in very rare cases e.g. if you are not 100% sure if something is a bug or asking a question that leads to improving the documentation. For general questions please use [Erigon's discord](https://github.com/ledgerwatch/erigon#erigon-discord-server).
This should only be used in very rare cases e.g. if you are not 100% sure if something is a bug or asking a question that leads to improving the documentation. For general questions please use [Erigon's discord](https://github.com/erigontech/erigon#erigon-discord-server).
2 changes: 1 addition & 1 deletion .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Check
on:
push:
branches:
- devel
- main
workflow_dispatch:

jobs:
Expand Down
31 changes: 18 additions & 13 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,32 @@ name: CI
on:
push:
branches:
<<<<<<< HEAD
- devel
- alpha
- op-erigon
=======
- main
>>>>>>> v3.0.0-alpha1
- 'release/**'
- tip/canyon
pull_request:
branches:
<<<<<<< HEAD
- devel
- alpha
- op-erigon
=======
- main
>>>>>>> v3.0.0-alpha1
- 'release/**'
- tip/canyon
types:
- opened
- reopened
- synchronize
- ready_for_review
workflow_dispatch:

concurrency:
group: ${{ github.ref }}
Expand All @@ -32,11 +41,11 @@ jobs:
# list of os: https://github.com/actions/virtual-environments
os:
- ubuntu-22.04
- macos-13
- macos-14
runs-on: ${{ matrix.os }}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: actions/setup-go@v4
Expand All @@ -63,14 +72,10 @@ jobs:
if: runner.os == 'Linux'
uses: golangci/golangci-lint-action@v4
with:
version: v1.57.2
version: v1.59.1
skip-build-cache: true
args: --help

- name: Install go-licenses
if: runner.os == 'Linux'
run: cd erigon-lib && make lint-licenses-deps

- name: Lint
if: runner.os == 'Linux'
run: make lint
Expand All @@ -95,10 +100,10 @@ jobs:

steps:
- name: configure Pagefile
uses: al-cheb/configure-pagefile-action@v1.3
uses: al-cheb/configure-pagefile-action@v1.4
with:
minimum-size: 8GB
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/setup-go@v4
with:
go-version: '1.21'
Expand All @@ -124,13 +129,13 @@ jobs:
run: cd erigon-lib && make test-no-fuzz

docker-build-check:
# don't run this on devel - 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/devel' }}
# 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@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0 # fetch git tags for "git describe"

Expand All @@ -146,7 +151,7 @@ jobs:
# ubuntu-22.04
# if: ${{ github.event_name == 'push' || !github.event.pull_request.draft }}
# steps:
# - uses: actions/checkout@v3
# - uses: actions/checkout@v4
#
# - name: run automated testing
# run: BUILD_ERIGON=1 ./tests/automated-testing/run.sh
4 changes: 2 additions & 2 deletions .github/workflows/docker-tags.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

Expand All @@ -33,7 +33,7 @@ jobs:
make release-dry-run
docker images
# docker image push --all-tags thorax/erigon
# docker image push --all-tags ghcr.io/ledgerwatch/erigon
# docker image push --all-tags ghcr.io/erigontech/erigon
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
VERSION: ${GITHUB_REF#refs/tags/}
Expand Down
45 changes: 45 additions & 0 deletions .github/workflows/hive-nightly.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
name: Hive (Nightly)

on:
schedule:
- cron: "0 01 * * *" # run at 1 am UTC every day
workflow_dispatch:

jobs:
hive:
runs-on: ubuntu-latest
steps:
- uses: AutoModality/action-clean@v1
- uses: actions/checkout@v4
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 --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
if: always()
run: |
ids=$(docker ps -a -q)
for id in $ids
do
echo "stopping/removing container: $id"
docker stop $id && docker rm $id
done
- name: parse hive results
uses: phoenix-actions/test-reporting@v10
with:
name: Tests
path: results-${{ github.run_id }}/*.xml
reporter: java-junit
55 changes: 55 additions & 0 deletions .github/workflows/manifest.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
name: Manifest Check
on:
push:
branches:
- main
- 'release/**'
paths:
- 'go.mod'
pull_request:
branches:
- main
- 'release/**'
paths:
- 'go.mod'
types:
- opened
- reopened
- synchronize
- ready_for_review
workflow_dispatch:

jobs:
# check-snap-modifications:
# runs-on: ubuntu-24.04
# outputs:
# modified: ${{ steps.check-modified.outputs.modified }}
#
# steps:
# - uses: actions/checkout@v4
# with:
# fetch-depth: 2 # Ensures we fetch enough history to compare
#
# - name: Is erigontech/erigon-snapshot updated in go.mod # if not, pipeline should exit because grep exit code >0 when no match
# run: |
# git diff HEAD~1 HEAD -- go.mod | grep 'github.com/erigontech/erigon-snapshot'

ManifestCheck:
# needs: check-snap-modifications
if: github.event.pull_request.draft == false
runs-on: ubuntu-24.04

steps:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: '1.22'
- run: sudo apt update && sudo apt install build-essential
- run: make downloader
- run: echo $ModModified
- run: ./build/bin/downloader manifest-verify --chain mainnet
- run: ./build/bin/downloader manifest-verify --chain bor-mainnet
- run: ./build/bin/downloader manifest-verify --chain gnosis
- run: ./build/bin/downloader manifest-verify --chain chiado
- run: ./build/bin/downloader manifest-verify --chain sepolia
- run: ./build/bin/downloader manifest-verify --chain amoy
31 changes: 31 additions & 0 deletions .github/workflows/qa-clean-exit-block-downloading.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: QA - Clean exit (block downloading)

on:
<<<<<<< HEAD
push:
branches:
- 'release/2.*'
Expand All @@ -9,11 +10,19 @@ on:
- 'release/2.*'
types:
- ready_for_review
=======
schedule:
- cron: '0 8 * * 1-6' # Run every day at 08:00 AM UTC except Sunday
>>>>>>> v3.0.0-alpha1
workflow_dispatch: # Run manually

jobs:
clean-exit-bd-test:
<<<<<<< HEAD
runs-on: [self-hosted, Erigon2]
=======
runs-on: [self-hosted, Erigon3]
>>>>>>> v3.0.0-alpha1
env:
ERIGON_REFERENCE_DATA_DIR: /opt/erigon-versions/reference-version/datadir
ERIGON_TESTBED_DATA_DIR: /opt/erigon-testbed/datadir
Expand Down Expand Up @@ -48,7 +57,12 @@ jobs:
set +e # Disable exit on error
# Run Erigon, send ctrl-c and check logs
<<<<<<< HEAD
python3 $ERIGON_QA_PATH/test_system/qa-tests/clean-exit/run_and_check_clean_exit.py ${{ github.workspace }}/build/bin $ERIGON_TESTBED_DATA_DIR $WORKING_TIME_SECONDS Erigon2
=======
python3 $ERIGON_QA_PATH/test_system/qa-tests/clean-exit/run_and_check_clean_exit.py \
${{ github.workspace }}/build/bin $ERIGON_TESTBED_DATA_DIR $WORKING_TIME_SECONDS Erigon3
>>>>>>> v3.0.0-alpha1

# Capture monitoring script exit status
test_exit_status=$?
Expand Down Expand Up @@ -85,13 +99,30 @@ jobs:
if: steps.test_step.outputs.test_executed == 'true'
env:
TEST_RESULT: ${{ steps.test_step.outputs.TEST_RESULT }}
<<<<<<< HEAD
run: |
=======
run: |
>>>>>>> v3.0.0-alpha1
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

<<<<<<< HEAD
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 clean-exit-block-downloading --chain $CHAIN --runner ${{ runner.name }} --db_version $db_version --outcome $TEST_RESULT --result_file ${{ github.workspace }}/result.json
=======
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 clean-exit-block-downloading \
--chain $CHAIN \
--runner ${{ runner.name }} \
--db_version $db_version \
--outcome $TEST_RESULT \
--result_file ${{ github.workspace }}/result.json
>>>>>>> v3.0.0-alpha1

- name: Upload test results
if: steps.test_step.outputs.test_executed == 'true'
Expand Down
Loading

0 comments on commit 245d355

Please sign in to comment.