kylefang/bitcoin-indexer
1
0
Fork 0
mirror of https://github.com/alexgo-io/bitcoin-indexer.git synced 2026-06-13 16:19:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: indexing

Browse Source
This commit is contained in:
Ludo Galabru
2023-03-08 15:54:18 -05:00
parent e6db5b4f3c
commit 45661ab62c
2 changed files with 27 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
components/chainhook-cli/src/cli/mod.rs
View File

@@ -2,7 +2,7 @@ use crate::block::DigestingCommand;
use crate::config::Config;
use crate::node::Node;
use crate::scan::bitcoin::{
retrieve_satoshi_point_using_bitcoin_rpc, scan_bitcoin_chain_with_predicate,
scan_bitcoin_chain_with_predicate, retrieve_satoshi_point_using_local_storage,
};
use crate::scan::stacks::scan_stacks_chain_with_predicate;
@@ -19,6 +19,7 @@ use chainhook_event_observer::observer::{
};
use chainhook_event_observer::redb::ReadableTable;
use chainhook_event_observer::utils::Context;
use chainhook_types::{BlockIdentifier, TransactionIdentifier};
use clap::{Parser, Subcommand};
use ctrlc;
use hiro_system_kit;
@@ -154,7 +155,7 @@ struct GetSatoshiCommand {
/// Txid
pub txid: String,
/// Output index
pub output_index: usize,
pub block_height: u64,
/// Target Devnet network
#[clap(
long = "devnet",
@@ -289,8 +290,9 @@ async fn handle_command(opts: Opts, ctx: Context) -> Result<(), String> {
OrdinalsCommand::Satoshi(cmd) => {
let config =
Config::default(cmd.devnet, cmd.testnet, cmd.mainnet, &cmd.config_path)?;
retrieve_satoshi_point_using_bitcoin_rpc(&config, &cmd.txid, cmd.output_index)
let txid = TransactionIdentifier { hash: cmd.txid.clone() };
let block_id = BlockIdentifier { hash: "".into(), index: cmd.block_height };
retrieve_satoshi_point_using_local_storage(&config, &block_id, &txid)
.await?;
}
},

40
components/chainhook-cli/src/scan/bitcoin.rs
View File

@@ -31,7 +31,7 @@ use chainhook_event_observer::observer::{
use chainhook_event_observer::redb::ReadableTable;
use chainhook_event_observer::utils::{file_append, send_request, Context};
use chainhook_types::{
BitcoinTransactionData, OrdinalInscriptionRevealData, OrdinalOperation, TransactionIdentifier,
BitcoinTransactionData, OrdinalInscriptionRevealData, OrdinalOperation, TransactionIdentifier, BlockIdentifier,
};
use reqwest::Client as HttpClient;
use rusqlite::{Connection, OpenFlags, Result, ToSql};
@@ -43,14 +43,15 @@ use std::time::Duration;
pub fn initialize_bitcoin_block_traversal_cache(path: &PathBuf) -> Connection {
let conn = create_or_open_readwrite_db(path);
conn.execute(
if let Err(e) = conn.execute(
"CREATE TABLE blocks (
id INTEGER NOT NULL PRIMARY KEY,
compacted_bytes TEXT NOT NULL
)",
[],
)
.unwrap();
) {
println!("Error: {}", e.to_string());
}
conn
}
@@ -189,12 +190,14 @@ pub fn write_compacted_block_to_index(
storage_conn: &Connection,
) {
let serialized_compacted_block = compacted_block.to_hex_bytes();
storage_conn
.execute(
"INSERT INTO blocks (id, compacted_bytes) VALUES (?1, ?2)",
rusqlite::params![&block_id, &serialized_compacted_block],
)
.unwrap();
if let Err(e) = storage_conn
.execute(
"INSERT INTO blocks (id, compacted_bytes) VALUES (?1, ?2)",
rusqlite::params![&block_id, &serialized_compacted_block],
) {
println!("Error: {}", e.to_string());
}
}
pub async fn scan_bitcoin_chain_with_predicate(
@@ -341,17 +344,16 @@ pub async fn scan_bitcoin_chain_with_predicate(
let mut total_hits = vec![];
let (retrieve_ordinal_tx, retrieve_ordinal_rx) =
channel::<std::option::Option<((BitcoinTransactionData, Vec<HookAction>))>>();
channel::<std::option::Option<(BlockIdentifier, BitcoinTransactionData, Vec<HookAction>)>>();
let (process_ordinal_tx, process_ordinal_rx) = channel();
let (cache_block_tx, cache_block_rx) = channel();
let _config = config.clone();
let handle_1 = hiro_system_kit::thread_named("Ordinal retrieval")
.spawn(move || {
while let Ok(Some((mut transaction, actions))) = retrieve_ordinal_rx.recv() {
let txid = &transaction.transaction_identifier.hash[2..];
println!("Retrieving satoshi point for {txid}");
let f = retrieve_satoshi_point_using_bitcoin_rpc(&_config, &txid, 0);
while let Ok(Some((block_identifier, mut transaction, actions))) = retrieve_ordinal_rx.recv() {
println!("Retrieving satoshi point for {}", transaction.transaction_identifier.hash);
let f = retrieve_satoshi_point_using_local_storage(&_config, &block_identifier, &transaction.transaction_identifier);
let (block_number, block_offset) = match hiro_system_kit::nestable_block_on(f) {
Ok(res) => res,
Err(err) => {
@@ -461,7 +463,7 @@ pub async fn scan_bitcoin_chain_with_predicate(
if is_scanning_inscriptions {
pipeline_started = true;
let _ = retrieve_ordinal_tx
.send(Some((tx.clone(), vec![predicate_spec.action.clone()])));
.send(Some((block.block_identifier.clone(), tx.clone(), vec![predicate_spec.action.clone()])));
} else {
hits.push(tx);
}
@@ -579,16 +581,16 @@ pub async fn retrieve_block_hash(config: &Config, block_height: &u64) -> Result<
pub async fn retrieve_satoshi_point_using_local_storage(
config: &Config,
origin_block_height: &u64,
block_identifier: &BlockIdentifier,
transaction_identifier: &TransactionIdentifier,
) -> Result<(u64, u64), String> {
let path = config.get_bitcoin_block_traversal_db_path();
let storage_conn = open_existing_readonly_db(&path);
let mut ordinal_offset = 0;
let mut ordinal_block_number = *origin_block_height as u32;
let mut ordinal_block_number = block_identifier.index as u32;
let txid = {
let bytes = hex::decode(&transaction_identifier.hash).unwrap();
let bytes = hex::decode(&transaction_identifier.hash[2..]).unwrap();
[bytes[0], bytes[1], bytes[2], bytes[3]]
};
let mut tx_cursor = (txid, 0);