Merge pull request #17962 from MinaProtocol/dkijania/handle_forks_in_missing_bl_auditor

Handling archive from network which were derived from fork

Author: dkijania

changes/17962.md

@@ -0,0 +1,3 @@
+Altering mina-missing-block-auditor app.
+
+Correctly handling network derived from devnet/mainnet, but without pre-hardfork blocks

src/app/missing_blocks_auditor/missing_blocks_auditor.ml

@@ -42,9 +42,25 @@ let main ~archive_uri () =
               ~metadata:[ ("error", `String (Caqti_error.show msg)) ] ;
             exit 1
       in
-      (* filter out genesis block *)
+      (* filters out genesis or first fork block. This is needed as they are not considered missing and
+         archive blocks can start from block with height > 1 in case of sandbox network forked from devnet/mainnet.
+         Archive of such network won't include genesis block but fork block as a first block *)
+      let%bind genesis_or_fork_block_height =
+        match%bind
+          Mina_caqti.Pool.use
+            (fun db -> Sql.GenesisOrFirstForkBlockHeight.run db ())
+            pool
+        with
+        | Ok height ->
+            return height
+        | Error msg ->
+            [%log error] "Error getting genesis or first fork block height"
+              ~metadata:[ ("error", `String (Caqti_error.show msg)) ] ;
+            exit 1
+      in
       let missing_blocks =
-        List.filter missing_blocks_raw ~f:(fun (_, _, height, _) -> height <> 1)
+        List.filter missing_blocks_raw ~f:(fun (_, _, height, _) ->
+            height <> genesis_or_fork_block_height )
       in
       let%bind () =
         if List.is_empty missing_blocks then
@@ -134,8 +150,14 @@ let main ~archive_uri () =
         [%log info] "Length of canonical chain is %Ld blocks" chain_len
       else (
         add_error chain_length_error ;
-        [%log info] "Length of canonical chain is %Ld blocks, expected: %Ld"
-          chain_len highest_canonical ) ;
+        if genesis_or_fork_block_height = 1 then
+          [%log info] "Length of canonical chain is %Ld blocks, expected: %Ld"
+            chain_len highest_canonical
+        else
+          [%log info]
+            "Length of canonical chain is %Ld blocks, expected: %Ld. (Note: \
+             genesis or first fork block has height %d)"
+            chain_len highest_canonical genesis_or_fork_block_height ) ;
       let invalid_chain =
         List.filter canonical_chain
           ~f:(fun (_block_id, _state_hash, chain_status) ->

src/app/missing_blocks_auditor/sql.ml

@@ -14,6 +14,20 @@ module Unparented_blocks = struct
   let run (module Conn : Mina_caqti.CONNECTION) () = Conn.collect_list query ()
 end
 
+module GenesisOrFirstForkBlockHeight = struct
+  let query =
+    Mina_caqti.find_req Caqti_type.unit Caqti_type.int
+      {sql| SELECT height FROM blocks
+            WHERE parent_id IS NULL
+            AND global_slot_since_hard_fork = 0
+            AND chain_status = 'canonical'
+            ORDER BY height ASC
+            LIMIT 1
+      |sql}
+
+  let run (module Conn : Mina_caqti.CONNECTION) height = Conn.find query height
+end
+
 module Missing_blocks_gap = struct
   let query =
     Mina_caqti.find_req Caqti_type.int Caqti_type.int