Merged ledgerwatch/erigon v2.48.1

.github/ISSUE_TEMPLATE/question.md

@@ -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://discord.gg/hQ2dxbNZ).
+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).

.github/workflows/check.yml

@@ -0,0 +1,15 @@
+name: Check
+
+on:
+  push:
+    branches:
+      - devel
+  workflow_dispatch:
+
+jobs:
+  goreleaser:
+    runs-on: ubuntu-latest
+    steps:
+      - run: echo ${GITHUB_REF}
+      - run: echo ${GITHUB_REF#refs/tags/}
+      - run: echo ${GITHUB_REF##*/}

.github/workflows/ci.yml

@@ -30,25 +30,15 @@ jobs:
         os: [ ubuntu-20.04, macos-11 ] # list of os: https://github.com/actions/virtual-environments
     runs-on: ${{ matrix.os }}
 
-    steps:      
+    steps:
       - uses: actions/checkout@v3
-      - run: git submodule update --init --recursive --force
-      - uses: actions/setup-go@v3
+      - uses: actions/setup-go@v4
         with:
-          go-version: 1.18.x
+          go-version: '1.19'
       - name: Install dependencies on Linux
         if: runner.os == 'Linux'
         run: sudo apt update && sudo apt install build-essential
 
-      - uses: actions/cache@v3
-        with:
-          path: |
-            ~/.cache/go-build
-            ~/Library/Caches/go-build
-            ~/go/pkg/mod
-          key: go-${{ matrix.os }}-${{ hashFiles('**/go.sum') }}
-          restore-keys: go-${{ matrix.os }}-
-
       - name: Build
         run: make all
 
@@ -66,28 +56,24 @@ jobs:
         if: runner.os == 'Linux'
         uses: golangci/golangci-lint-action@v3
         with:
-          version: v1.50
+          version: v1.52
           skip-pkg-cache: true
 
       - name: Test
         run: make test
 
-#      - name: Test HistoryV3
-#        run: make test3
-
   tests-windows:
     if: ${{ github.event_name == 'push' || !github.event.pull_request.draft }}
     strategy:
       matrix:
         os: [ windows-2022 ]
     runs-on: ${{ matrix.os }}
 
-    steps:      
+    steps:
       - uses: actions/checkout@v3
-      - run: git submodule update --init --recursive --force
-      - uses: actions/setup-go@v3
+      - uses: actions/setup-go@v4
         with:
-          go-version: 1.18.x
+          go-version: '1.19'
 
       - uses: actions/cache@v3
         with:
@@ -100,14 +86,6 @@ jobs:
           choco upgrade mingw -y --no-progress --version 11.2.0.07112021
           choco install cmake -y --no-progress --version 3.23.1
 
-      - uses: actions/cache@v3
-        with:
-          path: |
-            ~\AppData\Local\go-build
-            ~\go\pkg\mod
-          key: go-${{ matrix.os }}-${{ hashFiles('**/go.sum') }}
-          restore-keys: go-${{ matrix.os }}-
-
       - name: Build
         run: .\wmake.ps1 all
 
@@ -130,13 +108,13 @@ jobs:
       # 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-20.04
-      if: ${{ github.event_name == 'push' || !github.event.pull_request.draft }}
-      steps:
-        - uses: actions/checkout@v3
-      
-        - name: run automated testing
-          run: BUILD_ERIGON=1 ./tests/automated-testing/run.sh
+
+#  automated-tests:
+#    runs-on:
+#      ubuntu-20.04
+#    if: ${{ github.event_name == 'push' || !github.event.pull_request.draft }}
+#    steps:
+#      - uses: actions/checkout@v3
+#
+#      - name: run automated testing
+#        run: BUILD_ERIGON=1 ./tests/automated-testing/run.sh

.github/workflows/coverage.yml

@@ -11,11 +11,9 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - run: git submodule update --init --recursive --force
-
-      - uses: actions/setup-go@v3
+      - uses: actions/setup-go@v4
         with:
-          go-version: 1.18.x
+          go-version: '1.19'
 
       - name: install dependencies on Linux
         if: runner.os == 'Linux'

.github/workflows/docker-tags.yml

@@ -0,0 +1,41 @@
+name: Docker tags
+
+on:
+  push:
+    tags:
+      - 'y*.*.*'
+  workflow_dispatch:
+
+jobs:
+  goreleaser:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: dockerhub-login
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB }}
+          password: ${{ secrets.DOCKERHUB_KEY }}
+      - name: ghcr-login
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - uses: docker/setup-qemu-action@v2
+
+      - run: |
+          make release-dry-run
+          docker images
+        #          docker image push --all-tags thorax/erigon
+        #          docker image push --all-tags ghcr.io/ledgerwatch/erigon
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          VERSION: ${GITHUB_REF#refs/tags/}
+          DOCKER_USERNAME: ${{ secrets.DOCKERHUB }}
+          DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_KEY }}

.github/workflows/download-page.yml

