Merge tag 'v2.60.9' into upstream-2.60.9

testinprod-io · Oct 31, 2024 · c4a8ab7 · c4a8ab7
2 parents 812c1f7 + 501a53b
commit c4a8ab7
Show file tree

Hide file tree

Showing 37 changed files with 872 additions and 567 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -41,7 +41,7 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-go@v4
         with:
-          go-version: '1.21'
+          go-version: '1.22'
       - name: Install dependencies on Linux
         if: runner.os == 'Linux'
         run: sudo apt update && sudo apt install build-essential
@@ -101,7 +101,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v4
         with:
-          go-version: '1.21'
+          go-version: '1.22'
 
       - uses: actions/cache@v3
         with:
@@ -122,31 +122,3 @@ jobs:
 
       - 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-22.04
-
-    steps:
-      - uses: AutoModality/action-clean@v1
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0 # fetch git tags for "git describe"
-
-      - name: make docker (see dockerhub for image builds)
-        run: DOCKER_TAG=testinprod/op-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: sudo make docker
-        run: sudo DOCKER_TAG=testinprod/op-erigon:ci-$GITHUB_SHA DOCKER_UID=$(id -u) DOCKER_GID=$(id -g) make docker
-
-#  automated-tests:
-#    runs-on:
-#      ubuntu-22.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
diff --git a/.github/workflows/qa-rpc-integration-tests.yml b/.github/workflows/qa-rpc-integration-tests.yml
@@ -28,7 +28,7 @@ jobs:
       - name: Checkout RPC Tests Repository & Install Requirements
         run: |
           rm -rf ${{ runner.workspace }}/rpc-tests
-          git -c advice.detachedHead=false clone --depth 1 --branch v0.47.0 https://github.com/erigontech/rpc-tests ${{runner.workspace}}/rpc-tests
+          git -c advice.detachedHead=false clone --depth 1 --branch v0.52.0 https://github.com/erigontech/rpc-tests ${{runner.workspace}}/rpc-tests
           cd ${{ runner.workspace }}/rpc-tests
           pip3 install -r requirements.txt
 
@@ -38,28 +38,24 @@ jobs:
 
       - name: Build Erigon RPCDaemon
         run: |
-          make erigon
+          make rpcdaemon
         working-directory: ${{ github.workspace }}
 
       - name: Pause the Erigon instance dedicated to db maintenance
         run: |
           python3 $ERIGON_QA_PATH/test_system/db-producer/pause_production.py || true
 
-      - name: Restore Erigon Testbed Data Directory
-        run: |
-          rsync -a --delete $ERIGON_REFERENCE_DATA_DIR/ $ERIGON_TESTBED_DATA_DIR/
-
       - name: Run RpcDaemon
         working-directory: ${{ github.workspace }}/build/bin
         run: |
-          echo "Erigon (RpcDaemon) starting..."
+          echo "RpcDaemon starting..."
           
-          ./erigon --datadir $ERIGON_TESTBED_DATA_DIR --http.api admin,debug,eth,parity,erigon,trace,web3,txpool,ots,net --ws --verbosity 1 > erigon.log 2>&1 &
+          ./rpcdaemon --datadir $ERIGON_REFERENCE_DATA_DIR --http.api admin,debug,eth,parity,erigon,trace,web3,txpool,ots,net --ws --verbosity 1 > erigon.log 2>&1 &
 
           RPC_DAEMON_PID=$!          
           echo "RPC_DAEMON_PID=$RPC_DAEMON_PID" >> $GITHUB_ENV
           
-          echo "Erigon (RpcDaemon) started"
+          echo "RpcDaemon started"
 
       - name: Wait for port 8545 to be opened
         run: |
@@ -92,40 +88,47 @@ jobs:
           debug_traceBlockByNumber/test_10.tar,\
           debug_traceBlockByNumber/test_11.tar,\
           debug_traceBlockByNumber/test_12.tar,\
-          debug_traceCall/test_10.tar,\
           debug_traceCallMany/test_07.tar,\
           debug_traceCallMany/test_09.json,\
-          debug_traceCallMany/test_10.tar,\
-          debug_traceTransaction/test_17.tar,\
-          debug_traceTransaction/test_18.tar,\
-          debug_traceTransaction/test_21.json,\
-          debug_traceTransaction/test_28.tar,\
           engine_exchangeCapabilities/test_1.json,\
           engine_exchangeTransitionConfigurationV1/test_01.json,\
           engine_getClientVersionV1,\
           parity_getBlockReceipts,\
           trace_rawTransaction,\
