Merge branch 'fix_reorg_and_improve_continuity_checks' into fixed_out…

…put_batching
zingolabs · Jan 16, 2025 · 4f42071 · 4f42071
2 parents c9b898b + 5c34d84
commit 4f42071
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/zingo-sync/src/sync.rs b/zingo-sync/src/sync.rs
@@ -218,7 +218,10 @@ where
         .fold(0, |acc, block_range| {
             acc + (block_range.end - block_range.start)
         });
-    let scanned_blocks = sync_state.initial_sync_state().total_blocks_to_scan() - unscanned_blocks;
+    let scanned_blocks = sync_state
+        .initial_sync_state()
+        .total_blocks_to_scan()
+        .saturating_sub(unscanned_blocks);
     let percentage_blocks_scanned = (scanned_blocks as f32
         / sync_state.initial_sync_state().total_blocks_to_scan() as f32)
         * 100.0;
@@ -228,11 +231,11 @@ where
     let scanned_sapling_outputs = sync_state
         .initial_sync_state()
         .total_sapling_outputs_to_scan()
-        - unscanned_sapling_outputs;
+        .saturating_sub(unscanned_sapling_outputs);
     let scanned_orchard_outputs = sync_state
         .initial_sync_state()
         .total_orchard_outputs_to_scan()
-        - unscanned_orchard_outputs;
+        .saturating_sub(unscanned_orchard_outputs);
     let percentage_outputs_scanned = ((scanned_sapling_outputs + scanned_orchard_outputs) as f32
         / (sync_state
             .initial_sync_state()

diff --git a/zingo-sync/src/sync/state.rs b/zingo-sync/src/sync/state.rs
@@ -685,7 +685,7 @@ where
             .activation_height(NetworkUpgrade::Sapling)
             .expect("should have some sapling activation height");
 
-        match block_height.cmp(&sapling_activation_height) {
+        match block_height.cmp(&(sapling_activation_height - 1)) {
             cmp::Ordering::Greater => {
                 let frontiers = client::get_frontiers(fetch_request_sender.clone(), block_height)
                     .await