fix: parsing

hirosystems · Oct 23, 2024 · c211f08 · c211f08
1 parent 41c7dec
commit c211f08
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 16 deletions.
diff --git a/components/chainhook-cli/src/scan/stacks.rs b/components/chainhook-cli/src/scan/stacks.rs
@@ -339,6 +339,7 @@ pub async fn scan_stacks_chainstate_via_rocksdb_using_predicate(
             chainhook: predicate_spec,
             apply: hits_per_blocks,
             rollback: vec![],
+            // TODO(rafaelcr): Query for non consensus events which fall between block timestamps to fill in here
             events: vec![]
         };
         let res = match handle_stacks_hook_action(

diff --git a/components/chainhook-cli/src/service/mod.rs b/components/chainhook-cli/src/service/mod.rs
@@ -548,8 +548,9 @@ impl Service {
                             }
                             StacksChainEvent::ChainUpdatedWithMicroblocks(_)
                             | StacksChainEvent::ChainUpdatedWithMicroblocksReorg(_) => {},
-                            StacksChainEvent::ChainUpdatedWithNonConsensusEvents(_data) => {
+                            StacksChainEvent::ChainUpdatedWithNonConsensusEvents(data) => {
                                 // TODO(rafaelcr): Store signer data.
+                                println!("signer message: {:?}", data);
                             }
                         },
                         Err(e) => {
@@ -620,7 +621,7 @@ impl Service {
                             StacksChainEvent::ChainUpdatedWithMicroblocks(_)
                             | StacksChainEvent::ChainUpdatedWithMicroblocksReorg(_) => {},
                             StacksChainEvent::ChainUpdatedWithNonConsensusEvents(_) => {
-                                // TODO(rafaelcr): Send via HTTP payload.
+                                // TODO(rafaelcr): Expire signer message predicates when appropriate
                             },
                         };
                         update_status_from_report(

diff --git a/components/chainhook-cli/src/storage/mod.rs b/components/chainhook-cli/src/storage/mod.rs
@@ -1,3 +1,5 @@
+pub mod signers;
+
 use std::collections::VecDeque;
 use std::path::PathBuf;
 

diff --git a/components/chainhook-sdk/src/indexer/stacks/mod.rs b/components/chainhook-sdk/src/indexer/stacks/mod.rs
@@ -305,16 +305,17 @@ pub struct ContractReadonlyCall {
 
 #[cfg(feature = "stacks-signers")]
 #[derive(Deserialize, Debug)]
-pub struct NewStackerDbChunkIssuer {
-    pub issuer_id: u32,
-    pub slots: Vec<u32>,
-}
+pub struct NewStackerDbChunkIssuerId(pub u32);
+
+#[cfg(feature = "stacks-signers")]
+#[derive(Deserialize, Debug)]
+pub struct NewStackerDbChunkIssuerSlots(pub Vec<u32>);
 
 #[cfg(feature = "stacks-signers")]
 #[derive(Deserialize, Debug)]
 pub struct NewStackerDbChunksContractId {
     pub name: String,
-    pub issuer: Vec<NewStackerDbChunkIssuer>,
+    pub issuer: (NewStackerDbChunkIssuerId, NewStackerDbChunkIssuerSlots),
 }
 
 #[cfg(feature = "stacks-signers")]
@@ -323,7 +324,7 @@ pub struct NewSignerModifiedSlot {
     pub sig: String,
     pub data: String,
     pub slot_id: u64,
-    pub version: u64,
+    pub slot_version: u64,
 }
 
 #[cfg(feature = "stacks-signers")]
@@ -816,7 +817,7 @@ pub fn get_signer_pubkey_from_stackerdb_chunk_slot(
     };
 
     let mut digest_bytes = slot.slot_id.to_be_bytes().to_vec();
-    digest_bytes.extend(slot.version.to_be_bytes().to_vec());
+    digest_bytes.extend(slot.slot_version.to_be_bytes().to_vec());
     let data_bytes_hashed = Sha512Trunc256Sum::from_data(&data_bytes).to_bytes();
     digest_bytes.extend(data_bytes_hashed);
     let digest = Sha512Trunc256Sum::from_data(&digest_bytes).to_bytes();

diff --git a/components/chainhook-sdk/src/indexer/tests/helpers/stacks_events.rs b/components/chainhook-sdk/src/indexer/tests/helpers/stacks_events.rs
@@ -127,21 +127,24 @@ pub fn create_new_stackerdb_chunk(
     slot_data: String,
 ) -> crate::indexer::stacks::NewStackerDbChunks {
     use crate::indexer::stacks::{
-        NewSignerModifiedSlot, NewStackerDbChunkIssuer, NewStackerDbChunksContractId,
+        NewSignerModifiedSlot, NewStackerDbChunkIssuerId, NewStackerDbChunkIssuerSlots,
+        NewStackerDbChunksContractId,
     };
     crate::indexer::stacks::NewStackerDbChunks {
         contract_id: NewStackerDbChunksContractId {
             name: contract_name,
-            issuer: vec![NewStackerDbChunkIssuer {
-                issuer_id: 26,
-                slots: vec![0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-            }],
+            issuer: (
+                NewStackerDbChunkIssuerId(26),
+                NewStackerDbChunkIssuerSlots(vec![
+                    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                ]),
+            ),
         },
         modified_slots: vec![NewSignerModifiedSlot {
             sig: slot_sig,
             data: slot_data,
             slot_id: 1,
-            version: 141,
+            slot_version: 141,
         }],
     }
 }
diff --git a/components/chainhook-sdk/src/observer/http.rs b/components/chainhook-sdk/src/observer/http.rs
@@ -178,8 +178,8 @@ pub fn handle_new_stacks_block(
     success_response()
 }
 
-#[cfg(feature = "stacks-signers")]
 #[post("/stackerdb_chunks", format = "application/json", data = "<payload>")]
+#[cfg(feature = "stacks-signers")]
 pub fn handle_stackerdb_chunks(
     indexer_rw_lock: &State<Arc<RwLock<Indexer>>>,
     payload: Json<JsonValue>,