feat(test-suite): replace fhevm bash cli with Bun runtime

.github/workflows/test-suite-e2e-operators-tests.yml

@@ -82,6 +82,21 @@ jobs:
       contents: 'read' # Required to checkout repository code
       id-token: 'write' # Required for OIDC authentication
       packages: 'read' # Required to read GitHub packages/container registry
+    env:
+      GH_TOKEN: ${{ secrets.GHCR_READ_TOKEN || github.token }}
+      CONNECTOR_DB_MIGRATION_VERSION: ${{ inputs.connector_version }}
+      CONNECTOR_GW_LISTENER_VERSION: ${{ inputs.connector_version }}
+      CONNECTOR_KMS_WORKER_VERSION: ${{ inputs.connector_version }}
+      CONNECTOR_TX_SENDER_VERSION: ${{ inputs.connector_version }}
+      COPROCESSOR_DB_MIGRATION_VERSION: ${{ inputs.db_migration_version }}
+      HOST_VERSION: ${{ inputs.host_version }}
+      GATEWAY_VERSION: ${{ inputs.gateway_version }}
+      COPROCESSOR_HOST_LISTENER_VERSION: ${{ inputs.host_listener_version }}
+      COPROCESSOR_GW_LISTENER_VERSION: ${{ inputs.gateway_listener_version }}
+      COPROCESSOR_TX_SENDER_VERSION: ${{ inputs.tx_sender_version }}
+      COPROCESSOR_TFHE_WORKER_VERSION: ${{ inputs.tfhe_worker_version }}
+      COPROCESSOR_SNS_WORKER_VERSION: ${{ inputs.sns_worker_version }}
+      COPROCESSOR_ZKPROOF_WORKER_VERSION: ${{ inputs.zkproof_worker_version }}
     runs-on: ${{ needs.setup-instance.outputs.runner-name }}
     needs: setup-instance
     timeout-minutes: 1440
@@ -94,7 +109,10 @@ jobs:
       - name: Setup Docker
         uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v3.3.0
 
-      - name: Install Foundry
+      - name: Setup Bun
+        uses: oven-sh/setup-bun@ecf28ddc73e819eb6fa29df6b34ef8921c743461 # v2
+
+      - name: Install foundry
         uses: foundry-rs/foundry-toolchain@82dee4ba654bd2146511f85f0d013af94670c4de # v1.4.0
 
       - name: Login to GitHub Container Registry
@@ -111,24 +129,15 @@ jobs:
           username: ${{ secrets.CGR_USERNAME }}
           password: ${{ secrets.CGR_PASSWORD }}
 
+      - name: Install CLI deps
+        working-directory: test-suite/fhevm
+        run: |
+          bun install --frozen-lockfile
+
       - name: Deploy fhevm Stack
         working-directory: test-suite/fhevm
-        env:
-          CONNECTOR_DB_MIGRATION_VERSION: ${{ inputs.connector_version }}
-          CONNECTOR_GW_LISTENER_VERSION: ${{ inputs.connector_version }}
-          CONNECTOR_KMS_WORKER_VERSION: ${{ inputs.connector_version }}
-          CONNECTOR_TX_SENDER_VERSION: ${{ inputs.connector_version }}
-          DB_MIGRATION_VERSION: ${{ inputs.db_migration_version }}
-          HOST_VERSION: ${{ inputs.host_version }}
-          GATEWAY_VERSION: ${{ inputs.gateway_version }}
-          HOST_LISTENER_VERSION: ${{ inputs.host_listener_version }}
-          GW_LISTENER_VERSION: ${{ inputs.gateway_listener_version }}
-          TX_SENDER_VERSION: ${{ inputs.tx_sender_version }}
-          TFHE_WORKER_VERSION: ${{ inputs.tfhe_worker_version }}
-          SNS_WORKER_VERSION: ${{ inputs.sns_worker_version }}
-          ZKPROOF_WORKER_VERSION: ${{ inputs.zkproof_worker_version }}
         run: |
