fix: update SignerMessage deserializing

.vscode/chainhook.toml

@@ -0,0 +1,46 @@
+[storage]
+working_dir = "cache"
+
+# The HTTP API allows you to register / deregister
+# predicates dynamically.
+# This is disabled by default.
+#
+[http_api]
+http_port = 20456
+database_uri = "redis://localhost:6379/"
+
+[network]
+mode = "testnet"
+bitcoind_rpc_url = "http://localhost:18443"
+bitcoind_rpc_username = "btc"
+bitcoind_rpc_password = "btc"
+
+# Chainhook must be able to receive Bitcoin block events.
+# These events can originate from either a Stacks node or a Bitcoin node's ZeroMQ interface.
+
+# By default, the service is set to receive Bitcoin block events from the Stacks node:
+stacks_node_rpc_url = "http://localhost:20443"
+stacks_events_ingestion_port = 20455
+
+# However, events can also be received directly from a Bitcoin node.
+# To achieve this, comment out the `stacks_node_rpc_url` line and uncomment the following line:
+# bitcoind_zmq_url = "tcp://0.0.0.0:18543"
+
+[limits]
+max_number_of_bitcoin_predicates = 100
+max_number_of_concurrent_bitcoin_scans = 100
+max_number_of_stacks_predicates = 10
+max_number_of_concurrent_stacks_scans = 10
+max_number_of_processing_threads = 16
+max_number_of_networking_threads = 16
+max_caching_memory_size_mb = 32000
+
+# The TSV file is required for downloading historical data for your predicates. 
+# If this is not a requirement, you can comment out the `tsv_file_url` line.
+# [[event_source]]
+# tsv_file_url = "https://archive.hiro.so/regtest/stacks-blockchain-api/regtest-stacks-blockchain-api-latest"
+
+# Enables a server that provides metrics that can be scraped by Prometheus.
+# This is disabled by default.
+# [monitoring]
+# prometheus_monitoring_port = 20457

.vscode/launch.json

