[R4R] merge go-ethereum

.github/generate_change_log.sh

@@ -24,10 +24,6 @@ TESTNET_ZIP_SUM="$(checksum ./testnet.zip)"
 LINUX_BIN_SUM="$(checksum ./linux/geth)"
 MAC_BIN_SUM="$(checksum ./macos/geth)"
 WINDOWS_BIN_SUM="$(checksum ./windows/geth.exe)"
-ARM5_BIN_SUM="$(checksum ./arm5/geth-linux-arm-5)"
-ARM6_BIN_SUM="$(checksum ./arm6/geth-linux-arm-6)"
-ARM7_BIN_SUM="$(checksum ./arm7/geth-linux-arm-7)"
-ARM64_BIN_SUM="$(checksum ./arm64/geth-linux-arm64)"
 OUTPUT=$(cat <<-END
 ## Changelog\n
 ${CHANGE_LOG}\n
@@ -39,10 +35,6 @@ ${CHANGE_LOG}\n
 | geth_linux | ${LINUX_BIN_SUM} |\n
 | geth_mac  | ${MAC_BIN_SUM} |\n
 | geth_windows  | ${WINDOWS_BIN_SUM} |\n
-| geth_linux_arm5  | ${ARM5_BIN_SUM} |\n
-| geth_linux_arm6  | ${ARM6_BIN_SUM} |\n
-| geth_linux_arm7  | ${ARM7_BIN_SUM} |\n
-| geth_linux_arm64  | ${ARM64_BIN_SUM} |\n
 END
 )
 

.github/workflows/build-test.yml

@@ -15,7 +15,7 @@ jobs:
   unit-test:
     strategy:
       matrix:
-        go-version: [1.16.x]
+        go-version: [1.17.x]
         os: [ubuntu-18.04]
     runs-on: ${{ matrix.os }}
     steps:

.github/workflows/lint.yml

@@ -15,7 +15,7 @@ jobs:
   unit-test:
     strategy:
       matrix:
-        go-version: [1.16.x]
+        go-version: [1.17.x]
         os: [ubuntu-18.04]
     runs-on: ${{ matrix.os }}
     steps:

.github/workflows/pre-release.yml

@@ -10,7 +10,7 @@ jobs:
     name: Build Release
     strategy:
       matrix:
-        go-version: [1.16.x]
+        go-version: [1.17.x]
         os: [ubuntu-18.04, macos-11, windows-2019]
     runs-on: ${{ matrix.os }}
     steps:
@@ -45,19 +45,6 @@ jobs:
       - name: Build Binary for ${{matrix.os}}
         run: make geth
 