-          ./fhevm-cli deploy --coprocessors 2 --coprocessor-threshold 2
+          ./fhevm-cli up --target latest-release --coprocessors 2 --threshold 2
 
       - name: All operators tests
         working-directory: test-suite/fhevm
@@ -142,16 +151,16 @@ jobs:
 
       - name: Show logs on test failure
         working-directory: test-suite/fhevm
-        if: always()
+        if: failure()
         run: |
           echo "::group::Relayer Logs"
-          ./fhevm-cli logs relayer
+          timeout 20 ./fhevm-cli logs relayer || true
           echo "::endgroup::"
           echo "::group::SNS Worker Logs"
-          ./fhevm-cli logs sns-worker | grep -v "Selected 0 rows to process"
+          timeout 20 ./fhevm-cli logs sns-worker | grep -v "Selected 0 rows to process" || true
           echo "::endgroup::"
           echo "::group::Transaction Sender Logs (filtered)"
-          ./fhevm-cli logs transaction-sender | grep -v "Selected 0 rows to process"
+          timeout 20 ./fhevm-cli logs transaction-sender | grep -v "Selected 0 rows to process" || true
           echo "::endgroup::"
           echo "::group::Coprocessor 2 - SNS Worker"
           ./fhevm-cli logs coprocessor-2-sns-worker 2>/dev/null | grep -v "Selected 0 rows to process" || true
@@ -167,7 +176,7 @@ jobs:
         working-directory: test-suite/fhevm
         if: always()
         run: |
-          ./fhevm-cli clean
+          ./fhevm-cli clean --images
 
   teardown-instance:
     name: test-suite-e2e-operators-tests/teardown

.github/workflows/test-suite-e2e-tests.yml

@@ -3,6 +3,14 @@ name: test-suite-e2e-tests
 on:
   workflow_dispatch:
     inputs: &workflow_inputs
+      image_mode:
+        description: "Use registry images or build workspace overrides on the runner"
+        default: "registry"
+        type: string
+      override:
+        description: "Comma-separated override values for workspace mode (for example: all, coprocessor, or coprocessor:host-listener)"
+        default: ""
+        type: string
       coprocessor-db-migration-version:
         description: "Coprocessor DB Migration Image Version"
         default: ""
@@ -67,10 +75,6 @@ on:
         description: "KMS Core version"
         default: ""
         type: string
-      deploy-build:
-        description: "Build local Docker images from the checked out repository before deploy"
-        default: false
-        type: boolean
   workflow_call:
     secrets:
       GHCR_READ_TOKEN:
@@ -95,6 +99,9 @@ jobs:
       id-token: 'write' # Required for OIDC authentication
       packages: 'read' # Required to read GitHub packages/container registry
     env:
+      GH_TOKEN: ${{ secrets.GHCR_READ_TOKEN || github.token }}
+      IMAGE_MODE: ${{ inputs.image_mode || 'registry' }}
+      WORKSPACE_OVERRIDE: ${{ inputs.override || '' }}
       COPROCESSOR_DB_MIGRATION_VERSION: ${{ inputs.coprocessor-db-migration-version }}
       COPROCESSOR_HOST_LISTENER_VERSION: ${{ inputs.coprocessor-host-listener-version }}
       COPROCESSOR_GW_LISTENER_VERSION: ${{ inputs.coprocessor-gw-listener-version }}
@@ -121,7 +128,10 @@ jobs:
       - name: Setup Docker
         uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v3.3.0
 
-      - name: Install Foundry
+      - name: Setup Bun
+        uses: oven-sh/setup-bun@ecf28ddc73e819eb6fa29df6b34ef8921c743461 # v2
+
+      - name: Install foundry
         uses: foundry-rs/foundry-toolchain@82dee4ba654bd2146511f85f0d013af94670c4de # v1.4.0
 
       - name: Login to GitHub Container Registry
