fix(coprocessor): host-listener regression (#789)

* test(coprocessor): host-listener with correct initial block time

* fix(coprocessor): host-listener, regression on block rechecking

* test(ci): login to chainguard

Author: rudy-6-4

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

@@ -102,6 +102,13 @@ jobs:
           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: Set version from release
         if: github.event_name == 'release'
         run: |
@@ -150,7 +157,7 @@ jobs:
       - name: Public Decryption test
         working-directory: test-suite/fhevm
         run: |
-          ./fhevm-cli test public-decryption
+          timeout 5m ./fhevm-cli test public-decryption
 
       - name: User Decryption test
         working-directory: test-suite/fhevm
@@ -185,6 +192,9 @@ jobs:
           echo "::group::Transaction Sender Logs (filtered)"
           ./fhevm-cli logs transaction-sender | grep -v "Selected 0 rows to process"
           echo "::endgroup::"
+          echo "::group::Host Listener"
+          ./fhevm-cli logs host-listener
+          echo "::endgroup::"
 
       - name: Cleanup
         working-directory: test-suite/fhevm

coprocessor/fhevm-engine/host-listener/src/cmd/mod.rs

@@ -546,16 +546,26 @@ impl InfiniteLogIter {
                 },
             },
         };
+        let current_block_summary = current_block.into();
+
         if !self.block_history.is_ready_to_detect_reorg() {
             // at fresh restart no ancestor are known
+            if has_event {
+                // we don't add to history from which we have no event
+                // e.g. at timeout, because empty blocks are not get_logs
+                self.block_history.add_block(current_block_summary);
+            }
             return;
         }
 
-        let current_block_summary = current_block.into();
         let missing_blocks =
             self.get_missings_ancestors(current_block_summary).await;
-
         if missing_blocks.is_empty() {
+            // we don't add to history from which we have no event
+            // e.g. at timeout, because empty blocks are not get_logs
+            if has_event {
+                self.block_history.add_block(current_block_summary);
+            }
             return; // no reorg
         }
         warn!(
@@ -564,7 +574,6 @@ impl InfiniteLogIter {
         );
         self.populate_catchup_logs_from_missing_blocks(missing_blocks)
             .await;
-        // let's maintain the tip block by re-adding at end
         // we don't add to history from which we have no event
         // e.g. at timeout, because empty blocks are not get_logs
         if has_event {

test-suite/fhevm/docker-compose/coprocessor-docker-compose.yml

@@ -76,6 +76,7 @@ services:
       - --acl-contract-address=${ACL_CONTRACT_ADDRESS}
       - --tfhe-contract-address=${FHEVM_EXECUTOR_CONTRACT_ADDRESS}
       - --url=${RPC_URL}
+      - --initial-block-time=1
     depends_on:
       db:
         condition: service_healthy