chore: update reveal schema (#500)

Co-authored-by: Ludo Galabru <[email protected]>
hirosystems · Feb 14, 2024 · 384f94a · 384f94a
1 parent 50dd26f
commit 384f94a
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 10 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/components/chainhook-cli/Cargo.toml b/components/chainhook-cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "chainhook"
-version = "1.3.0"
+version = "1.3.1"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

diff --git a/components/chainhook-sdk/Cargo.toml b/components/chainhook-sdk/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "chainhook-sdk"
-version = "0.12.1"
+version = "0.12.5"
 description = "Stateless Transaction Indexing Engine for Stacks and Bitcoin"
 license = "GPL-3.0"
 edition = "2021"
@@ -16,7 +16,7 @@ stacks-rpc-client = "2"
 hiro-system-kit = { version = "0.3.1", optional = true }
 # stacks-rpc-client = { version = "1", path = "../../../clarinet/components/stacks-rpc-client" }
 # hiro-system-kit = { version = "0.1.0", path = "../../../clarinet/components/hiro-system-kit" }
-chainhook-types = { version = "1.3.0", path = "../chainhook-types-rs" }
+chainhook-types = { version = "1.3.3", path = "../chainhook-types-rs" }
 rocket = { version = "=0.5.0-rc.3", features = ["json"] }
 bitcoincore-rpc = "0.18.0"
 bitcoincore-rpc-json = "0.18.0"

diff --git a/components/chainhook-sdk/src/observer/tests/mod.rs b/components/chainhook-sdk/src/observer/tests/mod.rs
@@ -1146,8 +1146,12 @@ fn test_bitcoin_chainhook_through_reorg() {
                                 inscription_output_value: cursor,
                                 inscription_id: format!("{cursor}"),
                                 inscription_input_index: 0,
-                                inscription_pointer: 0,
+                                inscription_pointer: None,
                                 inscriber_address: None,
+                                metadata: None,
+                                metaprotocol: None,
+                                delegate: None,
+                                parent: None,
                                 ordinal_number: cursor,
                                 ordinal_block_height: b.block.block_identifier.index,
                                 ordinal_offset: 0,

diff --git a/components/chainhook-sdk/src/observer/zmq.rs b/components/chainhook-sdk/src/observer/zmq.rs
@@ -148,6 +148,7 @@ pub async fn start_zeromq_runloop(
                         "Possible re-org detected, retrieving parent block {parent_block_hash}"
                     )
                 });
+                block_hashes.push_front(block_hash);
                 block_hashes.push_front(parent_block_hash);
             }
         }

diff --git a/components/chainhook-types-rs/Cargo.toml b/components/chainhook-types-rs/Cargo.toml
@@ -2,7 +2,7 @@
 name = "chainhook-types"
 description = "Bitcoin and Stacks data schemas, based on the Rosetta specification"
 license = "MIT"
-version = "1.3.1"
+version = "1.3.3"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

diff --git a/components/chainhook-types-rs/src/rosetta.rs b/components/chainhook-types-rs/src/rosetta.rs
@@ -2,6 +2,7 @@ use super::bitcoin::{TxIn, TxOut};
 use crate::contract_interface::ContractInterface;
 use crate::events::*;
 use schemars::JsonSchema;
+use serde_json::Value;
 use std::cmp::Ordering;
 use std::collections::HashSet;
 use std::fmt::Display;
@@ -363,8 +364,12 @@ pub struct OrdinalInscriptionRevealData {
     pub inscription_output_value: u64,
     pub inscription_id: String,
     pub inscription_input_index: usize,
-    pub inscription_pointer: u64,
+    pub inscription_pointer: Option<u64>,
     pub inscriber_address: Option<String>,
+    pub delegate: Option<String>,
+    pub metaprotocol: Option<String>,
+    pub metadata: Option<Value>,
+    pub parent: Option<String>,
     pub ordinal_number: u64,
     pub ordinal_block_height: u64,
     pub ordinal_offset: u64,

diff --git a/docs/chainhook-openapi.json b/docs/chainhook-openapi.json
@@ -2,7 +2,7 @@
   "openapi": "3.0.0",
   "info": {
     "title": "chainhook",
-    "version": "1.3.0"
+    "version": "1.3.1"
   },
   "paths": {
     "/ping": {
-Original file line number
+Diff line change
@@ Expand Up / @@ -148,6 +148,7 @@ pub async fn start_zeromq_runloop( @@
                             "Possible re-org detected, retrieving parent block {parent_block_hash}"
                         )
                     });
+                    block_hashes.push_front(block_hash);
                     block_hashes.push_front(parent_block_hash);
                 }
             }
@@ Expand Down @@