-          trace_replayTransaction/test_24.json,\
-          trace_replayBlockTransactions/test_01.tar,\
-          trace_replayBlockTransactions/test_03.tar,\
-          trace_replayBlockTransactions/test_04.tar,\
-          trace_replayBlockTransactions/test_05.tar,\
-          trace_replayBlockTransactions/test_08.tar,\
-          trace_replayBlockTransactions/test_13.tar,\
-          trace_replayBlockTransactions/test_14.tar,\
-          trace_replayBlockTransactions/test_15.tar,\
-          trace_replayBlockTransactions/test_16.tar,\
-          trace_replayBlockTransactions/test_17.tar,\
-          trace_replayBlockTransactions/test_18.tar,\
-          trace_replayBlockTransactions/test_19.tar,\
-          trace_replayBlockTransactions/test_20.tar,\
-          trace_replayBlockTransactions/test_21.tar,\
-          trace_replayBlockTransactions/test_22.tar,\
-          trace_replayBlockTransactions/test_23.tar,\
-          trace_replayBlockTransactions/test_24.tar,\
-          trace_replayBlockTransactions/test_28.tar,\
-          trace_replayBlockTransactions/test_29.tar
-  
+          trace_replayBlockTransactions/test_29.tar,\
+          erigon_getHeaderByHash/test_02.json,\
+          erigon_getHeaderByHash/test_03.json,\
+          erigon_getHeaderByHash/test_04.json,\
+          erigon_getHeaderByHash/test_06.json,\
+          erigon_getHeaderByNumber/test_01.json,\
+          erigon_getHeaderByNumber/test_02.json,\
+          erigon_getHeaderByNumber/test_03.json,\
+          erigon_getHeaderByNumber/test_04.json,\
+          erigon_getHeaderByNumber/test_05.json,\
+          erigon_getHeaderByNumber/test_06.json,\
+          erigon_getHeaderByNumber/test_07.json,\
+          erigon_getHeaderByNumber/test_08.json,\
+          erigon_nodeInfo/test_1.json,\
+          eth_coinbase/test_01.json,\
+          eth_createAccessList/test_16.json,\
+          eth_getTransactionByHash/test_02.json,\
+          eth_submitHashrate/test_1.json,\
+          eth_submitWork/test_1.json,\
+          net_peerCount/test_1.json,\
+          net_version/test_1.json,\
+          ots_getBlockDetails/test_02.json,\
+          ots_getBlockDetails/test_05.json,\
+          ots_getBlockDetailsByHash/test_02.json,\
+          ots_getBlockDetailsByHash/test_03.json,\
+          txpool_content/test_01.json,\
+          txpool_status/test_1.json,\
+          web3_clientVersion/test_1.json,\
+          admin_nodeInfo/test_01.json,\
+          admin_peers/test_01.json,\
+          eth_getWork/test_01.json,\
+          eth_mining/test_01.json,\
+          eth_protocolVersion/test_1.json
+          
           # Capture test runner script exit status
           test_exit_status=$?
           
@@ -157,11 +160,6 @@ jobs:
             echo "Erigon RpcDaemon has already terminated"
           fi
 
-      - name: Delete Erigon Testbed Data Directory
-        if: always()
-        run: |
-          rm -rf $ERIGON_TESTBED_DATA_DIR
-
       - name: Resume the Erigon instance dedicated to db maintenance
         run: |
           python3 $ERIGON_QA_PATH/test_system/db-producer/resume_production.py || true

diff --git a/.github/workflows/qa-tip-tracking-gnosis.yml b/.github/workflows/qa-tip-tracking-gnosis.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: [self-hosted, Gnosis]
     timeout-minutes: 600
     env:
-      ERIGON_REFERENCE_DATA_DIR: /opt/erigon-versions/reference-version/datadir
+      ERIGON_REFERENCE_DATA_DIR: /opt/erigon-versions/reference-version-2/datadir
       ERIGON_TESTBED_DATA_DIR: /opt/erigon-testbed/datadir
       ERIGON_QA_PATH: /home/qarunner/erigon-qa
       TRACKING_TIME_SECONDS: 14400 # 4 hours