@@ -23,13 +23,14 @@ use ordhook::core::protocol::inscription_parsing::parse_inscriptions_and_standar
2323use ordhook:: core:: protocol:: satoshi_numbering:: compute_satoshi_number;
2424use ordhook:: db:: {
2525 delete_data_in_ordhook_db, find_all_inscription_transfers, find_all_inscriptions_in_block,
26- find_all_transfers_in_block, find_inscription_with_id , find_last_block_inserted ,
27- find_latest_inscription_block_height, find_lazy_block_at_block_height ,
26+ find_all_transfers_in_block, find_block_bytes_at_block_height , find_inscription_with_id ,
27+ find_last_block_inserted , find_latest_inscription_block_height, find_missing_blocks ,
2828 get_default_ordhook_db_file_path, initialize_ordhook_db, open_ordhook_db_conn_rocks_db_loop,
2929 open_readonly_ordhook_db_conn, open_readonly_ordhook_db_conn_rocks_db,
30- open_readwrite_ordhook_db_conn,
30+ open_readwrite_ordhook_db_conn, BlockBytesCursor ,
3131} ;
3232use ordhook:: download:: download_ordinals_dataset_if_required;
33+ use ordhook:: hex;
3334use ordhook:: scan:: bitcoin:: scan_bitcoin_chainstate_via_rpc_using_predicate;
3435use ordhook:: service:: { start_observer_forwarding, Service } ;
3536use reqwest:: Client as HttpClient ;
@@ -577,7 +578,7 @@ async fn handle_command(opts: Opts, ctx: &Context) -> Result<(), String> {
577578 let mut total_transfers_in_block = 0 ;
578579
579580 for ( _, inscription) in inscriptions. iter ( ) {
580- println ! ( "Inscription {} revealed at block #{} (inscription_number {}, ordinal_number {})" , inscription. get_inscription_id( ) , block_height, inscription. inscription_number, inscription. ordinal_number) ;
581+ println ! ( "Inscription {} revealed at block #{} (inscription_number {}, ordinal_number {})" , inscription. get_inscription_id( ) , block_height, inscription. inscription_number. jubilee , inscription. ordinal_number) ;
581582 if let Some ( transfers) = locations. remove ( & inscription. get_inscription_id ( ) )
582583 {
583584 for t in transfers. iter ( ) . skip ( 1 ) {
@@ -639,7 +640,7 @@ async fn handle_command(opts: Opts, ctx: &Context) -> Result<(), String> {
639640 "Inscription {} revealed at block #{} (inscription_number {}, ordinal_number {})" ,
640641 inscription. get_inscription_id( ) ,
641642 block_height,
642- inscription. inscription_number,
643+ inscription. inscription_number. jubilee ,
643644 inscription. ordinal_number
644645 ) ;
645646 let transfers = find_all_inscription_transfers (
@@ -668,15 +669,19 @@ async fn handle_command(opts: Opts, ctx: &Context) -> Result<(), String> {
668669 . await ?;
669670 let transaction_identifier = TransactionIdentifier :: new ( & cmd. transaction_id ) ;
670671 let cache = new_traversals_lazy_cache ( 100 ) ;
671- let res = compute_satoshi_number (
672+ let ( res, mut back_trace ) = compute_satoshi_number (
672673 & config. get_ordhook_config ( ) . db_path ,
673674 & block. block_identifier ,
674675 & transaction_identifier,
675676 0 ,
676- 0 ,
677677 & Arc :: new ( cache) ,
678+ true ,
678679 ctx,
679680 ) ?;
681+ back_trace. reverse ( ) ;
682+ for ( block_height, tx) in back_trace. iter ( ) {
683+ println ! ( "{}\t {}" , block_height, hex:: encode( tx) ) ;
684+ }
680685 println ! ( "{:?}" , res) ;
681686 }
682687 Command :: Service ( subcmd) => match subcmd {
@@ -793,9 +798,10 @@ async fn handle_command(opts: Opts, ctx: &Context) -> Result<(), String> {
793798 ctx,
794799 ) ;
795800 for i in cmd. get_blocks ( ) . into_iter ( ) {
796- let block =
797- find_lazy_block_at_block_height ( i as u32 , 10 , false , & blocks_db, ctx)
801+ let block_bytes =
802+ find_block_bytes_at_block_height ( i as u32 , 10 , & blocks_db, ctx)
798803 . expect ( "unable to retrieve block {i}" ) ;
804+ let block = BlockBytesCursor :: new ( & block_bytes) ;
799805 info ! ( ctx. expect_logger( ) , "--------------------" ) ;
800806 info ! ( ctx. expect_logger( ) , "Block: {i}" ) ;
801807 for tx in block. iter_tx ( ) {
@@ -861,18 +867,9 @@ async fn handle_command(opts: Opts, ctx: &Context) -> Result<(), String> {
861867 {
862868 let blocks_db =
863869 open_readonly_ordhook_db_conn_rocks_db ( & config. expected_cache_path ( ) , ctx) ?;
864- let tip = find_last_block_inserted ( & blocks_db) as u64 ;
870+ let tip = find_last_block_inserted ( & blocks_db) ;
865871 println ! ( "Tip: {}" , tip) ;
866-
867- let mut missing_blocks = vec ! [ ] ;
868- for i in cmd. start_block ..=cmd. end_block {
869- if find_lazy_block_at_block_height ( i as u32 , 0 , false , & blocks_db, ctx)
870- . is_none ( )
871- {
872- println ! ( "Missing block #{i}" ) ;
873- missing_blocks. push ( i) ;
874- }
875- }
872+ let missing_blocks = find_missing_blocks ( & blocks_db, 1 , tip, ctx) ;
876873 println ! ( "{:?}" , missing_blocks) ;
877874 }
878875 }
0 commit comments