Compare commits

...

3 Commits

Author SHA1 Message Date
nym21 098f6de047 release: v0.0.61 2025-06-15 17:30:49 +02:00
nym21 1b0f90fd68 release: v0.0.60 2025-06-15 17:27:41 +02:00
nym21 12252f407b computer: fix open of ohlc if fetched from different API than prev ohlc 2025-06-15 17:27:16 +02:00
5 changed files with 51 additions and 36 deletions
Generated
+15 -15
View File
@@ -443,7 +443,7 @@ dependencies = [
[[package]]
name = "brk"
version = "0.0.59"
version = "0.0.61"
dependencies = [
"brk_bundler",
"brk_cli",
@@ -463,7 +463,7 @@ dependencies = [
[[package]]
name = "brk_bundler"
version = "0.0.59"
version = "0.0.61"
dependencies = [
"brk_rolldown",
"log",
@@ -474,7 +474,7 @@ dependencies = [
[[package]]
name = "brk_cli"
version = "0.0.59"
version = "0.0.61"
dependencies = [
"bitcoincore-rpc",
"brk_computer",
@@ -499,7 +499,7 @@ dependencies = [
[[package]]
name = "brk_computer"
version = "0.0.59"
version = "0.0.61"
dependencies = [
"bitcoin",
"bitcoincore-rpc",
@@ -520,7 +520,7 @@ dependencies = [
[[package]]
name = "brk_core"
version = "0.0.59"
version = "0.0.61"
dependencies = [
"bincode",
"bitcoin",
@@ -541,7 +541,7 @@ dependencies = [
[[package]]
name = "brk_exit"
version = "0.0.59"
version = "0.0.61"
dependencies = [
"brk_logger",
"ctrlc",
@@ -550,7 +550,7 @@ dependencies = [
[[package]]
name = "brk_fetcher"
version = "0.0.59"
version = "0.0.61"
dependencies = [
"brk_core",
"brk_logger",
@@ -563,7 +563,7 @@ dependencies = [
[[package]]
name = "brk_indexer"
version = "0.0.59"
version = "0.0.61"
dependencies = [
"bitcoin",
"bitcoincore-rpc",
@@ -581,7 +581,7 @@ dependencies = [
[[package]]
name = "brk_logger"
version = "0.0.59"
version = "0.0.61"
dependencies = [
"color-eyre",
"env_logger",
@@ -591,7 +591,7 @@ dependencies = [
[[package]]
name = "brk_parser"
version = "0.0.59"
version = "0.0.61"
dependencies = [
"bitcoin",
"bitcoincore-rpc",
@@ -606,7 +606,7 @@ dependencies = [
[[package]]
name = "brk_query"
version = "0.0.59"
version = "0.0.61"
dependencies = [
"brk_computer",
"brk_core",
@@ -929,7 +929,7 @@ dependencies = [
[[package]]
name = "brk_server"
version = "0.0.59"
version = "0.0.61"
dependencies = [
"axum",
"bitcoincore-rpc",
@@ -959,7 +959,7 @@ dependencies = [
[[package]]
name = "brk_state"
version = "0.0.59"
version = "0.0.61"
dependencies = [
"bincode",
"brk_core",
@@ -973,7 +973,7 @@ dependencies = [
[[package]]
name = "brk_store"
version = "0.0.59"
version = "0.0.61"
dependencies = [
"arc-swap",
"brk_core",
@@ -995,7 +995,7 @@ dependencies = [
[[package]]
name = "brk_vec"
version = "0.0.59"
version = "0.0.61"
dependencies = [
"arc-swap",
"brk_core",
+15 -15
View File
@@ -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.59"
package.version = "0.0.61"
package.homepage = "https://bitcoinresearchkit.org"
package.repository = "https://github.com/bitcoinresearchkit/brk"
@@ -22,20 +22,20 @@ axum = "0.8.4"
bincode = { version = "2.0.1", features = ["serde"] }
bitcoin = { version = "0.32.6", features = ["serde"] }
bitcoincore-rpc = "0.19.0"
brk_bundler = { version = "0.0.59", path = "crates/brk_bundler" }
brk_cli = { version = "0.0.59", path = "crates/brk_cli" }
brk_computer = { version = "0.0.59", path = "crates/brk_computer" }
brk_core = { version = "0.0.59", path = "crates/brk_core" }
brk_exit = { version = "0.0.59", path = "crates/brk_exit" }
brk_fetcher = { version = "0.0.59", path = "crates/brk_fetcher" }
brk_indexer = { version = "0.0.59", path = "crates/brk_indexer" }
brk_logger = { version = "0.0.59", path = "crates/brk_logger" }
brk_parser = { version = "0.0.59", path = "crates/brk_parser" }
brk_query = { version = "0.0.59", path = "crates/brk_query" }
brk_server = { version = "0.0.59", path = "crates/brk_server" }
brk_state = { version = "0.0.59", path = "crates/brk_state" }
brk_store = { version = "0.0.59", path = "crates/brk_store" }
brk_vec = { version = "0.0.59", path = "crates/brk_vec" }
brk_bundler = { version = "0.0.61", path = "crates/brk_bundler" }
brk_cli = { version = "0.0.61", path = "crates/brk_cli" }
brk_computer = { version = "0.0.61", path = "crates/brk_computer" }
brk_core = { version = "0.0.61", path = "crates/brk_core" }
brk_exit = { version = "0.0.61", path = "crates/brk_exit" }
brk_fetcher = { version = "0.0.61", path = "crates/brk_fetcher" }
brk_indexer = { version = "0.0.61", path = "crates/brk_indexer" }
brk_logger = { version = "0.0.61", path = "crates/brk_logger" }
brk_parser = { version = "0.0.61", path = "crates/brk_parser" }
brk_query = { version = "0.0.61", path = "crates/brk_query" }
brk_server = { version = "0.0.61", path = "crates/brk_server" }
brk_state = { version = "0.0.61", path = "crates/brk_state" }
brk_store = { version = "0.0.61", path = "crates/brk_store" }
brk_vec = { version = "0.0.61", path = "crates/brk_vec" }
byteview = "=0.6.1"
clap = { version = "4.5.40", features = ["string"] }
clap_derive = "4.5.40"
+13 -3
View File
@@ -7,7 +7,7 @@ use brk_core::{
use brk_exit::Exit;
use brk_fetcher::Fetcher;
use brk_indexer::Indexer;
use brk_vec::{AnyCollectableVec, AnyIterableVec, Computation, EagerVec, Format};
use brk_vec::{AnyCollectableVec, AnyIterableVec, Computation, EagerVec, Format, StoredIndex};
use super::{
Indexes,
@@ -429,8 +429,18 @@ impl Vecs {
self.dateindex_to_ohlc_in_cents.compute_transform(
starting_indexes.dateindex,
&indexes.dateindex_to_date,
|(di, d, ..)| {
let ohlc = fetcher.get_date(d).unwrap();
|(di, d, this)| {
let mut ohlc = fetcher.get_date(d).unwrap();
if let Some(prev) = di.decremented() {
let prev_open = *this
.get_or_read(prev, &this.mmap().load())
.unwrap()
.unwrap()
.close;
*ohlc.open = prev_open;
*ohlc.high = (*ohlc.high).max(prev_open);
*ohlc.low = (*ohlc.low).min(prev_open);
}
(di, ohlc)
},
exit,
+5 -1
View File
@@ -1,6 +1,6 @@
use std::ops::{Add, Div};
use derive_deref::Deref;
use derive_deref::{Deref, DerefMut};
use serde::{Serialize, Serializer, ser::SerializeTuple};
use zerocopy_derive::{FromBytes, Immutable, IntoBytes, KnownLayout};
@@ -172,6 +172,7 @@ impl From<Close<Sats>> for OHLCSats {
IntoBytes,
KnownLayout,
Deref,
DerefMut,
Serialize,
)]
#[repr(C)]
@@ -259,6 +260,7 @@ where
IntoBytes,
KnownLayout,
Deref,
DerefMut,
Serialize,
)]
#[repr(C)]
@@ -346,6 +348,7 @@ where
IntoBytes,
KnownLayout,
Deref,
DerefMut,
Serialize,
)]
#[repr(C)]
@@ -433,6 +436,7 @@ where
IntoBytes,
KnownLayout,
Deref,
DerefMut,
Serialize,
)]
#[repr(C)]
@@ -96,9 +96,10 @@ impl BlkIndexToBlkRecap {
}
pub fn export(&self) {
let file = File::create(&self.path).unwrap_or_else(|_| {
let file = File::create(&self.path).unwrap_or_else(|e| {
dbg!(e);
dbg!(&self.path);
panic!("No such file or directory")
panic!("Cannot write file");
});
serde_json::to_writer(&mut BufWriter::new(file), &self.tree).unwrap();