Merge branch 'stacks-signers' into feat/signer-db

hirosystems · Oct 24, 2024 · 58e0f2e · 58e0f2e
2 parents 1551576 + 71364c1
commit 58e0f2e
Show file tree

Hide file tree

Showing 16 changed files with 239 additions and 75 deletions.
diff --git a/.vscode/chainhook.toml b/.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
diff --git a/.vscode/launch.json b/.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",

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/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" }
diff --git a/components/chainhook-cli/src/service/tests/helpers/mock_stacks_node.rs b/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(),

diff --git a/components/chainhook-sdk/src/chainhooks/stacks/mod.rs b/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,
     })
 }

diff --git a/components/chainhook-sdk/src/chainhooks/tests/fixtures/stacks/testnet/occurrence.json b/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",