diff --git a/.github/workflows/test-suite-e2e-tests-mq.yml b/.github/workflows/test-suite-e2e-tests-mq.yml deleted file mode 100644 index c1e7466568..0000000000 --- a/.github/workflows/test-suite-e2e-tests-mq.yml +++ /dev/null @@ -1,218 +0,0 @@ -name: test-suite-e2e-tests-mq - -on: - workflow_call: - secrets: - GHCR_READ_TOKEN: - required: true - CGR_USERNAME: - required: true - CGR_PASSWORD: - required: true - inputs: - coprocessor: - description: "Coprocessor versions array: [db_migration, gw_listener, host_listener, tx_sender, tfhe_worker, sns_worker, zkproof_worker]" - default: "[]" - type: string - gateway: - description: "Gateway version" - default: "" - type: string - host: - description: "Host version" - default: "" - type: string - connector: - description: "Connector versions array: [db_migration, gw_listener, tx_sender, kms_worker]" - default: "[]" - type: string - test-suite: - description: "Test suite version" - default: "" - type: string - relayer: - description: "Relayer version" - default: "" - type: string - kms-core: - description: "KMS Core version" - default: "" - type: string - workflow_dispatch: - inputs: - coprocessor: - description: "Coprocessor versions array: [db_migration, gw_listener, host_listener, tx_sender, tfhe_worker, sns_worker, zkproof_worker]" - default: "[]" - type: string - gateway: - description: "Gateway version" - default: "" - type: string - host: - description: "Host version" - default: "" - type: string - connector: - description: "Connector versions array: [db_migration, gw_listener, tx_sender, kms_worker]" - default: "[]" - type: string - test-suite: - description: "Test suite version" - default: "" - type: string - relayer: - description: "Relayer version" - default: "" - type: string - kms-core: - description: "KMS Core version" - default: "" - type: string - -permissions: {} - -# Allow to run multiple instances of the same workflow in parallel when triggered manually -concurrency: - group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event_name == 'workflow_dispatch' && github.run_id || 'auto' }} - cancel-in-progress: ${{ github.ref != 'refs/heads/main' }} - -jobs: - fhevm-e2e-test: - permissions: - contents: 'read' # Required to checkout repository code - id-token: 'write' # Required for OIDC authentication - packages: 'read' # Required to read GitHub packages/container registry - - runs-on: large_ubuntu_32 - steps: - - name: Checkout code - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - with: - persist-credentials: 'false' - - - name: Setup Docker - uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v3.3.0 - - - name: Login to GitHub Container Registry - uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0 - with: - registry: ghcr.io - username: ${{ github.actor }} - password: ${{ secrets.GHCR_READ_TOKEN }} - - - name: Login to Chainguard Registry - uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0 - with: - registry: cgr.dev - username: ${{ secrets.CGR_USERNAME }} - password: ${{ secrets.CGR_PASSWORD }} - - - name: Parse component versions - id: parse-versions - env: - COPROCESSOR_INPUT: ${{ inputs.coprocessor }} - GATEWAY_VERSION: ${{ inputs.gateway }} - HOST_VERSION: ${{ inputs.host }} - CONNECTOR_INPUT: ${{ inputs.connector }} - TEST_SUITE_VERSION: ${{ inputs.test-suite }} - RELAYER_VERSION: ${{ inputs.relayer }} - KMS_CORE_VERSION: ${{ inputs.kms-core }} - run: | - echo "🔧 Parsing component versions..." - - # Parse coprocessor array (7 elements) - if [[ "${COPROCESSOR_INPUT}" != "[]" && -n "${COPROCESSOR_INPUT}" ]]; then - echo "📊 Coprocessor array: ${COPROCESSOR_INPUT}" - - { - echo "DB_MIGRATION_VERSION=$(echo "${COPROCESSOR_INPUT}" | jq -r '.[0] // empty')" - echo "GW_LISTENER_VERSION=$(echo "${COPROCESSOR_INPUT}" | jq -r '.[1] // empty')" - echo "HOST_LISTENER_VERSION=$(echo "${COPROCESSOR_INPUT}" | jq -r '.[2] // empty')" - echo "TX_SENDER_VERSION=$(echo "${COPROCESSOR_INPUT}" | jq -r '.[3] // empty')" - echo "TFHE_WORKER_VERSION=$(echo "${COPROCESSOR_INPUT}" | jq -r '.[4] // empty')" - echo "SNS_WORKER_VERSION=$(echo "${COPROCESSOR_INPUT}" | jq -r '.[5] // empty')" - echo "ZKPROOF_WORKER_VERSION=$(echo "${COPROCESSOR_INPUT}" | jq -r '.[6] // empty')" - } >> "GITHUB_ENV" - fi - - # Parse connector array (4 elements) - if [[ "${CONNECTOR_INPUT}" != "[]" && -n "${CONNECTOR_INPUT}" ]]; then - echo "📊 Connector array: ${CONNECTOR_INPUT}" - - { - echo "CONNECTOR_DB_MIGRATION_VERSION=$(echo "${CONNECTOR_INPUT}" | jq -r '.[0] // empty')" - echo "CONNECTOR_GW_LISTENER_VERSION=$(echo "${CONNECTOR_INPUT}" | jq -r '.[1] // empty')" - echo "CONNECTOR_KMS_WORKER_VERSION=$(echo "${CONNECTOR_INPUT}" | jq -r '.[2] // empty')" - echo "CONNECTOR_TX_SENDER_VERSION=$(echo "${CONNECTOR_INPUT}" | jq -r '.[3] // empty')" - } >> "GITHUB_ENV" - fi - - echo "Component versions: gateway:${GATEWAY_VERSION}, host:${HOST_VERSION}, coprocessor:${COPROCESSOR_INPUT}, connector:${CONNECTOR_INPUT}, test-suite:${TEST_SUITE_VERSION}, relayer:${RELAYER_VERSION}, kms-core:${KMS_CORE_VERSION}" - echo "✅ Component versions parsed successfully" - - - name: Deploy fhevm Stack - working-directory: test-suite/fhevm - run: | - ./fhevm-cli deploy - - - name: Input proof test (uint64) - working-directory: test-suite/fhevm - run: | - ./fhevm-cli test input-proof - - - name: Input proof test with compute and decrypt (uint64) - working-directory: test-suite/fhevm - run: | - ./fhevm-cli test input-proof-compute-decrypt - - - name: User Decryption test - working-directory: test-suite/fhevm - run: | - ./fhevm-cli test user-decryption - - - name: ERC20 test - working-directory: test-suite/fhevm - run: | - ./fhevm-cli test erc20 - - - name: Public Decryption HTTP endpoint test (ebool) - working-directory: test-suite/fhevm - run: | - ./fhevm-cli test public-decrypt-http-ebool - - - name: Public Decryption HTTP endpoint test (mixed) - working-directory: test-suite/fhevm - run: | - ./fhevm-cli test public-decrypt-http-mixed - - - name: Delegate User Decryption (partial test) - working-directory: test-suite/fhevm - run: | - ./fhevm-cli test delegate-user-decryption - - - - name: Show logs on test failure - working-directory: test-suite/fhevm - if: always() - run: | - echo "::group::Relayer Logs" - ./fhevm-cli logs fhevm-relayer - echo "::endgroup::" - echo "::group::SNS Worker Logs" - ./fhevm-cli logs coprocessor-sns-worker | grep -v "Selected 0 rows to process" - echo "::endgroup::" - echo "::group::Transaction Sender Logs (filtered)" - ./fhevm-cli logs coprocessor-transaction-sender | grep -v "Selected 0 rows to process" - echo "::endgroup::" - echo "::group::Host Listener" - ./fhevm-cli logs coprocessor-host-listener - echo "::endgroup::" - echo "::group::Gateway Listener" - ./fhevm-cli logs coprocessor-gw-listener - echo "::endgroup::" - - - name: Cleanup - working-directory: test-suite/fhevm - if: always() - run: | - ./fhevm-cli clean diff --git a/.github/workflows/test-suite-e2e-tests.yml b/.github/workflows/test-suite-e2e-tests.yml index ac4a0580dd..a7e4b53249 100644 --- a/.github/workflows/test-suite-e2e-tests.yml +++ b/.github/workflows/test-suite-e2e-tests.yml @@ -1,56 +1,81 @@ name: test-suite-e2e-tests -# Github does not support more than 10 inputs for workflow_dispatch: -# https://docs.github.com/en/actions/reference/events-that-trigger-workflows#providing-inputs -# Core, relayer and test-suite will use the default versions defined in the `fhevm-cli` script on: workflow_dispatch: - inputs: - connector_version: - description: "Connector Version" + inputs: &workflow_inputs + coprocessor-db-migration-version: + description: "Coprocessor DB Migration Image Version" default: "" type: string - db_migration_version: - description: "Coprocessor DB Migration Image Version" + coprocessor-host-listener-version: + description: "Coprocessor Host Listener Image Version" + default: "" + type: string + coprocessor-gw-listener-version: + description: "Coprocessor Gateway Listener Image Version" + default: "" + type: string + coprocessor-tx-sender-version: + description: "Coprocessor Transaction Sender Image Version" + default: "" + type: string + coprocessor-tfhe-worker-version: + description: "Coprocessor TFHE Worker Image Version" + default: "" + type: string + coprocessor-sns-worker-version: + description: "Coprocessor SNS Worker Image Version" + default: "" + type: string + coprocessor-zkproof-worker-version: + description: "Coprocessor ZKProof Worker Image Version" default: "" type: string - host_version: - description: "Host Image Version" + gateway-version: + description: "Gateway version" default: "" type: string - gateway_version: - description: "Gateway Image Version" - required: false + host-version: + description: "Host version" default: "" type: string - host_listener_version: - description: "Host Listener Image Version" + connector-db-migration-version: + description: "KMS Connector DB Migration Image Version" default: "" type: string - gateway_listener_version: - description: "Gateway Listener Image Version" + connector-gw-listener-version: + description: "KMS Connector Gateway Listener Image Version" default: "" type: string - tx_sender_version: - description: "Transaction Sender Image Version" + connector-kms-worker-version: + description: "KMS Connector KMS Worker Image Version" default: "" type: string - tfhe_worker_version: - description: "TFHE Worker Image Version" + connector-tx-sender-version: + description: "KMS Connector Transaction Sender Image Version" default: "" type: string - sns_worker_version: - description: "SNS Worker Image Version" + test-suite-version: + description: "Test suite version" default: "" type: string - zkproof_worker_version: - description: "ZKProof Worker Image Version" + relayer-version: + description: "Relayer version" default: "" type: string - pull_request: - branches: - - main - - release/* + kms-core-version: + description: "KMS Core version" + default: "" + type: string + workflow_call: + secrets: + GHCR_READ_TOKEN: + required: true + CGR_USERNAME: + required: true + CGR_PASSWORD: + required: true + inputs: *workflow_inputs permissions: {} @@ -60,34 +85,28 @@ concurrency: cancel-in-progress: ${{ github.ref != 'refs/heads/main' }} jobs: - check-changes: - name: test-suite-e2e-tests/check-changes - permissions: - actions: 'read' # Required to read workflow run information - contents: 'read' # Required to checkout repository code - pull-requests: 'read' # Required to read pull request information - runs-on: ubuntu-latest - outputs: - changes-fhevm: ${{ steps.filter.outputs.fhevm }} - steps: - - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - with: - persist-credentials: 'false' - - uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2 - id: filter - with: - filters: | - fhevm: - - 'test-suite/fhevm/**' fhevm-e2e-test: - name: test-suite-e2e-tests/fhevm-e2e-test (bpr) - needs: check-changes - if: ${{ needs.check-changes.outputs.changes-fhevm == 'true' || github.event_name == 'release' || github.event_name == 'workflow_dispatch' }} permissions: contents: 'read' # Required to checkout repository code id-token: 'write' # Required for OIDC authentication packages: 'read' # Required to read GitHub packages/container registry - + env: + 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 }} + COPROCESSOR_TX_SENDER_VERSION: ${{ inputs.coprocessor-tx-sender-version }} + COPROCESSOR_TFHE_WORKER_VERSION: ${{ inputs.coprocessor-tfhe-worker-version }} + COPROCESSOR_SNS_WORKER_VERSION: ${{ inputs.coprocessor-sns-worker-version }} + COPROCESSOR_ZKPROOF_WORKER_VERSION: ${{ inputs.coprocessor-zkproof-worker-version }} + GATEWAY_VERSION: ${{ inputs.gateway-version }} + HOST_VERSION: ${{ inputs.host-version }} + CONNECTOR_DB_MIGRATION_VERSION: ${{ inputs.connector-db-migration-version }} + CONNECTOR_GW_LISTENER_VERSION: ${{ inputs.connector-gw-listener-version }} + CONNECTOR_KMS_WORKER_VERSION: ${{ inputs.connector-kms-worker-version }} + CONNECTOR_TX_SENDER_VERSION: ${{ inputs.connector-tx-sender-version }} + TEST_SUITE_VERSION: ${{ inputs.test-suite-version }} + RELAYER_VERSION: ${{ inputs.relayer-version }} + KMS_CORE_VERSION: ${{ inputs.kms-core-version }} runs-on: large_ubuntu_32 steps: - name: Checkout code @@ -112,43 +131,14 @@ jobs: username: ${{ secrets.CGR_USERNAME }} password: ${{ secrets.CGR_PASSWORD }} - - name: Set version from release - if: github.event_name == 'release' - run: | - { - echo "CONNECTOR_DB_MIGRATION_VERSION=${GH_REF_NAME}" - echo "CONNECTOR_GW_LISTENER_VERSION=${GH_REF_NAME}" - echo "CONNECTOR_KMS_WORKER_VERSION=${GH_REF_NAME}" - echo "CONNECTOR_TX_SENDER_VERSION=${GH_REF_NAME}" - echo "DB_MIGRATION_VERSION=${GH_REF_NAME}" - echo "GATEWAY_VERSION=${GH_REF_NAME}" - echo "HOST_VERSION=${GH_REF_NAME}" - echo "HOST_LISTENER_VERSION=${GH_REF_NAME}" - echo "GW_LISTENER_VERSION=${GH_REF_NAME}" - echo "TX_SENDER_VERSION=${GH_REF_NAME}" - echo "TFHE_WORKER_VERSION=${GH_REF_NAME}" - echo "SNS_WORKER_VERSION=${GH_REF_NAME}" - echo "ZKPROOF_WORKER_VERSION=${GH_REF_NAME}" - } >> "$GITHUB_ENV" + - name: Display component versions env: - GH_REF_NAME: ${{ github.ref_name }} + JSON_INPUT: ${{ toJSON(inputs) }} + run: | + echo "Component versions: $JSON_INPUT" - name: Deploy fhevm Stack working-directory: test-suite/fhevm - env: - CONNECTOR_DB_MIGRATION_VERSION: ${{ github.event_name == 'workflow_dispatch' && inputs.connector_version || env.CONNECTOR_DB_MIGRATION_VERSION }} - CONNECTOR_GW_LISTENER_VERSION: ${{ github.event_name == 'workflow_dispatch' && inputs.connector_version || env.CONNECTOR_GW_LISTENER_VERSION }} - CONNECTOR_KMS_WORKER_VERSION: ${{ github.event_name == 'workflow_dispatch' && inputs.connector_version || env.CONNECTOR_KMS_WORKER_VERSION }} - CONNECTOR_TX_SENDER_VERSION: ${{ github.event_name == 'workflow_dispatch' && inputs.connector_version || env.CONNECTOR_TX_SENDER_VERSION }} - DB_MIGRATION_VERSION: ${{ github.event_name == 'workflow_dispatch' && inputs.db_migration_version || env.DB_MIGRATION_VERSION }} - GATEWAY_VERSION: ${{ github.event_name == 'workflow_dispatch' && inputs.gateway_version || env.GATEWAY_VERSION }} - HOST_VERSION: ${{ github.event_name == 'workflow_dispatch' && inputs.host_version || env.HOST_VERSION }} - HOST_LISTENER_VERSION: ${{ github.event_name == 'workflow_dispatch' && inputs.host_listener_version || env.HOST_LISTENER_VERSION }} - GW_LISTENER_VERSION: ${{ github.event_name == 'workflow_dispatch' && inputs.gateway_listener_version || env.GW_LISTENER_VERSION }} - TX_SENDER_VERSION: ${{ github.event_name == 'workflow_dispatch' && inputs.tx_sender_version || env.TX_SENDER_VERSION }} - TFHE_WORKER_VERSION: ${{ github.event_name == 'workflow_dispatch' && inputs.tfhe_worker_version || env.TFHE_WORKER_VERSION }} - SNS_WORKER_VERSION: ${{ github.event_name == 'workflow_dispatch' && inputs.sns_worker_version || env.SNS_WORKER_VERSION }} - ZKPROOF_WORKER_VERSION: ${{ github.event_name == 'workflow_dispatch' && inputs.zkproof_worker_version || env.ZKPROOF_WORKER_VERSION }} run: | ./fhevm-cli deploy diff --git a/.github/workflows/test-suite-orchestrate-e2e-tests.yml b/.github/workflows/test-suite-orchestrate-e2e-tests.yml index 9b07838cc5..1657bee264 100644 --- a/.github/workflows/test-suite-orchestrate-e2e-tests.yml +++ b/.github/workflows/test-suite-orchestrate-e2e-tests.yml @@ -87,33 +87,27 @@ jobs: return imageTag; } - const coprocessor = [ - getImageTagIfBuilt('coprocessor-docker-build', 'db_migration_build_result'), - getImageTagIfBuilt('coprocessor-docker-build', 'gw_listener_build_result'), - getImageTagIfBuilt('coprocessor-docker-build', 'host_listener_build_result'), - getImageTagIfBuilt('coprocessor-docker-build', 'sns_worker_build_result'), - getImageTagIfBuilt('coprocessor-docker-build', 'tfhe_worker_build_result'), - getImageTagIfBuilt('coprocessor-docker-build', 'tx_sender_build_result'), - getImageTagIfBuilt('coprocessor-docker-build', 'zkproof_worker_build_result'), - ]; + core.setOutput('coprocessor-db-migration-version', getImageTagIfBuilt('coprocessor-docker-build', 'db_migration_build_result')); + core.setOutput('coprocessor-gw-listener-version', getImageTagIfBuilt('coprocessor-docker-build', 'gw_listener_build_result')); + core.setOutput('coprocessor-host-listener-version', getImageTagIfBuilt('coprocessor-docker-build', 'host_listener_build_result')); + core.setOutput('coprocessor-sns-worker-version', getImageTagIfBuilt('coprocessor-docker-build', 'sns_worker_build_result')); + core.setOutput('coprocessor-tfhe-worker-version', getImageTagIfBuilt('coprocessor-docker-build', 'tfhe_worker_build_result')); + core.setOutput('coprocessor-tx-sender-version', getImageTagIfBuilt('coprocessor-docker-build', 'tx_sender_build_result')); + core.setOutput('coprocessor-zkproof-worker-version', getImageTagIfBuilt('coprocessor-docker-build', 'zkproof_worker_build_result')); - const connector = [ - getImageTagIfBuilt('kms-connector-docker-build', 'db_migration_build_result'), - getImageTagIfBuilt('kms-connector-docker-build', 'gw_listener_build_result'), - getImageTagIfBuilt('kms-connector-docker-build', 'kms_worker_build_result'), - getImageTagIfBuilt('kms-connector-docker-build', 'tx_sender_build_result'), - ]; + core.setOutput('connector-db-migration-version', getImageTagIfBuilt('kms-connector-docker-build', 'db_migration_build_result')); + core.setOutput('connector-gw-listener-version', getImageTagIfBuilt('kms-connector-docker-build', 'gw_listener_build_result')); + core.setOutput('connector-kms-worker-version', getImageTagIfBuilt('kms-connector-docker-build', 'kms_worker_build_result')); + core.setOutput('connector-tx-sender-version', getImageTagIfBuilt('kms-connector-docker-build', 'tx_sender_build_result')); - core.setOutput('coprocessor', coprocessor); - core.setOutput('gateway', getImageTagIfBuilt('gateway-contracts-docker-build', 'build_result')); - core.setOutput('host', getImageTagIfBuilt('host-contracts-docker-build', 'build_result')); - core.setOutput('connector', connector); - core.setOutput('test-suite', getImageTagIfBuilt('test-suite-docker-build', 'build_result')); + core.setOutput('gateway-version', getImageTagIfBuilt('gateway-contracts-docker-build', 'build_result')); + core.setOutput('host-version', getImageTagIfBuilt('host-contracts-docker-build', 'build_result')); + core.setOutput('test-suite-version', getImageTagIfBuilt('test-suite-docker-build', 'build_result')); run-e2e-tests: needs: [create-e2e-tests-input] uses: - ./.github/workflows/test-suite-e2e-tests-mq.yml + ./.github/workflows/test-suite-e2e-tests.yml permissions: contents: 'read' # Required to checkout repository code id-token: 'write' # Required for OIDC authentication @@ -123,8 +117,17 @@ jobs: CGR_USERNAME: ${{ secrets.CGR_USERNAME }} CGR_PASSWORD: ${{ secrets.CGR_PASSWORD }} with: - coprocessor: ${{ needs.create-e2e-tests-input.outputs.coprocessor }} - gateway: ${{ needs.create-e2e-tests-input.outputs.gateway }} - host: ${{ needs.create-e2e-tests-input.outputs.host }} - connector: ${{ needs.create-e2e-tests-input.outputs.connector }} - test-suite: ${{ needs.create-e2e-tests-input.outputs.test-suite }} + 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 }} + coprocessor-sns-worker-version: ${{ needs.create-e2e-tests-input.outputs.coprocessor-sns-worker-version }} + coprocessor-tfhe-worker-version: ${{ needs.create-e2e-tests-input.outputs.coprocessor-tfhe-worker-version }} + coprocessor-tx-sender-version: ${{ needs.create-e2e-tests-input.outputs.coprocessor-tx-sender-version }} + coprocessor-zkproof-worker-version: ${{ needs.create-e2e-tests-input.outputs.coprocessor-zkproof-worker-version }} + connector-db-migration-version: ${{ needs.create-e2e-tests-input.outputs.connector-db-migration-version }} + connector-gw-listener-version: ${{ needs.create-e2e-tests-input.outputs.connector-gw-listener-version }} + connector-kms-worker-version: ${{ needs.create-e2e-tests-input.outputs.connector-kms-worker-version }} + connector-tx-sender-version: ${{ needs.create-e2e-tests-input.outputs.connector-tx-sender-version }} + gateway-version: ${{ needs.create-e2e-tests-input.outputs.gateway-version }} + host-version: ${{ needs.create-e2e-tests-input.outputs.host-version }} + test-suite-version: ${{ needs.create-e2e-tests-input.outputs.test-suite-version }} diff --git a/test-suite/fhevm/docker-compose/coprocessor-docker-compose.yml b/test-suite/fhevm/docker-compose/coprocessor-docker-compose.yml index e5390b2bca..28279d6427 100644 --- a/test-suite/fhevm/docker-compose/coprocessor-docker-compose.yml +++ b/test-suite/fhevm/docker-compose/coprocessor-docker-compose.yml @@ -1,7 +1,7 @@ services: coprocessor-db-migration: container_name: coprocessor-db-migration - image: ghcr.io/zama-ai/fhevm/coprocessor/db-migration:${DB_MIGRATION_VERSION} + image: ghcr.io/zama-ai/fhevm/coprocessor/db-migration:${COPROCESSOR_DB_MIGRATION_VERSION} build: context: ../../.. dockerfile: coprocessor/fhevm-engine/db-migration/Dockerfile @@ -21,7 +21,7 @@ services: ####################### COPROCESSOR SERVICES ####################### coprocessor-host-listener: container_name: coprocessor-host-listener - image: ghcr.io/zama-ai/fhevm/coprocessor/host-listener:${HOST_LISTENER_VERSION} + image: ghcr.io/zama-ai/fhevm/coprocessor/host-listener:${COPROCESSOR_HOST_LISTENER_VERSION} build: context: ../../.. dockerfile: coprocessor/fhevm-engine/host-listener/Dockerfile @@ -45,7 +45,7 @@ services: coprocessor-host-listener-poller: container_name: coprocessor-host-listener-poller - image: ghcr.io/zama-ai/fhevm/coprocessor/host-listener:${HOST_LISTENER_VERSION} + image: ghcr.io/zama-ai/fhevm/coprocessor/host-listener:${COPROCESSOR_HOST_LISTENER_VERSION} build: context: ../../.. dockerfile: coprocessor/fhevm-engine/host-listener/Dockerfile @@ -68,7 +68,7 @@ services: coprocessor-gw-listener: container_name: coprocessor-gw-listener - image: ghcr.io/zama-ai/fhevm/coprocessor/gw-listener:${GW_LISTENER_VERSION} + image: ghcr.io/zama-ai/fhevm/coprocessor/gw-listener:${COPROCESSOR_GW_LISTENER_VERSION} build: context: ../../.. dockerfile: coprocessor/fhevm-engine/gw-listener/Dockerfile @@ -99,7 +99,7 @@ services: coprocessor-tfhe-worker: container_name: coprocessor-tfhe-worker - image: ghcr.io/zama-ai/fhevm/coprocessor/tfhe-worker:${TFHE_WORKER_VERSION} + image: ghcr.io/zama-ai/fhevm/coprocessor/tfhe-worker:${COPROCESSOR_TFHE_WORKER_VERSION} build: context: ../../.. dockerfile: coprocessor/fhevm-engine/tfhe-worker/Dockerfile @@ -125,7 +125,7 @@ services: coprocessor-zkproof-worker: container_name: coprocessor-zkproof-worker - image: ghcr.io/zama-ai/fhevm/coprocessor/zkproof-worker:${ZKPROOF_WORKER_VERSION} + image: ghcr.io/zama-ai/fhevm/coprocessor/zkproof-worker:${COPROCESSOR_ZKPROOF_WORKER_VERSION} build: context: ../../.. dockerfile: coprocessor/fhevm-engine/zkproof-worker/Dockerfile @@ -149,7 +149,7 @@ services: coprocessor-sns-worker: container_name: coprocessor-sns-worker - image: ghcr.io/zama-ai/fhevm/coprocessor/sns-worker:${SNS_WORKER_VERSION} + image: ghcr.io/zama-ai/fhevm/coprocessor/sns-worker:${COPROCESSOR_SNS_WORKER_VERSION} build: context: ../../.. dockerfile: coprocessor/fhevm-engine/sns-worker/Dockerfile @@ -186,7 +186,7 @@ services: coprocessor-transaction-sender: container_name: coprocessor-transaction-sender - image: ghcr.io/zama-ai/fhevm/coprocessor/tx-sender:${TX_SENDER_VERSION} + image: ghcr.io/zama-ai/fhevm/coprocessor/tx-sender:${COPROCESSOR_TX_SENDER_VERSION} build: context: ../../.. dockerfile: coprocessor/fhevm-engine/transaction-sender/Dockerfile diff --git a/test-suite/fhevm/fhevm-cli b/test-suite/fhevm/fhevm-cli index 7bb80b4f35..f622a8355c 100755 --- a/test-suite/fhevm/fhevm-cli +++ b/test-suite/fhevm/fhevm-cli @@ -17,23 +17,23 @@ PROJECT="fhevm" # Default versions for the fhevm stack. # KMS connector services. -export CONNECTOR_DB_MIGRATION_VERSION=${CONNECTOR_DB_MIGRATION_VERSION:-"v0.10.2"} -export CONNECTOR_GW_LISTENER_VERSION=${CONNECTOR_GW_LISTENER_VERSION:-"v0.10.2"} -export CONNECTOR_KMS_WORKER_VERSION=${CONNECTOR_KMS_WORKER_VERSION:-"v0.10.2"} -export CONNECTOR_TX_SENDER_VERSION=${CONNECTOR_TX_SENDER_VERSION:-"v0.10.2"} +export CONNECTOR_DB_MIGRATION_VERSION=${CONNECTOR_DB_MIGRATION_VERSION:-"v0.10.5"} +export CONNECTOR_GW_LISTENER_VERSION=${CONNECTOR_GW_LISTENER_VERSION:-"v0.10.5"} +export CONNECTOR_KMS_WORKER_VERSION=${CONNECTOR_KMS_WORKER_VERSION:-"v0.10.5"} +export CONNECTOR_TX_SENDER_VERSION=${CONNECTOR_TX_SENDER_VERSION:-"v0.10.5"} # Coprocessor services. -export DB_MIGRATION_VERSION=${DB_MIGRATION_VERSION:-"v0.10.2"} -export GW_LISTENER_VERSION=${GW_LISTENER_VERSION:-"v0.10.2"} -export HOST_LISTENER_VERSION=${HOST_LISTENER_VERSION:-"v0.10.2"} -export TX_SENDER_VERSION=${TX_SENDER_VERSION:-"v0.10.2"} -export TFHE_WORKER_VERSION=${TFHE_WORKER_VERSION:-"v0.10.2"} -export SNS_WORKER_VERSION=${SNS_WORKER_VERSION:-"v0.10.2"} -export ZKPROOF_WORKER_VERSION=${ZKPROOF_WORKER_VERSION:-"v0.10.2"} +export COPROCESSOR_DB_MIGRATION_VERSION=${COPROCESSOR_DB_MIGRATION_VERSION:-"v0.10.5"} +export COPROCESSOR_GW_LISTENER_VERSION=${COPROCESSOR_GW_LISTENER_VERSION:-"v0.10.5"} +export COPROCESSOR_HOST_LISTENER_VERSION=${COPROCESSOR_HOST_LISTENER_VERSION:-"v0.10.5"} +export COPROCESSOR_TX_SENDER_VERSION=${COPROCESSOR_TX_SENDER_VERSION:-"v0.10.5"} +export COPROCESSOR_TFHE_WORKER_VERSION=${COPROCESSOR_TFHE_WORKER_VERSION:-"v0.10.5"} +export COPROCESSOR_SNS_WORKER_VERSION=${COPROCESSOR_SNS_WORKER_VERSION:-"v0.10.5"} +export COPROCESSOR_ZKPROOF_WORKER_VERSION=${COPROCESSOR_ZKPROOF_WORKER_VERSION:-"v0.10.5"} # Gateway and Host contracts. -export GATEWAY_VERSION=${GATEWAY_VERSION:-"v0.10.2"} -export HOST_VERSION=${HOST_VERSION:-"v0.10.2"} +export GATEWAY_VERSION=${GATEWAY_VERSION:-"v0.10.5"} +export HOST_VERSION=${HOST_VERSION:-"v0.10.5"} # Other services. export CORE_VERSION=${CORE_VERSION:-"v0.12.7"} diff --git a/test-suite/fhevm/scripts/deploy-fhevm-stack.sh b/test-suite/fhevm/scripts/deploy-fhevm-stack.sh index 863f510340..29d109b2fe 100755 --- a/test-suite/fhevm/scripts/deploy-fhevm-stack.sh +++ b/test-suite/fhevm/scripts/deploy-fhevm-stack.sh @@ -267,14 +267,14 @@ log_info "FHEVM Contracts:" log_info " gateway-contracts:${GATEWAY_VERSION}${BUILD_TAG}" log_info " host-contracts:${HOST_VERSION}${BUILD_TAG}" log_info "FHEVM Coprocessor Services:" -log_info " coprocessor/db-migration:${DB_MIGRATION_VERSION}${BUILD_TAG}" -log_info " coprocessor/gw-listener:${GW_LISTENER_VERSION}${BUILD_TAG}" -log_info " coprocessor/host-listener:${HOST_LISTENER_VERSION}${BUILD_TAG}" -log_info " coprocessor/poller:${HOST_LISTENER_VERSION}${BUILD_TAG}" -log_info " coprocessor/tx-sender:${TX_SENDER_VERSION}${BUILD_TAG}" -log_info " coprocessor/tfhe-worker:${TFHE_WORKER_VERSION}${BUILD_TAG}" -log_info " coprocessor/sns-worker:${SNS_WORKER_VERSION}${BUILD_TAG}" -log_info " coprocessor/zkproof-worker:${ZKPROOF_WORKER_VERSION}${BUILD_TAG}" +log_info " coprocessor/db-migration:${COPROCESSOR_DB_MIGRATION_VERSION}${BUILD_TAG}" +log_info " coprocessor/gw-listener:${COPROCESSOR_GW_LISTENER_VERSION}${BUILD_TAG}" +log_info " coprocessor/host-listener:${COPROCESSOR_HOST_LISTENER_VERSION}${BUILD_TAG}" +log_info " coprocessor/poller:${COPROCESSOR_HOST_LISTENER_VERSION}${BUILD_TAG}" +log_info " coprocessor/tx-sender:${COPROCESSOR_TX_SENDER_VERSION}${BUILD_TAG}" +log_info " coprocessor/tfhe-worker:${COPROCESSOR_TFHE_WORKER_VERSION}${BUILD_TAG}" +log_info " coprocessor/sns-worker:${COPROCESSOR_SNS_WORKER_VERSION}${BUILD_TAG}" +log_info " coprocessor/zkproof-worker:${COPROCESSOR_ZKPROOF_WORKER_VERSION}${BUILD_TAG}" log_info "FHEVM KMS Connector Services:" log_info " kms-connector/db-migration:${CONNECTOR_DB_MIGRATION_VERSION}${BUILD_TAG}" log_info " kms-connector/gw-listener:${CONNECTOR_GW_LISTENER_VERSION}${BUILD_TAG}"