feat: differentiate spent in fees and burnt

hirosystems · Nov 1, 2023 · bebe429 · bebe429
1 parent e880cf9
commit bebe429
Show file tree

Hide file tree

Showing 3 changed files with 82 additions and 18 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/components/ordhook-core/Cargo.toml b/components/ordhook-core/Cargo.toml
@@ -12,7 +12,7 @@ redis = "0.21.5"
 serde-redis = "0.12.0"
 hex = "0.4.3"
 rand = "0.8.5"
-chainhook-sdk = { version = "=0.10.1", default-features = false, features = ["zeromq", "log"] }
+chainhook-sdk = { version = "=0.10.3", features = ["zeromq"] }
 # chainhook-sdk = { version = "=0.10.1", path = "../../../chainhook/components/chainhook-sdk", default-features = false, features = ["zeromq", "log"] }
 hiro-system-kit = "0.3.1"
 reqwest = { version = "0.11", default-features = false, features = ["stream", "json", "rustls-tls"] }

diff --git a/components/ordhook-core/src/core/protocol/inscription_tracking.rs b/components/ordhook-core/src/core/protocol/inscription_tracking.rs
@@ -2,7 +2,7 @@ use chainhook_sdk::{
     bitcoincore_rpc_json::bitcoin::{hashes::hex::FromHex, Address, Network, Script},
     types::{
         BitcoinBlockData, BitcoinNetwork, BitcoinTransactionData, BlockIdentifier,
-        OrdinalInscriptionTransferData, OrdinalOperation, TransactionIdentifier,
+        OrdinalInscriptionTransferData, OrdinalOperation, TransactionIdentifier, OrdinalInscriptionTransferDestination,
     },
     utils::Context,
 };
@@ -114,7 +114,7 @@ pub fn augment_transaction_with_ordinals_transfers_data(
             let (
                 outpoint_post_transfer,
                 offset_post_transfer,
-                updated_address,
+                destination,
                 post_transfer_output_value,
             ) = match post_transfer_data {
                 SatPosition::Output((output_index, offset)) => {
@@ -124,7 +124,7 @@ pub fn augment_transaction_with_ordinals_transfers_data(
                         tx.metadata.outputs[output_index].get_script_pubkey_hex();
                     let updated_address = match Script::from_hex(&script_pub_key_hex) {
                         Ok(script) => match Address::from_script(&script, network.clone()) {
-                            Ok(address) => Some(address.to_string()),
+                            Ok(address) => OrdinalInscriptionTransferDestination::Transferred(address.to_string()),
                             Err(e) => {
                                 ctx.try_log(|logger| {
                                     warn!(
@@ -133,7 +133,7 @@ pub fn augment_transaction_with_ordinals_transfers_data(
                                         e.to_string()
                                     )
                                 });
-                                None
+                                OrdinalInscriptionTransferDestination::Burnt(script.to_string())
                             }
                         },
                         Err(e) => {
@@ -144,7 +144,7 @@ pub fn augment_transaction_with_ordinals_transfers_data(
                                     e.to_string()
                                 )
                             });
-                            None
+                            OrdinalInscriptionTransferDestination::Burnt(script_pub_key_hex.to_string())
                         }
                     };
 
@@ -181,7 +181,7 @@ pub fn augment_transaction_with_ordinals_transfers_data(
                             offset
                         )
                     });
-                    (outpoint, total_offset, None, None)
+                    (outpoint, total_offset, OrdinalInscriptionTransferDestination::SpentInFees, None)
                 }
             };
 
@@ -190,7 +190,7 @@ pub fn augment_transaction_with_ordinals_transfers_data(
 
             let transfer_data = OrdinalInscriptionTransferData {
                 inscription_id: watched_satpoint.inscription_id.clone(),
-                updated_address,
+                destination,
                 tx_index,
                 satpoint_pre_transfer,
                 satpoint_post_transfer,