fix: correctly track bitcoin block append metrics; add additional met…

…rics (#563)

Addresses #562

components/chainhook-sdk/src/indexer/fork_scratch_pad.rs

@@ -105,7 +105,7 @@ impl ForkScratchPad {
             }
             None => {
                 ctx.try_log(|logger| {
-                    slog::debug!(
+                    slog::error!(
                         logger,
                         "Unable to process Bitcoin {} - inboxed for later",
                         header.block_identifier
@@ -253,6 +253,13 @@ impl ForkScratchPad {
             }
         }
 
+        ctx.try_log(|logger| {
+            slog::debug!(
+                logger,
+                "Removing {} confirmed blocks from block store.",
+                canonical_segment[6..].len()
+            )
+        });
         for confirmed_block in canonical_segment[6..].into_iter() {
             let block = match self.headers_store.remove(confirmed_block) {
                 None => {
@@ -267,6 +274,14 @@ impl ForkScratchPad {
         }
 
         // Prune data
+        ctx.try_log(|logger| {
+            slog::debug!(
+                logger,
+                "Pruning {} blocks and {} forks.",
+                blocks_to_prune.len(),
+                forks_to_prune.len()
+            )
+        });
         for block_to_prune in blocks_to_prune {
             self.headers_store.remove(&block_to_prune);
         }

components/chainhook-sdk/src/indexer/mod.rs

@@ -143,17 +143,24 @@ impl Indexer {
         event
     }
 
-    pub fn handle_stacks_marshalled_block(
+    pub fn standardize_stacks_marshalled_block(
         &mut self,
         marshalled_block: JsonValue,
         ctx: &Context,
-    ) -> Result<Option<StacksChainEvent>, String> {
-        let block = stacks::standardize_stacks_marshalled_block(
+    ) -> Result<StacksBlockData, String> {
+        stacks::standardize_stacks_marshalled_block(
             &self.config,
             marshalled_block,
             &mut self.stacks_context,
             ctx,
-        )?;
+        )
+    }
+
+    pub fn process_stacks_block(
+        &mut self,
+        block: StacksBlockData,
+        ctx: &Context,
+    ) -> Result<Option<StacksChainEvent>, String> {
         self.stacks_blocks_pool.process_block(block, ctx)
     }
 

components/chainhook-sdk/src/indexer/stacks/blocks_pool.rs

@@ -357,6 +357,13 @@ impl StacksBlockPool {
         // that must be merged in Block 7.
         let mut blocks_to_confirm = canonical_segment[6..].to_vec();
         blocks_to_confirm.reverse();
+        ctx.try_log(|logger| {
+            slog::debug!(
+                logger,
+                "Removing {} confirmed blocks from block store.",
+                blocks_to_confirm.len()
+            )
+        });
         for confirmed_block in blocks_to_confirm.iter() {
             let block = match self.block_store.remove(confirmed_block) {
                 None => {
@@ -371,6 +378,14 @@ impl StacksBlockPool {
         }
 
         // Prune data
+        ctx.try_log(|logger| {
+            slog::debug!(
+                logger,
+                "Pruning {} blocks and {} forks.",
+                blocks_to_prune.len(),
+                forks_to_prune.len()
+            )
+        });
         for block_to_prune in blocks_to_prune {
             self.block_store.remove(&block_to_prune);
             self.micro_forks.remove(&block_to_prune);
@@ -381,8 +396,6 @@ impl StacksBlockPool {
             self.forks.remove(&fork_id);
         }
         // confirmed_blocks.reverse();
-
-        ctx.try_log(|logger| slog::debug!(logger, "AFTER: {:?}", confirmed_blocks.len()));
     }
 
     pub fn process_microblocks(