@@ -1,6 +1,30 @@
 {
   "version": "0.2.0",
   "configurations": [
+    {
+        "type": "lldb",
+        "request": "launch",
+        "name": "Debug executable 'chainhook'",
+        "cargo": {
+            "args": [
+                "build",
+                "--bin=chainhook",
+                "--package=chainhook"
+            ],
+            "filter": {
+                "name": "chainhook",
+                "kind": "bin"
+            }
+        },
+        "args": [
+            "service",
+            "start",
+            "--config-path=${workspaceFolder}/.vscode/chainhook.toml",
+        ],
+        "cwd": "${workspaceFolder}",
+        "preLaunchTask": "redis:start",
+        "postDebugTask": "redis:stop"
+    },
     {
       "type": "lldb",
       "request": "launch",

Cargo.toml

@@ -8,4 +8,4 @@ default-members = ["components/chainhook-cli", "components/chainhook-sdk"]
 resolver = "2"
 
 [patch.crates-io]
-stacks-codec = { git = "https://github.com/hirosystems/clarinet.git", rev = "b0683675115562d719ed4b5245f620e0990030a0" }
+stacks-codec = { git = "https://github.com/hirosystems/clarinet.git", rev = "fcebfb5a986ded32d5a450c34f8e5e5f2da97de4" }

components/chainhook-cli/src/service/tests/helpers/mock_stacks_node.rs

@@ -264,6 +264,7 @@ pub fn create_stacks_new_block(
         tenure_height: Some(1122),
         signer_bitvec: Some("000800000001ff".to_owned()),
         signer_signature: Some(vec!["1234".to_owned(), "2345".to_owned()]),
+        signer_signature_hash: None,
         cycle_number: Some(1),
         reward_set: Some(RewardSet {
             pox_ustx_threshold: "50000".to_owned(),

components/chainhook-sdk/src/chainhooks/stacks/mod.rs

@@ -873,7 +873,10 @@ pub fn evaluate_stacks_predicate_on_non_consensus_events<'a>(
             | StacksPredicate::NftEvent(_)
             | StacksPredicate::StxEvent(_)
             | StacksPredicate::PrintEvent(_)
-            | StacksPredicate::Txid(_) => unreachable!(),
+            | StacksPredicate::Txid(_) => {
+                // Ignore, possibly expected behavior?
+                // https://github.com/hirosystems/chainhook/pull/663#discussion_r1814995429
+            },
         };
     }
     (occurrences, expired_predicates)
@@ -1107,7 +1110,7 @@ fn serialize_stacks_non_consensus_event(
     };
     json!({
         "payload": payload,
-        "received_at": event.received_at_ms,
+        "received_at_ms": event.received_at_ms,
         "received_at_block": event.received_at_block,
     })
 }

components/chainhook-sdk/src/chainhooks/tests/fixtures/stacks/testnet/occurrence.json

@@ -20,7 +20,8 @@
         "cycle_number": null,
         "reward_set": null,
         "signer_bitvec": null,
-        "signer_signature": null
+        "signer_signature": null,
+        "signer_public_keys": null
       },
       "parent_block_identifier": {
         "hash": "0x",
@@ -108,7 +109,8 @@
         "cycle_number": null,
         "reward_set": null,
         "signer_bitvec": null,
-        "signer_signature": null
+        "signer_signature": null,
+        "signer_public_keys": null
       },
       "parent_block_identifier": {
         "hash": "0x",
@@ -195,7 +197,8 @@
         "cycle_number": null,
         "reward_set": null,
         "signer_bitvec": null,
-        "signer_signature": null
+        "signer_signature": null,
+        "signer_public_keys": null
       },
       "parent_block_identifier": {
         "hash": "0x",
@@ -283,7 +286,8 @@
         "cycle_number": null,
         "reward_set": null,
         "signer_bitvec": null,
-        "signer_signature": null
+        "signer_signature": null,
+        "signer_public_keys": null
       },
       "parent_block_identifier": {
         "hash": "0x",
@@ -370,7 +374,8 @@
         "cycle_number": null,
         "reward_set": null,
         "signer_bitvec": null,
-        "signer_signature": null
+        "signer_signature": null,
+        "signer_public_keys": null
       },
       "parent_block_identifier": {
         "hash": "0x",
@@ -459,7 +464,8 @@
         "cycle_number": null,
         "reward_set": null,
         "signer_bitvec": null,
-        "signer_signature": null
+        "signer_signature": null,
+        "signer_public_keys": null
       },
       "parent_block_identifier": {
         "hash": "0x",
@@ -547,7 +553,8 @@
         "cycle_number": null,
         "reward_set": null,
         "signer_bitvec": null,
-        "signer_signature": null
+        "signer_signature": null,
+        "signer_public_keys": null
       },
       "parent_block_identifier": {
         "hash": "0x",
@@ -635,7 +642,8 @@
         "cycle_number": null,
         "reward_set": null,
         "signer_bitvec": null,
-        "signer_signature": null
+        "signer_signature": null,
+        "signer_public_keys": null
       },
       "parent_block_identifier": {
         "hash": "0x",
@@ -724,7 +732,8 @@
         "cycle_number": null,
         "reward_set": null,
         "signer_bitvec": null,
-        "signer_signature": null
+        "signer_signature": null,
+        "signer_public_keys": null
       },
       "parent_block_identifier": {
         "hash": "0x",
@@ -812,7 +821,8 @@
         "cycle_number": null,
         "reward_set": null,
         "signer_bitvec": null,
-        "signer_signature": null
+        "signer_signature": null,
+        "signer_public_keys": null
       },
       "parent_block_identifier": {
         "hash": "0x",
@@ -900,7 +910,8 @@
         "cycle_number": null,
         "reward_set": null,
         "signer_bitvec": null,
-        "signer_signature": null
+        "signer_signature": null,
+        "signer_public_keys": null
       },
       "parent_block_identifier": {
         "hash": "0x",
@@ -988,7 +999,8 @@
         "cycle_number": null,
         "reward_set": null,
         "signer_bitvec": null,
-        "signer_signature": null
+        "signer_signature": null,
+        "signer_public_keys": null
       },
       "parent_block_identifier": {
         "hash": "0x",
@@ -1076,7 +1088,8 @@
         "cycle_number": null,
         "reward_set": null,
         "signer_bitvec": null,
-        "signer_signature": null
+        "signer_signature": null,
+        "signer_public_keys": null
       },
       "parent_block_identifier": {
         "hash": "0x",
@@ -1174,7 +1187,8 @@
         "cycle_number": null,
         "reward_set": null,
         "signer_bitvec": null,
-        "signer_signature": null
+        "signer_signature": null,
+        "signer_public_keys": null
       },
       "parent_block_identifier": {
         "hash": "0x",

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

@@ -45,6 +45,9 @@ pub struct NewBlock {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub signer_bitvec: Option<String>,
 
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub signer_signature_hash: Option<String>,
+
     #[serde(skip_serializing_if = "Option::is_none")]
     pub signer_signature: Option<Vec<String>>,
 
@@ -472,6 +475,13 @@ pub fn standardize_stacks_block(
         })
     };
 
+    let signer_sig_hash = block
+        .signer_signature_hash
+        .as_ref()
+        .map(|hash| {
+            hex::decode(&hash[2..]).expect("unable to decode signer_signature hex")
+        });
+
     let block = StacksBlockData {
         block_identifier: BlockIdentifier {
             hash: block.index_block_hash.clone(),
@@ -502,6 +512,20 @@ pub fn standardize_stacks_block(
             signer_bitvec: block.signer_bitvec.clone(),
             signer_signature: block.signer_signature.clone(),
 
+            signer_public_keys: match (signer_sig_hash, &block.signer_signature) {
+                (Some(signer_sig_hash), Some(signatures)) => {
+                    Some(signatures.iter().map(|sig_hex| {
+                        let sig_msg = clarity::util::secp256k1::MessageSignature::from_hex(sig_hex)
+                            .map_err(|e| format!("unable to parse signer signature message: {}", e))?;
+                        let pubkey = get_signer_pubkey_from_message_hash(&signer_sig_hash, &sig_msg)
+                            .map_err(|e| format!("unable to recover signer sig pubkey: {}", e))?;
+                        Ok(format!("0x{}", hex::encode(pubkey)))
+                    })
+                    .collect::<Result<Vec<_>, String>>()?)
+                }
+                _ => None,
+            },
+
             cycle_number: block.cycle_number,
             reward_set: block.reward_set.as_ref().and_then(|r| {
                 Some(StacksBlockMetadataRewardSet {
@@ -690,19 +714,22 @@ pub fn standardize_stacks_stackerdb_chunks(
                 })
             }
             SignerMessage::BlockResponse(block_response) => match block_response {
-                BlockResponse::Accepted((block_hash, sig)) => StacksSignerMessage::BlockResponse(
+                BlockResponse::Accepted(block_accepted) => StacksSignerMessage::BlockResponse(
                     BlockResponseData::Accepted(BlockAcceptedResponse {
-                        signer_signature_hash: format!("0x{}", block_hash.to_hex()),
-                        sig: format!("0x{}", sig.to_hex()),
+                        signer_signature_hash: format!("0x{}", block_accepted.signer_signature_hash.to_hex()),
+                        signature: format!("0x{}", block_accepted.signature.to_hex()),
+                        metadata: SignerMessageMetadata {
+                            server_version: block_accepted.metadata.server_version,
+                        }
                     }),
                 ),
                 BlockResponse::Rejected(block_rejection) => StacksSignerMessage::BlockResponse(
                     BlockResponseData::Rejected(BlockRejectedResponse {
                         reason: block_rejection.reason,
                         reason_code: match block_rejection.reason_code {
                             RejectCode::ValidationFailed(validate_reject_code) => {
-                                BlockRejectReasonCode::ValidationFailed(
-                                    match validate_reject_code {
+                                BlockRejectReasonCode::ValidationFailed {
+                                    validation_failed: match validate_reject_code {
                                         ValidateRejectCode::BadBlockHash => {
                                             BlockValidationFailedCode::BadBlockHash
                                         }
@@ -725,7 +752,7 @@ pub fn standardize_stacks_stackerdb_chunks(
                                             BlockValidationFailedCode::NoSuchTenure
                                         }
                                     },
-                                )
+                                }
                             }
                             RejectCode::NoSortitionView => BlockRejectReasonCode::NoSortitionView,
                             RejectCode::ConnectivityIssues => {
@@ -745,6 +772,9 @@ pub fn standardize_stacks_stackerdb_chunks(
                         ),
                         chain_id: block_rejection.chain_id,
                         signature: format!("0x{}", block_rejection.signature.to_hex()),
+                        metadata: SignerMessageMetadata {
+                            server_version: block_rejection.metadata.server_version,
+                        },
                     }),
                 ),
             },
@@ -848,6 +878,36 @@ fn get_nakamoto_index_block_hash(
     Ok(format!("0x{}", hex::encode(hash)))
 }
 
+pub fn get_signer_pubkey_from_message_hash(
+    message_hash: &Vec<u8>,
+    signature: &clarity::util::secp256k1::MessageSignature,
+) -> Result<[u8; 33], String> {
+    use miniscript::bitcoin::{
+        key::Secp256k1,
+        secp256k1::{
+            ecdsa::{RecoverableSignature, RecoveryId},
+            Message,
+        },
+    };
+
+    let (first, sig) = signature.0.split_at(1);
+    let rec_id = first[0];
+
+    let secp = Secp256k1::new();
+    let recovery_id =
+        RecoveryId::from_i32(rec_id as i32).map_err(|e| format!("invalid recovery id: {e}"))?;
+    let signature = RecoverableSignature::from_compact(&sig, recovery_id)
+        .map_err(|e| format!("invalid signature: {e}"))?;
+    let message =
+        Message::from_digest_slice(&message_hash).map_err(|e| format!("invalid digest message: {e}"))?;
+
+    let pubkey = secp
+        .recover_ecdsa(&message, &signature)
+        .map_err(|e| format!("unable to recover pubkey: {e}"))?;
+
+    Ok(pubkey.serialize())
+}
+
 #[cfg(feature = "stacks-signers")]
 pub fn get_signer_pubkey_from_stackerdb_chunk_slot(
     slot: &NewSignerModifiedSlot,