Merge remote-tracking branch 'refs/remotes/origin/master'

ethpandaops · Jan 29, 2025 · 3a59cd3 · 3a59cd3
2 parents 3b7b57e + 9c49d73
commit 3a59cd3
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 7 deletions.
diff --git a/.github/workflows/hive-devnet-5.yaml b/.github/workflows/hive-devnet-5.yaml
@@ -7,8 +7,8 @@ on:
     inputs:
       client:
         type: string
-        default: '"go-ethereum","besu","reth","nethermind","erigon"'
-        description: Comma-separated list of clients to test .e.g go-ethereum, besu, reth, nethermind, erigon
+        default: '"go-ethereum","besu","reth","nethermind","erigon","ethereumjs"'
+        description: Comma-separated list of clients to test .e.g go-ethereum, besu, reth, nethermind, erigon, ethereumjs
       simulator:
         type: string
         default: '"ethereum/rpc-compat","ethereum/eest/consume-engine","ethereum/eest/consume-rlp"'
@@ -37,6 +37,10 @@ on:
         type: string
         default: erigontech/erigon@main
         description: GitHub repository and tag for erigon (repo@tag)
+      ethereumjs_version:
+        type: string
+        default: ethereumjs/ethereumjs-monorepo@master
+        description: GitHub repository and tag for ethereumjs (repo@tag)
 
 env:
   S3_BUCKET: hive-results
@@ -89,6 +93,9 @@ jobs:
       erigon_image: ${{ steps.parse.outputs.erigon_image }}
       erigon_tag: ${{ steps.parse.outputs.erigon_tag }}
       erigon_docker_image_tag: ${{ steps.parse.outputs.erigon_docker_image_tag }}
+      ethereumjs_repo: ${{ steps.parse.outputs.ethereumjs_repo }}
+      ethereumjs_tag: ${{ steps.parse.outputs.ethereumjs_tag }}
+      ethereumjs_docker_image_tag: ${{ steps.parse.outputs.ethereumjs_docker_image_tag }}
       # client_config contains the YAML client config for Hive
       client_config: ${{ steps.client_config.outputs.config }}
     steps:
@@ -100,6 +107,7 @@ jobs:
           RETH_DEFAULT="paradigmxyz/reth@main"
           NETHERMIND_DEFAULT="NethermindEth/nethermind@master"
           ERIGON_DEFAULT="erigontech/erigon@main"
+          ETHEREUMJS_DEFAULT="ethereumjs/ethereumjs-monorepo@master"
 
           # Parse geth
           echo "geth_repo=$(echo ${GETH_VERSION:-$GETH_DEFAULT} | cut -d@ -f1)" >> $GITHUB_OUTPUT
@@ -126,6 +134,11 @@ jobs:
           echo "erigon_tag=$(echo ${ERIGON_VERSION:-$ERIGON_DEFAULT} | cut -d@ -f2)" >> $GITHUB_OUTPUT
           echo "erigon_docker_image_tag=$(echo ${ERIGON_VERSION:-$ERIGON_DEFAULT} | sed 's/[@\/]/_/g' | tr '[:upper:]' '[:lower:]')" >> $GITHUB_OUTPUT
 
+          # Parse ethereumjs
+          echo "ethereumjs_repo=$(echo ${ETHEREUMJS_VERSION:-$ETHEREUMJS_DEFAULT} | cut -d@ -f1)" >> $GITHUB_OUTPUT
+          echo "ethereumjs_tag=$(echo ${ETHEREUMJS_VERSION:-$ETHEREUMJS_DEFAULT} | cut -d@ -f2)" >> $GITHUB_OUTPUT
+          echo "ethereumjs_docker_image_tag=$(echo ${ETHEREUMJS_VERSION:-$ETHEREUMJS_DEFAULT} | sed 's/[@\/]/_/g' | tr '[:upper:]' '[:lower:]')" >> $GITHUB_OUTPUT
+
           # Parse hive
           echo "hive_repo=$(echo ${HIVE_VERSION:-$HIVE_DEFAULT} | cut -d@ -f1)" >> $GITHUB_OUTPUT
           echo "hive_tag=$(echo ${HIVE_VERSION:-$HIVE_DEFAULT} | cut -d@ -f2)" >> $GITHUB_OUTPUT
@@ -135,6 +148,7 @@ jobs:
           RETH_VERSION: ${{ inputs.reth_version }}
           NETHERMIND_VERSION: ${{ inputs.nethermind_version }}
           ERIGON_VERSION: ${{ inputs.erigon_version }}
+          ETHEREUMJS_VERSION: ${{ inputs.ethereumjs_version }}
       - id: client_config
         run: |
           cat << 'EOF' >> $GITHUB_OUTPUT
@@ -169,6 +183,12 @@ jobs:
             build_args:
               github: ${{ steps.parse.outputs.erigon_repo }}
               tag: ${{ steps.parse.outputs.erigon_tag }}
+          - client: ethereumjs
+            nametag: ${{ steps.parse.outputs.ethereumjs_docker_image_tag }}
+            dockerfile: git
+            build_args:
+              github: ${{ steps.parse.outputs.ethereumjs_repo }}
+              tag: ${{ steps.parse.outputs.ethereumjs_tag }}
           ENDCONFIG
           EOF
 
@@ -187,7 +207,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        client: ${{ fromJSON(format('[{0}]', inputs.client || '"go-ethereum","besu","reth","nethermind","erigon"')) }}
+        client: ${{ fromJSON(format('[{0}]', inputs.client || '"go-ethereum","besu","reth","nethermind","erigon","ethereumjs"')) }}
         simulator: ${{ fromJSON(format('[{0}]', inputs.simulator || '"ethereum/rpc-compat","ethereum/eest/consume-engine","ethereum/eest/consume-rlp"')) }}
     steps:
       - uses: actions/checkout@v4

diff --git a/setup.sh b/setup.sh
@@ -1,8 +1,8 @@
 #!/bin/bash -xe
 
 # Uninstall previous asdf plugins that shouldn't be managed anymore under asdf
-asdf uninstall ansible
-asdf uninstall ansible-lint
+asdf uninstall ansible || true
+asdf uninstall ansible-lint || true
 
 # Plugin list
 asdf plugin add age https://github.com/threkk/asdf-age.git || true
@@ -11,13 +11,13 @@ asdf plugin add sops https://github.com/feniix/asdf-sops.git || true
 asdf plugin-add terraform https://github.com/asdf-community/asdf-hashicorp.git || true
 asdf plugin-add helm https://github.com/Antiarchitect/asdf-helm.git || true
 asdf plugin-add python || true
+asdf plugin-add yq https://github.com/sudermanjr/asdf-yq.git
 asdf plugin add awscli || true
 
 asdf plugin-list
 asdf install
+asdf reshim
 
 # Install python tools
 pip install -r requirements.txt
 
-# reinstall terraform
-PLUGIN=terraform asdf list $PLUGIN | awk '{print "asdf uninstall $PLUGIN " $1 "; asdf install $PLUGIN " $1}' | bash