Merge tag 'v0.5.0' into release/polygon-0.x-fh2.3

# Conflicts: # .github/workflows/release.yml # accounts/abi/bind/backends/simulated.go # accounts/abi/bind/bind_test.go # cmd/devp2p/main.go # cmd/evm/internal/t8ntool/execution.go # cmd/evm/runner.go # cmd/geth/dbcmd.go # cmd/geth/main.go # cmd/utils/flags.go # consensus/beacon/consensus.go # consensus/bor/bor.go # consensus/clique/clique.go # consensus/consensus.go # consensus/ethash/consensus.go # core/blockchain.go # core/chain_makers.go # core/genesis.go # core/parallel_state_processor.go # core/state/state_object.go # core/state/state_test.go # core/state/statedb.go # core/state/statedb_test.go # core/state/sync_test.go # core/state/trie_prefetcher_test.go # core/state_processor.go # core/state_transition.go # core/txpool/txpool2_test.go # core/txpool/txpool_test.go # core/vm/contract.go # core/vm/contracts.go # core/vm/evm.go # core/vm/instructions.go # core/vm/instructions_test.go # core/vm/interface.go # core/vm/interpreter.go # core/vm/runtime/runtime.go # core/vm/runtime/runtime_test.go # eth/api_backend.go # eth/api_test.go # eth/ethconfig/gen_config.go # eth/state_accessor.go # eth/sync.go # eth/tracers/api.go # eth/tracers/api_bor.go # eth/tracers/internal/tracetest/calltrace_test.go # eth/tracers/js/tracer_test.go # eth/tracers/logger/logger_test.go # eth/tracers/tracers_test.go # go.mod # go.sum # graphql/graphql.go # internal/debug/flags.go # internal/ethapi/api.go # internal/ethapi/backend.go # les/api_backend.go # les/odr_test.go # les/state_accessor.go # light/odr_test.go # miner/worker.go # miner/worker_test.go # params/version.go # tests/state_test.go # tests/state_test_util.go
streamingfast · Sep 12, 2023 · 9697b42 · 9697b42
2 parents 1fd12d6 + a02374e
commit 9697b42
Show file tree

Hide file tree

Showing 1,424 changed files with 205,159 additions and 181,942 deletions.
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -35,6 +35,6 @@ and help.
 
 ## Configuration, dependencies, and tests
 
-Please see the [Developers' Guide](https://geth.ethereum.org/docs/developers/devguide)
+Please see the [Developers' Guide](https://geth.ethereum.org/docs/developers/geth-developer/dev-guide)
 for more details on configuring your environment, managing project dependencies
 and testing procedures.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -29,7 +29,7 @@ jobs:
 
         - uses: actions/setup-go@v3
           with:
-            go-version: 1.19.x
+            go-version: 1.20.x
 
         - name: Install dependencies on Linux
           if: runner.os == 'Linux'
@@ -98,7 +98,7 @@ jobs:
 
         - uses: actions/setup-go@v3
           with:
-            go-version: 1.18.x
+            go-version: 1.20.x
 
         - name: Checkout matic-cli
           uses: actions/checkout@v3

diff --git a/.github/workflows/packager.yml b/.github/workflows/packager.yml
@@ -23,7 +23,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@master
         with:
-          go-version: 1.19
+          go-version: 1.20.x
       - name: Adding TAG to ENV
         run: echo "GIT_TAG=`echo $(git describe --tags --abbrev=0)`" >> $GITHUB_ENV
 
@@ -47,7 +47,7 @@ jobs:
         run: cp -rp packaging/deb/bor packaging/deb/bor-${{ env.GIT_TAG }}-${{ env.ARCH }}
         env:
           ARCH: amd64
-          
+
       - name: Running package build
         run: dpkg-deb --build --root-owner-group packaging/deb/bor-${{ env.GIT_TAG }}-${{ env.ARCH }}
         env:
@@ -476,7 +476,7 @@ jobs:
           ARCH: amd64
           NODE: archive
           NETWORK: mainnet
-      - name: Building bor ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }} profile 
+      - name: Building bor ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }} profile
         run: dpkg-deb --build --root-owner-group packaging/deb/bor-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}
         env:
           ARCH: amd64
@@ -739,7 +739,7 @@ jobs:
           ARCH: arm64
           NODE: sentry
           NETWORK: mainnet
