Skip to content

Commit 473ddd0

Browse files
author
Ludo Galabru
committed
feat: add logs
1 parent f23be24 commit 473ddd0

File tree

4 files changed

+74
-71
lines changed

4 files changed

+74
-71
lines changed

‎components/chainhook-cli/src/service/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ fn load_predicates_from_redis(
379379

380380
let mut predicates = vec![];
381381
for key in chainhooks_to_load.iter() {
382-
let mut chainhook = match redis_con.hget::<_, _, String>(key, "specification") {
382+
let chainhook = match redis_con.hget::<_, _, String>(key, "specification") {
383383
Ok(spec) => match ChainhookSpecification::deserialize_specification(&spec, key) {
384384
Ok(spec) => spec,
385385
Err(e) => {

‎components/chainhook-event-observer/src/chainhooks/types.rs

+7-3
Original file line numberDiff line numberDiff line change
@@ -89,15 +89,19 @@ impl ChainhookConfig {
8989
};
9090
}
9191

92-
pub fn register_specification(&mut self, spec: ChainhookSpecification, enabled: bool) -> Result<(), String> {
92+
pub fn register_specification(
93+
&mut self,
94+
spec: ChainhookSpecification,
95+
enabled: bool,
96+
) -> Result<(), String> {
9397
match spec {
9498
ChainhookSpecification::Stacks(spec) => {
95-
let mut spec = spec.clone();
99+
let mut spec = spec.clone();
96100
spec.enabled = enabled;
97101
self.stacks_chainhooks.push(spec);
98102
}
99103
ChainhookSpecification::Bitcoin(spec) => {
100-
let mut spec = spec.clone();
104+
let mut spec = spec.clone();
101105
spec.enabled = enabled;
102106
self.bitcoin_chainhooks.push(spec);
103107
}

‎components/chainhook-event-observer/src/hord/db/mod.rs

+28-30
Original file line numberDiff line numberDiff line change
@@ -927,16 +927,14 @@ pub fn retrieve_satoshi_point_using_local_storage(
927927
let coinbase_txid = &res.0 .0 .0;
928928
let txid = tx_cursor.0;
929929

930-
// ctx.try_log(|logger| {
931-
// slog::info!(
932-
// logger,
933-
// "{ordinal_block_number}:{:?}:{:?}",
934-
// hex::encode(&coinbase_txid),
935-
// hex::encode(&txid)
936-
// )
937-
// });
938-
939-
// to remove
930+
ctx.try_log(|logger| {
931+
slog::info!(
932+
logger,
933+
"{ordinal_block_number}:{:?}:{:?}",
934+
hex::encode(&coinbase_txid),
935+
hex::encode(&txid)
936+
)
937+
});
940938

941939
// evaluate exit condition: did we reach the **final** coinbase transaction
942940
if coinbase_txid.eq(&txid) {
@@ -985,44 +983,44 @@ pub fn retrieve_satoshi_point_using_local_storage(
985983
continue;
986984
}
987985

988-
// ctx.try_log(|logger| {
989-
// slog::debug!(logger, "Evaluating {}: {:?}", hex::encode(&txid_n), outputs)
990-
// });
986+
ctx.try_log(|logger| {
987+
slog::info!(logger, "Evaluating {}: {:?}", hex::encode(&txid_n), outputs)
988+
});
991989

992990
let mut sats_out = 0;
993991
for (index, output_value) in outputs.iter().enumerate() {
994992
if index == tx_cursor.1 {
995993
break;
996994
}
997-
// ctx.try_log(|logger| {
998-
// slog::debug!(logger, "Adding {} from output #{}", output_value, index)
999-
// });
995+
ctx.try_log(|logger| {
996+
slog::info!(logger, "Adding {} from output #{}", output_value, index)
997+
});
1000998
sats_out += output_value;
1001999
}
10021000
sats_out += ordinal_offset;
1003-
// ctx.try_log(|logger| {
1004-
// slog::debug!(
1005-
// logger,
1006-
// "Adding offset {ordinal_offset} to sats_out {sats_out}"
1007-
// )
1008-
// });
1001+
ctx.try_log(|logger| {
1002+
slog::info!(
1003+
logger,
1004+
"Adding offset {ordinal_offset} to sats_out {sats_out}"
1005+
)
1006+
});
10091007

10101008
let mut sats_in = 0;
10111009
for (txin, block_height, vout, txin_value) in inputs.into_iter() {
10121010
sats_in += txin_value;
1013-
// ctx.try_log(|logger| {
1014-
// slog::debug!(
1015-
// logger,
1016-
// "Adding txin_value {txin_value} to sats_in {sats_in} (txin: {})",
1017-
// hex::encode(&txin)
1018-
// )
1019-
// });
1011+
ctx.try_log(|logger| {
1012+
slog::info!(
1013+
logger,
1014+
"Adding txin_value {txin_value} to sats_in {sats_in} (txin: {})",
1015+
hex::encode(&txin)
1016+
)
1017+
});
10201018

10211019
if sats_out < sats_in {
10221020
ordinal_offset = sats_out - (sats_in - txin_value);
10231021
ordinal_block_number = block_height;
10241022

1025-
ctx.try_log(|logger| slog::debug!(logger, "Block {ordinal_block_number} / Tx {} / [in:{sats_in}, out:{sats_out}]: {block_height} -> {ordinal_block_number}:{ordinal_offset} -> {}:{vout}",
1023+
ctx.try_log(|logger| slog::info!(logger, "Block {ordinal_block_number} / Tx {} / [in:{sats_in}, out:{sats_out}]: {block_height} -> {ordinal_block_number}:{ordinal_offset} -> {}:{vout}",
10261024
hex::encode(&txid_n),
10271025
hex::encode(&txin)));
10281026
tx_cursor = (txin, vout as usize);

‎components/chainhook-event-observer/src/hord/mod.rs

+38-37
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,6 @@ pub fn update_storage_and_augment_bitcoin_block_with_inscription_reveal_data(
228228
{
229229
if let OrdinalOperation::InscriptionRevealed(inscription) = ordinal_event {
230230
let inscription_number = latest_inscription_number;
231-
latest_inscription_number += 1;
232231
let traversal = match traversals.get(&new_tx.transaction_identifier) {
233232
Some(traversal) => traversal,
234233
None => {
@@ -250,56 +249,58 @@ pub fn update_storage_and_augment_bitcoin_block_with_inscription_reveal_data(
250249
inscription.transfers_pre_inscription = traversal.transfers;
251250
inscription.inscription_fee = new_tx.metadata.fee;
252251

253-
match storage {
254-
Storage::Sqlite(rw_hord_db_conn) => {
255-
if let Some(_entry) = find_inscription_with_ordinal_number(
256-
&traversal.ordinal_number,
257-
&inscription_db_conn,
258-
&ctx,
259-
) {
260-
ctx.try_log(|logger| {
261-
slog::warn!(
252+
if let Some(_entry) = find_inscription_with_ordinal_number(
253+
&traversal.ordinal_number,
254+
&inscription_db_conn,
255+
&ctx,
256+
) {
257+
ctx.try_log(|logger| {
258+
slog::warn!(
262259
logger,
263260
"Transaction {} in block {} is overriding an existing inscription {}",
264261
new_tx.transaction_identifier.hash,
265262
block.block_identifier.index,
266263
traversal.ordinal_number
267264
);
268-
});
269-
ordinals_events_indexes_to_discard.push_front(ordinal_event_index);
270-
} else {
265+
});
266+
ordinals_events_indexes_to_discard.push_front(ordinal_event_index);
267+
} else {
268+
match storage {
269+
Storage::Sqlite(rw_hord_db_conn) => {
270+
latest_inscription_number += 1;
271271
inscription.inscription_number = inscription_number;
272272
ctx.try_log(|logger| {
273-
slog::info!(
274-
logger,
275-
"Transaction {} in block {} inscribed some content ({}) on Satoshi #{}",
276-
new_tx.transaction_identifier.hash,
277-
block.block_identifier.index,
278-
inscription.content_type,
279-
traversal.ordinal_number
280-
);
281-
});
273+
slog::info!(
274+
logger,
275+
"Transaction {} in block {} inscribed some content ({}) on Satoshi #{}",
276+
new_tx.transaction_identifier.hash,
277+
block.block_identifier.index,
278+
inscription.content_type,
279+
traversal.ordinal_number
280+
);
281+
});
282282
store_new_inscription(
283283
&inscription,
284284
&block.block_identifier,
285285
&rw_hord_db_conn,
286286
&ctx,
287-
);
287+
);
288+
}
289+
Storage::Memory(map) => {
290+
// Do something!
291+
let outpoint = inscription.satpoint_post_inscription
292+
[0..inscription.satpoint_post_inscription.len() - 2]
293+
.to_string();
294+
map.insert(
295+
outpoint,
296+
vec![WatchedSatpoint {
297+
inscription_id: inscription.inscription_id.clone(),
298+
inscription_number: inscription.inscription_number,
299+
ordinal_number: inscription.ordinal_number,
300+
offset: 0,
301+
}],
302+
);
288303
}
289-
}
290-
Storage::Memory(map) => {
291-
let outpoint = inscription.satpoint_post_inscription
292-
[0..inscription.satpoint_post_inscription.len() - 2]
293-
.to_string();
294-
map.insert(
295-
outpoint,
296-
vec![WatchedSatpoint {
297-
inscription_id: inscription.inscription_id.clone(),
298-
inscription_number: inscription.inscription_number,
299-
ordinal_number: inscription.ordinal_number,
300-
offset: 0,
301-
}],
302-
);
303304
}
304305
}
305306
}

0 commit comments

Comments
 (0)