@@ -138,22 +148,58 @@ jobs:
           username: ${{ secrets.CGR_USERNAME }}
           password: ${{ secrets.CGR_PASSWORD }}
 
-      - name: Display component versions
-        env:
-          JSON_INPUT: ${{ toJSON(inputs) }}
+      - name: Install CLI deps
+        working-directory: test-suite/fhevm
+        run: bun install --frozen-lockfile
+
+      - name: Resolve CLI up args
+        working-directory: test-suite/fhevm
         run: |
-          echo "Component versions: $JSON_INPUT"
+          set -euo pipefail
+          args_file="$RUNNER_TEMP/fhevm-up-args"
+          printf '%s\n%s\n' --target latest-release > "$args_file"
+          case "$IMAGE_MODE" in
+            registry)
+              if [ -n "$WORKSPACE_OVERRIDE" ]; then
+                echo "::error::override requires image_mode=workspace"
+                exit 1
+              fi
+              ;;
+            workspace)
+              if [ -z "$WORKSPACE_OVERRIDE" ]; then
+                echo "::error::image_mode=workspace requires override"
+                exit 1
+              fi
+              IFS=',' read -r -a overrides <<< "$WORKSPACE_OVERRIDE"
+              for raw in "${overrides[@]}"; do
+                override="${raw#"${raw%%[![:space:]]*}"}"
+                override="${override%"${override##*[![:space:]]}"}"
+                [ -n "$override" ] || continue
+                printf '%s\n%s\n' --override "$override" >> "$args_file"
+              done
+              if ! grep -qx -- --override "$args_file"; then
+                echo "::error::override did not contain any usable values"
+                exit 1
+              fi
+              ;;
+            *)
+              echo "::error::image_mode must be registry or workspace"
+              exit 1
+              ;;
+          esac
+          echo "UP_ARGS_FILE=$args_file" >> "$GITHUB_ENV"
 
-      - name: Deploy fhevm Stack
+      - name: Dry run
         working-directory: test-suite/fhevm
-        env:
-          DEPLOY_BUILD: ${{ inputs.deploy-build }}
         run: |
-          if [[ "$DEPLOY_BUILD" == 'true' ]]; then
-            ./fhevm-cli deploy --build --coprocessors 2 --coprocessor-threshold 2
-          else
-            ./fhevm-cli deploy --coprocessors 2 --coprocessor-threshold 2
-          fi
+          mapfile -t up_args < "$UP_ARGS_FILE"
+          ./fhevm-cli up "${up_args[@]}" --dry-run
+
+      - name: Boot fhevm Stack
+        working-directory: test-suite/fhevm
+        run: |
+          mapfile -t up_args < "$UP_ARGS_FILE"
+          ./fhevm-cli up "${up_args[@]}"
 
       # E2E tests on pausing the Host contracts
       - name: Pause Host Contracts
@@ -242,28 +288,28 @@ jobs:
 
       - name: Show logs on test failure
         working-directory: test-suite/fhevm
-        if: always()
+        if: failure()
         run: |
           echo "::group::Relayer Logs"
-          ./fhevm-cli logs fhevm-relayer
+          timeout 20 ./fhevm-cli logs fhevm-relayer || true
           echo "::endgroup::"
           echo "::group::SNS Worker Logs"
-          ./fhevm-cli logs coprocessor-sns-worker | grep -v "Selected 0 rows to process"
+          timeout 20 ./fhevm-cli logs coprocessor-sns-worker | grep -v "Selected 0 rows to process" || true
           echo "::endgroup::"
           echo "::group::Transaction Sender Logs (filtered)"
-          ./fhevm-cli logs coprocessor-transaction-sender | grep -v "Selected 0 rows to process"
+          timeout 20 ./fhevm-cli logs coprocessor-transaction-sender | grep -v "Selected 0 rows to process" || true
           echo "::endgroup::"
           echo "::group::Host Listener"
