Try confirmed check to fetch last root hash

enginkaraman · Jun 12, 2020 · 58735bc · 58735bc
1 parent 2deedf3
commit 58735bc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -36,9 +36,8 @@ jobs:
     - name: integration-simple-full-exit
       run: ci-integration-simple-fullexit.sh
 
-# TODO: why it does not work on CI?
-#    - name: data-restore
-#      run: zksync data-restore check-existing
+    - name: data-restore
+      run: zksync data-restore check-existing
 
     - name: integration-testkit
       run: zksync integration-testkit

diff --git a/bin/data-restore b/bin/data-restore
@@ -22,7 +22,7 @@ BLOCK_HASH_ERR="Error: Unable to load the latest block hash"
 
 function fetch_root_hash {
   # Select the latest verified block and find its hash
-  QUERY="WITH last_block (number) AS (SELECT max(block_number) FROM operations WHERE action_type = 'VERIFY')
+  QUERY="WITH last_block (number) AS (SELECT max(block_number) FROM operations WHERE action_type = 'VERIFY' and confirmed = true)
        SELECT encode(root_hash, 'hex') FROM blocks, last_block WHERE blocks.number = last_block.number;"
   # By piping we make `psql` simply return value instead of drawing the table.
   # `xargs` is used to trim spaces around the value.