Merge pull request #266 from hirosystems/feat/cursed-inscriptions

feat: attempt to support cursed inscriptions
hirosystems · Jun 4, 2023 · 825f2c9 · 825f2c9
2 parents a4c486b + 2b954a2
commit 825f2c9
Show file tree

Hide file tree

Showing 10 changed files with 711 additions and 443 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/components/chainhook-cli/src/cli/mod.rs b/components/chainhook-cli/src/cli/mod.rs
@@ -15,9 +15,8 @@ use chainhook_event_observer::chainhooks::types::{
 use chainhook_event_observer::hord::db::{
     delete_data_in_hord_db, fetch_and_cache_blocks_in_hord_db, find_last_block_inserted,
     find_lazy_block_at_block_height, find_watched_satpoint_for_inscription, initialize_hord_db,
-    insert_entry_in_blocks, open_readonly_hord_db_conn, open_readonly_hord_db_conn_rocks_db,
-    open_readwrite_hord_db_conn, open_readwrite_hord_db_conn_rocks_db,
-    retrieve_satoshi_point_using_lazy_storage, LazyBlock,
+    open_readonly_hord_db_conn, open_readonly_hord_db_conn_rocks_db, open_readwrite_hord_db_conn,
+    open_readwrite_hord_db_conn_rocks_db, retrieve_satoshi_point_using_lazy_storage,
 };
 use chainhook_event_observer::hord::{
     new_traversals_lazy_cache, retrieve_inscribed_satoshi_points_from_block,
@@ -643,6 +642,7 @@ async fn handle_command(opts: Opts, ctx: Context) -> Result<(), String> {
                             &block_identifier,
                             &transaction_identifier,
                             0,
+                            0,
                             Arc::new(traversals_cache),
                             &ctx,
                         )?;

diff --git a/components/chainhook-cli/src/scan/bitcoin.rs b/components/chainhook-cli/src/scan/bitcoin.rs
@@ -61,7 +61,7 @@ pub async fn scan_bitcoin_chainstate_via_http_using_predicate(
     let (mut end_block, floating_end_block) = match predicate_spec.end_block {
         Some(end_block) => (end_block, false),
         None => match bitcoin_rpc.get_blockchain_info() {
-            Ok(result) => (result.blocks, true),
+            Ok(result) => (result.blocks - 1, true),
             Err(e) => {
                 return Err(format!(
                     "unable to retrieve Bitcoin chain tip ({})",
@@ -184,19 +184,19 @@ pub async fn scan_bitcoin_chainstate_via_http_using_predicate(
                 }
             };
 
-            update_storage_and_augment_bitcoin_block_with_inscription_reveal_data(
+            let _ = update_storage_and_augment_bitcoin_block_with_inscription_reveal_data(
                 &mut block,
                 &mut storage,
                 &traversals,
                 &hord_db_conn,
                 &ctx,
-            );
+            )?;
 
             let _ = update_storage_and_augment_bitcoin_block_with_inscription_transfer_data(
                 &mut block,
                 &mut storage,
                 &ctx,
-            );
+            )?;
 
             let inscriptions_revealed = get_inscriptions_revealed_in_block(&block)
                 .iter()
@@ -234,7 +234,7 @@ pub async fn scan_bitcoin_chainstate_via_http_using_predicate(
 
             if cursor == end_block && floating_end_block {
                 end_block = match bitcoin_rpc.get_blockchain_info() {
-                    Ok(result) => result.blocks,
+                    Ok(result) => result.blocks - 1,
                     Err(_e) => {
                         continue;
                     }
@@ -294,7 +294,7 @@ pub async fn scan_bitcoin_chainstate_via_http_using_predicate(
 
             if cursor == end_block && floating_end_block {
                 end_block = match bitcoin_rpc.get_blockchain_info() {
-                    Ok(result) => result.blocks,
+                    Ok(result) => result.blocks - 1,
                     Err(_e) => {
                         continue;
                     }

diff --git a/components/chainhook-event-observer/Cargo.toml b/components/chainhook-event-observer/Cargo.toml
@@ -21,7 +21,7 @@ hiro-system-kit = "0.1.0"
 # clarity-repl = { version = "1", path = "../../../clarinet/components/clarity-repl" }
 # hiro-system-kit = { version = "0.1.0", path = "../../../clarinet/components/hiro-system-kit" }
 chainhook-types = { version = "1.0.3", path = "../chainhook-types-rs" }
-rocket = { version = "=0.5.0-rc.2", features = ["json"] }
+rocket = { version = "=0.5.0-rc.3", features = ["json"] }
 bitcoincore-rpc = "0.16.0"
 bitcoincore-rpc-json = "0.16.0"
 base64 = "0.13.0"
@@ -37,7 +37,7 @@ clap_generate = { version = "3.0.3", optional = true }
 toml = { version = "0.5.6", features = ["preserve_order"], optional = true }
 ctrlc = { version = "3.2.2", optional = true }
 schemars = { version = "0.8.10" }
-rocket_okapi = "0.8.0-rc.1"
+rocket_okapi = "0.8.0-rc.3"
 crossbeam-channel = "0.5.6"
 chrono = { version = "0.4.19", optional = true }
 anyhow = { version = "1.0.56", features = ["backtrace"], optional = true  }