fix: inscription fee

hirosystems · Mar 23, 2023 · 2ac3022 · 2ac3022
1 parent e5ac34d
commit 2ac3022
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/components/chainhook-cli/src/scan/bitcoin.rs b/components/chainhook-cli/src/scan/bitcoin.rs
@@ -200,7 +200,7 @@ pub async fn scan_bitcoin_chain_with_predicate(
                     &transaction.transaction_identifier,
                     &ctx_,
                 );
-                let (block_number, block_offset) = match res {
+                let (block_number, block_offset, _) = match res {
                     Ok(res) => res,
                     Err(err) => {
                         println!("{err}");

diff --git a/components/chainhook-event-observer/src/indexer/bitcoin/mod.rs b/components/chainhook-event-observer/src/indexer/bitcoin/mod.rs
@@ -274,10 +274,13 @@ pub fn standardize_bitcoin_block(
             sats_in += value;
             inputs.push(TxIn {
                 previous_output: OutPoint {
-                    txid: input
-                        .txid
-                        .expect("not provided for coinbase txs")
-                        .to_string(),
+                    txid: format!(
+                        "0x{}",
+                        input
+                            .txid
+                            .expect("not provided for coinbase txs")
+                            .to_string()
+                    ),
                     vout: input.vout.expect("not provided for coinbase txs"),
                     block_height: input.prevout.expect("not provided for coinbase txs").height,
                     value,
@@ -366,6 +369,12 @@ fn try_parse_ordinal_operation(
                     index: 0,
                 };
 
+                let inscription_fee = tx
+                    .vout
+                    .get(0)
+                    .and_then(|o| Some(o.value.to_sat()))
+                    .unwrap_or(0);
+
                 let no_content_bytes = vec![];
                 let inscription_content_bytes = inscription.body().unwrap_or(&no_content_bytes);
 
@@ -385,12 +394,12 @@ fn try_parse_ordinal_operation(
                         content_length: inscription_content_bytes.len(),
                         inscription_id: inscription_id.to_string(),
                         inscriber_address,
+                        inscription_fee,
                         inscription_number: 0,
-                        inscription_fee: 0,
                         ordinal_number: 0,
                         ordinal_block_height: 0,
                         ordinal_offset: 0,
-                        outpoint_post_inscription: format!("{}:0:0", tx.txid.clone()),
+                        satpoint_post_inscription: format!("{}:0:0", tx.txid.clone()),
                     },
                 ));
             }