-      # ==============================
-      #       Cross Compile for ARM
-      # ==============================
-
-      - name: Build Binary for ARM
-        if: matrix.os == 'ubuntu-18.04'
-        env:
-          GOPATH: /home/runner/work/woodpecker/go
-        run: |
-          mkdir -p $GOPATH/src/github.com/binance-chain/bsc/
-          cp -r ./* $GOPATH/src/github.com/binance-chain/bsc/
-          cd $GOPATH/src/github.com/binance-chain/bsc/ && make geth-linux-arm
-
       # ==============================
       #       Upload artifacts
       # ==============================
@@ -83,34 +70,6 @@ jobs:
           name: windows
           path: ./build/bin/geth.exe
 
-      - name: Upload ARM-5 Build
-        uses: actions/upload-artifact@v2
-        if: matrix.os == 'ubuntu-18.04'
-        with:
-          name: arm5
-          path: /home/runner/work/woodpecker/go/src/github.com/binance-chain/bsc/build/bin/geth-linux-arm-5
-
-      - name: Upload ARM-6 Build
-        uses: actions/upload-artifact@v2
-        if: matrix.os == 'ubuntu-18.04'
-        with:
-          name: arm6
-          path: /home/runner/work/woodpecker/go/src/github.com/binance-chain/bsc/build/bin/geth-linux-arm-6
-
-      - name: Upload ARM-7 Build
-        uses: actions/upload-artifact@v2
-        if: matrix.os == 'ubuntu-18.04'
-        with:
-          name: arm7
-          path: /home/runner/work/woodpecker/go/src/github.com/binance-chain/bsc/build/bin/geth-linux-arm-7
-
-      - name: Upload ARM-64 Build
-        uses: actions/upload-artifact@v2
-        if: matrix.os == 'ubuntu-18.04'
-        with:
-          name: arm64
-          path: /home/runner/work/woodpecker/go/src/github.com/binance-chain/bsc/build/bin/geth-linux-arm64
-
   release:
     name: Release
     needs: build
@@ -143,30 +102,6 @@ jobs:
         with:
           name: windows
           path: ./windows
-
-      - name: Download Artifacts
-        uses: actions/download-artifact@v2
-        with:
-          name: arm5
-          path: ./arm5
-
-      - name: Download Artifacts
-        uses: actions/download-artifact@v2
-        with:
-          name: arm6
-          path: ./arm6
-
-      - name: Download Artifacts
-        uses: actions/download-artifact@v2
-        with:
-          name: arm7
-          path: ./arm7
-
-      - name: Download Artifacts
-        uses: actions/download-artifact@v2
-        with:
-          name: arm64
-          path: ./arm64
 
       - name: Download Config File
         run: |
@@ -226,46 +161,6 @@ jobs:
           asset_path: ./windows/geth.exe
           asset_name: geth_windows.exe
           asset_content_type: application/octet-stream
-
-      - name: Upload Release Asset - Linux ARM 5
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
-          asset_path: ./arm5/geth-linux-arm-5
-          asset_name: geth-linux-arm-5
-          asset_content_type: application/octet-stream
-
-      - name: Upload Release Asset - Linux ARM 6
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
-          asset_path: ./arm6/geth-linux-arm-6
-          asset_name: geth-linux-arm-6
-          asset_content_type: application/octet-stream
-
-      - name: Upload Release Asset - Linux ARM 7
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
-          asset_path: ./arm7/geth-linux-arm-7
-          asset_name: geth-linux-arm-7
-          asset_content_type: application/octet-stream
-
-      - name: Upload Release Asset - Linux ARM 64
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
-          asset_path: ./arm64/geth-linux-arm64
-          asset_name: geth-linux-arm64
-          asset_content_type: application/octet-stream
 
       - name: Upload Release Asset - MAINNET.ZIP
         uses: actions/upload-release-asset@v1

.github/workflows/release.yml

@@ -11,7 +11,7 @@ jobs:
     name: Build Release
     strategy:
       matrix:
-        go-version: [1.16.x]
+        go-version: [1.17.x]
         os: [ubuntu-18.04, macos-11, windows-2019]
     runs-on: ${{ matrix.os }}
     steps:
@@ -46,19 +46,6 @@ jobs:
       - name: Build Binary for ${{matrix.os}}
         run: make geth
 
-      # ==============================
-      #       Cross Compile for ARM
-      # ==============================
-
-      - name: Build Binary for ARM
-        if: matrix.os == 'ubuntu-18.04'
-        env:
-          GOPATH: /home/runner/work/woodpecker/go
-        run: |
-          mkdir -p $GOPATH/src/github.com/binance-chain/bsc/
-          cp -r ./* $GOPATH/src/github.com/binance-chain/bsc/
-          cd $GOPATH/src/github.com/binance-chain/bsc/ && make geth-linux-arm
-
       # ==============================
       #       Upload artifacts
       # ==============================
@@ -84,34 +71,6 @@ jobs:
           name: windows
           path: ./build/bin/geth.exe
 
-      - name: Upload ARM-5 Build
-        uses: actions/upload-artifact@v2
-        if: matrix.os == 'ubuntu-18.04'
-        with:
-          name: arm5
-          path: /home/runner/work/woodpecker/go/src/github.com/binance-chain/bsc/build/bin/geth-linux-arm-5
-
-      - name: Upload ARM-6 Build
-        uses: actions/upload-artifact@v2
-        if: matrix.os == 'ubuntu-18.04'
-        with:
-          name: arm6
-          path: /home/runner/work/woodpecker/go/src/github.com/binance-chain/bsc/build/bin/geth-linux-arm-6
-
-      - name: Upload ARM-7 Build
-        uses: actions/upload-artifact@v2
-        if: matrix.os == 'ubuntu-18.04'
-        with:
-          name: arm7
-          path: /home/runner/work/woodpecker/go/src/github.com/binance-chain/bsc/build/bin/geth-linux-arm-7
-
-      - name: Upload ARM-64 Build
-        uses: actions/upload-artifact@v2
-        if: matrix.os == 'ubuntu-18.04'
-        with:
-          name: arm64
-          path: /home/runner/work/woodpecker/go/src/github.com/binance-chain/bsc/build/bin/geth-linux-arm64
-
   release:
     name: Release
     needs: build
@@ -145,30 +104,6 @@ jobs:
           name: windows
           path: ./windows
 
-      - name: Download Artifacts
-        uses: actions/download-artifact@v2
-        with:
-          name: arm5
-          path: ./arm5
-
-      - name: Download Artifacts
-        uses: actions/download-artifact@v2
-        with:
-          name: arm6
-          path: ./arm6
-
-      - name: Download Artifacts
-        uses: actions/download-artifact@v2
-        with:
-          name: arm7
-          path: ./arm7
-
-      - name: Download Artifacts
-        uses: actions/download-artifact@v2
-        with:
-          name: arm64
-          path: ./arm64
-
       - name: Download Config File
         run: |
           . ./.github/release.env
@@ -236,46 +171,6 @@ jobs:
           asset_name: geth_windows.exe
           asset_content_type: application/octet-stream
 
-      - name: Upload Release Asset - Linux ARM 5
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
-          asset_path: ./arm5/geth-linux-arm-5
-          asset_name: geth-linux-arm-5
-          asset_content_type: application/octet-stream
-
-      - name: Upload Release Asset - Linux ARM 6
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
-          asset_path: ./arm6/geth-linux-arm-6
-          asset_name: geth-linux-arm-6
-          asset_content_type: application/octet-stream
-
-      - name: Upload Release Asset - Linux ARM 7
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
-          asset_path: ./arm7/geth-linux-arm-7
-          asset_name: geth-linux-arm-7
-          asset_content_type: application/octet-stream
-
-      - name: Upload Release Asset - Linux ARM 64
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
-          asset_path: ./arm64/geth-linux-arm64
-          asset_name: geth-linux-arm64
-          asset_content_type: application/octet-stream
-
       - name: Upload Release Asset - MAINNET.ZIP
         uses: actions/upload-release-asset@v1
         env:

.github/workflows/unit-test.yml

@@ -15,7 +15,7 @@ jobs:
   unit-test:
     strategy:
       matrix:
-        go-version: [1.16.x]
+        go-version: [1.17.x]
         os: [ubuntu-18.04]
     runs-on: ${{ matrix.os }}
     steps:
@@ -47,6 +47,5 @@ jobs:
       env:
         ANDROID_HOME: "" # Skip android test
       run: |
-        go clean -testcache
         make test
 

.gitmodules

@@ -1,3 +1,8 @@
 [submodule "tests"]
 	path = tests/testdata
 	url = https://github.com/ethereum/tests
+	shallow = true
+[submodule "evm-benchmarks"]
+	path = tests/evm-benchmarks
+	url = https://github.com/ipsilon/evm-benchmarks
+	shallow = true

.golangci.yml

@@ -1,7 +1,7 @@
 # This file configures github.com/golangci/golangci-lint.
 
 run:
-  timeout: 3m
+  timeout: 20m
   tests: true
   # default is true. Enables skipping of directories:
   #   vendor$, third_party$, testdata$, examples$, Godeps$, builtin$