Merge remote-tracking branch 'upstream/devel' into devel

# Conflicts:
#	go.mod

.github/ISSUE_TEMPLATE/bug.md

@@ -16,9 +16,9 @@ Commit hash:
 
 Erigon Command (with flags/config):
 
-Concensus Layer:
+Consensus Layer:
 
-Concensus Layer Command (with flags/config):
+Consensus Layer Command (with flags/config):
 
 Chain/Network: 
 

.github/workflows/ci.yml

@@ -4,12 +4,12 @@ on:
     branches:
       - devel
       - alpha
-      - stable
+      - 'release/**'
   pull_request:
     branches:
       - devel
       - alpha
-      - stable
+      - 'release/**'
     types:
       - opened
       - reopened
@@ -25,14 +25,14 @@ jobs:
     if: ${{ github.event_name == 'push' || !github.event.pull_request.draft }}
     strategy:
       matrix:
-        os: [ ubuntu-20.04, macos-11 ] # list of os: https://github.com/actions/virtual-environments
+        os: [ ubuntu-22.04, macos-13-xlarge ] # list of os: https://github.com/actions/virtual-environments
     runs-on: ${{ matrix.os }}
 
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v4
         with:
-          go-version: '1.19'
+          go-version: '1.20'
       - name: Install dependencies on Linux
         if: runner.os == 'Linux'
         run: sudo apt update && sudo apt install build-essential
@@ -50,11 +50,21 @@ jobs:
             echo >&2 "Reproducible build broken"; cat erigon1.sha256; cat erigon2.sha256; exit 1
           fi
 
-      - name: Lint
+      - name: Install golangci-lint
         if: runner.os == 'Linux'
         uses: golangci/golangci-lint-action@v3
         with:
-          version: v1.52
+          version: v1.55.2
+          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
 
       - name: Test
         run: make test
@@ -67,10 +77,14 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
+      - name: configure Pagefile
+        uses: al-cheb/[email protected]
+        with:
+          minimum-size: 8GB
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v4
         with:
-          go-version: '1.19'
+          go-version: '1.20'
 
       - uses: actions/cache@v3
         with:
@@ -80,19 +94,22 @@ jobs:
           key: chocolatey-${{ matrix.os }}
       - name: Install dependencies
         run: |
-          choco upgrade mingw -y --no-progress --version 11.2.0.07112021
-          choco install cmake -y --no-progress --version 3.23.1
+          choco upgrade mingw -y --no-progress --version 13.2.0
+          choco install cmake -y --no-progress --version 3.27.8
 
       - name: Build
         run: .\wmake.ps1 all
 
       - name: Test
         run: .\wmake.ps1 test
 
+      - name: Test erigon-lib
+        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' }}
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: AutoModality/action-clean@v1
       - uses: actions/checkout@v3
@@ -108,7 +125,7 @@ jobs:
 
 #  automated-tests:
 #    runs-on:
-#      ubuntu-20.04
+#      ubuntu-22.04
 #    if: ${{ github.event_name == 'push' || !github.event.pull_request.draft }}
 #    steps:
 #      - uses: actions/checkout@v3

.github/workflows/coverage.yml

@@ -12,7 +12,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v4
         with:
-          go-version: '1.19'
+          go-version: '1.20'
 
       - name: install dependencies on Linux
         if: runner.os == 'Linux'

.github/workflows/release.yml

@@ -19,6 +19,13 @@ jobs:
   goreleaser:
     runs-on: ubuntu-latest
     steps:
+      - name: Maximize build space
+        uses: AdityaGarg8/remove-unwanted-software@v1
+        with:
+          remove-dotnet: 'true'
+          remove-android: 'true'
+          remove-haskell: 'true'
+
       - name: Checkout
         uses: actions/checkout@v3
         with:

.github/workflows/test-integration-caplin.yml

@@ -0,0 +1,63 @@
+name: Consensus specification tests
+on:
+  push:
+    branches:
+      - devel
+      - alpha
+      - 'release/**'
+  pull_request:
+    branches:
+      - devel
+      - alpha
+      - 'release/**'
+    types:
+      - opened
+      - reopened
+      - synchronize
+      - ready_for_review
+
+jobs:
+  tests:
+    strategy:
+      matrix:
+#        disable macos-11 until https://github.com/ledgerwatch/erigon/issues/8789
+        os: [ ubuntu-22.04 ] # list of os: https://github.com/actions/virtual-environments
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v4
+        with:
+          go-version: '1.20'
+      - name: Install dependencies on Linux
+        if: runner.os == 'Linux'
+        run: sudo apt update && sudo apt install build-essential
+
+      - name: test-integration-caplin
+        run: cd cl/spectest && make tests && make mainnet
+
+  tests-windows:
+    strategy:
+      matrix:
+        os: [ windows-2022 ]
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v4
+        with:
+          go-version: '1.20'
+
+      - uses: actions/cache@v3
+        with:
+          path: |
+            C:\ProgramData\chocolatey\lib\mingw
+            C:\ProgramData\chocolatey\lib\cmake
+          key: chocolatey-${{ matrix.os }}
+      - name: Install dependencies
+        run: |
+          choco upgrade mingw -y --no-progress --version 13.2.0
+          choco install cmake -y --no-progress --version 3.27.8
+
+      - name: test-integration-caplin
+        run: cd ./cl/spectest/ && .\wmake.ps1 Tests Mainnet