@@ -0,0 +1,21 @@
+name: Trigger After Release
+
+on:
+  workflow_run:
+    workflows: ["release"]
+    types:
+      - completed
+
+jobs:
+  after_release:
+    if: ${{ github.event.workflow_run.conclusion == 'success' }}
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Publish downloads
+        run: |
+          cd cmd/release 
+          docker buildx build --push --platform linux/amd64 --build-arg GITHUB_TOKEN="${{ secrets.GITHUB_TOKEN }}" -t thorax/download:latest .

.github/workflows/release.yml

@@ -13,20 +13,28 @@ on:
       - 'v*.*.*'
       # to be used by fork patch-releases ^^
       - 'v*.*.*-*'
+  workflow_dispatch:
 
 jobs:
   goreleaser:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
-      - name: Set up Go
-        uses: actions/setup-go@master
+      - name: dockerhub-login
+        uses: docker/login-action@v2
         with:
-          go-version: 1.18.x
+          username: ${{ secrets.DOCKERHUB }}
+          password: ${{ secrets.DOCKERHUB_KEY }}
+      - name: ghcr-login
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Prepare
         id: prepare
@@ -42,16 +50,18 @@ jobs:
           name: ".docker-creds"
           json: ${{ secrets.DOCKER_CREDENTIAL }}
 
+      - run: echo ${{ steps.prepare.outputs.tag_name }}
+
       - name: Run GoReleaser
         run: |
           make release
+          docker images
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           VERSION: ${{ steps.prepare.outputs.tag_name }}
-          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
-
+          DOCKER_USERNAME: ${{ secrets.DOCKERHUB }}
+          DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_KEY }}
       - name: Publish downloads
         run: |
           cd cmd/release
-          docker buildx build --push --platform linux/amd64 --build-arg GITHUB_TOKEN="${{ secrets.GITHUB_TOKEN }}" -t thorax/download:latest .
+          docker buildx build --push --platform linux/amd64 --build-arg GITHUB_TOKEN="${{ secrets.GITHUB_TOKEN }}" -t thorax/download:latest .

.github/workflows/test-integration.yml

@@ -11,22 +11,13 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - run: git submodule update --init --recursive --force
-      - uses: actions/setup-go@v3
+      - uses: actions/setup-go@v4
         with:
-          go-version: 1.18.x
+          go-version: '1.19'
       - name: Install dependencies on Linux
         if: runner.os == 'Linux'
         run: sudo apt update && sudo apt install build-essential
 
-      - uses: actions/cache@v3
-        with:
-          path: |
-            ~/.cache/go-build
-            ~/Library/Caches/go-build
-            ~/go/pkg/mod
-          key: go-${{ matrix.os }}-${{ hashFiles('**/go.sum') }}
-          restore-keys: go-${{ matrix.os }}-
-
       - name: test-integration
         run: make test-integration
 
@@ -42,9 +33,9 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - run: git submodule update --init --recursive --force
-      - uses: actions/setup-go@v3
+      - uses: actions/setup-go@v4
         with:
-          go-version: 1.18.x
+          go-version: '1.19'
 
       - uses: actions/cache@v3
         with:
@@ -57,13 +48,5 @@ jobs:
           choco upgrade mingw -y --no-progress --version 11.2.0.07112021
           choco install cmake -y --no-progress --version 3.23.1
 
-      - uses: actions/cache@v3
-        with:
-          path: |
-            ~\AppData\Local\go-build
-            ~\go\pkg\mod
-          key: go-${{ matrix.os }}-${{ hashFiles('**/go.sum') }}
-          restore-keys: go-${{ matrix.os }}-
-
       - name: test-integration
         run: .\wmake.ps1 test-integration

.gitignore

@@ -81,4 +81,8 @@ docker-compose.*.yml
 coverage.out
 
 dist
-__debug_bin
+__debug_bin
+
+*.log
+
+caplin-recordings

.golangci.yml

@@ -2,22 +2,35 @@ run:
   deadline: 10m
 
 linters:
-  disable-all: true
+  presets:
+    - bugs
+    - error
+    - unused
+    - performance
+  disable:
+    - exhaustive
+    - musttag
+    - contextcheck
+    - wrapcheck
+    - goerr113
+    - unparam
+    - makezero #TODO: enable me
+    - noctx #TODO: enable me
+    - nilerr #TODO: enable me
+    - errorlint #TODO: enable me
+    - errchkjson #TODO: enable me
+    - unused #TODO: enable me
+    - gocheckcompilerdirectives
   enable:
+    - unconvert
+    #    - predeclared #TODO: enable me
+    #    - thelper #TODO: enable me
+    #    - wastedassign
     - gofmt
-    - errcheck
-    - gosimple
-    - govet
-    - ineffassign
-    - staticcheck
-#    - structcheck # 1.18
-#    - unused # 1.18
     - gocritic
-    - bodyclose
-    - gosec
+#    - revive
 #    - forcetypeassert
-    - prealloc
-    - unconvert
+#    - stylecheck
 
 linters-settings:
   gocritic: