diff --git a/Cargo.lock b/Cargo.lock index 888de5c84..1c5c695af 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -324,7 +324,7 @@ checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd" [[package]] name = "brk" -version = "0.0.3" +version = "0.0.4" dependencies = [ "brk_computer", "brk_core", @@ -340,7 +340,7 @@ dependencies = [ [[package]] name = "brk_cli" -version = "0.0.3" +version = "0.0.4" dependencies = [ "brk_computer", "brk_exit", @@ -353,12 +353,11 @@ dependencies = [ "color-eyre", "log", "tabled", - "terminal_size", ] [[package]] name = "brk_computer" -version = "0.0.3" +version = "0.0.4" dependencies = [ "brk_core", "brk_exit", @@ -372,7 +371,7 @@ dependencies = [ [[package]] name = "brk_core" -version = "0.0.3" +version = "0.0.4" dependencies = [ "bitcoin", "bitcoincore-rpc", @@ -389,7 +388,7 @@ dependencies = [ [[package]] name = "brk_exit" -version = "0.0.3" +version = "0.0.4" dependencies = [ "ctrlc", "log", @@ -397,7 +396,7 @@ dependencies = [ [[package]] name = "brk_fetcher" -version = "0.0.3" +version = "0.0.4" dependencies = [ "brk_core", "brk_logger", @@ -410,7 +409,7 @@ dependencies = [ [[package]] name = "brk_indexer" -version = "0.0.3" +version = "0.0.4" dependencies = [ "bitcoin", "bitcoincore-rpc", @@ -429,7 +428,7 @@ dependencies = [ [[package]] name = "brk_logger" -version = "0.0.3" +version = "0.0.4" dependencies = [ "color-eyre", "env_logger", @@ -438,7 +437,7 @@ dependencies = [ [[package]] name = "brk_parser" -version = "0.0.3" +version = "0.0.4" dependencies = [ "bitcoin", "bitcoincore-rpc", @@ -453,7 +452,7 @@ dependencies = [ [[package]] name = "brk_query" -version = "0.0.3" +version = "0.0.4" dependencies = [ "brk_computer", "brk_indexer", @@ -468,7 +467,7 @@ dependencies = [ [[package]] name = "brk_server" -version = "0.0.3" +version = "0.0.4" dependencies = [ "axum", "brk_computer", @@ -489,7 +488,7 @@ dependencies = [ [[package]] name = "brk_vec" -version = "0.0.3" +version = "0.0.4" dependencies = [ "brk_exit", "memmap2", @@ -2411,16 +2410,6 @@ dependencies = [ "windows-sys 0.59.0", ] -[[package]] -name = "terminal_size" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5352447f921fda68cf61b4101566c0bdb5104eff6804d0678e5227580ab6a4e9" -dependencies = [ - "rustix", - "windows-sys 0.59.0", -] - [[package]] name = "textwrap" version = "0.16.1" diff --git a/Cargo.toml b/Cargo.toml index cc440a989..4538ad5b8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,7 +4,7 @@ members = ["crates/*"] package.description = "The Bitcoin Research Kit is a suite of tools designed to extract, compute and display data stored on a Bitcoin Core node" package.license = "MIT" package.edition = "2024" -package.version = "0.0.3" +package.version = "0.0.4" package.repository = "https://github.com/bitcoinresearchkit/brk" [workspace.dependencies] diff --git a/README.md b/README.md index eacf8a812..cf6325902 100644 --- a/README.md +++ b/README.md @@ -29,6 +29,12 @@ Feel free to open an issue if you want to add another instance [Guide](https://crates.io/crates/brk_cli) +## Acknowledgments + +Immense thank you to the [Open Sats](https://opensats.org/) public charity. Their grant — from December 2024 to the present — has been critical in sustaining this project. + +Heartfelt thanks go out to every donor on [Nostr](https://primal.net/p/npub1jagmm3x39lmwfnrtvxcs9ac7g300y3dusv9lgzhk2e4x5frpxlrqa73v44) and [Geyser.fund](https://geyser.fund/project/brk) whose support has ensured the availability of the [kibō.money](https://kibo.money) public instance. + ## Donate image @@ -39,7 +45,7 @@ Feel free to open an issue if you want to add another instance [lnurl1dp68gurn8ghj7ampd3kx2ar0veekzar0wd5xjtnrdakj7tnhv4kxctttdehhwm30d3h82unvwqhkxmmww3jkuar8d35kgetj8yuq363hv4](lightning:lnurl1dp68gurn8ghj7ampd3kx2ar0veekzar0wd5xjtnrdakj7tnhv4kxctttdehhwm30d3h82unvwqhkxmmww3jkuar8d35kgetj8yuq363hv4) -[Geyser Fund](https://geyser.fund/project/kibo/) +[Geyser Fund](https://geyser.fund/project/brk) ## Old README diff --git a/crates/brk_cli/Cargo.toml b/crates/brk_cli/Cargo.toml index 119ad066c..dbf742d15 100644 --- a/crates/brk_cli/Cargo.toml +++ b/crates/brk_cli/Cargo.toml @@ -18,7 +18,6 @@ clap = { workspace = true, features = ["string"] } color-eyre = { workspace = true } log = { workspace = true } tabled = { workspace = true } -terminal_size = "0.4.1" [[bin]] name = "brk" diff --git a/crates/brk_cli/src/main.rs b/crates/brk_cli/src/main.rs index f64803d69..0e6bcac67 100644 --- a/crates/brk_cli/src/main.rs +++ b/crates/brk_cli/src/main.rs @@ -5,7 +5,7 @@ use brk_indexer::Indexer; use brk_query::Params as QueryArgs; use clap::{Parser, Subcommand}; use query::query; -use run::{RunArgs, run}; +use run::{RunConfig, run}; mod query; mod run; @@ -21,7 +21,7 @@ struct Cli { #[derive(Subcommand, Debug)] enum Commands { /// Run the indexer, computer and server - Run(RunArgs), + Run(RunConfig), /// Query generated datasets via the `run` command in a similar fashion as the server's API Query(QueryArgs), } @@ -40,7 +40,7 @@ fn main() -> color_eyre::Result<()> { let computer = Computer::import(&outputs_dir.join("computed"))?; match &cli.command { - Commands::Run(_) => run(indexer, computer), + Commands::Run(args) => run(indexer, computer, args), Commands::Query(args) => query(indexer, computer, args), } } diff --git a/crates/brk_cli/src/run.rs b/crates/brk_cli/src/run.rs index 608cf760b..6eee402b0 100644 --- a/crates/brk_cli/src/run.rs +++ b/crates/brk_cli/src/run.rs @@ -9,11 +9,11 @@ use clap::Parser; use log::info; #[derive(Parser, Debug)] -pub struct RunArgs { +pub struct RunConfig { name: Option, } -pub fn run(mut indexer: Indexer, mut computer: Computer) -> color_eyre::Result<()> { +pub fn run(mut indexer: Indexer, mut computer: Computer, config: &RunConfig) -> color_eyre::Result<()> { let data_dir = Path::new("../../../bitcoin"); let rpc = Box::leak(Box::new(rpc::Client::new( diff --git a/crates/brk_computer/src/lib.rs b/crates/brk_computer/src/lib.rs index 02d50fa08..669016b73 100644 --- a/crates/brk_computer/src/lib.rs +++ b/crates/brk_computer/src/lib.rs @@ -12,6 +12,7 @@ pub use brk_parser::rpc; mod storage; use brk_core::Date; +use log::info; use storage::{Stores, Vecs}; #[derive(Clone)] @@ -37,6 +38,8 @@ impl Computer { impl Computer { pub fn compute(&mut self, indexer: &mut Indexer, starting_indexes: Indexes, exit: &Exit) -> color_eyre::Result<()> { + info!("Computing..."); + let height_count = indexer.vecs.height_to_size.len(); let txindexes_count = indexer.vecs.txindex_to_txid.len(); let txinindexes_count = indexer.vecs.txinindex_to_txoutindex.len();