-          ./fhevm-cli logs coprocessor-host-listener
+          timeout 20 ./fhevm-cli logs coprocessor-host-listener || true
           echo "::endgroup::"
           echo "::group::Gateway Listener"
-          ./fhevm-cli logs coprocessor-gw-listener
+          timeout 20 ./fhevm-cli logs coprocessor-gw-listener || true
           echo "::endgroup::"
           echo "::group::ZKProof Worker"
-          ./fhevm-cli logs coprocessor-zkproof-worker
+          timeout 20 ./fhevm-cli logs coprocessor-zkproof-worker || true
           echo "::endgroup::"
           echo "::group::TFHE Worker"
-          ./fhevm-cli logs coprocessor-tfhe-worker
+          timeout 20 ./fhevm-cli logs coprocessor-tfhe-worker || true
           echo "::endgroup::"
           echo "::group::Coprocessor 2 - SNS Worker"
           ./fhevm-cli logs coprocessor-2-sns-worker 2>/dev/null | grep -v "Selected 0 rows to process" || true
@@ -279,4 +325,4 @@ jobs:
         working-directory: test-suite/fhevm
         if: always()
         run: |
-          ./fhevm-cli clean
+          ./fhevm-cli clean --images

.github/workflows/test-suite-orchestrate-e2e-tests.yml

@@ -141,6 +141,7 @@ jobs:
       CGR_USERNAME: ${{ secrets.CGR_USERNAME }}
       CGR_PASSWORD: ${{ secrets.CGR_PASSWORD }}
     with:
+      image_mode: registry
       coprocessor-db-migration-version: ${{ needs.create-e2e-tests-input.outputs.coprocessor-db-migration-version }}
       coprocessor-gw-listener-version: ${{ needs.create-e2e-tests-input.outputs.coprocessor-gw-listener-version }}
       coprocessor-host-listener-version: ${{ needs.create-e2e-tests-input.outputs.coprocessor-host-listener-version }}

.gitignore

@@ -54,6 +54,7 @@ tmp/
 .local/
 *-local.*
 .local
+.fhevm/
 
 # Node.js specific
 #-------------------------------------------------------------------------------

coprocessor/fhevm-engine/Dockerfile.workspace

@@ -62,6 +62,7 @@ RUN npm ci && \
 FROM ghcr.io/zama-ai/fhevm/gci/rust-glibc:1.91.0 AS builder
 
 ARG CARGO_PROFILE=release
+ARG BUILD_ID=unknown
 
 USER root
 WORKDIR /app
@@ -77,9 +78,6 @@ COPY gateway-contracts/rust_bindings ./gateway-contracts/rust_bindings
 COPY gateway-contracts/contracts ./gateway-contracts/contracts
 COPY host-contracts/contracts ./host-contracts/contracts
 
-# Copy BUILD_ID for version metadata (git commit reference)
-COPY .git/HEAD ./coprocessor/fhevm-engine/BUILD_ID
-
 WORKDIR /app/coprocessor/fhevm-engine
 
 # Build entire workspace - tfhe compiles ONCE here
@@ -89,7 +87,7 @@ WORKDIR /app/coprocessor/fhevm-engine
 RUN --mount=type=cache,target=/usr/local/cargo/registry,sharing=locked \
     --mount=type=cache,target=/app/coprocessor/fhevm-engine/target,sharing=locked \
     cargo fetch && \
-    SQLX_OFFLINE=true BUILD_ID=$(cat BUILD_ID) cargo build --profile=${CARGO_PROFILE} --workspace && \
+    SQLX_OFFLINE=true BUILD_ID=${BUILD_ID} cargo build --profile=${CARGO_PROFILE} --workspace && \
     mkdir -p /out && \
     cp target/${CARGO_PROFILE}/tfhe_worker /out/ && \
     cp target/${CARGO_PROFILE}/host_listener /out/ && \