-      - name: Building bor ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }} profile 
+      - name: Building bor ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }} profile
         run: dpkg-deb --build --root-owner-group packaging/deb/bor-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}
         env:
           ARCH: arm64
@@ -849,13 +849,13 @@ jobs:
           ARCH: arm64
           NODE: validator
           NETWORK: mainnet
-      - name: Building bor ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }} profile 
+      - name: Building bor ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }} profile
         run: dpkg-deb --build --root-owner-group packaging/deb/bor-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}
         env:
           ARCH: arm64
           NODE: validator
           NETWORK: mainnet
-        
+
       - name: Updating the control file to use with the arm64 profile
         run: cp -rp packaging/templates/package_scripts/control.profile.arm64 packaging/deb/bor/DEBIAN/control
 
@@ -895,7 +895,7 @@ jobs:
           ARCH: arm64
           NODE: archive
           NETWORK: mumbai
-      - name: Building bor ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }} profile 
+      - name: Building bor ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }} profile
         run: dpkg-deb --build --root-owner-group packaging/deb/bor-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}
         env:
           ARCH: arm64
@@ -938,7 +938,7 @@ jobs:
           ARCH: arm64
           NODE: archive
           NETWORK: mainnet
-      - name: Building bor ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }} profile 
+      - name: Building bor ${{ env.NODE }} on ${{ env.NETWORK }} on ${{ env.ARCH }} profile
         run: dpkg-deb --build --root-owner-group packaging/deb/bor-${{ env.NETWORK }}-${{ env.NODE }}-config_${{ env.GIT_TAG }}-${{ env.ARCH }}
         env:
           ARCH: arm64

diff --git a/.github/workflows/security-ci.yml b/.github/workflows/security-ci.yml
@@ -2,47 +2,6 @@ name: Security CI
 on: [ push, pull_request ]
 
 jobs:
-  snyk:
-    name: Snyk and Publish
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Source
-        uses: actions/checkout@master
-      - name: Run Snyk to check for vulnerabilities
-        uses: snyk/actions/golang@master
-        continue-on-error: true
-        env:
-          SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
-          GOFLAGS: "-buildvcs=false"
-        with:
-          args: --org=${{ secrets.SNYK_ORG }} --severity-threshold=medium --sarif-file-output=snyk.sarif
-      - name: Upload result to GitHub Code Scanning
-        uses: github/codeql-action/upload-sarif@v2
-        continue-on-error: true
-        with:
-          sarif_file: snyk.sarif
-
-  snyk-code:
-    name: Snyk Code and Publish
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-      - name: Checkout Source
-        uses: actions/checkout@master
-      - name: Run Snyk SAST to check for code vulnerabilities
-        uses: snyk/actions/golang@master
-        continue-on-error: true
-        env:
-          SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
-        with:
-          args: --org=${{ secrets.SNYK_ORG }} --sarif-file-output=snyk.sarif
-          command: code test
-      - name: Upload result to GitHub Code Scanning
-        uses: github/codeql-action/upload-sarif@v2
-        continue-on-error: true
-        with:
-          sarif_file: snyk.sarif
-
   govuln:
     name: Run govuln check and Publish
     runs-on: ubuntu-latest
@@ -54,8 +13,7 @@ jobs:
         env:
           DEBUG: "true"
         with:
-          go-version: 1.19
-          vulncheck-version: latest
+          go-version: 1.20.5
           package: ./...
           github-token: ${{ secrets.GITHUB_TOKEN }}
           fail-on-vuln: true

diff --git a/.github/workflows/security-sonarqube-ci.yml b/.github/workflows/security-sonarqube-ci.yml
diff --git a/.golangci.yml b/.golangci.yml
@@ -1,7 +1,7 @@
 # This file configures github.com/golangci/golangci-lint.
 
 run:
-  go: '1.18'
+  go: '1.20'
   timeout: 20m
   tests: true
   # default is true. Enables skipping of directories:
@@ -146,7 +146,7 @@ linters-settings:
 
 issues:
   exclude-rules:
-    - path: crypto/blake2b/
+    - path: crypto/bn256/cloudflare/optate.go
       linters:
         - deadcode
     - path: crypto/bn256/cloudflare

diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -103,11 +103,6 @@ nfpms:
     scripts:
       postinstall: builder/files/bor-post-install.sh
 
-    overrides:
-      rpm:
-        replacements:
-          amd64: x86_64
-
 snapshot:
   name_template: "{{ .Tag }}.next"