.github/workflows/test-integration.yml

@@ -4,7 +4,7 @@ on:
     branches:
       - devel
       - alpha
-      - stable
+      - 'release/**'
   schedule:
     - cron: '20 16 * * *' # daily at 16:20 UTC
   workflow_dispatch:
@@ -13,24 +13,29 @@ jobs:
   tests:
     strategy:
       matrix:
-        os: [ ubuntu-20.04, macos-11 ] # list of os: https://github.com/actions/virtual-environments
+        os: [ ubuntu-22.04, macos-13-xlarge ] # list of os: https://github.com/actions/virtual-environments
     runs-on: ${{ matrix.os }}
 
     steps:
       - uses: actions/checkout@v3
       - run: git submodule update --init --recursive --force
       - uses: actions/setup-go@v4
         with:
-          go-version: '1.19'
+          go-version: '1.20'
       - name: Install dependencies on Linux
         if: runner.os == 'Linux'
         run: sudo apt update && sudo apt install build-essential
 
       - name: test-integration
         run: make test-integration
 
-      - name: history-v3-test-integration
-        run: make test3-integration
+      - name: Test erigon as a library
+        env:
+          GIT_COMMIT: ${{ github.event.pull_request.head.sha || github.sha }}
+        run: make test-erigon-ext GIT_COMMIT=$GIT_COMMIT
+
+  #        name: history-v3-test-integration
+  #        run: make test3-integration
 
   tests-windows:
     strategy:
@@ -43,7 +48,7 @@ jobs:
       - run: git submodule update --init --recursive --force
       - uses: actions/setup-go@v4
         with:
-          go-version: '1.19'
+          go-version: '1.20'
 
       - uses: actions/cache@v3
         with:
@@ -53,8 +58,8 @@ jobs:
           key: chocolatey-${{ matrix.os }}
       - name: Install dependencies
         run: |
-          choco upgrade mingw -y --no-progress --version 11.2.0.07112021
-          choco install cmake -y --no-progress --version 3.23.1
+          choco upgrade mingw -y --no-progress --version 13.2.0
+          choco install cmake -y --no-progress --version 3.27.8
 
       - name: test-integration
         run: .\wmake.ps1 test-integration

.gitignore

@@ -47,6 +47,7 @@ profile.cov
 
 # VS Code
 .vscode
+*.code-workspace
 
 # dashboard
 /dashboard/assets/flow-typed
@@ -70,9 +71,7 @@ __pycache__
 libmdbx/build/*
 tests/testdata/*
 
-go.work
-go.work.sum
-erigon-lib/
+go.work*
 
 /goerli
 
@@ -82,7 +81,20 @@ coverage.out
 
 dist
 __debug_bin
+*.exe
 
 *.log
 
-caplin-recordings
+caplin-recordings
+
+jwt.hex
+
+.tool-versions
+
+*__debug_bin*
+yarn.lock
+node_modules
+
+/config.toml
+/config.yaml
+/config.yml

.golangci.yml

@@ -1,5 +1,9 @@
 run:
   deadline: 10m
+  build-tags:
+    - nosqlite
+    - noboltdb
+    - integration
 
 linters:
   presets:
@@ -8,6 +12,7 @@ linters:
     - unused
     - performance
   disable:
+    - gosec # enable it after 1-2 weeks. it failing CI withoutt enough info to fix: https://github.com/ledgerwatch/erigon/actions/runs/5928644129/job/16074701625
     - exhaustive
     - musttag
     - contextcheck
@@ -20,7 +25,10 @@ linters:
     - errorlint #TODO: enable me
     - errchkjson #TODO: enable me
     - unused #TODO: enable me
+    - testifylint #TODO: enable me
+    - perfsprint #TODO: enable me
     - gocheckcompilerdirectives
+    - protogetter
   enable:
     - unconvert
     #    - predeclared #TODO: enable me
@@ -119,6 +127,7 @@ issues:
         - unused
         - deadcode
         - gocritic
+        - perfsprint
     - path: hack\.go
       linters:
         - gosec