Merge of #2052

Author: mergify[bot]

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

@@ -94,6 +94,9 @@ jobs:
       - name: Setup Docker
         uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v3.3.0
 
+      - name: Install Foundry
+        uses: foundry-rs/foundry-toolchain@82dee4ba654bd2146511f85f0d013af94670c4de # v1.4.0
+
       - name: Login to GitHub Container Registry
         uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
         with:
@@ -125,7 +128,7 @@ jobs:
           SNS_WORKER_VERSION: ${{ inputs.sns_worker_version }}
           ZKPROOF_WORKER_VERSION: ${{ inputs.zkproof_worker_version }}
         run: |
-          ./fhevm-cli deploy
+          ./fhevm-cli deploy --coprocessors 2 --coprocessor-threshold 2
 
       - name: All operators tests
         working-directory: test-suite/fhevm
@@ -150,6 +153,15 @@ jobs:
           echo "::group::Transaction Sender Logs (filtered)"
           ./fhevm-cli logs transaction-sender | grep -v "Selected 0 rows to process"
           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
+          echo "::endgroup::"
+          echo "::group::Coprocessor 2 - Transaction Sender (filtered)"
+          ./fhevm-cli logs coprocessor-2-transaction-sender 2>/dev/null | grep -v "Selected 0 rows to process" || true
+          echo "::endgroup::"
+          echo "::group::Coprocessor 2 - TFHE Worker"
+          ./fhevm-cli logs coprocessor-2-tfhe-worker 2>/dev/null || true
+          echo "::endgroup::"
 
       - name: Cleanup
         working-directory: test-suite/fhevm

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

@@ -117,6 +117,9 @@ jobs:
       - name: Setup Docker
         uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v3.3.0
 
+      - name: Install Foundry
+        uses: foundry-rs/foundry-toolchain@82dee4ba654bd2146511f85f0d013af94670c4de # v1.4.0
+
       - name: Login to GitHub Container Registry
         uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
         with:
@@ -140,7 +143,7 @@ jobs:
       - name: Deploy fhevm Stack
         working-directory: test-suite/fhevm
         run: |
-          ./fhevm-cli deploy
+          ./fhevm-cli deploy --coprocessors 2 --coprocessor-threshold 2
 
       # E2E tests on pausing the Host contracts
       - name: Pause Host Contracts
@@ -247,6 +250,15 @@ jobs:
           echo "::group::TFHE Worker"
           ./fhevm-cli logs coprocessor-tfhe-worker
           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
+          echo "::endgroup::"
+          echo "::group::Coprocessor 2 - Transaction Sender (filtered)"
+          ./fhevm-cli logs coprocessor-2-transaction-sender 2>/dev/null | grep -v "Selected 0 rows to process" || true
+          echo "::endgroup::"
+          echo "::group::Coprocessor 2 - TFHE Worker"
+          ./fhevm-cli logs coprocessor-2-tfhe-worker 2>/dev/null || true
+          echo "::endgroup::"
 
       - name: Cleanup
         working-directory: test-suite/fhevm

test-suite/e2e/hardhat.config.ts

@@ -165,6 +165,7 @@ const config: HardhatUserConfig = {
   defaultNetwork: DEFAULT_NETWORK,
   mocha: {
     timeout: 300000,
+    rootHooks: require('./test/consensusWatchdog').mochaHooks,
   },
   gasReporter: {
     currency: 'USD',