fix: standardize redis predicate storage

components/chainhook-cli/src/config/mod.rs

@@ -1,7 +1,7 @@
 pub mod file;
 pub mod generator;
 
-use chainhook_sdk::chainhooks::types::{ChainhookStore, PoxConfig};
+use chainhook_sdk::chainhooks::types::PoxConfig;
 pub use chainhook_sdk::indexer::IndexerConfig;
 use chainhook_sdk::observer::{
     EventObserverConfig, PredicatesConfig, DEFAULT_PAYLOAD_HTTP_REQUEST_ATTEMPTS_INTERVAL_MS, DEFAULT_PAYLOAD_HTTP_REQUEST_ATTEMPTS_MAX, DEFAULT_PAYLOAD_HTTP_REQUEST_CONCURRENCY
@@ -119,7 +119,6 @@ impl Config {
     pub fn get_event_observer_config(&self) -> EventObserverConfig {
         EventObserverConfig {
             bitcoin_rpc_proxy_enabled: true,
-            registered_chainhooks: ChainhookStore::new(),
             predicates_config: PredicatesConfig {
                 payload_http_request_timeout_ms: self.predicates.payload_http_request_timeout_ms,
                 payload_http_request_concurrency: self.predicates.payload_http_request_concurrency,

components/chainhook-cli/src/scan/bitcoin.rs

@@ -1,9 +1,7 @@
 use crate::config::{Config, PredicatesApi};
 use crate::scan::common::get_block_heights_to_scan;
-use crate::service::{
-    open_readwrite_predicates_db_conn_or_panic, set_confirmed_expiration_status,
-    set_predicate_scanning_status, set_unconfirmed_expiration_status, ScanningData,
-};
+use crate::storage::predicates_db::{open_readwrite_predicates_db_conn_or_panic, set_confirmed_expiration_status, set_predicate_scanning_status, set_unconfirmed_expiration_status};
+use chainhook_sdk::chainhooks::types::{PredicateStatus, ScanningData};
 use chainhook_sdk::bitcoincore_rpc::RpcApi;
 use chainhook_sdk::bitcoincore_rpc::{Auth, Client};
 use chainhook_sdk::chainhooks::bitcoin::{
@@ -186,7 +184,7 @@ pub async fn scan_bitcoin_chainstate_via_rpc_using_predicate(
 
         let res = match process_block_with_predicates(
             block,
-            &vec![&predicate_spec],
+            &vec![&(predicate_spec.clone(), PredicateStatus::New)],
             &event_observer_config,
             ctx,
         )
@@ -262,7 +260,7 @@ pub async fn scan_bitcoin_chainstate_via_rpc_using_predicate(
 
 pub async fn process_block_with_predicates(
     block: BitcoinBlockData,
-    predicates: &Vec<&BitcoinChainhookInstance>,
+    predicates: &Vec<&(BitcoinChainhookInstance, PredicateStatus)>,
     event_observer_config: &EventObserverConfig,
     ctx: &Context,
 ) -> Result<u32, String> {

components/chainhook-cli/src/scan/common.rs

@@ -1,4 +1,4 @@
-use crate::service::ScanningData;
+use chainhook_sdk::chainhooks::types::ScanningData;
 use chainhook_sdk::utils::{BlockHeights, BlockHeightsError};
 use std::collections::VecDeque;
 

components/chainhook-cli/src/scan/stacks.rs

@@ -5,19 +5,14 @@ use std::{
     sync::{Arc, RwLock},
 };
 
+use chainhook_sdk::chainhooks::types::ScanningData;
+
 use crate::{
     archive::download_stacks_dataset_if_required,
     config::{Config, PredicatesApi},
     scan::common::get_block_heights_to_scan,
-    service::{
-        open_readwrite_predicates_db_conn_or_panic, set_confirmed_expiration_status,
-        set_predicate_scanning_status, set_unconfirmed_expiration_status, ScanningData,
-    },
     storage::{
-        get_last_block_height_inserted, get_last_unconfirmed_block_height_inserted,
-        get_stacks_block_at_block_height, insert_entry_in_stacks_blocks, is_stacks_block_present,
-        open_readonly_stacks_db_conn_with_retry, open_readwrite_stacks_db_conn,
-        signers::get_signer_db_messages_received_at_block, StacksDbConnections,
+        get_last_block_height_inserted, get_last_unconfirmed_block_height_inserted, get_stacks_block_at_block_height, insert_entry_in_stacks_blocks, is_stacks_block_present, open_readonly_stacks_db_conn_with_retry, open_readwrite_stacks_db_conn, predicates_db::{open_readwrite_predicates_db_conn_or_panic, set_confirmed_expiration_status, set_predicate_scanning_status, set_unconfirmed_expiration_status}, signers::get_signer_db_messages_received_at_block, StacksDbConnections
     },
 };
 use chainhook_sdk::{

components/chainhook-cli/src/scan/tests/mod.rs

@@ -3,8 +3,6 @@ use std::collections::VecDeque;
 use chainhook_sdk::utils::MAX_BLOCK_HEIGHTS_ENTRIES;
 use test_case::test_case;
 
-use crate::service::ScanningData;
-
 use super::common::get_block_heights_to_scan;
 
 fn expect_exceeded_max_entries_error(
@@ -90,15 +88,15 @@ fn get_huge_vec() -> Vec<u64> {
 #[test_case(None, None, Some(3), 2, None, Some(VecDeque::from([0,1,2,3])) => using expect_entries; "end_block > chain_tip, no start_block yields vec from 0 to end")]
 #[test_case(None, None, Some(2), 3, None, Some(VecDeque::from([0,1,2])) => using expect_entries; "chain_tip > end_block, no yields vec from 0 to end_block")]
 #[test_case(None, Some(0), Some(MAX_BLOCK_HEIGHTS_ENTRIES + 1), 0, None, None => using expect_exceeded_max_entries_error; "limits max number of entries")]
-#[test_case(None, Some(0), Some(3), 0, Some(ScanningData { number_of_blocks_to_scan: 0, number_of_blocks_evaluated: 0, number_of_times_triggered: 0, last_occurrence: None, last_evaluated_block_height: 2}), Some(VecDeque::from([2,3])) => using expect_entries; "uses previous scan data for start_block if available")]
+#[test_case(None, Some(0), Some(3), 0, Some(chainhook_sdk::chainhooks::types::ScanningData { number_of_blocks_to_scan: 0, number_of_blocks_evaluated: 0, number_of_times_triggered: 0, last_occurrence: None, last_evaluated_block_height: 2}), Some(VecDeque::from([2,3])) => using expect_entries; "uses previous scan data for start_block if available")]
 #[test_case(Some(vec![0,1,2]), None, None, 0, None, Some(VecDeque::from([0,1,2])) => using expect_entries; "providing blocks returns the same blocks as vec")]
 #[test_case(Some(get_huge_vec()), None, None, 0, None, None => using expect_exceeded_max_entries_error; "providing too many blocks errors")]
 fn test_get_block_heights_to_scan(
     blocks: Option<Vec<u64>>,
     start_block: Option<u64>,
     end_block: Option<u64>,
     chain_tip: u64,
-    unfinished_scan_data: Option<ScanningData>,
+    unfinished_scan_data: Option<chainhook_sdk::chainhooks::types::ScanningData>,
     expected: Option<VecDeque<u64>>,
 ) -> (Result<Option<VecDeque<u64>>, String>, Option<VecDeque<u64>>) {
     (