From 9576f6e91e2567ee782cd808fc9d4e37d47dd4cc Mon Sep 17 00:00:00 2001
From: nym21 <expat-epochs0i@icloud.com>
Date: Fri, 13 Dec 2024 12:30:56 +0100
Subject: [PATCH 01/63] website: fix window resize brave bug

---
 website/scripts/main.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/website/scripts/main.js b/website/scripts/main.js
index 0dd2cdda8..9e3f3d7b7 100644
--- a/website/scripts/main.js
+++ b/website/scripts/main.js
@@ -1310,10 +1310,11 @@ function initFrameSelectors() {
 
   function setAsideParent() {
     const { clientWidth } = window.document.documentElement;
-    if (clientWidth >= consts.MEDIUM_WIDTH) {
-      elements.body.append(elements.aside);
-    } else {
-      elements.main.append(elements.aside);
+    const { aside, body, main } = elements;
+    if (clientWidth >= consts.MEDIUM_WIDTH && aside.parentElement !== body) {
+      body.append(aside);
+    } else if (aside.parentElement !== main) {
+      main.append(aside);
     }
   }
 

From f6f4660cd22c4b88e78c129f53288678e0dc347d Mon Sep 17 00:00:00 2001
From: nym21 <expat-epochs0i@icloud.com>
Date: Fri, 13 Dec 2024 16:08:59 +0100
Subject: [PATCH 02/63] website: fix the previous fix

---
 website/scripts/main.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/website/scripts/main.js b/website/scripts/main.js
index 9e3f3d7b7..17edce5b5 100644
--- a/website/scripts/main.js
+++ b/website/scripts/main.js
@@ -1311,10 +1311,10 @@ function initFrameSelectors() {
   function setAsideParent() {
     const { clientWidth } = window.document.documentElement;
     const { aside, body, main } = elements;
-    if (clientWidth >= consts.MEDIUM_WIDTH && aside.parentElement !== body) {
-      body.append(aside);
-    } else if (aside.parentElement !== main) {
-      main.append(aside);
+    if (clientWidth >= consts.MEDIUM_WIDTH) {
+      aside.parentElement !== body && body.append(aside);
+    } else {
+      aside.parentElement !== main && main.append(aside);
     }
   }
 

From 795791219e15e92e53c11e49158ad3ce6c2b168d Mon Sep 17 00:00:00 2001
From: nym21 <expat-epochs0i@icloud.com>
Date: Fri, 13 Dec 2024 19:55:32 +0100
Subject: [PATCH 03/63] global: snapshot

---
 .gitignore                                    |   28 +-
 CHANGELOG.md                                  |   69 +-
 CONTRIBUTING.md                               |    4 +-
 server/Cargo.lock => Cargo.lock               |  556 ++--
 Cargo.toml                                    |   39 +
 README.md                                     |    3 +-
 crates/biter/CHANGELOG.md                     |   12 +
 {biter => crates/biter}/Cargo.lock            |   79 +-
 {biter => crates/biter}/Cargo.toml            |   10 +-
 {biter => crates/biter}/LICENSE.md            |    0
 {biter => crates/biter}/README.md             |   23 +-
 .../biter}/src/blk_index_to_blk_recap.rs      |   40 +-
 {biter => crates/biter}/src/blk_metadata.rs   |    0
 .../biter}/src/blk_metadata_and_block.rs      |    0
 {biter => crates/biter}/src/blk_recap.rs      |    0
 {biter => crates/biter}/src/lib.rs            |   21 +-
 {biter => crates/biter}/src/main.rs           |   14 +-
 {biter => crates/biter}/src/utils.rs          |   13 +-
 {iterable => crates/iterable}/Cargo.lock      |    0
 {iterable => crates/iterable}/Cargo.toml      |    0
 {iterable => crates/iterable}/README.md       |    0
 {iterable => crates/iterable}/src/lib.rs      |    0
 .../struct_iterable_derive/Cargo.toml         |    0
 .../struct_iterable_derive/README.md          |    0
 .../struct_iterable_derive/src/lib.rs         |    0
 .../struct_iterable_internal/Cargo.toml       |    0
 .../struct_iterable_internal/README.md        |    0
 .../struct_iterable_internal/src/lib.rs       |    0
 parser/Cargo.lock                             | 2430 -----------------
 parser/Cargo.toml                             |   32 -
 parser/reset.sh                               |    7 -
 parser/samply.sh                              |   10 -
 parser/src/databases/_trait.rs                |   52 -
 parser/src/io/consts.rs                       |    2 -
 parser/src/lib.rs                             |   19 -
 parser/src/main.rs                            |   36 -
 parser/src/states/_trait.rs                   |   48 -
 parser/src/utils/log.rs                       |   34 -
 parser/run.sh => run.sh                       |    2 +-
 server/Cargo.toml                             |   22 -
 server/restart-cloudflared.sh                 |    4 -
 server/run.sh                                 |   14 -
 server/src/api/structs/routes.rs              |  157 --
 {parser/src => src}/io/binary.rs              |    0
 {parser/src => src}/io/json.rs                |    0
 {parser/src => src}/io/mod.rs                 |    2 -
 {parser/src => src}/io/serialization.rs       |   31 +-
 src/main.rs                                   |   70 +
 {parser/src => src/parser}/actions/export.rs  |   40 +-
 .../src => src/parser}/actions/iter_blocks.rs |   93 +-
 .../src => src/parser}/actions/min_height.rs  |   28 +-
 {parser/src => src/parser}/actions/mod.rs     |    0
 {parser/src => src/parser}/actions/parse.rs   |   29 +-
 .../src => src/parser}/databases/_database.rs |   97 +-
 src/parser/databases/_trait.rs                |   59 +
 .../address_index_to_address_data.rs          |   39 +-
 .../address_index_to_empty_address_data.rs    |   37 +-
 .../databases/address_to_address_index.rs     |   91 +-
 .../src => src/parser}/databases/metadata.rs  |    8 +-
 {parser/src => src/parser}/databases/mod.rs   |   81 +-
 .../parser}/databases/txid_to_tx_data.rs      |   34 +-
 .../databases/txout_index_to_address_index.rs |   35 +-
 .../databases/txout_index_to_amount.rs        |   35 +-
 .../parser}/datasets/_traits/any_dataset.rs   |    6 +-
 .../datasets/_traits/any_dataset_group.rs     |    0
 .../parser}/datasets/_traits/any_datasets.rs  |    0
 .../datasets/_traits/min_initial_state.rs     |    0
 .../parser}/datasets/_traits/mod.rs           |    0
 .../parser}/datasets/address/all_metadata.rs  |    8 +-
 .../parser}/datasets/address/cohort.rs        |   14 +-
 .../datasets/address/cohort_metadata.rs       |   10 +-
 .../parser}/datasets/address/mod.rs           |   13 +-
 .../parser}/datasets/block_metadata.rs        |    6 +-
 .../src => src/parser}/datasets/coindays.rs   |    9 +-
 .../src => src/parser}/datasets/cointime.rs   |   20 +-
 .../src => src/parser}/datasets/constant.rs   |    4 +-
 .../parser}/datasets/date_metadata.rs         |    6 +-
 {parser/src => src/parser}/datasets/mining.rs |    6 +-
 {parser/src => src/parser}/datasets/mod.rs    |  126 +-
 {parser/src => src/parser}/datasets/price.rs  |   43 +-
 .../parser}/datasets/subs/capitalization.rs   |   16 +-
 .../src => src/parser}/datasets/subs/input.rs |   15 +-
 .../src => src/parser}/datasets/subs/mod.rs   |    7 +-
 .../parser}/datasets/subs/output.rs           |    0
 .../parser}/datasets/subs/price_paid.rs       |   14 +-
 .../src => src/parser}/datasets/subs/ratio.rs |   10 +-
 .../parser}/datasets/subs/realized.rs         |   16 +-
 .../src => src/parser}/datasets/subs/recap.rs |   10 +-
 .../parser}/datasets/subs/supply.rs           |   14 +-
 .../parser}/datasets/subs/unrealized.rs       |   14 +-
 .../src => src/parser}/datasets/subs/utxo.rs  |   14 +-
 .../parser}/datasets/transaction.rs           |    9 +-
 .../parser}/datasets/utxo/dataset.rs          |   10 +-
 .../src => src/parser}/datasets/utxo/mod.rs   |   10 +-
 src/parser/mod.rs                             |   52 +
 {parser/src => src/parser}/price/binance.rs   |   23 +-
 {parser/src => src/parser}/price/kibo.rs      |   10 +-
 {parser/src => src/parser}/price/kraken.rs    |    7 +-
 {parser/src => src/parser}/price/mod.rs       |    0
 src/parser/states/_trait.rs                   |   39 +
 .../address/cohort_durable_states.rs          |    2 +-
 .../cohorts_states/address/cohort_id.rs       |    0
 .../address/cohorts_durable_states.rs         |    2 +-
 .../address/cohorts_input_states.rs           |    2 +-
 .../address/cohorts_one_shot_states.rs        |    2 +-
 .../address/cohorts_output_states.rs          |    2 +-
 .../address/cohorts_realized_states.rs        |    2 +-
 .../states/cohorts_states/address/mod.rs      |    0
 .../address/split_by_address_cohort.rs        |    0
 .../any/capitalization_state.rs               |    0
 .../cohorts_states/any/durable_states.rs      |    0
 .../states/cohorts_states/any/input_state.rs  |    0
 .../parser}/states/cohorts_states/any/mod.rs  |    0
 .../cohorts_states/any/one_shot_states.rs     |    0
 .../states/cohorts_states/any/output_state.rs |    0
 .../cohorts_states/any/price_paid_state.rs    |    0
 .../cohorts_states/any/price_to_value.rs      |    0
 .../cohorts_states/any/realized_state.rs      |    0
 .../states/cohorts_states/any/supply_state.rs |    0
 .../cohorts_states/any/unrealized_state.rs    |    0
 .../states/cohorts_states/any/utxo_state.rs   |    0
 .../parser}/states/cohorts_states/mod.rs      |    0
 .../utxo/cohort_durable_states.rs             |    2 +-
 .../cohorts_states/utxo/cohort_filter.rs      |    0
 .../cohorts_states/utxo/cohort_filters.rs     |    0
 .../states/cohorts_states/utxo/cohort_id.rs   |    0
 .../utxo/cohorts_durable_states.rs            |    2 +-
 .../utxo/cohorts_one_shot_states.rs           |    2 +-
 .../utxo/cohorts_sent_states.rs               |    2 +-
 .../parser}/states/cohorts_states/utxo/mod.rs |    0
 .../utxo/split_by_utxo_cohort.rs              |    0
 {parser/src => src/parser}/states/counters.rs |    0
 .../parser}/states/date_data_vec.rs           |    0
 {parser/src => src/parser}/states/mod.rs      |   25 +-
 .../server}/api/handlers/dataset.rs           |   70 +-
 .../server}/api/handlers/extension.rs         |    0
 .../server}/api/handlers/fallback.rs          |    2 +-
 .../src => src/server}/api/handlers/mod.rs    |    0
 .../server}/api/handlers/response.rs          |    8 +-
 {server/src => src/server}/api/mod.rs         |   10 +-
 .../src => src/server}/api/structs/chunk.rs   |    0
 .../src => src/server}/api/structs/kind.rs    |    0
 {server/src => src/server}/api/structs/mod.rs |    0
 .../src => src/server}/api/structs/paths.rs   |    2 +-
 src/server/api/structs/routes.rs              |  159 ++
 {server/src => src/server}/header_map.rs      |    4 +-
 server/src/main.rs => src/server/mod.rs       |   34 +-
 .../server}/website/handlers/_minify.rs       |    0
 .../server}/website/handlers/file.rs          |   95 +-
 .../server}/website/handlers/minify.rs        |    0
 .../server}/website/handlers/mod.rs           |    0
 {server/src => src/server}/website/mod.rs     |    2 +-
 {parser/src => src}/structs/address.rs        |    4 +-
 {parser/src => src}/structs/address_data.rs   |    0
 .../src => src}/structs/address_liquidity.rs  |    0
 .../structs/address_realized_data.rs          |    0
 {parser/src => src}/structs/address_size.rs   |    0
 {parser/src => src}/structs/address_split.rs  |    0
 {parser/src => src}/structs/address_type.rs   |    0
 {parser/src => src}/structs/amount.rs         |    0
 {parser/src => src}/structs/any_map.rs        |   15 +-
 {parser/src => src}/structs/array.rs          |    0
 {parser/src => src}/structs/bi_map.rs         |    6 +-
 {parser/src => src}/structs/block_data.rs     |    0
 {parser/src => src}/structs/block_path.rs     |    0
 {parser/src => src}/structs/config.rs         |  168 +-
 {parser/src => src}/structs/counter.rs        |    0
 {parser/src => src}/structs/date.rs           |   16 +-
 {parser/src => src}/structs/date_data.rs      |    0
 {parser/src => src}/structs/date_map.rs       |    6 +-
 .../src => src}/structs/date_map_chunk_id.rs  |    4 +-
 .../src => src}/structs/empty_address_data.rs |    0
 {parser/src => src}/structs/epoch.rs          |    0
 {parser/src => src}/structs/exit.rs           |    6 +-
 {parser/src => src}/structs/generic_map.rs    |   72 +-
 {parser/src => src}/structs/height.rs         |   12 +-
 {parser/src => src}/structs/height_map.rs     |    4 +-
 .../structs/height_map_chunk_id.rs            |    4 +-
 {parser/src => src}/structs/liquidity.rs      |    0
 src/structs/map_path.rs                       |   24 +
 {parser/src => src}/structs/map_value.rs      |    0
 {parser/src => src}/structs/mod.rs            |    2 +
 {parser/src => src}/structs/ohlc.rs           |    0
 .../src => src}/structs/partial_txout_data.rs |    0
 {parser/src => src}/structs/price.rs          |    0
 {parser/src => src}/structs/ram.rs            |    0
 {parser/src => src}/structs/sent_data.rs      |    0
 .../structs/serialized_btreemap.rs            |    2 +-
 {parser/src => src}/structs/serialized_vec.rs |    2 +-
 {parser/src => src}/structs/timestamp.rs      |    6 +-
 {parser/src => src}/structs/tx_data.rs        |    0
 {parser/src => src}/structs/txout_index.rs    |    0
 {parser/src => src}/utils/consts.rs           |    0
 {parser/src => src}/utils/flamegraph.rs       |    9 +-
 src/utils/log.rs                              |   82 +
 {parser/src => src}/utils/lossy.rs            |    0
 {parser/src => src}/utils/mod.rs              |    1 -
 {parser/src => src}/utils/percentile.rs       |    0
 {parser/src => src}/utils/retry.rs            |    0
 {parser/src => src}/utils/rpc.rs              |   10 +-
 {parser/src => src}/utils/time.rs             |    4 +-
 .../fonts/satoshi/2024-09/font.var.woff2      |  Bin
 .../website}/assets/fonts/satoshi/FFL.txt     |    0
 .../assets/pdfs/block/2022-report.pdf         |  Bin
 .../pdfs/braiins/building-bitcoin-in-rust.pdf |  Bin
 .../pdfs/glassnode/cointime-economics.pdf     |  Bin
 .../assets/pdfs/multi-author/bcap_v1.0.pdf    |  Bin
 ...-bitcoin-adoption-in-the-united-states.pdf |  Bin
 .../protection-under-first-amendment.pdf      |  Bin
 .../pdfs/satoshi-nakamoto/whitepaper.pdf      |  Bin
 .../2021-bitcoin-clean-energy-initiative.pdf  |  Bin
 .../2024-11-20_09-41-25/apple-icon-180.png    |  Bin
 .../apple-splash-1125-2436.jpg                |  Bin
 .../apple-splash-1136-640.jpg                 |  Bin
 .../apple-splash-1170-2532.jpg                |  Bin
 .../apple-splash-1179-2556.jpg                |  Bin
 .../apple-splash-1242-2208.jpg                |  Bin
 .../apple-splash-1242-2688.jpg                |  Bin
 .../apple-splash-1284-2778.jpg                |  Bin
 .../apple-splash-1290-2796.jpg                |  Bin
 .../apple-splash-1334-750.jpg                 |  Bin
 .../apple-splash-1488-2266.jpg                |  Bin
 .../apple-splash-1536-2048.jpg                |  Bin
 .../apple-splash-1620-2160.jpg                |  Bin
 .../apple-splash-1640-2360.jpg                |  Bin
 .../apple-splash-1668-2224.jpg                |  Bin
 .../apple-splash-1668-2388.jpg                |  Bin
 .../apple-splash-1792-828.jpg                 |  Bin
 .../apple-splash-2048-1536.jpg                |  Bin
 .../apple-splash-2048-2732.jpg                |  Bin
 .../apple-splash-2160-1620.jpg                |  Bin
 .../apple-splash-2208-1242.jpg                |  Bin
 .../apple-splash-2224-1668.jpg                |  Bin
 .../apple-splash-2266-1488.jpg                |  Bin
 .../apple-splash-2360-1640.jpg                |  Bin
 .../apple-splash-2388-1668.jpg                |  Bin
 .../apple-splash-2436-1125.jpg                |  Bin
 .../apple-splash-2532-1170.jpg                |  Bin
 .../apple-splash-2556-1179.jpg                |  Bin
 .../apple-splash-2688-1242.jpg                |  Bin
 .../apple-splash-2732-2048.jpg                |  Bin
 .../apple-splash-2778-1284.jpg                |  Bin
 .../apple-splash-2796-1290.jpg                |  Bin
 .../apple-splash-640-1136.jpg                 |  Bin
 .../apple-splash-750-1334.jpg                 |  Bin
 .../apple-splash-828-1792.jpg                 |  Bin
 .../pwa/2024-11-20_09-41-25/favicon-196.png   |  Bin
 .../assets/pwa/2024-11-20_09-41-25/index.html |    0
 .../manifest-icon-192.maskable.png            |  Bin
 .../manifest-icon-512.maskable.png            |  Bin
 .../website}/assets/pwa/index.html            |    0
 {website => src/website}/generate-icons.sh    |    0
 {website => src/website}/index.html           |   27 +-
 {website => src/website}/jsconfig.json        |    0
 {website => src/website}/manifest.webmanifest |    0
 .../website}/misc/tailwindTo550.js            |    0
 .../website}/packages/lean-qr/README.md       |    0
 .../packages/lean-qr/v2.3.4/script.js         |    0
 .../packages/lean-qr/v2.3.4/types.d.ts        |    0
 .../packages/lightweight-charts/NOTICE.md     |    0
 .../packages/lightweight-charts/README.md     |    0
 .../packages/lightweight-charts/types.d.ts    |    0
 .../lightweight-charts/v4.2.0/script.js       |    0
 .../lightweight-charts/v4.2.0/types.d.ts      |    0
 .../packages/lightweight-charts/wrapper.js    |    0
 .../solid-signals/2024-11-02/script.js        |    0
 .../2024-11-02/types/core/constants.d.ts      |    0
 .../2024-11-02/types/core/core.d.ts           |    0
 .../2024-11-02/types/core/effect.d.ts         |    0
 .../2024-11-02/types/core/error.d.ts          |    0
 .../2024-11-02/types/core/flags.d.ts          |    0
 .../2024-11-02/types/core/index.d.ts          |    0
 .../2024-11-02/types/core/owner.d.ts          |    0
 .../2024-11-02/types/core/scheduler.d.ts      |    0
 .../solid-signals/2024-11-02/types/index.d.ts |    0
 .../solid-signals/2024-11-02/types/map.d.ts   |    0
 .../2024-11-02/types/signals.d.ts             |    0
 .../2024-11-02/types/store/index.d.ts         |    0
 .../2024-11-02/types/store/store.d.ts         |    0
 .../solid-signals/2024-11-02/types/utils.d.ts |    0
 .../solid-signals/2024-11-08/script.js        |    0
 .../2024-11-08/types/core/constants.d.ts      |    0
 .../2024-11-08/types/core/core.d.ts           |    0
 .../2024-11-08/types/core/effect.d.ts         |    0
 .../2024-11-08/types/core/error.d.ts          |    0
 .../2024-11-08/types/core/flags.d.ts          |    0
 .../2024-11-08/types/core/index.d.ts          |    0
 .../2024-11-08/types/core/owner.d.ts          |    0
 .../2024-11-08/types/core/scheduler.d.ts      |    0
 .../solid-signals/2024-11-08/types/index.d.ts |    0
 .../solid-signals/2024-11-08/types/map.d.ts   |    0
 .../2024-11-08/types/signals.d.ts             |    0
 .../2024-11-08/types/store/index.d.ts         |    0
 .../2024-11-08/types/store/store.d.ts         |    0
 .../solid-signals/2024-11-08/types/utils.d.ts |    0
 .../website}/packages/solid-signals/README.md |    0
 .../packages/solid-signals/types.d.ts         |    0
 .../packages/solid-signals/wrapper.js         |    0
 .../website}/packages/ufuzzy/README.md        |    0
 .../packages/ufuzzy/v1.0.14/script.js         |    0
 .../packages/ufuzzy/v1.0.14/types.d.ts        |    0
 {website => src/website}/robots.txt           |    0
 {website => src/website}/scripts/chart.js     |    0
 .../website}/scripts/live-price.js            |    0
 {website => src/website}/scripts/main.js      |    8 +-
 .../website}/scripts/moscow-time.js           |    0
 {website => src/website}/scripts/options.js   |    0
 .../website}/scripts/service-worker.js        |    0
 .../website}/scripts/simulation.js            |    0
 .../website}/scripts/types/self.d.ts          |    0
 {website => src/website}/styles/chart.css     |    0
 .../website}/styles/live-price.css            |    0
 .../website}/styles/moscow-time.css           |    0
 .../website}/styles/simulation.css            |    0
 {website => src/website}/tsconfig.json        |    0
 315 files changed, 1931 insertions(+), 4144 deletions(-)
 rename server/Cargo.lock => Cargo.lock (90%)
 create mode 100644 Cargo.toml
 create mode 100644 crates/biter/CHANGELOG.md
 rename {biter => crates/biter}/Cargo.lock (85%)
 rename {biter => crates/biter}/Cargo.toml (65%)
 rename {biter => crates/biter}/LICENSE.md (100%)
 rename {biter => crates/biter}/README.md (71%)
 rename {biter => crates/biter}/src/blk_index_to_blk_recap.rs (73%)
 rename {biter => crates/biter}/src/blk_metadata.rs (100%)
 rename {biter => crates/biter}/src/blk_metadata_and_block.rs (100%)
 rename {biter => crates/biter}/src/blk_recap.rs (100%)
 rename {biter => crates/biter}/src/lib.rs (96%)
 rename {biter => crates/biter}/src/main.rs (54%)
 rename {biter => crates/biter}/src/utils.rs (79%)
 rename {iterable => crates/iterable}/Cargo.lock (100%)
 rename {iterable => crates/iterable}/Cargo.toml (100%)
 rename {iterable => crates/iterable}/README.md (100%)
 rename {iterable => crates/iterable}/src/lib.rs (100%)
 rename {iterable => crates/iterable}/struct_iterable_derive/Cargo.toml (100%)
 rename {iterable => crates/iterable}/struct_iterable_derive/README.md (100%)
 rename {iterable => crates/iterable}/struct_iterable_derive/src/lib.rs (100%)
 rename {iterable => crates/iterable}/struct_iterable_internal/Cargo.toml (100%)
 rename {iterable => crates/iterable}/struct_iterable_internal/README.md (100%)
 rename {iterable => crates/iterable}/struct_iterable_internal/src/lib.rs (100%)
 delete mode 100644 parser/Cargo.lock
 delete mode 100644 parser/Cargo.toml
 delete mode 100755 parser/reset.sh
 delete mode 100755 parser/samply.sh
 delete mode 100644 parser/src/databases/_trait.rs
 delete mode 100644 parser/src/io/consts.rs
 delete mode 100644 parser/src/lib.rs
 delete mode 100644 parser/src/main.rs
 delete mode 100644 parser/src/states/_trait.rs
 delete mode 100644 parser/src/utils/log.rs
 rename parser/run.sh => run.sh (89%)
 delete mode 100644 server/Cargo.toml
 delete mode 100755 server/restart-cloudflared.sh
 delete mode 100755 server/run.sh
 delete mode 100644 server/src/api/structs/routes.rs
 rename {parser/src => src}/io/binary.rs (100%)
 rename {parser/src => src}/io/json.rs (100%)
 rename {parser/src => src}/io/mod.rs (77%)
 rename {parser/src => src}/io/serialization.rs (89%)
 create mode 100644 src/main.rs
 rename {parser/src => src/parser}/actions/export.rs (52%)
 rename {parser/src => src/parser}/actions/iter_blocks.rs (78%)
 rename {parser/src => src/parser}/actions/min_height.rs (84%)
 rename {parser/src => src/parser}/actions/mod.rs (100%)
 rename {parser/src => src/parser}/actions/parse.rs (98%)
 rename {parser/src => src/parser}/databases/_database.rs (76%)
 create mode 100644 src/parser/databases/_trait.rs
 rename {parser/src => src/parser}/databases/address_index_to_address_data.rs (86%)
 rename {parser/src => src/parser}/databases/address_index_to_empty_address_data.rs (84%)
 rename {parser/src => src/parser}/databases/address_to_address_index.rs (86%)
 rename {parser/src => src/parser}/databases/metadata.rs (94%)
 rename {parser/src => src/parser}/databases/mod.rs (78%)
 rename {parser/src => src/parser}/databases/txid_to_tx_data.rs (87%)
 rename {parser/src => src/parser}/databases/txout_index_to_address_index.rs (85%)
 rename {parser/src => src/parser}/databases/txout_index_to_amount.rs (84%)
 rename {parser/src => src/parser}/datasets/_traits/any_dataset.rs (99%)
 rename {parser/src => src/parser}/datasets/_traits/any_dataset_group.rs (100%)
 rename {parser/src => src/parser}/datasets/_traits/any_datasets.rs (100%)
 rename {parser/src => src/parser}/datasets/_traits/min_initial_state.rs (100%)
 rename {parser/src => src/parser}/datasets/_traits/mod.rs (100%)
 rename {parser/src => src/parser}/datasets/address/all_metadata.rs (88%)
 rename {parser/src => src/parser}/datasets/address/cohort.rs (96%)
 rename {parser/src => src/parser}/datasets/address/cohort_metadata.rs (87%)
 rename {parser/src => src/parser}/datasets/address/mod.rs (93%)
 rename {parser/src => src/parser}/datasets/block_metadata.rs (87%)
 rename {parser/src => src/parser}/datasets/coindays.rs (87%)
 rename {parser/src => src/parser}/datasets/cointime.rs (97%)
 rename {parser/src => src/parser}/datasets/constant.rs (90%)
 rename {parser/src => src/parser}/datasets/date_metadata.rs (88%)
 rename {parser/src => src/parser}/datasets/mining.rs (99%)
 rename {parser/src => src/parser}/datasets/mod.rs (75%)
 rename {parser/src => src/parser}/datasets/price.rs (93%)
 rename {parser/src => src/parser}/datasets/subs/capitalization.rs (90%)
 rename {parser/src => src/parser}/datasets/subs/input.rs (87%)
 rename {parser/src => src/parser}/datasets/subs/mod.rs (95%)
 rename {parser/src => src/parser}/datasets/subs/output.rs (100%)
 rename {parser/src => src/parser}/datasets/subs/price_paid.rs (96%)
 rename {parser/src => src/parser}/datasets/subs/ratio.rs (93%)
 rename {parser/src => src/parser}/datasets/subs/realized.rs (97%)
 rename {parser/src => src/parser}/datasets/subs/recap.rs (96%)
 rename {parser/src => src/parser}/datasets/subs/supply.rs (90%)
 rename {parser/src => src/parser}/datasets/subs/unrealized.rs (95%)
 rename {parser/src => src/parser}/datasets/subs/utxo.rs (83%)
 rename {parser/src => src/parser}/datasets/transaction.rs (97%)
 rename {parser/src => src/parser}/datasets/utxo/dataset.rs (96%)
 rename {parser/src => src/parser}/datasets/utxo/mod.rs (94%)
 create mode 100644 src/parser/mod.rs
 rename {parser/src => src/parser}/price/binance.rs (92%)
 rename {parser/src => src/parser}/price/kibo.rs (94%)
 rename {parser/src => src/parser}/price/kraken.rs (97%)
 rename {parser/src => src/parser}/price/mod.rs (100%)
 create mode 100644 src/parser/states/_trait.rs
 rename {parser/src => src/parser}/states/cohorts_states/address/cohort_durable_states.rs (97%)
 rename {parser/src => src/parser}/states/cohorts_states/address/cohort_id.rs (100%)
 rename {parser/src => src/parser}/states/cohorts_states/address/cohorts_durable_states.rs (99%)
 rename {parser/src => src/parser}/states/cohorts_states/address/cohorts_input_states.rs (97%)
 rename {parser/src => src/parser}/states/cohorts_states/address/cohorts_one_shot_states.rs (81%)
 rename {parser/src => src/parser}/states/cohorts_states/address/cohorts_output_states.rs (97%)
 rename {parser/src => src/parser}/states/cohorts_states/address/cohorts_realized_states.rs (98%)
 rename {parser/src => src/parser}/states/cohorts_states/address/mod.rs (100%)
 rename {parser/src => src/parser}/states/cohorts_states/address/split_by_address_cohort.rs (100%)
 rename {parser/src => src/parser}/states/cohorts_states/any/capitalization_state.rs (100%)
 rename {parser/src => src/parser}/states/cohorts_states/any/durable_states.rs (100%)
 rename {parser/src => src/parser}/states/cohorts_states/any/input_state.rs (100%)
 rename {parser/src => src/parser}/states/cohorts_states/any/mod.rs (100%)
 rename {parser/src => src/parser}/states/cohorts_states/any/one_shot_states.rs (100%)
 rename {parser/src => src/parser}/states/cohorts_states/any/output_state.rs (100%)
 rename {parser/src => src/parser}/states/cohorts_states/any/price_paid_state.rs (100%)
 rename {parser/src => src/parser}/states/cohorts_states/any/price_to_value.rs (100%)
 rename {parser/src => src/parser}/states/cohorts_states/any/realized_state.rs (100%)
 rename {parser/src => src/parser}/states/cohorts_states/any/supply_state.rs (100%)
 rename {parser/src => src/parser}/states/cohorts_states/any/unrealized_state.rs (100%)
 rename {parser/src => src/parser}/states/cohorts_states/any/utxo_state.rs (100%)
 rename {parser/src => src/parser}/states/cohorts_states/mod.rs (100%)
 rename {parser/src => src/parser}/states/cohorts_states/utxo/cohort_durable_states.rs (97%)
 rename {parser/src => src/parser}/states/cohorts_states/utxo/cohort_filter.rs (100%)
 rename {parser/src => src/parser}/states/cohorts_states/utxo/cohort_filters.rs (100%)
 rename {parser/src => src/parser}/states/cohorts_states/utxo/cohort_id.rs (100%)
 rename {parser/src => src/parser}/states/cohorts_states/utxo/cohorts_durable_states.rs (99%)
 rename {parser/src => src/parser}/states/cohorts_states/utxo/cohorts_one_shot_states.rs (81%)
 rename {parser/src => src/parser}/states/cohorts_states/utxo/cohorts_sent_states.rs (98%)
 rename {parser/src => src/parser}/states/cohorts_states/utxo/mod.rs (100%)
 rename {parser/src => src/parser}/states/cohorts_states/utxo/split_by_utxo_cohort.rs (100%)
 rename {parser/src => src/parser}/states/counters.rs (100%)
 rename {parser/src => src/parser}/states/date_data_vec.rs (100%)
 rename {parser/src => src/parser}/states/mod.rs (58%)
 rename {server/src => src/server}/api/handlers/dataset.rs (80%)
 rename {server/src => src/server}/api/handlers/extension.rs (100%)
 rename {server/src => src/server}/api/handlers/fallback.rs (94%)
 rename {server/src => src/server}/api/handlers/mod.rs (100%)
 rename {server/src => src/server}/api/handlers/response.rs (96%)
 rename {server/src => src/server}/api/mod.rs (50%)
 rename {server/src => src/server}/api/structs/chunk.rs (100%)
 rename {server/src => src/server}/api/structs/kind.rs (100%)
 rename {server/src => src/server}/api/structs/mod.rs (100%)
 rename {server/src => src/server}/api/structs/paths.rs (88%)
 create mode 100644 src/server/api/structs/routes.rs
 rename {server/src => src/server}/header_map.rs (98%)
 rename server/src/main.rs => src/server/mod.rs (55%)
 rename {server/src => src/server}/website/handlers/_minify.rs (100%)
 rename {server/src => src/server}/website/handlers/file.rs (53%)
 rename {server/src => src/server}/website/handlers/minify.rs (100%)
 rename {server/src => src/server}/website/handlers/mod.rs (100%)
 rename {server/src => src/server}/website/mod.rs (94%)
 rename {parser/src => src}/structs/address.rs (97%)
 rename {parser/src => src}/structs/address_data.rs (100%)
 rename {parser/src => src}/structs/address_liquidity.rs (100%)
 rename {parser/src => src}/structs/address_realized_data.rs (100%)
 rename {parser/src => src}/structs/address_size.rs (100%)
 rename {parser/src => src}/structs/address_split.rs (100%)
 rename {parser/src => src}/structs/address_type.rs (100%)
 rename {parser/src => src}/structs/amount.rs (100%)
 rename {parser/src => src}/structs/any_map.rs (53%)
 rename {parser/src => src}/structs/array.rs (100%)
 rename {parser/src => src}/structs/bi_map.rs (98%)
 rename {parser/src => src}/structs/block_data.rs (100%)
 rename {parser/src => src}/structs/block_path.rs (100%)
 rename {parser/src => src}/structs/config.rs (51%)
 rename {parser/src => src}/structs/counter.rs (100%)
 rename {parser/src => src}/structs/date.rs (92%)
 rename {parser/src => src}/structs/date_data.rs (100%)
 rename {parser/src => src}/structs/date_map.rs (94%)
 rename {parser/src => src}/structs/date_map_chunk_id.rs (95%)
 rename {parser/src => src}/structs/empty_address_data.rs (100%)
 rename {parser/src => src}/structs/epoch.rs (100%)
 rename {parser/src => src}/structs/exit.rs (92%)
 rename {parser/src => src}/structs/generic_map.rs (95%)
 rename {parser/src => src}/structs/height.rs (91%)
 rename {parser/src => src}/structs/height_map.rs (97%)
 rename {parser/src => src}/structs/height_map_chunk_id.rs (94%)
 rename {parser/src => src}/structs/liquidity.rs (100%)
 create mode 100644 src/structs/map_path.rs
 rename {parser/src => src}/structs/map_value.rs (100%)
 rename {parser/src => src}/structs/mod.rs (97%)
 rename {parser/src => src}/structs/ohlc.rs (100%)
 rename {parser/src => src}/structs/partial_txout_data.rs (100%)
 rename {parser/src => src}/structs/price.rs (100%)
 rename {parser/src => src}/structs/ram.rs (100%)
 rename {parser/src => src}/structs/sent_data.rs (100%)
 rename {parser/src => src}/structs/serialized_btreemap.rs (98%)
 rename {parser/src => src}/structs/serialized_vec.rs (98%)
 rename {parser/src => src}/structs/timestamp.rs (91%)
 rename {parser/src => src}/structs/tx_data.rs (100%)
 rename {parser/src => src}/structs/txout_index.rs (100%)
 rename {parser/src => src}/utils/consts.rs (100%)
 rename {parser/src => src}/utils/flamegraph.rs (84%)
 create mode 100644 src/utils/log.rs
 rename {parser/src => src}/utils/lossy.rs (100%)
 rename {parser/src => src}/utils/mod.rs (93%)
 rename {parser/src => src}/utils/percentile.rs (100%)
 rename {parser/src => src}/utils/retry.rs (100%)
 rename {parser/src => src}/utils/rpc.rs (61%)
 rename {parser/src => src}/utils/time.rs (66%)
 rename {website => src/website}/assets/fonts/satoshi/2024-09/font.var.woff2 (100%)
 rename {website => src/website}/assets/fonts/satoshi/FFL.txt (100%)
 rename {website => src/website}/assets/pdfs/block/2022-report.pdf (100%)
 rename {website => src/website}/assets/pdfs/braiins/building-bitcoin-in-rust.pdf (100%)
 rename {website => src/website}/assets/pdfs/glassnode/cointime-economics.pdf (100%)
 rename {website => src/website}/assets/pdfs/multi-author/bcap_v1.0.pdf (100%)
 rename {website => src/website}/assets/pdfs/nakamoto-project/understanding-bitcoin-adoption-in-the-united-states.pdf (100%)
 rename {website => src/website}/assets/pdfs/nydig/protection-under-first-amendment.pdf (100%)
 rename {website => src/website}/assets/pdfs/satoshi-nakamoto/whitepaper.pdf (100%)
 rename {website => src/website}/assets/pdfs/square/2021-bitcoin-clean-energy-initiative.pdf (100%)
 rename {website => src/website}/assets/pwa/2024-11-20_09-41-25/apple-icon-180.png (100%)
 rename {website => src/website}/assets/pwa/2024-11-20_09-41-25/apple-splash-1125-2436.jpg (100%)
 rename {website => src/website}/assets/pwa/2024-11-20_09-41-25/apple-splash-1136-640.jpg (100%)
 rename {website => src/website}/assets/pwa/2024-11-20_09-41-25/apple-splash-1170-2532.jpg (100%)
 rename {website => src/website}/assets/pwa/2024-11-20_09-41-25/apple-splash-1179-2556.jpg (100%)
 rename {website => src/website}/assets/pwa/2024-11-20_09-41-25/apple-splash-1242-2208.jpg (100%)
 rename {website => src/website}/assets/pwa/2024-11-20_09-41-25/apple-splash-1242-2688.jpg (100%)
 rename {website => src/website}/assets/pwa/2024-11-20_09-41-25/apple-splash-1284-2778.jpg (100%)
 rename {website => src/website}/assets/pwa/2024-11-20_09-41-25/apple-splash-1290-2796.jpg (100%)
 rename {website => src/website}/assets/pwa/2024-11-20_09-41-25/apple-splash-1334-750.jpg (100%)
 rename {website => src/website}/assets/pwa/2024-11-20_09-41-25/apple-splash-1488-2266.jpg (100%)
 rename {website => src/website}/assets/pwa/2024-11-20_09-41-25/apple-splash-1536-2048.jpg (100%)
 rename {website => src/website}/assets/pwa/2024-11-20_09-41-25/apple-splash-1620-2160.jpg (100%)
 rename {website => src/website}/assets/pwa/2024-11-20_09-41-25/apple-splash-1640-2360.jpg (100%)
 rename {website => src/website}/assets/pwa/2024-11-20_09-41-25/apple-splash-1668-2224.jpg (100%)
 rename {website => src/website}/assets/pwa/2024-11-20_09-41-25/apple-splash-1668-2388.jpg (100%)
 rename {website => src/website}/assets/pwa/2024-11-20_09-41-25/apple-splash-1792-828.jpg (100%)
 rename {website => src/website}/assets/pwa/2024-11-20_09-41-25/apple-splash-2048-1536.jpg (100%)
 rename {website => src/website}/assets/pwa/2024-11-20_09-41-25/apple-splash-2048-2732.jpg (100%)
 rename {website => src/website}/assets/pwa/2024-11-20_09-41-25/apple-splash-2160-1620.jpg (100%)
 rename {website => src/website}/assets/pwa/2024-11-20_09-41-25/apple-splash-2208-1242.jpg (100%)
 rename {website => src/website}/assets/pwa/2024-11-20_09-41-25/apple-splash-2224-1668.jpg (100%)
 rename {website => src/website}/assets/pwa/2024-11-20_09-41-25/apple-splash-2266-1488.jpg (100%)
 rename {website => src/website}/assets/pwa/2024-11-20_09-41-25/apple-splash-2360-1640.jpg (100%)
 rename {website => src/website}/assets/pwa/2024-11-20_09-41-25/apple-splash-2388-1668.jpg (100%)
 rename {website => src/website}/assets/pwa/2024-11-20_09-41-25/apple-splash-2436-1125.jpg (100%)
 rename {website => src/website}/assets/pwa/2024-11-20_09-41-25/apple-splash-2532-1170.jpg (100%)
 rename {website => src/website}/assets/pwa/2024-11-20_09-41-25/apple-splash-2556-1179.jpg (100%)
 rename {website => src/website}/assets/pwa/2024-11-20_09-41-25/apple-splash-2688-1242.jpg (100%)
 rename {website => src/website}/assets/pwa/2024-11-20_09-41-25/apple-splash-2732-2048.jpg (100%)
 rename {website => src/website}/assets/pwa/2024-11-20_09-41-25/apple-splash-2778-1284.jpg (100%)
 rename {website => src/website}/assets/pwa/2024-11-20_09-41-25/apple-splash-2796-1290.jpg (100%)
 rename {website => src/website}/assets/pwa/2024-11-20_09-41-25/apple-splash-640-1136.jpg (100%)
 rename {website => src/website}/assets/pwa/2024-11-20_09-41-25/apple-splash-750-1334.jpg (100%)
 rename {website => src/website}/assets/pwa/2024-11-20_09-41-25/apple-splash-828-1792.jpg (100%)
 rename {website => src/website}/assets/pwa/2024-11-20_09-41-25/favicon-196.png (100%)
 rename {website => src/website}/assets/pwa/2024-11-20_09-41-25/index.html (100%)
 rename {website => src/website}/assets/pwa/2024-11-20_09-41-25/manifest-icon-192.maskable.png (100%)
 rename {website => src/website}/assets/pwa/2024-11-20_09-41-25/manifest-icon-512.maskable.png (100%)
 rename {website => src/website}/assets/pwa/index.html (100%)
 rename {website => src/website}/generate-icons.sh (100%)
 rename {website => src/website}/index.html (99%)
 rename {website => src/website}/jsconfig.json (100%)
 rename {website => src/website}/manifest.webmanifest (100%)
 rename {website => src/website}/misc/tailwindTo550.js (100%)
 rename {website => src/website}/packages/lean-qr/README.md (100%)
 rename {website => src/website}/packages/lean-qr/v2.3.4/script.js (100%)
 rename {website => src/website}/packages/lean-qr/v2.3.4/types.d.ts (100%)
 rename {website => src/website}/packages/lightweight-charts/NOTICE.md (100%)
 rename {website => src/website}/packages/lightweight-charts/README.md (100%)
 rename {website => src/website}/packages/lightweight-charts/types.d.ts (100%)
 rename {website => src/website}/packages/lightweight-charts/v4.2.0/script.js (100%)
 rename {website => src/website}/packages/lightweight-charts/v4.2.0/types.d.ts (100%)
 rename {website => src/website}/packages/lightweight-charts/wrapper.js (100%)
 rename {website => src/website}/packages/solid-signals/2024-11-02/script.js (100%)
 rename {website => src/website}/packages/solid-signals/2024-11-02/types/core/constants.d.ts (100%)
 rename {website => src/website}/packages/solid-signals/2024-11-02/types/core/core.d.ts (100%)
 rename {website => src/website}/packages/solid-signals/2024-11-02/types/core/effect.d.ts (100%)
 rename {website => src/website}/packages/solid-signals/2024-11-02/types/core/error.d.ts (100%)
 rename {website => src/website}/packages/solid-signals/2024-11-02/types/core/flags.d.ts (100%)
 rename {website => src/website}/packages/solid-signals/2024-11-02/types/core/index.d.ts (100%)
 rename {website => src/website}/packages/solid-signals/2024-11-02/types/core/owner.d.ts (100%)
 rename {website => src/website}/packages/solid-signals/2024-11-02/types/core/scheduler.d.ts (100%)
 rename {website => src/website}/packages/solid-signals/2024-11-02/types/index.d.ts (100%)
 rename {website => src/website}/packages/solid-signals/2024-11-02/types/map.d.ts (100%)
 rename {website => src/website}/packages/solid-signals/2024-11-02/types/signals.d.ts (100%)
 rename {website => src/website}/packages/solid-signals/2024-11-02/types/store/index.d.ts (100%)
 rename {website => src/website}/packages/solid-signals/2024-11-02/types/store/store.d.ts (100%)
 rename {website => src/website}/packages/solid-signals/2024-11-02/types/utils.d.ts (100%)
 rename {website => src/website}/packages/solid-signals/2024-11-08/script.js (100%)
 rename {website => src/website}/packages/solid-signals/2024-11-08/types/core/constants.d.ts (100%)
 rename {website => src/website}/packages/solid-signals/2024-11-08/types/core/core.d.ts (100%)
 rename {website => src/website}/packages/solid-signals/2024-11-08/types/core/effect.d.ts (100%)
 rename {website => src/website}/packages/solid-signals/2024-11-08/types/core/error.d.ts (100%)
 rename {website => src/website}/packages/solid-signals/2024-11-08/types/core/flags.d.ts (100%)
 rename {website => src/website}/packages/solid-signals/2024-11-08/types/core/index.d.ts (100%)
 rename {website => src/website}/packages/solid-signals/2024-11-08/types/core/owner.d.ts (100%)
 rename {website => src/website}/packages/solid-signals/2024-11-08/types/core/scheduler.d.ts (100%)
 rename {website => src/website}/packages/solid-signals/2024-11-08/types/index.d.ts (100%)
 rename {website => src/website}/packages/solid-signals/2024-11-08/types/map.d.ts (100%)
 rename {website => src/website}/packages/solid-signals/2024-11-08/types/signals.d.ts (100%)
 rename {website => src/website}/packages/solid-signals/2024-11-08/types/store/index.d.ts (100%)
 rename {website => src/website}/packages/solid-signals/2024-11-08/types/store/store.d.ts (100%)
 rename {website => src/website}/packages/solid-signals/2024-11-08/types/utils.d.ts (100%)
 rename {website => src/website}/packages/solid-signals/README.md (100%)
 rename {website => src/website}/packages/solid-signals/types.d.ts (100%)
 rename {website => src/website}/packages/solid-signals/wrapper.js (100%)
 rename {website => src/website}/packages/ufuzzy/README.md (100%)
 rename {website => src/website}/packages/ufuzzy/v1.0.14/script.js (100%)
 rename {website => src/website}/packages/ufuzzy/v1.0.14/types.d.ts (100%)
 rename {website => src/website}/robots.txt (100%)
 rename {website => src/website}/scripts/chart.js (100%)
 rename {website => src/website}/scripts/live-price.js (100%)
 rename {website => src/website}/scripts/main.js (99%)
 rename {website => src/website}/scripts/moscow-time.js (100%)
 rename {website => src/website}/scripts/options.js (100%)
 rename {website => src/website}/scripts/service-worker.js (100%)
 rename {website => src/website}/scripts/simulation.js (100%)
 rename {website => src/website}/scripts/types/self.d.ts (100%)
 rename {website => src/website}/styles/chart.css (100%)
 rename {website => src/website}/styles/live-price.css (100%)
 rename {website => src/website}/styles/moscow-time.css (100%)
 rename {website => src/website}/styles/simulation.css (100%)
 rename {website => src/website}/tsconfig.json (100%)

diff --git a/.gitignore b/.gitignore
index af98ef201..da713f859 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,25 +1,9 @@
 # Mac OS
 .DS_Store
 
-# To do
-/charts
-TODO.md
-
 # Builds
-dist
 target
 
-# I/O
-in
-out
-.log
-/datasets
-/datasets2
-/price
-*..*
-/txout_*
-/db
-
 # Sync
 .stfolder
 
@@ -29,16 +13,10 @@ out
 # Ignored
 ignore
 
-# Scripts
-/start-node.sh
-
 # Editors
 .vscode
 .zed
 
-# Configs
-config.toml
-
 # Flamegraph
 flamegraph/
 flamegraph.svg
@@ -53,7 +31,7 @@ snapshots*/
 docker/kibo
 
 # Types
-website/scripts/types/paths.d.ts
+paths.d.ts
 
-# Misc
-OPENSATS.md
+# Git
+.git*
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3f703c65c..97b4a75e0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,13 +1,20 @@
-# Changelog
-
 <!--
-## v. 0.X.Y | WIP
-![Image of the kibō Web App version 0.X.Y](./assets/v0.X.Y.jpg)
+# v0.X.Y | WIP
+![Image of the kibō Web App version 0.X.Y](https://github.com/kibo-money/kibo/blob/main/assets/v0.X.Y.jpg)
 -->
 
-## v. 0.5.0 | [873199](https://mempool.space/block/0000000000000000000270925aa6a565be92e13164565a3f7994ca1966e48050) - 2024/12/04
+# v0.6.0 | WIP
 
-![Image of the kibō Web App version 0.5.0](./assets/v0.5.0.jpg)
+- Merged parser and server crates into a single project (and thus executable)
+- Started using `log` and `env_logger` crates
+- Improved logs
+- Added `--server BOOL` and `--parser BOOL` parameters (both are true by default)
+- Automated databases defragmention (and removed parameter)
+- Fixed input being unfocused right after being focused in Brave browser
+
+# [v0.5.0](https://github.com/kibo-money/kibo/tree/eea56d394bf92c62c81da8b78b8c47ea730683f5) | [873199](https://mempool.space/block/0000000000000000000270925aa6a565be92e13164565a3f7994ca1966e48050) - 2024/12/04
+
+![Image of the kibō Web App version 0.5.0](https://github.com/kibo-money/kibo/blob/main/assets/v0.5.0.jpg)
 
 ## Datasets
 
@@ -72,15 +79,15 @@
 
 - Moved back to this repo
 
-## v. 0.4.0 | [861950](https://mempool.space/block/00000000000000000000530d0e30ccf7deeace122dcc99f2668a06c6dad83629) - 2024/09/19
+# [v0.4.0](https://github.com/kibo-money/kibo/tree/a64c544815d9ef785e2fc1323582f774f16b9200) | [861950](https://mempool.space/block/00000000000000000000530d0e30ccf7deeace122dcc99f2668a06c6dad83629) - 2024/09/19
 
-![Image of the kibō Web App version 0.4.0](./assets/v0.4.0.jpg)
+![Image of the kibō Web App version 0.4.0](https://github.com/kibo-money/kibo/blob/main/assets/v0.4.0.jpg)
 
-### Brand
+## Brand
 
 - **Satonomics** is now **kibō** 🎉
 
-### Website
+## Website
 
 - Complete redesign of the website
 - Rewrote the whole application and removed `node`/`npm`/`pnpm` dependencies in favor for pure `HTML`/`CSS`/`Javascript`
@@ -88,7 +95,7 @@
 - Added Trading View attribution link to the settings frame and file in the lightweight charts folder
 - Many other changes
 
-### Parser
+## Parser
 
 - Changed the block iterator from a custom version of [bitcoin-explorer](https://crates.io/crates/bitcoin-explorer) to the homemade [biter](https://crates.io/crates/biter) which allows the parser to run alongside `bitcoind`
 - Added datasets compression thanks to [zstd](https://crates.io/crates/zstd) to reduce disk usage
@@ -103,17 +110,17 @@
 - Various first run fixes
 - Added to `-h` which arguments are saved, which is all of them at the time of writing
 
-### Server
+## Server
 
 - Updated the code to support compressed binaries
 - Added serving of the website
 - Improved `Cache-Control` behavior
 
-## v. 0.3.0 | [853930](https://mempool.space/block/00000000000000000002eb5e9a7950ca2d5d98bd1ed28fc9098aa630d417985d) - 2024/07/26
+# [v0.3.0](https://github.com/kibo-money/kibo/tree/b68b016091c45b071218fba01bac5b76e8eaf18c) | [853930](https://mempool.space/block/00000000000000000002eb5e9a7950ca2d5d98bd1ed28fc9098aa630d417985d) - 2024/07/26
 
-![Image of the Satonomics Web App version 0.3.0](./assets/v0.3.0.jpg)
+![Image of the Satonomics Web App version 0.3.0](https://github.com/kibo-money/kibo/blob/main/assets/v0.3.0.jpg)
 
-### Parser
+## Parser
 
 - Global
   - Improved self-hosting by:
@@ -156,7 +163,7 @@
 - Price
   - Improved error message when price cannot be found
 
-### App
+## App
 
 - General
   - Added chart scroll button for nice animations à la Wicked
@@ -182,17 +189,17 @@
 - Settings
   - Removed the horizontal scroll bar which was unintended
 
-### Server
+## Server
 
 - Run file
   - Only run with a watcher if `cargo watch` is available
   - Removed id_to_path file in favor for only `paths.d.ts` in `app/src/types`
 
-## v. 0.2.0 | [851286](https://mempool.space/block/0000000000000000000281ca7f1bf8c50702bfca168c7af1bdc67c977c1ac8ed) - 2024/07/08
+# [v0.2.0](https://github.com/kibo-money/kibo/tree/248187889283597c5dbb806292297453c25e97b8) | [851286](https://mempool.space/block/0000000000000000000281ca7f1bf8c50702bfca168c7af1bdc67c977c1ac8ed) - 2024/07/08
 
-![Image of the Satonomics Web App version 0.2.0](./assets/v0.2.0.jpg)
+![Image of the Satonomics Web App version 0.2.0](https://github.com/kibo-money/kibo/blob/main/assets/v0.2.0.jpg)
 
-### App
+## App
 
 - General
   - Added the height version of all datasets and many optimizations to make them usable but only available on desktop and tablets for now
@@ -220,24 +227,24 @@
   - Hopefully made scrollbars a little more subtle on WIndows and Linux, can't test
   - Generale style updates
 
-### Parser
+## Parser
 
 - Fixed ulimit only being run in Mac OS instead of whenever the program is detected
 
-## v. 0.1.1 | [849240](https://mempool.space/block/000000000000000000002b8653988655071c07bb5f7181c038f9326bc86db741) - 2024/06/24
+# [v0.1.1](https://github.com/kibo-money/kibo/tree/e55b5195a9de9aea306903c94ed63cb1720fda5f) | [849240](https://mempool.space/block/000000000000000000002b8653988655071c07bb5f7181c038f9326bc86db741) - 2024/06/24
 
-![Image of the Satonomics Web App version 0.1.1](./assets/v0.1.1.jpg)
+![Image of the Satonomics Web App version 0.1.1](https://github.com/kibo-money/kibo/blob/main/assets/v0.1.1.jpg)
 
-### Parser
+## Parser
 
 - Fixed overflow in `Price` struct which caused many Realized Caps and Realized Prices to have completely bogus data
 - Fixed Realized Cap computation which was using rounded prices instead normal ones
 
-### Server
+## Server
 
 - Added the chunk, date and time of the request to the terminal logs
 
-### App
+## App
 
 - Chart
   - Added double click option on a legend to toggle the visibility of all other series
@@ -270,14 +277,14 @@
 - Misc
   - Removed tracker even though it was a very privacy friendly as it appeared to not be working properly
 
-### Price
+## Price
 
 - Deleted old price datasets and their backups
 
-## v. 0.1.0 | [848642](https://mempool.space/block/000000000000000000020be5761d70751252219a9557f55e91ecdfb86c4e026a) - 2024/06/19
+# [v0.1.0](https://github.com/kibo-money/kibo/tree/a1a576d088c8f83ed32d48753a7611f70a964574) | [848642](https://mempool.space/block/000000000000000000020be5761d70751252219a9557f55e91ecdfb86c4e026a) - 2024/06/19
 
-![Image of the Satonomics Web App version 0.1.0](./assets/v0.1.0.jpg)
+![Image of the Satonomics Web App version 0.1.0](https://github.com/kibo-money/kibo/blob/main/assets/v0.1.0.jpg)
 
-## v. 0.0.X | [835444](https://mempool.space/block/000000000000000000009f93907a0dd83c080d5585cc7ec82c076d45f6d7c872) - 2024/03/20
+# v0.0.1 | [835444](https://mempool.space/block/000000000000000000009f93907a0dd83c080d5585cc7ec82c076d45f6d7c872) - 2024/03/20
 
-![Image of the Satonomics Web App version 0.0.X](./assets/v0.0.X.jpg)
+![Image of the Satonomics Web App version 0.0.X](https://github.com/kibo-money/kibo/blob/main/assets/v0.0.X.jpg)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index a6c0043c3..e23616908 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -3,6 +3,6 @@
 ## Parser
 
 - Avoid floats as much as possible
-  - Use structs like `WAmount` and `Price` for calculations
-  - **Only** use `WAmount.to_btc()` when inserting or computing inside a dataset. It is **very** expensive.
+  - Use structs like `Amount` and `Price` for calculations
+  - **Only** use `Amount.to_btc()` when inserting or computing inside a dataset. It is **very** expensive.
 - No `Arc`, `Rc`, `Mutex` even from third party libraries, they're slower
diff --git a/server/Cargo.lock b/Cargo.lock
similarity index 90%
rename from server/Cargo.lock
rename to Cargo.lock
index 540a98d4f..cd0f6c81f 100644
--- a/server/Cargo.lock
+++ b/Cargo.lock
@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "Inflector"
@@ -94,9 +94,9 @@ dependencies = [
 
 [[package]]
 name = "allocator-api2"
-version = "0.2.18"
+version = "0.2.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f"
+checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
 
 [[package]]
 name = "android-tzdata"
@@ -164,9 +164,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.89"
+version = "1.0.94"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6"
+checksum = "c1fd03a028ef38ba2276dce7e33fcd6369c158a1bca17946c4b1b701891c1ff7"
 
 [[package]]
 name = "arrayvec"
@@ -176,9 +176,9 @@ checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "ast_node"
-version = "1.0.0"
+version = "3.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4d23a6d1d5f18bdbc06d9aa908880e5f49205156ba804751af731c51f5cf81a"
+checksum = "91fb5864e2f5bf9fd9797b94b2dfd1554d4c3092b535008b27d7e15c86675a2f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -188,9 +188,9 @@ dependencies = [
 
 [[package]]
 name = "async-compression"
-version = "0.4.13"
+version = "0.4.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e614738943d3f68c628ae3dbce7c3daffb196665f82f8c8ea6b65de73c79429"
+checksum = "df895a515f70646414f4b45c0b79082783b80552b373a68283012928df56f522"
 dependencies = [
  "brotli",
  "flate2",
@@ -238,9 +238,9 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "axum"
-version = "0.7.7"
+version = "0.7.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "504e3947307ac8326a5437504c517c4b56716c9d98fac0028c2acc7ca47d70ae"
+checksum = "edca88bc138befd0323b20752846e6587272d3b03b0343c8ea28a6f819e6e71f"
 dependencies = [
  "async-trait",
  "axum-core",
@@ -312,8 +312,8 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2c8d66485a3a2ea485c1913c4572ce0256067a5377ac8c75c4960e1cda98605f"
 dependencies = [
- "bitcoin-internals",
- "bitcoin_hashes",
+ "bitcoin-internals 0.3.0",
+ "bitcoin_hashes 0.14.0",
 ]
 
 [[package]]
@@ -351,9 +351,9 @@ checksum = "d965446196e3b7decd44aa7ee49e31d630118f90ef12f97900f262eb915c951d"
 
 [[package]]
 name = "better_scoped_tls"
-version = "0.1.1"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "794edcc9b3fb07bb4aecaa11f093fd45663b4feadb782d68303a2268bc2701de"
+checksum = "50fd297a11c709be8348aec039c8b91de16075d2b2bdaee1bd562c0875993664"
 dependencies = [
  "scoped-tls",
 ]
@@ -378,17 +378,17 @@ dependencies = [
 
 [[package]]
 name = "bitcoin"
-version = "0.32.3"
+version = "0.32.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0032b0e8ead7074cda7fc4f034409607e3f03a6f71d66ade8a307f79b4d99e73"
+checksum = "ce6bc65742dea50536e35ad42492b234c27904a27f0abdcbce605015cb4ea026"
 dependencies = [
  "base58ck",
  "bech32",
- "bitcoin-internals",
- "bitcoin-io",
+ "bitcoin-internals 0.3.0",
+ "bitcoin-io 0.1.2",
  "bitcoin-units",
- "bitcoin_hashes",
- "hex-conservative",
+ "bitcoin_hashes 0.14.0",
+ "hex-conservative 0.2.1",
  "hex_lit",
  "secp256k1",
  "serde",
@@ -403,19 +403,34 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "bitcoin-internals"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b854212e29b96c8f0fe04cab11d57586c8f3257de0d146c76cb3b42b3eb9118"
+
 [[package]]
 name = "bitcoin-io"
 version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "340e09e8399c7bd8912f495af6aa58bea0c9214773417ffaa8f6460f93aaee56"
 
+[[package]]
+name = "bitcoin-io"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26792cd2bf245069a1c5acb06aa7ad7abe1de69b507c90b490bca81e0665d0ee"
+dependencies = [
+ "bitcoin-internals 0.4.0",
+]
+
 [[package]]
 name = "bitcoin-units"
 version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5285c8bcaa25876d07f37e3d30c303f2609179716e11d688f51e8f1fe70063e2"
 dependencies = [
- "bitcoin-internals",
+ "bitcoin-internals 0.3.0",
  "serde",
 ]
 
@@ -425,11 +440,21 @@ version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bb18c03d0db0247e147a21a6faafd5a7eb851c743db062de72018b6b7e8e4d16"
 dependencies = [
- "bitcoin-io",
- "hex-conservative",
+ "bitcoin-io 0.1.2",
+ "hex-conservative 0.2.1",
  "serde",
 ]
 
+[[package]]
+name = "bitcoin_hashes"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e0982261c82a50d89d1a411602afee0498b3e0debe3d36693f0c661352809639"
+dependencies = [
+ "bitcoin-io 0.2.0",
+ "hex-conservative 0.3.0",
+]
+
 [[package]]
 name = "bitcoincore-rpc"
 version = "0.19.0"
@@ -456,7 +481,7 @@ dependencies = [
 
 [[package]]
 name = "biter"
-version = "0.1.1"
+version = "0.2.1"
 dependencies = [
  "bitcoin",
  "bitcoincore-rpc",
@@ -591,9 +616,9 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
 
 [[package]]
 name = "chrono"
-version = "0.4.38"
+version = "0.4.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
+checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",
@@ -606,9 +631,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.20"
+version = "4.5.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8"
+checksum = "3135e7ec2ef7b10c6ed8950f0f792ed96ee093fa088608f1c76e569722700c84"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -616,9 +641,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.20"
+version = "4.5.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54"
+checksum = "30582fc632330df2bd26877bde0c1f4470d57c582bbc070376afcd04d8cb4838"
 dependencies = [
  "anstream",
  "anstyle",
@@ -640,9 +665,9 @@ dependencies = [
 
 [[package]]
 name = "clap_lex"
-version = "0.7.2"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"
+checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6"
 
 [[package]]
 name = "color-eyre"
@@ -695,9 +720,9 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.14"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0"
+checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3"
 dependencies = [
  "libc",
 ]
@@ -894,6 +919,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab"
 dependencies = [
  "log",
+ "regex",
 ]
 
 [[package]]
@@ -902,7 +928,10 @@ version = "0.11.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d"
 dependencies = [
+ "anstream",
+ "anstyle",
  "env_filter",
+ "humantime",
  "log",
 ]
 
@@ -946,9 +975,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 
 [[package]]
 name = "flate2"
-version = "1.0.34"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0"
+checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c"
 dependencies = [
  "crc32fast",
  "miniz_oxide 0.8.0",
@@ -986,9 +1015,9 @@ dependencies = [
 
 [[package]]
 name = "from_variant"
-version = "1.0.0"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8d8947525c49c73130b5a7187b55b027b6b78fe60268d9f4c283ed690698cb1"
+checksum = "8d7ccf961415e7aa17ef93dcb6c2441faaa8e768abe09e659b908089546f74c5"
 dependencies = [
  "proc-macro2",
  "swc_macros_common",
@@ -1144,12 +1173,6 @@ version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
 
-[[package]]
-name = "hermit-abi"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc"
-
 [[package]]
 name = "hex-conservative"
 version = "0.2.1"
@@ -1159,6 +1182,15 @@ dependencies = [
  "arrayvec",
 ]
 
+[[package]]
+name = "hex-conservative"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4afe881d0527571892c4034822e59bb10c6c991cce6abe8199b6f5cf10766f55"
+dependencies = [
+ "arrayvec",
+]
+
 [[package]]
 name = "hex_lit"
 version = "0.1.1"
@@ -1225,6 +1257,12 @@ version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
 
+[[package]]
+name = "humantime"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
+
 [[package]]
 name = "hyper"
 version = "1.4.1"
@@ -1356,9 +1394,9 @@ dependencies = [
 
 [[package]]
 name = "inferno"
-version = "0.11.21"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "232929e1d75fe899576a3d5c7416ad0d88dbfbb3c3d6aa00873a7408a50ddb88"
+checksum = "75a5d75fee4d36809e6b021e4b96b686e763d365ffdb03af2bd00786353f84fe"
 dependencies = [
  "ahash",
  "clap",
@@ -1367,7 +1405,6 @@ dependencies = [
  "dashmap 6.1.0",
  "env_logger",
  "indexmap",
- "is-terminal",
  "itoa",
  "log",
  "num-format",
@@ -1394,27 +1431,16 @@ checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708"
 
 [[package]]
 name = "is-macro"
-version = "0.3.6"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2069faacbe981460232f880d26bf3c7634e322d49053aa48c27e3ae642f728f1"
+checksum = "1d57a3e447e24c22647738e4607f1df1e0ec6f72e16182c4cd199f647cdfb0e4"
 dependencies = [
- "Inflector",
+ "heck",
  "proc-macro2",
  "quote",
  "syn 2.0.85",
 ]
 
-[[package]]
-name = "is-terminal"
-version = "0.4.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b"
-dependencies = [
- "hermit-abi 0.4.0",
- "libc",
- "windows-sys 0.52.0",
-]
-
 [[package]]
 name = "is_terminal_polyfill"
 version = "1.70.1"
@@ -1475,6 +1501,41 @@ dependencies = [
  "serde_json",
 ]
 
+[[package]]
+name = "kibo_money"
+version = "0.6.0"
+dependencies = [
+ "allocative",
+ "axum",
+ "bincode",
+ "bitcoin_hashes 0.15.0",
+ "biter",
+ "chrono",
+ "clap",
+ "color-eyre",
+ "ctrlc",
+ "derive_deref",
+ "env_logger",
+ "inferno",
+ "itertools",
+ "log",
+ "ordered-float",
+ "rayon",
+ "regex",
+ "reqwest",
+ "rlimit",
+ "sanakirja",
+ "serde",
+ "serde_json",
+ "struct_iterable",
+ "swc",
+ "swc_common",
+ "tokio",
+ "toml",
+ "tower-http",
+ "zstd",
+]
+
 [[package]]
 name = "lazy_static"
 version = "1.5.0"
@@ -1508,6 +1569,9 @@ name = "log"
 version = "0.4.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
+dependencies = [
+ "serde",
+]
 
 [[package]]
 name = "lru"
@@ -1541,9 +1605,9 @@ dependencies = [
 
 [[package]]
 name = "miette"
-version = "7.2.0"
+version = "7.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4edc8853320c2a0dab800fbda86253c8938f6ea88510dc92c5f1ed20e794afc1"
+checksum = "317f146e2eb7021892722af37cf1b971f0a70c8406f487e24952667616192c64"
 dependencies = [
  "cfg-if",
  "miette-derive",
@@ -1555,9 +1619,9 @@ dependencies = [
 
 [[package]]
 name = "miette-derive"
-version = "7.2.0"
+version = "7.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcf09caffaac8068c346b6df2a7fc27a177fd20b39421a39ce0a211bde679a6c"
+checksum = "23c9b935fbe1d6cbd1dac857b54a688145e2d93f48db36010514d0f612d0ad67"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1611,7 +1675,7 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
 dependencies = [
- "hermit-abi 0.3.9",
+ "hermit-abi",
  "libc",
  "wasi",
  "windows-sys 0.52.0",
@@ -1716,7 +1780,7 @@ version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
 dependencies = [
- "hermit-abi 0.3.9",
+ "hermit-abi",
  "libc",
 ]
 
@@ -1781,9 +1845,9 @@ dependencies = [
 
 [[package]]
 name = "ordered-float"
-version = "4.4.0"
+version = "4.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83e7ccb95e240b7c9506a3d544f10d935e142cc90b0a1d56954fb44d89ad6b97"
+checksum = "c65ee1f9701bf938026630b455d5315f490640234259037edb259798b3bcf85e"
 dependencies = [
  "num-traits",
 ]
@@ -1854,32 +1918,6 @@ dependencies = [
  "windows-targets",
 ]
 
-[[package]]
-name = "parser"
-version = "0.5.0"
-dependencies = [
- "allocative",
- "bincode",
- "bitcoin_hashes",
- "biter",
- "chrono",
- "clap",
- "color-eyre",
- "ctrlc",
- "derive_deref",
- "inferno",
- "itertools",
- "ordered-float",
- "rayon",
- "reqwest",
- "sanakirja",
- "serde",
- "serde_json",
- "struct_iterable",
- "toml",
- "zstd",
-]
-
 [[package]]
 name = "path-clean"
 version = "0.1.0"
@@ -1894,9 +1932,9 @@ checksum = "17359afc20d7ab31fdb42bb844c8b3bb1dabd7dcf7e68428492da7f16966fcef"
 
 [[package]]
 name = "pathdiff"
-version = "0.2.1"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd"
+checksum = "df94ce210e5bc13cb6651479fa48d14f601d9858cfe0467f43ae157023b938d3"
 
 [[package]]
 name = "percent-encoding"
@@ -1985,9 +2023,9 @@ dependencies = [
 
 [[package]]
 name = "preset_env_base"
-version = "0.6.0"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1aaeaf4147a07c6615d43fce02d8139e1f835e6ee53e69db2a4810823c138c26"
+checksum = "7c8a797e42c09d55157424ac6e9b6e9e5843fc68b887691b280b055e8c3ca5e4"
 dependencies = [
  "ahash",
  "anyhow",
@@ -2012,38 +2050,38 @@ dependencies = [
 
 [[package]]
 name = "psm"
-version = "0.1.23"
+version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa37f80ca58604976033fae9515a8a2989fc13797d953f7c04fb8fa36a11f205"
+checksum = "200b9ff220857e53e184257720a14553b2f4aa02577d2ed9842d45d4b9654810"
 dependencies = [
  "cc",
 ]
 
 [[package]]
 name = "ptr_meta"
-version = "0.1.4"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1"
+checksum = "fe9e76f66d3f9606f44e45598d155cb13ecf09f4a28199e48daf8c8fc937ea90"
 dependencies = [
  "ptr_meta_derive",
 ]
 
 [[package]]
 name = "ptr_meta_derive"
-version = "0.1.4"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac"
+checksum = "ca414edb151b4c8d125c12566ab0d74dc9cdba36fb80eb7b848c15f495fd32d1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.85",
 ]
 
 [[package]]
 name = "quick-xml"
-version = "0.26.0"
+version = "0.37.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f50b1c63b38611e7d4d7f68b82d3ad0cc71a2ad2e7f61fc10f1328d917c93cd"
+checksum = "f22f29bdff3987b4d8632ef95fd6424ec7e4e0a57e2f4fc63e489e75357f6a03"
 dependencies = [
  "memchr",
 ]
@@ -2139,9 +2177,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.11.0"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -2151,9 +2189,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.8"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3"
+checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -2234,6 +2272,15 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "rlimit"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7043b63bd0cd1aaa628e476b80e6d4023a3b50eb32789f2728908107bd0c793a"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "rustc-demangle"
 version = "0.1.24"
@@ -2309,9 +2356,9 @@ dependencies = [
 
 [[package]]
 name = "rustversion"
-version = "1.0.17"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6"
+checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248"
 
 [[package]]
 name = "ryu"
@@ -2373,7 +2420,7 @@ version = "0.29.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9465315bc9d4566e1724f0fffcbcc446268cb522e60f9a27bcded6b19c108113"
 dependencies = [
- "bitcoin_hashes",
+ "bitcoin_hashes 0.14.0",
  "rand",
  "secp256k1-sys",
  "serde",
@@ -2437,18 +2484,18 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
 
 [[package]]
 name = "serde"
-version = "1.0.214"
+version = "1.0.216"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f55c3193aca71c12ad7890f1785d2b73e1b9f63a0bbc353c08ef26fe03fc56b5"
+checksum = "0b9781016e935a97e8beecf0c933758c97a5520d32930e460142b4cd80c6338e"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.214"
+version = "1.0.216"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766"
+checksum = "46f859dbbf73865c6627ed570e78961cd3ac92407a2d117204c49232485da55e"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2457,9 +2504,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.132"
+version = "1.0.133"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03"
+checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377"
 dependencies = [
  "itoa",
  "memchr",
@@ -2498,27 +2545,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "server"
-version = "0.5.0"
-dependencies = [
- "axum",
- "bincode",
- "chrono",
- "color-eyre",
- "derive_deref",
- "itertools",
- "parser",
- "regex",
- "reqwest",
- "serde",
- "serde_json",
- "swc",
- "swc_common",
- "tokio",
- "tower-http",
-]
-
 [[package]]
 name = "sha1"
 version = "0.10.6"
@@ -2595,12 +2621,6 @@ dependencies = [
  "version_check",
 ]
 
-[[package]]
-name = "smawk"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c"
-
 [[package]]
 name = "socket2"
 version = "0.5.7"
@@ -2613,9 +2633,9 @@ dependencies = [
 
 [[package]]
 name = "sourcemap"
-version = "9.0.0"
+version = "9.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dab08a862c70980b8e23698b507e272317ae52a608a164a844111f5372374f1f"
+checksum = "27c4ea7042fd1a155ad95335b5d505ab00d5124ea0332a06c8390d200bb1a76a"
 dependencies = [
  "base64-simd",
  "bitvec",
@@ -2690,9 +2710,9 @@ checksum = "9091b6114800a5f2141aee1d1b9d6ca3592ac062dc5decb3764ec5895a47b4eb"
 
 [[package]]
 name = "string_enum"
-version = "0.4.4"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05e383308aebc257e7d7920224fa055c632478d92744eca77f99be8fa1545b90"
+checksum = "c9fe66b8ee349846ce2f9557a26b8f1e74843c4a13fb381f9a3d73617a5f956a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2736,9 +2756,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
 
 [[package]]
 name = "swc"
-version = "0.289.1"
+version = "9.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65d51f69ac919b22a08e8654f63def43578a174132bda87309dea8fddd41a5d9"
+checksum = "a8ded6be21206da7fb30e245d72373346d72fe095b75354a413b1d2b6bfda0b7"
 dependencies = [
  "anyhow",
  "base64 0.21.7",
@@ -2786,9 +2806,9 @@ dependencies = [
 
 [[package]]
 name = "swc_allocator"
-version = "0.1.9"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7016ee7a5186d6a80e381aa1926e0f3c7b06eaf444745ff7af3632e978eb8dc5"
+checksum = "117d5d3289663f53022ebf157df8a42b3872d7ac759e63abf96b5987b85d4af3"
 dependencies = [
  "bumpalo",
  "hashbrown 0.14.5",
@@ -2799,9 +2819,9 @@ dependencies = [
 
 [[package]]
 name = "swc_atoms"
-version = "1.0.2"
+version = "3.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b25ff0f3fd48ab1a95d86fd0505fdd1ac904f84d0350dc8222bbc824e9d4fdf6"
+checksum = "151a6feb82b989a087433baca7f6a6eb4fcf83f828c479eecd039c9312d60e10"
 dependencies = [
  "hstr",
  "once_cell",
@@ -2811,9 +2831,9 @@ dependencies = [
 
 [[package]]
 name = "swc_cached"
-version = "0.3.20"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83406221c501860fce9c27444f44125eafe9e598b8b81be7563d7036784cd05c"
+checksum = "96b6a5ef4cfec51d3fa30b73600f206453a37fc30cf1141e4644a57b1ed88616"
 dependencies = [
  "ahash",
  "anyhow",
@@ -2825,9 +2845,9 @@ dependencies = [
 
 [[package]]
 name = "swc_common"
-version = "0.40.1"
+version = "5.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f355465eaed1104244ce918b7ffb77ceb109aabeb74b04b98acae85683b0215b"
+checksum = "a521e8120dc0401580864a643b5bffa035c29fc3fc41697c972743d4f008ed22"
 dependencies = [
  "ahash",
  "ast_node",
@@ -2854,9 +2874,9 @@ dependencies = [
 
 [[package]]
 name = "swc_compiler_base"
-version = "0.23.0"
+version = "7.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20b82e7c3cc5954a5b2e9c545920232a1d37a70215719f5021f090eda9fcf88a"
+checksum = "91e6b81e3504db35cb4931ac448cc88a80e89d04de00412b74102b9dc86ba131"
 dependencies = [
  "anyhow",
  "base64 0.21.7",
@@ -2880,9 +2900,9 @@ dependencies = [
 
 [[package]]
 name = "swc_config"
-version = "0.1.15"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4740e53eaf68b101203c1df0937d5161a29f3c13bceed0836ddfe245b72dd000"
+checksum = "4aa30931f9b26af8edcb4cce605909d15dcfd7577220b22c50a2988f2a53c4c1"
 dependencies = [
  "anyhow",
  "indexmap",
@@ -2895,9 +2915,9 @@ dependencies = [
 
 [[package]]
 name = "swc_config_macro"
-version = "0.1.4"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c5f56139042c1a95b54f5ca48baa0e0172d369bcc9d3d473dad1de36bae8399"
+checksum = "7f2ebd37ef52a8555c8c9be78b694d64adcb5e3bc16c928f030d82f1d65fac57"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2907,9 +2927,9 @@ dependencies = [
 
 [[package]]
 name = "swc_ecma_ast"
-version = "0.121.1"
+version = "5.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db7e1b73c85ff968404867505646b3c6f26e4661e4fc831593b9e182fa59ddd4"
+checksum = "94cf86f17358b93fcfe2876a9f0f7a7ebbff94cd6eaab4c809c7a0da1f4b892e"
 dependencies = [
  "bitflags 2.6.0",
  "is-macro",
@@ -2920,14 +2940,15 @@ dependencies = [
  "string_enum",
  "swc_atoms",
  "swc_common",
+ "swc_visit",
  "unicode-id-start",
 ]
 
 [[package]]
 name = "swc_ecma_codegen"
-version = "0.158.1"
+version = "5.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1953878c2f44d796ff4ee8bde727890d24fe3bed9a86a23be4c4ef9ad79b6a6c"
+checksum = "fb17e77270860f2a975c546c4609e9fa7ae8dbcf85260497e31af19890645800"
 dependencies = [
  "memchr",
  "num-bigint",
@@ -2945,9 +2966,9 @@ dependencies = [
 
 [[package]]
 name = "swc_ecma_codegen_macros"
-version = "0.7.7"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "859fabde36db38634f3fad548dd5e3410c1aebba1b67a3c63e67018fa57a0bca"
+checksum = "5f9a42f479a6475647e248fa9750982c87cd985e19d1016a1fc18a70682305d1"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2957,9 +2978,9 @@ dependencies = [
 
 [[package]]
 name = "swc_ecma_compat_bugfixes"
-version = "0.16.0"
+version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fff0f4ede38d4110f8c639a4c07c8d2b677d3eac968ab33da312bbaf6ad5adf0"
+checksum = "448864548ea7c1866d140e36829196e5d7b35a55b4a1563945a8ce39322b8e7a"
 dependencies = [
  "swc_atoms",
  "swc_common",
@@ -2974,9 +2995,9 @@ dependencies = [
 
 [[package]]
 name = "swc_ecma_compat_common"
-version = "0.14.0"
+version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66a479b2061a3b2c939a9abd34cfd3e9a6983a8bf12f7d3da89ac7ad6a64d9a4"
+checksum = "9a04016559d293d2ac507d931e46ecfd92eb5e96ccf5452bc81c18c47806b858"
 dependencies = [
  "swc_common",
  "swc_ecma_ast",
@@ -2987,9 +3008,9 @@ dependencies = [
 
 [[package]]
 name = "swc_ecma_compat_es2015"
-version = "0.16.0"
+version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "129fa363e3ea01f9e2d2dbd06675bfd515689b261c28b30296d89c91b549916a"
+checksum = "aceb1b432819541aa1dd129b4a226f41cf881a53040efc711a625ee5f23e9afd"
 dependencies = [
  "arrayvec",
  "indexmap",
@@ -3014,9 +3035,9 @@ dependencies = [
 
 [[package]]
 name = "swc_ecma_compat_es2016"
-version = "0.16.0"
+version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a0f1dd466100cd41e85be398d1f4d973f8d5760ec52376294918def88e620ad"
+checksum = "fdc0d69f6541b781e4e95c1954e8ab916095b7369cdf69e14bf83be17b2dd943"
 dependencies = [
  "swc_atoms",
  "swc_common",
@@ -3031,9 +3052,9 @@ dependencies = [
 
 [[package]]
 name = "swc_ecma_compat_es2017"
-version = "0.16.0"
+version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33a3fcc3ae30628fc752d04b44c885ea6202ecfb187311d8827cc851ba7d906d"
+checksum = "1ac80866f541899e4c59a954c0a37a4fd21ea1455dc44400c088b72299c1d2cc"
 dependencies = [
  "serde",
  "swc_atoms",
@@ -3049,9 +3070,9 @@ dependencies = [
 
 [[package]]
 name = "swc_ecma_compat_es2018"
-version = "0.16.0"
+version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31160d66339dda14faefd3a2816a0436f0a1e4f33a2057d8f3663a1a567eaf2e"
+checksum = "cdc28efd763ad5fea7acc2f1fc73ade5b334201369b88aff472053b64b304a76"
 dependencies = [
  "serde",
  "swc_atoms",
@@ -3068,9 +3089,9 @@ dependencies = [
 
 [[package]]
 name = "swc_ecma_compat_es2019"
-version = "0.16.0"
+version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f0164ad462c81c421de2af75f408ca3a96324a3c5e81d999a90a58e6e40dbef"
+checksum = "f2439138f8b8c7cf1401395e0bbb6d3e35d20277268f8e8aa41fa64841af992e"
 dependencies = [
  "swc_atoms",
  "swc_common",
@@ -3084,9 +3105,9 @@ dependencies = [
 
 [[package]]
 name = "swc_ecma_compat_es2020"
-version = "0.16.0"
+version = "7.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da49ae2565352c179657b47e87b4879b8c1128b5447e8fbfaaa020702f740636"
+checksum = "b7a37218dcb1ad82943b9ebfbfbc283ba1ba542ed3c60aacea0b3a06e7f38809"
 dependencies = [
  "serde",
  "swc_atoms",
@@ -3102,9 +3123,9 @@ dependencies = [
 
 [[package]]
 name = "swc_ecma_compat_es2021"
-version = "0.16.0"
+version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d9fed665a9f5b2b3c55fc04f36b12c8d2148fd25fb216a4d9ae9fac331a5374"
+checksum = "9c4c9d40dcf5094e863ceac27c92053ef970991e46f190ddad678b8e3ca3ecde"
 dependencies = [
  "swc_atoms",
  "swc_common",
@@ -3118,9 +3139,9 @@ dependencies = [
 
 [[package]]
 name = "swc_ecma_compat_es2022"
-version = "0.16.0"
+version = "7.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "241bf311a26447690bbfc36ec76886dac04343f82e3fe638fc0e0cdbaeae534b"
+checksum = "93edab9540513a7622addbf2494fa61f487daf98d2c1ed819958b2a3d271835e"
 dependencies = [
  "swc_atoms",
  "swc_common",
@@ -3137,9 +3158,9 @@ dependencies = [
 
 [[package]]
 name = "swc_ecma_compat_es3"
-version = "0.16.0"
+version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a0c7867bba0129c8844cf274c9a0e3f1926d7225d6dce36343a4b1626399992"
+checksum = "0f158dcb284c676bfb425c42adf307a3259d71c999c0970370ed3e09886d83c9"
 dependencies = [
  "swc_common",
  "swc_ecma_ast",
@@ -3152,9 +3173,9 @@ dependencies = [
 
 [[package]]
 name = "swc_ecma_ext_transforms"
-version = "0.123.0"
+version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55ea0bdb96b8d24305cf23614db4c734425c44329bd6e1734e6ebd068a88b536"
+checksum = "d3cecd84290edc5c27d0cb6df79fcd82fe500772cd2526642955227e50359675"
 dependencies = [
  "phf",
  "swc_atoms",
@@ -3166,9 +3187,9 @@ dependencies = [
 
 [[package]]
 name = "swc_ecma_lints"
-version = "0.104.1"
+version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4afb24beda205684867ba555f59e4a470afbe67d9deaacc29b1a5e3a4a1fd58d"
+checksum = "808120ab5d77e0c9484f4e1b248d5f9dfecb103160340eab5710f068d69964b1"
 dependencies = [
  "auto_impl",
  "dashmap 5.5.3",
@@ -3186,9 +3207,9 @@ dependencies = [
 
 [[package]]
 name = "swc_ecma_loader"
-version = "0.52.1"
+version = "5.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f521eea3476abc7ae7adcbfa3479881087e5ae8fe358d46376d761e83fdb3120"
+checksum = "1a19b132079bfcd19d6fdabce7e55ece93a30787f3b8684c8646ddaf2237812d"
 dependencies = [
  "anyhow",
  "dashmap 5.5.3",
@@ -3208,9 +3229,9 @@ dependencies = [
 
 [[package]]
 name = "swc_ecma_minifier"
-version = "0.208.1"
+version = "6.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67d0fec4e2a4a00c1605f6baa2845cc05b4059c1bf9a6e45377c8ae67f04207d"
+checksum = "5368ebcf923fb8e94c94f5fe0caa230c7920b72e5d79ed4cc32592c03213b43d"
 dependencies = [
  "arrayvec",
  "indexmap",
@@ -3243,9 +3264,9 @@ dependencies = [
 
 [[package]]
 name = "swc_ecma_parser"
-version = "0.152.1"
+version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4cfd7930abe18c6829d4adedb5249e1b9fa68e8e786c6636250637992ba0466"
+checksum = "c2c361b4153905dc088a6bacfaa944b582305cf94fbfcaa9b3aa61a7dd3adbf9"
 dependencies = [
  "either",
  "new_debug_unreachable",
@@ -3265,9 +3286,9 @@ dependencies = [
 
 [[package]]
 name = "swc_ecma_preset_env"
-version = "0.221.0"
+version = "8.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b6b5a7222fe85be1732faa7a2c9812fc516d934ba320662c90c066264cd9eec"
+checksum = "39ac4bd1620798c38f767417f9b364b87fd2505a9e748d6b1d7549f155a0aa96"
 dependencies = [
  "anyhow",
  "dashmap 5.5.3",
@@ -3290,9 +3311,9 @@ dependencies = [
 
 [[package]]
 name = "swc_ecma_transforms"
-version = "0.243.0"
+version = "8.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b22f584075dfbd349c107def9c52de654979f0a1e8cdc4255dd4e7ec5b39800"
+checksum = "dccedb5a1e52795e132615a3ca01e2adb8fc9214ee75c258f8a3124a9b42c47e"
 dependencies = [
  "swc_atoms",
  "swc_common",
@@ -3310,9 +3331,9 @@ dependencies = [
 
 [[package]]
 name = "swc_ecma_transforms_base"
-version = "0.149.0"
+version = "6.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2194d20416a03ae02058934f8387691809f86466a2f2e7a65c56dcb001bd46b"
+checksum = "f31557485025a2fd1f833d63601c53010857e45633f44bcc87510f3578bde0c5"
 dependencies = [
  "better_scoped_tls",
  "bitflags 2.6.0",
@@ -3333,9 +3354,9 @@ dependencies = [
 
 [[package]]
 name = "swc_ecma_transforms_classes"
-version = "0.138.0"
+version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50e93ef88e45587864ef645e29c33f04f75360e47194c084f931855af3aac246"
+checksum = "3cd3a9eacaf2aa2ec7a8139e3c3883ddf4f8e948a08ee378725a4ad658beb3d9"
 dependencies = [
  "swc_atoms",
  "swc_common",
@@ -3347,9 +3368,9 @@ dependencies = [
 
 [[package]]
 name = "swc_ecma_transforms_compat"
-version = "0.175.0"
+version = "7.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35dd174f6c954a4fe1bff88a64de777ef65041411f96b60daf4a78864ad47789"
+checksum = "e245e2cb96ff093c0c3170dbe4c063a0b937ce4527d37f52f467529d4977634b"
 dependencies = [
  "arrayvec",
  "indexmap",
@@ -3383,9 +3404,9 @@ dependencies = [
 
 [[package]]
 name = "swc_ecma_transforms_macros"
-version = "0.5.5"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "500a1dadad1e0e41e417d633b3d6d5de677c9e0d3159b94ba3348436cdb15aab"
+checksum = "6845dfb88569f3e8cd05901505916a8ebe98be3922f94769ca49f84e8ccec8f7"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3395,9 +3416,9 @@ dependencies = [
 
 [[package]]
 name = "swc_ecma_transforms_module"
-version = "0.194.1"
+version = "7.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4317b5ce1f5fc00b7d72b712c822e1aa66cdb9dc155799ee2278e00b2172f918"
+checksum = "5480053dfa9b7ae34c6d5cdaa33bee3d7dfd33a259cabe9122806f36625912c1"
 dependencies = [
  "Inflector",
  "anyhow",
@@ -3422,9 +3443,9 @@ dependencies = [
 
 [[package]]
 name = "swc_ecma_transforms_optimization"
-version = "0.212.1"
+version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b2722095aef7b6de79b170c8c4e3c885576c5394e7a20328fdc51e880d6257b"
+checksum = "350a4965abfada7d5b23b3140896652acc11e110ac042a160bcea5bf8b08d367"
 dependencies = [
  "dashmap 5.5.3",
  "indexmap",
@@ -3446,9 +3467,9 @@ dependencies = [
 
 [[package]]
 name = "swc_ecma_transforms_proposal"
-version = "0.183.0"
+version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "718f1e24dd96cfb0b7ba8f8a4e61c98338cdac7a3f5f9f4a83951d776ac398bf"
+checksum = "cba55188e66696c43333d19492f69a6f4a7785f9486ebc1b3cf7c5f743927505"
 dependencies = [
  "either",
  "rustc-hash",
@@ -3466,9 +3487,9 @@ dependencies = [
 
 [[package]]
 name = "swc_ecma_transforms_react"
-version = "0.195.0"
+version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06ddcb8943976319a4f8b899862f094f6984511490e4bfa9b4c8fbd334539b62"
+checksum = "4cabf9375cfb71fc0e3d98e07e6fca39a18daa23d4878d8d2daa4c2b6c07b379"
 dependencies = [
  "base64 0.21.7",
  "dashmap 5.5.3",
@@ -3491,9 +3512,9 @@ dependencies = [
 
 [[package]]
 name = "swc_ecma_transforms_typescript"
-version = "0.202.1"
+version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31acb773a2d82e5524d021aa77a38ae8bc708171b0005fd420b43356d8dfba25"
+checksum = "77346c37397fb238f991d6dccc027881caca539628e9a6c629299c7b94bdb08a"
 dependencies = [
  "ryu-js",
  "serde",
@@ -3508,9 +3529,9 @@ dependencies = [
 
 [[package]]
 name = "swc_ecma_usage_analyzer"
-version = "0.33.0"
+version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55a1d8b627b6adc706ccd2a4a30a5413e9df91a9cff6569cb9d3b9f41c1bc8de"
+checksum = "6f58c91cfddea5723e22dbb8b1738642714d0acd1463d26d3bc7518b83468414"
 dependencies = [
  "indexmap",
  "rustc-hash",
@@ -3525,9 +3546,9 @@ dependencies = [
 
 [[package]]
 name = "swc_ecma_utils"
-version = "0.137.0"
+version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "939f21c75eff61ad3e485fc54d38988f2f9744ceda24a3feb8228dd072171d94"
+checksum = "527fad9bdb16883782d55291fd3330925b3572f512ef89b3d92a29e2f713fe4f"
 dependencies = [
  "indexmap",
  "num_cpus",
@@ -3544,9 +3565,9 @@ dependencies = [
 
 [[package]]
 name = "swc_ecma_visit"
-version = "0.107.0"
+version = "5.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15bd17e03251272ee04d1155036be5288055ab43d40ab2d9fd63ff815d326dad"
+checksum = "b04c06c1805bda18c27165560f1617a57453feb9fb0638d90839053641af42d4"
 dependencies = [
  "new_debug_unreachable",
  "num-bigint",
@@ -3559,9 +3580,9 @@ dependencies = [
 
 [[package]]
 name = "swc_eq_ignore_macros"
-version = "0.1.4"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63db0adcff29d220c3d151c5b25c0eabe7e32dd936212b84cdaa1392e3130497"
+checksum = "e96e15288bf385ab85eb83cff7f9e2d834348da58d0a31b33bdb572e66ee413e"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3570,9 +3591,9 @@ dependencies = [
 
 [[package]]
 name = "swc_error_reporters"
-version = "1.0.0"
+version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83f9286183c9be40aafcbbe8c397403fb32af812a3dffe93eee9067aee4fbedb"
+checksum = "4f741b530b2df577a287e193c4a111182de01b43361617af228ec9e6e6222fa4"
 dependencies = [
  "anyhow",
  "miette",
@@ -3583,9 +3604,9 @@ dependencies = [
 
 [[package]]
 name = "swc_fast_graph"
-version = "1.0.0"
+version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3daff8d4379be2a99ab4b146e4dd631ef2415965dc4f1d33e988a737c5ccc39a"
+checksum = "c22e0a0478b1b06610453a97c8371cafa742e371a79aff860ccfbabe1ab160a7"
 dependencies = [
  "indexmap",
  "petgraph",
@@ -3595,9 +3616,9 @@ dependencies = [
 
 [[package]]
 name = "swc_macros_common"
-version = "0.3.13"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f486687bfb7b5c560868f69ed2d458b880cebc9babebcb67e49f31b55c5bf847"
+checksum = "a509f56fca05b39ba6c15f3e58636c3924c78347d63853632ed2ffcb6f5a0ac7"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3606,9 +3627,9 @@ dependencies = [
 
 [[package]]
 name = "swc_node_comments"
-version = "0.27.0"
+version = "5.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31c325461f5e78e7749241f917945164adccfadcc2138a9a2e5ac9d186e1c459"
+checksum = "1b56d29b30a2b3f407cc8a64e01414a4150d10cc5dd72d9c2d34734d8c0af951"
 dependencies = [
  "dashmap 5.5.3",
  "swc_atoms",
@@ -3617,18 +3638,18 @@ dependencies = [
 
 [[package]]
 name = "swc_timer"
-version = "0.27.0"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f53899e4ab3f9ce3db83b4c845f8a27f37bf700b233febbc9a6da749651c2fbb"
+checksum = "4db06b46cc832f7cf83c2ce21905fc465d01443a2bdccf63644383e1f5847532"
 dependencies = [
  "tracing",
 ]
 
 [[package]]
 name = "swc_trace_macro"
-version = "1.0.0"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69aa25f667e4d74ab10a17a266edeb8b354273817b20b91e60471f1c860a221b"
+checksum = "4c78717a841565df57f811376a3d19c9156091c55175e12d378f3a522de70cef"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3637,9 +3658,9 @@ dependencies = [
 
 [[package]]
 name = "swc_transform_common"
-version = "0.1.1"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eda3e80e1ad638d3575bc07745a914af13dcb02215098659f864731078271f2c"
+checksum = "f23ade45bb0d8b5299022dc0f674c2125512412f5b26f42cfaffa16dcc00d56b"
 dependencies = [
  "better_scoped_tls",
  "once_cell",
@@ -3650,21 +3671,25 @@ dependencies = [
 
 [[package]]
 name = "swc_typescript"
-version = "0.8.0"
+version = "5.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b61f86dce2eeabd85d934a89cd481709918c751c44dfe433b5e4f1f40075fb5a"
+checksum = "fe778782270111e7152a99af340bf763f12cdc60df775cd0ce51eaa74dcc0249"
 dependencies = [
+ "petgraph",
+ "rustc-hash",
  "swc_atoms",
  "swc_common",
  "swc_ecma_ast",
+ "swc_ecma_utils",
+ "swc_ecma_visit",
  "thiserror",
 ]
 
 [[package]]
 name = "swc_visit"
-version = "0.6.2"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ceb044142ba2719ef9eb3b6b454fce61ab849eb696c34d190f04651955c613d"
+checksum = "9138b6a36bbe76dd6753c4c0794f7e26480ea757bee499738bedbbb3ae3ec5f3"
 dependencies = [
  "either",
  "new_debug_unreachable",
@@ -3753,7 +3778,6 @@ version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9"
 dependencies = [
- "smawk",
  "unicode-linebreak",
  "unicode-width",
 ]
@@ -3805,9 +3829,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.40.0"
+version = "1.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998"
+checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551"
 dependencies = [
  "backtrace",
  "bytes",
@@ -3918,9 +3942,9 @@ dependencies = [
 
 [[package]]
 name = "tower-http"
-version = "0.6.1"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8437150ab6bbc8c5f0f519e3d5ed4aa883a83dd4cdd3d1b21f9482936046cb97"
+checksum = "403fa3b783d4b626a8ad51d766ab03cb6d2dbfc46b1c5d4448395e6628dc9697"
 dependencies = [
  "async-compression",
  "bitflags 2.6.0",
@@ -3961,9 +3985,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-attributes"
-version = "0.1.27"
+version = "0.1.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
+checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4043,9 +4067,9 @@ checksum = "10103c57044730945224467c09f71a4db0071c123a0648cc3e818913bde6b561"
 
 [[package]]
 name = "unicode-id-start"
-version = "1.3.0"
+version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97e2a3c5fc9de285c0e805d98eba666adb4b2d9e1049ce44821ff7707cc34e91"
+checksum = "2f322b60f6b9736017344fa0635d64be2f458fbc04eef65f6be22976dd1ffd5b"
 
 [[package]]
 name = "unicode-ident"
@@ -4105,9 +4129,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "uuid"
-version = "1.10.0"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314"
+checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a"
 
 [[package]]
 name = "valuable"
diff --git a/Cargo.toml b/Cargo.toml
new file mode 100644
index 000000000..bd7c6bde3
--- /dev/null
+++ b/Cargo.toml
@@ -0,0 +1,39 @@
+[package]
+name = "kibo_money"
+version = "0.6.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+allocative = "0.3.3"
+axum = "0.7.9"
+bincode = { git = "https://github.com/bincode-org/bincode.git", features = [
+    "serde",
+] }
+bitcoin_hashes = { version = "0.15.0" }
+biter = { path = "./crates/biter" }
+chrono = { version = "0.4.39", features = ["serde"] }
+clap = { version = "4.5.23", features = ["derive"] }
+color-eyre = "0.6.3"
+ctrlc = { version = "3.4.5", features = ["termination"] }
+derive_deref = "1.1.1"
+env_logger = "0.11.5"
+inferno = "0.12.0"
+itertools = "0.13.0"
+log = { version = "0.4.22", features = ["std", "serde"] }
+ordered-float = "4.5.0"
+rayon = "1.10.0"
+regex = "1.11.1"
+reqwest = { version = "0.12.9", features = ["blocking", "json"] }
+rlimit = "0.10.2"
+sanakirja = "1.4.3"
+serde = { version = "1.0.216", features = ["derive"] }
+serde_json = "1.0.133"
+struct_iterable = { path = "./crates/iterable" }
+swc = "9.0.0"
+swc_common = "5.0.0"
+tokio = { version = "1.42.0", features = ["full"] }
+toml = "0.8.19"
+tower-http = { version = "0.6.2", features = ["compression-full"] }
+zstd = "0.13.2"
diff --git a/README.md b/README.md
index c2e0ce2cb..d602d55d8 100644
--- a/README.md
+++ b/README.md
@@ -122,6 +122,7 @@ Now we can finally start by running the parser, you need to use the `./run.sh` s
 For the first launch, the parser will need several information such as:
 
 - `--datadir`: which is bitcoin data directory path, prefer `$HOME` to `~` as the latter might not work
+- `--outdir`: where all outputs will be saved, prefer `$HOME` to `~` as the latter might not work
 
 Optionally you can also specify:
 
@@ -136,7 +137,7 @@ Everything will be saved in a `config.toml` file, which will allow you to simply
 Here's an example
 
 ```bash
-./run.sh --datadir=$HOME/Developer/bitcoin
+./run.sh --datadir=$HOME/Developer/bitcoin --outdir=$HOME/.kibo/out
 ```
 
 In a **new** terminal, go to the `server`'s folder of the repository
diff --git a/crates/biter/CHANGELOG.md b/crates/biter/CHANGELOG.md
new file mode 100644
index 000000000..9b9c5b195
--- /dev/null
+++ b/crates/biter/CHANGELOG.md
@@ -0,0 +1,12 @@
+# v0.2.1
+
+- Clean `.json` if necessary
+- Only save `.json` if needed
+- Updated benchmarks
+- Updated packages
+
+# v0.2.0
+
+- Removed the need for an output directory path
+- Changed the location of the saved json file from the previously needed output directory path to the Bitcoin data directory
+- Added a save of the json file every 144 * 30 blocks instead of only at the end
diff --git a/biter/Cargo.lock b/crates/biter/Cargo.lock
similarity index 85%
rename from biter/Cargo.lock
rename to crates/biter/Cargo.lock
index e178bb13f..b71079ba4 100644
--- a/biter/Cargo.lock
+++ b/crates/biter/Cargo.lock
@@ -1,12 +1,12 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "base58ck"
@@ -32,9 +32,9 @@ checksum = "d965446196e3b7decd44aa7ee49e31d630118f90ef12f97900f262eb915c951d"
 
 [[package]]
 name = "bitcoin"
-version = "0.32.2"
+version = "0.32.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea507acc1cd80fc084ace38544bbcf7ced7c2aa65b653b102de0ce718df668f6"
+checksum = "ce6bc65742dea50536e35ad42492b234c27904a27f0abdcbce605015cb4ea026"
 dependencies = [
  "base58ck",
  "bech32",
@@ -110,7 +110,7 @@ dependencies = [
 
 [[package]]
 name = "biter"
-version = "0.1.1"
+version = "0.2.1"
 dependencies = [
  "bitcoin",
  "bitcoincore-rpc",
@@ -129,9 +129,12 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "cc"
-version = "1.1.6"
+version = "1.1.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2aba8f4e9906c7ce3c73463f62a7f0c65183ada1a2d47e397cc8810827f9694f"
+checksum = "c2e7962b54006dcfcc61cb72735f4d89bb97061dd6a7ed882ec6b8ee53714c6f"
+dependencies = [
+ "shlex",
+]
 
 [[package]]
 name = "cfg-if"
@@ -258,9 +261,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.155"
+version = "0.2.161"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
+checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1"
 
 [[package]]
 name = "log"
@@ -287,27 +290,27 @@ dependencies = [
 
 [[package]]
 name = "ppv-lite86"
-version = "0.2.18"
+version = "0.2.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dee4364d9f3b902ef14fab8a1ddffb783a1cb6b4bba3bfc1fa3922732c7de97f"
+checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
 dependencies = [
  "zerocopy",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.86"
+version = "1.0.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -370,9 +373,9 @@ checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
 
 [[package]]
 name = "secp256k1"
-version = "0.29.0"
+version = "0.29.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e0cc0f1cf93f4969faf3ea1c7d8a9faed25918d96affa959720823dfe86d4f3"
+checksum = "9465315bc9d4566e1724f0fffcbcc446268cb522e60f9a27bcded6b19c108113"
 dependencies = [
  "bitcoin_hashes",
  "rand",
@@ -382,27 +385,27 @@ dependencies = [
 
 [[package]]
 name = "secp256k1-sys"
-version = "0.10.0"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1433bd67156263443f14d603720b082dd3121779323fce20cba2aa07b874bc1b"
+checksum = "d4387882333d3aa8cb20530a17c69a3752e97837832f34f6dccc760e715001d9"
 dependencies = [
  "cc",
 ]
 
 [[package]]
 name = "serde"
-version = "1.0.204"
+version = "1.0.216"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12"
+checksum = "0b9781016e935a97e8beecf0c933758c97a5520d32930e460142b4cd80c6338e"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.204"
+version = "1.0.216"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222"
+checksum = "46f859dbbf73865c6627ed570e78961cd3ac92407a2d117204c49232485da55e"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -411,9 +414,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.122"
+version = "1.0.133"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "784b6203951c57ff748476b126ccb5e8e2959a5c19e5c617ab1956be3dbc68da"
+checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377"
 dependencies = [
  "itoa",
  "memchr",
@@ -422,10 +425,16 @@ dependencies = [
 ]
 
 [[package]]
-name = "syn"
-version = "2.0.72"
+name = "shlex"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
+[[package]]
+name = "syn"
+version = "2.0.90"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -434,9 +443,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83"
 
 [[package]]
 name = "wasi"
@@ -446,9 +455,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "zerocopy"
-version = "0.6.6"
+version = "0.7.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "854e949ac82d619ee9a14c66a1b674ac730422372ccb759ce0c39cabcf2bf8e6"
+checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
 dependencies = [
  "byteorder",
  "zerocopy-derive",
@@ -456,9 +465,9 @@ dependencies = [
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.6.6"
+version = "0.7.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "125139de3f6b9d625c39e2efdd73d41bdac468ccd556556440e322be0e1bbd91"
+checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/biter/Cargo.toml b/crates/biter/Cargo.toml
similarity index 65%
rename from biter/Cargo.toml
rename to crates/biter/Cargo.toml
index f01e3608d..fb39c739d 100644
--- a/biter/Cargo.toml
+++ b/crates/biter/Cargo.toml
@@ -1,19 +1,19 @@
 [package]
 name = "biter"
 description = "A very fast Bitcoin block iterator"
-version = "0.1.1"
+version = "0.2.1"
 license = "MIT"
-repository = "https://github.com/kibo-money/kibo/tree/main/biter"
+repository = "https://github.com/kibo-money/kibo/tree/main/crates/biter"
 keywords = ["bitcoin", "block", "iterator"]
 categories = ["cryptography::cryptocurrencies", "encoding"]
 edition = "2021"
 
 [dependencies]
-bitcoin = { version = "0.32.2", features = ["serde"] }
+bitcoin = { version = "0.32.5", features = ["serde"] }
 rayon = "1.10.0"
 crossbeam = { version = "0.8.4", features = ["crossbeam-channel"] }
-serde = { version = "1.0.204", features = ["derive"] }
-serde_json = "1.0.122"
+serde = { version = "1.0.216", features = ["derive"] }
+serde_json = "1.0.133"
 derived-deref = "2.1.0"
 bitcoincore-rpc = "0.19.0"
 # tokio = { version = "1.39.2", features = ["rt-multi-thread"] }
diff --git a/biter/LICENSE.md b/crates/biter/LICENSE.md
similarity index 100%
rename from biter/LICENSE.md
rename to crates/biter/LICENSE.md
diff --git a/biter/README.md b/crates/biter/README.md
similarity index 71%
rename from biter/README.md
rename to crates/biter/README.md
index 932108dac..13c3097e6 100644
--- a/biter/README.md
+++ b/crates/biter/README.md
@@ -10,6 +10,8 @@ The element returned by the iterator is a tuple which includes the:
 ## Example
 
 ```rust
+use std::path::Path;
+
 use bitcoincore_rpc::{Auth, Client};
 
 fn main() {
@@ -18,9 +20,6 @@ fn main() {
     // Path to the Bitcoin data directory
     let data_dir = "../../bitcoin";
 
-    // Path to the export directory where a mini blk indexer will be exported
-    let export_dir = "./target";
-
     // Inclusive starting height of the blocks received, `None` for 0
     let start = Some(850_000);
 
@@ -29,11 +28,15 @@ fn main() {
 
     // RPC client to filter out forks
     let url = "http://localhost:8332";
-    let auth = Auth::UserPass("satoshi".to_string(), "nakamoto".to_string());
+    let cookie = Path::new(data_dir).join(".cookie");
+    let auth = Auth::CookieFile(cookie);
     let rpc = Client::new(url, auth).unwrap();
 
+    if cookie.is_file() {
+        Ok()
+
     // Create channel receiver then iterate over the blocks
-    biter::new(data_dir, export_dir, start, end, rpc)
+    biter::new(data_dir, start, end, rpc)
         .iter()
         .for_each(|(height, _block, hash)| {
             println!("{height}: {hash}");
@@ -52,11 +55,11 @@ Peak memory should be around 500MB.
 
 ## Comparaison
 
-|  | [biter](https://crates.io/crates/biter) | [bitcoin-explorer](https://crates.io/crates/bitcoin-explorer) | [blocks_iterator](https://crates.io/crates/blocks_iterator) |
+|  | [biter](https://crates.io/crates/biter) | [bitcoin-explorer (depreciated)](https://crates.io/crates/bitcoin-explorer) | [blocks_iterator](https://crates.io/crates/blocks_iterator) |
 | --- | --- | --- | --- |
-| Run **with** `bitcoind` | Yes ✅ | No ❌ | Yes ✅ |
-| Run **without** `bitcoind` | No ❌ | Yes ✅ | Yes ✅ |
-| `0..=855_000` | 16mn40s | 17mn 46s | > 2h |
-| `800_000..=855_000` | 2mn 53s (16mn40s if first run) | 3mn 2s | > 2h |
+| Runs **with** `bitcoind` | Yes ✅ | No ❌ | Yes ✅ |
+| Runs **without** `bitcoind` | No ❌ | Yes ✅ | Yes ✅ |
+| `0..=855_000` | 4mn 10s | 4mn 45s | > 2h |
+| `800_000..=855_000` | 0mn 52s (4mn 10s if first run) | 0mn 55s | > 2h |
 
 *Benchmarked on a Macbook Pro M3 Pro*
diff --git a/biter/src/blk_index_to_blk_recap.rs b/crates/biter/src/blk_index_to_blk_recap.rs
similarity index 73%
rename from biter/src/blk_index_to_blk_recap.rs
rename to crates/biter/src/blk_index_to_blk_recap.rs
index 9c9d53c53..c3823447c 100644
--- a/biter/src/blk_index_to_blk_recap.rs
+++ b/crates/biter/src/blk_index_to_blk_recap.rs
@@ -1,28 +1,31 @@
 use std::{
     cmp::Ordering,
-    collections::BTreeMap,
+    collections::{BTreeMap, BTreeSet},
     fs::{self, File},
     io::{BufReader, BufWriter},
-    path::PathBuf,
+    path::{Path, PathBuf},
 };
 
 use derived_deref::{Deref, DerefMut};
 
 use crate::{blk_recap::BlkRecap, BlkMetadataAndBlock};
 
+const TARGET_BLOCKS_PER_MONTH: usize = 144 * 30;
+
 #[derive(Deref, DerefMut, Debug)]
 pub struct BlkIndexToBlkRecap {
-    path: String,
+    path: PathBuf,
     #[target]
     tree: BTreeMap<usize, BlkRecap>,
+    last_safe_recap: Option<BlkRecap>,
 }
 
 impl BlkIndexToBlkRecap {
-    pub fn import(blocks_dir: &BTreeMap<usize, PathBuf>, export_dir: &str) -> Self {
-        let path = format!("{export_dir}/blk_index_to_blk_recap.json");
+    pub fn import(blocks_dir: &BTreeMap<usize, PathBuf>, data_dir: &Path) -> Self {
+        let path = data_dir.join("blk_index_to_blk_recap.json");
 
         let tree = {
-            fs::create_dir_all(export_dir).unwrap();
+            fs::create_dir_all(data_dir).unwrap();
 
             if let Ok(file) = File::open(&path) {
                 let reader = BufReader::new(file);
@@ -32,7 +35,11 @@ impl BlkIndexToBlkRecap {
             }
         };
 
-        let mut this = Self { path, tree };
+        let mut this = Self {
+            path,
+            tree,
+            last_safe_recap: None,
+        };
 
         this.clean_outdated(blocks_dir);
 
@@ -40,13 +47,22 @@ impl BlkIndexToBlkRecap {
     }
 
     pub fn clean_outdated(&mut self, blocks_dir: &BTreeMap<usize, PathBuf>) {
+        let mut unprocessed_keys = self.keys().copied().collect::<BTreeSet<_>>();
+
         blocks_dir.iter().for_each(|(blk_index, blk_path)| {
+            unprocessed_keys.remove(blk_index);
             if let Some(blk_recap) = self.get(blk_index) {
                 if blk_recap.has_different_modified_time(blk_path) {
                     self.remove(blk_index);
                 }
             }
         });
+
+        unprocessed_keys.iter().for_each(|blk_index| {
+            self.remove(blk_index);
+        });
+
+        self.last_safe_recap = self.last_entry().map(|e| e.get().clone());
     }
 
     pub fn get_start_recap(&self, start: Option<usize>) -> Option<(usize, BlkRecap)> {
@@ -73,7 +89,6 @@ impl BlkIndexToBlkRecap {
         let blk_index = blk_metadata_and_block.blk_metadata.index;
 
         if let Some(last_entry) = self.last_entry() {
-            // if last_entry.get().is_older_than(height) {
             match last_entry.key().cmp(&blk_index) {
                 Ordering::Greater => {
                     last_entry.remove_entry();
@@ -83,7 +98,6 @@ impl BlkIndexToBlkRecap {
                 }
                 Ordering::Equal => {}
             };
-            // }
         } else {
             if blk_index != 0 || height != 0 {
                 // dbg!(blk_index, height);
@@ -92,6 +106,14 @@ impl BlkIndexToBlkRecap {
 
             self.insert(blk_index, BlkRecap::first(blk_metadata_and_block));
         }
+
+        if self
+            .last_safe_recap
+            .map_or(true, |recap| recap.height() >= height)
+            && (height % TARGET_BLOCKS_PER_MONTH) == 0
+        {
+            self.export();
+        }
     }
 
     pub fn export(&self) {
diff --git a/biter/src/blk_metadata.rs b/crates/biter/src/blk_metadata.rs
similarity index 100%
rename from biter/src/blk_metadata.rs
rename to crates/biter/src/blk_metadata.rs
diff --git a/biter/src/blk_metadata_and_block.rs b/crates/biter/src/blk_metadata_and_block.rs
similarity index 100%
rename from biter/src/blk_metadata_and_block.rs
rename to crates/biter/src/blk_metadata_and_block.rs
diff --git a/biter/src/blk_recap.rs b/crates/biter/src/blk_recap.rs
similarity index 100%
rename from biter/src/blk_recap.rs
rename to crates/biter/src/blk_recap.rs
diff --git a/biter/src/lib.rs b/crates/biter/src/lib.rs
similarity index 96%
rename from biter/src/lib.rs
rename to crates/biter/src/lib.rs
index a064fa1cb..ed80f1882 100644
--- a/biter/src/lib.rs
+++ b/crates/biter/src/lib.rs
@@ -2,6 +2,7 @@ use std::{
     collections::{BTreeMap, BTreeSet, VecDeque},
     fs::{self},
     ops::ControlFlow,
+    path::Path,
     thread,
 };
 
@@ -44,7 +45,6 @@ enum BlockState {
 /// # Arguments
 ///
 /// * `data_dir` - Path to the Bitcoin data directory
-/// * `export_dir` - Path to the export directory where a mini blk indexer will be exported
 /// * `start` - Inclusive starting height of the blocks received, `None` for 0
 /// * `end` - Inclusive ending height of the blocks received, `None` for the last one
 /// * `rpc` - RPC client to filter out forks
@@ -52,21 +52,23 @@ enum BlockState {
 /// # Example
 ///
 /// ```rust
+/// use std::path::Path;
+///
 /// use bitcoincore_rpc::{Auth, Client};
 ///
 /// fn main() {
 ///     let i = std::time::Instant::now();
 ///
+///     let data_dir = Path::new("../../bitcoin");
 ///     let url = "http://localhost:8332";
-///     let auth = Auth::UserPass("satoshi".to_string(), "nakamoto".to_string());
+///     let cookie = Path::new(data_dir).join(".cookie");
+///     let auth = Auth::CookieFile(cookie);
 ///     let rpc = Client::new(url, auth).unwrap();
 ///
-///     let data_dir = "../../bitcoin";
-///     let export_dir = "./target";
 ///     let start = Some(850_000);
 ///     let end = None;
 ///
-///     biter::new(data_dir, export_dir, start, end, rpc)
+///     biter::new(data_dir, start, end, rpc)
 ///         .iter()
 ///         .for_each(|(height, _block, hash)| {
 ///             println!("{height}: {hash}");
@@ -77,8 +79,7 @@ enum BlockState {
 /// ```
 ///
 pub fn new(
-    data_dir: &str,
-    export_dir: &str,
+    data_dir: &Path,
     start: Option<usize>,
     end: Option<usize>,
     rpc: bitcoincore_rpc::Client,
@@ -87,15 +88,15 @@ pub fn new(
     let (send_block, recv_block) = bounded(BOUND_CAP);
     let (send_height_block_hash, recv_height_block_hash) = bounded(BOUND_CAP);
 
-    let blocks_dir = scan_blocks_dir(data_dir);
+    let blk_index_to_blk_path = scan_blocks_dir(data_dir);
 
-    let mut blk_index_to_blk_recap = BlkIndexToBlkRecap::import(&blocks_dir, export_dir);
+    let mut blk_index_to_blk_recap = BlkIndexToBlkRecap::import(&blk_index_to_blk_path, data_dir);
 
     let start_recap = blk_index_to_blk_recap.get_start_recap(start);
     let starting_blk_index = start_recap.as_ref().map_or(0, |(index, _)| *index);
 
     thread::spawn(move || {
-        blocks_dir
+        blk_index_to_blk_path
             .into_iter()
             .filter(|(blk_index, _)| blk_index >= &starting_blk_index)
             .try_for_each(move |(blk_index, blk_path)| {
diff --git a/biter/src/main.rs b/crates/biter/src/main.rs
similarity index 54%
rename from biter/src/main.rs
rename to crates/biter/src/main.rs
index 57ac1f020..ed1da58cb 100644
--- a/biter/src/main.rs
+++ b/crates/biter/src/main.rs
@@ -1,18 +1,20 @@
+use std::path::Path;
+
 use bitcoincore_rpc::{Auth, Client};
 
 fn main() {
     let i = std::time::Instant::now();
 
+    let data_dir = Path::new("../../../bitcoin");
     let url = "http://localhost:8332";
-    let auth = Auth::UserPass("satoshi".to_string(), "nakamoto".to_string());
+    let cookie = Path::new(data_dir).join(".cookie");
+    let auth = Auth::CookieFile(cookie);
     let rpc = Client::new(url, auth).unwrap();
 
-    let data_dir = "../bitcoin";
-    let export_dir = "./target";
-    let start = None;
-    let end = None;
+    let start = Some(800_000);
+    let end = Some(855_000);
 
-    biter::new(data_dir, export_dir, start, end, rpc)
+    biter::new(data_dir, start, end, rpc)
         .iter()
         .for_each(|(height, _block, hash)| {
             println!("{height}: {hash}");
diff --git a/biter/src/utils.rs b/crates/biter/src/utils.rs
similarity index 79%
rename from biter/src/utils.rs
rename to crates/biter/src/utils.rs
index 9b1bdb945..78819179e 100644
--- a/biter/src/utils.rs
+++ b/crates/biter/src/utils.rs
@@ -1,12 +1,17 @@
-use std::{collections::BTreeMap, fs, path::PathBuf, time::UNIX_EPOCH};
+use std::{
+    collections::BTreeMap,
+    fs,
+    path::{Path, PathBuf},
+    time::UNIX_EPOCH,
+};
 
 const BLK: &str = "blk";
 const DAT: &str = ".dat";
 
-pub fn scan_blocks_dir(data_dir_path: &str) -> BTreeMap<usize, PathBuf> {
-    let blocks_dir_path = &format!("{data_dir_path}/blocks");
+pub fn scan_blocks_dir(data_dir: &Path) -> BTreeMap<usize, PathBuf> {
+    let blocks_dir = data_dir.join("blocks");
 
-    fs::read_dir(blocks_dir_path)
+    fs::read_dir(blocks_dir)
         .unwrap()
         .map(|entry| entry.unwrap().path())
         .filter(|path| {
diff --git a/iterable/Cargo.lock b/crates/iterable/Cargo.lock
similarity index 100%
rename from iterable/Cargo.lock
rename to crates/iterable/Cargo.lock
diff --git a/iterable/Cargo.toml b/crates/iterable/Cargo.toml
similarity index 100%
rename from iterable/Cargo.toml
rename to crates/iterable/Cargo.toml
diff --git a/iterable/README.md b/crates/iterable/README.md
similarity index 100%
rename from iterable/README.md
rename to crates/iterable/README.md
diff --git a/iterable/src/lib.rs b/crates/iterable/src/lib.rs
similarity index 100%
rename from iterable/src/lib.rs
rename to crates/iterable/src/lib.rs
diff --git a/iterable/struct_iterable_derive/Cargo.toml b/crates/iterable/struct_iterable_derive/Cargo.toml
similarity index 100%
rename from iterable/struct_iterable_derive/Cargo.toml
rename to crates/iterable/struct_iterable_derive/Cargo.toml
diff --git a/iterable/struct_iterable_derive/README.md b/crates/iterable/struct_iterable_derive/README.md
similarity index 100%
rename from iterable/struct_iterable_derive/README.md
rename to crates/iterable/struct_iterable_derive/README.md
diff --git a/iterable/struct_iterable_derive/src/lib.rs b/crates/iterable/struct_iterable_derive/src/lib.rs
similarity index 100%
rename from iterable/struct_iterable_derive/src/lib.rs
rename to crates/iterable/struct_iterable_derive/src/lib.rs
diff --git a/iterable/struct_iterable_internal/Cargo.toml b/crates/iterable/struct_iterable_internal/Cargo.toml
similarity index 100%
rename from iterable/struct_iterable_internal/Cargo.toml
rename to crates/iterable/struct_iterable_internal/Cargo.toml
diff --git a/iterable/struct_iterable_internal/README.md b/crates/iterable/struct_iterable_internal/README.md
similarity index 100%
rename from iterable/struct_iterable_internal/README.md
rename to crates/iterable/struct_iterable_internal/README.md
diff --git a/iterable/struct_iterable_internal/src/lib.rs b/crates/iterable/struct_iterable_internal/src/lib.rs
similarity index 100%
rename from iterable/struct_iterable_internal/src/lib.rs
rename to crates/iterable/struct_iterable_internal/src/lib.rs
diff --git a/parser/Cargo.lock b/parser/Cargo.lock
deleted file mode 100644
index 91514253c..000000000
--- a/parser/Cargo.lock
+++ /dev/null
@@ -1,2430 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 3
-
-[[package]]
-name = "addr2line"
-version = "0.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
-dependencies = [
- "gimli",
-]
-
-[[package]]
-name = "adler"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
-
-[[package]]
-name = "ahash"
-version = "0.8.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
-dependencies = [
- "cfg-if",
- "getrandom",
- "once_cell",
- "version_check",
- "zerocopy",
-]
-
-[[package]]
-name = "allocative"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "082af274fd02beef17b7f0725a49ecafe6c075ef56cac9d6363eb3916a9817ae"
-dependencies = [
- "allocative_derive",
- "ctor",
-]
-
-[[package]]
-name = "allocative_derive"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe233a377643e0fc1a56421d7c90acdec45c291b30345eb9f08e8d0ddce5a4ab"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.85",
-]
-
-[[package]]
-name = "android-tzdata"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
-
-[[package]]
-name = "android_system_properties"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "anstream"
-version = "0.6.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
-dependencies = [
- "anstyle",
- "anstyle-parse",
- "anstyle-query",
- "anstyle-wincon",
- "colorchoice",
- "is_terminal_polyfill",
- "utf8parse",
-]
-
-[[package]]
-name = "anstyle"
-version = "1.0.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
-
-[[package]]
-name = "anstyle-parse"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb"
-dependencies = [
- "utf8parse",
-]
-
-[[package]]
-name = "anstyle-query"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a"
-dependencies = [
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "anstyle-wincon"
-version = "3.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
-dependencies = [
- "anstyle",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "arrayvec"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
-
-[[package]]
-name = "atomic-waker"
-version = "1.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
-
-[[package]]
-name = "autocfg"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
-
-[[package]]
-name = "backtrace"
-version = "0.3.71"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d"
-dependencies = [
- "addr2line",
- "cc",
- "cfg-if",
- "libc",
- "miniz_oxide",
- "object",
- "rustc-demangle",
-]
-
-[[package]]
-name = "base58ck"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c8d66485a3a2ea485c1913c4572ce0256067a5377ac8c75c4960e1cda98605f"
-dependencies = [
- "bitcoin-internals",
- "bitcoin_hashes",
-]
-
-[[package]]
-name = "base64"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
-
-[[package]]
-name = "base64"
-version = "0.22.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
-
-[[package]]
-name = "bech32"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d965446196e3b7decd44aa7ee49e31d630118f90ef12f97900f262eb915c951d"
-
-[[package]]
-name = "bincode"
-version = "2.0.0-rc.3"
-source = "git+https://github.com/bincode-org/bincode.git#5a91c1210168b968b957a14b743cf134f2d20719"
-dependencies = [
- "bincode_derive",
- "serde",
- "unty",
-]
-
-[[package]]
-name = "bincode_derive"
-version = "2.0.0-rc.3"
-source = "git+https://github.com/bincode-org/bincode.git#5a91c1210168b968b957a14b743cf134f2d20719"
-dependencies = [
- "virtue",
-]
-
-[[package]]
-name = "bitcoin"
-version = "0.32.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0032b0e8ead7074cda7fc4f034409607e3f03a6f71d66ade8a307f79b4d99e73"
-dependencies = [
- "base58ck",
- "bech32",
- "bitcoin-internals",
- "bitcoin-io",
- "bitcoin-units",
- "bitcoin_hashes",
- "hex-conservative",
- "hex_lit",
- "secp256k1",
- "serde",
-]
-
-[[package]]
-name = "bitcoin-internals"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30bdbe14aa07b06e6cfeffc529a1f099e5fbe249524f8125358604df99a4bed2"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "bitcoin-io"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "340e09e8399c7bd8912f495af6aa58bea0c9214773417ffaa8f6460f93aaee56"
-
-[[package]]
-name = "bitcoin-units"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5285c8bcaa25876d07f37e3d30c303f2609179716e11d688f51e8f1fe70063e2"
-dependencies = [
- "bitcoin-internals",
- "serde",
-]
-
-[[package]]
-name = "bitcoin_hashes"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb18c03d0db0247e147a21a6faafd5a7eb851c743db062de72018b6b7e8e4d16"
-dependencies = [
- "bitcoin-io",
- "hex-conservative",
- "serde",
-]
-
-[[package]]
-name = "bitcoincore-rpc"
-version = "0.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aedd23ae0fd321affb4bbbc36126c6f49a32818dc6b979395d24da8c9d4e80ee"
-dependencies = [
- "bitcoincore-rpc-json",
- "jsonrpc",
- "log",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "bitcoincore-rpc-json"
-version = "0.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8909583c5fab98508e80ef73e5592a651c954993dc6b7739963257d19f0e71a"
-dependencies = [
- "bitcoin",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "biter"
-version = "0.1.1"
-dependencies = [
- "bitcoin",
- "bitcoincore-rpc",
- "crossbeam",
- "derived-deref",
- "rayon",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "bitflags"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-
-[[package]]
-name = "bitflags"
-version = "2.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
-
-[[package]]
-name = "bumpalo"
-version = "3.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
-
-[[package]]
-name = "bytemuck"
-version = "1.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae"
-
-[[package]]
-name = "byteorder"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
-
-[[package]]
-name = "bytes"
-version = "1.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3"
-
-[[package]]
-name = "cc"
-version = "1.1.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e80e3b6a3ab07840e1cae9b0666a63970dc28e8ed5ffbcdacbfc760c281bfc1"
-dependencies = [
- "jobserver",
- "libc",
- "shlex",
-]
-
-[[package]]
-name = "cfg-if"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-
-[[package]]
-name = "cfg_aliases"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
-
-[[package]]
-name = "chrono"
-version = "0.4.38"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
-dependencies = [
- "android-tzdata",
- "iana-time-zone",
- "js-sys",
- "num-traits",
- "serde",
- "wasm-bindgen",
- "windows-targets",
-]
-
-[[package]]
-name = "clap"
-version = "4.5.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8"
-dependencies = [
- "clap_builder",
- "clap_derive",
-]
-
-[[package]]
-name = "clap_builder"
-version = "4.5.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54"
-dependencies = [
- "anstream",
- "anstyle",
- "clap_lex",
- "strsim",
-]
-
-[[package]]
-name = "clap_derive"
-version = "4.5.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab"
-dependencies = [
- "heck",
- "proc-macro2",
- "quote",
- "syn 2.0.85",
-]
-
-[[package]]
-name = "clap_lex"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"
-
-[[package]]
-name = "color-eyre"
-version = "0.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55146f5e46f237f7423d74111267d4597b59b0dad0ffaf7303bce9945d843ad5"
-dependencies = [
- "backtrace",
- "color-spantrace",
- "eyre",
- "indenter",
- "once_cell",
- "owo-colors",
- "tracing-error",
-]
-
-[[package]]
-name = "color-spantrace"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd6be1b2a7e382e2b98b43b2adcca6bb0e465af0bdd38123873ae61eb17a72c2"
-dependencies = [
- "once_cell",
- "owo-colors",
- "tracing-core",
- "tracing-error",
-]
-
-[[package]]
-name = "colorchoice"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
-
-[[package]]
-name = "core-foundation"
-version = "0.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
-[[package]]
-name = "core-foundation-sys"
-version = "0.8.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
-
-[[package]]
-name = "crossbeam"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1137cd7e7fc0fb5d3c5a8678be38ec56e819125d8d7907411fe24ccb943faca8"
-dependencies = [
- "crossbeam-channel",
- "crossbeam-deque",
- "crossbeam-epoch",
- "crossbeam-queue",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-channel"
-version = "0.5.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2"
-dependencies = [
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-deque"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"
-dependencies = [
- "crossbeam-epoch",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-epoch"
-version = "0.9.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
-dependencies = [
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-queue"
-version = "0.3.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35"
-dependencies = [
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-utils"
-version = "0.8.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
-
-[[package]]
-name = "ctor"
-version = "0.1.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096"
-dependencies = [
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "ctrlc"
-version = "3.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90eeab0aa92f3f9b4e87f258c72b139c207d251f9cbc1080a0086b86a8870dd3"
-dependencies = [
- "nix",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "dashmap"
-version = "6.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf"
-dependencies = [
- "cfg-if",
- "crossbeam-utils",
- "hashbrown 0.14.5",
- "lock_api",
- "once_cell",
- "parking_lot_core 0.9.10",
-]
-
-[[package]]
-name = "derive_deref"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcdbcee2d9941369faba772587a565f4f534e42cb8d17e5295871de730163b2b"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "derived-deref"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "805ef2023ccd65425743a91ecd11fc020979a0b01921db3104fb606d18a7b43e"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.85",
-]
-
-[[package]]
-name = "either"
-version = "1.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
-
-[[package]]
-name = "encoding_rs"
-version = "0.8.34"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "env_filter"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab"
-dependencies = [
- "log",
-]
-
-[[package]]
-name = "env_logger"
-version = "0.11.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d"
-dependencies = [
- "env_filter",
- "log",
-]
-
-[[package]]
-name = "equivalent"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
-
-[[package]]
-name = "errno"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
-dependencies = [
- "libc",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "eyre"
-version = "0.6.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec"
-dependencies = [
- "indenter",
- "once_cell",
-]
-
-[[package]]
-name = "fastrand"
-version = "2.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6"
-
-[[package]]
-name = "fnv"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
-
-[[package]]
-name = "foreign-types"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
-dependencies = [
- "foreign-types-shared",
-]
-
-[[package]]
-name = "foreign-types-shared"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
-
-[[package]]
-name = "form_urlencoded"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
-dependencies = [
- "percent-encoding",
-]
-
-[[package]]
-name = "fs2"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213"
-dependencies = [
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "futures-channel"
-version = "0.3.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
-dependencies = [
- "futures-core",
- "futures-sink",
-]
-
-[[package]]
-name = "futures-core"
-version = "0.3.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
-
-[[package]]
-name = "futures-io"
-version = "0.3.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
-
-[[package]]
-name = "futures-sink"
-version = "0.3.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
-
-[[package]]
-name = "futures-task"
-version = "0.3.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
-
-[[package]]
-name = "futures-util"
-version = "0.3.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
-dependencies = [
- "futures-core",
- "futures-io",
- "futures-sink",
- "futures-task",
- "memchr",
- "pin-project-lite",
- "pin-utils",
- "slab",
-]
-
-[[package]]
-name = "getrandom"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
-dependencies = [
- "cfg-if",
- "libc",
- "wasi",
-]
-
-[[package]]
-name = "gimli"
-version = "0.28.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
-
-[[package]]
-name = "h2"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205"
-dependencies = [
- "atomic-waker",
- "bytes",
- "fnv",
- "futures-core",
- "futures-sink",
- "http",
- "indexmap",
- "slab",
- "tokio",
- "tokio-util",
- "tracing",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.14.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
-
-[[package]]
-name = "hashbrown"
-version = "0.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb"
-
-[[package]]
-name = "heck"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
-
-[[package]]
-name = "hermit-abi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
-
-[[package]]
-name = "hermit-abi"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc"
-
-[[package]]
-name = "hex-conservative"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5313b072ce3c597065a808dbf612c4c8e8590bdbf8b579508bf7a762c5eae6cd"
-dependencies = [
- "arrayvec",
-]
-
-[[package]]
-name = "hex_lit"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3011d1213f159867b13cfd6ac92d2cd5f1345762c63be3554e84092d85a50bbd"
-
-[[package]]
-name = "http"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258"
-dependencies = [
- "bytes",
- "fnv",
- "itoa",
-]
-
-[[package]]
-name = "http-body"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
-dependencies = [
- "bytes",
- "http",
-]
-
-[[package]]
-name = "http-body-util"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f"
-dependencies = [
- "bytes",
- "futures-util",
- "http",
- "http-body",
- "pin-project-lite",
-]
-
-[[package]]
-name = "httparse"
-version = "1.9.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946"
-
-[[package]]
-name = "hyper"
-version = "1.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05"
-dependencies = [
- "bytes",
- "futures-channel",
- "futures-util",
- "h2",
- "http",
- "http-body",
- "httparse",
- "itoa",
- "pin-project-lite",
- "smallvec",
- "tokio",
- "want",
-]
-
-[[package]]
-name = "hyper-rustls"
-version = "0.27.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333"
-dependencies = [
- "futures-util",
- "http",
- "hyper",
- "hyper-util",
- "rustls",
- "rustls-pki-types",
- "tokio",
- "tokio-rustls",
- "tower-service",
-]
-
-[[package]]
-name = "hyper-tls"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"
-dependencies = [
- "bytes",
- "http-body-util",
- "hyper",
- "hyper-util",
- "native-tls",
- "tokio",
- "tokio-native-tls",
- "tower-service",
-]
-
-[[package]]
-name = "hyper-util"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41296eb09f183ac68eec06e03cdbea2e759633d4067b2f6552fc2e009bcad08b"
-dependencies = [
- "bytes",
- "futures-channel",
- "futures-util",
- "http",
- "http-body",
- "hyper",
- "pin-project-lite",
- "socket2",
- "tokio",
- "tower-service",
- "tracing",
-]
-
-[[package]]
-name = "iana-time-zone"
-version = "0.1.61"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220"
-dependencies = [
- "android_system_properties",
- "core-foundation-sys",
- "iana-time-zone-haiku",
- "js-sys",
- "wasm-bindgen",
- "windows-core",
-]
-
-[[package]]
-name = "iana-time-zone-haiku"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
-dependencies = [
- "cc",
-]
-
-[[package]]
-name = "idna"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
-dependencies = [
- "unicode-bidi",
- "unicode-normalization",
-]
-
-[[package]]
-name = "indenter"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683"
-
-[[package]]
-name = "indexmap"
-version = "2.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
-dependencies = [
- "equivalent",
- "hashbrown 0.15.0",
-]
-
-[[package]]
-name = "inferno"
-version = "0.11.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "232929e1d75fe899576a3d5c7416ad0d88dbfbb3c3d6aa00873a7408a50ddb88"
-dependencies = [
- "ahash",
- "clap",
- "crossbeam-channel",
- "crossbeam-utils",
- "dashmap",
- "env_logger",
- "indexmap",
- "is-terminal",
- "itoa",
- "log",
- "num-format",
- "once_cell",
- "quick-xml",
- "rgb",
- "str_stack",
-]
-
-[[package]]
-name = "instant"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "ipnet"
-version = "2.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708"
-
-[[package]]
-name = "is-terminal"
-version = "0.4.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b"
-dependencies = [
- "hermit-abi 0.4.0",
- "libc",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "is_terminal_polyfill"
-version = "1.70.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
-
-[[package]]
-name = "itertools"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
-dependencies = [
- "either",
-]
-
-[[package]]
-name = "itoa"
-version = "1.0.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
-
-[[package]]
-name = "jobserver"
-version = "0.1.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "js-sys"
-version = "0.3.70"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
-dependencies = [
- "wasm-bindgen",
-]
-
-[[package]]
-name = "jsonrpc"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3662a38d341d77efecb73caf01420cfa5aa63c0253fd7bc05289ef9f6616e1bf"
-dependencies = [
- "base64 0.13.1",
- "minreq",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "lazy_static"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
-
-[[package]]
-name = "libc"
-version = "0.2.159"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5"
-
-[[package]]
-name = "linux-raw-sys"
-version = "0.4.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
-
-[[package]]
-name = "lock_api"
-version = "0.4.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
-dependencies = [
- "autocfg",
- "scopeguard",
-]
-
-[[package]]
-name = "log"
-version = "0.4.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
-
-[[package]]
-name = "memchr"
-version = "2.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
-
-[[package]]
-name = "memmap2"
-version = "0.9.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "mime"
-version = "0.3.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
-
-[[package]]
-name = "miniz_oxide"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
-dependencies = [
- "adler",
-]
-
-[[package]]
-name = "minreq"
-version = "2.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "763d142cdff44aaadd9268bebddb156ef6c65a0e13486bb81673cf2d8739f9b0"
-dependencies = [
- "log",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "mio"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
-dependencies = [
- "hermit-abi 0.3.9",
- "libc",
- "wasi",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "native-tls"
-version = "0.2.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466"
-dependencies = [
- "libc",
- "log",
- "openssl",
- "openssl-probe",
- "openssl-sys",
- "schannel",
- "security-framework",
- "security-framework-sys",
- "tempfile",
-]
-
-[[package]]
-name = "nix"
-version = "0.29.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
-dependencies = [
- "bitflags 2.6.0",
- "cfg-if",
- "cfg_aliases",
- "libc",
-]
-
-[[package]]
-name = "num-format"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a652d9771a63711fd3c3deb670acfbe5c30a4072e664d7a3bf5a9e1056ac72c3"
-dependencies = [
- "arrayvec",
- "itoa",
-]
-
-[[package]]
-name = "num-traits"
-version = "0.2.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "object"
-version = "0.32.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "once_cell"
-version = "1.20.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
-
-[[package]]
-name = "openssl"
-version = "0.10.66"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1"
-dependencies = [
- "bitflags 2.6.0",
- "cfg-if",
- "foreign-types",
- "libc",
- "once_cell",
- "openssl-macros",
- "openssl-sys",
-]
-
-[[package]]
-name = "openssl-macros"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.85",
-]
-
-[[package]]
-name = "openssl-probe"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
-
-[[package]]
-name = "openssl-sys"
-version = "0.9.103"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6"
-dependencies = [
- "cc",
- "libc",
- "pkg-config",
- "vcpkg",
-]
-
-[[package]]
-name = "ordered-float"
-version = "4.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83e7ccb95e240b7c9506a3d544f10d935e142cc90b0a1d56954fb44d89ad6b97"
-dependencies = [
- "num-traits",
-]
-
-[[package]]
-name = "owo-colors"
-version = "3.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f"
-
-[[package]]
-name = "parking_lot"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
-dependencies = [
- "instant",
- "lock_api",
- "parking_lot_core 0.8.6",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.8.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc"
-dependencies = [
- "cfg-if",
- "instant",
- "libc",
- "redox_syscall 0.2.16",
- "smallvec",
- "winapi",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.9.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
-dependencies = [
- "cfg-if",
- "libc",
- "redox_syscall 0.5.7",
- "smallvec",
- "windows-targets",
-]
-
-[[package]]
-name = "parser"
-version = "0.5.0"
-dependencies = [
- "allocative",
- "bincode",
- "bitcoin_hashes",
- "biter",
- "chrono",
- "clap",
- "color-eyre",
- "ctrlc",
- "derive_deref",
- "inferno",
- "itertools",
- "ordered-float",
- "rayon",
- "reqwest",
- "sanakirja",
- "serde",
- "serde_json",
- "struct_iterable",
- "toml",
- "zstd",
-]
-
-[[package]]
-name = "percent-encoding"
-version = "2.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
-
-[[package]]
-name = "pin-project-lite"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
-
-[[package]]
-name = "pin-utils"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
-
-[[package]]
-name = "pkg-config"
-version = "0.3.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
-
-[[package]]
-name = "ppv-lite86"
-version = "0.2.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
-dependencies = [
- "zerocopy",
-]
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.89"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e"
-dependencies = [
- "unicode-ident",
-]
-
-[[package]]
-name = "quick-xml"
-version = "0.26.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f50b1c63b38611e7d4d7f68b82d3ad0cc71a2ad2e7f61fc10f1328d917c93cd"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.37"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
-dependencies = [
- "proc-macro2",
-]
-
-[[package]]
-name = "rand"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
-dependencies = [
- "libc",
- "rand_chacha",
- "rand_core",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
-dependencies = [
- "ppv-lite86",
- "rand_core",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
-dependencies = [
- "getrandom",
-]
-
-[[package]]
-name = "rayon"
-version = "1.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
-dependencies = [
- "either",
- "rayon-core",
-]
-
-[[package]]
-name = "rayon-core"
-version = "1.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
-dependencies = [
- "crossbeam-deque",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
-dependencies = [
- "bitflags 1.3.2",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.5.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f"
-dependencies = [
- "bitflags 2.6.0",
-]
-
-[[package]]
-name = "reqwest"
-version = "0.12.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f"
-dependencies = [
- "base64 0.22.1",
- "bytes",
- "encoding_rs",
- "futures-channel",
- "futures-core",
- "futures-util",
- "h2",
- "http",
- "http-body",
- "http-body-util",
- "hyper",
- "hyper-rustls",
- "hyper-tls",
- "hyper-util",
- "ipnet",
- "js-sys",
- "log",
- "mime",
- "native-tls",
- "once_cell",
- "percent-encoding",
- "pin-project-lite",
- "rustls-pemfile",
- "serde",
- "serde_json",
- "serde_urlencoded",
- "sync_wrapper",
- "system-configuration",
- "tokio",
- "tokio-native-tls",
- "tower-service",
- "url",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
- "windows-registry",
-]
-
-[[package]]
-name = "rgb"
-version = "0.8.50"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57397d16646700483b67d2dd6511d79318f9d057fdbd21a4066aeac8b41d310a"
-dependencies = [
- "bytemuck",
-]
-
-[[package]]
-name = "ring"
-version = "0.17.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
-dependencies = [
- "cc",
- "cfg-if",
- "getrandom",
- "libc",
- "spin",
- "untrusted",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "rustc-demangle"
-version = "0.1.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
-
-[[package]]
-name = "rustix"
-version = "0.38.37"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811"
-dependencies = [
- "bitflags 2.6.0",
- "errno",
- "libc",
- "linux-raw-sys",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "rustls"
-version = "0.23.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "415d9944693cb90382053259f89fbb077ea730ad7273047ec63b19bc9b160ba8"
-dependencies = [
- "once_cell",
- "rustls-pki-types",
- "rustls-webpki",
- "subtle",
- "zeroize",
-]
-
-[[package]]
-name = "rustls-pemfile"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50"
-dependencies = [
- "rustls-pki-types",
-]
-
-[[package]]
-name = "rustls-pki-types"
-version = "1.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e696e35370c65c9c541198af4543ccd580cf17fc25d8e05c5a242b202488c55"
-
-[[package]]
-name = "rustls-webpki"
-version = "0.102.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9"
-dependencies = [
- "ring",
- "rustls-pki-types",
- "untrusted",
-]
-
-[[package]]
-name = "ryu"
-version = "1.0.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
-
-[[package]]
-name = "sanakirja"
-version = "1.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81aaf70d064e2122209f04d01fd91e8908e7a327b516236e1cbc0c3f34ac6d11"
-dependencies = [
- "fs2",
- "log",
- "memmap2",
- "parking_lot",
- "sanakirja-core",
- "serde",
- "thiserror",
-]
-
-[[package]]
-name = "sanakirja-core"
-version = "1.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8376db34ae3eac6e7bd91168bc638450073b708ce9fb46940de676f552238bf5"
-
-[[package]]
-name = "schannel"
-version = "0.1.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1"
-dependencies = [
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "scopeguard"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
-
-[[package]]
-name = "secp256k1"
-version = "0.29.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9465315bc9d4566e1724f0fffcbcc446268cb522e60f9a27bcded6b19c108113"
-dependencies = [
- "bitcoin_hashes",
- "rand",
- "secp256k1-sys",
- "serde",
-]
-
-[[package]]
-name = "secp256k1-sys"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4387882333d3aa8cb20530a17c69a3752e97837832f34f6dccc760e715001d9"
-dependencies = [
- "cc",
-]
-
-[[package]]
-name = "security-framework"
-version = "2.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
-dependencies = [
- "bitflags 2.6.0",
- "core-foundation",
- "core-foundation-sys",
- "libc",
- "security-framework-sys",
-]
-
-[[package]]
-name = "security-framework-sys"
-version = "2.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
-[[package]]
-name = "serde"
-version = "1.0.214"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f55c3193aca71c12ad7890f1785d2b73e1b9f63a0bbc353c08ef26fe03fc56b5"
-dependencies = [
- "serde_derive",
-]
-
-[[package]]
-name = "serde_derive"
-version = "1.0.214"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.85",
-]
-
-[[package]]
-name = "serde_json"
-version = "1.0.132"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03"
-dependencies = [
- "itoa",
- "memchr",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "serde_spanned"
-version = "0.6.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "serde_urlencoded"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
-dependencies = [
- "form_urlencoded",
- "itoa",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "sharded-slab"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
-dependencies = [
- "lazy_static",
-]
-
-[[package]]
-name = "shlex"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
-
-[[package]]
-name = "slab"
-version = "0.4.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "smallvec"
-version = "1.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
-
-[[package]]
-name = "socket2"
-version = "0.5.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
-dependencies = [
- "libc",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "spin"
-version = "0.9.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
-
-[[package]]
-name = "str_stack"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9091b6114800a5f2141aee1d1b9d6ca3592ac062dc5decb3764ec5895a47b4eb"
-
-[[package]]
-name = "strsim"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
-
-[[package]]
-name = "struct_iterable"
-version = "0.1.2"
-dependencies = [
- "struct_iterable_derive",
- "struct_iterable_internal",
-]
-
-[[package]]
-name = "struct_iterable_derive"
-version = "0.1.0"
-dependencies = [
- "proc-macro2",
- "quote",
- "struct_iterable_internal",
- "syn 2.0.85",
-]
-
-[[package]]
-name = "struct_iterable_internal"
-version = "0.1.1"
-
-[[package]]
-name = "subtle"
-version = "2.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
-
-[[package]]
-name = "syn"
-version = "1.0.109"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.85"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5023162dfcd14ef8f32034d8bcd4cc5ddc61ef7a247c024a33e24e1f24d21b56"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "sync_wrapper"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394"
-dependencies = [
- "futures-core",
-]
-
-[[package]]
-name = "system-configuration"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b"
-dependencies = [
- "bitflags 2.6.0",
- "core-foundation",
- "system-configuration-sys",
-]
-
-[[package]]
-name = "system-configuration-sys"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
-[[package]]
-name = "tempfile"
-version = "3.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b"
-dependencies = [
- "cfg-if",
- "fastrand",
- "once_cell",
- "rustix",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "thiserror"
-version = "1.0.64"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84"
-dependencies = [
- "thiserror-impl",
-]
-
-[[package]]
-name = "thiserror-impl"
-version = "1.0.64"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.85",
-]
-
-[[package]]
-name = "thread_local"
-version = "1.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
-dependencies = [
- "cfg-if",
- "once_cell",
-]
-
-[[package]]
-name = "tinyvec"
-version = "1.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938"
-dependencies = [
- "tinyvec_macros",
-]
-
-[[package]]
-name = "tinyvec_macros"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
-
-[[package]]
-name = "tokio"
-version = "1.40.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998"
-dependencies = [
- "backtrace",
- "bytes",
- "libc",
- "mio",
- "pin-project-lite",
- "socket2",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "tokio-native-tls"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2"
-dependencies = [
- "native-tls",
- "tokio",
-]
-
-[[package]]
-name = "tokio-rustls"
-version = "0.26.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
-dependencies = [
- "rustls",
- "rustls-pki-types",
- "tokio",
-]
-
-[[package]]
-name = "tokio-util"
-version = "0.7.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a"
-dependencies = [
- "bytes",
- "futures-core",
- "futures-sink",
- "pin-project-lite",
- "tokio",
-]
-
-[[package]]
-name = "toml"
-version = "0.8.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e"
-dependencies = [
- "serde",
- "serde_spanned",
- "toml_datetime",
- "toml_edit",
-]
-
-[[package]]
-name = "toml_datetime"
-version = "0.6.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "toml_edit"
-version = "0.22.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"
-dependencies = [
- "indexmap",
- "serde",
- "serde_spanned",
- "toml_datetime",
- "winnow",
-]
-
-[[package]]
-name = "tower-service"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
-
-[[package]]
-name = "tracing"
-version = "0.1.40"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
-dependencies = [
- "pin-project-lite",
- "tracing-core",
-]
-
-[[package]]
-name = "tracing-core"
-version = "0.1.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
-dependencies = [
- "once_cell",
- "valuable",
-]
-
-[[package]]
-name = "tracing-error"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d686ec1c0f384b1277f097b2f279a2ecc11afe8c133c1aabf036a27cb4cd206e"
-dependencies = [
- "tracing",
- "tracing-subscriber",
-]
-
-[[package]]
-name = "tracing-subscriber"
-version = "0.3.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b"
-dependencies = [
- "sharded-slab",
- "thread_local",
- "tracing-core",
-]
-
-[[package]]
-name = "try-lock"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
-
-[[package]]
-name = "unicode-bidi"
-version = "0.3.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893"
-
-[[package]]
-name = "unicode-ident"
-version = "1.0.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
-
-[[package]]
-name = "unicode-normalization"
-version = "0.1.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956"
-dependencies = [
- "tinyvec",
-]
-
-[[package]]
-name = "untrusted"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
-
-[[package]]
-name = "unty"
-version = "0.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1a88342087869553c259588a3ec9ca73ce9b2d538b7051ba5789ff236b6c129"
-
-[[package]]
-name = "url"
-version = "2.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
-dependencies = [
- "form_urlencoded",
- "idna",
- "percent-encoding",
-]
-
-[[package]]
-name = "utf8parse"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
-
-[[package]]
-name = "valuable"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
-
-[[package]]
-name = "vcpkg"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
-
-[[package]]
-name = "version_check"
-version = "0.9.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
-
-[[package]]
-name = "virtue"
-version = "0.0.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7302ac74a033bf17b6e609ceec0f891ca9200d502d31f02dc7908d3d98767c9d"
-
-[[package]]
-name = "want"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e"
-dependencies = [
- "try-lock",
-]
-
-[[package]]
-name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
-
-[[package]]
-name = "wasm-bindgen"
-version = "0.2.93"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
-dependencies = [
- "cfg-if",
- "once_cell",
- "wasm-bindgen-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.93"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
-dependencies = [
- "bumpalo",
- "log",
- "once_cell",
- "proc-macro2",
- "quote",
- "syn 2.0.85",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-futures"
-version = "0.4.43"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed"
-dependencies = [
- "cfg-if",
- "js-sys",
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "wasm-bindgen-macro"
-version = "0.2.93"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
-dependencies = [
- "quote",
- "wasm-bindgen-macro-support",
-]
-
-[[package]]
-name = "wasm-bindgen-macro-support"
-version = "0.2.93"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.85",
- "wasm-bindgen-backend",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-shared"
-version = "0.2.93"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
-
-[[package]]
-name = "web-sys"
-version = "0.3.70"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0"
-dependencies = [
- "js-sys",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
-[[package]]
-name = "windows-core"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
-dependencies = [
- "windows-targets",
-]
-
-[[package]]
-name = "windows-registry"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0"
-dependencies = [
- "windows-result",
- "windows-strings",
- "windows-targets",
-]
-
-[[package]]
-name = "windows-result"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e"
-dependencies = [
- "windows-targets",
-]
-
-[[package]]
-name = "windows-strings"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10"
-dependencies = [
- "windows-result",
- "windows-targets",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
-dependencies = [
- "windows-targets",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.59.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
-dependencies = [
- "windows-targets",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
-dependencies = [
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc",
- "windows_i686_gnu",
- "windows_i686_gnullvm",
- "windows_i686_msvc",
- "windows_x86_64_gnu",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc",
-]
-
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
-
-[[package]]
-name = "windows_i686_gnullvm"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
-
-[[package]]
-name = "winnow"
-version = "0.6.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "zerocopy"
-version = "0.7.35"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
-dependencies = [
- "byteorder",
- "zerocopy-derive",
-]
-
-[[package]]
-name = "zerocopy-derive"
-version = "0.7.35"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.85",
-]
-
-[[package]]
-name = "zeroize"
-version = "1.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
-
-[[package]]
-name = "zstd"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9"
-dependencies = [
- "zstd-safe",
-]
-
-[[package]]
-name = "zstd-safe"
-version = "7.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54a3ab4db68cea366acc5c897c7b4d4d1b8994a9cd6e6f841f8964566a419059"
-dependencies = [
- "zstd-sys",
-]
-
-[[package]]
-name = "zstd-sys"
-version = "2.0.13+zstd.1.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa"
-dependencies = [
- "cc",
- "pkg-config",
-]
diff --git a/parser/Cargo.toml b/parser/Cargo.toml
deleted file mode 100644
index bf12d64de..000000000
--- a/parser/Cargo.toml
+++ /dev/null
@@ -1,32 +0,0 @@
-[package]
-name = "parser"
-version = "0.5.0"
-edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-allocative = "0.3.3"
-bincode = { git = "https://github.com/bincode-org/bincode.git", features = [
-    "serde",
-] }
-bitcoin_hashes = { version = "0.14.0" }
-biter = { path = "../biter" }
-chrono = { version = "0.4.38", features = ["serde"] }
-clap = { version = "4.5.20", features = ["derive"] }
-color-eyre = "0.6.3"
-ctrlc = { version = "3.4.5", features = ["termination"] }
-derive_deref = "1.1.1"
-inferno = "0.11.21"
-itertools = "0.13.0"
-ordered-float = "4.4.0"
-rayon = "1.10.0"
-reqwest = { version = "0.12.9", features = ["blocking", "json"] }
-sanakirja = "1.4.3"
-serde = { version = "1.0.214", features = ["derive"] }
-serde_json = "1.0.132"
-struct_iterable = { path = "../iterable" }
-toml = "0.8.19"
-zstd = "0.13.2"
-# memory-stats = "1.2.0"
-# sysinfo = "0.32.0"
diff --git a/parser/reset.sh b/parser/reset.sh
deleted file mode 100755
index d7a64be38..000000000
--- a/parser/reset.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-
-echo "Deleting datasets..."
-rm -r ../datasets
-echo "Deleting states and databases..."
-rm -r ./out
-echo "Done."
diff --git a/parser/samply.sh b/parser/samply.sh
deleted file mode 100755
index 6376c139a..000000000
--- a/parser/samply.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-
-echo "Increasing limit of opened files..."
-ulimit -n 1000000
-
-# Needed because the datasets tree is too big lol
-echo "Increasing stack size..."
-ulimit -s $(ulimit -Hs)
-
-cargo build --profile profiling && samply record ./target/profiling/parser "$HOME/Developer/bitcoin"
diff --git a/parser/src/databases/_trait.rs b/parser/src/databases/_trait.rs
deleted file mode 100644
index acf040d0b..000000000
--- a/parser/src/databases/_trait.rs
+++ /dev/null
@@ -1,52 +0,0 @@
-use std::{fs, io, path::PathBuf};
-
-use crate::{
-    io::OUTPUTS_FOLDER_PATH,
-    structs::{Date, Height},
-    utils::log,
-};
-
-use super::AnyDatabase;
-
-pub trait AnyDatabaseGroup
-where
-    Self: Sized,
-{
-    fn init() -> Self {
-        let s = Self::import();
-        s.create_dir_all().unwrap();
-        s
-    }
-
-    fn import() -> Self;
-
-    fn folder<'a>() -> &'a str;
-
-    fn drain_to_vec(&mut self) -> Vec<Box<dyn AnyDatabase + Send>>;
-    fn open_all(&mut self);
-
-    fn export_metadata(&mut self, height: Height, date: Date) -> color_eyre::Result<()>;
-
-    fn create_dir_all(&self) -> color_eyre::Result<(), io::Error>;
-
-    fn remove_dir_all(&self) -> color_eyre::Result<(), io::Error> {
-        fs::remove_dir_all(Self::root())
-    }
-
-    fn reset(&mut self) -> color_eyre::Result<(), io::Error> {
-        log(&format!("Reset {}", Self::folder()));
-
-        self.reset_metadata();
-        self.remove_dir_all()?;
-        self.create_dir_all()?;
-
-        Ok(())
-    }
-
-    fn reset_metadata(&mut self);
-
-    fn root() -> PathBuf {
-        let folder = Self::folder();
-        PathBuf::from(format!("{OUTPUTS_FOLDER_PATH}/databases/{folder}"))
-    }
-}
diff --git a/parser/src/io/consts.rs b/parser/src/io/consts.rs
deleted file mode 100644
index 750f7edb0..000000000
--- a/parser/src/io/consts.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-pub const INPUTS_FOLDER_PATH: &str = "./in";
-pub const OUTPUTS_FOLDER_PATH: &str = "./out";
diff --git a/parser/src/lib.rs b/parser/src/lib.rs
deleted file mode 100644
index c0b5efd29..000000000
--- a/parser/src/lib.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-mod actions;
-mod databases;
-mod datasets;
-mod io;
-mod price;
-mod states;
-mod structs;
-mod utils;
-
-pub use crate::{
-    actions::iter_blocks,
-    databases::{AnyDatabase, Database},
-    io::{Binary, Json, Serialization, COMPRESSED_BIN_EXTENSION, JSON_EXTENSION},
-    structs::{
-        Amount, Config, Date, DateMap, Exit, Height, HeightMap, MapChunkId, MapValue,
-        SerializedBTreeMap, SerializedVec, TxoutIndex, HEIGHT_MAP_CHUNK_SIZE, OHLC,
-    },
-    utils::{create_rpc, log, reset_logs},
-};
diff --git a/parser/src/main.rs b/parser/src/main.rs
deleted file mode 100644
index a95380569..000000000
--- a/parser/src/main.rs
+++ /dev/null
@@ -1,36 +0,0 @@
-use std::{thread::sleep, time::Duration};
-
-use biter::bitcoincore_rpc::RpcApi;
-use parser::{create_rpc, iter_blocks, log, reset_logs, Config, Exit};
-
-fn main() -> color_eyre::Result<()> {
-    color_eyre::install()?;
-
-    reset_logs();
-
-    let mut config = Config::import()?;
-
-    let rpc = create_rpc(&config).unwrap();
-
-    let exit = Exit::new();
-
-    loop {
-        let block_count = rpc.get_blockchain_info().unwrap().blocks as usize;
-
-        log(&format!("{block_count} blocks found."));
-
-        iter_blocks(&mut config, &rpc, block_count, exit.clone())?;
-
-        if let Some(delay) = config.delay {
-            sleep(Duration::from_secs(delay))
-        }
-
-        log("Waiting for a new block...\n");
-
-        while block_count == rpc.get_blockchain_info().unwrap().blocks as usize {
-            sleep(Duration::from_secs(1))
-        }
-    }
-
-    // Ok(())
-}
diff --git a/parser/src/states/_trait.rs b/parser/src/states/_trait.rs
deleted file mode 100644
index 2b82fbd94..000000000
--- a/parser/src/states/_trait.rs
+++ /dev/null
@@ -1,48 +0,0 @@
-use std::{fmt::Debug, fs, io, path::Path};
-
-use bincode::{Decode, Encode};
-use serde::{de::DeserializeOwned, Serialize};
-
-use crate::{io::OUTPUTS_FOLDER_PATH, Serialization};
-
-// https://github.com/djkoloski/rust_serialization_benchmark
-pub trait AnyState
-where
-    Self: Debug + Encode + Decode + Serialize + DeserializeOwned,
-{
-    fn name<'a>() -> &'a str;
-
-    fn create_dir_all() -> color_eyre::Result<(), io::Error> {
-        fs::create_dir_all(Self::folder_path())
-    }
-
-    fn folder_path() -> String {
-        format!("{OUTPUTS_FOLDER_PATH}/states")
-    }
-
-    fn full_path() -> String {
-        let name = Self::name();
-
-        let folder_path = Self::folder_path();
-
-        format!("{folder_path}/{name}")
-    }
-
-    fn reset(&mut self) -> color_eyre::Result<(), io::Error> {
-        self.clear();
-
-        fs::remove_file(Self::full_path())
-    }
-
-    fn import() -> color_eyre::Result<Self> {
-        Self::create_dir_all()?;
-
-        Serialization::Binary.import(Path::new(&Self::full_path()))
-    }
-
-    fn export(&self) -> color_eyre::Result<()> {
-        Serialization::Binary.export(Path::new(&Self::full_path()), self)
-    }
-
-    fn clear(&mut self);
-}
diff --git a/parser/src/utils/log.rs b/parser/src/utils/log.rs
deleted file mode 100644
index d6593f75f..000000000
--- a/parser/src/utils/log.rs
+++ /dev/null
@@ -1,34 +0,0 @@
-use std::{
-    fs::{self, OpenOptions},
-    io::Write,
-};
-
-use chrono::Local;
-use color_eyre::owo_colors::OwoColorize;
-
-const LOG_PATH: &str = "./.log";
-
-pub fn reset_logs() {
-    let _ = fs::remove_file(LOG_PATH);
-}
-
-#[inline(always)]
-pub fn log(str: &str) {
-    let date_time = format!("{}", Local::now().format("%Y-%m-%d %H:%M:%S -"));
-
-    str.lines()
-        .filter(|line| !line.is_empty())
-        .for_each(|line| {
-            let mut file = OpenOptions::new()
-                .create(true)
-                .append(true)
-                .open(LOG_PATH)
-                .unwrap();
-
-            if let Err(e) = writeln!(file, "{} {}", date_time, line) {
-                eprintln!("Couldn't write to file: {}", e);
-            }
-
-            println!("{} {}", date_time.bright_black(), line);
-        });
-}
diff --git a/parser/run.sh b/run.sh
similarity index 89%
rename from parser/run.sh
rename to run.sh
index b82977f49..24531425a 100755
--- a/parser/run.sh
+++ b/run.sh
@@ -4,7 +4,7 @@
 
 if command -v ulimit &> /dev/null; then
     echo "Increasing limit of opened files..."
-    ulimit -n 1000000 # Can't be $(ulimit -Hn), bitcoind needs some too !
+    # ulimit -n 1000000 # Can't be $(ulimit -Hn), bitcoind needs some too !
 
     # Needed because the datasets tree is too big lol
     echo "Increasing stack size..."
diff --git a/server/Cargo.toml b/server/Cargo.toml
deleted file mode 100644
index 92c9921f3..000000000
--- a/server/Cargo.toml
+++ /dev/null
@@ -1,22 +0,0 @@
-[package]
-name = "server"
-version = "0.5.0"
-edition = "2021"
-
-[dependencies]
-axum = "0.7.7"
-bincode = { git = "https://github.com/bincode-org/bincode.git" }
-chrono = "0.4.38"
-color-eyre = "0.6.3"
-derive_deref = "1.1.1"
-itertools = "0.13.0"
-parser = { path = "../parser" }
-regex = "1.11.0"
-reqwest = { version = "0.12.8", features = ["json"] }
-serde = { version = "1.0.210", features = ["derive"] }
-serde_json = { version = "1.0.128" }
-swc = "0.289.1"
-swc_common = "0.40.1"
-tokio = { version = "1.40.0", features = ["full"] }
-tower-http = { version = "0.6.1", features = ["compression-full"] }
-# oxc = { version = "0.34.0", features = ["codegen", "minifier"] }
diff --git a/server/restart-cloudflared.sh b/server/restart-cloudflared.sh
deleted file mode 100755
index fa1695f7a..000000000
--- a/server/restart-cloudflared.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-sudo launchctl stop com.cloudflare.cloudflared
-sudo launchctl unload /Library/LaunchDaemons/com.cloudflare.cloudflared.plist
-sudo launchctl load /Library/LaunchDaemons/com.cloudflare.cloudflared.plist
-sudo launchctl start com.cloudflare.cloudflared
diff --git a/server/run.sh b/server/run.sh
deleted file mode 100755
index 77a22baac..000000000
--- a/server/run.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-
-if cargo watch --help &> /dev/null; then
-    TRIGGER="./in/datasets_len.txt"
-
-    if [ ! -f "$TRIGGER" ]; then
-        mkdir "./in"
-        echo "0" > $TRIGGER
-    fi
-
-    cargo watch --no-vcs-ignores -w "./src" -w "$TRIGGER" -x "run -r"
-else
-    cargo run -r
-fi
diff --git a/server/src/api/structs/routes.rs b/server/src/api/structs/routes.rs
deleted file mode 100644
index fc33fbf5d..000000000
--- a/server/src/api/structs/routes.rs
+++ /dev/null
@@ -1,157 +0,0 @@
-use std::{
-    collections::{BTreeMap, HashMap},
-    fs,
-    path::{Path, PathBuf},
-};
-
-use derive_deref::{Deref, DerefMut};
-use itertools::Itertools;
-use parser::{Json, Serialization};
-
-use crate::Grouped;
-
-use super::Paths;
-
-#[derive(Clone, Debug)]
-pub struct Route {
-    pub url_path: String,
-    pub file_path: PathBuf,
-    pub values_type: String,
-    pub serialization: Serialization,
-}
-
-#[derive(Clone, Default, Deref, DerefMut)]
-pub struct Routes(pub Grouped<HashMap<String, Route>>);
-
-const INPUTS_PATH: &str = "./in";
-const WEBSITE_TYPES_PATH: &str = "../website/scripts/types";
-
-impl Routes {
-    pub fn build() -> Self {
-        let path_to_type: BTreeMap<String, String> =
-            Json::import(Path::new(&format!("{INPUTS_PATH}/disk_path_to_type.json"))).unwrap();
-
-        let mut routes = Routes::default();
-
-        path_to_type.into_iter().for_each(|(key, value)| {
-            let mut split_key = key.split('/').collect_vec();
-            let last = split_key.pop().unwrap().to_owned();
-
-            let mut skip = 2;
-
-            let mut serialization = Serialization::Binary;
-
-            if *split_key.get(1).unwrap() == "price" {
-                skip = 1;
-                serialization = Serialization::Json;
-            }
-
-            let mut split_key = split_key.iter().skip(skip).collect_vec();
-
-            // Use case for: "../datasets/last": "Value",
-            if split_key.is_empty() {
-                split_key.push(&"last");
-            }
-
-            let map_key = split_key.iter().join("_");
-
-            let url_path = split_key.iter().join("-");
-
-            let file_path = PathBuf::from(key.to_owned());
-            let values_type = value.to_owned();
-
-            if last == "date" {
-                routes.date.insert(
-                    map_key,
-                    Route {
-                        url_path: format!("date-to-{url_path}"),
-                        file_path,
-                        values_type,
-                        serialization,
-                    },
-                );
-            } else if last == "height" {
-                routes.height.insert(
-                    map_key,
-                    Route {
-                        url_path: format!("height-to-{url_path}"),
-                        file_path,
-                        values_type,
-                        serialization,
-                    },
-                );
-            } else if last == "last" {
-                routes.last.insert(
-                    map_key,
-                    Route {
-                        url_path,
-                        file_path,
-                        values_type,
-                        serialization,
-                    },
-                );
-            } else {
-                dbg!(&key, value, &last);
-                panic!("")
-            }
-        });
-
-        routes
-    }
-
-    pub fn generate_dts_file(&self) {
-        let map_to_type = |name: &str, map: &HashMap<String, Route>| -> String {
-            let paths = map
-                .values()
-                .map(|route| format!("\"{}\"", route.url_path))
-                .join(" | ");
-
-            format!("export type {}Path = {};\n", name, paths)
-        };
-
-        let date_type = map_to_type("Date", &self.date);
-
-        let height_type = map_to_type("Height", &self.height);
-
-        let last_type = map_to_type("Last", &self.last);
-
-        fs::write(
-            format!("{WEBSITE_TYPES_PATH}/paths.d.ts"),
-            format!("// This file is auto generated by the server\n// Manual changes are forbidden\n\n{date_type}\n{height_type}\n{last_type}"),
-        )
-        .unwrap();
-    }
-
-    pub fn to_full_paths(&self, host: String) -> Paths {
-        let url = {
-            let scheme = if host.contains("0.0.0.0") || host.contains("localhost") {
-                "http"
-            } else {
-                "https"
-            };
-
-            format!("{scheme}://{host}")
-        };
-
-        let transform = |map: &HashMap<String, Route>| -> BTreeMap<String, String> {
-            map.iter()
-                .map(|(key, route)| {
-                    (
-                        key.to_owned(),
-                        format!("{url}/api/{}", route.url_path.to_owned()),
-                    )
-                })
-                .collect()
-        };
-
-        let date_paths = transform(&self.date);
-        let height_paths = transform(&self.height);
-        let last_paths = transform(&self.last);
-
-        Paths(Grouped {
-            date: date_paths,
-            height: height_paths,
-            last: last_paths,
-        })
-    }
-}
diff --git a/parser/src/io/binary.rs b/src/io/binary.rs
similarity index 100%
rename from parser/src/io/binary.rs
rename to src/io/binary.rs
diff --git a/parser/src/io/json.rs b/src/io/json.rs
similarity index 100%
rename from parser/src/io/json.rs
rename to src/io/json.rs
diff --git a/parser/src/io/mod.rs b/src/io/mod.rs
similarity index 77%
rename from parser/src/io/mod.rs
rename to src/io/mod.rs
index 674784567..a0540ad92 100644
--- a/parser/src/io/mod.rs
+++ b/src/io/mod.rs
@@ -1,9 +1,7 @@
 mod binary;
-mod consts;
 mod json;
 mod serialization;
 
 pub use binary::*;
-pub use consts::*;
 pub use json::*;
 pub use serialization::*;
diff --git a/parser/src/io/serialization.rs b/src/io/serialization.rs
similarity index 89%
rename from parser/src/io/serialization.rs
rename to src/io/serialization.rs
index e9cd8137d..9dea77275 100644
--- a/parser/src/io/serialization.rs
+++ b/src/io/serialization.rs
@@ -1,4 +1,8 @@
-use std::{fmt::Debug, fs, path::Path};
+use std::{
+    fmt::Debug,
+    fs,
+    path::{Path, PathBuf},
+};
 
 use allocative::Allocative;
 use bincode::{Decode, Encode};
@@ -27,17 +31,6 @@ impl Serialization {
         }
     }
 
-    pub fn from_path(path: &Path) -> Self {
-        let path = path.to_str().unwrap();
-        if path.ends_with(BIN_EXTENSION) || path.ends_with(COMPRESSED_BIN_EXTENSION) {
-            Self::Binary
-        } else if path.ends_with(JSON_EXTENSION) || path.ends_with(HAR_EXTENSION) {
-            Self::Json
-        } else {
-            panic!("Extension \"{path}\" isn't supported")
-        }
-    }
-
     pub fn import<T>(&self, path: &Path) -> color_eyre::Result<T>
     where
         T: Debug + DeserializeOwned + Decode,
@@ -119,3 +112,17 @@ impl Serialization {
         }
     }
 }
+
+impl TryFrom<&PathBuf> for Serialization {
+    type Error = ();
+
+    fn try_from(path: &PathBuf) -> Result<Self, Self::Error> {
+        let extension = path.extension().ok_or(())?.to_str().unwrap();
+
+        match extension {
+            BIN_EXTENSION | COMPRESSED_BIN_EXTENSION => Ok(Self::Binary),
+            JSON_EXTENSION => Ok(Self::Json),
+            _ => Err(()),
+        }
+    }
+}
diff --git a/src/main.rs b/src/main.rs
new file mode 100644
index 000000000..97bdef558
--- /dev/null
+++ b/src/main.rs
@@ -0,0 +1,70 @@
+use biter::bitcoincore_rpc::Client;
+use log::info;
+use rlimit::{getrlimit, setrlimit, Resource};
+
+mod io;
+mod parser;
+mod server;
+mod structs;
+mod utils;
+
+use parser::{Databases, Datasets};
+use structs::{Config, Exit};
+use utils::init_log;
+
+fn main() -> color_eyre::Result<()> {
+    color_eyre::install()?;
+
+    init_log();
+
+    let (_, nofile_limit) = getrlimit(Resource::NOFILE).unwrap();
+    setrlimit(Resource::NOFILE, 138_240, nofile_limit)?;
+
+    std::thread::Builder::new()
+        .stack_size(getrlimit(Resource::STACK).unwrap().1 as usize)
+        .spawn(|| -> color_eyre::Result<()> {
+            let exit = Exit::new();
+
+            let config = Config::import()?;
+
+            info!("Starting...");
+
+            let rpc = Client::from(&config);
+
+            let databases = Databases::import(&config);
+
+            let datasets = Datasets::import(&config)?;
+
+            let paths_to_type = datasets.get_paths_to_type(&config);
+
+            tokio::runtime::Builder::new_multi_thread()
+                .enable_all()
+                .build()
+                .unwrap()
+                .block_on(async {
+                    let config_clone = config.clone();
+                    let run_parser = config.parser();
+                    let run_server = config.server();
+
+                    let handle = tokio::spawn(async move {
+                        if run_server {
+                            server::main(paths_to_type, &config_clone).await.unwrap();
+                        } else {
+                            info!("Skipping server");
+                        }
+                    });
+
+                    if run_parser {
+                        parser::main(&config, &rpc, &exit, databases, datasets)?;
+                    } else {
+                        info!("Skipping parser");
+                    }
+
+                    handle.await?;
+
+                    Ok(())
+                })
+        })?
+        .join()
+        .unwrap()
+}
diff --git a/parser/src/actions/export.rs b/src/parser/actions/export.rs
similarity index 52%
rename from parser/src/actions/export.rs
rename to src/parser/actions/export.rs
index 88af14a76..f43d8e3be 100644
--- a/parser/src/actions/export.rs
+++ b/src/parser/actions/export.rs
@@ -1,52 +1,62 @@
 use std::thread::{self};
 
+use log::info;
+
 use crate::{
-    databases::Databases,
-    datasets::AllDatasets,
-    states::States,
-    structs::{Date, Height},
-    utils::{log, time},
-    Exit,
+    parser::{databases::Databases, datasets::Datasets, states::States},
+    structs::{Config, Date, Exit, Height},
+    utils::time,
 };
 
 pub struct ExportedData<'a> {
+    pub config: &'a Config,
     pub databases: Option<&'a mut Databases>,
-    pub datasets: &'a mut AllDatasets,
+    pub datasets: &'a mut Datasets,
     pub date: Date,
+    pub defragment: bool,
+    pub exit: Exit,
     pub height: Height,
     pub states: Option<&'a States>,
-    pub exit: Exit,
 }
 
 pub fn export(
     ExportedData {
+        config,
         databases,
         datasets,
-        states,
-        height,
         date,
+        defragment,
         exit,
+        height,
+        states,
     }: ExportedData,
 ) -> color_eyre::Result<()> {
     if exit.active() {
-        log("Exit in progress, skipping export");
+        info!("Exit in progress, skipping export");
         return Ok(());
     }
 
     exit.block();
 
-    log("Exporting...");
+    info!("Exporting...");
+    if defragment {
+        info!("Will also defragment databases, please be patient it might take a while")
+    }
 
     time("Total save time", || -> color_eyre::Result<()> {
-        time("Datasets saved", || datasets.export())?;
+        time("Datasets saved", || datasets.export(config))?;
 
         thread::scope(|s| {
             if let Some(databases) = databases {
-                s.spawn(|| time("Databases saved", || databases.export(height, date)));
+                s.spawn(|| {
+                    time("Databases saved", || {
+                        databases.export(height, date, defragment)
+                    })
+                });
             }
 
             if let Some(states) = states {
-                s.spawn(|| time("States saved", || states.export()));
+                s.spawn(|| time("States saved", || states.export(config)));
             }
         });
 
diff --git a/parser/src/actions/iter_blocks.rs b/src/parser/actions/iter_blocks.rs
similarity index 78%
rename from parser/src/actions/iter_blocks.rs
rename to src/parser/actions/iter_blocks.rs
index aaf46e35e..84e5a4af4 100644
--- a/parser/src/actions/iter_blocks.rs
+++ b/src/parser/actions/iter_blocks.rs
@@ -1,63 +1,52 @@
 use std::{collections::BTreeSet, time::Instant};
 
+use biter::bitcoincore_rpc::Client;
+use chrono::Datelike;
 use export::ExportedData;
 use itertools::Itertools;
 
+use log::info;
 use parse::ParseData;
 
 use crate::{
-    actions::{export, find_first_inserted_unsafe_height, parse},
-    create_rpc,
-    databases::Databases,
-    datasets::{AllDatasets, ComputeData},
-    io::OUTPUTS_FOLDER_PATH,
-    states::{AddressCohortsDurableStates, States, UTXOCohortsDurableStates},
-    structs::{DateData, MapKey, Timestamp},
-    utils::{generate_allocation_files, log, time},
-    Config, Exit, Height,
+    parser::{
+        actions::{export, find_first_inserted_unsafe_height, parse},
+        databases::Databases,
+        datasets::{ComputeData, Datasets},
+        states::{AddressCohortsDurableStates, States, UTXOCohortsDurableStates},
+    },
+    structs::{Config, DateData, Exit, Height, MapKey, Timestamp},
+    utils::{generate_allocation_files, time},
 };
 
 pub fn iter_blocks(
-    config: &mut Config,
+    config: &Config,
     rpc: &biter::bitcoincore_rpc::Client,
     approx_block_count: usize,
     exit: Exit,
+    databases: &mut Databases,
+    datasets: &mut Datasets,
 ) -> color_eyre::Result<()> {
-    log("Starting...");
+    let mut states = States::import(config).unwrap_or_default();
 
-    let mut datasets = AllDatasets::import(config)?;
-
-    log("Imported datasets");
-
-    let mut databases = Databases::import();
-
-    if config.first_defragment() {
-        databases.defragment(&exit);
-        config.disable_defragment();
-    }
-
-    log("Imported databases");
-
-    let mut states = States::import().unwrap_or_default();
-
-    log("Imported states");
+    info!("Imported states");
 
     let first_unsafe_heights =
-        find_first_inserted_unsafe_height(&mut states, &mut databases, &mut datasets);
+        find_first_inserted_unsafe_height(&mut states, databases, datasets, config);
 
     let mut height = first_unsafe_heights.min();
 
-    log(&format!("Starting parsing at height: {height}"));
+    info!("Starting parsing at height: {height}");
 
     let mut next_block_opt = None;
     let mut blocks_loop_date = None;
+    let mut next_date_opt;
 
     let block_receiver = biter::new(
-        config.datadir.as_ref().unwrap(),
-        OUTPUTS_FOLDER_PATH,
+        &config.path_bitcoindir(),
         Some(height.to_usize()),
         None,
-        create_rpc(config).unwrap(),
+        Client::from(config),
     );
 
     let mut block_iter = block_receiver.iter();
@@ -93,15 +82,13 @@ pub fn iter_blocks(
                         panic!()
                     }
 
-                    let next_block_date = next_block_opt.as_ref().map(|(_, next_block, _)| {
+                    next_date_opt = next_block_opt.as_ref().map(|(_, next_block, _)| {
                         Timestamp::wrap(next_block.header.time).to_date()
                     });
 
                     // Always run for the first block of the loop
                     if blocks_loop_date.is_none() {
-                        log(&format!(
-                            "Processing {current_block_date} (height: {height})..."
-                        ));
+                        info!("Processing {current_block_date} (height: {height})...");
 
                         blocks_loop_date.replace(current_block_date);
 
@@ -125,7 +112,7 @@ pub fn iter_blocks(
                         panic!("current block should always have the same date as the current blocks loop");
                     }
 
-                    let is_date_last_block = next_block_date
+                    let is_date_last_block = next_date_opt
                         // Do NOT change `blocks_loop_date` to `current_block_date` !!!
                         .map_or(true, |next_block_date| blocks_loop_date < next_block_date);
 
@@ -159,16 +146,17 @@ pub fn iter_blocks(
                         }
 
                         parse(ParseData {
-                            rpc,
                             block: current_block,
                             block_index: blocks_loop_i,
                             compute_addresses,
-                            databases: &mut databases,
-                            datasets: &mut datasets,
+                            config,
+                            databases,
+                            datasets,
                             date: blocks_loop_date,
                             first_date_height: height,
                             height: current_block_height,
                             is_date_last_block,
+                            rpc,
                             states: &mut states,
                         });
                     }
@@ -178,7 +166,7 @@ pub fn iter_blocks(
                     if is_date_last_block {
                         height += blocks_loop_i;
 
-                        let is_check_point = next_block_date
+                        let is_check_point = next_date_opt
                             .as_ref()
                             .map_or(true, |date| date.is_first_of_month());
 
@@ -201,13 +189,13 @@ pub fn iter_blocks(
         // Don't remember why -1
         let last_height = height - 1_u32;
 
-        log(&format!(
-            "Parsing group took {} seconds (last height: {last_height})\n",
+        info!(
+            "Parsing group took {} seconds (last height: {last_height})",
             instant.elapsed().as_secs_f32(),
-        ));
+        );
 
         if first_unsafe_heights.computed <= last_height {
-            log("Computing datasets...");
+            info!("Computing datasets...");
             time("Computing datasets", || {
                 let dates = processed_dates.into_iter().collect_vec();
 
@@ -223,10 +211,17 @@ pub fn iter_blocks(
         if !config.dry_run() {
             let is_safe = height.is_safe(approx_block_count);
 
+            let defragment = is_safe
+                && next_date_opt.is_some_and(|date| {
+                    date.year() >= 2020 && date.is_january() && date.is_first_of_month()
+                });
+
             export(ExportedData {
-                databases: is_safe.then_some(&mut databases),
-                datasets: &mut datasets,
+                config,
+                databases: is_safe.then_some(databases),
+                datasets,
                 date: blocks_loop_date.unwrap(),
+                defragment,
                 height: last_height,
                 states: is_safe.then_some(&states),
                 exit: exit.clone(),
@@ -234,11 +229,11 @@ pub fn iter_blocks(
 
             if config.record_ram_usage() {
                 time("Exporing allocation files", || {
-                    generate_allocation_files(&datasets, &databases, &states, last_height)
+                    generate_allocation_files(datasets, databases, &states, last_height)
                 })?;
             }
         } else {
-            log("Skipping export");
+            info!("Skipping export");
         }
 
         println!();
diff --git a/parser/src/actions/min_height.rs b/src/parser/actions/min_height.rs
similarity index 84%
rename from parser/src/actions/min_height.rs
rename to src/parser/actions/min_height.rs
index 953c1ddf1..eb767c08b 100644
--- a/parser/src/actions/min_height.rs
+++ b/src/parser/actions/min_height.rs
@@ -1,9 +1,12 @@
+use log::info;
+
 use crate::{
-    databases::Databases,
-    datasets::{AllDatasets, AnyDatasets},
-    states::States,
-    structs::Height,
-    utils::log,
+    parser::{
+        databases::Databases,
+        datasets::{AnyDatasets, Datasets},
+        states::States,
+    },
+    structs::{Config, Height},
 };
 
 #[derive(Default, Debug)]
@@ -21,7 +24,8 @@ impl Heights {
 pub fn find_first_inserted_unsafe_height(
     states: &mut States,
     databases: &mut Databases,
-    datasets: &mut AllDatasets,
+    datasets: &mut Datasets,
+    config: &Config,
 ) -> Heights {
     let min_initial_inserted_last_address_height = datasets
         .address
@@ -51,7 +55,7 @@ pub fn find_first_inserted_unsafe_height(
         .map(|date_data| date_data.date)
         .and_then(|last_safe_date| {
             if !usable_databases {
-                log("Unusable databases");
+                info!("Unusable databases");
 
                 return None;
             }
@@ -61,8 +65,8 @@ pub fn find_first_inserted_unsafe_height(
             let min_datasets_inserted_last_height = datasets_min_initial_states.inserted.last_height;
             let min_datasets_inserted_last_date = datasets_min_initial_states.inserted.last_date;
 
-            log(&format!("min_datasets_inserted_last_height: {:?}", min_datasets_inserted_last_height));
-            log(&format!("min_datasets_inserted_last_date: {:?}", min_datasets_inserted_last_date));
+            info!("min_datasets_inserted_last_height: {:?}", min_datasets_inserted_last_height);
+            info!("min_datasets_inserted_last_date: {:?}", min_datasets_inserted_last_date);
 
             let inserted_last_date_is_older_than_saved_state = min_datasets_inserted_last_date.map_or(true, |min_datasets_last_date| min_datasets_last_date < last_safe_date);
 
@@ -80,7 +84,7 @@ pub fn find_first_inserted_unsafe_height(
                     let inserted_heights_and_dates_are_out_of_sync = min_datasets_inserted_last_height.map_or(true, |min_datasets_inserted_last_height| min_datasets_inserted_last_height < last_safe_height);
 
                     if inserted_heights_and_dates_are_out_of_sync {
-                        log(&format!("last_safe_height ({last_safe_height}) > min_datasets_height ({min_datasets_inserted_last_height:?})"));
+                        info!("last_safe_height ({last_safe_height}) > min_datasets_height ({min_datasets_inserted_last_height:?})");
 
                         None
                     } else {
@@ -108,7 +112,7 @@ pub fn find_first_inserted_unsafe_height(
             )
         })
         .unwrap_or_else(|| {
-            log("Starting over...");
+            info!("Starting over...");
 
             let include_addresses = !usable_databases
                 || min_initial_inserted_last_address_date.is_none()
@@ -119,7 +123,7 @@ pub fn find_first_inserted_unsafe_height(
             //     panic!("");
             // }
 
-            states.reset(include_addresses);
+            states.reset(config, include_addresses);
 
             databases.reset(include_addresses);
 
diff --git a/parser/src/actions/mod.rs b/src/parser/actions/mod.rs
similarity index 100%
rename from parser/src/actions/mod.rs
rename to src/parser/actions/mod.rs
diff --git a/parser/src/actions/parse.rs b/src/parser/actions/parse.rs
similarity index 98%
rename from parser/src/actions/parse.rs
rename to src/parser/actions/parse.rs
index 2199a5c3b..648bfb53e 100644
--- a/parser/src/actions/parse.rs
+++ b/src/parser/actions/parse.rs
@@ -9,18 +9,21 @@ use itertools::Itertools;
 use rayon::prelude::*;
 
 use crate::{
-    databases::{
-        AddressIndexToAddressData, AddressIndexToEmptyAddressData, AddressToAddressIndex,
-        Databases, TxidToTxData, TxoutIndexToAddressIndex, TxoutIndexToAmount,
-    },
-    datasets::{AllDatasets, InsertData},
-    states::{
-        AddressCohortsInputStates, AddressCohortsOutputStates, AddressCohortsRealizedStates,
-        States, UTXOCohortsOneShotStates, UTXOCohortsSentStates,
+    parser::{
+        databases::{
+            AddressIndexToAddressData, AddressIndexToEmptyAddressData, AddressToAddressIndex,
+            Databases, TxidToTxData, TxoutIndexToAddressIndex, TxoutIndexToAmount,
+        },
+        datasets::{Datasets, InsertData},
+        states::{
+            AddressCohortsInputStates, AddressCohortsOutputStates, AddressCohortsRealizedStates,
+            States, UTXOCohortsOneShotStates, UTXOCohortsSentStates,
+        },
     },
     structs::{
-        Address, AddressData, AddressRealizedData, Amount, BlockData, BlockPath, Counter, Date,
-        EmptyAddressData, Height, PartialTxoutData, Price, SentData, Timestamp, TxData, TxoutIndex,
+        Address, AddressData, AddressRealizedData, Amount, BlockData, BlockPath, Config, Counter,
+        Date, EmptyAddressData, Height, PartialTxoutData, Price, SentData, Timestamp, TxData,
+        TxoutIndex,
     },
 };
 
@@ -28,9 +31,10 @@ pub struct ParseData<'a> {
     // pub bitcoin_cli: &'a BitcoinCli,
     pub block: Block,
     pub block_index: usize,
+    pub config: &'a Config,
     pub compute_addresses: bool,
     pub databases: &'a mut Databases,
-    pub datasets: &'a mut AllDatasets,
+    pub datasets: &'a mut Datasets,
     pub date: Date,
     pub first_date_height: Height,
     pub height: Height,
@@ -43,6 +47,7 @@ pub fn parse(
     ParseData {
         block,
         block_index,
+        config,
         compute_addresses,
         databases,
         datasets,
@@ -72,7 +77,7 @@ pub fn parse(
     let block_price = Price::from_dollar(
         datasets
             .price
-            .get_height_ohlc(height, timestamp, previous_timestamp)
+            .get_height_ohlc(height, timestamp, previous_timestamp, config)
             .unwrap_or_else(|_| panic!("Expect {height} to have a price"))
             .close as f64,
     );
diff --git a/parser/src/databases/_database.rs b/src/parser/databases/_database.rs
similarity index 76%
rename from parser/src/databases/_database.rs
rename to src/parser/databases/_database.rs
index abc695f56..bd61f1078 100644
--- a/parser/src/databases/_database.rs
+++ b/src/parser/databases/_database.rs
@@ -1,35 +1,35 @@
+// https://docs.rs/sanakirja/latest/sanakirja/index.html
+// https://pijul.org/posts/2021-02-06-rethinking-sanakirja/
+
 use std::{
     collections::{BTreeMap, BTreeSet},
     fmt::Debug,
-    fs, mem,
+    fs, io, mem,
     path::PathBuf,
 };
 
 use allocative::Allocative;
 
-// https://docs.rs/sanakirja/latest/sanakirja/index.html
-// https://pijul.org/posts/2021-02-06-rethinking-sanakirja/
-//
-// Seems indeed much faster than ReDB and LMDB (heed)
-// But a lot has changed code wise between them so a retest wouldn't hurt
-//
-// Possible compression: https://pijul.org/posts/sanakirja-zstd/
 use sanakirja::{
     btree::{self, page, Db_, Iter},
     Commit, Env, Error, MutTxn, RootDb, Storable,
 };
 
+///
+/// Simple wrapper around Sanakirja Database with cached puts and dels for safe use outside exports.
+///
+/// There is no `cached_gets` since it's much cheaper and faster to do a parallel search first using `unsafe_get` than caching "gets" along the way.
+///
 #[derive(Allocative)]
 #[allocative(bound = "Key: Allocative, Value: Allocative")]
-/// There is no `cached_gets` since it's much cheaper and faster to do a parallel search first using `unsafe_get` than caching gets along the way.
 pub struct Database<Key, Value>
 where
     Key: Ord + Clone + Debug + Storable,
     Value: Storable + PartialEq,
 {
-    pub cached_puts: BTreeMap<Key, Value>,
-    pub cached_dels: BTreeSet<Key>,
     path: PathBuf,
+    cached_puts: BTreeMap<Key, Value>,
+    cached_dels: BTreeSet<Key>,
     #[allocative(skip)]
     db: Db_<Key, Value, page::Page<Key, Value>>,
     #[allocative(skip)]
@@ -62,11 +62,12 @@ where
         })
     }
 
+    #[inline]
     pub fn iter(&self) -> Iter<'_, MutTxn<Env, ()>, Key, Value, page::Page<Key, Value>> {
         btree::iter(&self.txn, &self.db, None).unwrap()
     }
 
-    pub fn iter_collect(&self) -> BTreeMap<Key, Value>
+    pub fn collect(&self) -> BTreeMap<Key, Value>
     where
         Value: Clone,
     {
@@ -76,6 +77,7 @@ where
             .collect::<_>()
     }
 
+    #[inline]
     pub fn get(&self, key: &Key) -> Option<&Value> {
         if let Some(cached_put) = self.get_from_puts(key) {
             return Some(cached_put);
@@ -84,6 +86,7 @@ where
         self.db_get(key)
     }
 
+    #[inline]
     pub fn db_get(&self, key: &Key) -> Option<&Value> {
         let option = btree::get(&self.txn, &self.db, key, None).unwrap();
 
@@ -96,17 +99,17 @@ where
         None
     }
 
-    #[inline(always)]
+    #[inline]
     pub fn get_from_puts(&self, key: &Key) -> Option<&Value> {
         self.cached_puts.get(key)
     }
 
-    #[inline(always)]
+    #[inline]
     pub fn get_mut_from_puts(&mut self, key: &Key) -> Option<&mut Value> {
         self.cached_puts.get_mut(key)
     }
 
-    #[inline(always)]
+    #[inline]
     pub fn remove(&mut self, key: &Key) -> Option<Value> {
         self.remove_from_puts(key).or_else(|| {
             self.db_remove(key);
@@ -139,7 +142,6 @@ where
     #[inline]
     pub fn insert(&mut self, key: Key, value: Value) -> Option<Value> {
         self.cached_dels.remove(&key);
-
         self.unsafe_insert(key, value)
     }
 
@@ -165,12 +167,11 @@ where
 }
 
 pub trait AnyDatabase {
-    fn export(self) -> color_eyre::Result<(), Error>;
-    fn boxed_export(self: Box<Self>) -> color_eyre::Result<(), Error>;
     #[allow(unused)]
-    fn defragment(self);
-    fn boxed_defragment(self: Box<Self>);
-    fn destroy(self);
+    fn export(self, defragment: bool) -> color_eyre::Result<(), Error>;
+    fn boxed_export(self: Box<Self>, defragment: bool) -> color_eyre::Result<(), Error>;
+    #[allow(unused)]
+    fn destroy(self) -> io::Result<()>;
 }
 
 impl<Key, Value> AnyDatabase for Database<Key, Value>
@@ -178,11 +179,31 @@ where
     Key: Ord + Clone + Debug + Storable,
     Value: Storable + PartialEq + Clone,
 {
-    fn export(self) -> color_eyre::Result<(), Error> {
-        Box::new(self).boxed_export()
+    fn export(self, defragment: bool) -> color_eyre::Result<(), Error> {
+        Box::new(self).boxed_export(defragment)
     }
 
-    fn boxed_export(mut self: Box<Self>) -> color_eyre::Result<(), Error> {
+    fn boxed_export(mut self: Box<Self>, defragment: bool) -> color_eyre::Result<(), Error> {
+        if defragment {
+            let mut btree = self.as_ref().collect();
+
+            let path = self.path.to_owned();
+            self.cached_dels.iter().for_each(|key| {
+                btree.remove(key);
+            });
+            btree.append(&mut self.cached_puts);
+
+            self.destroy()?;
+
+            *self = Self::open(path).unwrap();
+
+            if !self.is_empty() {
+                panic!()
+            }
+
+            self.cached_puts = btree;
+        }
+
         if self.cached_dels.is_empty() && self.cached_puts.is_empty() {
             return Ok(());
         }
@@ -198,35 +219,11 @@ where
         self.txn.commit()
     }
 
-    fn defragment(self) {
-        Box::new(self).boxed_defragment()
-    }
-
-    fn boxed_defragment(self: Box<Self>) {
-        let btree = self.iter_collect();
-
-        let path = self.path.to_owned();
-
-        self.destroy();
-
-        let mut db = Self::open(path).unwrap();
-
-        if !db.is_empty() {
-            panic!()
-        }
-
-        db.cached_puts = btree;
-        db.export().unwrap();
-    }
-
-    fn destroy(self) {
+    fn destroy(self) -> io::Result<()> {
         let path = self.path.to_owned();
 
         drop(self);
 
-        fs::remove_file(&path).unwrap_or_else(|_| {
-            dbg!(path);
-            panic!("Error");
-        });
+        fs::remove_file(&path)
     }
 }
diff --git a/src/parser/databases/_trait.rs b/src/parser/databases/_trait.rs
new file mode 100644
index 000000000..f238c82b1
--- /dev/null
+++ b/src/parser/databases/_trait.rs
@@ -0,0 +1,59 @@
+use std::{fs, io, path::Path};
+
+use log::info;
+
+use crate::structs::{Config, Date, Height};
+
+use super::{AnyDatabase, Metadata};
+
+pub trait AnyDatabaseGroup
+where
+    Self: Sized,
+{
+    fn init(config: &Config) -> Self {
+        let s = Self::import(config);
+        s.create_dir_all().unwrap();
+        s
+    }
+
+    fn import(config: &Config) -> Self;
+
+    fn drain_to_vec(&mut self) -> Vec<Box<dyn AnyDatabase + Send>>;
+    fn open_all(&mut self);
+
+    fn metadata(&mut self) -> &mut Metadata;
+    fn export_metadata(&mut self, height: Height, date: Date) -> color_eyre::Result<()> {
+        self.metadata().export(height, date)
+    }
+
+    fn create_dir_all(&self) -> color_eyre::Result<(), std::io::Error> {
+        fs::create_dir_all(self.path())
+    }
+
+    fn remove_dir_all(&self) -> color_eyre::Result<(), io::Error> {
+        fs::remove_dir_all(self.path())
+    }
+
+    fn reset(&mut self) -> color_eyre::Result<(), io::Error> {
+        info!(
+            "Reset {}",
+            self.path()
+                .components()
+                .last()
+                .unwrap()
+                .as_os_str()
+                .to_str()
+                .unwrap()
+        );
+
+        self.reset_metadata();
+        self.remove_dir_all()?;
+        self.create_dir_all()?;
+
+        Ok(())
+    }
+
+    fn reset_metadata(&mut self);
+
+    fn path(&self) -> &Path;
+}
diff --git a/parser/src/databases/address_index_to_address_data.rs b/src/parser/databases/address_index_to_address_data.rs
similarity index 86%
rename from parser/src/databases/address_index_to_address_data.rs
rename to src/parser/databases/address_index_to_address_data.rs
index e6ed7fc80..82c90acf0 100644
--- a/parser/src/databases/address_index_to_address_data.rs
+++ b/src/parser/databases/address_index_to_address_data.rs
@@ -2,6 +2,7 @@ use std::{
     collections::BTreeMap,
     fs, mem,
     ops::{Deref, DerefMut},
+    path::{Path, PathBuf},
 };
 
 use allocative::Allocative;
@@ -9,8 +10,8 @@ use itertools::Itertools;
 use rayon::prelude::*;
 
 use crate::{
-    states::AddressCohortsDurableStates,
-    structs::{AddressData, Date, Height},
+    parser::states::AddressCohortsDurableStates,
+    structs::{AddressData, Config},
     utils::time,
 };
 
@@ -22,8 +23,8 @@ type Database = _Database<Key, Value>;
 
 #[derive(Allocative)]
 pub struct AddressIndexToAddressData {
+    path: PathBuf,
     pub metadata: Metadata,
-
     pub map: BTreeMap<usize, Database>,
 }
 
@@ -72,6 +73,7 @@ impl AddressIndexToAddressData {
 
     pub fn open_db(&mut self, key: &Key) -> &mut Database {
         let db_index = Self::db_index(key);
+        let path = self.path().to_owned();
 
         self.entry(db_index).or_insert_with(|| {
             let db_name = format!(
@@ -80,7 +82,7 @@ impl AddressIndexToAddressData {
                 (db_index + 1) * ADDRESS_INDEX_DB_MAX_SIZE
             );
 
-            let path = Self::root().join(db_name);
+            let path = path.join(db_name);
 
             Database::open(path).unwrap()
         })
@@ -113,30 +115,23 @@ impl AddressIndexToAddressData {
 }
 
 impl AnyDatabaseGroup for AddressIndexToAddressData {
-    fn import() -> Self {
+    fn import(config: &Config) -> Self {
+        let path = config
+            .path_databases()
+            .join("address_index_to_address_data");
         Self {
-            metadata: Metadata::import(Self::root(), 1),
-
+            metadata: Metadata::import(&path, 1),
+            path,
             map: BTreeMap::default(),
         }
     }
 
-    fn create_dir_all(&self) -> color_eyre::Result<(), std::io::Error> {
-        fs::create_dir_all(Self::root())
-    }
-
     fn reset_metadata(&mut self) {
         self.metadata.reset();
     }
 
-    fn folder<'a>() -> &'a str {
-        "address_index_to_address_data"
-    }
-
     fn open_all(&mut self) {
-        let path = Self::root();
-
-        let folder = fs::read_dir(path);
+        let folder = fs::read_dir(&self.path);
 
         if folder.is_err() {
             return;
@@ -167,7 +162,11 @@ impl AnyDatabaseGroup for AddressIndexToAddressData {
             .collect_vec()
     }
 
-    fn export_metadata(&mut self, height: Height, date: Date) -> color_eyre::Result<()> {
-        self.metadata.export(height, date)
+    fn metadata(&mut self) -> &mut Metadata {
+        &mut self.metadata
+    }
+
+    fn path(&self) -> &Path {
+        &self.path
     }
 }
diff --git a/parser/src/databases/address_index_to_empty_address_data.rs b/src/parser/databases/address_index_to_empty_address_data.rs
similarity index 84%
rename from parser/src/databases/address_index_to_empty_address_data.rs
rename to src/parser/databases/address_index_to_empty_address_data.rs
index cdb0127fc..923ae4850 100644
--- a/parser/src/databases/address_index_to_empty_address_data.rs
+++ b/src/parser/databases/address_index_to_empty_address_data.rs
@@ -2,12 +2,13 @@ use std::{
     collections::BTreeMap,
     fs, mem,
     ops::{Deref, DerefMut},
+    path::{Path, PathBuf},
 };
 
 use allocative::Allocative;
 use itertools::Itertools;
 
-use crate::structs::{Date, EmptyAddressData, Height};
+use crate::structs::{Config, EmptyAddressData};
 
 use super::{
     AnyDatabase, AnyDatabaseGroup, Database as _Database, Metadata, ADDRESS_INDEX_DB_MAX_SIZE,
@@ -19,8 +20,8 @@ type Database = _Database<Key, Value>;
 
 #[derive(Allocative)]
 pub struct AddressIndexToEmptyAddressData {
+    path: PathBuf,
     pub metadata: Metadata,
-
     map: BTreeMap<usize, Database>,
 }
 
@@ -72,6 +73,7 @@ impl AddressIndexToEmptyAddressData {
 
     pub fn open_db(&mut self, key: &Key) -> &mut Database {
         let db_index = Self::db_index(key);
+        let path = self.path.to_owned();
 
         self.entry(db_index).or_insert_with(|| {
             let db_name = format!(
@@ -80,7 +82,7 @@ impl AddressIndexToEmptyAddressData {
                 (db_index + 1) * ADDRESS_INDEX_DB_MAX_SIZE
             );
 
-            let path = Self::root().join(db_name);
+            let path = path.join(db_name);
 
             Database::open(path).unwrap()
         })
@@ -92,30 +94,23 @@ impl AddressIndexToEmptyAddressData {
 }
 
 impl AnyDatabaseGroup for AddressIndexToEmptyAddressData {
-    fn import() -> Self {
+    fn import(config: &Config) -> Self {
+        let path = config
+            .path_databases()
+            .join("address_index_to_empty_address_data");
         Self {
-            metadata: Metadata::import(Self::root(), 1),
-
+            metadata: Metadata::import(&path, 1),
+            path,
             map: BTreeMap::default(),
         }
     }
 
-    fn create_dir_all(&self) -> color_eyre::Result<(), std::io::Error> {
-        fs::create_dir_all(Self::root())
-    }
-
     fn reset_metadata(&mut self) {
         self.metadata.reset();
     }
 
-    fn folder<'a>() -> &'a str {
-        "address_index_to_empty_address_data"
-    }
-
     fn open_all(&mut self) {
-        let path = Self::root();
-
-        let folder = fs::read_dir(path);
+        let folder = fs::read_dir(&self.path);
 
         if folder.is_err() {
             return;
@@ -146,7 +141,11 @@ impl AnyDatabaseGroup for AddressIndexToEmptyAddressData {
             .collect_vec()
     }
 
-    fn export_metadata(&mut self, height: Height, date: Date) -> color_eyre::Result<()> {
-        self.metadata.export(height, date)
+    fn metadata(&mut self) -> &mut Metadata {
+        &mut self.metadata
+    }
+
+    fn path(&self) -> &Path {
+        &self.path
     }
 }
diff --git a/parser/src/databases/address_to_address_index.rs b/src/parser/databases/address_to_address_index.rs
similarity index 86%
rename from parser/src/databases/address_to_address_index.rs
rename to src/parser/databases/address_to_address_index.rs
index 34b7e8d5b..35d9b7e30 100644
--- a/parser/src/databases/address_to_address_index.rs
+++ b/src/parser/databases/address_to_address_index.rs
@@ -7,7 +7,7 @@ use std::{
 use allocative::Allocative;
 use itertools::Itertools;
 
-use crate::structs::{Address, Date, Height, U8x19, U8x31};
+use crate::structs::{Address, Config, U8x19, U8x31};
 
 use super::{AnyDatabase, AnyDatabaseGroup, Database, Metadata};
 
@@ -30,6 +30,7 @@ type MultisigDatabase = U32Database;
 
 #[derive(Allocative)]
 pub struct AddressToAddressIndex {
+    path: PathBuf,
     pub metadata: Metadata,
 
     p2pk: BTreeMap<u16, P2PKDatabase>,
@@ -160,12 +161,12 @@ impl AddressToAddressIndex {
             .collect_vec()
     }
 
-    fn path_p2pk() -> PathBuf {
-        Self::root().join("p2pk")
+    fn path_p2pk(&self) -> PathBuf {
+        self.path().join("p2pk")
     }
 
     pub fn open_p2pk(&mut self, prefix: u16) -> &mut P2PKDatabase {
-        let path = Self::path_p2pk();
+        let path = self.path_p2pk();
         self.p2pk.entry(prefix).or_insert_with(|| {
             let path = path.join(prefix.to_string());
             Database::open(path).unwrap()
@@ -173,7 +174,7 @@ impl AddressToAddressIndex {
     }
 
     fn open_all_p2pk(&mut self) {
-        let path = Self::path_p2pk();
+        let path = self.path_p2pk();
         Self::path_to_group_prefixes(&path)
             .into_iter()
             .for_each(|prefix| {
@@ -184,12 +185,12 @@ impl AddressToAddressIndex {
             });
     }
 
-    fn path_p2pkh() -> PathBuf {
-        Self::root().join("p2pkh")
+    fn path_p2pkh(&self) -> PathBuf {
+        self.path().join("p2pkh")
     }
 
     pub fn open_p2pkh(&mut self, prefix: u16) -> &mut P2PKHDatabase {
-        let path = Self::path_p2pkh();
+        let path = self.path_p2pkh();
 
         self.p2pkh.entry(prefix).or_insert_with(|| {
             let path = path.join(prefix.to_string());
@@ -198,7 +199,7 @@ impl AddressToAddressIndex {
     }
 
     fn open_all_p2pkh(&mut self) {
-        let path = Self::path_p2pkh();
+        let path = self.path_p2pkh();
         Self::path_to_group_prefixes(&path)
             .into_iter()
             .for_each(|prefix| {
@@ -209,12 +210,12 @@ impl AddressToAddressIndex {
             });
     }
 
-    fn path_p2sh() -> PathBuf {
-        Self::root().join("p2sh")
+    fn path_p2sh(&self) -> PathBuf {
+        self.path().join("p2sh")
     }
 
     pub fn open_p2sh(&mut self, prefix: u16) -> &mut P2SHDatabase {
-        let path = Self::path_p2sh();
+        let path = self.path_p2sh();
 
         self.p2sh.entry(prefix).or_insert_with(|| {
             let path = path.join(prefix.to_string());
@@ -223,7 +224,7 @@ impl AddressToAddressIndex {
     }
 
     fn open_all_p2sh(&mut self) {
-        let path = Self::path_p2sh();
+        let path = self.path_p2sh();
         Self::path_to_group_prefixes(&path)
             .into_iter()
             .for_each(|prefix| {
@@ -234,12 +235,12 @@ impl AddressToAddressIndex {
             });
     }
 
-    fn path_p2wpkh() -> PathBuf {
-        Self::root().join("p2wpkh")
+    fn path_p2wpkh(&self) -> PathBuf {
+        self.path().join("p2wpkh")
     }
 
     pub fn open_p2wpkh(&mut self, prefix: u16) -> &mut P2WPKHDatabase {
-        let path = Self::path_p2wpkh();
+        let path = self.path_p2wpkh();
 
         self.p2wpkh.entry(prefix).or_insert_with(|| {
             let path = path.join(prefix.to_string());
@@ -248,7 +249,7 @@ impl AddressToAddressIndex {
     }
 
     fn open_all_p2wpkh(&mut self) {
-        let path = Self::path_p2wpkh();
+        let path = self.path_p2wpkh();
         Self::path_to_group_prefixes(&path)
             .into_iter()
             .for_each(|prefix| {
@@ -259,12 +260,12 @@ impl AddressToAddressIndex {
             });
     }
 
-    fn path_p2wsh() -> PathBuf {
-        Self::root().join("p2wsh")
+    fn path_p2wsh(&self) -> PathBuf {
+        self.path().join("p2wsh")
     }
 
     pub fn open_p2wsh(&mut self, prefix: u16) -> &mut P2WSHDatabase {
-        let path = Self::path_p2wsh();
+        let path = self.path_p2wsh();
 
         self.p2wsh.entry(prefix).or_insert_with(|| {
             let path = path.join(prefix.to_string());
@@ -273,7 +274,7 @@ impl AddressToAddressIndex {
     }
 
     fn open_all_p2wsh(&mut self) {
-        let path = Self::path_p2wsh();
+        let path = self.path_p2wsh();
         Self::path_to_group_prefixes(&path)
             .into_iter()
             .for_each(|prefix| {
@@ -284,12 +285,12 @@ impl AddressToAddressIndex {
             });
     }
 
-    fn path_p2tr() -> PathBuf {
-        Self::root().join("p2tr")
+    fn path_p2tr(&self) -> PathBuf {
+        self.path().join("p2tr")
     }
 
     pub fn open_p2tr(&mut self, prefix: u16) -> &mut P2TRDatabase {
-        let path = Self::path_p2tr();
+        let path = self.path_p2tr();
 
         self.p2tr.entry(prefix).or_insert_with(|| {
             let path = path.join(prefix.to_string());
@@ -298,7 +299,7 @@ impl AddressToAddressIndex {
     }
 
     fn open_all_p2tr(&mut self) {
-        let path = Self::path_p2tr();
+        let path = self.path_p2tr();
         Self::path_to_group_prefixes(&path)
             .into_iter()
             .for_each(|prefix| {
@@ -311,34 +312,36 @@ impl AddressToAddressIndex {
 
     pub fn open_unknown(&mut self) -> &mut UnknownDatabase {
         self.unknown
-            .get_or_insert_with(|| Database::open(Self::root().join("unknown")).unwrap())
+            .get_or_insert_with(|| Database::open(self.path.join("unknown")).unwrap())
     }
 
     pub fn open_op_return(&mut self) -> &mut UnknownDatabase {
         self.op_return
-            .get_or_insert_with(|| Database::open(Self::root().join("op_return")).unwrap())
+            .get_or_insert_with(|| Database::open(self.path.join("op_return")).unwrap())
     }
 
     pub fn open_push_only(&mut self) -> &mut UnknownDatabase {
         self.push_only
-            .get_or_insert_with(|| Database::open(Self::root().join("push_only")).unwrap())
+            .get_or_insert_with(|| Database::open(self.path.join("push_only")).unwrap())
     }
 
     pub fn open_empty(&mut self) -> &mut UnknownDatabase {
         self.empty
-            .get_or_insert_with(|| Database::open(Self::root().join("empty")).unwrap())
+            .get_or_insert_with(|| Database::open(self.path.join("empty")).unwrap())
     }
 
     pub fn open_multisig(&mut self) -> &mut MultisigDatabase {
         self.multisig
-            .get_or_insert_with(|| Database::open(Self::root().join("multisig")).unwrap())
+            .get_or_insert_with(|| Database::open(self.path.join("multisig")).unwrap())
     }
 }
 
 impl AnyDatabaseGroup for AddressToAddressIndex {
-    fn import() -> Self {
+    fn import(config: &Config) -> Self {
+        let path = config.path_databases().join("address_to_address_index");
         Self {
-            metadata: Metadata::import(Self::root(), 1),
+            metadata: Metadata::import(&path, 1),
+            path,
 
             p2pk: BTreeMap::default(),
             p2pkh: BTreeMap::default(),
@@ -355,22 +358,18 @@ impl AnyDatabaseGroup for AddressToAddressIndex {
     }
 
     fn create_dir_all(&self) -> color_eyre::Result<(), std::io::Error> {
-        fs::create_dir_all(Self::path_p2pk()).unwrap();
-        fs::create_dir_all(Self::path_p2pkh()).unwrap();
-        fs::create_dir_all(Self::path_p2sh()).unwrap();
-        fs::create_dir_all(Self::path_p2wpkh()).unwrap();
-        fs::create_dir_all(Self::path_p2wsh()).unwrap();
-        fs::create_dir_all(Self::path_p2tr())
+        fs::create_dir_all(self.path_p2pk()).unwrap();
+        fs::create_dir_all(self.path_p2pkh()).unwrap();
+        fs::create_dir_all(self.path_p2sh()).unwrap();
+        fs::create_dir_all(self.path_p2wpkh()).unwrap();
+        fs::create_dir_all(self.path_p2wsh()).unwrap();
+        fs::create_dir_all(self.path_p2tr())
     }
 
     fn reset_metadata(&mut self) {
         self.metadata.reset()
     }
 
-    fn folder<'a>() -> &'a str {
-        "address_to_address_index"
-    }
-
     fn drain_to_vec(&mut self) -> Vec<Box<dyn AnyDatabase + Send>> {
         mem::take(&mut self.p2pk)
             .into_values()
@@ -424,7 +423,11 @@ impl AnyDatabaseGroup for AddressToAddressIndex {
         self.open_all_p2tr();
     }
 
-    fn export_metadata(&mut self, height: Height, date: Date) -> color_eyre::Result<()> {
-        self.metadata.export(height, date)
+    fn metadata(&mut self) -> &mut Metadata {
+        &mut self.metadata
+    }
+
+    fn path(&self) -> &Path {
+        &self.path
     }
 }
diff --git a/parser/src/databases/metadata.rs b/src/parser/databases/metadata.rs
similarity index 94%
rename from parser/src/databases/metadata.rs
rename to src/parser/databases/metadata.rs
index eb0046c5d..9d69c4817 100644
--- a/parser/src/databases/metadata.rs
+++ b/src/parser/databases/metadata.rs
@@ -10,8 +10,8 @@ use std::{
 };
 
 use crate::{
+    io::Serialization,
     structs::{Counter, Date, Height},
-    Serialization,
 };
 
 #[derive(Default, Debug, Encode, Decode, Allocative)]
@@ -35,10 +35,10 @@ impl DerefMut for Metadata {
 }
 
 impl Metadata {
-    pub fn import(path: PathBuf, version: u16) -> Self {
+    pub fn import(path: &Path, version: u16) -> Self {
         Self {
-            data: MetadataData::import(&path, version),
-            path,
+            data: MetadataData::import(path, version),
+            path: path.to_owned(),
         }
     }
 
diff --git a/parser/src/databases/mod.rs b/src/parser/databases/mod.rs
similarity index 78%
rename from parser/src/databases/mod.rs
rename to src/parser/databases/mod.rs
index 9ff6bc752..9b32a982c 100644
--- a/parser/src/databases/mod.rs
+++ b/src/parser/databases/mod.rs
@@ -1,5 +1,3 @@
-use std::thread::{self};
-
 use allocative::Allocative;
 
 mod _database;
@@ -18,18 +16,14 @@ pub use address_index_to_address_data::*;
 pub use address_index_to_empty_address_data::*;
 pub use address_to_address_index::*;
 use itertools::Itertools;
+use log::info;
 use metadata::*;
 use rayon::iter::{IntoParallelIterator, ParallelIterator};
 pub use txid_to_tx_data::*;
 pub use txout_index_to_address_index::*;
 pub use txout_index_to_amount::*;
 
-use crate::{
-    log,
-    structs::{Date, Height},
-    utils::time,
-    Exit,
-};
+use crate::structs::{Config, Date, Height};
 
 #[derive(Allocative)]
 pub struct Databases {
@@ -42,18 +36,20 @@ pub struct Databases {
 }
 
 impl Databases {
-    pub fn import() -> Self {
-        let address_index_to_address_data = AddressIndexToAddressData::init();
+    pub fn import(config: &Config) -> Self {
+        let address_index_to_address_data = AddressIndexToAddressData::init(config);
 
-        let address_index_to_empty_address_data = AddressIndexToEmptyAddressData::init();
+        let address_index_to_empty_address_data = AddressIndexToEmptyAddressData::init(config);
 
-        let address_to_address_index = AddressToAddressIndex::init();
+        let address_to_address_index = AddressToAddressIndex::init(config);
 
-        let txid_to_tx_data = TxidToTxData::init();
+        let txid_to_tx_data = TxidToTxData::init(config);
 
-        let txout_index_to_address_index = TxoutIndexToAddressIndex::init();
+        let txout_index_to_address_index = TxoutIndexToAddressIndex::init(config);
 
-        let txout_index_to_amount = TxoutIndexToAmount::init();
+        let txout_index_to_amount = TxoutIndexToAmount::init(config);
+
+        info!("Imported databases");
 
         Self {
             address_index_to_address_data,
@@ -91,62 +87,21 @@ impl Databases {
         Ok(())
     }
 
-    pub fn export(&mut self, height: Height, date: Date) -> color_eyre::Result<()> {
+    pub fn export(
+        &mut self,
+        height: Height,
+        date: Date,
+        defragment: bool,
+    ) -> color_eyre::Result<()> {
         self.export_metadata(height, date)?;
 
         self.drain_to_vec()
             .into_par_iter()
-            .try_for_each(AnyDatabase::boxed_export)?;
+            .try_for_each(|s| AnyDatabase::boxed_export(s, defragment))?;
 
         Ok(())
     }
 
-    fn open_all(&mut self) {
-        thread::scope(|s| {
-            s.spawn(|| {
-                self.address_index_to_address_data.open_all();
-            });
-
-            s.spawn(|| {
-                self.address_index_to_empty_address_data.open_all();
-            });
-
-            s.spawn(|| {
-                self.address_to_address_index.open_all();
-            });
-
-            s.spawn(|| {
-                self.txid_to_tx_data.open_all();
-            });
-
-            s.spawn(|| {
-                self.txout_index_to_address_index.open_all();
-            });
-
-            s.spawn(|| {
-                self.txout_index_to_amount.open_all();
-            });
-        });
-    }
-
-    pub fn defragment(&mut self, exit: &Exit) {
-        exit.block();
-
-        log("Databases defragmentation");
-
-        time("Defragmenting databases", || {
-            time("Opened all databases", || self.open_all());
-
-            log("Defragmenting...");
-
-            self.drain_to_vec()
-                .into_par_iter()
-                .for_each(AnyDatabase::boxed_defragment);
-        });
-
-        exit.unblock();
-    }
-
     pub fn reset(&mut self, include_addresses: bool) {
         if include_addresses {
             let _ = self.address_index_to_address_data.reset();
diff --git a/parser/src/databases/txid_to_tx_data.rs b/src/parser/databases/txid_to_tx_data.rs
similarity index 87%
rename from parser/src/databases/txid_to_tx_data.rs
rename to src/parser/databases/txid_to_tx_data.rs
index 59a706249..14ee58555 100644
--- a/parser/src/databases/txid_to_tx_data.rs
+++ b/src/parser/databases/txid_to_tx_data.rs
@@ -2,13 +2,14 @@ use std::{
     collections::BTreeMap,
     fs, mem,
     ops::{Deref, DerefMut},
+    path::{Path, PathBuf},
 };
 
 use allocative::Allocative;
 use biter::bitcoin::Txid;
 use itertools::Itertools;
 
-use crate::structs::{Date, Height, TxData, U8x31};
+use crate::structs::{Config, TxData, U8x31};
 
 use super::{AnyDatabase, AnyDatabaseGroup, Database as _Database, Metadata};
 
@@ -18,8 +19,8 @@ type Database = _Database<Key, Value>;
 
 #[derive(Allocative)]
 pub struct TxidToTxData {
+    path: PathBuf,
     pub metadata: Metadata,
-
     map: BTreeMap<u16, Database>,
 }
 
@@ -109,8 +110,9 @@ impl TxidToTxData {
 
     #[inline(always)]
     pub fn _open_db(&mut self, db_index: u16) -> &mut Database {
+        let path = self.path.to_owned();
         self.entry(db_index).or_insert_with(|| {
-            let path = Self::root().join(db_index.to_string());
+            let path = path.join(db_index.to_string());
             Database::open(path).unwrap()
         })
     }
@@ -125,31 +127,23 @@ impl TxidToTxData {
 }
 
 impl AnyDatabaseGroup for TxidToTxData {
-    fn import() -> Self {
-        let metadata = Metadata::import(Self::root(), 2);
+    fn import(config: &Config) -> Self {
+        let path = config.path_databases().join("txid_to_tx_data");
+        let metadata = Metadata::import(&path, 2);
 
         Self {
+            path,
             metadata,
             map: BTreeMap::default(),
         }
     }
 
-    fn create_dir_all(&self) -> color_eyre::Result<(), std::io::Error> {
-        fs::create_dir_all(Self::root())
-    }
-
     fn reset_metadata(&mut self) {
         self.metadata.reset();
     }
 
-    fn folder<'a>() -> &'a str {
-        "txid_to_tx_data"
-    }
-
     fn open_all(&mut self) {
-        let path = Self::root();
-
-        let folder = fs::read_dir(path);
+        let folder = fs::read_dir(&self.path);
 
         if folder.is_err() {
             return;
@@ -180,7 +174,11 @@ impl AnyDatabaseGroup for TxidToTxData {
             .collect_vec()
     }
 
-    fn export_metadata(&mut self, height: Height, date: Date) -> color_eyre::Result<()> {
-        self.metadata.export(height, date)
+    fn metadata(&mut self) -> &mut Metadata {
+        &mut self.metadata
+    }
+
+    fn path(&self) -> &Path {
+        &self.path
     }
 }
diff --git a/parser/src/databases/txout_index_to_address_index.rs b/src/parser/databases/txout_index_to_address_index.rs
similarity index 85%
rename from parser/src/databases/txout_index_to_address_index.rs
rename to src/parser/databases/txout_index_to_address_index.rs
index 79baeac10..5db9f4484 100644
--- a/parser/src/databases/txout_index_to_address_index.rs
+++ b/src/parser/databases/txout_index_to_address_index.rs
@@ -2,12 +2,13 @@ use std::{
     collections::BTreeMap,
     fs, mem,
     ops::{Deref, DerefMut},
+    path::{Path, PathBuf},
 };
 
 use allocative::Allocative;
 use itertools::Itertools;
 
-use crate::structs::{Date, Height, TxoutIndex};
+use crate::structs::{Config, TxoutIndex};
 
 use super::{AnyDatabase, AnyDatabaseGroup, Database as _Database, Metadata};
 
@@ -17,8 +18,8 @@ type Database = _Database<Key, Value>;
 
 #[derive(Allocative)]
 pub struct TxoutIndexToAddressIndex {
+    path: PathBuf,
     pub metadata: Metadata,
-
     map: BTreeMap<usize, Database>,
 }
 
@@ -69,6 +70,7 @@ impl TxoutIndexToAddressIndex {
 
     pub fn open_db(&mut self, key: &Key) -> &mut Database {
         let db_index = Self::db_index(key);
+        let path = self.path.to_owned();
 
         self.entry(db_index).or_insert_with(|| {
             let db_name = format!(
@@ -77,7 +79,7 @@ impl TxoutIndexToAddressIndex {
                 (db_index + 1) * DB_MAX_SIZE
             );
 
-            let path = Self::root().join(db_name);
+            let path = path.join(db_name);
 
             Database::open(path).unwrap()
         })
@@ -89,30 +91,21 @@ impl TxoutIndexToAddressIndex {
 }
 
 impl AnyDatabaseGroup for TxoutIndexToAddressIndex {
-    fn import() -> Self {
+    fn import(config: &Config) -> Self {
+        let path = config.path_databases().join("txout_index_to_address_index");
         Self {
-            metadata: Metadata::import(Self::root(), 1),
-
+            metadata: Metadata::import(&path, 1),
+            path,
             map: BTreeMap::default(),
         }
     }
 
-    fn create_dir_all(&self) -> color_eyre::Result<(), std::io::Error> {
-        fs::create_dir_all(Self::root())
-    }
-
     fn reset_metadata(&mut self) {
         self.metadata.reset();
     }
 
-    fn folder<'a>() -> &'a str {
-        "txout_index_to_address_index"
-    }
-
     fn open_all(&mut self) {
-        let path = Self::root();
-
-        let folder = fs::read_dir(path);
+        let folder = fs::read_dir(&self.path);
 
         if folder.is_err() {
             return;
@@ -151,7 +144,11 @@ impl AnyDatabaseGroup for TxoutIndexToAddressIndex {
             .collect_vec()
     }
 
-    fn export_metadata(&mut self, height: Height, date: Date) -> color_eyre::Result<()> {
-        self.metadata.export(height, date)
+    fn metadata(&mut self) -> &mut Metadata {
+        &mut self.metadata
+    }
+
+    fn path(&self) -> &Path {
+        &self.path
     }
 }
diff --git a/parser/src/databases/txout_index_to_amount.rs b/src/parser/databases/txout_index_to_amount.rs
similarity index 84%
rename from parser/src/databases/txout_index_to_amount.rs
rename to src/parser/databases/txout_index_to_amount.rs
index 6774dfdb4..0464b04c7 100644
--- a/parser/src/databases/txout_index_to_amount.rs
+++ b/src/parser/databases/txout_index_to_amount.rs
@@ -2,12 +2,13 @@ use std::{
     collections::BTreeMap,
     fs, mem,
     ops::{Deref, DerefMut},
+    path::{Path, PathBuf},
 };
 
 use allocative::Allocative;
 use itertools::Itertools;
 
-use crate::structs::{Amount, Date, Height, TxoutIndex};
+use crate::structs::{Amount, Config, TxoutIndex};
 
 use super::{AnyDatabase, AnyDatabaseGroup, Database as _Database, Metadata};
 
@@ -17,8 +18,8 @@ type Database = _Database<Key, Value>;
 
 #[derive(Allocative)]
 pub struct TxoutIndexToAmount {
+    path: PathBuf,
     pub metadata: Metadata,
-
     map: BTreeMap<usize, Database>,
 }
 
@@ -69,6 +70,7 @@ impl TxoutIndexToAmount {
 
     pub fn open_db(&mut self, key: &Key) -> &mut Database {
         let db_index = Self::db_index(key);
+        let path = self.path.to_owned();
 
         self.entry(db_index).or_insert_with(|| {
             let db_name = format!(
@@ -77,7 +79,7 @@ impl TxoutIndexToAmount {
                 (db_index + 1) * DB_MAX_SIZE
             );
 
-            let path = Self::root().join(db_name);
+            let path = path.join(db_name);
 
             Database::open(path).unwrap()
         })
@@ -89,30 +91,21 @@ impl TxoutIndexToAmount {
 }
 
 impl AnyDatabaseGroup for TxoutIndexToAmount {
-    fn import() -> Self {
+    fn import(config: &Config) -> Self {
+        let path = config.path_databases().join("txout_index_to_amount");
         Self {
-            metadata: Metadata::import(Self::root(), 1),
-
+            metadata: Metadata::import(&path, 1),
+            path,
             map: BTreeMap::default(),
         }
     }
 
-    fn create_dir_all(&self) -> color_eyre::Result<(), std::io::Error> {
-        fs::create_dir_all(Self::root())
-    }
-
     fn reset_metadata(&mut self) {
         self.metadata.reset();
     }
 
-    fn folder<'a>() -> &'a str {
-        "txout_index_to_amount"
-    }
-
     fn open_all(&mut self) {
-        let path = Self::root();
-
-        let folder = fs::read_dir(path);
+        let folder = fs::read_dir(&self.path);
 
         if folder.is_err() {
             return;
@@ -151,7 +144,11 @@ impl AnyDatabaseGroup for TxoutIndexToAmount {
             .collect_vec()
     }
 
-    fn export_metadata(&mut self, height: Height, date: Date) -> color_eyre::Result<()> {
-        self.metadata.export(height, date)
+    fn metadata(&mut self) -> &mut Metadata {
+        &mut self.metadata
+    }
+
+    fn path(&self) -> &Path {
+        &self.path
     }
 }
diff --git a/parser/src/datasets/_traits/any_dataset.rs b/src/parser/datasets/_traits/any_dataset.rs
similarity index 99%
rename from parser/src/datasets/_traits/any_dataset.rs
rename to src/parser/datasets/_traits/any_dataset.rs
index 6a5091efc..4f5eba00b 100644
--- a/parser/src/datasets/_traits/any_dataset.rs
+++ b/src/parser/datasets/_traits/any_dataset.rs
@@ -3,14 +3,14 @@ use rayon::prelude::*;
 use struct_iterable::Iterable;
 
 use crate::{
-    datasets::{
+    parser::datasets::{
         cohort_metadata::AddressCohortMetadataDataset, ComputeData, DateRecapDataset, RatioDataset,
         SubDataset,
     },
     structs::{
-        AnyBiMap, AnyDateMap, AnyHeightMap, AnyMap, BiMap, Date, Height, MapKind, Timestamp, OHLC,
+        AnyBiMap, AnyDateMap, AnyHeightMap, AnyMap, BiMap, Date, DateMap, Height, HeightMap,
+        MapKind, Timestamp, OHLC,
     },
-    DateMap, HeightMap,
 };
 
 use super::{AnyDatasetGroup, MinInitialStates};
diff --git a/parser/src/datasets/_traits/any_dataset_group.rs b/src/parser/datasets/_traits/any_dataset_group.rs
similarity index 100%
rename from parser/src/datasets/_traits/any_dataset_group.rs
rename to src/parser/datasets/_traits/any_dataset_group.rs
diff --git a/parser/src/datasets/_traits/any_datasets.rs b/src/parser/datasets/_traits/any_datasets.rs
similarity index 100%
rename from parser/src/datasets/_traits/any_datasets.rs
rename to src/parser/datasets/_traits/any_datasets.rs
diff --git a/parser/src/datasets/_traits/min_initial_state.rs b/src/parser/datasets/_traits/min_initial_state.rs
similarity index 100%
rename from parser/src/datasets/_traits/min_initial_state.rs
rename to src/parser/datasets/_traits/min_initial_state.rs
diff --git a/parser/src/datasets/_traits/mod.rs b/src/parser/datasets/_traits/mod.rs
similarity index 100%
rename from parser/src/datasets/_traits/mod.rs
rename to src/parser/datasets/_traits/mod.rs
diff --git a/parser/src/datasets/address/all_metadata.rs b/src/parser/datasets/address/all_metadata.rs
similarity index 88%
rename from parser/src/datasets/address/all_metadata.rs
rename to src/parser/datasets/address/all_metadata.rs
index 124c27e6d..1087d62c6 100644
--- a/parser/src/datasets/address/all_metadata.rs
+++ b/src/parser/datasets/address/all_metadata.rs
@@ -2,8 +2,8 @@ use allocative::Allocative;
 use struct_iterable::Iterable;
 
 use crate::{
-    datasets::{AnyDataset, ComputeData, InsertData, MinInitialStates},
-    structs::{BiMap, Config, MapKind},
+    parser::datasets::{AnyDataset, ComputeData, InsertData, MinInitialStates},
+    structs::{BiMap, Config, MapKind, MapPath},
 };
 
 #[derive(Allocative, Iterable)]
@@ -15,8 +15,8 @@ pub struct AllAddressesMetadataDataset {
 }
 
 impl AllAddressesMetadataDataset {
-    pub fn import(parent_path: &str, config: &Config) -> color_eyre::Result<Self> {
-        let f = |s: &str| format!("{parent_path}/{s}");
+    pub fn import(path: &MapPath, config: &Config) -> color_eyre::Result<Self> {
+        let f = |s: &str| path.join(s);
 
         let mut s = Self {
             min_initial_states: MinInitialStates::default(),
diff --git a/parser/src/datasets/address/cohort.rs b/src/parser/datasets/address/cohort.rs
similarity index 96%
rename from parser/src/datasets/address/cohort.rs
rename to src/parser/datasets/address/cohort.rs
index c7d24ac82..f7676ad83 100644
--- a/parser/src/datasets/address/cohort.rs
+++ b/src/parser/datasets/address/cohort.rs
@@ -3,9 +3,11 @@ use allocative::Allocative;
 use struct_iterable::Iterable;
 
 use crate::{
-    datasets::{AnyDataset, ComputeData, InsertData, MinInitialStates, SubDataset},
-    states::{AddressCohortId, DurableStates},
-    structs::{AddressSplit, BiMap, Config, Date, Height},
+    parser::{
+        datasets::{AnyDataset, ComputeData, InsertData, MinInitialStates, SubDataset},
+        states::{AddressCohortId, DurableStates},
+    },
+    structs::{AddressSplit, BiMap, Config, Date, Height, MapPath},
 };
 
 use super::cohort_metadata::AddressCohortMetadataDataset;
@@ -23,7 +25,7 @@ pub struct CohortDataset {
 
 impl CohortDataset {
     pub fn import(
-        parent_path: &str,
+        path: &MapPath,
         id: AddressCohortId,
         config: &Config,
     ) -> color_eyre::Result<Self> {
@@ -33,8 +35,8 @@ impl CohortDataset {
         let mut s = Self {
             min_initial_states: MinInitialStates::default(),
             split,
-            metadata: AddressCohortMetadataDataset::import(parent_path, &name, config)?,
-            subs: SubDataset::import(parent_path, &name, config)?,
+            metadata: AddressCohortMetadataDataset::import(path, &name, config)?,
+            subs: SubDataset::import(path, &name, config)?,
         };
 
         s.min_initial_states
diff --git a/parser/src/datasets/address/cohort_metadata.rs b/src/parser/datasets/address/cohort_metadata.rs
similarity index 87%
rename from parser/src/datasets/address/cohort_metadata.rs
rename to src/parser/datasets/address/cohort_metadata.rs
index 185cda2de..860596d0c 100644
--- a/parser/src/datasets/address/cohort_metadata.rs
+++ b/src/parser/datasets/address/cohort_metadata.rs
@@ -2,8 +2,8 @@ use allocative::Allocative;
 use struct_iterable::Iterable;
 
 use crate::{
-    datasets::{AnyDataset, InsertData, MinInitialStates},
-    structs::{BiMap, Config, MapKind},
+    parser::datasets::{AnyDataset, InsertData, MinInitialStates},
+    structs::{BiMap, Config, MapKind, MapPath},
 };
 
 #[derive(Allocative, Iterable)]
@@ -19,15 +19,15 @@ pub struct AddressCohortMetadataDataset {
 
 impl AddressCohortMetadataDataset {
     pub fn import(
-        parent_path: &str,
+        path: &MapPath,
         name: &Option<String>,
         config: &Config,
     ) -> color_eyre::Result<Self> {
         let f = |s: &str| {
             if let Some(name) = name {
-                format!("{parent_path}/{name}/{s}")
+                path.join(&format!("{name}/{s}"))
             } else {
-                format!("{parent_path}/{s}")
+                path.join(s)
             }
         };
 
diff --git a/parser/src/datasets/address/mod.rs b/src/parser/datasets/address/mod.rs
similarity index 93%
rename from parser/src/datasets/address/mod.rs
rename to src/parser/datasets/address/mod.rs
index 392bf8bd6..a8760c860 100644
--- a/parser/src/datasets/address/mod.rs
+++ b/src/parser/datasets/address/mod.rs
@@ -7,9 +7,8 @@ use itertools::Itertools;
 use rayon::prelude::*;
 
 use crate::{
-    states::SplitByAddressCohort,
-    structs::{BiMap, Config, Height},
-    Date,
+    parser::states::SplitByAddressCohort,
+    structs::{BiMap, Config, Date, Height},
 };
 
 use self::{all_metadata::AllAddressesMetadataDataset, cohort::CohortDataset};
@@ -26,13 +25,15 @@ pub struct AddressDatasets {
 }
 
 impl AddressDatasets {
-    pub fn import(parent_path: &str, config: &Config) -> color_eyre::Result<Self> {
+    pub fn import(config: &Config) -> color_eyre::Result<Self> {
         let mut cohorts = SplitByAddressCohort::<Option<CohortDataset>>::default();
 
+        let path_dataset = config.path_datasets();
+
         cohorts
             .as_vec()
             .into_par_iter()
-            .map(|(_, id)| (id, CohortDataset::import(parent_path, id, config)))
+            .map(|(_, id)| (id, CohortDataset::import(&path_dataset, id, config)))
             .collect::<Vec<_>>()
             .into_iter()
             .try_for_each(|(id, dataset)| -> color_eyre::Result<()> {
@@ -43,7 +44,7 @@ impl AddressDatasets {
         let mut s = Self {
             min_initial_states: MinInitialStates::default(),
 
-            metadata: AllAddressesMetadataDataset::import(parent_path, config)?,
+            metadata: AllAddressesMetadataDataset::import(&path_dataset, config)?,
 
             cohorts: cohorts.unwrap(),
         };
diff --git a/parser/src/datasets/block_metadata.rs b/src/parser/datasets/block_metadata.rs
similarity index 87%
rename from parser/src/datasets/block_metadata.rs
rename to src/parser/datasets/block_metadata.rs
index aaa6ddfe9..1bfd17b0a 100644
--- a/parser/src/datasets/block_metadata.rs
+++ b/src/parser/datasets/block_metadata.rs
@@ -2,7 +2,7 @@ use allocative::Allocative;
 use struct_iterable::Iterable;
 
 use crate::{
-    datasets::AnyDataset,
+    parser::datasets::AnyDataset,
     structs::{Config, Date, HeightMap, MapKind, Timestamp},
 };
 
@@ -16,8 +16,8 @@ pub struct BlockMetadataDataset {
 }
 
 impl BlockMetadataDataset {
-    pub fn import(parent_path: &str, config: &Config) -> color_eyre::Result<Self> {
-        let f = |s: &str| format!("{parent_path}/{s}");
+    pub fn import(config: &Config) -> color_eyre::Result<Self> {
+        let f = |s: &str| config.path_datasets().join(s);
 
         let mut s = Self {
             min_initial_states: MinInitialStates::default(),
diff --git a/parser/src/datasets/coindays.rs b/src/parser/datasets/coindays.rs
similarity index 87%
rename from parser/src/datasets/coindays.rs
rename to src/parser/datasets/coindays.rs
index aae63dfc1..c6eca0151 100644
--- a/parser/src/datasets/coindays.rs
+++ b/src/parser/datasets/coindays.rs
@@ -2,9 +2,8 @@ use allocative::Allocative;
 use struct_iterable::Iterable;
 
 use crate::{
-    datasets::AnyDataset,
-    structs::{Config, MapKind},
-    DateMap, HeightMap,
+    parser::datasets::AnyDataset,
+    structs::{Config, DateMap, HeightMap, MapKind},
 };
 
 use super::{InsertData, MinInitialStates};
@@ -17,8 +16,8 @@ pub struct CoindaysDataset {
 }
 
 impl CoindaysDataset {
-    pub fn import(parent_path: &str, config: &Config) -> color_eyre::Result<Self> {
-        let f = |s: &str| format!("{parent_path}/{s}");
+    pub fn import(config: &Config) -> color_eyre::Result<Self> {
+        let f = |s: &str| config.path_datasets().join(s);
 
         let mut s = Self {
             min_initial_states: MinInitialStates::default(),
diff --git a/parser/src/datasets/cointime.rs b/src/parser/datasets/cointime.rs
similarity index 97%
rename from parser/src/datasets/cointime.rs
rename to src/parser/datasets/cointime.rs
index 0cd6d6773..2c4b79271 100644
--- a/parser/src/datasets/cointime.rs
+++ b/src/parser/datasets/cointime.rs
@@ -2,9 +2,8 @@ use allocative::Allocative;
 use struct_iterable::Iterable;
 
 use crate::{
-    structs::{BiMap, Config, DateMap, Height, MapKind},
+    structs::{BiMap, Config, DateMap, Height, HeightMap, MapKind},
     utils::{ONE_DAY_IN_DAYS, ONE_YEAR_IN_DAYS, THREE_MONTHS_IN_DAYS, TWO_WEEK_IN_DAYS},
-    HeightMap,
 };
 
 use super::{AnyDataset, ComputeData, InsertData, MinInitialStates, RatioDataset};
@@ -72,8 +71,9 @@ pub struct CointimeDataset {
 }
 
 impl CointimeDataset {
-    pub fn import(parent_path: &str, config: &Config) -> color_eyre::Result<Self> {
-        let f = |s: &str| format!("{parent_path}/{s}");
+    pub fn import(config: &Config) -> color_eyre::Result<Self> {
+        let path_dataset = config.path_datasets();
+        let f = |s: &str| path_dataset.join(s);
 
         let mut s = Self {
             min_initial_states: MinInitialStates::default(),
@@ -93,7 +93,7 @@ impl CointimeDataset {
             // Computed
             active_cap: BiMap::new_bin(1, MapKind::Computed, &f("active_cap")),
             active_price: BiMap::new_bin(1, MapKind::Computed, &f("active_price")),
-            active_price_ratio: RatioDataset::import(parent_path, "active_price", config)?,
+            active_price_ratio: RatioDataset::import(&path_dataset, "active_price", config)?,
             active_supply: BiMap::new_bin(1, MapKind::Computed, &f("active_supply")),
             active_supply_3m_net_change: BiMap::new_bin(
                 1,
@@ -140,7 +140,7 @@ impl CointimeDataset {
             ),
             cointime_cap: BiMap::new_bin(1, MapKind::Computed, &f("cointime_cap")),
             cointime_price: BiMap::new_bin(1, MapKind::Computed, &f("cointime_price")),
-            cointime_price_ratio: RatioDataset::import(parent_path, "cointime_price", config)?,
+            cointime_price_ratio: RatioDataset::import(&path_dataset, "cointime_price", config)?,
             cointime_value_created: HeightMap::new_bin(
                 1,
                 MapKind::Computed,
@@ -237,7 +237,11 @@ impl CointimeDataset {
                 &f("true_market_deviation"),
             ),
             true_market_mean: BiMap::new_bin(1, MapKind::Computed, &f("true_market_mean")),
-            true_market_mean_ratio: RatioDataset::import(parent_path, "true_market_mean", config)?,
+            true_market_mean_ratio: RatioDataset::import(
+                &path_dataset,
+                "true_market_mean",
+                config,
+            )?,
             true_market_net_unrealized_profit_and_loss: BiMap::new_bin(
                 1,
                 MapKind::Computed,
@@ -245,7 +249,7 @@ impl CointimeDataset {
             ),
             vaulted_cap: BiMap::new_bin(1, MapKind::Computed, &f("vaulted_cap")),
             vaulted_price: BiMap::new_bin(1, MapKind::Computed, &f("vaulted_price")),
-            vaulted_price_ratio: RatioDataset::import(parent_path, "vaulted_price", config)?,
+            vaulted_price_ratio: RatioDataset::import(&path_dataset, "vaulted_price", config)?,
             vaulted_supply: BiMap::new_bin(1, MapKind::Computed, &f("vaulted_supply")),
             vaulted_supply_3m_net_change: BiMap::new_bin(
                 1,
diff --git a/parser/src/datasets/constant.rs b/src/parser/datasets/constant.rs
similarity index 90%
rename from parser/src/datasets/constant.rs
rename to src/parser/datasets/constant.rs
index ae94965ae..4f1dce63f 100644
--- a/parser/src/datasets/constant.rs
+++ b/src/parser/datasets/constant.rs
@@ -16,8 +16,8 @@ pub struct ConstantDataset {
 }
 
 impl ConstantDataset {
-    pub fn import(parent_path: &str, config: &Config) -> color_eyre::Result<Self> {
-        let f = |s: &str| format!("{parent_path}/{s}");
+    pub fn import(config: &Config) -> color_eyre::Result<Self> {
+        let f = |s: &str| config.path_datasets().join(s);
 
         let mut s = Self {
             min_initial_states: MinInitialStates::default(),
diff --git a/parser/src/datasets/date_metadata.rs b/src/parser/datasets/date_metadata.rs
similarity index 88%
rename from parser/src/datasets/date_metadata.rs
rename to src/parser/datasets/date_metadata.rs
index 4f69ec24f..80f8fa9d6 100644
--- a/parser/src/datasets/date_metadata.rs
+++ b/src/parser/datasets/date_metadata.rs
@@ -2,7 +2,7 @@ use allocative::Allocative;
 use struct_iterable::Iterable;
 
 use crate::{
-    datasets::AnyDataset,
+    parser::datasets::AnyDataset,
     structs::{Config, DateMap, Height, MapKind},
 };
 
@@ -17,8 +17,8 @@ pub struct DateMetadataDataset {
 }
 
 impl DateMetadataDataset {
-    pub fn import(parent_path: &str, config: &Config) -> color_eyre::Result<Self> {
-        let f = |s: &str| format!("{parent_path}/{s}");
+    pub fn import(config: &Config) -> color_eyre::Result<Self> {
+        let f = |s: &str| config.path_datasets().join(s);
 
         let mut s = Self {
             min_initial_states: MinInitialStates::default(),
diff --git a/parser/src/datasets/mining.rs b/src/parser/datasets/mining.rs
similarity index 99%
rename from parser/src/datasets/mining.rs
rename to src/parser/datasets/mining.rs
index 759fcf35b..667b0a8a7 100644
--- a/parser/src/datasets/mining.rs
+++ b/src/parser/datasets/mining.rs
@@ -4,7 +4,7 @@ use ordered_float::OrderedFloat;
 use struct_iterable::Iterable;
 
 use crate::{
-    datasets::AnyDataset,
+    parser::datasets::AnyDataset,
     structs::{Amount, BiMap, Config, DateMap, Height, HeightMap, MapKey, MapKind},
     utils::{
         BYTES_IN_MB, ONE_DAY_IN_DAYS, ONE_MONTH_IN_DAYS, ONE_WEEK_IN_DAYS, ONE_YEAR_IN_DAYS,
@@ -123,8 +123,8 @@ pub struct MiningDataset {
 }
 
 impl MiningDataset {
-    pub fn import(parent_path: &str, config: &Config) -> color_eyre::Result<Self> {
-        let f = |s: &str| format!("{parent_path}/{s}");
+    pub fn import(config: &Config) -> color_eyre::Result<Self> {
+        let f = |s: &str| config.path_datasets().join(s);
 
         let mut s = Self {
             min_initial_states: MinInitialStates::default(),
diff --git a/parser/src/datasets/mod.rs b/src/parser/datasets/mod.rs
similarity index 75%
rename from parser/src/datasets/mod.rs
rename to src/parser/datasets/mod.rs
index 43a8c94c1..bc4edc899 100644
--- a/parser/src/datasets/mod.rs
+++ b/src/parser/datasets/mod.rs
@@ -1,9 +1,10 @@
-use std::{collections::BTreeMap, fs, ops::RangeInclusive, path::Path};
+use std::{collections::BTreeMap, ops::RangeInclusive, path::PathBuf};
 
 use allocative::Allocative;
 
 use itertools::Itertools;
 
+use log::info;
 use rayon::prelude::*;
 
 mod _traits;
@@ -34,16 +35,18 @@ pub use transaction::*;
 pub use utxo::*;
 
 use crate::{
-    databases::Databases,
-    io::{Json, JSON_EXTENSION},
-    states::{
-        AddressCohortsInputStates,
-        AddressCohortsOneShotStates,
-        AddressCohortsRealizedStates,
-        States,
-        UTXOCohortsOneShotStates,
-        // UTXOCohortsReceivedStates,
-        UTXOCohortsSentStates,
+    io::Json,
+    parser::{
+        databases::Databases,
+        states::{
+            AddressCohortsInputStates,
+            AddressCohortsOneShotStates,
+            AddressCohortsRealizedStates,
+            States,
+            UTXOCohortsOneShotStates,
+            // UTXOCohortsReceivedStates,
+            UTXOCohortsSentStates,
+        },
     },
     structs::{Amount, Config, Date, Height, Price, Timestamp},
 };
@@ -84,7 +87,7 @@ pub struct ComputeData<'a> {
 }
 
 #[derive(Allocative)]
-pub struct AllDatasets {
+pub struct Datasets {
     min_initial_states: MinInitialStates,
 
     pub constant: ConstantDataset,
@@ -99,31 +102,27 @@ pub struct AllDatasets {
     pub utxo: UTXODatasets,
 }
 
-const DATASETS_PATH: &str = "../datasets";
-
-impl AllDatasets {
+impl Datasets {
     pub fn import(config: &Config) -> color_eyre::Result<Self> {
-        let path = DATASETS_PATH;
+        let price = PriceDatasets::import(config)?;
 
-        let price = PriceDatasets::import(path, config)?;
+        let constant = ConstantDataset::import(config)?;
 
-        let constant = ConstantDataset::import(path, config)?;
+        let date_metadata = DateMetadataDataset::import(config)?;
 
-        let date_metadata = DateMetadataDataset::import(path, config)?;
+        let cointime = CointimeDataset::import(config)?;
 
-        let cointime = CointimeDataset::import(path, config)?;
+        let coindays = CoindaysDataset::import(config)?;
 
-        let coindays = CoindaysDataset::import(path, config)?;
+        let mining = MiningDataset::import(config)?;
 
-        let mining = MiningDataset::import(path, config)?;
+        let block_metadata = BlockMetadataDataset::import(config)?;
 
-        let block_metadata = BlockMetadataDataset::import(path, config)?;
+        let transaction = TransactionDataset::import(config)?;
 
-        let transaction = TransactionDataset::import(path, config)?;
+        let address = AddressDatasets::import(config)?;
 
-        let address = AddressDatasets::import(path, config)?;
-
-        let utxo = UTXODatasets::import(path, config)?;
+        let utxo = UTXODatasets::import(config)?;
 
         let mut s = Self {
             min_initial_states: MinInitialStates::default(),
@@ -143,7 +142,7 @@ impl AllDatasets {
         s.min_initial_states
             .consume(MinInitialStates::compute_from_datasets(&s, config));
 
-        s.export_meta_files()?;
+        info!("Imported datasets");
 
         Ok(s)
     }
@@ -269,43 +268,23 @@ impl AllDatasets {
         }
     }
 
-    pub fn export_meta_files(&self) -> color_eyre::Result<()> {
-        let mut path_to_type: BTreeMap<&Path, &str> = self
+    pub fn get_paths_to_type(&self, config: &Config) -> BTreeMap<PathBuf, String> {
+        let mut path_to_type: BTreeMap<PathBuf, String> = self
             .to_any_dataset_vec()
             .into_iter()
             .flat_map(|dataset| dataset.to_all_map_vec())
-            .flat_map(|map| map.exported_path_with_t_name())
+            .flat_map(|map| map.get_paths_to_type())
             .collect();
 
-        path_to_type.insert(Path::new("../datasets/last"), "Value");
+        path_to_type.insert(
+            config.path_datasets_last_values().unwrap().to_owned(),
+            "Value".to_string(),
+        );
 
-        let datasets_len = path_to_type.len();
-
-        let server_inputs_path = "../server/in";
-
-        fs::create_dir_all(server_inputs_path)?;
-
-        Json::export(
-            Path::new(&format!("{server_inputs_path}/disk_path_to_type.json")),
-            &path_to_type,
-        )?;
-
-        let datasets_len_path = format!("{server_inputs_path}/datasets_len.txt");
-
-        if let Ok(len) = fs::read_to_string(&datasets_len_path) {
-            if let Ok(len) = len.parse::<usize>() {
-                if datasets_len == len {
-                    return Ok(());
-                }
-            }
-        }
-
-        fs::write(datasets_len_path, datasets_len.to_string())?;
-
-        Ok(())
+        path_to_type
     }
 
-    pub fn export(&mut self) -> color_eyre::Result<()> {
+    pub fn export(&mut self, config: &Config) -> color_eyre::Result<()> {
         self.to_mut_any_dataset_vec()
             .into_iter()
             .for_each(|dataset| dataset.pre_export());
@@ -316,6 +295,11 @@ impl AllDatasets {
 
         let mut path_to_last: BTreeMap<String, Value> = BTreeMap::default();
 
+        let path_dataset = config.path_datasets();
+        let path_dataset_ser = path_dataset.to_str().unwrap();
+        let path_price = config.path_price();
+        let path_price_ser = path_price.to_str().unwrap();
+
         self.to_mut_any_dataset_vec()
             .into_iter()
             .for_each(|dataset| {
@@ -326,34 +310,28 @@ impl AllDatasets {
                         if let Some(last_value) = map.last_value() {
                             let mut last_path = last_path.clone();
                             last_path.pop();
+                            let key = last_path
+                                .to_str()
+                                .unwrap()
+                                .replace(path_dataset_ser, "")
+                                .replace(path_price_ser, "")
+                                .split("/")
+                                .join("-")
+                                .to_string();
 
-                            let last_path = last_path.to_str().unwrap();
-
-                            let skip = if last_path.starts_with(DATASETS_PATH) {
-                                2
-                            } else {
-                                1
-                            };
-
-                            path_to_last.insert(
-                                last_path.split('/').skip(skip).join("-").to_string(),
-                                last_value,
-                            );
+                            path_to_last.insert(key, last_value);
                         }
                     }
                 });
             });
 
-        Json::export(
-            Path::new(&format!("{DATASETS_PATH}/last.{JSON_EXTENSION}")),
-            &path_to_last,
-        )?;
+        Json::export(&config.path_datasets_last_values(), &path_to_last)?;
 
         Ok(())
     }
 }
 
-impl AnyDatasets for AllDatasets {
+impl AnyDatasets for Datasets {
     fn get_min_initial_states(&self) -> &MinInitialStates {
         &self.min_initial_states
     }
diff --git a/parser/src/datasets/price.rs b/src/parser/datasets/price.rs
similarity index 93%
rename from parser/src/datasets/price.rs
rename to src/parser/datasets/price.rs
index d2735c4ee..ca79bd945 100644
--- a/parser/src/datasets/price.rs
+++ b/src/parser/datasets/price.rs
@@ -7,7 +7,7 @@ use color_eyre::eyre::Error;
 use struct_iterable::Iterable;
 
 use crate::{
-    price::{Binance, Kibo, Kraken},
+    parser::price::{Binance, Kibo, Kraken},
     structs::{
         Amount, BiMap, Config, Date, DateMap, DateMapChunkId, Height, HeightMapChunkId, MapKey,
         MapKind, Timestamp, OHLC,
@@ -85,10 +85,9 @@ pub struct PriceDatasets {
 }
 
 impl PriceDatasets {
-    pub fn import(datasets_path: &str, config: &Config) -> color_eyre::Result<Self> {
-        let price_path = "../price";
-
-        let f = |s: &str| format!("{datasets_path}/{s}");
+    pub fn import(config: &Config) -> color_eyre::Result<Self> {
+        let path_dataset = config.path_datasets();
+        let f = |s: &str| path_dataset.join(s);
 
         let mut s = Self {
             min_initial_states: MinInitialStates::default(),
@@ -104,7 +103,7 @@ impl PriceDatasets {
             // ---
             // Inserted
             // ---
-            ohlc: BiMap::new_json(1, MapKind::Inserted, price_path),
+            ohlc: BiMap::new_json(1, MapKind::Inserted, &config.path_price()),
 
             // ---
             // Computed
@@ -115,31 +114,31 @@ impl PriceDatasets {
             close: BiMap::new_bin(1, MapKind::Computed, &f("close")),
             market_cap: BiMap::new_bin(1, MapKind::Computed, &f("market_cap")),
             price_1w_sma: BiMap::new_bin(1, MapKind::Computed, &f("price_1w_sma")),
-            price_1w_sma_ratio: RatioDataset::import(datasets_path, "price_1w_sma", config)?,
+            price_1w_sma_ratio: RatioDataset::import(&path_dataset, "price_1w_sma", config)?,
             price_1m_sma: BiMap::new_bin(1, MapKind::Computed, &f("price_1m_sma")),
-            price_1m_sma_ratio: RatioDataset::import(datasets_path, "price_1m_sma", config)?,
+            price_1m_sma_ratio: RatioDataset::import(&path_dataset, "price_1m_sma", config)?,
             price_1y_sma: BiMap::new_bin(1, MapKind::Computed, &f("price_1y_sma")),
-            price_1y_sma_ratio: RatioDataset::import(datasets_path, "price_1y_sma", config)?,
+            price_1y_sma_ratio: RatioDataset::import(&path_dataset, "price_1y_sma", config)?,
             price_2y_sma: BiMap::new_bin(1, MapKind::Computed, &f("price_2y_sma")),
-            price_2y_sma_ratio: RatioDataset::import(datasets_path, "price_2y_sma", config)?,
+            price_2y_sma_ratio: RatioDataset::import(&path_dataset, "price_2y_sma", config)?,
             price_4y_sma: BiMap::new_bin(1, MapKind::Computed, &f("price_4y_sma")),
-            price_4y_sma_ratio: RatioDataset::import(datasets_path, "price_4y_sma", config)?,
+            price_4y_sma_ratio: RatioDataset::import(&path_dataset, "price_4y_sma", config)?,
             price_8d_sma: BiMap::new_bin(1, MapKind::Computed, &f("price_8d_sma")),
-            price_8d_sma_ratio: RatioDataset::import(datasets_path, "price_8d_sma", config)?,
+            price_8d_sma_ratio: RatioDataset::import(&path_dataset, "price_8d_sma", config)?,
             price_13d_sma: BiMap::new_bin(1, MapKind::Computed, &f("price_13d_sma")),
-            price_13d_sma_ratio: RatioDataset::import(datasets_path, "price_13d_sma", config)?,
+            price_13d_sma_ratio: RatioDataset::import(&path_dataset, "price_13d_sma", config)?,
             price_21d_sma: BiMap::new_bin(1, MapKind::Computed, &f("price_21d_sma")),
-            price_21d_sma_ratio: RatioDataset::import(datasets_path, "price_21d_sma", config)?,
+            price_21d_sma_ratio: RatioDataset::import(&path_dataset, "price_21d_sma", config)?,
             price_34d_sma: BiMap::new_bin(1, MapKind::Computed, &f("price_34d_sma")),
-            price_34d_sma_ratio: RatioDataset::import(datasets_path, "price_34d_sma", config)?,
+            price_34d_sma_ratio: RatioDataset::import(&path_dataset, "price_34d_sma", config)?,
             price_55d_sma: BiMap::new_bin(1, MapKind::Computed, &f("price_55d_sma")),
-            price_55d_sma_ratio: RatioDataset::import(datasets_path, "price_55d_sma", config)?,
+            price_55d_sma_ratio: RatioDataset::import(&path_dataset, "price_55d_sma", config)?,
             price_89d_sma: BiMap::new_bin(1, MapKind::Computed, &f("price_89d_sma")),
-            price_89d_sma_ratio: RatioDataset::import(datasets_path, "price_89d_sma", config)?,
+            price_89d_sma_ratio: RatioDataset::import(&path_dataset, "price_89d_sma", config)?,
             price_144d_sma: BiMap::new_bin(1, MapKind::Computed, &f("price_144d_sma")),
-            price_144d_sma_ratio: RatioDataset::import(datasets_path, "price_144d_sma", config)?,
+            price_144d_sma_ratio: RatioDataset::import(&path_dataset, "price_144d_sma", config)?,
             price_200w_sma: BiMap::new_bin(1, MapKind::Computed, &f("price_200w_sma")),
-            price_200w_sma_ratio: RatioDataset::import(datasets_path, "price_200w_sma", config)?,
+            price_200w_sma_ratio: RatioDataset::import(&path_dataset, "price_200w_sma", config)?,
             price_1d_total_return: DateMap::new_bin(
                 1,
                 MapKind::Computed,
@@ -540,6 +539,7 @@ impl PriceDatasets {
         height: Height,
         timestamp: Timestamp,
         previous_timestamp: Option<Timestamp>,
+        config: &Config,
     ) -> color_eyre::Result<OHLC> {
         if let Some(ohlc) = self.ohlc.height.get_or_import(&height) {
             return Ok(ohlc);
@@ -558,7 +558,7 @@ impl PriceDatasets {
             .unwrap_or_else(|_| {
                 self.get_from_1mn_binance(timestamp, previous_timestamp)
                     .unwrap_or_else(|_| {
-                        self.get_from_har_binance(timestamp, previous_timestamp)
+                        self.get_from_har_binance(timestamp, previous_timestamp, config)
                             .unwrap_or_else(|_| {
                                 self.get_from_height_kibo(&height).unwrap_or_else(|_| {
                                     let date = timestamp.to_date();
@@ -659,10 +659,11 @@ How to fix this:
         &mut self,
         timestamp: Timestamp,
         previous_timestamp: Option<Timestamp>,
+        config: &Config,
     ) -> color_eyre::Result<OHLC> {
         if self.binance_har.is_none() {
             self.binance_har
-                .replace(Binance::read_har_file().unwrap_or_default());
+                .replace(Binance::read_har_file(config).unwrap_or_default());
         }
 
         Self::find_height_ohlc(
diff --git a/parser/src/datasets/subs/capitalization.rs b/src/parser/datasets/subs/capitalization.rs
similarity index 90%
rename from parser/src/datasets/subs/capitalization.rs
rename to src/parser/datasets/subs/capitalization.rs
index 20a792662..834f19a3e 100644
--- a/parser/src/datasets/subs/capitalization.rs
+++ b/src/parser/datasets/subs/capitalization.rs
@@ -2,9 +2,11 @@ use allocative::Allocative;
 use struct_iterable::Iterable;
 
 use crate::{
-    datasets::{AnyDataset, ComputeData, InsertData, MinInitialStates},
-    states::CapitalizationState,
-    structs::{BiMap, Config, MapKind},
+    parser::{
+        datasets::{AnyDataset, ComputeData, InsertData, MinInitialStates},
+        states::CapitalizationState,
+    },
+    structs::{BiMap, Config, MapKind, MapPath},
     utils::ONE_MONTH_IN_DAYS,
 };
 
@@ -22,15 +24,15 @@ pub struct CapitalizationDataset {
 
 impl CapitalizationDataset {
     pub fn import(
-        parent_path: &str,
+        path: &MapPath,
         name: &Option<String>,
         config: &Config,
     ) -> color_eyre::Result<Self> {
         let f = |s: &str| {
             if let Some(name) = name {
-                format!("{parent_path}/{name}/{s}")
+                path.join(&format!("{name}/{s}"))
             } else {
-                format!("{parent_path}/{s}")
+                path.join(s)
             }
         };
 
@@ -52,7 +54,7 @@ impl CapitalizationDataset {
             ),
             realized_price: BiMap::new_bin(1, MapKind::Computed, &f("realized_price")),
             realized_price_ratio: RatioDataset::import(
-                parent_path,
+                path,
                 &format!(
                     "{}realized_price",
                     name.as_ref().map_or("".to_owned(), |n| format!("{n}-"))
diff --git a/parser/src/datasets/subs/input.rs b/src/parser/datasets/subs/input.rs
similarity index 87%
rename from parser/src/datasets/subs/input.rs
rename to src/parser/datasets/subs/input.rs
index b9091205e..f7522cc03 100644
--- a/parser/src/datasets/subs/input.rs
+++ b/src/parser/datasets/subs/input.rs
@@ -2,10 +2,11 @@ use allocative::Allocative;
 use struct_iterable::Iterable;
 
 use crate::{
-    datasets::{AnyDataset, InsertData, MinInitialStates},
-    states::InputState,
-    structs::{BiMap, Config, MapKind},
-    DateMap, HeightMap,
+    parser::{
+        datasets::{AnyDataset, InsertData, MinInitialStates},
+        states::InputState,
+    },
+    structs::{BiMap, Config, DateMap, HeightMap, MapKind, MapPath},
 };
 
 #[derive(Allocative, Iterable)]
@@ -22,15 +23,15 @@ pub struct InputSubDataset {
 
 impl InputSubDataset {
     pub fn import(
-        parent_path: &str,
+        path: &MapPath,
         name: &Option<String>,
         config: &Config,
     ) -> color_eyre::Result<Self> {
         let f = |s: &str| {
             if let Some(name) = name {
-                format!("{parent_path}/{name}/{s}")
+                path.join(&format!("{name}/{s}"))
             } else {
-                format!("{parent_path}/{s}")
+                path.join(s)
             }
         };
 
diff --git a/parser/src/datasets/subs/mod.rs b/src/parser/datasets/subs/mod.rs
similarity index 95%
rename from parser/src/datasets/subs/mod.rs
rename to src/parser/datasets/subs/mod.rs
index c34be68cd..566cd8388 100644
--- a/parser/src/datasets/subs/mod.rs
+++ b/src/parser/datasets/subs/mod.rs
@@ -21,7 +21,10 @@ pub use supply::*;
 pub use unrealized::*;
 pub use utxo::*;
 
-use crate::{datasets::AnyDataset, structs::Config};
+use crate::{
+    parser::datasets::AnyDataset,
+    structs::{Config, MapPath},
+};
 
 use super::AnyDatasetGroup;
 
@@ -39,7 +42,7 @@ pub struct SubDataset {
 
 impl SubDataset {
     pub fn import(
-        parent_path: &str,
+        parent_path: &MapPath,
         name: &Option<String>,
         config: &Config,
     ) -> color_eyre::Result<Self> {
diff --git a/parser/src/datasets/subs/output.rs b/src/parser/datasets/subs/output.rs
similarity index 100%
rename from parser/src/datasets/subs/output.rs
rename to src/parser/datasets/subs/output.rs
diff --git a/parser/src/datasets/subs/price_paid.rs b/src/parser/datasets/subs/price_paid.rs
similarity index 96%
rename from parser/src/datasets/subs/price_paid.rs
rename to src/parser/datasets/subs/price_paid.rs
index ca06ef2b5..7f1bba43d 100644
--- a/parser/src/datasets/subs/price_paid.rs
+++ b/src/parser/datasets/subs/price_paid.rs
@@ -2,9 +2,11 @@ use allocative::Allocative;
 use struct_iterable::Iterable;
 
 use crate::{
-    datasets::{AnyDataset, InsertData, MinInitialStates},
-    states::PricePaidState,
-    structs::{BiMap, Config, Date, Height, MapKind},
+    parser::{
+        datasets::{AnyDataset, InsertData, MinInitialStates},
+        states::PricePaidState,
+    },
+    structs::{BiMap, Config, Date, Height, MapKind, MapPath},
 };
 
 #[derive(Allocative, Iterable)]
@@ -34,15 +36,15 @@ pub struct PricePaidSubDataset {
 
 impl PricePaidSubDataset {
     pub fn import(
-        parent_path: &str,
+        path: &MapPath,
         name: &Option<String>,
         config: &Config,
     ) -> color_eyre::Result<Self> {
         let f = |s: &str| {
             if let Some(name) = name {
-                format!("{parent_path}/{name}/{s}")
+                path.join(&format!("{name}/{s}"))
             } else {
-                format!("{parent_path}/{s}")
+                path.join(s)
             }
         };
 
diff --git a/parser/src/datasets/subs/ratio.rs b/src/parser/datasets/subs/ratio.rs
similarity index 93%
rename from parser/src/datasets/subs/ratio.rs
rename to src/parser/datasets/subs/ratio.rs
index d7ca03c3e..270f9dde0 100644
--- a/parser/src/datasets/subs/ratio.rs
+++ b/src/parser/datasets/subs/ratio.rs
@@ -2,8 +2,8 @@ use allocative::Allocative;
 use struct_iterable::Iterable;
 
 use crate::{
-    datasets::{AnyDataset, ComputeData, MinInitialStates},
-    structs::{BiMap, Config, MapKind},
+    parser::datasets::{AnyDataset, ComputeData, MinInitialStates},
+    structs::{BiMap, Config, MapKind, MapPath},
     utils::{ONE_MONTH_IN_DAYS, ONE_WEEK_IN_DAYS, ONE_YEAR_IN_DAYS},
 };
 
@@ -31,9 +31,9 @@ pub struct RatioDataset {
 }
 
 impl RatioDataset {
-    pub fn import(parent_path: &str, name: &str, config: &Config) -> color_eyre::Result<Self> {
-        let f_ratio = |s: &str| format!("{parent_path}/market_price_to_{name}_{s}");
-        let f_price = |s: &str| format!("{parent_path}/{name}_{s}");
+    pub fn import(path: &MapPath, name: &str, config: &Config) -> color_eyre::Result<Self> {
+        let f_ratio = |s: &str| path.join(&format!("market_price_to_{name}_{s}"));
+        let f_price = |s: &str| path.join(&format!("{name}_{s}"));
 
         let mut s = Self {
             min_initial_states: MinInitialStates::default(),
diff --git a/parser/src/datasets/subs/realized.rs b/src/parser/datasets/subs/realized.rs
similarity index 97%
rename from parser/src/datasets/subs/realized.rs
rename to src/parser/datasets/subs/realized.rs
index 005d4b389..c5c4ae98b 100644
--- a/parser/src/datasets/subs/realized.rs
+++ b/src/parser/datasets/subs/realized.rs
@@ -2,11 +2,12 @@ use allocative::Allocative;
 use struct_iterable::Iterable;
 
 use crate::{
-    datasets::{AnyDataset, ComputeData, InsertData, MinInitialStates},
-    states::RealizedState,
-    structs::{BiMap, Config, MapKind, Price},
+    parser::{
+        datasets::{AnyDataset, ComputeData, InsertData, MinInitialStates},
+        states::RealizedState,
+    },
+    structs::{BiMap, Config, DateMap, HeightMap, MapKind, MapPath, Price},
     utils::ONE_MONTH_IN_DAYS,
-    DateMap, HeightMap,
 };
 
 #[derive(Allocative, Iterable)]
@@ -45,18 +46,17 @@ pub struct RealizedSubDataset {
 
 impl RealizedSubDataset {
     pub fn import(
-        parent_path: &str,
+        path: &MapPath,
         name: &Option<String>,
         config: &Config,
     ) -> color_eyre::Result<Self> {
         let f = |s: &str| {
             if let Some(name) = name {
-                format!("{parent_path}/{name}/{s}")
+                path.join(&format!("{name}/{s}"))
             } else {
-                format!("{parent_path}/{s}")
+                path.join(s)
             }
         };
-
         let mut s = Self {
             min_initial_states: MinInitialStates::default(),
 
diff --git a/parser/src/datasets/subs/recap.rs b/src/parser/datasets/subs/recap.rs
similarity index 96%
rename from parser/src/datasets/subs/recap.rs
rename to src/parser/datasets/subs/recap.rs
index e5661fa53..e02277c1e 100644
--- a/parser/src/datasets/subs/recap.rs
+++ b/src/parser/datasets/subs/recap.rs
@@ -3,9 +3,11 @@ use std::{iter::Sum, ops::Add};
 use allocative::Allocative;
 
 use crate::{
-    structs::{DateMapChunkId, GenericMap, MapKey, MapKind, MapSerialized, MapValue},
+    structs::{
+        Date, DateMapChunkId, GenericMap, MapChunkId, MapKey, MapKind, MapPath, MapSerialized,
+        MapValue, SerializedBTreeMap,
+    },
     utils::{get_percentile, LossyFrom},
-    Date, MapChunkId, SerializedBTreeMap,
 };
 
 pub type DateRecapDataset<T> = RecapDataset<Date, T, DateMapChunkId, SerializedBTreeMap<Date, T>>;
@@ -91,8 +93,8 @@ where
     Key: MapKey<ChunkId>,
     Serialized: MapSerialized<Key, Value, ChunkId>,
 {
-    pub fn import(parent_path: &str, options: RecapOptions) -> color_eyre::Result<Self> {
-        let f = |s: &str| format!("{parent_path}/{s}");
+    pub fn import(path: &MapPath, options: RecapOptions) -> color_eyre::Result<Self> {
+        let f = |s: &str| path.join(s);
 
         let s = Self {
             // ---
diff --git a/parser/src/datasets/subs/supply.rs b/src/parser/datasets/subs/supply.rs
similarity index 90%
rename from parser/src/datasets/subs/supply.rs
rename to src/parser/datasets/subs/supply.rs
index 316ae0904..7fe41efec 100644
--- a/parser/src/datasets/subs/supply.rs
+++ b/src/parser/datasets/subs/supply.rs
@@ -2,9 +2,11 @@ use allocative::Allocative;
 use struct_iterable::Iterable;
 
 use crate::{
-    datasets::{AnyDataset, ComputeData, InsertData, MinInitialStates},
-    states::SupplyState,
-    structs::{BiMap, Config, MapKind},
+    parser::{
+        datasets::{AnyDataset, ComputeData, InsertData, MinInitialStates},
+        states::SupplyState,
+    },
+    structs::{BiMap, Config, MapKind, MapPath},
 };
 
 #[derive(Allocative, Iterable)]
@@ -19,15 +21,15 @@ pub struct SupplySubDataset {
 
 impl SupplySubDataset {
     pub fn import(
-        parent_path: &str,
+        path: &MapPath,
         name: &Option<String>,
         config: &Config,
     ) -> color_eyre::Result<Self> {
         let f = |s: &str| {
             if let Some(name) = name {
-                format!("{parent_path}/{name}/{s}")
+                path.join(&format!("{name}/{s}"))
             } else {
-                format!("{parent_path}/{s}")
+                path.join(s)
             }
         };
 
diff --git a/parser/src/datasets/subs/unrealized.rs b/src/parser/datasets/subs/unrealized.rs
similarity index 95%
rename from parser/src/datasets/subs/unrealized.rs
rename to src/parser/datasets/subs/unrealized.rs
index 7801cf243..6290f589b 100644
--- a/parser/src/datasets/subs/unrealized.rs
+++ b/src/parser/datasets/subs/unrealized.rs
@@ -2,9 +2,11 @@ use allocative::Allocative;
 use struct_iterable::Iterable;
 
 use crate::{
-    datasets::{AnyDataset, ComputeData, InsertData, MinInitialStates},
-    states::UnrealizedState,
-    structs::{BiMap, Config, MapKind},
+    parser::{
+        datasets::{AnyDataset, ComputeData, InsertData, MinInitialStates},
+        states::UnrealizedState,
+    },
+    structs::{BiMap, Config, MapKind, MapPath},
 };
 
 #[derive(Allocative, Iterable)]
@@ -26,15 +28,15 @@ pub struct UnrealizedSubDataset {
 
 impl UnrealizedSubDataset {
     pub fn import(
-        parent_path: &str,
+        path: &MapPath,
         name: &Option<String>,
         config: &Config,
     ) -> color_eyre::Result<Self> {
         let f = |s: &str| {
             if let Some(name) = name {
-                format!("{parent_path}/{name}/{s}")
+                path.join(&format!("{name}/{s}"))
             } else {
-                format!("{parent_path}/{s}")
+                path.join(s)
             }
         };
 
diff --git a/parser/src/datasets/subs/utxo.rs b/src/parser/datasets/subs/utxo.rs
similarity index 83%
rename from parser/src/datasets/subs/utxo.rs
rename to src/parser/datasets/subs/utxo.rs
index 61ecf9f90..4f5a071ae 100644
--- a/parser/src/datasets/subs/utxo.rs
+++ b/src/parser/datasets/subs/utxo.rs
@@ -2,9 +2,11 @@ use allocative::Allocative;
 use struct_iterable::Iterable;
 
 use crate::{
-    datasets::{AnyDataset, InsertData, MinInitialStates},
-    states::UTXOState,
-    structs::{BiMap, Config, MapKind},
+    parser::{
+        datasets::{AnyDataset, InsertData, MinInitialStates},
+        states::UTXOState,
+    },
+    structs::{BiMap, Config, MapKind, MapPath},
 };
 
 #[derive(Allocative, Iterable)]
@@ -16,15 +18,15 @@ pub struct UTXOSubDataset {
 
 impl UTXOSubDataset {
     pub fn import(
-        parent_path: &str,
+        path: &MapPath,
         name: &Option<String>,
         config: &Config,
     ) -> color_eyre::Result<Self> {
         let f = |s: &str| {
             if let Some(name) = name {
-                format!("{parent_path}/{name}/{s}")
+                path.join(&format!("{name}/{s}"))
             } else {
-                format!("{parent_path}/{s}")
+                path.join(s)
             }
         };
 
diff --git a/parser/src/datasets/transaction.rs b/src/parser/datasets/transaction.rs
similarity index 97%
rename from parser/src/datasets/transaction.rs
rename to src/parser/datasets/transaction.rs
index 7ab3ae300..94704de63 100644
--- a/parser/src/datasets/transaction.rs
+++ b/src/parser/datasets/transaction.rs
@@ -2,12 +2,11 @@ use allocative::Allocative;
 use struct_iterable::Iterable;
 
 use crate::{
-    datasets::InsertData,
-    structs::{BiMap, Config, HeightMap, MapKind},
+    parser::datasets::InsertData,
+    structs::{BiMap, Config, DateMap, HeightMap, MapKind},
     utils::{
         ONE_DAY_IN_S, ONE_MONTH_IN_DAYS, ONE_WEEK_IN_DAYS, ONE_YEAR_IN_DAYS, TARGET_BLOCKS_PER_DAY,
     },
-    DateMap,
 };
 
 use super::{AnyDataset, ComputeData, MinInitialStates};
@@ -52,8 +51,8 @@ pub struct TransactionDataset {
 }
 
 impl TransactionDataset {
-    pub fn import(parent_path: &str, config: &Config) -> color_eyre::Result<Self> {
-        let f = |s: &str| format!("{parent_path}/{s}");
+    pub fn import(config: &Config) -> color_eyre::Result<Self> {
+        let f = |s: &str| config.path_datasets().join(s);
 
         let mut s = Self {
             min_initial_states: MinInitialStates::default(),
diff --git a/parser/src/datasets/utxo/dataset.rs b/src/parser/datasets/utxo/dataset.rs
similarity index 96%
rename from parser/src/datasets/utxo/dataset.rs
rename to src/parser/datasets/utxo/dataset.rs
index 96b878ddf..01087dbb5 100644
--- a/parser/src/datasets/utxo/dataset.rs
+++ b/src/parser/datasets/utxo/dataset.rs
@@ -2,9 +2,11 @@ use allocative::Allocative;
 use struct_iterable::Iterable;
 
 use crate::{
-    datasets::{AnyDataset, ComputeData, InsertData, MinInitialStates, SubDataset},
-    states::UTXOCohortId,
-    structs::{BiMap, Config, Date, Height},
+    parser::{
+        datasets::{AnyDataset, ComputeData, InsertData, MinInitialStates, SubDataset},
+        states::UTXOCohortId,
+    },
+    structs::{BiMap, Config, Date, Height, MapPath},
 };
 
 #[derive(Allocative, Iterable)]
@@ -18,7 +20,7 @@ pub struct UTXODataset {
 
 impl UTXODataset {
     pub fn import(
-        parent_path: &str,
+        parent_path: &MapPath,
         id: UTXOCohortId,
         config: &Config,
     ) -> color_eyre::Result<Self> {
diff --git a/parser/src/datasets/utxo/mod.rs b/src/parser/datasets/utxo/mod.rs
similarity index 94%
rename from parser/src/datasets/utxo/mod.rs
rename to src/parser/datasets/utxo/mod.rs
index d9bc811bd..c9d0390b4 100644
--- a/parser/src/datasets/utxo/mod.rs
+++ b/src/parser/datasets/utxo/mod.rs
@@ -7,8 +7,8 @@ use rayon::prelude::*;
 use itertools::Itertools;
 
 use crate::{
-    datasets::AnyDatasets,
-    states::{SplitByUTXOCohort, UTXOCohortId},
+    parser::datasets::AnyDatasets,
+    parser::states::{SplitByUTXOCohort, UTXOCohortId},
     structs::{BiMap, Config, Date, Height},
 };
 
@@ -22,13 +22,15 @@ pub struct UTXODatasets {
 }
 
 impl UTXODatasets {
-    pub fn import(parent_path: &str, config: &Config) -> color_eyre::Result<Self> {
+    pub fn import(config: &Config) -> color_eyre::Result<Self> {
         let mut cohorts = SplitByUTXOCohort::<Option<UTXODataset>>::default();
 
+        let path_dataset = config.path_datasets();
+
         cohorts
             .as_vec()
             .into_par_iter()
-            .map(|(_, id)| (id, UTXODataset::import(parent_path, id, config)))
+            .map(|(_, id)| (id, UTXODataset::import(&path_dataset, id, config)))
             .collect::<Vec<_>>()
             .into_iter()
             .try_for_each(|(id, dataset)| -> color_eyre::Result<()> {
diff --git a/src/parser/mod.rs b/src/parser/mod.rs
new file mode 100644
index 000000000..21acaa3ce
--- /dev/null
+++ b/src/parser/mod.rs
@@ -0,0 +1,52 @@
+use std::{thread::sleep, time::Duration};
+
+use biter::bitcoincore_rpc::{Client, RpcApi};
+
+mod actions;
+mod databases;
+mod datasets;
+mod price;
+mod states;
+
+pub use actions::*;
+pub use databases::*;
+pub use datasets::*;
+use log::info;
+pub use states::*;
+
+use crate::structs::{Config, Exit};
+
+pub fn main(
+    config: &Config,
+    rpc: &Client,
+    exit: &Exit,
+    mut databases: Databases,
+    mut datasets: Datasets,
+) -> color_eyre::Result<()> {
+    loop {
+        let block_count = rpc.get_blockchain_info().unwrap().blocks as usize;
+
+        info!("{block_count} blocks found.");
+
+        iter_blocks(
+            config,
+            rpc,
+            block_count,
+            exit.clone(),
+            &mut databases,
+            &mut datasets,
+        )?;
+
+        if let Some(delay) = config.delay {
+            sleep(Duration::from_secs(delay))
+        }
+
+        info!("Waiting for a new block...");
+
+        while block_count == rpc.get_blockchain_info().unwrap().blocks as usize {
+            sleep(Duration::from_secs(1))
+        }
+    }
+
+    // Ok(())
+}
diff --git a/parser/src/price/binance.rs b/src/parser/price/binance.rs
similarity index 92%
rename from parser/src/price/binance.rs
rename to src/parser/price/binance.rs
index bbd988b13..3075f010d 100644
--- a/parser/src/price/binance.rs
+++ b/src/parser/price/binance.rs
@@ -1,26 +1,29 @@
 #![allow(dead_code)]
 
-use std::{collections::BTreeMap, fs, path::Path};
+use std::{collections::BTreeMap, fs};
 
 use color_eyre::eyre::ContextCompat;
 use itertools::Itertools;
+use log::info;
 use serde_json::Value;
 
 use crate::{
-    io::{Json, INPUTS_FOLDER_PATH},
-    structs::{Date, Timestamp, OHLC},
-    utils::{log, retry},
+    io::Json,
+    structs::{Config, Date, Timestamp, OHLC},
+    utils::retry,
 };
 
 pub struct Binance;
 
 impl Binance {
-    pub fn read_har_file() -> color_eyre::Result<BTreeMap<u32, OHLC>> {
-        log("binance: read har file");
+    pub fn read_har_file(config: &Config) -> color_eyre::Result<BTreeMap<u32, OHLC>> {
+        info!("binance: read har file");
 
-        fs::create_dir_all(INPUTS_FOLDER_PATH)?;
+        let path = config.path_inputs();
 
-        let path_binance_har = Path::new(INPUTS_FOLDER_PATH).join("binance.har");
+        fs::create_dir_all(&path)?;
+
+        let path_binance_har = path.join("binance.har");
 
         let json: BTreeMap<String, Value> = Json::import(&path_binance_har).unwrap_or_default();
 
@@ -104,7 +107,7 @@ impl Binance {
     }
 
     pub fn fetch_1mn_prices() -> color_eyre::Result<BTreeMap<u32, OHLC>> {
-        log("binance: fetch 1mn");
+        info!("binance: fetch 1mn");
 
         retry(
             |_| {
@@ -151,7 +154,7 @@ impl Binance {
     }
 
     pub fn fetch_daily_prices() -> color_eyre::Result<BTreeMap<Date, OHLC>> {
-        log("binance: fetch 1d");
+        info!("binance: fetch 1d");
 
         retry(
             |_| {
diff --git a/parser/src/price/kibo.rs b/src/parser/price/kibo.rs
similarity index 94%
rename from parser/src/price/kibo.rs
rename to src/parser/price/kibo.rs
index 51a48adc0..031fcf399 100644
--- a/parser/src/price/kibo.rs
+++ b/src/parser/price/kibo.rs
@@ -3,12 +3,12 @@ use std::{collections::BTreeMap, str::FromStr};
 use chrono::NaiveDate;
 use color_eyre::eyre::ContextCompat;
 use itertools::Itertools;
+use log::info;
 use serde_json::Value;
 
 use crate::{
-    structs::{Date, DateMapChunkId, HeightMapChunkId, OHLC},
-    utils::{log, retry},
-    MapChunkId,
+    structs::{Date, DateMapChunkId, HeightMapChunkId, MapChunkId, OHLC},
+    utils::retry,
 };
 
 pub struct Kibo;
@@ -28,7 +28,7 @@ impl Kibo {
     }
 
     pub fn fetch_height_prices(chunk_id: HeightMapChunkId) -> color_eyre::Result<Vec<OHLC>> {
-        log("kibo: fetch height prices");
+        info!("kibo: fetch height prices");
 
         retry(
             |try_index| {
@@ -61,7 +61,7 @@ impl Kibo {
     }
 
     pub fn fetch_date_prices(chunk_id: DateMapChunkId) -> color_eyre::Result<BTreeMap<Date, OHLC>> {
-        log("kibo: fetch date prices");
+        info!("kibo: fetch date prices");
 
         retry(
             |try_index| {
diff --git a/parser/src/price/kraken.rs b/src/parser/price/kraken.rs
similarity index 97%
rename from parser/src/price/kraken.rs
rename to src/parser/price/kraken.rs
index 7567964b1..dc7e403f4 100644
--- a/parser/src/price/kraken.rs
+++ b/src/parser/price/kraken.rs
@@ -1,18 +1,19 @@
 use std::collections::BTreeMap;
 
 use color_eyre::eyre::ContextCompat;
+use log::info;
 use serde_json::Value;
 
 use crate::{
     structs::{Date, Timestamp, OHLC},
-    utils::{log, retry},
+    utils::retry,
 };
 
 pub struct Kraken;
 
 impl Kraken {
     pub fn fetch_1mn_prices() -> color_eyre::Result<BTreeMap<u32, OHLC>> {
-        log("kraken: fetch 1mn");
+        info!("kraken: fetch 1mn");
 
         retry(
             |_| {
@@ -66,7 +67,7 @@ impl Kraken {
     }
 
     pub fn fetch_daily_prices() -> color_eyre::Result<BTreeMap<Date, OHLC>> {
-        log("fetch kraken daily");
+        info!("fetch kraken daily");
 
         retry(
             |_| {
diff --git a/parser/src/price/mod.rs b/src/parser/price/mod.rs
similarity index 100%
rename from parser/src/price/mod.rs
rename to src/parser/price/mod.rs
diff --git a/src/parser/states/_trait.rs b/src/parser/states/_trait.rs
new file mode 100644
index 000000000..b8b400cc3
--- /dev/null
+++ b/src/parser/states/_trait.rs
@@ -0,0 +1,39 @@
+use std::{
+    fmt::Debug,
+    fs, io,
+    path::{Path, PathBuf},
+};
+
+use bincode::{Decode, Encode};
+use serde::{de::DeserializeOwned, Serialize};
+
+use crate::{io::Serialization, structs::Config};
+
+// https://github.com/djkoloski/rust_serialization_benchmark
+pub trait AnyState
+where
+    Self: Debug + Encode + Decode + Serialize + DeserializeOwned,
+{
+    fn name<'a>() -> &'a str;
+
+    fn path(config: &Config) -> PathBuf {
+        config.path_states().join(Self::name())
+    }
+
+    fn reset(&mut self, config: &Config) -> color_eyre::Result<(), io::Error> {
+        self.clear();
+        fs::remove_file(Self::path(config))
+    }
+
+    fn import(config: &Config) -> color_eyre::Result<Self> {
+        let path = Self::path(config);
+        fs::create_dir_all(&path)?;
+        Serialization::Binary.import(&path)
+    }
+
+    fn export(&self, config: &Config) -> color_eyre::Result<()> {
+        Serialization::Binary.export(Path::new(&Self::path(config)), self)
+    }
+
+    fn clear(&mut self);
+}
diff --git a/parser/src/states/cohorts_states/address/cohort_durable_states.rs b/src/parser/states/cohorts_states/address/cohort_durable_states.rs
similarity index 97%
rename from parser/src/states/cohorts_states/address/cohort_durable_states.rs
rename to src/parser/states/cohorts_states/address/cohort_durable_states.rs
index 55c367ce8..8bcbb201b 100644
--- a/parser/src/states/cohorts_states/address/cohort_durable_states.rs
+++ b/src/parser/states/cohorts_states/address/cohort_durable_states.rs
@@ -3,7 +3,7 @@ use std::ops::AddAssign;
 use allocative::Allocative;
 
 use crate::{
-    states::{DurableStates, IsZero, OneShotStates, PriceToValue, UnrealizedState},
+    parser::states::{DurableStates, IsZero, OneShotStates, PriceToValue, UnrealizedState},
     structs::{Amount, Price},
 };
 
diff --git a/parser/src/states/cohorts_states/address/cohort_id.rs b/src/parser/states/cohorts_states/address/cohort_id.rs
similarity index 100%
rename from parser/src/states/cohorts_states/address/cohort_id.rs
rename to src/parser/states/cohorts_states/address/cohort_id.rs
diff --git a/parser/src/states/cohorts_states/address/cohorts_durable_states.rs b/src/parser/states/cohorts_states/address/cohorts_durable_states.rs
similarity index 99%
rename from parser/src/states/cohorts_states/address/cohorts_durable_states.rs
rename to src/parser/states/cohorts_states/address/cohorts_durable_states.rs
index 932143461..0dece4f9d 100644
--- a/parser/src/states/cohorts_states/address/cohorts_durable_states.rs
+++ b/src/parser/states/cohorts_states/address/cohorts_durable_states.rs
@@ -5,7 +5,7 @@ use derive_deref::{Deref, DerefMut};
 use rayon::prelude::*;
 
 use crate::{
-    databases::AddressIndexToAddressData,
+    parser::databases::AddressIndexToAddressData,
     structs::{AddressData, AddressRealizedData, Amount, Price},
 };
 
diff --git a/parser/src/states/cohorts_states/address/cohorts_input_states.rs b/src/parser/states/cohorts_states/address/cohorts_input_states.rs
similarity index 97%
rename from parser/src/states/cohorts_states/address/cohorts_input_states.rs
rename to src/parser/states/cohorts_states/address/cohorts_input_states.rs
index 5f6ef9afa..0da4376c5 100644
--- a/parser/src/states/cohorts_states/address/cohorts_input_states.rs
+++ b/src/parser/states/cohorts_states/address/cohorts_input_states.rs
@@ -1,7 +1,7 @@
 use derive_deref::{Deref, DerefMut};
 
 use crate::{
-    states::InputState,
+    parser::states::InputState,
     structs::{AddressRealizedData, Amount, LiquidityClassification},
 };
 
diff --git a/parser/src/states/cohorts_states/address/cohorts_one_shot_states.rs b/src/parser/states/cohorts_states/address/cohorts_one_shot_states.rs
similarity index 81%
rename from parser/src/states/cohorts_states/address/cohorts_one_shot_states.rs
rename to src/parser/states/cohorts_states/address/cohorts_one_shot_states.rs
index 042e44ea4..bda560fa6 100644
--- a/parser/src/states/cohorts_states/address/cohorts_one_shot_states.rs
+++ b/src/parser/states/cohorts_states/address/cohorts_one_shot_states.rs
@@ -1,6 +1,6 @@
 use derive_deref::{Deref, DerefMut};
 
-use crate::states::OneShotStates;
+use crate::parser::states::OneShotStates;
 
 use super::SplitByAddressCohort;
 
diff --git a/parser/src/states/cohorts_states/address/cohorts_output_states.rs b/src/parser/states/cohorts_states/address/cohorts_output_states.rs
similarity index 97%
rename from parser/src/states/cohorts_states/address/cohorts_output_states.rs
rename to src/parser/states/cohorts_states/address/cohorts_output_states.rs
index d0a682129..155ef98d2 100644
--- a/parser/src/states/cohorts_states/address/cohorts_output_states.rs
+++ b/src/parser/states/cohorts_states/address/cohorts_output_states.rs
@@ -1,7 +1,7 @@
 use derive_deref::{Deref, DerefMut};
 
 use crate::{
-    states::OutputState,
+    parser::states::OutputState,
     structs::{AddressRealizedData, Amount, LiquidityClassification},
 };
 
diff --git a/parser/src/states/cohorts_states/address/cohorts_realized_states.rs b/src/parser/states/cohorts_states/address/cohorts_realized_states.rs
similarity index 98%
rename from parser/src/states/cohorts_states/address/cohorts_realized_states.rs
rename to src/parser/states/cohorts_states/address/cohorts_realized_states.rs
index 524cc31f6..22d2a228b 100644
--- a/parser/src/states/cohorts_states/address/cohorts_realized_states.rs
+++ b/src/parser/states/cohorts_states/address/cohorts_realized_states.rs
@@ -1,7 +1,7 @@
 use derive_deref::{Deref, DerefMut};
 
 use crate::{
-    states::RealizedState,
+    parser::states::RealizedState,
     structs::{AddressRealizedData, LiquidityClassification, Price},
 };
 
diff --git a/parser/src/states/cohorts_states/address/mod.rs b/src/parser/states/cohorts_states/address/mod.rs
similarity index 100%
rename from parser/src/states/cohorts_states/address/mod.rs
rename to src/parser/states/cohorts_states/address/mod.rs
diff --git a/parser/src/states/cohorts_states/address/split_by_address_cohort.rs b/src/parser/states/cohorts_states/address/split_by_address_cohort.rs
similarity index 100%
rename from parser/src/states/cohorts_states/address/split_by_address_cohort.rs
rename to src/parser/states/cohorts_states/address/split_by_address_cohort.rs
diff --git a/parser/src/states/cohorts_states/any/capitalization_state.rs b/src/parser/states/cohorts_states/any/capitalization_state.rs
similarity index 100%
rename from parser/src/states/cohorts_states/any/capitalization_state.rs
rename to src/parser/states/cohorts_states/any/capitalization_state.rs
diff --git a/parser/src/states/cohorts_states/any/durable_states.rs b/src/parser/states/cohorts_states/any/durable_states.rs
similarity index 100%
rename from parser/src/states/cohorts_states/any/durable_states.rs
rename to src/parser/states/cohorts_states/any/durable_states.rs
diff --git a/parser/src/states/cohorts_states/any/input_state.rs b/src/parser/states/cohorts_states/any/input_state.rs
similarity index 100%
rename from parser/src/states/cohorts_states/any/input_state.rs
rename to src/parser/states/cohorts_states/any/input_state.rs
diff --git a/parser/src/states/cohorts_states/any/mod.rs b/src/parser/states/cohorts_states/any/mod.rs
similarity index 100%
rename from parser/src/states/cohorts_states/any/mod.rs
rename to src/parser/states/cohorts_states/any/mod.rs
diff --git a/parser/src/states/cohorts_states/any/one_shot_states.rs b/src/parser/states/cohorts_states/any/one_shot_states.rs
similarity index 100%
rename from parser/src/states/cohorts_states/any/one_shot_states.rs
rename to src/parser/states/cohorts_states/any/one_shot_states.rs
diff --git a/parser/src/states/cohorts_states/any/output_state.rs b/src/parser/states/cohorts_states/any/output_state.rs
similarity index 100%
rename from parser/src/states/cohorts_states/any/output_state.rs
rename to src/parser/states/cohorts_states/any/output_state.rs
diff --git a/parser/src/states/cohorts_states/any/price_paid_state.rs b/src/parser/states/cohorts_states/any/price_paid_state.rs
similarity index 100%
rename from parser/src/states/cohorts_states/any/price_paid_state.rs
rename to src/parser/states/cohorts_states/any/price_paid_state.rs
diff --git a/parser/src/states/cohorts_states/any/price_to_value.rs b/src/parser/states/cohorts_states/any/price_to_value.rs
similarity index 100%
rename from parser/src/states/cohorts_states/any/price_to_value.rs
rename to src/parser/states/cohorts_states/any/price_to_value.rs
diff --git a/parser/src/states/cohorts_states/any/realized_state.rs b/src/parser/states/cohorts_states/any/realized_state.rs
similarity index 100%
rename from parser/src/states/cohorts_states/any/realized_state.rs
rename to src/parser/states/cohorts_states/any/realized_state.rs
diff --git a/parser/src/states/cohorts_states/any/supply_state.rs b/src/parser/states/cohorts_states/any/supply_state.rs
similarity index 100%
rename from parser/src/states/cohorts_states/any/supply_state.rs
rename to src/parser/states/cohorts_states/any/supply_state.rs
diff --git a/parser/src/states/cohorts_states/any/unrealized_state.rs b/src/parser/states/cohorts_states/any/unrealized_state.rs
similarity index 100%
rename from parser/src/states/cohorts_states/any/unrealized_state.rs
rename to src/parser/states/cohorts_states/any/unrealized_state.rs
diff --git a/parser/src/states/cohorts_states/any/utxo_state.rs b/src/parser/states/cohorts_states/any/utxo_state.rs
similarity index 100%
rename from parser/src/states/cohorts_states/any/utxo_state.rs
rename to src/parser/states/cohorts_states/any/utxo_state.rs
diff --git a/parser/src/states/cohorts_states/mod.rs b/src/parser/states/cohorts_states/mod.rs
similarity index 100%
rename from parser/src/states/cohorts_states/mod.rs
rename to src/parser/states/cohorts_states/mod.rs
diff --git a/parser/src/states/cohorts_states/utxo/cohort_durable_states.rs b/src/parser/states/cohorts_states/utxo/cohort_durable_states.rs
similarity index 97%
rename from parser/src/states/cohorts_states/utxo/cohort_durable_states.rs
rename to src/parser/states/cohorts_states/utxo/cohort_durable_states.rs
index af47446e4..13ccce07a 100644
--- a/parser/src/states/cohorts_states/utxo/cohort_durable_states.rs
+++ b/src/parser/states/cohorts_states/utxo/cohort_durable_states.rs
@@ -1,7 +1,7 @@
 use allocative::Allocative;
 
 use crate::{
-    states::{DurableStates, OneShotStates, PriceToValue, UnrealizedState},
+    parser::states::{DurableStates, OneShotStates, PriceToValue, UnrealizedState},
     structs::{Amount, Price},
 };
 
diff --git a/parser/src/states/cohorts_states/utxo/cohort_filter.rs b/src/parser/states/cohorts_states/utxo/cohort_filter.rs
similarity index 100%
rename from parser/src/states/cohorts_states/utxo/cohort_filter.rs
rename to src/parser/states/cohorts_states/utxo/cohort_filter.rs
diff --git a/parser/src/states/cohorts_states/utxo/cohort_filters.rs b/src/parser/states/cohorts_states/utxo/cohort_filters.rs
similarity index 100%
rename from parser/src/states/cohorts_states/utxo/cohort_filters.rs
rename to src/parser/states/cohorts_states/utxo/cohort_filters.rs
diff --git a/parser/src/states/cohorts_states/utxo/cohort_id.rs b/src/parser/states/cohorts_states/utxo/cohort_id.rs
similarity index 100%
rename from parser/src/states/cohorts_states/utxo/cohort_id.rs
rename to src/parser/states/cohorts_states/utxo/cohort_id.rs
diff --git a/parser/src/states/cohorts_states/utxo/cohorts_durable_states.rs b/src/parser/states/cohorts_states/utxo/cohorts_durable_states.rs
similarity index 99%
rename from parser/src/states/cohorts_states/utxo/cohorts_durable_states.rs
rename to src/parser/states/cohorts_states/utxo/cohorts_durable_states.rs
index 16cafddcf..2ba92dbf2 100644
--- a/parser/src/states/cohorts_states/utxo/cohorts_durable_states.rs
+++ b/src/parser/states/cohorts_states/utxo/cohorts_durable_states.rs
@@ -3,7 +3,7 @@ use derive_deref::{Deref, DerefMut};
 use rayon::prelude::*;
 
 use crate::{
-    states::DateDataVec,
+    parser::states::DateDataVec,
     structs::{Amount, BlockData, Price, SentData, Timestamp},
 };
 
diff --git a/parser/src/states/cohorts_states/utxo/cohorts_one_shot_states.rs b/src/parser/states/cohorts_states/utxo/cohorts_one_shot_states.rs
similarity index 81%
rename from parser/src/states/cohorts_states/utxo/cohorts_one_shot_states.rs
rename to src/parser/states/cohorts_states/utxo/cohorts_one_shot_states.rs
index efd4db6a5..328fddf7a 100644
--- a/parser/src/states/cohorts_states/utxo/cohorts_one_shot_states.rs
+++ b/src/parser/states/cohorts_states/utxo/cohorts_one_shot_states.rs
@@ -1,6 +1,6 @@
 use derive_deref::{Deref, DerefMut};
 
-use crate::states::OneShotStates;
+use crate::parser::states::OneShotStates;
 
 use super::SplitByUTXOCohort;
 
diff --git a/parser/src/states/cohorts_states/utxo/cohorts_sent_states.rs b/src/parser/states/cohorts_states/utxo/cohorts_sent_states.rs
similarity index 98%
rename from parser/src/states/cohorts_states/utxo/cohorts_sent_states.rs
rename to src/parser/states/cohorts_states/utxo/cohorts_sent_states.rs
index 9b0da8a05..f09d908f7 100644
--- a/parser/src/states/cohorts_states/utxo/cohorts_sent_states.rs
+++ b/src/parser/states/cohorts_states/utxo/cohorts_sent_states.rs
@@ -3,7 +3,7 @@ use std::{cmp::Ordering, collections::BTreeMap};
 use derive_deref::{Deref, DerefMut};
 
 use crate::{
-    states::{DateDataVec, InputState, RealizedState},
+    parser::states::{DateDataVec, InputState, RealizedState},
     structs::{BlockPath, Price, SentData, Timestamp},
 };
 
diff --git a/parser/src/states/cohorts_states/utxo/mod.rs b/src/parser/states/cohorts_states/utxo/mod.rs
similarity index 100%
rename from parser/src/states/cohorts_states/utxo/mod.rs
rename to src/parser/states/cohorts_states/utxo/mod.rs
diff --git a/parser/src/states/cohorts_states/utxo/split_by_utxo_cohort.rs b/src/parser/states/cohorts_states/utxo/split_by_utxo_cohort.rs
similarity index 100%
rename from parser/src/states/cohorts_states/utxo/split_by_utxo_cohort.rs
rename to src/parser/states/cohorts_states/utxo/split_by_utxo_cohort.rs
diff --git a/parser/src/states/counters.rs b/src/parser/states/counters.rs
similarity index 100%
rename from parser/src/states/counters.rs
rename to src/parser/states/counters.rs
diff --git a/parser/src/states/date_data_vec.rs b/src/parser/states/date_data_vec.rs
similarity index 100%
rename from parser/src/states/date_data_vec.rs
rename to src/parser/states/date_data_vec.rs
diff --git a/parser/src/states/mod.rs b/src/parser/states/mod.rs
similarity index 58%
rename from parser/src/states/mod.rs
rename to src/parser/states/mod.rs
index 878b6d672..f67cec892 100644
--- a/parser/src/states/mod.rs
+++ b/src/parser/states/mod.rs
@@ -11,8 +11,9 @@ use allocative::Allocative;
 pub use cohorts_states::*;
 use counters::*;
 use date_data_vec::*;
+use log::info;
 
-use crate::utils::log;
+use crate::structs::Config;
 
 #[derive(Default, Allocative)]
 pub struct States {
@@ -23,12 +24,10 @@ pub struct States {
 }
 
 impl States {
-    pub fn import() -> color_eyre::Result<Self> {
-        let date_data_vec_handle = thread::spawn(DateDataVec::import);
+    pub fn import(config: &Config) -> color_eyre::Result<Self> {
+        let date_data_vec = DateDataVec::import(config)?;
 
-        let address_counters = Counters::import()?;
-
-        let date_data_vec = date_data_vec_handle.join().unwrap()?;
+        let address_counters = Counters::import(config)?;
 
         Ok(Self {
             address_cohorts_durable_states: None,
@@ -38,24 +37,24 @@ impl States {
         })
     }
 
-    pub fn reset(&mut self, include_addresses: bool) {
-        log("Reseting all states...");
+    pub fn reset(&mut self, config: &Config, include_addresses: bool) {
+        info!("Reseting all states...");
 
-        let _ = self.date_data_vec.reset();
+        let _ = self.date_data_vec.reset(config);
 
         self.utxo_cohorts_durable_states = None;
 
         if include_addresses {
-            let _ = self.address_counters.reset();
+            let _ = self.address_counters.reset(config);
 
             self.address_cohorts_durable_states = None;
         }
     }
 
-    pub fn export(&self) -> color_eyre::Result<()> {
+    pub fn export(&self, config: &Config) -> color_eyre::Result<()> {
         thread::scope(|s| {
-            s.spawn(|| self.address_counters.export().unwrap());
-            s.spawn(|| self.date_data_vec.export().unwrap());
+            s.spawn(|| self.address_counters.export(config).unwrap());
+            s.spawn(|| self.date_data_vec.export(config).unwrap());
         });
 
         Ok(())
diff --git a/server/src/api/handlers/dataset.rs b/src/server/api/handlers/dataset.rs
similarity index 80%
rename from server/src/api/handlers/dataset.rs
rename to src/server/api/handlers/dataset.rs
index b0ab851f8..c1fa63cec 100644
--- a/server/src/api/handlers/dataset.rs
+++ b/src/server/api/handlers/dataset.rs
@@ -9,15 +9,17 @@ use color_eyre::{eyre::eyre, owo_colors::OwoColorize};
 use reqwest::StatusCode;
 use serde::Deserialize;
 
-use parser::{
-    log, Date, DateMap, Height, HeightMap, Json, MapChunkId, COMPRESSED_BIN_EXTENSION,
-    HEIGHT_MAP_CHUNK_SIZE, JSON_EXTENSION, OHLC,
-};
-
 use crate::{
-    api::structs::{Chunk, Kind, Route},
-    header_map::HeaderMapUtils,
-    AppState,
+    io::{Json, COMPRESSED_BIN_EXTENSION, JSON_EXTENSION},
+    server::{
+        api::{
+            structs::{Chunk, Kind, Route},
+            API_URL_PREFIX,
+        },
+        header_map::HeaderMapUtils,
+        log_result, AppState,
+    },
+    structs::{Date, DateMap, Height, HeightMap, MapChunkId, HEIGHT_MAP_CHUNK_SIZE, OHLC},
 };
 
 use super::{
@@ -37,11 +39,32 @@ pub async fn dataset_handler(
     query: Query<Params>,
     State(app_state): State<AppState>,
 ) -> Response {
-    match _dataset_handler(headers, path, query, app_state) {
-        Ok(response) => response,
+    match _dataset_handler(headers, &path, &query, app_state) {
+        Ok(response) => {
+            log_result(
+                response.status(),
+                &format!(
+                    "{API_URL_PREFIX}/{}{}{}",
+                    path.0,
+                    query.chunk.map_or("".to_string(), |chunk| format!(
+                        "{}{chunk}",
+                        "?chunk=".bright_black()
+                    )),
+                    query.all.map_or("".to_string(), |all| format!(
+                        "{}{all}",
+                        "?all=".bright_black()
+                    ))
+                ),
+            );
+
+            response
+        }
         Err(error) => {
-            let mut response =
-                (StatusCode::INTERNAL_SERVER_ERROR, error.to_string()).into_response();
+            let code = StatusCode::INTERNAL_SERVER_ERROR;
+
+            log_result(code, &format!("{API_URL_PREFIX}/{}", path.0));
+
+            let mut response = (code, error.to_string()).into_response();
 
             response.headers_mut().insert_cors();
 
@@ -55,27 +78,14 @@ const HEIGHT_PREFIX: &str = "height-to-";
 
 fn _dataset_handler(
     headers: HeaderMap,
-    Path(path): Path<String>,
-    query: Query<Params>,
+    Path(path): &Path<String>,
+    query: &Query<Params>,
     AppState { routes }: AppState,
 ) -> color_eyre::Result<Response> {
     if query.chunk.is_some() && query.all.is_some() {
         return Err(eyre!("chunk and all are exclusive"));
     }
 
-    log(&format!(
-        "{}{}{}",
-        path,
-        query.chunk.map_or("".to_string(), |chunk| format!(
-            "{}{chunk}",
-            "?chunk=".bright_black()
-        )),
-        query.all.map_or("".to_string(), |all| format!(
-            "{}{all}",
-            "?all=".bright_black()
-        ))
-    ));
-
     let (kind, id, route) = if path.starts_with(DATE_PREFIX) {
         let id = convert_path_to_id(path.strip_prefix(DATE_PREFIX).unwrap());
         let route = routes.date.get(&id);
@@ -85,7 +95,7 @@ fn _dataset_handler(
         let route = routes.height.get(&id);
         (Kind::Height, id, route)
     } else {
-        let id = convert_path_to_id(&path);
+        let id = convert_path_to_id(path);
         let route = routes.last.get(&id);
         (Kind::Last, id, route)
     };
@@ -121,7 +131,7 @@ fn _dataset_handler(
         }
     }
 
-    let (date, response) = headers.check_if_modified_since(&route.file_path).unwrap();
+    let (date, response) = headers.check_if_modified_since(&route.file_path)?;
 
     if let Some(response) = response {
         return Ok(response);
@@ -163,7 +173,7 @@ fn process_datasets<ChunkId>(
     kind: Kind,
     chunk: &mut Option<Chunk>,
     route: &mut Route,
-    query: Query<Params>,
+    query: &Query<Params>,
     datasets: BTreeMap<ChunkId, PathBuf>,
 ) -> color_eyre::Result<()>
 where
diff --git a/server/src/api/handlers/extension.rs b/src/server/api/handlers/extension.rs
similarity index 100%
rename from server/src/api/handlers/extension.rs
rename to src/server/api/handlers/extension.rs
diff --git a/server/src/api/handlers/fallback.rs b/src/server/api/handlers/fallback.rs
similarity index 94%
rename from server/src/api/handlers/fallback.rs
rename to src/server/api/handlers/fallback.rs
index 158261d07..3ce9c7618 100644
--- a/server/src/api/handlers/fallback.rs
+++ b/src/server/api/handlers/fallback.rs
@@ -1,7 +1,7 @@
 use axum::{extract::State, http::HeaderMap, response::Response};
 use reqwest::header::HOST;
 
-use crate::AppState;
+use crate::server::AppState;
 
 use super::response::{generic_to_reponse, update_reponse_headers};
 
diff --git a/server/src/api/handlers/mod.rs b/src/server/api/handlers/mod.rs
similarity index 100%
rename from server/src/api/handlers/mod.rs
rename to src/server/api/handlers/mod.rs
diff --git a/server/src/api/handlers/response.rs b/src/server/api/handlers/response.rs
similarity index 96%
rename from server/src/api/handlers/response.rs
rename to src/server/api/handlers/response.rs
index edac89415..449c73dd1 100644
--- a/server/src/api/handlers/response.rs
+++ b/src/server/api/handlers/response.rs
@@ -2,13 +2,15 @@ use std::fmt::Debug;
 
 use axum::response::{IntoResponse, Json, Response};
 use bincode::Decode;
-use parser::{Date, MapValue, SerializedBTreeMap, SerializedVec};
 use serde::de::DeserializeOwned;
 use serde::Serialize;
 
 use crate::{
-    api::structs::{Chunk, Kind, Route},
-    header_map::HeaderMapUtils,
+    server::{
+        api::structs::{Chunk, Kind, Route},
+        header_map::HeaderMapUtils,
+    },
+    structs::{Date, MapValue, SerializedBTreeMap, SerializedVec},
 };
 
 use super::extension::Extension;
diff --git a/server/src/api/mod.rs b/src/server/api/mod.rs
similarity index 50%
rename from server/src/api/mod.rs
rename to src/server/api/mod.rs
index f1690fc30..5dfdc8871 100644
--- a/server/src/api/mod.rs
+++ b/src/server/api/mod.rs
@@ -1,19 +1,21 @@
 use axum::{routing::get, Router};
 use handlers::{dataset_handler, fallback};
 
-use crate::AppState;
+use super::AppState;
 
 mod handlers;
 pub mod structs;
 
+pub const API_URL_PREFIX: &str = "/api";
+
 pub trait ApiRoutes {
     fn add_api_routes(self) -> Self;
 }
 
 impl ApiRoutes for Router<AppState> {
     fn add_api_routes(self) -> Self {
-        self.route("/api/*path", get(dataset_handler))
-            .route("/api/", get(fallback))
-            .route("/api", get(fallback))
+        self.route(&format!("{API_URL_PREFIX}/*path"), get(dataset_handler))
+            .route(&format!("{API_URL_PREFIX}/"), get(fallback))
+            .route(API_URL_PREFIX, get(fallback))
     }
 }
diff --git a/server/src/api/structs/chunk.rs b/src/server/api/structs/chunk.rs
similarity index 100%
rename from server/src/api/structs/chunk.rs
rename to src/server/api/structs/chunk.rs
diff --git a/server/src/api/structs/kind.rs b/src/server/api/structs/kind.rs
similarity index 100%
rename from server/src/api/structs/kind.rs
rename to src/server/api/structs/kind.rs
diff --git a/server/src/api/structs/mod.rs b/src/server/api/structs/mod.rs
similarity index 100%
rename from server/src/api/structs/mod.rs
rename to src/server/api/structs/mod.rs
diff --git a/server/src/api/structs/paths.rs b/src/server/api/structs/paths.rs
similarity index 88%
rename from server/src/api/structs/paths.rs
rename to src/server/api/structs/paths.rs
index 1461e0138..9e707278f 100644
--- a/server/src/api/structs/paths.rs
+++ b/src/server/api/structs/paths.rs
@@ -3,7 +3,7 @@ use std::collections::BTreeMap;
 use derive_deref::{Deref, DerefMut};
 use serde::Serialize;
 
-use crate::Grouped;
+use crate::server::Grouped;
 
 #[derive(Clone, Default, Deref, DerefMut, Debug, Serialize)]
 pub struct Paths(pub Grouped<BTreeMap<String, String>>);
diff --git a/src/server/api/structs/routes.rs b/src/server/api/structs/routes.rs
new file mode 100644
index 000000000..8a5caf4bc
--- /dev/null
+++ b/src/server/api/structs/routes.rs
@@ -0,0 +1,159 @@
+use std::{
+    collections::{BTreeMap, HashMap},
+    path::PathBuf,
+};
+
+use derive_deref::{Deref, DerefMut};
+use itertools::Itertools;
+
+use crate::{
+    io::Serialization,
+    server::{api::API_URL_PREFIX, Grouped},
+    structs::Config,
+};
+
+use super::Paths;
+
+#[derive(Clone, Debug)]
+pub struct Route {
+    pub url_path: String,
+    pub file_path: PathBuf,
+    pub values_type: String,
+    pub serialization: Serialization,
+}
+
+#[derive(Clone, Default, Deref, DerefMut)]
+pub struct Routes(pub Grouped<HashMap<String, Route>>);
+
+const WEBSITE_TYPES_PATH: &str = "../website/scripts/types";
+
+impl Routes {
+    pub fn build(paths_to_type: BTreeMap<PathBuf, String>, config: &Config) -> Self {
+        let mut routes = Routes::default();
+
+        paths_to_type.into_iter().for_each(|(file_path, value)| {
+            let serialization =
+                Serialization::try_from(&file_path).unwrap_or(Serialization::Binary);
+
+            let file_path_ser = file_path.to_str().unwrap().to_owned();
+            let split_key = file_path_ser.replace(
+                &format!("{}/", config.path_datasets().to_str().unwrap()),
+                "",
+            );
+            let split_key =
+                split_key.replace(&format!("{}/", config.path_price().to_str().unwrap()), "");
+            let mut split_key = split_key.split('/').collect_vec();
+            let last = split_key.pop().unwrap().to_owned();
+            let last = last.split('.').next().unwrap();
+
+            // Use case for: "../datasets/last": "Value",
+            if split_key.is_empty() {
+                split_key.push("last");
+            }
+
+            let map_key = split_key.iter().join("_");
+
+            let url_path = split_key.iter().join("-");
+
+            let values_type = value.to_owned();
+
+            match last {
+                "date" => {
+                    routes.date.insert(
+                        map_key,
+                        Route {
+                            url_path: format!("date-to-{url_path}"),
+                            file_path,
+                            values_type,
+                            serialization,
+                        },
+                    );
+                }
+                "height" => {
+                    routes.height.insert(
+                        map_key,
+                        Route {
+                            url_path: format!("height-to-{url_path}"),
+                            file_path,
+                            values_type,
+                            serialization,
+                        },
+                    );
+                }
+                "last" => {
+                    routes.last.insert(
+                        map_key,
+                        Route {
+                            url_path,
+                            file_path,
+                            values_type,
+                            serialization,
+                        },
+                    );
+                }
+                _ => {
+                    dbg!(&file_path, value, &last, &split_key);
+                    panic!("")
+                }
+            }
+        });
+
+        routes
+    }
+
+    pub fn generate_dts_file(&self) {
+        let map_to_type = |name: &str, map: &HashMap<String, Route>| -> String {
+            let paths = map
+                .values()
+                .map(|route| format!("\"{}\"", route.url_path))
+                .join(" | ");
+
+            format!("export type {}Path = {};\n", name, paths)
+        };
+
+        let date_type = map_to_type("Date", &self.date);
+
+        let height_type = map_to_type("Height", &self.height);
+
+        let last_type = map_to_type("Last", &self.last);
+
+        // fs::write(
+        //     format!("{WEBSITE_TYPES_PATH}/paths.d.ts"),
+        //     format!("// This file is auto generated by the server\n// Manual changes are forbidden\n\n{date_type}\n{height_type}\n{last_type}"),
+        // )
+        // .unwrap();
+    }
+
+    pub fn to_full_paths(&self, host: String) -> Paths {
+        let url = {
+            let scheme = if host.contains("0.0.0.0") || host.contains("localhost") {
+                "http"
+            } else {
+                "https"
+            };
+
+            format!("{scheme}://{host}")
+        };
+
+        let transform = |map: &HashMap<String, Route>| -> BTreeMap<String, String> {
+            map.iter()
+                .map(|(key, route)| {
+                    (
+                        key.to_owned(),
+                        format!("{url}{API_URL_PREFIX}/{}", route.url_path.to_owned()),
+                    )
+                })
+                .collect()
+        };
+
+        let date_paths = transform(&self.date);
+        let height_paths = transform(&self.height);
+        let last_paths = transform(&self.last);
+
+        Paths(Grouped {
+            date: date_paths,
+            height: height_paths,
+            last: last_paths,
+        })
+    }
+}
diff --git a/server/src/header_map.rs b/src/server/header_map.rs
similarity index 98%
rename from server/src/header_map.rs
rename to src/server/header_map.rs
index f1af0527b..145f42796 100644
--- a/server/src/header_map.rs
+++ b/src/server/header_map.rs
@@ -6,7 +6,7 @@ use axum::{
     response::IntoResponse,
 };
 use chrono::{DateTime, Timelike, Utc};
-use parser::log;
+use log::info;
 use reqwest::{
     header::{HOST, IF_MODIFIED_SINCE},
     StatusCode,
@@ -163,7 +163,7 @@ impl HeaderMapUtils for HeaderMap {
             "png" => self.insert_content_type_image_png(),
             "webmanifest" => self.insert_content_type_application_manifest_json(),
             extension => {
-                log(&format!("Extension unsupported: {extension}"));
+                info!("Extension unsupported: {extension}");
                 panic!()
             }
         }
diff --git a/server/src/main.rs b/src/server/mod.rs
similarity index 55%
rename from server/src/main.rs
rename to src/server/mod.rs
index 3aa94b4f6..4d0de972b 100644
--- a/server/src/main.rs
+++ b/src/server/mod.rs
@@ -1,13 +1,17 @@
-use std::sync::Arc;
+use std::{collections::BTreeMap, path::PathBuf, sync::Arc};
 
 use api::{structs::Routes, ApiRoutes};
-use axum::{serve, Router};
-use parser::{log, reset_logs};
+use axum::{routing::get, serve, Router};
+use color_eyre::owo_colors::OwoColorize;
+use log::{error, info};
+use reqwest::StatusCode;
 use serde::Serialize;
 use tokio::net::TcpListener;
 use tower_http::compression::CompressionLayer;
 use website::WebsiteRoutes;
 
+use crate::structs::Config;
+
 mod api;
 mod header_map;
 mod website;
@@ -24,13 +28,11 @@ pub struct AppState {
     routes: Arc<Routes>,
 }
 
-#[tokio::main]
-async fn main() -> color_eyre::Result<()> {
-    color_eyre::install()?;
-
-    reset_logs();
-
-    let routes = Routes::build();
+pub async fn main(
+    paths_to_type: BTreeMap<PathBuf, String>,
+    config: &Config,
+) -> color_eyre::Result<()> {
+    let routes = Routes::build(paths_to_type, config);
 
     routes.generate_dts_file();
 
@@ -47,6 +49,7 @@ async fn main() -> color_eyre::Result<()> {
     let router = Router::new()
         .add_api_routes()
         .add_website_routes()
+        .route("/version", get(env!("CARGO_PKG_VERSION")))
         .with_state(state)
         .layer(compression_layer);
 
@@ -61,10 +64,19 @@ async fn main() -> color_eyre::Result<()> {
         port += 1;
     }
 
-    log(&format!("Starting server on port {port}..."));
+    info!("Starting server on port {port}...");
     let listener = listener.unwrap();
 
     serve(listener, router).await?;
 
     Ok(())
 }
+
+pub fn log_result(code: StatusCode, path: &str) {
+    match code {
+        StatusCode::INTERNAL_SERVER_ERROR => error!("{} {}", code.as_u16().red(), path),
+        StatusCode::NOT_MODIFIED => info!("{} {}", code.as_u16().bright_black(), path),
+        StatusCode::OK => info!("{} {}", code.as_u16().green(), path),
+        _ => error!("{} {}", code.as_u16().red(), path),
+    }
+}
diff --git a/server/src/website/handlers/_minify.rs b/src/server/website/handlers/_minify.rs
similarity index 100%
rename from server/src/website/handlers/_minify.rs
rename to src/server/website/handlers/_minify.rs
diff --git a/server/src/website/handlers/file.rs b/src/server/website/handlers/file.rs
similarity index 53%
rename from server/src/website/handlers/file.rs
rename to src/server/website/handlers/file.rs
index 6f1e4f636..3c6159a53 100644
--- a/server/src/website/handlers/file.rs
+++ b/src/server/website/handlers/file.rs
@@ -9,54 +9,77 @@ use axum::{
     http::HeaderMap,
     response::{IntoResponse, Response},
 };
-use parser::log;
+use log::{error, info};
 use reqwest::StatusCode;
 
-use crate::header_map::HeaderMapUtils;
+use crate::server::{header_map::HeaderMapUtils, log_result};
 
 use super::minify_js;
 
-const WEBSITE_PATH: &str = "../website/";
+const WEBSITE_PATH: &str = "./src/website/";
 
 pub async fn file_handler(headers: HeaderMap, path: extract::Path<String>) -> Response {
-    let mut path = path.0.replace("..", "").replace("\\", "");
-
-    if path.ends_with("Cargo.toml") {
-        path = "../server/Cargo.toml".to_owned();
-    }
-
-    let mut path = str_to_path(&path);
-
-    if !path.exists() {
-        if path.extension().is_some() {
-            let mut response: Response<Body> = (
-                StatusCode::INTERNAL_SERVER_ERROR,
-                "File doesn't exist".to_string(),
-            )
-                .into_response();
-
-            response.headers_mut().insert_cors();
-
-            return response;
-        } else {
-            path = str_to_path("index.html");
-        }
-    }
-
-    path_to_response(headers, &path)
+    any_handler(headers, Some(path))
 }
 
 pub async fn index_handler(headers: HeaderMap) -> Response {
-    path_to_response(headers, &str_to_path("index.html"))
+    any_handler(headers, None)
 }
 
-fn path_to_response(headers: HeaderMap, path: &Path) -> Response {
-    log(&path.to_str().unwrap().replace(WEBSITE_PATH, ""));
+fn any_handler(headers: HeaderMap, path: Option<extract::Path<String>>) -> Response {
+    let response = if let Some(path) = path.as_ref() {
+        let path = path.0.replace("..", "").replace("\\", "");
 
-    let (date, response) = headers.check_if_modified_since(path).unwrap();
+        let mut path = str_to_path(&path);
+
+        if !path.exists() {
+            if path.extension().is_some() {
+                let mut response: Response<Body> = (
+                    StatusCode::INTERNAL_SERVER_ERROR,
+                    "File doesn't exist".to_string(),
+                )
+                    .into_response();
+
+                response.headers_mut().insert_cors();
+
+                return response;
+            } else {
+                path = str_to_path("index.html");
+            }
+        }
+
+        path_to_response(&headers, &path)
+    } else {
+        path_to_response(&headers, &str_to_path("index.html"))
+    };
+
+    log_result(
+        response.status(),
+        &format!("/{}", path.map_or("".to_owned(), |p| p.0)),
+    );
+
+    response
+}
+
+fn path_to_response(headers: &HeaderMap, path: &Path) -> Response {
+    match _path_to_response(headers, path) {
+        Ok(response) => response,
+        Err(error) => {
+            let mut response =
+                (StatusCode::INTERNAL_SERVER_ERROR, error.to_string()).into_response();
+
+            response.headers_mut().insert_cors();
+
+            response
+        }
+    }
+}
+
+fn _path_to_response(headers: &HeaderMap, path: &Path) -> color_eyre::Result<Response> {
+    let (date, response) = headers.check_if_modified_since(path)?;
 
     if let Some(response) = response {
-        return response;
+        return Ok(response);
     }
 
     let mut response;
@@ -74,9 +97,9 @@ fn path_to_response(headers: HeaderMap, path: &Path) -> Response {
         response = Response::new(content.into());
     } else {
         let content = fs::read(path).unwrap_or_else(|error| {
-            log(&error.to_string());
+            error!("{error}");
             let path = path.to_str().unwrap();
-            log(&format!("Can't read file {path}"));
+            info!("Can't read file {path}");
             panic!("")
         });
 
@@ -108,7 +131,7 @@ fn path_to_response(headers: HeaderMap, path: &Path) -> Response {
 
     headers.insert_last_modified(date);
 
-    response
+    Ok(response)
 }
 
 fn str_to_path(path: &str) -> PathBuf {
diff --git a/server/src/website/handlers/minify.rs b/src/server/website/handlers/minify.rs
similarity index 100%
rename from server/src/website/handlers/minify.rs
rename to src/server/website/handlers/minify.rs
diff --git a/server/src/website/handlers/mod.rs b/src/server/website/handlers/mod.rs
similarity index 100%
rename from server/src/website/handlers/mod.rs
rename to src/server/website/handlers/mod.rs
diff --git a/server/src/website/mod.rs b/src/server/website/mod.rs
similarity index 94%
rename from server/src/website/mod.rs
rename to src/server/website/mod.rs
index 77cd1a1c9..fcb31516e 100644
--- a/server/src/website/mod.rs
+++ b/src/server/website/mod.rs
@@ -4,7 +4,7 @@ mod handlers;
 
 use handlers::{file_handler, index_handler};
 
-use crate::AppState;
+use super::AppState;
 
 pub trait WebsiteRoutes {
     fn add_website_routes(self) -> Self;
diff --git a/parser/src/structs/address.rs b/src/structs/address.rs
similarity index 97%
rename from parser/src/structs/address.rs
rename to src/structs/address.rs
index 7fc0255d5..b0e7930a2 100644
--- a/parser/src/structs/address.rs
+++ b/src/structs/address.rs
@@ -1,4 +1,4 @@
-use bitcoin_hashes::{hash160, Hash};
+use bitcoin_hashes::hash160;
 use biter::bitcoin::TxOut;
 
 use super::{AddressType, Counter, U8x19, U8x31};
@@ -56,7 +56,7 @@ impl Address {
 
             let hash = hash160::Hash::hash(pk);
 
-            let (prefix, rest) = Self::split_slice(&hash[..]);
+            let (prefix, rest) = Self::split_slice(&hash.as_byte_array()[..]);
 
             Self::P2PK((prefix, rest.into()))
         } else if script.is_p2pkh() {
diff --git a/parser/src/structs/address_data.rs b/src/structs/address_data.rs
similarity index 100%
rename from parser/src/structs/address_data.rs
rename to src/structs/address_data.rs
diff --git a/parser/src/structs/address_liquidity.rs b/src/structs/address_liquidity.rs
similarity index 100%
rename from parser/src/structs/address_liquidity.rs
rename to src/structs/address_liquidity.rs
diff --git a/parser/src/structs/address_realized_data.rs b/src/structs/address_realized_data.rs
similarity index 100%
rename from parser/src/structs/address_realized_data.rs
rename to src/structs/address_realized_data.rs
diff --git a/parser/src/structs/address_size.rs b/src/structs/address_size.rs
similarity index 100%
rename from parser/src/structs/address_size.rs
rename to src/structs/address_size.rs
diff --git a/parser/src/structs/address_split.rs b/src/structs/address_split.rs
similarity index 100%
rename from parser/src/structs/address_split.rs
rename to src/structs/address_split.rs
diff --git a/parser/src/structs/address_type.rs b/src/structs/address_type.rs
similarity index 100%
rename from parser/src/structs/address_type.rs
rename to src/structs/address_type.rs
diff --git a/parser/src/structs/amount.rs b/src/structs/amount.rs
similarity index 100%
rename from parser/src/structs/amount.rs
rename to src/structs/amount.rs
diff --git a/parser/src/structs/any_map.rs b/src/structs/any_map.rs
similarity index 53%
rename from parser/src/structs/any_map.rs
rename to src/structs/any_map.rs
index 7f816b1c3..455a5bdfc 100644
--- a/parser/src/structs/any_map.rs
+++ b/src/structs/any_map.rs
@@ -2,23 +2,26 @@ use std::path::{Path, PathBuf};
 
 use serde_json::Value;
 
-use super::MapKind;
+use super::{MapKind, MapPath};
 
 pub trait AnyMap {
     fn path(&self) -> &Path;
-    fn path_last(&self) -> &Option<PathBuf>;
+    fn path_last(&self) -> &Option<MapPath>;
 
     fn last_value(&self) -> Option<Value>;
 
     fn t_name(&self) -> &str;
 
-    fn exported_path_with_t_name(&self) -> Vec<(&Path, &str)> {
-        let t_name = self.t_name();
+    fn get_paths_to_type(&self) -> Vec<(PathBuf, String)> {
+        let t_name = self.t_name().to_string();
 
         if let Some(path_last) = self.path_last() {
-            vec![(self.path(), t_name), (path_last, t_name)]
+            vec![
+                (self.path().to_owned(), t_name.clone()),
+                (path_last.unwrap().to_owned(), t_name),
+            ]
         } else {
-            vec![(self.path(), t_name)]
+            vec![(self.path().to_owned(), t_name)]
         }
     }
 
diff --git a/parser/src/structs/array.rs b/src/structs/array.rs
similarity index 100%
rename from parser/src/structs/array.rs
rename to src/structs/array.rs
diff --git a/parser/src/structs/bi_map.rs b/src/structs/bi_map.rs
similarity index 98%
rename from parser/src/structs/bi_map.rs
rename to src/structs/bi_map.rs
index dd271ec14..87030f5b9 100644
--- a/parser/src/structs/bi_map.rs
+++ b/src/structs/bi_map.rs
@@ -8,7 +8,7 @@ use allocative::Allocative;
 use crate::utils::{LossyFrom, TARGET_BLOCKS_PER_DAY};
 
 use super::{
-    AnyDateMap, AnyHeightMap, AnyMap, Date, DateMap, Height, HeightMap, MapKind, MapValue,
+    AnyDateMap, AnyHeightMap, AnyMap, Date, DateMap, Height, HeightMap, MapKind, MapPath, MapValue,
 };
 
 #[derive(Allocative)]
@@ -24,14 +24,14 @@ impl<Value> BiMap<Value>
 where
     Value: MapValue,
 {
-    pub fn new_bin(version: u32, kind: MapKind, path: &str) -> Self {
+    pub fn new_bin(version: u32, kind: MapKind, path: &MapPath) -> Self {
         Self {
             height: HeightMap::_new_bin(version, kind, path, true),
             date: DateMap::_new_bin(version, kind, path, false),
         }
     }
 
-    pub fn new_json(version: u32, kind: MapKind, path: &str) -> Self {
+    pub fn new_json(version: u32, kind: MapKind, path: &MapPath) -> Self {
         Self {
             height: HeightMap::new_json(version, kind, path, true),
             date: DateMap::new_json(version, kind, path, false),
diff --git a/parser/src/structs/block_data.rs b/src/structs/block_data.rs
similarity index 100%
rename from parser/src/structs/block_data.rs
rename to src/structs/block_data.rs
diff --git a/parser/src/structs/block_path.rs b/src/structs/block_path.rs
similarity index 100%
rename from parser/src/structs/block_path.rs
rename to src/structs/block_path.rs
diff --git a/parser/src/structs/config.rs b/src/structs/config.rs
similarity index 51%
rename from parser/src/structs/config.rs
rename to src/structs/config.rs
index db7287c24..9ad22a1c0 100644
--- a/parser/src/structs/config.rs
+++ b/src/structs/config.rs
@@ -6,16 +6,21 @@ use std::{
 use biter::bitcoincore_rpc::Auth;
 use clap::Parser;
 use color_eyre::eyre::eyre;
+use log::info;
 use serde::{Deserialize, Serialize};
 
-use crate::log;
+use super::MapPath;
 
 #[derive(Parser, Debug, Clone, Default, Serialize, Deserialize, PartialEq)]
 #[command(version, about, long_about = None)]
 pub struct Config {
     /// Bitcoin data directory path, saved
     #[arg(long, value_name = "DIR")]
-    pub datadir: Option<String>,
+    bitcoindir: Option<String>,
+
+    /// Kibo data directory path, saved
+    #[arg(long, value_name = "DIR")]
+    kibodir: Option<String>,
 
     /// Bitcoin RPC ip, default: localhost, saved
     #[arg(long, value_name = "IP")]
@@ -25,7 +30,7 @@ pub struct Config {
     #[arg(long, value_name = "PORT")]
     pub rpcport: Option<u16>,
 
-    /// Bitcoin RPC cookie file, saved
+    /// Bitcoin RPC cookie file, default: --bitcoindir/.cookie, saved
     #[arg(long, value_name = "PATH")]
     pub rpccookiefile: Option<String>,
 
@@ -44,7 +49,15 @@ pub struct Config {
     // Maximum ram you want the program to use in GB, default: 50% of total, not saved
     // #[arg(long, value_name = "GB")]
     // pub max_ram: Option<f64>,
-    /// Start a dry run, default: false, not saved
+    /// Enable or disable the parser, default: true, not saved
+    #[arg(long, value_name = "BOOL")]
+    parser: Option<bool>,
+
+    /// Enable or disable the server, default: true, not saved
+    #[arg(long, value_name = "BOOL")]
+    server: Option<bool>,
+
+    /// Start a dry run, default: true, not saved
     #[arg(long, value_name = "BOOL")]
     dry_run: Option<bool>,
 
@@ -55,25 +68,25 @@ pub struct Config {
     /// Recompute all computed datasets, default: false, not saved
     #[arg(long, value_name = "BOOL")]
     recompute_computed: Option<bool>,
-
-    /// Start the program by defragmenting all databases to reduce their footprint, default: false, not saved
-    #[arg(long, value_name = "BOOL")]
-    first_defragment: Option<bool>,
 }
 
 impl Config {
-    const PATH: &'static str = "./config.toml";
-
     pub fn import() -> color_eyre::Result<Self> {
-        let mut config_saved = fs::read_to_string(Self::PATH)
-            .map_or(Config::default(), |contents| {
-                toml::from_str(&contents).unwrap_or_default()
-            });
+        let path = Self::path_dot_kibo();
+        let _ = fs::create_dir_all(&path);
+
+        let path = path.join("config.toml");
+
+        let mut config_saved = Self::read(&path);
 
         let mut config_args = Config::parse();
 
-        if let Some(datadir) = config_args.datadir.take() {
-            config_saved.datadir = Some(datadir);
+        if let Some(bitcoindir) = config_args.bitcoindir.take() {
+            config_saved.bitcoindir = Some(bitcoindir);
+        }
+
+        if let Some(kibodir) = config_args.kibodir.take() {
+            config_saved.kibodir = Some(kibodir);
         }
 
         if let Some(rpcconnect) = config_args.rpcconnect.take() {
@@ -110,31 +123,30 @@ impl Config {
 
         config.check();
 
-        config.write()?;
+        config.write(&path)?;
 
+        config.parser = config_args.parser.take();
+        config.server = config_args.server.take();
         config.dry_run = config_args.dry_run.take();
         config.record_ram_usage = config_args.record_ram_usage.take();
         config.recompute_computed = config_args.recompute_computed.take();
-        config.first_defragment = config_args.first_defragment.take();
 
-        log("---");
-        log("Configuration:");
-        log(&format!("datadir: {:?}", config.datadir));
-        log(&format!("rpcconnect: {:?}", config.rpcconnect));
-        log(&format!("rpcport: {:?}", config.rpcport));
-        log(&format!("rpccookiefile: {:?}", config.rpccookiefile));
-        log(&format!("rpcuser: {:?}", config.rpcuser));
-        log(&format!("rpcpassword: {:?}", config.rpcpassword));
-        log(&format!("delay: {:?}", config.delay));
-        // log(&format!("max_ram: {:?}", config.max_ram));
-        log(&format!("dry_run: {:?}", config.dry_run));
-        log(&format!("record_ram_usage: {:?}", config.record_ram_usage));
-        log(&format!(
-            "recompute_computed: {:?}",
-            config.recompute_computed
-        ));
-        log(&format!("first_defragment: {:?}", config.first_defragment));
-        log("---");
+        info!("Configuration {{");
+        info!("  bitcoindir: {:?}", config.bitcoindir);
+        info!("  kibodir: {:?}", config.kibodir);
+        info!("  rpcconnect: {:?}", config.rpcconnect);
+        info!("  rpcport: {:?}", config.rpcport);
+        info!("  rpccookiefile: {:?}", config.rpccookiefile);
+        info!("  rpcuser: {:?}", config.rpcuser);
+        info!("  rpcpassword: {:?}", config.rpcpassword);
+        info!("  delay: {:?}", config.delay);
+        // info!("  max_ram: {:?}", config.max_ram);
+        info!("  parser: {:?}", config.parser());
+        info!("  server: {:?}", config.server());
+        info!("  dry_run: {:?}", config.dry_run());
+        info!("  record_ram_usage: {:?}", config.record_ram_usage());
+        info!("  recompute_computed: {:?}", config.recompute_computed());
+        info!("}}");
 
         if config_args != Config::default() {
             dbg!(config_args);
@@ -145,14 +157,31 @@ impl Config {
     }
 
     fn check(&self) {
-        if self.datadir.is_none() {
+        if self.bitcoindir.is_none() {
             println!(
-                "You need to set the --datadir parameter at least once to run the parser.\nRun the program with '-h' for help."
+                "You need to set the --bitcoindir parameter at least once to run the parser.\nRun the program with '-h' for help."
+            );
+            std::process::exit(1);
+        } else if !self.path_bitcoindir().is_dir() {
+            println!(
+                "Given --bitcoindir parameter doesn't seem to be a valid directory path.\nRun the program with '-h' for help."
             );
             std::process::exit(1);
         }
 
-        let path = Path::new(self.datadir.as_ref().unwrap());
+        if self.kibodir.is_none() {
+            println!(
+                "You need to set the --kibodir parameter at least once to run the parser.\nRun the program with '-h' for help."
+            );
+            std::process::exit(1);
+        } else if !self.path_kibodir().is_dir() {
+            println!(
+                "Given --kibodir parameter doesn't seem to be a valid directory path.\nRun the program with '-h' for help."
+            );
+            std::process::exit(1);
+        }
+
+        let path = Path::new(self.bitcoindir.as_ref().unwrap());
         if !path.is_dir() {
             println!("Expect path '{:#?}' to be a directory.", path);
             std::process::exit(1);
@@ -166,12 +195,18 @@ impl Config {
         }
     }
 
-    fn write(&self) -> std::io::Result<()> {
-        fs::write(Self::PATH, toml::to_string(self).unwrap())
+    fn read(path: &Path) -> Self {
+        fs::read_to_string(path).map_or(Config::default(), |contents| {
+            toml::from_str(&contents).unwrap_or_default()
+        })
+    }
+
+    fn write(&self, path: &Path) -> std::io::Result<()> {
+        fs::write(path, toml::to_string(self).unwrap())
     }
 
     pub fn to_rpc_auth(&self) -> color_eyre::Result<Auth> {
-        let cookie = Path::new(self.datadir.as_ref().unwrap()).join(".cookie");
+        let cookie = Path::new(self.bitcoindir.as_ref().unwrap()).join(".cookie");
 
         if cookie.is_file() {
             Ok(Auth::CookieFile(cookie))
@@ -205,11 +240,52 @@ impl Config {
         self.recompute_computed.is_some_and(|b| b)
     }
 
-    pub fn first_defragment(&self) -> bool {
-        self.first_defragment.is_some_and(|b| b)
+    pub fn path_bitcoindir(&self) -> PathBuf {
+        PathBuf::from(self.bitcoindir.as_ref().unwrap())
     }
 
-    pub fn disable_defragment(&mut self) {
-        self.first_defragment.take();
+    fn path_kibodir(&self) -> PathBuf {
+        PathBuf::from(self.kibodir.as_ref().unwrap())
+    }
+
+    pub fn path_datasets(&self) -> MapPath {
+        MapPath::from(self.path_kibodir().join("datasets"))
+    }
+
+    pub fn path_datasets_last_values(&self) -> MapPath {
+        self.path_datasets().join("last.json")
+    }
+
+    pub fn path_price(&self) -> MapPath {
+        MapPath::from(self.path_kibodir().join("price"))
+    }
+
+    pub fn path_databases(&self) -> PathBuf {
+        self.path_kibodir().join("databases")
+    }
+
+    pub fn path_states(&self) -> PathBuf {
+        self.path_kibodir().join("states")
+    }
+
+    pub fn path_inputs(&self) -> PathBuf {
+        self.path_kibodir().join("inputs")
+    }
+
+    fn path_dot_kibo() -> PathBuf {
+        let home = std::env::var("HOME").unwrap();
+        Path::new(&home).join(".kibo")
+    }
+
+    pub fn path_log() -> PathBuf {
+        Self::path_dot_kibo().join("log")
+    }
+
+    pub fn parser(&self) -> bool {
+        self.parser.is_none_or(|b| b)
+    }
+
+    pub fn server(&self) -> bool {
+        self.server.is_none_or(|b| b)
     }
 }
diff --git a/parser/src/structs/counter.rs b/src/structs/counter.rs
similarity index 100%
rename from parser/src/structs/counter.rs
rename to src/structs/counter.rs
diff --git a/parser/src/structs/date.rs b/src/structs/date.rs
similarity index 92%
rename from parser/src/structs/date.rs
rename to src/structs/date.rs
index ec36f4c52..c2d51dd51 100644
--- a/parser/src/structs/date.rs
+++ b/src/structs/date.rs
@@ -44,10 +44,6 @@ impl Date {
         Self(chrono::offset::Utc::now().date_naive())
     }
 
-    pub fn yesterday() -> Self {
-        Self(Self::today().checked_sub_days(Days::new(1)).unwrap())
-    }
-
     pub fn difference_in_days_between(&self, older: Self) -> u32 {
         (**self - *older).num_days() as u32
     }
@@ -74,17 +70,13 @@ impl Date {
         }
     }
 
+    pub fn is_january(&self) -> bool {
+        self.month() == 1
+    }
+
     pub fn is_first_of_month(&self) -> bool {
         self.day() == 1
     }
-
-    pub fn is_first_of_january(&self) -> bool {
-        self.is_first_of_month() && self.month() == 1
-    }
-
-    pub fn is_first_of_june(&self) -> bool {
-        self.is_first_of_month() && self.month() == 6
-    }
 }
 
 impl MapKey<DateMapChunkId> for Date {
diff --git a/parser/src/structs/date_data.rs b/src/structs/date_data.rs
similarity index 100%
rename from parser/src/structs/date_data.rs
rename to src/structs/date_data.rs
diff --git a/parser/src/structs/date_map.rs b/src/structs/date_map.rs
similarity index 94%
rename from parser/src/structs/date_map.rs
rename to src/structs/date_map.rs
index 76e3c6bde..37e853efe 100644
--- a/parser/src/structs/date_map.rs
+++ b/src/structs/date_map.rs
@@ -1,8 +1,8 @@
 use std::iter::Sum;
 
-use crate::{Date, HeightMap};
-
-use super::{AnyMap, DateMapChunkId, GenericMap, Height, MapValue, SerializedBTreeMap};
+use super::{
+    AnyMap, Date, DateMapChunkId, GenericMap, Height, HeightMap, MapValue, SerializedBTreeMap,
+};
 
 pub type DateMap<Value> = GenericMap<Date, Value, DateMapChunkId, SerializedBTreeMap<Date, Value>>;
 
diff --git a/parser/src/structs/date_map_chunk_id.rs b/src/structs/date_map_chunk_id.rs
similarity index 95%
rename from parser/src/structs/date_map_chunk_id.rs
rename to src/structs/date_map_chunk_id.rs
index ca3fdac32..dbc8eb4fa 100644
--- a/parser/src/structs/date_map_chunk_id.rs
+++ b/src/structs/date_map_chunk_id.rs
@@ -3,9 +3,7 @@ use std::path::Path;
 use allocative::Allocative;
 use chrono::Datelike;
 
-use crate::Date;
-
-use super::MapChunkId;
+use super::{Date, MapChunkId};
 
 #[derive(Debug, Default, PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Allocative)]
 pub struct DateMapChunkId(i32);
diff --git a/parser/src/structs/empty_address_data.rs b/src/structs/empty_address_data.rs
similarity index 100%
rename from parser/src/structs/empty_address_data.rs
rename to src/structs/empty_address_data.rs
diff --git a/parser/src/structs/epoch.rs b/src/structs/epoch.rs
similarity index 100%
rename from parser/src/structs/epoch.rs
rename to src/structs/epoch.rs
diff --git a/parser/src/structs/exit.rs b/src/structs/exit.rs
similarity index 92%
rename from parser/src/structs/exit.rs
rename to src/structs/exit.rs
index 5122ef361..00408a42e 100644
--- a/parser/src/structs/exit.rs
+++ b/src/structs/exit.rs
@@ -8,7 +8,7 @@ use std::{
     time::Duration,
 };
 
-use super::super::log;
+use log::info;
 
 #[derive(Default, Clone)]
 pub struct Exit {
@@ -29,12 +29,12 @@ impl Exit {
         let blocked = move || _blocked.load(Ordering::SeqCst);
 
         ctrlc::set_handler(move || {
-            log("Exitting...");
+            info!("Exitting...");
 
             active.store(true, Ordering::SeqCst);
 
             if blocked() {
-                log("Waiting to exit safely");
+                info!("Waiting to exit safely");
 
                 while blocked() {
                     sleep(Duration::from_millis(50));
diff --git a/parser/src/structs/generic_map.rs b/src/structs/generic_map.rs
similarity index 95%
rename from parser/src/structs/generic_map.rs
rename to src/structs/generic_map.rs
index a384f6619..8c1e52244 100644
--- a/parser/src/structs/generic_map.rs
+++ b/src/structs/generic_map.rs
@@ -15,12 +15,11 @@ use ordered_float::OrderedFloat;
 use serde::{de::DeserializeOwned, Serialize};
 
 use crate::{
-    log,
+    io::Serialization,
     utils::{get_percentile, LossyFrom},
-    Serialization,
 };
 
-use super::{AnyMap, MapValue};
+use super::{AnyMap, MapPath, MapValue};
 
 #[derive(Debug, Clone, Copy, Allocative, PartialEq, Eq)]
 pub enum MapKind {
@@ -79,8 +78,8 @@ pub struct GenericMap<Key, Value, ChunkId, Serialized> {
     version: u32,
     kind: MapKind,
 
-    path_all: PathBuf,
-    path_last: Option<PathBuf>,
+    path_all: MapPath,
+    path_last: Option<MapPath>,
 
     chunks_in_memory: usize,
 
@@ -100,15 +99,15 @@ where
     Key: MapKey<ChunkId>,
     Serialized: MapSerialized<Key, Value, ChunkId>,
 {
-    pub fn new_bin(version: u32, kind: MapKind, path: &str) -> Self {
+    pub fn new_bin(version: u32, kind: MapKind, path: &MapPath) -> Self {
         Self::new(version, kind, path, Serialization::Binary, 1, true)
     }
 
-    pub fn _new_bin(version: u32, kind: MapKind, path: &str, export_last: bool) -> Self {
+    pub fn _new_bin(version: u32, kind: MapKind, path: &MapPath, export_last: bool) -> Self {
         Self::new(version, kind, path, Serialization::Binary, 1, export_last)
     }
 
-    pub fn new_json(version: u32, kind: MapKind, path: &str, export_last: bool) -> Self {
+    pub fn new_json(version: u32, kind: MapKind, path: &MapPath, export_last: bool) -> Self {
         Self::new(
             version,
             kind,
@@ -122,7 +121,7 @@ where
     fn new(
         version: u32,
         kind: MapKind,
-        path: &str,
+        path: &MapPath,
         serialization: Serialization,
         chunks_in_memory: usize,
         export_last: bool,
@@ -131,15 +130,16 @@ where
             panic!("Should always have at least the latest chunk in memory");
         }
 
-        let path = path.replace(['-', '_', ' '], "/");
+        let path_all = path.join(Key::map_name());
 
-        let path_all = PathBuf::from(format!("{path}/{}", Key::map_name()));
-
-        fs::create_dir_all(&path_all).unwrap();
+        fs::create_dir_all(&*path_all).unwrap_or_else(|_| {
+            dbg!(&path_all);
+            panic!()
+        });
 
         let path_last = {
             if export_last {
-                Some(PathBuf::from(format!("{path}/last")))
+                Some(path.join("last"))
             } else {
                 None
             }
@@ -187,9 +187,9 @@ where
             .initial_last_key
             .and_then(|last_key| last_key.to_first_unsafe());
 
-        if s.initial_first_unsafe_key.is_none() {
-            log(&format!("Missing dataset: {path}/{}", Key::map_name()));
-        }
+        // if s.initial_first_unsafe_key.is_none() {
+        //     log(&format!("Missing dataset: {path:?}/{}", Key::map_name()));
+        // }
 
         s
     }
@@ -312,7 +312,7 @@ where
         &self.path_all
     }
 
-    fn path_last(&self) -> &Option<PathBuf> {
+    fn path_last(&self) -> &Option<MapPath> {
         &self.path_last
     }
 
@@ -367,15 +367,15 @@ where
                     panic!();
                 });
 
-                let path = self.path_all.join(chunk_id.to_name());
+                let path = self.path_all.join(&chunk_id.to_name());
 
-                self.serialization.export(Path::new(&path), serialized)?;
+                self.serialization.export(&path, serialized)?;
 
                 // Export last
                 if index == len - 1 {
                     if let Some(path_last) = self.path_last.as_ref() {
                         self.serialization
-                            .export(Path::new(path_last), serialized.last().unwrap())?;
+                            .export(path_last, serialized.last().unwrap())?;
                     }
                 }
 
@@ -418,22 +418,22 @@ where
     Key: MapKey<ChunkId>,
     Serialized: MapSerialized<Key, Value, ChunkId>,
 {
-    pub fn sum_keys(&mut self, keys: &[Key]) -> Value
-    where
-        Value: Sum,
-    {
-        keys.iter()
-            .map(|key| self.get_or_import(key).unwrap())
-            .sum::<Value>()
-    }
+    // pub fn sum_keys(&mut self, keys: &[Key]) -> Value
+    // where
+    //     Value: Sum,
+    // {
+    //     keys.iter()
+    //         .map(|key| self.get_or_import(key).unwrap())
+    //         .sum::<Value>()
+    // }
 
-    pub fn average_keys(&mut self, keys: &[Key]) -> f32
-    where
-        Value: Sum,
-        f32: LossyFrom<Value>,
-    {
-        f32::lossy_from(self.sum_keys(keys)) / keys.len() as f32
-    }
+    // pub fn average_keys(&mut self, keys: &[Key]) -> f32
+    // where
+    //     Value: Sum,
+    //     f32: LossyFrom<Value>,
+    // {
+    //     f32::lossy_from(self.sum_keys(keys)) / keys.len() as f32
+    // }
 
     pub fn multi_insert<F>(&mut self, keys: &[Key], mut callback: F)
     where
diff --git a/parser/src/structs/height.rs b/src/structs/height.rs
similarity index 91%
rename from parser/src/structs/height.rs
rename to src/structs/height.rs
index b3d811eff..17a228275 100644
--- a/parser/src/structs/height.rs
+++ b/src/structs/height.rs
@@ -9,9 +9,7 @@ use biter::NUMBER_OF_UNSAFE_BLOCKS;
 use derive_deref::{Deref, DerefMut};
 use serde::{Deserialize, Serialize};
 
-use crate::HEIGHT_MAP_CHUNK_SIZE;
-
-use super::{HeightMapChunkId, MapKey};
+use super::{HeightMapChunkId, MapKey, HEIGHT_MAP_CHUNK_SIZE};
 
 #[derive(
     Debug,
@@ -47,11 +45,11 @@ impl Height {
         **self < (block_count - NUMBER_OF_UNSAFE_BLOCKS) as u32
     }
 
-    pub fn iter_range_inclusive(first: Height, last: Height) -> impl Iterator<Item = Height> {
-        let range = (*first)..=(*last);
+    // pub fn iter_range_inclusive(first: Height, last: Height) -> impl Iterator<Item = Height> {
+    //     let range = (*first)..=(*last);
 
-        range.into_iter().map(Height::new)
-    }
+    //     range.into_iter().map(Height::new)
+    // }
 }
 
 impl PartialEq<u64> for Height {
diff --git a/parser/src/structs/height_map.rs b/src/structs/height_map.rs
similarity index 97%
rename from parser/src/structs/height_map.rs
rename to src/structs/height_map.rs
index bd2f36a73..f768f96b0 100644
--- a/parser/src/structs/height_map.rs
+++ b/src/structs/height_map.rs
@@ -2,9 +2,7 @@ use std::{iter::Sum, ops::RangeInclusive};
 
 use itertools::Itertools;
 
-use crate::SerializedVec;
-
-use super::{AnyMap, GenericMap, Height, HeightMapChunkId, MapValue};
+use super::{AnyMap, GenericMap, Height, HeightMapChunkId, MapValue, SerializedVec};
 
 pub const HEIGHT_MAP_CHUNK_SIZE: u32 = 10_000;
 
diff --git a/parser/src/structs/height_map_chunk_id.rs b/src/structs/height_map_chunk_id.rs
similarity index 94%
rename from parser/src/structs/height_map_chunk_id.rs
rename to src/structs/height_map_chunk_id.rs
index 6f662529d..06d3856ce 100644
--- a/parser/src/structs/height_map_chunk_id.rs
+++ b/src/structs/height_map_chunk_id.rs
@@ -3,9 +3,7 @@ use std::path::Path;
 use allocative::Allocative;
 use derive_deref::{Deref, DerefMut};
 
-use crate::HEIGHT_MAP_CHUNK_SIZE;
-
-use super::{Height, MapChunkId};
+use super::{Height, MapChunkId, HEIGHT_MAP_CHUNK_SIZE};
 
 #[derive(
     Debug, Default, PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Allocative, Deref, DerefMut,
diff --git a/parser/src/structs/liquidity.rs b/src/structs/liquidity.rs
similarity index 100%
rename from parser/src/structs/liquidity.rs
rename to src/structs/liquidity.rs
diff --git a/src/structs/map_path.rs b/src/structs/map_path.rs
new file mode 100644
index 000000000..ebf056374
--- /dev/null
+++ b/src/structs/map_path.rs
@@ -0,0 +1,24 @@
+use std::path::PathBuf;
+
+use allocative::Allocative;
+use derive_deref::{Deref, DerefMut};
+
+#[derive(Debug, Clone, Deref, DerefMut, Allocative)]
+pub struct MapPath(PathBuf);
+
+impl MapPath {
+    pub fn join(&self, path: &str) -> Self {
+        let path = path.replace(['-', '_', ' '], "/");
+        Self(self.0.join(path))
+    }
+
+    pub fn unwrap(&self) -> &PathBuf {
+        &self.0
+    }
+}
+
+impl From<PathBuf> for MapPath {
+    fn from(value: PathBuf) -> Self {
+        Self(value)
+    }
+}
diff --git a/parser/src/structs/map_value.rs b/src/structs/map_value.rs
similarity index 100%
rename from parser/src/structs/map_value.rs
rename to src/structs/map_value.rs
diff --git a/parser/src/structs/mod.rs b/src/structs/mod.rs
similarity index 97%
rename from parser/src/structs/mod.rs
rename to src/structs/mod.rs
index 1278f5844..f1974120b 100644
--- a/parser/src/structs/mod.rs
+++ b/src/structs/mod.rs
@@ -25,6 +25,7 @@ mod height;
 mod height_map;
 mod height_map_chunk_id;
 mod liquidity;
+mod map_path;
 mod map_value;
 mod ohlc;
 mod partial_txout_data;
@@ -63,6 +64,7 @@ pub use height::*;
 pub use height_map::*;
 pub use height_map_chunk_id::*;
 pub use liquidity::*;
+pub use map_path::*;
 pub use map_value::*;
 pub use ohlc::*;
 pub use partial_txout_data::*;
diff --git a/parser/src/structs/ohlc.rs b/src/structs/ohlc.rs
similarity index 100%
rename from parser/src/structs/ohlc.rs
rename to src/structs/ohlc.rs
diff --git a/parser/src/structs/partial_txout_data.rs b/src/structs/partial_txout_data.rs
similarity index 100%
rename from parser/src/structs/partial_txout_data.rs
rename to src/structs/partial_txout_data.rs
diff --git a/parser/src/structs/price.rs b/src/structs/price.rs
similarity index 100%
rename from parser/src/structs/price.rs
rename to src/structs/price.rs
diff --git a/parser/src/structs/ram.rs b/src/structs/ram.rs
similarity index 100%
rename from parser/src/structs/ram.rs
rename to src/structs/ram.rs
diff --git a/parser/src/structs/sent_data.rs b/src/structs/sent_data.rs
similarity index 100%
rename from parser/src/structs/sent_data.rs
rename to src/structs/sent_data.rs
diff --git a/parser/src/structs/serialized_btreemap.rs b/src/structs/serialized_btreemap.rs
similarity index 98%
rename from parser/src/structs/serialized_btreemap.rs
rename to src/structs/serialized_btreemap.rs
index 2f1723ff1..97ec47ad5 100644
--- a/parser/src/structs/serialized_btreemap.rs
+++ b/src/structs/serialized_btreemap.rs
@@ -4,7 +4,7 @@ use allocative::Allocative;
 use bincode::{Decode, Encode};
 use serde::{de::DeserializeOwned, Deserialize, Serialize};
 
-use crate::Serialization;
+use crate::io::Serialization;
 
 use super::{DateMap, MapChunkId, MapKey, MapSerialized, MapValue};
 
diff --git a/parser/src/structs/serialized_vec.rs b/src/structs/serialized_vec.rs
similarity index 98%
rename from parser/src/structs/serialized_vec.rs
rename to src/structs/serialized_vec.rs
index 3d61a9738..aa02f51d3 100644
--- a/parser/src/structs/serialized_vec.rs
+++ b/src/structs/serialized_vec.rs
@@ -4,7 +4,7 @@ use allocative::Allocative;
 use bincode::{Decode, Encode};
 use serde::{de::DeserializeOwned, Deserialize, Serialize};
 
-use crate::Serialization;
+use crate::io::Serialization;
 
 use super::{HeightMap, MapChunkId, MapKey, MapSerialized, MapValue};
 
diff --git a/parser/src/structs/timestamp.rs b/src/structs/timestamp.rs
similarity index 91%
rename from parser/src/structs/timestamp.rs
rename to src/structs/timestamp.rs
index 04ce1b1ad..6e8455a23 100644
--- a/parser/src/structs/timestamp.rs
+++ b/src/structs/timestamp.rs
@@ -2,7 +2,7 @@ use std::ops::Sub;
 
 use allocative::Allocative;
 use bincode::{Decode, Encode};
-use chrono::{Datelike, NaiveDateTime, NaiveTime, TimeZone, Timelike, Utc};
+use chrono::{NaiveDateTime, NaiveTime, TimeZone, Timelike, Utc};
 use derive_deref::{Deref, DerefMut};
 use serde::{Deserialize, Serialize};
 
@@ -48,10 +48,6 @@ impl Timestamp {
         )
     }
 
-    pub fn to_year(self) -> u32 {
-        self.to_date().year() as u32
-    }
-
     pub fn to_floored_seconds(self) -> Self {
         let date_time = Utc.timestamp_opt(i64::from(self.0), 0).unwrap();
 
diff --git a/parser/src/structs/tx_data.rs b/src/structs/tx_data.rs
similarity index 100%
rename from parser/src/structs/tx_data.rs
rename to src/structs/tx_data.rs
diff --git a/parser/src/structs/txout_index.rs b/src/structs/txout_index.rs
similarity index 100%
rename from parser/src/structs/txout_index.rs
rename to src/structs/txout_index.rs
diff --git a/parser/src/utils/consts.rs b/src/utils/consts.rs
similarity index 100%
rename from parser/src/utils/consts.rs
rename to src/utils/consts.rs
diff --git a/parser/src/utils/flamegraph.rs b/src/utils/flamegraph.rs
similarity index 84%
rename from parser/src/utils/flamegraph.rs
rename to src/utils/flamegraph.rs
index 2a40ab398..2e96ce6e3 100644
--- a/parser/src/utils/flamegraph.rs
+++ b/src/utils/flamegraph.rs
@@ -2,10 +2,15 @@ use std::{fs, path::PathBuf};
 
 use chrono::Local;
 
-use crate::{databases::Databases, datasets::AllDatasets, states::States, structs::Height};
+use crate::{
+    parser::{Databases, Datasets, States},
+    structs::Height,
+};
+
+// use crate::{databases::Databases, datasets::AllDatasets, states::States, structs::Height};
 
 pub fn generate_allocation_files(
-    datasets: &AllDatasets,
+    datasets: &Datasets,
     databases: &Databases,
     states: &States,
     last_height: Height,
diff --git a/src/utils/log.rs b/src/utils/log.rs
new file mode 100644
index 000000000..4679d3339
--- /dev/null
+++ b/src/utils/log.rs
@@ -0,0 +1,82 @@
+use std::{
+    fmt::Display,
+    fs::{self, OpenOptions},
+    io::Write,
+};
+
+use chrono::Local;
+use color_eyre::owo_colors::OwoColorize;
+use env_logger::Env;
+
+use crate::structs::Config;
+
+#[inline(always)]
+pub fn init_log() {
+    let _ = fs::remove_file(Config::path_log());
+
+    let file = Box::new(
+        OpenOptions::new()
+            .create(true)
+            .append(true)
+            .open(Config::path_log())
+            .unwrap(),
+    );
+
+    env_logger::Builder::from_env(
+        Env::default().default_filter_or(format!("{}=info", env!("CARGO_PKG_NAME"))),
+    )
+    .format(move |buf, record| {
+        let date_time = format!("{}", Local::now().format("%Y-%m-%d %H:%M:%S"));
+        let level = record.level().as_str().to_lowercase();
+        let level = format!("{:5}", level);
+        let target = record.target();
+        let dash = "-";
+        let args = record.args();
+
+        let _ = write(
+            file.try_clone().unwrap(),
+            &date_time,
+            target,
+            &level,
+            dash,
+            args,
+        );
+
+        let colored_date_time = date_time.bright_black();
+        let colored_level = match level.chars().next().unwrap() {
+            'e' => level.red().to_string(),
+            'w' => level.yellow().to_string(),
+            'i' => level.green().to_string(),
+            'd' => level.blue().to_string(),
+            't' => level.cyan().to_string(),
+            _ => panic!(),
+        };
+        let colored_dash = dash.bright_black();
+
+        write(
+            buf,
+            colored_date_time,
+            target,
+            colored_level,
+            colored_dash,
+            args,
+        )
+    })
+    .init();
+}
+
+fn write(
+    mut buf: impl Write,
+    date_time: impl Display,
+    _target: impl Display,
+    level: impl Display,
+    dash: impl Display,
+    args: impl Display,
+) -> Result<(), std::io::Error> {
+    writeln!(buf, "{} {} {} {}", date_time, dash, level, args)
+    // writeln!(
+    //     buf,
+    //     "{} {} {} {}  {}",
+    //     date_time, _target, level, dash, args
+    // )
+}
diff --git a/parser/src/utils/lossy.rs b/src/utils/lossy.rs
similarity index 100%
rename from parser/src/utils/lossy.rs
rename to src/utils/lossy.rs
diff --git a/parser/src/utils/mod.rs b/src/utils/mod.rs
similarity index 93%
rename from parser/src/utils/mod.rs
rename to src/utils/mod.rs
index 18c6f8d80..0ed6755e9 100644
--- a/parser/src/utils/mod.rs
+++ b/src/utils/mod.rs
@@ -13,5 +13,4 @@ pub use log::*;
 pub use lossy::*;
 pub use percentile::*;
 pub use retry::*;
-pub use rpc::*;
 pub use time::*;
diff --git a/parser/src/utils/percentile.rs b/src/utils/percentile.rs
similarity index 100%
rename from parser/src/utils/percentile.rs
rename to src/utils/percentile.rs
diff --git a/parser/src/utils/retry.rs b/src/utils/retry.rs
similarity index 100%
rename from parser/src/utils/retry.rs
rename to src/utils/retry.rs
diff --git a/parser/src/utils/rpc.rs b/src/utils/rpc.rs
similarity index 61%
rename from parser/src/utils/rpc.rs
rename to src/utils/rpc.rs
index 4e65bd8aa..a25275d27 100644
--- a/parser/src/utils/rpc.rs
+++ b/src/utils/rpc.rs
@@ -1,8 +1,14 @@
 use biter::bitcoincore_rpc::Client;
 
-use crate::Config;
+use crate::structs::Config;
 
-pub fn create_rpc(config: &Config) -> color_eyre::Result<Client> {
+impl From<&Config> for Client {
+    fn from(config: &Config) -> Self {
+        create_rpc(config).unwrap()
+    }
+}
+
+fn create_rpc(config: &Config) -> color_eyre::Result<Client> {
     Ok(Client::new(
         &format!(
             "http://{}:{}",
diff --git a/parser/src/utils/time.rs b/src/utils/time.rs
similarity index 66%
rename from parser/src/utils/time.rs
rename to src/utils/time.rs
index ec5c090f1..f0001216d 100644
--- a/parser/src/utils/time.rs
+++ b/src/utils/time.rs
@@ -1,6 +1,6 @@
 use std::time::Instant;
 
-use crate::utils::log;
+use log::info;
 
 pub fn time<F, T>(name: &str, function: F) -> T
 where
@@ -10,7 +10,7 @@ where
 
     let returned = function();
 
-    log(&format!("{name}: {} seconds", time.elapsed().as_secs_f32()));
+    info!("{name}: {} seconds", time.elapsed().as_secs_f32());
 
     returned
 }
diff --git a/website/assets/fonts/satoshi/2024-09/font.var.woff2 b/src/website/assets/fonts/satoshi/2024-09/font.var.woff2
similarity index 100%
rename from website/assets/fonts/satoshi/2024-09/font.var.woff2
rename to src/website/assets/fonts/satoshi/2024-09/font.var.woff2
diff --git a/website/assets/fonts/satoshi/FFL.txt b/src/website/assets/fonts/satoshi/FFL.txt
similarity index 100%
rename from website/assets/fonts/satoshi/FFL.txt
rename to src/website/assets/fonts/satoshi/FFL.txt
diff --git a/website/assets/pdfs/block/2022-report.pdf b/src/website/assets/pdfs/block/2022-report.pdf
similarity index 100%
rename from website/assets/pdfs/block/2022-report.pdf
rename to src/website/assets/pdfs/block/2022-report.pdf
diff --git a/website/assets/pdfs/braiins/building-bitcoin-in-rust.pdf b/src/website/assets/pdfs/braiins/building-bitcoin-in-rust.pdf
similarity index 100%
rename from website/assets/pdfs/braiins/building-bitcoin-in-rust.pdf
rename to src/website/assets/pdfs/braiins/building-bitcoin-in-rust.pdf
diff --git a/website/assets/pdfs/glassnode/cointime-economics.pdf b/src/website/assets/pdfs/glassnode/cointime-economics.pdf
similarity index 100%
rename from website/assets/pdfs/glassnode/cointime-economics.pdf
rename to src/website/assets/pdfs/glassnode/cointime-economics.pdf
diff --git a/website/assets/pdfs/multi-author/bcap_v1.0.pdf b/src/website/assets/pdfs/multi-author/bcap_v1.0.pdf
similarity index 100%
rename from website/assets/pdfs/multi-author/bcap_v1.0.pdf
rename to src/website/assets/pdfs/multi-author/bcap_v1.0.pdf
diff --git a/website/assets/pdfs/nakamoto-project/understanding-bitcoin-adoption-in-the-united-states.pdf b/src/website/assets/pdfs/nakamoto-project/understanding-bitcoin-adoption-in-the-united-states.pdf
similarity index 100%
rename from website/assets/pdfs/nakamoto-project/understanding-bitcoin-adoption-in-the-united-states.pdf
rename to src/website/assets/pdfs/nakamoto-project/understanding-bitcoin-adoption-in-the-united-states.pdf
diff --git a/website/assets/pdfs/nydig/protection-under-first-amendment.pdf b/src/website/assets/pdfs/nydig/protection-under-first-amendment.pdf
similarity index 100%
rename from website/assets/pdfs/nydig/protection-under-first-amendment.pdf
rename to src/website/assets/pdfs/nydig/protection-under-first-amendment.pdf
diff --git a/website/assets/pdfs/satoshi-nakamoto/whitepaper.pdf b/src/website/assets/pdfs/satoshi-nakamoto/whitepaper.pdf
similarity index 100%
rename from website/assets/pdfs/satoshi-nakamoto/whitepaper.pdf
rename to src/website/assets/pdfs/satoshi-nakamoto/whitepaper.pdf
diff --git a/website/assets/pdfs/square/2021-bitcoin-clean-energy-initiative.pdf b/src/website/assets/pdfs/square/2021-bitcoin-clean-energy-initiative.pdf
similarity index 100%
rename from website/assets/pdfs/square/2021-bitcoin-clean-energy-initiative.pdf
rename to src/website/assets/pdfs/square/2021-bitcoin-clean-energy-initiative.pdf
diff --git a/website/assets/pwa/2024-11-20_09-41-25/apple-icon-180.png b/src/website/assets/pwa/2024-11-20_09-41-25/apple-icon-180.png
similarity index 100%
rename from website/assets/pwa/2024-11-20_09-41-25/apple-icon-180.png
rename to src/website/assets/pwa/2024-11-20_09-41-25/apple-icon-180.png
diff --git a/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1125-2436.jpg b/src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1125-2436.jpg
similarity index 100%
rename from website/assets/pwa/2024-11-20_09-41-25/apple-splash-1125-2436.jpg
rename to src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1125-2436.jpg
diff --git a/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1136-640.jpg b/src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1136-640.jpg
similarity index 100%
rename from website/assets/pwa/2024-11-20_09-41-25/apple-splash-1136-640.jpg
rename to src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1136-640.jpg
diff --git a/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1170-2532.jpg b/src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1170-2532.jpg
similarity index 100%
rename from website/assets/pwa/2024-11-20_09-41-25/apple-splash-1170-2532.jpg
rename to src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1170-2532.jpg
diff --git a/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1179-2556.jpg b/src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1179-2556.jpg
similarity index 100%
rename from website/assets/pwa/2024-11-20_09-41-25/apple-splash-1179-2556.jpg
rename to src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1179-2556.jpg
diff --git a/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1242-2208.jpg b/src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1242-2208.jpg
similarity index 100%
rename from website/assets/pwa/2024-11-20_09-41-25/apple-splash-1242-2208.jpg
rename to src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1242-2208.jpg
diff --git a/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1242-2688.jpg b/src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1242-2688.jpg
similarity index 100%
rename from website/assets/pwa/2024-11-20_09-41-25/apple-splash-1242-2688.jpg
rename to src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1242-2688.jpg
diff --git a/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1284-2778.jpg b/src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1284-2778.jpg
similarity index 100%
rename from website/assets/pwa/2024-11-20_09-41-25/apple-splash-1284-2778.jpg
rename to src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1284-2778.jpg
diff --git a/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1290-2796.jpg b/src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1290-2796.jpg
similarity index 100%
rename from website/assets/pwa/2024-11-20_09-41-25/apple-splash-1290-2796.jpg
rename to src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1290-2796.jpg
diff --git a/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1334-750.jpg b/src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1334-750.jpg
similarity index 100%
rename from website/assets/pwa/2024-11-20_09-41-25/apple-splash-1334-750.jpg
rename to src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1334-750.jpg
diff --git a/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1488-2266.jpg b/src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1488-2266.jpg
similarity index 100%
rename from website/assets/pwa/2024-11-20_09-41-25/apple-splash-1488-2266.jpg
rename to src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1488-2266.jpg
diff --git a/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1536-2048.jpg b/src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1536-2048.jpg
similarity index 100%
rename from website/assets/pwa/2024-11-20_09-41-25/apple-splash-1536-2048.jpg
rename to src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1536-2048.jpg
diff --git a/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1620-2160.jpg b/src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1620-2160.jpg
similarity index 100%
rename from website/assets/pwa/2024-11-20_09-41-25/apple-splash-1620-2160.jpg
rename to src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1620-2160.jpg
diff --git a/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1640-2360.jpg b/src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1640-2360.jpg
similarity index 100%
rename from website/assets/pwa/2024-11-20_09-41-25/apple-splash-1640-2360.jpg
rename to src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1640-2360.jpg
diff --git a/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1668-2224.jpg b/src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1668-2224.jpg
similarity index 100%
rename from website/assets/pwa/2024-11-20_09-41-25/apple-splash-1668-2224.jpg
rename to src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1668-2224.jpg
diff --git a/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1668-2388.jpg b/src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1668-2388.jpg
similarity index 100%
rename from website/assets/pwa/2024-11-20_09-41-25/apple-splash-1668-2388.jpg
rename to src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1668-2388.jpg
diff --git a/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1792-828.jpg b/src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1792-828.jpg
similarity index 100%
rename from website/assets/pwa/2024-11-20_09-41-25/apple-splash-1792-828.jpg
rename to src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1792-828.jpg
diff --git a/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2048-1536.jpg b/src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2048-1536.jpg
similarity index 100%
rename from website/assets/pwa/2024-11-20_09-41-25/apple-splash-2048-1536.jpg
rename to src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2048-1536.jpg
diff --git a/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2048-2732.jpg b/src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2048-2732.jpg
similarity index 100%
rename from website/assets/pwa/2024-11-20_09-41-25/apple-splash-2048-2732.jpg
rename to src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2048-2732.jpg
diff --git a/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2160-1620.jpg b/src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2160-1620.jpg
similarity index 100%
rename from website/assets/pwa/2024-11-20_09-41-25/apple-splash-2160-1620.jpg
rename to src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2160-1620.jpg
diff --git a/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2208-1242.jpg b/src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2208-1242.jpg
similarity index 100%
rename from website/assets/pwa/2024-11-20_09-41-25/apple-splash-2208-1242.jpg
rename to src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2208-1242.jpg
diff --git a/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2224-1668.jpg b/src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2224-1668.jpg
similarity index 100%
rename from website/assets/pwa/2024-11-20_09-41-25/apple-splash-2224-1668.jpg
rename to src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2224-1668.jpg
diff --git a/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2266-1488.jpg b/src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2266-1488.jpg
similarity index 100%
rename from website/assets/pwa/2024-11-20_09-41-25/apple-splash-2266-1488.jpg
rename to src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2266-1488.jpg
diff --git a/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2360-1640.jpg b/src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2360-1640.jpg
similarity index 100%
rename from website/assets/pwa/2024-11-20_09-41-25/apple-splash-2360-1640.jpg
rename to src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2360-1640.jpg
diff --git a/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2388-1668.jpg b/src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2388-1668.jpg
similarity index 100%
rename from website/assets/pwa/2024-11-20_09-41-25/apple-splash-2388-1668.jpg
rename to src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2388-1668.jpg
diff --git a/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2436-1125.jpg b/src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2436-1125.jpg
similarity index 100%
rename from website/assets/pwa/2024-11-20_09-41-25/apple-splash-2436-1125.jpg
rename to src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2436-1125.jpg
diff --git a/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2532-1170.jpg b/src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2532-1170.jpg
similarity index 100%
rename from website/assets/pwa/2024-11-20_09-41-25/apple-splash-2532-1170.jpg
rename to src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2532-1170.jpg
diff --git a/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2556-1179.jpg b/src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2556-1179.jpg
similarity index 100%
rename from website/assets/pwa/2024-11-20_09-41-25/apple-splash-2556-1179.jpg
rename to src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2556-1179.jpg
diff --git a/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2688-1242.jpg b/src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2688-1242.jpg
similarity index 100%
rename from website/assets/pwa/2024-11-20_09-41-25/apple-splash-2688-1242.jpg
rename to src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2688-1242.jpg
diff --git a/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2732-2048.jpg b/src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2732-2048.jpg
similarity index 100%
rename from website/assets/pwa/2024-11-20_09-41-25/apple-splash-2732-2048.jpg
rename to src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2732-2048.jpg
diff --git a/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2778-1284.jpg b/src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2778-1284.jpg
similarity index 100%
rename from website/assets/pwa/2024-11-20_09-41-25/apple-splash-2778-1284.jpg
rename to src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2778-1284.jpg
diff --git a/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2796-1290.jpg b/src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2796-1290.jpg
similarity index 100%
rename from website/assets/pwa/2024-11-20_09-41-25/apple-splash-2796-1290.jpg
rename to src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2796-1290.jpg
diff --git a/website/assets/pwa/2024-11-20_09-41-25/apple-splash-640-1136.jpg b/src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-640-1136.jpg
similarity index 100%
rename from website/assets/pwa/2024-11-20_09-41-25/apple-splash-640-1136.jpg
rename to src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-640-1136.jpg
diff --git a/website/assets/pwa/2024-11-20_09-41-25/apple-splash-750-1334.jpg b/src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-750-1334.jpg
similarity index 100%
rename from website/assets/pwa/2024-11-20_09-41-25/apple-splash-750-1334.jpg
rename to src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-750-1334.jpg
diff --git a/website/assets/pwa/2024-11-20_09-41-25/apple-splash-828-1792.jpg b/src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-828-1792.jpg
similarity index 100%
rename from website/assets/pwa/2024-11-20_09-41-25/apple-splash-828-1792.jpg
rename to src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-828-1792.jpg
diff --git a/website/assets/pwa/2024-11-20_09-41-25/favicon-196.png b/src/website/assets/pwa/2024-11-20_09-41-25/favicon-196.png
similarity index 100%
rename from website/assets/pwa/2024-11-20_09-41-25/favicon-196.png
rename to src/website/assets/pwa/2024-11-20_09-41-25/favicon-196.png
diff --git a/website/assets/pwa/2024-11-20_09-41-25/index.html b/src/website/assets/pwa/2024-11-20_09-41-25/index.html
similarity index 100%
rename from website/assets/pwa/2024-11-20_09-41-25/index.html
rename to src/website/assets/pwa/2024-11-20_09-41-25/index.html
diff --git a/website/assets/pwa/2024-11-20_09-41-25/manifest-icon-192.maskable.png b/src/website/assets/pwa/2024-11-20_09-41-25/manifest-icon-192.maskable.png
similarity index 100%
rename from website/assets/pwa/2024-11-20_09-41-25/manifest-icon-192.maskable.png
rename to src/website/assets/pwa/2024-11-20_09-41-25/manifest-icon-192.maskable.png
diff --git a/website/assets/pwa/2024-11-20_09-41-25/manifest-icon-512.maskable.png b/src/website/assets/pwa/2024-11-20_09-41-25/manifest-icon-512.maskable.png
similarity index 100%
rename from website/assets/pwa/2024-11-20_09-41-25/manifest-icon-512.maskable.png
rename to src/website/assets/pwa/2024-11-20_09-41-25/manifest-icon-512.maskable.png
diff --git a/website/assets/pwa/index.html b/src/website/assets/pwa/index.html
similarity index 100%
rename from website/assets/pwa/index.html
rename to src/website/assets/pwa/index.html
diff --git a/website/generate-icons.sh b/src/website/generate-icons.sh
similarity index 100%
rename from website/generate-icons.sh
rename to src/website/generate-icons.sh
diff --git a/website/index.html b/src/website/index.html
similarity index 99%
rename from website/index.html
rename to src/website/index.html
index b649580b9..93166e466 100644
--- a/website/index.html
+++ b/src/website/index.html
@@ -513,6 +513,7 @@
       input {
         border: 0;
         width: 100%;
+        text-align: left;
 
         &:focus-visible {
           outline: none;
@@ -834,32 +835,6 @@
         }
       }
 
-      aside {
-        > header {
-          button {
-            margin: -0.5rem 0;
-
-            &:first-child {
-              margin-left: -0.65rem;
-            }
-
-            &:last-child {
-              margin-right: -0.65rem;
-            }
-
-            &[data-highlight] {
-              * {
-                color: var(--orange) !important;
-              }
-            }
-
-            > svg {
-              margin: 0.5rem;
-            }
-          }
-        }
-      }
-
       #share-div {
         padding: 1.5rem;
         backdrop-filter: blur(12px);
diff --git a/website/jsconfig.json b/src/website/jsconfig.json
similarity index 100%
rename from website/jsconfig.json
rename to src/website/jsconfig.json
diff --git a/website/manifest.webmanifest b/src/website/manifest.webmanifest
similarity index 100%
rename from website/manifest.webmanifest
rename to src/website/manifest.webmanifest
diff --git a/website/misc/tailwindTo550.js b/src/website/misc/tailwindTo550.js
similarity index 100%
rename from website/misc/tailwindTo550.js
rename to src/website/misc/tailwindTo550.js
diff --git a/website/packages/lean-qr/README.md b/src/website/packages/lean-qr/README.md
similarity index 100%
rename from website/packages/lean-qr/README.md
rename to src/website/packages/lean-qr/README.md
diff --git a/website/packages/lean-qr/v2.3.4/script.js b/src/website/packages/lean-qr/v2.3.4/script.js
similarity index 100%
rename from website/packages/lean-qr/v2.3.4/script.js
rename to src/website/packages/lean-qr/v2.3.4/script.js
diff --git a/website/packages/lean-qr/v2.3.4/types.d.ts b/src/website/packages/lean-qr/v2.3.4/types.d.ts
similarity index 100%
rename from website/packages/lean-qr/v2.3.4/types.d.ts
rename to src/website/packages/lean-qr/v2.3.4/types.d.ts
diff --git a/website/packages/lightweight-charts/NOTICE.md b/src/website/packages/lightweight-charts/NOTICE.md
similarity index 100%
rename from website/packages/lightweight-charts/NOTICE.md
rename to src/website/packages/lightweight-charts/NOTICE.md
diff --git a/website/packages/lightweight-charts/README.md b/src/website/packages/lightweight-charts/README.md
similarity index 100%
rename from website/packages/lightweight-charts/README.md
rename to src/website/packages/lightweight-charts/README.md
diff --git a/website/packages/lightweight-charts/types.d.ts b/src/website/packages/lightweight-charts/types.d.ts
similarity index 100%
rename from website/packages/lightweight-charts/types.d.ts
rename to src/website/packages/lightweight-charts/types.d.ts
diff --git a/website/packages/lightweight-charts/v4.2.0/script.js b/src/website/packages/lightweight-charts/v4.2.0/script.js
similarity index 100%
rename from website/packages/lightweight-charts/v4.2.0/script.js
rename to src/website/packages/lightweight-charts/v4.2.0/script.js
diff --git a/website/packages/lightweight-charts/v4.2.0/types.d.ts b/src/website/packages/lightweight-charts/v4.2.0/types.d.ts
similarity index 100%
rename from website/packages/lightweight-charts/v4.2.0/types.d.ts
rename to src/website/packages/lightweight-charts/v4.2.0/types.d.ts
diff --git a/website/packages/lightweight-charts/wrapper.js b/src/website/packages/lightweight-charts/wrapper.js
similarity index 100%
rename from website/packages/lightweight-charts/wrapper.js
rename to src/website/packages/lightweight-charts/wrapper.js
diff --git a/website/packages/solid-signals/2024-11-02/script.js b/src/website/packages/solid-signals/2024-11-02/script.js
similarity index 100%
rename from website/packages/solid-signals/2024-11-02/script.js
rename to src/website/packages/solid-signals/2024-11-02/script.js
diff --git a/website/packages/solid-signals/2024-11-02/types/core/constants.d.ts b/src/website/packages/solid-signals/2024-11-02/types/core/constants.d.ts
similarity index 100%
rename from website/packages/solid-signals/2024-11-02/types/core/constants.d.ts
rename to src/website/packages/solid-signals/2024-11-02/types/core/constants.d.ts
diff --git a/website/packages/solid-signals/2024-11-02/types/core/core.d.ts b/src/website/packages/solid-signals/2024-11-02/types/core/core.d.ts
similarity index 100%
rename from website/packages/solid-signals/2024-11-02/types/core/core.d.ts
rename to src/website/packages/solid-signals/2024-11-02/types/core/core.d.ts
diff --git a/website/packages/solid-signals/2024-11-02/types/core/effect.d.ts b/src/website/packages/solid-signals/2024-11-02/types/core/effect.d.ts
similarity index 100%
rename from website/packages/solid-signals/2024-11-02/types/core/effect.d.ts
rename to src/website/packages/solid-signals/2024-11-02/types/core/effect.d.ts
diff --git a/website/packages/solid-signals/2024-11-02/types/core/error.d.ts b/src/website/packages/solid-signals/2024-11-02/types/core/error.d.ts
similarity index 100%
rename from website/packages/solid-signals/2024-11-02/types/core/error.d.ts
rename to src/website/packages/solid-signals/2024-11-02/types/core/error.d.ts
diff --git a/website/packages/solid-signals/2024-11-02/types/core/flags.d.ts b/src/website/packages/solid-signals/2024-11-02/types/core/flags.d.ts
similarity index 100%
rename from website/packages/solid-signals/2024-11-02/types/core/flags.d.ts
rename to src/website/packages/solid-signals/2024-11-02/types/core/flags.d.ts
diff --git a/website/packages/solid-signals/2024-11-02/types/core/index.d.ts b/src/website/packages/solid-signals/2024-11-02/types/core/index.d.ts
similarity index 100%
rename from website/packages/solid-signals/2024-11-02/types/core/index.d.ts
rename to src/website/packages/solid-signals/2024-11-02/types/core/index.d.ts
diff --git a/website/packages/solid-signals/2024-11-02/types/core/owner.d.ts b/src/website/packages/solid-signals/2024-11-02/types/core/owner.d.ts
similarity index 100%
rename from website/packages/solid-signals/2024-11-02/types/core/owner.d.ts
rename to src/website/packages/solid-signals/2024-11-02/types/core/owner.d.ts
diff --git a/website/packages/solid-signals/2024-11-02/types/core/scheduler.d.ts b/src/website/packages/solid-signals/2024-11-02/types/core/scheduler.d.ts
similarity index 100%
rename from website/packages/solid-signals/2024-11-02/types/core/scheduler.d.ts
rename to src/website/packages/solid-signals/2024-11-02/types/core/scheduler.d.ts
diff --git a/website/packages/solid-signals/2024-11-02/types/index.d.ts b/src/website/packages/solid-signals/2024-11-02/types/index.d.ts
similarity index 100%
rename from website/packages/solid-signals/2024-11-02/types/index.d.ts
rename to src/website/packages/solid-signals/2024-11-02/types/index.d.ts
diff --git a/website/packages/solid-signals/2024-11-02/types/map.d.ts b/src/website/packages/solid-signals/2024-11-02/types/map.d.ts
similarity index 100%
rename from website/packages/solid-signals/2024-11-02/types/map.d.ts
rename to src/website/packages/solid-signals/2024-11-02/types/map.d.ts
diff --git a/website/packages/solid-signals/2024-11-02/types/signals.d.ts b/src/website/packages/solid-signals/2024-11-02/types/signals.d.ts
similarity index 100%
rename from website/packages/solid-signals/2024-11-02/types/signals.d.ts
rename to src/website/packages/solid-signals/2024-11-02/types/signals.d.ts
diff --git a/website/packages/solid-signals/2024-11-02/types/store/index.d.ts b/src/website/packages/solid-signals/2024-11-02/types/store/index.d.ts
similarity index 100%
rename from website/packages/solid-signals/2024-11-02/types/store/index.d.ts
rename to src/website/packages/solid-signals/2024-11-02/types/store/index.d.ts
diff --git a/website/packages/solid-signals/2024-11-02/types/store/store.d.ts b/src/website/packages/solid-signals/2024-11-02/types/store/store.d.ts
similarity index 100%
rename from website/packages/solid-signals/2024-11-02/types/store/store.d.ts
rename to src/website/packages/solid-signals/2024-11-02/types/store/store.d.ts
diff --git a/website/packages/solid-signals/2024-11-02/types/utils.d.ts b/src/website/packages/solid-signals/2024-11-02/types/utils.d.ts
similarity index 100%
rename from website/packages/solid-signals/2024-11-02/types/utils.d.ts
rename to src/website/packages/solid-signals/2024-11-02/types/utils.d.ts
diff --git a/website/packages/solid-signals/2024-11-08/script.js b/src/website/packages/solid-signals/2024-11-08/script.js
similarity index 100%
rename from website/packages/solid-signals/2024-11-08/script.js
rename to src/website/packages/solid-signals/2024-11-08/script.js
diff --git a/website/packages/solid-signals/2024-11-08/types/core/constants.d.ts b/src/website/packages/solid-signals/2024-11-08/types/core/constants.d.ts
similarity index 100%
rename from website/packages/solid-signals/2024-11-08/types/core/constants.d.ts
rename to src/website/packages/solid-signals/2024-11-08/types/core/constants.d.ts
diff --git a/website/packages/solid-signals/2024-11-08/types/core/core.d.ts b/src/website/packages/solid-signals/2024-11-08/types/core/core.d.ts
similarity index 100%
rename from website/packages/solid-signals/2024-11-08/types/core/core.d.ts
rename to src/website/packages/solid-signals/2024-11-08/types/core/core.d.ts
diff --git a/website/packages/solid-signals/2024-11-08/types/core/effect.d.ts b/src/website/packages/solid-signals/2024-11-08/types/core/effect.d.ts
similarity index 100%
rename from website/packages/solid-signals/2024-11-08/types/core/effect.d.ts
rename to src/website/packages/solid-signals/2024-11-08/types/core/effect.d.ts
diff --git a/website/packages/solid-signals/2024-11-08/types/core/error.d.ts b/src/website/packages/solid-signals/2024-11-08/types/core/error.d.ts
similarity index 100%
rename from website/packages/solid-signals/2024-11-08/types/core/error.d.ts
rename to src/website/packages/solid-signals/2024-11-08/types/core/error.d.ts
diff --git a/website/packages/solid-signals/2024-11-08/types/core/flags.d.ts b/src/website/packages/solid-signals/2024-11-08/types/core/flags.d.ts
similarity index 100%
rename from website/packages/solid-signals/2024-11-08/types/core/flags.d.ts
rename to src/website/packages/solid-signals/2024-11-08/types/core/flags.d.ts
diff --git a/website/packages/solid-signals/2024-11-08/types/core/index.d.ts b/src/website/packages/solid-signals/2024-11-08/types/core/index.d.ts
similarity index 100%
rename from website/packages/solid-signals/2024-11-08/types/core/index.d.ts
rename to src/website/packages/solid-signals/2024-11-08/types/core/index.d.ts
diff --git a/website/packages/solid-signals/2024-11-08/types/core/owner.d.ts b/src/website/packages/solid-signals/2024-11-08/types/core/owner.d.ts
similarity index 100%
rename from website/packages/solid-signals/2024-11-08/types/core/owner.d.ts
rename to src/website/packages/solid-signals/2024-11-08/types/core/owner.d.ts
diff --git a/website/packages/solid-signals/2024-11-08/types/core/scheduler.d.ts b/src/website/packages/solid-signals/2024-11-08/types/core/scheduler.d.ts
similarity index 100%
rename from website/packages/solid-signals/2024-11-08/types/core/scheduler.d.ts
rename to src/website/packages/solid-signals/2024-11-08/types/core/scheduler.d.ts
diff --git a/website/packages/solid-signals/2024-11-08/types/index.d.ts b/src/website/packages/solid-signals/2024-11-08/types/index.d.ts
similarity index 100%
rename from website/packages/solid-signals/2024-11-08/types/index.d.ts
rename to src/website/packages/solid-signals/2024-11-08/types/index.d.ts
diff --git a/website/packages/solid-signals/2024-11-08/types/map.d.ts b/src/website/packages/solid-signals/2024-11-08/types/map.d.ts
similarity index 100%
rename from website/packages/solid-signals/2024-11-08/types/map.d.ts
rename to src/website/packages/solid-signals/2024-11-08/types/map.d.ts
diff --git a/website/packages/solid-signals/2024-11-08/types/signals.d.ts b/src/website/packages/solid-signals/2024-11-08/types/signals.d.ts
similarity index 100%
rename from website/packages/solid-signals/2024-11-08/types/signals.d.ts
rename to src/website/packages/solid-signals/2024-11-08/types/signals.d.ts
diff --git a/website/packages/solid-signals/2024-11-08/types/store/index.d.ts b/src/website/packages/solid-signals/2024-11-08/types/store/index.d.ts
similarity index 100%
rename from website/packages/solid-signals/2024-11-08/types/store/index.d.ts
rename to src/website/packages/solid-signals/2024-11-08/types/store/index.d.ts
diff --git a/website/packages/solid-signals/2024-11-08/types/store/store.d.ts b/src/website/packages/solid-signals/2024-11-08/types/store/store.d.ts
similarity index 100%
rename from website/packages/solid-signals/2024-11-08/types/store/store.d.ts
rename to src/website/packages/solid-signals/2024-11-08/types/store/store.d.ts
diff --git a/website/packages/solid-signals/2024-11-08/types/utils.d.ts b/src/website/packages/solid-signals/2024-11-08/types/utils.d.ts
similarity index 100%
rename from website/packages/solid-signals/2024-11-08/types/utils.d.ts
rename to src/website/packages/solid-signals/2024-11-08/types/utils.d.ts
diff --git a/website/packages/solid-signals/README.md b/src/website/packages/solid-signals/README.md
similarity index 100%
rename from website/packages/solid-signals/README.md
rename to src/website/packages/solid-signals/README.md
diff --git a/website/packages/solid-signals/types.d.ts b/src/website/packages/solid-signals/types.d.ts
similarity index 100%
rename from website/packages/solid-signals/types.d.ts
rename to src/website/packages/solid-signals/types.d.ts
diff --git a/website/packages/solid-signals/wrapper.js b/src/website/packages/solid-signals/wrapper.js
similarity index 100%
rename from website/packages/solid-signals/wrapper.js
rename to src/website/packages/solid-signals/wrapper.js
diff --git a/website/packages/ufuzzy/README.md b/src/website/packages/ufuzzy/README.md
similarity index 100%
rename from website/packages/ufuzzy/README.md
rename to src/website/packages/ufuzzy/README.md
diff --git a/website/packages/ufuzzy/v1.0.14/script.js b/src/website/packages/ufuzzy/v1.0.14/script.js
similarity index 100%
rename from website/packages/ufuzzy/v1.0.14/script.js
rename to src/website/packages/ufuzzy/v1.0.14/script.js
diff --git a/website/packages/ufuzzy/v1.0.14/types.d.ts b/src/website/packages/ufuzzy/v1.0.14/types.d.ts
similarity index 100%
rename from website/packages/ufuzzy/v1.0.14/types.d.ts
rename to src/website/packages/ufuzzy/v1.0.14/types.d.ts
diff --git a/website/robots.txt b/src/website/robots.txt
similarity index 100%
rename from website/robots.txt
rename to src/website/robots.txt
diff --git a/website/scripts/chart.js b/src/website/scripts/chart.js
similarity index 100%
rename from website/scripts/chart.js
rename to src/website/scripts/chart.js
diff --git a/website/scripts/live-price.js b/src/website/scripts/live-price.js
similarity index 100%
rename from website/scripts/live-price.js
rename to src/website/scripts/live-price.js
diff --git a/website/scripts/main.js b/src/website/scripts/main.js
similarity index 99%
rename from website/scripts/main.js
rename to src/website/scripts/main.js
index 17edce5b5..9e3f3d7b7 100644
--- a/website/scripts/main.js
+++ b/src/website/scripts/main.js
@@ -1311,10 +1311,10 @@ function initFrameSelectors() {
   function setAsideParent() {
     const { clientWidth } = window.document.documentElement;
     const { aside, body, main } = elements;
-    if (clientWidth >= consts.MEDIUM_WIDTH) {
-      aside.parentElement !== body && body.append(aside);
-    } else {
-      aside.parentElement !== main && main.append(aside);
+    if (clientWidth >= consts.MEDIUM_WIDTH && aside.parentElement !== body) {
+      body.append(aside);
+    } else if (aside.parentElement !== main) {
+      main.append(aside);
     }
   }
 
diff --git a/website/scripts/moscow-time.js b/src/website/scripts/moscow-time.js
similarity index 100%
rename from website/scripts/moscow-time.js
rename to src/website/scripts/moscow-time.js
diff --git a/website/scripts/options.js b/src/website/scripts/options.js
similarity index 100%
rename from website/scripts/options.js
rename to src/website/scripts/options.js
diff --git a/website/scripts/service-worker.js b/src/website/scripts/service-worker.js
similarity index 100%
rename from website/scripts/service-worker.js
rename to src/website/scripts/service-worker.js
diff --git a/website/scripts/simulation.js b/src/website/scripts/simulation.js
similarity index 100%
rename from website/scripts/simulation.js
rename to src/website/scripts/simulation.js
diff --git a/website/scripts/types/self.d.ts b/src/website/scripts/types/self.d.ts
similarity index 100%
rename from website/scripts/types/self.d.ts
rename to src/website/scripts/types/self.d.ts
diff --git a/website/styles/chart.css b/src/website/styles/chart.css
similarity index 100%
rename from website/styles/chart.css
rename to src/website/styles/chart.css
diff --git a/website/styles/live-price.css b/src/website/styles/live-price.css
similarity index 100%
rename from website/styles/live-price.css
rename to src/website/styles/live-price.css
diff --git a/website/styles/moscow-time.css b/src/website/styles/moscow-time.css
similarity index 100%
rename from website/styles/moscow-time.css
rename to src/website/styles/moscow-time.css
diff --git a/website/styles/simulation.css b/src/website/styles/simulation.css
similarity index 100%
rename from website/styles/simulation.css
rename to src/website/styles/simulation.css
diff --git a/website/tsconfig.json b/src/website/tsconfig.json
similarity index 100%
rename from website/tsconfig.json
rename to src/website/tsconfig.json

From c883ed19d6430827b2258e018c0c69bfd36e0f8e Mon Sep 17 00:00:00 2001
From: nym21 <expat-epochs0i@icloud.com>
Date: Fri, 13 Dec 2024 19:57:08 +0100
Subject: [PATCH 04/63] biter: readme: update

---
 crates/biter/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/biter/README.md b/crates/biter/README.md
index 13c3097e6..57bee26a6 100644
--- a/crates/biter/README.md
+++ b/crates/biter/README.md
@@ -1,4 +1,4 @@
-# Biter
+# biter
 
 Biter (Bitcoin Block Iterator) is a very fast and simple Rust library which reads raw block files (*blkXXXXX.dat*) from Bitcoin Core Node and creates an iterator over all the requested blocks in sequential order (0, 1, 2, ...).
 
@@ -55,7 +55,7 @@ Peak memory should be around 500MB.
 
 ## Comparaison
 
-|  | [biter](https://crates.io/crates/biter) | [bitcoin-explorer (depreciated)](https://crates.io/crates/bitcoin-explorer) | [blocks_iterator](https://crates.io/crates/blocks_iterator) |
+|  | [biter](https://crates.io/crates/biter) | [bitcoin-explorer (deprecated)](https://crates.io/crates/bitcoin-explorer) | [blocks_iterator](https://crates.io/crates/blocks_iterator) |
 | --- | --- | --- | --- |
 | Runs **with** `bitcoind` | Yes ✅ | No ❌ | Yes ✅ |
 | Runs **without** `bitcoind` | No ❌ | Yes ✅ | Yes ✅ |

From 50c77b51db8214680f548ee9efcf7ba8ebcf6388 Mon Sep 17 00:00:00 2001
From: nym21 <expat-epochs0i@icloud.com>
Date: Sat, 14 Dec 2024 14:55:44 +0100
Subject: [PATCH 05/63] snkrj: move database struct to its own crate

---
 CHANGELOG.md                                  |   3 +-
 Cargo.lock                                    |   9 +-
 Cargo.toml                                    |   2 +-
 crates/biter/LICENSE.md                       |   2 +-
 crates/snkrj/Cargo.lock                       | 242 +++++++++++++++++
 crates/snkrj/Cargo.toml                       |  12 +
 crates/snkrj/LICENSE.md                       |  21 ++
 crates/snkrj/README.md                        |  37 +++
 crates/snkrj/src/lib.rs                       | 252 ++++++++++++++++++
 crates/snkrj/src/main.rs                      |  29 ++
 src/parser/actions/iter_blocks.rs             |   4 +-
 src/parser/actions/parse.rs                   |  28 +-
 src/parser/databases/_database.rs             | 229 ----------------
 src/parser/databases/_trait.rs                |   3 +-
 .../address_index_to_address_data.rs          |  18 +-
 .../address_index_to_empty_address_data.rs    |  18 +-
 .../databases/address_to_address_index.rs     |  38 ++-
 src/parser/databases/mod.rs                   |   3 +-
 src/parser/databases/txid_to_tx_data.rs       |  53 +---
 .../databases/txout_index_to_address_index.rs |  16 +-
 src/parser/databases/txout_index_to_amount.rs |  16 +-
 src/structs/address_data.rs                   |   2 +-
 src/structs/amount.rs                         |   2 +-
 src/structs/array.rs                          |   2 +-
 src/structs/date.rs                           |   4 +
 src/structs/empty_address_data.rs             |   2 +-
 src/structs/tx_data.rs                        |   2 +-
 src/structs/txout_index.rs                    |   2 +-
 28 files changed, 702 insertions(+), 349 deletions(-)
 create mode 100644 crates/snkrj/Cargo.lock
 create mode 100644 crates/snkrj/Cargo.toml
 create mode 100644 crates/snkrj/LICENSE.md
 create mode 100644 crates/snkrj/README.md
 create mode 100644 crates/snkrj/src/lib.rs
 create mode 100644 crates/snkrj/src/main.rs
 delete mode 100644 src/parser/databases/_database.rs

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 97b4a75e0..339cc3a3e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,11 +6,12 @@
 # v0.6.0 | WIP
 
 - Merged parser and server crates into a single project (and thus executable)
-- Started using `log` and `env_logger` crates
+- Started using `log` and `env_logger` crates instead of custom code
 - Improved logs
 - Added `--server BOOL` and `--parser BOOL` parameters (both are true by default)
 - Automated databases defragmention (and removed parameter)
 - Fixed input being unfocused right after being focused in Brave browser
+- Moved Sanakirja database wrapper to its own crate: `snkrj`
 
 # [v0.5.0](https://github.com/kibo-money/kibo/tree/eea56d394bf92c62c81da8b78b8c47ea730683f5) | [873199](https://mempool.space/block/0000000000000000000270925aa6a565be92e13164565a3f7994ca1966e48050) - 2024/12/04
 
diff --git a/Cargo.lock b/Cargo.lock
index cd0f6c81f..e72dc3740 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1524,9 +1524,9 @@ dependencies = [
  "regex",
  "reqwest",
  "rlimit",
- "sanakirja",
  "serde",
  "serde_json",
+ "snkrj",
  "struct_iterable",
  "swc",
  "swc_common",
@@ -2621,6 +2621,13 @@ dependencies = [
  "version_check",
 ]
 
+[[package]]
+name = "snkrj"
+version = "0.1.0"
+dependencies = [
+ "sanakirja",
+]
+
 [[package]]
 name = "socket2"
 version = "0.5.7"
diff --git a/Cargo.toml b/Cargo.toml
index bd7c6bde3..19d50bc1f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -27,7 +27,7 @@ rayon = "1.10.0"
 regex = "1.11.1"
 reqwest = { version = "0.12.9", features = ["blocking", "json"] }
 rlimit = "0.10.2"
-sanakirja = "1.4.3"
+snkrj = { path = "./crates/snkrj" }
 serde = { version = "1.0.216", features = ["derive"] }
 serde_json = "1.0.133"
 struct_iterable = { path = "./crates/iterable" }
diff --git a/crates/biter/LICENSE.md b/crates/biter/LICENSE.md
index 690c7b5da..3fd127e58 100644
--- a/crates/biter/LICENSE.md
+++ b/crates/biter/LICENSE.md
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024 Biter
+Copyright (c) 2024 biter
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/crates/snkrj/Cargo.lock b/crates/snkrj/Cargo.lock
new file mode 100644
index 000000000..458967873
--- /dev/null
+++ b/crates/snkrj/Cargo.lock
@@ -0,0 +1,242 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 4
+
+[[package]]
+name = "autocfg"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
+
+[[package]]
+name = "bitflags"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "fs2"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "instant"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.168"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5aaeb2981e0606ca11d79718f8bb01164f1d6ed75080182d3abf017e6d244b6d"
+
+[[package]]
+name = "lock_api"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
+dependencies = [
+ "autocfg",
+ "scopeguard",
+]
+
+[[package]]
+name = "log"
+version = "0.4.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
+
+[[package]]
+name = "memmap2"
+version = "0.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "parking_lot"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
+dependencies = [
+ "instant",
+ "lock_api",
+ "parking_lot_core",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc"
+dependencies = [
+ "cfg-if",
+ "instant",
+ "libc",
+ "redox_syscall",
+ "smallvec",
+ "winapi",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.92"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
+dependencies = [
+ "bitflags",
+]
+
+[[package]]
+name = "sanakirja"
+version = "1.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81aaf70d064e2122209f04d01fd91e8908e7a327b516236e1cbc0c3f34ac6d11"
+dependencies = [
+ "fs2",
+ "log",
+ "memmap2",
+ "parking_lot",
+ "sanakirja-core",
+ "serde",
+ "thiserror",
+]
+
+[[package]]
+name = "sanakirja-core"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8376db34ae3eac6e7bd91168bc638450073b708ce9fb46940de676f552238bf5"
+
+[[package]]
+name = "scopeguard"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+
+[[package]]
+name = "serde"
+version = "1.0.216"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b9781016e935a97e8beecf0c933758c97a5520d32930e460142b4cd80c6338e"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.216"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46f859dbbf73865c6627ed570e78961cd3ac92407a2d117204c49232485da55e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "smallvec"
+version = "1.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
+
+[[package]]
+name = "snkrj"
+version = "0.1.0"
+dependencies = [
+ "sanakirja",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.90"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "thiserror"
+version = "1.0.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83"
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
diff --git a/crates/snkrj/Cargo.toml b/crates/snkrj/Cargo.toml
new file mode 100644
index 000000000..864b234b6
--- /dev/null
+++ b/crates/snkrj/Cargo.toml
@@ -0,0 +1,12 @@
+[package]
+name = "snkrj"
+description = "A simple wrapper around Sanakirja aatabase that acts as a very fast on disk BTreeMap"
+version = "0.1.0"
+license = "MIT"
+repository = "https://github.com/kibo-money/kibo/tree/main/crates/snkrj"
+keywords = ["database", "sanakirja", "btreemap"]
+categories = ["database"]
+edition = "2021"
+
+[dependencies]
+sanakirja = "1.4.3"
diff --git a/crates/snkrj/LICENSE.md b/crates/snkrj/LICENSE.md
new file mode 100644
index 000000000..aac235dcb
--- /dev/null
+++ b/crates/snkrj/LICENSE.md
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2024 snkrj
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/crates/snkrj/README.md b/crates/snkrj/README.md
new file mode 100644
index 000000000..1803d180c
--- /dev/null
+++ b/crates/snkrj/README.md
@@ -0,0 +1,37 @@
+# snkrj
+
+A simple wrapper around Sanakirja aatabase that acts as a very fast on disk BTreeMap.
+
+## Example
+
+```rust
+use snkrj::{AnyDatabase, Database};
+
+fn main() {
+    let path = std::env::temp_dir().join("./db");
+
+    let database: Database<i32, i32> = Database::open(path.clone()).unwrap();
+    let _ = database.destroy();
+
+    let mut database: Database<i32, i32> = Database::open(path.clone()).unwrap();
+    database.insert(64, 128);
+    database.export(false).unwrap();
+
+    let mut database: Database<i32, i32> = Database::open(path).unwrap();
+    database.insert(1, 2);
+    database.insert(128, 256);
+    println!("iter_ram:");
+    database.iter_ram().for_each(|pair| {
+        println!("{:?}", pair);
+    });
+    println!("iter_disk:");
+    database.iter_disk().for_each(|pair| {
+        println!("{:?}", pair.unwrap());
+    });
+    println!("iter_ram_then_disk:");
+    database.iter_ram_then_disk().for_each(|pair| {
+        println!("{:?}", pair);
+    });
+    database.export(false).unwrap();
+}
+```
diff --git a/crates/snkrj/src/lib.rs b/crates/snkrj/src/lib.rs
new file mode 100644
index 000000000..a99598595
--- /dev/null
+++ b/crates/snkrj/src/lib.rs
@@ -0,0 +1,252 @@
+// https://docs.rs/sanakirja/latest/sanakirja/index.html
+// https://pijul.org/posts/2021-02-06-rethinking-sanakirja/
+
+use std::{
+    collections::{BTreeMap, BTreeSet},
+    fmt::Debug,
+    fs, io, mem,
+    path::PathBuf,
+    result::Result,
+};
+
+use sanakirja::btree::{page, Db_};
+pub use sanakirja::*;
+
+///
+/// A simple wrapper around Sanakirja aatabase that acts as a very fast on disk BTreeMap.
+///
+/// The state of the tree is uncommited until `.export()` is called during which it is unsafe to stop the program.
+///
+pub struct Database<Key, Value>
+where
+    Key: Ord + Clone + Debug + Storable,
+    Value: Storable + PartialEq,
+{
+    path: PathBuf,
+    puts: BTreeMap<Key, Value>,
+    dels: BTreeSet<Key>,
+    db: Db_<Key, Value, page::Page<Key, Value>>,
+    txn: MutTxn<Env, ()>,
+}
+
+const ROOT_DB: usize = 0;
+const PAGE_SIZE: u64 = 4096;
+
+impl<Key, Value> Database<Key, Value>
+where
+    Key: Ord + Clone + Debug + Storable,
+    Value: Storable + PartialEq,
+{
+    /// Open a database without a lock file where only one instance is safe to open.
+    pub fn open(path: PathBuf) -> Result<Self, Error> {
+        let env = unsafe { Env::new_nolock(&path, PAGE_SIZE, 1)? };
+
+        let mut txn = Env::mut_txn_begin(env)?;
+
+        let db = txn
+            .root_db(ROOT_DB)
+            .unwrap_or_else(|| unsafe { btree::create_db_(&mut txn).unwrap() });
+
+        Ok(Self {
+            path,
+            puts: BTreeMap::default(),
+            dels: BTreeSet::default(),
+            db,
+            txn,
+        })
+    }
+
+    #[inline]
+    pub fn get(&self, key: &Key) -> Option<&Value> {
+        if let Some(cached_put) = self.get_from_ram(key) {
+            return Some(cached_put);
+        }
+
+        self.get_from_disk(key)
+    }
+
+    /// Get only from the uncommited tree (ram) without checking the database (disk)
+    #[inline]
+    pub fn get_from_ram(&self, key: &Key) -> Option<&Value> {
+        self.puts.get(key)
+    }
+
+    /// Get mut only from the uncommited tree (ram) without checking the database (disk)
+    #[inline]
+    pub fn get_mut_from_ram(&mut self, key: &Key) -> Option<&mut Value> {
+        self.puts.get_mut(key)
+    }
+
+    /// Get only from the database (disk) without checking the uncommited tree (ram)
+    #[inline]
+    pub fn get_from_disk(&self, key: &Key) -> Option<&Value> {
+        let option = btree::get(&self.txn, &self.db, key, None).unwrap();
+
+        if let Some((key_found, v)) = option {
+            if key == key_found {
+                return Some(v);
+            }
+        }
+
+        None
+    }
+
+    #[inline]
+    pub fn insert(&mut self, key: Key, value: Value) -> Option<Value> {
+        self.dels.remove(&key);
+        self.insert_to_ram(key, value)
+    }
+
+    /// Insert without removing the key to the dels tree, so be sure that it hasn't added to the delete set
+    #[inline]
+    pub fn insert_to_ram(&mut self, key: Key, value: Value) -> Option<Value> {
+        self.puts.insert(key, value)
+    }
+
+    #[inline]
+    pub fn update(&mut self, key: Key, value: Value) -> Option<Value> {
+        self.dels.insert(key.clone());
+        self.puts.insert(key, value)
+    }
+
+    #[inline]
+    pub fn remove(&mut self, key: &Key) -> Option<Value> {
+        self.remove_from_ram(key).or_else(|| {
+            self.remove_later_from_disk(key);
+
+            None
+        })
+    }
+
+    /// Get only from the uncommited tree (ram) without checking the database (disk)
+    #[inline]
+    pub fn remove_from_ram(&mut self, key: &Key) -> Option<Value> {
+        self.puts.remove(key)
+    }
+
+    /// Add the key only to the dels tree without checking if it's present in the puts tree, only use if you are positive that you neither added nor updated an entry with this key
+    #[inline]
+    pub fn remove_later_from_disk(&mut self, key: &Key) {
+        self.dels.insert(key.clone());
+    }
+
+    #[inline]
+    pub fn is_empty(&self) -> bool {
+        self.iter_disk().next().is_none()
+    }
+
+    /// Iterate over key/value pairs from the uncommited tree (ram)
+    #[inline]
+    pub fn iter_ram(&self) -> std::collections::btree_map::Iter<'_, Key, Value> {
+        self.puts.iter()
+    }
+
+    /// Iterate over key/value pairs from the database (disk)
+    #[inline]
+    pub fn iter_disk(
+        &self,
+    ) -> btree::Iter<'_, MutTxn<Env, ()>, Key, Value, page::Page<Key, Value>> {
+        btree::iter(&self.txn, &self.db, None).unwrap()
+    }
+
+    /// Iterate over key/value pairs
+    #[inline]
+    pub fn iter_ram_then_disk(&self) -> impl Iterator<Item = (&Key, &Value)> {
+        self.iter_ram().chain(self.iter_disk().map(|r| r.unwrap()))
+    }
+
+    /// Collect a **clone** of all uncommited key/value pairs (ram)
+    pub fn collect_ram(&self) -> BTreeMap<Key, Value>
+    where
+        Value: Clone,
+    {
+        self.puts.clone()
+    }
+
+    /// Collect a **clone** of all key/value pairs from the database (disk)
+    pub fn collect_disk(&self) -> BTreeMap<Key, Value>
+    where
+        Value: Clone,
+    {
+        self.iter_disk()
+            .map(|r| r.unwrap())
+            .map(|(key, value)| (key.clone(), value.clone()))
+            .collect::<_>()
+    }
+}
+
+pub trait AnyDatabase {
+    #[allow(unused)]
+    fn export(self, defragment: bool) -> Result<(), Error>;
+    fn boxed_export(self: Box<Self>, defragment: bool) -> Result<(), Error>;
+    #[allow(unused)]
+    fn destroy(self) -> io::Result<()>;
+}
+
+impl<Key, Value> AnyDatabase for Database<Key, Value>
+where
+    Key: Ord + Clone + Debug + Storable,
+    Value: Storable + PartialEq + Clone,
+{
+    /// Flush all puts and dels from the ram to disk with an option to defragment the database to save some disk space
+    ///
+    /// /!\ Do not kill the program while this function is runnning  /!\
+    fn export(self, defragment: bool) -> Result<(), Error> {
+        Box::new(self).boxed_export(defragment)
+    }
+
+    /// Flush all puts and dels from the ram to disk with an option to defragment the database to save some disk space
+    ///
+    /// /!\ Do not kill the program while this function is runnning  /!\
+    fn boxed_export(mut self: Box<Self>, defragment: bool) -> Result<(), Error> {
+        if defragment {
+            let mut btree = self.as_ref().collect_disk();
+
+            let path = self.path.to_owned();
+            self.dels.iter().for_each(|key| {
+                btree.remove(key);
+            });
+            btree.append(&mut self.puts);
+
+            self.destroy()?;
+
+            *self = Self::open(path).unwrap();
+
+            if !self.is_empty() {
+                panic!()
+            }
+
+            self.puts = btree;
+        }
+
+        if self.dels.is_empty() && self.puts.is_empty() {
+            return Ok(());
+        }
+
+        mem::take(&mut self.dels)
+            .into_iter()
+            .try_for_each(|key| -> Result<(), Error> {
+                btree::del(&mut self.txn, &mut self.db, &key, None)?;
+                Ok(())
+            })?;
+
+        mem::take(&mut self.puts).into_iter().try_for_each(
+            |(key, value)| -> Result<(), Error> {
+                btree::put(&mut self.txn, &mut self.db, &key, &value)?;
+                Ok(())
+            },
+        )?;
+
+        self.txn.set_root(ROOT_DB, self.db.db.into());
+
+        self.txn.commit()
+    }
+
+    fn destroy(self) -> io::Result<()> {
+        let path = self.path.to_owned();
+
+        drop(self);
+
+        fs::remove_file(&path)
+    }
+}
diff --git a/crates/snkrj/src/main.rs b/crates/snkrj/src/main.rs
new file mode 100644
index 000000000..da3c39d23
--- /dev/null
+++ b/crates/snkrj/src/main.rs
@@ -0,0 +1,29 @@
+use snkrj::{AnyDatabase, Database};
+
+fn main() {
+    let path = std::env::temp_dir().join("./db");
+
+    let database: Database<i32, i32> = Database::open(path.clone()).unwrap();
+    let _ = database.destroy();
+
+    let mut database: Database<i32, i32> = Database::open(path.clone()).unwrap();
+    database.insert(64, 128);
+    database.export(false).unwrap();
+
+    let mut database: Database<i32, i32> = Database::open(path).unwrap();
+    database.insert(1, 2);
+    database.insert(128, 256);
+    println!("iter_ram:");
+    database.iter_ram().for_each(|pair| {
+        println!("{:?}", pair);
+    });
+    println!("iter_disk:");
+    database.iter_disk().for_each(|pair| {
+        println!("{:?}", pair.unwrap());
+    });
+    println!("iter_ram_then_disk:");
+    database.iter_ram_then_disk().for_each(|pair| {
+        println!("{:?}", pair);
+    });
+    database.export(false).unwrap();
+}
diff --git a/src/parser/actions/iter_blocks.rs b/src/parser/actions/iter_blocks.rs
index 84e5a4af4..fcd41d254 100644
--- a/src/parser/actions/iter_blocks.rs
+++ b/src/parser/actions/iter_blocks.rs
@@ -213,7 +213,9 @@ pub fn iter_blocks(
 
             let defragment = is_safe
                 && next_date_opt.is_some_and(|date| {
-                    date.year() >= 2020 && date.is_january() && date.is_first_of_month()
+                    (date.year() >= 2020 && date.is_january()
+                        || date.year() >= 2022 && date.is_june())
+                        && date.is_first_of_month()
                 });
 
             export(ExportedData {
diff --git a/src/parser/actions/parse.rs b/src/parser/actions/parse.rs
index 648bfb53e..39e5207e8 100644
--- a/src/parser/actions/parse.rs
+++ b/src/parser/actions/parse.rs
@@ -241,7 +241,7 @@ pub fn parse(
 
                     databases
                         .txout_index_to_amount
-                        .unsafe_insert(txout_index, amount);
+                        .insert_to_ram(txout_index, amount);
 
                     if compute_addresses {
                         let address = address.unwrap();
@@ -253,7 +253,7 @@ pub fn parse(
                             if let Some(address_index) = address_index_opt.or_else(|| {
                                 databases
                                     .address_to_address_index
-                                    .unsafe_get_from_puts(&address)
+                                    .get_from_ram(&address)
                                     .cloned()
                             }) {
                                 let address_data = address_index_to_address_data
@@ -301,7 +301,7 @@ pub fn parse(
 
                         databases
                             .txout_index_to_address_index
-                            .unsafe_insert(txout_index, address_index);
+                            .insert_to_ram(txout_index, address_index);
                     }
                 });
 
@@ -336,9 +336,7 @@ pub fn parse(
                             .or_else(|| {
                                 is_tx_data_from_cached_puts = true;
 
-                                databases
-                                    .txid_to_tx_data
-                                    .unsafe_get_mut_from_puts(&input_txid)
+                                databases.txid_to_tx_data.get_mut_from_ram(&input_txid)
                             });
 
                         // Can be none because 0 sats inputs happen
@@ -534,7 +532,7 @@ pub fn parse(
 
                     if remove_tx_data_from_cached_puts {
                         // Pre remove tx_datas that are empty and weren't yet added to the database to avoid having it was in there or not (and thus avoid useless operations)
-                        databases.txid_to_tx_data.remove_from_puts(&input_txid)
+                        databases.txid_to_tx_data.remove_from_ram(&input_txid)
                     }
 
                     ControlFlow::Continue(())
@@ -558,7 +556,7 @@ pub fn parse(
     txid_to_tx_data.into_iter().for_each(|(txid, tx_data)| {
         if let Some(tx_data) = tx_data {
             if tx_data.is_empty() {
-                databases.txid_to_tx_data.remove_from_db(txid);
+                databases.txid_to_tx_data.remove_later_from_disk(txid);
             } else {
                 databases.txid_to_tx_data.update(txid, tx_data);
             }
@@ -738,14 +736,14 @@ pub fn parse(
         address_index_to_address_data.unwrap().into_iter().for_each(
             |(address_index, address_data)| {
                 if address_data.is_empty() {
-                    databases.address_index_to_empty_address_data.unsafe_insert(
+                    databases.address_index_to_empty_address_data.insert_to_ram(
                         address_index,
                         EmptyAddressData::from_non_empty(&address_data),
                     );
                 } else {
                     databases
                         .address_index_to_address_data
-                        .unsafe_insert(address_index, address_data);
+                        .insert_to_ram(address_index, address_data);
                 }
             },
         )
@@ -901,7 +899,7 @@ fn prepare_inputs<'a>(
 
     let mut tx_datas = txid_to_tx_data
         .par_iter()
-        .map(|(txid, _)| txid_to_tx_data_db.unsafe_get(txid))
+        .map(|(txid, _)| txid_to_tx_data_db.get(txid))
         .collect::<Vec<_>>();
 
     txid_to_tx_data.values_mut().rev().for_each(|tx_data_opt| {
@@ -992,20 +990,20 @@ fn compute_address_index_to_address_data(
         .par_iter_mut()
         .for_each(|(address_index, address_data)| {
             if let Some(_address_data) =
-                address_index_to_address_data_db.unsafe_get_from_cache(address_index)
+                address_index_to_address_data_db.get_from_ram(address_index)
             {
                 _address_data.clone_into(address_data);
             } else if let Some(empty_address_data) =
-                address_index_to_empty_address_data_db.unsafe_get_from_cache(address_index)
+                address_index_to_empty_address_data_db.get_from_ram(address_index)
             {
                 *address_data = AddressData::from_empty(empty_address_data);
             } else if let Some(_address_data) =
-                address_index_to_address_data_db.unsafe_get_from_db(address_index)
+                address_index_to_address_data_db.get_from_disk(address_index)
             {
                 _address_data.clone_into(address_data);
             } else {
                 let empty_address_data = address_index_to_empty_address_data_db
-                    .unsafe_get_from_db(address_index)
+                    .get_from_disk(address_index)
                     .unwrap();
 
                 *address_data = AddressData::from_empty(empty_address_data);
diff --git a/src/parser/databases/_database.rs b/src/parser/databases/_database.rs
deleted file mode 100644
index bd61f1078..000000000
--- a/src/parser/databases/_database.rs
+++ /dev/null
@@ -1,229 +0,0 @@
-// https://docs.rs/sanakirja/latest/sanakirja/index.html
-// https://pijul.org/posts/2021-02-06-rethinking-sanakirja/
-
-use std::{
-    collections::{BTreeMap, BTreeSet},
-    fmt::Debug,
-    fs, io, mem,
-    path::PathBuf,
-};
-
-use allocative::Allocative;
-
-use sanakirja::{
-    btree::{self, page, Db_, Iter},
-    Commit, Env, Error, MutTxn, RootDb, Storable,
-};
-
-///
-/// Simple wrapper around Sanakirja Database with cached puts and dels for safe use outside exports.
-///
-/// There is no `cached_gets` since it's much cheaper and faster to do a parallel search first using `unsafe_get` than caching "gets" along the way.
-///
-#[derive(Allocative)]
-#[allocative(bound = "Key: Allocative, Value: Allocative")]
-pub struct Database<Key, Value>
-where
-    Key: Ord + Clone + Debug + Storable,
-    Value: Storable + PartialEq,
-{
-    path: PathBuf,
-    cached_puts: BTreeMap<Key, Value>,
-    cached_dels: BTreeSet<Key>,
-    #[allocative(skip)]
-    db: Db_<Key, Value, page::Page<Key, Value>>,
-    #[allocative(skip)]
-    txn: MutTxn<Env, ()>,
-}
-
-const ROOT_DB: usize = 0;
-const PAGE_SIZE: u64 = 4096;
-
-impl<Key, Value> Database<Key, Value>
-where
-    Key: Ord + Clone + Debug + Storable,
-    Value: Storable + PartialEq,
-{
-    pub fn open(path: PathBuf) -> color_eyre::Result<Self> {
-        let env = unsafe { Env::new_nolock(&path, PAGE_SIZE, 1)? };
-
-        let mut txn = Env::mut_txn_begin(env)?;
-
-        let db = txn
-            .root_db(ROOT_DB)
-            .unwrap_or_else(|| unsafe { btree::create_db_(&mut txn).unwrap() });
-
-        Ok(Self {
-            path,
-            cached_puts: BTreeMap::default(),
-            cached_dels: BTreeSet::default(),
-            db,
-            txn,
-        })
-    }
-
-    #[inline]
-    pub fn iter(&self) -> Iter<'_, MutTxn<Env, ()>, Key, Value, page::Page<Key, Value>> {
-        btree::iter(&self.txn, &self.db, None).unwrap()
-    }
-
-    pub fn collect(&self) -> BTreeMap<Key, Value>
-    where
-        Value: Clone,
-    {
-        self.iter()
-            .map(|r| r.unwrap())
-            .map(|(key, value)| (key.clone(), value.clone()))
-            .collect::<_>()
-    }
-
-    #[inline]
-    pub fn get(&self, key: &Key) -> Option<&Value> {
-        if let Some(cached_put) = self.get_from_puts(key) {
-            return Some(cached_put);
-        }
-
-        self.db_get(key)
-    }
-
-    #[inline]
-    pub fn db_get(&self, key: &Key) -> Option<&Value> {
-        let option = btree::get(&self.txn, &self.db, key, None).unwrap();
-
-        if let Some((key_found, v)) = option {
-            if key == key_found {
-                return Some(v);
-            }
-        }
-
-        None
-    }
-
-    #[inline]
-    pub fn get_from_puts(&self, key: &Key) -> Option<&Value> {
-        self.cached_puts.get(key)
-    }
-
-    #[inline]
-    pub fn get_mut_from_puts(&mut self, key: &Key) -> Option<&mut Value> {
-        self.cached_puts.get_mut(key)
-    }
-
-    #[inline]
-    pub fn remove(&mut self, key: &Key) -> Option<Value> {
-        self.remove_from_puts(key).or_else(|| {
-            self.db_remove(key);
-
-            None
-        })
-    }
-
-    #[inline]
-    pub fn db_remove(&mut self, key: &Key) {
-        self.cached_dels.insert(key.clone());
-    }
-
-    #[inline]
-    pub fn update(&mut self, key: Key, value: Value) -> Option<Value> {
-        self.cached_dels.insert(key.clone());
-        self.cached_puts.insert(key, value)
-    }
-
-    #[inline]
-    pub fn is_empty(&self) -> bool {
-        self.iter().next().is_none()
-    }
-
-    #[inline]
-    pub fn remove_from_puts(&mut self, key: &Key) -> Option<Value> {
-        self.cached_puts.remove(key)
-    }
-
-    #[inline]
-    pub fn insert(&mut self, key: Key, value: Value) -> Option<Value> {
-        self.cached_dels.remove(&key);
-        self.unsafe_insert(key, value)
-    }
-
-    #[inline]
-    pub fn unsafe_insert(&mut self, key: Key, value: Value) -> Option<Value> {
-        self.cached_puts.insert(key, value)
-    }
-
-    fn db_multi_put(&mut self, tree: BTreeMap<Key, Value>) -> Result<(), Error> {
-        tree.into_iter()
-            .try_for_each(|(key, value)| -> Result<(), Error> {
-                btree::put(&mut self.txn, &mut self.db, &key, &value)?;
-                Ok(())
-            })
-    }
-
-    fn db_multi_del(&mut self, tree: BTreeSet<Key>) -> Result<(), Error> {
-        tree.into_iter().try_for_each(|key| -> Result<(), Error> {
-            btree::del(&mut self.txn, &mut self.db, &key, None)?;
-            Ok(())
-        })
-    }
-}
-
-pub trait AnyDatabase {
-    #[allow(unused)]
-    fn export(self, defragment: bool) -> color_eyre::Result<(), Error>;
-    fn boxed_export(self: Box<Self>, defragment: bool) -> color_eyre::Result<(), Error>;
-    #[allow(unused)]
-    fn destroy(self) -> io::Result<()>;
-}
-
-impl<Key, Value> AnyDatabase for Database<Key, Value>
-where
-    Key: Ord + Clone + Debug + Storable,
-    Value: Storable + PartialEq + Clone,
-{
-    fn export(self, defragment: bool) -> color_eyre::Result<(), Error> {
-        Box::new(self).boxed_export(defragment)
-    }
-
-    fn boxed_export(mut self: Box<Self>, defragment: bool) -> color_eyre::Result<(), Error> {
-        if defragment {
-            let mut btree = self.as_ref().collect();
-
-            let path = self.path.to_owned();
-            self.cached_dels.iter().for_each(|key| {
-                btree.remove(key);
-            });
-            btree.append(&mut self.cached_puts);
-
-            self.destroy()?;
-
-            *self = Self::open(path).unwrap();
-
-            if !self.is_empty() {
-                panic!()
-            }
-
-            self.cached_puts = btree;
-        }
-
-        if self.cached_dels.is_empty() && self.cached_puts.is_empty() {
-            return Ok(());
-        }
-
-        let cached_dels = mem::take(&mut self.cached_dels);
-        self.db_multi_del(cached_dels)?;
-
-        let cached_puts = mem::take(&mut self.cached_puts);
-        self.db_multi_put(cached_puts)?;
-
-        self.txn.set_root(ROOT_DB, self.db.db.into());
-
-        self.txn.commit()
-    }
-
-    fn destroy(self) -> io::Result<()> {
-        let path = self.path.to_owned();
-
-        drop(self);
-
-        fs::remove_file(&path)
-    }
-}
diff --git a/src/parser/databases/_trait.rs b/src/parser/databases/_trait.rs
index f238c82b1..5da93dd8a 100644
--- a/src/parser/databases/_trait.rs
+++ b/src/parser/databases/_trait.rs
@@ -1,10 +1,11 @@
 use std::{fs, io, path::Path};
 
 use log::info;
+use snkrj::AnyDatabase;
 
 use crate::structs::{Config, Date, Height};
 
-use super::{AnyDatabase, Metadata};
+use super::Metadata;
 
 pub trait AnyDatabaseGroup
 where
diff --git a/src/parser/databases/address_index_to_address_data.rs b/src/parser/databases/address_index_to_address_data.rs
index 82c90acf0..a56137b7f 100644
--- a/src/parser/databases/address_index_to_address_data.rs
+++ b/src/parser/databases/address_index_to_address_data.rs
@@ -8,6 +8,7 @@ use std::{
 use allocative::Allocative;
 use itertools::Itertools;
 use rayon::prelude::*;
+use snkrj::{AnyDatabase, Database as _Database};
 
 use crate::{
     parser::states::AddressCohortsDurableStates,
@@ -15,7 +16,7 @@ use crate::{
     utils::time,
 };
 
-use super::{AnyDatabase, AnyDatabaseGroup, Database as _Database, Metadata};
+use super::{AnyDatabaseGroup, Metadata};
 
 type Key = u32;
 type Value = AddressData;
@@ -25,6 +26,7 @@ type Database = _Database<Key, Value>;
 pub struct AddressIndexToAddressData {
     path: PathBuf,
     pub metadata: Metadata,
+    #[allocative(skip)]
     pub map: BTreeMap<usize, Database>,
 }
 
@@ -45,10 +47,10 @@ impl DerefMut for AddressIndexToAddressData {
 pub const ADDRESS_INDEX_DB_MAX_SIZE: usize = 250_000;
 
 impl AddressIndexToAddressData {
-    pub fn unsafe_insert(&mut self, key: Key, value: Value) -> Option<Value> {
+    pub fn insert_to_ram(&mut self, key: Key, value: Value) -> Option<Value> {
         self.metadata.called_insert();
 
-        self.open_db(&key).unsafe_insert(key, value)
+        self.open_db(&key).insert_to_ram(key, value)
     }
 
     pub fn remove(&mut self, key: &Key) -> Option<Value> {
@@ -59,16 +61,16 @@ impl AddressIndexToAddressData {
 
     /// Doesn't check if the database is open contrary to `safe_get` which does and opens if needed
     /// Though it makes it easy to use with rayon.
-    pub fn unsafe_get_from_cache(&self, key: &Key) -> Option<&Value> {
+    pub fn get_from_ram(&self, key: &Key) -> Option<&Value> {
         let db_index = Self::db_index(key);
 
-        self.get(&db_index).unwrap().get_from_puts(key)
+        self.get(&db_index).unwrap().get_from_ram(key)
     }
 
-    pub fn unsafe_get_from_db(&self, key: &Key) -> Option<&Value> {
+    pub fn get_from_disk(&self, key: &Key) -> Option<&Value> {
         let db_index = Self::db_index(key);
 
-        self.get(&db_index).unwrap().db_get(key)
+        self.get(&db_index).unwrap().get_from_disk(key)
     }
 
     pub fn open_db(&mut self, key: &Key) -> &mut Database {
@@ -99,7 +101,7 @@ impl AddressIndexToAddressData {
                     let mut s = AddressCohortsDurableStates::default();
 
                     database
-                        .iter()
+                        .iter_disk()
                         .map(|r| r.unwrap().1)
                         .for_each(|address_data| s.increment(address_data).unwrap());
 
diff --git a/src/parser/databases/address_index_to_empty_address_data.rs b/src/parser/databases/address_index_to_empty_address_data.rs
index 923ae4850..df940c2f3 100644
--- a/src/parser/databases/address_index_to_empty_address_data.rs
+++ b/src/parser/databases/address_index_to_empty_address_data.rs
@@ -7,12 +7,11 @@ use std::{
 
 use allocative::Allocative;
 use itertools::Itertools;
+use snkrj::{AnyDatabase, Database as _Database};
 
 use crate::structs::{Config, EmptyAddressData};
 
-use super::{
-    AnyDatabase, AnyDatabaseGroup, Database as _Database, Metadata, ADDRESS_INDEX_DB_MAX_SIZE,
-};
+use super::{AnyDatabaseGroup, Metadata, ADDRESS_INDEX_DB_MAX_SIZE};
 
 type Key = u32;
 type Value = EmptyAddressData;
@@ -22,6 +21,7 @@ type Database = _Database<Key, Value>;
 pub struct AddressIndexToEmptyAddressData {
     path: PathBuf,
     pub metadata: Metadata,
+    #[allocative(skip)]
     map: BTreeMap<usize, Database>,
 }
 
@@ -40,10 +40,10 @@ impl DerefMut for AddressIndexToEmptyAddressData {
 }
 
 impl AddressIndexToEmptyAddressData {
-    pub fn unsafe_insert(&mut self, key: Key, value: Value) -> Option<Value> {
+    pub fn insert_to_ram(&mut self, key: Key, value: Value) -> Option<Value> {
         self.metadata.called_insert();
 
-        self.open_db(&key).unsafe_insert(key, value)
+        self.open_db(&key).insert_to_ram(key, value)
     }
 
     pub fn remove(&mut self, key: &Key) -> Option<Value> {
@@ -54,13 +54,13 @@ impl AddressIndexToEmptyAddressData {
 
     /// Doesn't check if the database is open contrary to `safe_get` which does and opens if needed
     /// Though it makes it easy to use with rayon.
-    pub fn unsafe_get_from_cache(&self, key: &Key) -> Option<&Value> {
+    pub fn get_from_ram(&self, key: &Key) -> Option<&Value> {
         let db_index = Self::db_index(key);
 
-        self.get(&db_index).and_then(|db| db.get_from_puts(key))
+        self.get(&db_index).and_then(|db| db.get_from_ram(key))
     }
 
-    pub fn unsafe_get_from_db(&self, key: &Key) -> Option<&Value> {
+    pub fn get_from_disk(&self, key: &Key) -> Option<&Value> {
         let db_index = Self::db_index(key);
 
         self.get(&db_index)
@@ -68,7 +68,7 @@ impl AddressIndexToEmptyAddressData {
                 dbg!(&self.map.keys(), &key, &db_index);
                 panic!()
             })
-            .db_get(key)
+            .get_from_disk(key)
     }
 
     pub fn open_db(&mut self, key: &Key) -> &mut Database {
diff --git a/src/parser/databases/address_to_address_index.rs b/src/parser/databases/address_to_address_index.rs
index 35d9b7e30..01518a9fe 100644
--- a/src/parser/databases/address_to_address_index.rs
+++ b/src/parser/databases/address_to_address_index.rs
@@ -6,10 +6,11 @@ use std::{
 
 use allocative::Allocative;
 use itertools::Itertools;
+use snkrj::{AnyDatabase, Database};
 
 use crate::structs::{Address, Config, U8x19, U8x31};
 
-use super::{AnyDatabase, AnyDatabaseGroup, Database, Metadata};
+use super::{AnyDatabaseGroup, Metadata};
 
 type Value = u32;
 type U8x19Database = Database<U8x19, Value>;
@@ -33,16 +34,27 @@ pub struct AddressToAddressIndex {
     path: PathBuf,
     pub metadata: Metadata,
 
+    #[allocative(skip)]
     p2pk: BTreeMap<u16, P2PKDatabase>,
+    #[allocative(skip)]
     p2pkh: BTreeMap<u16, P2PKHDatabase>,
+    #[allocative(skip)]
     p2sh: BTreeMap<u16, P2SHDatabase>,
+    #[allocative(skip)]
     p2wpkh: BTreeMap<u16, P2WPKHDatabase>,
+    #[allocative(skip)]
     p2wsh: BTreeMap<u16, P2WSHDatabase>,
+    #[allocative(skip)]
     p2tr: BTreeMap<u16, P2TRDatabase>,
+    #[allocative(skip)]
     op_return: Option<OpReturnDatabase>,
+    #[allocative(skip)]
     push_only: Option<PushOnlyDatabase>,
+    #[allocative(skip)]
     unknown: Option<UnknownDatabase>,
+    #[allocative(skip)]
     empty: Option<EmptyDatabase>,
+    #[allocative(skip)]
     multisig: Option<MultisigDatabase>,
 }
 
@@ -103,19 +115,19 @@ impl AddressToAddressIndex {
         }
     }
 
-    pub fn unsafe_get_from_puts(&self, address: &Address) -> Option<&Value> {
+    pub fn get_from_ram(&self, address: &Address) -> Option<&Value> {
         match address {
-            Address::Empty(key) => self.empty.as_ref().unwrap().get_from_puts(key),
-            Address::Unknown(key) => self.unknown.as_ref().unwrap().get_from_puts(key),
-            Address::OpReturn(key) => self.op_return.as_ref().unwrap().get_from_puts(key),
-            Address::PushOnly(key) => self.push_only.as_ref().unwrap().get_from_puts(key),
-            Address::MultiSig(key) => self.multisig.as_ref().unwrap().get_from_puts(key),
-            Address::P2PK((prefix, key)) => self.p2pk.get(prefix).unwrap().get_from_puts(key),
-            Address::P2PKH((prefix, key)) => self.p2pkh.get(prefix).unwrap().get_from_puts(key),
-            Address::P2SH((prefix, key)) => self.p2sh.get(prefix).unwrap().get_from_puts(key),
-            Address::P2WPKH((prefix, key)) => self.p2wpkh.get(prefix).unwrap().get_from_puts(key),
-            Address::P2WSH((prefix, key)) => self.p2wsh.get(prefix).unwrap().get_from_puts(key),
-            Address::P2TR((prefix, key)) => self.p2tr.get(prefix).unwrap().get_from_puts(key),
+            Address::Empty(key) => self.empty.as_ref().unwrap().get_from_ram(key),
+            Address::Unknown(key) => self.unknown.as_ref().unwrap().get_from_ram(key),
+            Address::OpReturn(key) => self.op_return.as_ref().unwrap().get_from_ram(key),
+            Address::PushOnly(key) => self.push_only.as_ref().unwrap().get_from_ram(key),
+            Address::MultiSig(key) => self.multisig.as_ref().unwrap().get_from_ram(key),
+            Address::P2PK((prefix, key)) => self.p2pk.get(prefix).unwrap().get_from_ram(key),
+            Address::P2PKH((prefix, key)) => self.p2pkh.get(prefix).unwrap().get_from_ram(key),
+            Address::P2SH((prefix, key)) => self.p2sh.get(prefix).unwrap().get_from_ram(key),
+            Address::P2WPKH((prefix, key)) => self.p2wpkh.get(prefix).unwrap().get_from_ram(key),
+            Address::P2WSH((prefix, key)) => self.p2wsh.get(prefix).unwrap().get_from_ram(key),
+            Address::P2TR((prefix, key)) => self.p2tr.get(prefix).unwrap().get_from_ram(key),
         }
     }
 
diff --git a/src/parser/databases/mod.rs b/src/parser/databases/mod.rs
index 9b32a982c..3370d914a 100644
--- a/src/parser/databases/mod.rs
+++ b/src/parser/databases/mod.rs
@@ -1,6 +1,5 @@
 use allocative::Allocative;
 
-mod _database;
 mod _trait;
 mod address_index_to_address_data;
 mod address_index_to_empty_address_data;
@@ -10,7 +9,6 @@ mod txid_to_tx_data;
 mod txout_index_to_address_index;
 mod txout_index_to_amount;
 
-pub use _database::*;
 use _trait::*;
 pub use address_index_to_address_data::*;
 pub use address_index_to_empty_address_data::*;
@@ -19,6 +17,7 @@ use itertools::Itertools;
 use log::info;
 use metadata::*;
 use rayon::iter::{IntoParallelIterator, ParallelIterator};
+use snkrj::AnyDatabase;
 pub use txid_to_tx_data::*;
 pub use txout_index_to_address_index::*;
 pub use txout_index_to_amount::*;
diff --git a/src/parser/databases/txid_to_tx_data.rs b/src/parser/databases/txid_to_tx_data.rs
index 14ee58555..399c760d9 100644
--- a/src/parser/databases/txid_to_tx_data.rs
+++ b/src/parser/databases/txid_to_tx_data.rs
@@ -1,17 +1,17 @@
 use std::{
     collections::BTreeMap,
     fs, mem,
-    ops::{Deref, DerefMut},
     path::{Path, PathBuf},
 };
 
 use allocative::Allocative;
 use biter::bitcoin::Txid;
 use itertools::Itertools;
+use snkrj::{AnyDatabase, Database as _Database};
 
 use crate::structs::{Config, TxData, U8x31};
 
-use super::{AnyDatabase, AnyDatabaseGroup, Database as _Database, Metadata};
+use super::{AnyDatabaseGroup, Metadata};
 
 type Key = U8x31;
 type Value = TxData;
@@ -21,23 +21,10 @@ type Database = _Database<Key, Value>;
 pub struct TxidToTxData {
     path: PathBuf,
     pub metadata: Metadata,
+    #[allocative(skip)]
     map: BTreeMap<u16, Database>,
 }
 
-impl Deref for TxidToTxData {
-    type Target = BTreeMap<u16, Database>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.map
-    }
-}
-
-impl DerefMut for TxidToTxData {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.map
-    }
-}
-
 impl TxidToTxData {
     pub fn insert(&mut self, txid: &Txid, tx_index: Value) -> Option<Value> {
         self.metadata.called_insert();
@@ -47,53 +34,41 @@ impl TxidToTxData {
         self.open_db(txid).insert(txid_key, tx_index)
     }
 
-    // pub fn safe_get(&mut self, txid: &Txid) -> Option<&Value> {
-    //     let txid_key = Self::txid_to_key(txid);
-    //     self.open_db(txid).get(&txid_key)
-    // }
-
     /// Doesn't check if the database is open contrary to `safe_get` which does and opens if needed.
     /// Though it makes it easy to use with rayon
-    pub fn unsafe_get(&self, txid: &Txid) -> Option<&Value> {
+    pub fn get(&self, txid: &Txid) -> Option<&Value> {
         let txid_key = Self::txid_to_key(txid);
 
         let db_index = Self::db_index(txid);
 
-        self.get(&db_index).unwrap().get(&txid_key)
+        self.map.get(&db_index).unwrap().get(&txid_key)
     }
 
-    // pub fn unsafe_get_from_puts(&self, txid: &Txid) -> Option<&Value> {
-    //     let txid_key = Self::txid_to_key(txid);
-
-    //     let db_index = Self::db_index(txid);
-
-    //     self.get(&db_index).unwrap().get_from_puts(&txid_key)
-    // }
-
-    pub fn unsafe_get_mut_from_puts(&mut self, txid: &Txid) -> Option<&mut Value> {
+    pub fn get_mut_from_ram(&mut self, txid: &Txid) -> Option<&mut Value> {
         let txid_key = Self::txid_to_key(txid);
 
         let db_index = Self::db_index(txid);
 
-        self.get_mut(&db_index)
+        self.map
+            .get_mut(&db_index)
             .unwrap()
-            .get_mut_from_puts(&txid_key)
+            .get_mut_from_ram(&txid_key)
     }
 
-    pub fn remove_from_db(&mut self, txid: &Txid) {
+    pub fn remove_later_from_disk(&mut self, txid: &Txid) {
         self.metadata.called_remove();
 
         let txid_key = Self::txid_to_key(txid);
 
-        self.open_db(txid).db_remove(&txid_key);
+        self.open_db(txid).remove_later_from_disk(&txid_key);
     }
 
-    pub fn remove_from_puts(&mut self, txid: &Txid) {
+    pub fn remove_from_ram(&mut self, txid: &Txid) {
         self.metadata.called_remove();
 
         let txid_key = Self::txid_to_key(txid);
 
-        self.open_db(txid).remove_from_puts(&txid_key);
+        self.open_db(txid).remove_from_ram(&txid_key);
     }
 
     pub fn update(&mut self, txid: &Txid, tx_data: TxData) {
@@ -111,7 +86,7 @@ impl TxidToTxData {
     #[inline(always)]
     pub fn _open_db(&mut self, db_index: u16) -> &mut Database {
         let path = self.path.to_owned();
-        self.entry(db_index).or_insert_with(|| {
+        self.map.entry(db_index).or_insert_with(|| {
             let path = path.join(db_index.to_string());
             Database::open(path).unwrap()
         })
diff --git a/src/parser/databases/txout_index_to_address_index.rs b/src/parser/databases/txout_index_to_address_index.rs
index 5db9f4484..4e060ddfc 100644
--- a/src/parser/databases/txout_index_to_address_index.rs
+++ b/src/parser/databases/txout_index_to_address_index.rs
@@ -7,10 +7,11 @@ use std::{
 
 use allocative::Allocative;
 use itertools::Itertools;
+use snkrj::{AnyDatabase, Database as _Database};
 
 use crate::structs::{Config, TxoutIndex};
 
-use super::{AnyDatabase, AnyDatabaseGroup, Database as _Database, Metadata};
+use super::{AnyDatabaseGroup, Metadata};
 
 type Key = TxoutIndex;
 type Value = u32;
@@ -20,6 +21,7 @@ type Database = _Database<Key, Value>;
 pub struct TxoutIndexToAddressIndex {
     path: PathBuf,
     pub metadata: Metadata,
+    #[allocative(skip)]
     map: BTreeMap<usize, Database>,
 }
 
@@ -40,20 +42,12 @@ impl DerefMut for TxoutIndexToAddressIndex {
 const DB_MAX_SIZE: usize = 10_000_000_000;
 
 impl TxoutIndexToAddressIndex {
-    pub fn unsafe_insert(&mut self, key: Key, value: Value) -> Option<Value> {
+    pub fn insert_to_ram(&mut self, key: Key, value: Value) -> Option<Value> {
         self.metadata.called_insert();
 
-        self.open_db(&key).unsafe_insert(key, value)
+        self.open_db(&key).insert_to_ram(key, value)
     }
 
-    // pub fn undo_insert(&mut self, key: &Key) -> Option<Value> {
-    //     self.open_db(key).remove_from_puts(key).map(|v| {
-    //         self.metadata.called_remove();
-
-    //         v
-    //     })
-    // }
-
     pub fn remove(&mut self, key: &Key) -> Option<Value> {
         self.metadata.called_remove();
 
diff --git a/src/parser/databases/txout_index_to_amount.rs b/src/parser/databases/txout_index_to_amount.rs
index 0464b04c7..bc86a2c2e 100644
--- a/src/parser/databases/txout_index_to_amount.rs
+++ b/src/parser/databases/txout_index_to_amount.rs
@@ -7,10 +7,11 @@ use std::{
 
 use allocative::Allocative;
 use itertools::Itertools;
+use snkrj::{AnyDatabase, Database as _Database};
 
 use crate::structs::{Amount, Config, TxoutIndex};
 
-use super::{AnyDatabase, AnyDatabaseGroup, Database as _Database, Metadata};
+use super::{AnyDatabaseGroup, Metadata};
 
 type Key = TxoutIndex;
 type Value = Amount;
@@ -20,6 +21,7 @@ type Database = _Database<Key, Value>;
 pub struct TxoutIndexToAmount {
     path: PathBuf,
     pub metadata: Metadata,
+    #[allocative(skip)]
     map: BTreeMap<usize, Database>,
 }
 
@@ -40,20 +42,12 @@ impl DerefMut for TxoutIndexToAmount {
 const DB_MAX_SIZE: usize = 10_000_000_000;
 
 impl TxoutIndexToAmount {
-    pub fn unsafe_insert(&mut self, key: Key, value: Value) -> Option<Value> {
+    pub fn insert_to_ram(&mut self, key: Key, value: Value) -> Option<Value> {
         self.metadata.called_insert();
 
-        self.open_db(&key).unsafe_insert(key, value)
+        self.open_db(&key).insert_to_ram(key, value)
     }
 
-    // pub fn undo_insert(&mut self, key: &Key) -> Option<Value> {
-    //     self.open_db(key).remove_from_puts(key).map(|v| {
-    //         self.metadata.called_remove();
-
-    //         v
-    //     })
-    // }
-
     pub fn remove(&mut self, key: &Key) -> Option<Value> {
         self.metadata.called_remove();
 
diff --git a/src/structs/address_data.rs b/src/structs/address_data.rs
index 3d0968d0a..636819317 100644
--- a/src/structs/address_data.rs
+++ b/src/structs/address_data.rs
@@ -1,6 +1,6 @@
 use allocative::Allocative;
 use color_eyre::eyre::eyre;
-use sanakirja::{direct_repr, Storable, UnsizedStorable};
+use snkrj::{direct_repr, Storable, UnsizedStorable};
 
 use super::{AddressType, Amount, EmptyAddressData, LiquidityClassification, Price};
 
diff --git a/src/structs/amount.rs b/src/structs/amount.rs
index 6ff8ce1d4..8308a7d40 100644
--- a/src/structs/amount.rs
+++ b/src/structs/amount.rs
@@ -12,8 +12,8 @@ use bincode::{
 };
 use biter::bitcoin::Amount as BitcoinAmount;
 use derive_deref::{Deref, DerefMut};
-use sanakirja::{direct_repr, Storable, UnsizedStorable};
 use serde::{Deserialize, Serialize};
+use snkrj::{direct_repr, Storable, UnsizedStorable};
 
 use super::Height;
 
diff --git a/src/structs/array.rs b/src/structs/array.rs
index dbfb67592..8a915db6d 100644
--- a/src/structs/array.rs
+++ b/src/structs/array.rs
@@ -2,7 +2,7 @@ use std::fmt::Debug;
 
 use allocative::Allocative;
 use derive_deref::{Deref, DerefMut};
-use sanakirja::{direct_repr, Storable, UnsizedStorable};
+use snkrj::{direct_repr, Storable, UnsizedStorable};
 
 #[derive(
     Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Deref, DerefMut, Default, Copy, Allocative,
diff --git a/src/structs/date.rs b/src/structs/date.rs
index c2d51dd51..da448f6bb 100644
--- a/src/structs/date.rs
+++ b/src/structs/date.rs
@@ -74,6 +74,10 @@ impl Date {
         self.month() == 1
     }
 
+    pub fn is_june(&self) -> bool {
+        self.month() == 6
+    }
+
     pub fn is_first_of_month(&self) -> bool {
         self.day() == 1
     }
diff --git a/src/structs/empty_address_data.rs b/src/structs/empty_address_data.rs
index a7613efcb..48aaa7784 100644
--- a/src/structs/empty_address_data.rs
+++ b/src/structs/empty_address_data.rs
@@ -1,5 +1,5 @@
 use allocative::Allocative;
-use sanakirja::{direct_repr, Storable, UnsizedStorable};
+use snkrj::{direct_repr, Storable, UnsizedStorable};
 
 use super::{AddressData, AddressType, Amount};
 
diff --git a/src/structs/tx_data.rs b/src/structs/tx_data.rs
index 1a577e8be..162ed456f 100644
--- a/src/structs/tx_data.rs
+++ b/src/structs/tx_data.rs
@@ -1,5 +1,5 @@
 use allocative::Allocative;
-use sanakirja::{direct_repr, Storable, UnsizedStorable};
+use snkrj::{direct_repr, Storable, UnsizedStorable};
 
 use super::BlockPath;
 
diff --git a/src/structs/txout_index.rs b/src/structs/txout_index.rs
index 6da7f588d..ebb36775f 100644
--- a/src/structs/txout_index.rs
+++ b/src/structs/txout_index.rs
@@ -1,6 +1,6 @@
 use allocative::Allocative;
 use bincode::{Decode, Encode};
-use sanakirja::{direct_repr, Storable, UnsizedStorable};
+use snkrj::{direct_repr, Storable, UnsizedStorable};
 
 #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Encode, Decode, Allocative)]
 pub struct TxoutIndex {

From 0b3329ca35fb167223ce328c46f5a5503d99e391 Mon Sep 17 00:00:00 2001
From: nym21 <expat-epochs0i@icloud.com>
Date: Sat, 14 Dec 2024 14:56:55 +0100
Subject: [PATCH 06/63] git: fix ignore file

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index da713f859..1c9f9abdc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,4 +34,4 @@ docker/kibo
 paths.d.ts
 
 # Git
-.git*
+.git-*

From e0a378cb81cde69c503f6dd442567acf8e0679d0 Mon Sep 17 00:00:00 2001
From: nym21 <expat-epochs0i@icloud.com>
Date: Sat, 14 Dec 2024 17:39:42 +0100
Subject: [PATCH 07/63] biter: fix ?

---
 .gitignore                                    |  6 --
 Cargo.lock                                    |  4 +-
 Cargo.toml                                    |  6 +-
 README.md                                     | 70 ++++--------------
 crates/snkrj/Cargo.toml                       | 12 ----
 {crates => src/crates}/biter/CHANGELOG.md     |  0
 {crates => src/crates}/biter/Cargo.lock       |  0
 {crates => src/crates}/biter/Cargo.toml       |  4 +-
 {crates => src/crates}/biter/LICENSE.md       |  0
 {crates => src/crates}/biter/README.md        |  0
 .../biter/src/blk_index_to_blk_recap.rs       | 14 ++--
 .../crates}/biter/src/blk_metadata.rs         |  0
 .../biter/src/blk_metadata_and_block.rs       |  0
 {crates => src/crates}/biter/src/blk_recap.rs |  0
 {crates => src/crates}/biter/src/lib.rs       |  0
 {crates => src/crates}/biter/src/main.rs      |  4 +-
 {crates => src/crates}/biter/src/utils.rs     |  0
 {crates => src/crates}/iterable/Cargo.lock    |  0
 {crates => src/crates}/iterable/Cargo.toml    |  0
 {crates => src/crates}/iterable/README.md     |  0
 {crates => src/crates}/iterable/src/lib.rs    |  0
 .../struct_iterable_derive/Cargo.toml         |  0
 .../iterable/struct_iterable_derive/README.md |  0
 .../struct_iterable_derive/src/lib.rs         |  0
 .../struct_iterable_internal/Cargo.toml       |  0
 .../struct_iterable_internal/README.md        |  0
 .../struct_iterable_internal/src/lib.rs       |  0
 {crates => src/crates}/snkrj/Cargo.lock       |  0
 src/crates/snkrj/Cargo.toml                   | 12 ++++
 {crates => src/crates}/snkrj/LICENSE.md       |  0
 {crates => src/crates}/snkrj/README.md        |  0
 {crates => src/crates}/snkrj/src/lib.rs       |  0
 {crates => src/crates}/snkrj/src/main.rs      |  0
 src/parser/mod.rs                             |  2 +-
 src/structs/config.rs                         | 71 +++++++++++++------
 src/utils/rpc.rs                              |  7 +-
 36 files changed, 96 insertions(+), 116 deletions(-)
 delete mode 100644 crates/snkrj/Cargo.toml
 rename {crates => src/crates}/biter/CHANGELOG.md (100%)
 rename {crates => src/crates}/biter/Cargo.lock (100%)
 rename {crates => src/crates}/biter/Cargo.toml (85%)
 rename {crates => src/crates}/biter/LICENSE.md (100%)
 rename {crates => src/crates}/biter/README.md (100%)
 rename {crates => src/crates}/biter/src/blk_index_to_blk_recap.rs (90%)
 rename {crates => src/crates}/biter/src/blk_metadata.rs (100%)
 rename {crates => src/crates}/biter/src/blk_metadata_and_block.rs (100%)
 rename {crates => src/crates}/biter/src/blk_recap.rs (100%)
 rename {crates => src/crates}/biter/src/lib.rs (100%)
 rename {crates => src/crates}/biter/src/main.rs (89%)
 rename {crates => src/crates}/biter/src/utils.rs (100%)
 rename {crates => src/crates}/iterable/Cargo.lock (100%)
 rename {crates => src/crates}/iterable/Cargo.toml (100%)
 rename {crates => src/crates}/iterable/README.md (100%)
 rename {crates => src/crates}/iterable/src/lib.rs (100%)
 rename {crates => src/crates}/iterable/struct_iterable_derive/Cargo.toml (100%)
 rename {crates => src/crates}/iterable/struct_iterable_derive/README.md (100%)
 rename {crates => src/crates}/iterable/struct_iterable_derive/src/lib.rs (100%)
 rename {crates => src/crates}/iterable/struct_iterable_internal/Cargo.toml (100%)
 rename {crates => src/crates}/iterable/struct_iterable_internal/README.md (100%)
 rename {crates => src/crates}/iterable/struct_iterable_internal/src/lib.rs (100%)
 rename {crates => src/crates}/snkrj/Cargo.lock (100%)
 create mode 100644 src/crates/snkrj/Cargo.toml
 rename {crates => src/crates}/snkrj/LICENSE.md (100%)
 rename {crates => src/crates}/snkrj/README.md (100%)
 rename {crates => src/crates}/snkrj/src/lib.rs (100%)
 rename {crates => src/crates}/snkrj/src/main.rs (100%)

diff --git a/.gitignore b/.gitignore
index 1c9f9abdc..7df94636e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,9 +4,6 @@
 # Builds
 target
 
-# Sync
-.stfolder
-
 # Copies
 *\ copy*
 
@@ -32,6 +29,3 @@ docker/kibo
 
 # Types
 paths.d.ts
-
-# Git
-.git-*
diff --git a/Cargo.lock b/Cargo.lock
index e72dc3740..4122381e8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -481,7 +481,7 @@ dependencies = [
 
 [[package]]
 name = "biter"
-version = "0.2.1"
+version = "0.2.2"
 dependencies = [
  "bitcoin",
  "bitcoincore-rpc",
@@ -2623,7 +2623,7 @@ dependencies = [
 
 [[package]]
 name = "snkrj"
-version = "0.1.0"
+version = "0.1.1"
 dependencies = [
  "sanakirja",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 19d50bc1f..b35e6c734 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,7 +12,7 @@ bincode = { git = "https://github.com/bincode-org/bincode.git", features = [
     "serde",
 ] }
 bitcoin_hashes = { version = "0.15.0" }
-biter = { path = "./crates/biter" }
+biter = { path = "./src/crates/biter" }
 chrono = { version = "0.4.39", features = ["serde"] }
 clap = { version = "4.5.23", features = ["derive"] }
 color-eyre = "0.6.3"
@@ -27,10 +27,10 @@ rayon = "1.10.0"
 regex = "1.11.1"
 reqwest = { version = "0.12.9", features = ["blocking", "json"] }
 rlimit = "0.10.2"
-snkrj = { path = "./crates/snkrj" }
+snkrj = { path = "./src/crates/snkrj" }
 serde = { version = "1.0.216", features = ["derive"] }
 serde_json = "1.0.133"
-struct_iterable = { path = "./crates/iterable" }
+struct_iterable = { path = "./src/crates/iterable" }
 swc = "9.0.0"
 swc_common = "5.0.0"
 tokio = { version = "1.42.0", features = ["full"] }
diff --git a/README.md b/README.md
index d602d55d8..d364690a2 100644
--- a/README.md
+++ b/README.md
@@ -63,17 +63,19 @@ Please open an issue if you want to add another instance
 ### Requirements
 
 - At least 16 GB of RAM
-- 1 TB of free space (will use 70% of that without defragmentation and 40% after)
+  - Recommended: 32 GB
+- A disk with 1 TB of free space (will use between 40% to 80% depending on several things)
+  - Recommended: Rated at 3 GB/s (Thunderbolt 4 speed)
 - A running instance of bitcoin-core with:
   - `-txindex=1`
   - `-blocksxor=0`
   - RPC credentials
   - Example: `bitcoind -datadir="$HOME/.bitcoin" -blocksonly -txindex=1 -blocksxor=0`
 - Git
+- Unix based operating system (Mac OS or Linux)
+  - Ubuntu users need to install `open-ssl` via `sudo apt install libssl-dev pkg-config`
 
-### Manual
-
-_Mac OS and Linux only, Windows is unsupported_
+### Build
 
 First we need to install Rust (https://www.rust-lang.org/tools/install)
 
@@ -81,75 +83,33 @@ First we need to install Rust (https://www.rust-lang.org/tools/install)
 curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
 ```
 
-If you already had Rust installed you could update it just in case
+If you already had Rust installed you could update it
 
 ```bash
 rustup update
 ```
 
-> If you're on Ubuntu you'll probably also need to install `open-ssl` with
->
-> ```bash
-> sudo apt install libssl-dev pkg-config
-> ```
-
-Optionally, you can also install `cargo-watch` for the server to automatically restart it on file change, which will be triggered by new code and new datasets from the parser (https://github.com/watchexec/cargo-watch?tab=readme-ov-file#install)
-
-```bash
-cargo install cargo-watch --locked
-```
-
-Then you need to choose a path where all files related to **kibō** will live
+Then you need to choose a path where the project will reside and then clone it
 
 ```bash
 cd ???
-```
-
-We can now clone the repository
-
-```bash
 git clone https://github.com/kibo-money/kibo.git
+cd kibo
 ```
 
-In a new terminal, go to the `parser`'s folder of the repository
+If it's your first time running kibo, it will need several information such as:
 
-```bash
-cd ???/kibo/parser
-```
+- `--bitcoindir PATH`: path to bitcoin core data directory, `???/bitcoin`
+- `--kibodir PATH`: path to kibo outputs, if you have enough space on your main disk `~/.kibo` is fine
 
-Now we can finally start by running the parser, you need to use the `./run.sh` script instead of `cargo run -r` as we need to set various system variables for the program to run smoothly
+Everything will be saved at `~/.kibo/config.toml`, which will allow you to simply run `cargo run -r` next time
 
-For the first launch, the parser will need several information such as:
-
-- `--datadir`: which is bitcoin data directory path, prefer `$HOME` to `~` as the latter might not work
-- `--outdir`: where all outputs will be saved, prefer `$HOME` to `~` as the latter might not work
-
-Optionally you can also specify:
-
-- `--rpccookiefile`: the path to the cookie file if not default
-- `--rpcuser`: the username of the RPC credentials to talk to the bitcoin server if set
-- `--rpcpassword`: the password of the RPC credentials if set
-- `--rpcconnect`: if the bitcoin core server's IP is different than `localhost`
-- `--rpcport`: if the port is different than `8332`
-
-Everything will be saved in a `config.toml` file, which will allow you to simply run `./run.sh` next time
+If you need more options please run `cargo run -r --help` to see what parameters are available.
 
 Here's an example
 
 ```bash
-./run.sh --datadir=$HOME/Developer/bitcoin --outdir=$HOME/.kibo/out
-```
-
-In a **new** terminal, go to the `server`'s folder of the repository
-
-```bash
-cd ???/kibo/server
-```
-
-And start it also with the `run.sh` script instead of `cargo run -r`
-
-```bash
-./run.sh
+cargo run -r -- --bitcoindir=~/Developer/bitcoin --kibodir=~/.kibo
 ```
 
 Then the easiest to let others access your server is to use `cloudflared` which will also cache requests. For more information go to: https://developers.cloudflare.com/cloudflare-one/connections/connect-networks/
diff --git a/crates/snkrj/Cargo.toml b/crates/snkrj/Cargo.toml
deleted file mode 100644
index 864b234b6..000000000
--- a/crates/snkrj/Cargo.toml
+++ /dev/null
@@ -1,12 +0,0 @@
-[package]
-name = "snkrj"
-description = "A simple wrapper around Sanakirja aatabase that acts as a very fast on disk BTreeMap"
-version = "0.1.0"
-license = "MIT"
-repository = "https://github.com/kibo-money/kibo/tree/main/crates/snkrj"
-keywords = ["database", "sanakirja", "btreemap"]
-categories = ["database"]
-edition = "2021"
-
-[dependencies]
-sanakirja = "1.4.3"
diff --git a/crates/biter/CHANGELOG.md b/src/crates/biter/CHANGELOG.md
similarity index 100%
rename from crates/biter/CHANGELOG.md
rename to src/crates/biter/CHANGELOG.md
diff --git a/crates/biter/Cargo.lock b/src/crates/biter/Cargo.lock
similarity index 100%
rename from crates/biter/Cargo.lock
rename to src/crates/biter/Cargo.lock
diff --git a/crates/biter/Cargo.toml b/src/crates/biter/Cargo.toml
similarity index 85%
rename from crates/biter/Cargo.toml
rename to src/crates/biter/Cargo.toml
index fb39c739d..e9ad3f63a 100644
--- a/crates/biter/Cargo.toml
+++ b/src/crates/biter/Cargo.toml
@@ -1,9 +1,9 @@
 [package]
 name = "biter"
 description = "A very fast Bitcoin block iterator"
-version = "0.2.1"
+version = "0.2.2"
 license = "MIT"
-repository = "https://github.com/kibo-money/kibo/tree/main/crates/biter"
+repository = "https://github.com/kibo-money/kibo/tree/main/src/crates/biter"
 keywords = ["bitcoin", "block", "iterator"]
 categories = ["cryptography::cryptocurrencies", "encoding"]
 edition = "2021"
diff --git a/crates/biter/LICENSE.md b/src/crates/biter/LICENSE.md
similarity index 100%
rename from crates/biter/LICENSE.md
rename to src/crates/biter/LICENSE.md
diff --git a/crates/biter/README.md b/src/crates/biter/README.md
similarity index 100%
rename from crates/biter/README.md
rename to src/crates/biter/README.md
diff --git a/crates/biter/src/blk_index_to_blk_recap.rs b/src/crates/biter/src/blk_index_to_blk_recap.rs
similarity index 90%
rename from crates/biter/src/blk_index_to_blk_recap.rs
rename to src/crates/biter/src/blk_index_to_blk_recap.rs
index c3823447c..b0353261f 100644
--- a/crates/biter/src/blk_index_to_blk_recap.rs
+++ b/src/crates/biter/src/blk_index_to_blk_recap.rs
@@ -17,7 +17,7 @@ pub struct BlkIndexToBlkRecap {
     path: PathBuf,
     #[target]
     tree: BTreeMap<usize, BlkRecap>,
-    last_safe_recap: Option<BlkRecap>,
+    last_safe_height: Option<usize>,
 }
 
 impl BlkIndexToBlkRecap {
@@ -38,7 +38,7 @@ impl BlkIndexToBlkRecap {
         let mut this = Self {
             path,
             tree,
-            last_safe_recap: None,
+            last_safe_height: None,
         };
 
         this.clean_outdated(blocks_dir);
@@ -58,11 +58,11 @@ impl BlkIndexToBlkRecap {
             }
         });
 
-        unprocessed_keys.iter().for_each(|blk_index| {
-            self.remove(blk_index);
+        unprocessed_keys.into_iter().for_each(|blk_index| {
+            self.remove(&blk_index);
         });
 
-        self.last_safe_recap = self.last_entry().map(|e| e.get().clone());
+        self.last_safe_height = self.iter().map(|(_, recap)| recap.height()).max();
     }
 
     pub fn get_start_recap(&self, start: Option<usize>) -> Option<(usize, BlkRecap)> {
@@ -108,8 +108,8 @@ impl BlkIndexToBlkRecap {
         }
 
         if self
-            .last_safe_recap
-            .map_or(true, |recap| recap.height() >= height)
+            .last_safe_height
+            .map_or(true, |safe_height| height >= safe_height)
             && (height % TARGET_BLOCKS_PER_MONTH) == 0
         {
             self.export();
diff --git a/crates/biter/src/blk_metadata.rs b/src/crates/biter/src/blk_metadata.rs
similarity index 100%
rename from crates/biter/src/blk_metadata.rs
rename to src/crates/biter/src/blk_metadata.rs
diff --git a/crates/biter/src/blk_metadata_and_block.rs b/src/crates/biter/src/blk_metadata_and_block.rs
similarity index 100%
rename from crates/biter/src/blk_metadata_and_block.rs
rename to src/crates/biter/src/blk_metadata_and_block.rs
diff --git a/crates/biter/src/blk_recap.rs b/src/crates/biter/src/blk_recap.rs
similarity index 100%
rename from crates/biter/src/blk_recap.rs
rename to src/crates/biter/src/blk_recap.rs
diff --git a/crates/biter/src/lib.rs b/src/crates/biter/src/lib.rs
similarity index 100%
rename from crates/biter/src/lib.rs
rename to src/crates/biter/src/lib.rs
diff --git a/crates/biter/src/main.rs b/src/crates/biter/src/main.rs
similarity index 89%
rename from crates/biter/src/main.rs
rename to src/crates/biter/src/main.rs
index ed1da58cb..a8bea0066 100644
--- a/crates/biter/src/main.rs
+++ b/src/crates/biter/src/main.rs
@@ -11,8 +11,8 @@ fn main() {
     let auth = Auth::CookieFile(cookie);
     let rpc = Client::new(url, auth).unwrap();
 
-    let start = Some(800_000);
-    let end = Some(855_000);
+    let start = Some(810078);
+    let end = None;
 
     biter::new(data_dir, start, end, rpc)
         .iter()
diff --git a/crates/biter/src/utils.rs b/src/crates/biter/src/utils.rs
similarity index 100%
rename from crates/biter/src/utils.rs
rename to src/crates/biter/src/utils.rs
diff --git a/crates/iterable/Cargo.lock b/src/crates/iterable/Cargo.lock
similarity index 100%
rename from crates/iterable/Cargo.lock
rename to src/crates/iterable/Cargo.lock
diff --git a/crates/iterable/Cargo.toml b/src/crates/iterable/Cargo.toml
similarity index 100%
rename from crates/iterable/Cargo.toml
rename to src/crates/iterable/Cargo.toml
diff --git a/crates/iterable/README.md b/src/crates/iterable/README.md
similarity index 100%
rename from crates/iterable/README.md
rename to src/crates/iterable/README.md
diff --git a/crates/iterable/src/lib.rs b/src/crates/iterable/src/lib.rs
similarity index 100%
rename from crates/iterable/src/lib.rs
rename to src/crates/iterable/src/lib.rs
diff --git a/crates/iterable/struct_iterable_derive/Cargo.toml b/src/crates/iterable/struct_iterable_derive/Cargo.toml
similarity index 100%
rename from crates/iterable/struct_iterable_derive/Cargo.toml
rename to src/crates/iterable/struct_iterable_derive/Cargo.toml
diff --git a/crates/iterable/struct_iterable_derive/README.md b/src/crates/iterable/struct_iterable_derive/README.md
similarity index 100%
rename from crates/iterable/struct_iterable_derive/README.md
rename to src/crates/iterable/struct_iterable_derive/README.md
diff --git a/crates/iterable/struct_iterable_derive/src/lib.rs b/src/crates/iterable/struct_iterable_derive/src/lib.rs
similarity index 100%
rename from crates/iterable/struct_iterable_derive/src/lib.rs
rename to src/crates/iterable/struct_iterable_derive/src/lib.rs
diff --git a/crates/iterable/struct_iterable_internal/Cargo.toml b/src/crates/iterable/struct_iterable_internal/Cargo.toml
similarity index 100%
rename from crates/iterable/struct_iterable_internal/Cargo.toml
rename to src/crates/iterable/struct_iterable_internal/Cargo.toml
diff --git a/crates/iterable/struct_iterable_internal/README.md b/src/crates/iterable/struct_iterable_internal/README.md
similarity index 100%
rename from crates/iterable/struct_iterable_internal/README.md
rename to src/crates/iterable/struct_iterable_internal/README.md
diff --git a/crates/iterable/struct_iterable_internal/src/lib.rs b/src/crates/iterable/struct_iterable_internal/src/lib.rs
similarity index 100%
rename from crates/iterable/struct_iterable_internal/src/lib.rs
rename to src/crates/iterable/struct_iterable_internal/src/lib.rs
diff --git a/crates/snkrj/Cargo.lock b/src/crates/snkrj/Cargo.lock
similarity index 100%
rename from crates/snkrj/Cargo.lock
rename to src/crates/snkrj/Cargo.lock
diff --git a/src/crates/snkrj/Cargo.toml b/src/crates/snkrj/Cargo.toml
new file mode 100644
index 000000000..2341d6537
--- /dev/null
+++ b/src/crates/snkrj/Cargo.toml
@@ -0,0 +1,12 @@
+[package]
+name = "snkrj"
+description = "A simple wrapper around Sanakirja's database that acts as a very fast on disk BTreeMap"
+version = "0.1.1"
+license = "MIT"
+repository = "https://github.com/kibo-money/kibo/tree/main/src/crates/snkrj"
+keywords = ["database", "sanakirja", "btreemap"]
+categories = ["database"]
+edition = "2021"
+
+[dependencies]
+sanakirja = "1.4.3"
diff --git a/crates/snkrj/LICENSE.md b/src/crates/snkrj/LICENSE.md
similarity index 100%
rename from crates/snkrj/LICENSE.md
rename to src/crates/snkrj/LICENSE.md
diff --git a/crates/snkrj/README.md b/src/crates/snkrj/README.md
similarity index 100%
rename from crates/snkrj/README.md
rename to src/crates/snkrj/README.md
diff --git a/crates/snkrj/src/lib.rs b/src/crates/snkrj/src/lib.rs
similarity index 100%
rename from crates/snkrj/src/lib.rs
rename to src/crates/snkrj/src/lib.rs
diff --git a/crates/snkrj/src/main.rs b/src/crates/snkrj/src/main.rs
similarity index 100%
rename from crates/snkrj/src/main.rs
rename to src/crates/snkrj/src/main.rs
diff --git a/src/parser/mod.rs b/src/parser/mod.rs
index 21acaa3ce..b720f435c 100644
--- a/src/parser/mod.rs
+++ b/src/parser/mod.rs
@@ -37,7 +37,7 @@ pub fn main(
             &mut datasets,
         )?;
 
-        if let Some(delay) = config.delay {
+        if let Some(delay) = config.delay() {
             sleep(Duration::from_secs(delay))
         }
 
diff --git a/src/structs/config.rs b/src/structs/config.rs
index 9ad22a1c0..ed5acbedc 100644
--- a/src/structs/config.rs
+++ b/src/structs/config.rs
@@ -15,36 +15,36 @@ use super::MapPath;
 #[command(version, about, long_about = None)]
 pub struct Config {
     /// Bitcoin data directory path, saved
-    #[arg(long, value_name = "DIR")]
+    #[arg(long, value_name = "PATH")]
     bitcoindir: Option<String>,
 
-    /// Kibo data directory path, saved
-    #[arg(long, value_name = "DIR")]
+    /// Kibo output directory path, saved
+    #[arg(long, value_name = "PATH")]
     kibodir: Option<String>,
 
     /// Bitcoin RPC ip, default: localhost, saved
     #[arg(long, value_name = "IP")]
-    pub rpcconnect: Option<String>,
+    rpcconnect: Option<String>,
 
     /// Bitcoin RPC port, default: 8332, saved
     #[arg(long, value_name = "PORT")]
-    pub rpcport: Option<u16>,
+    rpcport: Option<u16>,
 
     /// Bitcoin RPC cookie file, default: --bitcoindir/.cookie, saved
     #[arg(long, value_name = "PATH")]
-    pub rpccookiefile: Option<String>,
+    rpccookiefile: Option<String>,
 
     /// Bitcoin RPC username, saved
     #[arg(long, value_name = "USERNAME")]
-    pub rpcuser: Option<String>,
+    rpcuser: Option<String>,
 
     /// Bitcoin RPC password, saved
     #[arg(long, value_name = "PASSWORD")]
-    pub rpcpassword: Option<String>,
+    rpcpassword: Option<String>,
 
     /// Delay between runs, default: 0, saved
     #[arg(long, value_name = "SECONDS")]
-    pub delay: Option<u64>,
+    delay: Option<u64>,
 
     // Maximum ram you want the program to use in GB, default: 50% of total, not saved
     // #[arg(long, value_name = "GB")]
@@ -181,7 +181,7 @@ impl Config {
             std::process::exit(1);
         }
 
-        let path = Path::new(self.bitcoindir.as_ref().unwrap());
+        let path = self.path_bitcoindir();
         if !path.is_dir() {
             println!("Expect path '{:#?}' to be a directory.", path);
             std::process::exit(1);
@@ -206,18 +206,10 @@ impl Config {
     }
 
     pub fn to_rpc_auth(&self) -> color_eyre::Result<Auth> {
-        let cookie = Path::new(self.bitcoindir.as_ref().unwrap()).join(".cookie");
+        let cookie = self.path_cookiefile();
 
         if cookie.is_file() {
             Ok(Auth::CookieFile(cookie))
-        } else if self
-            .rpccookiefile
-            .as_ref()
-            .is_some_and(|cookie| Path::new(cookie).is_file())
-        {
-            Ok(Auth::CookieFile(PathBuf::from(
-                self.rpccookiefile.as_ref().unwrap(),
-            )))
         } else if self.rpcuser.is_some() && self.rpcpassword.is_some() {
             Ok(Auth::UserPass(
                 self.rpcuser.clone().unwrap(),
@@ -228,6 +220,18 @@ impl Config {
         }
     }
 
+    pub fn rpcconnect(&self) -> Option<&String> {
+        self.rpcconnect.as_ref()
+    }
+
+    pub fn rpcport(&self) -> Option<u16> {
+        self.rpcport
+    }
+
+    pub fn delay(&self) -> Option<u64> {
+        self.delay
+    }
+
     pub fn dry_run(&self) -> bool {
         self.dry_run.is_some_and(|b| b)
     }
@@ -241,11 +245,36 @@ impl Config {
     }
 
     pub fn path_bitcoindir(&self) -> PathBuf {
-        PathBuf::from(self.bitcoindir.as_ref().unwrap())
+        Self::fix_user_path(self.bitcoindir.as_ref().unwrap().as_ref())
     }
 
     fn path_kibodir(&self) -> PathBuf {
-        PathBuf::from(self.kibodir.as_ref().unwrap())
+        Self::fix_user_path(self.kibodir.as_ref().unwrap().as_ref())
+    }
+
+    fn path_cookiefile(&self) -> PathBuf {
+        self.rpccookiefile.as_ref().map_or_else(
+            || self.path_bitcoindir().join(".cookie"),
+            |p| Self::fix_user_path(p.as_str()),
+        )
+    }
+
+    fn fix_user_path(path: &str) -> PathBuf {
+        let fix = move |pattern: &str| {
+            if path.starts_with(pattern) {
+                let path = &path
+                    .replace(&format!("{pattern}/"), "")
+                    .replace(pattern, "");
+
+                let home = std::env::var("HOME").unwrap();
+
+                Some(Path::new(&home).join(path))
+            } else {
+                None
+            }
+        };
+
+        fix("~").unwrap_or_else(|| fix("$HOME").unwrap_or_else(|| PathBuf::from(&path)))
     }
 
     pub fn path_datasets(&self) -> MapPath {
diff --git a/src/utils/rpc.rs b/src/utils/rpc.rs
index a25275d27..398989639 100644
--- a/src/utils/rpc.rs
+++ b/src/utils/rpc.rs
@@ -12,11 +12,8 @@ fn create_rpc(config: &Config) -> color_eyre::Result<Client> {
     Ok(Client::new(
         &format!(
             "http://{}:{}",
-            config
-                .rpcconnect
-                .as_ref()
-                .unwrap_or(&"localhost".to_owned()),
-            config.rpcport.unwrap_or(8332)
+            config.rpcconnect().unwrap_or(&"localhost".to_owned()),
+            config.rpcport().unwrap_or(8332)
         ),
         config.to_rpc_auth().unwrap(),
     )?)

From 8fabbde13b3dc887f27fc32229e1f30be09f2e6f Mon Sep 17 00:00:00 2001
From: nym21 <expat-epochs0i@icloud.com>
Date: Tue, 17 Dec 2024 10:39:28 +0100
Subject: [PATCH 08/63] global: small fixes

---
 CHANGELOG.md                                  | 13 +++-
 src/crates/biter/Cargo.lock                   |  2 +-
 src/crates/snkrj/Cargo.lock                   |  2 +-
 src/parser/actions/export.rs                  | 34 +++++------
 src/parser/actions/iter_blocks.rs             | 26 +++-----
 src/parser/actions/min_height.rs              |  2 +
 .../address_index_to_address_data.rs          | 31 +++++-----
 .../datasets/_traits/min_initial_state.rs     |  7 ---
 src/parser/states/_trait.rs                   |  5 +-
 src/parser/states/mod.rs                      |  4 +-
 src/server/api/structs/routes.rs              | 32 +++++++---
 src/structs/bi_map.rs                         |  2 +-
 src/structs/config.rs                         | 61 ++++++++++---------
 src/structs/date.rs                           |  4 +-
 src/structs/instant.rs                        | 15 +++++
 src/structs/mod.rs                            |  4 ++
 src/structs/rpc.rs                            | 17 ++++++
 src/utils/mod.rs                              |  1 -
 src/utils/rpc.rs                              | 20 ------
 src/utils/time.rs                             |  6 +-
 src/website/index.html                        |  1 +
 src/website/scripts/main.js                   |  8 +--
 src/website/scripts/options.js                | 52 ++++++----------
 23 files changed, 179 insertions(+), 170 deletions(-)
 create mode 100644 src/structs/instant.rs
 create mode 100644 src/structs/rpc.rs
 delete mode 100644 src/utils/rpc.rs

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 339cc3a3e..8c15669ab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,14 +5,21 @@
 
 # v0.6.0 | WIP
 
-- Merged parser and server crates into a single project (and thus executable)
+## Global
+
+- Merged parser and server crates into a single project (and thus executable), so now both will run at the same time with a single `cargo run -r`
+- Added `--no-server` and `--no-parser` to disable each if needed
+- Improved executable parameters
 - Started using `log` and `env_logger` crates instead of custom code
 - Improved logs
-- Added `--server BOOL` and `--parser BOOL` parameters (both are true by default)
-- Automated databases defragmention (and removed parameter)
+- Automated databases defragmention (and removed parameter) to improve disk usage and parse speed
 - Fixed input being unfocused right after being focused in Brave browser
 - Moved Sanakirja database wrapper to its own crate: `snkrj`
 
+## Git
+
+Added git tags for each version tough Markdown won't display formatted on Github so left the default text
+
 # [v0.5.0](https://github.com/kibo-money/kibo/tree/eea56d394bf92c62c81da8b78b8c47ea730683f5) | [873199](https://mempool.space/block/0000000000000000000270925aa6a565be92e13164565a3f7994ca1966e48050) - 2024/12/04
 
 ![Image of the kibō Web App version 0.5.0](https://github.com/kibo-money/kibo/blob/main/assets/v0.5.0.jpg)
diff --git a/src/crates/biter/Cargo.lock b/src/crates/biter/Cargo.lock
index b71079ba4..0de88bd25 100644
--- a/src/crates/biter/Cargo.lock
+++ b/src/crates/biter/Cargo.lock
@@ -110,7 +110,7 @@ dependencies = [
 
 [[package]]
 name = "biter"
-version = "0.2.1"
+version = "0.2.2"
 dependencies = [
  "bitcoin",
  "bitcoincore-rpc",
diff --git a/src/crates/snkrj/Cargo.lock b/src/crates/snkrj/Cargo.lock
index 458967873..7939c3538 100644
--- a/src/crates/snkrj/Cargo.lock
+++ b/src/crates/snkrj/Cargo.lock
@@ -177,7 +177,7 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "snkrj"
-version = "0.1.0"
+version = "0.1.1"
 dependencies = [
  "sanakirja",
 ]
diff --git a/src/parser/actions/export.rs b/src/parser/actions/export.rs
index f43d8e3be..314fb34c5 100644
--- a/src/parser/actions/export.rs
+++ b/src/parser/actions/export.rs
@@ -1,5 +1,3 @@
-use std::thread::{self};
-
 use log::info;
 
 use crate::{
@@ -38,27 +36,23 @@ pub fn export(
 
     exit.block();
 
-    info!("Exporting...");
-    if defragment {
-        info!("Will also defragment databases, please be patient it might take a while")
-    }
+    let text = if defragment {
+        "export and defragmentation"
+    } else {
+        "export"
+    };
+    info!("Starting {text}");
 
-    time("Total save time", || -> color_eyre::Result<()> {
-        time("Datasets saved", || datasets.export(config))?;
+    time(&format!("Finished {text}"), || -> color_eyre::Result<()> {
+        datasets.export(config)?;
 
-        thread::scope(|s| {
-            if let Some(databases) = databases {
-                s.spawn(|| {
-                    time("Databases saved", || {
-                        databases.export(height, date, defragment)
-                    })
-                });
-            }
+        if let Some(databases) = databases {
+            databases.export(height, date, defragment)?;
+        }
 
-            if let Some(states) = states {
-                s.spawn(|| time("States saved", || states.export(config)));
-            }
-        });
+        if let Some(states) = states {
+            states.export(config)?;
+        }
 
         Ok(())
     })?;
diff --git a/src/parser/actions/iter_blocks.rs b/src/parser/actions/iter_blocks.rs
index fcd41d254..1e1963fdc 100644
--- a/src/parser/actions/iter_blocks.rs
+++ b/src/parser/actions/iter_blocks.rs
@@ -15,7 +15,7 @@ use crate::{
         datasets::{ComputeData, Datasets},
         states::{AddressCohortsDurableStates, States, UTXOCohortsDurableStates},
     },
-    structs::{Config, DateData, Exit, Height, MapKey, Timestamp},
+    structs::{Config, DateData, DisplayInstant, Exit, Height, MapKey, Timestamp},
     utils::{generate_allocation_files, time},
 };
 
@@ -52,8 +52,6 @@ pub fn iter_blocks(
     let mut block_iter = block_receiver.iter();
 
     'parsing: loop {
-        let instant = Instant::now();
-
         let mut processed_heights = BTreeSet::new();
         let mut processed_dates = BTreeSet::new();
 
@@ -64,6 +62,8 @@ pub fn iter_blocks(
                 blocks_loop_date.take();
             }
 
+            let instant = Instant::now();
+
             'blocks: loop {
                 let current_block_opt = next_block_opt.take().or_else(|| block_iter.next());
 
@@ -88,8 +88,6 @@ pub fn iter_blocks(
 
                     // Always run for the first block of the loop
                     if blocks_loop_date.is_none() {
-                        info!("Processing {current_block_date} (height: {height})...");
-
                         blocks_loop_date.replace(current_block_date);
 
                         if states
@@ -164,15 +162,18 @@ pub fn iter_blocks(
                     blocks_loop_i += 1;
 
                     if is_date_last_block {
+                        info!(
+                            "Processed {current_block_date} ({height} - {current_block_height}) {}",
+                            instant.display()
+                        );
+
                         height += blocks_loop_i;
 
                         let is_check_point = next_date_opt
                             .as_ref()
                             .map_or(true, |date| date.is_first_of_month());
 
-                        let ran_for_at_least_a_minute = instant.elapsed().as_secs() >= 60;
-
-                        if (is_check_point && ran_for_at_least_a_minute)
+                        if (is_check_point && instant.elapsed().as_secs() >= 2)
                             || height.is_close_to_end(approx_block_count)
                         {
                             break 'days;
@@ -189,11 +190,6 @@ pub fn iter_blocks(
         // Don't remember why -1
         let last_height = height - 1_u32;
 
-        info!(
-            "Parsing group took {} seconds (last height: {last_height})",
-            instant.elapsed().as_secs_f32(),
-        );
-
         if first_unsafe_heights.computed <= last_height {
             info!("Computing datasets...");
             time("Computing datasets", || {
@@ -214,7 +210,7 @@ pub fn iter_blocks(
             let defragment = is_safe
                 && next_date_opt.is_some_and(|date| {
                     (date.year() >= 2020 && date.is_january()
-                        || date.year() >= 2022 && date.is_june())
+                        || date.year() >= 2022 && date.is_july())
                         && date.is_first_of_month()
                 });
 
@@ -237,8 +233,6 @@ pub fn iter_blocks(
         } else {
             info!("Skipping export");
         }
-
-        println!();
     }
 
     Ok(())
diff --git a/src/parser/actions/min_height.rs b/src/parser/actions/min_height.rs
index eb767c08b..7166bdbb4 100644
--- a/src/parser/actions/min_height.rs
+++ b/src/parser/actions/min_height.rs
@@ -123,6 +123,8 @@ pub fn find_first_inserted_unsafe_height(
             //     panic!("");
             // }
 
+            if true {panic!()}
+
             states.reset(config, include_addresses);
 
             databases.reset(include_addresses);
diff --git a/src/parser/databases/address_index_to_address_data.rs b/src/parser/databases/address_index_to_address_data.rs
index a56137b7f..fdcb09205 100644
--- a/src/parser/databases/address_index_to_address_data.rs
+++ b/src/parser/databases/address_index_to_address_data.rs
@@ -13,7 +13,6 @@ use snkrj::{AnyDatabase, Database as _Database};
 use crate::{
     parser::states::AddressCohortsDurableStates,
     structs::{AddressData, Config},
-    utils::time,
 };
 
 use super::{AnyDatabaseGroup, Metadata};
@@ -91,24 +90,24 @@ impl AddressIndexToAddressData {
     }
 
     pub fn compute_addres_cohorts_durable_states(&mut self) -> AddressCohortsDurableStates {
-        time("Iter through address_index_to_address_data", || {
-            self.open_all();
+        // time("Iter through address_index_to_address_data", || {
+        self.open_all();
 
-            // MUST CLEAR MAP, otherwise some weird things are happening later in the export I think
-            mem::take(&mut self.map)
-                .par_iter()
-                .map(|(_, database)| {
-                    let mut s = AddressCohortsDurableStates::default();
+        // MUST CLEAR MAP, otherwise some weird things are happening later in the export I think
+        mem::take(&mut self.map)
+            .par_iter()
+            .map(|(_, database)| {
+                let mut s = AddressCohortsDurableStates::default();
 
-                    database
-                        .iter_disk()
-                        .map(|r| r.unwrap().1)
-                        .for_each(|address_data| s.increment(address_data).unwrap());
+                database
+                    .iter_disk()
+                    .map(|r| r.unwrap().1)
+                    .for_each(|address_data| s.increment(address_data).unwrap());
 
-                    s
-                })
-                .sum()
-        })
+                s
+            })
+            .sum()
+        // })
     }
 
     fn db_index(key: &Key) -> usize {
diff --git a/src/parser/datasets/_traits/min_initial_state.rs b/src/parser/datasets/_traits/min_initial_state.rs
index db747aea8..2fdfad411 100644
--- a/src/parser/datasets/_traits/min_initial_state.rs
+++ b/src/parser/datasets/_traits/min_initial_state.rs
@@ -45,13 +45,6 @@ enum Mode {
 }
 
 impl MinInitialState {
-    // pub fn consume(&mut self, other: Self) {
-    //     self.first_unsafe_date = other.first_unsafe_date;
-    //     self.first_unsafe_height = other.first_unsafe_height;
-    //     self.last_date = other.last_date;
-    //     self.last_height = other.last_height;
-    // }
-
     fn compute_from_datasets(datasets: &dyn AnyDatasets, mode: Mode, config: &Config) -> Self {
         match mode {
             Mode::Inserted => {
diff --git a/src/parser/states/_trait.rs b/src/parser/states/_trait.rs
index b8b400cc3..c07277890 100644
--- a/src/parser/states/_trait.rs
+++ b/src/parser/states/_trait.rs
@@ -9,7 +9,6 @@ use serde::{de::DeserializeOwned, Serialize};
 
 use crate::{io::Serialization, structs::Config};
 
-// https://github.com/djkoloski/rust_serialization_benchmark
 pub trait AnyState
 where
     Self: Debug + Encode + Decode + Serialize + DeserializeOwned,
@@ -26,9 +25,7 @@ where
     }
 
     fn import(config: &Config) -> color_eyre::Result<Self> {
-        let path = Self::path(config);
-        fs::create_dir_all(&path)?;
-        Serialization::Binary.import(&path)
+        Serialization::Binary.import(&Self::path(config))
     }
 
     fn export(&self, config: &Config) -> color_eyre::Result<()> {
diff --git a/src/parser/states/mod.rs b/src/parser/states/mod.rs
index f67cec892..1558b0005 100644
--- a/src/parser/states/mod.rs
+++ b/src/parser/states/mod.rs
@@ -1,4 +1,4 @@
-use std::thread;
+use std::{fs, thread};
 
 mod _trait;
 mod cohorts_states;
@@ -25,6 +25,8 @@ pub struct States {
 
 impl States {
     pub fn import(config: &Config) -> color_eyre::Result<Self> {
+        fs::create_dir_all(config.path_states())?;
+
         let date_data_vec = DateDataVec::import(config)?;
 
         let address_counters = Counters::import(config)?;
diff --git a/src/server/api/structs/routes.rs b/src/server/api/structs/routes.rs
index 8a5caf4bc..0afbd3b0c 100644
--- a/src/server/api/structs/routes.rs
+++ b/src/server/api/structs/routes.rs
@@ -1,5 +1,6 @@
 use std::{
     collections::{BTreeMap, HashMap},
+    fs,
     path::PathBuf,
 };
 
@@ -31,17 +32,30 @@ impl Routes {
     pub fn build(paths_to_type: BTreeMap<PathBuf, String>, config: &Config) -> Self {
         let mut routes = Routes::default();
 
-        paths_to_type.into_iter().for_each(|(file_path, value)| {
-            let serialization =
-                Serialization::try_from(&file_path).unwrap_or(Serialization::Binary);
+        paths_to_type.into_iter().for_each(|(path, value)| {
+            let try_from_path = if path.is_file() {
+                path.clone()
+            } else {
+                fs::read_dir(&path)
+                    .unwrap_or_else(|_| {
+                        dbg!(&path);
+                        panic!();
+                    })
+                    .map(|e| e.unwrap().path())
+                    .find(|e| e.is_file())
+                    .unwrap()
+            };
 
-            let file_path_ser = file_path.to_str().unwrap().to_owned();
+            let serialization =
+                Serialization::try_from(&try_from_path).unwrap_or(Serialization::Binary);
+
+            let file_path_ser = path.to_str().unwrap().to_owned();
             let split_key = file_path_ser.replace(
                 &format!("{}/", config.path_datasets().to_str().unwrap()),
                 "",
             );
             let split_key =
-                split_key.replace(&format!("{}/", config.path_price().to_str().unwrap()), "");
+                split_key.replace(&format!("{}/", config.path_kibodir().to_str().unwrap()), "");
             let mut split_key = split_key.split('/').collect_vec();
             let last = split_key.pop().unwrap().to_owned();
             let last = last.split('.').next().unwrap();
@@ -63,7 +77,7 @@ impl Routes {
                         map_key,
                         Route {
                             url_path: format!("date-to-{url_path}"),
-                            file_path,
+                            file_path: path,
                             values_type,
                             serialization,
                         },
@@ -74,7 +88,7 @@ impl Routes {
                         map_key,
                         Route {
                             url_path: format!("height-to-{url_path}"),
-                            file_path,
+                            file_path: path,
                             values_type,
                             serialization,
                         },
@@ -85,14 +99,14 @@ impl Routes {
                         map_key,
                         Route {
                             url_path,
-                            file_path,
+                            file_path: path,
                             values_type,
                             serialization,
                         },
                     );
                 }
                 _ => {
-                    dbg!(&file_path, value, &last, &split_key);
+                    dbg!(&path, value, &last, &split_key);
                     panic!("")
                 }
             }
diff --git a/src/structs/bi_map.rs b/src/structs/bi_map.rs
index 87030f5b9..733c06846 100644
--- a/src/structs/bi_map.rs
+++ b/src/structs/bi_map.rs
@@ -11,7 +11,7 @@ use super::{
     AnyDateMap, AnyHeightMap, AnyMap, Date, DateMap, Height, HeightMap, MapKind, MapPath, MapValue,
 };
 
-#[derive(Allocative)]
+#[derive(Allocative, Debug)]
 pub struct BiMap<Value>
 where
     Value: MapValue,
diff --git a/src/structs/config.rs b/src/structs/config.rs
index ed5acbedc..f10e3919c 100644
--- a/src/structs/config.rs
+++ b/src/structs/config.rs
@@ -1,5 +1,6 @@
 use std::{
     fs::{self},
+    mem,
     path::{Path, PathBuf},
 };
 
@@ -46,28 +47,30 @@ pub struct Config {
     #[arg(long, value_name = "SECONDS")]
     delay: Option<u64>,
 
-    // Maximum ram you want the program to use in GB, default: 50% of total, not saved
-    // #[arg(long, value_name = "GB")]
-    // pub max_ram: Option<f64>,
-    /// Enable or disable the parser, default: true, not saved
-    #[arg(long, value_name = "BOOL")]
-    parser: Option<bool>,
+    /// Disable the parser, not saved
+    #[serde(default)]
+    #[arg(long, default_value_t = false)]
+    no_parser: bool,
 
-    /// Enable or disable the server, default: true, not saved
-    #[arg(long, value_name = "BOOL")]
-    server: Option<bool>,
+    /// Disable the server, not saved
+    #[serde(default)]
+    #[arg(long, default_value_t = false)]
+    no_server: bool,
 
-    /// Start a dry run, default: true, not saved
-    #[arg(long, value_name = "BOOL")]
-    dry_run: Option<bool>,
+    /// Run without saving, not saved
+    #[serde(default)]
+    #[arg(long, default_value_t = false)]
+    dry_run: bool,
 
-    /// Record ram usage, default: false, not saved
-    #[arg(long, value_name = "BOOL")]
-    record_ram_usage: Option<bool>,
+    /// Record ram usage, not saved
+    #[serde(default)]
+    #[arg(long, default_value_t = false)]
+    record_ram_usage: bool,
 
-    /// Recompute all computed datasets, default: false, not saved
-    #[arg(long, value_name = "BOOL")]
-    recompute_computed: Option<bool>,
+    /// Recompute all computed datasets, not saved
+    #[serde(default)]
+    #[arg(long, default_value_t = false)]
+    recompute_computed: bool,
 }
 
 impl Config {
@@ -125,11 +128,11 @@ impl Config {
 
         config.write(&path)?;
 
-        config.parser = config_args.parser.take();
-        config.server = config_args.server.take();
-        config.dry_run = config_args.dry_run.take();
-        config.record_ram_usage = config_args.record_ram_usage.take();
-        config.recompute_computed = config_args.recompute_computed.take();
+        config.no_parser = mem::take(&mut config_args.no_parser);
+        config.no_server = mem::take(&mut config_args.no_server);
+        config.dry_run = mem::take(&mut config_args.dry_run);
+        config.record_ram_usage = mem::take(&mut config_args.record_ram_usage);
+        config.recompute_computed = mem::take(&mut config_args.recompute_computed);
 
         info!("Configuration {{");
         info!("  bitcoindir: {:?}", config.bitcoindir);
@@ -233,22 +236,22 @@ impl Config {
     }
 
     pub fn dry_run(&self) -> bool {
-        self.dry_run.is_some_and(|b| b)
+        self.dry_run
     }
 
     pub fn record_ram_usage(&self) -> bool {
-        self.record_ram_usage.is_some_and(|b| b)
+        self.record_ram_usage
     }
 
     pub fn recompute_computed(&self) -> bool {
-        self.recompute_computed.is_some_and(|b| b)
+        self.recompute_computed
     }
 
     pub fn path_bitcoindir(&self) -> PathBuf {
         Self::fix_user_path(self.bitcoindir.as_ref().unwrap().as_ref())
     }
 
-    fn path_kibodir(&self) -> PathBuf {
+    pub fn path_kibodir(&self) -> PathBuf {
         Self::fix_user_path(self.kibodir.as_ref().unwrap().as_ref())
     }
 
@@ -311,10 +314,10 @@ impl Config {
     }
 
     pub fn parser(&self) -> bool {
-        self.parser.is_none_or(|b| b)
+        !self.no_parser
     }
 
     pub fn server(&self) -> bool {
-        self.server.is_none_or(|b| b)
+        !self.no_server
     }
 }
diff --git a/src/structs/date.rs b/src/structs/date.rs
index da448f6bb..fd3f0f77f 100644
--- a/src/structs/date.rs
+++ b/src/structs/date.rs
@@ -74,8 +74,8 @@ impl Date {
         self.month() == 1
     }
 
-    pub fn is_june(&self) -> bool {
-        self.month() == 6
+    pub fn is_july(&self) -> bool {
+        self.month() == 7
     }
 
     pub fn is_first_of_month(&self) -> bool {
diff --git a/src/structs/instant.rs b/src/structs/instant.rs
new file mode 100644
index 000000000..9495f71eb
--- /dev/null
+++ b/src/structs/instant.rs
@@ -0,0 +1,15 @@
+use std::time::Instant;
+
+use color_eyre::owo_colors::OwoColorize;
+
+pub trait DisplayInstant {
+    fn display(&self) -> String;
+}
+
+impl DisplayInstant for Instant {
+    fn display(&self) -> String {
+        format!("{:.2}s", self.elapsed().as_secs_f32())
+            .bright_black()
+            .to_string()
+    }
+}
diff --git a/src/structs/mod.rs b/src/structs/mod.rs
index f1974120b..0a7043ce3 100644
--- a/src/structs/mod.rs
+++ b/src/structs/mod.rs
@@ -24,12 +24,14 @@ mod generic_map;
 mod height;
 mod height_map;
 mod height_map_chunk_id;
+mod instant;
 mod liquidity;
 mod map_path;
 mod map_value;
 mod ohlc;
 mod partial_txout_data;
 mod price;
+mod rpc;
 mod sent_data;
 mod serialized_btreemap;
 mod serialized_vec;
@@ -63,12 +65,14 @@ pub use generic_map::*;
 pub use height::*;
 pub use height_map::*;
 pub use height_map_chunk_id::*;
+pub use instant::*;
 pub use liquidity::*;
 pub use map_path::*;
 pub use map_value::*;
 pub use ohlc::*;
 pub use partial_txout_data::*;
 pub use price::*;
+pub use rpc::*;
 pub use sent_data::*;
 pub use serialized_btreemap::*;
 pub use serialized_vec::*;
diff --git a/src/structs/rpc.rs b/src/structs/rpc.rs
new file mode 100644
index 000000000..f7aac8916
--- /dev/null
+++ b/src/structs/rpc.rs
@@ -0,0 +1,17 @@
+use biter::bitcoincore_rpc::Client;
+
+use crate::structs::Config;
+
+impl From<&Config> for Client {
+    fn from(config: &Config) -> Self {
+        Client::new(
+            &format!(
+                "http://{}:{}",
+                config.rpcconnect().unwrap_or(&"localhost".to_owned()),
+                config.rpcport().unwrap_or(8332)
+            ),
+            config.to_rpc_auth().unwrap(),
+        )
+        .unwrap()
+    }
+}
diff --git a/src/utils/mod.rs b/src/utils/mod.rs
index 0ed6755e9..59742bfe6 100644
--- a/src/utils/mod.rs
+++ b/src/utils/mod.rs
@@ -4,7 +4,6 @@ mod log;
 mod lossy;
 mod percentile;
 mod retry;
-mod rpc;
 mod time;
 
 pub use consts::*;
diff --git a/src/utils/rpc.rs b/src/utils/rpc.rs
deleted file mode 100644
index 398989639..000000000
--- a/src/utils/rpc.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-use biter::bitcoincore_rpc::Client;
-
-use crate::structs::Config;
-
-impl From<&Config> for Client {
-    fn from(config: &Config) -> Self {
-        create_rpc(config).unwrap()
-    }
-}
-
-fn create_rpc(config: &Config) -> color_eyre::Result<Client> {
-    Ok(Client::new(
-        &format!(
-            "http://{}:{}",
-            config.rpcconnect().unwrap_or(&"localhost".to_owned()),
-            config.rpcport().unwrap_or(8332)
-        ),
-        config.to_rpc_auth().unwrap(),
-    )?)
-}
diff --git a/src/utils/time.rs b/src/utils/time.rs
index f0001216d..2c6df6103 100644
--- a/src/utils/time.rs
+++ b/src/utils/time.rs
@@ -2,7 +2,9 @@ use std::time::Instant;
 
 use log::info;
 
-pub fn time<F, T>(name: &str, function: F) -> T
+use crate::structs::DisplayInstant;
+
+pub fn time<F, T>(text: &str, function: F) -> T
 where
     F: FnOnce() -> T,
 {
@@ -10,7 +12,7 @@ where
 
     let returned = function();
 
-    info!("{name}: {} seconds", time.elapsed().as_secs_f32());
+    info!("{text} {}", time.display());
 
     returned
 }
diff --git a/src/website/index.html b/src/website/index.html
index 93166e466..a48b547c3 100644
--- a/src/website/index.html
+++ b/src/website/index.html
@@ -1518,6 +1518,7 @@
               "
               >希望</small
             >
+            希望.お金
           </a>
           <small style="display: block">
             <strong>Bitcoin</strong> is
diff --git a/src/website/scripts/main.js b/src/website/scripts/main.js
index 9e3f3d7b7..17edce5b5 100644
--- a/src/website/scripts/main.js
+++ b/src/website/scripts/main.js
@@ -1311,10 +1311,10 @@ function initFrameSelectors() {
   function setAsideParent() {
     const { clientWidth } = window.document.documentElement;
     const { aside, body, main } = elements;
-    if (clientWidth >= consts.MEDIUM_WIDTH && aside.parentElement !== body) {
-      body.append(aside);
-    } else if (aside.parentElement !== main) {
-      main.append(aside);
+    if (clientWidth >= consts.MEDIUM_WIDTH) {
+      aside.parentElement !== body && body.append(aside);
+    } else {
+      aside.parentElement !== main && main.append(aside);
     }
   }
 
diff --git a/src/website/scripts/options.js b/src/website/scripts/options.js
index 983f05e97..6d0c35637 100644
--- a/src/website/scripts/options.js
+++ b/src/website/scripts/options.js
@@ -1501,28 +1501,23 @@ function createPartialOptions(colors) {
       name: "Market",
       tree: [
         {
-          name: "Price",
-          tree: [
+          scale,
+          name: "Dollars Per Bitcoin",
+          title: "Dollars Per Bitcoin",
+          description: "",
+          unit: "US Dollars",
+        },
+        {
+          scale,
+          name: "Satoshis Per Dollar",
+          title: "Satoshis Per Dollar",
+          description: "",
+          unit: "Satoshis",
+          bottom: [
             {
-              scale,
-              name: "Dollars Per Bitcoin",
-              title: "Dollars Per Bitcoin",
-              description: "",
-              unit: "US Dollars",
-            },
-            {
-              scale,
-              name: "Sats Per Dollar",
-              title: "Satoshis Per Dollar",
-              description: "",
-              unit: "Satoshis",
-              bottom: [
-                {
-                  title: "Sats",
-                  datasetPath: `${scale}-to-sats-per-dollar`,
-                  color: colors.bitcoin,
-                },
-              ],
+              title: "Satoshis",
+              datasetPath: `${scale}-to-sats-per-dollar`,
+              color: colors.bitcoin,
             },
           ],
         },
@@ -5128,18 +5123,9 @@ function createPartialOptions(colors) {
       url: () => window.location.href,
     },
     {
-      name: "Socials",
-      tree: [
-        {
-          name: "Bluesky",
-          url: () => "https://bsky.app/profile/kibo.money",
-        },
-        {
-          name: "Nostr",
-          url: () =>
-            "https://primal.net/p/npub1jagmm3x39lmwfnrtvxcs9ac7g300y3dusv9lgzhk2e4x5frpxlrqa73v44",
-        },
-      ],
+      name: "Social",
+      url: () =>
+        "https://primal.net/p/npub1jagmm3x39lmwfnrtvxcs9ac7g300y3dusv9lgzhk2e4x5frpxlrqa73v44",
     },
     {
       name: "Developers",

From 9dd87a48a693b89014b3f3cd6e43bdedc30c9ac1 Mon Sep 17 00:00:00 2001
From: nym21 <expat-epochs0i@icloud.com>
Date: Sun, 22 Dec 2024 00:42:11 +0100
Subject: [PATCH 09/63] server: rework api side

---
 README.md                                     |   3 +
 src/main.rs                                   |  15 +-
 src/parser/actions/export.rs                  |  10 +-
 src/parser/actions/iter_blocks.rs             |   6 +-
 src/parser/actions/min_height.rs              |   7 -
 src/parser/databases/mod.rs                   |   9 +-
 src/parser/databases/txid_to_tx_data.rs       |   2 +-
 .../datasets/_traits/min_initial_state.rs     |   4 +
 src/parser/datasets/mod.rs                    |  82 ++--
 src/parser/datasets/subs/recap.rs             |   4 +-
 src/parser/mod.rs                             |  11 +-
 src/server/api/handlers/dataset.rs            | 370 ++++++++++--------
 src/server/api/handlers/fallback.rs           |  19 -
 src/server/api/handlers/last_values.rs        |  13 +
 src/server/api/handlers/mod.rs                |   7 +-
 src/server/api/handlers/response.rs           | 167 --------
 src/server/api/mod.rs                         |   7 +-
 .../structs/{chunk.rs => chunk_metadata.rs}   |   2 +-
 .../api/{handlers => structs}/extension.rs    |   9 -
 src/server/api/structs/kind.rs                |  55 ++-
 src/server/api/structs/mod.rs                 |  12 +-
 src/server/api/structs/paths.rs               |   9 -
 src/server/api/structs/range.rs               |  32 ++
 src/server/api/structs/route.rs               |  33 ++
 src/server/api/structs/routes.rs              | 173 ++------
 src/server/header_map.rs                      |   1 +
 src/server/mod.rs                             |  33 +-
 src/server/website/handlers/file.rs           |   6 +-
 src/structs/any_map.rs                        |  30 +-
 src/structs/config.rs                         |   8 +-
 src/structs/date_map.rs                       |   4 +-
 src/structs/date_map_chunk_id.rs              |  10 +-
 src/structs/generic_map.rs                    |  63 ++-
 src/structs/height_map_chunk_id.rs            |  12 +-
 src/structs/map_value.rs                      |   3 +-
 src/structs/mod.rs                            |   1 -
 src/structs/ohlc.rs                           |  12 +
 src/structs/serialized_btreemap.rs            |  67 ++--
 src/structs/serialized_vec.rs                 |  60 +--
 src/structs/timestamp.rs                      |   8 +-
 40 files changed, 633 insertions(+), 746 deletions(-)
 delete mode 100644 src/server/api/handlers/fallback.rs
 create mode 100644 src/server/api/handlers/last_values.rs
 delete mode 100644 src/server/api/handlers/response.rs
 rename src/server/api/structs/{chunk.rs => chunk_metadata.rs} (85%)
 rename src/server/api/{handlers => structs}/extension.rs (76%)
 delete mode 100644 src/server/api/structs/paths.rs
 create mode 100644 src/server/api/structs/range.rs
 create mode 100644 src/server/api/structs/route.rs

diff --git a/README.md b/README.md
index d364690a2..b7cfd1067 100644
--- a/README.md
+++ b/README.md
@@ -74,6 +74,9 @@ Please open an issue if you want to add another instance
 - Git
 - Unix based operating system (Mac OS or Linux)
   - Ubuntu users need to install `open-ssl` via `sudo apt install libssl-dev pkg-config`
+  - Mac OS:
+    - Disable Spotlight or exclude the `--kibodir` folder from it
+    - Don't use Time Machine or exclude the `--kibodir` folder (especially needed for local snapshots)
 
 ### Build
 
diff --git a/src/main.rs b/src/main.rs
index 97bdef558..999e045f6 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -8,7 +8,8 @@ mod server;
 mod structs;
 mod utils;
 
-use parser::{Databases, Datasets};
+use parser::Datasets;
+use server::api::structs::Routes;
 use structs::{Config, Exit};
 use utils::init_log;
 
@@ -31,31 +32,27 @@ fn main() -> color_eyre::Result<()> {
 
             let rpc = Client::from(&config);
 
-            let databases = Databases::import(&config);
-
-            let datasets = Datasets::import(&config)?;
-
-            let paths_to_type = datasets.get_paths_to_type(&config);
+            let routes = Routes::build(&Datasets::import(&config)?, &config);
 
             tokio::runtime::Builder::new_multi_thread()
                 .enable_all()
                 .build()
                 .unwrap()
                 .block_on(async {
-                    let config_clone = config.clone();
                     let run_parser = config.parser();
                     let run_server = config.server();
 
+                    let config_clone = config.clone();
                     let handle = tokio::spawn(async move {
                         if run_server {
-                            server::main(paths_to_type, &config_clone).await.unwrap();
+                            server::main(routes, config_clone).await.unwrap();
                         } else {
                             info!("Skipping server");
                         }
                     });
 
                     if run_parser {
-                        parser::main(&config, &rpc, &exit, databases, datasets)?;
+                        parser::main(&config, &rpc, &exit)?;
                     } else {
                         info!("Skipping parser");
                     }
diff --git a/src/parser/actions/export.rs b/src/parser/actions/export.rs
index 314fb34c5..5a82e71a3 100644
--- a/src/parser/actions/export.rs
+++ b/src/parser/actions/export.rs
@@ -37,14 +37,14 @@ pub fn export(
     exit.block();
 
     let text = if defragment {
-        "export and defragmentation"
+        "Exporting and defragmenting..."
     } else {
-        "export"
+        "Exporting..."
     };
-    info!("Starting {text}");
+    info!("{text}");
 
-    time(&format!("Finished {text}"), || -> color_eyre::Result<()> {
-        datasets.export(config)?;
+    time("Finished export", || -> color_eyre::Result<()> {
+        datasets.export(config, height)?;
 
         if let Some(databases) = databases {
             databases.export(height, date, defragment)?;
diff --git a/src/parser/actions/iter_blocks.rs b/src/parser/actions/iter_blocks.rs
index 1e1963fdc..909a37ac9 100644
--- a/src/parser/actions/iter_blocks.rs
+++ b/src/parser/actions/iter_blocks.rs
@@ -173,7 +173,7 @@ pub fn iter_blocks(
                             .as_ref()
                             .map_or(true, |date| date.is_first_of_month());
 
-                        if (is_check_point && instant.elapsed().as_secs() >= 2)
+                        if (is_check_point && instant.elapsed().as_secs() >= 1)
                             || height.is_close_to_end(approx_block_count)
                         {
                             break 'days;
@@ -192,7 +192,7 @@ pub fn iter_blocks(
 
         if first_unsafe_heights.computed <= last_height {
             info!("Computing datasets...");
-            time("Computing datasets", || {
+            time("Computed datasets", || {
                 let dates = processed_dates.into_iter().collect_vec();
 
                 let heights = processed_heights.into_iter().collect_vec();
@@ -226,7 +226,7 @@ pub fn iter_blocks(
             })?;
 
             if config.record_ram_usage() {
-                time("Exporing allocation files", || {
+                time("Exporting allocation files", || {
                     generate_allocation_files(datasets, databases, &states, last_height)
                 })?;
             }
diff --git a/src/parser/actions/min_height.rs b/src/parser/actions/min_height.rs
index 7166bdbb4..e71b6ae50 100644
--- a/src/parser/actions/min_height.rs
+++ b/src/parser/actions/min_height.rs
@@ -118,13 +118,6 @@ pub fn find_first_inserted_unsafe_height(
                 || min_initial_inserted_last_address_date.is_none()
                 || min_initial_inserted_last_address_height.is_none();
 
-            // if include_addresses {
-            //     dbg!(include_addresses);
-            //     panic!("");
-            // }
-
-            if true {panic!()}
-
             states.reset(config, include_addresses);
 
             databases.reset(include_addresses);
diff --git a/src/parser/databases/mod.rs b/src/parser/databases/mod.rs
index 3370d914a..413790404 100644
--- a/src/parser/databases/mod.rs
+++ b/src/parser/databases/mod.rs
@@ -131,8 +131,8 @@ impl Databases {
 
     pub fn check_if_usable(
         &self,
-        min_initial_last_address_height: Option<Height>,
-        min_initial_last_address_date: Option<Date>,
+        last_address_height: Option<Height>,
+        last_address_date: Option<Date>,
     ) -> bool {
         let are_tx_databases_in_sync = self
             .txout_index_to_amount
@@ -169,8 +169,7 @@ impl Databases {
             return false;
         }
 
-        // let are_address_datasets_farer_or_in_sync_with_address_databases =
-        min_initial_last_address_height >= self.address_to_address_index.metadata.last_height
-            && min_initial_last_address_date >= self.address_to_address_index.metadata.last_date
+        last_address_height >= self.address_to_address_index.metadata.last_height
+            && last_address_date >= self.address_to_address_index.metadata.last_date
     }
 }
diff --git a/src/parser/databases/txid_to_tx_data.rs b/src/parser/databases/txid_to_tx_data.rs
index 399c760d9..59717614c 100644
--- a/src/parser/databases/txid_to_tx_data.rs
+++ b/src/parser/databases/txid_to_tx_data.rs
@@ -84,7 +84,7 @@ impl TxidToTxData {
     }
 
     #[inline(always)]
-    pub fn _open_db(&mut self, db_index: u16) -> &mut Database {
+    fn _open_db(&mut self, db_index: u16) -> &mut Database {
         let path = self.path.to_owned();
         self.map.entry(db_index).or_insert_with(|| {
             let path = path.join(db_index.to_string());
diff --git a/src/parser/datasets/_traits/min_initial_state.rs b/src/parser/datasets/_traits/min_initial_state.rs
index 2fdfad411..d89674eb7 100644
--- a/src/parser/datasets/_traits/min_initial_state.rs
+++ b/src/parser/datasets/_traits/min_initial_state.rs
@@ -29,6 +29,10 @@ impl MinInitialStates {
             computed: MinInitialState::compute_from_datasets(datasets, Mode::Computed, config),
         }
     }
+
+    pub fn min_last_height(&self) -> Option<Height> {
+        self.computed.last_height.min(self.inserted.last_height)
+    }
 }
 
 #[derive(Default, Debug, Clone, Copy, Allocative)]
diff --git a/src/parser/datasets/mod.rs b/src/parser/datasets/mod.rs
index bc4edc899..e8b797b18 100644
--- a/src/parser/datasets/mod.rs
+++ b/src/parser/datasets/mod.rs
@@ -1,4 +1,4 @@
-use std::{collections::BTreeMap, ops::RangeInclusive, path::PathBuf};
+use std::{collections::BTreeMap, ops::RangeInclusive};
 
 use allocative::Allocative;
 
@@ -139,14 +139,18 @@ impl Datasets {
             utxo,
         };
 
-        s.min_initial_states
-            .consume(MinInitialStates::compute_from_datasets(&s, config));
+        s.set_initial_states(config);
 
         info!("Imported datasets");
 
         Ok(s)
     }
 
+    fn set_initial_states(&mut self, config: &Config) {
+        self.min_initial_states
+            .consume(MinInitialStates::compute_from_datasets(self, config));
+    }
+
     pub fn insert(&mut self, insert_data: InsertData) {
         if insert_data.compute_addresses {
             self.address.insert(&insert_data);
@@ -228,21 +232,6 @@ impl Datasets {
             &mut self.price.market_cap,
         );
 
-        // No compute needed for now
-        // if self.block_metadata.should_compute(height, date) {
-        //     self.block_metadata.compute(&compute_data);
-        // }
-
-        // No compute needed for now
-        // if self.date_metadata.should_compute(height, date) {
-        //     self.date_metadata.compute(&compute_data);
-        // }
-
-        // No compute needed for now
-        // if self.coindays.should_compute(height, date) {
-        //     self.coindays.compute(&compute_data);
-        // }
-
         if self.transaction.should_compute(&compute_data) {
             self.transaction.compute(
                 &compute_data,
@@ -268,23 +257,12 @@ impl Datasets {
         }
     }
 
-    pub fn get_paths_to_type(&self, config: &Config) -> BTreeMap<PathBuf, String> {
-        let mut path_to_type: BTreeMap<PathBuf, String> = self
-            .to_any_dataset_vec()
-            .into_iter()
-            .flat_map(|dataset| dataset.to_all_map_vec())
-            .flat_map(|map| map.get_paths_to_type())
-            .collect();
+    pub fn export(&mut self, config: &Config, height: Height) -> color_eyre::Result<()> {
+        let is_new = self
+            .min_initial_states
+            .min_last_height()
+            .map_or(true, |last| last <= height);
 
-        path_to_type.insert(
-            config.path_datasets_last_values().unwrap().to_owned(),
-            "Value".to_string(),
-        );
-
-        path_to_type
-    }
-
-    pub fn export(&mut self, config: &Config) -> color_eyre::Result<()> {
         self.to_mut_any_dataset_vec()
             .into_iter()
             .for_each(|dataset| dataset.pre_export());
@@ -295,37 +273,27 @@ impl Datasets {
 
         let mut path_to_last: BTreeMap<String, Value> = BTreeMap::default();
 
-        let path_dataset = config.path_datasets();
-        let path_dataset_ser = path_dataset.to_str().unwrap();
-        let path_price = config.path_price();
-        let path_price_ser = path_price.to_str().unwrap();
-
         self.to_mut_any_dataset_vec()
             .into_iter()
             .for_each(|dataset| {
                 dataset.post_export();
 
-                dataset.to_all_map_vec().iter().for_each(|map| {
-                    if let Some(last_path) = map.path_last() {
-                        if let Some(last_value) = map.last_value() {
-                            let mut last_path = last_path.clone();
-                            last_path.pop();
-                            let key = last_path
-                                .to_str()
-                                .unwrap()
-                                .replace(path_dataset_ser, "")
-                                .replace(path_price_ser, "")
-                                .split("/")
-                                .join("-")
-                                .to_string();
-
-                            path_to_last.insert(key, last_value);
+                if is_new {
+                    dataset.to_all_map_vec().iter().for_each(|map| {
+                        if map.path_last().is_some() {
+                            if let Some(last_value) = map.last_value() {
+                                path_to_last.insert(map.id(config), last_value);
+                            }
                         }
-                    }
-                });
+                    });
+                }
             });
 
-        Json::export(&config.path_datasets_last_values(), &path_to_last)?;
+        if is_new {
+            Json::export(&config.path_datasets_last_values(), &path_to_last)?;
+        }
+
+        self.set_initial_states(config);
 
         Ok(())
     }
diff --git a/src/parser/datasets/subs/recap.rs b/src/parser/datasets/subs/recap.rs
index e02277c1e..7dac8d9d3 100644
--- a/src/parser/datasets/subs/recap.rs
+++ b/src/parser/datasets/subs/recap.rs
@@ -5,12 +5,12 @@ use allocative::Allocative;
 use crate::{
     structs::{
         Date, DateMapChunkId, GenericMap, MapChunkId, MapKey, MapKind, MapPath, MapSerialized,
-        MapValue, SerializedBTreeMap,
+        MapValue, SerializedDateMap,
     },
     utils::{get_percentile, LossyFrom},
 };
 
-pub type DateRecapDataset<T> = RecapDataset<Date, T, DateMapChunkId, SerializedBTreeMap<Date, T>>;
+pub type DateRecapDataset<T> = RecapDataset<Date, T, DateMapChunkId, SerializedDateMap<T>>;
 
 #[derive(Allocative)]
 pub struct RecapDataset<Key, Value, ChunkId, Serialized> {
diff --git a/src/parser/mod.rs b/src/parser/mod.rs
index b720f435c..3379223bd 100644
--- a/src/parser/mod.rs
+++ b/src/parser/mod.rs
@@ -16,18 +16,15 @@ pub use states::*;
 
 use crate::structs::{Config, Exit};
 
-pub fn main(
-    config: &Config,
-    rpc: &Client,
-    exit: &Exit,
-    mut databases: Databases,
-    mut datasets: Datasets,
-) -> color_eyre::Result<()> {
+pub fn main(config: &Config, rpc: &Client, exit: &Exit) -> color_eyre::Result<()> {
     loop {
         let block_count = rpc.get_blockchain_info().unwrap().blocks as usize;
 
         info!("{block_count} blocks found.");
 
+        let mut databases = Databases::import(config);
+        let mut datasets = Datasets::import(config)?;
+
         iter_blocks(
             config,
             rpc,
diff --git a/src/server/api/handlers/dataset.rs b/src/server/api/handlers/dataset.rs
index c1fa63cec..e547a44dd 100644
--- a/src/server/api/handlers/dataset.rs
+++ b/src/server/api/handlers/dataset.rs
@@ -1,224 +1,274 @@
-use std::{collections::BTreeMap, path::PathBuf};
+use std::{fmt::Debug, path::PathBuf, time::Instant};
 
 use axum::{
     extract::{Path, Query, State},
     http::HeaderMap,
     response::{IntoResponse, Response},
 };
-use color_eyre::{eyre::eyre, owo_colors::OwoColorize};
+use bincode::Decode;
+use chrono::{DateTime, Utc};
+use color_eyre::eyre::{eyre, ContextCompat};
 use reqwest::StatusCode;
-use serde::Deserialize;
+use serde::{de::DeserializeOwned, Deserialize, Serialize};
 
 use crate::{
-    io::{Json, COMPRESSED_BIN_EXTENSION, JSON_EXTENSION},
     server::{
         api::{
-            structs::{Chunk, Kind, Route},
+            structs::{ChunkMetadata, DatasetRange, DatasetRangeChunk, Extension, Kind, Route},
             API_URL_PREFIX,
         },
         header_map::HeaderMapUtils,
         log_result, AppState,
     },
-    structs::{Date, DateMap, Height, HeightMap, MapChunkId, HEIGHT_MAP_CHUNK_SIZE, OHLC},
-};
-
-use super::{
-    extension::Extension,
-    response::{typed_value_to_response, value_to_response},
+    structs::{
+        Date, GenericMap, Height, MapChunkId, MapKey, MapSerialized, MapValue, SerializedDateMap,
+        SerializedVec, OHLC,
+    },
 };
 
 #[derive(Deserialize)]
-pub struct Params {
-    chunk: Option<usize>,
-    all: Option<bool>,
+pub struct DatasetParams {
+    pub chunk: Option<usize>,
+    pub all: Option<bool>,
+    pub kind: String,
 }
 
 pub async fn dataset_handler(
     headers: HeaderMap,
     path: Path<String>,
-    query: Query<Params>,
+    query: Query<DatasetParams>,
     State(app_state): State<AppState>,
 ) -> Response {
-    match _dataset_handler(headers, &path, &query, app_state) {
-        Ok(response) => {
-            log_result(
-                response.status(),
-                &format!(
-                    "{API_URL_PREFIX}/{}{}{}",
-                    path.0,
-                    query.chunk.map_or("".to_string(), |chunk| format!(
-                        "{}{chunk}",
-                        "?chunk=".bright_black()
-                    )),
-                    query.all.map_or("".to_string(), |all| format!(
-                        "{}{all}",
-                        "?all=".bright_black()
-                    ))
-                ),
-            );
+    let instant = Instant::now();
 
+    let ser_path = format!(
+        "{API_URL_PREFIX}/{}?kind={}{}{}",
+        path.0,
+        query.kind,
+        query
+            .chunk
+            .map_or("".to_string(), |chunk| format!("&chunk={chunk}")),
+        query
+            .all
+            .map_or("".to_string(), |all| format!("&all={all}"))
+    );
+
+    match result_handler(headers, &path, &query, app_state) {
+        Ok(response) => {
+            log_result(response.status(), &ser_path, instant);
             response
         }
         Err(error) => {
-            let code = StatusCode::INTERNAL_SERVER_ERROR;
-
-            log_result(code, &format!("{API_URL_PREFIX}/{}", path.0));
-
-            let mut response = (code, error.to_string()).into_response();
-
+            let mut response =
+                (StatusCode::INTERNAL_SERVER_ERROR, error.to_string()).into_response();
+            log_result(response.status(), &ser_path, instant);
             response.headers_mut().insert_cors();
-
             response
         }
     }
 }
 
-const DATE_PREFIX: &str = "date-to-";
-const HEIGHT_PREFIX: &str = "height-to-";
-
-fn _dataset_handler(
+fn result_handler(
     headers: HeaderMap,
     Path(path): &Path<String>,
-    query: &Query<Params>,
-    AppState { routes }: AppState,
+    query: &Query<DatasetParams>,
+    AppState { routes, .. }: AppState,
 ) -> color_eyre::Result<Response> {
-    if query.chunk.is_some() && query.all.is_some() {
-        return Err(eyre!("chunk and all are exclusive"));
-    }
-
-    let (kind, id, route) = if path.starts_with(DATE_PREFIX) {
-        let id = convert_path_to_id(path.strip_prefix(DATE_PREFIX).unwrap());
-        let route = routes.date.get(&id);
-        (Kind::Date, id, route)
-    } else if path.starts_with(HEIGHT_PREFIX) {
-        let id = convert_path_to_id(path.strip_prefix(HEIGHT_PREFIX).unwrap());
-        let route = routes.height.get(&id);
-        (Kind::Height, id, route)
-    } else {
-        let id = convert_path_to_id(path);
-        let route = routes.last.get(&id);
-        (Kind::Last, id, route)
-    };
+    let path_buf = PathBuf::from(&path);
+    let id = path_buf.file_stem().unwrap().to_str().unwrap();
+    let ext = Extension::from(&path_buf);
 
+    let route = routes.get(id);
     if route.is_none() {
-        return Err(eyre!("Path error"));
+        return Err(eyre!("Wrong path"));
     }
+    let route = route.unwrap();
 
-    let mut route = route.unwrap().to_owned();
-
-    let mut chunk = None;
-
-    if query.all.map_or(true, |b| !b) {
-        match kind {
-            Kind::Date => {
-                let datasets = DateMap::<usize>::_read_dir(&route.file_path, &route.serialization);
-
-                process_datasets(&headers, kind, &mut chunk, &mut route, query, datasets)?;
-            }
-            Kind::Height => {
-                let datasets =
-                    HeightMap::<usize>::_read_dir(&route.file_path, &route.serialization);
-
-                process_datasets(&headers, kind, &mut chunk, &mut route, query, datasets)?;
-            }
-            Kind::Last => {
-                if !route.values_type.ends_with("Value") {
-                    route.file_path.set_extension(COMPRESSED_BIN_EXTENSION);
-                } else {
-                    route.file_path.set_extension(JSON_EXTENSION);
-                }
-            }
-        }
-    }
-
-    let (date, response) = headers.check_if_modified_since(&route.file_path)?;
-
-    if let Some(response) = response {
-        return Ok(response);
-    }
-
-    let type_name = route.values_type.split("::").last().unwrap();
-
-    let extension = Extension::from(&std::path::PathBuf::from(&path));
-
-    let mut response = match type_name {
-        "u8" => typed_value_to_response::<u8>(kind, &route, chunk, id, extension)?,
-        "u16" => typed_value_to_response::<u16>(kind, &route, chunk, id, extension)?,
-        "u32" => typed_value_to_response::<u32>(kind, &route, chunk, id, extension)?,
-        "u64" => typed_value_to_response::<u64>(kind, &route, chunk, id, extension)?,
-        "usize" => typed_value_to_response::<usize>(kind, &route, chunk, id, extension)?,
-        "f32" => typed_value_to_response::<f32>(kind, &route, chunk, id, extension)?,
-        "f64" => typed_value_to_response::<f64>(kind, &route, chunk, id, extension)?,
-        "OHLC" => typed_value_to_response::<OHLC>(kind, &route, chunk, id, extension)?,
-        "Date" => typed_value_to_response::<Date>(kind, &route, chunk, id, extension)?,
-        "Height" => typed_value_to_response::<Height>(kind, &route, chunk, id, extension)?,
-        "Value" => {
-            value_to_response::<serde_json::Value>(Json::import(&route.file_path)?, extension)
-        }
+    let type_name = route.type_name.as_str();
+    Ok(match type_name {
+        "u8" => typed_handler::<u8>(headers, id, ext, query, route)?,
+        "u16" => typed_handler::<u16>(headers, id, ext, query, route)?,
+        "u32" => typed_handler::<u32>(headers, id, ext, query, route)?,
+        "u64" => typed_handler::<u64>(headers, id, ext, query, route)?,
+        "usize" => typed_handler::<usize>(headers, id, ext, query, route)?,
+        "f32" => typed_handler::<f32>(headers, id, ext, query, route)?,
+        "f64" => typed_handler::<f64>(headers, id, ext, query, route)?,
+        "OHLC" => typed_handler::<OHLC>(headers, id, ext, query, route)?,
+        "Date" => typed_handler::<Date>(headers, id, ext, query, route)?,
+        "Height" => typed_handler::<Height>(headers, id, ext, query, route)?,
+        // "Value" => {
+        //     value_to_response::<serde_json::Value>(Json::import(&route.file_path)?, extension)
+        // }
         _ => panic!("Incompatible type: {type_name}"),
-    };
+    })
+}
 
+fn typed_handler<T>(
+    headers: HeaderMap,
+    id: &str,
+    ext: Option<Extension>,
+    query: &Query<DatasetParams>,
+    route: &Route,
+) -> color_eyre::Result<Response>
+where
+    T: Serialize + Debug + DeserializeOwned + Decode + MapValue,
+{
+    let kind = Kind::try_from(&query.kind)?;
+    if !route.list.contains(&kind) {
+        return Err(eyre!("{kind:?} not supported for this dataset"));
+    }
+
+    let range = DatasetRange::try_from(query)?;
+
+    let (mut response, date_modified) = match kind {
+        Kind::Date => map_to_response::<Date, T, _, SerializedDateMap<T>>(
+            id, headers, route, &ext, range, query,
+        ),
+        Kind::Height => map_to_response::<Height, T, _, SerializedVec<T>>(
+            id, headers, route, &ext, range, query,
+        ),
+        Kind::Last => {
+            let last_value: T = route.serialization.import(&route.path.join("last"))?;
+            return Ok(axum::response::Json(last_value).into_response());
+        }
+    }?;
+
+    let status_ok = response.status() == StatusCode::OK;
     let headers = response.headers_mut();
-    headers.insert_last_modified(date);
+
+    headers.insert_cors();
+
+    if status_ok {
+        headers.insert_last_modified(date_modified);
+    }
+
+    match ext {
+        Some(extension) => {
+            headers.insert_content_disposition_attachment();
+            match extension {
+                Extension::CSV => headers.insert_content_type_text_csv(),
+                Extension::JSON => headers.insert_content_type_application_json(),
+            }
+        }
+        _ => headers.insert_content_type_application_json(),
+    }
 
     Ok(response)
 }
 
-fn convert_path_to_id(s: &str) -> String {
-    Extension::remove_extension(s).replace('-', "_")
-}
-
-fn process_datasets<ChunkId>(
-    headers: &HeaderMap,
-    kind: Kind,
-    chunk: &mut Option<Chunk>,
-    route: &mut Route,
-    query: &Query<Params>,
-    datasets: BTreeMap<ChunkId, PathBuf>,
-) -> color_eyre::Result<()>
+fn map_to_response<Key, Value, ChunkId, Serialized>(
+    id: &str,
+    headers: HeaderMap,
+    route: &Route,
+    ext: &Option<Extension>,
+    range: DatasetRange,
+    query: &Query<DatasetParams>,
+) -> color_eyre::Result<(Response, DateTime<Utc>)>
 where
+    Key: MapKey<ChunkId>,
+    Value: MapValue,
     ChunkId: MapChunkId,
+    Serialized: MapSerialized<Key, Value, ChunkId>,
 {
-    let (last_chunk_id, _) = datasets.last_key_value().unwrap_or_else(|| {
-        dbg!(&datasets, &route);
-        panic!()
-    });
+    let folder_path = route.path.join(Key::map_name());
+    let serialization = &route.serialization;
 
-    let chunk_id = query
-        .chunk
-        .map(|id| ChunkId::from_usize(id))
-        .unwrap_or(*last_chunk_id);
+    let date_modified;
 
-    let path = datasets.get(&chunk_id);
+    let datasets =
+        GenericMap::<Key, Value, ChunkId, Serialized>::_read_dir(&folder_path, serialization);
 
-    if path.is_none() {
-        return Err(eyre!("Couldn't find chunk"));
-    }
+    let mut chunk_meta = None;
 
-    let path = path.unwrap();
-    route.file_path = path.clone();
+    let dataset = if let DatasetRange::Chunk(range_chunk) = range {
+        let chunk_id = match range_chunk {
+            DatasetRangeChunk::Last => {
+                *datasets
+                    .last_key_value()
+                    .context("Last tuple of dataset directory")?
+                    .0
+            }
+            DatasetRangeChunk::Chunk(chunk) => ChunkId::from_usize(chunk),
+        };
 
-    let offset = match kind {
-        Kind::Date => 1,
-        Kind::Height => HEIGHT_MAP_CHUNK_SIZE as usize,
-        _ => panic!(),
+        let chunk_path = datasets.get(&chunk_id);
+        if chunk_path.is_none() {
+            return Err(eyre!("Couldn't find chunk"));
+        }
+        let chunk_path = chunk_path.unwrap();
+
+        let (date, response) = headers.check_if_modified_since(chunk_path)?;
+        date_modified = date;
+
+        if let Some(response) = response {
+            return Ok((response, date_modified));
+        }
+
+        let to_url = |chunk: Option<ChunkId>| {
+            chunk.and_then(|chunk| {
+                datasets.contains_key(&chunk).then(|| {
+                    let scheme = headers.get_scheme();
+                    let host = headers.get_host();
+                    format!(
+                        "{scheme}://{host}/api/{id}?kind={}&chunk={}",
+                        query.kind,
+                        chunk.to_usize()
+                    )
+                })
+            })
+        };
+
+        chunk_meta.replace(ChunkMetadata {
+            id: chunk_id.to_usize(),
+            next: to_url(chunk_id.next()),
+            previous: to_url(chunk_id.previous()),
+        });
+
+        serialization.import::<Serialized>(chunk_path)?
+    } else {
+        let newest_file = datasets
+            .values()
+            .max_by(|a, b| {
+                a.metadata()
+                    .unwrap()
+                    .modified()
+                    .unwrap()
+                    .cmp(&b.metadata().unwrap().modified().unwrap())
+            })
+            .context("Expect to find newest file")?;
+
+        let (date, response) = headers.check_if_modified_since(newest_file)?;
+        date_modified = date;
+
+        if let Some(response) = response {
+            return Ok((response, date_modified));
+        }
+
+        Serialized::import_all(&folder_path, serialization)
     };
 
-    let offsetted_to_url = |offseted| {
-        datasets.get(&ChunkId::from_usize(offseted)).map(|_| {
-            let scheme = headers.get_scheme();
-            let host = headers.get_host();
-            format!("{scheme}://{host}/api/{}?chunk={offseted}", route.url_path)
+    let response = if *ext == Some(Extension::CSV) {
+        dataset.to_csv(id).into_response()
+    } else if let Some(chunk) = chunk_meta {
+        axum::response::Json(SerializedMapChunk {
+            chunk,
+            map: dataset.map(),
+            version: dataset.version(),
         })
+        .into_response()
+    } else {
+        axum::response::Json(dataset).into_response()
     };
 
-    let chunk_id = chunk_id.to_usize();
-
-    chunk.replace(Chunk {
-        id: chunk_id,
-        next: chunk_id.checked_add(offset).and_then(offsetted_to_url),
-        previous: chunk_id.checked_sub(offset).and_then(offsetted_to_url),
-    });
-
-    Ok(())
+    Ok((response, date_modified))
+}
+
+#[derive(Serialize)]
+struct SerializedMapChunk<T>
+where
+    T: Serialize,
+{
+    version: u32,
+    chunk: ChunkMetadata,
+    map: T,
 }
diff --git a/src/server/api/handlers/fallback.rs b/src/server/api/handlers/fallback.rs
deleted file mode 100644
index 3ce9c7618..000000000
--- a/src/server/api/handlers/fallback.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-use axum::{extract::State, http::HeaderMap, response::Response};
-use reqwest::header::HOST;
-
-use crate::server::AppState;
-
-use super::response::{generic_to_reponse, update_reponse_headers};
-
-pub async fn fallback(headers: HeaderMap, State(app_state): State<AppState>) -> Response {
-    update_reponse_headers(
-        generic_to_reponse(
-            app_state
-                .routes
-                .to_full_paths(headers[HOST].to_str().unwrap().to_string()),
-            None,
-        ),
-        60,
-        None,
-    )
-}
diff --git a/src/server/api/handlers/last_values.rs b/src/server/api/handlers/last_values.rs
new file mode 100644
index 000000000..1ba426f0a
--- /dev/null
+++ b/src/server/api/handlers/last_values.rs
@@ -0,0 +1,13 @@
+use axum::{
+    extract::State,
+    response::{IntoResponse, Response},
+};
+use serde_json::Value;
+
+use crate::{io::Json, server::AppState};
+
+pub async fn last_values_handler(State(app_state): State<AppState>) -> Response {
+    let values = Json::import::<Value>(&app_state.config.path_datasets_last_values()).unwrap();
+    let values = axum::Json(values);
+    values.into_response()
+}
diff --git a/src/server/api/handlers/mod.rs b/src/server/api/handlers/mod.rs
index 33474ff3a..518fe0dc7 100644
--- a/src/server/api/handlers/mod.rs
+++ b/src/server/api/handlers/mod.rs
@@ -1,8 +1,5 @@
 mod dataset;
-mod extension;
-mod fallback;
-
-mod response;
+mod last_values;
 
 pub use dataset::*;
-pub use fallback::*;
+pub use last_values::*;
diff --git a/src/server/api/handlers/response.rs b/src/server/api/handlers/response.rs
deleted file mode 100644
index 449c73dd1..000000000
--- a/src/server/api/handlers/response.rs
+++ /dev/null
@@ -1,167 +0,0 @@
-use std::fmt::Debug;
-
-use axum::response::{IntoResponse, Json, Response};
-use bincode::Decode;
-use serde::de::DeserializeOwned;
-use serde::Serialize;
-
-use crate::{
-    server::{
-        api::structs::{Chunk, Kind, Route},
-        header_map::HeaderMapUtils,
-    },
-    structs::{Date, MapValue, SerializedBTreeMap, SerializedVec},
-};
-
-use super::extension::Extension;
-
-#[derive(Serialize)]
-struct WrappedDataset<'a, T>
-where
-    T: Serialize,
-{
-    source: &'a str,
-    chunk: Chunk,
-    dataset: T,
-}
-
-#[derive(Serialize)]
-struct WrappedValue<T>
-where
-    T: Serialize,
-{
-    value: T,
-}
-
-pub fn typed_value_to_response<T>(
-    kind: Kind,
-    route: &Route,
-    chunk: Option<Chunk>,
-    id: String,
-    extension: Option<Extension>,
-) -> color_eyre::Result<Response>
-where
-    T: Serialize + Debug + DeserializeOwned + Decode + MapValue,
-{
-    Ok(match kind {
-        Kind::Date => {
-            let dataset = if chunk.is_some() {
-                route
-                    .serialization
-                    .import::<SerializedBTreeMap<Date, T>>(&route.file_path)?
-            } else {
-                SerializedBTreeMap::<Date, T>::import_all(&route.file_path, &route.serialization)
-            };
-
-            if extension == Some(Extension::CSV) {
-                let mut csv = format!("date,{}\n", id);
-
-                dataset.map.iter().for_each(|(k, v)| {
-                    csv += &format!("{},{:?}\n", k, v);
-                });
-
-                string_to_response(csv, extension)
-            } else {
-                dataset_to_response(dataset, chunk, extension)
-            }
-        }
-        Kind::Height => {
-            let dataset = if chunk.is_some() {
-                route
-                    .serialization
-                    .import::<SerializedVec<T>>(&route.file_path)?
-            } else {
-                SerializedVec::<T>::import_all(&route.file_path, &route.serialization)
-            };
-
-            if extension == Some(Extension::CSV) {
-                let mut csv = format!("height,{}\n", id);
-
-                let starting_height = chunk.map_or(0, |chunk| chunk.id);
-
-                dataset.map.iter().enumerate().for_each(|(k, v)| {
-                    csv += &format!("{},{:?}\n", starting_height + k, v);
-                });
-
-                string_to_response(csv, extension)
-            } else {
-                dataset_to_response(dataset, chunk, extension)
-            }
-        }
-        Kind::Last => {
-            let value = route.serialization.import::<T>(&route.file_path)?;
-
-            if extension == Some(Extension::JSON) {
-                value_to_response(WrappedValue { value }, extension)
-            } else {
-                value_to_response(value, extension)
-            }
-        }
-    })
-}
-
-pub fn string_to_response(s: String, extension: Option<Extension>) -> Response {
-    update_reponse_headers(s.into_response(), 5, extension)
-}
-
-pub fn value_to_response<T>(value: T, extension: Option<Extension>) -> Response
-where
-    T: Serialize,
-{
-    update_reponse_headers(generic_to_reponse(value, None), 1, extension)
-}
-
-fn dataset_to_response<T>(
-    dataset: T,
-    chunk: Option<Chunk>,
-    extension: Option<Extension>,
-) -> Response
-where
-    T: Serialize,
-{
-    update_reponse_headers(generic_to_reponse(dataset, chunk), 5, extension)
-}
-
-pub fn generic_to_reponse<T>(generic: T, chunk: Option<Chunk>) -> Response
-where
-    T: Serialize,
-{
-    if let Some(chunk) = chunk {
-        Json(WrappedDataset {
-            source: "https://kibo.money",
-            chunk,
-            dataset: generic,
-        })
-        .into_response()
-    } else {
-        Json(generic).into_response()
-    }
-}
-
-pub fn update_reponse_headers(
-    mut response: Response,
-    cache_time: u64,
-    extension: Option<Extension>,
-) -> Response {
-    let headers = response.headers_mut();
-
-    let max_age = cache_time;
-    let stale_while_revalidate = max_age;
-
-    headers.insert_cors();
-    headers.insert_cache_control_revalidate(max_age, stale_while_revalidate);
-
-    match extension {
-        Some(extension) => {
-            headers.insert_content_disposition_attachment();
-
-            match extension {
-                Extension::CSV => headers.insert_content_type_text_csv(),
-                Extension::JSON => headers.insert_content_type_application_json(),
-            }
-        }
-        _ => headers.insert_content_type_application_json(),
-    }
-
-    response
-}
diff --git a/src/server/api/mod.rs b/src/server/api/mod.rs
index 5dfdc8871..9ea585089 100644
--- a/src/server/api/mod.rs
+++ b/src/server/api/mod.rs
@@ -1,5 +1,5 @@
 use axum::{routing::get, Router};
-use handlers::{dataset_handler, fallback};
+use handlers::{dataset_handler, last_values_handler};
 
 use super::AppState;
 
@@ -14,8 +14,7 @@ pub trait ApiRoutes {
 
 impl ApiRoutes for Router<AppState> {
     fn add_api_routes(self) -> Self {
-        self.route(&format!("{API_URL_PREFIX}/*path"), get(dataset_handler))
-            .route(&format!("{API_URL_PREFIX}/"), get(fallback))
-            .route(API_URL_PREFIX, get(fallback))
+        self.route(&format!("{API_URL_PREFIX}/last"), get(last_values_handler))
+            .route(&format!("{API_URL_PREFIX}/*path"), get(dataset_handler))
     }
 }
diff --git a/src/server/api/structs/chunk.rs b/src/server/api/structs/chunk_metadata.rs
similarity index 85%
rename from src/server/api/structs/chunk.rs
rename to src/server/api/structs/chunk_metadata.rs
index c375f75c5..9dc2535e0 100644
--- a/src/server/api/structs/chunk.rs
+++ b/src/server/api/structs/chunk_metadata.rs
@@ -1,7 +1,7 @@
 use serde::{Deserialize, Serialize};
 
 #[derive(Debug, Serialize, Deserialize)]
-pub struct Chunk {
+pub struct ChunkMetadata {
     pub id: usize,
     pub previous: Option<String>,
     pub next: Option<String>,
diff --git a/src/server/api/handlers/extension.rs b/src/server/api/structs/extension.rs
similarity index 76%
rename from src/server/api/handlers/extension.rs
rename to src/server/api/structs/extension.rs
index 946ad67b9..21a7477c4 100644
--- a/src/server/api/handlers/extension.rs
+++ b/src/server/api/structs/extension.rs
@@ -31,13 +31,4 @@ impl Extension {
             Extension::JSON => "json",
         }
     }
-
-    pub fn to_dot_str(&self) -> String {
-        format!(".{}", self.to_str())
-    }
-
-    pub fn remove_extension(s: &str) -> String {
-        s.replace(&Self::CSV.to_dot_str(), "")
-            .replace(&Self::JSON.to_dot_str(), "")
-    }
 }
diff --git a/src/server/api/structs/kind.rs b/src/server/api/structs/kind.rs
index 93d4ac932..ab25dc6f0 100644
--- a/src/server/api/structs/kind.rs
+++ b/src/server/api/structs/kind.rs
@@ -1,6 +1,59 @@
-#[derive(PartialEq, Eq, Clone, Copy)]
+use std::collections::BTreeSet;
+
+use color_eyre::eyre::{eyre, ContextCompat};
+use serde::Deserialize;
+
+use crate::structs::{AnyMap, Date, Height, MapKey};
+
+#[derive(Debug, Clone, Copy, Deserialize, PartialEq, Eq, PartialOrd, Ord)]
 pub enum Kind {
     Date,
     Height,
     Last,
 }
+
+impl TryFrom<&String> for Kind {
+    type Error = color_eyre::Report;
+
+    fn try_from(str: &String) -> Result<Self, Self::Error> {
+        Ok(
+            match str
+                .to_lowercase()
+                .chars()
+                .next()
+                .context("Expect kind to have first letter")?
+            {
+                'd' => Self::Date,
+                'h' => Self::Height,
+                'l' => Self::Last,
+                _ => return Err(eyre!("Bad kind")),
+            },
+        )
+    }
+}
+
+impl From<&(dyn AnyMap + Send + Sync)> for BTreeSet<Kind> {
+    fn from(map: &(dyn AnyMap + Send + Sync)) -> Self {
+        let mut s = Self::new();
+        if map.key_name() == Date::map_name() {
+            s.insert(Kind::Date);
+        }
+        if map.key_name() == Height::map_name() {
+            s.insert(Kind::Height);
+        }
+        if map.last_value().is_some() {
+            s.insert(Kind::Last);
+        }
+        s
+    }
+}
+
+// impl std::fmt::Display for Kind {
+//     fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+//         match *self {
+//             Self::Date => write!(f, "date"),
+//             Self::Height => write!(f, "height"),
+//             Self::Last => write!(f, "last"),
+//         }
+//     }
+// }
diff --git a/src/server/api/structs/mod.rs b/src/server/api/structs/mod.rs
index 94f3cc402..76df682d8 100644
--- a/src/server/api/structs/mod.rs
+++ b/src/server/api/structs/mod.rs
@@ -1,9 +1,13 @@
-mod chunk;
+mod chunk_metadata;
+mod extension;
 mod kind;
-mod paths;
+mod range;
+mod route;
 mod routes;
 
-pub use chunk::*;
+pub use chunk_metadata::*;
+pub use extension::*;
 pub use kind::*;
-pub use paths::*;
+pub use range::*;
+pub use route::*;
 pub use routes::*;
diff --git a/src/server/api/structs/paths.rs b/src/server/api/structs/paths.rs
deleted file mode 100644
index 9e707278f..000000000
--- a/src/server/api/structs/paths.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-use std::collections::BTreeMap;
-
-use derive_deref::{Deref, DerefMut};
-use serde::Serialize;
-
-use crate::server::Grouped;
-
-#[derive(Clone, Default, Deref, DerefMut, Debug, Serialize)]
-pub struct Paths(pub Grouped<BTreeMap<String, String>>);
diff --git a/src/server/api/structs/range.rs b/src/server/api/structs/range.rs
new file mode 100644
index 000000000..84754a07e
--- /dev/null
+++ b/src/server/api/structs/range.rs
@@ -0,0 +1,32 @@
+use axum::extract::Query;
+use color_eyre::eyre::eyre;
+
+use crate::server::api::handlers::DatasetParams;
+
+pub enum DatasetRange {
+    All,
+    Chunk(DatasetRangeChunk),
+}
+
+impl TryFrom<&Query<DatasetParams>> for DatasetRange {
+    type Error = color_eyre::Report;
+
+    fn try_from(query: &Query<DatasetParams>) -> Result<Self, Self::Error> {
+        if let Some(chunk) = query.chunk {
+            if query.all.is_some() {
+                Err(eyre!("chunk and all are exclusive"))
+            } else {
+                Ok(Self::Chunk(DatasetRangeChunk::Chunk(chunk)))
+            }
+        } else if query.all.is_some() {
+            Ok(Self::All)
+        } else {
+            Ok(Self::Chunk(DatasetRangeChunk::Last))
+        }
+    }
+}
+
+pub enum DatasetRangeChunk {
+    Chunk(usize),
+    Last,
+}
diff --git a/src/server/api/structs/route.rs b/src/server/api/structs/route.rs
new file mode 100644
index 000000000..0eda227eb
--- /dev/null
+++ b/src/server/api/structs/route.rs
@@ -0,0 +1,33 @@
+use std::{collections::BTreeSet, path::PathBuf};
+
+use crate::{io::Serialization, structs::AnyMap};
+
+use super::Kind;
+
+#[derive(Debug, Clone)]
+pub struct Route {
+    pub type_name: String,
+    pub list: BTreeSet<Kind>,
+    pub path: PathBuf,
+    pub serialization: Serialization,
+}
+
+impl Route {
+    pub fn update(&mut self, map: &(dyn AnyMap + Send + Sync)) {
+        self.list.append(&mut BTreeSet::from(map));
+        if self.serialization != map.serialization() {
+            panic!("route.upate() different serialization")
+        }
+    }
+}
+
+impl From<&(dyn AnyMap + Send + Sync)> for Route {
+    fn from(map: &(dyn AnyMap + Send + Sync)) -> Self {
+        Self {
+            list: BTreeSet::from(map),
+            path: map.path_parent().to_owned(),
+            type_name: map.type_name().split("::").last().unwrap().to_owned(),
+            serialization: map.serialization(),
+        }
+    }
+}
diff --git a/src/server/api/structs/routes.rs b/src/server/api/structs/routes.rs
index 0afbd3b0c..14141142f 100644
--- a/src/server/api/structs/routes.rs
+++ b/src/server/api/structs/routes.rs
@@ -1,135 +1,49 @@
-use std::{
-    collections::{BTreeMap, HashMap},
-    fs,
-    path::PathBuf,
-};
+use std::collections::BTreeMap;
 
 use derive_deref::{Deref, DerefMut};
-use itertools::Itertools;
 
 use crate::{
-    io::Serialization,
-    server::{api::API_URL_PREFIX, Grouped},
+    parser::{AnyDatasets, Datasets},
     structs::Config,
 };
 
-use super::Paths;
+use super::Route;
 
-#[derive(Clone, Debug)]
-pub struct Route {
-    pub url_path: String,
-    pub file_path: PathBuf,
-    pub values_type: String,
-    pub serialization: Serialization,
-}
-
-#[derive(Clone, Default, Deref, DerefMut)]
-pub struct Routes(pub Grouped<HashMap<String, Route>>);
+#[derive(Debug, Clone, Default, Deref, DerefMut)]
+pub struct Routes(BTreeMap<String, Route>);
 
 const WEBSITE_TYPES_PATH: &str = "../website/scripts/types";
 
 impl Routes {
-    pub fn build(paths_to_type: BTreeMap<PathBuf, String>, config: &Config) -> Self {
-        let mut routes = Routes::default();
-
-        paths_to_type.into_iter().for_each(|(path, value)| {
-            let try_from_path = if path.is_file() {
-                path.clone()
-            } else {
-                fs::read_dir(&path)
-                    .unwrap_or_else(|_| {
-                        dbg!(&path);
-                        panic!();
-                    })
-                    .map(|e| e.unwrap().path())
-                    .find(|e| e.is_file())
-                    .unwrap()
-            };
-
-            let serialization =
-                Serialization::try_from(&try_from_path).unwrap_or(Serialization::Binary);
-
-            let file_path_ser = path.to_str().unwrap().to_owned();
-            let split_key = file_path_ser.replace(
-                &format!("{}/", config.path_datasets().to_str().unwrap()),
-                "",
-            );
-            let split_key =
-                split_key.replace(&format!("{}/", config.path_kibodir().to_str().unwrap()), "");
-            let mut split_key = split_key.split('/').collect_vec();
-            let last = split_key.pop().unwrap().to_owned();
-            let last = last.split('.').next().unwrap();
-
-            // Use case for: "../datasets/last": "Value",
-            if split_key.is_empty() {
-                split_key.push("last");
-            }
-
-            let map_key = split_key.iter().join("_");
-
-            let url_path = split_key.iter().join("-");
-
-            let values_type = value.to_owned();
-
-            match last {
-                "date" => {
-                    routes.date.insert(
-                        map_key,
-                        Route {
-                            url_path: format!("date-to-{url_path}"),
-                            file_path: path,
-                            values_type,
-                            serialization,
-                        },
-                    );
-                }
-                "height" => {
-                    routes.height.insert(
-                        map_key,
-                        Route {
-                            url_path: format!("height-to-{url_path}"),
-                            file_path: path,
-                            values_type,
-                            serialization,
-                        },
-                    );
-                }
-                "last" => {
-                    routes.last.insert(
-                        map_key,
-                        Route {
-                            url_path,
-                            file_path: path,
-                            values_type,
-                            serialization,
-                        },
-                    );
-                }
-                _ => {
-                    dbg!(&path, value, &last, &split_key);
-                    panic!("")
-                }
-            }
-        });
-
-        routes
+    pub fn build(datasets: &Datasets, config: &Config) -> Self {
+        datasets
+            .to_any_dataset_vec()
+            .into_iter()
+            .flat_map(|dataset| dataset.to_all_map_vec())
+            .fold(Self::default(), |mut routes, map| {
+                routes
+                    .entry(map.id(config))
+                    .or_insert_with(|| Route::from(map))
+                    .update(map);
+                routes
+            })
     }
 
     pub fn generate_dts_file(&self) {
-        let map_to_type = |name: &str, map: &HashMap<String, Route>| -> String {
-            let paths = map
-                .values()
-                .map(|route| format!("\"{}\"", route.url_path))
-                .join(" | ");
+        // let map_to_type = |name: &str, map: &HashMap<String, Route>| -> String {
+        //     let paths = map
+        //         .values()
+        //         .map(|route| format!("\"{}\"", route.url_path))
+        //         .join(" | ");
 
-            format!("export type {}Path = {};\n", name, paths)
-        };
+        //     format!("export type {}Path = {};\n", name, paths)
+        // };
 
-        let date_type = map_to_type("Date", &self.date);
+        // let date_type = map_to_type("Date", &self.date);
 
-        let height_type = map_to_type("Height", &self.height);
+        // let height_type = map_to_type("Height", &self.height);
 
-        let last_type = map_to_type("Last", &self.last);
+        // let last_type = map_to_type("Last", &self.last);
 
         // fs::write(
         //     format!("{WEBSITE_TYPES_PATH}/paths.d.ts"),
@@ -137,37 +51,4 @@ impl Routes {
         // )
         // .unwrap();
     }
-
-    pub fn to_full_paths(&self, host: String) -> Paths {
-        let url = {
-            let scheme = if host.contains("0.0.0.0") || host.contains("localhost") {
-                "http"
-            } else {
-                "https"
-            };
-
-            format!("{scheme}://{host}")
-        };
-
-        let transform = |map: &HashMap<String, Route>| -> BTreeMap<String, String> {
-            map.iter()
-                .map(|(key, route)| {
-                    (
-                        key.to_owned(),
-                        format!("{url}{API_URL_PREFIX}/{}", route.url_path.to_owned()),
-                    )
-                })
-                .collect()
-        };
-
-        let date_paths = transform(&self.date);
-        let height_paths = transform(&self.height);
-        let last_paths = transform(&self.last);
-
-        Paths(Grouped {
-            date: date_paths,
-            height: height_paths,
-            last: last_paths,
-        })
-    }
 }
diff --git a/src/server/header_map.rs b/src/server/header_map.rs
index 145f42796..837ec6132 100644
--- a/src/server/header_map.rs
+++ b/src/server/header_map.rs
@@ -31,6 +31,7 @@ pub trait HeaderMapUtils {
     ) -> color_eyre::Result<(DateTime<Utc>, Option<Response<Body>>)>;
 
     fn insert_cache_control_immutable(&mut self);
+    #[allow(unused)]
     fn insert_cache_control_revalidate(&mut self, max_age: u64, stale_while_revalidate: u64);
     fn insert_last_modified(&mut self, date: DateTime<Utc>);
 
diff --git a/src/server/mod.rs b/src/server/mod.rs
index 4d0de972b..9284ae71c 100644
--- a/src/server/mod.rs
+++ b/src/server/mod.rs
@@ -1,43 +1,32 @@
-use std::{collections::BTreeMap, path::PathBuf, sync::Arc};
+use std::{sync::Arc, time::Instant};
 
 use api::{structs::Routes, ApiRoutes};
 use axum::{routing::get, serve, Router};
 use color_eyre::owo_colors::OwoColorize;
 use log::{error, info};
 use reqwest::StatusCode;
-use serde::Serialize;
 use tokio::net::TcpListener;
 use tower_http::compression::CompressionLayer;
 use website::WebsiteRoutes;
 
 use crate::structs::Config;
 
-mod api;
+pub mod api;
 mod header_map;
 mod website;
 
-#[derive(Clone, Debug, Default, Serialize)]
-pub struct Grouped<T> {
-    pub date: T,
-    pub height: T,
-    pub last: T,
-}
-
 #[derive(Clone)]
 pub struct AppState {
     routes: Arc<Routes>,
+    config: Config,
 }
 
-pub async fn main(
-    paths_to_type: BTreeMap<PathBuf, String>,
-    config: &Config,
-) -> color_eyre::Result<()> {
-    let routes = Routes::build(paths_to_type, config);
-
+pub async fn main(routes: Routes, config: Config) -> color_eyre::Result<()> {
     routes.generate_dts_file();
 
     let state = AppState {
         routes: Arc::new(routes),
+        config,
     };
 
     let compression_layer = CompressionLayer::new()
@@ -72,11 +61,13 @@ pub async fn main(
     Ok(())
 }
 
-pub fn log_result(code: StatusCode, path: &str) {
+pub fn log_result(code: StatusCode, path: &str, instant: Instant) {
+    let time = format!("{}µs", instant.elapsed().as_micros());
+    let time = time.bright_black();
     match code {
-        StatusCode::INTERNAL_SERVER_ERROR => error!("{} {}", code.as_u16().red(), path),
-        StatusCode::NOT_MODIFIED => info!("{} {}", code.as_u16().bright_black(), path),
-        StatusCode::OK => info!("{} {}", code.as_u16().green(), path),
-        _ => error!("{} {}", code.as_u16().red(), path),
+        StatusCode::INTERNAL_SERVER_ERROR => error!("{} {} {}", code.as_u16().red(), path, time),
+        StatusCode::NOT_MODIFIED => info!("{} {} {}", code.as_u16().bright_black(), path, time),
+        StatusCode::OK => info!("{} {} {}", code.as_u16().green(), path, time),
+        _ => error!("{} {} {}", code.as_u16().red(), path, time),
     }
 }
diff --git a/src/server/website/handlers/file.rs b/src/server/website/handlers/file.rs
index 3c6159a53..125e7136c 100644
--- a/src/server/website/handlers/file.rs
+++ b/src/server/website/handlers/file.rs
@@ -1,6 +1,7 @@
 use std::{
     fs::{self},
     path::{Path, PathBuf},
+    time::Instant,
 };
 
 use axum::{
@@ -27,6 +28,8 @@ pub async fn index_handler(headers: HeaderMap) -> Response {
 }
 
 fn any_handler(headers: HeaderMap, path: Option<extract::Path<String>>) -> Response {
+    let instant = Instant::now();
+
     let response = if let Some(path) = path.as_ref() {
         let path = path.0.replace("..", "").replace("\\", "");
 
@@ -56,6 +59,7 @@ fn any_handler(headers: HeaderMap, path: Option<extract::Path<String>>) -> Respo
     log_result(
         response.status(),
         &format!("/{}", path.map_or("".to_owned(), |p| p.0)),
+        instant,
     );
 
     response
@@ -124,8 +128,6 @@ fn _path_to_response(headers: &HeaderMap, path: &Path) -> color_eyre::Result<Res
             })
         {
             headers.insert_cache_control_immutable();
-        } else {
-            headers.insert_cache_control_revalidate(1, 1);
         }
     }
 
diff --git a/src/structs/any_map.rs b/src/structs/any_map.rs
index 455a5bdfc..371898295 100644
--- a/src/structs/any_map.rs
+++ b/src/structs/any_map.rs
@@ -1,35 +1,23 @@
-use std::path::{Path, PathBuf};
+use std::path::Path;
 
 use serde_json::Value;
 
-use super::{MapKind, MapPath};
+use crate::io::Serialization;
+
+use super::{Config, MapKind, MapPath};
 
 pub trait AnyMap {
     fn path(&self) -> &Path;
+    fn path_parent(&self) -> &Path;
     fn path_last(&self) -> &Option<MapPath>;
-
     fn last_value(&self) -> Option<Value>;
-
-    fn t_name(&self) -> &str;
-
-    fn get_paths_to_type(&self) -> Vec<(PathBuf, String)> {
-        let t_name = self.t_name().to_string();
-
-        if let Some(path_last) = self.path_last() {
-            vec![
-                (self.path().to_owned(), t_name.clone()),
-                (path_last.unwrap().to_owned(), t_name),
-            ]
-        } else {
-            vec![(self.path().to_owned(), t_name)]
-        }
-    }
-
+    fn serialization(&self) -> Serialization;
+    fn type_name(&self) -> &str;
+    fn key_name(&self) -> &str;
     fn pre_export(&mut self);
     fn export(&self) -> color_eyre::Result<()>;
     fn post_export(&mut self);
-
     fn delete_files(&self);
-
     fn kind(&self) -> MapKind;
+    fn id(&self, config: &Config) -> String;
 }
diff --git a/src/structs/config.rs b/src/structs/config.rs
index f10e3919c..f51af3a0d 100644
--- a/src/structs/config.rs
+++ b/src/structs/config.rs
@@ -10,6 +10,8 @@ use color_eyre::eyre::eyre;
 use log::info;
 use serde::{Deserialize, Serialize};
 
+use crate::io::JSON_EXTENSION;
+
 use super::MapPath;
 
 #[derive(Parser, Debug, Clone, Default, Serialize, Deserialize, PartialEq)]
@@ -74,6 +76,8 @@ pub struct Config {
 }
 
 impl Config {
+    pub const DATASET_DIR_NAME: &str = "datasets";
+
     pub fn import() -> color_eyre::Result<Self> {
         let path = Self::path_dot_kibo();
         let _ = fs::create_dir_all(&path);
@@ -285,7 +289,7 @@ impl Config {
     }
 
     pub fn path_datasets_last_values(&self) -> MapPath {
-        self.path_datasets().join("last.json")
+        self.path_datasets().join(&format!("last.{JSON_EXTENSION}"))
     }
 
     pub fn path_price(&self) -> MapPath {
@@ -293,7 +297,7 @@ impl Config {
     }
 
     pub fn path_databases(&self) -> PathBuf {
-        self.path_kibodir().join("databases")
+        self.path_kibodir().join(Self::DATASET_DIR_NAME)
     }
 
     pub fn path_states(&self) -> PathBuf {
diff --git a/src/structs/date_map.rs b/src/structs/date_map.rs
index 37e853efe..54b97530c 100644
--- a/src/structs/date_map.rs
+++ b/src/structs/date_map.rs
@@ -1,10 +1,10 @@
 use std::iter::Sum;
 
 use super::{
-    AnyMap, Date, DateMapChunkId, GenericMap, Height, HeightMap, MapValue, SerializedBTreeMap,
+    AnyMap, Date, DateMapChunkId, GenericMap, Height, HeightMap, MapValue, SerializedDateMap,
 };
 
-pub type DateMap<Value> = GenericMap<Date, Value, DateMapChunkId, SerializedBTreeMap<Date, Value>>;
+pub type DateMap<Value> = GenericMap<Date, Value, DateMapChunkId, SerializedDateMap<Value>>;
 
 impl<Value> DateMap<Value>
 where
diff --git a/src/structs/date_map_chunk_id.rs b/src/structs/date_map_chunk_id.rs
index dbc8eb4fa..07554e24a 100644
--- a/src/structs/date_map_chunk_id.rs
+++ b/src/structs/date_map_chunk_id.rs
@@ -15,7 +15,7 @@ impl DateMapChunkId {
 }
 
 impl MapChunkId for DateMapChunkId {
-    fn to_name(&self) -> String {
+    fn to_string(&self) -> String {
         self.0.to_string()
     }
 
@@ -39,4 +39,12 @@ impl MapChunkId for DateMapChunkId {
     fn from_usize(id: usize) -> Self {
         Self(id as i32)
     }
+
+    fn next(&self) -> Option<Self> {
+        self.0.checked_add(1).map(Self)
+    }
+
+    fn previous(&self) -> Option<Self> {
+        self.0.checked_sub(1).map(Self)
+    }
 }
diff --git a/src/structs/generic_map.rs b/src/structs/generic_map.rs
index 8c1e52244..6cdb099f6 100644
--- a/src/structs/generic_map.rs
+++ b/src/structs/generic_map.rs
@@ -1,6 +1,6 @@
 use std::{
     collections::{BTreeMap, VecDeque},
-    fmt::Debug,
+    fmt::{Debug, Display},
     fs,
     iter::Sum,
     mem,
@@ -19,7 +19,7 @@ use crate::{
     utils::{get_percentile, LossyFrom},
 };
 
-use super::{AnyMap, MapPath, MapValue};
+use super::{AnyMap, Config, MapPath, MapValue};
 
 #[derive(Debug, Clone, Copy, Allocative, PartialEq, Eq)]
 pub enum MapKind {
@@ -29,7 +29,7 @@ pub enum MapKind {
 
 pub trait MapKey<ChunkId>
 where
-    Self: Sized + PartialOrd + Ord + Clone + Copy + Debug,
+    Self: Sized + PartialOrd + Ord + Clone + Copy + Debug + Display,
     ChunkId: MapChunkId,
 {
     fn to_chunk_id(&self) -> ChunkId;
@@ -61,16 +61,21 @@ where
     fn get(&self, serialized_key: &Key) -> Option<&Value>;
     fn last(&self) -> Option<&Value>;
     fn extend(&mut self, map: BTreeMap<Key, Value>);
+    fn import_all(path: &Path, serialization: &Serialization) -> Self;
+    fn to_csv(self, id: &str) -> String;
+    fn map(&self) -> &impl Serialize;
 }
 
 pub trait MapChunkId
 where
     Self: Ord + Debug + Copy + Clone,
 {
-    fn to_name(&self) -> String;
+    fn to_string(&self) -> String;
     fn from_path(path: &Path) -> color_eyre::Result<Self>;
     fn to_usize(self) -> usize;
     fn from_usize(id: usize) -> Self;
+    fn previous(&self) -> Option<Self>;
+    fn next(&self) -> Option<Self>;
 }
 
 #[derive(Debug, Allocative)]
@@ -79,6 +84,7 @@ pub struct GenericMap<Key, Value, ChunkId, Serialized> {
     kind: MapKind,
 
     path_all: MapPath,
+    path_parent: MapPath,
     path_last: Option<MapPath>,
 
     chunks_in_memory: usize,
@@ -150,6 +156,7 @@ where
             kind,
 
             path_all,
+            path_parent: path.to_owned(),
             path_last,
 
             chunks_in_memory,
@@ -177,15 +184,7 @@ where
                 }
             });
 
-        s.initial_last_key = s
-            .imported
-            .iter()
-            .last()
-            .and_then(|(last_chunk_id, serialized)| serialized.get_last_key(last_chunk_id));
-
-        s.initial_first_unsafe_key = s
-            .initial_last_key
-            .and_then(|last_key| last_key.to_first_unsafe());
+        s.set_initial_keys();
 
         // if s.initial_first_unsafe_key.is_none() {
         //     log(&format!("Missing dataset: {path:?}/{}", Key::map_name()));
@@ -194,6 +193,18 @@ where
         s
     }
 
+    fn set_initial_keys(&mut self) {
+        self.initial_last_key = self
+            .imported
+            .iter()
+            .last()
+            .and_then(|(last_chunk_id, serialized)| serialized.get_last_key(last_chunk_id));
+
+        self.initial_first_unsafe_key = self
+            .initial_last_key
+            .and_then(|last_key| last_key.to_first_unsafe());
+    }
+
     fn read_dir(&self) -> BTreeMap<ChunkId, PathBuf> {
         Self::_read_dir(&self.path_all, &self.serialization)
     }
@@ -308,10 +319,26 @@ where
     Key: MapKey<ChunkId>,
     Serialized: MapSerialized<Key, Value, ChunkId>,
 {
+    fn id(&self, config: &Config) -> String {
+        let path_to_string = |p: &Path| p.to_str().unwrap().to_owned();
+        path_to_string(self.path_parent())
+            .replace(&path_to_string(&config.path_kibodir()), "")
+            .replace(&format!("/{}/", Config::DATASET_DIR_NAME), "")
+            .replace("/", "-")
+    }
+
+    fn serialization(&self) -> Serialization {
+        self.serialization
+    }
+
     fn path(&self) -> &Path {
         &self.path_all
     }
 
+    fn path_parent(&self) -> &Path {
+        &self.path_parent
+    }
+
     fn path_last(&self) -> &Option<MapPath> {
         &self.path_last
     }
@@ -323,10 +350,14 @@ where
             .and_then(|v| serde_json::to_value(v).ok())
     }
 
-    fn t_name(&self) -> &str {
+    fn type_name(&self) -> &str {
         std::any::type_name::<Value>()
     }
 
+    fn key_name(&self) -> &str {
+        Key::map_name()
+    }
+
     fn pre_export(&mut self) {
         self.to_insert.iter_mut().for_each(|(chunk_id, map)| {
             if let Some((key, _)) = map.first_key_value() {
@@ -351,6 +382,8 @@ where
                 .or_insert(Serialized::new(self.version))
                 .extend(mem::take(map));
         });
+
+        self.set_initial_keys();
     }
 
     fn export(&self) -> color_eyre::Result<()> {
@@ -367,7 +400,7 @@ where
                     panic!();
                 });
 
-                let path = self.path_all.join(&chunk_id.to_name());
+                let path = self.path_all.join(&chunk_id.to_string());
 
                 self.serialization.export(&path, serialized)?;
 
diff --git a/src/structs/height_map_chunk_id.rs b/src/structs/height_map_chunk_id.rs
index 06d3856ce..bfe82058a 100644
--- a/src/structs/height_map_chunk_id.rs
+++ b/src/structs/height_map_chunk_id.rs
@@ -19,7 +19,7 @@ impl HeightMapChunkId {
 }
 
 impl MapChunkId for HeightMapChunkId {
-    fn to_name(&self) -> String {
+    fn to_string(&self) -> String {
         let start = ***self;
         let end = start + HEIGHT_MAP_CHUNK_SIZE;
 
@@ -46,4 +46,14 @@ impl MapChunkId for HeightMapChunkId {
     fn from_usize(id: usize) -> Self {
         Self(Height::new(id as u32))
     }
+
+    fn next(&self) -> Option<Self> {
+        self.checked_add(HEIGHT_MAP_CHUNK_SIZE)
+            .map(|h| Self(Height::new(h)))
+    }
+
+    fn previous(&self) -> Option<Self> {
+        self.checked_sub(HEIGHT_MAP_CHUNK_SIZE)
+            .map(|h| Self(Height::new(h)))
+    }
 }
diff --git a/src/structs/map_value.rs b/src/structs/map_value.rs
index f9790c72d..4f1dcf9fa 100644
--- a/src/structs/map_value.rs
+++ b/src/structs/map_value.rs
@@ -1,4 +1,4 @@
-use std::fmt::Debug;
+use std::fmt::{Debug, Display};
 
 use allocative::Allocative;
 use bincode::{Decode, Encode};
@@ -18,6 +18,7 @@ pub trait MapValue:
     + Sync
     + Send
     + Allocative
+    + Display
 {
 }
 
diff --git a/src/structs/mod.rs b/src/structs/mod.rs
index 0a7043ce3..f1f012319 100644
--- a/src/structs/mod.rs
+++ b/src/structs/mod.rs
@@ -72,7 +72,6 @@ pub use map_value::*;
 pub use ohlc::*;
 pub use partial_txout_data::*;
 pub use price::*;
-pub use rpc::*;
 pub use sent_data::*;
 pub use serialized_btreemap::*;
 pub use serialized_vec::*;
diff --git a/src/structs/ohlc.rs b/src/structs/ohlc.rs
index 666a52b1f..16fc833a5 100644
--- a/src/structs/ohlc.rs
+++ b/src/structs/ohlc.rs
@@ -1,3 +1,5 @@
+use std::fmt::{self};
+
 use allocative::Allocative;
 use bincode::{Decode, Encode};
 use serde::{Deserialize, Serialize};
@@ -10,3 +12,13 @@ pub struct OHLC {
     pub low: f32,
     pub close: f32,
 }
+
+impl fmt::Display for OHLC {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(
+            f,
+            "{{ open: {}, high: {}, low: {}, close: {} }}",
+            self.open, self.high, self.low, self.close
+        )
+    }
+}
diff --git a/src/structs/serialized_btreemap.rs b/src/structs/serialized_btreemap.rs
index 97ec47ad5..e70fb953d 100644
--- a/src/structs/serialized_btreemap.rs
+++ b/src/structs/serialized_btreemap.rs
@@ -6,7 +6,9 @@ use serde::{de::DeserializeOwned, Deserialize, Serialize};
 
 use crate::io::Serialization;
 
-use super::{DateMap, MapChunkId, MapKey, MapSerialized, MapValue};
+use super::{Date, DateMap, MapChunkId, MapKey, MapSerialized, MapValue};
+
+pub type SerializedDateMap<T> = SerializedBTreeMap<Date, T>;
 
 #[derive(Debug, Default, Serialize, Deserialize, Encode, Decode, Allocative)]
 pub struct SerializedBTreeMap<Key, Value>
@@ -17,41 +19,11 @@ where
     pub map: BTreeMap<Key, Value>,
 }
 
-impl<Key, Value> SerializedBTreeMap<Key, Value>
-where
-    Key: Ord,
-{
-    pub fn import_all<ChunkId>(path: &Path, serialization: &Serialization) -> Self
-    where
-        Self: Debug + Serialize + DeserializeOwned + Encode + Decode,
-        ChunkId: MapChunkId,
-        Key: MapKey<ChunkId>,
-        Value: MapValue,
-    {
-        let mut s = None;
-
-        DateMap::<usize>::_read_dir(path, serialization)
-            .iter()
-            .for_each(|(_, path)| {
-                let map = serialization.import::<Self>(path).unwrap();
-
-                if s.is_none() {
-                    s.replace(map);
-                } else {
-                    #[allow(clippy::unnecessary_unwrap)]
-                    s.as_mut().unwrap().map.extend(map.map);
-                }
-            });
-
-        s.unwrap()
-    }
-}
-
 impl<Key, Value, ChunkId> MapSerialized<Key, Value, ChunkId> for SerializedBTreeMap<Key, Value>
 where
     Self: Debug + Serialize + DeserializeOwned + Encode + Decode,
     ChunkId: MapChunkId,
-    Key: MapKey<ChunkId>,
+    Key: MapKey<ChunkId> + Serialize,
     Value: MapValue,
 {
     fn new(version: u32) -> Self {
@@ -80,4 +52,35 @@ where
     fn extend(&mut self, map: BTreeMap<Key, Value>) {
         self.map.extend(map)
     }
+
+    fn import_all(path: &Path, serialization: &Serialization) -> Self {
+        let mut s = None;
+
+        DateMap::<usize>::_read_dir(path, serialization)
+            .iter()
+            .for_each(|(_, path)| {
+                let map = serialization.import::<Self>(path).unwrap();
+
+                if s.is_none() {
+                    s.replace(map);
+                } else {
+                    #[allow(clippy::unnecessary_unwrap)]
+                    s.as_mut().unwrap().map.extend(map.map);
+                }
+            });
+
+        s.unwrap()
+    }
+
+    fn to_csv(self, id: &str) -> String {
+        let mut csv = format!("{},{}\n", Key::map_name(), id);
+        self.map.iter().for_each(|(k, v)| {
+            csv += &format!("{},{}\n", k, v);
+        });
+        csv
+    }
+
+    fn map(&self) -> &impl Serialize {
+        &self.map
+    }
 }
diff --git a/src/structs/serialized_vec.rs b/src/structs/serialized_vec.rs
index aa02f51d3..f8dac4c1b 100644
--- a/src/structs/serialized_vec.rs
+++ b/src/structs/serialized_vec.rs
@@ -14,31 +14,6 @@ pub struct SerializedVec<Value> {
     pub map: Vec<Value>,
 }
 
-impl<Value> SerializedVec<Value> {
-    pub fn import_all(path: &Path, serialization: &Serialization) -> Self
-    where
-        Self: Debug + Serialize + DeserializeOwned + Encode + Decode,
-        Value: MapValue,
-    {
-        let mut s = None;
-
-        HeightMap::<usize>::_read_dir(path, serialization)
-            .iter()
-            .for_each(|(_, path)| {
-                let mut map = serialization.import::<Self>(path).unwrap();
-
-                if s.is_none() {
-                    s.replace(map);
-                } else {
-                    #[allow(clippy::unnecessary_unwrap)]
-                    s.as_mut().unwrap().map.append(&mut map.map);
-                }
-            });
-
-        s.unwrap()
-    }
-}
-
 impl<Key, Value, ChunkId> MapSerialized<Key, Value, ChunkId> for SerializedVec<Value>
 where
     Self: Debug + Serialize + DeserializeOwned + Encode + Decode,
@@ -87,4 +62,39 @@ where
             }
         });
     }
+
+    fn import_all(path: &Path, serialization: &Serialization) -> Self
+    where
+        Self: Debug + Serialize + DeserializeOwned + Encode + Decode,
+        Value: MapValue,
+    {
+        let mut s = None;
+
+        HeightMap::<usize>::_read_dir(path, serialization)
+            .iter()
+            .for_each(|(_, path)| {
+                let mut map = serialization.import::<Self>(path).unwrap();
+
+                if s.is_none() {
+                    s.replace(map);
+                } else {
+                    #[allow(clippy::unnecessary_unwrap)]
+                    s.as_mut().unwrap().map.append(&mut map.map);
+                }
+            });
+
+        s.unwrap()
+    }
+
+    fn to_csv(self, id: &str) -> String {
+        let mut csv = format!("{},{}\n", Key::map_name(), id);
+        self.map.iter().enumerate().for_each(|(k, v)| {
+            csv += &format!("{:?},{:?}\n", k, v);
+        });
+        csv
+    }
+
+    fn map(&self) -> &impl Serialize {
+        &self.map
+    }
 }
diff --git a/src/structs/timestamp.rs b/src/structs/timestamp.rs
index 6e8455a23..e1ee2efeb 100644
--- a/src/structs/timestamp.rs
+++ b/src/structs/timestamp.rs
@@ -1,4 +1,4 @@
-use std::ops::Sub;
+use std::{fmt, ops::Sub};
 
 use allocative::Allocative;
 use bincode::{Decode, Encode};
@@ -81,3 +81,9 @@ impl Sub for Timestamp {
         Self::wrap(self.0 - rhs.0)
     }
 }
+
+impl fmt::Display for Timestamp {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", **self)
+    }
+}

From 8a733ee337fd43f4c0a28d1d6de88acb7a6ed0c4 Mon Sep 17 00:00:00 2001
From: nym21 <expat-epochs0i@icloud.com>
Date: Sun, 22 Dec 2024 09:39:27 +0100
Subject: [PATCH 10/63] changelog: update

---
 CHANGELOG.md | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8c15669ab..46d6696cd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,14 +7,17 @@
 
 ## Global
 
-- Merged parser and server crates into a single project (and thus executable), so now both will run at the same time with a single `cargo run -r`
+- Merged parser and server crates into a single project (and thus executable), so now both will run at the same time with a single `cargo run -r` [#7392982](https://github.com/kibo-money/kibo/commit/7392982824c2db94bcd57251fd41986117c29a23)
 - Added `--no-server` and `--no-parser` to disable each if needed
 - Improved executable parameters
-- Started using `log` and `env_logger` crates instead of custom code
+- Started using `log` and `env_logger` crates instead of custom code [#7392982](https://github.com/kibo-money/kibo/commit/7392982824c2db94bcd57251fd41986117c29a23)
 - Improved logs
-- Automated databases defragmention (and removed parameter) to improve disk usage and parse speed
-- Fixed input being unfocused right after being focused in Brave browser
-- Moved Sanakirja database wrapper to its own crate: `snkrj`
+- Automated databases defragmention (and removed parameter) to improve disk usage and parse speed [#7392982](https://github.com/kibo-money/kibo/commit/7392982824c2db94bcd57251fd41986117c29a23)
+- Fixed input being unfocused right after being focused in Brave browser [#9a9ae61](https://github.com/kibo-money/kibo/commit/9a9ae614d07b54c08b7e9c0e2aefe3b52fdb93c5)
+- Moved Sanakirja database wrapper to its own crate: `snkrj` [0f936dc](https://github.com/kibo-money/kibo/commit/0f936dcdfbecac0a228f023bd500d6e98f56446a)
+- Reworked server's API code [#6ab0f46]( https://github.com/kibo-money/kibo/commit/6ab0f463119a902a1b7ca9691b54f61543bb8f2f)
+  - New route format: `/api/date-to-realized-price` is now `/api/realized-price?kind=date`
+  - Added status and timing to logs
 
 ## Git
 

From 2b017ac6b5cf24ade3fc88eb475c02078d3d5297 Mon Sep 17 00:00:00 2001
From: nym21 <expat-epochs0i@icloud.com>
Date: Sun, 22 Dec 2024 10:22:55 +0100
Subject: [PATCH 11/63] website: lc: update to v4.2.2

---
 .../packages/lightweight-charts/types.d.ts    |    3 +-
 .../lightweight-charts/v4.2.2/script.js       |    9 +
 .../lightweight-charts/v4.2.2/types.d.ts      | 3882 +++++++++++++++++
 .../packages/lightweight-charts/wrapper.js    |    4 +-
 src/website/scripts/main.js                   |    4 +-
 src/website/scripts/service-worker.js         |    2 +-
 src/website/scripts/types/self.d.ts           |    2 +-
 7 files changed, 3898 insertions(+), 8 deletions(-)
 create mode 100644 src/website/packages/lightweight-charts/v4.2.2/script.js
 create mode 100644 src/website/packages/lightweight-charts/v4.2.2/types.d.ts

diff --git a/src/website/packages/lightweight-charts/types.d.ts b/src/website/packages/lightweight-charts/types.d.ts
index 02c5ab127..ca3fb9e42 100644
--- a/src/website/packages/lightweight-charts/types.d.ts
+++ b/src/website/packages/lightweight-charts/types.d.ts
@@ -1,6 +1,5 @@
 import { Signal } from "../solid-signals/types";
 import { Accessor } from "../solid-signals/2024-11-02/types/signals";
-import { Owner } from "../solid-signals/2024-11-02/types/core/owner";
 import {
   DeepPartial,
   BaselineStyleOptions,
@@ -11,7 +10,7 @@ import {
   CandlestickData,
   ISeriesApi,
   BaselineData,
-} from "./v4.2.0/types";
+} from "./v4.2.2/types";
 import { Color, Valued, ValuedCandlestickData } from "../../scripts/types/self";
 
 interface BaseSeriesBlueprint {
diff --git a/src/website/packages/lightweight-charts/v4.2.2/script.js b/src/website/packages/lightweight-charts/v4.2.2/script.js
new file mode 100644
index 000000000..3c5693745
--- /dev/null
+++ b/src/website/packages/lightweight-charts/v4.2.2/script.js
@@ -0,0 +1,9 @@
+// @ts-nocheck
+
+/*!
+ * @license
+ * TradingView Lightweight Charts™ v4.2.2
+ * Copyright (c) 2024 TradingView, Inc.
+ * Licensed under Apache License 2.0 https://www.apache.org/licenses/LICENSE-2.0
+ */
+const t={upColor:"#26a69a",downColor:"#ef5350",wickVisible:!0,borderVisible:!0,borderColor:"#378658",borderUpColor:"#26a69a",borderDownColor:"#ef5350",wickColor:"#737375",wickUpColor:"#26a69a",wickDownColor:"#ef5350"},i={upColor:"#26a69a",downColor:"#ef5350",openVisible:!0,thinBars:!0},n={color:"#2196f3",lineStyle:0,lineWidth:3,lineType:0,lineVisible:!0,crosshairMarkerVisible:!0,crosshairMarkerRadius:4,crosshairMarkerBorderColor:"",crosshairMarkerBorderWidth:2,crosshairMarkerBackgroundColor:"",lastPriceAnimation:0,pointMarkersVisible:!1},s={topColor:"rgba( 46, 220, 135, 0.4)",bottomColor:"rgba( 40, 221, 100, 0)",invertFilledArea:!1,lineColor:"#33D778",lineStyle:0,lineWidth:3,lineType:0,lineVisible:!0,crosshairMarkerVisible:!0,crosshairMarkerRadius:4,crosshairMarkerBorderColor:"",crosshairMarkerBorderWidth:2,crosshairMarkerBackgroundColor:"",lastPriceAnimation:0,pointMarkersVisible:!1},e={baseValue:{type:"price",price:0},topFillColor1:"rgba(38, 166, 154, 0.28)",topFillColor2:"rgba(38, 166, 154, 0.05)",topLineColor:"rgba(38, 166, 154, 1)",bottomFillColor1:"rgba(239, 83, 80, 0.05)",bottomFillColor2:"rgba(239, 83, 80, 0.28)",bottomLineColor:"rgba(239, 83, 80, 1)",lineWidth:3,lineStyle:0,lineType:0,lineVisible:!0,crosshairMarkerVisible:!0,crosshairMarkerRadius:4,crosshairMarkerBorderColor:"",crosshairMarkerBorderWidth:2,crosshairMarkerBackgroundColor:"",lastPriceAnimation:0,pointMarkersVisible:!1},r={color:"#26a69a",base:0},h={color:"#2196f3"},l={title:"",visible:!0,lastValueVisible:!0,priceLineVisible:!0,priceLineSource:0,priceLineWidth:1,priceLineColor:"",priceLineStyle:2,baseLineVisible:!0,baseLineWidth:1,baseLineColor:"#B2B5BE",baseLineStyle:0,priceFormat:{type:"price",precision:2,minMove:.01}};var a,o;function _(t,i){const n={0:[],1:[t.lineWidth,t.lineWidth],2:[2*t.lineWidth,2*t.lineWidth],3:[6*t.lineWidth,6*t.lineWidth],4:[t.lineWidth,4*t.lineWidth]}[i];t.setLineDash(n)}function u(t,i,n,s){t.beginPath();const e=t.lineWidth%2?.5:0;t.moveTo(n,i+e),t.lineTo(s,i+e),t.stroke()}function c(t,i){if(!t)throw new Error("Assertion failed"+(i?": "+i:""))}function d(t){if(void 0===t)throw new Error("Value is undefined");return t}function f(t){if(null===t)throw new Error("Value is null");return t}function v(t){return f(d(t))}!function(t){t[t.Simple=0]="Simple",t[t.WithSteps=1]="WithSteps",t[t.Curved=2]="Curved"}(a||(a={})),function(t){t[t.Solid=0]="Solid",t[t.Dotted=1]="Dotted",t[t.Dashed=2]="Dashed",t[t.LargeDashed=3]="LargeDashed",t[t.SparseDotted=4]="SparseDotted"}(o||(o={}));const p={khaki:"#f0e68c",azure:"#f0ffff",aliceblue:"#f0f8ff",ghostwhite:"#f8f8ff",gold:"#ffd700",goldenrod:"#daa520",gainsboro:"#dcdcdc",gray:"#808080",green:"#008000",honeydew:"#f0fff0",floralwhite:"#fffaf0",lightblue:"#add8e6",lightcoral:"#f08080",lemonchiffon:"#fffacd",hotpink:"#ff69b4",lightyellow:"#ffffe0",greenyellow:"#adff2f",lightgoldenrodyellow:"#fafad2",limegreen:"#32cd32",linen:"#faf0e6",lightcyan:"#e0ffff",magenta:"#f0f",maroon:"#800000",olive:"#808000",orange:"#ffa500",oldlace:"#fdf5e6",mediumblue:"#0000cd",transparent:"#0000",lime:"#0f0",lightpink:"#ffb6c1",mistyrose:"#ffe4e1",moccasin:"#ffe4b5",midnightblue:"#191970",orchid:"#da70d6",mediumorchid:"#ba55d3",mediumturquoise:"#48d1cc",orangered:"#ff4500",royalblue:"#4169e1",powderblue:"#b0e0e6",red:"#f00",coral:"#ff7f50",turquoise:"#40e0d0",white:"#fff",whitesmoke:"#f5f5f5",wheat:"#f5deb3",teal:"#008080",steelblue:"#4682b4",bisque:"#ffe4c4",aquamarine:"#7fffd4",aqua:"#0ff",sienna:"#a0522d",silver:"#c0c0c0",springgreen:"#00ff7f",antiquewhite:"#faebd7",burlywood:"#deb887",brown:"#a52a2a",beige:"#f5f5dc",chocolate:"#d2691e",chartreuse:"#7fff00",cornflowerblue:"#6495ed",cornsilk:"#fff8dc",crimson:"#dc143c",cadetblue:"#5f9ea0",tomato:"#ff6347",fuchsia:"#f0f",blue:"#00f",salmon:"#fa8072",blanchedalmond:"#ffebcd",slateblue:"#6a5acd",slategray:"#708090",thistle:"#d8bfd8",tan:"#d2b48c",cyan:"#0ff",darkblue:"#00008b",darkcyan:"#008b8b",darkgoldenrod:"#b8860b",darkgray:"#a9a9a9",blueviolet:"#8a2be2",black:"#000",darkmagenta:"#8b008b",darkslateblue:"#483d8b",darkkhaki:"#bdb76b",darkorchid:"#9932cc",darkorange:"#ff8c00",darkgreen:"#006400",darkred:"#8b0000",dodgerblue:"#1e90ff",darkslategray:"#2f4f4f",dimgray:"#696969",deepskyblue:"#00bfff",firebrick:"#b22222",forestgreen:"#228b22",indigo:"#4b0082",ivory:"#fffff0",lavenderblush:"#fff0f5",feldspar:"#d19275",indianred:"#cd5c5c",lightgreen:"#90ee90",lightgrey:"#d3d3d3",lightskyblue:"#87cefa",lightslategray:"#789",lightslateblue:"#8470ff",snow:"#fffafa",lightseagreen:"#20b2aa",lightsalmon:"#ffa07a",darksalmon:"#e9967a",darkviolet:"#9400d3",mediumpurple:"#9370d8",mediumaquamarine:"#66cdaa",skyblue:"#87ceeb",lavender:"#e6e6fa",lightsteelblue:"#b0c4de",mediumvioletred:"#c71585",mintcream:"#f5fffa",navajowhite:"#ffdead",navy:"#000080",olivedrab:"#6b8e23",palevioletred:"#d87093",violetred:"#d02090",yellow:"#ff0",yellowgreen:"#9acd32",lawngreen:"#7cfc00",pink:"#ffc0cb",paleturquoise:"#afeeee",palegoldenrod:"#eee8aa",darkolivegreen:"#556b2f",darkseagreen:"#8fbc8f",darkturquoise:"#00ced1",peachpuff:"#ffdab9",deeppink:"#ff1493",violet:"#ee82ee",palegreen:"#98fb98",mediumseagreen:"#3cb371",peru:"#cd853f",saddlebrown:"#8b4513",sandybrown:"#f4a460",rosybrown:"#bc8f8f",purple:"#800080",seagreen:"#2e8b57",seashell:"#fff5ee",papayawhip:"#ffefd5",mediumslateblue:"#7b68ee",plum:"#dda0dd",mediumspringgreen:"#00fa9a"};function m(t){return t<0?0:t>255?255:Math.round(t)||0}function b(t){return t<=0||t>1?Math.min(Math.max(t,0),1):Math.round(1e4*t)/1e4}const w=/^#([0-9a-f])([0-9a-f])([0-9a-f])([0-9a-f])?$/i,g=/^#([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{2})?$/i,M=/^rgb\(\s*(-?\d{1,10})\s*,\s*(-?\d{1,10})\s*,\s*(-?\d{1,10})\s*\)$/,x=/^rgba\(\s*(-?\d{1,10})\s*,\s*(-?\d{1,10})\s*,\s*(-?\d{1,10})\s*,\s*(-?\d*\.?\d+)\s*\)$/;function S(t){(t=t.toLowerCase())in p&&(t=p[t]);{const i=x.exec(t)||M.exec(t);if(i)return[m(parseInt(i[1],10)),m(parseInt(i[2],10)),m(parseInt(i[3],10)),b(i.length<5?1:parseFloat(i[4]))]}{const i=g.exec(t);if(i)return[m(parseInt(i[1],16)),m(parseInt(i[2],16)),m(parseInt(i[3],16)),1]}{const i=w.exec(t);if(i)return[m(17*parseInt(i[1],16)),m(17*parseInt(i[2],16)),m(17*parseInt(i[3],16)),1]}throw new Error(`Cannot parse color: ${t}`)}function k(t){return.199*t[0]+.687*t[1]+.114*t[2]}function y(t){const i=S(t);return{t:`rgb(${i[0]}, ${i[1]}, ${i[2]})`,i:k(i)>160?"black":"white"}}class C{constructor(){this.h=[]}l(t,i,n){const s={o:t,_:i,u:!0===n};this.h.push(s)}v(t){const i=this.h.findIndex((i=>t===i.o));i>-1&&this.h.splice(i,1)}p(t){this.h=this.h.filter((i=>i._!==t))}m(t,i,n){const s=[...this.h];this.h=this.h.filter((t=>!t.u)),s.forEach((s=>s.o(t,i,n)))}M(){return this.h.length>0}S(){this.h=[]}}function T(t,...i){for(const n of i)for(const i in n)void 0!==n[i]&&("object"!=typeof n[i]||void 0===t[i]||Array.isArray(n[i])?t[i]=n[i]:T(t[i],n[i]));return t}function P(t){return"number"==typeof t&&isFinite(t)}function R(t){return"number"==typeof t&&t%1==0}function D(t){return"string"==typeof t}function O(t){return"boolean"==typeof t}function V(t){const i=t;if(!i||"object"!=typeof i)return i;let n,s,e;for(s in n=Array.isArray(i)?[]:{},i)i.hasOwnProperty(s)&&(e=i[s],n[s]=e&&"object"==typeof e?V(e):e);return n}function B(t){return null!==t}function A(t){return null===t?void 0:t}const z="-apple-system, BlinkMacSystemFont, 'Trebuchet MS', Roboto, Ubuntu, sans-serif";function E(t,i,n){return void 0===i&&(i=z),`${n=void 0!==n?`${n} `:""}${t}px ${i}`}class I{constructor(t){this.k={C:1,T:5,P:NaN,R:"",D:"",O:"",V:"",B:0,A:0,I:0,L:0,N:0},this.F=t}W(){const t=this.k,i=this.j(),n=this.H();return t.P===i&&t.D===n||(t.P=i,t.D=n,t.R=E(i,n),t.L=2.5/12*i,t.B=t.L,t.A=i/12*t.T,t.I=i/12*t.T,t.N=0),t.O=this.$(),t.V=this.U(),this.k}$(){return this.F.W().layout.textColor}U(){return this.F.q()}j(){return this.F.W().layout.fontSize}H(){return this.F.W().layout.fontFamily}}class L{constructor(){this.Y=[]}Z(t){this.Y=t}X(t,i,n){this.Y.forEach((s=>{s.X(t,i,n)}))}}class N{X(t,i,n){t.useBitmapCoordinateSpace((t=>this.K(t,i,n)))}}class F extends N{constructor(){super(...arguments),this.G=null}J(t){this.G=t}K({context:t,horizontalPixelRatio:i,verticalPixelRatio:n}){if(null===this.G||null===this.G.tt)return;const s=this.G.tt,e=this.G,r=Math.max(1,Math.floor(i))%2/2,h=h=>{t.beginPath();for(let l=s.to-1;l>=s.from;--l){const s=e.it[l],a=Math.round(s.nt*i)+r,o=s.st*n,_=h*n+r;t.moveTo(a,o),t.arc(a,o,_,0,2*Math.PI)}t.fill()};e.et>0&&(t.fillStyle=e.rt,h(e.ht+e.et)),t.fillStyle=e.lt,h(e.ht)}}function W(){return{it:[{nt:0,st:0,ot:0,_t:0}],lt:"",rt:"",ht:0,et:0,tt:null}}const j={from:0,to:1};class H{constructor(t,i){this.ut=new L,this.ct=[],this.dt=[],this.ft=!0,this.F=t,this.vt=i,this.ut.Z(this.ct)}bt(t){const i=this.F.wt();i.length!==this.ct.length&&(this.dt=i.map(W),this.ct=this.dt.map((t=>{const i=new F;return i.J(t),i})),this.ut.Z(this.ct)),this.ft=!0}gt(){return this.ft&&(this.Mt(),this.ft=!1),this.ut}Mt(){const t=2===this.vt.W().mode,i=this.F.wt(),n=this.vt.xt(),s=this.F.St();i.forEach(((i,e)=>{var r;const h=this.dt[e],l=i.kt(n);if(t||null===l||!i.yt())return void(h.tt=null);const a=f(i.Ct());h.lt=l.Tt,h.ht=l.ht,h.et=l.Pt,h.it[0]._t=l._t,h.it[0].st=i.Dt().Rt(l._t,a.Ot),h.rt=null!==(r=l.Vt)&&void 0!==r?r:this.F.Bt(h.it[0].st/i.Dt().At()),h.it[0].ot=n,h.it[0].nt=s.zt(n),h.tt=j}))}}class $ extends N{constructor(t){super(),this.Et=t}K({context:t,bitmapSize:i,horizontalPixelRatio:n,verticalPixelRatio:s}){if(null===this.Et)return;const e=this.Et.It.yt,r=this.Et.Lt.yt;if(!e&&!r)return;const h=Math.round(this.Et.nt*n),l=Math.round(this.Et.st*s);t.lineCap="butt",e&&h>=0&&(t.lineWidth=Math.floor(this.Et.It.et*n),t.strokeStyle=this.Et.It.O,t.fillStyle=this.Et.It.O,_(t,this.Et.It.Nt),function(t,i,n,s){t.beginPath();const e=t.lineWidth%2?.5:0;t.moveTo(i+e,n),t.lineTo(i+e,s),t.stroke()}(t,h,0,i.height)),r&&l>=0&&(t.lineWidth=Math.floor(this.Et.Lt.et*s),t.strokeStyle=this.Et.Lt.O,t.fillStyle=this.Et.Lt.O,_(t,this.Et.Lt.Nt),u(t,l,0,i.width))}}class U{constructor(t){this.ft=!0,this.Ft={It:{et:1,Nt:0,O:"",yt:!1},Lt:{et:1,Nt:0,O:"",yt:!1},nt:0,st:0},this.Wt=new $(this.Ft),this.jt=t}bt(){this.ft=!0}gt(){return this.ft&&(this.Mt(),this.ft=!1),this.Wt}Mt(){const t=this.jt.yt(),i=f(this.jt.Ht()),n=i.$t().W().crosshair,s=this.Ft;if(2===n.mode)return s.Lt.yt=!1,void(s.It.yt=!1);s.Lt.yt=t&&this.jt.Ut(i),s.It.yt=t&&this.jt.qt(),s.Lt.et=n.horzLine.width,s.Lt.Nt=n.horzLine.style,s.Lt.O=n.horzLine.color,s.It.et=n.vertLine.width,s.It.Nt=n.vertLine.style,s.It.O=n.vertLine.color,s.nt=this.jt.Yt(),s.st=this.jt.Zt()}}function q(t,i,n,s,e,r){t.fillRect(i+r,n,s-2*r,r),t.fillRect(i+r,n+e-r,s-2*r,r),t.fillRect(i,n,r,e),t.fillRect(i+s-r,n,r,e)}function Y(t,i,n,s,e,r){t.save(),t.globalCompositeOperation="copy",t.fillStyle=r,t.fillRect(i,n,s,e),t.restore()}function Z(t,i,n,s,e,r){t.beginPath(),t.roundRect?t.roundRect(i,n,s,e,r):(t.lineTo(i+s-r[1],n),0!==r[1]&&t.arcTo(i+s,n,i+s,n+r[1],r[1]),t.lineTo(i+s,n+e-r[2]),0!==r[2]&&t.arcTo(i+s,n+e,i+s-r[2],n+e,r[2]),t.lineTo(i+r[3],n+e),0!==r[3]&&t.arcTo(i,n+e,i,n+e-r[3],r[3]),t.lineTo(i,n+r[0]),0!==r[0]&&t.arcTo(i,n,i+r[0],n,r[0]))}function X(t,i,n,s,e,r,h=0,l=[0,0,0,0],a=""){if(t.save(),!h||!a||a===r)return Z(t,i,n,s,e,l),t.fillStyle=r,t.fill(),void t.restore();const o=h/2;var _;Z(t,i+o,n+o,s-h,e-h,(_=-o,l.map((t=>0===t?t:t+_)))),"transparent"!==r&&(t.fillStyle=r,t.fill()),"transparent"!==a&&(t.lineWidth=h,t.strokeStyle=a,t.closePath(),t.stroke()),t.restore()}function K(t,i,n,s,e,r,h){t.save(),t.globalCompositeOperation="copy";const l=t.createLinearGradient(0,0,0,e);l.addColorStop(0,r),l.addColorStop(1,h),t.fillStyle=l,t.fillRect(i,n,s,e),t.restore()}class G{constructor(t,i){this.J(t,i)}J(t,i){this.Et=t,this.Xt=i}At(t,i){return this.Et.yt?t.P+t.L+t.B:0}X(t,i,n,s){if(!this.Et.yt||0===this.Et.Kt.length)return;const e=this.Et.O,r=this.Xt.t,h=t.useBitmapCoordinateSpace((t=>{const h=t.context;h.font=i.R;const l=this.Gt(t,i,n,s),a=l.Jt;return l.Qt?X(h,a.ti,a.ii,a.ni,a.si,r,a.ei,[a.ht,0,0,a.ht],r):X(h,a.ri,a.ii,a.ni,a.si,r,a.ei,[0,a.ht,a.ht,0],r),this.Et.hi&&(h.fillStyle=e,h.fillRect(a.ri,a.li,a.ai-a.ri,a.oi)),this.Et._i&&(h.fillStyle=i.V,h.fillRect(l.Qt?a.ui-a.ei:0,a.ii,a.ei,a.ci-a.ii)),l}));t.useMediaCoordinateSpace((({context:t})=>{const n=h.di;t.font=i.R,t.textAlign=h.Qt?"right":"left",t.textBaseline="middle",t.fillStyle=e,t.fillText(this.Et.Kt,n.fi,(n.ii+n.ci)/2+n.pi)}))}Gt(t,i,n,s){var e;const{context:r,bitmapSize:h,mediaSize:l,horizontalPixelRatio:a,verticalPixelRatio:o}=t,_=this.Et.hi||!this.Et.mi?i.T:0,u=this.Et.bi?i.C:0,c=i.L+this.Xt.wi,d=i.B+this.Xt.gi,f=i.A,v=i.I,p=this.Et.Kt,m=i.P,b=n.Mi(r,p),w=Math.ceil(n.xi(r,p)),g=m+c+d,M=i.C+f+v+w+_,x=Math.max(1,Math.floor(o));let S=Math.round(g*o);S%2!=x%2&&(S+=1);const k=u>0?Math.max(1,Math.floor(u*a)):0,y=Math.round(M*a),C=Math.round(_*a),T=null!==(e=this.Xt.Si)&&void 0!==e?e:this.Xt.ki,P=Math.round(T*o)-Math.floor(.5*o),R=Math.floor(P+x/2-S/2),D=R+S,O="right"===s,V=O?l.width-u:u,B=O?h.width-k:k;let A,z,E;return O?(A=B-y,z=B-C,E=V-_-f-u):(A=B+y,z=B+C,E=V+_+f),{Qt:O,Jt:{ii:R,li:P,ci:D,ni:y,si:S,ht:2*a,ei:k,ti:A,ri:B,ai:z,oi:x,ui:h.width},di:{ii:R/o,ci:D/o,fi:E,pi:b}}}}class J{constructor(t){this.yi={ki:0,t:"#000",gi:0,wi:0},this.Ci={Kt:"",yt:!1,hi:!0,mi:!1,Vt:"",O:"#FFF",_i:!1,bi:!1},this.Ti={Kt:"",yt:!1,hi:!1,mi:!0,Vt:"",O:"#FFF",_i:!0,bi:!0},this.ft=!0,this.Pi=new(t||G)(this.Ci,this.yi),this.Ri=new(t||G)(this.Ti,this.yi)}Kt(){return this.Di(),this.Ci.Kt}ki(){return this.Di(),this.yi.ki}bt(){this.ft=!0}At(t,i=!1){return Math.max(this.Pi.At(t,i),this.Ri.At(t,i))}Oi(){return this.yi.Si||0}Vi(t){this.yi.Si=t}Bi(){return this.Di(),this.Ci.yt||this.Ti.yt}Ai(){return this.Di(),this.Ci.yt}gt(t){return this.Di(),this.Ci.hi=this.Ci.hi&&t.W().ticksVisible,this.Ti.hi=this.Ti.hi&&t.W().ticksVisible,this.Pi.J(this.Ci,this.yi),this.Ri.J(this.Ti,this.yi),this.Pi}zi(){return this.Di(),this.Pi.J(this.Ci,this.yi),this.Ri.J(this.Ti,this.yi),this.Ri}Di(){this.ft&&(this.Ci.hi=!0,this.Ti.hi=!1,this.Ei(this.Ci,this.Ti,this.yi))}}class Q extends J{constructor(t,i,n){super(),this.jt=t,this.Ii=i,this.Li=n}Ei(t,i,n){if(t.yt=!1,2===this.jt.W().mode)return;const s=this.jt.W().horzLine;if(!s.labelVisible)return;const e=this.Ii.Ct();if(!this.jt.yt()||this.Ii.Ni()||null===e)return;const r=y(s.labelBackgroundColor);n.t=r.t,t.O=r.i;const h=2/12*this.Ii.P();n.wi=h,n.gi=h;const l=this.Li(this.Ii);n.ki=l.ki,t.Kt=this.Ii.Fi(l._t,e),t.yt=!0}}const tt=/[1-9]/g;class it{constructor(){this.Et=null}J(t){this.Et=t}X(t,i){if(null===this.Et||!1===this.Et.yt||0===this.Et.Kt.length)return;const n=t.useMediaCoordinateSpace((({context:t})=>(t.font=i.R,Math.round(i.Wi.xi(t,f(this.Et).Kt,tt)))));if(n<=0)return;const s=i.ji,e=n+2*s,r=e/2,h=this.Et.Hi;let l=this.Et.ki,a=Math.floor(l-r)+.5;a<0?(l+=Math.abs(0-a),a=Math.floor(l-r)+.5):a+e>h&&(l-=Math.abs(h-(a+e)),a=Math.floor(l-r)+.5);const o=a+e,_=Math.ceil(0+i.C+i.T+i.L+i.P+i.B);t.useBitmapCoordinateSpace((({context:t,horizontalPixelRatio:n,verticalPixelRatio:s})=>{const e=f(this.Et);t.fillStyle=e.t;const r=Math.round(a*n),h=Math.round(0*s),l=Math.round(o*n),u=Math.round(_*s),c=Math.round(2*n);if(t.beginPath(),t.moveTo(r,h),t.lineTo(r,u-c),t.arcTo(r,u,r+c,u,c),t.lineTo(l-c,u),t.arcTo(l,u,l,u-c,c),t.lineTo(l,h),t.fill(),e.hi){const r=Math.round(e.ki*n),l=h,a=Math.round((l+i.T)*s);t.fillStyle=e.O;const o=Math.max(1,Math.floor(n)),_=Math.floor(.5*n);t.fillRect(r-_,l,o,a-l)}})),t.useMediaCoordinateSpace((({context:t})=>{const n=f(this.Et),e=0+i.C+i.T+i.L+i.P/2;t.font=i.R,t.textAlign="left",t.textBaseline="middle",t.fillStyle=n.O;const r=i.Wi.Mi(t,"Apr0");t.translate(a+s,e+r),t.fillText(n.Kt,0,0)}))}}class nt{constructor(t,i,n){this.ft=!0,this.Wt=new it,this.Ft={yt:!1,t:"#4c525e",O:"white",Kt:"",Hi:0,ki:NaN,hi:!0},this.vt=t,this.$i=i,this.Li=n}bt(){this.ft=!0}gt(){return this.ft&&(this.Mt(),this.ft=!1),this.Wt.J(this.Ft),this.Wt}Mt(){const t=this.Ft;if(t.yt=!1,2===this.vt.W().mode)return;const i=this.vt.W().vertLine;if(!i.labelVisible)return;const n=this.$i.St();if(n.Ni())return;t.Hi=n.Hi();const s=this.Li();if(null===s)return;t.ki=s.ki;const e=n.Ui(this.vt.xt());t.Kt=n.qi(f(e)),t.yt=!0;const r=y(i.labelBackgroundColor);t.t=r.t,t.O=r.i,t.hi=n.W().ticksVisible}}class st{constructor(){this.Yi=null,this.Zi=0}Xi(){return this.Zi}Ki(t){this.Zi=t}Dt(){return this.Yi}Gi(t){this.Yi=t}Ji(t){return[]}Qi(){return[]}yt(){return!0}}var et;!function(t){t[t.Normal=0]="Normal",t[t.Magnet=1]="Magnet",t[t.Hidden=2]="Hidden"}(et||(et={}));class rt extends st{constructor(t,i){super(),this.tn=null,this.nn=NaN,this.sn=0,this.en=!0,this.rn=new Map,this.hn=!1,this.ln=NaN,this.an=NaN,this._n=NaN,this.un=NaN,this.$i=t,this.cn=i,this.dn=new H(t,this);this.fn=((t,i)=>n=>{const s=i(),e=t();if(n===f(this.tn).vn())return{_t:e,ki:s};{const t=f(n.Ct());return{_t:n.pn(s,t),ki:s}}})((()=>this.nn),(()=>this.an));const n=((t,i)=>()=>{const n=this.$i.St().mn(t()),s=i();return n&&Number.isFinite(s)?{ot:n,ki:s}:null})((()=>this.sn),(()=>this.Yt()));this.bn=new nt(this,t,n),this.wn=new U(this)}W(){return this.cn}gn(t,i){this._n=t,this.un=i}Mn(){this._n=NaN,this.un=NaN}xn(){return this._n}Sn(){return this.un}kn(t,i,n){this.hn||(this.hn=!0),this.en=!0,this.yn(t,i,n)}xt(){return this.sn}Yt(){return this.ln}Zt(){return this.an}yt(){return this.en}Cn(){this.en=!1,this.Tn(),this.nn=NaN,this.ln=NaN,this.an=NaN,this.tn=null,this.Mn()}Pn(t){return null!==this.tn?[this.wn,this.dn]:[]}Ut(t){return t===this.tn&&this.cn.horzLine.visible}qt(){return this.cn.vertLine.visible}Rn(t,i){this.en&&this.tn===t||this.rn.clear();const n=[];return this.tn===t&&n.push(this.Dn(this.rn,i,this.fn)),n}Qi(){return this.en?[this.bn]:[]}Ht(){return this.tn}On(){this.wn.bt(),this.rn.forEach((t=>t.bt())),this.bn.bt(),this.dn.bt()}Vn(t){return t&&!t.vn().Ni()?t.vn():null}yn(t,i,n){this.Bn(t,i,n)&&this.On()}Bn(t,i,n){const s=this.ln,e=this.an,r=this.nn,h=this.sn,l=this.tn,a=this.Vn(n);this.sn=t,this.ln=isNaN(t)?NaN:this.$i.St().zt(t),this.tn=n;const o=null!==a?a.Ct():null;return null!==a&&null!==o?(this.nn=i,this.an=a.Rt(i,o)):(this.nn=NaN,this.an=NaN),s!==this.ln||e!==this.an||h!==this.sn||r!==this.nn||l!==this.tn}Tn(){const t=this.$i.wt().map((t=>t.zn().An())).filter(B),i=0===t.length?null:Math.max(...t);this.sn=null!==i?i:NaN}Dn(t,i,n){let s=t.get(i);return void 0===s&&(s=new Q(this,i,n),t.set(i,s)),s}}function ht(t){return"left"===t||"right"===t}class lt{constructor(t){this.En=new Map,this.In=[],this.Ln=t}Nn(t,i){const n=function(t,i){return void 0===t?i:{Fn:Math.max(t.Fn,i.Fn),Wn:t.Wn||i.Wn}}(this.En.get(t),i);this.En.set(t,n)}jn(){return this.Ln}Hn(t){const i=this.En.get(t);return void 0===i?{Fn:this.Ln}:{Fn:Math.max(this.Ln,i.Fn),Wn:i.Wn}}$n(){this.Un(),this.In=[{qn:0}]}Yn(t){this.Un(),this.In=[{qn:1,Ot:t}]}Zn(t){this.Xn(),this.In.push({qn:5,Ot:t})}Un(){this.Xn(),this.In.push({qn:6})}Kn(){this.Un(),this.In=[{qn:4}]}Gn(t){this.Un(),this.In.push({qn:2,Ot:t})}Jn(t){this.Un(),this.In.push({qn:3,Ot:t})}Qn(){return this.In}ts(t){for(const i of t.In)this.ns(i);this.Ln=Math.max(this.Ln,t.Ln),t.En.forEach(((t,i)=>{this.Nn(i,t)}))}static ss(){return new lt(2)}static es(){return new lt(3)}ns(t){switch(t.qn){case 0:this.$n();break;case 1:this.Yn(t.Ot);break;case 2:this.Gn(t.Ot);break;case 3:this.Jn(t.Ot);break;case 4:this.Kn();break;case 5:this.Zn(t.Ot);break;case 6:this.Xn()}}Xn(){const t=this.In.findIndex((t=>5===t.qn));-1!==t&&this.In.splice(t,1)}}const at=".";function ot(t,i){if(!P(t))return"n/a";if(!R(i))throw new TypeError("invalid length");if(i<0||i>16)throw new TypeError("invalid length");if(0===i)return t.toString();return("0000000000000000"+t.toString()).slice(-i)}class _t{constructor(t,i){if(i||(i=1),P(t)&&R(t)||(t=100),t<0)throw new TypeError("invalid base");this.Ii=t,this.rs=i,this.hs()}format(t){const i=t<0?"−":"";return t=Math.abs(t),i+this.ls(t)}hs(){if(this.os=0,this.Ii>0&&this.rs>0){let t=this.Ii;for(;t>1;)t/=10,this.os++}}ls(t){const i=this.Ii/this.rs;let n=Math.floor(t),s="";const e=void 0!==this.os?this.os:NaN;if(i>1){let r=+(Math.round(t*i)-n*i).toFixed(this.os);r>=i&&(r-=i,n+=1),s=at+ot(+r.toFixed(this.os)*this.rs,e)}else n=Math.round(n*i)/i,e>0&&(s=at+ot(0,e));return n.toFixed(0)+s}}class ut extends _t{constructor(t=100){super(t)}format(t){return`${super.format(t)}%`}}class ct{constructor(t){this._s=t}format(t){let i="";return t<0&&(i="-",t=-t),t<995?i+this.us(t):t<999995?i+this.us(t/1e3)+"K":t<999999995?(t=1e3*Math.round(t/1e3),i+this.us(t/1e6)+"M"):(t=1e6*Math.round(t/1e6),i+this.us(t/1e9)+"B")}us(t){let i;const n=Math.pow(10,this._s);return i=(t=Math.round(t*n)/n)>=1e-15&&t<1?t.toFixed(this._s).replace(/\.?0+$/,""):String(t),i.replace(/(\.[1-9]*)0+$/,((t,i)=>i))}}function dt(t,i,n,s,e,r,h){if(0===i.length||s.from>=i.length||s.to<=0)return;const{context:l,horizontalPixelRatio:a,verticalPixelRatio:o}=t,_=i[s.from];let u=r(t,_),c=_;if(s.to-s.from<2){const i=e/2;l.beginPath();const n={nt:_.nt-i,st:_.st},s={nt:_.nt+i,st:_.st};l.moveTo(n.nt*a,n.st*o),l.lineTo(s.nt*a,s.st*o),h(t,u,n,s)}else{const e=(i,n)=>{h(t,u,c,n),l.beginPath(),u=i,c=n};let d=c;l.beginPath(),l.moveTo(_.nt*a,_.st*o);for(let h=s.from+1;h<s.to;++h){d=i[h];const s=r(t,d);switch(n){case 0:l.lineTo(d.nt*a,d.st*o);break;case 1:l.lineTo(d.nt*a,i[h-1].st*o),s!==u&&(e(s,d),l.lineTo(d.nt*a,i[h-1].st*o)),l.lineTo(d.nt*a,d.st*o);break;case 2:{const[t,n]=mt(i,h-1,h);l.bezierCurveTo(t.nt*a,t.st*o,n.nt*a,n.st*o,d.nt*a,d.st*o);break}}1!==n&&s!==u&&(e(s,d),l.moveTo(d.nt*a,d.st*o))}(c!==d||c===d&&1===n)&&h(t,u,c,d)}}const ft=6;function vt(t,i){return{nt:t.nt-i.nt,st:t.st-i.st}}function pt(t,i){return{nt:t.nt/i,st:t.st/i}}function mt(t,i,n){const s=Math.max(0,i-1),e=Math.min(t.length-1,n+1);var r,h;return[(r=t[i],h=pt(vt(t[n],t[s]),ft),{nt:r.nt+h.nt,st:r.st+h.st}),vt(t[n],pt(vt(t[e],t[i]),ft))]}function bt(t,i,n,s,e){const{context:r,horizontalPixelRatio:h,verticalPixelRatio:l}=i;r.lineTo(e.nt*h,t*l),r.lineTo(s.nt*h,t*l),r.closePath(),r.fillStyle=n,r.fill()}class wt extends N{constructor(){super(...arguments),this.G=null}J(t){this.G=t}K(t){var i;if(null===this.G)return;const{it:n,tt:s,cs:e,et:r,Nt:h,ds:l}=this.G,a=null!==(i=this.G.fs)&&void 0!==i?i:this.G.vs?0:t.mediaSize.height;if(null===s)return;const o=t.context;o.lineCap="butt",o.lineJoin="round",o.lineWidth=r,_(o,h),o.lineWidth=1,dt(t,n,l,s,e,this.ps.bind(this),bt.bind(null,a))}}function gt(t,i,n){return Math.min(Math.max(t,i),n)}function Mt(t,i,n){return i-t<=n}function xt(t){const i=Math.ceil(t);return i%2==0?i-1:i}class St{bs(t,i){const n=this.ws,{gs:s,Ms:e,xs:r,Ss:h,ks:l,fs:a}=i;if(void 0===this.ys||void 0===n||n.gs!==s||n.Ms!==e||n.xs!==r||n.Ss!==h||n.fs!==a||n.ks!==l){const n=t.context.createLinearGradient(0,0,0,l);if(n.addColorStop(0,s),null!=a){const i=gt(a*t.verticalPixelRatio/l,0,1);n.addColorStop(i,e),n.addColorStop(i,r)}n.addColorStop(1,h),this.ys=n,this.ws=i}return this.ys}}class kt extends wt{constructor(){super(...arguments),this.Cs=new St}ps(t,i){return this.Cs.bs(t,{gs:i.Ts,Ms:"",xs:"",Ss:i.Ps,ks:t.bitmapSize.height})}}function yt(t,i){const n=t.context;n.strokeStyle=i,n.stroke()}class Ct extends N{constructor(){super(...arguments),this.G=null}J(t){this.G=t}K(t){if(null===this.G)return;const{it:i,tt:n,cs:s,ds:e,et:r,Nt:h,Rs:l}=this.G;if(null===n)return;const a=t.context;a.lineCap="butt",a.lineWidth=r*t.verticalPixelRatio,_(a,h),a.lineJoin="round";const o=this.Ds.bind(this);void 0!==e&&dt(t,i,e,n,s,o,yt),l&&function(t,i,n,s,e){const{horizontalPixelRatio:r,verticalPixelRatio:h,context:l}=t;let a=null;const o=Math.max(1,Math.floor(r))%2/2,_=n*h+o;for(let n=s.to-1;n>=s.from;--n){const s=i[n];if(s){const i=e(t,s);i!==a&&(l.beginPath(),null!==a&&l.fill(),l.fillStyle=i,a=i);const n=Math.round(s.nt*r)+o,u=s.st*h;l.moveTo(n,u),l.arc(n,u,_,0,2*Math.PI)}}l.fill()}(t,i,l,n,o)}}class Tt extends Ct{Ds(t,i){return i.lt}}function Pt(t,i,n,s,e=0,r=i.length){let h=r-e;for(;0<h;){const r=h>>1,l=e+r;s(i[l],n)===t?(e=l+1,h-=r+1):h=r}return e}const Rt=Pt.bind(null,!0),Dt=Pt.bind(null,!1);function Ot(t,i){return t.ot<i}function Vt(t,i){return i<t.ot}function Bt(t,i,n){const s=i.Os(),e=i.ui(),r=Rt(t,s,Ot),h=Dt(t,e,Vt);if(!n)return{from:r,to:h};let l=r,a=h;return r>0&&r<t.length&&t[r].ot>=s&&(l=r-1),h>0&&h<t.length&&t[h-1].ot<=e&&(a=h+1),{from:l,to:a}}class At{constructor(t,i,n){this.Vs=!0,this.Bs=!0,this.As=!0,this.zs=[],this.Es=null,this.Is=t,this.Ls=i,this.Ns=n}bt(t){this.Vs=!0,"data"===t&&(this.Bs=!0),"options"===t&&(this.As=!0)}gt(){return this.Is.yt()?(this.Fs(),null===this.Es?null:this.Ws):null}js(){this.zs=this.zs.map((t=>Object.assign(Object.assign({},t),this.Is.$s().Hs(t.ot))))}Us(){this.Es=null}Fs(){this.Bs&&(this.qs(),this.Bs=!1),this.As&&(this.js(),this.As=!1),this.Vs&&(this.Ys(),this.Vs=!1)}Ys(){const t=this.Is.Dt(),i=this.Ls.St();if(this.Us(),i.Ni()||t.Ni())return;const n=i.Zs();if(null===n)return;if(0===this.Is.zn().Xs())return;const s=this.Is.Ct();null!==s&&(this.Es=Bt(this.zs,n,this.Ns),this.Ks(t,i,s.Ot),this.Gs())}}class zt extends At{constructor(t,i){super(t,i,!0)}Ks(t,i,n){i.Js(this.zs,A(this.Es)),t.Qs(this.zs,n,A(this.Es))}te(t,i){return{ot:t,_t:i,nt:NaN,st:NaN}}qs(){const t=this.Is.$s();this.zs=this.Is.zn().ie().map((i=>{const n=i.Ot[3];return this.ne(i.se,n,t)}))}}class Et extends zt{constructor(t,i){super(t,i),this.Ws=new L,this.ee=new kt,this.re=new Tt,this.Ws.Z([this.ee,this.re])}ne(t,i,n){return Object.assign(Object.assign({},this.te(t,i)),n.Hs(t))}Gs(){const t=this.Is.W();this.ee.J({ds:t.lineType,it:this.zs,Nt:t.lineStyle,et:t.lineWidth,fs:null,vs:t.invertFilledArea,tt:this.Es,cs:this.Ls.St().he()}),this.re.J({ds:t.lineVisible?t.lineType:void 0,it:this.zs,Nt:t.lineStyle,et:t.lineWidth,tt:this.Es,cs:this.Ls.St().he(),Rs:t.pointMarkersVisible?t.pointMarkersRadius||t.lineWidth/2+2:void 0})}}class It extends N{constructor(){super(...arguments),this.Et=null,this.le=0,this.ae=0}J(t){this.Et=t}K({context:t,horizontalPixelRatio:i,verticalPixelRatio:n}){if(null===this.Et||0===this.Et.zn.length||null===this.Et.tt)return;if(this.le=this.oe(i),this.le>=2){Math.max(1,Math.floor(i))%2!=this.le%2&&this.le--}this.ae=this.Et._e?Math.min(this.le,Math.floor(i)):this.le;let s=null;const e=this.ae<=this.le&&this.Et.he>=Math.floor(1.5*i);for(let r=this.Et.tt.from;r<this.Et.tt.to;++r){const h=this.Et.zn[r];s!==h.ue&&(t.fillStyle=h.ue,s=h.ue);const l=Math.floor(.5*this.ae),a=Math.round(h.nt*i),o=a-l,_=this.ae,u=o+_-1,c=Math.min(h.ce,h.de),d=Math.max(h.ce,h.de),f=Math.round(c*n)-l,v=Math.round(d*n)+l,p=Math.max(v-f,this.ae);t.fillRect(o,f,_,p);const m=Math.ceil(1.5*this.le);if(e){if(this.Et.fe){const i=a-m;let s=Math.max(f,Math.round(h.ve*n)-l),e=s+_-1;e>f+p-1&&(e=f+p-1,s=e-_+1),t.fillRect(i,s,o-i,e-s+1)}const i=a+m;let s=Math.max(f,Math.round(h.pe*n)-l),e=s+_-1;e>f+p-1&&(e=f+p-1,s=e-_+1),t.fillRect(u+1,s,i-u,e-s+1)}}}oe(t){const i=Math.floor(t);return Math.max(i,Math.floor(function(t,i){return Math.floor(.3*t*i)}(f(this.Et).he,t)))}}class Lt extends At{constructor(t,i){super(t,i,!1)}Ks(t,i,n){i.Js(this.zs,A(this.Es)),t.me(this.zs,n,A(this.Es))}be(t,i,n){return{ot:t,we:i.Ot[0],ge:i.Ot[1],Me:i.Ot[2],xe:i.Ot[3],nt:NaN,ve:NaN,ce:NaN,de:NaN,pe:NaN}}qs(){const t=this.Is.$s();this.zs=this.Is.zn().ie().map((i=>this.ne(i.se,i,t)))}}class Nt extends Lt{constructor(){super(...arguments),this.Ws=new It}ne(t,i,n){return Object.assign(Object.assign({},this.be(t,i,n)),n.Hs(t))}Gs(){const t=this.Is.W();this.Ws.J({zn:this.zs,he:this.Ls.St().he(),fe:t.openVisible,_e:t.thinBars,tt:this.Es})}}class Ft extends wt{constructor(){super(...arguments),this.Cs=new St}ps(t,i){const n=this.G;return this.Cs.bs(t,{gs:i.Se,Ms:i.ke,xs:i.ye,Ss:i.Ce,ks:t.bitmapSize.height,fs:n.fs})}}class Wt extends Ct{constructor(){super(...arguments),this.Te=new St}Ds(t,i){const n=this.G;return this.Te.bs(t,{gs:i.Pe,Ms:i.Pe,xs:i.Re,Ss:i.Re,ks:t.bitmapSize.height,fs:n.fs})}}class jt extends zt{constructor(t,i){super(t,i),this.Ws=new L,this.De=new Ft,this.Oe=new Wt,this.Ws.Z([this.De,this.Oe])}ne(t,i,n){return Object.assign(Object.assign({},this.te(t,i)),n.Hs(t))}Gs(){const t=this.Is.Ct();if(null===t)return;const i=this.Is.W(),n=this.Is.Dt().Rt(i.baseValue.price,t.Ot),s=this.Ls.St().he();this.De.J({it:this.zs,et:i.lineWidth,Nt:i.lineStyle,ds:i.lineType,fs:n,vs:!1,tt:this.Es,cs:s}),this.Oe.J({it:this.zs,et:i.lineWidth,Nt:i.lineStyle,ds:i.lineVisible?i.lineType:void 0,Rs:i.pointMarkersVisible?i.pointMarkersRadius||i.lineWidth/2+2:void 0,fs:n,tt:this.Es,cs:s})}}class Ht extends N{constructor(){super(...arguments),this.Et=null,this.le=0}J(t){this.Et=t}K(t){if(null===this.Et||0===this.Et.zn.length||null===this.Et.tt)return;const{horizontalPixelRatio:i}=t;if(this.le=function(t,i){if(t>=2.5&&t<=4)return Math.floor(3*i);const n=1-.2*Math.atan(Math.max(4,t)-4)/(.5*Math.PI),s=Math.floor(t*n*i),e=Math.floor(t*i),r=Math.min(s,e);return Math.max(Math.floor(i),r)}(this.Et.he,i),this.le>=2){Math.floor(i)%2!=this.le%2&&this.le--}const n=this.Et.zn;this.Et.Ve&&this.Be(t,n,this.Et.tt),this.Et._i&&this.Ae(t,n,this.Et.tt);const s=this.ze(i);(!this.Et._i||this.le>2*s)&&this.Ee(t,n,this.Et.tt)}Be(t,i,n){if(null===this.Et)return;const{context:s,horizontalPixelRatio:e,verticalPixelRatio:r}=t;let h="",l=Math.min(Math.floor(e),Math.floor(this.Et.he*e));l=Math.max(Math.floor(e),Math.min(l,this.le));const a=Math.floor(.5*l);let o=null;for(let t=n.from;t<n.to;t++){const n=i[t];n.Ie!==h&&(s.fillStyle=n.Ie,h=n.Ie);const _=Math.round(Math.min(n.ve,n.pe)*r),u=Math.round(Math.max(n.ve,n.pe)*r),c=Math.round(n.ce*r),d=Math.round(n.de*r);let f=Math.round(e*n.nt)-a;const v=f+l-1;null!==o&&(f=Math.max(o+1,f),f=Math.min(f,v));const p=v-f+1;s.fillRect(f,c,p,_-c),s.fillRect(f,u+1,p,d-u),o=v}}ze(t){let i=Math.floor(1*t);this.le<=2*i&&(i=Math.floor(.5*(this.le-1)));const n=Math.max(Math.floor(t),i);return this.le<=2*n?Math.max(Math.floor(t),Math.floor(1*t)):n}Ae(t,i,n){if(null===this.Et)return;const{context:s,horizontalPixelRatio:e,verticalPixelRatio:r}=t;let h="";const l=this.ze(e);let a=null;for(let t=n.from;t<n.to;t++){const n=i[t];n.Le!==h&&(s.fillStyle=n.Le,h=n.Le);let o=Math.round(n.nt*e)-Math.floor(.5*this.le);const _=o+this.le-1,u=Math.round(Math.min(n.ve,n.pe)*r),c=Math.round(Math.max(n.ve,n.pe)*r);if(null!==a&&(o=Math.max(a+1,o),o=Math.min(o,_)),this.Et.he*e>2*l)q(s,o,u,_-o+1,c-u+1,l);else{const t=_-o+1;s.fillRect(o,u,t,c-u+1)}a=_}}Ee(t,i,n){if(null===this.Et)return;const{context:s,horizontalPixelRatio:e,verticalPixelRatio:r}=t;let h="";const l=this.ze(e);for(let t=n.from;t<n.to;t++){const n=i[t];let a=Math.round(Math.min(n.ve,n.pe)*r),o=Math.round(Math.max(n.ve,n.pe)*r),_=Math.round(n.nt*e)-Math.floor(.5*this.le),u=_+this.le-1;if(n.ue!==h){const t=n.ue;s.fillStyle=t,h=t}this.Et._i&&(_+=l,a+=l,u-=l,o-=l),a>o||s.fillRect(_,a,u-_+1,o-a+1)}}}class $t extends Lt{constructor(){super(...arguments),this.Ws=new Ht}ne(t,i,n){return Object.assign(Object.assign({},this.be(t,i,n)),n.Hs(t))}Gs(){const t=this.Is.W();this.Ws.J({zn:this.zs,he:this.Ls.St().he(),Ve:t.wickVisible,_i:t.borderVisible,tt:this.Es})}}class Ut{constructor(t,i){this.Ne=t,this.Ii=i}X(t,i,n){this.Ne.draw(t,this.Ii,i,n)}}class qt extends At{constructor(t,i,n){super(t,i,!1),this.wn=n,this.Ws=new Ut(this.wn.renderer(),(i=>{const n=t.Ct();return null===n?null:t.Dt().Rt(i,n.Ot)}))}Fe(t){return this.wn.priceValueBuilder(t)}We(t){return this.wn.isWhitespace(t)}qs(){const t=this.Is.$s();this.zs=this.Is.zn().ie().map((i=>Object.assign(Object.assign({ot:i.se,nt:NaN},t.Hs(i.se)),{je:i.He})))}Ks(t,i){i.Js(this.zs,A(this.Es))}Gs(){this.wn.update({bars:this.zs.map(Yt),barSpacing:this.Ls.St().he(),visibleRange:this.Es},this.Is.W())}}function Yt(t){return{x:t.nt,time:t.ot,originalData:t.je,barColor:t.ue}}class Zt extends N{constructor(){super(...arguments),this.Et=null,this.$e=[]}J(t){this.Et=t,this.$e=[]}K({context:t,horizontalPixelRatio:i,verticalPixelRatio:n}){if(null===this.Et||0===this.Et.it.length||null===this.Et.tt)return;this.$e.length||this.Ue(i);const s=Math.max(1,Math.floor(n)),e=Math.round(this.Et.qe*n)-Math.floor(s/2),r=e+s;for(let i=this.Et.tt.from;i<this.Et.tt.to;i++){const h=this.Et.it[i],l=this.$e[i-this.Et.tt.from],a=Math.round(h.st*n);let o,_;t.fillStyle=h.ue,a<=e?(o=a,_=r):(o=e,_=a-Math.floor(s/2)+s),t.fillRect(l.Os,o,l.ui-l.Os+1,_-o)}}Ue(t){if(null===this.Et||0===this.Et.it.length||null===this.Et.tt)return void(this.$e=[]);const i=Math.ceil(this.Et.he*t)<=1?0:Math.max(1,Math.floor(t)),n=Math.round(this.Et.he*t)-i;this.$e=new Array(this.Et.tt.to-this.Et.tt.from);for(let i=this.Et.tt.from;i<this.Et.tt.to;i++){const s=this.Et.it[i],e=Math.round(s.nt*t);let r,h;if(n%2){const t=(n-1)/2;r=e-t,h=e+t}else{const t=n/2;r=e-t,h=e+t-1}this.$e[i-this.Et.tt.from]={Os:r,ui:h,Ye:e,Ze:s.nt*t,ot:s.ot}}for(let t=this.Et.tt.from+1;t<this.Et.tt.to;t++){const n=this.$e[t-this.Et.tt.from],s=this.$e[t-this.Et.tt.from-1];n.ot===s.ot+1&&(n.Os-s.ui!==i+1&&(s.Ye>s.Ze?s.ui=n.Os-i-1:n.Os=s.ui+i+1))}let s=Math.ceil(this.Et.he*t);for(let t=this.Et.tt.from;t<this.Et.tt.to;t++){const i=this.$e[t-this.Et.tt.from];i.ui<i.Os&&(i.ui=i.Os);const n=i.ui-i.Os+1;s=Math.min(n,s)}if(i>0&&s<4)for(let t=this.Et.tt.from;t<this.Et.tt.to;t++){const i=this.$e[t-this.Et.tt.from];i.ui-i.Os+1>s&&(i.Ye>i.Ze?i.ui-=1:i.Os+=1)}}}class Xt extends zt{constructor(){super(...arguments),this.Ws=new Zt}ne(t,i,n){return Object.assign(Object.assign({},this.te(t,i)),n.Hs(t))}Gs(){const t={it:this.zs,he:this.Ls.St().he(),tt:this.Es,qe:this.Is.Dt().Rt(this.Is.W().base,f(this.Is.Ct()).Ot)};this.Ws.J(t)}}class Kt extends zt{constructor(){super(...arguments),this.Ws=new Tt}ne(t,i,n){return Object.assign(Object.assign({},this.te(t,i)),n.Hs(t))}Gs(){const t=this.Is.W(),i={it:this.zs,Nt:t.lineStyle,ds:t.lineVisible?t.lineType:void 0,et:t.lineWidth,Rs:t.pointMarkersVisible?t.pointMarkersRadius||t.lineWidth/2+2:void 0,tt:this.Es,cs:this.Ls.St().he()};this.Ws.J(i)}}const Gt=/[2-9]/g;class Jt{constructor(t=50){this.Xe=0,this.Ke=1,this.Ge=1,this.Je={},this.Qe=new Map,this.tr=t}ir(){this.Xe=0,this.Qe.clear(),this.Ke=1,this.Ge=1,this.Je={}}xi(t,i,n){return this.nr(t,i,n).width}Mi(t,i,n){const s=this.nr(t,i,n);return((s.actualBoundingBoxAscent||0)-(s.actualBoundingBoxDescent||0))/2}nr(t,i,n){const s=n||Gt,e=String(i).replace(s,"0");if(this.Qe.has(e))return d(this.Qe.get(e)).sr;if(this.Xe===this.tr){const t=this.Je[this.Ge];delete this.Je[this.Ge],this.Qe.delete(t),this.Ge++,this.Xe--}t.save(),t.textBaseline="middle";const r=t.measureText(e);return t.restore(),0===r.width&&i.length||(this.Qe.set(e,{sr:r,er:this.Ke}),this.Je[this.Ke]=e,this.Xe++,this.Ke++),r}}class Qt{constructor(t){this.rr=null,this.k=null,this.hr="right",this.lr=t}ar(t,i,n){this.rr=t,this.k=i,this.hr=n}X(t){null!==this.k&&null!==this.rr&&this.rr.X(t,this.k,this.lr,this.hr)}}class ti{constructor(t,i,n){this._r=t,this.lr=new Jt(50),this.ur=i,this.F=n,this.j=-1,this.Wt=new Qt(this.lr)}gt(){const t=this.F.cr(this.ur);if(null===t)return null;const i=t.dr(this.ur)?t.vr():this.ur.Dt();if(null===i)return null;const n=t.pr(i);if("overlay"===n)return null;const s=this.F.mr();return s.P!==this.j&&(this.j=s.P,this.lr.ir()),this.Wt.ar(this._r.zi(),s,n),this.Wt}}class ii extends N{constructor(){super(...arguments),this.Et=null}J(t){this.Et=t}br(t,i){var n;if(!(null===(n=this.Et)||void 0===n?void 0:n.yt))return null;const{st:s,et:e,wr:r}=this.Et;return i>=s-e-7&&i<=s+e+7?{gr:this.Et,wr:r}:null}K({context:t,bitmapSize:i,horizontalPixelRatio:n,verticalPixelRatio:s}){if(null===this.Et)return;if(!1===this.Et.yt)return;const e=Math.round(this.Et.st*s);e<0||e>i.height||(t.lineCap="butt",t.strokeStyle=this.Et.O,t.lineWidth=Math.floor(this.Et.et*n),_(t,this.Et.Nt),u(t,e,0,i.width))}}class ni{constructor(t){this.Mr={st:0,O:"rgba(0, 0, 0, 0)",et:1,Nt:0,yt:!1},this.Sr=new ii,this.ft=!0,this.Is=t,this.Ls=t.$t(),this.Sr.J(this.Mr)}bt(){this.ft=!0}gt(){return this.Is.yt()?(this.ft&&(this.kr(),this.ft=!1),this.Sr):null}}class si extends ni{constructor(t){super(t)}kr(){this.Mr.yt=!1;const t=this.Is.Dt(),i=t.yr().yr;if(2!==i&&3!==i)return;const n=this.Is.W();if(!n.baseLineVisible||!this.Is.yt())return;const s=this.Is.Ct();null!==s&&(this.Mr.yt=!0,this.Mr.st=t.Rt(s.Ot,s.Ot),this.Mr.O=n.baseLineColor,this.Mr.et=n.baseLineWidth,this.Mr.Nt=n.baseLineStyle)}}class ei extends N{constructor(){super(...arguments),this.Et=null}J(t){this.Et=t}He(){return this.Et}K({context:t,horizontalPixelRatio:i,verticalPixelRatio:n}){const s=this.Et;if(null===s)return;const e=Math.max(1,Math.floor(i)),r=e%2/2,h=Math.round(s.Ze.x*i)+r,l=s.Ze.y*n;t.fillStyle=s.Cr,t.beginPath();const a=Math.max(2,1.5*s.Tr)*i;t.arc(h,l,a,0,2*Math.PI,!1),t.fill(),t.fillStyle=s.Pr,t.beginPath(),t.arc(h,l,s.ht*i,0,2*Math.PI,!1),t.fill(),t.lineWidth=e,t.strokeStyle=s.Rr,t.beginPath(),t.arc(h,l,s.ht*i+e/2,0,2*Math.PI,!1),t.stroke()}}const ri=[{Dr:0,Or:.25,Vr:4,Br:10,Ar:.25,zr:0,Er:.4,Ir:.8},{Dr:.25,Or:.525,Vr:10,Br:14,Ar:0,zr:0,Er:.8,Ir:0},{Dr:.525,Or:1,Vr:14,Br:14,Ar:0,zr:0,Er:0,Ir:0}];function hi(t,i,n,s){return function(t,i){if("transparent"===t)return t;const n=S(t),s=n[3];return`rgba(${n[0]}, ${n[1]}, ${n[2]}, ${i*s})`}(t,n+(s-n)*i)}function li(t,i){const n=t%2600/2600;let s;for(const t of ri)if(n>=t.Dr&&n<=t.Or){s=t;break}c(void 0!==s,"Last price animation internal logic error");const e=(n-s.Dr)/(s.Or-s.Dr);return{Pr:hi(i,e,s.Ar,s.zr),Rr:hi(i,e,s.Er,s.Ir),ht:(r=e,h=s.Vr,l=s.Br,h+(l-h)*r)};var r,h,l}class ai{constructor(t){this.Wt=new ei,this.ft=!0,this.Lr=!0,this.Nr=performance.now(),this.Fr=this.Nr-1,this.Wr=t}jr(){this.Fr=this.Nr-1,this.bt()}Hr(){if(this.bt(),2===this.Wr.W().lastPriceAnimation){const t=performance.now(),i=this.Fr-t;if(i>0)return void(i<650&&(this.Fr+=2600));this.Nr=t,this.Fr=t+2600}}bt(){this.ft=!0}$r(){this.Lr=!0}yt(){return 0!==this.Wr.W().lastPriceAnimation}Ur(){switch(this.Wr.W().lastPriceAnimation){case 0:return!1;case 1:return!0;case 2:return performance.now()<=this.Fr}}gt(){return this.ft?(this.Mt(),this.ft=!1,this.Lr=!1):this.Lr&&(this.qr(),this.Lr=!1),this.Wt}Mt(){this.Wt.J(null);const t=this.Wr.$t().St(),i=t.Zs(),n=this.Wr.Ct();if(null===i||null===n)return;const s=this.Wr.Yr(!0);if(s.Zr||!i.Xr(s.se))return;const e={x:t.zt(s.se),y:this.Wr.Dt().Rt(s._t,n.Ot)},r=s.O,h=this.Wr.W().lineWidth,l=li(this.Kr(),r);this.Wt.J({Cr:r,Tr:h,Pr:l.Pr,Rr:l.Rr,ht:l.ht,Ze:e})}qr(){const t=this.Wt.He();if(null!==t){const i=li(this.Kr(),t.Cr);t.Pr=i.Pr,t.Rr=i.Rr,t.ht=i.ht}}Kr(){return this.Ur()?performance.now()-this.Nr:2599}}function oi(t,i){return xt(Math.min(Math.max(t,12),30)*i)}function _i(t,i){switch(t){case"arrowDown":case"arrowUp":return oi(i,1);case"circle":return oi(i,.8);case"square":return oi(i,.7)}}function ui(t){return function(t){const i=Math.ceil(t);return i%2!=0?i-1:i}(oi(t,1))}function ci(t){return Math.max(oi(t,.1),3)}function di(t,i,n){return i?t:n?Math.ceil(t/2):0}function fi(t,i,n,s,e){const r=_i("square",n),h=(r-1)/2,l=t-h,a=i-h;return s>=l&&s<=l+r&&e>=a&&e<=a+r}function vi(t,i,n,s){const e=(_i("arrowUp",s)-1)/2*n.Gr,r=(xt(s/2)-1)/2*n.Gr;i.beginPath(),t?(i.moveTo(n.nt-e,n.st),i.lineTo(n.nt,n.st-e),i.lineTo(n.nt+e,n.st),i.lineTo(n.nt+r,n.st),i.lineTo(n.nt+r,n.st+e),i.lineTo(n.nt-r,n.st+e),i.lineTo(n.nt-r,n.st)):(i.moveTo(n.nt-e,n.st),i.lineTo(n.nt,n.st+e),i.lineTo(n.nt+e,n.st),i.lineTo(n.nt+r,n.st),i.lineTo(n.nt+r,n.st-e),i.lineTo(n.nt-r,n.st-e),i.lineTo(n.nt-r,n.st)),i.fill()}function pi(t,i,n,s,e,r){return fi(i,n,s,e,r)}class mi extends N{constructor(){super(...arguments),this.Et=null,this.lr=new Jt,this.j=-1,this.H="",this.Jr=""}J(t){this.Et=t}ar(t,i){this.j===t&&this.H===i||(this.j=t,this.H=i,this.Jr=E(t,i),this.lr.ir())}br(t,i){if(null===this.Et||null===this.Et.tt)return null;for(let n=this.Et.tt.from;n<this.Et.tt.to;n++){const s=this.Et.it[n];if(wi(s,t,i))return{gr:s.Qr,wr:s.wr}}return null}K({context:t,horizontalPixelRatio:i,verticalPixelRatio:n},s,e){if(null!==this.Et&&null!==this.Et.tt){t.textBaseline="middle",t.font=this.Jr;for(let s=this.Et.tt.from;s<this.Et.tt.to;s++){const e=this.Et.it[s];void 0!==e.Kt&&(e.Kt.Hi=this.lr.xi(t,e.Kt.th),e.Kt.At=this.j,e.Kt.nt=e.nt-e.Kt.Hi/2),bi(e,t,i,n)}}}}function bi(t,i,n,s){i.fillStyle=t.O,void 0!==t.Kt&&function(t,i,n,s,e,r){t.save(),t.scale(e,r),t.fillText(i,n,s),t.restore()}(i,t.Kt.th,t.Kt.nt,t.Kt.st,n,s),function(t,i,n){if(0===t.Xs)return;switch(t.ih){case"arrowDown":return void vi(!1,i,n,t.Xs);case"arrowUp":return void vi(!0,i,n,t.Xs);case"circle":return void function(t,i,n){const s=(_i("circle",n)-1)/2;t.beginPath(),t.arc(i.nt,i.st,s*i.Gr,0,2*Math.PI,!1),t.fill()}(i,n,t.Xs);case"square":return void function(t,i,n){const s=_i("square",n),e=(s-1)*i.Gr/2,r=i.nt-e,h=i.st-e;t.fillRect(r,h,s*i.Gr,s*i.Gr)}(i,n,t.Xs)}t.ih}(t,i,function(t,i,n){const s=Math.max(1,Math.floor(i))%2/2;return{nt:Math.round(t.nt*i)+s,st:t.st*n,Gr:i}}(t,n,s))}function wi(t,i,n){return!(void 0===t.Kt||!function(t,i,n,s,e,r){const h=s/2;return e>=t&&e<=t+n&&r>=i-h&&r<=i+h}(t.Kt.nt,t.Kt.st,t.Kt.Hi,t.Kt.At,i,n))||function(t,i,n){if(0===t.Xs)return!1;switch(t.ih){case"arrowDown":case"arrowUp":return pi(0,t.nt,t.st,t.Xs,i,n);case"circle":return function(t,i,n,s,e){const r=2+_i("circle",n)/2,h=t-s,l=i-e;return Math.sqrt(h*h+l*l)<=r}(t.nt,t.st,t.Xs,i,n);case"square":return fi(t.nt,t.st,t.Xs,i,n)}}(t,i,n)}function gi(t,i,n,s,e,r,h,l,a){const o=P(n)?n:n.xe,_=P(n)?n:n.ge,u=P(n)?n:n.Me,c=P(i.size)?Math.max(i.size,0):1,d=ui(l.he())*c,f=d/2;switch(t.Xs=d,i.position){case"inBar":return t.st=h.Rt(o,a),void(void 0!==t.Kt&&(t.Kt.st=t.st+f+r+.6*e));case"aboveBar":return t.st=h.Rt(_,a)-f-s.nh,void 0!==t.Kt&&(t.Kt.st=t.st-f-.6*e,s.nh+=1.2*e),void(s.nh+=d+r);case"belowBar":return t.st=h.Rt(u,a)+f+s.sh,void 0!==t.Kt&&(t.Kt.st=t.st+f+r+.6*e,s.sh+=1.2*e),void(s.sh+=d+r)}i.position}class Mi{constructor(t,i){this.ft=!0,this.eh=!0,this.rh=!0,this.hh=null,this.ah=null,this.Wt=new mi,this.Wr=t,this.$i=i,this.Et={it:[],tt:null}}bt(t){this.ft=!0,this.rh=!0,"data"===t&&(this.eh=!0,this.ah=null)}gt(t){if(!this.Wr.yt())return null;this.ft&&this.oh();const i=this.$i.W().layout;return this.Wt.ar(i.fontSize,i.fontFamily),this.Wt.J(this.Et),this.Wt}_h(){if(this.rh){if(this.Wr.uh().length>0){const t=this.$i.St().he(),i=ci(t),n=1.5*ui(t)+2*i,s=this.dh();this.hh={above:di(n,s.aboveBar,s.inBar),below:di(n,s.belowBar,s.inBar)}}else this.hh=null;this.rh=!1}return this.hh}dh(){return null===this.ah&&(this.ah=this.Wr.uh().reduce(((t,i)=>(t[i.position]||(t[i.position]=!0),t)),{inBar:!1,aboveBar:!1,belowBar:!1})),this.ah}oh(){const t=this.Wr.Dt(),i=this.$i.St(),n=this.Wr.uh();this.eh&&(this.Et.it=n.map((t=>({ot:t.time,nt:0,st:0,Xs:0,ih:t.shape,O:t.color,Qr:t.Qr,wr:t.id,Kt:void 0}))),this.eh=!1);const s=this.$i.W().layout;this.Et.tt=null;const e=i.Zs();if(null===e)return;const r=this.Wr.Ct();if(null===r)return;if(0===this.Et.it.length)return;let h=NaN;const l=ci(i.he()),a={nh:l,sh:l};this.Et.tt=Bt(this.Et.it,e,!0);for(let e=this.Et.tt.from;e<this.Et.tt.to;e++){const o=n[e];o.time!==h&&(a.nh=l,a.sh=l,h=o.time);const _=this.Et.it[e];_.nt=i.zt(o.time),void 0!==o.text&&o.text.length>0&&(_.Kt={th:o.text,nt:0,st:0,Hi:0,At:0});const u=this.Wr.fh(o.time);null!==u&&gi(_,o,u,a,s.fontSize,l,t,i,r.Ot)}this.ft=!1}}class xi extends ni{constructor(t){super(t)}kr(){const t=this.Mr;t.yt=!1;const i=this.Is.W();if(!i.priceLineVisible||!this.Is.yt())return;const n=this.Is.Yr(0===i.priceLineSource);n.Zr||(t.yt=!0,t.st=n.ki,t.O=this.Is.ph(n.O),t.et=i.priceLineWidth,t.Nt=i.priceLineStyle)}}class Si extends J{constructor(t){super(),this.jt=t}Ei(t,i,n){t.yt=!1,i.yt=!1;const s=this.jt;if(!s.yt())return;const e=s.W(),r=e.lastValueVisible,h=""!==s.mh(),l=0===e.seriesLastValueMode,a=s.Yr(!1);if(a.Zr)return;r&&(t.Kt=this.bh(a,r,l),t.yt=0!==t.Kt.length),(h||l)&&(i.Kt=this.wh(a,r,h,l),i.yt=i.Kt.length>0);const o=s.ph(a.O),_=y(o);n.t=_.t,n.ki=a.ki,i.Vt=s.$t().Bt(a.ki/s.Dt().At()),t.Vt=o,t.O=_.i,i.O=_.i}wh(t,i,n,s){let e="";const r=this.jt.mh();return n&&0!==r.length&&(e+=`${r} `),i&&s&&(e+=this.jt.Dt().gh()?t.Mh:t.xh),e.trim()}bh(t,i,n){return i?n?this.jt.Dt().gh()?t.xh:t.Mh:t.Kt:""}}function ki(t,i,n,s){const e=Number.isFinite(i),r=Number.isFinite(n);return e&&r?t(i,n):e||r?e?i:n:s}class yi{constructor(t,i){this.Sh=t,this.kh=i}yh(t){return null!==t&&(this.Sh===t.Sh&&this.kh===t.kh)}Ch(){return new yi(this.Sh,this.kh)}Th(){return this.Sh}Ph(){return this.kh}Rh(){return this.kh-this.Sh}Ni(){return this.kh===this.Sh||Number.isNaN(this.kh)||Number.isNaN(this.Sh)}ts(t){return null===t?this:new yi(ki(Math.min,this.Th(),t.Th(),-1/0),ki(Math.max,this.Ph(),t.Ph(),1/0))}Dh(t){if(!P(t))return;if(0===this.kh-this.Sh)return;const i=.5*(this.kh+this.Sh);let n=this.kh-i,s=this.Sh-i;n*=t,s*=t,this.kh=i+n,this.Sh=i+s}Oh(t){P(t)&&(this.kh+=t,this.Sh+=t)}Vh(){return{minValue:this.Sh,maxValue:this.kh}}static Bh(t){return null===t?null:new yi(t.minValue,t.maxValue)}}class Ci{constructor(t,i){this.Ah=t,this.zh=i||null}Eh(){return this.Ah}Ih(){return this.zh}Vh(){return null===this.Ah?null:{priceRange:this.Ah.Vh(),margins:this.zh||void 0}}static Bh(t){return null===t?null:new Ci(yi.Bh(t.priceRange),t.margins)}}class Ti extends ni{constructor(t,i){super(t),this.Lh=i}kr(){const t=this.Mr;t.yt=!1;const i=this.Lh.W();if(!this.Is.yt()||!i.lineVisible)return;const n=this.Lh.Nh();null!==n&&(t.yt=!0,t.st=n,t.O=i.color,t.et=i.lineWidth,t.Nt=i.lineStyle,t.wr=this.Lh.W().id)}}class Pi extends J{constructor(t,i){super(),this.Wr=t,this.Lh=i}Ei(t,i,n){t.yt=!1,i.yt=!1;const s=this.Lh.W(),e=s.axisLabelVisible,r=""!==s.title,h=this.Wr;if(!e||!h.yt())return;const l=this.Lh.Nh();if(null===l)return;r&&(i.Kt=s.title,i.yt=!0),i.Vt=h.$t().Bt(l/h.Dt().At()),t.Kt=this.Fh(s.price),t.yt=!0;const a=y(s.axisLabelColor||s.color);n.t=a.t;const o=s.axisLabelTextColor||a.i;t.O=o,i.O=o,n.ki=l}Fh(t){const i=this.Wr.Ct();return null===i?"":this.Wr.Dt().Fi(t,i.Ot)}}class Ri{constructor(t,i){this.Wr=t,this.cn=i,this.Wh=new Ti(t,this),this._r=new Pi(t,this),this.jh=new ti(this._r,t,t.$t())}Hh(t){T(this.cn,t),this.bt(),this.Wr.$t().$h()}W(){return this.cn}Uh(){return this.Wh}qh(){return this.jh}Yh(){return this._r}bt(){this.Wh.bt(),this._r.bt()}Nh(){const t=this.Wr,i=t.Dt();if(t.$t().St().Ni()||i.Ni())return null;const n=t.Ct();return null===n?null:i.Rt(this.cn.price,n.Ot)}}class Di extends st{constructor(t){super(),this.$i=t}$t(){return this.$i}}const Oi={Bar:(t,i,n,s)=>{var e;const r=i.upColor,h=i.downColor,l=f(t(n,s)),a=v(l.Ot[0])<=v(l.Ot[3]);return{ue:null!==(e=l.O)&&void 0!==e?e:a?r:h}},Candlestick:(t,i,n,s)=>{var e,r,h;const l=i.upColor,a=i.downColor,o=i.borderUpColor,_=i.borderDownColor,u=i.wickUpColor,c=i.wickDownColor,d=f(t(n,s)),p=v(d.Ot[0])<=v(d.Ot[3]);return{ue:null!==(e=d.O)&&void 0!==e?e:p?l:a,Le:null!==(r=d.Vt)&&void 0!==r?r:p?o:_,Ie:null!==(h=d.Zh)&&void 0!==h?h:p?u:c}},Custom:(t,i,n,s)=>{var e;return{ue:null!==(e=f(t(n,s)).O)&&void 0!==e?e:i.color}},Area:(t,i,n,s)=>{var e,r,h,l;const a=f(t(n,s));return{ue:null!==(e=a.lt)&&void 0!==e?e:i.lineColor,lt:null!==(r=a.lt)&&void 0!==r?r:i.lineColor,Ts:null!==(h=a.Ts)&&void 0!==h?h:i.topColor,Ps:null!==(l=a.Ps)&&void 0!==l?l:i.bottomColor}},Baseline:(t,i,n,s)=>{var e,r,h,l,a,o;const _=f(t(n,s));return{ue:_.Ot[3]>=i.baseValue.price?i.topLineColor:i.bottomLineColor,Pe:null!==(e=_.Pe)&&void 0!==e?e:i.topLineColor,Re:null!==(r=_.Re)&&void 0!==r?r:i.bottomLineColor,Se:null!==(h=_.Se)&&void 0!==h?h:i.topFillColor1,ke:null!==(l=_.ke)&&void 0!==l?l:i.topFillColor2,ye:null!==(a=_.ye)&&void 0!==a?a:i.bottomFillColor1,Ce:null!==(o=_.Ce)&&void 0!==o?o:i.bottomFillColor2}},Line:(t,i,n,s)=>{var e,r;const h=f(t(n,s));return{ue:null!==(e=h.O)&&void 0!==e?e:i.color,lt:null!==(r=h.O)&&void 0!==r?r:i.color}},Histogram:(t,i,n,s)=>{var e;return{ue:null!==(e=f(t(n,s)).O)&&void 0!==e?e:i.color}}};class Vi{constructor(t){this.Xh=(t,i)=>void 0!==i?i.Ot:this.Wr.zn().Kh(t),this.Wr=t,this.Gh=Oi[t.Jh()]}Hs(t,i){return this.Gh(this.Xh,this.Wr.W(),t,i)}}var Bi;!function(t){t[t.NearestLeft=-1]="NearestLeft",t[t.None=0]="None",t[t.NearestRight=1]="NearestRight"}(Bi||(Bi={}));const Ai=30;class zi{constructor(){this.Qh=[],this.tl=new Map,this.il=new Map}nl(){return this.Xs()>0?this.Qh[this.Qh.length-1]:null}sl(){return this.Xs()>0?this.el(0):null}An(){return this.Xs()>0?this.el(this.Qh.length-1):null}Xs(){return this.Qh.length}Ni(){return 0===this.Xs()}Xr(t){return null!==this.rl(t,0)}Kh(t){return this.hl(t)}hl(t,i=0){const n=this.rl(t,i);return null===n?null:Object.assign(Object.assign({},this.ll(n)),{se:this.el(n)})}ie(){return this.Qh}al(t,i,n){if(this.Ni())return null;let s=null;for(const e of n){s=Ei(s,this.ol(t,i,e))}return s}J(t){this.il.clear(),this.tl.clear(),this.Qh=t}el(t){return this.Qh[t].se}ll(t){return this.Qh[t]}rl(t,i){const n=this._l(t);if(null===n&&0!==i)switch(i){case-1:return this.ul(t);case 1:return this.cl(t);default:throw new TypeError("Unknown search mode")}return n}ul(t){let i=this.dl(t);return i>0&&(i-=1),i!==this.Qh.length&&this.el(i)<t?i:null}cl(t){const i=this.fl(t);return i!==this.Qh.length&&t<this.el(i)?i:null}_l(t){const i=this.dl(t);return i===this.Qh.length||t<this.Qh[i].se?null:i}dl(t){return Rt(this.Qh,t,((t,i)=>t.se<i))}fl(t){return Dt(this.Qh,t,((t,i)=>t.se>i))}vl(t,i,n){let s=null;for(let e=t;e<i;e++){const t=this.Qh[e].Ot[n];Number.isNaN(t)||(null===s?s={pl:t,ml:t}:(t<s.pl&&(s.pl=t),t>s.ml&&(s.ml=t)))}return s}ol(t,i,n){if(this.Ni())return null;let s=null;const e=f(this.sl()),r=f(this.An()),h=Math.max(t,e),l=Math.min(i,r),a=Math.ceil(h/Ai)*Ai,o=Math.max(a,Math.floor(l/Ai)*Ai);{const t=this.dl(h),e=this.fl(Math.min(l,a,i));s=Ei(s,this.vl(t,e,n))}let _=this.tl.get(n);void 0===_&&(_=new Map,this.tl.set(n,_));for(let t=Math.max(a+1,h);t<o;t+=Ai){const i=Math.floor(t/Ai);let e=_.get(i);if(void 0===e){const t=this.dl(i*Ai),s=this.fl((i+1)*Ai-1);e=this.vl(t,s,n),_.set(i,e)}s=Ei(s,e)}{const t=this.dl(o),i=this.fl(l);s=Ei(s,this.vl(t,i,n))}return s}}function Ei(t,i){if(null===t)return i;if(null===i)return t;return{pl:Math.min(t.pl,i.pl),ml:Math.max(t.ml,i.ml)}}class Ii{constructor(t){this.bl=t}X(t,i,n){this.bl.draw(t)}wl(t,i,n){var s,e;null===(e=(s=this.bl).drawBackground)||void 0===e||e.call(s,t)}}class Li{constructor(t){this.Qe=null,this.wn=t}gt(){var t;const i=this.wn.renderer();if(null===i)return null;if((null===(t=this.Qe)||void 0===t?void 0:t.gl)===i)return this.Qe.Ml;const n=new Ii(i);return this.Qe={gl:i,Ml:n},n}xl(){var t,i,n;return null!==(n=null===(i=(t=this.wn).zOrder)||void 0===i?void 0:i.call(t))&&void 0!==n?n:"normal"}}function Ni(t){var i,n,s,e,r;return{Kt:t.text(),ki:t.coordinate(),Si:null===(i=t.fixedCoordinate)||void 0===i?void 0:i.call(t),O:t.textColor(),t:t.backColor(),yt:null===(s=null===(n=t.visible)||void 0===n?void 0:n.call(t))||void 0===s||s,hi:null===(r=null===(e=t.tickVisible)||void 0===e?void 0:e.call(t))||void 0===r||r}}class Fi{constructor(t,i){this.Wt=new it,this.Sl=t,this.kl=i}gt(){return this.Wt.J(Object.assign({Hi:this.kl.Hi()},Ni(this.Sl))),this.Wt}}class Wi extends J{constructor(t,i){super(),this.Sl=t,this.Ii=i}Ei(t,i,n){const s=Ni(this.Sl);n.t=s.t,t.O=s.O;const e=2/12*this.Ii.P();n.wi=e,n.gi=e,n.ki=s.ki,n.Si=s.Si,t.Kt=s.Kt,t.yt=s.yt,t.hi=s.hi}}class ji{constructor(t,i){this.yl=null,this.Cl=null,this.Tl=null,this.Pl=null,this.Rl=null,this.Dl=t,this.Wr=i}Ol(){return this.Dl}On(){var t,i;null===(i=(t=this.Dl).updateAllViews)||void 0===i||i.call(t)}Pn(){var t,i,n,s;const e=null!==(n=null===(i=(t=this.Dl).paneViews)||void 0===i?void 0:i.call(t))&&void 0!==n?n:[];if((null===(s=this.yl)||void 0===s?void 0:s.gl)===e)return this.yl.Ml;const r=e.map((t=>new Li(t)));return this.yl={gl:e,Ml:r},r}Qi(){var t,i,n,s;const e=null!==(n=null===(i=(t=this.Dl).timeAxisViews)||void 0===i?void 0:i.call(t))&&void 0!==n?n:[];if((null===(s=this.Cl)||void 0===s?void 0:s.gl)===e)return this.Cl.Ml;const r=this.Wr.$t().St(),h=e.map((t=>new Fi(t,r)));return this.Cl={gl:e,Ml:h},h}Rn(){var t,i,n,s;const e=null!==(n=null===(i=(t=this.Dl).priceAxisViews)||void 0===i?void 0:i.call(t))&&void 0!==n?n:[];if((null===(s=this.Tl)||void 0===s?void 0:s.gl)===e)return this.Tl.Ml;const r=this.Wr.Dt(),h=e.map((t=>new Wi(t,r)));return this.Tl={gl:e,Ml:h},h}Vl(){var t,i,n,s;const e=null!==(n=null===(i=(t=this.Dl).priceAxisPaneViews)||void 0===i?void 0:i.call(t))&&void 0!==n?n:[];if((null===(s=this.Pl)||void 0===s?void 0:s.gl)===e)return this.Pl.Ml;const r=e.map((t=>new Li(t)));return this.Pl={gl:e,Ml:r},r}Bl(){var t,i,n,s;const e=null!==(n=null===(i=(t=this.Dl).timeAxisPaneViews)||void 0===i?void 0:i.call(t))&&void 0!==n?n:[];if((null===(s=this.Rl)||void 0===s?void 0:s.gl)===e)return this.Rl.Ml;const r=e.map((t=>new Li(t)));return this.Rl={gl:e,Ml:r},r}Al(t,i){var n,s,e;return null!==(e=null===(s=(n=this.Dl).autoscaleInfo)||void 0===s?void 0:s.call(n,t,i))&&void 0!==e?e:null}br(t,i){var n,s,e;return null!==(e=null===(s=(n=this.Dl).hitTest)||void 0===s?void 0:s.call(n,t,i))&&void 0!==e?e:null}}function Hi(t,i,n,s){t.forEach((t=>{i(t).forEach((t=>{t.xl()===n&&s.push(t)}))}))}function $i(t){return t.Pn()}function Ui(t){return t.Vl()}function qi(t){return t.Bl()}class Yi extends Di{constructor(t,i,n,s,e){super(t),this.Et=new zi,this.Wh=new xi(this),this.zl=[],this.El=new si(this),this.Il=null,this.Ll=null,this.Nl=[],this.Fl=[],this.Wl=null,this.jl=[],this.cn=i,this.Hl=n;const r=new Si(this);this.rn=[r],this.jh=new ti(r,this,t),"Area"!==n&&"Line"!==n&&"Baseline"!==n||(this.Il=new ai(this)),this.$l(),this.Ul(e)}S(){null!==this.Wl&&clearTimeout(this.Wl)}ph(t){return this.cn.priceLineColor||t}Yr(t){const i={Zr:!0},n=this.Dt();if(this.$t().St().Ni()||n.Ni()||this.Et.Ni())return i;const s=this.$t().St().Zs(),e=this.Ct();if(null===s||null===e)return i;let r,h;if(t){const t=this.Et.nl();if(null===t)return i;r=t,h=t.se}else{const t=this.Et.hl(s.ui(),-1);if(null===t)return i;if(r=this.Et.Kh(t.se),null===r)return i;h=t.se}const l=r.Ot[3],a=this.$s().Hs(h,{Ot:r}),o=n.Rt(l,e.Ot);return{Zr:!1,_t:l,Kt:n.Fi(l,e.Ot),Mh:n.ql(l),xh:n.Yl(l,e.Ot),O:a.ue,ki:o,se:h}}$s(){return null!==this.Ll||(this.Ll=new Vi(this)),this.Ll}W(){return this.cn}Hh(t){const i=t.priceScaleId;void 0!==i&&i!==this.cn.priceScaleId&&this.$t().Zl(this,i),T(this.cn,t),void 0!==t.priceFormat&&(this.$l(),this.$t().Xl()),this.$t().Kl(this),this.$t().Gl(),this.wn.bt("options")}J(t,i){this.Et.J(t),this.Jl(),this.wn.bt("data"),this.dn.bt("data"),null!==this.Il&&(i&&i.Ql?this.Il.Hr():0===t.length&&this.Il.jr());const n=this.$t().cr(this);this.$t().ta(n),this.$t().Kl(this),this.$t().Gl(),this.$t().$h()}ia(t){this.Nl=t,this.Jl();const i=this.$t().cr(this);this.dn.bt("data"),this.$t().ta(i),this.$t().Kl(this),this.$t().Gl(),this.$t().$h()}na(){return this.Nl}uh(){return this.Fl}sa(t){const i=new Ri(this,t);return this.zl.push(i),this.$t().Kl(this),i}ea(t){const i=this.zl.indexOf(t);-1!==i&&this.zl.splice(i,1),this.$t().Kl(this)}Jh(){return this.Hl}Ct(){const t=this.ra();return null===t?null:{Ot:t.Ot[3],ha:t.ot}}ra(){const t=this.$t().St().Zs();if(null===t)return null;const i=t.Os();return this.Et.hl(i,1)}zn(){return this.Et}fh(t){const i=this.Et.Kh(t);return null===i?null:"Bar"===this.Hl||"Candlestick"===this.Hl||"Custom"===this.Hl?{we:i.Ot[0],ge:i.Ot[1],Me:i.Ot[2],xe:i.Ot[3]}:i.Ot[3]}la(t){const i=[];Hi(this.jl,$i,"top",i);const n=this.Il;return null!==n&&n.yt()?(null===this.Wl&&n.Ur()&&(this.Wl=setTimeout((()=>{this.Wl=null,this.$t().aa()}),0)),n.$r(),i.unshift(n),i):i}Pn(){const t=[];this.oa()||t.push(this.El),t.push(this.wn,this.Wh,this.dn);const i=this.zl.map((t=>t.Uh()));return t.push(...i),Hi(this.jl,$i,"normal",t),t}_a(){return this.ua($i,"bottom")}ca(t){return this.ua(Ui,t)}da(t){return this.ua(qi,t)}fa(t,i){return this.jl.map((n=>n.br(t,i))).filter((t=>null!==t))}Ji(t){return[this.jh,...this.zl.map((t=>t.qh()))]}Rn(t,i){if(i!==this.Yi&&!this.oa())return[];const n=[...this.rn];for(const t of this.zl)n.push(t.Yh());return this.jl.forEach((t=>{n.push(...t.Rn())})),n}Qi(){const t=[];return this.jl.forEach((i=>{t.push(...i.Qi())})),t}Al(t,i){if(void 0!==this.cn.autoscaleInfoProvider){const n=this.cn.autoscaleInfoProvider((()=>{const n=this.va(t,i);return null===n?null:n.Vh()}));return Ci.Bh(n)}return this.va(t,i)}pa(){return this.cn.priceFormat.minMove}ma(){return this.ba}On(){var t;this.wn.bt(),this.dn.bt();for(const t of this.rn)t.bt();for(const t of this.zl)t.bt();this.Wh.bt(),this.El.bt(),null===(t=this.Il)||void 0===t||t.bt(),this.jl.forEach((t=>t.On()))}Dt(){return f(super.Dt())}kt(t){if(!(("Line"===this.Hl||"Area"===this.Hl||"Baseline"===this.Hl)&&this.cn.crosshairMarkerVisible))return null;const i=this.Et.Kh(t);if(null===i)return null;return{_t:i.Ot[3],ht:this.wa(),Vt:this.ga(),Pt:this.Ma(),Tt:this.xa(t)}}mh(){return this.cn.title}yt(){return this.cn.visible}Sa(t){this.jl.push(new ji(t,this))}ka(t){this.jl=this.jl.filter((i=>i.Ol()!==t))}ya(){if(this.wn instanceof qt!=!1)return t=>this.wn.Fe(t)}Ca(){if(this.wn instanceof qt!=!1)return t=>this.wn.We(t)}oa(){return!ht(this.Dt().Ta())}va(t,i){if(!R(t)||!R(i)||this.Et.Ni())return null;const n="Line"===this.Hl||"Area"===this.Hl||"Baseline"===this.Hl||"Histogram"===this.Hl?[3]:[2,1],s=this.Et.al(t,i,n);let e=null!==s?new yi(s.pl,s.ml):null;if("Histogram"===this.Jh()){const t=this.cn.base,i=new yi(t,t);e=null!==e?e.ts(i):i}let r=this.dn._h();return this.jl.forEach((n=>{const s=n.Al(t,i);if(null==s?void 0:s.priceRange){const t=new yi(s.priceRange.minValue,s.priceRange.maxValue);e=null!==e?e.ts(t):t}var h,l,a,o;(null==s?void 0:s.margins)&&(h=r,l=s.margins,r={above:Math.max(null!==(a=null==h?void 0:h.above)&&void 0!==a?a:0,l.above),below:Math.max(null!==(o=null==h?void 0:h.below)&&void 0!==o?o:0,l.below)})})),new Ci(e,r)}wa(){switch(this.Hl){case"Line":case"Area":case"Baseline":return this.cn.crosshairMarkerRadius}return 0}ga(){switch(this.Hl){case"Line":case"Area":case"Baseline":{const t=this.cn.crosshairMarkerBorderColor;if(0!==t.length)return t}}return null}Ma(){switch(this.Hl){case"Line":case"Area":case"Baseline":return this.cn.crosshairMarkerBorderWidth}return 0}xa(t){switch(this.Hl){case"Line":case"Area":case"Baseline":{const t=this.cn.crosshairMarkerBackgroundColor;if(0!==t.length)return t}}return this.$s().Hs(t).ue}$l(){switch(this.cn.priceFormat.type){case"custom":this.ba={format:this.cn.priceFormat.formatter};break;case"volume":this.ba=new ct(this.cn.priceFormat.precision);break;case"percent":this.ba=new ut(this.cn.priceFormat.precision);break;default:{const t=Math.pow(10,this.cn.priceFormat.precision);this.ba=new _t(t,this.cn.priceFormat.minMove*t)}}null!==this.Yi&&this.Yi.Pa()}Jl(){const t=this.$t().St();if(!t.Ra()||this.Et.Ni())return void(this.Fl=[]);const i=f(this.Et.sl());this.Fl=this.Nl.map(((n,s)=>{const e=f(t.Da(n.time,!0)),r=e<i?1:-1;return{time:f(this.Et.hl(e,r)).se,position:n.position,shape:n.shape,color:n.color,id:n.id,Qr:s,text:n.text,size:n.size,originalTime:n.originalTime}}))}Ul(t){switch(this.dn=new Mi(this,this.$t()),this.Hl){case"Bar":this.wn=new Nt(this,this.$t());break;case"Candlestick":this.wn=new $t(this,this.$t());break;case"Line":this.wn=new Kt(this,this.$t());break;case"Custom":this.wn=new qt(this,this.$t(),d(t));break;case"Area":this.wn=new Et(this,this.$t());break;case"Baseline":this.wn=new jt(this,this.$t());break;case"Histogram":this.wn=new Xt(this,this.$t());break;default:throw Error("Unknown chart style assigned: "+this.Hl)}}ua(t,i){const n=[];return Hi(this.jl,t,i,n),n}}class Zi{constructor(t){this.cn=t}Oa(t,i,n){let s=t;if(0===this.cn.mode)return s;const e=n.vn(),r=e.Ct();if(null===r)return s;const h=e.Rt(t,r),l=n.Va().filter((t=>t instanceof Yi)).reduce(((t,s)=>{if(n.dr(s)||!s.yt())return t;const e=s.Dt(),r=s.zn();if(e.Ni()||!r.Xr(i))return t;const h=r.Kh(i);if(null===h)return t;const l=v(s.Ct());return t.concat([e.Rt(h.Ot[3],l.Ot)])}),[]);if(0===l.length)return s;l.sort(((t,i)=>Math.abs(t-h)-Math.abs(i-h)));const a=l[0];return s=e.pn(a,r),s}}class Xi extends N{constructor(){super(...arguments),this.Et=null}J(t){this.Et=t}K({context:t,bitmapSize:i,horizontalPixelRatio:n,verticalPixelRatio:s}){if(null===this.Et)return;const e=Math.max(1,Math.floor(n));t.lineWidth=e,function(t,i){t.save(),t.lineWidth%2&&t.translate(.5,.5),i(),t.restore()}(t,(()=>{const r=f(this.Et);if(r.Ba){t.strokeStyle=r.Aa,_(t,r.za),t.beginPath();for(const s of r.Ea){const r=Math.round(s.Ia*n);t.moveTo(r,-e),t.lineTo(r,i.height+e)}t.stroke()}if(r.La){t.strokeStyle=r.Na,_(t,r.Fa),t.beginPath();for(const n of r.Wa){const r=Math.round(n.Ia*s);t.moveTo(-e,r),t.lineTo(i.width+e,r)}t.stroke()}}))}}class Ki{constructor(t){this.Wt=new Xi,this.ft=!0,this.tn=t}bt(){this.ft=!0}gt(){if(this.ft){const t=this.tn.$t().W().grid,i={La:t.horzLines.visible,Ba:t.vertLines.visible,Na:t.horzLines.color,Aa:t.vertLines.color,Fa:t.horzLines.style,za:t.vertLines.style,Wa:this.tn.vn().ja(),Ea:(this.tn.$t().St().ja()||[]).map((t=>({Ia:t.coord})))};this.Wt.J(i),this.ft=!1}return this.Wt}}class Gi{constructor(t){this.wn=new Ki(t)}Uh(){return this.wn}}const Ji={Ha:4,$a:1e-4};function Qi(t,i){const n=100*(t-i)/i;return i<0?-n:n}function tn(t,i){const n=Qi(t.Th(),i),s=Qi(t.Ph(),i);return new yi(n,s)}function nn(t,i){const n=100*(t-i)/i+100;return i<0?-n:n}function sn(t,i){const n=nn(t.Th(),i),s=nn(t.Ph(),i);return new yi(n,s)}function en(t,i){const n=Math.abs(t);if(n<1e-15)return 0;const s=Math.log10(n+i.$a)+i.Ha;return t<0?-s:s}function rn(t,i){const n=Math.abs(t);if(n<1e-15)return 0;const s=Math.pow(10,n-i.Ha)-i.$a;return t<0?-s:s}function hn(t,i){if(null===t)return null;const n=en(t.Th(),i),s=en(t.Ph(),i);return new yi(n,s)}function ln(t,i){if(null===t)return null;const n=rn(t.Th(),i),s=rn(t.Ph(),i);return new yi(n,s)}function an(t){if(null===t)return Ji;const i=Math.abs(t.Ph()-t.Th());if(i>=1||i<1e-15)return Ji;const n=Math.ceil(Math.abs(Math.log10(i))),s=Ji.Ha+n;return{Ha:s,$a:1/Math.pow(10,s)}}class on{constructor(t,i){if(this.Ua=t,this.qa=i,function(t){if(t<0)return!1;for(let i=t;i>1;i/=10)if(i%10!=0)return!1;return!0}(this.Ua))this.Ya=[2,2.5,2];else{this.Ya=[];for(let t=this.Ua;1!==t;){if(t%2==0)this.Ya.push(2),t/=2;else{if(t%5!=0)throw new Error("unexpected base");this.Ya.push(2,2.5),t/=5}if(this.Ya.length>100)throw new Error("something wrong with base")}}}Za(t,i,n){const s=0===this.Ua?0:1/this.Ua;let e=Math.pow(10,Math.max(0,Math.ceil(Math.log10(t-i)))),r=0,h=this.qa[0];for(;;){const t=Mt(e,s,1e-14)&&e>s+1e-14,i=Mt(e,n*h,1e-14),l=Mt(e,1,1e-14);if(!(t&&i&&l))break;e/=h,h=this.qa[++r%this.qa.length]}if(e<=s+1e-14&&(e=s),e=Math.max(1,e),this.Ya.length>0&&(l=e,a=1,o=1e-14,Math.abs(l-a)<o))for(r=0,h=this.Ya[0];Mt(e,n*h,1e-14)&&e>s+1e-14;)e/=h,h=this.Ya[++r%this.Ya.length];var l,a,o;return e}}class _n{constructor(t,i,n,s){this.Xa=[],this.Ii=t,this.Ua=i,this.Ka=n,this.Ga=s}Za(t,i){if(t<i)throw new Error("high < low");const n=this.Ii.At(),s=(t-i)*this.Ja()/n,e=new on(this.Ua,[2,2.5,2]),r=new on(this.Ua,[2,2,2.5]),h=new on(this.Ua,[2.5,2,2]),l=[];return l.push(e.Za(t,i,s),r.Za(t,i,s),h.Za(t,i,s)),function(t){if(t.length<1)throw Error("array is empty");let i=t[0];for(let n=1;n<t.length;++n)t[n]<i&&(i=t[n]);return i}(l)}Qa(){const t=this.Ii,i=t.Ct();if(null===i)return void(this.Xa=[]);const n=t.At(),s=this.Ka(n-1,i),e=this.Ka(0,i),r=this.Ii.W().entireTextOnly?this.io()/2:0,h=r,l=n-1-r,a=Math.max(s,e),o=Math.min(s,e);if(a===o)return void(this.Xa=[]);let _=this.Za(a,o),u=a%_;u+=u<0?_:0;const c=a>=o?1:-1;let d=null,f=0;for(let n=a-u;n>o;n-=_){const s=this.Ga(n,i,!0);null!==d&&Math.abs(s-d)<this.Ja()||(s<h||s>l||(f<this.Xa.length?(this.Xa[f].Ia=s,this.Xa[f].no=t.so(n)):this.Xa.push({Ia:s,no:t.so(n)}),f++,d=s,t.eo()&&(_=this.Za(n*c,o))))}this.Xa.length=f}ja(){return this.Xa}io(){return this.Ii.P()}Ja(){return Math.ceil(2.5*this.io())}}function un(t){return t.slice().sort(((t,i)=>f(t.Xi())-f(i.Xi())))}var cn;!function(t){t[t.Normal=0]="Normal",t[t.Logarithmic=1]="Logarithmic",t[t.Percentage=2]="Percentage",t[t.IndexedTo100=3]="IndexedTo100"}(cn||(cn={}));const dn=new ut,fn=new _t(100,1);class vn{constructor(t,i,n,s){this.ro=0,this.ho=null,this.Ah=null,this.lo=null,this.ao={oo:!1,_o:null},this.uo=0,this.co=0,this.do=new C,this.fo=new C,this.vo=[],this.po=null,this.mo=null,this.bo=null,this.wo=null,this.ba=fn,this.Mo=an(null),this.xo=t,this.cn=i,this.So=n,this.ko=s,this.yo=new _n(this,100,this.Co.bind(this),this.To.bind(this))}Ta(){return this.xo}W(){return this.cn}Hh(t){if(T(this.cn,t),this.Pa(),void 0!==t.mode&&this.Po({yr:t.mode}),void 0!==t.scaleMargins){const i=d(t.scaleMargins.top),n=d(t.scaleMargins.bottom);if(i<0||i>1)throw new Error(`Invalid top margin - expect value between 0 and 1, given=${i}`);if(n<0||n>1)throw new Error(`Invalid bottom margin - expect value between 0 and 1, given=${n}`);if(i+n>1)throw new Error(`Invalid margins - sum of margins must be less than 1, given=${i+n}`);this.Ro(),this.mo=null}}Do(){return this.cn.autoScale}eo(){return 1===this.cn.mode}gh(){return 2===this.cn.mode}Oo(){return 3===this.cn.mode}yr(){return{Wn:this.cn.autoScale,Vo:this.cn.invertScale,yr:this.cn.mode}}Po(t){const i=this.yr();let n=null;void 0!==t.Wn&&(this.cn.autoScale=t.Wn),void 0!==t.yr&&(this.cn.mode=t.yr,2!==t.yr&&3!==t.yr||(this.cn.autoScale=!0),this.ao.oo=!1),1===i.yr&&t.yr!==i.yr&&(!function(t,i){if(null===t)return!1;const n=rn(t.Th(),i),s=rn(t.Ph(),i);return isFinite(n)&&isFinite(s)}(this.Ah,this.Mo)?this.cn.autoScale=!0:(n=ln(this.Ah,this.Mo),null!==n&&this.Bo(n))),1===t.yr&&t.yr!==i.yr&&(n=hn(this.Ah,this.Mo),null!==n&&this.Bo(n));const s=i.yr!==this.cn.mode;s&&(2===i.yr||this.gh())&&this.Pa(),s&&(3===i.yr||this.Oo())&&this.Pa(),void 0!==t.Vo&&i.Vo!==t.Vo&&(this.cn.invertScale=t.Vo,this.Ao()),this.fo.m(i,this.yr())}zo(){return this.fo}P(){return this.So.fontSize}At(){return this.ro}Eo(t){this.ro!==t&&(this.ro=t,this.Ro(),this.mo=null)}Io(){if(this.ho)return this.ho;const t=this.At()-this.Lo()-this.No();return this.ho=t,t}Eh(){return this.Fo(),this.Ah}Bo(t,i){const n=this.Ah;(i||null===n&&null!==t||null!==n&&!n.yh(t))&&(this.mo=null,this.Ah=t)}Ni(){return this.Fo(),0===this.ro||!this.Ah||this.Ah.Ni()}Wo(t){return this.Vo()?t:this.At()-1-t}Rt(t,i){return this.gh()?t=Qi(t,i):this.Oo()&&(t=nn(t,i)),this.To(t,i)}Qs(t,i,n){this.Fo();const s=this.No(),e=f(this.Eh()),r=e.Th(),h=e.Ph(),l=this.Io()-1,a=this.Vo(),o=l/(h-r),_=void 0===n?0:n.from,u=void 0===n?t.length:n.to,c=this.jo();for(let n=_;n<u;n++){const e=t[n],h=e._t;if(isNaN(h))continue;let l=h;null!==c&&(l=c(e._t,i));const _=s+o*(l-r),u=a?_:this.ro-1-_;e.st=u}}me(t,i,n){this.Fo();const s=this.No(),e=f(this.Eh()),r=e.Th(),h=e.Ph(),l=this.Io()-1,a=this.Vo(),o=l/(h-r),_=void 0===n?0:n.from,u=void 0===n?t.length:n.to,c=this.jo();for(let n=_;n<u;n++){const e=t[n];let h=e.we,l=e.ge,_=e.Me,u=e.xe;null!==c&&(h=c(e.we,i),l=c(e.ge,i),_=c(e.Me,i),u=c(e.xe,i));let d=s+o*(h-r),f=a?d:this.ro-1-d;e.ve=f,d=s+o*(l-r),f=a?d:this.ro-1-d,e.ce=f,d=s+o*(_-r),f=a?d:this.ro-1-d,e.de=f,d=s+o*(u-r),f=a?d:this.ro-1-d,e.pe=f}}pn(t,i){const n=this.Co(t,i);return this.Ho(n,i)}Ho(t,i){let n=t;return this.gh()?n=function(t,i){return i<0&&(t=-t),t/100*i+i}(n,i):this.Oo()&&(n=function(t,i){return t-=100,i<0&&(t=-t),t/100*i+i}(n,i)),n}Va(){return this.vo}$o(){if(this.po)return this.po;let t=[];for(let i=0;i<this.vo.length;i++){const n=this.vo[i];null===n.Xi()&&n.Ki(i+1),t.push(n)}return t=un(t),this.po=t,this.po}Uo(t){-1===this.vo.indexOf(t)&&(this.vo.push(t),this.Pa(),this.qo())}Yo(t){const i=this.vo.indexOf(t);if(-1===i)throw new Error("source is not attached to scale");this.vo.splice(i,1),0===this.vo.length&&(this.Po({Wn:!0}),this.Bo(null)),this.Pa(),this.qo()}Ct(){let t=null;for(const i of this.vo){const n=i.Ct();null!==n&&((null===t||n.ha<t.ha)&&(t=n))}return null===t?null:t.Ot}Vo(){return this.cn.invertScale}ja(){const t=null===this.Ct();if(null!==this.mo&&(t||this.mo.Zo===t))return this.mo.ja;this.yo.Qa();const i=this.yo.ja();return this.mo={ja:i,Zo:t},this.do.m(),i}Xo(){return this.do}Ko(t){this.gh()||this.Oo()||null===this.bo&&null===this.lo&&(this.Ni()||(this.bo=this.ro-t,this.lo=f(this.Eh()).Ch()))}Go(t){if(this.gh()||this.Oo())return;if(null===this.bo)return;this.Po({Wn:!1}),(t=this.ro-t)<0&&(t=0);let i=(this.bo+.2*(this.ro-1))/(t+.2*(this.ro-1));const n=f(this.lo).Ch();i=Math.max(i,.1),n.Dh(i),this.Bo(n)}Jo(){this.gh()||this.Oo()||(this.bo=null,this.lo=null)}Qo(t){this.Do()||null===this.wo&&null===this.lo&&(this.Ni()||(this.wo=t,this.lo=f(this.Eh()).Ch()))}t_(t){if(this.Do())return;if(null===this.wo)return;const i=f(this.Eh()).Rh()/(this.Io()-1);let n=t-this.wo;this.Vo()&&(n*=-1);const s=n*i,e=f(this.lo).Ch();e.Oh(s),this.Bo(e,!0),this.mo=null}i_(){this.Do()||null!==this.wo&&(this.wo=null,this.lo=null)}ma(){return this.ba||this.Pa(),this.ba}Fi(t,i){switch(this.cn.mode){case 2:return this.n_(Qi(t,i));case 3:return this.ma().format(nn(t,i));default:return this.Fh(t)}}so(t){switch(this.cn.mode){case 2:return this.n_(t);case 3:return this.ma().format(t);default:return this.Fh(t)}}ql(t){return this.Fh(t,f(this.s_()).ma())}Yl(t,i){return t=Qi(t,i),this.n_(t,dn)}e_(){return this.vo}r_(t){this.ao={_o:t,oo:!1}}On(){this.vo.forEach((t=>t.On()))}Pa(){this.mo=null;const t=this.s_();let i=100;null!==t&&(i=Math.round(1/t.pa())),this.ba=fn,this.gh()?(this.ba=dn,i=100):this.Oo()?(this.ba=new _t(100,1),i=100):null!==t&&(this.ba=t.ma()),this.yo=new _n(this,i,this.Co.bind(this),this.To.bind(this)),this.yo.Qa()}qo(){this.po=null}s_(){return this.vo[0]||null}Lo(){return this.Vo()?this.cn.scaleMargins.bottom*this.At()+this.co:this.cn.scaleMargins.top*this.At()+this.uo}No(){return this.Vo()?this.cn.scaleMargins.top*this.At()+this.uo:this.cn.scaleMargins.bottom*this.At()+this.co}Fo(){this.ao.oo||(this.ao.oo=!0,this.h_())}Ro(){this.ho=null}To(t,i){if(this.Fo(),this.Ni())return 0;t=this.eo()&&t?en(t,this.Mo):t;const n=f(this.Eh()),s=this.No()+(this.Io()-1)*(t-n.Th())/n.Rh();return this.Wo(s)}Co(t,i){if(this.Fo(),this.Ni())return 0;const n=this.Wo(t),s=f(this.Eh()),e=s.Th()+s.Rh()*((n-this.No())/(this.Io()-1));return this.eo()?rn(e,this.Mo):e}Ao(){this.mo=null,this.yo.Qa()}h_(){const t=this.ao._o;if(null===t)return;let i=null;const n=this.e_();let s=0,e=0;for(const r of n){if(!r.yt())continue;const n=r.Ct();if(null===n)continue;const h=r.Al(t.Os(),t.ui());let l=h&&h.Eh();if(null!==l){switch(this.cn.mode){case 1:l=hn(l,this.Mo);break;case 2:l=tn(l,n.Ot);break;case 3:l=sn(l,n.Ot)}if(i=null===i?l:i.ts(f(l)),null!==h){const t=h.Ih();null!==t&&(s=Math.max(s,t.above),e=Math.max(e,t.below))}}}if(s===this.uo&&e===this.co||(this.uo=s,this.co=e,this.mo=null,this.Ro()),null!==i){if(i.Th()===i.Ph()){const t=this.s_(),n=5*(null===t||this.gh()||this.Oo()?1:t.pa());this.eo()&&(i=ln(i,this.Mo)),i=new yi(i.Th()-n,i.Ph()+n),this.eo()&&(i=hn(i,this.Mo))}if(this.eo()){const t=ln(i,this.Mo),n=an(t);if(r=n,h=this.Mo,r.Ha!==h.Ha||r.$a!==h.$a){const s=null!==this.lo?ln(this.lo,this.Mo):null;this.Mo=n,i=hn(t,n),null!==s&&(this.lo=hn(s,n))}}this.Bo(i)}else null===this.Ah&&(this.Bo(new yi(-.5,.5)),this.Mo=an(null));var r,h;this.ao.oo=!0}jo(){return this.gh()?Qi:this.Oo()?nn:this.eo()?t=>en(t,this.Mo):null}l_(t,i,n){return void 0===i?(void 0===n&&(n=this.ma()),n.format(t)):i(t)}Fh(t,i){return this.l_(t,this.ko.priceFormatter,i)}n_(t,i){return this.l_(t,this.ko.percentageFormatter,i)}}class pn{constructor(t,i){this.vo=[],this.a_=new Map,this.ro=0,this.o_=0,this.__=1e3,this.po=null,this.u_=new C,this.kl=t,this.$i=i,this.c_=new Gi(this);const n=i.W();this.d_=this.f_("left",n.leftPriceScale),this.v_=this.f_("right",n.rightPriceScale),this.d_.zo().l(this.p_.bind(this,this.d_),this),this.v_.zo().l(this.p_.bind(this,this.v_),this),this.m_(n)}m_(t){if(t.leftPriceScale&&this.d_.Hh(t.leftPriceScale),t.rightPriceScale&&this.v_.Hh(t.rightPriceScale),t.localization&&(this.d_.Pa(),this.v_.Pa()),t.overlayPriceScales){const i=Array.from(this.a_.values());for(const n of i){const i=f(n[0].Dt());i.Hh(t.overlayPriceScales),t.localization&&i.Pa()}}}b_(t){switch(t){case"left":return this.d_;case"right":return this.v_}return this.a_.has(t)?d(this.a_.get(t))[0].Dt():null}S(){this.$t().w_().p(this),this.d_.zo().p(this),this.v_.zo().p(this),this.vo.forEach((t=>{t.S&&t.S()})),this.u_.m()}g_(){return this.__}M_(t){this.__=t}$t(){return this.$i}Hi(){return this.o_}At(){return this.ro}x_(t){this.o_=t,this.S_()}Eo(t){this.ro=t,this.d_.Eo(t),this.v_.Eo(t),this.vo.forEach((i=>{if(this.dr(i)){const n=i.Dt();null!==n&&n.Eo(t)}})),this.S_()}Va(){return this.vo}dr(t){const i=t.Dt();return null===i||this.d_!==i&&this.v_!==i}Uo(t,i,n){const s=void 0!==n?n:this.y_().k_+1;this.C_(t,i,s)}Yo(t){const i=this.vo.indexOf(t);c(-1!==i,"removeDataSource: invalid data source"),this.vo.splice(i,1);const n=f(t.Dt()).Ta();if(this.a_.has(n)){const i=d(this.a_.get(n)),s=i.indexOf(t);-1!==s&&(i.splice(s,1),0===i.length&&this.a_.delete(n))}const s=t.Dt();s&&s.Va().indexOf(t)>=0&&s.Yo(t),null!==s&&(s.qo(),this.T_(s)),this.po=null}pr(t){return t===this.d_?"left":t===this.v_?"right":"overlay"}P_(){return this.d_}R_(){return this.v_}D_(t,i){t.Ko(i)}O_(t,i){t.Go(i),this.S_()}V_(t){t.Jo()}B_(t,i){t.Qo(i)}A_(t,i){t.t_(i),this.S_()}z_(t){t.i_()}S_(){this.vo.forEach((t=>{t.On()}))}vn(){let t=null;return this.$i.W().rightPriceScale.visible&&0!==this.v_.Va().length?t=this.v_:this.$i.W().leftPriceScale.visible&&0!==this.d_.Va().length?t=this.d_:0!==this.vo.length&&(t=this.vo[0].Dt()),null===t&&(t=this.v_),t}vr(){let t=null;return this.$i.W().rightPriceScale.visible?t=this.v_:this.$i.W().leftPriceScale.visible&&(t=this.d_),t}T_(t){null!==t&&t.Do()&&this.E_(t)}I_(t){const i=this.kl.Zs();t.Po({Wn:!0}),null!==i&&t.r_(i),this.S_()}L_(){this.E_(this.d_),this.E_(this.v_)}N_(){this.T_(this.d_),this.T_(this.v_),this.vo.forEach((t=>{this.dr(t)&&this.T_(t.Dt())})),this.S_(),this.$i.$h()}$o(){return null===this.po&&(this.po=un(this.vo)),this.po}F_(){return this.u_}W_(){return this.c_}E_(t){const i=t.e_();if(i&&i.length>0&&!this.kl.Ni()){const i=this.kl.Zs();null!==i&&t.r_(i)}t.On()}y_(){const t=this.$o();if(0===t.length)return{j_:0,k_:0};let i=0,n=0;for(let s=0;s<t.length;s++){const e=t[s].Xi();null!==e&&(e<i&&(i=e),e>n&&(n=e))}return{j_:i,k_:n}}C_(t,i,n){let s=this.b_(i);if(null===s&&(s=this.f_(i,this.$i.W().overlayPriceScales)),this.vo.push(t),!ht(i)){const n=this.a_.get(i)||[];n.push(t),this.a_.set(i,n)}s.Uo(t),t.Gi(s),t.Ki(n),this.T_(s),this.po=null}p_(t,i,n){i.yr!==n.yr&&this.E_(t)}f_(t,i){const n=Object.assign({visible:!0,autoScale:!0},V(i)),s=new vn(t,n,this.$i.W().layout,this.$i.W().localization);return s.Eo(this.At()),s}}class mn{constructor(t,i,n=50){this.Xe=0,this.Ke=1,this.Ge=1,this.Qe=new Map,this.Je=new Map,this.H_=t,this.U_=i,this.tr=n}q_(t){const i=t.time,n=this.U_.cacheKey(i),s=this.Qe.get(n);if(void 0!==s)return s.Y_;if(this.Xe===this.tr){const t=this.Je.get(this.Ge);this.Je.delete(this.Ge),this.Qe.delete(d(t)),this.Ge++,this.Xe--}const e=this.H_(t);return this.Qe.set(n,{Y_:e,er:this.Ke}),this.Je.set(this.Ke,n),this.Xe++,this.Ke++,e}}class bn{constructor(t,i){c(t<=i,"right should be >= left"),this.Z_=t,this.X_=i}Os(){return this.Z_}ui(){return this.X_}K_(){return this.X_-this.Z_+1}Xr(t){return this.Z_<=t&&t<=this.X_}yh(t){return this.Z_===t.Os()&&this.X_===t.ui()}}function wn(t,i){return null===t||null===i?t===i:t.yh(i)}class gn{constructor(){this.G_=new Map,this.Qe=null,this.J_=!1}Q_(t){this.J_=t,this.Qe=null}tu(t,i){this.iu(i),this.Qe=null;for(let n=i;n<t.length;++n){const i=t[n];let s=this.G_.get(i.timeWeight);void 0===s&&(s=[],this.G_.set(i.timeWeight,s)),s.push({index:n,time:i.time,weight:i.timeWeight,originalTime:i.originalTime})}}nu(t,i){const n=Math.ceil(i/t);return null!==this.Qe&&this.Qe.su===n||(this.Qe={ja:this.eu(n),su:n}),this.Qe.ja}iu(t){if(0===t)return void this.G_.clear();const i=[];this.G_.forEach(((n,s)=>{t<=n[0].index?i.push(s):n.splice(Rt(n,t,(i=>i.index<t)),1/0)}));for(const t of i)this.G_.delete(t)}eu(t){let i=[];for(const n of Array.from(this.G_.keys()).sort(((t,i)=>i-t))){if(!this.G_.get(n))continue;const s=i;i=[];const e=s.length;let r=0;const h=d(this.G_.get(n)),l=h.length;let a=1/0,o=-1/0;for(let n=0;n<l;n++){const l=h[n],_=l.index;for(;r<e;){const t=s[r],n=t.index;if(!(n<_)){a=n;break}r++,i.push(t),o=n,a=1/0}if(a-_>=t&&_-o>=t)i.push(l),o=_;else if(this.J_)return s}for(;r<e;r++)i.push(s[r])}return i}}class Mn{constructor(t){this.ru=t}hu(){return null===this.ru?null:new bn(Math.floor(this.ru.Os()),Math.ceil(this.ru.ui()))}lu(){return this.ru}static au(){return new Mn(null)}}function xn(t,i){return t.weight>i.weight?t:i}class Sn{constructor(t,i,n,s){this.o_=0,this.ou=null,this._u=[],this.wo=null,this.bo=null,this.uu=new gn,this.cu=new Map,this.du=Mn.au(),this.fu=!0,this.vu=new C,this.pu=new C,this.mu=new C,this.bu=null,this.wu=null,this.gu=[],this.cn=i,this.ko=n,this.Mu=i.rightOffset,this.xu=i.barSpacing,this.$i=t,this.U_=s,this.Su(),this.uu.Q_(i.uniformDistribution)}W(){return this.cn}ku(t){T(this.ko,t),this.yu(),this.Su()}Hh(t,i){var n;T(this.cn,t),this.cn.fixLeftEdge&&this.Cu(),this.cn.fixRightEdge&&this.Tu(),void 0!==t.barSpacing&&this.$i.Gn(t.barSpacing),void 0!==t.rightOffset&&this.$i.Jn(t.rightOffset),void 0!==t.minBarSpacing&&this.$i.Gn(null!==(n=t.barSpacing)&&void 0!==n?n:this.xu),this.yu(),this.Su(),this.mu.m()}mn(t){var i,n;return null!==(n=null===(i=this._u[t])||void 0===i?void 0:i.time)&&void 0!==n?n:null}Ui(t){var i;return null!==(i=this._u[t])&&void 0!==i?i:null}Da(t,i){if(this._u.length<1)return null;if(this.U_.key(t)>this.U_.key(this._u[this._u.length-1].time))return i?this._u.length-1:null;const n=Rt(this._u,this.U_.key(t),((t,i)=>this.U_.key(t.time)<i));return this.U_.key(t)<this.U_.key(this._u[n].time)?i?n:null:n}Ni(){return 0===this.o_||0===this._u.length||null===this.ou}Ra(){return this._u.length>0}Zs(){return this.Pu(),this.du.hu()}Ru(){return this.Pu(),this.du.lu()}Du(){const t=this.Zs();if(null===t)return null;const i={from:t.Os(),to:t.ui()};return this.Ou(i)}Ou(t){const i=Math.round(t.from),n=Math.round(t.to),s=f(this.Vu()),e=f(this.Bu());return{from:f(this.Ui(Math.max(s,i))),to:f(this.Ui(Math.min(e,n)))}}Au(t){return{from:f(this.Da(t.from,!0)),to:f(this.Da(t.to,!0))}}Hi(){return this.o_}x_(t){if(!isFinite(t)||t<=0)return;if(this.o_===t)return;const i=this.Ru(),n=this.o_;if(this.o_=t,this.fu=!0,this.cn.lockVisibleTimeRangeOnResize&&0!==n){const i=this.xu*t/n;this.xu=i}if(this.cn.fixLeftEdge&&null!==i&&i.Os()<=0){const i=n-t;this.Mu-=Math.round(i/this.xu)+1,this.fu=!0}this.zu(),this.Eu()}zt(t){if(this.Ni()||!R(t))return 0;const i=this.Iu()+this.Mu-t;return this.o_-(i+.5)*this.xu-1}Js(t,i){const n=this.Iu(),s=void 0===i?0:i.from,e=void 0===i?t.length:i.to;for(let i=s;i<e;i++){const s=t[i].ot,e=n+this.Mu-s,r=this.o_-(e+.5)*this.xu-1;t[i].nt=r}}Lu(t){return Math.ceil(this.Nu(t))}Jn(t){this.fu=!0,this.Mu=t,this.Eu(),this.$i.Fu(),this.$i.$h()}he(){return this.xu}Gn(t){this.Wu(t),this.Eu(),this.$i.Fu(),this.$i.$h()}ju(){return this.Mu}ja(){if(this.Ni())return null;if(null!==this.wu)return this.wu;const t=this.xu,i=5*(this.$i.W().layout.fontSize+4)/8*(this.cn.tickMarkMaxCharacterLength||8),n=Math.round(i/t),s=f(this.Zs()),e=Math.max(s.Os(),s.Os()-n),r=Math.max(s.ui(),s.ui()-n),h=this.uu.nu(t,i),l=this.Vu()+n,a=this.Bu()-n,o=this.Hu(),_=this.cn.fixLeftEdge||o,u=this.cn.fixRightEdge||o;let c=0;for(const t of h){if(!(e<=t.index&&t.index<=r))continue;let n;c<this.gu.length?(n=this.gu[c],n.coord=this.zt(t.index),n.label=this.$u(t),n.weight=t.weight):(n={needAlignCoordinate:!1,coord:this.zt(t.index),label:this.$u(t),weight:t.weight},this.gu.push(n)),this.xu>i/2&&!o?n.needAlignCoordinate=!1:n.needAlignCoordinate=_&&t.index<=l||u&&t.index>=a,c++}return this.gu.length=c,this.wu=this.gu,this.gu}Uu(){this.fu=!0,this.Gn(this.cn.barSpacing),this.Jn(this.cn.rightOffset)}qu(t){this.fu=!0,this.ou=t,this.Eu(),this.Cu()}Yu(t,i){const n=this.Nu(t),s=this.he(),e=s+i*(s/10);this.Gn(e),this.cn.rightBarStaysOnScroll||this.Jn(this.ju()+(n-this.Nu(t)))}Ko(t){this.wo&&this.i_(),null===this.bo&&null===this.bu&&(this.Ni()||(this.bo=t,this.Zu()))}Go(t){if(null===this.bu)return;const i=gt(this.o_-t,0,this.o_),n=gt(this.o_-f(this.bo),0,this.o_);0!==i&&0!==n&&this.Gn(this.bu.he*i/n)}Jo(){null!==this.bo&&(this.bo=null,this.Xu())}Qo(t){null===this.wo&&null===this.bu&&(this.Ni()||(this.wo=t,this.Zu()))}t_(t){if(null===this.wo)return;const i=(this.wo-t)/this.he();this.Mu=f(this.bu).ju+i,this.fu=!0,this.Eu()}i_(){null!==this.wo&&(this.wo=null,this.Xu())}Ku(){this.Gu(this.cn.rightOffset)}Gu(t,i=400){if(!isFinite(t))throw new RangeError("offset is required and must be finite number");if(!isFinite(i)||i<=0)throw new RangeError("animationDuration (optional) must be finite positive number");const n=this.Mu,s=performance.now();this.$i.Zn({Ju:t=>(t-s)/i>=1,Qu:e=>{const r=(e-s)/i;return r>=1?t:n+(t-n)*r}})}bt(t,i){this.fu=!0,this._u=t,this.uu.tu(t,i),this.Eu()}tc(){return this.vu}nc(){return this.pu}sc(){return this.mu}Iu(){return this.ou||0}ec(t){const i=t.K_();this.Wu(this.o_/i),this.Mu=t.ui()-this.Iu(),this.Eu(),this.fu=!0,this.$i.Fu(),this.$i.$h()}rc(){const t=this.Vu(),i=this.Bu();null!==t&&null!==i&&this.ec(new bn(t,i+this.cn.rightOffset))}hc(t){const i=new bn(t.from,t.to);this.ec(i)}qi(t){return void 0!==this.ko.timeFormatter?this.ko.timeFormatter(t.originalTime):this.U_.formatHorzItem(t.time)}Hu(){const{handleScroll:t,handleScale:i}=this.$i.W();return!(t.horzTouchDrag||t.mouseWheel||t.pressedMouseMove||t.vertTouchDrag||i.axisDoubleClickReset.time||i.axisPressedMouseMove.time||i.mouseWheel||i.pinch)}Vu(){return 0===this._u.length?null:0}Bu(){return 0===this._u.length?null:this._u.length-1}lc(t){return(this.o_-1-t)/this.xu}Nu(t){const i=this.lc(t),n=this.Iu()+this.Mu-i;return Math.round(1e6*n)/1e6}Wu(t){const i=this.xu;this.xu=t,this.zu(),i!==this.xu&&(this.fu=!0,this.ac())}Pu(){if(!this.fu)return;if(this.fu=!1,this.Ni())return void this.oc(Mn.au());const t=this.Iu(),i=this.o_/this.xu,n=this.Mu+t,s=new bn(n-i+1,n);this.oc(new Mn(s))}zu(){const t=this._c();if(this.xu<t&&(this.xu=t,this.fu=!0),0!==this.o_){const t=.5*this.o_;this.xu>t&&(this.xu=t,this.fu=!0)}}_c(){return this.cn.fixLeftEdge&&this.cn.fixRightEdge&&0!==this._u.length?this.o_/this._u.length:this.cn.minBarSpacing}Eu(){const t=this.uc();null!==t&&this.Mu<t&&(this.Mu=t,this.fu=!0);const i=this.cc();this.Mu>i&&(this.Mu=i,this.fu=!0)}uc(){const t=this.Vu(),i=this.ou;if(null===t||null===i)return null;return t-i-1+(this.cn.fixLeftEdge?this.o_/this.xu:Math.min(2,this._u.length))}cc(){return this.cn.fixRightEdge?0:this.o_/this.xu-Math.min(2,this._u.length)}Zu(){this.bu={he:this.he(),ju:this.ju()}}Xu(){this.bu=null}$u(t){let i=this.cu.get(t.weight);return void 0===i&&(i=new mn((t=>this.dc(t)),this.U_),this.cu.set(t.weight,i)),i.q_(t)}dc(t){return this.U_.formatTickmark(t,this.ko)}oc(t){const i=this.du;this.du=t,wn(i.hu(),this.du.hu())||this.vu.m(),wn(i.lu(),this.du.lu())||this.pu.m(),this.ac()}ac(){this.wu=null}yu(){this.ac(),this.cu.clear()}Su(){this.U_.updateFormatter(this.ko)}Cu(){if(!this.cn.fixLeftEdge)return;const t=this.Vu();if(null===t)return;const i=this.Zs();if(null===i)return;const n=i.Os()-t;if(n<0){const t=this.Mu-n-1;this.Jn(t)}this.zu()}Tu(){this.Eu(),this.zu()}}class kn{X(t,i,n){t.useMediaCoordinateSpace((t=>this.K(t,i,n)))}wl(t,i,n){t.useMediaCoordinateSpace((t=>this.fc(t,i,n)))}fc(t,i,n){}}class yn extends kn{constructor(t){super(),this.vc=new Map,this.Et=t}K(t){}fc(t){if(!this.Et.yt)return;const{context:i,mediaSize:n}=t;let s=0;for(const t of this.Et.mc){if(0===t.Kt.length)continue;i.font=t.R;const e=this.bc(i,t.Kt);e>n.width?t.Yu=n.width/e:t.Yu=1,s+=t.wc*t.Yu}let e=0;switch(this.Et.gc){case"top":e=0;break;case"center":e=Math.max((n.height-s)/2,0);break;case"bottom":e=Math.max(n.height-s,0)}i.fillStyle=this.Et.O;for(const t of this.Et.mc){i.save();let s=0;switch(this.Et.Mc){case"left":i.textAlign="left",s=t.wc/2;break;case"center":i.textAlign="center",s=n.width/2;break;case"right":i.textAlign="right",s=n.width-1-t.wc/2}i.translate(s,e),i.textBaseline="top",i.font=t.R,i.scale(t.Yu,t.Yu),i.fillText(t.Kt,0,t.xc),i.restore(),e+=t.wc*t.Yu}}bc(t,i){const n=this.Sc(t.font);let s=n.get(i);return void 0===s&&(s=t.measureText(i).width,n.set(i,s)),s}Sc(t){let i=this.vc.get(t);return void 0===i&&(i=new Map,this.vc.set(t,i)),i}}class Cn{constructor(t){this.ft=!0,this.Ft={yt:!1,O:"",mc:[],gc:"center",Mc:"center"},this.Wt=new yn(this.Ft),this.jt=t}bt(){this.ft=!0}gt(){return this.ft&&(this.Mt(),this.ft=!1),this.Wt}Mt(){const t=this.jt.W(),i=this.Ft;i.yt=t.visible,i.yt&&(i.O=t.color,i.Mc=t.horzAlign,i.gc=t.vertAlign,i.mc=[{Kt:t.text,R:E(t.fontSize,t.fontFamily,t.fontStyle),wc:1.2*t.fontSize,xc:0,Yu:0}])}}class Tn extends st{constructor(t,i){super(),this.cn=i,this.wn=new Cn(this)}Rn(){return[]}Pn(){return[this.wn]}W(){return this.cn}On(){this.wn.bt()}}var Pn,Rn,Dn,On,Vn;!function(t){t[t.OnTouchEnd=0]="OnTouchEnd",t[t.OnNextTap=1]="OnNextTap"}(Pn||(Pn={}));class Bn{constructor(t,i,n){this.kc=[],this.yc=[],this.o_=0,this.Cc=null,this.Tc=new C,this.Pc=new C,this.Rc=null,this.Dc=t,this.cn=i,this.U_=n,this.Oc=new I(this),this.kl=new Sn(this,i.timeScale,this.cn.localization,n),this.vt=new rt(this,i.crosshair),this.Vc=new Zi(i.crosshair),this.Bc=new Tn(this,i.watermark),this.Ac(),this.kc[0].M_(2e3),this.zc=this.Ec(0),this.Ic=this.Ec(1)}Xl(){this.Lc(lt.es())}$h(){this.Lc(lt.ss())}aa(){this.Lc(new lt(1))}Kl(t){const i=this.Nc(t);this.Lc(i)}Fc(){return this.Cc}Wc(t){const i=this.Cc;this.Cc=t,null!==i&&this.Kl(i.jc),null!==t&&this.Kl(t.jc)}W(){return this.cn}Hh(t){T(this.cn,t),this.kc.forEach((i=>i.m_(t))),void 0!==t.timeScale&&this.kl.Hh(t.timeScale),void 0!==t.localization&&this.kl.ku(t.localization),(t.leftPriceScale||t.rightPriceScale)&&this.Tc.m(),this.zc=this.Ec(0),this.Ic=this.Ec(1),this.Xl()}Hc(t,i){if("left"===t)return void this.Hh({leftPriceScale:i});if("right"===t)return void this.Hh({rightPriceScale:i});const n=this.$c(t);null!==n&&(n.Dt.Hh(i),this.Tc.m())}$c(t){for(const i of this.kc){const n=i.b_(t);if(null!==n)return{Ht:i,Dt:n}}return null}St(){return this.kl}Uc(){return this.kc}qc(){return this.Bc}Yc(){return this.vt}Zc(){return this.Pc}Xc(t,i){t.Eo(i),this.Fu()}x_(t){this.o_=t,this.kl.x_(this.o_),this.kc.forEach((i=>i.x_(t))),this.Fu()}Ac(t){const i=new pn(this.kl,this);void 0!==t?this.kc.splice(t,0,i):this.kc.push(i);const n=void 0===t?this.kc.length-1:t,s=lt.es();return s.Nn(n,{Fn:0,Wn:!0}),this.Lc(s),i}D_(t,i,n){t.D_(i,n)}O_(t,i,n){t.O_(i,n),this.Gl(),this.Lc(this.Kc(t,2))}V_(t,i){t.V_(i),this.Lc(this.Kc(t,2))}B_(t,i,n){i.Do()||t.B_(i,n)}A_(t,i,n){i.Do()||(t.A_(i,n),this.Gl(),this.Lc(this.Kc(t,2)))}z_(t,i){i.Do()||(t.z_(i),this.Lc(this.Kc(t,2)))}I_(t,i){t.I_(i),this.Lc(this.Kc(t,2))}Gc(t){this.kl.Ko(t)}Jc(t,i){const n=this.St();if(n.Ni()||0===i)return;const s=n.Hi();t=Math.max(1,Math.min(t,s)),n.Yu(t,i),this.Fu()}Qc(t){this.td(0),this.nd(t),this.sd()}ed(t){this.kl.Go(t),this.Fu()}rd(){this.kl.Jo(),this.$h()}td(t){this.kl.Qo(t)}nd(t){this.kl.t_(t),this.Fu()}sd(){this.kl.i_(),this.$h()}wt(){return this.yc}hd(t,i,n,s,e){this.vt.gn(t,i);let r=NaN,h=this.kl.Lu(t);const l=this.kl.Zs();null!==l&&(h=Math.min(Math.max(l.Os(),h),l.ui()));const a=s.vn(),o=a.Ct();null!==o&&(r=a.pn(i,o)),r=this.Vc.Oa(r,h,s),this.vt.kn(h,r,s),this.aa(),e||this.Pc.m(this.vt.xt(),{x:t,y:i},n)}ld(t,i,n){const s=n.vn(),e=s.Ct(),r=s.Rt(t,f(e)),h=this.kl.Da(i,!0),l=this.kl.zt(f(h));this.hd(l,r,null,n,!0)}ad(t){this.Yc().Cn(),this.aa(),t||this.Pc.m(null,null,null)}Gl(){const t=this.vt.Ht();if(null!==t){const i=this.vt.xn(),n=this.vt.Sn();this.hd(i,n,null,t)}this.vt.On()}od(t,i,n){const s=this.kl.mn(0);void 0!==i&&void 0!==n&&this.kl.bt(i,n);const e=this.kl.mn(0),r=this.kl.Iu(),h=this.kl.Zs();if(null!==h&&null!==s&&null!==e){const i=h.Xr(r),l=this.U_.key(s)>this.U_.key(e),a=null!==t&&t>r&&!l,o=this.kl.W().allowShiftVisibleRangeOnWhitespaceReplacement,_=i&&(!(void 0===n)||o)&&this.kl.W().shiftVisibleRangeOnNewBar;if(a&&!_){const i=t-r;this.kl.Jn(this.kl.ju()-i)}}this.kl.qu(t)}ta(t){null!==t&&t.N_()}cr(t){const i=this.kc.find((i=>i.$o().includes(t)));return void 0===i?null:i}Fu(){this.Bc.On(),this.kc.forEach((t=>t.N_())),this.Gl()}S(){this.kc.forEach((t=>t.S())),this.kc.length=0,this.cn.localization.priceFormatter=void 0,this.cn.localization.percentageFormatter=void 0,this.cn.localization.timeFormatter=void 0}_d(){return this.Oc}mr(){return this.Oc.W()}w_(){return this.Tc}ud(t,i,n){const s=this.kc[0],e=this.dd(i,t,s,n);return this.yc.push(e),1===this.yc.length?this.Xl():this.$h(),e}fd(t){const i=this.cr(t),n=this.yc.indexOf(t);c(-1!==n,"Series not found"),this.yc.splice(n,1),f(i).Yo(t),t.S&&t.S()}Zl(t,i){const n=f(this.cr(t));n.Yo(t);const s=this.$c(i);if(null===s){const s=t.Xi();n.Uo(t,i,s)}else{const e=s.Ht===n?t.Xi():void 0;s.Ht.Uo(t,i,e)}}rc(){const t=lt.ss();t.$n(),this.Lc(t)}vd(t){const i=lt.ss();i.Yn(t),this.Lc(i)}Kn(){const t=lt.ss();t.Kn(),this.Lc(t)}Gn(t){const i=lt.ss();i.Gn(t),this.Lc(i)}Jn(t){const i=lt.ss();i.Jn(t),this.Lc(i)}Zn(t){const i=lt.ss();i.Zn(t),this.Lc(i)}Un(){const t=lt.ss();t.Un(),this.Lc(t)}pd(){return this.cn.rightPriceScale.visible?"right":"left"}md(){return this.Ic}q(){return this.zc}Bt(t){const i=this.Ic,n=this.zc;if(i===n)return i;if(t=Math.max(0,Math.min(100,Math.round(100*t))),null===this.Rc||this.Rc.Ts!==n||this.Rc.Ps!==i)this.Rc={Ts:n,Ps:i,bd:new Map};else{const i=this.Rc.bd.get(t);if(void 0!==i)return i}const s=function(t,i,n){const[s,e,r,h]=S(t),[l,a,o,_]=S(i),u=[m(s+n*(l-s)),m(e+n*(a-e)),m(r+n*(o-r)),b(h+n*(_-h))];return`rgba(${u[0]}, ${u[1]}, ${u[2]}, ${u[3]})`}(n,i,t/100);return this.Rc.bd.set(t,s),s}Kc(t,i){const n=new lt(i);if(null!==t){const s=this.kc.indexOf(t);n.Nn(s,{Fn:i})}return n}Nc(t,i){return void 0===i&&(i=2),this.Kc(this.cr(t),i)}Lc(t){this.Dc&&this.Dc(t),this.kc.forEach((t=>t.W_().Uh().bt()))}dd(t,i,n,s){const e=new Yi(this,t,i,n,s),r=void 0!==t.priceScaleId?t.priceScaleId:this.pd();return n.Uo(e,r),ht(r)||e.Hh(t),e}Ec(t){const i=this.cn.layout;return"gradient"===i.background.type?0===t?i.background.topColor:i.background.bottomColor:i.background.color}}function An(t){return!P(t)&&!D(t)}function zn(t){return P(t)}!function(t){t[t.Disabled=0]="Disabled",t[t.Continuous=1]="Continuous",t[t.OnDataUpdate=2]="OnDataUpdate"}(Rn||(Rn={})),function(t){t[t.LastBar=0]="LastBar",t[t.LastVisible=1]="LastVisible"}(Dn||(Dn={})),function(t){t.Solid="solid",t.VerticalGradient="gradient"}(On||(On={})),function(t){t[t.Year=0]="Year",t[t.Month=1]="Month",t[t.DayOfMonth=2]="DayOfMonth",t[t.Time=3]="Time",t[t.TimeWithSeconds=4]="TimeWithSeconds"}(Vn||(Vn={}));const En=t=>t.getUTCFullYear();function In(t,i,n){return i.replace(/yyyy/g,(t=>ot(En(t),4))(t)).replace(/yy/g,(t=>ot(En(t)%100,2))(t)).replace(/MMMM/g,((t,i)=>new Date(t.getUTCFullYear(),t.getUTCMonth(),1).toLocaleString(i,{month:"long"}))(t,n)).replace(/MMM/g,((t,i)=>new Date(t.getUTCFullYear(),t.getUTCMonth(),1).toLocaleString(i,{month:"short"}))(t,n)).replace(/MM/g,(t=>ot((t=>t.getUTCMonth()+1)(t),2))(t)).replace(/dd/g,(t=>ot((t=>t.getUTCDate())(t),2))(t))}class Ln{constructor(t="yyyy-MM-dd",i="default"){this.wd=t,this.gd=i}q_(t){return In(t,this.wd,this.gd)}}class Nn{constructor(t){this.Md=t||"%h:%m:%s"}q_(t){return this.Md.replace("%h",ot(t.getUTCHours(),2)).replace("%m",ot(t.getUTCMinutes(),2)).replace("%s",ot(t.getUTCSeconds(),2))}}const Fn={xd:"yyyy-MM-dd",Sd:"%h:%m:%s",kd:" ",yd:"default"};class Wn{constructor(t={}){const i=Object.assign(Object.assign({},Fn),t);this.Cd=new Ln(i.xd,i.yd),this.Td=new Nn(i.Sd),this.Pd=i.kd}q_(t){return`${this.Cd.q_(t)}${this.Pd}${this.Td.q_(t)}`}}function jn(t){return 60*t*60*1e3}function Hn(t){return 60*t*1e3}const $n=[{Rd:(Un=1,1e3*Un),Dd:10},{Rd:Hn(1),Dd:20},{Rd:Hn(5),Dd:21},{Rd:Hn(30),Dd:22},{Rd:jn(1),Dd:30},{Rd:jn(3),Dd:31},{Rd:jn(6),Dd:32},{Rd:jn(12),Dd:33}];var Un;function qn(t,i){if(t.getUTCFullYear()!==i.getUTCFullYear())return 70;if(t.getUTCMonth()!==i.getUTCMonth())return 60;if(t.getUTCDate()!==i.getUTCDate())return 50;for(let n=$n.length-1;n>=0;--n)if(Math.floor(i.getTime()/$n[n].Rd)!==Math.floor(t.getTime()/$n[n].Rd))return $n[n].Dd;return 0}function Yn(t){let i=t;if(D(t)&&(i=Xn(t)),!An(i))throw new Error("time must be of type BusinessDay");const n=new Date(Date.UTC(i.year,i.month-1,i.day,0,0,0,0));return{Od:Math.round(n.getTime()/1e3),Vd:i}}function Zn(t){if(!zn(t))throw new Error("time must be of type isUTCTimestamp");return{Od:t}}function Xn(t){const i=new Date(t);if(isNaN(i.getTime()))throw new Error(`Invalid date string=${t}, expected format=yyyy-mm-dd`);return{day:i.getUTCDate(),month:i.getUTCMonth()+1,year:i.getUTCFullYear()}}function Kn(t){D(t.time)&&(t.time=Xn(t.time))}class Gn{options(){return this.cn}setOptions(t){this.cn=t,this.updateFormatter(t.localization)}preprocessData(t){Array.isArray(t)?function(t){t.forEach(Kn)}(t):Kn(t)}createConverterToInternalObj(t){return f(function(t){return 0===t.length?null:An(t[0].time)||D(t[0].time)?Yn:Zn}(t))}key(t){return"object"==typeof t&&"Od"in t?t.Od:this.key(this.convertHorzItemToInternal(t))}cacheKey(t){const i=t;return void 0===i.Vd?new Date(1e3*i.Od).getTime():new Date(Date.UTC(i.Vd.year,i.Vd.month-1,i.Vd.day)).getTime()}convertHorzItemToInternal(t){return zn(i=t)?Zn(i):An(i)?Yn(i):Yn(Xn(i));var i}updateFormatter(t){if(!this.cn)return;const i=t.dateFormat;this.cn.timeScale.timeVisible?this.Bd=new Wn({xd:i,Sd:this.cn.timeScale.secondsVisible?"%h:%m:%s":"%h:%m",kd:"   ",yd:t.locale}):this.Bd=new Ln(i,t.locale)}formatHorzItem(t){const i=t;return this.Bd.q_(new Date(1e3*i.Od))}formatTickmark(t,i){const n=function(t,i,n){switch(t){case 0:case 10:return i?n?4:3:2;case 20:case 21:case 22:case 30:case 31:case 32:case 33:return i?3:2;case 50:return 2;case 60:return 1;case 70:return 0}}(t.weight,this.cn.timeScale.timeVisible,this.cn.timeScale.secondsVisible),s=this.cn.timeScale;if(void 0!==s.tickMarkFormatter){const e=s.tickMarkFormatter(t.originalTime,n,i.locale);if(null!==e)return e}return function(t,i,n){const s={};switch(i){case 0:s.year="numeric";break;case 1:s.month="short";break;case 2:s.day="numeric";break;case 3:s.hour12=!1,s.hour="2-digit",s.minute="2-digit";break;case 4:s.hour12=!1,s.hour="2-digit",s.minute="2-digit",s.second="2-digit"}const e=void 0===t.Vd?new Date(1e3*t.Od):new Date(Date.UTC(t.Vd.year,t.Vd.month-1,t.Vd.day));return new Date(e.getUTCFullYear(),e.getUTCMonth(),e.getUTCDate(),e.getUTCHours(),e.getUTCMinutes(),e.getUTCSeconds(),e.getUTCMilliseconds()).toLocaleString(n,s)}(t.time,n,i.locale)}maxTickMarkWeight(t){let i=t.reduce(xn,t[0]).weight;return i>30&&i<50&&(i=30),i}fillWeightsForPoints(t,i){!function(t,i=0){if(0===t.length)return;let n=0===i?null:t[i-1].time.Od,s=null!==n?new Date(1e3*n):null,e=0;for(let r=i;r<t.length;++r){const i=t[r],h=new Date(1e3*i.time.Od);null!==s&&(i.timeWeight=qn(h,s)),e+=i.time.Od-(n||i.time.Od),n=i.time.Od,s=h}if(0===i&&t.length>1){const i=Math.ceil(e/(t.length-1)),n=new Date(1e3*(t[0].time.Od-i));t[0].timeWeight=qn(new Date(1e3*t[0].time.Od),n)}}(t,i)}static Ad(t){return T({localization:{dateFormat:"dd MMM 'yy"}},null!=t?t:{})}}function Jn(t){var i=t.width,n=t.height;if(i<0)throw new Error("Negative width is not allowed for Size");if(n<0)throw new Error("Negative height is not allowed for Size");return{width:i,height:n}}function Qn(t,i){return t.width===i.width&&t.height===i.height}var ts=function(){function t(t){var i=this;this._resolutionListener=function(){return i._onResolutionChanged()},this._resolutionMediaQueryList=null,this._observers=[],this._window=t,this._installResolutionListener()}return t.prototype.dispose=function(){this._uninstallResolutionListener(),this._window=null},Object.defineProperty(t.prototype,"value",{get:function(){return this._window.devicePixelRatio},enumerable:!1,configurable:!0}),t.prototype.subscribe=function(t){var i=this,n={next:t};return this._observers.push(n),{unsubscribe:function(){i._observers=i._observers.filter((function(t){return t!==n}))}}},t.prototype._installResolutionListener=function(){if(null!==this._resolutionMediaQueryList)throw new Error("Resolution listener is already installed");var t=this._window.devicePixelRatio;this._resolutionMediaQueryList=this._window.matchMedia("all and (resolution: ".concat(t,"dppx)")),this._resolutionMediaQueryList.addListener(this._resolutionListener)},t.prototype._uninstallResolutionListener=function(){null!==this._resolutionMediaQueryList&&(this._resolutionMediaQueryList.removeListener(this._resolutionListener),this._resolutionMediaQueryList=null)},t.prototype._reinstallResolutionListener=function(){this._uninstallResolutionListener(),this._installResolutionListener()},t.prototype._onResolutionChanged=function(){var t=this;this._observers.forEach((function(i){return i.next(t._window.devicePixelRatio)})),this._reinstallResolutionListener()},t}();var is=function(){function t(t,i,n){var s;this._canvasElement=null,this._bitmapSizeChangedListeners=[],this._suggestedBitmapSize=null,this._suggestedBitmapSizeChangedListeners=[],this._devicePixelRatioObservable=null,this._canvasElementResizeObserver=null,this._canvasElement=t,this._canvasElementClientSize=Jn({width:this._canvasElement.clientWidth,height:this._canvasElement.clientHeight}),this._transformBitmapSize=null!=i?i:function(t){return t},this._allowResizeObserver=null===(s=null==n?void 0:n.allowResizeObserver)||void 0===s||s,this._chooseAndInitObserver()}return t.prototype.dispose=function(){var t,i;if(null===this._canvasElement)throw new Error("Object is disposed");null===(t=this._canvasElementResizeObserver)||void 0===t||t.disconnect(),this._canvasElementResizeObserver=null,null===(i=this._devicePixelRatioObservable)||void 0===i||i.dispose(),this._devicePixelRatioObservable=null,this._suggestedBitmapSizeChangedListeners.length=0,this._bitmapSizeChangedListeners.length=0,this._canvasElement=null},Object.defineProperty(t.prototype,"canvasElement",{get:function(){if(null===this._canvasElement)throw new Error("Object is disposed");return this._canvasElement},enumerable:!1,configurable:!0}),Object.defineProperty(t.prototype,"canvasElementClientSize",{get:function(){return this._canvasElementClientSize},enumerable:!1,configurable:!0}),Object.defineProperty(t.prototype,"bitmapSize",{get:function(){return Jn({width:this.canvasElement.width,height:this.canvasElement.height})},enumerable:!1,configurable:!0}),t.prototype.resizeCanvasElement=function(t){this._canvasElementClientSize=Jn(t),this.canvasElement.style.width="".concat(this._canvasElementClientSize.width,"px"),this.canvasElement.style.height="".concat(this._canvasElementClientSize.height,"px"),this._invalidateBitmapSize()},t.prototype.subscribeBitmapSizeChanged=function(t){this._bitmapSizeChangedListeners.push(t)},t.prototype.unsubscribeBitmapSizeChanged=function(t){this._bitmapSizeChangedListeners=this._bitmapSizeChangedListeners.filter((function(i){return i!==t}))},Object.defineProperty(t.prototype,"suggestedBitmapSize",{get:function(){return this._suggestedBitmapSize},enumerable:!1,configurable:!0}),t.prototype.subscribeSuggestedBitmapSizeChanged=function(t){this._suggestedBitmapSizeChangedListeners.push(t)},t.prototype.unsubscribeSuggestedBitmapSizeChanged=function(t){this._suggestedBitmapSizeChangedListeners=this._suggestedBitmapSizeChangedListeners.filter((function(i){return i!==t}))},t.prototype.applySuggestedBitmapSize=function(){if(null!==this._suggestedBitmapSize){var t=this._suggestedBitmapSize;this._suggestedBitmapSize=null,this._resizeBitmap(t),this._emitSuggestedBitmapSizeChanged(t,this._suggestedBitmapSize)}},t.prototype._resizeBitmap=function(t){var i=this.bitmapSize;Qn(i,t)||(this.canvasElement.width=t.width,this.canvasElement.height=t.height,this._emitBitmapSizeChanged(i,t))},t.prototype._emitBitmapSizeChanged=function(t,i){var n=this;this._bitmapSizeChangedListeners.forEach((function(s){return s.call(n,t,i)}))},t.prototype._suggestNewBitmapSize=function(t){var i=this._suggestedBitmapSize,n=Jn(this._transformBitmapSize(t,this._canvasElementClientSize)),s=Qn(this.bitmapSize,n)?null:n;null===i&&null===s||null!==i&&null!==s&&Qn(i,s)||(this._suggestedBitmapSize=s,this._emitSuggestedBitmapSizeChanged(i,s))},t.prototype._emitSuggestedBitmapSizeChanged=function(t,i){var n=this;this._suggestedBitmapSizeChangedListeners.forEach((function(s){return s.call(n,t,i)}))},t.prototype._chooseAndInitObserver=function(){var t=this;this._allowResizeObserver?new Promise((function(t){var i=new ResizeObserver((function(n){t(n.every((function(t){return"devicePixelContentBoxSize"in t}))),i.disconnect()}));i.observe(document.body,{box:"device-pixel-content-box"})})).catch((function(){return!1})).then((function(i){return i?t._initResizeObserver():t._initDevicePixelRatioObservable()})):this._initDevicePixelRatioObservable()},t.prototype._initDevicePixelRatioObservable=function(){var t=this;if(null!==this._canvasElement){var i=ns(this._canvasElement);if(null===i)throw new Error("No window is associated with the canvas");this._devicePixelRatioObservable=function(t){return new ts(t)}(i),this._devicePixelRatioObservable.subscribe((function(){return t._invalidateBitmapSize()})),this._invalidateBitmapSize()}},t.prototype._invalidateBitmapSize=function(){var t,i;if(null!==this._canvasElement){var n=ns(this._canvasElement);if(null!==n){var s=null!==(i=null===(t=this._devicePixelRatioObservable)||void 0===t?void 0:t.value)&&void 0!==i?i:n.devicePixelRatio,e=this._canvasElement.getClientRects(),r=void 0!==e[0]?function(t,i){return Jn({width:Math.round(t.left*i+t.width*i)-Math.round(t.left*i),height:Math.round(t.top*i+t.height*i)-Math.round(t.top*i)})}(e[0],s):Jn({width:this._canvasElementClientSize.width*s,height:this._canvasElementClientSize.height*s});this._suggestNewBitmapSize(r)}}},t.prototype._initResizeObserver=function(){var t=this;null!==this._canvasElement&&(this._canvasElementResizeObserver=new ResizeObserver((function(i){var n=i.find((function(i){return i.target===t._canvasElement}));if(n&&n.devicePixelContentBoxSize&&n.devicePixelContentBoxSize[0]){var s=n.devicePixelContentBoxSize[0],e=Jn({width:s.inlineSize,height:s.blockSize});t._suggestNewBitmapSize(e)}})),this._canvasElementResizeObserver.observe(this._canvasElement,{box:"device-pixel-content-box"}))},t}();function ns(t){return t.ownerDocument.defaultView}var ss=function(){function t(t,i,n){if(0===i.width||0===i.height)throw new TypeError("Rendering target could only be created on a media with positive width and height");if(this._mediaSize=i,0===n.width||0===n.height)throw new TypeError("Rendering target could only be created using a bitmap with positive integer width and height");this._bitmapSize=n,this._context=t}return t.prototype.useMediaCoordinateSpace=function(t){try{return this._context.save(),this._context.setTransform(1,0,0,1,0,0),this._context.scale(this._horizontalPixelRatio,this._verticalPixelRatio),t({context:this._context,mediaSize:this._mediaSize})}finally{this._context.restore()}},t.prototype.useBitmapCoordinateSpace=function(t){try{return this._context.save(),this._context.setTransform(1,0,0,1,0,0),t({context:this._context,mediaSize:this._mediaSize,bitmapSize:this._bitmapSize,horizontalPixelRatio:this._horizontalPixelRatio,verticalPixelRatio:this._verticalPixelRatio})}finally{this._context.restore()}},Object.defineProperty(t.prototype,"_horizontalPixelRatio",{get:function(){return this._bitmapSize.width/this._mediaSize.width},enumerable:!1,configurable:!0}),Object.defineProperty(t.prototype,"_verticalPixelRatio",{get:function(){return this._bitmapSize.height/this._mediaSize.height},enumerable:!1,configurable:!0}),t}();function es(t,i){var n=t.canvasElementClientSize;if(0===n.width||0===n.height)return null;var s=t.bitmapSize;if(0===s.width||0===s.height)return null;var e=t.canvasElement.getContext("2d",i);return null===e?null:new ss(e,n,s)}const rs="undefined"!=typeof window;function hs(){return!!rs&&window.navigator.userAgent.toLowerCase().indexOf("firefox")>-1}function ls(){return!!rs&&/iPhone|iPad|iPod/.test(window.navigator.platform)}function as(t){return t+t%2}function os(t,i){return t.zd-i.zd}function _s(t,i,n){const s=(t.zd-i.zd)/(t.ot-i.ot);return Math.sign(s)*Math.min(Math.abs(s),n)}class us{constructor(t,i,n,s){this.Ed=null,this.Id=null,this.Ld=null,this.Nd=null,this.Fd=null,this.Wd=0,this.jd=0,this.Hd=t,this.$d=i,this.Ud=n,this.rs=s}qd(t,i){if(null!==this.Ed){if(this.Ed.ot===i)return void(this.Ed.zd=t);if(Math.abs(this.Ed.zd-t)<this.rs)return}this.Nd=this.Ld,this.Ld=this.Id,this.Id=this.Ed,this.Ed={ot:i,zd:t}}Dr(t,i){if(null===this.Ed||null===this.Id)return;if(i-this.Ed.ot>50)return;let n=0;const s=_s(this.Ed,this.Id,this.$d),e=os(this.Ed,this.Id),r=[s],h=[e];if(n+=e,null!==this.Ld){const t=_s(this.Id,this.Ld,this.$d);if(Math.sign(t)===Math.sign(s)){const i=os(this.Id,this.Ld);if(r.push(t),h.push(i),n+=i,null!==this.Nd){const t=_s(this.Ld,this.Nd,this.$d);if(Math.sign(t)===Math.sign(s)){const i=os(this.Ld,this.Nd);r.push(t),h.push(i),n+=i}}}}let l=0;for(let t=0;t<r.length;++t)l+=h[t]/n*r[t];Math.abs(l)<this.Hd||(this.Fd={zd:t,ot:i},this.jd=l,this.Wd=function(t,i){const n=Math.log(i);return Math.log(1*n/-t)/n}(Math.abs(l),this.Ud))}Qu(t){const i=f(this.Fd),n=t-i.ot;return i.zd+this.jd*(Math.pow(this.Ud,n)-1)/Math.log(this.Ud)}Ju(t){return null===this.Fd||this.Yd(t)===this.Wd}Yd(t){const i=t-f(this.Fd).ot;return Math.min(i,this.Wd)}}class cs{constructor(t,i){this.Zd=void 0,this.Xd=void 0,this.Kd=void 0,this.en=!1,this.Gd=t,this.Jd=i,this.Qd()}bt(){this.Qd()}tf(){this.Zd&&this.Gd.removeChild(this.Zd),this.Xd&&this.Gd.removeChild(this.Xd),this.Zd=void 0,this.Xd=void 0}if(){return this.en!==this.nf()||this.Kd!==this.sf()}sf(){return k(S(this.Jd.W().layout.textColor))>160?"dark":"light"}nf(){return this.Jd.W().layout.attributionLogo}ef(){const t=new URL(location.href);return t.hostname?"&utm_source="+t.hostname+t.pathname:""}Qd(){this.if()&&(this.tf(),this.en=this.nf(),this.en&&(this.Kd=this.sf(),this.Xd=document.createElement("style"),this.Xd.innerText="a#tv-attr-logo{--fill:#131722;--stroke:#fff;position:absolute;left:10px;bottom:10px;height:19px;width:35px;margin:0;padding:0;border:0;z-index:3;}a#tv-attr-logo[data-dark]{--fill:#D1D4DC;--stroke:#131722;}",this.Zd=document.createElement("a"),this.Zd.href=`https://www.tradingview.com/?utm_medium=lwc-link&utm_campaign=lwc-chart${this.ef()}`,this.Zd.title="Charting by TradingView",this.Zd.id="tv-attr-logo",this.Zd.target="_blank",this.Zd.innerHTML='<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 35 19" width="35" height="19" fill="none"><g fill-rule="evenodd" clip-path="url(#a)" clip-rule="evenodd"><path fill="var(--stroke)" d="M2 0H0v10h6v9h21.4l.5-1.3 6-15 1-2.7H23.7l-.5 1.3-.2.6a5 5 0 0 0-7-.9V0H2Zm20 17h4l5.2-13 .8-2h-7l-1 2.5-.2.5-1.5 3.8-.3.7V17Zm-.8-10a3 3 0 0 0 .7-2.7A3 3 0 1 0 16.8 7h4.4ZM14 7V2H2v6h6v9h4V7h2Z"/><path fill="var(--fill)" d="M14 2H2v6h6v9h6V2Zm12 15h-7l6-15h7l-6 15Zm-7-9a3 3 0 1 0 0-6 3 3 0 0 0 0 6Z"/></g><defs><clipPath id="a"><path fill="var(--stroke)" d="M0 0h35v19H0z"/></clipPath></defs></svg>',this.Zd.toggleAttribute("data-dark","dark"===this.Kd),this.Gd.appendChild(this.Xd),this.Gd.appendChild(this.Zd)))}}function ds(t,i){const n=f(t.ownerDocument).createElement("canvas");t.appendChild(n);const s=function(t,i){if("device-pixel-content-box"===i.type)return new is(t,i.transform,i.options);throw new Error("Unsupported binding target")}(n,{type:"device-pixel-content-box",options:{allowResizeObserver:!1},transform:(t,i)=>({width:Math.max(t.width,i.width),height:Math.max(t.height,i.height)})});return s.resizeCanvasElement(i),s}function fs(t){var i;t.width=1,t.height=1,null===(i=t.getContext("2d"))||void 0===i||i.clearRect(0,0,1,1)}function vs(t,i,n,s){t.wl&&t.wl(i,n,s)}function ps(t,i,n,s){t.X(i,n,s)}function ms(t,i,n,s){const e=t(n,s);for(const t of e){const n=t.gt();null!==n&&i(n)}}function bs(t){rs&&void 0!==window.chrome&&t.addEventListener("mousedown",(t=>{if(1===t.button)return t.preventDefault(),!1}))}class ws{constructor(t,i,n){this.rf=0,this.hf=null,this.lf={nt:Number.NEGATIVE_INFINITY,st:Number.POSITIVE_INFINITY},this.af=0,this._f=null,this.uf={nt:Number.NEGATIVE_INFINITY,st:Number.POSITIVE_INFINITY},this.cf=null,this.df=!1,this.ff=null,this.vf=null,this.pf=!1,this.mf=!1,this.bf=!1,this.wf=null,this.gf=null,this.Mf=null,this.xf=null,this.Sf=null,this.kf=null,this.yf=null,this.Cf=0,this.Tf=!1,this.Pf=!1,this.Rf=!1,this.Df=0,this.Of=null,this.Vf=!ls(),this.Bf=t=>{this.Af(t)},this.zf=t=>{if(this.Ef(t)){const i=this.If(t);if(++this.af,this._f&&this.af>1){const{Lf:n}=this.Nf(xs(t),this.uf);n<30&&!this.bf&&this.Ff(i,this.jf.Wf),this.Hf()}}else{const i=this.If(t);if(++this.rf,this.hf&&this.rf>1){const{Lf:n}=this.Nf(xs(t),this.lf);n<5&&!this.mf&&this.$f(i,this.jf.Uf),this.qf()}}},this.Yf=t,this.jf=i,this.cn=n,this.Zf()}S(){null!==this.wf&&(this.wf(),this.wf=null),null!==this.gf&&(this.gf(),this.gf=null),null!==this.xf&&(this.xf(),this.xf=null),null!==this.Sf&&(this.Sf(),this.Sf=null),null!==this.kf&&(this.kf(),this.kf=null),null!==this.Mf&&(this.Mf(),this.Mf=null),this.Xf(),this.qf()}Kf(t){this.xf&&this.xf();const i=this.Gf.bind(this);if(this.xf=()=>{this.Yf.removeEventListener("mousemove",i)},this.Yf.addEventListener("mousemove",i),this.Ef(t))return;const n=this.If(t);this.$f(n,this.jf.Jf),this.Vf=!0}qf(){null!==this.hf&&clearTimeout(this.hf),this.rf=0,this.hf=null,this.lf={nt:Number.NEGATIVE_INFINITY,st:Number.POSITIVE_INFINITY}}Hf(){null!==this._f&&clearTimeout(this._f),this.af=0,this._f=null,this.uf={nt:Number.NEGATIVE_INFINITY,st:Number.POSITIVE_INFINITY}}Gf(t){if(this.Rf||null!==this.vf)return;if(this.Ef(t))return;const i=this.If(t);this.$f(i,this.jf.Qf),this.Vf=!0}tv(t){const i=ks(t.changedTouches,f(this.Of));if(null===i)return;if(this.Df=Ss(t),null!==this.yf)return;if(this.Pf)return;this.Tf=!0;const n=this.Nf(xs(i),f(this.vf)),{iv:s,nv:e,Lf:r}=n;if(this.pf||!(r<5)){if(!this.pf){const t=.5*s,i=e>=t&&!this.cn.sv(),n=t>e&&!this.cn.ev();i||n||(this.Pf=!0),this.pf=!0,this.bf=!0,this.Xf(),this.Hf()}if(!this.Pf){const n=this.If(t,i);this.Ff(n,this.jf.rv),Ms(t)}}}hv(t){if(0!==t.button)return;const i=this.Nf(xs(t),f(this.ff)),{Lf:n}=i;if(n>=5&&(this.mf=!0,this.qf()),this.mf){const i=this.If(t);this.$f(i,this.jf.lv)}}Nf(t,i){const n=Math.abs(i.nt-t.nt),s=Math.abs(i.st-t.st);return{iv:n,nv:s,Lf:n+s}}av(t){let i=ks(t.changedTouches,f(this.Of));if(null===i&&0===t.touches.length&&(i=t.changedTouches[0]),null===i)return;this.Of=null,this.Df=Ss(t),this.Xf(),this.vf=null,this.kf&&(this.kf(),this.kf=null);const n=this.If(t,i);if(this.Ff(n,this.jf.ov),++this.af,this._f&&this.af>1){const{Lf:t}=this.Nf(xs(i),this.uf);t<30&&!this.bf&&this.Ff(n,this.jf.Wf),this.Hf()}else this.bf||(this.Ff(n,this.jf._v),this.jf._v&&Ms(t));0===this.af&&Ms(t),0===t.touches.length&&this.df&&(this.df=!1,Ms(t))}Af(t){if(0!==t.button)return;const i=this.If(t);if(this.ff=null,this.Rf=!1,this.Sf&&(this.Sf(),this.Sf=null),hs()){this.Yf.ownerDocument.documentElement.removeEventListener("mouseleave",this.Bf)}if(!this.Ef(t))if(this.$f(i,this.jf.uv),++this.rf,this.hf&&this.rf>1){const{Lf:n}=this.Nf(xs(t),this.lf);n<5&&!this.mf&&this.$f(i,this.jf.Uf),this.qf()}else this.mf||this.$f(i,this.jf.cv)}Xf(){null!==this.cf&&(clearTimeout(this.cf),this.cf=null)}dv(t){if(null!==this.Of)return;const i=t.changedTouches[0];this.Of=i.identifier,this.Df=Ss(t);const n=this.Yf.ownerDocument.documentElement;this.bf=!1,this.pf=!1,this.Pf=!1,this.vf=xs(i),this.kf&&(this.kf(),this.kf=null);{const i=this.tv.bind(this),s=this.av.bind(this);this.kf=()=>{n.removeEventListener("touchmove",i),n.removeEventListener("touchend",s)},n.addEventListener("touchmove",i,{passive:!1}),n.addEventListener("touchend",s,{passive:!1}),this.Xf(),this.cf=setTimeout(this.fv.bind(this,t),240)}const s=this.If(t,i);this.Ff(s,this.jf.vv),this._f||(this.af=0,this._f=setTimeout(this.Hf.bind(this),500),this.uf=xs(i))}pv(t){if(0!==t.button)return;const i=this.Yf.ownerDocument.documentElement;hs()&&i.addEventListener("mouseleave",this.Bf),this.mf=!1,this.ff=xs(t),this.Sf&&(this.Sf(),this.Sf=null);{const t=this.hv.bind(this),n=this.Af.bind(this);this.Sf=()=>{i.removeEventListener("mousemove",t),i.removeEventListener("mouseup",n)},i.addEventListener("mousemove",t),i.addEventListener("mouseup",n)}if(this.Rf=!0,this.Ef(t))return;const n=this.If(t);this.$f(n,this.jf.mv),this.hf||(this.rf=0,this.hf=setTimeout(this.qf.bind(this),500),this.lf=xs(t))}Zf(){this.Yf.addEventListener("mouseenter",this.Kf.bind(this)),this.Yf.addEventListener("touchcancel",this.Xf.bind(this));{const t=this.Yf.ownerDocument,i=t=>{this.jf.bv&&(t.composed&&this.Yf.contains(t.composedPath()[0])||t.target&&this.Yf.contains(t.target)||this.jf.bv())};this.gf=()=>{t.removeEventListener("touchstart",i)},this.wf=()=>{t.removeEventListener("mousedown",i)},t.addEventListener("mousedown",i),t.addEventListener("touchstart",i,{passive:!0})}ls()&&(this.Mf=()=>{this.Yf.removeEventListener("dblclick",this.zf)},this.Yf.addEventListener("dblclick",this.zf)),this.Yf.addEventListener("mouseleave",this.wv.bind(this)),this.Yf.addEventListener("touchstart",this.dv.bind(this),{passive:!0}),bs(this.Yf),this.Yf.addEventListener("mousedown",this.pv.bind(this)),this.gv(),this.Yf.addEventListener("touchmove",(()=>{}),{passive:!1})}gv(){void 0===this.jf.Mv&&void 0===this.jf.xv&&void 0===this.jf.Sv||(this.Yf.addEventListener("touchstart",(t=>this.kv(t.touches)),{passive:!0}),this.Yf.addEventListener("touchmove",(t=>{if(2===t.touches.length&&null!==this.yf&&void 0!==this.jf.xv){const i=gs(t.touches[0],t.touches[1])/this.Cf;this.jf.xv(this.yf,i),Ms(t)}}),{passive:!1}),this.Yf.addEventListener("touchend",(t=>{this.kv(t.touches)})))}kv(t){1===t.length&&(this.Tf=!1),2!==t.length||this.Tf||this.df?this.yv():this.Cv(t)}Cv(t){const i=this.Yf.getBoundingClientRect()||{left:0,top:0};this.yf={nt:(t[0].clientX-i.left+(t[1].clientX-i.left))/2,st:(t[0].clientY-i.top+(t[1].clientY-i.top))/2},this.Cf=gs(t[0],t[1]),void 0!==this.jf.Mv&&this.jf.Mv(),this.Xf()}yv(){null!==this.yf&&(this.yf=null,void 0!==this.jf.Sv&&this.jf.Sv())}wv(t){if(this.xf&&this.xf(),this.Ef(t))return;if(!this.Vf)return;const i=this.If(t);this.$f(i,this.jf.Tv),this.Vf=!ls()}fv(t){const i=ks(t.touches,f(this.Of));if(null===i)return;const n=this.If(t,i);this.Ff(n,this.jf.Pv),this.bf=!0,this.df=!0}Ef(t){return t.sourceCapabilities&&void 0!==t.sourceCapabilities.firesTouchEvents?t.sourceCapabilities.firesTouchEvents:Ss(t)<this.Df+500}Ff(t,i){i&&i.call(this.jf,t)}$f(t,i){i&&i.call(this.jf,t)}If(t,i){const n=i||t,s=this.Yf.getBoundingClientRect()||{left:0,top:0};return{clientX:n.clientX,clientY:n.clientY,pageX:n.pageX,pageY:n.pageY,screenX:n.screenX,screenY:n.screenY,localX:n.clientX-s.left,localY:n.clientY-s.top,ctrlKey:t.ctrlKey,altKey:t.altKey,shiftKey:t.shiftKey,metaKey:t.metaKey,Rv:!t.type.startsWith("mouse")&&"contextmenu"!==t.type&&"click"!==t.type,Dv:t.type,Ov:n.target,Vv:t.view,Bv:()=>{"touchstart"!==t.type&&Ms(t)}}}}function gs(t,i){const n=t.clientX-i.clientX,s=t.clientY-i.clientY;return Math.sqrt(n*n+s*s)}function Ms(t){t.cancelable&&t.preventDefault()}function xs(t){return{nt:t.pageX,st:t.pageY}}function Ss(t){return t.timeStamp||performance.now()}function ks(t,i){for(let n=0;n<t.length;++n)if(t[n].identifier===i)return t[n];return null}function ys(t){return{jc:t.jc,Av:{wr:t.zv.externalId},Ev:t.zv.cursorStyle}}function Cs(t,i,n){for(const s of t){const t=s.gt();if(null!==t&&t.br){const e=t.br(i,n);if(null!==e)return{Vv:s,Av:e}}}return null}function Ts(t,i){return n=>{var s,e,r,h;return(null!==(e=null===(s=n.Dt())||void 0===s?void 0:s.Ta())&&void 0!==e?e:"")!==i?[]:null!==(h=null===(r=n.ca)||void 0===r?void 0:r.call(n,t))&&void 0!==h?h:[]}}function Ps(t,i,n,s){if(!t.length)return;let e=0;const r=n/2,h=t[0].At(s,!0);let l=1===i?r-(t[0].Oi()-h/2):t[0].Oi()-h/2-r;l=Math.max(0,l);for(let r=1;r<t.length;r++){const h=t[r],a=t[r-1],o=a.At(s,!1),_=h.Oi(),u=a.Oi();if(1===i?_>u-o:_<u+o){const s=u-o*i;h.Vi(s);const r=s-i*o/2;if((1===i?r<0:r>n)&&l>0){const s=1===i?-1-r:r-n,h=Math.min(s,l);for(let n=e;n<t.length;n++)t[n].Vi(t[n].Oi()+i*h);l-=h}}else e=r,l=1===i?u-o-_:_-(u+o)}}class Rs{constructor(t,i,n,s){this.Ii=null,this.Iv=null,this.Lv=!1,this.Nv=new Jt(200),this.Jr=null,this.Fv=0,this.Wv=!1,this.jv=()=>{this.Wv||this.tn.Hv().$t().$h()},this.$v=()=>{this.Wv||this.tn.Hv().$t().$h()},this.tn=t,this.cn=i,this.So=i.layout,this.Oc=n,this.Uv="left"===s,this.qv=Ts("normal",s),this.Yv=Ts("top",s),this.Zv=Ts("bottom",s),this.Xv=document.createElement("div"),this.Xv.style.height="100%",this.Xv.style.overflow="hidden",this.Xv.style.width="25px",this.Xv.style.left="0",this.Xv.style.position="relative",this.Kv=ds(this.Xv,Jn({width:16,height:16})),this.Kv.subscribeSuggestedBitmapSizeChanged(this.jv);const e=this.Kv.canvasElement;e.style.position="absolute",e.style.zIndex="1",e.style.left="0",e.style.top="0",this.Gv=ds(this.Xv,Jn({width:16,height:16})),this.Gv.subscribeSuggestedBitmapSizeChanged(this.$v);const r=this.Gv.canvasElement;r.style.position="absolute",r.style.zIndex="2",r.style.left="0",r.style.top="0";const h={mv:this.Jv.bind(this),vv:this.Jv.bind(this),lv:this.Qv.bind(this),rv:this.Qv.bind(this),bv:this.tp.bind(this),uv:this.ip.bind(this),ov:this.ip.bind(this),Uf:this.np.bind(this),Wf:this.np.bind(this),Jf:this.sp.bind(this),Tv:this.ep.bind(this)};this.rp=new ws(this.Gv.canvasElement,h,{sv:()=>!this.cn.handleScroll.vertTouchDrag,ev:()=>!0})}S(){this.rp.S(),this.Gv.unsubscribeSuggestedBitmapSizeChanged(this.$v),fs(this.Gv.canvasElement),this.Gv.dispose(),this.Kv.unsubscribeSuggestedBitmapSizeChanged(this.jv),fs(this.Kv.canvasElement),this.Kv.dispose(),null!==this.Ii&&this.Ii.Xo().p(this),this.Ii=null}hp(){return this.Xv}P(){return this.So.fontSize}lp(){const t=this.Oc.W();return this.Jr!==t.R&&(this.Nv.ir(),this.Jr=t.R),t}ap(){if(null===this.Ii)return 0;let t=0;const i=this.lp(),n=f(this.Kv.canvasElement.getContext("2d"));n.save();const s=this.Ii.ja();n.font=this.op(),s.length>0&&(t=Math.max(this.Nv.xi(n,s[0].no),this.Nv.xi(n,s[s.length-1].no)));const e=this._p();for(let i=e.length;i--;){const s=this.Nv.xi(n,e[i].Kt());s>t&&(t=s)}const r=this.Ii.Ct();if(null!==r&&null!==this.Iv&&2!==this.cn.crosshair.mode){const i=this.Ii.pn(1,r),s=this.Ii.pn(this.Iv.height-2,r);t=Math.max(t,this.Nv.xi(n,this.Ii.Fi(Math.floor(Math.min(i,s))+.11111111111111,r)),this.Nv.xi(n,this.Ii.Fi(Math.ceil(Math.max(i,s))-.11111111111111,r)))}n.restore();const h=t||34;return as(Math.ceil(i.C+i.T+i.A+i.I+5+h))}up(t){null!==this.Iv&&Qn(this.Iv,t)||(this.Iv=t,this.Wv=!0,this.Kv.resizeCanvasElement(t),this.Gv.resizeCanvasElement(t),this.Wv=!1,this.Xv.style.width=`${t.width}px`,this.Xv.style.height=`${t.height}px`)}cp(){return f(this.Iv).width}Gi(t){this.Ii!==t&&(null!==this.Ii&&this.Ii.Xo().p(this),this.Ii=t,t.Xo().l(this.do.bind(this),this))}Dt(){return this.Ii}ir(){const t=this.tn.dp();this.tn.Hv().$t().I_(t,f(this.Dt()))}fp(t){if(null===this.Iv)return;if(1!==t){this.vp(),this.Kv.applySuggestedBitmapSize();const t=es(this.Kv);null!==t&&(t.useBitmapCoordinateSpace((t=>{this.pp(t),this.Ae(t)})),this.tn.mp(t,this.Zv),this.bp(t),this.tn.mp(t,this.qv),this.wp(t))}this.Gv.applySuggestedBitmapSize();const i=es(this.Gv);null!==i&&(i.useBitmapCoordinateSpace((({context:t,bitmapSize:i})=>{t.clearRect(0,0,i.width,i.height)})),this.gp(i),this.tn.mp(i,this.Yv))}Mp(){return this.Kv.bitmapSize}xp(t,i,n){const s=this.Mp();s.width>0&&s.height>0&&t.drawImage(this.Kv.canvasElement,i,n)}bt(){var t;null===(t=this.Ii)||void 0===t||t.ja()}Jv(t){if(null===this.Ii||this.Ii.Ni()||!this.cn.handleScale.axisPressedMouseMove.price)return;const i=this.tn.Hv().$t(),n=this.tn.dp();this.Lv=!0,i.D_(n,this.Ii,t.localY)}Qv(t){if(null===this.Ii||!this.cn.handleScale.axisPressedMouseMove.price)return;const i=this.tn.Hv().$t(),n=this.tn.dp(),s=this.Ii;i.O_(n,s,t.localY)}tp(){if(null===this.Ii||!this.cn.handleScale.axisPressedMouseMove.price)return;const t=this.tn.Hv().$t(),i=this.tn.dp(),n=this.Ii;this.Lv&&(this.Lv=!1,t.V_(i,n))}ip(t){if(null===this.Ii||!this.cn.handleScale.axisPressedMouseMove.price)return;const i=this.tn.Hv().$t(),n=this.tn.dp();this.Lv=!1,i.V_(n,this.Ii)}np(t){this.cn.handleScale.axisDoubleClickReset.price&&this.ir()}sp(t){if(null===this.Ii)return;!this.tn.Hv().$t().W().handleScale.axisPressedMouseMove.price||this.Ii.gh()||this.Ii.Oo()||this.Sp(1)}ep(t){this.Sp(0)}_p(){const t=[],i=null===this.Ii?void 0:this.Ii;return(n=>{for(let s=0;s<n.length;++s){const e=n[s].Rn(this.tn.dp(),i);for(let i=0;i<e.length;i++)t.push(e[i])}})(this.tn.dp().$o()),t}pp({context:t,bitmapSize:i}){const{width:n,height:s}=i,e=this.tn.dp().$t(),r=e.q(),h=e.md();r===h?Y(t,0,0,n,s,r):K(t,0,0,n,s,r,h)}Ae({context:t,bitmapSize:i,horizontalPixelRatio:n}){if(null===this.Iv||null===this.Ii||!this.Ii.W().borderVisible)return;t.fillStyle=this.Ii.W().borderColor;const s=Math.max(1,Math.floor(this.lp().C*n));let e;e=this.Uv?i.width-s:0,t.fillRect(e,0,s,i.height)}bp(t){if(null===this.Iv||null===this.Ii)return;const i=this.Ii.ja(),n=this.Ii.W(),s=this.lp(),e=this.Uv?this.Iv.width-s.T:0;n.borderVisible&&n.ticksVisible&&t.useBitmapCoordinateSpace((({context:t,horizontalPixelRatio:r,verticalPixelRatio:h})=>{t.fillStyle=n.borderColor;const l=Math.max(1,Math.floor(h)),a=Math.floor(.5*h),o=Math.round(s.T*r);t.beginPath();for(const n of i)t.rect(Math.floor(e*r),Math.round(n.Ia*h)-a,o,l);t.fill()})),t.useMediaCoordinateSpace((({context:t})=>{var r;t.font=this.op(),t.fillStyle=null!==(r=n.textColor)&&void 0!==r?r:this.So.textColor,t.textAlign=this.Uv?"right":"left",t.textBaseline="middle";const h=this.Uv?Math.round(e-s.A):Math.round(e+s.T+s.A),l=i.map((i=>this.Nv.Mi(t,i.no)));for(let n=i.length;n--;){const s=i[n];t.fillText(s.no,h,s.Ia+l[n])}}))}vp(){if(null===this.Iv||null===this.Ii)return;const t=[],i=this.Ii.$o().slice(),n=this.tn.dp(),s=this.lp();this.Ii===n.vr()&&this.tn.dp().$o().forEach((t=>{n.dr(t)&&i.push(t)}));const e=this.Ii;i.forEach((i=>{i.Rn(n,e).forEach((i=>{i.Vi(null),i.Bi()&&t.push(i)}))})),t.forEach((t=>t.Vi(t.ki())));this.Ii.W().alignLabels&&this.kp(t,s)}kp(t,i){if(null===this.Iv)return;const n=this.Iv.height/2,s=t.filter((t=>t.ki()<=n)),e=t.filter((t=>t.ki()>n));s.sort(((t,i)=>i.ki()-t.ki())),e.sort(((t,i)=>t.ki()-i.ki()));for(const n of t){const t=Math.floor(n.At(i)/2),s=n.ki();s>-t&&s<t&&n.Vi(t),s>this.Iv.height-t&&s<this.Iv.height+t&&n.Vi(this.Iv.height-t)}Ps(s,1,this.Iv.height,i),Ps(e,-1,this.Iv.height,i)}wp(t){if(null===this.Iv)return;const i=this._p(),n=this.lp(),s=this.Uv?"right":"left";i.forEach((i=>{if(i.Ai()){i.gt(f(this.Ii)).X(t,n,this.Nv,s)}}))}gp(t){if(null===this.Iv||null===this.Ii)return;const i=this.tn.Hv().$t(),n=[],s=this.tn.dp(),e=i.Yc().Rn(s,this.Ii);e.length&&n.push(e);const r=this.lp(),h=this.Uv?"right":"left";n.forEach((i=>{i.forEach((i=>{i.gt(f(this.Ii)).X(t,r,this.Nv,h)}))}))}Sp(t){this.Xv.style.cursor=1===t?"ns-resize":"default"}do(){const t=this.ap();this.Fv<t&&this.tn.Hv().$t().Xl(),this.Fv=t}op(){return E(this.So.fontSize,this.So.fontFamily)}}function Ds(t,i){var n,s;return null!==(s=null===(n=t._a)||void 0===n?void 0:n.call(t,i))&&void 0!==s?s:[]}function Os(t,i){var n,s;return null!==(s=null===(n=t.Pn)||void 0===n?void 0:n.call(t,i))&&void 0!==s?s:[]}function Vs(t,i){var n,s;return null!==(s=null===(n=t.Ji)||void 0===n?void 0:n.call(t,i))&&void 0!==s?s:[]}function Bs(t,i){var n,s;return null!==(s=null===(n=t.la)||void 0===n?void 0:n.call(t,i))&&void 0!==s?s:[]}class As{constructor(t,i){this.Iv=Jn({width:0,height:0}),this.yp=null,this.Cp=null,this.Tp=null,this.Pp=null,this.Rp=!1,this.Dp=new C,this.Op=new C,this.Vp=0,this.Bp=!1,this.Ap=null,this.zp=!1,this.Ep=null,this.Ip=null,this.Wv=!1,this.jv=()=>{this.Wv||null===this.Lp||this.$i().$h()},this.$v=()=>{this.Wv||null===this.Lp||this.$i().$h()},this.Jd=t,this.Lp=i,this.Lp.F_().l(this.Np.bind(this),this,!0),this.Fp=document.createElement("td"),this.Fp.style.padding="0",this.Fp.style.position="relative";const n=document.createElement("div");n.style.width="100%",n.style.height="100%",n.style.position="relative",n.style.overflow="hidden",this.Wp=document.createElement("td"),this.Wp.style.padding="0",this.jp=document.createElement("td"),this.jp.style.padding="0",this.Fp.appendChild(n),this.Kv=ds(n,Jn({width:16,height:16})),this.Kv.subscribeSuggestedBitmapSizeChanged(this.jv);const s=this.Kv.canvasElement;s.style.position="absolute",s.style.zIndex="1",s.style.left="0",s.style.top="0",this.Gv=ds(n,Jn({width:16,height:16})),this.Gv.subscribeSuggestedBitmapSizeChanged(this.$v);const e=this.Gv.canvasElement;e.style.position="absolute",e.style.zIndex="2",e.style.left="0",e.style.top="0",this.Hp=document.createElement("tr"),this.Hp.appendChild(this.Wp),this.Hp.appendChild(this.Fp),this.Hp.appendChild(this.jp),this.$p(),this.rp=new ws(this.Gv.canvasElement,this,{sv:()=>null===this.Ap&&!this.Jd.W().handleScroll.vertTouchDrag,ev:()=>null===this.Ap&&!this.Jd.W().handleScroll.horzTouchDrag})}S(){null!==this.yp&&this.yp.S(),null!==this.Cp&&this.Cp.S(),this.Tp=null,this.Gv.unsubscribeSuggestedBitmapSizeChanged(this.$v),fs(this.Gv.canvasElement),this.Gv.dispose(),this.Kv.unsubscribeSuggestedBitmapSizeChanged(this.jv),fs(this.Kv.canvasElement),this.Kv.dispose(),null!==this.Lp&&this.Lp.F_().p(this),this.rp.S()}dp(){return f(this.Lp)}Up(t){var i,n;null!==this.Lp&&this.Lp.F_().p(this),this.Lp=t,null!==this.Lp&&this.Lp.F_().l(As.prototype.Np.bind(this),this,!0),this.$p(),this.Jd.qp().indexOf(this)===this.Jd.qp().length-1?(this.Tp=null!==(i=this.Tp)&&void 0!==i?i:new cs(this.Fp,this.Jd),this.Tp.bt()):(null===(n=this.Tp)||void 0===n||n.tf(),this.Tp=null)}Hv(){return this.Jd}hp(){return this.Hp}$p(){if(null!==this.Lp&&(this.Yp(),0!==this.$i().wt().length)){if(null!==this.yp){const t=this.Lp.P_();this.yp.Gi(f(t))}if(null!==this.Cp){const t=this.Lp.R_();this.Cp.Gi(f(t))}}}Zp(){null!==this.yp&&this.yp.bt(),null!==this.Cp&&this.Cp.bt()}g_(){return null!==this.Lp?this.Lp.g_():0}M_(t){this.Lp&&this.Lp.M_(t)}Jf(t){if(!this.Lp)return;this.Xp();const i=t.localX,n=t.localY;this.Kp(i,n,t)}mv(t){this.Xp(),this.Gp(),this.Kp(t.localX,t.localY,t)}Qf(t){var i;if(!this.Lp)return;this.Xp();const n=t.localX,s=t.localY;this.Kp(n,s,t);const e=this.br(n,s);this.Jd.Jp(null!==(i=null==e?void 0:e.Ev)&&void 0!==i?i:null),this.$i().Wc(e&&{jc:e.jc,Av:e.Av})}cv(t){null!==this.Lp&&(this.Xp(),this.Qp(t))}Uf(t){null!==this.Lp&&this.tm(this.Op,t)}Wf(t){this.Uf(t)}lv(t){this.Xp(),this.im(t),this.Kp(t.localX,t.localY,t)}uv(t){null!==this.Lp&&(this.Xp(),this.Bp=!1,this.nm(t))}_v(t){null!==this.Lp&&this.Qp(t)}Pv(t){if(this.Bp=!0,null===this.Ap){const i={x:t.localX,y:t.localY};this.sm(i,i,t)}}Tv(t){null!==this.Lp&&(this.Xp(),this.Lp.$t().Wc(null),this.rm())}hm(){return this.Dp}lm(){return this.Op}Mv(){this.Vp=1,this.$i().Un()}xv(t,i){if(!this.Jd.W().handleScale.pinch)return;const n=5*(i-this.Vp);this.Vp=i,this.$i().Jc(t.nt,n)}vv(t){this.Bp=!1,this.zp=null!==this.Ap,this.Gp();const i=this.$i().Yc();null!==this.Ap&&i.yt()&&(this.Ep={x:i.Yt(),y:i.Zt()},this.Ap={x:t.localX,y:t.localY})}rv(t){if(null===this.Lp)return;const i=t.localX,n=t.localY;if(null===this.Ap)this.im(t);else{this.zp=!1;const s=f(this.Ep),e=s.x+(i-this.Ap.x),r=s.y+(n-this.Ap.y);this.Kp(e,r,t)}}ov(t){0===this.Hv().W().trackingMode.exitMode&&(this.zp=!0),this.am(),this.nm(t)}br(t,i){const n=this.Lp;return null===n?null:function(t,i,n){const s=t.$o(),e=function(t,i,n){var s,e;let r,h;for(const o of t){const t=null!==(e=null===(s=o.fa)||void 0===s?void 0:s.call(o,i,n))&&void 0!==e?e:[];for(const i of t)l=i.zOrder,(!(a=null==r?void 0:r.zOrder)||"top"===l&&"top"!==a||"normal"===l&&"bottom"===a)&&(r=i,h=o)}var l,a;return r&&h?{zv:r,jc:h}:null}(s,i,n);if("top"===(null==e?void 0:e.zv.zOrder))return ys(e);for(const r of s){if(e&&e.jc===r&&"bottom"!==e.zv.zOrder&&!e.zv.isBackground)return ys(e);const s=Cs(r.Pn(t),i,n);if(null!==s)return{jc:r,Vv:s.Vv,Av:s.Av};if(e&&e.jc===r&&"bottom"!==e.zv.zOrder&&e.zv.isBackground)return ys(e)}return(null==e?void 0:e.zv)?ys(e):null}(n,t,i)}om(t,i){f("left"===i?this.yp:this.Cp).up(Jn({width:t,height:this.Iv.height}))}_m(){return this.Iv}up(t){Qn(this.Iv,t)||(this.Iv=t,this.Wv=!0,this.Kv.resizeCanvasElement(t),this.Gv.resizeCanvasElement(t),this.Wv=!1,this.Fp.style.width=t.width+"px",this.Fp.style.height=t.height+"px")}um(){const t=f(this.Lp);t.T_(t.P_()),t.T_(t.R_());for(const i of t.Va())if(t.dr(i)){const n=i.Dt();null!==n&&t.T_(n),i.On()}}Mp(){return this.Kv.bitmapSize}xp(t,i,n){const s=this.Mp();s.width>0&&s.height>0&&t.drawImage(this.Kv.canvasElement,i,n)}fp(t){if(0===t)return;if(null===this.Lp)return;if(t>1&&this.um(),null!==this.yp&&this.yp.fp(t),null!==this.Cp&&this.Cp.fp(t),1!==t){this.Kv.applySuggestedBitmapSize();const t=es(this.Kv);null!==t&&(t.useBitmapCoordinateSpace((t=>{this.pp(t)})),this.Lp&&(this.dm(t,Ds),this.fm(t),this.vm(t),this.dm(t,Os),this.dm(t,Vs)))}this.Gv.applySuggestedBitmapSize();const i=es(this.Gv);null!==i&&(i.useBitmapCoordinateSpace((({context:t,bitmapSize:i})=>{t.clearRect(0,0,i.width,i.height)})),this.pm(i),this.dm(i,Bs))}bm(){return this.yp}wm(){return this.Cp}mp(t,i){this.dm(t,i)}Np(){null!==this.Lp&&this.Lp.F_().p(this),this.Lp=null}Qp(t){this.tm(this.Dp,t)}tm(t,i){const n=i.localX,s=i.localY;t.M()&&t.m(this.$i().St().Lu(n),{x:n,y:s},i)}pp({context:t,bitmapSize:i}){const{width:n,height:s}=i,e=this.$i(),r=e.q(),h=e.md();r===h?Y(t,0,0,n,s,h):K(t,0,0,n,s,r,h)}fm(t){const i=f(this.Lp).W_().Uh().gt();null!==i&&i.X(t,!1)}vm(t){const i=this.$i().qc();this.gm(t,Os,vs,i),this.gm(t,Os,ps,i)}pm(t){this.gm(t,Os,ps,this.$i().Yc())}dm(t,i){const n=f(this.Lp).$o();for(const s of n)this.gm(t,i,vs,s);for(const s of n)this.gm(t,i,ps,s)}gm(t,i,n,s){const e=f(this.Lp),r=e.$t().Fc(),h=null!==r&&r.jc===s,l=null!==r&&h&&void 0!==r.Av?r.Av.gr:void 0;ms(i,(i=>n(i,t,h,l)),s,e)}Yp(){if(null===this.Lp)return;const t=this.Jd,i=this.Lp.P_().W().visible,n=this.Lp.R_().W().visible;i||null===this.yp||(this.Wp.removeChild(this.yp.hp()),this.yp.S(),this.yp=null),n||null===this.Cp||(this.jp.removeChild(this.Cp.hp()),this.Cp.S(),this.Cp=null);const s=t.$t()._d();i&&null===this.yp&&(this.yp=new Rs(this,t.W(),s,"left"),this.Wp.appendChild(this.yp.hp())),n&&null===this.Cp&&(this.Cp=new Rs(this,t.W(),s,"right"),this.jp.appendChild(this.Cp.hp()))}Mm(t){return t.Rv&&this.Bp||null!==this.Ap}xm(t){return Math.max(0,Math.min(t,this.Iv.width-1))}Sm(t){return Math.max(0,Math.min(t,this.Iv.height-1))}Kp(t,i,n){this.$i().hd(this.xm(t),this.Sm(i),n,f(this.Lp))}rm(){this.$i().ad()}am(){this.zp&&(this.Ap=null,this.rm())}sm(t,i,n){this.Ap=t,this.zp=!1,this.Kp(i.x,i.y,n);const s=this.$i().Yc();this.Ep={x:s.Yt(),y:s.Zt()}}$i(){return this.Jd.$t()}nm(t){if(!this.Rp)return;const i=this.$i(),n=this.dp();if(i.z_(n,n.vn()),this.Pp=null,this.Rp=!1,i.sd(),null!==this.Ip){const t=performance.now(),n=i.St();this.Ip.Dr(n.ju(),t),this.Ip.Ju(t)||i.Zn(this.Ip)}}Xp(){this.Ap=null}Gp(){if(!this.Lp)return;if(this.$i().Un(),document.activeElement!==document.body&&document.activeElement!==document.documentElement)f(document.activeElement).blur();else{const t=document.getSelection();null!==t&&t.removeAllRanges()}!this.Lp.vn().Ni()&&this.$i().St().Ni()}im(t){if(null===this.Lp)return;const i=this.$i(),n=i.St();if(n.Ni())return;const s=this.Jd.W(),e=s.handleScroll,r=s.kineticScroll;if((!e.pressedMouseMove||t.Rv)&&(!e.horzTouchDrag&&!e.vertTouchDrag||!t.Rv))return;const h=this.Lp.vn(),l=performance.now();if(null!==this.Pp||this.Mm(t)||(this.Pp={x:t.clientX,y:t.clientY,Od:l,km:t.localX,ym:t.localY}),null!==this.Pp&&!this.Rp&&(this.Pp.x!==t.clientX||this.Pp.y!==t.clientY)){if(t.Rv&&r.touch||!t.Rv&&r.mouse){const t=n.he();this.Ip=new us(.2/t,7/t,.997,15/t),this.Ip.qd(n.ju(),this.Pp.Od)}else this.Ip=null;h.Ni()||i.B_(this.Lp,h,t.localY),i.td(t.localX),this.Rp=!0}this.Rp&&(h.Ni()||i.A_(this.Lp,h,t.localY),i.nd(t.localX),null!==this.Ip&&this.Ip.qd(n.ju(),l))}}class zs{constructor(t,i,n,s,e){this.ft=!0,this.Iv=Jn({width:0,height:0}),this.jv=()=>this.fp(3),this.Uv="left"===t,this.Oc=n._d,this.cn=i,this.Cm=s,this.Tm=e,this.Xv=document.createElement("div"),this.Xv.style.width="25px",this.Xv.style.height="100%",this.Xv.style.overflow="hidden",this.Kv=ds(this.Xv,Jn({width:16,height:16})),this.Kv.subscribeSuggestedBitmapSizeChanged(this.jv)}S(){this.Kv.unsubscribeSuggestedBitmapSizeChanged(this.jv),fs(this.Kv.canvasElement),this.Kv.dispose()}hp(){return this.Xv}_m(){return this.Iv}up(t){Qn(this.Iv,t)||(this.Iv=t,this.Kv.resizeCanvasElement(t),this.Xv.style.width=`${t.width}px`,this.Xv.style.height=`${t.height}px`,this.ft=!0)}fp(t){if(t<3&&!this.ft)return;if(0===this.Iv.width||0===this.Iv.height)return;this.ft=!1,this.Kv.applySuggestedBitmapSize();const i=es(this.Kv);null!==i&&i.useBitmapCoordinateSpace((t=>{this.pp(t),this.Ae(t)}))}Mp(){return this.Kv.bitmapSize}xp(t,i,n){const s=this.Mp();s.width>0&&s.height>0&&t.drawImage(this.Kv.canvasElement,i,n)}Ae({context:t,bitmapSize:i,horizontalPixelRatio:n,verticalPixelRatio:s}){if(!this.Cm())return;t.fillStyle=this.cn.timeScale.borderColor;const e=Math.floor(this.Oc.W().C*n),r=Math.floor(this.Oc.W().C*s),h=this.Uv?i.width-e:0;t.fillRect(h,0,e,r)}pp({context:t,bitmapSize:i}){Y(t,0,0,i.width,i.height,this.Tm())}}function Es(t){return i=>{var n,s;return null!==(s=null===(n=i.da)||void 0===n?void 0:n.call(i,t))&&void 0!==s?s:[]}}const Is=Es("normal"),Ls=Es("top"),Ns=Es("bottom");class Fs{constructor(t,i){this.Pm=null,this.Rm=null,this.k=null,this.Dm=!1,this.Iv=Jn({width:0,height:0}),this.Om=new C,this.Nv=new Jt(5),this.Wv=!1,this.jv=()=>{this.Wv||this.Jd.$t().$h()},this.$v=()=>{this.Wv||this.Jd.$t().$h()},this.Jd=t,this.U_=i,this.cn=t.W().layout,this.Zd=document.createElement("tr"),this.Vm=document.createElement("td"),this.Vm.style.padding="0",this.Bm=document.createElement("td"),this.Bm.style.padding="0",this.Xv=document.createElement("td"),this.Xv.style.height="25px",this.Xv.style.padding="0",this.Am=document.createElement("div"),this.Am.style.width="100%",this.Am.style.height="100%",this.Am.style.position="relative",this.Am.style.overflow="hidden",this.Xv.appendChild(this.Am),this.Kv=ds(this.Am,Jn({width:16,height:16})),this.Kv.subscribeSuggestedBitmapSizeChanged(this.jv);const n=this.Kv.canvasElement;n.style.position="absolute",n.style.zIndex="1",n.style.left="0",n.style.top="0",this.Gv=ds(this.Am,Jn({width:16,height:16})),this.Gv.subscribeSuggestedBitmapSizeChanged(this.$v);const s=this.Gv.canvasElement;s.style.position="absolute",s.style.zIndex="2",s.style.left="0",s.style.top="0",this.Zd.appendChild(this.Vm),this.Zd.appendChild(this.Xv),this.Zd.appendChild(this.Bm),this.zm(),this.Jd.$t().w_().l(this.zm.bind(this),this),this.rp=new ws(this.Gv.canvasElement,this,{sv:()=>!0,ev:()=>!this.Jd.W().handleScroll.horzTouchDrag})}S(){this.rp.S(),null!==this.Pm&&this.Pm.S(),null!==this.Rm&&this.Rm.S(),this.Gv.unsubscribeSuggestedBitmapSizeChanged(this.$v),fs(this.Gv.canvasElement),this.Gv.dispose(),this.Kv.unsubscribeSuggestedBitmapSizeChanged(this.jv),fs(this.Kv.canvasElement),this.Kv.dispose()}hp(){return this.Zd}Em(){return this.Pm}Im(){return this.Rm}mv(t){if(this.Dm)return;this.Dm=!0;const i=this.Jd.$t();!i.St().Ni()&&this.Jd.W().handleScale.axisPressedMouseMove.time&&i.Gc(t.localX)}vv(t){this.mv(t)}bv(){const t=this.Jd.$t();!t.St().Ni()&&this.Dm&&(this.Dm=!1,this.Jd.W().handleScale.axisPressedMouseMove.time&&t.rd())}lv(t){const i=this.Jd.$t();!i.St().Ni()&&this.Jd.W().handleScale.axisPressedMouseMove.time&&i.ed(t.localX)}rv(t){this.lv(t)}uv(){this.Dm=!1;const t=this.Jd.$t();t.St().Ni()&&!this.Jd.W().handleScale.axisPressedMouseMove.time||t.rd()}ov(){this.uv()}Uf(){this.Jd.W().handleScale.axisDoubleClickReset.time&&this.Jd.$t().Kn()}Wf(){this.Uf()}Jf(){this.Jd.$t().W().handleScale.axisPressedMouseMove.time&&this.Sp(1)}Tv(){this.Sp(0)}_m(){return this.Iv}Lm(){return this.Om}Nm(t,i,n){Qn(this.Iv,t)||(this.Iv=t,this.Wv=!0,this.Kv.resizeCanvasElement(t),this.Gv.resizeCanvasElement(t),this.Wv=!1,this.Xv.style.width=`${t.width}px`,this.Xv.style.height=`${t.height}px`,this.Om.m(t)),null!==this.Pm&&this.Pm.up(Jn({width:i,height:t.height})),null!==this.Rm&&this.Rm.up(Jn({width:n,height:t.height}))}Fm(){const t=this.Wm();return Math.ceil(t.C+t.T+t.P+t.L+t.B+t.jm)}bt(){this.Jd.$t().St().ja()}Mp(){return this.Kv.bitmapSize}xp(t,i,n){const s=this.Mp();s.width>0&&s.height>0&&t.drawImage(this.Kv.canvasElement,i,n)}fp(t){if(0===t)return;if(1!==t){this.Kv.applySuggestedBitmapSize();const i=es(this.Kv);null!==i&&(i.useBitmapCoordinateSpace((t=>{this.pp(t),this.Ae(t),this.Hm(i,Ns)})),this.bp(i),this.Hm(i,Is)),null!==this.Pm&&this.Pm.fp(t),null!==this.Rm&&this.Rm.fp(t)}this.Gv.applySuggestedBitmapSize();const i=es(this.Gv);null!==i&&(i.useBitmapCoordinateSpace((({context:t,bitmapSize:i})=>{t.clearRect(0,0,i.width,i.height)})),this.$m([...this.Jd.$t().wt(),this.Jd.$t().Yc()],i),this.Hm(i,Ls))}Hm(t,i){const n=this.Jd.$t().wt();for(const s of n)ms(i,(i=>vs(i,t,!1,void 0)),s,void 0);for(const s of n)ms(i,(i=>ps(i,t,!1,void 0)),s,void 0)}pp({context:t,bitmapSize:i}){Y(t,0,0,i.width,i.height,this.Jd.$t().md())}Ae({context:t,bitmapSize:i,verticalPixelRatio:n}){if(this.Jd.W().timeScale.borderVisible){t.fillStyle=this.Um();const s=Math.max(1,Math.floor(this.Wm().C*n));t.fillRect(0,0,i.width,s)}}bp(t){const i=this.Jd.$t().St(),n=i.ja();if(!n||0===n.length)return;const s=this.U_.maxTickMarkWeight(n),e=this.Wm(),r=i.W();r.borderVisible&&r.ticksVisible&&t.useBitmapCoordinateSpace((({context:t,horizontalPixelRatio:i,verticalPixelRatio:s})=>{t.strokeStyle=this.Um(),t.fillStyle=this.Um();const r=Math.max(1,Math.floor(i)),h=Math.floor(.5*i);t.beginPath();const l=Math.round(e.T*s);for(let s=n.length;s--;){const e=Math.round(n[s].coord*i);t.rect(e-h,0,r,l)}t.fill()})),t.useMediaCoordinateSpace((({context:t})=>{const i=e.C+e.T+e.L+e.P/2;t.textAlign="center",t.textBaseline="middle",t.fillStyle=this.$(),t.font=this.op();for(const e of n)if(e.weight<s){const n=e.needAlignCoordinate?this.qm(t,e.coord,e.label):e.coord;t.fillText(e.label,n,i)}this.Jd.W().timeScale.allowBoldLabels&&(t.font=this.Ym());for(const e of n)if(e.weight>=s){const n=e.needAlignCoordinate?this.qm(t,e.coord,e.label):e.coord;t.fillText(e.label,n,i)}}))}qm(t,i,n){const s=this.Nv.xi(t,n),e=s/2,r=Math.floor(i-e)+.5;return r<0?i+=Math.abs(0-r):r+s>this.Iv.width&&(i-=Math.abs(this.Iv.width-(r+s))),i}$m(t,i){const n=this.Wm();for(const s of t)for(const t of s.Qi())t.gt().X(i,n)}Um(){return this.Jd.W().timeScale.borderColor}$(){return this.cn.textColor}j(){return this.cn.fontSize}op(){return E(this.j(),this.cn.fontFamily)}Ym(){return E(this.j(),this.cn.fontFamily,"bold")}Wm(){null===this.k&&(this.k={C:1,N:NaN,L:NaN,B:NaN,ji:NaN,T:5,P:NaN,R:"",Wi:new Jt,jm:0});const t=this.k,i=this.op();if(t.R!==i){const n=this.j();t.P=n,t.R=i,t.L=3*n/12,t.B=3*n/12,t.ji=9*n/12,t.N=0,t.jm=4*n/12,t.Wi.ir()}return this.k}Sp(t){this.Xv.style.cursor=1===t?"ew-resize":"default"}zm(){const t=this.Jd.$t(),i=t.W();i.leftPriceScale.visible||null===this.Pm||(this.Vm.removeChild(this.Pm.hp()),this.Pm.S(),this.Pm=null),i.rightPriceScale.visible||null===this.Rm||(this.Bm.removeChild(this.Rm.hp()),this.Rm.S(),this.Rm=null);const n={_d:this.Jd.$t()._d()},s=()=>i.leftPriceScale.borderVisible&&t.St().W().borderVisible,e=()=>t.md();i.leftPriceScale.visible&&null===this.Pm&&(this.Pm=new zs("left",i,n,s,e),this.Vm.appendChild(this.Pm.hp())),i.rightPriceScale.visible&&null===this.Rm&&(this.Rm=new zs("right",i,n,s,e),this.Bm.appendChild(this.Rm.hp()))}}const Ws=!!rs&&!!navigator.userAgentData&&navigator.userAgentData.brands.some((t=>t.brand.includes("Chromium")))&&!!rs&&((null===(js=null===navigator||void 0===navigator?void 0:navigator.userAgentData)||void 0===js?void 0:js.platform)?"Windows"===navigator.userAgentData.platform:navigator.userAgent.toLowerCase().indexOf("win")>=0);var js;class Hs{constructor(t,i,n){var s;this.Zm=[],this.Xm=0,this.ro=0,this.o_=0,this.Km=0,this.Gm=0,this.Jm=null,this.Qm=!1,this.Dp=new C,this.Op=new C,this.Pc=new C,this.tb=null,this.ib=null,this.Gd=t,this.cn=i,this.U_=n,this.Zd=document.createElement("div"),this.Zd.classList.add("tv-lightweight-charts"),this.Zd.style.overflow="hidden",this.Zd.style.direction="ltr",this.Zd.style.width="100%",this.Zd.style.height="100%",(s=this.Zd).style.userSelect="none",s.style.webkitUserSelect="none",s.style.msUserSelect="none",s.style.MozUserSelect="none",s.style.webkitTapHighlightColor="transparent",this.nb=document.createElement("table"),this.nb.setAttribute("cellspacing","0"),this.Zd.appendChild(this.nb),this.sb=this.eb.bind(this),$s(this.cn)&&this.rb(!0),this.$i=new Bn(this.Dc.bind(this),this.cn,n),this.$t().Zc().l(this.hb.bind(this),this),this.lb=new Fs(this,this.U_),this.nb.appendChild(this.lb.hp());const e=i.autoSize&&this.ab();let r=this.cn.width,h=this.cn.height;if(e||0===r||0===h){const i=t.getBoundingClientRect();r=r||i.width,h=h||i.height}this.ob(r,h),this._b(),t.appendChild(this.Zd),this.ub(),this.$i.St().sc().l(this.$i.Xl.bind(this.$i),this),this.$i.w_().l(this.$i.Xl.bind(this.$i),this)}$t(){return this.$i}W(){return this.cn}qp(){return this.Zm}cb(){return this.lb}S(){this.rb(!1),0!==this.Xm&&window.cancelAnimationFrame(this.Xm),this.$i.Zc().p(this),this.$i.St().sc().p(this),this.$i.w_().p(this),this.$i.S();for(const t of this.Zm)this.nb.removeChild(t.hp()),t.hm().p(this),t.lm().p(this),t.S();this.Zm=[],f(this.lb).S(),null!==this.Zd.parentElement&&this.Zd.parentElement.removeChild(this.Zd),this.Pc.S(),this.Dp.S(),this.Op.S(),this.fb()}ob(t,i,n=!1){if(this.ro===i&&this.o_===t)return;const s=function(t){const i=Math.floor(t.width),n=Math.floor(t.height);return Jn({width:i-i%2,height:n-n%2})}(Jn({width:t,height:i}));this.ro=s.height,this.o_=s.width;const e=this.ro+"px",r=this.o_+"px";f(this.Zd).style.height=e,f(this.Zd).style.width=r,this.nb.style.height=e,this.nb.style.width=r,n?this.pb(lt.es(),performance.now()):this.$i.Xl()}fp(t){void 0===t&&(t=lt.es());for(let i=0;i<this.Zm.length;i++)this.Zm[i].fp(t.Hn(i).Fn);this.cn.timeScale.visible&&this.lb.fp(t.jn())}Hh(t){const i=$s(this.cn);this.$i.Hh(t);const n=$s(this.cn);n!==i&&this.rb(n),this.ub(),this.mb(t)}hm(){return this.Dp}lm(){return this.Op}Zc(){return this.Pc}bb(){null!==this.Jm&&(this.pb(this.Jm,performance.now()),this.Jm=null);const t=this.wb(null),i=document.createElement("canvas");i.width=t.width,i.height=t.height;const n=f(i.getContext("2d"));return this.wb(n),i}gb(t){if("left"===t&&!this.Mb())return 0;if("right"===t&&!this.xb())return 0;if(0===this.Zm.length)return 0;return f("left"===t?this.Zm[0].bm():this.Zm[0].wm()).cp()}Sb(){return this.cn.autoSize&&null!==this.tb}kb(){return this.Zd}Jp(t){this.ib=t,this.ib?this.kb().style.setProperty("cursor",t):this.kb().style.removeProperty("cursor")}yb(){return this.ib}Cb(){return d(this.Zm[0])._m()}mb(t){(void 0!==t.autoSize||!this.tb||void 0===t.width&&void 0===t.height)&&(t.autoSize&&!this.tb&&this.ab(),!1===t.autoSize&&null!==this.tb&&this.fb(),t.autoSize||void 0===t.width&&void 0===t.height||this.ob(t.width||this.o_,t.height||this.ro))}wb(t){let i=0,n=0;const s=this.Zm[0],e=(i,n)=>{let s=0;for(let e=0;e<this.Zm.length;e++){const r=this.Zm[e],h=f("left"===i?r.bm():r.wm()),l=h.Mp();null!==t&&h.xp(t,n,s),s+=l.height}};if(this.Mb()){e("left",0);i+=f(s.bm()).Mp().width}for(let s=0;s<this.Zm.length;s++){const e=this.Zm[s],r=e.Mp();null!==t&&e.xp(t,i,n),n+=r.height}if(i+=s.Mp().width,this.xb()){e("right",i);i+=f(s.wm()).Mp().width}const r=(i,n,s)=>{f("left"===i?this.lb.Em():this.lb.Im()).xp(f(t),n,s)};if(this.cn.timeScale.visible){const i=this.lb.Mp();if(null!==t){let e=0;this.Mb()&&(r("left",e,n),e=f(s.bm()).Mp().width),this.lb.xp(t,e,n),e+=i.width,this.xb()&&r("right",e,n)}n+=i.height}return Jn({width:i,height:n})}Tb(){let t=0,i=0,n=0;for(const s of this.Zm)this.Mb()&&(i=Math.max(i,f(s.bm()).ap(),this.cn.leftPriceScale.minimumWidth)),this.xb()&&(n=Math.max(n,f(s.wm()).ap(),this.cn.rightPriceScale.minimumWidth)),t+=s.g_();i=as(i),n=as(n);const s=this.o_,e=this.ro,r=Math.max(s-i-n,0),h=this.cn.timeScale.visible;let l=h?Math.max(this.lb.Fm(),this.cn.timeScale.minimumHeight):0;var a;l=(a=l)+a%2;const o=0+l,_=e<o?0:e-o,u=_/t;let c=0;for(let t=0;t<this.Zm.length;++t){const s=this.Zm[t];s.Up(this.$i.Uc()[t]);let e=0,h=0;h=t===this.Zm.length-1?_-c:Math.round(s.g_()*u),e=Math.max(h,2),c+=e,s.up(Jn({width:r,height:e})),this.Mb()&&s.om(i,"left"),this.xb()&&s.om(n,"right"),s.dp()&&this.$i.Xc(s.dp(),e)}this.lb.Nm(Jn({width:h?r:0,height:l}),h?i:0,h?n:0),this.$i.x_(r),this.Km!==i&&(this.Km=i),this.Gm!==n&&(this.Gm=n)}rb(t){t?this.Zd.addEventListener("wheel",this.sb,{passive:!1}):this.Zd.removeEventListener("wheel",this.sb)}Pb(t){switch(t.deltaMode){case t.DOM_DELTA_PAGE:return 120;case t.DOM_DELTA_LINE:return 32}return Ws?1/window.devicePixelRatio:1}eb(t){if(!(0!==t.deltaX&&this.cn.handleScroll.mouseWheel||0!==t.deltaY&&this.cn.handleScale.mouseWheel))return;const i=this.Pb(t),n=i*t.deltaX/100,s=-i*t.deltaY/100;if(t.cancelable&&t.preventDefault(),0!==s&&this.cn.handleScale.mouseWheel){const i=Math.sign(s)*Math.min(1,Math.abs(s)),n=t.clientX-this.Zd.getBoundingClientRect().left;this.$t().Jc(n,i)}0!==n&&this.cn.handleScroll.mouseWheel&&this.$t().Qc(-80*n)}pb(t,i){var n;const s=t.jn();3===s&&this.Rb(),3!==s&&2!==s||(this.Db(t),this.Ob(t,i),this.lb.bt(),this.Zm.forEach((t=>{t.Zp()})),3===(null===(n=this.Jm)||void 0===n?void 0:n.jn())&&(this.Jm.ts(t),this.Rb(),this.Db(this.Jm),this.Ob(this.Jm,i),t=this.Jm,this.Jm=null)),this.fp(t)}Ob(t,i){for(const n of t.Qn())this.ns(n,i)}Db(t){const i=this.$i.Uc();for(let n=0;n<i.length;n++)t.Hn(n).Wn&&i[n].L_()}ns(t,i){const n=this.$i.St();switch(t.qn){case 0:n.rc();break;case 1:n.hc(t.Ot);break;case 2:n.Gn(t.Ot);break;case 3:n.Jn(t.Ot);break;case 4:n.Uu();break;case 5:t.Ot.Ju(i)||n.Jn(t.Ot.Qu(i))}}Dc(t){null!==this.Jm?this.Jm.ts(t):this.Jm=t,this.Qm||(this.Qm=!0,this.Xm=window.requestAnimationFrame((t=>{if(this.Qm=!1,this.Xm=0,null!==this.Jm){const i=this.Jm;this.Jm=null,this.pb(i,t);for(const n of i.Qn())if(5===n.qn&&!n.Ot.Ju(t)){this.$t().Zn(n.Ot);break}}})))}Rb(){this._b()}_b(){const t=this.$i.Uc(),i=t.length,n=this.Zm.length;for(let t=i;t<n;t++){const t=d(this.Zm.pop());this.nb.removeChild(t.hp()),t.hm().p(this),t.lm().p(this),t.S()}for(let s=n;s<i;s++){const i=new As(this,t[s]);i.hm().l(this.Vb.bind(this),this),i.lm().l(this.Bb.bind(this),this),this.Zm.push(i),this.nb.insertBefore(i.hp(),this.lb.hp())}for(let n=0;n<i;n++){const i=t[n],s=this.Zm[n];s.dp()!==i?s.Up(i):s.$p()}this.ub(),this.Tb()}Ab(t,i,n){var s;const e=new Map;if(null!==t){this.$i.wt().forEach((i=>{const n=i.zn().hl(t);null!==n&&e.set(i,n)}))}let r;if(null!==t){const i=null===(s=this.$i.St().Ui(t))||void 0===s?void 0:s.originalTime;void 0!==i&&(r=i)}const h=this.$t().Fc(),l=null!==h&&h.jc instanceof Yi?h.jc:void 0,a=null!==h&&void 0!==h.Av?h.Av.wr:void 0;return{zb:r,se:null!=t?t:void 0,Eb:null!=i?i:void 0,Ib:l,Lb:e,Nb:a,Fb:null!=n?n:void 0}}Vb(t,i,n){this.Dp.m((()=>this.Ab(t,i,n)))}Bb(t,i,n){this.Op.m((()=>this.Ab(t,i,n)))}hb(t,i,n){this.Pc.m((()=>this.Ab(t,i,n)))}ub(){const t=this.cn.timeScale.visible?"":"none";this.lb.hp().style.display=t}Mb(){return this.Zm[0].dp().P_().W().visible}xb(){return this.Zm[0].dp().R_().W().visible}ab(){return"ResizeObserver"in window&&(this.tb=new ResizeObserver((t=>{const i=t.find((t=>t.target===this.Gd));i&&this.ob(i.contentRect.width,i.contentRect.height)})),this.tb.observe(this.Gd,{box:"border-box"}),!0)}fb(){null!==this.tb&&this.tb.disconnect(),this.tb=null}}function $s(t){return Boolean(t.handleScroll.mouseWheel||t.handleScale.mouseWheel)}function Us(t){return function(t){return void 0!==t.open}(t)||function(t){return void 0!==t.value}(t)}function qs(t,i){var n={};for(var s in t)Object.prototype.hasOwnProperty.call(t,s)&&i.indexOf(s)<0&&(n[s]=t[s]);if(null!=t&&"function"==typeof Object.getOwnPropertySymbols){var e=0;for(s=Object.getOwnPropertySymbols(t);e<s.length;e++)i.indexOf(s[e])<0&&Object.prototype.propertyIsEnumerable.call(t,s[e])&&(n[s[e]]=t[s[e]])}return n}function Ys(t,i,n,s){const e=n.value,r={se:i,ot:t,Ot:[e,e,e,e],zb:s};return void 0!==n.color&&(r.O=n.color),r}function Zs(t,i,n,s){const e=n.value,r={se:i,ot:t,Ot:[e,e,e,e],zb:s};return void 0!==n.lineColor&&(r.lt=n.lineColor),void 0!==n.topColor&&(r.Ts=n.topColor),void 0!==n.bottomColor&&(r.Ps=n.bottomColor),r}function Xs(t,i,n,s){const e=n.value,r={se:i,ot:t,Ot:[e,e,e,e],zb:s};return void 0!==n.topLineColor&&(r.Pe=n.topLineColor),void 0!==n.bottomLineColor&&(r.Re=n.bottomLineColor),void 0!==n.topFillColor1&&(r.Se=n.topFillColor1),void 0!==n.topFillColor2&&(r.ke=n.topFillColor2),void 0!==n.bottomFillColor1&&(r.ye=n.bottomFillColor1),void 0!==n.bottomFillColor2&&(r.Ce=n.bottomFillColor2),r}function Ks(t,i,n,s){const e={se:i,ot:t,Ot:[n.open,n.high,n.low,n.close],zb:s};return void 0!==n.color&&(e.O=n.color),e}function Gs(t,i,n,s){const e={se:i,ot:t,Ot:[n.open,n.high,n.low,n.close],zb:s};return void 0!==n.color&&(e.O=n.color),void 0!==n.borderColor&&(e.Vt=n.borderColor),void 0!==n.wickColor&&(e.Zh=n.wickColor),e}function Js(t,i,n,s,e){const r=d(e)(n),h=Math.max(...r),l=Math.min(...r),a=r[r.length-1],o=[a,h,l,a],_=n,{time:u,color:c}=_;return{se:i,ot:t,Ot:o,zb:s,He:qs(_,["time","color"]),O:c}}function Qs(t){return void 0!==t.Ot}function te(t,i){return void 0!==i.customValues&&(t.Wb=i.customValues),t}function ie(t){return(i,n,s,e,r,h)=>function(t,i){return i?i(t):void 0===(n=t).open&&void 0===n.value;var n}(s,h)?te({ot:i,se:n,zb:e},s):te(t(i,n,s,e,r),s)}function ne(t){return{Candlestick:ie(Gs),Bar:ie(Ks),Area:ie(Zs),Baseline:ie(Xs),Histogram:ie(Ys),Line:ie(Ys),Custom:ie(Js)}[t]}function se(t){return{se:0,jb:new Map,ha:t}}function ee(t,i){if(void 0!==t&&0!==t.length)return{Hb:i.key(t[0].ot),$b:i.key(t[t.length-1].ot)}}function re(t){let i;return t.forEach((t=>{void 0===i&&(i=t.zb)})),d(i)}class he{constructor(t){this.Ub=new Map,this.qb=new Map,this.Yb=new Map,this.Zb=[],this.U_=t}S(){this.Ub.clear(),this.qb.clear(),this.Yb.clear(),this.Zb=[]}Xb(t,i){let n=0!==this.Ub.size,s=!1;const e=this.qb.get(t);if(void 0!==e)if(1===this.qb.size)n=!1,s=!0,this.Ub.clear();else for(const i of this.Zb)i.pointData.jb.delete(t)&&(s=!0);let r=[];if(0!==i.length){const n=i.map((t=>t.time)),e=this.U_.createConverterToInternalObj(i),h=ne(t.Jh()),l=t.ya(),a=t.Ca();r=i.map(((i,r)=>{const o=e(i.time),_=this.U_.key(o);let u=this.Ub.get(_);void 0===u&&(u=se(o),this.Ub.set(_,u),s=!0);const c=h(o,u.se,i,n[r],l,a);return u.jb.set(t,c),c}))}n&&this.Kb(),this.Gb(t,r);let h=-1;if(s){const t=[];this.Ub.forEach((i=>{t.push({timeWeight:0,time:i.ha,pointData:i,originalTime:re(i.jb)})})),t.sort(((t,i)=>this.U_.key(t.time)-this.U_.key(i.time))),h=this.Jb(t)}return this.Qb(t,h,function(t,i,n){const s=ee(t,n),e=ee(i,n);if(void 0!==s&&void 0!==e)return{Ql:s.$b>=e.$b&&s.Hb>=e.Hb}}(this.qb.get(t),e,this.U_))}fd(t){return this.Xb(t,[])}tw(t,i){const n=i;!function(t){void 0===t.zb&&(t.zb=t.time)}(n),this.U_.preprocessData(i);const s=this.U_.createConverterToInternalObj([i])(i.time),e=this.Yb.get(t);if(void 0!==e&&this.U_.key(s)<this.U_.key(e))throw new Error(`Cannot update oldest data, last time=${e}, new time=${s}`);let r=this.Ub.get(this.U_.key(s));const h=void 0===r;void 0===r&&(r=se(s),this.Ub.set(this.U_.key(s),r));const l=ne(t.Jh()),a=t.ya(),o=t.Ca(),_=l(s,r.se,i,n.zb,a,o);r.jb.set(t,_),this.iw(t,_);const u={Ql:Qs(_)};if(!h)return this.Qb(t,-1,u);const c={timeWeight:0,time:r.ha,pointData:r,originalTime:re(r.jb)},d=Rt(this.Zb,this.U_.key(c.time),((t,i)=>this.U_.key(t.time)<i));this.Zb.splice(d,0,c);for(let t=d;t<this.Zb.length;++t)le(this.Zb[t].pointData,t);return this.U_.fillWeightsForPoints(this.Zb,d),this.Qb(t,d,u)}iw(t,i){let n=this.qb.get(t);void 0===n&&(n=[],this.qb.set(t,n));const s=0!==n.length?n[n.length-1]:null;null===s||this.U_.key(i.ot)>this.U_.key(s.ot)?Qs(i)&&n.push(i):Qs(i)?n[n.length-1]=i:n.splice(-1,1),this.Yb.set(t,i.ot)}Gb(t,i){0!==i.length?(this.qb.set(t,i.filter(Qs)),this.Yb.set(t,i[i.length-1].ot)):(this.qb.delete(t),this.Yb.delete(t))}Kb(){for(const t of this.Zb)0===t.pointData.jb.size&&this.Ub.delete(this.U_.key(t.time))}Jb(t){let i=-1;for(let n=0;n<this.Zb.length&&n<t.length;++n){const s=this.Zb[n],e=t[n];if(this.U_.key(s.time)!==this.U_.key(e.time)){i=n;break}e.timeWeight=s.timeWeight,le(e.pointData,n)}if(-1===i&&this.Zb.length!==t.length&&(i=Math.min(this.Zb.length,t.length)),-1===i)return-1;for(let n=i;n<t.length;++n)le(t[n].pointData,n);return this.U_.fillWeightsForPoints(t,i),this.Zb=t,i}nw(){if(0===this.qb.size)return null;let t=0;return this.qb.forEach((i=>{0!==i.length&&(t=Math.max(t,i[i.length-1].se))})),t}Qb(t,i,n){const s={sw:new Map,St:{Iu:this.nw()}};if(-1!==i)this.qb.forEach(((i,e)=>{s.sw.set(e,{He:i,ew:e===t?n:void 0})})),this.qb.has(t)||s.sw.set(t,{He:[],ew:n}),s.St.rw=this.Zb,s.St.hw=i;else{const i=this.qb.get(t);s.sw.set(t,{He:i||[],ew:n})}return s}}function le(t,i){t.se=i,t.jb.forEach((t=>{t.se=i}))}function ae(t){const i={value:t.Ot[3],time:t.zb};return void 0!==t.Wb&&(i.customValues=t.Wb),i}function oe(t){const i=ae(t);return void 0!==t.O&&(i.color=t.O),i}function _e(t){const i=ae(t);return void 0!==t.lt&&(i.lineColor=t.lt),void 0!==t.Ts&&(i.topColor=t.Ts),void 0!==t.Ps&&(i.bottomColor=t.Ps),i}function ue(t){const i=ae(t);return void 0!==t.Pe&&(i.topLineColor=t.Pe),void 0!==t.Re&&(i.bottomLineColor=t.Re),void 0!==t.Se&&(i.topFillColor1=t.Se),void 0!==t.ke&&(i.topFillColor2=t.ke),void 0!==t.ye&&(i.bottomFillColor1=t.ye),void 0!==t.Ce&&(i.bottomFillColor2=t.Ce),i}function ce(t){const i={open:t.Ot[0],high:t.Ot[1],low:t.Ot[2],close:t.Ot[3],time:t.zb};return void 0!==t.Wb&&(i.customValues=t.Wb),i}function de(t){const i=ce(t);return void 0!==t.O&&(i.color=t.O),i}function fe(t){const i=ce(t),{O:n,Vt:s,Zh:e}=t;return void 0!==n&&(i.color=n),void 0!==s&&(i.borderColor=s),void 0!==e&&(i.wickColor=e),i}function ve(t){return{Area:_e,Line:oe,Baseline:ue,Histogram:oe,Bar:de,Candlestick:fe,Custom:pe}[t]}function pe(t){const i=t.zb;return Object.assign(Object.assign({},t.He),{time:i})}const me={vertLine:{color:"#9598A1",width:1,style:3,visible:!0,labelVisible:!0,labelBackgroundColor:"#131722"},horzLine:{color:"#9598A1",width:1,style:3,visible:!0,labelVisible:!0,labelBackgroundColor:"#131722"},mode:1},be={vertLines:{color:"#D6DCDE",style:0,visible:!0},horzLines:{color:"#D6DCDE",style:0,visible:!0}},we={background:{type:"solid",color:"#FFFFFF"},textColor:"#191919",fontSize:12,fontFamily:z,attributionLogo:!0},ge={autoScale:!0,mode:0,invertScale:!1,alignLabels:!0,borderVisible:!0,borderColor:"#2B2B43",entireTextOnly:!1,visible:!1,ticksVisible:!1,scaleMargins:{bottom:.1,top:.2},minimumWidth:0},Me={rightOffset:0,barSpacing:6,minBarSpacing:.5,fixLeftEdge:!1,fixRightEdge:!1,lockVisibleTimeRangeOnResize:!1,rightBarStaysOnScroll:!1,borderVisible:!0,borderColor:"#2B2B43",visible:!0,timeVisible:!1,secondsVisible:!0,shiftVisibleRangeOnNewBar:!0,allowShiftVisibleRangeOnWhitespaceReplacement:!1,ticksVisible:!1,uniformDistribution:!1,minimumHeight:0,allowBoldLabels:!0},xe={color:"rgba(0, 0, 0, 0)",visible:!1,fontSize:48,fontFamily:z,fontStyle:"",text:"",horzAlign:"center",vertAlign:"center"};function Se(){return{width:0,height:0,autoSize:!1,layout:we,crosshair:me,grid:be,overlayPriceScales:Object.assign({},ge),leftPriceScale:Object.assign(Object.assign({},ge),{visible:!1}),rightPriceScale:Object.assign(Object.assign({},ge),{visible:!0}),timeScale:Me,watermark:xe,localization:{locale:rs?navigator.language:"",dateFormat:"dd MMM 'yy"},handleScroll:{mouseWheel:!0,pressedMouseMove:!0,horzTouchDrag:!0,vertTouchDrag:!0},handleScale:{axisPressedMouseMove:{time:!0,price:!0},axisDoubleClickReset:{time:!0,price:!0},mouseWheel:!0,pinch:!0},kineticScroll:{mouse:!1,touch:!0},trackingMode:{exitMode:1}}}class ke{constructor(t,i){this.lw=t,this.aw=i}applyOptions(t){this.lw.$t().Hc(this.aw,t)}options(){return this.Ii().W()}width(){return ht(this.aw)?this.lw.gb(this.aw):0}Ii(){return f(this.lw.$t().$c(this.aw)).Dt}}function ye(t,i,n){const s=qs(t,["time","originalTime"]),e=Object.assign({time:i},s);return void 0!==n&&(e.originalTime=n),e}const Ce={color:"#FF0000",price:0,lineStyle:2,lineWidth:1,lineVisible:!0,axisLabelVisible:!0,title:"",axisLabelColor:"",axisLabelTextColor:""};class Te{constructor(t){this.Lh=t}applyOptions(t){this.Lh.Hh(t)}options(){return this.Lh.W()}ow(){return this.Lh}}class Pe{constructor(t,i,n,s,e){this._w=new C,this.Is=t,this.uw=i,this.cw=n,this.U_=e,this.dw=s}S(){this._w.S()}priceFormatter(){return this.Is.ma()}priceToCoordinate(t){const i=this.Is.Ct();return null===i?null:this.Is.Dt().Rt(t,i.Ot)}coordinateToPrice(t){const i=this.Is.Ct();return null===i?null:this.Is.Dt().pn(t,i.Ot)}barsInLogicalRange(t){if(null===t)return null;const i=new Mn(new bn(t.from,t.to)).hu(),n=this.Is.zn();if(n.Ni())return null;const s=n.hl(i.Os(),1),e=n.hl(i.ui(),-1),r=f(n.sl()),h=f(n.An());if(null!==s&&null!==e&&s.se>e.se)return{barsBefore:t.from-r,barsAfter:h-t.to};const l={barsBefore:null===s||s.se===r?t.from-r:s.se-r,barsAfter:null===e||e.se===h?h-t.to:h-e.se};return null!==s&&null!==e&&(l.from=s.zb,l.to=e.zb),l}setData(t){this.U_,this.Is.Jh(),this.uw.fw(this.Is,t),this.pw("full")}update(t){this.Is.Jh(),this.uw.mw(this.Is,t),this.pw("update")}dataByIndex(t,i){const n=this.Is.zn().hl(t,i);if(null===n)return null;return ve(this.seriesType())(n)}data(){const t=ve(this.seriesType());return this.Is.zn().ie().map((i=>t(i)))}subscribeDataChanged(t){this._w.l(t)}unsubscribeDataChanged(t){this._w.v(t)}setMarkers(t){this.U_;const i=t.map((t=>ye(t,this.U_.convertHorzItemToInternal(t.time),t.time)));this.Is.ia(i)}markers(){return this.Is.na().map((t=>ye(t,t.originalTime,void 0)))}applyOptions(t){this.Is.Hh(t)}options(){return V(this.Is.W())}priceScale(){return this.cw.priceScale(this.Is.Dt().Ta())}createPriceLine(t){const i=T(V(Ce),t),n=this.Is.sa(i);return new Te(n)}removePriceLine(t){this.Is.ea(t.ow())}seriesType(){return this.Is.Jh()}attachPrimitive(t){this.Is.Sa(t),t.attached&&t.attached({chart:this.dw,series:this,requestUpdate:()=>this.Is.$t().Xl()})}detachPrimitive(t){this.Is.ka(t),t.detached&&t.detached()}pw(t){this._w.M()&&this._w.m(t)}}class Re{constructor(t,i,n){this.bw=new C,this.pu=new C,this.Om=new C,this.$i=t,this.kl=t.St(),this.lb=i,this.kl.tc().l(this.ww.bind(this)),this.kl.nc().l(this.gw.bind(this)),this.lb.Lm().l(this.Mw.bind(this)),this.U_=n}S(){this.kl.tc().p(this),this.kl.nc().p(this),this.lb.Lm().p(this),this.bw.S(),this.pu.S(),this.Om.S()}scrollPosition(){return this.kl.ju()}scrollToPosition(t,i){i?this.kl.Gu(t,1e3):this.$i.Jn(t)}scrollToRealTime(){this.kl.Ku()}getVisibleRange(){const t=this.kl.Du();return null===t?null:{from:t.from.originalTime,to:t.to.originalTime}}setVisibleRange(t){const i={from:this.U_.convertHorzItemToInternal(t.from),to:this.U_.convertHorzItemToInternal(t.to)},n=this.kl.Au(i);this.$i.vd(n)}getVisibleLogicalRange(){const t=this.kl.Ru();return null===t?null:{from:t.Os(),to:t.ui()}}setVisibleLogicalRange(t){c(t.from<=t.to,"The from index cannot be after the to index."),this.$i.vd(t)}resetTimeScale(){this.$i.Kn()}fitContent(){this.$i.rc()}logicalToCoordinate(t){const i=this.$i.St();return i.Ni()?null:i.zt(t)}coordinateToLogical(t){return this.kl.Ni()?null:this.kl.Lu(t)}timeToCoordinate(t){const i=this.U_.convertHorzItemToInternal(t),n=this.kl.Da(i,!1);return null===n?null:this.kl.zt(n)}coordinateToTime(t){const i=this.$i.St(),n=i.Lu(t),s=i.Ui(n);return null===s?null:s.originalTime}width(){return this.lb._m().width}height(){return this.lb._m().height}subscribeVisibleTimeRangeChange(t){this.bw.l(t)}unsubscribeVisibleTimeRangeChange(t){this.bw.v(t)}subscribeVisibleLogicalRangeChange(t){this.pu.l(t)}unsubscribeVisibleLogicalRangeChange(t){this.pu.v(t)}subscribeSizeChange(t){this.Om.l(t)}unsubscribeSizeChange(t){this.Om.v(t)}applyOptions(t){this.kl.Hh(t)}options(){return Object.assign(Object.assign({},V(this.kl.W())),{barSpacing:this.kl.he()})}ww(){this.bw.M()&&this.bw.m(this.getVisibleRange())}gw(){this.pu.M()&&this.pu.m(this.getVisibleLogicalRange())}Mw(t){this.Om.m(t.width,t.height)}}function De(t){if(void 0===t||"custom"===t.type)return;const i=t;void 0!==i.minMove&&void 0===i.precision&&(i.precision=function(t){if(t>=1)return 0;let i=0;for(;i<8;i++){const n=Math.round(t);if(Math.abs(n-t)<1e-8)return i;t*=10}return i}(i.minMove))}function Oe(t){return function(t){if(O(t.handleScale)){const i=t.handleScale;t.handleScale={axisDoubleClickReset:{time:i,price:i},axisPressedMouseMove:{time:i,price:i},mouseWheel:i,pinch:i}}else if(void 0!==t.handleScale){const{axisPressedMouseMove:i,axisDoubleClickReset:n}=t.handleScale;O(i)&&(t.handleScale.axisPressedMouseMove={time:i,price:i}),O(n)&&(t.handleScale.axisDoubleClickReset={time:n,price:n})}const i=t.handleScroll;O(i)&&(t.handleScroll={horzTouchDrag:i,vertTouchDrag:i,mouseWheel:i,pressedMouseMove:i})}(t),t}class Ve{constructor(t,i,n){this.xw=new Map,this.Sw=new Map,this.kw=new C,this.yw=new C,this.Cw=new C,this.Tw=new he(i);const s=void 0===n?V(Se()):T(V(Se()),Oe(n));this.U_=i,this.lw=new Hs(t,s,i),this.lw.hm().l((t=>{this.kw.M()&&this.kw.m(this.Pw(t()))}),this),this.lw.lm().l((t=>{this.yw.M()&&this.yw.m(this.Pw(t()))}),this),this.lw.Zc().l((t=>{this.Cw.M()&&this.Cw.m(this.Pw(t()))}),this);const e=this.lw.$t();this.Rw=new Re(e,this.lw.cb(),this.U_)}remove(){this.lw.hm().p(this),this.lw.lm().p(this),this.lw.Zc().p(this),this.Rw.S(),this.lw.S(),this.xw.clear(),this.Sw.clear(),this.kw.S(),this.yw.S(),this.Cw.S(),this.Tw.S()}resize(t,i,n){this.autoSizeActive()||this.lw.ob(t,i,n)}addCustomSeries(t,i){const n=v(t),s=Object.assign(Object.assign({},h),n.defaultOptions());return this.Dw("Custom",s,i,n)}addAreaSeries(t){return this.Dw("Area",s,t)}addBaselineSeries(t){return this.Dw("Baseline",e,t)}addBarSeries(t){return this.Dw("Bar",i,t)}addCandlestickSeries(i={}){return function(t){void 0!==t.borderColor&&(t.borderUpColor=t.borderColor,t.borderDownColor=t.borderColor),void 0!==t.wickColor&&(t.wickUpColor=t.wickColor,t.wickDownColor=t.wickColor)}(i),this.Dw("Candlestick",t,i)}addHistogramSeries(t){return this.Dw("Histogram",r,t)}addLineSeries(t){return this.Dw("Line",n,t)}removeSeries(t){const i=d(this.xw.get(t)),n=this.Tw.fd(i);this.lw.$t().fd(i),this.Ow(n),this.xw.delete(t),this.Sw.delete(i)}fw(t,i){this.Ow(this.Tw.Xb(t,i))}mw(t,i){this.Ow(this.Tw.tw(t,i))}subscribeClick(t){this.kw.l(t)}unsubscribeClick(t){this.kw.v(t)}subscribeCrosshairMove(t){this.Cw.l(t)}unsubscribeCrosshairMove(t){this.Cw.v(t)}subscribeDblClick(t){this.yw.l(t)}unsubscribeDblClick(t){this.yw.v(t)}priceScale(t){return new ke(this.lw,t)}timeScale(){return this.Rw}applyOptions(t){this.lw.Hh(Oe(t))}options(){return this.lw.W()}takeScreenshot(){return this.lw.bb()}autoSizeActive(){return this.lw.Sb()}chartElement(){return this.lw.kb()}paneSize(){const t=this.lw.Cb();return{height:t.height,width:t.width}}setCrosshairPosition(t,i,n){const s=this.xw.get(n);if(void 0===s)return;const e=this.lw.$t().cr(s);null!==e&&this.lw.$t().ld(t,i,e)}clearCrosshairPosition(){this.lw.$t().ad(!0)}Dw(t,i,n={},s){De(n.priceFormat);const e=T(V(l),V(i),n),r=this.lw.$t().ud(t,e,s),h=new Pe(r,this,this,this,this.U_);return this.xw.set(h,r),this.Sw.set(r,h),h}Ow(t){const i=this.lw.$t();i.od(t.St.Iu,t.St.rw,t.St.hw),t.sw.forEach(((t,i)=>i.J(t.He,t.ew))),i.Fu()}Vw(t){return d(this.Sw.get(t))}Pw(t){const i=new Map;t.Lb.forEach(((t,n)=>{const s=n.Jh(),e=ve(s)(t);if("Custom"!==s)c(Us(e));else{const t=n.Ca();c(!t||!1===t(e))}i.set(this.Vw(n),e)}));const n=void 0!==t.Ib&&this.Sw.has(t.Ib)?this.Vw(t.Ib):void 0;return{time:t.zb,logical:t.se,point:t.Eb,hoveredSeries:n,hoveredObjectId:t.Nb,seriesData:i,sourceEvent:t.Fb}}}function Be(t,i,n){let s;if(D(t)){const i=document.getElementById(t);c(null!==i,`Cannot find element in DOM with id=${t}`),s=i}else s=t;const e=new Ve(s,i,n);return i.setOptions(e.options()),e}function Ae(t,i){return Be(t,new Gn,Gn.Ad(i))}function ze(){return Gn}const Ee=Object.assign(Object.assign({},l),h);function Ie(){return"4.2.2"}export{On as ColorType,et as CrosshairMode,Rn as LastPriceAnimationMode,o as LineStyle,a as LineType,Bi as MismatchDirection,Dn as PriceLineSource,cn as PriceScaleMode,Vn as TickMarkType,Pn as TrackingModeExitMode,Ae as createChart,Be as createChartEx,Ee as customSeriesDefaultOptions,ze as defaultHorzScaleBehavior,An as isBusinessDay,zn as isUTCTimestamp,Ie as version};
diff --git a/src/website/packages/lightweight-charts/v4.2.2/types.d.ts b/src/website/packages/lightweight-charts/v4.2.2/types.d.ts
new file mode 100644
index 000000000..39fbd07c7
--- /dev/null
+++ b/src/website/packages/lightweight-charts/v4.2.2/types.d.ts
@@ -0,0 +1,3882 @@
+// Generated by dts-bundle-generator v8.0.1
+
+type CanvasRenderingTarget2D = any;
+
+export declare const customSeriesDefaultOptions: CustomSeriesOptions;
+/**
+ * Represents a type of color.
+ */
+export declare enum ColorType {
+  /** Solid color */
+  Solid = "solid",
+  /** Vertical gradient color */
+  VerticalGradient = "gradient",
+}
+/**
+ * Represents the crosshair mode.
+ */
+export declare enum CrosshairMode {
+  /**
+   * This mode allows crosshair to move freely on the chart.
+   */
+  Normal = 0,
+  /**
+   * This mode sticks crosshair's horizontal line to the price value of a single-value series or to the close price of OHLC-based series.
+   */
+  Magnet = 1,
+  /**
+   * This mode disables rendering of the crosshair.
+   */
+  Hidden = 2,
+}
+/**
+ * Represents the type of the last price animation for series such as area or line.
+ */
+export declare enum LastPriceAnimationMode {
+  /**
+   * Animation is always disabled
+   */
+  Disabled = 0,
+  /**
+   * Animation is always enabled.
+   */
+  Continuous = 1,
+  /**
+   * Animation is active after new data.
+   */
+  OnDataUpdate = 2,
+}
+/**
+ * Represents the possible line styles.
+ */
+export declare enum LineStyle {
+  /**
+   * A solid line.
+   */
+  Solid = 0,
+  /**
+   * A dotted line.
+   */
+  Dotted = 1,
+  /**
+   * A dashed line.
+   */
+  Dashed = 2,
+  /**
+   * A dashed line with bigger dashes.
+   */
+  LargeDashed = 3,
+  /**
+   * A dotted line with more space between dots.
+   */
+  SparseDotted = 4,
+}
+/**
+ * Represents the possible line types.
+ */
+export declare enum LineType {
+  /**
+   * A line.
+   */
+  Simple = 0,
+  /**
+   * A stepped line.
+   */
+  WithSteps = 1,
+  /**
+   * A curved line.
+   */
+  Curved = 2,
+}
+/**
+ * Search direction if no data found at provided index
+ */
+export declare enum MismatchDirection {
+  /**
+   * Search the nearest left item
+   */
+  NearestLeft = -1,
+  /**
+   * Do not search
+   */
+  None = 0,
+  /**
+   * Search the nearest right item
+   */
+  NearestRight = 1,
+}
+/**
+ * Represents the source of data to be used for the horizontal price line.
+ */
+export declare enum PriceLineSource {
+  /**
+   * Use the last bar data.
+   */
+  LastBar = 0,
+  /**
+   * Use the last visible data of the chart viewport.
+   */
+  LastVisible = 1,
+}
+/**
+ * Represents the price scale mode.
+ */
+export declare enum PriceScaleMode {
+  /**
+   * Price scale shows prices. Price range changes linearly.
+   */
+  Normal = 0,
+  /**
+   * Price scale shows prices. Price range changes logarithmically.
+   */
+  Logarithmic = 1,
+  /**
+   * Price scale shows percentage values according the first visible value of the price scale.
+   * The first visible value is 0% in this mode.
+   */
+  Percentage = 2,
+  /**
+   * The same as percentage mode, but the first value is moved to 100.
+   */
+  IndexedTo100 = 3,
+}
+/**
+ * Represents the type of a tick mark on the time axis.
+ */
+export declare enum TickMarkType {
+  /**
+   * The start of the year (e.g. it's the first tick mark in a year).
+   */
+  Year = 0,
+  /**
+   * The start of the month (e.g. it's the first tick mark in a month).
+   */
+  Month = 1,
+  /**
+   * A day of the month.
+   */
+  DayOfMonth = 2,
+  /**
+   * A time without seconds.
+   */
+  Time = 3,
+  /**
+   * A time with seconds.
+   */
+  TimeWithSeconds = 4,
+}
+/**
+ * Determine how to exit the tracking mode.
+ *
+ * By default, mobile users will long press to deactivate the scroll and have the ability to check values and dates.
+ * Another press is required to activate the scroll, be able to move left/right, zoom, etc.
+ */
+export declare enum TrackingModeExitMode {
+  /**
+   * Tracking Mode will be deactivated on touch end event.
+   */
+  OnTouchEnd = 0,
+  /**
+   * Tracking Mode will be deactivated on the next tap event.
+   */
+  OnNextTap = 1,
+}
+/**
+ * This function is the simplified main entry point of the Lightweight Charting Library with time points for the horizontal scale.
+ *
+ * @param container - ID of HTML element or element itself
+ * @param options - Any subset of options to be applied at start.
+ * @returns An interface to the created chart
+ */
+export declare function createChart(
+  container: string | HTMLElement,
+  options?: DeepPartial<ChartOptions>,
+): IChartApi;
+/**
+ * This function is the main entry point of the Lightweight Charting Library. If you are using time values
+ * for the horizontal scale then it is recommended that you rather use the {@link createChart} function.
+ *
+ * @template HorzScaleItem - type of points on the horizontal scale
+ * @template THorzScaleBehavior - type of horizontal axis strategy that encapsulate all the specific behaviors of the horizontal scale type
+ *
+ * @param container - ID of HTML element or element itself
+ * @param horzScaleBehavior - Horizontal scale behavior
+ * @param options - Any subset of options to be applied at start.
+ * @returns An interface to the created chart
+ */
+export declare function createChartEx<
+  HorzScaleItem,
+  THorzScaleBehavior extends IHorzScaleBehavior<HorzScaleItem>,
+>(
+  container: string | HTMLElement,
+  horzScaleBehavior: THorzScaleBehavior,
+  options?: DeepPartial<ReturnType<THorzScaleBehavior["options"]>>,
+): IChartApiBase<HorzScaleItem>;
+/**
+ * Provides the default implementation of the horizontal scale (time-based) that can be used as a base for extending the horizontal scale with custom behavior.
+ * This allows for the introduction of custom functionality without re-implementing the entire {@link IHorzScaleBehavior}&lt;{@link Time}&gt; interface.
+ *
+ * For further details, refer to the {@link createChartEx} chart constructor method.
+ *
+ * @returns An uninitialized class implementing the {@link IHorzScaleBehavior}&lt;{@link Time}&gt; interface
+ */
+export declare function defaultHorzScaleBehavior(): new () => IHorzScaleBehavior<Time>;
+/**
+ * Check if a time value is a business day object.
+ *
+ * @param time - The time to check.
+ * @returns `true` if `time` is a {@link BusinessDay} object, false otherwise.
+ */
+export declare function isBusinessDay(time: Time): time is BusinessDay;
+/**
+ * Check if a time value is a UTC timestamp number.
+ *
+ * @param time - The time to check.
+ * @returns `true` if `time` is a {@link UTCTimestamp} number, false otherwise.
+ */
+export declare function isUTCTimestamp(time: Time): time is UTCTimestamp;
+/**
+ * Returns the current version as a string. For example `'3.3.0'`.
+ */
+export declare function version(): string;
+/**
+ * Structure describing a single item of data for area series
+ */
+export interface AreaData<HorzScaleItem = Time>
+  extends SingleValueData<HorzScaleItem> {
+  /**
+   * Optional line color value for certain data item. If missed, color from options is used
+   */
+  lineColor?: string;
+  /**
+   * Optional top color value for certain data item. If missed, color from options is used
+   */
+  topColor?: string;
+  /**
+   * Optional bottom color value for certain data item. If missed, color from options is used
+   */
+  bottomColor?: string;
+}
+/**
+ * Represents style options for an area series.
+ */
+export interface AreaStyleOptions {
+  /**
+   * Color of the top part of the area.
+   *
+   * @defaultValue `'rgba( 46, 220, 135, 0.4)'`
+   */
+  topColor: string;
+  /**
+   * Color of the bottom part of the area.
+   *
+   * @defaultValue `'rgba( 40, 221, 100, 0)'`
+   */
+  bottomColor: string;
+  /**
+   * Invert the filled area. Fills the area above the line if set to true.
+   *
+   * @defaultValue `false`
+   */
+  invertFilledArea: boolean;
+  /**
+   * Line color.
+   *
+   * @defaultValue `'#33D778'`
+   */
+  lineColor: string;
+  /**
+   * Line style.
+   *
+   * @defaultValue {@link LineStyle.Solid}
+   */
+  lineStyle: LineStyle;
+  /**
+   * Line width in pixels.
+   *
+   * @defaultValue `3`
+   */
+  lineWidth: LineWidth;
+  /**
+   * Line type.
+   *
+   * @defaultValue {@link LineType.Simple}
+   */
+  lineType: LineType;
+  /**
+   * Show series line.
+   *
+   * @defaultValue `true`
+   */
+  lineVisible: boolean;
+  /**
+   * Show circle markers on each point.
+   *
+   * @defaultValue `false`
+   */
+  pointMarkersVisible: boolean;
+  /**
+   * Circle markers radius in pixels.
+   *
+   * @defaultValue `undefined`
+   */
+  pointMarkersRadius?: number;
+  /**
+   * Show the crosshair marker.
+   *
+   * @defaultValue `true`
+   */
+  crosshairMarkerVisible: boolean;
+  /**
+   * Crosshair marker radius in pixels.
+   *
+   * @defaultValue `4`
+   */
+  crosshairMarkerRadius: number;
+  /**
+   * Crosshair marker border color. An empty string falls back to the color of the series under the crosshair.
+   *
+   * @defaultValue `''`
+   */
+  crosshairMarkerBorderColor: string;
+  /**
+   * The crosshair marker background color. An empty string falls back to the color of the series under the crosshair.
+   *
+   * @defaultValue `''`
+   */
+  crosshairMarkerBackgroundColor: string;
+  /**
+   * Crosshair marker border width in pixels.
+   *
+   * @defaultValue `2`
+   */
+  crosshairMarkerBorderWidth: number;
+  /**
+   * Last price animation mode.
+   *
+   * @defaultValue {@link LastPriceAnimationMode.Disabled}
+   */
+  lastPriceAnimation: LastPriceAnimationMode;
+}
+/**
+ * Represents the margin used when updating a price scale.
+ */
+export interface AutoScaleMargins {
+  /** The number of pixels for bottom margin */
+  below: number;
+  /** The number of pixels for top margin */
+  above: number;
+}
+/**
+ * Represents information used to update a price scale.
+ */
+export interface AutoscaleInfo {
+  /**
+   * Price range.
+   */
+  priceRange: PriceRange;
+  /**
+   * Scale margins.
+   */
+  margins?: AutoScaleMargins;
+}
+/**
+ * Represents options for how the time and price axes react to mouse double click.
+ */
+export interface AxisDoubleClickOptions {
+  /**
+   * Enable resetting scaling the time axis by double-clicking the left mouse button.
+   *
+   * @defaultValue `true`
+   */
+  time: boolean;
+  /**
+   * Enable reseting scaling the price axis by by double-clicking the left mouse button.
+   *
+   * @defaultValue `true`
+   */
+  price: boolean;
+}
+/**
+ * Represents options for how the time and price axes react to mouse movements.
+ */
+export interface AxisPressedMouseMoveOptions {
+  /**
+   * Enable scaling the time axis by holding down the left mouse button and moving the mouse.
+   *
+   * @defaultValue `true`
+   */
+  time: boolean;
+  /**
+   * Enable scaling the price axis by holding down the left mouse button and moving the mouse.
+   *
+   * @defaultValue `true`
+   */
+  price: boolean;
+}
+/**
+ * Structure describing a single item of data for bar series
+ */
+export interface BarData<HorzScaleItem = Time> extends OhlcData<HorzScaleItem> {
+  /**
+   * Optional color value for certain data item. If missed, color from options is used
+   */
+  color?: string;
+}
+/**
+ * Represents style options for a bar series.
+ */
+export interface BarStyleOptions {
+  /**
+   * Color of rising bars.
+   *
+   * @defaultValue `'#26a69a'`
+   */
+  upColor: string;
+  /**
+   * Color of falling bars.
+   *
+   * @defaultValue `'#ef5350'`
+   */
+  downColor: string;
+  /**
+   * Show open lines on bars.
+   *
+   * @defaultValue `true`
+   */
+  openVisible: boolean;
+  /**
+   * Show bars as sticks.
+   *
+   * @defaultValue `true`
+   */
+  thinBars: boolean;
+}
+/**
+ * Represents a range of bars and the number of bars outside the range.
+ */
+export interface BarsInfo<HorzScaleItem> extends Partial<Range<HorzScaleItem>> {
+  /**
+   * The number of bars before the start of the range.
+   * Positive value means that there are some bars before (out of logical range from the left) the {@link Range.from} logical index in the series.
+   * Negative value means that the first series' bar is inside the passed logical range, and between the first series' bar and the {@link Range.from} logical index are some bars.
+   */
+  barsBefore: number;
+  /**
+   * The number of bars after the end of the range.
+   * Positive value in the `barsAfter` field means that there are some bars after (out of logical range from the right) the {@link Range.to} logical index in the series.
+   * Negative value means that the last series' bar is inside the passed logical range, and between the last series' bar and the {@link Range.to} logical index are some bars.
+   */
+  barsAfter: number;
+}
+/**
+ * Represents a type of priced base value of baseline series type.
+ */
+export interface BaseValuePrice {
+  /**
+   * Distinguished type value.
+   */
+  type: "price";
+  /**
+   * Price value.
+   */
+  price: number;
+}
+/**
+ * Structure describing a single item of data for baseline series
+ */
+export interface BaselineData<HorzScaleItem = Time>
+  extends SingleValueData<HorzScaleItem> {
+  /**
+   * Optional top area top fill color value for certain data item. If missed, color from options is used
+   */
+  topFillColor1?: string;
+  /**
+   * Optional top area bottom fill color value for certain data item. If missed, color from options is used
+   */
+  topFillColor2?: string;
+  /**
+   * Optional top area line color value for certain data item. If missed, color from options is used
+   */
+  topLineColor?: string;
+  /**
+   * Optional bottom area top fill color value for certain data item. If missed, color from options is used
+   */
+  bottomFillColor1?: string;
+  /**
+   * Optional bottom area bottom fill color value for certain data item. If missed, color from options is used
+   */
+  bottomFillColor2?: string;
+  /**
+   * Optional bottom area line color value for certain data item. If missed, color from options is used
+   */
+  bottomLineColor?: string;
+}
+/**
+ * Represents style options for a baseline series.
+ */
+export interface BaselineStyleOptions {
+  /**
+   * Base value of the series.
+   *
+   * @defaultValue `{ type: 'price', price: 0 }`
+   */
+  baseValue: BaseValueType;
+  /**
+   * The first color of the top area.
+   *
+   * @defaultValue `'rgba(38, 166, 154, 0.28)'`
+   */
+  topFillColor1: string;
+  /**
+   * The second color of the top area.
+   *
+   * @defaultValue `'rgba(38, 166, 154, 0.05)'`
+   */
+  topFillColor2: string;
+  /**
+   * The line color of the top area.
+   *
+   * @defaultValue `'rgba(38, 166, 154, 1)'`
+   */
+  topLineColor: string;
+  /**
+   * The first color of the bottom area.
+   *
+   * @defaultValue `'rgba(239, 83, 80, 0.05)'`
+   */
+  bottomFillColor1: string;
+  /**
+   * The second color of the bottom area.
+   *
+   * @defaultValue `'rgba(239, 83, 80, 0.28)'`
+   */
+  bottomFillColor2: string;
+  /**
+   * The line color of the bottom area.
+   *
+   * @defaultValue `'rgba(239, 83, 80, 1)'`
+   */
+  bottomLineColor: string;
+  /**
+   * Line width.
+   *
+   * @defaultValue `3`
+   */
+  lineWidth: LineWidth;
+  /**
+   * Line style.
+   *
+   * @defaultValue {@link LineStyle.Solid}
+   */
+  lineStyle: LineStyle;
+  /**
+   * Line type.
+   *
+   * @defaultValue {@link LineType.Simple}
+   */
+  lineType: LineType;
+  /**
+   * Show series line.
+   *
+   * @defaultValue `true`
+   */
+  lineVisible: boolean;
+  /**
+   * Show circle markers on each point.
+   *
+   * @defaultValue `false`
+   */
+  pointMarkersVisible: boolean;
+  /**
+   * Circle markers radius in pixels.
+   *
+   * @defaultValue `undefined`
+   */
+  pointMarkersRadius?: number;
+  /**
+   * Show the crosshair marker.
+   *
+   * @defaultValue `true`
+   */
+  crosshairMarkerVisible: boolean;
+  /**
+   * Crosshair marker radius in pixels.
+   *
+   * @defaultValue `4`
+   */
+  crosshairMarkerRadius: number;
+  /**
+   * Crosshair marker border color. An empty string falls back to the color of the series under the crosshair.
+   *
+   * @defaultValue `''`
+   */
+  crosshairMarkerBorderColor: string;
+  /**
+   * The crosshair marker background color. An empty string falls back to the color of the series under the crosshair.
+   *
+   * @defaultValue `''`
+   */
+  crosshairMarkerBackgroundColor: string;
+  /**
+   * Crosshair marker border width in pixels.
+   *
+   * @defaultValue `2`
+   */
+  crosshairMarkerBorderWidth: number;
+  /**
+   * Last price animation mode.
+   *
+   * @defaultValue {@link LastPriceAnimationMode.Disabled}
+   */
+  lastPriceAnimation: LastPriceAnimationMode;
+}
+/**
+ * Represents a time as a day/month/year.
+ *
+ * @example
+ * ```js
+ * const day = { year: 2019, month: 6, day: 1 }; // June 1, 2019
+ * ```
+ */
+export interface BusinessDay {
+  /**
+   * The year.
+   */
+  year: number;
+  /**
+   * The month.
+   */
+  month: number;
+  /**
+   * The day.
+   */
+  day: number;
+}
+/**
+ * Structure describing a single item of data for candlestick series
+ */
+export interface CandlestickData<HorzScaleItem = Time>
+  extends OhlcData<HorzScaleItem> {
+  /**
+   * Optional color value for certain data item. If missed, color from options is used
+   */
+  color?: string;
+  /**
+   * Optional border color value for certain data item. If missed, color from options is used
+   */
+  borderColor?: string;
+  /**
+   * Optional wick color value for certain data item. If missed, color from options is used
+   */
+  wickColor?: string;
+}
+/**
+ * Represents style options for a candlestick series.
+ */
+export interface CandlestickStyleOptions {
+  /**
+   * Color of rising candles.
+   *
+   * @defaultValue `'#26a69a'`
+   */
+  upColor: string;
+  /**
+   * Color of falling candles.
+   *
+   * @defaultValue `'#ef5350'`
+   */
+  downColor: string;
+  /**
+   * Enable high and low prices candle wicks.
+   *
+   * @defaultValue `true`
+   */
+  wickVisible: boolean;
+  /**
+   * Enable candle borders.
+   *
+   * @defaultValue `true`
+   */
+  borderVisible: boolean;
+  /**
+   * Border color.
+   *
+   * @defaultValue `'#378658'`
+   */
+  borderColor: string;
+  /**
+   * Border color of rising candles.
+   *
+   * @defaultValue `'#26a69a'`
+   */
+  borderUpColor: string;
+  /**
+   * Border color of falling candles.
+   *
+   * @defaultValue `'#ef5350'`
+   */
+  borderDownColor: string;
+  /**
+   * Wick color.
+   *
+   * @defaultValue `'#737375'`
+   */
+  wickColor: string;
+  /**
+   * Wick color of rising candles.
+   *
+   * @defaultValue `'#26a69a'`
+   */
+  wickUpColor: string;
+  /**
+   * Wick color of falling candles.
+   *
+   * @defaultValue `'#ef5350'`
+   */
+  wickDownColor: string;
+}
+/**
+ * Represents common chart options
+ */
+export interface ChartOptionsBase {
+  /**
+   * Width of the chart in pixels
+   *
+   * @defaultValue If `0` (default) or none value provided, then a size of the widget will be calculated based its container's size.
+   */
+  width: number;
+  /**
+   * Height of the chart in pixels
+   *
+   * @defaultValue If `0` (default) or none value provided, then a size of the widget will be calculated based its container's size.
+   */
+  height: number;
+  /**
+   * Setting this flag to `true` will make the chart watch the chart container's size and automatically resize the chart to fit its container whenever the size changes.
+   *
+   * This feature requires [`ResizeObserver`](https://developer.mozilla.org/en-US/docs/Web/API/ResizeObserver) class to be available in the global scope.
+   * Note that calling code is responsible for providing a polyfill if required. If the global scope does not have `ResizeObserver`, a warning will appear and the flag will be ignored.
+   *
+   * Please pay attention that `autoSize` option and explicit sizes options `width` and `height` don't conflict with one another.
+   * If you specify `autoSize` flag, then `width` and `height` options will be ignored unless `ResizeObserver` has failed. If it fails then the values will be used as fallback.
+   *
+   * The flag `autoSize` could also be set with and unset with `applyOptions` function.
+   * ```js
+   * const chart = LightweightCharts.createChart(document.body, {
+   *     autoSize: true,
+   * });
+   * ```
+   */
+  autoSize: boolean;
+  /**
+   * Watermark options.
+   *
+   * A watermark is a background label that includes a brief description of the drawn data. Any text can be added to it.
+   *
+   * Please make sure you enable it and set an appropriate font color and size to make your watermark visible in the background of the chart.
+   * We recommend a semi-transparent color and a large font. Also note that watermark position can be aligned vertically and horizontally.
+   */
+  watermark: WatermarkOptions;
+  /**
+   * Layout options
+   */
+  layout: LayoutOptions;
+  /**
+   * Left price scale options
+   */
+  leftPriceScale: VisiblePriceScaleOptions;
+  /**
+   * Right price scale options
+   */
+  rightPriceScale: VisiblePriceScaleOptions;
+  /**
+   * Overlay price scale options
+   */
+  overlayPriceScales: OverlayPriceScaleOptions;
+  /**
+   * Time scale options
+   */
+  timeScale: HorzScaleOptions;
+  /**
+   * The crosshair shows the intersection of the price and time scale values at any point on the chart.
+   *
+   */
+  crosshair: CrosshairOptions;
+  /**
+   * A grid is represented in the chart background as a vertical and horizontal lines drawn at the levels of visible marks of price and the time scales.
+   */
+  grid: GridOptions;
+  /**
+   * Scroll options, or a boolean flag that enables/disables scrolling
+   */
+  handleScroll: HandleScrollOptions | boolean;
+  /**
+   * Scale options, or a boolean flag that enables/disables scaling
+   */
+  handleScale: HandleScaleOptions | boolean;
+  /**
+   * Kinetic scroll options
+   */
+  kineticScroll: KineticScrollOptions;
+  /** @inheritDoc TrackingModeOptions
+   */
+  trackingMode: TrackingModeOptions;
+  /**
+   * Basic localization options
+   */
+  localization: LocalizationOptionsBase;
+}
+/**
+ * Structure describing options of the chart. Series options are to be set separately
+ */
+export interface ChartOptionsImpl<HorzScaleItem> extends ChartOptionsBase {
+  /**
+   * Localization options.
+   */
+  localization: LocalizationOptions<HorzScaleItem>;
+}
+/** Structure describing a crosshair line (vertical or horizontal) */
+export interface CrosshairLineOptions {
+  /**
+   * Crosshair line color.
+   *
+   * @defaultValue `'#758696'`
+   */
+  color: string;
+  /**
+   * Crosshair line width.
+   *
+   * @defaultValue `1`
+   */
+  width: LineWidth;
+  /**
+   * Crosshair line style.
+   *
+   * @defaultValue {@link LineStyle.LargeDashed}
+   */
+  style: LineStyle;
+  /**
+   * Display the crosshair line.
+   *
+   * Note that disabling crosshair lines does not disable crosshair marker on Line and Area series.
+   * It can be disabled by using `crosshairMarkerVisible` option of a relevant series.
+   *
+   * @see {@link LineStyleOptions.crosshairMarkerVisible}
+   * @see {@link AreaStyleOptions.crosshairMarkerVisible}
+   * @see {@link BaselineStyleOptions.crosshairMarkerVisible}
+   * @defaultValue `true`
+   */
+  visible: boolean;
+  /**
+   * Display the crosshair label on the relevant scale.
+   *
+   * @defaultValue `true`
+   */
+  labelVisible: boolean;
+  /**
+   * Crosshair label background color.
+   *
+   * @defaultValue `'#4c525e'`
+   */
+  labelBackgroundColor: string;
+}
+/** Structure describing crosshair options  */
+export interface CrosshairOptions {
+  /**
+   * Crosshair mode
+   *
+   * @defaultValue {@link CrosshairMode.Magnet}
+   */
+  mode: CrosshairMode;
+  /**
+   * Vertical line options.
+   */
+  vertLine: CrosshairLineOptions;
+  /**
+   * Horizontal line options.
+   */
+  horzLine: CrosshairLineOptions;
+}
+/**
+ * Renderer data for an item within the custom series.
+ */
+export interface CustomBarItemData<
+  HorzScaleItem,
+  TData extends CustomData<HorzScaleItem> = CustomData<HorzScaleItem>,
+> {
+  /**
+   * Horizontal coordinate for the item. Measured from the left edge of the pane in pixels.
+   */
+  x: number;
+  /**
+   * Time scale index for the item. This isn't the timestamp but rather the logical index.
+   */
+  time: number;
+  /**
+   * Original data for the item.
+   */
+  originalData: TData;
+  /**
+   * Color assigned for the item, typically used for price line and price scale label.
+   */
+  barColor: string;
+}
+/**
+ * Base structure describing a single item of data for a custom series.
+ *
+ * This type allows for any properties to be defined
+ * within the interface. It is recommended that you extend this interface with
+ * the required data structure.
+ */
+export interface CustomData<HorzScaleItem = Time>
+  extends CustomSeriesWhitespaceData<HorzScaleItem> {
+  /**
+   * If defined then this color will be used for the price line and price scale line
+   * for this specific data item of the custom series.
+   */
+  color?: string;
+}
+/**
+ * Represents a whitespace data item, which is a data point without a value.
+ */
+export interface CustomSeriesWhitespaceData<HorzScaleItem> {
+  /**
+   * The time of the data.
+   */
+  time: HorzScaleItem;
+  /**
+   * Additional custom values which will be ignored by the library, but
+   * could be used by plugins.
+   */
+  customValues?: Record<string, unknown>;
+}
+/**
+ * Represents style options for a custom series.
+ */
+export interface CustomStyleOptions {
+  /**
+   * Color used for the price line and price scale label.
+   */
+  color: string;
+}
+/** Grid line options. */
+export interface GridLineOptions {
+  /**
+   * Line color.
+   *
+   * @defaultValue `'#D6DCDE'`
+   */
+  color: string;
+  /**
+   * Line style.
+   *
+   * @defaultValue {@link LineStyle.Solid}
+   */
+  style: LineStyle;
+  /**
+   * Display the lines.
+   *
+   * @defaultValue `true`
+   */
+  visible: boolean;
+}
+/** Structure describing grid options. */
+export interface GridOptions {
+  /**
+   * Vertical grid line options.
+   */
+  vertLines: GridLineOptions;
+  /**
+   * Horizontal grid line options.
+   */
+  horzLines: GridLineOptions;
+}
+/**
+ * Represents options for how the chart is scaled by the mouse and touch gestures.
+ */
+export interface HandleScaleOptions {
+  /**
+   * Enable scaling with the mouse wheel.
+   *
+   * @defaultValue `true`
+   */
+  mouseWheel: boolean;
+  /**
+   * Enable scaling with pinch/zoom gestures.
+   *
+   * @defaultValue `true`
+   */
+  pinch: boolean;
+  /**
+   * Enable scaling the price and/or time scales by holding down the left mouse button and moving the mouse.
+   */
+  axisPressedMouseMove: AxisPressedMouseMoveOptions | boolean;
+  /**
+   * Enable resetting scaling by double-clicking the left mouse button.
+   */
+  axisDoubleClickReset: AxisDoubleClickOptions | boolean;
+}
+/**
+ * Represents options for how the chart is scrolled by the mouse and touch gestures.
+ */
+export interface HandleScrollOptions {
+  /**
+   * Enable scrolling with the mouse wheel.
+   *
+   * @defaultValue `true`
+   */
+  mouseWheel: boolean;
+  /**
+   * Enable scrolling by holding down the left mouse button and moving the mouse.
+   *
+   * @defaultValue `true`
+   */
+  pressedMouseMove: boolean;
+  /**
+   * Enable horizontal touch scrolling.
+   *
+   * When enabled the chart handles touch gestures that would normally scroll the webpage horizontally.
+   *
+   * @defaultValue `true`
+   */
+  horzTouchDrag: boolean;
+  /**
+   * Enable vertical touch scrolling.
+   *
+   * When enabled the chart handles touch gestures that would normally scroll the webpage vertically.
+   *
+   * @defaultValue `true`
+   */
+  vertTouchDrag: boolean;
+}
+/**
+ * Structure describing a single item of data for histogram series
+ */
+export interface HistogramData<HorzScaleItem = Time>
+  extends SingleValueData<HorzScaleItem> {
+  /**
+   * Optional color value for certain data item. If missed, color from options is used
+   */
+  color?: string;
+}
+/**
+ * Represents style options for a histogram series.
+ */
+export interface HistogramStyleOptions {
+  /**
+   * Column color.
+   *
+   * @defaultValue `'#26a69a'`
+   */
+  color: string;
+  /**
+   * Initial level of histogram columns.
+   *
+   * @defaultValue `0`
+   */
+  base: number;
+}
+/**
+ * Options for the time scale; the horizontal scale at the bottom of the chart that displays the time of data.
+ */
+export interface HorzScaleOptions {
+  /**
+   * The margin space in bars from the right side of the chart.
+   *
+   * @defaultValue `0`
+   */
+  rightOffset: number;
+  /**
+   * The space between bars in pixels.
+   *
+   * @defaultValue `6`
+   */
+  barSpacing: number;
+  /**
+   * The minimum space between bars in pixels.
+   *
+   * @defaultValue `0.5`
+   */
+  minBarSpacing: number;
+  /**
+   * Prevent scrolling to the left of the first bar.
+   *
+   * @defaultValue `false`
+   */
+  fixLeftEdge: boolean;
+  /**
+   * Prevent scrolling to the right of the most recent bar.
+   *
+   * @defaultValue `false`
+   */
+  fixRightEdge: boolean;
+  /**
+   * Prevent changing the visible time range during chart resizing.
+   *
+   * @defaultValue `false`
+   */
+  lockVisibleTimeRangeOnResize: boolean;
+  /**
+   * Prevent the hovered bar from moving when scrolling.
+   *
+   * @defaultValue `false`
+   */
+  rightBarStaysOnScroll: boolean;
+  /**
+   * Show the time scale border.
+   *
+   * @defaultValue `true`
+   */
+  borderVisible: boolean;
+  /**
+   * The time scale border color.
+   *
+   * @defaultValue `'#2B2B43'`
+   */
+  borderColor: string;
+  /**
+   * Show the time scale.
+   *
+   * @defaultValue `true`
+   */
+  visible: boolean;
+  /**
+   * Show the time, not just the date, in the time scale and vertical crosshair label.
+   *
+   * @defaultValue `false`
+   */
+  timeVisible: boolean;
+  /**
+   * Show seconds in the time scale and vertical crosshair label in `hh:mm:ss` format for intraday data.
+   *
+   * @defaultValue `true`
+   */
+  secondsVisible: boolean;
+  /**
+   * Shift the visible range to the right (into the future) by the number of new bars when new data is added.
+   *
+   * Note that this only applies when the last bar is visible.
+   *
+   * @defaultValue `true`
+   */
+  shiftVisibleRangeOnNewBar: boolean;
+  /**
+   * Allow the visible range to be shifted to the right when a new bar is added which
+   * is replacing an existing whitespace time point on the chart.
+   *
+   * Note that this only applies when the last bar is visible & `shiftVisibleRangeOnNewBar` is enabled.
+   *
+   * @defaultValue `false`
+   */
+  allowShiftVisibleRangeOnWhitespaceReplacement: boolean;
+  /**
+   * Draw small vertical line on time axis labels.
+   *
+   * @defaultValue `false`
+   */
+  ticksVisible: boolean;
+  /**
+   * Maximum tick mark label length. Used to override the default 8 character maximum length.
+   *
+   * @defaultValue `undefined`
+   */
+  tickMarkMaxCharacterLength?: number;
+  /**
+   * Changes horizontal scale marks generation.
+   * With this flag equal to `true`, marks of the same weight are either all drawn or none are drawn at all.
+   */
+  uniformDistribution: boolean;
+  /**
+   * Define a minimum height for the time scale.
+   * Note: This value will be exceeded if the
+   * time scale needs more space to display it's contents.
+   *
+   * Setting a minimum height could be useful for ensuring that
+   * multiple charts positioned in a horizontal stack each have
+   * an identical time scale height, or for plugins which
+   * require a bit more space within the time scale pane.
+   *
+   * @defaultValue 0
+   */
+  minimumHeight: number;
+  /**
+   * Allow major time scale labels to be rendered in a bolder font weight.
+   *
+   * @defaultValue true
+   */
+  allowBoldLabels: boolean;
+}
+/**
+ * The main interface of a single chart using time for horizontal scale.
+ */
+export interface IChartApi extends IChartApiBase<Time> {
+  /**
+   * Applies new options to the chart
+   *
+   * @param options - Any subset of options.
+   */
+  applyOptions(options: DeepPartial<ChartOptions>): void;
+}
+/**
+ * The main interface of a single chart.
+ */
+export interface IChartApiBase<HorzScaleItem = Time> {
+  /**
+   * Removes the chart object including all DOM elements. This is an irreversible operation, you cannot do anything with the chart after removing it.
+   */
+  remove(): void;
+  /**
+   * Sets fixed size of the chart. By default chart takes up 100% of its container.
+   *
+   * If chart has the `autoSize` option enabled, and the ResizeObserver is available then
+   * the width and height values will be ignored.
+   *
+   * @param width - Target width of the chart.
+   * @param height - Target height of the chart.
+   * @param forceRepaint - True to initiate resize immediately. One could need this to get screenshot immediately after resize.
+   */
+  resize(width: number, height: number, forceRepaint?: boolean): void;
+  /**
+   * Creates a custom series with specified parameters.
+   *
+   * A custom series is a generic series which can be extended with a custom renderer to
+   * implement chart types which the library doesn't support by default.
+   *
+   * @param customPaneView - A custom series pane view which implements the custom renderer.
+   * @param customOptions - Customization parameters of the series being created.
+   * ```js
+   * const series = chart.addCustomSeries(myCustomPaneView);
+   * ```
+   */
+  addCustomSeries<
+    TData extends CustomData<HorzScaleItem>,
+    TOptions extends CustomSeriesOptions,
+    TPartialOptions extends
+      SeriesPartialOptions<TOptions> = SeriesPartialOptions<TOptions>,
+  >(
+    customPaneView: ICustomSeriesPaneView<HorzScaleItem, TData, TOptions>,
+    customOptions?: SeriesPartialOptions<TOptions>,
+  ): ISeriesApi<
+    "Custom",
+    HorzScaleItem,
+    TData | WhitespaceData<HorzScaleItem>,
+    TOptions,
+    TPartialOptions
+  >;
+  /**
+   * Creates an area series with specified parameters.
+   *
+   * @param areaOptions - Customization parameters of the series being created.
+   * @returns An interface of the created series.
+   * @example
+   * ```js
+   * const series = chart.addAreaSeries();
+   * ```
+   */
+  addAreaSeries(
+    areaOptions?: AreaSeriesPartialOptions,
+  ): ISeriesApi<"Area", HorzScaleItem>;
+  /**
+   * Creates a baseline series with specified parameters.
+   *
+   * @param baselineOptions - Customization parameters of the series being created.
+   * @returns An interface of the created series.
+   * @example
+   * ```js
+   * const series = chart.addBaselineSeries();
+   * ```
+   */
+  addBaselineSeries(
+    baselineOptions?: BaselineSeriesPartialOptions,
+  ): ISeriesApi<"Baseline", HorzScaleItem>;
+  /**
+   * Creates a bar series with specified parameters.
+   *
+   * @param barOptions - Customization parameters of the series being created.
+   * @returns An interface of the created series.
+   * @example
+   * ```js
+   * const series = chart.addBarSeries();
+   * ```
+   */
+  addBarSeries(
+    barOptions?: BarSeriesPartialOptions,
+  ): ISeriesApi<"Bar", HorzScaleItem>;
+  /**
+   * Creates a candlestick series with specified parameters.
+   *
+   * @param candlestickOptions - Customization parameters of the series being created.
+   * @returns An interface of the created series.
+   * @example
+   * ```js
+   * const series = chart.addCandlestickSeries();
+   * ```
+   */
+  addCandlestickSeries(
+    candlestickOptions?: CandlestickSeriesPartialOptions,
+  ): ISeriesApi<"Candlestick", HorzScaleItem>;
+  /**
+   * Creates a histogram series with specified parameters.
+   *
+   * @param histogramOptions - Customization parameters of the series being created.
+   * @returns An interface of the created series.
+   * @example
+   * ```js
+   * const series = chart.addHistogramSeries();
+   * ```
+   */
+  addHistogramSeries(
+    histogramOptions?: HistogramSeriesPartialOptions,
+  ): ISeriesApi<"Histogram", HorzScaleItem>;
+  /**
+   * Creates a line series with specified parameters.
+   *
+   * @param lineOptions - Customization parameters of the series being created.
+   * @returns An interface of the created series.
+   * @example
+   * ```js
+   * const series = chart.addLineSeries();
+   * ```
+   */
+  addLineSeries(
+    lineOptions?: LineSeriesPartialOptions,
+  ): ISeriesApi<"Line", HorzScaleItem>;
+  /**
+   * Removes a series of any type. This is an irreversible operation, you cannot do anything with the series after removing it.
+   *
+   * @example
+   * ```js
+   * chart.removeSeries(series);
+   * ```
+   */
+  removeSeries(seriesApi: ISeriesApi<SeriesType, HorzScaleItem>): void;
+  /**
+   * Subscribe to the chart click event.
+   *
+   * @param handler - Handler to be called on mouse click.
+   * @example
+   * ```js
+   * function myClickHandler(param) {
+   *     if (!param.point) {
+   *         return;
+   *     }
+   *
+   *     console.log(`Click at ${param.point.x}, ${param.point.y}. The time is ${param.time}.`);
+   * }
+   *
+   * chart.subscribeClick(myClickHandler);
+   * ```
+   */
+  subscribeClick(handler: MouseEventHandler<HorzScaleItem>): void;
+  /**
+   * Unsubscribe a handler that was previously subscribed using {@link subscribeClick}.
+   *
+   * @param handler - Previously subscribed handler
+   * @example
+   * ```js
+   * chart.unsubscribeClick(myClickHandler);
+   * ```
+   */
+  unsubscribeClick(handler: MouseEventHandler<HorzScaleItem>): void;
+  /**
+   * Subscribe to the chart double-click event.
+   *
+   * @param handler - Handler to be called on mouse double-click.
+   * @example
+   * ```js
+   * function myDblClickHandler(param) {
+   *     if (!param.point) {
+   *         return;
+   *     }
+   *
+   *     console.log(`Double Click at ${param.point.x}, ${param.point.y}. The time is ${param.time}.`);
+   * }
+   *
+   * chart.subscribeDblClick(myDblClickHandler);
+   * ```
+   */
+  subscribeDblClick(handler: MouseEventHandler<HorzScaleItem>): void;
+  /**
+   * Unsubscribe a handler that was previously subscribed using {@link subscribeDblClick}.
+   *
+   * @param handler - Previously subscribed handler
+   * @example
+   * ```js
+   * chart.unsubscribeDblClick(myDblClickHandler);
+   * ```
+   */
+  unsubscribeDblClick(handler: MouseEventHandler<HorzScaleItem>): void;
+  /**
+   * Subscribe to the crosshair move event.
+   *
+   * @param handler - Handler to be called on crosshair move.
+   * @example
+   * ```js
+   * function myCrosshairMoveHandler(param) {
+   *     if (!param.point) {
+   *         return;
+   *     }
+   *
+   *     console.log(`Crosshair moved to ${param.point.x}, ${param.point.y}. The time is ${param.time}.`);
+   * }
+   *
+   * chart.subscribeCrosshairMove(myCrosshairMoveHandler);
+   * ```
+   */
+  subscribeCrosshairMove(handler: MouseEventHandler<HorzScaleItem>): void;
+  /**
+   * Unsubscribe a handler that was previously subscribed using {@link subscribeCrosshairMove}.
+   *
+   * @param handler - Previously subscribed handler
+   * @example
+   * ```js
+   * chart.unsubscribeCrosshairMove(myCrosshairMoveHandler);
+   * ```
+   */
+  unsubscribeCrosshairMove(handler: MouseEventHandler<HorzScaleItem>): void;
+  /**
+   * Returns API to manipulate a price scale.
+   *
+   * @param priceScaleId - ID of the price scale.
+   * @returns Price scale API.
+   */
+  priceScale(priceScaleId: string): IPriceScaleApi;
+  /**
+   * Returns API to manipulate the time scale
+   *
+   * @returns Target API
+   */
+  timeScale(): ITimeScaleApi<HorzScaleItem>;
+  /**
+   * Applies new options to the chart
+   *
+   * @param options - Any subset of options.
+   */
+  applyOptions(options: DeepPartial<ChartOptionsImpl<HorzScaleItem>>): void;
+  /**
+   * Returns currently applied options
+   *
+   * @returns Full set of currently applied options, including defaults
+   */
+  options(): Readonly<ChartOptionsImpl<HorzScaleItem>>;
+  /**
+   * Make a screenshot of the chart with all the elements excluding crosshair.
+   *
+   * @returns A canvas with the chart drawn on. Any `Canvas` methods like `toDataURL()` or `toBlob()` can be used to serialize the result.
+   */
+  takeScreenshot(): HTMLCanvasElement;
+  /**
+   * Returns the active state of the `autoSize` option. This can be used to check
+   * whether the chart is handling resizing automatically with a `ResizeObserver`.
+   *
+   * @returns Whether the `autoSize` option is enabled and the active.
+   */
+  autoSizeActive(): boolean;
+  /**
+   * Returns the generated div element containing the chart. This can be used for adding your own additional event listeners, or for measuring the
+   * elements dimensions and position within the document.
+   *
+   * @returns generated div element containing the chart.
+   */
+  chartElement(): HTMLDivElement;
+  /**
+   * Set the crosshair position within the chart.
+   *
+   * Usually the crosshair position is set automatically by the user's actions. However in some cases you may want to set it explicitly.
+   *
+   * For example if you want to synchronise the crosshairs of two separate charts.
+   *
+   * @param price - The price (vertical coordinate) of the new crosshair position.
+   * @param horizontalPosition - The horizontal coordinate (time by default) of the new crosshair position.
+   */
+  setCrosshairPosition(
+    price: number,
+    horizontalPosition: HorzScaleItem,
+    seriesApi: ISeriesApi<SeriesType, HorzScaleItem>,
+  ): void;
+  /**
+   * Clear the crosshair position within the chart.
+   */
+  clearCrosshairPosition(): void;
+  /**
+   * Returns the dimensions of the chart pane (the plot surface which excludes time and price scales).
+   * This would typically only be useful for plugin development.
+   *
+   * @returns Dimensions of the chart pane
+   */
+  paneSize(): PaneSize;
+}
+/**
+ * Renderer for the custom series. This paints on the main chart pane.
+ */
+export interface ICustomSeriesPaneRenderer {
+  /**
+   * Draw function for the renderer.
+   *
+   * @param target - canvas context to draw on, refer to FancyCanvas library for more details about this class.
+   * @param priceConverter - converter function for changing prices into vertical coordinate values.
+   * @param isHovered - Whether the series is hovered.
+   * @param hitTestData - Optional hit test data for the series.
+   */
+  draw(
+    target: CanvasRenderingTarget2D,
+    priceConverter: PriceToCoordinateConverter,
+    isHovered: boolean,
+    hitTestData?: unknown,
+  ): void;
+}
+/**
+ * This interface represents the view for the custom series
+ */
+export interface ICustomSeriesPaneView<
+  HorzScaleItem = Time,
+  TData extends CustomData<HorzScaleItem> = CustomData<HorzScaleItem>,
+  TSeriesOptions extends CustomSeriesOptions = CustomSeriesOptions,
+> {
+  /**
+   * This method returns a renderer - special object to draw data for the series
+   * on the main chart pane.
+   *
+   * @returns an renderer object to be used for drawing.
+   */
+  renderer(): ICustomSeriesPaneRenderer;
+  /**
+   * This method will be called with the latest data for the renderer to use
+   * during the next paint.
+   */
+  update(
+    data: PaneRendererCustomData<HorzScaleItem, TData>,
+    seriesOptions: TSeriesOptions,
+  ): void;
+  /**
+   * A function for interpreting the custom series data and returning an array of numbers
+   * representing the price values for the item. These price values are used
+   * by the chart to determine the auto-scaling (to ensure the items are in view) and the crosshair
+   * and price line positions. The last value in the array will be used as the current value. You shouldn't need to
+   * have more than 3 values in this array since the library only needs a largest, smallest, and current value.
+   */
+  priceValueBuilder(plotRow: TData): CustomSeriesPricePlotValues;
+  /**
+   * A function for testing whether a data point should be considered fully specified, or if it should
+   * be considered as whitespace. Should return `true` if is whitespace.
+   *
+   * @param data - data point to be tested
+   */
+  isWhitespace(
+    data: TData | CustomSeriesWhitespaceData<HorzScaleItem>,
+  ): data is CustomSeriesWhitespaceData<HorzScaleItem>;
+  /**
+   * Default options
+   */
+  defaultOptions(): TSeriesOptions;
+  /**
+   * This method will be evoked when the series has been removed from the chart. This method should be used to
+   * clean up any objects, references, and other items that could potentially cause memory leaks.
+   *
+   * This method should contain all the necessary code to clean up the object before it is removed from memory.
+   * This includes removing any event listeners or timers that are attached to the object, removing any references
+   * to other objects, and resetting any values or properties that were modified during the lifetime of the object.
+   */
+  destroy?(): void;
+}
+/**
+ * Class interface for Horizontal scale behavior
+ */
+export interface IHorzScaleBehavior<HorzScaleItem> {
+  /**
+   * Structure describing options of the chart.
+   *
+   * @returns ChartOptionsBase
+   */
+  options(): ChartOptionsImpl<HorzScaleItem>;
+  /**
+   * Set the chart options. Note that this is different to `applyOptions` since the provided options will overwrite the current options
+   * instead of merging with the current options.
+   *
+   * @param options - Chart options to be set
+   * @returns void
+   */
+  setOptions(options: ChartOptionsImpl<HorzScaleItem>): void;
+  /**
+   * Method to preprocess the data.
+   *
+   * @param data - Data items for the series
+   * @returns void
+   */
+  preprocessData(
+    data: DataItem<HorzScaleItem> | DataItem<HorzScaleItem>[],
+  ): void;
+  /**
+   * Convert horizontal scale item into an internal horizontal scale item.
+   *
+   * @param item - item to be converted
+   * @returns InternalHorzScaleItem
+   */
+  convertHorzItemToInternal(item: HorzScaleItem): InternalHorzScaleItem;
+  /**
+   * Creates and returns a converter for changing series data into internal horizontal scale items.
+   *
+   * @param data - series data
+   * @returns HorzScaleItemConverterToInternalObj
+   */
+  createConverterToInternalObj(
+    data: SeriesDataItemTypeMap<HorzScaleItem>[SeriesType][],
+  ): HorzScaleItemConverterToInternalObj<HorzScaleItem>;
+  /**
+   * Returns the key for the specified horizontal scale item.
+   *
+   * @param internalItem - horizontal scale item for which the key should be returned
+   * @returns InternalHorzScaleItemKey
+   */
+  key(
+    internalItem: InternalHorzScaleItem | HorzScaleItem,
+  ): InternalHorzScaleItemKey;
+  /**
+   * Returns the cache key for the specified horizontal scale item.
+   *
+   * @param internalItem - horizontal scale item for which the cache key should be returned
+   * @returns number
+   */
+  cacheKey(internalItem: InternalHorzScaleItem): number;
+  /**
+   * Update the formatter with the localization options.
+   *
+   * @param options - Localization options
+   * @returns void
+   */
+  updateFormatter(options: LocalizationOptions<HorzScaleItem>): void;
+  /**
+   * Format the horizontal scale item into a display string.
+   *
+   * @param item - horizontal scale item to be formatted as a string
+   * @returns string
+   */
+  formatHorzItem(item: InternalHorzScaleItem): string;
+  /**
+   * Format the horizontal scale tickmark into a display string.
+   *
+   * @param item - tickmark item
+   * @param localizationOptions - Localization options
+   * @returns string
+   */
+  formatTickmark(
+    item: TickMark,
+    localizationOptions: LocalizationOptions<HorzScaleItem>,
+  ): string;
+  /**
+   * Returns the maximum tickmark weight value for the specified tickmarks on the time scale.
+   *
+   * @param marks - Timescale tick marks
+   * @returns TickMarkWeightValue
+   */
+  maxTickMarkWeight(marks: TimeMark[]): TickMarkWeightValue;
+  /**
+   * Fill the weights for the sorted time scale points.
+   *
+   * @param sortedTimePoints - sorted time scale points
+   * @param startIndex - starting index
+   * @returns void
+   */
+  fillWeightsForPoints(
+    sortedTimePoints: readonly Mutable<TimeScalePoint>[],
+    startIndex: number,
+  ): void;
+  /**
+   * If returns true, then the tick mark formatter will be called for all the visible
+   * tick marks even if the formatter has previously been called for a specific tick mark.
+   * This allows you to change the formatting on all the tick marks.
+   *
+   * @param tickMarks - array of tick marks
+   * @returns boolean
+   */
+  shouldResetTickmarkLabels?(tickMarks: readonly TickMark[]): boolean;
+}
+/** Interface to be implemented by the object in order to be used as a price formatter */
+export interface IPriceFormatter {
+  /**
+   * Formatting function
+   *
+   * @param price - Original price to be formatted
+   * @returns Formatted price
+   */
+  format(price: number): string;
+}
+/**
+ * Represents the interface for interacting with price lines.
+ */
+export interface IPriceLine {
+  /**
+   * Apply options to the price line.
+   *
+   * @param options - Any subset of options.
+   * @example
+   * ```js
+   * priceLine.applyOptions({
+   *     price: 90.0,
+   *     color: 'red',
+   *     lineWidth: 3,
+   *     lineStyle: LightweightCharts.LineStyle.Dashed,
+   *     axisLabelVisible: false,
+   *     title: 'P/L 600',
+   * });
+   * ```
+   */
+  applyOptions(options: Partial<PriceLineOptions>): void;
+  /**
+   * Get the currently applied options.
+   */
+  options(): Readonly<PriceLineOptions>;
+}
+/** Interface to control chart's price scale */
+export interface IPriceScaleApi {
+  /**
+   * Applies new options to the price scale
+   *
+   * @param options - Any subset of options.
+   */
+  applyOptions(options: DeepPartial<PriceScaleOptions>): void;
+  /**
+   * Returns currently applied options of the price scale
+   *
+   * @returns Full set of currently applied options, including defaults
+   */
+  options(): Readonly<PriceScaleOptions>;
+  /**
+   * Returns a width of the price scale if it's visible or 0 if invisible.
+   */
+  width(): number;
+}
+/**
+ * Represents the interface for interacting with series.
+ */
+export interface ISeriesApi<
+  TSeriesType extends SeriesType,
+  HorzScaleItem = Time,
+  TData = SeriesDataItemTypeMap<HorzScaleItem>[TSeriesType],
+  TOptions = SeriesOptionsMap[TSeriesType],
+  TPartialOptions = SeriesPartialOptionsMap[TSeriesType],
+> {
+  /**
+   * Returns current price formatter
+   *
+   * @returns Interface to the price formatter object that can be used to format prices in the same way as the chart does
+   */
+  priceFormatter(): IPriceFormatter;
+  /**
+   * Converts specified series price to pixel coordinate according to the series price scale
+   *
+   * @param price - Input price to be converted
+   * @returns Pixel coordinate of the price level on the chart
+   */
+  priceToCoordinate(price: number): Coordinate | null;
+  /**
+   * Converts specified coordinate to price value according to the series price scale
+   *
+   * @param coordinate - Input coordinate to be converted
+   * @returns Price value of the coordinate on the chart
+   */
+  coordinateToPrice(coordinate: number): BarPrice | null;
+  /**
+   * Returns bars information for the series in the provided [logical range](/time-scale.md#logical-range) or `null`, if no series data has been found in the requested range.
+   * This method can be used, for instance, to implement downloading historical data while scrolling to prevent a user from seeing empty space.
+   *
+   * @param range - The [logical range](/time-scale.md#logical-range) to retrieve info for.
+   * @returns The bars info for the given logical range.
+   * @example Getting bars info for current visible range
+   * ```js
+   * const barsInfo = series.barsInLogicalRange(chart.timeScale().getVisibleLogicalRange());
+   * console.log(barsInfo);
+   * ```
+   * @example Implementing downloading historical data while scrolling
+   * ```js
+   * function onVisibleLogicalRangeChanged(newVisibleLogicalRange) {
+   *     const barsInfo = series.barsInLogicalRange(newVisibleLogicalRange);
+   *     // if there less than 50 bars to the left of the visible area
+   *     if (barsInfo !== null && barsInfo.barsBefore < 50) {
+   *         // try to load additional historical data and prepend it to the series data
+   *     }
+   * }
+   *
+   * chart.timeScale().subscribeVisibleLogicalRangeChange(onVisibleLogicalRangeChanged);
+   * ```
+   */
+  barsInLogicalRange(range: Range<number>): BarsInfo<HorzScaleItem> | null;
+  /**
+   * Applies new options to the existing series
+   * You can set options initially when you create series or use the `applyOptions` method of the series to change the existing options.
+   * Note that you can only pass options you want to change.
+   *
+   * @param options - Any subset of options.
+   */
+  applyOptions(options: TPartialOptions): void;
+  /**
+   * Returns currently applied options
+   *
+   * @returns Full set of currently applied options, including defaults
+   */
+  options(): Readonly<TOptions>;
+  /**
+   * Returns interface of the price scale the series is currently attached
+   *
+   * @returns IPriceScaleApi object to control the price scale
+   */
+  priceScale(): IPriceScaleApi;
+  /**
+   * Sets or replaces series data.
+   *
+   * @param data - Ordered (earlier time point goes first) array of data items. Old data is fully replaced with the new one.
+   * @example Setting data to a line series
+   * ```js
+   * lineSeries.setData([
+   *     { time: '2018-12-12', value: 24.11 },
+   *     { time: '2018-12-13', value: 31.74 },
+   * ]);
+   * ```
+   * @example Setting data to a bars (or candlestick) series
+   * ```js
+   * barSeries.setData([
+   *     { time: '2018-12-19', open: 141.77, high: 170.39, low: 120.25, close: 145.72 },
+   *     { time: '2018-12-20', open: 145.72, high: 147.99, low: 100.11, close: 108.19 },
+   * ]);
+   * ```
+   */
+  setData(data: TData[]): void;
+  /**
+   * Adds new data item to the existing set (or updates the latest item if times of the passed/latest items are equal).
+   *
+   * @param bar - A single data item to be added. Time of the new item must be greater or equal to the latest existing time point.
+   * If the new item's time is equal to the last existing item's time, then the existing item is replaced with the new one.
+   * @example Updating line series data
+   * ```js
+   * lineSeries.update({
+   *     time: '2018-12-12',
+   *     value: 24.11,
+   * });
+   * ```
+   * @example Updating bar (or candlestick) series data
+   * ```js
+   * barSeries.update({
+   *     time: '2018-12-19',
+   *     open: 141.77,
+   *     high: 170.39,
+   *     low: 120.25,
+   *     close: 145.72,
+   * });
+   * ```
+   */
+  update(bar: TData): void;
+  /**
+   * Returns a bar data by provided logical index.
+   *
+   * @param logicalIndex - Logical index
+   * @param mismatchDirection - Search direction if no data found at provided logical index.
+   * @returns Original data item provided via setData or update methods.
+   * @example
+   * ```js
+   * const originalData = series.dataByIndex(10, LightweightCharts.MismatchDirection.NearestLeft);
+   * ```
+   */
+  dataByIndex(
+    logicalIndex: number,
+    mismatchDirection?: MismatchDirection,
+  ): TData | null;
+  /**
+   * Returns all the bar data for the series.
+   *
+   * @returns Original data items provided via setData or update methods.
+   * @example
+   * ```js
+   * const originalData = series.data();
+   * ```
+   */
+  data(): readonly TData[];
+  /**
+   * Subscribe to the data changed event. This event is fired whenever the `update` or `setData` method is evoked
+   * on the series.
+   *
+   * @param handler - Handler to be called on a data changed event.
+   * @example
+   * ```js
+   * function myHandler() {
+   *     const data = series.data();
+   *     console.log(`The data has changed. New Data length: ${data.length}`);
+   * }
+   *
+   * series.subscribeDataChanged(myHandler);
+   * ```
+   */
+  subscribeDataChanged(handler: DataChangedHandler): void;
+  /**
+   * Unsubscribe a handler that was previously subscribed using {@link subscribeDataChanged}.
+   *
+   * @param handler - Previously subscribed handler
+   * @example
+   * ```js
+   * chart.unsubscribeDataChanged(myHandler);
+   * ```
+   */
+  unsubscribeDataChanged(handler: DataChangedHandler): void;
+  /**
+   * Allows to set/replace all existing series markers with new ones.
+   *
+   * @param data - An array of series markers. This array should be sorted by time. Several markers with same time are allowed.
+   * @example
+   * ```js
+   * series.setMarkers([
+   *     {
+   *         time: '2019-04-09',
+   *         position: 'aboveBar',
+   *         color: 'black',
+   *         shape: 'arrowDown',
+   *     },
+   *     {
+   *         time: '2019-05-31',
+   *         position: 'belowBar',
+   *         color: 'red',
+   *         shape: 'arrowUp',
+   *         id: 'id3',
+   *     },
+   *     {
+   *         time: '2019-05-31',
+   *         position: 'belowBar',
+   *         color: 'orange',
+   *         shape: 'arrowUp',
+   *         id: 'id4',
+   *         text: 'example',
+   *         size: 2,
+   *     },
+   * ]);
+   *
+   * chart.subscribeCrosshairMove(param => {
+   *     console.log(param.hoveredObjectId);
+   * });
+   *
+   * chart.subscribeClick(param => {
+   *     console.log(param.hoveredObjectId);
+   * });
+   * ```
+   */
+  setMarkers(data: SeriesMarker<HorzScaleItem>[]): void;
+  /**
+   * Returns an array of series markers.
+   */
+  markers(): SeriesMarker<HorzScaleItem>[];
+  /**
+   * Creates a new price line
+   *
+   * @param options - Any subset of options, however `price` is required.
+   * @example
+   * ```js
+   * const priceLine = series.createPriceLine({
+   *     price: 80.0,
+   *     color: 'green',
+   *     lineWidth: 2,
+   *     lineStyle: LightweightCharts.LineStyle.Dotted,
+   *     axisLabelVisible: true,
+   *     title: 'P/L 500',
+   * });
+   * ```
+   */
+  createPriceLine(options: CreatePriceLineOptions): IPriceLine;
+  /**
+   * Removes the price line that was created before.
+   *
+   * @param line - A line to remove.
+   * @example
+   * ```js
+   * const priceLine = series.createPriceLine({ price: 80.0 });
+   * series.removePriceLine(priceLine);
+   * ```
+   */
+  removePriceLine(line: IPriceLine): void;
+  /**
+   * Return current series type.
+   *
+   * @returns Type of the series.
+   * @example
+   * ```js
+   * const lineSeries = chart.addLineSeries();
+   * console.log(lineSeries.seriesType()); // "Line"
+   *
+   * const candlestickSeries = chart.addCandlestickSeries();
+   * console.log(candlestickSeries.seriesType()); // "Candlestick"
+   * ```
+   */
+  seriesType(): TSeriesType;
+  /**
+   * Attaches additional drawing primitive to the series
+   *
+   * @param primitive - any implementation of ISeriesPrimitive interface
+   */
+  attachPrimitive(primitive: ISeriesPrimitive<HorzScaleItem>): void;
+  /**
+   * Detaches additional drawing primitive from the series
+   *
+   * @param primitive - implementation of ISeriesPrimitive interface attached before
+   * Does nothing if specified primitive was not attached
+   */
+  detachPrimitive(primitive: ISeriesPrimitive<HorzScaleItem>): void;
+}
+/**
+ * This interface represents a label on the price or time axis
+ */
+export interface ISeriesPrimitiveAxisView {
+  /**
+   * The desired coordinate for the label. Note that the label will be automatically moved to prevent overlapping with other labels. If you would like the label to be drawn at the
+   * exact coordinate under all circumstances then rather use `fixedCoordinate`.
+   * For a price axis the value returned will represent the vertical distance (pixels) from the top. For a time axis the value will represent the horizontal distance from the left.
+   *
+   * @returns coordinate. distance from top for price axis, or distance from left for time axis.
+   */
+  coordinate(): number;
+  /**
+   * fixed coordinate of the label. A label with a fixed coordinate value will always be drawn at the specified coordinate and will appear above any 'unfixed' labels. If you supply
+   * a fixed coordinate then you should return a large negative number for `coordinate` so that the automatic placement of unfixed labels doesn't leave a blank space for this label.
+   * For a price axis the value returned will represent the vertical distance (pixels) from the top. For a time axis the value will represent the horizontal distance from the left.
+   *
+   * @returns coordinate. distance from top for price axis, or distance from left for time axis.
+   */
+  fixedCoordinate?(): number | undefined;
+  /**
+   * @returns text of the label
+   */
+  text(): string;
+  /**
+   * @returns text color of the label
+   */
+  textColor(): string;
+  /**
+   * @returns background color of the label
+   */
+  backColor(): string;
+  /**
+   * @returns whether the label should be visible (default: `true`)
+   */
+  visible?(): boolean;
+  /**
+   * @returns whether the tick mark line should be visible (default: `true`)
+   */
+  tickVisible?(): boolean;
+}
+/**
+ * Base interface for series primitives. It must be implemented to add some external graphics to series
+ */
+export interface ISeriesPrimitiveBase<TSeriesAttachedParameters = unknown> {
+  /**
+   * This method is called when viewport has been changed, so primitive have to recalculate / invalidate its data
+   */
+  updateAllViews?(): void;
+  /**
+   * Returns array of labels to be drawn on the price axis used by the series
+   *
+   * @returns array of objects; each of then must implement ISeriesPrimitiveAxisView interface
+   *
+   * For performance reasons, the lightweight library uses internal caches based on references to arrays
+   * So, this method must return new array if set of views has changed and should try to return the same array if nothing changed
+   */
+  priceAxisViews?(): readonly ISeriesPrimitiveAxisView[];
+  /**
+   * Returns array of labels to be drawn on the time axis
+   *
+   * @returns array of objects; each of then must implement ISeriesPrimitiveAxisView interface
+   *
+   * For performance reasons, the lightweight library uses internal caches based on references to arrays
+   * So, this method must return new array if set of views has changed and should try to return the same array if nothing changed
+   */
+  timeAxisViews?(): readonly ISeriesPrimitiveAxisView[];
+  /**
+   * Returns array of objects representing primitive in the main area of the chart
+   *
+   * @returns array of objects; each of then must implement ISeriesPrimitivePaneView interface
+   *
+   * For performance reasons, the lightweight library uses internal caches based on references to arrays
+   * So, this method must return new array if set of views has changed and should try to return the same array if nothing changed
+   */
+  paneViews?(): readonly ISeriesPrimitivePaneView[];
+  /**
+   * Returns array of objects representing primitive in the price axis area of the chart
+   *
+   * @returns array of objects; each of then must implement ISeriesPrimitivePaneView interface
+   *
+   * For performance reasons, the lightweight library uses internal caches based on references to arrays
+   * So, this method must return new array if set of views has changed and should try to return the same array if nothing changed
+   */
+  priceAxisPaneViews?(): readonly ISeriesPrimitivePaneView[];
+  /**
+   * Returns array of objects representing primitive in the time axis area of the chart
+   *
+   * @returns array of objects; each of then must implement ISeriesPrimitivePaneView interface
+   *
+   * For performance reasons, the lightweight library uses internal caches based on references to arrays
+   * So, this method must return new array if set of views has changed and should try to return the same array if nothing changed
+   */
+  timeAxisPaneViews?(): readonly ISeriesPrimitivePaneView[];
+  /**
+   * Return autoscaleInfo which will be merged with the series base autoscaleInfo. You can use this to expand the autoscale range
+   * to include visual elements drawn outside of the series' current visible price range.
+   *
+   * **Important**: Please note that this method will be evoked very often during scrolling and zooming of the chart, thus it
+   * is recommended that this method is either simple to execute, or makes use of optimisations such as caching to ensure that
+   * the chart remains responsive.
+   *
+   * @param startTimePoint - start time point for the current visible range
+   * @param endTimePoint - end time point for the current visible range
+   * @returns AutoscaleInfo
+   */
+  autoscaleInfo?(
+    startTimePoint: Logical,
+    endTimePoint: Logical,
+  ): AutoscaleInfo | null;
+  /**
+   * Attached Lifecycle hook.
+   *
+   * @param param - An object containing useful references for the attached primitive to use.
+   * @returns void
+   */
+  attached?(param: TSeriesAttachedParameters): void;
+  /**
+   * Detached Lifecycle hook.
+   *
+   * @returns void
+   */
+  detached?(): void;
+  /**
+   * Hit test method which will be called by the library when the cursor is moved.
+   * Use this to register object ids being hovered for use within the crosshairMoved
+   * and click events emitted by the chart. Additionally, the hit test result can
+   * specify a preferred cursor type to display for the main chart pane. This method
+   * should return the top most hit for this primitive if more than one object is
+   * being intersected.
+   *
+   * @param x - x Coordinate of mouse event
+   * @param y - y Coordinate of mouse event
+   */
+  hitTest?(x: number, y: number): PrimitiveHoveredItem | null;
+}
+/**
+ * This interface represents rendering some element on the canvas
+ */
+export interface ISeriesPrimitivePaneRenderer {
+  /**
+   * Method to draw main content of the element
+   *
+   * @param target - canvas context to draw on, refer to FancyCanvas library for more details about this class
+   *
+   */
+  draw(target: CanvasRenderingTarget2D): void;
+  /**
+   * Optional method to draw the background.
+   * Some elements could implement this method to draw on the background of the chart.
+   * Usually this is some kind of watermarks or time areas highlighting.
+   *
+   * @param target - canvas context to draw on, refer FancyCanvas library for more details about this class
+   */
+  drawBackground?(target: CanvasRenderingTarget2D): void;
+}
+/**
+ * This interface represents the primitive for one of the pane of the chart (main chart area, time scale, price scale).
+ */
+export interface ISeriesPrimitivePaneView {
+  /**
+   * Defines where in the visual layer stack the renderer should be executed. Default is `'normal'`.
+   *
+   * @returns the desired position in the visual layer stack. @see {@link SeriesPrimitivePaneViewZOrder}
+   */
+  zOrder?(): SeriesPrimitivePaneViewZOrder;
+  /**
+   * This method returns a renderer - special object to draw data
+   *
+   * @returns an renderer object to be used for drawing, or `null` if we have nothing to draw.
+   */
+  renderer(): ISeriesPrimitivePaneRenderer | null;
+}
+/** Interface to chart time scale */
+export interface ITimeScaleApi<HorzScaleItem> {
+  /**
+   * Return the distance from the right edge of the time scale to the lastest bar of the series measured in bars.
+   */
+  scrollPosition(): number;
+  /**
+   * Scrolls the chart to the specified position.
+   *
+   * @param position - Target data position
+   * @param animated - Setting this to true makes the chart scrolling smooth and adds animation
+   */
+  scrollToPosition(position: number, animated: boolean): void;
+  /**
+   * Restores default scroll position of the chart. This process is always animated.
+   */
+  scrollToRealTime(): void;
+  /**
+   * Returns current visible time range of the chart.
+   *
+   * Note that this method cannot extrapolate time and will use the only currently existent data.
+   * To get complete information about current visible range, please use {@link getVisibleLogicalRange} and {@link ISeriesApi.barsInLogicalRange}.
+   *
+   * @returns Visible range or null if the chart has no data at all.
+   */
+  getVisibleRange(): Range<HorzScaleItem> | null;
+  /**
+   * Sets visible range of data.
+   *
+   * Note that this method cannot extrapolate time and will use the only currently existent data.
+   * Thus, for example, if currently a chart doesn't have data prior `2018-01-01` date and you set visible range with `from` date `2016-01-01`, it will be automatically adjusted to `2018-01-01` (and the same for `to` date).
+   *
+   * But if you can approximate indexes on your own - you could use {@link setVisibleLogicalRange} instead.
+   *
+   * @param range - Target visible range of data.
+   * @example
+   * ```js
+   * chart.timeScale().setVisibleRange({
+   *     from: (new Date(Date.UTC(2018, 0, 1, 0, 0, 0, 0))).getTime() / 1000,
+   *     to: (new Date(Date.UTC(2018, 1, 1, 0, 0, 0, 0))).getTime() / 1000,
+   * });
+   * ```
+   */
+  setVisibleRange(range: Range<HorzScaleItem>): void;
+  /**
+   * Returns the current visible [logical range](/time-scale.md#logical-range) of the chart as an object with the first and last time points of the logical range, or returns `null` if the chart has no data.
+   *
+   * @returns Visible range or null if the chart has no data at all.
+   */
+  getVisibleLogicalRange(): LogicalRange | null;
+  /**
+   * Sets visible [logical range](/time-scale.md#logical-range) of data.
+   *
+   * @param range - Target visible logical range of data.
+   * @example
+   * ```js
+   * chart.timeScale().setVisibleLogicalRange({ from: 0, to: 10 });
+   * ```
+   */
+  setVisibleLogicalRange(range: Range<number>): void;
+  /**
+   * Restores default zoom level and scroll position of the time scale.
+   */
+  resetTimeScale(): void;
+  /**
+   * Automatically calculates the visible range to fit all data from all series.
+   */
+  fitContent(): void;
+  /**
+   * Converts a logical index to local x coordinate.
+   *
+   * @param logical - Logical index needs to be converted
+   * @returns x coordinate of that time or `null` if the chart doesn't have data
+   */
+  logicalToCoordinate(logical: Logical): Coordinate | null;
+  /**
+   * Converts a coordinate to logical index.
+   *
+   * @param x - Coordinate needs to be converted
+   * @returns Logical index that is located on that coordinate or `null` if the chart doesn't have data
+   */
+  coordinateToLogical(x: number): Logical | null;
+  /**
+   * Converts a time to local x coordinate.
+   *
+   * @param time - Time needs to be converted
+   * @returns X coordinate of that time or `null` if no time found on time scale
+   */
+  timeToCoordinate(time: HorzScaleItem): Coordinate | null;
+  /**
+   * Converts a coordinate to time.
+   *
+   * @param x - Coordinate needs to be converted.
+   * @returns Time of a bar that is located on that coordinate or `null` if there are no bars found on that coordinate.
+   */
+  coordinateToTime(x: number): HorzScaleItem | null;
+  /**
+   * Returns a width of the time scale.
+   */
+  width(): number;
+  /**
+   * Returns a height of the time scale.
+   */
+  height(): number;
+  /**
+   * Subscribe to the visible time range change events.
+   *
+   * The argument passed to the handler function is an object with `from` and `to` properties of type {@link Time}, or `null` if there is no visible data.
+   *
+   * @param handler - Handler (function) to be called when the visible indexes change.
+   * @example
+   * ```js
+   * function myVisibleTimeRangeChangeHandler(newVisibleTimeRange) {
+   *     if (newVisibleTimeRange === null) {
+   *         // handle null
+   *     }
+   *
+   *     // handle new logical range
+   * }
+   *
+   * chart.timeScale().subscribeVisibleTimeRangeChange(myVisibleTimeRangeChangeHandler);
+   * ```
+   */
+  subscribeVisibleTimeRangeChange(
+    handler: TimeRangeChangeEventHandler<HorzScaleItem>,
+  ): void;
+  /**
+   * Unsubscribe a handler that was previously subscribed using {@link subscribeVisibleTimeRangeChange}.
+   *
+   * @param handler - Previously subscribed handler
+   * @example
+   * ```js
+   * chart.timeScale().unsubscribeVisibleTimeRangeChange(myVisibleTimeRangeChangeHandler);
+   * ```
+   */
+  unsubscribeVisibleTimeRangeChange(
+    handler: TimeRangeChangeEventHandler<HorzScaleItem>,
+  ): void;
+  /**
+   * Subscribe to the visible logical range change events.
+   *
+   * The argument passed to the handler function is an object with `from` and `to` properties of type `number`, or `null` if there is no visible data.
+   *
+   * @param handler - Handler (function) to be called when the visible indexes change.
+   * @example
+   * ```js
+   * function myVisibleLogicalRangeChangeHandler(newVisibleLogicalRange) {
+   *     if (newVisibleLogicalRange === null) {
+   *         // handle null
+   *     }
+   *
+   *     // handle new logical range
+   * }
+   *
+   * chart.timeScale().subscribeVisibleLogicalRangeChange(myVisibleLogicalRangeChangeHandler);
+   * ```
+   */
+  subscribeVisibleLogicalRangeChange(
+    handler: LogicalRangeChangeEventHandler,
+  ): void;
+  /**
+   * Unsubscribe a handler that was previously subscribed using {@link subscribeVisibleLogicalRangeChange}.
+   *
+   * @param handler - Previously subscribed handler
+   * @example
+   * ```js
+   * chart.timeScale().unsubscribeVisibleLogicalRangeChange(myVisibleLogicalRangeChangeHandler);
+   * ```
+   */
+  unsubscribeVisibleLogicalRangeChange(
+    handler: LogicalRangeChangeEventHandler,
+  ): void;
+  /**
+   * Adds a subscription to time scale size changes
+   *
+   * @param handler - Handler (function) to be called when the time scale size changes
+   */
+  subscribeSizeChange(handler: SizeChangeEventHandler): void;
+  /**
+   * Removes a subscription to time scale size changes
+   *
+   * @param handler - Previously subscribed handler
+   */
+  unsubscribeSizeChange(handler: SizeChangeEventHandler): void;
+  /**
+   * Applies new options to the time scale.
+   *
+   * @param options - Any subset of options.
+   */
+  applyOptions(options: DeepPartial<HorzScaleOptions>): void;
+  /**
+   * Returns current options
+   *
+   * @returns Currently applied options
+   */
+  options(): Readonly<HorzScaleOptions>;
+}
+/**
+ * Represents options for enabling or disabling kinetic scrolling with mouse and touch gestures.
+ */
+export interface KineticScrollOptions {
+  /**
+   * Enable kinetic scroll with touch gestures.
+   *
+   * @defaultValue `true`
+   */
+  touch: boolean;
+  /**
+   * Enable kinetic scroll with the mouse.
+   *
+   * @defaultValue `false`
+   */
+  mouse: boolean;
+}
+/** Represents layout options */
+export interface LayoutOptions {
+  /**
+   * Chart and scales background color.
+   *
+   * @defaultValue `{ type: ColorType.Solid, color: '#FFFFFF' }`
+   */
+  background: Background;
+  /**
+   * Color of text on the scales.
+   *
+   * @defaultValue `'#191919'`
+   */
+  textColor: string;
+  /**
+   * Font size of text on scales in pixels.
+   *
+   * @defaultValue `12`
+   */
+  fontSize: number;
+  /**
+   * Font family of text on the scales.
+   *
+   * @defaultValue `-apple-system, BlinkMacSystemFont, 'Trebuchet MS', Roboto, Ubuntu, sans-serif`
+   */
+  fontFamily: string;
+  /**
+   * Display the TradingView attribution logo on the main chart pane.
+   *
+   * The licence for library specifies that you add the "attribution notice"
+   * from the NOTICE file to your code and a link to https://www.tradingview.com/ to
+   * the page of your website or mobile application that is available to your users.
+   * Using this attribution logo is sufficient for meeting this linking requirement.
+   * However, if you already fulfill this requirement then you can disable this
+   * attribution logo.
+   *
+   * @defaultValue true
+   */
+  attributionLogo: boolean;
+}
+/**
+ * Structure describing a single item of data for line series
+ */
+export interface LineData<HorzScaleItem = Time>
+  extends SingleValueData<HorzScaleItem> {
+  /**
+   * Optional color value for certain data item. If missed, color from options is used
+   */
+  color?: string;
+}
+/**
+ * Represents style options for a line series.
+ */
+export interface LineStyleOptions {
+  /**
+   * Line color.
+   *
+   * @defaultValue `'#2196f3'`
+   */
+  color: string;
+  /**
+   * Line style.
+   *
+   * @defaultValue {@link LineStyle.Solid}
+   */
+  lineStyle: LineStyle;
+  /**
+   * Line width in pixels.
+   *
+   * @defaultValue `3`
+   */
+  lineWidth: LineWidth;
+  /**
+   * Line type.
+   *
+   * @defaultValue {@link LineType.Simple}
+   */
+  lineType: LineType;
+  /**
+   * Show series line.
+   *
+   * @defaultValue `true`
+   */
+  lineVisible: boolean;
+  /**
+   * Show circle markers on each point.
+   *
+   * @defaultValue `false`
+   */
+  pointMarkersVisible: boolean;
+  /**
+   * Circle markers radius in pixels.
+   *
+   * @defaultValue `undefined`
+   */
+  pointMarkersRadius?: number;
+  /**
+   * Show the crosshair marker.
+   *
+   * @defaultValue `true`
+   */
+  crosshairMarkerVisible: boolean;
+  /**
+   * Crosshair marker radius in pixels.
+   *
+   * @defaultValue `4`
+   */
+  crosshairMarkerRadius: number;
+  /**
+   * Crosshair marker border color. An empty string falls back to the color of the series under the crosshair.
+   *
+   * @defaultValue `''`
+   */
+  crosshairMarkerBorderColor: string;
+  /**
+   * The crosshair marker background color. An empty string falls back to the color of the series under the crosshair.
+   *
+   * @defaultValue `''`
+   */
+  crosshairMarkerBackgroundColor: string;
+  /**
+   * Crosshair marker border width in pixels.
+   *
+   * @defaultValue `2`
+   */
+  crosshairMarkerBorderWidth: number;
+  /**
+   * Last price animation mode.
+   *
+   * @defaultValue {@link LastPriceAnimationMode.Disabled}
+   */
+  lastPriceAnimation: LastPriceAnimationMode;
+}
+/**
+ * Represents options for formatting dates, times, and prices according to a locale.
+ */
+export interface LocalizationOptions<HorzScaleItem>
+  extends LocalizationOptionsBase {
+  /**
+   * Override formatting of the time scale crosshair label.
+   *
+   * @defaultValue `undefined`
+   */
+  timeFormatter?: TimeFormatterFn<HorzScaleItem>;
+  /**
+   * Date formatting string.
+   *
+   * Can contain `yyyy`, `yy`, `MMMM`, `MMM`, `MM` and `dd` literals which will be replaced with corresponding date's value.
+   *
+   * Ignored if {@link timeFormatter} has been specified.
+   *
+   * @defaultValue `'dd MMM \'yy'`
+   */
+  dateFormat: string;
+}
+/**
+ * Represents basic localization options
+ */
+export interface LocalizationOptionsBase {
+  /**
+   * Current locale used to format dates. Uses the browser's language settings by default.
+   *
+   * @see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl#Locale_identification_and_negotiation
+   * @defaultValue `navigator.language`
+   */
+  locale: string;
+  /**
+   * Override formatting of the price scale tick marks, labels and crosshair labels. Can be used for cases that can't be covered with built-in price formats.
+   *
+   * @see {@link PriceFormatCustom}
+   * @defaultValue `undefined`
+   */
+  priceFormatter?: PriceFormatterFn;
+  /**
+   * Override formatting of the percentage scale tick marks, labels and crosshair labels. Can be used for cases that can't be covered with built-in percentage format.
+   *
+   * @defaultValue `undefined`
+   */
+  percentageFormatter?: PercentageFormatterFn;
+}
+/**
+ * Represents a mouse event.
+ */
+export interface MouseEventParams<HorzScaleItem = Time> {
+  /**
+   * Time of the data at the location of the mouse event.
+   *
+   * The value will be `undefined` if the location of the event in the chart is outside the range of available data.
+   */
+  time?: HorzScaleItem;
+  /**
+   * Logical index
+   */
+  logical?: Logical;
+  /**
+   * Location of the event in the chart.
+   *
+   * The value will be `undefined` if the event is fired outside the chart, for example a mouse leave event.
+   */
+  point?: Point;
+  /**
+   * Data of all series at the location of the event in the chart.
+   *
+   * Keys of the map are {@link ISeriesApi} instances. Values are prices.
+   * Values of the map are original data items
+   */
+  seriesData: Map<
+    ISeriesApi<SeriesType, HorzScaleItem>,
+    | BarData<HorzScaleItem>
+    | LineData<HorzScaleItem>
+    | HistogramData<HorzScaleItem>
+    | CustomData<HorzScaleItem>
+  >;
+  /**
+   * The {@link ISeriesApi} for the series at the point of the mouse event.
+   */
+  hoveredSeries?: ISeriesApi<SeriesType, HorzScaleItem>;
+  /**
+   * The ID of the object at the point of the mouse event.
+   */
+  hoveredObjectId?: unknown;
+  /**
+   * The underlying source mouse or touch event data, if available
+   */
+  sourceEvent?: TouchMouseEventData;
+}
+/**
+ * Represents a bar with a {@link Time} and open, high, low, and close prices.
+ */
+export interface OhlcData<HorzScaleItem = Time>
+  extends WhitespaceData<HorzScaleItem> {
+  /**
+   * The bar time.
+   */
+  time: HorzScaleItem;
+  /**
+   * The open price.
+   */
+  open: number;
+  /**
+   * The high price.
+   */
+  high: number;
+  /**
+   * The low price.
+   */
+  low: number;
+  /**
+   * The close price.
+   */
+  close: number;
+}
+/**
+ * Data provide to the custom series pane view which can be used within the renderer
+ * for drawing the series data.
+ */
+export interface PaneRendererCustomData<
+  HorzScaleItem,
+  TData extends CustomData<HorzScaleItem>,
+> {
+  /**
+   * List of all the series' items and their x coordinates.
+   */
+  bars: readonly CustomBarItemData<HorzScaleItem, TData>[];
+  /**
+   * Spacing between consecutive bars.
+   */
+  barSpacing: number;
+  /**
+   * The current visible range of items on the chart.
+   */
+  visibleRange: Range<number> | null;
+}
+/**
+ * Dimensions of the Chart Pane
+ * (the main chart area which excludes the time and price scales).
+ */
+export interface PaneSize {
+  /** Height of the Chart Pane (pixels) */
+  height: number;
+  /** Width of the Chart Pane (pixels) */
+  width: number;
+}
+/**
+ * Represents a point on the chart.
+ */
+export interface Point {
+  /**
+   * The x coordinate.
+   */
+  readonly x: Coordinate;
+  /**
+   * The y coordinate.
+   */
+  readonly y: Coordinate;
+}
+/**
+ * Represents series value formatting options.
+ * The precision and minMove properties allow wide customization of formatting.
+ *
+ * @example
+ * `minMove=0.01`, `precision` is not specified - prices will change like 1.13, 1.14, 1.15 etc.
+ * @example
+ * `minMove=0.01`, `precision=3` - prices will change like 1.130, 1.140, 1.150 etc.
+ * @example
+ * `minMove=0.05`, `precision` is not specified - prices will change like 1.10, 1.15, 1.20 etc.
+ */
+export interface PriceFormatBuiltIn {
+  /**
+   * Built-in price formats:
+   * - `'price'` is the most common choice; it allows customization of precision and rounding of prices.
+   * - `'volume'` uses abbreviation for formatting prices like `1.2K` or `12.67M`.
+   * - `'percent'` uses `%` sign at the end of prices.
+   */
+  type: "price" | "volume" | "percent";
+  /**
+   * Number of digits after the decimal point.
+   * If it is not set, then its value is calculated automatically based on minMove.
+   *
+   * @defaultValue `2` if both {@link minMove} and {@link precision} are not provided, calculated automatically based on {@link minMove} otherwise.
+   */
+  precision: number;
+  /**
+   * The minimum possible step size for price value movement. This value shouldn't have more decimal digits than the precision.
+   *
+   * @defaultValue `0.01`
+   */
+  minMove: number;
+}
+/**
+ * Represents series value formatting options.
+ */
+export interface PriceFormatCustom {
+  /**
+   * The custom price format.
+   */
+  type: "custom";
+  /**
+   * Override price formatting behaviour. Can be used for cases that can't be covered with built-in price formats.
+   */
+  formatter: PriceFormatterFn;
+  /**
+   * The minimum possible step size for price value movement.
+   *
+   * @defaultValue `0.01`
+   */
+  minMove: number;
+}
+/**
+ * Represents a price line options.
+ */
+export interface PriceLineOptions {
+  /**
+   * The optional ID of this price line.
+   */
+  id?: string;
+  /**
+   * Price line's value.
+   *
+   * @defaultValue `0`
+   */
+  price: number;
+  /**
+   * Price line's color.
+   *
+   * @defaultValue `''`
+   */
+  color: string;
+  /**
+   * Price line's width in pixels.
+   *
+   * @defaultValue `1`
+   */
+  lineWidth: LineWidth;
+  /**
+   * Price line's style.
+   *
+   * @defaultValue {@link LineStyle.Solid}
+   */
+  lineStyle: LineStyle;
+  /**
+   * Display line.
+   *
+   * @defaultValue `true`
+   */
+  lineVisible: boolean;
+  /**
+   * Display the current price value in on the price scale.
+   *
+   * @defaultValue `true`
+   */
+  axisLabelVisible: boolean;
+  /**
+   * Price line's on the chart pane.
+   *
+   * @defaultValue `''`
+   */
+  title: string;
+  /**
+   * Background color for the axis label.
+   * Will default to the price line color if unspecified.
+   *
+   * @defaultValue `''`
+   */
+  axisLabelColor: string;
+  /**
+   * Text color for the axis label.
+   *
+   * @defaultValue `''`
+   */
+  axisLabelTextColor: string;
+}
+/**
+ * Represents a price range.
+ */
+export interface PriceRange {
+  /**
+   * Maximum value in the range.
+   */
+  minValue: number;
+  /**
+   * Minimum value in the range.
+   */
+  maxValue: number;
+}
+/** Defines margins of the price scale. */
+export interface PriceScaleMargins {
+  /**
+   * Top margin in percentages. Must be greater or equal to 0 and less than 1.
+   */
+  top: number;
+  /**
+   * Bottom margin in percentages. Must be greater or equal to 0 and less than 1.
+   */
+  bottom: number;
+}
+/** Structure that describes price scale options */
+export interface PriceScaleOptions {
+  /**
+   * Autoscaling is a feature that automatically adjusts a price scale to fit the visible range of data.
+   * Note that overlay price scales are always auto-scaled.
+   *
+   * @defaultValue `true`
+   */
+  autoScale: boolean;
+  /**
+   * Price scale mode.
+   *
+   * @defaultValue {@link PriceScaleMode.Normal}
+   */
+  mode: PriceScaleMode;
+  /**
+   * Invert the price scale, so that a upwards trend is shown as a downwards trend and vice versa.
+   * Affects both the price scale and the data on the chart.
+   *
+   * @defaultValue `false`
+   */
+  invertScale: boolean;
+  /**
+   * Align price scale labels to prevent them from overlapping.
+   *
+   * @defaultValue `true`
+   */
+  alignLabels: boolean;
+  /**
+   * Price scale margins.
+   *
+   * @defaultValue `{ bottom: 0.1, top: 0.2 }`
+   * @example
+   * ```js
+   * chart.priceScale('right').applyOptions({
+   *     scaleMargins: {
+   *         top: 0.8,
+   *         bottom: 0,
+   *     },
+   * });
+   * ```
+   */
+  scaleMargins: PriceScaleMargins;
+  /**
+   * Set true to draw a border between the price scale and the chart area.
+   *
+   * @defaultValue `true`
+   */
+  borderVisible: boolean;
+  /**
+   * Price scale border color.
+   *
+   * @defaultValue `'#2B2B43'`
+   */
+  borderColor: string;
+  /**
+   * Price scale text color.
+   * If not provided {@link LayoutOptions.textColor} is used.
+   *
+   * @defaultValue `undefined`
+   */
+  textColor?: string;
+  /**
+   * Show top and bottom corner labels only if entire text is visible.
+   *
+   * @defaultValue `false`
+   */
+  entireTextOnly: boolean;
+  /**
+   * Indicates if this price scale visible. Ignored by overlay price scales.
+   *
+   * @defaultValue `true` for the right price scale and `false` for the left
+   */
+  visible: boolean;
+  /**
+   * Draw small horizontal line on price axis labels.
+   *
+   * @defaultValue `false`
+   */
+  ticksVisible: boolean;
+  /**
+   * Define a minimum width for the price scale.
+   * Note: This value will be exceeded if the
+   * price scale needs more space to display it's contents.
+   *
+   * Setting a minimum width could be useful for ensuring that
+   * multiple charts positioned in a vertical stack each have
+   * an identical price scale width, or for plugins which
+   * require a bit more space within the price scale pane.
+   *
+   * @defaultValue 0
+   */
+  minimumWidth: number;
+}
+/**
+ * Data representing the currently hovered object from the Hit test.
+ */
+export interface PrimitiveHoveredItem {
+  /**
+   * CSS cursor style as defined here: [MDN: CSS Cursor](https://developer.mozilla.org/en-US/docs/Web/CSS/cursor) or `undefined`
+   * if you want the library to use the default cursor style instead.
+   */
+  cursorStyle?: string;
+  /**
+   * Hovered objects external ID. Can be used to identify the source item within a mouse subscriber event.
+   */
+  externalId: string;
+  /**
+   * The zOrder of the hovered item.
+   */
+  zOrder: SeriesPrimitivePaneViewZOrder;
+  /**
+   * Set to true if the object is rendered using `drawBackground` instead of `draw`.
+   */
+  isBackground?: boolean;
+}
+/**
+ * Represents a generic range `from` one value `to` another.
+ */
+export interface Range<T> {
+  /**
+   * The from value. The start of the range.
+   */
+  from: T;
+  /**
+   * The to value. The end of the range.
+   */
+  to: T;
+}
+/**
+ * Object containing references to the chart and series instances, and a requestUpdate method for triggering
+ * a refresh of the chart.
+ */
+export interface SeriesAttachedParameter<
+  HorzScaleItem = Time,
+  TSeriesType extends SeriesType = keyof SeriesOptionsMap,
+> {
+  /**
+   * Chart instance.
+   */
+  chart: IChartApiBase<HorzScaleItem>;
+  /**
+   * Series to which the Primitive is attached.
+   */
+  series: ISeriesApi<TSeriesType, HorzScaleItem>;
+  /**
+   * Request an update (redraw the chart)
+   */
+  requestUpdate: () => void;
+}
+/**
+ * Represents the type of data that a series contains.
+ *
+ * For example a bar series contains {@link BarData} or {@link WhitespaceData}.
+ */
+export interface SeriesDataItemTypeMap<HorzScaleItem = Time> {
+  /**
+   * The types of bar series data.
+   */
+  Bar: BarData<HorzScaleItem> | WhitespaceData<HorzScaleItem>;
+  /**
+   * The types of candlestick series data.
+   */
+  Candlestick: CandlestickData<HorzScaleItem> | WhitespaceData<HorzScaleItem>;
+  /**
+   * The types of area series data.
+   */
+  Area: AreaData<HorzScaleItem> | WhitespaceData<HorzScaleItem>;
+  /**
+   * The types of baseline series data.
+   */
+  Baseline: BaselineData<HorzScaleItem> | WhitespaceData<HorzScaleItem>;
+  /**
+   * The types of line series data.
+   */
+  Line: LineData<HorzScaleItem> | WhitespaceData<HorzScaleItem>;
+  /**
+   * The types of histogram series data.
+   */
+  Histogram: HistogramData<HorzScaleItem> | WhitespaceData<HorzScaleItem>;
+  /**
+   * The base types of an custom series data.
+   */
+  Custom: CustomData<HorzScaleItem> | CustomSeriesWhitespaceData<HorzScaleItem>;
+}
+/**
+ * Represents a series marker.
+ */
+export interface SeriesMarker<TimeType> {
+  /**
+   * The time of the marker.
+   */
+  time: TimeType;
+  /**
+   * The position of the marker.
+   */
+  position: SeriesMarkerPosition;
+  /**
+   * The shape of the marker.
+   */
+  shape: SeriesMarkerShape;
+  /**
+   * The color of the marker.
+   */
+  color: string;
+  /**
+   * The ID of the marker.
+   */
+  id?: string;
+  /**
+   * The optional text of the marker.
+   */
+  text?: string;
+  /**
+   * The optional size of the marker.
+   *
+   * @defaultValue `1`
+   */
+  size?: number;
+}
+/**
+ * Represents options common for all types of series
+ */
+export interface SeriesOptionsCommon {
+  /**
+   * Visibility of the label with the latest visible price on the price scale.
+   *
+   * @defaultValue `true`
+   */
+  lastValueVisible: boolean;
+  /**
+   * You can name series when adding it to a chart. This name will be displayed on the label next to the last value label.
+   *
+   * @defaultValue `''`
+   */
+  title: string;
+  /**
+   * Target price scale to bind new series to.
+   *
+   * @defaultValue `'right'` if right scale is visible and `'left'` otherwise
+   */
+  priceScaleId?: string;
+  /**
+   * Visibility of the series.
+   * If the series is hidden, everything including price lines, baseline, price labels and markers, will also be hidden.
+   * Please note that hiding a series is not equivalent to deleting it, since hiding does not affect the timeline at all, unlike deleting where the timeline can be changed (some points can be deleted).
+   *
+   * @defaultValue `true`
+   */
+  visible: boolean;
+  /**
+   * Show the price line. Price line is a horizontal line indicating the last price of the series.
+   *
+   * @defaultValue `true`
+   */
+  priceLineVisible: boolean;
+  /**
+   * The source to use for the value of the price line.
+   *
+   * @defaultValue {@link PriceLineSource.LastBar}
+   */
+  priceLineSource: PriceLineSource;
+  /**
+   * Width of the price line.
+   *
+   * @defaultValue `1`
+   */
+  priceLineWidth: LineWidth;
+  /**
+   * Color of the price line.
+   * By default, its color is set by the last bar color (or by line color on Line and Area charts).
+   *
+   * @defaultValue `''`
+   */
+  priceLineColor: string;
+  /**
+   * Price line style.
+   *
+   * @defaultValue {@link LineStyle.Dashed}
+   */
+  priceLineStyle: LineStyle;
+  /**
+   * Price format.
+   *
+   * @defaultValue `{ type: 'price', precision: 2, minMove: 0.01 }`
+   */
+  priceFormat: PriceFormat;
+  /**
+   * Visibility of base line. Suitable for percentage and `IndexedTo100` scales.
+   *
+   * @defaultValue `true`
+   */
+  baseLineVisible: boolean;
+  /**
+   * Color of the base line in `IndexedTo100` mode.
+   *
+   * @defaultValue `'#B2B5BE'`
+   */
+  baseLineColor: string;
+  /**
+   * Base line width. Suitable for percentage and `IndexedTo10` scales.
+   *
+   * @defaultValue `1`
+   */
+  baseLineWidth: LineWidth;
+  /**
+   * Base line style. Suitable for percentage and indexedTo100 scales.
+   *
+   * @defaultValue {@link LineStyle.Solid}
+   */
+  baseLineStyle: LineStyle;
+  /**
+   * Override the default {@link AutoscaleInfo} provider.
+   * By default, the chart scales data automatically based on visible data range.
+   * However, for some reasons one could require overriding this behavior.
+   *
+   * @defaultValue `undefined`
+   * @example Use price range from 0 to 100 regardless the current visible range
+   * ```js
+   * const firstSeries = chart.addLineSeries({
+   *     autoscaleInfoProvider: () => ({
+   *         priceRange: {
+   *             minValue: 0,
+   *             maxValue: 100,
+   *         },
+   *     }),
+   * });
+   * ```
+   * @example Adding a small pixel margins to the price range
+   * ```js
+   * const firstSeries = chart.addLineSeries({
+   *     autoscaleInfoProvider: () => ({
+   *         priceRange: {
+   *             minValue: 0,
+   *             maxValue: 100,
+   *         },
+   *         margins: {
+   *             above: 10,
+   *             below: 10,
+   *         },
+   *     }),
+   * });
+   * ```
+   * @example Using the default implementation to adjust the result
+   * ```js
+   * const firstSeries = chart.addLineSeries({
+   *     autoscaleInfoProvider: original => {
+   *         const res = original();
+   *         if (res !== null) {
+   *             res.priceRange.minValue -= 10;
+   *             res.priceRange.maxValue += 10;
+   *         }
+   *         return res;
+   *     },
+   * });
+   * ```
+   */
+  autoscaleInfoProvider?: AutoscaleInfoProvider;
+}
+/**
+ * Represents the type of options for each series type.
+ *
+ * For example a bar series has options represented by {@link BarSeriesOptions}.
+ */
+export interface SeriesOptionsMap {
+  /**
+   * The type of bar series options.
+   */
+  Bar: BarSeriesOptions;
+  /**
+   * The type of candlestick series options.
+   */
+  Candlestick: CandlestickSeriesOptions;
+  /**
+   * The type of area series options.
+   */
+  Area: AreaSeriesOptions;
+  /**
+   * The type of baseline series options.
+   */
+  Baseline: BaselineSeriesOptions;
+  /**
+   * The type of line series options.
+   */
+  Line: LineSeriesOptions;
+  /**
+   * The type of histogram series options.
+   */
+  Histogram: HistogramSeriesOptions;
+  /**
+   * The type of a custom series options.
+   */
+  Custom: CustomSeriesOptions;
+}
+/**
+ * Represents the type of partial options for each series type.
+ *
+ * For example a bar series has options represented by {@link BarSeriesPartialOptions}.
+ */
+export interface SeriesPartialOptionsMap {
+  /**
+   * The type of bar series partial options.
+   */
+  Bar: BarSeriesPartialOptions;
+  /**
+   * The type of candlestick series partial options.
+   */
+  Candlestick: CandlestickSeriesPartialOptions;
+  /**
+   * The type of area series partial options.
+   */
+  Area: AreaSeriesPartialOptions;
+  /**
+   * The type of baseline series partial options.
+   */
+  Baseline: BaselineSeriesPartialOptions;
+  /**
+   * The type of line series partial options.
+   */
+  Line: LineSeriesPartialOptions;
+  /**
+   * The type of histogram series partial options.
+   */
+  Histogram: HistogramSeriesPartialOptions;
+  /**
+   * The type of a custom series partial options.
+   */
+  Custom: CustomSeriesPartialOptions;
+}
+/**
+ * A base interface for a data point of single-value series.
+ */
+export interface SingleValueData<HorzScaleItem = Time>
+  extends WhitespaceData<HorzScaleItem> {
+  /**
+   * The time of the data.
+   */
+  time: HorzScaleItem;
+  /**
+   * Price value of the data.
+   */
+  value: number;
+}
+/**
+ * Represents a solid color.
+ */
+export interface SolidColor {
+  /**
+   * Type of color.
+   */
+  type: ColorType.Solid;
+  /**
+   * Color.
+   */
+  color: string;
+}
+/**
+ * Tick mark for the horizontal scale.
+ */
+export interface TickMark {
+  /** Index */
+  index: TimePointIndex;
+  /** Time / Coordinate */
+  time: InternalHorzScaleItem;
+  /** Weight of the tick mark */
+  weight: TickMarkWeightValue;
+  /** Original value for the `time` property */
+  originalTime: unknown;
+}
+/**
+ * Options for chart with time at the horizontal scale
+ */
+export interface TimeChartOptions extends ChartOptionsImpl<Time> {
+  /**
+   * Extended time scale options with option to override tickMarkFormatter
+   */
+  timeScale: TimeScaleOptions;
+}
+/**
+ * Represents a tick mark on the horizontal (time) scale.
+ */
+export interface TimeMark {
+  /** Does time mark need to be aligned */
+  needAlignCoordinate: boolean;
+  /** Coordinate for the time mark */
+  coord: number;
+  /** Display label for the time mark */
+  label: string;
+  /** Weight of the time mark */
+  weight: TickMarkWeightValue;
+}
+/**
+ * Extended time scale options for time-based horizontal scale
+ */
+export interface TimeScaleOptions extends HorzScaleOptions {
+  /**
+   * Tick marks formatter can be used to customize tick marks labels on the time axis.
+   *
+   * @defaultValue `undefined`
+   */
+  tickMarkFormatter?: TickMarkFormatter;
+}
+/**
+ * Represents a point on the time scale
+ */
+export interface TimeScalePoint {
+  /** Weight of the point */
+  readonly timeWeight: TickMarkWeightValue;
+  /** Time of the point */
+  readonly time: InternalHorzScaleItem;
+  /** Original time for the point */
+  readonly originalTime: unknown;
+}
+/**
+ * The TouchMouseEventData interface represents events that occur due to the user interacting with a
+ * pointing device (such as a mouse).
+ * See {@link https://developer.mozilla.org/en-US/docs/Web/API/MouseEvent | MouseEvent}
+ */
+export interface TouchMouseEventData {
+  /**
+   * The X coordinate of the mouse pointer in local (DOM content) coordinates.
+   */
+  readonly clientX: Coordinate;
+  /**
+   * The Y coordinate of the mouse pointer in local (DOM content) coordinates.
+   */
+  readonly clientY: Coordinate;
+  /**
+   * The X coordinate of the mouse pointer relative to the whole document.
+   */
+  readonly pageX: Coordinate;
+  /**
+   * The Y coordinate of the mouse pointer relative to the whole document.
+   */
+  readonly pageY: Coordinate;
+  /**
+   * The X coordinate of the mouse pointer in global (screen) coordinates.
+   */
+  readonly screenX: Coordinate;
+  /**
+   * The Y coordinate of the mouse pointer in global (screen) coordinates.
+   */
+  readonly screenY: Coordinate;
+  /**
+   * The X coordinate of the mouse pointer relative to the chart / price axis / time axis canvas element.
+   */
+  readonly localX: Coordinate;
+  /**
+   * The Y coordinate of the mouse pointer relative to the chart / price axis / time axis canvas element.
+   */
+  readonly localY: Coordinate;
+  /**
+   * Returns a boolean value that is true if the Ctrl key was active when the key event was generated.
+   */
+  readonly ctrlKey: boolean;
+  /**
+   * Returns a boolean value that is true if the Alt (Option or ⌥ on macOS) key was active when the
+   * key event was generated.
+   */
+  readonly altKey: boolean;
+  /**
+   * Returns a boolean value that is true if the Shift key was active when the key event was generated.
+   */
+  readonly shiftKey: boolean;
+  /**
+   * Returns a boolean value that is true if the Meta key (on Mac keyboards, the ⌘ Command key; on
+   * Windows keyboards, the Windows key (⊞)) was active when the key event was generated.
+   */
+  readonly metaKey: boolean;
+}
+/**
+ * Represent options for the tracking mode's behavior.
+ *
+ * Mobile users will not have the ability to see the values/dates like they do on desktop.
+ * To see it, they should enter the tracking mode. The tracking mode will deactivate the scrolling
+ * and make it possible to check values and dates.
+ */
+export interface TrackingModeOptions {
+  /** @inheritDoc TrackingModeExitMode
+   *
+   * @defaultValue {@link TrackingModeExitMode.OnNextTap}
+   */
+  exitMode: TrackingModeExitMode;
+}
+/**
+ * Represents a vertical gradient of two colors.
+ */
+export interface VerticalGradientColor {
+  /**
+   * Type of color.
+   */
+  type: ColorType.VerticalGradient;
+  /**
+   * Top color
+   */
+  topColor: string;
+  /**
+   * Bottom color
+   */
+  bottomColor: string;
+}
+/** Watermark options. */
+export interface WatermarkOptions {
+  /**
+   * Watermark color.
+   *
+   * @defaultValue `'rgba(0, 0, 0, 0)'`
+   */
+  color: string;
+  /**
+   * Display the watermark.
+   *
+   * @defaultValue `false`
+   */
+  visible: boolean;
+  /**
+   * Text of the watermark. Word wrapping is not supported.
+   *
+   * @defaultValue `''`
+   */
+  text: string;
+  /**
+   * Font size in pixels.
+   *
+   * @defaultValue `48`
+   */
+  fontSize: number;
+  /**
+   * Font family.
+   *
+   * @defaultValue `-apple-system, BlinkMacSystemFont, 'Trebuchet MS', Roboto, Ubuntu, sans-serif`
+   */
+  fontFamily: string;
+  /**
+   * Font style.
+   *
+   * @defaultValue `''`
+   */
+  fontStyle: string;
+  /**
+   * Horizontal alignment inside the chart area.
+   *
+   * @defaultValue `'center'`
+   */
+  horzAlign: HorzAlign;
+  /**
+   * Vertical alignment inside the chart area.
+   *
+   * @defaultValue `'center'`
+   */
+  vertAlign: VertAlign;
+}
+/**
+ * Represents a whitespace data item, which is a data point without a value.
+ *
+ * @example
+ * ```js
+ * const data = [
+ *     { time: '2018-12-03', value: 27.02 },
+ *     { time: '2018-12-04' }, // whitespace
+ *     { time: '2018-12-05' }, // whitespace
+ *     { time: '2018-12-06' }, // whitespace
+ *     { time: '2018-12-07' }, // whitespace
+ *     { time: '2018-12-08', value: 23.92 },
+ *     { time: '2018-12-13', value: 30.74 },
+ * ];
+ * ```
+ */
+export interface WhitespaceData<HorzScaleItem = Time> {
+  /**
+   * The time of the data.
+   */
+  time: HorzScaleItem;
+  /**
+   * Additional custom values which will be ignored by the library, but
+   * could be used by plugins.
+   */
+  customValues?: Record<string, unknown>;
+}
+/**
+ * Represents area series options.
+ */
+export type AreaSeriesOptions = SeriesOptions<AreaStyleOptions>;
+/**
+ * Represents area series options where all properties are optional.
+ */
+export type AreaSeriesPartialOptions = SeriesPartialOptions<AreaStyleOptions>;
+/**
+ * A custom function used to get autoscale information.
+ *
+ * @param baseImplementation - The default implementation of autoscale algorithm, you can use it to adjust the result.
+ */
+export type AutoscaleInfoProvider = (
+  baseImplementation: () => AutoscaleInfo | null,
+) => AutoscaleInfo | null;
+/**
+ * Represents the background color of the chart.
+ */
+export type Background = SolidColor | VerticalGradientColor;
+/**
+ * Represents a price as a `number`.
+ */
+export type BarPrice = Nominal<number, "BarPrice">;
+/**
+ * Represents bar series options.
+ */
+export type BarSeriesOptions = SeriesOptions<BarStyleOptions>;
+/**
+ * Represents bar series options where all properties are options.
+ */
+export type BarSeriesPartialOptions = SeriesPartialOptions<BarStyleOptions>;
+/**
+ * Represents a type of a base value of baseline series type.
+ */
+export type BaseValueType = BaseValuePrice;
+/**
+ * Structure describing baseline series options.
+ */
+export type BaselineSeriesOptions = SeriesOptions<BaselineStyleOptions>;
+/**
+ * Represents baseline series options where all properties are options.
+ */
+export type BaselineSeriesPartialOptions =
+  SeriesPartialOptions<BaselineStyleOptions>;
+/**
+ * Represents candlestick series options.
+ */
+export type CandlestickSeriesOptions = SeriesOptions<CandlestickStyleOptions>;
+/**
+ * Represents candlestick series options where all properties are optional.
+ */
+export type CandlestickSeriesPartialOptions =
+  SeriesPartialOptions<CandlestickStyleOptions>;
+/**
+ * Structure describing options of the chart with time points at the horizontal scale. Series options are to be set separately
+ */
+export type ChartOptions = TimeChartOptions;
+/**
+ * Represents a coordiate as a `number`.
+ */
+export type Coordinate = Nominal<number, "Coordinate">;
+/**
+ * Price line options for the {@link ISeriesApi.createPriceLine} method.
+ *
+ * `price` is required, while the rest of the options are optional.
+ */
+export type CreatePriceLineOptions = Partial<PriceLineOptions> &
+  Pick<PriceLineOptions, "price">;
+/**
+ * Represents a custom series options.
+ */
+export type CustomSeriesOptions = SeriesOptions<CustomStyleOptions>;
+/**
+ * Represents a custom series options where all properties are optional.
+ */
+export type CustomSeriesPartialOptions =
+  SeriesPartialOptions<CustomStyleOptions>;
+/**
+ * Price values for the custom series. This list should include the largest, smallest, and current price values for the data point.
+ * The last value in the array will be used for the current value. You shouldn't need to
+ * have more than 3 values in this array since the library only needs a largest, smallest, and current value.
+ *
+ * Examples:
+ * - For a line series, this would contain a single number representing the current value.
+ * - For a candle series, this would contain the high, low, and close values. Where the last value would be the close value.
+ */
+export type CustomSeriesPricePlotValues = number[];
+/**
+ * A custom function use to handle data changed events.
+ */
+export type DataChangedHandler = (scope: DataChangedScope) => void;
+/**
+ * The extent of the data change.
+ */
+export type DataChangedScope = "full" | "update";
+/**
+ * Represents the type of data that a series contains.
+ */
+export type DataItem<HorzScaleItem> =
+  SeriesDataItemTypeMap<HorzScaleItem>[SeriesType];
+/**
+ * Represents a type `T` where every property is optional.
+ */
+export type DeepPartial<T> = {
+  [P in keyof T]?: T[P] extends (infer U)[]
+    ? DeepPartial<U>[]
+    : T[P] extends readonly (infer X)[]
+      ? readonly DeepPartial<X>[]
+      : DeepPartial<T[P]>;
+};
+/**
+ * Represents histogram series options.
+ */
+export type HistogramSeriesOptions = SeriesOptions<HistogramStyleOptions>;
+/**
+ * Represents histogram series options where all properties are optional.
+ */
+export type HistogramSeriesPartialOptions =
+  SeriesPartialOptions<HistogramStyleOptions>;
+/**
+ * Represents a horizontal alignment.
+ */
+export type HorzAlign = "left" | "center" | "right";
+/**
+ * Function for converting a horizontal scale item to an internal item.
+ */
+export type HorzScaleItemConverterToInternalObj<HorzScaleItem> = (
+  time: HorzScaleItem,
+) => InternalHorzScaleItem;
+/**
+ * Interface for series primitives. It must be implemented to add some external graphics to series.
+ */
+export type ISeriesPrimitive<HorzScaleItem = Time> = ISeriesPrimitiveBase<
+  SeriesAttachedParameter<HorzScaleItem, SeriesType>
+>;
+/**
+ * Internal Horizontal Scale Item
+ */
+export type InternalHorzScaleItem = Nominal<unknown, "InternalHorzScaleItem">;
+/**
+ * Index key for a horizontal scale item.
+ */
+export type InternalHorzScaleItemKey = Nominal<
+  number,
+  "InternalHorzScaleItemKey"
+>;
+/**
+ * Represents line series options.
+ */
+export type LineSeriesOptions = SeriesOptions<LineStyleOptions>;
+/**
+ * Represents line series options where all properties are optional.
+ */
+export type LineSeriesPartialOptions = SeriesPartialOptions<LineStyleOptions>;
+/**
+ * Represents the width of a line.
+ */
+export type LineWidth = 1 | 2 | 3 | 4;
+/**
+ * Represents the `to` or `from` number in a logical range.
+ */
+export type Logical = Nominal<number, "Logical">;
+/**
+ * A logical range is an object with 2 properties: `from` and `to`, which are numbers and represent logical indexes on the time scale.
+ *
+ * The starting point of the time scale's logical range is the first data item among all series.
+ * Before that point all indexes are negative, starting from that point - positive.
+ *
+ * Indexes might have fractional parts, for instance 4.2, due to the time-scale being continuous rather than discrete.
+ *
+ * Integer part of the logical index means index of the fully visible bar.
+ * Thus, if we have 5.2 as the last visible logical index (`to` field), that means that the last visible bar has index 5, but we also have partially visible (for 20%) 6th bar.
+ * Half (e.g. 1.5, 3.5, 10.5) means exactly a middle of the bar.
+ */
+export type LogicalRange = Range<Logical>;
+/**
+ * A custom function used to handle changes to the time scale's logical range.
+ */
+export type LogicalRangeChangeEventHandler = (
+  logicalRange: LogicalRange | null,
+) => void;
+/**
+ * A custom function use to handle mouse events.
+ */
+export type MouseEventHandler<HorzScaleItem> = (
+  param: MouseEventParams<HorzScaleItem>,
+) => void;
+/**
+ * Removes "readonly" from all properties
+ */
+export type Mutable<T> = {
+  -readonly [P in keyof T]: T[P];
+};
+/**
+ * This is the generic type useful for declaring a nominal type,
+ * which does not structurally matches with the base type and
+ * the other types declared over the same base type
+ *
+ * @example
+ * ```ts
+ * type Index = Nominal<number, 'Index'>;
+ * // let i: Index = 42; // this fails to compile
+ * let i: Index = 42 as Index; // OK
+ * ```
+ * @example
+ * ```ts
+ * type TagName = Nominal<string, 'TagName'>;
+ * ```
+ */
+export type Nominal<T, Name extends string> = T & {
+  /** The 'name' or species of the nominal. */
+  [Symbol.species]: Name;
+};
+/**
+ * Represents overlay price scale options.
+ */
+export type OverlayPriceScaleOptions = Omit<
+  PriceScaleOptions,
+  "visible" | "autoScale"
+>;
+/**
+ * A function used to format a percentage value as a string.
+ */
+export type PercentageFormatterFn = (percentageValue: number) => string;
+/**
+ * Represents information used to format prices.
+ */
+export type PriceFormat = PriceFormatBuiltIn | PriceFormatCustom;
+/**
+ * A function used to format a {@link BarPrice} as a string.
+ */
+export type PriceFormatterFn = (priceValue: BarPrice) => string;
+/**
+ * Converter function for changing prices into vertical coordinate values.
+ *
+ * This is provided as a convenience function since the series original data will most likely be defined
+ * in price values, and the renderer needs to draw with coordinates. This returns the same values as
+ * directly using the series' priceToCoordinate method.
+ */
+export type PriceToCoordinateConverter = (price: number) => Coordinate | null;
+/**
+ * Represents the position of a series marker relative to a bar.
+ */
+export type SeriesMarkerPosition = "aboveBar" | "belowBar" | "inBar";
+/**
+ * Represents the shape of a series marker.
+ */
+export type SeriesMarkerShape = "circle" | "square" | "arrowUp" | "arrowDown";
+/**
+ * Represents the intersection of a series type `T`'s options and common series options.
+ *
+ * @see {@link SeriesOptionsCommon} for common options.
+ */
+export type SeriesOptions<T> = T & SeriesOptionsCommon;
+/**
+ * Represents a {@link SeriesOptions} where every property is optional.
+ */
+export type SeriesPartialOptions<T> = DeepPartial<T & SeriesOptionsCommon>;
+/**
+ * Defines where in the visual layer stack the renderer should be executed.
+ *
+ * - `bottom`: Draw below everything except the background.
+ * - `normal`: Draw at the same level as the series.
+ * - `top`: Draw above everything (including the crosshair).
+ */
+export type SeriesPrimitivePaneViewZOrder = "bottom" | "normal" | "top";
+/**
+ * Represents a type of series.
+ *
+ * @see {@link SeriesOptionsMap}
+ */
+export type SeriesType = keyof SeriesOptionsMap;
+/**
+ * A custom function used to handle changes to the time scale's size.
+ */
+export type SizeChangeEventHandler = (width: number, height: number) => void;
+/**
+ * The `TickMarkFormatter` is used to customize tick mark labels on the time scale.
+ *
+ * This function should return `time` as a string formatted according to `tickMarkType` type (year, month, etc) and `locale`.
+ *
+ * Note that the returned string should be the shortest possible value and should have no more than 8 characters.
+ * Otherwise, the tick marks will overlap each other.
+ *
+ * If the formatter function returns `null` then the default tick mark formatter will be used as a fallback.
+ *
+ * @example
+ * ```js
+ * const customFormatter = (time, tickMarkType, locale) => {
+ *     // your code here
+ * };
+ * ```
+ */
+export type TickMarkFormatter = (
+  time: Time,
+  tickMarkType: TickMarkType,
+  locale: string,
+) => string | null;
+/**
+ * Weight of the tick mark. @see TickMarkWeight enum
+ */
+export type TickMarkWeightValue = Nominal<number, "TickMarkWeightValue">;
+/**
+ * The Time type is used to represent the time of data items.
+ *
+ * Values can be a {@link UTCTimestamp}, a {@link BusinessDay}, or a business day string in ISO format.
+ *
+ * @example
+ * ```js
+ * const timestamp = 1529899200; // Literal timestamp representing 2018-06-25T04:00:00.000Z
+ * const businessDay = { year: 2019, month: 6, day: 1 }; // June 1, 2019
+ * const businessDayString = '2021-02-03'; // Business day string literal
+ * ```
+ */
+export type Time = UTCTimestamp | BusinessDay | string;
+/**
+ * A custom function used to override formatting of a time to a string.
+ */
+export type TimeFormatterFn<HorzScaleItem = Time> = (
+  time: HorzScaleItem,
+) => string;
+/**
+ * Index for a point on the horizontal (time) scale.
+ */
+export type TimePointIndex = Nominal<number, "TimePointIndex">;
+/**
+ * A custom function used to handle changes to the time scale's time range.
+ */
+export type TimeRangeChangeEventHandler<HorzScaleItem> = (
+  timeRange: Range<HorzScaleItem> | null,
+) => void;
+/**
+ * Represents a time as a UNIX timestamp.
+ *
+ * If your chart displays an intraday interval you should use a UNIX Timestamp.
+ *
+ * Note that JavaScript Date APIs like `Date.now` return a number of milliseconds but UTCTimestamp expects a number of seconds.
+ *
+ * Note that to prevent errors, you should cast the numeric type of the time to `UTCTimestamp` type from the package (`value as UTCTimestamp`) in TypeScript code.
+ *
+ * @example
+ * ```ts
+ * const timestamp = 1529899200 as UTCTimestamp; // Literal timestamp representing 2018-06-25T04:00:00.000Z
+ * const timestamp2 = (Date.now() / 1000) as UTCTimestamp;
+ * ```
+ */
+export type UTCTimestamp = Nominal<number, "UTCTimestamp">;
+/**
+ * Represents a vertical alignment.
+ */
+export type VertAlign = "top" | "center" | "bottom";
+/**
+ * Represents a visible price scale's options.
+ *
+ * @see {@link PriceScaleOptions}
+ */
+export type VisiblePriceScaleOptions = PriceScaleOptions;
+
+export {};
diff --git a/src/website/packages/lightweight-charts/wrapper.js b/src/website/packages/lightweight-charts/wrapper.js
index 21513fea9..4a04d2149 100644
--- a/src/website/packages/lightweight-charts/wrapper.js
+++ b/src/website/packages/lightweight-charts/wrapper.js
@@ -1,7 +1,7 @@
 // @ts-check
 
 /**
- * @import { DeepPartial, ChartOptions, IChartApi, IHorzScaleBehavior, WhitespaceData, SingleValueData, ISeriesApi, Time, LogicalRange, SeriesType, BaselineStyleOptions, SeriesOptionsCommon, createChart as CreateClassicChart, createChartEx as CreateCustomChart } from "./v4.2.0/types"
+ * @import { DeepPartial, ChartOptions, IChartApi, IHorzScaleBehavior, WhitespaceData, SingleValueData, ISeriesApi, Time, LogicalRange, SeriesType, BaselineStyleOptions, SeriesOptionsCommon, createChart as CreateClassicChart, createChartEx as CreateCustomChart } from "./v4.2.2/types"
  */
 
 const ids = {
@@ -16,7 +16,7 @@ const ids = {
   },
 };
 
-export default import("./v4.2.0/script.js").then((lightweightCharts) => {
+export default import("./v4.2.2/script.js").then((lightweightCharts) => {
   const createClassicChart = /** @type {CreateClassicChart} */ (
     lightweightCharts.createChart
   );
diff --git a/src/website/scripts/main.js b/src/website/scripts/main.js
index 17edce5b5..20dc050d4 100644
--- a/src/website/scripts/main.js
+++ b/src/website/scripts/main.js
@@ -2,10 +2,10 @@
 
 /**
  * @import { Option, ResourceDataset, TimeScale, TimeRange, Unit, Weighted, DatasetPath, OHLC, FetchedJSON, DatasetValue, FetchedResult, AnyDatasetPath, Color, DatasetCandlestickData, PartialChartOption, ChartOption, AnyPartialOption, ProcessedOptionAddons, OptionsTree, AnyPath, SimulationOption, Frequency, LastValues } from "./types/self"
- * @import {createChart as CreateClassicChart, createChartEx as CreateCustomChart, LineStyleOptions } from "../packages/lightweight-charts/v4.2.0/types";
+ * @import {createChart as CreateClassicChart, createChartEx as CreateCustomChart, LineStyleOptions } from "../packages/lightweight-charts/v4.2.2/types";
  * @import { Marker,  CreatePaneParameters,  HoveredLegend, ChartPane, SplitSeries, SingleSeries, CreateSplitSeriesParameters, LineSeriesBlueprint, CandlestickSeriesBlueprint, BaselineSeriesBlueprint, CreateBaseSeriesParameters, BaseSeries, RemoveSeriesBlueprintFluff, SplitSeriesBlueprint, AnySeries, PriceSeriesType } from "../packages/lightweight-charts/types";
  * @import * as _ from "../packages/ufuzzy/v1.0.14/types"
- * @import { DeepPartial, ChartOptions, IChartApi, IHorzScaleBehavior, WhitespaceData, SingleValueData, ISeriesApi, Time, LineData, LogicalRange, SeriesMarker, CandlestickData, SeriesType, BaselineStyleOptions, SeriesOptionsCommon } from "../packages/lightweight-charts/v4.2.0/types"
+ * @import { DeepPartial, ChartOptions, IChartApi, IHorzScaleBehavior, WhitespaceData, SingleValueData, ISeriesApi, Time, LineData, LogicalRange, SeriesMarker, CandlestickData, SeriesType, BaselineStyleOptions, SeriesOptionsCommon } from "../packages/lightweight-charts/v4.2.2/types"
  * @import { DatePath, HeightPath, LastPath } from "./types/paths";
  * @import { SignalOptions } from "../packages/solid-signals/2024-11-02/types/core/core"
  * @import { getOwner as GetOwner, onCleanup as OnCleanup, Owner } from "../packages/solid-signals/2024-11-02/types/core/owner"
diff --git a/src/website/scripts/service-worker.js b/src/website/scripts/service-worker.js
index 35e78fd55..b6199e231 100644
--- a/src/website/scripts/service-worker.js
+++ b/src/website/scripts/service-worker.js
@@ -20,7 +20,7 @@ self.addEventListener("install", (_event) => {
         "/scripts/simulation.js",
         "/styles/simulation.css",
         "/packages/lean-qr/v2.3.4/script.js",
-        "/packages/lightweight-charts/v4.2.0/script.js",
+        "/packages/lightweight-charts/v4.2.2/script.js",
         "/packages/solid-signals/2024-11-02/script.js",
         "/packages/ufuzzy/v1.0.14/script.js",
       ]);
diff --git a/src/website/scripts/types/self.d.ts b/src/website/scripts/types/self.d.ts
index fed6f9b4f..9e5637458 100644
--- a/src/website/scripts/types/self.d.ts
+++ b/src/website/scripts/types/self.d.ts
@@ -15,7 +15,7 @@ import {
   SeriesType,
   ISeriesApi,
   BaselineData,
-} from "../../packages/lightweight-charts/v4.2.0/types";
+} from "../../packages/lightweight-charts/v4.2.2/types";
 import { DatePath, HeightPath, LastPath } from "./paths";
 import { AnyPossibleCohortId } from "../options";
 import { Signal } from "../../packages/solid-signals/types";

From 481f5c0a97e1b8dfd179b016df9092f340ec8cae Mon Sep 17 00:00:00 2001
From: nym21 <expat-epochs0i@icloud.com>
Date: Fri, 27 Dec 2024 12:28:27 +0100
Subject: [PATCH 12/63] server: add support for dataset by timestamp

---
 CHANGELOG.md                        |   1 +
 src/parser/actions/iter_blocks.rs   |   4 +-
 src/parser/actions/parse.rs         |   2 +-
 src/parser/price/binance.rs         |   2 +-
 src/parser/price/kraken.rs          |   2 +-
 src/server/api/handlers/dataset.rs  | 222 ++++++++++++++++++++--------
 src/server/api/structs/extension.rs |   2 +-
 src/server/api/structs/kind.rs      |  13 +-
 src/server/header_map.rs            |  37 ++---
 src/server/mod.rs                   |   1 +
 src/server/response.rs              |  20 +++
 src/server/website/handlers/file.rs |  13 +-
 src/structs/config.rs               |   5 +-
 src/structs/date.rs                 |   2 +-
 src/structs/generic_map.rs          |   4 +-
 src/structs/serialized_btreemap.rs  |   3 +-
 src/structs/serialized_vec.rs       |   6 +
 src/structs/timestamp.rs            |  64 +++++++-
 src/utils/retry.rs                  |   4 -
 19 files changed, 286 insertions(+), 121 deletions(-)
 create mode 100644 src/server/response.rs

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 46d6696cd..da7793865 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@
 - Reworked server's API code [#6ab0f46]( https://github.com/kibo-money/kibo/commit/6ab0f463119a902a1b7ca9691b54f61543bb8f2f)
   - New route format: `/api/date-to-realized-price` is now `/api/realized-price?kind=date`
   - Added status and timing to logs
+- Updated website packages
 
 ## Git
 
diff --git a/src/parser/actions/iter_blocks.rs b/src/parser/actions/iter_blocks.rs
index 909a37ac9..de9b630b2 100644
--- a/src/parser/actions/iter_blocks.rs
+++ b/src/parser/actions/iter_blocks.rs
@@ -72,7 +72,7 @@ pub fn iter_blocks(
                 if let Some((_current_block_height, current_block, _current_block_hash)) =
                     current_block_opt
                 {
-                    let timestamp = Timestamp::wrap(current_block.header.time);
+                    let timestamp = Timestamp::from(current_block.header.time);
 
                     let current_block_date = timestamp.to_date();
                     let current_block_height: Height = height + blocks_loop_i;
@@ -83,7 +83,7 @@ pub fn iter_blocks(
                     }
 
                     next_date_opt = next_block_opt.as_ref().map(|(_, next_block, _)| {
-                        Timestamp::wrap(next_block.header.time).to_date()
+                        Timestamp::from(next_block.header.time).to_date()
                     });
 
                     // Always run for the first block of the loop
diff --git a/src/parser/actions/parse.rs b/src/parser/actions/parse.rs
index 39e5207e8..f3f94ed7a 100644
--- a/src/parser/actions/parse.rs
+++ b/src/parser/actions/parse.rs
@@ -61,7 +61,7 @@ pub fn parse(
 ) {
     // log(&format!("{height}"));
 
-    let timestamp = Timestamp::wrap(block.header.time);
+    let timestamp = Timestamp::from(block.header.time);
 
     // If false, expect that the code is flawless
     // or create a 0 value txid database
diff --git a/src/parser/price/binance.rs b/src/parser/price/binance.rs
index 3075f010d..304a5db4a 100644
--- a/src/parser/price/binance.rs
+++ b/src/parser/price/binance.rs
@@ -171,7 +171,7 @@ impl Binance {
                         // [timestamp, open, high, low, close, volume, ...]
                         let array = value.as_array().unwrap();
 
-                        let date = Timestamp::wrap(
+                        let date = Timestamp::from(
                             (array.first().unwrap().as_u64().unwrap() / 1_000) as u32,
                         )
                         .to_date();
diff --git a/src/parser/price/kraken.rs b/src/parser/price/kraken.rs
index dc7e403f4..d308b7f27 100644
--- a/src/parser/price/kraken.rs
+++ b/src/parser/price/kraken.rs
@@ -91,7 +91,7 @@ impl Kraken {
                     .map(|value| {
                         let array = value.as_array().unwrap();
 
-                        let date = Timestamp::wrap(array.first().unwrap().as_u64().unwrap() as u32)
+                        let date = Timestamp::from(array.first().unwrap().as_u64().unwrap() as u32)
                             .to_date();
 
                         let get_f32 = |index: usize| {
diff --git a/src/server/api/handlers/dataset.rs b/src/server/api/handlers/dataset.rs
index e547a44dd..b7cc4154e 100644
--- a/src/server/api/handlers/dataset.rs
+++ b/src/server/api/handlers/dataset.rs
@@ -1,6 +1,7 @@
 use std::{fmt::Debug, path::PathBuf, time::Instant};
 
 use axum::{
+    body::Body,
     extract::{Path, Query, State},
     http::HeaderMap,
     response::{IntoResponse, Response},
@@ -14,15 +15,19 @@ use serde::{de::DeserializeOwned, Deserialize, Serialize};
 use crate::{
     server::{
         api::{
-            structs::{ChunkMetadata, DatasetRange, DatasetRangeChunk, Extension, Kind, Route},
+            structs::{
+                ChunkMetadata, DatasetRange, DatasetRangeChunk, Extension, Kind, Route, Routes,
+            },
             API_URL_PREFIX,
         },
-        header_map::HeaderMapUtils,
-        log_result, AppState,
+        header_map::{HeaderMapExtended, Modified},
+        log_result,
+        response::ResponseExtended,
+        AppState,
     },
     structs::{
-        Date, GenericMap, Height, MapChunkId, MapKey, MapSerialized, MapValue, SerializedDateMap,
-        SerializedVec, OHLC,
+        Date, GenericMap, Height, HeightMapChunkId, MapChunkId, MapKey, MapSerialized, MapValue,
+        SerializedBTreeMap, SerializedDateMap, SerializedTimeMap, SerializedVec, Timestamp, OHLC,
     },
 };
 
@@ -86,19 +91,17 @@ fn result_handler(
 
     let type_name = route.type_name.as_str();
     Ok(match type_name {
-        "u8" => typed_handler::<u8>(headers, id, ext, query, route)?,
-        "u16" => typed_handler::<u16>(headers, id, ext, query, route)?,
-        "u32" => typed_handler::<u32>(headers, id, ext, query, route)?,
-        "u64" => typed_handler::<u64>(headers, id, ext, query, route)?,
-        "usize" => typed_handler::<usize>(headers, id, ext, query, route)?,
-        "f32" => typed_handler::<f32>(headers, id, ext, query, route)?,
-        "f64" => typed_handler::<f64>(headers, id, ext, query, route)?,
-        "OHLC" => typed_handler::<OHLC>(headers, id, ext, query, route)?,
-        "Date" => typed_handler::<Date>(headers, id, ext, query, route)?,
-        "Height" => typed_handler::<Height>(headers, id, ext, query, route)?,
-        // "Value" => {
-        //     value_to_response::<serde_json::Value>(Json::import(&route.file_path)?, extension)
-        // }
+        "u8" => typed_handler::<u8>(headers, id, ext, query, route, &routes)?,
+        "u16" => typed_handler::<u16>(headers, id, ext, query, route, &routes)?,
+        "u32" => typed_handler::<u32>(headers, id, ext, query, route, &routes)?,
+        "u64" => typed_handler::<u64>(headers, id, ext, query, route, &routes)?,
+        "usize" => typed_handler::<usize>(headers, id, ext, query, route, &routes)?,
+        "f32" => typed_handler::<f32>(headers, id, ext, query, route, &routes)?,
+        "f64" => typed_handler::<f64>(headers, id, ext, query, route, &routes)?,
+        "OHLC" => typed_handler::<OHLC>(headers, id, ext, query, route, &routes)?,
+        "Date" => typed_handler::<Date>(headers, id, ext, query, route, &routes)?,
+        "Height" => typed_handler::<Height>(headers, id, ext, query, route, &routes)?,
+        "Timestamp" => typed_handler::<Timestamp>(headers, id, ext, query, route, &routes)?,
         _ => panic!("Incompatible type: {type_name}"),
     })
 }
@@ -109,6 +112,7 @@ fn typed_handler<T>(
     ext: Option<Extension>,
     query: &Query<DatasetParams>,
     route: &Route,
+    routes: &Routes,
 ) -> color_eyre::Result<Response>
 where
     T: Serialize + Debug + DeserializeOwned + Decode + MapValue,
@@ -121,26 +125,97 @@ where
     let range = DatasetRange::try_from(query)?;
 
     let (mut response, date_modified) = match kind {
-        Kind::Date => map_to_response::<Date, T, _, SerializedDateMap<T>>(
-            id, headers, route, &ext, range, query,
-        ),
-        Kind::Height => map_to_response::<Height, T, _, SerializedVec<T>>(
-            id, headers, route, &ext, range, query,
-        ),
         Kind::Last => {
             let last_value: T = route.serialization.import(&route.path.join("last"))?;
             return Ok(axum::response::Json(last_value).into_response());
         }
-    }?;
+        Kind::Date => match read_serialized::<Date, T, _, SerializedDateMap<T>>(
+            id, &headers, route, &range, query,
+        )? {
+            ReadSerialized::DatasetAndDate((dataset, date, chunk_meta)) => {
+                (serialized_to_response(dataset, id, chunk_meta, ext), date)
+            }
+            ReadSerialized::NotModified => return Ok(Response::new_not_modified()),
+            ReadSerialized::_Phantom(_) => unreachable!(),
+        },
+        Kind::Height => match read_serialized::<Height, T, _, SerializedVec<T>>(
+            id, &headers, route, &range, query,
+        )? {
+            ReadSerialized::DatasetAndDate((dataset, date, chunk_meta)) => (
+                serialized_to_response::<Height, T, _, SerializedVec<T>>(
+                    dataset, id, chunk_meta, ext,
+                ),
+                date,
+            ),
+            ReadSerialized::NotModified => return Ok(Response::new_not_modified()),
+            ReadSerialized::_Phantom(_) => unreachable!(),
+        },
+        Kind::Timestamp => {
+            let (dataset, date, chunk_meta) = match read_serialized::<Height, T, _, SerializedVec<T>>(
+                id, &headers, route, &range, query,
+            )? {
+                ReadSerialized::DatasetAndDate(tuple) => tuple,
+                ReadSerialized::NotModified => return Ok(Response::new_not_modified()),
+                ReadSerialized::_Phantom(_) => unreachable!(),
+            };
+
+            let (timestamp_dataset, _, _) =
+                match read_serialized::<Height, Timestamp, _, SerializedVec<Timestamp>>(
+                    "timestamp",
+                    &headers,
+                    routes.get("timestamp").unwrap(),
+                    &range,
+                    query,
+                )? {
+                    ReadSerialized::DatasetAndDate(tuple) => tuple,
+                    ReadSerialized::NotModified => return Ok(Response::new_not_modified()),
+                    ReadSerialized::_Phantom(_) => unreachable!(),
+                };
+
+            let mut serialized_timemap: SerializedTimeMap<T> = SerializedBTreeMap::default();
+
+            dataset
+                .map
+                .into_iter()
+                .enumerate()
+                .for_each(|(index, value)| {
+                    serialized_timemap.map.insert(
+                        timestamp_dataset
+                            .get_index(index)
+                            .cloned()
+                            .unwrap_or(Timestamp::now()),
+                        value,
+                    );
+                });
+
+            (
+                serialized_to_response::<Timestamp, T, HeightMapChunkId, SerializedTimeMap<T>>(
+                    serialized_timemap,
+                    id,
+                    chunk_meta,
+                    ext,
+                ),
+                date,
+            )
+
+            // let m = read_serialized::<Height, T, _, SerializedVec<T>>(
+            //     id, &headers, route, &range, query,
+            // )?;
+            // let t = read_serialized::<Height, Timestamp, _, SerializedVec<Timestamp>>(
+            //     "timestamp",
+            //     &headers,
+            //     routes.get("timestamp").unwrap(),
+            //     &range,
+            //     query,
+            // );
+            // t
+        }
+    };
 
-    let status_ok = response.status() == StatusCode::OK;
     let headers = response.headers_mut();
 
     headers.insert_cors();
-
-    if status_ok {
-        headers.insert_last_modified(date_modified);
-    }
+    headers.insert_last_modified(date_modified);
 
     match ext {
         Some(extension) => {
@@ -156,14 +231,51 @@ where
     Ok(response)
 }
 
-fn map_to_response<Key, Value, ChunkId, Serialized>(
+fn serialized_to_response<Key, Value, ChunkId, Serialized>(
+    dataset: Serialized,
     id: &str,
-    headers: HeaderMap,
+    chunk_meta: Option<ChunkMetadata>,
+    ext: Option<Extension>,
+) -> Response<Body>
+where
+    Key: MapKey<ChunkId>,
+    Value: MapValue,
+    ChunkId: MapChunkId,
+    Serialized: MapSerialized<Key, Value, ChunkId>,
+{
+    if ext == Some(Extension::CSV) {
+        dataset.to_csv(id).into_response()
+    } else if let Some(chunk) = chunk_meta {
+        axum::response::Json(SerializedMapChunk {
+            chunk,
+            map: dataset.map(),
+            version: dataset.version(),
+        })
+        .into_response()
+    } else {
+        axum::response::Json(dataset).into_response()
+    }
+}
+
+enum ReadSerialized<Key, Value, ChunkId, Serialized>
+where
+    Key: MapKey<ChunkId>,
+    Value: MapValue,
+    ChunkId: MapChunkId,
+    Serialized: MapSerialized<Key, Value, ChunkId>,
+{
+    DatasetAndDate((Serialized, DateTime<Utc>, Option<ChunkMetadata>)),
+    NotModified,
+    _Phantom((Key, Value, ChunkId)),
+}
+
+fn read_serialized<Key, Value, ChunkId, Serialized>(
+    id: &str,
+    headers: &HeaderMap,
     route: &Route,
-    ext: &Option<Extension>,
-    range: DatasetRange,
+    range: &DatasetRange,
     query: &Query<DatasetParams>,
-) -> color_eyre::Result<(Response, DateTime<Utc>)>
+) -> color_eyre::Result<ReadSerialized<Key, Value, ChunkId, Serialized>>
 where
     Key: MapKey<ChunkId>,
     Value: MapValue,
@@ -188,7 +300,7 @@ where
                     .context("Last tuple of dataset directory")?
                     .0
             }
-            DatasetRangeChunk::Chunk(chunk) => ChunkId::from_usize(chunk),
+            DatasetRangeChunk::Chunk(chunk) => ChunkId::from_usize(*chunk),
         };
 
         let chunk_path = datasets.get(&chunk_id);
@@ -197,12 +309,11 @@ where
         }
         let chunk_path = chunk_path.unwrap();
 
-        let (date, response) = headers.check_if_modified_since(chunk_path)?;
-        date_modified = date;
-
-        if let Some(response) = response {
-            return Ok((response, date_modified));
+        let (modified, date) = headers.check_if_modified_since(chunk_path)?;
+        if modified == Modified::NotModifiedSince {
+            return Ok(ReadSerialized::NotModified);
         }
+        date_modified = date;
 
         let to_url = |chunk: Option<ChunkId>| {
             chunk.and_then(|chunk| {
@@ -237,30 +348,21 @@ where
             })
             .context("Expect to find newest file")?;
 
-        let (date, response) = headers.check_if_modified_since(newest_file)?;
-        date_modified = date;
-
-        if let Some(response) = response {
-            return Ok((response, date_modified));
+        let (modified, date) = headers.check_if_modified_since(newest_file)?;
+        if modified == Modified::NotModifiedSince {
+            return Ok(ReadSerialized::NotModified);
         }
 
+        date_modified = date;
+
         Serialized::import_all(&folder_path, serialization)
     };
 
-    let response = if *ext == Some(Extension::CSV) {
-        dataset.to_csv(id).into_response()
-    } else if let Some(chunk) = chunk_meta {
-        axum::response::Json(SerializedMapChunk {
-            chunk,
-            map: dataset.map(),
-            version: dataset.version(),
-        })
-        .into_response()
-    } else {
-        axum::response::Json(dataset).into_response()
-    };
-
-    Ok((response, date_modified))
+    Ok(ReadSerialized::DatasetAndDate((
+        dataset,
+        date_modified,
+        chunk_meta,
+    )))
 }
 
 #[derive(Serialize)]
diff --git a/src/server/api/structs/extension.rs b/src/server/api/structs/extension.rs
index 21a7477c4..1a4d5a33c 100644
--- a/src/server/api/structs/extension.rs
+++ b/src/server/api/structs/extension.rs
@@ -1,6 +1,6 @@
 use std::path::Path;
 
-#[derive(PartialEq, Eq)]
+#[derive(PartialEq, Eq, Clone, Copy)]
 pub enum Extension {
     #[allow(clippy::upper_case_acronyms)]
     CSV,
diff --git a/src/server/api/structs/kind.rs b/src/server/api/structs/kind.rs
index ab25dc6f0..67456ceb5 100644
--- a/src/server/api/structs/kind.rs
+++ b/src/server/api/structs/kind.rs
@@ -9,6 +9,7 @@ use crate::structs::{AnyMap, Date, Height, MapKey};
 pub enum Kind {
     Date,
     Height,
+    Timestamp,
     Last,
 }
 
@@ -25,6 +26,7 @@ impl TryFrom<&String> for Kind {
             {
                 'd' => Self::Date,
                 'h' => Self::Height,
+                't' => Self::Timestamp,
                 'l' => Self::Last,
                 _ => return Err(eyre!("Bad kind")),
             },
@@ -40,6 +42,7 @@ impl From<&(dyn AnyMap + Send + Sync)> for BTreeSet<Kind> {
         }
         if map.key_name() == Height::map_name() {
             s.insert(Kind::Height);
+            s.insert(Kind::Timestamp);
         }
         if map.last_value().is_some() {
             s.insert(Kind::Last);
@@ -47,13 +50,3 @@ impl From<&(dyn AnyMap + Send + Sync)> for BTreeSet<Kind> {
         s
     }
 }
-
-// impl std::fmt::Display for Kind {
-//     fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-//         match *self {
-//             Self::Date => write!(f, "date"),
-//             Self::Height => write!(f, "height"),
-//             Self::Last => write!(f, "last"),
-//         }
-//     }
-// }
diff --git a/src/server/header_map.rs b/src/server/header_map.rs
index 837ec6132..c9b63c42c 100644
--- a/src/server/header_map.rs
+++ b/src/server/header_map.rs
@@ -1,21 +1,20 @@
 use std::path::Path;
 
-use axum::{
-    body::Body,
-    http::{header, HeaderMap, Response},
-    response::IntoResponse,
-};
+use axum::http::{header, HeaderMap};
 use chrono::{DateTime, Timelike, Utc};
 use log::info;
-use reqwest::{
-    header::{HOST, IF_MODIFIED_SINCE},
-    StatusCode,
-};
+use reqwest::header::{HOST, IF_MODIFIED_SINCE};
 
 const STALE_IF_ERROR: u64 = 30_000_000; // 1 Year ish
 const MODIFIED_SINCE_FORMAT: &str = "%a, %d %b %Y %H:%M:%S GMT";
 
-pub trait HeaderMapUtils {
+#[derive(PartialEq, Eq)]
+pub enum Modified {
+    ModifiedSince,
+    NotModifiedSince,
+}
+
+pub trait HeaderMapExtended {
     fn get_scheme(&self) -> &str;
     fn get_host(&self) -> &str;
     fn check_if_host_is_any_local(&self) -> bool;
@@ -25,10 +24,8 @@ pub trait HeaderMapUtils {
     fn insert_cors(&mut self);
 
     fn get_if_modified_since(&self) -> Option<DateTime<Utc>>;
-    fn check_if_modified_since(
-        &self,
-        path: &Path,
-    ) -> color_eyre::Result<(DateTime<Utc>, Option<Response<Body>>)>;
+    fn check_if_modified_since(&self, path: &Path)
+        -> color_eyre::Result<(Modified, DateTime<Utc>)>;
 
     fn insert_cache_control_immutable(&mut self);
     #[allow(unused)]
@@ -52,7 +49,7 @@ pub trait HeaderMapUtils {
     fn insert_content_type_font_woff2(&mut self);
 }
 
-impl HeaderMapUtils for HeaderMap {
+impl HeaderMapExtended for HeaderMap {
     fn get_scheme(&self) -> &str {
         if self.check_if_host_is_any_local() {
             "http"
@@ -114,22 +111,18 @@ impl HeaderMapUtils for HeaderMap {
     fn check_if_modified_since(
         &self,
         path: &Path,
-    ) -> color_eyre::Result<(DateTime<Utc>, Option<Response<Body>>)> {
+    ) -> color_eyre::Result<(Modified, DateTime<Utc>)> {
         let time = path.metadata()?.modified()?;
         let date: DateTime<Utc> = time.into();
         let date = date.with_nanosecond(0).unwrap();
-        let mut response_opt = None;
 
         if let Some(if_modified_since) = self.get_if_modified_since() {
             if if_modified_since == date {
-                let mut response = (StatusCode::NOT_MODIFIED, "").into_response();
-                let headers = response.headers_mut();
-                headers.insert_cors();
-                response_opt.replace(response);
+                return Ok((Modified::NotModifiedSince, date));
             }
         }
 
-        Ok((date, response_opt))
+        Ok((Modified::ModifiedSince, date))
     }
 
     fn get_if_modified_since(&self) -> Option<DateTime<Utc>> {
diff --git a/src/server/mod.rs b/src/server/mod.rs
index 9284ae71c..6cdd0422e 100644
--- a/src/server/mod.rs
+++ b/src/server/mod.rs
@@ -13,6 +13,7 @@ use crate::structs::Config;
 
 pub mod api;
 mod header_map;
+mod response;
 mod website;
 
 #[derive(Clone)]
diff --git a/src/server/response.rs b/src/server/response.rs
new file mode 100644
index 000000000..78f7c3bfc
--- /dev/null
+++ b/src/server/response.rs
@@ -0,0 +1,20 @@
+use axum::{body::Body, http::Response, response::IntoResponse};
+use reqwest::StatusCode;
+
+use super::header_map::HeaderMapExtended;
+
+pub trait ResponseExtended
+where
+    Self: Sized,
+{
+    fn new_not_modified() -> Self;
+}
+
+impl ResponseExtended for Response<Body> {
+    fn new_not_modified() -> Response<Body> {
+        let mut response = (StatusCode::NOT_MODIFIED, "").into_response();
+        let headers = response.headers_mut();
+        headers.insert_cors();
+        response
+    }
+}
diff --git a/src/server/website/handlers/file.rs b/src/server/website/handlers/file.rs
index 125e7136c..c2788c951 100644
--- a/src/server/website/handlers/file.rs
+++ b/src/server/website/handlers/file.rs
@@ -13,7 +13,11 @@ use axum::{
 use log::{error, info};
 use reqwest::StatusCode;
 
-use crate::server::{header_map::HeaderMapUtils, log_result};
+use crate::server::{
+    header_map::{HeaderMapExtended, Modified},
+    log_result,
+    response::ResponseExtended,
+};
 
 use super::minify_js;
 
@@ -80,10 +84,9 @@ fn path_to_response(headers: &HeaderMap, path: &Path) -> Response {
 }
 
 fn _path_to_response(headers: &HeaderMap, path: &Path) -> color_eyre::Result<Response> {
-    let (date, response) = headers.check_if_modified_since(path)?;
-
-    if let Some(response) = response {
-        return Ok(response);
+    let (modified, date) = headers.check_if_modified_since(path)?;
+    if modified == Modified::NotModifiedSince {
+        return Ok(Response::new_not_modified());
     }
 
     let mut response;
diff --git a/src/structs/config.rs b/src/structs/config.rs
index f51af3a0d..89ac372e1 100644
--- a/src/structs/config.rs
+++ b/src/structs/config.rs
@@ -77,6 +77,7 @@ pub struct Config {
 
 impl Config {
     pub const DATASET_DIR_NAME: &str = "datasets";
+    pub const DATABASES_DIR_NAME: &str = "databases";
 
     pub fn import() -> color_eyre::Result<Self> {
         let path = Self::path_dot_kibo();
@@ -285,7 +286,7 @@ impl Config {
     }
 
     pub fn path_datasets(&self) -> MapPath {
-        MapPath::from(self.path_kibodir().join("datasets"))
+        MapPath::from(self.path_kibodir().join(Self::DATASET_DIR_NAME))
     }
 
     pub fn path_datasets_last_values(&self) -> MapPath {
@@ -297,7 +298,7 @@ impl Config {
     }
 
     pub fn path_databases(&self) -> PathBuf {
-        self.path_kibodir().join(Self::DATASET_DIR_NAME)
+        self.path_kibodir().join(Self::DATABASES_DIR_NAME)
     }
 
     pub fn path_states(&self) -> PathBuf {
diff --git a/src/structs/date.rs b/src/structs/date.rs
index fd3f0f77f..b99e933a4 100644
--- a/src/structs/date.rs
+++ b/src/structs/date.rs
@@ -49,7 +49,7 @@ impl Date {
     }
 
     pub fn to_timestamp(self) -> Timestamp {
-        Timestamp::wrap(NaiveDateTime::from(*self).and_utc().timestamp() as u32)
+        Timestamp::from(NaiveDateTime::from(*self).and_utc().timestamp() as u32)
     }
 
     /// Returns value between 0.0 and 1.0 depending on its completion
diff --git a/src/structs/generic_map.rs b/src/structs/generic_map.rs
index 6cdb099f6..f15c92e05 100644
--- a/src/structs/generic_map.rs
+++ b/src/structs/generic_map.rs
@@ -322,8 +322,8 @@ where
     fn id(&self, config: &Config) -> String {
         let path_to_string = |p: &Path| p.to_str().unwrap().to_owned();
         path_to_string(self.path_parent())
-            .replace(&path_to_string(&config.path_kibodir()), "")
-            .replace(&format!("/{}/", Config::DATASET_DIR_NAME), "")
+            .replace(&format!("{}/", path_to_string(&config.path_kibodir())), "")
+            .replace(&format!("{}/", Config::DATASET_DIR_NAME), "")
             .replace("/", "-")
     }
 
diff --git a/src/structs/serialized_btreemap.rs b/src/structs/serialized_btreemap.rs
index e70fb953d..3b5b730d4 100644
--- a/src/structs/serialized_btreemap.rs
+++ b/src/structs/serialized_btreemap.rs
@@ -6,9 +6,10 @@ use serde::{de::DeserializeOwned, Deserialize, Serialize};
 
 use crate::io::Serialization;
 
-use super::{Date, DateMap, MapChunkId, MapKey, MapSerialized, MapValue};
+use super::{Date, DateMap, MapChunkId, MapKey, MapSerialized, MapValue, Timestamp};
 
 pub type SerializedDateMap<T> = SerializedBTreeMap<Date, T>;
+pub type SerializedTimeMap<T> = SerializedBTreeMap<Timestamp, T>;
 
 #[derive(Debug, Default, Serialize, Deserialize, Encode, Decode, Allocative)]
 pub struct SerializedBTreeMap<Key, Value>
diff --git a/src/structs/serialized_vec.rs b/src/structs/serialized_vec.rs
index f8dac4c1b..73efd3f3e 100644
--- a/src/structs/serialized_vec.rs
+++ b/src/structs/serialized_vec.rs
@@ -14,6 +14,12 @@ pub struct SerializedVec<Value> {
     pub map: Vec<Value>,
 }
 
+impl<Value> SerializedVec<Value> {
+    pub fn get_index(&self, index: usize) -> Option<&Value> {
+        self.map.get(index)
+    }
+}
+
 impl<Key, Value, ChunkId> MapSerialized<Key, Value, ChunkId> for SerializedVec<Value>
 where
     Self: Debug + Serialize + DeserializeOwned + Encode + Decode,
diff --git a/src/structs/timestamp.rs b/src/structs/timestamp.rs
index e1ee2efeb..0d8cc88df 100644
--- a/src/structs/timestamp.rs
+++ b/src/structs/timestamp.rs
@@ -8,7 +8,7 @@ use serde::{Deserialize, Serialize};
 
 use crate::utils::{ONE_DAY_IN_S, ONE_HOUR_IN_S};
 
-use super::Date;
+use super::{Date, HeightMapChunkId, MapKey};
 
 #[derive(
     Debug,
@@ -32,10 +32,6 @@ pub struct Timestamp(u32);
 impl Timestamp {
     pub const ZERO: Self = Self(0);
 
-    pub fn wrap(timestamp: u32) -> Self {
-        Self(timestamp)
-    }
-
     pub fn now() -> Self {
         Self(chrono::offset::Utc::now().timestamp() as u32)
     }
@@ -51,7 +47,7 @@ impl Timestamp {
     pub fn to_floored_seconds(self) -> Self {
         let date_time = Utc.timestamp_opt(i64::from(self.0), 0).unwrap();
 
-        Self::wrap(
+        Self::from(
             NaiveDateTime::new(
                 date_time.date_naive(),
                 NaiveTime::from_hms_opt(date_time.hour(), date_time.minute(), 0).unwrap(),
@@ -70,7 +66,7 @@ impl Timestamp {
     }
 
     pub fn older_by_1h_plus_than(&self, younger: Self) -> bool {
-        younger.checked_sub(**self).unwrap_or_default() > ONE_HOUR_IN_S as u32
+        (*younger).checked_sub(**self).unwrap_or_default() > ONE_HOUR_IN_S as u32
     }
 }
 
@@ -78,7 +74,7 @@ impl Sub for Timestamp {
     type Output = Self;
 
     fn sub(self, rhs: Self) -> Self::Output {
-        Self::wrap(self.0 - rhs.0)
+        Self::from(self.0 - rhs.0)
     }
 }
 
@@ -87,3 +83,55 @@ impl fmt::Display for Timestamp {
         write!(f, "{}", **self)
     }
 }
+
+impl From<u32> for Timestamp {
+    fn from(value: u32) -> Self {
+        Self(value)
+    }
+}
+
+impl MapKey<HeightMapChunkId> for Timestamp {
+    fn to_chunk_id(&self) -> HeightMapChunkId {
+        unreachable!();
+    }
+
+    fn to_first_unsafe(&self) -> Option<Self> {
+        unreachable!();
+    }
+
+    fn to_serialized_key(&self) -> Self {
+        unreachable!();
+    }
+
+    fn is_out_of_bounds(&self) -> bool {
+        unreachable!();
+    }
+
+    fn is_first(&self) -> bool {
+        unreachable!();
+    }
+
+    fn checked_sub(&self, _: usize) -> Option<Self> {
+        unreachable!();
+    }
+
+    fn min_percentile_key() -> Self {
+        unreachable!();
+    }
+
+    fn iter_up_to(&self, other: &Self) -> impl Iterator<Item = Self> {
+        (**self..=**other).map(Timestamp::from)
+    }
+
+    fn map_name<'a>() -> &'a str {
+        "timestamp"
+    }
+
+    fn to_usize(&self) -> usize {
+        (**self) as usize
+    }
+
+    fn from_usize(t: usize) -> Self {
+        Self(t as u32)
+    }
+}
diff --git a/src/utils/retry.rs b/src/utils/retry.rs
index 6f22e968c..f200ced47 100644
--- a/src/utils/retry.rs
+++ b/src/utils/retry.rs
@@ -5,10 +5,6 @@ pub fn retry<T>(
     sleep_in_s: u64,
     retries: usize,
 ) -> color_eyre::Result<T> {
-    if retries < 1 {
-        unreachable!()
-    }
-
     let mut i = 0;
 
     loop {

From d72bf0739a52f74167eddc04e9595152465a7b7e Mon Sep 17 00:00:00 2001
From: nym21 <expat-epochs0i@icloud.com>
Date: Fri, 27 Dec 2024 12:33:09 +0100
Subject: [PATCH 13/63] changelog: update

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index da7793865..bfa74cb29 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,9 @@
   - New route format: `/api/date-to-realized-price` is now `/api/realized-price?kind=date`
   - Added status and timing to logs
 - Updated website packages
+- Added API support for datasets by timestamp (by merging any dataset by height with the height to timestamp dataset and so it still uses heights as chunk ids) [#ca00f3f](https://github.com/kibo-money/kibo/commit/ca00f3f71526f0c5c16021024fec7e5c6e47221c)
+  - `/api/realized-price?kind=t`
+  - `/api/realized-price?kind=timestamp&chunk=860000`
 
 ## Git
 

From dea853d8409605c249410585d8e61b950924ff45 Mon Sep 17 00:00:00 2001
From: nym21 <expat-epochs0i@icloud.com>
Date: Wed, 1 Jan 2025 10:32:39 +0100
Subject: [PATCH 14/63] init: separate parser crate

---
 src/crates/barser/Cargo.lock                  | 1094 +++++++++++++++++
 src/crates/barser/Cargo.toml                  |   12 +
 .../databases/blockhash_prefix_to_height.rs   |   35 +
 .../src/databases/height_to_blockhash.rs      |   37 +
 .../barser/src/databases/height_to_txindex.rs |   45 +
 src/crates/barser/src/databases/mod.rs        |  167 +++
 .../src/databases/txid_prefix_to_txindex.rs   |   46 +
 .../barser/src/databases/txindex_to_txid.rs   |   28 +
 .../src/databases/txoutindex_to_amount.rs     |   30 +
 src/crates/barser/src/main.rs                 |  100 ++
 src/crates/barser/src/structs/amount.rs       |   90 ++
 src/crates/barser/src/structs/database.rs     |  138 +++
 src/crates/barser/src/structs/exit.rs         |   60 +
 src/crates/barser/src/structs/height.rs       |  110 ++
 src/crates/barser/src/structs/mod.rs          |   17 +
 src/crates/barser/src/structs/slice.rs        |   34 +
 src/crates/barser/src/structs/txindex.rs      |   44 +
 src/crates/barser/src/structs/txoutindex.rs   |   53 +
 src/crates/barser/src/structs/version.rs      |   18 +
 19 files changed, 2158 insertions(+)
 create mode 100644 src/crates/barser/Cargo.lock
 create mode 100644 src/crates/barser/Cargo.toml
 create mode 100644 src/crates/barser/src/databases/blockhash_prefix_to_height.rs
 create mode 100644 src/crates/barser/src/databases/height_to_blockhash.rs
 create mode 100644 src/crates/barser/src/databases/height_to_txindex.rs
 create mode 100644 src/crates/barser/src/databases/mod.rs
 create mode 100644 src/crates/barser/src/databases/txid_prefix_to_txindex.rs
 create mode 100644 src/crates/barser/src/databases/txindex_to_txid.rs
 create mode 100644 src/crates/barser/src/databases/txoutindex_to_amount.rs
 create mode 100644 src/crates/barser/src/main.rs
 create mode 100644 src/crates/barser/src/structs/amount.rs
 create mode 100644 src/crates/barser/src/structs/database.rs
 create mode 100644 src/crates/barser/src/structs/exit.rs
 create mode 100644 src/crates/barser/src/structs/height.rs
 create mode 100644 src/crates/barser/src/structs/mod.rs
 create mode 100644 src/crates/barser/src/structs/slice.rs
 create mode 100644 src/crates/barser/src/structs/txindex.rs
 create mode 100644 src/crates/barser/src/structs/txoutindex.rs
 create mode 100644 src/crates/barser/src/structs/version.rs

diff --git a/src/crates/barser/Cargo.lock b/src/crates/barser/Cargo.lock
new file mode 100644
index 000000000..7d20da2a9
--- /dev/null
+++ b/src/crates/barser/Cargo.lock
@@ -0,0 +1,1094 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 4
+
+[[package]]
+name = "addr2line"
+version = "0.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
+dependencies = [
+ "gimli",
+]
+
+[[package]]
+name = "adler"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+
+[[package]]
+name = "arrayvec"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
+
+[[package]]
+name = "autocfg"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
+
+[[package]]
+name = "backtrace"
+version = "0.3.71"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d"
+dependencies = [
+ "addr2line",
+ "cc",
+ "cfg-if",
+ "libc",
+ "miniz_oxide",
+ "object",
+ "rustc-demangle",
+]
+
+[[package]]
+name = "base58ck"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c8d66485a3a2ea485c1913c4572ce0256067a5377ac8c75c4960e1cda98605f"
+dependencies = [
+ "bitcoin-internals",
+ "bitcoin_hashes",
+]
+
+[[package]]
+name = "base64"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
+
+[[package]]
+name = "bech32"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d965446196e3b7decd44aa7ee49e31d630118f90ef12f97900f262eb915c951d"
+
+[[package]]
+name = "bitcoin"
+version = "0.32.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce6bc65742dea50536e35ad42492b234c27904a27f0abdcbce605015cb4ea026"
+dependencies = [
+ "base58ck",
+ "bech32",
+ "bitcoin-internals",
+ "bitcoin-io",
+ "bitcoin-units",
+ "bitcoin_hashes",
+ "hex-conservative",
+ "hex_lit",
+ "secp256k1",
+ "serde",
+]
+
+[[package]]
+name = "bitcoin-internals"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30bdbe14aa07b06e6cfeffc529a1f099e5fbe249524f8125358604df99a4bed2"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "bitcoin-io"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b47c4ab7a93edb0c7198c5535ed9b52b63095f4e9b45279c6736cec4b856baf"
+
+[[package]]
+name = "bitcoin-units"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5285c8bcaa25876d07f37e3d30c303f2609179716e11d688f51e8f1fe70063e2"
+dependencies = [
+ "bitcoin-internals",
+ "serde",
+]
+
+[[package]]
+name = "bitcoin_hashes"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb18c03d0db0247e147a21a6faafd5a7eb851c743db062de72018b6b7e8e4d16"
+dependencies = [
+ "bitcoin-io",
+ "hex-conservative",
+ "serde",
+]
+
+[[package]]
+name = "bitcoincore-rpc"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aedd23ae0fd321affb4bbbc36126c6f49a32818dc6b979395d24da8c9d4e80ee"
+dependencies = [
+ "bitcoincore-rpc-json",
+ "jsonrpc",
+ "log",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "bitcoincore-rpc-json"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8909583c5fab98508e80ef73e5592a651c954993dc6b7739963257d19f0e71a"
+dependencies = [
+ "bitcoin",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "biter"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "02527a2b7944d9edc90db0a73339c57cd521f9623f99416574d1943312c9d290"
+dependencies = [
+ "bitcoin",
+ "bitcoincore-rpc",
+ "crossbeam",
+ "derived-deref",
+ "rayon",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "bitflags"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+
+[[package]]
+name = "byteorder"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+
+[[package]]
+name = "cc"
+version = "1.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9157bbaa6b165880c27a4293a474c91cdcf265cc68cc829bf10be0964a391caf"
+dependencies = [
+ "shlex",
+]
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "cfg_aliases"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
+
+[[package]]
+name = "color-eyre"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55146f5e46f237f7423d74111267d4597b59b0dad0ffaf7303bce9945d843ad5"
+dependencies = [
+ "backtrace",
+ "color-spantrace",
+ "eyre",
+ "indenter",
+ "once_cell",
+ "owo-colors",
+ "tracing-error",
+]
+
+[[package]]
+name = "color-spantrace"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd6be1b2a7e382e2b98b43b2adcca6bb0e465af0bdd38123873ae61eb17a72c2"
+dependencies = [
+ "once_cell",
+ "owo-colors",
+ "tracing-core",
+ "tracing-error",
+]
+
+[[package]]
+name = "crossbeam"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1137cd7e7fc0fb5d3c5a8678be38ec56e819125d8d7907411fe24ccb943faca8"
+dependencies = [
+ "crossbeam-channel",
+ "crossbeam-deque",
+ "crossbeam-epoch",
+ "crossbeam-queue",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-channel"
+version = "0.5.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06ba6d68e24814cb8de6bb986db8222d3a027d15872cabc0d18817bc3c0e4471"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-deque"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51"
+dependencies = [
+ "crossbeam-epoch",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-epoch"
+version = "0.9.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-queue"
+version = "0.3.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f58bbc28f91df819d0aa2a2c00cd19754769c2fad90579b3592b1c9ba7a3115"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-skiplist"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df29de440c58ca2cc6e587ec3d22347551a32435fbde9d2bff64e78a9ffa151b"
+dependencies = [
+ "crossbeam-epoch",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
+
+[[package]]
+name = "ctrlc"
+version = "3.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90eeab0aa92f3f9b4e87f258c72b139c207d251f9cbc1080a0086b86a8870dd3"
+dependencies = [
+ "nix",
+ "windows-sys",
+]
+
+[[package]]
+name = "dashmap"
+version = "6.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf"
+dependencies = [
+ "cfg-if",
+ "crossbeam-utils",
+ "hashbrown",
+ "lock_api",
+ "once_cell",
+ "parking_lot_core",
+]
+
+[[package]]
+name = "derive_deref"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dcdbcee2d9941369faba772587a565f4f534e42cb8d17e5295871de730163b2b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "derived-deref"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "805ef2023ccd65425743a91ecd11fc020979a0b01921db3104fb606d18a7b43e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.92",
+]
+
+[[package]]
+name = "double-ended-peekable"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0d05e1c0dbad51b52c38bda7adceef61b9efc2baf04acfe8726a8c4630a6f57"
+
+[[package]]
+name = "either"
+version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
+
+[[package]]
+name = "enum_dispatch"
+version = "0.3.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa18ce2bc66555b3218614519ac839ddb759a7d6720732f979ef8d13be147ecd"
+dependencies = [
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.92",
+]
+
+[[package]]
+name = "equivalent"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+
+[[package]]
+name = "errno"
+version = "0.3.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
+dependencies = [
+ "libc",
+ "windows-sys",
+]
+
+[[package]]
+name = "eyre"
+version = "0.6.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec"
+dependencies = [
+ "indenter",
+ "once_cell",
+]
+
+[[package]]
+name = "fastrand"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
+
+[[package]]
+name = "fjall"
+version = "2.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9cd1bb382d52e527f10f5ed3f126bb4a87c77fbf878a1432010820a71aaa6322"
+dependencies = [
+ "byteorder",
+ "dashmap",
+ "log",
+ "lsm-tree",
+ "path-absolutize",
+ "std-semaphore",
+ "tempfile",
+ "xxhash-rust",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi",
+]
+
+[[package]]
+name = "gimli"
+version = "0.28.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
+
+[[package]]
+name = "guardian"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "493913a18c0d7bebb75127a26a432162c59edbe06f6cf712001e3e769345e8b5"
+
+[[package]]
+name = "hashbrown"
+version = "0.14.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+
+[[package]]
+name = "hex-conservative"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5313b072ce3c597065a808dbf612c4c8e8590bdbf8b579508bf7a762c5eae6cd"
+dependencies = [
+ "arrayvec",
+]
+
+[[package]]
+name = "hex_lit"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3011d1213f159867b13cfd6ac92d2cd5f1345762c63be3554e84092d85a50bbd"
+
+[[package]]
+name = "indenter"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683"
+
+[[package]]
+name = "itoa"
+version = "1.0.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
+
+[[package]]
+name = "jsonrpc"
+version = "0.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3662a38d341d77efecb73caf01420cfa5aa63c0253fd7bc05289ef9f6616e1bf"
+dependencies = [
+ "base64",
+ "minreq",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
+
+[[package]]
+name = "libc"
+version = "0.2.169"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.4.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
+
+[[package]]
+name = "lock_api"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
+dependencies = [
+ "autocfg",
+ "scopeguard",
+]
+
+[[package]]
+name = "log"
+version = "0.4.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
+
+[[package]]
+name = "lsm-tree"
+version = "2.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7952bc71e90c0b58ce441dcf6cf8624cac042125dec1183ec9c48144f74378d"
+dependencies = [
+ "byteorder",
+ "crossbeam-skiplist",
+ "double-ended-peekable",
+ "enum_dispatch",
+ "guardian",
+ "log",
+ "lz4_flex",
+ "path-absolutize",
+ "quick_cache",
+ "rustc-hash",
+ "self_cell",
+ "tempfile",
+ "value-log",
+ "varint-rs",
+ "xxhash-rust",
+]
+
+[[package]]
+name = "lz4_flex"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75761162ae2b0e580d7e7c390558127e5f01b4194debd6221fd8c207fc80e3f5"
+
+[[package]]
+name = "memchr"
+version = "2.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+
+[[package]]
+name = "min-max-heap"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2687e6cf9c00f48e9284cf9fd15f2ef341d03cc7743abf9df4c5f07fdee50b18"
+
+[[package]]
+name = "miniz_oxide"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
+dependencies = [
+ "adler",
+]
+
+[[package]]
+name = "minreq"
+version = "2.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "36a8e50e917e18a37d500d27d40b7bc7d127e71c0c94fb2d83f43b4afd308390"
+dependencies = [
+ "log",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "nix"
+version = "0.29.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
+dependencies = [
+ "bitflags",
+ "cfg-if",
+ "cfg_aliases",
+ "libc",
+]
+
+[[package]]
+name = "object"
+version = "0.32.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.20.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
+
+[[package]]
+name = "owo-colors"
+version = "3.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f"
+
+[[package]]
+name = "parking_lot_core"
+version = "0.9.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "redox_syscall",
+ "smallvec",
+ "windows-targets",
+]
+
+[[package]]
+name = "path-absolutize"
+version = "3.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e4af381fe79fa195b4909485d99f73a80792331df0625188e707854f0b3383f5"
+dependencies = [
+ "path-dedot",
+]
+
+[[package]]
+name = "path-dedot"
+version = "3.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07ba0ad7e047712414213ff67533e6dd477af0a4e1d14fb52343e53d30ea9397"
+dependencies = [
+ "once_cell",
+]
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff"
+
+[[package]]
+name = "ppv-lite86"
+version = "0.2.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
+dependencies = [
+ "zerocopy",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.92"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quick_cache"
+version = "0.6.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d7c94f8935a9df96bb6380e8592c70edf497a643f94bd23b2f76b399385dbf4"
+dependencies = [
+ "equivalent",
+ "hashbrown",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.38"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "rand"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+dependencies = [
+ "libc",
+ "rand_chacha",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+dependencies = [
+ "ppv-lite86",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+dependencies = [
+ "getrandom",
+]
+
+[[package]]
+name = "rayon"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
+dependencies = [
+ "either",
+ "rayon-core",
+]
+
+[[package]]
+name = "rayon-core"
+version = "1.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
+dependencies = [
+ "crossbeam-deque",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.5.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834"
+dependencies = [
+ "bitflags",
+]
+
+[[package]]
+name = "rust-playground"
+version = "0.1.0"
+dependencies = [
+ "biter",
+ "color-eyre",
+ "ctrlc",
+ "derive_deref",
+ "fjall",
+ "rayon",
+]
+
+[[package]]
+name = "rustc-demangle"
+version = "0.1.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
+
+[[package]]
+name = "rustc-hash"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7fb8039b3032c191086b10f11f319a6e99e1e82889c5cc6046f515c9db1d497"
+
+[[package]]
+name = "rustix"
+version = "0.38.42"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f93dc38ecbab2eb790ff964bb77fa94faf256fd3e73285fd7ba0903b76bedb85"
+dependencies = [
+ "bitflags",
+ "errno",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys",
+]
+
+[[package]]
+name = "ryu"
+version = "1.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
+
+[[package]]
+name = "scopeguard"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+
+[[package]]
+name = "secp256k1"
+version = "0.29.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9465315bc9d4566e1724f0fffcbcc446268cb522e60f9a27bcded6b19c108113"
+dependencies = [
+ "bitcoin_hashes",
+ "rand",
+ "secp256k1-sys",
+ "serde",
+]
+
+[[package]]
+name = "secp256k1-sys"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4387882333d3aa8cb20530a17c69a3752e97837832f34f6dccc760e715001d9"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "self_cell"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2fdfc24bc566f839a2da4c4295b82db7d25a24253867d5c64355abb5799bdbe"
+
+[[package]]
+name = "serde"
+version = "1.0.216"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b9781016e935a97e8beecf0c933758c97a5520d32930e460142b4cd80c6338e"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.216"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46f859dbbf73865c6627ed570e78961cd3ac92407a2d117204c49232485da55e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.92",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.133"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377"
+dependencies = [
+ "itoa",
+ "memchr",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "sharded-slab"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
+dependencies = [
+ "lazy_static",
+]
+
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
+[[package]]
+name = "smallvec"
+version = "1.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
+
+[[package]]
+name = "std-semaphore"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33ae9eec00137a8eed469fb4148acd9fc6ac8c3f9b110f52cd34698c8b5bfa0e"
+
+[[package]]
+name = "syn"
+version = "1.0.109"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.92"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70ae51629bf965c5c098cc9e87908a3df5301051a9e087d6f9bef5c9771ed126"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "tempfile"
+version = "3.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c"
+dependencies = [
+ "cfg-if",
+ "fastrand",
+ "once_cell",
+ "rustix",
+ "windows-sys",
+]
+
+[[package]]
+name = "thread_local"
+version = "1.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+]
+
+[[package]]
+name = "tracing"
+version = "0.1.41"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
+dependencies = [
+ "pin-project-lite",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-core"
+version = "0.1.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c"
+dependencies = [
+ "once_cell",
+ "valuable",
+]
+
+[[package]]
+name = "tracing-error"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b1581020d7a273442f5b45074a6a57d5757ad0a47dac0e9f0bd57b81936f3db"
+dependencies = [
+ "tracing",
+ "tracing-subscriber",
+]
+
+[[package]]
+name = "tracing-subscriber"
+version = "0.3.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008"
+dependencies = [
+ "sharded-slab",
+ "thread_local",
+ "tracing-core",
+]
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83"
+
+[[package]]
+name = "valuable"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
+
+[[package]]
+name = "value-log"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7abc2af068c21c0b0531624fbdb5b2c950cf8e7dc72cedf77a9ec10bb677450f"
+dependencies = [
+ "byteorder",
+ "log",
+ "min-max-heap",
+ "path-absolutize",
+ "quick_cache",
+ "rustc-hash",
+ "tempfile",
+ "xxhash-rust",
+]
+
+[[package]]
+name = "varint-rs"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f54a172d0620933a27a4360d3db3e2ae0dd6cceae9730751a036bbf182c4b23"
+
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
+[[package]]
+name = "windows-sys"
+version = "0.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+
+[[package]]
+name = "xxhash-rust"
+version = "0.8.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7d48f1b18be023c95e7b75f481cac649d74be7c507ff4a407c55cfb957f7934"
+
+[[package]]
+name = "zerocopy"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
+dependencies = [
+ "byteorder",
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.92",
+]
diff --git a/src/crates/barser/Cargo.toml b/src/crates/barser/Cargo.toml
new file mode 100644
index 000000000..9902da560
--- /dev/null
+++ b/src/crates/barser/Cargo.toml
@@ -0,0 +1,12 @@
+[package]
+name = "barser"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+biter = "0.2.2"
+color-eyre = "0.6.3"
+ctrlc = "3.4.5"
+derive_deref = "1.1.1"
+fjall = "2.4.4"
+rayon = "1.10.0"
diff --git a/src/crates/barser/src/databases/blockhash_prefix_to_height.rs b/src/crates/barser/src/databases/blockhash_prefix_to_height.rs
new file mode 100644
index 000000000..40c83118b
--- /dev/null
+++ b/src/crates/barser/src/databases/blockhash_prefix_to_height.rs
@@ -0,0 +1,35 @@
+use biter::bitcoin::BlockHash;
+use color_eyre::eyre::eyre;
+use derive_deref::{Deref, DerefMut};
+
+use crate::structs::{Database, DatabaseTrait, Height, Version};
+
+#[derive(Deref, DerefMut)]
+pub struct BlockhashPrefixToHeight(Database);
+
+impl BlockhashPrefixToHeight {
+    pub fn import() -> color_eyre::Result<Self> {
+        Ok(Self(Database::import(
+            "blockhash_suffix_to_height",
+            Self::version(),
+        )?))
+    }
+
+    pub fn insert(&mut self, blockhash: &BlockHash, height: Height) -> color_eyre::Result<()> {
+        if let Some(_height) = self.fetch_update(blockhash[..8].into(), height.into(), height)? {
+            // dbg!(height, Height::from(other), hash);
+            return Err(eyre!("BlockhashSuffixToHeight: key collision"));
+        }
+        Ok(())
+    }
+
+    pub fn remove(&mut self, blockhash: &BlockHash) {
+        self.0.remove((&blockhash[..]).into())
+    }
+}
+
+impl DatabaseTrait for BlockhashPrefixToHeight {
+    fn version() -> Version {
+        Version::from(1)
+    }
+}
diff --git a/src/crates/barser/src/databases/height_to_blockhash.rs b/src/crates/barser/src/databases/height_to_blockhash.rs
new file mode 100644
index 000000000..bce5882da
--- /dev/null
+++ b/src/crates/barser/src/databases/height_to_blockhash.rs
@@ -0,0 +1,37 @@
+use biter::bitcoin::{hashes::Hash, BlockHash};
+use derive_deref::{Deref, DerefMut};
+use fjall::Slice;
+
+use crate::structs::{Database, DatabaseTrait, Height, Version};
+
+#[derive(Deref, DerefMut)]
+pub struct HeightToBlockhash(Database);
+
+impl HeightToBlockhash {
+    pub fn import() -> color_eyre::Result<Self> {
+        Ok(Self(Database::import(
+            "height_to_blockhash",
+            Self::version(),
+        )?))
+    }
+
+    pub fn insert(&mut self, height: Height, blockhash: &BlockHash) {
+        self.0.insert(height.into(), blockhash[..].into(), height)
+    }
+
+    pub fn get(&self, height: Height) -> fjall::Result<Option<BlockHash>> {
+        self.0
+            .get(Slice::from(height))
+            .map(|opt| opt.map(|slice| BlockHash::from_slice(&slice).unwrap()))
+    }
+
+    pub fn remove(&mut self, height: Height) {
+        self.0.remove(Slice::from(height))
+    }
+}
+
+impl DatabaseTrait for HeightToBlockhash {
+    fn version() -> Version {
+        Version::from(1)
+    }
+}
diff --git a/src/crates/barser/src/databases/height_to_txindex.rs b/src/crates/barser/src/databases/height_to_txindex.rs
new file mode 100644
index 000000000..0cdeb0781
--- /dev/null
+++ b/src/crates/barser/src/databases/height_to_txindex.rs
@@ -0,0 +1,45 @@
+use derive_deref::{Deref, DerefMut};
+use fjall::Slice;
+
+use crate::structs::{Database, DatabaseTrait, Height, Txindex, Version};
+
+#[derive(Deref, DerefMut)]
+pub struct HeightToTxindex(Database);
+
+#[derive(Debug, PartialEq, Eq)]
+pub enum HeightToTxindexPosition {
+    First,
+    Last,
+}
+
+impl HeightToTxindex {
+    pub fn import(position: HeightToTxindexPosition) -> color_eyre::Result<Self> {
+        Ok(Self(Database::import(
+            &format!(
+                "height_to_{}_txindex",
+                format!("{position:?}").to_lowercase()
+            ),
+            Self::version(),
+        )?))
+    }
+
+    pub fn insert(&mut self, height: Height, txindex: Txindex) {
+        self.0.insert(height.into(), txindex.into(), height)
+    }
+
+    pub fn get(&self, height: Height) -> fjall::Result<Option<Txindex>> {
+        self.0
+            .get(Slice::from(height))
+            .map(|opt| opt.map(|slice| slice.into()))
+    }
+
+    pub fn remove(&mut self, height: Height) {
+        self.0.remove(Slice::from(height))
+    }
+}
+
+impl DatabaseTrait for HeightToTxindex {
+    fn version() -> Version {
+        Version::from(1)
+    }
+}
diff --git a/src/crates/barser/src/databases/mod.rs b/src/crates/barser/src/databases/mod.rs
new file mode 100644
index 000000000..fd9066db9
--- /dev/null
+++ b/src/crates/barser/src/databases/mod.rs
@@ -0,0 +1,167 @@
+use std::{ops::Sub, thread};
+
+use biter::{
+    bitcoin::{hashes::Hash, BlockHash, Txid},
+    bitcoincore_rpc::Client,
+};
+pub use blockhash_prefix_to_height::*;
+use color_eyre::eyre::ContextCompat;
+use fjall::Slice;
+
+mod blockhash_prefix_to_height;
+mod height_to_blockhash;
+mod height_to_txindex;
+mod txid_prefix_to_txindex;
+mod txindex_to_txid;
+mod txoutindex_to_amount;
+
+pub use height_to_blockhash::*;
+pub use height_to_txindex::*;
+pub use txid_prefix_to_txindex::*;
+pub use txindex_to_txid::*;
+pub use txoutindex_to_amount::*;
+
+use crate::structs::{Height, Txindex, Txoutindex};
+
+pub struct Databases {
+    pub blockhash_prefix_to_height: BlockhashPrefixToHeight,
+    pub height_to_blockhash: HeightToBlockhash,
+    pub height_to_first_txindex: HeightToTxindex,
+    pub height_to_last_txindex: HeightToTxindex,
+    pub txid_prefix_to_txindex: TxidPrefixToTxindex,
+    pub txindex_to_txid: TxindexToTxid,
+    pub txoutindex_to_amount: TxoutindexToAmount,
+}
+
+const UNSAFE_BLOCKS: usize = 100;
+
+impl Databases {
+    pub fn import() -> color_eyre::Result<Self> {
+        thread::scope(|scope| {
+            let blockhash_prefix_to_height_handle = scope.spawn(BlockhashPrefixToHeight::import);
+            let height_to_blockhash_handle = scope.spawn(HeightToBlockhash::import);
+            let height_to_first_txindex_handle =
+                scope.spawn(|| HeightToTxindex::import(HeightToTxindexPosition::First));
+            let height_to_last_txindex_handle =
+                scope.spawn(|| HeightToTxindex::import(HeightToTxindexPosition::Last));
+            let txid_prefix_to_txindex_handle = scope.spawn(TxidPrefixToTxindex::import);
+            let txindex_to_txid_handle = scope.spawn(TxindexToTxid::import);
+            let txoutindex_to_amount_handle = scope.spawn(TxoutindexToAmount::import);
+
+            Ok(Self {
+                blockhash_prefix_to_height: blockhash_prefix_to_height_handle.join().unwrap()?,
+                height_to_blockhash: height_to_blockhash_handle.join().unwrap()?,
+                height_to_first_txindex: height_to_first_txindex_handle.join().unwrap()?,
+                height_to_last_txindex: height_to_last_txindex_handle.join().unwrap()?,
+                txid_prefix_to_txindex: txid_prefix_to_txindex_handle.join().unwrap()?,
+                txindex_to_txid: txindex_to_txid_handle.join().unwrap()?,
+                txoutindex_to_amount: txoutindex_to_amount_handle.join().unwrap()?,
+            })
+        })
+    }
+
+    pub fn export(&mut self, height: Height) -> color_eyre::Result<()> {
+        thread::scope(|scope| {
+            scope.spawn(|| self.blockhash_prefix_to_height.export(height).unwrap());
+            scope.spawn(|| self.height_to_blockhash.export(height).unwrap());
+            scope.spawn(|| self.height_to_first_txindex.export(height).unwrap());
+            scope.spawn(|| self.height_to_last_txindex.export(height).unwrap());
+            scope.spawn(|| self.txid_prefix_to_txindex.export(height).unwrap());
+            scope.spawn(|| self.txindex_to_txid.export(height).unwrap());
+            scope.spawn(|| self.txoutindex_to_amount.export(height).unwrap());
+        });
+        Ok(())
+    }
+
+    pub fn start_height(&self, rpc: &Client) -> color_eyre::Result<Height> {
+        let safe_height = Height::try_from(rpc)?.sub(UNSAFE_BLOCKS);
+        Ok(self
+            .min_height()
+            .map(|h| h.sub(UNSAFE_BLOCKS))
+            .unwrap_or_default()
+            .min(safe_height))
+    }
+
+    fn min_height(&self) -> Option<Height> {
+        [
+            self.blockhash_prefix_to_height.height(),
+            self.height_to_blockhash.height(),
+            self.height_to_first_txindex.height(),
+            self.height_to_last_txindex.height(),
+            self.txid_prefix_to_txindex.height(),
+            self.txindex_to_txid.height(),
+            self.txoutindex_to_amount.height(),
+        ]
+        .into_iter()
+        .map(ToOwned::to_owned)
+        .min()
+        .flatten()
+    }
+
+    pub fn has_different_blockhash(
+        &self,
+        height: Height,
+        blockhash: &BlockHash,
+    ) -> fjall::Result<bool> {
+        Ok(self
+            .height_to_blockhash
+            .get(height)?
+            .is_some_and(|saved_blockhash| blockhash != &saved_blockhash))
+    }
+
+    pub fn erase_from(&mut self, height: Height) -> color_eyre::Result<()> {
+        let mut txindex = None;
+
+        self.height_to_blockhash
+            .range(Slice::from(height)..)
+            .try_for_each(|slice| -> color_eyre::Result<()> {
+                let (slice_height, slice_blockhash) = slice?;
+                let height = Height::from(slice_height);
+                let blockhash = BlockHash::from_slice(&slice_blockhash)?;
+
+                self.height_to_blockhash.remove(height);
+                self.blockhash_prefix_to_height.remove(&blockhash);
+                if txindex.is_none() {
+                    txindex.replace(
+                        self.height_to_first_txindex
+                            .get(height)?
+                            .context("for height to have first txindex")?,
+                    );
+                }
+                self.height_to_first_txindex.remove(height);
+                self.height_to_last_txindex.remove(height);
+
+                Ok(())
+            })?;
+
+        let txindex = txindex.context("txindex to not be none by now")?;
+
+        self.txindex_to_txid
+            .range(Slice::from(txindex)..)
+            .try_for_each(|slice| -> color_eyre::Result<()> {
+                let (slice_txindex, slice_txid) = slice?;
+                let txindex = Txindex::from(slice_txindex);
+                let txid = Txid::from_slice(&slice_txid)?;
+
+                self.txindex_to_txid.remove(txindex);
+                self.txid_prefix_to_txindex.remove(&txid);
+
+                Ok(())
+            })?;
+
+        let txoutindex = Txoutindex::from(txindex);
+
+        self.txoutindex_to_amount
+            .range(Slice::from(txoutindex)..)
+            .try_for_each(|slice| -> color_eyre::Result<()> {
+                let (slice_txoutindex, _) = slice?;
+                let txoutindex = Txoutindex::from(slice_txoutindex);
+
+                self.txoutindex_to_amount.remove(txoutindex);
+
+                Ok(())
+            })?;
+
+        Ok(())
+    }
+}
diff --git a/src/crates/barser/src/databases/txid_prefix_to_txindex.rs b/src/crates/barser/src/databases/txid_prefix_to_txindex.rs
new file mode 100644
index 000000000..dfc1b6fab
--- /dev/null
+++ b/src/crates/barser/src/databases/txid_prefix_to_txindex.rs
@@ -0,0 +1,46 @@
+use biter::bitcoin::Txid;
+use color_eyre::eyre::eyre;
+use derive_deref::{Deref, DerefMut};
+use fjall::Slice;
+
+use crate::structs::{Database, DatabaseTrait, Height, Txindex, Version};
+
+#[derive(Deref, DerefMut)]
+pub struct TxidPrefixToTxindex(Database);
+
+impl TxidPrefixToTxindex {
+    pub fn import() -> color_eyre::Result<Self> {
+        Ok(Self(Database::import(
+            "txid_prefix_to_txindex",
+            Self::version(),
+        )?))
+    }
+
+    pub fn insert(
+        &mut self,
+        txid: &Txid,
+        txindex: Txindex,
+        height: Height,
+    ) -> color_eyre::Result<()> {
+        if let Some(_txindex) =
+            self.fetch_update(Self::txid_to_key(txid), txindex.into(), height)?
+        {
+            return Err(eyre!("TxidPrefixToTxindex: key collision"));
+        }
+        Ok(())
+    }
+
+    pub fn remove(&mut self, txid: &Txid) {
+        self.0.remove(Self::txid_to_key(txid))
+    }
+
+    fn txid_to_key(txid: &Txid) -> Slice {
+        txid[0..8].into()
+    }
+}
+
+impl DatabaseTrait for TxidPrefixToTxindex {
+    fn version() -> Version {
+        Version::from(1)
+    }
+}
diff --git a/src/crates/barser/src/databases/txindex_to_txid.rs b/src/crates/barser/src/databases/txindex_to_txid.rs
new file mode 100644
index 000000000..9c913f98b
--- /dev/null
+++ b/src/crates/barser/src/databases/txindex_to_txid.rs
@@ -0,0 +1,28 @@
+use biter::bitcoin::Txid;
+use derive_deref::{Deref, DerefMut};
+use fjall::Slice;
+
+use crate::structs::{Database, DatabaseTrait, Height, Txindex, Version};
+
+#[derive(Deref, DerefMut)]
+pub struct TxindexToTxid(Database);
+
+impl TxindexToTxid {
+    pub fn import() -> color_eyre::Result<Self> {
+        Ok(Self(Database::import("txindex_to_txid", Self::version())?))
+    }
+
+    pub fn insert(&mut self, txindex: Txindex, txid: &Txid, height: Height) {
+        self.0.insert(txindex.into(), txid[..].into(), height)
+    }
+
+    pub fn remove(&mut self, txindex: Txindex) {
+        self.0.remove(Slice::from(txindex))
+    }
+}
+
+impl DatabaseTrait for TxindexToTxid {
+    fn version() -> Version {
+        Version::from(1)
+    }
+}
diff --git a/src/crates/barser/src/databases/txoutindex_to_amount.rs b/src/crates/barser/src/databases/txoutindex_to_amount.rs
new file mode 100644
index 000000000..7ac6de829
--- /dev/null
+++ b/src/crates/barser/src/databases/txoutindex_to_amount.rs
@@ -0,0 +1,30 @@
+use derive_deref::{Deref, DerefMut};
+use fjall::Slice;
+
+use crate::structs::{Amount, Database, DatabaseTrait, Height, Txoutindex, Version};
+
+#[derive(Deref, DerefMut)]
+pub struct TxoutindexToAmount(Database);
+
+impl TxoutindexToAmount {
+    pub fn import() -> color_eyre::Result<Self> {
+        Ok(Self(Database::import(
+            "txoutindex_to_amount",
+            Self::version(),
+        )?))
+    }
+
+    pub fn insert(&mut self, txoutindex: Txoutindex, amount: Amount, height: Height) {
+        self.0.insert(txoutindex.into(), amount.into(), height)
+    }
+
+    pub fn remove(&mut self, txoutindex: Txoutindex) {
+        self.0.remove(Slice::from(txoutindex))
+    }
+}
+
+impl DatabaseTrait for TxoutindexToAmount {
+    fn version() -> Version {
+        Version::from(1)
+    }
+}
diff --git a/src/crates/barser/src/main.rs b/src/crates/barser/src/main.rs
new file mode 100644
index 000000000..e3ce5399e
--- /dev/null
+++ b/src/crates/barser/src/main.rs
@@ -0,0 +1,100 @@
+use std::path::Path;
+
+use biter::bitcoincore_rpc::{Auth, Client};
+
+mod databases;
+mod structs;
+
+use databases::Databases;
+use structs::{Exit, Height, Txindex, Txoutindex};
+
+// https://github.com/fjall-rs/fjall/discussions/72
+// https://github.com/romanz/electrs/blob/master/doc/schema.md
+
+const DAILY_BLOCK_TARGET: usize = 144;
+const MONTHLY_BLOCK_TARGET: usize = DAILY_BLOCK_TARGET * 30;
+
+fn main() -> color_eyre::Result<()> {
+    let i = std::time::Instant::now();
+
+    let data_dir = Path::new("../bitcoin");
+    let cookie = Path::new(data_dir).join(".cookie");
+    let rpc = Client::new("http://localhost:8332", Auth::CookieFile(cookie)).unwrap();
+
+    let exit = Exit::new();
+
+    let mut dbs = Databases::import()?;
+
+    let mut height = dbs.start_height(&rpc)?;
+
+    let mut txindex = dbs
+        .height_to_last_txindex
+        .get(height)?
+        .unwrap_or(Txindex::default());
+
+    let export = |dbs: &mut Databases, height: Height| -> color_eyre::Result<()> {
+        exit.block();
+        println!("Exporting...");
+        dbs.export(height)?;
+        println!("Export done");
+        exit.unblock();
+        Ok(())
+    };
+
+    biter::new(data_dir, Some(height.into()), None, rpc)
+        .iter()
+        .try_for_each(|(_height, block, blockhash)| -> color_eyre::Result<()> {
+            println!("Processing block {_height}...");
+
+            height = Height::from(_height);
+
+            if dbs.has_different_blockhash(height, &blockhash)? {
+                dbs.erase_from(height)?;
+            }
+
+            dbs.blockhash_prefix_to_height.insert(&blockhash, height)?;
+            dbs.height_to_blockhash.insert(height, &blockhash);
+
+            let txlen = block.txdata.len();
+
+            block.txdata.into_iter().enumerate().try_for_each(
+                |(i, tx)| -> color_eyre::Result<()> {
+                    if i == txlen - 1 {
+                        dbs.height_to_last_txindex.insert(height, txindex);
+                    }
+
+                    if !dbs.txindex_to_txid.is_safe(height)
+                        || !dbs.txid_prefix_to_txindex.is_safe(height)
+                    {
+                        let txid = tx.compute_txid();
+                        dbs.txindex_to_txid.insert(txindex, &txid, height);
+                        dbs.txid_prefix_to_txindex.insert(&txid, txindex, height)?;
+                    }
+
+                    txindex.increment();
+
+                    tx.output.into_iter().enumerate().for_each(|(vout, txout)| {
+                        let vout = vout as u16;
+                        let txoutindex = Txoutindex::from((txindex, vout));
+                        let amount = txout.value.into();
+                        dbs.txoutindex_to_amount.insert(txoutindex, amount, height);
+                    });
+
+                    Ok(())
+                },
+            )?;
+
+            let should_snapshot = _height % MONTHLY_BLOCK_TARGET == 0 && !exit.active();
+            if should_snapshot {
+                export(&mut dbs, height)?;
+            }
+
+            Ok(())
+        })?;
+
+    export(&mut dbs, height)?;
+
+    dbg!(i.elapsed());
+
+    Ok(())
+}
diff --git a/src/crates/barser/src/structs/amount.rs b/src/crates/barser/src/structs/amount.rs
new file mode 100644
index 000000000..d25acf47a
--- /dev/null
+++ b/src/crates/barser/src/structs/amount.rs
@@ -0,0 +1,90 @@
+use std::{
+    iter::Sum,
+    ops::{Add, AddAssign, Mul, Sub, SubAssign},
+};
+
+use biter::bitcoin;
+use derive_deref::{Deref, DerefMut};
+
+use super::Height;
+
+#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Deref, DerefMut, Default)]
+pub struct Amount(bitcoin::Amount);
+
+impl Amount {
+    pub const ZERO: Self = Self(bitcoin::Amount::ZERO);
+    pub const ONE_BTC_F32: f32 = 100_000_000.0;
+    pub const ONE_BTC_F64: f64 = 100_000_000.0;
+}
+
+impl From<u64> for Amount {
+    fn from(value: u64) -> Self {
+        Self(bitcoin::Amount::from_sat(value))
+    }
+}
+
+impl From<bitcoin::Amount> for Amount {
+    fn from(value: bitcoin::Amount) -> Self {
+        Self(value)
+    }
+}
+
+impl From<Amount> for fjall::Slice {
+    fn from(value: Amount) -> Self {
+        value.to_sat().to_be_bytes().into()
+    }
+}
+
+impl Add for Amount {
+    type Output = Amount;
+    fn add(self, rhs: Amount) -> Self::Output {
+        Amount::from(self.to_sat() + rhs.to_sat())
+    }
+}
+
+impl AddAssign for Amount {
+    fn add_assign(&mut self, rhs: Self) {
+        *self = Amount::from(self.to_sat() + rhs.to_sat());
+    }
+}
+
+impl Sub for Amount {
+    type Output = Amount;
+    fn sub(self, rhs: Amount) -> Self::Output {
+        Amount::from(self.to_sat() - rhs.to_sat())
+    }
+}
+
+impl SubAssign for Amount {
+    fn sub_assign(&mut self, rhs: Self) {
+        *self = Amount::from(self.to_sat() - rhs.to_sat());
+    }
+}
+
+impl Mul<Amount> for Amount {
+    type Output = Amount;
+    fn mul(self, rhs: Amount) -> Self::Output {
+        Amount::from(self.to_sat() * rhs.to_sat())
+    }
+}
+
+impl Mul<u64> for Amount {
+    type Output = Amount;
+    fn mul(self, rhs: u64) -> Self::Output {
+        Amount::from(self.to_sat() * rhs)
+    }
+}
+
+impl Mul<Height> for Amount {
+    type Output = Amount;
+    fn mul(self, rhs: Height) -> Self::Output {
+        Amount::from(self.to_sat() * *rhs as u64)
+    }
+}
+
+impl Sum for Amount {
+    fn sum<I: Iterator<Item = Self>>(iter: I) -> Self {
+        let sats: u64 = iter.map(|amt| amt.to_sat()).sum();
+        Amount::from(sats)
+    }
+}
diff --git a/src/crates/barser/src/structs/database.rs b/src/crates/barser/src/structs/database.rs
new file mode 100644
index 000000000..f33aa304f
--- /dev/null
+++ b/src/crates/barser/src/structs/database.rs
@@ -0,0 +1,138 @@
+use std::{mem, ops::RangeBounds};
+
+use fjall::{
+    Batch, Keyspace, KvPair, PartitionCreateOptions, PartitionHandle, PersistMode, Result, Slice,
+};
+
+use super::{Height, Version};
+
+pub struct Database {
+    keyspace: Keyspace,
+    data: PartitionHandle,
+    meta: PartitionHandle,
+    batch: Batch,
+    height: Option<Height>,
+}
+
+const VERSION: &str = "version";
+const HEIGHT: &str = "height";
+
+impl Database {
+    pub fn import(name: &str, version: Version) -> Result<Self> {
+        let keyspace = fjall::Config::new(format!("./databases/{name}")).open()?;
+
+        let data = Self::open_data(&keyspace)?;
+        let meta = Self::open_meta(&keyspace)?;
+
+        let batch = keyspace.batch();
+
+        let mut this = Self {
+            height: meta.get(HEIGHT)?.map(Height::from),
+            keyspace,
+            data,
+            meta,
+            batch,
+        };
+
+        if let Some(slice) = this.meta.get(VERSION)? {
+            if version != Version::from(slice) {
+                this = this.reset()?;
+            }
+        }
+
+        this.batch
+            .insert(&this.meta, VERSION, version.to_be_bytes());
+
+        Ok(this)
+    }
+
+    fn open_data(keyspace: &Keyspace) -> Result<PartitionHandle> {
+        keyspace.open_partition("data", Self::create_options())
+    }
+
+    fn open_meta(keyspace: &Keyspace) -> Result<PartitionHandle> {
+        keyspace.open_partition("meta", Self::create_options())
+    }
+
+    fn create_options() -> PartitionCreateOptions {
+        PartitionCreateOptions::default().manual_journal_persist(true)
+    }
+
+    pub fn get(&self, key: Slice) -> Result<Option<Slice>> {
+        self.data.get(key)
+    }
+
+    pub fn range<'a, K: AsRef<[u8]> + 'a, R: RangeBounds<K> + 'a>(
+        &'a self,
+        range: R,
+    ) -> impl DoubleEndedIterator<Item = Result<KvPair>> + 'static {
+        self.data.range(range)
+    }
+
+    pub fn insert(&mut self, key: Slice, value: Slice, height: Height) {
+        if self.is_safe(height) {
+            return;
+        }
+        self.batch.insert(&self.data, key, value);
+    }
+
+    pub fn fetch_update(
+        &mut self,
+        key: Slice,
+        value: Slice,
+        height: Height,
+    ) -> Result<Option<Slice>> {
+        if self.is_safe(height) {
+            return Ok(None);
+        }
+        let prev = self.get(key.clone());
+        self.batch.insert(&self.data, key, value);
+        prev
+    }
+
+    pub fn remove(&mut self, key: Slice) {
+        self.batch.remove(&self.data, key);
+    }
+
+    pub fn is_safe(&self, height: Height) -> bool {
+        self.height.is_some_and(|self_height| self_height >= height)
+    }
+
+    fn persist(&self) -> Result<()> {
+        self.keyspace.persist(PersistMode::SyncAll)
+    }
+
+    pub fn export(&mut self, height: Height) -> Result<()> {
+        let mut batch = self.keyspace.batch();
+        mem::swap(&mut batch, &mut self.batch);
+
+        batch.insert(&self.meta, HEIGHT, height.to_be_bytes());
+
+        batch.commit()?;
+
+        self.persist()
+    }
+
+    fn reset(mut self) -> Result<Self> {
+        self.keyspace.delete_partition(self.data)?;
+        self.keyspace.delete_partition(self.meta)?;
+
+        self.keyspace.persist(PersistMode::SyncAll)?;
+
+        self.data = Self::open_data(&self.keyspace)?;
+        self.meta = Self::open_meta(&self.keyspace)?;
+
+        Ok(self)
+    }
+
+    pub fn height(&self) -> &Option<Height> {
+        &self.height
+    }
+}
+
+pub trait DatabaseTrait
+where
+    Self: Sized,
+{
+    fn version() -> Version;
+}
diff --git a/src/crates/barser/src/structs/exit.rs b/src/crates/barser/src/structs/exit.rs
new file mode 100644
index 000000000..d206f5b07
--- /dev/null
+++ b/src/crates/barser/src/structs/exit.rs
@@ -0,0 +1,60 @@
+use std::{
+    process::exit,
+    sync::{
+        atomic::{AtomicBool, Ordering},
+        Arc,
+    },
+    thread::sleep,
+    time::Duration,
+};
+
+#[derive(Default, Clone)]
+pub struct Exit {
+    blocked: Arc<AtomicBool>,
+    active: Arc<AtomicBool>,
+}
+
+impl Exit {
+    pub fn new() -> Self {
+        let s = Self {
+            active: Arc::new(AtomicBool::new(false)),
+            blocked: Arc::new(AtomicBool::new(false)),
+        };
+
+        let active = s.active.clone();
+
+        let _blocked = s.blocked.clone();
+        let blocked = move || _blocked.load(Ordering::SeqCst);
+
+        ctrlc::set_handler(move || {
+            println!("Exitting...");
+
+            active.store(true, Ordering::SeqCst);
+
+            if blocked() {
+                println!("Waiting to exit safely");
+
+                while blocked() {
+                    sleep(Duration::from_millis(50));
+                }
+            }
+
+            exit(0);
+        })
+        .expect("Error setting Ctrl-C handler");
+
+        s
+    }
+
+    pub fn block(&self) {
+        self.blocked.store(true, Ordering::SeqCst);
+    }
+
+    pub fn unblock(&self) {
+        self.blocked.store(false, Ordering::SeqCst);
+    }
+
+    pub fn active(&self) -> bool {
+        self.active.load(Ordering::SeqCst)
+    }
+}
diff --git a/src/crates/barser/src/structs/height.rs b/src/crates/barser/src/structs/height.rs
new file mode 100644
index 000000000..d39992459
--- /dev/null
+++ b/src/crates/barser/src/structs/height.rs
@@ -0,0 +1,110 @@
+use std::{
+    fmt,
+    ops::{Add, AddAssign, Sub},
+};
+
+use biter::bitcoincore_rpc::{self, RpcApi};
+use derive_deref::{Deref, DerefMut};
+
+use super::SliceExtended;
+
+#[derive(Debug, Clone, Copy, Deref, DerefMut, PartialEq, Eq, PartialOrd, Ord, Default)]
+pub struct Height(u32);
+
+impl From<fjall::Slice> for Height {
+    fn from(slice: fjall::Slice) -> Self {
+        Self(slice.read_u32())
+    }
+}
+impl From<Height> for fjall::Slice {
+    fn from(value: Height) -> Self {
+        value.to_be_bytes().into()
+    }
+}
+
+impl From<u32> for Height {
+    fn from(value: u32) -> Self {
+        Self(value)
+    }
+}
+
+impl From<usize> for Height {
+    fn from(value: usize) -> Self {
+        Self(value as u32)
+    }
+}
+impl From<Height> for usize {
+    fn from(value: Height) -> Self {
+        value.0 as usize
+    }
+}
+
+impl TryFrom<&bitcoincore_rpc::Client> for Height {
+    type Error = bitcoincore_rpc::Error;
+    fn try_from(value: &bitcoincore_rpc::Client) -> Result<Self, Self::Error> {
+        Ok((value.get_blockchain_info()?.blocks as usize - 1).into())
+    }
+}
+
+impl PartialEq<u64> for Height {
+    fn eq(&self, other: &u64) -> bool {
+        **self == *other as u32
+    }
+}
+
+impl Add<u32> for Height {
+    type Output = Height;
+
+    fn add(self, rhs: u32) -> Self::Output {
+        Self::from(*self + rhs)
+    }
+}
+
+impl Add<usize> for Height {
+    type Output = Height;
+
+    fn add(self, rhs: usize) -> Self::Output {
+        Self::from(*self + rhs as u32)
+    }
+}
+
+impl Sub<Height> for Height {
+    type Output = Height;
+
+    fn sub(self, rhs: Height) -> Self::Output {
+        Self::from(*self - *rhs)
+    }
+}
+
+impl Sub<i32> for Height {
+    type Output = Height;
+    fn sub(self, rhs: i32) -> Self::Output {
+        Self::from(*self - rhs as u32)
+    }
+}
+
+impl Sub<u32> for Height {
+    type Output = Height;
+    fn sub(self, rhs: u32) -> Self::Output {
+        Self::from(*self - rhs)
+    }
+}
+
+impl Sub<usize> for Height {
+    type Output = Height;
+    fn sub(self, rhs: usize) -> Self::Output {
+        Self::from(*self - rhs as u32)
+    }
+}
+
+impl AddAssign<usize> for Height {
+    fn add_assign(&mut self, rhs: usize) {
+        *self = self.add(rhs);
+    }
+}
+
+impl fmt::Display for Height {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", **self)
+    }
+}
diff --git a/src/crates/barser/src/structs/mod.rs b/src/crates/barser/src/structs/mod.rs
new file mode 100644
index 000000000..574b6655a
--- /dev/null
+++ b/src/crates/barser/src/structs/mod.rs
@@ -0,0 +1,17 @@
+mod amount;
+mod database;
+mod exit;
+mod height;
+mod slice;
+mod txindex;
+mod txoutindex;
+mod version;
+
+pub use amount::*;
+pub use database::*;
+pub use exit::*;
+pub use height::*;
+pub use slice::*;
+pub use txindex::*;
+pub use txoutindex::*;
+pub use version::*;
diff --git a/src/crates/barser/src/structs/slice.rs b/src/crates/barser/src/structs/slice.rs
new file mode 100644
index 000000000..2602f8bd5
--- /dev/null
+++ b/src/crates/barser/src/structs/slice.rs
@@ -0,0 +1,34 @@
+use std::io::Read;
+
+pub trait SliceExtended {
+    fn read_u8(&self) -> u8;
+    fn read_u32(&self) -> u32;
+    fn read_u64(&self) -> u64;
+    fn read_exact(&self, buf: &mut [u8]);
+}
+
+impl SliceExtended for fjall::Slice {
+    fn read_u8(&self) -> u8 {
+        let mut buf: [u8; 1] = [0; 1];
+        self.read_exact(&mut buf);
+        u8::from_be_bytes(buf)
+    }
+
+    fn read_u32(&self) -> u32 {
+        let mut buf: [u8; 4] = [0; 4];
+        self.read_exact(&mut buf);
+        u32::from_be_bytes(buf)
+    }
+
+    fn read_u64(&self) -> u64 {
+        let mut buf: [u8; 8] = [0; 8];
+        self.read_exact(&mut buf);
+        u64::from_be_bytes(buf)
+    }
+
+    fn read_exact(&self, buf: &mut [u8]) {
+        self.bytes().take(buf.len()).enumerate().for_each(|(i, r)| {
+            buf[i] = r.unwrap();
+        });
+    }
+}
diff --git a/src/crates/barser/src/structs/txindex.rs b/src/crates/barser/src/structs/txindex.rs
new file mode 100644
index 000000000..45d02e751
--- /dev/null
+++ b/src/crates/barser/src/structs/txindex.rs
@@ -0,0 +1,44 @@
+use derive_deref::{Deref, DerefMut};
+
+use super::SliceExtended;
+
+#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Deref, DerefMut, Default)]
+pub struct Txindex(u32);
+
+impl Txindex {
+    pub fn increment(&mut self) {
+        self.0 += 1;
+    }
+
+    pub fn incremented(self) -> Self {
+        Self(*self + 1)
+    }
+}
+
+impl From<u32> for Txindex {
+    fn from(value: u32) -> Self {
+        Self(value)
+    }
+}
+
+impl From<u64> for Txindex {
+    fn from(value: u64) -> Self {
+        Self(value as u32)
+    }
+}
+impl From<Txindex> for u64 {
+    fn from(value: Txindex) -> Self {
+        value.0 as u64
+    }
+}
+
+impl From<fjall::Slice> for Txindex {
+    fn from(slice: fjall::Slice) -> Self {
+        Self(slice.read_u32())
+    }
+}
+impl From<Txindex> for fjall::Slice {
+    fn from(value: Txindex) -> Self {
+        value.to_be_bytes().into()
+    }
+}
diff --git a/src/crates/barser/src/structs/txoutindex.rs b/src/crates/barser/src/structs/txoutindex.rs
new file mode 100644
index 000000000..ab05801ad
--- /dev/null
+++ b/src/crates/barser/src/structs/txoutindex.rs
@@ -0,0 +1,53 @@
+use super::{SliceExtended, Txindex};
+
+#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Default)]
+pub struct Txoutindex {
+    pub txindex: Txindex,
+    pub vout: u16,
+}
+
+const SHIFT: u64 = 16;
+const AND: u64 = (1 << SHIFT) - 1;
+
+impl From<Txindex> for Txoutindex {
+    fn from(value: Txindex) -> Self {
+        Self {
+            txindex: value,
+            vout: 0,
+        }
+    }
+}
+
+impl From<(Txindex, u16)> for Txoutindex {
+    fn from(value: (Txindex, u16)) -> Self {
+        Self {
+            txindex: value.0,
+            vout: value.1,
+        }
+    }
+}
+
+impl From<u64> for Txoutindex {
+    fn from(value: u64) -> Self {
+        Self {
+            txindex: (value >> SHIFT).into(),
+            vout: (value & AND) as u16,
+        }
+    }
+}
+impl From<Txoutindex> for u64 {
+    fn from(value: Txoutindex) -> Self {
+        (u64::from(value.txindex) << SHIFT) + value.vout as u64
+    }
+}
+
+impl From<Txoutindex> for fjall::Slice {
+    fn from(value: Txoutindex) -> Self {
+        u64::from(value).to_be_bytes().into()
+    }
+}
+impl From<fjall::Slice> for Txoutindex {
+    fn from(value: fjall::Slice) -> Self {
+        fjall::Slice::read_u64(&value).into()
+    }
+}
diff --git a/src/crates/barser/src/structs/version.rs b/src/crates/barser/src/structs/version.rs
new file mode 100644
index 000000000..4c0dfe27e
--- /dev/null
+++ b/src/crates/barser/src/structs/version.rs
@@ -0,0 +1,18 @@
+use derive_deref::{Deref, DerefMut};
+
+use super::SliceExtended;
+
+#[derive(Debug, Clone, Copy, Deref, DerefMut, PartialEq, Eq, PartialOrd, Ord)]
+pub struct Version(u8);
+
+impl From<u8> for Version {
+    fn from(value: u8) -> Self {
+        Self(value)
+    }
+}
+
+impl From<fjall::Slice> for Version {
+    fn from(slice: fjall::Slice) -> Self {
+        Self(slice.read_u8())
+    }
+}

From 1380b42c1de374da00524b7c7e233aaf2fcdf832 Mon Sep 17 00:00:00 2001
From: nym21 <expat-epochs0i@icloud.com>
Date: Fri, 3 Jan 2025 21:34:10 +0100
Subject: [PATCH 15/63] bitbase: snapshot

---
 Cargo.lock                                    |  12 +-
 src/crates/barser/src/main.rs                 | 100 -----------
 src/crates/barser/src/structs/txoutindex.rs   |  53 ------
 src/crates/bitbase/.gitignore                 |   1 +
 src/crates/{barser => bitbase}/Cargo.lock     |  79 ++++++---
 src/crates/{barser => bitbase}/Cargo.toml     |   3 +-
 .../addressbytes_prefix_to_addressindex.rs    |  41 +++++
 .../database/addressindex_to_addressbytes.rs  |  43 +++++
 .../database/addressindex_to_addresstype.rs   |  38 ++++
 .../database/addressindex_to_txoutindexes.rs  |  42 +++++
 .../database}/blockhash_prefix_to_height.rs   |   0
 .../src/database}/height_to_blockhash.rs      |   0
 .../src/database}/height_to_txindex.rs        |   0
 .../databases => bitbase/src/database}/mod.rs | 119 +++++++++++--
 .../src/database}/txid_prefix_to_txindex.rs   |   0
 .../bitbase/src/database/txindex_to_height.rs |  29 +++
 .../src/database}/txindex_to_txid.rs          |   3 +-
 .../database/txoutindex_to_addressindex.rs    |  30 ++++
 .../src/database}/txoutindex_to_amount.rs     |   3 +-
 src/crates/bitbase/src/main.rs                | 167 ++++++++++++++++++
 .../bitbase/src/structs/addressbytes.rs       |  53 ++++++
 .../bitbase/src/structs/addressindex.rs       |  47 +++++
 .../bitbase/src/structs/addresstxoutindex.rs  |  35 ++++
 src/crates/bitbase/src/structs/addresstype.rs |  40 +++++
 .../{barser => bitbase}/src/structs/amount.rs |   3 +-
 .../{barser => bitbase}/src/structs/exit.rs   |   0
 .../src/structs/fjall.rs}                     |  15 +-
 .../{barser => bitbase}/src/structs/height.rs |   7 +-
 .../{barser => bitbase}/src/structs/mod.rs    |  12 +-
 .../{barser => bitbase}/src/structs/slice.rs  |  17 +-
 .../src/structs/txindex.rs                    |   9 +-
 src/crates/bitbase/src/structs/txoutindex.rs  |  46 +++++
 .../src/structs/version.rs                    |   5 +-
 src/crates/biter/Cargo.lock                   |  24 +--
 src/crates/biter/Cargo.toml                   |   4 +-
 src/crates/biter/src/blk_index_to_blk_path.rs |  46 +++++
 .../biter/src/blk_index_to_blk_recap.rs       |   6 +-
 src/crates/biter/src/lib.rs                   |  12 +-
 src/crates/biter/src/utils.rs                 |  39 +---
 src/parser/actions/iter_blocks.rs             |   2 +-
 40 files changed, 906 insertions(+), 279 deletions(-)
 delete mode 100644 src/crates/barser/src/main.rs
 delete mode 100644 src/crates/barser/src/structs/txoutindex.rs
 create mode 100644 src/crates/bitbase/.gitignore
 rename src/crates/{barser => bitbase}/Cargo.lock (95%)
 rename src/crates/{barser => bitbase}/Cargo.toml (79%)
 create mode 100644 src/crates/bitbase/src/database/addressbytes_prefix_to_addressindex.rs
 create mode 100644 src/crates/bitbase/src/database/addressindex_to_addressbytes.rs
 create mode 100644 src/crates/bitbase/src/database/addressindex_to_addresstype.rs
 create mode 100644 src/crates/bitbase/src/database/addressindex_to_txoutindexes.rs
 rename src/crates/{barser/src/databases => bitbase/src/database}/blockhash_prefix_to_height.rs (100%)
 rename src/crates/{barser/src/databases => bitbase/src/database}/height_to_blockhash.rs (100%)
 rename src/crates/{barser/src/databases => bitbase/src/database}/height_to_txindex.rs (100%)
 rename src/crates/{barser/src/databases => bitbase/src/database}/mod.rs (53%)
 rename src/crates/{barser/src/databases => bitbase/src/database}/txid_prefix_to_txindex.rs (100%)
 create mode 100644 src/crates/bitbase/src/database/txindex_to_height.rs
 rename src/crates/{barser/src/databases => bitbase/src/database}/txindex_to_txid.rs (91%)
 create mode 100644 src/crates/bitbase/src/database/txoutindex_to_addressindex.rs
 rename src/crates/{barser/src/databases => bitbase/src/database}/txoutindex_to_amount.rs (91%)
 create mode 100644 src/crates/bitbase/src/main.rs
 create mode 100644 src/crates/bitbase/src/structs/addressbytes.rs
 create mode 100644 src/crates/bitbase/src/structs/addressindex.rs
 create mode 100644 src/crates/bitbase/src/structs/addresstxoutindex.rs
 create mode 100644 src/crates/bitbase/src/structs/addresstype.rs
 rename src/crates/{barser => bitbase}/src/structs/amount.rs (97%)
 rename src/crates/{barser => bitbase}/src/structs/exit.rs (100%)
 rename src/crates/{barser/src/structs/database.rs => bitbase/src/structs/fjall.rs} (90%)
 rename src/crates/{barser => bitbase}/src/structs/height.rs (94%)
 rename src/crates/{barser => bitbase}/src/structs/mod.rs (51%)
 rename src/crates/{barser => bitbase}/src/structs/slice.rs (70%)
 rename src/crates/{barser => bitbase}/src/structs/txindex.rs (81%)
 create mode 100644 src/crates/bitbase/src/structs/txoutindex.rs
 rename src/crates/{barser => bitbase}/src/structs/version.rs (77%)
 create mode 100644 src/crates/biter/src/blk_index_to_blk_path.rs

diff --git a/Cargo.lock b/Cargo.lock
index 4122381e8..66ae12c36 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2484,18 +2484,18 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
 
 [[package]]
 name = "serde"
-version = "1.0.216"
+version = "1.0.217"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b9781016e935a97e8beecf0c933758c97a5520d32930e460142b4cd80c6338e"
+checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.216"
+version = "1.0.217"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46f859dbbf73865c6627ed570e78961cd3ac92407a2d117204c49232485da55e"
+checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2504,9 +2504,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.133"
+version = "1.0.134"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377"
+checksum = "d00f4175c42ee48b15416f6193a959ba3a0d67fc699a0db9ad12df9f83991c7d"
 dependencies = [
  "itoa",
  "memchr",
diff --git a/src/crates/barser/src/main.rs b/src/crates/barser/src/main.rs
deleted file mode 100644
index e3ce5399e..000000000
--- a/src/crates/barser/src/main.rs
+++ /dev/null
@@ -1,100 +0,0 @@
-use std::path::Path;
-
-use biter::bitcoincore_rpc::{Auth, Client};
-
-mod databases;
-mod structs;
-
-use databases::Databases;
-use structs::{Exit, Height, Txindex, Txoutindex};
-
-// https://github.com/fjall-rs/fjall/discussions/72
-// https://github.com/romanz/electrs/blob/master/doc/schema.md
-
-const DAILY_BLOCK_TARGET: usize = 144;
-const MONTHLY_BLOCK_TARGET: usize = DAILY_BLOCK_TARGET * 30;
-
-fn main() -> color_eyre::Result<()> {
-    let i = std::time::Instant::now();
-
-    let data_dir = Path::new("../bitcoin");
-    let cookie = Path::new(data_dir).join(".cookie");
-    let rpc = Client::new("http://localhost:8332", Auth::CookieFile(cookie)).unwrap();
-
-    let exit = Exit::new();
-
-    let mut dbs = Databases::import()?;
-
-    let mut height = dbs.start_height(&rpc)?;
-
-    let mut txindex = dbs
-        .height_to_last_txindex
-        .get(height)?
-        .unwrap_or(Txindex::default());
-
-    let export = |dbs: &mut Databases, height: Height| -> color_eyre::Result<()> {
-        exit.block();
-        println!("Exporting...");
-        dbs.export(height)?;
-        println!("Export done");
-        exit.unblock();
-        Ok(())
-    };
-
-    biter::new(data_dir, Some(height.into()), None, rpc)
-        .iter()
-        .try_for_each(|(_height, block, blockhash)| -> color_eyre::Result<()> {
-            println!("Processing block {_height}...");
-
-            height = Height::from(_height);
-
-            if dbs.has_different_blockhash(height, &blockhash)? {
-                dbs.erase_from(height)?;
-            }
-
-            dbs.blockhash_prefix_to_height.insert(&blockhash, height)?;
-            dbs.height_to_blockhash.insert(height, &blockhash);
-
-            let txlen = block.txdata.len();
-
-            block.txdata.into_iter().enumerate().try_for_each(
-                |(i, tx)| -> color_eyre::Result<()> {
-                    if i == txlen - 1 {
-                        dbs.height_to_last_txindex.insert(height, txindex);
-                    }
-
-                    if !dbs.txindex_to_txid.is_safe(height)
-                        || !dbs.txid_prefix_to_txindex.is_safe(height)
-                    {
-                        let txid = tx.compute_txid();
-                        dbs.txindex_to_txid.insert(txindex, &txid, height);
-                        dbs.txid_prefix_to_txindex.insert(&txid, txindex, height)?;
-                    }
-
-                    txindex.increment();
-
-                    tx.output.into_iter().enumerate().for_each(|(vout, txout)| {
-                        let vout = vout as u16;
-                        let txoutindex = Txoutindex::from((txindex, vout));
-                        let amount = txout.value.into();
-                        dbs.txoutindex_to_amount.insert(txoutindex, amount, height);
-                    });
-
-                    Ok(())
-                },
-            )?;
-
-            let should_snapshot = _height % MONTHLY_BLOCK_TARGET == 0 && !exit.active();
-            if should_snapshot {
-                export(&mut dbs, height)?;
-            }
-
-            Ok(())
-        })?;
-
-    export(&mut dbs, height)?;
-
-    dbg!(i.elapsed());
-
-    Ok(())
-}
diff --git a/src/crates/barser/src/structs/txoutindex.rs b/src/crates/barser/src/structs/txoutindex.rs
deleted file mode 100644
index ab05801ad..000000000
--- a/src/crates/barser/src/structs/txoutindex.rs
+++ /dev/null
@@ -1,53 +0,0 @@
-use super::{SliceExtended, Txindex};
-
-#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Default)]
-pub struct Txoutindex {
-    pub txindex: Txindex,
-    pub vout: u16,
-}
-
-const SHIFT: u64 = 16;
-const AND: u64 = (1 << SHIFT) - 1;
-
-impl From<Txindex> for Txoutindex {
-    fn from(value: Txindex) -> Self {
-        Self {
-            txindex: value,
-            vout: 0,
-        }
-    }
-}
-
-impl From<(Txindex, u16)> for Txoutindex {
-    fn from(value: (Txindex, u16)) -> Self {
-        Self {
-            txindex: value.0,
-            vout: value.1,
-        }
-    }
-}
-
-impl From<u64> for Txoutindex {
-    fn from(value: u64) -> Self {
-        Self {
-            txindex: (value >> SHIFT).into(),
-            vout: (value & AND) as u16,
-        }
-    }
-}
-impl From<Txoutindex> for u64 {
-    fn from(value: Txoutindex) -> Self {
-        (u64::from(value.txindex) << SHIFT) + value.vout as u64
-    }
-}
-
-impl From<Txoutindex> for fjall::Slice {
-    fn from(value: Txoutindex) -> Self {
-        u64::from(value).to_be_bytes().into()
-    }
-}
-impl From<fjall::Slice> for Txoutindex {
-    fn from(value: fjall::Slice) -> Self {
-        fjall::Slice::read_u64(&value).into()
-    }
-}
diff --git a/src/crates/bitbase/.gitignore b/src/crates/bitbase/.gitignore
new file mode 100644
index 000000000..e2647cd44
--- /dev/null
+++ b/src/crates/bitbase/.gitignore
@@ -0,0 +1 @@
+/database
diff --git a/src/crates/barser/Cargo.lock b/src/crates/bitbase/Cargo.lock
similarity index 95%
rename from src/crates/barser/Cargo.lock
rename to src/crates/bitbase/Cargo.lock
index 7d20da2a9..1cb32bd0d 100644
--- a/src/crates/barser/Cargo.lock
+++ b/src/crates/bitbase/Cargo.lock
@@ -50,8 +50,8 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2c8d66485a3a2ea485c1913c4572ce0256067a5377ac8c75c4960e1cda98605f"
 dependencies = [
- "bitcoin-internals",
- "bitcoin_hashes",
+ "bitcoin-internals 0.3.0",
+ "bitcoin_hashes 0.14.0",
 ]
 
 [[package]]
@@ -66,6 +66,19 @@ version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d965446196e3b7decd44aa7ee49e31d630118f90ef12f97900f262eb915c951d"
 
+[[package]]
+name = "bitbase"
+version = "0.1.0"
+dependencies = [
+ "bitcoin_hashes 0.16.0",
+ "biter",
+ "color-eyre",
+ "ctrlc",
+ "derive_deref",
+ "fjall",
+ "rayon",
+]
+
 [[package]]
 name = "bitcoin"
 version = "0.32.5"
@@ -74,11 +87,11 @@ checksum = "ce6bc65742dea50536e35ad42492b234c27904a27f0abdcbce605015cb4ea026"
 dependencies = [
  "base58ck",
  "bech32",
- "bitcoin-internals",
- "bitcoin-io",
+ "bitcoin-internals 0.3.0",
+ "bitcoin-io 0.1.3",
  "bitcoin-units",
- "bitcoin_hashes",
- "hex-conservative",
+ "bitcoin_hashes 0.14.0",
+ "hex-conservative 0.2.1",
  "hex_lit",
  "secp256k1",
  "serde",
@@ -93,19 +106,34 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "bitcoin-internals"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b854212e29b96c8f0fe04cab11d57586c8f3257de0d146c76cb3b42b3eb9118"
+
 [[package]]
 name = "bitcoin-io"
 version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b47c4ab7a93edb0c7198c5535ed9b52b63095f4e9b45279c6736cec4b856baf"
 
+[[package]]
+name = "bitcoin-io"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26792cd2bf245069a1c5acb06aa7ad7abe1de69b507c90b490bca81e0665d0ee"
+dependencies = [
+ "bitcoin-internals 0.4.0",
+]
+
 [[package]]
 name = "bitcoin-units"
 version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5285c8bcaa25876d07f37e3d30c303f2609179716e11d688f51e8f1fe70063e2"
 dependencies = [
- "bitcoin-internals",
+ "bitcoin-internals 0.3.0",
  "serde",
 ]
 
@@ -115,11 +143,21 @@ version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bb18c03d0db0247e147a21a6faafd5a7eb851c743db062de72018b6b7e8e4d16"
 dependencies = [
- "bitcoin-io",
- "hex-conservative",
+ "bitcoin-io 0.1.3",
+ "hex-conservative 0.2.1",
  "serde",
 ]
 
+[[package]]
+name = "bitcoin_hashes"
+version = "0.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e5d09f16329cd545d7e6008b2c6b2af3a90bc678cf41ac3d2f6755943301b16"
+dependencies = [
+ "bitcoin-io 0.2.0",
+ "hex-conservative 0.3.0",
+]
+
 [[package]]
 name = "bitcoincore-rpc"
 version = "0.19.0"
@@ -441,6 +479,15 @@ dependencies = [
  "arrayvec",
 ]
 
+[[package]]
+name = "hex-conservative"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4afe881d0527571892c4034822e59bb10c6c991cce6abe8199b6f5cf10766f55"
+dependencies = [
+ "arrayvec",
+]
+
 [[package]]
 name = "hex_lit"
 version = "0.1.1"
@@ -732,18 +779,6 @@ dependencies = [
  "bitflags",
 ]
 
-[[package]]
-name = "rust-playground"
-version = "0.1.0"
-dependencies = [
- "biter",
- "color-eyre",
- "ctrlc",
- "derive_deref",
- "fjall",
- "rayon",
-]
-
 [[package]]
 name = "rustc-demangle"
 version = "0.1.24"
@@ -787,7 +822,7 @@ version = "0.29.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9465315bc9d4566e1724f0fffcbcc446268cb522e60f9a27bcded6b19c108113"
 dependencies = [
- "bitcoin_hashes",
+ "bitcoin_hashes 0.14.0",
  "rand",
  "secp256k1-sys",
  "serde",
diff --git a/src/crates/barser/Cargo.toml b/src/crates/bitbase/Cargo.toml
similarity index 79%
rename from src/crates/barser/Cargo.toml
rename to src/crates/bitbase/Cargo.toml
index 9902da560..0febf661b 100644
--- a/src/crates/barser/Cargo.toml
+++ b/src/crates/bitbase/Cargo.toml
@@ -1,9 +1,10 @@
 [package]
-name = "barser"
+name = "bitbase"
 version = "0.1.0"
 edition = "2021"
 
 [dependencies]
+bitcoin_hashes = "0.16.0"
 biter = "0.2.2"
 color-eyre = "0.6.3"
 ctrlc = "3.4.5"
diff --git a/src/crates/bitbase/src/database/addressbytes_prefix_to_addressindex.rs b/src/crates/bitbase/src/database/addressbytes_prefix_to_addressindex.rs
new file mode 100644
index 000000000..a72cee62a
--- /dev/null
+++ b/src/crates/bitbase/src/database/addressbytes_prefix_to_addressindex.rs
@@ -0,0 +1,41 @@
+use color_eyre::eyre::eyre;
+use derive_deref::{Deref, DerefMut};
+
+use crate::structs::{Addressbytes, Addressindex, Database, DatabaseTrait, Height, Version};
+
+#[derive(Deref, DerefMut)]
+pub struct AddressbytesPrefixToAddressindex(Database);
+
+impl AddressbytesPrefixToAddressindex {
+    pub fn import() -> color_eyre::Result<Self> {
+        Ok(Self(Database::import(
+            "address_prefix_to_addressindex",
+            Self::version(),
+        )?))
+    }
+
+    pub fn insert(
+        &mut self,
+        addressbytes: &Addressbytes,
+        addressindex: Addressindex,
+        height: Height,
+    ) -> color_eyre::Result<()> {
+        if let Some(_height) =
+            self.fetch_update(addressbytes.to_prefix_slice(), addressindex.into(), height)?
+        {
+            dbg!(addressbytes, addressindex);
+            return Err(eyre!("AddressPrefixToAddressindex: key collision"));
+        }
+        Ok(())
+    }
+
+    pub fn remove(&mut self, addressbytes: &Addressbytes) {
+        self.0.remove(addressbytes.to_prefix_slice())
+    }
+}
+
+impl DatabaseTrait for AddressbytesPrefixToAddressindex {
+    fn version() -> Version {
+        Version::from(1)
+    }
+}
diff --git a/src/crates/bitbase/src/database/addressindex_to_addressbytes.rs b/src/crates/bitbase/src/database/addressindex_to_addressbytes.rs
new file mode 100644
index 000000000..228bc3965
--- /dev/null
+++ b/src/crates/bitbase/src/database/addressindex_to_addressbytes.rs
@@ -0,0 +1,43 @@
+use derive_deref::{Deref, DerefMut};
+
+use crate::structs::{Addressbytes, Addressindex, Database, DatabaseTrait, Height, Version};
+
+#[derive(Deref, DerefMut)]
+pub struct AddressindexToAddressbytes(Database);
+
+impl AddressindexToAddressbytes {
+    pub fn import() -> color_eyre::Result<Self> {
+        Ok(Self(Database::import(
+            "addressindex_to_addressbytes",
+            Self::version(),
+        )?))
+    }
+
+    pub fn get(&self, addressindex: Addressindex) -> color_eyre::Result<Option<Addressbytes>> {
+        if let Some(address) = self.0.get(addressindex.into())?.map(Addressbytes::try_from) {
+            Ok(Some(address?))
+        } else {
+            Ok(None)
+        }
+    }
+
+    pub fn insert(
+        &mut self,
+        addressindex: Addressindex,
+        addressbytes: &Addressbytes,
+        height: Height,
+    ) {
+        self.0
+            .insert(addressindex.into(), addressbytes.into(), height)
+    }
+
+    pub fn remove(&mut self, addressindex: Addressindex) {
+        self.0.remove(addressindex.into())
+    }
+}
+
+impl DatabaseTrait for AddressindexToAddressbytes {
+    fn version() -> Version {
+        Version::from(1)
+    }
+}
diff --git a/src/crates/bitbase/src/database/addressindex_to_addresstype.rs b/src/crates/bitbase/src/database/addressindex_to_addresstype.rs
new file mode 100644
index 000000000..32fc0046a
--- /dev/null
+++ b/src/crates/bitbase/src/database/addressindex_to_addresstype.rs
@@ -0,0 +1,38 @@
+use derive_deref::{Deref, DerefMut};
+
+use crate::structs::{Addressindex, Addresstype, Database, DatabaseTrait, Height, Version};
+
+#[derive(Deref, DerefMut)]
+pub struct AddressindexToAddresstype(Database);
+
+impl AddressindexToAddresstype {
+    pub fn import() -> color_eyre::Result<Self> {
+        Ok(Self(Database::import(
+            "addressindex_to_addresstype",
+            Self::version(),
+        )?))
+    }
+
+    // pub fn get(&self, addressindex: Addressindex) -> color_eyre::Result<Option<Addresstype>> {
+    //     if let Some(addresstype) = self.0.get(addressindex.into())?.map(Addresstype::try_from) {
+    //         Ok(Some(addresstype?))
+    //     } else {
+    //         Ok(None)
+    //     }
+    // }
+
+    pub fn insert(&mut self, addressindex: Addressindex, addresstype: Addresstype, height: Height) {
+        self.0
+            .insert(addressindex.into(), addresstype.into(), height)
+    }
+
+    pub fn remove(&mut self, addressindex: Addressindex) {
+        self.0.remove(addressindex.into())
+    }
+}
+
+impl DatabaseTrait for AddressindexToAddresstype {
+    fn version() -> Version {
+        Version::from(1)
+    }
+}
diff --git a/src/crates/bitbase/src/database/addressindex_to_txoutindexes.rs b/src/crates/bitbase/src/database/addressindex_to_txoutindexes.rs
new file mode 100644
index 000000000..7f173c3a9
--- /dev/null
+++ b/src/crates/bitbase/src/database/addressindex_to_txoutindexes.rs
@@ -0,0 +1,42 @@
+use derive_deref::{Deref, DerefMut};
+use fjall::Slice;
+
+use crate::structs::{
+    Addressindex, Addresstxoutindex, Database, DatabaseTrait, Height, SliceExtended, Txoutindex,
+    Version,
+};
+
+#[derive(Deref, DerefMut)]
+pub struct AddressindexToTxoutindexes(Database);
+
+impl AddressindexToTxoutindexes {
+    pub fn import() -> color_eyre::Result<Self> {
+        Ok(Self(Database::import(
+            "addressindex_to_txoutindexes",
+            Self::version(),
+        )?))
+    }
+
+    pub fn insert(&mut self, addressindex: Addressindex, txoutindex: Txoutindex, height: Height) {
+        self.0.insert(
+            Addresstxoutindex::from((addressindex, txoutindex)).into(),
+            Slice::default(),
+            height,
+        )
+    }
+
+    pub fn remove(&mut self, addressindex: Addressindex, txoutindex: Txoutindex) {
+        self.0
+            .remove(Addresstxoutindex::from((addressindex, txoutindex)).into());
+    }
+
+    pub fn is_empty(&self, addressindex: Addressindex) -> bool {
+        self.prefix(Slice::from(addressindex)).next().is_none()
+    }
+}
+
+impl DatabaseTrait for AddressindexToTxoutindexes {
+    fn version() -> Version {
+        Version::from(1)
+    }
+}
diff --git a/src/crates/barser/src/databases/blockhash_prefix_to_height.rs b/src/crates/bitbase/src/database/blockhash_prefix_to_height.rs
similarity index 100%
rename from src/crates/barser/src/databases/blockhash_prefix_to_height.rs
rename to src/crates/bitbase/src/database/blockhash_prefix_to_height.rs
diff --git a/src/crates/barser/src/databases/height_to_blockhash.rs b/src/crates/bitbase/src/database/height_to_blockhash.rs
similarity index 100%
rename from src/crates/barser/src/databases/height_to_blockhash.rs
rename to src/crates/bitbase/src/database/height_to_blockhash.rs
diff --git a/src/crates/barser/src/databases/height_to_txindex.rs b/src/crates/bitbase/src/database/height_to_txindex.rs
similarity index 100%
rename from src/crates/barser/src/databases/height_to_txindex.rs
rename to src/crates/bitbase/src/database/height_to_txindex.rs
diff --git a/src/crates/barser/src/databases/mod.rs b/src/crates/bitbase/src/database/mod.rs
similarity index 53%
rename from src/crates/barser/src/databases/mod.rs
rename to src/crates/bitbase/src/database/mod.rs
index fd9066db9..94b3469c2 100644
--- a/src/crates/barser/src/databases/mod.rs
+++ b/src/crates/bitbase/src/database/mod.rs
@@ -1,43 +1,65 @@
-use std::{ops::Sub, thread};
+use std::{collections::BTreeSet, ops::Sub, thread};
 
-use biter::{
-    bitcoin::{hashes::Hash, BlockHash, Txid},
-    bitcoincore_rpc::Client,
-};
-pub use blockhash_prefix_to_height::*;
+use biter::bitcoin::{hashes::Hash, BlockHash, Txid};
 use color_eyre::eyre::ContextCompat;
 use fjall::Slice;
 
+mod addressbytes_prefix_to_addressindex;
+mod addressindex_to_addressbytes;
+mod addressindex_to_addresstype;
+mod addressindex_to_txoutindexes;
 mod blockhash_prefix_to_height;
 mod height_to_blockhash;
 mod height_to_txindex;
 mod txid_prefix_to_txindex;
+mod txindex_to_height;
 mod txindex_to_txid;
+mod txoutindex_to_addressindex;
 mod txoutindex_to_amount;
 
+pub use addressbytes_prefix_to_addressindex::*;
+pub use addressindex_to_addressbytes::*;
+pub use addressindex_to_addresstype::*;
+pub use addressindex_to_txoutindexes::*;
+pub use blockhash_prefix_to_height::*;
 pub use height_to_blockhash::*;
 pub use height_to_txindex::*;
 pub use txid_prefix_to_txindex::*;
+pub use txindex_to_height::*;
 pub use txindex_to_txid::*;
+pub use txoutindex_to_addressindex::*;
 pub use txoutindex_to_amount::*;
 
-use crate::structs::{Height, Txindex, Txoutindex};
+use crate::structs::{Addressindex, Exit, Height, Txindex, Txoutindex};
 
-pub struct Databases {
+pub struct Database {
+    pub addressbytes_prefix_to_addressindex: AddressbytesPrefixToAddressindex,
+    pub addressindex_to_addressbytes: AddressindexToAddressbytes,
+    pub addressindex_to_addresstype: AddressindexToAddresstype,
+    pub addressindex_to_txoutindexes: AddressindexToTxoutindexes,
     pub blockhash_prefix_to_height: BlockhashPrefixToHeight,
     pub height_to_blockhash: HeightToBlockhash,
     pub height_to_first_txindex: HeightToTxindex,
     pub height_to_last_txindex: HeightToTxindex,
     pub txid_prefix_to_txindex: TxidPrefixToTxindex,
     pub txindex_to_txid: TxindexToTxid,
+    pub txindex_to_height: TxindexToHeight,
+    pub txoutindex_to_addressindex: TxoutindexToAddressindex,
     pub txoutindex_to_amount: TxoutindexToAmount,
 }
 
 const UNSAFE_BLOCKS: usize = 100;
 
-impl Databases {
+impl Database {
     pub fn import() -> color_eyre::Result<Self> {
         thread::scope(|scope| {
+            let addressbytes_prefix_to_addressindex_handle =
+                scope.spawn(AddressbytesPrefixToAddressindex::import);
+            let addressindex_to_addressbytes_handle =
+                scope.spawn(AddressindexToAddressbytes::import);
+            let addressindex_to_addresstype_handle = scope.spawn(AddressindexToAddresstype::import);
+            let addressindex_to_txoutindexes_handle =
+                scope.spawn(AddressindexToTxoutindexes::import);
             let blockhash_prefix_to_height_handle = scope.spawn(BlockhashPrefixToHeight::import);
             let height_to_blockhash_handle = scope.spawn(HeightToBlockhash::import);
             let height_to_first_txindex_handle =
@@ -45,16 +67,30 @@ impl Databases {
             let height_to_last_txindex_handle =
                 scope.spawn(|| HeightToTxindex::import(HeightToTxindexPosition::Last));
             let txid_prefix_to_txindex_handle = scope.spawn(TxidPrefixToTxindex::import);
+            let txindex_to_height_handle = scope.spawn(TxindexToHeight::import);
             let txindex_to_txid_handle = scope.spawn(TxindexToTxid::import);
+            let txoutindex_to_addressindex_handle = scope.spawn(TxoutindexToAddressindex::import);
             let txoutindex_to_amount_handle = scope.spawn(TxoutindexToAmount::import);
 
             Ok(Self {
+                addressbytes_prefix_to_addressindex: addressbytes_prefix_to_addressindex_handle
+                    .join()
+                    .unwrap()?,
+                addressindex_to_addressbytes: addressindex_to_addressbytes_handle
+                    .join()
+                    .unwrap()?,
+                addressindex_to_addresstype: addressindex_to_addresstype_handle.join().unwrap()?,
+                addressindex_to_txoutindexes: addressindex_to_txoutindexes_handle
+                    .join()
+                    .unwrap()?,
                 blockhash_prefix_to_height: blockhash_prefix_to_height_handle.join().unwrap()?,
                 height_to_blockhash: height_to_blockhash_handle.join().unwrap()?,
                 height_to_first_txindex: height_to_first_txindex_handle.join().unwrap()?,
                 height_to_last_txindex: height_to_last_txindex_handle.join().unwrap()?,
                 txid_prefix_to_txindex: txid_prefix_to_txindex_handle.join().unwrap()?,
+                txindex_to_height: txindex_to_height_handle.join().unwrap()?,
                 txindex_to_txid: txindex_to_txid_handle.join().unwrap()?,
+                txoutindex_to_addressindex: txoutindex_to_addressindex_handle.join().unwrap()?,
                 txoutindex_to_amount: txoutindex_to_amount_handle.join().unwrap()?,
             })
         })
@@ -62,34 +98,47 @@ impl Databases {
 
     pub fn export(&mut self, height: Height) -> color_eyre::Result<()> {
         thread::scope(|scope| {
+            scope.spawn(|| {
+                self.addressbytes_prefix_to_addressindex
+                    .export(height)
+                    .unwrap()
+            });
+            scope.spawn(|| self.addressindex_to_addressbytes.export(height).unwrap());
+            scope.spawn(|| self.addressindex_to_addresstype.export(height).unwrap());
+            scope.spawn(|| self.addressindex_to_txoutindexes.export(height).unwrap());
             scope.spawn(|| self.blockhash_prefix_to_height.export(height).unwrap());
             scope.spawn(|| self.height_to_blockhash.export(height).unwrap());
             scope.spawn(|| self.height_to_first_txindex.export(height).unwrap());
             scope.spawn(|| self.height_to_last_txindex.export(height).unwrap());
             scope.spawn(|| self.txid_prefix_to_txindex.export(height).unwrap());
+            scope.spawn(|| self.txindex_to_height.export(height).unwrap());
             scope.spawn(|| self.txindex_to_txid.export(height).unwrap());
+            scope.spawn(|| self.txoutindex_to_addressindex.export(height).unwrap());
             scope.spawn(|| self.txoutindex_to_amount.export(height).unwrap());
         });
         Ok(())
     }
 
-    pub fn start_height(&self, rpc: &Client) -> color_eyre::Result<Height> {
-        let safe_height = Height::try_from(rpc)?.sub(UNSAFE_BLOCKS);
-        Ok(self
-            .min_height()
+    pub fn start_height(&self) -> Height {
+        self.min_height()
             .map(|h| h.sub(UNSAFE_BLOCKS))
             .unwrap_or_default()
-            .min(safe_height))
     }
 
     fn min_height(&self) -> Option<Height> {
         [
+            self.addressbytes_prefix_to_addressindex.height(),
+            self.addressindex_to_addressbytes.height(),
+            self.addressindex_to_addresstype.height(),
+            self.addressindex_to_txoutindexes.height(),
             self.blockhash_prefix_to_height.height(),
             self.height_to_blockhash.height(),
             self.height_to_first_txindex.height(),
             self.height_to_last_txindex.height(),
             self.txid_prefix_to_txindex.height(),
+            self.txindex_to_height.height(),
             self.txindex_to_txid.height(),
+            self.txoutindex_to_addressindex.height(),
             self.txoutindex_to_amount.height(),
         ]
         .into_iter()
@@ -109,7 +158,11 @@ impl Databases {
             .is_some_and(|saved_blockhash| blockhash != &saved_blockhash))
     }
 
-    pub fn erase_from(&mut self, height: Height) -> color_eyre::Result<()> {
+    pub fn rollback_from(&mut self, height: Height, exit: &Exit) -> color_eyre::Result<()> {
+        exit.block();
+
+        self.export(height)?;
+
         let mut txindex = None;
 
         self.height_to_blockhash
@@ -144,6 +197,7 @@ impl Databases {
                 let txid = Txid::from_slice(&slice_txid)?;
 
                 self.txindex_to_txid.remove(txindex);
+                self.txindex_to_height.remove(txindex);
                 self.txid_prefix_to_txindex.remove(&txid);
 
                 Ok(())
@@ -151,6 +205,8 @@ impl Databases {
 
         let txoutindex = Txoutindex::from(txindex);
 
+        let mut addressindexes = BTreeSet::new();
+
         self.txoutindex_to_amount
             .range(Slice::from(txoutindex)..)
             .try_for_each(|slice| -> color_eyre::Result<()> {
@@ -159,9 +215,42 @@ impl Databases {
 
                 self.txoutindex_to_amount.remove(txoutindex);
 
+                if let Some(addressindex_slice) =
+                    self.txoutindex_to_addressindex.get(txoutindex.into())?
+                {
+                    self.txoutindex_to_addressindex.remove(txoutindex);
+
+                    let addressindex = Addressindex::from(addressindex_slice);
+                    addressindexes.insert(addressindex);
+                    self.addressindex_to_txoutindexes
+                        .remove(addressindex, txoutindex);
+                }
+
                 Ok(())
             })?;
 
+        self.export(height)?;
+
+        addressindexes
+            .into_iter()
+            .filter(|addressindex| self.addressindex_to_txoutindexes.is_empty(*addressindex))
+            .try_for_each(|addressindex| -> color_eyre::Result<()> {
+                let addressbytes = self
+                    .addressindex_to_addressbytes
+                    .get(addressindex)?
+                    .context("addressindex_to_address to have value")?;
+                self.addressbytes_prefix_to_addressindex
+                    .remove(&addressbytes);
+                self.addressindex_to_addressbytes.remove(addressindex);
+                self.addressindex_to_addresstype.remove(addressindex);
+
+                Ok(())
+            })?;
+
+        self.export(height)?;
+
+        exit.unblock();
+
         Ok(())
     }
 }
diff --git a/src/crates/barser/src/databases/txid_prefix_to_txindex.rs b/src/crates/bitbase/src/database/txid_prefix_to_txindex.rs
similarity index 100%
rename from src/crates/barser/src/databases/txid_prefix_to_txindex.rs
rename to src/crates/bitbase/src/database/txid_prefix_to_txindex.rs
diff --git a/src/crates/bitbase/src/database/txindex_to_height.rs b/src/crates/bitbase/src/database/txindex_to_height.rs
new file mode 100644
index 000000000..32bb956a8
--- /dev/null
+++ b/src/crates/bitbase/src/database/txindex_to_height.rs
@@ -0,0 +1,29 @@
+use derive_deref::{Deref, DerefMut};
+
+use crate::structs::{Database, DatabaseTrait, Height, Txindex, Version};
+
+#[derive(Deref, DerefMut)]
+pub struct TxindexToHeight(Database);
+
+impl TxindexToHeight {
+    pub fn import() -> color_eyre::Result<Self> {
+        Ok(Self(Database::import(
+            "txindex_to_height",
+            Self::version(),
+        )?))
+    }
+
+    pub fn insert(&mut self, txindex: Txindex, height: Height) {
+        self.0.insert(txindex.into(), height.into(), height)
+    }
+
+    pub fn remove(&mut self, txindex: Txindex) {
+        self.0.remove(txindex.into())
+    }
+}
+
+impl DatabaseTrait for TxindexToHeight {
+    fn version() -> Version {
+        Version::from(1)
+    }
+}
diff --git a/src/crates/barser/src/databases/txindex_to_txid.rs b/src/crates/bitbase/src/database/txindex_to_txid.rs
similarity index 91%
rename from src/crates/barser/src/databases/txindex_to_txid.rs
rename to src/crates/bitbase/src/database/txindex_to_txid.rs
index 9c913f98b..7369fd6bf 100644
--- a/src/crates/barser/src/databases/txindex_to_txid.rs
+++ b/src/crates/bitbase/src/database/txindex_to_txid.rs
@@ -1,6 +1,5 @@
 use biter::bitcoin::Txid;
 use derive_deref::{Deref, DerefMut};
-use fjall::Slice;
 
 use crate::structs::{Database, DatabaseTrait, Height, Txindex, Version};
 
@@ -17,7 +16,7 @@ impl TxindexToTxid {
     }
 
     pub fn remove(&mut self, txindex: Txindex) {
-        self.0.remove(Slice::from(txindex))
+        self.0.remove(txindex.into())
     }
 }
 
diff --git a/src/crates/bitbase/src/database/txoutindex_to_addressindex.rs b/src/crates/bitbase/src/database/txoutindex_to_addressindex.rs
new file mode 100644
index 000000000..d71631db7
--- /dev/null
+++ b/src/crates/bitbase/src/database/txoutindex_to_addressindex.rs
@@ -0,0 +1,30 @@
+use derive_deref::{Deref, DerefMut};
+
+use crate::structs::{Addressindex, Database, DatabaseTrait, Height, Txoutindex, Version};
+
+#[derive(Deref, DerefMut)]
+pub struct TxoutindexToAddressindex(Database);
+
+impl TxoutindexToAddressindex {
+    pub fn import() -> color_eyre::Result<Self> {
+        Ok(Self(Database::import(
+            "txoutindex_to_addressindex",
+            Self::version(),
+        )?))
+    }
+
+    pub fn insert(&mut self, txoutindex: Txoutindex, addressindex: Addressindex, height: Height) {
+        self.0
+            .insert(txoutindex.into(), addressindex.into(), height)
+    }
+
+    pub fn remove(&mut self, txoutindex: Txoutindex) {
+        self.0.remove(txoutindex.into())
+    }
+}
+
+impl DatabaseTrait for TxoutindexToAddressindex {
+    fn version() -> Version {
+        Version::from(1)
+    }
+}
diff --git a/src/crates/barser/src/databases/txoutindex_to_amount.rs b/src/crates/bitbase/src/database/txoutindex_to_amount.rs
similarity index 91%
rename from src/crates/barser/src/databases/txoutindex_to_amount.rs
rename to src/crates/bitbase/src/database/txoutindex_to_amount.rs
index 7ac6de829..6a014d342 100644
--- a/src/crates/barser/src/databases/txoutindex_to_amount.rs
+++ b/src/crates/bitbase/src/database/txoutindex_to_amount.rs
@@ -1,5 +1,4 @@
 use derive_deref::{Deref, DerefMut};
-use fjall::Slice;
 
 use crate::structs::{Amount, Database, DatabaseTrait, Height, Txoutindex, Version};
 
@@ -19,7 +18,7 @@ impl TxoutindexToAmount {
     }
 
     pub fn remove(&mut self, txoutindex: Txoutindex) {
-        self.0.remove(Slice::from(txoutindex))
+        self.0.remove(txoutindex.into())
     }
 }
 
diff --git a/src/crates/bitbase/src/main.rs b/src/crates/bitbase/src/main.rs
new file mode 100644
index 000000000..5e42ee33d
--- /dev/null
+++ b/src/crates/bitbase/src/main.rs
@@ -0,0 +1,167 @@
+use std::path::Path;
+
+use biter::bitcoincore_rpc::{Auth, Client};
+
+mod database;
+mod structs;
+
+use database::Database;
+use fjall::Slice;
+use structs::{Addressbytes, Addressindex, Addresstype, Exit, Height, Txindex, Txoutindex};
+
+// https://github.com/fjall-rs/fjall/discussions/72
+// https://github.com/romanz/electrs/blob/master/doc/schema.md
+
+const DAILY_BLOCK_TARGET: usize = 144;
+const MONTHLY_BLOCK_TARGET: usize = DAILY_BLOCK_TARGET * 30;
+
+fn main() -> color_eyre::Result<()> {
+    let i = std::time::Instant::now();
+
+    let data_dir = Path::new("../../../../bitcoin");
+    let cookie = Path::new(data_dir).join(".cookie");
+    let rpc = Client::new("http://localhost:8332", Auth::CookieFile(cookie)).unwrap();
+
+    let exit = Exit::new();
+
+    let mut db = Database::import()?;
+
+    let mut height = db.start_height();
+
+    let mut txindex = db
+        .height_to_last_txindex
+        .get(height)?
+        .map(Txindex::incremented)
+        .unwrap_or(Txindex::default());
+
+    let mut addressindex = db
+        .txoutindex_to_addressindex
+        .prefix(Slice::from(txindex))
+        .last()
+        .map(|res| -> color_eyre::Result<Addressindex> {
+            Ok(Addressindex::from(res?.1).incremented())
+        })
+        .unwrap_or(Ok(Addressindex::default()))?;
+
+    let export = |db: &mut Database, height: Height| -> color_eyre::Result<()> {
+        exit.block();
+        println!("Exporting...");
+        db.export(height)?;
+        println!("Export done");
+        exit.unblock();
+        Ok(())
+    };
+
+    biter::new(data_dir, Some(height.into()), None, rpc)
+        .iter()
+        .try_for_each(|(_height, block, blockhash)| -> color_eyre::Result<()> {
+            println!("Processing block {_height}...");
+
+            height = Height::from(_height);
+
+            if db.has_different_blockhash(height, &blockhash)? {
+                db.rollback_from(height, &exit)?;
+            }
+
+            db.blockhash_prefix_to_height.insert(&blockhash, height)?;
+            db.height_to_blockhash.insert(height, &blockhash);
+
+            let txlen = block.txdata.len();
+            let last_txindex = txlen - 1;
+
+            block.txdata.into_iter().enumerate().try_for_each(
+                |(txi, tx)| -> color_eyre::Result<()> {
+                    if txi == 0 {
+                        db.height_to_first_txindex.insert(height, txindex);
+                    }
+                    if txi == last_txindex {
+                        db.height_to_last_txindex.insert(height, txindex);
+                    }
+
+                    if !db.txindex_to_txid.is_safe(height)
+                        || !db.txid_prefix_to_txindex.is_safe(height)
+                    {
+                        let txid = tx.compute_txid();
+                        db.txindex_to_txid.insert(txindex, &txid, height);
+                        db.txid_prefix_to_txindex.insert(&txid, txindex, height)?;
+                    }
+
+                    db.txindex_to_height.insert(txindex, height);
+
+                    txindex.increment();
+
+                    tx.output.into_iter().enumerate().try_for_each(
+                        |(vout, txout)| -> color_eyre::Result<()> {
+                            let vout = vout as u16;
+                            let txoutindex = Txoutindex::from((txindex, vout));
+                            let amount = txout.value.into();
+                            db.txoutindex_to_amount.insert(txoutindex, amount, height);
+
+                            let script = &txout.script_pubkey;
+
+                            let addressbytes =
+                                Addressbytes::try_from(script).inspect_err(|_| {
+                                    dbg!(&txout, height, txi);
+                                })?;
+                            let addresstype = Addresstype::try_from(script)?;
+
+                            let mut addressindex_local = addressindex;
+
+                            if let Some(addressindex_slice) = db
+                                .addressbytes_prefix_to_addressindex
+                                .get((&addressbytes).into())?
+                            {
+                                addressindex_local = addressindex_slice.into()
+                            } else {
+                                db.addressbytes_prefix_to_addressindex
+                                    .insert(&addressbytes, addressindex_local, height)
+                                    .inspect_err(|_| {
+                                        dbg!(addresstype);
+                                    })?;
+                                db.addressindex_to_addressbytes.insert(
+                                    addressindex_local,
+                                    &addressbytes,
+                                    height,
+                                );
+                                db.addressindex_to_addresstype.insert(
+                                    addressindex_local,
+                                    addresstype,
+                                    height,
+                                );
+                                addressindex.increment();
+                            }
+
+                            db.txoutindex_to_addressindex.insert(
+                                txoutindex,
+                                addressindex_local,
+                                height,
+                            );
+
+                            db.addressindex_to_txoutindexes.insert(
+                                addressindex_local,
+                                txoutindex,
+                                height,
+                            );
+
+                            Ok(())
+                        },
+                    )?;
+
+                    Ok(())
+                },
+            )?;
+
+            let should_snapshot = _height % MONTHLY_BLOCK_TARGET == 0 && !exit.active();
+            if should_snapshot {
+                export(&mut db, height)?;
+            }
+
+            Ok(())
+        })?;
+
+    export(&mut db, height)?;
+
+    dbg!(i.elapsed());
+
+    Ok(())
+}
diff --git a/src/crates/bitbase/src/structs/addressbytes.rs b/src/crates/bitbase/src/structs/addressbytes.rs
new file mode 100644
index 000000000..f3533abd9
--- /dev/null
+++ b/src/crates/bitbase/src/structs/addressbytes.rs
@@ -0,0 +1,53 @@
+use biter::bitcoin::ScriptBuf;
+use color_eyre::eyre::eyre;
+use fjall::Slice;
+
+#[derive(Debug)]
+pub struct Addressbytes(Slice);
+
+impl Addressbytes {
+    pub fn to_prefix_slice(&self) -> Slice {
+        self.0[..8].into()
+    }
+}
+
+impl TryFrom<&ScriptBuf> for Addressbytes {
+    type Error = color_eyre::Report;
+    fn try_from(script: &ScriptBuf) -> Result<Self, Self::Error> {
+        if script.is_p2pk() {
+            let bytes = script.as_bytes();
+            let bytes = match bytes.len() {
+                67 => &script.as_bytes()[1..66],
+                35 => &script.as_bytes()[1..34],
+                _ => {
+                    dbg!(bytes);
+                    return Err(eyre!("Wrong len"));
+                }
+            };
+
+            if bytes[0] != 4 {
+                dbg!(bytes);
+                return Err(eyre!("Doesn't start with a 4"));
+            }
+
+            Ok(Self(bytes.into()))
+        } else if script.is_p2pkh() {
+            let bytes = &script.as_bytes()[3..23];
+
+            Ok(Self(bytes.into()))
+        } else {
+            Err(eyre!("Unsupported address type"))
+        }
+    }
+}
+
+impl From<Slice> for Addressbytes {
+    fn from(value: Slice) -> Self {
+        Self(value)
+    }
+}
+impl From<&Addressbytes> for Slice {
+    fn from(value: &Addressbytes) -> Self {
+        value.0.clone()
+    }
+}
diff --git a/src/crates/bitbase/src/structs/addressindex.rs b/src/crates/bitbase/src/structs/addressindex.rs
new file mode 100644
index 000000000..0d53e05d2
--- /dev/null
+++ b/src/crates/bitbase/src/structs/addressindex.rs
@@ -0,0 +1,47 @@
+use derive_deref::{Deref, DerefMut};
+use fjall::Slice;
+
+use super::SliceExtended;
+
+#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Deref, DerefMut, Default)]
+pub struct Addressindex(u32);
+
+impl Addressindex {
+    pub const BYTES: usize = size_of::<Self>();
+
+    pub fn increment(&mut self) {
+        self.0 += 1;
+    }
+
+    pub fn incremented(self) -> Self {
+        Self(*self + 1)
+    }
+}
+
+impl From<u32> for Addressindex {
+    fn from(value: u32) -> Self {
+        Self(value)
+    }
+}
+
+impl From<u64> for Addressindex {
+    fn from(value: u64) -> Self {
+        Self(value as u32)
+    }
+}
+impl From<Addressindex> for u64 {
+    fn from(value: Addressindex) -> Self {
+        value.0 as u64
+    }
+}
+
+impl From<Slice> for Addressindex {
+    fn from(slice: Slice) -> Self {
+        Self(slice.read_u32())
+    }
+}
+impl From<Addressindex> for Slice {
+    fn from(value: Addressindex) -> Self {
+        value.to_be_bytes().into()
+    }
+}
diff --git a/src/crates/bitbase/src/structs/addresstxoutindex.rs b/src/crates/bitbase/src/structs/addresstxoutindex.rs
new file mode 100644
index 000000000..b83cde83e
--- /dev/null
+++ b/src/crates/bitbase/src/structs/addresstxoutindex.rs
@@ -0,0 +1,35 @@
+use fjall::Slice;
+
+use super::{Addressindex, Txoutindex};
+
+pub struct Addresstxoutindex {
+    addressindex: Addressindex,
+    txoutindex: Txoutindex,
+}
+
+impl From<(Addressindex, Txoutindex)> for Addresstxoutindex {
+    fn from(value: (Addressindex, Txoutindex)) -> Self {
+        Self {
+            addressindex: value.0,
+            txoutindex: value.1,
+        }
+    }
+}
+
+impl From<Addresstxoutindex> for Slice {
+    fn from(value: Addresstxoutindex) -> Self {
+        let txindex_slice = Self::from(value.addressindex);
+        let vout_slice = Self::from(value.txoutindex);
+        Self::from([txindex_slice, vout_slice].concat())
+    }
+}
+impl From<Slice> for Addresstxoutindex {
+    fn from(value: Slice) -> Self {
+        let addressindex = Addressindex::from(Slice::from(&value[..Addressindex::BYTES]));
+        let txoutindex = Txoutindex::from(Slice::from(&value[Addressindex::BYTES..]));
+        Self {
+            addressindex,
+            txoutindex,
+        }
+    }
+}
diff --git a/src/crates/bitbase/src/structs/addresstype.rs b/src/crates/bitbase/src/structs/addresstype.rs
new file mode 100644
index 000000000..716c844d1
--- /dev/null
+++ b/src/crates/bitbase/src/structs/addresstype.rs
@@ -0,0 +1,40 @@
+use biter::bitcoin::ScriptBuf;
+use color_eyre::eyre::eyre;
+use fjall::Slice;
+
+use super::SliceExtended;
+
+#[derive(Debug, Clone, Copy)]
+pub enum Addresstype {
+    P2PK,
+    P2PKH,
+}
+
+impl TryFrom<&ScriptBuf> for Addresstype {
+    type Error = color_eyre::Report;
+    fn try_from(value: &ScriptBuf) -> Result<Self, Self::Error> {
+        if value.is_p2pk() {
+            Ok(Self::P2PK)
+        } else if value.is_p2pkh() {
+            Ok(Self::P2PKH)
+        } else {
+            Err(eyre!("Not compatible script"))
+        }
+    }
+}
+
+impl TryFrom<Slice> for Addresstype {
+    type Error = color_eyre::Report;
+    fn try_from(value: Slice) -> Result<Self, Self::Error> {
+        match value.read_u8() {
+            x if x == Addresstype::P2PK as u8 => Ok(Addresstype::P2PK),
+            x if x == Addresstype::P2PKH as u8 => Ok(Addresstype::P2PKH),
+            _ => Err(eyre!("Unknown type")),
+        }
+    }
+}
+impl From<Addresstype> for Slice {
+    fn from(addresstype: Addresstype) -> Self {
+        (addresstype as u8).to_be_bytes().into()
+    }
+}
diff --git a/src/crates/barser/src/structs/amount.rs b/src/crates/bitbase/src/structs/amount.rs
similarity index 97%
rename from src/crates/barser/src/structs/amount.rs
rename to src/crates/bitbase/src/structs/amount.rs
index d25acf47a..0219842d7 100644
--- a/src/crates/barser/src/structs/amount.rs
+++ b/src/crates/bitbase/src/structs/amount.rs
@@ -5,6 +5,7 @@ use std::{
 
 use biter::bitcoin;
 use derive_deref::{Deref, DerefMut};
+use fjall::Slice;
 
 use super::Height;
 
@@ -29,7 +30,7 @@ impl From<bitcoin::Amount> for Amount {
     }
 }
 
-impl From<Amount> for fjall::Slice {
+impl From<Amount> for Slice {
     fn from(value: Amount) -> Self {
         value.to_sat().to_be_bytes().into()
     }
diff --git a/src/crates/barser/src/structs/exit.rs b/src/crates/bitbase/src/structs/exit.rs
similarity index 100%
rename from src/crates/barser/src/structs/exit.rs
rename to src/crates/bitbase/src/structs/exit.rs
diff --git a/src/crates/barser/src/structs/database.rs b/src/crates/bitbase/src/structs/fjall.rs
similarity index 90%
rename from src/crates/barser/src/structs/database.rs
rename to src/crates/bitbase/src/structs/fjall.rs
index f33aa304f..cfae90a45 100644
--- a/src/crates/barser/src/structs/database.rs
+++ b/src/crates/bitbase/src/structs/fjall.rs
@@ -1,10 +1,8 @@
 use std::{mem, ops::RangeBounds};
 
-use fjall::{
-    Batch, Keyspace, KvPair, PartitionCreateOptions, PartitionHandle, PersistMode, Result, Slice,
-};
+pub use fjall::*;
 
-use super::{Height, Version};
+use crate::structs::{Height, Version};
 
 pub struct Database {
     keyspace: Keyspace,
@@ -19,7 +17,7 @@ const HEIGHT: &str = "height";
 
 impl Database {
     pub fn import(name: &str, version: Version) -> Result<Self> {
-        let keyspace = fjall::Config::new(format!("./databases/{name}")).open()?;
+        let keyspace = fjall::Config::new(format!("./database/{name}")).open()?;
 
         let data = Self::open_data(&keyspace)?;
         let meta = Self::open_meta(&keyspace)?;
@@ -69,6 +67,13 @@ impl Database {
         self.data.range(range)
     }
 
+    pub fn prefix<'a, K: AsRef<[u8]> + 'a>(
+        &'a self,
+        prefix: K,
+    ) -> impl DoubleEndedIterator<Item = Result<KvPair>> + 'static {
+        self.data.prefix(prefix)
+    }
+
     pub fn insert(&mut self, key: Slice, value: Slice, height: Height) {
         if self.is_safe(height) {
             return;
diff --git a/src/crates/barser/src/structs/height.rs b/src/crates/bitbase/src/structs/height.rs
similarity index 94%
rename from src/crates/barser/src/structs/height.rs
rename to src/crates/bitbase/src/structs/height.rs
index d39992459..cd5aa23fb 100644
--- a/src/crates/barser/src/structs/height.rs
+++ b/src/crates/bitbase/src/structs/height.rs
@@ -5,18 +5,19 @@ use std::{
 
 use biter::bitcoincore_rpc::{self, RpcApi};
 use derive_deref::{Deref, DerefMut};
+use fjall::Slice;
 
 use super::SliceExtended;
 
 #[derive(Debug, Clone, Copy, Deref, DerefMut, PartialEq, Eq, PartialOrd, Ord, Default)]
 pub struct Height(u32);
 
-impl From<fjall::Slice> for Height {
-    fn from(slice: fjall::Slice) -> Self {
+impl From<Slice> for Height {
+    fn from(slice: Slice) -> Self {
         Self(slice.read_u32())
     }
 }
-impl From<Height> for fjall::Slice {
+impl From<Height> for Slice {
     fn from(value: Height) -> Self {
         value.to_be_bytes().into()
     }
diff --git a/src/crates/barser/src/structs/mod.rs b/src/crates/bitbase/src/structs/mod.rs
similarity index 51%
rename from src/crates/barser/src/structs/mod.rs
rename to src/crates/bitbase/src/structs/mod.rs
index 574b6655a..ad6ef9954 100644
--- a/src/crates/barser/src/structs/mod.rs
+++ b/src/crates/bitbase/src/structs/mod.rs
@@ -1,15 +1,23 @@
+mod addressbytes;
+mod addressindex;
+mod addresstxoutindex;
+mod addresstype;
 mod amount;
-mod database;
 mod exit;
+mod fjall;
 mod height;
 mod slice;
 mod txindex;
 mod txoutindex;
 mod version;
 
+pub use addressbytes::*;
+pub use addressindex::*;
+pub use addresstxoutindex::*;
+pub use addresstype::*;
 pub use amount::*;
-pub use database::*;
 pub use exit::*;
+pub use fjall::*;
 pub use height::*;
 pub use slice::*;
 pub use txindex::*;
diff --git a/src/crates/barser/src/structs/slice.rs b/src/crates/bitbase/src/structs/slice.rs
similarity index 70%
rename from src/crates/barser/src/structs/slice.rs
rename to src/crates/bitbase/src/structs/slice.rs
index 2602f8bd5..98e47c7f3 100644
--- a/src/crates/barser/src/structs/slice.rs
+++ b/src/crates/bitbase/src/structs/slice.rs
@@ -1,19 +1,34 @@
 use std::io::Read;
 
+use fjall::Slice;
+
+#[allow(unused)]
 pub trait SliceExtended {
+    fn default() -> Self;
     fn read_u8(&self) -> u8;
+    fn read_u16(&self) -> u16;
     fn read_u32(&self) -> u32;
     fn read_u64(&self) -> u64;
     fn read_exact(&self, buf: &mut [u8]);
 }
 
-impl SliceExtended for fjall::Slice {
+impl SliceExtended for Slice {
+    fn default() -> Self {
+        Self::new(&[])
+    }
+
     fn read_u8(&self) -> u8 {
         let mut buf: [u8; 1] = [0; 1];
         self.read_exact(&mut buf);
         u8::from_be_bytes(buf)
     }
 
+    fn read_u16(&self) -> u16 {
+        let mut buf: [u8; 2] = [0; 2];
+        self.read_exact(&mut buf);
+        u16::from_be_bytes(buf)
+    }
+
     fn read_u32(&self) -> u32 {
         let mut buf: [u8; 4] = [0; 4];
         self.read_exact(&mut buf);
diff --git a/src/crates/barser/src/structs/txindex.rs b/src/crates/bitbase/src/structs/txindex.rs
similarity index 81%
rename from src/crates/barser/src/structs/txindex.rs
rename to src/crates/bitbase/src/structs/txindex.rs
index 45d02e751..2df5434fa 100644
--- a/src/crates/barser/src/structs/txindex.rs
+++ b/src/crates/bitbase/src/structs/txindex.rs
@@ -1,4 +1,5 @@
 use derive_deref::{Deref, DerefMut};
+use fjall::Slice;
 
 use super::SliceExtended;
 
@@ -6,6 +7,8 @@ use super::SliceExtended;
 pub struct Txindex(u32);
 
 impl Txindex {
+    pub const BYTES: usize = size_of::<Self>();
+
     pub fn increment(&mut self) {
         self.0 += 1;
     }
@@ -32,12 +35,12 @@ impl From<Txindex> for u64 {
     }
 }
 
-impl From<fjall::Slice> for Txindex {
-    fn from(slice: fjall::Slice) -> Self {
+impl From<Slice> for Txindex {
+    fn from(slice: Slice) -> Self {
         Self(slice.read_u32())
     }
 }
-impl From<Txindex> for fjall::Slice {
+impl From<Txindex> for Slice {
     fn from(value: Txindex) -> Self {
         value.to_be_bytes().into()
     }
diff --git a/src/crates/bitbase/src/structs/txoutindex.rs b/src/crates/bitbase/src/structs/txoutindex.rs
new file mode 100644
index 000000000..69b194aff
--- /dev/null
+++ b/src/crates/bitbase/src/structs/txoutindex.rs
@@ -0,0 +1,46 @@
+use fjall::Slice;
+
+use super::{SliceExtended, Txindex};
+
+#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Default)]
+pub struct Txoutindex {
+    pub txindex: Txindex,
+    pub vout: u16,
+}
+
+impl Txoutindex {
+    pub const BYTES: usize = size_of::<Self>();
+}
+
+impl From<Txindex> for Txoutindex {
+    fn from(value: Txindex) -> Self {
+        Self {
+            txindex: value,
+            vout: 0,
+        }
+    }
+}
+
+impl From<(Txindex, u16)> for Txoutindex {
+    fn from(value: (Txindex, u16)) -> Self {
+        Self {
+            txindex: value.0,
+            vout: value.1,
+        }
+    }
+}
+
+impl From<Txoutindex> for Slice {
+    fn from(value: Txoutindex) -> Self {
+        let txindex_slice = Self::from(value.txindex);
+        let vout_slice = Self::from(value.vout.to_be_bytes());
+        Self::from([txindex_slice, vout_slice].concat())
+    }
+}
+impl From<Slice> for Txoutindex {
+    fn from(value: Slice) -> Self {
+        let txindex = Txindex::from(Slice::from(&value[..Txindex::BYTES]));
+        let vout = Slice::from(&value[Txindex::BYTES..]).read_u16();
+        Self { txindex, vout }
+    }
+}
diff --git a/src/crates/barser/src/structs/version.rs b/src/crates/bitbase/src/structs/version.rs
similarity index 77%
rename from src/crates/barser/src/structs/version.rs
rename to src/crates/bitbase/src/structs/version.rs
index 4c0dfe27e..0c4692388 100644
--- a/src/crates/barser/src/structs/version.rs
+++ b/src/crates/bitbase/src/structs/version.rs
@@ -1,4 +1,5 @@
 use derive_deref::{Deref, DerefMut};
+use fjall::Slice;
 
 use super::SliceExtended;
 
@@ -11,8 +12,8 @@ impl From<u8> for Version {
     }
 }
 
-impl From<fjall::Slice> for Version {
-    fn from(slice: fjall::Slice) -> Self {
+impl From<Slice> for Version {
+    fn from(slice: Slice) -> Self {
         Self(slice.read_u8())
     }
 }
diff --git a/src/crates/biter/Cargo.lock b/src/crates/biter/Cargo.lock
index 0de88bd25..04c5c6ee7 100644
--- a/src/crates/biter/Cargo.lock
+++ b/src/crates/biter/Cargo.lock
@@ -243,9 +243,9 @@ checksum = "3011d1213f159867b13cfd6ac92d2cd5f1345762c63be3554e84092d85a50bbd"
 
 [[package]]
 name = "itoa"
-version = "1.0.11"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
+checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
 
 [[package]]
 name = "jsonrpc"
@@ -308,9 +308,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.37"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
+checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc"
 dependencies = [
  "proc-macro2",
 ]
@@ -394,18 +394,18 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.216"
+version = "1.0.217"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b9781016e935a97e8beecf0c933758c97a5520d32930e460142b4cd80c6338e"
+checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.216"
+version = "1.0.217"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46f859dbbf73865c6627ed570e78961cd3ac92407a2d117204c49232485da55e"
+checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -414,9 +414,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.133"
+version = "1.0.134"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377"
+checksum = "d00f4175c42ee48b15416f6193a959ba3a0d67fc699a0db9ad12df9f83991c7d"
 dependencies = [
  "itoa",
  "memchr",
@@ -432,9 +432,9 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 
 [[package]]
 name = "syn"
-version = "2.0.90"
+version = "2.0.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31"
+checksum = "9c786062daee0d6db1132800e623df74274a0a87322d8e183338e01b3d98d058"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/src/crates/biter/Cargo.toml b/src/crates/biter/Cargo.toml
index e9ad3f63a..26db5dd47 100644
--- a/src/crates/biter/Cargo.toml
+++ b/src/crates/biter/Cargo.toml
@@ -12,8 +12,8 @@ edition = "2021"
 bitcoin = { version = "0.32.5", features = ["serde"] }
 rayon = "1.10.0"
 crossbeam = { version = "0.8.4", features = ["crossbeam-channel"] }
-serde = { version = "1.0.216", features = ["derive"] }
-serde_json = "1.0.133"
+serde = { version = "1.0.217", features = ["derive"] }
+serde_json = "1.0.134"
 derived-deref = "2.1.0"
 bitcoincore-rpc = "0.19.0"
 # tokio = { version = "1.39.2", features = ["rt-multi-thread"] }
diff --git a/src/crates/biter/src/blk_index_to_blk_path.rs b/src/crates/biter/src/blk_index_to_blk_path.rs
new file mode 100644
index 000000000..17cf2da39
--- /dev/null
+++ b/src/crates/biter/src/blk_index_to_blk_path.rs
@@ -0,0 +1,46 @@
+use std::{
+    collections::BTreeMap,
+    fs,
+    path::{Path, PathBuf},
+};
+
+use derived_deref::{Deref, DerefMut};
+
+const BLK: &str = "blk";
+const DAT: &str = ".dat";
+
+#[derive(Debug, Deref, DerefMut)]
+pub struct BlkIndexToBlkPath(BTreeMap<usize, PathBuf>);
+
+impl BlkIndexToBlkPath {
+    pub fn scan(data_dir: &Path) -> Self {
+        let blocks_dir = data_dir.join("blocks");
+
+        Self(
+            fs::read_dir(blocks_dir)
+                .unwrap()
+                .map(|entry| entry.unwrap().path())
+                .filter(|path| {
+                    let is_file = path.is_file();
+
+                    if is_file {
+                        let file_name = path.file_name().unwrap().to_str().unwrap();
+
+                        file_name.starts_with(BLK) && file_name.ends_with(DAT)
+                    } else {
+                        false
+                    }
+                })
+                .map(|path| {
+                    let file_name = path.file_name().unwrap().to_str().unwrap();
+
+                    let blk_index = file_name[BLK.len()..(file_name.len() - DAT.len())]
+                        .parse::<usize>()
+                        .unwrap();
+
+                    (blk_index, path)
+                })
+                .collect::<BTreeMap<_, _>>(),
+        )
+    }
+}
diff --git a/src/crates/biter/src/blk_index_to_blk_recap.rs b/src/crates/biter/src/blk_index_to_blk_recap.rs
index b0353261f..b819448a6 100644
--- a/src/crates/biter/src/blk_index_to_blk_recap.rs
+++ b/src/crates/biter/src/blk_index_to_blk_recap.rs
@@ -8,7 +8,7 @@ use std::{
 
 use derived_deref::{Deref, DerefMut};
 
-use crate::{blk_recap::BlkRecap, BlkMetadataAndBlock};
+use crate::{blk_recap::BlkRecap, BlkIndexToBlkPath, BlkMetadataAndBlock};
 
 const TARGET_BLOCKS_PER_MONTH: usize = 144 * 30;
 
@@ -21,7 +21,7 @@ pub struct BlkIndexToBlkRecap {
 }
 
 impl BlkIndexToBlkRecap {
-    pub fn import(blocks_dir: &BTreeMap<usize, PathBuf>, data_dir: &Path) -> Self {
+    pub fn import(blocks_dir: &BlkIndexToBlkPath, data_dir: &Path) -> Self {
         let path = data_dir.join("blk_index_to_blk_recap.json");
 
         let tree = {
@@ -46,7 +46,7 @@ impl BlkIndexToBlkRecap {
         this
     }
 
-    pub fn clean_outdated(&mut self, blocks_dir: &BTreeMap<usize, PathBuf>) {
+    pub fn clean_outdated(&mut self, blocks_dir: &BlkIndexToBlkPath) {
         let mut unprocessed_keys = self.keys().copied().collect::<BTreeSet<_>>();
 
         blocks_dir.iter().for_each(|(blk_index, blk_path)| {
diff --git a/src/crates/biter/src/lib.rs b/src/crates/biter/src/lib.rs
index ed80f1882..55daa343e 100644
--- a/src/crates/biter/src/lib.rs
+++ b/src/crates/biter/src/lib.rs
@@ -13,12 +13,14 @@ use bitcoin::{
     Block, BlockHash,
 };
 use bitcoincore_rpc::RpcApi;
+use blk_index_to_blk_path::*;
 use crossbeam::channel::{bounded, Receiver};
 use rayon::prelude::*;
 
 pub use bitcoin;
 pub use bitcoincore_rpc;
 
+mod blk_index_to_blk_path;
 mod blk_index_to_blk_recap;
 mod blk_metadata;
 mod blk_metadata_and_block;
@@ -88,7 +90,7 @@ pub fn new(
     let (send_block, recv_block) = bounded(BOUND_CAP);
     let (send_height_block_hash, recv_height_block_hash) = bounded(BOUND_CAP);
 
-    let blk_index_to_blk_path = scan_blocks_dir(data_dir);
+    let blk_index_to_blk_path = BlkIndexToBlkPath::scan(data_dir);
 
     let mut blk_index_to_blk_recap = BlkIndexToBlkRecap::import(&blk_index_to_blk_path, data_dir);
 
@@ -97,12 +99,12 @@ pub fn new(
 
     thread::spawn(move || {
         blk_index_to_blk_path
-            .into_iter()
-            .filter(|(blk_index, _)| blk_index >= &starting_blk_index)
+            .iter()
+            .filter(|(blk_index, _)| blk_index >= &&starting_blk_index)
             .try_for_each(move |(blk_index, blk_path)| {
-                let blk_metadata = BlkMetadata::new(blk_index, &blk_path);
+                let blk_metadata = BlkMetadata::new(*blk_index, blk_path);
 
-                let blk_bytes = fs::read(&blk_path).unwrap();
+                let blk_bytes = fs::read(blk_path).unwrap();
                 let blk_bytes_len = blk_bytes.len() as u64;
 
                 let mut cursor = Cursor::new(blk_bytes.as_slice());
diff --git a/src/crates/biter/src/utils.rs b/src/crates/biter/src/utils.rs
index 78819179e..0894cd24d 100644
--- a/src/crates/biter/src/utils.rs
+++ b/src/crates/biter/src/utils.rs
@@ -1,41 +1,4 @@
-use std::{
-    collections::BTreeMap,
-    fs,
-    path::{Path, PathBuf},
-    time::UNIX_EPOCH,
-};
-
-const BLK: &str = "blk";
-const DAT: &str = ".dat";
-
-pub fn scan_blocks_dir(data_dir: &Path) -> BTreeMap<usize, PathBuf> {
-    let blocks_dir = data_dir.join("blocks");
-
-    fs::read_dir(blocks_dir)
-        .unwrap()
-        .map(|entry| entry.unwrap().path())
-        .filter(|path| {
-            let is_file = path.is_file();
-
-            if is_file {
-                let file_name = path.file_name().unwrap().to_str().unwrap();
-
-                file_name.starts_with(BLK) && file_name.ends_with(DAT)
-            } else {
-                false
-            }
-        })
-        .map(|path| {
-            let file_name = path.file_name().unwrap().to_str().unwrap();
-
-            let blk_index = file_name[BLK.len()..(file_name.len() - DAT.len())]
-                .parse::<usize>()
-                .unwrap();
-
-            (blk_index, path)
-        })
-        .collect::<BTreeMap<_, _>>()
-}
+use std::{fs, path::PathBuf, time::UNIX_EPOCH};
 
 pub fn path_to_modified_time(path: &PathBuf) -> u64 {
     fs::metadata(path)
diff --git a/src/parser/actions/iter_blocks.rs b/src/parser/actions/iter_blocks.rs
index de9b630b2..ba79b13d9 100644
--- a/src/parser/actions/iter_blocks.rs
+++ b/src/parser/actions/iter_blocks.rs
@@ -21,7 +21,7 @@ use crate::{
 
 pub fn iter_blocks(
     config: &Config,
-    rpc: &biter::bitcoincore_rpc::Client,
+    rpc: &Client,
     approx_block_count: usize,
     exit: Exit,
     databases: &mut Databases,

From bf31ee5fd64008cdae2352f32d97c24cecf23191 Mon Sep 17 00:00:00 2001
From: nym21 <expat-epochs0i@icloud.com>
Date: Mon, 6 Jan 2025 10:45:04 +0100
Subject: [PATCH 16/63] bitbase: move to transactional

---
 .../addressbytes_prefix_to_addressindex.rs    |  41 ---
 .../database/addressindex_to_addressbytes.rs  |  43 ---
 .../database/addressindex_to_addresstype.rs   |  38 ---
 .../database/addressindex_to_txoutindexes.rs  |  42 ---
 .../database/blockhash_prefix_to_height.rs    |  35 ---
 .../src/database/height_to_blockhash.rs       |  37 ---
 .../bitbase/src/database/height_to_txindex.rs |  45 ---
 src/crates/bitbase/src/database/mod.rs        | 256 ----------------
 .../src/database/txid_prefix_to_txindex.rs    |  46 ---
 .../bitbase/src/database/txindex_to_height.rs |  29 --
 .../bitbase/src/database/txindex_to_txid.rs   |  27 --
 .../database/txoutindex_to_addressindex.rs    |  30 --
 .../src/database/txoutindex_to_amount.rs      |  29 --
 src/crates/bitbase/src/main.rs                | 282 +++++++++++++-----
 .../bitbase/src/structs/addressbytes.rs       |  76 +++--
 .../bitbase/src/structs/addressindex.rs       |   4 +
 src/crates/bitbase/src/structs/addresstype.rs |  42 ++-
 src/crates/bitbase/src/structs/fjall.rs       | 143 ---------
 src/crates/bitbase/src/structs/mod.rs         |   8 +-
 src/crates/bitbase/src/structs/partition.rs   | 104 +++++++
 src/crates/bitbase/src/structs/partitions.rs  | 278 +++++++++++++++++
 src/crates/bitbase/src/structs/prefix.rs      |  25 ++
 src/crates/bitbase/src/structs/version.rs     |   6 +
 src/crates/biter/src/lib.rs                   |   2 +-
 24 files changed, 714 insertions(+), 954 deletions(-)
 delete mode 100644 src/crates/bitbase/src/database/addressbytes_prefix_to_addressindex.rs
 delete mode 100644 src/crates/bitbase/src/database/addressindex_to_addressbytes.rs
 delete mode 100644 src/crates/bitbase/src/database/addressindex_to_addresstype.rs
 delete mode 100644 src/crates/bitbase/src/database/addressindex_to_txoutindexes.rs
 delete mode 100644 src/crates/bitbase/src/database/blockhash_prefix_to_height.rs
 delete mode 100644 src/crates/bitbase/src/database/height_to_blockhash.rs
 delete mode 100644 src/crates/bitbase/src/database/height_to_txindex.rs
 delete mode 100644 src/crates/bitbase/src/database/mod.rs
 delete mode 100644 src/crates/bitbase/src/database/txid_prefix_to_txindex.rs
 delete mode 100644 src/crates/bitbase/src/database/txindex_to_height.rs
 delete mode 100644 src/crates/bitbase/src/database/txindex_to_txid.rs
 delete mode 100644 src/crates/bitbase/src/database/txoutindex_to_addressindex.rs
 delete mode 100644 src/crates/bitbase/src/database/txoutindex_to_amount.rs
 delete mode 100644 src/crates/bitbase/src/structs/fjall.rs
 create mode 100644 src/crates/bitbase/src/structs/partition.rs
 create mode 100644 src/crates/bitbase/src/structs/partitions.rs
 create mode 100644 src/crates/bitbase/src/structs/prefix.rs

diff --git a/src/crates/bitbase/src/database/addressbytes_prefix_to_addressindex.rs b/src/crates/bitbase/src/database/addressbytes_prefix_to_addressindex.rs
deleted file mode 100644
index a72cee62a..000000000
--- a/src/crates/bitbase/src/database/addressbytes_prefix_to_addressindex.rs
+++ /dev/null
@@ -1,41 +0,0 @@
-use color_eyre::eyre::eyre;
-use derive_deref::{Deref, DerefMut};
-
-use crate::structs::{Addressbytes, Addressindex, Database, DatabaseTrait, Height, Version};
-
-#[derive(Deref, DerefMut)]
-pub struct AddressbytesPrefixToAddressindex(Database);
-
-impl AddressbytesPrefixToAddressindex {
-    pub fn import() -> color_eyre::Result<Self> {
-        Ok(Self(Database::import(
-            "address_prefix_to_addressindex",
-            Self::version(),
-        )?))
-    }
-
-    pub fn insert(
-        &mut self,
-        addressbytes: &Addressbytes,
-        addressindex: Addressindex,
-        height: Height,
-    ) -> color_eyre::Result<()> {
-        if let Some(_height) =
-            self.fetch_update(addressbytes.to_prefix_slice(), addressindex.into(), height)?
-        {
-            dbg!(addressbytes, addressindex);
-            return Err(eyre!("AddressPrefixToAddressindex: key collision"));
-        }
-        Ok(())
-    }
-
-    pub fn remove(&mut self, addressbytes: &Addressbytes) {
-        self.0.remove(addressbytes.to_prefix_slice())
-    }
-}
-
-impl DatabaseTrait for AddressbytesPrefixToAddressindex {
-    fn version() -> Version {
-        Version::from(1)
-    }
-}
diff --git a/src/crates/bitbase/src/database/addressindex_to_addressbytes.rs b/src/crates/bitbase/src/database/addressindex_to_addressbytes.rs
deleted file mode 100644
index 228bc3965..000000000
--- a/src/crates/bitbase/src/database/addressindex_to_addressbytes.rs
+++ /dev/null
@@ -1,43 +0,0 @@
-use derive_deref::{Deref, DerefMut};
-
-use crate::structs::{Addressbytes, Addressindex, Database, DatabaseTrait, Height, Version};
-
-#[derive(Deref, DerefMut)]
-pub struct AddressindexToAddressbytes(Database);
-
-impl AddressindexToAddressbytes {
-    pub fn import() -> color_eyre::Result<Self> {
-        Ok(Self(Database::import(
-            "addressindex_to_addressbytes",
-            Self::version(),
-        )?))
-    }
-
-    pub fn get(&self, addressindex: Addressindex) -> color_eyre::Result<Option<Addressbytes>> {
-        if let Some(address) = self.0.get(addressindex.into())?.map(Addressbytes::try_from) {
-            Ok(Some(address?))
-        } else {
-            Ok(None)
-        }
-    }
-
-    pub fn insert(
-        &mut self,
-        addressindex: Addressindex,
-        addressbytes: &Addressbytes,
-        height: Height,
-    ) {
-        self.0
-            .insert(addressindex.into(), addressbytes.into(), height)
-    }
-
-    pub fn remove(&mut self, addressindex: Addressindex) {
-        self.0.remove(addressindex.into())
-    }
-}
-
-impl DatabaseTrait for AddressindexToAddressbytes {
-    fn version() -> Version {
-        Version::from(1)
-    }
-}
diff --git a/src/crates/bitbase/src/database/addressindex_to_addresstype.rs b/src/crates/bitbase/src/database/addressindex_to_addresstype.rs
deleted file mode 100644
index 32fc0046a..000000000
--- a/src/crates/bitbase/src/database/addressindex_to_addresstype.rs
+++ /dev/null
@@ -1,38 +0,0 @@
-use derive_deref::{Deref, DerefMut};
-
-use crate::structs::{Addressindex, Addresstype, Database, DatabaseTrait, Height, Version};
-
-#[derive(Deref, DerefMut)]
-pub struct AddressindexToAddresstype(Database);
-
-impl AddressindexToAddresstype {
-    pub fn import() -> color_eyre::Result<Self> {
-        Ok(Self(Database::import(
-            "addressindex_to_addresstype",
-            Self::version(),
-        )?))
-    }
-
-    // pub fn get(&self, addressindex: Addressindex) -> color_eyre::Result<Option<Addresstype>> {
-    //     if let Some(addresstype) = self.0.get(addressindex.into())?.map(Addresstype::try_from) {
-    //         Ok(Some(addresstype?))
-    //     } else {
-    //         Ok(None)
-    //     }
-    // }
-
-    pub fn insert(&mut self, addressindex: Addressindex, addresstype: Addresstype, height: Height) {
-        self.0
-            .insert(addressindex.into(), addresstype.into(), height)
-    }
-
-    pub fn remove(&mut self, addressindex: Addressindex) {
-        self.0.remove(addressindex.into())
-    }
-}
-
-impl DatabaseTrait for AddressindexToAddresstype {
-    fn version() -> Version {
-        Version::from(1)
-    }
-}
diff --git a/src/crates/bitbase/src/database/addressindex_to_txoutindexes.rs b/src/crates/bitbase/src/database/addressindex_to_txoutindexes.rs
deleted file mode 100644
index 7f173c3a9..000000000
--- a/src/crates/bitbase/src/database/addressindex_to_txoutindexes.rs
+++ /dev/null
@@ -1,42 +0,0 @@
-use derive_deref::{Deref, DerefMut};
-use fjall::Slice;
-
-use crate::structs::{
-    Addressindex, Addresstxoutindex, Database, DatabaseTrait, Height, SliceExtended, Txoutindex,
-    Version,
-};
-
-#[derive(Deref, DerefMut)]
-pub struct AddressindexToTxoutindexes(Database);
-
-impl AddressindexToTxoutindexes {
-    pub fn import() -> color_eyre::Result<Self> {
-        Ok(Self(Database::import(
-            "addressindex_to_txoutindexes",
-            Self::version(),
-        )?))
-    }
-
-    pub fn insert(&mut self, addressindex: Addressindex, txoutindex: Txoutindex, height: Height) {
-        self.0.insert(
-            Addresstxoutindex::from((addressindex, txoutindex)).into(),
-            Slice::default(),
-            height,
-        )
-    }
-
-    pub fn remove(&mut self, addressindex: Addressindex, txoutindex: Txoutindex) {
-        self.0
-            .remove(Addresstxoutindex::from((addressindex, txoutindex)).into());
-    }
-
-    pub fn is_empty(&self, addressindex: Addressindex) -> bool {
-        self.prefix(Slice::from(addressindex)).next().is_none()
-    }
-}
-
-impl DatabaseTrait for AddressindexToTxoutindexes {
-    fn version() -> Version {
-        Version::from(1)
-    }
-}
diff --git a/src/crates/bitbase/src/database/blockhash_prefix_to_height.rs b/src/crates/bitbase/src/database/blockhash_prefix_to_height.rs
deleted file mode 100644
index 40c83118b..000000000
--- a/src/crates/bitbase/src/database/blockhash_prefix_to_height.rs
+++ /dev/null
@@ -1,35 +0,0 @@
-use biter::bitcoin::BlockHash;
-use color_eyre::eyre::eyre;
-use derive_deref::{Deref, DerefMut};
-
-use crate::structs::{Database, DatabaseTrait, Height, Version};
-
-#[derive(Deref, DerefMut)]
-pub struct BlockhashPrefixToHeight(Database);
-
-impl BlockhashPrefixToHeight {
-    pub fn import() -> color_eyre::Result<Self> {
-        Ok(Self(Database::import(
-            "blockhash_suffix_to_height",
-            Self::version(),
-        )?))
-    }
-
-    pub fn insert(&mut self, blockhash: &BlockHash, height: Height) -> color_eyre::Result<()> {
-        if let Some(_height) = self.fetch_update(blockhash[..8].into(), height.into(), height)? {
-            // dbg!(height, Height::from(other), hash);
-            return Err(eyre!("BlockhashSuffixToHeight: key collision"));
-        }
-        Ok(())
-    }
-
-    pub fn remove(&mut self, blockhash: &BlockHash) {
-        self.0.remove((&blockhash[..]).into())
-    }
-}
-
-impl DatabaseTrait for BlockhashPrefixToHeight {
-    fn version() -> Version {
-        Version::from(1)
-    }
-}
diff --git a/src/crates/bitbase/src/database/height_to_blockhash.rs b/src/crates/bitbase/src/database/height_to_blockhash.rs
deleted file mode 100644
index bce5882da..000000000
--- a/src/crates/bitbase/src/database/height_to_blockhash.rs
+++ /dev/null
@@ -1,37 +0,0 @@
-use biter::bitcoin::{hashes::Hash, BlockHash};
-use derive_deref::{Deref, DerefMut};
-use fjall::Slice;
-
-use crate::structs::{Database, DatabaseTrait, Height, Version};
-
-#[derive(Deref, DerefMut)]
-pub struct HeightToBlockhash(Database);
-
-impl HeightToBlockhash {
-    pub fn import() -> color_eyre::Result<Self> {
-        Ok(Self(Database::import(
-            "height_to_blockhash",
-            Self::version(),
-        )?))
-    }
-
-    pub fn insert(&mut self, height: Height, blockhash: &BlockHash) {
-        self.0.insert(height.into(), blockhash[..].into(), height)
-    }
-
-    pub fn get(&self, height: Height) -> fjall::Result<Option<BlockHash>> {
-        self.0
-            .get(Slice::from(height))
-            .map(|opt| opt.map(|slice| BlockHash::from_slice(&slice).unwrap()))
-    }
-
-    pub fn remove(&mut self, height: Height) {
-        self.0.remove(Slice::from(height))
-    }
-}
-
-impl DatabaseTrait for HeightToBlockhash {
-    fn version() -> Version {
-        Version::from(1)
-    }
-}
diff --git a/src/crates/bitbase/src/database/height_to_txindex.rs b/src/crates/bitbase/src/database/height_to_txindex.rs
deleted file mode 100644
index 0cdeb0781..000000000
--- a/src/crates/bitbase/src/database/height_to_txindex.rs
+++ /dev/null
@@ -1,45 +0,0 @@
-use derive_deref::{Deref, DerefMut};
-use fjall::Slice;
-
-use crate::structs::{Database, DatabaseTrait, Height, Txindex, Version};
-
-#[derive(Deref, DerefMut)]
-pub struct HeightToTxindex(Database);
-
-#[derive(Debug, PartialEq, Eq)]
-pub enum HeightToTxindexPosition {
-    First,
-    Last,
-}
-
-impl HeightToTxindex {
-    pub fn import(position: HeightToTxindexPosition) -> color_eyre::Result<Self> {
-        Ok(Self(Database::import(
-            &format!(
-                "height_to_{}_txindex",
-                format!("{position:?}").to_lowercase()
-            ),
-            Self::version(),
-        )?))
-    }
-
-    pub fn insert(&mut self, height: Height, txindex: Txindex) {
-        self.0.insert(height.into(), txindex.into(), height)
-    }
-
-    pub fn get(&self, height: Height) -> fjall::Result<Option<Txindex>> {
-        self.0
-            .get(Slice::from(height))
-            .map(|opt| opt.map(|slice| slice.into()))
-    }
-
-    pub fn remove(&mut self, height: Height) {
-        self.0.remove(Slice::from(height))
-    }
-}
-
-impl DatabaseTrait for HeightToTxindex {
-    fn version() -> Version {
-        Version::from(1)
-    }
-}
diff --git a/src/crates/bitbase/src/database/mod.rs b/src/crates/bitbase/src/database/mod.rs
deleted file mode 100644
index 94b3469c2..000000000
--- a/src/crates/bitbase/src/database/mod.rs
+++ /dev/null
@@ -1,256 +0,0 @@
-use std::{collections::BTreeSet, ops::Sub, thread};
-
-use biter::bitcoin::{hashes::Hash, BlockHash, Txid};
-use color_eyre::eyre::ContextCompat;
-use fjall::Slice;
-
-mod addressbytes_prefix_to_addressindex;
-mod addressindex_to_addressbytes;
-mod addressindex_to_addresstype;
-mod addressindex_to_txoutindexes;
-mod blockhash_prefix_to_height;
-mod height_to_blockhash;
-mod height_to_txindex;
-mod txid_prefix_to_txindex;
-mod txindex_to_height;
-mod txindex_to_txid;
-mod txoutindex_to_addressindex;
-mod txoutindex_to_amount;
-
-pub use addressbytes_prefix_to_addressindex::*;
-pub use addressindex_to_addressbytes::*;
-pub use addressindex_to_addresstype::*;
-pub use addressindex_to_txoutindexes::*;
-pub use blockhash_prefix_to_height::*;
-pub use height_to_blockhash::*;
-pub use height_to_txindex::*;
-pub use txid_prefix_to_txindex::*;
-pub use txindex_to_height::*;
-pub use txindex_to_txid::*;
-pub use txoutindex_to_addressindex::*;
-pub use txoutindex_to_amount::*;
-
-use crate::structs::{Addressindex, Exit, Height, Txindex, Txoutindex};
-
-pub struct Database {
-    pub addressbytes_prefix_to_addressindex: AddressbytesPrefixToAddressindex,
-    pub addressindex_to_addressbytes: AddressindexToAddressbytes,
-    pub addressindex_to_addresstype: AddressindexToAddresstype,
-    pub addressindex_to_txoutindexes: AddressindexToTxoutindexes,
-    pub blockhash_prefix_to_height: BlockhashPrefixToHeight,
-    pub height_to_blockhash: HeightToBlockhash,
-    pub height_to_first_txindex: HeightToTxindex,
-    pub height_to_last_txindex: HeightToTxindex,
-    pub txid_prefix_to_txindex: TxidPrefixToTxindex,
-    pub txindex_to_txid: TxindexToTxid,
-    pub txindex_to_height: TxindexToHeight,
-    pub txoutindex_to_addressindex: TxoutindexToAddressindex,
-    pub txoutindex_to_amount: TxoutindexToAmount,
-}
-
-const UNSAFE_BLOCKS: usize = 100;
-
-impl Database {
-    pub fn import() -> color_eyre::Result<Self> {
-        thread::scope(|scope| {
-            let addressbytes_prefix_to_addressindex_handle =
-                scope.spawn(AddressbytesPrefixToAddressindex::import);
-            let addressindex_to_addressbytes_handle =
-                scope.spawn(AddressindexToAddressbytes::import);
-            let addressindex_to_addresstype_handle = scope.spawn(AddressindexToAddresstype::import);
-            let addressindex_to_txoutindexes_handle =
-                scope.spawn(AddressindexToTxoutindexes::import);
-            let blockhash_prefix_to_height_handle = scope.spawn(BlockhashPrefixToHeight::import);
-            let height_to_blockhash_handle = scope.spawn(HeightToBlockhash::import);
-            let height_to_first_txindex_handle =
-                scope.spawn(|| HeightToTxindex::import(HeightToTxindexPosition::First));
-            let height_to_last_txindex_handle =
-                scope.spawn(|| HeightToTxindex::import(HeightToTxindexPosition::Last));
-            let txid_prefix_to_txindex_handle = scope.spawn(TxidPrefixToTxindex::import);
-            let txindex_to_height_handle = scope.spawn(TxindexToHeight::import);
-            let txindex_to_txid_handle = scope.spawn(TxindexToTxid::import);
-            let txoutindex_to_addressindex_handle = scope.spawn(TxoutindexToAddressindex::import);
-            let txoutindex_to_amount_handle = scope.spawn(TxoutindexToAmount::import);
-
-            Ok(Self {
-                addressbytes_prefix_to_addressindex: addressbytes_prefix_to_addressindex_handle
-                    .join()
-                    .unwrap()?,
-                addressindex_to_addressbytes: addressindex_to_addressbytes_handle
-                    .join()
-                    .unwrap()?,
-                addressindex_to_addresstype: addressindex_to_addresstype_handle.join().unwrap()?,
-                addressindex_to_txoutindexes: addressindex_to_txoutindexes_handle
-                    .join()
-                    .unwrap()?,
-                blockhash_prefix_to_height: blockhash_prefix_to_height_handle.join().unwrap()?,
-                height_to_blockhash: height_to_blockhash_handle.join().unwrap()?,
-                height_to_first_txindex: height_to_first_txindex_handle.join().unwrap()?,
-                height_to_last_txindex: height_to_last_txindex_handle.join().unwrap()?,
-                txid_prefix_to_txindex: txid_prefix_to_txindex_handle.join().unwrap()?,
-                txindex_to_height: txindex_to_height_handle.join().unwrap()?,
-                txindex_to_txid: txindex_to_txid_handle.join().unwrap()?,
-                txoutindex_to_addressindex: txoutindex_to_addressindex_handle.join().unwrap()?,
-                txoutindex_to_amount: txoutindex_to_amount_handle.join().unwrap()?,
-            })
-        })
-    }
-
-    pub fn export(&mut self, height: Height) -> color_eyre::Result<()> {
-        thread::scope(|scope| {
-            scope.spawn(|| {
-                self.addressbytes_prefix_to_addressindex
-                    .export(height)
-                    .unwrap()
-            });
-            scope.spawn(|| self.addressindex_to_addressbytes.export(height).unwrap());
-            scope.spawn(|| self.addressindex_to_addresstype.export(height).unwrap());
-            scope.spawn(|| self.addressindex_to_txoutindexes.export(height).unwrap());
-            scope.spawn(|| self.blockhash_prefix_to_height.export(height).unwrap());
-            scope.spawn(|| self.height_to_blockhash.export(height).unwrap());
-            scope.spawn(|| self.height_to_first_txindex.export(height).unwrap());
-            scope.spawn(|| self.height_to_last_txindex.export(height).unwrap());
-            scope.spawn(|| self.txid_prefix_to_txindex.export(height).unwrap());
-            scope.spawn(|| self.txindex_to_height.export(height).unwrap());
-            scope.spawn(|| self.txindex_to_txid.export(height).unwrap());
-            scope.spawn(|| self.txoutindex_to_addressindex.export(height).unwrap());
-            scope.spawn(|| self.txoutindex_to_amount.export(height).unwrap());
-        });
-        Ok(())
-    }
-
-    pub fn start_height(&self) -> Height {
-        self.min_height()
-            .map(|h| h.sub(UNSAFE_BLOCKS))
-            .unwrap_or_default()
-    }
-
-    fn min_height(&self) -> Option<Height> {
-        [
-            self.addressbytes_prefix_to_addressindex.height(),
-            self.addressindex_to_addressbytes.height(),
-            self.addressindex_to_addresstype.height(),
-            self.addressindex_to_txoutindexes.height(),
-            self.blockhash_prefix_to_height.height(),
-            self.height_to_blockhash.height(),
-            self.height_to_first_txindex.height(),
-            self.height_to_last_txindex.height(),
-            self.txid_prefix_to_txindex.height(),
-            self.txindex_to_height.height(),
-            self.txindex_to_txid.height(),
-            self.txoutindex_to_addressindex.height(),
-            self.txoutindex_to_amount.height(),
-        ]
-        .into_iter()
-        .map(ToOwned::to_owned)
-        .min()
-        .flatten()
-    }
-
-    pub fn has_different_blockhash(
-        &self,
-        height: Height,
-        blockhash: &BlockHash,
-    ) -> fjall::Result<bool> {
-        Ok(self
-            .height_to_blockhash
-            .get(height)?
-            .is_some_and(|saved_blockhash| blockhash != &saved_blockhash))
-    }
-
-    pub fn rollback_from(&mut self, height: Height, exit: &Exit) -> color_eyre::Result<()> {
-        exit.block();
-
-        self.export(height)?;
-
-        let mut txindex = None;
-
-        self.height_to_blockhash
-            .range(Slice::from(height)..)
-            .try_for_each(|slice| -> color_eyre::Result<()> {
-                let (slice_height, slice_blockhash) = slice?;
-                let height = Height::from(slice_height);
-                let blockhash = BlockHash::from_slice(&slice_blockhash)?;
-
-                self.height_to_blockhash.remove(height);
-                self.blockhash_prefix_to_height.remove(&blockhash);
-                if txindex.is_none() {
-                    txindex.replace(
-                        self.height_to_first_txindex
-                            .get(height)?
-                            .context("for height to have first txindex")?,
-                    );
-                }
-                self.height_to_first_txindex.remove(height);
-                self.height_to_last_txindex.remove(height);
-
-                Ok(())
-            })?;
-
-        let txindex = txindex.context("txindex to not be none by now")?;
-
-        self.txindex_to_txid
-            .range(Slice::from(txindex)..)
-            .try_for_each(|slice| -> color_eyre::Result<()> {
-                let (slice_txindex, slice_txid) = slice?;
-                let txindex = Txindex::from(slice_txindex);
-                let txid = Txid::from_slice(&slice_txid)?;
-
-                self.txindex_to_txid.remove(txindex);
-                self.txindex_to_height.remove(txindex);
-                self.txid_prefix_to_txindex.remove(&txid);
-
-                Ok(())
-            })?;
-
-        let txoutindex = Txoutindex::from(txindex);
-
-        let mut addressindexes = BTreeSet::new();
-
-        self.txoutindex_to_amount
-            .range(Slice::from(txoutindex)..)
-            .try_for_each(|slice| -> color_eyre::Result<()> {
-                let (slice_txoutindex, _) = slice?;
-                let txoutindex = Txoutindex::from(slice_txoutindex);
-
-                self.txoutindex_to_amount.remove(txoutindex);
-
-                if let Some(addressindex_slice) =
-                    self.txoutindex_to_addressindex.get(txoutindex.into())?
-                {
-                    self.txoutindex_to_addressindex.remove(txoutindex);
-
-                    let addressindex = Addressindex::from(addressindex_slice);
-                    addressindexes.insert(addressindex);
-                    self.addressindex_to_txoutindexes
-                        .remove(addressindex, txoutindex);
-                }
-
-                Ok(())
-            })?;
-
-        self.export(height)?;
-
-        addressindexes
-            .into_iter()
-            .filter(|addressindex| self.addressindex_to_txoutindexes.is_empty(*addressindex))
-            .try_for_each(|addressindex| -> color_eyre::Result<()> {
-                let addressbytes = self
-                    .addressindex_to_addressbytes
-                    .get(addressindex)?
-                    .context("addressindex_to_address to have value")?;
-                self.addressbytes_prefix_to_addressindex
-                    .remove(&addressbytes);
-                self.addressindex_to_addressbytes.remove(addressindex);
-                self.addressindex_to_addresstype.remove(addressindex);
-
-                Ok(())
-            })?;
-
-        self.export(height)?;
-
-        exit.unblock();
-
-        Ok(())
-    }
-}
diff --git a/src/crates/bitbase/src/database/txid_prefix_to_txindex.rs b/src/crates/bitbase/src/database/txid_prefix_to_txindex.rs
deleted file mode 100644
index dfc1b6fab..000000000
--- a/src/crates/bitbase/src/database/txid_prefix_to_txindex.rs
+++ /dev/null
@@ -1,46 +0,0 @@
-use biter::bitcoin::Txid;
-use color_eyre::eyre::eyre;
-use derive_deref::{Deref, DerefMut};
-use fjall::Slice;
-
-use crate::structs::{Database, DatabaseTrait, Height, Txindex, Version};
-
-#[derive(Deref, DerefMut)]
-pub struct TxidPrefixToTxindex(Database);
-
-impl TxidPrefixToTxindex {
-    pub fn import() -> color_eyre::Result<Self> {
-        Ok(Self(Database::import(
-            "txid_prefix_to_txindex",
-            Self::version(),
-        )?))
-    }
-
-    pub fn insert(
-        &mut self,
-        txid: &Txid,
-        txindex: Txindex,
-        height: Height,
-    ) -> color_eyre::Result<()> {
-        if let Some(_txindex) =
-            self.fetch_update(Self::txid_to_key(txid), txindex.into(), height)?
-        {
-            return Err(eyre!("TxidPrefixToTxindex: key collision"));
-        }
-        Ok(())
-    }
-
-    pub fn remove(&mut self, txid: &Txid) {
-        self.0.remove(Self::txid_to_key(txid))
-    }
-
-    fn txid_to_key(txid: &Txid) -> Slice {
-        txid[0..8].into()
-    }
-}
-
-impl DatabaseTrait for TxidPrefixToTxindex {
-    fn version() -> Version {
-        Version::from(1)
-    }
-}
diff --git a/src/crates/bitbase/src/database/txindex_to_height.rs b/src/crates/bitbase/src/database/txindex_to_height.rs
deleted file mode 100644
index 32bb956a8..000000000
--- a/src/crates/bitbase/src/database/txindex_to_height.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-use derive_deref::{Deref, DerefMut};
-
-use crate::structs::{Database, DatabaseTrait, Height, Txindex, Version};
-
-#[derive(Deref, DerefMut)]
-pub struct TxindexToHeight(Database);
-
-impl TxindexToHeight {
-    pub fn import() -> color_eyre::Result<Self> {
-        Ok(Self(Database::import(
-            "txindex_to_height",
-            Self::version(),
-        )?))
-    }
-
-    pub fn insert(&mut self, txindex: Txindex, height: Height) {
-        self.0.insert(txindex.into(), height.into(), height)
-    }
-
-    pub fn remove(&mut self, txindex: Txindex) {
-        self.0.remove(txindex.into())
-    }
-}
-
-impl DatabaseTrait for TxindexToHeight {
-    fn version() -> Version {
-        Version::from(1)
-    }
-}
diff --git a/src/crates/bitbase/src/database/txindex_to_txid.rs b/src/crates/bitbase/src/database/txindex_to_txid.rs
deleted file mode 100644
index 7369fd6bf..000000000
--- a/src/crates/bitbase/src/database/txindex_to_txid.rs
+++ /dev/null
@@ -1,27 +0,0 @@
-use biter::bitcoin::Txid;
-use derive_deref::{Deref, DerefMut};
-
-use crate::structs::{Database, DatabaseTrait, Height, Txindex, Version};
-
-#[derive(Deref, DerefMut)]
-pub struct TxindexToTxid(Database);
-
-impl TxindexToTxid {
-    pub fn import() -> color_eyre::Result<Self> {
-        Ok(Self(Database::import("txindex_to_txid", Self::version())?))
-    }
-
-    pub fn insert(&mut self, txindex: Txindex, txid: &Txid, height: Height) {
-        self.0.insert(txindex.into(), txid[..].into(), height)
-    }
-
-    pub fn remove(&mut self, txindex: Txindex) {
-        self.0.remove(txindex.into())
-    }
-}
-
-impl DatabaseTrait for TxindexToTxid {
-    fn version() -> Version {
-        Version::from(1)
-    }
-}
diff --git a/src/crates/bitbase/src/database/txoutindex_to_addressindex.rs b/src/crates/bitbase/src/database/txoutindex_to_addressindex.rs
deleted file mode 100644
index d71631db7..000000000
--- a/src/crates/bitbase/src/database/txoutindex_to_addressindex.rs
+++ /dev/null
@@ -1,30 +0,0 @@
-use derive_deref::{Deref, DerefMut};
-
-use crate::structs::{Addressindex, Database, DatabaseTrait, Height, Txoutindex, Version};
-
-#[derive(Deref, DerefMut)]
-pub struct TxoutindexToAddressindex(Database);
-
-impl TxoutindexToAddressindex {
-    pub fn import() -> color_eyre::Result<Self> {
-        Ok(Self(Database::import(
-            "txoutindex_to_addressindex",
-            Self::version(),
-        )?))
-    }
-
-    pub fn insert(&mut self, txoutindex: Txoutindex, addressindex: Addressindex, height: Height) {
-        self.0
-            .insert(txoutindex.into(), addressindex.into(), height)
-    }
-
-    pub fn remove(&mut self, txoutindex: Txoutindex) {
-        self.0.remove(txoutindex.into())
-    }
-}
-
-impl DatabaseTrait for TxoutindexToAddressindex {
-    fn version() -> Version {
-        Version::from(1)
-    }
-}
diff --git a/src/crates/bitbase/src/database/txoutindex_to_amount.rs b/src/crates/bitbase/src/database/txoutindex_to_amount.rs
deleted file mode 100644
index 6a014d342..000000000
--- a/src/crates/bitbase/src/database/txoutindex_to_amount.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-use derive_deref::{Deref, DerefMut};
-
-use crate::structs::{Amount, Database, DatabaseTrait, Height, Txoutindex, Version};
-
-#[derive(Deref, DerefMut)]
-pub struct TxoutindexToAmount(Database);
-
-impl TxoutindexToAmount {
-    pub fn import() -> color_eyre::Result<Self> {
-        Ok(Self(Database::import(
-            "txoutindex_to_amount",
-            Self::version(),
-        )?))
-    }
-
-    pub fn insert(&mut self, txoutindex: Txoutindex, amount: Amount, height: Height) {
-        self.0.insert(txoutindex.into(), amount.into(), height)
-    }
-
-    pub fn remove(&mut self, txoutindex: Txoutindex) {
-        self.0.remove(txoutindex.into())
-    }
-}
-
-impl DatabaseTrait for TxoutindexToAmount {
-    fn version() -> Version {
-        Version::from(1)
-    }
-}
diff --git a/src/crates/bitbase/src/main.rs b/src/crates/bitbase/src/main.rs
index 5e42ee33d..8ad47a7e7 100644
--- a/src/crates/bitbase/src/main.rs
+++ b/src/crates/bitbase/src/main.rs
@@ -1,13 +1,18 @@
-use std::path::Path;
+use std::{path::Path, str::FromStr};
 
-use biter::bitcoincore_rpc::{Auth, Client};
+use biter::{
+    bitcoin::{hashes::Hash, Txid},
+    bitcoincore_rpc::{Auth, Client},
+};
 
-mod database;
 mod structs;
 
-use database::Database;
-use fjall::Slice;
-use structs::{Addressbytes, Addressindex, Addresstype, Exit, Height, Txindex, Txoutindex};
+use color_eyre::eyre::{eyre, ContextCompat};
+use fjall::{PersistMode, Slice, TransactionalKeyspace, WriteTransaction};
+use structs::{
+    Addressbytes, Addressindex, Addresstxoutindex, Addresstype, Amount, Exit, Height, Partitions,
+    Prefix, SliceExtended, Txindex, Txoutindex,
+};
 
 // https://github.com/fjall-rs/fjall/discussions/72
 // https://github.com/romanz/electrs/blob/master/doc/schema.md
@@ -24,124 +29,241 @@ fn main() -> color_eyre::Result<()> {
 
     let exit = Exit::new();
 
-    let mut db = Database::import()?;
+    let keyspace = fjall::Config::new("./database").open_transactional()?;
 
-    let mut height = db.start_height();
+    let mut parts = Partitions::import(&keyspace, &exit)?;
 
-    let mut txindex = db
-        .height_to_last_txindex
-        .get(height)?
+    let wtx = keyspace.write_tx();
+
+    let mut height = parts.start_height();
+
+    let mut txindex = wtx
+        .get(parts.height_to_last_txindex.data(), Slice::from(height))?
+        .map(Txindex::from)
         .map(Txindex::incremented)
         .unwrap_or(Txindex::default());
 
-    let mut addressindex = db
-        .txoutindex_to_addressindex
-        .prefix(Slice::from(txindex))
-        .last()
-        .map(|res| -> color_eyre::Result<Addressindex> {
-            Ok(Addressindex::from(res?.1).incremented())
-        })
-        .unwrap_or(Ok(Addressindex::default()))?;
+    let mut addressindex = wtx
+        .get(
+            parts.height_to_last_addressindex.data(),
+            Slice::from(height),
+        )?
+        .map(Addressindex::from)
+        .map(Addressindex::incremented)
+        .unwrap_or(Addressindex::default());
 
-    let export = |db: &mut Database, height: Height| -> color_eyre::Result<()> {
+    let export = |keyspace: &TransactionalKeyspace,
+                  mut wtx: WriteTransaction,
+                  parts: &Partitions,
+                  height: Height|
+     -> color_eyre::Result<()> {
+        parts.udpate_meta(&mut wtx, height);
         exit.block();
         println!("Exporting...");
-        db.export(height)?;
+        wtx.commit()?;
+        keyspace.persist(PersistMode::SyncAll)?;
         println!("Export done");
         exit.unblock();
         Ok(())
     };
 
+    let mut wtx_opt = Some(wtx);
+
     biter::new(data_dir, Some(height.into()), None, rpc)
         .iter()
         .try_for_each(|(_height, block, blockhash)| -> color_eyre::Result<()> {
+            let mut wtx = wtx_opt.take().context("option should've wtx")?;
+
             println!("Processing block {_height}...");
 
             height = Height::from(_height);
 
-            if db.has_different_blockhash(height, &blockhash)? {
-                db.rollback_from(height, &exit)?;
+            let has_different_blockhash = wtx
+                .get(parts.height_to_blockhash.data(), Slice::from(height))?
+                .is_some_and(|saved_blockhash_slice| blockhash[..] != saved_blockhash_slice[..]);
+
+            if has_different_blockhash {
+                parts.rollback_from(&mut wtx, height, &exit)?;
             }
 
-            db.blockhash_prefix_to_height.insert(&blockhash, height)?;
-            db.height_to_blockhash.insert(height, &blockhash);
+            if parts.blockhash_prefix_to_height.needs(height) {
+                if let Some(prev) = wtx.fetch_update(
+                    parts.blockhash_prefix_to_height.data(),
+                    blockhash.prefix(),
+                    |_| Some(Slice::from(height)),
+                )? {
+                    dbg!(prev);
+                    return Err(eyre!("Expect none"));
+                }
+            }
+
+            if parts.height_to_blockhash.needs(height) {
+                wtx.insert(
+                    parts.height_to_blockhash.data(),
+                    Slice::from(height),
+                    blockhash,
+                );
+            }
+
+            if parts.height_to_first_addressindex.needs(height) {
+                wtx.insert(
+                    parts.height_to_first_addressindex.data(),
+                    Slice::from(addressindex),
+                    blockhash,
+                );
+            }
 
             let txlen = block.txdata.len();
-            let last_txindex = txlen - 1;
+            let last_txi = txlen - 1;
 
             block.txdata.into_iter().enumerate().try_for_each(
                 |(txi, tx)| -> color_eyre::Result<()> {
-                    if txi == 0 {
-                        db.height_to_first_txindex.insert(height, txindex);
+                    if txi == 0 && parts.height_to_first_txindex.needs(height) {
+                        wtx.insert(
+                            parts.height_to_first_txindex.data(),
+                            Slice::from(height),
+                            Slice::from(txindex),
+                        );
                     }
-                    if txi == last_txindex {
-                        db.height_to_last_txindex.insert(height, txindex);
+                    if txi == last_txi && parts.height_to_last_txindex.needs(height) {
+                        wtx.insert(
+                            parts.height_to_last_txindex.data(),
+                            Slice::from(height),
+                            Slice::from(txindex),
+                        );
                     }
 
-                    if !db.txindex_to_txid.is_safe(height)
-                        || !db.txid_prefix_to_txindex.is_safe(height)
+                    if parts.txindex_to_txid.needs(height)
+                        || parts.txid_prefix_to_txindex.needs(height)
                     {
                         let txid = tx.compute_txid();
-                        db.txindex_to_txid.insert(txindex, &txid, height);
-                        db.txid_prefix_to_txindex.insert(&txid, txindex, height)?;
+
+                        if parts.txindex_to_txid.needs(height) {
+                            wtx.insert(parts.txindex_to_txid.data(), Slice::from(txindex), txid);
+                        }
+
+                        if parts.txid_prefix_to_txindex.needs(height) {
+                            if let Some(prev) = wtx.fetch_update(
+                                parts.txid_prefix_to_txindex.data(),
+                                txid.prefix(),
+                                |_| Some(Slice::from(txindex)),
+                            )? {
+                                let prev_txid = Txid::from_slice(&wtx
+                                    .get(parts.txindex_to_txid.data(), &prev)?.expect("To have txid for txindex"))?;
+
+                                let only_known_dup_txids = [Txid::from_str("d5d27987d2a3dfc724e359870c6644b40e497bdc0589a033220fe15429d88599")?, Txid::from_str("e3bf3d07d4b0375638d5f1db5255fe07ba2c4cb067cd81b84ee974b6585fb468")?];
+
+                                // TODO
+                                // link txindex to txid
+                                // txid_prefix should point to the first vout so no override
+                                // do not add vout as they're invalid
+
+                                if !only_known_dup_txids.contains(&prev_txid) {
+                                    let prev_height = Height::from(wtx.get(parts.txindex_to_height.data(), &prev)?.expect("To have height"));
+                                    let prev_txindex = Txindex::from(prev);
+                                    dbg!(
+                                        height,
+                                        txid,
+                                        txindex,
+                                        prev_height,
+                                        prev_txid,
+                                        prev_txindex,
+                                    );
+                                    return Err(eyre!("Expect none"));
+                                }
+                            }
+                        }
                     }
 
-                    db.txindex_to_height.insert(txindex, height);
+                    if parts.txindex_to_height.needs(height) {
+                        wtx.insert(
+                            parts.txindex_to_height.data(),
+                            Slice::from(txindex),
+                            Slice::from(height),
+                        );
+                    }
 
                     txindex.increment();
 
-                    tx.output.into_iter().enumerate().try_for_each(
+                    tx.output.iter().enumerate().try_for_each(
                         |(vout, txout)| -> color_eyre::Result<()> {
                             let vout = vout as u16;
                             let txoutindex = Txoutindex::from((txindex, vout));
-                            let amount = txout.value.into();
-                            db.txoutindex_to_amount.insert(txoutindex, amount, height);
+                            let amount = Amount::from(txout.value);
+
+                            if parts.txoutindex_to_amount.needs(height) {
+                                wtx.insert(
+                                    parts.txoutindex_to_amount.data(),
+                                    Slice::from(txoutindex),
+                                    Slice::from(amount),
+                                );
+                            }
 
                             let script = &txout.script_pubkey;
 
+                            let addresstype = Addresstype::from(script);
                             let addressbytes =
-                                Addressbytes::try_from(script).inspect_err(|_| {
-                                    dbg!(&txout, height, txi);
-                                })?;
-                            let addresstype = Addresstype::try_from(script)?;
+                                Addressbytes::try_from((script, addresstype, addressindex))
+                                    .inspect_err(|_| {
+                                        dbg!(&txout, height, txi, &tx.compute_txid());
+                                    })?;
 
                             let mut addressindex_local = addressindex;
 
-                            if let Some(addressindex_slice) = db
-                                .addressbytes_prefix_to_addressindex
-                                .get((&addressbytes).into())?
-                            {
+                            if let Some(addressindex_slice) = wtx.get(
+                                parts.addressbytes_prefix_to_addressindex.data(),
+                                Slice::from(&addressbytes),
+                            )? {
                                 addressindex_local = addressindex_slice.into()
                             } else {
-                                db.addressbytes_prefix_to_addressindex
-                                    .insert(&addressbytes, addressindex_local, height)
-                                    .inspect_err(|_| {
-                                        dbg!(addresstype);
-                                    })?;
-                                db.addressindex_to_addressbytes.insert(
-                                    addressindex_local,
-                                    &addressbytes,
-                                    height,
-                                );
-                                db.addressindex_to_addresstype.insert(
-                                    addressindex_local,
-                                    addresstype,
-                                    height,
-                                );
+                                if parts.addressbytes_prefix_to_addressindex.needs(height) {
+                                    if let Some(prev) = wtx.fetch_update(
+                                        parts.addressbytes_prefix_to_addressindex.data(),
+                                        Slice::from(&addressbytes),
+                                        |_| Some(Slice::from(addressindex_local)),
+                                    )? {
+                                        dbg!(prev);
+                                        return Err(eyre!("Expect none"));
+                                    }
+                                }
+
+                                if parts.addressindex_to_addressbytes.needs(height) {
+                                    wtx.insert(
+                                        parts.addressindex_to_addressbytes.data(),
+                                        Slice::from(addressindex_local),
+                                        Slice::from(&addressbytes),
+                                    );
+                                }
+
+                                if parts.addressindex_to_addresstype.needs(height) {
+                                    wtx.insert(
+                                        parts.addressindex_to_addresstype.data(),
+                                        Slice::from(addressindex_local),
+                                        Slice::from(addresstype),
+                                    );
+                                }
+
                                 addressindex.increment();
                             }
 
-                            db.txoutindex_to_addressindex.insert(
-                                txoutindex,
-                                addressindex_local,
-                                height,
-                            );
+                            if parts.txoutindex_to_addressindex.needs(height) {
+                                wtx.insert(
+                                    parts.txoutindex_to_addressindex.data(),
+                                    Slice::from(txoutindex),
+                                    Slice::from(addressindex_local),
+                                );
+                            }
 
-                            db.addressindex_to_txoutindexes.insert(
-                                addressindex_local,
-                                txoutindex,
-                                height,
-                            );
+                            if parts.addresstxoutindexes.needs(height) {
+                                wtx.insert(
+                                    parts.addresstxoutindexes.data(),
+                                    Slice::from(Addresstxoutindex::from((
+                                        addressindex_local,
+                                        txoutindex,
+                                    ))),
+                                    Slice::default(),
+                                );
+                            }
 
                             Ok(())
                         },
@@ -151,15 +273,29 @@ fn main() -> color_eyre::Result<()> {
                 },
             )?;
 
+            if parts.height_to_last_addressindex.needs(height) {
+                wtx.insert(
+                    parts.height_to_last_addressindex.data(),
+                    Slice::from(addressindex.decremented()),
+                    blockhash,
+                );
+            }
+
             let should_snapshot = _height % MONTHLY_BLOCK_TARGET == 0 && !exit.active();
             if should_snapshot {
-                export(&mut db, height)?;
+                export(&keyspace, wtx, &parts, height)?;
+                wtx_opt.replace(keyspace.write_tx());
+            } else {
+                wtx_opt.replace(wtx);
             }
 
             Ok(())
         })?;
 
-    export(&mut db, height)?;
+    let wtx = wtx_opt
+        .take()
+        .context("option should have WriteTransaction")?;
+    export(&keyspace, wtx, &parts, height)?;
 
     dbg!(i.elapsed());
 
diff --git a/src/crates/bitbase/src/structs/addressbytes.rs b/src/crates/bitbase/src/structs/addressbytes.rs
index f3533abd9..e51952e27 100644
--- a/src/crates/bitbase/src/structs/addressbytes.rs
+++ b/src/crates/bitbase/src/structs/addressbytes.rs
@@ -1,42 +1,62 @@
 use biter::bitcoin::ScriptBuf;
 use color_eyre::eyre::eyre;
+use derive_deref::{Deref, DerefMut};
 use fjall::Slice;
 
-#[derive(Debug)]
+use super::{Addressindex, Addresstype};
+
+#[derive(Debug, Deref, DerefMut)]
 pub struct Addressbytes(Slice);
 
-impl Addressbytes {
-    pub fn to_prefix_slice(&self) -> Slice {
-        self.0[..8].into()
-    }
-}
-
-impl TryFrom<&ScriptBuf> for Addressbytes {
+impl TryFrom<(&ScriptBuf, Addresstype, Addressindex)> for Addressbytes {
     type Error = color_eyre::Report;
-    fn try_from(script: &ScriptBuf) -> Result<Self, Self::Error> {
-        if script.is_p2pk() {
-            let bytes = script.as_bytes();
-            let bytes = match bytes.len() {
-                67 => &script.as_bytes()[1..66],
-                35 => &script.as_bytes()[1..34],
-                _ => {
+    fn try_from(tuple: (&ScriptBuf, Addresstype, Addressindex)) -> Result<Self, Self::Error> {
+        let (script, addresstype, addressindex) = tuple;
+
+        match addresstype {
+            Addresstype::P2PK => {
+                let bytes = script.as_bytes();
+                let bytes = match bytes.len() {
+                    67 => &script.as_bytes()[1..66],
+                    35 => &script.as_bytes()[1..34],
+                    _ => {
+                        dbg!(bytes);
+                        return Err(eyre!("Wrong len"));
+                    }
+                };
+
+                if bytes[0] != 4 {
                     dbg!(bytes);
-                    return Err(eyre!("Wrong len"));
+                    return Err(eyre!("Doesn't start with a 4"));
                 }
-            };
 
-            if bytes[0] != 4 {
-                dbg!(bytes);
-                return Err(eyre!("Doesn't start with a 4"));
+                Ok(Self(bytes.into()))
+            }
+            Addresstype::P2PKH => {
+                let bytes = &script.as_bytes()[3..23];
+                Ok(Self(bytes.into()))
+            }
+            _ => {
+                if script.is_p2sh() {
+                    Err(eyre!("p2sh address type"))
+                } else if script.is_p2wpkh() {
+                    Err(eyre!("p2wpkh address type"))
+                } else if script.is_p2wsh() {
+                    Err(eyre!("p2wsh address type"))
+                } else if script.is_p2tr() {
+                    Err(eyre!("p2tr address type"))
+                } else if script.is_empty() {
+                    Err(eyre!("empty address type"))
+                } else if script.is_op_return() {
+                    Err(eyre!("op_return address type"))
+                } else if script.is_multisig() {
+                    Err(eyre!("multisig address type"))
+                } else if script.is_push_only() {
+                    Err(eyre!("push only address type"))
+                } else {
+                    Ok(Self(addressindex.into()))
+                }
             }
-
-            Ok(Self(bytes.into()))
-        } else if script.is_p2pkh() {
-            let bytes = &script.as_bytes()[3..23];
-
-            Ok(Self(bytes.into()))
-        } else {
-            Err(eyre!("Unsupported address type"))
         }
     }
 }
diff --git a/src/crates/bitbase/src/structs/addressindex.rs b/src/crates/bitbase/src/structs/addressindex.rs
index 0d53e05d2..87fca33b2 100644
--- a/src/crates/bitbase/src/structs/addressindex.rs
+++ b/src/crates/bitbase/src/structs/addressindex.rs
@@ -9,6 +9,10 @@ pub struct Addressindex(u32);
 impl Addressindex {
     pub const BYTES: usize = size_of::<Self>();
 
+    pub fn decremented(self) -> Self {
+        Self(*self - 1)
+    }
+
     pub fn increment(&mut self) {
         self.0 += 1;
     }
diff --git a/src/crates/bitbase/src/structs/addresstype.rs b/src/crates/bitbase/src/structs/addresstype.rs
index 716c844d1..ff13060ac 100644
--- a/src/crates/bitbase/src/structs/addresstype.rs
+++ b/src/crates/bitbase/src/structs/addresstype.rs
@@ -4,21 +4,45 @@ use fjall::Slice;
 
 use super::SliceExtended;
 
-#[derive(Debug, Clone, Copy)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
 pub enum Addresstype {
     P2PK,
     P2PKH,
+    P2SH,
+    P2WPKH,
+    P2WSH,
+    P2TR,
+    Multisig = 251,
+    PushOnly = 252,
+    OpReturn = 253,
+    Empty = 254,
+    Unknown = 255,
 }
 
-impl TryFrom<&ScriptBuf> for Addresstype {
-    type Error = color_eyre::Report;
-    fn try_from(value: &ScriptBuf) -> Result<Self, Self::Error> {
-        if value.is_p2pk() {
-            Ok(Self::P2PK)
-        } else if value.is_p2pkh() {
-            Ok(Self::P2PKH)
+impl From<&ScriptBuf> for Addresstype {
+    fn from(script: &ScriptBuf) -> Self {
+        if script.is_p2pk() {
+            Self::P2PK
+        } else if script.is_p2pkh() {
+            Self::P2PKH
+        } else if script.is_p2sh() {
+            Self::P2SH
+        } else if script.is_p2wpkh() {
+            Self::P2WPKH
+        } else if script.is_p2wsh() {
+            Self::P2WSH
+        } else if script.is_p2tr() {
+            Self::P2TR
+        } else if script.is_empty() {
+            Self::Empty
+        } else if script.is_op_return() {
+            Self::OpReturn
+        } else if script.is_push_only() {
+            Self::PushOnly
+        } else if script.is_multisig() {
+            Self::Multisig
         } else {
-            Err(eyre!("Not compatible script"))
+            Self::Unknown
         }
     }
 }
diff --git a/src/crates/bitbase/src/structs/fjall.rs b/src/crates/bitbase/src/structs/fjall.rs
deleted file mode 100644
index cfae90a45..000000000
--- a/src/crates/bitbase/src/structs/fjall.rs
+++ /dev/null
@@ -1,143 +0,0 @@
-use std::{mem, ops::RangeBounds};
-
-pub use fjall::*;
-
-use crate::structs::{Height, Version};
-
-pub struct Database {
-    keyspace: Keyspace,
-    data: PartitionHandle,
-    meta: PartitionHandle,
-    batch: Batch,
-    height: Option<Height>,
-}
-
-const VERSION: &str = "version";
-const HEIGHT: &str = "height";
-
-impl Database {
-    pub fn import(name: &str, version: Version) -> Result<Self> {
-        let keyspace = fjall::Config::new(format!("./database/{name}")).open()?;
-
-        let data = Self::open_data(&keyspace)?;
-        let meta = Self::open_meta(&keyspace)?;
-
-        let batch = keyspace.batch();
-
-        let mut this = Self {
-            height: meta.get(HEIGHT)?.map(Height::from),
-            keyspace,
-            data,
-            meta,
-            batch,
-        };
-
-        if let Some(slice) = this.meta.get(VERSION)? {
-            if version != Version::from(slice) {
-                this = this.reset()?;
-            }
-        }
-
-        this.batch
-            .insert(&this.meta, VERSION, version.to_be_bytes());
-
-        Ok(this)
-    }
-
-    fn open_data(keyspace: &Keyspace) -> Result<PartitionHandle> {
-        keyspace.open_partition("data", Self::create_options())
-    }
-
-    fn open_meta(keyspace: &Keyspace) -> Result<PartitionHandle> {
-        keyspace.open_partition("meta", Self::create_options())
-    }
-
-    fn create_options() -> PartitionCreateOptions {
-        PartitionCreateOptions::default().manual_journal_persist(true)
-    }
-
-    pub fn get(&self, key: Slice) -> Result<Option<Slice>> {
-        self.data.get(key)
-    }
-
-    pub fn range<'a, K: AsRef<[u8]> + 'a, R: RangeBounds<K> + 'a>(
-        &'a self,
-        range: R,
-    ) -> impl DoubleEndedIterator<Item = Result<KvPair>> + 'static {
-        self.data.range(range)
-    }
-
-    pub fn prefix<'a, K: AsRef<[u8]> + 'a>(
-        &'a self,
-        prefix: K,
-    ) -> impl DoubleEndedIterator<Item = Result<KvPair>> + 'static {
-        self.data.prefix(prefix)
-    }
-
-    pub fn insert(&mut self, key: Slice, value: Slice, height: Height) {
-        if self.is_safe(height) {
-            return;
-        }
-        self.batch.insert(&self.data, key, value);
-    }
-
-    pub fn fetch_update(
-        &mut self,
-        key: Slice,
-        value: Slice,
-        height: Height,
-    ) -> Result<Option<Slice>> {
-        if self.is_safe(height) {
-            return Ok(None);
-        }
-        let prev = self.get(key.clone());
-        self.batch.insert(&self.data, key, value);
-        prev
-    }
-
-    pub fn remove(&mut self, key: Slice) {
-        self.batch.remove(&self.data, key);
-    }
-
-    pub fn is_safe(&self, height: Height) -> bool {
-        self.height.is_some_and(|self_height| self_height >= height)
-    }
-
-    fn persist(&self) -> Result<()> {
-        self.keyspace.persist(PersistMode::SyncAll)
-    }
-
-    pub fn export(&mut self, height: Height) -> Result<()> {
-        let mut batch = self.keyspace.batch();
-        mem::swap(&mut batch, &mut self.batch);
-
-        batch.insert(&self.meta, HEIGHT, height.to_be_bytes());
-
-        batch.commit()?;
-
-        self.persist()
-    }
-
-    fn reset(mut self) -> Result<Self> {
-        self.keyspace.delete_partition(self.data)?;
-        self.keyspace.delete_partition(self.meta)?;
-
-        self.keyspace.persist(PersistMode::SyncAll)?;
-
-        self.data = Self::open_data(&self.keyspace)?;
-        self.meta = Self::open_meta(&self.keyspace)?;
-
-        Ok(self)
-    }
-
-    pub fn height(&self) -> &Option<Height> {
-        &self.height
-    }
-}
-
-pub trait DatabaseTrait
-where
-    Self: Sized,
-{
-    fn version() -> Version;
-}
diff --git a/src/crates/bitbase/src/structs/mod.rs b/src/crates/bitbase/src/structs/mod.rs
index ad6ef9954..6b557004e 100644
--- a/src/crates/bitbase/src/structs/mod.rs
+++ b/src/crates/bitbase/src/structs/mod.rs
@@ -4,8 +4,10 @@ mod addresstxoutindex;
 mod addresstype;
 mod amount;
 mod exit;
-mod fjall;
 mod height;
+mod partition;
+mod partitions;
+mod prefix;
 mod slice;
 mod txindex;
 mod txoutindex;
@@ -17,8 +19,10 @@ pub use addresstxoutindex::*;
 pub use addresstype::*;
 pub use amount::*;
 pub use exit::*;
-pub use fjall::*;
 pub use height::*;
+pub use partition::*;
+pub use partitions::*;
+pub use prefix::*;
 pub use slice::*;
 pub use txindex::*;
 pub use txoutindex::*;
diff --git a/src/crates/bitbase/src/structs/partition.rs b/src/crates/bitbase/src/structs/partition.rs
new file mode 100644
index 000000000..bd913f22c
--- /dev/null
+++ b/src/crates/bitbase/src/structs/partition.rs
@@ -0,0 +1,104 @@
+pub use fjall::{
+    PartitionCreateOptions, PersistMode, Result, TransactionalKeyspace,
+    TransactionalPartitionHandle,
+};
+
+use crate::structs::{Height, Version};
+
+use super::Exit;
+
+pub struct Partition {
+    version: Version,
+    data: TransactionalPartitionHandle,
+    meta: TransactionalPartitionHandle,
+    height: Option<Height>,
+}
+
+impl Partition {
+    pub const VERSION: &str = "version";
+    pub const HEIGHT: &str = "height";
+
+    pub fn import(
+        keyspace: &TransactionalKeyspace,
+        name: &str,
+        version: Version,
+        exit: &Exit,
+    ) -> Result<Self> {
+        let data = Self::open_data(keyspace, name)?;
+        let meta = Self::open_meta(keyspace, name)?;
+
+        let mut this = Self {
+            version,
+            height: meta.get(Self::HEIGHT)?.map(Height::from),
+            data,
+            meta,
+        };
+
+        if let Some(slice) = this.meta.get(Self::VERSION)? {
+            if version != Version::from(slice) {
+                this = this.reset(keyspace, name, exit)?;
+            }
+        }
+
+        Ok(this)
+    }
+
+    fn open_data(
+        keyspace: &TransactionalKeyspace,
+        name: &str,
+    ) -> Result<TransactionalPartitionHandle> {
+        keyspace.open_partition(&format!("{name}-data"), Self::create_options())
+    }
+
+    fn open_meta(
+        keyspace: &TransactionalKeyspace,
+        name: &str,
+    ) -> Result<TransactionalPartitionHandle> {
+        keyspace.open_partition(&format!("{name}-meta"), Self::create_options())
+    }
+
+    fn create_options() -> PartitionCreateOptions {
+        PartitionCreateOptions::default().manual_journal_persist(true)
+    }
+
+    pub fn is_safe(&self, height: Height) -> bool {
+        self.height.is_some_and(|self_height| self_height >= height)
+    }
+
+    pub fn needs(&self, height: Height) -> bool {
+        !self.is_safe(height)
+    }
+
+    pub fn version(&self) -> Version {
+        self.version
+    }
+
+    pub fn data(&self) -> &TransactionalPartitionHandle {
+        &self.data
+    }
+
+    pub fn meta(&self) -> &TransactionalPartitionHandle {
+        &self.meta
+    }
+
+    fn reset(mut self, keyspace: &TransactionalKeyspace, name: &str, exit: &Exit) -> Result<Self> {
+        exit.block();
+
+        keyspace.delete_partition(self.data)?;
+        keyspace.delete_partition(self.meta)?;
+
+        keyspace.persist(PersistMode::SyncAll)?;
+
+        self.data = Self::open_data(keyspace, name)?;
+        self.meta = Self::open_meta(keyspace, name)?;
+        self.height = None;
+
+        exit.unblock();
+
+        Ok(self)
+    }
+
+    pub fn height(&self) -> &Option<Height> {
+        &self.height
+    }
+}
diff --git a/src/crates/bitbase/src/structs/partitions.rs b/src/crates/bitbase/src/structs/partitions.rs
new file mode 100644
index 000000000..ebacd93c6
--- /dev/null
+++ b/src/crates/bitbase/src/structs/partitions.rs
@@ -0,0 +1,278 @@
+use std::ops::Sub;
+
+use fjall::{Slice, TransactionalKeyspace, WriteTransaction};
+
+use crate::structs::{Exit, Height, Partition, Version};
+
+pub struct Partitions {
+    pub addressbytes_prefix_to_addressindex: Partition,
+    pub addressindex_to_addressbytes: Partition,
+    pub addressindex_to_addresstype: Partition,
+    pub addresstxoutindexes: Partition,
+    pub blockhash_prefix_to_height: Partition,
+    pub height_to_blockhash: Partition,
+    pub height_to_first_addressindex: Partition,
+    pub height_to_first_txindex: Partition,
+    pub height_to_last_addressindex: Partition,
+    pub height_to_last_txindex: Partition,
+    pub txid_prefix_to_txindex: Partition,
+    pub txindex_to_height: Partition,
+    pub txindex_to_txid: Partition,
+    pub txoutindex_to_addressindex: Partition,
+    pub txoutindex_to_amount: Partition,
+}
+
+const UNSAFE_BLOCKS: usize = 100;
+
+impl Partitions {
+    pub fn import(keyspace: &TransactionalKeyspace, exit: &Exit) -> color_eyre::Result<Self> {
+        Ok(Self {
+            addressbytes_prefix_to_addressindex: Partition::import(
+                keyspace,
+                "addressbytes_prefix_to_addressindex",
+                Version::from(1),
+                exit,
+            )?,
+            addressindex_to_addressbytes: Partition::import(
+                keyspace,
+                "addressindex_to_addressbytes",
+                Version::from(1),
+                exit,
+            )?,
+            addressindex_to_addresstype: Partition::import(
+                keyspace,
+                "addressindex_to_addresstype",
+                Version::from(1),
+                exit,
+            )?,
+            addresstxoutindexes: Partition::import(
+                keyspace,
+                "addresstxoutindexes",
+                Version::from(1),
+                exit,
+            )?,
+            blockhash_prefix_to_height: Partition::import(
+                keyspace,
+                "blockhash_prefix_to_height",
+                Version::from(1),
+                exit,
+            )?,
+            height_to_blockhash: Partition::import(
+                keyspace,
+                "height_to_blockhash",
+                Version::from(1),
+                exit,
+            )?,
+            height_to_first_addressindex: Partition::import(
+                keyspace,
+                "height_to_first_addressindex",
+                Version::from(1),
+                exit,
+            )?,
+            height_to_first_txindex: Partition::import(
+                keyspace,
+                "height_to_first_txindex",
+                Version::from(1),
+                exit,
+            )?,
+            height_to_last_addressindex: Partition::import(
+                keyspace,
+                "height_to_last_addressindex",
+                Version::from(1),
+                exit,
+            )?,
+            height_to_last_txindex: Partition::import(
+                keyspace,
+                "height_to_last_txindex",
+                Version::from(1),
+                exit,
+            )?,
+            txid_prefix_to_txindex: Partition::import(
+                keyspace,
+                "txid_prefix_to_txindex",
+                Version::from(1),
+                exit,
+            )?,
+            txindex_to_height: Partition::import(
+                keyspace,
+                "txindex_to_height",
+                Version::from(1),
+                exit,
+            )?,
+            txindex_to_txid: Partition::import(
+                keyspace,
+                "txindex_to_txid",
+                Version::from(1),
+                exit,
+            )?,
+            txoutindex_to_addressindex: Partition::import(
+                keyspace,
+                "txoutindex_to_addressindex",
+                Version::from(1),
+                exit,
+            )?,
+            txoutindex_to_amount: Partition::import(
+                keyspace,
+                "txoutindex_to_amount",
+                Version::from(1),
+                exit,
+            )?,
+        })
+    }
+
+    pub fn udpate_meta(&self, wtx: &mut WriteTransaction, height: Height) {
+        self.to_vec().into_iter().for_each(|part| {
+            let meta = part.meta();
+            wtx.insert(meta, Partition::VERSION, Slice::from(part.version()));
+            wtx.insert(meta, Partition::HEIGHT, height.to_be_bytes());
+        });
+    }
+
+    pub fn start_height(&self) -> Height {
+        self.min_height()
+            .map(|height| height.sub(UNSAFE_BLOCKS))
+            .unwrap_or_default()
+    }
+
+    fn min_height(&self) -> Option<Height> {
+        self.to_vec()
+            .into_iter()
+            .map(|part| part.height())
+            .map(ToOwned::to_owned)
+            .min()
+            .flatten()
+    }
+
+    pub fn rollback_from(
+        &mut self,
+        _wtx: &mut WriteTransaction,
+        _height: Height,
+        _exit: &Exit,
+    ) -> color_eyre::Result<()> {
+        panic!();
+        // let mut txindex = None;
+
+        // wtx.range(self.height_to_blockhash.data(), Slice::from(height)..)
+        //     .try_for_each(|slice| -> color_eyre::Result<()> {
+        //         let (height_slice, slice_blockhash) = slice?;
+        //         let blockhash = BlockHash::from_slice(&slice_blockhash)?;
+
+        //         wtx.remove(self.height_to_blockhash.data(), height_slice);
+
+        //         wtx.remove(self.blockhash_prefix_to_height.data(), blockhash.prefix());
+
+        //         if txindex.is_none() {
+        //             txindex.replace(
+        //                 wtx.get(self.height_to_first_txindex.data(), height_slice)?
+        //                     .context("for height to have first txindex")?,
+        //             );
+        //         }
+        //         wtx.remove(self.height_to_first_txindex.data(), height_slice);
+        //         wtx.remove(self.height_to_last_txindex.data(), height_slice);
+
+        //         Ok(())
+        //     })?;
+
+        // let txindex = txindex.context("txindex to not be none by now")?;
+
+        // wtx.range(self.txindex_to_txid.data(), Slice::from(txindex)..)
+        //     .try_for_each(|slice| -> color_eyre::Result<()> {
+        //         let (slice_txindex, slice_txid) = slice?;
+        //         let txindex = Txindex::from(slice_txindex);
+        //         let txid = Txid::from_slice(&slice_txid)?;
+
+        //         wtx.remove(self.txindex_to_txid.data(), Slice::from(txindex));
+        //         wtx.remove(self.txindex_to_height.data(), Slice::from(txindex));
+        //         wtx.remove(self.txid_prefix_to_txindex.data(), txid.prefix());
+
+        //         Ok(())
+        //     })?;
+
+        // let txoutindex = Txoutindex::from(txindex);
+
+        // let mut addressindexes = BTreeSet::new();
+
+        // wtx.range(self.txoutindex_to_amount.data(), Slice::from(txoutindex)..)
+        //     .try_for_each(|slice| -> color_eyre::Result<()> {
+        //         let (txoutindex_slice, _) = slice?;
+
+        //         wtx.remove(self.txoutindex_to_amount.data(), txoutindex_slice);
+
+        //         if let Some(addressindex_slice) =
+        //             wtx.get(self.txoutindex_to_addressindex.data(), txoutindex_slice)?
+        //         {
+        //             wtx.remove(self.txoutindex_to_addressindex.data(), txoutindex_slice);
+
+        //             let addressindex = Addressindex::from(addressindex_slice);
+        //             addressindexes.insert(addressindex);
+
+        //             let txoutindex = Txoutindex::from(txoutindex_slice);
+        //             let addresstxoutindex = Addresstxoutindex::from((addressindex, txoutindex));
+
+        //             wtx.remove(
+        //                 self.addressindex_to_txoutindexes.data(),
+        //                 Slice::from(addresstxoutindex),
+        //             );
+        //         }
+
+        //         Ok(())
+        //     })?;
+
+        // addressindexes
+        // .into_iter()
+        // .filter(|addressindex| {
+        //     let is_empty = wtx
+        //         .prefix(
+        //             self.addressindex_to_txoutindexes.data(),
+        //             Slice::from(*addressindex),
+        //         )
+        //         .next()
+        //         .is_none();
+        //     is_empty
+        // })
+        // .try_for_each(|addressindex| -> color_eyre::Result<()> {
+        //     let addressindex_slice = Slice::from(addressindex);
+
+        //     let addressbytes = Addressbytes::from(
+        //         wtx.get(
+        //             self.addressindex_to_addressbytes.data(),
+        //             &addressindex_slice,
+        //         )?
+        //         .context("addressindex_to_address to have value")?,
+        //     );
+        //     wtx.remove(
+        //         self.addressbytes_prefix_to_addressindex.data(),
+        //         addressbytes.prefix(),
+        //     );
+        //     wtx.remove(
+        //         self.addressindex_to_addressbytes.data(),
+        //         &addressindex_slice,
+        //     );
+        //     wtx.remove(self.addressindex_to_addresstype.data(), &addressindex_slice);
+
+        //     Ok(())
+        // })?;
+
+        // Ok(())
+    }
+
+    fn to_vec(&self) -> Vec<&Partition> {
+        vec![
+            &self.addressbytes_prefix_to_addressindex,
+            &self.addressindex_to_addressbytes,
+            &self.addressindex_to_addresstype,
+            &self.addresstxoutindexes,
+            &self.blockhash_prefix_to_height,
+            &self.height_to_blockhash,
+            &self.height_to_first_addressindex,
+            &self.height_to_first_txindex,
+            &self.height_to_last_addressindex,
+            &self.height_to_last_txindex,
+            &self.txid_prefix_to_txindex,
+            &self.txindex_to_height,
+            &self.txindex_to_txid,
+            &self.txoutindex_to_addressindex,
+            &self.txoutindex_to_amount,
+        ]
+    }
+}
diff --git a/src/crates/bitbase/src/structs/prefix.rs b/src/crates/bitbase/src/structs/prefix.rs
new file mode 100644
index 000000000..951979107
--- /dev/null
+++ b/src/crates/bitbase/src/structs/prefix.rs
@@ -0,0 +1,25 @@
+use biter::bitcoin::{BlockHash, Txid};
+
+use super::Addressbytes;
+
+pub trait Prefix {
+    fn prefix(&self) -> &[u8];
+}
+
+impl Prefix for Addressbytes {
+    fn prefix(&self) -> &[u8] {
+        &self[..8]
+    }
+}
+
+impl Prefix for BlockHash {
+    fn prefix(&self) -> &[u8] {
+        &self[..8]
+    }
+}
+
+impl Prefix for Txid {
+    fn prefix(&self) -> &[u8] {
+        &self[..8]
+    }
+}
diff --git a/src/crates/bitbase/src/structs/version.rs b/src/crates/bitbase/src/structs/version.rs
index 0c4692388..80fdf235c 100644
--- a/src/crates/bitbase/src/structs/version.rs
+++ b/src/crates/bitbase/src/structs/version.rs
@@ -17,3 +17,9 @@ impl From<Slice> for Version {
         Self(slice.read_u8())
     }
 }
+
+impl From<Version> for Slice {
+    fn from(value: Version) -> Self {
+        value.to_be_bytes().into()
+    }
+}
diff --git a/src/crates/biter/src/lib.rs b/src/crates/biter/src/lib.rs
index 55daa343e..d71d93027 100644
--- a/src/crates/biter/src/lib.rs
+++ b/src/crates/biter/src/lib.rs
@@ -77,7 +77,7 @@ enum BlockState {
 ///         });
 ///
 ///     dbg!(i.elapsed());
-///}
+/// }
 /// ```
 ///
 pub fn new(

From 5b1735db2b8b0f774983b36c6e5129a58c9e9cda Mon Sep 17 00:00:00 2001
From: nym21 <expat-epochs0i@icloud.com>
Date: Tue, 7 Jan 2025 12:15:58 +0100
Subject: [PATCH 17/63] bitbase: pre-rayon snapshot

---
 src/crates/bitbase/rustfmt.toml               |   1 +
 src/crates/bitbase/src/main.rs                | 388 +++++++++++++-----
 .../bitbase/src/structs/addressbytes.rs       |  58 ++-
 .../bitbase/src/structs/addresstxoutindex.rs  |   6 +-
 src/crates/bitbase/src/structs/amount.rs      |   4 +
 src/crates/bitbase/src/structs/partition.rs   |  22 +-
 src/crates/bitbase/src/structs/partitions.rs  |  71 +---
 7 files changed, 336 insertions(+), 214 deletions(-)
 create mode 100644 src/crates/bitbase/rustfmt.toml

diff --git a/src/crates/bitbase/rustfmt.toml b/src/crates/bitbase/rustfmt.toml
new file mode 100644
index 000000000..753065179
--- /dev/null
+++ b/src/crates/bitbase/rustfmt.toml
@@ -0,0 +1 @@
+max_width = 120
diff --git a/src/crates/bitbase/src/main.rs b/src/crates/bitbase/src/main.rs
index 8ad47a7e7..a1ece1c0f 100644
--- a/src/crates/bitbase/src/main.rs
+++ b/src/crates/bitbase/src/main.rs
@@ -1,4 +1,4 @@
-use std::{path::Path, str::FromStr};
+use std::{collections::BTreeMap, path::Path, str::FromStr};
 
 use biter::{
     bitcoin::{hashes::Hash, Txid},
@@ -9,9 +9,10 @@ mod structs;
 
 use color_eyre::eyre::{eyre, ContextCompat};
 use fjall::{PersistMode, Slice, TransactionalKeyspace, WriteTransaction};
+use rayon::prelude::*;
 use structs::{
-    Addressbytes, Addressindex, Addresstxoutindex, Addresstype, Amount, Exit, Height, Partitions,
-    Prefix, SliceExtended, Txindex, Txoutindex,
+    Addressbytes, Addressindex, Addresstxoutindex, Addresstype, Amount, Exit, Height, Partitions, Prefix,
+    SliceExtended, Txindex, Txoutindex,
 };
 
 // https://github.com/fjall-rs/fjall/discussions/72
@@ -19,6 +20,7 @@ use structs::{
 
 const DAILY_BLOCK_TARGET: usize = 144;
 const MONTHLY_BLOCK_TARGET: usize = DAILY_BLOCK_TARGET * 30;
+const U16MAX: usize = u16::MAX as usize;
 
 fn main() -> color_eyre::Result<()> {
     let i = std::time::Instant::now();
@@ -38,18 +40,13 @@ fn main() -> color_eyre::Result<()> {
     let mut height = parts.start_height();
 
     let mut txindex = wtx
-        .get(parts.height_to_last_txindex.data(), Slice::from(height))?
+        .get(parts.height_to_first_txindex.data(), Slice::from(height))?
         .map(Txindex::from)
-        .map(Txindex::incremented)
         .unwrap_or(Txindex::default());
 
     let mut addressindex = wtx
-        .get(
-            parts.height_to_last_addressindex.data(),
-            Slice::from(height),
-        )?
+        .get(parts.height_to_first_addressindex.data(), Slice::from(height))?
         .map(Addressindex::from)
-        .map(Addressindex::incremented)
         .unwrap_or(Addressindex::default());
 
     let export = |keyspace: &TransactionalKeyspace,
@@ -72,37 +69,35 @@ fn main() -> color_eyre::Result<()> {
     biter::new(data_dir, Some(height.into()), None, rpc)
         .iter()
         .try_for_each(|(_height, block, blockhash)| -> color_eyre::Result<()> {
-            let mut wtx = wtx_opt.take().context("option should've wtx")?;
-
             println!("Processing block {_height}...");
 
             height = Height::from(_height);
 
-            let has_different_blockhash = wtx
-                .get(parts.height_to_blockhash.data(), Slice::from(height))?
-                .is_some_and(|saved_blockhash_slice| blockhash[..] != saved_blockhash_slice[..]);
+            let mut wtx = wtx_opt.take().context("option should have wtx")?;
 
-            if has_different_blockhash {
-                parts.rollback_from(&mut wtx, height, &exit)?;
+            let saved_blockhash_slice_opt = wtx.get(parts.height_to_blockhash.data(), Slice::from(height))?;
+            if let Some(saved_blockhash_slice) = saved_blockhash_slice_opt {
+                if blockhash[..] != saved_blockhash_slice[..] {
+                    parts.rollback_from(&mut wtx, height, &exit)?;
+                } else {
+                    wtx_opt.replace(wtx);
+                    return Ok(());
+                }
             }
 
             if parts.blockhash_prefix_to_height.needs(height) {
-                if let Some(prev) = wtx.fetch_update(
-                    parts.blockhash_prefix_to_height.data(),
-                    blockhash.prefix(),
-                    |_| Some(Slice::from(height)),
-                )? {
-                    dbg!(prev);
-                    return Err(eyre!("Expect none"));
+                if let Some(prev_height_slice) =
+                    wtx.fetch_update(parts.blockhash_prefix_to_height.data(), blockhash.prefix(), |_| {
+                        Some(Slice::from(height))
+                    })?
+                {
+                    dbg!(blockhash, Height::from(prev_height_slice));
+                    return Err(eyre!("Collision, expect prefix to need be set yet"));
                 }
             }
 
             if parts.height_to_blockhash.needs(height) {
-                wtx.insert(
-                    parts.height_to_blockhash.data(),
-                    Slice::from(height),
-                    blockhash,
-                );
+                wtx.insert(parts.height_to_blockhash.data(), Slice::from(height), blockhash);
             }
 
             if parts.height_to_first_addressindex.needs(height) {
@@ -116,8 +111,99 @@ fn main() -> color_eyre::Result<()> {
             let txlen = block.txdata.len();
             let last_txi = txlen - 1;
 
-            block.txdata.into_iter().enumerate().try_for_each(
-                |(txi, tx)| -> color_eyre::Result<()> {
+            let mut txi_to_txid_and_prev_txindex_slice_opt = block
+                .txdata
+                .par_iter()
+                .enumerate()
+                .map(|(txi, tx)| -> color_eyre::Result<(usize, (Txid, Option<Slice>))> {
+                    let txid = tx.compute_txid();
+
+                    let prev_txindex_slice_opt = wtx.get(parts.txid_prefix_to_txindex.data(), txid.prefix())?;
+
+                    Ok((txi, (txid, prev_txindex_slice_opt)))
+                })
+                .try_fold(
+                    || -> BTreeMap<usize, (Txid, Option<Slice>)> { BTreeMap::default() },
+                    |mut map, tuple| -> color_eyre::Result<BTreeMap<usize, (Txid, Option<Slice>)>> {
+                        let (txi, tuple) = tuple?;
+                        map.insert(txi, tuple);
+                        Ok(map)
+                    },
+                )
+                .try_reduce(BTreeMap::default, |mut map, mut map2| {
+                    if map.len() > map2.len() {
+                        map.append(&mut map2);
+                        Ok(map)
+                    } else {
+                        map2.append(&mut map);
+                        Ok(map2)
+                    }
+                })?;
+
+            // let addresstxoutindexes_out = block
+            //     .txdata
+            //     .par_iter()
+            //     .filter(|tx| !tx.is_coinbase())
+            //     .flat_map(|tx| &tx.input)
+            //     .try_fold(
+            //         || -> Vec<Addresstxoutindex> { vec![] },
+            //         |mut vec, txin| -> color_eyre::Result<Vec<Addresstxoutindex>> {
+            //             let outpoint = txin.previous_output;
+            //             let txid_prefix = outpoint.txid.prefix();
+            //             let vout = outpoint.vout as u16;
+
+            //             let txindex = Txindex::from(
+            //                 wtx.get(parts.txid_prefix_to_txindex.data(), txid_prefix)?
+            //                     .context("Expect txid to be saved")?,
+            //             );
+
+            //             let txoutindex = Txoutindex::from((txindex, vout));
+
+            //             let addressindex = Addressindex::from(
+            //                 wtx.get(parts.txoutindex_to_addressindex.data(), Slice::from(txoutindex))?
+            //                     .context("Expect addressindex to not be none")
+            //                     .inspect_err(|_| {
+            //                         let height = Height::from(
+            //                             wtx.get(parts.txindex_to_height.data(), Slice::from(txindex))
+            //                                 .expect("txindex_to_height get not fail")
+            //                                 .expect("Expect height for txindex"),
+            //                         );
+            //                         dbg!(outpoint.txid, txindex, vout, txoutindex, height);
+            //                     })?,
+            //             );
+
+            //             if parts.addresstxoutindexes_out.needs(height) {
+            //                 vec.push(Addresstxoutindex::from((addressindex, txoutindex)));
+            //             }
+
+            //             Ok(vec)
+            //         },
+            //     )
+            //     .try_reduce(Vec::new, |mut v, mut v2| {
+            //         if v.len() > v2.len() {
+            //             v.append(&mut v2);
+            //             Ok(v)
+            //         } else {
+            //             v2.append(&mut v);
+            //             Ok(v2)
+            //         }
+            //     })?;
+
+            // addresstxoutindexes_out.into_iter().for_each(|addresstxoutindex| {
+            //     wtx.insert(
+            //         parts.addresstxoutindexes_out.data(),
+            //         Slice::from(addresstxoutindex),
+            //         Slice::default(),
+            //     );
+            // });
+
+            block
+                .txdata
+                .into_iter()
+                .enumerate()
+                .try_for_each(|(txi, tx)| -> color_eyre::Result<()> {
+                    let is_coinbase = tx.is_coinbase();
+
                     if txi == 0 && parts.height_to_first_txindex.needs(height) {
                         wtx.insert(
                             parts.height_to_first_txindex.data(),
@@ -133,44 +219,47 @@ fn main() -> color_eyre::Result<()> {
                         );
                     }
 
-                    if parts.txindex_to_txid.needs(height)
-                        || parts.txid_prefix_to_txindex.needs(height)
-                    {
-                        let txid = tx.compute_txid();
+                    let mut bad_tx = false;
 
-                        if parts.txindex_to_txid.needs(height) {
-                            wtx.insert(parts.txindex_to_txid.data(), Slice::from(txindex), txid);
+                    let (txid, prev_txindex_slice_opt) = txi_to_txid_and_prev_txindex_slice_opt
+                        .remove(&txi)
+                        .context("Par compute of tx should have worked")
+                        .inspect_err(|_| {
+                            dbg!(&txi_to_txid_and_prev_txindex_slice_opt, &txi, tx.compute_txid());
+                        })?;
+
+                    if parts.txindex_to_txid.needs(height) {
+                        wtx.insert(parts.txindex_to_txid.data(), Slice::from(txindex), txid);
+                    }
+
+                    match prev_txindex_slice_opt {
+                        None => {
+                            if parts.txid_prefix_to_txindex.needs(height) {
+                                wtx.insert(parts.txid_prefix_to_txindex.data(), txid.prefix(), Slice::from(txindex));
+                            }
                         }
+                        Some(prev_txindex_slice) => {
+                            let prev_txid = Txid::from_slice(
+                                &wtx.get(parts.txindex_to_txid.data(), &prev_txindex_slice)?
+                                    .expect("To have txid for txindex"),
+                            )?;
 
-                        if parts.txid_prefix_to_txindex.needs(height) {
-                            if let Some(prev) = wtx.fetch_update(
-                                parts.txid_prefix_to_txindex.data(),
-                                txid.prefix(),
-                                |_| Some(Slice::from(txindex)),
-                            )? {
-                                let prev_txid = Txid::from_slice(&wtx
-                                    .get(parts.txindex_to_txid.data(), &prev)?.expect("To have txid for txindex"))?;
+                            let only_known_dup_txids = [
+                                Txid::from_str("d5d27987d2a3dfc724e359870c6644b40e497bdc0589a033220fe15429d88599")?,
+                                Txid::from_str("e3bf3d07d4b0375638d5f1db5255fe07ba2c4cb067cd81b84ee974b6585fb468")?,
+                            ];
 
-                                let only_known_dup_txids = [Txid::from_str("d5d27987d2a3dfc724e359870c6644b40e497bdc0589a033220fe15429d88599")?, Txid::from_str("e3bf3d07d4b0375638d5f1db5255fe07ba2c4cb067cd81b84ee974b6585fb468")?];
+                            let is_dup = only_known_dup_txids.contains(&prev_txid);
+                            bad_tx = is_dup;
 
-                                // TODO
-                                // link txindex to txid
-                                // txid_prefix should point to the first vout so no override
-                                // do not add vout as they're invalid
-
-                                if !only_known_dup_txids.contains(&prev_txid) {
-                                    let prev_height = Height::from(wtx.get(parts.txindex_to_height.data(), &prev)?.expect("To have height"));
-                                    let prev_txindex = Txindex::from(prev);
-                                    dbg!(
-                                        height,
-                                        txid,
-                                        txindex,
-                                        prev_height,
-                                        prev_txid,
-                                        prev_txindex,
-                                    );
-                                    return Err(eyre!("Expect none"));
-                                }
+                            if !is_dup {
+                                let prev_height = Height::from(
+                                    wtx.get(parts.txindex_to_height.data(), &prev_txindex_slice)?
+                                        .expect("To have height"),
+                                );
+                                let prev_txindex = Txindex::from(prev_txindex_slice);
+                                dbg!(height, txid, txindex, prev_height, prev_txid, prev_txindex,);
+                                return Err(eyre!("Expect none"));
                             }
                         }
                     }
@@ -183,15 +272,90 @@ fn main() -> color_eyre::Result<()> {
                         );
                     }
 
-                    txindex.increment();
+                    tx.input
+                        .par_iter()
+                        // .into_par_iter()
+                        .try_fold(
+                            || -> Vec<Addresstxoutindex> { vec![] },
+                            |mut vec, txin| -> color_eyre::Result<Vec<Addresstxoutindex>> {
+                                if is_coinbase {
+                                    return Ok(vec);
+                                }
+
+                                let outpoint = txin.previous_output;
+                                let txid_prefix = outpoint.txid.prefix();
+                                let vout = outpoint.vout as u16;
+
+                                let txindex = Txindex::from(
+                                    wtx.get(parts.txid_prefix_to_txindex.data(), txid_prefix)?
+                                        .context("Expect txid to be saved")?,
+                                );
+
+                                let txoutindex = Txoutindex::from((txindex, vout));
+
+                                let addressindex = Addressindex::from(
+                                    wtx.get(parts.txoutindex_to_addressindex.data(), Slice::from(txoutindex))?
+                                        .context("Expect addressindex to not be none")
+                                        .inspect_err(|_| {
+                                            let height = Height::from(
+                                                wtx.get(parts.txindex_to_height.data(), Slice::from(txindex))
+                                                    .expect("txindex_to_height get not fail")
+                                                    .expect("Expect height for txindex"),
+                                            );
+                                            dbg!(txid, outpoint.txid, txindex, vout, txoutindex, height);
+                                        })?,
+                                );
+
+                                if bad_tx {
+                                    dbg!(tx.compute_txid(), outpoint);
+                                    panic!("bad tx in input")
+                                }
+                                if !bad_tx && parts.addresstxoutindexes_out.needs(height) {
+                                    vec.push(Addresstxoutindex::from((addressindex, txoutindex)));
+                                }
+
+                                Ok(vec)
+                            },
+                        )
+                        .try_reduce(Vec::new, |mut v, mut v2| {
+                            if v.len() > v2.len() {
+                                v.append(&mut v2);
+                                Ok(v)
+                            } else {
+                                v2.append(&mut v);
+                                Ok(v2)
+                            }
+                        })?
+                        .into_iter()
+                        .for_each(|addresstxoutindex| {
+                            wtx.insert(
+                                parts.addresstxoutindexes_out.data(),
+                                Slice::from(addresstxoutindex),
+                                Slice::default(),
+                            );
+                        });
+
+                    tx.output
+                        .into_iter()
+                        .enumerate()
+                        .try_for_each(|(vout, txout)| -> color_eyre::Result<()> {
+                            if vout > U16MAX {
+                                return Err(eyre!("vout bigger than u16::MAX"));
+                            }
 
-                    tx.output.iter().enumerate().try_for_each(
-                        |(vout, txout)| -> color_eyre::Result<()> {
                             let vout = vout as u16;
                             let txoutindex = Txoutindex::from((txindex, vout));
                             let amount = Amount::from(txout.value);
 
-                            if parts.txoutindex_to_amount.needs(height) {
+                            if amount.is_zero() {
+                                if parts.zero_txoutindexes.needs(height) {
+                                    wtx.insert(
+                                        parts.zero_txoutindexes.data(),
+                                        Slice::from(txoutindex),
+                                        Slice::default(),
+                                    );
+                                }
+                            } else if parts.txoutindex_to_amount.needs(height) {
                                 wtx.insert(
                                     parts.txoutindex_to_amount.data(),
                                     Slice::from(txoutindex),
@@ -201,40 +365,24 @@ fn main() -> color_eyre::Result<()> {
 
                             let script = &txout.script_pubkey;
 
-                            let addresstype = Addresstype::from(script);
-                            let addressbytes =
-                                Addressbytes::try_from((script, addresstype, addressindex))
-                                    .inspect_err(|_| {
-                                        dbg!(&txout, height, txi, &tx.compute_txid());
-                                    })?;
-
                             let mut addressindex_local = addressindex;
 
-                            if let Some(addressindex_slice) = wtx.get(
-                                parts.addressbytes_prefix_to_addressindex.data(),
-                                Slice::from(&addressbytes),
-                            )? {
+                            let addresstype = Addresstype::from(script);
+
+                            let addressbytes = Addressbytes::try_from((script, addresstype)).inspect_err(|_| {
+                                // dbg!(&txout, height, txi, &tx.compute_txid());
+                            });
+
+                            if let Some(addressindex_slice) = addressbytes.as_ref().ok().and_then(|addressbytes| {
+                                wtx.get(
+                                    parts.addressbytes_prefix_to_addressindex.data(),
+                                    Slice::from(addressbytes),
+                                )
+                                .ok()
+                                .and_then(|s| s)
+                            }) {
                                 addressindex_local = addressindex_slice.into()
                             } else {
-                                if parts.addressbytes_prefix_to_addressindex.needs(height) {
-                                    if let Some(prev) = wtx.fetch_update(
-                                        parts.addressbytes_prefix_to_addressindex.data(),
-                                        Slice::from(&addressbytes),
-                                        |_| Some(Slice::from(addressindex_local)),
-                                    )? {
-                                        dbg!(prev);
-                                        return Err(eyre!("Expect none"));
-                                    }
-                                }
-
-                                if parts.addressindex_to_addressbytes.needs(height) {
-                                    wtx.insert(
-                                        parts.addressindex_to_addressbytes.data(),
-                                        Slice::from(addressindex_local),
-                                        Slice::from(&addressbytes),
-                                    );
-                                }
-
                                 if parts.addressindex_to_addresstype.needs(height) {
                                     wtx.insert(
                                         parts.addressindex_to_addresstype.data(),
@@ -243,6 +391,27 @@ fn main() -> color_eyre::Result<()> {
                                     );
                                 }
 
+                                if let Ok(addressbytes) = addressbytes {
+                                    if parts.addressbytes_prefix_to_addressindex.needs(height) {
+                                        if let Some(prev) = wtx.fetch_update(
+                                            parts.addressbytes_prefix_to_addressindex.data(),
+                                            Slice::from(&addressbytes),
+                                            |_| Some(Slice::from(addressindex_local)),
+                                        )? {
+                                            dbg!(prev);
+                                            return Err(eyre!("Expect none"));
+                                        }
+                                    }
+
+                                    if parts.addressindex_to_addressbytes.needs(height) {
+                                        wtx.insert(
+                                            parts.addressindex_to_addressbytes.data(),
+                                            Slice::from(addressindex_local),
+                                            Slice::from(&addressbytes),
+                                        );
+                                    }
+                                }
+
                                 addressindex.increment();
                             }
 
@@ -254,24 +423,23 @@ fn main() -> color_eyre::Result<()> {
                                 );
                             }
 
-                            if parts.addresstxoutindexes.needs(height) {
+                            let addresstxoutindex = Addresstxoutindex::from((addressindex_local, txoutindex));
+
+                            if !bad_tx && parts.addresstxoutindexes_in.needs(height) {
                                 wtx.insert(
-                                    parts.addresstxoutindexes.data(),
-                                    Slice::from(Addresstxoutindex::from((
-                                        addressindex_local,
-                                        txoutindex,
-                                    ))),
+                                    parts.addresstxoutindexes_in.data(),
+                                    Slice::from(addresstxoutindex),
                                     Slice::default(),
                                 );
                             }
 
                             Ok(())
-                        },
-                    )?;
+                        })?;
+
+                    txindex.increment();
 
                     Ok(())
-                },
-            )?;
+                })?;
 
             if parts.height_to_last_addressindex.needs(height) {
                 wtx.insert(
@@ -292,9 +460,7 @@ fn main() -> color_eyre::Result<()> {
             Ok(())
         })?;
 
-    let wtx = wtx_opt
-        .take()
-        .context("option should have WriteTransaction")?;
+    let wtx = wtx_opt.take().context("option should have WriteTransaction")?;
     export(&keyspace, wtx, &parts, height)?;
 
     dbg!(i.elapsed());
diff --git a/src/crates/bitbase/src/structs/addressbytes.rs b/src/crates/bitbase/src/structs/addressbytes.rs
index e51952e27..f4db632ee 100644
--- a/src/crates/bitbase/src/structs/addressbytes.rs
+++ b/src/crates/bitbase/src/structs/addressbytes.rs
@@ -3,60 +3,54 @@ use color_eyre::eyre::eyre;
 use derive_deref::{Deref, DerefMut};
 use fjall::Slice;
 
-use super::{Addressindex, Addresstype};
+use super::Addresstype;
 
 #[derive(Debug, Deref, DerefMut)]
 pub struct Addressbytes(Slice);
 
-impl TryFrom<(&ScriptBuf, Addresstype, Addressindex)> for Addressbytes {
+impl TryFrom<(&ScriptBuf, Addresstype)> for Addressbytes {
     type Error = color_eyre::Report;
-    fn try_from(tuple: (&ScriptBuf, Addresstype, Addressindex)) -> Result<Self, Self::Error> {
-        let (script, addresstype, addressindex) = tuple;
+    fn try_from(tuple: (&ScriptBuf, Addresstype)) -> Result<Self, Self::Error> {
+        let (script, addresstype) = tuple;
 
         match addresstype {
             Addresstype::P2PK => {
                 let bytes = script.as_bytes();
                 let bytes = match bytes.len() {
-                    67 => &script.as_bytes()[1..66],
-                    35 => &script.as_bytes()[1..34],
+                    67 => &bytes[1..66],
+                    35 => &bytes[1..34],
                     _ => {
                         dbg!(bytes);
                         return Err(eyre!("Wrong len"));
                     }
                 };
-
-                if bytes[0] != 4 {
-                    dbg!(bytes);
-                    return Err(eyre!("Doesn't start with a 4"));
-                }
-
                 Ok(Self(bytes.into()))
             }
             Addresstype::P2PKH => {
                 let bytes = &script.as_bytes()[3..23];
                 Ok(Self(bytes.into()))
             }
-            _ => {
-                if script.is_p2sh() {
-                    Err(eyre!("p2sh address type"))
-                } else if script.is_p2wpkh() {
-                    Err(eyre!("p2wpkh address type"))
-                } else if script.is_p2wsh() {
-                    Err(eyre!("p2wsh address type"))
-                } else if script.is_p2tr() {
-                    Err(eyre!("p2tr address type"))
-                } else if script.is_empty() {
-                    Err(eyre!("empty address type"))
-                } else if script.is_op_return() {
-                    Err(eyre!("op_return address type"))
-                } else if script.is_multisig() {
-                    Err(eyre!("multisig address type"))
-                } else if script.is_push_only() {
-                    Err(eyre!("push only address type"))
-                } else {
-                    Ok(Self(addressindex.into()))
-                }
+            Addresstype::P2SH => {
+                let bytes = &script.as_bytes()[2..22];
+                Ok(Self(bytes.into()))
             }
+            Addresstype::P2WPKH => {
+                let bytes = &script.as_bytes()[2..];
+                Ok(Self(bytes.into()))
+            }
+            Addresstype::P2WSH => {
+                let bytes = &script.as_bytes()[2..];
+                Ok(Self(bytes.into()))
+            }
+            Addresstype::P2TR => {
+                let bytes = &script.as_bytes()[2..];
+                Ok(Self(bytes.into()))
+            }
+            Addresstype::Multisig => Err(eyre!("multisig address type")),
+            Addresstype::PushOnly => Err(eyre!("push_only address type")),
+            Addresstype::Unknown => Err(eyre!("unknown address type")),
+            Addresstype::Empty => Err(eyre!("empty address type")),
+            Addresstype::OpReturn => Err(eyre!("op_return address type")),
         }
     }
 }
diff --git a/src/crates/bitbase/src/structs/addresstxoutindex.rs b/src/crates/bitbase/src/structs/addresstxoutindex.rs
index b83cde83e..02a5d0d82 100644
--- a/src/crates/bitbase/src/structs/addresstxoutindex.rs
+++ b/src/crates/bitbase/src/structs/addresstxoutindex.rs
@@ -18,9 +18,9 @@ impl From<(Addressindex, Txoutindex)> for Addresstxoutindex {
 
 impl From<Addresstxoutindex> for Slice {
     fn from(value: Addresstxoutindex) -> Self {
-        let txindex_slice = Self::from(value.addressindex);
-        let vout_slice = Self::from(value.txoutindex);
-        Self::from([txindex_slice, vout_slice].concat())
+        let addressindex_slice = Self::from(value.addressindex);
+        let txoutindex_slice = Self::from(value.txoutindex);
+        Self::from([addressindex_slice, txoutindex_slice].concat())
     }
 }
 impl From<Slice> for Addresstxoutindex {
diff --git a/src/crates/bitbase/src/structs/amount.rs b/src/crates/bitbase/src/structs/amount.rs
index 0219842d7..515ea29da 100644
--- a/src/crates/bitbase/src/structs/amount.rs
+++ b/src/crates/bitbase/src/structs/amount.rs
@@ -16,6 +16,10 @@ impl Amount {
     pub const ZERO: Self = Self(bitcoin::Amount::ZERO);
     pub const ONE_BTC_F32: f32 = 100_000_000.0;
     pub const ONE_BTC_F64: f64 = 100_000_000.0;
+
+    pub fn is_zero(&self) -> bool {
+        *self == Self::ZERO
+    }
 }
 
 impl From<u64> for Amount {
diff --git a/src/crates/bitbase/src/structs/partition.rs b/src/crates/bitbase/src/structs/partition.rs
index bd913f22c..4f184442f 100644
--- a/src/crates/bitbase/src/structs/partition.rs
+++ b/src/crates/bitbase/src/structs/partition.rs
@@ -1,7 +1,4 @@
-pub use fjall::{
-    PartitionCreateOptions, PersistMode, Result, TransactionalKeyspace,
-    TransactionalPartitionHandle,
-};
+pub use fjall::{PartitionCreateOptions, PersistMode, Result, TransactionalKeyspace, TransactionalPartitionHandle};
 
 use crate::structs::{Height, Version};
 
@@ -18,12 +15,7 @@ impl Partition {
     pub const VERSION: &str = "version";
     pub const HEIGHT: &str = "height";
 
-    pub fn import(
-        keyspace: &TransactionalKeyspace,
-        name: &str,
-        version: Version,
-        exit: &Exit,
-    ) -> Result<Self> {
+    pub fn import(keyspace: &TransactionalKeyspace, name: &str, version: Version, exit: &Exit) -> Result<Self> {
         let data = Self::open_data(keyspace, name)?;
         let meta = Self::open_meta(keyspace, name)?;
 
@@ -43,17 +35,11 @@ impl Partition {
         Ok(this)
     }
 
-    fn open_data(
-        keyspace: &TransactionalKeyspace,
-        name: &str,
-    ) -> Result<TransactionalPartitionHandle> {
+    fn open_data(keyspace: &TransactionalKeyspace, name: &str) -> Result<TransactionalPartitionHandle> {
         keyspace.open_partition(&format!("{name}-data"), Self::create_options())
     }
 
-    fn open_meta(
-        keyspace: &TransactionalKeyspace,
-        name: &str,
-    ) -> Result<TransactionalPartitionHandle> {
+    fn open_meta(keyspace: &TransactionalKeyspace, name: &str) -> Result<TransactionalPartitionHandle> {
         keyspace.open_partition(&format!("{name}-meta"), Self::create_options())
     }
 
diff --git a/src/crates/bitbase/src/structs/partitions.rs b/src/crates/bitbase/src/structs/partitions.rs
index ebacd93c6..1b08c8c1e 100644
--- a/src/crates/bitbase/src/structs/partitions.rs
+++ b/src/crates/bitbase/src/structs/partitions.rs
@@ -8,7 +8,8 @@ pub struct Partitions {
     pub addressbytes_prefix_to_addressindex: Partition,
     pub addressindex_to_addressbytes: Partition,
     pub addressindex_to_addresstype: Partition,
-    pub addresstxoutindexes: Partition,
+    pub addresstxoutindexes_in: Partition,
+    pub addresstxoutindexes_out: Partition,
     pub blockhash_prefix_to_height: Partition,
     pub height_to_blockhash: Partition,
     pub height_to_first_addressindex: Partition,
@@ -20,6 +21,7 @@ pub struct Partitions {
     pub txindex_to_txid: Partition,
     pub txoutindex_to_addressindex: Partition,
     pub txoutindex_to_amount: Partition,
+    pub zero_txoutindexes: Partition,
 }
 
 const UNSAFE_BLOCKS: usize = 100;
@@ -45,78 +47,40 @@ impl Partitions {
                 Version::from(1),
                 exit,
             )?,
-            addresstxoutindexes: Partition::import(
-                keyspace,
-                "addresstxoutindexes",
-                Version::from(1),
-                exit,
-            )?,
+            addresstxoutindexes_in: Partition::import(keyspace, "addresstxoutindexes_in", Version::from(1), exit)?,
+            addresstxoutindexes_out: Partition::import(keyspace, "addresstxoutindexes_out", Version::from(1), exit)?,
             blockhash_prefix_to_height: Partition::import(
                 keyspace,
                 "blockhash_prefix_to_height",
                 Version::from(1),
                 exit,
             )?,
-            height_to_blockhash: Partition::import(
-                keyspace,
-                "height_to_blockhash",
-                Version::from(1),
-                exit,
-            )?,
+            height_to_blockhash: Partition::import(keyspace, "height_to_blockhash", Version::from(1), exit)?,
             height_to_first_addressindex: Partition::import(
                 keyspace,
                 "height_to_first_addressindex",
                 Version::from(1),
                 exit,
             )?,
-            height_to_first_txindex: Partition::import(
-                keyspace,
-                "height_to_first_txindex",
-                Version::from(1),
-                exit,
-            )?,
+            height_to_first_txindex: Partition::import(keyspace, "height_to_first_txindex", Version::from(1), exit)?,
             height_to_last_addressindex: Partition::import(
                 keyspace,
                 "height_to_last_addressindex",
                 Version::from(1),
                 exit,
             )?,
-            height_to_last_txindex: Partition::import(
-                keyspace,
-                "height_to_last_txindex",
-                Version::from(1),
-                exit,
-            )?,
-            txid_prefix_to_txindex: Partition::import(
-                keyspace,
-                "txid_prefix_to_txindex",
-                Version::from(1),
-                exit,
-            )?,
-            txindex_to_height: Partition::import(
-                keyspace,
-                "txindex_to_height",
-                Version::from(1),
-                exit,
-            )?,
-            txindex_to_txid: Partition::import(
-                keyspace,
-                "txindex_to_txid",
-                Version::from(1),
-                exit,
-            )?,
+            height_to_last_txindex: Partition::import(keyspace, "height_to_last_txindex", Version::from(1), exit)?,
+            txid_prefix_to_txindex: Partition::import(keyspace, "txid_prefix_to_txindex", Version::from(1), exit)?,
+            txindex_to_height: Partition::import(keyspace, "txindex_to_height", Version::from(1), exit)?,
+            txindex_to_txid: Partition::import(keyspace, "txindex_to_txid", Version::from(1), exit)?,
             txoutindex_to_addressindex: Partition::import(
                 keyspace,
                 "txoutindex_to_addressindex",
                 Version::from(1),
                 exit,
             )?,
-            txoutindex_to_amount: Partition::import(
-                keyspace,
-                "txoutindex_to_amount",
-                Version::from(1),
-                exit,
-            )?,
+            txoutindex_to_amount: Partition::import(keyspace, "txoutindex_to_amount", Version::from(1), exit)?,
+            zero_txoutindexes: Partition::import(keyspace, "zero_txoutindexes", Version::from(1), exit)?,
         })
     }
 
@@ -252,6 +216,11 @@ impl Partitions {
 
         //     Ok(())
         // })?;
+        //
+
+        // todo!("clear addresstxoutindexes_out")
+        // todo!("clear addresstxoutindexes_in")
+        // todo!("clear zero_txoutindexes")
 
         // Ok(())
     }
@@ -261,7 +230,8 @@ impl Partitions {
             &self.addressbytes_prefix_to_addressindex,
             &self.addressindex_to_addressbytes,
             &self.addressindex_to_addresstype,
-            &self.addresstxoutindexes,
+            &self.addresstxoutindexes_in,
+            &self.addresstxoutindexes_out,
             &self.blockhash_prefix_to_height,
             &self.height_to_blockhash,
             &self.height_to_first_addressindex,
@@ -273,6 +243,7 @@ impl Partitions {
             &self.txindex_to_txid,
             &self.txoutindex_to_addressindex,
             &self.txoutindex_to_amount,
+            &self.zero_txoutindexes,
         ]
     }
 }

From 1c3cb91ecd43f132ba00f1e4b3f21b3944a40efd Mon Sep 17 00:00:00 2001
From: nym21 <expat-epochs0i@icloud.com>
Date: Wed, 8 Jan 2025 18:01:28 +0100
Subject: [PATCH 18/63] bitbase: rayon done

---
 src/crates/bitbase/src/main.rs                | 598 ++++++++++--------
 .../bitbase/src/structs/addressbytes.rs       |   2 +-
 src/crates/bitbase/src/structs/txindex.rs     |  19 +-
 3 files changed, 339 insertions(+), 280 deletions(-)

diff --git a/src/crates/bitbase/src/main.rs b/src/crates/bitbase/src/main.rs
index a1ece1c0f..57268a91a 100644
--- a/src/crates/bitbase/src/main.rs
+++ b/src/crates/bitbase/src/main.rs
@@ -1,7 +1,7 @@
-use std::{collections::BTreeMap, path::Path, str::FromStr};
+use std::{collections::BTreeMap, path::Path, str::FromStr, thread};
 
 use biter::{
-    bitcoin::{hashes::Hash, Txid},
+    bitcoin::{hashes::Hash, TxIn, TxOut, Txid},
     bitcoincore_rpc::{Auth, Client},
 };
 
@@ -22,9 +22,16 @@ const DAILY_BLOCK_TARGET: usize = 144;
 const MONTHLY_BLOCK_TARGET: usize = DAILY_BLOCK_TARGET * 30;
 const U16MAX: usize = u16::MAX as usize;
 
+enum TxInOrAddresstxoutindex<'a> {
+    TxIn(&'a TxIn),
+    Addresstxoutindex(Addresstxoutindex),
+}
+
 fn main() -> color_eyre::Result<()> {
     let i = std::time::Instant::now();
 
+    let check_collisions = true;
+
     let data_dir = Path::new("../../../../bitcoin");
     let cookie = Path::new(data_dir).join(".cookie");
     let rpc = Client::new("http://localhost:8332", Auth::CookieFile(cookie)).unwrap();
@@ -86,14 +93,16 @@ fn main() -> color_eyre::Result<()> {
             }
 
             if parts.blockhash_prefix_to_height.needs(height) {
-                if let Some(prev_height_slice) =
-                    wtx.fetch_update(parts.blockhash_prefix_to_height.data(), blockhash.prefix(), |_| {
-                        Some(Slice::from(height))
-                    })?
-                {
-                    dbg!(blockhash, Height::from(prev_height_slice));
-                    return Err(eyre!("Collision, expect prefix to need be set yet"));
+                if check_collisions {
+                    if let Some(prev_height_slice) =
+                        wtx.get(parts.blockhash_prefix_to_height.data(), blockhash.prefix())?
+                    {
+                        dbg!(blockhash, Height::from(prev_height_slice));
+                        return Err(eyre!("Collision, expect prefix to need be set yet"));
+                    }
                 }
+
+                wtx.insert(parts.blockhash_prefix_to_height.data(), blockhash.prefix(),Slice::from(height));
             }
 
             if parts.height_to_blockhash.needs(height) {
@@ -111,107 +120,316 @@ fn main() -> color_eyre::Result<()> {
             let txlen = block.txdata.len();
             let last_txi = txlen - 1;
 
-            let mut txi_to_txid_and_prev_txindex_slice_opt = block
-                .txdata
-                .par_iter()
-                .enumerate()
-                .map(|(txi, tx)| -> color_eyre::Result<(usize, (Txid, Option<Slice>))> {
-                    let txid = tx.compute_txid();
+            let (txid_to_index_join_handle, txin_or_addresstxoutindex_vec_handle, txoutindex_to_txout_addresstype_addressbytes_res_addressindex_opt_handle) = thread::scope(|scope| {
+                let txid_to_index_handle = scope.spawn(|| -> color_eyre::Result<_> {
+                    block
+                    .txdata
+                    .par_iter()
+                    .enumerate()
+                    .map(|(index, tx)| -> color_eyre::Result<_> {
+                        let txid = tx.compute_txid();
 
-                    let prev_txindex_slice_opt = wtx.get(parts.txid_prefix_to_txindex.data(), txid.prefix())?;
+                        // Could be removed as should only trigger for two txid (duplicates)
+                        let prev_txindex_slice_opt = wtx.get(parts.txid_prefix_to_txindex.data(), txid.prefix())?;
 
-                    Ok((txi, (txid, prev_txindex_slice_opt)))
-                })
-                .try_fold(
-                    || -> BTreeMap<usize, (Txid, Option<Slice>)> { BTreeMap::default() },
-                    |mut map, tuple| -> color_eyre::Result<BTreeMap<usize, (Txid, Option<Slice>)>> {
-                        let (txi, tuple) = tuple?;
-                        map.insert(txi, tuple);
-                        Ok(map)
-                    },
-                )
-                .try_reduce(BTreeMap::default, |mut map, mut map2| {
-                    if map.len() > map2.len() {
-                        map.append(&mut map2);
-                        Ok(map)
-                    } else {
-                        map2.append(&mut map);
-                        Ok(map2)
+                        Ok((txid, (index, prev_txindex_slice_opt)))
+                    })
+                    .try_fold(
+                        BTreeMap::new,
+                        |mut map, tuple| {
+                            let (key, value) = tuple?;
+                            map.insert(key, value);
+                            Ok(map)
+                        },
+                    )
+                    .try_reduce(BTreeMap::new, |mut map, mut map2| {
+                        if map.len() > map2.len() {
+                            map.append(&mut map2);
+                            Ok(map)
+                        } else {
+                            map2.append(&mut map);
+                            Ok(map2)
+                        }
+                    })});
+
+                let txin_or_addresstxoutindex_vec_handle = scope.spawn(|| -> color_eyre::Result<Vec<TxInOrAddresstxoutindex>> {
+                    block
+                        .txdata
+                        .par_iter()
+                        .filter(|tx| !tx.is_coinbase())
+                        .flat_map(|tx| &tx.input)
+                        .map(|txin| -> color_eyre::Result<_> {
+                            let outpoint = txin.previous_output;
+                            let txid_prefix = outpoint.txid.prefix();
+                            let vout = outpoint.vout as u16;
+
+                            let txindex = if let Some(txindex) = wtx
+                                .get(parts.txid_prefix_to_txindex.data(), txid_prefix)?
+                                .map(Txindex::from)
+                            {
+                                txindex
+                            } else {
+                                return Ok(TxInOrAddresstxoutindex::TxIn(txin));
+                            };
+
+                            let txoutindex = Txoutindex::from((txindex, vout));
+
+                            let addressindex = Addressindex::from(
+                                wtx.get(parts.txoutindex_to_addressindex.data(), Slice::from(txoutindex))?
+                                    .context("Expect addressindex to not be none")
+                                    .inspect_err(|_| {
+                                        let height = Height::from(
+                                            wtx.get(parts.txindex_to_height.data(), Slice::from(txindex))
+                                                .expect("txindex_to_height get not fail")
+                                                .expect("Expect height for txindex"),
+                                        );
+                                        dbg!(outpoint.txid, txindex, vout, txoutindex, height);
+                                    })?,
+                            );
+
+                            Ok(TxInOrAddresstxoutindex::Addresstxoutindex(Addresstxoutindex::from((
+                                addressindex,
+                                txoutindex,
+                            ))))
+                        })
+                        .try_fold(
+                            Vec::new,
+                            |mut vec, addresstxoutindex| {
+                                // There is no need to check for bad_tx as there are only 2 instances known
+                                // Which you can find below and which are coinbase tx and thus which are already filtered
+                                if parts.addresstxoutindexes_out.needs(height) {
+                                    vec.push(addresstxoutindex?);
+                                }
+
+                                Ok(vec)
+                            },
+                        )
+                        .try_reduce(Vec::new, |mut v, mut v2| {
+                            if v.len() > v2.len() {
+                                v.append(&mut v2);
+                                Ok(v)
+                            } else {
+                                v2.append(&mut v);
+                                Ok(v2)
+                            }
+                        })
+                });
+
+                let txoutindex_to_txout_addresstype_addressbytes_res_addressindex_opt_handle = scope.spawn(|| -> color_eyre::Result<BTreeMap<Txoutindex,
+                (&TxOut, Addresstype, color_eyre::Result<Addressbytes>, Option<Slice>)>> {
+                    block
+                        .txdata
+                        .par_iter()
+                        .enumerate()
+                        .flat_map(|(index, tx)| {
+                            tx.output
+                                .par_iter()
+                                .enumerate()
+                                .map(move |(vout, txout)| (index, vout, txout))
+                        })
+                        .map(
+                            |(index, vout, txout)| {
+                                if vout > U16MAX {
+                                    return Err(eyre!("vout bigger than u16::MAX"));
+                                }
+
+                                let vout = vout as u16;
+                                let txindex = txindex + index;
+                                let txoutindex = Txoutindex::from((txindex, vout));
+
+                                let script = &txout.script_pubkey;
+
+                                let addresstype = Addresstype::from(script);
+
+                                let addressbytes_res = Addressbytes::try_from((script, addresstype)).inspect_err(|_| {
+                                    // dbg!(&txout, height, txi, &tx.compute_txid());
+                                });
+
+                                let addressindex_slice_opt = addressbytes_res.as_ref().ok().and_then(|addressbytes| {
+                                    wtx.get(
+                                        parts.addressbytes_prefix_to_addressindex.data(),
+                                        Slice::from(addressbytes),
+                                    )
+                                    .ok()
+                                    .and_then(|s| s)
+                                });
+
+                                let is_new_address = addressindex_slice_opt.is_none();
+
+                                if check_collisions && is_new_address {
+                                    if let Ok(addressbytes) = &addressbytes_res {
+                                        if let Some(prev) = wtx.get(
+                                            parts.addressbytes_prefix_to_addressindex.data(),
+                                            Slice::from(addressbytes),
+                                        )? {
+                                            dbg!(prev);
+                                            return Err(eyre!("addressbytes_prefix_to_addressindex collision, expect none"));
+                                        }
+                                    }
+                                }
+
+                                Ok((
+                                    txoutindex,
+                                    (txout, addresstype, addressbytes_res, addressindex_slice_opt),
+                                ))
+                            },
+                        )
+                        .try_fold(
+                            BTreeMap::new,
+                            |mut map, tuple| -> color_eyre::Result<_> {
+                                let (key, value) = tuple?;
+                                map.insert(key, value);
+                                Ok(map)
+                            },
+                        )
+                        .try_reduce(BTreeMap::new, |mut map, mut map2| {
+                            if map.len() > map2.len() {
+                                map.append(&mut map2);
+                                Ok(map)
+                            } else {
+                                map2.append(&mut map);
+                                Ok(map2)
+                            }
+                        })
+                });
+
+                (txid_to_index_handle.join(), txin_or_addresstxoutindex_vec_handle.join(), txoutindex_to_txout_addresstype_addressbytes_res_addressindex_opt_handle.join())
+            });
+
+            let txid_to_index = txid_to_index_join_handle.ok().context("Expect txid_to_index_join_handle to join")??;
+
+            let txin_or_addresstxoutindex_vec = txin_or_addresstxoutindex_vec_handle.ok().context("Export txin_or_addresstxoutindex_vec_handle to join")??;
+
+            let txoutindex_to_txout_addresstype_addressbytes_res_addressindex_opt = txoutindex_to_txout_addresstype_addressbytes_res_addressindex_opt_handle.ok().context("Expect txoutindex_to_txout_addresstype_addressbytes_res_addressindex_opt_handle to join")??;
+
+            let mut new_txoutindex_to_addressindex: BTreeMap<Txoutindex, Addressindex> = BTreeMap::new();
+
+            txoutindex_to_txout_addresstype_addressbytes_res_addressindex_opt
+                .into_iter()
+                .try_for_each(|(txoutindex, (txout, addresstype, addressbytes_res, addressindex_slice_opt))| -> color_eyre::Result<()> {
+                    let amount = Amount::from(txout.value);
+
+                    let mut addressindex_local = addressindex;
+
+                    if amount.is_zero() {
+                        if parts.zero_txoutindexes.needs(height) {
+                            wtx.insert(
+                                parts.zero_txoutindexes.data(),
+                                Slice::from(txoutindex),
+                                Slice::default(),
+                            );
+                        }
+                    } else if parts.txoutindex_to_amount.needs(height) {
+                        wtx.insert(
+                            parts.txoutindex_to_amount.data(),
+                            Slice::from(txoutindex),
+                            Slice::from(amount),
+                        );
                     }
+
+                    if let Some(addressindex_slice) = addressindex_slice_opt {
+                        addressindex_local = addressindex_slice.into()
+                    } else {
+                        new_txoutindex_to_addressindex.insert(txoutindex, addressindex_local);
+
+                        if parts.addressindex_to_addresstype.needs(height) {
+                            wtx.insert(
+                                parts.addressindex_to_addresstype.data(),
+                                Slice::from(addressindex_local),
+                                Slice::from(addresstype),
+                            );
+                        }
+
+                        if let Ok(addressbytes) = addressbytes_res {
+                            if parts.addressbytes_prefix_to_addressindex.needs(height) {
+                                wtx.insert(
+                                    parts.addressbytes_prefix_to_addressindex.data(),
+                                    Slice::from(addressbytes.prefix()),
+                                    Slice::from(addressindex_local),
+                                );
+                            }
+
+                            if parts.addressindex_to_addressbytes.needs(height) {
+                                wtx.insert(
+                                    parts.addressindex_to_addressbytes.data(),
+                                    Slice::from(addressindex_local),
+                                    Slice::from(&addressbytes),
+                                );
+                            }
+
+                        }
+
+                        addressindex.increment();
+                    }
+
+                    if parts.txoutindex_to_addressindex.needs(height) {
+                        wtx.insert(
+                            parts.txoutindex_to_addressindex.data(),
+                            Slice::from(txoutindex),
+                            Slice::from(addressindex_local),
+                        );
+                    }
+
+                    let addresstxoutindex = Addresstxoutindex::from((addressindex_local, txoutindex));
+
+                    if parts.addresstxoutindexes_in.needs(height) {
+                        wtx.insert(
+                            parts.addresstxoutindexes_in.data(),
+                            Slice::from(addresstxoutindex),
+                            Slice::default(),
+                        );
+                    }
+
+                    Ok(())
                 })?;
 
-            // let addresstxoutindexes_out = block
-            //     .txdata
-            //     .par_iter()
-            //     .filter(|tx| !tx.is_coinbase())
-            //     .flat_map(|tx| &tx.input)
-            //     .try_fold(
-            //         || -> Vec<Addresstxoutindex> { vec![] },
-            //         |mut vec, txin| -> color_eyre::Result<Vec<Addresstxoutindex>> {
-            //             let outpoint = txin.previous_output;
-            //             let txid_prefix = outpoint.txid.prefix();
-            //             let vout = outpoint.vout as u16;
-
-            //             let txindex = Txindex::from(
-            //                 wtx.get(parts.txid_prefix_to_txindex.data(), txid_prefix)?
-            //                     .context("Expect txid to be saved")?,
-            //             );
-
-            //             let txoutindex = Txoutindex::from((txindex, vout));
-
-            //             let addressindex = Addressindex::from(
-            //                 wtx.get(parts.txoutindex_to_addressindex.data(), Slice::from(txoutindex))?
-            //                     .context("Expect addressindex to not be none")
-            //                     .inspect_err(|_| {
-            //                         let height = Height::from(
-            //                             wtx.get(parts.txindex_to_height.data(), Slice::from(txindex))
-            //                                 .expect("txindex_to_height get not fail")
-            //                                 .expect("Expect height for txindex"),
-            //                         );
-            //                         dbg!(outpoint.txid, txindex, vout, txoutindex, height);
-            //                     })?,
-            //             );
-
-            //             if parts.addresstxoutindexes_out.needs(height) {
-            //                 vec.push(Addresstxoutindex::from((addressindex, txoutindex)));
-            //             }
-
-            //             Ok(vec)
-            //         },
-            //     )
-            //     .try_reduce(Vec::new, |mut v, mut v2| {
-            //         if v.len() > v2.len() {
-            //             v.append(&mut v2);
-            //             Ok(v)
-            //         } else {
-            //             v2.append(&mut v);
-            //             Ok(v2)
-            //         }
-            //     })?;
-
-            // addresstxoutindexes_out.into_iter().for_each(|addresstxoutindex| {
-            //     wtx.insert(
-            //         parts.addresstxoutindexes_out.data(),
-            //         Slice::from(addresstxoutindex),
-            //         Slice::default(),
-            //     );
-            // });
-
-            block
-                .txdata
+            if parts.addresstxoutindexes_out.needs(height) {
+                txin_or_addresstxoutindex_vec
                 .into_iter()
-                .enumerate()
-                .try_for_each(|(txi, tx)| -> color_eyre::Result<()> {
-                    let is_coinbase = tx.is_coinbase();
+                .map(|txin_or_addresstxoutindex| -> color_eyre::Result<Addresstxoutindex> {
+                    match txin_or_addresstxoutindex {
+                        TxInOrAddresstxoutindex::Addresstxoutindex(addresstxoutindex) => Ok(addresstxoutindex),
+                        TxInOrAddresstxoutindex::TxIn(txin) => {
+                            let outpoint = txin.previous_output;
+                            let txid = outpoint.txid;
+                            let vout = outpoint.vout as u16;
+                            let index = txid_to_index
+                                .get(&txid)
+                                .context("txid should be in same block")?.0;
+                            let txindex = txindex + index;
+                            let txoutindex = Txoutindex::from((txindex, vout));
+                            let addressindex = new_txoutindex_to_addressindex
+                                .remove(&txoutindex)
+                                .context("should have found addressindex from same block").inspect_err(|_| {
+                                    dbg!(txin, txoutindex);
+                                })?;
 
-                    if txi == 0 && parts.height_to_first_txindex.needs(height) {
+                            Ok(Addresstxoutindex::from((addressindex, txoutindex)))
+                        }
+                    }
+                })
+                .try_for_each(|addresstxoutindex| -> color_eyre::Result<()> {
+                    wtx.insert(
+                        parts.addresstxoutindexes_out.data(),
+                        Slice::from(addresstxoutindex?),
+                        Slice::default(),
+                    );
+                    Ok(())
+                })?;
+            }
+
+            txid_to_index.into_iter().try_for_each(
+                |(txid, (index, prev_txindex_slice_opt))| -> color_eyre::Result<()> {
+                    let txindex = txindex + index;
+
+                    if index == 0 && parts.height_to_first_txindex.needs(height) {
                         wtx.insert(
                             parts.height_to_first_txindex.data(),
                             Slice::from(height),
                             Slice::from(txindex),
                         );
                     }
-                    if txi == last_txi && parts.height_to_last_txindex.needs(height) {
+                    if index == last_txi && parts.height_to_last_txindex.needs(height) {
                         wtx.insert(
                             parts.height_to_last_txindex.data(),
                             Slice::from(height),
@@ -219,15 +437,6 @@ fn main() -> color_eyre::Result<()> {
                         );
                     }
 
-                    let mut bad_tx = false;
-
-                    let (txid, prev_txindex_slice_opt) = txi_to_txid_and_prev_txindex_slice_opt
-                        .remove(&txi)
-                        .context("Par compute of tx should have worked")
-                        .inspect_err(|_| {
-                            dbg!(&txi_to_txid_and_prev_txindex_slice_opt, &txi, tx.compute_txid());
-                        })?;
-
                     if parts.txindex_to_txid.needs(height) {
                         wtx.insert(parts.txindex_to_txid.data(), Slice::from(txindex), txid);
                     }
@@ -239,18 +448,20 @@ fn main() -> color_eyre::Result<()> {
                             }
                         }
                         Some(prev_txindex_slice) => {
+                            // Ok if `get` is not par as should happen only twice
                             let prev_txid = Txid::from_slice(
                                 &wtx.get(parts.txindex_to_txid.data(), &prev_txindex_slice)?
                                     .expect("To have txid for txindex"),
                             )?;
 
+                            // If another Txid needs to be added to the list
+                            // We need to check that it's also a coinbase tx otherwise par_iter inputs needs to be updated
                             let only_known_dup_txids = [
                                 Txid::from_str("d5d27987d2a3dfc724e359870c6644b40e497bdc0589a033220fe15429d88599")?,
                                 Txid::from_str("e3bf3d07d4b0375638d5f1db5255fe07ba2c4cb067cd81b84ee974b6585fb468")?,
                             ];
 
                             let is_dup = only_known_dup_txids.contains(&prev_txid);
-                            bad_tx = is_dup;
 
                             if !is_dup {
                                 let prev_height = Height::from(
@@ -272,174 +483,9 @@ fn main() -> color_eyre::Result<()> {
                         );
                     }
 
-                    tx.input
-                        .par_iter()
-                        // .into_par_iter()
-                        .try_fold(
-                            || -> Vec<Addresstxoutindex> { vec![] },
-                            |mut vec, txin| -> color_eyre::Result<Vec<Addresstxoutindex>> {
-                                if is_coinbase {
-                                    return Ok(vec);
-                                }
-
-                                let outpoint = txin.previous_output;
-                                let txid_prefix = outpoint.txid.prefix();
-                                let vout = outpoint.vout as u16;
-
-                                let txindex = Txindex::from(
-                                    wtx.get(parts.txid_prefix_to_txindex.data(), txid_prefix)?
-                                        .context("Expect txid to be saved")?,
-                                );
-
-                                let txoutindex = Txoutindex::from((txindex, vout));
-
-                                let addressindex = Addressindex::from(
-                                    wtx.get(parts.txoutindex_to_addressindex.data(), Slice::from(txoutindex))?
-                                        .context("Expect addressindex to not be none")
-                                        .inspect_err(|_| {
-                                            let height = Height::from(
-                                                wtx.get(parts.txindex_to_height.data(), Slice::from(txindex))
-                                                    .expect("txindex_to_height get not fail")
-                                                    .expect("Expect height for txindex"),
-                                            );
-                                            dbg!(txid, outpoint.txid, txindex, vout, txoutindex, height);
-                                        })?,
-                                );
-
-                                if bad_tx {
-                                    dbg!(tx.compute_txid(), outpoint);
-                                    panic!("bad tx in input")
-                                }
-                                if !bad_tx && parts.addresstxoutindexes_out.needs(height) {
-                                    vec.push(Addresstxoutindex::from((addressindex, txoutindex)));
-                                }
-
-                                Ok(vec)
-                            },
-                        )
-                        .try_reduce(Vec::new, |mut v, mut v2| {
-                            if v.len() > v2.len() {
-                                v.append(&mut v2);
-                                Ok(v)
-                            } else {
-                                v2.append(&mut v);
-                                Ok(v2)
-                            }
-                        })?
-                        .into_iter()
-                        .for_each(|addresstxoutindex| {
-                            wtx.insert(
-                                parts.addresstxoutindexes_out.data(),
-                                Slice::from(addresstxoutindex),
-                                Slice::default(),
-                            );
-                        });
-
-                    tx.output
-                        .into_iter()
-                        .enumerate()
-                        .try_for_each(|(vout, txout)| -> color_eyre::Result<()> {
-                            if vout > U16MAX {
-                                return Err(eyre!("vout bigger than u16::MAX"));
-                            }
-
-                            let vout = vout as u16;
-                            let txoutindex = Txoutindex::from((txindex, vout));
-                            let amount = Amount::from(txout.value);
-
-                            if amount.is_zero() {
-                                if parts.zero_txoutindexes.needs(height) {
-                                    wtx.insert(
-                                        parts.zero_txoutindexes.data(),
-                                        Slice::from(txoutindex),
-                                        Slice::default(),
-                                    );
-                                }
-                            } else if parts.txoutindex_to_amount.needs(height) {
-                                wtx.insert(
-                                    parts.txoutindex_to_amount.data(),
-                                    Slice::from(txoutindex),
-                                    Slice::from(amount),
-                                );
-                            }
-
-                            let script = &txout.script_pubkey;
-
-                            let mut addressindex_local = addressindex;
-
-                            let addresstype = Addresstype::from(script);
-
-                            let addressbytes = Addressbytes::try_from((script, addresstype)).inspect_err(|_| {
-                                // dbg!(&txout, height, txi, &tx.compute_txid());
-                            });
-
-                            if let Some(addressindex_slice) = addressbytes.as_ref().ok().and_then(|addressbytes| {
-                                wtx.get(
-                                    parts.addressbytes_prefix_to_addressindex.data(),
-                                    Slice::from(addressbytes),
-                                )
-                                .ok()
-                                .and_then(|s| s)
-                            }) {
-                                addressindex_local = addressindex_slice.into()
-                            } else {
-                                if parts.addressindex_to_addresstype.needs(height) {
-                                    wtx.insert(
-                                        parts.addressindex_to_addresstype.data(),
-                                        Slice::from(addressindex_local),
-                                        Slice::from(addresstype),
-                                    );
-                                }
-
-                                if let Ok(addressbytes) = addressbytes {
-                                    if parts.addressbytes_prefix_to_addressindex.needs(height) {
-                                        if let Some(prev) = wtx.fetch_update(
-                                            parts.addressbytes_prefix_to_addressindex.data(),
-                                            Slice::from(&addressbytes),
-                                            |_| Some(Slice::from(addressindex_local)),
-                                        )? {
-                                            dbg!(prev);
-                                            return Err(eyre!("Expect none"));
-                                        }
-                                    }
-
-                                    if parts.addressindex_to_addressbytes.needs(height) {
-                                        wtx.insert(
-                                            parts.addressindex_to_addressbytes.data(),
-                                            Slice::from(addressindex_local),
-                                            Slice::from(&addressbytes),
-                                        );
-                                    }
-                                }
-
-                                addressindex.increment();
-                            }
-
-                            if parts.txoutindex_to_addressindex.needs(height) {
-                                wtx.insert(
-                                    parts.txoutindex_to_addressindex.data(),
-                                    Slice::from(txoutindex),
-                                    Slice::from(addressindex_local),
-                                );
-                            }
-
-                            let addresstxoutindex = Addresstxoutindex::from((addressindex_local, txoutindex));
-
-                            if !bad_tx && parts.addresstxoutindexes_in.needs(height) {
-                                wtx.insert(
-                                    parts.addresstxoutindexes_in.data(),
-                                    Slice::from(addresstxoutindex),
-                                    Slice::default(),
-                                );
-                            }
-
-                            Ok(())
-                        })?;
-
-                    txindex.increment();
-
                     Ok(())
-                })?;
+                },
+            )?;
 
             if parts.height_to_last_addressindex.needs(height) {
                 wtx.insert(
@@ -457,10 +503,12 @@ fn main() -> color_eyre::Result<()> {
                 wtx_opt.replace(wtx);
             }
 
+            txindex += txlen;
+
             Ok(())
         })?;
 
-    let wtx = wtx_opt.take().context("option should have WriteTransaction")?;
+    let wtx = wtx_opt.take().context("option should have wtx")?;
     export(&keyspace, wtx, &parts, height)?;
 
     dbg!(i.elapsed());
diff --git a/src/crates/bitbase/src/structs/addressbytes.rs b/src/crates/bitbase/src/structs/addressbytes.rs
index f4db632ee..d23e39beb 100644
--- a/src/crates/bitbase/src/structs/addressbytes.rs
+++ b/src/crates/bitbase/src/structs/addressbytes.rs
@@ -5,7 +5,7 @@ use fjall::Slice;
 
 use super::Addresstype;
 
-#[derive(Debug, Deref, DerefMut)]
+#[derive(Debug, Deref, DerefMut, PartialEq, Eq, PartialOrd, Ord)]
 pub struct Addressbytes(Slice);
 
 impl TryFrom<(&ScriptBuf, Addresstype)> for Addressbytes {
diff --git a/src/crates/bitbase/src/structs/txindex.rs b/src/crates/bitbase/src/structs/txindex.rs
index 2df5434fa..556c352cd 100644
--- a/src/crates/bitbase/src/structs/txindex.rs
+++ b/src/crates/bitbase/src/structs/txindex.rs
@@ -1,3 +1,5 @@
+use std::ops::{Add, AddAssign};
+
 use derive_deref::{Deref, DerefMut};
 use fjall::Slice;
 
@@ -9,10 +11,6 @@ pub struct Txindex(u32);
 impl Txindex {
     pub const BYTES: usize = size_of::<Self>();
 
-    pub fn increment(&mut self) {
-        self.0 += 1;
-    }
-
     pub fn incremented(self) -> Self {
         Self(*self + 1)
     }
@@ -45,3 +43,16 @@ impl From<Txindex> for Slice {
         value.to_be_bytes().into()
     }
 }
+
+impl Add<usize> for Txindex {
+    type Output = Self;
+    fn add(self, rhs: usize) -> Self::Output {
+        Self(self.0 + rhs as u32)
+    }
+}
+
+impl AddAssign<usize> for Txindex {
+    fn add_assign(&mut self, rhs: usize) {
+        self.0 += rhs as u32
+    }
+}

From 813f16cceead274d49b3a1bd07cb96ec01c86c5b Mon Sep 17 00:00:00 2001
From: nym21 <expat-epochs0i@icloud.com>
Date: Thu, 9 Jan 2025 00:13:52 +0100
Subject: [PATCH 19/63] bitbase: small optimization

---
 src/crates/bitbase/src/main.rs | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/crates/bitbase/src/main.rs b/src/crates/bitbase/src/main.rs
index 57268a91a..9068628c4 100644
--- a/src/crates/bitbase/src/main.rs
+++ b/src/crates/bitbase/src/main.rs
@@ -34,7 +34,7 @@ fn main() -> color_eyre::Result<()> {
 
     let data_dir = Path::new("../../../../bitcoin");
     let cookie = Path::new(data_dir).join(".cookie");
-    let rpc = Client::new("http://localhost:8332", Auth::CookieFile(cookie)).unwrap();
+    let rpc = Client::new("http://localhost:8332", Auth::CookieFile(cookie))?;
 
     let exit = Exit::new();
 
@@ -120,8 +120,8 @@ fn main() -> color_eyre::Result<()> {
             let txlen = block.txdata.len();
             let last_txi = txlen - 1;
 
-            let (txid_to_index_join_handle, txin_or_addresstxoutindex_vec_handle, txoutindex_to_txout_addresstype_addressbytes_res_addressindex_opt_handle) = thread::scope(|scope| {
-                let txid_to_index_handle = scope.spawn(|| -> color_eyre::Result<_> {
+            let (txid_prefix_slice_to_txid_and_index_join_handle, txin_or_addresstxoutindex_vec_handle, txoutindex_to_txout_addresstype_addressbytes_res_addressindex_opt_handle) = thread::scope(|scope| {
+                let txid_prefix_slice_to_txid_and_index_handle = scope.spawn(|| -> color_eyre::Result<_> {
                     block
                     .txdata
                     .par_iter()
@@ -132,7 +132,7 @@ fn main() -> color_eyre::Result<()> {
                         // Could be removed as should only trigger for two txid (duplicates)
                         let prev_txindex_slice_opt = wtx.get(parts.txid_prefix_to_txindex.data(), txid.prefix())?;
 
-                        Ok((txid, (index, prev_txindex_slice_opt)))
+                        Ok((Slice::from(txid.prefix()), (txid, index, prev_txindex_slice_opt)))
                     })
                     .try_fold(
                         BTreeMap::new,
@@ -293,10 +293,10 @@ fn main() -> color_eyre::Result<()> {
                         })
                 });
 
-                (txid_to_index_handle.join(), txin_or_addresstxoutindex_vec_handle.join(), txoutindex_to_txout_addresstype_addressbytes_res_addressindex_opt_handle.join())
+                (txid_prefix_slice_to_txid_and_index_handle.join(), txin_or_addresstxoutindex_vec_handle.join(), txoutindex_to_txout_addresstype_addressbytes_res_addressindex_opt_handle.join())
             });
 
-            let txid_to_index = txid_to_index_join_handle.ok().context("Expect txid_to_index_join_handle to join")??;
+            let txid_prefix_slice_to_txid_and_index = txid_prefix_slice_to_txid_and_index_join_handle.ok().context("Expect txid_prefix_slice_to_txid_and_index_join_handle to join")??;
 
             let txin_or_addresstxoutindex_vec = txin_or_addresstxoutindex_vec_handle.ok().context("Export txin_or_addresstxoutindex_vec_handle to join")??;
 
@@ -370,9 +370,9 @@ fn main() -> color_eyre::Result<()> {
                         );
                     }
 
-                    let addresstxoutindex = Addresstxoutindex::from((addressindex_local, txoutindex));
 
                     if parts.addresstxoutindexes_in.needs(height) {
+                        let addresstxoutindex = Addresstxoutindex::from((addressindex_local, txoutindex));
                         wtx.insert(
                             parts.addresstxoutindexes_in.data(),
                             Slice::from(addresstxoutindex),
@@ -393,9 +393,9 @@ fn main() -> color_eyre::Result<()> {
                             let outpoint = txin.previous_output;
                             let txid = outpoint.txid;
                             let vout = outpoint.vout as u16;
-                            let index = txid_to_index
-                                .get(&txid)
-                                .context("txid should be in same block")?.0;
+                            let index = txid_prefix_slice_to_txid_and_index
+                                .get(txid.prefix())
+                                .context("txid should be in same block")?.1;
                             let txindex = txindex + index;
                             let txoutindex = Txoutindex::from((txindex, vout));
                             let addressindex = new_txoutindex_to_addressindex
@@ -418,8 +418,8 @@ fn main() -> color_eyre::Result<()> {
                 })?;
             }
 
-            txid_to_index.into_iter().try_for_each(
-                |(txid, (index, prev_txindex_slice_opt))| -> color_eyre::Result<()> {
+            txid_prefix_slice_to_txid_and_index.into_iter().try_for_each(
+                |(txid_prefix, (txid, index, prev_txindex_slice_opt))| -> color_eyre::Result<()> {
                     let txindex = txindex + index;
 
                     if index == 0 && parts.height_to_first_txindex.needs(height) {
@@ -444,7 +444,7 @@ fn main() -> color_eyre::Result<()> {
                     match prev_txindex_slice_opt {
                         None => {
                             if parts.txid_prefix_to_txindex.needs(height) {
-                                wtx.insert(parts.txid_prefix_to_txindex.data(), txid.prefix(), Slice::from(txindex));
+                                wtx.insert(parts.txid_prefix_to_txindex.data(), txid_prefix, Slice::from(txindex));
                             }
                         }
                         Some(prev_txindex_slice) => {
@@ -508,6 +508,10 @@ fn main() -> color_eyre::Result<()> {
             Ok(())
         })?;
 
+    // dbg!(i.elapsed());
+
+    // loop {}
+
     let wtx = wtx_opt.take().context("option should have wtx")?;
     export(&keyspace, wtx, &parts, height)?;
 

From 1212c3627ba0da5852117a016b1137793338a298 Mon Sep 17 00:00:00 2001
From: nym21 <expat-epochs0i@icloud.com>
Date: Thu, 9 Jan 2025 20:53:04 +0100
Subject: [PATCH 20/63] cargo: update fjall to v2.5

---
 src/crates/bitbase/Cargo.lock  | 28 ++++++++++++++--------------
 src/crates/bitbase/Cargo.toml  |  2 +-
 src/crates/bitbase/src/main.rs | 23 ++++++++++++-----------
 3 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/src/crates/bitbase/Cargo.lock b/src/crates/bitbase/Cargo.lock
index 1cb32bd0d..585837238 100644
--- a/src/crates/bitbase/Cargo.lock
+++ b/src/crates/bitbase/Cargo.lock
@@ -366,7 +366,7 @@ checksum = "805ef2023ccd65425743a91ecd11fc020979a0b01921db3104fb606d18a7b43e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.92",
+ "syn 2.0.95",
 ]
 
 [[package]]
@@ -390,7 +390,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.92",
+ "syn 2.0.95",
 ]
 
 [[package]]
@@ -427,9 +427,9 @@ checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
 
 [[package]]
 name = "fjall"
-version = "2.4.4"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cd1bb382d52e527f10f5ed3f126bb4a87c77fbf878a1432010820a71aaa6322"
+checksum = "80910a26e4fb5e5393ff64d293602ac1ade56cf4d14d244c02a7d4ddcd5f10bc"
 dependencies = [
  "byteorder",
  "dashmap",
@@ -554,9 +554,9 @@ checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
 
 [[package]]
 name = "lsm-tree"
-version = "2.4.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7952bc71e90c0b58ce441dcf6cf8624cac042125dec1183ec9c48144f74378d"
+checksum = "4d858efa63a32a286a06aa3968f3ed09811d556697e9f9804aa72ea679ed3b83"
 dependencies = [
  "byteorder",
  "crossbeam-skiplist",
@@ -860,7 +860,7 @@ checksum = "46f859dbbf73865c6627ed570e78961cd3ac92407a2d117204c49232485da55e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.92",
+ "syn 2.0.95",
 ]
 
 [[package]]
@@ -915,9 +915,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.92"
+version = "2.0.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70ae51629bf965c5c098cc9e87908a3df5301051a9e087d6f9bef5c9771ed126"
+checksum = "46f71c0377baf4ef1cc3e3402ded576dccc315800fbc62dfc7fe04b009773b4a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1002,9 +1002,9 @@ checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
 
 [[package]]
 name = "value-log"
-version = "1.4.0"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7abc2af068c21c0b0531624fbdb5b2c950cf8e7dc72cedf77a9ec10bb677450f"
+checksum = "1f90495556d09c3026f7f3897f8a7db59c8c701082e32dcf58c2319062ae1eb0"
 dependencies = [
  "byteorder",
  "log",
@@ -1103,9 +1103,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "xxhash-rust"
-version = "0.8.14"
+version = "0.8.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7d48f1b18be023c95e7b75f481cac649d74be7c507ff4a407c55cfb957f7934"
+checksum = "fdd20c5420375476fbd4394763288da7eb0cc0b8c11deed431a91562af7335d3"
 
 [[package]]
 name = "zerocopy"
@@ -1125,5 +1125,5 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.92",
+ "syn 2.0.95",
 ]
diff --git a/src/crates/bitbase/Cargo.toml b/src/crates/bitbase/Cargo.toml
index 0febf661b..a4a033886 100644
--- a/src/crates/bitbase/Cargo.toml
+++ b/src/crates/bitbase/Cargo.toml
@@ -9,5 +9,5 @@ biter = "0.2.2"
 color-eyre = "0.6.3"
 ctrlc = "3.4.5"
 derive_deref = "1.1.1"
-fjall = "2.4.4"
+fjall = "2.5.0"
 rayon = "1.10.0"
diff --git a/src/crates/bitbase/src/main.rs b/src/crates/bitbase/src/main.rs
index 9068628c4..ded75007e 100644
--- a/src/crates/bitbase/src/main.rs
+++ b/src/crates/bitbase/src/main.rs
@@ -1,4 +1,9 @@
-use std::{collections::BTreeMap, path::Path, str::FromStr, thread};
+use std::{
+    collections::BTreeMap,
+    path::Path,
+    str::FromStr,
+    thread::{self},
+};
 
 use biter::{
     bitcoin::{hashes::Hash, TxIn, TxOut, Txid},
@@ -18,8 +23,6 @@ use structs::{
 // https://github.com/fjall-rs/fjall/discussions/72
 // https://github.com/romanz/electrs/blob/master/doc/schema.md
 
-const DAILY_BLOCK_TARGET: usize = 144;
-const MONTHLY_BLOCK_TARGET: usize = DAILY_BLOCK_TARGET * 30;
 const U16MAX: usize = u16::MAX as usize;
 
 enum TxInOrAddresstxoutindex<'a> {
@@ -106,14 +109,14 @@ fn main() -> color_eyre::Result<()> {
             }
 
             if parts.height_to_blockhash.needs(height) {
-                wtx.insert(parts.height_to_blockhash.data(), Slice::from(height), blockhash);
+                wtx.insert(parts.height_to_blockhash.data(), Slice::from(height), &blockhash[..]);
             }
 
             if parts.height_to_first_addressindex.needs(height) {
                 wtx.insert(
                     parts.height_to_first_addressindex.data(),
+                    Slice::from(height),
                     Slice::from(addressindex),
-                    blockhash,
                 );
             }
 
@@ -438,7 +441,7 @@ fn main() -> color_eyre::Result<()> {
                     }
 
                     if parts.txindex_to_txid.needs(height) {
-                        wtx.insert(parts.txindex_to_txid.data(), Slice::from(txindex), txid);
+                        wtx.insert(parts.txindex_to_txid.data(), Slice::from(txindex), &txid[..]);
                     }
 
                     match prev_txindex_slice_opt {
@@ -490,12 +493,12 @@ fn main() -> color_eyre::Result<()> {
             if parts.height_to_last_addressindex.needs(height) {
                 wtx.insert(
                     parts.height_to_last_addressindex.data(),
+                    Slice::from(height),
                     Slice::from(addressindex.decremented()),
-                    blockhash,
                 );
             }
 
-            let should_snapshot = _height % MONTHLY_BLOCK_TARGET == 0 && !exit.active();
+            let should_snapshot = _height % 100 == 0 && !exit.active();
             if should_snapshot {
                 export(&keyspace, wtx, &parts, height)?;
                 wtx_opt.replace(keyspace.write_tx());
@@ -508,9 +511,7 @@ fn main() -> color_eyre::Result<()> {
             Ok(())
         })?;
 
-    // dbg!(i.elapsed());
-
-    // loop {}
+    dbg!(i.elapsed());
 
     let wtx = wtx_opt.take().context("option should have wtx")?;
     export(&keyspace, wtx, &parts, height)?;

From 82746a066911fa36a74b1b71976de9a3a728199d Mon Sep 17 00:00:00 2001
From: nym21 <expat-epochs0i@icloud.com>
Date: Tue, 14 Jan 2025 12:32:27 +0100
Subject: [PATCH 21/63] bitbase: vecdisk

---
 src/crates/bitbase/.gitignore                 |   1 +
 src/crates/bitbase/Cargo.lock                 |  10 +
 src/crates/bitbase/Cargo.toml                 |   1 +
 src/crates/bitbase/src/main.rs                | 436 +++++++++---------
 .../bitbase/src/structs/addressbytes.rs       | 109 ++++-
 .../bitbase/src/structs/addressindex.rs       |  24 +-
 .../src/structs/addressindextxoutindex.rs     |  38 ++
 .../bitbase/src/structs/addresstxoutindex.rs  |  35 --
 src/crates/bitbase/src/structs/addresstype.rs |  34 +-
 .../bitbase/src/structs/addresstypeindex.rs   |  81 ++++
 src/crates/bitbase/src/structs/height.rs      |  85 ++--
 src/crates/bitbase/src/structs/mod.rs         |  12 +-
 src/crates/bitbase/src/structs/partition.rs   |  28 +-
 src/crates/bitbase/src/structs/partitions.rs  |  74 +--
 src/crates/bitbase/src/structs/prefix.rs      |  52 ++-
 src/crates/bitbase/src/structs/slice.rs       |  57 ++-
 src/crates/bitbase/src/structs/txindex.rs     |  56 ++-
 src/crates/bitbase/src/structs/txindexvout.rs |  51 ++
 src/crates/bitbase/src/structs/txoutindex.rs  |  86 ++--
 src/crates/bitbase/src/structs/vecdisk.rs     | 219 +++++++++
 src/crates/bitbase/src/structs/vecdisks.rs    | 248 ++++++++++
 src/crates/bitbase/src/structs/version.rs     |  14 +-
 22 files changed, 1261 insertions(+), 490 deletions(-)
 create mode 100644 src/crates/bitbase/src/structs/addressindextxoutindex.rs
 delete mode 100644 src/crates/bitbase/src/structs/addresstxoutindex.rs
 create mode 100644 src/crates/bitbase/src/structs/addresstypeindex.rs
 create mode 100644 src/crates/bitbase/src/structs/txindexvout.rs
 create mode 100644 src/crates/bitbase/src/structs/vecdisk.rs
 create mode 100644 src/crates/bitbase/src/structs/vecdisks.rs

diff --git a/src/crates/bitbase/.gitignore b/src/crates/bitbase/.gitignore
index e2647cd44..ef19dbeff 100644
--- a/src/crates/bitbase/.gitignore
+++ b/src/crates/bitbase/.gitignore
@@ -1 +1,2 @@
 /database
+*_bkp
diff --git a/src/crates/bitbase/Cargo.lock b/src/crates/bitbase/Cargo.lock
index 585837238..82340f639 100644
--- a/src/crates/bitbase/Cargo.lock
+++ b/src/crates/bitbase/Cargo.lock
@@ -76,6 +76,7 @@ dependencies = [
  "ctrlc",
  "derive_deref",
  "fjall",
+ "memmap2",
  "rayon",
 ]
 
@@ -587,6 +588,15 @@ version = "2.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
+[[package]]
+name = "memmap2"
+version = "0.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "min-max-heap"
 version = "1.3.0"
diff --git a/src/crates/bitbase/Cargo.toml b/src/crates/bitbase/Cargo.toml
index a4a033886..659e81017 100644
--- a/src/crates/bitbase/Cargo.toml
+++ b/src/crates/bitbase/Cargo.toml
@@ -10,4 +10,5 @@ color-eyre = "0.6.3"
 ctrlc = "3.4.5"
 derive_deref = "1.1.1"
 fjall = "2.5.0"
+memmap2 = "0.9.5"
 rayon = "1.10.0"
diff --git a/src/crates/bitbase/src/main.rs b/src/crates/bitbase/src/main.rs
index ded75007e..b99ecf268 100644
--- a/src/crates/bitbase/src/main.rs
+++ b/src/crates/bitbase/src/main.rs
@@ -1,12 +1,13 @@
 use std::{
     collections::BTreeMap,
+    io::{Read, Write},
     path::Path,
     str::FromStr,
     thread::{self},
 };
 
 use biter::{
-    bitcoin::{hashes::Hash, TxIn, TxOut, Txid},
+    bitcoin::{TxIn, TxOut, Txid},
     bitcoincore_rpc::{Auth, Client},
 };
 
@@ -16,18 +17,17 @@ use color_eyre::eyre::{eyre, ContextCompat};
 use fjall::{PersistMode, Slice, TransactionalKeyspace, WriteTransaction};
 use rayon::prelude::*;
 use structs::{
-    Addressbytes, Addressindex, Addresstxoutindex, Addresstype, Amount, Exit, Height, Partitions, Prefix,
-    SliceExtended, Txindex, Txoutindex,
+    Addressbytes, AddressbytesPrefix, Addressindex, Addressindextxoutindex, Addresstype, Addresstypeindex, Amount,
+    AnyVecdisk, BlockHashPrefix, Exit, Height, Partitions, TxidPrefix, Txindex, Txindexvout, Txoutindex, Vecdisks,
 };
 
 // https://github.com/fjall-rs/fjall/discussions/72
 // https://github.com/romanz/electrs/blob/master/doc/schema.md
 
-const U16MAX: usize = u16::MAX as usize;
-
-enum TxInOrAddresstxoutindex<'a> {
+#[derive(Debug)]
+enum TxInOrAddressindextoutindex<'a> {
     TxIn(&'a TxIn),
-    Addresstxoutindex(Addresstxoutindex),
+    Addressindextoutindex(Addressindextxoutindex),
 }
 
 fn main() -> color_eyre::Result<()> {
@@ -41,27 +41,40 @@ fn main() -> color_eyre::Result<()> {
 
     let exit = Exit::new();
 
-    let keyspace = fjall::Config::new("./database").open_transactional()?;
+    let path_database = Path::new("./database");
 
-    let mut parts = Partitions::import(&keyspace, &exit)?;
+    let mut vecdisks = Vecdisks::import(path_database)?;
+
+    let keyspace = fjall::Config::new(path_database).open_transactional()?;
+
+    let parts = Partitions::import(&keyspace, &exit)?;
 
     let wtx = keyspace.write_tx();
 
     let mut height = parts.start_height();
 
-    let mut txindex = wtx
-        .get(parts.height_to_first_txindex.data(), Slice::from(height))?
-        .map(Txindex::from)
+    let mut txindex = vecdisks
+        .height_to_first_txindex
+        .get(height)?
+        .cloned()
         .unwrap_or(Txindex::default());
 
-    let mut addressindex = wtx
-        .get(parts.height_to_first_addressindex.data(), Slice::from(height))?
-        .map(Addressindex::from)
+    let mut txoutindex = vecdisks
+        .height_to_first_txoutindex
+        .get(height)?
+        .cloned()
+        .unwrap_or(Txoutindex::default());
+
+    let mut addressindex = vecdisks
+        .height_to_first_addressindex
+        .get(height)?
+        .cloned()
         .unwrap_or(Addressindex::default());
 
     let export = |keyspace: &TransactionalKeyspace,
                   mut wtx: WriteTransaction,
                   parts: &Partitions,
+                  vecdisks: &mut Vecdisks,
                   height: Height|
      -> color_eyre::Result<()> {
         parts.udpate_meta(&mut wtx, height);
@@ -69,6 +82,7 @@ fn main() -> color_eyre::Result<()> {
         println!("Exporting...");
         wtx.commit()?;
         keyspace.persist(PersistMode::SyncAll)?;
+        vecdisks.flush()?;
         println!("Export done");
         exit.unblock();
         Ok(())
@@ -76,7 +90,7 @@ fn main() -> color_eyre::Result<()> {
 
     let mut wtx_opt = Some(wtx);
 
-    biter::new(data_dir, Some(height.into()), None, rpc)
+    biter::new(data_dir, Some(height.into()), Some(400_000), rpc)
         .iter()
         .try_for_each(|(_height, block, blockhash)| -> color_eyre::Result<()> {
             println!("Processing block {_height}...");
@@ -85,46 +99,52 @@ fn main() -> color_eyre::Result<()> {
 
             let mut wtx = wtx_opt.take().context("option should have wtx")?;
 
-            let saved_blockhash_slice_opt = wtx.get(parts.height_to_blockhash.data(), Slice::from(height))?;
-            if let Some(saved_blockhash_slice) = saved_blockhash_slice_opt {
-                if blockhash[..] != saved_blockhash_slice[..] {
-                    parts.rollback_from(&mut wtx, height, &exit)?;
-                } else {
-                    wtx_opt.replace(wtx);
-                    return Ok(());
-                }
-            }
+            // if let Some(saved_blockhash) = vecdisks.height_to_blockhash.get(height)? {
+            //     if &blockhash != saved_blockhash {
+            //         parts.rollback_from(&mut wtx, height, &exit)?;
+            //     } else {
+            //         wtx_opt.replace(wtx);
+            //         return Ok(());
+            //     }
+            // }
 
             if parts.blockhash_prefix_to_height.needs(height) {
+                let blockhash_prefix = BlockHashPrefix::from(&blockhash);
+
                 if check_collisions {
+
                     if let Some(prev_height_slice) =
-                        wtx.get(parts.blockhash_prefix_to_height.data(), blockhash.prefix())?
+                        wtx.get(parts.blockhash_prefix_to_height.data(), blockhash_prefix.clone())?
                     {
-                        dbg!(blockhash, Height::from(prev_height_slice));
+                        dbg!(blockhash, Height::try_from(prev_height_slice)?);
                         return Err(eyre!("Collision, expect prefix to need be set yet"));
                     }
                 }
 
-                wtx.insert(parts.blockhash_prefix_to_height.data(), blockhash.prefix(),Slice::from(height));
+                wtx.insert(parts.blockhash_prefix_to_height.data(), blockhash_prefix.clone(),Slice::from(height));
             }
 
-            if parts.height_to_blockhash.needs(height) {
-                wtx.insert(parts.height_to_blockhash.data(), Slice::from(height), &blockhash[..]);
-            }
+            vecdisks.height_to_blockhash.push_if_needed(height, blockhash)?;
+            vecdisks.height_to_first_txindex.push_if_needed(height, txindex)?;
+            vecdisks.height_to_first_txoutindex.push_if_needed(height, txoutindex)?;
+            vecdisks.height_to_first_addressindex.push_if_needed(height, addressindex)?;
 
-            if parts.height_to_first_addressindex.needs(height) {
-                wtx.insert(
-                    parts.height_to_first_addressindex.data(),
-                    Slice::from(height),
-                    Slice::from(addressindex),
-                );
-            }
+            let outputs = block
+                .txdata
+                .iter()
+                .enumerate()
+                .flat_map(|(index, tx)| {
+                    tx.output
+                        .iter()
+                        .enumerate()
+                        .map(move |(vout, txout)| (Txindex::from(index), vout as u32, txout))
+                }).collect::<Vec<_>>();
 
-            let txlen = block.txdata.len();
-            let last_txi = txlen - 1;
+            let tx_len = block.txdata.len();
+            let outputs_len = outputs.len();
 
-            let (txid_prefix_slice_to_txid_and_index_join_handle, txin_or_addresstxoutindex_vec_handle, txoutindex_to_txout_addresstype_addressbytes_res_addressindex_opt_handle) = thread::scope(|scope| {
-                let txid_prefix_slice_to_txid_and_index_handle = scope.spawn(|| -> color_eyre::Result<_> {
+            let (txid_prefix_to_txid_and_block_txindex_and_prev_txindex_join_handle, txin_or_addressindextxoutindex_vec_handle, txoutindex_to_txout_addresstype_addressbytes_res_addressindex_opt_handle) = thread::scope(|scope| {
+                let txid_prefix_to_txid_and_block_txindex_and_prev_txindex_handle = scope.spawn(|| -> color_eyre::Result<_> {
                     block
                     .txdata
                     .par_iter()
@@ -132,10 +152,14 @@ fn main() -> color_eyre::Result<()> {
                     .map(|(index, tx)| -> color_eyre::Result<_> {
                         let txid = tx.compute_txid();
 
-                        // Could be removed as should only trigger for two txid (duplicates)
-                        let prev_txindex_slice_opt = wtx.get(parts.txid_prefix_to_txindex.data(), txid.prefix())?;
+                        let prev_txindex_slice_opt = if check_collisions {
+                            // Should only find collisions for two txids (duplicates), see below
+                            wtx.get(parts.txid_prefix_to_txindex.data(), TxidPrefix::from(&txid).clone())?.map(Txindex::try_from)
+                        } else {
+                            None
+                        };
 
-                        Ok((Slice::from(txid.prefix()), (txid, index, prev_txindex_slice_opt)))
+                        Ok((TxidPrefix::from(&txid), (txid, Txindex::from(index), prev_txindex_slice_opt)))
                     })
                     .try_fold(
                         BTreeMap::new,
@@ -155,7 +179,7 @@ fn main() -> color_eyre::Result<()> {
                         }
                     })});
 
-                let txin_or_addresstxoutindex_vec_handle = scope.spawn(|| -> color_eyre::Result<Vec<TxInOrAddresstxoutindex>> {
+                let txin_or_addressindextxoutindex_vec_handle = scope.spawn(|| -> color_eyre::Result<Vec<TxInOrAddressindextoutindex>> {
                     block
                         .txdata
                         .par_iter()
@@ -163,45 +187,50 @@ fn main() -> color_eyre::Result<()> {
                         .flat_map(|tx| &tx.input)
                         .map(|txin| -> color_eyre::Result<_> {
                             let outpoint = txin.previous_output;
-                            let txid_prefix = outpoint.txid.prefix();
-                            let vout = outpoint.vout as u16;
+                            let txid = outpoint.txid;
+                            let vout = outpoint.vout;
 
-                            let txindex = if let Some(txindex) = wtx
-                                .get(parts.txid_prefix_to_txindex.data(), txid_prefix)?
-                                .map(Txindex::from)
+                            let txindex_local = if let Some(txindex_local) = wtx
+                                .get(parts.txid_prefix_to_txindex.data(), TxidPrefix::from(&txid).clone())?
+                                .map(Txindex::try_from)
                             {
-                                txindex
+                                txindex_local
                             } else {
-                                return Ok(TxInOrAddresstxoutindex::TxIn(txin));
-                            };
+                                return Ok(TxInOrAddressindextoutindex::TxIn(txin));
+                            }?;
 
-                            let txoutindex = Txoutindex::from((txindex, vout));
+                            let txindexvout = Txindexvout::from((txindex_local, vout));
 
-                            let addressindex = Addressindex::from(
-                                wtx.get(parts.txoutindex_to_addressindex.data(), Slice::from(txoutindex))?
-                                    .context("Expect addressindex to not be none")
+                            let txoutindex = Txoutindex::try_from(
+                                wtx.get(parts.txindexvout_to_txoutindex.data(), Slice::from(txindexvout))?
+                                    .context("Expect txoutindex to not be none")
                                     .inspect_err(|_| {
-                                        let height = Height::from(
-                                            wtx.get(parts.txindex_to_height.data(), Slice::from(txindex))
-                                                .expect("txindex_to_height get not fail")
-                                                .expect("Expect height for txindex"),
-                                        );
-                                        dbg!(outpoint.txid, txindex, vout, txoutindex, height);
+                                        // let height = vecdisks.txindex_to_height.get(txindex.into()).expect("txindex_to_height get not fail")
+                                        // .expect("Expect height for txindex");
+                                        dbg!(outpoint.txid, txindex_local, vout, txindexvout);
                                     })?,
-                            );
+                            )?;
 
-                            Ok(TxInOrAddresstxoutindex::Addresstxoutindex(Addresstxoutindex::from((
+                            let addressindex = *vecdisks.txoutindex_to_addressindex.get(txoutindex)?
+                                .context("Expect addressindex to not be none")
+                                .inspect_err(|_| {
+                                    // let height = vecdisks.txindex_to_height.get(txindex.into()).expect("txindex_to_height get not fail")
+                                    // .expect("Expect height for txindex");
+                                    dbg!(outpoint.txid, txindex_local, vout, txindexvout);
+                                })?;
+
+                            Ok(TxInOrAddressindextoutindex::Addressindextoutindex(Addressindextxoutindex::from((
                                 addressindex,
                                 txoutindex,
                             ))))
                         })
                         .try_fold(
                             Vec::new,
-                            |mut vec, addresstxoutindex| {
+                            |mut vec, addressindextxoutindex| {
                                 // There is no need to check for bad_tx as there are only 2 instances known
                                 // Which you can find below and which are coinbase tx and thus which are already filtered
-                                if parts.addresstxoutindexes_out.needs(height) {
-                                    vec.push(addresstxoutindex?);
+                                if parts.addressindextxoutindex_out.needs(height) {
+                                    vec.push(addressindextxoutindex?);
                                 }
 
                                 Ok(vec)
@@ -219,26 +248,13 @@ fn main() -> color_eyre::Result<()> {
                 });
 
                 let txoutindex_to_txout_addresstype_addressbytes_res_addressindex_opt_handle = scope.spawn(|| -> color_eyre::Result<BTreeMap<Txoutindex,
-                (&TxOut, Addresstype, color_eyre::Result<Addressbytes>, Option<Slice>)>> {
-                    block
-                        .txdata
-                        .par_iter()
-                        .enumerate()
-                        .flat_map(|(index, tx)| {
-                            tx.output
-                                .par_iter()
-                                .enumerate()
-                                .map(move |(vout, txout)| (index, vout, txout))
-                        })
+                (&TxOut, Txindexvout, Addresstype, color_eyre::Result<Addressbytes>, Option<Slice>)>> {
+                    outputs.into_par_iter().enumerate()
                         .map(
-                            |(index, vout, txout)| {
-                                if vout > U16MAX {
-                                    return Err(eyre!("vout bigger than u16::MAX"));
-                                }
-
-                                let vout = vout as u16;
-                                let txindex = txindex + index;
-                                let txoutindex = Txoutindex::from((txindex, vout));
+                            |(block_txoutindex, (block_txindex, vout, txout))| {
+                                let txindex_local = txindex + block_txindex;
+                                let txindexvout = Txindexvout::from((txindex_local, vout));
+                                let txoutindex_local = txoutindex + Txoutindex::from(block_txoutindex);
 
                                 let script = &txout.script_pubkey;
 
@@ -249,9 +265,10 @@ fn main() -> color_eyre::Result<()> {
                                 });
 
                                 let addressindex_slice_opt = addressbytes_res.as_ref().ok().and_then(|addressbytes| {
+                                    let prefix = AddressbytesPrefix::from(addressbytes);
                                     wtx.get(
                                         parts.addressbytes_prefix_to_addressindex.data(),
-                                        Slice::from(addressbytes),
+                                        prefix.clone(),
                                     )
                                     .ok()
                                     .and_then(|s| s)
@@ -261,9 +278,10 @@ fn main() -> color_eyre::Result<()> {
 
                                 if check_collisions && is_new_address {
                                     if let Ok(addressbytes) = &addressbytes_res {
+                                        let prefix = AddressbytesPrefix::from(addressbytes);
                                         if let Some(prev) = wtx.get(
                                             parts.addressbytes_prefix_to_addressindex.data(),
-                                            Slice::from(addressbytes),
+                                            prefix.clone(),
                                         )? {
                                             dbg!(prev);
                                             return Err(eyre!("addressbytes_prefix_to_addressindex collision, expect none"));
@@ -272,8 +290,8 @@ fn main() -> color_eyre::Result<()> {
                                 }
 
                                 Ok((
-                                    txoutindex,
-                                    (txout, addresstype, addressbytes_res, addressindex_slice_opt),
+                                    txoutindex_local,
+                                    (txout, txindexvout, addresstype, addressbytes_res, addressindex_slice_opt),
                                 ))
                             },
                         )
@@ -296,166 +314,147 @@ fn main() -> color_eyre::Result<()> {
                         })
                 });
 
-                (txid_prefix_slice_to_txid_and_index_handle.join(), txin_or_addresstxoutindex_vec_handle.join(), txoutindex_to_txout_addresstype_addressbytes_res_addressindex_opt_handle.join())
+                (txid_prefix_to_txid_and_block_txindex_and_prev_txindex_handle.join(), txin_or_addressindextxoutindex_vec_handle.join(), txoutindex_to_txout_addresstype_addressbytes_res_addressindex_opt_handle.join())
             });
 
-            let txid_prefix_slice_to_txid_and_index = txid_prefix_slice_to_txid_and_index_join_handle.ok().context("Expect txid_prefix_slice_to_txid_and_index_join_handle to join")??;
+            let txid_prefix_to_txid_and_block_txindex_and_prev_txindex = txid_prefix_to_txid_and_block_txindex_and_prev_txindex_join_handle.ok().context("Expect txid_prefix_to_txid_and_block_txindex_and_prev_txindex_join_handle to join")??;
 
-            let txin_or_addresstxoutindex_vec = txin_or_addresstxoutindex_vec_handle.ok().context("Export txin_or_addresstxoutindex_vec_handle to join")??;
+            let txin_or_addressindextxoutindex_vec = txin_or_addressindextxoutindex_vec_handle.ok().context("Export txin_or_addressindextxoutindex_vec_handle to join")??;
 
             let txoutindex_to_txout_addresstype_addressbytes_res_addressindex_opt = txoutindex_to_txout_addresstype_addressbytes_res_addressindex_opt_handle.ok().context("Expect txoutindex_to_txout_addresstype_addressbytes_res_addressindex_opt_handle to join")??;
 
-            let mut new_txoutindex_to_addressindex: BTreeMap<Txoutindex, Addressindex> = BTreeMap::new();
+            let mut new_txindexvout_to_addressindextxoutindex: BTreeMap<Txindexvout, Addressindextxoutindex> = BTreeMap::new();
 
             txoutindex_to_txout_addresstype_addressbytes_res_addressindex_opt
                 .into_iter()
-                .try_for_each(|(txoutindex, (txout, addresstype, addressbytes_res, addressindex_slice_opt))| -> color_eyre::Result<()> {
+                .try_for_each(|(txoutindex, (txout, txindexvout, addresstype, addressbytes_res, addressindex_slice_opt))| -> color_eyre::Result<()> {
                     let amount = Amount::from(txout.value);
 
-                    let mut addressindex_local = addressindex;
-
-                    if amount.is_zero() {
-                        if parts.zero_txoutindexes.needs(height) {
-                            wtx.insert(
-                                parts.zero_txoutindexes.data(),
-                                Slice::from(txoutindex),
-                                Slice::default(),
-                            );
-                        }
-                    } else if parts.txoutindex_to_amount.needs(height) {
+                    if parts.txindexvout_to_txoutindex.needs(height) {
                         wtx.insert(
-                            parts.txoutindex_to_amount.data(),
+                            parts.txindexvout_to_txoutindex.data(),
+                            Slice::from(txindexvout),
                             Slice::from(txoutindex),
-                            Slice::from(amount),
                         );
                     }
 
-                    if let Some(addressindex_slice) = addressindex_slice_opt {
-                        addressindex_local = addressindex_slice.into()
-                    } else {
-                        new_txoutindex_to_addressindex.insert(txoutindex, addressindex_local);
+                    vecdisks.txoutindex_to_amount.push_if_needed(
+                        txoutindex,
+                        amount,
+                    )?;
 
-                        if parts.addressindex_to_addresstype.needs(height) {
-                            wtx.insert(
-                                parts.addressindex_to_addresstype.data(),
-                                Slice::from(addressindex_local),
-                                Slice::from(addresstype),
-                            );
-                        }
+                    let mut addressindex_local = addressindex;
+
+                    if let Some(addressindex_slice) = addressindex_slice_opt {
+                        addressindex_local = Addressindex::try_from(addressindex_slice)?;
+                    } else {
+                        vecdisks.addressindex_to_addresstype.push_if_needed(addressindex_local, addresstype)?;
+
+                        // TODO: Create counter of other addresstypes instead
+                        let addresstypeindex = Addresstypeindex::from(vecdisks.addresstype_to_addressvecdisk(addresstype).map_or(0, |vecdisk| vecdisk.len()));
+
+                        vecdisks.addressindex_to_addresstypeindex.push_if_needed(addressindex_local, addresstypeindex)?;
 
                         if let Ok(addressbytes) = addressbytes_res {
                             if parts.addressbytes_prefix_to_addressindex.needs(height) {
                                 wtx.insert(
                                     parts.addressbytes_prefix_to_addressindex.data(),
-                                    Slice::from(addressbytes.prefix()),
+                                    AddressbytesPrefix::from(&addressbytes).clone(),
                                     Slice::from(addressindex_local),
                                 );
                             }
 
-                            if parts.addressindex_to_addressbytes.needs(height) {
-                                wtx.insert(
-                                    parts.addressindex_to_addressbytes.data(),
-                                    Slice::from(addressindex_local),
-                                    Slice::from(&addressbytes),
-                                );
-                            }
-
+                            vecdisks.push_addressbytes_if_needed(addresstypeindex, addressbytes)?;
                         }
 
                         addressindex.increment();
                     }
 
-                    if parts.txoutindex_to_addressindex.needs(height) {
-                        wtx.insert(
-                            parts.txoutindex_to_addressindex.data(),
-                            Slice::from(txoutindex),
-                            Slice::from(addressindex_local),
-                        );
-                    }
+                    new_txindexvout_to_addressindextxoutindex.insert(txindexvout, Addressindextxoutindex::from((addressindex_local, txoutindex)));
 
+                    vecdisks.txoutindex_to_addressindex.push_if_needed(
+                        txoutindex,
+                        addressindex_local,
+                    )?;
 
-                    if parts.addresstxoutindexes_in.needs(height) {
-                        let addresstxoutindex = Addresstxoutindex::from((addressindex_local, txoutindex));
+                    if parts.addressindextxoutindex_in.needs(height) {
+                        let addressindextxoutindex = Addressindextxoutindex::from((addressindex_local, txoutindex));
                         wtx.insert(
-                            parts.addresstxoutindexes_in.data(),
-                            Slice::from(addresstxoutindex),
-                            Slice::default(),
+                            parts.addressindextxoutindex_in.data(),
+                            Slice::from(addressindextxoutindex),
+                            Slice::from(&[]),
                         );
                     }
 
                     Ok(())
                 })?;
 
-            if parts.addresstxoutindexes_out.needs(height) {
-                txin_or_addresstxoutindex_vec
+            if parts.addressindextxoutindex_out.needs(height) {
+                txin_or_addressindextxoutindex_vec
                 .into_iter()
-                .map(|txin_or_addresstxoutindex| -> color_eyre::Result<Addresstxoutindex> {
-                    match txin_or_addresstxoutindex {
-                        TxInOrAddresstxoutindex::Addresstxoutindex(addresstxoutindex) => Ok(addresstxoutindex),
-                        TxInOrAddresstxoutindex::TxIn(txin) => {
+                .map(|txin_or_addressindextxoutindex| -> color_eyre::Result<Addressindextxoutindex> {
+                    match txin_or_addressindextxoutindex {
+                        TxInOrAddressindextoutindex::Addressindextoutindex(addressindextxoutindex) => Ok(addressindextxoutindex),
+                        TxInOrAddressindextoutindex::TxIn(txin) => {
                             let outpoint = txin.previous_output;
                             let txid = outpoint.txid;
-                            let vout = outpoint.vout as u16;
-                            let index = txid_prefix_slice_to_txid_and_index
-                                .get(txid.prefix())
+                            let vout = outpoint.vout;
+                            let index = txid_prefix_to_txid_and_block_txindex_and_prev_txindex
+                                .get(&TxidPrefix::from(&txid))
                                 .context("txid should be in same block")?.1;
-                            let txindex = txindex + index;
-                            let txoutindex = Txoutindex::from((txindex, vout));
-                            let addressindex = new_txoutindex_to_addressindex
-                                .remove(&txoutindex)
-                                .context("should have found addressindex from same block").inspect_err(|_| {
-                                    dbg!(txin, txoutindex);
-                                })?;
+                            let txindex_local = txindex + index;
 
-                            Ok(Addresstxoutindex::from((addressindex, txoutindex)))
+                            let txindexvout = Txindexvout::from((txindex_local, vout));
+
+                            new_txindexvout_to_addressindextxoutindex
+                                .remove(&txindexvout)
+                                .context("should have found addressindex from same block").inspect_err(|_| {
+                                    dbg!(&new_txindexvout_to_addressindextxoutindex, txin, txindexvout, txid);
+                                })
                         }
                     }
                 })
-                .try_for_each(|addresstxoutindex| -> color_eyre::Result<()> {
+                .try_for_each(|addressindextxoutindex| -> color_eyre::Result<()> {
                     wtx.insert(
-                        parts.addresstxoutindexes_out.data(),
-                        Slice::from(addresstxoutindex?),
-                        Slice::default(),
+                        parts.addressindextxoutindex_out.data(),
+                        Slice::from(addressindextxoutindex?),
+                        Slice::from(&[]),
                     );
                     Ok(())
                 })?;
             }
 
-            txid_prefix_slice_to_txid_and_index.into_iter().try_for_each(
-                |(txid_prefix, (txid, index, prev_txindex_slice_opt))| -> color_eyre::Result<()> {
-                    let txindex = txindex + index;
+            drop(new_txindexvout_to_addressindextxoutindex);
 
-                    if index == 0 && parts.height_to_first_txindex.needs(height) {
-                        wtx.insert(
-                            parts.height_to_first_txindex.data(),
-                            Slice::from(height),
-                            Slice::from(txindex),
-                        );
-                    }
-                    if index == last_txi && parts.height_to_last_txindex.needs(height) {
-                        wtx.insert(
-                            parts.height_to_last_txindex.data(),
-                            Slice::from(height),
-                            Slice::from(txindex),
-                        );
-                    }
+            let mut txindex_to_txid: BTreeMap<Txindex, Txid> = BTreeMap::default();
 
-                    if parts.txindex_to_txid.needs(height) {
-                        wtx.insert(parts.txindex_to_txid.data(), Slice::from(txindex), &txid[..]);
-                    }
+            txid_prefix_to_txid_and_block_txindex_and_prev_txindex.into_iter().try_for_each(
+                |(txid_prefix, (txid, index, prev_txindex_opt))| -> color_eyre::Result<()> {
+                    let txindex_local = txindex + index;
 
-                    match prev_txindex_slice_opt {
+                    txindex_to_txid.insert(txindex_local, txid);
+
+                    match prev_txindex_opt {
                         None => {
                             if parts.txid_prefix_to_txindex.needs(height) {
-                                wtx.insert(parts.txid_prefix_to_txindex.data(), txid_prefix, Slice::from(txindex));
+                                wtx.insert(parts.txid_prefix_to_txindex.data(), txid_prefix.clone(), Slice::from(txindex_local));
                             }
                         }
-                        Some(prev_txindex_slice) => {
+                        Some(prev_txindex_res) => {
+                            let prev_txindex = prev_txindex_res?;
+
+                            // In case if we start at an already parsed height
+                            if txindex_local == prev_txindex {
+                                return Ok(())
+                            }
+
+                            let len = vecdisks.txindex_to_txid.len();
                             // Ok if `get` is not par as should happen only twice
-                            let prev_txid = Txid::from_slice(
-                                &wtx.get(parts.txindex_to_txid.data(), &prev_txindex_slice)?
-                                    .expect("To have txid for txindex"),
-                            )?;
+                            let prev_txid =
+                                vecdisks.txindex_to_txid.get(prev_txindex)?
+                                    .context("To have txid for txindex").inspect_err(|_| {
+                                        dbg!(txindex_local, txid, len);
+                                    })?;
 
                             // If another Txid needs to be added to the list
                             // We need to check that it's also a coinbase tx otherwise par_iter inputs needs to be updated
@@ -464,59 +463,66 @@ fn main() -> color_eyre::Result<()> {
                                 Txid::from_str("e3bf3d07d4b0375638d5f1db5255fe07ba2c4cb067cd81b84ee974b6585fb468")?,
                             ];
 
-                            let is_dup = only_known_dup_txids.contains(&prev_txid);
+                            let is_dup = only_known_dup_txids.contains(prev_txid);
 
                             if !is_dup {
-                                let prev_height = Height::from(
-                                    wtx.get(parts.txindex_to_height.data(), &prev_txindex_slice)?
-                                        .expect("To have height"),
-                                );
-                                let prev_txindex = Txindex::from(prev_txindex_slice);
-                                dbg!(height, txid, txindex, prev_height, prev_txid, prev_txindex,);
+                                let prev_height = vecdisks.txindex_to_height.get(prev_txindex)?.expect("To have height");
+                                dbg!(height, txid, txindex_local, prev_height, prev_txid, prev_txindex);
                                 return Err(eyre!("Expect none"));
                             }
                         }
                     }
 
-                    if parts.txindex_to_height.needs(height) {
-                        wtx.insert(
-                            parts.txindex_to_height.data(),
-                            Slice::from(txindex),
-                            Slice::from(height),
-                        );
-                    }
-
                     Ok(())
                 },
             )?;
 
-            if parts.height_to_last_addressindex.needs(height) {
-                wtx.insert(
-                    parts.height_to_last_addressindex.data(),
-                    Slice::from(height),
-                    Slice::from(addressindex.decremented()),
-                );
-            }
+            txindex_to_txid.into_iter().try_for_each(|(txindex, txid)| -> color_eyre::Result<()> {
+                vecdisks.txindex_to_txid.push_if_needed(txindex, txid)?;
+                vecdisks.txindex_to_height.push_if_needed(txindex, height)?;
+                Ok(())
+            })?;
+
+            vecdisks.height_to_last_txindex.push_if_needed(height, txindex.decremented())?;
+            vecdisks.height_to_last_txoutindex.push_if_needed(height, txoutindex.decremented())?;
+            vecdisks.height_to_last_addressindex.push_if_needed(height, addressindex.decremented())?;
 
             let should_snapshot = _height % 100 == 0 && !exit.active();
             if should_snapshot {
-                export(&keyspace, wtx, &parts, height)?;
+                export(&keyspace, wtx, &parts, &mut vecdisks, height)?;
                 wtx_opt.replace(keyspace.write_tx());
             } else {
                 wtx_opt.replace(wtx);
             }
 
-            txindex += txlen;
+            txindex += Txindex::from(tx_len);
+            txoutindex += Txoutindex::from(outputs_len);
 
             Ok(())
         })?;
 
     dbg!(i.elapsed());
 
+    pause();
+
     let wtx = wtx_opt.take().context("option should have wtx")?;
-    export(&keyspace, wtx, &parts, height)?;
+    export(&keyspace, wtx, &parts, &mut vecdisks, height)?;
+
+    pause();
 
     dbg!(i.elapsed());
 
     Ok(())
 }
+
+fn pause() {
+    let mut stdin = std::io::stdin();
+    let mut stdout = std::io::stdout();
+
+    // We want the cursor to stay at the end of the line, so we print without a newline and flush manually.
+    write!(stdout, "Press any key to continue...").unwrap();
+    stdout.flush().unwrap();
+
+    // Read a single byte and discard
+    let _ = stdin.read(&mut [0u8]).unwrap();
+}
diff --git a/src/crates/bitbase/src/structs/addressbytes.rs b/src/crates/bitbase/src/structs/addressbytes.rs
index d23e39beb..a7a3b773d 100644
--- a/src/crates/bitbase/src/structs/addressbytes.rs
+++ b/src/crates/bitbase/src/structs/addressbytes.rs
@@ -1,12 +1,19 @@
 use biter::bitcoin::ScriptBuf;
 use color_eyre::eyre::eyre;
 use derive_deref::{Deref, DerefMut};
-use fjall::Slice;
 
 use super::Addresstype;
 
-#[derive(Debug, Deref, DerefMut, PartialEq, Eq, PartialOrd, Ord)]
-pub struct Addressbytes(Slice);
+#[derive(Debug)]
+pub enum Addressbytes {
+    P2PK65(P2PK65AddressBytes),
+    P2PK33(P2PK33AddressBytes),
+    P2PKH(P2PKHAddressBytes),
+    P2SH(P2SHAddressBytes),
+    P2WPKH(P2WPKHAddressBytes),
+    P2WSH(P2WSHAddressBytes),
+    P2TR(P2TRAddressBytes),
+}
 
 impl TryFrom<(&ScriptBuf, Addresstype)> for Addressbytes {
     type Error = color_eyre::Report;
@@ -14,37 +21,47 @@ impl TryFrom<(&ScriptBuf, Addresstype)> for Addressbytes {
         let (script, addresstype) = tuple;
 
         match addresstype {
-            Addresstype::P2PK => {
+            Addresstype::P2PK65 => {
                 let bytes = script.as_bytes();
                 let bytes = match bytes.len() {
                     67 => &bytes[1..66],
+                    _ => {
+                        dbg!(bytes);
+                        return Err(eyre!("Wrong len"));
+                    }
+                };
+                Ok(Self::P2PK65(P2PK65AddressBytes(U8x65::from(bytes))))
+            }
+            Addresstype::P2PK33 => {
+                let bytes = script.as_bytes();
+                let bytes = match bytes.len() {
                     35 => &bytes[1..34],
                     _ => {
                         dbg!(bytes);
                         return Err(eyre!("Wrong len"));
                     }
                 };
-                Ok(Self(bytes.into()))
+                Ok(Self::P2PK33(P2PK33AddressBytes(U8x33::from(bytes))))
             }
             Addresstype::P2PKH => {
                 let bytes = &script.as_bytes()[3..23];
-                Ok(Self(bytes.into()))
+                Ok(Self::P2PKH(P2PKHAddressBytes(U8x20::from(bytes))))
             }
             Addresstype::P2SH => {
                 let bytes = &script.as_bytes()[2..22];
-                Ok(Self(bytes.into()))
+                Ok(Self::P2SH(P2SHAddressBytes(U8x20::from(bytes))))
             }
             Addresstype::P2WPKH => {
                 let bytes = &script.as_bytes()[2..];
-                Ok(Self(bytes.into()))
+                Ok(Self::P2WPKH(P2WPKHAddressBytes(U8x20::from(bytes))))
             }
             Addresstype::P2WSH => {
                 let bytes = &script.as_bytes()[2..];
-                Ok(Self(bytes.into()))
+                Ok(Self::P2WSH(P2WSHAddressBytes(U8x32::from(bytes))))
             }
             Addresstype::P2TR => {
                 let bytes = &script.as_bytes()[2..];
-                Ok(Self(bytes.into()))
+                Ok(Self::P2TR(P2TRAddressBytes(U8x32::from(bytes))))
             }
             Addresstype::Multisig => Err(eyre!("multisig address type")),
             Addresstype::PushOnly => Err(eyre!("push_only address type")),
@@ -55,13 +72,73 @@ impl TryFrom<(&ScriptBuf, Addresstype)> for Addressbytes {
     }
 }
 
-impl From<Slice> for Addressbytes {
-    fn from(value: Slice) -> Self {
-        Self(value)
+#[derive(Debug, Clone, Deref)]
+pub struct P2PK65AddressBytes(U8x65);
+
+#[derive(Debug, Clone, Deref)]
+pub struct P2PK33AddressBytes(U8x33);
+
+#[derive(Debug, Clone, Deref)]
+pub struct P2PKHAddressBytes(U8x20);
+
+#[derive(Debug, Clone, Deref)]
+pub struct P2SHAddressBytes(U8x20);
+
+#[derive(Debug, Clone, Deref)]
+pub struct P2WPKHAddressBytes(U8x20);
+
+#[derive(Debug, Clone, Deref)]
+pub struct P2WSHAddressBytes(U8x32);
+
+#[derive(Debug, Clone, Deref)]
+pub struct P2TRAddressBytes(U8x32);
+
+#[derive(Debug, Clone, Deref, DerefMut)]
+pub struct U8x20([u8; 20]);
+impl From<&[u8]> for U8x20 {
+    fn from(slice: &[u8]) -> Self {
+        let mut arr = [0; 20];
+        arr.copy_from_slice(slice);
+        Self(arr)
     }
 }
-impl From<&Addressbytes> for Slice {
-    fn from(value: &Addressbytes) -> Self {
-        value.0.clone()
+
+#[derive(Debug, Clone, Deref, DerefMut)]
+pub struct U8x32([u8; 32]);
+impl From<&[u8]> for U8x32 {
+    fn from(slice: &[u8]) -> Self {
+        let mut arr = [0; 32];
+        arr.copy_from_slice(slice);
+        Self(arr)
+    }
+}
+
+#[derive(Debug, Clone, Deref, DerefMut)]
+pub struct U8x33([u8; 33]);
+impl From<&[u8]> for U8x33 {
+    fn from(slice: &[u8]) -> Self {
+        let mut arr = [0; 33];
+        arr.copy_from_slice(slice);
+        Self(arr)
+    }
+}
+
+#[derive(Debug, Clone, Deref, DerefMut)]
+pub struct U8x64([u8; 64]);
+impl From<&[u8]> for U8x64 {
+    fn from(slice: &[u8]) -> Self {
+        let mut arr = [0; 64];
+        arr.copy_from_slice(slice);
+        Self(arr)
+    }
+}
+
+#[derive(Debug, Clone, Deref, DerefMut)]
+pub struct U8x65([u8; 65]);
+impl From<&[u8]> for U8x65 {
+    fn from(slice: &[u8]) -> Self {
+        let mut arr = [0; 65];
+        arr.copy_from_slice(slice);
+        Self(arr)
     }
 }
diff --git a/src/crates/bitbase/src/structs/addressindex.rs b/src/crates/bitbase/src/structs/addressindex.rs
index 87fca33b2..a5d2c9774 100644
--- a/src/crates/bitbase/src/structs/addressindex.rs
+++ b/src/crates/bitbase/src/structs/addressindex.rs
@@ -39,9 +39,27 @@ impl From<Addressindex> for u64 {
     }
 }
 
-impl From<Slice> for Addressindex {
-    fn from(slice: Slice) -> Self {
-        Self(slice.read_u32())
+impl From<usize> for Addressindex {
+    fn from(value: usize) -> Self {
+        Self(value as u32)
+    }
+}
+impl From<Addressindex> for usize {
+    fn from(value: Addressindex) -> Self {
+        value.0 as usize
+    }
+}
+
+impl TryFrom<Slice> for Addressindex {
+    type Error = color_eyre::Report;
+    fn try_from(value: Slice) -> Result<Self, Self::Error> {
+        Self::try_from(&value[..])
+    }
+}
+impl TryFrom<&[u8]> for Addressindex {
+    type Error = color_eyre::Report;
+    fn try_from(value: &[u8]) -> Result<Self, Self::Error> {
+        Ok(Self::from(value.read_be_u32()?))
     }
 }
 impl From<Addressindex> for Slice {
diff --git a/src/crates/bitbase/src/structs/addressindextxoutindex.rs b/src/crates/bitbase/src/structs/addressindextxoutindex.rs
new file mode 100644
index 000000000..cc89164b1
--- /dev/null
+++ b/src/crates/bitbase/src/structs/addressindextxoutindex.rs
@@ -0,0 +1,38 @@
+use fjall::Slice;
+
+use super::{Addressindex, Txoutindex};
+
+#[derive(Debug)]
+pub struct Addressindextxoutindex {
+    addressindex: Addressindex,
+    txoutindex: Txoutindex,
+}
+
+impl From<(Addressindex, Txoutindex)> for Addressindextxoutindex {
+    fn from(value: (Addressindex, Txoutindex)) -> Self {
+        Self {
+            addressindex: value.0,
+            txoutindex: value.1,
+        }
+    }
+}
+
+impl From<Addressindextxoutindex> for Slice {
+    fn from(value: Addressindextxoutindex) -> Self {
+        let addressindex_slice = Self::from(value.addressindex);
+        let txindexvout_slice = Self::from(value.txoutindex);
+        Self::from([addressindex_slice, txindexvout_slice].concat())
+    }
+}
+impl TryFrom<Slice> for Addressindextxoutindex {
+    type Error = color_eyre::Report;
+    fn try_from(value: Slice) -> Result<Self, Self::Error> {
+        let addressindex = Addressindex::try_from(&value[..Addressindex::BYTES])?;
+        let txindexvout = Txoutindex::try_from(&value[Addressindex::BYTES..])?;
+
+        Ok(Self {
+            addressindex,
+            txoutindex: txindexvout,
+        })
+    }
+}
diff --git a/src/crates/bitbase/src/structs/addresstxoutindex.rs b/src/crates/bitbase/src/structs/addresstxoutindex.rs
deleted file mode 100644
index 02a5d0d82..000000000
--- a/src/crates/bitbase/src/structs/addresstxoutindex.rs
+++ /dev/null
@@ -1,35 +0,0 @@
-use fjall::Slice;
-
-use super::{Addressindex, Txoutindex};
-
-pub struct Addresstxoutindex {
-    addressindex: Addressindex,
-    txoutindex: Txoutindex,
-}
-
-impl From<(Addressindex, Txoutindex)> for Addresstxoutindex {
-    fn from(value: (Addressindex, Txoutindex)) -> Self {
-        Self {
-            addressindex: value.0,
-            txoutindex: value.1,
-        }
-    }
-}
-
-impl From<Addresstxoutindex> for Slice {
-    fn from(value: Addresstxoutindex) -> Self {
-        let addressindex_slice = Self::from(value.addressindex);
-        let txoutindex_slice = Self::from(value.txoutindex);
-        Self::from([addressindex_slice, txoutindex_slice].concat())
-    }
-}
-impl From<Slice> for Addresstxoutindex {
-    fn from(value: Slice) -> Self {
-        let addressindex = Addressindex::from(Slice::from(&value[..Addressindex::BYTES]));
-        let txoutindex = Txoutindex::from(Slice::from(&value[Addressindex::BYTES..]));
-        Self {
-            addressindex,
-            txoutindex,
-        }
-    }
-}
diff --git a/src/crates/bitbase/src/structs/addresstype.rs b/src/crates/bitbase/src/structs/addresstype.rs
index ff13060ac..abc37a296 100644
--- a/src/crates/bitbase/src/structs/addresstype.rs
+++ b/src/crates/bitbase/src/structs/addresstype.rs
@@ -1,12 +1,9 @@
 use biter::bitcoin::ScriptBuf;
-use color_eyre::eyre::eyre;
-use fjall::Slice;
-
-use super::SliceExtended;
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
 pub enum Addresstype {
-    P2PK,
+    P2PK65,
+    P2PK33,
     P2PKH,
     P2SH,
     P2WPKH,
@@ -22,7 +19,16 @@ pub enum Addresstype {
 impl From<&ScriptBuf> for Addresstype {
     fn from(script: &ScriptBuf) -> Self {
         if script.is_p2pk() {
-            Self::P2PK
+            let bytes = script.as_bytes();
+
+            match bytes.len() {
+                67 => Self::P2PK65,
+                35 => Self::P2PK33,
+                _ => {
+                    dbg!(bytes);
+                    unreachable!()
+                }
+            }
         } else if script.is_p2pkh() {
             Self::P2PKH
         } else if script.is_p2sh() {
@@ -46,19 +52,3 @@ impl From<&ScriptBuf> for Addresstype {
         }
     }
 }
-
-impl TryFrom<Slice> for Addresstype {
-    type Error = color_eyre::Report;
-    fn try_from(value: Slice) -> Result<Self, Self::Error> {
-        match value.read_u8() {
-            x if x == Addresstype::P2PK as u8 => Ok(Addresstype::P2PK),
-            x if x == Addresstype::P2PKH as u8 => Ok(Addresstype::P2PKH),
-            _ => Err(eyre!("Unknown type")),
-        }
-    }
-}
-impl From<Addresstype> for Slice {
-    fn from(addresstype: Addresstype) -> Self {
-        (addresstype as u8).to_be_bytes().into()
-    }
-}
diff --git a/src/crates/bitbase/src/structs/addresstypeindex.rs b/src/crates/bitbase/src/structs/addresstypeindex.rs
new file mode 100644
index 000000000..15c2f4ba3
--- /dev/null
+++ b/src/crates/bitbase/src/structs/addresstypeindex.rs
@@ -0,0 +1,81 @@
+use derive_deref::{Deref, DerefMut};
+use fjall::Slice;
+
+use super::SliceExtended;
+
+#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Deref, DerefMut, Default)]
+pub struct Addresstypeindex(u32);
+
+impl Addresstypeindex {
+    pub fn decremented(self) -> Self {
+        Self(*self - 1)
+    }
+
+    pub fn increment(&mut self) {
+        self.0 += 1;
+    }
+
+    pub fn incremented(self) -> Self {
+        Self(*self + 1)
+    }
+}
+
+impl From<u32> for Addresstypeindex {
+    fn from(value: u32) -> Self {
+        Self(value)
+    }
+}
+
+impl From<u64> for Addresstypeindex {
+    fn from(value: u64) -> Self {
+        Self(value as u32)
+    }
+}
+impl From<Addresstypeindex> for u64 {
+    fn from(value: Addresstypeindex) -> Self {
+        value.0 as u64
+    }
+}
+
+impl From<usize> for Addresstypeindex {
+    fn from(value: usize) -> Self {
+        Self(value as u32)
+    }
+}
+impl From<Addresstypeindex> for usize {
+    fn from(value: Addresstypeindex) -> Self {
+        value.0 as usize
+    }
+}
+
+impl TryFrom<Slice> for Addresstypeindex {
+    type Error = color_eyre::Report;
+    fn try_from(value: Slice) -> Result<Self, Self::Error> {
+        Self::try_from(&value[..])
+    }
+}
+impl TryFrom<&[u8]> for Addresstypeindex {
+    type Error = color_eyre::Report;
+    fn try_from(value: &[u8]) -> Result<Self, Self::Error> {
+        Ok(Self::from(value.read_be_u32()?))
+    }
+}
+impl From<Addresstypeindex> for Slice {
+    fn from(value: Addresstypeindex) -> Self {
+        value.to_be_bytes().into()
+    }
+}
+
+// impl Bytes for Addresstypeindex {
+//     const SIZE: usize = size_of::<Self>();
+
+//     type ByteArray = [u8; Self::SIZE];
+
+//     // fn try_from_bytes(bytes: &[u8]) -> color_eyre::Result<Self> {
+//     //     Ok(Self(Self::read_u32(bytes)))
+//     // }
+
+//     fn to_bytes(&self) -> Self::ByteArray {
+//         self.to_ne_bytes()
+//     }
+// }
diff --git a/src/crates/bitbase/src/structs/height.rs b/src/crates/bitbase/src/structs/height.rs
index cd5aa23fb..3f8f0f346 100644
--- a/src/crates/bitbase/src/structs/height.rs
+++ b/src/crates/bitbase/src/structs/height.rs
@@ -12,41 +12,6 @@ use super::SliceExtended;
 #[derive(Debug, Clone, Copy, Deref, DerefMut, PartialEq, Eq, PartialOrd, Ord, Default)]
 pub struct Height(u32);
 
-impl From<Slice> for Height {
-    fn from(slice: Slice) -> Self {
-        Self(slice.read_u32())
-    }
-}
-impl From<Height> for Slice {
-    fn from(value: Height) -> Self {
-        value.to_be_bytes().into()
-    }
-}
-
-impl From<u32> for Height {
-    fn from(value: u32) -> Self {
-        Self(value)
-    }
-}
-
-impl From<usize> for Height {
-    fn from(value: usize) -> Self {
-        Self(value as u32)
-    }
-}
-impl From<Height> for usize {
-    fn from(value: Height) -> Self {
-        value.0 as usize
-    }
-}
-
-impl TryFrom<&bitcoincore_rpc::Client> for Height {
-    type Error = bitcoincore_rpc::Error;
-    fn try_from(value: &bitcoincore_rpc::Client) -> Result<Self, Self::Error> {
-        Ok((value.get_blockchain_info()?.blocks as usize - 1).into())
-    }
-}
-
 impl PartialEq<u64> for Height {
     fn eq(&self, other: &u64) -> bool {
         **self == *other as u32
@@ -109,3 +74,53 @@ impl fmt::Display for Height {
         write!(f, "{}", **self)
     }
 }
+
+impl TryFrom<Slice> for Height {
+    type Error = color_eyre::Report;
+    fn try_from(value: Slice) -> Result<Self, Self::Error> {
+        Ok(Self::from((&value[..]).read_be_u32()?))
+    }
+}
+impl From<Height> for Slice {
+    fn from(value: Height) -> Self {
+        value.to_be_bytes().into()
+    }
+}
+
+impl From<u32> for Height {
+    fn from(value: u32) -> Self {
+        Self(value)
+    }
+}
+
+impl From<usize> for Height {
+    fn from(value: usize) -> Self {
+        Self(value as u32)
+    }
+}
+impl From<Height> for usize {
+    fn from(value: Height) -> Self {
+        value.0 as usize
+    }
+}
+
+impl TryFrom<&bitcoincore_rpc::Client> for Height {
+    type Error = bitcoincore_rpc::Error;
+    fn try_from(value: &bitcoincore_rpc::Client) -> Result<Self, Self::Error> {
+        Ok((value.get_blockchain_info()?.blocks as usize - 1).into())
+    }
+}
+
+// impl Bytes for Height {
+//     const SIZE: usize = size_of::<Self>();
+
+//     type ByteArray = [u8; Self::SIZE];
+
+//     // fn try_from_bytes(bytes: &[u8]) -> color_eyre::Result<Self> {
+//     //     Ok(Self(Self::read_u32(bytes)))
+//     // }
+
+//     fn to_bytes(&self) -> Self::ByteArray {
+//         self.to_ne_bytes()
+//     }
+// }
diff --git a/src/crates/bitbase/src/structs/mod.rs b/src/crates/bitbase/src/structs/mod.rs
index 6b557004e..123921c06 100644
--- a/src/crates/bitbase/src/structs/mod.rs
+++ b/src/crates/bitbase/src/structs/mod.rs
@@ -1,7 +1,8 @@
 mod addressbytes;
 mod addressindex;
-mod addresstxoutindex;
+mod addressindextxoutindex;
 mod addresstype;
+mod addresstypeindex;
 mod amount;
 mod exit;
 mod height;
@@ -10,13 +11,17 @@ mod partitions;
 mod prefix;
 mod slice;
 mod txindex;
+mod txindexvout;
 mod txoutindex;
+mod vecdisk;
+mod vecdisks;
 mod version;
 
 pub use addressbytes::*;
 pub use addressindex::*;
-pub use addresstxoutindex::*;
+pub use addressindextxoutindex::*;
 pub use addresstype::*;
+pub use addresstypeindex::*;
 pub use amount::*;
 pub use exit::*;
 pub use height::*;
@@ -25,5 +30,8 @@ pub use partitions::*;
 pub use prefix::*;
 pub use slice::*;
 pub use txindex::*;
+pub use txindexvout::*;
 pub use txoutindex::*;
+pub use vecdisk::*;
+pub use vecdisks::*;
 pub use version::*;
diff --git a/src/crates/bitbase/src/structs/partition.rs b/src/crates/bitbase/src/structs/partition.rs
index 4f184442f..23791188d 100644
--- a/src/crates/bitbase/src/structs/partition.rs
+++ b/src/crates/bitbase/src/structs/partition.rs
@@ -15,38 +15,52 @@ impl Partition {
     pub const VERSION: &str = "version";
     pub const HEIGHT: &str = "height";
 
-    pub fn import(keyspace: &TransactionalKeyspace, name: &str, version: Version, exit: &Exit) -> Result<Self> {
+    pub fn import(
+        keyspace: &TransactionalKeyspace,
+        name: &str,
+        version: Version,
+        exit: &Exit,
+    ) -> color_eyre::Result<Self> {
         let data = Self::open_data(keyspace, name)?;
         let meta = Self::open_meta(keyspace, name)?;
 
+        let mut height = None;
+        if let Some(height_res) = meta.get(Self::HEIGHT)?.map(Height::try_from) {
+            height = Some(height_res?);
+        }
+
         let mut this = Self {
             version,
-            height: meta.get(Self::HEIGHT)?.map(Height::from),
+            height,
             data,
             meta,
         };
 
+        let mut different_version = false;
         if let Some(slice) = this.meta.get(Self::VERSION)? {
-            if version != Version::from(slice) {
-                this = this.reset(keyspace, name, exit)?;
-            }
+            different_version = Version::try_from(slice).map_or(true, |version2| version != version2);
+        }
+
+        if different_version {
+            this = this.reset(keyspace, name, exit)?;
         }
 
         Ok(this)
     }
 
     fn open_data(keyspace: &TransactionalKeyspace, name: &str) -> Result<TransactionalPartitionHandle> {
-        keyspace.open_partition(&format!("{name}-data"), Self::create_options())
+        keyspace.open_partition(&format!("{name}_data"), Self::create_options())
     }
 
     fn open_meta(keyspace: &TransactionalKeyspace, name: &str) -> Result<TransactionalPartitionHandle> {
-        keyspace.open_partition(&format!("{name}-meta"), Self::create_options())
+        keyspace.open_partition(&format!("{name}_meta"), Self::create_options())
     }
 
     fn create_options() -> PartitionCreateOptions {
         PartitionCreateOptions::default().manual_journal_persist(true)
     }
 
+    // TODO: Still needed ?
     pub fn is_safe(&self, height: Height) -> bool {
         self.height.is_some_and(|self_height| self_height >= height)
     }
diff --git a/src/crates/bitbase/src/structs/partitions.rs b/src/crates/bitbase/src/structs/partitions.rs
index 1b08c8c1e..2563d468f 100644
--- a/src/crates/bitbase/src/structs/partitions.rs
+++ b/src/crates/bitbase/src/structs/partitions.rs
@@ -6,22 +6,11 @@ use crate::structs::{Exit, Height, Partition, Version};
 
 pub struct Partitions {
     pub addressbytes_prefix_to_addressindex: Partition,
-    pub addressindex_to_addressbytes: Partition,
-    pub addressindex_to_addresstype: Partition,
-    pub addresstxoutindexes_in: Partition,
-    pub addresstxoutindexes_out: Partition,
+    pub addressindextxoutindex_in: Partition,
+    pub addressindextxoutindex_out: Partition,
     pub blockhash_prefix_to_height: Partition,
-    pub height_to_blockhash: Partition,
-    pub height_to_first_addressindex: Partition,
-    pub height_to_first_txindex: Partition,
-    pub height_to_last_addressindex: Partition,
-    pub height_to_last_txindex: Partition,
     pub txid_prefix_to_txindex: Partition,
-    pub txindex_to_height: Partition,
-    pub txindex_to_txid: Partition,
-    pub txoutindex_to_addressindex: Partition,
-    pub txoutindex_to_amount: Partition,
-    pub zero_txoutindexes: Partition,
+    pub txindexvout_to_txoutindex: Partition,
 }
 
 const UNSAFE_BLOCKS: usize = 100;
@@ -35,52 +24,21 @@ impl Partitions {
                 Version::from(1),
                 exit,
             )?,
-            addressindex_to_addressbytes: Partition::import(
-                keyspace,
-                "addressindex_to_addressbytes",
-                Version::from(1),
-                exit,
-            )?,
-            addressindex_to_addresstype: Partition::import(
-                keyspace,
-                "addressindex_to_addresstype",
-                Version::from(1),
-                exit,
-            )?,
-            addresstxoutindexes_in: Partition::import(keyspace, "addresstxoutindexes_in", Version::from(1), exit)?,
-            addresstxoutindexes_out: Partition::import(keyspace, "addresstxoutindexes_out", Version::from(1), exit)?,
+            addressindextxoutindex_in: Partition::import(keyspace, "addresstxoutindexes_in", Version::from(1), exit)?,
+            addressindextxoutindex_out: Partition::import(keyspace, "addresstxoutindexes_out", Version::from(1), exit)?,
             blockhash_prefix_to_height: Partition::import(
                 keyspace,
                 "blockhash_prefix_to_height",
                 Version::from(1),
                 exit,
             )?,
-            height_to_blockhash: Partition::import(keyspace, "height_to_blockhash", Version::from(1), exit)?,
-            height_to_first_addressindex: Partition::import(
-                keyspace,
-                "height_to_first_addressindex",
-                Version::from(1),
-                exit,
-            )?,
-            height_to_first_txindex: Partition::import(keyspace, "height_to_first_txindex", Version::from(1), exit)?,
-            height_to_last_addressindex: Partition::import(
-                keyspace,
-                "height_to_last_addressindex",
-                Version::from(1),
-                exit,
-            )?,
-            height_to_last_txindex: Partition::import(keyspace, "height_to_last_txindex", Version::from(1), exit)?,
             txid_prefix_to_txindex: Partition::import(keyspace, "txid_prefix_to_txindex", Version::from(1), exit)?,
-            txindex_to_height: Partition::import(keyspace, "txindex_to_height", Version::from(1), exit)?,
-            txindex_to_txid: Partition::import(keyspace, "txindex_to_txid", Version::from(1), exit)?,
-            txoutindex_to_addressindex: Partition::import(
+            txindexvout_to_txoutindex: Partition::import(
                 keyspace,
-                "txoutindex_to_addressindex",
+                "txindexvout_to_txoutindex",
                 Version::from(1),
                 exit,
             )?,
-            txoutindex_to_amount: Partition::import(keyspace, "txoutindex_to_amount", Version::from(1), exit)?,
-            zero_txoutindexes: Partition::import(keyspace, "zero_txoutindexes", Version::from(1), exit)?,
         })
     }
 
@@ -221,6 +179,7 @@ impl Partitions {
         // todo!("clear addresstxoutindexes_out")
         // todo!("clear addresstxoutindexes_in")
         // todo!("clear zero_txoutindexes")
+        // todo!("clear txindexvout_to_txoutindex")
 
         // Ok(())
     }
@@ -228,22 +187,11 @@ impl Partitions {
     fn to_vec(&self) -> Vec<&Partition> {
         vec![
             &self.addressbytes_prefix_to_addressindex,
-            &self.addressindex_to_addressbytes,
-            &self.addressindex_to_addresstype,
-            &self.addresstxoutindexes_in,
-            &self.addresstxoutindexes_out,
+            &self.addressindextxoutindex_in,
+            &self.addressindextxoutindex_out,
             &self.blockhash_prefix_to_height,
-            &self.height_to_blockhash,
-            &self.height_to_first_addressindex,
-            &self.height_to_first_txindex,
-            &self.height_to_last_addressindex,
-            &self.height_to_last_txindex,
             &self.txid_prefix_to_txindex,
-            &self.txindex_to_height,
-            &self.txindex_to_txid,
-            &self.txoutindex_to_addressindex,
-            &self.txoutindex_to_amount,
-            &self.zero_txoutindexes,
+            &self.txindexvout_to_txoutindex,
         ]
     }
 }
diff --git a/src/crates/bitbase/src/structs/prefix.rs b/src/crates/bitbase/src/structs/prefix.rs
index 951979107..661a3971c 100644
--- a/src/crates/bitbase/src/structs/prefix.rs
+++ b/src/crates/bitbase/src/structs/prefix.rs
@@ -1,25 +1,55 @@
 use biter::bitcoin::{BlockHash, Txid};
+use derive_deref::Deref;
+use fjall::Slice;
 
 use super::Addressbytes;
 
-pub trait Prefix {
-    fn prefix(&self) -> &[u8];
+#[derive(Debug, Deref, PartialEq, Eq, PartialOrd, Ord)]
+pub struct Prefix(Slice);
+impl From<&[u8]> for Prefix {
+    fn from(value: &[u8]) -> Self {
+        Self(Slice::from(&value[..8]))
+    }
 }
+// pub struct Prefix([u8; 8]);
+// impl From<&[u8]> for Prefix {
+//     fn from(value: &[u8]) -> Self {
+//         let mut buf: [u8; 8] = [0; 8];
+//         value.iter().take(8).enumerate().for_each(|(i, v)| {
+//             buf[i] = *v;
+//         });
+//         Self(buf)
+//     }
+// }
 
-impl Prefix for Addressbytes {
-    fn prefix(&self) -> &[u8] {
-        &self[..8]
+#[derive(Debug, Deref)]
+pub struct AddressbytesPrefix(Prefix);
+impl From<&Addressbytes> for AddressbytesPrefix {
+    fn from(value: &Addressbytes) -> Self {
+        Self(Prefix::from(match value {
+            Addressbytes::P2PK65(bytes) => &bytes[..],
+            Addressbytes::P2PK33(bytes) => &bytes[..],
+            Addressbytes::P2PKH(bytes) => &bytes[..],
+            Addressbytes::P2SH(bytes) => &bytes[..],
+            Addressbytes::P2WPKH(bytes) => &bytes[..],
+            Addressbytes::P2WSH(bytes) => &bytes[..],
+            Addressbytes::P2TR(bytes) => &bytes[..],
+        }))
     }
 }
 
-impl Prefix for BlockHash {
-    fn prefix(&self) -> &[u8] {
-        &self[..8]
+#[derive(Debug, Deref)]
+pub struct BlockHashPrefix(Prefix);
+impl From<&BlockHash> for BlockHashPrefix {
+    fn from(value: &BlockHash) -> Self {
+        Self(Prefix::from(&value[..]))
     }
 }
 
-impl Prefix for Txid {
-    fn prefix(&self) -> &[u8] {
-        &self[..8]
+#[derive(Debug, Deref, PartialEq, Eq, PartialOrd, Ord)]
+pub struct TxidPrefix(Prefix);
+impl From<&Txid> for TxidPrefix {
+    fn from(value: &Txid) -> Self {
+        Self(Prefix::from(&value[..]))
     }
 }
diff --git a/src/crates/bitbase/src/structs/slice.rs b/src/crates/bitbase/src/structs/slice.rs
index 98e47c7f3..4ded832b1 100644
--- a/src/crates/bitbase/src/structs/slice.rs
+++ b/src/crates/bitbase/src/structs/slice.rs
@@ -1,49 +1,48 @@
-use std::io::Read;
-
-use fjall::Slice;
+use color_eyre::eyre::eyre;
 
 #[allow(unused)]
 pub trait SliceExtended {
-    fn default() -> Self;
-    fn read_u8(&self) -> u8;
-    fn read_u16(&self) -> u16;
-    fn read_u32(&self) -> u32;
-    fn read_u64(&self) -> u64;
-    fn read_exact(&self, buf: &mut [u8]);
+    fn read_be_u8(&self) -> color_eyre::Result<u8>;
+    fn read_be_u16(&self) -> color_eyre::Result<u16>;
+    fn read_be_u32(&self) -> color_eyre::Result<u32>;
+    fn read_be_u64(&self) -> color_eyre::Result<u64>;
+    fn read_exact(&self, buf: &mut [u8]) -> color_eyre::Result<()>;
 }
 
-impl SliceExtended for Slice {
-    fn default() -> Self {
-        Self::new(&[])
-    }
-
-    fn read_u8(&self) -> u8 {
+impl SliceExtended for &[u8] {
+    fn read_be_u8(&self) -> color_eyre::Result<u8> {
         let mut buf: [u8; 1] = [0; 1];
-        self.read_exact(&mut buf);
-        u8::from_be_bytes(buf)
+        self.read_exact(&mut buf)?;
+        Ok(u8::from_be_bytes(buf))
     }
 
-    fn read_u16(&self) -> u16 {
+    fn read_be_u16(&self) -> color_eyre::Result<u16> {
         let mut buf: [u8; 2] = [0; 2];
-        self.read_exact(&mut buf);
-        u16::from_be_bytes(buf)
+        self.read_exact(&mut buf)?;
+        Ok(u16::from_be_bytes(buf))
     }
 
-    fn read_u32(&self) -> u32 {
+    fn read_be_u32(&self) -> color_eyre::Result<u32> {
         let mut buf: [u8; 4] = [0; 4];
-        self.read_exact(&mut buf);
-        u32::from_be_bytes(buf)
+        self.read_exact(&mut buf)?;
+        Ok(u32::from_be_bytes(buf))
     }
 
-    fn read_u64(&self) -> u64 {
+    fn read_be_u64(&self) -> color_eyre::Result<u64> {
         let mut buf: [u8; 8] = [0; 8];
-        self.read_exact(&mut buf);
-        u64::from_be_bytes(buf)
+        self.read_exact(&mut buf)?;
+        Ok(u64::from_be_bytes(buf))
     }
 
-    fn read_exact(&self, buf: &mut [u8]) {
-        self.bytes().take(buf.len()).enumerate().for_each(|(i, r)| {
-            buf[i] = r.unwrap();
+    fn read_exact(&self, buf: &mut [u8]) -> color_eyre::Result<()> {
+        let buf_len = buf.len();
+        if self.len() != buf_len {
+            dbg!(self.len(), buf_len);
+            return Err(eyre!("Not exact len"));
+        }
+        self.iter().take(buf_len).enumerate().for_each(|(i, r)| {
+            buf[i] = *r;
         });
+        Ok(())
     }
 }
diff --git a/src/crates/bitbase/src/structs/txindex.rs b/src/crates/bitbase/src/structs/txindex.rs
index 556c352cd..47bcdea8f 100644
--- a/src/crates/bitbase/src/structs/txindex.rs
+++ b/src/crates/bitbase/src/structs/txindex.rs
@@ -9,11 +9,26 @@ use super::SliceExtended;
 pub struct Txindex(u32);
 
 impl Txindex {
-    pub const BYTES: usize = size_of::<Self>();
-
     pub fn incremented(self) -> Self {
         Self(*self + 1)
     }
+
+    pub fn decremented(self) -> Self {
+        Self(*self - 1)
+    }
+}
+
+impl Add<Txindex> for Txindex {
+    type Output = Self;
+    fn add(self, rhs: Txindex) -> Self::Output {
+        Self(self.0 + rhs.0)
+    }
+}
+
+impl AddAssign<Txindex> for Txindex {
+    fn add_assign(&mut self, rhs: Txindex) {
+        self.0 += rhs.0
+    }
 }
 
 impl From<u32> for Txindex {
@@ -33,9 +48,27 @@ impl From<Txindex> for u64 {
     }
 }
 
-impl From<Slice> for Txindex {
-    fn from(slice: Slice) -> Self {
-        Self(slice.read_u32())
+impl From<usize> for Txindex {
+    fn from(value: usize) -> Self {
+        Self(value as u32)
+    }
+}
+impl From<Txindex> for usize {
+    fn from(value: Txindex) -> Self {
+        value.0 as usize
+    }
+}
+
+impl TryFrom<Slice> for Txindex {
+    type Error = color_eyre::Report;
+    fn try_from(value: Slice) -> Result<Self, Self::Error> {
+        Self::try_from(&value[..])
+    }
+}
+impl TryFrom<&[u8]> for Txindex {
+    type Error = color_eyre::Report;
+    fn try_from(value: &[u8]) -> Result<Self, Self::Error> {
+        Ok(Self::from(value.read_be_u32()?))
     }
 }
 impl From<Txindex> for Slice {
@@ -43,16 +76,3 @@ impl From<Txindex> for Slice {
         value.to_be_bytes().into()
     }
 }
-
-impl Add<usize> for Txindex {
-    type Output = Self;
-    fn add(self, rhs: usize) -> Self::Output {
-        Self(self.0 + rhs as u32)
-    }
-}
-
-impl AddAssign<usize> for Txindex {
-    fn add_assign(&mut self, rhs: usize) {
-        self.0 += rhs as u32
-    }
-}
diff --git a/src/crates/bitbase/src/structs/txindexvout.rs b/src/crates/bitbase/src/structs/txindexvout.rs
new file mode 100644
index 000000000..0a75a529c
--- /dev/null
+++ b/src/crates/bitbase/src/structs/txindexvout.rs
@@ -0,0 +1,51 @@
+use fjall::Slice;
+
+use super::{SliceExtended, Txindex};
+
+#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Default)]
+pub struct Txindexvout {
+    pub txindex: Txindex,
+    pub vout: u32,
+}
+
+const BYTES: usize = size_of::<Txindexvout>();
+
+impl From<Txindex> for Txindexvout {
+    fn from(value: Txindex) -> Self {
+        Self {
+            txindex: value,
+            vout: 0,
+        }
+    }
+}
+
+impl From<(Txindex, u32)> for Txindexvout {
+    fn from(value: (Txindex, u32)) -> Self {
+        Self {
+            txindex: value.0,
+            vout: value.1,
+        }
+    }
+}
+
+impl From<Txindexvout> for Slice {
+    fn from(value: Txindexvout) -> Self {
+        let txindex_slice = Self::from(value.txindex);
+        let vout_slice = Self::from(value.vout.to_be_bytes());
+        Self::from([txindex_slice, vout_slice].concat())
+    }
+}
+impl TryFrom<Slice> for Txindexvout {
+    type Error = color_eyre::Report;
+    fn try_from(value: Slice) -> Result<Self, Self::Error> {
+        Self::try_from(&value[..])
+    }
+}
+impl TryFrom<&[u8]> for Txindexvout {
+    type Error = color_eyre::Report;
+    fn try_from(value: &[u8]) -> Result<Self, Self::Error> {
+        let txindex = Txindex::try_from(&value[..BYTES])?;
+        let vout = (&value[BYTES..]).read_be_u32()?;
+        Ok(Self { txindex, vout })
+    }
+}
diff --git a/src/crates/bitbase/src/structs/txoutindex.rs b/src/crates/bitbase/src/structs/txoutindex.rs
index 69b194aff..92e1bc88d 100644
--- a/src/crates/bitbase/src/structs/txoutindex.rs
+++ b/src/crates/bitbase/src/structs/txoutindex.rs
@@ -1,46 +1,72 @@
+use std::ops::{Add, AddAssign};
+
+use derive_deref::{Deref, DerefMut};
 use fjall::Slice;
 
-use super::{SliceExtended, Txindex};
+use super::SliceExtended;
 
-#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Default)]
-pub struct Txoutindex {
-    pub txindex: Txindex,
-    pub vout: u16,
-}
+#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Deref, DerefMut, Default)]
+pub struct Txoutindex(u64);
 
 impl Txoutindex {
-    pub const BYTES: usize = size_of::<Self>();
-}
+    pub fn incremented(self) -> Self {
+        Self(*self + 1)
+    }
 
-impl From<Txindex> for Txoutindex {
-    fn from(value: Txindex) -> Self {
-        Self {
-            txindex: value,
-            vout: 0,
-        }
+    pub fn decremented(self) -> Self {
+        Self(*self - 1)
     }
 }
 
-impl From<(Txindex, u16)> for Txoutindex {
-    fn from(value: (Txindex, u16)) -> Self {
-        Self {
-            txindex: value.0,
-            vout: value.1,
-        }
+impl Add<Txoutindex> for Txoutindex {
+    type Output = Self;
+    fn add(self, rhs: Txoutindex) -> Self::Output {
+        Self(self.0 + rhs.0)
     }
 }
 
+impl AddAssign<Txoutindex> for Txoutindex {
+    fn add_assign(&mut self, rhs: Txoutindex) {
+        self.0 += rhs.0
+    }
+}
+
+impl From<u64> for Txoutindex {
+    fn from(value: u64) -> Self {
+        Self(value)
+    }
+}
+impl From<Txoutindex> for u64 {
+    fn from(value: Txoutindex) -> Self {
+        value.0
+    }
+}
+
+impl From<usize> for Txoutindex {
+    fn from(value: usize) -> Self {
+        Self(value as u64)
+    }
+}
+impl From<Txoutindex> for usize {
+    fn from(value: Txoutindex) -> Self {
+        value.0 as usize
+    }
+}
+
+impl TryFrom<Slice> for Txoutindex {
+    type Error = color_eyre::Report;
+    fn try_from(value: Slice) -> Result<Self, Self::Error> {
+        Self::try_from(&value[..])
+    }
+}
+impl TryFrom<&[u8]> for Txoutindex {
+    type Error = color_eyre::Report;
+    fn try_from(value: &[u8]) -> Result<Self, Self::Error> {
+        Ok(Self::from(value.read_be_u64()?))
+    }
+}
 impl From<Txoutindex> for Slice {
     fn from(value: Txoutindex) -> Self {
-        let txindex_slice = Self::from(value.txindex);
-        let vout_slice = Self::from(value.vout.to_be_bytes());
-        Self::from([txindex_slice, vout_slice].concat())
-    }
-}
-impl From<Slice> for Txoutindex {
-    fn from(value: Slice) -> Self {
-        let txindex = Txindex::from(Slice::from(&value[..Txindex::BYTES]));
-        let vout = Slice::from(&value[Txindex::BYTES..]).read_u16();
-        Self { txindex, vout }
+        value.to_be_bytes().into()
     }
 }
diff --git a/src/crates/bitbase/src/structs/vecdisk.rs b/src/crates/bitbase/src/structs/vecdisk.rs
new file mode 100644
index 000000000..13aa4e9fe
--- /dev/null
+++ b/src/crates/bitbase/src/structs/vecdisk.rs
@@ -0,0 +1,219 @@
+use std::{
+    cmp::Ordering,
+    fmt::Debug,
+    fs::{File, OpenOptions},
+    io::{self, Write},
+    marker::PhantomData,
+    mem,
+    ops::Range,
+    path::Path,
+    sync::OnceLock,
+};
+
+use color_eyre::eyre::{eyre, ContextCompat};
+
+use derive_deref::{Deref, DerefMut};
+use memmap2::{Mmap, MmapOptions};
+
+///
+/// A Push only vec stored on disk using Mmap
+///
+/// Reads (imports of Mmap) are lazy
+///
+/// Stores only raw data without any overhead, and doesn't even have a header (TODO: which it should, at least to Err if wrong endian)
+///
+/// The file isn't portable for speed reasons (TODO: but could be ?)
+///
+#[derive(Debug)]
+pub struct Vecdisk<I, T> {
+    file: File,
+    mmaps: VecLazyMmap,
+    disk_len: usize,
+    cache: Vec<T>,
+    phantom: PhantomData<I>,
+}
+
+/// In bytes
+const MAX_PAGE_SIZE: usize = 4096;
+
+impl<I, T> Vecdisk<I, T>
+where
+    I: Into<usize>,
+    T: Sized + Debug,
+{
+    pub const SIZE: usize = size_of::<T>();
+
+    pub const PER_PAGE: usize = MAX_PAGE_SIZE / Self::SIZE;
+    /// In bytes
+    pub const PAGE_SIZE: usize = Self::PER_PAGE * Self::SIZE;
+
+    pub fn import(path: &Path) -> color_eyre::Result<Self> {
+        let file = Self::open_file(path)?;
+
+        let mut this = Self {
+            disk_len: Self::byte_index_to_index(file.metadata()?.len() as usize),
+            file,
+            mmaps: VecLazyMmap::default(),
+            cache: vec![],
+            phantom: PhantomData,
+        };
+
+        this.reset_mmaps();
+
+        Ok(this)
+    }
+
+    fn reset_mmaps(&mut self) {
+        self.mmaps
+            .reset((self.disk_len as f64 / Self::PER_PAGE as f64).ceil() as usize);
+    }
+
+    fn open_file(path: &Path) -> Result<File, io::Error> {
+        OpenOptions::new()
+            .read(true)
+            .create(true)
+            .truncate(false)
+            .append(true)
+            .open(path)
+    }
+
+    #[inline]
+    fn index_to_mmap_index(index: usize) -> usize {
+        Self::index_to_byte_index(index) / Self::PAGE_SIZE
+    }
+
+    #[inline]
+    fn index_to_range(index: usize) -> Range<usize> {
+        let index = Self::index_to_byte_index(index) % Self::PAGE_SIZE;
+        index..(index + Self::SIZE)
+    }
+
+    #[inline]
+    fn index_to_byte_index(index: usize) -> usize {
+        index * Self::SIZE
+    }
+
+    #[inline]
+    fn byte_index_to_index(byte_index: usize) -> usize {
+        byte_index / Self::SIZE
+    }
+
+    #[allow(unused)]
+    #[inline]
+    pub fn get(&self, index: I) -> color_eyre::Result<Option<&T>> {
+        self._get(index.into())
+    }
+    fn _get(&self, index: usize) -> color_eyre::Result<Option<&T>> {
+        if self.disk_len == 0 {
+            Ok(None)
+        } else if index > self.disk_len - 1 {
+            Ok(self.cache.get(index - self.disk_len))
+        } else {
+            let mmap_index = Self::index_to_mmap_index(index);
+
+            let mmap = self
+                .mmaps
+                .get(mmap_index)
+                .context("Expect mmap to be open")?
+                .get_or_load(MAX_PAGE_SIZE, (mmap_index * Self::PAGE_SIZE) as u64, &self.file);
+
+            let range = Self::index_to_range(index);
+            let src = &mmap[range];
+
+            let (prefix, shorts, suffix) = unsafe { src.align_to::<T>() };
+
+            if !prefix.is_empty() || shorts.len() != 1 || !suffix.is_empty() {
+                dbg!(&src, &prefix, &shorts, &suffix);
+                return Err(eyre!("align_to issue"));
+            }
+
+            Ok(Some(&shorts[0]))
+        }
+    }
+
+    #[allow(unused)]
+    pub fn first(&self) -> color_eyre::Result<Option<&T>> {
+        self._get(0)
+    }
+
+    #[allow(unused)]
+    pub fn last(&self) -> color_eyre::Result<Option<&T>> {
+        let len = self.len();
+        if len == 0 {
+            return Ok(None);
+        }
+        self._get(len - 1)
+    }
+
+    pub fn push(&mut self, value: T) {
+        self.cache.push(value)
+    }
+
+    pub fn push_if_needed(&mut self, index: I, value: T) -> color_eyre::Result<()> {
+        let len = self.len();
+        let index = index.into();
+        match len.cmp(&index) {
+            Ordering::Greater => Ok(()),
+            Ordering::Equal => {
+                self.push(value);
+                Ok(())
+            }
+            Ordering::Less => {
+                dbg!(std::any::type_name::<I>(), std::any::type_name::<T>());
+                dbg!(len, index, value);
+                Err(eyre!("Index is too high"))
+            }
+        }
+    }
+}
+
+pub trait AnyVecdisk {
+    fn len(&self) -> usize;
+    fn flush(&mut self) -> color_eyre::Result<()>;
+}
+
+impl<I, T> AnyVecdisk for Vecdisk<I, T>
+where
+    I: Into<usize>,
+    T: Sized + Debug,
+{
+    fn len(&self) -> usize {
+        self.disk_len + self.cache.len()
+    }
+
+    fn flush(&mut self) -> color_eyre::Result<()> {
+        self.disk_len += self.cache.len();
+        self.reset_mmaps();
+
+        let mut bytes: Vec<u8> = vec![];
+
+        mem::take(&mut self.cache).into_iter().for_each(|v| {
+            let data: *const T = &v;
+            let data: *const u8 = data as *const u8;
+            let slice = unsafe { std::slice::from_raw_parts(data, Self::SIZE) };
+            bytes.extend_from_slice(slice)
+        });
+
+        self.file.write_all(&bytes)?;
+
+        Ok(())
+    }
+}
+
+#[derive(Debug, Default, Deref, DerefMut)]
+struct VecLazyMmap(Vec<LazyMmap>);
+impl VecLazyMmap {
+    pub fn reset(&mut self, len: usize) {
+        self.clear();
+        self.resize_with(len, Default::default);
+    }
+}
+
+/// Box to reduce the size, would be 24 instead
+#[derive(Debug, Default, Deref)]
+struct LazyMmap(OnceLock<Box<Mmap>>);
+impl LazyMmap {
+    pub fn get_or_load(&self, len: usize, offset: u64, file: &File) -> &Mmap {
+        self.get_or_init(|| Box::new(unsafe { MmapOptions::new().len(len).offset(offset).map(file).unwrap() }))
+    }
+}
diff --git a/src/crates/bitbase/src/structs/vecdisks.rs b/src/crates/bitbase/src/structs/vecdisks.rs
new file mode 100644
index 000000000..37843c1ae
--- /dev/null
+++ b/src/crates/bitbase/src/structs/vecdisks.rs
@@ -0,0 +1,248 @@
+use std::{fs, path::Path};
+
+use biter::bitcoin::{BlockHash, Txid};
+use color_eyre::eyre::eyre;
+
+use super::{
+    Addressbytes, Addressindex, Addresstype, Addresstypeindex, Amount, AnyVecdisk, Exit, Height, P2PK33AddressBytes,
+    P2PK65AddressBytes, P2PKHAddressBytes, P2SHAddressBytes, P2TRAddressBytes, P2WPKHAddressBytes, P2WSHAddressBytes,
+    Txindex, Txoutindex, Vecdisk,
+};
+
+pub struct Vecdisks {
+    // TODO:
+    //
+    // Add
+    // txindex_to_fees
+    // height_to_fees
+    // height_to_utc_date
+    // height_to_timestamp
+    //
+    // NOT the following as because of reorg it's subjective
+    // date_to_fees
+    // date_to_first_height
+    // date_to_last_height
+    pub addressindex_to_addresstype: Vecdisk<Addressindex, Addresstype>,
+    pub addressindex_to_addresstypeindex: Vecdisk<Addressindex, Addresstypeindex>,
+    pub height_to_blockhash: Vecdisk<Height, BlockHash>,
+    pub height_to_first_addressindex: Vecdisk<Height, Addressindex>,
+    pub height_to_first_txindex: Vecdisk<Height, Txindex>,
+    pub height_to_first_txoutindex: Vecdisk<Height, Txoutindex>,
+    pub height_to_last_addressindex: Vecdisk<Height, Addressindex>,
+    pub height_to_last_txindex: Vecdisk<Height, Txindex>,
+    pub height_to_last_txoutindex: Vecdisk<Height, Txoutindex>,
+    pub p2pk65index_to_p2pk65addressbytes: Vecdisk<Addresstypeindex, P2PK65AddressBytes>,
+    pub p2pk33index_to_p2pk33addressbytes: Vecdisk<Addresstypeindex, P2PK33AddressBytes>,
+    pub p2pkhindex_to_p2pkhaddressbytes: Vecdisk<Addresstypeindex, P2PKHAddressBytes>,
+    pub p2shindex_to_p2shaddressbytes: Vecdisk<Addresstypeindex, P2SHAddressBytes>,
+    pub p2wpkhindex_to_p2wpkhaddressbytes: Vecdisk<Addresstypeindex, P2WPKHAddressBytes>,
+    pub p2wshindex_to_p2wshaddressbytes: Vecdisk<Addresstypeindex, P2WSHAddressBytes>,
+    pub p2trindex_to_p2traddressbytes: Vecdisk<Addresstypeindex, P2TRAddressBytes>,
+    pub txindex_to_height: Vecdisk<Txindex, Height>,
+    pub txindex_to_txid: Vecdisk<Txindex, Txid>,
+    pub txoutindex_to_addressindex: Vecdisk<Txoutindex, Addressindex>,
+    pub txoutindex_to_amount: Vecdisk<Txoutindex, Amount>,
+}
+
+// const UNSAFE_BLOCKS: usize = 100;
+
+impl Vecdisks {
+    pub fn import(path: &Path) -> color_eyre::Result<Self> {
+        fs::create_dir_all(path)?;
+
+        Ok(Self {
+            addressindex_to_addresstype: Vecdisk::import(&path.join("addressindex_to_addresstype"))?,
+            addressindex_to_addresstypeindex: Vecdisk::import(&path.join("addressindex_to_addresstypeindex"))?,
+            height_to_blockhash: Vecdisk::import(&path.join("height_to_blockhash"))?,
+            height_to_first_addressindex: Vecdisk::import(&path.join("height_to_first_addressindex"))?,
+            height_to_first_txindex: Vecdisk::import(&path.join("height_to_first_txindex"))?,
+            height_to_first_txoutindex: Vecdisk::import(&path.join("height_to_first_txoutindex"))?,
+            height_to_last_addressindex: Vecdisk::import(&path.join("height_to_last_addressindex"))?,
+            height_to_last_txindex: Vecdisk::import(&path.join("height_to_last_txindex"))?,
+            height_to_last_txoutindex: Vecdisk::import(&path.join("height_to_last_txoutindex"))?,
+            p2pk65index_to_p2pk65addressbytes: Vecdisk::import(&path.join("p2pk65index_to_p2pk65addressbytes"))?,
+            p2pk33index_to_p2pk33addressbytes: Vecdisk::import(&path.join("p2pk33index_to_p2pk33addressbytes"))?,
+            p2pkhindex_to_p2pkhaddressbytes: Vecdisk::import(&path.join("p2pkhindex_to_p2pkhaddressbytes"))?,
+            p2shindex_to_p2shaddressbytes: Vecdisk::import(&path.join("p2shindex_to_p2shaddressbytes"))?,
+            p2wpkhindex_to_p2wpkhaddressbytes: Vecdisk::import(&path.join("p2wpkhindex_to_p2wpkhaddressbytes"))?,
+            p2wshindex_to_p2wshaddressbytes: Vecdisk::import(&path.join("p2wshindex_to_p2wshaddressbytes"))?,
+            p2trindex_to_p2traddressbytes: Vecdisk::import(&path.join("p2trindex_to_p2traddressbytes"))?,
+            txindex_to_height: Vecdisk::import(&path.join("txindex_to_height"))?,
+            txindex_to_txid: Vecdisk::import(&path.join("txindex_to_txid"))?,
+            txoutindex_to_addressindex: Vecdisk::import(&path.join("txoutindex_to_addressindex"))?,
+            txoutindex_to_amount: Vecdisk::import(&path.join("txoutindex_to_amount"))?,
+        })
+    }
+
+    pub fn addresstype_to_addressvecdisk(&self, addresstype: Addresstype) -> color_eyre::Result<&dyn AnyVecdisk> {
+        match addresstype {
+            Addresstype::P2PK65 => Ok(&self.p2pk65index_to_p2pk65addressbytes),
+            Addresstype::P2PK33 => Ok(&self.p2pk33index_to_p2pk33addressbytes),
+            Addresstype::P2PKH => Ok(&self.p2pkhindex_to_p2pkhaddressbytes),
+            Addresstype::P2SH => Ok(&self.p2shindex_to_p2shaddressbytes),
+            Addresstype::P2WPKH => Ok(&self.p2wpkhindex_to_p2wpkhaddressbytes),
+            Addresstype::P2WSH => Ok(&self.p2wshindex_to_p2wshaddressbytes),
+            Addresstype::P2TR => Ok(&self.p2trindex_to_p2traddressbytes),
+            _ => Err(eyre!("wrong address type")),
+        }
+    }
+
+    pub fn push_addressbytes_if_needed(
+        &mut self,
+        index: Addresstypeindex,
+        addressbytes: Addressbytes,
+    ) -> color_eyre::Result<()> {
+        match addressbytes {
+            Addressbytes::P2PK65(bytes) => self.p2pk65index_to_p2pk65addressbytes.push_if_needed(index, bytes),
+            Addressbytes::P2PK33(bytes) => self.p2pk33index_to_p2pk33addressbytes.push_if_needed(index, bytes),
+            Addressbytes::P2PKH(bytes) => self.p2pkhindex_to_p2pkhaddressbytes.push_if_needed(index, bytes),
+            Addressbytes::P2SH(bytes) => self.p2shindex_to_p2shaddressbytes.push_if_needed(index, bytes),
+            Addressbytes::P2WPKH(bytes) => self.p2wpkhindex_to_p2wpkhaddressbytes.push_if_needed(index, bytes),
+            Addressbytes::P2WSH(bytes) => self.p2wshindex_to_p2wshaddressbytes.push_if_needed(index, bytes),
+            Addressbytes::P2TR(bytes) => self.p2trindex_to_p2traddressbytes.push_if_needed(index, bytes),
+        }
+    }
+
+    #[allow(unused)]
+    pub fn rollback_from(&mut self, _height: Height, _exit: &Exit) -> color_eyre::Result<()> {
+        panic!();
+        // let mut txindex = None;
+
+        // wtx.range(self.height_to_blockhash.data(), Slice::from(height)..)
+        //     .try_for_each(|slice| -> color_eyre::Result<()> {
+        //         let (height_slice, slice_blockhash) = slice?;
+        //         let blockhash = BlockHash::from_slice(&slice_blockhash)?;
+
+        //         wtx.remove(self.height_to_blockhash.data(), height_slice);
+
+        //         wtx.remove(self.blockhash_prefix_to_height.data(), blockhash.prefix());
+
+        //         if txindex.is_none() {
+        //             txindex.replace(
+        //                 wtx.get(self.height_to_first_txindex.data(), height_slice)?
+        //                     .context("for height to have first txindex")?,
+        //             );
+        //         }
+        //         wtx.remove(self.height_to_first_txindex.data(), height_slice);
+        //         wtx.remove(self.height_to_last_txindex.data(), height_slice);
+
+        //         Ok(())
+        //     })?;
+
+        // let txindex = txindex.context("txindex to not be none by now")?;
+
+        // wtx.range(self.txindex_to_txid.data(), Slice::from(txindex)..)
+        //     .try_for_each(|slice| -> color_eyre::Result<()> {
+        //         let (slice_txindex, slice_txid) = slice?;
+        //         let txindex = Txindex::from(slice_txindex);
+        //         let txid = Txid::from_slice(&slice_txid)?;
+
+        //         wtx.remove(self.txindex_to_txid.data(), Slice::from(txindex));
+        //         wtx.remove(self.txindex_to_height.data(), Slice::from(txindex));
+        //         wtx.remove(self.txid_prefix_to_txindex.data(), txid.prefix());
+
+        //         Ok(())
+        //     })?;
+
+        // let txoutindex = Txoutindex::from(txindex);
+
+        // let mut addressindexes = BTreeSet::new();
+
+        // wtx.range(self.txoutindex_to_amount.data(), Slice::from(txoutindex)..)
+        //     .try_for_each(|slice| -> color_eyre::Result<()> {
+        //         let (txoutindex_slice, _) = slice?;
+
+        //         wtx.remove(self.txoutindex_to_amount.data(), txoutindex_slice);
+
+        //         if let Some(addressindex_slice) =
+        //             wtx.get(self.txoutindex_to_addressindex.data(), txoutindex_slice)?
+        //         {
+        //             wtx.remove(self.txoutindex_to_addressindex.data(), txoutindex_slice);
+
+        //             let addressindex = Addressindex::from(addressindex_slice);
+        //             addressindexes.insert(addressindex);
+
+        //             let txoutindex = Txoutindex::from(txoutindex_slice);
+        //             let addresstxoutindex = Addresstxoutindex::from((addressindex, txoutindex));
+
+        //             wtx.remove(
+        //                 self.addressindex_to_txoutindexes.data(),
+        //                 Slice::from(addresstxoutindex),
+        //             );
+        //         }
+
+        //         Ok(())
+        //     })?;
+
+        // addressindexes
+        // .into_iter()
+        // .filter(|addressindex| {
+        //     let is_empty = wtx
+        //         .prefix(
+        //             self.addressindex_to_txoutindexes.data(),
+        //             Slice::from(*addressindex),
+        //         )
+        //         .next()
+        //         .is_none();
+        //     is_empty
+        // })
+        // .try_for_each(|addressindex| -> color_eyre::Result<()> {
+        //     let addressindex_slice = Slice::from(addressindex);
+
+        //     let addressbytes = Addressbytes::from(
+        //         wtx.get(
+        //             self.addressindex_to_addressbytes.data(),
+        //             &addressindex_slice,
+        //         )?
+        //         .context("addressindex_to_address to have value")?,
+        //     );
+        //     wtx.remove(
+        //         self.addressbytes_prefix_to_addressindex.data(),
+        //         addressbytes.prefix(),
+        //     );
+        //     wtx.remove(
+        //         self.addressindex_to_addressbytes.data(),
+        //         &addressindex_slice,
+        //     );
+        //     wtx.remove(self.addressindex_to_addresstype.data(), &addressindex_slice);
+
+        //     Ok(())
+        // })?;
+        //
+
+        // todo!("clear addresstxoutindexes_out")
+        // todo!("clear addresstxoutindexes_in")
+        // todo!("clear zero_txoutindexes")
+
+        // Ok(())
+    }
+
+    pub fn flush(&mut self) -> color_eyre::Result<()> {
+        self.as_mut_vec().into_iter().try_for_each(AnyVecdisk::flush)
+    }
+
+    fn as_mut_vec(&mut self) -> Vec<&mut dyn AnyVecdisk> {
+        vec![
+            &mut self.addressindex_to_addresstype,
+            &mut self.addressindex_to_addresstypeindex,
+            &mut self.height_to_blockhash,
+            &mut self.height_to_first_addressindex,
+            &mut self.height_to_first_txindex,
+            &mut self.height_to_first_txoutindex,
+            &mut self.height_to_last_addressindex,
+            &mut self.height_to_last_txindex,
+            &mut self.height_to_last_txoutindex,
+            &mut self.p2pk65index_to_p2pk65addressbytes,
+            &mut self.p2pk33index_to_p2pk33addressbytes,
+            &mut self.p2pkhindex_to_p2pkhaddressbytes,
+            &mut self.p2shindex_to_p2shaddressbytes,
+            &mut self.p2wpkhindex_to_p2wpkhaddressbytes,
+            &mut self.p2wshindex_to_p2wshaddressbytes,
+            &mut self.p2trindex_to_p2traddressbytes,
+            &mut self.txindex_to_height,
+            &mut self.txindex_to_txid,
+            &mut self.txoutindex_to_addressindex,
+            &mut self.txoutindex_to_amount,
+        ]
+    }
+}
diff --git a/src/crates/bitbase/src/structs/version.rs b/src/crates/bitbase/src/structs/version.rs
index 80fdf235c..cc94051ed 100644
--- a/src/crates/bitbase/src/structs/version.rs
+++ b/src/crates/bitbase/src/structs/version.rs
@@ -12,12 +12,18 @@ impl From<u8> for Version {
     }
 }
 
-impl From<Slice> for Version {
-    fn from(slice: Slice) -> Self {
-        Self(slice.read_u8())
+impl TryFrom<Slice> for Version {
+    type Error = color_eyre::Report;
+    fn try_from(value: Slice) -> Result<Self, Self::Error> {
+        Self::try_from(&value[..])
+    }
+}
+impl TryFrom<&[u8]> for Version {
+    type Error = color_eyre::Report;
+    fn try_from(value: &[u8]) -> Result<Self, Self::Error> {
+        Ok(Self::from(value.read_be_u8()?))
     }
 }
-
 impl From<Version> for Slice {
     fn from(value: Version) -> Self {
         value.to_be_bytes().into()

From d373c6398e296bcb8bdff81d0ad4c154b354ee24 Mon Sep 17 00:00:00 2001
From: nym21 <expat-epochs0i@icloud.com>
Date: Tue, 14 Jan 2025 12:38:06 +0100
Subject: [PATCH 22/63] bitbase: renamed to bindex

---
 src/crates/{bitbase => bindex}/.gitignore                       | 1 -
 src/crates/{bitbase => bindex}/Cargo.lock                       | 0
 src/crates/{bitbase => bindex}/Cargo.toml                       | 2 +-
 src/crates/{bitbase => bindex}/rustfmt.toml                     | 0
 src/crates/{bitbase => bindex}/src/main.rs                      | 0
 src/crates/{bitbase => bindex}/src/structs/addressbytes.rs      | 0
 src/crates/{bitbase => bindex}/src/structs/addressindex.rs      | 0
 .../{bitbase => bindex}/src/structs/addressindextxoutindex.rs   | 0
 src/crates/{bitbase => bindex}/src/structs/addresstype.rs       | 0
 src/crates/{bitbase => bindex}/src/structs/addresstypeindex.rs  | 0
 src/crates/{bitbase => bindex}/src/structs/amount.rs            | 0
 src/crates/{bitbase => bindex}/src/structs/exit.rs              | 0
 src/crates/{bitbase => bindex}/src/structs/height.rs            | 0
 src/crates/{bitbase => bindex}/src/structs/mod.rs               | 0
 src/crates/{bitbase => bindex}/src/structs/partition.rs         | 0
 src/crates/{bitbase => bindex}/src/structs/partitions.rs        | 0
 src/crates/{bitbase => bindex}/src/structs/prefix.rs            | 0
 src/crates/{bitbase => bindex}/src/structs/slice.rs             | 0
 src/crates/{bitbase => bindex}/src/structs/txindex.rs           | 0
 src/crates/{bitbase => bindex}/src/structs/txindexvout.rs       | 0
 src/crates/{bitbase => bindex}/src/structs/txoutindex.rs        | 0
 src/crates/{bitbase => bindex}/src/structs/vecdisk.rs           | 0
 src/crates/{bitbase => bindex}/src/structs/vecdisks.rs          | 0
 src/crates/{bitbase => bindex}/src/structs/version.rs           | 0
 24 files changed, 1 insertion(+), 2 deletions(-)
 rename src/crates/{bitbase => bindex}/.gitignore (62%)
 rename src/crates/{bitbase => bindex}/Cargo.lock (100%)
 rename src/crates/{bitbase => bindex}/Cargo.toml (92%)
 rename src/crates/{bitbase => bindex}/rustfmt.toml (100%)
 rename src/crates/{bitbase => bindex}/src/main.rs (100%)
 rename src/crates/{bitbase => bindex}/src/structs/addressbytes.rs (100%)
 rename src/crates/{bitbase => bindex}/src/structs/addressindex.rs (100%)
 rename src/crates/{bitbase => bindex}/src/structs/addressindextxoutindex.rs (100%)
 rename src/crates/{bitbase => bindex}/src/structs/addresstype.rs (100%)
 rename src/crates/{bitbase => bindex}/src/structs/addresstypeindex.rs (100%)
 rename src/crates/{bitbase => bindex}/src/structs/amount.rs (100%)
 rename src/crates/{bitbase => bindex}/src/structs/exit.rs (100%)
 rename src/crates/{bitbase => bindex}/src/structs/height.rs (100%)
 rename src/crates/{bitbase => bindex}/src/structs/mod.rs (100%)
 rename src/crates/{bitbase => bindex}/src/structs/partition.rs (100%)
 rename src/crates/{bitbase => bindex}/src/structs/partitions.rs (100%)
 rename src/crates/{bitbase => bindex}/src/structs/prefix.rs (100%)
 rename src/crates/{bitbase => bindex}/src/structs/slice.rs (100%)
 rename src/crates/{bitbase => bindex}/src/structs/txindex.rs (100%)
 rename src/crates/{bitbase => bindex}/src/structs/txindexvout.rs (100%)
 rename src/crates/{bitbase => bindex}/src/structs/txoutindex.rs (100%)
 rename src/crates/{bitbase => bindex}/src/structs/vecdisk.rs (100%)
 rename src/crates/{bitbase => bindex}/src/structs/vecdisks.rs (100%)
 rename src/crates/{bitbase => bindex}/src/structs/version.rs (100%)

diff --git a/src/crates/bitbase/.gitignore b/src/crates/bindex/.gitignore
similarity index 62%
rename from src/crates/bitbase/.gitignore
rename to src/crates/bindex/.gitignore
index ef19dbeff..e2647cd44 100644
--- a/src/crates/bitbase/.gitignore
+++ b/src/crates/bindex/.gitignore
@@ -1,2 +1 @@
 /database
-*_bkp
diff --git a/src/crates/bitbase/Cargo.lock b/src/crates/bindex/Cargo.lock
similarity index 100%
rename from src/crates/bitbase/Cargo.lock
rename to src/crates/bindex/Cargo.lock
diff --git a/src/crates/bitbase/Cargo.toml b/src/crates/bindex/Cargo.toml
similarity index 92%
rename from src/crates/bitbase/Cargo.toml
rename to src/crates/bindex/Cargo.toml
index 659e81017..a180c716f 100644
--- a/src/crates/bitbase/Cargo.toml
+++ b/src/crates/bindex/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "bitbase"
+name = "bindex"
 version = "0.1.0"
 edition = "2021"
 
diff --git a/src/crates/bitbase/rustfmt.toml b/src/crates/bindex/rustfmt.toml
similarity index 100%
rename from src/crates/bitbase/rustfmt.toml
rename to src/crates/bindex/rustfmt.toml
diff --git a/src/crates/bitbase/src/main.rs b/src/crates/bindex/src/main.rs
similarity index 100%
rename from src/crates/bitbase/src/main.rs
rename to src/crates/bindex/src/main.rs
diff --git a/src/crates/bitbase/src/structs/addressbytes.rs b/src/crates/bindex/src/structs/addressbytes.rs
similarity index 100%
rename from src/crates/bitbase/src/structs/addressbytes.rs
rename to src/crates/bindex/src/structs/addressbytes.rs
diff --git a/src/crates/bitbase/src/structs/addressindex.rs b/src/crates/bindex/src/structs/addressindex.rs
similarity index 100%
rename from src/crates/bitbase/src/structs/addressindex.rs
rename to src/crates/bindex/src/structs/addressindex.rs
diff --git a/src/crates/bitbase/src/structs/addressindextxoutindex.rs b/src/crates/bindex/src/structs/addressindextxoutindex.rs
similarity index 100%
rename from src/crates/bitbase/src/structs/addressindextxoutindex.rs
rename to src/crates/bindex/src/structs/addressindextxoutindex.rs
diff --git a/src/crates/bitbase/src/structs/addresstype.rs b/src/crates/bindex/src/structs/addresstype.rs
similarity index 100%
rename from src/crates/bitbase/src/structs/addresstype.rs
rename to src/crates/bindex/src/structs/addresstype.rs
diff --git a/src/crates/bitbase/src/structs/addresstypeindex.rs b/src/crates/bindex/src/structs/addresstypeindex.rs
similarity index 100%
rename from src/crates/bitbase/src/structs/addresstypeindex.rs
rename to src/crates/bindex/src/structs/addresstypeindex.rs
diff --git a/src/crates/bitbase/src/structs/amount.rs b/src/crates/bindex/src/structs/amount.rs
similarity index 100%
rename from src/crates/bitbase/src/structs/amount.rs
rename to src/crates/bindex/src/structs/amount.rs
diff --git a/src/crates/bitbase/src/structs/exit.rs b/src/crates/bindex/src/structs/exit.rs
similarity index 100%
rename from src/crates/bitbase/src/structs/exit.rs
rename to src/crates/bindex/src/structs/exit.rs
diff --git a/src/crates/bitbase/src/structs/height.rs b/src/crates/bindex/src/structs/height.rs
similarity index 100%
rename from src/crates/bitbase/src/structs/height.rs
rename to src/crates/bindex/src/structs/height.rs
diff --git a/src/crates/bitbase/src/structs/mod.rs b/src/crates/bindex/src/structs/mod.rs
similarity index 100%
rename from src/crates/bitbase/src/structs/mod.rs
rename to src/crates/bindex/src/structs/mod.rs
diff --git a/src/crates/bitbase/src/structs/partition.rs b/src/crates/bindex/src/structs/partition.rs
similarity index 100%
rename from src/crates/bitbase/src/structs/partition.rs
rename to src/crates/bindex/src/structs/partition.rs
diff --git a/src/crates/bitbase/src/structs/partitions.rs b/src/crates/bindex/src/structs/partitions.rs
similarity index 100%
rename from src/crates/bitbase/src/structs/partitions.rs
rename to src/crates/bindex/src/structs/partitions.rs
diff --git a/src/crates/bitbase/src/structs/prefix.rs b/src/crates/bindex/src/structs/prefix.rs
similarity index 100%
rename from src/crates/bitbase/src/structs/prefix.rs
rename to src/crates/bindex/src/structs/prefix.rs
diff --git a/src/crates/bitbase/src/structs/slice.rs b/src/crates/bindex/src/structs/slice.rs
similarity index 100%
rename from src/crates/bitbase/src/structs/slice.rs
rename to src/crates/bindex/src/structs/slice.rs
diff --git a/src/crates/bitbase/src/structs/txindex.rs b/src/crates/bindex/src/structs/txindex.rs
similarity index 100%
rename from src/crates/bitbase/src/structs/txindex.rs
rename to src/crates/bindex/src/structs/txindex.rs
diff --git a/src/crates/bitbase/src/structs/txindexvout.rs b/src/crates/bindex/src/structs/txindexvout.rs
similarity index 100%
rename from src/crates/bitbase/src/structs/txindexvout.rs
rename to src/crates/bindex/src/structs/txindexvout.rs
diff --git a/src/crates/bitbase/src/structs/txoutindex.rs b/src/crates/bindex/src/structs/txoutindex.rs
similarity index 100%
rename from src/crates/bitbase/src/structs/txoutindex.rs
rename to src/crates/bindex/src/structs/txoutindex.rs
diff --git a/src/crates/bitbase/src/structs/vecdisk.rs b/src/crates/bindex/src/structs/vecdisk.rs
similarity index 100%
rename from src/crates/bitbase/src/structs/vecdisk.rs
rename to src/crates/bindex/src/structs/vecdisk.rs
diff --git a/src/crates/bitbase/src/structs/vecdisks.rs b/src/crates/bindex/src/structs/vecdisks.rs
similarity index 100%
rename from src/crates/bitbase/src/structs/vecdisks.rs
rename to src/crates/bindex/src/structs/vecdisks.rs
diff --git a/src/crates/bitbase/src/structs/version.rs b/src/crates/bindex/src/structs/version.rs
similarity index 100%
rename from src/crates/bitbase/src/structs/version.rs
rename to src/crates/bindex/src/structs/version.rs

From 4cc57e9c915add174c07736b3886fcce13e65bbd Mon Sep 17 00:00:00 2001
From: nym21 <expat-epochs0i@icloud.com>
Date: Tue, 14 Jan 2025 23:35:42 +0100
Subject: [PATCH 23/63] bindex: back to sanakirja

---
 Cargo.lock                                    | 703 ++++++++++++------
 Cargo.toml                                    |  22 +-
 src/crates/bindex/Cargo.lock                  | 417 +++++++----
 src/crates/bindex/Cargo.toml                  |   3 +-
 src/crates/bindex/src/main.rs                 | 172 ++---
 src/crates/bindex/src/structs/addressindex.rs |  23 +-
 .../src/structs/addressindextxoutindex.rs     |  25 +-
 .../bindex/src/structs/addresstypeindex.rs    |  37 +-
 src/crates/bindex/src/structs/amount.rs       |  33 +-
 .../bindex/src/structs/canopy/database.rs     |  23 +
 .../bindex/src/structs/canopy/environment.rs  |  20 +
 src/crates/bindex/src/structs/canopy/mod.rs   |   9 +
 .../bindex/src/structs/canopy/transaction.rs  |  19 +
 src/crates/bindex/src/structs/canopy/tree.rs  |  84 +++
 src/crates/bindex/src/structs/databases.rs    | 186 +++++
 src/crates/bindex/src/structs/height.rs       |  31 +-
 src/crates/bindex/src/structs/mod.rs          |  10 +-
 src/crates/bindex/src/structs/prefix.rs       |  58 +-
 src/crates/bindex/src/structs/slice.rs        |   7 +
 src/crates/bindex/src/structs/txindex.rs      |  23 +-
 src/crates/bindex/src/structs/txindexvout.rs  |  29 +-
 src/crates/bindex/src/structs/txoutindex.rs   |  23 +-
 src/crates/bindex/src/structs/version.rs      |   1 -
 src/crates/biter/Cargo.lock                   |  12 +-
 src/crates/biter/Cargo.toml                   |   2 +-
 25 files changed, 1245 insertions(+), 727 deletions(-)
 create mode 100644 src/crates/bindex/src/structs/canopy/database.rs
 create mode 100644 src/crates/bindex/src/structs/canopy/environment.rs
 create mode 100644 src/crates/bindex/src/structs/canopy/mod.rs
 create mode 100644 src/crates/bindex/src/structs/canopy/transaction.rs
 create mode 100644 src/crates/bindex/src/structs/canopy/tree.rs
 create mode 100644 src/crates/bindex/src/structs/databases.rs

diff --git a/Cargo.lock b/Cargo.lock
index 66ae12c36..aebbad5f6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -73,9 +73,9 @@ dependencies = [
 
 [[package]]
 name = "allocative"
-version = "0.3.3"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "082af274fd02beef17b7f0725a49ecafe6c075ef56cac9d6363eb3916a9817ae"
+checksum = "8fac2ce611db8b8cee9b2aa886ca03c924e9da5e5295d0dbd0526e5d0b0710f7"
 dependencies = [
  "allocative_derive",
  "ctor",
@@ -89,7 +89,7 @@ checksum = "fe233a377643e0fc1a56421d7c90acdec45c291b30345eb9f08e8d0ddce5a4ab"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.96",
 ]
 
 [[package]]
@@ -115,9 +115,9 @@ dependencies = [
 
 [[package]]
 name = "anstream"
-version = "0.6.15"
+version = "0.6.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
+checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -130,36 +130,36 @@ dependencies = [
 
 [[package]]
 name = "anstyle"
-version = "1.0.8"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
+checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.5"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb"
+checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
 dependencies = [
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle-query"
-version = "1.1.1"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a"
+checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.4"
+version = "3.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
+checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125"
 dependencies = [
  "anstyle",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -183,7 +183,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "swc_macros_common",
- "syn 2.0.85",
+ "syn 2.0.96",
 ]
 
 [[package]]
@@ -210,7 +210,7 @@ checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.96",
 ]
 
 [[package]]
@@ -227,7 +227,7 @@ checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.96",
 ]
 
 [[package]]
@@ -262,7 +262,7 @@ dependencies = [
  "serde_json",
  "serde_path_to_error",
  "serde_urlencoded",
- "sync_wrapper 1.0.1",
+ "sync_wrapper",
  "tokio",
  "tower",
  "tower-layer",
@@ -285,7 +285,7 @@ dependencies = [
  "mime",
  "pin-project-lite",
  "rustversion",
- "sync_wrapper 1.0.1",
+ "sync_wrapper",
  "tower-layer",
  "tower-service",
  "tracing",
@@ -500,9 +500,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.6.0"
+version = "2.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+checksum = "1be3f42a67d6d345ecd59f675f3f012d6974981560836e938c22b424b85ce1be"
 
 [[package]]
 name = "bitvec"
@@ -575,9 +575,9 @@ dependencies = [
 
 [[package]]
 name = "bytemuck"
-version = "1.18.0"
+version = "1.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae"
+checksum = "ef657dfab802224e671f5818e9a4935f9b1957ed18e58292690cc39e7a4092a3"
 
 [[package]]
 name = "byteorder"
@@ -587,15 +587,15 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.7.2"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3"
+checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b"
 
 [[package]]
 name = "cc"
-version = "1.1.28"
+version = "1.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e80e3b6a3ab07840e1cae9b0666a63970dc28e8ed5ffbcdacbfc760c281bfc1"
+checksum = "a012a0df96dd6d06ba9a1b29d6402d1a5d77c6befd2566afdc26e10603dc93d7"
 dependencies = [
  "jobserver",
  "libc",
@@ -631,9 +631,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.23"
+version = "4.5.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3135e7ec2ef7b10c6ed8950f0f792ed96ee093fa088608f1c76e569722700c84"
+checksum = "a8eb5e908ef3a6efbe1ed62520fb7287959888c88485abe072543190ecc66783"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -641,9 +641,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.23"
+version = "4.5.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30582fc632330df2bd26877bde0c1f4470d57c582bbc070376afcd04d8cb4838"
+checksum = "96b01801b5fc6a0a232407abc821660c9c6d25a1cafc0d4f85f29fb8d9afc121"
 dependencies = [
  "anstream",
  "anstyle",
@@ -653,14 +653,14 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.18"
+version = "4.5.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab"
+checksum = "54b755194d6389280185988721fffba69495eed5ee9feeee9a599b53db80318c"
 dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.96",
 ]
 
 [[package]]
@@ -698,9 +698,9 @@ dependencies = [
 
 [[package]]
 name = "colorchoice"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
+checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
 
 [[package]]
 name = "core-foundation"
@@ -751,18 +751,18 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-channel"
-version = "0.5.13"
+version = "0.5.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2"
+checksum = "06ba6d68e24814cb8de6bb986db8222d3a027d15872cabc0d18817bc3c0e4471"
 dependencies = [
  "crossbeam-utils",
 ]
 
 [[package]]
 name = "crossbeam-deque"
-version = "0.8.5"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"
+checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51"
 dependencies = [
  "crossbeam-epoch",
  "crossbeam-utils",
@@ -788,9 +788,9 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.20"
+version = "0.8.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
+checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
 
 [[package]]
 name = "crypto-common"
@@ -884,7 +884,7 @@ checksum = "805ef2023ccd65425743a91ecd11fc020979a0b01921db3104fb606d18a7b43e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.96",
 ]
 
 [[package]]
@@ -897,6 +897,17 @@ dependencies = [
  "crypto-common",
 ]
 
+[[package]]
+name = "displaydoc"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.96",
+]
+
 [[package]]
 name = "either"
 version = "1.13.0"
@@ -905,18 +916,18 @@ checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
 
 [[package]]
 name = "encoding_rs"
-version = "0.8.34"
+version = "0.8.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59"
+checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3"
 dependencies = [
  "cfg-if",
 ]
 
 [[package]]
 name = "env_filter"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab"
+checksum = "186e05a59d4c50738528153b83b0b0194d3a29507dfec16eccd4b342903397d0"
 dependencies = [
  "log",
  "regex",
@@ -924,9 +935,9 @@ dependencies = [
 
 [[package]]
 name = "env_logger"
-version = "0.11.5"
+version = "0.11.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d"
+checksum = "dcaee3d8e3cfc3fd92428d477bc97fc29ec8716d180c0d74c643bb26166660e0"
 dependencies = [
  "anstream",
  "anstyle",
@@ -943,12 +954,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[package]]
 name = "errno"
-version = "0.3.9"
+version = "0.3.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
+checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
 dependencies = [
  "libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -963,9 +974,9 @@ dependencies = [
 
 [[package]]
 name = "fastrand"
-version = "2.1.1"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6"
+checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
 
 [[package]]
 name = "fixedbitset"
@@ -1021,7 +1032,7 @@ checksum = "8d7ccf961415e7aa17ef93dcb6c2441faaa8e768abe09e659b908089546f74c5"
 dependencies = [
  "proc-macro2",
  "swc_macros_common",
- "syn 2.0.85",
+ "syn 2.0.96",
 ]
 
 [[package]]
@@ -1157,9 +1168,9 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.15.0"
+version = "0.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb"
+checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
 
 [[package]]
 name = "heck"
@@ -1199,9 +1210,9 @@ checksum = "3011d1213f159867b13cfd6ac92d2cd5f1345762c63be3554e84092d85a50bbd"
 
 [[package]]
 name = "hstr"
-version = "0.2.12"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dae404c0c5d4e95d4858876ab02eecd6a196bb8caa42050dfa809938833fc412"
+checksum = "63d6824358c0fd9a68bb23999ed2ef76c84f79408a26ef7ae53d5f370c94ad36"
 dependencies = [
  "hashbrown 0.14.5",
  "new_debug_unreachable",
@@ -1213,9 +1224,9 @@ dependencies = [
 
 [[package]]
 name = "http"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258"
+checksum = "f16ca2af56261c99fba8bac40a10251ce8188205a4c448fbb745a2e4daa76fea"
 dependencies = [
  "bytes",
  "fnv",
@@ -1265,9 +1276,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
 [[package]]
 name = "hyper"
-version = "1.4.1"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05"
+checksum = "97818827ef4f364230e16705d4706e2897df2bb60617d6ca15d598025a3c481f"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -1319,9 +1330,9 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.9"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41296eb09f183ac68eec06e03cdbea2e759633d4067b2f6552fc2e009bcad08b"
+checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -1360,13 +1371,142 @@ dependencies = [
 ]
 
 [[package]]
-name = "idna"
-version = "0.5.0"
+name = "icu_collections"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
+checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
 dependencies = [
- "unicode-bidi",
- "unicode-normalization",
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
+dependencies = [
+ "displaydoc",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_locid_transform_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e"
+
+[[package]]
+name = "icu_normalizer"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_normalizer_data",
+ "icu_properties",
+ "icu_provider",
+ "smallvec",
+ "utf16_iter",
+ "utf8_iter",
+ "write16",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
+
+[[package]]
+name = "icu_properties"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_locid_transform",
+ "icu_properties_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_properties_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
+
+[[package]]
+name = "icu_provider"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_provider_macros",
+ "stable_deref_trait",
+ "tinystr",
+ "writeable",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_provider_macros"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.96",
+]
+
+[[package]]
+name = "idna"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
+dependencies = [
+ "idna_adapter",
+ "smallvec",
+ "utf8_iter",
+]
+
+[[package]]
+name = "idna_adapter"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71"
+dependencies = [
+ "icu_normalizer",
+ "icu_properties",
 ]
 
 [[package]]
@@ -1383,20 +1523,20 @@ checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683"
 
 [[package]]
 name = "indexmap"
-version = "2.6.0"
+version = "2.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
+checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f"
 dependencies = [
  "equivalent",
- "hashbrown 0.15.0",
+ "hashbrown 0.15.2",
  "serde",
 ]
 
 [[package]]
 name = "inferno"
-version = "0.12.0"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75a5d75fee4d36809e6b021e4b96b686e763d365ffdb03af2bd00786353f84fe"
+checksum = "692eda1cc790750b9f5a5e3921ef9c117fd5498b97cfacbc910693e5b29002dc"
 dependencies = [
  "ahash",
  "clap",
@@ -1438,7 +1578,7 @@ dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.96",
 ]
 
 [[package]]
@@ -1458,9 +1598,9 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.11"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
+checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
 
 [[package]]
 name = "jobserver"
@@ -1473,10 +1613,11 @@ dependencies = [
 
 [[package]]
 name = "js-sys"
-version = "0.3.70"
+version = "0.3.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
+checksum = "6717b6b5b077764fb5966237269cb3c64edddde4b14ce42647430a78ced9e7b7"
 dependencies = [
+ "once_cell",
  "wasm-bindgen",
 ]
 
@@ -1544,15 +1685,21 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "libc"
-version = "0.2.159"
+version = "0.2.169"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5"
+checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.4.14"
+version = "0.4.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
+checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
+
+[[package]]
+name = "litemap"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104"
 
 [[package]]
 name = "lock_api"
@@ -1566,9 +1713,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.22"
+version = "0.4.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
+checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f"
 dependencies = [
  "serde",
 ]
@@ -1625,7 +1772,7 @@ checksum = "23c9b935fbe1d6cbd1dac857b54a688145e2d93f48db36010514d0f612d0ad67"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.96",
 ]
 
 [[package]]
@@ -1671,11 +1818,10 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
+checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd"
 dependencies = [
- "hermit-abi",
  "libc",
  "wasi",
  "windows-sys 0.52.0",
@@ -1710,7 +1856,7 @@ version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.7.0",
  "cfg-if",
  "cfg_aliases",
  "libc",
@@ -1805,7 +1951,7 @@ version = "0.10.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.7.0",
  "cfg-if",
  "foreign-types",
  "libc",
@@ -1822,7 +1968,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.96",
 ]
 
 [[package]]
@@ -1833,9 +1979,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.103"
+version = "0.9.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6"
+checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741"
 dependencies = [
  "cc",
  "libc",
@@ -1845,9 +1991,9 @@ dependencies = [
 
 [[package]]
 name = "ordered-float"
-version = "4.5.0"
+version = "4.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c65ee1f9701bf938026630b455d5315f490640234259037edb259798b3bcf85e"
+checksum = "7bb71e1b3fa6ca1c61f383464aaf2bb0e2f8e772a1f01d486832464de363b951"
 dependencies = [
  "num-traits",
 ]
@@ -1913,7 +2059,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall 0.5.7",
+ "redox_syscall 0.5.8",
  "smallvec",
  "windows-targets",
 ]
@@ -1982,7 +2128,7 @@ dependencies = [
  "phf_shared",
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.96",
 ]
 
 [[package]]
@@ -1996,9 +2142,9 @@ dependencies = [
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.14"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
+checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
 
 [[package]]
 name = "pin-utils"
@@ -2033,7 +2179,7 @@ dependencies = [
  "dashmap 5.5.3",
  "from_variant",
  "once_cell",
- "semver 1.0.23",
+ "semver 1.0.24",
  "serde",
  "st-map",
  "tracing",
@@ -2041,9 +2187,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.89"
+version = "1.0.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e"
+checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99"
 dependencies = [
  "unicode-ident",
 ]
@@ -2074,7 +2220,7 @@ checksum = "ca414edb151b4c8d125c12566ab0d74dc9cdba36fb80eb7b848c15f495fd32d1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.96",
 ]
 
 [[package]]
@@ -2088,9 +2234,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.37"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
+checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc"
 dependencies = [
  "proc-macro2",
 ]
@@ -2168,11 +2314,11 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.7"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f"
+checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.7.0",
 ]
 
 [[package]]
@@ -2206,9 +2352,9 @@ checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
 [[package]]
 name = "reqwest"
-version = "0.12.9"
+version = "0.12.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f"
+checksum = "43e734407157c3c2034e0258f5e4473ddb361b1e85f95a66690d67264d7cd1da"
 dependencies = [
  "base64 0.22.1",
  "bytes",
@@ -2236,10 +2382,11 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_urlencoded",
- "sync_wrapper 1.0.1",
+ "sync_wrapper",
  "system-configuration",
  "tokio",
  "tokio-native-tls",
+ "tower",
  "tower-service",
  "url",
  "wasm-bindgen",
@@ -2304,22 +2451,22 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.37"
+version = "0.38.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811"
+checksum = "a78891ee6bf2340288408954ac787aa063d8e8817e9f53abb37c695c6d834ef6"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.7.0",
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "rustls"
-version = "0.23.14"
+version = "0.23.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "415d9944693cb90382053259f89fbb077ea730ad7273047ec63b19bc9b160ba8"
+checksum = "5fbb44d7acc4e873d613422379f69f237a1b141928c02f6bc6ccfddddc2d7993"
 dependencies = [
  "once_cell",
  "rustls-pki-types",
@@ -2339,9 +2486,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.9.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e696e35370c65c9c541198af4543ccd580cf17fc25d8e05c5a242b202488c55"
+checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b"
 
 [[package]]
 name = "rustls-webpki"
@@ -2441,7 +2588,7 @@ version = "2.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.7.0",
  "core-foundation",
  "core-foundation-sys",
  "libc",
@@ -2469,9 +2616,9 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.23"
+version = "1.0.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
+checksum = "3cb6eb87a131f756572d7fb904f6e7b68633f09cca868c5df1c4b8d1a694bbba"
 dependencies = [
  "serde",
 ]
@@ -2499,14 +2646,14 @@ checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.96",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.134"
+version = "1.0.135"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d00f4175c42ee48b15416f6193a959ba3a0d67fc699a0db9ad12df9f83991c7d"
+checksum = "2b0d7ba2887406110130a978386c4e1befb98c674b4fba677954e4db976630d9"
 dependencies = [
  "itoa",
  "memchr",
@@ -2630,9 +2777,9 @@ dependencies = [
 
 [[package]]
 name = "socket2"
-version = "0.5.7"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
+checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8"
 dependencies = [
  "libc",
  "windows-sys 0.52.0",
@@ -2700,7 +2847,7 @@ checksum = "710e9696ef338691287aeb937ee6ffe60022f579d3c8d2fd9d58973a9a10a466"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.96",
 ]
 
 [[package]]
@@ -2724,7 +2871,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "swc_macros_common",
- "syn 2.0.85",
+ "syn 2.0.96",
 ]
 
 [[package]]
@@ -2748,7 +2895,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "struct_iterable_internal",
- "syn 2.0.85",
+ "syn 2.0.96",
 ]
 
 [[package]]
@@ -2763,9 +2910,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
 
 [[package]]
 name = "swc"
-version = "9.0.0"
+version = "9.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8ded6be21206da7fb30e245d72373346d72fe095b75354a413b1d2b6bfda0b7"
+checksum = "0314867b5eae2f5fa7844bd68b0d4040737aad49914dceae13e603b4afd8d4a1"
 dependencies = [
  "anyhow",
  "base64 0.21.7",
@@ -2826,9 +2973,9 @@ dependencies = [
 
 [[package]]
 name = "swc_atoms"
-version = "3.0.0"
+version = "3.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "151a6feb82b989a087433baca7f6a6eb4fcf83f828c479eecd039c9312d60e10"
+checksum = "a640bf2e4430a149c87b5eaf377477ce8615ca7cb808054dd20e79e42da5d6ba"
 dependencies = [
  "hstr",
  "once_cell",
@@ -2929,16 +3076,16 @@ dependencies = [
  "proc-macro2",
  "quote",
  "swc_macros_common",
- "syn 2.0.85",
+ "syn 2.0.96",
 ]
 
 [[package]]
 name = "swc_ecma_ast"
-version = "5.0.0"
+version = "5.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94cf86f17358b93fcfe2876a9f0f7a7ebbff94cd6eaab4c809c7a0da1f4b892e"
+checksum = "82f448db2d1c52ffd2bd3788d89cafd8b5a75b97f0dc8aae00874dda2647f6b6"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.7.0",
  "is-macro",
  "num-bigint",
  "phf",
@@ -2953,9 +3100,9 @@ dependencies = [
 
 [[package]]
 name = "swc_ecma_codegen"
-version = "5.0.0"
+version = "5.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb17e77270860f2a975c546c4609e9fa7ae8dbcf85260497e31af19890645800"
+checksum = "7f93692de35a77d920ce8d96a46217735e5f86bf42f76cc8f1a60628c347c4c8"
 dependencies = [
  "memchr",
  "num-bigint",
@@ -2980,7 +3127,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "swc_macros_common",
- "syn 2.0.85",
+ "syn 2.0.96",
 ]
 
 [[package]]
@@ -3194,9 +3341,9 @@ dependencies = [
 
 [[package]]
 name = "swc_ecma_lints"
-version = "6.0.0"
+version = "6.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "808120ab5d77e0c9484f4e1b248d5f9dfecb103160340eab5710f068d69964b1"
+checksum = "0acd3d5633bdc22eb9786e6baf819334ba90162c9c382978945fe93926d9c7eb"
 dependencies = [
  "auto_impl",
  "dashmap 5.5.3",
@@ -3236,9 +3383,9 @@ dependencies = [
 
 [[package]]
 name = "swc_ecma_minifier"
-version = "6.0.1"
+version = "6.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5368ebcf923fb8e94c94f5fe0caa230c7920b72e5d79ed4cc32592c03213b43d"
+checksum = "114c2005290d3a16dd1ced9733a0dd11862b9caf01fe43d6b796d2c9db6b7217"
 dependencies = [
  "arrayvec",
  "indexmap",
@@ -3271,9 +3418,9 @@ dependencies = [
 
 [[package]]
 name = "swc_ecma_parser"
-version = "6.0.0"
+version = "6.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2c361b4153905dc088a6bacfaa944b582305cf94fbfcaa9b3aa61a7dd3adbf9"
+checksum = "b92d3a25349d7f612c38d940f09f9c19c7b7aa3bf4d22fbe31ea44fd5354de02"
 dependencies = [
  "either",
  "new_debug_unreachable",
@@ -3303,7 +3450,7 @@ dependencies = [
  "once_cell",
  "preset_env_base",
  "rustc-hash",
- "semver 1.0.23",
+ "semver 1.0.24",
  "serde",
  "serde_json",
  "st-map",
@@ -3343,7 +3490,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f31557485025a2fd1f833d63601c53010857e45633f44bcc87510f3578bde0c5"
 dependencies = [
  "better_scoped_tls",
- "bitflags 2.6.0",
+ "bitflags 2.7.0",
  "indexmap",
  "once_cell",
  "phf",
@@ -3418,7 +3565,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "swc_macros_common",
- "syn 2.0.85",
+ "syn 2.0.96",
 ]
 
 [[package]]
@@ -3429,7 +3576,7 @@ checksum = "5480053dfa9b7ae34c6d5cdaa33bee3d7dfd33a259cabe9122806f36625912c1"
 dependencies = [
  "Inflector",
  "anyhow",
- "bitflags 2.6.0",
+ "bitflags 2.7.0",
  "indexmap",
  "is-macro",
  "path-clean 1.0.1",
@@ -3553,9 +3700,9 @@ dependencies = [
 
 [[package]]
 name = "swc_ecma_utils"
-version = "6.0.0"
+version = "6.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "527fad9bdb16883782d55291fd3330925b3572f512ef89b3d92a29e2f713fe4f"
+checksum = "8f82c9cd6029741a0ae31191796de31c7db42ad54053dd9ee16db8e8b840378e"
 dependencies = [
  "indexmap",
  "num_cpus",
@@ -3593,7 +3740,7 @@ checksum = "e96e15288bf385ab85eb83cff7f9e2d834348da58d0a31b33bdb572e66ee413e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.96",
 ]
 
 [[package]]
@@ -3629,7 +3776,7 @@ checksum = "a509f56fca05b39ba6c15f3e58636c3924c78347d63853632ed2ffcb6f5a0ac7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.96",
 ]
 
 [[package]]
@@ -3660,7 +3807,7 @@ checksum = "4c78717a841565df57f811376a3d19c9156091c55175e12d378f3a522de70cef"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.96",
 ]
 
 [[package]]
@@ -3678,9 +3825,9 @@ dependencies = [
 
 [[package]]
 name = "swc_typescript"
-version = "5.0.0"
+version = "5.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe778782270111e7152a99af340bf763f12cdc60df775cd0ce51eaa74dcc0249"
+checksum = "78090bda84e8fc330a4c3a1db2551007e0035a92f02f74daed19ef8293087817"
 dependencies = [
  "petgraph",
  "rustc-hash",
@@ -3715,9 +3862,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.85"
+version = "2.0.96"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5023162dfcd14ef8f32034d8bcd4cc5ddc61ef7a247c024a33e24e1f24d21b56"
+checksum = "d5d0adab1ae378d7f53bdebc67a39f1f151407ef230f0ce2883572f5d8985c80"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3726,26 +3873,31 @@ dependencies = [
 
 [[package]]
 name = "sync_wrapper"
-version = "0.1.2"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
-
-[[package]]
-name = "sync_wrapper"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394"
+checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263"
 dependencies = [
  "futures-core",
 ]
 
+[[package]]
+name = "synstructure"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.96",
+]
+
 [[package]]
 name = "system-configuration"
 version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.7.0",
  "core-foundation",
  "system-configuration-sys",
 ]
@@ -3768,12 +3920,13 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
 
 [[package]]
 name = "tempfile"
-version = "3.13.0"
+version = "3.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b"
+checksum = "9a8a559c81686f576e8cd0290cd2a24a2a9ad80c98b3478856500fcbd7acd704"
 dependencies = [
  "cfg-if",
  "fastrand",
+ "getrandom",
  "once_cell",
  "rustix",
  "windows-sys 0.59.0",
@@ -3791,22 +3944,22 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.64"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84"
+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.64"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3"
+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.96",
 ]
 
 [[package]]
@@ -3820,25 +3973,20 @@ dependencies = [
 ]
 
 [[package]]
-name = "tinyvec"
-version = "1.8.0"
+name = "tinystr"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938"
+checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
 dependencies = [
- "tinyvec_macros",
+ "displaydoc",
+ "zerovec",
 ]
 
-[[package]]
-name = "tinyvec_macros"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
-
 [[package]]
 name = "tokio"
-version = "1.42.0"
+version = "1.43.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551"
+checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e"
 dependencies = [
  "backtrace",
  "bytes",
@@ -3854,13 +4002,13 @@ dependencies = [
 
 [[package]]
 name = "tokio-macros"
-version = "2.4.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
+checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.96",
 ]
 
 [[package]]
@@ -3886,9 +4034,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.12"
+version = "0.7.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a"
+checksum = "d7fcaa8d55a2bdd6b83ace262b016eca0d79ee02818c5c1bcdf0305114081078"
 dependencies = [
  "bytes",
  "futures-core",
@@ -3933,14 +4081,14 @@ dependencies = [
 
 [[package]]
 name = "tower"
-version = "0.5.1"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2873938d487c3cfb9aed7546dc9f2711d867c9f90c46b889989a2cb84eba6b4f"
+checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9"
 dependencies = [
  "futures-core",
  "futures-util",
  "pin-project-lite",
- "sync_wrapper 0.1.2",
+ "sync_wrapper",
  "tokio",
  "tower-layer",
  "tower-service",
@@ -3954,7 +4102,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "403fa3b783d4b626a8ad51d766ab03cb6d2dbfc46b1c5d4448395e6628dc9697"
 dependencies = [
  "async-compression",
- "bitflags 2.6.0",
+ "bitflags 2.7.0",
  "bytes",
  "futures-core",
  "http",
@@ -3980,9 +4128,9 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
 
 [[package]]
 name = "tracing"
-version = "0.1.40"
+version = "0.1.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
+checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
 dependencies = [
  "log",
  "pin-project-lite",
@@ -3998,14 +4146,14 @@ checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.96",
 ]
 
 [[package]]
 name = "tracing-core"
-version = "0.1.32"
+version = "0.1.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
+checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c"
 dependencies = [
  "once_cell",
  "valuable",
@@ -4060,12 +4208,6 @@ version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
 
-[[package]]
-name = "unicode-bidi"
-version = "0.3.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893"
-
 [[package]]
 name = "unicode-id"
 version = "0.3.5"
@@ -4080,9 +4222,9 @@ checksum = "2f322b60f6b9736017344fa0635d64be2f458fbc04eef65f6be22976dd1ffd5b"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.13"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
+checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83"
 
 [[package]]
 name = "unicode-linebreak"
@@ -4090,15 +4232,6 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f"
 
-[[package]]
-name = "unicode-normalization"
-version = "0.1.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956"
-dependencies = [
- "tinyvec",
-]
-
 [[package]]
 name = "unicode-width"
 version = "0.1.14"
@@ -4119,15 +4252,27 @@ checksum = "a1a88342087869553c259588a3ec9ca73ce9b2d538b7051ba5789ff236b6c129"
 
 [[package]]
 name = "url"
-version = "2.5.2"
+version = "2.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
+checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60"
 dependencies = [
  "form_urlencoded",
  "idna",
  "percent-encoding",
 ]
 
+[[package]]
+name = "utf16_iter"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
+
+[[package]]
+name = "utf8_iter"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
+
 [[package]]
 name = "utf8parse"
 version = "0.2.2"
@@ -4181,9 +4326,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.93"
+version = "0.2.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
+checksum = "a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -4192,16 +4337,15 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.93"
+version = "0.2.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
+checksum = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79"
 dependencies = [
  "bumpalo",
  "log",
- "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.96",
  "wasm-bindgen-shared",
 ]
 
@@ -4219,9 +4363,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.93"
+version = "0.2.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
+checksum = "2cc6181fd9a7492eef6fef1f33961e3695e4579b9872a6f7c83aee556666d4fe"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -4229,28 +4373,28 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.93"
+version = "0.2.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
+checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.96",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.93"
+version = "0.2.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
+checksum = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6"
 
 [[package]]
 name = "web-sys"
-version = "0.3.70"
+version = "0.3.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0"
+checksum = "04dd7223427d52553d3702c004d3b2fe07c148165faa56313cb00211e31c12bc"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -4408,6 +4552,18 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "write16"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
+
+[[package]]
+name = "writeable"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
+
 [[package]]
 name = "wyz"
 version = "0.5.1"
@@ -4417,6 +4573,30 @@ dependencies = [
  "tap",
 ]
 
+[[package]]
+name = "yoke"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40"
+dependencies = [
+ "serde",
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
+]
+
+[[package]]
+name = "yoke-derive"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.96",
+ "synstructure",
+]
+
 [[package]]
 name = "zerocopy"
 version = "0.7.35"
@@ -4435,7 +4615,28 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.85",
+ "syn 2.0.96",
+]
+
+[[package]]
+name = "zerofrom"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e"
+dependencies = [
+ "zerofrom-derive",
+]
+
+[[package]]
+name = "zerofrom-derive"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.96",
+ "synstructure",
 ]
 
 [[package]]
@@ -4444,6 +4645,28 @@ version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
 
+[[package]]
+name = "zerovec"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
+dependencies = [
+ "yoke",
+ "zerofrom",
+ "zerovec-derive",
+]
+
+[[package]]
+name = "zerovec-derive"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.96",
+]
+
 [[package]]
 name = "zstd"
 version = "0.13.2"
diff --git a/Cargo.toml b/Cargo.toml
index b35e6c734..5955bcc61 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-allocative = "0.3.3"
+allocative = "0.3.4"
 axum = "0.7.9"
 bincode = { git = "https://github.com/bincode-org/bincode.git", features = [
     "serde",
@@ -14,26 +14,26 @@ bincode = { git = "https://github.com/bincode-org/bincode.git", features = [
 bitcoin_hashes = { version = "0.15.0" }
 biter = { path = "./src/crates/biter" }
 chrono = { version = "0.4.39", features = ["serde"] }
-clap = { version = "4.5.23", features = ["derive"] }
+clap = { version = "4.5.26", features = ["derive"] }
 color-eyre = "0.6.3"
 ctrlc = { version = "3.4.5", features = ["termination"] }
 derive_deref = "1.1.1"
-env_logger = "0.11.5"
-inferno = "0.12.0"
+env_logger = "0.11.6"
+inferno = "0.12.1"
 itertools = "0.13.0"
-log = { version = "0.4.22", features = ["std", "serde"] }
-ordered-float = "4.5.0"
+log = { version = "0.4.25", features = ["std", "serde"] }
+ordered-float = "4.6.0"
 rayon = "1.10.0"
 regex = "1.11.1"
-reqwest = { version = "0.12.9", features = ["blocking", "json"] }
+reqwest = { version = "0.12.12", features = ["blocking", "json"] }
 rlimit = "0.10.2"
 snkrj = { path = "./src/crates/snkrj" }
-serde = { version = "1.0.216", features = ["derive"] }
-serde_json = "1.0.133"
+serde = { version = "1.0.217", features = ["derive"] }
+serde_json = "1.0.135"
 struct_iterable = { path = "./src/crates/iterable" }
-swc = "9.0.0"
+swc = "9.0.2"
 swc_common = "5.0.0"
-tokio = { version = "1.42.0", features = ["full"] }
+tokio = { version = "1.43.0", features = ["full"] }
 toml = "0.8.19"
 tower-http = { version = "0.6.2", features = ["compression-full"] }
 zstd = "0.13.2"
diff --git a/src/crates/bindex/Cargo.lock b/src/crates/bindex/Cargo.lock
index 82340f639..5ed126848 100644
--- a/src/crates/bindex/Cargo.lock
+++ b/src/crates/bindex/Cargo.lock
@@ -17,6 +17,25 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
+[[package]]
+name = "ahash"
+version = "0.8.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
+dependencies = [
+ "cfg-if",
+ "getrandom",
+ "once_cell",
+ "version_check",
+ "zerocopy",
+]
+
+[[package]]
+name = "allocator-api2"
+version = "0.2.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
+
 [[package]]
 name = "arrayvec"
 version = "0.7.6"
@@ -67,17 +86,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d965446196e3b7decd44aa7ee49e31d630118f90ef12f97900f262eb915c951d"
 
 [[package]]
-name = "bitbase"
+name = "bindex"
 version = "0.1.0"
 dependencies = [
  "bitcoin_hashes 0.16.0",
  "biter",
+ "canopydb",
  "color-eyre",
  "ctrlc",
  "derive_deref",
- "fjall",
  "memmap2",
  "rayon",
+ "snkrj",
 ]
 
 [[package]]
@@ -198,6 +218,12 @@ dependencies = [
  "serde_json",
 ]
 
+[[package]]
+name = "bitflags"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
 [[package]]
 name = "bitflags"
 version = "2.6.0"
@@ -210,6 +236,37 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
+[[package]]
+name = "canopydb"
+version = "0.1.0"
+source = "git+https://github.com/arthurprs/canopydb#daab91758a7905abc2a7d1a9c7e9f6c41227e72b"
+dependencies = [
+ "bitflags 2.6.0",
+ "dashmap",
+ "derive_more",
+ "fail",
+ "foldhash",
+ "fslock",
+ "hashbrown",
+ "libc",
+ "lock_api",
+ "log",
+ "lz4_flex",
+ "memmap2",
+ "nix",
+ "parking_lot 0.12.3",
+ "quick_cache",
+ "rand",
+ "serde",
+ "serde_json",
+ "smallvec 2.0.0-alpha.9",
+ "sptr",
+ "tempfile",
+ "triomphe",
+ "xxhash-rust",
+ "zerocopy",
+]
+
 [[package]]
 name = "cc"
 version = "1.2.4"
@@ -308,16 +365,6 @@ dependencies = [
  "crossbeam-utils",
 ]
 
-[[package]]
-name = "crossbeam-skiplist"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df29de440c58ca2cc6e587ec3d22347551a32435fbde9d2bff64e78a9ffa151b"
-dependencies = [
- "crossbeam-epoch",
- "crossbeam-utils",
-]
-
 [[package]]
 name = "crossbeam-utils"
 version = "0.8.21"
@@ -345,7 +392,7 @@ dependencies = [
  "hashbrown",
  "lock_api",
  "once_cell",
- "parking_lot_core",
+ "parking_lot_core 0.9.10",
 ]
 
 [[package]]
@@ -359,6 +406,27 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "derive_more"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05"
+dependencies = [
+ "derive_more-impl",
+]
+
+[[package]]
+name = "derive_more-impl"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.95",
+ "unicode-xid",
+]
+
 [[package]]
 name = "derived-deref"
 version = "2.1.0"
@@ -370,30 +438,12 @@ dependencies = [
  "syn 2.0.95",
 ]
 
-[[package]]
-name = "double-ended-peekable"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0d05e1c0dbad51b52c38bda7adceef61b9efc2baf04acfe8726a8c4630a6f57"
-
 [[package]]
 name = "either"
 version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
 
-[[package]]
-name = "enum_dispatch"
-version = "0.3.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa18ce2bc66555b3218614519ac839ddb759a7d6720732f979ef8d13be147ecd"
-dependencies = [
- "once_cell",
- "proc-macro2",
- "quote",
- "syn 2.0.95",
-]
-
 [[package]]
 name = "equivalent"
 version = "1.0.1"
@@ -420,6 +470,17 @@ dependencies = [
  "once_cell",
 ]
 
+[[package]]
+name = "fail"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fe5e43d0f78a42ad591453aedb1d7ae631ce7ee445c7643691055a9ed8d3b01c"
+dependencies = [
+ "log",
+ "once_cell",
+ "rand",
+]
+
 [[package]]
 name = "fastrand"
 version = "2.3.0"
@@ -427,19 +488,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
 
 [[package]]
-name = "fjall"
-version = "2.5.0"
+name = "foldhash"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80910a26e4fb5e5393ff64d293602ac1ade56cf4d14d244c02a7d4ddcd5f10bc"
+checksum = "a0d2fde1f7b3d48b8395d5f2de76c18a528bd6a9cdde438df747bfcba3e05d6f"
+
+[[package]]
+name = "fs2"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213"
 dependencies = [
- "byteorder",
- "dashmap",
- "log",
- "lsm-tree",
- "path-absolutize",
- "std-semaphore",
- "tempfile",
- "xxhash-rust",
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "fslock"
+version = "0.2.1"
+source = "git+https://github.com/arthurprs/fslock.git?rev=7ec91154136a2b3d567b1f79e87cae5d3ca3d927#7ec91154136a2b3d567b1f79e87cae5d3ca3d927"
+dependencies = [
+ "libc",
+ "winapi",
 ]
 
 [[package]]
@@ -459,17 +529,15 @@ version = "0.28.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
 
-[[package]]
-name = "guardian"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "493913a18c0d7bebb75127a26a432162c59edbe06f6cf712001e3e769345e8b5"
-
 [[package]]
 name = "hashbrown"
 version = "0.14.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+dependencies = [
+ "ahash",
+ "allocator-api2",
+]
 
 [[package]]
 name = "hex-conservative"
@@ -501,6 +569,15 @@ version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683"
 
+[[package]]
+name = "instant"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
+dependencies = [
+ "cfg-if",
+]
+
 [[package]]
 name = "itoa"
 version = "1.0.14"
@@ -533,9 +610,9 @@ checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.4.14"
+version = "0.4.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
+checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
 
 [[package]]
 name = "lock_api"
@@ -553,29 +630,6 @@ version = "0.4.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
 
-[[package]]
-name = "lsm-tree"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d858efa63a32a286a06aa3968f3ed09811d556697e9f9804aa72ea679ed3b83"
-dependencies = [
- "byteorder",
- "crossbeam-skiplist",
- "double-ended-peekable",
- "enum_dispatch",
- "guardian",
- "log",
- "lz4_flex",
- "path-absolutize",
- "quick_cache",
- "rustc-hash",
- "self_cell",
- "tempfile",
- "value-log",
- "varint-rs",
- "xxhash-rust",
-]
-
 [[package]]
 name = "lz4_flex"
 version = "0.11.3"
@@ -597,12 +651,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "min-max-heap"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2687e6cf9c00f48e9284cf9fd15f2ef341d03cc7743abf9df4c5f07fdee50b18"
-
 [[package]]
 name = "miniz_oxide"
 version = "0.7.4"
@@ -629,7 +677,7 @@ version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
 dependencies = [
- "bitflags",
+ "bitflags 2.6.0",
  "cfg-if",
  "cfg_aliases",
  "libc",
@@ -656,6 +704,41 @@ version = "3.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f"
 
+[[package]]
+name = "parking_lot"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
+dependencies = [
+ "instant",
+ "lock_api",
+ "parking_lot_core 0.8.6",
+]
+
+[[package]]
+name = "parking_lot"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
+dependencies = [
+ "lock_api",
+ "parking_lot_core 0.9.10",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc"
+dependencies = [
+ "cfg-if",
+ "instant",
+ "libc",
+ "redox_syscall 0.2.16",
+ "smallvec 1.13.2",
+ "winapi",
+]
+
 [[package]]
 name = "parking_lot_core"
 version = "0.9.10"
@@ -664,29 +747,11 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall",
- "smallvec",
+ "redox_syscall 0.5.8",
+ "smallvec 1.13.2",
  "windows-targets",
 ]
 
-[[package]]
-name = "path-absolutize"
-version = "3.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4af381fe79fa195b4909485d99f73a80792331df0625188e707854f0b3383f5"
-dependencies = [
- "path-dedot",
-]
-
-[[package]]
-name = "path-dedot"
-version = "3.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07ba0ad7e047712414213ff67533e6dd477af0a4e1d14fb52343e53d30ea9397"
-dependencies = [
- "once_cell",
-]
-
 [[package]]
 name = "pin-project-lite"
 version = "0.2.15"
@@ -717,8 +782,10 @@ version = "0.6.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7d7c94f8935a9df96bb6380e8592c70edf497a643f94bd23b2f76b399385dbf4"
 dependencies = [
+ "ahash",
  "equivalent",
  "hashbrown",
+ "parking_lot 0.12.3",
 ]
 
 [[package]]
@@ -780,13 +847,22 @@ dependencies = [
  "crossbeam-utils",
 ]
 
+[[package]]
+name = "redox_syscall"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
+dependencies = [
+ "bitflags 1.3.2",
+]
+
 [[package]]
 name = "redox_syscall"
 version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834"
 dependencies = [
- "bitflags",
+ "bitflags 2.6.0",
 ]
 
 [[package]]
@@ -795,19 +871,13 @@ version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
 
-[[package]]
-name = "rustc-hash"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7fb8039b3032c191086b10f11f319a6e99e1e82889c5cc6046f515c9db1d497"
-
 [[package]]
 name = "rustix"
-version = "0.38.42"
+version = "0.38.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93dc38ecbab2eb790ff964bb77fa94faf256fd3e73285fd7ba0903b76bedb85"
+checksum = "a78891ee6bf2340288408954ac787aa063d8e8817e9f53abb37c695c6d834ef6"
 dependencies = [
- "bitflags",
+ "bitflags 2.6.0",
  "errno",
  "libc",
  "linux-raw-sys",
@@ -820,6 +890,27 @@ version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
 
+[[package]]
+name = "sanakirja"
+version = "1.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81aaf70d064e2122209f04d01fd91e8908e7a327b516236e1cbc0c3f34ac6d11"
+dependencies = [
+ "fs2",
+ "log",
+ "memmap2",
+ "parking_lot 0.11.2",
+ "sanakirja-core",
+ "serde",
+ "thiserror",
+]
+
+[[package]]
+name = "sanakirja-core"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8376db34ae3eac6e7bd91168bc638450073b708ce9fb46940de676f552238bf5"
+
 [[package]]
 name = "scopeguard"
 version = "1.2.0"
@@ -847,12 +938,6 @@ dependencies = [
  "cc",
 ]
 
-[[package]]
-name = "self_cell"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2fdfc24bc566f839a2da4c4295b82db7d25a24253867d5c64355abb5799bdbe"
-
 [[package]]
 name = "serde"
 version = "1.0.216"
@@ -907,10 +992,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
-name = "std-semaphore"
-version = "0.1.0"
+name = "smallvec"
+version = "2.0.0-alpha.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33ae9eec00137a8eed469fb4148acd9fc6ac8c3f9b110f52cd34698c8b5bfa0e"
+checksum = "5e22442b16a0c1bfae679ffed8ec5e160ae2aa8495cea891f0d2ff7b84fe5c4c"
+
+[[package]]
+name = "snkrj"
+version = "0.1.1"
+dependencies = [
+ "sanakirja",
+]
+
+[[package]]
+name = "sptr"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b9b39299b249ad65f3b7e96443bad61c02ca5cd3589f46cb6d610a0fd6c0d6a"
 
 [[package]]
 name = "syn"
@@ -936,17 +1034,38 @@ dependencies = [
 
 [[package]]
 name = "tempfile"
-version = "3.14.0"
+version = "3.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c"
+checksum = "9a8a559c81686f576e8cd0290cd2a24a2a9ad80c98b3478856500fcbd7acd704"
 dependencies = [
  "cfg-if",
  "fastrand",
+ "getrandom",
  "once_cell",
  "rustix",
  "windows-sys",
 ]
 
+[[package]]
+name = "thiserror"
+version = "1.0.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.95",
+]
+
 [[package]]
 name = "thread_local"
 version = "1.1.8"
@@ -998,12 +1117,24 @@ dependencies = [
  "tracing-core",
 ]
 
+[[package]]
+name = "triomphe"
+version = "0.1.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef8f7726da4807b58ea5c96fdc122f80702030edc33b35aff9190a51148ccc85"
+
 [[package]]
 name = "unicode-ident"
 version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83"
 
+[[package]]
+name = "unicode-xid"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
+
 [[package]]
 name = "valuable"
 version = "0.1.0"
@@ -1011,26 +1142,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
 
 [[package]]
-name = "value-log"
-version = "1.4.1"
+name = "version_check"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f90495556d09c3026f7f3897f8a7db59c8c701082e32dcf58c2319062ae1eb0"
-dependencies = [
- "byteorder",
- "log",
- "min-max-heap",
- "path-absolutize",
- "quick_cache",
- "rustc-hash",
- "tempfile",
- "xxhash-rust",
-]
-
-[[package]]
-name = "varint-rs"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f54a172d0620933a27a4360d3db3e2ae0dd6cceae9730751a036bbf182c4b23"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
 
 [[package]]
 name = "wasi"
@@ -1038,6 +1153,28 @@ version = "0.11.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
 [[package]]
 name = "windows-sys"
 version = "0.59.0"
diff --git a/src/crates/bindex/Cargo.toml b/src/crates/bindex/Cargo.toml
index a180c716f..705d3ed4c 100644
--- a/src/crates/bindex/Cargo.toml
+++ b/src/crates/bindex/Cargo.toml
@@ -9,6 +9,7 @@ biter = "0.2.2"
 color-eyre = "0.6.3"
 ctrlc = "3.4.5"
 derive_deref = "1.1.1"
-fjall = "2.5.0"
 memmap2 = "0.9.5"
 rayon = "1.10.0"
+snkrj = { path = "../snkrj" }
+canopydb = { git = "https://github.com/arthurprs/canopydb" }
diff --git a/src/crates/bindex/src/main.rs b/src/crates/bindex/src/main.rs
index b99ecf268..0746a4aba 100644
--- a/src/crates/bindex/src/main.rs
+++ b/src/crates/bindex/src/main.rs
@@ -14,11 +14,10 @@ use biter::{
 mod structs;
 
 use color_eyre::eyre::{eyre, ContextCompat};
-use fjall::{PersistMode, Slice, TransactionalKeyspace, WriteTransaction};
 use rayon::prelude::*;
 use structs::{
     Addressbytes, AddressbytesPrefix, Addressindex, Addressindextxoutindex, Addresstype, Addresstypeindex, Amount,
-    AnyVecdisk, BlockHashPrefix, Exit, Height, Partitions, TxidPrefix, Txindex, Txindexvout, Txoutindex, Vecdisks,
+    AnyVecdisk, BlockHashPrefix, Databases, Exit, Height, TxidPrefix, Txindex, Txindexvout, Txoutindex, Vecdisks,
 };
 
 // https://github.com/fjall-rs/fjall/discussions/72
@@ -30,6 +29,8 @@ enum TxInOrAddressindextoutindex<'a> {
     Addressindextoutindex(Addressindextxoutindex),
 }
 
+const MONTHLY_BLOCK_TARGET: usize = 144 * 30;
+
 fn main() -> color_eyre::Result<()> {
     let i = std::time::Instant::now();
 
@@ -45,13 +46,9 @@ fn main() -> color_eyre::Result<()> {
 
     let mut vecdisks = Vecdisks::import(path_database)?;
 
-    let keyspace = fjall::Config::new(path_database).open_transactional()?;
+    let databases = Databases::open(path_database)?;
 
-    let parts = Partitions::import(&keyspace, &exit)?;
-
-    let wtx = keyspace.write_tx();
-
-    let mut height = parts.start_height();
+    let mut height = Height::from(0_u32);
 
     let mut txindex = vecdisks
         .height_to_first_txindex
@@ -71,24 +68,17 @@ fn main() -> color_eyre::Result<()> {
         .cloned()
         .unwrap_or(Addressindex::default());
 
-    let export = |keyspace: &TransactionalKeyspace,
-                  mut wtx: WriteTransaction,
-                  parts: &Partitions,
-                  vecdisks: &mut Vecdisks,
-                  height: Height|
-     -> color_eyre::Result<()> {
-        parts.udpate_meta(&mut wtx, height);
+    let export = |databases: Databases, vecdisks: &mut Vecdisks, height: Height| -> color_eyre::Result<()> {
         exit.block();
         println!("Exporting...");
-        wtx.commit()?;
-        keyspace.persist(PersistMode::SyncAll)?;
+        databases.export();
         vecdisks.flush()?;
         println!("Export done");
         exit.unblock();
         Ok(())
     };
 
-    let mut wtx_opt = Some(wtx);
+    let mut databases_opt = Some(databases);
 
     biter::new(data_dir, Some(height.into()), Some(400_000), rpc)
         .iter()
@@ -97,7 +87,7 @@ fn main() -> color_eyre::Result<()> {
 
             height = Height::from(_height);
 
-            let mut wtx = wtx_opt.take().context("option should have wtx")?;
+            let mut databases = databases_opt.take().context("option should have wtx")?;
 
             // if let Some(saved_blockhash) = vecdisks.height_to_blockhash.get(height)? {
             //     if &blockhash != saved_blockhash {
@@ -108,22 +98,21 @@ fn main() -> color_eyre::Result<()> {
             //     }
             // }
 
-            if parts.blockhash_prefix_to_height.needs(height) {
-                let blockhash_prefix = BlockHashPrefix::from(&blockhash);
+            // if parts.blockhash_prefix_to_height.needs(height) {
+            let blockhash_prefix = BlockHashPrefix::try_from(&blockhash)?;
 
-                if check_collisions {
-
-                    if let Some(prev_height_slice) =
-                        wtx.get(parts.blockhash_prefix_to_height.data(), blockhash_prefix.clone())?
-                    {
-                        dbg!(blockhash, Height::try_from(prev_height_slice)?);
-                        return Err(eyre!("Collision, expect prefix to need be set yet"));
-                    }
+            if check_collisions {
+                if let Some(prev_height) =
+                    databases.blockhash_prefix_to_height.get(&blockhash_prefix)
+                {
+                    dbg!(blockhash, prev_height);
+                    return Err(eyre!("Collision, expect prefix to need be set yet"));
                 }
-
-                wtx.insert(parts.blockhash_prefix_to_height.data(), blockhash_prefix.clone(),Slice::from(height));
             }
 
+            databases.blockhash_prefix_to_height.insert(blockhash_prefix,height);
+            // }
+
             vecdisks.height_to_blockhash.push_if_needed(height, blockhash)?;
             vecdisks.height_to_first_txindex.push_if_needed(height, txindex)?;
             vecdisks.height_to_first_txoutindex.push_if_needed(height, txoutindex)?;
@@ -152,14 +141,16 @@ fn main() -> color_eyre::Result<()> {
                     .map(|(index, tx)| -> color_eyre::Result<_> {
                         let txid = tx.compute_txid();
 
+                        let txid_prefix = TxidPrefix::try_from(&txid)?;
+
                         let prev_txindex_slice_opt = if check_collisions {
                             // Should only find collisions for two txids (duplicates), see below
-                            wtx.get(parts.txid_prefix_to_txindex.data(), TxidPrefix::from(&txid).clone())?.map(Txindex::try_from)
+                            databases.txid_prefix_to_txindex.get(&txid_prefix).cloned()
                         } else {
                             None
                         };
 
-                        Ok((TxidPrefix::from(&txid), (txid, Txindex::from(index), prev_txindex_slice_opt)))
+                        Ok((txid_prefix, (txid, Txindex::from(index), prev_txindex_slice_opt)))
                     })
                     .try_fold(
                         BTreeMap::new,
@@ -190,26 +181,24 @@ fn main() -> color_eyre::Result<()> {
                             let txid = outpoint.txid;
                             let vout = outpoint.vout;
 
-                            let txindex_local = if let Some(txindex_local) = wtx
-                                .get(parts.txid_prefix_to_txindex.data(), TxidPrefix::from(&txid).clone())?
-                                .map(Txindex::try_from)
+                            let txindex_local = if let Some(txindex_local) = databases.txid_prefix_to_txindex
+                                .get(&TxidPrefix::try_from(&txid)?)
                             {
-                                txindex_local
+                                *txindex_local
                             } else {
                                 return Ok(TxInOrAddressindextoutindex::TxIn(txin));
-                            }?;
+                            };
 
                             let txindexvout = Txindexvout::from((txindex_local, vout));
 
-                            let txoutindex = Txoutindex::try_from(
-                                wtx.get(parts.txindexvout_to_txoutindex.data(), Slice::from(txindexvout))?
+                            let txoutindex =
+                                *databases.txindexvout_to_txoutindex.get(&txindexvout)
                                     .context("Expect txoutindex to not be none")
                                     .inspect_err(|_| {
                                         // let height = vecdisks.txindex_to_height.get(txindex.into()).expect("txindex_to_height get not fail")
                                         // .expect("Expect height for txindex");
                                         dbg!(outpoint.txid, txindex_local, vout, txindexvout);
-                                    })?,
-                            )?;
+                                    })?;
 
                             let addressindex = *vecdisks.txoutindex_to_addressindex.get(txoutindex)?
                                 .context("Expect addressindex to not be none")
@@ -229,9 +218,10 @@ fn main() -> color_eyre::Result<()> {
                             |mut vec, addressindextxoutindex| {
                                 // There is no need to check for bad_tx as there are only 2 instances known
                                 // Which you can find below and which are coinbase tx and thus which are already filtered
-                                if parts.addressindextxoutindex_out.needs(height) {
+
+                                // if parts.addressindextxoutindex_out.needs(height) {
                                     vec.push(addressindextxoutindex?);
-                                }
+                                // }
 
                                 Ok(vec)
                             },
@@ -248,7 +238,7 @@ fn main() -> color_eyre::Result<()> {
                 });
 
                 let txoutindex_to_txout_addresstype_addressbytes_res_addressindex_opt_handle = scope.spawn(|| -> color_eyre::Result<BTreeMap<Txoutindex,
-                (&TxOut, Txindexvout, Addresstype, color_eyre::Result<Addressbytes>, Option<Slice>)>> {
+                (&TxOut, Txindexvout, Addresstype, color_eyre::Result<Addressbytes>, Option<Addressindex>)>> {
                     outputs.into_par_iter().enumerate()
                         .map(
                             |(block_txoutindex, (block_txindex, vout, txout))| {
@@ -265,24 +255,18 @@ fn main() -> color_eyre::Result<()> {
                                 });
 
                                 let addressindex_slice_opt = addressbytes_res.as_ref().ok().and_then(|addressbytes| {
-                                    let prefix = AddressbytesPrefix::from(addressbytes);
-                                    wtx.get(
-                                        parts.addressbytes_prefix_to_addressindex.data(),
-                                        prefix.clone(),
-                                    )
-                                    .ok()
-                                    .and_then(|s| s)
+                                    databases.addressbytes_prefix_to_addressindex.get(
+                                        &AddressbytesPrefix::try_from(addressbytes).unwrap(),
+                                    ).cloned()
                                 });
 
                                 let is_new_address = addressindex_slice_opt.is_none();
 
                                 if check_collisions && is_new_address {
                                     if let Ok(addressbytes) = &addressbytes_res {
-                                        let prefix = AddressbytesPrefix::from(addressbytes);
-                                        if let Some(prev) = wtx.get(
-                                            parts.addressbytes_prefix_to_addressindex.data(),
-                                            prefix.clone(),
-                                        )? {
+                                        if let Some(prev) = databases.addressbytes_prefix_to_addressindex.get(
+                                            &AddressbytesPrefix::try_from(addressbytes)?,
+                                        ) {
                                             dbg!(prev);
                                             return Err(eyre!("addressbytes_prefix_to_addressindex collision, expect none"));
                                         }
@@ -327,16 +311,15 @@ fn main() -> color_eyre::Result<()> {
 
             txoutindex_to_txout_addresstype_addressbytes_res_addressindex_opt
                 .into_iter()
-                .try_for_each(|(txoutindex, (txout, txindexvout, addresstype, addressbytes_res, addressindex_slice_opt))| -> color_eyre::Result<()> {
+                .try_for_each(|(txoutindex, (txout, txindexvout, addresstype, addressbytes_res, addressindex_opt))| -> color_eyre::Result<()> {
                     let amount = Amount::from(txout.value);
 
-                    if parts.txindexvout_to_txoutindex.needs(height) {
-                        wtx.insert(
-                            parts.txindexvout_to_txoutindex.data(),
-                            Slice::from(txindexvout),
-                            Slice::from(txoutindex),
+                    // if parts.txindexvout_to_txoutindex.needs(height) {
+                        databases.txindexvout_to_txoutindex.insert(
+                            txindexvout,
+                            txoutindex,
                         );
-                    }
+                    // }
 
                     vecdisks.txoutindex_to_amount.push_if_needed(
                         txoutindex,
@@ -345,8 +328,8 @@ fn main() -> color_eyre::Result<()> {
 
                     let mut addressindex_local = addressindex;
 
-                    if let Some(addressindex_slice) = addressindex_slice_opt {
-                        addressindex_local = Addressindex::try_from(addressindex_slice)?;
+                    if let Some(addressindex) = addressindex_opt {
+                        addressindex_local = addressindex;
                     } else {
                         vecdisks.addressindex_to_addresstype.push_if_needed(addressindex_local, addresstype)?;
 
@@ -356,13 +339,12 @@ fn main() -> color_eyre::Result<()> {
                         vecdisks.addressindex_to_addresstypeindex.push_if_needed(addressindex_local, addresstypeindex)?;
 
                         if let Ok(addressbytes) = addressbytes_res {
-                            if parts.addressbytes_prefix_to_addressindex.needs(height) {
-                                wtx.insert(
-                                    parts.addressbytes_prefix_to_addressindex.data(),
-                                    AddressbytesPrefix::from(&addressbytes).clone(),
-                                    Slice::from(addressindex_local),
+                            // if parts.addressbytes_prefix_to_addressindex.needs(height) {
+                                databases.addressbytes_prefix_to_addressindex.insert(
+                                    AddressbytesPrefix::try_from(&addressbytes)?,
+                                    addressindex_local,
                                 );
-                            }
+                            // }
 
                             vecdisks.push_addressbytes_if_needed(addresstypeindex, addressbytes)?;
                         }
@@ -377,19 +359,18 @@ fn main() -> color_eyre::Result<()> {
                         addressindex_local,
                     )?;
 
-                    if parts.addressindextxoutindex_in.needs(height) {
+                    // if parts.addressindextxoutindex_in.needs(height) {
                         let addressindextxoutindex = Addressindextxoutindex::from((addressindex_local, txoutindex));
-                        wtx.insert(
-                            parts.addressindextxoutindex_in.data(),
-                            Slice::from(addressindextxoutindex),
-                            Slice::from(&[]),
+                        databases.addressindextxoutindex_in.insert(
+                            addressindextxoutindex,
+                           (),
                         );
-                    }
+                    // }
 
                     Ok(())
                 })?;
 
-            if parts.addressindextxoutindex_out.needs(height) {
+            // if parts.addressindextxoutindex_out.needs(height) {
                 txin_or_addressindextxoutindex_vec
                 .into_iter()
                 .map(|txin_or_addressindextxoutindex| -> color_eyre::Result<Addressindextxoutindex> {
@@ -400,7 +381,7 @@ fn main() -> color_eyre::Result<()> {
                             let txid = outpoint.txid;
                             let vout = outpoint.vout;
                             let index = txid_prefix_to_txid_and_block_txindex_and_prev_txindex
-                                .get(&TxidPrefix::from(&txid))
+                                .get(&TxidPrefix::try_from(&txid)?)
                                 .context("txid should be in same block")?.1;
                             let txindex_local = txindex + index;
 
@@ -415,14 +396,13 @@ fn main() -> color_eyre::Result<()> {
                     }
                 })
                 .try_for_each(|addressindextxoutindex| -> color_eyre::Result<()> {
-                    wtx.insert(
-                        parts.addressindextxoutindex_out.data(),
-                        Slice::from(addressindextxoutindex?),
-                        Slice::from(&[]),
+                    databases.addressindextxoutindex_out.insert(
+                        addressindextxoutindex?,
+                        (),
                     );
                     Ok(())
                 })?;
-            }
+            // }
 
             drop(new_txindexvout_to_addressindextxoutindex);
 
@@ -436,13 +416,11 @@ fn main() -> color_eyre::Result<()> {
 
                     match prev_txindex_opt {
                         None => {
-                            if parts.txid_prefix_to_txindex.needs(height) {
-                                wtx.insert(parts.txid_prefix_to_txindex.data(), txid_prefix.clone(), Slice::from(txindex_local));
-                            }
+                            // if parts.txid_prefix_to_txindex.needs(height) {
+                            databases.txid_prefix_to_txindex.insert(txid_prefix, txindex_local);
+                            // }
                         }
-                        Some(prev_txindex_res) => {
-                            let prev_txindex = prev_txindex_res?;
-
+                        Some(prev_txindex) => {
                             // In case if we start at an already parsed height
                             if txindex_local == prev_txindex {
                                 return Ok(())
@@ -487,12 +465,12 @@ fn main() -> color_eyre::Result<()> {
             vecdisks.height_to_last_txoutindex.push_if_needed(height, txoutindex.decremented())?;
             vecdisks.height_to_last_addressindex.push_if_needed(height, addressindex.decremented())?;
 
-            let should_snapshot = _height % 100 == 0 && !exit.active();
+            let should_snapshot = _height % MONTHLY_BLOCK_TARGET == 0 && !exit.active();
             if should_snapshot {
-                export(&keyspace, wtx, &parts, &mut vecdisks, height)?;
-                wtx_opt.replace(keyspace.write_tx());
+                export(databases, &mut vecdisks, height)?;
+                databases_opt.replace(Databases::open(path_database)?);
             } else {
-                wtx_opt.replace(wtx);
+                databases_opt.replace(databases);
             }
 
             txindex += Txindex::from(tx_len);
@@ -505,8 +483,8 @@ fn main() -> color_eyre::Result<()> {
 
     pause();
 
-    let wtx = wtx_opt.take().context("option should have wtx")?;
-    export(&keyspace, wtx, &parts, &mut vecdisks, height)?;
+    let databases = databases_opt.take().context("option should have wtx")?;
+    export(databases, &mut vecdisks, height)?;
 
     pause();
 
diff --git a/src/crates/bindex/src/structs/addressindex.rs b/src/crates/bindex/src/structs/addressindex.rs
index a5d2c9774..7da1b22c0 100644
--- a/src/crates/bindex/src/structs/addressindex.rs
+++ b/src/crates/bindex/src/structs/addressindex.rs
@@ -1,10 +1,9 @@
 use derive_deref::{Deref, DerefMut};
-use fjall::Slice;
-
-use super::SliceExtended;
+use snkrj::{direct_repr, Storable, UnsizedStorable};
 
 #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Deref, DerefMut, Default)]
 pub struct Addressindex(u32);
+direct_repr!(Addressindex);
 
 impl Addressindex {
     pub const BYTES: usize = size_of::<Self>();
@@ -49,21 +48,3 @@ impl From<Addressindex> for usize {
         value.0 as usize
     }
 }
-
-impl TryFrom<Slice> for Addressindex {
-    type Error = color_eyre::Report;
-    fn try_from(value: Slice) -> Result<Self, Self::Error> {
-        Self::try_from(&value[..])
-    }
-}
-impl TryFrom<&[u8]> for Addressindex {
-    type Error = color_eyre::Report;
-    fn try_from(value: &[u8]) -> Result<Self, Self::Error> {
-        Ok(Self::from(value.read_be_u32()?))
-    }
-}
-impl From<Addressindex> for Slice {
-    fn from(value: Addressindex) -> Self {
-        value.to_be_bytes().into()
-    }
-}
diff --git a/src/crates/bindex/src/structs/addressindextxoutindex.rs b/src/crates/bindex/src/structs/addressindextxoutindex.rs
index cc89164b1..aa07e3bec 100644
--- a/src/crates/bindex/src/structs/addressindextxoutindex.rs
+++ b/src/crates/bindex/src/structs/addressindextxoutindex.rs
@@ -1,12 +1,13 @@
-use fjall::Slice;
+use snkrj::{direct_repr, Storable, UnsizedStorable};
 
 use super::{Addressindex, Txoutindex};
 
-#[derive(Debug)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
 pub struct Addressindextxoutindex {
     addressindex: Addressindex,
     txoutindex: Txoutindex,
 }
+direct_repr!(Addressindextxoutindex);
 
 impl From<(Addressindex, Txoutindex)> for Addressindextxoutindex {
     fn from(value: (Addressindex, Txoutindex)) -> Self {
@@ -16,23 +17,3 @@ impl From<(Addressindex, Txoutindex)> for Addressindextxoutindex {
         }
     }
 }
-
-impl From<Addressindextxoutindex> for Slice {
-    fn from(value: Addressindextxoutindex) -> Self {
-        let addressindex_slice = Self::from(value.addressindex);
-        let txindexvout_slice = Self::from(value.txoutindex);
-        Self::from([addressindex_slice, txindexvout_slice].concat())
-    }
-}
-impl TryFrom<Slice> for Addressindextxoutindex {
-    type Error = color_eyre::Report;
-    fn try_from(value: Slice) -> Result<Self, Self::Error> {
-        let addressindex = Addressindex::try_from(&value[..Addressindex::BYTES])?;
-        let txindexvout = Txoutindex::try_from(&value[Addressindex::BYTES..])?;
-
-        Ok(Self {
-            addressindex,
-            txoutindex: txindexvout,
-        })
-    }
-}
diff --git a/src/crates/bindex/src/structs/addresstypeindex.rs b/src/crates/bindex/src/structs/addresstypeindex.rs
index 15c2f4ba3..a2ca0e5de 100644
--- a/src/crates/bindex/src/structs/addresstypeindex.rs
+++ b/src/crates/bindex/src/structs/addresstypeindex.rs
@@ -1,10 +1,9 @@
 use derive_deref::{Deref, DerefMut};
-use fjall::Slice;
-
-use super::SliceExtended;
+use snkrj::{direct_repr, Storable, UnsizedStorable};
 
 #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Deref, DerefMut, Default)]
 pub struct Addresstypeindex(u32);
+direct_repr!(Addresstypeindex);
 
 impl Addresstypeindex {
     pub fn decremented(self) -> Self {
@@ -47,35 +46,3 @@ impl From<Addresstypeindex> for usize {
         value.0 as usize
     }
 }
-
-impl TryFrom<Slice> for Addresstypeindex {
-    type Error = color_eyre::Report;
-    fn try_from(value: Slice) -> Result<Self, Self::Error> {
-        Self::try_from(&value[..])
-    }
-}
-impl TryFrom<&[u8]> for Addresstypeindex {
-    type Error = color_eyre::Report;
-    fn try_from(value: &[u8]) -> Result<Self, Self::Error> {
-        Ok(Self::from(value.read_be_u32()?))
-    }
-}
-impl From<Addresstypeindex> for Slice {
-    fn from(value: Addresstypeindex) -> Self {
-        value.to_be_bytes().into()
-    }
-}
-
-// impl Bytes for Addresstypeindex {
-//     const SIZE: usize = size_of::<Self>();
-
-//     type ByteArray = [u8; Self::SIZE];
-
-//     // fn try_from_bytes(bytes: &[u8]) -> color_eyre::Result<Self> {
-//     //     Ok(Self(Self::read_u32(bytes)))
-//     // }
-
-//     fn to_bytes(&self) -> Self::ByteArray {
-//         self.to_ne_bytes()
-//     }
-// }
diff --git a/src/crates/bindex/src/structs/amount.rs b/src/crates/bindex/src/structs/amount.rs
index 515ea29da..9f4320b8a 100644
--- a/src/crates/bindex/src/structs/amount.rs
+++ b/src/crates/bindex/src/structs/amount.rs
@@ -5,12 +5,13 @@ use std::{
 
 use biter::bitcoin;
 use derive_deref::{Deref, DerefMut};
-use fjall::Slice;
+use snkrj::{direct_repr, Storable, UnsizedStorable};
 
 use super::Height;
 
 #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Deref, DerefMut, Default)]
 pub struct Amount(bitcoin::Amount);
+direct_repr!(Amount);
 
 impl Amount {
     pub const ZERO: Self = Self(bitcoin::Amount::ZERO);
@@ -22,24 +23,6 @@ impl Amount {
     }
 }
 
-impl From<u64> for Amount {
-    fn from(value: u64) -> Self {
-        Self(bitcoin::Amount::from_sat(value))
-    }
-}
-
-impl From<bitcoin::Amount> for Amount {
-    fn from(value: bitcoin::Amount) -> Self {
-        Self(value)
-    }
-}
-
-impl From<Amount> for Slice {
-    fn from(value: Amount) -> Self {
-        value.to_sat().to_be_bytes().into()
-    }
-}
-
 impl Add for Amount {
     type Output = Amount;
     fn add(self, rhs: Amount) -> Self::Output {
@@ -93,3 +76,15 @@ impl Sum for Amount {
         Amount::from(sats)
     }
 }
+
+impl From<u64> for Amount {
+    fn from(value: u64) -> Self {
+        Self(bitcoin::Amount::from_sat(value))
+    }
+}
+
+impl From<bitcoin::Amount> for Amount {
+    fn from(value: bitcoin::Amount) -> Self {
+        Self(value)
+    }
+}
diff --git a/src/crates/bindex/src/structs/canopy/database.rs b/src/crates/bindex/src/structs/canopy/database.rs
new file mode 100644
index 000000000..8cced0770
--- /dev/null
+++ b/src/crates/bindex/src/structs/canopy/database.rs
@@ -0,0 +1,23 @@
+use std::time::Duration;
+
+use canopydb::{Database as CanopyDatabase, DbOptions};
+use derive_deref::{Deref, DerefMut};
+
+use super::Environment;
+
+#[derive(Debug, Deref, DerefMut)]
+pub struct Database(CanopyDatabase);
+
+impl Database {
+    pub fn new(environment: &Environment, name: &str) -> color_eyre::Result<Self> {
+        let mut options = DbOptions::default();
+        options.use_wal = false;
+        options.checkpoint_interval = Duration::from_secs(u64::MAX);
+        options.checkpoint_target_size = usize::MAX;
+        options.throttle_memory_limit = usize::MAX;
+        options.stall_memory_limit = usize::MAX;
+        options.write_txn_memory_limit = usize::MAX;
+
+        Ok(Self(environment.get_or_create_database_with(name, options)?))
+    }
+}
diff --git a/src/crates/bindex/src/structs/canopy/environment.rs b/src/crates/bindex/src/structs/canopy/environment.rs
new file mode 100644
index 000000000..562e159d9
--- /dev/null
+++ b/src/crates/bindex/src/structs/canopy/environment.rs
@@ -0,0 +1,20 @@
+use std::path::Path;
+
+use canopydb::{EnvOptions, Environment as CanopyEnvironment};
+use derive_deref::{Deref, DerefMut};
+
+#[derive(Debug, Deref, DerefMut)]
+pub struct Environment(CanopyEnvironment);
+
+impl Environment {
+    pub fn new(path: &Path) -> color_eyre::Result<Self> {
+        let mut options = EnvOptions::new(path);
+        // options.use_mmap = true;
+        options.disable_fsync = true;
+        options.wal_new_file_on_checkpoint = false;
+        options.wal_background_sync_interval = None;
+        options.wal_write_batch_memory_limit = usize::MAX;
+
+        Ok(Self(CanopyEnvironment::with_options(options)?))
+    }
+}
diff --git a/src/crates/bindex/src/structs/canopy/mod.rs b/src/crates/bindex/src/structs/canopy/mod.rs
new file mode 100644
index 000000000..46cb95a00
--- /dev/null
+++ b/src/crates/bindex/src/structs/canopy/mod.rs
@@ -0,0 +1,9 @@
+mod database;
+mod environment;
+// mod transaction;
+mod tree;
+
+pub use database::*;
+pub use environment::*;
+// pub use transaction::*;
+pub use tree::*;
diff --git a/src/crates/bindex/src/structs/canopy/transaction.rs b/src/crates/bindex/src/structs/canopy/transaction.rs
new file mode 100644
index 000000000..d1a6ca13c
--- /dev/null
+++ b/src/crates/bindex/src/structs/canopy/transaction.rs
@@ -0,0 +1,19 @@
+use canopydb::{Tree as CanopyTree, TreeOptions, WriteTransaction};
+
+use super::{Database, Tree};
+
+#[derive(Debug)]
+pub struct Transaction<'a, K, V> {
+    tx: WriteTransaction,
+    tree: Tree<'a, K, V>,
+}
+
+impl<'a, K, V> Transaction<'a, K, V> {
+    pub fn new(db: &Database) -> color_eyre::Result<Self> {
+        let tx = db.begin_write()?;
+
+        let tree = Tree::new(&tx)?;
+
+        Ok(Self { tx, tree })
+    }
+}
diff --git a/src/crates/bindex/src/structs/canopy/tree.rs b/src/crates/bindex/src/structs/canopy/tree.rs
new file mode 100644
index 000000000..7809835ea
--- /dev/null
+++ b/src/crates/bindex/src/structs/canopy/tree.rs
@@ -0,0 +1,84 @@
+use std::{
+    fmt::Debug,
+    marker::PhantomData,
+    ops::{Deref, DerefMut},
+};
+
+use canopydb::{Tree as CanopyTree, TreeOptions, WriteTransaction};
+use color_eyre::eyre::eyre;
+
+#[derive(Debug)]
+pub struct Tree<'a, K, V> {
+    tree: CanopyTree<'a>,
+    k: PhantomData<K>,
+    v: PhantomData<V>,
+}
+impl<'a, K, V> Deref for Tree<'a, K, V> {
+    type Target = CanopyTree<'a>;
+    fn deref(&self) -> &Self::Target {
+        &self.tree
+    }
+}
+impl<'a, K, V> DerefMut for Tree<'a, K, V> {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        &mut self.tree
+    }
+}
+
+impl<'a, K, V> Tree<'a, K, V>
+where
+    K: Debug + Sized,
+    V: Debug + Sized + Clone + Copy,
+{
+    const SIZE_OF_K: usize = size_of::<K>();
+    const SIZE_OF_V: usize = size_of::<V>();
+
+    pub fn new(tx: &'a WriteTransaction) -> color_eyre::Result<Self> {
+        let mut options = TreeOptions::new();
+        options.compress_overflow_values = None;
+        options.fixed_key_len = size_of::<K>() as i8;
+        options.fixed_value_len = size_of::<V>() as i8;
+
+        Ok(Self {
+            tree: tx.get_or_create_tree_with(b"tree", options)?,
+            k: PhantomData,
+            v: PhantomData,
+        })
+    }
+
+    pub fn get(&self, key: &K) -> color_eyre::Result<Option<V>> {
+        let slice = self.tree.get(Self::key_as_slice(key))?;
+
+        if slice.is_none() {
+            return Ok(None);
+        }
+
+        let slice = slice.unwrap();
+
+        let (prefix, shorts, suffix) = unsafe { slice.align_to::<V>() };
+
+        if !prefix.is_empty() || shorts.len() != 1 || !suffix.is_empty() {
+            dbg!(&key, &prefix, &shorts, &suffix);
+            return Err(eyre!("align_to issue"));
+        }
+
+        Ok(Some(shorts[0]))
+    }
+
+    pub fn insert(&mut self, key: &K, value: &V) -> Result<(), canopydb::Error> {
+        self.tree
+            .insert(Self::key_as_slice(key), Self::value_as_slice(value))
+    }
+
+    fn key_as_slice(key: &K) -> &[u8] {
+        let data: *const K = key;
+        let data: *const u8 = data as *const u8;
+        unsafe { std::slice::from_raw_parts(data, Self::SIZE_OF_K) }
+    }
+
+    fn value_as_slice(value: &V) -> &[u8] {
+        let data: *const V = value;
+        let data: *const u8 = data as *const u8;
+        unsafe { std::slice::from_raw_parts(data, Self::SIZE_OF_V) }
+    }
+}
diff --git a/src/crates/bindex/src/structs/databases.rs b/src/crates/bindex/src/structs/databases.rs
new file mode 100644
index 000000000..f28a2e7d4
--- /dev/null
+++ b/src/crates/bindex/src/structs/databases.rs
@@ -0,0 +1,186 @@
+use std::{path::Path, thread};
+
+use snkrj::{AnyDatabase, Database};
+
+use crate::structs::Height;
+
+use super::{
+    AddressbytesPrefix, Addressindex, Addressindextxoutindex, BlockHashPrefix, TxidPrefix, Txindex, Txindexvout,
+    Txoutindex,
+};
+
+pub struct Databases {
+    pub addressbytes_prefix_to_addressindex: Database<AddressbytesPrefix, Addressindex>,
+    pub addressindextxoutindex_in: Database<Addressindextxoutindex, ()>,
+    pub addressindextxoutindex_out: Database<Addressindextxoutindex, ()>,
+    pub blockhash_prefix_to_height: Database<BlockHashPrefix, Height>,
+    pub txid_prefix_to_txindex: Database<TxidPrefix, Txindex>,
+    pub txindexvout_to_txoutindex: Database<Txindexvout, Txoutindex>,
+}
+
+const UNSAFE_BLOCKS: usize = 100;
+
+impl Databases {
+    pub fn open(path: &Path) -> color_eyre::Result<Self> {
+        Ok(Self {
+            addressbytes_prefix_to_addressindex: Database::open(path.join("addressbytes_prefix_to_addressindex"))?,
+            addressindextxoutindex_in: Database::open(path.join("addresstxoutindexes_in"))?,
+            addressindextxoutindex_out: Database::open(path.join("addresstxoutindexes_out"))?,
+            blockhash_prefix_to_height: Database::open(path.join("blockhash_prefix_to_height"))?,
+            txid_prefix_to_txindex: Database::open(path.join("txid_prefix_to_txindex"))?,
+            txindexvout_to_txoutindex: Database::open(path.join("txindexvout_to_txoutindex"))?,
+        })
+    }
+
+    // pub fn rollback_from(
+    //     &mut self,
+    //     _wtx: &mut WriteTransaction,
+    //     _height: Height,
+    //     _exit: &Exit,
+    // ) -> color_eyre::Result<()> {
+    //     panic!();
+    // let mut txindex = None;
+
+    // wtx.range(self.height_to_blockhash.data(), Slice::from(height)..)
+    //     .try_for_each(|slice| -> color_eyre::Result<()> {
+    //         let (height_slice, slice_blockhash) = slice?;
+    //         let blockhash = BlockHash::from_slice(&slice_blockhash)?;
+
+    //         wtx.remove(self.height_to_blockhash.data(), height_slice);
+
+    //         wtx.remove(self.blockhash_prefix_to_height.data(), blockhash.prefix());
+
+    //         if txindex.is_none() {
+    //             txindex.replace(
+    //                 wtx.get(self.height_to_first_txindex.data(), height_slice)?
+    //                     .context("for height to have first txindex")?,
+    //             );
+    //         }
+    //         wtx.remove(self.height_to_first_txindex.data(), height_slice);
+    //         wtx.remove(self.height_to_last_txindex.data(), height_slice);
+
+    //         Ok(())
+    //     })?;
+
+    // let txindex = txindex.context("txindex to not be none by now")?;
+
+    // wtx.range(self.txindex_to_txid.data(), Slice::from(txindex)..)
+    //     .try_for_each(|slice| -> color_eyre::Result<()> {
+    //         let (slice_txindex, slice_txid) = slice?;
+    //         let txindex = Txindex::from(slice_txindex);
+    //         let txid = Txid::from_slice(&slice_txid)?;
+
+    //         wtx.remove(self.txindex_to_txid.data(), Slice::from(txindex));
+    //         wtx.remove(self.txindex_to_height.data(), Slice::from(txindex));
+    //         wtx.remove(self.txid_prefix_to_txindex.data(), txid.prefix());
+
+    //         Ok(())
+    //     })?;
+
+    // let txoutindex = Txoutindex::from(txindex);
+
+    // let mut addressindexes = BTreeSet::new();
+
+    // wtx.range(self.txoutindex_to_amount.data(), Slice::from(txoutindex)..)
+    //     .try_for_each(|slice| -> color_eyre::Result<()> {
+    //         let (txoutindex_slice, _) = slice?;
+
+    //         wtx.remove(self.txoutindex_to_amount.data(), txoutindex_slice);
+
+    //         if let Some(addressindex_slice) =
+    //             wtx.get(self.txoutindex_to_addressindex.data(), txoutindex_slice)?
+    //         {
+    //             wtx.remove(self.txoutindex_to_addressindex.data(), txoutindex_slice);
+
+    //             let addressindex = Addressindex::from(addressindex_slice);
+    //             addressindexes.insert(addressindex);
+
+    //             let txoutindex = Txoutindex::from(txoutindex_slice);
+    //             let addresstxoutindex = Addresstxoutindex::from((addressindex, txoutindex));
+
+    //             wtx.remove(
+    //                 self.addressindex_to_txoutindexes.data(),
+    //                 Slice::from(addresstxoutindex),
+    //             );
+    //         }
+
+    //         Ok(())
+    //     })?;
+
+    // addressindexes
+    // .into_iter()
+    // .filter(|addressindex| {
+    //     let is_empty = wtx
+    //         .prefix(
+    //             self.addressindex_to_txoutindexes.data(),
+    //             Slice::from(*addressindex),
+    //         )
+    //         .next()
+    //         .is_none();
+    //     is_empty
+    // })
+    // .try_for_each(|addressindex| -> color_eyre::Result<()> {
+    //     let addressindex_slice = Slice::from(addressindex);
+
+    //     let addressbytes = Addressbytes::from(
+    //         wtx.get(
+    //             self.addressindex_to_addressbytes.data(),
+    //             &addressindex_slice,
+    //         )?
+    //         .context("addressindex_to_address to have value")?,
+    //     );
+    //     wtx.remove(
+    //         self.addressbytes_prefix_to_addressindex.data(),
+    //         addressbytes.prefix(),
+    //     );
+    //     wtx.remove(
+    //         self.addressindex_to_addressbytes.data(),
+    //         &addressindex_slice,
+    //     );
+    //     wtx.remove(self.addressindex_to_addresstype.data(), &addressindex_slice);
+
+    //     Ok(())
+    // })?;
+    //
+
+    // todo!("clear addresstxoutindexes_out")
+    // todo!("clear addresstxoutindexes_in")
+    // todo!("clear zero_txoutindexes")
+    // todo!("clear txindexvout_to_txoutindex")
+
+    // Ok(())
+    // }
+
+    fn to_ref_vec(&self) -> Vec<&dyn AnyDatabase> {
+        vec![
+            &self.addressbytes_prefix_to_addressindex as &dyn AnyDatabase,
+            &self.addressindextxoutindex_in,
+            &self.addressindextxoutindex_out,
+            &self.blockhash_prefix_to_height,
+            &self.txid_prefix_to_txindex,
+            &self.txindexvout_to_txoutindex,
+        ]
+    }
+
+    fn to_ref_mut_vec(&mut self) -> Vec<&mut dyn AnyDatabase> {
+        vec![
+            &mut self.addressbytes_prefix_to_addressindex as &mut dyn AnyDatabase,
+            &mut self.addressindextxoutindex_in,
+            &mut self.addressindextxoutindex_out,
+            &mut self.blockhash_prefix_to_height,
+            &mut self.txid_prefix_to_txindex,
+            &mut self.txindexvout_to_txoutindex,
+        ]
+    }
+
+    pub fn export(self) {
+        thread::scope(|scope| {
+            scope.spawn(|| self.addressbytes_prefix_to_addressindex.export(false));
+            scope.spawn(|| self.addressindextxoutindex_in.export(false));
+            scope.spawn(|| self.addressindextxoutindex_out.export(false));
+            scope.spawn(|| self.blockhash_prefix_to_height.export(false));
+            scope.spawn(|| self.txid_prefix_to_txindex.export(false));
+            scope.spawn(|| self.txindexvout_to_txoutindex.export(false));
+        });
+    }
+}
diff --git a/src/crates/bindex/src/structs/height.rs b/src/crates/bindex/src/structs/height.rs
index 3f8f0f346..6528b8fab 100644
--- a/src/crates/bindex/src/structs/height.rs
+++ b/src/crates/bindex/src/structs/height.rs
@@ -5,12 +5,11 @@ use std::{
 
 use biter::bitcoincore_rpc::{self, RpcApi};
 use derive_deref::{Deref, DerefMut};
-use fjall::Slice;
-
-use super::SliceExtended;
+use snkrj::{direct_repr, Storable, UnsizedStorable};
 
 #[derive(Debug, Clone, Copy, Deref, DerefMut, PartialEq, Eq, PartialOrd, Ord, Default)]
 pub struct Height(u32);
+direct_repr!(Height);
 
 impl PartialEq<u64> for Height {
     fn eq(&self, other: &u64) -> bool {
@@ -75,18 +74,6 @@ impl fmt::Display for Height {
     }
 }
 
-impl TryFrom<Slice> for Height {
-    type Error = color_eyre::Report;
-    fn try_from(value: Slice) -> Result<Self, Self::Error> {
-        Ok(Self::from((&value[..]).read_be_u32()?))
-    }
-}
-impl From<Height> for Slice {
-    fn from(value: Height) -> Self {
-        value.to_be_bytes().into()
-    }
-}
-
 impl From<u32> for Height {
     fn from(value: u32) -> Self {
         Self(value)
@@ -110,17 +97,3 @@ impl TryFrom<&bitcoincore_rpc::Client> for Height {
         Ok((value.get_blockchain_info()?.blocks as usize - 1).into())
     }
 }
-
-// impl Bytes for Height {
-//     const SIZE: usize = size_of::<Self>();
-
-//     type ByteArray = [u8; Self::SIZE];
-
-//     // fn try_from_bytes(bytes: &[u8]) -> color_eyre::Result<Self> {
-//     //     Ok(Self(Self::read_u32(bytes)))
-//     // }
-
-//     fn to_bytes(&self) -> Self::ByteArray {
-//         self.to_ne_bytes()
-//     }
-// }
diff --git a/src/crates/bindex/src/structs/mod.rs b/src/crates/bindex/src/structs/mod.rs
index 123921c06..44ca041c4 100644
--- a/src/crates/bindex/src/structs/mod.rs
+++ b/src/crates/bindex/src/structs/mod.rs
@@ -4,10 +4,10 @@ mod addressindextxoutindex;
 mod addresstype;
 mod addresstypeindex;
 mod amount;
+mod canopy;
+mod databases;
 mod exit;
 mod height;
-mod partition;
-mod partitions;
 mod prefix;
 mod slice;
 mod txindex;
@@ -15,7 +15,6 @@ mod txindexvout;
 mod txoutindex;
 mod vecdisk;
 mod vecdisks;
-mod version;
 
 pub use addressbytes::*;
 pub use addressindex::*;
@@ -23,10 +22,10 @@ pub use addressindextxoutindex::*;
 pub use addresstype::*;
 pub use addresstypeindex::*;
 pub use amount::*;
+pub use canopy::*;
+pub use databases::*;
 pub use exit::*;
 pub use height::*;
-pub use partition::*;
-pub use partitions::*;
 pub use prefix::*;
 pub use slice::*;
 pub use txindex::*;
@@ -34,4 +33,3 @@ pub use txindexvout::*;
 pub use txoutindex::*;
 pub use vecdisk::*;
 pub use vecdisks::*;
-pub use version::*;
diff --git a/src/crates/bindex/src/structs/prefix.rs b/src/crates/bindex/src/structs/prefix.rs
index 661a3971c..ee90efbda 100644
--- a/src/crates/bindex/src/structs/prefix.rs
+++ b/src/crates/bindex/src/structs/prefix.rs
@@ -1,32 +1,26 @@
 use biter::bitcoin::{BlockHash, Txid};
 use derive_deref::Deref;
-use fjall::Slice;
+use snkrj::{direct_repr, Storable, UnsizedStorable};
 
-use super::Addressbytes;
+use super::{Addressbytes, SliceExtended};
 
-#[derive(Debug, Deref, PartialEq, Eq, PartialOrd, Ord)]
-pub struct Prefix(Slice);
-impl From<&[u8]> for Prefix {
-    fn from(value: &[u8]) -> Self {
-        Self(Slice::from(&value[..8]))
+#[derive(Debug, Deref, Clone, PartialEq, Eq, PartialOrd, Ord)]
+pub struct Prefix([u8; 8]);
+direct_repr!(Prefix);
+impl TryFrom<&[u8]> for Prefix {
+    type Error = color_eyre::Report;
+    fn try_from(value: &[u8]) -> Result<Self, Self::Error> {
+        Ok(Self(value.read_8xU8()?))
     }
 }
-// pub struct Prefix([u8; 8]);
-// impl From<&[u8]> for Prefix {
-//     fn from(value: &[u8]) -> Self {
-//         let mut buf: [u8; 8] = [0; 8];
-//         value.iter().take(8).enumerate().for_each(|(i, v)| {
-//             buf[i] = *v;
-//         });
-//         Self(buf)
-//     }
-// }
 
-#[derive(Debug, Deref)]
+#[derive(Debug, Deref, Clone, PartialEq, Eq, PartialOrd, Ord)]
 pub struct AddressbytesPrefix(Prefix);
-impl From<&Addressbytes> for AddressbytesPrefix {
-    fn from(value: &Addressbytes) -> Self {
-        Self(Prefix::from(match value {
+direct_repr!(AddressbytesPrefix);
+impl TryFrom<&Addressbytes> for AddressbytesPrefix {
+    type Error = color_eyre::Report;
+    fn try_from(value: &Addressbytes) -> Result<Self, Self::Error> {
+        Ok(Self(Prefix::try_from(match value {
             Addressbytes::P2PK65(bytes) => &bytes[..],
             Addressbytes::P2PK33(bytes) => &bytes[..],
             Addressbytes::P2PKH(bytes) => &bytes[..],
@@ -34,22 +28,26 @@ impl From<&Addressbytes> for AddressbytesPrefix {
             Addressbytes::P2WPKH(bytes) => &bytes[..],
             Addressbytes::P2WSH(bytes) => &bytes[..],
             Addressbytes::P2TR(bytes) => &bytes[..],
-        }))
+        })?))
     }
 }
 
-#[derive(Debug, Deref)]
+#[derive(Debug, Deref, Clone, PartialEq, Eq, PartialOrd, Ord)]
 pub struct BlockHashPrefix(Prefix);
-impl From<&BlockHash> for BlockHashPrefix {
-    fn from(value: &BlockHash) -> Self {
-        Self(Prefix::from(&value[..]))
+direct_repr!(BlockHashPrefix);
+impl TryFrom<&BlockHash> for BlockHashPrefix {
+    type Error = color_eyre::Report;
+    fn try_from(value: &BlockHash) -> Result<Self, Self::Error> {
+        Ok(Self(Prefix::try_from(&value[..])?))
     }
 }
 
-#[derive(Debug, Deref, PartialEq, Eq, PartialOrd, Ord)]
+#[derive(Debug, Deref, Clone, PartialEq, Eq, PartialOrd, Ord)]
 pub struct TxidPrefix(Prefix);
-impl From<&Txid> for TxidPrefix {
-    fn from(value: &Txid) -> Self {
-        Self(Prefix::from(&value[..]))
+direct_repr!(TxidPrefix);
+impl TryFrom<&Txid> for TxidPrefix {
+    type Error = color_eyre::Report;
+    fn try_from(value: &Txid) -> Result<Self, Self::Error> {
+        Ok(Self(Prefix::try_from(&value[..])?))
     }
 }
diff --git a/src/crates/bindex/src/structs/slice.rs b/src/crates/bindex/src/structs/slice.rs
index 4ded832b1..1c598970b 100644
--- a/src/crates/bindex/src/structs/slice.rs
+++ b/src/crates/bindex/src/structs/slice.rs
@@ -2,6 +2,7 @@ use color_eyre::eyre::eyre;
 
 #[allow(unused)]
 pub trait SliceExtended {
+    fn read_8xU8(&self) -> color_eyre::Result<[u8; 8]>;
     fn read_be_u8(&self) -> color_eyre::Result<u8>;
     fn read_be_u16(&self) -> color_eyre::Result<u16>;
     fn read_be_u32(&self) -> color_eyre::Result<u32>;
@@ -10,6 +11,12 @@ pub trait SliceExtended {
 }
 
 impl SliceExtended for &[u8] {
+    fn read_8xU8(&self) -> color_eyre::Result<[u8; 8]> {
+        let mut buf: [u8; 8] = [0; 8];
+        (&self[..8]).read_exact(&mut buf)?;
+        Ok(buf)
+    }
+
     fn read_be_u8(&self) -> color_eyre::Result<u8> {
         let mut buf: [u8; 1] = [0; 1];
         self.read_exact(&mut buf)?;
diff --git a/src/crates/bindex/src/structs/txindex.rs b/src/crates/bindex/src/structs/txindex.rs
index 47bcdea8f..70a3735e3 100644
--- a/src/crates/bindex/src/structs/txindex.rs
+++ b/src/crates/bindex/src/structs/txindex.rs
@@ -1,12 +1,11 @@
 use std::ops::{Add, AddAssign};
 
 use derive_deref::{Deref, DerefMut};
-use fjall::Slice;
-
-use super::SliceExtended;
+use snkrj::{direct_repr, Storable, UnsizedStorable};
 
 #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Deref, DerefMut, Default)]
 pub struct Txindex(u32);
+direct_repr!(Txindex);
 
 impl Txindex {
     pub fn incremented(self) -> Self {
@@ -58,21 +57,3 @@ impl From<Txindex> for usize {
         value.0 as usize
     }
 }
-
-impl TryFrom<Slice> for Txindex {
-    type Error = color_eyre::Report;
-    fn try_from(value: Slice) -> Result<Self, Self::Error> {
-        Self::try_from(&value[..])
-    }
-}
-impl TryFrom<&[u8]> for Txindex {
-    type Error = color_eyre::Report;
-    fn try_from(value: &[u8]) -> Result<Self, Self::Error> {
-        Ok(Self::from(value.read_be_u32()?))
-    }
-}
-impl From<Txindex> for Slice {
-    fn from(value: Txindex) -> Self {
-        value.to_be_bytes().into()
-    }
-}
diff --git a/src/crates/bindex/src/structs/txindexvout.rs b/src/crates/bindex/src/structs/txindexvout.rs
index 0a75a529c..6ba23d23c 100644
--- a/src/crates/bindex/src/structs/txindexvout.rs
+++ b/src/crates/bindex/src/structs/txindexvout.rs
@@ -1,14 +1,13 @@
-use fjall::Slice;
+use snkrj::{direct_repr, Storable, UnsizedStorable};
 
-use super::{SliceExtended, Txindex};
+use super::Txindex;
 
 #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Default)]
 pub struct Txindexvout {
     pub txindex: Txindex,
     pub vout: u32,
 }
-
-const BYTES: usize = size_of::<Txindexvout>();
+direct_repr!(Txindexvout);
 
 impl From<Txindex> for Txindexvout {
     fn from(value: Txindex) -> Self {
@@ -27,25 +26,3 @@ impl From<(Txindex, u32)> for Txindexvout {
         }
     }
 }
-
-impl From<Txindexvout> for Slice {
-    fn from(value: Txindexvout) -> Self {
-        let txindex_slice = Self::from(value.txindex);
-        let vout_slice = Self::from(value.vout.to_be_bytes());
-        Self::from([txindex_slice, vout_slice].concat())
-    }
-}
-impl TryFrom<Slice> for Txindexvout {
-    type Error = color_eyre::Report;
-    fn try_from(value: Slice) -> Result<Self, Self::Error> {
-        Self::try_from(&value[..])
-    }
-}
-impl TryFrom<&[u8]> for Txindexvout {
-    type Error = color_eyre::Report;
-    fn try_from(value: &[u8]) -> Result<Self, Self::Error> {
-        let txindex = Txindex::try_from(&value[..BYTES])?;
-        let vout = (&value[BYTES..]).read_be_u32()?;
-        Ok(Self { txindex, vout })
-    }
-}
diff --git a/src/crates/bindex/src/structs/txoutindex.rs b/src/crates/bindex/src/structs/txoutindex.rs
index 92e1bc88d..6424bf70a 100644
--- a/src/crates/bindex/src/structs/txoutindex.rs
+++ b/src/crates/bindex/src/structs/txoutindex.rs
@@ -1,12 +1,11 @@
 use std::ops::{Add, AddAssign};
 
 use derive_deref::{Deref, DerefMut};
-use fjall::Slice;
-
-use super::SliceExtended;
+use snkrj::{direct_repr, Storable, UnsizedStorable};
 
 #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Deref, DerefMut, Default)]
 pub struct Txoutindex(u64);
+direct_repr!(Txoutindex);
 
 impl Txoutindex {
     pub fn incremented(self) -> Self {
@@ -52,21 +51,3 @@ impl From<Txoutindex> for usize {
         value.0 as usize
     }
 }
-
-impl TryFrom<Slice> for Txoutindex {
-    type Error = color_eyre::Report;
-    fn try_from(value: Slice) -> Result<Self, Self::Error> {
-        Self::try_from(&value[..])
-    }
-}
-impl TryFrom<&[u8]> for Txoutindex {
-    type Error = color_eyre::Report;
-    fn try_from(value: &[u8]) -> Result<Self, Self::Error> {
-        Ok(Self::from(value.read_be_u64()?))
-    }
-}
-impl From<Txoutindex> for Slice {
-    fn from(value: Txoutindex) -> Self {
-        value.to_be_bytes().into()
-    }
-}
diff --git a/src/crates/bindex/src/structs/version.rs b/src/crates/bindex/src/structs/version.rs
index cc94051ed..a4dd4b0ec 100644
--- a/src/crates/bindex/src/structs/version.rs
+++ b/src/crates/bindex/src/structs/version.rs
@@ -1,5 +1,4 @@
 use derive_deref::{Deref, DerefMut};
-use fjall::Slice;
 
 use super::SliceExtended;
 
diff --git a/src/crates/biter/Cargo.lock b/src/crates/biter/Cargo.lock
index 04c5c6ee7..c3335d7d9 100644
--- a/src/crates/biter/Cargo.lock
+++ b/src/crates/biter/Cargo.lock
@@ -299,9 +299,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.92"
+version = "1.0.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0"
+checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99"
 dependencies = [
  "unicode-ident",
 ]
@@ -414,9 +414,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.134"
+version = "1.0.135"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d00f4175c42ee48b15416f6193a959ba3a0d67fc699a0db9ad12df9f83991c7d"
+checksum = "2b0d7ba2887406110130a978386c4e1befb98c674b4fba677954e4db976630d9"
 dependencies = [
  "itoa",
  "memchr",
@@ -432,9 +432,9 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 
 [[package]]
 name = "syn"
-version = "2.0.93"
+version = "2.0.96"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c786062daee0d6db1132800e623df74274a0a87322d8e183338e01b3d98d058"
+checksum = "d5d0adab1ae378d7f53bdebc67a39f1f151407ef230f0ce2883572f5d8985c80"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/src/crates/biter/Cargo.toml b/src/crates/biter/Cargo.toml
index 26db5dd47..6bb8bc3f6 100644
--- a/src/crates/biter/Cargo.toml
+++ b/src/crates/biter/Cargo.toml
@@ -13,7 +13,7 @@ bitcoin = { version = "0.32.5", features = ["serde"] }
 rayon = "1.10.0"
 crossbeam = { version = "0.8.4", features = ["crossbeam-channel"] }
 serde = { version = "1.0.217", features = ["derive"] }
-serde_json = "1.0.134"
+serde_json = "1.0.135"
 derived-deref = "2.1.0"
 bitcoincore-rpc = "0.19.0"
 # tokio = { version = "1.39.2", features = ["rt-multi-thread"] }

From 009d02fa6885def5716e37e78c81587dba62ac90 Mon Sep 17 00:00:00 2001
From: nym21 <expat-epochs0i@icloud.com>
Date: Thu, 16 Jan 2025 13:25:35 +0100
Subject: [PATCH 24/63] storable_vec: general update

---
 src/crates/bindex/Cargo.lock                  | 663 ++++++++++++------
 src/crates/bindex/Cargo.toml                  |   3 +-
 src/crates/bindex/src/main.rs                 |  96 +--
 .../bindex/src/structs/canopy/database.rs     |  23 -
 .../bindex/src/structs/canopy/environment.rs  |  20 -
 src/crates/bindex/src/structs/canopy/mod.rs   |   9 -
 .../bindex/src/structs/canopy/transaction.rs  |  19 -
 src/crates/bindex/src/structs/canopy/tree.rs  |  84 ---
 src/crates/bindex/src/structs/mod.rs          |   8 +-
 .../structs/{vecdisks.rs => storable_vecs.rs} |  99 +--
 src/crates/snkrj/src/lib.rs                   |   5 +
 src/crates/storable_vec/Cargo.lock            | 246 +++++++
 src/crates/storable_vec/Cargo.toml            |  12 +
 src/crates/storable_vec/LICENSE.md            |  21 +
 src/crates/storable_vec/README.md             |  52 ++
 .../vecdisk.rs => storable_vec/src/lib.rs}    |  99 ++-
 src/crates/storable_vec/src/main.rs           |  24 +
 17 files changed, 985 insertions(+), 498 deletions(-)
 delete mode 100644 src/crates/bindex/src/structs/canopy/database.rs
 delete mode 100644 src/crates/bindex/src/structs/canopy/environment.rs
 delete mode 100644 src/crates/bindex/src/structs/canopy/mod.rs
 delete mode 100644 src/crates/bindex/src/structs/canopy/transaction.rs
 delete mode 100644 src/crates/bindex/src/structs/canopy/tree.rs
 rename src/crates/bindex/src/structs/{vecdisks.rs => storable_vecs.rs} (65%)
 create mode 100644 src/crates/storable_vec/Cargo.lock
 create mode 100644 src/crates/storable_vec/Cargo.toml
 create mode 100644 src/crates/storable_vec/LICENSE.md
 create mode 100644 src/crates/storable_vec/README.md
 rename src/crates/{bindex/src/structs/vecdisk.rs => storable_vec/src/lib.rs} (74%)
 create mode 100644 src/crates/storable_vec/src/main.rs

diff --git a/src/crates/bindex/Cargo.lock b/src/crates/bindex/Cargo.lock
index 5ed126848..77fb36e11 100644
--- a/src/crates/bindex/Cargo.lock
+++ b/src/crates/bindex/Cargo.lock
@@ -18,24 +18,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
 [[package]]
-name = "ahash"
-version = "0.8.11"
+name = "aead"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
+checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0"
 dependencies = [
- "cfg-if",
- "getrandom",
- "once_cell",
- "version_check",
- "zerocopy",
+ "crypto-common",
+ "generic-array",
 ]
 
-[[package]]
-name = "allocator-api2"
-version = "0.2.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
-
 [[package]]
 name = "arrayvec"
 version = "0.7.6"
@@ -85,19 +76,29 @@ version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d965446196e3b7decd44aa7ee49e31d630118f90ef12f97900f262eb915c951d"
 
+[[package]]
+name = "bincode"
+version = "1.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "bindex"
 version = "0.1.0"
 dependencies = [
  "bitcoin_hashes 0.16.0",
  "biter",
- "canopydb",
  "color-eyre",
  "ctrlc",
  "derive_deref",
+ "heed3",
  "memmap2",
  "rayon",
  "snkrj",
+ "storable_vec",
 ]
 
 [[package]]
@@ -229,6 +230,9 @@ name = "bitflags"
 version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+dependencies = [
+ "serde",
+]
 
 [[package]]
 name = "byteorder"
@@ -236,37 +240,6 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
-[[package]]
-name = "canopydb"
-version = "0.1.0"
-source = "git+https://github.com/arthurprs/canopydb#daab91758a7905abc2a7d1a9c7e9f6c41227e72b"
-dependencies = [
- "bitflags 2.6.0",
- "dashmap",
- "derive_more",
- "fail",
- "foldhash",
- "fslock",
- "hashbrown",
- "libc",
- "lock_api",
- "log",
- "lz4_flex",
- "memmap2",
- "nix",
- "parking_lot 0.12.3",
- "quick_cache",
- "rand",
- "serde",
- "serde_json",
- "smallvec 2.0.0-alpha.9",
- "sptr",
- "tempfile",
- "triomphe",
- "xxhash-rust",
- "zerocopy",
-]
-
 [[package]]
 name = "cc"
 version = "1.2.4"
@@ -371,6 +344,16 @@ version = "0.8.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
 
+[[package]]
+name = "crypto-common"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
+dependencies = [
+ "generic-array",
+ "typenum",
+]
+
 [[package]]
 name = "ctrlc"
 version = "3.4.5"
@@ -381,20 +364,6 @@ dependencies = [
  "windows-sys",
 ]
 
-[[package]]
-name = "dashmap"
-version = "6.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf"
-dependencies = [
- "cfg-if",
- "crossbeam-utils",
- "hashbrown",
- "lock_api",
- "once_cell",
- "parking_lot_core 0.9.10",
-]
-
 [[package]]
 name = "derive_deref"
 version = "1.1.1"
@@ -406,27 +375,6 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "derive_more"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05"
-dependencies = [
- "derive_more-impl",
-]
-
-[[package]]
-name = "derive_more-impl"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.95",
- "unicode-xid",
-]
-
 [[package]]
 name = "derived-deref"
 version = "2.1.0"
@@ -438,28 +386,32 @@ dependencies = [
  "syn 2.0.95",
 ]
 
+[[package]]
+name = "displaydoc"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.95",
+]
+
+[[package]]
+name = "doxygen-rs"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "415b6ec780d34dcf624666747194393603d0373b7141eef01d12ee58881507d9"
+dependencies = [
+ "phf",
+]
+
 [[package]]
 name = "either"
 version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
 
-[[package]]
-name = "equivalent"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
-
-[[package]]
-name = "errno"
-version = "0.3.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
-dependencies = [
- "libc",
- "windows-sys",
-]
-
 [[package]]
 name = "eyre"
 version = "0.6.12"
@@ -471,28 +423,14 @@ dependencies = [
 ]
 
 [[package]]
-name = "fail"
-version = "0.5.1"
+name = "form_urlencoded"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe5e43d0f78a42ad591453aedb1d7ae631ce7ee445c7643691055a9ed8d3b01c"
+checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
 dependencies = [
- "log",
- "once_cell",
- "rand",
+ "percent-encoding",
 ]
 
-[[package]]
-name = "fastrand"
-version = "2.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
-
-[[package]]
-name = "foldhash"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0d2fde1f7b3d48b8395d5f2de76c18a528bd6a9cdde438df747bfcba3e05d6f"
-
 [[package]]
 name = "fs2"
 version = "0.4.3"
@@ -504,12 +442,14 @@ dependencies = [
 ]
 
 [[package]]
-name = "fslock"
-version = "0.2.1"
-source = "git+https://github.com/arthurprs/fslock.git?rev=7ec91154136a2b3d567b1f79e87cae5d3ca3d927#7ec91154136a2b3d567b1f79e87cae5d3ca3d927"
+name = "generic-array"
+version = "0.14.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
 dependencies = [
- "libc",
- "winapi",
+ "serde",
+ "typenum",
+ "version_check",
 ]
 
 [[package]]
@@ -530,13 +470,43 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
 
 [[package]]
-name = "hashbrown"
-version = "0.14.5"
+name = "heed-traits"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+checksum = "eb3130048d404c57ce5a1ac61a903696e8fcde7e8c2991e9fcfc1f27c3ef74ff"
+
+[[package]]
+name = "heed-types"
+version = "0.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13c255bdf46e07fb840d120a36dcc81f385140d7191c76a7391672675c01a55d"
 dependencies = [
- "ahash",
- "allocator-api2",
+ "bincode",
+ "byteorder",
+ "heed-traits",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "heed3"
+version = "0.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7abcf1276482447d5ea921dad8c72fa5b2cfcf4c5016a16491605240bf736205"
+dependencies = [
+ "aead",
+ "bitflags 2.6.0",
+ "byteorder",
+ "generic-array",
+ "heed-traits",
+ "heed-types",
+ "libc",
+ "lmdb-master3-sys",
+ "once_cell",
+ "page_size",
+ "serde",
+ "synchronoise",
+ "url",
 ]
 
 [[package]]
@@ -563,6 +533,145 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3011d1213f159867b13cfd6ac92d2cd5f1345762c63be3554e84092d85a50bbd"
 
+[[package]]
+name = "icu_collections"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
+dependencies = [
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
+dependencies = [
+ "displaydoc",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_locid_transform_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e"
+
+[[package]]
+name = "icu_normalizer"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_normalizer_data",
+ "icu_properties",
+ "icu_provider",
+ "smallvec",
+ "utf16_iter",
+ "utf8_iter",
+ "write16",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
+
+[[package]]
+name = "icu_properties"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_locid_transform",
+ "icu_properties_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_properties_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
+
+[[package]]
+name = "icu_provider"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_provider_macros",
+ "stable_deref_trait",
+ "tinystr",
+ "writeable",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_provider_macros"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.95",
+]
+
+[[package]]
+name = "idna"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
+dependencies = [
+ "idna_adapter",
+ "smallvec",
+ "utf8_iter",
+]
+
+[[package]]
+name = "idna_adapter"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71"
+dependencies = [
+ "icu_normalizer",
+ "icu_properties",
+]
+
 [[package]]
 name = "indenter"
 version = "0.3.3"
@@ -609,10 +718,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
 
 [[package]]
-name = "linux-raw-sys"
-version = "0.4.15"
+name = "litemap"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
+checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104"
+
+[[package]]
+name = "lmdb-master3-sys"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9bea2558bc45a71673600dcd84070be37cdb7a87da2fc7255c6d377c498df00d"
+dependencies = [
+ "cc",
+ "doxygen-rs",
+ "libc",
+]
 
 [[package]]
 name = "lock_api"
@@ -630,12 +750,6 @@ version = "0.4.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
 
-[[package]]
-name = "lz4_flex"
-version = "0.11.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75761162ae2b0e580d7e7c390558127e5f01b4194debd6221fd8c207fc80e3f5"
-
 [[package]]
 name = "memchr"
 version = "2.7.4"
@@ -704,6 +818,16 @@ version = "3.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f"
 
+[[package]]
+name = "page_size"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30d5b2194ed13191c1999ae0704b7839fb18384fa22e49b57eeaa97d79ce40da"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
 [[package]]
 name = "parking_lot"
 version = "0.11.2"
@@ -712,17 +836,7 @@ checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
 dependencies = [
  "instant",
  "lock_api",
- "parking_lot_core 0.8.6",
-]
-
-[[package]]
-name = "parking_lot"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
-dependencies = [
- "lock_api",
- "parking_lot_core 0.9.10",
+ "parking_lot_core",
 ]
 
 [[package]]
@@ -734,22 +848,57 @@ dependencies = [
  "cfg-if",
  "instant",
  "libc",
- "redox_syscall 0.2.16",
- "smallvec 1.13.2",
+ "redox_syscall",
+ "smallvec",
  "winapi",
 ]
 
 [[package]]
-name = "parking_lot_core"
-version = "0.9.10"
+name = "percent-encoding"
+version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
+checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
+
+[[package]]
+name = "phf"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078"
 dependencies = [
- "cfg-if",
- "libc",
- "redox_syscall 0.5.8",
- "smallvec 1.13.2",
- "windows-targets",
+ "phf_macros",
+ "phf_shared",
+]
+
+[[package]]
+name = "phf_generator"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d"
+dependencies = [
+ "phf_shared",
+ "rand",
+]
+
+[[package]]
+name = "phf_macros"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f84ac04429c13a7ff43785d75ad27569f2951ce0ffd30a3321230db2fc727216"
+dependencies = [
+ "phf_generator",
+ "phf_shared",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.95",
+]
+
+[[package]]
+name = "phf_shared"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5"
+dependencies = [
+ "siphasher",
 ]
 
 [[package]]
@@ -776,18 +925,6 @@ dependencies = [
  "unicode-ident",
 ]
 
-[[package]]
-name = "quick_cache"
-version = "0.6.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d7c94f8935a9df96bb6380e8592c70edf497a643f94bd23b2f76b399385dbf4"
-dependencies = [
- "ahash",
- "equivalent",
- "hashbrown",
- "parking_lot 0.12.3",
-]
-
 [[package]]
 name = "quote"
 version = "1.0.38"
@@ -856,34 +993,12 @@ dependencies = [
  "bitflags 1.3.2",
 ]
 
-[[package]]
-name = "redox_syscall"
-version = "0.5.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834"
-dependencies = [
- "bitflags 2.6.0",
-]
-
 [[package]]
 name = "rustc-demangle"
 version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
 
-[[package]]
-name = "rustix"
-version = "0.38.43"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a78891ee6bf2340288408954ac787aa063d8e8817e9f53abb37c695c6d834ef6"
-dependencies = [
- "bitflags 2.6.0",
- "errno",
- "libc",
- "linux-raw-sys",
- "windows-sys",
-]
-
 [[package]]
 name = "ryu"
 version = "1.0.18"
@@ -899,7 +1014,7 @@ dependencies = [
  "fs2",
  "log",
  "memmap2",
- "parking_lot 0.11.2",
+ "parking_lot",
  "sanakirja-core",
  "serde",
  "thiserror",
@@ -985,18 +1100,18 @@ version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 
+[[package]]
+name = "siphasher"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d"
+
 [[package]]
 name = "smallvec"
 version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
-[[package]]
-name = "smallvec"
-version = "2.0.0-alpha.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e22442b16a0c1bfae679ffed8ec5e160ae2aa8495cea891f0d2ff7b84fe5c4c"
-
 [[package]]
 name = "snkrj"
 version = "0.1.1"
@@ -1005,10 +1120,18 @@ dependencies = [
 ]
 
 [[package]]
-name = "sptr"
-version = "0.3.2"
+name = "stable_deref_trait"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b9b39299b249ad65f3b7e96443bad61c02ca5cd3589f46cb6d610a0fd6c0d6a"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+
+[[package]]
+name = "storable_vec"
+version = "0.1.2"
+dependencies = [
+ "color-eyre",
+ "memmap2",
+]
 
 [[package]]
 name = "syn"
@@ -1033,17 +1156,23 @@ dependencies = [
 ]
 
 [[package]]
-name = "tempfile"
-version = "3.15.0"
+name = "synchronoise"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a8a559c81686f576e8cd0290cd2a24a2a9ad80c98b3478856500fcbd7acd704"
+checksum = "3dbc01390fc626ce8d1cffe3376ded2b72a11bb70e1c75f404a210e4daa4def2"
 dependencies = [
- "cfg-if",
- "fastrand",
- "getrandom",
- "once_cell",
- "rustix",
- "windows-sys",
+ "crossbeam-queue",
+]
+
+[[package]]
+name = "synstructure"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.95",
 ]
 
 [[package]]
@@ -1076,6 +1205,16 @@ dependencies = [
  "once_cell",
 ]
 
+[[package]]
+name = "tinystr"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
+dependencies = [
+ "displaydoc",
+ "zerovec",
+]
+
 [[package]]
 name = "tracing"
 version = "0.1.41"
@@ -1118,10 +1257,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "triomphe"
-version = "0.1.14"
+name = "typenum"
+version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef8f7726da4807b58ea5c96fdc122f80702030edc33b35aff9190a51148ccc85"
+checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
 
 [[package]]
 name = "unicode-ident"
@@ -1130,10 +1269,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83"
 
 [[package]]
-name = "unicode-xid"
-version = "0.2.6"
+name = "url"
+version = "2.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
+checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60"
+dependencies = [
+ "form_urlencoded",
+ "idna",
+ "percent-encoding",
+]
+
+[[package]]
+name = "utf16_iter"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
+
+[[package]]
+name = "utf8_iter"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
 
 [[package]]
 name = "valuable"
@@ -1249,10 +1405,40 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
-name = "xxhash-rust"
-version = "0.8.15"
+name = "write16"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdd20c5420375476fbd4394763288da7eb0cc0b8c11deed431a91562af7335d3"
+checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
+
+[[package]]
+name = "writeable"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
+
+[[package]]
+name = "yoke"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40"
+dependencies = [
+ "serde",
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
+]
+
+[[package]]
+name = "yoke-derive"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.95",
+ "synstructure",
+]
 
 [[package]]
 name = "zerocopy"
@@ -1274,3 +1460,46 @@ dependencies = [
  "quote",
  "syn 2.0.95",
 ]
+
+[[package]]
+name = "zerofrom"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e"
+dependencies = [
+ "zerofrom-derive",
+]
+
+[[package]]
+name = "zerofrom-derive"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.95",
+ "synstructure",
+]
+
+[[package]]
+name = "zerovec"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
+dependencies = [
+ "yoke",
+ "zerofrom",
+ "zerovec-derive",
+]
+
+[[package]]
+name = "zerovec-derive"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.95",
+]
diff --git a/src/crates/bindex/Cargo.toml b/src/crates/bindex/Cargo.toml
index 705d3ed4c..fdfd1f242 100644
--- a/src/crates/bindex/Cargo.toml
+++ b/src/crates/bindex/Cargo.toml
@@ -9,7 +9,8 @@ biter = "0.2.2"
 color-eyre = "0.6.3"
 ctrlc = "3.4.5"
 derive_deref = "1.1.1"
+heed3 = "0.21.0"
 memmap2 = "0.9.5"
 rayon = "1.10.0"
 snkrj = { path = "../snkrj" }
-canopydb = { git = "https://github.com/arthurprs/canopydb" }
+storable_vec = { path = "../storable_vec" }
diff --git a/src/crates/bindex/src/main.rs b/src/crates/bindex/src/main.rs
index 0746a4aba..3d16849a1 100644
--- a/src/crates/bindex/src/main.rs
+++ b/src/crates/bindex/src/main.rs
@@ -10,6 +10,7 @@ use biter::{
     bitcoin::{TxIn, TxOut, Txid},
     bitcoincore_rpc::{Auth, Client},
 };
+// use heed3::{Database, EnvOpenOptions};
 
 mod structs;
 
@@ -17,7 +18,7 @@ use color_eyre::eyre::{eyre, ContextCompat};
 use rayon::prelude::*;
 use structs::{
     Addressbytes, AddressbytesPrefix, Addressindex, Addressindextxoutindex, Addresstype, Addresstypeindex, Amount,
-    AnyVecdisk, BlockHashPrefix, Databases, Exit, Height, TxidPrefix, Txindex, Txindexvout, Txoutindex, Vecdisks,
+    BlockHashPrefix, Databases, Exit, Height, StorableVecs, TxidPrefix, Txindex, Txindexvout, Txoutindex,
 };
 
 // https://github.com/fjall-rs/fjall/discussions/72
@@ -32,6 +33,8 @@ enum TxInOrAddressindextoutindex<'a> {
 const MONTHLY_BLOCK_TARGET: usize = 144 * 30;
 
 fn main() -> color_eyre::Result<()> {
+    color_eyre::install()?;
+
     let i = std::time::Instant::now();
 
     let check_collisions = true;
@@ -44,31 +47,47 @@ fn main() -> color_eyre::Result<()> {
 
     let path_database = Path::new("./database");
 
-    let mut vecdisks = Vecdisks::import(path_database)?;
+    let mut vecs = StorableVecs::import(path_database)?;
+
+    // let env = unsafe { EnvOpenOptions::new().open(Path::new("./heed"))? };
+    // let mut wtxn = env.write_txn()?;
+
+    // let addressbytes_prefix_to_addressindex: Database<AddressbytesPrefix, Addressindex> =
+    //     env.create_database(&mut wtxn, Some("addressbytes_prefix_to_addressindex"))?;
+    // let addressindextxoutindex_in: Database<Addressindextxoutindex, ()> =
+    //     env.create_database(&mut wtxn, Some("addressindextxoutindex_in"))?;
+    // let addressindextxoutindex_out: Database<Addressindextxoutindex, ()> =
+    //     env.create_database(&mut wtxn, Some("addressindextxoutindex_out"))?;
+    // let blockhash_prefix_to_height: Database<BlockHashPrefix, Height> =
+    //     env.create_database(&mut wtxn, Some("blockhash_prefix_to_height"))?;
+    // let txid_prefix_to_txindex: Database<TxidPrefix, Txindex> =
+    //     env.create_database(&mut wtxn, Some("txid_prefix_to_txindex"))?;
+    // let txindexvout_to_txoutindex: Database<Txindexvout, Txoutindex> =
+    //     env.create_database(&mut wtxn, Some("txindexvout_to_txoutindex"))?;
 
     let databases = Databases::open(path_database)?;
 
     let mut height = Height::from(0_u32);
 
-    let mut txindex = vecdisks
+    let mut txindex = vecs
         .height_to_first_txindex
         .get(height)?
         .cloned()
         .unwrap_or(Txindex::default());
 
-    let mut txoutindex = vecdisks
+    let mut txoutindex = vecs
         .height_to_first_txoutindex
         .get(height)?
         .cloned()
         .unwrap_or(Txoutindex::default());
 
-    let mut addressindex = vecdisks
+    let mut addressindex = vecs
         .height_to_first_addressindex
         .get(height)?
         .cloned()
         .unwrap_or(Addressindex::default());
 
-    let export = |databases: Databases, vecdisks: &mut Vecdisks, height: Height| -> color_eyre::Result<()> {
+    let export = |databases: Databases, vecdisks: &mut StorableVecs, height: Height| -> color_eyre::Result<()> {
         exit.block();
         println!("Exporting...");
         databases.export();
@@ -101,22 +120,23 @@ fn main() -> color_eyre::Result<()> {
             // if parts.blockhash_prefix_to_height.needs(height) {
             let blockhash_prefix = BlockHashPrefix::try_from(&blockhash)?;
 
-            if check_collisions {
-                if let Some(prev_height) =
-                    databases.blockhash_prefix_to_height.get(&blockhash_prefix)
-                {
-                    dbg!(blockhash, prev_height);
-                    return Err(eyre!("Collision, expect prefix to need be set yet"));
-                }
-            }
-
-            databases.blockhash_prefix_to_height.insert(blockhash_prefix,height);
+            // if check_collisions {
+            //     if let Some(prev_height) =
+            //         databases.blockhash_prefix_to_height.get(&blockhash_prefix)
+            //     {
+            //         dbg!(blockhash, prev_height);
+            //         return Err(eyre!("Collision, expect prefix to need be set yet"));
+            //     }
             // }
 
-            vecdisks.height_to_blockhash.push_if_needed(height, blockhash)?;
-            vecdisks.height_to_first_txindex.push_if_needed(height, txindex)?;
-            vecdisks.height_to_first_txoutindex.push_if_needed(height, txoutindex)?;
-            vecdisks.height_to_first_addressindex.push_if_needed(height, addressindex)?;
+            databases.blockhash_prefix_to_height.insert(blockhash_prefix,height);
+            // blockhash_prefix_to_height.put(&mut wtxn, &blockhash_prefix,&height);
+            // }
+
+            vecs.height_to_blockhash.push_if_needed(height, blockhash)?;
+            vecs.height_to_first_txindex.push_if_needed(height, txindex)?;
+            vecs.height_to_first_txoutindex.push_if_needed(height, txoutindex)?;
+            vecs.height_to_first_addressindex.push_if_needed(height, addressindex)?;
 
             let outputs = block
                 .txdata
@@ -200,7 +220,7 @@ fn main() -> color_eyre::Result<()> {
                                         dbg!(outpoint.txid, txindex_local, vout, txindexvout);
                                     })?;
 
-                            let addressindex = *vecdisks.txoutindex_to_addressindex.get(txoutindex)?
+                            let addressindex = *vecs.txoutindex_to_addressindex.get(txoutindex)?
                                 .context("Expect addressindex to not be none")
                                 .inspect_err(|_| {
                                     // let height = vecdisks.txindex_to_height.get(txindex.into()).expect("txindex_to_height get not fail")
@@ -321,7 +341,7 @@ fn main() -> color_eyre::Result<()> {
                         );
                     // }
 
-                    vecdisks.txoutindex_to_amount.push_if_needed(
+                    vecs.txoutindex_to_amount.push_if_needed(
                         txoutindex,
                         amount,
                     )?;
@@ -331,12 +351,12 @@ fn main() -> color_eyre::Result<()> {
                     if let Some(addressindex) = addressindex_opt {
                         addressindex_local = addressindex;
                     } else {
-                        vecdisks.addressindex_to_addresstype.push_if_needed(addressindex_local, addresstype)?;
+                        vecs.addressindex_to_addresstype.push_if_needed(addressindex_local, addresstype)?;
 
                         // TODO: Create counter of other addresstypes instead
-                        let addresstypeindex = Addresstypeindex::from(vecdisks.addresstype_to_addressvecdisk(addresstype).map_or(0, |vecdisk| vecdisk.len()));
+                        let addresstypeindex = Addresstypeindex::from(vecs.addresstype_to_addressbytes(addresstype).map_or(0, |vecdisk| vecdisk.len()));
 
-                        vecdisks.addressindex_to_addresstypeindex.push_if_needed(addressindex_local, addresstypeindex)?;
+                        vecs.addressindex_to_addresstypeindex.push_if_needed(addressindex_local, addresstypeindex)?;
 
                         if let Ok(addressbytes) = addressbytes_res {
                             // if parts.addressbytes_prefix_to_addressindex.needs(height) {
@@ -346,7 +366,7 @@ fn main() -> color_eyre::Result<()> {
                                 );
                             // }
 
-                            vecdisks.push_addressbytes_if_needed(addresstypeindex, addressbytes)?;
+                            vecs.push_addressbytes_if_needed(addresstypeindex, addressbytes)?;
                         }
 
                         addressindex.increment();
@@ -354,7 +374,7 @@ fn main() -> color_eyre::Result<()> {
 
                     new_txindexvout_to_addressindextxoutindex.insert(txindexvout, Addressindextxoutindex::from((addressindex_local, txoutindex)));
 
-                    vecdisks.txoutindex_to_addressindex.push_if_needed(
+                    vecs.txoutindex_to_addressindex.push_if_needed(
                         txoutindex,
                         addressindex_local,
                     )?;
@@ -426,10 +446,10 @@ fn main() -> color_eyre::Result<()> {
                                 return Ok(())
                             }
 
-                            let len = vecdisks.txindex_to_txid.len();
+                            let len = vecs.txindex_to_txid.len();
                             // Ok if `get` is not par as should happen only twice
                             let prev_txid =
-                                vecdisks.txindex_to_txid.get(prev_txindex)?
+                                vecs.txindex_to_txid.get(prev_txindex)?
                                     .context("To have txid for txindex").inspect_err(|_| {
                                         dbg!(txindex_local, txid, len);
                                     })?;
@@ -444,7 +464,7 @@ fn main() -> color_eyre::Result<()> {
                             let is_dup = only_known_dup_txids.contains(prev_txid);
 
                             if !is_dup {
-                                let prev_height = vecdisks.txindex_to_height.get(prev_txindex)?.expect("To have height");
+                                let prev_height = vecs.txindex_to_height.get(prev_txindex)?.expect("To have height");
                                 dbg!(height, txid, txindex_local, prev_height, prev_txid, prev_txindex);
                                 return Err(eyre!("Expect none"));
                             }
@@ -456,18 +476,18 @@ fn main() -> color_eyre::Result<()> {
             )?;
 
             txindex_to_txid.into_iter().try_for_each(|(txindex, txid)| -> color_eyre::Result<()> {
-                vecdisks.txindex_to_txid.push_if_needed(txindex, txid)?;
-                vecdisks.txindex_to_height.push_if_needed(txindex, height)?;
+                vecs.txindex_to_txid.push_if_needed(txindex, txid)?;
+                vecs.txindex_to_height.push_if_needed(txindex, height)?;
                 Ok(())
             })?;
 
-            vecdisks.height_to_last_txindex.push_if_needed(height, txindex.decremented())?;
-            vecdisks.height_to_last_txoutindex.push_if_needed(height, txoutindex.decremented())?;
-            vecdisks.height_to_last_addressindex.push_if_needed(height, addressindex.decremented())?;
+            vecs.height_to_last_txindex.push_if_needed(height, txindex.decremented())?;
+            vecs.height_to_last_txoutindex.push_if_needed(height, txoutindex.decremented())?;
+            vecs.height_to_last_addressindex.push_if_needed(height, addressindex.decremented())?;
 
             let should_snapshot = _height % MONTHLY_BLOCK_TARGET == 0 && !exit.active();
             if should_snapshot {
-                export(databases, &mut vecdisks, height)?;
+                export(databases, &mut vecs, height)?;
                 databases_opt.replace(Databases::open(path_database)?);
             } else {
                 databases_opt.replace(databases);
@@ -484,9 +504,7 @@ fn main() -> color_eyre::Result<()> {
     pause();
 
     let databases = databases_opt.take().context("option should have wtx")?;
-    export(databases, &mut vecdisks, height)?;
-
-    pause();
+    export(databases, &mut vecs, height)?;
 
     dbg!(i.elapsed());
 
diff --git a/src/crates/bindex/src/structs/canopy/database.rs b/src/crates/bindex/src/structs/canopy/database.rs
deleted file mode 100644
index 8cced0770..000000000
--- a/src/crates/bindex/src/structs/canopy/database.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-use std::time::Duration;
-
-use canopydb::{Database as CanopyDatabase, DbOptions};
-use derive_deref::{Deref, DerefMut};
-
-use super::Environment;
-
-#[derive(Debug, Deref, DerefMut)]
-pub struct Database(CanopyDatabase);
-
-impl Database {
-    pub fn new(environment: &Environment, name: &str) -> color_eyre::Result<Self> {
-        let mut options = DbOptions::default();
-        options.use_wal = false;
-        options.checkpoint_interval = Duration::from_secs(u64::MAX);
-        options.checkpoint_target_size = usize::MAX;
-        options.throttle_memory_limit = usize::MAX;
-        options.stall_memory_limit = usize::MAX;
-        options.write_txn_memory_limit = usize::MAX;
-
-        Ok(Self(environment.get_or_create_database_with(name, options)?))
-    }
-}
diff --git a/src/crates/bindex/src/structs/canopy/environment.rs b/src/crates/bindex/src/structs/canopy/environment.rs
deleted file mode 100644
index 562e159d9..000000000
--- a/src/crates/bindex/src/structs/canopy/environment.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-use std::path::Path;
-
-use canopydb::{EnvOptions, Environment as CanopyEnvironment};
-use derive_deref::{Deref, DerefMut};
-
-#[derive(Debug, Deref, DerefMut)]
-pub struct Environment(CanopyEnvironment);
-
-impl Environment {
-    pub fn new(path: &Path) -> color_eyre::Result<Self> {
-        let mut options = EnvOptions::new(path);
-        // options.use_mmap = true;
-        options.disable_fsync = true;
-        options.wal_new_file_on_checkpoint = false;
-        options.wal_background_sync_interval = None;
-        options.wal_write_batch_memory_limit = usize::MAX;
-
-        Ok(Self(CanopyEnvironment::with_options(options)?))
-    }
-}
diff --git a/src/crates/bindex/src/structs/canopy/mod.rs b/src/crates/bindex/src/structs/canopy/mod.rs
deleted file mode 100644
index 46cb95a00..000000000
--- a/src/crates/bindex/src/structs/canopy/mod.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-mod database;
-mod environment;
-// mod transaction;
-mod tree;
-
-pub use database::*;
-pub use environment::*;
-// pub use transaction::*;
-pub use tree::*;
diff --git a/src/crates/bindex/src/structs/canopy/transaction.rs b/src/crates/bindex/src/structs/canopy/transaction.rs
deleted file mode 100644
index d1a6ca13c..000000000
--- a/src/crates/bindex/src/structs/canopy/transaction.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-use canopydb::{Tree as CanopyTree, TreeOptions, WriteTransaction};
-
-use super::{Database, Tree};
-
-#[derive(Debug)]
-pub struct Transaction<'a, K, V> {
-    tx: WriteTransaction,
-    tree: Tree<'a, K, V>,
-}
-
-impl<'a, K, V> Transaction<'a, K, V> {
-    pub fn new(db: &Database) -> color_eyre::Result<Self> {
-        let tx = db.begin_write()?;
-
-        let tree = Tree::new(&tx)?;
-
-        Ok(Self { tx, tree })
-    }
-}
diff --git a/src/crates/bindex/src/structs/canopy/tree.rs b/src/crates/bindex/src/structs/canopy/tree.rs
deleted file mode 100644
index 7809835ea..000000000
--- a/src/crates/bindex/src/structs/canopy/tree.rs
+++ /dev/null
@@ -1,84 +0,0 @@
-use std::{
-    fmt::Debug,
-    marker::PhantomData,
-    ops::{Deref, DerefMut},
-};
-
-use canopydb::{Tree as CanopyTree, TreeOptions, WriteTransaction};
-use color_eyre::eyre::eyre;
-
-#[derive(Debug)]
-pub struct Tree<'a, K, V> {
-    tree: CanopyTree<'a>,
-    k: PhantomData<K>,
-    v: PhantomData<V>,
-}
-impl<'a, K, V> Deref for Tree<'a, K, V> {
-    type Target = CanopyTree<'a>;
-    fn deref(&self) -> &Self::Target {
-        &self.tree
-    }
-}
-impl<'a, K, V> DerefMut for Tree<'a, K, V> {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.tree
-    }
-}
-
-impl<'a, K, V> Tree<'a, K, V>
-where
-    K: Debug + Sized,
-    V: Debug + Sized + Clone + Copy,
-{
-    const SIZE_OF_K: usize = size_of::<K>();
-    const SIZE_OF_V: usize = size_of::<V>();
-
-    pub fn new(tx: &'a WriteTransaction) -> color_eyre::Result<Self> {
-        let mut options = TreeOptions::new();
-        options.compress_overflow_values = None;
-        options.fixed_key_len = size_of::<K>() as i8;
-        options.fixed_value_len = size_of::<V>() as i8;
-
-        Ok(Self {
-            tree: tx.get_or_create_tree_with(b"tree", options)?,
-            k: PhantomData,
-            v: PhantomData,
-        })
-    }
-
-    pub fn get(&self, key: &K) -> color_eyre::Result<Option<V>> {
-        let slice = self.tree.get(Self::key_as_slice(key))?;
-
-        if slice.is_none() {
-            return Ok(None);
-        }
-
-        let slice = slice.unwrap();
-
-        let (prefix, shorts, suffix) = unsafe { slice.align_to::<V>() };
-
-        if !prefix.is_empty() || shorts.len() != 1 || !suffix.is_empty() {
-            dbg!(&key, &prefix, &shorts, &suffix);
-            return Err(eyre!("align_to issue"));
-        }
-
-        Ok(Some(shorts[0]))
-    }
-
-    pub fn insert(&mut self, key: &K, value: &V) -> Result<(), canopydb::Error> {
-        self.tree
-            .insert(Self::key_as_slice(key), Self::value_as_slice(value))
-    }
-
-    fn key_as_slice(key: &K) -> &[u8] {
-        let data: *const K = key;
-        let data: *const u8 = data as *const u8;
-        unsafe { std::slice::from_raw_parts(data, Self::SIZE_OF_K) }
-    }
-
-    fn value_as_slice(value: &V) -> &[u8] {
-        let data: *const V = value;
-        let data: *const u8 = data as *const u8;
-        unsafe { std::slice::from_raw_parts(data, Self::SIZE_OF_V) }
-    }
-}
diff --git a/src/crates/bindex/src/structs/mod.rs b/src/crates/bindex/src/structs/mod.rs
index 44ca041c4..1198641bc 100644
--- a/src/crates/bindex/src/structs/mod.rs
+++ b/src/crates/bindex/src/structs/mod.rs
@@ -4,17 +4,15 @@ mod addressindextxoutindex;
 mod addresstype;
 mod addresstypeindex;
 mod amount;
-mod canopy;
 mod databases;
 mod exit;
 mod height;
 mod prefix;
 mod slice;
+mod storable_vecs;
 mod txindex;
 mod txindexvout;
 mod txoutindex;
-mod vecdisk;
-mod vecdisks;
 
 pub use addressbytes::*;
 pub use addressindex::*;
@@ -22,14 +20,12 @@ pub use addressindextxoutindex::*;
 pub use addresstype::*;
 pub use addresstypeindex::*;
 pub use amount::*;
-pub use canopy::*;
 pub use databases::*;
 pub use exit::*;
 pub use height::*;
 pub use prefix::*;
 pub use slice::*;
+pub use storable_vecs::*;
 pub use txindex::*;
 pub use txindexvout::*;
 pub use txoutindex::*;
-pub use vecdisk::*;
-pub use vecdisks::*;
diff --git a/src/crates/bindex/src/structs/vecdisks.rs b/src/crates/bindex/src/structs/storable_vecs.rs
similarity index 65%
rename from src/crates/bindex/src/structs/vecdisks.rs
rename to src/crates/bindex/src/structs/storable_vecs.rs
index 37843c1ae..ab7042a1a 100644
--- a/src/crates/bindex/src/structs/vecdisks.rs
+++ b/src/crates/bindex/src/structs/storable_vecs.rs
@@ -1,15 +1,16 @@
-use std::{fs, path::Path};
+use std::{fs, io, path::Path};
 
 use biter::bitcoin::{BlockHash, Txid};
 use color_eyre::eyre::eyre;
+use storable_vec::{AnyStorableVec, StorableVec};
 
 use super::{
-    Addressbytes, Addressindex, Addresstype, Addresstypeindex, Amount, AnyVecdisk, Exit, Height, P2PK33AddressBytes,
+    Addressbytes, Addressindex, Addresstype, Addresstypeindex, Amount, Exit, Height, P2PK33AddressBytes,
     P2PK65AddressBytes, P2PKHAddressBytes, P2SHAddressBytes, P2TRAddressBytes, P2WPKHAddressBytes, P2WSHAddressBytes,
-    Txindex, Txoutindex, Vecdisk,
+    Txindex, Txoutindex,
 };
 
-pub struct Vecdisks {
+pub struct StorableVecs {
     // TODO:
     //
     // Add
@@ -22,59 +23,59 @@ pub struct Vecdisks {
     // date_to_fees
     // date_to_first_height
     // date_to_last_height
-    pub addressindex_to_addresstype: Vecdisk<Addressindex, Addresstype>,
-    pub addressindex_to_addresstypeindex: Vecdisk<Addressindex, Addresstypeindex>,
-    pub height_to_blockhash: Vecdisk<Height, BlockHash>,
-    pub height_to_first_addressindex: Vecdisk<Height, Addressindex>,
-    pub height_to_first_txindex: Vecdisk<Height, Txindex>,
-    pub height_to_first_txoutindex: Vecdisk<Height, Txoutindex>,
-    pub height_to_last_addressindex: Vecdisk<Height, Addressindex>,
-    pub height_to_last_txindex: Vecdisk<Height, Txindex>,
-    pub height_to_last_txoutindex: Vecdisk<Height, Txoutindex>,
-    pub p2pk65index_to_p2pk65addressbytes: Vecdisk<Addresstypeindex, P2PK65AddressBytes>,
-    pub p2pk33index_to_p2pk33addressbytes: Vecdisk<Addresstypeindex, P2PK33AddressBytes>,
-    pub p2pkhindex_to_p2pkhaddressbytes: Vecdisk<Addresstypeindex, P2PKHAddressBytes>,
-    pub p2shindex_to_p2shaddressbytes: Vecdisk<Addresstypeindex, P2SHAddressBytes>,
-    pub p2wpkhindex_to_p2wpkhaddressbytes: Vecdisk<Addresstypeindex, P2WPKHAddressBytes>,
-    pub p2wshindex_to_p2wshaddressbytes: Vecdisk<Addresstypeindex, P2WSHAddressBytes>,
-    pub p2trindex_to_p2traddressbytes: Vecdisk<Addresstypeindex, P2TRAddressBytes>,
-    pub txindex_to_height: Vecdisk<Txindex, Height>,
-    pub txindex_to_txid: Vecdisk<Txindex, Txid>,
-    pub txoutindex_to_addressindex: Vecdisk<Txoutindex, Addressindex>,
-    pub txoutindex_to_amount: Vecdisk<Txoutindex, Amount>,
+    pub addressindex_to_addresstype: StorableVec<Addressindex, Addresstype>,
+    pub addressindex_to_addresstypeindex: StorableVec<Addressindex, Addresstypeindex>,
+    pub height_to_blockhash: StorableVec<Height, BlockHash>,
+    pub height_to_first_addressindex: StorableVec<Height, Addressindex>,
+    pub height_to_first_txindex: StorableVec<Height, Txindex>,
+    pub height_to_first_txoutindex: StorableVec<Height, Txoutindex>,
+    pub height_to_last_addressindex: StorableVec<Height, Addressindex>,
+    pub height_to_last_txindex: StorableVec<Height, Txindex>,
+    pub height_to_last_txoutindex: StorableVec<Height, Txoutindex>,
+    pub p2pk65index_to_p2pk65addressbytes: StorableVec<Addresstypeindex, P2PK65AddressBytes>,
+    pub p2pk33index_to_p2pk33addressbytes: StorableVec<Addresstypeindex, P2PK33AddressBytes>,
+    pub p2pkhindex_to_p2pkhaddressbytes: StorableVec<Addresstypeindex, P2PKHAddressBytes>,
+    pub p2shindex_to_p2shaddressbytes: StorableVec<Addresstypeindex, P2SHAddressBytes>,
+    pub p2wpkhindex_to_p2wpkhaddressbytes: StorableVec<Addresstypeindex, P2WPKHAddressBytes>,
+    pub p2wshindex_to_p2wshaddressbytes: StorableVec<Addresstypeindex, P2WSHAddressBytes>,
+    pub p2trindex_to_p2traddressbytes: StorableVec<Addresstypeindex, P2TRAddressBytes>,
+    pub txindex_to_height: StorableVec<Txindex, Height>,
+    pub txindex_to_txid: StorableVec<Txindex, Txid>,
+    pub txoutindex_to_addressindex: StorableVec<Txoutindex, Addressindex>,
+    pub txoutindex_to_amount: StorableVec<Txoutindex, Amount>,
 }
 
 // const UNSAFE_BLOCKS: usize = 100;
 
-impl Vecdisks {
+impl StorableVecs {
     pub fn import(path: &Path) -> color_eyre::Result<Self> {
         fs::create_dir_all(path)?;
 
         Ok(Self {
-            addressindex_to_addresstype: Vecdisk::import(&path.join("addressindex_to_addresstype"))?,
-            addressindex_to_addresstypeindex: Vecdisk::import(&path.join("addressindex_to_addresstypeindex"))?,
-            height_to_blockhash: Vecdisk::import(&path.join("height_to_blockhash"))?,
-            height_to_first_addressindex: Vecdisk::import(&path.join("height_to_first_addressindex"))?,
-            height_to_first_txindex: Vecdisk::import(&path.join("height_to_first_txindex"))?,
-            height_to_first_txoutindex: Vecdisk::import(&path.join("height_to_first_txoutindex"))?,
-            height_to_last_addressindex: Vecdisk::import(&path.join("height_to_last_addressindex"))?,
-            height_to_last_txindex: Vecdisk::import(&path.join("height_to_last_txindex"))?,
-            height_to_last_txoutindex: Vecdisk::import(&path.join("height_to_last_txoutindex"))?,
-            p2pk65index_to_p2pk65addressbytes: Vecdisk::import(&path.join("p2pk65index_to_p2pk65addressbytes"))?,
-            p2pk33index_to_p2pk33addressbytes: Vecdisk::import(&path.join("p2pk33index_to_p2pk33addressbytes"))?,
-            p2pkhindex_to_p2pkhaddressbytes: Vecdisk::import(&path.join("p2pkhindex_to_p2pkhaddressbytes"))?,
-            p2shindex_to_p2shaddressbytes: Vecdisk::import(&path.join("p2shindex_to_p2shaddressbytes"))?,
-            p2wpkhindex_to_p2wpkhaddressbytes: Vecdisk::import(&path.join("p2wpkhindex_to_p2wpkhaddressbytes"))?,
-            p2wshindex_to_p2wshaddressbytes: Vecdisk::import(&path.join("p2wshindex_to_p2wshaddressbytes"))?,
-            p2trindex_to_p2traddressbytes: Vecdisk::import(&path.join("p2trindex_to_p2traddressbytes"))?,
-            txindex_to_height: Vecdisk::import(&path.join("txindex_to_height"))?,
-            txindex_to_txid: Vecdisk::import(&path.join("txindex_to_txid"))?,
-            txoutindex_to_addressindex: Vecdisk::import(&path.join("txoutindex_to_addressindex"))?,
-            txoutindex_to_amount: Vecdisk::import(&path.join("txoutindex_to_amount"))?,
+            addressindex_to_addresstype: StorableVec::import(&path.join("addressindex_to_addresstype"))?,
+            addressindex_to_addresstypeindex: StorableVec::import(&path.join("addressindex_to_addresstypeindex"))?,
+            height_to_blockhash: StorableVec::import(&path.join("height_to_blockhash"))?,
+            height_to_first_addressindex: StorableVec::import(&path.join("height_to_first_addressindex"))?,
+            height_to_first_txindex: StorableVec::import(&path.join("height_to_first_txindex"))?,
+            height_to_first_txoutindex: StorableVec::import(&path.join("height_to_first_txoutindex"))?,
+            height_to_last_addressindex: StorableVec::import(&path.join("height_to_last_addressindex"))?,
+            height_to_last_txindex: StorableVec::import(&path.join("height_to_last_txindex"))?,
+            height_to_last_txoutindex: StorableVec::import(&path.join("height_to_last_txoutindex"))?,
+            p2pk65index_to_p2pk65addressbytes: StorableVec::import(&path.join("p2pk65index_to_p2pk65addressbytes"))?,
+            p2pk33index_to_p2pk33addressbytes: StorableVec::import(&path.join("p2pk33index_to_p2pk33addressbytes"))?,
+            p2pkhindex_to_p2pkhaddressbytes: StorableVec::import(&path.join("p2pkhindex_to_p2pkhaddressbytes"))?,
+            p2shindex_to_p2shaddressbytes: StorableVec::import(&path.join("p2shindex_to_p2shaddressbytes"))?,
+            p2wpkhindex_to_p2wpkhaddressbytes: StorableVec::import(&path.join("p2wpkhindex_to_p2wpkhaddressbytes"))?,
+            p2wshindex_to_p2wshaddressbytes: StorableVec::import(&path.join("p2wshindex_to_p2wshaddressbytes"))?,
+            p2trindex_to_p2traddressbytes: StorableVec::import(&path.join("p2trindex_to_p2traddressbytes"))?,
+            txindex_to_height: StorableVec::import(&path.join("txindex_to_height"))?,
+            txindex_to_txid: StorableVec::import(&path.join("txindex_to_txid"))?,
+            txoutindex_to_addressindex: StorableVec::import(&path.join("txoutindex_to_addressindex"))?,
+            txoutindex_to_amount: StorableVec::import(&path.join("txoutindex_to_amount"))?,
         })
     }
 
-    pub fn addresstype_to_addressvecdisk(&self, addresstype: Addresstype) -> color_eyre::Result<&dyn AnyVecdisk> {
+    pub fn addresstype_to_addressbytes(&self, addresstype: Addresstype) -> color_eyre::Result<&dyn AnyStorableVec> {
         match addresstype {
             Addresstype::P2PK65 => Ok(&self.p2pk65index_to_p2pk65addressbytes),
             Addresstype::P2PK33 => Ok(&self.p2pk33index_to_p2pk33addressbytes),
@@ -217,11 +218,11 @@ impl Vecdisks {
         // Ok(())
     }
 
-    pub fn flush(&mut self) -> color_eyre::Result<()> {
-        self.as_mut_vec().into_iter().try_for_each(AnyVecdisk::flush)
+    pub fn flush(&mut self) -> io::Result<()> {
+        self.as_mut_vec().into_iter().try_for_each(AnyStorableVec::flush)
     }
 
-    fn as_mut_vec(&mut self) -> Vec<&mut dyn AnyVecdisk> {
+    fn as_mut_vec(&mut self) -> Vec<&mut dyn AnyStorableVec> {
         vec![
             &mut self.addressindex_to_addresstype,
             &mut self.addressindex_to_addresstypeindex,
diff --git a/src/crates/snkrj/src/lib.rs b/src/crates/snkrj/src/lib.rs
index a99598595..5d7d29446 100644
--- a/src/crates/snkrj/src/lib.rs
+++ b/src/crates/snkrj/src/lib.rs
@@ -173,6 +173,11 @@ where
             .map(|(key, value)| (key.clone(), value.clone()))
             .collect::<_>()
     }
+
+    #[inline]
+    pub fn len(&self) -> usize {
+        self.iter_ram_then_disk().count()
+    }
 }
 
 pub trait AnyDatabase {
diff --git a/src/crates/storable_vec/Cargo.lock b/src/crates/storable_vec/Cargo.lock
new file mode 100644
index 000000000..0697fc2b7
--- /dev/null
+++ b/src/crates/storable_vec/Cargo.lock
@@ -0,0 +1,246 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 4
+
+[[package]]
+name = "addr2line"
+version = "0.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
+dependencies = [
+ "gimli",
+]
+
+[[package]]
+name = "adler"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+
+[[package]]
+name = "backtrace"
+version = "0.3.71"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d"
+dependencies = [
+ "addr2line",
+ "cc",
+ "cfg-if",
+ "libc",
+ "miniz_oxide",
+ "object",
+ "rustc-demangle",
+]
+
+[[package]]
+name = "cc"
+version = "1.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8293772165d9345bdaaa39b45b2109591e63fe5e6fbc23c6ff930a048aa310b"
+dependencies = [
+ "shlex",
+]
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "color-eyre"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55146f5e46f237f7423d74111267d4597b59b0dad0ffaf7303bce9945d843ad5"
+dependencies = [
+ "backtrace",
+ "color-spantrace",
+ "eyre",
+ "indenter",
+ "once_cell",
+ "owo-colors",
+ "tracing-error",
+]
+
+[[package]]
+name = "color-spantrace"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd6be1b2a7e382e2b98b43b2adcca6bb0e465af0bdd38123873ae61eb17a72c2"
+dependencies = [
+ "once_cell",
+ "owo-colors",
+ "tracing-core",
+ "tracing-error",
+]
+
+[[package]]
+name = "eyre"
+version = "0.6.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec"
+dependencies = [
+ "indenter",
+ "once_cell",
+]
+
+[[package]]
+name = "gimli"
+version = "0.28.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
+
+[[package]]
+name = "indenter"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683"
+
+[[package]]
+name = "lazy_static"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
+
+[[package]]
+name = "libc"
+version = "0.2.169"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
+
+[[package]]
+name = "memchr"
+version = "2.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+
+[[package]]
+name = "memmap2"
+version = "0.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "miniz_oxide"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
+dependencies = [
+ "adler",
+]
+
+[[package]]
+name = "object"
+version = "0.32.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.20.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
+
+[[package]]
+name = "owo-colors"
+version = "3.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f"
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
+
+[[package]]
+name = "rustc-demangle"
+version = "0.1.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
+
+[[package]]
+name = "sharded-slab"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
+dependencies = [
+ "lazy_static",
+]
+
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
+[[package]]
+name = "storable_vec"
+version = "0.1.2"
+dependencies = [
+ "color-eyre",
+ "memmap2",
+]
+
+[[package]]
+name = "thread_local"
+version = "1.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+]
+
+[[package]]
+name = "tracing"
+version = "0.1.41"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
+dependencies = [
+ "pin-project-lite",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-core"
+version = "0.1.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c"
+dependencies = [
+ "once_cell",
+ "valuable",
+]
+
+[[package]]
+name = "tracing-error"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b1581020d7a273442f5b45074a6a57d5757ad0a47dac0e9f0bd57b81936f3db"
+dependencies = [
+ "tracing",
+ "tracing-subscriber",
+]
+
+[[package]]
+name = "tracing-subscriber"
+version = "0.3.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008"
+dependencies = [
+ "sharded-slab",
+ "thread_local",
+ "tracing-core",
+]
+
+[[package]]
+name = "valuable"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
diff --git a/src/crates/storable_vec/Cargo.toml b/src/crates/storable_vec/Cargo.toml
new file mode 100644
index 000000000..0dcbc1b11
--- /dev/null
+++ b/src/crates/storable_vec/Cargo.toml
@@ -0,0 +1,12 @@
+[package]
+name = "storable_vec"
+description = "A very small, fast, efficient and simple storable Vec"
+version = "0.1.2"
+license = "MIT"
+keywords = ["vec", "disk", "data"]
+categories = ["database"]
+edition = "2021"
+
+[dependencies]
+color-eyre = "0.6.3"
+memmap2 = "0.9.5"
diff --git a/src/crates/storable_vec/LICENSE.md b/src/crates/storable_vec/LICENSE.md
new file mode 100644
index 000000000..bd3da5717
--- /dev/null
+++ b/src/crates/storable_vec/LICENSE.md
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2024 storable_vec
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/src/crates/storable_vec/README.md b/src/crates/storable_vec/README.md
new file mode 100644
index 000000000..9a1eb0afb
--- /dev/null
+++ b/src/crates/storable_vec/README.md
@@ -0,0 +1,52 @@
+# storable_vec
+
+A very small, fast, efficient and simple storable `vec` which uses `mmap2` for speed.
+
+## Features
+
+- [x] Get (Rayon compatible)
+- [x] Push
+- [ ] Update
+- [ ] Remove
+
+## Example
+
+```rust
+use std::path::Path;
+
+use storable_vec::{AnyStorableVec, StorableVec};
+
+fn main() -> color_eyre::Result<()> {
+    color_eyre::install()?;
+
+    {
+        let mut vec: StorableVec<usize, u32> = StorableVec::import(Path::new("./v"))?;
+        vec.push(21);
+        dbg!(vec.get(0)?); // 21
+        vec.flush()?;
+    }
+
+    {
+        let vec: StorableVec<usize, u32> = StorableVec::import(Path::new("./v"))?;
+        dbg!(vec.get(0)?); // 21
+    }
+
+    Ok(())
+}
+```
+
+## Disclaimer
+
+Portability will depend on the type of values.
+
+Non bytes/slices types (`u8`, `u16`, ...) will be read as slice in an unsafe manner (using `std::slice::from_raw_parts`) and thus have the endianness of the system. On the other hand, `&[u8]` should be inserted as is.
+
+If portability is important to you, just create a wrapper struct which has custom `get`, `push`, ... methods and does something like:
+
+```rust
+impl StorableVecU64 {
+    pub fn push(&mut self, value: u64) {
+        self.push(&value.to_be_bytes())
+    }
+}
+```
diff --git a/src/crates/bindex/src/structs/vecdisk.rs b/src/crates/storable_vec/src/lib.rs
similarity index 74%
rename from src/crates/bindex/src/structs/vecdisk.rs
rename to src/crates/storable_vec/src/lib.rs
index 13aa4e9fe..d695520df 100644
--- a/src/crates/bindex/src/structs/vecdisk.rs
+++ b/src/crates/storable_vec/src/lib.rs
@@ -5,14 +5,13 @@ use std::{
     io::{self, Write},
     marker::PhantomData,
     mem,
-    ops::Range,
+    ops::{Deref, DerefMut, Range},
     path::Path,
     sync::OnceLock,
 };
 
 use color_eyre::eyre::{eyre, ContextCompat};
 
-use derive_deref::{Deref, DerefMut};
 use memmap2::{Mmap, MmapOptions};
 
 ///
@@ -25,7 +24,7 @@ use memmap2::{Mmap, MmapOptions};
 /// The file isn't portable for speed reasons (TODO: but could be ?)
 ///
 #[derive(Debug)]
-pub struct Vecdisk<I, T> {
+pub struct StorableVec<I, T> {
     file: File,
     mmaps: VecLazyMmap,
     disk_len: usize,
@@ -36,7 +35,7 @@ pub struct Vecdisk<I, T> {
 /// In bytes
 const MAX_PAGE_SIZE: usize = 4096;
 
-impl<I, T> Vecdisk<I, T>
+impl<I, T> StorableVec<I, T>
 where
     I: Into<usize>,
     T: Sized + Debug,
@@ -103,10 +102,8 @@ where
     pub fn get(&self, index: I) -> color_eyre::Result<Option<&T>> {
         self._get(index.into())
     }
-    fn _get(&self, index: usize) -> color_eyre::Result<Option<&T>> {
-        if self.disk_len == 0 {
-            Ok(None)
-        } else if index > self.disk_len - 1 {
+    pub fn _get(&self, index: usize) -> color_eyre::Result<Option<&T>> {
+        if self.disk_len == 0 || index > self.disk_len - 1 {
             Ok(self.cache.get(index - self.disk_len))
         } else {
             let mmap_index = Self::index_to_mmap_index(index);
@@ -115,7 +112,11 @@ where
                 .mmaps
                 .get(mmap_index)
                 .context("Expect mmap to be open")?
-                .get_or_load(MAX_PAGE_SIZE, (mmap_index * Self::PAGE_SIZE) as u64, &self.file);
+                .get_or_load(
+                    MAX_PAGE_SIZE,
+                    (mmap_index * Self::PAGE_SIZE) as u64,
+                    &self.file,
+                );
 
             let range = Self::index_to_range(index);
             let src = &mmap[range];
@@ -150,8 +151,10 @@ where
     }
 
     pub fn push_if_needed(&mut self, index: I, value: T) -> color_eyre::Result<()> {
+        self._push_if_needed(index.into(), value)
+    }
+    pub fn _push_if_needed(&mut self, index: usize, value: T) -> color_eyre::Result<()> {
         let len = self.len();
-        let index = index.into();
         match len.cmp(&index) {
             Ordering::Greater => Ok(()),
             Ordering::Equal => {
@@ -165,23 +168,16 @@ where
             }
         }
     }
-}
 
-pub trait AnyVecdisk {
-    fn len(&self) -> usize;
-    fn flush(&mut self) -> color_eyre::Result<()>;
-}
-
-impl<I, T> AnyVecdisk for Vecdisk<I, T>
-where
-    I: Into<usize>,
-    T: Sized + Debug,
-{
-    fn len(&self) -> usize {
+    pub fn len(&self) -> usize {
         self.disk_len + self.cache.len()
     }
 
-    fn flush(&mut self) -> color_eyre::Result<()> {
+    pub fn is_empty(&self) -> bool {
+        self.len() == 0
+    }
+
+    pub fn flush(&mut self) -> io::Result<()> {
         self.disk_len += self.cache.len();
         self.reset_mmaps();
 
@@ -194,26 +190,67 @@ where
             bytes.extend_from_slice(slice)
         });
 
-        self.file.write_all(&bytes)?;
-
-        Ok(())
+        self.file.write_all(&bytes)
     }
 }
 
-#[derive(Debug, Default, Deref, DerefMut)]
+pub trait AnyStorableVec {
+    fn len(&self) -> usize;
+    fn is_empty(&self) -> bool;
+    fn flush(&mut self) -> io::Result<()>;
+}
+
+impl<I, T> AnyStorableVec for StorableVec<I, T>
+where
+    I: Into<usize>,
+    T: Sized + Debug,
+{
+    fn len(&self) -> usize {
+        self.len()
+    }
+
+    fn is_empty(&self) -> bool {
+        self.is_empty()
+    }
+
+    fn flush(&mut self) -> io::Result<()> {
+        self.flush()
+    }
+}
+
+#[derive(Debug, Default)]
 struct VecLazyMmap(Vec<LazyMmap>);
 impl VecLazyMmap {
     pub fn reset(&mut self, len: usize) {
-        self.clear();
-        self.resize_with(len, Default::default);
+        self.0.clear();
+        self.0.resize_with(len, Default::default);
+    }
+}
+impl Deref for VecLazyMmap {
+    type Target = Vec<LazyMmap>;
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
+impl DerefMut for VecLazyMmap {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        &mut self.0
     }
 }
 
 /// Box to reduce the size, would be 24 instead
-#[derive(Debug, Default, Deref)]
+#[derive(Debug, Default)]
 struct LazyMmap(OnceLock<Box<Mmap>>);
 impl LazyMmap {
     pub fn get_or_load(&self, len: usize, offset: u64, file: &File) -> &Mmap {
-        self.get_or_init(|| Box::new(unsafe { MmapOptions::new().len(len).offset(offset).map(file).unwrap() }))
+        self.0.get_or_init(|| {
+            Box::new(unsafe {
+                MmapOptions::new()
+                    .len(len)
+                    .offset(offset)
+                    .map(file)
+                    .unwrap()
+            })
+        })
     }
 }
diff --git a/src/crates/storable_vec/src/main.rs b/src/crates/storable_vec/src/main.rs
new file mode 100644
index 000000000..f8e048c9b
--- /dev/null
+++ b/src/crates/storable_vec/src/main.rs
@@ -0,0 +1,24 @@
+use std::path::Path;
+
+use storable_vec::{AnyStorableVec, StorableVec};
+
+fn main() -> color_eyre::Result<()> {
+    color_eyre::install()?;
+
+    {
+        let mut vec: StorableVec<usize, u32> = StorableVec::import(Path::new("./v"))?;
+
+        vec.push(21);
+        dbg!(vec.get(0)?); // 21
+
+        vec.flush()?;
+    }
+
+    {
+        let vec: StorableVec<usize, u32> = StorableVec::import(Path::new("./v"))?;
+
+        dbg!(vec.get(0)?); // 21
+    }
+
+    Ok(())
+}

From 1296a2e9ec0898353f64b448ff166bf411e039c0 Mon Sep 17 00:00:00 2001
From: nym21 <expat-epochs0i@icloud.com>
Date: Wed, 22 Jan 2025 11:38:50 +0100
Subject: [PATCH 25/63] general: massive update

---
 CHANGELOG.md                                  |   7 +-
 CONTRIBUTING.md                               |   8 -
 LICENSE.md                                    |   2 +-
 src/crates/bindex/Cargo.lock                  | 530 ++----------------
 src/crates/bindex/Cargo.toml                  |   3 +-
 src/crates/bindex/src/main.rs                 | 294 +++++-----
 src/crates/bindex/src/structs/addressbytes.rs |  76 ++-
 src/crates/bindex/src/structs/date.rs         |  12 +
 src/crates/bindex/src/structs/height.rs       |  26 +-
 src/crates/bindex/src/structs/mod.rs          |  18 +-
 src/crates/bindex/src/structs/partition.rs    | 104 ----
 src/crates/bindex/src/structs/partitions.rs   | 197 -------
 src/crates/bindex/src/structs/prefix.rs       |  53 +-
 src/crates/bindex/src/structs/slice.rs        |   4 +-
 .../bindex/src/structs/storable_vecs.rs       | 249 --------
 src/crates/bindex/src/structs/store.rs        | 153 +++++
 .../src/structs/{databases.rs => stores.rs}   |  84 ++-
 src/crates/bindex/src/structs/timestamp.rs    |  11 +
 src/crates/bindex/src/structs/vec.rs          | 116 ++++
 src/crates/bindex/src/structs/vecs.rs         | 410 ++++++++++++++
 src/crates/bindex/src/structs/version.rs      |  35 +-
 src/crates/snkrj/Cargo.toml                   |   2 +-
 src/crates/snkrj/src/lib.rs                   | 193 +++++--
 src/crates/snkrj/src/main.rs                  |   6 +-
 src/crates/storable_vec/.gitignore            |   1 +
 src/crates/storable_vec/Cargo.lock            | 221 --------
 src/crates/storable_vec/Cargo.toml            |   1 -
 src/crates/storable_vec/README.md             |   1 +
 src/crates/storable_vec/src/lib.rs            | 294 ++++++----
 src/crates/storable_vec/src/main.rs           |  15 +-
 src/parser/price/binance.rs                   |  72 +--
 src/parser/price/kibo.rs                      |  40 +-
 src/parser/price/kraken.rs                    |  76 +--
 33 files changed, 1560 insertions(+), 1754 deletions(-)
 delete mode 100644 CONTRIBUTING.md
 create mode 100644 src/crates/bindex/src/structs/date.rs
 delete mode 100644 src/crates/bindex/src/structs/partition.rs
 delete mode 100644 src/crates/bindex/src/structs/partitions.rs
 delete mode 100644 src/crates/bindex/src/structs/storable_vecs.rs
 create mode 100644 src/crates/bindex/src/structs/store.rs
 rename src/crates/bindex/src/structs/{databases.rs => stores.rs} (69%)
 create mode 100644 src/crates/bindex/src/structs/timestamp.rs
 create mode 100644 src/crates/bindex/src/structs/vec.rs
 create mode 100644 src/crates/bindex/src/structs/vecs.rs
 create mode 100644 src/crates/storable_vec/.gitignore

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bfa74cb29..c5456c4da 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,10 +22,15 @@
 - Added API support for datasets by timestamp (by merging any dataset by height with the height to timestamp dataset and so it still uses heights as chunk ids) [#ca00f3f](https://github.com/kibo-money/kibo/commit/ca00f3f71526f0c5c16021024fec7e5c6e47221c)
   - `/api/realized-price?kind=t`
   - `/api/realized-price?kind=timestamp&chunk=860000`
+- Created separate crate for indexing called `bindex`
+- Created a crate a storage engine specialized in storing datasets that have indexes as keys and thus can be represented by an array/vec called `storable-vec`
+- Removed the need for the `-txindex=1` parameter when starting your Bitcoin Core node as kibō has its own indexes now
+- Tried different storage engines such as `fjall`, `canopydb` and `heed`, the first ended up being 3 times slower than `sanakirja` and the rest wouldn't play nice with `rayon` which is a dealbreaker
+- `snkrj` added a robust auto defragmentation to improve disk usage without the need for user's intervention
 
 ## Git
 
-Added git tags for each version tough Markdown won't display formatted on Github so left the default text
+Added git tags for each version though Markdown won't display formatted on Github so left the default text
 
 # [v0.5.0](https://github.com/kibo-money/kibo/tree/eea56d394bf92c62c81da8b78b8c47ea730683f5) | [873199](https://mempool.space/block/0000000000000000000270925aa6a565be92e13164565a3f7994ca1966e48050) - 2024/12/04
 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
deleted file mode 100644
index e23616908..000000000
--- a/CONTRIBUTING.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# Guidelines
-
-## Parser
-
-- Avoid floats as much as possible
-  - Use structs like `Amount` and `Price` for calculations
-  - **Only** use `Amount.to_btc()` when inserting or computing inside a dataset. It is **very** expensive.
-- No `Arc`, `Rc`, `Mutex` even from third party libraries, they're slower
diff --git a/LICENSE.md b/LICENSE.md
index 77197e6d3..819632a70 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024 kibō
+Copyright (c) 2024 kibō.money
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/src/crates/bindex/Cargo.lock b/src/crates/bindex/Cargo.lock
index 77fb36e11..2b724651b 100644
--- a/src/crates/bindex/Cargo.lock
+++ b/src/crates/bindex/Cargo.lock
@@ -17,16 +17,6 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
-[[package]]
-name = "aead"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0"
-dependencies = [
- "crypto-common",
- "generic-array",
-]
-
 [[package]]
 name = "arrayvec"
 version = "0.7.6"
@@ -76,15 +66,6 @@ version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d965446196e3b7decd44aa7ee49e31d630118f90ef12f97900f262eb915c951d"
 
-[[package]]
-name = "bincode"
-version = "1.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "bindex"
 version = "0.1.0"
@@ -94,8 +75,7 @@ dependencies = [
  "color-eyre",
  "ctrlc",
  "derive_deref",
- "heed3",
- "memmap2",
+ "jiff",
  "rayon",
  "snkrj",
  "storable_vec",
@@ -230,9 +210,6 @@ name = "bitflags"
 version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
-dependencies = [
- "serde",
-]
 
 [[package]]
 name = "byteorder"
@@ -344,16 +321,6 @@ version = "0.8.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
 
-[[package]]
-name = "crypto-common"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
-dependencies = [
- "generic-array",
- "typenum",
-]
-
 [[package]]
 name = "ctrlc"
 version = "3.4.5"
@@ -386,26 +353,6 @@ dependencies = [
  "syn 2.0.95",
 ]
 
-[[package]]
-name = "displaydoc"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.95",
-]
-
-[[package]]
-name = "doxygen-rs"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "415b6ec780d34dcf624666747194393603d0373b7141eef01d12ee58881507d9"
-dependencies = [
- "phf",
-]
-
 [[package]]
 name = "either"
 version = "1.13.0"
@@ -422,15 +369,6 @@ dependencies = [
  "once_cell",
 ]
 
-[[package]]
-name = "form_urlencoded"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
-dependencies = [
- "percent-encoding",
-]
-
 [[package]]
 name = "fs2"
 version = "0.4.3"
@@ -441,17 +379,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "generic-array"
-version = "0.14.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
-dependencies = [
- "serde",
- "typenum",
- "version_check",
-]
-
 [[package]]
 name = "getrandom"
 version = "0.2.15"
@@ -469,46 +396,6 @@ version = "0.28.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
 
-[[package]]
-name = "heed-traits"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb3130048d404c57ce5a1ac61a903696e8fcde7e8c2991e9fcfc1f27c3ef74ff"
-
-[[package]]
-name = "heed-types"
-version = "0.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13c255bdf46e07fb840d120a36dcc81f385140d7191c76a7391672675c01a55d"
-dependencies = [
- "bincode",
- "byteorder",
- "heed-traits",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "heed3"
-version = "0.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7abcf1276482447d5ea921dad8c72fa5b2cfcf4c5016a16491605240bf736205"
-dependencies = [
- "aead",
- "bitflags 2.6.0",
- "byteorder",
- "generic-array",
- "heed-traits",
- "heed-types",
- "libc",
- "lmdb-master3-sys",
- "once_cell",
- "page_size",
- "serde",
- "synchronoise",
- "url",
-]
-
 [[package]]
 name = "hex-conservative"
 version = "0.2.1"
@@ -533,145 +420,6 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3011d1213f159867b13cfd6ac92d2cd5f1345762c63be3554e84092d85a50bbd"
 
-[[package]]
-name = "icu_collections"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
-dependencies = [
- "displaydoc",
- "yoke",
- "zerofrom",
- "zerovec",
-]
-
-[[package]]
-name = "icu_locid"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
-dependencies = [
- "displaydoc",
- "litemap",
- "tinystr",
- "writeable",
- "zerovec",
-]
-
-[[package]]
-name = "icu_locid_transform"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
-dependencies = [
- "displaydoc",
- "icu_locid",
- "icu_locid_transform_data",
- "icu_provider",
- "tinystr",
- "zerovec",
-]
-
-[[package]]
-name = "icu_locid_transform_data"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e"
-
-[[package]]
-name = "icu_normalizer"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
-dependencies = [
- "displaydoc",
- "icu_collections",
- "icu_normalizer_data",
- "icu_properties",
- "icu_provider",
- "smallvec",
- "utf16_iter",
- "utf8_iter",
- "write16",
- "zerovec",
-]
-
-[[package]]
-name = "icu_normalizer_data"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
-
-[[package]]
-name = "icu_properties"
-version = "1.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5"
-dependencies = [
- "displaydoc",
- "icu_collections",
- "icu_locid_transform",
- "icu_properties_data",
- "icu_provider",
- "tinystr",
- "zerovec",
-]
-
-[[package]]
-name = "icu_properties_data"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
-
-[[package]]
-name = "icu_provider"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
-dependencies = [
- "displaydoc",
- "icu_locid",
- "icu_provider_macros",
- "stable_deref_trait",
- "tinystr",
- "writeable",
- "yoke",
- "zerofrom",
- "zerovec",
-]
-
-[[package]]
-name = "icu_provider_macros"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.95",
-]
-
-[[package]]
-name = "idna"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
-dependencies = [
- "idna_adapter",
- "smallvec",
- "utf8_iter",
-]
-
-[[package]]
-name = "idna_adapter"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71"
-dependencies = [
- "icu_normalizer",
- "icu_properties",
-]
-
 [[package]]
 name = "indenter"
 version = "0.3.3"
@@ -693,6 +441,35 @@ version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
 
+[[package]]
+name = "jiff"
+version = "0.1.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2bb0c2e28117985a4d90e3bc70092bc8f226f434c7ec7e23dd9ff99c5c5721a"
+dependencies = [
+ "jiff-tzdb-platform",
+ "log",
+ "portable-atomic",
+ "portable-atomic-util",
+ "serde",
+ "windows-sys",
+]
+
+[[package]]
+name = "jiff-tzdb"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf2cec2f5d266af45a071ece48b1fb89f3b00b2421ac3a5fe10285a6caaa60d3"
+
+[[package]]
+name = "jiff-tzdb-platform"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a63c62e404e7b92979d2792352d885a7f8f83fd1d0d31eea582d77b2ceca697e"
+dependencies = [
+ "jiff-tzdb",
+]
+
 [[package]]
 name = "jsonrpc"
 version = "0.18.0"
@@ -717,23 +494,6 @@ version = "0.2.169"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
 
-[[package]]
-name = "litemap"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104"
-
-[[package]]
-name = "lmdb-master3-sys"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9bea2558bc45a71673600dcd84070be37cdb7a87da2fc7255c6d377c498df00d"
-dependencies = [
- "cc",
- "doxygen-rs",
- "libc",
-]
-
 [[package]]
 name = "lock_api"
 version = "0.4.12"
@@ -818,16 +578,6 @@ version = "3.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f"
 
-[[package]]
-name = "page_size"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30d5b2194ed13191c1999ae0704b7839fb18384fa22e49b57eeaa97d79ce40da"
-dependencies = [
- "libc",
- "winapi",
-]
-
 [[package]]
 name = "parking_lot"
 version = "0.11.2"
@@ -853,60 +603,27 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "percent-encoding"
-version = "2.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
-
-[[package]]
-name = "phf"
-version = "0.11.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078"
-dependencies = [
- "phf_macros",
- "phf_shared",
-]
-
-[[package]]
-name = "phf_generator"
-version = "0.11.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d"
-dependencies = [
- "phf_shared",
- "rand",
-]
-
-[[package]]
-name = "phf_macros"
-version = "0.11.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f84ac04429c13a7ff43785d75ad27569f2951ce0ffd30a3321230db2fc727216"
-dependencies = [
- "phf_generator",
- "phf_shared",
- "proc-macro2",
- "quote",
- "syn 2.0.95",
-]
-
-[[package]]
-name = "phf_shared"
-version = "0.11.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5"
-dependencies = [
- "siphasher",
-]
-
 [[package]]
 name = "pin-project-lite"
 version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff"
 
+[[package]]
+name = "portable-atomic"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6"
+
+[[package]]
+name = "portable-atomic-util"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507"
+dependencies = [
+ "portable-atomic",
+]
+
 [[package]]
 name = "ppv-lite86"
 version = "0.2.20"
@@ -1100,12 +817,6 @@ version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 
-[[package]]
-name = "siphasher"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d"
-
 [[package]]
 name = "smallvec"
 version = "1.13.2"
@@ -1119,17 +830,10 @@ dependencies = [
  "sanakirja",
 ]
 
-[[package]]
-name = "stable_deref_trait"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
-
 [[package]]
 name = "storable_vec"
 version = "0.1.2"
 dependencies = [
- "color-eyre",
  "memmap2",
 ]
 
@@ -1155,26 +859,6 @@ dependencies = [
  "unicode-ident",
 ]
 
-[[package]]
-name = "synchronoise"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dbc01390fc626ce8d1cffe3376ded2b72a11bb70e1c75f404a210e4daa4def2"
-dependencies = [
- "crossbeam-queue",
-]
-
-[[package]]
-name = "synstructure"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.95",
-]
-
 [[package]]
 name = "thiserror"
 version = "1.0.69"
@@ -1205,16 +889,6 @@ dependencies = [
  "once_cell",
 ]
 
-[[package]]
-name = "tinystr"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
-dependencies = [
- "displaydoc",
- "zerovec",
-]
-
 [[package]]
 name = "tracing"
 version = "0.1.41"
@@ -1256,53 +930,18 @@ dependencies = [
  "tracing-core",
 ]
 
-[[package]]
-name = "typenum"
-version = "1.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
-
 [[package]]
 name = "unicode-ident"
 version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83"
 
-[[package]]
-name = "url"
-version = "2.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60"
-dependencies = [
- "form_urlencoded",
- "idna",
- "percent-encoding",
-]
-
-[[package]]
-name = "utf16_iter"
-version = "1.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
-
-[[package]]
-name = "utf8_iter"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
-
 [[package]]
 name = "valuable"
 version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
 
-[[package]]
-name = "version_check"
-version = "0.9.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
-
 [[package]]
 name = "wasi"
 version = "0.11.0+wasi-snapshot-preview1"
@@ -1404,42 +1043,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
-[[package]]
-name = "write16"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
-
-[[package]]
-name = "writeable"
-version = "0.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
-
-[[package]]
-name = "yoke"
-version = "0.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40"
-dependencies = [
- "serde",
- "stable_deref_trait",
- "yoke-derive",
- "zerofrom",
-]
-
-[[package]]
-name = "yoke-derive"
-version = "0.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.95",
- "synstructure",
-]
-
 [[package]]
 name = "zerocopy"
 version = "0.7.35"
@@ -1460,46 +1063,3 @@ dependencies = [
  "quote",
  "syn 2.0.95",
 ]
-
-[[package]]
-name = "zerofrom"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e"
-dependencies = [
- "zerofrom-derive",
-]
-
-[[package]]
-name = "zerofrom-derive"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.95",
- "synstructure",
-]
-
-[[package]]
-name = "zerovec"
-version = "0.10.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
-dependencies = [
- "yoke",
- "zerofrom",
- "zerovec-derive",
-]
-
-[[package]]
-name = "zerovec-derive"
-version = "0.10.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.95",
-]
diff --git a/src/crates/bindex/Cargo.toml b/src/crates/bindex/Cargo.toml
index fdfd1f242..4b86ae73d 100644
--- a/src/crates/bindex/Cargo.toml
+++ b/src/crates/bindex/Cargo.toml
@@ -9,8 +9,7 @@ biter = "0.2.2"
 color-eyre = "0.6.3"
 ctrlc = "3.4.5"
 derive_deref = "1.1.1"
-heed3 = "0.21.0"
-memmap2 = "0.9.5"
+jiff = "0.1.24"
 rayon = "1.10.0"
 snkrj = { path = "../snkrj" }
 storable_vec = { path = "../storable_vec" }
diff --git a/src/crates/bindex/src/main.rs b/src/crates/bindex/src/main.rs
index 3d16849a1..34e224d3e 100644
--- a/src/crates/bindex/src/main.rs
+++ b/src/crates/bindex/src/main.rs
@@ -7,10 +7,9 @@ use std::{
 };
 
 use biter::{
-    bitcoin::{TxIn, TxOut, Txid},
+    bitcoin::{Transaction, TxIn, TxOut, Txid},
     bitcoincore_rpc::{Auth, Client},
 };
-// use heed3::{Database, EnvOpenOptions};
 
 mod structs;
 
@@ -18,10 +17,9 @@ use color_eyre::eyre::{eyre, ContextCompat};
 use rayon::prelude::*;
 use structs::{
     Addressbytes, AddressbytesPrefix, Addressindex, Addressindextxoutindex, Addresstype, Addresstypeindex, Amount,
-    BlockHashPrefix, Databases, Exit, Height, StorableVecs, TxidPrefix, Txindex, Txindexvout, Txoutindex,
+    BlockHashPrefix, Date, Exit, Height, Stores, Timestamp, TxidPrefix, Txindex, Txindexvout, Txoutindex, Vecs,
 };
 
-// https://github.com/fjall-rs/fjall/discussions/72
 // https://github.com/romanz/electrs/blob/master/doc/schema.md
 
 #[derive(Debug)]
@@ -30,7 +28,8 @@ enum TxInOrAddressindextoutindex<'a> {
     Addressindextoutindex(Addressindextxoutindex),
 }
 
-const MONTHLY_BLOCK_TARGET: usize = 144 * 30;
+const UNSAFE_BLOCKS: u32 = 100;
+const SNAPSHOT_BLOCK_RANGE: usize = 4_200; // MUST 210_000 % THIS == 0
 
 fn main() -> color_eyre::Result<()> {
     color_eyre::install()?;
@@ -46,28 +45,19 @@ fn main() -> color_eyre::Result<()> {
     let exit = Exit::new();
 
     let path_database = Path::new("./database");
+    let path_stores = path_database.join("stores");
 
-    let mut vecs = StorableVecs::import(path_database)?;
+    let stores = Stores::open(&path_stores)?;
 
-    // let env = unsafe { EnvOpenOptions::new().open(Path::new("./heed"))? };
-    // let mut wtxn = env.write_txn()?;
+    let mut vecs = Vecs::import(&path_database.join("vecs"))?;
 
-    // let addressbytes_prefix_to_addressindex: Database<AddressbytesPrefix, Addressindex> =
-    //     env.create_database(&mut wtxn, Some("addressbytes_prefix_to_addressindex"))?;
-    // let addressindextxoutindex_in: Database<Addressindextxoutindex, ()> =
-    //     env.create_database(&mut wtxn, Some("addressindextxoutindex_in"))?;
-    // let addressindextxoutindex_out: Database<Addressindextxoutindex, ()> =
-    //     env.create_database(&mut wtxn, Some("addressindextxoutindex_out"))?;
-    // let blockhash_prefix_to_height: Database<BlockHashPrefix, Height> =
-    //     env.create_database(&mut wtxn, Some("blockhash_prefix_to_height"))?;
-    // let txid_prefix_to_txindex: Database<TxidPrefix, Txindex> =
-    //     env.create_database(&mut wtxn, Some("txid_prefix_to_txindex"))?;
-    // let txindexvout_to_txoutindex: Database<Txindexvout, Txoutindex> =
-    //     env.create_database(&mut wtxn, Some("txindexvout_to_txoutindex"))?;
-
-    let databases = Databases::open(path_database)?;
-
-    let mut height = Height::from(0_u32);
+    let mut height = vecs
+        .min_height()
+        .unwrap_or_default()
+        .min(stores.min_height())
+        .and_then(|h| h.checked_sub(UNSAFE_BLOCKS))
+        .map(Height::from)
+        .unwrap_or_default();
 
     let mut txindex = vecs
         .height_to_first_txindex
@@ -87,56 +77,82 @@ fn main() -> color_eyre::Result<()> {
         .cloned()
         .unwrap_or(Addressindex::default());
 
-    let export = |databases: Databases, vecdisks: &mut StorableVecs, height: Height| -> color_eyre::Result<()> {
+    let export = |stores: Stores, vecs: &mut Vecs, height: Height| -> color_eyre::Result<()> {
         exit.block();
         println!("Exporting...");
-        databases.export();
-        vecdisks.flush()?;
+        // Memory: 2.87
+        // Real Memory: 16.23
+        // Private Memory: 10.8
+        if height > Height::from(400_000_u32) {
+            pause();
+        }
+        vecs.reset_cache();
+        println!("Resetted cache");
+        // Memory: 2.87
+        // Real Memory: 13.24
+        // Private Memory: 10.8
+        if height > Height::from(400_000_u32) {
+            pause();
+        }
+        vecs.flush(height)?;
+        println!("Vecs flushed");
+        // Memory: 3.36
+        // Real Memory: 13.55
+        // Private Memory: 10.66
+        // Gone up wtf
+        if height > Height::from(400_000_u32) {
+            pause();
+        }
+        stores.export(height);
         println!("Export done");
+        if height > Height::from(400_000_u32) {
+            pause();
+        }
         exit.unblock();
         Ok(())
     };
 
-    let mut databases_opt = Some(databases);
+    let mut stores_opt = Some(stores);
 
-    biter::new(data_dir, Some(height.into()), Some(400_000), rpc)
+    biter::new(data_dir, Some(height.into()), None, rpc)
         .iter()
         .try_for_each(|(_height, block, blockhash)| -> color_eyre::Result<()> {
             println!("Processing block {_height}...");
 
             height = Height::from(_height);
+            let timestamp = Timestamp::try_from(block.header.time)?;
+            let date = Date::from(&timestamp);
 
-            let mut databases = databases_opt.take().context("option should have wtx")?;
+            let mut stores = stores_opt.take().context("option should have wtx")?;
 
-            // if let Some(saved_blockhash) = vecdisks.height_to_blockhash.get(height)? {
-            //     if &blockhash != saved_blockhash {
-            //         parts.rollback_from(&mut wtx, height, &exit)?;
-            //     } else {
-            //         wtx_opt.replace(wtx);
-            //         return Ok(());
-            //     }
-            // }
+            if let Some(saved_blockhash) = vecs.height_to_blockhash.get(height)? {
+                if &blockhash != saved_blockhash {
+                    todo!("Rollback not implemented");
+                    // parts.rollback_from(&mut wtx, height, &exit)?;
+                }
+            }
 
-            // if parts.blockhash_prefix_to_height.needs(height) {
-            let blockhash_prefix = BlockHashPrefix::try_from(&blockhash)?;
+            if stores.blockhash_prefix_to_height.needs(height) {
+                let blockhash_prefix = BlockHashPrefix::try_from(&blockhash)?;
 
-            // if check_collisions {
-            //     if let Some(prev_height) =
-            //         databases.blockhash_prefix_to_height.get(&blockhash_prefix)
-            //     {
-            //         dbg!(blockhash, prev_height);
-            //         return Err(eyre!("Collision, expect prefix to need be set yet"));
-            //     }
-            // }
+                if check_collisions {
+                    if let Some(prev_height) =
+                        stores.blockhash_prefix_to_height.get(&blockhash_prefix)
+                    {
+                        dbg!(blockhash, prev_height);
+                        return Err(eyre!("Collision, expect prefix to need be set yet"));
+                    }
+                }
 
-            databases.blockhash_prefix_to_height.insert(blockhash_prefix,height);
-            // blockhash_prefix_to_height.put(&mut wtxn, &blockhash_prefix,&height);
-            // }
+                stores.blockhash_prefix_to_height.insert(blockhash_prefix,height);
+            }
 
             vecs.height_to_blockhash.push_if_needed(height, blockhash)?;
             vecs.height_to_first_txindex.push_if_needed(height, txindex)?;
             vecs.height_to_first_txoutindex.push_if_needed(height, txoutindex)?;
             vecs.height_to_first_addressindex.push_if_needed(height, addressindex)?;
+            vecs.height_to_timestamp.push_if_needed(height, timestamp)?;
+            vecs.height_to_date.push_if_needed(height, date)?;
 
             let outputs = block
                 .txdata
@@ -163,14 +179,14 @@ fn main() -> color_eyre::Result<()> {
 
                         let txid_prefix = TxidPrefix::try_from(&txid)?;
 
-                        let prev_txindex_slice_opt = if check_collisions {
+                        let prev_txindex_slice_opt = if check_collisions && stores.txid_prefix_to_txindex.needs(height) {
                             // Should only find collisions for two txids (duplicates), see below
-                            databases.txid_prefix_to_txindex.get(&txid_prefix).cloned()
+                            stores.txid_prefix_to_txindex.get(&txid_prefix).cloned()
                         } else {
                             None
                         };
 
-                        Ok((txid_prefix, (txid, Txindex::from(index), prev_txindex_slice_opt)))
+                        Ok((txid_prefix, (tx, txid, Txindex::from(index), prev_txindex_slice_opt)))
                     })
                     .try_fold(
                         BTreeMap::new,
@@ -201,8 +217,11 @@ fn main() -> color_eyre::Result<()> {
                             let txid = outpoint.txid;
                             let vout = outpoint.vout;
 
-                            let txindex_local = if let Some(txindex_local) = databases.txid_prefix_to_txindex
-                                .get(&TxidPrefix::try_from(&txid)?)
+                            let txindex_local = if let Some(txindex_local) = stores.txid_prefix_to_txindex
+                                .get(&TxidPrefix::try_from(&txid)?).and_then(|txindex_local| {
+                                    // Checking if not finding txindex from the future
+                                    (txindex_local < &txindex).then_some(txindex_local)
+                                })
                             {
                                 *txindex_local
                             } else {
@@ -212,11 +231,9 @@ fn main() -> color_eyre::Result<()> {
                             let txindexvout = Txindexvout::from((txindex_local, vout));
 
                             let txoutindex =
-                                *databases.txindexvout_to_txoutindex.get(&txindexvout)
+                                *stores.txindexvout_to_txoutindex.get(&txindexvout)
                                     .context("Expect txoutindex to not be none")
                                     .inspect_err(|_| {
-                                        // let height = vecdisks.txindex_to_height.get(txindex.into()).expect("txindex_to_height get not fail")
-                                        // .expect("Expect height for txindex");
                                         dbg!(outpoint.txid, txindex_local, vout, txindexvout);
                                     })?;
 
@@ -236,13 +253,7 @@ fn main() -> color_eyre::Result<()> {
                         .try_fold(
                             Vec::new,
                             |mut vec, addressindextxoutindex| {
-                                // There is no need to check for bad_tx as there are only 2 instances known
-                                // Which you can find below and which are coinbase tx and thus which are already filtered
-
-                                // if parts.addressindextxoutindex_out.needs(height) {
-                                    vec.push(addressindextxoutindex?);
-                                // }
-
+                                vec.push(addressindextxoutindex?);
                                 Ok(vec)
                             },
                         )
@@ -257,11 +268,12 @@ fn main() -> color_eyre::Result<()> {
                         })
                 });
 
-                let txoutindex_to_txout_addresstype_addressbytes_res_addressindex_opt_handle = scope.spawn(|| -> color_eyre::Result<BTreeMap<Txoutindex,
-                (&TxOut, Txindexvout, Addresstype, color_eyre::Result<Addressbytes>, Option<Addressindex>)>> {
+                let txoutindex_to_txout_addresstype_addressbytes_res_addressindex_opt_handle = scope.spawn(|| {
                     outputs.into_par_iter().enumerate()
                         .map(
-                            |(block_txoutindex, (block_txindex, vout, txout))| {
+                            #[allow(clippy::type_complexity)]
+                            |(block_txoutindex, (block_txindex, vout, txout))| -> color_eyre::Result<(Txoutindex,
+                            (&TxOut, Txindexvout, Addresstype, color_eyre::Result<Addressbytes>, Option<Addressindex>))> {
                                 let txindex_local = txindex + block_txindex;
                                 let txindexvout = Txindexvout::from((txindex_local, vout));
                                 let txoutindex_local = txoutindex + Txoutindex::from(block_txoutindex);
@@ -274,28 +286,40 @@ fn main() -> color_eyre::Result<()> {
                                     // dbg!(&txout, height, txi, &tx.compute_txid());
                                 });
 
-                                let addressindex_slice_opt = addressbytes_res.as_ref().ok().and_then(|addressbytes| {
-                                    databases.addressbytes_prefix_to_addressindex.get(
-                                        &AddressbytesPrefix::try_from(addressbytes).unwrap(),
-                                    ).cloned()
+                                let addressindex_opt = addressbytes_res.as_ref().ok().and_then(|addressbytes| {
+                                    stores.addressbytes_prefix_to_addressindex.get(
+                                        &AddressbytesPrefix::from((addressbytes, addresstype)),
+                                    )
+                                        .cloned()
+                                        // Checking if not in the future
+                                        .and_then(|addressindex_local| (addressindex_local < addressindex)
+                                        .then_some(addressindex_local))
                                 });
 
-                                let is_new_address = addressindex_slice_opt.is_none();
+                                if let Some(Some(addressindex)) = check_collisions.then_some(addressindex_opt) {
+                                    let addressbytes = addressbytes_res.as_ref().unwrap();
 
-                                if check_collisions && is_new_address {
-                                    if let Ok(addressbytes) = &addressbytes_res {
-                                        if let Some(prev) = databases.addressbytes_prefix_to_addressindex.get(
-                                            &AddressbytesPrefix::try_from(addressbytes)?,
-                                        ) {
-                                            dbg!(prev);
-                                            return Err(eyre!("addressbytes_prefix_to_addressindex collision, expect none"));
-                                        }
+                                    let prev_addresstype = *vecs.addressindex_to_addresstype.get(
+                                        addressindex,
+                                    )?.context("Expect to have address type")?;
+
+                                    let addresstypeindex = *vecs.addressindex_to_addresstypeindex.get(
+                                        addressindex,
+                                    )?.context("Expect to have address type index")?;
+
+                                    let prev_addressbytes_opt= vecs.get_addressbytes(prev_addresstype, addresstypeindex)?;
+
+                                    let prev_addressbytes = prev_addressbytes_opt.as_ref().context("Expect to have addressbytes")?;
+
+                                    if (vecs.addressindex_to_addresstype.hasnt(addressindex) && addresstype != prev_addresstype) || (stores.addressbytes_prefix_to_addressindex.needs(height) && prev_addressbytes != addressbytes) {
+                                        dbg!(addresstype, prev_addresstype, prev_addressbytes, addressbytes, addressindex, addresstypeindex, txout, AddressbytesPrefix::from((addressbytes, addresstype)), AddressbytesPrefix::from((prev_addressbytes, prev_addresstype)));
+                                        panic!()
                                     }
                                 }
 
                                 Ok((
                                     txoutindex_local,
-                                    (txout, txindexvout, addresstype, addressbytes_res, addressindex_slice_opt),
+                                    (txout, txindexvout, addresstype, addressbytes_res, addressindex_opt),
                                 ))
                             },
                         )
@@ -329,17 +353,18 @@ fn main() -> color_eyre::Result<()> {
 
             let mut new_txindexvout_to_addressindextxoutindex: BTreeMap<Txindexvout, Addressindextxoutindex> = BTreeMap::new();
 
+            let mut already_added_addressbytes_prefix: BTreeMap<AddressbytesPrefix, Addressindex> = BTreeMap::new();
+
             txoutindex_to_txout_addresstype_addressbytes_res_addressindex_opt
                 .into_iter()
                 .try_for_each(|(txoutindex, (txout, txindexvout, addresstype, addressbytes_res, addressindex_opt))| -> color_eyre::Result<()> {
                     let amount = Amount::from(txout.value);
 
-                    // if parts.txindexvout_to_txoutindex.needs(height) {
-                        databases.txindexvout_to_txoutindex.insert(
-                            txindexvout,
-                            txoutindex,
-                        );
-                    // }
+                    stores.txindexvout_to_txoutindex.insert_if_needed(
+                        txindexvout,
+                        txoutindex,
+                        height,
+                    );
 
                     vecs.txoutindex_to_amount.push_if_needed(
                         txoutindex,
@@ -348,49 +373,63 @@ fn main() -> color_eyre::Result<()> {
 
                     let mut addressindex_local = addressindex;
 
-                    if let Some(addressindex) = addressindex_opt {
+                    let mut addressbytes_prefix= None;
+
+                    if let Some(addressindex) = addressindex_opt.or_else(|| addressbytes_res.as_ref().ok().and_then(|addressbytes| {
+                        // Check if address was first seen before in this iterator
+                        // Example: https://mempool.space/address/046a0765b5865641ce08dd39690aade26dfbf5511430ca428a3089261361cef170e3929a68aee3d8d4848b0c5111b0a37b82b86ad559fd2a745b44d8e8d9dfdc0c
+                        addressbytes_prefix.replace(AddressbytesPrefix::from((addressbytes, addresstype)));
+                        already_added_addressbytes_prefix.get(
+                        addressbytes_prefix.as_ref().unwrap(),
+                        ).cloned()
+                    })) {
                         addressindex_local = addressindex;
                     } else {
-                        vecs.addressindex_to_addresstype.push_if_needed(addressindex_local, addresstype)?;
+                        addressindex.increment();
 
                         // TODO: Create counter of other addresstypes instead
-                        let addresstypeindex = Addresstypeindex::from(vecs.addresstype_to_addressbytes(addresstype).map_or(0, |vecdisk| vecdisk.len()));
+                        let addresstypeindex = Addresstypeindex::from(vecs.addresstype_to_addressbytes(addresstype).map_or(0, |vec| vec.len()));
+
+                        vecs.addressindex_to_addresstype.push_if_needed(addressindex_local, addresstype)?;
 
                         vecs.addressindex_to_addresstypeindex.push_if_needed(addressindex_local, addresstypeindex)?;
 
                         if let Ok(addressbytes) = addressbytes_res {
-                            // if parts.addressbytes_prefix_to_addressindex.needs(height) {
-                                databases.addressbytes_prefix_to_addressindex.insert(
-                                    AddressbytesPrefix::try_from(&addressbytes)?,
-                                    addressindex_local,
-                                );
-                            // }
+                            let addressbytes_prefix = addressbytes_prefix.unwrap();
+
+                            already_added_addressbytes_prefix.insert(addressbytes_prefix.clone(), addressindex_local);
+
+                            stores.addressbytes_prefix_to_addressindex.insert_if_needed(
+                                addressbytes_prefix,
+                                addressindex_local,
+                                height
+                            );
 
                             vecs.push_addressbytes_if_needed(addresstypeindex, addressbytes)?;
                         }
-
-                        addressindex.increment();
                     }
 
-                    new_txindexvout_to_addressindextxoutindex.insert(txindexvout, Addressindextxoutindex::from((addressindex_local, txoutindex)));
+                    let addressindextxoutindex = Addressindextxoutindex::from((addressindex_local, txoutindex));
+
+                    new_txindexvout_to_addressindextxoutindex.insert(txindexvout, addressindextxoutindex);
 
                     vecs.txoutindex_to_addressindex.push_if_needed(
                         txoutindex,
                         addressindex_local,
                     )?;
 
-                    // if parts.addressindextxoutindex_in.needs(height) {
-                        let addressindextxoutindex = Addressindextxoutindex::from((addressindex_local, txoutindex));
-                        databases.addressindextxoutindex_in.insert(
-                            addressindextxoutindex,
-                           (),
-                        );
-                    // }
+                    stores.addressindextxoutindex_in.insert_if_needed(
+                        addressindextxoutindex,
+                        (),
+                        height,
+                    );
 
                     Ok(())
                 })?;
 
-            // if parts.addressindextxoutindex_out.needs(height) {
+            drop(already_added_addressbytes_prefix);
+
+            if stores.addressindextxoutindex_out.needs(height) {
                 txin_or_addressindextxoutindex_vec
                 .into_iter()
                 .map(|txin_or_addressindextxoutindex| -> color_eyre::Result<Addressindextxoutindex> {
@@ -402,7 +441,7 @@ fn main() -> color_eyre::Result<()> {
                             let vout = outpoint.vout;
                             let index = txid_prefix_to_txid_and_block_txindex_and_prev_txindex
                                 .get(&TxidPrefix::try_from(&txid)?)
-                                .context("txid should be in same block")?.1;
+                                .context("txid should be in same block")?.2;
                             let txindex_local = txindex + index;
 
                             let txindexvout = Txindexvout::from((txindex_local, vout));
@@ -416,30 +455,28 @@ fn main() -> color_eyre::Result<()> {
                     }
                 })
                 .try_for_each(|addressindextxoutindex| -> color_eyre::Result<()> {
-                    databases.addressindextxoutindex_out.insert(
+                    stores.addressindextxoutindex_out.insert(
                         addressindextxoutindex?,
                         (),
                     );
                     Ok(())
                 })?;
-            // }
+            }
 
             drop(new_txindexvout_to_addressindextxoutindex);
 
-            let mut txindex_to_txid: BTreeMap<Txindex, Txid> = BTreeMap::default();
+            let mut txindex_to_tx_and_txid: BTreeMap<Txindex, (&Transaction, Txid)> = BTreeMap::default();
 
             txid_prefix_to_txid_and_block_txindex_and_prev_txindex.into_iter().try_for_each(
-                |(txid_prefix, (txid, index, prev_txindex_opt))| -> color_eyre::Result<()> {
+                |(txid_prefix, (tx, txid, index, prev_txindex_opt))| -> color_eyre::Result<()> {
                     let txindex_local = txindex + index;
 
-                    txindex_to_txid.insert(txindex_local, txid);
+                    txindex_to_tx_and_txid.insert(txindex_local, (tx, txid));
 
                     match prev_txindex_opt {
                         None => {
-                            // if parts.txid_prefix_to_txindex.needs(height) {
-                            databases.txid_prefix_to_txindex.insert(txid_prefix, txindex_local);
-                            // }
-                        }
+                            stores.txid_prefix_to_txindex.insert_if_needed(txid_prefix, txindex_local, height);
+                        },
                         Some(prev_txindex) => {
                             // In case if we start at an already parsed height
                             if txindex_local == prev_txindex {
@@ -475,9 +512,12 @@ fn main() -> color_eyre::Result<()> {
                 },
             )?;
 
-            txindex_to_txid.into_iter().try_for_each(|(txindex, txid)| -> color_eyre::Result<()> {
+            txindex_to_tx_and_txid.into_iter().try_for_each(|(txindex, (tx, txid))| -> color_eyre::Result<()> {
+                vecs.txindex_to_txversion.push_if_needed(txindex, tx.version)?;
                 vecs.txindex_to_txid.push_if_needed(txindex, txid)?;
                 vecs.txindex_to_height.push_if_needed(txindex, height)?;
+                vecs.txindex_to_inputcount.push_if_needed(txindex, tx.input.len() as u32)?;
+                vecs.txindex_to_outputcount.push_if_needed(txindex, tx.output.len() as u32)?;
                 Ok(())
             })?;
 
@@ -485,12 +525,12 @@ fn main() -> color_eyre::Result<()> {
             vecs.height_to_last_txoutindex.push_if_needed(height, txoutindex.decremented())?;
             vecs.height_to_last_addressindex.push_if_needed(height, addressindex.decremented())?;
 
-            let should_snapshot = _height % MONTHLY_BLOCK_TARGET == 0 && !exit.active();
+            let should_snapshot = _height % SNAPSHOT_BLOCK_RANGE == 0 && !exit.active();
             if should_snapshot {
-                export(databases, &mut vecs, height)?;
-                databases_opt.replace(Databases::open(path_database)?);
+                export(stores, &mut vecs, height)?;
+                stores_opt.replace(Stores::open(&path_stores)?);
             } else {
-                databases_opt.replace(databases);
+                stores_opt.replace(stores);
             }
 
             txindex += Txindex::from(tx_len);
@@ -503,8 +543,10 @@ fn main() -> color_eyre::Result<()> {
 
     pause();
 
-    let databases = databases_opt.take().context("option should have wtx")?;
-    export(databases, &mut vecs, height)?;
+    let stores = stores_opt.take().context("option should have wtx")?;
+    export(stores, &mut vecs, height)?;
+
+    pause();
 
     dbg!(i.elapsed());
 
diff --git a/src/crates/bindex/src/structs/addressbytes.rs b/src/crates/bindex/src/structs/addressbytes.rs
index a7a3b773d..463e5d542 100644
--- a/src/crates/bindex/src/structs/addressbytes.rs
+++ b/src/crates/bindex/src/structs/addressbytes.rs
@@ -4,7 +4,7 @@ use derive_deref::{Deref, DerefMut};
 
 use super::Addresstype;
 
-#[derive(Debug)]
+#[derive(Debug, PartialEq, Eq)]
 pub enum Addressbytes {
     P2PK65(P2PK65AddressBytes),
     P2PK33(P2PK33AddressBytes),
@@ -15,6 +15,20 @@ pub enum Addressbytes {
     P2TR(P2TRAddressBytes),
 }
 
+impl Addressbytes {
+    pub fn as_slice(&self) -> &[u8] {
+        match self {
+            Addressbytes::P2PK65(bytes) => &bytes[..],
+            Addressbytes::P2PK33(bytes) => &bytes[..],
+            Addressbytes::P2PKH(bytes) => &bytes[..],
+            Addressbytes::P2SH(bytes) => &bytes[..],
+            Addressbytes::P2WPKH(bytes) => &bytes[..],
+            Addressbytes::P2WSH(bytes) => &bytes[..],
+            Addressbytes::P2TR(bytes) => &bytes[..],
+        }
+    }
+}
+
 impl TryFrom<(&ScriptBuf, Addresstype)> for Addressbytes {
     type Error = color_eyre::Report;
     fn try_from(tuple: (&ScriptBuf, Addresstype)) -> Result<Self, Self::Error> {
@@ -72,28 +86,64 @@ impl TryFrom<(&ScriptBuf, Addresstype)> for Addressbytes {
     }
 }
 
-#[derive(Debug, Clone, Deref)]
+impl From<P2PK65AddressBytes> for Addressbytes {
+    fn from(value: P2PK65AddressBytes) -> Self {
+        Self::P2PK65(value)
+    }
+}
+impl From<P2PK33AddressBytes> for Addressbytes {
+    fn from(value: P2PK33AddressBytes) -> Self {
+        Self::P2PK33(value)
+    }
+}
+impl From<P2PKHAddressBytes> for Addressbytes {
+    fn from(value: P2PKHAddressBytes) -> Self {
+        Self::P2PKH(value)
+    }
+}
+impl From<P2SHAddressBytes> for Addressbytes {
+    fn from(value: P2SHAddressBytes) -> Self {
+        Self::P2SH(value)
+    }
+}
+impl From<P2WPKHAddressBytes> for Addressbytes {
+    fn from(value: P2WPKHAddressBytes) -> Self {
+        Self::P2WPKH(value)
+    }
+}
+impl From<P2WSHAddressBytes> for Addressbytes {
+    fn from(value: P2WSHAddressBytes) -> Self {
+        Self::P2WSH(value)
+    }
+}
+impl From<P2TRAddressBytes> for Addressbytes {
+    fn from(value: P2TRAddressBytes) -> Self {
+        Self::P2TR(value)
+    }
+}
+
+#[derive(Debug, Clone, Deref, PartialEq, Eq)]
 pub struct P2PK65AddressBytes(U8x65);
 
-#[derive(Debug, Clone, Deref)]
+#[derive(Debug, Clone, Deref, PartialEq, Eq)]
 pub struct P2PK33AddressBytes(U8x33);
 
-#[derive(Debug, Clone, Deref)]
+#[derive(Debug, Clone, Deref, PartialEq, Eq)]
 pub struct P2PKHAddressBytes(U8x20);
 
-#[derive(Debug, Clone, Deref)]
+#[derive(Debug, Clone, Deref, PartialEq, Eq)]
 pub struct P2SHAddressBytes(U8x20);
 
-#[derive(Debug, Clone, Deref)]
+#[derive(Debug, Clone, Deref, PartialEq, Eq)]
 pub struct P2WPKHAddressBytes(U8x20);
 
-#[derive(Debug, Clone, Deref)]
+#[derive(Debug, Clone, Deref, PartialEq, Eq)]
 pub struct P2WSHAddressBytes(U8x32);
 
-#[derive(Debug, Clone, Deref)]
+#[derive(Debug, Clone, Deref, PartialEq, Eq)]
 pub struct P2TRAddressBytes(U8x32);
 
-#[derive(Debug, Clone, Deref, DerefMut)]
+#[derive(Debug, Clone, Deref, DerefMut, PartialEq, Eq)]
 pub struct U8x20([u8; 20]);
 impl From<&[u8]> for U8x20 {
     fn from(slice: &[u8]) -> Self {
@@ -103,7 +153,7 @@ impl From<&[u8]> for U8x20 {
     }
 }
 
-#[derive(Debug, Clone, Deref, DerefMut)]
+#[derive(Debug, Clone, Deref, DerefMut, PartialEq, Eq)]
 pub struct U8x32([u8; 32]);
 impl From<&[u8]> for U8x32 {
     fn from(slice: &[u8]) -> Self {
@@ -113,7 +163,7 @@ impl From<&[u8]> for U8x32 {
     }
 }
 
-#[derive(Debug, Clone, Deref, DerefMut)]
+#[derive(Debug, Clone, Deref, DerefMut, PartialEq, Eq)]
 pub struct U8x33([u8; 33]);
 impl From<&[u8]> for U8x33 {
     fn from(slice: &[u8]) -> Self {
@@ -123,7 +173,7 @@ impl From<&[u8]> for U8x33 {
     }
 }
 
-#[derive(Debug, Clone, Deref, DerefMut)]
+#[derive(Debug, Clone, Deref, DerefMut, PartialEq, Eq)]
 pub struct U8x64([u8; 64]);
 impl From<&[u8]> for U8x64 {
     fn from(slice: &[u8]) -> Self {
@@ -133,7 +183,7 @@ impl From<&[u8]> for U8x64 {
     }
 }
 
-#[derive(Debug, Clone, Deref, DerefMut)]
+#[derive(Debug, Clone, Deref, DerefMut, PartialEq, Eq)]
 pub struct U8x65([u8; 65]);
 impl From<&[u8]> for U8x65 {
     fn from(slice: &[u8]) -> Self {
diff --git a/src/crates/bindex/src/structs/date.rs b/src/crates/bindex/src/structs/date.rs
new file mode 100644
index 000000000..3ef99bb54
--- /dev/null
+++ b/src/crates/bindex/src/structs/date.rs
@@ -0,0 +1,12 @@
+use jiff::tz::TimeZone;
+
+use super::Timestamp;
+
+#[derive(Debug)]
+pub struct Date(jiff::civil::Date);
+
+impl From<&Timestamp> for Date {
+    fn from(value: &Timestamp) -> Self {
+        Self(jiff::civil::Date::from(value.to_zoned(TimeZone::UTC)))
+    }
+}
diff --git a/src/crates/bindex/src/structs/height.rs b/src/crates/bindex/src/structs/height.rs
index 6528b8fab..b3df4bc15 100644
--- a/src/crates/bindex/src/structs/height.rs
+++ b/src/crates/bindex/src/structs/height.rs
@@ -1,16 +1,24 @@
 use std::{
-    fmt,
-    ops::{Add, AddAssign, Sub},
+    fmt, fs, io,
+    ops::{Add, AddAssign, Rem, Sub},
+    path::Path,
 };
 
 use biter::bitcoincore_rpc::{self, RpcApi};
 use derive_deref::{Deref, DerefMut};
 use snkrj::{direct_repr, Storable, UnsizedStorable};
+use storable_vec::UnsafeSizedSerDe;
 
 #[derive(Debug, Clone, Copy, Deref, DerefMut, PartialEq, Eq, PartialOrd, Ord, Default)]
 pub struct Height(u32);
 direct_repr!(Height);
 
+impl Height {
+    pub fn write(&self, path: &Path) -> Result<(), io::Error> {
+        fs::write(path, self.unsafe_as_slice())
+    }
+}
+
 impl PartialEq<u64> for Height {
     fn eq(&self, other: &u64) -> bool {
         **self == *other as u32
@@ -68,6 +76,13 @@ impl AddAssign<usize> for Height {
     }
 }
 
+impl Rem<usize> for Height {
+    type Output = Height;
+    fn rem(self, rhs: usize) -> Self::Output {
+        Self(self.abs_diff(Height::from(rhs).0))
+    }
+}
+
 impl fmt::Display for Height {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(f, "{}", **self)
@@ -91,6 +106,13 @@ impl From<Height> for usize {
     }
 }
 
+impl TryFrom<&Path> for Height {
+    type Error = color_eyre::Report;
+    fn try_from(value: &Path) -> Result<Self, Self::Error> {
+        Ok(Self::unsafe_try_from_slice(fs::read(value)?.as_slice())?.to_owned())
+    }
+}
+
 impl TryFrom<&bitcoincore_rpc::Client> for Height {
     type Error = bitcoincore_rpc::Error;
     fn try_from(value: &bitcoincore_rpc::Client) -> Result<Self, Self::Error> {
diff --git a/src/crates/bindex/src/structs/mod.rs b/src/crates/bindex/src/structs/mod.rs
index 1198641bc..0c0a84e02 100644
--- a/src/crates/bindex/src/structs/mod.rs
+++ b/src/crates/bindex/src/structs/mod.rs
@@ -4,15 +4,20 @@ mod addressindextxoutindex;
 mod addresstype;
 mod addresstypeindex;
 mod amount;
-mod databases;
+mod date;
 mod exit;
 mod height;
 mod prefix;
 mod slice;
-mod storable_vecs;
+mod store;
+mod stores;
+mod timestamp;
 mod txindex;
 mod txindexvout;
 mod txoutindex;
+mod vec;
+mod vecs;
+mod version;
 
 pub use addressbytes::*;
 pub use addressindex::*;
@@ -20,12 +25,17 @@ pub use addressindextxoutindex::*;
 pub use addresstype::*;
 pub use addresstypeindex::*;
 pub use amount::*;
-pub use databases::*;
+pub use date::*;
 pub use exit::*;
 pub use height::*;
 pub use prefix::*;
 pub use slice::*;
-pub use storable_vecs::*;
+pub use store::*;
+pub use stores::*;
+pub use timestamp::*;
 pub use txindex::*;
 pub use txindexvout::*;
 pub use txoutindex::*;
+pub use vec::*;
+pub use vecs::*;
+pub use version::*;
diff --git a/src/crates/bindex/src/structs/partition.rs b/src/crates/bindex/src/structs/partition.rs
deleted file mode 100644
index 23791188d..000000000
--- a/src/crates/bindex/src/structs/partition.rs
+++ /dev/null
@@ -1,104 +0,0 @@
-pub use fjall::{PartitionCreateOptions, PersistMode, Result, TransactionalKeyspace, TransactionalPartitionHandle};
-
-use crate::structs::{Height, Version};
-
-use super::Exit;
-
-pub struct Partition {
-    version: Version,
-    data: TransactionalPartitionHandle,
-    meta: TransactionalPartitionHandle,
-    height: Option<Height>,
-}
-
-impl Partition {
-    pub const VERSION: &str = "version";
-    pub const HEIGHT: &str = "height";
-
-    pub fn import(
-        keyspace: &TransactionalKeyspace,
-        name: &str,
-        version: Version,
-        exit: &Exit,
-    ) -> color_eyre::Result<Self> {
-        let data = Self::open_data(keyspace, name)?;
-        let meta = Self::open_meta(keyspace, name)?;
-
-        let mut height = None;
-        if let Some(height_res) = meta.get(Self::HEIGHT)?.map(Height::try_from) {
-            height = Some(height_res?);
-        }
-
-        let mut this = Self {
-            version,
-            height,
-            data,
-            meta,
-        };
-
-        let mut different_version = false;
-        if let Some(slice) = this.meta.get(Self::VERSION)? {
-            different_version = Version::try_from(slice).map_or(true, |version2| version != version2);
-        }
-
-        if different_version {
-            this = this.reset(keyspace, name, exit)?;
-        }
-
-        Ok(this)
-    }
-
-    fn open_data(keyspace: &TransactionalKeyspace, name: &str) -> Result<TransactionalPartitionHandle> {
-        keyspace.open_partition(&format!("{name}_data"), Self::create_options())
-    }
-
-    fn open_meta(keyspace: &TransactionalKeyspace, name: &str) -> Result<TransactionalPartitionHandle> {
-        keyspace.open_partition(&format!("{name}_meta"), Self::create_options())
-    }
-
-    fn create_options() -> PartitionCreateOptions {
-        PartitionCreateOptions::default().manual_journal_persist(true)
-    }
-
-    // TODO: Still needed ?
-    pub fn is_safe(&self, height: Height) -> bool {
-        self.height.is_some_and(|self_height| self_height >= height)
-    }
-
-    pub fn needs(&self, height: Height) -> bool {
-        !self.is_safe(height)
-    }
-
-    pub fn version(&self) -> Version {
-        self.version
-    }
-
-    pub fn data(&self) -> &TransactionalPartitionHandle {
-        &self.data
-    }
-
-    pub fn meta(&self) -> &TransactionalPartitionHandle {
-        &self.meta
-    }
-
-    fn reset(mut self, keyspace: &TransactionalKeyspace, name: &str, exit: &Exit) -> Result<Self> {
-        exit.block();
-
-        keyspace.delete_partition(self.data)?;
-        keyspace.delete_partition(self.meta)?;
-
-        keyspace.persist(PersistMode::SyncAll)?;
-
-        self.data = Self::open_data(keyspace, name)?;
-        self.meta = Self::open_meta(keyspace, name)?;
-        self.height = None;
-
-        exit.unblock();
-
-        Ok(self)
-    }
-
-    pub fn height(&self) -> &Option<Height> {
-        &self.height
-    }
-}
diff --git a/src/crates/bindex/src/structs/partitions.rs b/src/crates/bindex/src/structs/partitions.rs
deleted file mode 100644
index 2563d468f..000000000
--- a/src/crates/bindex/src/structs/partitions.rs
+++ /dev/null
@@ -1,197 +0,0 @@
-use std::ops::Sub;
-
-use fjall::{Slice, TransactionalKeyspace, WriteTransaction};
-
-use crate::structs::{Exit, Height, Partition, Version};
-
-pub struct Partitions {
-    pub addressbytes_prefix_to_addressindex: Partition,
-    pub addressindextxoutindex_in: Partition,
-    pub addressindextxoutindex_out: Partition,
-    pub blockhash_prefix_to_height: Partition,
-    pub txid_prefix_to_txindex: Partition,
-    pub txindexvout_to_txoutindex: Partition,
-}
-
-const UNSAFE_BLOCKS: usize = 100;
-
-impl Partitions {
-    pub fn import(keyspace: &TransactionalKeyspace, exit: &Exit) -> color_eyre::Result<Self> {
-        Ok(Self {
-            addressbytes_prefix_to_addressindex: Partition::import(
-                keyspace,
-                "addressbytes_prefix_to_addressindex",
-                Version::from(1),
-                exit,
-            )?,
-            addressindextxoutindex_in: Partition::import(keyspace, "addresstxoutindexes_in", Version::from(1), exit)?,
-            addressindextxoutindex_out: Partition::import(keyspace, "addresstxoutindexes_out", Version::from(1), exit)?,
-            blockhash_prefix_to_height: Partition::import(
-                keyspace,
-                "blockhash_prefix_to_height",
-                Version::from(1),
-                exit,
-            )?,
-            txid_prefix_to_txindex: Partition::import(keyspace, "txid_prefix_to_txindex", Version::from(1), exit)?,
-            txindexvout_to_txoutindex: Partition::import(
-                keyspace,
-                "txindexvout_to_txoutindex",
-                Version::from(1),
-                exit,
-            )?,
-        })
-    }
-
-    pub fn udpate_meta(&self, wtx: &mut WriteTransaction, height: Height) {
-        self.to_vec().into_iter().for_each(|part| {
-            let meta = part.meta();
-            wtx.insert(meta, Partition::VERSION, Slice::from(part.version()));
-            wtx.insert(meta, Partition::HEIGHT, height.to_be_bytes());
-        });
-    }
-
-    pub fn start_height(&self) -> Height {
-        self.min_height()
-            .map(|height| height.sub(UNSAFE_BLOCKS))
-            .unwrap_or_default()
-    }
-
-    fn min_height(&self) -> Option<Height> {
-        self.to_vec()
-            .into_iter()
-            .map(|part| part.height())
-            .map(ToOwned::to_owned)
-            .min()
-            .flatten()
-    }
-
-    pub fn rollback_from(
-        &mut self,
-        _wtx: &mut WriteTransaction,
-        _height: Height,
-        _exit: &Exit,
-    ) -> color_eyre::Result<()> {
-        panic!();
-        // let mut txindex = None;
-
-        // wtx.range(self.height_to_blockhash.data(), Slice::from(height)..)
-        //     .try_for_each(|slice| -> color_eyre::Result<()> {
-        //         let (height_slice, slice_blockhash) = slice?;
-        //         let blockhash = BlockHash::from_slice(&slice_blockhash)?;
-
-        //         wtx.remove(self.height_to_blockhash.data(), height_slice);
-
-        //         wtx.remove(self.blockhash_prefix_to_height.data(), blockhash.prefix());
-
-        //         if txindex.is_none() {
-        //             txindex.replace(
-        //                 wtx.get(self.height_to_first_txindex.data(), height_slice)?
-        //                     .context("for height to have first txindex")?,
-        //             );
-        //         }
-        //         wtx.remove(self.height_to_first_txindex.data(), height_slice);
-        //         wtx.remove(self.height_to_last_txindex.data(), height_slice);
-
-        //         Ok(())
-        //     })?;
-
-        // let txindex = txindex.context("txindex to not be none by now")?;
-
-        // wtx.range(self.txindex_to_txid.data(), Slice::from(txindex)..)
-        //     .try_for_each(|slice| -> color_eyre::Result<()> {
-        //         let (slice_txindex, slice_txid) = slice?;
-        //         let txindex = Txindex::from(slice_txindex);
-        //         let txid = Txid::from_slice(&slice_txid)?;
-
-        //         wtx.remove(self.txindex_to_txid.data(), Slice::from(txindex));
-        //         wtx.remove(self.txindex_to_height.data(), Slice::from(txindex));
-        //         wtx.remove(self.txid_prefix_to_txindex.data(), txid.prefix());
-
-        //         Ok(())
-        //     })?;
-
-        // let txoutindex = Txoutindex::from(txindex);
-
-        // let mut addressindexes = BTreeSet::new();
-
-        // wtx.range(self.txoutindex_to_amount.data(), Slice::from(txoutindex)..)
-        //     .try_for_each(|slice| -> color_eyre::Result<()> {
-        //         let (txoutindex_slice, _) = slice?;
-
-        //         wtx.remove(self.txoutindex_to_amount.data(), txoutindex_slice);
-
-        //         if let Some(addressindex_slice) =
-        //             wtx.get(self.txoutindex_to_addressindex.data(), txoutindex_slice)?
-        //         {
-        //             wtx.remove(self.txoutindex_to_addressindex.data(), txoutindex_slice);
-
-        //             let addressindex = Addressindex::from(addressindex_slice);
-        //             addressindexes.insert(addressindex);
-
-        //             let txoutindex = Txoutindex::from(txoutindex_slice);
-        //             let addresstxoutindex = Addresstxoutindex::from((addressindex, txoutindex));
-
-        //             wtx.remove(
-        //                 self.addressindex_to_txoutindexes.data(),
-        //                 Slice::from(addresstxoutindex),
-        //             );
-        //         }
-
-        //         Ok(())
-        //     })?;
-
-        // addressindexes
-        // .into_iter()
-        // .filter(|addressindex| {
-        //     let is_empty = wtx
-        //         .prefix(
-        //             self.addressindex_to_txoutindexes.data(),
-        //             Slice::from(*addressindex),
-        //         )
-        //         .next()
-        //         .is_none();
-        //     is_empty
-        // })
-        // .try_for_each(|addressindex| -> color_eyre::Result<()> {
-        //     let addressindex_slice = Slice::from(addressindex);
-
-        //     let addressbytes = Addressbytes::from(
-        //         wtx.get(
-        //             self.addressindex_to_addressbytes.data(),
-        //             &addressindex_slice,
-        //         )?
-        //         .context("addressindex_to_address to have value")?,
-        //     );
-        //     wtx.remove(
-        //         self.addressbytes_prefix_to_addressindex.data(),
-        //         addressbytes.prefix(),
-        //     );
-        //     wtx.remove(
-        //         self.addressindex_to_addressbytes.data(),
-        //         &addressindex_slice,
-        //     );
-        //     wtx.remove(self.addressindex_to_addresstype.data(), &addressindex_slice);
-
-        //     Ok(())
-        // })?;
-        //
-
-        // todo!("clear addresstxoutindexes_out")
-        // todo!("clear addresstxoutindexes_in")
-        // todo!("clear zero_txoutindexes")
-        // todo!("clear txindexvout_to_txoutindex")
-
-        // Ok(())
-    }
-
-    fn to_vec(&self) -> Vec<&Partition> {
-        vec![
-            &self.addressbytes_prefix_to_addressindex,
-            &self.addressindextxoutindex_in,
-            &self.addressindextxoutindex_out,
-            &self.blockhash_prefix_to_height,
-            &self.txid_prefix_to_txindex,
-            &self.txindexvout_to_txoutindex,
-        ]
-    }
-}
diff --git a/src/crates/bindex/src/structs/prefix.rs b/src/crates/bindex/src/structs/prefix.rs
index ee90efbda..06c113458 100644
--- a/src/crates/bindex/src/structs/prefix.rs
+++ b/src/crates/bindex/src/structs/prefix.rs
@@ -2,52 +2,49 @@ use biter::bitcoin::{BlockHash, Txid};
 use derive_deref::Deref;
 use snkrj::{direct_repr, Storable, UnsizedStorable};
 
-use super::{Addressbytes, SliceExtended};
+use super::{Addressbytes, Addresstype, SliceExtended};
 
 #[derive(Debug, Deref, Clone, PartialEq, Eq, PartialOrd, Ord)]
-pub struct Prefix([u8; 8]);
-direct_repr!(Prefix);
-impl TryFrom<&[u8]> for Prefix {
-    type Error = color_eyre::Report;
-    fn try_from(value: &[u8]) -> Result<Self, Self::Error> {
-        Ok(Self(value.read_8xU8()?))
-    }
-}
-
-#[derive(Debug, Deref, Clone, PartialEq, Eq, PartialOrd, Ord)]
-pub struct AddressbytesPrefix(Prefix);
+pub struct AddressbytesPrefix([u8; 8]);
 direct_repr!(AddressbytesPrefix);
-impl TryFrom<&Addressbytes> for AddressbytesPrefix {
-    type Error = color_eyre::Report;
-    fn try_from(value: &Addressbytes) -> Result<Self, Self::Error> {
-        Ok(Self(Prefix::try_from(match value {
-            Addressbytes::P2PK65(bytes) => &bytes[..],
-            Addressbytes::P2PK33(bytes) => &bytes[..],
-            Addressbytes::P2PKH(bytes) => &bytes[..],
-            Addressbytes::P2SH(bytes) => &bytes[..],
-            Addressbytes::P2WPKH(bytes) => &bytes[..],
-            Addressbytes::P2WSH(bytes) => &bytes[..],
-            Addressbytes::P2TR(bytes) => &bytes[..],
-        })?))
+impl From<(&Addressbytes, Addresstype)> for AddressbytesPrefix {
+    fn from((addressbytes, addresstype): (&Addressbytes, Addresstype)) -> Self {
+        let shorten = |slice: &[u8]| {
+            let len = slice.len();
+            let mut buf: [u8; 8] = [0; 8];
+            // Using both ends for collision reasons despite rehashing the addresses
+            (0..4_usize).for_each(|i| {
+                buf[i] = slice[i];
+                buf[4 + i] = slice[len - 4 + i];
+            });
+            buf[4] = addresstype as u8;
+            // Put in the middle and not at the start because either the first or the last byte can be used to split and if the type is used it wouldn't have the 0..256 range
+            // End result:
+            // [ i=0, i=1, i=2, i=3, type as u8, i=len-3, i=len-2, i=len-1 ]
+            buf
+        };
+        Self(shorten(
+            bitcoin_hashes::hash160::Hash::hash(addressbytes.as_slice()).as_byte_array(),
+        ))
     }
 }
 
 #[derive(Debug, Deref, Clone, PartialEq, Eq, PartialOrd, Ord)]
-pub struct BlockHashPrefix(Prefix);
+pub struct BlockHashPrefix([u8; 8]);
 direct_repr!(BlockHashPrefix);
 impl TryFrom<&BlockHash> for BlockHashPrefix {
     type Error = color_eyre::Report;
     fn try_from(value: &BlockHash) -> Result<Self, Self::Error> {
-        Ok(Self(Prefix::try_from(&value[..])?))
+        Ok(Self((&value[..]).read_8x_u8()?))
     }
 }
 
 #[derive(Debug, Deref, Clone, PartialEq, Eq, PartialOrd, Ord)]
-pub struct TxidPrefix(Prefix);
+pub struct TxidPrefix([u8; 8]);
 direct_repr!(TxidPrefix);
 impl TryFrom<&Txid> for TxidPrefix {
     type Error = color_eyre::Report;
     fn try_from(value: &Txid) -> Result<Self, Self::Error> {
-        Ok(Self(Prefix::try_from(&value[..])?))
+        Ok(Self((&value[..]).read_8x_u8()?))
     }
 }
diff --git a/src/crates/bindex/src/structs/slice.rs b/src/crates/bindex/src/structs/slice.rs
index 1c598970b..d09b7890f 100644
--- a/src/crates/bindex/src/structs/slice.rs
+++ b/src/crates/bindex/src/structs/slice.rs
@@ -2,7 +2,7 @@ use color_eyre::eyre::eyre;
 
 #[allow(unused)]
 pub trait SliceExtended {
-    fn read_8xU8(&self) -> color_eyre::Result<[u8; 8]>;
+    fn read_8x_u8(&self) -> color_eyre::Result<[u8; 8]>;
     fn read_be_u8(&self) -> color_eyre::Result<u8>;
     fn read_be_u16(&self) -> color_eyre::Result<u16>;
     fn read_be_u32(&self) -> color_eyre::Result<u32>;
@@ -11,7 +11,7 @@ pub trait SliceExtended {
 }
 
 impl SliceExtended for &[u8] {
-    fn read_8xU8(&self) -> color_eyre::Result<[u8; 8]> {
+    fn read_8x_u8(&self) -> color_eyre::Result<[u8; 8]> {
         let mut buf: [u8; 8] = [0; 8];
         (&self[..8]).read_exact(&mut buf)?;
         Ok(buf)
diff --git a/src/crates/bindex/src/structs/storable_vecs.rs b/src/crates/bindex/src/structs/storable_vecs.rs
deleted file mode 100644
index ab7042a1a..000000000
--- a/src/crates/bindex/src/structs/storable_vecs.rs
+++ /dev/null
@@ -1,249 +0,0 @@
-use std::{fs, io, path::Path};
-
-use biter::bitcoin::{BlockHash, Txid};
-use color_eyre::eyre::eyre;
-use storable_vec::{AnyStorableVec, StorableVec};
-
-use super::{
-    Addressbytes, Addressindex, Addresstype, Addresstypeindex, Amount, Exit, Height, P2PK33AddressBytes,
-    P2PK65AddressBytes, P2PKHAddressBytes, P2SHAddressBytes, P2TRAddressBytes, P2WPKHAddressBytes, P2WSHAddressBytes,
-    Txindex, Txoutindex,
-};
-
-pub struct StorableVecs {
-    // TODO:
-    //
-    // Add
-    // txindex_to_fees
-    // height_to_fees
-    // height_to_utc_date
-    // height_to_timestamp
-    //
-    // NOT the following as because of reorg it's subjective
-    // date_to_fees
-    // date_to_first_height
-    // date_to_last_height
-    pub addressindex_to_addresstype: StorableVec<Addressindex, Addresstype>,
-    pub addressindex_to_addresstypeindex: StorableVec<Addressindex, Addresstypeindex>,
-    pub height_to_blockhash: StorableVec<Height, BlockHash>,
-    pub height_to_first_addressindex: StorableVec<Height, Addressindex>,
-    pub height_to_first_txindex: StorableVec<Height, Txindex>,
-    pub height_to_first_txoutindex: StorableVec<Height, Txoutindex>,
-    pub height_to_last_addressindex: StorableVec<Height, Addressindex>,
-    pub height_to_last_txindex: StorableVec<Height, Txindex>,
-    pub height_to_last_txoutindex: StorableVec<Height, Txoutindex>,
-    pub p2pk65index_to_p2pk65addressbytes: StorableVec<Addresstypeindex, P2PK65AddressBytes>,
-    pub p2pk33index_to_p2pk33addressbytes: StorableVec<Addresstypeindex, P2PK33AddressBytes>,
-    pub p2pkhindex_to_p2pkhaddressbytes: StorableVec<Addresstypeindex, P2PKHAddressBytes>,
-    pub p2shindex_to_p2shaddressbytes: StorableVec<Addresstypeindex, P2SHAddressBytes>,
-    pub p2wpkhindex_to_p2wpkhaddressbytes: StorableVec<Addresstypeindex, P2WPKHAddressBytes>,
-    pub p2wshindex_to_p2wshaddressbytes: StorableVec<Addresstypeindex, P2WSHAddressBytes>,
-    pub p2trindex_to_p2traddressbytes: StorableVec<Addresstypeindex, P2TRAddressBytes>,
-    pub txindex_to_height: StorableVec<Txindex, Height>,
-    pub txindex_to_txid: StorableVec<Txindex, Txid>,
-    pub txoutindex_to_addressindex: StorableVec<Txoutindex, Addressindex>,
-    pub txoutindex_to_amount: StorableVec<Txoutindex, Amount>,
-}
-
-// const UNSAFE_BLOCKS: usize = 100;
-
-impl StorableVecs {
-    pub fn import(path: &Path) -> color_eyre::Result<Self> {
-        fs::create_dir_all(path)?;
-
-        Ok(Self {
-            addressindex_to_addresstype: StorableVec::import(&path.join("addressindex_to_addresstype"))?,
-            addressindex_to_addresstypeindex: StorableVec::import(&path.join("addressindex_to_addresstypeindex"))?,
-            height_to_blockhash: StorableVec::import(&path.join("height_to_blockhash"))?,
-            height_to_first_addressindex: StorableVec::import(&path.join("height_to_first_addressindex"))?,
-            height_to_first_txindex: StorableVec::import(&path.join("height_to_first_txindex"))?,
-            height_to_first_txoutindex: StorableVec::import(&path.join("height_to_first_txoutindex"))?,
-            height_to_last_addressindex: StorableVec::import(&path.join("height_to_last_addressindex"))?,
-            height_to_last_txindex: StorableVec::import(&path.join("height_to_last_txindex"))?,
-            height_to_last_txoutindex: StorableVec::import(&path.join("height_to_last_txoutindex"))?,
-            p2pk65index_to_p2pk65addressbytes: StorableVec::import(&path.join("p2pk65index_to_p2pk65addressbytes"))?,
-            p2pk33index_to_p2pk33addressbytes: StorableVec::import(&path.join("p2pk33index_to_p2pk33addressbytes"))?,
-            p2pkhindex_to_p2pkhaddressbytes: StorableVec::import(&path.join("p2pkhindex_to_p2pkhaddressbytes"))?,
-            p2shindex_to_p2shaddressbytes: StorableVec::import(&path.join("p2shindex_to_p2shaddressbytes"))?,
-            p2wpkhindex_to_p2wpkhaddressbytes: StorableVec::import(&path.join("p2wpkhindex_to_p2wpkhaddressbytes"))?,
-            p2wshindex_to_p2wshaddressbytes: StorableVec::import(&path.join("p2wshindex_to_p2wshaddressbytes"))?,
-            p2trindex_to_p2traddressbytes: StorableVec::import(&path.join("p2trindex_to_p2traddressbytes"))?,
-            txindex_to_height: StorableVec::import(&path.join("txindex_to_height"))?,
-            txindex_to_txid: StorableVec::import(&path.join("txindex_to_txid"))?,
-            txoutindex_to_addressindex: StorableVec::import(&path.join("txoutindex_to_addressindex"))?,
-            txoutindex_to_amount: StorableVec::import(&path.join("txoutindex_to_amount"))?,
-        })
-    }
-
-    pub fn addresstype_to_addressbytes(&self, addresstype: Addresstype) -> color_eyre::Result<&dyn AnyStorableVec> {
-        match addresstype {
-            Addresstype::P2PK65 => Ok(&self.p2pk65index_to_p2pk65addressbytes),
-            Addresstype::P2PK33 => Ok(&self.p2pk33index_to_p2pk33addressbytes),
-            Addresstype::P2PKH => Ok(&self.p2pkhindex_to_p2pkhaddressbytes),
-            Addresstype::P2SH => Ok(&self.p2shindex_to_p2shaddressbytes),
-            Addresstype::P2WPKH => Ok(&self.p2wpkhindex_to_p2wpkhaddressbytes),
-            Addresstype::P2WSH => Ok(&self.p2wshindex_to_p2wshaddressbytes),
-            Addresstype::P2TR => Ok(&self.p2trindex_to_p2traddressbytes),
-            _ => Err(eyre!("wrong address type")),
-        }
-    }
-
-    pub fn push_addressbytes_if_needed(
-        &mut self,
-        index: Addresstypeindex,
-        addressbytes: Addressbytes,
-    ) -> color_eyre::Result<()> {
-        match addressbytes {
-            Addressbytes::P2PK65(bytes) => self.p2pk65index_to_p2pk65addressbytes.push_if_needed(index, bytes),
-            Addressbytes::P2PK33(bytes) => self.p2pk33index_to_p2pk33addressbytes.push_if_needed(index, bytes),
-            Addressbytes::P2PKH(bytes) => self.p2pkhindex_to_p2pkhaddressbytes.push_if_needed(index, bytes),
-            Addressbytes::P2SH(bytes) => self.p2shindex_to_p2shaddressbytes.push_if_needed(index, bytes),
-            Addressbytes::P2WPKH(bytes) => self.p2wpkhindex_to_p2wpkhaddressbytes.push_if_needed(index, bytes),
-            Addressbytes::P2WSH(bytes) => self.p2wshindex_to_p2wshaddressbytes.push_if_needed(index, bytes),
-            Addressbytes::P2TR(bytes) => self.p2trindex_to_p2traddressbytes.push_if_needed(index, bytes),
-        }
-    }
-
-    #[allow(unused)]
-    pub fn rollback_from(&mut self, _height: Height, _exit: &Exit) -> color_eyre::Result<()> {
-        panic!();
-        // let mut txindex = None;
-
-        // wtx.range(self.height_to_blockhash.data(), Slice::from(height)..)
-        //     .try_for_each(|slice| -> color_eyre::Result<()> {
-        //         let (height_slice, slice_blockhash) = slice?;
-        //         let blockhash = BlockHash::from_slice(&slice_blockhash)?;
-
-        //         wtx.remove(self.height_to_blockhash.data(), height_slice);
-
-        //         wtx.remove(self.blockhash_prefix_to_height.data(), blockhash.prefix());
-
-        //         if txindex.is_none() {
-        //             txindex.replace(
-        //                 wtx.get(self.height_to_first_txindex.data(), height_slice)?
-        //                     .context("for height to have first txindex")?,
-        //             );
-        //         }
-        //         wtx.remove(self.height_to_first_txindex.data(), height_slice);
-        //         wtx.remove(self.height_to_last_txindex.data(), height_slice);
-
-        //         Ok(())
-        //     })?;
-
-        // let txindex = txindex.context("txindex to not be none by now")?;
-
-        // wtx.range(self.txindex_to_txid.data(), Slice::from(txindex)..)
-        //     .try_for_each(|slice| -> color_eyre::Result<()> {
-        //         let (slice_txindex, slice_txid) = slice?;
-        //         let txindex = Txindex::from(slice_txindex);
-        //         let txid = Txid::from_slice(&slice_txid)?;
-
-        //         wtx.remove(self.txindex_to_txid.data(), Slice::from(txindex));
-        //         wtx.remove(self.txindex_to_height.data(), Slice::from(txindex));
-        //         wtx.remove(self.txid_prefix_to_txindex.data(), txid.prefix());
-
-        //         Ok(())
-        //     })?;
-
-        // let txoutindex = Txoutindex::from(txindex);
-
-        // let mut addressindexes = BTreeSet::new();
-
-        // wtx.range(self.txoutindex_to_amount.data(), Slice::from(txoutindex)..)
-        //     .try_for_each(|slice| -> color_eyre::Result<()> {
-        //         let (txoutindex_slice, _) = slice?;
-
-        //         wtx.remove(self.txoutindex_to_amount.data(), txoutindex_slice);
-
-        //         if let Some(addressindex_slice) =
-        //             wtx.get(self.txoutindex_to_addressindex.data(), txoutindex_slice)?
-        //         {
-        //             wtx.remove(self.txoutindex_to_addressindex.data(), txoutindex_slice);
-
-        //             let addressindex = Addressindex::from(addressindex_slice);
-        //             addressindexes.insert(addressindex);
-
-        //             let txoutindex = Txoutindex::from(txoutindex_slice);
-        //             let addresstxoutindex = Addresstxoutindex::from((addressindex, txoutindex));
-
-        //             wtx.remove(
-        //                 self.addressindex_to_txoutindexes.data(),
-        //                 Slice::from(addresstxoutindex),
-        //             );
-        //         }
-
-        //         Ok(())
-        //     })?;
-
-        // addressindexes
-        // .into_iter()
-        // .filter(|addressindex| {
-        //     let is_empty = wtx
-        //         .prefix(
-        //             self.addressindex_to_txoutindexes.data(),
-        //             Slice::from(*addressindex),
-        //         )
-        //         .next()
-        //         .is_none();
-        //     is_empty
-        // })
-        // .try_for_each(|addressindex| -> color_eyre::Result<()> {
-        //     let addressindex_slice = Slice::from(addressindex);
-
-        //     let addressbytes = Addressbytes::from(
-        //         wtx.get(
-        //             self.addressindex_to_addressbytes.data(),
-        //             &addressindex_slice,
-        //         )?
-        //         .context("addressindex_to_address to have value")?,
-        //     );
-        //     wtx.remove(
-        //         self.addressbytes_prefix_to_addressindex.data(),
-        //         addressbytes.prefix(),
-        //     );
-        //     wtx.remove(
-        //         self.addressindex_to_addressbytes.data(),
-        //         &addressindex_slice,
-        //     );
-        //     wtx.remove(self.addressindex_to_addresstype.data(), &addressindex_slice);
-
-        //     Ok(())
-        // })?;
-        //
-
-        // todo!("clear addresstxoutindexes_out")
-        // todo!("clear addresstxoutindexes_in")
-        // todo!("clear zero_txoutindexes")
-
-        // Ok(())
-    }
-
-    pub fn flush(&mut self) -> io::Result<()> {
-        self.as_mut_vec().into_iter().try_for_each(AnyStorableVec::flush)
-    }
-
-    fn as_mut_vec(&mut self) -> Vec<&mut dyn AnyStorableVec> {
-        vec![
-            &mut self.addressindex_to_addresstype,
-            &mut self.addressindex_to_addresstypeindex,
-            &mut self.height_to_blockhash,
-            &mut self.height_to_first_addressindex,
-            &mut self.height_to_first_txindex,
-            &mut self.height_to_first_txoutindex,
-            &mut self.height_to_last_addressindex,
-            &mut self.height_to_last_txindex,
-            &mut self.height_to_last_txoutindex,
-            &mut self.p2pk65index_to_p2pk65addressbytes,
-            &mut self.p2pk33index_to_p2pk33addressbytes,
-            &mut self.p2pkhindex_to_p2pkhaddressbytes,
-            &mut self.p2shindex_to_p2shaddressbytes,
-            &mut self.p2wpkhindex_to_p2wpkhaddressbytes,
-            &mut self.p2wshindex_to_p2wshaddressbytes,
-            &mut self.p2trindex_to_p2traddressbytes,
-            &mut self.txindex_to_height,
-            &mut self.txindex_to_txid,
-            &mut self.txoutindex_to_addressindex,
-            &mut self.txoutindex_to_amount,
-        ]
-    }
-}
diff --git a/src/crates/bindex/src/structs/store.rs b/src/crates/bindex/src/structs/store.rs
new file mode 100644
index 000000000..eefd70b2e
--- /dev/null
+++ b/src/crates/bindex/src/structs/store.rs
@@ -0,0 +1,153 @@
+use std::{
+    array, fs,
+    path::{Path, PathBuf},
+    sync::OnceLock,
+};
+
+use rayon::prelude::*;
+use snkrj::{Database, DatabaseKey, DatabaseValue, UnitDatabase};
+use storable_vec::UnsafeSizedSerDe;
+
+use super::{Height, Version};
+
+pub struct Store<K, V>
+where
+    K: DatabaseKey,
+    V: DatabaseValue,
+{
+    pathbuf: PathBuf,
+    version: Version,
+    height: Option<Height>,
+    len: usize,
+    pub parts: [OnceLock<Box<Database<K, V>>>; 256],
+}
+
+impl<K, V> Store<K, V>
+where
+    K: DatabaseKey,
+    V: DatabaseValue,
+{
+    pub fn open(path: &Path, version: Version) -> Result<Self, snkrj::Error> {
+        fs::create_dir_all(path)?;
+
+        let is_same_version =
+            Version::try_from(Self::path_version_(path).as_path()).is_ok_and(|prev_version| version == prev_version);
+
+        if !is_same_version {
+            fs::remove_dir(path)?;
+            fs::create_dir_all(path)?;
+        }
+
+        let height = Height::try_from(Self::path_height_(path).as_path()).ok();
+
+        Ok(Self {
+            pathbuf: path.to_owned(),
+            version,
+            height,
+            len: UnitDatabase::read_length_(path),
+            parts: array::from_fn(|_| OnceLock::new()),
+        })
+    }
+
+    #[allow(unused)]
+    pub fn len(&self) -> usize {
+        self.len
+    }
+
+    fn key_to_byte(key: &K) -> u8 {
+        let slice = key.unsafe_as_slice();
+
+        *(if cfg!(target_endian = "big") {
+            slice.last()
+        } else {
+            slice.first()
+        })
+        .unwrap()
+    }
+
+    fn get_or_init_store(&self, key: &K) -> &Database<K, V> {
+        self.get_or_init_store_(Self::key_to_byte(key) as usize)
+    }
+
+    fn get_or_init_store_(&self, storeindex: usize) -> &Database<K, V> {
+        self.parts[storeindex]
+            .get_or_init(|| Box::new(Database::open(self.path_parts().join(storeindex.to_string())).unwrap()))
+    }
+
+    fn get_or_init_mut_store(&mut self, key: &K) -> &mut Database<K, V> {
+        self.get_or_init_store(key);
+
+        self.parts
+            .get_mut(Self::key_to_byte(key) as usize)
+            .unwrap()
+            .get_mut()
+            .unwrap()
+    }
+
+    #[allow(unused)]
+    pub fn open_all(&self) {
+        (0..=(u8::MAX) as usize).for_each(|storeindex| {
+            self.get_or_init_store_(storeindex);
+        });
+    }
+
+    pub fn get(&self, key: &K) -> Option<&V> {
+        self.get_or_init_store(key).get(key)
+    }
+
+    pub fn insert(&mut self, key: K, value: V) -> Option<V> {
+        self.len += 1;
+        self.get_or_init_mut_store(&key).insert(key, value)
+    }
+
+    pub fn insert_if_needed(&mut self, key: K, value: V, height: Height) {
+        if self.needs(height) {
+            self.insert(key, value);
+        }
+    }
+
+    pub fn export(mut self, height: Height) -> Result<(), snkrj::Error> {
+        if self.height.is_some_and(|self_height| self_height >= height) {
+            return Ok(());
+        }
+
+        self.height = Some(height);
+        self.version.write(&self.path_version())?;
+        height.write(&self.path_height())?;
+        UnitDatabase::write_length_(&self.pathbuf, self.len)?;
+        self.parts.into_par_iter().try_for_each(|s| {
+            if let Some(db) = s.into_inner() {
+                db.export()
+            } else {
+                Ok(())
+            }
+        })
+    }
+
+    fn path_parts(&self) -> PathBuf {
+        Self::path_parts_(&self.pathbuf)
+    }
+    fn path_parts_(path: &Path) -> PathBuf {
+        path.join("parts")
+    }
+
+    fn path_version(&self) -> PathBuf {
+        Self::path_version_(&self.pathbuf)
+    }
+    fn path_version_(path: &Path) -> PathBuf {
+        path.join("version")
+    }
+
+    pub fn height(&self) -> Option<&Height> {
+        self.height.as_ref()
+    }
+    pub fn needs(&self, height: Height) -> bool {
+        self.height.is_none_or(|self_height| height > self_height)
+    }
+    fn path_height(&self) -> PathBuf {
+        Self::path_height_(&self.pathbuf)
+    }
+    fn path_height_(path: &Path) -> PathBuf {
+        path.join("height")
+    }
+}
diff --git a/src/crates/bindex/src/structs/databases.rs b/src/crates/bindex/src/structs/stores.rs
similarity index 69%
rename from src/crates/bindex/src/structs/databases.rs
rename to src/crates/bindex/src/structs/stores.rs
index f28a2e7d4..37e360bf7 100644
--- a/src/crates/bindex/src/structs/databases.rs
+++ b/src/crates/bindex/src/structs/stores.rs
@@ -1,34 +1,33 @@
 use std::{path::Path, thread};
 
-use snkrj::{AnyDatabase, Database};
-
 use crate::structs::Height;
 
 use super::{
-    AddressbytesPrefix, Addressindex, Addressindextxoutindex, BlockHashPrefix, TxidPrefix, Txindex, Txindexvout,
-    Txoutindex,
+    AddressbytesPrefix, Addressindex, Addressindextxoutindex, BlockHashPrefix, Store, TxidPrefix, Txindex, Txindexvout,
+    Txoutindex, Version,
 };
 
-pub struct Databases {
-    pub addressbytes_prefix_to_addressindex: Database<AddressbytesPrefix, Addressindex>,
-    pub addressindextxoutindex_in: Database<Addressindextxoutindex, ()>,
-    pub addressindextxoutindex_out: Database<Addressindextxoutindex, ()>,
-    pub blockhash_prefix_to_height: Database<BlockHashPrefix, Height>,
-    pub txid_prefix_to_txindex: Database<TxidPrefix, Txindex>,
-    pub txindexvout_to_txoutindex: Database<Txindexvout, Txoutindex>,
+pub struct Stores {
+    pub addressbytes_prefix_to_addressindex: Store<AddressbytesPrefix, Addressindex>,
+    pub addressindextxoutindex_in: Store<Addressindextxoutindex, ()>,
+    pub addressindextxoutindex_out: Store<Addressindextxoutindex, ()>,
+    pub blockhash_prefix_to_height: Store<BlockHashPrefix, Height>,
+    pub txid_prefix_to_txindex: Store<TxidPrefix, Txindex>,
+    pub txindexvout_to_txoutindex: Store<Txindexvout, Txoutindex>,
 }
 
-const UNSAFE_BLOCKS: usize = 100;
-
-impl Databases {
+impl Stores {
     pub fn open(path: &Path) -> color_eyre::Result<Self> {
         Ok(Self {
-            addressbytes_prefix_to_addressindex: Database::open(path.join("addressbytes_prefix_to_addressindex"))?,
-            addressindextxoutindex_in: Database::open(path.join("addresstxoutindexes_in"))?,
-            addressindextxoutindex_out: Database::open(path.join("addresstxoutindexes_out"))?,
-            blockhash_prefix_to_height: Database::open(path.join("blockhash_prefix_to_height"))?,
-            txid_prefix_to_txindex: Database::open(path.join("txid_prefix_to_txindex"))?,
-            txindexvout_to_txoutindex: Database::open(path.join("txindexvout_to_txoutindex"))?,
+            addressbytes_prefix_to_addressindex: Store::open(
+                &path.join("addressbytes_prefix_to_addressindex"),
+                Version::from(1),
+            )?,
+            addressindextxoutindex_in: Store::open(&path.join("addresstxoutindexes_in"), Version::from(1))?,
+            addressindextxoutindex_out: Store::open(&path.join("addresstxoutindexes_out"), Version::from(1))?,
+            blockhash_prefix_to_height: Store::open(&path.join("blockhash_prefix_to_height"), Version::from(1))?,
+            txid_prefix_to_txindex: Store::open(&path.join("txid_prefix_to_txindex"), Version::from(1))?,
+            txindexvout_to_txoutindex: Store::open(&path.join("txindexvout_to_txoutindex"), Version::from(1))?,
         })
     }
 
@@ -151,36 +150,29 @@ impl Databases {
     // Ok(())
     // }
 
-    fn to_ref_vec(&self) -> Vec<&dyn AnyDatabase> {
-        vec![
-            &self.addressbytes_prefix_to_addressindex as &dyn AnyDatabase,
-            &self.addressindextxoutindex_in,
-            &self.addressindextxoutindex_out,
-            &self.blockhash_prefix_to_height,
-            &self.txid_prefix_to_txindex,
-            &self.txindexvout_to_txoutindex,
+    pub fn min_height(&self) -> Option<Height> {
+        [
+            self.addressbytes_prefix_to_addressindex.height(),
+            self.addressindextxoutindex_in.height(),
+            self.addressindextxoutindex_out.height(),
+            self.blockhash_prefix_to_height.height(),
+            self.txid_prefix_to_txindex.height(),
+            self.txindexvout_to_txoutindex.height(),
         ]
+        .into_iter()
+        .min()
+        .flatten()
+        .cloned()
     }
 
-    fn to_ref_mut_vec(&mut self) -> Vec<&mut dyn AnyDatabase> {
-        vec![
-            &mut self.addressbytes_prefix_to_addressindex as &mut dyn AnyDatabase,
-            &mut self.addressindextxoutindex_in,
-            &mut self.addressindextxoutindex_out,
-            &mut self.blockhash_prefix_to_height,
-            &mut self.txid_prefix_to_txindex,
-            &mut self.txindexvout_to_txoutindex,
-        ]
-    }
-
-    pub fn export(self) {
+    pub fn export(self, height: Height) {
         thread::scope(|scope| {
-            scope.spawn(|| self.addressbytes_prefix_to_addressindex.export(false));
-            scope.spawn(|| self.addressindextxoutindex_in.export(false));
-            scope.spawn(|| self.addressindextxoutindex_out.export(false));
-            scope.spawn(|| self.blockhash_prefix_to_height.export(false));
-            scope.spawn(|| self.txid_prefix_to_txindex.export(false));
-            scope.spawn(|| self.txindexvout_to_txoutindex.export(false));
+            scope.spawn(|| self.addressbytes_prefix_to_addressindex.export(height));
+            scope.spawn(|| self.addressindextxoutindex_in.export(height));
+            scope.spawn(|| self.addressindextxoutindex_out.export(height));
+            scope.spawn(|| self.blockhash_prefix_to_height.export(height));
+            scope.spawn(|| self.txid_prefix_to_txindex.export(height));
+            scope.spawn(|| self.txindexvout_to_txoutindex.export(height));
         });
     }
 }
diff --git a/src/crates/bindex/src/structs/timestamp.rs b/src/crates/bindex/src/structs/timestamp.rs
new file mode 100644
index 000000000..3ed62e1ae
--- /dev/null
+++ b/src/crates/bindex/src/structs/timestamp.rs
@@ -0,0 +1,11 @@
+use derive_deref::Deref;
+
+#[derive(Debug, Deref, Clone)]
+pub struct Timestamp(jiff::Timestamp);
+
+impl TryFrom<u32> for Timestamp {
+    type Error = jiff::Error;
+    fn try_from(value: u32) -> Result<Self, Self::Error> {
+        Ok(Self(jiff::Timestamp::from_second(value as i64)?))
+    }
+}
diff --git a/src/crates/bindex/src/structs/vec.rs b/src/crates/bindex/src/structs/vec.rs
new file mode 100644
index 000000000..f8184cd45
--- /dev/null
+++ b/src/crates/bindex/src/structs/vec.rs
@@ -0,0 +1,116 @@
+use std::{
+    fmt::Debug,
+    fs, io,
+    ops::{Deref, DerefMut},
+    path::{Path, PathBuf},
+};
+
+use super::{Height, Version};
+
+pub struct StorableVec<I, T> {
+    pathbuf: PathBuf,
+    version: Version,
+    vec: storable_vec::StorableVec<I, T>,
+}
+
+impl<I, T> StorableVec<I, T>
+where
+    I: Into<usize>,
+    T: Sized + Debug,
+{
+    pub fn import(path: &Path, version: Version) -> io::Result<Self> {
+        fs::create_dir_all(path)?;
+
+        let pathbuf = path.to_owned();
+        let path_vec = Self::_path_vec(path);
+        let path_version = Self::_path_version(path);
+
+        let is_same_version =
+            Version::try_from(path_version.as_path()).is_ok_and(|prev_version| version == prev_version);
+        if !is_same_version {
+            let _ = fs::remove_file(&path_vec);
+            let _ = fs::remove_file(&path_version);
+            let _ = fs::remove_file(Self::_path_height(path));
+        }
+
+        Ok(Self {
+            pathbuf,
+            version,
+            vec: storable_vec::StorableVec::import(&path_vec)?,
+        })
+    }
+
+    pub fn flush(&mut self, height: Height) -> io::Result<()> {
+        height.write(&self.path_height())?;
+        self.version.write(&self.path_version())?;
+        self.vec.flush()
+    }
+
+    // fn path_vec(&self) -> PathBuf {
+    //     Self::_path_vec(&self.path)
+    // }
+    fn _path_vec(path: &Path) -> PathBuf {
+        path.join("vec")
+    }
+
+    fn path_version(&self) -> PathBuf {
+        Self::_path_version(&self.pathbuf)
+    }
+    fn _path_version(path: &Path) -> PathBuf {
+        path.join("version")
+    }
+
+    pub fn height(&self) -> color_eyre::Result<Height> {
+        Height::try_from(self.path_height().as_path())
+    }
+    fn path_height(&self) -> PathBuf {
+        Self::_path_height(&self.pathbuf)
+    }
+    fn _path_height(path: &Path) -> PathBuf {
+        path.join("height")
+    }
+
+    fn reset_cache(&mut self) {
+        self.vec.reset_cache();
+    }
+
+    // pub fn needs(&self, height: Height) -> bool {
+    //     self.height() // store height in struct
+    // }
+}
+
+impl<I, T> Deref for StorableVec<I, T> {
+    type Target = storable_vec::StorableVec<I, T>;
+    fn deref(&self) -> &Self::Target {
+        &self.vec
+    }
+}
+impl<I, T> DerefMut for StorableVec<I, T> {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        &mut self.vec
+    }
+}
+
+pub trait AnyBindexVec {
+    fn height(&self) -> color_eyre::Result<Height>;
+    fn reset_cache(&mut self);
+    fn flush(&mut self, height: Height) -> io::Result<()>;
+}
+
+impl<I, T> AnyBindexVec for StorableVec<I, T>
+where
+    I: Into<usize>,
+    T: Sized + Debug,
+{
+    fn height(&self) -> color_eyre::Result<Height> {
+        self.height()
+    }
+
+    fn reset_cache(&mut self) {
+        self.reset_cache();
+    }
+
+    fn flush(&mut self, height: Height) -> io::Result<()> {
+        self.flush(height)
+    }
+}
diff --git a/src/crates/bindex/src/structs/vecs.rs b/src/crates/bindex/src/structs/vecs.rs
new file mode 100644
index 000000000..66c7f5992
--- /dev/null
+++ b/src/crates/bindex/src/structs/vecs.rs
@@ -0,0 +1,410 @@
+use std::{fs, io, path::Path};
+
+use biter::bitcoin::{transaction, BlockHash, Txid};
+use color_eyre::eyre::eyre;
+use rayon::prelude::*;
+use storable_vec::AnyStorableVec;
+
+use super::{
+    Addressbytes, Addressindex, Addresstype, Addresstypeindex, Amount, AnyBindexVec, Date, Exit, Height,
+    P2PK33AddressBytes, P2PK65AddressBytes, P2PKHAddressBytes, P2SHAddressBytes, P2TRAddressBytes, P2WPKHAddressBytes,
+    P2WSHAddressBytes, StorableVec, Timestamp, Txindex, Txoutindex, Version,
+};
+
+pub struct Vecs {
+    pub addressindex_to_addresstype: StorableVec<Addressindex, Addresstype>,
+    pub addressindex_to_addresstypeindex: StorableVec<Addressindex, Addresstypeindex>,
+    pub height_to_blockhash: StorableVec<Height, BlockHash>,
+    pub height_to_date: StorableVec<Height, Date>,
+    pub height_to_totalfees: StorableVec<Height, Amount>,
+    pub height_to_first_addressindex: StorableVec<Height, Addressindex>,
+    pub height_to_first_txindex: StorableVec<Height, Txindex>,
+    pub height_to_first_txoutindex: StorableVec<Height, Txoutindex>,
+    pub height_to_inputcount: StorableVec<Txindex, u32>,
+    pub height_to_last_addressindex: StorableVec<Height, Addressindex>,
+    pub height_to_last_txindex: StorableVec<Height, Txindex>,
+    pub height_to_last_txoutindex: StorableVec<Height, Txoutindex>,
+    pub height_to_outputcount: StorableVec<Txindex, u32>,
+    pub height_to_timestamp: StorableVec<Height, Timestamp>,
+    pub height_to_txcount: StorableVec<Txindex, u32>,
+    // pub height_to_size: StorableVec<Txindex, u32>,
+    // pub height_to_weight: StorableVec<Txindex, u32>,
+    // pub height_to_subsidy: StorableVec<Txindex, u32>,
+    // pub height_to_minfeerate: StorableVec<Txindex, u32>,
+    // pub height_to_maxfeerate: StorableVec<Txindex, u32>,
+    // pub height_to_medianfeerate: StorableVec<Txindex, u32>,
+    pub p2pk33index_to_p2pk33addressbytes: StorableVec<Addresstypeindex, P2PK33AddressBytes>,
+    pub p2pk65index_to_p2pk65addressbytes: StorableVec<Addresstypeindex, P2PK65AddressBytes>,
+    pub p2pkhindex_to_p2pkhaddressbytes: StorableVec<Addresstypeindex, P2PKHAddressBytes>,
+    pub p2shindex_to_p2shaddressbytes: StorableVec<Addresstypeindex, P2SHAddressBytes>,
+    pub p2trindex_to_p2traddressbytes: StorableVec<Addresstypeindex, P2TRAddressBytes>,
+    pub p2wpkhindex_to_p2wpkhaddressbytes: StorableVec<Addresstypeindex, P2WPKHAddressBytes>,
+    pub p2wshindex_to_p2wshaddressbytes: StorableVec<Addresstypeindex, P2WSHAddressBytes>,
+    pub txindex_to_fee: StorableVec<Txindex, Amount>,
+    // pub txindex_to_feerate: StorableVec<Txindex, Feerate>,
+    pub txindex_to_height: StorableVec<Txindex, Height>,
+    pub txindex_to_inputcount: StorableVec<Txindex, u32>,
+    pub txindex_to_outputcount: StorableVec<Txindex, u32>,
+    pub txindex_to_txid: StorableVec<Txindex, Txid>,
+    pub txindex_to_txversion: StorableVec<Txindex, transaction::Version>,
+    pub txoutindex_to_addressindex: StorableVec<Txoutindex, Addressindex>,
+    pub txoutindex_to_amount: StorableVec<Txoutindex, Amount>,
+}
+
+// const UNSAFE_BLOCKS: usize = 100;
+
+impl Vecs {
+    pub fn import(path: &Path) -> color_eyre::Result<Self> {
+        fs::create_dir_all(path)?;
+
+        Ok(Self {
+            addressindex_to_addresstype: StorableVec::import(
+                &path.join("addressindex_to_addresstype"),
+                Version::from(1),
+            )?,
+            addressindex_to_addresstypeindex: StorableVec::import(
+                &path.join("addressindex_to_addresstypeindex"),
+                Version::from(1),
+            )?,
+            height_to_blockhash: StorableVec::import(&path.join("height_to_blockhash"), Version::from(1))?,
+            height_to_date: StorableVec::import(&path.join("height_to_date"), Version::from(1))?,
+            height_to_first_addressindex: StorableVec::import(
+                &path.join("height_to_first_addressindex"),
+                Version::from(1),
+            )?,
+            height_to_first_txindex: StorableVec::import(&path.join("height_to_first_txindex"), Version::from(1))?,
+            height_to_first_txoutindex: StorableVec::import(
+                &path.join("height_to_first_txoutindex"),
+                Version::from(1),
+            )?,
+            height_to_inputcount: StorableVec::import(&path.join("height_to_inputcount"), Version::from(1))?,
+            height_to_last_addressindex: StorableVec::import(
+                &path.join("height_to_last_addressindex"),
+                Version::from(1),
+            )?,
+            height_to_last_txindex: StorableVec::import(&path.join("height_to_last_txindex"), Version::from(1))?,
+            height_to_last_txoutindex: StorableVec::import(&path.join("height_to_last_txoutindex"), Version::from(1))?,
+            height_to_outputcount: StorableVec::import(&path.join("height_to_outputcount"), Version::from(1))?,
+            height_to_timestamp: StorableVec::import(&path.join("height_to_timestamp"), Version::from(1))?,
+            height_to_totalfees: StorableVec::import(&path.join("height_to_totalfees"), Version::from(1))?,
+            height_to_txcount: StorableVec::import(&path.join("height_to_txcount"), Version::from(1))?,
+            p2pk33index_to_p2pk33addressbytes: StorableVec::import(
+                &path.join("p2pk33index_to_p2pk33addressbytes"),
+                Version::from(1),
+            )?,
+            p2pk65index_to_p2pk65addressbytes: StorableVec::import(
+                &path.join("p2pk65index_to_p2pk65addressbytes"),
+                Version::from(1),
+            )?,
+            p2pkhindex_to_p2pkhaddressbytes: StorableVec::import(
+                &path.join("p2pkhindex_to_p2pkhaddressbytes"),
+                Version::from(1),
+            )?,
+            p2shindex_to_p2shaddressbytes: StorableVec::import(
+                &path.join("p2shindex_to_p2shaddressbytes"),
+                Version::from(1),
+            )?,
+            p2trindex_to_p2traddressbytes: StorableVec::import(
+                &path.join("p2trindex_to_p2traddressbytes"),
+                Version::from(1),
+            )?,
+            p2wpkhindex_to_p2wpkhaddressbytes: StorableVec::import(
+                &path.join("p2wpkhindex_to_p2wpkhaddressbytes"),
+                Version::from(1),
+            )?,
+            p2wshindex_to_p2wshaddressbytes: StorableVec::import(
+                &path.join("p2wshindex_to_p2wshaddressbytes"),
+                Version::from(1),
+            )?,
+            txindex_to_fee: StorableVec::import(&path.join("txindex_to_fee"), Version::from(1))?,
+            txindex_to_height: StorableVec::import(&path.join("txindex_to_height"), Version::from(1))?,
+            txindex_to_inputcount: StorableVec::import(&path.join("txindex_to_inputcount"), Version::from(1))?,
+            txindex_to_outputcount: StorableVec::import(&path.join("txindex_to_outputcount"), Version::from(1))?,
+            txindex_to_txid: StorableVec::import(&path.join("txindex_to_txid"), Version::from(1))?,
+            txindex_to_txversion: StorableVec::import(&path.join("txindex_to_txversion"), Version::from(1))?,
+            txoutindex_to_addressindex: StorableVec::import(
+                &path.join("txoutindex_to_addressindex"),
+                Version::from(1),
+            )?,
+            txoutindex_to_amount: StorableVec::import(&path.join("txoutindex_to_amount"), Version::from(1))?,
+        })
+    }
+
+    pub fn addresstype_to_addressbytes(&self, addresstype: Addresstype) -> color_eyre::Result<&dyn AnyStorableVec> {
+        match addresstype {
+            Addresstype::P2PK65 => Ok(&*self.p2pk65index_to_p2pk65addressbytes),
+            Addresstype::P2PK33 => Ok(&*self.p2pk33index_to_p2pk33addressbytes),
+            Addresstype::P2PKH => Ok(&*self.p2pkhindex_to_p2pkhaddressbytes),
+            Addresstype::P2SH => Ok(&*self.p2shindex_to_p2shaddressbytes),
+            Addresstype::P2WPKH => Ok(&*self.p2wpkhindex_to_p2wpkhaddressbytes),
+            Addresstype::P2WSH => Ok(&*self.p2wshindex_to_p2wshaddressbytes),
+            Addresstype::P2TR => Ok(&*self.p2trindex_to_p2traddressbytes),
+            _ => Err(eyre!("wrong address type")),
+        }
+    }
+
+    pub fn push_addressbytes_if_needed(
+        &mut self,
+        index: Addresstypeindex,
+        addressbytes: Addressbytes,
+    ) -> storable_vec::Result<()> {
+        match addressbytes {
+            Addressbytes::P2PK65(bytes) => self.p2pk65index_to_p2pk65addressbytes.push_if_needed(index, bytes),
+            Addressbytes::P2PK33(bytes) => self.p2pk33index_to_p2pk33addressbytes.push_if_needed(index, bytes),
+            Addressbytes::P2PKH(bytes) => self.p2pkhindex_to_p2pkhaddressbytes.push_if_needed(index, bytes),
+            Addressbytes::P2SH(bytes) => self.p2shindex_to_p2shaddressbytes.push_if_needed(index, bytes),
+            Addressbytes::P2WPKH(bytes) => self.p2wpkhindex_to_p2wpkhaddressbytes.push_if_needed(index, bytes),
+            Addressbytes::P2WSH(bytes) => self.p2wshindex_to_p2wshaddressbytes.push_if_needed(index, bytes),
+            Addressbytes::P2TR(bytes) => self.p2trindex_to_p2traddressbytes.push_if_needed(index, bytes),
+        }
+    }
+
+    pub fn get_addressbytes(
+        &self,
+        addresstype: Addresstype,
+        addresstypeindex: Addresstypeindex,
+    ) -> storable_vec::Result<Option<Addressbytes>> {
+        Ok(match addresstype {
+            Addresstype::P2PK65 => self
+                .p2pk65index_to_p2pk65addressbytes
+                .get(addresstypeindex)?
+                .cloned()
+                .map(Addressbytes::from),
+            Addresstype::P2PK33 => self
+                .p2pk33index_to_p2pk33addressbytes
+                .get(addresstypeindex)?
+                .cloned()
+                .map(Addressbytes::from),
+            Addresstype::P2PKH => self
+                .p2pkhindex_to_p2pkhaddressbytes
+                .get(addresstypeindex)?
+                .cloned()
+                .map(Addressbytes::from),
+            Addresstype::P2SH => self
+                .p2shindex_to_p2shaddressbytes
+                .get(addresstypeindex)?
+                .cloned()
+                .map(Addressbytes::from),
+            Addresstype::P2WPKH => self
+                .p2wpkhindex_to_p2wpkhaddressbytes
+                .get(addresstypeindex)?
+                .cloned()
+                .map(Addressbytes::from),
+            Addresstype::P2WSH => self
+                .p2wshindex_to_p2wshaddressbytes
+                .get(addresstypeindex)?
+                .cloned()
+                .map(Addressbytes::from),
+            Addresstype::P2TR => self
+                .p2trindex_to_p2traddressbytes
+                .get(addresstypeindex)?
+                .cloned()
+                .map(Addressbytes::from),
+            _ => unreachable!(),
+        })
+    }
+
+    #[allow(unused)]
+    pub fn rollback_from(&mut self, _height: Height, _exit: &Exit) -> color_eyre::Result<()> {
+        panic!();
+        // let mut txindex = None;
+
+        // wtx.range(self.height_to_blockhash.data(), Slice::from(height)..)
+        //     .try_for_each(|slice| -> color_eyre::Result<()> {
+        //         let (height_slice, slice_blockhash) = slice?;
+        //         let blockhash = BlockHash::from_slice(&slice_blockhash)?;
+
+        //         wtx.remove(self.height_to_blockhash.data(), height_slice);
+
+        //         wtx.remove(self.blockhash_prefix_to_height.data(), blockhash.prefix());
+
+        //         if txindex.is_none() {
+        //             txindex.replace(
+        //                 wtx.get(self.height_to_first_txindex.data(), height_slice)?
+        //                     .context("for height to have first txindex")?,
+        //             );
+        //         }
+        //         wtx.remove(self.height_to_first_txindex.data(), height_slice);
+        //         wtx.remove(self.height_to_last_txindex.data(), height_slice);
+
+        //         Ok(())
+        //     })?;
+
+        // let txindex = txindex.context("txindex to not be none by now")?;
+
+        // wtx.range(self.txindex_to_txid.data(), Slice::from(txindex)..)
+        //     .try_for_each(|slice| -> color_eyre::Result<()> {
+        //         let (slice_txindex, slice_txid) = slice?;
+        //         let txindex = Txindex::from(slice_txindex);
+        //         let txid = Txid::from_slice(&slice_txid)?;
+
+        //         wtx.remove(self.txindex_to_txid.data(), Slice::from(txindex));
+        //         wtx.remove(self.txindex_to_height.data(), Slice::from(txindex));
+        //         wtx.remove(self.txid_prefix_to_txindex.data(), txid.prefix());
+
+        //         Ok(())
+        //     })?;
+
+        // let txoutindex = Txoutindex::from(txindex);
+
+        // let mut addressindexes = BTreeSet::new();
+
+        // wtx.range(self.txoutindex_to_amount.data(), Slice::from(txoutindex)..)
+        //     .try_for_each(|slice| -> color_eyre::Result<()> {
+        //         let (txoutindex_slice, _) = slice?;
+
+        //         wtx.remove(self.txoutindex_to_amount.data(), txoutindex_slice);
+
+        //         if let Some(addressindex_slice) =
+        //             wtx.get(self.txoutindex_to_addressindex.data(), txoutindex_slice)?
+        //         {
+        //             wtx.remove(self.txoutindex_to_addressindex.data(), txoutindex_slice);
+
+        //             let addressindex = Addressindex::from(addressindex_slice);
+        //             addressindexes.insert(addressindex);
+
+        //             let txoutindex = Txoutindex::from(txoutindex_slice);
+        //             let addresstxoutindex = Addresstxoutindex::from((addressindex, txoutindex));
+
+        //             wtx.remove(
+        //                 self.addressindex_to_txoutindexes.data(),
+        //                 Slice::from(addresstxoutindex),
+        //             );
+        //         }
+
+        //         Ok(())
+        //     })?;
+
+        // addressindexes
+        // .into_iter()
+        // .filter(|addressindex| {
+        //     let is_empty = wtx
+        //         .prefix(
+        //             self.addressindex_to_txoutindexes.data(),
+        //             Slice::from(*addressindex),
+        //         )
+        //         .next()
+        //         .is_none();
+        //     is_empty
+        // })
+        // .try_for_each(|addressindex| -> color_eyre::Result<()> {
+        //     let addressindex_slice = Slice::from(addressindex);
+
+        //     let addressbytes = Addressbytes::from(
+        //         wtx.get(
+        //             self.addressindex_to_addressbytes.data(),
+        //             &addressindex_slice,
+        //         )?
+        //         .context("addressindex_to_address to have value")?,
+        //     );
+        //     wtx.remove(
+        //         self.addressbytes_prefix_to_addressindex.data(),
+        //         addressbytes.prefix(),
+        //     );
+        //     wtx.remove(
+        //         self.addressindex_to_addressbytes.data(),
+        //         &addressindex_slice,
+        //     );
+        //     wtx.remove(self.addressindex_to_addresstype.data(), &addressindex_slice);
+
+        //     Ok(())
+        // })?;
+        //
+
+        // todo!("clear addresstxoutindexes_out")
+        // todo!("clear addresstxoutindexes_in")
+        // todo!("clear zero_txoutindexes")
+
+        // Ok(())
+    }
+
+    pub fn flush(&mut self, height: Height) -> io::Result<()> {
+        self.as_mut_slice()
+            .into_par_iter()
+            .try_for_each(|vec| vec.flush(height))
+    }
+
+    pub fn reset_cache(&mut self) {
+        self.as_mut_slice().par_iter_mut().for_each(|vec| {
+            vec.reset_cache();
+        })
+    }
+
+    pub fn min_height(&self) -> color_eyre::Result<Option<Height>> {
+        Ok(self
+            .as_slice()
+            .into_iter()
+            .map(|vec| vec.height().unwrap_or_default())
+            .min())
+    }
+
+    pub fn as_slice(&self) -> [&dyn AnyBindexVec; 30] {
+        [
+            &self.addressindex_to_addresstype as &dyn AnyBindexVec,
+            &self.addressindex_to_addresstypeindex,
+            &self.height_to_blockhash,
+            &self.height_to_date,
+            &self.height_to_totalfees,
+            &self.height_to_first_addressindex,
+            &self.height_to_first_txindex,
+            &self.height_to_first_txoutindex,
+            &self.height_to_inputcount,
+            &self.height_to_last_addressindex,
+            &self.height_to_last_txindex,
+            &self.height_to_last_txoutindex,
+            &self.height_to_outputcount,
+            &self.height_to_timestamp,
+            &self.height_to_txcount,
+            &self.p2pk33index_to_p2pk33addressbytes,
+            &self.p2pk65index_to_p2pk65addressbytes,
+            &self.p2pkhindex_to_p2pkhaddressbytes,
+            &self.p2shindex_to_p2shaddressbytes,
+            &self.p2trindex_to_p2traddressbytes,
+            &self.p2wpkhindex_to_p2wpkhaddressbytes,
+            &self.p2wshindex_to_p2wshaddressbytes,
+            &self.txindex_to_fee,
+            &self.txindex_to_height,
+            &self.txindex_to_inputcount,
+            &self.txindex_to_outputcount,
+            &self.txindex_to_txid,
+            &self.txindex_to_txversion,
+            &self.txoutindex_to_addressindex,
+            &self.txoutindex_to_amount,
+        ]
+    }
+
+    pub fn as_mut_slice(&mut self) -> [&mut (dyn AnyBindexVec + Send + Sync); 30] {
+        [
+            &mut self.addressindex_to_addresstype as &mut (dyn AnyBindexVec + Send + Sync),
+            &mut self.addressindex_to_addresstypeindex,
+            &mut self.height_to_blockhash,
+            &mut self.height_to_date,
+            &mut self.height_to_totalfees, // <-
+            &mut self.height_to_first_addressindex,
+            &mut self.height_to_first_txindex,
+            &mut self.height_to_first_txoutindex,
+            &mut self.height_to_inputcount, // <-
+            &mut self.height_to_last_addressindex,
+            &mut self.height_to_last_txindex,
+            &mut self.height_to_last_txoutindex,
+            &mut self.height_to_outputcount, // <-
+            &mut self.height_to_timestamp,
+            &mut self.height_to_txcount, // <-
+            &mut self.p2pk33index_to_p2pk33addressbytes,
+            &mut self.p2pk65index_to_p2pk65addressbytes,
+            &mut self.p2pkhindex_to_p2pkhaddressbytes,
+            &mut self.p2shindex_to_p2shaddressbytes,
+            &mut self.p2trindex_to_p2traddressbytes,
+            &mut self.p2wpkhindex_to_p2wpkhaddressbytes,
+            &mut self.p2wshindex_to_p2wshaddressbytes,
+            &mut self.txindex_to_fee, // <-
+            &mut self.txindex_to_height,
+            &mut self.txindex_to_inputcount,  // <-
+            &mut self.txindex_to_outputcount, // <-
+            &mut self.txindex_to_txid,
+            &mut self.txindex_to_txversion,
+            &mut self.txoutindex_to_addressindex,
+            &mut self.txoutindex_to_amount,
+        ]
+    }
+}
diff --git a/src/crates/bindex/src/structs/version.rs b/src/crates/bindex/src/structs/version.rs
index a4dd4b0ec..e5c35b83a 100644
--- a/src/crates/bindex/src/structs/version.rs
+++ b/src/crates/bindex/src/structs/version.rs
@@ -1,30 +1,25 @@
-use derive_deref::{Deref, DerefMut};
+use std::{fs, io, path::Path};
 
-use super::SliceExtended;
+use storable_vec::UnsafeSizedSerDe;
 
-#[derive(Debug, Clone, Copy, Deref, DerefMut, PartialEq, Eq, PartialOrd, Ord)]
-pub struct Version(u8);
+#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
+pub struct Version(u32);
 
-impl From<u8> for Version {
-    fn from(value: u8) -> Self {
+impl Version {
+    pub fn write(&self, path: &Path) -> Result<(), io::Error> {
+        fs::write(path, self.unsafe_as_slice())
+    }
+}
+
+impl From<u32> for Version {
+    fn from(value: u32) -> Self {
         Self(value)
     }
 }
 
-impl TryFrom<Slice> for Version {
+impl TryFrom<&Path> for Version {
     type Error = color_eyre::Report;
-    fn try_from(value: Slice) -> Result<Self, Self::Error> {
-        Self::try_from(&value[..])
-    }
-}
-impl TryFrom<&[u8]> for Version {
-    type Error = color_eyre::Report;
-    fn try_from(value: &[u8]) -> Result<Self, Self::Error> {
-        Ok(Self::from(value.read_be_u8()?))
-    }
-}
-impl From<Version> for Slice {
-    fn from(value: Version) -> Self {
-        value.to_be_bytes().into()
+    fn try_from(value: &Path) -> Result<Self, Self::Error> {
+        Ok(Self::unsafe_try_from_slice(fs::read(value)?.as_slice())?.to_owned())
     }
 }
diff --git a/src/crates/snkrj/Cargo.toml b/src/crates/snkrj/Cargo.toml
index 2341d6537..49704555a 100644
--- a/src/crates/snkrj/Cargo.toml
+++ b/src/crates/snkrj/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "snkrj"
-description = "A simple wrapper around Sanakirja's database that acts as a very fast on disk BTreeMap"
+description = "A very simple wrapper around Sanakirja"
 version = "0.1.1"
 license = "MIT"
 repository = "https://github.com/kibo-money/kibo/tree/main/src/crates/snkrj"
diff --git a/src/crates/snkrj/src/lib.rs b/src/crates/snkrj/src/lib.rs
index 5d7d29446..00189538b 100644
--- a/src/crates/snkrj/src/lib.rs
+++ b/src/crates/snkrj/src/lib.rs
@@ -1,11 +1,13 @@
 // https://docs.rs/sanakirja/latest/sanakirja/index.html
 // https://pijul.org/posts/2021-02-06-rethinking-sanakirja/
 
+use core::panic;
 use std::{
     collections::{BTreeMap, BTreeSet},
     fmt::Debug,
-    fs, io, mem,
-    path::PathBuf,
+    fs::{self, File},
+    io, mem,
+    path::{Path, PathBuf},
     result::Result,
 };
 
@@ -19,12 +21,13 @@ pub use sanakirja::*;
 ///
 pub struct Database<Key, Value>
 where
-    Key: Ord + Clone + Debug + Storable,
-    Value: Storable + PartialEq,
+    Key: DatabaseKey,
+    Value: DatabaseValue,
 {
-    path: PathBuf,
+    pathbuf: PathBuf,
     puts: BTreeMap<Key, Value>,
     dels: BTreeSet<Key>,
+    len: usize,
     db: Db_<Key, Value, page::Page<Key, Value>>,
     txn: MutTxn<Env, ()>,
 }
@@ -32,14 +35,24 @@ where
 const ROOT_DB: usize = 0;
 const PAGE_SIZE: u64 = 4096;
 
+pub type UnitDatabase = Database<(), ()>;
+
+const DEFRAGMENT_RATIO_THRESHOLD: f64 = 0.5;
+
 impl<Key, Value> Database<Key, Value>
 where
-    Key: Ord + Clone + Debug + Storable,
-    Value: Storable + PartialEq,
+    Key: DatabaseKey,
+    Value: DatabaseValue,
 {
+    const KEY_SIZE: usize = size_of::<Key>();
+    const VALUE_SIZE: usize = size_of::<Value>();
+    const KEY_AND_VALUE_SIZE: usize = Self::KEY_SIZE + Self::VALUE_SIZE;
+
     /// Open a database without a lock file where only one instance is safe to open.
-    pub fn open(path: PathBuf) -> Result<Self, Error> {
-        let env = unsafe { Env::new_nolock(&path, PAGE_SIZE, 1)? };
+    pub fn open(pathbuf: PathBuf) -> Result<Self, Error> {
+        fs::create_dir_all(&pathbuf)?;
+
+        let env = unsafe { Env::new_nolock(Self::path_sanakirja_(&pathbuf), PAGE_SIZE, 1)? };
 
         let mut txn = Env::mut_txn_begin(env)?;
 
@@ -48,7 +61,8 @@ where
             .unwrap_or_else(|| unsafe { btree::create_db_(&mut txn).unwrap() });
 
         Ok(Self {
-            path,
+            len: Self::read_length_(&pathbuf),
+            pathbuf,
             puts: BTreeMap::default(),
             dels: BTreeSet::default(),
             db,
@@ -56,6 +70,37 @@ where
         })
     }
 
+    pub fn path_sanakirja(&self) -> PathBuf {
+        Self::path_sanakirja_(&self.pathbuf)
+    }
+    fn path_sanakirja_(path: &Path) -> PathBuf {
+        path.join("sanakirja")
+    }
+
+    pub fn read_length(&self) -> usize {
+        Self::read_length_(&self.pathbuf)
+    }
+    pub fn read_length_(path: &Path) -> usize {
+        fs::read(Self::path_length(path))
+            .map(|v| {
+                let mut buf = [0_u8; 8];
+                v.iter().enumerate().take(8).for_each(|(i, b)| {
+                    buf[i] = *b;
+                });
+                usize::from_le_bytes(buf)
+            })
+            .unwrap_or_default()
+    }
+    pub fn write_length(&self) -> Result<(), io::Error> {
+        Self::write_length_(&self.pathbuf, self.len)
+    }
+    pub fn write_length_(path: &Path, len: usize) -> Result<(), io::Error> {
+        fs::write(Self::path_length(path), len.to_le_bytes())
+    }
+    fn path_length(path: &Path) -> PathBuf {
+        path.join("length")
+    }
+
     #[inline]
     pub fn get(&self, key: &Key) -> Option<&Value> {
         if let Some(cached_put) = self.get_from_ram(key) {
@@ -100,6 +145,7 @@ where
     /// Insert without removing the key to the dels tree, so be sure that it hasn't added to the delete set
     #[inline]
     pub fn insert_to_ram(&mut self, key: Key, value: Value) -> Option<Value> {
+        self.len += 1;
         self.puts.insert(key, value)
     }
 
@@ -111,9 +157,9 @@ where
 
     #[inline]
     pub fn remove(&mut self, key: &Key) -> Option<Value> {
-        self.remove_from_ram(key).or_else(|| {
-            self.remove_later_from_disk(key);
-
+        self.len -= 1;
+        self.puts.remove(key).or_else(|| {
+            self.dels.insert(key.clone());
             None
         })
     }
@@ -121,20 +167,17 @@ where
     /// Get only from the uncommited tree (ram) without checking the database (disk)
     #[inline]
     pub fn remove_from_ram(&mut self, key: &Key) -> Option<Value> {
+        self.len -= 1;
         self.puts.remove(key)
     }
 
     /// Add the key only to the dels tree without checking if it's present in the puts tree, only use if you are positive that you neither added nor updated an entry with this key
     #[inline]
     pub fn remove_later_from_disk(&mut self, key: &Key) {
+        self.len -= 1;
         self.dels.insert(key.clone());
     }
 
-    #[inline]
-    pub fn is_empty(&self) -> bool {
-        self.iter_disk().next().is_none()
-    }
-
     /// Iterate over key/value pairs from the uncommited tree (ram)
     #[inline]
     pub fn iter_ram(&self) -> std::collections::btree_map::Iter<'_, Key, Value> {
@@ -156,18 +199,12 @@ where
     }
 
     /// Collect a **clone** of all uncommited key/value pairs (ram)
-    pub fn collect_ram(&self) -> BTreeMap<Key, Value>
-    where
-        Value: Clone,
-    {
+    pub fn collect_ram(&self) -> BTreeMap<Key, Value> {
         self.puts.clone()
     }
 
     /// Collect a **clone** of all key/value pairs from the database (disk)
-    pub fn collect_disk(&self) -> BTreeMap<Key, Value>
-    where
-        Value: Clone,
-    {
+    pub fn collect_disk(&self) -> BTreeMap<Key, Value> {
         self.iter_disk()
             .map(|r| r.unwrap())
             .map(|(key, value)| (key.clone(), value.clone()))
@@ -176,54 +213,68 @@ where
 
     #[inline]
     pub fn len(&self) -> usize {
-        self.iter_ram_then_disk().count()
+        self.len
     }
-}
 
-pub trait AnyDatabase {
-    #[allow(unused)]
-    fn export(self, defragment: bool) -> Result<(), Error>;
-    fn boxed_export(self: Box<Self>, defragment: bool) -> Result<(), Error>;
-    #[allow(unused)]
-    fn destroy(self) -> io::Result<()>;
-}
+    #[inline]
+    pub fn is_empty(&self) -> bool {
+        self.len == 0
+    }
 
-impl<Key, Value> AnyDatabase for Database<Key, Value>
-where
-    Key: Ord + Clone + Debug + Storable,
-    Value: Storable + PartialEq + Clone,
-{
-    /// Flush all puts and dels from the ram to disk with an option to defragment the database to save some disk space
-    ///
-    /// /!\ Do not kill the program while this function is runnning  /!\
-    fn export(self, defragment: bool) -> Result<(), Error> {
-        Box::new(self).boxed_export(defragment)
+    // pub fn export(self) -> Result<(), Error> {
+    //     self.boxed().boxed_export()
+    // }
+
+    // pub fn boxed(self) -> Box<Self> {
+    //     Box::new(self)
+    // }
+
+    pub fn get_file_size_to_data_ratio(&self) -> Result<f64, Error> {
+        let data_bytes = (self.len() * Self::KEY_AND_VALUE_SIZE) as f64;
+        let file_bytes = File::open(&self.pathbuf)?.metadata()?.len() as f64;
+        Ok(file_bytes / data_bytes)
     }
 
     /// Flush all puts and dels from the ram to disk with an option to defragment the database to save some disk space
     ///
     /// /!\ Do not kill the program while this function is runnning  /!\
-    fn boxed_export(mut self: Box<Self>, defragment: bool) -> Result<(), Error> {
+    pub fn export(mut self) -> Result<(), Error> {
+        let defragment = self.get_file_size_to_data_ratio()? >= DEFRAGMENT_RATIO_THRESHOLD;
+
         if defragment {
-            let mut btree = self.as_ref().collect_disk();
+            let mut btree = self.collect_disk();
 
-            let path = self.path.to_owned();
+            let disk_len = btree.len();
+            let dels_len = self.dels.len();
+            let puts_len = self.puts.len();
+
+            let path = self.pathbuf.to_owned();
             self.dels.iter().for_each(|key| {
                 btree.remove(key);
             });
             btree.append(&mut self.puts);
 
+            let len = btree.len();
+
+            if len != self.len {
+                dbg!(len, self.len, path, disk_len, dels_len, puts_len);
+                panic!("Len should be the same");
+            }
+
             self.destroy()?;
 
-            *self = Self::open(path).unwrap();
+            self = Self::open(path).unwrap();
 
             if !self.is_empty() {
                 panic!()
             }
 
+            self.len = len;
             self.puts = btree;
         }
 
+        self.write_length()?;
+
         if self.dels.is_empty() && self.puts.is_empty() {
             return Ok(());
         }
@@ -247,11 +298,49 @@ where
         self.txn.commit()
     }
 
-    fn destroy(self) -> io::Result<()> {
-        let path = self.path.to_owned();
+    pub fn destroy(self) -> io::Result<()> {
+        let path = self.pathbuf.to_owned();
 
         drop(self);
 
-        fs::remove_file(&path)
+        fs::remove_dir_all(&path)
     }
 }
+
+pub trait AnyDatabase {
+    fn export(self) -> Result<(), Error>;
+    // fn boxed_export(self: Box<Self>) -> Result<(), Error>;
+    fn destroy(self) -> io::Result<()>;
+}
+
+impl<Key, Value> AnyDatabase for Database<Key, Value>
+where
+    Key: DatabaseKey,
+    Value: DatabaseValue,
+{
+    fn export(self) -> Result<(), Error> {
+        self.export()
+    }
+
+    // fn boxed_export(self: Box<Self>) -> Result<(), Error> {
+    //     self.boxed_export()
+    // }
+
+    fn destroy(self) -> io::Result<()> {
+        self.destroy()
+    }
+}
+
+pub trait DatabaseKey
+where
+    Self: Ord + Clone + Debug + Storable + Send + Sync,
+{
+}
+impl<T> DatabaseKey for T where T: Ord + Clone + Debug + Storable + Send + Sync {}
+
+pub trait DatabaseValue
+where
+    Self: Clone + Storable + PartialEq + Send + Sync,
+{
+}
+impl<T> DatabaseValue for T where T: Clone + Storable + PartialEq + Send + Sync {}
diff --git a/src/crates/snkrj/src/main.rs b/src/crates/snkrj/src/main.rs
index da3c39d23..a28e195de 100644
--- a/src/crates/snkrj/src/main.rs
+++ b/src/crates/snkrj/src/main.rs
@@ -1,4 +1,4 @@
-use snkrj::{AnyDatabase, Database};
+use snkrj::Database;
 
 fn main() {
     let path = std::env::temp_dir().join("./db");
@@ -8,7 +8,7 @@ fn main() {
 
     let mut database: Database<i32, i32> = Database::open(path.clone()).unwrap();
     database.insert(64, 128);
-    database.export(false).unwrap();
+    database.export().unwrap();
 
     let mut database: Database<i32, i32> = Database::open(path).unwrap();
     database.insert(1, 2);
@@ -25,5 +25,5 @@ fn main() {
     database.iter_ram_then_disk().for_each(|pair| {
         println!("{:?}", pair);
     });
-    database.export(false).unwrap();
+    database.export().unwrap();
 }
diff --git a/src/crates/storable_vec/.gitignore b/src/crates/storable_vec/.gitignore
new file mode 100644
index 000000000..a7ab01af7
--- /dev/null
+++ b/src/crates/storable_vec/.gitignore
@@ -0,0 +1 @@
+/v
diff --git a/src/crates/storable_vec/Cargo.lock b/src/crates/storable_vec/Cargo.lock
index 0697fc2b7..86ab81ef7 100644
--- a/src/crates/storable_vec/Cargo.lock
+++ b/src/crates/storable_vec/Cargo.lock
@@ -2,118 +2,12 @@
 # It is not intended for manual editing.
 version = 4
 
-[[package]]
-name = "addr2line"
-version = "0.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
-dependencies = [
- "gimli",
-]
-
-[[package]]
-name = "adler"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
-
-[[package]]
-name = "backtrace"
-version = "0.3.71"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d"
-dependencies = [
- "addr2line",
- "cc",
- "cfg-if",
- "libc",
- "miniz_oxide",
- "object",
- "rustc-demangle",
-]
-
-[[package]]
-name = "cc"
-version = "1.2.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8293772165d9345bdaaa39b45b2109591e63fe5e6fbc23c6ff930a048aa310b"
-dependencies = [
- "shlex",
-]
-
-[[package]]
-name = "cfg-if"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-
-[[package]]
-name = "color-eyre"
-version = "0.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55146f5e46f237f7423d74111267d4597b59b0dad0ffaf7303bce9945d843ad5"
-dependencies = [
- "backtrace",
- "color-spantrace",
- "eyre",
- "indenter",
- "once_cell",
- "owo-colors",
- "tracing-error",
-]
-
-[[package]]
-name = "color-spantrace"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd6be1b2a7e382e2b98b43b2adcca6bb0e465af0bdd38123873ae61eb17a72c2"
-dependencies = [
- "once_cell",
- "owo-colors",
- "tracing-core",
- "tracing-error",
-]
-
-[[package]]
-name = "eyre"
-version = "0.6.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec"
-dependencies = [
- "indenter",
- "once_cell",
-]
-
-[[package]]
-name = "gimli"
-version = "0.28.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
-
-[[package]]
-name = "indenter"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683"
-
-[[package]]
-name = "lazy_static"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
-
 [[package]]
 name = "libc"
 version = "0.2.169"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
 
-[[package]]
-name = "memchr"
-version = "2.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
-
 [[package]]
 name = "memmap2"
 version = "0.9.5"
@@ -123,124 +17,9 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "miniz_oxide"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
-dependencies = [
- "adler",
-]
-
-[[package]]
-name = "object"
-version = "0.32.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "once_cell"
-version = "1.20.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
-
-[[package]]
-name = "owo-colors"
-version = "3.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f"
-
-[[package]]
-name = "pin-project-lite"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
-
-[[package]]
-name = "rustc-demangle"
-version = "0.1.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
-
-[[package]]
-name = "sharded-slab"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
-dependencies = [
- "lazy_static",
-]
-
-[[package]]
-name = "shlex"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
-
 [[package]]
 name = "storable_vec"
 version = "0.1.2"
 dependencies = [
- "color-eyre",
  "memmap2",
 ]
-
-[[package]]
-name = "thread_local"
-version = "1.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
-dependencies = [
- "cfg-if",
- "once_cell",
-]
-
-[[package]]
-name = "tracing"
-version = "0.1.41"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
-dependencies = [
- "pin-project-lite",
- "tracing-core",
-]
-
-[[package]]
-name = "tracing-core"
-version = "0.1.33"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c"
-dependencies = [
- "once_cell",
- "valuable",
-]
-
-[[package]]
-name = "tracing-error"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b1581020d7a273442f5b45074a6a57d5757ad0a47dac0e9f0bd57b81936f3db"
-dependencies = [
- "tracing",
- "tracing-subscriber",
-]
-
-[[package]]
-name = "tracing-subscriber"
-version = "0.3.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008"
-dependencies = [
- "sharded-slab",
- "thread_local",
- "tracing-core",
-]
-
-[[package]]
-name = "valuable"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
diff --git a/src/crates/storable_vec/Cargo.toml b/src/crates/storable_vec/Cargo.toml
index 0dcbc1b11..2cb9ff888 100644
--- a/src/crates/storable_vec/Cargo.toml
+++ b/src/crates/storable_vec/Cargo.toml
@@ -8,5 +8,4 @@ categories = ["database"]
 edition = "2021"
 
 [dependencies]
-color-eyre = "0.6.3"
 memmap2 = "0.9.5"
diff --git a/src/crates/storable_vec/README.md b/src/crates/storable_vec/README.md
index 9a1eb0afb..e098e2cd4 100644
--- a/src/crates/storable_vec/README.md
+++ b/src/crates/storable_vec/README.md
@@ -7,6 +7,7 @@ A very small, fast, efficient and simple storable `vec` which uses `mmap2` for s
 - [x] Get (Rayon compatible)
 - [x] Push
 - [ ] Update
+- [ ] Insert
 - [ ] Remove
 
 ## Example
diff --git a/src/crates/storable_vec/src/lib.rs b/src/crates/storable_vec/src/lib.rs
index d695520df..0319afe26 100644
--- a/src/crates/storable_vec/src/lib.rs
+++ b/src/crates/storable_vec/src/lib.rs
@@ -1,21 +1,19 @@
 use std::{
     cmp::Ordering,
-    fmt::Debug,
+    fmt::{self, Debug},
     fs::{File, OpenOptions},
     io::{self, Write},
     marker::PhantomData,
     mem,
-    ops::{Deref, DerefMut, Range},
+    ops::Range,
     path::Path,
     sync::OnceLock,
 };
 
-use color_eyre::eyre::{eyre, ContextCompat};
-
 use memmap2::{Mmap, MmapOptions};
 
 ///
-/// A Push only vec stored on disk using Mmap
+/// A very small, fast, efficient and simple storable Vec
 ///
 /// Reads (imports of Mmap) are lazy
 ///
@@ -23,17 +21,24 @@ use memmap2::{Mmap, MmapOptions};
 ///
 /// The file isn't portable for speed reasons (TODO: but could be ?)
 ///
+/// If you don't call `.flush()` it just acts as a normal Vec
+///
 #[derive(Debug)]
 pub struct StorableVec<I, T> {
     file: File,
-    mmaps: VecLazyMmap,
+    cache: Vec<OnceLock<Box<Mmap>>>, // Boxed to reduce the size of the lock (24 > 16)
     disk_len: usize,
-    cache: Vec<T>,
+    pushed: Vec<T>,
+    // updated: BTreeMap<usize, T>,
+    // inserted: BTreeMap<usize, T>,
+    // removed: BTreeSet<usize>,
     phantom: PhantomData<I>,
 }
 
 /// In bytes
 const MAX_PAGE_SIZE: usize = 4096;
+const ONE_MB: usize = 1024 * 1024;
+const MAX_CACHE_SIZE: usize = 50 * ONE_MB;
 
 impl<I, T> StorableVec<I, T>
 where
@@ -45,26 +50,31 @@ where
     pub const PER_PAGE: usize = MAX_PAGE_SIZE / Self::SIZE;
     /// In bytes
     pub const PAGE_SIZE: usize = Self::PER_PAGE * Self::SIZE;
+    pub const CACHE_LENGTH: usize = MAX_CACHE_SIZE / Self::PAGE_SIZE;
 
-    pub fn import(path: &Path) -> color_eyre::Result<Self> {
+    pub fn import(path: &Path) -> Result<Self, io::Error> {
         let file = Self::open_file(path)?;
 
         let mut this = Self {
             disk_len: Self::byte_index_to_index(file.metadata()?.len() as usize),
             file,
-            mmaps: VecLazyMmap::default(),
             cache: vec![],
+            pushed: vec![],
+            // updated: BTreeMap::new(),
+            // inserted: BTreeMap::new(),
+            // removed: BTreeSet::new(),
             phantom: PhantomData,
         };
 
-        this.reset_mmaps();
+        this.reset_cache();
 
         Ok(this)
     }
 
-    fn reset_mmaps(&mut self) {
-        self.mmaps
-            .reset((self.disk_len as f64 / Self::PER_PAGE as f64).ceil() as usize);
+    pub fn reset_cache(&mut self) {
+        let len = (self.disk_len as f64 / Self::PER_PAGE as f64).ceil() as usize;
+        self.cache.clear();
+        self.cache.resize_with(len, Default::default);
     }
 
     fn open_file(path: &Path) -> Result<File, io::Error> {
@@ -97,63 +107,85 @@ where
         byte_index / Self::SIZE
     }
 
-    #[allow(unused)]
-    #[inline]
-    pub fn get(&self, index: I) -> color_eyre::Result<Option<&T>> {
-        self._get(index.into())
-    }
-    pub fn _get(&self, index: usize) -> color_eyre::Result<Option<&T>> {
-        if self.disk_len == 0 || index > self.disk_len - 1 {
-            Ok(self.cache.get(index - self.disk_len))
-        } else {
-            let mmap_index = Self::index_to_mmap_index(index);
-
-            let mmap = self
-                .mmaps
-                .get(mmap_index)
-                .context("Expect mmap to be open")?
-                .get_or_load(
-                    MAX_PAGE_SIZE,
-                    (mmap_index * Self::PAGE_SIZE) as u64,
-                    &self.file,
-                );
-
-            let range = Self::index_to_range(index);
-            let src = &mmap[range];
-
-            let (prefix, shorts, suffix) = unsafe { src.align_to::<T>() };
-
-            if !prefix.is_empty() || shorts.len() != 1 || !suffix.is_empty() {
-                dbg!(&src, &prefix, &shorts, &suffix);
-                return Err(eyre!("align_to issue"));
+    fn index_to_pushed_index(&self, index: usize) -> Result<Option<usize>> {
+        if index >= self.disk_len {
+            let index = index - self.disk_len;
+            if index >= self.pushed.len() {
+                Err(Error::IndexTooHigh)
+            } else {
+                Ok(Some(index))
             }
-
-            Ok(Some(&shorts[0]))
+        } else {
+            Ok(None)
         }
     }
 
     #[allow(unused)]
-    pub fn first(&self) -> color_eyre::Result<Option<&T>> {
-        self._get(0)
+    #[inline]
+    pub fn get(&self, index: I) -> Result<Option<&T>> {
+        self.get_(index.into())
+    }
+    pub fn get_(&self, index: usize) -> Result<Option<&T>> {
+        match self.index_to_pushed_index(index) {
+            Ok(index) => {
+                if let Some(index) = index {
+                    return Ok(self.pushed.get(index));
+                }
+            }
+            Err(Error::IndexTooHigh) => return Ok(None),
+            Err(error) => return Err(error),
+        }
+
+        // if !self.updated.is_empty() {
+        //     if let Some(v) = self.updated.get(&index) {
+        //         return Ok(Some(v));
+        //     }
+        // }
+
+        let mmap_index = Self::index_to_mmap_index(index);
+
+        let mmap = &**self
+            .cache
+            .get(mmap_index)
+            .ok_or(Error::MmapsVecIsTooSmall)?
+            .get_or_init(|| {
+                Box::new(unsafe {
+                    MmapOptions::new()
+                        .len(MAX_PAGE_SIZE)
+                        .offset((mmap_index * Self::PAGE_SIZE) as u64)
+                        .map(&self.file)
+                        .unwrap()
+                })
+            });
+
+        let range = Self::index_to_range(index);
+        let src = &mmap[range];
+
+        Ok(Some(T::unsafe_try_from_slice(src)?))
     }
 
     #[allow(unused)]
-    pub fn last(&self) -> color_eyre::Result<Option<&T>> {
+    pub fn first(&self) -> Result<Option<&T>> {
+        self.get_(0)
+    }
+
+    #[allow(unused)]
+    pub fn last(&self) -> Result<Option<&T>> {
         let len = self.len();
         if len == 0 {
             return Ok(None);
         }
-        self._get(len - 1)
+        self.get_(len - 1)
     }
 
     pub fn push(&mut self, value: T) {
-        self.cache.push(value)
+        self.pushed.push(value)
     }
 
-    pub fn push_if_needed(&mut self, index: I, value: T) -> color_eyre::Result<()> {
-        self._push_if_needed(index.into(), value)
+    pub fn push_if_needed(&mut self, index: I, value: T) -> Result<()> {
+        self.push_if_needed_(index.into(), value)
     }
-    pub fn _push_if_needed(&mut self, index: usize, value: T) -> color_eyre::Result<()> {
+    pub fn push_if_needed_(&mut self, index: usize, value: T) -> Result<()> {
         let len = self.len();
         match len.cmp(&index) {
             Ordering::Greater => Ok(()),
@@ -161,34 +193,81 @@ where
                 self.push(value);
                 Ok(())
             }
-            Ordering::Less => {
-                dbg!(std::any::type_name::<I>(), std::any::type_name::<T>());
-                dbg!(len, index, value);
-                Err(eyre!("Index is too high"))
-            }
+            Ordering::Less => Err(Error::IndexTooHigh),
         }
     }
 
+    // pub fn update(&mut self, index: I, value: T) -> Result<()> {
+    //     self._update(index.into(), value)
+    // }
+    // pub fn update_(&mut self, index: usize, value: T) -> Result<()> {
+    //     if let Some(index) = self.index_to_pushed_index(index) {
+    //         self.pushed[index] = value;
+    //     } else {
+    //         self.updated.insert(index, value);
+    //     }
+    //     Ok(())
+    // }
+
+    // pub fn fetch_update(&mut self, index: I, value: T) -> Result<T>
+    // where
+    //     T: Clone,
+    // {
+    //     self._fetch_update(index.into(), value)
+    // }
+    // pub fn fetch_update_(&mut self, index: usize, value: T) -> Result<T>
+    // where
+    //     T: Clone,
+    // {
+    //     let prev_opt = self.updated.insert(index, value);
+    //     if let Some(prev) = prev_opt {
+    //         Ok(prev)
+    //     } else {
+    //         Ok(self
+    //             ._get(index)?
+    //             .ok_or(Error::ExpectFileToHaveIndex)?
+    //             .clone())
+    //     }
+    // }
+
+    // pub fn remove(&mut self, index: I) {
+    //     self._remove(index.into())
+    // }
+    // pub fn remove_(&mut self, index: usize) {
+    //     self.removed.insert(index);
+    // }
+
     pub fn len(&self) -> usize {
-        self.disk_len + self.cache.len()
+        self.disk_len + self.pushed.len()
     }
 
     pub fn is_empty(&self) -> bool {
         self.len() == 0
     }
 
+    pub fn has(&self, index: I) -> bool {
+        self.has_(index.into())
+    }
+    pub fn has_(&self, index: usize) -> bool {
+        index < self.len()
+    }
+
+    pub fn hasnt(&self, index: I) -> bool {
+        self.hasnt_(index.into())
+    }
+    pub fn hasnt_(&self, index: usize) -> bool {
+        !self.has_(index)
+    }
+
     pub fn flush(&mut self) -> io::Result<()> {
-        self.disk_len += self.cache.len();
-        self.reset_mmaps();
+        self.disk_len += self.pushed.len();
+        self.reset_cache();
 
         let mut bytes: Vec<u8> = vec![];
 
-        mem::take(&mut self.cache).into_iter().for_each(|v| {
-            let data: *const T = &v;
-            let data: *const u8 = data as *const u8;
-            let slice = unsafe { std::slice::from_raw_parts(data, Self::SIZE) };
-            bytes.extend_from_slice(slice)
-        });
+        mem::take(&mut self.pushed)
+            .into_iter()
+            .for_each(|v| bytes.extend_from_slice(v.unsafe_as_slice()));
 
         self.file.write_all(&bytes)
     }
@@ -197,6 +276,7 @@ where
 pub trait AnyStorableVec {
     fn len(&self) -> usize;
     fn is_empty(&self) -> bool;
+    fn reset_cache(&mut self);
     fn flush(&mut self) -> io::Result<()>;
 }
 
@@ -213,44 +293,60 @@ where
         self.is_empty()
     }
 
+    fn reset_cache(&mut self) {
+        self.reset_cache();
+    }
+
     fn flush(&mut self) -> io::Result<()> {
         self.flush()
     }
 }
 
-#[derive(Debug, Default)]
-struct VecLazyMmap(Vec<LazyMmap>);
-impl VecLazyMmap {
-    pub fn reset(&mut self, len: usize) {
-        self.0.clear();
-        self.0.resize_with(len, Default::default);
-    }
-}
-impl Deref for VecLazyMmap {
-    type Target = Vec<LazyMmap>;
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-impl DerefMut for VecLazyMmap {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.0
-    }
-}
+pub trait UnsafeSizedSerDe
+where
+    Self: Sized,
+{
+    const SIZE: usize = size_of::<Self>();
 
-/// Box to reduce the size, would be 24 instead
-#[derive(Debug, Default)]
-struct LazyMmap(OnceLock<Box<Mmap>>);
-impl LazyMmap {
-    pub fn get_or_load(&self, len: usize, offset: u64, file: &File) -> &Mmap {
-        self.0.get_or_init(|| {
-            Box::new(unsafe {
-                MmapOptions::new()
-                    .len(len)
-                    .offset(offset)
-                    .map(file)
-                    .unwrap()
-            })
-        })
+    fn unsafe_try_from_slice(slice: &[u8]) -> Result<&Self> {
+        let (prefix, shorts, suffix) = unsafe { slice.align_to::<Self>() };
+
+        if !prefix.is_empty() || shorts.len() != 1 || !suffix.is_empty() {
+            // dbg!(&slice, &prefix, &shorts, &suffix);
+            return Err(Error::FailedToAlignToSelf);
+        }
+
+        Ok(&shorts[0])
+    }
+
+    fn unsafe_as_slice(&self) -> &[u8] {
+        let data: *const Self = self;
+        let data: *const u8 = data as *const u8;
+        unsafe { std::slice::from_raw_parts(data, Self::SIZE) }
     }
 }
+impl<T> UnsafeSizedSerDe for T {}
+
+pub type Result<T, E = Error> = std::result::Result<T, E>;
+
+#[derive(Debug)]
+pub enum Error {
+    MmapsVecIsTooSmall,
+    FailedToAlignToSelf,
+    IndexTooHigh,
+    ExpectFileToHaveIndex,
+    ExpectVecToHaveIndex,
+}
+impl fmt::Display for Error {
+    // This trait requires `fmt` with this exact signature.
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        match self {
+            Error::MmapsVecIsTooSmall => write!(f, "Mmaps vec is too small"),
+            Error::FailedToAlignToSelf => write!(f, "Failed to align_to for T"),
+            Error::IndexTooHigh => write!(f, "Index too high"),
+            Error::ExpectFileToHaveIndex => write!(f, "Expect file to have index"),
+            Error::ExpectVecToHaveIndex => write!(f, "Expect vec to have index"),
+        }
+    }
+}
+impl std::error::Error for Error {}
diff --git a/src/crates/storable_vec/src/main.rs b/src/crates/storable_vec/src/main.rs
index f8e048c9b..a71155def 100644
--- a/src/crates/storable_vec/src/main.rs
+++ b/src/crates/storable_vec/src/main.rs
@@ -1,15 +1,16 @@
 use std::path::Path;
 
-use storable_vec::{AnyStorableVec, StorableVec};
-
-fn main() -> color_eyre::Result<()> {
-    color_eyre::install()?;
+use storable_vec::StorableVec;
 
+fn main() -> Result<(), Box<dyn std::error::Error>> {
     {
         let mut vec: StorableVec<usize, u32> = StorableVec::import(Path::new("./v"))?;
 
-        vec.push(21);
-        dbg!(vec.get(0)?); // 21
+        vec.push(0);
+        vec.push(1);
+        vec.push(2);
+        dbg!(vec.get(0)?); // Some(0)
+        dbg!(vec.get(21)?); // None
 
         vec.flush()?;
     }
@@ -17,7 +18,7 @@ fn main() -> color_eyre::Result<()> {
     {
         let vec: StorableVec<usize, u32> = StorableVec::import(Path::new("./v"))?;
 
-        dbg!(vec.get(0)?); // 21
+        dbg!(vec.get(0)?); // 0
     }
 
     Ok(())
diff --git a/src/parser/price/binance.rs b/src/parser/price/binance.rs
index 304a5db4a..0967ad1e0 100644
--- a/src/parser/price/binance.rs
+++ b/src/parser/price/binance.rs
@@ -120,33 +120,37 @@ impl Binance {
                     .as_array()
                     .context("Expect to be an array")?
                     .iter()
-                    .map(|value| {
+                    .map(|value| -> color_eyre::Result<_> {
                         // [timestamp, open, high, low, close, volume, ...]
-                        let array = value.as_array().unwrap();
+                        let array = value.as_array().context("Expect to be array")?;
 
-                        let timestamp = (array.first().unwrap().as_u64().unwrap() / 1_000) as u32;
+                        let timestamp = (array
+                            .first()
+                            .context("Expect to have first")?
+                            .as_u64()
+                            .context("Expect to be convertible to u64")?
+                            / 1_000) as u32;
 
-                        let get_f32 = |index: usize| {
-                            array
+                        let get_f32 = |index: usize| -> color_eyre::Result<f32> {
+                            Ok(array
                                 .get(index)
-                                .unwrap()
+                                .context("Expect to have index")?
                                 .as_str()
-                                .unwrap()
-                                .parse::<f32>()
-                                .unwrap()
+                                .context("Expect to have &str")?
+                                .parse::<f32>()?)
                         };
 
-                        (
+                        Ok((
                             timestamp,
                             OHLC {
-                                open: get_f32(1),
-                                high: get_f32(2),
-                                low: get_f32(3),
-                                close: get_f32(4),
+                                open: get_f32(1)?,
+                                high: get_f32(2)?,
+                                low: get_f32(3)?,
+                                close: get_f32(4)?,
                             },
-                        )
+                        ))
                     })
-                    .collect::<BTreeMap<_, _>>())
+                    .collect::<Result<BTreeMap<_, _>, _>>()?)
             },
             30,
             10,
@@ -167,36 +171,40 @@ impl Binance {
                     .as_array()
                     .context("Expect to be an array")?
                     .iter()
-                    .map(|value| {
+                    .map(|value| -> color_eyre::Result<_> {
                         // [timestamp, open, high, low, close, volume, ...]
-                        let array = value.as_array().unwrap();
+                        let array = value.as_array().context("Expect to be array")?;
 
                         let date = Timestamp::from(
-                            (array.first().unwrap().as_u64().unwrap() / 1_000) as u32,
+                            (array
+                                .first()
+                                .context("Expect to have first")?
+                                .as_u64()
+                                .context("Expect to be convertible to u64")?
+                                / 1_000) as u32,
                         )
                         .to_date();
 
-                        let get_f32 = |index: usize| {
-                            array
+                        let get_f32 = |index: usize| -> color_eyre::Result<f32> {
+                            Ok(array
                                 .get(index)
-                                .unwrap()
+                                .context("Expect to have index")?
                                 .as_str()
-                                .unwrap()
-                                .parse::<f32>()
-                                .unwrap()
+                                .context("Expect to have &str")?
+                                .parse::<f32>()?)
                         };
 
-                        (
+                        Ok((
                             date,
                             OHLC {
-                                open: get_f32(1),
-                                high: get_f32(2),
-                                low: get_f32(3),
-                                close: get_f32(4),
+                                open: get_f32(1)?,
+                                high: get_f32(2)?,
+                                low: get_f32(3)?,
+                                close: get_f32(4)?,
                             },
-                        )
+                        ))
                     })
-                    .collect::<BTreeMap<_, _>>())
+                    .collect::<Result<BTreeMap<_, _>, _>>()?)
             },
             30,
             10,
diff --git a/src/parser/price/kibo.rs b/src/parser/price/kibo.rs
index 031fcf399..858b7d7ac 100644
--- a/src/parser/price/kibo.rs
+++ b/src/parser/price/kibo.rs
@@ -2,7 +2,6 @@ use std::{collections::BTreeMap, str::FromStr};
 
 use chrono::NaiveDate;
 use color_eyre::eyre::ContextCompat;
-use itertools::Itertools;
 use log::info;
 use serde_json::Value;
 
@@ -40,7 +39,7 @@ impl Kibo {
                 ))?
                 .json()?;
 
-                Ok(body
+                let vec = body
                     .as_object()
                     .context("Expect to be an object")?
                     .get("dataset")
@@ -53,7 +52,9 @@ impl Kibo {
                     .context("Expect to be an array")?
                     .iter()
                     .map(Self::value_to_ohlc)
-                    .collect_vec())
+                    .collect::<Result<Vec<_>, _>>()?;
+
+                Ok(vec)
             },
             30,
             RETRIES,
@@ -85,28 +86,33 @@ impl Kibo {
                     .as_object()
                     .context("Expect to be an object")?
                     .iter()
-                    .map(|(serialized_date, value)| {
-                        let date = Date::wrap(NaiveDate::from_str(serialized_date).unwrap());
-
-                        (date, Self::value_to_ohlc(value))
+                    .map(|(serialized_date, value)| -> color_eyre::Result<_> {
+                        let date = Date::wrap(NaiveDate::from_str(serialized_date)?);
+                        Ok((date, Self::value_to_ohlc(value)?))
                     })
-                    .collect::<BTreeMap<_, _>>())
+                    .collect::<Result<BTreeMap<_, _>, _>>()?)
             },
             30,
             RETRIES,
         )
     }
 
-    fn value_to_ohlc(value: &Value) -> OHLC {
-        let ohlc = value.as_object().unwrap();
+    fn value_to_ohlc(value: &Value) -> color_eyre::Result<OHLC> {
+        let ohlc = value.as_object().context("Expect as_object to work")?;
 
-        let get_value = |key: &str| ohlc.get(key).unwrap().as_f64().unwrap() as f32;
+        let get_value = |key: &str| -> color_eyre::Result<f32> {
+            Ok(ohlc
+                .get(key)
+                .context("Expect get key to work")?
+                .as_f64()
+                .context("Expect as_f64 to work")? as f32)
+        };
 
-        OHLC {
-            open: get_value("open"),
-            high: get_value("high"),
-            low: get_value("low"),
-            close: get_value("close"),
-        }
+        Ok(OHLC {
+            open: get_value("open")?,
+            high: get_value("high")?,
+            low: get_value("low")?,
+            close: get_value("close")?,
+        })
     }
 }
diff --git a/src/parser/price/kraken.rs b/src/parser/price/kraken.rs
index d308b7f27..99566fee0 100644
--- a/src/parser/price/kraken.rs
+++ b/src/parser/price/kraken.rs
@@ -34,32 +34,36 @@ impl Kraken {
                     .as_array()
                     .context("Expect to be an array")?
                     .iter()
-                    .map(|value| {
-                        let array = value.as_array().unwrap();
+                    .map(|value| -> color_eyre::Result<_> {
+                        let array = value.as_array().context("Expect as_array to work")?;
 
-                        let timestamp = array.first().unwrap().as_u64().unwrap() as u32;
+                        let timestamp = array
+                            .first()
+                            .context("Expect first to work")?
+                            .as_u64()
+                            .expect("Expect as_u64 to work")
+                            as u32;
 
-                        let get_f32 = |index: usize| {
-                            array
+                        let get_f32 = |index: usize| -> color_eyre::Result<f32> {
+                            Ok(array
                                 .get(index)
-                                .unwrap()
+                                .context("Expect get index to work")?
                                 .as_str()
-                                .unwrap()
-                                .parse::<f32>()
-                                .unwrap()
+                                .context("Expect as_str to work")?
+                                .parse::<f32>()?)
                         };
 
-                        (
+                        Ok((
                             timestamp,
                             OHLC {
-                                open: get_f32(1),
-                                high: get_f32(2),
-                                low: get_f32(3),
-                                close: get_f32(4),
+                                open: get_f32(1)?,
+                                high: get_f32(2)?,
+                                low: get_f32(3)?,
+                                close: get_f32(4)?,
                             },
-                        )
+                        ))
                     })
-                    .collect::<BTreeMap<_, _>>())
+                    .collect::<Result<BTreeMap<_, _>, _>>()?)
             },
             30,
             10,
@@ -88,33 +92,39 @@ impl Kraken {
                     .as_array()
                     .context("Expect to be an array")?
                     .iter()
-                    .map(|value| {
-                        let array = value.as_array().unwrap();
+                    .map(|value| -> color_eyre::Result<_> {
+                        let array = value.as_array().context("Expect as_array to work")?;
 
-                        let date = Timestamp::from(array.first().unwrap().as_u64().unwrap() as u32)
-                            .to_date();
-
-                        let get_f32 = |index: usize| {
+                        let date = Timestamp::from(
                             array
+                                .first()
+                                .context("Expect first to work")?
+                                .as_u64()
+                                .context("Expect as_u64 to work")?
+                                as u32,
+                        )
+                        .to_date();
+
+                        let get_f32 = |index: usize| -> color_eyre::Result<f32> {
+                            Ok(array
                                 .get(index)
-                                .unwrap()
+                                .context("Expect get index to work")?
                                 .as_str()
-                                .unwrap()
-                                .parse::<f32>()
-                                .unwrap()
+                                .context("Expect as_str to work")?
+                                .parse::<f32>()?)
                         };
 
-                        (
+                        Ok((
                             date,
                             OHLC {
-                                open: get_f32(1),
-                                high: get_f32(2),
-                                low: get_f32(3),
-                                close: get_f32(4),
+                                open: get_f32(1)?,
+                                high: get_f32(2)?,
+                                low: get_f32(3)?,
+                                close: get_f32(4)?,
                             },
-                        )
+                        ))
                     })
-                    .collect::<BTreeMap<_, _>>())
+                    .collect::<Result<BTreeMap<_, _>, _>>()?)
             },
             30,
             10,

From d629ae8fbb67834ac55783908505d3eb8f6a4664 Mon Sep 17 00:00:00 2001
From: nym21 <expat-epochs0i@icloud.com>
Date: Thu, 23 Jan 2025 11:11:39 +0100
Subject: [PATCH 26/63] bindex: snapshot

---
 Cargo.lock                                    | 3724 +----------------
 Cargo.toml                                    |   76 +-
 {src/crates/bindex => bindex}/.gitignore      |    0
 {src/crates/bindex => bindex}/Cargo.lock      |    0
 {src/crates/bindex => bindex}/Cargo.toml      |    0
 {src/crates/bindex => bindex}/rustfmt.toml    |    0
 {src/crates/bindex => bindex}/src/main.rs     |  117 +-
 .../src/structs/addressbytes.rs               |    0
 .../src/structs/addressindex.rs               |    0
 .../src/structs/addressindextxoutindex.rs     |    0
 .../src/structs/addresstype.rs                |    0
 .../src/structs/addresstypeindex.rs           |    0
 .../bindex => bindex}/src/structs/amount.rs   |    0
 .../bindex => bindex}/src/structs/date.rs     |    2 +-
 .../bindex => bindex}/src/structs/exit.rs     |    0
 .../bindex => bindex}/src/structs/height.rs   |    0
 .../bindex => bindex}/src/structs/mod.rs      |    0
 .../bindex => bindex}/src/structs/prefix.rs   |    5 +
 .../bindex => bindex}/src/structs/slice.rs    |    0
 .../bindex => bindex}/src/structs/store.rs    |    0
 .../bindex => bindex}/src/structs/stores.rs   |    0
 .../src/structs/timestamp.rs                  |    0
 .../bindex => bindex}/src/structs/txindex.rs  |    0
 .../src/structs/txindexvout.rs                |    0
 .../src/structs/txoutindex.rs                 |    0
 .../bindex => bindex}/src/structs/vec.rs      |   13 +-
 .../bindex => bindex}/src/structs/vecs.rs     |   34 +-
 .../bindex => bindex}/src/structs/version.rs  |    0
 {src/crates/biter => biter}/CHANGELOG.md      |    0
 {src/crates/biter => biter}/Cargo.lock        |    0
 {src/crates/biter => biter}/Cargo.toml        |    0
 {src/crates/biter => biter}/LICENSE.md        |    0
 {src/crates/biter => biter}/README.md         |    0
 .../src/blk_index_to_blk_path.rs              |    0
 .../src/blk_index_to_blk_recap.rs             |    0
 .../biter => biter}/src/blk_metadata.rs       |    0
 .../src/blk_metadata_and_block.rs             |    0
 {src/crates/biter => biter}/src/blk_recap.rs  |    0
 {src/crates/biter => biter}/src/lib.rs        |   32 +-
 {src/crates/biter => biter}/src/main.rs       |    0
 {src/crates/biter => biter}/src/utils.rs      |    0
 {src/crates/iterable => iterable}/Cargo.lock  |    0
 {src/crates/iterable => iterable}/Cargo.toml  |    0
 {src/crates/iterable => iterable}/README.md   |    0
 {src/crates/iterable => iterable}/src/lib.rs  |    0
 .../struct_iterable_derive/Cargo.toml         |    0
 .../struct_iterable_derive/README.md          |    0
 .../struct_iterable_derive/src/lib.rs         |    0
 .../struct_iterable_internal/Cargo.toml       |    0
 .../struct_iterable_internal/README.md        |    0
 .../struct_iterable_internal/src/lib.rs       |    0
 {src/crates/snkrj => snkrj}/Cargo.lock        |    0
 {src/crates/snkrj => snkrj}/Cargo.toml        |    0
 {src/crates/snkrj => snkrj}/LICENSE.md        |    0
 {src/crates/snkrj => snkrj}/README.md         |    0
 {src/crates/snkrj => snkrj}/src/lib.rs        |    0
 {src/crates/snkrj => snkrj}/src/main.rs       |    0
 .../storable_vec => storable_vec}/.gitignore  |    0
 .../storable_vec => storable_vec}/Cargo.lock  |    0
 .../storable_vec => storable_vec}/Cargo.toml  |    0
 .../storable_vec => storable_vec}/LICENSE.md  |    0
 .../storable_vec => storable_vec}/README.md   |    0
 .../storable_vec => storable_vec}/src/lib.rs  |  175 +-
 .../storable_vec => storable_vec}/src/main.rs |    0
 64 files changed, 334 insertions(+), 3844 deletions(-)
 rename {src/crates/bindex => bindex}/.gitignore (100%)
 rename {src/crates/bindex => bindex}/Cargo.lock (100%)
 rename {src/crates/bindex => bindex}/Cargo.toml (100%)
 rename {src/crates/bindex => bindex}/rustfmt.toml (100%)
 rename {src/crates/bindex => bindex}/src/main.rs (87%)
 rename {src/crates/bindex => bindex}/src/structs/addressbytes.rs (100%)
 rename {src/crates/bindex => bindex}/src/structs/addressindex.rs (100%)
 rename {src/crates/bindex => bindex}/src/structs/addressindextxoutindex.rs (100%)
 rename {src/crates/bindex => bindex}/src/structs/addresstype.rs (100%)
 rename {src/crates/bindex => bindex}/src/structs/addresstypeindex.rs (100%)
 rename {src/crates/bindex => bindex}/src/structs/amount.rs (100%)
 rename {src/crates/bindex => bindex}/src/structs/date.rs (90%)
 rename {src/crates/bindex => bindex}/src/structs/exit.rs (100%)
 rename {src/crates/bindex => bindex}/src/structs/height.rs (100%)
 rename {src/crates/bindex => bindex}/src/structs/mod.rs (100%)
 rename {src/crates/bindex => bindex}/src/structs/prefix.rs (94%)
 rename {src/crates/bindex => bindex}/src/structs/slice.rs (100%)
 rename {src/crates/bindex => bindex}/src/structs/store.rs (100%)
 rename {src/crates/bindex => bindex}/src/structs/stores.rs (100%)
 rename {src/crates/bindex => bindex}/src/structs/timestamp.rs (100%)
 rename {src/crates/bindex => bindex}/src/structs/txindex.rs (100%)
 rename {src/crates/bindex => bindex}/src/structs/txindexvout.rs (100%)
 rename {src/crates/bindex => bindex}/src/structs/txoutindex.rs (100%)
 rename {src/crates/bindex => bindex}/src/structs/vec.rs (92%)
 rename {src/crates/bindex => bindex}/src/structs/vecs.rs (95%)
 rename {src/crates/bindex => bindex}/src/structs/version.rs (100%)
 rename {src/crates/biter => biter}/CHANGELOG.md (100%)
 rename {src/crates/biter => biter}/Cargo.lock (100%)
 rename {src/crates/biter => biter}/Cargo.toml (100%)
 rename {src/crates/biter => biter}/LICENSE.md (100%)
 rename {src/crates/biter => biter}/README.md (100%)
 rename {src/crates/biter => biter}/src/blk_index_to_blk_path.rs (100%)
 rename {src/crates/biter => biter}/src/blk_index_to_blk_recap.rs (100%)
 rename {src/crates/biter => biter}/src/blk_metadata.rs (100%)
 rename {src/crates/biter => biter}/src/blk_metadata_and_block.rs (100%)
 rename {src/crates/biter => biter}/src/blk_recap.rs (100%)
 rename {src/crates/biter => biter}/src/lib.rs (95%)
 rename {src/crates/biter => biter}/src/main.rs (100%)
 rename {src/crates/biter => biter}/src/utils.rs (100%)
 rename {src/crates/iterable => iterable}/Cargo.lock (100%)
 rename {src/crates/iterable => iterable}/Cargo.toml (100%)
 rename {src/crates/iterable => iterable}/README.md (100%)
 rename {src/crates/iterable => iterable}/src/lib.rs (100%)
 rename {src/crates/iterable => iterable}/struct_iterable_derive/Cargo.toml (100%)
 rename {src/crates/iterable => iterable}/struct_iterable_derive/README.md (100%)
 rename {src/crates/iterable => iterable}/struct_iterable_derive/src/lib.rs (100%)
 rename {src/crates/iterable => iterable}/struct_iterable_internal/Cargo.toml (100%)
 rename {src/crates/iterable => iterable}/struct_iterable_internal/README.md (100%)
 rename {src/crates/iterable => iterable}/struct_iterable_internal/src/lib.rs (100%)
 rename {src/crates/snkrj => snkrj}/Cargo.lock (100%)
 rename {src/crates/snkrj => snkrj}/Cargo.toml (100%)
 rename {src/crates/snkrj => snkrj}/LICENSE.md (100%)
 rename {src/crates/snkrj => snkrj}/README.md (100%)
 rename {src/crates/snkrj => snkrj}/src/lib.rs (100%)
 rename {src/crates/snkrj => snkrj}/src/main.rs (100%)
 rename {src/crates/storable_vec => storable_vec}/.gitignore (100%)
 rename {src/crates/storable_vec => storable_vec}/Cargo.lock (100%)
 rename {src/crates/storable_vec => storable_vec}/Cargo.toml (100%)
 rename {src/crates/storable_vec => storable_vec}/LICENSE.md (100%)
 rename {src/crates/storable_vec => storable_vec}/README.md (100%)
 rename {src/crates/storable_vec => storable_vec}/src/lib.rs (65%)
 rename {src/crates/storable_vec => storable_vec}/src/main.rs (100%)

diff --git a/Cargo.lock b/Cargo.lock
index aebbad5f6..b4de7143a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2,16 +2,6 @@
 # It is not intended for manual editing.
 version = 4
 
-[[package]]
-name = "Inflector"
-version = "0.11.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3"
-dependencies = [
- "lazy_static",
- "regex",
-]
-
 [[package]]
 name = "addr2line"
 version = "0.21.0"
@@ -27,270 +17,18 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
-[[package]]
-name = "adler2"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
-
-[[package]]
-name = "ahash"
-version = "0.8.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
-dependencies = [
- "cfg-if",
- "getrandom",
- "once_cell",
- "serde",
- "version_check",
- "zerocopy",
-]
-
-[[package]]
-name = "aho-corasick"
-version = "1.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "alloc-no-stdlib"
-version = "2.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3"
-
-[[package]]
-name = "alloc-stdlib"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece"
-dependencies = [
- "alloc-no-stdlib",
-]
-
-[[package]]
-name = "allocative"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fac2ce611db8b8cee9b2aa886ca03c924e9da5e5295d0dbd0526e5d0b0710f7"
-dependencies = [
- "allocative_derive",
- "ctor",
-]
-
-[[package]]
-name = "allocative_derive"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe233a377643e0fc1a56421d7c90acdec45c291b30345eb9f08e8d0ddce5a4ab"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.96",
-]
-
-[[package]]
-name = "allocator-api2"
-version = "0.2.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
-
-[[package]]
-name = "android-tzdata"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
-
-[[package]]
-name = "android_system_properties"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "anstream"
-version = "0.6.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
-dependencies = [
- "anstyle",
- "anstyle-parse",
- "anstyle-query",
- "anstyle-wincon",
- "colorchoice",
- "is_terminal_polyfill",
- "utf8parse",
-]
-
-[[package]]
-name = "anstyle"
-version = "1.0.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
-
-[[package]]
-name = "anstyle-parse"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
-dependencies = [
- "utf8parse",
-]
-
-[[package]]
-name = "anstyle-query"
-version = "1.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
-dependencies = [
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "anstyle-wincon"
-version = "3.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125"
-dependencies = [
- "anstyle",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "anyhow"
-version = "1.0.94"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1fd03a028ef38ba2276dce7e33fcd6369c158a1bca17946c4b1b701891c1ff7"
-
 [[package]]
 name = "arrayvec"
 version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
-[[package]]
-name = "ast_node"
-version = "3.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91fb5864e2f5bf9fd9797b94b2dfd1554d4c3092b535008b27d7e15c86675a2f"
-dependencies = [
- "proc-macro2",
- "quote",
- "swc_macros_common",
- "syn 2.0.96",
-]
-
-[[package]]
-name = "async-compression"
-version = "0.4.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df895a515f70646414f4b45c0b79082783b80552b373a68283012928df56f522"
-dependencies = [
- "brotli",
- "flate2",
- "futures-core",
- "memchr",
- "pin-project-lite",
- "tokio",
- "zstd",
- "zstd-safe",
-]
-
-[[package]]
-name = "async-trait"
-version = "0.1.83"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.96",
-]
-
-[[package]]
-name = "atomic-waker"
-version = "1.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
-
-[[package]]
-name = "auto_impl"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.96",
-]
-
 [[package]]
 name = "autocfg"
 version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
-[[package]]
-name = "axum"
-version = "0.7.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edca88bc138befd0323b20752846e6587272d3b03b0343c8ea28a6f819e6e71f"
-dependencies = [
- "async-trait",
- "axum-core",
- "bytes",
- "futures-util",
- "http",
- "http-body",
- "http-body-util",
- "hyper",
- "hyper-util",
- "itoa",
- "matchit",
- "memchr",
- "mime",
- "percent-encoding",
- "pin-project-lite",
- "rustversion",
- "serde",
- "serde_json",
- "serde_path_to_error",
- "serde_urlencoded",
- "sync_wrapper",
- "tokio",
- "tower",
- "tower-layer",
- "tower-service",
- "tracing",
-]
-
-[[package]]
-name = "axum-core"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09f2bd6146b97ae3359fa0cc6d6b376d9539582c7b4220f041a33ec24c226199"
-dependencies = [
- "async-trait",
- "bytes",
- "futures-util",
- "http",
- "http-body",
- "http-body-util",
- "mime",
- "pin-project-lite",
- "rustversion",
- "sync_wrapper",
- "tower-layer",
- "tower-service",
- "tracing",
-]
-
 [[package]]
 name = "backtrace"
 version = "0.3.71"
@@ -301,7 +39,7 @@ dependencies = [
  "cc",
  "cfg-if",
  "libc",
- "miniz_oxide 0.7.4",
+ "miniz_oxide",
  "object",
  "rustc-demangle",
 ]
@@ -322,27 +60,6 @@ version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
 
-[[package]]
-name = "base64"
-version = "0.21.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
-
-[[package]]
-name = "base64"
-version = "0.22.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
-
-[[package]]
-name = "base64-simd"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "781dd20c3aff0bd194fe7d2a977dd92f21c173891f3a03b677359e5fa457e5d5"
-dependencies = [
- "simd-abstraction",
-]
-
 [[package]]
 name = "bech32"
 version = "0.11.0"
@@ -350,30 +67,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d965446196e3b7decd44aa7ee49e31d630118f90ef12f97900f262eb915c951d"
 
 [[package]]
-name = "better_scoped_tls"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50fd297a11c709be8348aec039c8b91de16075d2b2bdaee1bd562c0875993664"
+name = "bindex"
+version = "0.1.0"
 dependencies = [
- "scoped-tls",
-]
-
-[[package]]
-name = "bincode"
-version = "2.0.0-rc.3"
-source = "git+https://github.com/bincode-org/bincode.git#5a91c1210168b968b957a14b743cf134f2d20719"
-dependencies = [
- "bincode_derive",
- "serde",
- "unty",
-]
-
-[[package]]
-name = "bincode_derive"
-version = "2.0.0-rc.3"
-source = "git+https://github.com/bincode-org/bincode.git#5a91c1210168b968b957a14b743cf134f2d20719"
-dependencies = [
- "virtue",
+ "bitcoin_hashes 0.16.0",
+ "biter 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "color-eyre",
+ "ctrlc",
+ "derive_deref",
+ "jiff",
+ "rayon",
+ "snkrj",
+ "storable_vec",
 ]
 
 [[package]]
@@ -447,9 +152,9 @@ dependencies = [
 
 [[package]]
 name = "bitcoin_hashes"
-version = "0.15.0"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0982261c82a50d89d1a411602afee0498b3e0debe3d36693f0c661352809639"
+checksum = "7e5d09f16329cd545d7e6008b2c6b2af3a90bc678cf41ac3d2f6755943301b16"
 dependencies = [
  "bitcoin-io 0.2.0",
  "hex-conservative 0.3.0",
@@ -492,6 +197,21 @@ dependencies = [
  "serde_json",
 ]
 
+[[package]]
+name = "biter"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "02527a2b7944d9edc90db0a73339c57cd521f9623f99416574d1943312c9d290"
+dependencies = [
+ "bitcoin",
+ "bitcoincore-rpc",
+ "crossbeam",
+ "derived-deref",
+ "rayon",
+ "serde",
+ "serde_json",
+]
+
 [[package]]
 name = "bitflags"
 version = "1.3.2"
@@ -504,101 +224,18 @@ version = "2.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1be3f42a67d6d345ecd59f675f3f012d6974981560836e938c22b424b85ce1be"
 
-[[package]]
-name = "bitvec"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c"
-dependencies = [
- "funty",
- "radium",
- "tap",
- "wyz",
-]
-
-[[package]]
-name = "block-buffer"
-version = "0.10.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
-dependencies = [
- "generic-array",
-]
-
-[[package]]
-name = "brotli"
-version = "7.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc97b8f16f944bba54f0433f07e30be199b6dc2bd25937444bbad560bcea29bd"
-dependencies = [
- "alloc-no-stdlib",
- "alloc-stdlib",
- "brotli-decompressor",
-]
-
-[[package]]
-name = "brotli-decompressor"
-version = "4.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a45bd2e4095a8b518033b128020dd4a55aab1c0a381ba4404a472630f4bc362"
-dependencies = [
- "alloc-no-stdlib",
- "alloc-stdlib",
-]
-
-[[package]]
-name = "browserslist-rs"
-version = "0.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdf0ca73de70c3da94e4194e4a01fe732378f55d47cf4c0588caab22a0dbfa14"
-dependencies = [
- "ahash",
- "chrono",
- "either",
- "indexmap",
- "itertools",
- "nom",
- "once_cell",
- "serde",
- "serde_json",
- "thiserror",
-]
-
-[[package]]
-name = "bumpalo"
-version = "3.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
-dependencies = [
- "allocator-api2",
-]
-
-[[package]]
-name = "bytemuck"
-version = "1.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef657dfab802224e671f5818e9a4935f9b1957ed18e58292690cc39e7a4092a3"
-
 [[package]]
 name = "byteorder"
 version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
-[[package]]
-name = "bytes"
-version = "1.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b"
-
 [[package]]
 name = "cc"
 version = "1.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a012a0df96dd6d06ba9a1b29d6402d1a5d77c6befd2566afdc26e10603dc93d7"
 dependencies = [
- "jobserver",
- "libc",
  "shlex",
 ]
 
@@ -614,61 +251,6 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
 
-[[package]]
-name = "chrono"
-version = "0.4.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825"
-dependencies = [
- "android-tzdata",
- "iana-time-zone",
- "js-sys",
- "num-traits",
- "serde",
- "wasm-bindgen",
- "windows-targets",
-]
-
-[[package]]
-name = "clap"
-version = "4.5.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8eb5e908ef3a6efbe1ed62520fb7287959888c88485abe072543190ecc66783"
-dependencies = [
- "clap_builder",
- "clap_derive",
-]
-
-[[package]]
-name = "clap_builder"
-version = "4.5.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96b01801b5fc6a0a232407abc821660c9c6d25a1cafc0d4f85f29fb8d9afc121"
-dependencies = [
- "anstream",
- "anstyle",
- "clap_lex",
- "strsim",
-]
-
-[[package]]
-name = "clap_derive"
-version = "4.5.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54b755194d6389280185988721fffba69495eed5ee9feeee9a599b53db80318c"
-dependencies = [
- "heck",
- "proc-macro2",
- "quote",
- "syn 2.0.96",
-]
-
-[[package]]
-name = "clap_lex"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6"
-
 [[package]]
 name = "color-eyre"
 version = "0.6.3"
@@ -680,7 +262,7 @@ dependencies = [
  "eyre",
  "indenter",
  "once_cell",
- "owo-colors 3.5.0",
+ "owo-colors",
  "tracing-error",
 ]
 
@@ -691,51 +273,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cd6be1b2a7e382e2b98b43b2adcca6bb0e465af0bdd38123873ae61eb17a72c2"
 dependencies = [
  "once_cell",
- "owo-colors 3.5.0",
+ "owo-colors",
  "tracing-core",
  "tracing-error",
 ]
 
-[[package]]
-name = "colorchoice"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
-
-[[package]]
-name = "core-foundation"
-version = "0.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
-[[package]]
-name = "core-foundation-sys"
-version = "0.8.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
-
-[[package]]
-name = "cpufeatures"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "crc32fast"
-version = "1.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
-dependencies = [
- "cfg-if",
-]
-
 [[package]]
 name = "crossbeam"
 version = "0.8.4"
@@ -792,26 +334,6 @@ version = "0.8.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
 
-[[package]]
-name = "crypto-common"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
-dependencies = [
- "generic-array",
- "typenum",
-]
-
-[[package]]
-name = "ctor"
-version = "0.1.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096"
-dependencies = [
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "ctrlc"
 version = "3.4.5"
@@ -819,50 +341,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "90eeab0aa92f3f9b4e87f258c72b139c207d251f9cbc1080a0086b86a8870dd3"
 dependencies = [
  "nix",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "dashmap"
-version = "5.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856"
-dependencies = [
- "cfg-if",
- "hashbrown 0.14.5",
- "lock_api",
- "once_cell",
- "parking_lot_core 0.9.10",
-]
-
-[[package]]
-name = "dashmap"
-version = "6.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf"
-dependencies = [
- "cfg-if",
- "crossbeam-utils",
- "hashbrown 0.14.5",
- "lock_api",
- "once_cell",
- "parking_lot_core 0.9.10",
-]
-
-[[package]]
-name = "data-encoding"
-version = "2.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2"
-
-[[package]]
-name = "debugid"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d"
-dependencies = [
- "serde",
- "uuid",
+ "windows-sys",
 ]
 
 [[package]]
@@ -887,81 +366,12 @@ dependencies = [
  "syn 2.0.96",
 ]
 
-[[package]]
-name = "digest"
-version = "0.10.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
-dependencies = [
- "block-buffer",
- "crypto-common",
-]
-
-[[package]]
-name = "displaydoc"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.96",
-]
-
 [[package]]
 name = "either"
 version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
 
-[[package]]
-name = "encoding_rs"
-version = "0.8.35"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "env_filter"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "186e05a59d4c50738528153b83b0b0194d3a29507dfec16eccd4b342903397d0"
-dependencies = [
- "log",
- "regex",
-]
-
-[[package]]
-name = "env_logger"
-version = "0.11.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcaee3d8e3cfc3fd92428d477bc97fc29ec8716d180c0d74c643bb26166660e0"
-dependencies = [
- "anstream",
- "anstyle",
- "env_filter",
- "humantime",
- "log",
-]
-
-[[package]]
-name = "equivalent"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
-
-[[package]]
-name = "errno"
-version = "0.3.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
-dependencies = [
- "libc",
- "windows-sys 0.59.0",
-]
-
 [[package]]
 name = "eyre"
 version = "0.6.12"
@@ -972,69 +382,6 @@ dependencies = [
  "once_cell",
 ]
 
-[[package]]
-name = "fastrand"
-version = "2.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
-
-[[package]]
-name = "fixedbitset"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
-
-[[package]]
-name = "flate2"
-version = "1.0.35"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c"
-dependencies = [
- "crc32fast",
- "miniz_oxide 0.8.0",
-]
-
-[[package]]
-name = "fnv"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
-
-[[package]]
-name = "foreign-types"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
-dependencies = [
- "foreign-types-shared",
-]
-
-[[package]]
-name = "foreign-types-shared"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
-
-[[package]]
-name = "form_urlencoded"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
-dependencies = [
- "percent-encoding",
-]
-
-[[package]]
-name = "from_variant"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d7ccf961415e7aa17ef93dcb6c2441faaa8e768abe09e659b908089546f74c5"
-dependencies = [
- "proc-macro2",
- "swc_macros_common",
- "syn 2.0.96",
-]
-
 [[package]]
 name = "fs2"
 version = "0.4.3"
@@ -1045,72 +392,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "funty"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
-
-[[package]]
-name = "futures-channel"
-version = "0.3.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
-dependencies = [
- "futures-core",
- "futures-sink",
-]
-
-[[package]]
-name = "futures-core"
-version = "0.3.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
-
-[[package]]
-name = "futures-io"
-version = "0.3.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
-
-[[package]]
-name = "futures-sink"
-version = "0.3.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
-
-[[package]]
-name = "futures-task"
-version = "0.3.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
-
-[[package]]
-name = "futures-util"
-version = "0.3.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
-dependencies = [
- "futures-core",
- "futures-io",
- "futures-sink",
- "futures-task",
- "memchr",
- "pin-project-lite",
- "pin-utils",
- "slab",
-]
-
-[[package]]
-name = "generic-array"
-version = "0.14.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
-dependencies = [
- "typenum",
- "version_check",
-]
-
 [[package]]
 name = "getrandom"
 version = "0.2.15"
@@ -1128,62 +409,6 @@ version = "0.28.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
 
-[[package]]
-name = "h2"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205"
-dependencies = [
- "atomic-waker",
- "bytes",
- "fnv",
- "futures-core",
- "futures-sink",
- "http",
- "indexmap",
- "slab",
- "tokio",
- "tokio-util",
- "tracing",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
-dependencies = [
- "ahash",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.14.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
-dependencies = [
- "ahash",
- "allocator-api2",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.15.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
-
-[[package]]
-name = "heck"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
-
-[[package]]
-name = "hermit-abi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
-
 [[package]]
 name = "hex-conservative"
 version = "0.2.1"
@@ -1208,352 +433,12 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3011d1213f159867b13cfd6ac92d2cd5f1345762c63be3554e84092d85a50bbd"
 
-[[package]]
-name = "hstr"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63d6824358c0fd9a68bb23999ed2ef76c84f79408a26ef7ae53d5f370c94ad36"
-dependencies = [
- "hashbrown 0.14.5",
- "new_debug_unreachable",
- "once_cell",
- "phf",
- "rustc-hash",
- "triomphe",
-]
-
-[[package]]
-name = "http"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f16ca2af56261c99fba8bac40a10251ce8188205a4c448fbb745a2e4daa76fea"
-dependencies = [
- "bytes",
- "fnv",
- "itoa",
-]
-
-[[package]]
-name = "http-body"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
-dependencies = [
- "bytes",
- "http",
-]
-
-[[package]]
-name = "http-body-util"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f"
-dependencies = [
- "bytes",
- "futures-util",
- "http",
- "http-body",
- "pin-project-lite",
-]
-
-[[package]]
-name = "httparse"
-version = "1.9.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946"
-
-[[package]]
-name = "httpdate"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
-
-[[package]]
-name = "humantime"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
-
-[[package]]
-name = "hyper"
-version = "1.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97818827ef4f364230e16705d4706e2897df2bb60617d6ca15d598025a3c481f"
-dependencies = [
- "bytes",
- "futures-channel",
- "futures-util",
- "h2",
- "http",
- "http-body",
- "httparse",
- "httpdate",
- "itoa",
- "pin-project-lite",
- "smallvec",
- "tokio",
- "want",
-]
-
-[[package]]
-name = "hyper-rustls"
-version = "0.27.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333"
-dependencies = [
- "futures-util",
- "http",
- "hyper",
- "hyper-util",
- "rustls",
- "rustls-pki-types",
- "tokio",
- "tokio-rustls",
- "tower-service",
-]
-
-[[package]]
-name = "hyper-tls"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"
-dependencies = [
- "bytes",
- "http-body-util",
- "hyper",
- "hyper-util",
- "native-tls",
- "tokio",
- "tokio-native-tls",
- "tower-service",
-]
-
-[[package]]
-name = "hyper-util"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4"
-dependencies = [
- "bytes",
- "futures-channel",
- "futures-util",
- "http",
- "http-body",
- "hyper",
- "pin-project-lite",
- "socket2",
- "tokio",
- "tower-service",
- "tracing",
-]
-
-[[package]]
-name = "iana-time-zone"
-version = "0.1.61"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220"
-dependencies = [
- "android_system_properties",
- "core-foundation-sys",
- "iana-time-zone-haiku",
- "js-sys",
- "wasm-bindgen",
- "windows-core",
-]
-
-[[package]]
-name = "iana-time-zone-haiku"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
-dependencies = [
- "cc",
-]
-
-[[package]]
-name = "icu_collections"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
-dependencies = [
- "displaydoc",
- "yoke",
- "zerofrom",
- "zerovec",
-]
-
-[[package]]
-name = "icu_locid"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
-dependencies = [
- "displaydoc",
- "litemap",
- "tinystr",
- "writeable",
- "zerovec",
-]
-
-[[package]]
-name = "icu_locid_transform"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
-dependencies = [
- "displaydoc",
- "icu_locid",
- "icu_locid_transform_data",
- "icu_provider",
- "tinystr",
- "zerovec",
-]
-
-[[package]]
-name = "icu_locid_transform_data"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e"
-
-[[package]]
-name = "icu_normalizer"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
-dependencies = [
- "displaydoc",
- "icu_collections",
- "icu_normalizer_data",
- "icu_properties",
- "icu_provider",
- "smallvec",
- "utf16_iter",
- "utf8_iter",
- "write16",
- "zerovec",
-]
-
-[[package]]
-name = "icu_normalizer_data"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
-
-[[package]]
-name = "icu_properties"
-version = "1.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5"
-dependencies = [
- "displaydoc",
- "icu_collections",
- "icu_locid_transform",
- "icu_properties_data",
- "icu_provider",
- "tinystr",
- "zerovec",
-]
-
-[[package]]
-name = "icu_properties_data"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
-
-[[package]]
-name = "icu_provider"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
-dependencies = [
- "displaydoc",
- "icu_locid",
- "icu_provider_macros",
- "stable_deref_trait",
- "tinystr",
- "writeable",
- "yoke",
- "zerofrom",
- "zerovec",
-]
-
-[[package]]
-name = "icu_provider_macros"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.96",
-]
-
-[[package]]
-name = "idna"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
-dependencies = [
- "idna_adapter",
- "smallvec",
- "utf8_iter",
-]
-
-[[package]]
-name = "idna_adapter"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71"
-dependencies = [
- "icu_normalizer",
- "icu_properties",
-]
-
-[[package]]
-name = "if_chain"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed"
-
 [[package]]
 name = "indenter"
 version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683"
 
-[[package]]
-name = "indexmap"
-version = "2.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f"
-dependencies = [
- "equivalent",
- "hashbrown 0.15.2",
- "serde",
-]
-
-[[package]]
-name = "inferno"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "692eda1cc790750b9f5a5e3921ef9c117fd5498b97cfacbc910693e5b29002dc"
-dependencies = [
- "ahash",
- "clap",
- "crossbeam-channel",
- "crossbeam-utils",
- "dashmap 6.1.0",
- "env_logger",
- "indexmap",
- "itoa",
- "log",
- "num-format",
- "once_cell",
- "quick-xml",
- "rgb",
- "str_stack",
-]
-
 [[package]]
 name = "instant"
 version = "0.1.13"
@@ -1563,39 +448,6 @@ dependencies = [
  "cfg-if",
 ]
 
-[[package]]
-name = "ipnet"
-version = "2.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708"
-
-[[package]]
-name = "is-macro"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d57a3e447e24c22647738e4607f1df1e0ec6f72e16182c4cd199f647cdfb0e4"
-dependencies = [
- "heck",
- "proc-macro2",
- "quote",
- "syn 2.0.96",
-]
-
-[[package]]
-name = "is_terminal_polyfill"
-version = "1.70.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
-
-[[package]]
-name = "itertools"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
-dependencies = [
- "either",
-]
-
 [[package]]
 name = "itoa"
 version = "1.0.14"
@@ -1603,31 +455,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
 
 [[package]]
-name = "jobserver"
-version = "0.1.32"
+name = "jiff"
+version = "0.1.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0"
+checksum = "fb73dbeee753ae9411475ddd8861765fa7f25fe1eebf180c24e1bbabef3fbdcd"
 dependencies = [
- "libc",
+ "jiff-tzdb-platform",
+ "log",
+ "portable-atomic",
+ "portable-atomic-util",
+ "serde",
+ "windows-sys",
 ]
 
 [[package]]
-name = "js-sys"
-version = "0.3.76"
+name = "jiff-tzdb"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6717b6b5b077764fb5966237269cb3c64edddde4b14ce42647430a78ced9e7b7"
-dependencies = [
- "once_cell",
- "wasm-bindgen",
-]
+checksum = "cf2cec2f5d266af45a071ece48b1fb89f3b00b2421ac3a5fe10285a6caaa60d3"
 
 [[package]]
-name = "jsonc-parser"
-version = "0.21.1"
+name = "jiff-tzdb-platform"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b56a20e76235284255a09fcd1f45cf55d3c524ea657ebd3854735925c57743d"
+checksum = "a63c62e404e7b92979d2792352d885a7f8f83fd1d0d31eea582d77b2ceca697e"
 dependencies = [
- "serde_json",
+ "jiff-tzdb",
 ]
 
 [[package]]
@@ -1636,47 +489,12 @@ version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3662a38d341d77efecb73caf01420cfa5aa63c0253fd7bc05289ef9f6616e1bf"
 dependencies = [
- "base64 0.13.1",
+ "base64",
  "minreq",
  "serde",
  "serde_json",
 ]
 
-[[package]]
-name = "kibo_money"
-version = "0.6.0"
-dependencies = [
- "allocative",
- "axum",
- "bincode",
- "bitcoin_hashes 0.15.0",
- "biter",
- "chrono",
- "clap",
- "color-eyre",
- "ctrlc",
- "derive_deref",
- "env_logger",
- "inferno",
- "itertools",
- "log",
- "ordered-float",
- "rayon",
- "regex",
- "reqwest",
- "rlimit",
- "serde",
- "serde_json",
- "snkrj",
- "struct_iterable",
- "swc",
- "swc_common",
- "tokio",
- "toml",
- "tower-http",
- "zstd",
-]
-
 [[package]]
 name = "lazy_static"
 version = "1.5.0"
@@ -1689,18 +507,6 @@ version = "0.2.169"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
 
-[[package]]
-name = "linux-raw-sys"
-version = "0.4.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
-
-[[package]]
-name = "litemap"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104"
-
 [[package]]
 name = "lock_api"
 version = "0.4.12"
@@ -1716,24 +522,6 @@ name = "log"
 version = "0.4.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "lru"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "718e8fae447df0c7e1ba7f5189829e63fd536945c8988d61444c19039f16b670"
-dependencies = [
- "hashbrown 0.13.2",
-]
-
-[[package]]
-name = "matchit"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94"
 
 [[package]]
 name = "memchr"
@@ -1750,43 +538,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "miette"
-version = "7.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "317f146e2eb7021892722af37cf1b971f0a70c8406f487e24952667616192c64"
-dependencies = [
- "cfg-if",
- "miette-derive",
- "owo-colors 4.1.0",
- "textwrap",
- "thiserror",
- "unicode-width",
-]
-
-[[package]]
-name = "miette-derive"
-version = "7.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23c9b935fbe1d6cbd1dac857b54a688145e2d93f48db36010514d0f612d0ad67"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.96",
-]
-
-[[package]]
-name = "mime"
-version = "0.3.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
-
-[[package]]
-name = "minimal-lexical"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
-
 [[package]]
 name = "miniz_oxide"
 version = "0.7.4"
@@ -1796,15 +547,6 @@ dependencies = [
  "adler",
 ]
 
-[[package]]
-name = "miniz_oxide"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1"
-dependencies = [
- "adler2",
-]
-
 [[package]]
 name = "minreq"
 version = "2.12.0"
@@ -1816,40 +558,6 @@ dependencies = [
  "serde_json",
 ]
 
-[[package]]
-name = "mio"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd"
-dependencies = [
- "libc",
- "wasi",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "native-tls"
-version = "0.2.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466"
-dependencies = [
- "libc",
- "log",
- "openssl",
- "openssl-probe",
- "openssl-sys",
- "schannel",
- "security-framework",
- "security-framework-sys",
- "tempfile",
-]
-
-[[package]]
-name = "new_debug_unreachable"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086"
-
 [[package]]
 name = "nix"
 version = "0.29.0"
@@ -1862,74 +570,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "nom"
-version = "7.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
-dependencies = [
- "memchr",
- "minimal-lexical",
-]
-
-[[package]]
-name = "normpath"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a9da8c9922c35a1033d76f7272dfc2e7ee20392083d75aeea6ced23c6266578"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "num-bigint"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
-dependencies = [
- "num-integer",
- "num-traits",
- "serde",
-]
-
-[[package]]
-name = "num-format"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a652d9771a63711fd3c3deb670acfbe5c30a4072e664d7a3bf5a9e1056ac72c3"
-dependencies = [
- "arrayvec",
- "itoa",
-]
-
-[[package]]
-name = "num-integer"
-version = "0.1.46"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
-dependencies = [
- "num-traits",
-]
-
-[[package]]
-name = "num-traits"
-version = "0.2.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "num_cpus"
-version = "1.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
-dependencies = [
- "hermit-abi",
- "libc",
-]
-
 [[package]]
 name = "object"
 version = "0.32.2"
@@ -1945,77 +585,12 @@ version = "1.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
 
-[[package]]
-name = "openssl"
-version = "0.10.66"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1"
-dependencies = [
- "bitflags 2.7.0",
- "cfg-if",
- "foreign-types",
- "libc",
- "once_cell",
- "openssl-macros",
- "openssl-sys",
-]
-
-[[package]]
-name = "openssl-macros"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.96",
-]
-
-[[package]]
-name = "openssl-probe"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
-
-[[package]]
-name = "openssl-sys"
-version = "0.9.104"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741"
-dependencies = [
- "cc",
- "libc",
- "pkg-config",
- "vcpkg",
-]
-
-[[package]]
-name = "ordered-float"
-version = "4.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7bb71e1b3fa6ca1c61f383464aaf2bb0e2f8e772a1f01d486832464de363b951"
-dependencies = [
- "num-traits",
-]
-
-[[package]]
-name = "outref"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f222829ae9293e33a9f5e9f440c6760a3d450a64affe1846486b140db81c1f4"
-
 [[package]]
 name = "owo-colors"
 version = "3.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f"
 
-[[package]]
-name = "owo-colors"
-version = "4.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb37767f6569cd834a413442455e0f066d0d522de8630436e2a1761d9726ba56"
-
 [[package]]
 name = "parking_lot"
 version = "0.11.2"
@@ -2024,17 +599,7 @@ checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
 dependencies = [
  "instant",
  "lock_api",
- "parking_lot_core 0.8.6",
-]
-
-[[package]]
-name = "parking_lot"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
-dependencies = [
- "lock_api",
- "parking_lot_core 0.9.10",
+ "parking_lot_core",
 ]
 
 [[package]]
@@ -2046,100 +611,11 @@ dependencies = [
  "cfg-if",
  "instant",
  "libc",
- "redox_syscall 0.2.16",
+ "redox_syscall",
  "smallvec",
  "winapi",
 ]
 
-[[package]]
-name = "parking_lot_core"
-version = "0.9.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
-dependencies = [
- "cfg-if",
- "libc",
- "redox_syscall 0.5.8",
- "smallvec",
- "windows-targets",
-]
-
-[[package]]
-name = "path-clean"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecba01bf2678719532c5e3059e0b5f0811273d94b397088b82e3bd0a78c78fdd"
-
-[[package]]
-name = "path-clean"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17359afc20d7ab31fdb42bb844c8b3bb1dabd7dcf7e68428492da7f16966fcef"
-
-[[package]]
-name = "pathdiff"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df94ce210e5bc13cb6651479fa48d14f601d9858cfe0467f43ae157023b938d3"
-
-[[package]]
-name = "percent-encoding"
-version = "2.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
-
-[[package]]
-name = "petgraph"
-version = "0.6.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
-dependencies = [
- "fixedbitset",
- "indexmap",
-]
-
-[[package]]
-name = "phf"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc"
-dependencies = [
- "phf_macros",
- "phf_shared",
-]
-
-[[package]]
-name = "phf_generator"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0"
-dependencies = [
- "phf_shared",
- "rand",
-]
-
-[[package]]
-name = "phf_macros"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b"
-dependencies = [
- "phf_generator",
- "phf_shared",
- "proc-macro2",
- "quote",
- "syn 2.0.96",
-]
-
-[[package]]
-name = "phf_shared"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b"
-dependencies = [
- "siphasher",
-]
-
 [[package]]
 name = "pin-project-lite"
 version = "0.2.16"
@@ -2147,16 +623,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
 
 [[package]]
-name = "pin-utils"
-version = "0.1.0"
+name = "portable-atomic"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6"
 
 [[package]]
-name = "pkg-config"
-version = "0.3.31"
+name = "portable-atomic-util"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
+checksum = "d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507"
+dependencies = [
+ "portable-atomic",
+]
 
 [[package]]
 name = "ppv-lite86"
@@ -2167,24 +646,6 @@ dependencies = [
  "zerocopy",
 ]
 
-[[package]]
-name = "preset_env_base"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c8a797e42c09d55157424ac6e9b6e9e5843fc68b887691b280b055e8c3ca5e4"
-dependencies = [
- "ahash",
- "anyhow",
- "browserslist-rs",
- "dashmap 5.5.3",
- "from_variant",
- "once_cell",
- "semver 1.0.24",
- "serde",
- "st-map",
- "tracing",
-]
-
 [[package]]
 name = "proc-macro2"
 version = "1.0.93"
@@ -2194,44 +655,6 @@ dependencies = [
  "unicode-ident",
 ]
 
-[[package]]
-name = "psm"
-version = "0.1.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "200b9ff220857e53e184257720a14553b2f4aa02577d2ed9842d45d4b9654810"
-dependencies = [
- "cc",
-]
-
-[[package]]
-name = "ptr_meta"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe9e76f66d3f9606f44e45598d155cb13ecf09f4a28199e48daf8c8fc937ea90"
-dependencies = [
- "ptr_meta_derive",
-]
-
-[[package]]
-name = "ptr_meta_derive"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca414edb151b4c8d125c12566ab0d74dc9cdba36fb80eb7b848c15f495fd32d1"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.96",
-]
-
-[[package]]
-name = "quick-xml"
-version = "0.37.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f22f29bdff3987b4d8632ef95fd6424ec7e4e0a57e2f4fc63e489e75357f6a03"
-dependencies = [
- "memchr",
-]
-
 [[package]]
 name = "quote"
 version = "1.0.38"
@@ -2241,18 +664,6 @@ dependencies = [
  "proc-macro2",
 ]
 
-[[package]]
-name = "radium"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
-
-[[package]]
-name = "radix_fmt"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce082a9940a7ace2ad4a8b7d0b1eac6aa378895f18be598230c5f2284ac05426"
-
 [[package]]
 name = "rand"
 version = "0.8.5"
@@ -2312,213 +723,18 @@ dependencies = [
  "bitflags 1.3.2",
 ]
 
-[[package]]
-name = "redox_syscall"
-version = "0.5.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834"
-dependencies = [
- "bitflags 2.7.0",
-]
-
-[[package]]
-name = "regex"
-version = "1.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-automata",
- "regex-syntax",
-]
-
-[[package]]
-name = "regex-automata"
-version = "0.4.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-syntax",
-]
-
-[[package]]
-name = "regex-syntax"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
-
-[[package]]
-name = "reqwest"
-version = "0.12.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43e734407157c3c2034e0258f5e4473ddb361b1e85f95a66690d67264d7cd1da"
-dependencies = [
- "base64 0.22.1",
- "bytes",
- "encoding_rs",
- "futures-channel",
- "futures-core",
- "futures-util",
- "h2",
- "http",
- "http-body",
- "http-body-util",
- "hyper",
- "hyper-rustls",
- "hyper-tls",
- "hyper-util",
- "ipnet",
- "js-sys",
- "log",
- "mime",
- "native-tls",
- "once_cell",
- "percent-encoding",
- "pin-project-lite",
- "rustls-pemfile",
- "serde",
- "serde_json",
- "serde_urlencoded",
- "sync_wrapper",
- "system-configuration",
- "tokio",
- "tokio-native-tls",
- "tower",
- "tower-service",
- "url",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
- "windows-registry",
-]
-
-[[package]]
-name = "rgb"
-version = "0.8.50"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57397d16646700483b67d2dd6511d79318f9d057fdbd21a4066aeac8b41d310a"
-dependencies = [
- "bytemuck",
-]
-
-[[package]]
-name = "ring"
-version = "0.17.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
-dependencies = [
- "cc",
- "cfg-if",
- "getrandom",
- "libc",
- "spin",
- "untrusted",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "rlimit"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7043b63bd0cd1aaa628e476b80e6d4023a3b50eb32789f2728908107bd0c793a"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "rustc-demangle"
 version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
 
-[[package]]
-name = "rustc-hash"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
-
-[[package]]
-name = "rustc_version"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
-dependencies = [
- "semver 0.9.0",
-]
-
-[[package]]
-name = "rustix"
-version = "0.38.43"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a78891ee6bf2340288408954ac787aa063d8e8817e9f53abb37c695c6d834ef6"
-dependencies = [
- "bitflags 2.7.0",
- "errno",
- "libc",
- "linux-raw-sys",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "rustls"
-version = "0.23.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fbb44d7acc4e873d613422379f69f237a1b141928c02f6bc6ccfddddc2d7993"
-dependencies = [
- "once_cell",
- "rustls-pki-types",
- "rustls-webpki",
- "subtle",
- "zeroize",
-]
-
-[[package]]
-name = "rustls-pemfile"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50"
-dependencies = [
- "rustls-pki-types",
-]
-
-[[package]]
-name = "rustls-pki-types"
-version = "1.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b"
-
-[[package]]
-name = "rustls-webpki"
-version = "0.102.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9"
-dependencies = [
- "ring",
- "rustls-pki-types",
- "untrusted",
-]
-
-[[package]]
-name = "rustversion"
-version = "1.0.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248"
-
 [[package]]
 name = "ryu"
 version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
 
-[[package]]
-name = "ryu-js"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad97d4ce1560a5e27cec89519dc8300d1aa6035b099821261c651486a19e44d5"
-
 [[package]]
 name = "sanakirja"
 version = "1.4.3"
@@ -2528,7 +744,7 @@ dependencies = [
  "fs2",
  "log",
  "memmap2",
- "parking_lot 0.11.2",
+ "parking_lot",
  "sanakirja-core",
  "serde",
  "thiserror",
@@ -2540,21 +756,6 @@ version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8376db34ae3eac6e7bd91168bc638450073b708ce9fb46940de676f552238bf5"
 
-[[package]]
-name = "schannel"
-version = "0.1.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1"
-dependencies = [
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "scoped-tls"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
-
 [[package]]
 name = "scopeguard"
 version = "1.2.0"
@@ -2582,53 +783,6 @@ dependencies = [
  "cc",
 ]
 
-[[package]]
-name = "security-framework"
-version = "2.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
-dependencies = [
- "bitflags 2.7.0",
- "core-foundation",
- "core-foundation-sys",
- "libc",
- "security-framework-sys",
-]
-
-[[package]]
-name = "security-framework-sys"
-version = "2.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
-[[package]]
-name = "semver"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
-dependencies = [
- "semver-parser",
-]
-
-[[package]]
-name = "semver"
-version = "1.0.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3cb6eb87a131f756572d7fb904f6e7b68633f09cca868c5df1c4b8d1a694bbba"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "semver-parser"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
-
 [[package]]
 name = "serde"
 version = "1.0.217"
@@ -2661,48 +815,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "serde_path_to_error"
-version = "0.1.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af99884400da37c88f5e9146b7f1fd0fbcae8f6eec4e9da38b67d05486f814a6"
-dependencies = [
- "itoa",
- "serde",
-]
-
-[[package]]
-name = "serde_spanned"
-version = "0.6.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "serde_urlencoded"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
-dependencies = [
- "form_urlencoded",
- "itoa",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "sha1"
-version = "0.10.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
-dependencies = [
- "cfg-if",
- "cpufeatures",
- "digest",
-]
-
 [[package]]
 name = "sharded-slab"
 version = "0.1.7"
@@ -2718,56 +830,12 @@ version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 
-[[package]]
-name = "signal-hook-registry"
-version = "1.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "simd-abstraction"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cadb29c57caadc51ff8346233b5cec1d240b68ce55cf1afc764818791876987"
-dependencies = [
- "outref",
-]
-
-[[package]]
-name = "siphasher"
-version = "0.3.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
-
-[[package]]
-name = "slab"
-version = "0.4.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
-dependencies = [
- "autocfg",
-]
-
 [[package]]
 name = "smallvec"
 version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
-[[package]]
-name = "smartstring"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fb72c633efbaa2dd666986505016c32c3044395ceaf881518399d2f4127ee29"
-dependencies = [
- "autocfg",
- "static_assertions",
- "version_check",
-]
-
 [[package]]
 name = "snkrj"
 version = "0.1.1"
@@ -2776,110 +844,12 @@ dependencies = [
 ]
 
 [[package]]
-name = "socket2"
-version = "0.5.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8"
+name = "storable_vec"
+version = "0.1.2"
 dependencies = [
- "libc",
- "windows-sys 0.52.0",
+ "memmap2",
 ]
 
-[[package]]
-name = "sourcemap"
-version = "9.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27c4ea7042fd1a155ad95335b5d505ab00d5124ea0332a06c8390d200bb1a76a"
-dependencies = [
- "base64-simd",
- "bitvec",
- "data-encoding",
- "debugid",
- "if_chain",
- "rustc-hash",
- "rustc_version",
- "serde",
- "serde_json",
- "unicode-id-start",
- "url",
-]
-
-[[package]]
-name = "spin"
-version = "0.9.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
-
-[[package]]
-name = "st-map"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8257dd592de7614be71a2342d36ba2d527ddad3f9a0c8d09d6ceed4c371531e4"
-dependencies = [
- "arrayvec",
- "static-map-macro",
-]
-
-[[package]]
-name = "stable_deref_trait"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
-
-[[package]]
-name = "stacker"
-version = "0.1.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "799c883d55abdb5e98af1a7b3f23b9b6de8ecada0ecac058672d7635eb48ca7b"
-dependencies = [
- "cc",
- "cfg-if",
- "libc",
- "psm",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "static-map-macro"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "710e9696ef338691287aeb937ee6ffe60022f579d3c8d2fd9d58973a9a10a466"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.96",
-]
-
-[[package]]
-name = "static_assertions"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
-
-[[package]]
-name = "str_stack"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9091b6114800a5f2141aee1d1b9d6ca3592ac062dc5decb3764ec5895a47b4eb"
-
-[[package]]
-name = "string_enum"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9fe66b8ee349846ce2f9557a26b8f1e74843c4a13fb381f9a3d73617a5f956a"
-dependencies = [
- "proc-macro2",
- "quote",
- "swc_macros_common",
- "syn 2.0.96",
-]
-
-[[package]]
-name = "strsim"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
-
 [[package]]
 name = "struct_iterable"
 version = "0.1.2"
@@ -2902,953 +872,6 @@ dependencies = [
 name = "struct_iterable_internal"
 version = "0.1.1"
 
-[[package]]
-name = "subtle"
-version = "2.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
-
-[[package]]
-name = "swc"
-version = "9.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0314867b5eae2f5fa7844bd68b0d4040737aad49914dceae13e603b4afd8d4a1"
-dependencies = [
- "anyhow",
- "base64 0.21.7",
- "dashmap 5.5.3",
- "either",
- "indexmap",
- "jsonc-parser",
- "lru",
- "once_cell",
- "parking_lot 0.12.3",
- "pathdiff",
- "regex",
- "rustc-hash",
- "serde",
- "serde_json",
- "sourcemap",
- "swc_atoms",
- "swc_cached",
- "swc_common",
- "swc_compiler_base",
- "swc_config",
- "swc_ecma_ast",
- "swc_ecma_codegen",
- "swc_ecma_ext_transforms",
- "swc_ecma_lints",
- "swc_ecma_loader",
- "swc_ecma_minifier",
- "swc_ecma_parser",
- "swc_ecma_preset_env",
- "swc_ecma_transforms",
- "swc_ecma_transforms_base",
- "swc_ecma_transforms_compat",
- "swc_ecma_transforms_optimization",
- "swc_ecma_utils",
- "swc_ecma_visit",
- "swc_error_reporters",
- "swc_node_comments",
- "swc_timer",
- "swc_transform_common",
- "swc_typescript",
- "swc_visit",
- "tracing",
- "url",
-]
-
-[[package]]
-name = "swc_allocator"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "117d5d3289663f53022ebf157df8a42b3872d7ac759e63abf96b5987b85d4af3"
-dependencies = [
- "bumpalo",
- "hashbrown 0.14.5",
- "ptr_meta",
- "rustc-hash",
- "triomphe",
-]
-
-[[package]]
-name = "swc_atoms"
-version = "3.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a640bf2e4430a149c87b5eaf377477ce8615ca7cb808054dd20e79e42da5d6ba"
-dependencies = [
- "hstr",
- "once_cell",
- "rustc-hash",
- "serde",
-]
-
-[[package]]
-name = "swc_cached"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96b6a5ef4cfec51d3fa30b73600f206453a37fc30cf1141e4644a57b1ed88616"
-dependencies = [
- "ahash",
- "anyhow",
- "dashmap 5.5.3",
- "once_cell",
- "regex",
- "serde",
-]
-
-[[package]]
-name = "swc_common"
-version = "5.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a521e8120dc0401580864a643b5bffa035c29fc3fc41697c972743d4f008ed22"
-dependencies = [
- "ahash",
- "ast_node",
- "better_scoped_tls",
- "cfg-if",
- "either",
- "from_variant",
- "new_debug_unreachable",
- "num-bigint",
- "once_cell",
- "parking_lot 0.12.3",
- "rustc-hash",
- "serde",
- "siphasher",
- "sourcemap",
- "swc_allocator",
- "swc_atoms",
- "swc_eq_ignore_macros",
- "swc_visit",
- "tracing",
- "unicode-width",
- "url",
-]
-
-[[package]]
-name = "swc_compiler_base"
-version = "7.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91e6b81e3504db35cb4931ac448cc88a80e89d04de00412b74102b9dc86ba131"
-dependencies = [
- "anyhow",
- "base64 0.21.7",
- "once_cell",
- "pathdiff",
- "rustc-hash",
- "serde",
- "serde_json",
- "sourcemap",
- "swc_allocator",
- "swc_atoms",
- "swc_common",
- "swc_config",
- "swc_ecma_ast",
- "swc_ecma_codegen",
- "swc_ecma_minifier",
- "swc_ecma_parser",
- "swc_ecma_visit",
- "swc_timer",
-]
-
-[[package]]
-name = "swc_config"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4aa30931f9b26af8edcb4cce605909d15dcfd7577220b22c50a2988f2a53c4c1"
-dependencies = [
- "anyhow",
- "indexmap",
- "serde",
- "serde_json",
- "sourcemap",
- "swc_cached",
- "swc_config_macro",
-]
-
-[[package]]
-name = "swc_config_macro"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f2ebd37ef52a8555c8c9be78b694d64adcb5e3bc16c928f030d82f1d65fac57"
-dependencies = [
- "proc-macro2",
- "quote",
- "swc_macros_common",
- "syn 2.0.96",
-]
-
-[[package]]
-name = "swc_ecma_ast"
-version = "5.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82f448db2d1c52ffd2bd3788d89cafd8b5a75b97f0dc8aae00874dda2647f6b6"
-dependencies = [
- "bitflags 2.7.0",
- "is-macro",
- "num-bigint",
- "phf",
- "scoped-tls",
- "serde",
- "string_enum",
- "swc_atoms",
- "swc_common",
- "swc_visit",
- "unicode-id-start",
-]
-
-[[package]]
-name = "swc_ecma_codegen"
-version = "5.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f93692de35a77d920ce8d96a46217735e5f86bf42f76cc8f1a60628c347c4c8"
-dependencies = [
- "memchr",
- "num-bigint",
- "once_cell",
- "regex",
- "serde",
- "sourcemap",
- "swc_allocator",
- "swc_atoms",
- "swc_common",
- "swc_ecma_ast",
- "swc_ecma_codegen_macros",
- "tracing",
-]
-
-[[package]]
-name = "swc_ecma_codegen_macros"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f9a42f479a6475647e248fa9750982c87cd985e19d1016a1fc18a70682305d1"
-dependencies = [
- "proc-macro2",
- "quote",
- "swc_macros_common",
- "syn 2.0.96",
-]
-
-[[package]]
-name = "swc_ecma_compat_bugfixes"
-version = "6.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "448864548ea7c1866d140e36829196e5d7b35a55b4a1563945a8ce39322b8e7a"
-dependencies = [
- "swc_atoms",
- "swc_common",
- "swc_ecma_ast",
- "swc_ecma_compat_es2015",
- "swc_ecma_transforms_base",
- "swc_ecma_utils",
- "swc_ecma_visit",
- "swc_trace_macro",
- "tracing",
-]
-
-[[package]]
-name = "swc_ecma_compat_common"
-version = "6.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a04016559d293d2ac507d931e46ecfd92eb5e96ccf5452bc81c18c47806b858"
-dependencies = [
- "swc_common",
- "swc_ecma_ast",
- "swc_ecma_utils",
- "swc_ecma_visit",
- "swc_trace_macro",
-]
-
-[[package]]
-name = "swc_ecma_compat_es2015"
-version = "6.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aceb1b432819541aa1dd129b4a226f41cf881a53040efc711a625ee5f23e9afd"
-dependencies = [
- "arrayvec",
- "indexmap",
- "is-macro",
- "rustc-hash",
- "serde",
- "serde_derive",
- "smallvec",
- "swc_atoms",
- "swc_common",
- "swc_config",
- "swc_ecma_ast",
- "swc_ecma_compat_common",
- "swc_ecma_transforms_base",
- "swc_ecma_transforms_classes",
- "swc_ecma_transforms_macros",
- "swc_ecma_utils",
- "swc_ecma_visit",
- "swc_trace_macro",
- "tracing",
-]
-
-[[package]]
-name = "swc_ecma_compat_es2016"
-version = "6.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdc0d69f6541b781e4e95c1954e8ab916095b7369cdf69e14bf83be17b2dd943"
-dependencies = [
- "swc_atoms",
- "swc_common",
- "swc_ecma_ast",
- "swc_ecma_transforms_base",
- "swc_ecma_transforms_macros",
- "swc_ecma_utils",
- "swc_ecma_visit",
- "swc_trace_macro",
- "tracing",
-]
-
-[[package]]
-name = "swc_ecma_compat_es2017"
-version = "6.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ac80866f541899e4c59a954c0a37a4fd21ea1455dc44400c088b72299c1d2cc"
-dependencies = [
- "serde",
- "swc_atoms",
- "swc_common",
- "swc_ecma_ast",
- "swc_ecma_transforms_base",
- "swc_ecma_transforms_macros",
- "swc_ecma_utils",
- "swc_ecma_visit",
- "swc_trace_macro",
- "tracing",
-]
-
-[[package]]
-name = "swc_ecma_compat_es2018"
-version = "6.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdc28efd763ad5fea7acc2f1fc73ade5b334201369b88aff472053b64b304a76"
-dependencies = [
- "serde",
- "swc_atoms",
- "swc_common",
- "swc_ecma_ast",
- "swc_ecma_compat_common",
- "swc_ecma_transforms_base",
- "swc_ecma_transforms_macros",
- "swc_ecma_utils",
- "swc_ecma_visit",
- "swc_trace_macro",
- "tracing",
-]
-
-[[package]]
-name = "swc_ecma_compat_es2019"
-version = "6.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2439138f8b8c7cf1401395e0bbb6d3e35d20277268f8e8aa41fa64841af992e"
-dependencies = [
- "swc_atoms",
- "swc_common",
- "swc_ecma_ast",
- "swc_ecma_transforms_base",
- "swc_ecma_utils",
- "swc_ecma_visit",
- "swc_trace_macro",
- "tracing",
-]
-
-[[package]]
-name = "swc_ecma_compat_es2020"
-version = "7.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7a37218dcb1ad82943b9ebfbfbc283ba1ba542ed3c60aacea0b3a06e7f38809"
-dependencies = [
- "serde",
- "swc_atoms",
- "swc_common",
- "swc_ecma_ast",
- "swc_ecma_compat_es2022",
- "swc_ecma_transforms_base",
- "swc_ecma_utils",
- "swc_ecma_visit",
- "swc_trace_macro",
- "tracing",
-]
-
-[[package]]
-name = "swc_ecma_compat_es2021"
-version = "6.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c4c9d40dcf5094e863ceac27c92053ef970991e46f190ddad678b8e3ca3ecde"
-dependencies = [
- "swc_atoms",
- "swc_common",
- "swc_ecma_ast",
- "swc_ecma_transforms_base",
- "swc_ecma_utils",
- "swc_ecma_visit",
- "swc_trace_macro",
- "tracing",
-]
-
-[[package]]
-name = "swc_ecma_compat_es2022"
-version = "7.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93edab9540513a7622addbf2494fa61f487daf98d2c1ed819958b2a3d271835e"
-dependencies = [
- "swc_atoms",
- "swc_common",
- "swc_ecma_ast",
- "swc_ecma_compat_common",
- "swc_ecma_transforms_base",
- "swc_ecma_transforms_classes",
- "swc_ecma_transforms_macros",
- "swc_ecma_utils",
- "swc_ecma_visit",
- "swc_trace_macro",
- "tracing",
-]
-
-[[package]]
-name = "swc_ecma_compat_es3"
-version = "6.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f158dcb284c676bfb425c42adf307a3259d71c999c0970370ed3e09886d83c9"
-dependencies = [
- "swc_common",
- "swc_ecma_ast",
- "swc_ecma_transforms_base",
- "swc_ecma_utils",
- "swc_ecma_visit",
- "swc_trace_macro",
- "tracing",
-]
-
-[[package]]
-name = "swc_ecma_ext_transforms"
-version = "6.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3cecd84290edc5c27d0cb6df79fcd82fe500772cd2526642955227e50359675"
-dependencies = [
- "phf",
- "swc_atoms",
- "swc_common",
- "swc_ecma_ast",
- "swc_ecma_utils",
- "swc_ecma_visit",
-]
-
-[[package]]
-name = "swc_ecma_lints"
-version = "6.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0acd3d5633bdc22eb9786e6baf819334ba90162c9c382978945fe93926d9c7eb"
-dependencies = [
- "auto_impl",
- "dashmap 5.5.3",
- "parking_lot 0.12.3",
- "rayon",
- "regex",
- "serde",
- "swc_atoms",
- "swc_common",
- "swc_config",
- "swc_ecma_ast",
- "swc_ecma_utils",
- "swc_ecma_visit",
-]
-
-[[package]]
-name = "swc_ecma_loader"
-version = "5.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a19b132079bfcd19d6fdabce7e55ece93a30787f3b8684c8646ddaf2237812d"
-dependencies = [
- "anyhow",
- "dashmap 5.5.3",
- "lru",
- "normpath",
- "once_cell",
- "parking_lot 0.12.3",
- "path-clean 0.1.0",
- "pathdiff",
- "serde",
- "serde_json",
- "swc_atoms",
- "swc_cached",
- "swc_common",
- "tracing",
-]
-
-[[package]]
-name = "swc_ecma_minifier"
-version = "6.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "114c2005290d3a16dd1ced9733a0dd11862b9caf01fe43d6b796d2c9db6b7217"
-dependencies = [
- "arrayvec",
- "indexmap",
- "num-bigint",
- "num_cpus",
- "once_cell",
- "parking_lot 0.12.3",
- "phf",
- "radix_fmt",
- "regex",
- "rustc-hash",
- "ryu-js",
- "serde",
- "serde_json",
- "swc_allocator",
- "swc_atoms",
- "swc_common",
- "swc_config",
- "swc_ecma_ast",
- "swc_ecma_codegen",
- "swc_ecma_parser",
- "swc_ecma_transforms_base",
- "swc_ecma_transforms_optimization",
- "swc_ecma_usage_analyzer",
- "swc_ecma_utils",
- "swc_ecma_visit",
- "swc_timer",
- "tracing",
-]
-
-[[package]]
-name = "swc_ecma_parser"
-version = "6.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b92d3a25349d7f612c38d940f09f9c19c7b7aa3bf4d22fbe31ea44fd5354de02"
-dependencies = [
- "either",
- "new_debug_unreachable",
- "num-bigint",
- "num-traits",
- "phf",
- "serde",
- "smallvec",
- "smartstring",
- "stacker",
- "swc_atoms",
- "swc_common",
- "swc_ecma_ast",
- "tracing",
- "typed-arena",
-]
-
-[[package]]
-name = "swc_ecma_preset_env"
-version = "8.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39ac4bd1620798c38f767417f9b364b87fd2505a9e748d6b1d7549f155a0aa96"
-dependencies = [
- "anyhow",
- "dashmap 5.5.3",
- "indexmap",
- "once_cell",
- "preset_env_base",
- "rustc-hash",
- "semver 1.0.24",
- "serde",
- "serde_json",
- "st-map",
- "string_enum",
- "swc_atoms",
- "swc_common",
- "swc_ecma_ast",
- "swc_ecma_transforms",
- "swc_ecma_utils",
- "swc_ecma_visit",
-]
-
-[[package]]
-name = "swc_ecma_transforms"
-version = "8.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dccedb5a1e52795e132615a3ca01e2adb8fc9214ee75c258f8a3124a9b42c47e"
-dependencies = [
- "swc_atoms",
- "swc_common",
- "swc_ecma_ast",
- "swc_ecma_transforms_base",
- "swc_ecma_transforms_compat",
- "swc_ecma_transforms_module",
- "swc_ecma_transforms_optimization",
- "swc_ecma_transforms_proposal",
- "swc_ecma_transforms_react",
- "swc_ecma_transforms_typescript",
- "swc_ecma_utils",
- "swc_ecma_visit",
-]
-
-[[package]]
-name = "swc_ecma_transforms_base"
-version = "6.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f31557485025a2fd1f833d63601c53010857e45633f44bcc87510f3578bde0c5"
-dependencies = [
- "better_scoped_tls",
- "bitflags 2.7.0",
- "indexmap",
- "once_cell",
- "phf",
- "rustc-hash",
- "serde",
- "smallvec",
- "swc_atoms",
- "swc_common",
- "swc_ecma_ast",
- "swc_ecma_parser",
- "swc_ecma_utils",
- "swc_ecma_visit",
- "tracing",
-]
-
-[[package]]
-name = "swc_ecma_transforms_classes"
-version = "6.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3cd3a9eacaf2aa2ec7a8139e3c3883ddf4f8e948a08ee378725a4ad658beb3d9"
-dependencies = [
- "swc_atoms",
- "swc_common",
- "swc_ecma_ast",
- "swc_ecma_transforms_base",
- "swc_ecma_utils",
- "swc_ecma_visit",
-]
-
-[[package]]
-name = "swc_ecma_transforms_compat"
-version = "7.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e245e2cb96ff093c0c3170dbe4c063a0b937ce4527d37f52f467529d4977634b"
-dependencies = [
- "arrayvec",
- "indexmap",
- "is-macro",
- "num-bigint",
- "serde",
- "smallvec",
- "swc_atoms",
- "swc_common",
- "swc_config",
- "swc_ecma_ast",
- "swc_ecma_compat_bugfixes",
- "swc_ecma_compat_common",
- "swc_ecma_compat_es2015",
- "swc_ecma_compat_es2016",
- "swc_ecma_compat_es2017",
- "swc_ecma_compat_es2018",
- "swc_ecma_compat_es2019",
- "swc_ecma_compat_es2020",
- "swc_ecma_compat_es2021",
- "swc_ecma_compat_es2022",
- "swc_ecma_compat_es3",
- "swc_ecma_transforms_base",
- "swc_ecma_transforms_classes",
- "swc_ecma_transforms_macros",
- "swc_ecma_utils",
- "swc_ecma_visit",
- "swc_trace_macro",
- "tracing",
-]
-
-[[package]]
-name = "swc_ecma_transforms_macros"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6845dfb88569f3e8cd05901505916a8ebe98be3922f94769ca49f84e8ccec8f7"
-dependencies = [
- "proc-macro2",
- "quote",
- "swc_macros_common",
- "syn 2.0.96",
-]
-
-[[package]]
-name = "swc_ecma_transforms_module"
-version = "7.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5480053dfa9b7ae34c6d5cdaa33bee3d7dfd33a259cabe9122806f36625912c1"
-dependencies = [
- "Inflector",
- "anyhow",
- "bitflags 2.7.0",
- "indexmap",
- "is-macro",
- "path-clean 1.0.1",
- "pathdiff",
- "regex",
- "serde",
- "swc_atoms",
- "swc_cached",
- "swc_common",
- "swc_ecma_ast",
- "swc_ecma_loader",
- "swc_ecma_parser",
- "swc_ecma_transforms_base",
- "swc_ecma_utils",
- "swc_ecma_visit",
- "tracing",
-]
-
-[[package]]
-name = "swc_ecma_transforms_optimization"
-version = "6.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "350a4965abfada7d5b23b3140896652acc11e110ac042a160bcea5bf8b08d367"
-dependencies = [
- "dashmap 5.5.3",
- "indexmap",
- "once_cell",
- "petgraph",
- "rustc-hash",
- "serde_json",
- "swc_atoms",
- "swc_common",
- "swc_ecma_ast",
- "swc_ecma_parser",
- "swc_ecma_transforms_base",
- "swc_ecma_transforms_macros",
- "swc_ecma_utils",
- "swc_ecma_visit",
- "swc_fast_graph",
- "tracing",
-]
-
-[[package]]
-name = "swc_ecma_transforms_proposal"
-version = "6.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cba55188e66696c43333d19492f69a6f4a7785f9486ebc1b3cf7c5f743927505"
-dependencies = [
- "either",
- "rustc-hash",
- "serde",
- "smallvec",
- "swc_atoms",
- "swc_common",
- "swc_ecma_ast",
- "swc_ecma_transforms_base",
- "swc_ecma_transforms_classes",
- "swc_ecma_transforms_macros",
- "swc_ecma_utils",
- "swc_ecma_visit",
-]
-
-[[package]]
-name = "swc_ecma_transforms_react"
-version = "6.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cabf9375cfb71fc0e3d98e07e6fca39a18daa23d4878d8d2daa4c2b6c07b379"
-dependencies = [
- "base64 0.21.7",
- "dashmap 5.5.3",
- "indexmap",
- "once_cell",
- "serde",
- "sha1",
- "string_enum",
- "swc_allocator",
- "swc_atoms",
- "swc_common",
- "swc_config",
- "swc_ecma_ast",
- "swc_ecma_parser",
- "swc_ecma_transforms_base",
- "swc_ecma_transforms_macros",
- "swc_ecma_utils",
- "swc_ecma_visit",
-]
-
-[[package]]
-name = "swc_ecma_transforms_typescript"
-version = "6.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77346c37397fb238f991d6dccc027881caca539628e9a6c629299c7b94bdb08a"
-dependencies = [
- "ryu-js",
- "serde",
- "swc_atoms",
- "swc_common",
- "swc_ecma_ast",
- "swc_ecma_transforms_base",
- "swc_ecma_transforms_react",
- "swc_ecma_utils",
- "swc_ecma_visit",
-]
-
-[[package]]
-name = "swc_ecma_usage_analyzer"
-version = "6.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f58c91cfddea5723e22dbb8b1738642714d0acd1463d26d3bc7518b83468414"
-dependencies = [
- "indexmap",
- "rustc-hash",
- "swc_atoms",
- "swc_common",
- "swc_ecma_ast",
- "swc_ecma_utils",
- "swc_ecma_visit",
- "swc_timer",
- "tracing",
-]
-
-[[package]]
-name = "swc_ecma_utils"
-version = "6.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f82c9cd6029741a0ae31191796de31c7db42ad54053dd9ee16db8e8b840378e"
-dependencies = [
- "indexmap",
- "num_cpus",
- "once_cell",
- "rustc-hash",
- "ryu-js",
- "swc_atoms",
- "swc_common",
- "swc_ecma_ast",
- "swc_ecma_visit",
- "tracing",
- "unicode-id",
-]
-
-[[package]]
-name = "swc_ecma_visit"
-version = "5.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b04c06c1805bda18c27165560f1617a57453feb9fb0638d90839053641af42d4"
-dependencies = [
- "new_debug_unreachable",
- "num-bigint",
- "swc_atoms",
- "swc_common",
- "swc_ecma_ast",
- "swc_visit",
- "tracing",
-]
-
-[[package]]
-name = "swc_eq_ignore_macros"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96e15288bf385ab85eb83cff7f9e2d834348da58d0a31b33bdb572e66ee413e"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.96",
-]
-
-[[package]]
-name = "swc_error_reporters"
-version = "6.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f741b530b2df577a287e193c4a111182de01b43361617af228ec9e6e6222fa4"
-dependencies = [
- "anyhow",
- "miette",
- "once_cell",
- "parking_lot 0.12.3",
- "swc_common",
-]
-
-[[package]]
-name = "swc_fast_graph"
-version = "6.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c22e0a0478b1b06610453a97c8371cafa742e371a79aff860ccfbabe1ab160a7"
-dependencies = [
- "indexmap",
- "petgraph",
- "rustc-hash",
- "swc_common",
-]
-
-[[package]]
-name = "swc_macros_common"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a509f56fca05b39ba6c15f3e58636c3924c78347d63853632ed2ffcb6f5a0ac7"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.96",
-]
-
-[[package]]
-name = "swc_node_comments"
-version = "5.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b56d29b30a2b3f407cc8a64e01414a4150d10cc5dd72d9c2d34734d8c0af951"
-dependencies = [
- "dashmap 5.5.3",
- "swc_atoms",
- "swc_common",
-]
-
-[[package]]
-name = "swc_timer"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4db06b46cc832f7cf83c2ce21905fc465d01443a2bdccf63644383e1f5847532"
-dependencies = [
- "tracing",
-]
-
-[[package]]
-name = "swc_trace_macro"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c78717a841565df57f811376a3d19c9156091c55175e12d378f3a522de70cef"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.96",
-]
-
-[[package]]
-name = "swc_transform_common"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f23ade45bb0d8b5299022dc0f674c2125512412f5b26f42cfaffa16dcc00d56b"
-dependencies = [
- "better_scoped_tls",
- "once_cell",
- "rustc-hash",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "swc_typescript"
-version = "5.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78090bda84e8fc330a4c3a1db2551007e0035a92f02f74daed19ef8293087817"
-dependencies = [
- "petgraph",
- "rustc-hash",
- "swc_atoms",
- "swc_common",
- "swc_ecma_ast",
- "swc_ecma_utils",
- "swc_ecma_visit",
- "thiserror",
-]
-
-[[package]]
-name = "swc_visit"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9138b6a36bbe76dd6753c4c0794f7e26480ea757bee499738bedbbb3ae3ec5f3"
-dependencies = [
- "either",
- "new_debug_unreachable",
-]
-
 [[package]]
 name = "syn"
 version = "1.0.109"
@@ -3871,77 +894,6 @@ dependencies = [
  "unicode-ident",
 ]
 
-[[package]]
-name = "sync_wrapper"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263"
-dependencies = [
- "futures-core",
-]
-
-[[package]]
-name = "synstructure"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.96",
-]
-
-[[package]]
-name = "system-configuration"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b"
-dependencies = [
- "bitflags 2.7.0",
- "core-foundation",
- "system-configuration-sys",
-]
-
-[[package]]
-name = "system-configuration-sys"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
-[[package]]
-name = "tap"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
-
-[[package]]
-name = "tempfile"
-version = "3.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a8a559c81686f576e8cd0290cd2a24a2a9ad80c98b3478856500fcbd7acd704"
-dependencies = [
- "cfg-if",
- "fastrand",
- "getrandom",
- "once_cell",
- "rustix",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "textwrap"
-version = "0.16.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9"
-dependencies = [
- "unicode-linebreak",
- "unicode-width",
-]
-
 [[package]]
 name = "thiserror"
 version = "1.0.69"
@@ -3972,183 +924,16 @@ dependencies = [
  "once_cell",
 ]
 
-[[package]]
-name = "tinystr"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
-dependencies = [
- "displaydoc",
- "zerovec",
-]
-
-[[package]]
-name = "tokio"
-version = "1.43.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e"
-dependencies = [
- "backtrace",
- "bytes",
- "libc",
- "mio",
- "parking_lot 0.12.3",
- "pin-project-lite",
- "signal-hook-registry",
- "socket2",
- "tokio-macros",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "tokio-macros"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.96",
-]
-
-[[package]]
-name = "tokio-native-tls"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2"
-dependencies = [
- "native-tls",
- "tokio",
-]
-
-[[package]]
-name = "tokio-rustls"
-version = "0.26.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
-dependencies = [
- "rustls",
- "rustls-pki-types",
- "tokio",
-]
-
-[[package]]
-name = "tokio-util"
-version = "0.7.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7fcaa8d55a2bdd6b83ace262b016eca0d79ee02818c5c1bcdf0305114081078"
-dependencies = [
- "bytes",
- "futures-core",
- "futures-sink",
- "pin-project-lite",
- "tokio",
-]
-
-[[package]]
-name = "toml"
-version = "0.8.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e"
-dependencies = [
- "serde",
- "serde_spanned",
- "toml_datetime",
- "toml_edit",
-]
-
-[[package]]
-name = "toml_datetime"
-version = "0.6.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "toml_edit"
-version = "0.22.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"
-dependencies = [
- "indexmap",
- "serde",
- "serde_spanned",
- "toml_datetime",
- "winnow",
-]
-
-[[package]]
-name = "tower"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9"
-dependencies = [
- "futures-core",
- "futures-util",
- "pin-project-lite",
- "sync_wrapper",
- "tokio",
- "tower-layer",
- "tower-service",
- "tracing",
-]
-
-[[package]]
-name = "tower-http"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "403fa3b783d4b626a8ad51d766ab03cb6d2dbfc46b1c5d4448395e6628dc9697"
-dependencies = [
- "async-compression",
- "bitflags 2.7.0",
- "bytes",
- "futures-core",
- "http",
- "http-body",
- "pin-project-lite",
- "tokio",
- "tokio-util",
- "tower-layer",
- "tower-service",
-]
-
-[[package]]
-name = "tower-layer"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"
-
-[[package]]
-name = "tower-service"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
-
 [[package]]
 name = "tracing"
 version = "0.1.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
 dependencies = [
- "log",
  "pin-project-lite",
- "tracing-attributes",
  "tracing-core",
 ]
 
-[[package]]
-name = "tracing-attributes"
-version = "0.1.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.96",
-]
-
 [[package]]
 name = "tracing-core"
 version = "0.1.33"
@@ -4180,226 +965,24 @@ dependencies = [
  "tracing-core",
 ]
 
-[[package]]
-name = "triomphe"
-version = "0.1.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef8f7726da4807b58ea5c96fdc122f80702030edc33b35aff9190a51148ccc85"
-dependencies = [
- "serde",
- "stable_deref_trait",
-]
-
-[[package]]
-name = "try-lock"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
-
-[[package]]
-name = "typed-arena"
-version = "2.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a"
-
-[[package]]
-name = "typenum"
-version = "1.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
-
-[[package]]
-name = "unicode-id"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10103c57044730945224467c09f71a4db0071c123a0648cc3e818913bde6b561"
-
-[[package]]
-name = "unicode-id-start"
-version = "1.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f322b60f6b9736017344fa0635d64be2f458fbc04eef65f6be22976dd1ffd5b"
-
 [[package]]
 name = "unicode-ident"
 version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83"
 
-[[package]]
-name = "unicode-linebreak"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f"
-
-[[package]]
-name = "unicode-width"
-version = "0.1.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
-
-[[package]]
-name = "untrusted"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
-
-[[package]]
-name = "unty"
-version = "0.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1a88342087869553c259588a3ec9ca73ce9b2d538b7051ba5789ff236b6c129"
-
-[[package]]
-name = "url"
-version = "2.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60"
-dependencies = [
- "form_urlencoded",
- "idna",
- "percent-encoding",
-]
-
-[[package]]
-name = "utf16_iter"
-version = "1.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
-
-[[package]]
-name = "utf8_iter"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
-
-[[package]]
-name = "utf8parse"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
-
-[[package]]
-name = "uuid"
-version = "1.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a"
-
 [[package]]
 name = "valuable"
 version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
 
-[[package]]
-name = "vcpkg"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
-
-[[package]]
-name = "version_check"
-version = "0.9.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
-
-[[package]]
-name = "virtue"
-version = "0.0.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7302ac74a033bf17b6e609ceec0f891ca9200d502d31f02dc7908d3d98767c9d"
-
-[[package]]
-name = "want"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e"
-dependencies = [
- "try-lock",
-]
-
 [[package]]
 name = "wasi"
 version = "0.11.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
-[[package]]
-name = "wasm-bindgen"
-version = "0.2.99"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396"
-dependencies = [
- "cfg-if",
- "once_cell",
- "wasm-bindgen-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.99"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79"
-dependencies = [
- "bumpalo",
- "log",
- "proc-macro2",
- "quote",
- "syn 2.0.96",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-futures"
-version = "0.4.43"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed"
-dependencies = [
- "cfg-if",
- "js-sys",
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "wasm-bindgen-macro"
-version = "0.2.99"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cc6181fd9a7492eef6fef1f33961e3695e4579b9872a6f7c83aee556666d4fe"
-dependencies = [
- "quote",
- "wasm-bindgen-macro-support",
-]
-
-[[package]]
-name = "wasm-bindgen-macro-support"
-version = "0.2.99"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.96",
- "wasm-bindgen-backend",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-shared"
-version = "0.2.99"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6"
-
-[[package]]
-name = "web-sys"
-version = "0.3.76"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04dd7223427d52553d3702c004d3b2fe07c148165faa56313cb00211e31c12bc"
-dependencies = [
- "js-sys",
- "wasm-bindgen",
-]
-
 [[package]]
 name = "winapi"
 version = "0.3.9"
@@ -4422,54 +1005,6 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
-[[package]]
-name = "windows-core"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
-dependencies = [
- "windows-targets",
-]
-
-[[package]]
-name = "windows-registry"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0"
-dependencies = [
- "windows-result",
- "windows-strings",
- "windows-targets",
-]
-
-[[package]]
-name = "windows-result"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e"
-dependencies = [
- "windows-targets",
-]
-
-[[package]]
-name = "windows-strings"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10"
-dependencies = [
- "windows-result",
- "windows-targets",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
-dependencies = [
- "windows-targets",
-]
-
 [[package]]
 name = "windows-sys"
 version = "0.59.0"
@@ -4543,60 +1078,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
-[[package]]
-name = "winnow"
-version = "0.6.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "write16"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
-
-[[package]]
-name = "writeable"
-version = "0.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
-
-[[package]]
-name = "wyz"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed"
-dependencies = [
- "tap",
-]
-
-[[package]]
-name = "yoke"
-version = "0.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40"
-dependencies = [
- "serde",
- "stable_deref_trait",
- "yoke-derive",
- "zerofrom",
-]
-
-[[package]]
-name = "yoke-derive"
-version = "0.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.96",
- "synstructure",
-]
-
 [[package]]
 name = "zerocopy"
 version = "0.7.35"
@@ -4617,80 +1098,3 @@ dependencies = [
  "quote",
  "syn 2.0.96",
 ]
-
-[[package]]
-name = "zerofrom"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e"
-dependencies = [
- "zerofrom-derive",
-]
-
-[[package]]
-name = "zerofrom-derive"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.96",
- "synstructure",
-]
-
-[[package]]
-name = "zeroize"
-version = "1.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
-
-[[package]]
-name = "zerovec"
-version = "0.10.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
-dependencies = [
- "yoke",
- "zerofrom",
- "zerovec-derive",
-]
-
-[[package]]
-name = "zerovec-derive"
-version = "0.10.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.96",
-]
-
-[[package]]
-name = "zstd"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9"
-dependencies = [
- "zstd-safe",
-]
-
-[[package]]
-name = "zstd-safe"
-version = "7.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54a3ab4db68cea366acc5c897c7b4d4d1b8994a9cd6e6f841f8964566a419059"
-dependencies = [
- "zstd-sys",
-]
-
-[[package]]
-name = "zstd-sys"
-version = "2.0.13+zstd.1.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa"
-dependencies = [
- "cc",
- "pkg-config",
-]
diff --git a/Cargo.toml b/Cargo.toml
index 5955bcc61..1a3669c99 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,39 +1,43 @@
-[package]
-name = "kibo_money"
-version = "0.6.0"
-edition = "2021"
+# [package]
+# name = "kibo_money"
+# version = "0.6.0"
+# edition = "2021"
+
+[workspace]
+members = ["bindex", "biter", "iterable", "snkrj", "storable_vec"]
+resolver = "2"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
-[dependencies]
-allocative = "0.3.4"
-axum = "0.7.9"
-bincode = { git = "https://github.com/bincode-org/bincode.git", features = [
-    "serde",
-] }
-bitcoin_hashes = { version = "0.15.0" }
-biter = { path = "./src/crates/biter" }
-chrono = { version = "0.4.39", features = ["serde"] }
-clap = { version = "4.5.26", features = ["derive"] }
-color-eyre = "0.6.3"
-ctrlc = { version = "3.4.5", features = ["termination"] }
-derive_deref = "1.1.1"
-env_logger = "0.11.6"
-inferno = "0.12.1"
-itertools = "0.13.0"
-log = { version = "0.4.25", features = ["std", "serde"] }
-ordered-float = "4.6.0"
-rayon = "1.10.0"
-regex = "1.11.1"
-reqwest = { version = "0.12.12", features = ["blocking", "json"] }
-rlimit = "0.10.2"
-snkrj = { path = "./src/crates/snkrj" }
-serde = { version = "1.0.217", features = ["derive"] }
-serde_json = "1.0.135"
-struct_iterable = { path = "./src/crates/iterable" }
-swc = "9.0.2"
-swc_common = "5.0.0"
-tokio = { version = "1.43.0", features = ["full"] }
-toml = "0.8.19"
-tower-http = { version = "0.6.2", features = ["compression-full"] }
-zstd = "0.13.2"
+# [dependencies]
+# allocative = "0.3.4"
+# axum = "0.7.9"
+# bincode = { git = "https://github.com/bincode-org/bincode.git", features = [
+#     "serde",
+# ] }
+# bitcoin_hashes = { version = "0.15.0" }
+# biter = { path = "./src/crates/biter" }
+# chrono = { version = "0.4.39", features = ["serde"] }
+# clap = { version = "4.5.26", features = ["derive"] }
+# color-eyre = "0.6.3"
+# ctrlc = { version = "3.4.5", features = ["termination"] }
+# derive_deref = "1.1.1"
+# env_logger = "0.11.6"
+# inferno = "0.12.1"
+# itertools = "0.13.0"
+# log = { version = "0.4.25", features = ["std", "serde"] }
+# ordered-float = "4.6.0"
+# rayon = "1.10.0"
+# regex = "1.11.1"
+# reqwest = { version = "0.12.12", features = ["blocking", "json"] }
+# rlimit = "0.10.2"
+# snkrj = { path = "./src/crates/snkrj" }
+# serde = { version = "1.0.217", features = ["derive"] }
+# serde_json = "1.0.135"
+# struct_iterable = { path = "./src/crates/iterable" }
+# swc = "9.0.2"
+# swc_common = "5.0.0"
+# tokio = { version = "1.43.0", features = ["full"] }
+# toml = "0.8.19"
+# tower-http = { version = "0.6.2", features = ["compression-full"] }
+# zstd = "0.13.2"
diff --git a/src/crates/bindex/.gitignore b/bindex/.gitignore
similarity index 100%
rename from src/crates/bindex/.gitignore
rename to bindex/.gitignore
diff --git a/src/crates/bindex/Cargo.lock b/bindex/Cargo.lock
similarity index 100%
rename from src/crates/bindex/Cargo.lock
rename to bindex/Cargo.lock
diff --git a/src/crates/bindex/Cargo.toml b/bindex/Cargo.toml
similarity index 100%
rename from src/crates/bindex/Cargo.toml
rename to bindex/Cargo.toml
diff --git a/src/crates/bindex/rustfmt.toml b/bindex/rustfmt.toml
similarity index 100%
rename from src/crates/bindex/rustfmt.toml
rename to bindex/rustfmt.toml
diff --git a/src/crates/bindex/src/main.rs b/bindex/src/main.rs
similarity index 87%
rename from src/crates/bindex/src/main.rs
rename to bindex/src/main.rs
index 34e224d3e..30f1e1de6 100644
--- a/src/crates/bindex/src/main.rs
+++ b/bindex/src/main.rs
@@ -29,7 +29,8 @@ enum TxInOrAddressindextoutindex<'a> {
 }
 
 const UNSAFE_BLOCKS: u32 = 100;
-const SNAPSHOT_BLOCK_RANGE: usize = 4_200; // MUST 210_000 % THIS == 0
+const DAILY_BLOCK_TARGET: usize = 144;
+const SNAPSHOT_BLOCK_RANGE: usize = DAILY_BLOCK_TARGET * 10;
 
 fn main() -> color_eyre::Result<()> {
     color_eyre::install()?;
@@ -38,7 +39,7 @@ fn main() -> color_eyre::Result<()> {
 
     let check_collisions = true;
 
-    let data_dir = Path::new("../../../../bitcoin");
+    let data_dir = Path::new("../../bitcoin");
     let cookie = Path::new(data_dir).join(".cookie");
     let rpc = Client::new("http://localhost:8332", Auth::CookieFile(cookie))?;
 
@@ -62,59 +63,63 @@ fn main() -> color_eyre::Result<()> {
     let mut txindex = vecs
         .height_to_first_txindex
         .get(height)?
-        .cloned()
+        .map(|v| *v)
         .unwrap_or(Txindex::default());
 
     let mut txoutindex = vecs
         .height_to_first_txoutindex
         .get(height)?
-        .cloned()
+        .map(|v| *v)
         .unwrap_or(Txoutindex::default());
 
     let mut addressindex = vecs
         .height_to_first_addressindex
         .get(height)?
-        .cloned()
+        .map(|v| *v)
         .unwrap_or(Addressindex::default());
 
     let export = |stores: Stores, vecs: &mut Vecs, height: Height| -> color_eyre::Result<()> {
         exit.block();
         println!("Exporting...");
-        // Memory: 2.87
-        // Real Memory: 16.23
-        // Private Memory: 10.8
-        if height > Height::from(400_000_u32) {
-            pause();
-        }
-        vecs.reset_cache();
-        println!("Resetted cache");
-        // Memory: 2.87
-        // Real Memory: 13.24
-        // Private Memory: 10.8
-        if height > Height::from(400_000_u32) {
-            pause();
-        }
+        // Memory: 3.76 GB
+        // Real Memory: 22.47 GB
+        // Private Memory: 12.44 GB
+        // if height > Height::from(400_000_u32) {
+        //     pause();
+        // }
+        // vecs.reset_cache();
+        // At: 403200
+        // Memory: 3.78 GB
+        // Real Memory: 12.65 GB
+        // Private Memory: 11.39 GB
+        // if height > Height::from(400_000_u32) {
+        //     pause();
+        // }
         vecs.flush(height)?;
-        println!("Vecs flushed");
-        // Memory: 3.36
-        // Real Memory: 13.55
-        // Private Memory: 10.66
+        // At: 403200
+        // Memory: 3.79 GB
+        // Real Memory: 12.37 GB
+        // Private Memory: 10.95 GB
         // Gone up wtf
-        if height > Height::from(400_000_u32) {
-            pause();
-        }
+        // if height > Height::from(400_000_u32) {
+        //     pause();
+        // }
         stores.export(height);
         println!("Export done");
-        if height > Height::from(400_000_u32) {
-            pause();
-        }
+        // At: 403200
+        // Memory: 2.23 GB
+        // Real Memory: 1.05 GB
+        // Private Memory: 0.109 GB
+        // if height > Height::from(400_000_u32) {
+        //     pause();
+        // }
         exit.unblock();
         Ok(())
     };
 
     let mut stores_opt = Some(stores);
 
-    biter::new(data_dir, Some(height.into()), None, rpc)
+    biter::new(data_dir, Some(height.into()), Some(400_000), rpc)
         .iter()
         .try_for_each(|(_height, block, blockhash)| -> color_eyre::Result<()> {
             println!("Processing block {_height}...");
@@ -126,7 +131,8 @@ fn main() -> color_eyre::Result<()> {
             let mut stores = stores_opt.take().context("option should have wtx")?;
 
             if let Some(saved_blockhash) = vecs.height_to_blockhash.get(height)? {
-                if &blockhash != saved_blockhash {
+                // if &blockhash != saved_blockhash {
+                if &blockhash != saved_blockhash.as_ref() {
                     todo!("Rollback not implemented");
                     // parts.rollback_from(&mut wtx, height, &exit)?;
                 }
@@ -162,7 +168,7 @@ fn main() -> color_eyre::Result<()> {
                     tx.output
                         .iter()
                         .enumerate()
-                        .map(move |(vout, txout)| (Txindex::from(index), vout as u32, txout))
+                        .map(move |(vout, txout)| (Txindex::from(index), vout as u32, txout, tx))
                 }).collect::<Vec<_>>();
 
             let tx_len = block.txdata.len();
@@ -272,7 +278,7 @@ fn main() -> color_eyre::Result<()> {
                     outputs.into_par_iter().enumerate()
                         .map(
                             #[allow(clippy::type_complexity)]
-                            |(block_txoutindex, (block_txindex, vout, txout))| -> color_eyre::Result<(Txoutindex,
+                            |(block_txoutindex, (block_txindex, vout, txout, tx))| -> color_eyre::Result<(Txoutindex,
                             (&TxOut, Txindexvout, Addresstype, color_eyre::Result<Addressbytes>, Option<Addressindex>))> {
                                 let txindex_local = txindex + block_txindex;
                                 let txindexvout = Txindexvout::from((txindex_local, vout));
@@ -294,25 +300,28 @@ fn main() -> color_eyre::Result<()> {
                                         // Checking if not in the future
                                         .and_then(|addressindex_local| (addressindex_local < addressindex)
                                         .then_some(addressindex_local))
-                                });
+                                }); // OK
 
-                                if let Some(Some(addressindex)) = check_collisions.then_some(addressindex_opt) {
+                                if let Some(Some(addressindex_local)) = check_collisions.then_some(addressindex_opt) {
                                     let addressbytes = addressbytes_res.as_ref().unwrap();
 
                                     let prev_addresstype = *vecs.addressindex_to_addresstype.get(
-                                        addressindex,
+                                        addressindex_local,
                                     )?.context("Expect to have address type")?;
 
                                     let addresstypeindex = *vecs.addressindex_to_addresstypeindex.get(
-                                        addressindex,
+                                        addressindex_local,
                                     )?.context("Expect to have address type index")?;
+                                    // Good first time
+                                    // Wrong after rerun
 
                                     let prev_addressbytes_opt= vecs.get_addressbytes(prev_addresstype, addresstypeindex)?;
 
                                     let prev_addressbytes = prev_addressbytes_opt.as_ref().context("Expect to have addressbytes")?;
 
-                                    if (vecs.addressindex_to_addresstype.hasnt(addressindex) && addresstype != prev_addresstype) || (stores.addressbytes_prefix_to_addressindex.needs(height) && prev_addressbytes != addressbytes) {
-                                        dbg!(addresstype, prev_addresstype, prev_addressbytes, addressbytes, addressindex, addresstypeindex, txout, AddressbytesPrefix::from((addressbytes, addresstype)), AddressbytesPrefix::from((prev_addressbytes, prev_addresstype)));
+                                    if (vecs.addressindex_to_addresstype.hasnt(addressindex_local) && addresstype != prev_addresstype) || (stores.addressbytes_prefix_to_addressindex.needs(height) && prev_addressbytes != addressbytes) {
+                                        let txid = tx.compute_txid();
+                                        dbg!(_height, txid, vout, block_txindex, addresstype, prev_addresstype, prev_addressbytes, addressbytes, addressindex, addressindex_local, addresstypeindex, txout, AddressbytesPrefix::from((addressbytes, addresstype)), AddressbytesPrefix::from((prev_addressbytes, prev_addresstype)));
                                         panic!()
                                     }
                                 }
@@ -373,7 +382,7 @@ fn main() -> color_eyre::Result<()> {
 
                     let mut addressindex_local = addressindex;
 
-                    let mut addressbytes_prefix= None;
+                    let mut addressbytes_prefix = None;
 
                     if let Some(addressindex) = addressindex_opt.or_else(|| addressbytes_res.as_ref().ok().and_then(|addressbytes| {
                         // Check if address was first seen before in this iterator
@@ -397,6 +406,22 @@ fn main() -> color_eyre::Result<()> {
                         if let Ok(addressbytes) = addressbytes_res {
                             let addressbytes_prefix = addressbytes_prefix.unwrap();
 
+                            // if addressindex_local == Addressindex::from(257905_u32) || addressbytes_prefix == AddressbytesPrefix::from(
+                            //     [
+                            //         116_u8,
+                            //         86,
+                            //         96,
+                            //         52,
+                            //         2,
+                            //         87,
+                            //         151,
+                            //         177,
+                            //     ],
+                            // ) {
+                            //     dbg!(addressindex_local, addressbytes, addressbytes_prefix, addresstypeindex);
+                            //     panic!();
+                            // }
+
                             already_added_addressbytes_prefix.insert(addressbytes_prefix.clone(), addressindex_local);
 
                             stores.addressbytes_prefix_to_addressindex.insert_if_needed(
@@ -491,6 +516,10 @@ fn main() -> color_eyre::Result<()> {
                                         dbg!(txindex_local, txid, len);
                                     })?;
 
+                            // #[allow(clippy::redundant_locals)]
+                            // let prev_txid = prev_txid;
+                            let prev_txid = prev_txid.as_ref();
+
                             // If another Txid needs to be added to the list
                             // We need to check that it's also a coinbase tx otherwise par_iter inputs needs to be updated
                             let only_known_dup_txids = [
@@ -539,17 +568,13 @@ fn main() -> color_eyre::Result<()> {
             Ok(())
         })?;
 
-    dbg!(i.elapsed());
-
-    pause();
-
     let stores = stores_opt.take().context("option should have wtx")?;
     export(stores, &mut vecs, height)?;
 
-    pause();
-
     dbg!(i.elapsed());
 
+    pause();
+
     Ok(())
 }
 
diff --git a/src/crates/bindex/src/structs/addressbytes.rs b/bindex/src/structs/addressbytes.rs
similarity index 100%
rename from src/crates/bindex/src/structs/addressbytes.rs
rename to bindex/src/structs/addressbytes.rs
diff --git a/src/crates/bindex/src/structs/addressindex.rs b/bindex/src/structs/addressindex.rs
similarity index 100%
rename from src/crates/bindex/src/structs/addressindex.rs
rename to bindex/src/structs/addressindex.rs
diff --git a/src/crates/bindex/src/structs/addressindextxoutindex.rs b/bindex/src/structs/addressindextxoutindex.rs
similarity index 100%
rename from src/crates/bindex/src/structs/addressindextxoutindex.rs
rename to bindex/src/structs/addressindextxoutindex.rs
diff --git a/src/crates/bindex/src/structs/addresstype.rs b/bindex/src/structs/addresstype.rs
similarity index 100%
rename from src/crates/bindex/src/structs/addresstype.rs
rename to bindex/src/structs/addresstype.rs
diff --git a/src/crates/bindex/src/structs/addresstypeindex.rs b/bindex/src/structs/addresstypeindex.rs
similarity index 100%
rename from src/crates/bindex/src/structs/addresstypeindex.rs
rename to bindex/src/structs/addresstypeindex.rs
diff --git a/src/crates/bindex/src/structs/amount.rs b/bindex/src/structs/amount.rs
similarity index 100%
rename from src/crates/bindex/src/structs/amount.rs
rename to bindex/src/structs/amount.rs
diff --git a/src/crates/bindex/src/structs/date.rs b/bindex/src/structs/date.rs
similarity index 90%
rename from src/crates/bindex/src/structs/date.rs
rename to bindex/src/structs/date.rs
index 3ef99bb54..ae3a76ff5 100644
--- a/src/crates/bindex/src/structs/date.rs
+++ b/bindex/src/structs/date.rs
@@ -2,7 +2,7 @@ use jiff::tz::TimeZone;
 
 use super::Timestamp;
 
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub struct Date(jiff::civil::Date);
 
 impl From<&Timestamp> for Date {
diff --git a/src/crates/bindex/src/structs/exit.rs b/bindex/src/structs/exit.rs
similarity index 100%
rename from src/crates/bindex/src/structs/exit.rs
rename to bindex/src/structs/exit.rs
diff --git a/src/crates/bindex/src/structs/height.rs b/bindex/src/structs/height.rs
similarity index 100%
rename from src/crates/bindex/src/structs/height.rs
rename to bindex/src/structs/height.rs
diff --git a/src/crates/bindex/src/structs/mod.rs b/bindex/src/structs/mod.rs
similarity index 100%
rename from src/crates/bindex/src/structs/mod.rs
rename to bindex/src/structs/mod.rs
diff --git a/src/crates/bindex/src/structs/prefix.rs b/bindex/src/structs/prefix.rs
similarity index 94%
rename from src/crates/bindex/src/structs/prefix.rs
rename to bindex/src/structs/prefix.rs
index 06c113458..98a579ed7 100644
--- a/src/crates/bindex/src/structs/prefix.rs
+++ b/bindex/src/structs/prefix.rs
@@ -28,6 +28,11 @@ impl From<(&Addressbytes, Addresstype)> for AddressbytesPrefix {
         ))
     }
 }
+impl From<[u8; 8]> for AddressbytesPrefix {
+    fn from(value: [u8; 8]) -> Self {
+        Self(value)
+    }
+}
 
 #[derive(Debug, Deref, Clone, PartialEq, Eq, PartialOrd, Ord)]
 pub struct BlockHashPrefix([u8; 8]);
diff --git a/src/crates/bindex/src/structs/slice.rs b/bindex/src/structs/slice.rs
similarity index 100%
rename from src/crates/bindex/src/structs/slice.rs
rename to bindex/src/structs/slice.rs
diff --git a/src/crates/bindex/src/structs/store.rs b/bindex/src/structs/store.rs
similarity index 100%
rename from src/crates/bindex/src/structs/store.rs
rename to bindex/src/structs/store.rs
diff --git a/src/crates/bindex/src/structs/stores.rs b/bindex/src/structs/stores.rs
similarity index 100%
rename from src/crates/bindex/src/structs/stores.rs
rename to bindex/src/structs/stores.rs
diff --git a/src/crates/bindex/src/structs/timestamp.rs b/bindex/src/structs/timestamp.rs
similarity index 100%
rename from src/crates/bindex/src/structs/timestamp.rs
rename to bindex/src/structs/timestamp.rs
diff --git a/src/crates/bindex/src/structs/txindex.rs b/bindex/src/structs/txindex.rs
similarity index 100%
rename from src/crates/bindex/src/structs/txindex.rs
rename to bindex/src/structs/txindex.rs
diff --git a/src/crates/bindex/src/structs/txindexvout.rs b/bindex/src/structs/txindexvout.rs
similarity index 100%
rename from src/crates/bindex/src/structs/txindexvout.rs
rename to bindex/src/structs/txindexvout.rs
diff --git a/src/crates/bindex/src/structs/txoutindex.rs b/bindex/src/structs/txoutindex.rs
similarity index 100%
rename from src/crates/bindex/src/structs/txoutindex.rs
rename to bindex/src/structs/txoutindex.rs
diff --git a/src/crates/bindex/src/structs/vec.rs b/bindex/src/structs/vec.rs
similarity index 92%
rename from src/crates/bindex/src/structs/vec.rs
rename to bindex/src/structs/vec.rs
index f8184cd45..c78d93d97 100644
--- a/src/crates/bindex/src/structs/vec.rs
+++ b/bindex/src/structs/vec.rs
@@ -16,7 +16,7 @@ pub struct StorableVec<I, T> {
 impl<I, T> StorableVec<I, T>
 where
     I: Into<usize>,
-    T: Sized + Debug,
+    T: Sized + Debug + Clone,
 {
     pub fn import(path: &Path, version: Version) -> io::Result<Self> {
         fs::create_dir_all(path)?;
@@ -70,10 +70,6 @@ where
         path.join("height")
     }
 
-    fn reset_cache(&mut self) {
-        self.vec.reset_cache();
-    }
-
     // pub fn needs(&self, height: Height) -> bool {
     //     self.height() // store height in struct
     // }
@@ -93,23 +89,18 @@ impl<I, T> DerefMut for StorableVec<I, T> {
 
 pub trait AnyBindexVec {
     fn height(&self) -> color_eyre::Result<Height>;
-    fn reset_cache(&mut self);
     fn flush(&mut self, height: Height) -> io::Result<()>;
 }
 
 impl<I, T> AnyBindexVec for StorableVec<I, T>
 where
     I: Into<usize>,
-    T: Sized + Debug,
+    T: Sized + Debug + Clone,
 {
     fn height(&self) -> color_eyre::Result<Height> {
         self.height()
     }
 
-    fn reset_cache(&mut self) {
-        self.reset_cache();
-    }
-
     fn flush(&mut self, height: Height) -> io::Result<()> {
         self.flush(height)
     }
diff --git a/src/crates/bindex/src/structs/vecs.rs b/bindex/src/structs/vecs.rs
similarity index 95%
rename from src/crates/bindex/src/structs/vecs.rs
rename to bindex/src/structs/vecs.rs
index 66c7f5992..59e6ebcc7 100644
--- a/src/crates/bindex/src/structs/vecs.rs
+++ b/bindex/src/structs/vecs.rs
@@ -168,38 +168,38 @@ impl Vecs {
             Addresstype::P2PK65 => self
                 .p2pk65index_to_p2pk65addressbytes
                 .get(addresstypeindex)?
-                .cloned()
-                .map(Addressbytes::from),
+                // .map(|v| Addressbytes::from(v.clone())),
+                .map(|v| Addressbytes::from(v.into_inner())),
             Addresstype::P2PK33 => self
                 .p2pk33index_to_p2pk33addressbytes
                 .get(addresstypeindex)?
-                .cloned()
-                .map(Addressbytes::from),
+                // .map(|v| Addressbytes::from(v.clone())),
+                .map(|v| Addressbytes::from(v.into_inner())),
             Addresstype::P2PKH => self
                 .p2pkhindex_to_p2pkhaddressbytes
                 .get(addresstypeindex)?
-                .cloned()
-                .map(Addressbytes::from),
+                // .map(|v| Addressbytes::from(v.clone())),
+                .map(|v| Addressbytes::from(v.into_inner())),
             Addresstype::P2SH => self
                 .p2shindex_to_p2shaddressbytes
                 .get(addresstypeindex)?
-                .cloned()
-                .map(Addressbytes::from),
+                // .map(|v| Addressbytes::from(v.clone())),
+                .map(|v| Addressbytes::from(v.into_inner())),
             Addresstype::P2WPKH => self
                 .p2wpkhindex_to_p2wpkhaddressbytes
                 .get(addresstypeindex)?
-                .cloned()
-                .map(Addressbytes::from),
+                // .map(|v| Addressbytes::from(v.clone())),
+                .map(|v| Addressbytes::from(v.into_inner())),
             Addresstype::P2WSH => self
                 .p2wshindex_to_p2wshaddressbytes
                 .get(addresstypeindex)?
-                .cloned()
-                .map(Addressbytes::from),
+                // .map(|v| Addressbytes::from(v.clone())),
+                .map(|v| Addressbytes::from(v.into_inner())),
             Addresstype::P2TR => self
                 .p2trindex_to_p2traddressbytes
                 .get(addresstypeindex)?
-                .cloned()
-                .map(Addressbytes::from),
+                // .map(|v| Addressbytes::from(v.clone())),
+                .map(|v| Addressbytes::from(v.into_inner())),
             _ => unreachable!(),
         })
     }
@@ -324,12 +324,6 @@ impl Vecs {
             .try_for_each(|vec| vec.flush(height))
     }
 
-    pub fn reset_cache(&mut self) {
-        self.as_mut_slice().par_iter_mut().for_each(|vec| {
-            vec.reset_cache();
-        })
-    }
-
     pub fn min_height(&self) -> color_eyre::Result<Option<Height>> {
         Ok(self
             .as_slice()
diff --git a/src/crates/bindex/src/structs/version.rs b/bindex/src/structs/version.rs
similarity index 100%
rename from src/crates/bindex/src/structs/version.rs
rename to bindex/src/structs/version.rs
diff --git a/src/crates/biter/CHANGELOG.md b/biter/CHANGELOG.md
similarity index 100%
rename from src/crates/biter/CHANGELOG.md
rename to biter/CHANGELOG.md
diff --git a/src/crates/biter/Cargo.lock b/biter/Cargo.lock
similarity index 100%
rename from src/crates/biter/Cargo.lock
rename to biter/Cargo.lock
diff --git a/src/crates/biter/Cargo.toml b/biter/Cargo.toml
similarity index 100%
rename from src/crates/biter/Cargo.toml
rename to biter/Cargo.toml
diff --git a/src/crates/biter/LICENSE.md b/biter/LICENSE.md
similarity index 100%
rename from src/crates/biter/LICENSE.md
rename to biter/LICENSE.md
diff --git a/src/crates/biter/README.md b/biter/README.md
similarity index 100%
rename from src/crates/biter/README.md
rename to biter/README.md
diff --git a/src/crates/biter/src/blk_index_to_blk_path.rs b/biter/src/blk_index_to_blk_path.rs
similarity index 100%
rename from src/crates/biter/src/blk_index_to_blk_path.rs
rename to biter/src/blk_index_to_blk_path.rs
diff --git a/src/crates/biter/src/blk_index_to_blk_recap.rs b/biter/src/blk_index_to_blk_recap.rs
similarity index 100%
rename from src/crates/biter/src/blk_index_to_blk_recap.rs
rename to biter/src/blk_index_to_blk_recap.rs
diff --git a/src/crates/biter/src/blk_metadata.rs b/biter/src/blk_metadata.rs
similarity index 100%
rename from src/crates/biter/src/blk_metadata.rs
rename to biter/src/blk_metadata.rs
diff --git a/src/crates/biter/src/blk_metadata_and_block.rs b/biter/src/blk_metadata_and_block.rs
similarity index 100%
rename from src/crates/biter/src/blk_metadata_and_block.rs
rename to biter/src/blk_metadata_and_block.rs
diff --git a/src/crates/biter/src/blk_recap.rs b/biter/src/blk_recap.rs
similarity index 100%
rename from src/crates/biter/src/blk_recap.rs
rename to biter/src/blk_recap.rs
diff --git a/src/crates/biter/src/lib.rs b/biter/src/lib.rs
similarity index 95%
rename from src/crates/biter/src/lib.rs
rename to biter/src/lib.rs
index d71d93027..c554537cc 100644
--- a/src/crates/biter/src/lib.rs
+++ b/biter/src/lib.rs
@@ -58,26 +58,24 @@ enum BlockState {
 ///
 /// use bitcoincore_rpc::{Auth, Client};
 ///
-/// fn main() {
-///     let i = std::time::Instant::now();
+/// let i = std::time::Instant::now();
 ///
-///     let data_dir = Path::new("../../bitcoin");
-///     let url = "http://localhost:8332";
-///     let cookie = Path::new(data_dir).join(".cookie");
-///     let auth = Auth::CookieFile(cookie);
-///     let rpc = Client::new(url, auth).unwrap();
+/// let data_dir = Path::new("../../bitcoin");
+/// let url = "http://localhost:8332";
+/// let cookie = Path::new(data_dir).join(".cookie");
+/// let auth = Auth::CookieFile(cookie);
+/// let rpc = Client::new(url, auth).unwrap();
 ///
-///     let start = Some(850_000);
-///     let end = None;
+/// let start = Some(850_000);
+/// let end = None;
 ///
-///     biter::new(data_dir, start, end, rpc)
-///         .iter()
-///         .for_each(|(height, _block, hash)| {
-///             println!("{height}: {hash}");
-///         });
+/// biter::new(data_dir, start, end, rpc)
+///     .iter()
+///     .for_each(|(height, _block, hash)| {
+///         println!("{height}: {hash}");
+///     });
 ///
-///     dbg!(i.elapsed());
-/// }
+/// dbg!(i.elapsed());
 /// ```
 ///
 pub fn new(
@@ -285,7 +283,7 @@ pub fn new(
                     .unwrap();
             }
 
-            if end.map_or(false, |end| height == end) {
+            if end == Some(height) {
                 return ControlFlow::Break(());
             }
 
diff --git a/src/crates/biter/src/main.rs b/biter/src/main.rs
similarity index 100%
rename from src/crates/biter/src/main.rs
rename to biter/src/main.rs
diff --git a/src/crates/biter/src/utils.rs b/biter/src/utils.rs
similarity index 100%
rename from src/crates/biter/src/utils.rs
rename to biter/src/utils.rs
diff --git a/src/crates/iterable/Cargo.lock b/iterable/Cargo.lock
similarity index 100%
rename from src/crates/iterable/Cargo.lock
rename to iterable/Cargo.lock
diff --git a/src/crates/iterable/Cargo.toml b/iterable/Cargo.toml
similarity index 100%
rename from src/crates/iterable/Cargo.toml
rename to iterable/Cargo.toml
diff --git a/src/crates/iterable/README.md b/iterable/README.md
similarity index 100%
rename from src/crates/iterable/README.md
rename to iterable/README.md
diff --git a/src/crates/iterable/src/lib.rs b/iterable/src/lib.rs
similarity index 100%
rename from src/crates/iterable/src/lib.rs
rename to iterable/src/lib.rs
diff --git a/src/crates/iterable/struct_iterable_derive/Cargo.toml b/iterable/struct_iterable_derive/Cargo.toml
similarity index 100%
rename from src/crates/iterable/struct_iterable_derive/Cargo.toml
rename to iterable/struct_iterable_derive/Cargo.toml
diff --git a/src/crates/iterable/struct_iterable_derive/README.md b/iterable/struct_iterable_derive/README.md
similarity index 100%
rename from src/crates/iterable/struct_iterable_derive/README.md
rename to iterable/struct_iterable_derive/README.md
diff --git a/src/crates/iterable/struct_iterable_derive/src/lib.rs b/iterable/struct_iterable_derive/src/lib.rs
similarity index 100%
rename from src/crates/iterable/struct_iterable_derive/src/lib.rs
rename to iterable/struct_iterable_derive/src/lib.rs
diff --git a/src/crates/iterable/struct_iterable_internal/Cargo.toml b/iterable/struct_iterable_internal/Cargo.toml
similarity index 100%
rename from src/crates/iterable/struct_iterable_internal/Cargo.toml
rename to iterable/struct_iterable_internal/Cargo.toml
diff --git a/src/crates/iterable/struct_iterable_internal/README.md b/iterable/struct_iterable_internal/README.md
similarity index 100%
rename from src/crates/iterable/struct_iterable_internal/README.md
rename to iterable/struct_iterable_internal/README.md
diff --git a/src/crates/iterable/struct_iterable_internal/src/lib.rs b/iterable/struct_iterable_internal/src/lib.rs
similarity index 100%
rename from src/crates/iterable/struct_iterable_internal/src/lib.rs
rename to iterable/struct_iterable_internal/src/lib.rs
diff --git a/src/crates/snkrj/Cargo.lock b/snkrj/Cargo.lock
similarity index 100%
rename from src/crates/snkrj/Cargo.lock
rename to snkrj/Cargo.lock
diff --git a/src/crates/snkrj/Cargo.toml b/snkrj/Cargo.toml
similarity index 100%
rename from src/crates/snkrj/Cargo.toml
rename to snkrj/Cargo.toml
diff --git a/src/crates/snkrj/LICENSE.md b/snkrj/LICENSE.md
similarity index 100%
rename from src/crates/snkrj/LICENSE.md
rename to snkrj/LICENSE.md
diff --git a/src/crates/snkrj/README.md b/snkrj/README.md
similarity index 100%
rename from src/crates/snkrj/README.md
rename to snkrj/README.md
diff --git a/src/crates/snkrj/src/lib.rs b/snkrj/src/lib.rs
similarity index 100%
rename from src/crates/snkrj/src/lib.rs
rename to snkrj/src/lib.rs
diff --git a/src/crates/snkrj/src/main.rs b/snkrj/src/main.rs
similarity index 100%
rename from src/crates/snkrj/src/main.rs
rename to snkrj/src/main.rs
diff --git a/src/crates/storable_vec/.gitignore b/storable_vec/.gitignore
similarity index 100%
rename from src/crates/storable_vec/.gitignore
rename to storable_vec/.gitignore
diff --git a/src/crates/storable_vec/Cargo.lock b/storable_vec/Cargo.lock
similarity index 100%
rename from src/crates/storable_vec/Cargo.lock
rename to storable_vec/Cargo.lock
diff --git a/src/crates/storable_vec/Cargo.toml b/storable_vec/Cargo.toml
similarity index 100%
rename from src/crates/storable_vec/Cargo.toml
rename to storable_vec/Cargo.toml
diff --git a/src/crates/storable_vec/LICENSE.md b/storable_vec/LICENSE.md
similarity index 100%
rename from src/crates/storable_vec/LICENSE.md
rename to storable_vec/LICENSE.md
diff --git a/src/crates/storable_vec/README.md b/storable_vec/README.md
similarity index 100%
rename from src/crates/storable_vec/README.md
rename to storable_vec/README.md
diff --git a/src/crates/storable_vec/src/lib.rs b/storable_vec/src/lib.rs
similarity index 65%
rename from src/crates/storable_vec/src/lib.rs
rename to storable_vec/src/lib.rs
index 0319afe26..3037b9080 100644
--- a/src/crates/storable_vec/src/lib.rs
+++ b/storable_vec/src/lib.rs
@@ -2,11 +2,11 @@ use std::{
     cmp::Ordering,
     fmt::{self, Debug},
     fs::{File, OpenOptions},
-    io::{self, Write},
+    io::{self, Read, Seek, SeekFrom, Write},
     marker::PhantomData,
     mem,
-    ops::Range,
-    path::Path,
+    ops::{Deref, Range},
+    path::{Path, PathBuf},
     sync::OnceLock,
 };
 
@@ -25,6 +25,8 @@ use memmap2::{Mmap, MmapOptions};
 ///
 #[derive(Debug)]
 pub struct StorableVec<I, T> {
+    pathbuf: PathBuf,
+    // file_for_reads: File,
     file: File,
     cache: Vec<OnceLock<Box<Mmap>>>, // Boxed to reduce the size of the lock (24 > 16)
     disk_len: usize,
@@ -36,28 +38,69 @@ pub struct StorableVec<I, T> {
 }
 
 /// In bytes
-const MAX_PAGE_SIZE: usize = 4096;
-const ONE_MB: usize = 1024 * 1024;
-const MAX_CACHE_SIZE: usize = 50 * ONE_MB;
+const MAX_PAGE_SIZE: usize = 4 * 4096;
+const ONE_MB: usize = 1000 * 1024;
+const MAX_CACHE_SIZE: usize = 100 * ONE_MB;
+
+#[derive(Debug, Clone)]
+pub enum Value<'a, T> {
+    Ref(&'a T),
+    Owned(T),
+}
+
+impl<T> Value<'_, T>
+where
+    T: Sized + Debug + Clone,
+{
+    pub fn into_inner(self) -> T {
+        match self {
+            Self::Ref(t) => t.to_owned(),
+            Self::Owned(t) => t,
+        }
+    }
+}
+
+impl<T> Deref for Value<'_, T> {
+    type Target = T;
+    fn deref(&self) -> &Self::Target {
+        match self {
+            Self::Ref(t) => t,
+            Self::Owned(t) => t,
+        }
+    }
+}
+
+impl<T> AsRef<T> for Value<'_, T>
+where
+    T: Sized + Debug + Clone,
+{
+    fn as_ref(&self) -> &T {
+        match self {
+            Self::Ref(t) => t,
+            Self::Owned(t) => t,
+        }
+    }
+}
 
 impl<I, T> StorableVec<I, T>
 where
     I: Into<usize>,
-    T: Sized + Debug,
+    T: Sized + Debug + Clone,
 {
-    pub const SIZE: usize = size_of::<T>();
-
-    pub const PER_PAGE: usize = MAX_PAGE_SIZE / Self::SIZE;
+    pub const SIZE_OF_T: usize = size_of::<T>();
+    pub const PER_PAGE: usize = MAX_PAGE_SIZE / Self::SIZE_OF_T;
     /// In bytes
-    pub const PAGE_SIZE: usize = Self::PER_PAGE * Self::SIZE;
+    pub const PAGE_SIZE: usize = Self::PER_PAGE * Self::SIZE_OF_T;
     pub const CACHE_LENGTH: usize = MAX_CACHE_SIZE / Self::PAGE_SIZE;
 
     pub fn import(path: &Path) -> Result<Self, io::Error> {
         let file = Self::open_file(path)?;
 
         let mut this = Self {
+            pathbuf: path.to_owned(),
             disk_len: Self::byte_index_to_index(file.metadata()?.len() as usize),
             file,
+            // file_for_reads: Self::open_file(path)?,
             cache: vec![],
             pushed: vec![],
             // updated: BTreeMap::new(),
@@ -66,15 +109,21 @@ where
             phantom: PhantomData,
         };
 
+        this.cache.resize_with(Self::CACHE_LENGTH, Default::default);
+        this.cache.shrink_to_fit();
+
         this.reset_cache();
 
         Ok(this)
     }
 
-    pub fn reset_cache(&mut self) {
-        let len = (self.disk_len as f64 / Self::PER_PAGE as f64).ceil() as usize;
-        self.cache.clear();
-        self.cache.resize_with(len, Default::default);
+    fn reset_cache(&mut self) {
+        // let len = (self.disk_len as f64 / Self::PER_PAGE as f64).ceil() as usize;
+        // self.cache.clear();
+        // self.cache.resize_with(len, Default::default);
+        self.cache.iter_mut().for_each(|lock| {
+            lock.take();
+        });
     }
 
     fn open_file(path: &Path) -> Result<File, io::Error> {
@@ -87,24 +136,19 @@ where
     }
 
     #[inline]
-    fn index_to_mmap_index(index: usize) -> usize {
-        Self::index_to_byte_index(index) / Self::PAGE_SIZE
-    }
-
-    #[inline]
-    fn index_to_range(index: usize) -> Range<usize> {
+    fn index_to_byte_range(index: usize) -> Range<usize> {
         let index = Self::index_to_byte_index(index) % Self::PAGE_SIZE;
-        index..(index + Self::SIZE)
+        index..(index + Self::SIZE_OF_T)
     }
 
     #[inline]
     fn index_to_byte_index(index: usize) -> usize {
-        index * Self::SIZE
+        index * Self::SIZE_OF_T
     }
 
     #[inline]
     fn byte_index_to_index(byte_index: usize) -> usize {
-        byte_index / Self::SIZE
+        byte_index / Self::SIZE_OF_T
     }
 
     fn index_to_pushed_index(&self, index: usize) -> Result<Option<usize>> {
@@ -122,14 +166,14 @@ where
 
     #[allow(unused)]
     #[inline]
-    pub fn get(&self, index: I) -> Result<Option<&T>> {
+    pub fn get(&self, index: I) -> Result<Option<Value<'_, T>>> {
         self.get_(index.into())
     }
-    pub fn get_(&self, index: usize) -> Result<Option<&T>> {
+    pub fn get_(&self, index: usize) -> Result<Option<Value<'_, T>>> {
         match self.index_to_pushed_index(index) {
             Ok(index) => {
                 if let Some(index) = index {
-                    return Ok(self.pushed.get(index));
+                    return Ok(self.pushed.get(index).map(|v| Value::Ref(v)));
                 }
             }
             Err(Error::IndexTooHigh) => return Ok(None),
@@ -142,35 +186,56 @@ where
         //     }
         // }
 
-        let mmap_index = Self::index_to_mmap_index(index);
+        let byte_index = Self::index_to_byte_index(index);
+        let page_index = index / Self::PER_PAGE;
+        let last_index = self.disk_len - 1;
+        let max_page_index = last_index / Self::PER_PAGE;
+        let min_page_index = (max_page_index + 1)
+            .checked_sub(Self::CACHE_LENGTH)
+            .unwrap_or_default();
 
-        let mmap = &**self
-            .cache
-            .get(mmap_index)
-            .ok_or(Error::MmapsVecIsTooSmall)?
-            .get_or_init(|| {
-                Box::new(unsafe {
-                    MmapOptions::new()
-                        .len(MAX_PAGE_SIZE)
-                        .offset((mmap_index * Self::PAGE_SIZE) as u64)
-                        .map(&self.file)
-                        .unwrap()
-                })
-            });
+        if page_index >= min_page_index {
+            let mmap = &**self
+                .cache
+                .get(page_index - min_page_index)
+                .ok_or(Error::MmapsVecIsTooSmall)?
+                .get_or_init(|| {
+                    Box::new(unsafe {
+                        MmapOptions::new()
+                            .len(Self::PAGE_SIZE)
+                            .offset((page_index * Self::PAGE_SIZE) as u64)
+                            .map(&self.file)
+                            .unwrap()
+                    })
+                });
 
-        let range = Self::index_to_range(index);
-        let src = &mmap[range];
+            let range = Self::index_to_byte_range(index);
 
-        Ok(Some(T::unsafe_try_from_slice(src)?))
+            let slice = &mmap[range];
+
+            Ok(Some(Value::Ref(T::unsafe_try_from_slice(slice)?)))
+        } else {
+            // let mut file = &self.file_for_reads;
+            let mut file = Self::open_file(&self.pathbuf).unwrap();
+
+            file.seek(SeekFrom::Start(byte_index as u64)).unwrap();
+
+            let mut buf = vec![0; Self::SIZE_OF_T];
+            file.read_exact(&mut buf).unwrap();
+
+            let value = T::unsafe_try_from_slice(&buf[..])?;
+
+            Ok(Some(Value::Owned(value.to_owned())))
+        }
     }
 
     #[allow(unused)]
-    pub fn first(&self) -> Result<Option<&T>> {
+    pub fn first(&self) -> Result<Option<Value<'_, T>>> {
         self.get_(0)
     }
 
     #[allow(unused)]
-    pub fn last(&self) -> Result<Option<&T>> {
+    pub fn last(&self) -> Result<Option<Value<'_, T>>> {
         let len = self.len();
         if len == 0 {
             return Ok(None);
@@ -261,6 +326,7 @@ where
 
     pub fn flush(&mut self) -> io::Result<()> {
         self.disk_len += self.pushed.len();
+
         self.reset_cache();
 
         let mut bytes: Vec<u8> = vec![];
@@ -269,21 +335,28 @@ where
             .into_iter()
             .for_each(|v| bytes.extend_from_slice(v.unsafe_as_slice()));
 
-        self.file.write_all(&bytes)
+        // self.file.seek(SeekFrom::End(0))?;
+        self.file.write_all(&bytes)?;
+        // self.file_for_mmaps.write_all(&bytes)?;
+
+        // self.file_for_mmaps.sync_all()?;
+        // self.file_for_reads.sync_all()?;
+        // self.file_for_reads = Self::open_file(&self.pathbuf)?;
+
+        Ok(())
     }
 }
 
 pub trait AnyStorableVec {
     fn len(&self) -> usize;
     fn is_empty(&self) -> bool;
-    fn reset_cache(&mut self);
     fn flush(&mut self) -> io::Result<()>;
 }
 
 impl<I, T> AnyStorableVec for StorableVec<I, T>
 where
     I: Into<usize>,
-    T: Sized + Debug,
+    T: Sized + Debug + Clone,
 {
     fn len(&self) -> usize {
         self.len()
@@ -293,10 +366,6 @@ where
         self.is_empty()
     }
 
-    fn reset_cache(&mut self) {
-        self.reset_cache();
-    }
-
     fn flush(&mut self) -> io::Result<()> {
         self.flush()
     }
diff --git a/src/crates/storable_vec/src/main.rs b/storable_vec/src/main.rs
similarity index 100%
rename from src/crates/storable_vec/src/main.rs
rename to storable_vec/src/main.rs

From b94d94e116ab3a1a0be479fae1db1c0aee532491 Mon Sep 17 00:00:00 2001
From: nym21 <expat-epochs0i@icloud.com>
Date: Sat, 25 Jan 2025 22:46:11 +0100
Subject: [PATCH 27/63] bindex: snapshot

---
 CHANGELOG.md                                  |   2 +-
 Cargo.lock                                    |  36 +-
 Cargo.toml                                    |   2 +-
 bindex/.gitignore                             |   1 +
 bindex/Cargo.toml                             |   4 +-
 bindex/src/indexer.rs                         | 672 ++++++++++++++++++
 bindex/src/main.rs                            | 585 +--------------
 bindex/src/storage/mod.rs                     |   5 +
 bindex/src/storage/stores/meta.rs             |  81 +++
 .../stores.rs => storage/stores/mod.rs}       |  71 +-
 bindex/src/storage/stores/multi.rs            | 101 +++
 bindex/src/storage/stores/unique.rs           | 102 +++
 .../{structs/vec.rs => storage/vecs/base.rs}  |  41 +-
 .../{structs/vecs.rs => storage/vecs/mod.rs}  | 185 +++--
 bindex/src/structs/addresstypeindex.rs        |   6 +
 bindex/src/structs/height.rs                  |   8 +-
 bindex/src/structs/mod.rs                     |  18 +-
 bindex/src/structs/store.rs                   | 153 ----
 bindex/src/structs/txoutindex.rs              |   9 +
 bindex/src/structs/vout.rs                    |  30 +
 biter/src/lib.rs                              |   2 +-
 bomputer/Cargo.toml                           |   6 +
 bomputer/src/lib.rs                           |  18 +
 {bindex => bomputer}/src/structs/date.rs      |   7 +
 bomputer/src/structs/feerate.rs               |   4 +
 bomputer/src/structs/mod.rs                   |   5 +
 exit/Cargo.toml                               |   7 +
 bindex/src/structs/exit.rs => exit/src/lib.rs |   0
 snkrj/src/base.rs                             | 174 +++++
 snkrj/src/lib.rs                              | 348 +--------
 snkrj/src/main.rs                             |  14 +-
 snkrj/src/multi.rs                            | 240 +++++++
 snkrj/src/traits.rs                           |  59 ++
 snkrj/src/unique.rs                           | 223 ++++++
 storable_vec/src/lib.rs                       | 124 ++--
 35 files changed, 2053 insertions(+), 1290 deletions(-)
 create mode 100644 bindex/src/indexer.rs
 create mode 100644 bindex/src/storage/mod.rs
 create mode 100644 bindex/src/storage/stores/meta.rs
 rename bindex/src/{structs/stores.rs => storage/stores/mod.rs} (67%)
 create mode 100644 bindex/src/storage/stores/multi.rs
 create mode 100644 bindex/src/storage/stores/unique.rs
 rename bindex/src/{structs/vec.rs => storage/vecs/base.rs} (69%)
 rename bindex/src/{structs/vecs.rs => storage/vecs/mod.rs} (70%)
 delete mode 100644 bindex/src/structs/store.rs
 create mode 100644 bindex/src/structs/vout.rs
 create mode 100644 bomputer/Cargo.toml
 create mode 100644 bomputer/src/lib.rs
 rename {bindex => bomputer}/src/structs/date.rs (70%)
 create mode 100644 bomputer/src/structs/feerate.rs
 create mode 100644 bomputer/src/structs/mod.rs
 create mode 100644 exit/Cargo.toml
 rename bindex/src/structs/exit.rs => exit/src/lib.rs (100%)
 create mode 100644 snkrj/src/base.rs
 create mode 100644 snkrj/src/multi.rs
 create mode 100644 snkrj/src/traits.rs
 create mode 100644 snkrj/src/unique.rs

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c5456c4da..ae5122317 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,7 +25,7 @@
 - Created separate crate for indexing called `bindex`
 - Created a crate a storage engine specialized in storing datasets that have indexes as keys and thus can be represented by an array/vec called `storable-vec`
 - Removed the need for the `-txindex=1` parameter when starting your Bitcoin Core node as kibō has its own indexes now
-- Tried different storage engines such as `fjall`, `canopydb` and `heed`, the first ended up being 3 times slower than `sanakirja` and the rest wouldn't play nice with `rayon` which is a dealbreaker
+- Tried different storage engines such as `fjall`, `canopydb` and `heed`, the first ended up being 3 times slower than `sanakirja` and had very fragile files (just looking at them would corrupt them), and the rest wouldn't play nice with `rayon` which is a dealbreaker
 - `snkrj` added a robust auto defragmentation to improve disk usage without the need for user's intervention
 
 ## Git
diff --git a/Cargo.lock b/Cargo.lock
index b4de7143a..534b8a9e7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -71,10 +71,10 @@ name = "bindex"
 version = "0.1.0"
 dependencies = [
  "bitcoin_hashes 0.16.0",
- "biter 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "biter",
  "color-eyre",
- "ctrlc",
  "derive_deref",
+ "exit",
  "jiff",
  "rayon",
  "snkrj",
@@ -197,21 +197,6 @@ dependencies = [
  "serde_json",
 ]
 
-[[package]]
-name = "biter"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02527a2b7944d9edc90db0a73339c57cd521f9623f99416574d1943312c9d290"
-dependencies = [
- "bitcoin",
- "bitcoincore-rpc",
- "crossbeam",
- "derived-deref",
- "rayon",
- "serde",
- "serde_json",
-]
-
 [[package]]
 name = "bitflags"
 version = "1.3.2"
@@ -220,9 +205,13 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.7.0"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1be3f42a67d6d345ecd59f675f3f012d6974981560836e938c22b424b85ce1be"
+checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36"
+
+[[package]]
+name = "bomputer"
+version = "0.1.0"
 
 [[package]]
 name = "byteorder"
@@ -372,6 +361,13 @@ version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
 
+[[package]]
+name = "exit"
+version = "0.1.0"
+dependencies = [
+ "ctrlc",
+]
+
 [[package]]
 name = "eyre"
 version = "0.6.12"
@@ -564,7 +560,7 @@ version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
 dependencies = [
- "bitflags 2.7.0",
+ "bitflags 2.8.0",
  "cfg-if",
  "cfg_aliases",
  "libc",
diff --git a/Cargo.toml b/Cargo.toml
index 1a3669c99..95fb25da8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -4,7 +4,7 @@
 # edition = "2021"
 
 [workspace]
-members = ["bindex", "biter", "iterable", "snkrj", "storable_vec"]
+members = ["bindex", "biter", "bomputer", "exit", "iterable", "snkrj", "storable_vec"]
 resolver = "2"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
diff --git a/bindex/.gitignore b/bindex/.gitignore
index e2647cd44..752861df6 100644
--- a/bindex/.gitignore
+++ b/bindex/.gitignore
@@ -1 +1,2 @@
 /database
+/indexes
diff --git a/bindex/Cargo.toml b/bindex/Cargo.toml
index 4b86ae73d..549182e38 100644
--- a/bindex/Cargo.toml
+++ b/bindex/Cargo.toml
@@ -5,10 +5,10 @@ edition = "2021"
 
 [dependencies]
 bitcoin_hashes = "0.16.0"
-biter = "0.2.2"
+biter = { path = "../biter" }
 color-eyre = "0.6.3"
-ctrlc = "3.4.5"
 derive_deref = "1.1.1"
+exit = { path = "../exit" }
 jiff = "0.1.24"
 rayon = "1.10.0"
 snkrj = { path = "../snkrj" }
diff --git a/bindex/src/indexer.rs b/bindex/src/indexer.rs
new file mode 100644
index 000000000..38b8591fe
--- /dev/null
+++ b/bindex/src/indexer.rs
@@ -0,0 +1,672 @@
+use std::{
+    collections::BTreeMap,
+    io::{Read, Write},
+    path::Path,
+    str::FromStr,
+    thread::{self},
+};
+
+use biter::{
+    bitcoin::{Transaction, TxIn, TxOut, Txid},
+    rpc,
+};
+use exit::Exit;
+
+use crate::storage::{Stores, Vecs};
+use crate::structs::{
+    Addressbytes, AddressbytesPrefix, Addressindex, Addresstype, Amount, BlockHashPrefix, Height, Timestamp,
+    TxidPrefix, Txindex, Txoutindex, Vout,
+};
+use color_eyre::eyre::{eyre, ContextCompat};
+use rayon::prelude::*;
+
+#[derive(Debug)]
+enum TxInOrAddressindextoutindex<'a> {
+    TxIn(&'a TxIn),
+    AddressTxTxoutIndexes((Addressindex, Txindex, Txoutindex)),
+}
+
+const UNSAFE_BLOCKS: u32 = 100;
+const DAILY_BLOCK_TARGET: usize = 144;
+const SNAPSHOT_BLOCK_RANGE: usize = DAILY_BLOCK_TARGET * 10;
+
+#[derive(Debug, Default)]
+pub struct Indexer {
+    //
+}
+
+impl Indexer {
+    pub fn index(indexes_dir: &Path, bitcoin_dir: &Path, rpc: rpc::Client, exit: Exit) -> color_eyre::Result<()> {
+        let check_collisions = true;
+
+        let mut vecs = Vecs::import(&indexes_dir.join("vecs"))?;
+
+        let open_stores = || Stores::open(&indexes_dir.join("stores"));
+        let stores = open_stores()?;
+
+        let mut height = vecs
+            .min_height()
+            .unwrap_or_default()
+            .min(stores.min_height())
+            .and_then(|h| h.checked_sub(UNSAFE_BLOCKS))
+            .map(Height::from)
+            .unwrap_or_default();
+        // let mut height = Height::default();
+
+        let mut txindex_global = vecs.height_to_first_txindex.get_or_default(height)?;
+        let mut txoutindex_global = vecs.height_to_first_txoutindex.get_or_default(height)?;
+        let mut addressindex_global = vecs.height_to_first_addressindex.get_or_default(height)?;
+        let mut emptyindex_global = vecs.height_to_first_emptyindex.get_or_default(height)?;
+        let mut multisigindex_global = vecs.height_to_first_emptyindex.get_or_default(height)?;
+        let mut opreturnindex_global = vecs.height_to_first_emptyindex.get_or_default(height)?;
+        let mut pushonlyindex_global = vecs.height_to_first_emptyindex.get_or_default(height)?;
+        let mut unknownindex_global = vecs.height_to_first_emptyindex.get_or_default(height)?;
+        let mut p2pk33index_global = vecs.height_to_p2pk33index.get_or_default(height)?;
+        let mut p2pk65index_global = vecs.height_to_p2pk65index.get_or_default(height)?;
+        let mut p2pkhindex_global = vecs.height_to_p2pkhindex.get_or_default(height)?;
+        let mut p2shindex_global = vecs.height_to_p2shindex.get_or_default(height)?;
+        let mut p2trindex_global = vecs.height_to_p2trindex.get_or_default(height)?;
+        let mut p2wpkhindex_global = vecs.height_to_p2wpkhindex.get_or_default(height)?;
+        let mut p2wshindex_global = vecs.height_to_p2wshindex.get_or_default(height)?;
+
+        let export = |stores: Stores, vecs: &mut Vecs, height: Height| -> color_eyre::Result<()> {
+            println!("Exporting...");
+
+            exit.block();
+            // At 401760
+            // Memory: 1.87 GB
+            // Real Memory: 13.46 GB
+            // if height >= Height::from(400_000_u32) {
+            //     pause();
+            // }
+            println!("Flushing vecs...");
+
+            thread::scope(|scope| -> color_eyre::Result<()> {
+                let vecs_handle = scope.spawn(|| vecs.flush(height));
+                let stores_handle = scope.spawn(|| stores.export(height));
+                vecs_handle.join().unwrap()?;
+                stores_handle.join().unwrap()?;
+                Ok(())
+            })?;
+
+            // At 401760
+            // Memory: 1.83 GB
+            // Real Memory: 9.45 GB
+            // if height >= Height::from(400_000_u32) {
+            //     pause();
+            // }
+
+            // At: 401760
+            // Memory: 1.34 GB
+            // Real Memory: 1.52 GB
+            println!("All done...");
+            // if height >= Height::from(400_000_u32) {
+            //     pause();
+            // }
+            exit.unblock();
+            Ok(())
+        };
+
+        let mut stores_opt = Some(stores);
+
+        biter::new(bitcoin_dir, Some(height.into()), None, rpc)
+            .iter()
+            .try_for_each(|(_height, block, blockhash)| -> color_eyre::Result<()> {
+                println!("Processing block {_height}...");
+
+                height = Height::from(_height);
+                let timestamp = Timestamp::try_from(block.header.time)?;
+
+                let mut stores = stores_opt.take().context("option should have wtx")?;
+
+                if let Some(saved_blockhash) = vecs.height_to_blockhash.get(height)? {
+                    if &blockhash != saved_blockhash.as_ref() {
+                        todo!("Rollback not implemented");
+                        // parts.rollback_from(&mut wtx, height, &exit)?;
+                    }
+                }
+
+                let blockhash_prefix = BlockHashPrefix::try_from(&blockhash)?;
+
+                if stores
+                    .blockhash_prefix_to_height
+                    .get(&blockhash_prefix)?
+                    .is_some_and(|prev_height| *prev_height != height)
+                {
+                    dbg!(blockhash);
+                    return Err(eyre!("Collision, expect prefix to need be set yet"));
+                }
+
+                stores
+                    .blockhash_prefix_to_height
+                    .insert_if_needed(blockhash_prefix, height, height);
+
+                vecs.height_to_blockhash.push_if_needed(height, blockhash)?;
+                vecs.height_to_timestamp.push_if_needed(height, timestamp)?;
+                vecs.height_to_size.push_if_needed(height, block.total_size())?;
+                vecs.height_to_weight.push_if_needed(height, block.weight())?;
+                vecs.height_to_first_txindex.push_if_needed(height, txindex_global)?;
+                vecs.height_to_first_txoutindex
+                    .push_if_needed(height, txoutindex_global)?;
+                vecs.height_to_first_addressindex
+                    .push_if_needed(height, addressindex_global)?;
+                vecs.height_to_first_emptyindex
+                    .push_if_needed(height, emptyindex_global)?;
+                vecs.height_to_first_multisigindex
+                    .push_if_needed(height, multisigindex_global)?;
+                vecs.height_to_first_opreturnindex
+                    .push_if_needed(height, opreturnindex_global)?;
+                vecs.height_to_first_pushonlyindex
+                    .push_if_needed(height, pushonlyindex_global)?;
+                vecs.height_to_first_unknownindex
+                    .push_if_needed(height, unknownindex_global)?;
+                vecs.height_to_p2pk33index.push_if_needed(height, p2pk33index_global)?;
+                vecs.height_to_p2pk65index.push_if_needed(height, p2pk65index_global)?;
+                vecs.height_to_p2pkhindex.push_if_needed(height, p2pkhindex_global)?;
+                vecs.height_to_p2shindex.push_if_needed(height, p2shindex_global)?;
+                vecs.height_to_p2trindex.push_if_needed(height, p2trindex_global)?;
+                vecs.height_to_p2wpkhindex.push_if_needed(height, p2wpkhindex_global)?;
+                vecs.height_to_p2wshindex.push_if_needed(height, p2wshindex_global)?;
+
+                let outputs = block
+                    .txdata
+                    .iter()
+                    .enumerate()
+                    .flat_map(|(index, tx)| {
+                        tx.output
+                            .iter()
+                            .enumerate()
+                            .map(move |(vout, txout)| (Txindex::from(index), Vout::from(vout), txout, tx))
+                    })
+                    .collect::<Vec<_>>();
+
+                let tx_len = block.txdata.len();
+                let outputs_len = outputs.len();
+
+                let (
+                    txid_prefix_to_txid_and_block_txindex_and_prev_txindex_join_handle,
+                    txin_or_addressindextxoutindex_vec_handle,
+                    txoutindex_to_txout_addresstype_addressbytes_res_addressindex_opt_handle,
+                ) = thread::scope(|scope| {
+                    let txid_prefix_to_txid_and_block_txindex_and_prev_txindex_handle =
+                        scope.spawn(|| -> color_eyre::Result<_> {
+                            block
+                                .txdata
+                                .par_iter()
+                                .enumerate()
+                                .map(|(index, tx)| -> color_eyre::Result<_> {
+                                    let txid = tx.compute_txid();
+
+                                    let txid_prefix = TxidPrefix::try_from(&txid)?;
+
+                                    let prev_txindex_slice_opt =
+                                        if check_collisions && stores.txid_prefix_to_txindex.needs(height) {
+                                            // Should only find collisions for two txids (duplicates), see below
+                                            stores.txid_prefix_to_txindex.get(&txid_prefix)?.cloned()
+                                        } else {
+                                            None
+                                        };
+
+                                    Ok((txid_prefix, (tx, txid, Txindex::from(index), prev_txindex_slice_opt)))
+                                })
+                                .try_fold(BTreeMap::new, |mut map, tuple| {
+                                    let (key, value) = tuple?;
+                                    map.insert(key, value);
+                                    Ok(map)
+                                })
+                                .try_reduce(BTreeMap::new, |mut map, mut map2| {
+                                    if map.len() > map2.len() {
+                                        map.append(&mut map2);
+                                        Ok(map)
+                                    } else {
+                                        map2.append(&mut map);
+                                        Ok(map2)
+                                    }
+                                })
+                        });
+
+                    let txin_or_addressindextxoutindex_vec_handle =
+                        scope.spawn(|| -> color_eyre::Result<Vec<TxInOrAddressindextoutindex>> {
+                            block
+                                .txdata
+                                .par_iter()
+                                .filter(|tx| !tx.is_coinbase())
+                                .flat_map(|tx| &tx.input)
+                                .map(|txin| -> color_eyre::Result<_> {
+                                    let outpoint = txin.previous_output;
+                                    let txid = outpoint.txid;
+                                    let vout = Vout::from(outpoint.vout);
+
+                                    let txindex = if let Some(txindex) = stores
+                                        .txid_prefix_to_txindex
+                                        .get(&TxidPrefix::try_from(&txid)?)?
+                                        .and_then(|txindex| {
+                                            // Checking if not finding txindex from the future
+                                            (txindex < &txindex_global).then_some(txindex)
+                                        }) {
+                                        *txindex
+                                    } else {
+                                        return Ok(TxInOrAddressindextoutindex::TxIn(txin));
+                                    };
+
+                                    let txoutindex = *vecs
+                                        .txindex_to_first_txoutindex
+                                        .get(txindex)?
+                                        .context("Expect txoutindex to not be none")
+                                        .inspect_err(|_| {
+                                            dbg!(outpoint.txid, txindex, vout);
+                                        })?
+                                        + vout;
+
+                                    let addressindex = *vecs
+                                        .txoutindex_to_addressindex
+                                        .get(txoutindex)?
+                                        .context("Expect addressindex to not be none")
+                                        .inspect_err(|_| {
+                                            // let height = vecdisks.txindex_to_height.get(txindex.into()).expect("txindex_to_height get not fail")
+                                            // .expect("Expect height for txindex");
+                                            dbg!(outpoint.txid, txindex, vout, txoutindex);
+                                        })?;
+
+                                    Ok(TxInOrAddressindextoutindex::AddressTxTxoutIndexes((
+                                        addressindex,
+                                        txindex,
+                                        txoutindex,
+                                    )))
+                                })
+                                .try_fold(Vec::new, |mut vec, res| {
+                                    vec.push(res?);
+                                    Ok(vec)
+                                })
+                                .try_reduce(Vec::new, |mut v, mut v2| {
+                                    if v.len() > v2.len() {
+                                        v.append(&mut v2);
+                                        Ok(v)
+                                    } else {
+                                        v2.append(&mut v);
+                                        Ok(v2)
+                                    }
+                                })
+                        });
+
+                    let txoutindex_to_txout_addresstype_addressbytes_res_addressindex_opt_handle = scope.spawn(|| {
+                        outputs
+                            .into_par_iter()
+                            .enumerate()
+                            .map(
+                                #[allow(clippy::type_complexity)]
+                                |(block_txoutindex, (block_txindex, vout, txout, tx))| -> color_eyre::Result<(
+                                    Txoutindex,
+                                    (
+                                        &TxOut,
+                                        Txindex,
+                                        Vout,
+                                        Addresstype,
+                                        color_eyre::Result<Addressbytes>,
+                                        Option<Addressindex>,
+                                        &Transaction,
+                                    ),
+                                )> {
+                                    let txindex = txindex_global + block_txindex;
+                                    let txoutindex = txoutindex_global + Txoutindex::from(block_txoutindex);
+
+                                    let script = &txout.script_pubkey;
+
+                                    let addresstype = Addresstype::from(script);
+
+                                    let addressbytes_res =
+                                        Addressbytes::try_from((script, addresstype)).inspect_err(|_| {
+                                            // dbg!(&txout, height, txi, &tx.compute_txid());
+                                        });
+
+                                    let addressindex_opt = addressbytes_res.as_ref().ok().and_then(|addressbytes| {
+                                        stores
+                                            .addressbytes_prefix_to_addressindex
+                                            .get(&AddressbytesPrefix::from((addressbytes, addresstype)))
+                                            .unwrap()
+                                            .cloned()
+                                            // Checking if not in the future
+                                            .and_then(|addressindex_local| {
+                                                (addressindex_local < addressindex_global).then_some(addressindex_local)
+                                            })
+                                    }); // OK
+
+                                    if let Some(Some(addressindex)) = check_collisions.then_some(addressindex_opt) {
+                                        let addressbytes = addressbytes_res.as_ref().unwrap();
+
+                                        let prev_addresstype = *vecs
+                                            .addressindex_to_addresstype
+                                            .get(addressindex)?
+                                            .context("Expect to have address type")?;
+
+                                        let addresstypeindex = *vecs
+                                            .addressindex_to_addresstypeindex
+                                            .get(addressindex)?
+                                            .context("Expect to have address type index")?;
+                                        // Good first time
+                                        // Wrong after rerun
+
+                                        let prev_addressbytes_opt =
+                                            vecs.get_addressbytes(prev_addresstype, addresstypeindex)?;
+
+                                        let prev_addressbytes =
+                                            prev_addressbytes_opt.as_ref().context("Expect to have addressbytes")?;
+
+                                        if (vecs.addressindex_to_addresstype.hasnt(addressindex)
+                                            && addresstype != prev_addresstype)
+                                            || (stores.addressbytes_prefix_to_addressindex.needs(height)
+                                                && prev_addressbytes != addressbytes)
+                                        {
+                                            let txid = tx.compute_txid();
+                                            dbg!(
+                                                _height,
+                                                txid,
+                                                vout,
+                                                block_txindex,
+                                                addresstype,
+                                                prev_addresstype,
+                                                prev_addressbytes,
+                                                addressbytes,
+                                                addressindex_global,
+                                                addressindex,
+                                                addresstypeindex,
+                                                txout,
+                                                AddressbytesPrefix::from((addressbytes, addresstype)),
+                                                AddressbytesPrefix::from((prev_addressbytes, prev_addresstype))
+                                            );
+                                            panic!()
+                                        }
+                                    }
+
+                                    Ok((
+                                        txoutindex,
+                                        (
+                                            txout,
+                                            txindex,
+                                            vout,
+                                            addresstype,
+                                            addressbytes_res,
+                                            addressindex_opt,
+                                            tx,
+                                        ),
+                                    ))
+                                },
+                            )
+                            .try_fold(BTreeMap::new, |mut map, tuple| -> color_eyre::Result<_> {
+                                let (key, value) = tuple?;
+                                map.insert(key, value);
+                                Ok(map)
+                            })
+                            .try_reduce(BTreeMap::new, |mut map, mut map2| {
+                                if map.len() > map2.len() {
+                                    map.append(&mut map2);
+                                    Ok(map)
+                                } else {
+                                    map2.append(&mut map);
+                                    Ok(map2)
+                                }
+                            })
+                    });
+
+                    (
+                        txid_prefix_to_txid_and_block_txindex_and_prev_txindex_handle.join(),
+                        txin_or_addressindextxoutindex_vec_handle.join(),
+                        txoutindex_to_txout_addresstype_addressbytes_res_addressindex_opt_handle.join(),
+                    )
+                });
+
+                let txid_prefix_to_txid_and_block_txindex_and_prev_txindex =
+                    txid_prefix_to_txid_and_block_txindex_and_prev_txindex_join_handle
+                        .ok()
+                        .context(
+                            "Expect txid_prefix_to_txid_and_block_txindex_and_prev_txindex_join_handle to join",
+                        )??;
+
+                let txin_or_addressindextxoutindex_vec = txin_or_addressindextxoutindex_vec_handle
+                    .ok()
+                    .context("Export txin_or_addressindextxoutindex_vec_handle to join")??;
+
+                let txoutindex_to_txout_addresstype_addressbytes_res_addressindex_opt =
+                    txoutindex_to_txout_addresstype_addressbytes_res_addressindex_opt_handle
+                        .ok()
+                        .context(
+                            "Expect txoutindex_to_txout_addresstype_addressbytes_res_addressindex_opt_handle to join",
+                        )??;
+
+                let mut new_txindexvout_to_addressindextxoutindex: BTreeMap<
+                    (Txindex, Vout),
+                    (Addressindex, Txoutindex),
+                > = BTreeMap::new();
+
+                let mut already_added_addressbytes_prefix: BTreeMap<AddressbytesPrefix, Addressindex> = BTreeMap::new();
+
+                txoutindex_to_txout_addresstype_addressbytes_res_addressindex_opt
+                .into_iter()
+                .try_for_each(
+                    |(
+                        txoutindex,
+                        (txout, txindex, vout, addresstype, addressbytes_res, addressindex_opt, _tx),
+                    )|
+                     -> color_eyre::Result<()> {
+                        let amount = Amount::from(txout.value);
+
+                        if vout.is_zero() {
+                            vecs.txindex_to_first_txoutindex.push_if_needed(txindex, txoutindex)?;
+                        }
+
+                        vecs.txoutindex_to_amount.push_if_needed(txoutindex, amount)?;
+
+                        let mut addressindex = addressindex_global;
+
+                        let mut addressbytes_prefix = None;
+
+                        if let Some(addressindex_local) = addressindex_opt.or_else(|| {
+                            addressbytes_res.as_ref().ok().and_then(|addressbytes| {
+                                // Check if address was first seen before in this iterator
+                                // Example: https://mempool.space/address/046a0765b5865641ce08dd39690aade26dfbf5511430ca428a3089261361cef170e3929a68aee3d8d4848b0c5111b0a37b82b86ad559fd2a745b44d8e8d9dfdc0c
+                                addressbytes_prefix.replace(AddressbytesPrefix::from((addressbytes, addresstype)));
+                                already_added_addressbytes_prefix
+                                    .get(addressbytes_prefix.as_ref().unwrap())
+                                    .cloned()
+                            })
+                        }) {
+                            addressindex = addressindex_local;
+                        } else {
+                            addressindex_global.increment();
+
+                            let addresstypeindex = match addresstype {
+                                Addresstype::Empty => emptyindex_global.clone_then_increment(),
+                                Addresstype::Multisig => multisigindex_global.clone_then_increment(),
+                                Addresstype::OpReturn => opreturnindex_global.clone_then_increment(),
+                                Addresstype::PushOnly => pushonlyindex_global.clone_then_increment(),
+                                Addresstype::Unknown => unknownindex_global.clone_then_increment(),
+                                Addresstype::P2PK65 => p2pk65index_global.clone_then_increment(),
+                                Addresstype::P2PK33 => p2pk33index_global.clone_then_increment(),
+                                Addresstype::P2PKH => p2pkhindex_global.clone_then_increment(),
+                                Addresstype::P2SH => p2shindex_global.clone_then_increment(),
+                                Addresstype::P2WPKH => p2wpkhindex_global.clone_then_increment(),
+                                Addresstype::P2WSH => p2wshindex_global.clone_then_increment(),
+                                Addresstype::P2TR => p2trindex_global.clone_then_increment(),
+                            };
+
+                            vecs.addressindex_to_addresstype
+                                .push_if_needed(addressindex, addresstype)?;
+
+                            vecs.addressindex_to_addresstypeindex
+                                .push_if_needed(addressindex, addresstypeindex)?;
+
+                            vecs.addressindex_to_height
+                                .push_if_needed(addressindex, height)?;
+
+                            if let Ok(addressbytes) = addressbytes_res {
+                                let addressbytes_prefix = addressbytes_prefix.unwrap();
+
+                                already_added_addressbytes_prefix
+                                    .insert(addressbytes_prefix.clone(), addressindex);
+
+                                stores.addressbytes_prefix_to_addressindex.insert_if_needed(
+                                    addressbytes_prefix,
+                                    addressindex,
+                                    height,
+                                );
+
+                                vecs.push_addressbytes_if_needed(addresstypeindex, addressbytes)?;
+                            }
+                        }
+
+                        new_txindexvout_to_addressindextxoutindex
+                            .insert((txindex, vout), (addressindex, txoutindex));
+
+                        vecs.txoutindex_to_addressindex
+                            .push_if_needed(txoutindex, addressindex)?;
+
+                        stores
+                            .addressindex_to_txoutindex_in
+                            .insert_if_needed(addressindex, txoutindex, height);
+
+                        Ok(())
+                    },
+                )?;
+
+                drop(already_added_addressbytes_prefix);
+
+                txin_or_addressindextxoutindex_vec
+                    .into_iter()
+                    .map(
+                        |txin_or_addressindextxoutindex| -> color_eyre::Result<(Addressindex, Txindex, Txoutindex)> {
+                            match txin_or_addressindextxoutindex {
+                                TxInOrAddressindextoutindex::AddressTxTxoutIndexes(triplet) => Ok(triplet),
+                                TxInOrAddressindextoutindex::TxIn(txin) => {
+                                    let outpoint = txin.previous_output;
+                                    let txid = outpoint.txid;
+                                    let vout = Vout::from(outpoint.vout);
+                                    let index = txid_prefix_to_txid_and_block_txindex_and_prev_txindex
+                                        .get(&TxidPrefix::try_from(&txid)?)
+                                        .context("txid should be in same block")?
+                                        .2;
+                                    let txindex = txindex_global + index;
+
+                                    let (addressindex, txoutindex) = new_txindexvout_to_addressindextxoutindex
+                                        .remove(&(txindex, vout))
+                                        .context("should have found addressindex from same block")
+                                        .inspect_err(|_| {
+                                            dbg!(&new_txindexvout_to_addressindextxoutindex, txin, txindex, vout, txid);
+                                        })?;
+
+                                    Ok((addressindex, txindex, txoutindex))
+                                }
+                            }
+                        },
+                    )
+                    .try_for_each(|res| -> color_eyre::Result<()> {
+                        let (addressindex, txindex, txoutindex) = res?;
+                        stores
+                            .addressindex_to_txoutindex_out
+                            .insert_if_needed(addressindex, txoutindex, height);
+                        stores
+                            .txindex_to_txoutindex_in
+                            .insert_if_needed(txindex, txoutindex, height);
+                        Ok(())
+                    })?;
+
+                drop(new_txindexvout_to_addressindextxoutindex);
+
+                let mut txindex_to_tx_and_txid: BTreeMap<Txindex, (&Transaction, Txid)> = BTreeMap::default();
+
+                txid_prefix_to_txid_and_block_txindex_and_prev_txindex
+                    .into_iter()
+                    .try_for_each(
+                        |(txid_prefix, (tx, txid, index, prev_txindex_opt))| -> color_eyre::Result<()> {
+                            let txindex = txindex_global + index;
+
+                            txindex_to_tx_and_txid.insert(txindex, (tx, txid));
+
+                            match prev_txindex_opt {
+                                None => {
+                                    stores
+                                        .txid_prefix_to_txindex
+                                        .insert_if_needed(txid_prefix, txindex, height);
+                                }
+                                Some(prev_txindex) => {
+                                    // In case if we start at an already parsed height
+                                    if txindex == prev_txindex {
+                                        return Ok(());
+                                    }
+
+                                    let len = vecs.txindex_to_txid.len();
+                                    // Ok if `get` is not par as should happen only twice
+                                    let prev_txid = vecs
+                                        .txindex_to_txid
+                                        .get(prev_txindex)?
+                                        .context("To have txid for txindex")
+                                        .inspect_err(|_| {
+                                            dbg!(txindex, txid, len);
+                                        })?;
+
+                                    // #[allow(clippy::redundant_locals)]
+                                    // let prev_txid = prev_txid;
+                                    let prev_txid = prev_txid.as_ref();
+
+                                    // If another Txid needs to be added to the list
+                                    // We need to check that it's also a coinbase tx otherwise par_iter inputs needs to be updated
+                                    let only_known_dup_txids = [
+                                        Txid::from_str(
+                                            "d5d27987d2a3dfc724e359870c6644b40e497bdc0589a033220fe15429d88599",
+                                        )?,
+                                        Txid::from_str(
+                                            "e3bf3d07d4b0375638d5f1db5255fe07ba2c4cb067cd81b84ee974b6585fb468",
+                                        )?,
+                                    ];
+
+                                    let is_dup = only_known_dup_txids.contains(prev_txid);
+
+                                    if !is_dup {
+                                        let prev_height =
+                                            vecs.txindex_to_height.get(prev_txindex)?.expect("To have height");
+                                        dbg!(height, txid, txindex, prev_height, prev_txid, prev_txindex);
+                                        return Err(eyre!("Expect none"));
+                                    }
+                                }
+                            }
+
+                            Ok(())
+                        },
+                    )?;
+
+                txindex_to_tx_and_txid
+                    .into_iter()
+                    .try_for_each(|(txindex, (tx, txid))| -> color_eyre::Result<()> {
+                        vecs.txindex_to_txversion.push_if_needed(txindex, tx.version)?;
+                        vecs.txindex_to_txid.push_if_needed(txindex, txid)?;
+                        vecs.txindex_to_height.push_if_needed(txindex, height)?;
+                        vecs.txindex_to_locktime.push_if_needed(txindex, tx.lock_time)?;
+                        Ok(())
+                    })?;
+
+                txindex_global += Txindex::from(tx_len);
+                txoutindex_global += Txoutindex::from(outputs_len);
+
+                let should_snapshot = _height != 0 && _height % SNAPSHOT_BLOCK_RANGE == 0 && !exit.active();
+                if should_snapshot {
+                    export(stores, &mut vecs, height)?;
+                    stores_opt.replace(open_stores()?);
+                } else {
+                    stores_opt.replace(stores);
+                }
+
+                Ok(())
+            })?;
+
+        export(stores_opt.take().context("option should have wtx")?, &mut vecs, height)?;
+
+        Ok(())
+    }
+}
+
+fn pause() {
+    let mut stdin = std::io::stdin();
+    let mut stdout = std::io::stdout();
+    write!(stdout, "Press any key to continue...").unwrap();
+    stdout.flush().unwrap();
+    let _ = stdin.read(&mut [0u8]).unwrap();
+}
diff --git a/bindex/src/main.rs b/bindex/src/main.rs
index 30f1e1de6..bd571c95b 100644
--- a/bindex/src/main.rs
+++ b/bindex/src/main.rs
@@ -1,591 +1,32 @@
-use std::{
-    collections::BTreeMap,
-    io::{Read, Write},
-    path::Path,
-    str::FromStr,
-    thread::{self},
-};
+use std::path::Path;
 
-use biter::{
-    bitcoin::{Transaction, TxIn, TxOut, Txid},
-    bitcoincore_rpc::{Auth, Client},
-};
+use biter::rpc;
 
+mod indexer;
+mod storage;
 mod structs;
 
-use color_eyre::eyre::{eyre, ContextCompat};
-use rayon::prelude::*;
-use structs::{
-    Addressbytes, AddressbytesPrefix, Addressindex, Addressindextxoutindex, Addresstype, Addresstypeindex, Amount,
-    BlockHashPrefix, Date, Exit, Height, Stores, Timestamp, TxidPrefix, Txindex, Txindexvout, Txoutindex, Vecs,
-};
+use exit::Exit;
+use indexer::Indexer;
+use structs::{AddressbytesPrefix, Addressindex, BlockHashPrefix, Height, TxidPrefix, Txindex, Txoutindex};
 
 // https://github.com/romanz/electrs/blob/master/doc/schema.md
 
-#[derive(Debug)]
-enum TxInOrAddressindextoutindex<'a> {
-    TxIn(&'a TxIn),
-    Addressindextoutindex(Addressindextxoutindex),
-}
-
-const UNSAFE_BLOCKS: u32 = 100;
-const DAILY_BLOCK_TARGET: usize = 144;
-const SNAPSHOT_BLOCK_RANGE: usize = DAILY_BLOCK_TARGET * 10;
-
 fn main() -> color_eyre::Result<()> {
     color_eyre::install()?;
 
-    let i = std::time::Instant::now();
-
-    let check_collisions = true;
-
     let data_dir = Path::new("../../bitcoin");
-    let cookie = Path::new(data_dir).join(".cookie");
-    let rpc = Client::new("http://localhost:8332", Auth::CookieFile(cookie))?;
-
+    let rpc = rpc::Client::new(
+        "http://localhost:8332",
+        rpc::Auth::CookieFile(Path::new(data_dir).join(".cookie")),
+    )?;
     let exit = Exit::new();
 
-    let path_database = Path::new("./database");
-    let path_stores = path_database.join("stores");
+    let i = std::time::Instant::now();
 
-    let stores = Stores::open(&path_stores)?;
-
-    let mut vecs = Vecs::import(&path_database.join("vecs"))?;
-
-    let mut height = vecs
-        .min_height()
-        .unwrap_or_default()
-        .min(stores.min_height())
-        .and_then(|h| h.checked_sub(UNSAFE_BLOCKS))
-        .map(Height::from)
-        .unwrap_or_default();
-
-    let mut txindex = vecs
-        .height_to_first_txindex
-        .get(height)?
-        .map(|v| *v)
-        .unwrap_or(Txindex::default());
-
-    let mut txoutindex = vecs
-        .height_to_first_txoutindex
-        .get(height)?
-        .map(|v| *v)
-        .unwrap_or(Txoutindex::default());
-
-    let mut addressindex = vecs
-        .height_to_first_addressindex
-        .get(height)?
-        .map(|v| *v)
-        .unwrap_or(Addressindex::default());
-
-    let export = |stores: Stores, vecs: &mut Vecs, height: Height| -> color_eyre::Result<()> {
-        exit.block();
-        println!("Exporting...");
-        // Memory: 3.76 GB
-        // Real Memory: 22.47 GB
-        // Private Memory: 12.44 GB
-        // if height > Height::from(400_000_u32) {
-        //     pause();
-        // }
-        // vecs.reset_cache();
-        // At: 403200
-        // Memory: 3.78 GB
-        // Real Memory: 12.65 GB
-        // Private Memory: 11.39 GB
-        // if height > Height::from(400_000_u32) {
-        //     pause();
-        // }
-        vecs.flush(height)?;
-        // At: 403200
-        // Memory: 3.79 GB
-        // Real Memory: 12.37 GB
-        // Private Memory: 10.95 GB
-        // Gone up wtf
-        // if height > Height::from(400_000_u32) {
-        //     pause();
-        // }
-        stores.export(height);
-        println!("Export done");
-        // At: 403200
-        // Memory: 2.23 GB
-        // Real Memory: 1.05 GB
-        // Private Memory: 0.109 GB
-        // if height > Height::from(400_000_u32) {
-        //     pause();
-        // }
-        exit.unblock();
-        Ok(())
-    };
-
-    let mut stores_opt = Some(stores);
-
-    biter::new(data_dir, Some(height.into()), Some(400_000), rpc)
-        .iter()
-        .try_for_each(|(_height, block, blockhash)| -> color_eyre::Result<()> {
-            println!("Processing block {_height}...");
-
-            height = Height::from(_height);
-            let timestamp = Timestamp::try_from(block.header.time)?;
-            let date = Date::from(&timestamp);
-
-            let mut stores = stores_opt.take().context("option should have wtx")?;
-
-            if let Some(saved_blockhash) = vecs.height_to_blockhash.get(height)? {
-                // if &blockhash != saved_blockhash {
-                if &blockhash != saved_blockhash.as_ref() {
-                    todo!("Rollback not implemented");
-                    // parts.rollback_from(&mut wtx, height, &exit)?;
-                }
-            }
-
-            if stores.blockhash_prefix_to_height.needs(height) {
-                let blockhash_prefix = BlockHashPrefix::try_from(&blockhash)?;
-
-                if check_collisions {
-                    if let Some(prev_height) =
-                        stores.blockhash_prefix_to_height.get(&blockhash_prefix)
-                    {
-                        dbg!(blockhash, prev_height);
-                        return Err(eyre!("Collision, expect prefix to need be set yet"));
-                    }
-                }
-
-                stores.blockhash_prefix_to_height.insert(blockhash_prefix,height);
-            }
-
-            vecs.height_to_blockhash.push_if_needed(height, blockhash)?;
-            vecs.height_to_first_txindex.push_if_needed(height, txindex)?;
-            vecs.height_to_first_txoutindex.push_if_needed(height, txoutindex)?;
-            vecs.height_to_first_addressindex.push_if_needed(height, addressindex)?;
-            vecs.height_to_timestamp.push_if_needed(height, timestamp)?;
-            vecs.height_to_date.push_if_needed(height, date)?;
-
-            let outputs = block
-                .txdata
-                .iter()
-                .enumerate()
-                .flat_map(|(index, tx)| {
-                    tx.output
-                        .iter()
-                        .enumerate()
-                        .map(move |(vout, txout)| (Txindex::from(index), vout as u32, txout, tx))
-                }).collect::<Vec<_>>();
-
-            let tx_len = block.txdata.len();
-            let outputs_len = outputs.len();
-
-            let (txid_prefix_to_txid_and_block_txindex_and_prev_txindex_join_handle, txin_or_addressindextxoutindex_vec_handle, txoutindex_to_txout_addresstype_addressbytes_res_addressindex_opt_handle) = thread::scope(|scope| {
-                let txid_prefix_to_txid_and_block_txindex_and_prev_txindex_handle = scope.spawn(|| -> color_eyre::Result<_> {
-                    block
-                    .txdata
-                    .par_iter()
-                    .enumerate()
-                    .map(|(index, tx)| -> color_eyre::Result<_> {
-                        let txid = tx.compute_txid();
-
-                        let txid_prefix = TxidPrefix::try_from(&txid)?;
-
-                        let prev_txindex_slice_opt = if check_collisions && stores.txid_prefix_to_txindex.needs(height) {
-                            // Should only find collisions for two txids (duplicates), see below
-                            stores.txid_prefix_to_txindex.get(&txid_prefix).cloned()
-                        } else {
-                            None
-                        };
-
-                        Ok((txid_prefix, (tx, txid, Txindex::from(index), prev_txindex_slice_opt)))
-                    })
-                    .try_fold(
-                        BTreeMap::new,
-                        |mut map, tuple| {
-                            let (key, value) = tuple?;
-                            map.insert(key, value);
-                            Ok(map)
-                        },
-                    )
-                    .try_reduce(BTreeMap::new, |mut map, mut map2| {
-                        if map.len() > map2.len() {
-                            map.append(&mut map2);
-                            Ok(map)
-                        } else {
-                            map2.append(&mut map);
-                            Ok(map2)
-                        }
-                    })});
-
-                let txin_or_addressindextxoutindex_vec_handle = scope.spawn(|| -> color_eyre::Result<Vec<TxInOrAddressindextoutindex>> {
-                    block
-                        .txdata
-                        .par_iter()
-                        .filter(|tx| !tx.is_coinbase())
-                        .flat_map(|tx| &tx.input)
-                        .map(|txin| -> color_eyre::Result<_> {
-                            let outpoint = txin.previous_output;
-                            let txid = outpoint.txid;
-                            let vout = outpoint.vout;
-
-                            let txindex_local = if let Some(txindex_local) = stores.txid_prefix_to_txindex
-                                .get(&TxidPrefix::try_from(&txid)?).and_then(|txindex_local| {
-                                    // Checking if not finding txindex from the future
-                                    (txindex_local < &txindex).then_some(txindex_local)
-                                })
-                            {
-                                *txindex_local
-                            } else {
-                                return Ok(TxInOrAddressindextoutindex::TxIn(txin));
-                            };
-
-                            let txindexvout = Txindexvout::from((txindex_local, vout));
-
-                            let txoutindex =
-                                *stores.txindexvout_to_txoutindex.get(&txindexvout)
-                                    .context("Expect txoutindex to not be none")
-                                    .inspect_err(|_| {
-                                        dbg!(outpoint.txid, txindex_local, vout, txindexvout);
-                                    })?;
-
-                            let addressindex = *vecs.txoutindex_to_addressindex.get(txoutindex)?
-                                .context("Expect addressindex to not be none")
-                                .inspect_err(|_| {
-                                    // let height = vecdisks.txindex_to_height.get(txindex.into()).expect("txindex_to_height get not fail")
-                                    // .expect("Expect height for txindex");
-                                    dbg!(outpoint.txid, txindex_local, vout, txindexvout);
-                                })?;
-
-                            Ok(TxInOrAddressindextoutindex::Addressindextoutindex(Addressindextxoutindex::from((
-                                addressindex,
-                                txoutindex,
-                            ))))
-                        })
-                        .try_fold(
-                            Vec::new,
-                            |mut vec, addressindextxoutindex| {
-                                vec.push(addressindextxoutindex?);
-                                Ok(vec)
-                            },
-                        )
-                        .try_reduce(Vec::new, |mut v, mut v2| {
-                            if v.len() > v2.len() {
-                                v.append(&mut v2);
-                                Ok(v)
-                            } else {
-                                v2.append(&mut v);
-                                Ok(v2)
-                            }
-                        })
-                });
-
-                let txoutindex_to_txout_addresstype_addressbytes_res_addressindex_opt_handle = scope.spawn(|| {
-                    outputs.into_par_iter().enumerate()
-                        .map(
-                            #[allow(clippy::type_complexity)]
-                            |(block_txoutindex, (block_txindex, vout, txout, tx))| -> color_eyre::Result<(Txoutindex,
-                            (&TxOut, Txindexvout, Addresstype, color_eyre::Result<Addressbytes>, Option<Addressindex>))> {
-                                let txindex_local = txindex + block_txindex;
-                                let txindexvout = Txindexvout::from((txindex_local, vout));
-                                let txoutindex_local = txoutindex + Txoutindex::from(block_txoutindex);
-
-                                let script = &txout.script_pubkey;
-
-                                let addresstype = Addresstype::from(script);
-
-                                let addressbytes_res = Addressbytes::try_from((script, addresstype)).inspect_err(|_| {
-                                    // dbg!(&txout, height, txi, &tx.compute_txid());
-                                });
-
-                                let addressindex_opt = addressbytes_res.as_ref().ok().and_then(|addressbytes| {
-                                    stores.addressbytes_prefix_to_addressindex.get(
-                                        &AddressbytesPrefix::from((addressbytes, addresstype)),
-                                    )
-                                        .cloned()
-                                        // Checking if not in the future
-                                        .and_then(|addressindex_local| (addressindex_local < addressindex)
-                                        .then_some(addressindex_local))
-                                }); // OK
-
-                                if let Some(Some(addressindex_local)) = check_collisions.then_some(addressindex_opt) {
-                                    let addressbytes = addressbytes_res.as_ref().unwrap();
-
-                                    let prev_addresstype = *vecs.addressindex_to_addresstype.get(
-                                        addressindex_local,
-                                    )?.context("Expect to have address type")?;
-
-                                    let addresstypeindex = *vecs.addressindex_to_addresstypeindex.get(
-                                        addressindex_local,
-                                    )?.context("Expect to have address type index")?;
-                                    // Good first time
-                                    // Wrong after rerun
-
-                                    let prev_addressbytes_opt= vecs.get_addressbytes(prev_addresstype, addresstypeindex)?;
-
-                                    let prev_addressbytes = prev_addressbytes_opt.as_ref().context("Expect to have addressbytes")?;
-
-                                    if (vecs.addressindex_to_addresstype.hasnt(addressindex_local) && addresstype != prev_addresstype) || (stores.addressbytes_prefix_to_addressindex.needs(height) && prev_addressbytes != addressbytes) {
-                                        let txid = tx.compute_txid();
-                                        dbg!(_height, txid, vout, block_txindex, addresstype, prev_addresstype, prev_addressbytes, addressbytes, addressindex, addressindex_local, addresstypeindex, txout, AddressbytesPrefix::from((addressbytes, addresstype)), AddressbytesPrefix::from((prev_addressbytes, prev_addresstype)));
-                                        panic!()
-                                    }
-                                }
-
-                                Ok((
-                                    txoutindex_local,
-                                    (txout, txindexvout, addresstype, addressbytes_res, addressindex_opt),
-                                ))
-                            },
-                        )
-                        .try_fold(
-                            BTreeMap::new,
-                            |mut map, tuple| -> color_eyre::Result<_> {
-                                let (key, value) = tuple?;
-                                map.insert(key, value);
-                                Ok(map)
-                            },
-                        )
-                        .try_reduce(BTreeMap::new, |mut map, mut map2| {
-                            if map.len() > map2.len() {
-                                map.append(&mut map2);
-                                Ok(map)
-                            } else {
-                                map2.append(&mut map);
-                                Ok(map2)
-                            }
-                        })
-                });
-
-                (txid_prefix_to_txid_and_block_txindex_and_prev_txindex_handle.join(), txin_or_addressindextxoutindex_vec_handle.join(), txoutindex_to_txout_addresstype_addressbytes_res_addressindex_opt_handle.join())
-            });
-
-            let txid_prefix_to_txid_and_block_txindex_and_prev_txindex = txid_prefix_to_txid_and_block_txindex_and_prev_txindex_join_handle.ok().context("Expect txid_prefix_to_txid_and_block_txindex_and_prev_txindex_join_handle to join")??;
-
-            let txin_or_addressindextxoutindex_vec = txin_or_addressindextxoutindex_vec_handle.ok().context("Export txin_or_addressindextxoutindex_vec_handle to join")??;
-
-            let txoutindex_to_txout_addresstype_addressbytes_res_addressindex_opt = txoutindex_to_txout_addresstype_addressbytes_res_addressindex_opt_handle.ok().context("Expect txoutindex_to_txout_addresstype_addressbytes_res_addressindex_opt_handle to join")??;
-
-            let mut new_txindexvout_to_addressindextxoutindex: BTreeMap<Txindexvout, Addressindextxoutindex> = BTreeMap::new();
-
-            let mut already_added_addressbytes_prefix: BTreeMap<AddressbytesPrefix, Addressindex> = BTreeMap::new();
-
-            txoutindex_to_txout_addresstype_addressbytes_res_addressindex_opt
-                .into_iter()
-                .try_for_each(|(txoutindex, (txout, txindexvout, addresstype, addressbytes_res, addressindex_opt))| -> color_eyre::Result<()> {
-                    let amount = Amount::from(txout.value);
-
-                    stores.txindexvout_to_txoutindex.insert_if_needed(
-                        txindexvout,
-                        txoutindex,
-                        height,
-                    );
-
-                    vecs.txoutindex_to_amount.push_if_needed(
-                        txoutindex,
-                        amount,
-                    )?;
-
-                    let mut addressindex_local = addressindex;
-
-                    let mut addressbytes_prefix = None;
-
-                    if let Some(addressindex) = addressindex_opt.or_else(|| addressbytes_res.as_ref().ok().and_then(|addressbytes| {
-                        // Check if address was first seen before in this iterator
-                        // Example: https://mempool.space/address/046a0765b5865641ce08dd39690aade26dfbf5511430ca428a3089261361cef170e3929a68aee3d8d4848b0c5111b0a37b82b86ad559fd2a745b44d8e8d9dfdc0c
-                        addressbytes_prefix.replace(AddressbytesPrefix::from((addressbytes, addresstype)));
-                        already_added_addressbytes_prefix.get(
-                        addressbytes_prefix.as_ref().unwrap(),
-                        ).cloned()
-                    })) {
-                        addressindex_local = addressindex;
-                    } else {
-                        addressindex.increment();
-
-                        // TODO: Create counter of other addresstypes instead
-                        let addresstypeindex = Addresstypeindex::from(vecs.addresstype_to_addressbytes(addresstype).map_or(0, |vec| vec.len()));
-
-                        vecs.addressindex_to_addresstype.push_if_needed(addressindex_local, addresstype)?;
-
-                        vecs.addressindex_to_addresstypeindex.push_if_needed(addressindex_local, addresstypeindex)?;
-
-                        if let Ok(addressbytes) = addressbytes_res {
-                            let addressbytes_prefix = addressbytes_prefix.unwrap();
-
-                            // if addressindex_local == Addressindex::from(257905_u32) || addressbytes_prefix == AddressbytesPrefix::from(
-                            //     [
-                            //         116_u8,
-                            //         86,
-                            //         96,
-                            //         52,
-                            //         2,
-                            //         87,
-                            //         151,
-                            //         177,
-                            //     ],
-                            // ) {
-                            //     dbg!(addressindex_local, addressbytes, addressbytes_prefix, addresstypeindex);
-                            //     panic!();
-                            // }
-
-                            already_added_addressbytes_prefix.insert(addressbytes_prefix.clone(), addressindex_local);
-
-                            stores.addressbytes_prefix_to_addressindex.insert_if_needed(
-                                addressbytes_prefix,
-                                addressindex_local,
-                                height
-                            );
-
-                            vecs.push_addressbytes_if_needed(addresstypeindex, addressbytes)?;
-                        }
-                    }
-
-                    let addressindextxoutindex = Addressindextxoutindex::from((addressindex_local, txoutindex));
-
-                    new_txindexvout_to_addressindextxoutindex.insert(txindexvout, addressindextxoutindex);
-
-                    vecs.txoutindex_to_addressindex.push_if_needed(
-                        txoutindex,
-                        addressindex_local,
-                    )?;
-
-                    stores.addressindextxoutindex_in.insert_if_needed(
-                        addressindextxoutindex,
-                        (),
-                        height,
-                    );
-
-                    Ok(())
-                })?;
-
-            drop(already_added_addressbytes_prefix);
-
-            if stores.addressindextxoutindex_out.needs(height) {
-                txin_or_addressindextxoutindex_vec
-                .into_iter()
-                .map(|txin_or_addressindextxoutindex| -> color_eyre::Result<Addressindextxoutindex> {
-                    match txin_or_addressindextxoutindex {
-                        TxInOrAddressindextoutindex::Addressindextoutindex(addressindextxoutindex) => Ok(addressindextxoutindex),
-                        TxInOrAddressindextoutindex::TxIn(txin) => {
-                            let outpoint = txin.previous_output;
-                            let txid = outpoint.txid;
-                            let vout = outpoint.vout;
-                            let index = txid_prefix_to_txid_and_block_txindex_and_prev_txindex
-                                .get(&TxidPrefix::try_from(&txid)?)
-                                .context("txid should be in same block")?.2;
-                            let txindex_local = txindex + index;
-
-                            let txindexvout = Txindexvout::from((txindex_local, vout));
-
-                            new_txindexvout_to_addressindextxoutindex
-                                .remove(&txindexvout)
-                                .context("should have found addressindex from same block").inspect_err(|_| {
-                                    dbg!(&new_txindexvout_to_addressindextxoutindex, txin, txindexvout, txid);
-                                })
-                        }
-                    }
-                })
-                .try_for_each(|addressindextxoutindex| -> color_eyre::Result<()> {
-                    stores.addressindextxoutindex_out.insert(
-                        addressindextxoutindex?,
-                        (),
-                    );
-                    Ok(())
-                })?;
-            }
-
-            drop(new_txindexvout_to_addressindextxoutindex);
-
-            let mut txindex_to_tx_and_txid: BTreeMap<Txindex, (&Transaction, Txid)> = BTreeMap::default();
-
-            txid_prefix_to_txid_and_block_txindex_and_prev_txindex.into_iter().try_for_each(
-                |(txid_prefix, (tx, txid, index, prev_txindex_opt))| -> color_eyre::Result<()> {
-                    let txindex_local = txindex + index;
-
-                    txindex_to_tx_and_txid.insert(txindex_local, (tx, txid));
-
-                    match prev_txindex_opt {
-                        None => {
-                            stores.txid_prefix_to_txindex.insert_if_needed(txid_prefix, txindex_local, height);
-                        },
-                        Some(prev_txindex) => {
-                            // In case if we start at an already parsed height
-                            if txindex_local == prev_txindex {
-                                return Ok(())
-                            }
-
-                            let len = vecs.txindex_to_txid.len();
-                            // Ok if `get` is not par as should happen only twice
-                            let prev_txid =
-                                vecs.txindex_to_txid.get(prev_txindex)?
-                                    .context("To have txid for txindex").inspect_err(|_| {
-                                        dbg!(txindex_local, txid, len);
-                                    })?;
-
-                            // #[allow(clippy::redundant_locals)]
-                            // let prev_txid = prev_txid;
-                            let prev_txid = prev_txid.as_ref();
-
-                            // If another Txid needs to be added to the list
-                            // We need to check that it's also a coinbase tx otherwise par_iter inputs needs to be updated
-                            let only_known_dup_txids = [
-                                Txid::from_str("d5d27987d2a3dfc724e359870c6644b40e497bdc0589a033220fe15429d88599")?,
-                                Txid::from_str("e3bf3d07d4b0375638d5f1db5255fe07ba2c4cb067cd81b84ee974b6585fb468")?,
-                            ];
-
-                            let is_dup = only_known_dup_txids.contains(prev_txid);
-
-                            if !is_dup {
-                                let prev_height = vecs.txindex_to_height.get(prev_txindex)?.expect("To have height");
-                                dbg!(height, txid, txindex_local, prev_height, prev_txid, prev_txindex);
-                                return Err(eyre!("Expect none"));
-                            }
-                        }
-                    }
-
-                    Ok(())
-                },
-            )?;
-
-            txindex_to_tx_and_txid.into_iter().try_for_each(|(txindex, (tx, txid))| -> color_eyre::Result<()> {
-                vecs.txindex_to_txversion.push_if_needed(txindex, tx.version)?;
-                vecs.txindex_to_txid.push_if_needed(txindex, txid)?;
-                vecs.txindex_to_height.push_if_needed(txindex, height)?;
-                vecs.txindex_to_inputcount.push_if_needed(txindex, tx.input.len() as u32)?;
-                vecs.txindex_to_outputcount.push_if_needed(txindex, tx.output.len() as u32)?;
-                Ok(())
-            })?;
-
-            vecs.height_to_last_txindex.push_if_needed(height, txindex.decremented())?;
-            vecs.height_to_last_txoutindex.push_if_needed(height, txoutindex.decremented())?;
-            vecs.height_to_last_addressindex.push_if_needed(height, addressindex.decremented())?;
-
-            let should_snapshot = _height % SNAPSHOT_BLOCK_RANGE == 0 && !exit.active();
-            if should_snapshot {
-                export(stores, &mut vecs, height)?;
-                stores_opt.replace(Stores::open(&path_stores)?);
-            } else {
-                stores_opt.replace(stores);
-            }
-
-            txindex += Txindex::from(tx_len);
-            txoutindex += Txoutindex::from(outputs_len);
-
-            Ok(())
-        })?;
-
-    let stores = stores_opt.take().context("option should have wtx")?;
-    export(stores, &mut vecs, height)?;
+    Indexer::index(Path::new("indexes"), data_dir, rpc, exit)?;
 
     dbg!(i.elapsed());
 
-    pause();
-
     Ok(())
 }
-
-fn pause() {
-    let mut stdin = std::io::stdin();
-    let mut stdout = std::io::stdout();
-
-    // We want the cursor to stay at the end of the line, so we print without a newline and flush manually.
-    write!(stdout, "Press any key to continue...").unwrap();
-    stdout.flush().unwrap();
-
-    // Read a single byte and discard
-    let _ = stdin.read(&mut [0u8]).unwrap();
-}
diff --git a/bindex/src/storage/mod.rs b/bindex/src/storage/mod.rs
new file mode 100644
index 000000000..96983bd40
--- /dev/null
+++ b/bindex/src/storage/mod.rs
@@ -0,0 +1,5 @@
+mod stores;
+mod vecs;
+
+pub use stores::*;
+pub use vecs::*;
diff --git a/bindex/src/storage/stores/meta.rs b/bindex/src/storage/stores/meta.rs
new file mode 100644
index 000000000..b73ac3385
--- /dev/null
+++ b/bindex/src/storage/stores/meta.rs
@@ -0,0 +1,81 @@
+use std::{
+    fs, io,
+    path::{Path, PathBuf},
+};
+
+use snkrj::UnitDatabase;
+
+use super::{Height, Version};
+
+pub struct StoreMeta {
+    pathbuf: PathBuf,
+    version: Version,
+    height: Option<Height>,
+    pub len: usize,
+}
+
+impl StoreMeta {
+    pub fn checked_open(path: &Path, version: Version) -> Result<Self, snkrj::Error> {
+        fs::create_dir_all(path)?;
+
+        let is_same_version =
+            Version::try_from(Self::path_version_(path).as_path()).is_ok_and(|prev_version| version == prev_version);
+
+        if !is_same_version {
+            fs::remove_dir_all(path)?;
+            fs::create_dir(path)?;
+        }
+
+        let this = Self {
+            pathbuf: path.to_owned(),
+            version,
+            height: Height::try_from(Self::path_height_(path).as_path()).ok(),
+            len: UnitDatabase::read_length_(path),
+        };
+
+        this.version.write(&this.path_version())?;
+
+        Ok(this)
+    }
+
+    #[allow(unused)]
+    pub fn len(&self) -> usize {
+        self.len
+    }
+
+    pub fn export(mut self, height: Height) -> Result<(), io::Error> {
+        self.height = Some(height);
+        height.write(&self.path_height())?;
+        UnitDatabase::write_length_(&self.pathbuf, self.len)
+    }
+
+    pub fn path_parts(&self) -> PathBuf {
+        Self::path_parts_(&self.pathbuf)
+    }
+    fn path_parts_(path: &Path) -> PathBuf {
+        path.join("parts")
+    }
+
+    fn path_version(&self) -> PathBuf {
+        Self::path_version_(&self.pathbuf)
+    }
+    fn path_version_(path: &Path) -> PathBuf {
+        path.join("version")
+    }
+
+    pub fn height(&self) -> Option<&Height> {
+        self.height.as_ref()
+    }
+    pub fn needs(&self, height: Height) -> bool {
+        self.height.is_none_or(|self_height| height > self_height)
+    }
+    pub fn has(&self, height: Height) -> bool {
+        !self.needs(height)
+    }
+    fn path_height(&self) -> PathBuf {
+        Self::path_height_(&self.pathbuf)
+    }
+    fn path_height_(path: &Path) -> PathBuf {
+        path.join("height")
+    }
+}
diff --git a/bindex/src/structs/stores.rs b/bindex/src/storage/stores/mod.rs
similarity index 67%
rename from bindex/src/structs/stores.rs
rename to bindex/src/storage/stores/mod.rs
index 37e360bf7..e9e500fa7 100644
--- a/bindex/src/structs/stores.rs
+++ b/bindex/src/storage/stores/mod.rs
@@ -1,33 +1,44 @@
 use std::{path::Path, thread};
 
-use crate::structs::Height;
-
-use super::{
-    AddressbytesPrefix, Addressindex, Addressindextxoutindex, BlockHashPrefix, Store, TxidPrefix, Txindex, Txindexvout,
-    Txoutindex, Version,
+use crate::{
+    structs::Version, AddressbytesPrefix, Addressindex, BlockHashPrefix, Height, TxidPrefix, Txindex, Txoutindex,
 };
 
+mod meta;
+mod multi;
+mod unique;
+
+use meta::*;
+use multi::*;
+use unique::*;
+
 pub struct Stores {
-    pub addressbytes_prefix_to_addressindex: Store<AddressbytesPrefix, Addressindex>,
-    pub addressindextxoutindex_in: Store<Addressindextxoutindex, ()>,
-    pub addressindextxoutindex_out: Store<Addressindextxoutindex, ()>,
-    pub blockhash_prefix_to_height: Store<BlockHashPrefix, Height>,
-    pub txid_prefix_to_txindex: Store<TxidPrefix, Txindex>,
-    pub txindexvout_to_txoutindex: Store<Txindexvout, Txoutindex>,
+    pub addressbytes_prefix_to_addressindex: StoreUnique<AddressbytesPrefix, Addressindex>,
+    pub addressindex_to_txoutindex_in: StoreMulti<Addressindex, Txoutindex>, // Received
+    pub addressindex_to_txoutindex_out: StoreMulti<Addressindex, Txoutindex>, // Spent
+    pub blockhash_prefix_to_height: StoreUnique<BlockHashPrefix, Height>,
+    pub txid_prefix_to_txindex: StoreUnique<TxidPrefix, Txindex>,
+    pub txindex_to_txoutindex_in: StoreMulti<Txindex, Txoutindex>, // Inputs
 }
 
 impl Stores {
     pub fn open(path: &Path) -> color_eyre::Result<Self> {
         Ok(Self {
-            addressbytes_prefix_to_addressindex: Store::open(
+            addressbytes_prefix_to_addressindex: StoreUnique::open(
                 &path.join("addressbytes_prefix_to_addressindex"),
                 Version::from(1),
             )?,
-            addressindextxoutindex_in: Store::open(&path.join("addresstxoutindexes_in"), Version::from(1))?,
-            addressindextxoutindex_out: Store::open(&path.join("addresstxoutindexes_out"), Version::from(1))?,
-            blockhash_prefix_to_height: Store::open(&path.join("blockhash_prefix_to_height"), Version::from(1))?,
-            txid_prefix_to_txindex: Store::open(&path.join("txid_prefix_to_txindex"), Version::from(1))?,
-            txindexvout_to_txoutindex: Store::open(&path.join("txindexvout_to_txoutindex"), Version::from(1))?,
+            addressindex_to_txoutindex_in: StoreMulti::open(
+                &path.join("addressindex_to_txoutindex_in"),
+                Version::from(1),
+            )?,
+            addressindex_to_txoutindex_out: StoreMulti::open(
+                &path.join("addressindex_to_txoutindex_out"),
+                Version::from(1),
+            )?,
+            blockhash_prefix_to_height: StoreUnique::open(&path.join("blockhash_prefix_to_height"), Version::from(1))?,
+            txid_prefix_to_txindex: StoreUnique::open(&path.join("txid_prefix_to_txindex"), Version::from(1))?,
+            txindex_to_txoutindex_in: StoreMulti::open(&path.join("txindex_to_txoutindex_in"), Version::from(1))?,
         })
     }
 
@@ -153,11 +164,11 @@ impl Stores {
     pub fn min_height(&self) -> Option<Height> {
         [
             self.addressbytes_prefix_to_addressindex.height(),
-            self.addressindextxoutindex_in.height(),
-            self.addressindextxoutindex_out.height(),
+            self.addressindex_to_txoutindex_in.height(),
+            self.addressindex_to_txoutindex_out.height(),
             self.blockhash_prefix_to_height.height(),
             self.txid_prefix_to_txindex.height(),
-            self.txindexvout_to_txoutindex.height(),
+            self.txindex_to_txoutindex_in.height(),
         ]
         .into_iter()
         .min()
@@ -165,14 +176,18 @@ impl Stores {
         .cloned()
     }
 
-    pub fn export(self, height: Height) {
+    pub fn export(self, height: Height) -> Result<(), snkrj::Error> {
         thread::scope(|scope| {
-            scope.spawn(|| self.addressbytes_prefix_to_addressindex.export(height));
-            scope.spawn(|| self.addressindextxoutindex_in.export(height));
-            scope.spawn(|| self.addressindextxoutindex_out.export(height));
-            scope.spawn(|| self.blockhash_prefix_to_height.export(height));
-            scope.spawn(|| self.txid_prefix_to_txindex.export(height));
-            scope.spawn(|| self.txindexvout_to_txoutindex.export(height));
-        });
+            vec![
+                scope.spawn(|| self.addressbytes_prefix_to_addressindex.export(height)),
+                scope.spawn(|| self.addressindex_to_txoutindex_in.export(height)),
+                scope.spawn(|| self.addressindex_to_txoutindex_out.export(height)),
+                scope.spawn(|| self.blockhash_prefix_to_height.export(height)),
+                scope.spawn(|| self.txid_prefix_to_txindex.export(height)),
+                scope.spawn(|| self.txindex_to_txoutindex_in.export(height)),
+            ]
+            .into_iter()
+            .try_for_each(|handle| -> Result<(), snkrj::Error> { handle.join().unwrap() })
+        })
     }
 }
diff --git a/bindex/src/storage/stores/multi.rs b/bindex/src/storage/stores/multi.rs
new file mode 100644
index 000000000..2c5cf2e4b
--- /dev/null
+++ b/bindex/src/storage/stores/multi.rs
@@ -0,0 +1,101 @@
+use std::{array, path::Path, sync::OnceLock};
+
+use rayon::prelude::*;
+use snkrj::{DatabaseKey, DatabaseMulti, DatabaseValue};
+
+use super::{Height, StoreMeta, Version};
+
+pub struct StoreMulti<K, V>
+where
+    K: DatabaseKey,
+    V: DatabaseValue,
+{
+    meta: StoreMeta,
+    pub parts: [OnceLock<Box<DatabaseMulti<K, V>>>; 64],
+}
+
+impl<K, V> StoreMulti<K, V>
+where
+    K: DatabaseKey,
+    V: DatabaseValue,
+{
+    pub fn open(path: &Path, version: Version) -> Result<Self, snkrj::Error> {
+        let meta = StoreMeta::checked_open(path, version)?;
+
+        Ok(Self {
+            meta,
+            parts: array::from_fn(|_| OnceLock::new()),
+        })
+    }
+
+    // pub fn len(&self) -> usize {
+    //     self.meta.len()
+    // }
+
+    fn get_or_init_store(&self, key: &K) -> &DatabaseMulti<K, V> {
+        self.get_or_init_store_(key.as_ne_six_bits() as usize)
+    }
+
+    fn get_or_init_store_(&self, storeindex: usize) -> &DatabaseMulti<K, V> {
+        self.parts[storeindex]
+            .get_or_init(|| Box::new(DatabaseMulti::open(self.meta.path_parts().join(storeindex.to_string())).unwrap()))
+    }
+
+    fn get_or_init_mut_store(&mut self, key: &K) -> &mut DatabaseMulti<K, V> {
+        self.get_or_init_store(key);
+
+        self.parts
+            .get_mut(key.as_ne_six_bits() as usize)
+            .unwrap()
+            .get_mut()
+            .unwrap()
+    }
+
+    #[allow(unused)]
+    pub fn open_all(&self) {
+        (0..=(u8::MAX) as usize).for_each(|storeindex| {
+            self.get_or_init_store_(storeindex);
+        });
+    }
+
+    pub fn get(&self, key: &K) -> Result<Option<&V>, snkrj::Error> {
+        self.get_or_init_store(key).get(key)
+    }
+
+    pub fn insert(&mut self, key: K, value: V) -> Option<V> {
+        self.meta.len += 1;
+        self.get_or_init_mut_store(&key).insert(key, value)
+    }
+
+    pub fn insert_if_needed(&mut self, key: K, value: V, height: Height) {
+        if self.meta.needs(height) {
+            self.insert(key, value);
+        }
+    }
+
+    pub fn export(self, height: Height) -> Result<(), snkrj::Error> {
+        if self.has(height) {
+            return Ok(());
+        }
+
+        self.meta.export(height)?;
+
+        self.parts.into_par_iter().try_for_each(|s| {
+            if let Some(db) = s.into_inner() {
+                db.export()
+            } else {
+                Ok(())
+            }
+        })
+    }
+
+    pub fn height(&self) -> Option<&Height> {
+        self.meta.height()
+    }
+    pub fn needs(&self, height: Height) -> bool {
+        self.meta.needs(height)
+    }
+    pub fn has(&self, height: Height) -> bool {
+        self.meta.has(height)
+    }
+}
diff --git a/bindex/src/storage/stores/unique.rs b/bindex/src/storage/stores/unique.rs
new file mode 100644
index 000000000..ff4864181
--- /dev/null
+++ b/bindex/src/storage/stores/unique.rs
@@ -0,0 +1,102 @@
+use std::{array, path::Path, sync::OnceLock};
+
+use rayon::prelude::*;
+use snkrj::{DatabaseKey, DatabaseUnique, DatabaseValue};
+
+use super::{Height, StoreMeta, Version};
+
+pub struct StoreUnique<K, V>
+where
+    K: DatabaseKey,
+    V: DatabaseValue,
+{
+    meta: StoreMeta,
+    pub parts: [OnceLock<Box<DatabaseUnique<K, V>>>; 64],
+}
+
+impl<K, V> StoreUnique<K, V>
+where
+    K: DatabaseKey,
+    V: DatabaseValue,
+{
+    pub fn open(path: &Path, version: Version) -> Result<Self, snkrj::Error> {
+        let meta = StoreMeta::checked_open(path, version)?;
+
+        Ok(Self {
+            meta,
+            parts: array::from_fn(|_| OnceLock::new()),
+        })
+    }
+
+    // pub fn len(&self) -> usize {
+    //     self.meta.len()
+    // }
+
+    fn get_or_init_store(&self, key: &K) -> &DatabaseUnique<K, V> {
+        self.get_or_init_store_(key.as_ne_six_bits() as usize)
+    }
+
+    fn get_or_init_store_(&self, storeindex: usize) -> &DatabaseUnique<K, V> {
+        self.parts[storeindex].get_or_init(|| {
+            Box::new(DatabaseUnique::open(self.meta.path_parts().join(storeindex.to_string())).unwrap())
+        })
+    }
+
+    fn get_or_init_mut_store(&mut self, key: &K) -> &mut DatabaseUnique<K, V> {
+        self.get_or_init_store(key);
+
+        self.parts
+            .get_mut(key.as_ne_six_bits() as usize)
+            .unwrap()
+            .get_mut()
+            .unwrap()
+    }
+
+    #[allow(unused)]
+    pub fn open_all(&self) {
+        (0..=(u8::MAX) as usize).for_each(|storeindex| {
+            self.get_or_init_store_(storeindex);
+        });
+    }
+
+    pub fn get(&self, key: &K) -> Result<Option<&V>, snkrj::Error> {
+        self.get_or_init_store(key).get(key)
+    }
+
+    pub fn insert(&mut self, key: K, value: V) -> Option<V> {
+        self.meta.len += 1;
+        self.get_or_init_mut_store(&key).insert(key, value)
+    }
+
+    pub fn insert_if_needed(&mut self, key: K, value: V, height: Height) {
+        if self.meta.needs(height) {
+            self.insert(key, value);
+        }
+    }
+
+    pub fn export(self, height: Height) -> Result<(), snkrj::Error> {
+        if self.has(height) {
+            return Ok(());
+        }
+
+        self.meta.export(height)?;
+
+        self.parts.into_par_iter().try_for_each(|s| {
+            if let Some(db) = s.into_inner() {
+                db.export()
+            } else {
+                Ok(())
+            }
+        })
+    }
+
+    pub fn height(&self) -> Option<&Height> {
+        self.meta.height()
+    }
+    pub fn needs(&self, height: Height) -> bool {
+        self.meta.needs(height)
+    }
+    pub fn has(&self, height: Height) -> bool {
+        self.meta.has(height)
+    }
+}
diff --git a/bindex/src/structs/vec.rs b/bindex/src/storage/vecs/base.rs
similarity index 69%
rename from bindex/src/structs/vec.rs
rename to bindex/src/storage/vecs/base.rs
index c78d93d97..834bfc435 100644
--- a/bindex/src/structs/vec.rs
+++ b/bindex/src/storage/vecs/base.rs
@@ -8,6 +8,7 @@ use std::{
 use super::{Height, Version};
 
 pub struct StorableVec<I, T> {
+    height: Option<Height>,
     pathbuf: PathBuf,
     version: Version,
     vec: storable_vec::StorableVec<I, T>,
@@ -22,41 +23,48 @@ where
         fs::create_dir_all(path)?;
 
         let pathbuf = path.to_owned();
-        let path_vec = Self::_path_vec(path);
-        let path_version = Self::_path_version(path);
+        let path_vec = Self::path_vec_(path);
+        let path_version = Self::path_version_(path);
 
         let is_same_version =
             Version::try_from(path_version.as_path()).is_ok_and(|prev_version| version == prev_version);
         if !is_same_version {
             let _ = fs::remove_file(&path_vec);
             let _ = fs::remove_file(&path_version);
-            let _ = fs::remove_file(Self::_path_height(path));
+            let _ = fs::remove_file(Self::path_height_(path));
         }
 
-        Ok(Self {
+        let this = Self {
+            height: Height::try_from(Self::path_height_(path).as_path()).ok(),
             pathbuf,
             version,
             vec: storable_vec::StorableVec::import(&path_vec)?,
-        })
+        };
+
+        this.version.write(&this.path_version())?;
+
+        Ok(this)
     }
 
     pub fn flush(&mut self, height: Height) -> io::Result<()> {
-        height.write(&self.path_height())?;
-        self.version.write(&self.path_version())?;
+        if self.needs(height) {
+            height.write(&self.path_height())?;
+        }
+
         self.vec.flush()
     }
 
     // fn path_vec(&self) -> PathBuf {
     //     Self::_path_vec(&self.path)
     // }
-    fn _path_vec(path: &Path) -> PathBuf {
+    fn path_vec_(path: &Path) -> PathBuf {
         path.join("vec")
     }
 
     fn path_version(&self) -> PathBuf {
-        Self::_path_version(&self.pathbuf)
+        Self::path_version_(&self.pathbuf)
     }
-    fn _path_version(path: &Path) -> PathBuf {
+    fn path_version_(path: &Path) -> PathBuf {
         path.join("version")
     }
 
@@ -64,15 +72,18 @@ where
         Height::try_from(self.path_height().as_path())
     }
     fn path_height(&self) -> PathBuf {
-        Self::_path_height(&self.pathbuf)
+        Self::path_height_(&self.pathbuf)
     }
-    fn _path_height(path: &Path) -> PathBuf {
+    fn path_height_(path: &Path) -> PathBuf {
         path.join("height")
     }
 
-    // pub fn needs(&self, height: Height) -> bool {
-    //     self.height() // store height in struct
-    // }
+    pub fn needs(&self, height: Height) -> bool {
+        self.height.is_none_or(|self_height| height > self_height)
+    }
+    pub fn has(&self, height: Height) -> bool {
+        !self.needs(height)
+    }
 }
 
 impl<I, T> Deref for StorableVec<I, T> {
diff --git a/bindex/src/structs/vecs.rs b/bindex/src/storage/vecs/mod.rs
similarity index 70%
rename from bindex/src/structs/vecs.rs
rename to bindex/src/storage/vecs/mod.rs
index 59e6ebcc7..05ff6b180 100644
--- a/bindex/src/structs/vecs.rs
+++ b/bindex/src/storage/vecs/mod.rs
@@ -1,38 +1,44 @@
 use std::{fs, io, path::Path};
 
-use biter::bitcoin::{transaction, BlockHash, Txid};
+use biter::bitcoin::{self, transaction, BlockHash, Txid, Weight};
 use color_eyre::eyre::eyre;
+use exit::Exit;
 use rayon::prelude::*;
 use storable_vec::AnyStorableVec;
 
-use super::{
-    Addressbytes, Addressindex, Addresstype, Addresstypeindex, Amount, AnyBindexVec, Date, Exit, Height,
-    P2PK33AddressBytes, P2PK65AddressBytes, P2PKHAddressBytes, P2SHAddressBytes, P2TRAddressBytes, P2WPKHAddressBytes,
-    P2WSHAddressBytes, StorableVec, Timestamp, Txindex, Txoutindex, Version,
+use crate::structs::{
+    Addressbytes, Addressindex, Addresstype, Addresstypeindex, Amount, Height, P2PK33AddressBytes, P2PK65AddressBytes,
+    P2PKHAddressBytes, P2SHAddressBytes, P2TRAddressBytes, P2WPKHAddressBytes, P2WSHAddressBytes, Timestamp, Txindex,
+    Txoutindex, Version,
 };
 
+mod base;
+
+use base::*;
+
 pub struct Vecs {
     pub addressindex_to_addresstype: StorableVec<Addressindex, Addresstype>,
     pub addressindex_to_addresstypeindex: StorableVec<Addressindex, Addresstypeindex>,
+    pub addressindex_to_height: StorableVec<Addressindex, Height>,
     pub height_to_blockhash: StorableVec<Height, BlockHash>,
-    pub height_to_date: StorableVec<Height, Date>,
-    pub height_to_totalfees: StorableVec<Height, Amount>,
     pub height_to_first_addressindex: StorableVec<Height, Addressindex>,
+    pub height_to_first_emptyindex: StorableVec<Height, Addresstypeindex>,
+    pub height_to_first_multisigindex: StorableVec<Height, Addresstypeindex>,
+    pub height_to_first_opreturnindex: StorableVec<Height, Addresstypeindex>,
+    pub height_to_first_pushonlyindex: StorableVec<Height, Addresstypeindex>,
     pub height_to_first_txindex: StorableVec<Height, Txindex>,
     pub height_to_first_txoutindex: StorableVec<Height, Txoutindex>,
-    pub height_to_inputcount: StorableVec<Txindex, u32>,
-    pub height_to_last_addressindex: StorableVec<Height, Addressindex>,
-    pub height_to_last_txindex: StorableVec<Height, Txindex>,
-    pub height_to_last_txoutindex: StorableVec<Height, Txoutindex>,
-    pub height_to_outputcount: StorableVec<Txindex, u32>,
+    pub height_to_first_unknownindex: StorableVec<Height, Addresstypeindex>,
+    pub height_to_p2pk33index: StorableVec<Height, Addresstypeindex>,
+    pub height_to_p2pk65index: StorableVec<Height, Addresstypeindex>,
+    pub height_to_p2pkhindex: StorableVec<Height, Addresstypeindex>,
+    pub height_to_p2shindex: StorableVec<Height, Addresstypeindex>,
+    pub height_to_p2trindex: StorableVec<Height, Addresstypeindex>,
+    pub height_to_p2wpkhindex: StorableVec<Height, Addresstypeindex>,
+    pub height_to_p2wshindex: StorableVec<Height, Addresstypeindex>,
+    pub height_to_size: StorableVec<Height, usize>,
     pub height_to_timestamp: StorableVec<Height, Timestamp>,
-    pub height_to_txcount: StorableVec<Txindex, u32>,
-    // pub height_to_size: StorableVec<Txindex, u32>,
-    // pub height_to_weight: StorableVec<Txindex, u32>,
-    // pub height_to_subsidy: StorableVec<Txindex, u32>,
-    // pub height_to_minfeerate: StorableVec<Txindex, u32>,
-    // pub height_to_maxfeerate: StorableVec<Txindex, u32>,
-    // pub height_to_medianfeerate: StorableVec<Txindex, u32>,
+    pub height_to_weight: StorableVec<Height, Weight>,
     pub p2pk33index_to_p2pk33addressbytes: StorableVec<Addresstypeindex, P2PK33AddressBytes>,
     pub p2pk65index_to_p2pk65addressbytes: StorableVec<Addresstypeindex, P2PK65AddressBytes>,
     pub p2pkhindex_to_p2pkhaddressbytes: StorableVec<Addresstypeindex, P2PKHAddressBytes>,
@@ -40,15 +46,30 @@ pub struct Vecs {
     pub p2trindex_to_p2traddressbytes: StorableVec<Addresstypeindex, P2TRAddressBytes>,
     pub p2wpkhindex_to_p2wpkhaddressbytes: StorableVec<Addresstypeindex, P2WPKHAddressBytes>,
     pub p2wshindex_to_p2wshaddressbytes: StorableVec<Addresstypeindex, P2WSHAddressBytes>,
-    pub txindex_to_fee: StorableVec<Txindex, Amount>,
-    // pub txindex_to_feerate: StorableVec<Txindex, Feerate>,
+    pub txindex_to_first_txoutindex: StorableVec<Txindex, Txoutindex>,
     pub txindex_to_height: StorableVec<Txindex, Height>,
-    pub txindex_to_inputcount: StorableVec<Txindex, u32>,
-    pub txindex_to_outputcount: StorableVec<Txindex, u32>,
+    pub txindex_to_locktime: StorableVec<Txindex, bitcoin::absolute::LockTime>,
     pub txindex_to_txid: StorableVec<Txindex, Txid>,
     pub txindex_to_txversion: StorableVec<Txindex, transaction::Version>,
     pub txoutindex_to_addressindex: StorableVec<Txoutindex, Addressindex>,
     pub txoutindex_to_amount: StorableVec<Txoutindex, Amount>,
+    // Can be computed later:
+    // pub height_to_date: StorableVec<Height, Date>,
+    // pub height_to_totalfees: StorableVec<Height, Amount>,
+    // pub height_to_inputcount: StorableVec<Txindex, u32>,
+    // pub height_to_last_addressindex: StorableVec<Height, Addressindex>,
+    // pub height_to_last_txindex: StorableVec<Height, Txindex>,
+    // pub height_to_last_txoutindex: StorableVec<Height, Txoutindex>,
+    // pub height_to_outputcount: StorableVec<Txindex, u32>,
+    // pub height_to_txcount: StorableVec<Txindex, u32>,
+    // pub height_to_subsidy: StorableVec<Txindex, u32>,
+    // pub height_to_minfeerate: StorableVec<Txindex, Feerate>,
+    // pub height_to_maxfeerate: StorableVec<Txindex, Feerate>,
+    // pub height_to_medianfeerate: StorableVec<Txindex, Feerate>,
+    // pub txindex_to_feerate: StorableVec<Txindex, Feerate>,
+    // pub txindex_to_inputcount: StorableVec<Txindex, u32>,
+    // pub txindex_to_outputcount: StorableVec<Txindex, u32>,
+    // pub txindex_to_last_txoutindex: StorableVec<Txindex, Txoutindex>,
 }
 
 // const UNSAFE_BLOCKS: usize = 100;
@@ -66,28 +87,47 @@ impl Vecs {
                 &path.join("addressindex_to_addresstypeindex"),
                 Version::from(1),
             )?,
+            addressindex_to_height: StorableVec::import(&path.join("addressindex_to_height"), Version::from(1))?,
             height_to_blockhash: StorableVec::import(&path.join("height_to_blockhash"), Version::from(1))?,
-            height_to_date: StorableVec::import(&path.join("height_to_date"), Version::from(1))?,
             height_to_first_addressindex: StorableVec::import(
                 &path.join("height_to_first_addressindex"),
                 Version::from(1),
             )?,
+            height_to_first_emptyindex: StorableVec::import(
+                &path.join("height_to_first_emptyindex"),
+                Version::from(1),
+            )?,
+            height_to_first_multisigindex: StorableVec::import(
+                &path.join("height_to_first_multisigindex"),
+                Version::from(1),
+            )?,
+            height_to_first_opreturnindex: StorableVec::import(
+                &path.join("height_to_first_opreturnindex"),
+                Version::from(1),
+            )?,
+            height_to_first_pushonlyindex: StorableVec::import(
+                &path.join("height_to_first_pushonlyindex"),
+                Version::from(1),
+            )?,
             height_to_first_txindex: StorableVec::import(&path.join("height_to_first_txindex"), Version::from(1))?,
             height_to_first_txoutindex: StorableVec::import(
                 &path.join("height_to_first_txoutindex"),
                 Version::from(1),
             )?,
-            height_to_inputcount: StorableVec::import(&path.join("height_to_inputcount"), Version::from(1))?,
-            height_to_last_addressindex: StorableVec::import(
-                &path.join("height_to_last_addressindex"),
+            height_to_first_unknownindex: StorableVec::import(
+                &path.join("height_to_first_unkownindex"),
                 Version::from(1),
             )?,
-            height_to_last_txindex: StorableVec::import(&path.join("height_to_last_txindex"), Version::from(1))?,
-            height_to_last_txoutindex: StorableVec::import(&path.join("height_to_last_txoutindex"), Version::from(1))?,
-            height_to_outputcount: StorableVec::import(&path.join("height_to_outputcount"), Version::from(1))?,
+            height_to_p2pk33index: StorableVec::import(&path.join("height_to_p2pk33index"), Version::from(1))?,
+            height_to_p2pk65index: StorableVec::import(&path.join("height_to_p2pk65index"), Version::from(1))?,
+            height_to_p2pkhindex: StorableVec::import(&path.join("height_to_p2pkhindex"), Version::from(1))?,
+            height_to_p2shindex: StorableVec::import(&path.join("height_to_p2shindex"), Version::from(1))?,
+            height_to_p2trindex: StorableVec::import(&path.join("height_to_p2trindex"), Version::from(1))?,
+            height_to_p2wpkhindex: StorableVec::import(&path.join("height_to_p2wpkhindex"), Version::from(1))?,
+            height_to_p2wshindex: StorableVec::import(&path.join("height_to_p2wshindex"), Version::from(1))?,
+            height_to_size: StorableVec::import(&path.join("height_to_size"), Version::from(1))?,
             height_to_timestamp: StorableVec::import(&path.join("height_to_timestamp"), Version::from(1))?,
-            height_to_totalfees: StorableVec::import(&path.join("height_to_totalfees"), Version::from(1))?,
-            height_to_txcount: StorableVec::import(&path.join("height_to_txcount"), Version::from(1))?,
+            height_to_weight: StorableVec::import(&path.join("height_to_weight"), Version::from(1))?,
             p2pk33index_to_p2pk33addressbytes: StorableVec::import(
                 &path.join("p2pk33index_to_p2pk33addressbytes"),
                 Version::from(1),
@@ -116,10 +156,12 @@ impl Vecs {
                 &path.join("p2wshindex_to_p2wshaddressbytes"),
                 Version::from(1),
             )?,
-            txindex_to_fee: StorableVec::import(&path.join("txindex_to_fee"), Version::from(1))?,
+            txindex_to_first_txoutindex: StorableVec::import(
+                &path.join("txindex_to_first_txoutindex"),
+                Version::from(1),
+            )?,
             txindex_to_height: StorableVec::import(&path.join("txindex_to_height"), Version::from(1))?,
-            txindex_to_inputcount: StorableVec::import(&path.join("txindex_to_inputcount"), Version::from(1))?,
-            txindex_to_outputcount: StorableVec::import(&path.join("txindex_to_outputcount"), Version::from(1))?,
+            txindex_to_locktime: StorableVec::import(&path.join("txindex_to_locktime"), Version::from(1))?,
             txindex_to_txid: StorableVec::import(&path.join("txindex_to_txid"), Version::from(1))?,
             txindex_to_txversion: StorableVec::import(&path.join("txindex_to_txversion"), Version::from(1))?,
             txoutindex_to_addressindex: StorableVec::import(
@@ -130,19 +172,6 @@ impl Vecs {
         })
     }
 
-    pub fn addresstype_to_addressbytes(&self, addresstype: Addresstype) -> color_eyre::Result<&dyn AnyStorableVec> {
-        match addresstype {
-            Addresstype::P2PK65 => Ok(&*self.p2pk65index_to_p2pk65addressbytes),
-            Addresstype::P2PK33 => Ok(&*self.p2pk33index_to_p2pk33addressbytes),
-            Addresstype::P2PKH => Ok(&*self.p2pkhindex_to_p2pkhaddressbytes),
-            Addresstype::P2SH => Ok(&*self.p2shindex_to_p2shaddressbytes),
-            Addresstype::P2WPKH => Ok(&*self.p2wpkhindex_to_p2wpkhaddressbytes),
-            Addresstype::P2WSH => Ok(&*self.p2wshindex_to_p2wshaddressbytes),
-            Addresstype::P2TR => Ok(&*self.p2trindex_to_p2traddressbytes),
-            _ => Err(eyre!("wrong address type")),
-        }
-    }
-
     pub fn push_addressbytes_if_needed(
         &mut self,
         index: Addresstypeindex,
@@ -332,23 +361,30 @@ impl Vecs {
             .min())
     }
 
-    pub fn as_slice(&self) -> [&dyn AnyBindexVec; 30] {
+    pub fn as_slice(&self) -> [&dyn AnyBindexVec; 36] {
         [
             &self.addressindex_to_addresstype as &dyn AnyBindexVec,
             &self.addressindex_to_addresstypeindex,
+            &self.addressindex_to_height,
             &self.height_to_blockhash,
-            &self.height_to_date,
-            &self.height_to_totalfees,
             &self.height_to_first_addressindex,
+            &self.height_to_first_emptyindex,
+            &self.height_to_first_multisigindex,
+            &self.height_to_first_opreturnindex,
+            &self.height_to_first_pushonlyindex,
             &self.height_to_first_txindex,
             &self.height_to_first_txoutindex,
-            &self.height_to_inputcount,
-            &self.height_to_last_addressindex,
-            &self.height_to_last_txindex,
-            &self.height_to_last_txoutindex,
-            &self.height_to_outputcount,
+            &self.height_to_first_unknownindex,
+            &self.height_to_p2pk33index,
+            &self.height_to_p2pk65index,
+            &self.height_to_p2pkhindex,
+            &self.height_to_p2shindex,
+            &self.height_to_p2trindex,
+            &self.height_to_p2wpkhindex,
+            &self.height_to_p2wshindex,
+            &self.height_to_size,
             &self.height_to_timestamp,
-            &self.height_to_txcount,
+            &self.height_to_weight,
             &self.p2pk33index_to_p2pk33addressbytes,
             &self.p2pk65index_to_p2pk65addressbytes,
             &self.p2pkhindex_to_p2pkhaddressbytes,
@@ -356,10 +392,9 @@ impl Vecs {
             &self.p2trindex_to_p2traddressbytes,
             &self.p2wpkhindex_to_p2wpkhaddressbytes,
             &self.p2wshindex_to_p2wshaddressbytes,
-            &self.txindex_to_fee,
+            &self.txindex_to_first_txoutindex,
             &self.txindex_to_height,
-            &self.txindex_to_inputcount,
-            &self.txindex_to_outputcount,
+            &self.txindex_to_locktime,
             &self.txindex_to_txid,
             &self.txindex_to_txversion,
             &self.txoutindex_to_addressindex,
@@ -367,23 +402,30 @@ impl Vecs {
         ]
     }
 
-    pub fn as_mut_slice(&mut self) -> [&mut (dyn AnyBindexVec + Send + Sync); 30] {
+    pub fn as_mut_slice(&mut self) -> [&mut (dyn AnyBindexVec + Send + Sync); 36] {
         [
             &mut self.addressindex_to_addresstype as &mut (dyn AnyBindexVec + Send + Sync),
             &mut self.addressindex_to_addresstypeindex,
+            &mut self.addressindex_to_height,
             &mut self.height_to_blockhash,
-            &mut self.height_to_date,
-            &mut self.height_to_totalfees, // <-
             &mut self.height_to_first_addressindex,
+            &mut self.height_to_first_emptyindex,
+            &mut self.height_to_first_multisigindex,
+            &mut self.height_to_first_opreturnindex,
+            &mut self.height_to_first_pushonlyindex,
             &mut self.height_to_first_txindex,
             &mut self.height_to_first_txoutindex,
-            &mut self.height_to_inputcount, // <-
-            &mut self.height_to_last_addressindex,
-            &mut self.height_to_last_txindex,
-            &mut self.height_to_last_txoutindex,
-            &mut self.height_to_outputcount, // <-
+            &mut self.height_to_first_unknownindex,
+            &mut self.height_to_p2pk33index,
+            &mut self.height_to_p2pk65index,
+            &mut self.height_to_p2pkhindex,
+            &mut self.height_to_p2shindex,
+            &mut self.height_to_p2trindex,
+            &mut self.height_to_p2wpkhindex,
+            &mut self.height_to_p2wshindex,
+            &mut self.height_to_size,
             &mut self.height_to_timestamp,
-            &mut self.height_to_txcount, // <-
+            &mut self.height_to_weight,
             &mut self.p2pk33index_to_p2pk33addressbytes,
             &mut self.p2pk65index_to_p2pk65addressbytes,
             &mut self.p2pkhindex_to_p2pkhaddressbytes,
@@ -391,10 +433,9 @@ impl Vecs {
             &mut self.p2trindex_to_p2traddressbytes,
             &mut self.p2wpkhindex_to_p2wpkhaddressbytes,
             &mut self.p2wshindex_to_p2wshaddressbytes,
-            &mut self.txindex_to_fee, // <-
+            &mut self.txindex_to_first_txoutindex,
             &mut self.txindex_to_height,
-            &mut self.txindex_to_inputcount,  // <-
-            &mut self.txindex_to_outputcount, // <-
+            &mut self.txindex_to_locktime,
             &mut self.txindex_to_txid,
             &mut self.txindex_to_txversion,
             &mut self.txoutindex_to_addressindex,
diff --git a/bindex/src/structs/addresstypeindex.rs b/bindex/src/structs/addresstypeindex.rs
index a2ca0e5de..5b126b31d 100644
--- a/bindex/src/structs/addresstypeindex.rs
+++ b/bindex/src/structs/addresstypeindex.rs
@@ -17,6 +17,12 @@ impl Addresstypeindex {
     pub fn incremented(self) -> Self {
         Self(*self + 1)
     }
+
+    pub fn clone_then_increment(&mut self) -> Self {
+        let i = *self;
+        self.increment();
+        i
+    }
 }
 
 impl From<u32> for Addresstypeindex {
diff --git a/bindex/src/structs/height.rs b/bindex/src/structs/height.rs
index b3df4bc15..1fdb478c3 100644
--- a/bindex/src/structs/height.rs
+++ b/bindex/src/structs/height.rs
@@ -4,7 +4,7 @@ use std::{
     path::Path,
 };
 
-use biter::bitcoincore_rpc::{self, RpcApi};
+use biter::rpc::{self, RpcApi};
 use derive_deref::{Deref, DerefMut};
 use snkrj::{direct_repr, Storable, UnsizedStorable};
 use storable_vec::UnsafeSizedSerDe;
@@ -113,9 +113,9 @@ impl TryFrom<&Path> for Height {
     }
 }
 
-impl TryFrom<&bitcoincore_rpc::Client> for Height {
-    type Error = bitcoincore_rpc::Error;
-    fn try_from(value: &bitcoincore_rpc::Client) -> Result<Self, Self::Error> {
+impl TryFrom<&rpc::Client> for Height {
+    type Error = rpc::Error;
+    fn try_from(value: &rpc::Client) -> Result<Self, Self::Error> {
         Ok((value.get_blockchain_info()?.blocks as usize - 1).into())
     }
 }
diff --git a/bindex/src/structs/mod.rs b/bindex/src/structs/mod.rs
index 0c0a84e02..44e08c7c1 100644
--- a/bindex/src/structs/mod.rs
+++ b/bindex/src/structs/mod.rs
@@ -1,41 +1,27 @@
 mod addressbytes;
 mod addressindex;
-mod addressindextxoutindex;
 mod addresstype;
 mod addresstypeindex;
 mod amount;
-mod date;
-mod exit;
 mod height;
 mod prefix;
 mod slice;
-mod store;
-mod stores;
 mod timestamp;
 mod txindex;
-mod txindexvout;
 mod txoutindex;
-mod vec;
-mod vecs;
 mod version;
+mod vout;
 
 pub use addressbytes::*;
 pub use addressindex::*;
-pub use addressindextxoutindex::*;
 pub use addresstype::*;
 pub use addresstypeindex::*;
 pub use amount::*;
-pub use date::*;
-pub use exit::*;
 pub use height::*;
 pub use prefix::*;
 pub use slice::*;
-pub use store::*;
-pub use stores::*;
 pub use timestamp::*;
 pub use txindex::*;
-pub use txindexvout::*;
 pub use txoutindex::*;
-pub use vec::*;
-pub use vecs::*;
 pub use version::*;
+pub use vout::*;
diff --git a/bindex/src/structs/store.rs b/bindex/src/structs/store.rs
deleted file mode 100644
index eefd70b2e..000000000
--- a/bindex/src/structs/store.rs
+++ /dev/null
@@ -1,153 +0,0 @@
-use std::{
-    array, fs,
-    path::{Path, PathBuf},
-    sync::OnceLock,
-};
-
-use rayon::prelude::*;
-use snkrj::{Database, DatabaseKey, DatabaseValue, UnitDatabase};
-use storable_vec::UnsafeSizedSerDe;
-
-use super::{Height, Version};
-
-pub struct Store<K, V>
-where
-    K: DatabaseKey,
-    V: DatabaseValue,
-{
-    pathbuf: PathBuf,
-    version: Version,
-    height: Option<Height>,
-    len: usize,
-    pub parts: [OnceLock<Box<Database<K, V>>>; 256],
-}
-
-impl<K, V> Store<K, V>
-where
-    K: DatabaseKey,
-    V: DatabaseValue,
-{
-    pub fn open(path: &Path, version: Version) -> Result<Self, snkrj::Error> {
-        fs::create_dir_all(path)?;
-
-        let is_same_version =
-            Version::try_from(Self::path_version_(path).as_path()).is_ok_and(|prev_version| version == prev_version);
-
-        if !is_same_version {
-            fs::remove_dir(path)?;
-            fs::create_dir_all(path)?;
-        }
-
-        let height = Height::try_from(Self::path_height_(path).as_path()).ok();
-
-        Ok(Self {
-            pathbuf: path.to_owned(),
-            version,
-            height,
-            len: UnitDatabase::read_length_(path),
-            parts: array::from_fn(|_| OnceLock::new()),
-        })
-    }
-
-    #[allow(unused)]
-    pub fn len(&self) -> usize {
-        self.len
-    }
-
-    fn key_to_byte(key: &K) -> u8 {
-        let slice = key.unsafe_as_slice();
-
-        *(if cfg!(target_endian = "big") {
-            slice.last()
-        } else {
-            slice.first()
-        })
-        .unwrap()
-    }
-
-    fn get_or_init_store(&self, key: &K) -> &Database<K, V> {
-        self.get_or_init_store_(Self::key_to_byte(key) as usize)
-    }
-
-    fn get_or_init_store_(&self, storeindex: usize) -> &Database<K, V> {
-        self.parts[storeindex]
-            .get_or_init(|| Box::new(Database::open(self.path_parts().join(storeindex.to_string())).unwrap()))
-    }
-
-    fn get_or_init_mut_store(&mut self, key: &K) -> &mut Database<K, V> {
-        self.get_or_init_store(key);
-
-        self.parts
-            .get_mut(Self::key_to_byte(key) as usize)
-            .unwrap()
-            .get_mut()
-            .unwrap()
-    }
-
-    #[allow(unused)]
-    pub fn open_all(&self) {
-        (0..=(u8::MAX) as usize).for_each(|storeindex| {
-            self.get_or_init_store_(storeindex);
-        });
-    }
-
-    pub fn get(&self, key: &K) -> Option<&V> {
-        self.get_or_init_store(key).get(key)
-    }
-
-    pub fn insert(&mut self, key: K, value: V) -> Option<V> {
-        self.len += 1;
-        self.get_or_init_mut_store(&key).insert(key, value)
-    }
-
-    pub fn insert_if_needed(&mut self, key: K, value: V, height: Height) {
-        if self.needs(height) {
-            self.insert(key, value);
-        }
-    }
-
-    pub fn export(mut self, height: Height) -> Result<(), snkrj::Error> {
-        if self.height.is_some_and(|self_height| self_height >= height) {
-            return Ok(());
-        }
-
-        self.height = Some(height);
-        self.version.write(&self.path_version())?;
-        height.write(&self.path_height())?;
-        UnitDatabase::write_length_(&self.pathbuf, self.len)?;
-        self.parts.into_par_iter().try_for_each(|s| {
-            if let Some(db) = s.into_inner() {
-                db.export()
-            } else {
-                Ok(())
-            }
-        })
-    }
-
-    fn path_parts(&self) -> PathBuf {
-        Self::path_parts_(&self.pathbuf)
-    }
-    fn path_parts_(path: &Path) -> PathBuf {
-        path.join("parts")
-    }
-
-    fn path_version(&self) -> PathBuf {
-        Self::path_version_(&self.pathbuf)
-    }
-    fn path_version_(path: &Path) -> PathBuf {
-        path.join("version")
-    }
-
-    pub fn height(&self) -> Option<&Height> {
-        self.height.as_ref()
-    }
-    pub fn needs(&self, height: Height) -> bool {
-        self.height.is_none_or(|self_height| height > self_height)
-    }
-    fn path_height(&self) -> PathBuf {
-        Self::path_height_(&self.pathbuf)
-    }
-    fn path_height_(path: &Path) -> PathBuf {
-        path.join("height")
-    }
-}
diff --git a/bindex/src/structs/txoutindex.rs b/bindex/src/structs/txoutindex.rs
index 6424bf70a..f0dfba968 100644
--- a/bindex/src/structs/txoutindex.rs
+++ b/bindex/src/structs/txoutindex.rs
@@ -3,6 +3,8 @@ use std::ops::{Add, AddAssign};
 use derive_deref::{Deref, DerefMut};
 use snkrj::{direct_repr, Storable, UnsizedStorable};
 
+use super::Vout;
+
 #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Deref, DerefMut, Default)]
 pub struct Txoutindex(u64);
 direct_repr!(Txoutindex);
@@ -24,6 +26,13 @@ impl Add<Txoutindex> for Txoutindex {
     }
 }
 
+impl Add<Vout> for Txoutindex {
+    type Output = Self;
+    fn add(self, rhs: Vout) -> Self::Output {
+        Self(self.0 + u64::from(rhs))
+    }
+}
+
 impl AddAssign<Txoutindex> for Txoutindex {
     fn add_assign(&mut self, rhs: Txoutindex) {
         self.0 += rhs.0
diff --git a/bindex/src/structs/vout.rs b/bindex/src/structs/vout.rs
new file mode 100644
index 000000000..a5f267823
--- /dev/null
+++ b/bindex/src/structs/vout.rs
@@ -0,0 +1,30 @@
+use derive_deref::Deref;
+
+#[derive(Debug, Deref, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
+pub struct Vout(u32);
+
+impl Vout {
+    const ZERO: Self = Vout(0_u32);
+
+    pub fn is_zero(&self) -> bool {
+        *self == Self::ZERO
+    }
+}
+
+impl From<u32> for Vout {
+    fn from(value: u32) -> Self {
+        Self(value)
+    }
+}
+
+impl From<usize> for Vout {
+    fn from(value: usize) -> Self {
+        Self(value as u32)
+    }
+}
+
+impl From<Vout> for u64 {
+    fn from(value: Vout) -> Self {
+        value.0 as u64
+    }
+}
diff --git a/biter/src/lib.rs b/biter/src/lib.rs
index c554537cc..03afdfebb 100644
--- a/biter/src/lib.rs
+++ b/biter/src/lib.rs
@@ -18,7 +18,7 @@ use crossbeam::channel::{bounded, Receiver};
 use rayon::prelude::*;
 
 pub use bitcoin;
-pub use bitcoincore_rpc;
+pub use bitcoincore_rpc as rpc;
 
 mod blk_index_to_blk_path;
 mod blk_index_to_blk_recap;
diff --git a/bomputer/Cargo.toml b/bomputer/Cargo.toml
new file mode 100644
index 000000000..ad1754861
--- /dev/null
+++ b/bomputer/Cargo.toml
@@ -0,0 +1,6 @@
+[package]
+name = "bomputer"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
diff --git a/bomputer/src/lib.rs b/bomputer/src/lib.rs
new file mode 100644
index 000000000..00a8d195b
--- /dev/null
+++ b/bomputer/src/lib.rs
@@ -0,0 +1,18 @@
+mod structs;
+
+use structs::*;
+
+pub fn add(left: u64, right: u64) -> u64 {
+    left + right
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn it_works() {
+        let result = add(2, 2);
+        assert_eq!(result, 4);
+    }
+}
diff --git a/bindex/src/structs/date.rs b/bomputer/src/structs/date.rs
similarity index 70%
rename from bindex/src/structs/date.rs
rename to bomputer/src/structs/date.rs
index ae3a76ff5..207c88d3d 100644
--- a/bindex/src/structs/date.rs
+++ b/bomputer/src/structs/date.rs
@@ -10,3 +10,10 @@ impl From<&Timestamp> for Date {
         Self(jiff::civil::Date::from(value.to_zoned(TimeZone::UTC)))
     }
 }
+
+impl From<Date> for usize {
+    // 2009-01-03 => 0
+    // 2009-01-09 => 1
+    // 2009-01-10 => 2
+    // ...
+}
diff --git a/bomputer/src/structs/feerate.rs b/bomputer/src/structs/feerate.rs
new file mode 100644
index 000000000..52ed2fad9
--- /dev/null
+++ b/bomputer/src/structs/feerate.rs
@@ -0,0 +1,4 @@
+use derive_deref::Deref;
+
+#[derive(Debug, Deref, Clone, Copy)]
+pub struct Feerate(f32);
diff --git a/bomputer/src/structs/mod.rs b/bomputer/src/structs/mod.rs
new file mode 100644
index 000000000..9d48ff76d
--- /dev/null
+++ b/bomputer/src/structs/mod.rs
@@ -0,0 +1,5 @@
+mod date;
+mod feerate;
+
+pub use date::*;
+pub use feerate::*;
diff --git a/exit/Cargo.toml b/exit/Cargo.toml
new file mode 100644
index 000000000..9a58fb4bb
--- /dev/null
+++ b/exit/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "exit"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+ctrlc = "3.4.5"
diff --git a/bindex/src/structs/exit.rs b/exit/src/lib.rs
similarity index 100%
rename from bindex/src/structs/exit.rs
rename to exit/src/lib.rs
diff --git a/snkrj/src/base.rs b/snkrj/src/base.rs
new file mode 100644
index 000000000..113ffe77a
--- /dev/null
+++ b/snkrj/src/base.rs
@@ -0,0 +1,174 @@
+// https://docs.rs/sanakirja/latest/sanakirja/index.html
+// https://pijul.org/posts/2021-02-06-rethinking-sanakirja/
+
+use std::{
+    collections::BTreeMap,
+    fs::{self, File},
+    io,
+    path::{Component, Path, PathBuf},
+    result::Result,
+};
+
+use sanakirja::btree::{page, Db_};
+pub use sanakirja::*;
+
+use crate::{DatabaseKey, DatabaseValue};
+
+pub type UnitDatabase = Base<(), ()>;
+
+///
+/// A simple wrapper around Sanakirja aatabase that acts as a very fast on disk BTreeMap.
+///
+/// The state of the tree is uncommited until `.export()` is called during which it is unsafe to stop the program.
+///
+pub struct Base<Key, Value>
+where
+    Key: DatabaseKey,
+    Value: DatabaseValue,
+{
+    pathbuf: PathBuf,
+    db: Db_<Key, Value, page::Page<Key, Value>>,
+    txn: MutTxn<Env, ()>,
+}
+
+const ROOT_DB: usize = 0;
+const PAGE_SIZE: u64 = 4096;
+
+const DEFRAGMENT_RATIO_THRESHOLD: f64 = 0.5;
+
+impl<Key, Value> Base<Key, Value>
+where
+    Key: DatabaseKey,
+    Value: DatabaseValue,
+{
+    const KEY_SIZE: usize = size_of::<Key>();
+    const VALUE_SIZE: usize = size_of::<Value>();
+    const KEY_AND_VALUE_SIZE: usize = Self::KEY_SIZE + Self::VALUE_SIZE;
+
+    /// Open a database without a lock file where only one instance is safe to open.
+    pub fn open(pathbuf: PathBuf) -> Result<Self, Error> {
+        fs::create_dir_all(&pathbuf)?;
+
+        let env = unsafe { Env::new_nolock(Self::path_sanakirja_(&pathbuf), PAGE_SIZE, 1)? };
+
+        let mut txn = Env::mut_txn_begin(env)?;
+
+        let db = txn
+            .root_db(ROOT_DB)
+            .unwrap_or_else(|| unsafe { btree::create_db_(&mut txn).unwrap() });
+
+        Ok(Self { pathbuf, db, txn })
+    }
+
+    pub fn path_sanakirja(&self) -> PathBuf {
+        Self::path_sanakirja_(&self.pathbuf)
+    }
+    fn path_sanakirja_(path: &Path) -> PathBuf {
+        path.join("sanakirja")
+    }
+
+    pub fn path_self_defragmented(&self) -> PathBuf {
+        let defragmented_path_opt: Option<Component> = self.pathbuf.components().last();
+        let folder = match defragmented_path_opt {
+            Some(Component::Normal(f)) => f.to_str().unwrap(),
+            _ => unreachable!(),
+        };
+        let mut original_path = self.pathbuf.clone();
+        original_path.pop();
+        original_path.join(format!("{folder}-defragmented"))
+    }
+
+    pub fn read_length(&self) -> usize {
+        Self::read_length_(&self.pathbuf)
+    }
+    pub fn read_length_(path: &Path) -> usize {
+        fs::read(Self::path_length(path))
+            .map(|v| {
+                let mut buf = [0_u8; 8];
+                v.iter().enumerate().take(8).for_each(|(i, b)| {
+                    buf[i] = *b;
+                });
+                usize::from_le_bytes(buf)
+            })
+            .unwrap_or_default()
+    }
+    pub fn write_length(&self, len: usize) -> Result<(), io::Error> {
+        Self::write_length_(&self.pathbuf, len)
+    }
+    pub fn write_length_(path: &Path, len: usize) -> Result<(), io::Error> {
+        fs::write(Self::path_length(path), len.to_le_bytes())
+    }
+    fn path_length(path: &Path) -> PathBuf {
+        path.join("length")
+    }
+
+    #[inline]
+    pub fn get(&self, key: &Key) -> Result<Option<&Value>, Error> {
+        let option = btree::get(&self.txn, &self.db, key, None)?;
+        if let Some((key_found, v)) = option {
+            if key == key_found {
+                return Ok(Some(v));
+            }
+        }
+        Ok(None)
+    }
+
+    /// Iterate over key/value pairs from the database (disk)
+    #[inline]
+    #[allow(clippy::type_complexity)]
+    pub fn iter(
+        &self,
+    ) -> Result<btree::Iter<'_, MutTxn<Env, ()>, Key, Value, page::Page<Key, Value>>, Error> {
+        btree::iter(&self.txn, &self.db, None)
+    }
+
+    pub fn put(&mut self, key: &Key, value: &Value) -> Result<bool, Error> {
+        btree::put(&mut self.txn, &mut self.db, key, value)
+    }
+
+    pub fn del(&mut self, key: &Key, value: Option<&Value>) -> Result<bool, Error> {
+        btree::del(&mut self.txn, &mut self.db, key, value)
+    }
+
+    fn get_file_size_to_data_size_ratio(&self, len: usize) -> Result<f64, Error> {
+        let data_bytes = (len * Self::KEY_AND_VALUE_SIZE) as f64;
+        let file_bytes = File::open(&self.pathbuf)?.metadata()?.len() as f64;
+        Ok(file_bytes / data_bytes)
+    }
+
+    pub fn should_defragment(&self, len: usize) -> Result<bool, Error> {
+        Ok(self.get_file_size_to_data_size_ratio(len)? >= DEFRAGMENT_RATIO_THRESHOLD)
+    }
+
+    pub fn iter_collect(&self) -> Result<BTreeMap<&Key, &Value>, Error> {
+        self.iter()?.collect::<_>()
+    }
+
+    pub fn iter_collect_multi(&self) -> Result<BTreeMap<&Key, Vec<&Value>>, Error> {
+        let mut tree: BTreeMap<_, Vec<_>> = BTreeMap::new();
+        self.iter()?.try_for_each(|res| -> Result<(), Error> {
+            let (key, value): (&Key, &Value) = res?;
+            tree.entry(key).or_default().push(value);
+            Ok(())
+        })?;
+        Ok(tree)
+    }
+
+    pub fn commit(mut self, len: usize) -> Result<(), Error> {
+        // dbg!(&self.pathbuf, len);
+        // panic!();
+        self.write_length(len)?;
+        self.txn.set_root(ROOT_DB, self.db.db.into());
+        self.txn.commit()
+    }
+
+    pub fn destroy(self) -> io::Result<()> {
+        let path = self.pathbuf.to_owned();
+        drop(self);
+        fs::remove_dir_all(&path)
+    }
+
+    pub fn path(&self) -> &Path {
+        &self.pathbuf
+    }
+}
diff --git a/snkrj/src/lib.rs b/snkrj/src/lib.rs
index 00189538b..241bfd3b7 100644
--- a/snkrj/src/lib.rs
+++ b/snkrj/src/lib.rs
@@ -1,346 +1,14 @@
 // https://docs.rs/sanakirja/latest/sanakirja/index.html
 // https://pijul.org/posts/2021-02-06-rethinking-sanakirja/
 
-use core::panic;
-use std::{
-    collections::{BTreeMap, BTreeSet},
-    fmt::Debug,
-    fs::{self, File},
-    io, mem,
-    path::{Path, PathBuf},
-    result::Result,
-};
-
-use sanakirja::btree::{page, Db_};
 pub use sanakirja::*;
 
-///
-/// A simple wrapper around Sanakirja aatabase that acts as a very fast on disk BTreeMap.
-///
-/// The state of the tree is uncommited until `.export()` is called during which it is unsafe to stop the program.
-///
-pub struct Database<Key, Value>
-where
-    Key: DatabaseKey,
-    Value: DatabaseValue,
-{
-    pathbuf: PathBuf,
-    puts: BTreeMap<Key, Value>,
-    dels: BTreeSet<Key>,
-    len: usize,
-    db: Db_<Key, Value, page::Page<Key, Value>>,
-    txn: MutTxn<Env, ()>,
-}
+mod base;
+mod multi;
+mod traits;
+mod unique;
 
-const ROOT_DB: usize = 0;
-const PAGE_SIZE: u64 = 4096;
-
-pub type UnitDatabase = Database<(), ()>;
-
-const DEFRAGMENT_RATIO_THRESHOLD: f64 = 0.5;
-
-impl<Key, Value> Database<Key, Value>
-where
-    Key: DatabaseKey,
-    Value: DatabaseValue,
-{
-    const KEY_SIZE: usize = size_of::<Key>();
-    const VALUE_SIZE: usize = size_of::<Value>();
-    const KEY_AND_VALUE_SIZE: usize = Self::KEY_SIZE + Self::VALUE_SIZE;
-
-    /// Open a database without a lock file where only one instance is safe to open.
-    pub fn open(pathbuf: PathBuf) -> Result<Self, Error> {
-        fs::create_dir_all(&pathbuf)?;
-
-        let env = unsafe { Env::new_nolock(Self::path_sanakirja_(&pathbuf), PAGE_SIZE, 1)? };
-
-        let mut txn = Env::mut_txn_begin(env)?;
-
-        let db = txn
-            .root_db(ROOT_DB)
-            .unwrap_or_else(|| unsafe { btree::create_db_(&mut txn).unwrap() });
-
-        Ok(Self {
-            len: Self::read_length_(&pathbuf),
-            pathbuf,
-            puts: BTreeMap::default(),
-            dels: BTreeSet::default(),
-            db,
-            txn,
-        })
-    }
-
-    pub fn path_sanakirja(&self) -> PathBuf {
-        Self::path_sanakirja_(&self.pathbuf)
-    }
-    fn path_sanakirja_(path: &Path) -> PathBuf {
-        path.join("sanakirja")
-    }
-
-    pub fn read_length(&self) -> usize {
-        Self::read_length_(&self.pathbuf)
-    }
-    pub fn read_length_(path: &Path) -> usize {
-        fs::read(Self::path_length(path))
-            .map(|v| {
-                let mut buf = [0_u8; 8];
-                v.iter().enumerate().take(8).for_each(|(i, b)| {
-                    buf[i] = *b;
-                });
-                usize::from_le_bytes(buf)
-            })
-            .unwrap_or_default()
-    }
-    pub fn write_length(&self) -> Result<(), io::Error> {
-        Self::write_length_(&self.pathbuf, self.len)
-    }
-    pub fn write_length_(path: &Path, len: usize) -> Result<(), io::Error> {
-        fs::write(Self::path_length(path), len.to_le_bytes())
-    }
-    fn path_length(path: &Path) -> PathBuf {
-        path.join("length")
-    }
-
-    #[inline]
-    pub fn get(&self, key: &Key) -> Option<&Value> {
-        if let Some(cached_put) = self.get_from_ram(key) {
-            return Some(cached_put);
-        }
-
-        self.get_from_disk(key)
-    }
-
-    /// Get only from the uncommited tree (ram) without checking the database (disk)
-    #[inline]
-    pub fn get_from_ram(&self, key: &Key) -> Option<&Value> {
-        self.puts.get(key)
-    }
-
-    /// Get mut only from the uncommited tree (ram) without checking the database (disk)
-    #[inline]
-    pub fn get_mut_from_ram(&mut self, key: &Key) -> Option<&mut Value> {
-        self.puts.get_mut(key)
-    }
-
-    /// Get only from the database (disk) without checking the uncommited tree (ram)
-    #[inline]
-    pub fn get_from_disk(&self, key: &Key) -> Option<&Value> {
-        let option = btree::get(&self.txn, &self.db, key, None).unwrap();
-
-        if let Some((key_found, v)) = option {
-            if key == key_found {
-                return Some(v);
-            }
-        }
-
-        None
-    }
-
-    #[inline]
-    pub fn insert(&mut self, key: Key, value: Value) -> Option<Value> {
-        self.dels.remove(&key);
-        self.insert_to_ram(key, value)
-    }
-
-    /// Insert without removing the key to the dels tree, so be sure that it hasn't added to the delete set
-    #[inline]
-    pub fn insert_to_ram(&mut self, key: Key, value: Value) -> Option<Value> {
-        self.len += 1;
-        self.puts.insert(key, value)
-    }
-
-    #[inline]
-    pub fn update(&mut self, key: Key, value: Value) -> Option<Value> {
-        self.dels.insert(key.clone());
-        self.puts.insert(key, value)
-    }
-
-    #[inline]
-    pub fn remove(&mut self, key: &Key) -> Option<Value> {
-        self.len -= 1;
-        self.puts.remove(key).or_else(|| {
-            self.dels.insert(key.clone());
-            None
-        })
-    }
-
-    /// Get only from the uncommited tree (ram) without checking the database (disk)
-    #[inline]
-    pub fn remove_from_ram(&mut self, key: &Key) -> Option<Value> {
-        self.len -= 1;
-        self.puts.remove(key)
-    }
-
-    /// Add the key only to the dels tree without checking if it's present in the puts tree, only use if you are positive that you neither added nor updated an entry with this key
-    #[inline]
-    pub fn remove_later_from_disk(&mut self, key: &Key) {
-        self.len -= 1;
-        self.dels.insert(key.clone());
-    }
-
-    /// Iterate over key/value pairs from the uncommited tree (ram)
-    #[inline]
-    pub fn iter_ram(&self) -> std::collections::btree_map::Iter<'_, Key, Value> {
-        self.puts.iter()
-    }
-
-    /// Iterate over key/value pairs from the database (disk)
-    #[inline]
-    pub fn iter_disk(
-        &self,
-    ) -> btree::Iter<'_, MutTxn<Env, ()>, Key, Value, page::Page<Key, Value>> {
-        btree::iter(&self.txn, &self.db, None).unwrap()
-    }
-
-    /// Iterate over key/value pairs
-    #[inline]
-    pub fn iter_ram_then_disk(&self) -> impl Iterator<Item = (&Key, &Value)> {
-        self.iter_ram().chain(self.iter_disk().map(|r| r.unwrap()))
-    }
-
-    /// Collect a **clone** of all uncommited key/value pairs (ram)
-    pub fn collect_ram(&self) -> BTreeMap<Key, Value> {
-        self.puts.clone()
-    }
-
-    /// Collect a **clone** of all key/value pairs from the database (disk)
-    pub fn collect_disk(&self) -> BTreeMap<Key, Value> {
-        self.iter_disk()
-            .map(|r| r.unwrap())
-            .map(|(key, value)| (key.clone(), value.clone()))
-            .collect::<_>()
-    }
-
-    #[inline]
-    pub fn len(&self) -> usize {
-        self.len
-    }
-
-    #[inline]
-    pub fn is_empty(&self) -> bool {
-        self.len == 0
-    }
-
-    // pub fn export(self) -> Result<(), Error> {
-    //     self.boxed().boxed_export()
-    // }
-
-    // pub fn boxed(self) -> Box<Self> {
-    //     Box::new(self)
-    // }
-
-    pub fn get_file_size_to_data_ratio(&self) -> Result<f64, Error> {
-        let data_bytes = (self.len() * Self::KEY_AND_VALUE_SIZE) as f64;
-        let file_bytes = File::open(&self.pathbuf)?.metadata()?.len() as f64;
-        Ok(file_bytes / data_bytes)
-    }
-
-    /// Flush all puts and dels from the ram to disk with an option to defragment the database to save some disk space
-    ///
-    /// /!\ Do not kill the program while this function is runnning  /!\
-    pub fn export(mut self) -> Result<(), Error> {
-        let defragment = self.get_file_size_to_data_ratio()? >= DEFRAGMENT_RATIO_THRESHOLD;
-
-        if defragment {
-            let mut btree = self.collect_disk();
-
-            let disk_len = btree.len();
-            let dels_len = self.dels.len();
-            let puts_len = self.puts.len();
-
-            let path = self.pathbuf.to_owned();
-            self.dels.iter().for_each(|key| {
-                btree.remove(key);
-            });
-            btree.append(&mut self.puts);
-
-            let len = btree.len();
-
-            if len != self.len {
-                dbg!(len, self.len, path, disk_len, dels_len, puts_len);
-                panic!("Len should be the same");
-            }
-
-            self.destroy()?;
-
-            self = Self::open(path).unwrap();
-
-            if !self.is_empty() {
-                panic!()
-            }
-
-            self.len = len;
-            self.puts = btree;
-        }
-
-        self.write_length()?;
-
-        if self.dels.is_empty() && self.puts.is_empty() {
-            return Ok(());
-        }
-
-        mem::take(&mut self.dels)
-            .into_iter()
-            .try_for_each(|key| -> Result<(), Error> {
-                btree::del(&mut self.txn, &mut self.db, &key, None)?;
-                Ok(())
-            })?;
-
-        mem::take(&mut self.puts).into_iter().try_for_each(
-            |(key, value)| -> Result<(), Error> {
-                btree::put(&mut self.txn, &mut self.db, &key, &value)?;
-                Ok(())
-            },
-        )?;
-
-        self.txn.set_root(ROOT_DB, self.db.db.into());
-
-        self.txn.commit()
-    }
-
-    pub fn destroy(self) -> io::Result<()> {
-        let path = self.pathbuf.to_owned();
-
-        drop(self);
-
-        fs::remove_dir_all(&path)
-    }
-}
-
-pub trait AnyDatabase {
-    fn export(self) -> Result<(), Error>;
-    // fn boxed_export(self: Box<Self>) -> Result<(), Error>;
-    fn destroy(self) -> io::Result<()>;
-}
-
-impl<Key, Value> AnyDatabase for Database<Key, Value>
-where
-    Key: DatabaseKey,
-    Value: DatabaseValue,
-{
-    fn export(self) -> Result<(), Error> {
-        self.export()
-    }
-
-    // fn boxed_export(self: Box<Self>) -> Result<(), Error> {
-    //     self.boxed_export()
-    // }
-
-    fn destroy(self) -> io::Result<()> {
-        self.destroy()
-    }
-}
-
-pub trait DatabaseKey
-where
-    Self: Ord + Clone + Debug + Storable + Send + Sync,
-{
-}
-impl<T> DatabaseKey for T where T: Ord + Clone + Debug + Storable + Send + Sync {}
-
-pub trait DatabaseValue
-where
-    Self: Clone + Storable + PartialEq + Send + Sync,
-{
-}
-impl<T> DatabaseValue for T where T: Clone + Storable + PartialEq + Send + Sync {}
+pub use base::*;
+pub use multi::*;
+pub use traits::*;
+pub use unique::*;
diff --git a/snkrj/src/main.rs b/snkrj/src/main.rs
index a28e195de..055d45f79 100644
--- a/snkrj/src/main.rs
+++ b/snkrj/src/main.rs
@@ -1,16 +1,16 @@
-use snkrj::Database;
+use snkrj::DatabaseUnique;
 
 fn main() {
     let path = std::env::temp_dir().join("./db");
 
-    let database: Database<i32, i32> = Database::open(path.clone()).unwrap();
-    let _ = database.destroy();
+    // let database: DatabaseUnique<i32, i32> = DatabaseUnique::open(path.clone()).unwrap();
+    // let _ = database.destroy();
 
-    let mut database: Database<i32, i32> = Database::open(path.clone()).unwrap();
+    let mut database: DatabaseUnique<i32, i32> = DatabaseUnique::open(path.clone()).unwrap();
     database.insert(64, 128);
     database.export().unwrap();
 
-    let mut database: Database<i32, i32> = Database::open(path).unwrap();
+    let mut database: DatabaseUnique<i32, i32> = DatabaseUnique::open(path).unwrap();
     database.insert(1, 2);
     database.insert(128, 256);
     println!("iter_ram:");
@@ -18,11 +18,11 @@ fn main() {
         println!("{:?}", pair);
     });
     println!("iter_disk:");
-    database.iter_disk().for_each(|pair| {
+    database.iter_disk().unwrap().for_each(|pair| {
         println!("{:?}", pair.unwrap());
     });
     println!("iter_ram_then_disk:");
-    database.iter_ram_then_disk().for_each(|pair| {
+    database.iter_ram_then_disk().unwrap().for_each(|pair| {
         println!("{:?}", pair);
     });
     database.export().unwrap();
diff --git a/snkrj/src/multi.rs b/snkrj/src/multi.rs
new file mode 100644
index 000000000..24f8cbebe
--- /dev/null
+++ b/snkrj/src/multi.rs
@@ -0,0 +1,240 @@
+// https://docs.rs/sanakirja/latest/sanakirja/index.html
+// https://pijul.org/posts/2021-02-06-rethinking-sanakirja/
+
+use core::panic;
+use std::{
+    collections::{BTreeMap, BTreeSet},
+    fs, mem,
+    path::PathBuf,
+    result::Result,
+};
+
+use sanakirja::btree::page;
+pub use sanakirja::*;
+
+use crate::{AnyDatabase, Base, DatabaseKey, DatabaseValue};
+
+///
+/// A simple wrapper around Sanakirja aatabase that acts as a very fast on disk BTreeMap.
+///
+/// The state of the tree is uncommited until `.export()` is called during which it is unsafe to stop the program.
+///
+pub struct DatabaseMulti<Key, Value>
+where
+    Key: DatabaseKey,
+    Value: DatabaseValue,
+{
+    puts: BTreeMap<Key, Vec<Value>>,
+    dels: BTreeSet<Key>,
+    len: usize,
+    db: Base<Key, Value>,
+}
+
+impl<Key, Value> DatabaseMulti<Key, Value>
+where
+    Key: DatabaseKey,
+    Value: DatabaseValue,
+{
+    /// Open a database without a lock file where only one instance is safe to open.
+    pub fn open(pathbuf: PathBuf) -> Result<Self, Error> {
+        let db = Base::open(pathbuf)?;
+        Ok(Self {
+            len: db.read_length(),
+            puts: BTreeMap::default(),
+            dels: BTreeSet::default(),
+            db,
+        })
+    }
+
+    #[inline]
+    pub fn get(&self, key: &Key) -> Result<Option<&Value>, Error> {
+        if let Some(cached_put) = self.get_uncommited(key) {
+            return Ok(Some(cached_put));
+        }
+
+        self.db.get(key)
+    }
+
+    /// Get only from the uncommited tree (ram) without checking the database (disk)
+    #[inline]
+    pub fn get_uncommited(&self, key: &Key) -> Option<&Value> {
+        self.puts.get(key).and_then(|v| v.first())
+    }
+
+    /// Get mut only from the uncommited tree (ram) without checking the database (disk)
+    #[inline]
+    pub fn get_mut_uncommited(&mut self, key: &Key) -> Option<&mut Value> {
+        self.puts.get_mut(key).and_then(|v| v.first_mut())
+    }
+
+    #[inline]
+    pub fn insert(&mut self, key: Key, value: Value) -> Option<Value> {
+        self.dels.remove(&key);
+        self.unchecked_insert(key, value)
+    }
+
+    /// Insert without removing the key to the dels tree, so be sure that it hasn't added to the delete set
+    #[inline]
+    pub fn unchecked_insert(&mut self, key: Key, value: Value) -> Option<Value> {
+        self.len += 1;
+        self.puts.entry(key).or_default().push(value);
+        None
+    }
+
+    #[inline]
+    pub fn update(&mut self, key: Key, value: Value) -> Option<Value> {
+        todo!()
+        // self.dels.insert(key.clone());
+        // self.puts.insert(key, value)
+    }
+
+    #[inline]
+    pub fn remove(&mut self, key: &Key) -> Option<Value> {
+        todo!()
+        // self.len -= 1;
+        // self.puts.remove(key).or_else(|| {
+        //     self.dels.insert(key.clone());
+        //     None
+        // })
+    }
+
+    /// Remove only from the uncommited tree (ram) without checking the database (disk)
+    #[inline]
+    pub fn remove_from_uncommited(&mut self, key: &Key) -> Option<Value> {
+        todo!()
+        // self.len -= 1;
+        // self.puts.remove(key)
+    }
+
+    /// Add the key only to the dels tree without checking if it's present in the puts tree, only use if you are positive that you neither added nor updated an entry with this key
+    #[inline]
+    pub fn remove_later_from_disk(&mut self, key: &Key) {
+        todo!()
+        // self.len -= 1;
+        // self.dels.insert(key.clone());
+    }
+
+    /// Iterate over key/value pairs from the uncommited tree (ram)
+    #[inline]
+    pub fn iter_ram(&self) -> std::collections::btree_map::Iter<'_, Key, Vec<Value>> {
+        self.puts.iter()
+    }
+
+    /// Iterate over key/value pairs from the database (disk)
+    #[inline]
+    #[allow(clippy::type_complexity)]
+    pub fn iter_disk(
+        &self,
+    ) -> Result<btree::Iter<'_, MutTxn<Env, ()>, Key, Value, page::Page<Key, Value>>, Error> {
+        self.db.iter()
+    }
+
+    /// Iterate over key/value pairs
+    // #[inline]
+    // pub fn iter_ram_then_disk(&self) -> Result<impl Iterator<Item = (&Key, &Value)>, Error> {
+    //     todo!();
+    //     // Ok(self.iter_ram().chain(self.iter_disk()?.map(|r| r.unwrap())))
+    // }
+
+    /// Collect a **clone** of all uncommited key/value pairs (ram)
+    pub fn collect_ram(&self) -> BTreeMap<Key, Value> {
+        todo!()
+        // self.puts.clone()
+    }
+
+    #[inline]
+    pub fn len(&self) -> usize {
+        self.len
+    }
+
+    #[inline]
+    pub fn is_empty(&self) -> bool {
+        self.len == 0
+    }
+
+    /// Flush all puts and dels from the ram to disk with an option to defragment the database to save some disk space
+    ///
+    /// /!\ Do not kill the program while this function is runnning  /!\
+    pub fn export(mut self) -> Result<(), Error> {
+        if self.dels.is_empty() && self.puts.is_empty() {
+            return Ok(());
+        }
+
+        if self.db.should_defragment(self.len)? {
+            let mut btree = self.db.iter_collect_multi()?;
+            // TODO:
+            // self.dels.iter().for_each(|key| {
+            //     btree.remove(key);
+            // });
+            self.puts.iter().for_each(|(key, values)| {
+                // btree.insert(key, value);
+                let vec = btree.entry(key).or_default();
+                vec.extend(values.iter());
+            });
+
+            let path_self_original = self.db.path().to_owned();
+            let path_self_defragmented = self.db.path_self_defragmented();
+
+            let len = btree.values().map(|v| v.len()).sum::<usize>();
+
+            if len != self.len {
+                dbg!(len, self.len, path_self_defragmented);
+                panic!("Len should be the same");
+            }
+
+            {
+                let mut defragmented = Self::open(path_self_defragmented.clone()).unwrap();
+
+                btree
+                    .into_iter()
+                    .try_for_each(|(key, values)| -> Result<(), Error> {
+                        values
+                            .into_iter()
+                            .try_for_each(|value| -> Result<(), Error> {
+                                defragmented.db.put(key, value)?;
+                                Ok(())
+                            })?;
+                        Ok(())
+                    })?;
+
+                defragmented.len = len;
+                defragmented.db.commit(self.len)?;
+            }
+
+            drop(self);
+
+            fs::remove_dir_all(&path_self_original)?;
+            fs::rename(&path_self_defragmented, &path_self_original)?;
+
+            Ok(())
+        } else {
+            mem::take(&mut self.dels)
+                .into_iter()
+                .try_for_each(|key| -> Result<(), Error> {
+                    self.db.del(&key, None)?;
+                    Ok(())
+                })?;
+
+            mem::take(&mut self.puts).into_iter().try_for_each(
+                |(key, vec): (Key, Vec<Value>)| -> Result<(), Error> {
+                    vec.into_iter().try_for_each(|value| -> Result<(), Error> {
+                        self.db.put(&key, &value)?;
+                        Ok(())
+                    })
+                },
+            )?;
+
+            self.db.commit(self.len)
+        }
+    }
+}
+
+impl<Key, Value> AnyDatabase for DatabaseMulti<Key, Value>
+where
+    Key: DatabaseKey,
+    Value: DatabaseValue,
+{
+    fn export(self) -> Result<(), Error> {
+        self.export()
+    }
+}
diff --git a/snkrj/src/traits.rs b/snkrj/src/traits.rs
new file mode 100644
index 000000000..758b70472
--- /dev/null
+++ b/snkrj/src/traits.rs
@@ -0,0 +1,59 @@
+use std::fmt::Debug;
+
+use sanakirja::Storable;
+
+pub trait AnyDatabase {
+    fn export(self) -> Result<(), sanakirja::Error>;
+    // fn destroy(self) -> io::Result<()>;
+}
+
+pub trait DatabaseKey
+where
+    Self: Ord + Clone + Debug + Storable + Send + Sync,
+{
+    const SIZE: usize = size_of::<Self>();
+    const SIZE_SMALLER_THAN_TWO: bool = Self::SIZE < 2;
+
+    fn as_ne_byte(&self) -> u8 {
+        let data: *const Self = self;
+        let data: *const u8 = data as *const u8;
+        let slice = unsafe { std::slice::from_raw_parts(data, Self::SIZE) };
+
+        *(if cfg!(target_endian = "big") {
+            slice.last()
+        } else {
+            slice.first()
+        })
+        .unwrap()
+    }
+
+    fn as_ne_six_bits(&self) -> u8 {
+        self.as_ne_byte() >> 2
+    }
+
+    fn as_ne_two_bytes(&self) -> [u8; 2] {
+        let data: *const Self = self;
+        let data: *const u8 = data as *const u8;
+        let slice = unsafe { std::slice::from_raw_parts(data, Self::SIZE) };
+
+        if Self::SIZE_SMALLER_THAN_TWO {
+            panic!("Doesn't make sense")
+        }
+
+        if cfg!(target_endian = "big") {
+            let mut iter = slice.iter().rev();
+            [*iter.next().unwrap(), *iter.next().unwrap()]
+        } else {
+            let mut iter = slice.iter();
+            [*iter.next().unwrap(), *iter.next().unwrap()]
+        }
+    }
+}
+impl<T> DatabaseKey for T where T: Ord + Clone + Debug + Storable + Send + Sync {}
+
+pub trait DatabaseValue
+where
+    Self: Clone + Storable + PartialEq + Send + Sync,
+{
+}
+impl<T> DatabaseValue for T where T: Clone + Storable + PartialEq + Send + Sync {}
diff --git a/snkrj/src/unique.rs b/snkrj/src/unique.rs
new file mode 100644
index 000000000..f5dc6582e
--- /dev/null
+++ b/snkrj/src/unique.rs
@@ -0,0 +1,223 @@
+// https://docs.rs/sanakirja/latest/sanakirja/index.html
+// https://pijul.org/posts/2021-02-06-rethinking-sanakirja/
+
+use core::panic;
+use std::{
+    collections::{BTreeMap, BTreeSet},
+    fs, mem,
+    path::PathBuf,
+    result::Result,
+};
+
+use sanakirja::btree::page;
+pub use sanakirja::*;
+
+use crate::{AnyDatabase, Base, DatabaseKey, DatabaseValue};
+
+///
+/// A simple wrapper around Sanakirja aatabase that acts as a very fast on disk BTreeMap.
+///
+/// The state of the tree is uncommited until `.export()` is called during which it is unsafe to stop the program.
+///
+pub struct DatabaseUnique<Key, Value>
+where
+    Key: DatabaseKey,
+    Value: DatabaseValue,
+{
+    puts: BTreeMap<Key, Value>,
+    dels: BTreeSet<Key>,
+    len: usize,
+    db: Base<Key, Value>,
+}
+
+impl<Key, Value> DatabaseUnique<Key, Value>
+where
+    Key: DatabaseKey,
+    Value: DatabaseValue,
+{
+    /// Open a database without a lock file where only one instance is safe to open.
+    pub fn open(pathbuf: PathBuf) -> Result<Self, Error> {
+        let db = Base::open(pathbuf)?;
+        Ok(Self {
+            len: db.read_length(),
+            puts: BTreeMap::default(),
+            dels: BTreeSet::default(),
+            db,
+        })
+    }
+
+    #[inline]
+    pub fn get(&self, key: &Key) -> Result<Option<&Value>, Error> {
+        if let Some(cached_put) = self.get_uncommited(key) {
+            return Ok(Some(cached_put));
+        }
+
+        self.db.get(key)
+    }
+
+    /// Get only from the uncommited tree (ram) without checking the database (disk)
+    #[inline]
+    pub fn get_uncommited(&self, key: &Key) -> Option<&Value> {
+        self.puts.get(key)
+    }
+
+    /// Get mut only from the uncommited tree (ram) without checking the database (disk)
+    #[inline]
+    pub fn get_mut_uncommited(&mut self, key: &Key) -> Option<&mut Value> {
+        self.puts.get_mut(key)
+    }
+
+    #[inline]
+    pub fn insert(&mut self, key: Key, value: Value) -> Option<Value> {
+        self.dels.remove(&key);
+        self.unchecked_insert(key, value)
+    }
+
+    /// Insert without removing the key to the dels tree, so be sure that it hasn't added to the delete set
+    #[inline]
+    pub fn unchecked_insert(&mut self, key: Key, value: Value) -> Option<Value> {
+        self.len += 1;
+        self.puts.insert(key, value)
+    }
+
+    #[inline]
+    pub fn update(&mut self, key: Key, value: Value) -> Option<Value> {
+        self.dels.insert(key.clone());
+        self.puts.insert(key, value)
+    }
+
+    #[inline]
+    pub fn remove(&mut self, key: &Key) -> Option<Value> {
+        self.len -= 1;
+        self.puts.remove(key).or_else(|| {
+            self.dels.insert(key.clone());
+            None
+        })
+    }
+
+    /// Remove only from the uncommited tree (ram) without checking the database (disk)
+    #[inline]
+    pub fn remove_from_uncommited(&mut self, key: &Key) -> Option<Value> {
+        self.len -= 1;
+        self.puts.remove(key)
+    }
+
+    /// Add the key only to the dels tree without checking if it's present in the puts tree, only use if you are positive that you neither added nor updated an entry with this key
+    #[inline]
+    pub fn remove_later_from_disk(&mut self, key: &Key) {
+        self.len -= 1;
+        self.dels.insert(key.clone());
+    }
+
+    /// Iterate over key/value pairs from the uncommited tree (ram)
+    #[inline]
+    pub fn iter_ram(&self) -> std::collections::btree_map::Iter<'_, Key, Value> {
+        self.puts.iter()
+    }
+
+    /// Iterate over key/value pairs from the database (disk)
+    #[inline]
+    #[allow(clippy::type_complexity)]
+    pub fn iter_disk(
+        &self,
+    ) -> Result<btree::Iter<'_, MutTxn<Env, ()>, Key, Value, page::Page<Key, Value>>, Error> {
+        self.db.iter()
+    }
+
+    /// Iterate over key/value pairs
+    #[inline]
+    pub fn iter_ram_then_disk(&self) -> Result<impl Iterator<Item = (&Key, &Value)>, Error> {
+        Ok(self.iter_ram().chain(self.iter_disk()?.map(|r| r.unwrap())))
+    }
+
+    /// Collect a **clone** of all uncommited key/value pairs (ram)
+    pub fn collect_ram(&self) -> BTreeMap<Key, Value> {
+        self.puts.clone()
+    }
+
+    #[inline]
+    pub fn len(&self) -> usize {
+        self.len
+    }
+
+    #[inline]
+    pub fn is_empty(&self) -> bool {
+        self.len == 0
+    }
+
+    /// Flush all puts and dels from the ram to disk with an option to defragment the database to save some disk space
+    ///
+    /// /!\ Do not kill the program while this function is runnning  /!\
+    pub fn export(mut self) -> Result<(), Error> {
+        if self.dels.is_empty() && self.puts.is_empty() {
+            return Ok(());
+        }
+
+        if self.db.should_defragment(self.len)? {
+            let mut btree = self.db.iter_collect()?;
+            self.dels.iter().for_each(|key| {
+                btree.remove(key);
+            });
+            self.puts.iter().for_each(|(key, value)| {
+                btree.insert(key, value);
+            });
+
+            let path_self_original = self.db.path().to_owned();
+            let path_self_defragmented = self.db.path_self_defragmented();
+
+            let len = btree.len();
+
+            if len != self.len {
+                dbg!(len, self.len, path_self_defragmented);
+                panic!("Len should be the same");
+            }
+
+            {
+                let mut defragmented = Self::open(path_self_defragmented.clone()).unwrap();
+
+                btree
+                    .into_iter()
+                    .try_for_each(|(key, value)| -> Result<(), Error> {
+                        defragmented.db.put(key, value)?;
+                        Ok(())
+                    })?;
+
+                defragmented.len = len;
+                defragmented.db.commit(self.len)?;
+            }
+
+            drop(self);
+
+            fs::remove_dir_all(&path_self_original)?;
+            fs::rename(&path_self_defragmented, &path_self_original)?;
+
+            Ok(())
+        } else {
+            mem::take(&mut self.dels)
+                .into_iter()
+                .try_for_each(|key| -> Result<(), Error> {
+                    self.db.del(&key, None)?;
+                    Ok(())
+                })?;
+
+            mem::take(&mut self.puts).into_iter().try_for_each(
+                |(key, value)| -> Result<(), Error> {
+                    self.db.put(&key, &value)?;
+                    Ok(())
+                },
+            )?;
+
+            self.db.commit(self.len)
+        }
+    }
+}
+
+impl<Key, Value> AnyDatabase for DatabaseUnique<Key, Value>
+where
+    Key: DatabaseKey,
+    Value: DatabaseValue,
+{
+    fn export(self) -> Result<(), Error> {
+        self.export()
+    }
+}
diff --git a/storable_vec/src/lib.rs b/storable_vec/src/lib.rs
index 3037b9080..69839dbd7 100644
--- a/storable_vec/src/lib.rs
+++ b/storable_vec/src/lib.rs
@@ -26,7 +26,6 @@ use memmap2::{Mmap, MmapOptions};
 #[derive(Debug)]
 pub struct StorableVec<I, T> {
     pathbuf: PathBuf,
-    // file_for_reads: File,
     file: File,
     cache: Vec<OnceLock<Box<Mmap>>>, // Boxed to reduce the size of the lock (24 > 16)
     disk_len: usize,
@@ -42,46 +41,6 @@ const MAX_PAGE_SIZE: usize = 4 * 4096;
 const ONE_MB: usize = 1000 * 1024;
 const MAX_CACHE_SIZE: usize = 100 * ONE_MB;
 
-#[derive(Debug, Clone)]
-pub enum Value<'a, T> {
-    Ref(&'a T),
-    Owned(T),
-}
-
-impl<T> Value<'_, T>
-where
-    T: Sized + Debug + Clone,
-{
-    pub fn into_inner(self) -> T {
-        match self {
-            Self::Ref(t) => t.to_owned(),
-            Self::Owned(t) => t,
-        }
-    }
-}
-
-impl<T> Deref for Value<'_, T> {
-    type Target = T;
-    fn deref(&self) -> &Self::Target {
-        match self {
-            Self::Ref(t) => t,
-            Self::Owned(t) => t,
-        }
-    }
-}
-
-impl<T> AsRef<T> for Value<'_, T>
-where
-    T: Sized + Debug + Clone,
-{
-    fn as_ref(&self) -> &T {
-        match self {
-            Self::Ref(t) => t,
-            Self::Owned(t) => t,
-        }
-    }
-}
-
 impl<I, T> StorableVec<I, T>
 where
     I: Into<usize>,
@@ -91,7 +50,8 @@ where
     pub const PER_PAGE: usize = MAX_PAGE_SIZE / Self::SIZE_OF_T;
     /// In bytes
     pub const PAGE_SIZE: usize = Self::PER_PAGE * Self::SIZE_OF_T;
-    pub const CACHE_LENGTH: usize = MAX_CACHE_SIZE / Self::PAGE_SIZE;
+    pub const CACHE_LENGTH: usize = usize::MAX;
+    // pub const CACHE_LENGTH: usize = MAX_CACHE_SIZE / Self::PAGE_SIZE;
 
     pub fn import(path: &Path) -> Result<Self, io::Error> {
         let file = Self::open_file(path)?;
@@ -100,7 +60,6 @@ where
             pathbuf: path.to_owned(),
             disk_len: Self::byte_index_to_index(file.metadata()?.len() as usize),
             file,
-            // file_for_reads: Self::open_file(path)?,
             cache: vec![],
             pushed: vec![],
             // updated: BTreeMap::new(),
@@ -109,9 +68,6 @@ where
             phantom: PhantomData,
         };
 
-        this.cache.resize_with(Self::CACHE_LENGTH, Default::default);
-        this.cache.shrink_to_fit();
-
         this.reset_cache();
 
         Ok(this)
@@ -121,9 +77,14 @@ where
         // let len = (self.disk_len as f64 / Self::PER_PAGE as f64).ceil() as usize;
         // self.cache.clear();
         // self.cache.resize_with(len, Default::default);
+
         self.cache.iter_mut().for_each(|lock| {
             lock.take();
         });
+        let len = (self.disk_len as f64 / Self::PER_PAGE as f64).ceil() as usize;
+        self.cache
+            .resize_with(Self::CACHE_LENGTH.min(len), Default::default);
+        self.cache.shrink_to_fit();
     }
 
     fn open_file(path: &Path) -> Result<File, io::Error> {
@@ -164,7 +125,6 @@ where
         }
     }
 
-    #[allow(unused)]
     #[inline]
     pub fn get(&self, index: I) -> Result<Option<Value<'_, T>>> {
         self.get_(index.into())
@@ -191,7 +151,7 @@ where
         let last_index = self.disk_len - 1;
         let max_page_index = last_index / Self::PER_PAGE;
         let min_page_index = (max_page_index + 1)
-            .checked_sub(Self::CACHE_LENGTH)
+            .checked_sub(self.cache.len())
             .unwrap_or_default();
 
         if page_index >= min_page_index {
@@ -215,7 +175,6 @@ where
 
             Ok(Some(Value::Ref(T::unsafe_try_from_slice(slice)?)))
         } else {
-            // let mut file = &self.file_for_reads;
             let mut file = Self::open_file(&self.pathbuf).unwrap();
 
             file.seek(SeekFrom::Start(byte_index as u64)).unwrap();
@@ -228,6 +187,15 @@ where
             Ok(Some(Value::Owned(value.to_owned())))
         }
     }
+    pub fn get_or_default(&self, index: I) -> Result<T>
+    where
+        T: Default + Clone,
+    {
+        Ok(self
+            .get(index)?
+            .map(|v| (*v).clone())
+            .unwrap_or(Default::default()))
+    }
 
     #[allow(unused)]
     pub fn first(&self) -> Result<Option<Value<'_, T>>> {
@@ -253,7 +221,11 @@ where
     pub fn push_if_needed_(&mut self, index: usize, value: T) -> Result<()> {
         let len = self.len();
         match len.cmp(&index) {
-            Ordering::Greater => Ok(()),
+            Ordering::Greater => {
+                // dbg!(len, index);
+                // panic!();
+                Ok(())
+            }
             Ordering::Equal => {
                 self.push(value);
                 Ok(())
@@ -325,23 +297,21 @@ where
     }
 
     pub fn flush(&mut self) -> io::Result<()> {
-        self.disk_len += self.pushed.len();
-
         self.reset_cache();
 
+        if self.pushed.is_empty() {
+            return Ok(());
+        }
+
+        self.disk_len += self.pushed.len();
+
         let mut bytes: Vec<u8> = vec![];
 
         mem::take(&mut self.pushed)
             .into_iter()
             .for_each(|v| bytes.extend_from_slice(v.unsafe_as_slice()));
 
-        // self.file.seek(SeekFrom::End(0))?;
         self.file.write_all(&bytes)?;
-        // self.file_for_mmaps.write_all(&bytes)?;
-
-        // self.file_for_mmaps.sync_all()?;
-        // self.file_for_reads.sync_all()?;
-        // self.file_for_reads = Self::open_file(&self.pathbuf)?;
 
         Ok(())
     }
@@ -371,6 +341,44 @@ where
     }
 }
 
+#[derive(Debug, Clone)]
+pub enum Value<'a, T> {
+    Ref(&'a T),
+    Owned(T),
+}
+
+impl<T> Value<'_, T>
+where
+    T: Sized + Debug + Clone,
+{
+    pub fn into_inner(self) -> T {
+        match self {
+            Self::Ref(t) => t.to_owned(),
+            Self::Owned(t) => t,
+        }
+    }
+}
+impl<T> Deref for Value<'_, T> {
+    type Target = T;
+    fn deref(&self) -> &Self::Target {
+        match self {
+            Self::Ref(t) => t,
+            Self::Owned(t) => t,
+        }
+    }
+}
+impl<T> AsRef<T> for Value<'_, T>
+where
+    T: Sized + Debug + Clone,
+{
+    fn as_ref(&self) -> &T {
+        match self {
+            Self::Ref(t) => t,
+            Self::Owned(t) => t,
+        }
+    }
+}
+
 pub trait UnsafeSizedSerDe
 where
     Self: Sized,

From 4923c2e2044cf20066cce259b98559dd8e3e6ef8 Mon Sep 17 00:00:00 2001
From: nym21 <expat-epochs0i@icloud.com>
Date: Sun, 26 Jan 2025 17:42:47 +0100
Subject: [PATCH 28/63] bindex: converted txindex_to_txoutindex_in to storable
 vecs

---
 bindex/Cargo.toml                            |   1 +
 bindex/src/{indexer.rs => lib.rs}            | 255 +++++++++++--------
 bindex/src/main.rs                           |   8 +-
 bindex/src/storage/stores/mod.rs             |  32 +--
 bindex/src/storage/stores/multi.rs           |   2 +
 bindex/src/storage/vecs/base.rs              |   1 +
 bindex/src/storage/vecs/mod.rs               |  23 +-
 bindex/src/structs/addressindextxoutindex.rs |  19 --
 bindex/src/structs/mod.rs                    |   4 +
 bindex/src/structs/prefix.rs                 |  24 +-
 bindex/src/structs/txindexvout.rs            |  28 --
 bindex/src/structs/txinindex.rs              |  62 +++++
 bindex/src/structs/txoutindex.rs             |  11 +-
 bindex/src/structs/vin.rs                    |  30 +++
 14 files changed, 300 insertions(+), 200 deletions(-)
 rename bindex/src/{indexer.rs => lib.rs} (78%)
 delete mode 100644 bindex/src/structs/addressindextxoutindex.rs
 delete mode 100644 bindex/src/structs/txindexvout.rs
 create mode 100644 bindex/src/structs/txinindex.rs
 create mode 100644 bindex/src/structs/vin.rs

diff --git a/bindex/Cargo.toml b/bindex/Cargo.toml
index 549182e38..c3957119a 100644
--- a/bindex/Cargo.toml
+++ b/bindex/Cargo.toml
@@ -10,6 +10,7 @@ color-eyre = "0.6.3"
 derive_deref = "1.1.1"
 exit = { path = "../exit" }
 jiff = "0.1.24"
+rapidhash = "1.3.0"
 rayon = "1.10.0"
 snkrj = { path = "../snkrj" }
 storable_vec = { path = "../storable_vec" }
diff --git a/bindex/src/indexer.rs b/bindex/src/lib.rs
similarity index 78%
rename from bindex/src/indexer.rs
rename to bindex/src/lib.rs
index 38b8591fe..8509fbdf5 100644
--- a/bindex/src/indexer.rs
+++ b/bindex/src/lib.rs
@@ -10,30 +10,25 @@ use biter::{
     bitcoin::{Transaction, TxIn, TxOut, Txid},
     rpc,
 };
-use exit::Exit;
-
-use crate::storage::{Stores, Vecs};
-use crate::structs::{
-    Addressbytes, AddressbytesPrefix, Addressindex, Addresstype, Amount, BlockHashPrefix, Height, Timestamp,
-    TxidPrefix, Txindex, Txoutindex, Vout,
-};
 use color_eyre::eyre::{eyre, ContextCompat};
+use exit::Exit;
 use rayon::prelude::*;
 
-#[derive(Debug)]
-enum TxInOrAddressindextoutindex<'a> {
-    TxIn(&'a TxIn),
-    AddressTxTxoutIndexes((Addressindex, Txindex, Txoutindex)),
-}
+mod storage;
+mod structs;
+
+use storage::{Stores, Vecs};
+use structs::{
+    Addressbytes, AddressbytesPrefix, Addressindex, Addresstype, Amount, BlockHashPrefix, Height, Timestamp,
+    TxidPrefix, Txindex, Txinindex, Txoutindex, Vin, Vout,
+};
 
 const UNSAFE_BLOCKS: u32 = 100;
 const DAILY_BLOCK_TARGET: usize = 144;
 const SNAPSHOT_BLOCK_RANGE: usize = DAILY_BLOCK_TARGET * 10;
 
-#[derive(Debug, Default)]
-pub struct Indexer {
-    //
-}
+#[derive(Debug)]
+pub struct Indexer;
 
 impl Indexer {
     pub fn index(indexes_dir: &Path, bitcoin_dir: &Path, rpc: rpc::Client, exit: Exit) -> color_eyre::Result<()> {
@@ -54,6 +49,7 @@ impl Indexer {
         // let mut height = Height::default();
 
         let mut txindex_global = vecs.height_to_first_txindex.get_or_default(height)?;
+        let mut txinindex_global = vecs.height_to_first_txinindex.get_or_default(height)?;
         let mut txoutindex_global = vecs.height_to_first_txoutindex.get_or_default(height)?;
         let mut addressindex_global = vecs.height_to_first_addressindex.get_or_default(height)?;
         let mut emptyindex_global = vecs.height_to_first_emptyindex.get_or_default(height)?;
@@ -146,6 +142,8 @@ impl Indexer {
                 vecs.height_to_size.push_if_needed(height, block.total_size())?;
                 vecs.height_to_weight.push_if_needed(height, block.weight())?;
                 vecs.height_to_first_txindex.push_if_needed(height, txindex_global)?;
+                vecs.height_to_first_txinindex
+                    .push_if_needed(height, txinindex_global)?;
                 vecs.height_to_first_txoutindex
                     .push_if_needed(height, txoutindex_global)?;
                 vecs.height_to_first_addressindex
@@ -168,6 +166,18 @@ impl Indexer {
                 vecs.height_to_p2wpkhindex.push_if_needed(height, p2wpkhindex_global)?;
                 vecs.height_to_p2wshindex.push_if_needed(height, p2wshindex_global)?;
 
+                let inputs = block
+                    .txdata
+                    .iter()
+                    .enumerate()
+                    .flat_map(|(index, tx)| {
+                        tx.input
+                            .iter()
+                            .enumerate()
+                            .map(move |(vin, txin)| (Txindex::from(index), Vin::from(vin), txin, tx))
+                    })
+                    .collect::<Vec<_>>();
+
                 let outputs = block
                     .txdata
                     .iter()
@@ -182,10 +192,11 @@ impl Indexer {
 
                 let tx_len = block.txdata.len();
                 let outputs_len = outputs.len();
+                let inputs_len = inputs.len();
 
                 let (
                     txid_prefix_to_txid_and_block_txindex_and_prev_txindex_join_handle,
-                    txin_or_addressindextxoutindex_vec_handle,
+                    input_source_vec_handle,
                     txoutindex_to_txout_addresstype_addressbytes_res_addressindex_opt_handle,
                 ) = thread::scope(|scope| {
                     let txid_prefix_to_txid_and_block_txindex_and_prev_txindex_handle =
@@ -225,69 +236,78 @@ impl Indexer {
                                 })
                         });
 
-                    let txin_or_addressindextxoutindex_vec_handle =
-                        scope.spawn(|| -> color_eyre::Result<Vec<TxInOrAddressindextoutindex>> {
-                            block
-                                .txdata
-                                .par_iter()
-                                .filter(|tx| !tx.is_coinbase())
-                                .flat_map(|tx| &tx.input)
-                                .map(|txin| -> color_eyre::Result<_> {
-                                    let outpoint = txin.previous_output;
-                                    let txid = outpoint.txid;
-                                    let vout = Vout::from(outpoint.vout);
+                    let input_source_vec_handle = scope.spawn(|| {
+                        inputs
+                            .into_par_iter()
+                            .enumerate()
+                            .map(|(block_txinindex, (block_txindex, vin, txin, tx))| -> color_eyre::Result<(Txinindex, InputSource)> {
+                                let txindex = txindex_global + block_txindex;
+                                let txinindex = txinindex_global + Txinindex::from(block_txinindex);
 
-                                    let txindex = if let Some(txindex) = stores
-                                        .txid_prefix_to_txindex
-                                        .get(&TxidPrefix::try_from(&txid)?)?
-                                        .and_then(|txindex| {
-                                            // Checking if not finding txindex from the future
-                                            (txindex < &txindex_global).then_some(txindex)
-                                        }) {
-                                        *txindex
-                                    } else {
-                                        return Ok(TxInOrAddressindextoutindex::TxIn(txin));
-                                    };
+                                // dbg!((txindex, txinindex, vin));
 
-                                    let txoutindex = *vecs
-                                        .txindex_to_first_txoutindex
-                                        .get(txindex)?
-                                        .context("Expect txoutindex to not be none")
-                                        .inspect_err(|_| {
-                                            dbg!(outpoint.txid, txindex, vout);
-                                        })?
-                                        + vout;
+                                let outpoint = txin.previous_output;
 
-                                    let addressindex = *vecs
-                                        .txoutindex_to_addressindex
-                                        .get(txoutindex)?
-                                        .context("Expect addressindex to not be none")
-                                        .inspect_err(|_| {
-                                            // let height = vecdisks.txindex_to_height.get(txindex.into()).expect("txindex_to_height get not fail")
-                                            // .expect("Expect height for txindex");
-                                            dbg!(outpoint.txid, txindex, vout, txoutindex);
-                                        })?;
+                                if tx.is_coinbase() {
+                                    return Ok((txinindex, InputSource::SameBlock((tx, txindex, txin, vin))));
+                                }
 
-                                    Ok(TxInOrAddressindextoutindex::AddressTxTxoutIndexes((
-                                        addressindex,
-                                        txindex,
-                                        txoutindex,
-                                    )))
-                                })
-                                .try_fold(Vec::new, |mut vec, res| {
-                                    vec.push(res?);
-                                    Ok(vec)
-                                })
-                                .try_reduce(Vec::new, |mut v, mut v2| {
-                                    if v.len() > v2.len() {
-                                        v.append(&mut v2);
-                                        Ok(v)
-                                    } else {
-                                        v2.append(&mut v);
-                                        Ok(v2)
-                                    }
-                                })
-                        });
+                                let prev_txindex = if let Some(txindex) = stores
+                                    .txid_prefix_to_txindex
+                                    .get(&TxidPrefix::try_from(&outpoint.txid)?)?
+                                    .and_then(|txindex| {
+                                        // Checking if not finding txindex from the future
+                                        (txindex < &txindex_global).then_some(txindex)
+                                    }) {
+                                    *txindex
+                                } else {
+                                    // dbg!(txindex_global + block_txindex, txindex, txin, vin);
+                                    return Ok((txinindex, InputSource::SameBlock((tx, txindex, txin, vin))));
+                                };
+
+                                let vout = Vout::from(outpoint.vout);
+
+                                let txoutindex = *vecs
+                                    .txindex_to_first_txoutindex
+                                    .get(prev_txindex)?
+                                    .context("Expect txoutindex to not be none")
+                                    .inspect_err(|_| {
+                                        dbg!(outpoint.txid, prev_txindex, vout);
+                                    })?
+                                    + vout;
+
+                                let addressindex = *vecs
+                                    .txoutindex_to_addressindex
+                                    .get(txoutindex)?
+                                    .context("Expect addressindex to not be none")
+                                    .inspect_err(|_| {
+                                        // let height = vecdisks.txindex_to_height.get(txindex.into()).expect("txindex_to_height get not fail")
+                                        // .expect("Expect height for txindex");
+                                        dbg!(outpoint.txid, prev_txindex, vout, txoutindex);
+                                    })?;
+
+                                Ok((txinindex, InputSource::PreviousBlock((
+                                    vin,
+                                    txindex,
+                                    txoutindex,
+                                    addressindex,
+                                ))))
+                            })
+                            .try_fold(BTreeMap::new, |mut map, tuple| -> color_eyre::Result<_> {
+                                let (key, value) = tuple?;
+                                map.insert(key, value);
+                                Ok(map)
+                            })
+                            .try_reduce(BTreeMap::new, |mut map, mut map2| {
+                                if map.len() > map2.len() {
+                                    map.append(&mut map2);
+                                    Ok(map)
+                                } else {
+                                    map2.append(&mut map);
+                                    Ok(map2)
+                                }
+                            })
+                    });
 
                     let txoutindex_to_txout_addresstype_addressbytes_res_addressindex_opt_handle = scope.spawn(|| {
                         outputs
@@ -410,7 +430,7 @@ impl Indexer {
 
                     (
                         txid_prefix_to_txid_and_block_txindex_and_prev_txindex_handle.join(),
-                        txin_or_addressindextxoutindex_vec_handle.join(),
+                        input_source_vec_handle.join(),
                         txoutindex_to_txout_addresstype_addressbytes_res_addressindex_opt_handle.join(),
                     )
                 });
@@ -422,9 +442,9 @@ impl Indexer {
                             "Expect txid_prefix_to_txid_and_block_txindex_and_prev_txindex_join_handle to join",
                         )??;
 
-                let txin_or_addressindextxoutindex_vec = txin_or_addressindextxoutindex_vec_handle
+                let input_source_vec = input_source_vec_handle
                     .ok()
-                    .context("Export txin_or_addressindextxoutindex_vec_handle to join")??;
+                    .context("Export input_source_vec_handle to join")??;
 
                 let txoutindex_to_txout_addresstype_addressbytes_res_addressindex_opt =
                     txoutindex_to_txout_addresstype_addressbytes_res_addressindex_opt_handle
@@ -433,9 +453,9 @@ impl Indexer {
                             "Expect txoutindex_to_txout_addresstype_addressbytes_res_addressindex_opt_handle to join",
                         )??;
 
-                let mut new_txindexvout_to_addressindextxoutindex: BTreeMap<
+                let mut new_txindexvout_to_txoutindex: BTreeMap<
                     (Txindex, Vout),
-                    (Addressindex, Txoutindex),
+                    Txoutindex,
                 > = BTreeMap::new();
 
                 let mut already_added_addressbytes_prefix: BTreeMap<AddressbytesPrefix, Addressindex> = BTreeMap::new();
@@ -514,15 +534,15 @@ impl Indexer {
                             }
                         }
 
-                        new_txindexvout_to_addressindextxoutindex
-                            .insert((txindex, vout), (addressindex, txoutindex));
+                        new_txindexvout_to_txoutindex
+                            .insert((txindex, vout), txoutindex);
 
                         vecs.txoutindex_to_addressindex
                             .push_if_needed(txoutindex, addressindex)?;
 
-                        stores
-                            .addressindex_to_txoutindex_in
-                            .insert_if_needed(addressindex, txoutindex, height);
+                        // stores
+                        //     .addressindex_to_txoutindex_in
+                        //     .insert_if_needed(addressindex, txoutindex, height);
 
                         Ok(())
                     },
@@ -530,46 +550,63 @@ impl Indexer {
 
                 drop(already_added_addressbytes_prefix);
 
-                txin_or_addressindextxoutindex_vec
+                input_source_vec
                     .into_iter()
                     .map(
-                        |txin_or_addressindextxoutindex| -> color_eyre::Result<(Addressindex, Txindex, Txoutindex)> {
-                            match txin_or_addressindextxoutindex {
-                                TxInOrAddressindextoutindex::AddressTxTxoutIndexes(triplet) => Ok(triplet),
-                                TxInOrAddressindextoutindex::TxIn(txin) => {
+                        #[allow(clippy::type_complexity)]
+                        |(txinindex, input_source)| -> color_eyre::Result<(
+                            Txinindex, Vin, Txindex, Option<(Addressindex, Txoutindex)>
+                        )> {
+                            match input_source {
+                                InputSource::PreviousBlock((vin, txindex, txoutindex, addressindex)) => Ok((txinindex, vin, txindex, Some((addressindex, txoutindex)))),
+                                InputSource::SameBlock((tx, txindex, txin, vin)) => {
+                                    if tx.is_coinbase() {
+                                        return Ok((txinindex, vin, txindex, None));
+                                    }
+
                                     let outpoint = txin.previous_output;
                                     let txid = outpoint.txid;
                                     let vout = Vout::from(outpoint.vout);
-                                    let index = txid_prefix_to_txid_and_block_txindex_and_prev_txindex
+
+                                    let block_txindex = txid_prefix_to_txid_and_block_txindex_and_prev_txindex
                                         .get(&TxidPrefix::try_from(&txid)?)
                                         .context("txid should be in same block")?
                                         .2;
-                                    let txindex = txindex_global + index;
+                                    let prev_txindex = txindex_global + block_txindex;
 
-                                    let (addressindex, txoutindex) = new_txindexvout_to_addressindextxoutindex
-                                        .remove(&(txindex, vout))
+                                    let prev_txoutindex = new_txindexvout_to_txoutindex
+                                        .remove(&(prev_txindex, vout))
                                         .context("should have found addressindex from same block")
                                         .inspect_err(|_| {
-                                            dbg!(&new_txindexvout_to_addressindextxoutindex, txin, txindex, vout, txid);
+                                            dbg!(&new_txindexvout_to_txoutindex, txin, prev_txindex, vout, txid);
                                         })?;
 
-                                    Ok((addressindex, txindex, txoutindex))
+                                    Ok((txinindex, vin, txindex, Some((Addressindex::from(0_u32), prev_txoutindex))))
                                 }
                             }
                         },
                     )
                     .try_for_each(|res| -> color_eyre::Result<()> {
-                        let (addressindex, txindex, txoutindex) = res?;
-                        stores
-                            .addressindex_to_txoutindex_out
-                            .insert_if_needed(addressindex, txoutindex, height);
-                        stores
-                            .txindex_to_txoutindex_in
-                            .insert_if_needed(txindex, txoutindex, height);
+                        let (txinindex, vin, txindex, addressindex_and_txoutindex_opt) = res?;
+
+                        if vin.is_zero() {
+                            vecs.txindex_to_first_txinindex.push_if_needed(txindex, txinindex)?;
+                        }
+
+                        let txoutindex = addressindex_and_txoutindex_opt.map_or(Txoutindex::MAX, |(_, txoutindex)| txoutindex);
+
+                        vecs.txinindex_to_txoutindex.push_if_needed(txinindex, txoutindex)?;
+
+                        // if let Some(addressindex) = addressindex_and_txoutindex_opt.map(|(addressindex, _)| addressindex) {
+                        //     stores
+                        //         .addressindex_to_txoutindex_out
+                        //         .insert_if_needed(addressindex, txoutindex, height);
+                        // }
+
                         Ok(())
                     })?;
 
-                drop(new_txindexvout_to_addressindextxoutindex);
+                drop(new_txindexvout_to_txoutindex);
 
                 let mut txindex_to_tx_and_txid: BTreeMap<Txindex, (&Transaction, Txid)> = BTreeMap::default();
 
@@ -644,6 +681,7 @@ impl Indexer {
                     })?;
 
                 txindex_global += Txindex::from(tx_len);
+                txinindex_global += Txinindex::from(inputs_len);
                 txoutindex_global += Txoutindex::from(outputs_len);
 
                 let should_snapshot = _height != 0 && _height % SNAPSHOT_BLOCK_RANGE == 0 && !exit.active();
@@ -663,6 +701,13 @@ impl Indexer {
     }
 }
 
+#[derive(Debug)]
+enum InputSource<'a> {
+    PreviousBlock((Vin, Txindex, Txoutindex, Addressindex)),
+    SameBlock((&'a Transaction, Txindex, &'a TxIn, Vin)),
+}
+
+#[allow(unused)]
 fn pause() {
     let mut stdin = std::io::stdin();
     let mut stdout = std::io::stdout();
diff --git a/bindex/src/main.rs b/bindex/src/main.rs
index bd571c95b..9a0ee8dc3 100644
--- a/bindex/src/main.rs
+++ b/bindex/src/main.rs
@@ -1,14 +1,8 @@
 use std::path::Path;
 
+use bindex::Indexer;
 use biter::rpc;
-
-mod indexer;
-mod storage;
-mod structs;
-
 use exit::Exit;
-use indexer::Indexer;
-use structs::{AddressbytesPrefix, Addressindex, BlockHashPrefix, Height, TxidPrefix, Txindex, Txoutindex};
 
 // https://github.com/romanz/electrs/blob/master/doc/schema.md
 
diff --git a/bindex/src/storage/stores/mod.rs b/bindex/src/storage/stores/mod.rs
index e9e500fa7..778943ad8 100644
--- a/bindex/src/storage/stores/mod.rs
+++ b/bindex/src/storage/stores/mod.rs
@@ -14,11 +14,10 @@ use unique::*;
 
 pub struct Stores {
     pub addressbytes_prefix_to_addressindex: StoreUnique<AddressbytesPrefix, Addressindex>,
-    pub addressindex_to_txoutindex_in: StoreMulti<Addressindex, Txoutindex>, // Received
-    pub addressindex_to_txoutindex_out: StoreMulti<Addressindex, Txoutindex>, // Spent
+    // pub addressindex_to_txoutindex_in: StoreMulti<Addressindex, Txoutindex>, // Received
+    // pub addressindex_to_txoutindex_out: StoreMulti<Addressindex, Txoutindex>, // Spent
     pub blockhash_prefix_to_height: StoreUnique<BlockHashPrefix, Height>,
     pub txid_prefix_to_txindex: StoreUnique<TxidPrefix, Txindex>,
-    pub txindex_to_txoutindex_in: StoreMulti<Txindex, Txoutindex>, // Inputs
 }
 
 impl Stores {
@@ -28,17 +27,16 @@ impl Stores {
                 &path.join("addressbytes_prefix_to_addressindex"),
                 Version::from(1),
             )?,
-            addressindex_to_txoutindex_in: StoreMulti::open(
-                &path.join("addressindex_to_txoutindex_in"),
-                Version::from(1),
-            )?,
-            addressindex_to_txoutindex_out: StoreMulti::open(
-                &path.join("addressindex_to_txoutindex_out"),
-                Version::from(1),
-            )?,
+            // addressindex_to_txoutindex_in: StoreMulti::open(
+            //     &path.join("addressindex_to_txoutindex_in"),
+            //     Version::from(1),
+            // )?,
+            // addressindex_to_txoutindex_out: StoreMulti::open(
+            //     &path.join("addressindex_to_txoutindex_out"),
+            //     Version::from(1),
+            // )?,
             blockhash_prefix_to_height: StoreUnique::open(&path.join("blockhash_prefix_to_height"), Version::from(1))?,
             txid_prefix_to_txindex: StoreUnique::open(&path.join("txid_prefix_to_txindex"), Version::from(1))?,
-            txindex_to_txoutindex_in: StoreMulti::open(&path.join("txindex_to_txoutindex_in"), Version::from(1))?,
         })
     }
 
@@ -164,11 +162,10 @@ impl Stores {
     pub fn min_height(&self) -> Option<Height> {
         [
             self.addressbytes_prefix_to_addressindex.height(),
-            self.addressindex_to_txoutindex_in.height(),
-            self.addressindex_to_txoutindex_out.height(),
+            // self.addressindex_to_txoutindex_in.height(),
+            // self.addressindex_to_txoutindex_out.height(),
             self.blockhash_prefix_to_height.height(),
             self.txid_prefix_to_txindex.height(),
-            self.txindex_to_txoutindex_in.height(),
         ]
         .into_iter()
         .min()
@@ -180,11 +177,10 @@ impl Stores {
         thread::scope(|scope| {
             vec![
                 scope.spawn(|| self.addressbytes_prefix_to_addressindex.export(height)),
-                scope.spawn(|| self.addressindex_to_txoutindex_in.export(height)),
-                scope.spawn(|| self.addressindex_to_txoutindex_out.export(height)),
+                // scope.spawn(|| self.addressindex_to_txoutindex_in.export(height)),
+                // scope.spawn(|| self.addressindex_to_txoutindex_out.export(height)),
                 scope.spawn(|| self.blockhash_prefix_to_height.export(height)),
                 scope.spawn(|| self.txid_prefix_to_txindex.export(height)),
-                scope.spawn(|| self.txindex_to_txoutindex_in.export(height)),
             ]
             .into_iter()
             .try_for_each(|handle| -> Result<(), snkrj::Error> { handle.join().unwrap() })
diff --git a/bindex/src/storage/stores/multi.rs b/bindex/src/storage/stores/multi.rs
index 2c5cf2e4b..68250e8d7 100644
--- a/bindex/src/storage/stores/multi.rs
+++ b/bindex/src/storage/stores/multi.rs
@@ -58,6 +58,7 @@ where
         });
     }
 
+    #[allow(unused)]
     pub fn get(&self, key: &K) -> Result<Option<&V>, snkrj::Error> {
         self.get_or_init_store(key).get(key)
     }
@@ -92,6 +93,7 @@ where
     pub fn height(&self) -> Option<&Height> {
         self.meta.height()
     }
+    #[allow(unused)]
     pub fn needs(&self, height: Height) -> bool {
         self.meta.needs(height)
     }
diff --git a/bindex/src/storage/vecs/base.rs b/bindex/src/storage/vecs/base.rs
index 834bfc435..9149d3b34 100644
--- a/bindex/src/storage/vecs/base.rs
+++ b/bindex/src/storage/vecs/base.rs
@@ -81,6 +81,7 @@ where
     pub fn needs(&self, height: Height) -> bool {
         self.height.is_none_or(|self_height| height > self_height)
     }
+    #[allow(unused)]
     pub fn has(&self, height: Height) -> bool {
         !self.needs(height)
     }
diff --git a/bindex/src/storage/vecs/mod.rs b/bindex/src/storage/vecs/mod.rs
index 05ff6b180..471f37c1c 100644
--- a/bindex/src/storage/vecs/mod.rs
+++ b/bindex/src/storage/vecs/mod.rs
@@ -1,15 +1,13 @@
 use std::{fs, io, path::Path};
 
 use biter::bitcoin::{self, transaction, BlockHash, Txid, Weight};
-use color_eyre::eyre::eyre;
 use exit::Exit;
 use rayon::prelude::*;
-use storable_vec::AnyStorableVec;
 
 use crate::structs::{
     Addressbytes, Addressindex, Addresstype, Addresstypeindex, Amount, Height, P2PK33AddressBytes, P2PK65AddressBytes,
     P2PKHAddressBytes, P2SHAddressBytes, P2TRAddressBytes, P2WPKHAddressBytes, P2WSHAddressBytes, Timestamp, Txindex,
-    Txoutindex, Version,
+    Txinindex, Txoutindex, Version,
 };
 
 mod base;
@@ -27,6 +25,7 @@ pub struct Vecs {
     pub height_to_first_opreturnindex: StorableVec<Height, Addresstypeindex>,
     pub height_to_first_pushonlyindex: StorableVec<Height, Addresstypeindex>,
     pub height_to_first_txindex: StorableVec<Height, Txindex>,
+    pub height_to_first_txinindex: StorableVec<Height, Txinindex>,
     pub height_to_first_txoutindex: StorableVec<Height, Txoutindex>,
     pub height_to_first_unknownindex: StorableVec<Height, Addresstypeindex>,
     pub height_to_p2pk33index: StorableVec<Height, Addresstypeindex>,
@@ -46,11 +45,13 @@ pub struct Vecs {
     pub p2trindex_to_p2traddressbytes: StorableVec<Addresstypeindex, P2TRAddressBytes>,
     pub p2wpkhindex_to_p2wpkhaddressbytes: StorableVec<Addresstypeindex, P2WPKHAddressBytes>,
     pub p2wshindex_to_p2wshaddressbytes: StorableVec<Addresstypeindex, P2WSHAddressBytes>,
+    pub txindex_to_first_txinindex: StorableVec<Txindex, Txinindex>,
     pub txindex_to_first_txoutindex: StorableVec<Txindex, Txoutindex>,
     pub txindex_to_height: StorableVec<Txindex, Height>,
     pub txindex_to_locktime: StorableVec<Txindex, bitcoin::absolute::LockTime>,
     pub txindex_to_txid: StorableVec<Txindex, Txid>,
     pub txindex_to_txversion: StorableVec<Txindex, transaction::Version>,
+    pub txinindex_to_txoutindex: StorableVec<Txinindex, Txoutindex>,
     pub txoutindex_to_addressindex: StorableVec<Txoutindex, Addressindex>,
     pub txoutindex_to_amount: StorableVec<Txoutindex, Amount>,
     // Can be computed later:
@@ -110,6 +111,7 @@ impl Vecs {
                 Version::from(1),
             )?,
             height_to_first_txindex: StorableVec::import(&path.join("height_to_first_txindex"), Version::from(1))?,
+            height_to_first_txinindex: StorableVec::import(&path.join("height_to_first_txinindex"), Version::from(1))?,
             height_to_first_txoutindex: StorableVec::import(
                 &path.join("height_to_first_txoutindex"),
                 Version::from(1),
@@ -156,6 +158,10 @@ impl Vecs {
                 &path.join("p2wshindex_to_p2wshaddressbytes"),
                 Version::from(1),
             )?,
+            txindex_to_first_txinindex: StorableVec::import(
+                &path.join("txindex_to_first_txinindex"),
+                Version::from(1),
+            )?,
             txindex_to_first_txoutindex: StorableVec::import(
                 &path.join("txindex_to_first_txoutindex"),
                 Version::from(1),
@@ -164,6 +170,7 @@ impl Vecs {
             txindex_to_locktime: StorableVec::import(&path.join("txindex_to_locktime"), Version::from(1))?,
             txindex_to_txid: StorableVec::import(&path.join("txindex_to_txid"), Version::from(1))?,
             txindex_to_txversion: StorableVec::import(&path.join("txindex_to_txversion"), Version::from(1))?,
+            txinindex_to_txoutindex: StorableVec::import(&path.join("txinindex_to_txoutindex"), Version::from(1))?,
             txoutindex_to_addressindex: StorableVec::import(
                 &path.join("txoutindex_to_addressindex"),
                 Version::from(1),
@@ -361,7 +368,7 @@ impl Vecs {
             .min())
     }
 
-    pub fn as_slice(&self) -> [&dyn AnyBindexVec; 36] {
+    pub fn as_slice(&self) -> [&dyn AnyBindexVec; 39] {
         [
             &self.addressindex_to_addresstype as &dyn AnyBindexVec,
             &self.addressindex_to_addresstypeindex,
@@ -373,6 +380,7 @@ impl Vecs {
             &self.height_to_first_opreturnindex,
             &self.height_to_first_pushonlyindex,
             &self.height_to_first_txindex,
+            &self.height_to_first_txinindex,
             &self.height_to_first_txoutindex,
             &self.height_to_first_unknownindex,
             &self.height_to_p2pk33index,
@@ -392,17 +400,19 @@ impl Vecs {
             &self.p2trindex_to_p2traddressbytes,
             &self.p2wpkhindex_to_p2wpkhaddressbytes,
             &self.p2wshindex_to_p2wshaddressbytes,
+            &self.txindex_to_first_txinindex,
             &self.txindex_to_first_txoutindex,
             &self.txindex_to_height,
             &self.txindex_to_locktime,
             &self.txindex_to_txid,
             &self.txindex_to_txversion,
+            &self.txinindex_to_txoutindex,
             &self.txoutindex_to_addressindex,
             &self.txoutindex_to_amount,
         ]
     }
 
-    pub fn as_mut_slice(&mut self) -> [&mut (dyn AnyBindexVec + Send + Sync); 36] {
+    pub fn as_mut_slice(&mut self) -> [&mut (dyn AnyBindexVec + Send + Sync); 39] {
         [
             &mut self.addressindex_to_addresstype as &mut (dyn AnyBindexVec + Send + Sync),
             &mut self.addressindex_to_addresstypeindex,
@@ -414,6 +424,7 @@ impl Vecs {
             &mut self.height_to_first_opreturnindex,
             &mut self.height_to_first_pushonlyindex,
             &mut self.height_to_first_txindex,
+            &mut self.height_to_first_txinindex,
             &mut self.height_to_first_txoutindex,
             &mut self.height_to_first_unknownindex,
             &mut self.height_to_p2pk33index,
@@ -433,11 +444,13 @@ impl Vecs {
             &mut self.p2trindex_to_p2traddressbytes,
             &mut self.p2wpkhindex_to_p2wpkhaddressbytes,
             &mut self.p2wshindex_to_p2wshaddressbytes,
+            &mut self.txindex_to_first_txinindex,
             &mut self.txindex_to_first_txoutindex,
             &mut self.txindex_to_height,
             &mut self.txindex_to_locktime,
             &mut self.txindex_to_txid,
             &mut self.txindex_to_txversion,
+            &mut self.txinindex_to_txoutindex,
             &mut self.txoutindex_to_addressindex,
             &mut self.txoutindex_to_amount,
         ]
diff --git a/bindex/src/structs/addressindextxoutindex.rs b/bindex/src/structs/addressindextxoutindex.rs
deleted file mode 100644
index aa07e3bec..000000000
--- a/bindex/src/structs/addressindextxoutindex.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-use snkrj::{direct_repr, Storable, UnsizedStorable};
-
-use super::{Addressindex, Txoutindex};
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
-pub struct Addressindextxoutindex {
-    addressindex: Addressindex,
-    txoutindex: Txoutindex,
-}
-direct_repr!(Addressindextxoutindex);
-
-impl From<(Addressindex, Txoutindex)> for Addressindextxoutindex {
-    fn from(value: (Addressindex, Txoutindex)) -> Self {
-        Self {
-            addressindex: value.0,
-            txoutindex: value.1,
-        }
-    }
-}
diff --git a/bindex/src/structs/mod.rs b/bindex/src/structs/mod.rs
index 44e08c7c1..7f5daac0a 100644
--- a/bindex/src/structs/mod.rs
+++ b/bindex/src/structs/mod.rs
@@ -8,8 +8,10 @@ mod prefix;
 mod slice;
 mod timestamp;
 mod txindex;
+mod txinindex;
 mod txoutindex;
 mod version;
+mod vin;
 mod vout;
 
 pub use addressbytes::*;
@@ -22,6 +24,8 @@ pub use prefix::*;
 pub use slice::*;
 pub use timestamp::*;
 pub use txindex::*;
+pub use txinindex::*;
 pub use txoutindex::*;
 pub use version::*;
+pub use vin::*;
 pub use vout::*;
diff --git a/bindex/src/structs/prefix.rs b/bindex/src/structs/prefix.rs
index 98a579ed7..6ae4e0306 100644
--- a/bindex/src/structs/prefix.rs
+++ b/bindex/src/structs/prefix.rs
@@ -1,3 +1,5 @@
+use std::hash::Hasher;
+
 use biter::bitcoin::{BlockHash, Txid};
 use derive_deref::Deref;
 use snkrj::{direct_repr, Storable, UnsizedStorable};
@@ -9,23 +11,11 @@ pub struct AddressbytesPrefix([u8; 8]);
 direct_repr!(AddressbytesPrefix);
 impl From<(&Addressbytes, Addresstype)> for AddressbytesPrefix {
     fn from((addressbytes, addresstype): (&Addressbytes, Addresstype)) -> Self {
-        let shorten = |slice: &[u8]| {
-            let len = slice.len();
-            let mut buf: [u8; 8] = [0; 8];
-            // Using both ends for collision reasons despite rehashing the addresses
-            (0..4_usize).for_each(|i| {
-                buf[i] = slice[i];
-                buf[4 + i] = slice[len - 4 + i];
-            });
-            buf[4] = addresstype as u8;
-            // Put in the middle and not at the start because either the first or the last byte can be used to split and if the type is used it wouldn't have the 0..256 range
-            // End result:
-            // [ i=0, i=1, i=2, i=3, type as u8, i=len-3, i=len-2, i=len-1 ]
-            buf
-        };
-        Self(shorten(
-            bitcoin_hashes::hash160::Hash::hash(addressbytes.as_slice()).as_byte_array(),
-        ))
+        let mut hasher = rapidhash::RapidHasher::default();
+        hasher.write(addressbytes.as_slice());
+        let mut slice = hasher.finish().to_le_bytes();
+        slice[0] = slice[0].wrapping_add(addresstype as u8);
+        Self(slice)
     }
 }
 impl From<[u8; 8]> for AddressbytesPrefix {
diff --git a/bindex/src/structs/txindexvout.rs b/bindex/src/structs/txindexvout.rs
deleted file mode 100644
index 6ba23d23c..000000000
--- a/bindex/src/structs/txindexvout.rs
+++ /dev/null
@@ -1,28 +0,0 @@
-use snkrj::{direct_repr, Storable, UnsizedStorable};
-
-use super::Txindex;
-
-#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Default)]
-pub struct Txindexvout {
-    pub txindex: Txindex,
-    pub vout: u32,
-}
-direct_repr!(Txindexvout);
-
-impl From<Txindex> for Txindexvout {
-    fn from(value: Txindex) -> Self {
-        Self {
-            txindex: value,
-            vout: 0,
-        }
-    }
-}
-
-impl From<(Txindex, u32)> for Txindexvout {
-    fn from(value: (Txindex, u32)) -> Self {
-        Self {
-            txindex: value.0,
-            vout: value.1,
-        }
-    }
-}
diff --git a/bindex/src/structs/txinindex.rs b/bindex/src/structs/txinindex.rs
new file mode 100644
index 000000000..2c6bb7ad1
--- /dev/null
+++ b/bindex/src/structs/txinindex.rs
@@ -0,0 +1,62 @@
+use std::ops::{Add, AddAssign};
+
+use derive_deref::{Deref, DerefMut};
+use snkrj::{direct_repr, Storable, UnsizedStorable};
+
+use super::Vout;
+
+#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Deref, DerefMut, Default)]
+pub struct Txinindex(u64);
+direct_repr!(Txinindex);
+
+impl Txinindex {
+    pub fn incremented(self) -> Self {
+        Self(*self + 1)
+    }
+
+    pub fn decremented(self) -> Self {
+        Self(*self - 1)
+    }
+}
+
+impl Add<Txinindex> for Txinindex {
+    type Output = Self;
+    fn add(self, rhs: Txinindex) -> Self::Output {
+        Self(self.0 + rhs.0)
+    }
+}
+
+impl Add<Vout> for Txinindex {
+    type Output = Self;
+    fn add(self, rhs: Vout) -> Self::Output {
+        Self(self.0 + u64::from(rhs))
+    }
+}
+
+impl AddAssign<Txinindex> for Txinindex {
+    fn add_assign(&mut self, rhs: Txinindex) {
+        self.0 += rhs.0
+    }
+}
+
+impl From<u64> for Txinindex {
+    fn from(value: u64) -> Self {
+        Self(value)
+    }
+}
+impl From<Txinindex> for u64 {
+    fn from(value: Txinindex) -> Self {
+        value.0
+    }
+}
+
+impl From<usize> for Txinindex {
+    fn from(value: usize) -> Self {
+        Self(value as u64)
+    }
+}
+impl From<Txinindex> for usize {
+    fn from(value: Txinindex) -> Self {
+        value.0 as usize
+    }
+}
diff --git a/bindex/src/structs/txoutindex.rs b/bindex/src/structs/txoutindex.rs
index f0dfba968..d4083fb05 100644
--- a/bindex/src/structs/txoutindex.rs
+++ b/bindex/src/structs/txoutindex.rs
@@ -1,4 +1,7 @@
-use std::ops::{Add, AddAssign};
+use std::{
+    ops::{Add, AddAssign},
+    u64,
+};
 
 use derive_deref::{Deref, DerefMut};
 use snkrj::{direct_repr, Storable, UnsizedStorable};
@@ -10,6 +13,8 @@ pub struct Txoutindex(u64);
 direct_repr!(Txoutindex);
 
 impl Txoutindex {
+    pub const MAX: Self = Self(u64::MAX);
+
     pub fn incremented(self) -> Self {
         Self(*self + 1)
     }
@@ -17,6 +22,10 @@ impl Txoutindex {
     pub fn decremented(self) -> Self {
         Self(*self - 1)
     }
+
+    pub fn is_coinbase(self) -> bool {
+        self == Self::MAX
+    }
 }
 
 impl Add<Txoutindex> for Txoutindex {
diff --git a/bindex/src/structs/vin.rs b/bindex/src/structs/vin.rs
new file mode 100644
index 000000000..65524d489
--- /dev/null
+++ b/bindex/src/structs/vin.rs
@@ -0,0 +1,30 @@
+use derive_deref::Deref;
+
+#[derive(Debug, Deref, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
+pub struct Vin(u32);
+
+impl Vin {
+    const ZERO: Self = Vin(0_u32);
+
+    pub fn is_zero(&self) -> bool {
+        *self == Self::ZERO
+    }
+}
+
+impl From<u32> for Vin {
+    fn from(value: u32) -> Self {
+        Self(value)
+    }
+}
+
+impl From<usize> for Vin {
+    fn from(value: usize) -> Self {
+        Self(value as u32)
+    }
+}
+
+impl From<Vin> for u64 {
+    fn from(value: Vin) -> Self {
+        value.0 as u64
+    }
+}

From 042be6e2291c37912972617cab17da368dce8204 Mon Sep 17 00:00:00 2001
From: nym21 <expat-epochs0i@icloud.com>
Date: Mon, 27 Jan 2025 09:55:28 +0100
Subject: [PATCH 29/63] bindex: removed addressindex to in/out puts as they're
 computable later

---
 bindex/src/lib.rs                    | 102 ++++++++-------------------
 bindex/src/storage/partitions/mod.rs |   0
 bindex/src/storage/stores/mod.rs     |  15 ----
 bindex/src/storage/stores/multi.rs   |   6 +-
 bindex/src/storage/stores/unique.rs  |   6 +-
 bindex/src/storage/vecs/mod.rs       |  71 +++++++++++--------
 bindex/src/structs/txoutindex.rs     |   9 +--
 7 files changed, 83 insertions(+), 126 deletions(-)
 create mode 100644 bindex/src/storage/partitions/mod.rs

diff --git a/bindex/src/lib.rs b/bindex/src/lib.rs
index 8509fbdf5..17584650a 100644
--- a/bindex/src/lib.rs
+++ b/bindex/src/lib.rs
@@ -24,8 +24,7 @@ use structs::{
 };
 
 const UNSAFE_BLOCKS: u32 = 100;
-const DAILY_BLOCK_TARGET: usize = 144;
-const SNAPSHOT_BLOCK_RANGE: usize = DAILY_BLOCK_TARGET * 10;
+const SNAPSHOT_BLOCK_RANGE: usize = 1000;
 
 #[derive(Debug)]
 pub struct Indexer;
@@ -53,29 +52,27 @@ impl Indexer {
         let mut txoutindex_global = vecs.height_to_first_txoutindex.get_or_default(height)?;
         let mut addressindex_global = vecs.height_to_first_addressindex.get_or_default(height)?;
         let mut emptyindex_global = vecs.height_to_first_emptyindex.get_or_default(height)?;
-        let mut multisigindex_global = vecs.height_to_first_emptyindex.get_or_default(height)?;
-        let mut opreturnindex_global = vecs.height_to_first_emptyindex.get_or_default(height)?;
-        let mut pushonlyindex_global = vecs.height_to_first_emptyindex.get_or_default(height)?;
-        let mut unknownindex_global = vecs.height_to_first_emptyindex.get_or_default(height)?;
-        let mut p2pk33index_global = vecs.height_to_p2pk33index.get_or_default(height)?;
-        let mut p2pk65index_global = vecs.height_to_p2pk65index.get_or_default(height)?;
-        let mut p2pkhindex_global = vecs.height_to_p2pkhindex.get_or_default(height)?;
-        let mut p2shindex_global = vecs.height_to_p2shindex.get_or_default(height)?;
-        let mut p2trindex_global = vecs.height_to_p2trindex.get_or_default(height)?;
-        let mut p2wpkhindex_global = vecs.height_to_p2wpkhindex.get_or_default(height)?;
-        let mut p2wshindex_global = vecs.height_to_p2wshindex.get_or_default(height)?;
+        let mut multisigindex_global = vecs.height_to_first_multisigindex.get_or_default(height)?;
+        let mut opreturnindex_global = vecs.height_to_first_opreturnindex.get_or_default(height)?;
+        let mut pushonlyindex_global = vecs.height_to_first_pushonlyindex.get_or_default(height)?;
+        let mut unknownindex_global = vecs.height_to_first_unknownindex.get_or_default(height)?;
+        let mut p2pk33index_global = vecs.height_to_first_p2pk33index.get_or_default(height)?;
+        let mut p2pk65index_global = vecs.height_to_first_p2pk65index.get_or_default(height)?;
+        let mut p2pkhindex_global = vecs.height_to_first_p2pkhindex.get_or_default(height)?;
+        let mut p2shindex_global = vecs.height_to_first_p2shindex.get_or_default(height)?;
+        let mut p2trindex_global = vecs.height_to_first_p2trindex.get_or_default(height)?;
+        let mut p2wpkhindex_global = vecs.height_to_first_p2wpkhindex.get_or_default(height)?;
+        let mut p2wshindex_global = vecs.height_to_first_p2wshindex.get_or_default(height)?;
 
         let export = |stores: Stores, vecs: &mut Vecs, height: Height| -> color_eyre::Result<()> {
             println!("Exporting...");
 
+            if height >= Height::from(400_000_u32) {
+                pause();
+                //     println!("Flushing vecs...");
+            }
+
             exit.block();
-            // At 401760
-            // Memory: 1.87 GB
-            // Real Memory: 13.46 GB
-            // if height >= Height::from(400_000_u32) {
-            //     pause();
-            // }
-            println!("Flushing vecs...");
 
             thread::scope(|scope| -> color_eyre::Result<()> {
                 let vecs_handle = scope.spawn(|| vecs.flush(height));
@@ -85,27 +82,13 @@ impl Indexer {
                 Ok(())
             })?;
 
-            // At 401760
-            // Memory: 1.83 GB
-            // Real Memory: 9.45 GB
-            // if height >= Height::from(400_000_u32) {
-            //     pause();
-            // }
-
-            // At: 401760
-            // Memory: 1.34 GB
-            // Real Memory: 1.52 GB
-            println!("All done...");
-            // if height >= Height::from(400_000_u32) {
-            //     pause();
-            // }
             exit.unblock();
             Ok(())
         };
 
         let mut stores_opt = Some(stores);
 
-        biter::new(bitcoin_dir, Some(height.into()), None, rpc)
+        biter::new(bitcoin_dir, Some(height.into()), Some(500_000), rpc)
             .iter()
             .try_for_each(|(_height, block, blockhash)| -> color_eyre::Result<()> {
                 println!("Processing block {_height}...");
@@ -158,13 +141,13 @@ impl Indexer {
                     .push_if_needed(height, pushonlyindex_global)?;
                 vecs.height_to_first_unknownindex
                     .push_if_needed(height, unknownindex_global)?;
-                vecs.height_to_p2pk33index.push_if_needed(height, p2pk33index_global)?;
-                vecs.height_to_p2pk65index.push_if_needed(height, p2pk65index_global)?;
-                vecs.height_to_p2pkhindex.push_if_needed(height, p2pkhindex_global)?;
-                vecs.height_to_p2shindex.push_if_needed(height, p2shindex_global)?;
-                vecs.height_to_p2trindex.push_if_needed(height, p2trindex_global)?;
-                vecs.height_to_p2wpkhindex.push_if_needed(height, p2wpkhindex_global)?;
-                vecs.height_to_p2wshindex.push_if_needed(height, p2wshindex_global)?;
+                vecs.height_to_first_p2pk33index.push_if_needed(height, p2pk33index_global)?;
+                vecs.height_to_first_p2pk65index.push_if_needed(height, p2pk65index_global)?;
+                vecs.height_to_first_p2pkhindex.push_if_needed(height, p2pkhindex_global)?;
+                vecs.height_to_first_p2shindex.push_if_needed(height, p2shindex_global)?;
+                vecs.height_to_first_p2trindex.push_if_needed(height, p2trindex_global)?;
+                vecs.height_to_first_p2wpkhindex.push_if_needed(height, p2wpkhindex_global)?;
+                vecs.height_to_first_p2wshindex.push_if_needed(height, p2wshindex_global)?;
 
                 let inputs = block
                     .txdata
@@ -276,21 +259,10 @@ impl Indexer {
                                     })?
                                     + vout;
 
-                                let addressindex = *vecs
-                                    .txoutindex_to_addressindex
-                                    .get(txoutindex)?
-                                    .context("Expect addressindex to not be none")
-                                    .inspect_err(|_| {
-                                        // let height = vecdisks.txindex_to_height.get(txindex.into()).expect("txindex_to_height get not fail")
-                                        // .expect("Expect height for txindex");
-                                        dbg!(outpoint.txid, prev_txindex, vout, txoutindex);
-                                    })?;
-
                                 Ok((txinindex, InputSource::PreviousBlock((
                                     vin,
                                     txindex,
                                     txoutindex,
-                                    addressindex,
                                 ))))
                             })
                             .try_fold(BTreeMap::new, |mut map, tuple| -> color_eyre::Result<_> {
@@ -540,10 +512,6 @@ impl Indexer {
                         vecs.txoutindex_to_addressindex
                             .push_if_needed(txoutindex, addressindex)?;
 
-                        // stores
-                        //     .addressindex_to_txoutindex_in
-                        //     .insert_if_needed(addressindex, txoutindex, height);
-
                         Ok(())
                     },
                 )?;
@@ -555,13 +523,13 @@ impl Indexer {
                     .map(
                         #[allow(clippy::type_complexity)]
                         |(txinindex, input_source)| -> color_eyre::Result<(
-                            Txinindex, Vin, Txindex, Option<(Addressindex, Txoutindex)>
+                            Txinindex, Vin, Txindex, Txoutindex
                         )> {
                             match input_source {
-                                InputSource::PreviousBlock((vin, txindex, txoutindex, addressindex)) => Ok((txinindex, vin, txindex, Some((addressindex, txoutindex)))),
+                                InputSource::PreviousBlock((vin, txindex, txoutindex)) => Ok((txinindex, vin, txindex, txoutindex)),
                                 InputSource::SameBlock((tx, txindex, txin, vin)) => {
                                     if tx.is_coinbase() {
-                                        return Ok((txinindex, vin, txindex, None));
+                                        return Ok((txinindex, vin, txindex, Txoutindex::COINBASE));
                                     }
 
                                     let outpoint = txin.previous_output;
@@ -581,28 +549,20 @@ impl Indexer {
                                             dbg!(&new_txindexvout_to_txoutindex, txin, prev_txindex, vout, txid);
                                         })?;
 
-                                    Ok((txinindex, vin, txindex, Some((Addressindex::from(0_u32), prev_txoutindex))))
+                                    Ok((txinindex, vin, txindex, prev_txoutindex))
                                 }
                             }
                         },
                     )
                     .try_for_each(|res| -> color_eyre::Result<()> {
-                        let (txinindex, vin, txindex, addressindex_and_txoutindex_opt) = res?;
+                        let (txinindex, vin, txindex, txoutindex) = res?;
 
                         if vin.is_zero() {
                             vecs.txindex_to_first_txinindex.push_if_needed(txindex, txinindex)?;
                         }
 
-                        let txoutindex = addressindex_and_txoutindex_opt.map_or(Txoutindex::MAX, |(_, txoutindex)| txoutindex);
-
                         vecs.txinindex_to_txoutindex.push_if_needed(txinindex, txoutindex)?;
 
-                        // if let Some(addressindex) = addressindex_and_txoutindex_opt.map(|(addressindex, _)| addressindex) {
-                        //     stores
-                        //         .addressindex_to_txoutindex_out
-                        //         .insert_if_needed(addressindex, txoutindex, height);
-                        // }
-
                         Ok(())
                     })?;
 
@@ -703,7 +663,7 @@ impl Indexer {
 
 #[derive(Debug)]
 enum InputSource<'a> {
-    PreviousBlock((Vin, Txindex, Txoutindex, Addressindex)),
+    PreviousBlock((Vin, Txindex, Txoutindex)),
     SameBlock((&'a Transaction, Txindex, &'a TxIn, Vin)),
 }
 
diff --git a/bindex/src/storage/partitions/mod.rs b/bindex/src/storage/partitions/mod.rs
new file mode 100644
index 000000000..e69de29bb
diff --git a/bindex/src/storage/stores/mod.rs b/bindex/src/storage/stores/mod.rs
index 778943ad8..8a00fb17a 100644
--- a/bindex/src/storage/stores/mod.rs
+++ b/bindex/src/storage/stores/mod.rs
@@ -9,13 +9,10 @@ mod multi;
 mod unique;
 
 use meta::*;
-use multi::*;
 use unique::*;
 
 pub struct Stores {
     pub addressbytes_prefix_to_addressindex: StoreUnique<AddressbytesPrefix, Addressindex>,
-    // pub addressindex_to_txoutindex_in: StoreMulti<Addressindex, Txoutindex>, // Received
-    // pub addressindex_to_txoutindex_out: StoreMulti<Addressindex, Txoutindex>, // Spent
     pub blockhash_prefix_to_height: StoreUnique<BlockHashPrefix, Height>,
     pub txid_prefix_to_txindex: StoreUnique<TxidPrefix, Txindex>,
 }
@@ -27,14 +24,6 @@ impl Stores {
                 &path.join("addressbytes_prefix_to_addressindex"),
                 Version::from(1),
             )?,
-            // addressindex_to_txoutindex_in: StoreMulti::open(
-            //     &path.join("addressindex_to_txoutindex_in"),
-            //     Version::from(1),
-            // )?,
-            // addressindex_to_txoutindex_out: StoreMulti::open(
-            //     &path.join("addressindex_to_txoutindex_out"),
-            //     Version::from(1),
-            // )?,
             blockhash_prefix_to_height: StoreUnique::open(&path.join("blockhash_prefix_to_height"), Version::from(1))?,
             txid_prefix_to_txindex: StoreUnique::open(&path.join("txid_prefix_to_txindex"), Version::from(1))?,
         })
@@ -162,8 +151,6 @@ impl Stores {
     pub fn min_height(&self) -> Option<Height> {
         [
             self.addressbytes_prefix_to_addressindex.height(),
-            // self.addressindex_to_txoutindex_in.height(),
-            // self.addressindex_to_txoutindex_out.height(),
             self.blockhash_prefix_to_height.height(),
             self.txid_prefix_to_txindex.height(),
         ]
@@ -177,8 +164,6 @@ impl Stores {
         thread::scope(|scope| {
             vec![
                 scope.spawn(|| self.addressbytes_prefix_to_addressindex.export(height)),
-                // scope.spawn(|| self.addressindex_to_txoutindex_in.export(height)),
-                // scope.spawn(|| self.addressindex_to_txoutindex_out.export(height)),
                 scope.spawn(|| self.blockhash_prefix_to_height.export(height)),
                 scope.spawn(|| self.txid_prefix_to_txindex.export(height)),
             ]
diff --git a/bindex/src/storage/stores/multi.rs b/bindex/src/storage/stores/multi.rs
index 68250e8d7..4ac8f15b6 100644
--- a/bindex/src/storage/stores/multi.rs
+++ b/bindex/src/storage/stores/multi.rs
@@ -11,7 +11,7 @@ where
     V: DatabaseValue,
 {
     meta: StoreMeta,
-    pub parts: [OnceLock<Box<DatabaseMulti<K, V>>>; 64],
+    pub parts: [OnceLock<Box<DatabaseMulti<K, V>>>; 256],
 }
 
 impl<K, V> StoreMulti<K, V>
@@ -33,7 +33,7 @@ where
     // }
 
     fn get_or_init_store(&self, key: &K) -> &DatabaseMulti<K, V> {
-        self.get_or_init_store_(key.as_ne_six_bits() as usize)
+        self.get_or_init_store_(key.as_ne_byte() as usize)
     }
 
     fn get_or_init_store_(&self, storeindex: usize) -> &DatabaseMulti<K, V> {
@@ -45,7 +45,7 @@ where
         self.get_or_init_store(key);
 
         self.parts
-            .get_mut(key.as_ne_six_bits() as usize)
+            .get_mut(key.as_ne_byte() as usize)
             .unwrap()
             .get_mut()
             .unwrap()
diff --git a/bindex/src/storage/stores/unique.rs b/bindex/src/storage/stores/unique.rs
index ff4864181..6c958d6d1 100644
--- a/bindex/src/storage/stores/unique.rs
+++ b/bindex/src/storage/stores/unique.rs
@@ -11,7 +11,7 @@ where
     V: DatabaseValue,
 {
     meta: StoreMeta,
-    pub parts: [OnceLock<Box<DatabaseUnique<K, V>>>; 64],
+    pub parts: [OnceLock<Box<DatabaseUnique<K, V>>>; 256],
 }
 
 impl<K, V> StoreUnique<K, V>
@@ -33,7 +33,7 @@ where
     // }
 
     fn get_or_init_store(&self, key: &K) -> &DatabaseUnique<K, V> {
-        self.get_or_init_store_(key.as_ne_six_bits() as usize)
+        self.get_or_init_store_(key.as_ne_byte() as usize)
     }
 
     fn get_or_init_store_(&self, storeindex: usize) -> &DatabaseUnique<K, V> {
@@ -46,7 +46,7 @@ where
         self.get_or_init_store(key);
 
         self.parts
-            .get_mut(key.as_ne_six_bits() as usize)
+            .get_mut(key.as_ne_byte() as usize)
             .unwrap()
             .get_mut()
             .unwrap()
diff --git a/bindex/src/storage/vecs/mod.rs b/bindex/src/storage/vecs/mod.rs
index 471f37c1c..83487ebab 100644
--- a/bindex/src/storage/vecs/mod.rs
+++ b/bindex/src/storage/vecs/mod.rs
@@ -28,13 +28,13 @@ pub struct Vecs {
     pub height_to_first_txinindex: StorableVec<Height, Txinindex>,
     pub height_to_first_txoutindex: StorableVec<Height, Txoutindex>,
     pub height_to_first_unknownindex: StorableVec<Height, Addresstypeindex>,
-    pub height_to_p2pk33index: StorableVec<Height, Addresstypeindex>,
-    pub height_to_p2pk65index: StorableVec<Height, Addresstypeindex>,
-    pub height_to_p2pkhindex: StorableVec<Height, Addresstypeindex>,
-    pub height_to_p2shindex: StorableVec<Height, Addresstypeindex>,
-    pub height_to_p2trindex: StorableVec<Height, Addresstypeindex>,
-    pub height_to_p2wpkhindex: StorableVec<Height, Addresstypeindex>,
-    pub height_to_p2wshindex: StorableVec<Height, Addresstypeindex>,
+    pub height_to_first_p2pk33index: StorableVec<Height, Addresstypeindex>,
+    pub height_to_first_p2pk65index: StorableVec<Height, Addresstypeindex>,
+    pub height_to_first_p2pkhindex: StorableVec<Height, Addresstypeindex>,
+    pub height_to_first_p2shindex: StorableVec<Height, Addresstypeindex>,
+    pub height_to_first_p2trindex: StorableVec<Height, Addresstypeindex>,
+    pub height_to_first_p2wpkhindex: StorableVec<Height, Addresstypeindex>,
+    pub height_to_first_p2wshindex: StorableVec<Height, Addresstypeindex>,
     pub height_to_size: StorableVec<Height, usize>,
     pub height_to_timestamp: StorableVec<Height, Timestamp>,
     pub height_to_weight: StorableVec<Height, Weight>,
@@ -120,13 +120,28 @@ impl Vecs {
                 &path.join("height_to_first_unkownindex"),
                 Version::from(1),
             )?,
-            height_to_p2pk33index: StorableVec::import(&path.join("height_to_p2pk33index"), Version::from(1))?,
-            height_to_p2pk65index: StorableVec::import(&path.join("height_to_p2pk65index"), Version::from(1))?,
-            height_to_p2pkhindex: StorableVec::import(&path.join("height_to_p2pkhindex"), Version::from(1))?,
-            height_to_p2shindex: StorableVec::import(&path.join("height_to_p2shindex"), Version::from(1))?,
-            height_to_p2trindex: StorableVec::import(&path.join("height_to_p2trindex"), Version::from(1))?,
-            height_to_p2wpkhindex: StorableVec::import(&path.join("height_to_p2wpkhindex"), Version::from(1))?,
-            height_to_p2wshindex: StorableVec::import(&path.join("height_to_p2wshindex"), Version::from(1))?,
+            height_to_first_p2pk33index: StorableVec::import(
+                &path.join("height_to_first_p2pk33index"),
+                Version::from(1),
+            )?,
+            height_to_first_p2pk65index: StorableVec::import(
+                &path.join("height_to_first_p2pk65index"),
+                Version::from(1),
+            )?,
+            height_to_first_p2pkhindex: StorableVec::import(
+                &path.join("height_to_first_p2pkhindex"),
+                Version::from(1),
+            )?,
+            height_to_first_p2shindex: StorableVec::import(&path.join("height_to_first_p2shindex"), Version::from(1))?,
+            height_to_first_p2trindex: StorableVec::import(&path.join("height_to_first_p2trindex"), Version::from(1))?,
+            height_to_first_p2wpkhindex: StorableVec::import(
+                &path.join("height_to_first_p2wpkhindex"),
+                Version::from(1),
+            )?,
+            height_to_first_p2wshindex: StorableVec::import(
+                &path.join("height_to_first_p2wshindex"),
+                Version::from(1),
+            )?,
             height_to_size: StorableVec::import(&path.join("height_to_size"), Version::from(1))?,
             height_to_timestamp: StorableVec::import(&path.join("height_to_timestamp"), Version::from(1))?,
             height_to_weight: StorableVec::import(&path.join("height_to_weight"), Version::from(1))?,
@@ -383,13 +398,13 @@ impl Vecs {
             &self.height_to_first_txinindex,
             &self.height_to_first_txoutindex,
             &self.height_to_first_unknownindex,
-            &self.height_to_p2pk33index,
-            &self.height_to_p2pk65index,
-            &self.height_to_p2pkhindex,
-            &self.height_to_p2shindex,
-            &self.height_to_p2trindex,
-            &self.height_to_p2wpkhindex,
-            &self.height_to_p2wshindex,
+            &self.height_to_first_p2pk33index,
+            &self.height_to_first_p2pk65index,
+            &self.height_to_first_p2pkhindex,
+            &self.height_to_first_p2shindex,
+            &self.height_to_first_p2trindex,
+            &self.height_to_first_p2wpkhindex,
+            &self.height_to_first_p2wshindex,
             &self.height_to_size,
             &self.height_to_timestamp,
             &self.height_to_weight,
@@ -427,13 +442,13 @@ impl Vecs {
             &mut self.height_to_first_txinindex,
             &mut self.height_to_first_txoutindex,
             &mut self.height_to_first_unknownindex,
-            &mut self.height_to_p2pk33index,
-            &mut self.height_to_p2pk65index,
-            &mut self.height_to_p2pkhindex,
-            &mut self.height_to_p2shindex,
-            &mut self.height_to_p2trindex,
-            &mut self.height_to_p2wpkhindex,
-            &mut self.height_to_p2wshindex,
+            &mut self.height_to_first_p2pk33index,
+            &mut self.height_to_first_p2pk65index,
+            &mut self.height_to_first_p2pkhindex,
+            &mut self.height_to_first_p2shindex,
+            &mut self.height_to_first_p2trindex,
+            &mut self.height_to_first_p2wpkhindex,
+            &mut self.height_to_first_p2wshindex,
             &mut self.height_to_size,
             &mut self.height_to_timestamp,
             &mut self.height_to_weight,
diff --git a/bindex/src/structs/txoutindex.rs b/bindex/src/structs/txoutindex.rs
index d4083fb05..91740bcb1 100644
--- a/bindex/src/structs/txoutindex.rs
+++ b/bindex/src/structs/txoutindex.rs
@@ -1,7 +1,4 @@
-use std::{
-    ops::{Add, AddAssign},
-    u64,
-};
+use std::ops::{Add, AddAssign};
 
 use derive_deref::{Deref, DerefMut};
 use snkrj::{direct_repr, Storable, UnsizedStorable};
@@ -13,7 +10,7 @@ pub struct Txoutindex(u64);
 direct_repr!(Txoutindex);
 
 impl Txoutindex {
-    pub const MAX: Self = Self(u64::MAX);
+    pub const COINBASE: Self = Self(u64::MAX);
 
     pub fn incremented(self) -> Self {
         Self(*self + 1)
@@ -24,7 +21,7 @@ impl Txoutindex {
     }
 
     pub fn is_coinbase(self) -> bool {
-        self == Self::MAX
+        self == Self::COINBASE
     }
 }
 

From 90a5c4fbf8dacb007e831cd7a579f82a077cb9a5 Mon Sep 17 00:00:00 2001
From: nym21 <expat-epochs0i@icloud.com>
Date: Mon, 27 Jan 2025 12:49:19 +0100
Subject: [PATCH 30/63] bindex: retrying fjall

---
 Cargo.lock                                    | 268 +++++++++++++++++-
 bindex/Cargo.toml                             |   1 +
 bindex/src/lib.rs                             |  92 +++---
 bindex/src/storage/canopy/database.rs         |  50 ++++
 bindex/src/storage/canopy/environment.rs      |  20 ++
 bindex/src/storage/canopy/mod.rs              |   9 +
 bindex/src/storage/canopy/transaction.rs      |  19 ++
 bindex/src/storage/canopy/tree.rs             |  84 ++++++
 bindex/src/storage/fjall/base.rs              | 145 ++++++++++
 bindex/src/storage/fjall/mod.rs               | 200 +++++++++++++
 bindex/src/storage/mod.rs                     |  12 +-
 bindex/src/storage/partitions/mod.rs          |   0
 .../src/storage/{stores => sanakirja}/meta.rs |   0
 .../src/storage/{stores => sanakirja}/mod.rs  |   0
 .../storage/{stores => sanakirja}/multi.rs    |   0
 .../storage/{stores => sanakirja}/unique.rs   |   0
 .../storage/{vecs => storable_vec}/base.rs    |   0
 .../src/storage/{vecs => storable_vec}/mod.rs |   0
 bindex/src/structs/addressindex.rs            |  13 +
 bindex/src/structs/height.rs                  |  12 +
 bindex/src/structs/prefix.rs                  |  55 +++-
 bindex/src/structs/txindex.rs                 |  13 +
 bindex/src/structs/version.rs                 |  12 +
 storable_vec/src/lib.rs                       |  24 +-
 24 files changed, 974 insertions(+), 55 deletions(-)
 create mode 100644 bindex/src/storage/canopy/database.rs
 create mode 100644 bindex/src/storage/canopy/environment.rs
 create mode 100644 bindex/src/storage/canopy/mod.rs
 create mode 100644 bindex/src/storage/canopy/transaction.rs
 create mode 100644 bindex/src/storage/canopy/tree.rs
 create mode 100644 bindex/src/storage/fjall/base.rs
 create mode 100644 bindex/src/storage/fjall/mod.rs
 delete mode 100644 bindex/src/storage/partitions/mod.rs
 rename bindex/src/storage/{stores => sanakirja}/meta.rs (100%)
 rename bindex/src/storage/{stores => sanakirja}/mod.rs (100%)
 rename bindex/src/storage/{stores => sanakirja}/multi.rs (100%)
 rename bindex/src/storage/{stores => sanakirja}/unique.rs (100%)
 rename bindex/src/storage/{vecs => storable_vec}/base.rs (100%)
 rename bindex/src/storage/{vecs => storable_vec}/mod.rs (100%)

diff --git a/Cargo.lock b/Cargo.lock
index 534b8a9e7..4913a9beb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -75,7 +75,9 @@ dependencies = [
  "color-eyre",
  "derive_deref",
  "exit",
+ "fjall",
  "jiff",
+ "rapidhash",
  "rayon",
  "snkrj",
  "storable_vec",
@@ -317,6 +319,16 @@ dependencies = [
  "crossbeam-utils",
 ]
 
+[[package]]
+name = "crossbeam-skiplist"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df29de440c58ca2cc6e587ec3d22347551a32435fbde9d2bff64e78a9ffa151b"
+dependencies = [
+ "crossbeam-epoch",
+ "crossbeam-utils",
+]
+
 [[package]]
 name = "crossbeam-utils"
 version = "0.8.21"
@@ -333,6 +345,20 @@ dependencies = [
  "windows-sys",
 ]
 
+[[package]]
+name = "dashmap"
+version = "6.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf"
+dependencies = [
+ "cfg-if",
+ "crossbeam-utils",
+ "hashbrown",
+ "lock_api",
+ "once_cell",
+ "parking_lot_core 0.9.10",
+]
+
 [[package]]
 name = "derive_deref"
 version = "1.1.1"
@@ -355,12 +381,46 @@ dependencies = [
  "syn 2.0.96",
 ]
 
+[[package]]
+name = "double-ended-peekable"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0d05e1c0dbad51b52c38bda7adceef61b9efc2baf04acfe8726a8c4630a6f57"
+
 [[package]]
 name = "either"
 version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
 
+[[package]]
+name = "enum_dispatch"
+version = "0.3.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa18ce2bc66555b3218614519ac839ddb759a7d6720732f979ef8d13be147ecd"
+dependencies = [
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.96",
+]
+
+[[package]]
+name = "equivalent"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+
+[[package]]
+name = "errno"
+version = "0.3.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
+dependencies = [
+ "libc",
+ "windows-sys",
+]
+
 [[package]]
 name = "exit"
 version = "0.1.0"
@@ -378,6 +438,28 @@ dependencies = [
  "once_cell",
 ]
 
+[[package]]
+name = "fastrand"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
+
+[[package]]
+name = "fjall"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "80910a26e4fb5e5393ff64d293602ac1ade56cf4d14d244c02a7d4ddcd5f10bc"
+dependencies = [
+ "byteorder",
+ "dashmap",
+ "log",
+ "lsm-tree",
+ "path-absolutize",
+ "std-semaphore",
+ "tempfile",
+ "xxhash-rust",
+]
+
 [[package]]
 name = "fs2"
 version = "0.4.3"
@@ -405,6 +487,18 @@ version = "0.28.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
 
+[[package]]
+name = "guardian"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "493913a18c0d7bebb75127a26a432162c59edbe06f6cf712001e3e769345e8b5"
+
+[[package]]
+name = "hashbrown"
+version = "0.14.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+
 [[package]]
 name = "hex-conservative"
 version = "0.2.1"
@@ -503,6 +597,12 @@ version = "0.2.169"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
 
+[[package]]
+name = "linux-raw-sys"
+version = "0.4.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
+
 [[package]]
 name = "lock_api"
 version = "0.4.12"
@@ -519,6 +619,35 @@ version = "0.4.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f"
 
+[[package]]
+name = "lsm-tree"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4d858efa63a32a286a06aa3968f3ed09811d556697e9f9804aa72ea679ed3b83"
+dependencies = [
+ "byteorder",
+ "crossbeam-skiplist",
+ "double-ended-peekable",
+ "enum_dispatch",
+ "guardian",
+ "log",
+ "lz4_flex",
+ "path-absolutize",
+ "quick_cache",
+ "rustc-hash",
+ "self_cell",
+ "tempfile",
+ "value-log",
+ "varint-rs",
+ "xxhash-rust",
+]
+
+[[package]]
+name = "lz4_flex"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75761162ae2b0e580d7e7c390558127e5f01b4194debd6221fd8c207fc80e3f5"
+
 [[package]]
 name = "memchr"
 version = "2.7.4"
@@ -534,6 +663,12 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "min-max-heap"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2687e6cf9c00f48e9284cf9fd15f2ef341d03cc7743abf9df4c5f07fdee50b18"
+
 [[package]]
 name = "miniz_oxide"
 version = "0.7.4"
@@ -595,7 +730,7 @@ checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
 dependencies = [
  "instant",
  "lock_api",
- "parking_lot_core",
+ "parking_lot_core 0.8.6",
 ]
 
 [[package]]
@@ -607,11 +742,42 @@ dependencies = [
  "cfg-if",
  "instant",
  "libc",
- "redox_syscall",
+ "redox_syscall 0.2.16",
  "smallvec",
  "winapi",
 ]
 
+[[package]]
+name = "parking_lot_core"
+version = "0.9.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "redox_syscall 0.5.8",
+ "smallvec",
+ "windows-targets",
+]
+
+[[package]]
+name = "path-absolutize"
+version = "3.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e4af381fe79fa195b4909485d99f73a80792331df0625188e707854f0b3383f5"
+dependencies = [
+ "path-dedot",
+]
+
+[[package]]
+name = "path-dedot"
+version = "3.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07ba0ad7e047712414213ff67533e6dd477af0a4e1d14fb52343e53d30ea9397"
+dependencies = [
+ "once_cell",
+]
+
 [[package]]
 name = "pin-project-lite"
 version = "0.2.16"
@@ -651,6 +817,16 @@ dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "quick_cache"
+version = "0.6.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d7c94f8935a9df96bb6380e8592c70edf497a643f94bd23b2f76b399385dbf4"
+dependencies = [
+ "equivalent",
+ "hashbrown",
+]
+
 [[package]]
 name = "quote"
 version = "1.0.38"
@@ -690,6 +866,12 @@ dependencies = [
  "getrandom",
 ]
 
+[[package]]
+name = "rapidhash"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c3cf30fb8a0540827f3e22514836533403dece9ac517631160a1fb36d0dd5d6"
+
 [[package]]
 name = "rayon"
 version = "1.10.0"
@@ -719,12 +901,40 @@ dependencies = [
  "bitflags 1.3.2",
 ]
 
+[[package]]
+name = "redox_syscall"
+version = "0.5.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834"
+dependencies = [
+ "bitflags 2.8.0",
+]
+
 [[package]]
 name = "rustc-demangle"
 version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
 
+[[package]]
+name = "rustc-hash"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7fb8039b3032c191086b10f11f319a6e99e1e82889c5cc6046f515c9db1d497"
+
+[[package]]
+name = "rustix"
+version = "0.38.44"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
+dependencies = [
+ "bitflags 2.8.0",
+ "errno",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys",
+]
+
 [[package]]
 name = "ryu"
 version = "1.0.18"
@@ -779,6 +989,12 @@ dependencies = [
  "cc",
 ]
 
+[[package]]
+name = "self_cell"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2fdfc24bc566f839a2da4c4295b82db7d25a24253867d5c64355abb5799bdbe"
+
 [[package]]
 name = "serde"
 version = "1.0.217"
@@ -839,6 +1055,12 @@ dependencies = [
  "sanakirja",
 ]
 
+[[package]]
+name = "std-semaphore"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33ae9eec00137a8eed469fb4148acd9fc6ac8c3f9b110f52cd34698c8b5bfa0e"
+
 [[package]]
 name = "storable_vec"
 version = "0.1.2"
@@ -890,6 +1112,20 @@ dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "tempfile"
+version = "3.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a8a559c81686f576e8cd0290cd2a24a2a9ad80c98b3478856500fcbd7acd704"
+dependencies = [
+ "cfg-if",
+ "fastrand",
+ "getrandom",
+ "once_cell",
+ "rustix",
+ "windows-sys",
+]
+
 [[package]]
 name = "thiserror"
 version = "1.0.69"
@@ -973,6 +1209,28 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
 
+[[package]]
+name = "value-log"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f90495556d09c3026f7f3897f8a7db59c8c701082e32dcf58c2319062ae1eb0"
+dependencies = [
+ "byteorder",
+ "log",
+ "min-max-heap",
+ "path-absolutize",
+ "quick_cache",
+ "rustc-hash",
+ "tempfile",
+ "xxhash-rust",
+]
+
+[[package]]
+name = "varint-rs"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f54a172d0620933a27a4360d3db3e2ae0dd6cceae9730751a036bbf182c4b23"
+
 [[package]]
 name = "wasi"
 version = "0.11.0+wasi-snapshot-preview1"
@@ -1074,6 +1332,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
+[[package]]
+name = "xxhash-rust"
+version = "0.8.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdd20c5420375476fbd4394763288da7eb0cc0b8c11deed431a91562af7335d3"
+
 [[package]]
 name = "zerocopy"
 version = "0.7.35"
diff --git a/bindex/Cargo.toml b/bindex/Cargo.toml
index c3957119a..f716175b6 100644
--- a/bindex/Cargo.toml
+++ b/bindex/Cargo.toml
@@ -9,6 +9,7 @@ biter = { path = "../biter" }
 color-eyre = "0.6.3"
 derive_deref = "1.1.1"
 exit = { path = "../exit" }
+fjall = "2.5.0"
 jiff = "0.1.24"
 rapidhash = "1.3.0"
 rayon = "1.10.0"
diff --git a/bindex/src/lib.rs b/bindex/src/lib.rs
index 17584650a..f04a6cdcd 100644
--- a/bindex/src/lib.rs
+++ b/bindex/src/lib.rs
@@ -3,7 +3,8 @@ use std::{
     io::{Read, Write},
     path::Path,
     str::FromStr,
-    thread::{self},
+    thread::{self, sleep},
+    time::Duration,
 };
 
 use biter::{
@@ -12,12 +13,13 @@ use biter::{
 };
 use color_eyre::eyre::{eyre, ContextCompat};
 use exit::Exit;
+use fjall::{PersistMode, ReadTransaction, TransactionalKeyspace};
 use rayon::prelude::*;
 
 mod storage;
 mod structs;
 
-use storage::{Stores, Vecs};
+use storage::{Partitions, Vecs};
 use structs::{
     Addressbytes, AddressbytesPrefix, Addressindex, Addresstype, Amount, BlockHashPrefix, Height, Timestamp,
     TxidPrefix, Txindex, Txinindex, Txoutindex, Vin, Vout,
@@ -35,17 +37,17 @@ impl Indexer {
 
         let mut vecs = Vecs::import(&indexes_dir.join("vecs"))?;
 
-        let open_stores = || Stores::open(&indexes_dir.join("stores"));
-        let stores = open_stores()?;
+        let keyspace = fjall::Config::new(indexes_dir.join("fjall")).open_transactional()?;
+        let mut parts = Partitions::import(&keyspace, &exit)?;
+        let rtx = keyspace.read_tx();
 
         let mut height = vecs
             .min_height()
             .unwrap_or_default()
-            .min(stores.min_height())
+            .min(parts.min_height())
             .and_then(|h| h.checked_sub(UNSAFE_BLOCKS))
             .map(Height::from)
             .unwrap_or_default();
-        // let mut height = Height::default();
 
         let mut txindex_global = vecs.height_to_first_txindex.get_or_default(height)?;
         let mut txinindex_global = vecs.height_to_first_txinindex.get_or_default(height)?;
@@ -64,31 +66,37 @@ impl Indexer {
         let mut p2wpkhindex_global = vecs.height_to_first_p2wpkhindex.get_or_default(height)?;
         let mut p2wshindex_global = vecs.height_to_first_p2wshindex.get_or_default(height)?;
 
-        let export = |stores: Stores, vecs: &mut Vecs, height: Height| -> color_eyre::Result<()> {
+        let export = |keyspace: &TransactionalKeyspace,
+                      rtx: ReadTransaction,
+                      parts: &mut Partitions,
+                      vecs: &mut Vecs,
+                      height: Height|
+         -> color_eyre::Result<()> {
             println!("Exporting...");
 
-            if height >= Height::from(400_000_u32) {
-                pause();
-                //     println!("Flushing vecs...");
-            }
+            drop(rtx);
 
             exit.block();
 
             thread::scope(|scope| -> color_eyre::Result<()> {
                 let vecs_handle = scope.spawn(|| vecs.flush(height));
-                let stores_handle = scope.spawn(|| stores.export(height));
+
+                parts.write(keyspace, height)?;
+                keyspace.persist(PersistMode::SyncAll)?;
+
                 vecs_handle.join().unwrap()?;
-                stores_handle.join().unwrap()?;
                 Ok(())
             })?;
 
             exit.unblock();
+
             Ok(())
         };
 
-        let mut stores_opt = Some(stores);
+        // let mut stores_opt = Some(stores);
+        let mut rtx_opt = Some(rtx);
 
-        biter::new(bitcoin_dir, Some(height.into()), Some(500_000), rpc)
+        biter::new(bitcoin_dir, Some(height.into()), None, rpc)
             .iter()
             .try_for_each(|(_height, block, blockhash)| -> color_eyre::Result<()> {
                 println!("Processing block {_height}...");
@@ -96,27 +104,28 @@ impl Indexer {
                 height = Height::from(_height);
                 let timestamp = Timestamp::try_from(block.header.time)?;
 
-                let mut stores = stores_opt.take().context("option should have wtx")?;
+                // let mut stores = stores_opt.take().context("option should have store")?;
+                let rtx = rtx_opt.take().context("option should have rtx")?;
 
                 if let Some(saved_blockhash) = vecs.height_to_blockhash.get(height)? {
                     if &blockhash != saved_blockhash.as_ref() {
                         todo!("Rollback not implemented");
-                        // parts.rollback_from(&mut wtx, height, &exit)?;
+                        // parts.rollback_from(&mut rtx, height, &exit)?;
                     }
                 }
 
                 let blockhash_prefix = BlockHashPrefix::try_from(&blockhash)?;
 
-                if stores
+                if parts
                     .blockhash_prefix_to_height
-                    .get(&blockhash_prefix)?
-                    .is_some_and(|prev_height| *prev_height != height)
+                    .get(&rtx, &blockhash_prefix)?
+                    .is_some_and(|prev_height| prev_height != height)
                 {
                     dbg!(blockhash);
                     return Err(eyre!("Collision, expect prefix to need be set yet"));
                 }
 
-                stores
+                parts
                     .blockhash_prefix_to_height
                     .insert_if_needed(blockhash_prefix, height, height);
 
@@ -194,9 +203,9 @@ impl Indexer {
                                     let txid_prefix = TxidPrefix::try_from(&txid)?;
 
                                     let prev_txindex_slice_opt =
-                                        if check_collisions && stores.txid_prefix_to_txindex.needs(height) {
+                                        if check_collisions && parts.txid_prefix_to_txindex.needs(height) {
                                             // Should only find collisions for two txids (duplicates), see below
-                                            stores.txid_prefix_to_txindex.get(&txid_prefix)?.cloned()
+                                            parts.txid_prefix_to_txindex.get(&rtx, &txid_prefix)?
                                         } else {
                                             None
                                         };
@@ -235,14 +244,14 @@ impl Indexer {
                                     return Ok((txinindex, InputSource::SameBlock((tx, txindex, txin, vin))));
                                 }
 
-                                let prev_txindex = if let Some(txindex) = stores
+                                let prev_txindex = if let Some(txindex) = parts
                                     .txid_prefix_to_txindex
-                                    .get(&TxidPrefix::try_from(&outpoint.txid)?)?
+                                    .get(&rtx, &TxidPrefix::try_from(&outpoint.txid)?)?
                                     .and_then(|txindex| {
                                         // Checking if not finding txindex from the future
-                                        (txindex < &txindex_global).then_some(txindex)
+                                        (txindex < txindex_global).then_some(txindex)
                                     }) {
-                                    *txindex
+                                    txindex
                                 } else {
                                     // dbg!(txindex_global + block_txindex, txindex, txin, vin);
                                     return Ok((txinindex, InputSource::SameBlock((tx, txindex, txin, vin))));
@@ -312,11 +321,10 @@ impl Indexer {
                                         });
 
                                     let addressindex_opt = addressbytes_res.as_ref().ok().and_then(|addressbytes| {
-                                        stores
+                                        parts
                                             .addressbytes_prefix_to_addressindex
-                                            .get(&AddressbytesPrefix::from((addressbytes, addresstype)))
+                                            .get(&rtx, &AddressbytesPrefix::from((addressbytes, addresstype)))
                                             .unwrap()
-                                            .cloned()
                                             // Checking if not in the future
                                             .and_then(|addressindex_local| {
                                                 (addressindex_local < addressindex_global).then_some(addressindex_local)
@@ -346,7 +354,7 @@ impl Indexer {
 
                                         if (vecs.addressindex_to_addresstype.hasnt(addressindex)
                                             && addresstype != prev_addresstype)
-                                            || (stores.addressbytes_prefix_to_addressindex.needs(height)
+                                            || (parts.addressbytes_prefix_to_addressindex.needs(height)
                                                 && prev_addressbytes != addressbytes)
                                         {
                                             let txid = tx.compute_txid();
@@ -494,9 +502,9 @@ impl Indexer {
                                 let addressbytes_prefix = addressbytes_prefix.unwrap();
 
                                 already_added_addressbytes_prefix
-                                    .insert(addressbytes_prefix.clone(), addressindex);
+                                    .insert(addressbytes_prefix, addressindex);
 
-                                stores.addressbytes_prefix_to_addressindex.insert_if_needed(
+                                parts.addressbytes_prefix_to_addressindex.insert_if_needed(
                                     addressbytes_prefix,
                                     addressindex,
                                     height,
@@ -580,7 +588,7 @@ impl Indexer {
 
                             match prev_txindex_opt {
                                 None => {
-                                    stores
+                                    parts
                                         .txid_prefix_to_txindex
                                         .insert_if_needed(txid_prefix, txindex, height);
                                 }
@@ -646,16 +654,24 @@ impl Indexer {
 
                 let should_snapshot = _height != 0 && _height % SNAPSHOT_BLOCK_RANGE == 0 && !exit.active();
                 if should_snapshot {
-                    export(stores, &mut vecs, height)?;
-                    stores_opt.replace(open_stores()?);
+                    export(&keyspace, rtx, &mut parts, &mut vecs, height)?;
+                    rtx_opt.replace(keyspace.read_tx());
                 } else {
-                    stores_opt.replace(stores);
+                    rtx_opt.replace(rtx);
                 }
 
                 Ok(())
             })?;
 
-        export(stores_opt.take().context("option should have wtx")?, &mut vecs, height)?;
+        export(
+            &keyspace,
+            rtx_opt.take().context("option should have wtx")?,
+            &mut parts,
+            &mut vecs,
+            height,
+        )?;
+
+        sleep(Duration::from_millis(100));
 
         Ok(())
     }
diff --git a/bindex/src/storage/canopy/database.rs b/bindex/src/storage/canopy/database.rs
new file mode 100644
index 000000000..fd871d742
--- /dev/null
+++ b/bindex/src/storage/canopy/database.rs
@@ -0,0 +1,50 @@
+use std::{
+    ops::{Deref, DerefMut},
+    time::Duration,
+};
+
+use canopydb::{Database as CanopyDatabase, DbOptions, Error, WriteTransaction};
+
+use super::Environment;
+
+#[derive(Debug)]
+pub struct Database {
+    db: CanopyDatabase,
+    // pub wtx: WriteTransaction,
+}
+impl Deref for Database {
+    type Target = CanopyDatabase;
+    fn deref(&self) -> &Self::Target {
+        &self.db
+    }
+}
+impl DerefMut for Database {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        &mut self.db
+    }
+}
+
+impl Database {
+    pub fn new(environment: &Environment, name: &str) -> color_eyre::Result<Self> {
+        let mut options = DbOptions::default();
+        options.use_wal = false;
+        options.checkpoint_interval = Duration::from_secs(u64::MAX);
+        options.checkpoint_target_size = usize::MAX;
+        options.throttle_memory_limit = usize::MAX;
+        options.stall_memory_limit = usize::MAX;
+        options.write_txn_memory_limit = usize::MAX;
+
+        let db = environment.get_or_create_database_with(name, options)?;
+
+        Ok(Self {
+            // wtx: db.begin_write()?,
+            db,
+        })
+    }
+
+    pub fn flush(&mut self) -> Result<(), Error> {
+        // drop(blockhash_prefix_to_height_tree);
+        // blockhash_prefix_to_height_tx_opt.take().map(|tx| tx.commit());
+        self.checkpoint()
+    }
+}
diff --git a/bindex/src/storage/canopy/environment.rs b/bindex/src/storage/canopy/environment.rs
new file mode 100644
index 000000000..562e159d9
--- /dev/null
+++ b/bindex/src/storage/canopy/environment.rs
@@ -0,0 +1,20 @@
+use std::path::Path;
+
+use canopydb::{EnvOptions, Environment as CanopyEnvironment};
+use derive_deref::{Deref, DerefMut};
+
+#[derive(Debug, Deref, DerefMut)]
+pub struct Environment(CanopyEnvironment);
+
+impl Environment {
+    pub fn new(path: &Path) -> color_eyre::Result<Self> {
+        let mut options = EnvOptions::new(path);
+        // options.use_mmap = true;
+        options.disable_fsync = true;
+        options.wal_new_file_on_checkpoint = false;
+        options.wal_background_sync_interval = None;
+        options.wal_write_batch_memory_limit = usize::MAX;
+
+        Ok(Self(CanopyEnvironment::with_options(options)?))
+    }
+}
diff --git a/bindex/src/storage/canopy/mod.rs b/bindex/src/storage/canopy/mod.rs
new file mode 100644
index 000000000..46cb95a00
--- /dev/null
+++ b/bindex/src/storage/canopy/mod.rs
@@ -0,0 +1,9 @@
+mod database;
+mod environment;
+// mod transaction;
+mod tree;
+
+pub use database::*;
+pub use environment::*;
+// pub use transaction::*;
+pub use tree::*;
diff --git a/bindex/src/storage/canopy/transaction.rs b/bindex/src/storage/canopy/transaction.rs
new file mode 100644
index 000000000..d1a6ca13c
--- /dev/null
+++ b/bindex/src/storage/canopy/transaction.rs
@@ -0,0 +1,19 @@
+use canopydb::{Tree as CanopyTree, TreeOptions, WriteTransaction};
+
+use super::{Database, Tree};
+
+#[derive(Debug)]
+pub struct Transaction<'a, K, V> {
+    tx: WriteTransaction,
+    tree: Tree<'a, K, V>,
+}
+
+impl<'a, K, V> Transaction<'a, K, V> {
+    pub fn new(db: &Database) -> color_eyre::Result<Self> {
+        let tx = db.begin_write()?;
+
+        let tree = Tree::new(&tx)?;
+
+        Ok(Self { tx, tree })
+    }
+}
diff --git a/bindex/src/storage/canopy/tree.rs b/bindex/src/storage/canopy/tree.rs
new file mode 100644
index 000000000..7809835ea
--- /dev/null
+++ b/bindex/src/storage/canopy/tree.rs
@@ -0,0 +1,84 @@
+use std::{
+    fmt::Debug,
+    marker::PhantomData,
+    ops::{Deref, DerefMut},
+};
+
+use canopydb::{Tree as CanopyTree, TreeOptions, WriteTransaction};
+use color_eyre::eyre::eyre;
+
+#[derive(Debug)]
+pub struct Tree<'a, K, V> {
+    tree: CanopyTree<'a>,
+    k: PhantomData<K>,
+    v: PhantomData<V>,
+}
+impl<'a, K, V> Deref for Tree<'a, K, V> {
+    type Target = CanopyTree<'a>;
+    fn deref(&self) -> &Self::Target {
+        &self.tree
+    }
+}
+impl<'a, K, V> DerefMut for Tree<'a, K, V> {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        &mut self.tree
+    }
+}
+
+impl<'a, K, V> Tree<'a, K, V>
+where
+    K: Debug + Sized,
+    V: Debug + Sized + Clone + Copy,
+{
+    const SIZE_OF_K: usize = size_of::<K>();
+    const SIZE_OF_V: usize = size_of::<V>();
+
+    pub fn new(tx: &'a WriteTransaction) -> color_eyre::Result<Self> {
+        let mut options = TreeOptions::new();
+        options.compress_overflow_values = None;
+        options.fixed_key_len = size_of::<K>() as i8;
+        options.fixed_value_len = size_of::<V>() as i8;
+
+        Ok(Self {
+            tree: tx.get_or_create_tree_with(b"tree", options)?,
+            k: PhantomData,
+            v: PhantomData,
+        })
+    }
+
+    pub fn get(&self, key: &K) -> color_eyre::Result<Option<V>> {
+        let slice = self.tree.get(Self::key_as_slice(key))?;
+
+        if slice.is_none() {
+            return Ok(None);
+        }
+
+        let slice = slice.unwrap();
+
+        let (prefix, shorts, suffix) = unsafe { slice.align_to::<V>() };
+
+        if !prefix.is_empty() || shorts.len() != 1 || !suffix.is_empty() {
+            dbg!(&key, &prefix, &shorts, &suffix);
+            return Err(eyre!("align_to issue"));
+        }
+
+        Ok(Some(shorts[0]))
+    }
+
+    pub fn insert(&mut self, key: &K, value: &V) -> Result<(), canopydb::Error> {
+        self.tree
+            .insert(Self::key_as_slice(key), Self::value_as_slice(value))
+    }
+
+    fn key_as_slice(key: &K) -> &[u8] {
+        let data: *const K = key;
+        let data: *const u8 = data as *const u8;
+        unsafe { std::slice::from_raw_parts(data, Self::SIZE_OF_K) }
+    }
+
+    fn value_as_slice(value: &V) -> &[u8] {
+        let data: *const V = value;
+        let data: *const u8 = data as *const u8;
+        unsafe { std::slice::from_raw_parts(data, Self::SIZE_OF_V) }
+    }
+}
diff --git a/bindex/src/storage/fjall/base.rs b/bindex/src/storage/fjall/base.rs
new file mode 100644
index 000000000..9ed674187
--- /dev/null
+++ b/bindex/src/storage/fjall/base.rs
@@ -0,0 +1,145 @@
+use std::{collections::BTreeMap, mem};
+
+use exit::Exit;
+use fjall::{
+    PartitionCreateOptions, PersistMode, ReadTransaction, Result, Slice, TransactionalKeyspace,
+    TransactionalPartitionHandle, TxKeyspace, WriteTransaction,
+};
+
+use crate::structs::{Height, Version};
+
+pub struct Partition<Key, Value> {
+    version: Version,
+    data: TransactionalPartitionHandle,
+    meta: TransactionalPartitionHandle,
+    height: Option<Height>,
+    puts: BTreeMap<Key, Value>,
+}
+
+impl<Key, Value> Partition<Key, Value>
+where
+    Key: Into<Slice> + Ord,
+    Value: Into<Slice> + TryFrom<Slice> + Clone,
+{
+    pub const VERSION: &str = "version";
+    pub const HEIGHT: &str = "height";
+
+    pub fn import(
+        keyspace: &TransactionalKeyspace,
+        name: &str,
+        version: Version,
+        exit: &Exit,
+    ) -> color_eyre::Result<Self> {
+        let data = Self::open_data(keyspace, name)?;
+        let meta = Self::open_meta(keyspace, name)?;
+
+        let height = if let Some(slice) = meta.get(Self::HEIGHT)? {
+            Some(Height::try_from(slice)?)
+        } else {
+            None
+        };
+
+        let mut this = Self {
+            version,
+            height,
+            data,
+            meta,
+            puts: BTreeMap::new(),
+        };
+
+        if let Some(slice) = this.meta.get(Self::VERSION)? {
+            if version != Version::try_from(slice)? {
+                this = this.reset(keyspace, name, exit)?;
+            }
+        }
+
+        Ok(this)
+    }
+
+    fn open_data(keyspace: &TransactionalKeyspace, name: &str) -> Result<TransactionalPartitionHandle> {
+        keyspace.open_partition(&format!("{name}-data"), Self::create_options())
+    }
+
+    fn open_meta(keyspace: &TransactionalKeyspace, name: &str) -> Result<TransactionalPartitionHandle> {
+        keyspace.open_partition(&format!("{name}-meta"), Self::create_options())
+    }
+
+    fn create_options() -> PartitionCreateOptions {
+        PartitionCreateOptions::default().manual_journal_persist(true)
+    }
+
+    pub fn has(&self, height: Height) -> bool {
+        self.height.is_some_and(|self_height| self_height >= height)
+    }
+    pub fn needs(&self, height: Height) -> bool {
+        !self.has(height)
+    }
+
+    pub fn get<'a>(&self, rtx: &ReadTransaction, key: &'a Key) -> color_eyre::Result<Option<Value>>
+    where
+        fjall::Slice: std::convert::From<&'a Key>,
+        <Value as std::convert::TryFrom<fjall::Slice>>::Error: std::error::Error + Send + Sync,
+        <Value as std::convert::TryFrom<fjall::Slice>>::Error: 'static,
+    {
+        if let Some(v) = self.puts.get(key) {
+            return Ok(Some(v.clone()));
+        }
+
+        if let Some(slice) = rtx.get(&self.data, Slice::from(key))? {
+            let v_res = Value::try_from(slice);
+            let v = v_res?;
+            Ok(Some(v))
+        } else {
+            Ok(None)
+        }
+    }
+
+    pub fn insert_if_needed(&mut self, key: Key, value: Value, height: Height) {
+        if self.needs(height) {
+            self.puts.insert(key, value);
+        }
+    }
+
+    fn update_meta(&self, wtx: &mut WriteTransaction, height: Height) {
+        wtx.insert(&self.meta, Self::VERSION, self.version());
+        wtx.insert(&self.meta, Self::HEIGHT, height);
+    }
+
+    pub fn write(&mut self, keyspace: &TxKeyspace, height: Height) -> Result<()> {
+        if self.has(height) && self.puts.is_empty() {
+            return Ok(());
+        }
+
+        let mut wtx = keyspace.write_tx();
+        mem::take(&mut self.puts)
+            .into_iter()
+            .for_each(|(key, value)| wtx.insert(&self.data, key, value));
+        self.update_meta(&mut wtx, height);
+        wtx.commit()
+    }
+
+    pub fn version(&self) -> Version {
+        self.version
+    }
+
+    fn reset(mut self, keyspace: &TransactionalKeyspace, name: &str, exit: &Exit) -> Result<Self> {
+        exit.block();
+
+        keyspace.delete_partition(self.data)?;
+        keyspace.delete_partition(self.meta)?;
+
+        keyspace.persist(PersistMode::SyncAll)?;
+
+        self.data = Self::open_data(keyspace, name)?;
+        self.meta = Self::open_meta(keyspace, name)?;
+        self.height = None;
+
+        exit.unblock();
+
+        Ok(self)
+    }
+
+    pub fn height(&self) -> Option<&Height> {
+        self.height.as_ref()
+    }
+}
diff --git a/bindex/src/storage/fjall/mod.rs b/bindex/src/storage/fjall/mod.rs
new file mode 100644
index 000000000..e458eacc6
--- /dev/null
+++ b/bindex/src/storage/fjall/mod.rs
@@ -0,0 +1,200 @@
+use std::thread;
+
+use crate::{structs::Version, AddressbytesPrefix, Addressindex, BlockHashPrefix, Height, TxidPrefix, Txindex};
+
+mod base;
+use base::*;
+use exit::Exit;
+use fjall::{TransactionalKeyspace, TxKeyspace};
+
+pub struct Partitions {
+    pub addressbytes_prefix_to_addressindex: Partition<AddressbytesPrefix, Addressindex>,
+    pub blockhash_prefix_to_height: Partition<BlockHashPrefix, Height>,
+    pub txid_prefix_to_txindex: Partition<TxidPrefix, Txindex>,
+}
+
+impl Partitions {
+    pub fn import(keyspace: &TransactionalKeyspace, exit: &Exit) -> color_eyre::Result<Self> {
+        Ok(Self {
+            addressbytes_prefix_to_addressindex: Partition::import(
+                keyspace,
+                "addressbytes_prefix_to_addressindex",
+                Version::from(1),
+                exit,
+            )?,
+            blockhash_prefix_to_height: Partition::import(
+                keyspace,
+                "blockhash_prefix_to_height",
+                Version::from(1),
+                exit,
+            )?,
+            txid_prefix_to_txindex: Partition::import(keyspace, "txid_prefix_to_txindex", Version::from(1), exit)?,
+        })
+    }
+
+    // pub fn rollback_from(
+    //     &mut self,
+    //     _wtx: &mut WriteTransaction,
+    //     _height: Height,
+    //     _exit: &Exit,
+    // ) -> color_eyre::Result<()> {
+    //     panic!();
+    // let mut txindex = None;
+
+    // wtx.range(self.height_to_blockhash.data(), Slice::from(height)..)
+    //     .try_for_each(|slice| -> color_eyre::Result<()> {
+    //         let (height_slice, slice_blockhash) = slice?;
+    //         let blockhash = BlockHash::from_slice(&slice_blockhash)?;
+
+    //         wtx.remove(self.height_to_blockhash.data(), height_slice);
+
+    //         wtx.remove(self.blockhash_prefix_to_height.data(), blockhash.prefix());
+
+    //         if txindex.is_none() {
+    //             txindex.replace(
+    //                 wtx.get(self.height_to_first_txindex.data(), height_slice)?
+    //                     .context("for height to have first txindex")?,
+    //             );
+    //         }
+    //         wtx.remove(self.height_to_first_txindex.data(), height_slice);
+    //         wtx.remove(self.height_to_last_txindex.data(), height_slice);
+
+    //         Ok(())
+    //     })?;
+
+    // let txindex = txindex.context("txindex to not be none by now")?;
+
+    // wtx.range(self.txindex_to_txid.data(), Slice::from(txindex)..)
+    //     .try_for_each(|slice| -> color_eyre::Result<()> {
+    //         let (slice_txindex, slice_txid) = slice?;
+    //         let txindex = Txindex::from(slice_txindex);
+    //         let txid = Txid::from_slice(&slice_txid)?;
+
+    //         wtx.remove(self.txindex_to_txid.data(), Slice::from(txindex));
+    //         wtx.remove(self.txindex_to_height.data(), Slice::from(txindex));
+    //         wtx.remove(self.txid_prefix_to_txindex.data(), txid.prefix());
+
+    //         Ok(())
+    //     })?;
+
+    // let txoutindex = Txoutindex::from(txindex);
+
+    // let mut addressindexes = BTreeSet::new();
+
+    // wtx.range(self.txoutindex_to_amount.data(), Slice::from(txoutindex)..)
+    //     .try_for_each(|slice| -> color_eyre::Result<()> {
+    //         let (txoutindex_slice, _) = slice?;
+
+    //         wtx.remove(self.txoutindex_to_amount.data(), txoutindex_slice);
+
+    //         if let Some(addressindex_slice) =
+    //             wtx.get(self.txoutindex_to_addressindex.data(), txoutindex_slice)?
+    //         {
+    //             wtx.remove(self.txoutindex_to_addressindex.data(), txoutindex_slice);
+
+    //             let addressindex = Addressindex::from(addressindex_slice);
+    //             addressindexes.insert(addressindex);
+
+    //             let txoutindex = Txoutindex::from(txoutindex_slice);
+    //             let addresstxoutindex = Addresstxoutindex::from((addressindex, txoutindex));
+
+    //             wtx.remove(
+    //                 self.addressindex_to_txoutindexes.data(),
+    //                 Slice::from(addresstxoutindex),
+    //             );
+    //         }
+
+    //         Ok(())
+    //     })?;
+
+    // addressindexes
+    // .into_iter()
+    // .filter(|addressindex| {
+    //     let is_empty = wtx
+    //         .prefix(
+    //             self.addressindex_to_txoutindexes.data(),
+    //             Slice::from(*addressindex),
+    //         )
+    //         .next()
+    //         .is_none();
+    //     is_empty
+    // })
+    // .try_for_each(|addressindex| -> color_eyre::Result<()> {
+    //     let addressindex_slice = Slice::from(addressindex);
+
+    //     let addressbytes = Addressbytes::from(
+    //         wtx.get(
+    //             self.addressindex_to_addressbytes.data(),
+    //             &addressindex_slice,
+    //         )?
+    //         .context("addressindex_to_address to have value")?,
+    //     );
+    //     wtx.remove(
+    //         self.addressbytes_prefix_to_addressindex.data(),
+    //         addressbytes.prefix(),
+    //     );
+    //     wtx.remove(
+    //         self.addressindex_to_addressbytes.data(),
+    //         &addressindex_slice,
+    //     );
+    //     wtx.remove(self.addressindex_to_addresstype.data(), &addressindex_slice);
+
+    //     Ok(())
+    // })?;
+    //
+
+    // todo!("clear addresstxoutindexes_out")
+    // todo!("clear addresstxoutindexes_in")
+    // todo!("clear zero_txoutindexes")
+    // todo!("clear txindexvout_to_txoutindex")
+
+    // Ok(())
+    // }
+
+    pub fn min_height(&self) -> Option<Height> {
+        [
+            self.addressbytes_prefix_to_addressindex.height(),
+            self.blockhash_prefix_to_height.height(),
+            self.txid_prefix_to_txindex.height(),
+        ]
+        .into_iter()
+        .min()
+        .flatten()
+        .cloned()
+    }
+
+    pub fn write(&mut self, keyspace: &TxKeyspace, height: Height) -> fjall::Result<()> {
+        thread::scope(|scope| {
+            let addressbytes_prefix_to_addressindex_write_handle =
+                scope.spawn(|| self.addressbytes_prefix_to_addressindex.write(keyspace, height));
+            let blockhash_prefix_to_height_write_handle =
+                scope.spawn(|| self.blockhash_prefix_to_height.write(keyspace, height));
+            let txid_prefix_to_txindex_write_handle =
+                scope.spawn(|| self.txid_prefix_to_txindex.write(keyspace, height));
+
+            addressbytes_prefix_to_addressindex_write_handle.join().unwrap()?;
+            blockhash_prefix_to_height_write_handle.join().unwrap()?;
+            txid_prefix_to_txindex_write_handle.join().unwrap()?;
+
+            Ok(())
+        })
+    }
+
+    // pub fn udpate_meta(&self, wtx: &mut WriteTransaction, height: Height) {
+    //     self.addressbytes_prefix_to_addressindex.update_meta(wtx, height);
+    //     self.blockhash_prefix_to_height.update_meta(wtx, height);
+    //     self.txid_prefix_to_txindex.update_meta(wtx, height);
+    // }
+
+    // pub fn export(self, height: Height) -> Result<(), snkrj::Error> {
+    //     thread::scope(|scope| {
+    //         vec![
+    //             scope.spawn(|| self.addressbytes_prefix_to_addressindex.export(height)),
+    //             scope.spawn(|| self.blockhash_prefix_to_height.export(height)),
+    //             scope.spawn(|| self.txid_prefix_to_txindex.export(height)),
+    //         ]
+    //         .into_iter()
+    //         .try_for_each(|handle| -> Result<(), snkrj::Error> { handle.join().unwrap() })
+    //     })
+    // }
+}
diff --git a/bindex/src/storage/mod.rs b/bindex/src/storage/mod.rs
index 96983bd40..c920d9e38 100644
--- a/bindex/src/storage/mod.rs
+++ b/bindex/src/storage/mod.rs
@@ -1,5 +1,9 @@
-mod stores;
-mod vecs;
+// mod canopy;
+mod fjall;
+// mod sanakirja;
+mod storable_vec;
 
-pub use stores::*;
-pub use vecs::*;
+// pub use canopy::*;
+pub use fjall::*;
+// pub use sanakirja::*;
+pub use storable_vec::*;
diff --git a/bindex/src/storage/partitions/mod.rs b/bindex/src/storage/partitions/mod.rs
deleted file mode 100644
index e69de29bb..000000000
diff --git a/bindex/src/storage/stores/meta.rs b/bindex/src/storage/sanakirja/meta.rs
similarity index 100%
rename from bindex/src/storage/stores/meta.rs
rename to bindex/src/storage/sanakirja/meta.rs
diff --git a/bindex/src/storage/stores/mod.rs b/bindex/src/storage/sanakirja/mod.rs
similarity index 100%
rename from bindex/src/storage/stores/mod.rs
rename to bindex/src/storage/sanakirja/mod.rs
diff --git a/bindex/src/storage/stores/multi.rs b/bindex/src/storage/sanakirja/multi.rs
similarity index 100%
rename from bindex/src/storage/stores/multi.rs
rename to bindex/src/storage/sanakirja/multi.rs
diff --git a/bindex/src/storage/stores/unique.rs b/bindex/src/storage/sanakirja/unique.rs
similarity index 100%
rename from bindex/src/storage/stores/unique.rs
rename to bindex/src/storage/sanakirja/unique.rs
diff --git a/bindex/src/storage/vecs/base.rs b/bindex/src/storage/storable_vec/base.rs
similarity index 100%
rename from bindex/src/storage/vecs/base.rs
rename to bindex/src/storage/storable_vec/base.rs
diff --git a/bindex/src/storage/vecs/mod.rs b/bindex/src/storage/storable_vec/mod.rs
similarity index 100%
rename from bindex/src/storage/vecs/mod.rs
rename to bindex/src/storage/storable_vec/mod.rs
diff --git a/bindex/src/structs/addressindex.rs b/bindex/src/structs/addressindex.rs
index 7da1b22c0..eab1f7c97 100644
--- a/bindex/src/structs/addressindex.rs
+++ b/bindex/src/structs/addressindex.rs
@@ -1,5 +1,6 @@
 use derive_deref::{Deref, DerefMut};
 use snkrj::{direct_repr, Storable, UnsizedStorable};
+use storable_vec::UnsafeSizedSerDe;
 
 #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Deref, DerefMut, Default)]
 pub struct Addressindex(u32);
@@ -48,3 +49,15 @@ impl From<Addressindex> for usize {
         value.0 as usize
     }
 }
+
+impl TryFrom<fjall::Slice> for Addressindex {
+    type Error = storable_vec::Error;
+    fn try_from(value: fjall::Slice) -> Result<Self, Self::Error> {
+        Ok(*Self::unsafe_try_from_slice(&value)?)
+    }
+}
+impl From<Addressindex> for fjall::Slice {
+    fn from(value: Addressindex) -> Self {
+        Self::new(value.unsafe_as_slice())
+    }
+}
diff --git a/bindex/src/structs/height.rs b/bindex/src/structs/height.rs
index 1fdb478c3..717a1cde5 100644
--- a/bindex/src/structs/height.rs
+++ b/bindex/src/structs/height.rs
@@ -119,3 +119,15 @@ impl TryFrom<&rpc::Client> for Height {
         Ok((value.get_blockchain_info()?.blocks as usize - 1).into())
     }
 }
+
+impl TryFrom<fjall::Slice> for Height {
+    type Error = storable_vec::Error;
+    fn try_from(value: fjall::Slice) -> Result<Self, Self::Error> {
+        Ok(*Self::unsafe_try_from_slice(&value)?)
+    }
+}
+impl From<Height> for fjall::Slice {
+    fn from(value: Height) -> Self {
+        Self::new(value.unsafe_as_slice())
+    }
+}
diff --git a/bindex/src/structs/prefix.rs b/bindex/src/structs/prefix.rs
index 6ae4e0306..cc2e2e15e 100644
--- a/bindex/src/structs/prefix.rs
+++ b/bindex/src/structs/prefix.rs
@@ -3,10 +3,11 @@ use std::hash::Hasher;
 use biter::bitcoin::{BlockHash, Txid};
 use derive_deref::Deref;
 use snkrj::{direct_repr, Storable, UnsizedStorable};
+use storable_vec::UnsafeSizedSerDe;
 
 use super::{Addressbytes, Addresstype, SliceExtended};
 
-#[derive(Debug, Deref, Clone, PartialEq, Eq, PartialOrd, Ord)]
+#[derive(Debug, Deref, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
 pub struct AddressbytesPrefix([u8; 8]);
 direct_repr!(AddressbytesPrefix);
 impl From<(&Addressbytes, Addresstype)> for AddressbytesPrefix {
@@ -23,8 +24,24 @@ impl From<[u8; 8]> for AddressbytesPrefix {
         Self(value)
     }
 }
+impl TryFrom<fjall::Slice> for AddressbytesPrefix {
+    type Error = color_eyre::Report;
+    fn try_from(value: fjall::Slice) -> Result<Self, Self::Error> {
+        Ok(*Self::unsafe_try_from_slice(&value)?)
+    }
+}
+impl From<&AddressbytesPrefix> for fjall::Slice {
+    fn from(value: &AddressbytesPrefix) -> Self {
+        Self::new(value.unsafe_as_slice())
+    }
+}
+impl From<AddressbytesPrefix> for fjall::Slice {
+    fn from(value: AddressbytesPrefix) -> Self {
+        Self::from(&value)
+    }
+}
 
-#[derive(Debug, Deref, Clone, PartialEq, Eq, PartialOrd, Ord)]
+#[derive(Debug, Deref, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
 pub struct BlockHashPrefix([u8; 8]);
 direct_repr!(BlockHashPrefix);
 impl TryFrom<&BlockHash> for BlockHashPrefix {
@@ -33,8 +50,24 @@ impl TryFrom<&BlockHash> for BlockHashPrefix {
         Ok(Self((&value[..]).read_8x_u8()?))
     }
 }
+impl TryFrom<fjall::Slice> for BlockHashPrefix {
+    type Error = color_eyre::Report;
+    fn try_from(value: fjall::Slice) -> Result<Self, Self::Error> {
+        Ok(*Self::unsafe_try_from_slice(&value)?)
+    }
+}
+impl From<&BlockHashPrefix> for fjall::Slice {
+    fn from(value: &BlockHashPrefix) -> Self {
+        Self::new(value.unsafe_as_slice())
+    }
+}
+impl From<BlockHashPrefix> for fjall::Slice {
+    fn from(value: BlockHashPrefix) -> Self {
+        Self::from(&value)
+    }
+}
 
-#[derive(Debug, Deref, Clone, PartialEq, Eq, PartialOrd, Ord)]
+#[derive(Debug, Deref, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
 pub struct TxidPrefix([u8; 8]);
 direct_repr!(TxidPrefix);
 impl TryFrom<&Txid> for TxidPrefix {
@@ -43,3 +76,19 @@ impl TryFrom<&Txid> for TxidPrefix {
         Ok(Self((&value[..]).read_8x_u8()?))
     }
 }
+impl TryFrom<fjall::Slice> for TxidPrefix {
+    type Error = color_eyre::Report;
+    fn try_from(value: fjall::Slice) -> Result<Self, Self::Error> {
+        Ok(*Self::unsafe_try_from_slice(&value)?)
+    }
+}
+impl From<&TxidPrefix> for fjall::Slice {
+    fn from(value: &TxidPrefix) -> Self {
+        Self::new(value.unsafe_as_slice())
+    }
+}
+impl From<TxidPrefix> for fjall::Slice {
+    fn from(value: TxidPrefix) -> Self {
+        Self::from(&value)
+    }
+}
diff --git a/bindex/src/structs/txindex.rs b/bindex/src/structs/txindex.rs
index 70a3735e3..4b2b781e6 100644
--- a/bindex/src/structs/txindex.rs
+++ b/bindex/src/structs/txindex.rs
@@ -2,6 +2,7 @@ use std::ops::{Add, AddAssign};
 
 use derive_deref::{Deref, DerefMut};
 use snkrj::{direct_repr, Storable, UnsizedStorable};
+use storable_vec::UnsafeSizedSerDe;
 
 #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Deref, DerefMut, Default)]
 pub struct Txindex(u32);
@@ -57,3 +58,15 @@ impl From<Txindex> for usize {
         value.0 as usize
     }
 }
+
+impl TryFrom<fjall::Slice> for Txindex {
+    type Error = storable_vec::Error;
+    fn try_from(value: fjall::Slice) -> Result<Self, Self::Error> {
+        Ok(*Self::unsafe_try_from_slice(&value)?)
+    }
+}
+impl From<Txindex> for fjall::Slice {
+    fn from(value: Txindex) -> Self {
+        Self::new(value.unsafe_as_slice())
+    }
+}
diff --git a/bindex/src/structs/version.rs b/bindex/src/structs/version.rs
index e5c35b83a..4faa4ec0d 100644
--- a/bindex/src/structs/version.rs
+++ b/bindex/src/structs/version.rs
@@ -23,3 +23,15 @@ impl TryFrom<&Path> for Version {
         Ok(Self::unsafe_try_from_slice(fs::read(value)?.as_slice())?.to_owned())
     }
 }
+
+impl TryFrom<fjall::Slice> for Version {
+    type Error = color_eyre::Report;
+    fn try_from(value: fjall::Slice) -> Result<Self, Self::Error> {
+        Ok(*Self::unsafe_try_from_slice(&value)?)
+    }
+}
+impl From<Version> for fjall::Slice {
+    fn from(value: Version) -> Self {
+        Self::new(value.unsafe_as_slice())
+    }
+}
diff --git a/storable_vec/src/lib.rs b/storable_vec/src/lib.rs
index 69839dbd7..ad5b5de24 100644
--- a/storable_vec/src/lib.rs
+++ b/storable_vec/src/lib.rs
@@ -27,7 +27,7 @@ use memmap2::{Mmap, MmapOptions};
 pub struct StorableVec<I, T> {
     pathbuf: PathBuf,
     file: File,
-    cache: Vec<OnceLock<Box<Mmap>>>, // Boxed to reduce the size of the lock (24 > 16)
+    cache: Vec<OnceLock<Box<Mmap>>>, // Boxed Mmap to reduce the size of the Lock (from 24 to 16)
     disk_len: usize,
     pushed: Vec<T>,
     // updated: BTreeMap<usize, T>,
@@ -40,6 +40,7 @@ pub struct StorableVec<I, T> {
 const MAX_PAGE_SIZE: usize = 4 * 4096;
 const ONE_MB: usize = 1000 * 1024;
 const MAX_CACHE_SIZE: usize = 100 * ONE_MB;
+// const MAX_CACHE_SIZE: usize = 100 * ONE_MB;
 
 impl<I, T> StorableVec<I, T>
 where
@@ -50,8 +51,7 @@ where
     pub const PER_PAGE: usize = MAX_PAGE_SIZE / Self::SIZE_OF_T;
     /// In bytes
     pub const PAGE_SIZE: usize = Self::PER_PAGE * Self::SIZE_OF_T;
-    pub const CACHE_LENGTH: usize = usize::MAX;
-    // pub const CACHE_LENGTH: usize = MAX_CACHE_SIZE / Self::PAGE_SIZE;
+    pub const CACHE_LENGTH: usize = MAX_CACHE_SIZE / Self::PAGE_SIZE;
 
     pub fn import(path: &Path) -> Result<Self, io::Error> {
         let file = Self::open_file(path)?;
@@ -78,13 +78,18 @@ where
         // self.cache.clear();
         // self.cache.resize_with(len, Default::default);
 
+        // par_iter_mut ?
         self.cache.iter_mut().for_each(|lock| {
             lock.take();
         });
+
         let len = (self.disk_len as f64 / Self::PER_PAGE as f64).ceil() as usize;
-        self.cache
-            .resize_with(Self::CACHE_LENGTH.min(len), Default::default);
-        self.cache.shrink_to_fit();
+        let len = Self::CACHE_LENGTH.min(len);
+
+        if self.cache.len() != len {
+            self.cache.resize_with(len, Default::default);
+            self.cache.shrink_to_fit();
+        }
     }
 
     fn open_file(path: &Path) -> Result<File, io::Error> {
@@ -222,7 +227,7 @@ where
         let len = self.len();
         match len.cmp(&index) {
             Ordering::Greater => {
-                // dbg!(len, index);
+                // dbg!(len, index, &self.pathbuf);
                 // panic!();
                 Ok(())
             }
@@ -230,7 +235,10 @@ where
                 self.push(value);
                 Ok(())
             }
-            Ordering::Less => Err(Error::IndexTooHigh),
+            Ordering::Less => {
+                dbg!(index, value);
+                Err(Error::IndexTooHigh)
+            }
         }
     }
 

From d68c6f9f2eb749dbfcef869dd276ce9f1e3da5d9 Mon Sep 17 00:00:00 2001
From: nym21 <expat-epochs0i@icloud.com>
Date: Mon, 27 Jan 2025 23:25:28 +0100
Subject: [PATCH 31/63] bindex: contained fjall code

---
 CHANGELOG.md                                  |   1 -
 Cargo.lock                                    |  12 +-
 Cargo.toml                                    |  11 +-
 bindex/Cargo.toml                             |   2 +-
 bindex/src/lib.rs                             |  82 +++++-----
 bindex/src/main.rs                            |   6 +-
 .../storage/{canopy => canopies}/database.rs  |   0
 .../{canopy => canopies}/environment.rs       |   0
 .../src/storage/{canopy => canopies}/mod.rs   |   0
 .../{canopy => canopies}/transaction.rs       |   0
 .../src/storage/{canopy => canopies}/tree.rs  |   0
 bindex/src/storage/fjall/base.rs              | 145 ------------------
 bindex/src/storage/fjalls/base.rs             | 102 ++++++++++++
 bindex/src/storage/fjalls/meta.rs             |  92 +++++++++++
 bindex/src/storage/{fjall => fjalls}/mod.rs   |  47 +++---
 bindex/src/storage/mod.rs                     |   8 +-
 .../storage/{sanakirja => sanakirjas}/meta.rs |   0
 .../storage/{sanakirja => sanakirjas}/mod.rs  |   0
 .../{sanakirja => sanakirjas}/multi.rs        |   0
 .../{sanakirja => sanakirjas}/unique.rs       |   0
 .../{storable_vec => storable_vecs}/base.rs   |   0
 .../{storable_vec => storable_vecs}/mod.rs    |   4 +-
 bomputer/Cargo.toml                           |   6 +
 bomputer/src/lib.rs                           |  37 +++--
 bomputer/src/main.rs                          |  13 ++
 bomputer/src/structs/date.rs                  |  46 ++++--
 server/Cargo.toml                             |  37 +++++
 .../src}/api/handlers/dataset.rs              |   0
 .../src}/api/handlers/last_values.rs          |   0
 .../server => server/src}/api/handlers/mod.rs |   0
 {src/server => server/src}/api/mod.rs         |   0
 .../src}/api/structs/chunk_metadata.rs        |   0
 .../src}/api/structs/extension.rs             |   0
 .../server => server/src}/api/structs/kind.rs |   0
 {src/server => server/src}/api/structs/mod.rs |   0
 .../src}/api/structs/range.rs                 |   0
 .../src}/api/structs/route.rs                 |   0
 .../src}/api/structs/routes.rs                |   0
 {src/server => server/src}/header_map.rs      |   0
 src/server/mod.rs => server/src/lib.rs        |   0
 {src/server => server/src}/response.rs        |   0
 .../src}/website/handlers/_minify.rs          |   0
 .../src}/website/handlers/file.rs             |   0
 .../src}/website/handlers/minify.rs           |   0
 .../src}/website/handlers/mod.rs              |   0
 {src/server => server/src}/website/mod.rs     |   0
 {iterable => struct_iterable}/Cargo.lock      |   0
 {iterable => struct_iterable}/Cargo.toml      |   0
 {iterable => struct_iterable}/README.md       |   0
 {iterable => struct_iterable}/src/lib.rs      |   0
 .../struct_iterable_derive/Cargo.toml         |   0
 .../struct_iterable_derive/README.md          |   0
 .../struct_iterable_derive/src/lib.rs         |   0
 .../struct_iterable_internal/Cargo.toml       |   0
 .../struct_iterable_internal/README.md        |   0
 .../struct_iterable_internal/src/lib.rs       |   0
 .../fonts/satoshi/2024-09/font.var.woff2      | Bin
 .../assets/fonts/satoshi/FFL.txt              |   0
 .../assets/pdfs/block/2022-report.pdf         | Bin
 .../pdfs/braiins/building-bitcoin-in-rust.pdf | Bin
 .../pdfs/glassnode/cointime-economics.pdf     | Bin
 .../assets/pdfs/multi-author/bcap_v1.0.pdf    | Bin
 ...-bitcoin-adoption-in-the-united-states.pdf | Bin
 .../protection-under-first-amendment.pdf      | Bin
 .../pdfs/satoshi-nakamoto/whitepaper.pdf      | Bin
 .../2021-bitcoin-clean-energy-initiative.pdf  | Bin
 .../2024-11-20_09-41-25/apple-icon-180.png    | Bin
 .../apple-splash-1125-2436.jpg                | Bin
 .../apple-splash-1136-640.jpg                 | Bin
 .../apple-splash-1170-2532.jpg                | Bin
 .../apple-splash-1179-2556.jpg                | Bin
 .../apple-splash-1242-2208.jpg                | Bin
 .../apple-splash-1242-2688.jpg                | Bin
 .../apple-splash-1284-2778.jpg                | Bin
 .../apple-splash-1290-2796.jpg                | Bin
 .../apple-splash-1334-750.jpg                 | Bin
 .../apple-splash-1488-2266.jpg                | Bin
 .../apple-splash-1536-2048.jpg                | Bin
 .../apple-splash-1620-2160.jpg                | Bin
 .../apple-splash-1640-2360.jpg                | Bin
 .../apple-splash-1668-2224.jpg                | Bin
 .../apple-splash-1668-2388.jpg                | Bin
 .../apple-splash-1792-828.jpg                 | Bin
 .../apple-splash-2048-1536.jpg                | Bin
 .../apple-splash-2048-2732.jpg                | Bin
 .../apple-splash-2160-1620.jpg                | Bin
 .../apple-splash-2208-1242.jpg                | Bin
 .../apple-splash-2224-1668.jpg                | Bin
 .../apple-splash-2266-1488.jpg                | Bin
 .../apple-splash-2360-1640.jpg                | Bin
 .../apple-splash-2388-1668.jpg                | Bin
 .../apple-splash-2436-1125.jpg                | Bin
 .../apple-splash-2532-1170.jpg                | Bin
 .../apple-splash-2556-1179.jpg                | Bin
 .../apple-splash-2688-1242.jpg                | Bin
 .../apple-splash-2732-2048.jpg                | Bin
 .../apple-splash-2778-1284.jpg                | Bin
 .../apple-splash-2796-1290.jpg                | Bin
 .../apple-splash-640-1136.jpg                 | Bin
 .../apple-splash-750-1334.jpg                 | Bin
 .../apple-splash-828-1792.jpg                 | Bin
 .../pwa/2024-11-20_09-41-25/favicon-196.png   | Bin
 .../assets/pwa/2024-11-20_09-41-25/index.html |   0
 .../manifest-icon-192.maskable.png            | Bin
 .../manifest-icon-512.maskable.png            | Bin
 .../website => website}/assets/pwa/index.html |   0
 {src/website => website}/generate-icons.sh    |   0
 {src/website => website}/index.html           |   0
 {src/website => website}/jsconfig.json        |   0
 {src/website => website}/manifest.webmanifest |   0
 .../website => website}/misc/tailwindTo550.js |   0
 .../packages/lean-qr/README.md                |   0
 .../packages/lean-qr/v2.3.4/script.js         |   0
 .../packages/lean-qr/v2.3.4/types.d.ts        |   0
 .../packages/lightweight-charts/NOTICE.md     |   0
 .../packages/lightweight-charts/README.md     |   0
 .../packages/lightweight-charts/types.d.ts    |   0
 .../lightweight-charts/v4.2.0/script.js       |   0
 .../lightweight-charts/v4.2.0/types.d.ts      |   0
 .../lightweight-charts/v4.2.2/script.js       |   0
 .../lightweight-charts/v4.2.2/types.d.ts      |   0
 .../packages/lightweight-charts/wrapper.js    |   0
 .../solid-signals/2024-11-02/script.js        |   0
 .../2024-11-02/types/core/constants.d.ts      |   0
 .../2024-11-02/types/core/core.d.ts           |   0
 .../2024-11-02/types/core/effect.d.ts         |   0
 .../2024-11-02/types/core/error.d.ts          |   0
 .../2024-11-02/types/core/flags.d.ts          |   0
 .../2024-11-02/types/core/index.d.ts          |   0
 .../2024-11-02/types/core/owner.d.ts          |   0
 .../2024-11-02/types/core/scheduler.d.ts      |   0
 .../solid-signals/2024-11-02/types/index.d.ts |   0
 .../solid-signals/2024-11-02/types/map.d.ts   |   0
 .../2024-11-02/types/signals.d.ts             |   0
 .../2024-11-02/types/store/index.d.ts         |   0
 .../2024-11-02/types/store/store.d.ts         |   0
 .../solid-signals/2024-11-02/types/utils.d.ts |   0
 .../solid-signals/2024-11-08/script.js        |   0
 .../2024-11-08/types/core/constants.d.ts      |   0
 .../2024-11-08/types/core/core.d.ts           |   0
 .../2024-11-08/types/core/effect.d.ts         |   0
 .../2024-11-08/types/core/error.d.ts          |   0
 .../2024-11-08/types/core/flags.d.ts          |   0
 .../2024-11-08/types/core/index.d.ts          |   0
 .../2024-11-08/types/core/owner.d.ts          |   0
 .../2024-11-08/types/core/scheduler.d.ts      |   0
 .../solid-signals/2024-11-08/types/index.d.ts |   0
 .../solid-signals/2024-11-08/types/map.d.ts   |   0
 .../2024-11-08/types/signals.d.ts             |   0
 .../2024-11-08/types/store/index.d.ts         |   0
 .../2024-11-08/types/store/store.d.ts         |   0
 .../solid-signals/2024-11-08/types/utils.d.ts |   0
 .../packages/solid-signals/README.md          |   0
 .../packages/solid-signals/types.d.ts         |   0
 .../packages/solid-signals/wrapper.js         |   0
 .../packages/ufuzzy/README.md                 |   0
 .../packages/ufuzzy/v1.0.14/script.js         |   0
 .../packages/ufuzzy/v1.0.14/types.d.ts        |   0
 {src/website => website}/robots.txt           |   0
 {src/website => website}/scripts/chart.js     |   0
 .../website => website}/scripts/live-price.js |   0
 {src/website => website}/scripts/main.js      |   0
 .../scripts/moscow-time.js                    |   0
 {src/website => website}/scripts/options.js   |   0
 .../scripts/service-worker.js                 |   0
 .../website => website}/scripts/simulation.js |   0
 .../scripts/types/self.d.ts                   |   0
 {src/website => website}/styles/chart.css     |   0
 .../website => website}/styles/live-price.css |   0
 .../styles/moscow-time.css                    |   0
 .../website => website}/styles/simulation.css |   0
 {src/website => website}/tsconfig.json        |   0
 172 files changed, 397 insertions(+), 254 deletions(-)
 rename bindex/src/storage/{canopy => canopies}/database.rs (100%)
 rename bindex/src/storage/{canopy => canopies}/environment.rs (100%)
 rename bindex/src/storage/{canopy => canopies}/mod.rs (100%)
 rename bindex/src/storage/{canopy => canopies}/transaction.rs (100%)
 rename bindex/src/storage/{canopy => canopies}/tree.rs (100%)
 delete mode 100644 bindex/src/storage/fjall/base.rs
 create mode 100644 bindex/src/storage/fjalls/base.rs
 create mode 100644 bindex/src/storage/fjalls/meta.rs
 rename bindex/src/storage/{fjall => fjalls}/mod.rs (82%)
 rename bindex/src/storage/{sanakirja => sanakirjas}/meta.rs (100%)
 rename bindex/src/storage/{sanakirja => sanakirjas}/mod.rs (100%)
 rename bindex/src/storage/{sanakirja => sanakirjas}/multi.rs (100%)
 rename bindex/src/storage/{sanakirja => sanakirjas}/unique.rs (100%)
 rename bindex/src/storage/{storable_vec => storable_vecs}/base.rs (100%)
 rename bindex/src/storage/{storable_vec => storable_vecs}/mod.rs (99%)
 create mode 100644 bomputer/src/main.rs
 create mode 100644 server/Cargo.toml
 rename {src/server => server/src}/api/handlers/dataset.rs (100%)
 rename {src/server => server/src}/api/handlers/last_values.rs (100%)
 rename {src/server => server/src}/api/handlers/mod.rs (100%)
 rename {src/server => server/src}/api/mod.rs (100%)
 rename {src/server => server/src}/api/structs/chunk_metadata.rs (100%)
 rename {src/server => server/src}/api/structs/extension.rs (100%)
 rename {src/server => server/src}/api/structs/kind.rs (100%)
 rename {src/server => server/src}/api/structs/mod.rs (100%)
 rename {src/server => server/src}/api/structs/range.rs (100%)
 rename {src/server => server/src}/api/structs/route.rs (100%)
 rename {src/server => server/src}/api/structs/routes.rs (100%)
 rename {src/server => server/src}/header_map.rs (100%)
 rename src/server/mod.rs => server/src/lib.rs (100%)
 rename {src/server => server/src}/response.rs (100%)
 rename {src/server => server/src}/website/handlers/_minify.rs (100%)
 rename {src/server => server/src}/website/handlers/file.rs (100%)
 rename {src/server => server/src}/website/handlers/minify.rs (100%)
 rename {src/server => server/src}/website/handlers/mod.rs (100%)
 rename {src/server => server/src}/website/mod.rs (100%)
 rename {iterable => struct_iterable}/Cargo.lock (100%)
 rename {iterable => struct_iterable}/Cargo.toml (100%)
 rename {iterable => struct_iterable}/README.md (100%)
 rename {iterable => struct_iterable}/src/lib.rs (100%)
 rename {iterable => struct_iterable}/struct_iterable_derive/Cargo.toml (100%)
 rename {iterable => struct_iterable}/struct_iterable_derive/README.md (100%)
 rename {iterable => struct_iterable}/struct_iterable_derive/src/lib.rs (100%)
 rename {iterable => struct_iterable}/struct_iterable_internal/Cargo.toml (100%)
 rename {iterable => struct_iterable}/struct_iterable_internal/README.md (100%)
 rename {iterable => struct_iterable}/struct_iterable_internal/src/lib.rs (100%)
 rename {src/website => website}/assets/fonts/satoshi/2024-09/font.var.woff2 (100%)
 rename {src/website => website}/assets/fonts/satoshi/FFL.txt (100%)
 rename {src/website => website}/assets/pdfs/block/2022-report.pdf (100%)
 rename {src/website => website}/assets/pdfs/braiins/building-bitcoin-in-rust.pdf (100%)
 rename {src/website => website}/assets/pdfs/glassnode/cointime-economics.pdf (100%)
 rename {src/website => website}/assets/pdfs/multi-author/bcap_v1.0.pdf (100%)
 rename {src/website => website}/assets/pdfs/nakamoto-project/understanding-bitcoin-adoption-in-the-united-states.pdf (100%)
 rename {src/website => website}/assets/pdfs/nydig/protection-under-first-amendment.pdf (100%)
 rename {src/website => website}/assets/pdfs/satoshi-nakamoto/whitepaper.pdf (100%)
 rename {src/website => website}/assets/pdfs/square/2021-bitcoin-clean-energy-initiative.pdf (100%)
 rename {src/website => website}/assets/pwa/2024-11-20_09-41-25/apple-icon-180.png (100%)
 rename {src/website => website}/assets/pwa/2024-11-20_09-41-25/apple-splash-1125-2436.jpg (100%)
 rename {src/website => website}/assets/pwa/2024-11-20_09-41-25/apple-splash-1136-640.jpg (100%)
 rename {src/website => website}/assets/pwa/2024-11-20_09-41-25/apple-splash-1170-2532.jpg (100%)
 rename {src/website => website}/assets/pwa/2024-11-20_09-41-25/apple-splash-1179-2556.jpg (100%)
 rename {src/website => website}/assets/pwa/2024-11-20_09-41-25/apple-splash-1242-2208.jpg (100%)
 rename {src/website => website}/assets/pwa/2024-11-20_09-41-25/apple-splash-1242-2688.jpg (100%)
 rename {src/website => website}/assets/pwa/2024-11-20_09-41-25/apple-splash-1284-2778.jpg (100%)
 rename {src/website => website}/assets/pwa/2024-11-20_09-41-25/apple-splash-1290-2796.jpg (100%)
 rename {src/website => website}/assets/pwa/2024-11-20_09-41-25/apple-splash-1334-750.jpg (100%)
 rename {src/website => website}/assets/pwa/2024-11-20_09-41-25/apple-splash-1488-2266.jpg (100%)
 rename {src/website => website}/assets/pwa/2024-11-20_09-41-25/apple-splash-1536-2048.jpg (100%)
 rename {src/website => website}/assets/pwa/2024-11-20_09-41-25/apple-splash-1620-2160.jpg (100%)
 rename {src/website => website}/assets/pwa/2024-11-20_09-41-25/apple-splash-1640-2360.jpg (100%)
 rename {src/website => website}/assets/pwa/2024-11-20_09-41-25/apple-splash-1668-2224.jpg (100%)
 rename {src/website => website}/assets/pwa/2024-11-20_09-41-25/apple-splash-1668-2388.jpg (100%)
 rename {src/website => website}/assets/pwa/2024-11-20_09-41-25/apple-splash-1792-828.jpg (100%)
 rename {src/website => website}/assets/pwa/2024-11-20_09-41-25/apple-splash-2048-1536.jpg (100%)
 rename {src/website => website}/assets/pwa/2024-11-20_09-41-25/apple-splash-2048-2732.jpg (100%)
 rename {src/website => website}/assets/pwa/2024-11-20_09-41-25/apple-splash-2160-1620.jpg (100%)
 rename {src/website => website}/assets/pwa/2024-11-20_09-41-25/apple-splash-2208-1242.jpg (100%)
 rename {src/website => website}/assets/pwa/2024-11-20_09-41-25/apple-splash-2224-1668.jpg (100%)
 rename {src/website => website}/assets/pwa/2024-11-20_09-41-25/apple-splash-2266-1488.jpg (100%)
 rename {src/website => website}/assets/pwa/2024-11-20_09-41-25/apple-splash-2360-1640.jpg (100%)
 rename {src/website => website}/assets/pwa/2024-11-20_09-41-25/apple-splash-2388-1668.jpg (100%)
 rename {src/website => website}/assets/pwa/2024-11-20_09-41-25/apple-splash-2436-1125.jpg (100%)
 rename {src/website => website}/assets/pwa/2024-11-20_09-41-25/apple-splash-2532-1170.jpg (100%)
 rename {src/website => website}/assets/pwa/2024-11-20_09-41-25/apple-splash-2556-1179.jpg (100%)
 rename {src/website => website}/assets/pwa/2024-11-20_09-41-25/apple-splash-2688-1242.jpg (100%)
 rename {src/website => website}/assets/pwa/2024-11-20_09-41-25/apple-splash-2732-2048.jpg (100%)
 rename {src/website => website}/assets/pwa/2024-11-20_09-41-25/apple-splash-2778-1284.jpg (100%)
 rename {src/website => website}/assets/pwa/2024-11-20_09-41-25/apple-splash-2796-1290.jpg (100%)
 rename {src/website => website}/assets/pwa/2024-11-20_09-41-25/apple-splash-640-1136.jpg (100%)
 rename {src/website => website}/assets/pwa/2024-11-20_09-41-25/apple-splash-750-1334.jpg (100%)
 rename {src/website => website}/assets/pwa/2024-11-20_09-41-25/apple-splash-828-1792.jpg (100%)
 rename {src/website => website}/assets/pwa/2024-11-20_09-41-25/favicon-196.png (100%)
 rename {src/website => website}/assets/pwa/2024-11-20_09-41-25/index.html (100%)
 rename {src/website => website}/assets/pwa/2024-11-20_09-41-25/manifest-icon-192.maskable.png (100%)
 rename {src/website => website}/assets/pwa/2024-11-20_09-41-25/manifest-icon-512.maskable.png (100%)
 rename {src/website => website}/assets/pwa/index.html (100%)
 rename {src/website => website}/generate-icons.sh (100%)
 rename {src/website => website}/index.html (100%)
 rename {src/website => website}/jsconfig.json (100%)
 rename {src/website => website}/manifest.webmanifest (100%)
 rename {src/website => website}/misc/tailwindTo550.js (100%)
 rename {src/website => website}/packages/lean-qr/README.md (100%)
 rename {src/website => website}/packages/lean-qr/v2.3.4/script.js (100%)
 rename {src/website => website}/packages/lean-qr/v2.3.4/types.d.ts (100%)
 rename {src/website => website}/packages/lightweight-charts/NOTICE.md (100%)
 rename {src/website => website}/packages/lightweight-charts/README.md (100%)
 rename {src/website => website}/packages/lightweight-charts/types.d.ts (100%)
 rename {src/website => website}/packages/lightweight-charts/v4.2.0/script.js (100%)
 rename {src/website => website}/packages/lightweight-charts/v4.2.0/types.d.ts (100%)
 rename {src/website => website}/packages/lightweight-charts/v4.2.2/script.js (100%)
 rename {src/website => website}/packages/lightweight-charts/v4.2.2/types.d.ts (100%)
 rename {src/website => website}/packages/lightweight-charts/wrapper.js (100%)
 rename {src/website => website}/packages/solid-signals/2024-11-02/script.js (100%)
 rename {src/website => website}/packages/solid-signals/2024-11-02/types/core/constants.d.ts (100%)
 rename {src/website => website}/packages/solid-signals/2024-11-02/types/core/core.d.ts (100%)
 rename {src/website => website}/packages/solid-signals/2024-11-02/types/core/effect.d.ts (100%)
 rename {src/website => website}/packages/solid-signals/2024-11-02/types/core/error.d.ts (100%)
 rename {src/website => website}/packages/solid-signals/2024-11-02/types/core/flags.d.ts (100%)
 rename {src/website => website}/packages/solid-signals/2024-11-02/types/core/index.d.ts (100%)
 rename {src/website => website}/packages/solid-signals/2024-11-02/types/core/owner.d.ts (100%)
 rename {src/website => website}/packages/solid-signals/2024-11-02/types/core/scheduler.d.ts (100%)
 rename {src/website => website}/packages/solid-signals/2024-11-02/types/index.d.ts (100%)
 rename {src/website => website}/packages/solid-signals/2024-11-02/types/map.d.ts (100%)
 rename {src/website => website}/packages/solid-signals/2024-11-02/types/signals.d.ts (100%)
 rename {src/website => website}/packages/solid-signals/2024-11-02/types/store/index.d.ts (100%)
 rename {src/website => website}/packages/solid-signals/2024-11-02/types/store/store.d.ts (100%)
 rename {src/website => website}/packages/solid-signals/2024-11-02/types/utils.d.ts (100%)
 rename {src/website => website}/packages/solid-signals/2024-11-08/script.js (100%)
 rename {src/website => website}/packages/solid-signals/2024-11-08/types/core/constants.d.ts (100%)
 rename {src/website => website}/packages/solid-signals/2024-11-08/types/core/core.d.ts (100%)
 rename {src/website => website}/packages/solid-signals/2024-11-08/types/core/effect.d.ts (100%)
 rename {src/website => website}/packages/solid-signals/2024-11-08/types/core/error.d.ts (100%)
 rename {src/website => website}/packages/solid-signals/2024-11-08/types/core/flags.d.ts (100%)
 rename {src/website => website}/packages/solid-signals/2024-11-08/types/core/index.d.ts (100%)
 rename {src/website => website}/packages/solid-signals/2024-11-08/types/core/owner.d.ts (100%)
 rename {src/website => website}/packages/solid-signals/2024-11-08/types/core/scheduler.d.ts (100%)
 rename {src/website => website}/packages/solid-signals/2024-11-08/types/index.d.ts (100%)
 rename {src/website => website}/packages/solid-signals/2024-11-08/types/map.d.ts (100%)
 rename {src/website => website}/packages/solid-signals/2024-11-08/types/signals.d.ts (100%)
 rename {src/website => website}/packages/solid-signals/2024-11-08/types/store/index.d.ts (100%)
 rename {src/website => website}/packages/solid-signals/2024-11-08/types/store/store.d.ts (100%)
 rename {src/website => website}/packages/solid-signals/2024-11-08/types/utils.d.ts (100%)
 rename {src/website => website}/packages/solid-signals/README.md (100%)
 rename {src/website => website}/packages/solid-signals/types.d.ts (100%)
 rename {src/website => website}/packages/solid-signals/wrapper.js (100%)
 rename {src/website => website}/packages/ufuzzy/README.md (100%)
 rename {src/website => website}/packages/ufuzzy/v1.0.14/script.js (100%)
 rename {src/website => website}/packages/ufuzzy/v1.0.14/types.d.ts (100%)
 rename {src/website => website}/robots.txt (100%)
 rename {src/website => website}/scripts/chart.js (100%)
 rename {src/website => website}/scripts/live-price.js (100%)
 rename {src/website => website}/scripts/main.js (100%)
 rename {src/website => website}/scripts/moscow-time.js (100%)
 rename {src/website => website}/scripts/options.js (100%)
 rename {src/website => website}/scripts/service-worker.js (100%)
 rename {src/website => website}/scripts/simulation.js (100%)
 rename {src/website => website}/scripts/types/self.d.ts (100%)
 rename {src/website => website}/styles/chart.css (100%)
 rename {src/website => website}/styles/live-price.css (100%)
 rename {src/website => website}/styles/moscow-time.css (100%)
 rename {src/website => website}/styles/simulation.css (100%)
 rename {src/website => website}/tsconfig.json (100%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ae5122317..cc13603fc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,7 +25,6 @@
 - Created separate crate for indexing called `bindex`
 - Created a crate a storage engine specialized in storing datasets that have indexes as keys and thus can be represented by an array/vec called `storable-vec`
 - Removed the need for the `-txindex=1` parameter when starting your Bitcoin Core node as kibō has its own indexes now
-- Tried different storage engines such as `fjall`, `canopydb` and `heed`, the first ended up being 3 times slower than `sanakirja` and had very fragile files (just looking at them would corrupt them), and the rest wouldn't play nice with `rayon` which is a dealbreaker
 - `snkrj` added a robust auto defragmentation to improve disk usage without the need for user's intervention
 
 ## Git
diff --git a/Cargo.lock b/Cargo.lock
index 4913a9beb..93e87f14b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -214,6 +214,14 @@ checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36"
 [[package]]
 name = "bomputer"
 version = "0.1.0"
+dependencies = [
+ "bindex",
+ "color-eyre",
+ "derive_deref",
+ "exit",
+ "jiff",
+ "rayon",
+]
 
 [[package]]
 name = "byteorder"
@@ -546,9 +554,9 @@ checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
 
 [[package]]
 name = "jiff"
-version = "0.1.25"
+version = "0.1.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb73dbeee753ae9411475ddd8861765fa7f25fe1eebf180c24e1bbabef3fbdcd"
+checksum = "a85348106ab244d90fe2d70faad939b71c5dad1258e5da9116e176064fc6c078"
 dependencies = [
  "jiff-tzdb-platform",
  "log",
diff --git a/Cargo.toml b/Cargo.toml
index 95fb25da8..8a7b88571 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -4,7 +4,16 @@
 # edition = "2021"
 
 [workspace]
-members = ["bindex", "biter", "bomputer", "exit", "iterable", "snkrj", "storable_vec"]
+members = [
+    "bindex",
+    "biter",
+    "bomputer",
+    "exit",
+    # "server",
+    "snkrj",
+    "struct_iterable",
+    "storable_vec",
+]
 resolver = "2"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
diff --git a/bindex/Cargo.toml b/bindex/Cargo.toml
index f716175b6..f07cd8537 100644
--- a/bindex/Cargo.toml
+++ b/bindex/Cargo.toml
@@ -10,7 +10,7 @@ color-eyre = "0.6.3"
 derive_deref = "1.1.1"
 exit = { path = "../exit" }
 fjall = "2.5.0"
-jiff = "0.1.24"
+jiff = "0.1.27"
 rapidhash = "1.3.0"
 rayon = "1.10.0"
 snkrj = { path = "../snkrj" }
diff --git a/bindex/src/lib.rs b/bindex/src/lib.rs
index f04a6cdcd..0d8cdbac4 100644
--- a/bindex/src/lib.rs
+++ b/bindex/src/lib.rs
@@ -7,10 +7,9 @@ use std::{
     time::Duration,
 };
 
-use biter::{
-    bitcoin::{Transaction, TxIn, TxOut, Txid},
-    rpc,
-};
+pub use biter::*;
+
+use biter::bitcoin::{Transaction, TxIn, TxOut, Txid};
 use color_eyre::eyre::{eyre, ContextCompat};
 use exit::Exit;
 use fjall::{PersistMode, ReadTransaction, TransactionalKeyspace};
@@ -19,8 +18,10 @@ use rayon::prelude::*;
 mod storage;
 mod structs;
 
-use storage::{Partitions, Vecs};
-use structs::{
+pub use biter;
+
+use storage::{Fjalls, StorableVecs};
+pub use structs::{
     Addressbytes, AddressbytesPrefix, Addressindex, Addresstype, Amount, BlockHashPrefix, Height, Timestamp,
     TxidPrefix, Txindex, Txinindex, Txoutindex, Vin, Vout,
 };
@@ -28,18 +29,24 @@ use structs::{
 const UNSAFE_BLOCKS: u32 = 100;
 const SNAPSHOT_BLOCK_RANGE: usize = 1000;
 
-#[derive(Debug)]
-pub struct Indexer;
+pub struct Indexer {
+    vecs: StorableVecs,
+    parts: Fjalls,
+}
 
 impl Indexer {
-    pub fn index(indexes_dir: &Path, bitcoin_dir: &Path, rpc: rpc::Client, exit: Exit) -> color_eyre::Result<()> {
+    pub fn import(indexes_dir: &Path) -> color_eyre::Result<Self> {
+        let vecs = StorableVecs::import(&indexes_dir.join("vecs"))?;
+        let parts = Fjalls::import(&indexes_dir.join("fjall"))?;
+
+        Ok(Self { vecs, parts })
+    }
+
+    pub fn index(&mut self, bitcoin_dir: &Path, rpc: rpc::Client, exit: &Exit) -> color_eyre::Result<()> {
         let check_collisions = true;
 
-        let mut vecs = Vecs::import(&indexes_dir.join("vecs"))?;
-
-        let keyspace = fjall::Config::new(indexes_dir.join("fjall")).open_transactional()?;
-        let mut parts = Partitions::import(&keyspace, &exit)?;
-        let rtx = keyspace.read_tx();
+        let vecs = &mut self.vecs;
+        let parts = &mut self.parts;
 
         let mut height = vecs
             .min_height()
@@ -66,24 +73,14 @@ impl Indexer {
         let mut p2wpkhindex_global = vecs.height_to_first_p2wpkhindex.get_or_default(height)?;
         let mut p2wshindex_global = vecs.height_to_first_p2wshindex.get_or_default(height)?;
 
-        let export = |keyspace: &TransactionalKeyspace,
-                      rtx: ReadTransaction,
-                      parts: &mut Partitions,
-                      vecs: &mut Vecs,
-                      height: Height|
-         -> color_eyre::Result<()> {
+        let export = |parts: &mut Fjalls, vecs: &mut StorableVecs, height: Height| -> color_eyre::Result<()> {
             println!("Exporting...");
 
-            drop(rtx);
-
             exit.block();
 
             thread::scope(|scope| -> color_eyre::Result<()> {
                 let vecs_handle = scope.spawn(|| vecs.flush(height));
-
-                parts.write(keyspace, height)?;
-                keyspace.persist(PersistMode::SyncAll)?;
-
+                parts.commit(height)?;
                 vecs_handle.join().unwrap()?;
                 Ok(())
             })?;
@@ -93,8 +90,8 @@ impl Indexer {
             Ok(())
         };
 
-        // let mut stores_opt = Some(stores);
-        let mut rtx_opt = Some(rtx);
+        // // let mut stores_opt = Some(stores);
+        // let mut rtx_opt = Some(rtx);
 
         biter::new(bitcoin_dir, Some(height.into()), None, rpc)
             .iter()
@@ -105,7 +102,7 @@ impl Indexer {
                 let timestamp = Timestamp::try_from(block.header.time)?;
 
                 // let mut stores = stores_opt.take().context("option should have store")?;
-                let rtx = rtx_opt.take().context("option should have rtx")?;
+                // let rtx = rtx_opt.take().context("option should have rtx")?;
 
                 if let Some(saved_blockhash) = vecs.height_to_blockhash.get(height)? {
                     if &blockhash != saved_blockhash.as_ref() {
@@ -118,7 +115,7 @@ impl Indexer {
 
                 if parts
                     .blockhash_prefix_to_height
-                    .get(&rtx, &blockhash_prefix)?
+                    .get(&blockhash_prefix)?
                     .is_some_and(|prev_height| prev_height != height)
                 {
                     dbg!(blockhash);
@@ -205,7 +202,7 @@ impl Indexer {
                                     let prev_txindex_slice_opt =
                                         if check_collisions && parts.txid_prefix_to_txindex.needs(height) {
                                             // Should only find collisions for two txids (duplicates), see below
-                                            parts.txid_prefix_to_txindex.get(&rtx, &txid_prefix)?
+                                            parts.txid_prefix_to_txindex.get(&txid_prefix)?
                                         } else {
                                             None
                                         };
@@ -246,7 +243,7 @@ impl Indexer {
 
                                 let prev_txindex = if let Some(txindex) = parts
                                     .txid_prefix_to_txindex
-                                    .get(&rtx, &TxidPrefix::try_from(&outpoint.txid)?)?
+                                    .get(&TxidPrefix::try_from(&outpoint.txid)?)?
                                     .and_then(|txindex| {
                                         // Checking if not finding txindex from the future
                                         (txindex < txindex_global).then_some(txindex)
@@ -323,7 +320,7 @@ impl Indexer {
                                     let addressindex_opt = addressbytes_res.as_ref().ok().and_then(|addressbytes| {
                                         parts
                                             .addressbytes_prefix_to_addressindex
-                                            .get(&rtx, &AddressbytesPrefix::from((addressbytes, addresstype)))
+                                            .get(&AddressbytesPrefix::from((addressbytes, addresstype)))
                                             .unwrap()
                                             // Checking if not in the future
                                             .and_then(|addressindex_local| {
@@ -546,7 +543,10 @@ impl Indexer {
 
                                     let block_txindex = txid_prefix_to_txid_and_block_txindex_and_prev_txindex
                                         .get(&TxidPrefix::try_from(&txid)?)
-                                        .context("txid should be in same block")?
+                                        .context("txid should be in same block").inspect_err(|_| {
+                                            dbg!(&txid_prefix_to_txid_and_block_txindex_and_prev_txindex);
+                                            // panic!();
+                                        })?
                                         .2;
                                     let prev_txindex = txindex_global + block_txindex;
 
@@ -654,22 +654,13 @@ impl Indexer {
 
                 let should_snapshot = _height != 0 && _height % SNAPSHOT_BLOCK_RANGE == 0 && !exit.active();
                 if should_snapshot {
-                    export(&keyspace, rtx, &mut parts, &mut vecs, height)?;
-                    rtx_opt.replace(keyspace.read_tx());
-                } else {
-                    rtx_opt.replace(rtx);
+                    export(parts, vecs, height)?;
                 }
 
                 Ok(())
             })?;
 
-        export(
-            &keyspace,
-            rtx_opt.take().context("option should have wtx")?,
-            &mut parts,
-            &mut vecs,
-            height,
-        )?;
+        export(parts, vecs, height)?;
 
         sleep(Duration::from_millis(100));
 
@@ -683,7 +674,6 @@ enum InputSource<'a> {
     SameBlock((&'a Transaction, Txindex, &'a TxIn, Vin)),
 }
 
-#[allow(unused)]
 fn pause() {
     let mut stdin = std::io::stdin();
     let mut stdout = std::io::stdout();
diff --git a/bindex/src/main.rs b/bindex/src/main.rs
index 9a0ee8dc3..7d6e08eb4 100644
--- a/bindex/src/main.rs
+++ b/bindex/src/main.rs
@@ -4,8 +4,6 @@ use bindex::Indexer;
 use biter::rpc;
 use exit::Exit;
 
-// https://github.com/romanz/electrs/blob/master/doc/schema.md
-
 fn main() -> color_eyre::Result<()> {
     color_eyre::install()?;
 
@@ -18,7 +16,9 @@ fn main() -> color_eyre::Result<()> {
 
     let i = std::time::Instant::now();
 
-    Indexer::index(Path::new("indexes"), data_dir, rpc, exit)?;
+    let mut indexer = Indexer::import(Path::new("indexes"))?;
+
+    indexer.index(data_dir, rpc, &exit)?;
 
     dbg!(i.elapsed());
 
diff --git a/bindex/src/storage/canopy/database.rs b/bindex/src/storage/canopies/database.rs
similarity index 100%
rename from bindex/src/storage/canopy/database.rs
rename to bindex/src/storage/canopies/database.rs
diff --git a/bindex/src/storage/canopy/environment.rs b/bindex/src/storage/canopies/environment.rs
similarity index 100%
rename from bindex/src/storage/canopy/environment.rs
rename to bindex/src/storage/canopies/environment.rs
diff --git a/bindex/src/storage/canopy/mod.rs b/bindex/src/storage/canopies/mod.rs
similarity index 100%
rename from bindex/src/storage/canopy/mod.rs
rename to bindex/src/storage/canopies/mod.rs
diff --git a/bindex/src/storage/canopy/transaction.rs b/bindex/src/storage/canopies/transaction.rs
similarity index 100%
rename from bindex/src/storage/canopy/transaction.rs
rename to bindex/src/storage/canopies/transaction.rs
diff --git a/bindex/src/storage/canopy/tree.rs b/bindex/src/storage/canopies/tree.rs
similarity index 100%
rename from bindex/src/storage/canopy/tree.rs
rename to bindex/src/storage/canopies/tree.rs
diff --git a/bindex/src/storage/fjall/base.rs b/bindex/src/storage/fjall/base.rs
deleted file mode 100644
index 9ed674187..000000000
--- a/bindex/src/storage/fjall/base.rs
+++ /dev/null
@@ -1,145 +0,0 @@
-use std::{collections::BTreeMap, mem};
-
-use exit::Exit;
-use fjall::{
-    PartitionCreateOptions, PersistMode, ReadTransaction, Result, Slice, TransactionalKeyspace,
-    TransactionalPartitionHandle, TxKeyspace, WriteTransaction,
-};
-
-use crate::structs::{Height, Version};
-
-pub struct Partition<Key, Value> {
-    version: Version,
-    data: TransactionalPartitionHandle,
-    meta: TransactionalPartitionHandle,
-    height: Option<Height>,
-    puts: BTreeMap<Key, Value>,
-}
-
-impl<Key, Value> Partition<Key, Value>
-where
-    Key: Into<Slice> + Ord,
-    Value: Into<Slice> + TryFrom<Slice> + Clone,
-{
-    pub const VERSION: &str = "version";
-    pub const HEIGHT: &str = "height";
-
-    pub fn import(
-        keyspace: &TransactionalKeyspace,
-        name: &str,
-        version: Version,
-        exit: &Exit,
-    ) -> color_eyre::Result<Self> {
-        let data = Self::open_data(keyspace, name)?;
-        let meta = Self::open_meta(keyspace, name)?;
-
-        let height = if let Some(slice) = meta.get(Self::HEIGHT)? {
-            Some(Height::try_from(slice)?)
-        } else {
-            None
-        };
-
-        let mut this = Self {
-            version,
-            height,
-            data,
-            meta,
-            puts: BTreeMap::new(),
-        };
-
-        if let Some(slice) = this.meta.get(Self::VERSION)? {
-            if version != Version::try_from(slice)? {
-                this = this.reset(keyspace, name, exit)?;
-            }
-        }
-
-        Ok(this)
-    }
-
-    fn open_data(keyspace: &TransactionalKeyspace, name: &str) -> Result<TransactionalPartitionHandle> {
-        keyspace.open_partition(&format!("{name}-data"), Self::create_options())
-    }
-
-    fn open_meta(keyspace: &TransactionalKeyspace, name: &str) -> Result<TransactionalPartitionHandle> {
-        keyspace.open_partition(&format!("{name}-meta"), Self::create_options())
-    }
-
-    fn create_options() -> PartitionCreateOptions {
-        PartitionCreateOptions::default().manual_journal_persist(true)
-    }
-
-    pub fn has(&self, height: Height) -> bool {
-        self.height.is_some_and(|self_height| self_height >= height)
-    }
-    pub fn needs(&self, height: Height) -> bool {
-        !self.has(height)
-    }
-
-    pub fn get<'a>(&self, rtx: &ReadTransaction, key: &'a Key) -> color_eyre::Result<Option<Value>>
-    where
-        fjall::Slice: std::convert::From<&'a Key>,
-        <Value as std::convert::TryFrom<fjall::Slice>>::Error: std::error::Error + Send + Sync,
-        <Value as std::convert::TryFrom<fjall::Slice>>::Error: 'static,
-    {
-        if let Some(v) = self.puts.get(key) {
-            return Ok(Some(v.clone()));
-        }
-
-        if let Some(slice) = rtx.get(&self.data, Slice::from(key))? {
-            let v_res = Value::try_from(slice);
-            let v = v_res?;
-            Ok(Some(v))
-        } else {
-            Ok(None)
-        }
-    }
-
-    pub fn insert_if_needed(&mut self, key: Key, value: Value, height: Height) {
-        if self.needs(height) {
-            self.puts.insert(key, value);
-        }
-    }
-
-    fn update_meta(&self, wtx: &mut WriteTransaction, height: Height) {
-        wtx.insert(&self.meta, Self::VERSION, self.version());
-        wtx.insert(&self.meta, Self::HEIGHT, height);
-    }
-
-    pub fn write(&mut self, keyspace: &TxKeyspace, height: Height) -> Result<()> {
-        if self.has(height) && self.puts.is_empty() {
-            return Ok(());
-        }
-
-        let mut wtx = keyspace.write_tx();
-        mem::take(&mut self.puts)
-            .into_iter()
-            .for_each(|(key, value)| wtx.insert(&self.data, key, value));
-        self.update_meta(&mut wtx, height);
-        wtx.commit()
-    }
-
-    pub fn version(&self) -> Version {
-        self.version
-    }
-
-    fn reset(mut self, keyspace: &TransactionalKeyspace, name: &str, exit: &Exit) -> Result<Self> {
-        exit.block();
-
-        keyspace.delete_partition(self.data)?;
-        keyspace.delete_partition(self.meta)?;
-
-        keyspace.persist(PersistMode::SyncAll)?;
-
-        self.data = Self::open_data(keyspace, name)?;
-        self.meta = Self::open_meta(keyspace, name)?;
-        self.height = None;
-
-        exit.unblock();
-
-        Ok(self)
-    }
-
-    pub fn height(&self) -> Option<&Height> {
-        self.height.as_ref()
-    }
-}
diff --git a/bindex/src/storage/fjalls/base.rs b/bindex/src/storage/fjalls/base.rs
new file mode 100644
index 000000000..43385992c
--- /dev/null
+++ b/bindex/src/storage/fjalls/base.rs
@@ -0,0 +1,102 @@
+use std::{collections::BTreeMap, mem, path::Path};
+
+use fjall::{
+    PartitionCreateOptions, PersistMode, ReadTransaction, Result, Slice, TransactionalKeyspace,
+    TransactionalPartitionHandle,
+};
+
+use crate::structs::{Height, Version};
+
+use super::Meta;
+
+pub struct Partition<Key, Value> {
+    meta: Meta,
+    keyspace: TransactionalKeyspace,
+    part: TransactionalPartitionHandle,
+    rtx: ReadTransaction,
+    puts: BTreeMap<Key, Value>,
+}
+
+impl<Key, Value> Partition<Key, Value>
+where
+    Key: Into<Slice> + Ord,
+    Value: Into<Slice> + TryFrom<Slice> + Clone,
+{
+    pub fn import(path: &Path, version: Version) -> color_eyre::Result<Self> {
+        let meta = Meta::checked_open(path, version)?;
+
+        let keyspace = fjall::Config::new(path.join("fjall")).open_transactional()?;
+        let handle = keyspace.open_partition(
+            "partition",
+            PartitionCreateOptions::default().manual_journal_persist(true),
+        )?;
+        let rtx = keyspace.read_tx();
+
+        Ok(Self {
+            meta,
+            keyspace,
+            part: handle,
+            rtx,
+            puts: BTreeMap::new(),
+        })
+    }
+
+    pub fn len(&self) -> usize {
+        self.meta.len() + self.puts.len()
+    }
+
+    pub fn has(&self, height: Height) -> bool {
+        self.height().is_some_and(|self_height| self_height >= &height)
+    }
+    pub fn needs(&self, height: Height) -> bool {
+        !self.has(height)
+    }
+
+    pub fn get<'a>(&self, key: &'a Key) -> color_eyre::Result<Option<Value>>
+    where
+        fjall::Slice: std::convert::From<&'a Key>,
+        <Value as std::convert::TryFrom<fjall::Slice>>::Error: std::error::Error + Send + Sync,
+        <Value as std::convert::TryFrom<fjall::Slice>>::Error: 'static,
+    {
+        if let Some(v) = self.puts.get(key) {
+            return Ok(Some(v.clone()));
+        }
+
+        if let Some(slice) = self.rtx.get(&self.part, Slice::from(key))? {
+            let v_res = Value::try_from(slice);
+            let v = v_res?;
+            Ok(Some(v))
+        } else {
+            Ok(None)
+        }
+    }
+
+    pub fn insert_if_needed(&mut self, key: Key, value: Value, height: Height) {
+        if self.needs(height) {
+            self.puts.insert(key, value);
+        }
+    }
+
+    pub fn commit(&mut self, height: Height) -> Result<()> {
+        if self.has(height) && self.puts.is_empty() {
+            return Ok(());
+        }
+
+        let mut wtx = self.keyspace.write_tx();
+        mem::take(&mut self.puts)
+            .into_iter()
+            .for_each(|(key, value)| wtx.insert(&self.part, key, value));
+        self.meta.export(self.len(), height)?;
+        wtx.commit()?;
+
+        self.keyspace.persist(PersistMode::SyncAll)?;
+
+        self.rtx = self.keyspace.read_tx();
+
+        Ok(())
+    }
+
+    pub fn height(&self) -> Option<&Height> {
+        self.meta.height()
+    }
+}
diff --git a/bindex/src/storage/fjalls/meta.rs b/bindex/src/storage/fjalls/meta.rs
new file mode 100644
index 000000000..3c04e38e2
--- /dev/null
+++ b/bindex/src/storage/fjalls/meta.rs
@@ -0,0 +1,92 @@
+use std::{
+    fs, io,
+    path::{Path, PathBuf},
+};
+
+use storable_vec::UnsafeSizedSerDe;
+
+use super::{Height, Version};
+
+pub struct Meta {
+    pathbuf: PathBuf,
+    version: Version,
+    height: Option<Height>,
+    len: usize,
+}
+
+impl Meta {
+    pub fn checked_open(path: &Path, version: Version) -> color_eyre::Result<Self> {
+        fs::create_dir_all(path)?;
+
+        let is_same_version =
+            Version::try_from(Self::path_version_(path).as_path()).is_ok_and(|prev_version| version == prev_version);
+
+        if !is_same_version {
+            fs::remove_dir_all(path)?;
+            fs::create_dir(path)?;
+        }
+
+        let this = Self {
+            pathbuf: path.to_owned(),
+            version,
+            height: Height::try_from(Self::path_height_(path).as_path()).ok(),
+            len: Self::read_length_(path)?,
+        };
+
+        this.version.write(&this.path_version())?;
+
+        Ok(this)
+    }
+
+    pub fn len(&self) -> usize {
+        self.len
+    }
+
+    pub fn export(&mut self, len: usize, height: Height) -> io::Result<()> {
+        self.len = len;
+        self.write_length()?;
+        self.height = Some(height);
+        height.write(&self.path_height())
+    }
+
+    fn path_version(&self) -> PathBuf {
+        Self::path_version_(&self.pathbuf)
+    }
+    fn path_version_(path: &Path) -> PathBuf {
+        path.join("version")
+    }
+
+    pub fn height(&self) -> Option<&Height> {
+        self.height.as_ref()
+    }
+    pub fn needs(&self, height: Height) -> bool {
+        self.height.is_none_or(|self_height| height > self_height)
+    }
+    pub fn has(&self, height: Height) -> bool {
+        !self.needs(height)
+    }
+    fn path_height(&self) -> PathBuf {
+        Self::path_height_(&self.pathbuf)
+    }
+    fn path_height_(path: &Path) -> PathBuf {
+        path.join("height")
+    }
+
+    fn read_length(&self) -> color_eyre::Result<usize> {
+        Self::read_length_(&self.pathbuf)
+    }
+    fn read_length_(path: &Path) -> color_eyre::Result<usize> {
+        Ok(fs::read(Self::path_length(path))
+            .map(|v| usize::unsafe_try_from_slice(v.as_slice()).cloned().unwrap_or_default())
+            .unwrap_or_default())
+    }
+    fn write_length(&self) -> io::Result<()> {
+        Self::write_length_(&self.pathbuf, self.len)
+    }
+    fn write_length_(path: &Path, len: usize) -> Result<(), io::Error> {
+        fs::write(Self::path_length(path), len.to_le_bytes())
+    }
+    fn path_length(path: &Path) -> PathBuf {
+        path.join("length")
+    }
+}
diff --git a/bindex/src/storage/fjall/mod.rs b/bindex/src/storage/fjalls/mod.rs
similarity index 82%
rename from bindex/src/storage/fjall/mod.rs
rename to bindex/src/storage/fjalls/mod.rs
index e458eacc6..3d17bb007 100644
--- a/bindex/src/storage/fjall/mod.rs
+++ b/bindex/src/storage/fjalls/mod.rs
@@ -1,34 +1,28 @@
-use std::thread;
+use std::{path::Path, thread};
 
 use crate::{structs::Version, AddressbytesPrefix, Addressindex, BlockHashPrefix, Height, TxidPrefix, Txindex};
 
 mod base;
-use base::*;
-use exit::Exit;
-use fjall::{TransactionalKeyspace, TxKeyspace};
+mod meta;
 
-pub struct Partitions {
+use base::*;
+use meta::*;
+
+pub struct Fjalls {
     pub addressbytes_prefix_to_addressindex: Partition<AddressbytesPrefix, Addressindex>,
     pub blockhash_prefix_to_height: Partition<BlockHashPrefix, Height>,
     pub txid_prefix_to_txindex: Partition<TxidPrefix, Txindex>,
 }
 
-impl Partitions {
-    pub fn import(keyspace: &TransactionalKeyspace, exit: &Exit) -> color_eyre::Result<Self> {
+impl Fjalls {
+    pub fn import(path: &Path) -> color_eyre::Result<Self> {
         Ok(Self {
             addressbytes_prefix_to_addressindex: Partition::import(
-                keyspace,
-                "addressbytes_prefix_to_addressindex",
+                &path.join("addressbytes_prefix_to_addressindex"),
                 Version::from(1),
-                exit,
             )?,
-            blockhash_prefix_to_height: Partition::import(
-                keyspace,
-                "blockhash_prefix_to_height",
-                Version::from(1),
-                exit,
-            )?,
-            txid_prefix_to_txindex: Partition::import(keyspace, "txid_prefix_to_txindex", Version::from(1), exit)?,
+            blockhash_prefix_to_height: Partition::import(&path.join("blockhash_prefix_to_height"), Version::from(1))?,
+            txid_prefix_to_txindex: Partition::import(&path.join("txid_prefix_to_txindex"), Version::from(1))?,
         })
     }
 
@@ -163,18 +157,17 @@ impl Partitions {
         .cloned()
     }
 
-    pub fn write(&mut self, keyspace: &TxKeyspace, height: Height) -> fjall::Result<()> {
+    pub fn commit(&mut self, height: Height) -> fjall::Result<()> {
         thread::scope(|scope| {
-            let addressbytes_prefix_to_addressindex_write_handle =
-                scope.spawn(|| self.addressbytes_prefix_to_addressindex.write(keyspace, height));
-            let blockhash_prefix_to_height_write_handle =
-                scope.spawn(|| self.blockhash_prefix_to_height.write(keyspace, height));
-            let txid_prefix_to_txindex_write_handle =
-                scope.spawn(|| self.txid_prefix_to_txindex.write(keyspace, height));
+            let addressbytes_prefix_to_addressindex_commit_handle =
+                scope.spawn(|| self.addressbytes_prefix_to_addressindex.commit(height));
+            let blockhash_prefix_to_height_commit_handle =
+                scope.spawn(|| self.blockhash_prefix_to_height.commit(height));
+            let txid_prefix_to_txindex_commit_handle = scope.spawn(|| self.txid_prefix_to_txindex.commit(height));
 
-            addressbytes_prefix_to_addressindex_write_handle.join().unwrap()?;
-            blockhash_prefix_to_height_write_handle.join().unwrap()?;
-            txid_prefix_to_txindex_write_handle.join().unwrap()?;
+            addressbytes_prefix_to_addressindex_commit_handle.join().unwrap()?;
+            blockhash_prefix_to_height_commit_handle.join().unwrap()?;
+            txid_prefix_to_txindex_commit_handle.join().unwrap()?;
 
             Ok(())
         })
diff --git a/bindex/src/storage/mod.rs b/bindex/src/storage/mod.rs
index c920d9e38..f25e0398a 100644
--- a/bindex/src/storage/mod.rs
+++ b/bindex/src/storage/mod.rs
@@ -1,9 +1,9 @@
 // mod canopy;
-mod fjall;
+mod fjalls;
 // mod sanakirja;
-mod storable_vec;
+mod storable_vecs;
 
 // pub use canopy::*;
-pub use fjall::*;
+pub use fjalls::*;
 // pub use sanakirja::*;
-pub use storable_vec::*;
+pub use storable_vecs::*;
diff --git a/bindex/src/storage/sanakirja/meta.rs b/bindex/src/storage/sanakirjas/meta.rs
similarity index 100%
rename from bindex/src/storage/sanakirja/meta.rs
rename to bindex/src/storage/sanakirjas/meta.rs
diff --git a/bindex/src/storage/sanakirja/mod.rs b/bindex/src/storage/sanakirjas/mod.rs
similarity index 100%
rename from bindex/src/storage/sanakirja/mod.rs
rename to bindex/src/storage/sanakirjas/mod.rs
diff --git a/bindex/src/storage/sanakirja/multi.rs b/bindex/src/storage/sanakirjas/multi.rs
similarity index 100%
rename from bindex/src/storage/sanakirja/multi.rs
rename to bindex/src/storage/sanakirjas/multi.rs
diff --git a/bindex/src/storage/sanakirja/unique.rs b/bindex/src/storage/sanakirjas/unique.rs
similarity index 100%
rename from bindex/src/storage/sanakirja/unique.rs
rename to bindex/src/storage/sanakirjas/unique.rs
diff --git a/bindex/src/storage/storable_vec/base.rs b/bindex/src/storage/storable_vecs/base.rs
similarity index 100%
rename from bindex/src/storage/storable_vec/base.rs
rename to bindex/src/storage/storable_vecs/base.rs
diff --git a/bindex/src/storage/storable_vec/mod.rs b/bindex/src/storage/storable_vecs/mod.rs
similarity index 99%
rename from bindex/src/storage/storable_vec/mod.rs
rename to bindex/src/storage/storable_vecs/mod.rs
index 83487ebab..a9ea76211 100644
--- a/bindex/src/storage/storable_vec/mod.rs
+++ b/bindex/src/storage/storable_vecs/mod.rs
@@ -14,7 +14,7 @@ mod base;
 
 use base::*;
 
-pub struct Vecs {
+pub struct StorableVecs {
     pub addressindex_to_addresstype: StorableVec<Addressindex, Addresstype>,
     pub addressindex_to_addresstypeindex: StorableVec<Addressindex, Addresstypeindex>,
     pub addressindex_to_height: StorableVec<Addressindex, Height>,
@@ -75,7 +75,7 @@ pub struct Vecs {
 
 // const UNSAFE_BLOCKS: usize = 100;
 
-impl Vecs {
+impl StorableVecs {
     pub fn import(path: &Path) -> color_eyre::Result<Self> {
         fs::create_dir_all(path)?;
 
diff --git a/bomputer/Cargo.toml b/bomputer/Cargo.toml
index ad1754861..cd8dcb5ea 100644
--- a/bomputer/Cargo.toml
+++ b/bomputer/Cargo.toml
@@ -4,3 +4,9 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
+bindex = { path = "../bindex" }
+color-eyre = "0.6.3"
+derive_deref = "1.1.1"
+exit = { path = "../exit" }
+jiff = "0.1.27"
+rayon = "1.10.0"
diff --git a/bomputer/src/lib.rs b/bomputer/src/lib.rs
index 00a8d195b..a1e960b65 100644
--- a/bomputer/src/lib.rs
+++ b/bomputer/src/lib.rs
@@ -1,18 +1,35 @@
+use std::path::Path;
+
+use bindex::{biter::rpc, Indexer};
+use exit::Exit;
+
 mod structs;
 
 use structs::*;
 
-pub fn add(left: u64, right: u64) -> u64 {
-    left + right
+pub struct Bomputer;
+
+impl Bomputer {
+    pub fn compute() {}
 }
 
-#[cfg(test)]
-mod tests {
-    use super::*;
+pub fn main() -> color_eyre::Result<()> {
+    color_eyre::install()?;
 
-    #[test]
-    fn it_works() {
-        let result = add(2, 2);
-        assert_eq!(result, 4);
-    }
+    let data_dir = Path::new("../../bitcoin");
+    let rpc = rpc::Client::new(
+        "http://localhost:8332",
+        rpc::Auth::CookieFile(Path::new(data_dir).join(".cookie")),
+    )?;
+    let exit = Exit::new();
+
+    let i = std::time::Instant::now();
+
+    let mut indexer = Indexer::import(Path::new("indexes"))?;
+
+    indexer.index(data_dir, rpc, &exit)?;
+
+    dbg!(i.elapsed());
+
+    Ok(())
 }
diff --git a/bomputer/src/main.rs b/bomputer/src/main.rs
new file mode 100644
index 000000000..164fa7fa1
--- /dev/null
+++ b/bomputer/src/main.rs
@@ -0,0 +1,13 @@
+use structs::Date;
+
+mod structs;
+
+pub fn main() -> color_eyre::Result<()> {
+    let date1 = Date::from(jiff::civil::Date::constant(2009, 1, 9));
+    let date2 = Date::from(jiff::civil::Date::constant(2009, 1, 31));
+    let date3 = Date::from(jiff::civil::Date::constant(2019, 1, 9));
+    dbg!(usize::try_from(date1))?;
+    dbg!(usize::try_from(date2))?;
+    dbg!(usize::try_from(date3))?;
+    Ok(())
+}
diff --git a/bomputer/src/structs/date.rs b/bomputer/src/structs/date.rs
index 207c88d3d..c603135c1 100644
--- a/bomputer/src/structs/date.rs
+++ b/bomputer/src/structs/date.rs
@@ -1,19 +1,41 @@
-use jiff::tz::TimeZone;
+use bindex::Timestamp;
+use color_eyre::eyre::eyre;
+use derive_deref::Deref;
+use jiff::{civil::Date as _Date, tz::TimeZone};
 
-use super::Timestamp;
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Deref)]
+pub struct Date(_Date);
 
-#[derive(Debug, Clone)]
-pub struct Date(jiff::civil::Date);
+impl Date {
+    const INDEX_ZERO: Self = Self(_Date::constant(2009, 1, 3));
+    const INDEX_ONE: Self = Self(_Date::constant(2009, 1, 9));
+}
 
-impl From<&Timestamp> for Date {
-    fn from(value: &Timestamp) -> Self {
-        Self(jiff::civil::Date::from(value.to_zoned(TimeZone::UTC)))
+impl From<_Date> for Date {
+    fn from(value: _Date) -> Self {
+        Self(value)
     }
 }
 
-impl From<Date> for usize {
-    // 2009-01-03 => 0
-    // 2009-01-09 => 1
-    // 2009-01-10 => 2
-    // ...
+impl From<&Timestamp> for Date {
+    fn from(value: &Timestamp) -> Self {
+        Self(_Date::from(value.to_zoned(TimeZone::UTC)))
+    }
+}
+
+impl TryFrom<Date> for usize {
+    type Error = color_eyre::Report;
+    fn try_from(value: Date) -> Result<Self, Self::Error> {
+        if value < Date::INDEX_ZERO {
+            Err(eyre!("Date is too early"))
+        } else if value == Date::INDEX_ZERO {
+            Ok(0)
+        } else if value < Date::INDEX_ONE {
+            Err(eyre!("Date is between first and second"))
+        } else if value == Date::INDEX_ONE {
+            Ok(1)
+        } else {
+            Ok(Date::INDEX_ONE.until(*value)?.get_days() as usize + 1)
+        }
+    }
 }
diff --git a/server/Cargo.toml b/server/Cargo.toml
new file mode 100644
index 000000000..b453775bb
--- /dev/null
+++ b/server/Cargo.toml
@@ -0,0 +1,37 @@
+[package]
+name = "kibo_server"
+version = "0.6.0"
+edition = "2021"
+
+[dependencies]
+# allocative = "0.3.4"
+axum = "0.7.9"
+# bincode = { git = "https://github.com/bincode-org/bincode.git", features = [
+#     "serde",
+# ] }
+# bitcoin_hashes = { version = "0.15.0" }
+# biter = { path = "./src/crates/biter" }
+# chrono = { version = "0.4.39", features = ["serde"] }
+# clap = { version = "4.5.26", features = ["derive"] }
+# color-eyre = "0.6.3"
+# ctrlc = { version = "3.4.5", features = ["termination"] }
+# derive_deref = "1.1.1"
+# env_logger = "0.11.6"
+# inferno = "0.12.1"
+# itertools = "0.13.0"
+# log = { version = "0.4.25", features = ["std", "serde"] }
+# ordered-float = "4.6.0"
+# rayon = "1.10.0"
+# regex = "1.11.1"
+# reqwest = { version = "0.12.12", features = ["blocking", "json"] }
+# rlimit = "0.10.2"
+# snkrj = { path = "./src/crates/snkrj" }
+# serde = { version = "1.0.217", features = ["derive"] }
+# serde_json = "1.0.135"
+# struct_iterable = { path = "./src/crates/iterable" }
+# swc = "9.0.2"
+# swc_common = "5.0.0"
+# tokio = { version = "1.43.0", features = ["full"] }
+# toml = "0.8.19"
+# tower-http = { version = "0.6.2", features = ["compression-full"] }
+# zstd = "0.13.2"
diff --git a/src/server/api/handlers/dataset.rs b/server/src/api/handlers/dataset.rs
similarity index 100%
rename from src/server/api/handlers/dataset.rs
rename to server/src/api/handlers/dataset.rs
diff --git a/src/server/api/handlers/last_values.rs b/server/src/api/handlers/last_values.rs
similarity index 100%
rename from src/server/api/handlers/last_values.rs
rename to server/src/api/handlers/last_values.rs
diff --git a/src/server/api/handlers/mod.rs b/server/src/api/handlers/mod.rs
similarity index 100%
rename from src/server/api/handlers/mod.rs
rename to server/src/api/handlers/mod.rs
diff --git a/src/server/api/mod.rs b/server/src/api/mod.rs
similarity index 100%
rename from src/server/api/mod.rs
rename to server/src/api/mod.rs
diff --git a/src/server/api/structs/chunk_metadata.rs b/server/src/api/structs/chunk_metadata.rs
similarity index 100%
rename from src/server/api/structs/chunk_metadata.rs
rename to server/src/api/structs/chunk_metadata.rs
diff --git a/src/server/api/structs/extension.rs b/server/src/api/structs/extension.rs
similarity index 100%
rename from src/server/api/structs/extension.rs
rename to server/src/api/structs/extension.rs
diff --git a/src/server/api/structs/kind.rs b/server/src/api/structs/kind.rs
similarity index 100%
rename from src/server/api/structs/kind.rs
rename to server/src/api/structs/kind.rs
diff --git a/src/server/api/structs/mod.rs b/server/src/api/structs/mod.rs
similarity index 100%
rename from src/server/api/structs/mod.rs
rename to server/src/api/structs/mod.rs
diff --git a/src/server/api/structs/range.rs b/server/src/api/structs/range.rs
similarity index 100%
rename from src/server/api/structs/range.rs
rename to server/src/api/structs/range.rs
diff --git a/src/server/api/structs/route.rs b/server/src/api/structs/route.rs
similarity index 100%
rename from src/server/api/structs/route.rs
rename to server/src/api/structs/route.rs
diff --git a/src/server/api/structs/routes.rs b/server/src/api/structs/routes.rs
similarity index 100%
rename from src/server/api/structs/routes.rs
rename to server/src/api/structs/routes.rs
diff --git a/src/server/header_map.rs b/server/src/header_map.rs
similarity index 100%
rename from src/server/header_map.rs
rename to server/src/header_map.rs
diff --git a/src/server/mod.rs b/server/src/lib.rs
similarity index 100%
rename from src/server/mod.rs
rename to server/src/lib.rs
diff --git a/src/server/response.rs b/server/src/response.rs
similarity index 100%
rename from src/server/response.rs
rename to server/src/response.rs
diff --git a/src/server/website/handlers/_minify.rs b/server/src/website/handlers/_minify.rs
similarity index 100%
rename from src/server/website/handlers/_minify.rs
rename to server/src/website/handlers/_minify.rs
diff --git a/src/server/website/handlers/file.rs b/server/src/website/handlers/file.rs
similarity index 100%
rename from src/server/website/handlers/file.rs
rename to server/src/website/handlers/file.rs
diff --git a/src/server/website/handlers/minify.rs b/server/src/website/handlers/minify.rs
similarity index 100%
rename from src/server/website/handlers/minify.rs
rename to server/src/website/handlers/minify.rs
diff --git a/src/server/website/handlers/mod.rs b/server/src/website/handlers/mod.rs
similarity index 100%
rename from src/server/website/handlers/mod.rs
rename to server/src/website/handlers/mod.rs
diff --git a/src/server/website/mod.rs b/server/src/website/mod.rs
similarity index 100%
rename from src/server/website/mod.rs
rename to server/src/website/mod.rs
diff --git a/iterable/Cargo.lock b/struct_iterable/Cargo.lock
similarity index 100%
rename from iterable/Cargo.lock
rename to struct_iterable/Cargo.lock
diff --git a/iterable/Cargo.toml b/struct_iterable/Cargo.toml
similarity index 100%
rename from iterable/Cargo.toml
rename to struct_iterable/Cargo.toml
diff --git a/iterable/README.md b/struct_iterable/README.md
similarity index 100%
rename from iterable/README.md
rename to struct_iterable/README.md
diff --git a/iterable/src/lib.rs b/struct_iterable/src/lib.rs
similarity index 100%
rename from iterable/src/lib.rs
rename to struct_iterable/src/lib.rs
diff --git a/iterable/struct_iterable_derive/Cargo.toml b/struct_iterable/struct_iterable_derive/Cargo.toml
similarity index 100%
rename from iterable/struct_iterable_derive/Cargo.toml
rename to struct_iterable/struct_iterable_derive/Cargo.toml
diff --git a/iterable/struct_iterable_derive/README.md b/struct_iterable/struct_iterable_derive/README.md
similarity index 100%
rename from iterable/struct_iterable_derive/README.md
rename to struct_iterable/struct_iterable_derive/README.md
diff --git a/iterable/struct_iterable_derive/src/lib.rs b/struct_iterable/struct_iterable_derive/src/lib.rs
similarity index 100%
rename from iterable/struct_iterable_derive/src/lib.rs
rename to struct_iterable/struct_iterable_derive/src/lib.rs
diff --git a/iterable/struct_iterable_internal/Cargo.toml b/struct_iterable/struct_iterable_internal/Cargo.toml
similarity index 100%
rename from iterable/struct_iterable_internal/Cargo.toml
rename to struct_iterable/struct_iterable_internal/Cargo.toml
diff --git a/iterable/struct_iterable_internal/README.md b/struct_iterable/struct_iterable_internal/README.md
similarity index 100%
rename from iterable/struct_iterable_internal/README.md
rename to struct_iterable/struct_iterable_internal/README.md
diff --git a/iterable/struct_iterable_internal/src/lib.rs b/struct_iterable/struct_iterable_internal/src/lib.rs
similarity index 100%
rename from iterable/struct_iterable_internal/src/lib.rs
rename to struct_iterable/struct_iterable_internal/src/lib.rs
diff --git a/src/website/assets/fonts/satoshi/2024-09/font.var.woff2 b/website/assets/fonts/satoshi/2024-09/font.var.woff2
similarity index 100%
rename from src/website/assets/fonts/satoshi/2024-09/font.var.woff2
rename to website/assets/fonts/satoshi/2024-09/font.var.woff2
diff --git a/src/website/assets/fonts/satoshi/FFL.txt b/website/assets/fonts/satoshi/FFL.txt
similarity index 100%
rename from src/website/assets/fonts/satoshi/FFL.txt
rename to website/assets/fonts/satoshi/FFL.txt
diff --git a/src/website/assets/pdfs/block/2022-report.pdf b/website/assets/pdfs/block/2022-report.pdf
similarity index 100%
rename from src/website/assets/pdfs/block/2022-report.pdf
rename to website/assets/pdfs/block/2022-report.pdf
diff --git a/src/website/assets/pdfs/braiins/building-bitcoin-in-rust.pdf b/website/assets/pdfs/braiins/building-bitcoin-in-rust.pdf
similarity index 100%
rename from src/website/assets/pdfs/braiins/building-bitcoin-in-rust.pdf
rename to website/assets/pdfs/braiins/building-bitcoin-in-rust.pdf
diff --git a/src/website/assets/pdfs/glassnode/cointime-economics.pdf b/website/assets/pdfs/glassnode/cointime-economics.pdf
similarity index 100%
rename from src/website/assets/pdfs/glassnode/cointime-economics.pdf
rename to website/assets/pdfs/glassnode/cointime-economics.pdf
diff --git a/src/website/assets/pdfs/multi-author/bcap_v1.0.pdf b/website/assets/pdfs/multi-author/bcap_v1.0.pdf
similarity index 100%
rename from src/website/assets/pdfs/multi-author/bcap_v1.0.pdf
rename to website/assets/pdfs/multi-author/bcap_v1.0.pdf
diff --git a/src/website/assets/pdfs/nakamoto-project/understanding-bitcoin-adoption-in-the-united-states.pdf b/website/assets/pdfs/nakamoto-project/understanding-bitcoin-adoption-in-the-united-states.pdf
similarity index 100%
rename from src/website/assets/pdfs/nakamoto-project/understanding-bitcoin-adoption-in-the-united-states.pdf
rename to website/assets/pdfs/nakamoto-project/understanding-bitcoin-adoption-in-the-united-states.pdf
diff --git a/src/website/assets/pdfs/nydig/protection-under-first-amendment.pdf b/website/assets/pdfs/nydig/protection-under-first-amendment.pdf
similarity index 100%
rename from src/website/assets/pdfs/nydig/protection-under-first-amendment.pdf
rename to website/assets/pdfs/nydig/protection-under-first-amendment.pdf
diff --git a/src/website/assets/pdfs/satoshi-nakamoto/whitepaper.pdf b/website/assets/pdfs/satoshi-nakamoto/whitepaper.pdf
similarity index 100%
rename from src/website/assets/pdfs/satoshi-nakamoto/whitepaper.pdf
rename to website/assets/pdfs/satoshi-nakamoto/whitepaper.pdf
diff --git a/src/website/assets/pdfs/square/2021-bitcoin-clean-energy-initiative.pdf b/website/assets/pdfs/square/2021-bitcoin-clean-energy-initiative.pdf
similarity index 100%
rename from src/website/assets/pdfs/square/2021-bitcoin-clean-energy-initiative.pdf
rename to website/assets/pdfs/square/2021-bitcoin-clean-energy-initiative.pdf
diff --git a/src/website/assets/pwa/2024-11-20_09-41-25/apple-icon-180.png b/website/assets/pwa/2024-11-20_09-41-25/apple-icon-180.png
similarity index 100%
rename from src/website/assets/pwa/2024-11-20_09-41-25/apple-icon-180.png
rename to website/assets/pwa/2024-11-20_09-41-25/apple-icon-180.png
diff --git a/src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1125-2436.jpg b/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1125-2436.jpg
similarity index 100%
rename from src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1125-2436.jpg
rename to website/assets/pwa/2024-11-20_09-41-25/apple-splash-1125-2436.jpg
diff --git a/src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1136-640.jpg b/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1136-640.jpg
similarity index 100%
rename from src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1136-640.jpg
rename to website/assets/pwa/2024-11-20_09-41-25/apple-splash-1136-640.jpg
diff --git a/src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1170-2532.jpg b/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1170-2532.jpg
similarity index 100%
rename from src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1170-2532.jpg
rename to website/assets/pwa/2024-11-20_09-41-25/apple-splash-1170-2532.jpg
diff --git a/src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1179-2556.jpg b/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1179-2556.jpg
similarity index 100%
rename from src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1179-2556.jpg
rename to website/assets/pwa/2024-11-20_09-41-25/apple-splash-1179-2556.jpg
diff --git a/src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1242-2208.jpg b/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1242-2208.jpg
similarity index 100%
rename from src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1242-2208.jpg
rename to website/assets/pwa/2024-11-20_09-41-25/apple-splash-1242-2208.jpg
diff --git a/src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1242-2688.jpg b/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1242-2688.jpg
similarity index 100%
rename from src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1242-2688.jpg
rename to website/assets/pwa/2024-11-20_09-41-25/apple-splash-1242-2688.jpg
diff --git a/src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1284-2778.jpg b/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1284-2778.jpg
similarity index 100%
rename from src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1284-2778.jpg
rename to website/assets/pwa/2024-11-20_09-41-25/apple-splash-1284-2778.jpg
diff --git a/src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1290-2796.jpg b/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1290-2796.jpg
similarity index 100%
rename from src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1290-2796.jpg
rename to website/assets/pwa/2024-11-20_09-41-25/apple-splash-1290-2796.jpg
diff --git a/src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1334-750.jpg b/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1334-750.jpg
similarity index 100%
rename from src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1334-750.jpg
rename to website/assets/pwa/2024-11-20_09-41-25/apple-splash-1334-750.jpg
diff --git a/src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1488-2266.jpg b/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1488-2266.jpg
similarity index 100%
rename from src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1488-2266.jpg
rename to website/assets/pwa/2024-11-20_09-41-25/apple-splash-1488-2266.jpg
diff --git a/src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1536-2048.jpg b/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1536-2048.jpg
similarity index 100%
rename from src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1536-2048.jpg
rename to website/assets/pwa/2024-11-20_09-41-25/apple-splash-1536-2048.jpg
diff --git a/src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1620-2160.jpg b/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1620-2160.jpg
similarity index 100%
rename from src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1620-2160.jpg
rename to website/assets/pwa/2024-11-20_09-41-25/apple-splash-1620-2160.jpg
diff --git a/src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1640-2360.jpg b/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1640-2360.jpg
similarity index 100%
rename from src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1640-2360.jpg
rename to website/assets/pwa/2024-11-20_09-41-25/apple-splash-1640-2360.jpg
diff --git a/src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1668-2224.jpg b/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1668-2224.jpg
similarity index 100%
rename from src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1668-2224.jpg
rename to website/assets/pwa/2024-11-20_09-41-25/apple-splash-1668-2224.jpg
diff --git a/src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1668-2388.jpg b/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1668-2388.jpg
similarity index 100%
rename from src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1668-2388.jpg
rename to website/assets/pwa/2024-11-20_09-41-25/apple-splash-1668-2388.jpg
diff --git a/src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1792-828.jpg b/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1792-828.jpg
similarity index 100%
rename from src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1792-828.jpg
rename to website/assets/pwa/2024-11-20_09-41-25/apple-splash-1792-828.jpg
diff --git a/src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2048-1536.jpg b/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2048-1536.jpg
similarity index 100%
rename from src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2048-1536.jpg
rename to website/assets/pwa/2024-11-20_09-41-25/apple-splash-2048-1536.jpg
diff --git a/src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2048-2732.jpg b/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2048-2732.jpg
similarity index 100%
rename from src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2048-2732.jpg
rename to website/assets/pwa/2024-11-20_09-41-25/apple-splash-2048-2732.jpg
diff --git a/src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2160-1620.jpg b/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2160-1620.jpg
similarity index 100%
rename from src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2160-1620.jpg
rename to website/assets/pwa/2024-11-20_09-41-25/apple-splash-2160-1620.jpg
diff --git a/src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2208-1242.jpg b/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2208-1242.jpg
similarity index 100%
rename from src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2208-1242.jpg
rename to website/assets/pwa/2024-11-20_09-41-25/apple-splash-2208-1242.jpg
diff --git a/src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2224-1668.jpg b/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2224-1668.jpg
similarity index 100%
rename from src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2224-1668.jpg
rename to website/assets/pwa/2024-11-20_09-41-25/apple-splash-2224-1668.jpg
diff --git a/src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2266-1488.jpg b/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2266-1488.jpg
similarity index 100%
rename from src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2266-1488.jpg
rename to website/assets/pwa/2024-11-20_09-41-25/apple-splash-2266-1488.jpg
diff --git a/src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2360-1640.jpg b/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2360-1640.jpg
similarity index 100%
rename from src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2360-1640.jpg
rename to website/assets/pwa/2024-11-20_09-41-25/apple-splash-2360-1640.jpg
diff --git a/src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2388-1668.jpg b/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2388-1668.jpg
similarity index 100%
rename from src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2388-1668.jpg
rename to website/assets/pwa/2024-11-20_09-41-25/apple-splash-2388-1668.jpg
diff --git a/src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2436-1125.jpg b/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2436-1125.jpg
similarity index 100%
rename from src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2436-1125.jpg
rename to website/assets/pwa/2024-11-20_09-41-25/apple-splash-2436-1125.jpg
diff --git a/src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2532-1170.jpg b/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2532-1170.jpg
similarity index 100%
rename from src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2532-1170.jpg
rename to website/assets/pwa/2024-11-20_09-41-25/apple-splash-2532-1170.jpg
diff --git a/src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2556-1179.jpg b/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2556-1179.jpg
similarity index 100%
rename from src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2556-1179.jpg
rename to website/assets/pwa/2024-11-20_09-41-25/apple-splash-2556-1179.jpg
diff --git a/src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2688-1242.jpg b/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2688-1242.jpg
similarity index 100%
rename from src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2688-1242.jpg
rename to website/assets/pwa/2024-11-20_09-41-25/apple-splash-2688-1242.jpg
diff --git a/src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2732-2048.jpg b/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2732-2048.jpg
similarity index 100%
rename from src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2732-2048.jpg
rename to website/assets/pwa/2024-11-20_09-41-25/apple-splash-2732-2048.jpg
diff --git a/src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2778-1284.jpg b/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2778-1284.jpg
similarity index 100%
rename from src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2778-1284.jpg
rename to website/assets/pwa/2024-11-20_09-41-25/apple-splash-2778-1284.jpg
diff --git a/src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2796-1290.jpg b/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2796-1290.jpg
similarity index 100%
rename from src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2796-1290.jpg
rename to website/assets/pwa/2024-11-20_09-41-25/apple-splash-2796-1290.jpg
diff --git a/src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-640-1136.jpg b/website/assets/pwa/2024-11-20_09-41-25/apple-splash-640-1136.jpg
similarity index 100%
rename from src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-640-1136.jpg
rename to website/assets/pwa/2024-11-20_09-41-25/apple-splash-640-1136.jpg
diff --git a/src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-750-1334.jpg b/website/assets/pwa/2024-11-20_09-41-25/apple-splash-750-1334.jpg
similarity index 100%
rename from src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-750-1334.jpg
rename to website/assets/pwa/2024-11-20_09-41-25/apple-splash-750-1334.jpg
diff --git a/src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-828-1792.jpg b/website/assets/pwa/2024-11-20_09-41-25/apple-splash-828-1792.jpg
similarity index 100%
rename from src/website/assets/pwa/2024-11-20_09-41-25/apple-splash-828-1792.jpg
rename to website/assets/pwa/2024-11-20_09-41-25/apple-splash-828-1792.jpg
diff --git a/src/website/assets/pwa/2024-11-20_09-41-25/favicon-196.png b/website/assets/pwa/2024-11-20_09-41-25/favicon-196.png
similarity index 100%
rename from src/website/assets/pwa/2024-11-20_09-41-25/favicon-196.png
rename to website/assets/pwa/2024-11-20_09-41-25/favicon-196.png
diff --git a/src/website/assets/pwa/2024-11-20_09-41-25/index.html b/website/assets/pwa/2024-11-20_09-41-25/index.html
similarity index 100%
rename from src/website/assets/pwa/2024-11-20_09-41-25/index.html
rename to website/assets/pwa/2024-11-20_09-41-25/index.html
diff --git a/src/website/assets/pwa/2024-11-20_09-41-25/manifest-icon-192.maskable.png b/website/assets/pwa/2024-11-20_09-41-25/manifest-icon-192.maskable.png
similarity index 100%
rename from src/website/assets/pwa/2024-11-20_09-41-25/manifest-icon-192.maskable.png
rename to website/assets/pwa/2024-11-20_09-41-25/manifest-icon-192.maskable.png
diff --git a/src/website/assets/pwa/2024-11-20_09-41-25/manifest-icon-512.maskable.png b/website/assets/pwa/2024-11-20_09-41-25/manifest-icon-512.maskable.png
similarity index 100%
rename from src/website/assets/pwa/2024-11-20_09-41-25/manifest-icon-512.maskable.png
rename to website/assets/pwa/2024-11-20_09-41-25/manifest-icon-512.maskable.png
diff --git a/src/website/assets/pwa/index.html b/website/assets/pwa/index.html
similarity index 100%
rename from src/website/assets/pwa/index.html
rename to website/assets/pwa/index.html
diff --git a/src/website/generate-icons.sh b/website/generate-icons.sh
similarity index 100%
rename from src/website/generate-icons.sh
rename to website/generate-icons.sh
diff --git a/src/website/index.html b/website/index.html
similarity index 100%
rename from src/website/index.html
rename to website/index.html
diff --git a/src/website/jsconfig.json b/website/jsconfig.json
similarity index 100%
rename from src/website/jsconfig.json
rename to website/jsconfig.json
diff --git a/src/website/manifest.webmanifest b/website/manifest.webmanifest
similarity index 100%
rename from src/website/manifest.webmanifest
rename to website/manifest.webmanifest
diff --git a/src/website/misc/tailwindTo550.js b/website/misc/tailwindTo550.js
similarity index 100%
rename from src/website/misc/tailwindTo550.js
rename to website/misc/tailwindTo550.js
diff --git a/src/website/packages/lean-qr/README.md b/website/packages/lean-qr/README.md
similarity index 100%
rename from src/website/packages/lean-qr/README.md
rename to website/packages/lean-qr/README.md
diff --git a/src/website/packages/lean-qr/v2.3.4/script.js b/website/packages/lean-qr/v2.3.4/script.js
similarity index 100%
rename from src/website/packages/lean-qr/v2.3.4/script.js
rename to website/packages/lean-qr/v2.3.4/script.js
diff --git a/src/website/packages/lean-qr/v2.3.4/types.d.ts b/website/packages/lean-qr/v2.3.4/types.d.ts
similarity index 100%
rename from src/website/packages/lean-qr/v2.3.4/types.d.ts
rename to website/packages/lean-qr/v2.3.4/types.d.ts
diff --git a/src/website/packages/lightweight-charts/NOTICE.md b/website/packages/lightweight-charts/NOTICE.md
similarity index 100%
rename from src/website/packages/lightweight-charts/NOTICE.md
rename to website/packages/lightweight-charts/NOTICE.md
diff --git a/src/website/packages/lightweight-charts/README.md b/website/packages/lightweight-charts/README.md
similarity index 100%
rename from src/website/packages/lightweight-charts/README.md
rename to website/packages/lightweight-charts/README.md
diff --git a/src/website/packages/lightweight-charts/types.d.ts b/website/packages/lightweight-charts/types.d.ts
similarity index 100%
rename from src/website/packages/lightweight-charts/types.d.ts
rename to website/packages/lightweight-charts/types.d.ts
diff --git a/src/website/packages/lightweight-charts/v4.2.0/script.js b/website/packages/lightweight-charts/v4.2.0/script.js
similarity index 100%
rename from src/website/packages/lightweight-charts/v4.2.0/script.js
rename to website/packages/lightweight-charts/v4.2.0/script.js
diff --git a/src/website/packages/lightweight-charts/v4.2.0/types.d.ts b/website/packages/lightweight-charts/v4.2.0/types.d.ts
similarity index 100%
rename from src/website/packages/lightweight-charts/v4.2.0/types.d.ts
rename to website/packages/lightweight-charts/v4.2.0/types.d.ts
diff --git a/src/website/packages/lightweight-charts/v4.2.2/script.js b/website/packages/lightweight-charts/v4.2.2/script.js
similarity index 100%
rename from src/website/packages/lightweight-charts/v4.2.2/script.js
rename to website/packages/lightweight-charts/v4.2.2/script.js
diff --git a/src/website/packages/lightweight-charts/v4.2.2/types.d.ts b/website/packages/lightweight-charts/v4.2.2/types.d.ts
similarity index 100%
rename from src/website/packages/lightweight-charts/v4.2.2/types.d.ts
rename to website/packages/lightweight-charts/v4.2.2/types.d.ts
diff --git a/src/website/packages/lightweight-charts/wrapper.js b/website/packages/lightweight-charts/wrapper.js
similarity index 100%
rename from src/website/packages/lightweight-charts/wrapper.js
rename to website/packages/lightweight-charts/wrapper.js
diff --git a/src/website/packages/solid-signals/2024-11-02/script.js b/website/packages/solid-signals/2024-11-02/script.js
similarity index 100%
rename from src/website/packages/solid-signals/2024-11-02/script.js
rename to website/packages/solid-signals/2024-11-02/script.js
diff --git a/src/website/packages/solid-signals/2024-11-02/types/core/constants.d.ts b/website/packages/solid-signals/2024-11-02/types/core/constants.d.ts
similarity index 100%
rename from src/website/packages/solid-signals/2024-11-02/types/core/constants.d.ts
rename to website/packages/solid-signals/2024-11-02/types/core/constants.d.ts
diff --git a/src/website/packages/solid-signals/2024-11-02/types/core/core.d.ts b/website/packages/solid-signals/2024-11-02/types/core/core.d.ts
similarity index 100%
rename from src/website/packages/solid-signals/2024-11-02/types/core/core.d.ts
rename to website/packages/solid-signals/2024-11-02/types/core/core.d.ts
diff --git a/src/website/packages/solid-signals/2024-11-02/types/core/effect.d.ts b/website/packages/solid-signals/2024-11-02/types/core/effect.d.ts
similarity index 100%
rename from src/website/packages/solid-signals/2024-11-02/types/core/effect.d.ts
rename to website/packages/solid-signals/2024-11-02/types/core/effect.d.ts
diff --git a/src/website/packages/solid-signals/2024-11-02/types/core/error.d.ts b/website/packages/solid-signals/2024-11-02/types/core/error.d.ts
similarity index 100%
rename from src/website/packages/solid-signals/2024-11-02/types/core/error.d.ts
rename to website/packages/solid-signals/2024-11-02/types/core/error.d.ts
diff --git a/src/website/packages/solid-signals/2024-11-02/types/core/flags.d.ts b/website/packages/solid-signals/2024-11-02/types/core/flags.d.ts
similarity index 100%
rename from src/website/packages/solid-signals/2024-11-02/types/core/flags.d.ts
rename to website/packages/solid-signals/2024-11-02/types/core/flags.d.ts
diff --git a/src/website/packages/solid-signals/2024-11-02/types/core/index.d.ts b/website/packages/solid-signals/2024-11-02/types/core/index.d.ts
similarity index 100%
rename from src/website/packages/solid-signals/2024-11-02/types/core/index.d.ts
rename to website/packages/solid-signals/2024-11-02/types/core/index.d.ts
diff --git a/src/website/packages/solid-signals/2024-11-02/types/core/owner.d.ts b/website/packages/solid-signals/2024-11-02/types/core/owner.d.ts
similarity index 100%
rename from src/website/packages/solid-signals/2024-11-02/types/core/owner.d.ts
rename to website/packages/solid-signals/2024-11-02/types/core/owner.d.ts
diff --git a/src/website/packages/solid-signals/2024-11-02/types/core/scheduler.d.ts b/website/packages/solid-signals/2024-11-02/types/core/scheduler.d.ts
similarity index 100%
rename from src/website/packages/solid-signals/2024-11-02/types/core/scheduler.d.ts
rename to website/packages/solid-signals/2024-11-02/types/core/scheduler.d.ts
diff --git a/src/website/packages/solid-signals/2024-11-02/types/index.d.ts b/website/packages/solid-signals/2024-11-02/types/index.d.ts
similarity index 100%
rename from src/website/packages/solid-signals/2024-11-02/types/index.d.ts
rename to website/packages/solid-signals/2024-11-02/types/index.d.ts
diff --git a/src/website/packages/solid-signals/2024-11-02/types/map.d.ts b/website/packages/solid-signals/2024-11-02/types/map.d.ts
similarity index 100%
rename from src/website/packages/solid-signals/2024-11-02/types/map.d.ts
rename to website/packages/solid-signals/2024-11-02/types/map.d.ts
diff --git a/src/website/packages/solid-signals/2024-11-02/types/signals.d.ts b/website/packages/solid-signals/2024-11-02/types/signals.d.ts
similarity index 100%
rename from src/website/packages/solid-signals/2024-11-02/types/signals.d.ts
rename to website/packages/solid-signals/2024-11-02/types/signals.d.ts
diff --git a/src/website/packages/solid-signals/2024-11-02/types/store/index.d.ts b/website/packages/solid-signals/2024-11-02/types/store/index.d.ts
similarity index 100%
rename from src/website/packages/solid-signals/2024-11-02/types/store/index.d.ts
rename to website/packages/solid-signals/2024-11-02/types/store/index.d.ts
diff --git a/src/website/packages/solid-signals/2024-11-02/types/store/store.d.ts b/website/packages/solid-signals/2024-11-02/types/store/store.d.ts
similarity index 100%
rename from src/website/packages/solid-signals/2024-11-02/types/store/store.d.ts
rename to website/packages/solid-signals/2024-11-02/types/store/store.d.ts
diff --git a/src/website/packages/solid-signals/2024-11-02/types/utils.d.ts b/website/packages/solid-signals/2024-11-02/types/utils.d.ts
similarity index 100%
rename from src/website/packages/solid-signals/2024-11-02/types/utils.d.ts
rename to website/packages/solid-signals/2024-11-02/types/utils.d.ts
diff --git a/src/website/packages/solid-signals/2024-11-08/script.js b/website/packages/solid-signals/2024-11-08/script.js
similarity index 100%
rename from src/website/packages/solid-signals/2024-11-08/script.js
rename to website/packages/solid-signals/2024-11-08/script.js
diff --git a/src/website/packages/solid-signals/2024-11-08/types/core/constants.d.ts b/website/packages/solid-signals/2024-11-08/types/core/constants.d.ts
similarity index 100%
rename from src/website/packages/solid-signals/2024-11-08/types/core/constants.d.ts
rename to website/packages/solid-signals/2024-11-08/types/core/constants.d.ts
diff --git a/src/website/packages/solid-signals/2024-11-08/types/core/core.d.ts b/website/packages/solid-signals/2024-11-08/types/core/core.d.ts
similarity index 100%
rename from src/website/packages/solid-signals/2024-11-08/types/core/core.d.ts
rename to website/packages/solid-signals/2024-11-08/types/core/core.d.ts
diff --git a/src/website/packages/solid-signals/2024-11-08/types/core/effect.d.ts b/website/packages/solid-signals/2024-11-08/types/core/effect.d.ts
similarity index 100%
rename from src/website/packages/solid-signals/2024-11-08/types/core/effect.d.ts
rename to website/packages/solid-signals/2024-11-08/types/core/effect.d.ts
diff --git a/src/website/packages/solid-signals/2024-11-08/types/core/error.d.ts b/website/packages/solid-signals/2024-11-08/types/core/error.d.ts
similarity index 100%
rename from src/website/packages/solid-signals/2024-11-08/types/core/error.d.ts
rename to website/packages/solid-signals/2024-11-08/types/core/error.d.ts
diff --git a/src/website/packages/solid-signals/2024-11-08/types/core/flags.d.ts b/website/packages/solid-signals/2024-11-08/types/core/flags.d.ts
similarity index 100%
rename from src/website/packages/solid-signals/2024-11-08/types/core/flags.d.ts
rename to website/packages/solid-signals/2024-11-08/types/core/flags.d.ts
diff --git a/src/website/packages/solid-signals/2024-11-08/types/core/index.d.ts b/website/packages/solid-signals/2024-11-08/types/core/index.d.ts
similarity index 100%
rename from src/website/packages/solid-signals/2024-11-08/types/core/index.d.ts
rename to website/packages/solid-signals/2024-11-08/types/core/index.d.ts
diff --git a/src/website/packages/solid-signals/2024-11-08/types/core/owner.d.ts b/website/packages/solid-signals/2024-11-08/types/core/owner.d.ts
similarity index 100%
rename from src/website/packages/solid-signals/2024-11-08/types/core/owner.d.ts
rename to website/packages/solid-signals/2024-11-08/types/core/owner.d.ts
diff --git a/src/website/packages/solid-signals/2024-11-08/types/core/scheduler.d.ts b/website/packages/solid-signals/2024-11-08/types/core/scheduler.d.ts
similarity index 100%
rename from src/website/packages/solid-signals/2024-11-08/types/core/scheduler.d.ts
rename to website/packages/solid-signals/2024-11-08/types/core/scheduler.d.ts
diff --git a/src/website/packages/solid-signals/2024-11-08/types/index.d.ts b/website/packages/solid-signals/2024-11-08/types/index.d.ts
similarity index 100%
rename from src/website/packages/solid-signals/2024-11-08/types/index.d.ts
rename to website/packages/solid-signals/2024-11-08/types/index.d.ts
diff --git a/src/website/packages/solid-signals/2024-11-08/types/map.d.ts b/website/packages/solid-signals/2024-11-08/types/map.d.ts
similarity index 100%
rename from src/website/packages/solid-signals/2024-11-08/types/map.d.ts
rename to website/packages/solid-signals/2024-11-08/types/map.d.ts
diff --git a/src/website/packages/solid-signals/2024-11-08/types/signals.d.ts b/website/packages/solid-signals/2024-11-08/types/signals.d.ts
similarity index 100%
rename from src/website/packages/solid-signals/2024-11-08/types/signals.d.ts
rename to website/packages/solid-signals/2024-11-08/types/signals.d.ts
diff --git a/src/website/packages/solid-signals/2024-11-08/types/store/index.d.ts b/website/packages/solid-signals/2024-11-08/types/store/index.d.ts
similarity index 100%
rename from src/website/packages/solid-signals/2024-11-08/types/store/index.d.ts
rename to website/packages/solid-signals/2024-11-08/types/store/index.d.ts
diff --git a/src/website/packages/solid-signals/2024-11-08/types/store/store.d.ts b/website/packages/solid-signals/2024-11-08/types/store/store.d.ts
similarity index 100%
rename from src/website/packages/solid-signals/2024-11-08/types/store/store.d.ts
rename to website/packages/solid-signals/2024-11-08/types/store/store.d.ts
diff --git a/src/website/packages/solid-signals/2024-11-08/types/utils.d.ts b/website/packages/solid-signals/2024-11-08/types/utils.d.ts
similarity index 100%
rename from src/website/packages/solid-signals/2024-11-08/types/utils.d.ts
rename to website/packages/solid-signals/2024-11-08/types/utils.d.ts
diff --git a/src/website/packages/solid-signals/README.md b/website/packages/solid-signals/README.md
similarity index 100%
rename from src/website/packages/solid-signals/README.md
rename to website/packages/solid-signals/README.md
diff --git a/src/website/packages/solid-signals/types.d.ts b/website/packages/solid-signals/types.d.ts
similarity index 100%
rename from src/website/packages/solid-signals/types.d.ts
rename to website/packages/solid-signals/types.d.ts
diff --git a/src/website/packages/solid-signals/wrapper.js b/website/packages/solid-signals/wrapper.js
similarity index 100%
rename from src/website/packages/solid-signals/wrapper.js
rename to website/packages/solid-signals/wrapper.js
diff --git a/src/website/packages/ufuzzy/README.md b/website/packages/ufuzzy/README.md
similarity index 100%
rename from src/website/packages/ufuzzy/README.md
rename to website/packages/ufuzzy/README.md
diff --git a/src/website/packages/ufuzzy/v1.0.14/script.js b/website/packages/ufuzzy/v1.0.14/script.js
similarity index 100%
rename from src/website/packages/ufuzzy/v1.0.14/script.js
rename to website/packages/ufuzzy/v1.0.14/script.js
diff --git a/src/website/packages/ufuzzy/v1.0.14/types.d.ts b/website/packages/ufuzzy/v1.0.14/types.d.ts
similarity index 100%
rename from src/website/packages/ufuzzy/v1.0.14/types.d.ts
rename to website/packages/ufuzzy/v1.0.14/types.d.ts
diff --git a/src/website/robots.txt b/website/robots.txt
similarity index 100%
rename from src/website/robots.txt
rename to website/robots.txt
diff --git a/src/website/scripts/chart.js b/website/scripts/chart.js
similarity index 100%
rename from src/website/scripts/chart.js
rename to website/scripts/chart.js
diff --git a/src/website/scripts/live-price.js b/website/scripts/live-price.js
similarity index 100%
rename from src/website/scripts/live-price.js
rename to website/scripts/live-price.js
diff --git a/src/website/scripts/main.js b/website/scripts/main.js
similarity index 100%
rename from src/website/scripts/main.js
rename to website/scripts/main.js
diff --git a/src/website/scripts/moscow-time.js b/website/scripts/moscow-time.js
similarity index 100%
rename from src/website/scripts/moscow-time.js
rename to website/scripts/moscow-time.js
diff --git a/src/website/scripts/options.js b/website/scripts/options.js
similarity index 100%
rename from src/website/scripts/options.js
rename to website/scripts/options.js
diff --git a/src/website/scripts/service-worker.js b/website/scripts/service-worker.js
similarity index 100%
rename from src/website/scripts/service-worker.js
rename to website/scripts/service-worker.js
diff --git a/src/website/scripts/simulation.js b/website/scripts/simulation.js
similarity index 100%
rename from src/website/scripts/simulation.js
rename to website/scripts/simulation.js
diff --git a/src/website/scripts/types/self.d.ts b/website/scripts/types/self.d.ts
similarity index 100%
rename from src/website/scripts/types/self.d.ts
rename to website/scripts/types/self.d.ts
diff --git a/src/website/styles/chart.css b/website/styles/chart.css
similarity index 100%
rename from src/website/styles/chart.css
rename to website/styles/chart.css
diff --git a/src/website/styles/live-price.css b/website/styles/live-price.css
similarity index 100%
rename from src/website/styles/live-price.css
rename to website/styles/live-price.css
diff --git a/src/website/styles/moscow-time.css b/website/styles/moscow-time.css
similarity index 100%
rename from src/website/styles/moscow-time.css
rename to website/styles/moscow-time.css
diff --git a/src/website/styles/simulation.css b/website/styles/simulation.css
similarity index 100%
rename from src/website/styles/simulation.css
rename to website/styles/simulation.css
diff --git a/src/website/tsconfig.json b/website/tsconfig.json
similarity index 100%
rename from src/website/tsconfig.json
rename to website/tsconfig.json

From f7f3e3cc034e61d9e53bf719a0d8a7b569664e6c Mon Sep 17 00:00:00 2001
From: nym21 <expat-epochs0i@icloud.com>
Date: Tue, 28 Jan 2025 11:30:10 +0100
Subject: [PATCH 32/63] bindex: no copy fjall get + small fixes

---
 bindex/src/lib.rs                 | 12 ++---
 bindex/src/storage/fjalls/base.rs | 75 ++++++++++++++++++-------------
 bindex/src/storage/fjalls/meta.rs | 17 ++++---
 3 files changed, 63 insertions(+), 41 deletions(-)

diff --git a/bindex/src/lib.rs b/bindex/src/lib.rs
index 0d8cdbac4..5a4bbb159 100644
--- a/bindex/src/lib.rs
+++ b/bindex/src/lib.rs
@@ -12,7 +12,6 @@ pub use biter::*;
 use biter::bitcoin::{Transaction, TxIn, TxOut, Txid};
 use color_eyre::eyre::{eyre, ContextCompat};
 use exit::Exit;
-use fjall::{PersistMode, ReadTransaction, TransactionalKeyspace};
 use rayon::prelude::*;
 
 mod storage;
@@ -36,10 +35,10 @@ pub struct Indexer {
 
 impl Indexer {
     pub fn import(indexes_dir: &Path) -> color_eyre::Result<Self> {
-        let vecs = StorableVecs::import(&indexes_dir.join("vecs"))?;
-        let parts = Fjalls::import(&indexes_dir.join("fjall"))?;
-
-        Ok(Self { vecs, parts })
+        Ok(Self {
+            vecs: StorableVecs::import(&indexes_dir.join("vecs"))?,
+            parts: Fjalls::import(&indexes_dir.join("fjall"))?,
+        })
     }
 
     pub fn index(&mut self, bitcoin_dir: &Path, rpc: rpc::Client, exit: &Exit) -> color_eyre::Result<()> {
@@ -93,7 +92,7 @@ impl Indexer {
         // // let mut stores_opt = Some(stores);
         // let mut rtx_opt = Some(rtx);
 
-        biter::new(bitcoin_dir, Some(height.into()), None, rpc)
+        biter::new(bitcoin_dir, Some(height.into()), Some(400_000), rpc)
             .iter()
             .try_for_each(|(_height, block, blockhash)| -> color_eyre::Result<()> {
                 println!("Processing block {_height}...");
@@ -674,6 +673,7 @@ enum InputSource<'a> {
     SameBlock((&'a Transaction, Txindex, &'a TxIn, Vin)),
 }
 
+#[allow(unused)]
 fn pause() {
     let mut stdin = std::io::stdin();
     let mut stdout = std::io::stdout();
diff --git a/bindex/src/storage/fjalls/base.rs b/bindex/src/storage/fjalls/base.rs
index 43385992c..ca69556f1 100644
--- a/bindex/src/storage/fjalls/base.rs
+++ b/bindex/src/storage/fjalls/base.rs
@@ -4,6 +4,7 @@ use fjall::{
     PartitionCreateOptions, PersistMode, ReadTransaction, Result, Slice, TransactionalKeyspace,
     TransactionalPartitionHandle,
 };
+use storable_vec::UnsafeSizedSerDe;
 
 use crate::structs::{Height, Version};
 
@@ -24,48 +25,38 @@ where
 {
     pub fn import(path: &Path, version: Version) -> color_eyre::Result<Self> {
         let meta = Meta::checked_open(path, version)?;
-
-        let keyspace = fjall::Config::new(path.join("fjall")).open_transactional()?;
-        let handle = keyspace.open_partition(
-            "partition",
-            PartitionCreateOptions::default().manual_journal_persist(true),
-        )?;
+        let keyspace = if let Ok(keyspace) = Self::open_keyspace(path) {
+            keyspace
+        } else {
+            meta.reset()?;
+            return Self::import(path, version);
+        };
+        let part = if let Ok(part) = Self::open_partition_handle(&keyspace) {
+            part
+        } else {
+            drop(keyspace);
+            meta.reset()?;
+            return Self::import(path, version);
+        };
         let rtx = keyspace.read_tx();
 
         Ok(Self {
             meta,
             keyspace,
-            part: handle,
+            part,
             rtx,
             puts: BTreeMap::new(),
         })
     }
 
-    pub fn len(&self) -> usize {
-        self.meta.len() + self.puts.len()
-    }
-
-    pub fn has(&self, height: Height) -> bool {
-        self.height().is_some_and(|self_height| self_height >= &height)
-    }
-    pub fn needs(&self, height: Height) -> bool {
-        !self.has(height)
-    }
-
-    pub fn get<'a>(&self, key: &'a Key) -> color_eyre::Result<Option<Value>>
+    pub fn get(&self, key: &Key) -> color_eyre::Result<Option<Value>>
     where
-        fjall::Slice: std::convert::From<&'a Key>,
-        <Value as std::convert::TryFrom<fjall::Slice>>::Error: std::error::Error + Send + Sync,
-        <Value as std::convert::TryFrom<fjall::Slice>>::Error: 'static,
+        <Value as TryFrom<Slice>>::Error: std::error::Error + Send + Sync + 'static,
     {
         if let Some(v) = self.puts.get(key) {
-            return Ok(Some(v.clone()));
-        }
-
-        if let Some(slice) = self.rtx.get(&self.part, Slice::from(key))? {
-            let v_res = Value::try_from(slice);
-            let v = v_res?;
-            Ok(Some(v))
+            Ok(Some(v.clone()))
+        } else if let Some(slice) = self.rtx.get(&self.part, key.unsafe_as_slice())? {
+            Ok(Some(Value::try_from(slice)?))
         } else {
             Ok(None)
         }
@@ -82,11 +73,13 @@ where
             return Ok(());
         }
 
+        self.meta.export(self.len(), height)?;
+
         let mut wtx = self.keyspace.write_tx();
         mem::take(&mut self.puts)
             .into_iter()
             .for_each(|(key, value)| wtx.insert(&self.part, key, value));
-        self.meta.export(self.len(), height)?;
+
         wtx.commit()?;
 
         self.keyspace.persist(PersistMode::SyncAll)?;
@@ -99,4 +92,26 @@ where
     pub fn height(&self) -> Option<&Height> {
         self.meta.height()
     }
+
+    pub fn len(&self) -> usize {
+        self.meta.len() + self.puts.len()
+    }
+
+    pub fn has(&self, height: Height) -> bool {
+        self.meta.has(height)
+    }
+    pub fn needs(&self, height: Height) -> bool {
+        self.meta.needs(height)
+    }
+
+    fn open_keyspace(path: &Path) -> Result<TransactionalKeyspace> {
+        fjall::Config::new(path.join("fjall")).open_transactional()
+    }
+
+    fn open_partition_handle(keyspace: &TransactionalKeyspace) -> Result<TransactionalPartitionHandle> {
+        keyspace.open_partition(
+            "partition",
+            PartitionCreateOptions::default().manual_journal_persist(true),
+        )
+    }
 }
diff --git a/bindex/src/storage/fjalls/meta.rs b/bindex/src/storage/fjalls/meta.rs
index 3c04e38e2..2431a0fe4 100644
--- a/bindex/src/storage/fjalls/meta.rs
+++ b/bindex/src/storage/fjalls/meta.rs
@@ -22,8 +22,7 @@ impl Meta {
             Version::try_from(Self::path_version_(path).as_path()).is_ok_and(|prev_version| version == prev_version);
 
         if !is_same_version {
-            fs::remove_dir_all(path)?;
-            fs::create_dir(path)?;
+            Self::reset_(path)?;
         }
 
         let this = Self {
@@ -49,6 +48,14 @@ impl Meta {
         height.write(&self.path_height())
     }
 
+    pub fn reset(&self) -> io::Result<()> {
+        Self::reset_(self.pathbuf.as_path())
+    }
+    fn reset_(path: &Path) -> io::Result<()> {
+        fs::remove_dir_all(path)?;
+        fs::create_dir(path)
+    }
+
     fn path_version(&self) -> PathBuf {
         Self::path_version_(&self.pathbuf)
     }
@@ -72,9 +79,9 @@ impl Meta {
         path.join("height")
     }
 
-    fn read_length(&self) -> color_eyre::Result<usize> {
-        Self::read_length_(&self.pathbuf)
-    }
+    // fn read_length(&self) -> color_eyre::Result<usize> {
+    //     Self::read_length_(&self.pathbuf)
+    // }
     fn read_length_(path: &Path) -> color_eyre::Result<usize> {
         Ok(fs::read(Self::path_length(path))
             .map(|v| usize::unsafe_try_from_slice(v.as_slice()).cloned().unwrap_or_default())

From 8c610f8a834bbfa8e478941095c49b5961faaa53 Mon Sep 17 00:00:00 2001
From: nym21 <expat-epochs0i@icloud.com>
Date: Tue, 28 Jan 2025 17:45:36 +0100
Subject: [PATCH 33/63] workspace: reorg

---
 Cargo.lock                                    | 209 ++++--------------
 Cargo.toml                                    |  63 ++----
 LICENSE.md                                    |   2 +-
 bindex/Cargo.toml                             |  17 --
 bomputer/Cargo.toml                           |  12 -
 computer/Cargo.toml                           |  13 ++
 {bomputer => computer}/src/lib.rs             |   3 +-
 {bomputer => computer}/src/main.rs            |   0
 {bomputer => computer}/src/structs/date.rs    |   0
 {bomputer => computer}/src/structs/feerate.rs |   0
 {bomputer => computer}/src/structs/mod.rs     |   0
 {bindex => indexer}/.gitignore                |   0
 {bindex => indexer}/Cargo.lock                |   0
 indexer/Cargo.toml                            |  19 ++
 {bindex => indexer}/rustfmt.toml              |   0
 {bindex => indexer}/src/lib.rs                |  56 +++--
 {bindex => indexer}/src/main.rs               |   0
 .../src/storage/canopies/database.rs          |   0
 .../src/storage/canopies/environment.rs       |   0
 .../src/storage/canopies/mod.rs               |   0
 .../src/storage/canopies/transaction.rs       |   0
 .../src/storage/canopies/tree.rs              |   0
 .../src/storage/fjalls/base.rs                |  23 +-
 .../src/storage/fjalls/meta.rs                |   2 +-
 {bindex => indexer}/src/storage/fjalls/mod.rs |  16 +-
 {bindex => indexer}/src/storage/mod.rs        |   0
 .../src/storage/sanakirjas/meta.rs            |   0
 .../src/storage/sanakirjas/mod.rs             |   0
 .../src/storage/sanakirjas/multi.rs           |   0
 .../src/storage/sanakirjas/unique.rs          |   0
 .../src/storage/storable_vecs/base.rs         |   0
 .../src/storage/storable_vecs/mod.rs          |   0
 .../src/structs/addressbytes.rs               |   0
 .../src/structs/addressindex.rs               |   8 +-
 .../src/structs/addresstype.rs                |   0
 .../src/structs/addresstypeindex.rs           |   4 +-
 {bindex => indexer}/src/structs/amount.rs     |   4 +-
 .../src/structs/compressed.rs                 |  26 +--
 {bindex => indexer}/src/structs/height.rs     |   8 +-
 {bindex => indexer}/src/structs/mod.rs        |   4 +-
 {bindex => indexer}/src/structs/slice.rs      |   0
 {bindex => indexer}/src/structs/timestamp.rs  |   0
 {bindex => indexer}/src/structs/txindex.rs    |   8 +-
 {bindex => indexer}/src/structs/txinindex.rs  |   4 +-
 {bindex => indexer}/src/structs/txoutindex.rs |   4 +-
 {bindex => indexer}/src/structs/version.rs    |   2 +-
 {bindex => indexer}/src/structs/vin.rs        |   0
 {bindex => indexer}/src/structs/vout.rs       |   0
 {biter => iterator}/CHANGELOG.md              |   0
 {biter => iterator}/Cargo.lock                |   0
 {biter => iterator}/Cargo.toml                |   8 +-
 {biter => iterator}/LICENSE.md                |   0
 {biter => iterator}/README.md                 |   0
 .../src/blk_index_to_blk_path.rs              |   2 +-
 .../src/blk_index_to_blk_recap.rs             |  28 +--
 {biter => iterator}/src/blk_metadata.rs       |   0
 .../src/blk_metadata_and_block.rs             |   0
 {biter => iterator}/src/blk_recap.rs          |   0
 {biter => iterator}/src/lib.rs                |   0
 {biter => iterator}/src/main.rs               |   0
 {biter => iterator}/src/utils.rs              |   0
 storable_vec/Cargo.toml                       |   1 +
 storable_vec/src/lib.rs                       |  60 +++--
 .../struct_iterable_derive/Cargo.toml         |   6 +-
 unsafe_slice_serde/Cargo.toml                 |   3 +
 unsafe_slice_serde/src/lib.rs                 |  42 ++++
 66 files changed, 268 insertions(+), 389 deletions(-)
 delete mode 100644 bindex/Cargo.toml
 delete mode 100644 bomputer/Cargo.toml
 create mode 100644 computer/Cargo.toml
 rename {bomputer => computer}/src/lib.rs (94%)
 rename {bomputer => computer}/src/main.rs (100%)
 rename {bomputer => computer}/src/structs/date.rs (100%)
 rename {bomputer => computer}/src/structs/feerate.rs (100%)
 rename {bomputer => computer}/src/structs/mod.rs (100%)
 rename {bindex => indexer}/.gitignore (100%)
 rename {bindex => indexer}/Cargo.lock (100%)
 create mode 100644 indexer/Cargo.toml
 rename {bindex => indexer}/rustfmt.toml (100%)
 rename {bindex => indexer}/src/lib.rs (93%)
 rename {bindex => indexer}/src/main.rs (100%)
 rename {bindex => indexer}/src/storage/canopies/database.rs (100%)
 rename {bindex => indexer}/src/storage/canopies/environment.rs (100%)
 rename {bindex => indexer}/src/storage/canopies/mod.rs (100%)
 rename {bindex => indexer}/src/storage/canopies/transaction.rs (100%)
 rename {bindex => indexer}/src/storage/canopies/tree.rs (100%)
 rename {bindex => indexer}/src/storage/fjalls/base.rs (83%)
 rename {bindex => indexer}/src/storage/fjalls/meta.rs (98%)
 rename {bindex => indexer}/src/storage/fjalls/mod.rs (91%)
 rename {bindex => indexer}/src/storage/mod.rs (100%)
 rename {bindex => indexer}/src/storage/sanakirjas/meta.rs (100%)
 rename {bindex => indexer}/src/storage/sanakirjas/mod.rs (100%)
 rename {bindex => indexer}/src/storage/sanakirjas/multi.rs (100%)
 rename {bindex => indexer}/src/storage/sanakirjas/unique.rs (100%)
 rename {bindex => indexer}/src/storage/storable_vecs/base.rs (100%)
 rename {bindex => indexer}/src/storage/storable_vecs/mod.rs (100%)
 rename {bindex => indexer}/src/structs/addressbytes.rs (100%)
 rename {bindex => indexer}/src/structs/addressindex.rs (87%)
 rename {bindex => indexer}/src/structs/addresstype.rs (100%)
 rename {bindex => indexer}/src/structs/addresstypeindex.rs (92%)
 rename {bindex => indexer}/src/structs/amount.rs (96%)
 rename bindex/src/structs/prefix.rs => indexer/src/structs/compressed.rs (80%)
 rename {bindex => indexer}/src/structs/height.rs (94%)
 rename {bindex => indexer}/src/structs/mod.rs (92%)
 rename {bindex => indexer}/src/structs/slice.rs (100%)
 rename {bindex => indexer}/src/structs/timestamp.rs (100%)
 rename {bindex => indexer}/src/structs/txindex.rs (89%)
 rename {bindex => indexer}/src/structs/txinindex.rs (93%)
 rename {bindex => indexer}/src/structs/txoutindex.rs (93%)
 rename {bindex => indexer}/src/structs/version.rs (95%)
 rename {bindex => indexer}/src/structs/vin.rs (100%)
 rename {bindex => indexer}/src/structs/vout.rs (100%)
 rename {biter => iterator}/CHANGELOG.md (100%)
 rename {biter => iterator}/Cargo.lock (100%)
 rename {biter => iterator}/Cargo.toml (81%)
 rename {biter => iterator}/LICENSE.md (100%)
 rename {biter => iterator}/README.md (100%)
 rename {biter => iterator}/src/blk_index_to_blk_path.rs (97%)
 rename {biter => iterator}/src/blk_index_to_blk_recap.rs (80%)
 rename {biter => iterator}/src/blk_metadata.rs (100%)
 rename {biter => iterator}/src/blk_metadata_and_block.rs (100%)
 rename {biter => iterator}/src/blk_recap.rs (100%)
 rename {biter => iterator}/src/lib.rs (100%)
 rename {biter => iterator}/src/main.rs (100%)
 rename {biter => iterator}/src/utils.rs (100%)
 create mode 100644 unsafe_slice_serde/Cargo.toml
 create mode 100644 unsafe_slice_serde/src/lib.rs

diff --git a/Cargo.lock b/Cargo.lock
index 93e87f14b..55cedc130 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -70,6 +70,7 @@ checksum = "d965446196e3b7decd44aa7ee49e31d630118f90ef12f97900f262eb915c951d"
 name = "bindex"
 version = "0.1.0"
 dependencies = [
+ "bitcoin",
  "bitcoin_hashes 0.16.0",
  "biter",
  "color-eyre",
@@ -79,8 +80,8 @@ dependencies = [
  "jiff",
  "rapidhash",
  "rayon",
- "snkrj",
  "storable_vec",
+ "unsafe_slice_serde",
 ]
 
 [[package]]
@@ -92,7 +93,7 @@ dependencies = [
  "base58ck",
  "bech32",
  "bitcoin-internals 0.3.0",
- "bitcoin-io 0.1.2",
+ "bitcoin-io 0.1.3",
  "bitcoin-units",
  "bitcoin_hashes 0.14.0",
  "hex-conservative 0.2.1",
@@ -118,9 +119,9 @@ checksum = "2b854212e29b96c8f0fe04cab11d57586c8f3257de0d146c76cb3b42b3eb9118"
 
 [[package]]
 name = "bitcoin-io"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "340e09e8399c7bd8912f495af6aa58bea0c9214773417ffaa8f6460f93aaee56"
+checksum = "0b47c4ab7a93edb0c7198c5535ed9b52b63095f4e9b45279c6736cec4b856baf"
 
 [[package]]
 name = "bitcoin-io"
@@ -147,7 +148,7 @@ version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bb18c03d0db0247e147a21a6faafd5a7eb851c743db062de72018b6b7e8e4d16"
 dependencies = [
- "bitcoin-io 0.1.2",
+ "bitcoin-io 0.1.3",
  "hex-conservative 0.2.1",
  "serde",
 ]
@@ -193,18 +194,12 @@ dependencies = [
  "bitcoin",
  "bitcoincore-rpc",
  "crossbeam",
- "derived-deref",
+ "derive_deref",
  "rayon",
  "serde",
  "serde_json",
 ]
 
-[[package]]
-name = "bitflags"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-
 [[package]]
 name = "bitflags"
 version = "2.8.0"
@@ -216,6 +211,7 @@ name = "bomputer"
 version = "0.1.0"
 dependencies = [
  "bindex",
+ "biter",
  "color-eyre",
  "derive_deref",
  "exit",
@@ -231,9 +227,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "cc"
-version = "1.2.7"
+version = "1.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a012a0df96dd6d06ba9a1b29d6402d1a5d77c6befd2566afdc26e10603dc93d7"
+checksum = "13208fcbb66eaeffe09b99fffbe1af420f00a7b35aa99ad683dfc1aa76145229"
 dependencies = [
  "shlex",
 ]
@@ -320,9 +316,9 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-queue"
-version = "0.3.11"
+version = "0.3.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35"
+checksum = "0f58bbc28f91df819d0aa2a2c00cd19754769c2fad90579b3592b1c9ba7a3115"
 dependencies = [
  "crossbeam-utils",
 ]
@@ -364,7 +360,7 @@ dependencies = [
  "hashbrown",
  "lock_api",
  "once_cell",
- "parking_lot_core 0.9.10",
+ "parking_lot_core",
 ]
 
 [[package]]
@@ -378,17 +374,6 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "derived-deref"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "805ef2023ccd65425743a91ecd11fc020979a0b01921db3104fb606d18a7b43e"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.96",
-]
-
 [[package]]
 name = "double-ended-peekable"
 version = "0.1.0"
@@ -468,16 +453,6 @@ dependencies = [
  "xxhash-rust",
 ]
 
-[[package]]
-name = "fs2"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213"
-dependencies = [
- "libc",
- "winapi",
-]
-
 [[package]]
 name = "getrandom"
 version = "0.2.15"
@@ -537,15 +512,6 @@ version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683"
 
-[[package]]
-name = "instant"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
-dependencies = [
- "cfg-if",
-]
-
 [[package]]
 name = "itoa"
 version = "1.0.14"
@@ -554,9 +520,9 @@ checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
 
 [[package]]
 name = "jiff"
-version = "0.1.27"
+version = "0.1.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a85348106ab244d90fe2d70faad939b71c5dad1258e5da9116e176064fc6c078"
+checksum = "c607c728e28764fecde611a2764a3a5db19ae21dcec46f292244f5cc5c085a81"
 dependencies = [
  "jiff-tzdb-platform",
  "log",
@@ -688,9 +654,9 @@ dependencies = [
 
 [[package]]
 name = "minreq"
-version = "2.12.0"
+version = "2.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "763d142cdff44aaadd9268bebddb156ef6c65a0e13486bb81673cf2d8739f9b0"
+checksum = "36a8e50e917e18a37d500d27d40b7bc7d127e71c0c94fb2d83f43b4afd308390"
 dependencies = [
  "log",
  "serde",
@@ -703,7 +669,7 @@ version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
 dependencies = [
- "bitflags 2.8.0",
+ "bitflags",
  "cfg-if",
  "cfg_aliases",
  "libc",
@@ -730,31 +696,6 @@ version = "3.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f"
 
-[[package]]
-name = "parking_lot"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
-dependencies = [
- "instant",
- "lock_api",
- "parking_lot_core 0.8.6",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.8.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc"
-dependencies = [
- "cfg-if",
- "instant",
- "libc",
- "redox_syscall 0.2.16",
- "smallvec",
- "winapi",
-]
-
 [[package]]
 name = "parking_lot_core"
 version = "0.9.10"
@@ -763,7 +704,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall 0.5.8",
+ "redox_syscall",
  "smallvec",
  "windows-targets",
 ]
@@ -900,22 +841,13 @@ dependencies = [
  "crossbeam-utils",
 ]
 
-[[package]]
-name = "redox_syscall"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
-dependencies = [
- "bitflags 1.3.2",
-]
-
 [[package]]
 name = "redox_syscall"
 version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834"
 dependencies = [
- "bitflags 2.8.0",
+ "bitflags",
 ]
 
 [[package]]
@@ -936,7 +868,7 @@ version = "0.38.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
 dependencies = [
- "bitflags 2.8.0",
+ "bitflags",
  "errno",
  "libc",
  "linux-raw-sys",
@@ -945,30 +877,9 @@ dependencies = [
 
 [[package]]
 name = "ryu"
-version = "1.0.18"
+version = "1.0.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
-
-[[package]]
-name = "sanakirja"
-version = "1.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81aaf70d064e2122209f04d01fd91e8908e7a327b516236e1cbc0c3f34ac6d11"
-dependencies = [
- "fs2",
- "log",
- "memmap2",
- "parking_lot",
- "sanakirja-core",
- "serde",
- "thiserror",
-]
-
-[[package]]
-name = "sanakirja-core"
-version = "1.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8376db34ae3eac6e7bd91168bc638450073b708ce9fb46940de676f552238bf5"
+checksum = "6ea1a2d0a644769cc99faa24c3ad26b379b786fe7c36fd3c546254801650e6dd"
 
 [[package]]
 name = "scopeguard"
@@ -1025,9 +936,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.135"
+version = "1.0.137"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b0d7ba2887406110130a978386c4e1befb98c674b4fba677954e4db976630d9"
+checksum = "930cfb6e6abf99298aaad7d29abbef7a9999a9a8806a40088f55f0dcec03146b"
 dependencies = [
  "itoa",
  "memchr",
@@ -1056,13 +967,6 @@ version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
-[[package]]
-name = "snkrj"
-version = "0.1.1"
-dependencies = [
- "sanakirja",
-]
-
 [[package]]
 name = "std-semaphore"
 version = "0.1.0"
@@ -1074,6 +978,7 @@ name = "storable_vec"
 version = "0.1.2"
 dependencies = [
  "memmap2",
+ "unsafe_slice_serde",
 ]
 
 [[package]]
@@ -1134,26 +1039,6 @@ dependencies = [
  "windows-sys",
 ]
 
-[[package]]
-name = "thiserror"
-version = "1.0.69"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
-dependencies = [
- "thiserror-impl",
-]
-
-[[package]]
-name = "thiserror-impl"
-version = "1.0.69"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.96",
-]
-
 [[package]]
 name = "thread_local"
 version = "1.1.8"
@@ -1186,9 +1071,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-error"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d686ec1c0f384b1277f097b2f279a2ecc11afe8c133c1aabf036a27cb4cd206e"
+checksum = "8b1581020d7a273442f5b45074a6a57d5757ad0a47dac0e9f0bd57b81936f3db"
 dependencies = [
  "tracing",
  "tracing-subscriber",
@@ -1196,9 +1081,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-subscriber"
-version = "0.3.18"
+version = "0.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b"
+checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008"
 dependencies = [
  "sharded-slab",
  "thread_local",
@@ -1207,15 +1092,19 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.14"
+version = "1.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83"
+checksum = "a210d160f08b701c8721ba1c726c11662f877ea6b7094007e1ca9a1041945034"
+
+[[package]]
+name = "unsafe_slice_serde"
+version = "0.1.0"
 
 [[package]]
 name = "valuable"
-version = "0.1.0"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
+checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65"
 
 [[package]]
 name = "value-log"
@@ -1245,28 +1134,6 @@ version = "0.11.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
 [[package]]
 name = "windows-sys"
 version = "0.59.0"
diff --git a/Cargo.toml b/Cargo.toml
index 8a7b88571..daf8e4a05 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,52 +1,25 @@
-# [package]
-# name = "kibo_money"
-# version = "0.6.0"
-# edition = "2021"
-
 [workspace]
 members = [
-    "bindex",
-    "biter",
-    "bomputer",
+    "computer",
     "exit",
-    # "server",
-    "snkrj",
-    "struct_iterable",
+    "indexer",
+    "iterator",
     "storable_vec",
+    "struct_iterable",
+    "unsafe_slice_serde",
 ]
 resolver = "2"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-# [dependencies]
-# allocative = "0.3.4"
-# axum = "0.7.9"
-# bincode = { git = "https://github.com/bincode-org/bincode.git", features = [
-#     "serde",
-# ] }
-# bitcoin_hashes = { version = "0.15.0" }
-# biter = { path = "./src/crates/biter" }
-# chrono = { version = "0.4.39", features = ["serde"] }
-# clap = { version = "4.5.26", features = ["derive"] }
-# color-eyre = "0.6.3"
-# ctrlc = { version = "3.4.5", features = ["termination"] }
-# derive_deref = "1.1.1"
-# env_logger = "0.11.6"
-# inferno = "0.12.1"
-# itertools = "0.13.0"
-# log = { version = "0.4.25", features = ["std", "serde"] }
-# ordered-float = "4.6.0"
-# rayon = "1.10.0"
-# regex = "1.11.1"
-# reqwest = { version = "0.12.12", features = ["blocking", "json"] }
-# rlimit = "0.10.2"
-# snkrj = { path = "./src/crates/snkrj" }
-# serde = { version = "1.0.217", features = ["derive"] }
-# serde_json = "1.0.135"
-# struct_iterable = { path = "./src/crates/iterable" }
-# swc = "9.0.2"
-# swc_common = "5.0.0"
-# tokio = { version = "1.43.0", features = ["full"] }
-# toml = "0.8.19"
-# tower-http = { version = "0.6.2", features = ["compression-full"] }
-# zstd = "0.13.2"
+[workspace.dependencies]
+bindex = { path = "indexer" }
+bitcoin = { version = "0.32.5", features = ["serde"] }
+biter = { path = "iterator" }
+bomputer = { path = "computer" }
+color-eyre = "0.6.3"
+derive_deref = "1.1.1"
+exit = { path = "exit" }
+jiff = "0.1.28"
+rayon = "1.10.0"
+storable_vec = { path = "storable_vec" }
+struct_iterable = { path = "struct_iterable" }
+unsafe_slice_serde = { path = "unsafe_slice_serde" }
diff --git a/LICENSE.md b/LICENSE.md
index 819632a70..4827b5007 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024 kibō.money
+Copyright (c) 2025 kibō.money
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/bindex/Cargo.toml b/bindex/Cargo.toml
deleted file mode 100644
index f07cd8537..000000000
--- a/bindex/Cargo.toml
+++ /dev/null
@@ -1,17 +0,0 @@
-[package]
-name = "bindex"
-version = "0.1.0"
-edition = "2021"
-
-[dependencies]
-bitcoin_hashes = "0.16.0"
-biter = { path = "../biter" }
-color-eyre = "0.6.3"
-derive_deref = "1.1.1"
-exit = { path = "../exit" }
-fjall = "2.5.0"
-jiff = "0.1.27"
-rapidhash = "1.3.0"
-rayon = "1.10.0"
-snkrj = { path = "../snkrj" }
-storable_vec = { path = "../storable_vec" }
diff --git a/bomputer/Cargo.toml b/bomputer/Cargo.toml
deleted file mode 100644
index cd8dcb5ea..000000000
--- a/bomputer/Cargo.toml
+++ /dev/null
@@ -1,12 +0,0 @@
-[package]
-name = "bomputer"
-version = "0.1.0"
-edition = "2021"
-
-[dependencies]
-bindex = { path = "../bindex" }
-color-eyre = "0.6.3"
-derive_deref = "1.1.1"
-exit = { path = "../exit" }
-jiff = "0.1.27"
-rayon = "1.10.0"
diff --git a/computer/Cargo.toml b/computer/Cargo.toml
new file mode 100644
index 000000000..a8f285300
--- /dev/null
+++ b/computer/Cargo.toml
@@ -0,0 +1,13 @@
+[package]
+name = "bomputer"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+biter = { workspace = true }
+bindex = { workspace = true }
+color-eyre = { workspace = true }
+derive_deref = { workspace = true }
+exit = { workspace = true }
+jiff = { workspace = true }
+rayon = { workspace = true }
diff --git a/bomputer/src/lib.rs b/computer/src/lib.rs
similarity index 94%
rename from bomputer/src/lib.rs
rename to computer/src/lib.rs
index a1e960b65..ad59cc0b5 100644
--- a/bomputer/src/lib.rs
+++ b/computer/src/lib.rs
@@ -1,6 +1,7 @@
 use std::path::Path;
 
-use bindex::{biter::rpc, Indexer};
+use bindex::Indexer;
+use biter::rpc;
 use exit::Exit;
 
 mod structs;
diff --git a/bomputer/src/main.rs b/computer/src/main.rs
similarity index 100%
rename from bomputer/src/main.rs
rename to computer/src/main.rs
diff --git a/bomputer/src/structs/date.rs b/computer/src/structs/date.rs
similarity index 100%
rename from bomputer/src/structs/date.rs
rename to computer/src/structs/date.rs
diff --git a/bomputer/src/structs/feerate.rs b/computer/src/structs/feerate.rs
similarity index 100%
rename from bomputer/src/structs/feerate.rs
rename to computer/src/structs/feerate.rs
diff --git a/bomputer/src/structs/mod.rs b/computer/src/structs/mod.rs
similarity index 100%
rename from bomputer/src/structs/mod.rs
rename to computer/src/structs/mod.rs
diff --git a/bindex/.gitignore b/indexer/.gitignore
similarity index 100%
rename from bindex/.gitignore
rename to indexer/.gitignore
diff --git a/bindex/Cargo.lock b/indexer/Cargo.lock
similarity index 100%
rename from bindex/Cargo.lock
rename to indexer/Cargo.lock
diff --git a/indexer/Cargo.toml b/indexer/Cargo.toml
new file mode 100644
index 000000000..6773c2618
--- /dev/null
+++ b/indexer/Cargo.toml
@@ -0,0 +1,19 @@
+[package]
+name = "bindex"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+bitcoin = { workspace = true }
+bitcoin_hashes = "0.16.0"
+biter = { workspace = true }
+color-eyre = { workspace = true }
+derive_deref = { workspace = true }
+exit = { workspace = true }
+fjall = "2.5.0"
+jiff = { workspace = true }
+rapidhash = "1.3.0"
+rayon = { workspace = true }
+# snkrj = { workspace = true }
+storable_vec = { workspace = true }
+unsafe_slice_serde = { workspace = true }
diff --git a/bindex/rustfmt.toml b/indexer/rustfmt.toml
similarity index 100%
rename from bindex/rustfmt.toml
rename to indexer/rustfmt.toml
diff --git a/bindex/src/lib.rs b/indexer/src/lib.rs
similarity index 93%
rename from bindex/src/lib.rs
rename to indexer/src/lib.rs
index 5a4bbb159..b286b2866 100644
--- a/bindex/src/lib.rs
+++ b/indexer/src/lib.rs
@@ -9,7 +9,7 @@ use std::{
 
 pub use biter::*;
 
-use biter::bitcoin::{Transaction, TxIn, TxOut, Txid};
+use bitcoin::{Transaction, TxIn, TxOut, Txid};
 use color_eyre::eyre::{eyre, ContextCompat};
 use exit::Exit;
 use rayon::prelude::*;
@@ -21,8 +21,8 @@ pub use biter;
 
 use storage::{Fjalls, StorableVecs};
 pub use structs::{
-    Addressbytes, AddressbytesPrefix, Addressindex, Addresstype, Amount, BlockHashPrefix, Height, Timestamp,
-    TxidPrefix, Txindex, Txinindex, Txoutindex, Vin, Vout,
+    AddressHash, Addressbytes, Addressindex, Addresstype, Amount, BlockHashPrefix, Height, Timestamp, TxidPrefix,
+    Txindex, Txinindex, Txoutindex, Vin, Vout,
 };
 
 const UNSAFE_BLOCKS: u32 = 100;
@@ -89,10 +89,7 @@ impl Indexer {
             Ok(())
         };
 
-        // // let mut stores_opt = Some(stores);
-        // let mut rtx_opt = Some(rtx);
-
-        biter::new(bitcoin_dir, Some(height.into()), Some(400_000), rpc)
+        biter::new(bitcoin_dir, Some(height.into()), None, rpc)
             .iter()
             .try_for_each(|(_height, block, blockhash)| -> color_eyre::Result<()> {
                 println!("Processing block {_height}...");
@@ -100,9 +97,6 @@ impl Indexer {
                 height = Height::from(_height);
                 let timestamp = Timestamp::try_from(block.header.time)?;
 
-                // let mut stores = stores_opt.take().context("option should have store")?;
-                // let rtx = rtx_opt.take().context("option should have rtx")?;
-
                 if let Some(saved_blockhash) = vecs.height_to_blockhash.get(height)? {
                     if &blockhash != saved_blockhash.as_ref() {
                         todo!("Rollback not implemented");
@@ -115,7 +109,7 @@ impl Indexer {
                 if parts
                     .blockhash_prefix_to_height
                     .get(&blockhash_prefix)?
-                    .is_some_and(|prev_height| prev_height != height)
+                    .is_some_and(|prev_height| *prev_height != height)
                 {
                     dbg!(blockhash);
                     return Err(eyre!("Collision, expect prefix to need be set yet"));
@@ -198,15 +192,15 @@ impl Indexer {
 
                                     let txid_prefix = TxidPrefix::try_from(&txid)?;
 
-                                    let prev_txindex_slice_opt =
+                                    let prev_txindex_opt =
                                         if check_collisions && parts.txid_prefix_to_txindex.needs(height) {
                                             // Should only find collisions for two txids (duplicates), see below
-                                            parts.txid_prefix_to_txindex.get(&txid_prefix)?
+                                            parts.txid_prefix_to_txindex.get(&txid_prefix)?.map(|v| *v)
                                         } else {
                                             None
                                         };
 
-                                    Ok((txid_prefix, (tx, txid, Txindex::from(index), prev_txindex_slice_opt)))
+                                    Ok((txid_prefix, (tx, txid, Txindex::from(index), prev_txindex_opt)))
                                 })
                                 .try_fold(BTreeMap::new, |mut map, tuple| {
                                     let (key, value) = tuple?;
@@ -243,6 +237,7 @@ impl Indexer {
                                 let prev_txindex = if let Some(txindex) = parts
                                     .txid_prefix_to_txindex
                                     .get(&TxidPrefix::try_from(&outpoint.txid)?)?
+                                    .map(|v| *v)
                                     .and_then(|txindex| {
                                         // Checking if not finding txindex from the future
                                         (txindex < txindex_global).then_some(txindex)
@@ -318,9 +313,10 @@ impl Indexer {
 
                                     let addressindex_opt = addressbytes_res.as_ref().ok().and_then(|addressbytes| {
                                         parts
-                                            .addressbytes_prefix_to_addressindex
-                                            .get(&AddressbytesPrefix::from((addressbytes, addresstype)))
+                                            .addresshash_to_addressindex
+                                            .get(&AddressHash::from((addressbytes, addresstype)))
                                             .unwrap()
+                                            .map(|v| *v)
                                             // Checking if not in the future
                                             .and_then(|addressindex_local| {
                                                 (addressindex_local < addressindex_global).then_some(addressindex_local)
@@ -350,7 +346,7 @@ impl Indexer {
 
                                         if (vecs.addressindex_to_addresstype.hasnt(addressindex)
                                             && addresstype != prev_addresstype)
-                                            || (parts.addressbytes_prefix_to_addressindex.needs(height)
+                                            || (parts.addresshash_to_addressindex.needs(height)
                                                 && prev_addressbytes != addressbytes)
                                         {
                                             let txid = tx.compute_txid();
@@ -367,8 +363,8 @@ impl Indexer {
                                                 addressindex,
                                                 addresstypeindex,
                                                 txout,
-                                                AddressbytesPrefix::from((addressbytes, addresstype)),
-                                                AddressbytesPrefix::from((prev_addressbytes, prev_addresstype))
+                                                AddressHash::from((addressbytes, addresstype)),
+                                                AddressHash::from((prev_addressbytes, prev_addresstype))
                                             );
                                             panic!()
                                         }
@@ -434,7 +430,7 @@ impl Indexer {
                     Txoutindex,
                 > = BTreeMap::new();
 
-                let mut already_added_addressbytes_prefix: BTreeMap<AddressbytesPrefix, Addressindex> = BTreeMap::new();
+                let mut already_added_addresshash: BTreeMap<AddressHash, Addressindex> = BTreeMap::new();
 
                 txoutindex_to_txout_addresstype_addressbytes_res_addressindex_opt
                 .into_iter()
@@ -454,15 +450,15 @@ impl Indexer {
 
                         let mut addressindex = addressindex_global;
 
-                        let mut addressbytes_prefix = None;
+                        let mut addresshash = None;
 
                         if let Some(addressindex_local) = addressindex_opt.or_else(|| {
                             addressbytes_res.as_ref().ok().and_then(|addressbytes| {
                                 // Check if address was first seen before in this iterator
                                 // Example: https://mempool.space/address/046a0765b5865641ce08dd39690aade26dfbf5511430ca428a3089261361cef170e3929a68aee3d8d4848b0c5111b0a37b82b86ad559fd2a745b44d8e8d9dfdc0c
-                                addressbytes_prefix.replace(AddressbytesPrefix::from((addressbytes, addresstype)));
-                                already_added_addressbytes_prefix
-                                    .get(addressbytes_prefix.as_ref().unwrap())
+                                addresshash.replace(AddressHash::from((addressbytes, addresstype)));
+                                already_added_addresshash
+                                    .get(addresshash.as_ref().unwrap())
                                     .cloned()
                             })
                         }) {
@@ -495,13 +491,13 @@ impl Indexer {
                                 .push_if_needed(addressindex, height)?;
 
                             if let Ok(addressbytes) = addressbytes_res {
-                                let addressbytes_prefix = addressbytes_prefix.unwrap();
+                                let addresshash = addresshash.unwrap();
 
-                                already_added_addressbytes_prefix
-                                    .insert(addressbytes_prefix, addressindex);
+                                already_added_addresshash
+                                    .insert(addresshash, addressindex);
 
-                                parts.addressbytes_prefix_to_addressindex.insert_if_needed(
-                                    addressbytes_prefix,
+                                parts.addresshash_to_addressindex.insert_if_needed(
+                                    addresshash,
                                     addressindex,
                                     height,
                                 );
@@ -520,7 +516,7 @@ impl Indexer {
                     },
                 )?;
 
-                drop(already_added_addressbytes_prefix);
+                drop(already_added_addresshash);
 
                 input_source_vec
                     .into_iter()
diff --git a/bindex/src/main.rs b/indexer/src/main.rs
similarity index 100%
rename from bindex/src/main.rs
rename to indexer/src/main.rs
diff --git a/bindex/src/storage/canopies/database.rs b/indexer/src/storage/canopies/database.rs
similarity index 100%
rename from bindex/src/storage/canopies/database.rs
rename to indexer/src/storage/canopies/database.rs
diff --git a/bindex/src/storage/canopies/environment.rs b/indexer/src/storage/canopies/environment.rs
similarity index 100%
rename from bindex/src/storage/canopies/environment.rs
rename to indexer/src/storage/canopies/environment.rs
diff --git a/bindex/src/storage/canopies/mod.rs b/indexer/src/storage/canopies/mod.rs
similarity index 100%
rename from bindex/src/storage/canopies/mod.rs
rename to indexer/src/storage/canopies/mod.rs
diff --git a/bindex/src/storage/canopies/transaction.rs b/indexer/src/storage/canopies/transaction.rs
similarity index 100%
rename from bindex/src/storage/canopies/transaction.rs
rename to indexer/src/storage/canopies/transaction.rs
diff --git a/bindex/src/storage/canopies/tree.rs b/indexer/src/storage/canopies/tree.rs
similarity index 100%
rename from bindex/src/storage/canopies/tree.rs
rename to indexer/src/storage/canopies/tree.rs
diff --git a/bindex/src/storage/fjalls/base.rs b/indexer/src/storage/fjalls/base.rs
similarity index 83%
rename from bindex/src/storage/fjalls/base.rs
rename to indexer/src/storage/fjalls/base.rs
index ca69556f1..42a575e4a 100644
--- a/bindex/src/storage/fjalls/base.rs
+++ b/indexer/src/storage/fjalls/base.rs
@@ -1,10 +1,11 @@
-use std::{collections::BTreeMap, mem, path::Path};
+use std::{collections::BTreeMap, error, mem, path::Path};
 
 use fjall::{
     PartitionCreateOptions, PersistMode, ReadTransaction, Result, Slice, TransactionalKeyspace,
     TransactionalPartitionHandle,
 };
-use storable_vec::UnsafeSizedSerDe;
+use storable_vec::Value;
+use unsafe_slice_serde::UnsafeSliceSerde;
 
 use crate::structs::{Height, Version};
 
@@ -18,10 +19,11 @@ pub struct Partition<Key, Value> {
     puts: BTreeMap<Key, Value>,
 }
 
-impl<Key, Value> Partition<Key, Value>
+impl<K, V> Partition<K, V>
 where
-    Key: Into<Slice> + Ord,
-    Value: Into<Slice> + TryFrom<Slice> + Clone,
+    K: Into<Slice> + Ord,
+    V: Into<Slice> + TryFrom<Slice>,
+    <V as TryFrom<Slice>>::Error: error::Error + Send + Sync + 'static,
 {
     pub fn import(path: &Path, version: Version) -> color_eyre::Result<Self> {
         let meta = Meta::checked_open(path, version)?;
@@ -49,20 +51,17 @@ where
         })
     }
 
-    pub fn get(&self, key: &Key) -> color_eyre::Result<Option<Value>>
-    where
-        <Value as TryFrom<Slice>>::Error: std::error::Error + Send + Sync + 'static,
-    {
+    pub fn get(&self, key: &K) -> color_eyre::Result<Option<Value<V>>> {
         if let Some(v) = self.puts.get(key) {
-            Ok(Some(v.clone()))
+            Ok(Some(Value::Ref(v)))
         } else if let Some(slice) = self.rtx.get(&self.part, key.unsafe_as_slice())? {
-            Ok(Some(Value::try_from(slice)?))
+            Ok(Some(Value::Owned(V::try_from(slice)?)))
         } else {
             Ok(None)
         }
     }
 
-    pub fn insert_if_needed(&mut self, key: Key, value: Value, height: Height) {
+    pub fn insert_if_needed(&mut self, key: K, value: V, height: Height) {
         if self.needs(height) {
             self.puts.insert(key, value);
         }
diff --git a/bindex/src/storage/fjalls/meta.rs b/indexer/src/storage/fjalls/meta.rs
similarity index 98%
rename from bindex/src/storage/fjalls/meta.rs
rename to indexer/src/storage/fjalls/meta.rs
index 2431a0fe4..c26a19033 100644
--- a/bindex/src/storage/fjalls/meta.rs
+++ b/indexer/src/storage/fjalls/meta.rs
@@ -3,7 +3,7 @@ use std::{
     path::{Path, PathBuf},
 };
 
-use storable_vec::UnsafeSizedSerDe;
+use unsafe_slice_serde::UnsafeSliceSerde;
 
 use super::{Height, Version};
 
diff --git a/bindex/src/storage/fjalls/mod.rs b/indexer/src/storage/fjalls/mod.rs
similarity index 91%
rename from bindex/src/storage/fjalls/mod.rs
rename to indexer/src/storage/fjalls/mod.rs
index 3d17bb007..2a952a7e4 100644
--- a/bindex/src/storage/fjalls/mod.rs
+++ b/indexer/src/storage/fjalls/mod.rs
@@ -1,6 +1,6 @@
 use std::{path::Path, thread};
 
-use crate::{structs::Version, AddressbytesPrefix, Addressindex, BlockHashPrefix, Height, TxidPrefix, Txindex};
+use crate::{structs::Version, AddressHash, Addressindex, BlockHashPrefix, Height, TxidPrefix, Txindex};
 
 mod base;
 mod meta;
@@ -9,7 +9,7 @@ use base::*;
 use meta::*;
 
 pub struct Fjalls {
-    pub addressbytes_prefix_to_addressindex: Partition<AddressbytesPrefix, Addressindex>,
+    pub addresshash_to_addressindex: Partition<AddressHash, Addressindex>,
     pub blockhash_prefix_to_height: Partition<BlockHashPrefix, Height>,
     pub txid_prefix_to_txindex: Partition<TxidPrefix, Txindex>,
 }
@@ -17,8 +17,8 @@ pub struct Fjalls {
 impl Fjalls {
     pub fn import(path: &Path) -> color_eyre::Result<Self> {
         Ok(Self {
-            addressbytes_prefix_to_addressindex: Partition::import(
-                &path.join("addressbytes_prefix_to_addressindex"),
+            addresshash_to_addressindex: Partition::import(
+                &path.join("addresshash_to_addressindex"),
                 Version::from(1),
             )?,
             blockhash_prefix_to_height: Partition::import(&path.join("blockhash_prefix_to_height"), Version::from(1))?,
@@ -147,7 +147,7 @@ impl Fjalls {
 
     pub fn min_height(&self) -> Option<Height> {
         [
-            self.addressbytes_prefix_to_addressindex.height(),
+            self.addresshash_to_addressindex.height(),
             self.blockhash_prefix_to_height.height(),
             self.txid_prefix_to_txindex.height(),
         ]
@@ -159,13 +159,13 @@ impl Fjalls {
 
     pub fn commit(&mut self, height: Height) -> fjall::Result<()> {
         thread::scope(|scope| {
-            let addressbytes_prefix_to_addressindex_commit_handle =
-                scope.spawn(|| self.addressbytes_prefix_to_addressindex.commit(height));
+            let addresshash_to_addressindex_commit_handle =
+                scope.spawn(|| self.addresshash_to_addressindex.commit(height));
             let blockhash_prefix_to_height_commit_handle =
                 scope.spawn(|| self.blockhash_prefix_to_height.commit(height));
             let txid_prefix_to_txindex_commit_handle = scope.spawn(|| self.txid_prefix_to_txindex.commit(height));
 
-            addressbytes_prefix_to_addressindex_commit_handle.join().unwrap()?;
+            addresshash_to_addressindex_commit_handle.join().unwrap()?;
             blockhash_prefix_to_height_commit_handle.join().unwrap()?;
             txid_prefix_to_txindex_commit_handle.join().unwrap()?;
 
diff --git a/bindex/src/storage/mod.rs b/indexer/src/storage/mod.rs
similarity index 100%
rename from bindex/src/storage/mod.rs
rename to indexer/src/storage/mod.rs
diff --git a/bindex/src/storage/sanakirjas/meta.rs b/indexer/src/storage/sanakirjas/meta.rs
similarity index 100%
rename from bindex/src/storage/sanakirjas/meta.rs
rename to indexer/src/storage/sanakirjas/meta.rs
diff --git a/bindex/src/storage/sanakirjas/mod.rs b/indexer/src/storage/sanakirjas/mod.rs
similarity index 100%
rename from bindex/src/storage/sanakirjas/mod.rs
rename to indexer/src/storage/sanakirjas/mod.rs
diff --git a/bindex/src/storage/sanakirjas/multi.rs b/indexer/src/storage/sanakirjas/multi.rs
similarity index 100%
rename from bindex/src/storage/sanakirjas/multi.rs
rename to indexer/src/storage/sanakirjas/multi.rs
diff --git a/bindex/src/storage/sanakirjas/unique.rs b/indexer/src/storage/sanakirjas/unique.rs
similarity index 100%
rename from bindex/src/storage/sanakirjas/unique.rs
rename to indexer/src/storage/sanakirjas/unique.rs
diff --git a/bindex/src/storage/storable_vecs/base.rs b/indexer/src/storage/storable_vecs/base.rs
similarity index 100%
rename from bindex/src/storage/storable_vecs/base.rs
rename to indexer/src/storage/storable_vecs/base.rs
diff --git a/bindex/src/storage/storable_vecs/mod.rs b/indexer/src/storage/storable_vecs/mod.rs
similarity index 100%
rename from bindex/src/storage/storable_vecs/mod.rs
rename to indexer/src/storage/storable_vecs/mod.rs
diff --git a/bindex/src/structs/addressbytes.rs b/indexer/src/structs/addressbytes.rs
similarity index 100%
rename from bindex/src/structs/addressbytes.rs
rename to indexer/src/structs/addressbytes.rs
diff --git a/bindex/src/structs/addressindex.rs b/indexer/src/structs/addressindex.rs
similarity index 87%
rename from bindex/src/structs/addressindex.rs
rename to indexer/src/structs/addressindex.rs
index eab1f7c97..2780cf4d5 100644
--- a/bindex/src/structs/addressindex.rs
+++ b/indexer/src/structs/addressindex.rs
@@ -1,10 +1,10 @@
 use derive_deref::{Deref, DerefMut};
-use snkrj::{direct_repr, Storable, UnsizedStorable};
-use storable_vec::UnsafeSizedSerDe;
+// use snkrj::{direct_repr, Storable, UnsizedStorable};
+use unsafe_slice_serde::UnsafeSliceSerde;
 
 #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Deref, DerefMut, Default)]
 pub struct Addressindex(u32);
-direct_repr!(Addressindex);
+// direct_repr!(Addressindex);
 
 impl Addressindex {
     pub const BYTES: usize = size_of::<Self>();
@@ -51,7 +51,7 @@ impl From<Addressindex> for usize {
 }
 
 impl TryFrom<fjall::Slice> for Addressindex {
-    type Error = storable_vec::Error;
+    type Error = unsafe_slice_serde::Error;
     fn try_from(value: fjall::Slice) -> Result<Self, Self::Error> {
         Ok(*Self::unsafe_try_from_slice(&value)?)
     }
diff --git a/bindex/src/structs/addresstype.rs b/indexer/src/structs/addresstype.rs
similarity index 100%
rename from bindex/src/structs/addresstype.rs
rename to indexer/src/structs/addresstype.rs
diff --git a/bindex/src/structs/addresstypeindex.rs b/indexer/src/structs/addresstypeindex.rs
similarity index 92%
rename from bindex/src/structs/addresstypeindex.rs
rename to indexer/src/structs/addresstypeindex.rs
index 5b126b31d..7fe615080 100644
--- a/bindex/src/structs/addresstypeindex.rs
+++ b/indexer/src/structs/addresstypeindex.rs
@@ -1,9 +1,9 @@
 use derive_deref::{Deref, DerefMut};
-use snkrj::{direct_repr, Storable, UnsizedStorable};
+// use snkrj::{direct_repr, Storable, UnsizedStorable};
 
 #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Deref, DerefMut, Default)]
 pub struct Addresstypeindex(u32);
-direct_repr!(Addresstypeindex);
+// direct_repr!(Addresstypeindex);
 
 impl Addresstypeindex {
     pub fn decremented(self) -> Self {
diff --git a/bindex/src/structs/amount.rs b/indexer/src/structs/amount.rs
similarity index 96%
rename from bindex/src/structs/amount.rs
rename to indexer/src/structs/amount.rs
index 9f4320b8a..f6ac571bc 100644
--- a/bindex/src/structs/amount.rs
+++ b/indexer/src/structs/amount.rs
@@ -5,13 +5,13 @@ use std::{
 
 use biter::bitcoin;
 use derive_deref::{Deref, DerefMut};
-use snkrj::{direct_repr, Storable, UnsizedStorable};
+// use snkrj::{direct_repr, Storable, UnsizedStorable};
 
 use super::Height;
 
 #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Deref, DerefMut, Default)]
 pub struct Amount(bitcoin::Amount);
-direct_repr!(Amount);
+// direct_repr!(Amount);
 
 impl Amount {
     pub const ZERO: Self = Self(bitcoin::Amount::ZERO);
diff --git a/bindex/src/structs/prefix.rs b/indexer/src/structs/compressed.rs
similarity index 80%
rename from bindex/src/structs/prefix.rs
rename to indexer/src/structs/compressed.rs
index cc2e2e15e..4aab25aa1 100644
--- a/bindex/src/structs/prefix.rs
+++ b/indexer/src/structs/compressed.rs
@@ -2,15 +2,15 @@ use std::hash::Hasher;
 
 use biter::bitcoin::{BlockHash, Txid};
 use derive_deref::Deref;
-use snkrj::{direct_repr, Storable, UnsizedStorable};
-use storable_vec::UnsafeSizedSerDe;
+// use snkrj::{direct_repr, Storable, UnsizedStorable};
+use unsafe_slice_serde::UnsafeSliceSerde;
 
 use super::{Addressbytes, Addresstype, SliceExtended};
 
 #[derive(Debug, Deref, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
-pub struct AddressbytesPrefix([u8; 8]);
-direct_repr!(AddressbytesPrefix);
-impl From<(&Addressbytes, Addresstype)> for AddressbytesPrefix {
+pub struct AddressHash([u8; 8]);
+// direct_repr!(AddressHash);
+impl From<(&Addressbytes, Addresstype)> for AddressHash {
     fn from((addressbytes, addresstype): (&Addressbytes, Addresstype)) -> Self {
         let mut hasher = rapidhash::RapidHasher::default();
         hasher.write(addressbytes.as_slice());
@@ -19,31 +19,31 @@ impl From<(&Addressbytes, Addresstype)> for AddressbytesPrefix {
         Self(slice)
     }
 }
-impl From<[u8; 8]> for AddressbytesPrefix {
+impl From<[u8; 8]> for AddressHash {
     fn from(value: [u8; 8]) -> Self {
         Self(value)
     }
 }
-impl TryFrom<fjall::Slice> for AddressbytesPrefix {
+impl TryFrom<fjall::Slice> for AddressHash {
     type Error = color_eyre::Report;
     fn try_from(value: fjall::Slice) -> Result<Self, Self::Error> {
         Ok(*Self::unsafe_try_from_slice(&value)?)
     }
 }
-impl From<&AddressbytesPrefix> for fjall::Slice {
-    fn from(value: &AddressbytesPrefix) -> Self {
+impl From<&AddressHash> for fjall::Slice {
+    fn from(value: &AddressHash) -> Self {
         Self::new(value.unsafe_as_slice())
     }
 }
-impl From<AddressbytesPrefix> for fjall::Slice {
-    fn from(value: AddressbytesPrefix) -> Self {
+impl From<AddressHash> for fjall::Slice {
+    fn from(value: AddressHash) -> Self {
         Self::from(&value)
     }
 }
 
 #[derive(Debug, Deref, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
 pub struct BlockHashPrefix([u8; 8]);
-direct_repr!(BlockHashPrefix);
+// direct_repr!(BlockHashPrefix);
 impl TryFrom<&BlockHash> for BlockHashPrefix {
     type Error = color_eyre::Report;
     fn try_from(value: &BlockHash) -> Result<Self, Self::Error> {
@@ -69,7 +69,7 @@ impl From<BlockHashPrefix> for fjall::Slice {
 
 #[derive(Debug, Deref, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
 pub struct TxidPrefix([u8; 8]);
-direct_repr!(TxidPrefix);
+// direct_repr!(TxidPrefix);
 impl TryFrom<&Txid> for TxidPrefix {
     type Error = color_eyre::Report;
     fn try_from(value: &Txid) -> Result<Self, Self::Error> {
diff --git a/bindex/src/structs/height.rs b/indexer/src/structs/height.rs
similarity index 94%
rename from bindex/src/structs/height.rs
rename to indexer/src/structs/height.rs
index 717a1cde5..1784fc206 100644
--- a/bindex/src/structs/height.rs
+++ b/indexer/src/structs/height.rs
@@ -6,12 +6,12 @@ use std::{
 
 use biter::rpc::{self, RpcApi};
 use derive_deref::{Deref, DerefMut};
-use snkrj::{direct_repr, Storable, UnsizedStorable};
-use storable_vec::UnsafeSizedSerDe;
+// use snkrj::{direct_repr, Storable, UnsizedStorable};
+use unsafe_slice_serde::UnsafeSliceSerde;
 
 #[derive(Debug, Clone, Copy, Deref, DerefMut, PartialEq, Eq, PartialOrd, Ord, Default)]
 pub struct Height(u32);
-direct_repr!(Height);
+// direct_repr!(Height);
 
 impl Height {
     pub fn write(&self, path: &Path) -> Result<(), io::Error> {
@@ -121,7 +121,7 @@ impl TryFrom<&rpc::Client> for Height {
 }
 
 impl TryFrom<fjall::Slice> for Height {
-    type Error = storable_vec::Error;
+    type Error = unsafe_slice_serde::Error;
     fn try_from(value: fjall::Slice) -> Result<Self, Self::Error> {
         Ok(*Self::unsafe_try_from_slice(&value)?)
     }
diff --git a/bindex/src/structs/mod.rs b/indexer/src/structs/mod.rs
similarity index 92%
rename from bindex/src/structs/mod.rs
rename to indexer/src/structs/mod.rs
index 7f5daac0a..bb92346ed 100644
--- a/bindex/src/structs/mod.rs
+++ b/indexer/src/structs/mod.rs
@@ -3,8 +3,8 @@ mod addressindex;
 mod addresstype;
 mod addresstypeindex;
 mod amount;
+mod compressed;
 mod height;
-mod prefix;
 mod slice;
 mod timestamp;
 mod txindex;
@@ -19,8 +19,8 @@ pub use addressindex::*;
 pub use addresstype::*;
 pub use addresstypeindex::*;
 pub use amount::*;
+pub use compressed::*;
 pub use height::*;
-pub use prefix::*;
 pub use slice::*;
 pub use timestamp::*;
 pub use txindex::*;
diff --git a/bindex/src/structs/slice.rs b/indexer/src/structs/slice.rs
similarity index 100%
rename from bindex/src/structs/slice.rs
rename to indexer/src/structs/slice.rs
diff --git a/bindex/src/structs/timestamp.rs b/indexer/src/structs/timestamp.rs
similarity index 100%
rename from bindex/src/structs/timestamp.rs
rename to indexer/src/structs/timestamp.rs
diff --git a/bindex/src/structs/txindex.rs b/indexer/src/structs/txindex.rs
similarity index 89%
rename from bindex/src/structs/txindex.rs
rename to indexer/src/structs/txindex.rs
index 4b2b781e6..974565a02 100644
--- a/bindex/src/structs/txindex.rs
+++ b/indexer/src/structs/txindex.rs
@@ -1,12 +1,12 @@
 use std::ops::{Add, AddAssign};
 
 use derive_deref::{Deref, DerefMut};
-use snkrj::{direct_repr, Storable, UnsizedStorable};
-use storable_vec::UnsafeSizedSerDe;
+// use snkrj::{direct_repr, Storable, UnsizedStorable};
+use unsafe_slice_serde::UnsafeSliceSerde;
 
 #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Deref, DerefMut, Default)]
 pub struct Txindex(u32);
-direct_repr!(Txindex);
+// direct_repr!(Txindex);
 
 impl Txindex {
     pub fn incremented(self) -> Self {
@@ -60,7 +60,7 @@ impl From<Txindex> for usize {
 }
 
 impl TryFrom<fjall::Slice> for Txindex {
-    type Error = storable_vec::Error;
+    type Error = unsafe_slice_serde::Error;
     fn try_from(value: fjall::Slice) -> Result<Self, Self::Error> {
         Ok(*Self::unsafe_try_from_slice(&value)?)
     }
diff --git a/bindex/src/structs/txinindex.rs b/indexer/src/structs/txinindex.rs
similarity index 93%
rename from bindex/src/structs/txinindex.rs
rename to indexer/src/structs/txinindex.rs
index 2c6bb7ad1..03807b5c7 100644
--- a/bindex/src/structs/txinindex.rs
+++ b/indexer/src/structs/txinindex.rs
@@ -1,13 +1,13 @@
 use std::ops::{Add, AddAssign};
 
 use derive_deref::{Deref, DerefMut};
-use snkrj::{direct_repr, Storable, UnsizedStorable};
+// use snkrj::{direct_repr, Storable, UnsizedStorable};
 
 use super::Vout;
 
 #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Deref, DerefMut, Default)]
 pub struct Txinindex(u64);
-direct_repr!(Txinindex);
+// direct_repr!(Txinindex);
 
 impl Txinindex {
     pub fn incremented(self) -> Self {
diff --git a/bindex/src/structs/txoutindex.rs b/indexer/src/structs/txoutindex.rs
similarity index 93%
rename from bindex/src/structs/txoutindex.rs
rename to indexer/src/structs/txoutindex.rs
index 91740bcb1..5ab2e7ccf 100644
--- a/bindex/src/structs/txoutindex.rs
+++ b/indexer/src/structs/txoutindex.rs
@@ -1,13 +1,13 @@
 use std::ops::{Add, AddAssign};
 
 use derive_deref::{Deref, DerefMut};
-use snkrj::{direct_repr, Storable, UnsizedStorable};
+// use snkrj::{direct_repr, Storable, UnsizedStorable};
 
 use super::Vout;
 
 #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Deref, DerefMut, Default)]
 pub struct Txoutindex(u64);
-direct_repr!(Txoutindex);
+// direct_repr!(Txoutindex);
 
 impl Txoutindex {
     pub const COINBASE: Self = Self(u64::MAX);
diff --git a/bindex/src/structs/version.rs b/indexer/src/structs/version.rs
similarity index 95%
rename from bindex/src/structs/version.rs
rename to indexer/src/structs/version.rs
index 4faa4ec0d..3f01cb414 100644
--- a/bindex/src/structs/version.rs
+++ b/indexer/src/structs/version.rs
@@ -1,6 +1,6 @@
 use std::{fs, io, path::Path};
 
-use storable_vec::UnsafeSizedSerDe;
+use unsafe_slice_serde::UnsafeSliceSerde;
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
 pub struct Version(u32);
diff --git a/bindex/src/structs/vin.rs b/indexer/src/structs/vin.rs
similarity index 100%
rename from bindex/src/structs/vin.rs
rename to indexer/src/structs/vin.rs
diff --git a/bindex/src/structs/vout.rs b/indexer/src/structs/vout.rs
similarity index 100%
rename from bindex/src/structs/vout.rs
rename to indexer/src/structs/vout.rs
diff --git a/biter/CHANGELOG.md b/iterator/CHANGELOG.md
similarity index 100%
rename from biter/CHANGELOG.md
rename to iterator/CHANGELOG.md
diff --git a/biter/Cargo.lock b/iterator/Cargo.lock
similarity index 100%
rename from biter/Cargo.lock
rename to iterator/Cargo.lock
diff --git a/biter/Cargo.toml b/iterator/Cargo.toml
similarity index 81%
rename from biter/Cargo.toml
rename to iterator/Cargo.toml
index 6bb8bc3f6..853d673db 100644
--- a/biter/Cargo.toml
+++ b/iterator/Cargo.toml
@@ -9,11 +9,11 @@ categories = ["cryptography::cryptocurrencies", "encoding"]
 edition = "2021"
 
 [dependencies]
-bitcoin = { version = "0.32.5", features = ["serde"] }
-rayon = "1.10.0"
+bitcoin = { workspace = true }
+rayon = { workspace = true }
 crossbeam = { version = "0.8.4", features = ["crossbeam-channel"] }
 serde = { version = "1.0.217", features = ["derive"] }
-serde_json = "1.0.135"
-derived-deref = "2.1.0"
+serde_json = "1.0.137"
+derive_deref = { workspace = true }
 bitcoincore-rpc = "0.19.0"
 # tokio = { version = "1.39.2", features = ["rt-multi-thread"] }
diff --git a/biter/LICENSE.md b/iterator/LICENSE.md
similarity index 100%
rename from biter/LICENSE.md
rename to iterator/LICENSE.md
diff --git a/biter/README.md b/iterator/README.md
similarity index 100%
rename from biter/README.md
rename to iterator/README.md
diff --git a/biter/src/blk_index_to_blk_path.rs b/iterator/src/blk_index_to_blk_path.rs
similarity index 97%
rename from biter/src/blk_index_to_blk_path.rs
rename to iterator/src/blk_index_to_blk_path.rs
index 17cf2da39..e365018c8 100644
--- a/biter/src/blk_index_to_blk_path.rs
+++ b/iterator/src/blk_index_to_blk_path.rs
@@ -4,7 +4,7 @@ use std::{
     path::{Path, PathBuf},
 };
 
-use derived_deref::{Deref, DerefMut};
+use derive_deref::{Deref, DerefMut};
 
 const BLK: &str = "blk";
 const DAT: &str = ".dat";
diff --git a/biter/src/blk_index_to_blk_recap.rs b/iterator/src/blk_index_to_blk_recap.rs
similarity index 80%
rename from biter/src/blk_index_to_blk_recap.rs
rename to iterator/src/blk_index_to_blk_recap.rs
index b819448a6..f080b6d54 100644
--- a/biter/src/blk_index_to_blk_recap.rs
+++ b/iterator/src/blk_index_to_blk_recap.rs
@@ -6,16 +6,13 @@ use std::{
     path::{Path, PathBuf},
 };
 
-use derived_deref::{Deref, DerefMut};
-
 use crate::{blk_recap::BlkRecap, BlkIndexToBlkPath, BlkMetadataAndBlock};
 
 const TARGET_BLOCKS_PER_MONTH: usize = 144 * 30;
 
-#[derive(Deref, DerefMut, Debug)]
+#[derive(Debug)]
 pub struct BlkIndexToBlkRecap {
     path: PathBuf,
-    #[target]
     tree: BTreeMap<usize, BlkRecap>,
     last_safe_height: Option<usize>,
 }
@@ -47,37 +44,38 @@ impl BlkIndexToBlkRecap {
     }
 
     pub fn clean_outdated(&mut self, blocks_dir: &BlkIndexToBlkPath) {
-        let mut unprocessed_keys = self.keys().copied().collect::<BTreeSet<_>>();
+        let mut unprocessed_keys = self.tree.keys().copied().collect::<BTreeSet<_>>();
 
         blocks_dir.iter().for_each(|(blk_index, blk_path)| {
             unprocessed_keys.remove(blk_index);
-            if let Some(blk_recap) = self.get(blk_index) {
+            if let Some(blk_recap) = self.tree.get(blk_index) {
                 if blk_recap.has_different_modified_time(blk_path) {
-                    self.remove(blk_index);
+                    self.tree.remove(blk_index);
                 }
             }
         });
 
         unprocessed_keys.into_iter().for_each(|blk_index| {
-            self.remove(&blk_index);
+            self.tree.remove(&blk_index);
         });
 
-        self.last_safe_height = self.iter().map(|(_, recap)| recap.height()).max();
+        self.last_safe_height = self.tree.values().map(|recap| recap.height()).max();
     }
 
     pub fn get_start_recap(&self, start: Option<usize>) -> Option<(usize, BlkRecap)> {
         if let Some(start) = start {
-            let (last_key, last_value) = self.last_key_value()?;
+            let (last_key, last_value) = self.tree.last_key_value()?;
 
             if last_value.height() < start {
                 return Some((*last_key, *last_value));
             } else if let Some((blk_index, _)) = self
+                .tree
                 .iter()
                 .find(|(_, blk_recap)| blk_recap.is_younger_than(start))
             {
                 if *blk_index != 0 {
                     let blk_index = *blk_index - 1;
-                    return Some((blk_index, *self.get(&blk_index).unwrap()));
+                    return Some((blk_index, *self.tree.get(&blk_index).unwrap()));
                 }
             }
         }
@@ -88,13 +86,14 @@ impl BlkIndexToBlkRecap {
     pub fn update(&mut self, blk_metadata_and_block: &BlkMetadataAndBlock, height: usize) {
         let blk_index = blk_metadata_and_block.blk_metadata.index;
 
-        if let Some(last_entry) = self.last_entry() {
+        if let Some(last_entry) = self.tree.last_entry() {
             match last_entry.key().cmp(&blk_index) {
                 Ordering::Greater => {
                     last_entry.remove_entry();
                 }
                 Ordering::Less => {
-                    self.insert(blk_index, BlkRecap::from(height, blk_metadata_and_block));
+                    self.tree
+                        .insert(blk_index, BlkRecap::from(height, blk_metadata_and_block));
                 }
                 Ordering::Equal => {}
             };
@@ -104,7 +103,8 @@ impl BlkIndexToBlkRecap {
                 unreachable!();
             }
 
-            self.insert(blk_index, BlkRecap::first(blk_metadata_and_block));
+            self.tree
+                .insert(blk_index, BlkRecap::first(blk_metadata_and_block));
         }
 
         if self
diff --git a/biter/src/blk_metadata.rs b/iterator/src/blk_metadata.rs
similarity index 100%
rename from biter/src/blk_metadata.rs
rename to iterator/src/blk_metadata.rs
diff --git a/biter/src/blk_metadata_and_block.rs b/iterator/src/blk_metadata_and_block.rs
similarity index 100%
rename from biter/src/blk_metadata_and_block.rs
rename to iterator/src/blk_metadata_and_block.rs
diff --git a/biter/src/blk_recap.rs b/iterator/src/blk_recap.rs
similarity index 100%
rename from biter/src/blk_recap.rs
rename to iterator/src/blk_recap.rs
diff --git a/biter/src/lib.rs b/iterator/src/lib.rs
similarity index 100%
rename from biter/src/lib.rs
rename to iterator/src/lib.rs
diff --git a/biter/src/main.rs b/iterator/src/main.rs
similarity index 100%
rename from biter/src/main.rs
rename to iterator/src/main.rs
diff --git a/biter/src/utils.rs b/iterator/src/utils.rs
similarity index 100%
rename from biter/src/utils.rs
rename to iterator/src/utils.rs
diff --git a/storable_vec/Cargo.toml b/storable_vec/Cargo.toml
index 2cb9ff888..61cb279ee 100644
--- a/storable_vec/Cargo.toml
+++ b/storable_vec/Cargo.toml
@@ -9,3 +9,4 @@ edition = "2021"
 
 [dependencies]
 memmap2 = "0.9.5"
+unsafe_slice_serde = { workspace = true }
diff --git a/storable_vec/src/lib.rs b/storable_vec/src/lib.rs
index ad5b5de24..9924c827a 100644
--- a/storable_vec/src/lib.rs
+++ b/storable_vec/src/lib.rs
@@ -7,10 +7,14 @@ use std::{
     mem,
     ops::{Deref, Range},
     path::{Path, PathBuf},
-    sync::OnceLock,
+    sync::{
+        // atomic::{AtomicUsize, Ordering as AtomicOrdering},
+        OnceLock,
+    },
 };
 
 use memmap2::{Mmap, MmapOptions};
+use unsafe_slice_serde::UnsafeSliceSerde;
 
 ///
 /// A very small, fast, efficient and simple storable Vec
@@ -33,6 +37,8 @@ pub struct StorableVec<I, T> {
     // updated: BTreeMap<usize, T>,
     // inserted: BTreeMap<usize, T>,
     // removed: BTreeSet<usize>,
+    // min: AtomicUsize,
+    // opened_mmaps: AtomicUsize,
     phantom: PhantomData<I>,
 }
 
@@ -66,6 +72,8 @@ where
             // inserted: BTreeMap::new(),
             // removed: BTreeSet::new(),
             phantom: PhantomData,
+            // min: AtomicUsize::new(usize::MAX),
+            // opened_mmaps: AtomicUsize::new(0),
         };
 
         this.reset_cache();
@@ -159,6 +167,12 @@ where
             .checked_sub(self.cache.len())
             .unwrap_or_default();
 
+        // let min_open_page = self.min.load(AtomicOrdering::SeqCst);
+
+        // if self.min.load(AtomicOrdering::SeqCst) {
+        //     self.min.set(value)
+        // }
+
         if page_index >= min_page_index {
             let mmap = &**self
                 .cache
@@ -178,16 +192,19 @@ where
 
             let slice = &mmap[range];
 
-            Ok(Some(Value::Ref(T::unsafe_try_from_slice(slice)?)))
+            Ok(Some(Value::Ref(
+                T::unsafe_try_from_slice(slice).map_err(Error::UnsafeSliceSerde)?,
+            )))
         } else {
-            let mut file = Self::open_file(&self.pathbuf).unwrap();
+            let mut file = Self::open_file(&self.pathbuf).map_err(Error::IO)?;
 
-            file.seek(SeekFrom::Start(byte_index as u64)).unwrap();
+            file.seek(SeekFrom::Start(byte_index as u64))
+                .map_err(Error::IO)?;
 
             let mut buf = vec![0; Self::SIZE_OF_T];
-            file.read_exact(&mut buf).unwrap();
+            file.read_exact(&mut buf).map_err(Error::IO)?;
 
-            let value = T::unsafe_try_from_slice(&buf[..])?;
+            let value = T::unsafe_try_from_slice(&buf[..]).map_err(Error::UnsafeSliceSerde)?;
 
             Ok(Some(Value::Owned(value.to_owned())))
         }
@@ -387,37 +404,13 @@ where
     }
 }
 
-pub trait UnsafeSizedSerDe
-where
-    Self: Sized,
-{
-    const SIZE: usize = size_of::<Self>();
-
-    fn unsafe_try_from_slice(slice: &[u8]) -> Result<&Self> {
-        let (prefix, shorts, suffix) = unsafe { slice.align_to::<Self>() };
-
-        if !prefix.is_empty() || shorts.len() != 1 || !suffix.is_empty() {
-            // dbg!(&slice, &prefix, &shorts, &suffix);
-            return Err(Error::FailedToAlignToSelf);
-        }
-
-        Ok(&shorts[0])
-    }
-
-    fn unsafe_as_slice(&self) -> &[u8] {
-        let data: *const Self = self;
-        let data: *const u8 = data as *const u8;
-        unsafe { std::slice::from_raw_parts(data, Self::SIZE) }
-    }
-}
-impl<T> UnsafeSizedSerDe for T {}
-
 pub type Result<T, E = Error> = std::result::Result<T, E>;
 
 #[derive(Debug)]
 pub enum Error {
     MmapsVecIsTooSmall,
-    FailedToAlignToSelf,
+    IO(io::Error),
+    UnsafeSliceSerde(unsafe_slice_serde::Error),
     IndexTooHigh,
     ExpectFileToHaveIndex,
     ExpectVecToHaveIndex,
@@ -427,7 +420,8 @@ impl fmt::Display for Error {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         match self {
             Error::MmapsVecIsTooSmall => write!(f, "Mmaps vec is too small"),
-            Error::FailedToAlignToSelf => write!(f, "Failed to align_to for T"),
+            Error::IO(error) => Debug::fmt(&error, f),
+            Error::UnsafeSliceSerde(error) => Debug::fmt(&error, f),
             Error::IndexTooHigh => write!(f, "Index too high"),
             Error::ExpectFileToHaveIndex => write!(f, "Expect file to have index"),
             Error::ExpectVecToHaveIndex => write!(f, "Expect vec to have index"),
diff --git a/struct_iterable/struct_iterable_derive/Cargo.toml b/struct_iterable/struct_iterable_derive/Cargo.toml
index 95d4be924..c47efa491 100644
--- a/struct_iterable/struct_iterable_derive/Cargo.toml
+++ b/struct_iterable/struct_iterable_derive/Cargo.toml
@@ -11,7 +11,7 @@ proc-macro = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-syn = "2.0.85"
-quote = "1.0.37"
-proc-macro2 = "1.0.89"
+syn = "2.0.96"
+quote = "1.0.38"
+proc-macro2 = "1.0.93"
 struct_iterable_internal = { path = "../struct_iterable_internal" }
diff --git a/unsafe_slice_serde/Cargo.toml b/unsafe_slice_serde/Cargo.toml
new file mode 100644
index 000000000..60a15b1ff
--- /dev/null
+++ b/unsafe_slice_serde/Cargo.toml
@@ -0,0 +1,3 @@
+[package]
+name = "unsafe_slice_serde"
+version = "0.1.0"
diff --git a/unsafe_slice_serde/src/lib.rs b/unsafe_slice_serde/src/lib.rs
new file mode 100644
index 000000000..02f7b5fb8
--- /dev/null
+++ b/unsafe_slice_serde/src/lib.rs
@@ -0,0 +1,42 @@
+use std::{fmt, slice};
+
+pub trait UnsafeSliceSerde
+where
+    Self: Sized,
+{
+    const SIZE: usize = size_of::<Self>();
+
+    fn unsafe_try_from_slice(slice: &[u8]) -> Result<&Self> {
+        let (prefix, shorts, suffix) = unsafe { slice.align_to::<Self>() };
+
+        if !prefix.is_empty() || shorts.len() != 1 || !suffix.is_empty() {
+            // dbg!(&slice, &prefix, &shorts, &suffix);
+            return Err(Error::FailedToAlignToSelf);
+        }
+
+        Ok(&shorts[0])
+    }
+
+    fn unsafe_as_slice(&self) -> &[u8] {
+        let data: *const Self = self;
+        let data: *const u8 = data as *const u8;
+        unsafe { slice::from_raw_parts(data, Self::SIZE) }
+    }
+}
+impl<T> UnsafeSliceSerde for T {}
+
+pub type Result<T, E = Error> = std::result::Result<T, E>;
+
+#[derive(Debug)]
+pub enum Error {
+    FailedToAlignToSelf,
+}
+impl fmt::Display for Error {
+    // This trait requires `fmt` with this exact signature.
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        match self {
+            Error::FailedToAlignToSelf => write!(f, "Failed to align_to for T"),
+        }
+    }
+}
+impl std::error::Error for Error {}

From ad34d9d40205280aa8744357c49b56f90196149e Mon Sep 17 00:00:00 2001
From: nym21 <expat-epochs0i@icloud.com>
Date: Fri, 31 Jan 2025 11:43:14 +0100
Subject: [PATCH 34/63] bomputer: init

---
 .gitignore                                    |   5 +-
 CHANGELOG.md                                  |  16 ++--
 Cargo.lock                                    |   3 +
 Cargo.toml                                    |   1 +
 README.md                                     |   6 +-
 {assets => _assets}/dove-orange.svg           |   0
 {assets => _assets}/dove-white.svg            |   0
 {assets => _assets}/logo-dove-dark.svg        |   0
 {assets => _assets}/logo-dove-light.svg       |   0
 {assets => _assets}/logo-dove-orange.svg      |   0
 {assets => _assets}/logo-full-dark.svg        |   0
 {assets => _assets}/logo-full-light.svg       |   0
 {assets => _assets}/logo-icon.svg             |   0
 {assets => _assets}/logo-long-text-dark.svg   |   0
 {assets => _assets}/logo-long-text-light.svg  |   0
 {assets => _assets}/logo-short-text-dark.svg  |   0
 {assets => _assets}/logo-short-text-light.svg |   0
 {assets => _assets}/logo-stamp-orange.svg     |   0
 {assets => _assets}/logo-stamp.svg            |   0
 {assets => _assets}/v0.0.X.jpg                | Bin
 {assets => _assets}/v0.1.0.jpg                | Bin
 {assets => _assets}/v0.1.1.jpg                | Bin
 {assets => _assets}/v0.2.0.jpg                | Bin
 {assets => _assets}/v0.3.0.jpg                | Bin
 {assets => _assets}/v0.4.0.jpg                | Bin
 {assets => _assets}/v0.5.0.jpg                | Bin
 {docker => _docker}/Dockerfile                |   0
 {docker => _docker}/build.sh                  |   0
 {docker => _docker}/cmd.sh                    |   0
 {docker => _docker}/run.sh                    |   0
 computer/Cargo.toml                           |   5 +-
 computer/src/lib.rs                           |  73 +++++++++++-----
 computer/src/main.rs                          |  29 +++++--
 computer/src/storage/fjalls.rs                |  22 +++++
 computer/src/storage/mod.rs                   |   5 ++
 computer/src/storage/storable_vecs/base.rs    |  74 ++++++++++++++++
 computer/src/storage/storable_vecs/mod.rs     |  77 +++++++++++++++++
 .../src/structs/addressindextxoutindex.rs     |  21 +++++
 computer/src/structs/date.rs                  |   2 +-
 computer/src/structs/mod.rs                   |   4 +
 computer/src/structs/unit.rs                  |  13 +++
 indexer/.gitignore                            |   2 -
 indexer/Cargo.toml                            |   2 +-
 indexer/src/lib.rs                            |  58 +++++++------
 indexer/src/main.rs                           |   2 +-
 indexer/src/storage/fjalls/base.rs            |  13 +--
 indexer/src/storage/fjalls/meta.rs            |   7 +-
 indexer/src/storage/fjalls/mod.rs             |  23 ++---
 indexer/src/storage/storable_vecs/base.rs     |   7 +-
 indexer/src/storage/storable_vecs/mod.rs      |  31 ++-----
 indexer/src/structs/addressindex.rs           |   9 +-
 indexer/src/structs/addresstypeindex.rs       |   2 -
 indexer/src/structs/amount.rs                 |   2 -
 indexer/src/structs/compressed.rs             |  29 +++----
 indexer/src/structs/height.rs                 |   9 +-
 indexer/src/structs/timestamp.rs              |   2 +-
 indexer/src/structs/txindex.rs                |   9 +-
 indexer/src/structs/txinindex.rs              |   2 -
 indexer/src/structs/txoutindex.rs             |   2 -
 indexer/src/structs/version.rs                |   7 +-
 iterator/src/blk_index_to_blk_recap.rs        |  25 +++---
 iterator/src/lib.rs                           |  39 ++-------
 iterator/src/main.rs                          |   4 +-
 run.sh                                        |  25 ------
 indexer/rustfmt.toml => rustfmt.toml          |   0
 storable_vec/src/lib.rs                       |  79 +++++++++++++-----
 unsafe_slice_serde/Cargo.toml                 |   1 +
 67 files changed, 498 insertions(+), 249 deletions(-)
 rename {assets => _assets}/dove-orange.svg (100%)
 rename {assets => _assets}/dove-white.svg (100%)
 rename {assets => _assets}/logo-dove-dark.svg (100%)
 rename {assets => _assets}/logo-dove-light.svg (100%)
 rename {assets => _assets}/logo-dove-orange.svg (100%)
 rename {assets => _assets}/logo-full-dark.svg (100%)
 rename {assets => _assets}/logo-full-light.svg (100%)
 rename {assets => _assets}/logo-icon.svg (100%)
 rename {assets => _assets}/logo-long-text-dark.svg (100%)
 rename {assets => _assets}/logo-long-text-light.svg (100%)
 rename {assets => _assets}/logo-short-text-dark.svg (100%)
 rename {assets => _assets}/logo-short-text-light.svg (100%)
 rename {assets => _assets}/logo-stamp-orange.svg (100%)
 rename {assets => _assets}/logo-stamp.svg (100%)
 rename {assets => _assets}/v0.0.X.jpg (100%)
 rename {assets => _assets}/v0.1.0.jpg (100%)
 rename {assets => _assets}/v0.1.1.jpg (100%)
 rename {assets => _assets}/v0.2.0.jpg (100%)
 rename {assets => _assets}/v0.3.0.jpg (100%)
 rename {assets => _assets}/v0.4.0.jpg (100%)
 rename {assets => _assets}/v0.5.0.jpg (100%)
 rename {docker => _docker}/Dockerfile (100%)
 rename {docker => _docker}/build.sh (100%)
 rename {docker => _docker}/cmd.sh (100%)
 rename {docker => _docker}/run.sh (100%)
 create mode 100644 computer/src/storage/fjalls.rs
 create mode 100644 computer/src/storage/mod.rs
 create mode 100644 computer/src/storage/storable_vecs/base.rs
 create mode 100644 computer/src/storage/storable_vecs/mod.rs
 create mode 100644 computer/src/structs/addressindextxoutindex.rs
 create mode 100644 computer/src/structs/unit.rs
 delete mode 100644 indexer/.gitignore
 delete mode 100755 run.sh
 rename indexer/rustfmt.toml => rustfmt.toml (100%)

diff --git a/.gitignore b/.gitignore
index 7df94636e..86d71e5f0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,7 +8,7 @@ target
 *\ copy*
 
 # Ignored
-ignore
+_ignore
 
 # Editors
 .vscode
@@ -29,3 +29,6 @@ docker/kibo
 
 # Types
 paths.d.ts
+
+# Outputs
+_outputs
diff --git a/CHANGELOG.md b/CHANGELOG.md
index cc13603fc..501136c6b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 <!--
 # v0.X.Y | WIP
-![Image of the kibō Web App version 0.X.Y](https://github.com/kibo-money/kibo/blob/main/assets/v0.X.Y.jpg)
+![Image of the kibō Web App version 0.X.Y](https://github.com/kibo-money/kibo/blob/main/_assets/v0.X.Y.jpg)
 -->
 
 # v0.6.0 | WIP
@@ -33,7 +33,7 @@ Added git tags for each version though Markdown won't display formatted on Githu
 
 # [v0.5.0](https://github.com/kibo-money/kibo/tree/eea56d394bf92c62c81da8b78b8c47ea730683f5) | [873199](https://mempool.space/block/0000000000000000000270925aa6a565be92e13164565a3f7994ca1966e48050) - 2024/12/04
 
-![Image of the kibō Web App version 0.5.0](https://github.com/kibo-money/kibo/blob/main/assets/v0.5.0.jpg)
+![Image of the kibō Web App version 0.5.0](https://github.com/kibo-money/kibo/blob/main/_assets/v0.5.0.jpg)
 
 ## Datasets
 
@@ -100,7 +100,7 @@ Added git tags for each version though Markdown won't display formatted on Githu
 
 # [v0.4.0](https://github.com/kibo-money/kibo/tree/a64c544815d9ef785e2fc1323582f774f16b9200) | [861950](https://mempool.space/block/00000000000000000000530d0e30ccf7deeace122dcc99f2668a06c6dad83629) - 2024/09/19
 
-![Image of the kibō Web App version 0.4.0](https://github.com/kibo-money/kibo/blob/main/assets/v0.4.0.jpg)
+![Image of the kibō Web App version 0.4.0](https://github.com/kibo-money/kibo/blob/main/_assets/v0.4.0.jpg)
 
 ## Brand
 
@@ -137,7 +137,7 @@ Added git tags for each version though Markdown won't display formatted on Githu
 
 # [v0.3.0](https://github.com/kibo-money/kibo/tree/b68b016091c45b071218fba01bac5b76e8eaf18c) | [853930](https://mempool.space/block/00000000000000000002eb5e9a7950ca2d5d98bd1ed28fc9098aa630d417985d) - 2024/07/26
 
-![Image of the Satonomics Web App version 0.3.0](https://github.com/kibo-money/kibo/blob/main/assets/v0.3.0.jpg)
+![Image of the Satonomics Web App version 0.3.0](https://github.com/kibo-money/kibo/blob/main/_assets/v0.3.0.jpg)
 
 ## Parser
 
@@ -216,7 +216,7 @@ Added git tags for each version though Markdown won't display formatted on Githu
 
 # [v0.2.0](https://github.com/kibo-money/kibo/tree/248187889283597c5dbb806292297453c25e97b8) | [851286](https://mempool.space/block/0000000000000000000281ca7f1bf8c50702bfca168c7af1bdc67c977c1ac8ed) - 2024/07/08
 
-![Image of the Satonomics Web App version 0.2.0](https://github.com/kibo-money/kibo/blob/main/assets/v0.2.0.jpg)
+![Image of the Satonomics Web App version 0.2.0](https://github.com/kibo-money/kibo/blob/main/_assets/v0.2.0.jpg)
 
 ## App
 
@@ -252,7 +252,7 @@ Added git tags for each version though Markdown won't display formatted on Githu
 
 # [v0.1.1](https://github.com/kibo-money/kibo/tree/e55b5195a9de9aea306903c94ed63cb1720fda5f) | [849240](https://mempool.space/block/000000000000000000002b8653988655071c07bb5f7181c038f9326bc86db741) - 2024/06/24
 
-![Image of the Satonomics Web App version 0.1.1](https://github.com/kibo-money/kibo/blob/main/assets/v0.1.1.jpg)
+![Image of the Satonomics Web App version 0.1.1](https://github.com/kibo-money/kibo/blob/main/_assets/v0.1.1.jpg)
 
 ## Parser
 
@@ -302,8 +302,8 @@ Added git tags for each version though Markdown won't display formatted on Githu
 
 # [v0.1.0](https://github.com/kibo-money/kibo/tree/a1a576d088c8f83ed32d48753a7611f70a964574) | [848642](https://mempool.space/block/000000000000000000020be5761d70751252219a9557f55e91ecdfb86c4e026a) - 2024/06/19
 
-![Image of the Satonomics Web App version 0.1.0](https://github.com/kibo-money/kibo/blob/main/assets/v0.1.0.jpg)
+![Image of the Satonomics Web App version 0.1.0](https://github.com/kibo-money/kibo/blob/main/_assets/v0.1.0.jpg)
 
 # v0.0.1 | [835444](https://mempool.space/block/000000000000000000009f93907a0dd83c080d5585cc7ec82c076d45f6d7c872) - 2024/03/20
 
-![Image of the Satonomics Web App version 0.0.X](https://github.com/kibo-money/kibo/blob/main/assets/v0.0.X.jpg)
+![Image of the Satonomics Web App version 0.0.X](https://github.com/kibo-money/kibo/blob/main/_assets/v0.0.X.jpg)
diff --git a/Cargo.lock b/Cargo.lock
index 55cedc130..af827c497 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -215,8 +215,11 @@ dependencies = [
  "color-eyre",
  "derive_deref",
  "exit",
+ "fjall",
  "jiff",
  "rayon",
+ "storable_vec",
+ "unsafe_slice_serde",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index daf8e4a05..947468aa0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -18,6 +18,7 @@ bomputer = { path = "computer" }
 color-eyre = "0.6.3"
 derive_deref = "1.1.1"
 exit = { path = "exit" }
+fjall = "2.5.0"
 jiff = "0.1.28"
 rayon = "1.10.0"
 storable_vec = { path = "storable_vec" }
diff --git a/README.md b/README.md
index b7cfd1067..900f36fa9 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
 <a href="https://kibo.money" target="_blank">
   <picture>
-    <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/kibo-money/kibo/main/assets/logo-long-text-dark.svg">
-    <source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/kibo-money/kibo/main/assets/logo-long-text-light.svg">
-    <img alt="kibō" src="https://raw.githubusercontent.com/kibo-money/kibo/main/assets/logo-long-text-light.svg" width="210" height="auto">
+    <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/kibo-money/kibo/main/_assets/logo-long-text-dark.svg">
+    <source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/kibo-money/kibo/main/_assets/logo-long-text-light.svg">
+    <img alt="kibō" src="https://raw.githubusercontent.com/kibo-money/kibo/main/_assets/logo-long-text-light.svg" width="210" height="auto">
   </picture>
 </a>
 
diff --git a/assets/dove-orange.svg b/_assets/dove-orange.svg
similarity index 100%
rename from assets/dove-orange.svg
rename to _assets/dove-orange.svg
diff --git a/assets/dove-white.svg b/_assets/dove-white.svg
similarity index 100%
rename from assets/dove-white.svg
rename to _assets/dove-white.svg
diff --git a/assets/logo-dove-dark.svg b/_assets/logo-dove-dark.svg
similarity index 100%
rename from assets/logo-dove-dark.svg
rename to _assets/logo-dove-dark.svg
diff --git a/assets/logo-dove-light.svg b/_assets/logo-dove-light.svg
similarity index 100%
rename from assets/logo-dove-light.svg
rename to _assets/logo-dove-light.svg
diff --git a/assets/logo-dove-orange.svg b/_assets/logo-dove-orange.svg
similarity index 100%
rename from assets/logo-dove-orange.svg
rename to _assets/logo-dove-orange.svg
diff --git a/assets/logo-full-dark.svg b/_assets/logo-full-dark.svg
similarity index 100%
rename from assets/logo-full-dark.svg
rename to _assets/logo-full-dark.svg
diff --git a/assets/logo-full-light.svg b/_assets/logo-full-light.svg
similarity index 100%
rename from assets/logo-full-light.svg
rename to _assets/logo-full-light.svg
diff --git a/assets/logo-icon.svg b/_assets/logo-icon.svg
similarity index 100%
rename from assets/logo-icon.svg
rename to _assets/logo-icon.svg
diff --git a/assets/logo-long-text-dark.svg b/_assets/logo-long-text-dark.svg
similarity index 100%
rename from assets/logo-long-text-dark.svg
rename to _assets/logo-long-text-dark.svg
diff --git a/assets/logo-long-text-light.svg b/_assets/logo-long-text-light.svg
similarity index 100%
rename from assets/logo-long-text-light.svg
rename to _assets/logo-long-text-light.svg
diff --git a/assets/logo-short-text-dark.svg b/_assets/logo-short-text-dark.svg
similarity index 100%
rename from assets/logo-short-text-dark.svg
rename to _assets/logo-short-text-dark.svg
diff --git a/assets/logo-short-text-light.svg b/_assets/logo-short-text-light.svg
similarity index 100%
rename from assets/logo-short-text-light.svg
rename to _assets/logo-short-text-light.svg
diff --git a/assets/logo-stamp-orange.svg b/_assets/logo-stamp-orange.svg
similarity index 100%
rename from assets/logo-stamp-orange.svg
rename to _assets/logo-stamp-orange.svg
diff --git a/assets/logo-stamp.svg b/_assets/logo-stamp.svg
similarity index 100%
rename from assets/logo-stamp.svg
rename to _assets/logo-stamp.svg
diff --git a/assets/v0.0.X.jpg b/_assets/v0.0.X.jpg
similarity index 100%
rename from assets/v0.0.X.jpg
rename to _assets/v0.0.X.jpg
diff --git a/assets/v0.1.0.jpg b/_assets/v0.1.0.jpg
similarity index 100%
rename from assets/v0.1.0.jpg
rename to _assets/v0.1.0.jpg
diff --git a/assets/v0.1.1.jpg b/_assets/v0.1.1.jpg
similarity index 100%
rename from assets/v0.1.1.jpg
rename to _assets/v0.1.1.jpg
diff --git a/assets/v0.2.0.jpg b/_assets/v0.2.0.jpg
similarity index 100%
rename from assets/v0.2.0.jpg
rename to _assets/v0.2.0.jpg
diff --git a/assets/v0.3.0.jpg b/_assets/v0.3.0.jpg
similarity index 100%
rename from assets/v0.3.0.jpg
rename to _assets/v0.3.0.jpg
diff --git a/assets/v0.4.0.jpg b/_assets/v0.4.0.jpg
similarity index 100%
rename from assets/v0.4.0.jpg
rename to _assets/v0.4.0.jpg
diff --git a/assets/v0.5.0.jpg b/_assets/v0.5.0.jpg
similarity index 100%
rename from assets/v0.5.0.jpg
rename to _assets/v0.5.0.jpg
diff --git a/docker/Dockerfile b/_docker/Dockerfile
similarity index 100%
rename from docker/Dockerfile
rename to _docker/Dockerfile
diff --git a/docker/build.sh b/_docker/build.sh
similarity index 100%
rename from docker/build.sh
rename to _docker/build.sh
diff --git a/docker/cmd.sh b/_docker/cmd.sh
similarity index 100%
rename from docker/cmd.sh
rename to _docker/cmd.sh
diff --git a/docker/run.sh b/_docker/run.sh
similarity index 100%
rename from docker/run.sh
rename to _docker/run.sh
diff --git a/computer/Cargo.toml b/computer/Cargo.toml
index a8f285300..4ea89fad8 100644
--- a/computer/Cargo.toml
+++ b/computer/Cargo.toml
@@ -4,10 +4,13 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-biter = { workspace = true }
 bindex = { workspace = true }
+biter = { workspace = true }
 color-eyre = { workspace = true }
 derive_deref = { workspace = true }
 exit = { workspace = true }
+fjall = { workspace = true }
 jiff = { workspace = true }
 rayon = { workspace = true }
+storable_vec = { workspace = true }
+unsafe_slice_serde = { workspace = true }
diff --git a/computer/src/lib.rs b/computer/src/lib.rs
index ad59cc0b5..c59dbed44 100644
--- a/computer/src/lib.rs
+++ b/computer/src/lib.rs
@@ -1,36 +1,71 @@
-use std::path::Path;
+use std::path::{Path, PathBuf};
 
-use bindex::Indexer;
+use bindex::{Height, Indexer};
 use biter::rpc;
 use exit::Exit;
 
+mod storage;
 mod structs;
 
+use storage::{Fjalls, StorableVecs};
 use structs::*;
 
-pub struct Bomputer;
-
-impl Bomputer {
-    pub fn compute() {}
+pub struct Computer {
+    outputs_dir: PathBuf,
+    vecs: StorableVecs,
+    trees: Fjalls,
 }
 
-pub fn main() -> color_eyre::Result<()> {
-    color_eyre::install()?;
+impl Computer {
+    pub fn import(outputs_dir: &Path) -> color_eyre::Result<Self> {
+        let outputs_dir = outputs_dir.to_owned();
+        let computed_dir = outputs_dir.join("computed");
+        let vecs = StorableVecs::import(&computed_dir.join("vecs"))?;
+        let trees = Fjalls::import(&computed_dir.join("fjall"))?;
+        Ok(Self {
+            outputs_dir,
+            vecs,
+            trees,
+        })
+    }
 
-    let data_dir = Path::new("../../bitcoin");
-    let rpc = rpc::Client::new(
-        "http://localhost:8332",
-        rpc::Auth::CookieFile(Path::new(data_dir).join(".cookie")),
-    )?;
-    let exit = Exit::new();
+    pub fn compute(&mut self, bitcoin_dir: &Path, rpc: rpc::Client, exit: &Exit) -> color_eyre::Result<()> {
+        let mut indexer = Indexer::import(&self.outputs_dir.join("indexes"))?;
 
-    let i = std::time::Instant::now();
+        if false {
+            indexer.index(bitcoin_dir, rpc, exit)?;
+        }
 
-    let mut indexer = Indexer::import(Path::new("indexes"))?;
+        // TODO: Remove all outdated
 
-    indexer.index(data_dir, rpc, &exit)?;
+        // Compute txindex to X
 
-    dbg!(i.elapsed());
+        // Compute height to X
+        indexer
+            .vecs()
+            .height_to_timestamp
+            .read_from_(self.vecs.height_to_date.len(), |(_height, timestamp)| {
+                self.vecs
+                    .height_to_date
+                    .push_if_needed(Height::from(_height), Date::from(timestamp))
+            })?;
+        self.vecs
+            .height_to_date
+            .read_from_(self.vecs.date_to_first_height.len(), |(_height, date)| {
+                self.vecs
+                    .date_to_first_height
+                    .push_if_needed(*date, Height::from(_height))
+            })?;
 
-    Ok(())
+        // Compute date to X
+        // ...
+
+        // Compute month to X
+        // ...
+
+        // Compute year to X
+        // ...
+
+        Ok(())
+    }
 }
diff --git a/computer/src/main.rs b/computer/src/main.rs
index 164fa7fa1..92623c1ed 100644
--- a/computer/src/main.rs
+++ b/computer/src/main.rs
@@ -1,13 +1,28 @@
-use structs::Date;
+use std::path::Path;
+
+use biter::rpc;
+use bomputer::Computer;
+use exit::Exit;
 
 mod structs;
 
 pub fn main() -> color_eyre::Result<()> {
-    let date1 = Date::from(jiff::civil::Date::constant(2009, 1, 9));
-    let date2 = Date::from(jiff::civil::Date::constant(2009, 1, 31));
-    let date3 = Date::from(jiff::civil::Date::constant(2019, 1, 9));
-    dbg!(usize::try_from(date1))?;
-    dbg!(usize::try_from(date2))?;
-    dbg!(usize::try_from(date3))?;
+    color_eyre::install()?;
+
+    let data_dir = Path::new("../../bitcoin");
+    let rpc = rpc::Client::new(
+        "http://localhost:8332",
+        rpc::Auth::CookieFile(Path::new(data_dir).join(".cookie")),
+    )?;
+    let exit = Exit::new();
+
+    let i = std::time::Instant::now();
+
+    let mut computer = Computer::import(Path::new("../_outputs"))?;
+
+    computer.compute(data_dir, rpc, &exit)?;
+
+    dbg!(i.elapsed());
+
     Ok(())
 }
diff --git a/computer/src/storage/fjalls.rs b/computer/src/storage/fjalls.rs
new file mode 100644
index 000000000..d4a5c6d34
--- /dev/null
+++ b/computer/src/storage/fjalls.rs
@@ -0,0 +1,22 @@
+use std::path::Path;
+
+use bindex::{Store, Version};
+
+use crate::structs::{AddressindexTxoutindex, Unit};
+
+pub struct Fjalls {
+    pub address_txoutindex_in: Store<AddressindexTxoutindex, Unit>,
+    pub address_txoutindex_out: Store<AddressindexTxoutindex, Unit>,
+}
+
+impl Fjalls {
+    pub fn import(path: &Path) -> color_eyre::Result<Self> {
+        let address_txoutindex_in = Store::import(&path.join("address_txoutindex_in"), Version::from(1))?;
+        let address_txoutindex_out = Store::import(&path.join("address_txoutindex_out"), Version::from(1))?;
+
+        Ok(Self {
+            address_txoutindex_in,
+            address_txoutindex_out,
+        })
+    }
+}
diff --git a/computer/src/storage/mod.rs b/computer/src/storage/mod.rs
new file mode 100644
index 000000000..15d757c6a
--- /dev/null
+++ b/computer/src/storage/mod.rs
@@ -0,0 +1,5 @@
+mod fjalls;
+mod storable_vecs;
+
+pub use fjalls::*;
+pub use storable_vecs::*;
diff --git a/computer/src/storage/storable_vecs/base.rs b/computer/src/storage/storable_vecs/base.rs
new file mode 100644
index 000000000..04e86f108
--- /dev/null
+++ b/computer/src/storage/storable_vecs/base.rs
@@ -0,0 +1,74 @@
+use std::{
+    fmt::Debug,
+    io,
+    ops::{Deref, DerefMut},
+    path::Path,
+};
+
+use bindex::{Indexer, Version};
+
+use crate::Computer;
+
+pub struct StorableVec<I, T> {
+    vec: bindex::StorableVec<I, T>,
+    f: Box<dyn Fn(&Indexer, &Computer) -> storable_vec::Result<Vec<(I, T)>>>,
+}
+
+impl<I, T> StorableVec<I, T>
+where
+    I: TryInto<usize>,
+    T: Sized + Debug + Clone,
+{
+    pub fn import<F>(path: &Path, version: Version, f: F) -> io::Result<Self>
+    where
+        F: Fn(&Indexer, &Computer) -> storable_vec::Result<Vec<(I, T)>> + 'static,
+    {
+        let vec = bindex::StorableVec::import(path, version)?;
+
+        Ok(Self { vec, f: Box::new(f) })
+    }
+
+    pub fn compute(&mut self, indexer: &Indexer, computer: &Computer) -> storable_vec::Result<()> {
+        (self.f)(indexer, computer)?
+            .into_iter()
+            .try_for_each(|(i, v)| self.push_if_needed(i, v))
+    }
+
+    // pub fn fill(&mut self) {
+    //     self
+    //         .vecs()
+    //         .height_to_timestamp
+    //         .read_iter(move |(_height, timestamp)| {
+    //             let height = Height::from(_height);
+    //             let date = Date::from(timestamp);
+    //             self.vecs.date_to_first_height.push_if_needed(date, height)?;
+    //             Ok(())
+    //         })?;
+    // }
+}
+
+impl<I, T> Deref for StorableVec<I, T> {
+    type Target = bindex::StorableVec<I, T>;
+    fn deref(&self) -> &Self::Target {
+        &self.vec
+    }
+}
+impl<I, T> DerefMut for StorableVec<I, T> {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        &mut self.vec
+    }
+}
+
+pub trait AnyComputedStorableVec {
+    fn compute(&mut self, indexer: &Indexer, computer: &Computer) -> storable_vec::Result<()>;
+}
+
+impl<I, T> AnyComputedStorableVec for StorableVec<I, T>
+where
+    I: TryInto<usize>,
+    T: Sized + Debug + Clone,
+{
+    fn compute(&mut self, indexer: &Indexer, computer: &Computer) -> storable_vec::Result<()> {
+        self.compute(indexer, computer)
+    }
+}
diff --git a/computer/src/storage/storable_vecs/mod.rs b/computer/src/storage/storable_vecs/mod.rs
new file mode 100644
index 000000000..27cf5a856
--- /dev/null
+++ b/computer/src/storage/storable_vecs/mod.rs
@@ -0,0 +1,77 @@
+use std::{fs, path::Path};
+
+use bindex::{Addressindex, Amount, Height, StorableVec, Timestamp, Txindex, Txinindex, Txoutindex, Version};
+
+use crate::structs::{Date, Feerate};
+
+// mod base;
+
+// use base::*;
+
+pub struct StorableVecs {
+    pub date_to_first_height: StorableVec<Date, Height>,
+    // pub height_to_block_interval: StorableVec<Height, Timestamp>,
+    pub height_to_date: StorableVec<Height, Date>,
+    // pub height_to_fee: StorableVec<Txindex, Amount>,
+    // pub height_to_inputcount: StorableVec<Txindex, u32>,
+    // pub height_to_last_addressindex: StorableVec<Height, Addressindex>,
+    // pub height_to_last_txindex: StorableVec<Height, Txindex>,
+    // pub height_to_last_txoutindex: StorableVec<Height, Txoutindex>,
+    // pub height_to_maxfeerate: StorableVec<Txindex, Feerate>,
+    // pub height_to_medianfeerate: StorableVec<Txindex, Feerate>,
+    // pub height_to_minfeerate: StorableVec<Txindex, Feerate>,
+    // pub height_to_outputcount: StorableVec<Txindex, u32>,
+    // pub height_to_subsidy: StorableVec<Txindex, u32>,
+    // pub height_to_totalfees: StorableVec<Height, Amount>,
+    // pub height_to_txcount: StorableVec<Txindex, u32>,
+    pub txindex_to_fee: StorableVec<Txindex, Amount>,
+    // pub txindex_to_feerate: StorableVec<Txindex, Feerate>,
+    pub txindex_to_inputcount: StorableVec<Txindex, u32>,
+    pub txindex_to_last_txinindex: StorableVec<Txindex, Txinindex>,
+    pub txindex_to_last_txoutindex: StorableVec<Txindex, Txoutindex>,
+    pub txindex_to_outputcount: StorableVec<Txindex, u32>,
+}
+
+impl StorableVecs {
+    pub fn import(path: &Path) -> color_eyre::Result<Self> {
+        fs::create_dir_all(path)?;
+
+        Ok(Self {
+            date_to_first_height: StorableVec::import(&path.join("date_to_first_height"), Version::from(1))?,
+            // height_to_block_interval: StorableVec::import(&path.join("height_to_block_interval"), Version::from(1))?,
+            height_to_date: StorableVec::import(&path.join("height_to_date"), Version::from(1))?,
+            // height_to_fee: StorableVec::import(&path.join("height_to_fee"), Version::from(1))?,
+            // height_to_inputcount: StorableVec::import(&path.join("height_to_inputcount"), Version::from(1))?,
+            // height_to_last_addressindex: StorableVec::import(
+            //     &path.join("height_to_last_addressindex"),
+            //     Version::from(1),
+            // )?,
+            // height_to_last_txindex: StorableVec::import(&path.join("height_to_last_txindex"), Version::from(1))?,
+            // height_to_last_txoutindex: StorableVec::import(&path.join("height_to_last_txoutindex"), Version::from(1))?,
+            // height_to_maxfeerate: StorableVec::import(&path.join("height_to_maxfeerate"), Version::from(1))?,
+            // height_to_medianfeerate: StorableVec::import(&path.join("height_to_medianfeerate"), Version::from(1))?,
+            // height_to_minfeerate: StorableVec::import(&path.join("height_to_minfeerate"), Version::from(1))?,
+            // height_to_outputcount: StorableVec::import(&path.join("height_to_outputcount"), Version::from(1))?,
+            // height_to_subsidy: StorableVec::import(&path.join("height_to_subsidy"), Version::from(1))?,
+            // height_to_totalfees: StorableVec::import(&path.join("height_to_totalfees"), Version::from(1))?,
+            // height_to_txcount: StorableVec::import(&path.join("height_to_txcount"), Version::from(1))?,
+            txindex_to_fee: StorableVec::import(&path.join("txindex_to_fee"), Version::from(1))?,
+            // txindex_to_feerate: StorableVec::import(&path.join("txindex_to_feerate"), Version::from(1))?,
+            txindex_to_inputcount: StorableVec::import(&path.join("txindex_to_inputcount"), Version::from(1))?,
+            txindex_to_last_txinindex: StorableVec::import(&path.join("txindex_to_last_txinindex"), Version::from(1))?,
+            txindex_to_last_txoutindex: StorableVec::import(
+                &path.join("txindex_to_last_txoutindex"),
+                Version::from(1),
+            )?,
+            txindex_to_outputcount: StorableVec::import(&path.join("txindex_to_outputcount"), Version::from(1))?,
+        })
+    }
+
+    // pub fn as_slice(&self) -> [&dyn AnyComputedStorableVec; 1] {
+    //     [&self.date_to_first_height]
+    // }
+
+    // pub fn as_mut_slice(&mut self) -> [&mut dyn AnyComputedStorableVec; 1] {
+    //     [&mut self.date_to_first_height]
+    // }
+}
diff --git a/computer/src/structs/addressindextxoutindex.rs b/computer/src/structs/addressindextxoutindex.rs
new file mode 100644
index 000000000..bc5ef32a2
--- /dev/null
+++ b/computer/src/structs/addressindextxoutindex.rs
@@ -0,0 +1,21 @@
+use bindex::{Addressindex, Txoutindex};
+use fjall::Slice;
+use unsafe_slice_serde::UnsafeSliceSerde;
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
+pub struct AddressindexTxoutindex {
+    addressindex: Addressindex,
+    txoutindex: Txoutindex,
+}
+
+impl TryFrom<Slice> for AddressindexTxoutindex {
+    type Error = unsafe_slice_serde::Error;
+    fn try_from(value: Slice) -> Result<Self, Self::Error> {
+        Ok(*Self::unsafe_try_from_slice(&value)?)
+    }
+}
+impl From<AddressindexTxoutindex> for Slice {
+    fn from(value: AddressindexTxoutindex) -> Self {
+        Self::new(value.unsafe_as_slice())
+    }
+}
diff --git a/computer/src/structs/date.rs b/computer/src/structs/date.rs
index c603135c1..dda76cdea 100644
--- a/computer/src/structs/date.rs
+++ b/computer/src/structs/date.rs
@@ -3,7 +3,7 @@ use color_eyre::eyre::eyre;
 use derive_deref::Deref;
 use jiff::{civil::Date as _Date, tz::TimeZone};
 
-#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Deref)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Deref)]
 pub struct Date(_Date);
 
 impl Date {
diff --git a/computer/src/structs/mod.rs b/computer/src/structs/mod.rs
index 9d48ff76d..b73b18519 100644
--- a/computer/src/structs/mod.rs
+++ b/computer/src/structs/mod.rs
@@ -1,5 +1,9 @@
+mod addressindextxoutindex;
 mod date;
 mod feerate;
+mod unit;
 
+pub use addressindextxoutindex::*;
 pub use date::*;
 pub use feerate::*;
+pub use unit::*;
diff --git a/computer/src/structs/unit.rs b/computer/src/structs/unit.rs
new file mode 100644
index 000000000..05b8bb0b8
--- /dev/null
+++ b/computer/src/structs/unit.rs
@@ -0,0 +1,13 @@
+use fjall::Slice;
+
+pub struct Unit();
+impl From<Slice> for Unit {
+    fn from(_: Slice) -> Self {
+        Self()
+    }
+}
+impl From<Unit> for Slice {
+    fn from(_: Unit) -> Self {
+        Self::new(&[])
+    }
+}
diff --git a/indexer/.gitignore b/indexer/.gitignore
deleted file mode 100644
index 752861df6..000000000
--- a/indexer/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/database
-/indexes
diff --git a/indexer/Cargo.toml b/indexer/Cargo.toml
index 6773c2618..4a07f4015 100644
--- a/indexer/Cargo.toml
+++ b/indexer/Cargo.toml
@@ -10,7 +10,7 @@ biter = { workspace = true }
 color-eyre = { workspace = true }
 derive_deref = { workspace = true }
 exit = { workspace = true }
-fjall = "2.5.0"
+fjall = { workspace = true }
 jiff = { workspace = true }
 rapidhash = "1.3.0"
 rayon = { workspace = true }
diff --git a/indexer/src/lib.rs b/indexer/src/lib.rs
index b286b2866..6ff495281 100644
--- a/indexer/src/lib.rs
+++ b/indexer/src/lib.rs
@@ -17,7 +17,8 @@ use rayon::prelude::*;
 mod storage;
 mod structs;
 
-pub use biter;
+pub use storage::{AnyStorableVec, StorableVec, Store, StoreMeta};
+pub use structs::Version;
 
 use storage::{Fjalls, StorableVecs};
 pub use structs::{
@@ -30,27 +31,34 @@ const SNAPSHOT_BLOCK_RANGE: usize = 1000;
 
 pub struct Indexer {
     vecs: StorableVecs,
-    parts: Fjalls,
+    trees: Fjalls,
 }
 
 impl Indexer {
     pub fn import(indexes_dir: &Path) -> color_eyre::Result<Self> {
-        Ok(Self {
-            vecs: StorableVecs::import(&indexes_dir.join("vecs"))?,
-            parts: Fjalls::import(&indexes_dir.join("fjall"))?,
-        })
+        let vecs = StorableVecs::import(&indexes_dir.join("vecs"))?;
+        let trees = Fjalls::import(&indexes_dir.join("fjall"))?;
+        Ok(Self { vecs, trees })
+    }
+
+    pub fn vecs(&self) -> &StorableVecs {
+        &self.vecs
+    }
+
+    pub fn trees(&self) -> &Fjalls {
+        &self.trees
     }
 
     pub fn index(&mut self, bitcoin_dir: &Path, rpc: rpc::Client, exit: &Exit) -> color_eyre::Result<()> {
         let check_collisions = true;
 
         let vecs = &mut self.vecs;
-        let parts = &mut self.parts;
+        let trees = &mut self.trees;
 
         let mut height = vecs
             .min_height()
             .unwrap_or_default()
-            .min(parts.min_height())
+            .min(trees.min_height())
             .and_then(|h| h.checked_sub(UNSAFE_BLOCKS))
             .map(Height::from)
             .unwrap_or_default();
@@ -72,14 +80,14 @@ impl Indexer {
         let mut p2wpkhindex_global = vecs.height_to_first_p2wpkhindex.get_or_default(height)?;
         let mut p2wshindex_global = vecs.height_to_first_p2wshindex.get_or_default(height)?;
 
-        let export = |parts: &mut Fjalls, vecs: &mut StorableVecs, height: Height| -> color_eyre::Result<()> {
+        let export = |trees: &mut Fjalls, vecs: &mut StorableVecs, height: Height| -> color_eyre::Result<()> {
             println!("Exporting...");
 
             exit.block();
 
             thread::scope(|scope| -> color_eyre::Result<()> {
                 let vecs_handle = scope.spawn(|| vecs.flush(height));
-                parts.commit(height)?;
+                trees.commit(height)?;
                 vecs_handle.join().unwrap()?;
                 Ok(())
             })?;
@@ -95,18 +103,17 @@ impl Indexer {
                 println!("Processing block {_height}...");
 
                 height = Height::from(_height);
-                let timestamp = Timestamp::try_from(block.header.time)?;
 
                 if let Some(saved_blockhash) = vecs.height_to_blockhash.get(height)? {
                     if &blockhash != saved_blockhash.as_ref() {
                         todo!("Rollback not implemented");
-                        // parts.rollback_from(&mut rtx, height, &exit)?;
+                        // trees.rollback_from(&mut rtx, height, &exit)?;
                     }
                 }
 
                 let blockhash_prefix = BlockHashPrefix::try_from(&blockhash)?;
 
-                if parts
+                if trees
                     .blockhash_prefix_to_height
                     .get(&blockhash_prefix)?
                     .is_some_and(|prev_height| *prev_height != height)
@@ -115,12 +122,13 @@ impl Indexer {
                     return Err(eyre!("Collision, expect prefix to need be set yet"));
                 }
 
-                parts
+                trees
                     .blockhash_prefix_to_height
                     .insert_if_needed(blockhash_prefix, height, height);
 
                 vecs.height_to_blockhash.push_if_needed(height, blockhash)?;
-                vecs.height_to_timestamp.push_if_needed(height, timestamp)?;
+                vecs.height_to_difficulty.push_if_needed(height, block.header.difficulty_float())?;
+                vecs.height_to_timestamp.push_if_needed(height, Timestamp::try_from(block.header.time)?)?;
                 vecs.height_to_size.push_if_needed(height, block.total_size())?;
                 vecs.height_to_weight.push_if_needed(height, block.weight())?;
                 vecs.height_to_first_txindex.push_if_needed(height, txindex_global)?;
@@ -193,9 +201,9 @@ impl Indexer {
                                     let txid_prefix = TxidPrefix::try_from(&txid)?;
 
                                     let prev_txindex_opt =
-                                        if check_collisions && parts.txid_prefix_to_txindex.needs(height) {
+                                        if check_collisions && trees.txid_prefix_to_txindex.needs(height) {
                                             // Should only find collisions for two txids (duplicates), see below
-                                            parts.txid_prefix_to_txindex.get(&txid_prefix)?.map(|v| *v)
+                                            trees.txid_prefix_to_txindex.get(&txid_prefix)?.map(|v| *v)
                                         } else {
                                             None
                                         };
@@ -234,7 +242,7 @@ impl Indexer {
                                     return Ok((txinindex, InputSource::SameBlock((tx, txindex, txin, vin))));
                                 }
 
-                                let prev_txindex = if let Some(txindex) = parts
+                                let prev_txindex = if let Some(txindex) = trees
                                     .txid_prefix_to_txindex
                                     .get(&TxidPrefix::try_from(&outpoint.txid)?)?
                                     .map(|v| *v)
@@ -312,7 +320,7 @@ impl Indexer {
                                         });
 
                                     let addressindex_opt = addressbytes_res.as_ref().ok().and_then(|addressbytes| {
-                                        parts
+                                        trees
                                             .addresshash_to_addressindex
                                             .get(&AddressHash::from((addressbytes, addresstype)))
                                             .unwrap()
@@ -344,9 +352,9 @@ impl Indexer {
                                         let prev_addressbytes =
                                             prev_addressbytes_opt.as_ref().context("Expect to have addressbytes")?;
 
-                                        if (vecs.addressindex_to_addresstype.hasnt(addressindex)
+                                        if (vecs.addressindex_to_addresstype.hasnt(addressindex)?
                                             && addresstype != prev_addresstype)
-                                            || (parts.addresshash_to_addressindex.needs(height)
+                                            || (trees.addresshash_to_addressindex.needs(height)
                                                 && prev_addressbytes != addressbytes)
                                         {
                                             let txid = tx.compute_txid();
@@ -496,7 +504,7 @@ impl Indexer {
                                 already_added_addresshash
                                     .insert(addresshash, addressindex);
 
-                                parts.addresshash_to_addressindex.insert_if_needed(
+                                trees.addresshash_to_addressindex.insert_if_needed(
                                     addresshash,
                                     addressindex,
                                     height,
@@ -583,7 +591,7 @@ impl Indexer {
 
                             match prev_txindex_opt {
                                 None => {
-                                    parts
+                                    trees
                                         .txid_prefix_to_txindex
                                         .insert_if_needed(txid_prefix, txindex, height);
                                 }
@@ -649,13 +657,13 @@ impl Indexer {
 
                 let should_snapshot = _height != 0 && _height % SNAPSHOT_BLOCK_RANGE == 0 && !exit.active();
                 if should_snapshot {
-                    export(parts, vecs, height)?;
+                    export(trees, vecs, height)?;
                 }
 
                 Ok(())
             })?;
 
-        export(parts, vecs, height)?;
+        export(trees, vecs, height)?;
 
         sleep(Duration::from_millis(100));
 
diff --git a/indexer/src/main.rs b/indexer/src/main.rs
index 7d6e08eb4..d51f8bac7 100644
--- a/indexer/src/main.rs
+++ b/indexer/src/main.rs
@@ -16,7 +16,7 @@ fn main() -> color_eyre::Result<()> {
 
     let i = std::time::Instant::now();
 
-    let mut indexer = Indexer::import(Path::new("indexes"))?;
+    let mut indexer = Indexer::import(Path::new("../_outputs/indexes"))?;
 
     indexer.index(data_dir, rpc, &exit)?;
 
diff --git a/indexer/src/storage/fjalls/base.rs b/indexer/src/storage/fjalls/base.rs
index 42a575e4a..8f2767da7 100644
--- a/indexer/src/storage/fjalls/base.rs
+++ b/indexer/src/storage/fjalls/base.rs
@@ -9,24 +9,24 @@ use unsafe_slice_serde::UnsafeSliceSerde;
 
 use crate::structs::{Height, Version};
 
-use super::Meta;
+use super::StoreMeta;
 
-pub struct Partition<Key, Value> {
-    meta: Meta,
+pub struct Store<Key, Value> {
+    meta: StoreMeta,
     keyspace: TransactionalKeyspace,
     part: TransactionalPartitionHandle,
     rtx: ReadTransaction,
     puts: BTreeMap<Key, Value>,
 }
 
-impl<K, V> Partition<K, V>
+impl<K, V> Store<K, V>
 where
     K: Into<Slice> + Ord,
     V: Into<Slice> + TryFrom<Slice>,
     <V as TryFrom<Slice>>::Error: error::Error + Send + Sync + 'static,
 {
     pub fn import(path: &Path, version: Version) -> color_eyre::Result<Self> {
-        let meta = Meta::checked_open(path, version)?;
+        let meta = StoreMeta::checked_open(path, version)?;
         let keyspace = if let Ok(keyspace) = Self::open_keyspace(path) {
             keyspace
         } else {
@@ -95,6 +95,9 @@ where
     pub fn len(&self) -> usize {
         self.meta.len() + self.puts.len()
     }
+    pub fn is_empty(&self) -> bool {
+        self.len() == 0
+    }
 
     pub fn has(&self, height: Height) -> bool {
         self.meta.has(height)
diff --git a/indexer/src/storage/fjalls/meta.rs b/indexer/src/storage/fjalls/meta.rs
index c26a19033..1372f1d34 100644
--- a/indexer/src/storage/fjalls/meta.rs
+++ b/indexer/src/storage/fjalls/meta.rs
@@ -7,14 +7,14 @@ use unsafe_slice_serde::UnsafeSliceSerde;
 
 use super::{Height, Version};
 
-pub struct Meta {
+pub struct StoreMeta {
     pathbuf: PathBuf,
     version: Version,
     height: Option<Height>,
     len: usize,
 }
 
-impl Meta {
+impl StoreMeta {
     pub fn checked_open(path: &Path, version: Version) -> color_eyre::Result<Self> {
         fs::create_dir_all(path)?;
 
@@ -40,6 +40,9 @@ impl Meta {
     pub fn len(&self) -> usize {
         self.len
     }
+    pub fn is_empty(&self) -> bool {
+        self.len() == 0
+    }
 
     pub fn export(&mut self, len: usize, height: Height) -> io::Result<()> {
         self.len = len;
diff --git a/indexer/src/storage/fjalls/mod.rs b/indexer/src/storage/fjalls/mod.rs
index 2a952a7e4..be75266ea 100644
--- a/indexer/src/storage/fjalls/mod.rs
+++ b/indexer/src/storage/fjalls/mod.rs
@@ -5,24 +5,25 @@ use crate::{structs::Version, AddressHash, Addressindex, BlockHashPrefix, Height
 mod base;
 mod meta;
 
-use base::*;
-use meta::*;
+pub use base::*;
+pub use meta::*;
 
 pub struct Fjalls {
-    pub addresshash_to_addressindex: Partition<AddressHash, Addressindex>,
-    pub blockhash_prefix_to_height: Partition<BlockHashPrefix, Height>,
-    pub txid_prefix_to_txindex: Partition<TxidPrefix, Txindex>,
+    pub addresshash_to_addressindex: Store<AddressHash, Addressindex>,
+    pub blockhash_prefix_to_height: Store<BlockHashPrefix, Height>,
+    pub txid_prefix_to_txindex: Store<TxidPrefix, Txindex>,
 }
 
 impl Fjalls {
     pub fn import(path: &Path) -> color_eyre::Result<Self> {
+        let addresshash_to_addressindex = Store::import(&path.join("addresshash_to_addressindex"), Version::from(1))?;
+        let blockhash_prefix_to_height = Store::import(&path.join("blockhash_prefix_to_height"), Version::from(1))?;
+        let txid_prefix_to_txindex = Store::import(&path.join("txid_prefix_to_txindex"), Version::from(1))?;
+
         Ok(Self {
-            addresshash_to_addressindex: Partition::import(
-                &path.join("addresshash_to_addressindex"),
-                Version::from(1),
-            )?,
-            blockhash_prefix_to_height: Partition::import(&path.join("blockhash_prefix_to_height"), Version::from(1))?,
-            txid_prefix_to_txindex: Partition::import(&path.join("txid_prefix_to_txindex"), Version::from(1))?,
+            addresshash_to_addressindex,
+            blockhash_prefix_to_height,
+            txid_prefix_to_txindex,
         })
     }
 
diff --git a/indexer/src/storage/storable_vecs/base.rs b/indexer/src/storage/storable_vecs/base.rs
index 9149d3b34..41707602c 100644
--- a/indexer/src/storage/storable_vecs/base.rs
+++ b/indexer/src/storage/storable_vecs/base.rs
@@ -7,6 +7,7 @@ use std::{
 
 use super::{Height, Version};
 
+#[derive(Debug)]
 pub struct StorableVec<I, T> {
     height: Option<Height>,
     pathbuf: PathBuf,
@@ -16,7 +17,7 @@ pub struct StorableVec<I, T> {
 
 impl<I, T> StorableVec<I, T>
 where
-    I: Into<usize>,
+    I: TryInto<usize>,
     T: Sized + Debug + Clone,
 {
     pub fn import(path: &Path, version: Version) -> io::Result<Self> {
@@ -99,12 +100,12 @@ impl<I, T> DerefMut for StorableVec<I, T> {
     }
 }
 
-pub trait AnyBindexVec {
+pub trait AnyStorableVec {
     fn height(&self) -> color_eyre::Result<Height>;
     fn flush(&mut self, height: Height) -> io::Result<()>;
 }
 
-impl<I, T> AnyBindexVec for StorableVec<I, T>
+impl<I, T> AnyStorableVec for StorableVec<I, T>
 where
     I: Into<usize>,
     T: Sized + Debug + Clone,
diff --git a/indexer/src/storage/storable_vecs/mod.rs b/indexer/src/storage/storable_vecs/mod.rs
index a9ea76211..7d251df42 100644
--- a/indexer/src/storage/storable_vecs/mod.rs
+++ b/indexer/src/storage/storable_vecs/mod.rs
@@ -12,13 +12,14 @@ use crate::structs::{
 
 mod base;
 
-use base::*;
+pub use base::*;
 
 pub struct StorableVecs {
     pub addressindex_to_addresstype: StorableVec<Addressindex, Addresstype>,
     pub addressindex_to_addresstypeindex: StorableVec<Addressindex, Addresstypeindex>,
     pub addressindex_to_height: StorableVec<Addressindex, Height>,
     pub height_to_blockhash: StorableVec<Height, BlockHash>,
+    pub height_to_difficulty: StorableVec<Height, f64>,
     pub height_to_first_addressindex: StorableVec<Height, Addressindex>,
     pub height_to_first_emptyindex: StorableVec<Height, Addresstypeindex>,
     pub height_to_first_multisigindex: StorableVec<Height, Addresstypeindex>,
@@ -54,23 +55,6 @@ pub struct StorableVecs {
     pub txinindex_to_txoutindex: StorableVec<Txinindex, Txoutindex>,
     pub txoutindex_to_addressindex: StorableVec<Txoutindex, Addressindex>,
     pub txoutindex_to_amount: StorableVec<Txoutindex, Amount>,
-    // Can be computed later:
-    // pub height_to_date: StorableVec<Height, Date>,
-    // pub height_to_totalfees: StorableVec<Height, Amount>,
-    // pub height_to_inputcount: StorableVec<Txindex, u32>,
-    // pub height_to_last_addressindex: StorableVec<Height, Addressindex>,
-    // pub height_to_last_txindex: StorableVec<Height, Txindex>,
-    // pub height_to_last_txoutindex: StorableVec<Height, Txoutindex>,
-    // pub height_to_outputcount: StorableVec<Txindex, u32>,
-    // pub height_to_txcount: StorableVec<Txindex, u32>,
-    // pub height_to_subsidy: StorableVec<Txindex, u32>,
-    // pub height_to_minfeerate: StorableVec<Txindex, Feerate>,
-    // pub height_to_maxfeerate: StorableVec<Txindex, Feerate>,
-    // pub height_to_medianfeerate: StorableVec<Txindex, Feerate>,
-    // pub txindex_to_feerate: StorableVec<Txindex, Feerate>,
-    // pub txindex_to_inputcount: StorableVec<Txindex, u32>,
-    // pub txindex_to_outputcount: StorableVec<Txindex, u32>,
-    // pub txindex_to_last_txoutindex: StorableVec<Txindex, Txoutindex>,
 }
 
 // const UNSAFE_BLOCKS: usize = 100;
@@ -90,6 +74,7 @@ impl StorableVecs {
             )?,
             addressindex_to_height: StorableVec::import(&path.join("addressindex_to_height"), Version::from(1))?,
             height_to_blockhash: StorableVec::import(&path.join("height_to_blockhash"), Version::from(1))?,
+            height_to_difficulty: StorableVec::import(&path.join("height_to_difficulty"), Version::from(1))?,
             height_to_first_addressindex: StorableVec::import(
                 &path.join("height_to_first_addressindex"),
                 Version::from(1),
@@ -383,12 +368,13 @@ impl StorableVecs {
             .min())
     }
 
-    pub fn as_slice(&self) -> [&dyn AnyBindexVec; 39] {
+    pub fn as_slice(&self) -> [&dyn AnyStorableVec; 40] {
         [
-            &self.addressindex_to_addresstype as &dyn AnyBindexVec,
+            &self.addressindex_to_addresstype as &dyn AnyStorableVec,
             &self.addressindex_to_addresstypeindex,
             &self.addressindex_to_height,
             &self.height_to_blockhash,
+            &self.height_to_difficulty,
             &self.height_to_first_addressindex,
             &self.height_to_first_emptyindex,
             &self.height_to_first_multisigindex,
@@ -427,12 +413,13 @@ impl StorableVecs {
         ]
     }
 
-    pub fn as_mut_slice(&mut self) -> [&mut (dyn AnyBindexVec + Send + Sync); 39] {
+    pub fn as_mut_slice(&mut self) -> [&mut (dyn AnyStorableVec + Send + Sync); 40] {
         [
-            &mut self.addressindex_to_addresstype as &mut (dyn AnyBindexVec + Send + Sync),
+            &mut self.addressindex_to_addresstype as &mut (dyn AnyStorableVec + Send + Sync),
             &mut self.addressindex_to_addresstypeindex,
             &mut self.addressindex_to_height,
             &mut self.height_to_blockhash,
+            &mut self.height_to_difficulty,
             &mut self.height_to_first_addressindex,
             &mut self.height_to_first_emptyindex,
             &mut self.height_to_first_multisigindex,
diff --git a/indexer/src/structs/addressindex.rs b/indexer/src/structs/addressindex.rs
index 2780cf4d5..02578722b 100644
--- a/indexer/src/structs/addressindex.rs
+++ b/indexer/src/structs/addressindex.rs
@@ -1,10 +1,9 @@
 use derive_deref::{Deref, DerefMut};
-// use snkrj::{direct_repr, Storable, UnsizedStorable};
+use fjall::Slice;
 use unsafe_slice_serde::UnsafeSliceSerde;
 
 #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Deref, DerefMut, Default)]
 pub struct Addressindex(u32);
-// direct_repr!(Addressindex);
 
 impl Addressindex {
     pub const BYTES: usize = size_of::<Self>();
@@ -50,13 +49,13 @@ impl From<Addressindex> for usize {
     }
 }
 
-impl TryFrom<fjall::Slice> for Addressindex {
+impl TryFrom<Slice> for Addressindex {
     type Error = unsafe_slice_serde::Error;
-    fn try_from(value: fjall::Slice) -> Result<Self, Self::Error> {
+    fn try_from(value: Slice) -> Result<Self, Self::Error> {
         Ok(*Self::unsafe_try_from_slice(&value)?)
     }
 }
-impl From<Addressindex> for fjall::Slice {
+impl From<Addressindex> for Slice {
     fn from(value: Addressindex) -> Self {
         Self::new(value.unsafe_as_slice())
     }
diff --git a/indexer/src/structs/addresstypeindex.rs b/indexer/src/structs/addresstypeindex.rs
index 7fe615080..971be4455 100644
--- a/indexer/src/structs/addresstypeindex.rs
+++ b/indexer/src/structs/addresstypeindex.rs
@@ -1,9 +1,7 @@
 use derive_deref::{Deref, DerefMut};
-// use snkrj::{direct_repr, Storable, UnsizedStorable};
 
 #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Deref, DerefMut, Default)]
 pub struct Addresstypeindex(u32);
-// direct_repr!(Addresstypeindex);
 
 impl Addresstypeindex {
     pub fn decremented(self) -> Self {
diff --git a/indexer/src/structs/amount.rs b/indexer/src/structs/amount.rs
index f6ac571bc..6c66fc725 100644
--- a/indexer/src/structs/amount.rs
+++ b/indexer/src/structs/amount.rs
@@ -5,13 +5,11 @@ use std::{
 
 use biter::bitcoin;
 use derive_deref::{Deref, DerefMut};
-// use snkrj::{direct_repr, Storable, UnsizedStorable};
 
 use super::Height;
 
 #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Deref, DerefMut, Default)]
 pub struct Amount(bitcoin::Amount);
-// direct_repr!(Amount);
 
 impl Amount {
     pub const ZERO: Self = Self(bitcoin::Amount::ZERO);
diff --git a/indexer/src/structs/compressed.rs b/indexer/src/structs/compressed.rs
index 4aab25aa1..59acbaa97 100644
--- a/indexer/src/structs/compressed.rs
+++ b/indexer/src/structs/compressed.rs
@@ -2,14 +2,13 @@ use std::hash::Hasher;
 
 use biter::bitcoin::{BlockHash, Txid};
 use derive_deref::Deref;
-// use snkrj::{direct_repr, Storable, UnsizedStorable};
+use fjall::Slice;
 use unsafe_slice_serde::UnsafeSliceSerde;
 
 use super::{Addressbytes, Addresstype, SliceExtended};
 
 #[derive(Debug, Deref, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
 pub struct AddressHash([u8; 8]);
-// direct_repr!(AddressHash);
 impl From<(&Addressbytes, Addresstype)> for AddressHash {
     fn from((addressbytes, addresstype): (&Addressbytes, Addresstype)) -> Self {
         let mut hasher = rapidhash::RapidHasher::default();
@@ -24,18 +23,18 @@ impl From<[u8; 8]> for AddressHash {
         Self(value)
     }
 }
-impl TryFrom<fjall::Slice> for AddressHash {
+impl TryFrom<Slice> for AddressHash {
     type Error = color_eyre::Report;
-    fn try_from(value: fjall::Slice) -> Result<Self, Self::Error> {
+    fn try_from(value: Slice) -> Result<Self, Self::Error> {
         Ok(*Self::unsafe_try_from_slice(&value)?)
     }
 }
-impl From<&AddressHash> for fjall::Slice {
+impl From<&AddressHash> for Slice {
     fn from(value: &AddressHash) -> Self {
         Self::new(value.unsafe_as_slice())
     }
 }
-impl From<AddressHash> for fjall::Slice {
+impl From<AddressHash> for Slice {
     fn from(value: AddressHash) -> Self {
         Self::from(&value)
     }
@@ -43,25 +42,24 @@ impl From<AddressHash> for fjall::Slice {
 
 #[derive(Debug, Deref, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
 pub struct BlockHashPrefix([u8; 8]);
-// direct_repr!(BlockHashPrefix);
 impl TryFrom<&BlockHash> for BlockHashPrefix {
     type Error = color_eyre::Report;
     fn try_from(value: &BlockHash) -> Result<Self, Self::Error> {
         Ok(Self((&value[..]).read_8x_u8()?))
     }
 }
-impl TryFrom<fjall::Slice> for BlockHashPrefix {
+impl TryFrom<Slice> for BlockHashPrefix {
     type Error = color_eyre::Report;
-    fn try_from(value: fjall::Slice) -> Result<Self, Self::Error> {
+    fn try_from(value: Slice) -> Result<Self, Self::Error> {
         Ok(*Self::unsafe_try_from_slice(&value)?)
     }
 }
-impl From<&BlockHashPrefix> for fjall::Slice {
+impl From<&BlockHashPrefix> for Slice {
     fn from(value: &BlockHashPrefix) -> Self {
         Self::new(value.unsafe_as_slice())
     }
 }
-impl From<BlockHashPrefix> for fjall::Slice {
+impl From<BlockHashPrefix> for Slice {
     fn from(value: BlockHashPrefix) -> Self {
         Self::from(&value)
     }
@@ -69,25 +67,24 @@ impl From<BlockHashPrefix> for fjall::Slice {
 
 #[derive(Debug, Deref, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
 pub struct TxidPrefix([u8; 8]);
-// direct_repr!(TxidPrefix);
 impl TryFrom<&Txid> for TxidPrefix {
     type Error = color_eyre::Report;
     fn try_from(value: &Txid) -> Result<Self, Self::Error> {
         Ok(Self((&value[..]).read_8x_u8()?))
     }
 }
-impl TryFrom<fjall::Slice> for TxidPrefix {
+impl TryFrom<Slice> for TxidPrefix {
     type Error = color_eyre::Report;
-    fn try_from(value: fjall::Slice) -> Result<Self, Self::Error> {
+    fn try_from(value: Slice) -> Result<Self, Self::Error> {
         Ok(*Self::unsafe_try_from_slice(&value)?)
     }
 }
-impl From<&TxidPrefix> for fjall::Slice {
+impl From<&TxidPrefix> for Slice {
     fn from(value: &TxidPrefix) -> Self {
         Self::new(value.unsafe_as_slice())
     }
 }
-impl From<TxidPrefix> for fjall::Slice {
+impl From<TxidPrefix> for Slice {
     fn from(value: TxidPrefix) -> Self {
         Self::from(&value)
     }
diff --git a/indexer/src/structs/height.rs b/indexer/src/structs/height.rs
index 1784fc206..ee829a992 100644
--- a/indexer/src/structs/height.rs
+++ b/indexer/src/structs/height.rs
@@ -6,12 +6,11 @@ use std::{
 
 use biter::rpc::{self, RpcApi};
 use derive_deref::{Deref, DerefMut};
-// use snkrj::{direct_repr, Storable, UnsizedStorable};
+use fjall::Slice;
 use unsafe_slice_serde::UnsafeSliceSerde;
 
 #[derive(Debug, Clone, Copy, Deref, DerefMut, PartialEq, Eq, PartialOrd, Ord, Default)]
 pub struct Height(u32);
-// direct_repr!(Height);
 
 impl Height {
     pub fn write(&self, path: &Path) -> Result<(), io::Error> {
@@ -120,13 +119,13 @@ impl TryFrom<&rpc::Client> for Height {
     }
 }
 
-impl TryFrom<fjall::Slice> for Height {
+impl TryFrom<Slice> for Height {
     type Error = unsafe_slice_serde::Error;
-    fn try_from(value: fjall::Slice) -> Result<Self, Self::Error> {
+    fn try_from(value: Slice) -> Result<Self, Self::Error> {
         Ok(*Self::unsafe_try_from_slice(&value)?)
     }
 }
-impl From<Height> for fjall::Slice {
+impl From<Height> for Slice {
     fn from(value: Height) -> Self {
         Self::new(value.unsafe_as_slice())
     }
diff --git a/indexer/src/structs/timestamp.rs b/indexer/src/structs/timestamp.rs
index 3ed62e1ae..4b9fc285e 100644
--- a/indexer/src/structs/timestamp.rs
+++ b/indexer/src/structs/timestamp.rs
@@ -1,6 +1,6 @@
 use derive_deref::Deref;
 
-#[derive(Debug, Deref, Clone)]
+#[derive(Debug, Deref, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
 pub struct Timestamp(jiff::Timestamp);
 
 impl TryFrom<u32> for Timestamp {
diff --git a/indexer/src/structs/txindex.rs b/indexer/src/structs/txindex.rs
index 974565a02..2ec5b4ac6 100644
--- a/indexer/src/structs/txindex.rs
+++ b/indexer/src/structs/txindex.rs
@@ -1,12 +1,11 @@
 use std::ops::{Add, AddAssign};
 
 use derive_deref::{Deref, DerefMut};
-// use snkrj::{direct_repr, Storable, UnsizedStorable};
+use fjall::Slice;
 use unsafe_slice_serde::UnsafeSliceSerde;
 
 #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Deref, DerefMut, Default)]
 pub struct Txindex(u32);
-// direct_repr!(Txindex);
 
 impl Txindex {
     pub fn incremented(self) -> Self {
@@ -59,13 +58,13 @@ impl From<Txindex> for usize {
     }
 }
 
-impl TryFrom<fjall::Slice> for Txindex {
+impl TryFrom<Slice> for Txindex {
     type Error = unsafe_slice_serde::Error;
-    fn try_from(value: fjall::Slice) -> Result<Self, Self::Error> {
+    fn try_from(value: Slice) -> Result<Self, Self::Error> {
         Ok(*Self::unsafe_try_from_slice(&value)?)
     }
 }
-impl From<Txindex> for fjall::Slice {
+impl From<Txindex> for Slice {
     fn from(value: Txindex) -> Self {
         Self::new(value.unsafe_as_slice())
     }
diff --git a/indexer/src/structs/txinindex.rs b/indexer/src/structs/txinindex.rs
index 03807b5c7..2c8fcfb07 100644
--- a/indexer/src/structs/txinindex.rs
+++ b/indexer/src/structs/txinindex.rs
@@ -1,13 +1,11 @@
 use std::ops::{Add, AddAssign};
 
 use derive_deref::{Deref, DerefMut};
-// use snkrj::{direct_repr, Storable, UnsizedStorable};
 
 use super::Vout;
 
 #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Deref, DerefMut, Default)]
 pub struct Txinindex(u64);
-// direct_repr!(Txinindex);
 
 impl Txinindex {
     pub fn incremented(self) -> Self {
diff --git a/indexer/src/structs/txoutindex.rs b/indexer/src/structs/txoutindex.rs
index 5ab2e7ccf..bf7517f35 100644
--- a/indexer/src/structs/txoutindex.rs
+++ b/indexer/src/structs/txoutindex.rs
@@ -1,13 +1,11 @@
 use std::ops::{Add, AddAssign};
 
 use derive_deref::{Deref, DerefMut};
-// use snkrj::{direct_repr, Storable, UnsizedStorable};
 
 use super::Vout;
 
 #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Deref, DerefMut, Default)]
 pub struct Txoutindex(u64);
-// direct_repr!(Txoutindex);
 
 impl Txoutindex {
     pub const COINBASE: Self = Self(u64::MAX);
diff --git a/indexer/src/structs/version.rs b/indexer/src/structs/version.rs
index 3f01cb414..4d8257e2c 100644
--- a/indexer/src/structs/version.rs
+++ b/indexer/src/structs/version.rs
@@ -1,5 +1,6 @@
 use std::{fs, io, path::Path};
 
+use fjall::Slice;
 use unsafe_slice_serde::UnsafeSliceSerde;
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
@@ -24,13 +25,13 @@ impl TryFrom<&Path> for Version {
     }
 }
 
-impl TryFrom<fjall::Slice> for Version {
+impl TryFrom<Slice> for Version {
     type Error = color_eyre::Report;
-    fn try_from(value: fjall::Slice) -> Result<Self, Self::Error> {
+    fn try_from(value: Slice) -> Result<Self, Self::Error> {
         Ok(*Self::unsafe_try_from_slice(&value)?)
     }
 }
-impl From<Version> for fjall::Slice {
+impl From<Version> for Slice {
     fn from(value: Version) -> Self {
         Self::new(value.unsafe_as_slice())
     }
diff --git a/iterator/src/blk_index_to_blk_recap.rs b/iterator/src/blk_index_to_blk_recap.rs
index f080b6d54..5a105bfca 100644
--- a/iterator/src/blk_index_to_blk_recap.rs
+++ b/iterator/src/blk_index_to_blk_recap.rs
@@ -59,6 +59,15 @@ impl BlkIndexToBlkRecap {
             self.tree.remove(&blk_index);
         });
 
+        while self.tree.last_entry().map(|last| *last.key()).is_some_and(|key| {
+            if key >= self.tree.len() {
+                self.tree.pop_last();
+                true
+            } else {
+                false
+            }
+        }) {}
+
         self.last_safe_height = self.tree.values().map(|recap| recap.height()).max();
     }
 
@@ -68,13 +77,12 @@ impl BlkIndexToBlkRecap {
 
             if last_value.height() < start {
                 return Some((*last_key, *last_value));
-            } else if let Some((blk_index, _)) = self
-                .tree
-                .iter()
-                .find(|(_, blk_recap)| blk_recap.is_younger_than(start))
+            } else if let Some((blk_index, _)) =
+                self.tree.iter().find(|(_, blk_recap)| blk_recap.is_younger_than(start))
             {
                 if *blk_index != 0 {
-                    let blk_index = *blk_index - 1;
+                    // Temporary fix, need to rethink the whole thing
+                    let blk_index = (*blk_index).checked_sub(3).unwrap_or_default();
                     return Some((blk_index, *self.tree.get(&blk_index).unwrap()));
                 }
             }
@@ -103,13 +111,10 @@ impl BlkIndexToBlkRecap {
                 unreachable!();
             }
 
-            self.tree
-                .insert(blk_index, BlkRecap::first(blk_metadata_and_block));
+            self.tree.insert(blk_index, BlkRecap::first(blk_metadata_and_block));
         }
 
-        if self
-            .last_safe_height
-            .map_or(true, |safe_height| height >= safe_height)
+        if self.last_safe_height.map_or(true, |safe_height| height >= safe_height)
             && (height % TARGET_BLOCKS_PER_MONTH) == 0
         {
             self.export();
diff --git a/iterator/src/lib.rs b/iterator/src/lib.rs
index 03afdfebb..ebd20c97d 100644
--- a/iterator/src/lib.rs
+++ b/iterator/src/lib.rs
@@ -98,7 +98,7 @@ pub fn new(
     thread::spawn(move || {
         blk_index_to_blk_path
             .iter()
-            .filter(|(blk_index, _)| blk_index >= &&starting_blk_index)
+            .filter(|(blk_index, _)| **blk_index >= starting_blk_index)
             .try_for_each(move |(blk_index, blk_path)| {
                 let blk_metadata = BlkMetadata::new(*blk_index, blk_path);
 
@@ -147,38 +147,6 @@ pub fn new(
             })
     });
 
-    // thread::spawn(move || {
-    //     recv_block_reader.iter().par_bridge().try_for_each(
-    //         move |(blk_metadata, mut block_state)| {
-    //             let raw_block = match block_state {
-    //                 BlockState::Raw(vec) => vec,
-    //                 _ => unreachable!(),
-    //             };
-
-    //             let mut cursor = Cursor::new(raw_block);
-
-    //             block_state = BlockState::Decoded(Block::consensus_decode(&mut cursor).unwrap());
-
-    //             if send_block
-    //                 .send(BlkMetadataAndBlock::new(
-    //                     blk_metadata,
-    //                     match block_state {
-    //                         BlockState::Decoded(block) => block,
-    //                         _ => unreachable!(),
-    //                     },
-    //                 ))
-    //                 .is_err()
-    //             {
-    //                 return ControlFlow::Break(());
-    //             }
-
-    //             ControlFlow::Continue(())
-    //         },
-    //     );
-    // });
-
-    // Can't use the previous code because .send() blocks all the threads if full
-    // And other .par_iter() are also stuck because of that
     thread::spawn(move || {
         let mut bulk = vec![];
 
@@ -192,7 +160,9 @@ pub fn new(
 
                 let mut cursor = Cursor::new(raw_block);
 
-                *block_state = BlockState::Decoded(Block::consensus_decode(&mut cursor).unwrap());
+                let block = Block::consensus_decode(&mut cursor).unwrap();
+
+                *block_state = BlockState::Decoded(block);
             });
 
             bulk.drain(..).try_for_each(|(blk_metadata, block_state)| {
@@ -219,6 +189,7 @@ pub fn new(
                 return ControlFlow::Continue(());
             }
 
+            // Sending in bulk to not lock threads in standby
             drain_and_send(&mut bulk)
         });
 
diff --git a/iterator/src/main.rs b/iterator/src/main.rs
index a8bea0066..908ba6127 100644
--- a/iterator/src/main.rs
+++ b/iterator/src/main.rs
@@ -5,13 +5,13 @@ use bitcoincore_rpc::{Auth, Client};
 fn main() {
     let i = std::time::Instant::now();
 
-    let data_dir = Path::new("../../../bitcoin");
+    let data_dir = Path::new("../../bitcoin");
     let url = "http://localhost:8332";
     let cookie = Path::new(data_dir).join(".cookie");
     let auth = Auth::CookieFile(cookie);
     let rpc = Client::new(url, auth).unwrap();
 
-    let start = Some(810078);
+    let start = Some(749900);
     let end = None;
 
     biter::new(data_dir, start, end, rpc)
diff --git a/run.sh b/run.sh
deleted file mode 100755
index 24531425a..000000000
--- a/run.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-
-# https://stackoverflow.com/questions/31389483/find-and-delete-file-or-folder-older-than-x-days
-
-if command -v ulimit &> /dev/null; then
-    echo "Increasing limit of opened files..."
-    # ulimit -n 1000000 # Can't be $(ulimit -Hn), bitcoind needs some too !
-
-    # Needed because the datasets tree is too big lol
-    echo "Increasing stack size..."
-    ulimit -s $(ulimit -Hs)
-fi
-
-# For Mac OS users
-if [ "$(uname)" == "Darwin" ]; then
-    if mdutil -s / | grep "enabled"; then
-        echo "Disabling spotlight indexing..."
-        sudo mdutil -a -i off &> /dev/null
-    fi
-
-    echo "Thinning local TimeMachine snapshots..."
-    tmutil thinlocalsnapshots / &> /dev/null
-fi
-
-cargo run -r -- "$@"
diff --git a/indexer/rustfmt.toml b/rustfmt.toml
similarity index 100%
rename from indexer/rustfmt.toml
rename to rustfmt.toml
diff --git a/storable_vec/src/lib.rs b/storable_vec/src/lib.rs
index 9924c827a..df2297f25 100644
--- a/storable_vec/src/lib.rs
+++ b/storable_vec/src/lib.rs
@@ -50,7 +50,7 @@ const MAX_CACHE_SIZE: usize = 100 * ONE_MB;
 
 impl<I, T> StorableVec<I, T>
 where
-    I: Into<usize>,
+    I: TryInto<usize>,
     T: Sized + Debug + Clone,
 {
     pub const SIZE_OF_T: usize = size_of::<T>();
@@ -60,11 +60,11 @@ where
     pub const CACHE_LENGTH: usize = MAX_CACHE_SIZE / Self::PAGE_SIZE;
 
     pub fn import(path: &Path) -> Result<Self, io::Error> {
-        let file = Self::open_file(path)?;
+        let file = Self::open_file_(path)?;
 
         let mut this = Self {
             pathbuf: path.to_owned(),
-            disk_len: Self::byte_index_to_index(file.metadata()?.len() as usize),
+            disk_len: Self::byte_index_to_index(Self::file_len(&file)?),
             file,
             cache: vec![],
             pushed: vec![],
@@ -81,6 +81,10 @@ where
         Ok(this)
     }
 
+    fn file_len(file: &File) -> io::Result<usize> {
+        Ok(file.metadata()?.len() as usize)
+    }
+
     fn reset_cache(&mut self) {
         // let len = (self.disk_len as f64 / Self::PER_PAGE as f64).ceil() as usize;
         // self.cache.clear();
@@ -100,7 +104,10 @@ where
         }
     }
 
-    fn open_file(path: &Path) -> Result<File, io::Error> {
+    fn open_file(&self) -> Result<File, Error> {
+        Self::open_file_(&self.pathbuf).map_err(Error::IO)
+    }
+    fn open_file_(path: &Path) -> Result<File, io::Error> {
         OpenOptions::new()
             .read(true)
             .create(true)
@@ -140,7 +147,7 @@ where
 
     #[inline]
     pub fn get(&self, index: I) -> Result<Option<Value<'_, T>>> {
-        self.get_(index.into())
+        self.get_(index.try_into().map_err(|_| Error::FailedKeyTryIntoUsize)?)
     }
     pub fn get_(&self, index: usize) -> Result<Option<Value<'_, T>>> {
         match self.index_to_pushed_index(index) {
@@ -163,9 +170,7 @@ where
         let page_index = index / Self::PER_PAGE;
         let last_index = self.disk_len - 1;
         let max_page_index = last_index / Self::PER_PAGE;
-        let min_page_index = (max_page_index + 1)
-            .checked_sub(self.cache.len())
-            .unwrap_or_default();
+        let min_page_index = (max_page_index + 1).checked_sub(self.cache.len()).unwrap_or_default();
 
         // let min_open_page = self.min.load(AtomicOrdering::SeqCst);
 
@@ -196,14 +201,11 @@ where
                 T::unsafe_try_from_slice(slice).map_err(Error::UnsafeSliceSerde)?,
             )))
         } else {
-            let mut file = Self::open_file(&self.pathbuf).map_err(Error::IO)?;
-
-            file.seek(SeekFrom::Start(byte_index as u64))
-                .map_err(Error::IO)?;
-
+            let mut file = self.open_file()?;
             let mut buf = vec![0; Self::SIZE_OF_T];
-            file.read_exact(&mut buf).map_err(Error::IO)?;
 
+            file.seek(SeekFrom::Start(byte_index as u64)).map_err(Error::IO)?;
+            file.read_exact(&mut buf).map_err(Error::IO)?;
             let value = T::unsafe_try_from_slice(&buf[..]).map_err(Error::UnsafeSliceSerde)?;
 
             Ok(Some(Value::Owned(value.to_owned())))
@@ -213,10 +215,39 @@ where
     where
         T: Default + Clone,
     {
-        Ok(self
-            .get(index)?
-            .map(|v| (*v).clone())
-            .unwrap_or(Default::default()))
+        Ok(self.get(index)?.map(|v| (*v).clone()).unwrap_or(Default::default()))
+    }
+
+    pub fn read_iter<F>(&self, f: F) -> Result<()>
+    where
+        F: FnMut((usize, &T)) -> Result<()>,
+    {
+        self.read_from_(0, f)
+    }
+
+    pub fn read_from_<F>(&self, index: usize, mut f: F) -> Result<()>
+    where
+        F: FnMut((usize, &T)) -> Result<()>,
+    {
+        let mut file = self.open_file()?;
+        let mut buf = vec![0; Self::SIZE_OF_T];
+
+        let byte_index = Self::index_to_byte_index(index);
+
+        file.seek(SeekFrom::Start(byte_index as u64)).map_err(Error::IO)?;
+
+        let mut i = 0;
+
+        loop {
+            if file.read_exact(&mut buf).map_err(Error::IO).is_err() {
+                break;
+            }
+            let v = T::unsafe_try_from_slice(&buf[..]).map_err(Error::UnsafeSliceSerde)?;
+            f((i, v))?;
+            i += 1;
+        }
+
+        Ok(())
     }
 
     #[allow(unused)]
@@ -238,7 +269,7 @@ where
     }
 
     pub fn push_if_needed(&mut self, index: I, value: T) -> Result<()> {
-        self.push_if_needed_(index.into(), value)
+        self.push_if_needed_(index.try_into().map_err(|_| Error::FailedKeyTryIntoUsize)?, value)
     }
     pub fn push_if_needed_(&mut self, index: usize, value: T) -> Result<()> {
         let len = self.len();
@@ -307,15 +338,15 @@ where
         self.len() == 0
     }
 
-    pub fn has(&self, index: I) -> bool {
-        self.has_(index.into())
+    pub fn has(&self, index: I) -> Result<bool> {
+        Ok(self.has_(index.try_into().map_err(|_| Error::FailedKeyTryIntoUsize)?))
     }
     pub fn has_(&self, index: usize) -> bool {
         index < self.len()
     }
 
-    pub fn hasnt(&self, index: I) -> bool {
-        self.hasnt_(index.into())
+    pub fn hasnt(&self, index: I) -> Result<bool> {
+        Ok(self.hasnt_(index.try_into().map_err(|_| Error::FailedKeyTryIntoUsize)?))
     }
     pub fn hasnt_(&self, index: usize) -> bool {
         !self.has_(index)
@@ -414,6 +445,7 @@ pub enum Error {
     IndexTooHigh,
     ExpectFileToHaveIndex,
     ExpectVecToHaveIndex,
+    FailedKeyTryIntoUsize,
 }
 impl fmt::Display for Error {
     // This trait requires `fmt` with this exact signature.
@@ -425,6 +457,7 @@ impl fmt::Display for Error {
             Error::IndexTooHigh => write!(f, "Index too high"),
             Error::ExpectFileToHaveIndex => write!(f, "Expect file to have index"),
             Error::ExpectVecToHaveIndex => write!(f, "Expect vec to have index"),
+            Error::FailedKeyTryIntoUsize => write!(f, "Failed to convert key to usize"),
         }
     }
 }
diff --git a/unsafe_slice_serde/Cargo.toml b/unsafe_slice_serde/Cargo.toml
index 60a15b1ff..bc73a8033 100644
--- a/unsafe_slice_serde/Cargo.toml
+++ b/unsafe_slice_serde/Cargo.toml
@@ -1,3 +1,4 @@
 [package]
 name = "unsafe_slice_serde"
 version = "0.1.0"
+edition = "2021"

From 1e37d75e493ccd8570589bc313978d66061575df Mon Sep 17 00:00:00 2001
From: nym21 <expat-epochs0i@icloud.com>
Date: Sun, 2 Feb 2025 23:28:03 +0100
Subject: [PATCH 35/63] global: snapshot

---
 Cargo.lock                                    |  58 +---
 computer/Cargo.toml                           |   1 -
 computer/src/lib.rs                           |  67 +++--
 computer/src/storage/fjalls.rs                |  12 +-
 computer/src/storage/storable_vecs/base.rs    | 176 +++++++----
 computer/src/storage/storable_vecs/mod.rs     |  15 +-
 computer/src/structs/date.rs                  |  19 +-
 indexer/Cargo.toml                            |   1 -
 indexer/src/lib.rs                            |  12 +-
 indexer/src/storage/storable_vecs/base.rs     |  64 ++--
 indexer/src/storage/storable_vecs/mod.rs      |  21 +-
 indexer/src/structs/addressindex.rs           |  16 +
 indexer/src/structs/addresstypeindex.rs       |  16 +
 indexer/src/structs/height.rs                 |  11 +-
 indexer/src/structs/txindex.rs                |  16 +-
 indexer/src/structs/txinindex.rs              |  31 +-
 indexer/src/structs/txoutindex.rs             |  25 +-
 indexer/src/structs/vin.rs                    |   3 +-
 storable_vec/src/any.rs                       |  27 ++
 storable_vec/src/bytes.rs                     |  11 +
 storable_vec/src/error.rs                     |  34 +++
 storable_vec/src/index.rs                     |  11 +
 storable_vec/src/lib.rs                       | 282 +++++++++---------
 storable_vec/src/main.rs                      |  12 +-
 storable_vec/src/type_.rs                     |   8 +
 storable_vec/src/value.rs                     |  39 +++
 storable_vec/src/version.rs                   |  29 ++
 .../struct_iterable_derive/Cargo.toml         |   2 -
 28 files changed, 660 insertions(+), 359 deletions(-)
 create mode 100644 storable_vec/src/any.rs
 create mode 100644 storable_vec/src/bytes.rs
 create mode 100644 storable_vec/src/error.rs
 create mode 100644 storable_vec/src/index.rs
 create mode 100644 storable_vec/src/type_.rs
 create mode 100644 storable_vec/src/value.rs
 create mode 100644 storable_vec/src/version.rs

diff --git a/Cargo.lock b/Cargo.lock
index af827c497..544e428e2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -50,8 +50,8 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2c8d66485a3a2ea485c1913c4572ce0256067a5377ac8c75c4960e1cda98605f"
 dependencies = [
- "bitcoin-internals 0.3.0",
- "bitcoin_hashes 0.14.0",
+ "bitcoin-internals",
+ "bitcoin_hashes",
 ]
 
 [[package]]
@@ -71,7 +71,6 @@ name = "bindex"
 version = "0.1.0"
 dependencies = [
  "bitcoin",
- "bitcoin_hashes 0.16.0",
  "biter",
  "color-eyre",
  "derive_deref",
@@ -92,11 +91,11 @@ checksum = "ce6bc65742dea50536e35ad42492b234c27904a27f0abdcbce605015cb4ea026"
 dependencies = [
  "base58ck",
  "bech32",
- "bitcoin-internals 0.3.0",
- "bitcoin-io 0.1.3",
+ "bitcoin-internals",
+ "bitcoin-io",
  "bitcoin-units",
- "bitcoin_hashes 0.14.0",
- "hex-conservative 0.2.1",
+ "bitcoin_hashes",
+ "hex-conservative",
  "hex_lit",
  "secp256k1",
  "serde",
@@ -111,34 +110,19 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "bitcoin-internals"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b854212e29b96c8f0fe04cab11d57586c8f3257de0d146c76cb3b42b3eb9118"
-
 [[package]]
 name = "bitcoin-io"
 version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b47c4ab7a93edb0c7198c5535ed9b52b63095f4e9b45279c6736cec4b856baf"
 
-[[package]]
-name = "bitcoin-io"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26792cd2bf245069a1c5acb06aa7ad7abe1de69b507c90b490bca81e0665d0ee"
-dependencies = [
- "bitcoin-internals 0.4.0",
-]
-
 [[package]]
 name = "bitcoin-units"
 version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5285c8bcaa25876d07f37e3d30c303f2609179716e11d688f51e8f1fe70063e2"
 dependencies = [
- "bitcoin-internals 0.3.0",
+ "bitcoin-internals",
  "serde",
 ]
 
@@ -148,21 +132,11 @@ version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bb18c03d0db0247e147a21a6faafd5a7eb851c743db062de72018b6b7e8e4d16"
 dependencies = [
- "bitcoin-io 0.1.3",
- "hex-conservative 0.2.1",
+ "bitcoin-io",
+ "hex-conservative",
  "serde",
 ]
 
-[[package]]
-name = "bitcoin_hashes"
-version = "0.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e5d09f16329cd545d7e6008b2c6b2af3a90bc678cf41ac3d2f6755943301b16"
-dependencies = [
- "bitcoin-io 0.2.0",
- "hex-conservative 0.3.0",
-]
-
 [[package]]
 name = "bitcoincore-rpc"
 version = "0.19.0"
@@ -217,7 +191,6 @@ dependencies = [
  "exit",
  "fjall",
  "jiff",
- "rayon",
  "storable_vec",
  "unsafe_slice_serde",
 ]
@@ -494,15 +467,6 @@ dependencies = [
  "arrayvec",
 ]
 
-[[package]]
-name = "hex-conservative"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4afe881d0527571892c4034822e59bb10c6c991cce6abe8199b6f5cf10766f55"
-dependencies = [
- "arrayvec",
-]
-
 [[package]]
 name = "hex_lit"
 version = "0.1.1"
@@ -896,7 +860,7 @@ version = "0.29.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9465315bc9d4566e1724f0fffcbcc446268cb522e60f9a27bcded6b19c108113"
 dependencies = [
- "bitcoin_hashes 0.14.0",
+ "bitcoin_hashes",
  "rand",
  "secp256k1-sys",
  "serde",
@@ -996,9 +960,7 @@ dependencies = [
 name = "struct_iterable_derive"
 version = "0.1.0"
 dependencies = [
- "proc-macro2",
  "quote",
- "struct_iterable_internal",
  "syn 2.0.96",
 ]
 
diff --git a/computer/Cargo.toml b/computer/Cargo.toml
index 4ea89fad8..b1ac43a13 100644
--- a/computer/Cargo.toml
+++ b/computer/Cargo.toml
@@ -11,6 +11,5 @@ derive_deref = { workspace = true }
 exit = { workspace = true }
 fjall = { workspace = true }
 jiff = { workspace = true }
-rayon = { workspace = true }
 storable_vec = { workspace = true }
 unsafe_slice_serde = { workspace = true }
diff --git a/computer/src/lib.rs b/computer/src/lib.rs
index c59dbed44..124ed8369 100644
--- a/computer/src/lib.rs
+++ b/computer/src/lib.rs
@@ -1,6 +1,6 @@
 use std::path::{Path, PathBuf};
 
-use bindex::{Height, Indexer};
+use bindex::Indexer;
 use biter::rpc;
 use exit::Exit;
 
@@ -36,34 +36,63 @@ impl Computer {
             indexer.index(bitcoin_dir, rpc, exit)?;
         }
 
+        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();
+        let txoutindexes_count = indexer.vecs().txoutindex_to_addressindex.len();
+
         // TODO: Remove all outdated
 
-        // Compute txindex to X
+        self.vecs
+            .txindex_to_last_txinindex
+            .compute_last_index_from_first(&indexer.vecs().txindex_to_first_txinindex, txinindexes_count)?;
+
+        self.vecs.txindex_to_inputcount.compute_count_from_indexes(
+            &indexer.vecs().txindex_to_first_txinindex,
+            &self.vecs.txindex_to_last_txinindex,
+        )?;
+
+        self.vecs
+            .txindex_to_last_txoutindex
+            .compute_last_index_from_first(&indexer.vecs().txindex_to_first_txoutindex, txoutindexes_count)?;
+
+        self.vecs.txindex_to_outputcount.compute_count_from_indexes(
+            &indexer.vecs().txindex_to_first_txoutindex,
+            &self.vecs.txindex_to_last_txoutindex,
+        )?;
 
-        // Compute height to X
-        indexer
-            .vecs()
-            .height_to_timestamp
-            .read_from_(self.vecs.height_to_date.len(), |(_height, timestamp)| {
-                self.vecs
-                    .height_to_date
-                    .push_if_needed(Height::from(_height), Date::from(timestamp))
-            })?;
         self.vecs
             .height_to_date
-            .read_from_(self.vecs.date_to_first_height.len(), |(_height, date)| {
-                self.vecs
-                    .date_to_first_height
-                    .push_if_needed(*date, Height::from(_height))
-            })?;
+            .compute_transform(&indexer.vecs().height_to_timestamp, |timestamp| Date::from(timestamp))?;
 
-        // Compute date to X
+        self.vecs
+            .height_to_last_txindex
+            .compute_last_index_from_first(&indexer.vecs().height_to_first_txindex, height_count)?;
+
+        self.vecs.txindex_to_height.compute_inverse_less_to_more(
+            &indexer.vecs().height_to_first_txindex,
+            &self.vecs.height_to_last_txindex,
+        )?;
+
+        let date_count = self.vecs.height_to_date.len();
+
+        self.vecs
+            .date_to_first_height
+            .compute_inverse_more_to_less(&self.vecs.height_to_date)?;
+
+        // ---
+        // Date to X
+        // ---
         // ...
 
-        // Compute month to X
+        // ---
+        // Month to X
+        // ---
         // ...
 
-        // Compute year to X
+        // ---
+        // Year to X
+        // ---
         // ...
 
         Ok(())
diff --git a/computer/src/storage/fjalls.rs b/computer/src/storage/fjalls.rs
index d4a5c6d34..aba352bc6 100644
--- a/computer/src/storage/fjalls.rs
+++ b/computer/src/storage/fjalls.rs
@@ -5,18 +5,18 @@ use bindex::{Store, Version};
 use crate::structs::{AddressindexTxoutindex, Unit};
 
 pub struct Fjalls {
-    pub address_txoutindex_in: Store<AddressindexTxoutindex, Unit>,
-    pub address_txoutindex_out: Store<AddressindexTxoutindex, Unit>,
+    pub address_to_utxos_received: Store<AddressindexTxoutindex, Unit>,
+    pub address_to_utxos_spent: Store<AddressindexTxoutindex, Unit>,
 }
 
 impl Fjalls {
     pub fn import(path: &Path) -> color_eyre::Result<Self> {
-        let address_txoutindex_in = Store::import(&path.join("address_txoutindex_in"), Version::from(1))?;
-        let address_txoutindex_out = Store::import(&path.join("address_txoutindex_out"), Version::from(1))?;
+        let address_to_utxos_received = Store::import(&path.join("address_to_utxos_received"), Version::from(1))?;
+        let address_to_utxos_spent = Store::import(&path.join("address_to_utxos_spent"), Version::from(1))?;
 
         Ok(Self {
-            address_txoutindex_in,
-            address_txoutindex_out,
+            address_to_utxos_received,
+            address_to_utxos_spent,
         })
     }
 }
diff --git a/computer/src/storage/storable_vecs/base.rs b/computer/src/storage/storable_vecs/base.rs
index 04e86f108..b19e8196a 100644
--- a/computer/src/storage/storable_vecs/base.rs
+++ b/computer/src/storage/storable_vecs/base.rs
@@ -1,74 +1,144 @@
 use std::{
+    error,
     fmt::Debug,
     io,
-    ops::{Deref, DerefMut},
+    ops::{Add, Sub},
     path::Path,
 };
 
-use bindex::{Indexer, Version};
+use derive_deref::{Deref, DerefMut};
+use storable_vec::{StorableVecIndex, StorableVecType, Version};
 
-use crate::Computer;
+#[derive(Debug, Deref, DerefMut)]
+pub struct StorableVec<I, T>(storable_vec::StorableVec<I, T>);
 
-pub struct StorableVec<I, T> {
-    vec: bindex::StorableVec<I, T>,
-    f: Box<dyn Fn(&Indexer, &Computer) -> storable_vec::Result<Vec<(I, T)>>>,
-}
+const FLUSH_EVERY: usize = 10_000;
 
 impl<I, T> StorableVec<I, T>
 where
-    I: TryInto<usize>,
-    T: Sized + Debug + Clone,
+    I: StorableVecIndex,
+    T: StorableVecType,
 {
-    pub fn import<F>(path: &Path, version: Version, f: F) -> io::Result<Self>
+    pub fn import(path: &Path, version: Version) -> io::Result<Self> {
+        Ok(Self(storable_vec::StorableVec::import(path, version)?))
+    }
+
+    fn flush_vec_if_needed(&mut self) -> io::Result<()> {
+        if self.pushed_len() == FLUSH_EVERY {
+            self.flush()
+        } else {
+            Ok(())
+        }
+    }
+
+    pub fn compute_inverse_more_to_less(&mut self, other: &storable_vec::StorableVec<T, I>) -> storable_vec::Result<()>
     where
-        F: Fn(&Indexer, &Computer) -> storable_vec::Result<Vec<(I, T)>> + 'static,
+        I: StorableVecType,
+        T: StorableVecIndex,
     {
-        let vec = bindex::StorableVec::import(path, version)?;
-
-        Ok(Self { vec, f: Box::new(f) })
+        other.iter_from(self.last()?.map(|v| *v).unwrap_or_default(), |(v, i)| {
+            self.push_if_needed(*i, v)
+        })
     }
 
-    pub fn compute(&mut self, indexer: &Indexer, computer: &Computer) -> storable_vec::Result<()> {
-        (self.f)(indexer, computer)?
-            .into_iter()
-            .try_for_each(|(i, v)| self.push_if_needed(i, v))
+    pub fn compute_inverse_less_to_more(
+        &mut self,
+        first_indexes: &storable_vec::StorableVec<T, I>,
+        last_indexes: &storable_vec::StorableVec<T, I>,
+    ) -> color_eyre::Result<()>
+    where
+        I: StorableVecType,
+        T: StorableVecIndex,
+    {
+        let (mut file_last, mut buf_last) = last_indexes.prepare_to_read_at_(self.len())?;
+        first_indexes.iter_from(T::from(self.len()), |(value, first_index)| {
+            let first_index: usize = (*first_index)
+                .try_into()
+                .map_err(|_| storable_vec::Error::FailedKeyTryIntoUsize)?;
+            let last_index = last_indexes.read_exact(&mut file_last, &mut buf_last)?;
+            let last_index: usize = (*last_index)
+                .try_into()
+                .map_err(|_| storable_vec::Error::FailedKeyTryIntoUsize)?;
+            (first_index..last_index).try_for_each(|index| self.push_if_needed(I::from(index), value))?;
+            Ok(())
+        })?;
+        self.flush()?;
+        Ok(())
     }
 
-    // pub fn fill(&mut self) {
-    //     self
-    //         .vecs()
-    //         .height_to_timestamp
-    //         .read_iter(move |(_height, timestamp)| {
-    //             let height = Height::from(_height);
-    //             let date = Date::from(timestamp);
-    //             self.vecs.date_to_first_height.push_if_needed(date, height)?;
-    //             Ok(())
-    //         })?;
-    // }
-}
+    pub fn compute_transform<A, F>(&mut self, other: &storable_vec::StorableVec<I, A>, t: F) -> storable_vec::Result<()>
+    where
+        A: StorableVecType,
+        F: Fn(&A) -> T,
+    {
+        other.iter_from(I::from(self.len()), |(i, a)| self.push_if_needed(i, t(a)))
+    }
 
-impl<I, T> Deref for StorableVec<I, T> {
-    type Target = bindex::StorableVec<I, T>;
-    fn deref(&self) -> &Self::Target {
-        &self.vec
-    }
-}
-impl<I, T> DerefMut for StorableVec<I, T> {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.vec
-    }
-}
-
-pub trait AnyComputedStorableVec {
-    fn compute(&mut self, indexer: &Indexer, computer: &Computer) -> storable_vec::Result<()>;
-}
-
-impl<I, T> AnyComputedStorableVec for StorableVec<I, T>
-where
-    I: TryInto<usize>,
-    T: Sized + Debug + Clone,
-{
-    fn compute(&mut self, indexer: &Indexer, computer: &Computer) -> storable_vec::Result<()> {
-        self.compute(indexer, computer)
+    pub fn compute_is_first_ordered<A>(
+        &mut self,
+        self_to_other: &storable_vec::StorableVec<I, A>,
+        other_to_self: &storable_vec::StorableVec<A, I>,
+    ) -> storable_vec::Result<()>
+    where
+        A: StorableVecIndex + StorableVecType,
+    {
+        // let mut prev_a_opt = None;
+        // self_to_other.iter_from(I::from(self.len()), |(i, a)| {
+        //     if prev_a_opt.is_none() {
+        //         prev_a_opt.replace(a);
+        //         self.push_if_needed(i, other_to_self.read_at(a) == i);
+        //     } else {
+        //         let prev_a = prev_a_opt.unwrap();
+        //         if a != prev_a
+        //     }
+        //     other_to_self.seek_read(a);
+        //     self.push_if_needed(i, t(a));
+        //     Ok(())
+        // })
+        Ok(())
+    }
+
+    pub fn compute_last_index_from_first(
+        &mut self,
+        first_index_vec: &storable_vec::StorableVec<I, T>,
+        final_len: usize,
+    ) -> color_eyre::Result<()>
+    where
+        T: Copy + From<usize> + Sub<T, Output = T> + StorableVecIndex,
+    {
+        let mut prev_index: Option<I> = None;
+        first_index_vec.iter_from(I::from(self.len()), |(i, v)| {
+            if let Some(prev_index) = prev_index {
+                self.push_if_needed(prev_index, *v - T::from(1))?;
+            }
+            prev_index.replace(i);
+            self.flush_vec_if_needed().map_err(storable_vec::Error::IO)
+        })?;
+        if let Some(prev_index) = prev_index {
+            self.push_if_needed(prev_index, T::from(final_len) - T::from(1))?;
+        }
+        self.flush()?;
+        Ok(())
+    }
+
+    pub fn compute_count_from_indexes<T2>(
+        &mut self,
+        first_indexes: &storable_vec::StorableVec<I, T2>,
+        last_indexes: &storable_vec::StorableVec<I, T2>,
+    ) -> color_eyre::Result<()>
+    where
+        T: From<T2>,
+        T2: StorableVecType + Copy + Add<usize, Output = T2> + Sub<T2, Output = T2> + TryInto<T>,
+        <T2 as TryInto<T>>::Error: error::Error + Send + Sync + 'static,
+    {
+        let (mut file_last, mut buf_last) = last_indexes.prepare_to_read_at_(self.len())?;
+        first_indexes.iter_from(I::from(self.len()), |(i, first_index)| {
+            let last_index = last_indexes.read_exact(&mut file_last, &mut buf_last)?;
+            let count = *last_index + 1_usize - *first_index;
+            self.push_if_needed(i, count.into())?;
+            self.flush_vec_if_needed().map_err(storable_vec::Error::IO)
+        })?;
+        self.flush()?;
+        Ok(())
     }
 }
diff --git a/computer/src/storage/storable_vecs/mod.rs b/computer/src/storage/storable_vecs/mod.rs
index 27cf5a856..c2becc932 100644
--- a/computer/src/storage/storable_vecs/mod.rs
+++ b/computer/src/storage/storable_vecs/mod.rs
@@ -1,12 +1,13 @@
 use std::{fs, path::Path};
 
-use bindex::{Addressindex, Amount, Height, StorableVec, Timestamp, Txindex, Txinindex, Txoutindex, Version};
+use bindex::{Addressindex, Amount, Height, Timestamp, Txindex, Txinindex, Txoutindex};
+use storable_vec::Version;
 
 use crate::structs::{Date, Feerate};
 
-// mod base;
+mod base;
 
-// use base::*;
+use base::*;
 
 pub struct StorableVecs {
     pub date_to_first_height: StorableVec<Date, Height>,
@@ -15,7 +16,7 @@ pub struct StorableVecs {
     // pub height_to_fee: StorableVec<Txindex, Amount>,
     // pub height_to_inputcount: StorableVec<Txindex, u32>,
     // pub height_to_last_addressindex: StorableVec<Height, Addressindex>,
-    // pub height_to_last_txindex: StorableVec<Height, Txindex>,
+    pub height_to_last_txindex: StorableVec<Height, Txindex>,
     // pub height_to_last_txoutindex: StorableVec<Height, Txoutindex>,
     // pub height_to_maxfeerate: StorableVec<Txindex, Feerate>,
     // pub height_to_medianfeerate: StorableVec<Txindex, Feerate>,
@@ -25,6 +26,8 @@ pub struct StorableVecs {
     // pub height_to_totalfees: StorableVec<Height, Amount>,
     // pub height_to_txcount: StorableVec<Txindex, u32>,
     pub txindex_to_fee: StorableVec<Txindex, Amount>,
+    pub txindex_to_height: StorableVec<Txindex, Height>,
+    pub txindex_to_is_coinbase: StorableVec<Txindex, bool>,
     // pub txindex_to_feerate: StorableVec<Txindex, Feerate>,
     pub txindex_to_inputcount: StorableVec<Txindex, u32>,
     pub txindex_to_last_txinindex: StorableVec<Txindex, Txinindex>,
@@ -46,7 +49,7 @@ impl StorableVecs {
             //     &path.join("height_to_last_addressindex"),
             //     Version::from(1),
             // )?,
-            // height_to_last_txindex: StorableVec::import(&path.join("height_to_last_txindex"), Version::from(1))?,
+            height_to_last_txindex: StorableVec::import(&path.join("height_to_last_txindex"), Version::from(1))?,
             // height_to_last_txoutindex: StorableVec::import(&path.join("height_to_last_txoutindex"), Version::from(1))?,
             // height_to_maxfeerate: StorableVec::import(&path.join("height_to_maxfeerate"), Version::from(1))?,
             // height_to_medianfeerate: StorableVec::import(&path.join("height_to_medianfeerate"), Version::from(1))?,
@@ -56,6 +59,8 @@ impl StorableVecs {
             // height_to_totalfees: StorableVec::import(&path.join("height_to_totalfees"), Version::from(1))?,
             // height_to_txcount: StorableVec::import(&path.join("height_to_txcount"), Version::from(1))?,
             txindex_to_fee: StorableVec::import(&path.join("txindex_to_fee"), Version::from(1))?,
+            txindex_to_height: StorableVec::import(&path.join("txindex_to_height"), Version::from(1))?,
+            txindex_to_is_coinbase: StorableVec::import(&path.join("txindex_to_is_coinbase"), Version::from(1))?,
             // txindex_to_feerate: StorableVec::import(&path.join("txindex_to_feerate"), Version::from(1))?,
             txindex_to_inputcount: StorableVec::import(&path.join("txindex_to_inputcount"), Version::from(1))?,
             txindex_to_last_txinindex: StorableVec::import(&path.join("txindex_to_last_txinindex"), Version::from(1))?,
diff --git a/computer/src/structs/date.rs b/computer/src/structs/date.rs
index dda76cdea..fd6937b0f 100644
--- a/computer/src/structs/date.rs
+++ b/computer/src/structs/date.rs
@@ -1,9 +1,11 @@
+use std::ops::Add;
+
 use bindex::Timestamp;
 use color_eyre::eyre::eyre;
 use derive_deref::Deref;
-use jiff::{civil::Date as _Date, tz::TimeZone};
+use jiff::{civil::Date as _Date, tz::TimeZone, Span};
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Deref)]
+#[derive(Debug, Default, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Deref)]
 pub struct Date(_Date);
 
 impl Date {
@@ -39,3 +41,16 @@ impl TryFrom<Date> for usize {
         }
     }
 }
+
+impl From<usize> for Date {
+    fn from(value: usize) -> Self {
+        Self(Self::INDEX_ZERO.checked_add(Span::new().days(value as i64)).unwrap())
+    }
+}
+
+impl Add<usize> for Date {
+    type Output = Self;
+    fn add(self, rhs: usize) -> Self::Output {
+        Self(self.0.checked_add(Span::new().days(rhs as i64)).unwrap())
+    }
+}
diff --git a/indexer/Cargo.toml b/indexer/Cargo.toml
index 4a07f4015..2ef5fe3a3 100644
--- a/indexer/Cargo.toml
+++ b/indexer/Cargo.toml
@@ -5,7 +5,6 @@ edition = "2021"
 
 [dependencies]
 bitcoin = { workspace = true }
-bitcoin_hashes = "0.16.0"
 biter = { workspace = true }
 color-eyre = { workspace = true }
 derive_deref = { workspace = true }
diff --git a/indexer/src/lib.rs b/indexer/src/lib.rs
index 6ff495281..2256ebf1b 100644
--- a/indexer/src/lib.rs
+++ b/indexer/src/lib.rs
@@ -104,7 +104,7 @@ impl Indexer {
 
                 height = Height::from(_height);
 
-                if let Some(saved_blockhash) = vecs.height_to_blockhash.get(height)? {
+                if let Some(saved_blockhash) = vecs.height_to_blockhash.cached_get(height)? {
                     if &blockhash != saved_blockhash.as_ref() {
                         todo!("Rollback not implemented");
                         // trees.rollback_from(&mut rtx, height, &exit)?;
@@ -260,7 +260,7 @@ impl Indexer {
 
                                 let txoutindex = *vecs
                                     .txindex_to_first_txoutindex
-                                    .get(prev_txindex)?
+                                    .cached_get(prev_txindex)?
                                     .context("Expect txoutindex to not be none")
                                     .inspect_err(|_| {
                                         dbg!(outpoint.txid, prev_txindex, vout);
@@ -336,12 +336,12 @@ impl Indexer {
 
                                         let prev_addresstype = *vecs
                                             .addressindex_to_addresstype
-                                            .get(addressindex)?
+                                            .cached_get(addressindex)?
                                             .context("Expect to have address type")?;
 
                                         let addresstypeindex = *vecs
                                             .addressindex_to_addresstypeindex
-                                            .get(addressindex)?
+                                            .cached_get(addressindex)?
                                             .context("Expect to have address type index")?;
                                         // Good first time
                                         // Wrong after rerun
@@ -605,7 +605,7 @@ impl Indexer {
                                     // Ok if `get` is not par as should happen only twice
                                     let prev_txid = vecs
                                         .txindex_to_txid
-                                        .get(prev_txindex)?
+                                        .cached_get(prev_txindex)?
                                         .context("To have txid for txindex")
                                         .inspect_err(|_| {
                                             dbg!(txindex, txid, len);
@@ -630,7 +630,7 @@ impl Indexer {
 
                                     if !is_dup {
                                         let prev_height =
-                                            vecs.txindex_to_height.get(prev_txindex)?.expect("To have height");
+                                            vecs.txindex_to_height.cached_get(prev_txindex)?.expect("To have height");
                                         dbg!(height, txid, txindex, prev_height, prev_txid, prev_txindex);
                                         return Err(eyre!("Expect none"));
                                     }
diff --git a/indexer/src/storage/storable_vecs/base.rs b/indexer/src/storage/storable_vecs/base.rs
index 41707602c..8d1030ab7 100644
--- a/indexer/src/storage/storable_vecs/base.rs
+++ b/indexer/src/storage/storable_vecs/base.rs
@@ -1,79 +1,44 @@
 use std::{
     fmt::Debug,
-    fs, io,
+    io,
     ops::{Deref, DerefMut},
     path::{Path, PathBuf},
 };
 
-use super::{Height, Version};
+use storable_vec::{StorableVecIndex, StorableVecType, Version};
+
+use super::Height;
 
 #[derive(Debug)]
 pub struct StorableVec<I, T> {
     height: Option<Height>,
-    pathbuf: PathBuf,
-    version: Version,
     vec: storable_vec::StorableVec<I, T>,
 }
 
 impl<I, T> StorableVec<I, T>
 where
-    I: TryInto<usize>,
-    T: Sized + Debug + Clone,
+    I: StorableVecIndex,
+    T: StorableVecType,
 {
     pub fn import(path: &Path, version: Version) -> io::Result<Self> {
-        fs::create_dir_all(path)?;
-
-        let pathbuf = path.to_owned();
-        let path_vec = Self::path_vec_(path);
-        let path_version = Self::path_version_(path);
-
-        let is_same_version =
-            Version::try_from(path_version.as_path()).is_ok_and(|prev_version| version == prev_version);
-        if !is_same_version {
-            let _ = fs::remove_file(&path_vec);
-            let _ = fs::remove_file(&path_version);
-            let _ = fs::remove_file(Self::path_height_(path));
-        }
-
-        let this = Self {
+        Ok(Self {
             height: Height::try_from(Self::path_height_(path).as_path()).ok(),
-            pathbuf,
-            version,
-            vec: storable_vec::StorableVec::import(&path_vec)?,
-        };
-
-        this.version.write(&this.path_version())?;
-
-        Ok(this)
+            vec: storable_vec::StorableVec::import(path, version)?,
+        })
     }
 
     pub fn flush(&mut self, height: Height) -> io::Result<()> {
         if self.needs(height) {
             height.write(&self.path_height())?;
         }
-
         self.vec.flush()
     }
 
-    // fn path_vec(&self) -> PathBuf {
-    //     Self::_path_vec(&self.path)
-    // }
-    fn path_vec_(path: &Path) -> PathBuf {
-        path.join("vec")
-    }
-
-    fn path_version(&self) -> PathBuf {
-        Self::path_version_(&self.pathbuf)
-    }
-    fn path_version_(path: &Path) -> PathBuf {
-        path.join("version")
-    }
-
     pub fn height(&self) -> color_eyre::Result<Height> {
         Height::try_from(self.path_height().as_path())
     }
     fn path_height(&self) -> PathBuf {
-        Self::path_height_(&self.pathbuf)
+        Self::path_height_(self.vec.path())
     }
     fn path_height_(path: &Path) -> PathBuf {
         path.join("height")
@@ -103,17 +68,22 @@ impl<I, T> DerefMut for StorableVec<I, T> {
 pub trait AnyStorableVec {
     fn height(&self) -> color_eyre::Result<Height>;
     fn flush(&mut self, height: Height) -> io::Result<()>;
+    fn reset_cache(&mut self);
 }
 
 impl<I, T> AnyStorableVec for StorableVec<I, T>
 where
-    I: Into<usize>,
-    T: Sized + Debug + Clone,
+    I: StorableVecIndex,
+    T: StorableVecType,
 {
     fn height(&self) -> color_eyre::Result<Height> {
         self.height()
     }
 
+    fn reset_cache(&mut self) {
+        self.vec.reset_cache()
+    }
+
     fn flush(&mut self, height: Height) -> io::Result<()> {
         self.flush(height)
     }
diff --git a/indexer/src/storage/storable_vecs/mod.rs b/indexer/src/storage/storable_vecs/mod.rs
index 7d251df42..15aa0c749 100644
--- a/indexer/src/storage/storable_vecs/mod.rs
+++ b/indexer/src/storage/storable_vecs/mod.rs
@@ -3,11 +3,12 @@ use std::{fs, io, path::Path};
 use biter::bitcoin::{self, transaction, BlockHash, Txid, Weight};
 use exit::Exit;
 use rayon::prelude::*;
+use storable_vec::Version;
 
 use crate::structs::{
     Addressbytes, Addressindex, Addresstype, Addresstypeindex, Amount, Height, P2PK33AddressBytes, P2PK65AddressBytes,
     P2PKHAddressBytes, P2SHAddressBytes, P2TRAddressBytes, P2WPKHAddressBytes, P2WSHAddressBytes, Timestamp, Txindex,
-    Txinindex, Txoutindex, Version,
+    Txinindex, Txoutindex,
 };
 
 mod base;
@@ -203,37 +204,37 @@ impl StorableVecs {
         Ok(match addresstype {
             Addresstype::P2PK65 => self
                 .p2pk65index_to_p2pk65addressbytes
-                .get(addresstypeindex)?
+                .cached_get(addresstypeindex)?
                 // .map(|v| Addressbytes::from(v.clone())),
                 .map(|v| Addressbytes::from(v.into_inner())),
             Addresstype::P2PK33 => self
                 .p2pk33index_to_p2pk33addressbytes
-                .get(addresstypeindex)?
+                .cached_get(addresstypeindex)?
                 // .map(|v| Addressbytes::from(v.clone())),
                 .map(|v| Addressbytes::from(v.into_inner())),
             Addresstype::P2PKH => self
                 .p2pkhindex_to_p2pkhaddressbytes
-                .get(addresstypeindex)?
+                .cached_get(addresstypeindex)?
                 // .map(|v| Addressbytes::from(v.clone())),
                 .map(|v| Addressbytes::from(v.into_inner())),
             Addresstype::P2SH => self
                 .p2shindex_to_p2shaddressbytes
-                .get(addresstypeindex)?
+                .cached_get(addresstypeindex)?
                 // .map(|v| Addressbytes::from(v.clone())),
                 .map(|v| Addressbytes::from(v.into_inner())),
             Addresstype::P2WPKH => self
                 .p2wpkhindex_to_p2wpkhaddressbytes
-                .get(addresstypeindex)?
+                .cached_get(addresstypeindex)?
                 // .map(|v| Addressbytes::from(v.clone())),
                 .map(|v| Addressbytes::from(v.into_inner())),
             Addresstype::P2WSH => self
                 .p2wshindex_to_p2wshaddressbytes
-                .get(addresstypeindex)?
+                .cached_get(addresstypeindex)?
                 // .map(|v| Addressbytes::from(v.clone())),
                 .map(|v| Addressbytes::from(v.into_inner())),
             Addresstype::P2TR => self
                 .p2trindex_to_p2traddressbytes
-                .get(addresstypeindex)?
+                .cached_get(addresstypeindex)?
                 // .map(|v| Addressbytes::from(v.clone())),
                 .map(|v| Addressbytes::from(v.into_inner())),
             _ => unreachable!(),
@@ -354,6 +355,10 @@ impl StorableVecs {
         // Ok(())
     }
 
+    pub fn reset_cache(&mut self) {
+        self.as_mut_slice().into_par_iter().for_each(|vec| vec.reset_cache())
+    }
+
     pub fn flush(&mut self, height: Height) -> io::Result<()> {
         self.as_mut_slice()
             .into_par_iter()
diff --git a/indexer/src/structs/addressindex.rs b/indexer/src/structs/addressindex.rs
index 02578722b..0a5ea91c9 100644
--- a/indexer/src/structs/addressindex.rs
+++ b/indexer/src/structs/addressindex.rs
@@ -1,3 +1,5 @@
+use std::ops::Add;
+
 use derive_deref::{Deref, DerefMut};
 use fjall::Slice;
 use unsafe_slice_serde::UnsafeSliceSerde;
@@ -60,3 +62,17 @@ impl From<Addressindex> for Slice {
         Self::new(value.unsafe_as_slice())
     }
 }
+
+impl Add<usize> for Addressindex {
+    type Output = Self;
+    fn add(self, rhs: usize) -> Self::Output {
+        Self(self.0 + rhs as u32)
+    }
+}
+
+impl Add<Addressindex> for Addressindex {
+    type Output = Self;
+    fn add(self, rhs: Addressindex) -> Self::Output {
+        Self(self.0 + rhs.0)
+    }
+}
diff --git a/indexer/src/structs/addresstypeindex.rs b/indexer/src/structs/addresstypeindex.rs
index 971be4455..d94938e97 100644
--- a/indexer/src/structs/addresstypeindex.rs
+++ b/indexer/src/structs/addresstypeindex.rs
@@ -1,3 +1,5 @@
+use std::ops::Add;
+
 use derive_deref::{Deref, DerefMut};
 
 #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Deref, DerefMut, Default)]
@@ -50,3 +52,17 @@ impl From<Addresstypeindex> for usize {
         value.0 as usize
     }
 }
+
+impl Add<usize> for Addresstypeindex {
+    type Output = Self;
+    fn add(self, rhs: usize) -> Self::Output {
+        Self(self.0 + rhs as u32)
+    }
+}
+
+impl Add<Addresstypeindex> for Addresstypeindex {
+    type Output = Self;
+    fn add(self, rhs: Addresstypeindex) -> Self::Output {
+        Self(self.0 + rhs.0)
+    }
+}
diff --git a/indexer/src/structs/height.rs b/indexer/src/structs/height.rs
index ee829a992..b9ff4b92f 100644
--- a/indexer/src/structs/height.rs
+++ b/indexer/src/structs/height.rs
@@ -24,11 +24,19 @@ impl PartialEq<u64> for Height {
     }
 }
 
+impl Add<Height> for Height {
+    type Output = Height;
+
+    fn add(self, rhs: Height) -> Self::Output {
+        Self::from(self.0 + rhs.0)
+    }
+}
+
 impl Add<u32> for Height {
     type Output = Height;
 
     fn add(self, rhs: u32) -> Self::Output {
-        Self::from(*self + rhs)
+        Self::from(self.0 + rhs)
     }
 }
 
@@ -42,7 +50,6 @@ impl Add<usize> for Height {
 
 impl Sub<Height> for Height {
     type Output = Height;
-
     fn sub(self, rhs: Height) -> Self::Output {
         Self::from(*self - *rhs)
     }
diff --git a/indexer/src/structs/txindex.rs b/indexer/src/structs/txindex.rs
index 2ec5b4ac6..906e605d8 100644
--- a/indexer/src/structs/txindex.rs
+++ b/indexer/src/structs/txindex.rs
@@ -1,4 +1,4 @@
-use std::ops::{Add, AddAssign};
+use std::ops::{Add, AddAssign, Sub};
 
 use derive_deref::{Deref, DerefMut};
 use fjall::Slice;
@@ -24,12 +24,26 @@ impl Add<Txindex> for Txindex {
     }
 }
 
+impl Add<usize> for Txindex {
+    type Output = Self;
+    fn add(self, rhs: usize) -> Self::Output {
+        Self(self.0 + rhs as u32)
+    }
+}
+
 impl AddAssign<Txindex> for Txindex {
     fn add_assign(&mut self, rhs: Txindex) {
         self.0 += rhs.0
     }
 }
 
+impl Sub<Txindex> for Txindex {
+    type Output = Txindex;
+    fn sub(self, rhs: Txindex) -> Self::Output {
+        Self::from(*self - *rhs)
+    }
+}
+
 impl From<u32> for Txindex {
     fn from(value: u32) -> Self {
         Self(value)
diff --git a/indexer/src/structs/txinindex.rs b/indexer/src/structs/txinindex.rs
index 2c8fcfb07..9c217961c 100644
--- a/indexer/src/structs/txinindex.rs
+++ b/indexer/src/structs/txinindex.rs
@@ -1,8 +1,8 @@
-use std::ops::{Add, AddAssign};
+use std::ops::{Add, AddAssign, Sub};
 
 use derive_deref::{Deref, DerefMut};
 
-use super::Vout;
+use super::Vin;
 
 #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Deref, DerefMut, Default)]
 pub struct Txinindex(u64);
@@ -24,19 +24,42 @@ impl Add<Txinindex> for Txinindex {
     }
 }
 
-impl Add<Vout> for Txinindex {
+impl Add<Vin> for Txinindex {
     type Output = Self;
-    fn add(self, rhs: Vout) -> Self::Output {
+    fn add(self, rhs: Vin) -> Self::Output {
         Self(self.0 + u64::from(rhs))
     }
 }
 
+impl Add<usize> for Txinindex {
+    type Output = Self;
+    fn add(self, rhs: usize) -> Self::Output {
+        Self(self.0 + rhs as u64)
+    }
+}
+
 impl AddAssign<Txinindex> for Txinindex {
     fn add_assign(&mut self, rhs: Txinindex) {
         self.0 += rhs.0
     }
 }
 
+impl Sub<Txinindex> for Txinindex {
+    type Output = Self;
+    fn sub(self, rhs: Txinindex) -> Self::Output {
+        Self(self.0 - rhs.0)
+    }
+}
+
+impl From<Txinindex> for u32 {
+    fn from(value: Txinindex) -> Self {
+        if value.0 > u32::MAX as u64 {
+            panic!()
+        }
+        value.0 as u32
+    }
+}
+
 impl From<u64> for Txinindex {
     fn from(value: u64) -> Self {
         Self(value)
diff --git a/indexer/src/structs/txoutindex.rs b/indexer/src/structs/txoutindex.rs
index bf7517f35..541ae40ab 100644
--- a/indexer/src/structs/txoutindex.rs
+++ b/indexer/src/structs/txoutindex.rs
@@ -1,4 +1,4 @@
-use std::ops::{Add, AddAssign};
+use std::ops::{Add, AddAssign, Sub};
 
 use derive_deref::{Deref, DerefMut};
 
@@ -37,12 +37,35 @@ impl Add<Vout> for Txoutindex {
     }
 }
 
+impl Add<usize> for Txoutindex {
+    type Output = Self;
+    fn add(self, rhs: usize) -> Self::Output {
+        Self(self.0 + rhs as u64)
+    }
+}
+
 impl AddAssign<Txoutindex> for Txoutindex {
     fn add_assign(&mut self, rhs: Txoutindex) {
         self.0 += rhs.0
     }
 }
 
+impl Sub<Txoutindex> for Txoutindex {
+    type Output = Self;
+    fn sub(self, rhs: Txoutindex) -> Self::Output {
+        Self(self.0 - rhs.0)
+    }
+}
+
+impl From<Txoutindex> for u32 {
+    fn from(value: Txoutindex) -> Self {
+        if value.0 > u32::MAX as u64 {
+            panic!()
+        }
+        value.0 as u32
+    }
+}
+
 impl From<u64> for Txoutindex {
     fn from(value: u64) -> Self {
         Self(value)
diff --git a/indexer/src/structs/vin.rs b/indexer/src/structs/vin.rs
index 65524d489..a26e0cfa1 100644
--- a/indexer/src/structs/vin.rs
+++ b/indexer/src/structs/vin.rs
@@ -4,7 +4,8 @@ use derive_deref::Deref;
 pub struct Vin(u32);
 
 impl Vin {
-    const ZERO: Self = Vin(0_u32);
+    pub const ZERO: Self = Vin(0);
+    pub const ONE: Self = Vin(1);
 
     pub fn is_zero(&self) -> bool {
         *self == Self::ZERO
diff --git a/storable_vec/src/any.rs b/storable_vec/src/any.rs
new file mode 100644
index 000000000..ec13a397a
--- /dev/null
+++ b/storable_vec/src/any.rs
@@ -0,0 +1,27 @@
+use std::io;
+
+use crate::{StorableVec, StorableVecIndex, StorableVecType};
+
+pub trait AnyStorableVec {
+    fn len(&self) -> usize;
+    fn is_empty(&self) -> bool;
+    fn unsafe_flush(&mut self) -> io::Result<()>;
+}
+
+impl<I, T> AnyStorableVec for StorableVec<I, T>
+where
+    I: StorableVecIndex,
+    T: StorableVecType,
+{
+    fn len(&self) -> usize {
+        self.len()
+    }
+
+    fn is_empty(&self) -> bool {
+        self.is_empty()
+    }
+
+    fn unsafe_flush(&mut self) -> io::Result<()> {
+        self.flush()
+    }
+}
diff --git a/storable_vec/src/bytes.rs b/storable_vec/src/bytes.rs
new file mode 100644
index 000000000..569d9dd32
--- /dev/null
+++ b/storable_vec/src/bytes.rs
@@ -0,0 +1,11 @@
+use std::sync::Arc;
+
+use crate::Result;
+
+pub trait Bytes: Sized {
+    const LEN: usize = size_of::<Self>();
+    fn to_bytes(&self) -> Arc<[u8]>;
+    fn try_from_bytes(bytes: &[u8]) -> Result<Self>;
+}
+
+pub trait UnsafeBytes {}
diff --git a/storable_vec/src/error.rs b/storable_vec/src/error.rs
new file mode 100644
index 000000000..63f503b52
--- /dev/null
+++ b/storable_vec/src/error.rs
@@ -0,0 +1,34 @@
+use std::{
+    fmt::{self, Debug},
+    io,
+};
+
+pub type Result<T, E = Error> = std::result::Result<T, E>;
+
+#[derive(Debug)]
+pub enum Error {
+    MmapsVecIsTooSmall,
+    IO(io::Error),
+    UnsafeSliceSerde(unsafe_slice_serde::Error),
+    IndexTooHigh,
+    ExpectFileToHaveIndex,
+    ExpectVecToHaveIndex,
+    FailedKeyTryIntoUsize,
+}
+
+impl fmt::Display for Error {
+    // This trait requires `fmt` with this exact signature.
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        match self {
+            Error::MmapsVecIsTooSmall => write!(f, "Mmaps vec is too small"),
+            Error::IO(error) => Debug::fmt(&error, f),
+            Error::UnsafeSliceSerde(error) => Debug::fmt(&error, f),
+            Error::IndexTooHigh => write!(f, "Index too high"),
+            Error::ExpectFileToHaveIndex => write!(f, "Expect file to have index"),
+            Error::ExpectVecToHaveIndex => write!(f, "Expect vec to have index"),
+            Error::FailedKeyTryIntoUsize => write!(f, "Failed to convert key to usize"),
+        }
+    }
+}
+
+impl std::error::Error for Error {}
diff --git a/storable_vec/src/index.rs b/storable_vec/src/index.rs
new file mode 100644
index 000000000..fff90ada1
--- /dev/null
+++ b/storable_vec/src/index.rs
@@ -0,0 +1,11 @@
+use std::{fmt::Debug, ops::Add};
+
+pub trait StorableVecIndex
+where
+    Self: Debug + Default + Copy + Clone + TryInto<usize> + From<usize> + Add<usize, Output = Self>,
+{
+}
+impl<I> StorableVecIndex for I where
+    I: Debug + Default + Copy + Clone + TryInto<usize> + From<usize> + Add<usize, Output = Self>
+{
+}
diff --git a/storable_vec/src/lib.rs b/storable_vec/src/lib.rs
index df2297f25..905c2d952 100644
--- a/storable_vec/src/lib.rs
+++ b/storable_vec/src/lib.rs
@@ -1,21 +1,34 @@
 use std::{
     cmp::Ordering,
-    fmt::{self, Debug},
-    fs::{File, OpenOptions},
+    fmt::Debug,
+    fs::{self, File, OpenOptions},
     io::{self, Read, Seek, SeekFrom, Write},
     marker::PhantomData,
     mem,
-    ops::{Deref, Range},
+    ops::Range,
     path::{Path, PathBuf},
-    sync::{
-        // atomic::{AtomicUsize, Ordering as AtomicOrdering},
-        OnceLock,
-    },
+    sync::OnceLock,
 };
 
 use memmap2::{Mmap, MmapOptions};
 use unsafe_slice_serde::UnsafeSliceSerde;
 
+mod any;
+// mod bytes;
+mod error;
+mod index;
+mod type_;
+mod value;
+mod version;
+
+pub use any::*;
+// pub use bytes::*;
+pub use error::*;
+pub use index::*;
+pub use type_::*;
+pub use value::*;
+pub use version::*;
+
 ///
 /// A very small, fast, efficient and simple storable Vec
 ///
@@ -30,7 +43,7 @@ use unsafe_slice_serde::UnsafeSliceSerde;
 #[derive(Debug)]
 pub struct StorableVec<I, T> {
     pathbuf: PathBuf,
-    file: File,
+    unsafe_file: File,
     cache: Vec<OnceLock<Box<Mmap>>>, // Boxed Mmap to reduce the size of the Lock (from 24 to 16)
     disk_len: usize,
     pushed: Vec<T>,
@@ -50,8 +63,8 @@ const MAX_CACHE_SIZE: usize = 100 * ONE_MB;
 
 impl<I, T> StorableVec<I, T>
 where
-    I: TryInto<usize>,
-    T: Sized + Debug + Clone,
+    I: StorableVecIndex,
+    T: StorableVecType,
 {
     pub const SIZE_OF_T: usize = size_of::<T>();
     pub const PER_PAGE: usize = MAX_PAGE_SIZE / Self::SIZE_OF_T;
@@ -59,13 +72,23 @@ where
     pub const PAGE_SIZE: usize = Self::PER_PAGE * Self::SIZE_OF_T;
     pub const CACHE_LENGTH: usize = MAX_CACHE_SIZE / Self::PAGE_SIZE;
 
-    pub fn import(path: &Path) -> Result<Self, io::Error> {
-        let file = Self::open_file_(path)?;
+    pub fn import(path: &Path, version: Version) -> Result<Self, io::Error> {
+        fs::create_dir_all(path)?;
+
+        let path_version = Self::path_version_(path);
+        let is_same_version =
+            Version::try_from(path_version.as_path()).is_ok_and(|prev_version| version == prev_version);
+        if !is_same_version {
+            fs::remove_dir_all(path)?;
+        }
+        version.write(&path_version)?;
+
+        let unsafe_file = Self::open_file_(&Self::path_vec_(path))?;
 
         let mut this = Self {
             pathbuf: path.to_owned(),
-            disk_len: Self::byte_index_to_index(Self::file_len(&file)?),
-            file,
+            disk_len: Self::disk_len(&unsafe_file)?,
+            unsafe_file,
             cache: vec![],
             pushed: vec![],
             // updated: BTreeMap::new(),
@@ -76,20 +99,17 @@ where
             // opened_mmaps: AtomicUsize::new(0),
         };
 
+        // TODO: Only if write mode
         this.reset_cache();
 
         Ok(this)
     }
 
-    fn file_len(file: &File) -> io::Result<usize> {
-        Ok(file.metadata()?.len() as usize)
+    pub fn disk_len(file: &File) -> io::Result<usize> {
+        Ok(Self::byte_index_to_index(file.metadata()?.len() as usize))
     }
 
-    fn reset_cache(&mut self) {
-        // let len = (self.disk_len as f64 / Self::PER_PAGE as f64).ceil() as usize;
-        // self.cache.clear();
-        // self.cache.resize_with(len, Default::default);
-
+    pub fn reset_cache(&mut self) {
         // par_iter_mut ?
         self.cache.iter_mut().for_each(|lock| {
             lock.take();
@@ -105,7 +125,7 @@ where
     }
 
     fn open_file(&self) -> Result<File, Error> {
-        Self::open_file_(&self.pathbuf).map_err(Error::IO)
+        Self::open_file_(&self.path_vec()).map_err(Error::IO)
     }
     fn open_file_(path: &Path) -> Result<File, io::Error> {
         OpenOptions::new()
@@ -146,10 +166,10 @@ where
     }
 
     #[inline]
-    pub fn get(&self, index: I) -> Result<Option<Value<'_, T>>> {
-        self.get_(index.try_into().map_err(|_| Error::FailedKeyTryIntoUsize)?)
+    pub fn cached_get(&self, index: I) -> Result<Option<Value<'_, T>>> {
+        self.cached_get_(index.try_into().map_err(|_| Error::FailedKeyTryIntoUsize)?)
     }
-    pub fn get_(&self, index: usize) -> Result<Option<Value<'_, T>>> {
+    fn cached_get_(&self, index: usize) -> Result<Option<Value<'_, T>>> {
         match self.index_to_pushed_index(index) {
             Ok(index) => {
                 if let Some(index) = index {
@@ -166,7 +186,6 @@ where
         //     }
         // }
 
-        let byte_index = Self::index_to_byte_index(index);
         let page_index = index / Self::PER_PAGE;
         let last_index = self.disk_len - 1;
         let max_page_index = last_index / Self::PER_PAGE;
@@ -188,7 +207,7 @@ where
                         MmapOptions::new()
                             .len(Self::PAGE_SIZE)
                             .offset((page_index * Self::PAGE_SIZE) as u64)
-                            .map(&self.file)
+                            .map(&self.unsafe_file)
                             .unwrap()
                     })
                 });
@@ -201,49 +220,78 @@ where
                 T::unsafe_try_from_slice(slice).map_err(Error::UnsafeSliceSerde)?,
             )))
         } else {
-            let mut file = self.open_file()?;
-            let mut buf = vec![0; Self::SIZE_OF_T];
-
-            file.seek(SeekFrom::Start(byte_index as u64)).map_err(Error::IO)?;
-            file.read_exact(&mut buf).map_err(Error::IO)?;
-            let value = T::unsafe_try_from_slice(&buf[..]).map_err(Error::UnsafeSliceSerde)?;
-
+            let (mut file, mut buf) = self.prepare_to_read()?;
+            Self::seek_(&mut file, index)?;
+            let value = self.read_exact(&mut file, &mut buf)?;
             Ok(Some(Value::Owned(value.to_owned())))
         }
     }
+
     pub fn get_or_default(&self, index: I) -> Result<T>
     where
         T: Default + Clone,
     {
-        Ok(self.get(index)?.map(|v| (*v).clone()).unwrap_or(Default::default()))
+        Ok(self
+            .cached_get(index)?
+            .map(|v| (*v).clone())
+            .unwrap_or(Default::default()))
     }
 
-    pub fn read_iter<F>(&self, f: F) -> Result<()>
-    where
-        F: FnMut((usize, &T)) -> Result<()>,
-    {
-        self.read_from_(0, f)
+    pub fn seek(file: &mut File, index: I) -> Result<()> {
+        Self::seek_(file, index.try_into().map_err(|_| Error::FailedKeyTryIntoUsize)?)
     }
 
-    pub fn read_from_<F>(&self, index: usize, mut f: F) -> Result<()>
-    where
-        F: FnMut((usize, &T)) -> Result<()>,
-    {
-        let mut file = self.open_file()?;
-        let mut buf = vec![0; Self::SIZE_OF_T];
-
+    pub fn seek_(file: &mut File, index: usize) -> Result<()> {
         let byte_index = Self::index_to_byte_index(index);
-
         file.seek(SeekFrom::Start(byte_index as u64)).map_err(Error::IO)?;
+        Ok(())
+    }
 
-        let mut i = 0;
+    pub fn iter<F>(&self, f: F) -> Result<()>
+    where
+        F: FnMut((I, &T)) -> Result<()>,
+    {
+        self.iter_from(I::from(0_usize), f)
+    }
 
-        loop {
-            if file.read_exact(&mut buf).map_err(Error::IO).is_err() {
-                break;
-            }
-            let v = T::unsafe_try_from_slice(&buf[..]).map_err(Error::UnsafeSliceSerde)?;
-            f((i, v))?;
+    pub fn prepare_to_read(&self) -> Result<(File, Vec<u8>)> {
+        let file = self.open_file()?;
+        let buf = vec![0; Self::SIZE_OF_T];
+        Ok((file, buf))
+    }
+
+    pub fn prepare_to_read_at(&self, index: I) -> Result<(File, Vec<u8>)> {
+        self.prepare_to_read_at_(index.try_into().map_err(|_| Error::FailedKeyTryIntoUsize)?)
+    }
+    pub fn prepare_to_read_at_(&self, index: usize) -> Result<(File, Vec<u8>)> {
+        let (mut file, buf) = self.prepare_to_read()?;
+        Self::seek_(&mut file, index)?;
+        Ok((file, buf))
+    }
+
+    pub fn read_exact<'a>(&self, file: &'a mut File, buf: &'a mut [u8]) -> Result<&'a T> {
+        file.read_exact(buf).map_err(Error::IO)?;
+        let v = T::unsafe_try_from_slice(&buf[..]).map_err(Error::UnsafeSliceSerde)?;
+        Ok(v)
+    }
+
+    pub fn iter_from<F>(&self, index: I, mut f: F) -> Result<()>
+    where
+        F: FnMut((I, &T)) -> Result<()>,
+    {
+        let (mut file, mut buf) = self.prepare_to_read()?;
+        let disk_len = Self::disk_len(&file).map_err(Error::IO)?;
+        Self::seek(&mut file, index)?;
+
+        let mut i: usize = index.try_into().map_err(|_| Error::FailedKeyTryIntoUsize)?;
+        while i < disk_len {
+            let v = self.read_exact(&mut file, &mut buf)?;
+            f((I::from(i), v))?;
+            i += 1;
+        }
+        i = 0;
+        while i < self.pushed_len() {
+            f((I::from(i + disk_len), self.pushed.get(i).as_ref().unwrap()))?;
             i += 1;
         }
 
@@ -252,7 +300,7 @@ where
 
     #[allow(unused)]
     pub fn first(&self) -> Result<Option<Value<'_, T>>> {
-        self.get_(0)
+        self.cached_get_(0)
     }
 
     #[allow(unused)]
@@ -261,7 +309,7 @@ where
         if len == 0 {
             return Ok(None);
         }
-        self.get_(len - 1)
+        self.cached_get_(len - 1)
     }
 
     pub fn push(&mut self, value: T) {
@@ -271,7 +319,7 @@ where
     pub fn push_if_needed(&mut self, index: I, value: T) -> Result<()> {
         self.push_if_needed_(index.try_into().map_err(|_| Error::FailedKeyTryIntoUsize)?, value)
     }
-    pub fn push_if_needed_(&mut self, index: usize, value: T) -> Result<()> {
+    fn push_if_needed_(&mut self, index: usize, value: T) -> Result<()> {
         let len = self.len();
         match len.cmp(&index) {
             Ordering::Greater => {
@@ -331,7 +379,11 @@ where
     // }
 
     pub fn len(&self) -> usize {
-        self.disk_len + self.pushed.len()
+        self.disk_len + self.pushed_len()
+    }
+
+    pub fn pushed_len(&self) -> usize {
+        self.pushed.len()
     }
 
     pub fn is_empty(&self) -> bool {
@@ -341,18 +393,30 @@ where
     pub fn has(&self, index: I) -> Result<bool> {
         Ok(self.has_(index.try_into().map_err(|_| Error::FailedKeyTryIntoUsize)?))
     }
-    pub fn has_(&self, index: usize) -> bool {
+    fn has_(&self, index: usize) -> bool {
         index < self.len()
     }
 
     pub fn hasnt(&self, index: I) -> Result<bool> {
         Ok(self.hasnt_(index.try_into().map_err(|_| Error::FailedKeyTryIntoUsize)?))
     }
-    pub fn hasnt_(&self, index: usize) -> bool {
+    fn hasnt_(&self, index: usize) -> bool {
         !self.has_(index)
     }
 
+    // pub fn flush(&mut self) -> io::Result<()>
+    // where
+    //     T: Bytes,
+    // {
+    //     self.flush_(|bytes, v| bytes.extend_from_slice(&v.to_bytes()))
+    // }
     pub fn flush(&mut self) -> io::Result<()> {
+        //     self.flush_(|bytes, v| bytes.extend_from_slice(v.unsafe_as_slice()))
+        // }
+        // fn flush_<F>(&mut self, mut extend: F) -> io::Result<()>
+        // where
+        //     F: FnMut(&mut Vec<u8>, T),
+        // {
         self.reset_cache();
 
         if self.pushed.is_empty() {
@@ -366,99 +430,25 @@ where
         mem::take(&mut self.pushed)
             .into_iter()
             .for_each(|v| bytes.extend_from_slice(v.unsafe_as_slice()));
+        // .for_each(|v| extend(&mut bytes, v));
 
-        self.file.write_all(&bytes)?;
+        self.unsafe_file.write_all(&bytes)?;
 
         Ok(())
     }
-}
 
-pub trait AnyStorableVec {
-    fn len(&self) -> usize;
-    fn is_empty(&self) -> bool;
-    fn flush(&mut self) -> io::Result<()>;
-}
-
-impl<I, T> AnyStorableVec for StorableVec<I, T>
-where
-    I: Into<usize>,
-    T: Sized + Debug + Clone,
-{
-    fn len(&self) -> usize {
-        self.len()
+    pub fn path(&self) -> &Path {
+        &self.pathbuf
     }
 
-    fn is_empty(&self) -> bool {
-        self.is_empty()
+    fn path_vec(&self) -> PathBuf {
+        Self::path_vec_(&self.pathbuf)
+    }
+    fn path_vec_(path: &Path) -> PathBuf {
+        path.join("vec")
     }
 
-    fn flush(&mut self) -> io::Result<()> {
-        self.flush()
+    fn path_version_(path: &Path) -> PathBuf {
+        path.join("version")
     }
 }
-
-#[derive(Debug, Clone)]
-pub enum Value<'a, T> {
-    Ref(&'a T),
-    Owned(T),
-}
-
-impl<T> Value<'_, T>
-where
-    T: Sized + Debug + Clone,
-{
-    pub fn into_inner(self) -> T {
-        match self {
-            Self::Ref(t) => t.to_owned(),
-            Self::Owned(t) => t,
-        }
-    }
-}
-impl<T> Deref for Value<'_, T> {
-    type Target = T;
-    fn deref(&self) -> &Self::Target {
-        match self {
-            Self::Ref(t) => t,
-            Self::Owned(t) => t,
-        }
-    }
-}
-impl<T> AsRef<T> for Value<'_, T>
-where
-    T: Sized + Debug + Clone,
-{
-    fn as_ref(&self) -> &T {
-        match self {
-            Self::Ref(t) => t,
-            Self::Owned(t) => t,
-        }
-    }
-}
-
-pub type Result<T, E = Error> = std::result::Result<T, E>;
-
-#[derive(Debug)]
-pub enum Error {
-    MmapsVecIsTooSmall,
-    IO(io::Error),
-    UnsafeSliceSerde(unsafe_slice_serde::Error),
-    IndexTooHigh,
-    ExpectFileToHaveIndex,
-    ExpectVecToHaveIndex,
-    FailedKeyTryIntoUsize,
-}
-impl fmt::Display for Error {
-    // This trait requires `fmt` with this exact signature.
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        match self {
-            Error::MmapsVecIsTooSmall => write!(f, "Mmaps vec is too small"),
-            Error::IO(error) => Debug::fmt(&error, f),
-            Error::UnsafeSliceSerde(error) => Debug::fmt(&error, f),
-            Error::IndexTooHigh => write!(f, "Index too high"),
-            Error::ExpectFileToHaveIndex => write!(f, "Expect file to have index"),
-            Error::ExpectVecToHaveIndex => write!(f, "Expect vec to have index"),
-            Error::FailedKeyTryIntoUsize => write!(f, "Failed to convert key to usize"),
-        }
-    }
-}
-impl std::error::Error for Error {}
diff --git a/storable_vec/src/main.rs b/storable_vec/src/main.rs
index a71155def..8a32b4ed2 100644
--- a/storable_vec/src/main.rs
+++ b/storable_vec/src/main.rs
@@ -1,24 +1,24 @@
 use std::path::Path;
 
-use storable_vec::StorableVec;
+use storable_vec::{StorableVec, Version};
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     {
-        let mut vec: StorableVec<usize, u32> = StorableVec::import(Path::new("./v"))?;
+        let mut vec: StorableVec<usize, u32> = StorableVec::import(Path::new("./v"), Version::from(1))?;
 
         vec.push(0);
         vec.push(1);
         vec.push(2);
-        dbg!(vec.get(0)?); // Some(0)
-        dbg!(vec.get(21)?); // None
+        dbg!(vec.cached_get(0)?); // Some(0)
+        dbg!(vec.cached_get(21)?); // None
 
         vec.flush()?;
     }
 
     {
-        let vec: StorableVec<usize, u32> = StorableVec::import(Path::new("./v"))?;
+        let vec: StorableVec<usize, u32> = StorableVec::import(Path::new("./v"), Version::from(1))?;
 
-        dbg!(vec.get(0)?); // 0
+        dbg!(vec.cached_get(0)?); // 0
     }
 
     Ok(())
diff --git a/storable_vec/src/type_.rs b/storable_vec/src/type_.rs
new file mode 100644
index 000000000..5fdeeeeef
--- /dev/null
+++ b/storable_vec/src/type_.rs
@@ -0,0 +1,8 @@
+use std::fmt::Debug;
+
+pub trait StorableVecType
+where
+    Self: Sized + Debug + Clone,
+{
+}
+impl<T> StorableVecType for T where T: Sized + Debug + Clone {}
diff --git a/storable_vec/src/value.rs b/storable_vec/src/value.rs
new file mode 100644
index 000000000..7adaf7bb2
--- /dev/null
+++ b/storable_vec/src/value.rs
@@ -0,0 +1,39 @@
+use std::{fmt::Debug, ops::Deref};
+
+#[derive(Debug, Clone)]
+pub enum Value<'a, T> {
+    Ref(&'a T),
+    Owned(T),
+}
+
+impl<T> Value<'_, T>
+where
+    T: Sized + Debug + Clone,
+{
+    pub fn into_inner(self) -> T {
+        match self {
+            Self::Ref(t) => t.to_owned(),
+            Self::Owned(t) => t,
+        }
+    }
+}
+impl<T> Deref for Value<'_, T> {
+    type Target = T;
+    fn deref(&self) -> &Self::Target {
+        match self {
+            Self::Ref(t) => t,
+            Self::Owned(t) => t,
+        }
+    }
+}
+impl<T> AsRef<T> for Value<'_, T>
+where
+    T: Sized + Debug + Clone,
+{
+    fn as_ref(&self) -> &T {
+        match self {
+            Self::Ref(t) => t,
+            Self::Owned(t) => t,
+        }
+    }
+}
diff --git a/storable_vec/src/version.rs b/storable_vec/src/version.rs
new file mode 100644
index 000000000..e3c22c552
--- /dev/null
+++ b/storable_vec/src/version.rs
@@ -0,0 +1,29 @@
+use std::{
+    fs,
+    io::{self, Read},
+    path::Path,
+};
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
+pub struct Version(u32);
+
+impl Version {
+    pub fn write(&self, path: &Path) -> Result<(), io::Error> {
+        fs::write(path, self.0.to_le_bytes())
+    }
+}
+
+impl From<u32> for Version {
+    fn from(value: u32) -> Self {
+        Self(value)
+    }
+}
+
+impl TryFrom<&Path> for Version {
+    type Error = io::Error;
+    fn try_from(value: &Path) -> Result<Self, Self::Error> {
+        let mut buf = [0; 4];
+        fs::read(value)?.as_slice().read_exact(&mut buf)?;
+        Ok(Self(u32::from_le_bytes(buf)))
+    }
+}
diff --git a/struct_iterable/struct_iterable_derive/Cargo.toml b/struct_iterable/struct_iterable_derive/Cargo.toml
index c47efa491..3f591a895 100644
--- a/struct_iterable/struct_iterable_derive/Cargo.toml
+++ b/struct_iterable/struct_iterable_derive/Cargo.toml
@@ -13,5 +13,3 @@ proc-macro = true
 [dependencies]
 syn = "2.0.96"
 quote = "1.0.38"
-proc-macro2 = "1.0.93"
-struct_iterable_internal = { path = "../struct_iterable_internal" }

From 42c996e16e489588ab41a22aa56b3d78fd457bc9 Mon Sep 17 00:00:00 2001
From: nym21 <expat-epochs0i@icloud.com>
Date: Sun, 2 Feb 2025 23:55:05 +0100
Subject: [PATCH 36/63] global: snapshot

---
 Cargo.lock                                    | 20 +++++-----
 Cargo.toml                                    |  2 +-
 iterator/Cargo.toml                           |  2 +-
 storable_vec/src/{ => enums}/error.rs         |  0
 storable_vec/src/enums/mod.rs                 |  5 +++
 storable_vec/src/{ => enums}/value.rs         |  0
 storable_vec/src/lib.rs                       | 37 ++++++++++++-------
 storable_vec/src/structs/mod.rs               |  3 ++
 storable_vec/src/{ => structs}/version.rs     |  0
 storable_vec/src/{ => traits}/any.rs          |  4 +-
 storable_vec/src/{ => traits}/bytes.rs        |  0
 storable_vec/src/{ => traits}/index.rs        |  0
 storable_vec/src/traits/mod.rs                |  8 ++++
 storable_vec/src/{ => traits}/type_.rs        |  0
 .../struct_iterable_derive/Cargo.toml         |  2 +-
 15 files changed, 55 insertions(+), 28 deletions(-)
 rename storable_vec/src/{ => enums}/error.rs (100%)
 create mode 100644 storable_vec/src/enums/mod.rs
 rename storable_vec/src/{ => enums}/value.rs (100%)
 create mode 100644 storable_vec/src/structs/mod.rs
 rename storable_vec/src/{ => structs}/version.rs (100%)
 rename storable_vec/src/{ => traits}/any.rs (86%)
 rename storable_vec/src/{ => traits}/bytes.rs (100%)
 rename storable_vec/src/{ => traits}/index.rs (100%)
 create mode 100644 storable_vec/src/traits/mod.rs
 rename storable_vec/src/{ => traits}/type_.rs (100%)

diff --git a/Cargo.lock b/Cargo.lock
index 544e428e2..918eb85d9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -371,7 +371,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.96",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -487,9 +487,9 @@ checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
 
 [[package]]
 name = "jiff"
-version = "0.1.28"
+version = "0.1.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c607c728e28764fecde611a2764a3a5db19ae21dcec46f292244f5cc5c085a81"
+checksum = "c04ef77ae73f3cf50510712722f0c4e8b46f5aaa1bf5ffad2ae213e6495e78e5"
 dependencies = [
  "jiff-tzdb-platform",
  "log",
@@ -898,14 +898,14 @@ checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.96",
+ "syn 2.0.98",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.137"
+version = "1.0.138"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "930cfb6e6abf99298aaad7d29abbef7a9999a9a8806a40088f55f0dcec03146b"
+checksum = "d434192e7da787e94a6ea7e9670b26a036d0ca41e0b7efb2676dd32bae872949"
 dependencies = [
  "itoa",
  "memchr",
@@ -961,7 +961,7 @@ name = "struct_iterable_derive"
 version = "0.1.0"
 dependencies = [
  "quote",
- "syn 2.0.96",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -981,9 +981,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.96"
+version = "2.0.98"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5d0adab1ae378d7f53bdebc67a39f1f151407ef230f0ce2883572f5d8985c80"
+checksum = "36147f1a48ae0ec2b5b3bc5b537d267457555a10dc06f3dbc8cb11ba3006d3b1"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1196,5 +1196,5 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.96",
+ "syn 2.0.98",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 947468aa0..d8e9bfe38 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -19,7 +19,7 @@ color-eyre = "0.6.3"
 derive_deref = "1.1.1"
 exit = { path = "exit" }
 fjall = "2.5.0"
-jiff = "0.1.28"
+jiff = "0.1.29"
 rayon = "1.10.0"
 storable_vec = { path = "storable_vec" }
 struct_iterable = { path = "struct_iterable" }
diff --git a/iterator/Cargo.toml b/iterator/Cargo.toml
index 853d673db..15a8700c5 100644
--- a/iterator/Cargo.toml
+++ b/iterator/Cargo.toml
@@ -13,7 +13,7 @@ bitcoin = { workspace = true }
 rayon = { workspace = true }
 crossbeam = { version = "0.8.4", features = ["crossbeam-channel"] }
 serde = { version = "1.0.217", features = ["derive"] }
-serde_json = "1.0.137"
+serde_json = "1.0.138"
 derive_deref = { workspace = true }
 bitcoincore-rpc = "0.19.0"
 # tokio = { version = "1.39.2", features = ["rt-multi-thread"] }
diff --git a/storable_vec/src/error.rs b/storable_vec/src/enums/error.rs
similarity index 100%
rename from storable_vec/src/error.rs
rename to storable_vec/src/enums/error.rs
diff --git a/storable_vec/src/enums/mod.rs b/storable_vec/src/enums/mod.rs
new file mode 100644
index 000000000..9198ca8e0
--- /dev/null
+++ b/storable_vec/src/enums/mod.rs
@@ -0,0 +1,5 @@
+mod error;
+mod value;
+
+pub use error::*;
+pub use value::*;
diff --git a/storable_vec/src/value.rs b/storable_vec/src/enums/value.rs
similarity index 100%
rename from storable_vec/src/value.rs
rename to storable_vec/src/enums/value.rs
diff --git a/storable_vec/src/lib.rs b/storable_vec/src/lib.rs
index 905c2d952..5613cb6a8 100644
--- a/storable_vec/src/lib.rs
+++ b/storable_vec/src/lib.rs
@@ -13,21 +13,28 @@ use std::{
 use memmap2::{Mmap, MmapOptions};
 use unsafe_slice_serde::UnsafeSliceSerde;
 
-mod any;
-// mod bytes;
-mod error;
-mod index;
-mod type_;
-mod value;
-mod version;
+mod enums;
+mod structs;
+mod traits;
 
-pub use any::*;
-// pub use bytes::*;
-pub use error::*;
-pub use index::*;
-pub use type_::*;
-pub use value::*;
-pub use version::*;
+pub use enums::*;
+pub use structs::*;
+pub use traits::*;
+
+/// Uses `Mmap` instead of `File`
+///
+/// Used in `/indexer`
+const CACHED: u8 = 0;
+
+/// Will use the same `File` for every read, so not thread safe
+///
+/// Used in `/computer`
+const RAW_SYNC: u8 = 1;
+
+/// Will spin up a new `File` for every read
+///
+/// Used in `/server`
+const RAW_ASYNC: u8 = 2;
 
 ///
 /// A very small, fast, efficient and simple storable Vec
@@ -45,6 +52,7 @@ pub struct StorableVec<I, T> {
     pathbuf: PathBuf,
     unsafe_file: File,
     cache: Vec<OnceLock<Box<Mmap>>>, // Boxed Mmap to reduce the size of the Lock (from 24 to 16)
+    buf: Vec<u8>,
     disk_len: usize,
     pushed: Vec<T>,
     // updated: BTreeMap<usize, T>,
@@ -89,6 +97,7 @@ where
             pathbuf: path.to_owned(),
             disk_len: Self::disk_len(&unsafe_file)?,
             unsafe_file,
+            buf: vec![0; Self::SIZE_OF_T],
             cache: vec![],
             pushed: vec![],
             // updated: BTreeMap::new(),
diff --git a/storable_vec/src/structs/mod.rs b/storable_vec/src/structs/mod.rs
new file mode 100644
index 000000000..7a60bc383
--- /dev/null
+++ b/storable_vec/src/structs/mod.rs
@@ -0,0 +1,3 @@
+mod version;
+
+pub use version::*;
diff --git a/storable_vec/src/version.rs b/storable_vec/src/structs/version.rs
similarity index 100%
rename from storable_vec/src/version.rs
rename to storable_vec/src/structs/version.rs
diff --git a/storable_vec/src/any.rs b/storable_vec/src/traits/any.rs
similarity index 86%
rename from storable_vec/src/any.rs
rename to storable_vec/src/traits/any.rs
index ec13a397a..22ff38e9c 100644
--- a/storable_vec/src/any.rs
+++ b/storable_vec/src/traits/any.rs
@@ -1,6 +1,8 @@
 use std::io;
 
-use crate::{StorableVec, StorableVecIndex, StorableVecType};
+use crate::StorableVec;
+
+use super::{StorableVecIndex, StorableVecType};
 
 pub trait AnyStorableVec {
     fn len(&self) -> usize;
diff --git a/storable_vec/src/bytes.rs b/storable_vec/src/traits/bytes.rs
similarity index 100%
rename from storable_vec/src/bytes.rs
rename to storable_vec/src/traits/bytes.rs
diff --git a/storable_vec/src/index.rs b/storable_vec/src/traits/index.rs
similarity index 100%
rename from storable_vec/src/index.rs
rename to storable_vec/src/traits/index.rs
diff --git a/storable_vec/src/traits/mod.rs b/storable_vec/src/traits/mod.rs
new file mode 100644
index 000000000..2a8c9e8ae
--- /dev/null
+++ b/storable_vec/src/traits/mod.rs
@@ -0,0 +1,8 @@
+mod any;
+// mod bytes;
+mod index;
+mod type_;
+
+pub use any::*;
+pub use index::*;
+pub use type_::*;
diff --git a/storable_vec/src/type_.rs b/storable_vec/src/traits/type_.rs
similarity index 100%
rename from storable_vec/src/type_.rs
rename to storable_vec/src/traits/type_.rs
diff --git a/struct_iterable/struct_iterable_derive/Cargo.toml b/struct_iterable/struct_iterable_derive/Cargo.toml
index 3f591a895..a48babad4 100644
--- a/struct_iterable/struct_iterable_derive/Cargo.toml
+++ b/struct_iterable/struct_iterable_derive/Cargo.toml
@@ -11,5 +11,5 @@ proc-macro = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-syn = "2.0.96"
+syn = "2.0.98"
 quote = "1.0.38"

From d11a1622f89a45de7b46ccbb73231e0f2d6d9170 Mon Sep 17 00:00:00 2001
From: nym21 <expat-epochs0i@icloud.com>
Date: Tue, 4 Feb 2025 20:56:48 +0100
Subject: [PATCH 37/63] storable_vec: add modes

---
 Cargo.toml                                 |   1 +
 computer/src/lib.rs                        |  44 +-
 computer/src/main.rs                       |   3 +-
 computer/src/storage/storable_vecs/base.rs |  73 +--
 computer/src/storage/storable_vecs/mod.rs  |  50 +-
 computer/src/structs/date.rs               |   8 +-
 indexer/src/lib.rs                         |  58 +-
 indexer/src/main.rs                        |   3 +-
 indexer/src/storage/storable_vecs/base.rs  |  25 +-
 indexer/src/storage/storable_vecs/mod.rs   | 214 ++++---
 storable_vec/src/enums/error.rs            |  27 +-
 storable_vec/src/lib.rs                    | 648 ++++++++++++++-------
 storable_vec/src/main.rs                   |  13 +-
 storable_vec/src/structs/version.rs        |  14 +-
 storable_vec/src/traits/any.rs             |   6 +-
 storable_vec/src/traits/index.rs           |   4 +-
 16 files changed, 696 insertions(+), 495 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index d8e9bfe38..1d166cb17 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -24,3 +24,4 @@ rayon = "1.10.0"
 storable_vec = { path = "storable_vec" }
 struct_iterable = { path = "struct_iterable" }
 unsafe_slice_serde = { path = "unsafe_slice_serde" }
+zerocopy = "0.8.15"
diff --git a/computer/src/lib.rs b/computer/src/lib.rs
index 124ed8369..10a889e6b 100644
--- a/computer/src/lib.rs
+++ b/computer/src/lib.rs
@@ -7,16 +7,17 @@ use exit::Exit;
 mod storage;
 mod structs;
 
+use storable_vec::{CACHED_GETS, SINGLE_THREAD};
 use storage::{Fjalls, StorableVecs};
 use structs::*;
 
-pub struct Computer {
+pub struct Computer<const MODE: u8> {
     outputs_dir: PathBuf,
-    vecs: StorableVecs,
+    vecs: StorableVecs<MODE>,
     trees: Fjalls,
 }
 
-impl Computer {
+impl<const MODE: u8> Computer<MODE> {
     pub fn import(outputs_dir: &Path) -> color_eyre::Result<Self> {
         let outputs_dir = outputs_dir.to_owned();
         let computed_dir = outputs_dir.join("computed");
@@ -29,56 +30,63 @@ impl Computer {
         })
     }
 
-    pub fn compute(&mut self, bitcoin_dir: &Path, rpc: rpc::Client, exit: &Exit) -> color_eyre::Result<()> {
-        let mut indexer = Indexer::import(&self.outputs_dir.join("indexes"))?;
+    fn open_indexer<const MODE_IDX: u8>(&self) -> color_eyre::Result<Indexer<MODE_IDX>> {
+        Indexer::import(&self.outputs_dir.join("indexes"))
+    }
+}
 
+impl Computer<SINGLE_THREAD> {
+    pub fn compute(&mut self, bitcoin_dir: &Path, rpc: rpc::Client, exit: &Exit) -> color_eyre::Result<()> {
         if false {
+            let mut indexer: Indexer<CACHED_GETS> = self.open_indexer()?;
             indexer.index(bitcoin_dir, rpc, exit)?;
         }
 
-        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();
-        let txoutindexes_count = indexer.vecs().txoutindex_to_addressindex.len();
+        let mut indexer: Indexer<SINGLE_THREAD> = self.open_indexer()?;
+
+        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();
+        let txoutindexes_count = indexer.vecs.txoutindex_to_addressindex.len();
 
         // TODO: Remove all outdated
 
         self.vecs
             .txindex_to_last_txinindex
-            .compute_last_index_from_first(&indexer.vecs().txindex_to_first_txinindex, txinindexes_count)?;
+            .compute_last_index_from_first(&indexer.vecs.txindex_to_first_txinindex, txinindexes_count)?;
 
         self.vecs.txindex_to_inputcount.compute_count_from_indexes(
-            &indexer.vecs().txindex_to_first_txinindex,
+            &indexer.vecs.txindex_to_first_txinindex,
             &self.vecs.txindex_to_last_txinindex,
         )?;
 
         self.vecs
             .txindex_to_last_txoutindex
-            .compute_last_index_from_first(&indexer.vecs().txindex_to_first_txoutindex, txoutindexes_count)?;
+            .compute_last_index_from_first(&indexer.vecs.txindex_to_first_txoutindex, txoutindexes_count)?;
 
         self.vecs.txindex_to_outputcount.compute_count_from_indexes(
-            &indexer.vecs().txindex_to_first_txoutindex,
+            &indexer.vecs.txindex_to_first_txoutindex,
             &self.vecs.txindex_to_last_txoutindex,
         )?;
 
         self.vecs
             .height_to_date
-            .compute_transform(&indexer.vecs().height_to_timestamp, |timestamp| Date::from(timestamp))?;
+            .compute_transform(&mut indexer.vecs.height_to_timestamp, |timestamp| Date::from(timestamp))?;
 
         self.vecs
             .height_to_last_txindex
-            .compute_last_index_from_first(&indexer.vecs().height_to_first_txindex, height_count)?;
+            .compute_last_index_from_first(&indexer.vecs.height_to_first_txindex, height_count)?;
 
         self.vecs.txindex_to_height.compute_inverse_less_to_more(
-            &indexer.vecs().height_to_first_txindex,
-            &self.vecs.height_to_last_txindex,
+            &mut indexer.vecs.height_to_first_txindex,
+            &mut self.vecs.height_to_last_txindex,
         )?;
 
         let date_count = self.vecs.height_to_date.len();
 
         self.vecs
             .date_to_first_height
-            .compute_inverse_more_to_less(&self.vecs.height_to_date)?;
+            .compute_inverse_more_to_less(&mut self.vecs.height_to_date)?;
 
         // ---
         // Date to X
diff --git a/computer/src/main.rs b/computer/src/main.rs
index 92623c1ed..d6c4fd584 100644
--- a/computer/src/main.rs
+++ b/computer/src/main.rs
@@ -3,6 +3,7 @@ use std::path::Path;
 use biter::rpc;
 use bomputer::Computer;
 use exit::Exit;
+use storable_vec::SINGLE_THREAD;
 
 mod structs;
 
@@ -18,7 +19,7 @@ pub fn main() -> color_eyre::Result<()> {
 
     let i = std::time::Instant::now();
 
-    let mut computer = Computer::import(Path::new("../_outputs"))?;
+    let mut computer: Computer<SINGLE_THREAD> = Computer::import(Path::new("../_outputs"))?;
 
     computer.compute(data_dir, rpc, &exit)?;
 
diff --git a/computer/src/storage/storable_vecs/base.rs b/computer/src/storage/storable_vecs/base.rs
index b19e8196a..a3cb4f25e 100644
--- a/computer/src/storage/storable_vecs/base.rs
+++ b/computer/src/storage/storable_vecs/base.rs
@@ -7,22 +7,28 @@ use std::{
 };
 
 use derive_deref::{Deref, DerefMut};
-use storable_vec::{StorableVecIndex, StorableVecType, Version};
+use storable_vec::{StorableVecIndex, StorableVecType, Version, SINGLE_THREAD};
 
 #[derive(Debug, Deref, DerefMut)]
-pub struct StorableVec<I, T>(storable_vec::StorableVec<I, T>);
+pub struct StorableVec<I, T, const MODE: u8>(storable_vec::StorableVec<I, T, MODE>);
 
 const FLUSH_EVERY: usize = 10_000;
 
-impl<I, T> StorableVec<I, T>
+impl<I, T, const MODE: u8> StorableVec<I, T, MODE>
 where
     I: StorableVecIndex,
     T: StorableVecType,
 {
-    pub fn import(path: &Path, version: Version) -> io::Result<Self> {
-        Ok(Self(storable_vec::StorableVec::import(path, version)?))
+    pub fn import(path: &Path, version: Version) -> storable_vec::Result<Self> {
+        Ok(Self(storable_vec::StorableVec::forced_import(path, version)?))
     }
+}
 
+impl<I, T> StorableVec<I, T, SINGLE_THREAD>
+where
+    I: StorableVecIndex,
+    T: StorableVecType,
+{
     fn flush_vec_if_needed(&mut self) -> io::Result<()> {
         if self.pushed_len() == FLUSH_EVERY {
             self.flush()
@@ -31,53 +37,10 @@ where
         }
     }
 
-    pub fn compute_inverse_more_to_less(&mut self, other: &storable_vec::StorableVec<T, I>) -> storable_vec::Result<()>
-    where
-        I: StorableVecType,
-        T: StorableVecIndex,
-    {
-        other.iter_from(self.last()?.map(|v| *v).unwrap_or_default(), |(v, i)| {
-            self.push_if_needed(*i, v)
-        })
-    }
-
-    pub fn compute_inverse_less_to_more(
-        &mut self,
-        first_indexes: &storable_vec::StorableVec<T, I>,
-        last_indexes: &storable_vec::StorableVec<T, I>,
-    ) -> color_eyre::Result<()>
-    where
-        I: StorableVecType,
-        T: StorableVecIndex,
-    {
-        let (mut file_last, mut buf_last) = last_indexes.prepare_to_read_at_(self.len())?;
-        first_indexes.iter_from(T::from(self.len()), |(value, first_index)| {
-            let first_index: usize = (*first_index)
-                .try_into()
-                .map_err(|_| storable_vec::Error::FailedKeyTryIntoUsize)?;
-            let last_index = last_indexes.read_exact(&mut file_last, &mut buf_last)?;
-            let last_index: usize = (*last_index)
-                .try_into()
-                .map_err(|_| storable_vec::Error::FailedKeyTryIntoUsize)?;
-            (first_index..last_index).try_for_each(|index| self.push_if_needed(I::from(index), value))?;
-            Ok(())
-        })?;
-        self.flush()?;
-        Ok(())
-    }
-
-    pub fn compute_transform<A, F>(&mut self, other: &storable_vec::StorableVec<I, A>, t: F) -> storable_vec::Result<()>
-    where
-        A: StorableVecType,
-        F: Fn(&A) -> T,
-    {
-        other.iter_from(I::from(self.len()), |(i, a)| self.push_if_needed(i, t(a)))
-    }
-
     pub fn compute_is_first_ordered<A>(
         &mut self,
-        self_to_other: &storable_vec::StorableVec<I, A>,
-        other_to_self: &storable_vec::StorableVec<A, I>,
+        self_to_other: &storable_vec::StorableVec<I, A, SINGLE_THREAD>,
+        other_to_self: &storable_vec::StorableVec<A, I, SINGLE_THREAD>,
     ) -> storable_vec::Result<()>
     where
         A: StorableVecIndex + StorableVecType,
@@ -100,7 +63,7 @@ where
 
     pub fn compute_last_index_from_first(
         &mut self,
-        first_index_vec: &storable_vec::StorableVec<I, T>,
+        first_index_vec: &storable_vec::StorableVec<I, T, SINGLE_THREAD>,
         final_len: usize,
     ) -> color_eyre::Result<()>
     where
@@ -112,7 +75,7 @@ where
                 self.push_if_needed(prev_index, *v - T::from(1))?;
             }
             prev_index.replace(i);
-            self.flush_vec_if_needed().map_err(storable_vec::Error::IO)
+            Ok(self.flush_vec_if_needed()?)
         })?;
         if let Some(prev_index) = prev_index {
             self.push_if_needed(prev_index, T::from(final_len) - T::from(1))?;
@@ -123,8 +86,8 @@ where
 
     pub fn compute_count_from_indexes<T2>(
         &mut self,
-        first_indexes: &storable_vec::StorableVec<I, T2>,
-        last_indexes: &storable_vec::StorableVec<I, T2>,
+        first_indexes: &storable_vec::StorableVec<I, T2, SINGLE_THREAD>,
+        last_indexes: &storable_vec::StorableVec<I, T2, SINGLE_THREAD>,
     ) -> color_eyre::Result<()>
     where
         T: From<T2>,
@@ -136,7 +99,7 @@ where
             let last_index = last_indexes.read_exact(&mut file_last, &mut buf_last)?;
             let count = *last_index + 1_usize - *first_index;
             self.push_if_needed(i, count.into())?;
-            self.flush_vec_if_needed().map_err(storable_vec::Error::IO)
+            Ok(self.flush_vec_if_needed()?)
         })?;
         self.flush()?;
         Ok(())
diff --git a/computer/src/storage/storable_vecs/mod.rs b/computer/src/storage/storable_vecs/mod.rs
index c2becc932..a63fdbc2c 100644
--- a/computer/src/storage/storable_vecs/mod.rs
+++ b/computer/src/storage/storable_vecs/mod.rs
@@ -9,33 +9,33 @@ mod base;
 
 use base::*;
 
-pub struct StorableVecs {
-    pub date_to_first_height: StorableVec<Date, Height>,
-    // pub height_to_block_interval: StorableVec<Height, Timestamp>,
-    pub height_to_date: StorableVec<Height, Date>,
-    // pub height_to_fee: StorableVec<Txindex, Amount>,
-    // pub height_to_inputcount: StorableVec<Txindex, u32>,
-    // pub height_to_last_addressindex: StorableVec<Height, Addressindex>,
-    pub height_to_last_txindex: StorableVec<Height, Txindex>,
-    // pub height_to_last_txoutindex: StorableVec<Height, Txoutindex>,
-    // pub height_to_maxfeerate: StorableVec<Txindex, Feerate>,
-    // pub height_to_medianfeerate: StorableVec<Txindex, Feerate>,
-    // pub height_to_minfeerate: StorableVec<Txindex, Feerate>,
-    // pub height_to_outputcount: StorableVec<Txindex, u32>,
-    // pub height_to_subsidy: StorableVec<Txindex, u32>,
-    // pub height_to_totalfees: StorableVec<Height, Amount>,
-    // pub height_to_txcount: StorableVec<Txindex, u32>,
-    pub txindex_to_fee: StorableVec<Txindex, Amount>,
-    pub txindex_to_height: StorableVec<Txindex, Height>,
-    pub txindex_to_is_coinbase: StorableVec<Txindex, bool>,
-    // pub txindex_to_feerate: StorableVec<Txindex, Feerate>,
-    pub txindex_to_inputcount: StorableVec<Txindex, u32>,
-    pub txindex_to_last_txinindex: StorableVec<Txindex, Txinindex>,
-    pub txindex_to_last_txoutindex: StorableVec<Txindex, Txoutindex>,
-    pub txindex_to_outputcount: StorableVec<Txindex, u32>,
+pub struct StorableVecs<const MODE: u8> {
+    pub date_to_first_height: StorableVec<Date, Height, MODE>,
+    // pub height_to_block_interval: StorableVec<Height, Timestamp, MODE>,
+    pub height_to_date: StorableVec<Height, Date, MODE>,
+    // pub height_to_fee: StorableVec<Txindex, Amount, MODE>,
+    // pub height_to_inputcount: StorableVec<Txindex, u32, MODE>,
+    // pub height_to_last_addressindex: StorableVec<Height, Addressindex, MODE>,
+    pub height_to_last_txindex: StorableVec<Height, Txindex, MODE>,
+    // pub height_to_last_txoutindex: StorableVec<Height, Txoutindex, MODE>,
+    // pub height_to_maxfeerate: StorableVec<Txindex, Feerate, MODE>,
+    // pub height_to_medianfeerate: StorableVec<Txindex, Feerate, MODE>,
+    // pub height_to_minfeerate: StorableVec<Txindex, Feerate, MODE>,
+    // pub height_to_outputcount: StorableVec<Txindex, u32, MODE>,
+    // pub height_to_subsidy: StorableVec<Txindex, u32, MODE>,
+    // pub height_to_totalfees: StorableVec<Height, Amount, MODE>,
+    // pub height_to_txcount: StorableVec<Txindex, u32, MODE>,
+    pub txindex_to_fee: StorableVec<Txindex, Amount, MODE>,
+    pub txindex_to_height: StorableVec<Txindex, Height, MODE>,
+    pub txindex_to_is_coinbase: StorableVec<Txindex, bool, MODE>,
+    // pub txindex_to_feerate: StorableVec<Txindex, Feerate, MODE>,
+    pub txindex_to_inputcount: StorableVec<Txindex, u32, MODE>,
+    pub txindex_to_last_txinindex: StorableVec<Txindex, Txinindex, MODE>,
+    pub txindex_to_last_txoutindex: StorableVec<Txindex, Txoutindex, MODE>,
+    pub txindex_to_outputcount: StorableVec<Txindex, u32, MODE>,
 }
 
-impl StorableVecs {
+impl<const MODE: u8> StorableVecs<MODE> {
     pub fn import(path: &Path) -> color_eyre::Result<Self> {
         fs::create_dir_all(path)?;
 
diff --git a/computer/src/structs/date.rs b/computer/src/structs/date.rs
index fd6937b0f..9d965662b 100644
--- a/computer/src/structs/date.rs
+++ b/computer/src/structs/date.rs
@@ -5,9 +5,15 @@ use color_eyre::eyre::eyre;
 use derive_deref::Deref;
 use jiff::{civil::Date as _Date, tz::TimeZone, Span};
 
-#[derive(Debug, Default, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Deref)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Deref)]
 pub struct Date(_Date);
 
+impl Default for Date {
+    fn default() -> Self {
+        Self::INDEX_ZERO
+    }
+}
+
 impl Date {
     const INDEX_ZERO: Self = Self(_Date::constant(2009, 1, 3));
     const INDEX_ONE: Self = Self(_Date::constant(2009, 1, 9));
diff --git a/indexer/src/lib.rs b/indexer/src/lib.rs
index 2256ebf1b..511feade3 100644
--- a/indexer/src/lib.rs
+++ b/indexer/src/lib.rs
@@ -13,6 +13,7 @@ use bitcoin::{Transaction, TxIn, TxOut, Txid};
 use color_eyre::eyre::{eyre, ContextCompat};
 use exit::Exit;
 use rayon::prelude::*;
+use storable_vec::CACHED_GETS;
 
 mod storage;
 mod structs;
@@ -29,26 +30,20 @@ pub use structs::{
 const UNSAFE_BLOCKS: u32 = 100;
 const SNAPSHOT_BLOCK_RANGE: usize = 1000;
 
-pub struct Indexer {
-    vecs: StorableVecs,
-    trees: Fjalls,
+pub struct Indexer<const MODE: u8> {
+    pub vecs: StorableVecs<MODE>,
+    pub trees: Fjalls,
 }
 
-impl Indexer {
+impl<const MODE: u8> Indexer<MODE> {
     pub fn import(indexes_dir: &Path) -> color_eyre::Result<Self> {
         let vecs = StorableVecs::import(&indexes_dir.join("vecs"))?;
         let trees = Fjalls::import(&indexes_dir.join("fjall"))?;
         Ok(Self { vecs, trees })
     }
+}
 
-    pub fn vecs(&self) -> &StorableVecs {
-        &self.vecs
-    }
-
-    pub fn trees(&self) -> &Fjalls {
-        &self.trees
-    }
-
+impl Indexer<CACHED_GETS> {
     pub fn index(&mut self, bitcoin_dir: &Path, rpc: rpc::Client, exit: &Exit) -> color_eyre::Result<()> {
         let check_collisions = true;
 
@@ -80,22 +75,23 @@ impl Indexer {
         let mut p2wpkhindex_global = vecs.height_to_first_p2wpkhindex.get_or_default(height)?;
         let mut p2wshindex_global = vecs.height_to_first_p2wshindex.get_or_default(height)?;
 
-        let export = |trees: &mut Fjalls, vecs: &mut StorableVecs, height: Height| -> color_eyre::Result<()> {
-            println!("Exporting...");
+        let export =
+            |trees: &mut Fjalls, vecs: &mut StorableVecs<CACHED_GETS>, height: Height| -> color_eyre::Result<()> {
+                println!("Exporting...");
 
-            exit.block();
+                exit.block();
+
+                thread::scope(|scope| -> color_eyre::Result<()> {
+                    let vecs_handle = scope.spawn(|| vecs.flush(height));
+                    trees.commit(height)?;
+                    vecs_handle.join().unwrap()?;
+                    Ok(())
+                })?;
+
+                exit.unblock();
 
-            thread::scope(|scope| -> color_eyre::Result<()> {
-                let vecs_handle = scope.spawn(|| vecs.flush(height));
-                trees.commit(height)?;
-                vecs_handle.join().unwrap()?;
                 Ok(())
-            })?;
-
-            exit.unblock();
-
-            Ok(())
-        };
+            };
 
         biter::new(bitcoin_dir, Some(height.into()), None, rpc)
             .iter()
@@ -104,7 +100,7 @@ impl Indexer {
 
                 height = Height::from(_height);
 
-                if let Some(saved_blockhash) = vecs.height_to_blockhash.cached_get(height)? {
+                if let Some(saved_blockhash) = vecs.height_to_blockhash.get(height)? {
                     if &blockhash != saved_blockhash.as_ref() {
                         todo!("Rollback not implemented");
                         // trees.rollback_from(&mut rtx, height, &exit)?;
@@ -260,7 +256,7 @@ impl Indexer {
 
                                 let txoutindex = *vecs
                                     .txindex_to_first_txoutindex
-                                    .cached_get(prev_txindex)?
+                                    .get(prev_txindex)?
                                     .context("Expect txoutindex to not be none")
                                     .inspect_err(|_| {
                                         dbg!(outpoint.txid, prev_txindex, vout);
@@ -336,12 +332,12 @@ impl Indexer {
 
                                         let prev_addresstype = *vecs
                                             .addressindex_to_addresstype
-                                            .cached_get(addressindex)?
+                                            .get(addressindex)?
                                             .context("Expect to have address type")?;
 
                                         let addresstypeindex = *vecs
                                             .addressindex_to_addresstypeindex
-                                            .cached_get(addressindex)?
+                                            .get(addressindex)?
                                             .context("Expect to have address type index")?;
                                         // Good first time
                                         // Wrong after rerun
@@ -605,7 +601,7 @@ impl Indexer {
                                     // Ok if `get` is not par as should happen only twice
                                     let prev_txid = vecs
                                         .txindex_to_txid
-                                        .cached_get(prev_txindex)?
+                                        .get(prev_txindex)?
                                         .context("To have txid for txindex")
                                         .inspect_err(|_| {
                                             dbg!(txindex, txid, len);
@@ -630,7 +626,7 @@ impl Indexer {
 
                                     if !is_dup {
                                         let prev_height =
-                                            vecs.txindex_to_height.cached_get(prev_txindex)?.expect("To have height");
+                                            vecs.txindex_to_height.get(prev_txindex)?.expect("To have height");
                                         dbg!(height, txid, txindex, prev_height, prev_txid, prev_txindex);
                                         return Err(eyre!("Expect none"));
                                     }
diff --git a/indexer/src/main.rs b/indexer/src/main.rs
index d51f8bac7..4cb954e3f 100644
--- a/indexer/src/main.rs
+++ b/indexer/src/main.rs
@@ -3,6 +3,7 @@ use std::path::Path;
 use bindex::Indexer;
 use biter::rpc;
 use exit::Exit;
+use storable_vec::CACHED_GETS;
 
 fn main() -> color_eyre::Result<()> {
     color_eyre::install()?;
@@ -16,7 +17,7 @@ fn main() -> color_eyre::Result<()> {
 
     let i = std::time::Instant::now();
 
-    let mut indexer = Indexer::import(Path::new("../_outputs/indexes"))?;
+    let mut indexer: Indexer<CACHED_GETS> = Indexer::import(Path::new("../_outputs/indexes"))?;
 
     indexer.index(data_dir, rpc, &exit)?;
 
diff --git a/indexer/src/storage/storable_vecs/base.rs b/indexer/src/storage/storable_vecs/base.rs
index 8d1030ab7..99b6adfa8 100644
--- a/indexer/src/storage/storable_vecs/base.rs
+++ b/indexer/src/storage/storable_vecs/base.rs
@@ -5,25 +5,25 @@ use std::{
     path::{Path, PathBuf},
 };
 
-use storable_vec::{StorableVecIndex, StorableVecType, Version};
+use storable_vec::{StorableVecIndex, StorableVecType, Version, CACHED_GETS};
 
 use super::Height;
 
 #[derive(Debug)]
-pub struct StorableVec<I, T> {
+pub struct StorableVec<I, T, const MODE: u8> {
     height: Option<Height>,
-    vec: storable_vec::StorableVec<I, T>,
+    vec: storable_vec::StorableVec<I, T, MODE>,
 }
 
-impl<I, T> StorableVec<I, T>
+impl<I, T, const MODE: u8> StorableVec<I, T, MODE>
 where
     I: StorableVecIndex,
     T: StorableVecType,
 {
-    pub fn import(path: &Path, version: Version) -> io::Result<Self> {
+    pub fn import(path: &Path, version: Version) -> storable_vec::Result<Self> {
         Ok(Self {
             height: Height::try_from(Self::path_height_(path).as_path()).ok(),
-            vec: storable_vec::StorableVec::import(path, version)?,
+            vec: storable_vec::StorableVec::forced_import(path, version)?,
         })
     }
 
@@ -53,13 +53,13 @@ where
     }
 }
 
-impl<I, T> Deref for StorableVec<I, T> {
-    type Target = storable_vec::StorableVec<I, T>;
+impl<I, T, const MODE: u8> Deref for StorableVec<I, T, MODE> {
+    type Target = storable_vec::StorableVec<I, T, MODE>;
     fn deref(&self) -> &Self::Target {
         &self.vec
     }
 }
-impl<I, T> DerefMut for StorableVec<I, T> {
+impl<I, T, const MODE: u8> DerefMut for StorableVec<I, T, MODE> {
     fn deref_mut(&mut self) -> &mut Self::Target {
         &mut self.vec
     }
@@ -68,10 +68,9 @@ impl<I, T> DerefMut for StorableVec<I, T> {
 pub trait AnyStorableVec {
     fn height(&self) -> color_eyre::Result<Height>;
     fn flush(&mut self, height: Height) -> io::Result<()>;
-    fn reset_cache(&mut self);
 }
 
-impl<I, T> AnyStorableVec for StorableVec<I, T>
+impl<I, T, const MODE: u8> AnyStorableVec for StorableVec<I, T, MODE>
 where
     I: StorableVecIndex,
     T: StorableVecType,
@@ -80,10 +79,6 @@ where
         self.height()
     }
 
-    fn reset_cache(&mut self) {
-        self.vec.reset_cache()
-    }
-
     fn flush(&mut self, height: Height) -> io::Result<()> {
         self.flush(height)
     }
diff --git a/indexer/src/storage/storable_vecs/mod.rs b/indexer/src/storage/storable_vecs/mod.rs
index 15aa0c749..4c43f3e8f 100644
--- a/indexer/src/storage/storable_vecs/mod.rs
+++ b/indexer/src/storage/storable_vecs/mod.rs
@@ -3,7 +3,7 @@ use std::{fs, io, path::Path};
 use biter::bitcoin::{self, transaction, BlockHash, Txid, Weight};
 use exit::Exit;
 use rayon::prelude::*;
-use storable_vec::Version;
+use storable_vec::{Version, CACHED_GETS};
 
 use crate::structs::{
     Addressbytes, Addressindex, Addresstype, Addresstypeindex, Amount, Height, P2PK33AddressBytes, P2PK65AddressBytes,
@@ -15,52 +15,52 @@ mod base;
 
 pub use base::*;
 
-pub struct StorableVecs {
-    pub addressindex_to_addresstype: StorableVec<Addressindex, Addresstype>,
-    pub addressindex_to_addresstypeindex: StorableVec<Addressindex, Addresstypeindex>,
-    pub addressindex_to_height: StorableVec<Addressindex, Height>,
-    pub height_to_blockhash: StorableVec<Height, BlockHash>,
-    pub height_to_difficulty: StorableVec<Height, f64>,
-    pub height_to_first_addressindex: StorableVec<Height, Addressindex>,
-    pub height_to_first_emptyindex: StorableVec<Height, Addresstypeindex>,
-    pub height_to_first_multisigindex: StorableVec<Height, Addresstypeindex>,
-    pub height_to_first_opreturnindex: StorableVec<Height, Addresstypeindex>,
-    pub height_to_first_pushonlyindex: StorableVec<Height, Addresstypeindex>,
-    pub height_to_first_txindex: StorableVec<Height, Txindex>,
-    pub height_to_first_txinindex: StorableVec<Height, Txinindex>,
-    pub height_to_first_txoutindex: StorableVec<Height, Txoutindex>,
-    pub height_to_first_unknownindex: StorableVec<Height, Addresstypeindex>,
-    pub height_to_first_p2pk33index: StorableVec<Height, Addresstypeindex>,
-    pub height_to_first_p2pk65index: StorableVec<Height, Addresstypeindex>,
-    pub height_to_first_p2pkhindex: StorableVec<Height, Addresstypeindex>,
-    pub height_to_first_p2shindex: StorableVec<Height, Addresstypeindex>,
-    pub height_to_first_p2trindex: StorableVec<Height, Addresstypeindex>,
-    pub height_to_first_p2wpkhindex: StorableVec<Height, Addresstypeindex>,
-    pub height_to_first_p2wshindex: StorableVec<Height, Addresstypeindex>,
-    pub height_to_size: StorableVec<Height, usize>,
-    pub height_to_timestamp: StorableVec<Height, Timestamp>,
-    pub height_to_weight: StorableVec<Height, Weight>,
-    pub p2pk33index_to_p2pk33addressbytes: StorableVec<Addresstypeindex, P2PK33AddressBytes>,
-    pub p2pk65index_to_p2pk65addressbytes: StorableVec<Addresstypeindex, P2PK65AddressBytes>,
-    pub p2pkhindex_to_p2pkhaddressbytes: StorableVec<Addresstypeindex, P2PKHAddressBytes>,
-    pub p2shindex_to_p2shaddressbytes: StorableVec<Addresstypeindex, P2SHAddressBytes>,
-    pub p2trindex_to_p2traddressbytes: StorableVec<Addresstypeindex, P2TRAddressBytes>,
-    pub p2wpkhindex_to_p2wpkhaddressbytes: StorableVec<Addresstypeindex, P2WPKHAddressBytes>,
-    pub p2wshindex_to_p2wshaddressbytes: StorableVec<Addresstypeindex, P2WSHAddressBytes>,
-    pub txindex_to_first_txinindex: StorableVec<Txindex, Txinindex>,
-    pub txindex_to_first_txoutindex: StorableVec<Txindex, Txoutindex>,
-    pub txindex_to_height: StorableVec<Txindex, Height>,
-    pub txindex_to_locktime: StorableVec<Txindex, bitcoin::absolute::LockTime>,
-    pub txindex_to_txid: StorableVec<Txindex, Txid>,
-    pub txindex_to_txversion: StorableVec<Txindex, transaction::Version>,
-    pub txinindex_to_txoutindex: StorableVec<Txinindex, Txoutindex>,
-    pub txoutindex_to_addressindex: StorableVec<Txoutindex, Addressindex>,
-    pub txoutindex_to_amount: StorableVec<Txoutindex, Amount>,
+pub struct StorableVecs<const MODE: u8> {
+    pub addressindex_to_addresstype: StorableVec<Addressindex, Addresstype, MODE>,
+    pub addressindex_to_addresstypeindex: StorableVec<Addressindex, Addresstypeindex, MODE>,
+    pub addressindex_to_height: StorableVec<Addressindex, Height, MODE>,
+    pub height_to_blockhash: StorableVec<Height, BlockHash, MODE>,
+    pub height_to_difficulty: StorableVec<Height, f64, MODE>,
+    pub height_to_first_addressindex: StorableVec<Height, Addressindex, MODE>,
+    pub height_to_first_emptyindex: StorableVec<Height, Addresstypeindex, MODE>,
+    pub height_to_first_multisigindex: StorableVec<Height, Addresstypeindex, MODE>,
+    pub height_to_first_opreturnindex: StorableVec<Height, Addresstypeindex, MODE>,
+    pub height_to_first_pushonlyindex: StorableVec<Height, Addresstypeindex, MODE>,
+    pub height_to_first_txindex: StorableVec<Height, Txindex, MODE>,
+    pub height_to_first_txinindex: StorableVec<Height, Txinindex, MODE>,
+    pub height_to_first_txoutindex: StorableVec<Height, Txoutindex, MODE>,
+    pub height_to_first_unknownindex: StorableVec<Height, Addresstypeindex, MODE>,
+    pub height_to_first_p2pk33index: StorableVec<Height, Addresstypeindex, MODE>,
+    pub height_to_first_p2pk65index: StorableVec<Height, Addresstypeindex, MODE>,
+    pub height_to_first_p2pkhindex: StorableVec<Height, Addresstypeindex, MODE>,
+    pub height_to_first_p2shindex: StorableVec<Height, Addresstypeindex, MODE>,
+    pub height_to_first_p2trindex: StorableVec<Height, Addresstypeindex, MODE>,
+    pub height_to_first_p2wpkhindex: StorableVec<Height, Addresstypeindex, MODE>,
+    pub height_to_first_p2wshindex: StorableVec<Height, Addresstypeindex, MODE>,
+    pub height_to_size: StorableVec<Height, usize, MODE>,
+    pub height_to_timestamp: StorableVec<Height, Timestamp, MODE>,
+    pub height_to_weight: StorableVec<Height, Weight, MODE>,
+    pub p2pk33index_to_p2pk33addressbytes: StorableVec<Addresstypeindex, P2PK33AddressBytes, MODE>,
+    pub p2pk65index_to_p2pk65addressbytes: StorableVec<Addresstypeindex, P2PK65AddressBytes, MODE>,
+    pub p2pkhindex_to_p2pkhaddressbytes: StorableVec<Addresstypeindex, P2PKHAddressBytes, MODE>,
+    pub p2shindex_to_p2shaddressbytes: StorableVec<Addresstypeindex, P2SHAddressBytes, MODE>,
+    pub p2trindex_to_p2traddressbytes: StorableVec<Addresstypeindex, P2TRAddressBytes, MODE>,
+    pub p2wpkhindex_to_p2wpkhaddressbytes: StorableVec<Addresstypeindex, P2WPKHAddressBytes, MODE>,
+    pub p2wshindex_to_p2wshaddressbytes: StorableVec<Addresstypeindex, P2WSHAddressBytes, MODE>,
+    pub txindex_to_first_txinindex: StorableVec<Txindex, Txinindex, MODE>,
+    pub txindex_to_first_txoutindex: StorableVec<Txindex, Txoutindex, MODE>,
+    pub txindex_to_height: StorableVec<Txindex, Height, MODE>,
+    pub txindex_to_locktime: StorableVec<Txindex, bitcoin::absolute::LockTime, MODE>,
+    pub txindex_to_txid: StorableVec<Txindex, Txid, MODE>,
+    pub txindex_to_txversion: StorableVec<Txindex, transaction::Version, MODE>,
+    pub txinindex_to_txoutindex: StorableVec<Txinindex, Txoutindex, MODE>,
+    pub txoutindex_to_addressindex: StorableVec<Txoutindex, Addressindex, MODE>,
+    pub txoutindex_to_amount: StorableVec<Txoutindex, Amount, MODE>,
 }
 
 // const UNSAFE_BLOCKS: usize = 100;
 
-impl StorableVecs {
+impl<const MODE: u8> StorableVecs<MODE> {
     pub fn import(path: &Path) -> color_eyre::Result<Self> {
         fs::create_dir_all(path)?;
 
@@ -180,67 +180,6 @@ impl StorableVecs {
         })
     }
 
-    pub fn push_addressbytes_if_needed(
-        &mut self,
-        index: Addresstypeindex,
-        addressbytes: Addressbytes,
-    ) -> storable_vec::Result<()> {
-        match addressbytes {
-            Addressbytes::P2PK65(bytes) => self.p2pk65index_to_p2pk65addressbytes.push_if_needed(index, bytes),
-            Addressbytes::P2PK33(bytes) => self.p2pk33index_to_p2pk33addressbytes.push_if_needed(index, bytes),
-            Addressbytes::P2PKH(bytes) => self.p2pkhindex_to_p2pkhaddressbytes.push_if_needed(index, bytes),
-            Addressbytes::P2SH(bytes) => self.p2shindex_to_p2shaddressbytes.push_if_needed(index, bytes),
-            Addressbytes::P2WPKH(bytes) => self.p2wpkhindex_to_p2wpkhaddressbytes.push_if_needed(index, bytes),
-            Addressbytes::P2WSH(bytes) => self.p2wshindex_to_p2wshaddressbytes.push_if_needed(index, bytes),
-            Addressbytes::P2TR(bytes) => self.p2trindex_to_p2traddressbytes.push_if_needed(index, bytes),
-        }
-    }
-
-    pub fn get_addressbytes(
-        &self,
-        addresstype: Addresstype,
-        addresstypeindex: Addresstypeindex,
-    ) -> storable_vec::Result<Option<Addressbytes>> {
-        Ok(match addresstype {
-            Addresstype::P2PK65 => self
-                .p2pk65index_to_p2pk65addressbytes
-                .cached_get(addresstypeindex)?
-                // .map(|v| Addressbytes::from(v.clone())),
-                .map(|v| Addressbytes::from(v.into_inner())),
-            Addresstype::P2PK33 => self
-                .p2pk33index_to_p2pk33addressbytes
-                .cached_get(addresstypeindex)?
-                // .map(|v| Addressbytes::from(v.clone())),
-                .map(|v| Addressbytes::from(v.into_inner())),
-            Addresstype::P2PKH => self
-                .p2pkhindex_to_p2pkhaddressbytes
-                .cached_get(addresstypeindex)?
-                // .map(|v| Addressbytes::from(v.clone())),
-                .map(|v| Addressbytes::from(v.into_inner())),
-            Addresstype::P2SH => self
-                .p2shindex_to_p2shaddressbytes
-                .cached_get(addresstypeindex)?
-                // .map(|v| Addressbytes::from(v.clone())),
-                .map(|v| Addressbytes::from(v.into_inner())),
-            Addresstype::P2WPKH => self
-                .p2wpkhindex_to_p2wpkhaddressbytes
-                .cached_get(addresstypeindex)?
-                // .map(|v| Addressbytes::from(v.clone())),
-                .map(|v| Addressbytes::from(v.into_inner())),
-            Addresstype::P2WSH => self
-                .p2wshindex_to_p2wshaddressbytes
-                .cached_get(addresstypeindex)?
-                // .map(|v| Addressbytes::from(v.clone())),
-                .map(|v| Addressbytes::from(v.into_inner())),
-            Addresstype::P2TR => self
-                .p2trindex_to_p2traddressbytes
-                .cached_get(addresstypeindex)?
-                // .map(|v| Addressbytes::from(v.clone())),
-                .map(|v| Addressbytes::from(v.into_inner())),
-            _ => unreachable!(),
-        })
-    }
-
     #[allow(unused)]
     pub fn rollback_from(&mut self, _height: Height, _exit: &Exit) -> color_eyre::Result<()> {
         panic!();
@@ -355,10 +294,6 @@ impl StorableVecs {
         // Ok(())
     }
 
-    pub fn reset_cache(&mut self) {
-        self.as_mut_slice().into_par_iter().for_each(|vec| vec.reset_cache())
-    }
-
     pub fn flush(&mut self, height: Height) -> io::Result<()> {
         self.as_mut_slice()
             .into_par_iter()
@@ -463,3 +398,66 @@ impl StorableVecs {
         ]
     }
 }
+
+impl StorableVecs<CACHED_GETS> {
+    pub fn get_addressbytes(
+        &self,
+        addresstype: Addresstype,
+        addresstypeindex: Addresstypeindex,
+    ) -> storable_vec::Result<Option<Addressbytes>> {
+        Ok(match addresstype {
+            Addresstype::P2PK65 => self
+                .p2pk65index_to_p2pk65addressbytes
+                .get(addresstypeindex)?
+                // .map(|v| Addressbytes::from(v.clone())),
+                .map(|v| Addressbytes::from(v.into_inner())),
+            Addresstype::P2PK33 => self
+                .p2pk33index_to_p2pk33addressbytes
+                .get(addresstypeindex)?
+                // .map(|v| Addressbytes::from(v.clone())),
+                .map(|v| Addressbytes::from(v.into_inner())),
+            Addresstype::P2PKH => self
+                .p2pkhindex_to_p2pkhaddressbytes
+                .get(addresstypeindex)?
+                // .map(|v| Addressbytes::from(v.clone())),
+                .map(|v| Addressbytes::from(v.into_inner())),
+            Addresstype::P2SH => self
+                .p2shindex_to_p2shaddressbytes
+                .get(addresstypeindex)?
+                // .map(|v| Addressbytes::from(v.clone())),
+                .map(|v| Addressbytes::from(v.into_inner())),
+            Addresstype::P2WPKH => self
+                .p2wpkhindex_to_p2wpkhaddressbytes
+                .get(addresstypeindex)?
+                // .map(|v| Addressbytes::from(v.clone())),
+                .map(|v| Addressbytes::from(v.into_inner())),
+            Addresstype::P2WSH => self
+                .p2wshindex_to_p2wshaddressbytes
+                .get(addresstypeindex)?
+                // .map(|v| Addressbytes::from(v.clone())),
+                .map(|v| Addressbytes::from(v.into_inner())),
+            Addresstype::P2TR => self
+                .p2trindex_to_p2traddressbytes
+                .get(addresstypeindex)?
+                // .map(|v| Addressbytes::from(v.clone())),
+                .map(|v| Addressbytes::from(v.into_inner())),
+            _ => unreachable!(),
+        })
+    }
+
+    pub fn push_addressbytes_if_needed(
+        &mut self,
+        index: Addresstypeindex,
+        addressbytes: Addressbytes,
+    ) -> storable_vec::Result<()> {
+        match addressbytes {
+            Addressbytes::P2PK65(bytes) => self.p2pk65index_to_p2pk65addressbytes.push_if_needed(index, bytes),
+            Addressbytes::P2PK33(bytes) => self.p2pk33index_to_p2pk33addressbytes.push_if_needed(index, bytes),
+            Addressbytes::P2PKH(bytes) => self.p2pkhindex_to_p2pkhaddressbytes.push_if_needed(index, bytes),
+            Addressbytes::P2SH(bytes) => self.p2shindex_to_p2shaddressbytes.push_if_needed(index, bytes),
+            Addressbytes::P2WPKH(bytes) => self.p2wpkhindex_to_p2wpkhaddressbytes.push_if_needed(index, bytes),
+            Addressbytes::P2WSH(bytes) => self.p2wshindex_to_p2wshaddressbytes.push_if_needed(index, bytes),
+            Addressbytes::P2TR(bytes) => self.p2trindex_to_p2traddressbytes.push_if_needed(index, bytes),
+        }
+    }
+}
diff --git a/storable_vec/src/enums/error.rs b/storable_vec/src/enums/error.rs
index 63f503b52..0905fd97c 100644
--- a/storable_vec/src/enums/error.rs
+++ b/storable_vec/src/enums/error.rs
@@ -3,30 +3,55 @@ use std::{
     io,
 };
 
+use crate::Version;
+
 pub type Result<T, E = Error> = std::result::Result<T, E>;
 
 #[derive(Debug)]
 pub enum Error {
+    WrongEndian,
+    DifferentVersion { found: Version, expected: Version },
     MmapsVecIsTooSmall,
     IO(io::Error),
     UnsafeSliceSerde(unsafe_slice_serde::Error),
     IndexTooHigh,
+    IndexTooLow,
     ExpectFileToHaveIndex,
     ExpectVecToHaveIndex,
     FailedKeyTryIntoUsize,
+    UnsupportedUnflushedState,
+}
+
+impl From<io::Error> for Error {
+    fn from(value: io::Error) -> Self {
+        Self::IO(value)
+    }
+}
+
+impl From<unsafe_slice_serde::Error> for Error {
+    fn from(value: unsafe_slice_serde::Error) -> Self {
+        Self::UnsafeSliceSerde(value)
+    }
 }
 
 impl fmt::Display for Error {
-    // This trait requires `fmt` with this exact signature.
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         match self {
+            Error::WrongEndian => write!(f, "Wrong endian"),
+            Error::DifferentVersion { found, expected } => {
+                write!(f, "Different version; found: {found:?}, expected: {expected:?}")
+            }
             Error::MmapsVecIsTooSmall => write!(f, "Mmaps vec is too small"),
             Error::IO(error) => Debug::fmt(&error, f),
             Error::UnsafeSliceSerde(error) => Debug::fmt(&error, f),
             Error::IndexTooHigh => write!(f, "Index too high"),
+            Error::IndexTooLow => write!(f, "Index too low"),
             Error::ExpectFileToHaveIndex => write!(f, "Expect file to have index"),
             Error::ExpectVecToHaveIndex => write!(f, "Expect vec to have index"),
             Error::FailedKeyTryIntoUsize => write!(f, "Failed to convert key to usize"),
+            Error::UnsupportedUnflushedState => {
+                write!(f, "Unsupported unflush state, please flush before using this function")
+            }
         }
     }
 }
diff --git a/storable_vec/src/lib.rs b/storable_vec/src/lib.rs
index 5613cb6a8..95da53292 100644
--- a/storable_vec/src/lib.rs
+++ b/storable_vec/src/lib.rs
@@ -21,20 +21,22 @@ pub use enums::*;
 pub use structs::*;
 pub use traits::*;
 
+type Buffer = Vec<u8>;
+
 /// Uses `Mmap` instead of `File`
 ///
 /// Used in `/indexer`
-const CACHED: u8 = 0;
+pub const CACHED_GETS: u8 = 0;
 
 /// Will use the same `File` for every read, so not thread safe
 ///
 /// Used in `/computer`
-const RAW_SYNC: u8 = 1;
+pub const SINGLE_THREAD: u8 = 1;
 
 /// Will spin up a new `File` for every read
 ///
 /// Used in `/server`
-const RAW_ASYNC: u8 = 2;
+pub const ASYNC_READ_ONLY: u8 = 2;
 
 ///
 /// A very small, fast, efficient and simple storable Vec
@@ -48,12 +50,16 @@ const RAW_ASYNC: u8 = 2;
 /// If you don't call `.flush()` it just acts as a normal Vec
 ///
 #[derive(Debug)]
-pub struct StorableVec<I, T> {
+pub struct StorableVec<I, T, const MODE: u8> {
     pathbuf: PathBuf,
-    unsafe_file: File,
+    file: File,
+    /// **Number of values NOT number of bytes**
+    file_len: usize,
+    /// Only for SINGLE_THREAD
+    file_position: u64,
+    buf: Buffer,
+    /// Only for CACHED_GETS
     cache: Vec<OnceLock<Box<Mmap>>>, // Boxed Mmap to reduce the size of the Lock (from 24 to 16)
-    buf: Vec<u8>,
-    disk_len: usize,
     pushed: Vec<T>,
     // updated: BTreeMap<usize, T>,
     // inserted: BTreeMap<usize, T>,
@@ -69,7 +75,7 @@ const ONE_MB: usize = 1000 * 1024;
 const MAX_CACHE_SIZE: usize = 100 * ONE_MB;
 // const MAX_CACHE_SIZE: usize = 100 * ONE_MB;
 
-impl<I, T> StorableVec<I, T>
+impl<I, T, const MODE: u8> StorableVec<I, T, MODE>
 where
     I: StorableVecIndex,
     T: StorableVecType,
@@ -80,24 +86,44 @@ where
     pub const PAGE_SIZE: usize = Self::PER_PAGE * Self::SIZE_OF_T;
     pub const CACHE_LENGTH: usize = MAX_CACHE_SIZE / Self::PAGE_SIZE;
 
-    pub fn import(path: &Path, version: Version) -> Result<Self, io::Error> {
+    /// Same as import but will remove the folder if the endian or the version is different, so be careful !
+    pub fn forced_import(path: &Path, version: Version) -> Result<Self> {
+        let res = Self::import(path, version);
+        match res {
+            Err(Error::WrongEndian) | Err(Error::DifferentVersion { found: _, expected: _ }) => {
+                fs::remove_dir_all(path)?;
+                Self::import(path, version)
+            }
+            _ => res,
+        }
+    }
+
+    pub fn import(path: &Path, version: Version) -> Result<Self> {
         fs::create_dir_all(path)?;
 
         let path_version = Self::path_version_(path);
-        let is_same_version =
-            Version::try_from(path_version.as_path()).is_ok_and(|prev_version| version == prev_version);
-        if !is_same_version {
-            fs::remove_dir_all(path)?;
+
+        if let Ok(prev_version) = Version::try_from(path_version.as_path()) {
+            if prev_version != version {
+                if prev_version.swap_bytes() == version {
+                    return Err(Error::WrongEndian);
+                }
+                return Err(Error::DifferentVersion {
+                    found: prev_version,
+                    expected: version,
+                });
+            }
         }
         version.write(&path_version)?;
 
-        let unsafe_file = Self::open_file_(&Self::path_vec_(path))?;
+        let file = Self::open_file_(&Self::path_vec_(path))?;
 
-        let mut this = Self {
+        let mut slf = Self {
             pathbuf: path.to_owned(),
-            disk_len: Self::disk_len(&unsafe_file)?,
-            unsafe_file,
-            buf: vec![0; Self::SIZE_OF_T],
+            file_position: 0,
+            file_len: Self::read_disk_len_(&file)?,
+            file,
+            buf: Self::create_buffer(),
             cache: vec![],
             pushed: vec![],
             // updated: BTreeMap::new(),
@@ -108,35 +134,20 @@ where
             // opened_mmaps: AtomicUsize::new(0),
         };
 
-        // TODO: Only if write mode
-        this.reset_cache();
+        slf.reset_disk_related_state()?;
 
-        Ok(this)
+        Ok(slf)
     }
 
-    pub fn disk_len(file: &File) -> io::Result<usize> {
-        Ok(Self::byte_index_to_index(file.metadata()?.len() as usize))
+    #[inline]
+    fn create_buffer() -> Buffer {
+        vec![0; Self::SIZE_OF_T]
     }
 
-    pub fn reset_cache(&mut self) {
-        // par_iter_mut ?
-        self.cache.iter_mut().for_each(|lock| {
-            lock.take();
-        });
-
-        let len = (self.disk_len as f64 / Self::PER_PAGE as f64).ceil() as usize;
-        let len = Self::CACHE_LENGTH.min(len);
-
-        if self.cache.len() != len {
-            self.cache.resize_with(len, Default::default);
-            self.cache.shrink_to_fit();
-        }
+    fn open_file(&self) -> io::Result<File> {
+        Self::open_file_(&self.path_vec())
     }
-
-    fn open_file(&self) -> Result<File, Error> {
-        Self::open_file_(&self.path_vec()).map_err(Error::IO)
-    }
-    fn open_file_(path: &Path) -> Result<File, io::Error> {
+    fn open_file_(path: &Path) -> io::Result<File> {
         OpenOptions::new()
             .read(true)
             .create(true)
@@ -145,199 +156,104 @@ where
             .open(path)
     }
 
-    #[inline]
-    fn index_to_byte_range(index: usize) -> Range<usize> {
-        let index = Self::index_to_byte_index(index) % Self::PAGE_SIZE;
-        index..(index + Self::SIZE_OF_T)
+    fn read_disk_len(&self) -> io::Result<usize> {
+        Self::read_disk_len_(&self.file)
+    }
+    fn read_disk_len_(file: &File) -> io::Result<usize> {
+        Ok(Self::byte_index_to_index(file.metadata()?.len() as usize))
     }
 
-    #[inline]
-    fn index_to_byte_index(index: usize) -> usize {
-        index * Self::SIZE_OF_T
+    fn reset_disk_related_state(&mut self) -> io::Result<()> {
+        self.file = self.open_file()?;
+        self.file_len = self.read_disk_len()?;
+        self.file_position = 0;
+        self.reset_cache()
     }
 
-    #[inline]
-    fn byte_index_to_index(byte_index: usize) -> usize {
-        byte_index / Self::SIZE_OF_T
-    }
-
-    fn index_to_pushed_index(&self, index: usize) -> Result<Option<usize>> {
-        if index >= self.disk_len {
-            let index = index - self.disk_len;
-            if index >= self.pushed.len() {
-                Err(Error::IndexTooHigh)
-            } else {
-                Ok(Some(index))
-            }
-        } else {
-            Ok(None)
-        }
-    }
-
-    #[inline]
-    pub fn cached_get(&self, index: I) -> Result<Option<Value<'_, T>>> {
-        self.cached_get_(index.try_into().map_err(|_| Error::FailedKeyTryIntoUsize)?)
-    }
-    fn cached_get_(&self, index: usize) -> Result<Option<Value<'_, T>>> {
-        match self.index_to_pushed_index(index) {
-            Ok(index) => {
-                if let Some(index) = index {
-                    return Ok(self.pushed.get(index).map(|v| Value::Ref(v)));
-                }
-            }
-            Err(Error::IndexTooHigh) => return Ok(None),
-            Err(error) => return Err(error),
-        }
-
-        // if !self.updated.is_empty() {
-        //     if let Some(v) = self.updated.get(&index) {
-        //         return Ok(Some(v));
-        //     }
-        // }
-
-        let page_index = index / Self::PER_PAGE;
-        let last_index = self.disk_len - 1;
-        let max_page_index = last_index / Self::PER_PAGE;
-        let min_page_index = (max_page_index + 1).checked_sub(self.cache.len()).unwrap_or_default();
-
-        // let min_open_page = self.min.load(AtomicOrdering::SeqCst);
-
-        // if self.min.load(AtomicOrdering::SeqCst) {
-        //     self.min.set(value)
-        // }
-
-        if page_index >= min_page_index {
-            let mmap = &**self
-                .cache
-                .get(page_index - min_page_index)
-                .ok_or(Error::MmapsVecIsTooSmall)?
-                .get_or_init(|| {
-                    Box::new(unsafe {
-                        MmapOptions::new()
-                            .len(Self::PAGE_SIZE)
-                            .offset((page_index * Self::PAGE_SIZE) as u64)
-                            .map(&self.unsafe_file)
-                            .unwrap()
-                    })
+    fn reset_cache(&mut self) -> io::Result<()> {
+        match MODE {
+            CACHED_GETS => {
+                // par_iter_mut ?
+                self.cache.iter_mut().for_each(|lock| {
+                    lock.take();
                 });
 
-            let range = Self::index_to_byte_range(index);
+                let len = (self.file_len as f64 / Self::PER_PAGE as f64).ceil() as usize;
+                let len = Self::CACHE_LENGTH.min(len);
 
-            let slice = &mmap[range];
+                if self.cache.len() != len {
+                    self.cache.resize_with(len, Default::default);
+                    self.cache.shrink_to_fit();
+                }
 
-            Ok(Some(Value::Ref(
-                T::unsafe_try_from_slice(slice).map_err(Error::UnsafeSliceSerde)?,
-            )))
-        } else {
-            let (mut file, mut buf) = self.prepare_to_read()?;
-            Self::seek_(&mut file, index)?;
-            let value = self.read_exact(&mut file, &mut buf)?;
-            Ok(Some(Value::Owned(value.to_owned())))
+                Ok(())
+            }
+            _ => Ok(()),
         }
     }
 
-    pub fn get_or_default(&self, index: I) -> Result<T>
-    where
-        T: Default + Clone,
-    {
-        Ok(self
-            .cached_get(index)?
-            .map(|v| (*v).clone())
-            .unwrap_or(Default::default()))
-    }
+    // #[inline]
+    // fn open_file_at_then_read(&self, index: I) -> Result<T> {
+    //     self.open_file_at_then_read_(Self::i_to_usize(index)?)
+    // }
+    fn open_file_at_then_read(&self, index: usize) -> Result<T> {
+        // let (mut file, mut buf) = self.open_file_at(index)?;
+        let mut file = self.open_file()?;
+        let mut buf = Self::create_buffer();
 
-    pub fn seek(file: &mut File, index: I) -> Result<()> {
-        Self::seek_(file, index.try_into().map_err(|_| Error::FailedKeyTryIntoUsize)?)
-    }
-
-    pub fn seek_(file: &mut File, index: usize) -> Result<()> {
         let byte_index = Self::index_to_byte_index(index);
-        file.seek(SeekFrom::Start(byte_index as u64)).map_err(Error::IO)?;
-        Ok(())
-    }
+        Self::seek(&mut file, byte_index)?;
 
-    pub fn iter<F>(&self, f: F) -> Result<()>
-    where
-        F: FnMut((I, &T)) -> Result<()>,
-    {
-        self.iter_from(I::from(0_usize), f)
+        Ok(Self::read_exact(&mut file, &mut buf)?.to_owned())
     }
-
-    pub fn prepare_to_read(&self) -> Result<(File, Vec<u8>)> {
-        let file = self.open_file()?;
-        let buf = vec![0; Self::SIZE_OF_T];
-        Ok((file, buf))
+    // #[inline]
+    // fn open_file_at(&self, index: I) -> Result<(File, Buffer)> {
+    //     self.open_file_at_(Self::i_to_usize(index)?)
+    // }
+    // fn open_file_at(&self, index: usize) -> Result<(File, Buffer)> {
+    //     let mut file = self.open_file()?;
+    //     let buf = Self::create_buffer();
+    //     let byte_index = Self::index_to_byte_index(index);
+    //     Self::seek(&mut file, byte_index)?;
+    //     Ok((file, buf))
+    // }
+    // #[inline]
+    // fn seek_if_needed_(file: &mut File, index: I) -> Result<u64> {
+    //     Self::seek_if_needed__(file, Self::i_to_usize(index)?).map_err(Error::IO)
+    // }
+    // #[inline]
+    // fn seek_if_needed(file: &mut File, index: usize) -> io::Result<u64> {
+    //     let byte_index = Self::index_to_byte_index(index);
+    //     if file.stream_position()? != byte_index {
+    //         Self::seek(file, byte_index)?;
+    //     }
+    //     Ok(byte_index)
+    // }
+    #[inline]
+    fn seek(file: &mut File, byte_index: u64) -> io::Result<u64> {
+        file.seek(SeekFrom::Start(byte_index))
     }
-
-    pub fn prepare_to_read_at(&self, index: I) -> Result<(File, Vec<u8>)> {
-        self.prepare_to_read_at_(index.try_into().map_err(|_| Error::FailedKeyTryIntoUsize)?)
-    }
-    pub fn prepare_to_read_at_(&self, index: usize) -> Result<(File, Vec<u8>)> {
-        let (mut file, buf) = self.prepare_to_read()?;
-        Self::seek_(&mut file, index)?;
-        Ok((file, buf))
-    }
-
-    pub fn read_exact<'a>(&self, file: &'a mut File, buf: &'a mut [u8]) -> Result<&'a T> {
-        file.read_exact(buf).map_err(Error::IO)?;
-        let v = T::unsafe_try_from_slice(&buf[..]).map_err(Error::UnsafeSliceSerde)?;
+    fn read_exact<'a>(file: &'a mut File, buf: &'a mut [u8]) -> Result<&'a T> {
+        file.read_exact(buf)?;
+        let v = T::unsafe_try_from_slice(&buf[..])?;
         Ok(v)
     }
 
-    pub fn iter_from<F>(&self, index: I, mut f: F) -> Result<()>
-    where
-        F: FnMut((I, &T)) -> Result<()>,
-    {
-        let (mut file, mut buf) = self.prepare_to_read()?;
-        let disk_len = Self::disk_len(&file).map_err(Error::IO)?;
-        Self::seek(&mut file, index)?;
-
-        let mut i: usize = index.try_into().map_err(|_| Error::FailedKeyTryIntoUsize)?;
-        while i < disk_len {
-            let v = self.read_exact(&mut file, &mut buf)?;
-            f((I::from(i), v))?;
-            i += 1;
-        }
-        i = 0;
-        while i < self.pushed_len() {
-            f((I::from(i + disk_len), self.pushed.get(i).as_ref().unwrap()))?;
-            i += 1;
-        }
-
-        Ok(())
-    }
-
-    #[allow(unused)]
-    pub fn first(&self) -> Result<Option<Value<'_, T>>> {
-        self.cached_get_(0)
-    }
-
-    #[allow(unused)]
-    pub fn last(&self) -> Result<Option<Value<'_, T>>> {
-        let len = self.len();
-        if len == 0 {
-            return Ok(None);
-        }
-        self.cached_get_(len - 1)
-    }
-
-    pub fn push(&mut self, value: T) {
+    #[inline]
+    fn push_(&mut self, value: T) {
         self.pushed.push(value)
     }
 
-    pub fn push_if_needed(&mut self, index: I, value: T) -> Result<()> {
-        self.push_if_needed_(index.try_into().map_err(|_| Error::FailedKeyTryIntoUsize)?, value)
-    }
-    fn push_if_needed_(&mut self, index: usize, value: T) -> Result<()> {
-        let len = self.len();
-        match len.cmp(&index) {
+    #[inline]
+    fn push_if_needed_(&mut self, index: I, value: T) -> Result<()> {
+        match self.pushed_len().cmp(&Self::i_to_usize(index)?) {
             Ordering::Greater => {
                 // dbg!(len, index, &self.pathbuf);
                 // panic!();
                 Ok(())
             }
             Ordering::Equal => {
-                self.push(value);
+                self.pushed.push(value);
                 Ok(())
             }
             Ordering::Less => {
@@ -345,7 +261,34 @@ where
                 Err(Error::IndexTooHigh)
             }
         }
+        // Self::push_to_vec_if_needed(&mut self.pushed, index, value)
     }
+    // #[inline]
+    // fn push_if_needed__(&mut self, index: usize, value: T) -> Result<()> {
+    //     Self::push_to_vec_if_needed_(&mut self.pushed, index, value)
+    // }
+    // #[inline]
+    // fn push_to_vec_if_needed(vec: &mut Vec<T>, index: I, value: T) -> Result<()> {
+    //     Self::push_to_vec_if_needed_(vec, Self::i_to_usize(index)?, value)
+    // }
+    // fn push_to_vec_if_needed_(vec: &mut Vec<T>, index: usize, value: T) -> Result<()> {
+    //     let len = vec.len();
+    //     match len.cmp(&index) {
+    //         Ordering::Greater => {
+    //             // dbg!(len, index, &self.pathbuf);
+    //             // panic!();
+    //             Ok(())
+    //         }
+    //         Ordering::Equal => {
+    //             vec.push(value);
+    //             Ok(())
+    //         }
+    //         Ordering::Less => {
+    //             dbg!(index, value);
+    //             Err(Error::IndexTooHigh)
+    //         }
+    //     }
+    // }
 
     // pub fn update(&mut self, index: I, value: T) -> Result<()> {
     //     self._update(index.into(), value)
@@ -387,77 +330,332 @@ where
     //     self.removed.insert(index);
     // }
 
+    #[inline]
     pub fn len(&self) -> usize {
-        self.disk_len + self.pushed_len()
+        self.file_len + self.pushed_len()
     }
 
+    #[inline]
     pub fn pushed_len(&self) -> usize {
         self.pushed.len()
     }
 
+    #[inline]
     pub fn is_empty(&self) -> bool {
         self.len() == 0
     }
 
+    #[inline]
     pub fn has(&self, index: I) -> Result<bool> {
-        Ok(self.has_(index.try_into().map_err(|_| Error::FailedKeyTryIntoUsize)?))
+        Ok(self.has_(Self::i_to_usize(index)?))
     }
+    #[inline]
     fn has_(&self, index: usize) -> bool {
         index < self.len()
     }
 
+    #[inline]
     pub fn hasnt(&self, index: I) -> Result<bool> {
-        Ok(self.hasnt_(index.try_into().map_err(|_| Error::FailedKeyTryIntoUsize)?))
+        self.has(index).map(|b| !b)
     }
+    #[inline]
     fn hasnt_(&self, index: usize) -> bool {
         !self.has_(index)
     }
 
-    // pub fn flush(&mut self) -> io::Result<()>
-    // where
-    //     T: Bytes,
-    // {
-    //     self.flush_(|bytes, v| bytes.extend_from_slice(&v.to_bytes()))
-    // }
     pub fn flush(&mut self) -> io::Result<()> {
-        //     self.flush_(|bytes, v| bytes.extend_from_slice(v.unsafe_as_slice()))
-        // }
-        // fn flush_<F>(&mut self, mut extend: F) -> io::Result<()>
-        // where
-        //     F: FnMut(&mut Vec<u8>, T),
-        // {
-        self.reset_cache();
+        self.reset_disk_related_state()?;
 
         if self.pushed.is_empty() {
             return Ok(());
         }
 
-        self.disk_len += self.pushed.len();
+        self.file_len += self.pushed.len();
 
         let mut bytes: Vec<u8> = vec![];
 
         mem::take(&mut self.pushed)
             .into_iter()
             .for_each(|v| bytes.extend_from_slice(v.unsafe_as_slice()));
-        // .for_each(|v| extend(&mut bytes, v));
 
-        self.unsafe_file.write_all(&bytes)?;
+        self.file.write_all(&bytes)?;
 
         Ok(())
     }
 
+    #[inline]
+    fn i_to_usize(index: I) -> Result<usize> {
+        index.try_into().map_err(|_| Error::FailedKeyTryIntoUsize)
+    }
+
+    #[inline]
+    fn byte_index_to_index(byte_index: usize) -> usize {
+        byte_index / Self::SIZE_OF_T
+    }
+
+    #[inline]
+    fn index_to_byte_index(index: usize) -> u64 {
+        (index * Self::SIZE_OF_T) as u64
+    }
+
+    #[inline]
+    fn index_to_byte_range(index: usize) -> Range<usize> {
+        let index = (Self::index_to_byte_index(index) as usize) % Self::PAGE_SIZE;
+        index..(index + Self::SIZE_OF_T)
+    }
+
+    fn index_to_pushed_index(&self, index: usize) -> Result<Option<usize>> {
+        if index >= self.file_len {
+            let index = index - self.file_len;
+            if index >= self.pushed.len() {
+                Err(Error::IndexTooHigh)
+            } else {
+                Ok(Some(index))
+            }
+        } else {
+            Err(Error::IndexTooLow)
+        }
+    }
+
+    #[inline]
     pub fn path(&self) -> &Path {
         &self.pathbuf
     }
 
+    #[inline]
     fn path_vec(&self) -> PathBuf {
         Self::path_vec_(&self.pathbuf)
     }
+    #[inline]
     fn path_vec_(path: &Path) -> PathBuf {
         path.join("vec")
     }
 
+    #[inline]
     fn path_version_(path: &Path) -> PathBuf {
         path.join("version")
     }
 }
+
+impl<I, T> StorableVec<I, T, CACHED_GETS>
+where
+    I: StorableVecIndex,
+    T: StorableVecType,
+{
+    #[inline]
+    pub fn get(&self, index: I) -> Result<Option<Value<'_, T>>> {
+        self.get_(Self::i_to_usize(index)?)
+    }
+    fn get_(&self, index: usize) -> Result<Option<Value<'_, T>>> {
+        match self.index_to_pushed_index(index) {
+            Ok(index) => {
+                if let Some(index) = index {
+                    return Ok(self.pushed.get(index).map(|v| Value::Ref(v)));
+                }
+            }
+            Err(Error::IndexTooHigh) => return Ok(None),
+            Err(Error::IndexTooLow) => {}
+            Err(error) => return Err(error),
+        }
+
+        // if !self.updated.is_empty() {
+        //     if let Some(v) = self.updated.get(&index) {
+        //         return Ok(Some(v));
+        //     }
+        // }
+
+        let page_index = index / Self::PER_PAGE;
+        let last_index = self.file_len - 1;
+        let max_page_index = last_index / Self::PER_PAGE;
+        let min_page_index = (max_page_index + 1).checked_sub(self.cache.len()).unwrap_or_default();
+
+        // let min_open_page = self.min.load(AtomicOrdering::SeqCst);
+
+        // if self.min.load(AtomicOrdering::SeqCst) {
+        //     self.min.set(value)
+        // }
+
+        if page_index >= min_page_index {
+            let mmap = &**self
+                .cache
+                .get(page_index - min_page_index)
+                .ok_or(Error::MmapsVecIsTooSmall)?
+                .get_or_init(|| {
+                    Box::new(unsafe {
+                        MmapOptions::new()
+                            .len(Self::PAGE_SIZE)
+                            .offset((page_index * Self::PAGE_SIZE) as u64)
+                            .map(&self.file)
+                            .unwrap()
+                    })
+                });
+
+            let range = Self::index_to_byte_range(index);
+            let slice = &mmap[range];
+            return Ok(Some(Value::Ref(T::unsafe_try_from_slice(slice)?)));
+        }
+
+        Ok(Some(Value::Owned(self.open_file_at_then_read(index)?.to_owned())))
+    }
+
+    pub fn get_or_default(&self, index: I) -> Result<T>
+    where
+        T: Default + Clone,
+    {
+        Ok(self.get(index)?.map(|v| (*v).clone()).unwrap_or(Default::default()))
+    }
+
+    #[inline]
+    pub fn push(&mut self, value: T) {
+        self.push_(value)
+    }
+
+    #[inline]
+    pub fn push_if_needed(&mut self, index: I, value: T) -> Result<()> {
+        self.push_if_needed_(index, value)
+    }
+}
+
+const FLUSH_EVERY: usize = 10_000;
+impl<I, T> StorableVec<I, T, SINGLE_THREAD>
+where
+    I: StorableVecIndex,
+    T: StorableVecType,
+{
+    pub fn get(&mut self, index: I) -> Result<&T> {
+        self.get_(Self::i_to_usize(index)?)
+    }
+    fn get_(&mut self, index: usize) -> Result<&T> {
+        let byte_index = Self::index_to_byte_index(index);
+        if self.file_position != byte_index {
+            self.file_position = Self::seek(&mut self.file, byte_index)?;
+        }
+        let res = Self::read_exact(&mut self.file, &mut self.buf);
+        if res.is_ok() {
+            self.file_position += Self::SIZE_OF_T as u64;
+        }
+        res
+    }
+
+    pub fn last(&mut self) -> Result<Option<&T>> {
+        let len = self.len();
+        if len == 0 {
+            return Ok(None);
+        }
+        Ok(self.get_(len - 1).ok())
+    }
+
+    #[inline]
+    pub fn push(&mut self, value: T) {
+        self.push_(value)
+    }
+
+    #[inline]
+    pub fn push_if_needed(&mut self, index: I, value: T) -> Result<()> {
+        self.push_if_needed_(index, value)?;
+
+        if self.pushed_len() >= FLUSH_EVERY {
+            Ok(self.flush()?)
+        } else {
+            Ok(())
+        }
+    }
+
+    // #[inline]
+    // fn seek_if_needed(&mut self, index: I) -> Result<()> {
+    //     if self.file_position == Self::index_to_byte_index(Self::i_to_usize(index)?) {
+    //         return Ok(());
+    //     }
+    //     self.file_position = Self::seek_if_needed_(&mut self.file, index)?;
+    //     Ok(())
+    // }
+
+    pub fn iter<F>(&mut self, f: F) -> Result<()>
+    where
+        F: FnMut((I, &T)) -> Result<()>,
+    {
+        self.iter_from(I::default(), f)
+    }
+
+    pub fn iter_from<F>(&mut self, mut index: I, mut f: F) -> Result<()>
+    where
+        F: FnMut((I, &T)) -> Result<()>,
+    {
+        // let pushed_len = self.pushed_len();
+
+        // self.seek_if_needed(index)?;
+
+        if !self.pushed.is_empty() {
+            return Err(Error::UnsupportedUnflushedState);
+        }
+
+        let disk_len = I::from(Self::read_disk_len_(&self.file)?);
+
+        while index < disk_len {
+            f((index, self.get(index)?))?;
+            index = index + 1;
+        }
+
+        // i = 0;
+        // while i < pushed_len {
+        //     f((I::from(i + disk_len), self.pushed.get(i).as_ref().unwrap()))?;
+        //     i += 1;
+        // }
+
+        Ok(())
+    }
+
+    pub fn compute_inverse_more_to_less(&mut self, other: &mut StorableVec<T, I, SINGLE_THREAD>) -> Result<()>
+    where
+        I: StorableVecType,
+        T: StorableVecIndex,
+    {
+        let index = self.last()?.cloned().unwrap_or_default();
+        other.iter_from(index, |(v, i)| self.push_if_needed(*i, v))?;
+        Ok(self.flush()?)
+    }
+
+    pub fn compute_inverse_less_to_more(
+        &mut self,
+        first_indexes: &mut StorableVec<T, I, SINGLE_THREAD>,
+        last_indexes: &mut StorableVec<T, I, SINGLE_THREAD>,
+    ) -> Result<()>
+    where
+        I: StorableVecType,
+        T: StorableVecIndex,
+    {
+        first_indexes.iter_from(T::from(self.len()), |(value, first_index)| {
+            let first_index = Self::i_to_usize(*first_index)?;
+            let last_index = Self::i_to_usize(*last_indexes.get(value)?)?;
+            (first_index..last_index).try_for_each(|index| self.push_if_needed(I::from(index), value))
+        })?;
+        Ok(self.flush()?)
+    }
+
+    pub fn compute_transform<A, F>(&mut self, other: &mut StorableVec<I, A, SINGLE_THREAD>, t: F) -> Result<()>
+    where
+        A: StorableVecType,
+        F: Fn(&A) -> T,
+    {
+        other.iter_from(I::from(self.len()), |(i, a)| self.push_if_needed(i, t(a)))?;
+        Ok(self.flush()?)
+    }
+}
+
+impl<I, T> StorableVec<I, T, ASYNC_READ_ONLY>
+where
+    I: StorableVecIndex,
+    T: StorableVecType,
+{
+    #[inline]
+    pub fn get(&self, index: I) -> Result<Option<Value<'_, T>>> {
+        self.get_(Self::i_to_usize(index)?)
+    }
+    #[inline]
+    fn get_(&self, index: usize) -> Result<Option<Value<'_, T>>> {
+        Ok(Some(Value::Owned(self.open_file_at_then_read(index)?.to_owned())))
+    }
+
+    // Add iter iter_from iter_range collect..
+    // + add memory cap
+}
diff --git a/storable_vec/src/main.rs b/storable_vec/src/main.rs
index 8a32b4ed2..08e5b9612 100644
--- a/storable_vec/src/main.rs
+++ b/storable_vec/src/main.rs
@@ -1,24 +1,25 @@
 use std::path::Path;
 
-use storable_vec::{StorableVec, Version};
+use storable_vec::{StorableVec, Version, CACHED_GETS};
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     {
-        let mut vec: StorableVec<usize, u32> = StorableVec::import(Path::new("./v"), Version::from(1))?;
+        let mut vec: StorableVec<usize, u32, CACHED_GETS> =
+            StorableVec::forced_import(Path::new("./v"), Version::from(1))?;
 
         vec.push(0);
         vec.push(1);
         vec.push(2);
-        dbg!(vec.cached_get(0)?); // Some(0)
-        dbg!(vec.cached_get(21)?); // None
+        dbg!(vec.get(0)?); // Some(0)
+        dbg!(vec.get(21)?); // None
 
         vec.flush()?;
     }
 
     {
-        let vec: StorableVec<usize, u32> = StorableVec::import(Path::new("./v"), Version::from(1))?;
+        let vec: StorableVec<usize, u32, CACHED_GETS> = StorableVec::forced_import(Path::new("./v"), Version::from(1))?;
 
-        dbg!(vec.cached_get(0)?); // 0
+        dbg!(vec.get(0)?); // 0
     }
 
     Ok(())
diff --git a/storable_vec/src/structs/version.rs b/storable_vec/src/structs/version.rs
index e3c22c552..67af8da9f 100644
--- a/storable_vec/src/structs/version.rs
+++ b/storable_vec/src/structs/version.rs
@@ -4,12 +4,20 @@ use std::{
     path::Path,
 };
 
+use unsafe_slice_serde::UnsafeSliceSerde;
+
+use crate::Error;
+
 #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
 pub struct Version(u32);
 
 impl Version {
     pub fn write(&self, path: &Path) -> Result<(), io::Error> {
-        fs::write(path, self.0.to_le_bytes())
+        fs::write(path, self.0.unsafe_as_slice())
+    }
+
+    pub fn swap_bytes(self) -> Self {
+        Self(self.0.swap_bytes())
     }
 }
 
@@ -20,10 +28,10 @@ impl From<u32> for Version {
 }
 
 impl TryFrom<&Path> for Version {
-    type Error = io::Error;
+    type Error = Error;
     fn try_from(value: &Path) -> Result<Self, Self::Error> {
         let mut buf = [0; 4];
         fs::read(value)?.as_slice().read_exact(&mut buf)?;
-        Ok(Self(u32::from_le_bytes(buf)))
+        Ok(*(Self::unsafe_try_from_slice(&buf)?))
     }
 }
diff --git a/storable_vec/src/traits/any.rs b/storable_vec/src/traits/any.rs
index 22ff38e9c..8dcf72a82 100644
--- a/storable_vec/src/traits/any.rs
+++ b/storable_vec/src/traits/any.rs
@@ -7,10 +7,10 @@ use super::{StorableVecIndex, StorableVecType};
 pub trait AnyStorableVec {
     fn len(&self) -> usize;
     fn is_empty(&self) -> bool;
-    fn unsafe_flush(&mut self) -> io::Result<()>;
+    fn flush(&mut self) -> io::Result<()>;
 }
 
-impl<I, T> AnyStorableVec for StorableVec<I, T>
+impl<I, T, const MODE: u8> AnyStorableVec for StorableVec<I, T, MODE>
 where
     I: StorableVecIndex,
     T: StorableVecType,
@@ -23,7 +23,7 @@ where
         self.is_empty()
     }
 
-    fn unsafe_flush(&mut self) -> io::Result<()> {
+    fn flush(&mut self) -> io::Result<()> {
         self.flush()
     }
 }
diff --git a/storable_vec/src/traits/index.rs b/storable_vec/src/traits/index.rs
index fff90ada1..6ff29dcca 100644
--- a/storable_vec/src/traits/index.rs
+++ b/storable_vec/src/traits/index.rs
@@ -2,10 +2,10 @@ use std::{fmt::Debug, ops::Add};
 
 pub trait StorableVecIndex
 where
-    Self: Debug + Default + Copy + Clone + TryInto<usize> + From<usize> + Add<usize, Output = Self>,
+    Self: Debug + Default + Copy + Clone + PartialOrd + Ord + TryInto<usize> + From<usize> + Add<usize, Output = Self>,
 {
 }
 impl<I> StorableVecIndex for I where
-    I: Debug + Default + Copy + Clone + TryInto<usize> + From<usize> + Add<usize, Output = Self>
+    I: Debug + Default + Copy + Clone + PartialOrd + Ord + TryInto<usize> + From<usize> + Add<usize, Output = Self>
 {
 }

From 138ca80c106abe5a6c341cfffcff2f9784db1bf7 Mon Sep 17 00:00:00 2001
From: nym21 <expat-epochs0i@icloud.com>
Date: Wed, 5 Feb 2025 00:23:58 +0100
Subject: [PATCH 38/63] global: snapshot

---
 computer/src/lib.rs                        |  18 +-
 computer/src/storage/storable_vecs/base.rs |  94 +---------
 indexer/src/storage/storable_vecs/base.rs  |   2 +-
 storable_vec/src/lib.rs                    | 191 ++++++++-------------
 storable_vec/src/main.rs                   |   8 +-
 5 files changed, 88 insertions(+), 225 deletions(-)

diff --git a/computer/src/lib.rs b/computer/src/lib.rs
index 10a889e6b..0d4a788d8 100644
--- a/computer/src/lib.rs
+++ b/computer/src/lib.rs
@@ -13,8 +13,8 @@ use structs::*;
 
 pub struct Computer<const MODE: u8> {
     outputs_dir: PathBuf,
-    vecs: StorableVecs<MODE>,
-    trees: Fjalls,
+    pub vecs: StorableVecs<MODE>,
+    pub trees: Fjalls,
 }
 
 impl<const MODE: u8> Computer<MODE> {
@@ -53,20 +53,20 @@ impl Computer<SINGLE_THREAD> {
 
         self.vecs
             .txindex_to_last_txinindex
-            .compute_last_index_from_first(&indexer.vecs.txindex_to_first_txinindex, txinindexes_count)?;
+            .compute_last_index_from_first(&mut indexer.vecs.txindex_to_first_txinindex, txinindexes_count)?;
 
         self.vecs.txindex_to_inputcount.compute_count_from_indexes(
-            &indexer.vecs.txindex_to_first_txinindex,
-            &self.vecs.txindex_to_last_txinindex,
+            &mut indexer.vecs.txindex_to_first_txinindex,
+            &mut self.vecs.txindex_to_last_txinindex,
         )?;
 
         self.vecs
             .txindex_to_last_txoutindex
-            .compute_last_index_from_first(&indexer.vecs.txindex_to_first_txoutindex, txoutindexes_count)?;
+            .compute_last_index_from_first(&mut indexer.vecs.txindex_to_first_txoutindex, txoutindexes_count)?;
 
         self.vecs.txindex_to_outputcount.compute_count_from_indexes(
-            &indexer.vecs.txindex_to_first_txoutindex,
-            &self.vecs.txindex_to_last_txoutindex,
+            &mut indexer.vecs.txindex_to_first_txoutindex,
+            &mut self.vecs.txindex_to_last_txoutindex,
         )?;
 
         self.vecs
@@ -75,7 +75,7 @@ impl Computer<SINGLE_THREAD> {
 
         self.vecs
             .height_to_last_txindex
-            .compute_last_index_from_first(&indexer.vecs.height_to_first_txindex, height_count)?;
+            .compute_last_index_from_first(&mut indexer.vecs.height_to_first_txindex, height_count)?;
 
         self.vecs.txindex_to_height.compute_inverse_less_to_more(
             &mut indexer.vecs.height_to_first_txindex,
diff --git a/computer/src/storage/storable_vecs/base.rs b/computer/src/storage/storable_vecs/base.rs
index a3cb4f25e..11cbbcee3 100644
--- a/computer/src/storage/storable_vecs/base.rs
+++ b/computer/src/storage/storable_vecs/base.rs
@@ -1,19 +1,11 @@
-use std::{
-    error,
-    fmt::Debug,
-    io,
-    ops::{Add, Sub},
-    path::Path,
-};
+use std::{fmt::Debug, path::Path};
 
 use derive_deref::{Deref, DerefMut};
-use storable_vec::{StorableVecIndex, StorableVecType, Version, SINGLE_THREAD};
+use storable_vec::{StorableVecIndex, StorableVecType, Version};
 
 #[derive(Debug, Deref, DerefMut)]
 pub struct StorableVec<I, T, const MODE: u8>(storable_vec::StorableVec<I, T, MODE>);
 
-const FLUSH_EVERY: usize = 10_000;
-
 impl<I, T, const MODE: u8> StorableVec<I, T, MODE>
 where
     I: StorableVecIndex,
@@ -23,85 +15,3 @@ where
         Ok(Self(storable_vec::StorableVec::forced_import(path, version)?))
     }
 }
-
-impl<I, T> StorableVec<I, T, SINGLE_THREAD>
-where
-    I: StorableVecIndex,
-    T: StorableVecType,
-{
-    fn flush_vec_if_needed(&mut self) -> io::Result<()> {
-        if self.pushed_len() == FLUSH_EVERY {
-            self.flush()
-        } else {
-            Ok(())
-        }
-    }
-
-    pub fn compute_is_first_ordered<A>(
-        &mut self,
-        self_to_other: &storable_vec::StorableVec<I, A, SINGLE_THREAD>,
-        other_to_self: &storable_vec::StorableVec<A, I, SINGLE_THREAD>,
-    ) -> storable_vec::Result<()>
-    where
-        A: StorableVecIndex + StorableVecType,
-    {
-        // let mut prev_a_opt = None;
-        // self_to_other.iter_from(I::from(self.len()), |(i, a)| {
-        //     if prev_a_opt.is_none() {
-        //         prev_a_opt.replace(a);
-        //         self.push_if_needed(i, other_to_self.read_at(a) == i);
-        //     } else {
-        //         let prev_a = prev_a_opt.unwrap();
-        //         if a != prev_a
-        //     }
-        //     other_to_self.seek_read(a);
-        //     self.push_if_needed(i, t(a));
-        //     Ok(())
-        // })
-        Ok(())
-    }
-
-    pub fn compute_last_index_from_first(
-        &mut self,
-        first_index_vec: &storable_vec::StorableVec<I, T, SINGLE_THREAD>,
-        final_len: usize,
-    ) -> color_eyre::Result<()>
-    where
-        T: Copy + From<usize> + Sub<T, Output = T> + StorableVecIndex,
-    {
-        let mut prev_index: Option<I> = None;
-        first_index_vec.iter_from(I::from(self.len()), |(i, v)| {
-            if let Some(prev_index) = prev_index {
-                self.push_if_needed(prev_index, *v - T::from(1))?;
-            }
-            prev_index.replace(i);
-            Ok(self.flush_vec_if_needed()?)
-        })?;
-        if let Some(prev_index) = prev_index {
-            self.push_if_needed(prev_index, T::from(final_len) - T::from(1))?;
-        }
-        self.flush()?;
-        Ok(())
-    }
-
-    pub fn compute_count_from_indexes<T2>(
-        &mut self,
-        first_indexes: &storable_vec::StorableVec<I, T2, SINGLE_THREAD>,
-        last_indexes: &storable_vec::StorableVec<I, T2, SINGLE_THREAD>,
-    ) -> color_eyre::Result<()>
-    where
-        T: From<T2>,
-        T2: StorableVecType + Copy + Add<usize, Output = T2> + Sub<T2, Output = T2> + TryInto<T>,
-        <T2 as TryInto<T>>::Error: error::Error + Send + Sync + 'static,
-    {
-        let (mut file_last, mut buf_last) = last_indexes.prepare_to_read_at_(self.len())?;
-        first_indexes.iter_from(I::from(self.len()), |(i, first_index)| {
-            let last_index = last_indexes.read_exact(&mut file_last, &mut buf_last)?;
-            let count = *last_index + 1_usize - *first_index;
-            self.push_if_needed(i, count.into())?;
-            Ok(self.flush_vec_if_needed()?)
-        })?;
-        self.flush()?;
-        Ok(())
-    }
-}
diff --git a/indexer/src/storage/storable_vecs/base.rs b/indexer/src/storage/storable_vecs/base.rs
index 99b6adfa8..5f32bdc26 100644
--- a/indexer/src/storage/storable_vecs/base.rs
+++ b/indexer/src/storage/storable_vecs/base.rs
@@ -5,7 +5,7 @@ use std::{
     path::{Path, PathBuf},
 };
 
-use storable_vec::{StorableVecIndex, StorableVecType, Version, CACHED_GETS};
+use storable_vec::{StorableVecIndex, StorableVecType, Version};
 
 use super::Height;
 
diff --git a/storable_vec/src/lib.rs b/storable_vec/src/lib.rs
index 95da53292..cbaf540ae 100644
--- a/storable_vec/src/lib.rs
+++ b/storable_vec/src/lib.rs
@@ -1,11 +1,12 @@
 use std::{
     cmp::Ordering,
+    error,
     fmt::Debug,
     fs::{self, File, OpenOptions},
     io::{self, Read, Seek, SeekFrom, Write},
     marker::PhantomData,
     mem,
-    ops::Range,
+    ops::{Add, Range, Sub},
     path::{Path, PathBuf},
     sync::OnceLock,
 };
@@ -192,47 +193,18 @@ where
         }
     }
 
-    // #[inline]
-    // fn open_file_at_then_read(&self, index: I) -> Result<T> {
-    //     self.open_file_at_then_read_(Self::i_to_usize(index)?)
-    // }
     fn open_file_at_then_read(&self, index: usize) -> Result<T> {
-        // let (mut file, mut buf) = self.open_file_at(index)?;
         let mut file = self.open_file()?;
         let mut buf = Self::create_buffer();
-
-        let byte_index = Self::index_to_byte_index(index);
-        Self::seek(&mut file, byte_index)?;
-
-        Ok(Self::read_exact(&mut file, &mut buf)?.to_owned())
+        Self::seek(&mut file, Self::index_to_byte_index(index))?;
+        Self::read_exact(&mut file, &mut buf).map(|v| v.to_owned())
     }
-    // #[inline]
-    // fn open_file_at(&self, index: I) -> Result<(File, Buffer)> {
-    //     self.open_file_at_(Self::i_to_usize(index)?)
-    // }
-    // fn open_file_at(&self, index: usize) -> Result<(File, Buffer)> {
-    //     let mut file = self.open_file()?;
-    //     let buf = Self::create_buffer();
-    //     let byte_index = Self::index_to_byte_index(index);
-    //     Self::seek(&mut file, byte_index)?;
-    //     Ok((file, buf))
-    // }
-    // #[inline]
-    // fn seek_if_needed_(file: &mut File, index: I) -> Result<u64> {
-    //     Self::seek_if_needed__(file, Self::i_to_usize(index)?).map_err(Error::IO)
-    // }
-    // #[inline]
-    // fn seek_if_needed(file: &mut File, index: usize) -> io::Result<u64> {
-    //     let byte_index = Self::index_to_byte_index(index);
-    //     if file.stream_position()? != byte_index {
-    //         Self::seek(file, byte_index)?;
-    //     }
-    //     Ok(byte_index)
-    // }
+
     #[inline]
     fn seek(file: &mut File, byte_index: u64) -> io::Result<u64> {
         file.seek(SeekFrom::Start(byte_index))
     }
+
     fn read_exact<'a>(file: &'a mut File, buf: &'a mut [u8]) -> Result<&'a T> {
         file.read_exact(buf)?;
         let v = T::unsafe_try_from_slice(&buf[..])?;
@@ -261,74 +233,7 @@ where
                 Err(Error::IndexTooHigh)
             }
         }
-        // Self::push_to_vec_if_needed(&mut self.pushed, index, value)
     }
-    // #[inline]
-    // fn push_if_needed__(&mut self, index: usize, value: T) -> Result<()> {
-    //     Self::push_to_vec_if_needed_(&mut self.pushed, index, value)
-    // }
-    // #[inline]
-    // fn push_to_vec_if_needed(vec: &mut Vec<T>, index: I, value: T) -> Result<()> {
-    //     Self::push_to_vec_if_needed_(vec, Self::i_to_usize(index)?, value)
-    // }
-    // fn push_to_vec_if_needed_(vec: &mut Vec<T>, index: usize, value: T) -> Result<()> {
-    //     let len = vec.len();
-    //     match len.cmp(&index) {
-    //         Ordering::Greater => {
-    //             // dbg!(len, index, &self.pathbuf);
-    //             // panic!();
-    //             Ok(())
-    //         }
-    //         Ordering::Equal => {
-    //             vec.push(value);
-    //             Ok(())
-    //         }
-    //         Ordering::Less => {
-    //             dbg!(index, value);
-    //             Err(Error::IndexTooHigh)
-    //         }
-    //     }
-    // }
-
-    // pub fn update(&mut self, index: I, value: T) -> Result<()> {
-    //     self._update(index.into(), value)
-    // }
-    // pub fn update_(&mut self, index: usize, value: T) -> Result<()> {
-    //     if let Some(index) = self.index_to_pushed_index(index) {
-    //         self.pushed[index] = value;
-    //     } else {
-    //         self.updated.insert(index, value);
-    //     }
-    //     Ok(())
-    // }
-
-    // pub fn fetch_update(&mut self, index: I, value: T) -> Result<T>
-    // where
-    //     T: Clone,
-    // {
-    //     self._fetch_update(index.into(), value)
-    // }
-    // pub fn fetch_update_(&mut self, index: usize, value: T) -> Result<T>
-    // where
-    //     T: Clone,
-    // {
-    //     let prev_opt = self.updated.insert(index, value);
-    //     if let Some(prev) = prev_opt {
-    //         Ok(prev)
-    //     } else {
-    //         Ok(self
-    //             ._get(index)?
-    //             .ok_or(Error::ExpectFileToHaveIndex)?
-    //             .clone())
-    //     }
-    // }
-
-    // pub fn remove(&mut self, index: I) {
-    //     self._remove(index.into())
-    // }
-    // pub fn remove_(&mut self, index: usize) {
-    //     self.removed.insert(index);
-    // }
 
     #[inline]
     pub fn len(&self) -> usize {
@@ -358,10 +263,6 @@ where
     pub fn hasnt(&self, index: I) -> Result<bool> {
         self.has(index).map(|b| !b)
     }
-    #[inline]
-    fn hasnt_(&self, index: usize) -> bool {
-        !self.has_(index)
-    }
 
     pub fn flush(&mut self) -> io::Result<()> {
         self.reset_disk_related_state()?;
@@ -528,6 +429,7 @@ where
     fn get_(&mut self, index: usize) -> Result<&T> {
         let byte_index = Self::index_to_byte_index(index);
         if self.file_position != byte_index {
+            println!("seek");
             self.file_position = Self::seek(&mut self.file, byte_index)?;
         }
         let res = Self::read_exact(&mut self.file, &mut self.buf);
@@ -561,15 +463,6 @@ where
         }
     }
 
-    // #[inline]
-    // fn seek_if_needed(&mut self, index: I) -> Result<()> {
-    //     if self.file_position == Self::index_to_byte_index(Self::i_to_usize(index)?) {
-    //         return Ok(());
-    //     }
-    //     self.file_position = Self::seek_if_needed_(&mut self.file, index)?;
-    //     Ok(())
-    // }
-
     pub fn iter<F>(&mut self, f: F) -> Result<()>
     where
         F: FnMut((I, &T)) -> Result<()>,
@@ -605,6 +498,15 @@ where
         Ok(())
     }
 
+    pub fn compute_transform<A, F>(&mut self, other: &mut StorableVec<I, A, SINGLE_THREAD>, t: F) -> Result<()>
+    where
+        A: StorableVecType,
+        F: Fn(&A) -> T,
+    {
+        other.iter_from(I::from(self.len()), |(i, a)| self.push_if_needed(i, t(a)))?;
+        Ok(self.flush()?)
+    }
+
     pub fn compute_inverse_more_to_less(&mut self, other: &mut StorableVec<T, I, SINGLE_THREAD>) -> Result<()>
     where
         I: StorableVecType,
@@ -632,12 +534,59 @@ where
         Ok(self.flush()?)
     }
 
-    pub fn compute_transform<A, F>(&mut self, other: &mut StorableVec<I, A, SINGLE_THREAD>, t: F) -> Result<()>
+    pub fn compute_last_index_from_first(
+        &mut self,
+        first_index_vec: &mut StorableVec<I, T, SINGLE_THREAD>,
+        final_len: usize,
+    ) -> Result<()>
     where
-        A: StorableVecType,
-        F: Fn(&A) -> T,
+        T: Copy + From<usize> + Sub<T, Output = T> + StorableVecIndex,
     {
-        other.iter_from(I::from(self.len()), |(i, a)| self.push_if_needed(i, t(a)))?;
+        let one = T::from(1);
+        let mut prev_index: Option<I> = None;
+        first_index_vec.iter_from(I::from(self.len()), |(i, v)| {
+            if let Some(prev_index) = prev_index {
+                self.push_if_needed(prev_index, *v - one)?;
+            }
+            prev_index.replace(i);
+            Ok(())
+        })?;
+        if let Some(prev_index) = prev_index {
+            self.push_if_needed(prev_index, T::from(final_len) - one)?;
+        }
+        Ok(self.flush()?)
+    }
+
+    pub fn compute_count_from_indexes<T2>(
+        &mut self,
+        first_indexes: &mut StorableVec<I, T2, SINGLE_THREAD>,
+        last_indexes: &mut StorableVec<I, T2, SINGLE_THREAD>,
+    ) -> Result<()>
+    where
+        T: From<T2>,
+        T2: StorableVecType + Copy + Add<usize, Output = T2> + Sub<T2, Output = T2> + TryInto<T>,
+        <T2 as TryInto<T>>::Error: error::Error + Send + Sync + 'static,
+    {
+        first_indexes.iter_from(I::from(self.len()), |(i, first_index)| {
+            let last_index = last_indexes.get(i)?;
+            let count = *last_index + 1_usize - *first_index;
+            self.push_if_needed(i, count.into())
+        })?;
+        Ok(self.flush()?)
+    }
+
+    pub fn compute_is_first_ordered<A>(
+        &mut self,
+        self_to_other: &mut StorableVec<I, A, SINGLE_THREAD>,
+        other_to_self: &mut StorableVec<A, I, SINGLE_THREAD>,
+    ) -> Result<()>
+    where
+        A: StorableVecIndex + StorableVecType,
+        T: From<bool>,
+    {
+        self_to_other.iter_from(I::from(self.len()), |(i, other)| {
+            self.push_if_needed(i, T::from(other_to_self.get(*other)? == &i))
+        })?;
         Ok(self.flush()?)
     }
 }
@@ -648,12 +597,12 @@ where
     T: StorableVecType,
 {
     #[inline]
-    pub fn get(&self, index: I) -> Result<Option<Value<'_, T>>> {
+    pub fn get(&self, index: I) -> Result<Option<T>> {
         self.get_(Self::i_to_usize(index)?)
     }
     #[inline]
-    fn get_(&self, index: usize) -> Result<Option<Value<'_, T>>> {
-        Ok(Some(Value::Owned(self.open_file_at_then_read(index)?.to_owned())))
+    fn get_(&self, index: usize) -> Result<Option<T>> {
+        Ok(Some(self.open_file_at_then_read(index)?.to_owned()))
     }
 
     // Add iter iter_from iter_range collect..
diff --git a/storable_vec/src/main.rs b/storable_vec/src/main.rs
index 08e5b9612..9c55fea26 100644
--- a/storable_vec/src/main.rs
+++ b/storable_vec/src/main.rs
@@ -1,6 +1,6 @@
 use std::path::Path;
 
-use storable_vec::{StorableVec, Version, CACHED_GETS};
+use storable_vec::{StorableVec, Version, ASYNC_READ_ONLY, CACHED_GETS, SINGLE_THREAD};
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     {
@@ -17,9 +17,13 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     }
 
     {
-        let vec: StorableVec<usize, u32, CACHED_GETS> = StorableVec::forced_import(Path::new("./v"), Version::from(1))?;
+        let mut vec: StorableVec<usize, u32, SINGLE_THREAD> =
+            StorableVec::forced_import(Path::new("./v"), Version::from(1))?;
 
         dbg!(vec.get(0)?); // 0
+        dbg!(vec.get(1)?); // 0
+        dbg!(vec.get(2)?); // 0
+        dbg!(vec.get(0)?); // 0
     }
 
     Ok(())

From d86d6145207bb9898861ea92d5b8f277ebde0101 Mon Sep 17 00:00:00 2001
From: nym21 <expat-epochs0i@icloud.com>
Date: Wed, 5 Feb 2025 16:42:53 +0100
Subject: [PATCH 39/63] global: from custom unsafe_slice to zerocopy

---
 Cargo.lock                                    | 34 +++++--
 Cargo.toml                                    |  4 +-
 computer/Cargo.toml                           |  2 +-
 computer/src/lib.rs                           | 18 +++-
 computer/src/storage/fjalls.rs                |  3 +-
 computer/src/storage/storable_vecs.rs         | 95 +++++++++++++++++++
 computer/src/storage/storable_vecs/base.rs    | 17 ----
 computer/src/storage/storable_vecs/mod.rs     | 82 ----------------
 .../src/structs/addressindextxoutindex.rs     | 11 ++-
 computer/src/structs/date.rs                  | 77 +++++++++++----
 indexer/Cargo.toml                            |  3 +-
 indexer/src/lib.rs                            | 32 ++++---
 indexer/src/storage/fjalls/base.rs            | 10 +-
 indexer/src/storage/fjalls/meta.rs            |  9 +-
 indexer/src/storage/fjalls/mod.rs             |  5 +-
 indexer/src/storage/fjalls/version.rs         | 51 ++++++++++
 indexer/src/storage/storable_vecs/base.rs     |  6 +-
 indexer/src/storage/storable_vecs/mod.rs      | 11 +--
 indexer/src/structs/addressbytes.rs           | 25 ++---
 indexer/src/structs/addressindex.rs           | 25 ++++-
 indexer/src/structs/addresstype.rs            |  4 +-
 indexer/src/structs/addresstypeindex.rs       | 18 +++-
 indexer/src/structs/amount.rs                 | 47 ++++++---
 indexer/src/structs/blockhash.rs              | 19 ++++
 indexer/src/structs/compressed.rs             | 45 +++++----
 indexer/src/structs/height.rs                 | 43 +++++++--
 indexer/src/structs/locktime.rs               | 28 ++++++
 indexer/src/structs/mod.rs                    | 14 ++-
 indexer/src/structs/slice.rs                  | 55 -----------
 indexer/src/structs/timestamp.rs              | 30 ++++--
 indexer/src/structs/txid.rs                   | 19 ++++
 indexer/src/structs/txindex.rs                | 25 ++++-
 indexer/src/structs/txinindex.rs              | 18 +++-
 indexer/src/structs/txoutindex.rs             | 18 +++-
 indexer/src/structs/txversion.rs              | 17 ++++
 indexer/src/structs/version.rs                | 38 --------
 indexer/src/structs/weight.rs                 | 17 ++++
 storable_vec/Cargo.toml                       |  2 +-
 storable_vec/src/enums/error.rs               | 18 +++-
 storable_vec/src/lib.rs                       | 17 ++--
 storable_vec/src/structs/version.rs           |  8 +-
 storable_vec/src/traits/index.rs              | 24 ++++-
 storable_vec/src/traits/type_.rs              |  6 +-
 43 files changed, 684 insertions(+), 366 deletions(-)
 create mode 100644 computer/src/storage/storable_vecs.rs
 delete mode 100644 computer/src/storage/storable_vecs/base.rs
 delete mode 100644 computer/src/storage/storable_vecs/mod.rs
 create mode 100644 indexer/src/storage/fjalls/version.rs
 create mode 100644 indexer/src/structs/blockhash.rs
 create mode 100644 indexer/src/structs/locktime.rs
 delete mode 100644 indexer/src/structs/slice.rs
 create mode 100644 indexer/src/structs/txid.rs
 create mode 100644 indexer/src/structs/txversion.rs
 delete mode 100644 indexer/src/structs/version.rs
 create mode 100644 indexer/src/structs/weight.rs

diff --git a/Cargo.lock b/Cargo.lock
index 918eb85d9..eda8ab27a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -80,7 +80,7 @@ dependencies = [
  "rapidhash",
  "rayon",
  "storable_vec",
- "unsafe_slice_serde",
+ "zerocopy 0.8.16",
 ]
 
 [[package]]
@@ -192,7 +192,7 @@ dependencies = [
  "fjall",
  "jiff",
  "storable_vec",
- "unsafe_slice_serde",
+ "zerocopy 0.8.16",
 ]
 
 [[package]]
@@ -721,7 +721,7 @@ version = "0.2.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
 dependencies = [
- "zerocopy",
+ "zerocopy 0.7.35",
 ]
 
 [[package]]
@@ -945,7 +945,7 @@ name = "storable_vec"
 version = "0.1.2"
 dependencies = [
  "memmap2",
- "unsafe_slice_serde",
+ "zerocopy 0.8.16",
 ]
 
 [[package]]
@@ -1061,10 +1061,6 @@ version = "1.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a210d160f08b701c8721ba1c726c11662f877ea6b7094007e1ca9a1041945034"
 
-[[package]]
-name = "unsafe_slice_serde"
-version = "0.1.0"
-
 [[package]]
 name = "valuable"
 version = "0.1.1"
@@ -1185,7 +1181,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
 dependencies = [
  "byteorder",
- "zerocopy-derive",
+ "zerocopy-derive 0.7.35",
+]
+
+[[package]]
+name = "zerocopy"
+version = "0.8.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b8c07a70861ce02bad1607b5753ecb2501f67847b9f9ada7c160fff0ec6300c"
+dependencies = [
+ "zerocopy-derive 0.8.16",
 ]
 
 [[package]]
@@ -1198,3 +1203,14 @@ dependencies = [
  "quote",
  "syn 2.0.98",
 ]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.8.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5226bc9a9a9836e7428936cde76bb6b22feea1a8bfdbc0d241136e4d13417e25"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+]
diff --git a/Cargo.toml b/Cargo.toml
index 1d166cb17..c069e0bee 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -6,7 +6,6 @@ members = [
     "iterator",
     "storable_vec",
     "struct_iterable",
-    "unsafe_slice_serde",
 ]
 resolver = "2"
 
@@ -23,5 +22,4 @@ jiff = "0.1.29"
 rayon = "1.10.0"
 storable_vec = { path = "storable_vec" }
 struct_iterable = { path = "struct_iterable" }
-unsafe_slice_serde = { path = "unsafe_slice_serde" }
-zerocopy = "0.8.15"
+zerocopy = { version = "0.8.15", features = ["derive"] }
diff --git a/computer/Cargo.toml b/computer/Cargo.toml
index b1ac43a13..5ff3bb781 100644
--- a/computer/Cargo.toml
+++ b/computer/Cargo.toml
@@ -12,4 +12,4 @@ exit = { workspace = true }
 fjall = { workspace = true }
 jiff = { workspace = true }
 storable_vec = { workspace = true }
-unsafe_slice_serde = { workspace = true }
+zerocopy = { workspace = true }
diff --git a/computer/src/lib.rs b/computer/src/lib.rs
index 0d4a788d8..ff656d32c 100644
--- a/computer/src/lib.rs
+++ b/computer/src/lib.rs
@@ -55,7 +55,7 @@ impl Computer<SINGLE_THREAD> {
             .txindex_to_last_txinindex
             .compute_last_index_from_first(&mut indexer.vecs.txindex_to_first_txinindex, txinindexes_count)?;
 
-        self.vecs.txindex_to_inputcount.compute_count_from_indexes(
+        self.vecs.txindex_to_inputs_count.compute_count_from_indexes(
             &mut indexer.vecs.txindex_to_first_txinindex,
             &mut self.vecs.txindex_to_last_txinindex,
         )?;
@@ -64,14 +64,16 @@ impl Computer<SINGLE_THREAD> {
             .txindex_to_last_txoutindex
             .compute_last_index_from_first(&mut indexer.vecs.txindex_to_first_txoutindex, txoutindexes_count)?;
 
-        self.vecs.txindex_to_outputcount.compute_count_from_indexes(
+        self.vecs.txindex_to_outputs_count.compute_count_from_indexes(
             &mut indexer.vecs.txindex_to_first_txoutindex,
             &mut self.vecs.txindex_to_last_txoutindex,
         )?;
 
         self.vecs
             .height_to_date
-            .compute_transform(&mut indexer.vecs.height_to_timestamp, |timestamp| Date::from(timestamp))?;
+            .compute_transform(&mut indexer.vecs.height_to_timestamp, |timestamp| {
+                Date::from(*timestamp)
+            })?;
 
         self.vecs
             .height_to_last_txindex
@@ -82,6 +84,16 @@ impl Computer<SINGLE_THREAD> {
             &mut self.vecs.height_to_last_txindex,
         )?;
 
+        self.vecs.txindex_to_is_coinbase.compute_is_first_ordered(
+            &mut self.vecs.txindex_to_height,
+            &mut indexer.vecs.height_to_first_txindex,
+        )?;
+
+        self.vecs.txindex_to_fee.compute_transform(
+            &mut self.vecs.txindex_to_height,
+            &mut indexer.vecs.height_to_first_txindex,
+        )?;
+
         let date_count = self.vecs.height_to_date.len();
 
         self.vecs
diff --git a/computer/src/storage/fjalls.rs b/computer/src/storage/fjalls.rs
index aba352bc6..9ba82cd4a 100644
--- a/computer/src/storage/fjalls.rs
+++ b/computer/src/storage/fjalls.rs
@@ -1,6 +1,7 @@
 use std::path::Path;
 
-use bindex::{Store, Version};
+use bindex::Store;
+use storable_vec::Version;
 
 use crate::structs::{AddressindexTxoutindex, Unit};
 
diff --git a/computer/src/storage/storable_vecs.rs b/computer/src/storage/storable_vecs.rs
new file mode 100644
index 000000000..0a78610fd
--- /dev/null
+++ b/computer/src/storage/storable_vecs.rs
@@ -0,0 +1,95 @@
+use std::{fs, path::Path};
+
+use bindex::{Addressindex, Amount, Height, Timestamp, Txindex, Txinindex, Txoutindex};
+use storable_vec::{StorableVec, Version};
+
+use crate::structs::{Date, Feerate};
+
+// mod base;
+
+// use base::*;
+
+pub struct StorableVecs<const MODE: u8> {
+    pub date_to_first_height: StorableVec<Date, Height, MODE>,
+    // pub height_to_block_interval: StorableVec<Height, Timestamp, MODE>,
+    pub height_to_date: StorableVec<Height, Date, MODE>,
+    // pub height_to_fee: StorableVec<Txindex, Amount, MODE>,
+    // pub height_to_inputcount: StorableVec<Txindex, u32, MODE>,
+    // pub height_to_last_addressindex: StorableVec<Height, Addressindex, MODE>,
+    pub height_to_last_txindex: StorableVec<Height, Txindex, MODE>,
+    // pub height_to_last_txoutindex: StorableVec<Height, Txoutindex, MODE>,
+    // pub height_to_maxfeerate: StorableVec<Txindex, Feerate, MODE>,
+    // pub height_to_medianfeerate: StorableVec<Txindex, Feerate, MODE>,
+    // pub height_to_minfeerate: StorableVec<Txindex, Feerate, MODE>,
+    // pub height_to_outputcount: StorableVec<Txindex, u32, MODE>,
+    // pub height_to_subsidy: StorableVec<Txindex, u32, MODE>,
+    // pub height_to_totalfees: StorableVec<Height, Amount, MODE>,
+    // pub height_to_txcount: StorableVec<Txindex, u32, MODE>,
+    pub txindex_to_fee: StorableVec<Txindex, Amount, MODE>,
+    pub txindex_to_height: StorableVec<Txindex, Height, MODE>,
+    pub txindex_to_is_coinbase: StorableVec<Txindex, bool, MODE>,
+    // pub txindex_to_feerate: StorableVec<Txindex, Feerate, MODE>,
+    pub txindex_to_inputs_count: StorableVec<Txindex, u32, MODE>,
+    pub txindex_to_inputs_sum: StorableVec<Txindex, Amount, MODE>,
+    pub txindex_to_last_txinindex: StorableVec<Txindex, Txinindex, MODE>,
+    pub txindex_to_last_txoutindex: StorableVec<Txindex, Txoutindex, MODE>,
+    pub txindex_to_outputs_count: StorableVec<Txindex, u32, MODE>,
+    pub txindex_to_outputs_sum: StorableVec<Txindex, Amount, MODE>,
+}
+
+impl<const MODE: u8> StorableVecs<MODE> {
+    pub fn import(path: &Path) -> color_eyre::Result<Self> {
+        fs::create_dir_all(path)?;
+
+        Ok(Self {
+            date_to_first_height: StorableVec::forced_import(&path.join("date_to_first_height"), Version::from(1))?,
+            // height_to_block_interval: StorableVec::forced_import(&path.join("height_to_block_interval"), Version::from(1))?,
+            height_to_date: StorableVec::forced_import(&path.join("height_to_date"), Version::from(1))?,
+            // height_to_fee: StorableVec::forced_import(&path.join("height_to_fee"), Version::from(1))?,
+            // height_to_inputcount: StorableVec::forced_import(&path.join("height_to_inputcount"), Version::from(1))?,
+            // height_to_last_addressindex: StorableVec::forced_import(
+            //     &path.join("height_to_last_addressindex"),
+            //     Version::from(1),
+            // )?,
+            height_to_last_txindex: StorableVec::forced_import(&path.join("height_to_last_txindex"), Version::from(1))?,
+            // height_to_last_txoutindex: StorableVec::forced_import(&path.join("height_to_last_txoutindex"), Version::from(1))?,
+            // height_to_maxfeerate: StorableVec::forced_import(&path.join("height_to_maxfeerate"), Version::from(1))?,
+            // height_to_medianfeerate: StorableVec::forced_import(&path.join("height_to_medianfeerate"), Version::from(1))?,
+            // height_to_minfeerate: StorableVec::forced_import(&path.join("height_to_minfeerate"), Version::from(1))?,
+            // height_to_outputcount: StorableVec::forced_import(&path.join("height_to_outputcount"), Version::from(1))?,
+            // height_to_subsidy: StorableVec::forced_import(&path.join("height_to_subsidy"), Version::from(1))?,
+            // height_to_totalfees: StorableVec::forced_import(&path.join("height_to_totalfees"), Version::from(1))?,
+            // height_to_txcount: StorableVec::forced_import(&path.join("height_to_txcount"), Version::from(1))?,
+            txindex_to_fee: StorableVec::forced_import(&path.join("txindex_to_fee"), Version::from(1))?,
+            txindex_to_height: StorableVec::forced_import(&path.join("txindex_to_height"), Version::from(1))?,
+            txindex_to_is_coinbase: StorableVec::forced_import(&path.join("txindex_to_is_coinbase"), Version::from(1))?,
+            // txindex_to_feerate: StorableVec::forced_import(&path.join("txindex_to_feerate"), Version::from(1))?,
+            txindex_to_inputs_count: StorableVec::forced_import(
+                &path.join("txindex_to_inputs_count"),
+                Version::from(1),
+            )?,
+            txindex_to_inputs_sum: StorableVec::forced_import(&path.join("txindex_to_inputs_sum"), Version::from(1))?,
+            txindex_to_last_txinindex: StorableVec::forced_import(
+                &path.join("txindex_to_last_txinindex"),
+                Version::from(1),
+            )?,
+            txindex_to_last_txoutindex: StorableVec::forced_import(
+                &path.join("txindex_to_last_txoutindex"),
+                Version::from(1),
+            )?,
+            txindex_to_outputs_count: StorableVec::forced_import(
+                &path.join("txindex_to_outputs_count"),
+                Version::from(1),
+            )?,
+            txindex_to_outputs_sum: StorableVec::forced_import(&path.join("txindex_to_outputs_sum"), Version::from(1))?,
+        })
+    }
+
+    // pub fn as_slice(&self) -> [&dyn AnyComputedStorableVec; 1] {
+    //     [&self.date_to_first_height]
+    // }
+
+    // pub fn as_mut_slice(&mut self) -> [&mut dyn AnyComputedStorableVec; 1] {
+    //     [&mut self.date_to_first_height]
+    // }
+}
diff --git a/computer/src/storage/storable_vecs/base.rs b/computer/src/storage/storable_vecs/base.rs
deleted file mode 100644
index 11cbbcee3..000000000
--- a/computer/src/storage/storable_vecs/base.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-use std::{fmt::Debug, path::Path};
-
-use derive_deref::{Deref, DerefMut};
-use storable_vec::{StorableVecIndex, StorableVecType, Version};
-
-#[derive(Debug, Deref, DerefMut)]
-pub struct StorableVec<I, T, const MODE: u8>(storable_vec::StorableVec<I, T, MODE>);
-
-impl<I, T, const MODE: u8> StorableVec<I, T, MODE>
-where
-    I: StorableVecIndex,
-    T: StorableVecType,
-{
-    pub fn import(path: &Path, version: Version) -> storable_vec::Result<Self> {
-        Ok(Self(storable_vec::StorableVec::forced_import(path, version)?))
-    }
-}
diff --git a/computer/src/storage/storable_vecs/mod.rs b/computer/src/storage/storable_vecs/mod.rs
deleted file mode 100644
index a63fdbc2c..000000000
--- a/computer/src/storage/storable_vecs/mod.rs
+++ /dev/null
@@ -1,82 +0,0 @@
-use std::{fs, path::Path};
-
-use bindex::{Addressindex, Amount, Height, Timestamp, Txindex, Txinindex, Txoutindex};
-use storable_vec::Version;
-
-use crate::structs::{Date, Feerate};
-
-mod base;
-
-use base::*;
-
-pub struct StorableVecs<const MODE: u8> {
-    pub date_to_first_height: StorableVec<Date, Height, MODE>,
-    // pub height_to_block_interval: StorableVec<Height, Timestamp, MODE>,
-    pub height_to_date: StorableVec<Height, Date, MODE>,
-    // pub height_to_fee: StorableVec<Txindex, Amount, MODE>,
-    // pub height_to_inputcount: StorableVec<Txindex, u32, MODE>,
-    // pub height_to_last_addressindex: StorableVec<Height, Addressindex, MODE>,
-    pub height_to_last_txindex: StorableVec<Height, Txindex, MODE>,
-    // pub height_to_last_txoutindex: StorableVec<Height, Txoutindex, MODE>,
-    // pub height_to_maxfeerate: StorableVec<Txindex, Feerate, MODE>,
-    // pub height_to_medianfeerate: StorableVec<Txindex, Feerate, MODE>,
-    // pub height_to_minfeerate: StorableVec<Txindex, Feerate, MODE>,
-    // pub height_to_outputcount: StorableVec<Txindex, u32, MODE>,
-    // pub height_to_subsidy: StorableVec<Txindex, u32, MODE>,
-    // pub height_to_totalfees: StorableVec<Height, Amount, MODE>,
-    // pub height_to_txcount: StorableVec<Txindex, u32, MODE>,
-    pub txindex_to_fee: StorableVec<Txindex, Amount, MODE>,
-    pub txindex_to_height: StorableVec<Txindex, Height, MODE>,
-    pub txindex_to_is_coinbase: StorableVec<Txindex, bool, MODE>,
-    // pub txindex_to_feerate: StorableVec<Txindex, Feerate, MODE>,
-    pub txindex_to_inputcount: StorableVec<Txindex, u32, MODE>,
-    pub txindex_to_last_txinindex: StorableVec<Txindex, Txinindex, MODE>,
-    pub txindex_to_last_txoutindex: StorableVec<Txindex, Txoutindex, MODE>,
-    pub txindex_to_outputcount: StorableVec<Txindex, u32, MODE>,
-}
-
-impl<const MODE: u8> StorableVecs<MODE> {
-    pub fn import(path: &Path) -> color_eyre::Result<Self> {
-        fs::create_dir_all(path)?;
-
-        Ok(Self {
-            date_to_first_height: StorableVec::import(&path.join("date_to_first_height"), Version::from(1))?,
-            // height_to_block_interval: StorableVec::import(&path.join("height_to_block_interval"), Version::from(1))?,
-            height_to_date: StorableVec::import(&path.join("height_to_date"), Version::from(1))?,
-            // height_to_fee: StorableVec::import(&path.join("height_to_fee"), Version::from(1))?,
-            // height_to_inputcount: StorableVec::import(&path.join("height_to_inputcount"), Version::from(1))?,
-            // height_to_last_addressindex: StorableVec::import(
-            //     &path.join("height_to_last_addressindex"),
-            //     Version::from(1),
-            // )?,
-            height_to_last_txindex: StorableVec::import(&path.join("height_to_last_txindex"), Version::from(1))?,
-            // height_to_last_txoutindex: StorableVec::import(&path.join("height_to_last_txoutindex"), Version::from(1))?,
-            // height_to_maxfeerate: StorableVec::import(&path.join("height_to_maxfeerate"), Version::from(1))?,
-            // height_to_medianfeerate: StorableVec::import(&path.join("height_to_medianfeerate"), Version::from(1))?,
-            // height_to_minfeerate: StorableVec::import(&path.join("height_to_minfeerate"), Version::from(1))?,
-            // height_to_outputcount: StorableVec::import(&path.join("height_to_outputcount"), Version::from(1))?,
-            // height_to_subsidy: StorableVec::import(&path.join("height_to_subsidy"), Version::from(1))?,
-            // height_to_totalfees: StorableVec::import(&path.join("height_to_totalfees"), Version::from(1))?,
-            // height_to_txcount: StorableVec::import(&path.join("height_to_txcount"), Version::from(1))?,
-            txindex_to_fee: StorableVec::import(&path.join("txindex_to_fee"), Version::from(1))?,
-            txindex_to_height: StorableVec::import(&path.join("txindex_to_height"), Version::from(1))?,
-            txindex_to_is_coinbase: StorableVec::import(&path.join("txindex_to_is_coinbase"), Version::from(1))?,
-            // txindex_to_feerate: StorableVec::import(&path.join("txindex_to_feerate"), Version::from(1))?,
-            txindex_to_inputcount: StorableVec::import(&path.join("txindex_to_inputcount"), Version::from(1))?,
-            txindex_to_last_txinindex: StorableVec::import(&path.join("txindex_to_last_txinindex"), Version::from(1))?,
-            txindex_to_last_txoutindex: StorableVec::import(
-                &path.join("txindex_to_last_txoutindex"),
-                Version::from(1),
-            )?,
-            txindex_to_outputcount: StorableVec::import(&path.join("txindex_to_outputcount"), Version::from(1))?,
-        })
-    }
-
-    // pub fn as_slice(&self) -> [&dyn AnyComputedStorableVec; 1] {
-    //     [&self.date_to_first_height]
-    // }
-
-    // pub fn as_mut_slice(&mut self) -> [&mut dyn AnyComputedStorableVec; 1] {
-    //     [&mut self.date_to_first_height]
-    // }
-}
diff --git a/computer/src/structs/addressindextxoutindex.rs b/computer/src/structs/addressindextxoutindex.rs
index bc5ef32a2..ebaab0bae 100644
--- a/computer/src/structs/addressindextxoutindex.rs
+++ b/computer/src/structs/addressindextxoutindex.rs
@@ -1,21 +1,22 @@
 use bindex::{Addressindex, Txoutindex};
 use fjall::Slice;
-use unsafe_slice_serde::UnsafeSliceSerde;
+use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout};
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Immutable, IntoBytes, KnownLayout, FromBytes)]
 pub struct AddressindexTxoutindex {
     addressindex: Addressindex,
+    _padding: u32,
     txoutindex: Txoutindex,
 }
 
 impl TryFrom<Slice> for AddressindexTxoutindex {
-    type Error = unsafe_slice_serde::Error;
+    type Error = storable_vec::Error;
     fn try_from(value: Slice) -> Result<Self, Self::Error> {
-        Ok(*Self::unsafe_try_from_slice(&value)?)
+        Ok(Self::read_from_bytes(&value)?)
     }
 }
 impl From<AddressindexTxoutindex> for Slice {
     fn from(value: AddressindexTxoutindex) -> Self {
-        Self::new(value.unsafe_as_slice())
+        Self::new(value.as_bytes())
     }
 }
diff --git a/computer/src/structs/date.rs b/computer/src/structs/date.rs
index 9d965662b..3ae799946 100644
--- a/computer/src/structs/date.rs
+++ b/computer/src/structs/date.rs
@@ -2,11 +2,30 @@ use std::ops::Add;
 
 use bindex::Timestamp;
 use color_eyre::eyre::eyre;
-use derive_deref::Deref;
-use jiff::{civil::Date as _Date, tz::TimeZone, Span};
+use jiff::{civil::Date as Date_, tz::TimeZone, Span};
+use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout};
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Deref)]
-pub struct Date(_Date);
+#[derive(Debug, Clone, Copy, PartialEq, Eq, FromBytes, Immutable, IntoBytes, KnownLayout)]
+pub struct Date {
+    year: u16,
+    month: u8,
+    day: u8,
+}
+
+impl Date {
+    const INDEX_ZERO: Self = Self {
+        year: 2009,
+        month: 1,
+        day: 3,
+    };
+    const INDEX_ZERO_: Date_ = Date_::constant(2009, 1, 3);
+    const INDEX_ONE: Self = Self {
+        year: 2009,
+        month: 1,
+        day: 9,
+    };
+    const INDEX_ONE_: Date_ = Date_::constant(2009, 1, 9);
+}
 
 impl Default for Date {
     fn default() -> Self {
@@ -14,49 +33,67 @@ impl Default for Date {
     }
 }
 
-impl Date {
-    const INDEX_ZERO: Self = Self(_Date::constant(2009, 1, 3));
-    const INDEX_ONE: Self = Self(_Date::constant(2009, 1, 9));
-}
-
-impl From<_Date> for Date {
-    fn from(value: _Date) -> Self {
-        Self(value)
+impl PartialOrd for Date {
+    fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
+        Some(self.cmp(other))
     }
 }
 
-impl From<&Timestamp> for Date {
-    fn from(value: &Timestamp) -> Self {
-        Self(_Date::from(value.to_zoned(TimeZone::UTC)))
+impl Ord for Date {
+    fn cmp(&self, other: &Self) -> std::cmp::Ordering {
+        Date_::from(*self).cmp(&Date_::from(*other))
+    }
+}
+
+impl From<Date_> for Date {
+    fn from(value: Date_) -> Self {
+        Self {
+            year: value.year() as u16,
+            month: value.month() as u8,
+            day: value.day() as u8,
+        }
+    }
+}
+
+impl From<Date> for Date_ {
+    fn from(value: Date) -> Self {
+        Self::new(value.year as i16, value.month as i8, value.day as i8).unwrap()
+    }
+}
+
+impl From<Timestamp> for Date {
+    fn from(value: Timestamp) -> Self {
+        Self::from(Date_::from(jiff::Timestamp::from(value).to_zoned(TimeZone::UTC)))
     }
 }
 
 impl TryFrom<Date> for usize {
     type Error = color_eyre::Report;
     fn try_from(value: Date) -> Result<Self, Self::Error> {
-        if value < Date::INDEX_ZERO {
+        let value_ = Date_::from(value);
+        if value_ < Date::INDEX_ZERO_ {
             Err(eyre!("Date is too early"))
         } else if value == Date::INDEX_ZERO {
             Ok(0)
-        } else if value < Date::INDEX_ONE {
+        } else if value_ < Date::INDEX_ONE_ {
             Err(eyre!("Date is between first and second"))
         } else if value == Date::INDEX_ONE {
             Ok(1)
         } else {
-            Ok(Date::INDEX_ONE.until(*value)?.get_days() as usize + 1)
+            Ok(Date_::from(Date::INDEX_ONE).until(value_)?.get_days() as usize + 1)
         }
     }
 }
 
 impl From<usize> for Date {
     fn from(value: usize) -> Self {
-        Self(Self::INDEX_ZERO.checked_add(Span::new().days(value as i64)).unwrap())
+        Self::from(Self::INDEX_ZERO_.checked_add(Span::new().days(value as i64)).unwrap())
     }
 }
 
 impl Add<usize> for Date {
     type Output = Self;
     fn add(self, rhs: usize) -> Self::Output {
-        Self(self.0.checked_add(Span::new().days(rhs as i64)).unwrap())
+        Self::from(Date_::from(self).checked_add(Span::new().days(rhs as i64)).unwrap())
     }
 }
diff --git a/indexer/Cargo.toml b/indexer/Cargo.toml
index 2ef5fe3a3..64d91747c 100644
--- a/indexer/Cargo.toml
+++ b/indexer/Cargo.toml
@@ -13,6 +13,5 @@ fjall = { workspace = true }
 jiff = { workspace = true }
 rapidhash = "1.3.0"
 rayon = { workspace = true }
-# snkrj = { workspace = true }
 storable_vec = { workspace = true }
-unsafe_slice_serde = { workspace = true }
+zerocopy = { workspace = true }
diff --git a/indexer/src/lib.rs b/indexer/src/lib.rs
index 511feade3..3447e5d17 100644
--- a/indexer/src/lib.rs
+++ b/indexer/src/lib.rs
@@ -9,7 +9,7 @@ use std::{
 
 pub use biter::*;
 
-use bitcoin::{Transaction, TxIn, TxOut, Txid};
+use bitcoin::{Transaction, TxIn, TxOut};
 use color_eyre::eyre::{eyre, ContextCompat};
 use exit::Exit;
 use rayon::prelude::*;
@@ -19,7 +19,7 @@ mod storage;
 mod structs;
 
 pub use storage::{AnyStorableVec, StorableVec, Store, StoreMeta};
-pub use structs::Version;
+use structs::{BlockHash, Txid};
 
 use storage::{Fjalls, StorableVecs};
 pub use structs::{
@@ -98,6 +98,7 @@ impl Indexer<CACHED_GETS> {
             .try_for_each(|(_height, block, blockhash)| -> color_eyre::Result<()> {
                 println!("Processing block {_height}...");
 
+                let blockhash = BlockHash::from(blockhash);
                 height = Height::from(_height);
 
                 if let Some(saved_blockhash) = vecs.height_to_blockhash.get(height)? {
@@ -124,9 +125,9 @@ impl Indexer<CACHED_GETS> {
 
                 vecs.height_to_blockhash.push_if_needed(height, blockhash)?;
                 vecs.height_to_difficulty.push_if_needed(height, block.header.difficulty_float())?;
-                vecs.height_to_timestamp.push_if_needed(height, Timestamp::try_from(block.header.time)?)?;
+                vecs.height_to_timestamp.push_if_needed(height, Timestamp::from(block.header.time))?;
                 vecs.height_to_size.push_if_needed(height, block.total_size())?;
-                vecs.height_to_weight.push_if_needed(height, block.weight())?;
+                vecs.height_to_weight.push_if_needed(height, block.weight().into())?;
                 vecs.height_to_first_txindex.push_if_needed(height, txindex_global)?;
                 vecs.height_to_first_txinindex
                     .push_if_needed(height, txinindex_global)?;
@@ -192,7 +193,7 @@ impl Indexer<CACHED_GETS> {
                                 .par_iter()
                                 .enumerate()
                                 .map(|(index, tx)| -> color_eyre::Result<_> {
-                                    let txid = tx.compute_txid();
+                                    let txid = Txid::from(tx.compute_txid());
 
                                     let txid_prefix = TxidPrefix::try_from(&txid)?;
 
@@ -233,6 +234,7 @@ impl Indexer<CACHED_GETS> {
                                 // dbg!((txindex, txinindex, vin));
 
                                 let outpoint = txin.previous_output;
+                                let txid = Txid::from(outpoint.txid);
 
                                 if tx.is_coinbase() {
                                     return Ok((txinindex, InputSource::SameBlock((tx, txindex, txin, vin))));
@@ -240,7 +242,7 @@ impl Indexer<CACHED_GETS> {
 
                                 let prev_txindex = if let Some(txindex) = trees
                                     .txid_prefix_to_txindex
-                                    .get(&TxidPrefix::try_from(&outpoint.txid)?)?
+                                    .get(&TxidPrefix::try_from(&txid)?)?
                                     .map(|v| *v)
                                     .and_then(|txindex| {
                                         // Checking if not finding txindex from the future
@@ -537,7 +539,7 @@ impl Indexer<CACHED_GETS> {
                                     }
 
                                     let outpoint = txin.previous_output;
-                                    let txid = outpoint.txid;
+                                    let txid = Txid::from(outpoint.txid);
                                     let vout = Vout::from(outpoint.vout);
 
                                     let block_txindex = txid_prefix_to_txid_and_block_txindex_and_prev_txindex
@@ -604,7 +606,7 @@ impl Indexer<CACHED_GETS> {
                                         .get(prev_txindex)?
                                         .context("To have txid for txindex")
                                         .inspect_err(|_| {
-                                            dbg!(txindex, txid, len);
+                                            dbg!(txindex, len);
                                         })?;
 
                                     // #[allow(clippy::redundant_locals)]
@@ -614,12 +616,12 @@ impl Indexer<CACHED_GETS> {
                                     // If another Txid needs to be added to the list
                                     // We need to check that it's also a coinbase tx otherwise par_iter inputs needs to be updated
                                     let only_known_dup_txids = [
-                                        Txid::from_str(
+                                        bitcoin::Txid::from_str(
                                             "d5d27987d2a3dfc724e359870c6644b40e497bdc0589a033220fe15429d88599",
-                                        )?,
-                                        Txid::from_str(
+                                        )?.into(),
+                                        bitcoin::Txid::from_str(
                                             "e3bf3d07d4b0375638d5f1db5255fe07ba2c4cb067cd81b84ee974b6585fb468",
-                                        )?,
+                                        )?.into(),
                                     ];
 
                                     let is_dup = only_known_dup_txids.contains(prev_txid);
@@ -627,7 +629,7 @@ impl Indexer<CACHED_GETS> {
                                     if !is_dup {
                                         let prev_height =
                                             vecs.txindex_to_height.get(prev_txindex)?.expect("To have height");
-                                        dbg!(height, txid, txindex, prev_height, prev_txid, prev_txindex);
+                                        dbg!(height, txindex, prev_height, prev_txid, prev_txindex);
                                         return Err(eyre!("Expect none"));
                                     }
                                 }
@@ -640,10 +642,10 @@ impl Indexer<CACHED_GETS> {
                 txindex_to_tx_and_txid
                     .into_iter()
                     .try_for_each(|(txindex, (tx, txid))| -> color_eyre::Result<()> {
-                        vecs.txindex_to_txversion.push_if_needed(txindex, tx.version)?;
+                        vecs.txindex_to_txversion.push_if_needed(txindex, tx.version.into())?;
                         vecs.txindex_to_txid.push_if_needed(txindex, txid)?;
                         vecs.txindex_to_height.push_if_needed(txindex, height)?;
-                        vecs.txindex_to_locktime.push_if_needed(txindex, tx.lock_time)?;
+                        vecs.txindex_to_locktime.push_if_needed(txindex, tx.lock_time.into())?;
                         Ok(())
                     })?;
 
diff --git a/indexer/src/storage/fjalls/base.rs b/indexer/src/storage/fjalls/base.rs
index 8f2767da7..6d6030f2e 100644
--- a/indexer/src/storage/fjalls/base.rs
+++ b/indexer/src/storage/fjalls/base.rs
@@ -4,10 +4,10 @@ use fjall::{
     PartitionCreateOptions, PersistMode, ReadTransaction, Result, Slice, TransactionalKeyspace,
     TransactionalPartitionHandle,
 };
-use storable_vec::Value;
-use unsafe_slice_serde::UnsafeSliceSerde;
+use storable_vec::{Value, Version};
+use zerocopy::{Immutable, IntoBytes};
 
-use crate::structs::{Height, Version};
+use crate::structs::Height;
 
 use super::StoreMeta;
 
@@ -21,7 +21,7 @@ pub struct Store<Key, Value> {
 
 impl<K, V> Store<K, V>
 where
-    K: Into<Slice> + Ord,
+    K: Into<Slice> + Ord + Immutable + IntoBytes,
     V: Into<Slice> + TryFrom<Slice>,
     <V as TryFrom<Slice>>::Error: error::Error + Send + Sync + 'static,
 {
@@ -54,7 +54,7 @@ where
     pub fn get(&self, key: &K) -> color_eyre::Result<Option<Value<V>>> {
         if let Some(v) = self.puts.get(key) {
             Ok(Some(Value::Ref(v)))
-        } else if let Some(slice) = self.rtx.get(&self.part, key.unsafe_as_slice())? {
+        } else if let Some(slice) = self.rtx.get(&self.part, key.as_bytes())? {
             Ok(Some(Value::Owned(V::try_from(slice)?)))
         } else {
             Ok(None)
diff --git a/indexer/src/storage/fjalls/meta.rs b/indexer/src/storage/fjalls/meta.rs
index 1372f1d34..35f7bf24d 100644
--- a/indexer/src/storage/fjalls/meta.rs
+++ b/indexer/src/storage/fjalls/meta.rs
@@ -3,9 +3,10 @@ use std::{
     path::{Path, PathBuf},
 };
 
-use unsafe_slice_serde::UnsafeSliceSerde;
+use storable_vec::Version;
+use zerocopy::{FromBytes, IntoBytes};
 
-use super::{Height, Version};
+use super::Height;
 
 pub struct StoreMeta {
     pathbuf: PathBuf,
@@ -87,14 +88,14 @@ impl StoreMeta {
     // }
     fn read_length_(path: &Path) -> color_eyre::Result<usize> {
         Ok(fs::read(Self::path_length(path))
-            .map(|v| usize::unsafe_try_from_slice(v.as_slice()).cloned().unwrap_or_default())
+            .map(|v| usize::read_from_bytes(v.as_slice()).unwrap_or_default())
             .unwrap_or_default())
     }
     fn write_length(&self) -> io::Result<()> {
         Self::write_length_(&self.pathbuf, self.len)
     }
     fn write_length_(path: &Path, len: usize) -> Result<(), io::Error> {
-        fs::write(Self::path_length(path), len.to_le_bytes())
+        fs::write(Self::path_length(path), len.as_bytes())
     }
     fn path_length(path: &Path) -> PathBuf {
         path.join("length")
diff --git a/indexer/src/storage/fjalls/mod.rs b/indexer/src/storage/fjalls/mod.rs
index be75266ea..4c6724929 100644
--- a/indexer/src/storage/fjalls/mod.rs
+++ b/indexer/src/storage/fjalls/mod.rs
@@ -1,9 +1,12 @@
 use std::{path::Path, thread};
 
-use crate::{structs::Version, AddressHash, Addressindex, BlockHashPrefix, Height, TxidPrefix, Txindex};
+use storable_vec::Version;
+
+use crate::{AddressHash, Addressindex, BlockHashPrefix, Height, TxidPrefix, Txindex};
 
 mod base;
 mod meta;
+// mod version;
 
 pub use base::*;
 pub use meta::*;
diff --git a/indexer/src/storage/fjalls/version.rs b/indexer/src/storage/fjalls/version.rs
new file mode 100644
index 000000000..1fb2028ba
--- /dev/null
+++ b/indexer/src/storage/fjalls/version.rs
@@ -0,0 +1,51 @@
+use std::{fs, io, path::Path};
+
+use derive_deref::Deref;
+use fjall::Slice;
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Deref)]
+pub struct Version(u32);
+
+impl Version {
+    pub fn write(&self, path: &Path) -> Result<(), io::Error> {
+        fs::write(path, self.to_ne_bytes())
+    }
+}
+
+impl From<u32> for Version {
+    fn from(value: u32) -> Self {
+        Self(value)
+    }
+}
+
+impl TryFrom<&Path> for Version {
+    type Error = io::Error;
+    fn try_from(value: &Path) -> Result<Self, Self::Error> {
+        Self::try_from(&fs::read(value)?)
+    }
+}
+impl TryFrom<Slice> for Version {
+    type Error = fjall::Error;
+    fn try_from(value: Slice) -> Result<Self, Self::Error> {
+        Self::from(&value)
+    }
+}
+impl TryFrom<&[u8]> for Version {
+    type Error = storable_vec::Error;
+    fn try_from(value: &[u8]) -> Result<Self, Self::Error> {
+        let mut buf: [u8; 4] = [0; 4];
+        let buf_len = buf.len();
+        if value.len() != buf_len {
+            panic!();
+        }
+        value.iter().enumerate().for_each(|(i, r)| {
+            buf[i] = *r;
+        });
+        Ok(Self(u32::from_ne_bytes(buf)))
+    }
+}
+impl From<Version> for Slice {
+    fn from(value: Version) -> Self {
+        Self::new(&value.to_ne_bytes())
+    }
+}
diff --git a/indexer/src/storage/storable_vecs/base.rs b/indexer/src/storage/storable_vecs/base.rs
index 5f32bdc26..e165431ce 100644
--- a/indexer/src/storage/storable_vecs/base.rs
+++ b/indexer/src/storage/storable_vecs/base.rs
@@ -34,7 +34,7 @@ where
         self.vec.flush()
     }
 
-    pub fn height(&self) -> color_eyre::Result<Height> {
+    pub fn height(&self) -> storable_vec::Result<Height> {
         Height::try_from(self.path_height().as_path())
     }
     fn path_height(&self) -> PathBuf {
@@ -66,7 +66,7 @@ impl<I, T, const MODE: u8> DerefMut for StorableVec<I, T, MODE> {
 }
 
 pub trait AnyStorableVec {
-    fn height(&self) -> color_eyre::Result<Height>;
+    fn height(&self) -> storable_vec::Result<Height>;
     fn flush(&mut self, height: Height) -> io::Result<()>;
 }
 
@@ -75,7 +75,7 @@ where
     I: StorableVecIndex,
     T: StorableVecType,
 {
-    fn height(&self) -> color_eyre::Result<Height> {
+    fn height(&self) -> storable_vec::Result<Height> {
         self.height()
     }
 
diff --git a/indexer/src/storage/storable_vecs/mod.rs b/indexer/src/storage/storable_vecs/mod.rs
index 4c43f3e8f..09654f836 100644
--- a/indexer/src/storage/storable_vecs/mod.rs
+++ b/indexer/src/storage/storable_vecs/mod.rs
@@ -1,14 +1,13 @@
 use std::{fs, io, path::Path};
 
-use biter::bitcoin::{self, transaction, BlockHash, Txid, Weight};
 use exit::Exit;
 use rayon::prelude::*;
 use storable_vec::{Version, CACHED_GETS};
 
 use crate::structs::{
-    Addressbytes, Addressindex, Addresstype, Addresstypeindex, Amount, Height, P2PK33AddressBytes, P2PK65AddressBytes,
-    P2PKHAddressBytes, P2SHAddressBytes, P2TRAddressBytes, P2WPKHAddressBytes, P2WSHAddressBytes, Timestamp, Txindex,
-    Txinindex, Txoutindex,
+    Addressbytes, Addressindex, Addresstype, Addresstypeindex, Amount, BlockHash, Height, LockTime, P2PK33AddressBytes,
+    P2PK65AddressBytes, P2PKHAddressBytes, P2SHAddressBytes, P2TRAddressBytes, P2WPKHAddressBytes, P2WSHAddressBytes,
+    Timestamp, TxVersion, Txid, Txindex, Txinindex, Txoutindex, Weight,
 };
 
 mod base;
@@ -50,9 +49,9 @@ pub struct StorableVecs<const MODE: u8> {
     pub txindex_to_first_txinindex: StorableVec<Txindex, Txinindex, MODE>,
     pub txindex_to_first_txoutindex: StorableVec<Txindex, Txoutindex, MODE>,
     pub txindex_to_height: StorableVec<Txindex, Height, MODE>,
-    pub txindex_to_locktime: StorableVec<Txindex, bitcoin::absolute::LockTime, MODE>,
+    pub txindex_to_locktime: StorableVec<Txindex, LockTime, MODE>,
     pub txindex_to_txid: StorableVec<Txindex, Txid, MODE>,
-    pub txindex_to_txversion: StorableVec<Txindex, transaction::Version, MODE>,
+    pub txindex_to_txversion: StorableVec<Txindex, TxVersion, MODE>,
     pub txinindex_to_txoutindex: StorableVec<Txinindex, Txoutindex, MODE>,
     pub txoutindex_to_addressindex: StorableVec<Txoutindex, Addressindex, MODE>,
     pub txoutindex_to_amount: StorableVec<Txoutindex, Amount, MODE>,
diff --git a/indexer/src/structs/addressbytes.rs b/indexer/src/structs/addressbytes.rs
index 463e5d542..34ce0663d 100644
--- a/indexer/src/structs/addressbytes.rs
+++ b/indexer/src/structs/addressbytes.rs
@@ -1,6 +1,7 @@
 use biter::bitcoin::ScriptBuf;
 use color_eyre::eyre::eyre;
 use derive_deref::{Deref, DerefMut};
+use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout};
 
 use super::Addresstype;
 
@@ -122,28 +123,28 @@ impl From<P2TRAddressBytes> for Addressbytes {
     }
 }
 
-#[derive(Debug, Clone, Deref, PartialEq, Eq)]
+#[derive(Debug, Clone, Deref, PartialEq, Eq, Immutable, IntoBytes, KnownLayout, FromBytes)]
 pub struct P2PK65AddressBytes(U8x65);
 
-#[derive(Debug, Clone, Deref, PartialEq, Eq)]
+#[derive(Debug, Clone, Deref, PartialEq, Eq, Immutable, IntoBytes, KnownLayout, FromBytes)]
 pub struct P2PK33AddressBytes(U8x33);
 
-#[derive(Debug, Clone, Deref, PartialEq, Eq)]
+#[derive(Debug, Clone, Deref, PartialEq, Eq, Immutable, IntoBytes, KnownLayout, FromBytes)]
 pub struct P2PKHAddressBytes(U8x20);
 
-#[derive(Debug, Clone, Deref, PartialEq, Eq)]
+#[derive(Debug, Clone, Deref, PartialEq, Eq, Immutable, IntoBytes, KnownLayout, FromBytes)]
 pub struct P2SHAddressBytes(U8x20);
 
-#[derive(Debug, Clone, Deref, PartialEq, Eq)]
+#[derive(Debug, Clone, Deref, PartialEq, Eq, Immutable, IntoBytes, KnownLayout, FromBytes)]
 pub struct P2WPKHAddressBytes(U8x20);
 
-#[derive(Debug, Clone, Deref, PartialEq, Eq)]
+#[derive(Debug, Clone, Deref, PartialEq, Eq, Immutable, IntoBytes, KnownLayout, FromBytes)]
 pub struct P2WSHAddressBytes(U8x32);
 
-#[derive(Debug, Clone, Deref, PartialEq, Eq)]
+#[derive(Debug, Clone, Deref, PartialEq, Eq, Immutable, IntoBytes, KnownLayout, FromBytes)]
 pub struct P2TRAddressBytes(U8x32);
 
-#[derive(Debug, Clone, Deref, DerefMut, PartialEq, Eq)]
+#[derive(Debug, Clone, Deref, DerefMut, PartialEq, Eq, Immutable, IntoBytes, KnownLayout, FromBytes)]
 pub struct U8x20([u8; 20]);
 impl From<&[u8]> for U8x20 {
     fn from(slice: &[u8]) -> Self {
@@ -153,7 +154,7 @@ impl From<&[u8]> for U8x20 {
     }
 }
 
-#[derive(Debug, Clone, Deref, DerefMut, PartialEq, Eq)]
+#[derive(Debug, Clone, Deref, DerefMut, PartialEq, Eq, Immutable, IntoBytes, KnownLayout, FromBytes)]
 pub struct U8x32([u8; 32]);
 impl From<&[u8]> for U8x32 {
     fn from(slice: &[u8]) -> Self {
@@ -163,7 +164,7 @@ impl From<&[u8]> for U8x32 {
     }
 }
 
-#[derive(Debug, Clone, Deref, DerefMut, PartialEq, Eq)]
+#[derive(Debug, Clone, Deref, DerefMut, PartialEq, Eq, Immutable, IntoBytes, KnownLayout, FromBytes)]
 pub struct U8x33([u8; 33]);
 impl From<&[u8]> for U8x33 {
     fn from(slice: &[u8]) -> Self {
@@ -173,7 +174,7 @@ impl From<&[u8]> for U8x33 {
     }
 }
 
-#[derive(Debug, Clone, Deref, DerefMut, PartialEq, Eq)]
+#[derive(Debug, Clone, Deref, DerefMut, PartialEq, Eq, Immutable, IntoBytes, KnownLayout, FromBytes)]
 pub struct U8x64([u8; 64]);
 impl From<&[u8]> for U8x64 {
     fn from(slice: &[u8]) -> Self {
@@ -183,7 +184,7 @@ impl From<&[u8]> for U8x64 {
     }
 }
 
-#[derive(Debug, Clone, Deref, DerefMut, PartialEq, Eq)]
+#[derive(Debug, Clone, Deref, DerefMut, PartialEq, Eq, Immutable, IntoBytes, KnownLayout, FromBytes)]
 pub struct U8x65([u8; 65]);
 impl From<&[u8]> for U8x65 {
     fn from(slice: &[u8]) -> Self {
diff --git a/indexer/src/structs/addressindex.rs b/indexer/src/structs/addressindex.rs
index 0a5ea91c9..72fcf06a0 100644
--- a/indexer/src/structs/addressindex.rs
+++ b/indexer/src/structs/addressindex.rs
@@ -2,9 +2,24 @@ use std::ops::Add;
 
 use derive_deref::{Deref, DerefMut};
 use fjall::Slice;
-use unsafe_slice_serde::UnsafeSliceSerde;
+use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout};
 
-#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Deref, DerefMut, Default)]
+#[derive(
+    Debug,
+    PartialEq,
+    Eq,
+    PartialOrd,
+    Ord,
+    Clone,
+    Copy,
+    Deref,
+    DerefMut,
+    Default,
+    FromBytes,
+    Immutable,
+    IntoBytes,
+    KnownLayout,
+)]
 pub struct Addressindex(u32);
 
 impl Addressindex {
@@ -52,14 +67,14 @@ impl From<Addressindex> for usize {
 }
 
 impl TryFrom<Slice> for Addressindex {
-    type Error = unsafe_slice_serde::Error;
+    type Error = storable_vec::Error;
     fn try_from(value: Slice) -> Result<Self, Self::Error> {
-        Ok(*Self::unsafe_try_from_slice(&value)?)
+        Ok(Self::read_from_bytes(&value)?)
     }
 }
 impl From<Addressindex> for Slice {
     fn from(value: Addressindex) -> Self {
-        Self::new(value.unsafe_as_slice())
+        Self::new(value.as_bytes())
     }
 }
 
diff --git a/indexer/src/structs/addresstype.rs b/indexer/src/structs/addresstype.rs
index abc37a296..efb5a2a71 100644
--- a/indexer/src/structs/addresstype.rs
+++ b/indexer/src/structs/addresstype.rs
@@ -1,6 +1,8 @@
 use biter::bitcoin::ScriptBuf;
+use zerocopy::{Immutable, IntoBytes, KnownLayout, TryFromBytes};
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, TryFromBytes, Immutable, IntoBytes, KnownLayout)]
+#[repr(u8)]
 pub enum Addresstype {
     P2PK65,
     P2PK33,
diff --git a/indexer/src/structs/addresstypeindex.rs b/indexer/src/structs/addresstypeindex.rs
index d94938e97..042a8d352 100644
--- a/indexer/src/structs/addresstypeindex.rs
+++ b/indexer/src/structs/addresstypeindex.rs
@@ -1,8 +1,24 @@
 use std::ops::Add;
 
 use derive_deref::{Deref, DerefMut};
+use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout};
 
-#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Deref, DerefMut, Default)]
+#[derive(
+    Debug,
+    PartialEq,
+    Eq,
+    PartialOrd,
+    Ord,
+    Clone,
+    Copy,
+    Deref,
+    DerefMut,
+    Default,
+    FromBytes,
+    Immutable,
+    IntoBytes,
+    KnownLayout,
+)]
 pub struct Addresstypeindex(u32);
 
 impl Addresstypeindex {
diff --git a/indexer/src/structs/amount.rs b/indexer/src/structs/amount.rs
index 6c66fc725..bfe620a25 100644
--- a/indexer/src/structs/amount.rs
+++ b/indexer/src/structs/amount.rs
@@ -5,14 +5,30 @@ use std::{
 
 use biter::bitcoin;
 use derive_deref::{Deref, DerefMut};
+use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout};
 
 use super::Height;
 
-#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Deref, DerefMut, Default)]
-pub struct Amount(bitcoin::Amount);
+#[derive(
+    Debug,
+    PartialEq,
+    Eq,
+    PartialOrd,
+    Ord,
+    Clone,
+    Copy,
+    Deref,
+    DerefMut,
+    Default,
+    FromBytes,
+    Immutable,
+    IntoBytes,
+    KnownLayout,
+)]
+pub struct Amount(u64);
 
 impl Amount {
-    pub const ZERO: Self = Self(bitcoin::Amount::ZERO);
+    pub const ZERO: Self = Self(0);
     pub const ONE_BTC_F32: f32 = 100_000_000.0;
     pub const ONE_BTC_F64: f64 = 100_000_000.0;
 
@@ -24,65 +40,70 @@ impl Amount {
 impl Add for Amount {
     type Output = Amount;
     fn add(self, rhs: Amount) -> Self::Output {
-        Amount::from(self.to_sat() + rhs.to_sat())
+        Amount::from(*self + *rhs)
     }
 }
 
 impl AddAssign for Amount {
     fn add_assign(&mut self, rhs: Self) {
-        *self = Amount::from(self.to_sat() + rhs.to_sat());
+        *self = *self + rhs;
     }
 }
 
 impl Sub for Amount {
     type Output = Amount;
     fn sub(self, rhs: Amount) -> Self::Output {
-        Amount::from(self.to_sat() - rhs.to_sat())
+        Amount::from(*self - *rhs)
     }
 }
 
 impl SubAssign for Amount {
     fn sub_assign(&mut self, rhs: Self) {
-        *self = Amount::from(self.to_sat() - rhs.to_sat());
+        *self = *self - rhs;
     }
 }
 
 impl Mul<Amount> for Amount {
     type Output = Amount;
     fn mul(self, rhs: Amount) -> Self::Output {
-        Amount::from(self.to_sat() * rhs.to_sat())
+        Amount::from(*self * *rhs)
     }
 }
 
 impl Mul<u64> for Amount {
     type Output = Amount;
     fn mul(self, rhs: u64) -> Self::Output {
-        Amount::from(self.to_sat() * rhs)
+        Amount::from(*self * rhs)
     }
 }
 
 impl Mul<Height> for Amount {
     type Output = Amount;
     fn mul(self, rhs: Height) -> Self::Output {
-        Amount::from(self.to_sat() * *rhs as u64)
+        Amount::from(*self * *rhs as u64)
     }
 }
 
 impl Sum for Amount {
     fn sum<I: Iterator<Item = Self>>(iter: I) -> Self {
-        let sats: u64 = iter.map(|amt| amt.to_sat()).sum();
+        let sats: u64 = iter.map(|amt| *amt).sum();
         Amount::from(sats)
     }
 }
 
 impl From<u64> for Amount {
     fn from(value: u64) -> Self {
-        Self(bitcoin::Amount::from_sat(value))
+        Self(value)
     }
 }
 
 impl From<bitcoin::Amount> for Amount {
     fn from(value: bitcoin::Amount) -> Self {
-        Self(value)
+        Self(value.to_sat())
+    }
+}
+impl From<Amount> for bitcoin::Amount {
+    fn from(value: Amount) -> Self {
+        Self::from_sat(value.0)
     }
 }
diff --git a/indexer/src/structs/blockhash.rs b/indexer/src/structs/blockhash.rs
new file mode 100644
index 000000000..df24104b8
--- /dev/null
+++ b/indexer/src/structs/blockhash.rs
@@ -0,0 +1,19 @@
+use std::mem;
+
+use derive_deref::Deref;
+use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout};
+
+#[derive(Debug, Deref, Clone, PartialEq, Eq, Immutable, IntoBytes, KnownLayout, FromBytes)]
+pub struct BlockHash([u8; 32]);
+
+impl From<bitcoin::BlockHash> for BlockHash {
+    fn from(value: bitcoin::BlockHash) -> Self {
+        unsafe { mem::transmute(value) }
+    }
+}
+
+impl From<BlockHash> for bitcoin::BlockHash {
+    fn from(value: BlockHash) -> Self {
+        unsafe { mem::transmute(value) }
+    }
+}
diff --git a/indexer/src/structs/compressed.rs b/indexer/src/structs/compressed.rs
index 59acbaa97..92301d14b 100644
--- a/indexer/src/structs/compressed.rs
+++ b/indexer/src/structs/compressed.rs
@@ -1,13 +1,12 @@
 use std::hash::Hasher;
 
-use biter::bitcoin::{BlockHash, Txid};
 use derive_deref::Deref;
 use fjall::Slice;
-use unsafe_slice_serde::UnsafeSliceSerde;
+use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout};
 
-use super::{Addressbytes, Addresstype, SliceExtended};
+use super::{Addressbytes, Addresstype, BlockHash, Txid};
 
-#[derive(Debug, Deref, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
+#[derive(Debug, Deref, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, FromBytes, Immutable, IntoBytes, KnownLayout)]
 pub struct AddressHash([u8; 8]);
 impl From<(&Addressbytes, Addresstype)> for AddressHash {
     fn from((addressbytes, addresstype): (&Addressbytes, Addresstype)) -> Self {
@@ -24,14 +23,14 @@ impl From<[u8; 8]> for AddressHash {
     }
 }
 impl TryFrom<Slice> for AddressHash {
-    type Error = color_eyre::Report;
+    type Error = storable_vec::Error;
     fn try_from(value: Slice) -> Result<Self, Self::Error> {
-        Ok(*Self::unsafe_try_from_slice(&value)?)
+        Ok(Self::read_from_bytes(&value)?)
     }
 }
 impl From<&AddressHash> for Slice {
     fn from(value: &AddressHash) -> Self {
-        Self::new(value.unsafe_as_slice())
+        Self::new(value.as_bytes())
     }
 }
 impl From<AddressHash> for Slice {
@@ -40,23 +39,23 @@ impl From<AddressHash> for Slice {
     }
 }
 
-#[derive(Debug, Deref, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
+#[derive(Debug, Deref, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, FromBytes, Immutable, IntoBytes, KnownLayout)]
 pub struct BlockHashPrefix([u8; 8]);
 impl TryFrom<&BlockHash> for BlockHashPrefix {
     type Error = color_eyre::Report;
     fn try_from(value: &BlockHash) -> Result<Self, Self::Error> {
-        Ok(Self((&value[..]).read_8x_u8()?))
+        Ok(Self(copy_first_8bytes(&value[..])))
     }
 }
 impl TryFrom<Slice> for BlockHashPrefix {
-    type Error = color_eyre::Report;
+    type Error = storable_vec::Error;
     fn try_from(value: Slice) -> Result<Self, Self::Error> {
-        Ok(*Self::unsafe_try_from_slice(&value)?)
+        Ok(Self::read_from_bytes(&value)?)
     }
 }
 impl From<&BlockHashPrefix> for Slice {
     fn from(value: &BlockHashPrefix) -> Self {
-        Self::new(value.unsafe_as_slice())
+        Self::new(value.as_bytes())
     }
 }
 impl From<BlockHashPrefix> for Slice {
@@ -65,23 +64,23 @@ impl From<BlockHashPrefix> for Slice {
     }
 }
 
-#[derive(Debug, Deref, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
+#[derive(Debug, Deref, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, FromBytes, Immutable, IntoBytes, KnownLayout)]
 pub struct TxidPrefix([u8; 8]);
 impl TryFrom<&Txid> for TxidPrefix {
     type Error = color_eyre::Report;
     fn try_from(value: &Txid) -> Result<Self, Self::Error> {
-        Ok(Self((&value[..]).read_8x_u8()?))
+        Ok(Self(copy_first_8bytes(&value[..])))
     }
 }
 impl TryFrom<Slice> for TxidPrefix {
-    type Error = color_eyre::Report;
+    type Error = storable_vec::Error;
     fn try_from(value: Slice) -> Result<Self, Self::Error> {
-        Ok(*Self::unsafe_try_from_slice(&value)?)
+        Ok(Self::read_from_bytes(&value)?)
     }
 }
 impl From<&TxidPrefix> for Slice {
     fn from(value: &TxidPrefix) -> Self {
-        Self::new(value.unsafe_as_slice())
+        Self::new(value.as_bytes())
     }
 }
 impl From<TxidPrefix> for Slice {
@@ -89,3 +88,15 @@ impl From<TxidPrefix> for Slice {
         Self::from(&value)
     }
 }
+
+fn copy_first_8bytes(slice: &[u8]) -> [u8; 8] {
+    let mut buf: [u8; 8] = [0; 8];
+    let buf_len = buf.len();
+    if slice.len() < buf_len {
+        panic!("bad len");
+    }
+    slice.iter().take(buf_len).enumerate().for_each(|(i, r)| {
+        buf[i] = *r;
+    });
+    buf
+}
diff --git a/indexer/src/structs/height.rs b/indexer/src/structs/height.rs
index b9ff4b92f..c8b999597 100644
--- a/indexer/src/structs/height.rs
+++ b/indexer/src/structs/height.rs
@@ -7,14 +7,29 @@ use std::{
 use biter::rpc::{self, RpcApi};
 use derive_deref::{Deref, DerefMut};
 use fjall::Slice;
-use unsafe_slice_serde::UnsafeSliceSerde;
+use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout};
 
-#[derive(Debug, Clone, Copy, Deref, DerefMut, PartialEq, Eq, PartialOrd, Ord, Default)]
+#[derive(
+    Debug,
+    Clone,
+    Copy,
+    Deref,
+    DerefMut,
+    PartialEq,
+    Eq,
+    PartialOrd,
+    Ord,
+    Default,
+    FromBytes,
+    Immutable,
+    IntoBytes,
+    KnownLayout,
+)]
 pub struct Height(u32);
 
 impl Height {
     pub fn write(&self, path: &Path) -> Result<(), io::Error> {
-        fs::write(path, self.unsafe_as_slice())
+        fs::write(path, self.as_bytes())
     }
 }
 
@@ -113,9 +128,9 @@ impl From<Height> for usize {
 }
 
 impl TryFrom<&Path> for Height {
-    type Error = color_eyre::Report;
+    type Error = storable_vec::Error;
     fn try_from(value: &Path) -> Result<Self, Self::Error> {
-        Ok(Self::unsafe_try_from_slice(fs::read(value)?.as_slice())?.to_owned())
+        Ok(Self::read_from_bytes(fs::read(value)?.as_slice())?.to_owned())
     }
 }
 
@@ -127,13 +142,25 @@ impl TryFrom<&rpc::Client> for Height {
 }
 
 impl TryFrom<Slice> for Height {
-    type Error = unsafe_slice_serde::Error;
+    type Error = storable_vec::Error;
     fn try_from(value: Slice) -> Result<Self, Self::Error> {
-        Ok(*Self::unsafe_try_from_slice(&value)?)
+        Ok(Self::read_from_bytes(&value)?)
     }
 }
 impl From<Height> for Slice {
     fn from(value: Height) -> Self {
-        Self::new(value.unsafe_as_slice())
+        Self::new(value.as_bytes())
+    }
+}
+
+impl From<bitcoin::locktime::absolute::Height> for Height {
+    fn from(value: bitcoin::locktime::absolute::Height) -> Self {
+        Self(value.to_consensus_u32())
+    }
+}
+
+impl From<Height> for bitcoin::locktime::absolute::Height {
+    fn from(value: Height) -> Self {
+        bitcoin::locktime::absolute::Height::from_consensus(*value).unwrap()
     }
 }
diff --git a/indexer/src/structs/locktime.rs b/indexer/src/structs/locktime.rs
new file mode 100644
index 000000000..3d1963945
--- /dev/null
+++ b/indexer/src/structs/locktime.rs
@@ -0,0 +1,28 @@
+use zerocopy::{Immutable, IntoBytes, KnownLayout, TryFromBytes};
+
+use super::{Height, Timestamp};
+
+#[derive(Debug, Immutable, Clone, Copy, IntoBytes, KnownLayout, TryFromBytes)]
+#[repr(C)]
+pub enum LockTime {
+    Height(Height),
+    Timestamp(Timestamp),
+}
+
+impl From<bitcoin::absolute::LockTime> for LockTime {
+    fn from(value: bitcoin::absolute::LockTime) -> Self {
+        match value {
+            bitcoin::absolute::LockTime::Blocks(h) => LockTime::Height(h.into()),
+            bitcoin::absolute::LockTime::Seconds(t) => LockTime::Timestamp(t.into()),
+        }
+    }
+}
+
+impl From<LockTime> for bitcoin::absolute::LockTime {
+    fn from(value: LockTime) -> Self {
+        match value {
+            LockTime::Height(h) => bitcoin::absolute::LockTime::Blocks(h.into()),
+            LockTime::Timestamp(t) => bitcoin::absolute::LockTime::Seconds(t.into()),
+        }
+    }
+}
diff --git a/indexer/src/structs/mod.rs b/indexer/src/structs/mod.rs
index bb92346ed..04b682955 100644
--- a/indexer/src/structs/mod.rs
+++ b/indexer/src/structs/mod.rs
@@ -3,29 +3,35 @@ mod addressindex;
 mod addresstype;
 mod addresstypeindex;
 mod amount;
+mod blockhash;
 mod compressed;
 mod height;
-mod slice;
+mod locktime;
 mod timestamp;
+mod txid;
 mod txindex;
 mod txinindex;
 mod txoutindex;
-mod version;
+mod txversion;
 mod vin;
 mod vout;
+mod weight;
 
 pub use addressbytes::*;
 pub use addressindex::*;
 pub use addresstype::*;
 pub use addresstypeindex::*;
 pub use amount::*;
+pub use blockhash::*;
 pub use compressed::*;
 pub use height::*;
-pub use slice::*;
+pub use locktime::*;
 pub use timestamp::*;
+pub use txid::*;
 pub use txindex::*;
 pub use txinindex::*;
 pub use txoutindex::*;
-pub use version::*;
+pub use txversion::*;
 pub use vin::*;
 pub use vout::*;
+pub use weight::*;
diff --git a/indexer/src/structs/slice.rs b/indexer/src/structs/slice.rs
deleted file mode 100644
index d09b7890f..000000000
--- a/indexer/src/structs/slice.rs
+++ /dev/null
@@ -1,55 +0,0 @@
-use color_eyre::eyre::eyre;
-
-#[allow(unused)]
-pub trait SliceExtended {
-    fn read_8x_u8(&self) -> color_eyre::Result<[u8; 8]>;
-    fn read_be_u8(&self) -> color_eyre::Result<u8>;
-    fn read_be_u16(&self) -> color_eyre::Result<u16>;
-    fn read_be_u32(&self) -> color_eyre::Result<u32>;
-    fn read_be_u64(&self) -> color_eyre::Result<u64>;
-    fn read_exact(&self, buf: &mut [u8]) -> color_eyre::Result<()>;
-}
-
-impl SliceExtended for &[u8] {
-    fn read_8x_u8(&self) -> color_eyre::Result<[u8; 8]> {
-        let mut buf: [u8; 8] = [0; 8];
-        (&self[..8]).read_exact(&mut buf)?;
-        Ok(buf)
-    }
-
-    fn read_be_u8(&self) -> color_eyre::Result<u8> {
-        let mut buf: [u8; 1] = [0; 1];
-        self.read_exact(&mut buf)?;
-        Ok(u8::from_be_bytes(buf))
-    }
-
-    fn read_be_u16(&self) -> color_eyre::Result<u16> {
-        let mut buf: [u8; 2] = [0; 2];
-        self.read_exact(&mut buf)?;
-        Ok(u16::from_be_bytes(buf))
-    }
-
-    fn read_be_u32(&self) -> color_eyre::Result<u32> {
-        let mut buf: [u8; 4] = [0; 4];
-        self.read_exact(&mut buf)?;
-        Ok(u32::from_be_bytes(buf))
-    }
-
-    fn read_be_u64(&self) -> color_eyre::Result<u64> {
-        let mut buf: [u8; 8] = [0; 8];
-        self.read_exact(&mut buf)?;
-        Ok(u64::from_be_bytes(buf))
-    }
-
-    fn read_exact(&self, buf: &mut [u8]) -> color_eyre::Result<()> {
-        let buf_len = buf.len();
-        if self.len() != buf_len {
-            dbg!(self.len(), buf_len);
-            return Err(eyre!("Not exact len"));
-        }
-        self.iter().take(buf_len).enumerate().for_each(|(i, r)| {
-            buf[i] = *r;
-        });
-        Ok(())
-    }
-}
diff --git a/indexer/src/structs/timestamp.rs b/indexer/src/structs/timestamp.rs
index 4b9fc285e..b7c73106d 100644
--- a/indexer/src/structs/timestamp.rs
+++ b/indexer/src/structs/timestamp.rs
@@ -1,11 +1,29 @@
 use derive_deref::Deref;
+use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout};
 
-#[derive(Debug, Deref, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
-pub struct Timestamp(jiff::Timestamp);
+#[derive(Debug, Deref, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, FromBytes, Immutable, IntoBytes, KnownLayout)]
+pub struct Timestamp(u32);
 
-impl TryFrom<u32> for Timestamp {
-    type Error = jiff::Error;
-    fn try_from(value: u32) -> Result<Self, Self::Error> {
-        Ok(Self(jiff::Timestamp::from_second(value as i64)?))
+impl From<u32> for Timestamp {
+    fn from(value: u32) -> Self {
+        Self(value)
+    }
+}
+
+impl From<Timestamp> for jiff::Timestamp {
+    fn from(value: Timestamp) -> Self {
+        jiff::Timestamp::from_second(*value as i64).unwrap()
+    }
+}
+
+impl From<bitcoin::locktime::absolute::Time> for Timestamp {
+    fn from(value: bitcoin::locktime::absolute::Time) -> Self {
+        Self(value.to_consensus_u32())
+    }
+}
+
+impl From<Timestamp> for bitcoin::locktime::absolute::Time {
+    fn from(value: Timestamp) -> Self {
+        bitcoin::locktime::absolute::Time::from_consensus(*value).unwrap()
     }
 }
diff --git a/indexer/src/structs/txid.rs b/indexer/src/structs/txid.rs
new file mode 100644
index 000000000..fee437fa0
--- /dev/null
+++ b/indexer/src/structs/txid.rs
@@ -0,0 +1,19 @@
+use std::mem;
+
+use derive_deref::Deref;
+use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout};
+
+#[derive(Debug, Deref, Clone, PartialEq, Eq, Immutable, IntoBytes, KnownLayout, FromBytes)]
+pub struct Txid([u8; 32]);
+
+impl From<bitcoin::Txid> for Txid {
+    fn from(value: bitcoin::Txid) -> Self {
+        unsafe { mem::transmute(value) }
+    }
+}
+
+impl From<Txid> for bitcoin::Txid {
+    fn from(value: Txid) -> Self {
+        unsafe { mem::transmute(value) }
+    }
+}
diff --git a/indexer/src/structs/txindex.rs b/indexer/src/structs/txindex.rs
index 906e605d8..479380958 100644
--- a/indexer/src/structs/txindex.rs
+++ b/indexer/src/structs/txindex.rs
@@ -2,9 +2,24 @@ use std::ops::{Add, AddAssign, Sub};
 
 use derive_deref::{Deref, DerefMut};
 use fjall::Slice;
-use unsafe_slice_serde::UnsafeSliceSerde;
+use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout};
 
-#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Deref, DerefMut, Default)]
+#[derive(
+    Debug,
+    PartialEq,
+    Eq,
+    PartialOrd,
+    Ord,
+    Clone,
+    Copy,
+    Deref,
+    DerefMut,
+    Default,
+    FromBytes,
+    Immutable,
+    IntoBytes,
+    KnownLayout,
+)]
 pub struct Txindex(u32);
 
 impl Txindex {
@@ -73,13 +88,13 @@ impl From<Txindex> for usize {
 }
 
 impl TryFrom<Slice> for Txindex {
-    type Error = unsafe_slice_serde::Error;
+    type Error = storable_vec::Error;
     fn try_from(value: Slice) -> Result<Self, Self::Error> {
-        Ok(*Self::unsafe_try_from_slice(&value)?)
+        Ok(Self::read_from_bytes(&value)?)
     }
 }
 impl From<Txindex> for Slice {
     fn from(value: Txindex) -> Self {
-        Self::new(value.unsafe_as_slice())
+        Self::new(value.as_bytes())
     }
 }
diff --git a/indexer/src/structs/txinindex.rs b/indexer/src/structs/txinindex.rs
index 9c217961c..78727456e 100644
--- a/indexer/src/structs/txinindex.rs
+++ b/indexer/src/structs/txinindex.rs
@@ -1,10 +1,26 @@
 use std::ops::{Add, AddAssign, Sub};
 
 use derive_deref::{Deref, DerefMut};
+use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout};
 
 use super::Vin;
 
-#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Deref, DerefMut, Default)]
+#[derive(
+    Debug,
+    PartialEq,
+    Eq,
+    PartialOrd,
+    Ord,
+    Clone,
+    Copy,
+    Deref,
+    DerefMut,
+    Default,
+    FromBytes,
+    Immutable,
+    IntoBytes,
+    KnownLayout,
+)]
 pub struct Txinindex(u64);
 
 impl Txinindex {
diff --git a/indexer/src/structs/txoutindex.rs b/indexer/src/structs/txoutindex.rs
index 541ae40ab..fbc85dea2 100644
--- a/indexer/src/structs/txoutindex.rs
+++ b/indexer/src/structs/txoutindex.rs
@@ -1,10 +1,26 @@
 use std::ops::{Add, AddAssign, Sub};
 
 use derive_deref::{Deref, DerefMut};
+use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout};
 
 use super::Vout;
 
-#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Deref, DerefMut, Default)]
+#[derive(
+    Debug,
+    PartialEq,
+    Eq,
+    PartialOrd,
+    Ord,
+    Clone,
+    Copy,
+    Deref,
+    DerefMut,
+    Default,
+    FromBytes,
+    Immutable,
+    IntoBytes,
+    KnownLayout,
+)]
 pub struct Txoutindex(u64);
 
 impl Txoutindex {
diff --git a/indexer/src/structs/txversion.rs b/indexer/src/structs/txversion.rs
new file mode 100644
index 000000000..345e5f0e8
--- /dev/null
+++ b/indexer/src/structs/txversion.rs
@@ -0,0 +1,17 @@
+use derive_deref::Deref;
+use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout};
+
+#[derive(Debug, Deref, Clone, Copy, Immutable, IntoBytes, KnownLayout, FromBytes)]
+pub struct TxVersion(i32);
+
+impl From<bitcoin::transaction::Version> for TxVersion {
+    fn from(value: bitcoin::transaction::Version) -> Self {
+        Self(value.0)
+    }
+}
+
+impl From<TxVersion> for bitcoin::transaction::Version {
+    fn from(value: TxVersion) -> Self {
+        Self(value.0)
+    }
+}
diff --git a/indexer/src/structs/version.rs b/indexer/src/structs/version.rs
deleted file mode 100644
index 4d8257e2c..000000000
--- a/indexer/src/structs/version.rs
+++ /dev/null
@@ -1,38 +0,0 @@
-use std::{fs, io, path::Path};
-
-use fjall::Slice;
-use unsafe_slice_serde::UnsafeSliceSerde;
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
-pub struct Version(u32);
-
-impl Version {
-    pub fn write(&self, path: &Path) -> Result<(), io::Error> {
-        fs::write(path, self.unsafe_as_slice())
-    }
-}
-
-impl From<u32> for Version {
-    fn from(value: u32) -> Self {
-        Self(value)
-    }
-}
-
-impl TryFrom<&Path> for Version {
-    type Error = color_eyre::Report;
-    fn try_from(value: &Path) -> Result<Self, Self::Error> {
-        Ok(Self::unsafe_try_from_slice(fs::read(value)?.as_slice())?.to_owned())
-    }
-}
-
-impl TryFrom<Slice> for Version {
-    type Error = color_eyre::Report;
-    fn try_from(value: Slice) -> Result<Self, Self::Error> {
-        Ok(*Self::unsafe_try_from_slice(&value)?)
-    }
-}
-impl From<Version> for Slice {
-    fn from(value: Version) -> Self {
-        Self::new(value.unsafe_as_slice())
-    }
-}
diff --git a/indexer/src/structs/weight.rs b/indexer/src/structs/weight.rs
new file mode 100644
index 000000000..c930ee867
--- /dev/null
+++ b/indexer/src/structs/weight.rs
@@ -0,0 +1,17 @@
+use derive_deref::Deref;
+use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout};
+
+#[derive(Debug, Deref, Clone, Copy, Immutable, IntoBytes, KnownLayout, FromBytes)]
+pub struct Weight(u64);
+
+impl From<bitcoin::Weight> for Weight {
+    fn from(value: bitcoin::Weight) -> Self {
+        Self(value.to_wu())
+    }
+}
+
+impl From<Weight> for bitcoin::Weight {
+    fn from(value: Weight) -> Self {
+        Self::from_wu(*value)
+    }
+}
diff --git a/storable_vec/Cargo.toml b/storable_vec/Cargo.toml
index 61cb279ee..5604fb80b 100644
--- a/storable_vec/Cargo.toml
+++ b/storable_vec/Cargo.toml
@@ -9,4 +9,4 @@ edition = "2021"
 
 [dependencies]
 memmap2 = "0.9.5"
-unsafe_slice_serde = { workspace = true }
+zerocopy = { workspace = true }
diff --git a/storable_vec/src/enums/error.rs b/storable_vec/src/enums/error.rs
index 0905fd97c..37908bbae 100644
--- a/storable_vec/src/enums/error.rs
+++ b/storable_vec/src/enums/error.rs
@@ -13,7 +13,8 @@ pub enum Error {
     DifferentVersion { found: Version, expected: Version },
     MmapsVecIsTooSmall,
     IO(io::Error),
-    UnsafeSliceSerde(unsafe_slice_serde::Error),
+    // UnsafeSliceSerde(zerocopy::error::),
+    ZeroCopyError,
     IndexTooHigh,
     IndexTooLow,
     ExpectFileToHaveIndex,
@@ -28,9 +29,15 @@ impl From<io::Error> for Error {
     }
 }
 
-impl From<unsafe_slice_serde::Error> for Error {
-    fn from(value: unsafe_slice_serde::Error) -> Self {
-        Self::UnsafeSliceSerde(value)
+impl<A, B, C> From<zerocopy::error::ConvertError<A, B, C>> for Error {
+    fn from(_: zerocopy::error::ConvertError<A, B, C>) -> Self {
+        Self::ZeroCopyError
+    }
+}
+
+impl<A, B> From<zerocopy::error::SizeError<A, B>> for Error {
+    fn from(_: zerocopy::error::SizeError<A, B>) -> Self {
+        Self::ZeroCopyError
     }
 }
 
@@ -43,7 +50,7 @@ impl fmt::Display for Error {
             }
             Error::MmapsVecIsTooSmall => write!(f, "Mmaps vec is too small"),
             Error::IO(error) => Debug::fmt(&error, f),
-            Error::UnsafeSliceSerde(error) => Debug::fmt(&error, f),
+            // Error::UnsafeSliceSerde(error) => Debug::fmt(&error, f),
             Error::IndexTooHigh => write!(f, "Index too high"),
             Error::IndexTooLow => write!(f, "Index too low"),
             Error::ExpectFileToHaveIndex => write!(f, "Expect file to have index"),
@@ -52,6 +59,7 @@ impl fmt::Display for Error {
             Error::UnsupportedUnflushedState => {
                 write!(f, "Unsupported unflush state, please flush before using this function")
             }
+            Error::ZeroCopyError => write!(f, "Zero copy convert error"),
         }
     }
 }
diff --git a/storable_vec/src/lib.rs b/storable_vec/src/lib.rs
index cbaf540ae..3a916394d 100644
--- a/storable_vec/src/lib.rs
+++ b/storable_vec/src/lib.rs
@@ -11,8 +11,8 @@ use std::{
     sync::OnceLock,
 };
 
-use memmap2::{Mmap, MmapOptions};
-use unsafe_slice_serde::UnsafeSliceSerde;
+pub use memmap2;
+pub use zerocopy;
 
 mod enums;
 mod structs;
@@ -60,7 +60,7 @@ pub struct StorableVec<I, T, const MODE: u8> {
     file_position: u64,
     buf: Buffer,
     /// Only for CACHED_GETS
-    cache: Vec<OnceLock<Box<Mmap>>>, // Boxed Mmap to reduce the size of the Lock (from 24 to 16)
+    cache: Vec<OnceLock<Box<memmap2::Mmap>>>, // Boxed Mmap to reduce the size of the Lock (from 24 to 16)
     pushed: Vec<T>,
     // updated: BTreeMap<usize, T>,
     // inserted: BTreeMap<usize, T>,
@@ -207,7 +207,7 @@ where
 
     fn read_exact<'a>(file: &'a mut File, buf: &'a mut [u8]) -> Result<&'a T> {
         file.read_exact(buf)?;
-        let v = T::unsafe_try_from_slice(&buf[..])?;
+        let v = T::try_ref_from_bytes(&buf[..])?;
         Ok(v)
     }
 
@@ -277,7 +277,7 @@ where
 
         mem::take(&mut self.pushed)
             .into_iter()
-            .for_each(|v| bytes.extend_from_slice(v.unsafe_as_slice()));
+            .for_each(|v| bytes.extend_from_slice(v.as_bytes()));
 
         self.file.write_all(&bytes)?;
 
@@ -383,7 +383,7 @@ where
                 .ok_or(Error::MmapsVecIsTooSmall)?
                 .get_or_init(|| {
                     Box::new(unsafe {
-                        MmapOptions::new()
+                        memmap2::MmapOptions::new()
                             .len(Self::PAGE_SIZE)
                             .offset((page_index * Self::PAGE_SIZE) as u64)
                             .map(&self.file)
@@ -393,7 +393,7 @@ where
 
             let range = Self::index_to_byte_range(index);
             let slice = &mmap[range];
-            return Ok(Some(Value::Ref(T::unsafe_try_from_slice(slice)?)));
+            return Ok(Some(Value::Ref(T::try_ref_from_bytes(slice)?)));
         }
 
         Ok(Some(Value::Owned(self.open_file_at_then_read(index)?.to_owned())))
@@ -581,8 +581,9 @@ where
         other_to_self: &mut StorableVec<A, I, SINGLE_THREAD>,
     ) -> Result<()>
     where
-        A: StorableVecIndex + StorableVecType,
+        I: StorableVecType,
         T: From<bool>,
+        A: StorableVecIndex + StorableVecType,
     {
         self_to_other.iter_from(I::from(self.len()), |(i, other)| {
             self.push_if_needed(i, T::from(other_to_self.get(*other)? == &i))
diff --git a/storable_vec/src/structs/version.rs b/storable_vec/src/structs/version.rs
index 67af8da9f..565f868b1 100644
--- a/storable_vec/src/structs/version.rs
+++ b/storable_vec/src/structs/version.rs
@@ -4,16 +4,16 @@ use std::{
     path::Path,
 };
 
-use unsafe_slice_serde::UnsafeSliceSerde;
+use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout};
 
 use crate::Error;
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, FromBytes, IntoBytes, Immutable, KnownLayout)]
 pub struct Version(u32);
 
 impl Version {
     pub fn write(&self, path: &Path) -> Result<(), io::Error> {
-        fs::write(path, self.0.unsafe_as_slice())
+        fs::write(path, self.as_bytes())
     }
 
     pub fn swap_bytes(self) -> Self {
@@ -32,6 +32,6 @@ impl TryFrom<&Path> for Version {
     fn try_from(value: &Path) -> Result<Self, Self::Error> {
         let mut buf = [0; 4];
         fs::read(value)?.as_slice().read_exact(&mut buf)?;
-        Ok(*(Self::unsafe_try_from_slice(&buf)?))
+        Ok(*(Self::ref_from_bytes(&buf)?))
     }
 }
diff --git a/storable_vec/src/traits/index.rs b/storable_vec/src/traits/index.rs
index 6ff29dcca..c99b64320 100644
--- a/storable_vec/src/traits/index.rs
+++ b/storable_vec/src/traits/index.rs
@@ -2,10 +2,30 @@ use std::{fmt::Debug, ops::Add};
 
 pub trait StorableVecIndex
 where
-    Self: Debug + Default + Copy + Clone + PartialOrd + Ord + TryInto<usize> + From<usize> + Add<usize, Output = Self>,
+    Self: Debug
+        + Default
+        + Copy
+        + Clone
+        + PartialEq
+        + Eq
+        + PartialOrd
+        + Ord
+        + TryInto<usize>
+        + From<usize>
+        + Add<usize, Output = Self>,
 {
 }
 impl<I> StorableVecIndex for I where
-    I: Debug + Default + Copy + Clone + PartialOrd + Ord + TryInto<usize> + From<usize> + Add<usize, Output = Self>
+    I: Debug
+        + Default
+        + Copy
+        + Clone
+        + PartialEq
+        + Eq
+        + PartialOrd
+        + Ord
+        + TryInto<usize>
+        + From<usize>
+        + Add<usize, Output = Self>
 {
 }
diff --git a/storable_vec/src/traits/type_.rs b/storable_vec/src/traits/type_.rs
index 5fdeeeeef..06e94efc0 100644
--- a/storable_vec/src/traits/type_.rs
+++ b/storable_vec/src/traits/type_.rs
@@ -1,8 +1,10 @@
 use std::fmt::Debug;
 
+use zerocopy::{Immutable, IntoBytes, KnownLayout, TryFromBytes};
+
 pub trait StorableVecType
 where
-    Self: Sized + Debug + Clone,
+    Self: Sized + Debug + Clone + TryFromBytes + IntoBytes + Immutable + KnownLayout,
 {
 }
-impl<T> StorableVecType for T where T: Sized + Debug + Clone {}
+impl<T> StorableVecType for T where T: Sized + Debug + Clone + TryFromBytes + IntoBytes + Immutable + KnownLayout {}

From 5aaa55197eef556f1e589cfcfde8e73f6b572f01 Mon Sep 17 00:00:00 2001
From: nym21 <expat-epochs0i@icloud.com>
Date: Wed, 5 Feb 2025 23:42:48 +0100
Subject: [PATCH 40/63] workspace: use folder name for packages

---
 Cargo.lock                                    | 3407 ++++++++++++++++-
 Cargo.toml                                    |   10 +-
 computer/Cargo.toml                           |    4 +-
 computer/src/lib.rs                           |   12 +-
 computer/src/main.rs                          |    2 +-
 computer/src/storage/fjalls.rs                |    2 +-
 computer/src/storage/storable_vecs.rs         |    2 +-
 .../src/structs/addressindextxoutindex.rs     |    2 +-
 computer/src/structs/date.rs                  |    2 +-
 indexer/Cargo.lock                            | 1065 ------
 indexer/Cargo.toml                            |    2 +-
 indexer/src/lib.rs                            |    4 +-
 indexer/src/main.rs                           |    2 +-
 indexer/src/structs/addressbytes.rs           |    2 +-
 indexer/src/structs/addresstype.rs            |    2 +-
 indexer/src/structs/amount.rs                 |    2 +-
 indexer/src/structs/height.rs                 |    2 +-
 server/Cargo.toml                             |   18 +-
 server/src/website/handlers/minify.rs         |   23 +-
 src/main.rs                                   |    2 +-
 src/parser/actions/iter_blocks.rs             |   39 +-
 src/parser/actions/parse.rs                   |  710 ++--
 src/parser/databases/txid_to_tx_data.rs       |    7 +-
 src/parser/mod.rs                             |   11 +-
 src/structs/address.rs                        |    2 +-
 src/structs/amount.rs                         |   17 +-
 src/structs/config.rs                         |    6 +-
 src/structs/height.rs                         |    2 +-
 src/structs/rpc.rs                            |    2 +-
 storable_vec/src/lib.rs                       |   20 +
 storable_vec/src/main.rs                      |    2 +-
 unsafe_slice_serde/Cargo.toml                 |    4 -
 unsafe_slice_serde/src/lib.rs                 |   42 -
 33 files changed, 3776 insertions(+), 1655 deletions(-)
 delete mode 100644 indexer/Cargo.lock
 delete mode 100644 unsafe_slice_serde/Cargo.toml
 delete mode 100644 unsafe_slice_serde/src/lib.rs

diff --git a/Cargo.lock b/Cargo.lock
index eda8ab27a..6284a90e4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2,6 +2,16 @@
 # It is not intended for manual editing.
 version = 4
 
+[[package]]
+name = "Inflector"
+version = "0.11.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3"
+dependencies = [
+ "lazy_static",
+ "regex",
+]
+
 [[package]]
 name = "addr2line"
 version = "0.21.0"
@@ -17,18 +27,194 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
+[[package]]
+name = "adler2"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
+
+[[package]]
+name = "ahash"
+version = "0.8.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
+dependencies = [
+ "cfg-if",
+ "getrandom 0.2.15",
+ "once_cell",
+ "serde",
+ "version_check",
+ "zerocopy 0.7.35",
+]
+
+[[package]]
+name = "aho-corasick"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "alloc-no-stdlib"
+version = "2.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3"
+
+[[package]]
+name = "alloc-stdlib"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece"
+dependencies = [
+ "alloc-no-stdlib",
+]
+
+[[package]]
+name = "allocator-api2"
+version = "0.2.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
+
+[[package]]
+name = "android-tzdata"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
+
+[[package]]
+name = "android_system_properties"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "anyhow"
+version = "1.0.95"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04"
+
 [[package]]
 name = "arrayvec"
 version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
+[[package]]
+name = "ascii"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d92bec98840b8f03a5ff5413de5293bfcd8bf96467cf5452609f939ec6f5de16"
+
+[[package]]
+name = "ast_node"
+version = "3.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91fb5864e2f5bf9fd9797b94b2dfd1554d4c3092b535008b27d7e15c86675a2f"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "swc_macros_common",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "async-compression"
+version = "0.4.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df895a515f70646414f4b45c0b79082783b80552b373a68283012928df56f522"
+dependencies = [
+ "brotli",
+ "flate2",
+ "futures-core",
+ "memchr",
+ "pin-project-lite",
+ "tokio",
+ "zstd",
+ "zstd-safe",
+]
+
+[[package]]
+name = "atomic-waker"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
+
+[[package]]
+name = "auto_impl"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e12882f59de5360c748c4cbf569a042d5fb0eb515f7bea9c1f470b47f6ffbd73"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+]
+
 [[package]]
 name = "autocfg"
 version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
+[[package]]
+name = "axum"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d6fd624c75e18b3b4c6b9caf42b1afe24437daaee904069137d8bab077be8b8"
+dependencies = [
+ "axum-core",
+ "bytes",
+ "form_urlencoded",
+ "futures-util",
+ "http",
+ "http-body",
+ "http-body-util",
+ "hyper",
+ "hyper-util",
+ "itoa",
+ "matchit",
+ "memchr",
+ "mime",
+ "percent-encoding",
+ "pin-project-lite",
+ "rustversion",
+ "serde",
+ "serde_json",
+ "serde_path_to_error",
+ "serde_urlencoded",
+ "sync_wrapper",
+ "tokio",
+ "tower",
+ "tower-layer",
+ "tower-service",
+ "tracing",
+]
+
+[[package]]
+name = "axum-core"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df1362f362fd16024ae199c1970ce98f9661bf5ef94b9808fee734bc3698b733"
+dependencies = [
+ "bytes",
+ "futures-util",
+ "http",
+ "http-body",
+ "http-body-util",
+ "mime",
+ "pin-project-lite",
+ "rustversion",
+ "sync_wrapper",
+ "tower-layer",
+ "tower-service",
+ "tracing",
+]
+
 [[package]]
 name = "backtrace"
 version = "0.3.71"
@@ -39,7 +225,7 @@ dependencies = [
  "cc",
  "cfg-if",
  "libc",
- "miniz_oxide",
+ "miniz_oxide 0.7.4",
  "object",
  "rustc-demangle",
 ]
@@ -60,12 +246,42 @@ version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
 
+[[package]]
+name = "base64"
+version = "0.21.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
+
+[[package]]
+name = "base64"
+version = "0.22.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
+
+[[package]]
+name = "base64-simd"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "781dd20c3aff0bd194fe7d2a977dd92f21c173891f3a03b677359e5fa457e5d5"
+dependencies = [
+ "simd-abstraction",
+]
+
 [[package]]
 name = "bech32"
 version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d965446196e3b7decd44aa7ee49e31d630118f90ef12f97900f262eb915c951d"
 
+[[package]]
+name = "better_scoped_tls"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50fd297a11c709be8348aec039c8b91de16075d2b2bdaee1bd562c0875993664"
+dependencies = [
+ "scoped-tls",
+]
+
 [[package]]
 name = "bindex"
 version = "0.1.0"
@@ -180,6 +396,27 @@ version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36"
 
+[[package]]
+name = "bitvec"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c"
+dependencies = [
+ "funty",
+ "radium",
+ "tap",
+ "wyz",
+]
+
+[[package]]
+name = "block-buffer"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
+dependencies = [
+ "generic-array",
+]
+
 [[package]]
 name = "bomputer"
 version = "0.1.0"
@@ -195,6 +432,53 @@ dependencies = [
  "zerocopy 0.8.16",
 ]
 
+[[package]]
+name = "brotli"
+version = "7.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc97b8f16f944bba54f0433f07e30be199b6dc2bd25937444bbad560bcea29bd"
+dependencies = [
+ "alloc-no-stdlib",
+ "alloc-stdlib",
+ "brotli-decompressor",
+]
+
+[[package]]
+name = "brotli-decompressor"
+version = "4.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74fa05ad7d803d413eb8380983b092cbbaf9a85f151b871360e7b00cd7060b37"
+dependencies = [
+ "alloc-no-stdlib",
+ "alloc-stdlib",
+]
+
+[[package]]
+name = "browserslist-rs"
+version = "0.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74c973b79d9b6b89854493185ab760c6ef8e54bcfad10ad4e33991e46b374ac8"
+dependencies = [
+ "ahash",
+ "chrono",
+ "either",
+ "indexmap",
+ "itertools",
+ "nom",
+ "serde",
+ "serde_json",
+ "thiserror",
+]
+
+[[package]]
+name = "bumpalo"
+version = "3.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf"
+dependencies = [
+ "allocator-api2",
+]
+
 [[package]]
 name = "byteorder"
 version = "1.5.0"
@@ -202,11 +486,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
-name = "cc"
-version = "1.2.10"
+name = "bytes"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13208fcbb66eaeffe09b99fffbe1af420f00a7b35aa99ad683dfc1aa76145229"
+checksum = "f61dac84819c6588b558454b194026eb1f09c293b9036ae9b159e74e73ab6cf9"
+
+[[package]]
+name = "byteview"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df559a101a77b0b6f034ca9e5747dfd267a0b54ee29d6c227768deda0b153a99"
+
+[[package]]
+name = "cc"
+version = "1.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "755717a7de9ec452bf7f3f1a3099085deabd7f2962b861dae91ecd7a365903d2"
 dependencies = [
+ "jobserver",
+ "libc",
  "shlex",
 ]
 
@@ -222,6 +520,18 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
 
+[[package]]
+name = "chrono"
+version = "0.4.39"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825"
+dependencies = [
+ "android-tzdata",
+ "iana-time-zone",
+ "num-traits",
+ "windows-targets",
+]
+
 [[package]]
 name = "color-eyre"
 version = "0.6.3"
@@ -233,7 +543,7 @@ dependencies = [
  "eyre",
  "indenter",
  "once_cell",
- "owo-colors",
+ "owo-colors 3.5.0",
  "tracing-error",
 ]
 
@@ -244,11 +554,51 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cd6be1b2a7e382e2b98b43b2adcca6bb0e465af0bdd38123873ae61eb17a72c2"
 dependencies = [
  "once_cell",
- "owo-colors",
+ "owo-colors 3.5.0",
  "tracing-core",
  "tracing-error",
 ]
 
+[[package]]
+name = "compare"
+version = "0.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea0095f6103c2a8b44acd6fd15960c801dafebf02e21940360833e0673f48ba7"
+
+[[package]]
+name = "core-foundation"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
+[[package]]
+name = "core-foundation-sys"
+version = "0.8.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
+
+[[package]]
+name = "cpufeatures"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "crc32fast"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
+dependencies = [
+ "cfg-if",
+]
+
 [[package]]
 name = "crossbeam"
 version = "0.8.4"
@@ -315,6 +665,16 @@ version = "0.8.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
 
+[[package]]
+name = "crypto-common"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
+dependencies = [
+ "generic-array",
+ "typenum",
+]
+
 [[package]]
 name = "ctrlc"
 version = "3.4.5"
@@ -322,7 +682,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "90eeab0aa92f3f9b4e87f258c72b139c207d251f9cbc1080a0086b86a8870dd3"
 dependencies = [
  "nix",
- "windows-sys",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "dashmap"
+version = "5.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856"
+dependencies = [
+ "cfg-if",
+ "hashbrown 0.14.5",
+ "lock_api",
+ "once_cell",
+ "parking_lot_core",
 ]
 
 [[package]]
@@ -333,12 +706,28 @@ checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf"
 dependencies = [
  "cfg-if",
  "crossbeam-utils",
- "hashbrown",
+ "hashbrown 0.14.5",
  "lock_api",
  "once_cell",
  "parking_lot_core",
 ]
 
+[[package]]
+name = "data-encoding"
+version = "2.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e60eed09d8c01d3cee5b7d30acb059b76614c918fa0f992e0dd6eeb10daad6f"
+
+[[package]]
+name = "debugid"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d"
+dependencies = [
+ "serde",
+ "uuid",
+]
+
 [[package]]
 name = "derive_deref"
 version = "1.1.1"
@@ -350,6 +739,27 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "digest"
+version = "0.10.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
+dependencies = [
+ "block-buffer",
+ "crypto-common",
+]
+
+[[package]]
+name = "displaydoc"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+]
+
 [[package]]
 name = "double-ended-peekable"
 version = "0.1.0"
@@ -362,6 +772,15 @@ version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
 
+[[package]]
+name = "encoding_rs"
+version = "0.8.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3"
+dependencies = [
+ "cfg-if",
+]
+
 [[package]]
 name = "enum_dispatch"
 version = "0.3.13"
@@ -387,7 +806,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
 dependencies = [
  "libc",
- "windows-sys",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -413,6 +832,12 @@ version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
 
+[[package]]
+name = "fixedbitset"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
+
 [[package]]
 name = "fjall"
 version = "2.5.0"
@@ -420,7 +845,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "80910a26e4fb5e5393ff64d293602ac1ade56cf4d14d244c02a7d4ddcd5f10bc"
 dependencies = [
  "byteorder",
- "dashmap",
+ "dashmap 6.1.0",
  "log",
  "lsm-tree",
  "path-absolutize",
@@ -429,6 +854,123 @@ dependencies = [
  "xxhash-rust",
 ]
 
+[[package]]
+name = "flate2"
+version = "1.0.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c"
+dependencies = [
+ "crc32fast",
+ "miniz_oxide 0.8.3",
+]
+
+[[package]]
+name = "fnv"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+
+[[package]]
+name = "foreign-types"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
+dependencies = [
+ "foreign-types-shared",
+]
+
+[[package]]
+name = "foreign-types-shared"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
+
+[[package]]
+name = "form_urlencoded"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
+dependencies = [
+ "percent-encoding",
+]
+
+[[package]]
+name = "from_variant"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8d7ccf961415e7aa17ef93dcb6c2441faaa8e768abe09e659b908089546f74c5"
+dependencies = [
+ "proc-macro2",
+ "swc_macros_common",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "funty"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
+
+[[package]]
+name = "futures-channel"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
+dependencies = [
+ "futures-core",
+ "futures-sink",
+]
+
+[[package]]
+name = "futures-core"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
+
+[[package]]
+name = "futures-io"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
+
+[[package]]
+name = "futures-sink"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
+
+[[package]]
+name = "futures-task"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
+
+[[package]]
+name = "futures-util"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
+dependencies = [
+ "futures-core",
+ "futures-io",
+ "futures-sink",
+ "futures-task",
+ "memchr",
+ "pin-project-lite",
+ "pin-utils",
+ "slab",
+]
+
+[[package]]
+name = "generic-array"
+version = "0.14.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
+dependencies = [
+ "typenum",
+ "version_check",
+]
+
 [[package]]
 name = "getrandom"
 version = "0.2.15"
@@ -437,7 +979,19 @@ checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
 dependencies = [
  "cfg-if",
  "libc",
- "wasi",
+ "wasi 0.11.0+wasi-snapshot-preview1",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43a49c392881ce6d5c3b8cb70f98717b7c07aabbdff06687b9030dbfbe2725f8"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi 0.13.3+wasi-0.2.2",
+ "windows-targets",
 ]
 
 [[package]]
@@ -452,11 +1006,61 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "493913a18c0d7bebb75127a26a432162c59edbe06f6cf712001e3e769345e8b5"
 
+[[package]]
+name = "h2"
+version = "0.4.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ccae279728d634d083c00f6099cb58f01cc99c145b84b8be2f6c74618d79922e"
+dependencies = [
+ "atomic-waker",
+ "bytes",
+ "fnv",
+ "futures-core",
+ "futures-sink",
+ "http",
+ "indexmap",
+ "slab",
+ "tokio",
+ "tokio-util",
+ "tracing",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+dependencies = [
+ "ahash",
+]
+
 [[package]]
 name = "hashbrown"
 version = "0.14.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+dependencies = [
+ "ahash",
+ "allocator-api2",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.15.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
+
+[[package]]
+name = "heck"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+
+[[package]]
+name = "hermit-abi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
 
 [[package]]
 name = "hex-conservative"
@@ -473,12 +1077,360 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3011d1213f159867b13cfd6ac92d2cd5f1345762c63be3554e84092d85a50bbd"
 
+[[package]]
+name = "hstr"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1a26def229ea95a8709dad32868d975d0dd40235bd2ce82920e4a8fe692b5e0"
+dependencies = [
+ "hashbrown 0.14.5",
+ "new_debug_unreachable",
+ "once_cell",
+ "phf",
+ "rustc-hash 1.1.0",
+ "triomphe",
+]
+
+[[package]]
+name = "http"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f16ca2af56261c99fba8bac40a10251ce8188205a4c448fbb745a2e4daa76fea"
+dependencies = [
+ "bytes",
+ "fnv",
+ "itoa",
+]
+
+[[package]]
+name = "http-body"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
+dependencies = [
+ "bytes",
+ "http",
+]
+
+[[package]]
+name = "http-body-util"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f"
+dependencies = [
+ "bytes",
+ "futures-util",
+ "http",
+ "http-body",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "httparse"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2d708df4e7140240a16cd6ab0ab65c972d7433ab77819ea693fde9c43811e2a"
+
+[[package]]
+name = "httpdate"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
+
+[[package]]
+name = "hyper"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc2b571658e38e0c01b1fdca3bbbe93c00d3d71693ff2770043f8c29bc7d6f80"
+dependencies = [
+ "bytes",
+ "futures-channel",
+ "futures-util",
+ "h2",
+ "http",
+ "http-body",
+ "httparse",
+ "httpdate",
+ "itoa",
+ "pin-project-lite",
+ "smallvec",
+ "tokio",
+ "want",
+]
+
+[[package]]
+name = "hyper-rustls"
+version = "0.27.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d191583f3da1305256f22463b9bb0471acad48a4e534a5218b9963e9c1f59b2"
+dependencies = [
+ "futures-util",
+ "http",
+ "hyper",
+ "hyper-util",
+ "rustls",
+ "rustls-pki-types",
+ "tokio",
+ "tokio-rustls",
+ "tower-service",
+]
+
+[[package]]
+name = "hyper-tls"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"
+dependencies = [
+ "bytes",
+ "http-body-util",
+ "hyper",
+ "hyper-util",
+ "native-tls",
+ "tokio",
+ "tokio-native-tls",
+ "tower-service",
+]
+
+[[package]]
+name = "hyper-util"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4"
+dependencies = [
+ "bytes",
+ "futures-channel",
+ "futures-util",
+ "http",
+ "http-body",
+ "hyper",
+ "pin-project-lite",
+ "socket2",
+ "tokio",
+ "tower-service",
+ "tracing",
+]
+
+[[package]]
+name = "iana-time-zone"
+version = "0.1.61"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220"
+dependencies = [
+ "android_system_properties",
+ "core-foundation-sys",
+ "iana-time-zone-haiku",
+ "js-sys",
+ "wasm-bindgen",
+ "windows-core",
+]
+
+[[package]]
+name = "iana-time-zone-haiku"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "icu_collections"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
+dependencies = [
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
+dependencies = [
+ "displaydoc",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_locid_transform_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e"
+
+[[package]]
+name = "icu_normalizer"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_normalizer_data",
+ "icu_properties",
+ "icu_provider",
+ "smallvec",
+ "utf16_iter",
+ "utf8_iter",
+ "write16",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
+
+[[package]]
+name = "icu_properties"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_locid_transform",
+ "icu_properties_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_properties_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
+
+[[package]]
+name = "icu_provider"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_provider_macros",
+ "stable_deref_trait",
+ "tinystr",
+ "writeable",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_provider_macros"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "idna"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
+dependencies = [
+ "idna_adapter",
+ "smallvec",
+ "utf8_iter",
+]
+
+[[package]]
+name = "idna_adapter"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71"
+dependencies = [
+ "icu_normalizer",
+ "icu_properties",
+]
+
+[[package]]
+name = "if_chain"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed"
+
 [[package]]
 name = "indenter"
 version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683"
 
+[[package]]
+name = "indexmap"
+version = "2.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c9c992b02b5b4c94ea26e32fe5bccb7aa7d9f390ab5c1221ff895bc7ea8b652"
+dependencies = [
+ "equivalent",
+ "hashbrown 0.15.2",
+ "serde",
+]
+
+[[package]]
+name = "interval-heap"
+version = "0.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11274e5e8e89b8607cfedc2910b6626e998779b48a019151c7604d0adcb86ac6"
+dependencies = [
+ "compare",
+]
+
+[[package]]
+name = "ipnet"
+version = "2.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130"
+
+[[package]]
+name = "is-macro"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d57a3e447e24c22647738e4607f1df1e0ec6f72e16182c4cd199f647cdfb0e4"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "itertools"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
+dependencies = [
+ "either",
+]
+
 [[package]]
 name = "itoa"
 version = "1.0.14"
@@ -496,7 +1448,7 @@ dependencies = [
  "portable-atomic",
  "portable-atomic-util",
  "serde",
- "windows-sys",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -514,18 +1466,61 @@ dependencies = [
  "jiff-tzdb",
 ]
 
+[[package]]
+name = "jobserver"
+version = "0.1.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "js-sys"
+version = "0.3.77"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f"
+dependencies = [
+ "once_cell",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "jsonc-parser"
+version = "0.21.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b56a20e76235284255a09fcd1f45cf55d3c524ea657ebd3854735925c57743d"
+dependencies = [
+ "serde_json",
+]
+
 [[package]]
 name = "jsonrpc"
 version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3662a38d341d77efecb73caf01420cfa5aa63c0253fd7bc05289ef9f6616e1bf"
 dependencies = [
- "base64",
+ "base64 0.13.1",
  "minreq",
  "serde",
  "serde_json",
 ]
 
+[[package]]
+name = "kibo_server"
+version = "0.6.0"
+dependencies = [
+ "axum",
+ "color-eyre",
+ "regex",
+ "reqwest",
+ "swc",
+ "swc_common",
+ "tokio",
+ "tower-http",
+ "zstd",
+]
+
 [[package]]
 name = "lazy_static"
 version = "1.5.0"
@@ -544,6 +1539,12 @@ version = "0.4.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
 
+[[package]]
+name = "litemap"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104"
+
 [[package]]
 name = "lock_api"
 version = "0.4.12"
@@ -560,6 +1561,15 @@ version = "0.4.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f"
 
+[[package]]
+name = "lru"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "718e8fae447df0c7e1ba7f5189829e63fd536945c8988d61444c19039f16b670"
+dependencies = [
+ "hashbrown 0.13.2",
+]
+
 [[package]]
 name = "lsm-tree"
 version = "2.5.0"
@@ -575,7 +1585,7 @@ dependencies = [
  "lz4_flex",
  "path-absolutize",
  "quick_cache",
- "rustc-hash",
+ "rustc-hash 2.1.1",
  "self_cell",
  "tempfile",
  "value-log",
@@ -589,6 +1599,12 @@ version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "75761162ae2b0e580d7e7c390558127e5f01b4194debd6221fd8c207fc80e3f5"
 
+[[package]]
+name = "matchit"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "47e1ffaa40ddd1f3ed91f717a33c8c0ee23fff369e3aa8772b9605cc1d22f4c3"
+
 [[package]]
 name = "memchr"
 version = "2.7.4"
@@ -605,10 +1621,41 @@ dependencies = [
 ]
 
 [[package]]
-name = "min-max-heap"
-version = "1.3.0"
+name = "miette"
+version = "7.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2687e6cf9c00f48e9284cf9fd15f2ef341d03cc7743abf9df4c5f07fdee50b18"
+checksum = "1a955165f87b37fd1862df2a59547ac542c77ef6d17c666f619d1ad22dd89484"
+dependencies = [
+ "cfg-if",
+ "miette-derive",
+ "owo-colors 4.1.0",
+ "textwrap",
+ "thiserror",
+ "unicode-width",
+]
+
+[[package]]
+name = "miette-derive"
+version = "7.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf45bf44ab49be92fd1227a3be6fc6f617f1a337c06af54981048574d8783147"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "mime"
+version = "0.3.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
+
+[[package]]
+name = "minimal-lexical"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "miniz_oxide"
@@ -620,16 +1667,59 @@ dependencies = [
 ]
 
 [[package]]
-name = "minreq"
-version = "2.13.0"
+name = "miniz_oxide"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36a8e50e917e18a37d500d27d40b7bc7d127e71c0c94fb2d83f43b4afd308390"
+checksum = "b8402cab7aefae129c6977bb0ff1b8fd9a04eb5b51efc50a70bea51cda0c7924"
+dependencies = [
+ "adler2",
+]
+
+[[package]]
+name = "minreq"
+version = "2.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da0c420feb01b9fb5061f8c8f452534361dd783756dcf38ec45191ce55e7a161"
 dependencies = [
  "log",
  "serde",
  "serde_json",
 ]
 
+[[package]]
+name = "mio"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd"
+dependencies = [
+ "libc",
+ "wasi 0.11.0+wasi-snapshot-preview1",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "native-tls"
+version = "0.2.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0dab59f8e050d5df8e4dd87d9206fb6f65a483e20ac9fda365ade4fab353196c"
+dependencies = [
+ "libc",
+ "log",
+ "openssl",
+ "openssl-probe",
+ "openssl-sys",
+ "schannel",
+ "security-framework",
+ "security-framework-sys",
+ "tempfile",
+]
+
+[[package]]
+name = "new_debug_unreachable"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086"
+
 [[package]]
 name = "nix"
 version = "0.29.0"
@@ -642,6 +1732,64 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "nom"
+version = "7.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
+dependencies = [
+ "memchr",
+ "minimal-lexical",
+]
+
+[[package]]
+name = "normpath"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a9da8c9922c35a1033d76f7272dfc2e7ee20392083d75aeea6ced23c6266578"
+dependencies = [
+ "winapi",
+]
+
+[[package]]
+name = "num-bigint"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
+dependencies = [
+ "num-integer",
+ "num-traits",
+ "serde",
+]
+
+[[package]]
+name = "num-integer"
+version = "0.1.46"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "num_cpus"
+version = "1.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
+dependencies = [
+ "hermit-abi",
+ "libc",
+]
+
 [[package]]
 name = "object"
 version = "0.32.2"
@@ -657,12 +1805,78 @@ version = "1.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
 
+[[package]]
+name = "openssl"
+version = "0.10.70"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61cfb4e166a8bb8c9b55c500bc2308550148ece889be90f609377e58140f42c6"
+dependencies = [
+ "bitflags",
+ "cfg-if",
+ "foreign-types",
+ "libc",
+ "once_cell",
+ "openssl-macros",
+ "openssl-sys",
+]
+
+[[package]]
+name = "openssl-macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "openssl-probe"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
+
+[[package]]
+name = "openssl-sys"
+version = "0.9.105"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b22d5b84be05a8d6947c7cb71f7c849aa0f112acd4bf51c2a7c1c988ac0a9dc"
+dependencies = [
+ "cc",
+ "libc",
+ "pkg-config",
+ "vcpkg",
+]
+
+[[package]]
+name = "outref"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f222829ae9293e33a9f5e9f440c6760a3d450a64affe1846486b140db81c1f4"
+
 [[package]]
 name = "owo-colors"
 version = "3.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f"
 
+[[package]]
+name = "owo-colors"
+version = "4.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb37767f6569cd834a413442455e0f066d0d522de8630436e2a1761d9726ba56"
+
+[[package]]
+name = "parking_lot"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
+dependencies = [
+ "lock_api",
+ "parking_lot_core",
+]
+
 [[package]]
 name = "parking_lot_core"
 version = "0.9.10"
@@ -685,6 +1899,18 @@ dependencies = [
  "path-dedot",
 ]
 
+[[package]]
+name = "path-clean"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ecba01bf2678719532c5e3059e0b5f0811273d94b397088b82e3bd0a78c78fdd"
+
+[[package]]
+name = "path-clean"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17359afc20d7ab31fdb42bb844c8b3bb1dabd7dcf7e68428492da7f16966fcef"
+
 [[package]]
 name = "path-dedot"
 version = "3.1.1"
@@ -694,12 +1920,88 @@ dependencies = [
  "once_cell",
 ]
 
+[[package]]
+name = "pathdiff"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df94ce210e5bc13cb6651479fa48d14f601d9858cfe0467f43ae157023b938d3"
+
+[[package]]
+name = "percent-encoding"
+version = "2.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
+
+[[package]]
+name = "petgraph"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
+dependencies = [
+ "fixedbitset",
+ "indexmap",
+]
+
+[[package]]
+name = "phf"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078"
+dependencies = [
+ "phf_macros",
+ "phf_shared",
+]
+
+[[package]]
+name = "phf_generator"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d"
+dependencies = [
+ "phf_shared",
+ "rand",
+]
+
+[[package]]
+name = "phf_macros"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f84ac04429c13a7ff43785d75ad27569f2951ce0ffd30a3321230db2fc727216"
+dependencies = [
+ "phf_generator",
+ "phf_shared",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "phf_shared"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5"
+dependencies = [
+ "siphasher 1.0.1",
+]
+
 [[package]]
 name = "pin-project-lite"
 version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
 
+[[package]]
+name = "pin-utils"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+
+[[package]]
+name = "pkg-config"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
+
 [[package]]
 name = "portable-atomic"
 version = "1.10.0"
@@ -724,6 +2026,24 @@ dependencies = [
  "zerocopy 0.7.35",
 ]
 
+[[package]]
+name = "preset_env_base"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07852df2dda2f0ab8c3407a6fd19e9389563af11c20f6c299bd07ff9fc96d6ae"
+dependencies = [
+ "anyhow",
+ "browserslist-rs",
+ "dashmap 5.5.3",
+ "from_variant",
+ "once_cell",
+ "rustc-hash 2.1.1",
+ "semver 1.0.25",
+ "serde",
+ "st-map",
+ "tracing",
+]
+
 [[package]]
 name = "proc-macro2"
 version = "1.0.93"
@@ -734,13 +2054,42 @@ dependencies = [
 ]
 
 [[package]]
-name = "quick_cache"
-version = "0.6.9"
+name = "psm"
+version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d7c94f8935a9df96bb6380e8592c70edf497a643f94bd23b2f76b399385dbf4"
+checksum = "200b9ff220857e53e184257720a14553b2f4aa02577d2ed9842d45d4b9654810"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "ptr_meta"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fe9e76f66d3f9606f44e45598d155cb13ecf09f4a28199e48daf8c8fc937ea90"
+dependencies = [
+ "ptr_meta_derive",
+]
+
+[[package]]
+name = "ptr_meta_derive"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca414edb151b4c8d125c12566ab0d74dc9cdba36fb80eb7b848c15f495fd32d1"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "quick_cache"
+version = "0.6.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f67cfc9c723c39f3615eb0840b00c4cb9e2b068d2fa761a30d845ec91730a59"
 dependencies = [
  "equivalent",
- "hashbrown",
+ "hashbrown 0.14.5",
 ]
 
 [[package]]
@@ -752,6 +2101,18 @@ dependencies = [
  "proc-macro2",
 ]
 
+[[package]]
+name = "radium"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
+
+[[package]]
+name = "radix_fmt"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce082a9940a7ace2ad4a8b7d0b1eac6aa378895f18be598230c5f2284ac05426"
+
 [[package]]
 name = "rand"
 version = "0.8.5"
@@ -779,7 +2140,7 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "getrandom",
+ "getrandom 0.2.15",
 ]
 
 [[package]]
@@ -817,6 +2178,95 @@ dependencies = [
  "bitflags",
 ]
 
+[[package]]
+name = "regex"
+version = "1.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
+
+[[package]]
+name = "reqwest"
+version = "0.12.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43e734407157c3c2034e0258f5e4473ddb361b1e85f95a66690d67264d7cd1da"
+dependencies = [
+ "base64 0.22.1",
+ "bytes",
+ "encoding_rs",
+ "futures-channel",
+ "futures-core",
+ "futures-util",
+ "h2",
+ "http",
+ "http-body",
+ "http-body-util",
+ "hyper",
+ "hyper-rustls",
+ "hyper-tls",
+ "hyper-util",
+ "ipnet",
+ "js-sys",
+ "log",
+ "mime",
+ "native-tls",
+ "once_cell",
+ "percent-encoding",
+ "pin-project-lite",
+ "rustls-pemfile",
+ "serde",
+ "serde_json",
+ "serde_urlencoded",
+ "sync_wrapper",
+ "system-configuration",
+ "tokio",
+ "tokio-native-tls",
+ "tower",
+ "tower-service",
+ "url",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+ "windows-registry",
+]
+
+[[package]]
+name = "ring"
+version = "0.17.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
+dependencies = [
+ "cc",
+ "cfg-if",
+ "getrandom 0.2.15",
+ "libc",
+ "spin",
+ "untrusted",
+ "windows-sys 0.52.0",
+]
+
 [[package]]
 name = "rustc-demangle"
 version = "0.1.24"
@@ -825,9 +2275,24 @@ checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
 
 [[package]]
 name = "rustc-hash"
-version = "2.1.0"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7fb8039b3032c191086b10f11f319a6e99e1e82889c5cc6046f515c9db1d497"
+checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
+
+[[package]]
+name = "rustc-hash"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
+
+[[package]]
+name = "rustc_version"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
+dependencies = [
+ "semver 0.9.0",
+]
 
 [[package]]
 name = "rustix"
@@ -839,15 +2304,81 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys",
+ "windows-sys 0.59.0",
 ]
 
+[[package]]
+name = "rustls"
+version = "0.23.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fb9263ab4eb695e42321db096e3b8fbd715a59b154d5c88d82db2175b681ba7"
+dependencies = [
+ "once_cell",
+ "rustls-pki-types",
+ "rustls-webpki",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "rustls-pemfile"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50"
+dependencies = [
+ "rustls-pki-types",
+]
+
+[[package]]
+name = "rustls-pki-types"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "917ce264624a4b4db1c364dcc35bfca9ded014d0a958cd47ad3e960e988ea51c"
+
+[[package]]
+name = "rustls-webpki"
+version = "0.102.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9"
+dependencies = [
+ "ring",
+ "rustls-pki-types",
+ "untrusted",
+]
+
+[[package]]
+name = "rustversion"
+version = "1.0.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4"
+
 [[package]]
 name = "ryu"
 version = "1.0.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6ea1a2d0a644769cc99faa24c3ad26b379b786fe7c36fd3c546254801650e6dd"
 
+[[package]]
+name = "ryu-js"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad97d4ce1560a5e27cec89519dc8300d1aa6035b099821261c651486a19e44d5"
+
+[[package]]
+name = "schannel"
+version = "0.1.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d"
+dependencies = [
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "scoped-tls"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
+
 [[package]]
 name = "scopeguard"
 version = "1.2.0"
@@ -875,12 +2406,59 @@ dependencies = [
  "cc",
 ]
 
+[[package]]
+name = "security-framework"
+version = "2.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
+dependencies = [
+ "bitflags",
+ "core-foundation",
+ "core-foundation-sys",
+ "libc",
+ "security-framework-sys",
+]
+
+[[package]]
+name = "security-framework-sys"
+version = "2.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
 [[package]]
 name = "self_cell"
 version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c2fdfc24bc566f839a2da4c4295b82db7d25a24253867d5c64355abb5799bdbe"
 
+[[package]]
+name = "semver"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
+dependencies = [
+ "semver-parser",
+]
+
+[[package]]
+name = "semver"
+version = "1.0.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f79dfe2d285b0488816f30e700a7438c5a73d816b5b7d3ac72fbc48b0d185e03"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "semver-parser"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
+
 [[package]]
 name = "serde"
 version = "1.0.217"
@@ -913,6 +2491,39 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "serde_path_to_error"
+version = "0.1.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af99884400da37c88f5e9146b7f1fd0fbcae8f6eec4e9da38b67d05486f814a6"
+dependencies = [
+ "itoa",
+ "serde",
+]
+
+[[package]]
+name = "serde_urlencoded"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
+dependencies = [
+ "form_urlencoded",
+ "itoa",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "sha1"
+version = "0.10.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest",
+]
+
 [[package]]
 name = "sharded-slab"
 version = "0.1.7"
@@ -928,12 +2539,143 @@ version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 
+[[package]]
+name = "signal-hook-registry"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "simd-abstraction"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9cadb29c57caadc51ff8346233b5cec1d240b68ce55cf1afc764818791876987"
+dependencies = [
+ "outref",
+]
+
+[[package]]
+name = "siphasher"
+version = "0.3.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
+
+[[package]]
+name = "siphasher"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d"
+
+[[package]]
+name = "slab"
+version = "0.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
+dependencies = [
+ "autocfg",
+]
+
 [[package]]
 name = "smallvec"
 version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
+[[package]]
+name = "smartstring"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fb72c633efbaa2dd666986505016c32c3044395ceaf881518399d2f4127ee29"
+dependencies = [
+ "autocfg",
+ "static_assertions",
+ "version_check",
+]
+
+[[package]]
+name = "socket2"
+version = "0.5.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8"
+dependencies = [
+ "libc",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "sourcemap"
+version = "9.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "27c4ea7042fd1a155ad95335b5d505ab00d5124ea0332a06c8390d200bb1a76a"
+dependencies = [
+ "base64-simd",
+ "bitvec",
+ "data-encoding",
+ "debugid",
+ "if_chain",
+ "rustc-hash 1.1.0",
+ "rustc_version",
+ "serde",
+ "serde_json",
+ "unicode-id-start",
+ "url",
+]
+
+[[package]]
+name = "spin"
+version = "0.9.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
+
+[[package]]
+name = "st-map"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8257dd592de7614be71a2342d36ba2d527ddad3f9a0c8d09d6ceed4c371531e4"
+dependencies = [
+ "arrayvec",
+ "static-map-macro",
+]
+
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+
+[[package]]
+name = "stacker"
+version = "0.1.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "799c883d55abdb5e98af1a7b3f23b9b6de8ecada0ecac058672d7635eb48ca7b"
+dependencies = [
+ "cc",
+ "cfg-if",
+ "libc",
+ "psm",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "static-map-macro"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "710e9696ef338691287aeb937ee6ffe60022f579d3c8d2fd9d58973a9a10a466"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "static_assertions"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
+
 [[package]]
 name = "std-semaphore"
 version = "0.1.0"
@@ -948,6 +2690,18 @@ dependencies = [
  "zerocopy 0.8.16",
 ]
 
+[[package]]
+name = "string_enum"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c9fe66b8ee349846ce2f9557a26b8f1e74843c4a13fb381f9a3d73617a5f956a"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "swc_macros_common",
+ "syn 2.0.98",
+]
+
 [[package]]
 name = "struct_iterable"
 version = "0.1.2"
@@ -968,6 +2722,976 @@ dependencies = [
 name = "struct_iterable_internal"
 version = "0.1.1"
 
+[[package]]
+name = "subtle"
+version = "2.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
+
+[[package]]
+name = "swc"
+version = "13.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4107d56ba60c3b965d50cbd26762530553f6ab3fb98aeea917c75ee08c81c346"
+dependencies = [
+ "anyhow",
+ "base64 0.21.7",
+ "dashmap 5.5.3",
+ "either",
+ "indexmap",
+ "jsonc-parser",
+ "lru",
+ "once_cell",
+ "parking_lot",
+ "pathdiff",
+ "regex",
+ "rustc-hash 2.1.1",
+ "serde",
+ "serde_json",
+ "sourcemap",
+ "swc_atoms",
+ "swc_cached",
+ "swc_common",
+ "swc_compiler_base",
+ "swc_config",
+ "swc_ecma_ast",
+ "swc_ecma_codegen",
+ "swc_ecma_ext_transforms",
+ "swc_ecma_lints",
+ "swc_ecma_loader",
+ "swc_ecma_minifier",
+ "swc_ecma_parser",
+ "swc_ecma_preset_env",
+ "swc_ecma_transforms",
+ "swc_ecma_transforms_base",
+ "swc_ecma_transforms_compat",
+ "swc_ecma_transforms_optimization",
+ "swc_ecma_utils",
+ "swc_ecma_visit",
+ "swc_error_reporters",
+ "swc_node_comments",
+ "swc_timer",
+ "swc_transform_common",
+ "swc_typescript",
+ "swc_visit",
+ "tracing",
+ "url",
+]
+
+[[package]]
+name = "swc_allocator"
+version = "3.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a1f988452cab8c4e25776e5a855ba088cdb38fbe9714f9b9d2a6ff345824858"
+dependencies = [
+ "bumpalo",
+ "hashbrown 0.14.5",
+ "ptr_meta",
+ "rustc-hash 2.1.1",
+ "triomphe",
+]
+
+[[package]]
+name = "swc_atoms"
+version = "3.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "31b770be7f8c626633841a0408e2b66b0d6a395a5a0a565a1591f15dc05af8d3"
+dependencies = [
+ "hstr",
+ "once_cell",
+ "rustc-hash 2.1.1",
+ "serde",
+]
+
+[[package]]
+name = "swc_cached"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7133338c3bef796430deced151b0eaa5430710a90e38da19e8e3045e8e36eeb"
+dependencies = [
+ "anyhow",
+ "dashmap 5.5.3",
+ "once_cell",
+ "regex",
+ "rustc-hash 2.1.1",
+ "serde",
+]
+
+[[package]]
+name = "swc_common"
+version = "6.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa92d673f12585e950300d3d397eefd2da9effe3373d7882f46b35b0f9ef9cec"
+dependencies = [
+ "ast_node",
+ "better_scoped_tls",
+ "cfg-if",
+ "either",
+ "from_variant",
+ "new_debug_unreachable",
+ "num-bigint",
+ "once_cell",
+ "parking_lot",
+ "rustc-hash 2.1.1",
+ "serde",
+ "siphasher 0.3.11",
+ "sourcemap",
+ "swc_allocator",
+ "swc_atoms",
+ "swc_eq_ignore_macros",
+ "swc_visit",
+ "tracing",
+ "unicode-width",
+ "url",
+]
+
+[[package]]
+name = "swc_compiler_base"
+version = "11.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c126a0562e58c04cc7e8600ea375bc96473a0dd4733e0708de4b58164d5a3ec1"
+dependencies = [
+ "anyhow",
+ "base64 0.21.7",
+ "once_cell",
+ "pathdiff",
+ "rustc-hash 2.1.1",
+ "serde",
+ "serde_json",
+ "sourcemap",
+ "swc_allocator",
+ "swc_atoms",
+ "swc_common",
+ "swc_config",
+ "swc_ecma_ast",
+ "swc_ecma_codegen",
+ "swc_ecma_minifier",
+ "swc_ecma_parser",
+ "swc_ecma_visit",
+ "swc_timer",
+]
+
+[[package]]
+name = "swc_config"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb63364aebd1a8490a80fa8933825c6916d4df55d5472312d5adb62c9fb4e4ba"
+dependencies = [
+ "anyhow",
+ "indexmap",
+ "serde",
+ "serde_json",
+ "sourcemap",
+ "swc_cached",
+ "swc_config_macro",
+]
+
+[[package]]
+name = "swc_config_macro"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f2ebd37ef52a8555c8c9be78b694d64adcb5e3bc16c928f030d82f1d65fac57"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "swc_macros_common",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "swc_ecma_ast"
+version = "6.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d16cd007587c1cccaabe76ad640a59a05e51fed0ec4c0600b8ed6f26c9be2ec"
+dependencies = [
+ "bitflags",
+ "is-macro",
+ "num-bigint",
+ "phf",
+ "scoped-tls",
+ "serde",
+ "string_enum",
+ "swc_atoms",
+ "swc_common",
+ "swc_visit",
+ "unicode-id-start",
+]
+
+[[package]]
+name = "swc_ecma_codegen"
+version = "6.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ab1c30908a59fa1f103b7f2ae0b2788271d05c2a9d4f174e44cca4367aa6d7d"
+dependencies = [
+ "ascii",
+ "memchr",
+ "num-bigint",
+ "once_cell",
+ "regex",
+ "rustc-hash 2.1.1",
+ "serde",
+ "sourcemap",
+ "swc_allocator",
+ "swc_atoms",
+ "swc_common",
+ "swc_ecma_ast",
+ "swc_ecma_codegen_macros",
+ "tracing",
+]
+
+[[package]]
+name = "swc_ecma_codegen_macros"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f9a42f479a6475647e248fa9750982c87cd985e19d1016a1fc18a70682305d1"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "swc_macros_common",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "swc_ecma_compat_bugfixes"
+version = "9.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f08d54d4480e63535bf8aa2f56e5e43e682e02c703d2dd419aefca20c991c167"
+dependencies = [
+ "rustc-hash 2.1.1",
+ "swc_atoms",
+ "swc_common",
+ "swc_ecma_ast",
+ "swc_ecma_compat_es2015",
+ "swc_ecma_transforms_base",
+ "swc_ecma_utils",
+ "swc_ecma_visit",
+ "swc_trace_macro",
+ "tracing",
+]
+
+[[package]]
+name = "swc_ecma_compat_common"
+version = "9.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df57bb8d6477c81459e892aa4427e54b231abc675d32d1b1981978331b9e5505"
+dependencies = [
+ "swc_common",
+ "swc_ecma_ast",
+ "swc_ecma_utils",
+ "swc_ecma_visit",
+ "swc_trace_macro",
+]
+
+[[package]]
+name = "swc_ecma_compat_es2015"
+version = "9.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e043d59b56f54f5799e6a04400286804434f39feba82dc7f00fe870d122caa55"
+dependencies = [
+ "arrayvec",
+ "indexmap",
+ "is-macro",
+ "rustc-hash 2.1.1",
+ "serde",
+ "serde_derive",
+ "smallvec",
+ "swc_atoms",
+ "swc_common",
+ "swc_config",
+ "swc_ecma_ast",
+ "swc_ecma_compat_common",
+ "swc_ecma_transforms_base",
+ "swc_ecma_transforms_classes",
+ "swc_ecma_transforms_macros",
+ "swc_ecma_utils",
+ "swc_ecma_visit",
+ "swc_trace_macro",
+ "tracing",
+]
+
+[[package]]
+name = "swc_ecma_compat_es2016"
+version = "9.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cedbafaa7ec38e076cf43e53894b2e40cc3876e17c2bd740b41082a81c3964c8"
+dependencies = [
+ "swc_atoms",
+ "swc_common",
+ "swc_ecma_ast",
+ "swc_ecma_transforms_base",
+ "swc_ecma_transforms_macros",
+ "swc_ecma_utils",
+ "swc_ecma_visit",
+ "swc_trace_macro",
+ "tracing",
+]
+
+[[package]]
+name = "swc_ecma_compat_es2017"
+version = "9.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d5077ba72189a26f4a074d226df5ca92af5df49a4f85324ff6f71fce676b60e"
+dependencies = [
+ "serde",
+ "swc_atoms",
+ "swc_common",
+ "swc_ecma_ast",
+ "swc_ecma_transforms_base",
+ "swc_ecma_transforms_macros",
+ "swc_ecma_utils",
+ "swc_ecma_visit",
+ "swc_trace_macro",
+ "tracing",
+]
+
+[[package]]
+name = "swc_ecma_compat_es2018"
+version = "9.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "634385e806b12cad22eb0a4a62a100583d0d5ea81cda605f49dedd3b637d8bc7"
+dependencies = [
+ "serde",
+ "swc_atoms",
+ "swc_common",
+ "swc_ecma_ast",
+ "swc_ecma_compat_common",
+ "swc_ecma_transforms_base",
+ "swc_ecma_transforms_macros",
+ "swc_ecma_utils",
+ "swc_ecma_visit",
+ "swc_trace_macro",
+ "tracing",
+]
+
+[[package]]
+name = "swc_ecma_compat_es2019"
+version = "9.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c603b3b07d12f800ce5fe6b4d157dde14d9315b9b2e3576deebd99a310adfdb"
+dependencies = [
+ "swc_atoms",
+ "swc_common",
+ "swc_ecma_ast",
+ "swc_ecma_transforms_base",
+ "swc_ecma_utils",
+ "swc_ecma_visit",
+ "swc_trace_macro",
+ "tracing",
+]
+
+[[package]]
+name = "swc_ecma_compat_es2020"
+version = "10.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e13b59539620b1ddca8ab3e9b3747bc8358fc3b4a9c88390051135591ba86608"
+dependencies = [
+ "serde",
+ "swc_atoms",
+ "swc_common",
+ "swc_ecma_ast",
+ "swc_ecma_compat_es2022",
+ "swc_ecma_transforms_base",
+ "swc_ecma_utils",
+ "swc_ecma_visit",
+ "swc_trace_macro",
+ "tracing",
+]
+
+[[package]]
+name = "swc_ecma_compat_es2021"
+version = "9.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a96de895205bfccbc722d9449e70b0feae79950ab95c2d0115139433d649d06"
+dependencies = [
+ "swc_atoms",
+ "swc_common",
+ "swc_ecma_ast",
+ "swc_ecma_transforms_base",
+ "swc_ecma_utils",
+ "swc_ecma_visit",
+ "swc_trace_macro",
+ "tracing",
+]
+
+[[package]]
+name = "swc_ecma_compat_es2022"
+version = "10.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55de1bcd911804365e7f12d0f32ea38874cee7d8f5c44b17b0d05410094ef214"
+dependencies = [
+ "rustc-hash 2.1.1",
+ "swc_atoms",
+ "swc_common",
+ "swc_ecma_ast",
+ "swc_ecma_compat_common",
+ "swc_ecma_transforms_base",
+ "swc_ecma_transforms_classes",
+ "swc_ecma_transforms_macros",
+ "swc_ecma_utils",
+ "swc_ecma_visit",
+ "swc_trace_macro",
+ "tracing",
+]
+
+[[package]]
+name = "swc_ecma_compat_es3"
+version = "9.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "82b09b355fb9995927fc7ad262a8384574a8c920d6869b4f12810bcfedacf6d8"
+dependencies = [
+ "swc_common",
+ "swc_ecma_ast",
+ "swc_ecma_transforms_base",
+ "swc_ecma_utils",
+ "swc_ecma_visit",
+ "swc_trace_macro",
+ "tracing",
+]
+
+[[package]]
+name = "swc_ecma_ext_transforms"
+version = "9.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc517764142a071eac496aeb5e0ad910db3d27bbd57fbc2de1a0a50172179189"
+dependencies = [
+ "phf",
+ "swc_atoms",
+ "swc_common",
+ "swc_ecma_ast",
+ "swc_ecma_utils",
+ "swc_ecma_visit",
+]
+
+[[package]]
+name = "swc_ecma_lints"
+version = "9.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb3d14aa9c8a6adbacbf8cb072387b4dc445b8bc51a8009257d782890431f0c4"
+dependencies = [
+ "auto_impl",
+ "dashmap 5.5.3",
+ "parking_lot",
+ "regex",
+ "rustc-hash 2.1.1",
+ "serde",
+ "swc_atoms",
+ "swc_common",
+ "swc_config",
+ "swc_ecma_ast",
+ "swc_ecma_utils",
+ "swc_ecma_visit",
+ "swc_parallel",
+]
+
+[[package]]
+name = "swc_ecma_loader"
+version = "6.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd99e5ef9cbecc33e8e199ad060d2af0a28ab0c2340eb37a7d4ba17fa59576d4"
+dependencies = [
+ "anyhow",
+ "dashmap 5.5.3",
+ "lru",
+ "normpath",
+ "once_cell",
+ "parking_lot",
+ "path-clean 0.1.0",
+ "pathdiff",
+ "rustc-hash 2.1.1",
+ "serde",
+ "serde_json",
+ "swc_atoms",
+ "swc_cached",
+ "swc_common",
+ "tracing",
+]
+
+[[package]]
+name = "swc_ecma_minifier"
+version = "10.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dac6648ce5f9dda34a683132771aa8be50c96ca89440cf8197d6f9ff019e9e47"
+dependencies = [
+ "arrayvec",
+ "indexmap",
+ "num-bigint",
+ "num_cpus",
+ "once_cell",
+ "parking_lot",
+ "phf",
+ "radix_fmt",
+ "regex",
+ "rustc-hash 2.1.1",
+ "ryu-js",
+ "serde",
+ "serde_json",
+ "swc_allocator",
+ "swc_atoms",
+ "swc_common",
+ "swc_config",
+ "swc_ecma_ast",
+ "swc_ecma_codegen",
+ "swc_ecma_parser",
+ "swc_ecma_transforms_base",
+ "swc_ecma_transforms_optimization",
+ "swc_ecma_usage_analyzer",
+ "swc_ecma_utils",
+ "swc_ecma_visit",
+ "swc_parallel",
+ "swc_timer",
+ "tracing",
+]
+
+[[package]]
+name = "swc_ecma_parser"
+version = "8.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d99556f20b91452fa4c6da1891f90e58998e89842d6321bb7326ebfe81c37dca"
+dependencies = [
+ "either",
+ "new_debug_unreachable",
+ "num-bigint",
+ "num-traits",
+ "phf",
+ "rustc-hash 2.1.1",
+ "serde",
+ "smallvec",
+ "smartstring",
+ "stacker",
+ "swc_atoms",
+ "swc_common",
+ "swc_ecma_ast",
+ "tracing",
+ "typed-arena",
+]
+
+[[package]]
+name = "swc_ecma_preset_env"
+version = "11.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22b32544046c3eb22865e0ca5d01987652bf2792ced0e3c63c108aaa709613b8"
+dependencies = [
+ "anyhow",
+ "dashmap 5.5.3",
+ "indexmap",
+ "once_cell",
+ "preset_env_base",
+ "rustc-hash 2.1.1",
+ "semver 1.0.25",
+ "serde",
+ "serde_json",
+ "st-map",
+ "string_enum",
+ "swc_atoms",
+ "swc_common",
+ "swc_ecma_ast",
+ "swc_ecma_transforms",
+ "swc_ecma_utils",
+ "swc_ecma_visit",
+]
+
+[[package]]
+name = "swc_ecma_transforms"
+version = "11.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "059b8a22359b6cb5fbf942926935abf2faba898d337656fe9d6ffae37c7fa2d8"
+dependencies = [
+ "swc_atoms",
+ "swc_common",
+ "swc_ecma_ast",
+ "swc_ecma_transforms_base",
+ "swc_ecma_transforms_compat",
+ "swc_ecma_transforms_module",
+ "swc_ecma_transforms_optimization",
+ "swc_ecma_transforms_proposal",
+ "swc_ecma_transforms_react",
+ "swc_ecma_transforms_typescript",
+ "swc_ecma_utils",
+ "swc_ecma_visit",
+]
+
+[[package]]
+name = "swc_ecma_transforms_base"
+version = "9.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b696e003dd095ae8b8dba00f601040f756273c9af0fd67cb1c57115785cb5ec"
+dependencies = [
+ "better_scoped_tls",
+ "bitflags",
+ "indexmap",
+ "once_cell",
+ "phf",
+ "rustc-hash 2.1.1",
+ "serde",
+ "smallvec",
+ "swc_atoms",
+ "swc_common",
+ "swc_ecma_ast",
+ "swc_ecma_parser",
+ "swc_ecma_utils",
+ "swc_ecma_visit",
+ "swc_parallel",
+ "tracing",
+]
+
+[[package]]
+name = "swc_ecma_transforms_classes"
+version = "9.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22c0ccd085c481c3690b93db9e3e27658b7133192c9bf49b146f11c0180808e7"
+dependencies = [
+ "swc_atoms",
+ "swc_common",
+ "swc_ecma_ast",
+ "swc_ecma_transforms_base",
+ "swc_ecma_utils",
+ "swc_ecma_visit",
+]
+
+[[package]]
+name = "swc_ecma_transforms_compat"
+version = "10.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c933a35718a42dde2873120f0f4768d9054125e9c56f7b7223f35efac21bd76"
+dependencies = [
+ "arrayvec",
+ "indexmap",
+ "is-macro",
+ "num-bigint",
+ "serde",
+ "smallvec",
+ "swc_atoms",
+ "swc_common",
+ "swc_config",
+ "swc_ecma_ast",
+ "swc_ecma_compat_bugfixes",
+ "swc_ecma_compat_common",
+ "swc_ecma_compat_es2015",
+ "swc_ecma_compat_es2016",
+ "swc_ecma_compat_es2017",
+ "swc_ecma_compat_es2018",
+ "swc_ecma_compat_es2019",
+ "swc_ecma_compat_es2020",
+ "swc_ecma_compat_es2021",
+ "swc_ecma_compat_es2022",
+ "swc_ecma_compat_es3",
+ "swc_ecma_transforms_base",
+ "swc_ecma_transforms_classes",
+ "swc_ecma_transforms_macros",
+ "swc_ecma_utils",
+ "swc_ecma_visit",
+ "swc_trace_macro",
+ "tracing",
+]
+
+[[package]]
+name = "swc_ecma_transforms_macros"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6845dfb88569f3e8cd05901505916a8ebe98be3922f94769ca49f84e8ccec8f7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "swc_macros_common",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "swc_ecma_transforms_module"
+version = "10.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "461ad2212af7c681e46b4beb91ca25b84a29467f327cd0c09e33f5908b73384f"
+dependencies = [
+ "Inflector",
+ "anyhow",
+ "bitflags",
+ "indexmap",
+ "is-macro",
+ "path-clean 1.0.1",
+ "pathdiff",
+ "regex",
+ "rustc-hash 2.1.1",
+ "serde",
+ "swc_atoms",
+ "swc_cached",
+ "swc_common",
+ "swc_ecma_ast",
+ "swc_ecma_loader",
+ "swc_ecma_parser",
+ "swc_ecma_transforms_base",
+ "swc_ecma_utils",
+ "swc_ecma_visit",
+ "tracing",
+]
+
+[[package]]
+name = "swc_ecma_transforms_optimization"
+version = "9.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26d05cd8942bb58b4676d8189e82942504004555957cb87a563bc4938f2440ab"
+dependencies = [
+ "dashmap 5.5.3",
+ "indexmap",
+ "once_cell",
+ "petgraph",
+ "rustc-hash 2.1.1",
+ "serde_json",
+ "swc_atoms",
+ "swc_common",
+ "swc_ecma_ast",
+ "swc_ecma_parser",
+ "swc_ecma_transforms_base",
+ "swc_ecma_transforms_macros",
+ "swc_ecma_utils",
+ "swc_ecma_visit",
+ "swc_fast_graph",
+ "tracing",
+]
+
+[[package]]
+name = "swc_ecma_transforms_proposal"
+version = "9.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08f82905f3d824bbe0555961df6c0f19807c6460ce49b3ddafec49493dc95b3e"
+dependencies = [
+ "either",
+ "rustc-hash 2.1.1",
+ "serde",
+ "smallvec",
+ "swc_atoms",
+ "swc_common",
+ "swc_ecma_ast",
+ "swc_ecma_transforms_base",
+ "swc_ecma_transforms_classes",
+ "swc_ecma_transforms_macros",
+ "swc_ecma_utils",
+ "swc_ecma_visit",
+]
+
+[[package]]
+name = "swc_ecma_transforms_react"
+version = "9.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3dee5ef36740d62b3f69c777385067e0fe6e10fd87e4107e5495b74b15e0a0b7"
+dependencies = [
+ "base64 0.21.7",
+ "dashmap 5.5.3",
+ "indexmap",
+ "once_cell",
+ "rustc-hash 2.1.1",
+ "serde",
+ "sha1",
+ "string_enum",
+ "swc_allocator",
+ "swc_atoms",
+ "swc_common",
+ "swc_config",
+ "swc_ecma_ast",
+ "swc_ecma_parser",
+ "swc_ecma_transforms_base",
+ "swc_ecma_transforms_macros",
+ "swc_ecma_utils",
+ "swc_ecma_visit",
+]
+
+[[package]]
+name = "swc_ecma_transforms_typescript"
+version = "9.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "693f6e9683ae814930fa17f21b6915c795ab5d1883dd351753a18b689a78492f"
+dependencies = [
+ "once_cell",
+ "rustc-hash 2.1.1",
+ "ryu-js",
+ "serde",
+ "swc_atoms",
+ "swc_common",
+ "swc_ecma_ast",
+ "swc_ecma_transforms_base",
+ "swc_ecma_transforms_react",
+ "swc_ecma_utils",
+ "swc_ecma_visit",
+]
+
+[[package]]
+name = "swc_ecma_usage_analyzer"
+version = "10.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b2031aed05786c806c8092b16cafad791be16f28e7222a9db069320937c1eb9"
+dependencies = [
+ "indexmap",
+ "rustc-hash 2.1.1",
+ "swc_atoms",
+ "swc_common",
+ "swc_ecma_ast",
+ "swc_ecma_utils",
+ "swc_ecma_visit",
+ "swc_timer",
+ "tracing",
+]
+
+[[package]]
+name = "swc_ecma_utils"
+version = "9.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3c217edaa22c98537e09ed3189e723feed3d889eeb7e02a0b3d48cbb91ba7e4"
+dependencies = [
+ "indexmap",
+ "num_cpus",
+ "once_cell",
+ "rustc-hash 2.1.1",
+ "ryu-js",
+ "swc_atoms",
+ "swc_common",
+ "swc_ecma_ast",
+ "swc_ecma_visit",
+ "swc_parallel",
+ "tracing",
+ "unicode-id",
+]
+
+[[package]]
+name = "swc_ecma_visit"
+version = "6.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a32fb2902c01f9b4615605a4a3e67e0c928bd3b9f2182e764f1c9fe4130965cf"
+dependencies = [
+ "new_debug_unreachable",
+ "num-bigint",
+ "swc_atoms",
+ "swc_common",
+ "swc_ecma_ast",
+ "swc_visit",
+ "tracing",
+]
+
+[[package]]
+name = "swc_eq_ignore_macros"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e96e15288bf385ab85eb83cff7f9e2d834348da58d0a31b33bdb572e66ee413e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "swc_error_reporters"
+version = "7.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed21ea887faeb0dab190838d2331ed187f2a74d185c9fe7044d5092900a83d29"
+dependencies = [
+ "anyhow",
+ "miette",
+ "once_cell",
+ "parking_lot",
+ "swc_common",
+]
+
+[[package]]
+name = "swc_fast_graph"
+version = "7.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ebf3efc1b14392006675682cfb8bab282bf88dbdfee65235a81b8a7b30af805"
+dependencies = [
+ "indexmap",
+ "petgraph",
+ "rustc-hash 2.1.1",
+ "swc_common",
+]
+
+[[package]]
+name = "swc_macros_common"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a509f56fca05b39ba6c15f3e58636c3924c78347d63853632ed2ffcb6f5a0ac7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "swc_node_comments"
+version = "6.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca0fdc3b404de25c08d5ed201b54db27d39c5f41e0389b6231910c50e76b1682"
+dependencies = [
+ "dashmap 5.5.3",
+ "rustc-hash 2.1.1",
+ "swc_atoms",
+ "swc_common",
+]
+
+[[package]]
+name = "swc_parallel"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5f75f1094d69174ef628e3665fff0f81d58e9f568802e3c90d332c72b0b6026"
+dependencies = [
+ "once_cell",
+]
+
+[[package]]
+name = "swc_timer"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4db06b46cc832f7cf83c2ce21905fc465d01443a2bdccf63644383e1f5847532"
+dependencies = [
+ "tracing",
+]
+
+[[package]]
+name = "swc_trace_macro"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c78717a841565df57f811376a3d19c9156091c55175e12d378f3a522de70cef"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "swc_transform_common"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79319c2165695896119f0cb22847dedfb0bd7f77acd98dbc5bc1f081105db6f3"
+dependencies = [
+ "better_scoped_tls",
+ "once_cell",
+ "rustc-hash 2.1.1",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "swc_typescript"
+version = "8.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fbac6fb2bac25fd3b3aa49ad19001f5e6f7be1b9971dd34f8e7649f939e39c8"
+dependencies = [
+ "petgraph",
+ "rustc-hash 2.1.1",
+ "swc_atoms",
+ "swc_common",
+ "swc_ecma_ast",
+ "swc_ecma_utils",
+ "swc_ecma_visit",
+ "thiserror",
+]
+
+[[package]]
+name = "swc_visit"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9138b6a36bbe76dd6753c4c0794f7e26480ea757bee499738bedbbb3ae3ec5f3"
+dependencies = [
+ "either",
+ "new_debug_unreachable",
+]
+
 [[package]]
 name = "syn"
 version = "1.0.109"
@@ -991,17 +3715,94 @@ dependencies = [
 ]
 
 [[package]]
-name = "tempfile"
-version = "3.15.0"
+name = "sync_wrapper"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a8a559c81686f576e8cd0290cd2a24a2a9ad80c98b3478856500fcbd7acd704"
+checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263"
+dependencies = [
+ "futures-core",
+]
+
+[[package]]
+name = "synstructure"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "system-configuration"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b"
+dependencies = [
+ "bitflags",
+ "core-foundation",
+ "system-configuration-sys",
+]
+
+[[package]]
+name = "system-configuration-sys"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
+[[package]]
+name = "tap"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
+
+[[package]]
+name = "tempfile"
+version = "3.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38c246215d7d24f48ae091a2902398798e05d978b24315d6efbc00ede9a8bb91"
 dependencies = [
  "cfg-if",
  "fastrand",
- "getrandom",
+ "getrandom 0.3.1",
  "once_cell",
  "rustix",
- "windows-sys",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "textwrap"
+version = "0.16.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9"
+dependencies = [
+ "unicode-linebreak",
+ "unicode-width",
+]
+
+[[package]]
+name = "thiserror"
+version = "1.0.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -1014,16 +3815,148 @@ dependencies = [
  "once_cell",
 ]
 
+[[package]]
+name = "tinystr"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
+dependencies = [
+ "displaydoc",
+ "zerovec",
+]
+
+[[package]]
+name = "tokio"
+version = "1.43.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e"
+dependencies = [
+ "backtrace",
+ "bytes",
+ "libc",
+ "mio",
+ "parking_lot",
+ "pin-project-lite",
+ "signal-hook-registry",
+ "socket2",
+ "tokio-macros",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "tokio-macros"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "tokio-native-tls"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2"
+dependencies = [
+ "native-tls",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-rustls"
+version = "0.26.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f6d0975eaace0cf0fcadee4e4aaa5da15b5c079146f2cffb67c113be122bf37"
+dependencies = [
+ "rustls",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-util"
+version = "0.7.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7fcaa8d55a2bdd6b83ace262b016eca0d79ee02818c5c1bcdf0305114081078"
+dependencies = [
+ "bytes",
+ "futures-core",
+ "futures-sink",
+ "pin-project-lite",
+ "tokio",
+]
+
+[[package]]
+name = "tower"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9"
+dependencies = [
+ "futures-core",
+ "futures-util",
+ "pin-project-lite",
+ "sync_wrapper",
+ "tokio",
+ "tower-layer",
+ "tower-service",
+ "tracing",
+]
+
+[[package]]
+name = "tower-http"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "403fa3b783d4b626a8ad51d766ab03cb6d2dbfc46b1c5d4448395e6628dc9697"
+dependencies = [
+ "async-compression",
+ "bitflags",
+ "bytes",
+ "futures-core",
+ "http",
+ "http-body",
+ "pin-project-lite",
+ "tokio",
+ "tokio-util",
+ "tower-layer",
+ "tower-service",
+]
+
+[[package]]
+name = "tower-layer"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"
+
+[[package]]
+name = "tower-service"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
+
 [[package]]
 name = "tracing"
 version = "0.1.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
 dependencies = [
+ "log",
  "pin-project-lite",
+ "tracing-attributes",
  "tracing-core",
 ]
 
+[[package]]
+name = "tracing-attributes"
+version = "0.1.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+]
+
 [[package]]
 name = "tracing-core"
 version = "0.1.33"
@@ -1055,12 +3988,99 @@ dependencies = [
  "tracing-core",
 ]
 
+[[package]]
+name = "triomphe"
+version = "0.1.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef8f7726da4807b58ea5c96fdc122f80702030edc33b35aff9190a51148ccc85"
+dependencies = [
+ "serde",
+ "stable_deref_trait",
+]
+
+[[package]]
+name = "try-lock"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
+
+[[package]]
+name = "typed-arena"
+version = "2.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a"
+
+[[package]]
+name = "typenum"
+version = "1.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
+
+[[package]]
+name = "unicode-id"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "10103c57044730945224467c09f71a4db0071c123a0648cc3e818913bde6b561"
+
+[[package]]
+name = "unicode-id-start"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f322b60f6b9736017344fa0635d64be2f458fbc04eef65f6be22976dd1ffd5b"
+
 [[package]]
 name = "unicode-ident"
 version = "1.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a210d160f08b701c8721ba1c726c11662f877ea6b7094007e1ca9a1041945034"
 
+[[package]]
+name = "unicode-linebreak"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f"
+
+[[package]]
+name = "unicode-width"
+version = "0.1.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
+
+[[package]]
+name = "untrusted"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
+
+[[package]]
+name = "url"
+version = "2.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60"
+dependencies = [
+ "form_urlencoded",
+ "idna",
+ "percent-encoding",
+]
+
+[[package]]
+name = "utf16_iter"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
+
+[[package]]
+name = "utf8_iter"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
+
+[[package]]
+name = "uuid"
+version = "1.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ced87ca4be083373936a67f8de945faa23b6b42384bd5b64434850802c6dccd0"
+
 [[package]]
 name = "valuable"
 version = "0.1.1"
@@ -1069,16 +4089,17 @@ checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65"
 
 [[package]]
 name = "value-log"
-version = "1.4.1"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f90495556d09c3026f7f3897f8a7db59c8c701082e32dcf58c2319062ae1eb0"
+checksum = "addf12a5bb88dbd4a006b59c2da6d5091c6e4440ab9e8e9e6cc4b2357b43a842"
 dependencies = [
  "byteorder",
+ "byteview",
+ "interval-heap",
  "log",
- "min-max-heap",
  "path-absolutize",
  "quick_cache",
- "rustc-hash",
+ "rustc-hash 2.1.1",
  "tempfile",
  "xxhash-rust",
 ]
@@ -1089,12 +4110,193 @@ version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f54a172d0620933a27a4360d3db3e2ae0dd6cceae9730751a036bbf182c4b23"
 
+[[package]]
+name = "vcpkg"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
+
+[[package]]
+name = "version_check"
+version = "0.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
+
+[[package]]
+name = "want"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e"
+dependencies = [
+ "try-lock",
+]
+
 [[package]]
 name = "wasi"
 version = "0.11.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
+[[package]]
+name = "wasi"
+version = "0.13.3+wasi-0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26816d2e1a4a36a2940b96c5296ce403917633dff8f3440e9b236ed6f6bacad2"
+dependencies = [
+ "wit-bindgen-rt",
+]
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.100"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+ "rustversion",
+ "wasm-bindgen-macro",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.100"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
+dependencies = [
+ "bumpalo",
+ "log",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-futures"
+version = "0.4.50"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61"
+dependencies = [
+ "cfg-if",
+ "js-sys",
+ "once_cell",
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.100"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.100"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.100"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "web-sys"
+version = "0.3.77"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "windows-core"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-registry"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0"
+dependencies = [
+ "windows-result",
+ "windows-strings",
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-result"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-strings"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10"
+dependencies = [
+ "windows-result",
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets",
+]
+
 [[package]]
 name = "windows-sys"
 version = "0.59.0"
@@ -1168,12 +4370,66 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
+[[package]]
+name = "wit-bindgen-rt"
+version = "0.33.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c"
+dependencies = [
+ "bitflags",
+]
+
+[[package]]
+name = "write16"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
+
+[[package]]
+name = "writeable"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
+
+[[package]]
+name = "wyz"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed"
+dependencies = [
+ "tap",
+]
+
 [[package]]
 name = "xxhash-rust"
 version = "0.8.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fdd20c5420375476fbd4394763288da7eb0cc0b8c11deed431a91562af7335d3"
 
+[[package]]
+name = "yoke"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40"
+dependencies = [
+ "serde",
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
+]
+
+[[package]]
+name = "yoke-derive"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+ "synstructure",
+]
+
 [[package]]
 name = "zerocopy"
 version = "0.7.35"
@@ -1214,3 +4470,80 @@ dependencies = [
  "quote",
  "syn 2.0.98",
 ]
+
+[[package]]
+name = "zerofrom"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e"
+dependencies = [
+ "zerofrom-derive",
+]
+
+[[package]]
+name = "zerofrom-derive"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+ "synstructure",
+]
+
+[[package]]
+name = "zeroize"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
+
+[[package]]
+name = "zerovec"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
+dependencies = [
+ "yoke",
+ "zerofrom",
+ "zerovec-derive",
+]
+
+[[package]]
+name = "zerovec-derive"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "zstd"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9"
+dependencies = [
+ "zstd-safe",
+]
+
+[[package]]
+name = "zstd-safe"
+version = "7.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "54a3ab4db68cea366acc5c897c7b4d4d1b8994a9cd6e6f841f8964566a419059"
+dependencies = [
+ "zstd-sys",
+]
+
+[[package]]
+name = "zstd-sys"
+version = "2.0.13+zstd.1.5.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa"
+dependencies = [
+ "cc",
+ "pkg-config",
+]
diff --git a/Cargo.toml b/Cargo.toml
index c069e0bee..c20d580bc 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -4,22 +4,24 @@ members = [
     "exit",
     "indexer",
     "iterator",
+    "server",
     "storable_vec",
     "struct_iterable",
 ]
 resolver = "2"
 
 [workspace.dependencies]
-bindex = { path = "indexer" }
 bitcoin = { version = "0.32.5", features = ["serde"] }
-biter = { path = "iterator" }
-bomputer = { path = "computer" }
 color-eyre = "0.6.3"
+computer = { path = "computer", package = "bomputer" }
 derive_deref = "1.1.1"
 exit = { path = "exit" }
 fjall = "2.5.0"
+indexer = { path = "indexer", package = "bindex" }
+iterator = { path = "iterator", package = "biter" }
 jiff = "0.1.29"
 rayon = "1.10.0"
+server = { path = "server" }
 storable_vec = { path = "storable_vec" }
 struct_iterable = { path = "struct_iterable" }
-zerocopy = { version = "0.8.15", features = ["derive"] }
+zerocopy = { version = "0.8.16", features = ["derive"] }
diff --git a/computer/Cargo.toml b/computer/Cargo.toml
index 5ff3bb781..0d0f44e26 100644
--- a/computer/Cargo.toml
+++ b/computer/Cargo.toml
@@ -4,12 +4,12 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-bindex = { workspace = true }
-biter = { workspace = true }
+iterator = { workspace = true }
 color-eyre = { workspace = true }
 derive_deref = { workspace = true }
 exit = { workspace = true }
 fjall = { workspace = true }
+indexer = { workspace = true }
 jiff = { workspace = true }
 storable_vec = { workspace = true }
 zerocopy = { workspace = true }
diff --git a/computer/src/lib.rs b/computer/src/lib.rs
index ff656d32c..7a2a807c8 100644
--- a/computer/src/lib.rs
+++ b/computer/src/lib.rs
@@ -1,8 +1,8 @@
 use std::path::{Path, PathBuf};
 
-use bindex::Indexer;
-use biter::rpc;
 use exit::Exit;
+use indexer::Indexer;
+use iterator::rpc;
 
 mod storage;
 mod structs;
@@ -89,10 +89,10 @@ impl Computer<SINGLE_THREAD> {
             &mut indexer.vecs.height_to_first_txindex,
         )?;
 
-        self.vecs.txindex_to_fee.compute_transform(
-            &mut self.vecs.txindex_to_height,
-            &mut indexer.vecs.height_to_first_txindex,
-        )?;
+        // self.vecs.txindex_to_fee.compute_transform(
+        //     &mut self.vecs.txindex_to_height,
+        //     &mut indexer.vecs.height_to_first_txindex,
+        // )?;
 
         let date_count = self.vecs.height_to_date.len();
 
diff --git a/computer/src/main.rs b/computer/src/main.rs
index d6c4fd584..aac39505c 100644
--- a/computer/src/main.rs
+++ b/computer/src/main.rs
@@ -1,8 +1,8 @@
 use std::path::Path;
 
-use biter::rpc;
 use bomputer::Computer;
 use exit::Exit;
+use iterator::rpc;
 use storable_vec::SINGLE_THREAD;
 
 mod structs;
diff --git a/computer/src/storage/fjalls.rs b/computer/src/storage/fjalls.rs
index 9ba82cd4a..304ab0bc5 100644
--- a/computer/src/storage/fjalls.rs
+++ b/computer/src/storage/fjalls.rs
@@ -1,6 +1,6 @@
 use std::path::Path;
 
-use bindex::Store;
+use indexer::Store;
 use storable_vec::Version;
 
 use crate::structs::{AddressindexTxoutindex, Unit};
diff --git a/computer/src/storage/storable_vecs.rs b/computer/src/storage/storable_vecs.rs
index 0a78610fd..131a34f04 100644
--- a/computer/src/storage/storable_vecs.rs
+++ b/computer/src/storage/storable_vecs.rs
@@ -1,6 +1,6 @@
 use std::{fs, path::Path};
 
-use bindex::{Addressindex, Amount, Height, Timestamp, Txindex, Txinindex, Txoutindex};
+use indexer::{Addressindex, Amount, Height, Timestamp, Txindex, Txinindex, Txoutindex};
 use storable_vec::{StorableVec, Version};
 
 use crate::structs::{Date, Feerate};
diff --git a/computer/src/structs/addressindextxoutindex.rs b/computer/src/structs/addressindextxoutindex.rs
index ebaab0bae..3902528e7 100644
--- a/computer/src/structs/addressindextxoutindex.rs
+++ b/computer/src/structs/addressindextxoutindex.rs
@@ -1,5 +1,5 @@
-use bindex::{Addressindex, Txoutindex};
 use fjall::Slice;
+use indexer::{Addressindex, Txoutindex};
 use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout};
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Immutable, IntoBytes, KnownLayout, FromBytes)]
diff --git a/computer/src/structs/date.rs b/computer/src/structs/date.rs
index 3ae799946..583389450 100644
--- a/computer/src/structs/date.rs
+++ b/computer/src/structs/date.rs
@@ -1,7 +1,7 @@
 use std::ops::Add;
 
-use bindex::Timestamp;
 use color_eyre::eyre::eyre;
+use indexer::Timestamp;
 use jiff::{civil::Date as Date_, tz::TimeZone, Span};
 use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout};
 
diff --git a/indexer/Cargo.lock b/indexer/Cargo.lock
deleted file mode 100644
index 2b724651b..000000000
--- a/indexer/Cargo.lock
+++ /dev/null
@@ -1,1065 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 4
-
-[[package]]
-name = "addr2line"
-version = "0.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
-dependencies = [
- "gimli",
-]
-
-[[package]]
-name = "adler"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
-
-[[package]]
-name = "arrayvec"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
-
-[[package]]
-name = "autocfg"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
-
-[[package]]
-name = "backtrace"
-version = "0.3.71"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d"
-dependencies = [
- "addr2line",
- "cc",
- "cfg-if",
- "libc",
- "miniz_oxide",
- "object",
- "rustc-demangle",
-]
-
-[[package]]
-name = "base58ck"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c8d66485a3a2ea485c1913c4572ce0256067a5377ac8c75c4960e1cda98605f"
-dependencies = [
- "bitcoin-internals 0.3.0",
- "bitcoin_hashes 0.14.0",
-]
-
-[[package]]
-name = "base64"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
-
-[[package]]
-name = "bech32"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d965446196e3b7decd44aa7ee49e31d630118f90ef12f97900f262eb915c951d"
-
-[[package]]
-name = "bindex"
-version = "0.1.0"
-dependencies = [
- "bitcoin_hashes 0.16.0",
- "biter",
- "color-eyre",
- "ctrlc",
- "derive_deref",
- "jiff",
- "rayon",
- "snkrj",
- "storable_vec",
-]
-
-[[package]]
-name = "bitcoin"
-version = "0.32.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce6bc65742dea50536e35ad42492b234c27904a27f0abdcbce605015cb4ea026"
-dependencies = [
- "base58ck",
- "bech32",
- "bitcoin-internals 0.3.0",
- "bitcoin-io 0.1.3",
- "bitcoin-units",
- "bitcoin_hashes 0.14.0",
- "hex-conservative 0.2.1",
- "hex_lit",
- "secp256k1",
- "serde",
-]
-
-[[package]]
-name = "bitcoin-internals"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30bdbe14aa07b06e6cfeffc529a1f099e5fbe249524f8125358604df99a4bed2"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "bitcoin-internals"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b854212e29b96c8f0fe04cab11d57586c8f3257de0d146c76cb3b42b3eb9118"
-
-[[package]]
-name = "bitcoin-io"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b47c4ab7a93edb0c7198c5535ed9b52b63095f4e9b45279c6736cec4b856baf"
-
-[[package]]
-name = "bitcoin-io"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26792cd2bf245069a1c5acb06aa7ad7abe1de69b507c90b490bca81e0665d0ee"
-dependencies = [
- "bitcoin-internals 0.4.0",
-]
-
-[[package]]
-name = "bitcoin-units"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5285c8bcaa25876d07f37e3d30c303f2609179716e11d688f51e8f1fe70063e2"
-dependencies = [
- "bitcoin-internals 0.3.0",
- "serde",
-]
-
-[[package]]
-name = "bitcoin_hashes"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb18c03d0db0247e147a21a6faafd5a7eb851c743db062de72018b6b7e8e4d16"
-dependencies = [
- "bitcoin-io 0.1.3",
- "hex-conservative 0.2.1",
- "serde",
-]
-
-[[package]]
-name = "bitcoin_hashes"
-version = "0.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e5d09f16329cd545d7e6008b2c6b2af3a90bc678cf41ac3d2f6755943301b16"
-dependencies = [
- "bitcoin-io 0.2.0",
- "hex-conservative 0.3.0",
-]
-
-[[package]]
-name = "bitcoincore-rpc"
-version = "0.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aedd23ae0fd321affb4bbbc36126c6f49a32818dc6b979395d24da8c9d4e80ee"
-dependencies = [
- "bitcoincore-rpc-json",
- "jsonrpc",
- "log",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "bitcoincore-rpc-json"
-version = "0.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8909583c5fab98508e80ef73e5592a651c954993dc6b7739963257d19f0e71a"
-dependencies = [
- "bitcoin",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "biter"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02527a2b7944d9edc90db0a73339c57cd521f9623f99416574d1943312c9d290"
-dependencies = [
- "bitcoin",
- "bitcoincore-rpc",
- "crossbeam",
- "derived-deref",
- "rayon",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "bitflags"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-
-[[package]]
-name = "bitflags"
-version = "2.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
-
-[[package]]
-name = "byteorder"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
-
-[[package]]
-name = "cc"
-version = "1.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9157bbaa6b165880c27a4293a474c91cdcf265cc68cc829bf10be0964a391caf"
-dependencies = [
- "shlex",
-]
-
-[[package]]
-name = "cfg-if"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-
-[[package]]
-name = "cfg_aliases"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
-
-[[package]]
-name = "color-eyre"
-version = "0.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55146f5e46f237f7423d74111267d4597b59b0dad0ffaf7303bce9945d843ad5"
-dependencies = [
- "backtrace",
- "color-spantrace",
- "eyre",
- "indenter",
- "once_cell",
- "owo-colors",
- "tracing-error",
-]
-
-[[package]]
-name = "color-spantrace"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd6be1b2a7e382e2b98b43b2adcca6bb0e465af0bdd38123873ae61eb17a72c2"
-dependencies = [
- "once_cell",
- "owo-colors",
- "tracing-core",
- "tracing-error",
-]
-
-[[package]]
-name = "crossbeam"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1137cd7e7fc0fb5d3c5a8678be38ec56e819125d8d7907411fe24ccb943faca8"
-dependencies = [
- "crossbeam-channel",
- "crossbeam-deque",
- "crossbeam-epoch",
- "crossbeam-queue",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-channel"
-version = "0.5.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06ba6d68e24814cb8de6bb986db8222d3a027d15872cabc0d18817bc3c0e4471"
-dependencies = [
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-deque"
-version = "0.8.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51"
-dependencies = [
- "crossbeam-epoch",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-epoch"
-version = "0.9.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
-dependencies = [
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-queue"
-version = "0.3.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f58bbc28f91df819d0aa2a2c00cd19754769c2fad90579b3592b1c9ba7a3115"
-dependencies = [
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-utils"
-version = "0.8.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
-
-[[package]]
-name = "ctrlc"
-version = "3.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90eeab0aa92f3f9b4e87f258c72b139c207d251f9cbc1080a0086b86a8870dd3"
-dependencies = [
- "nix",
- "windows-sys",
-]
-
-[[package]]
-name = "derive_deref"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcdbcee2d9941369faba772587a565f4f534e42cb8d17e5295871de730163b2b"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "derived-deref"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "805ef2023ccd65425743a91ecd11fc020979a0b01921db3104fb606d18a7b43e"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.95",
-]
-
-[[package]]
-name = "either"
-version = "1.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
-
-[[package]]
-name = "eyre"
-version = "0.6.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec"
-dependencies = [
- "indenter",
- "once_cell",
-]
-
-[[package]]
-name = "fs2"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213"
-dependencies = [
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "getrandom"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
-dependencies = [
- "cfg-if",
- "libc",
- "wasi",
-]
-
-[[package]]
-name = "gimli"
-version = "0.28.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
-
-[[package]]
-name = "hex-conservative"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5313b072ce3c597065a808dbf612c4c8e8590bdbf8b579508bf7a762c5eae6cd"
-dependencies = [
- "arrayvec",
-]
-
-[[package]]
-name = "hex-conservative"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4afe881d0527571892c4034822e59bb10c6c991cce6abe8199b6f5cf10766f55"
-dependencies = [
- "arrayvec",
-]
-
-[[package]]
-name = "hex_lit"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3011d1213f159867b13cfd6ac92d2cd5f1345762c63be3554e84092d85a50bbd"
-
-[[package]]
-name = "indenter"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683"
-
-[[package]]
-name = "instant"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "itoa"
-version = "1.0.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
-
-[[package]]
-name = "jiff"
-version = "0.1.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2bb0c2e28117985a4d90e3bc70092bc8f226f434c7ec7e23dd9ff99c5c5721a"
-dependencies = [
- "jiff-tzdb-platform",
- "log",
- "portable-atomic",
- "portable-atomic-util",
- "serde",
- "windows-sys",
-]
-
-[[package]]
-name = "jiff-tzdb"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf2cec2f5d266af45a071ece48b1fb89f3b00b2421ac3a5fe10285a6caaa60d3"
-
-[[package]]
-name = "jiff-tzdb-platform"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a63c62e404e7b92979d2792352d885a7f8f83fd1d0d31eea582d77b2ceca697e"
-dependencies = [
- "jiff-tzdb",
-]
-
-[[package]]
-name = "jsonrpc"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3662a38d341d77efecb73caf01420cfa5aa63c0253fd7bc05289ef9f6616e1bf"
-dependencies = [
- "base64",
- "minreq",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "lazy_static"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
-
-[[package]]
-name = "libc"
-version = "0.2.169"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
-
-[[package]]
-name = "lock_api"
-version = "0.4.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
-dependencies = [
- "autocfg",
- "scopeguard",
-]
-
-[[package]]
-name = "log"
-version = "0.4.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
-
-[[package]]
-name = "memchr"
-version = "2.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
-
-[[package]]
-name = "memmap2"
-version = "0.9.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "miniz_oxide"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
-dependencies = [
- "adler",
-]
-
-[[package]]
-name = "minreq"
-version = "2.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36a8e50e917e18a37d500d27d40b7bc7d127e71c0c94fb2d83f43b4afd308390"
-dependencies = [
- "log",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "nix"
-version = "0.29.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
-dependencies = [
- "bitflags 2.6.0",
- "cfg-if",
- "cfg_aliases",
- "libc",
-]
-
-[[package]]
-name = "object"
-version = "0.32.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "once_cell"
-version = "1.20.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
-
-[[package]]
-name = "owo-colors"
-version = "3.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f"
-
-[[package]]
-name = "parking_lot"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
-dependencies = [
- "instant",
- "lock_api",
- "parking_lot_core",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.8.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc"
-dependencies = [
- "cfg-if",
- "instant",
- "libc",
- "redox_syscall",
- "smallvec",
- "winapi",
-]
-
-[[package]]
-name = "pin-project-lite"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff"
-
-[[package]]
-name = "portable-atomic"
-version = "1.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6"
-
-[[package]]
-name = "portable-atomic-util"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507"
-dependencies = [
- "portable-atomic",
-]
-
-[[package]]
-name = "ppv-lite86"
-version = "0.2.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
-dependencies = [
- "zerocopy",
-]
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0"
-dependencies = [
- "unicode-ident",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.38"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc"
-dependencies = [
- "proc-macro2",
-]
-
-[[package]]
-name = "rand"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
-dependencies = [
- "libc",
- "rand_chacha",
- "rand_core",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
-dependencies = [
- "ppv-lite86",
- "rand_core",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
-dependencies = [
- "getrandom",
-]
-
-[[package]]
-name = "rayon"
-version = "1.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
-dependencies = [
- "either",
- "rayon-core",
-]
-
-[[package]]
-name = "rayon-core"
-version = "1.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
-dependencies = [
- "crossbeam-deque",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
-dependencies = [
- "bitflags 1.3.2",
-]
-
-[[package]]
-name = "rustc-demangle"
-version = "0.1.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
-
-[[package]]
-name = "ryu"
-version = "1.0.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
-
-[[package]]
-name = "sanakirja"
-version = "1.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81aaf70d064e2122209f04d01fd91e8908e7a327b516236e1cbc0c3f34ac6d11"
-dependencies = [
- "fs2",
- "log",
- "memmap2",
- "parking_lot",
- "sanakirja-core",
- "serde",
- "thiserror",
-]
-
-[[package]]
-name = "sanakirja-core"
-version = "1.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8376db34ae3eac6e7bd91168bc638450073b708ce9fb46940de676f552238bf5"
-
-[[package]]
-name = "scopeguard"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
-
-[[package]]
-name = "secp256k1"
-version = "0.29.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9465315bc9d4566e1724f0fffcbcc446268cb522e60f9a27bcded6b19c108113"
-dependencies = [
- "bitcoin_hashes 0.14.0",
- "rand",
- "secp256k1-sys",
- "serde",
-]
-
-[[package]]
-name = "secp256k1-sys"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4387882333d3aa8cb20530a17c69a3752e97837832f34f6dccc760e715001d9"
-dependencies = [
- "cc",
-]
-
-[[package]]
-name = "serde"
-version = "1.0.216"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b9781016e935a97e8beecf0c933758c97a5520d32930e460142b4cd80c6338e"
-dependencies = [
- "serde_derive",
-]
-
-[[package]]
-name = "serde_derive"
-version = "1.0.216"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46f859dbbf73865c6627ed570e78961cd3ac92407a2d117204c49232485da55e"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.95",
-]
-
-[[package]]
-name = "serde_json"
-version = "1.0.133"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377"
-dependencies = [
- "itoa",
- "memchr",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "sharded-slab"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
-dependencies = [
- "lazy_static",
-]
-
-[[package]]
-name = "shlex"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
-
-[[package]]
-name = "smallvec"
-version = "1.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
-
-[[package]]
-name = "snkrj"
-version = "0.1.1"
-dependencies = [
- "sanakirja",
-]
-
-[[package]]
-name = "storable_vec"
-version = "0.1.2"
-dependencies = [
- "memmap2",
-]
-
-[[package]]
-name = "syn"
-version = "1.0.109"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.95"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46f71c0377baf4ef1cc3e3402ded576dccc315800fbc62dfc7fe04b009773b4a"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "thiserror"
-version = "1.0.69"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
-dependencies = [
- "thiserror-impl",
-]
-
-[[package]]
-name = "thiserror-impl"
-version = "1.0.69"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.95",
-]
-
-[[package]]
-name = "thread_local"
-version = "1.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
-dependencies = [
- "cfg-if",
- "once_cell",
-]
-
-[[package]]
-name = "tracing"
-version = "0.1.41"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
-dependencies = [
- "pin-project-lite",
- "tracing-core",
-]
-
-[[package]]
-name = "tracing-core"
-version = "0.1.33"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c"
-dependencies = [
- "once_cell",
- "valuable",
-]
-
-[[package]]
-name = "tracing-error"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b1581020d7a273442f5b45074a6a57d5757ad0a47dac0e9f0bd57b81936f3db"
-dependencies = [
- "tracing",
- "tracing-subscriber",
-]
-
-[[package]]
-name = "tracing-subscriber"
-version = "0.3.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008"
-dependencies = [
- "sharded-slab",
- "thread_local",
- "tracing-core",
-]
-
-[[package]]
-name = "unicode-ident"
-version = "1.0.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83"
-
-[[package]]
-name = "valuable"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
-
-[[package]]
-name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
-
-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
-[[package]]
-name = "windows-sys"
-version = "0.59.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
-dependencies = [
- "windows-targets",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
-dependencies = [
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc",
- "windows_i686_gnu",
- "windows_i686_gnullvm",
- "windows_i686_msvc",
- "windows_x86_64_gnu",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc",
-]
-
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
-
-[[package]]
-name = "windows_i686_gnullvm"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
-
-[[package]]
-name = "zerocopy"
-version = "0.7.35"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
-dependencies = [
- "byteorder",
- "zerocopy-derive",
-]
-
-[[package]]
-name = "zerocopy-derive"
-version = "0.7.35"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.95",
-]
diff --git a/indexer/Cargo.toml b/indexer/Cargo.toml
index 64d91747c..4219b5629 100644
--- a/indexer/Cargo.toml
+++ b/indexer/Cargo.toml
@@ -5,11 +5,11 @@ edition = "2021"
 
 [dependencies]
 bitcoin = { workspace = true }
-biter = { workspace = true }
 color-eyre = { workspace = true }
 derive_deref = { workspace = true }
 exit = { workspace = true }
 fjall = { workspace = true }
+iterator = { workspace = true }
 jiff = { workspace = true }
 rapidhash = "1.3.0"
 rayon = { workspace = true }
diff --git a/indexer/src/lib.rs b/indexer/src/lib.rs
index 3447e5d17..0078f7cfd 100644
--- a/indexer/src/lib.rs
+++ b/indexer/src/lib.rs
@@ -7,7 +7,7 @@ use std::{
     time::Duration,
 };
 
-pub use biter::*;
+pub use iterator::*;
 
 use bitcoin::{Transaction, TxIn, TxOut};
 use color_eyre::eyre::{eyre, ContextCompat};
@@ -93,7 +93,7 @@ impl Indexer<CACHED_GETS> {
                 Ok(())
             };
 
-        biter::new(bitcoin_dir, Some(height.into()), None, rpc)
+        iterator::new(bitcoin_dir, Some(height.into()), None, rpc)
             .iter()
             .try_for_each(|(_height, block, blockhash)| -> color_eyre::Result<()> {
                 println!("Processing block {_height}...");
diff --git a/indexer/src/main.rs b/indexer/src/main.rs
index 4cb954e3f..67385efd7 100644
--- a/indexer/src/main.rs
+++ b/indexer/src/main.rs
@@ -1,8 +1,8 @@
 use std::path::Path;
 
 use bindex::Indexer;
-use biter::rpc;
 use exit::Exit;
+use iterator::rpc;
 use storable_vec::CACHED_GETS;
 
 fn main() -> color_eyre::Result<()> {
diff --git a/indexer/src/structs/addressbytes.rs b/indexer/src/structs/addressbytes.rs
index 34ce0663d..1d882977c 100644
--- a/indexer/src/structs/addressbytes.rs
+++ b/indexer/src/structs/addressbytes.rs
@@ -1,6 +1,6 @@
-use biter::bitcoin::ScriptBuf;
 use color_eyre::eyre::eyre;
 use derive_deref::{Deref, DerefMut};
+use iterator::bitcoin::ScriptBuf;
 use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout};
 
 use super::Addresstype;
diff --git a/indexer/src/structs/addresstype.rs b/indexer/src/structs/addresstype.rs
index efb5a2a71..a4bac0a41 100644
--- a/indexer/src/structs/addresstype.rs
+++ b/indexer/src/structs/addresstype.rs
@@ -1,4 +1,4 @@
-use biter::bitcoin::ScriptBuf;
+use iterator::bitcoin::ScriptBuf;
 use zerocopy::{Immutable, IntoBytes, KnownLayout, TryFromBytes};
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, TryFromBytes, Immutable, IntoBytes, KnownLayout)]
diff --git a/indexer/src/structs/amount.rs b/indexer/src/structs/amount.rs
index bfe620a25..519a3eaa2 100644
--- a/indexer/src/structs/amount.rs
+++ b/indexer/src/structs/amount.rs
@@ -3,8 +3,8 @@ use std::{
     ops::{Add, AddAssign, Mul, Sub, SubAssign},
 };
 
-use biter::bitcoin;
 use derive_deref::{Deref, DerefMut};
+use iterator::bitcoin;
 use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout};
 
 use super::Height;
diff --git a/indexer/src/structs/height.rs b/indexer/src/structs/height.rs
index c8b999597..618466926 100644
--- a/indexer/src/structs/height.rs
+++ b/indexer/src/structs/height.rs
@@ -4,9 +4,9 @@ use std::{
     path::Path,
 };
 
-use biter::rpc::{self, RpcApi};
 use derive_deref::{Deref, DerefMut};
 use fjall::Slice;
+use iterator::rpc::{self, RpcApi};
 use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout};
 
 #[derive(
diff --git a/server/Cargo.toml b/server/Cargo.toml
index b453775bb..d249fd57d 100644
--- a/server/Cargo.toml
+++ b/server/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 
 [dependencies]
 # allocative = "0.3.4"
-axum = "0.7.9"
+axum = "0.8.1"
 # bincode = { git = "https://github.com/bincode-org/bincode.git", features = [
 #     "serde",
 # ] }
@@ -13,7 +13,7 @@ axum = "0.7.9"
 # biter = { path = "./src/crates/biter" }
 # chrono = { version = "0.4.39", features = ["serde"] }
 # clap = { version = "4.5.26", features = ["derive"] }
-# color-eyre = "0.6.3"
+color-eyre = { workspace = true }
 # ctrlc = { version = "3.4.5", features = ["termination"] }
 # derive_deref = "1.1.1"
 # env_logger = "0.11.6"
@@ -22,16 +22,16 @@ axum = "0.7.9"
 # log = { version = "0.4.25", features = ["std", "serde"] }
 # ordered-float = "4.6.0"
 # rayon = "1.10.0"
-# regex = "1.11.1"
-# reqwest = { version = "0.12.12", features = ["blocking", "json"] }
+regex = "1.11.1"
+reqwest = { version = "0.12.12", features = ["blocking", "json"] }
 # rlimit = "0.10.2"
 # snkrj = { path = "./src/crates/snkrj" }
 # serde = { version = "1.0.217", features = ["derive"] }
 # serde_json = "1.0.135"
 # struct_iterable = { path = "./src/crates/iterable" }
-# swc = "9.0.2"
-# swc_common = "5.0.0"
-# tokio = { version = "1.43.0", features = ["full"] }
+swc = "13.0.1"
+swc_common = "6.0.0"
+tokio = { version = "1.43.0", features = ["full"] }
 # toml = "0.8.19"
-# tower-http = { version = "0.6.2", features = ["compression-full"] }
-# zstd = "0.13.2"
+tower-http = { version = "0.6.2", features = ["compression-full"] }
+zstd = "0.13.2"
diff --git a/server/src/website/handlers/minify.rs b/server/src/website/handlers/minify.rs
index 5c6a26074..5391b718a 100644
--- a/server/src/website/handlers/minify.rs
+++ b/server/src/website/handlers/minify.rs
@@ -6,24 +6,17 @@ use swc::{config::JsMinifyOptions, try_with_handler, JsMinifyExtras};
 use swc_common::{SourceMap, GLOBALS};
 
 pub fn minify_js(path: &Path) -> String {
-    let cm = Arc::<SourceMap>::default();
+    let source_map = Arc::<SourceMap>::default();
+    let compiler = swc::Compiler::new(source_map.clone());
 
-    let c = swc::Compiler::new(cm.clone());
-
-    let output = GLOBALS
+    GLOBALS
         .set(&Default::default(), || {
-            try_with_handler(cm.clone(), Default::default(), |handler| {
-                let fm = cm.load_file(path).expect("failed to load file");
+            try_with_handler(source_map.clone(), Default::default(), |handler| {
+                let fm = source_map.load_file(path).expect("failed to load file");
 
-                c.minify(
-                    fm,
-                    handler,
-                    &JsMinifyOptions::default(),
-                    JsMinifyExtras::default(),
-                )
+                compiler.minify(fm, handler, &JsMinifyOptions::default(), JsMinifyExtras::default())
             })
         })
-        .unwrap();
-
-    output.code
+        .unwrap()
+        .code
 }
diff --git a/src/main.rs b/src/main.rs
index 999e045f6..1996a7aa5 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,4 +1,4 @@
-use biter::bitcoincore_rpc::Client;
+use iterator::bitcoincore_rpc::Client;
 use log::info;
 use rlimit::{getrlimit, setrlimit, Resource};
 
diff --git a/src/parser/actions/iter_blocks.rs b/src/parser/actions/iter_blocks.rs
index ba79b13d9..b5d9edfc0 100644
--- a/src/parser/actions/iter_blocks.rs
+++ b/src/parser/actions/iter_blocks.rs
@@ -1,8 +1,8 @@
 use std::{collections::BTreeSet, time::Instant};
 
-use biter::bitcoincore_rpc::Client;
 use chrono::Datelike;
 use export::ExportedData;
+use iterator::bitcoincore_rpc::Client;
 use itertools::Itertools;
 
 use log::info;
@@ -31,8 +31,7 @@ pub fn iter_blocks(
 
     info!("Imported states");
 
-    let first_unsafe_heights =
-        find_first_inserted_unsafe_height(&mut states, databases, datasets, config);
+    let first_unsafe_heights = find_first_inserted_unsafe_height(&mut states, databases, datasets, config);
 
     let mut height = first_unsafe_heights.min();
 
@@ -69,9 +68,7 @@ pub fn iter_blocks(
 
                 next_block_opt = block_iter.next();
 
-                if let Some((_current_block_height, current_block, _current_block_hash)) =
-                    current_block_opt
-                {
+                if let Some((_current_block_height, current_block, _current_block_hash)) = current_block_opt {
                     let timestamp = Timestamp::from(current_block.header.time);
 
                     let current_block_date = timestamp.to_date();
@@ -82,9 +79,9 @@ pub fn iter_blocks(
                         panic!()
                     }
 
-                    next_date_opt = next_block_opt.as_ref().map(|(_, next_block, _)| {
-                        Timestamp::from(next_block.header.time).to_date()
-                    });
+                    next_date_opt = next_block_opt
+                        .as_ref()
+                        .map(|(_, next_block, _)| Timestamp::from(next_block.header.time).to_date());
 
                     // Always run for the first block of the loop
                     if blocks_loop_date.is_none() {
@@ -96,9 +93,7 @@ pub fn iter_blocks(
                             .map(|date_data| *date_data.date < *current_block_date)
                             .unwrap_or(true)
                         {
-                            states
-                                .date_data_vec
-                                .push(DateData::new(current_block_date, vec![]));
+                            states.date_data_vec.push(DateData::new(current_block_date, vec![]));
                         }
 
                         processed_dates.insert(current_block_date);
@@ -117,10 +112,8 @@ pub fn iter_blocks(
                     processed_heights.insert(current_block_height);
 
                     if first_unsafe_heights.inserted <= current_block_height {
-                        let compute_addresses = databases.check_if_needs_to_compute_addresses(
-                            current_block_height,
-                            blocks_loop_date,
-                        );
+                        let compute_addresses =
+                            databases.check_if_needs_to_compute_addresses(current_block_height, blocks_loop_date);
 
                         if states.address_cohorts_durable_states.is_none()
                             && (compute_addresses
@@ -128,10 +121,9 @@ pub fn iter_blocks(
                                     .address
                                     .needs_durable_states(current_block_height, current_block_date))
                         {
-                            states.address_cohorts_durable_states =
-                                Some(AddressCohortsDurableStates::init(
-                                    &mut databases.address_index_to_address_data,
-                                ));
+                            states.address_cohorts_durable_states = Some(AddressCohortsDurableStates::init(
+                                &mut databases.address_index_to_address_data,
+                            ));
                         }
 
                         if states.utxo_cohorts_durable_states.is_none()
@@ -169,9 +161,7 @@ pub fn iter_blocks(
 
                         height += blocks_loop_i;
 
-                        let is_check_point = next_date_opt
-                            .as_ref()
-                            .map_or(true, |date| date.is_first_of_month());
+                        let is_check_point = next_date_opt.as_ref().map_or(true, |date| date.is_first_of_month());
 
                         if (is_check_point && instant.elapsed().as_secs() >= 1)
                             || height.is_close_to_end(approx_block_count)
@@ -209,8 +199,7 @@ pub fn iter_blocks(
 
             let defragment = is_safe
                 && next_date_opt.is_some_and(|date| {
-                    (date.year() >= 2020 && date.is_january()
-                        || date.year() >= 2022 && date.is_july())
+                    (date.year() >= 2020 && date.is_january() || date.year() >= 2022 && date.is_july())
                         && date.is_first_of_month()
                 });
 
diff --git a/src/parser/actions/parse.rs b/src/parser/actions/parse.rs
index f3f94ed7a..b526a71a9 100644
--- a/src/parser/actions/parse.rs
+++ b/src/parser/actions/parse.rs
@@ -1,6 +1,6 @@
 use std::{collections::BTreeMap, ops::ControlFlow, thread};
 
-use biter::{
+use iterator::{
     bitcoin::{Block, Txid},
     bitcoincore_rpc::RpcApi,
 };
@@ -11,19 +11,18 @@ use rayon::prelude::*;
 use crate::{
     parser::{
         databases::{
-            AddressIndexToAddressData, AddressIndexToEmptyAddressData, AddressToAddressIndex,
-            Databases, TxidToTxData, TxoutIndexToAddressIndex, TxoutIndexToAmount,
+            AddressIndexToAddressData, AddressIndexToEmptyAddressData, AddressToAddressIndex, Databases, TxidToTxData,
+            TxoutIndexToAddressIndex, TxoutIndexToAmount,
         },
         datasets::{Datasets, InsertData},
         states::{
-            AddressCohortsInputStates, AddressCohortsOutputStates, AddressCohortsRealizedStates,
-            States, UTXOCohortsOneShotStates, UTXOCohortsSentStates,
+            AddressCohortsInputStates, AddressCohortsOutputStates, AddressCohortsRealizedStates, States,
+            UTXOCohortsOneShotStates, UTXOCohortsSentStates,
         },
     },
     structs::{
-        Address, AddressData, AddressRealizedData, Amount, BlockData, BlockPath, Config, Counter,
-        Date, EmptyAddressData, Height, PartialTxoutData, Price, SentData, Timestamp, TxData,
-        TxoutIndex,
+        Address, AddressData, AddressRealizedData, Amount, BlockData, BlockPath, Config, Counter, Date,
+        EmptyAddressData, Height, PartialTxoutData, Price, SentData, Timestamp, TxData, TxoutIndex,
     },
 };
 
@@ -111,8 +110,7 @@ pub fn parse(
 
     let mut block_path_to_sent_data: BTreeMap<BlockPath, SentData> = BTreeMap::default();
     // let mut received_data: ReceivedData = ReceivedData::default();
-    let mut address_index_to_address_realized_data: BTreeMap<u32, AddressRealizedData> =
-        BTreeMap::default();
+    let mut address_index_to_address_realized_data: BTreeMap<u32, AddressRealizedData> = BTreeMap::default();
 
     let mut coinbase = Amount::ZERO;
     let mut satblocks_destroyed = Amount::ZERO;
@@ -171,261 +169,228 @@ pub fn parse(
         )
     });
 
-    block
-        .txdata
-        .iter()
-        .enumerate()
-        .try_for_each(|(block_tx_index, tx)| {
-            let txid = tx.compute_txid();
-            let tx_index = databases.txid_to_tx_data.metadata.serial as u32;
+    block.txdata.iter().enumerate().try_for_each(|(block_tx_index, tx)| {
+        let txid = tx.compute_txid();
+        let tx_index = databases.txid_to_tx_data.metadata.serial as u32;
 
-            transaction_count += 1;
+        transaction_count += 1;
 
-            // --
-            // outputs
-            // ---
+        // --
+        // outputs
+        // ---
 
-            let mut utxos = BTreeMap::new();
-            let mut spendable_amount = Amount::ZERO;
+        let mut utxos = BTreeMap::new();
+        let mut spendable_amount = Amount::ZERO;
 
-            let is_coinbase = tx.is_coinbase();
+        let is_coinbase = tx.is_coinbase();
 
-            if is_coinbase != (block_tx_index == 0) {
-                unreachable!();
-            }
+        if is_coinbase != (block_tx_index == 0) {
+            unreachable!();
+        }
 
-            let mut inputs_sum = Amount::ZERO;
-            let mut outputs_sum = Amount::ZERO;
+        let mut inputs_sum = Amount::ZERO;
+        let mut outputs_sum = Amount::ZERO;
 
-            let last_block = states.date_data_vec.last_mut_block().unwrap();
+        let last_block = states.date_data_vec.last_mut_block().unwrap();
 
-            // Before `input` to cover outputs being used in the same block as inputs
-            tx.output
-                .iter()
-                .enumerate()
-                .filter_map(|(vout, tx_out)| {
-                    if vout > (u16::MAX as usize) {
-                        panic!("vout can indeed be bigger than u16::MAX !");
-                    }
+        // Before `input` to cover outputs being used in the same block as inputs
+        tx.output
+            .iter()
+            .enumerate()
+            .filter_map(|(vout, tx_out)| {
+                if vout > (u16::MAX as usize) {
+                    panic!("vout can indeed be bigger than u16::MAX !");
+                }
 
-                    let amount = Amount::wrap(tx_out.value);
+                let amount = Amount::wrap(tx_out.value);
 
-                    if is_coinbase {
-                        coinbase += amount;
-                    } else {
-                        outputs_sum += amount;
-                    }
+                if is_coinbase {
+                    coinbase += amount;
+                } else {
+                    outputs_sum += amount;
+                }
 
-                    partial_txout_data_vec
-                        .pop()
-                        .unwrap()
-                        // None if not worth parsing (empty/op_return/...)
-                        .map(|partial_txout_data| (vout, partial_txout_data))
-                })
-                .for_each(|(vout, partial_txout_data)| {
-                    let vout = vout as u16;
+                partial_txout_data_vec
+                    .pop()
+                    .unwrap()
+                    // None if not worth parsing (empty/op_return/...)
+                    .map(|partial_txout_data| (vout, partial_txout_data))
+            })
+            .for_each(|(vout, partial_txout_data)| {
+                let vout = vout as u16;
 
-                    let txout_index = TxoutIndex::new(tx_index, vout);
+                let txout_index = TxoutIndex::new(tx_index, vout);
 
-                    let PartialTxoutData {
-                        address,
-                        address_index_opt,
-                        amount,
-                    } = partial_txout_data;
+                let PartialTxoutData {
+                    address,
+                    address_index_opt,
+                    amount,
+                } = partial_txout_data;
 
-                    spendable_amount += amount;
+                spendable_amount += amount;
 
-                    last_block.receive(amount);
+                last_block.receive(amount);
 
-                    utxos.insert(vout, amount);
+                utxos.insert(vout, amount);
+
+                databases.txout_index_to_amount.insert_to_ram(txout_index, amount);
+
+                if compute_addresses {
+                    let address = address.unwrap();
+
+                    let address_index_to_address_data = address_index_to_address_data.as_mut().unwrap();
+
+                    let (address_data, address_index) = {
+                        if let Some(address_index) = address_index_opt
+                            .or_else(|| databases.address_to_address_index.get_from_ram(&address).cloned())
+                        {
+                            let address_data = address_index_to_address_data.get_mut(&address_index).unwrap();
+
+                            (address_data, address_index)
+                        } else {
+                            let address_index = databases.address_to_address_index.metadata.serial as u32;
+
+                            let address_type = address.to_type();
+
+                            if let Some(previous) = databases.address_to_address_index.insert(address, address_index) {
+                                dbg!(previous);
+                                panic!("address #{address_index} shouldn't be present during put");
+                            }
+
+                            // Checked new
+                            let address_data = address_index_to_address_data
+                                .entry(address_index)
+                                .and_modify(|_| {
+                                    panic!("Shouldn't exist");
+                                })
+                                // Will always insert, it's to avoid insert + get
+                                .or_insert(AddressData::new(address_type));
+
+                            (address_data, address_index)
+                        }
+                    };
+
+                    // MUST be before received !
+                    let address_realized_data = address_index_to_address_realized_data
+                        .entry(address_index)
+                        .or_insert_with(|| AddressRealizedData::default(address_data));
+
+                    address_data.receive(amount, block_price);
+
+                    address_realized_data.receive(amount);
 
                     databases
-                        .txout_index_to_amount
-                        .insert_to_ram(txout_index, amount);
+                        .txout_index_to_address_index
+                        .insert_to_ram(txout_index, address_index);
+                }
+            });
 
-                    if compute_addresses {
-                        let address = address.unwrap();
+        if !utxos.is_empty() {
+            databases.txid_to_tx_data.insert(
+                &txid,
+                TxData::new(
+                    tx_index,
+                    BlockPath::new(date_index as u16, block_index as u16),
+                    utxos.len() as u16,
+                ),
+            );
+        }
 
-                        let address_index_to_address_data =
-                            address_index_to_address_data.as_mut().unwrap();
+        // ---
+        // inputs
+        // ---
 
-                        let (address_data, address_index) = {
-                            if let Some(address_index) = address_index_opt.or_else(|| {
-                                databases
-                                    .address_to_address_index
-                                    .get_from_ram(&address)
-                                    .cloned()
-                            }) {
-                                let address_data = address_index_to_address_data
-                                    .get_mut(&address_index)
-                                    .unwrap();
+        if !is_coinbase {
+            tx.input.iter().try_for_each(|txin| {
+                let outpoint = txin.previous_output;
+                let input_txid = outpoint.txid;
+                let input_vout = outpoint.vout;
 
-                                (address_data, address_index)
-                            } else {
-                                let address_index =
-                                    databases.address_to_address_index.metadata.serial as u32;
+                let remove_tx_data_from_cached_puts = {
+                    let mut is_tx_data_from_cached_puts = false;
 
-                                let address_type = address.to_type();
+                    let input_tx_data = txid_to_tx_data.get_mut(&input_txid).unwrap().as_mut().or_else(|| {
+                        is_tx_data_from_cached_puts = true;
 
-                                if let Some(previous) = databases
-                                    .address_to_address_index
-                                    .insert(address, address_index)
-                                {
-                                    dbg!(previous);
-                                    panic!(
-                                        "address #{address_index} shouldn't be present during put"
-                                    );
-                                }
+                        databases.txid_to_tx_data.get_mut_from_ram(&input_txid)
+                    });
 
-                                // Checked new
-                                let address_data = address_index_to_address_data
-                                    .entry(address_index)
-                                    .and_modify(|_| {
-                                        panic!("Shouldn't exist");
-                                    })
-                                    // Will always insert, it's to avoid insert + get
-                                    .or_insert(AddressData::new(address_type));
+                    // Can be none because 0 sats inputs happen
+                    // https://mempool.space/tx/f329e55c2de9b821356e6f2c4bba923ea7030cad61120f5ced5d4429f5c86fda#vin=27
 
-                                (address_data, address_index)
-                            }
-                        };
+                    if input_tx_data.is_none() {
+                        if !enable_check_if_txout_value_is_zero_in_db
+                            || rpc
+                                .get_raw_transaction(&input_txid, None)
+                                .unwrap()
+                                .output
+                                .get(input_vout as usize)
+                                .unwrap()
+                                .value
+                                .to_sat()
+                                == 0
+                        {
+                            return ControlFlow::Continue::<()>(());
+                        }
 
-                        // MUST be before received !
-                        let address_realized_data = address_index_to_address_realized_data
-                            .entry(address_index)
-                            .or_insert_with(|| AddressRealizedData::default(address_data));
-
-                        address_data.receive(amount, block_price);
-
-                        address_realized_data.receive(amount);
-
-                        databases
-                            .txout_index_to_address_index
-                            .insert_to_ram(txout_index, address_index);
+                        dbg!((input_txid, txid, tx_index, input_vout));
+                        panic!("Txid to be in txid_to_tx_data");
                     }
-                });
 
-            if !utxos.is_empty() {
-                databases.txid_to_tx_data.insert(
-                    &txid,
-                    TxData::new(
-                        tx_index,
-                        BlockPath::new(date_index as u16, block_index as u16),
-                        utxos.len() as u16,
-                    ),
-                );
-            }
+                    let input_tx_data = input_tx_data.unwrap();
+                    let input_tx_index = input_tx_data.index;
+                    let input_vout = input_vout as u16;
+                    let input_txout_index = TxoutIndex::new(input_tx_index, input_vout);
 
-            // ---
-            // inputs
-            // ---
+                    // if input_tx_index == 2516 || input_tx_index == 2490 {
+                    //     dbg!(input_tx_index, &input_tx_data.utxos);
+                    // }
 
-            if !is_coinbase {
-                tx.input.iter().try_for_each(|txin| {
-                    let outpoint = txin.previous_output;
-                    let input_txid = outpoint.txid;
-                    let input_vout = outpoint.vout;
+                    // let input_amount = input_tx_data.utxos.remove(&input_vout);
 
-                    let remove_tx_data_from_cached_puts = {
-                        let mut is_tx_data_from_cached_puts = false;
+                    let input_amount_and_address_index = databases
+                        .txout_index_to_amount
+                        .remove(&input_txout_index)
+                        .map(|amount| {
+                            (
+                                amount,
+                                databases.txout_index_to_address_index.remove(&input_txout_index),
+                            )
+                        }) // Remove from cached puts
+                        .or_else(|| txout_index_to_amount_and_address_index.remove(&input_txout_index));
 
-                        let input_tx_data = txid_to_tx_data
-                            .get_mut(&input_txid)
-                            .unwrap()
-                            .as_mut()
-                            .or_else(|| {
-                                is_tx_data_from_cached_puts = true;
-
-                                databases.txid_to_tx_data.get_mut_from_ram(&input_txid)
-                            });
-
-                        // Can be none because 0 sats inputs happen
-                        // https://mempool.space/tx/f329e55c2de9b821356e6f2c4bba923ea7030cad61120f5ced5d4429f5c86fda#vin=27
-
-                        if input_tx_data.is_none() {
-                            if !enable_check_if_txout_value_is_zero_in_db
-                                || rpc
-                                    .get_raw_transaction(&input_txid, None)
-                                    .unwrap()
-                                    .output
-                                    .get(input_vout as usize)
-                                    .unwrap()
-                                    .value
-                                    .to_sat()
-                                    == 0
-                            {
-                                return ControlFlow::Continue::<()>(());
-                            }
-
-                            dbg!((input_txid, txid, tx_index, input_vout));
-                            panic!("Txid to be in txid_to_tx_data");
+                    if input_amount_and_address_index.is_none() {
+                        if !enable_check_if_txout_value_is_zero_in_db
+                            || rpc
+                                .get_raw_transaction(&input_txid, None)
+                                .unwrap()
+                                .output
+                                .get(input_vout as usize)
+                                .unwrap()
+                                .value
+                                .to_sat()
+                                == 0
+                        {
+                            return ControlFlow::Continue::<()>(());
                         }
 
-                        let input_tx_data = input_tx_data.unwrap();
-                        let input_tx_index = input_tx_data.index;
-                        let input_vout = input_vout as u16;
-                        let input_txout_index = TxoutIndex::new(input_tx_index, input_vout);
+                        dbg!((input_txid, tx_index, input_tx_index, input_vout, input_tx_data, txid,));
+                        panic!("Txout index to be in txout_index_to_txout_value");
+                    }
 
-                        // if input_tx_index == 2516 || input_tx_index == 2490 {
-                        //     dbg!(input_tx_index, &input_tx_data.utxos);
-                        // }
+                    input_tx_data.utxos -= 1;
 
-                        // let input_amount = input_tx_data.utxos.remove(&input_vout);
+                    let (input_amount, input_address_index) = input_amount_and_address_index.unwrap();
 
-                        let input_amount_and_address_index = databases
-                            .txout_index_to_amount
-                            .remove(&input_txout_index)
-                            .map(|amount| {
-                                (
-                                    amount,
-                                    databases
-                                        .txout_index_to_address_index
-                                        .remove(&input_txout_index),
-                                )
-                            }) // Remove from cached puts
-                            .or_else(|| {
-                                txout_index_to_amount_and_address_index.remove(&input_txout_index)
-                            });
+                    let input_block_path = input_tx_data.block_path;
 
-                        if input_amount_and_address_index.is_none() {
-                            if !enable_check_if_txout_value_is_zero_in_db
-                                || rpc
-                                    .get_raw_transaction(&input_txid, None)
-                                    .unwrap()
-                                    .output
-                                    .get(input_vout as usize)
-                                    .unwrap()
-                                    .value
-                                    .to_sat()
-                                    == 0
-                            {
-                                return ControlFlow::Continue::<()>(());
-                            }
+                    let BlockPath {
+                        date_index: input_date_index,
+                        block_index: input_block_index,
+                    } = input_block_path;
 
-                            dbg!((
-                                input_txid,
-                                tx_index,
-                                input_tx_index,
-                                input_vout,
-                                input_tx_data,
-                                txid,
-                            ));
-                            panic!("Txout index to be in txout_index_to_txout_value");
-                        }
-
-                        input_tx_data.utxos -= 1;
-
-                        let (input_amount, input_address_index) =
-                            input_amount_and_address_index.unwrap();
-
-                        let input_block_path = input_tx_data.block_path;
-
-                        let BlockPath {
-                            date_index: input_date_index,
-                            block_index: input_block_index,
-                        } = input_block_path;
-
-                        let input_date_data = states
+                    let input_date_data =
+                        states
                             .date_data_vec
                             .get_mut(input_date_index as usize)
                             .unwrap_or_else(|| {
@@ -433,121 +398,112 @@ pub fn parse(
                                 panic!()
                             });
 
-                        let input_block_data = input_date_data
-                            .blocks
-                            .get_mut(input_block_index as usize)
+                    let input_block_data = input_date_data
+                        .blocks
+                        .get_mut(input_block_index as usize)
+                        .unwrap_or_else(|| {
+                            dbg!(
+                                height,
+                                &input_txid,
+                                input_block_path,
+                                input_date_index,
+                                input_block_index,
+                            );
+                            panic!()
+                        });
+
+                    input_block_data.send(input_amount);
+
+                    inputs_sum += input_amount;
+
+                    block_path_to_sent_data
+                        .entry(input_block_path)
+                        .or_default()
+                        .send(input_amount);
+
+                    satblocks_destroyed += input_amount * (height - input_block_data.height);
+
+                    satdays_destroyed +=
+                        input_amount * date.signed_duration_since(*input_date_data.date).num_days() as u64;
+
+                    if compute_addresses {
+                        let input_address_index = input_address_index.unwrap_or_else(|| {
+                            dbg!(
+                                height,
+                                input_amount,
+                                &input_tx_data,
+                                input_address_index,
+                                input_txout_index,
+                                txid,
+                                input_txid,
+                                input_vout
+                            );
+                            panic!()
+                        });
+
+                        let address_index_to_address_data = address_index_to_address_data.as_mut().unwrap();
+
+                        let input_address_data = address_index_to_address_data
+                            .get_mut(&input_address_index)
                             .unwrap_or_else(|| {
-                                dbg!(
-                                    height,
-                                    &input_txid,
-                                    input_block_path,
-                                    input_date_index,
-                                    input_block_index,
-                                );
-                                panic!()
+                                dbg!(input_address_index, input_txout_index, input_txid, input_vout);
+                                panic!();
                             });
 
-                        input_block_data.send(input_amount);
+                        let input_address_realized_data = address_index_to_address_realized_data
+                            .entry(input_address_index)
+                            .or_insert_with(|| AddressRealizedData::default(input_address_data));
 
-                        inputs_sum += input_amount;
+                        let previous_price = input_block_data.price;
 
-                        block_path_to_sent_data
-                            .entry(input_block_path)
-                            .or_default()
-                            .send(input_amount);
-
-                        satblocks_destroyed += input_amount * (height - input_block_data.height);
-
-                        satdays_destroyed += input_amount
-                            * date.signed_duration_since(*input_date_data.date).num_days() as u64;
-
-                        if compute_addresses {
-                            let input_address_index = input_address_index.unwrap_or_else(|| {
+                        // MUST be after `or_insert_with`
+                        input_address_data
+                            .send(input_amount, previous_price)
+                            .unwrap_or_else(|_| {
                                 dbg!(
-                                    height,
-                                    input_amount,
-                                    &input_tx_data,
                                     input_address_index,
-                                    input_txout_index,
                                     txid,
                                     input_txid,
-                                    input_vout
+                                    input_amount,
+                                    tx_index,
+                                    input_tx_index,
+                                    input_vout,
+                                    &input_address_data
                                 );
+
                                 panic!()
                             });
 
-                            let address_index_to_address_data =
-                                address_index_to_address_data.as_mut().unwrap();
-
-                            let input_address_data = address_index_to_address_data
-                                .get_mut(&input_address_index)
-                                .unwrap_or_else(|| {
-                                    dbg!(
-                                        input_address_index,
-                                        input_txout_index,
-                                        input_txid,
-                                        input_vout
-                                    );
-                                    panic!();
-                                });
-
-                            let input_address_realized_data =
-                                address_index_to_address_realized_data
-                                    .entry(input_address_index)
-                                    .or_insert_with(|| {
-                                        AddressRealizedData::default(input_address_data)
-                                    });
-
-                            let previous_price = input_block_data.price;
-
-                            // MUST be after `or_insert_with`
-                            input_address_data
-                                .send(input_amount, previous_price)
-                                .unwrap_or_else(|_| {
-                                    dbg!(
-                                        input_address_index,
-                                        txid,
-                                        input_txid,
-                                        input_amount,
-                                        tx_index,
-                                        input_tx_index,
-                                        input_vout,
-                                        &input_address_data
-                                    );
-
-                                    panic!()
-                                });
-
-                            input_address_realized_data.send(
-                                input_amount,
-                                block_price,
-                                previous_price,
-                                timestamp,
-                                input_block_data.timestamp,
-                            );
-                        };
-
-                        is_tx_data_from_cached_puts && input_tx_data.is_empty()
+                        input_address_realized_data.send(
+                            input_amount,
+                            block_price,
+                            previous_price,
+                            timestamp,
+                            input_block_data.timestamp,
+                        );
                     };
 
-                    if remove_tx_data_from_cached_puts {
-                        // Pre remove tx_datas that are empty and weren't yet added to the database to avoid having it was in there or not (and thus avoid useless operations)
-                        databases.txid_to_tx_data.remove_from_ram(&input_txid)
-                    }
+                    is_tx_data_from_cached_puts && input_tx_data.is_empty()
+                };
 
-                    ControlFlow::Continue(())
-                })?;
-            }
+                if remove_tx_data_from_cached_puts {
+                    // Pre remove tx_datas that are empty and weren't yet added to the database to avoid having it was in there or not (and thus avoid useless operations)
+                    databases.txid_to_tx_data.remove_from_ram(&input_txid)
+                }
 
-            amount_sent += inputs_sum;
+                ControlFlow::Continue(())
+            })?;
+        }
 
-            let fee = inputs_sum - outputs_sum;
+        amount_sent += inputs_sum;
 
-            fees_total += fee;
-            fees.push(fee);
+        let fee = inputs_sum - outputs_sum;
 
-            ControlFlow::Continue(())
-        });
+        fees_total += fee;
+        fees.push(fee);
+
+        ControlFlow::Continue(())
+    });
 
     if !partial_txout_data_vec.is_empty() {
         panic!("partial_txout_data_vec should've been fully consumed");
@@ -580,24 +536,17 @@ pub fn parse(
 
             if datasets.utxo.needs_durable_states(height, date) {
                 if let Some(previous_last_block_data) = previous_last_block_data {
-                    block_path_to_sent_data
-                        .iter()
-                        .for_each(|(block_path, sent_data)| {
-                            let block_data =
-                                states.date_data_vec.get_block_data(block_path).unwrap();
+                    block_path_to_sent_data.iter().for_each(|(block_path, sent_data)| {
+                        let block_data = states.date_data_vec.get_block_data(block_path).unwrap();
 
-                            if block_data.height != height {
-                                states
-                                    .utxo_cohorts_durable_states
-                                    .as_mut()
-                                    .unwrap()
-                                    .subtract_moved(
-                                        block_data,
-                                        sent_data,
-                                        previous_last_block_data,
-                                    );
-                            }
-                        });
+                        if block_data.height != height {
+                            states.utxo_cohorts_durable_states.as_mut().unwrap().subtract_moved(
+                                block_data,
+                                sent_data,
+                                previous_last_block_data,
+                            );
+                        }
+                    });
                 }
 
                 let last_block_data = states.date_data_vec.last_block().unwrap();
@@ -615,11 +564,7 @@ pub fn parse(
                             .utxo_cohorts_durable_states
                             .as_mut()
                             .unwrap()
-                            .udpate_age_if_needed(
-                                block_data,
-                                last_block_data,
-                                previous_last_block_data,
-                            );
+                            .udpate_age_if_needed(block_data, last_block_data, previous_last_block_data);
                     });
             }
 
@@ -628,14 +573,7 @@ pub fn parse(
                     .utxo_cohorts_durable_states
                     .as_ref()
                     .unwrap()
-                    .compute_one_shot_states(
-                        block_price,
-                        if is_date_last_block {
-                            Some(date_price)
-                        } else {
-                            None
-                        },
-                    );
+                    .compute_one_shot_states(block_price, if is_date_last_block { Some(date_price) } else { None });
             }
         });
 
@@ -668,10 +606,10 @@ pub fn parse(
                 // TODO: Only compute if needed
                 address_cohorts_output_states.replace(AddressCohortsOutputStates::default());
 
-                address_index_to_address_realized_data.iter().for_each(
-                    |(address_index, address_realized_data)| {
-                        let current_address_data =
-                            address_index_to_address_data.get(address_index).unwrap();
+                address_index_to_address_realized_data
+                    .iter()
+                    .for_each(|(address_index, address_realized_data)| {
+                        let current_address_data = address_index_to_address_data.get(address_index).unwrap();
 
                         states
                             .address_cohorts_durable_states
@@ -711,42 +649,34 @@ pub fn parse(
                                 &current_address_data.compute_liquidity_classification(),
                             )
                             .unwrap();
-                    },
-                );
+                    });
 
                 address_cohorts_one_shot_states.replace(
                     states
                         .address_cohorts_durable_states
                         .as_ref()
                         .unwrap()
-                        .compute_one_shot_states(
-                            block_price,
-                            if is_date_last_block {
-                                Some(date_price)
-                            } else {
-                                None
-                            },
-                        ),
+                        .compute_one_shot_states(block_price, if is_date_last_block { Some(date_price) } else { None }),
                 );
             });
         }
     });
 
     if compute_addresses {
-        address_index_to_address_data.unwrap().into_iter().for_each(
-            |(address_index, address_data)| {
+        address_index_to_address_data
+            .unwrap()
+            .into_iter()
+            .for_each(|(address_index, address_data)| {
                 if address_data.is_empty() {
-                    databases.address_index_to_empty_address_data.insert_to_ram(
-                        address_index,
-                        EmptyAddressData::from_non_empty(&address_data),
-                    );
+                    databases
+                        .address_index_to_empty_address_data
+                        .insert_to_ram(address_index, EmptyAddressData::from_non_empty(&address_data));
                 } else {
                     databases
                         .address_index_to_address_data
                         .insert_to_ram(address_index, address_data);
                 }
-            },
-        )
+            })
     }
 
     datasets.insert(InsertData {
@@ -851,17 +781,15 @@ fn prepare_outputs(
         .collect_vec();
 
     if compute_addresses {
-        partial_txout_data_vec
-            .par_iter_mut()
-            .for_each(|partial_tx_out_data| {
-                if let Some(partial_tx_out_data) = partial_tx_out_data {
-                    let address_index_opt = address_to_address_index
-                        .unsafe_get(partial_tx_out_data.address.as_ref().unwrap())
-                        .cloned();
+        partial_txout_data_vec.par_iter_mut().for_each(|partial_tx_out_data| {
+            if let Some(partial_tx_out_data) = partial_tx_out_data {
+                let address_index_opt = address_to_address_index
+                    .unsafe_get(partial_tx_out_data.address.as_ref().unwrap())
+                    .cloned();
 
-                    partial_tx_out_data.address_index_opt = address_index_opt;
-                }
-            });
+                partial_tx_out_data.address_index_opt = address_index_opt;
+            }
+        });
     }
 
     TxoutsParsingResults {
@@ -937,11 +865,8 @@ fn prepare_inputs<'a>(
                 // https://mempool.space/tx/9d8a0d851c9fb2cdf1c6d9406ce97e19e6911ae3503ab2dd5f38640bacdac996
                 // which is used later as input
                 .map(|amount| {
-                    let address_index = compute_addresses.then(|| {
-                        *txout_index_to_address_index_db
-                            .unsafe_get(&txout_index)
-                            .unwrap()
-                    });
+                    let address_index =
+                        compute_addresses.then(|| *txout_index_to_address_index_db.unsafe_get(&txout_index).unwrap());
 
                     (txout_index, (*amount, address_index))
                 })
@@ -989,17 +914,12 @@ fn compute_address_index_to_address_data(
     address_index_to_address_data
         .par_iter_mut()
         .for_each(|(address_index, address_data)| {
-            if let Some(_address_data) =
-                address_index_to_address_data_db.get_from_ram(address_index)
-            {
+            if let Some(_address_data) = address_index_to_address_data_db.get_from_ram(address_index) {
                 _address_data.clone_into(address_data);
-            } else if let Some(empty_address_data) =
-                address_index_to_empty_address_data_db.get_from_ram(address_index)
+            } else if let Some(empty_address_data) = address_index_to_empty_address_data_db.get_from_ram(address_index)
             {
                 *address_data = AddressData::from_empty(empty_address_data);
-            } else if let Some(_address_data) =
-                address_index_to_address_data_db.get_from_disk(address_index)
-            {
+            } else if let Some(_address_data) = address_index_to_address_data_db.get_from_disk(address_index) {
                 _address_data.clone_into(address_data);
             } else {
                 let empty_address_data = address_index_to_empty_address_data_db
diff --git a/src/parser/databases/txid_to_tx_data.rs b/src/parser/databases/txid_to_tx_data.rs
index 59717614c..4ca277d4a 100644
--- a/src/parser/databases/txid_to_tx_data.rs
+++ b/src/parser/databases/txid_to_tx_data.rs
@@ -5,7 +5,7 @@ use std::{
 };
 
 use allocative::Allocative;
-use biter::bitcoin::Txid;
+use iterator::bitcoin::Txid;
 use itertools::Itertools;
 use snkrj::{AnyDatabase, Database as _Database};
 
@@ -49,10 +49,7 @@ impl TxidToTxData {
 
         let db_index = Self::db_index(txid);
 
-        self.map
-            .get_mut(&db_index)
-            .unwrap()
-            .get_mut_from_ram(&txid_key)
+        self.map.get_mut(&db_index).unwrap().get_mut_from_ram(&txid_key)
     }
 
     pub fn remove_later_from_disk(&mut self, txid: &Txid) {
diff --git a/src/parser/mod.rs b/src/parser/mod.rs
index 3379223bd..df9692a70 100644
--- a/src/parser/mod.rs
+++ b/src/parser/mod.rs
@@ -1,6 +1,6 @@
 use std::{thread::sleep, time::Duration};
 
-use biter::bitcoincore_rpc::{Client, RpcApi};
+use iterator::bitcoincore_rpc::{Client, RpcApi};
 
 mod actions;
 mod databases;
@@ -25,14 +25,7 @@ pub fn main(config: &Config, rpc: &Client, exit: &Exit) -> color_eyre::Result<()
         let mut databases = Databases::import(config);
         let mut datasets = Datasets::import(config)?;
 
-        iter_blocks(
-            config,
-            rpc,
-            block_count,
-            exit.clone(),
-            &mut databases,
-            &mut datasets,
-        )?;
+        iter_blocks(config, rpc, block_count, exit.clone(), &mut databases, &mut datasets)?;
 
         if let Some(delay) = config.delay() {
             sleep(Duration::from_secs(delay))
diff --git a/src/structs/address.rs b/src/structs/address.rs
index b0e7930a2..d202e63d3 100644
--- a/src/structs/address.rs
+++ b/src/structs/address.rs
@@ -1,5 +1,5 @@
 use bitcoin_hashes::hash160;
-use biter::bitcoin::TxOut;
+use iterator::bitcoin::TxOut;
 
 use super::{AddressType, Counter, U8x19, U8x31};
 
diff --git a/src/structs/amount.rs b/src/structs/amount.rs
index 8308a7d40..f0d6a48db 100644
--- a/src/structs/amount.rs
+++ b/src/structs/amount.rs
@@ -10,27 +10,14 @@ use bincode::{
     error::{DecodeError, EncodeError},
     BorrowDecode, Decode, Encode,
 };
-use biter::bitcoin::Amount as BitcoinAmount;
 use derive_deref::{Deref, DerefMut};
+use iterator::bitcoin::Amount as BitcoinAmount;
 use serde::{Deserialize, Serialize};
 use snkrj::{direct_repr, Storable, UnsizedStorable};
 
 use super::Height;
 
-#[derive(
-    Debug,
-    PartialEq,
-    Eq,
-    PartialOrd,
-    Ord,
-    Clone,
-    Copy,
-    Deref,
-    DerefMut,
-    Default,
-    Serialize,
-    Deserialize,
-)]
+#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Deref, DerefMut, Default, Serialize, Deserialize)]
 pub struct Amount(BitcoinAmount);
 direct_repr!(Amount);
 
diff --git a/src/structs/config.rs b/src/structs/config.rs
index 89ac372e1..9b84ae495 100644
--- a/src/structs/config.rs
+++ b/src/structs/config.rs
@@ -4,9 +4,9 @@ use std::{
     path::{Path, PathBuf},
 };
 
-use biter::bitcoincore_rpc::Auth;
 use clap::Parser;
 use color_eyre::eyre::eyre;
+use iterator::bitcoincore_rpc::Auth;
 use log::info;
 use serde::{Deserialize, Serialize};
 
@@ -270,9 +270,7 @@ impl Config {
     fn fix_user_path(path: &str) -> PathBuf {
         let fix = move |pattern: &str| {
             if path.starts_with(pattern) {
-                let path = &path
-                    .replace(&format!("{pattern}/"), "")
-                    .replace(pattern, "");
+                let path = &path.replace(&format!("{pattern}/"), "").replace(pattern, "");
 
                 let home = std::env::var("HOME").unwrap();
 
diff --git a/src/structs/height.rs b/src/structs/height.rs
index 17a228275..efdc1dc18 100644
--- a/src/structs/height.rs
+++ b/src/structs/height.rs
@@ -5,8 +5,8 @@ use std::{
 
 use allocative::Allocative;
 use bincode::{Decode, Encode};
-use biter::NUMBER_OF_UNSAFE_BLOCKS;
 use derive_deref::{Deref, DerefMut};
+use iterator::NUMBER_OF_UNSAFE_BLOCKS;
 use serde::{Deserialize, Serialize};
 
 use super::{HeightMapChunkId, MapKey, HEIGHT_MAP_CHUNK_SIZE};
diff --git a/src/structs/rpc.rs b/src/structs/rpc.rs
index f7aac8916..20ce2db9a 100644
--- a/src/structs/rpc.rs
+++ b/src/structs/rpc.rs
@@ -1,4 +1,4 @@
-use biter::bitcoincore_rpc::Client;
+use iterator::bitcoincore_rpc::Client;
 
 use crate::structs::Config;
 
diff --git a/storable_vec/src/lib.rs b/storable_vec/src/lib.rs
index 3a916394d..21d4ad3cd 100644
--- a/storable_vec/src/lib.rs
+++ b/storable_vec/src/lib.rs
@@ -590,6 +590,26 @@ where
         })?;
         Ok(self.flush()?)
     }
+
+    pub fn compute_sum_from_indexes<T2, F>(
+        &mut self,
+        first_indexes: &mut StorableVec<I, T2, SINGLE_THREAD>,
+        last_indexes: &mut StorableVec<I, T2, SINGLE_THREAD>,
+        callback: F,
+    ) -> Result<()>
+    where
+        T: From<T2>,
+        T2: StorableVecType + Copy + Add<usize, Output = T2> + Sub<T2, Output = T2> + TryInto<T>,
+        <T2 as TryInto<T>>::Error: error::Error + Send + Sync + 'static,
+        F: Fn(&T2) -> T,
+    {
+        first_indexes.iter_from(I::from(self.len()), |(i, first_index)| {
+            let last_index = last_indexes.get(i)?;
+            let count = *last_index + 1_usize - *first_index;
+            self.push_if_needed(i, count.into())
+        })?;
+        Ok(self.flush()?)
+    }
 }
 
 impl<I, T> StorableVec<I, T, ASYNC_READ_ONLY>
diff --git a/storable_vec/src/main.rs b/storable_vec/src/main.rs
index 9c55fea26..15c162146 100644
--- a/storable_vec/src/main.rs
+++ b/storable_vec/src/main.rs
@@ -1,6 +1,6 @@
 use std::path::Path;
 
-use storable_vec::{StorableVec, Version, ASYNC_READ_ONLY, CACHED_GETS, SINGLE_THREAD};
+use storable_vec::{StorableVec, Version, CACHED_GETS, SINGLE_THREAD};
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     {
diff --git a/unsafe_slice_serde/Cargo.toml b/unsafe_slice_serde/Cargo.toml
deleted file mode 100644
index bc73a8033..000000000
--- a/unsafe_slice_serde/Cargo.toml
+++ /dev/null
@@ -1,4 +0,0 @@
-[package]
-name = "unsafe_slice_serde"
-version = "0.1.0"
-edition = "2021"
diff --git a/unsafe_slice_serde/src/lib.rs b/unsafe_slice_serde/src/lib.rs
deleted file mode 100644
index 02f7b5fb8..000000000
--- a/unsafe_slice_serde/src/lib.rs
+++ /dev/null
@@ -1,42 +0,0 @@
-use std::{fmt, slice};
-
-pub trait UnsafeSliceSerde
-where
-    Self: Sized,
-{
-    const SIZE: usize = size_of::<Self>();
-
-    fn unsafe_try_from_slice(slice: &[u8]) -> Result<&Self> {
-        let (prefix, shorts, suffix) = unsafe { slice.align_to::<Self>() };
-
-        if !prefix.is_empty() || shorts.len() != 1 || !suffix.is_empty() {
-            // dbg!(&slice, &prefix, &shorts, &suffix);
-            return Err(Error::FailedToAlignToSelf);
-        }
-
-        Ok(&shorts[0])
-    }
-
-    fn unsafe_as_slice(&self) -> &[u8] {
-        let data: *const Self = self;
-        let data: *const u8 = data as *const u8;
-        unsafe { slice::from_raw_parts(data, Self::SIZE) }
-    }
-}
-impl<T> UnsafeSliceSerde for T {}
-
-pub type Result<T, E = Error> = std::result::Result<T, E>;
-
-#[derive(Debug)]
-pub enum Error {
-    FailedToAlignToSelf,
-}
-impl fmt::Display for Error {
-    // This trait requires `fmt` with this exact signature.
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        match self {
-            Error::FailedToAlignToSelf => write!(f, "Failed to align_to for T"),
-        }
-    }
-}
-impl std::error::Error for Error {}

From cb7ea40e7c4fbdc222ac5df59bb25241c037f4f6 Mon Sep 17 00:00:00 2001
From: nym21 <expat-epochs0i@icloud.com>
Date: Tue, 11 Feb 2025 18:52:08 +0100
Subject: [PATCH 41/63] server: started

---
 server/Cargo.toml                        |  33 +++--
 server/src/api/handlers/dataset.rs       |  94 +++++---------
 server/src/api/mod.rs                    |  99 +++++++++++++-
 server/src/api/structs/chunk_metadata.rs |   8 --
 server/src/api/structs/extension.rs      |  34 -----
 server/src/api/structs/format.rs         |  27 ++++
 server/src/api/structs/index.rs          | 122 ++++++++++++++++++
 server/src/api/structs/kind.rs           |   8 +-
 server/src/api/structs/mod.rs            |  26 ++--
 server/src/lib.rs                        | 156 ++++++++++++++++++++---
 server/src/main.rs                       |  20 +++
 server/src/{ => traits}/header_map.rs    |  64 ++++------
 server/src/traits/mod.rs                 |   5 +
 server/src/{ => traits}/response.rs      |   0
 server/src/website/handlers/_minify.rs   |  41 ------
 server/src/website/handlers/file.rs      |  32 ++---
 server/src/website/handlers/minify.rs    |  47 +++++--
 server/src/website/mod.rs                |   3 +-
 18 files changed, 542 insertions(+), 277 deletions(-)
 delete mode 100644 server/src/api/structs/chunk_metadata.rs
 delete mode 100644 server/src/api/structs/extension.rs
 create mode 100644 server/src/api/structs/format.rs
 create mode 100644 server/src/api/structs/index.rs
 create mode 100644 server/src/main.rs
 rename server/src/{ => traits}/header_map.rs (80%)
 create mode 100644 server/src/traits/mod.rs
 rename server/src/{ => traits}/response.rs (100%)
 delete mode 100644 server/src/website/handlers/_minify.rs

diff --git a/server/Cargo.toml b/server/Cargo.toml
index d249fd57d..4d209cafc 100644
--- a/server/Cargo.toml
+++ b/server/Cargo.toml
@@ -1,37 +1,34 @@
 [package]
-name = "kibo_server"
+name = "berver"
 version = "0.6.0"
 edition = "2021"
 
 [dependencies]
-# allocative = "0.3.4"
-axum = "0.8.1"
-# bincode = { git = "https://github.com/bincode-org/bincode.git", features = [
-#     "serde",
-# ] }
 # bitcoin_hashes = { version = "0.15.0" }
 # biter = { path = "./src/crates/biter" }
 # chrono = { version = "0.4.39", features = ["serde"] }
 # clap = { version = "4.5.26", features = ["derive"] }
-color-eyre = { workspace = true }
 # ctrlc = { version = "3.4.5", features = ["termination"] }
-# derive_deref = "1.1.1"
-# env_logger = "0.11.6"
 # inferno = "0.12.1"
 # itertools = "0.13.0"
-# log = { version = "0.4.25", features = ["std", "serde"] }
 # ordered-float = "4.6.0"
 # rayon = "1.10.0"
+# rlimit = "0.10.2"
+# serde_json = "1.0.135"
+axum = "0.8.1"
+color-eyre = { workspace = true }
+computer = { workspace = true }
+derive_deref = { workspace = true }
+indexer = { workspace = true }
+jiff = { workspace = true }
+logger = { workspace = true }
+oxc = { version = "0.49.0", features = ["codegen", "minifier"] }
 regex = "1.11.1"
 reqwest = { version = "0.12.12", features = ["blocking", "json"] }
-# rlimit = "0.10.2"
-# snkrj = { path = "./src/crates/snkrj" }
-# serde = { version = "1.0.217", features = ["derive"] }
-# serde_json = "1.0.135"
-# struct_iterable = { path = "./src/crates/iterable" }
-swc = "13.0.1"
-swc_common = "6.0.0"
+serde = { workspace = true }
+serde_json = "1.0.138"
+storable_vec = { workspace = true }
+struct_iterable = { workspace = true }
 tokio = { version = "1.43.0", features = ["full"] }
-# toml = "0.8.19"
 tower-http = { version = "0.6.2", features = ["compression-full"] }
 zstd = "0.13.2"
diff --git a/server/src/api/handlers/dataset.rs b/server/src/api/handlers/dataset.rs
index b7cc4154e..2a6e4d04f 100644
--- a/server/src/api/handlers/dataset.rs
+++ b/server/src/api/handlers/dataset.rs
@@ -15,9 +15,7 @@ use serde::{de::DeserializeOwned, Deserialize, Serialize};
 use crate::{
     server::{
         api::{
-            structs::{
-                ChunkMetadata, DatasetRange, DatasetRangeChunk, Extension, Kind, Route, Routes,
-            },
+            structs::{ChunkMetadata, DatasetRange, DatasetRangeChunk, Extension, Kind, Route, Routes},
             API_URL_PREFIX,
         },
         header_map::{HeaderMapExtended, Modified},
@@ -26,8 +24,8 @@ use crate::{
         AppState,
     },
     structs::{
-        Date, GenericMap, Height, HeightMapChunkId, MapChunkId, MapKey, MapSerialized, MapValue,
-        SerializedBTreeMap, SerializedDateMap, SerializedTimeMap, SerializedVec, Timestamp, OHLC,
+        Date, GenericMap, Height, HeightMapChunkId, MapChunkId, MapKey, MapSerialized, MapValue, SerializedBTreeMap,
+        SerializedDateMap, SerializedTimeMap, SerializedVec, Timestamp, OHLC,
     },
 };
 
@@ -50,12 +48,8 @@ pub async fn dataset_handler(
         "{API_URL_PREFIX}/{}?kind={}{}{}",
         path.0,
         query.kind,
-        query
-            .chunk
-            .map_or("".to_string(), |chunk| format!("&chunk={chunk}")),
-        query
-            .all
-            .map_or("".to_string(), |all| format!("&all={all}"))
+        query.chunk.map_or("".to_string(), |chunk| format!("&chunk={chunk}")),
+        query.all.map_or("".to_string(), |all| format!("&all={all}"))
     );
 
     match result_handler(headers, &path, &query, app_state) {
@@ -64,8 +58,7 @@ pub async fn dataset_handler(
             response
         }
         Err(error) => {
-            let mut response =
-                (StatusCode::INTERNAL_SERVER_ERROR, error.to_string()).into_response();
+            let mut response = (StatusCode::INTERNAL_SERVER_ERROR, error.to_string()).into_response();
             log_result(response.status(), &ser_path, instant);
             response.headers_mut().insert_cors();
             response
@@ -129,64 +122,49 @@ where
             let last_value: T = route.serialization.import(&route.path.join("last"))?;
             return Ok(axum::response::Json(last_value).into_response());
         }
-        Kind::Date => match read_serialized::<Date, T, _, SerializedDateMap<T>>(
-            id, &headers, route, &range, query,
-        )? {
+        Kind::Date => match read_serialized::<Date, T, _, SerializedDateMap<T>>(id, &headers, route, &range, query)? {
             ReadSerialized::DatasetAndDate((dataset, date, chunk_meta)) => {
                 (serialized_to_response(dataset, id, chunk_meta, ext), date)
             }
             ReadSerialized::NotModified => return Ok(Response::new_not_modified()),
             ReadSerialized::_Phantom(_) => unreachable!(),
         },
-        Kind::Height => match read_serialized::<Height, T, _, SerializedVec<T>>(
-            id, &headers, route, &range, query,
-        )? {
+        Kind::Height => match read_serialized::<Height, T, _, SerializedVec<T>>(id, &headers, route, &range, query)? {
             ReadSerialized::DatasetAndDate((dataset, date, chunk_meta)) => (
-                serialized_to_response::<Height, T, _, SerializedVec<T>>(
-                    dataset, id, chunk_meta, ext,
-                ),
+                serialized_to_response::<Height, T, _, SerializedVec<T>>(dataset, id, chunk_meta, ext),
                 date,
             ),
             ReadSerialized::NotModified => return Ok(Response::new_not_modified()),
             ReadSerialized::_Phantom(_) => unreachable!(),
         },
         Kind::Timestamp => {
-            let (dataset, date, chunk_meta) = match read_serialized::<Height, T, _, SerializedVec<T>>(
-                id, &headers, route, &range, query,
+            let (dataset, date, chunk_meta) =
+                match read_serialized::<Height, T, _, SerializedVec<T>>(id, &headers, route, &range, query)? {
+                    ReadSerialized::DatasetAndDate(tuple) => tuple,
+                    ReadSerialized::NotModified => return Ok(Response::new_not_modified()),
+                    ReadSerialized::_Phantom(_) => unreachable!(),
+                };
+
+            let (timestamp_dataset, _, _) = match read_serialized::<Height, Timestamp, _, SerializedVec<Timestamp>>(
+                "timestamp",
+                &headers,
+                routes.get("timestamp").unwrap(),
+                &range,
+                query,
             )? {
                 ReadSerialized::DatasetAndDate(tuple) => tuple,
                 ReadSerialized::NotModified => return Ok(Response::new_not_modified()),
                 ReadSerialized::_Phantom(_) => unreachable!(),
             };
 
-            let (timestamp_dataset, _, _) =
-                match read_serialized::<Height, Timestamp, _, SerializedVec<Timestamp>>(
-                    "timestamp",
-                    &headers,
-                    routes.get("timestamp").unwrap(),
-                    &range,
-                    query,
-                )? {
-                    ReadSerialized::DatasetAndDate(tuple) => tuple,
-                    ReadSerialized::NotModified => return Ok(Response::new_not_modified()),
-                    ReadSerialized::_Phantom(_) => unreachable!(),
-                };
-
             let mut serialized_timemap: SerializedTimeMap<T> = SerializedBTreeMap::default();
 
-            dataset
-                .map
-                .into_iter()
-                .enumerate()
-                .for_each(|(index, value)| {
-                    serialized_timemap.map.insert(
-                        timestamp_dataset
-                            .get_index(index)
-                            .cloned()
-                            .unwrap_or(Timestamp::now()),
-                        value,
-                    );
-                });
+            dataset.map.into_iter().enumerate().for_each(|(index, value)| {
+                serialized_timemap.map.insert(
+                    timestamp_dataset.get_index(index).cloned().unwrap_or(Timestamp::now()),
+                    value,
+                );
+            });
 
             (
                 serialized_to_response::<Timestamp, T, HeightMapChunkId, SerializedTimeMap<T>>(
@@ -287,19 +265,13 @@ where
 
     let date_modified;
 
-    let datasets =
-        GenericMap::<Key, Value, ChunkId, Serialized>::_read_dir(&folder_path, serialization);
+    let datasets = GenericMap::<Key, Value, ChunkId, Serialized>::_read_dir(&folder_path, serialization);
 
     let mut chunk_meta = None;
 
     let dataset = if let DatasetRange::Chunk(range_chunk) = range {
         let chunk_id = match range_chunk {
-            DatasetRangeChunk::Last => {
-                *datasets
-                    .last_key_value()
-                    .context("Last tuple of dataset directory")?
-                    .0
-            }
+            DatasetRangeChunk::Last => *datasets.last_key_value().context("Last tuple of dataset directory")?.0,
             DatasetRangeChunk::Chunk(chunk) => ChunkId::from_usize(*chunk),
         };
 
@@ -358,11 +330,7 @@ where
         Serialized::import_all(&folder_path, serialization)
     };
 
-    Ok(ReadSerialized::DatasetAndDate((
-        dataset,
-        date_modified,
-        chunk_meta,
-    )))
+    Ok(ReadSerialized::DatasetAndDate((dataset, date_modified, chunk_meta)))
 }
 
 #[derive(Serialize)]
diff --git a/server/src/api/mod.rs b/server/src/api/mod.rs
index 9ea585089..8cbd71a6f 100644
--- a/server/src/api/mod.rs
+++ b/server/src/api/mod.rs
@@ -1,12 +1,25 @@
-use axum::{routing::get, Router};
-use handlers::{dataset_handler, last_values_handler};
+use std::time::Instant;
+
+use axum::{
+    extract::{Query, State},
+    http::HeaderMap,
+    response::{IntoResponse, Response},
+    routing::get,
+    Json, Router,
+};
+use color_eyre::eyre::eyre;
+use reqwest::StatusCode;
+use serde::Deserialize;
+use structs::{Format, Index};
+
+use crate::{log_result, traits::HeaderMapExtended};
 
 use super::AppState;
 
-mod handlers;
+// mod handlers;
 pub mod structs;
 
-pub const API_URL_PREFIX: &str = "/api";
+pub const VECS_URL_PREFIX: &str = "/api/vecs";
 
 pub trait ApiRoutes {
     fn add_api_routes(self) -> Self;
@@ -14,7 +27,81 @@ pub trait ApiRoutes {
 
 impl ApiRoutes for Router<AppState> {
     fn add_api_routes(self) -> Self {
-        self.route(&format!("{API_URL_PREFIX}/last"), get(last_values_handler))
-            .route(&format!("{API_URL_PREFIX}/*path"), get(dataset_handler))
+        self.route(VECS_URL_PREFIX, get(handler))
+    }
+}
+
+#[derive(Debug, Deserialize)]
+pub struct DatasetParams {
+    pub i: String,
+    pub v: String,
+    pub from: Option<i64>,
+    pub to: Option<i64>,
+    pub format: Option<String>,
+}
+
+pub async fn handler(headers: HeaderMap, query: Query<DatasetParams>, State(app_state): State<AppState>) -> Response {
+    let instant = Instant::now();
+
+    let path = format!(
+        "{VECS_URL_PREFIX}?i={}&v={}{}{}",
+        query.i,
+        query.v,
+        query.from.map_or("".to_string(), |from| format!("&from={from}")),
+        query.to.map_or("".to_string(), |to| format!("&to={to}")),
+    );
+
+    match req_to_response_res(headers, query, app_state) {
+        Ok(response) => {
+            log_result(response.status(), &path, instant);
+            response
+        }
+        Err(error) => {
+            let mut response = (StatusCode::INTERNAL_SERVER_ERROR, error.to_string()).into_response();
+            log_result(response.status(), &path, instant);
+            response.headers_mut().insert_cors();
+            response
+        }
+    }
+}
+
+fn req_to_response_res(
+    headers: HeaderMap,
+    Query(DatasetParams { format, from, i, to, v }): Query<DatasetParams>,
+    AppState { vecs, .. }: AppState,
+) -> color_eyre::Result<Response> {
+    let format = Format::try_from(format).ok();
+    let indexes = i
+        .to_lowercase()
+        .split(",")
+        .flat_map(|s| Index::try_from(s).ok())
+        .collect::<Vec<_>>();
+
+    if indexes.len() > 1 {
+        return Err(eyre!("Multiple indexes aren't supported yet !"));
+    } else if indexes.is_empty() {
+        return Err(eyre!("Bad index(es)"));
+    }
+
+    dbg!(format, &indexes, &v, from, to);
+
+    let values = v
+        .to_lowercase()
+        .split(",")
+        .flat_map(|s| vecs.get(&s.replace("_", "-")))
+        .flat_map(|i_to_v| i_to_v.get(indexes.first().unwrap()))
+        .map(|vec| vec.collect_range(from, to).unwrap())
+        .collect::<Vec<_>>();
+
+    if values.len() == 1 {
+        let values = values.first().unwrap();
+        if values.len() == 1 {
+            let value = values.first().unwrap();
+            Ok(Json(value).into_response())
+        } else {
+            Ok(Json(values).into_response())
+        }
+    } else {
+        Ok(Json(values).into_response())
     }
 }
diff --git a/server/src/api/structs/chunk_metadata.rs b/server/src/api/structs/chunk_metadata.rs
deleted file mode 100644
index 9dc2535e0..000000000
--- a/server/src/api/structs/chunk_metadata.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-use serde::{Deserialize, Serialize};
-
-#[derive(Debug, Serialize, Deserialize)]
-pub struct ChunkMetadata {
-    pub id: usize,
-    pub previous: Option<String>,
-    pub next: Option<String>,
-}
diff --git a/server/src/api/structs/extension.rs b/server/src/api/structs/extension.rs
deleted file mode 100644
index 1a4d5a33c..000000000
--- a/server/src/api/structs/extension.rs
+++ /dev/null
@@ -1,34 +0,0 @@
-use std::path::Path;
-
-#[derive(PartialEq, Eq, Clone, Copy)]
-pub enum Extension {
-    #[allow(clippy::upper_case_acronyms)]
-    CSV,
-    #[allow(clippy::upper_case_acronyms)]
-    JSON,
-}
-
-impl Extension {
-    pub fn from(path: &Path) -> Option<Self> {
-        if let Some(extension) = path.extension() {
-            let extension = extension.to_str().unwrap();
-
-            if extension == Self::CSV.to_str() {
-                Some(Self::CSV)
-            } else if extension == Self::JSON.to_str() {
-                Some(Self::JSON)
-            } else {
-                None
-            }
-        } else {
-            None
-        }
-    }
-
-    pub fn to_str(&self) -> &str {
-        match self {
-            Extension::CSV => "csv",
-            Extension::JSON => "json",
-        }
-    }
-}
diff --git a/server/src/api/structs/format.rs b/server/src/api/structs/format.rs
new file mode 100644
index 000000000..5e0da56a8
--- /dev/null
+++ b/server/src/api/structs/format.rs
@@ -0,0 +1,27 @@
+use color_eyre::eyre::eyre;
+
+#[allow(clippy::upper_case_acronyms)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum Format {
+    CSV,
+    JSON,
+}
+
+impl TryFrom<Option<String>> for Format {
+    type Error = color_eyre::Report;
+    fn try_from(value: Option<String>) -> Result<Self, Self::Error> {
+        if let Some(value) = value {
+            let value = value.to_lowercase();
+            let value = value.as_str();
+            if value == "csv" {
+                Ok(Self::CSV)
+            } else if value == "json" {
+                Ok(Self::JSON)
+            } else {
+                Err(eyre!("Fail"))
+            }
+        } else {
+            Err(eyre!("Fail"))
+        }
+    }
+}
diff --git a/server/src/api/structs/index.rs b/server/src/api/structs/index.rs
new file mode 100644
index 000000000..5de782cdf
--- /dev/null
+++ b/server/src/api/structs/index.rs
@@ -0,0 +1,122 @@
+use std::fmt::{self, Debug};
+
+use computer::Date;
+use indexer::{
+    Addressindex, Height, P2PK33index, P2PK65index, P2PKHindex, P2SHindex, P2TRindex, P2WPKHindex, P2WSHindex, Txindex,
+    Txinindex, Txoutindex,
+};
+
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
+pub enum Index {
+    Addressindex,
+    Date,
+    Height,
+    P2PK33index,
+    P2PK65index,
+    P2PKHindex,
+    P2SHindex,
+    P2TRindex,
+    P2WPKHindex,
+    P2WSHindex,
+    Txindex,
+    Txinindex,
+    Txoutindex,
+}
+
+impl TryFrom<&str> for Index {
+    type Error = ();
+    fn try_from(value: &str) -> Result<Self, Self::Error> {
+        Ok(match value {
+            "addri" | "addressindex" => Self::Addressindex,
+            "d" | "date" => Self::Date,
+            "h" | "height" => Self::Height,
+            "p2pk33index" => Self::P2PK33index,
+            "p2pk65index" => Self::P2PK65index,
+            "p2pkhindex" => Self::P2PKHindex,
+            "p2shindex" => Self::P2SHindex,
+            "p2trindex" => Self::P2TRindex,
+            "p2wpkhindex" => Self::P2WPKHindex,
+            "p2wshindex" => Self::P2WSHindex,
+            "txi" | "txindex" => Self::Txindex,
+            "txini" | "txinindex" => Self::Txinindex,
+            "txouti" | "txoutindex" => Self::Txoutindex,
+            _ => return Err(()),
+        })
+    }
+}
+
+impl fmt::Display for Index {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        Debug::fmt(self, f)
+    }
+}
+
+pub trait IndexTypeToIndexEnum {
+    fn to_enum() -> Index;
+}
+
+impl IndexTypeToIndexEnum for Addressindex {
+    fn to_enum() -> Index {
+        Index::Addressindex
+    }
+}
+impl IndexTypeToIndexEnum for Date {
+    fn to_enum() -> Index {
+        Index::Date
+    }
+}
+impl IndexTypeToIndexEnum for Height {
+    fn to_enum() -> Index {
+        Index::Height
+    }
+}
+impl IndexTypeToIndexEnum for Txindex {
+    fn to_enum() -> Index {
+        Index::Txindex
+    }
+}
+impl IndexTypeToIndexEnum for Txinindex {
+    fn to_enum() -> Index {
+        Index::Txinindex
+    }
+}
+impl IndexTypeToIndexEnum for Txoutindex {
+    fn to_enum() -> Index {
+        Index::Txoutindex
+    }
+}
+impl IndexTypeToIndexEnum for P2PK33index {
+    fn to_enum() -> Index {
+        Index::P2PK33index
+    }
+}
+impl IndexTypeToIndexEnum for P2PK65index {
+    fn to_enum() -> Index {
+        Index::P2PK65index
+    }
+}
+impl IndexTypeToIndexEnum for P2PKHindex {
+    fn to_enum() -> Index {
+        Index::P2PKHindex
+    }
+}
+impl IndexTypeToIndexEnum for P2SHindex {
+    fn to_enum() -> Index {
+        Index::P2SHindex
+    }
+}
+impl IndexTypeToIndexEnum for P2TRindex {
+    fn to_enum() -> Index {
+        Index::P2TRindex
+    }
+}
+impl IndexTypeToIndexEnum for P2WPKHindex {
+    fn to_enum() -> Index {
+        Index::P2WPKHindex
+    }
+}
+impl IndexTypeToIndexEnum for P2WSHindex {
+    fn to_enum() -> Index {
+        Index::P2WSHindex
+    }
+}
diff --git a/server/src/api/structs/kind.rs b/server/src/api/structs/kind.rs
index 67456ceb5..31e6a852a 100644
--- a/server/src/api/structs/kind.rs
+++ b/server/src/api/structs/kind.rs
@@ -9,8 +9,8 @@ use crate::structs::{AnyMap, Date, Height, MapKey};
 pub enum Kind {
     Date,
     Height,
-    Timestamp,
-    Last,
+    // Timestamp,
+    // Last,
 }
 
 impl TryFrom<&String> for Kind {
@@ -26,8 +26,8 @@ impl TryFrom<&String> for Kind {
             {
                 'd' => Self::Date,
                 'h' => Self::Height,
-                't' => Self::Timestamp,
-                'l' => Self::Last,
+                // 't' => Self::Timestamp,
+                // 'l' => Self::Last,
                 _ => return Err(eyre!("Bad kind")),
             },
         )
diff --git a/server/src/api/structs/mod.rs b/server/src/api/structs/mod.rs
index 76df682d8..33cc08128 100644
--- a/server/src/api/structs/mod.rs
+++ b/server/src/api/structs/mod.rs
@@ -1,13 +1,15 @@
-mod chunk_metadata;
-mod extension;
-mod kind;
-mod range;
-mod route;
-mod routes;
+// mod chunk_metadata;
+mod format;
+mod index;
+// mod kind;
+// mod range;
+// mod route;
+// mod routes;
 
-pub use chunk_metadata::*;
-pub use extension::*;
-pub use kind::*;
-pub use range::*;
-pub use route::*;
-pub use routes::*;
+// pub use chunk_metadata::*;
+pub use format::*;
+pub use index::*;
+// pub use kind::*;
+// pub use range::*;
+// pub use route::*;
+// pub use routes::*;
diff --git a/server/src/lib.rs b/server/src/lib.rs
index 6cdd0422e..bf1271520 100644
--- a/server/src/lib.rs
+++ b/server/src/lib.rs
@@ -1,40 +1,155 @@
-use std::{sync::Arc, time::Instant};
+use std::{collections::BTreeMap, time::Instant};
 
-use api::{structs::Routes, ApiRoutes};
-use axum::{routing::get, serve, Router};
+use api::{
+    structs::{Index, IndexTypeToIndexEnum},
+    ApiRoutes,
+};
+use axum::{body::Body, response::IntoResponse, routing::get, serve, Router};
 use color_eyre::owo_colors::OwoColorize;
-use log::{error, info};
+use computer::Computer;
+use derive_deref::{Deref, DerefMut};
+use indexer::Indexer;
+use logger::{error, info};
 use reqwest::StatusCode;
+use serde::Serialize;
+use serde_json::Value;
+use storable_vec::{StorableVecIndex, StorableVecType, STATELESS};
 use tokio::net::TcpListener;
 use tower_http::compression::CompressionLayer;
 use website::WebsiteRoutes;
 
-use crate::structs::Config;
-
-pub mod api;
-mod header_map;
-mod response;
+mod api;
+mod traits;
 mod website;
 
 #[derive(Clone)]
 pub struct AppState {
-    routes: Arc<Routes>,
-    config: Config,
+    vecs: &'static VecIdToIndexToVec,
+    indexer: &'static Indexer<STATELESS>,
+    computer: &'static Computer<STATELESS>,
 }
 
-pub async fn main(routes: Routes, config: Config) -> color_eyre::Result<()> {
-    routes.generate_dts_file();
+#[derive(Default, Deref, DerefMut)]
+pub struct VecIdToIndexToVec(BTreeMap<String, IndexToVec>);
+
+impl VecIdToIndexToVec {
+    pub fn insert<I, T>(&mut self, vec: &'static storable_vec::StorableVec<I, T, STATELESS>)
+    where
+        I: StorableVecIndex + IndexTypeToIndexEnum + Send + Sync,
+        T: StorableVecType + Send + Sync + Serialize,
+    {
+        let file_name = vec.file_name();
+        let split = file_name.split("_to_").collect::<Vec<_>>();
+        if split.len() != 2 {
+            panic!();
+        }
+        let index = vec.key_to_enum();
+        if split[0] != index.to_string().to_lowercase() {
+            dbg!(split[0], index.to_string());
+            panic!();
+        }
+        let key = split[1].to_string().replace("_", "-");
+        let prev = self.entry(key).or_default().insert(index, vec);
+        if prev.is_some() {
+            panic!()
+        }
+    }
+}
+
+#[derive(Default, Deref, DerefMut)]
+pub struct IndexToVec {
+    pub index_to_vec: BTreeMap<Index, &'static (dyn AnyStatelessStorableVec + Send + Sync)>,
+}
+
+pub trait AnyStatelessStorableVec {
+    fn key_to_enum(&self) -> Index;
+    fn collect_range(&self, from: Option<i64>, to: Option<i64>) -> storable_vec::Result<Vec<Value>>;
+    // fn collect_range(&self, from: Option<i64>, to: Option<i64>) -> storable_vec::Result<Vec<T>>;
+}
+
+impl<I, T> AnyStatelessStorableVec for storable_vec::StorableVec<I, T, STATELESS>
+where
+    I: StorableVecIndex + IndexTypeToIndexEnum + Send + Sync,
+    T: StorableVecType + Send + Sync + Serialize,
+{
+    fn key_to_enum(&self) -> Index {
+        I::to_enum()
+    }
+
+    fn collect_range(&self, from: Option<i64>, to: Option<i64>) -> storable_vec::Result<Vec<Value>> {
+        Ok(self
+            .collect_range(from, to)?
+            .into_iter()
+            .map(|v| serde_json::to_value(v).unwrap())
+            .collect::<Vec<_>>())
+    }
+}
+
+trait StatelessVecs {
+    fn parse(&'static self, vecs: &mut VecIdToIndexToVec);
+}
+
+impl StatelessVecs for Indexer<STATELESS> {
+    fn parse(&'static self, vecs: &mut VecIdToIndexToVec) {
+        vecs.insert(&self.vecs.addressindex_to_addresstype);
+        vecs.insert(&self.vecs.addressindex_to_addresstypeindex);
+        vecs.insert(&self.vecs.addressindex_to_height);
+        vecs.insert(&self.vecs.height_to_blockhash);
+        vecs.insert(&self.vecs.height_to_difficulty);
+        vecs.insert(&self.vecs.height_to_first_addressindex);
+        vecs.insert(&self.vecs.height_to_first_emptyindex);
+        vecs.insert(&self.vecs.height_to_first_multisigindex);
+        vecs.insert(&self.vecs.height_to_first_opreturnindex);
+        vecs.insert(&self.vecs.height_to_first_pushonlyindex);
+        vecs.insert(&self.vecs.height_to_first_txindex);
+        vecs.insert(&self.vecs.height_to_first_txinindex);
+        vecs.insert(&self.vecs.height_to_first_txoutindex);
+        vecs.insert(&self.vecs.height_to_first_unknownindex);
+        vecs.insert(&self.vecs.height_to_first_p2pk33index);
+        vecs.insert(&self.vecs.height_to_first_p2pk65index);
+        vecs.insert(&self.vecs.height_to_first_p2pkhindex);
+        vecs.insert(&self.vecs.height_to_first_p2shindex);
+        vecs.insert(&self.vecs.height_to_first_p2trindex);
+        vecs.insert(&self.vecs.height_to_first_p2wpkhindex);
+        vecs.insert(&self.vecs.height_to_first_p2wshindex);
+        vecs.insert(&self.vecs.height_to_size);
+        vecs.insert(&self.vecs.height_to_timestamp);
+        vecs.insert(&self.vecs.height_to_weight);
+        vecs.insert(&self.vecs.p2pk33index_to_p2pk33addressbytes);
+        vecs.insert(&self.vecs.p2pk65index_to_p2pk65addressbytes);
+        vecs.insert(&self.vecs.p2pkhindex_to_p2pkhaddressbytes);
+        vecs.insert(&self.vecs.p2shindex_to_p2shaddressbytes);
+        vecs.insert(&self.vecs.p2trindex_to_p2traddressbytes);
+        vecs.insert(&self.vecs.p2wpkhindex_to_p2wpkhaddressbytes);
+        vecs.insert(&self.vecs.p2wshindex_to_p2wshaddressbytes);
+        vecs.insert(&self.vecs.txindex_to_first_txinindex);
+        vecs.insert(&self.vecs.txindex_to_first_txoutindex);
+        vecs.insert(&self.vecs.txindex_to_height);
+        vecs.insert(&self.vecs.txindex_to_locktime);
+        vecs.insert(&self.vecs.txindex_to_txid);
+        vecs.insert(&self.vecs.txindex_to_txversion);
+        vecs.insert(&self.vecs.txinindex_to_txoutindex);
+        vecs.insert(&self.vecs.txoutindex_to_addressindex);
+        vecs.insert(&self.vecs.txoutindex_to_amount);
+    }
+}
+
+pub async fn main(indexer: Indexer<STATELESS>, computer: Computer<STATELESS>) -> color_eyre::Result<()> {
+    // pub async fn main(routes: Routes, config: Config) -> color_eyre::Result<()> {
+    // routes.generate_dts_file();
+
+    let indexer = Box::leak(Box::new(indexer));
+    let computer = Box::leak(Box::new(computer));
+    let vecs = Box::leak(Box::new(VecIdToIndexToVec::default()));
+    indexer.parse(vecs);
 
     let state = AppState {
-        routes: Arc::new(routes),
-        config,
+        vecs,
+        indexer,
+        computer,
     };
 
-    let compression_layer = CompressionLayer::new()
-        .br(true)
-        .deflate(true)
-        .gzip(true)
-        .zstd(true);
+    let compression_layer = CompressionLayer::new().br(true).deflate(true).gzip(true).zstd(true);
 
     let router = Router::new()
         .add_api_routes()
@@ -55,6 +170,7 @@ pub async fn main(routes: Routes, config: Config) -> color_eyre::Result<()> {
     }
 
     info!("Starting server on port {port}...");
+
     let listener = listener.unwrap();
 
     serve(listener, router).await?;
diff --git a/server/src/main.rs b/server/src/main.rs
new file mode 100644
index 000000000..b01a47c11
--- /dev/null
+++ b/server/src/main.rs
@@ -0,0 +1,20 @@
+use std::path::Path;
+
+use computer::Computer;
+use indexer::Indexer;
+use storable_vec::STATELESS;
+
+#[tokio::main]
+pub async fn main() -> color_eyre::Result<()> {
+    color_eyre::install()?;
+
+    logger::init_log(None);
+
+    let path = Path::new("../_outputs");
+    let indexer: Indexer<STATELESS> = Indexer::import(&path.join("indexes"))?;
+    let computer: Computer<STATELESS> = Computer::import(&path.join("computed"))?;
+
+    berver::main(indexer, computer).await.unwrap();
+
+    Ok(())
+}
diff --git a/server/src/header_map.rs b/server/src/traits/header_map.rs
similarity index 80%
rename from server/src/header_map.rs
rename to server/src/traits/header_map.rs
index c9b63c42c..68aaf902d 100644
--- a/server/src/header_map.rs
+++ b/server/src/traits/header_map.rs
@@ -1,15 +1,15 @@
-use std::path::Path;
+use std::{path::Path, time};
 
 use axum::http::{header, HeaderMap};
-use chrono::{DateTime, Timelike, Utc};
-use log::info;
+use jiff::{civil::DateTime, fmt::strtime, tz::TimeZone, Timestamp};
+use logger::info;
 use reqwest::header::{HOST, IF_MODIFIED_SINCE};
 
 const STALE_IF_ERROR: u64 = 30_000_000; // 1 Year ish
 const MODIFIED_SINCE_FORMAT: &str = "%a, %d %b %Y %H:%M:%S GMT";
 
 #[derive(PartialEq, Eq)]
-pub enum Modified {
+pub enum ModifiedState {
     ModifiedSince,
     NotModifiedSince,
 }
@@ -23,14 +23,13 @@ pub trait HeaderMapExtended {
 
     fn insert_cors(&mut self);
 
-    fn get_if_modified_since(&self) -> Option<DateTime<Utc>>;
-    fn check_if_modified_since(&self, path: &Path)
-        -> color_eyre::Result<(Modified, DateTime<Utc>)>;
+    fn get_if_modified_since(&self) -> Option<DateTime>;
+    fn check_if_modified_since(&self, path: &Path) -> color_eyre::Result<(ModifiedState, DateTime)>;
 
     fn insert_cache_control_immutable(&mut self);
     #[allow(unused)]
     fn insert_cache_control_revalidate(&mut self, max_age: u64, stale_while_revalidate: u64);
-    fn insert_last_modified(&mut self, date: DateTime<Utc>);
+    fn insert_last_modified(&mut self, date: DateTime);
 
     fn insert_content_disposition_attachment(&mut self);
 
@@ -102,40 +101,39 @@ impl HeaderMapExtended for HeaderMap {
     );
     }
 
-    fn insert_last_modified(&mut self, date: DateTime<Utc>) {
-        let formatted = date.format(MODIFIED_SINCE_FORMAT).to_string();
+    fn insert_last_modified(&mut self, date: DateTime) {
+        let formatted = date
+            .to_zoned(TimeZone::system())
+            .unwrap()
+            .strftime(MODIFIED_SINCE_FORMAT)
+            .to_string();
 
         self.insert(header::LAST_MODIFIED, formatted.parse().unwrap());
     }
 
-    fn check_if_modified_since(
-        &self,
-        path: &Path,
-    ) -> color_eyre::Result<(Modified, DateTime<Utc>)> {
-        let time = path.metadata()?.modified()?;
-        let date: DateTime<Utc> = time.into();
-        let date = date.with_nanosecond(0).unwrap();
+    fn check_if_modified_since(&self, path: &Path) -> color_eyre::Result<(ModifiedState, DateTime)> {
+        let duration = path.metadata()?.modified()?.duration_since(time::UNIX_EPOCH).unwrap();
+        let date = Timestamp::new(duration.as_secs() as i64, 0)
+            .unwrap()
+            .to_zoned(TimeZone::UTC)
+            .datetime();
 
         if let Some(if_modified_since) = self.get_if_modified_since() {
             if if_modified_since == date {
-                return Ok((Modified::NotModifiedSince, date));
+                return Ok((ModifiedState::NotModifiedSince, date));
             }
         }
 
-        Ok((Modified::ModifiedSince, date))
+        Ok((ModifiedState::ModifiedSince, date))
     }
 
-    fn get_if_modified_since(&self) -> Option<DateTime<Utc>> {
+    fn get_if_modified_since(&self) -> Option<DateTime> {
         if let Some(modified_since) = self.get(IF_MODIFIED_SINCE) {
             if let Ok(modified_since) = modified_since.to_str() {
-                let date = DateTime::parse_from_str(
-                    &format!("{modified_since} +00:00"),
-                    &format!("{MODIFIED_SINCE_FORMAT} %z"),
-                );
-
-                if let Ok(x) = date {
-                    return Some(x.to_utc());
-                }
+                return strtime::parse(MODIFIED_SINCE_FORMAT, modified_since)
+                    .unwrap()
+                    .to_datetime()
+                    .ok();
             }
         }
 
@@ -176,10 +174,7 @@ impl HeaderMapExtended for HeaderMap {
     }
 
     fn insert_content_type_application_javascript(&mut self) {
-        self.insert(
-            header::CONTENT_TYPE,
-            "application/javascript".parse().unwrap(),
-        );
+        self.insert(header::CONTENT_TYPE, "application/javascript".parse().unwrap());
     }
 
     fn insert_content_type_application_json(&mut self) {
@@ -187,10 +182,7 @@ impl HeaderMapExtended for HeaderMap {
     }
 
     fn insert_content_type_application_manifest_json(&mut self) {
-        self.insert(
-            header::CONTENT_TYPE,
-            "application/manifest+json".parse().unwrap(),
-        );
+        self.insert(header::CONTENT_TYPE, "application/manifest+json".parse().unwrap());
     }
 
     fn insert_content_type_application_pdf(&mut self) {
diff --git a/server/src/traits/mod.rs b/server/src/traits/mod.rs
new file mode 100644
index 000000000..7055e7209
--- /dev/null
+++ b/server/src/traits/mod.rs
@@ -0,0 +1,5 @@
+mod header_map;
+mod response;
+
+pub use header_map::*;
+pub use response::*;
diff --git a/server/src/response.rs b/server/src/traits/response.rs
similarity index 100%
rename from server/src/response.rs
rename to server/src/traits/response.rs
diff --git a/server/src/website/handlers/_minify.rs b/server/src/website/handlers/_minify.rs
deleted file mode 100644
index aa5497b55..000000000
--- a/server/src/website/handlers/_minify.rs
+++ /dev/null
@@ -1,41 +0,0 @@
-// Files are bigger than with SWC, to retest later
-
-// Source: https://github.com/oxc-project/oxc/blob/main/crates/oxc_minifier/examples/minifier.rs
-
-use std::{fs, path::Path};
-
-use oxc::{
-    allocator::Allocator,
-    codegen::{CodeGenerator, CodegenOptions},
-    minifier::{MinifierOptions, MinifierReturn},
-    parser::{Parser, ParserReturn},
-    span::SourceType,
-};
-
-//
-pub fn minify_js(path: &Path) -> String {
-    let allocator = Allocator::default();
-
-    let source_type = SourceType::from_path(path).unwrap();
-
-    let source_text = fs::read_to_string(path).unwrap();
-
-    let ParserReturn { mut program, .. } =
-        Parser::new(&allocator, &source_text, source_type).parse();
-
-    let minifier = oxc::minifier::Minifier::new(MinifierOptions::default());
-
-    let MinifierReturn { mangler } = minifier.build(&allocator, &mut program);
-
-    CodeGenerator::new()
-        .with_options(CodegenOptions {
-            single_quote: false,
-            minify: true,
-            comments: false,
-            annotation_comments: false,
-            source_map_path: None,
-        })
-        .with_mangler(mangler)
-        .build(&program)
-        .code
-}
diff --git a/server/src/website/handlers/file.rs b/server/src/website/handlers/file.rs
index c2788c951..e94022da8 100644
--- a/server/src/website/handlers/file.rs
+++ b/server/src/website/handlers/file.rs
@@ -10,18 +10,17 @@ use axum::{
     http::HeaderMap,
     response::{IntoResponse, Response},
 };
-use log::{error, info};
+use logger::{error, info};
 use reqwest::StatusCode;
 
-use crate::server::{
-    header_map::{HeaderMapExtended, Modified},
+use crate::{
     log_result,
-    response::ResponseExtended,
+    traits::{HeaderMapExtended, ModifiedState, ResponseExtended},
 };
 
 use super::minify_js;
 
-const WEBSITE_PATH: &str = "./src/website/";
+const WEBSITE_DEV_PATH: &str = "../website/";
 
 pub async fn file_handler(headers: HeaderMap, path: extract::Path<String>) -> Response {
     any_handler(headers, Some(path))
@@ -41,11 +40,8 @@ fn any_handler(headers: HeaderMap, path: Option<extract::Path<String>>) -> Respo
 
         if !path.exists() {
             if path.extension().is_some() {
-                let mut response: Response<Body> = (
-                    StatusCode::INTERNAL_SERVER_ERROR,
-                    "File doesn't exist".to_string(),
-                )
-                    .into_response();
+                let mut response: Response<Body> =
+                    (StatusCode::INTERNAL_SERVER_ERROR, "File doesn't exist".to_string()).into_response();
 
                 response.headers_mut().insert_cors();
 
@@ -70,11 +66,10 @@ fn any_handler(headers: HeaderMap, path: Option<extract::Path<String>>) -> Respo
 }
 
 fn path_to_response(headers: &HeaderMap, path: &Path) -> Response {
-    match _path_to_response(headers, path) {
+    match path_to_response_(headers, path) {
         Ok(response) => response,
         Err(error) => {
-            let mut response =
-                (StatusCode::INTERNAL_SERVER_ERROR, error.to_string()).into_response();
+            let mut response = (StatusCode::INTERNAL_SERVER_ERROR, error.to_string()).into_response();
 
             response.headers_mut().insert_cors();
 
@@ -83,9 +78,9 @@ fn path_to_response(headers: &HeaderMap, path: &Path) -> Response {
     }
 }
 
-fn _path_to_response(headers: &HeaderMap, path: &Path) -> color_eyre::Result<Response> {
+fn path_to_response_(headers: &HeaderMap, path: &Path) -> color_eyre::Result<Response> {
     let (modified, date) = headers.check_if_modified_since(path)?;
-    if modified == Modified::NotModifiedSince {
+    if modified == ModifiedState::NotModifiedSince {
         return Ok(Response::new_not_modified());
     }
 
@@ -124,10 +119,7 @@ fn _path_to_response(headers: &HeaderMap, path: &Path) -> color_eyre::Result<Res
             || serialized_path.contains("assets/")
             || serialized_path.contains("packages/")
             || path.extension().is_some_and(|extension| {
-                extension == "pdf"
-                    || extension == "jpg"
-                    || extension == "png"
-                    || extension == "woff2"
+                extension == "pdf" || extension == "jpg" || extension == "png" || extension == "woff2"
             })
         {
             headers.insert_cache_control_immutable();
@@ -140,5 +132,5 @@ fn _path_to_response(headers: &HeaderMap, path: &Path) -> color_eyre::Result<Res
 }
 
 fn str_to_path(path: &str) -> PathBuf {
-    PathBuf::from(&format!("{WEBSITE_PATH}{path}"))
+    PathBuf::from(&format!("{WEBSITE_DEV_PATH}{path}"))
 }
diff --git a/server/src/website/handlers/minify.rs b/server/src/website/handlers/minify.rs
index 5391b718a..15705778b 100644
--- a/server/src/website/handlers/minify.rs
+++ b/server/src/website/handlers/minify.rs
@@ -1,22 +1,43 @@
-// Simplified version of: https://github.com/swc-project/swc/blob/main/crates/swc/examples/minify.rs
+// Source: https://github.com/oxc-project/oxc/blob/main/crates/oxc_minifier/examples/minifier.rs
 
-use std::{path::Path, sync::Arc};
+use std::{fs, path::Path};
 
-use swc::{config::JsMinifyOptions, try_with_handler, JsMinifyExtras};
-use swc_common::{SourceMap, GLOBALS};
+use oxc::{
+    allocator::Allocator,
+    codegen::{CodeGenerator, CodegenOptions, LegalComment},
+    minifier::{CompressOptions, MangleOptions, Minifier, MinifierOptions},
+    parser::Parser,
+    span::SourceType,
+};
 
+//
 pub fn minify_js(path: &Path) -> String {
-    let source_map = Arc::<SourceMap>::default();
-    let compiler = swc::Compiler::new(source_map.clone());
+    let allocator = Allocator::default();
 
-    GLOBALS
-        .set(&Default::default(), || {
-            try_with_handler(source_map.clone(), Default::default(), |handler| {
-                let fm = source_map.load_file(path).expect("failed to load file");
+    let source_type = SourceType::from_path(path).unwrap();
 
-                compiler.minify(fm, handler, &JsMinifyOptions::default(), JsMinifyExtras::default())
-            })
+    let source_text = fs::read_to_string(path).unwrap();
+
+    let parser_return = Parser::new(&allocator, &source_text, source_type).parse();
+
+    let mut program = parser_return.program;
+
+    let minifier_return = Minifier::new(MinifierOptions {
+        mangle: Some(MangleOptions::default()),
+        compress: Some(CompressOptions::default()),
+    })
+    .build(&allocator, &mut program);
+
+    CodeGenerator::new()
+        .with_options(CodegenOptions {
+            minify: true,
+            single_quote: false,
+            comments: false,
+            annotation_comments: false,
+            source_map_path: None,
+            legal_comments: LegalComment::None,
         })
-        .unwrap()
+        .with_symbol_table(minifier_return.symbol_table)
+        .build(&program)
         .code
 }
diff --git a/server/src/website/mod.rs b/server/src/website/mod.rs
index fcb31516e..5aa3a0d09 100644
--- a/server/src/website/mod.rs
+++ b/server/src/website/mod.rs
@@ -12,7 +12,6 @@ pub trait WebsiteRoutes {
 
 impl WebsiteRoutes for Router<AppState> {
     fn add_website_routes(self) -> Self {
-        self.route("/*path", get(file_handler))
-            .route("/", get(index_handler))
+        self.route("/{*path}", get(file_handler)).route("/", get(index_handler))
     }
 }

From cf26696d12bf337457de031ae9ef44273ac50395 Mon Sep 17 00:00:00 2001
From: nym21 <expat-epochs0i@icloud.com>
Date: Tue, 11 Feb 2025 19:01:30 +0100
Subject: [PATCH 42/63] global: snapshot

---
 Cargo.lock                               | 2266 ++++++----------------
 Cargo.toml                               |   12 +-
 computer/src/lib.rs                      |   31 +-
 computer/src/main.rs                     |   12 +-
 computer/src/storage/storable_vecs.rs    |   15 +-
 exit/Cargo.toml                          |    1 +
 exit/src/lib.rs                          |    6 +-
 indexer/Cargo.toml                       |    4 +
 indexer/src/lib.rs                       |   55 +-
 indexer/src/main.rs                      |    8 +
 indexer/src/storage/storable_vecs/mod.rs |   82 +-
 indexer/src/structs/addressbytes.rs      |   31 +-
 indexer/src/structs/addressindex.rs      |    2 +
 indexer/src/structs/addresstype.rs       |    5 +-
 indexer/src/structs/addresstypeindex.rs  |  484 ++++-
 indexer/src/structs/amount.rs            |    2 +
 indexer/src/structs/blockhash.rs         |    3 +-
 indexer/src/structs/height.rs            |    2 +
 indexer/src/structs/locktime.rs          |    3 +-
 indexer/src/structs/timestamp.rs         |    5 +-
 indexer/src/structs/txid.rs              |    3 +-
 indexer/src/structs/txindex.rs           |    2 +
 indexer/src/structs/txinindex.rs         |    2 +
 indexer/src/structs/txoutindex.rs        |    2 +
 indexer/src/structs/txversion.rs         |    3 +-
 indexer/src/structs/weight.rs            |    3 +-
 iterator/src/lib.rs                      |   21 +-
 logger/Cargo.toml                        |   10 +
 logger/src/lib.rs                        |   62 +
 logger/src/main.rs                       |    7 +
 server/src/api/mod.rs                    |    7 +-
 src/structs/epoch.rs                     |    2 +-
 storable_vec/src/enums/error.rs          |    2 +
 storable_vec/src/lib.rs                  |   95 +-
 34 files changed, 1379 insertions(+), 1871 deletions(-)
 create mode 100644 logger/Cargo.toml
 create mode 100644 logger/src/lib.rs
 create mode 100644 logger/src/main.rs

diff --git a/Cargo.lock b/Cargo.lock
index 6284a90e4..45be29409 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2,16 +2,6 @@
 # It is not intended for manual editing.
 version = 4
 
-[[package]]
-name = "Inflector"
-version = "0.11.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3"
-dependencies = [
- "lazy_static",
- "regex",
-]
-
 [[package]]
 name = "addr2line"
 version = "0.21.0"
@@ -33,20 +23,6 @@ version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
 
-[[package]]
-name = "ahash"
-version = "0.8.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
-dependencies = [
- "cfg-if",
- "getrandom 0.2.15",
- "once_cell",
- "serde",
- "version_check",
- "zerocopy 0.7.35",
-]
-
 [[package]]
 name = "aho-corasick"
 version = "1.1.3"
@@ -78,25 +54,54 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
 
 [[package]]
-name = "android-tzdata"
-version = "0.1.1"
+name = "anstream"
+version = "0.6.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
-
-[[package]]
-name = "android_system_properties"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
+checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
 dependencies = [
- "libc",
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "is_terminal_polyfill",
+ "utf8parse",
 ]
 
 [[package]]
-name = "anyhow"
-version = "1.0.95"
+name = "anstyle"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04"
+checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
+
+[[package]]
+name = "anstyle-parse"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
+dependencies = [
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "3.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e"
+dependencies = [
+ "anstyle",
+ "once_cell",
+ "windows-sys 0.59.0",
+]
 
 [[package]]
 name = "arrayvec"
@@ -105,22 +110,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
-name = "ascii"
-version = "1.1.0"
+name = "assert-unchecked"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d92bec98840b8f03a5ff5413de5293bfcd8bf96467cf5452609f939ec6f5de16"
-
-[[package]]
-name = "ast_node"
-version = "3.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91fb5864e2f5bf9fd9797b94b2dfd1554d4c3092b535008b27d7e15c86675a2f"
-dependencies = [
- "proc-macro2",
- "quote",
- "swc_macros_common",
- "syn 2.0.98",
-]
+checksum = "7330592adf847ee2e3513587b4db2db410a0d751378654e7e993d9adcbe5c795"
 
 [[package]]
 name = "async-compression"
@@ -144,17 +137,6 @@ version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
 
-[[package]]
-name = "auto_impl"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e12882f59de5360c748c4cbf569a042d5fb0eb515f7bea9c1f470b47f6ffbd73"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.98",
-]
-
 [[package]]
 name = "autocfg"
 version = "1.4.0"
@@ -246,12 +228,6 @@ version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
 
-[[package]]
-name = "base64"
-version = "0.21.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
-
 [[package]]
 name = "base64"
 version = "0.22.1"
@@ -260,11 +236,12 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
 [[package]]
 name = "base64-simd"
-version = "0.7.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "781dd20c3aff0bd194fe7d2a977dd92f21c173891f3a03b677359e5fa457e5d5"
+checksum = "339abbe78e73178762e23bea9dfd08e697eb3f3301cd4be981c0f78ba5859195"
 dependencies = [
- "simd-abstraction",
+ "outref",
+ "vsimd",
 ]
 
 [[package]]
@@ -274,12 +251,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d965446196e3b7decd44aa7ee49e31d630118f90ef12f97900f262eb915c951d"
 
 [[package]]
-name = "better_scoped_tls"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50fd297a11c709be8348aec039c8b91de16075d2b2bdaee1bd562c0875993664"
+name = "berver"
+version = "0.6.0"
 dependencies = [
- "scoped-tls",
+ "axum",
+ "bindex",
+ "bomputer",
+ "color-eyre",
+ "derive_deref",
+ "jiff",
+ "logger",
+ "oxc",
+ "regex",
+ "reqwest",
+ "serde",
+ "serde_json",
+ "storable_vec",
+ "struct_iterable",
+ "tokio",
+ "tower-http",
+ "zstd",
 ]
 
 [[package]]
@@ -293,10 +284,14 @@ dependencies = [
  "exit",
  "fjall",
  "jiff",
+ "logger",
  "rapidhash",
  "rayon",
+ "rlimit",
+ "serde",
+ "serde_bytes",
  "storable_vec",
- "zerocopy 0.8.16",
+ "zerocopy 0.8.17",
 ]
 
 [[package]]
@@ -396,27 +391,6 @@ version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36"
 
-[[package]]
-name = "bitvec"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c"
-dependencies = [
- "funty",
- "radium",
- "tap",
- "wyz",
-]
-
-[[package]]
-name = "block-buffer"
-version = "0.10.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
-dependencies = [
- "generic-array",
-]
-
 [[package]]
 name = "bomputer"
 version = "0.1.0"
@@ -429,7 +403,7 @@ dependencies = [
  "fjall",
  "jiff",
  "storable_vec",
- "zerocopy 0.8.16",
+ "zerocopy 0.8.17",
 ]
 
 [[package]]
@@ -453,23 +427,6 @@ dependencies = [
  "alloc-stdlib",
 ]
 
-[[package]]
-name = "browserslist-rs"
-version = "0.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74c973b79d9b6b89854493185ab760c6ef8e54bcfad10ad4e33991e46b374ac8"
-dependencies = [
- "ahash",
- "chrono",
- "either",
- "indexmap",
- "itertools",
- "nom",
- "serde",
- "serde_json",
- "thiserror",
-]
-
 [[package]]
 name = "bumpalo"
 version = "3.17.0"
@@ -493,15 +450,24 @@ checksum = "f61dac84819c6588b558454b194026eb1f09c293b9036ae9b159e74e73ab6cf9"
 
 [[package]]
 name = "byteview"
-version = "0.5.1"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df559a101a77b0b6f034ca9e5747dfd267a0b54ee29d6c227768deda0b153a99"
+checksum = "b9f101f5d5ac7c27fa7e664bbdc2697b2627f24c701e1309564840c67554dbcc"
+
+[[package]]
+name = "castaway"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0abae9be0aaf9ea96a3b1b8b1b55c602ca751eba1b1500220cea4ecbafe7c0d5"
+dependencies = [
+ "rustversion",
+]
 
 [[package]]
 name = "cc"
-version = "1.2.12"
+version = "1.2.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "755717a7de9ec452bf7f3f1a3099085deabd7f2962b861dae91ecd7a365903d2"
+checksum = "c7777341816418c02e033934a09f20dc0ccaf65a5201ef8a450ae0105a573fda"
 dependencies = [
  "jobserver",
  "libc",
@@ -520,18 +486,6 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
 
-[[package]]
-name = "chrono"
-version = "0.4.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825"
-dependencies = [
- "android-tzdata",
- "iana-time-zone",
- "num-traits",
- "windows-targets",
-]
-
 [[package]]
 name = "color-eyre"
 version = "0.6.3"
@@ -559,6 +513,26 @@ dependencies = [
  "tracing-error",
 ]
 
+[[package]]
+name = "colorchoice"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
+
+[[package]]
+name = "compact_str"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b79c4069c6cad78e2e0cdfcbd26275770669fb39fd308a752dc110e83b9af32"
+dependencies = [
+ "castaway",
+ "cfg-if",
+ "itoa",
+ "rustversion",
+ "ryu",
+ "static_assertions",
+]
+
 [[package]]
 name = "compare"
 version = "0.0.6"
@@ -582,13 +556,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 
 [[package]]
-name = "cpufeatures"
-version = "0.2.17"
+name = "cow-utils"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280"
-dependencies = [
- "libc",
-]
+checksum = "417bef24afe1460300965a25ff4a24b8b45ad011948302ec221e8a0a81eb2c79"
 
 [[package]]
 name = "crc32fast"
@@ -665,16 +636,6 @@ version = "0.8.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
 
-[[package]]
-name = "crypto-common"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
-dependencies = [
- "generic-array",
- "typenum",
-]
-
 [[package]]
 name = "ctrlc"
 version = "3.4.5"
@@ -685,19 +646,6 @@ dependencies = [
  "windows-sys 0.59.0",
 ]
 
-[[package]]
-name = "dashmap"
-version = "5.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856"
-dependencies = [
- "cfg-if",
- "hashbrown 0.14.5",
- "lock_api",
- "once_cell",
- "parking_lot_core",
-]
-
 [[package]]
 name = "dashmap"
 version = "6.1.0"
@@ -712,22 +660,6 @@ dependencies = [
  "parking_lot_core",
 ]
 
-[[package]]
-name = "data-encoding"
-version = "2.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e60eed09d8c01d3cee5b7d30acb059b76614c918fa0f992e0dd6eeb10daad6f"
-
-[[package]]
-name = "debugid"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d"
-dependencies = [
- "serde",
- "uuid",
-]
-
 [[package]]
 name = "derive_deref"
 version = "1.1.1"
@@ -739,16 +671,6 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "digest"
-version = "0.10.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
-dependencies = [
- "block-buffer",
- "crypto-common",
-]
-
 [[package]]
 name = "displaydoc"
 version = "0.2.5"
@@ -793,6 +715,29 @@ dependencies = [
  "syn 2.0.98",
 ]
 
+[[package]]
+name = "env_filter"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "186e05a59d4c50738528153b83b0b0194d3a29507dfec16eccd4b342903397d0"
+dependencies = [
+ "log",
+ "regex",
+]
+
+[[package]]
+name = "env_logger"
+version = "0.11.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dcaee3d8e3cfc3fd92428d477bc97fc29ec8716d180c0d74c643bb26166660e0"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "env_filter",
+ "humantime",
+ "log",
+]
+
 [[package]]
 name = "equivalent"
 version = "1.0.1"
@@ -806,7 +751,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
 dependencies = [
  "libc",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -814,6 +759,7 @@ name = "exit"
 version = "0.1.0"
 dependencies = [
  "ctrlc",
+ "logger",
 ]
 
 [[package]]
@@ -834,18 +780,19 @@ checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
 
 [[package]]
 name = "fixedbitset"
-version = "0.4.2"
+version = "0.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
+checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99"
 
 [[package]]
 name = "fjall"
-version = "2.5.0"
+version = "2.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80910a26e4fb5e5393ff64d293602ac1ade56cf4d14d244c02a7d4ddcd5f10bc"
+checksum = "0ddab3925ea1ed59863d246305c7bc113dc2e12b691405d2d02e429cfa0c87a5"
 dependencies = [
  "byteorder",
- "dashmap 6.1.0",
+ "byteview",
+ "dashmap",
  "log",
  "lsm-tree",
  "path-absolutize",
@@ -894,23 +841,6 @@ dependencies = [
  "percent-encoding",
 ]
 
-[[package]]
-name = "from_variant"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d7ccf961415e7aa17ef93dcb6c2441faaa8e768abe09e659b908089546f74c5"
-dependencies = [
- "proc-macro2",
- "swc_macros_common",
- "syn 2.0.98",
-]
-
-[[package]]
-name = "funty"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
-
 [[package]]
 name = "futures-channel"
 version = "0.3.31"
@@ -961,16 +891,6 @@ dependencies = [
  "slab",
 ]
 
-[[package]]
-name = "generic-array"
-version = "0.14.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
-dependencies = [
- "typenum",
- "version_check",
-]
-
 [[package]]
 name = "getrandom"
 version = "0.2.15"
@@ -1002,9 +922,9 @@ checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
 
 [[package]]
 name = "guardian"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "493913a18c0d7bebb75127a26a432162c59edbe06f6cf712001e3e769345e8b5"
+checksum = "17e2ac29387b1aa07a1e448f7bb4f35b500787971e965b02842b900afa5c8f6f"
 
 [[package]]
 name = "h2"
@@ -1025,42 +945,20 @@ dependencies = [
  "tracing",
 ]
 
-[[package]]
-name = "hashbrown"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
-dependencies = [
- "ahash",
-]
-
 [[package]]
 name = "hashbrown"
 version = "0.14.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
-dependencies = [
- "ahash",
- "allocator-api2",
-]
 
 [[package]]
 name = "hashbrown"
 version = "0.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
-
-[[package]]
-name = "heck"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
-
-[[package]]
-name = "hermit-abi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
+dependencies = [
+ "allocator-api2",
+]
 
 [[package]]
 name = "hex-conservative"
@@ -1077,20 +975,6 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3011d1213f159867b13cfd6ac92d2cd5f1345762c63be3554e84092d85a50bbd"
 
-[[package]]
-name = "hstr"
-version = "0.2.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1a26def229ea95a8709dad32868d975d0dd40235bd2ce82920e4a8fe692b5e0"
-dependencies = [
- "hashbrown 0.14.5",
- "new_debug_unreachable",
- "once_cell",
- "phf",
- "rustc-hash 1.1.0",
- "triomphe",
-]
-
 [[package]]
 name = "http"
 version = "1.2.0"
@@ -1137,6 +1021,12 @@ version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
 
+[[package]]
+name = "humantime"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
+
 [[package]]
 name = "hyper"
 version = "1.6.0"
@@ -1210,29 +1100,6 @@ dependencies = [
  "tracing",
 ]
 
-[[package]]
-name = "iana-time-zone"
-version = "0.1.61"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220"
-dependencies = [
- "android_system_properties",
- "core-foundation-sys",
- "iana-time-zone-haiku",
- "js-sys",
- "wasm-bindgen",
- "windows-core",
-]
-
-[[package]]
-name = "iana-time-zone-haiku"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
-dependencies = [
- "cc",
-]
-
 [[package]]
 name = "icu_collections"
 version = "1.5.0"
@@ -1372,12 +1239,6 @@ dependencies = [
  "icu_properties",
 ]
 
-[[package]]
-name = "if_chain"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed"
-
 [[package]]
 name = "indenter"
 version = "0.3.3"
@@ -1392,7 +1253,6 @@ checksum = "8c9c992b02b5b4c94ea26e32fe5bccb7aa7d9f390ab5c1221ff895bc7ea8b652"
 dependencies = [
  "equivalent",
  "hashbrown 0.15.2",
- "serde",
 ]
 
 [[package]]
@@ -1411,22 +1271,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130"
 
 [[package]]
-name = "is-macro"
-version = "0.3.7"
+name = "is_terminal_polyfill"
+version = "1.70.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d57a3e447e24c22647738e4607f1df1e0ec6f72e16182c4cd199f647cdfb0e4"
-dependencies = [
- "heck",
- "proc-macro2",
- "quote",
- "syn 2.0.98",
-]
+checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
 
 [[package]]
 name = "itertools"
-version = "0.13.0"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
+checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285"
 dependencies = [
  "either",
 ]
@@ -1439,16 +1293,16 @@ checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
 
 [[package]]
 name = "jiff"
-version = "0.1.29"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c04ef77ae73f3cf50510712722f0c4e8b46f5aaa1bf5ffad2ae213e6495e78e5"
+checksum = "ba926fdd8e5b5e7f9700355b0831d8c416afe94b014b1023424037a187c9c582"
 dependencies = [
  "jiff-tzdb-platform",
  "log",
  "portable-atomic",
  "portable-atomic-util",
  "serde",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -1485,15 +1339,6 @@ dependencies = [
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "jsonc-parser"
-version = "0.21.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b56a20e76235284255a09fcd1f45cf55d3c524ea657ebd3854735925c57743d"
-dependencies = [
- "serde_json",
-]
-
 [[package]]
 name = "jsonrpc"
 version = "0.18.0"
@@ -1506,21 +1351,6 @@ dependencies = [
  "serde_json",
 ]
 
-[[package]]
-name = "kibo_server"
-version = "0.6.0"
-dependencies = [
- "axum",
- "color-eyre",
- "regex",
- "reqwest",
- "swc",
- "swc_common",
- "tokio",
- "tower-http",
- "zstd",
-]
-
 [[package]]
 name = "lazy_static"
 version = "1.5.0"
@@ -1562,30 +1392,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f"
 
 [[package]]
-name = "lru"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "718e8fae447df0c7e1ba7f5189829e63fd536945c8988d61444c19039f16b670"
+name = "logger"
+version = "0.1.0"
 dependencies = [
- "hashbrown 0.13.2",
+ "color-eyre",
+ "env_logger",
+ "jiff",
+ "log",
 ]
 
 [[package]]
 name = "lsm-tree"
-version = "2.5.0"
+version = "2.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d858efa63a32a286a06aa3968f3ed09811d556697e9f9804aa72ea679ed3b83"
+checksum = "2880324e429cd3285e56d0382c025b3d9336d672bbf344e3fde9783a5623f0f6"
 dependencies = [
  "byteorder",
  "crossbeam-skiplist",
  "double-ended-peekable",
  "enum_dispatch",
  "guardian",
+ "interval-heap",
  "log",
  "lz4_flex",
  "path-absolutize",
  "quick_cache",
- "rustc-hash 2.1.1",
+ "rustc-hash",
  "self_cell",
  "tempfile",
  "value-log",
@@ -1620,43 +1452,12 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "miette"
-version = "7.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a955165f87b37fd1862df2a59547ac542c77ef6d17c666f619d1ad22dd89484"
-dependencies = [
- "cfg-if",
- "miette-derive",
- "owo-colors 4.1.0",
- "textwrap",
- "thiserror",
- "unicode-width",
-]
-
-[[package]]
-name = "miette-derive"
-version = "7.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf45bf44ab49be92fd1227a3be6fc6f617f1a337c06af54981048574d8783147"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.98",
-]
-
 [[package]]
 name = "mime"
 version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
 
-[[package]]
-name = "minimal-lexical"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
-
 [[package]]
 name = "miniz_oxide"
 version = "0.7.4"
@@ -1714,12 +1515,6 @@ dependencies = [
  "tempfile",
 ]
 
-[[package]]
-name = "new_debug_unreachable"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086"
-
 [[package]]
 name = "nix"
 version = "0.29.0"
@@ -1733,23 +1528,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "nom"
-version = "7.1.3"
+name = "nonmax"
+version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
-dependencies = [
- "memchr",
- "minimal-lexical",
-]
-
-[[package]]
-name = "normpath"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a9da8c9922c35a1033d76f7272dfc2e7ee20392083d75aeea6ced23c6266578"
-dependencies = [
- "winapi",
-]
+checksum = "610a5acd306ec67f907abe5567859a3c693fb9886eb1f012ab8f2a47bef3db51"
 
 [[package]]
 name = "num-bigint"
@@ -1759,7 +1541,6 @@ checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
 dependencies = [
  "num-integer",
  "num-traits",
- "serde",
 ]
 
 [[package]]
@@ -1780,16 +1561,6 @@ dependencies = [
  "autocfg",
 ]
 
-[[package]]
-name = "num_cpus"
-version = "1.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
-dependencies = [
- "hermit-abi",
- "libc",
-]
-
 [[package]]
 name = "object"
 version = "0.32.2"
@@ -1801,9 +1572,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.20.2"
+version = "1.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
+checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e"
 
 [[package]]
 name = "openssl"
@@ -1851,9 +1622,9 @@ dependencies = [
 
 [[package]]
 name = "outref"
-version = "0.1.0"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f222829ae9293e33a9f5e9f440c6760a3d450a64affe1846486b140db81c1f4"
+checksum = "1a80800c0488c3a21695ea981a54918fbb37abf04f4d0720c453632255e2ff0e"
 
 [[package]]
 name = "owo-colors"
@@ -1867,6 +1638,338 @@ version = "4.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fb37767f6569cd834a413442455e0f066d0d522de8630436e2a1761d9726ba56"
 
+[[package]]
+name = "oxc"
+version = "0.49.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f346cc73c834df63403e8baa7b4e7efc9c6c4dbf45eb8fc6014bdb7b2d83b12"
+dependencies = [
+ "oxc_allocator",
+ "oxc_ast",
+ "oxc_codegen",
+ "oxc_diagnostics",
+ "oxc_mangler",
+ "oxc_minifier",
+ "oxc_parser",
+ "oxc_regular_expression",
+ "oxc_span",
+ "oxc_syntax",
+]
+
+[[package]]
+name = "oxc-miette"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e03e63fd113c068b82d07c9c614b0b146c08a3ac0a4dface3ea1d1a9d14d549e"
+dependencies = [
+ "cfg-if",
+ "owo-colors 4.1.0",
+ "oxc-miette-derive",
+ "textwrap",
+ "thiserror",
+ "unicode-width 0.2.0",
+]
+
+[[package]]
+name = "oxc-miette-derive"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e21f680e8c5f1900297d394627d495351b9e37761f7bbf90116bd5eeb6e80967"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "oxc_allocator"
+version = "0.49.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba82e27c94fd90c94cba7f3ec9079c6eea4d2000b57c29c7d34d100bf8c80de7"
+dependencies = [
+ "allocator-api2",
+ "bumpalo",
+ "hashbrown 0.15.2",
+ "rustc-hash",
+ "simdutf8",
+]
+
+[[package]]
+name = "oxc_ast"
+version = "0.49.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96cc90207e2212fa7b3511014cfa193ef2807bb504424e16ae8aa3e5a6715a3f"
+dependencies = [
+ "bitflags",
+ "cow-utils",
+ "nonmax",
+ "num-bigint",
+ "num-traits",
+ "oxc_allocator",
+ "oxc_ast_macros",
+ "oxc_estree",
+ "oxc_regular_expression",
+ "oxc_span",
+ "oxc_syntax",
+]
+
+[[package]]
+name = "oxc_ast_macros"
+version = "0.49.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "315ff1ec55898f4d132d7f5ac3a8777d6c05e02d25bae7195e1eb0326146b299"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+]
+
+[[package]]
+name = "oxc_cfg"
+version = "0.49.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68480b093736d6ac483afead3b5d9942bd02ec6b62e414d4265482eebffe9788"
+dependencies = [
+ "bitflags",
+ "itertools",
+ "nonmax",
+ "oxc_index",
+ "oxc_syntax",
+ "petgraph",
+ "rustc-hash",
+]
+
+[[package]]
+name = "oxc_codegen"
+version = "0.49.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef6d9fd6b5953dcb9f814bf9ecd93979193269b17927a38c916afb702629f754"
+dependencies = [
+ "assert-unchecked",
+ "bitflags",
+ "cow-utils",
+ "nonmax",
+ "oxc_allocator",
+ "oxc_ast",
+ "oxc_data_structures",
+ "oxc_index",
+ "oxc_semantic",
+ "oxc_sourcemap",
+ "oxc_span",
+ "oxc_syntax",
+ "rustc-hash",
+ "ryu-js",
+]
+
+[[package]]
+name = "oxc_data_structures"
+version = "0.49.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8342a5e7cb5ea7833a16b3075abb962094443b00caa22e2b2f93d47c44caf871"
+dependencies = [
+ "assert-unchecked",
+ "ropey",
+]
+
+[[package]]
+name = "oxc_diagnostics"
+version = "0.49.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e96ced1ce8a7a2c5972a9ac69a1df801966157cdb40c09e9c39b13efecdf63c9"
+dependencies = [
+ "cow-utils",
+ "oxc-miette",
+]
+
+[[package]]
+name = "oxc_ecmascript"
+version = "0.49.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05f3d220214466200c5a5c6475b681cad6aa9e076aa0e9a290c920375993cc75"
+dependencies = [
+ "num-bigint",
+ "num-traits",
+ "oxc_ast",
+ "oxc_span",
+ "oxc_syntax",
+]
+
+[[package]]
+name = "oxc_estree"
+version = "0.49.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd0ba1ad13334dd7d203273c4d99b0f508c0d069888b5d2c36261c70630a0317"
+
+[[package]]
+name = "oxc_index"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5eca5d9726cd0a6e433debe003b7bc88b2ecad0bb6109f0cef7c55e692139a34"
+
+[[package]]
+name = "oxc_mangler"
+version = "0.49.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "de5d581f96d85a192d1c6191ee3b476ba715f565a228c605b501be2456e49f51"
+dependencies = [
+ "fixedbitset",
+ "itertools",
+ "oxc_allocator",
+ "oxc_ast",
+ "oxc_index",
+ "oxc_semantic",
+ "oxc_span",
+ "rustc-hash",
+]
+
+[[package]]
+name = "oxc_minifier"
+version = "0.49.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5137cabf5eeadec26708803c9676539cb418afab1403374d46c3ed0554d41c38"
+dependencies = [
+ "cow-utils",
+ "oxc_allocator",
+ "oxc_ast",
+ "oxc_codegen",
+ "oxc_data_structures",
+ "oxc_ecmascript",
+ "oxc_mangler",
+ "oxc_parser",
+ "oxc_semantic",
+ "oxc_span",
+ "oxc_syntax",
+ "oxc_traverse",
+ "rustc-hash",
+]
+
+[[package]]
+name = "oxc_parser"
+version = "0.49.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd86fb907a291acf174889b545424abf2c11b3875203d363637c1835d9692176"
+dependencies = [
+ "assert-unchecked",
+ "bitflags",
+ "cow-utils",
+ "memchr",
+ "num-bigint",
+ "num-traits",
+ "oxc_allocator",
+ "oxc_ast",
+ "oxc_diagnostics",
+ "oxc_ecmascript",
+ "oxc_regular_expression",
+ "oxc_span",
+ "oxc_syntax",
+ "rustc-hash",
+ "seq-macro",
+]
+
+[[package]]
+name = "oxc_regular_expression"
+version = "0.49.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d77b2ad85545ca2f6a2d319230d35e6cbacc2734029079bc820b2176cea37dc4"
+dependencies = [
+ "oxc_allocator",
+ "oxc_ast_macros",
+ "oxc_diagnostics",
+ "oxc_estree",
+ "oxc_span",
+ "phf",
+ "rustc-hash",
+ "unicode-id-start",
+]
+
+[[package]]
+name = "oxc_semantic"
+version = "0.49.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f021acc396e980c533abc66ec3680c18dda8ff4329dc32c49b8666d48d4627a1"
+dependencies = [
+ "assert-unchecked",
+ "itertools",
+ "oxc_allocator",
+ "oxc_ast",
+ "oxc_cfg",
+ "oxc_data_structures",
+ "oxc_diagnostics",
+ "oxc_ecmascript",
+ "oxc_index",
+ "oxc_span",
+ "oxc_syntax",
+ "phf",
+ "rustc-hash",
+ "self_cell",
+]
+
+[[package]]
+name = "oxc_sourcemap"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "48557f779d04c8bfa8a930db5a3c35c0a86ff4e6bf1552ce446b9596a6e77c42"
+dependencies = [
+ "base64-simd",
+ "cfg-if",
+ "cow-utils",
+ "rustc-hash",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "oxc_span"
+version = "0.49.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3492e9db0c166a6072f4da2003966f3c3dad5f6c39ba86589dc0ab85de94dbb6"
+dependencies = [
+ "compact_str",
+ "oxc-miette",
+ "oxc_allocator",
+ "oxc_ast_macros",
+ "oxc_estree",
+]
+
+[[package]]
+name = "oxc_syntax"
+version = "0.49.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2945b8d56e1cf569c933812bc37277de784bba3fd92a565a640f2650801b2d5"
+dependencies = [
+ "assert-unchecked",
+ "bitflags",
+ "cow-utils",
+ "nonmax",
+ "oxc_allocator",
+ "oxc_ast_macros",
+ "oxc_estree",
+ "oxc_index",
+ "oxc_span",
+ "phf",
+ "rustc-hash",
+ "ryu-js",
+ "unicode-id-start",
+]
+
+[[package]]
+name = "oxc_traverse"
+version = "0.49.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ba02cbc4f6b98c1bb04c3a73c336657d999a75b464af91cf3abb93e610c0650"
+dependencies = [
+ "compact_str",
+ "itoa",
+ "oxc_allocator",
+ "oxc_ast",
+ "oxc_data_structures",
+ "oxc_ecmascript",
+ "oxc_semantic",
+ "oxc_span",
+ "oxc_syntax",
+ "rustc-hash",
+]
+
 [[package]]
 name = "parking_lot"
 version = "0.12.3"
@@ -1899,18 +2002,6 @@ dependencies = [
  "path-dedot",
 ]
 
-[[package]]
-name = "path-clean"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecba01bf2678719532c5e3059e0b5f0811273d94b397088b82e3bd0a78c78fdd"
-
-[[package]]
-name = "path-clean"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17359afc20d7ab31fdb42bb844c8b3bb1dabd7dcf7e68428492da7f16966fcef"
-
 [[package]]
 name = "path-dedot"
 version = "3.1.1"
@@ -1920,12 +2011,6 @@ dependencies = [
  "once_cell",
 ]
 
-[[package]]
-name = "pathdiff"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df94ce210e5bc13cb6651479fa48d14f601d9858cfe0467f43ae157023b938d3"
-
 [[package]]
 name = "percent-encoding"
 version = "2.3.1"
@@ -1934,9 +2019,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
 [[package]]
 name = "petgraph"
-version = "0.6.5"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
+checksum = "3672b37090dbd86368a4145bc067582552b29c27377cad4e0a306c97f9bd7772"
 dependencies = [
  "fixedbitset",
  "indexmap",
@@ -1981,7 +2066,7 @@ version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5"
 dependencies = [
- "siphasher 1.0.1",
+ "siphasher",
 ]
 
 [[package]]
@@ -2026,24 +2111,6 @@ dependencies = [
  "zerocopy 0.7.35",
 ]
 
-[[package]]
-name = "preset_env_base"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07852df2dda2f0ab8c3407a6fd19e9389563af11c20f6c299bd07ff9fc96d6ae"
-dependencies = [
- "anyhow",
- "browserslist-rs",
- "dashmap 5.5.3",
- "from_variant",
- "once_cell",
- "rustc-hash 2.1.1",
- "semver 1.0.25",
- "serde",
- "st-map",
- "tracing",
-]
-
 [[package]]
 name = "proc-macro2"
 version = "1.0.93"
@@ -2053,35 +2120,6 @@ dependencies = [
  "unicode-ident",
 ]
 
-[[package]]
-name = "psm"
-version = "0.1.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "200b9ff220857e53e184257720a14553b2f4aa02577d2ed9842d45d4b9654810"
-dependencies = [
- "cc",
-]
-
-[[package]]
-name = "ptr_meta"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe9e76f66d3f9606f44e45598d155cb13ecf09f4a28199e48daf8c8fc937ea90"
-dependencies = [
- "ptr_meta_derive",
-]
-
-[[package]]
-name = "ptr_meta_derive"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca414edb151b4c8d125c12566ab0d74dc9cdba36fb80eb7b848c15f495fd32d1"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.98",
-]
-
 [[package]]
 name = "quick_cache"
 version = "0.6.10"
@@ -2101,18 +2139,6 @@ dependencies = [
  "proc-macro2",
 ]
 
-[[package]]
-name = "radium"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
-
-[[package]]
-name = "radix_fmt"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce082a9940a7ace2ad4a8b7d0b1eac6aa378895f18be598230c5f2284ac05426"
-
 [[package]]
 name = "rand"
 version = "0.8.5"
@@ -2267,33 +2293,37 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "rlimit"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7043b63bd0cd1aaa628e476b80e6d4023a3b50eb32789f2728908107bd0c793a"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "ropey"
+version = "1.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93411e420bcd1a75ddd1dc3caf18c23155eda2c090631a85af21ba19e97093b5"
+dependencies = [
+ "smallvec",
+ "str_indices",
+]
+
 [[package]]
 name = "rustc-demangle"
 version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
 
-[[package]]
-name = "rustc-hash"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
-
 [[package]]
 name = "rustc-hash"
 version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
 
-[[package]]
-name = "rustc_version"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
-dependencies = [
- "semver 0.9.0",
-]
-
 [[package]]
 name = "rustix"
 version = "0.38.44"
@@ -2304,7 +2334,7 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -2373,12 +2403,6 @@ dependencies = [
  "windows-sys 0.59.0",
 ]
 
-[[package]]
-name = "scoped-tls"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
-
 [[package]]
 name = "scopeguard"
 version = "1.2.0"
@@ -2436,28 +2460,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c2fdfc24bc566f839a2da4c4295b82db7d25a24253867d5c64355abb5799bdbe"
 
 [[package]]
-name = "semver"
-version = "0.9.0"
+name = "seq-macro"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
-dependencies = [
- "semver-parser",
-]
-
-[[package]]
-name = "semver"
-version = "1.0.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f79dfe2d285b0488816f30e700a7438c5a73d816b5b7d3ac72fbc48b0d185e03"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "semver-parser"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
+checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4"
 
 [[package]]
 name = "serde"
@@ -2468,6 +2474,15 @@ dependencies = [
  "serde_derive",
 ]
 
+[[package]]
+name = "serde_bytes"
+version = "0.11.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "387cc504cb06bb40a96c8e04e951fe01854cf6bc921053c954e4a606d9675c6a"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "serde_derive"
 version = "1.0.217"
@@ -2513,17 +2528,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "sha1"
-version = "0.10.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
-dependencies = [
- "cfg-if",
- "cpufeatures",
- "digest",
-]
-
 [[package]]
 name = "sharded-slab"
 version = "0.1.7"
@@ -2549,19 +2553,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "simd-abstraction"
-version = "0.7.1"
+name = "simdutf8"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cadb29c57caadc51ff8346233b5cec1d240b68ce55cf1afc764818791876987"
-dependencies = [
- "outref",
-]
-
-[[package]]
-name = "siphasher"
-version = "0.3.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
+checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e"
 
 [[package]]
 name = "siphasher"
@@ -2585,15 +2580,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
-name = "smartstring"
-version = "1.0.1"
+name = "smawk"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fb72c633efbaa2dd666986505016c32c3044395ceaf881518399d2f4127ee29"
-dependencies = [
- "autocfg",
- "static_assertions",
- "version_check",
-]
+checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c"
 
 [[package]]
 name = "socket2"
@@ -2605,71 +2595,18 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
-[[package]]
-name = "sourcemap"
-version = "9.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27c4ea7042fd1a155ad95335b5d505ab00d5124ea0332a06c8390d200bb1a76a"
-dependencies = [
- "base64-simd",
- "bitvec",
- "data-encoding",
- "debugid",
- "if_chain",
- "rustc-hash 1.1.0",
- "rustc_version",
- "serde",
- "serde_json",
- "unicode-id-start",
- "url",
-]
-
 [[package]]
 name = "spin"
 version = "0.9.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
 
-[[package]]
-name = "st-map"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8257dd592de7614be71a2342d36ba2d527ddad3f9a0c8d09d6ceed4c371531e4"
-dependencies = [
- "arrayvec",
- "static-map-macro",
-]
-
 [[package]]
 name = "stable_deref_trait"
 version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
 
-[[package]]
-name = "stacker"
-version = "0.1.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "799c883d55abdb5e98af1a7b3f23b9b6de8ecada0ecac058672d7635eb48ca7b"
-dependencies = [
- "cc",
- "cfg-if",
- "libc",
- "psm",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "static-map-macro"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "710e9696ef338691287aeb937ee6ffe60022f579d3c8d2fd9d58973a9a10a466"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.98",
-]
-
 [[package]]
 name = "static_assertions"
 version = "1.1.0"
@@ -2687,20 +2624,14 @@ name = "storable_vec"
 version = "0.1.2"
 dependencies = [
  "memmap2",
- "zerocopy 0.8.16",
+ "zerocopy 0.8.17",
 ]
 
 [[package]]
-name = "string_enum"
-version = "1.0.0"
+name = "str_indices"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9fe66b8ee349846ce2f9557a26b8f1e74843c4a13fb381f9a3d73617a5f956a"
-dependencies = [
- "proc-macro2",
- "quote",
- "swc_macros_common",
- "syn 2.0.98",
-]
+checksum = "d08889ec5408683408db66ad89e0e1f93dff55c73a4ccc71c427d5b277ee47e6"
 
 [[package]]
 name = "struct_iterable"
@@ -2728,970 +2659,6 @@ version = "2.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
 
-[[package]]
-name = "swc"
-version = "13.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4107d56ba60c3b965d50cbd26762530553f6ab3fb98aeea917c75ee08c81c346"
-dependencies = [
- "anyhow",
- "base64 0.21.7",
- "dashmap 5.5.3",
- "either",
- "indexmap",
- "jsonc-parser",
- "lru",
- "once_cell",
- "parking_lot",
- "pathdiff",
- "regex",
- "rustc-hash 2.1.1",
- "serde",
- "serde_json",
- "sourcemap",
- "swc_atoms",
- "swc_cached",
- "swc_common",
- "swc_compiler_base",
- "swc_config",
- "swc_ecma_ast",
- "swc_ecma_codegen",
- "swc_ecma_ext_transforms",
- "swc_ecma_lints",
- "swc_ecma_loader",
- "swc_ecma_minifier",
- "swc_ecma_parser",
- "swc_ecma_preset_env",
- "swc_ecma_transforms",
- "swc_ecma_transforms_base",
- "swc_ecma_transforms_compat",
- "swc_ecma_transforms_optimization",
- "swc_ecma_utils",
- "swc_ecma_visit",
- "swc_error_reporters",
- "swc_node_comments",
- "swc_timer",
- "swc_transform_common",
- "swc_typescript",
- "swc_visit",
- "tracing",
- "url",
-]
-
-[[package]]
-name = "swc_allocator"
-version = "3.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a1f988452cab8c4e25776e5a855ba088cdb38fbe9714f9b9d2a6ff345824858"
-dependencies = [
- "bumpalo",
- "hashbrown 0.14.5",
- "ptr_meta",
- "rustc-hash 2.1.1",
- "triomphe",
-]
-
-[[package]]
-name = "swc_atoms"
-version = "3.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31b770be7f8c626633841a0408e2b66b0d6a395a5a0a565a1591f15dc05af8d3"
-dependencies = [
- "hstr",
- "once_cell",
- "rustc-hash 2.1.1",
- "serde",
-]
-
-[[package]]
-name = "swc_cached"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7133338c3bef796430deced151b0eaa5430710a90e38da19e8e3045e8e36eeb"
-dependencies = [
- "anyhow",
- "dashmap 5.5.3",
- "once_cell",
- "regex",
- "rustc-hash 2.1.1",
- "serde",
-]
-
-[[package]]
-name = "swc_common"
-version = "6.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa92d673f12585e950300d3d397eefd2da9effe3373d7882f46b35b0f9ef9cec"
-dependencies = [
- "ast_node",
- "better_scoped_tls",
- "cfg-if",
- "either",
- "from_variant",
- "new_debug_unreachable",
- "num-bigint",
- "once_cell",
- "parking_lot",
- "rustc-hash 2.1.1",
- "serde",
- "siphasher 0.3.11",
- "sourcemap",
- "swc_allocator",
- "swc_atoms",
- "swc_eq_ignore_macros",
- "swc_visit",
- "tracing",
- "unicode-width",
- "url",
-]
-
-[[package]]
-name = "swc_compiler_base"
-version = "11.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c126a0562e58c04cc7e8600ea375bc96473a0dd4733e0708de4b58164d5a3ec1"
-dependencies = [
- "anyhow",
- "base64 0.21.7",
- "once_cell",
- "pathdiff",
- "rustc-hash 2.1.1",
- "serde",
- "serde_json",
- "sourcemap",
- "swc_allocator",
- "swc_atoms",
- "swc_common",
- "swc_config",
- "swc_ecma_ast",
- "swc_ecma_codegen",
- "swc_ecma_minifier",
- "swc_ecma_parser",
- "swc_ecma_visit",
- "swc_timer",
-]
-
-[[package]]
-name = "swc_config"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb63364aebd1a8490a80fa8933825c6916d4df55d5472312d5adb62c9fb4e4ba"
-dependencies = [
- "anyhow",
- "indexmap",
- "serde",
- "serde_json",
- "sourcemap",
- "swc_cached",
- "swc_config_macro",
-]
-
-[[package]]
-name = "swc_config_macro"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f2ebd37ef52a8555c8c9be78b694d64adcb5e3bc16c928f030d82f1d65fac57"
-dependencies = [
- "proc-macro2",
- "quote",
- "swc_macros_common",
- "syn 2.0.98",
-]
-
-[[package]]
-name = "swc_ecma_ast"
-version = "6.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d16cd007587c1cccaabe76ad640a59a05e51fed0ec4c0600b8ed6f26c9be2ec"
-dependencies = [
- "bitflags",
- "is-macro",
- "num-bigint",
- "phf",
- "scoped-tls",
- "serde",
- "string_enum",
- "swc_atoms",
- "swc_common",
- "swc_visit",
- "unicode-id-start",
-]
-
-[[package]]
-name = "swc_ecma_codegen"
-version = "6.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ab1c30908a59fa1f103b7f2ae0b2788271d05c2a9d4f174e44cca4367aa6d7d"
-dependencies = [
- "ascii",
- "memchr",
- "num-bigint",
- "once_cell",
- "regex",
- "rustc-hash 2.1.1",
- "serde",
- "sourcemap",
- "swc_allocator",
- "swc_atoms",
- "swc_common",
- "swc_ecma_ast",
- "swc_ecma_codegen_macros",
- "tracing",
-]
-
-[[package]]
-name = "swc_ecma_codegen_macros"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f9a42f479a6475647e248fa9750982c87cd985e19d1016a1fc18a70682305d1"
-dependencies = [
- "proc-macro2",
- "quote",
- "swc_macros_common",
- "syn 2.0.98",
-]
-
-[[package]]
-name = "swc_ecma_compat_bugfixes"
-version = "9.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f08d54d4480e63535bf8aa2f56e5e43e682e02c703d2dd419aefca20c991c167"
-dependencies = [
- "rustc-hash 2.1.1",
- "swc_atoms",
- "swc_common",
- "swc_ecma_ast",
- "swc_ecma_compat_es2015",
- "swc_ecma_transforms_base",
- "swc_ecma_utils",
- "swc_ecma_visit",
- "swc_trace_macro",
- "tracing",
-]
-
-[[package]]
-name = "swc_ecma_compat_common"
-version = "9.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df57bb8d6477c81459e892aa4427e54b231abc675d32d1b1981978331b9e5505"
-dependencies = [
- "swc_common",
- "swc_ecma_ast",
- "swc_ecma_utils",
- "swc_ecma_visit",
- "swc_trace_macro",
-]
-
-[[package]]
-name = "swc_ecma_compat_es2015"
-version = "9.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e043d59b56f54f5799e6a04400286804434f39feba82dc7f00fe870d122caa55"
-dependencies = [
- "arrayvec",
- "indexmap",
- "is-macro",
- "rustc-hash 2.1.1",
- "serde",
- "serde_derive",
- "smallvec",
- "swc_atoms",
- "swc_common",
- "swc_config",
- "swc_ecma_ast",
- "swc_ecma_compat_common",
- "swc_ecma_transforms_base",
- "swc_ecma_transforms_classes",
- "swc_ecma_transforms_macros",
- "swc_ecma_utils",
- "swc_ecma_visit",
- "swc_trace_macro",
- "tracing",
-]
-
-[[package]]
-name = "swc_ecma_compat_es2016"
-version = "9.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cedbafaa7ec38e076cf43e53894b2e40cc3876e17c2bd740b41082a81c3964c8"
-dependencies = [
- "swc_atoms",
- "swc_common",
- "swc_ecma_ast",
- "swc_ecma_transforms_base",
- "swc_ecma_transforms_macros",
- "swc_ecma_utils",
- "swc_ecma_visit",
- "swc_trace_macro",
- "tracing",
-]
-
-[[package]]
-name = "swc_ecma_compat_es2017"
-version = "9.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d5077ba72189a26f4a074d226df5ca92af5df49a4f85324ff6f71fce676b60e"
-dependencies = [
- "serde",
- "swc_atoms",
- "swc_common",
- "swc_ecma_ast",
- "swc_ecma_transforms_base",
- "swc_ecma_transforms_macros",
- "swc_ecma_utils",
- "swc_ecma_visit",
- "swc_trace_macro",
- "tracing",
-]
-
-[[package]]
-name = "swc_ecma_compat_es2018"
-version = "9.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "634385e806b12cad22eb0a4a62a100583d0d5ea81cda605f49dedd3b637d8bc7"
-dependencies = [
- "serde",
- "swc_atoms",
- "swc_common",
- "swc_ecma_ast",
- "swc_ecma_compat_common",
- "swc_ecma_transforms_base",
- "swc_ecma_transforms_macros",
- "swc_ecma_utils",
- "swc_ecma_visit",
- "swc_trace_macro",
- "tracing",
-]
-
-[[package]]
-name = "swc_ecma_compat_es2019"
-version = "9.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c603b3b07d12f800ce5fe6b4d157dde14d9315b9b2e3576deebd99a310adfdb"
-dependencies = [
- "swc_atoms",
- "swc_common",
- "swc_ecma_ast",
- "swc_ecma_transforms_base",
- "swc_ecma_utils",
- "swc_ecma_visit",
- "swc_trace_macro",
- "tracing",
-]
-
-[[package]]
-name = "swc_ecma_compat_es2020"
-version = "10.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e13b59539620b1ddca8ab3e9b3747bc8358fc3b4a9c88390051135591ba86608"
-dependencies = [
- "serde",
- "swc_atoms",
- "swc_common",
- "swc_ecma_ast",
- "swc_ecma_compat_es2022",
- "swc_ecma_transforms_base",
- "swc_ecma_utils",
- "swc_ecma_visit",
- "swc_trace_macro",
- "tracing",
-]
-
-[[package]]
-name = "swc_ecma_compat_es2021"
-version = "9.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a96de895205bfccbc722d9449e70b0feae79950ab95c2d0115139433d649d06"
-dependencies = [
- "swc_atoms",
- "swc_common",
- "swc_ecma_ast",
- "swc_ecma_transforms_base",
- "swc_ecma_utils",
- "swc_ecma_visit",
- "swc_trace_macro",
- "tracing",
-]
-
-[[package]]
-name = "swc_ecma_compat_es2022"
-version = "10.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55de1bcd911804365e7f12d0f32ea38874cee7d8f5c44b17b0d05410094ef214"
-dependencies = [
- "rustc-hash 2.1.1",
- "swc_atoms",
- "swc_common",
- "swc_ecma_ast",
- "swc_ecma_compat_common",
- "swc_ecma_transforms_base",
- "swc_ecma_transforms_classes",
- "swc_ecma_transforms_macros",
- "swc_ecma_utils",
- "swc_ecma_visit",
- "swc_trace_macro",
- "tracing",
-]
-
-[[package]]
-name = "swc_ecma_compat_es3"
-version = "9.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82b09b355fb9995927fc7ad262a8384574a8c920d6869b4f12810bcfedacf6d8"
-dependencies = [
- "swc_common",
- "swc_ecma_ast",
- "swc_ecma_transforms_base",
- "swc_ecma_utils",
- "swc_ecma_visit",
- "swc_trace_macro",
- "tracing",
-]
-
-[[package]]
-name = "swc_ecma_ext_transforms"
-version = "9.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc517764142a071eac496aeb5e0ad910db3d27bbd57fbc2de1a0a50172179189"
-dependencies = [
- "phf",
- "swc_atoms",
- "swc_common",
- "swc_ecma_ast",
- "swc_ecma_utils",
- "swc_ecma_visit",
-]
-
-[[package]]
-name = "swc_ecma_lints"
-version = "9.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb3d14aa9c8a6adbacbf8cb072387b4dc445b8bc51a8009257d782890431f0c4"
-dependencies = [
- "auto_impl",
- "dashmap 5.5.3",
- "parking_lot",
- "regex",
- "rustc-hash 2.1.1",
- "serde",
- "swc_atoms",
- "swc_common",
- "swc_config",
- "swc_ecma_ast",
- "swc_ecma_utils",
- "swc_ecma_visit",
- "swc_parallel",
-]
-
-[[package]]
-name = "swc_ecma_loader"
-version = "6.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd99e5ef9cbecc33e8e199ad060d2af0a28ab0c2340eb37a7d4ba17fa59576d4"
-dependencies = [
- "anyhow",
- "dashmap 5.5.3",
- "lru",
- "normpath",
- "once_cell",
- "parking_lot",
- "path-clean 0.1.0",
- "pathdiff",
- "rustc-hash 2.1.1",
- "serde",
- "serde_json",
- "swc_atoms",
- "swc_cached",
- "swc_common",
- "tracing",
-]
-
-[[package]]
-name = "swc_ecma_minifier"
-version = "10.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dac6648ce5f9dda34a683132771aa8be50c96ca89440cf8197d6f9ff019e9e47"
-dependencies = [
- "arrayvec",
- "indexmap",
- "num-bigint",
- "num_cpus",
- "once_cell",
- "parking_lot",
- "phf",
- "radix_fmt",
- "regex",
- "rustc-hash 2.1.1",
- "ryu-js",
- "serde",
- "serde_json",
- "swc_allocator",
- "swc_atoms",
- "swc_common",
- "swc_config",
- "swc_ecma_ast",
- "swc_ecma_codegen",
- "swc_ecma_parser",
- "swc_ecma_transforms_base",
- "swc_ecma_transforms_optimization",
- "swc_ecma_usage_analyzer",
- "swc_ecma_utils",
- "swc_ecma_visit",
- "swc_parallel",
- "swc_timer",
- "tracing",
-]
-
-[[package]]
-name = "swc_ecma_parser"
-version = "8.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d99556f20b91452fa4c6da1891f90e58998e89842d6321bb7326ebfe81c37dca"
-dependencies = [
- "either",
- "new_debug_unreachable",
- "num-bigint",
- "num-traits",
- "phf",
- "rustc-hash 2.1.1",
- "serde",
- "smallvec",
- "smartstring",
- "stacker",
- "swc_atoms",
- "swc_common",
- "swc_ecma_ast",
- "tracing",
- "typed-arena",
-]
-
-[[package]]
-name = "swc_ecma_preset_env"
-version = "11.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22b32544046c3eb22865e0ca5d01987652bf2792ced0e3c63c108aaa709613b8"
-dependencies = [
- "anyhow",
- "dashmap 5.5.3",
- "indexmap",
- "once_cell",
- "preset_env_base",
- "rustc-hash 2.1.1",
- "semver 1.0.25",
- "serde",
- "serde_json",
- "st-map",
- "string_enum",
- "swc_atoms",
- "swc_common",
- "swc_ecma_ast",
- "swc_ecma_transforms",
- "swc_ecma_utils",
- "swc_ecma_visit",
-]
-
-[[package]]
-name = "swc_ecma_transforms"
-version = "11.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "059b8a22359b6cb5fbf942926935abf2faba898d337656fe9d6ffae37c7fa2d8"
-dependencies = [
- "swc_atoms",
- "swc_common",
- "swc_ecma_ast",
- "swc_ecma_transforms_base",
- "swc_ecma_transforms_compat",
- "swc_ecma_transforms_module",
- "swc_ecma_transforms_optimization",
- "swc_ecma_transforms_proposal",
- "swc_ecma_transforms_react",
- "swc_ecma_transforms_typescript",
- "swc_ecma_utils",
- "swc_ecma_visit",
-]
-
-[[package]]
-name = "swc_ecma_transforms_base"
-version = "9.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b696e003dd095ae8b8dba00f601040f756273c9af0fd67cb1c57115785cb5ec"
-dependencies = [
- "better_scoped_tls",
- "bitflags",
- "indexmap",
- "once_cell",
- "phf",
- "rustc-hash 2.1.1",
- "serde",
- "smallvec",
- "swc_atoms",
- "swc_common",
- "swc_ecma_ast",
- "swc_ecma_parser",
- "swc_ecma_utils",
- "swc_ecma_visit",
- "swc_parallel",
- "tracing",
-]
-
-[[package]]
-name = "swc_ecma_transforms_classes"
-version = "9.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22c0ccd085c481c3690b93db9e3e27658b7133192c9bf49b146f11c0180808e7"
-dependencies = [
- "swc_atoms",
- "swc_common",
- "swc_ecma_ast",
- "swc_ecma_transforms_base",
- "swc_ecma_utils",
- "swc_ecma_visit",
-]
-
-[[package]]
-name = "swc_ecma_transforms_compat"
-version = "10.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c933a35718a42dde2873120f0f4768d9054125e9c56f7b7223f35efac21bd76"
-dependencies = [
- "arrayvec",
- "indexmap",
- "is-macro",
- "num-bigint",
- "serde",
- "smallvec",
- "swc_atoms",
- "swc_common",
- "swc_config",
- "swc_ecma_ast",
- "swc_ecma_compat_bugfixes",
- "swc_ecma_compat_common",
- "swc_ecma_compat_es2015",
- "swc_ecma_compat_es2016",
- "swc_ecma_compat_es2017",
- "swc_ecma_compat_es2018",
- "swc_ecma_compat_es2019",
- "swc_ecma_compat_es2020",
- "swc_ecma_compat_es2021",
- "swc_ecma_compat_es2022",
- "swc_ecma_compat_es3",
- "swc_ecma_transforms_base",
- "swc_ecma_transforms_classes",
- "swc_ecma_transforms_macros",
- "swc_ecma_utils",
- "swc_ecma_visit",
- "swc_trace_macro",
- "tracing",
-]
-
-[[package]]
-name = "swc_ecma_transforms_macros"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6845dfb88569f3e8cd05901505916a8ebe98be3922f94769ca49f84e8ccec8f7"
-dependencies = [
- "proc-macro2",
- "quote",
- "swc_macros_common",
- "syn 2.0.98",
-]
-
-[[package]]
-name = "swc_ecma_transforms_module"
-version = "10.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "461ad2212af7c681e46b4beb91ca25b84a29467f327cd0c09e33f5908b73384f"
-dependencies = [
- "Inflector",
- "anyhow",
- "bitflags",
- "indexmap",
- "is-macro",
- "path-clean 1.0.1",
- "pathdiff",
- "regex",
- "rustc-hash 2.1.1",
- "serde",
- "swc_atoms",
- "swc_cached",
- "swc_common",
- "swc_ecma_ast",
- "swc_ecma_loader",
- "swc_ecma_parser",
- "swc_ecma_transforms_base",
- "swc_ecma_utils",
- "swc_ecma_visit",
- "tracing",
-]
-
-[[package]]
-name = "swc_ecma_transforms_optimization"
-version = "9.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26d05cd8942bb58b4676d8189e82942504004555957cb87a563bc4938f2440ab"
-dependencies = [
- "dashmap 5.5.3",
- "indexmap",
- "once_cell",
- "petgraph",
- "rustc-hash 2.1.1",
- "serde_json",
- "swc_atoms",
- "swc_common",
- "swc_ecma_ast",
- "swc_ecma_parser",
- "swc_ecma_transforms_base",
- "swc_ecma_transforms_macros",
- "swc_ecma_utils",
- "swc_ecma_visit",
- "swc_fast_graph",
- "tracing",
-]
-
-[[package]]
-name = "swc_ecma_transforms_proposal"
-version = "9.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08f82905f3d824bbe0555961df6c0f19807c6460ce49b3ddafec49493dc95b3e"
-dependencies = [
- "either",
- "rustc-hash 2.1.1",
- "serde",
- "smallvec",
- "swc_atoms",
- "swc_common",
- "swc_ecma_ast",
- "swc_ecma_transforms_base",
- "swc_ecma_transforms_classes",
- "swc_ecma_transforms_macros",
- "swc_ecma_utils",
- "swc_ecma_visit",
-]
-
-[[package]]
-name = "swc_ecma_transforms_react"
-version = "9.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dee5ef36740d62b3f69c777385067e0fe6e10fd87e4107e5495b74b15e0a0b7"
-dependencies = [
- "base64 0.21.7",
- "dashmap 5.5.3",
- "indexmap",
- "once_cell",
- "rustc-hash 2.1.1",
- "serde",
- "sha1",
- "string_enum",
- "swc_allocator",
- "swc_atoms",
- "swc_common",
- "swc_config",
- "swc_ecma_ast",
- "swc_ecma_parser",
- "swc_ecma_transforms_base",
- "swc_ecma_transforms_macros",
- "swc_ecma_utils",
- "swc_ecma_visit",
-]
-
-[[package]]
-name = "swc_ecma_transforms_typescript"
-version = "9.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "693f6e9683ae814930fa17f21b6915c795ab5d1883dd351753a18b689a78492f"
-dependencies = [
- "once_cell",
- "rustc-hash 2.1.1",
- "ryu-js",
- "serde",
- "swc_atoms",
- "swc_common",
- "swc_ecma_ast",
- "swc_ecma_transforms_base",
- "swc_ecma_transforms_react",
- "swc_ecma_utils",
- "swc_ecma_visit",
-]
-
-[[package]]
-name = "swc_ecma_usage_analyzer"
-version = "10.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b2031aed05786c806c8092b16cafad791be16f28e7222a9db069320937c1eb9"
-dependencies = [
- "indexmap",
- "rustc-hash 2.1.1",
- "swc_atoms",
- "swc_common",
- "swc_ecma_ast",
- "swc_ecma_utils",
- "swc_ecma_visit",
- "swc_timer",
- "tracing",
-]
-
-[[package]]
-name = "swc_ecma_utils"
-version = "9.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3c217edaa22c98537e09ed3189e723feed3d889eeb7e02a0b3d48cbb91ba7e4"
-dependencies = [
- "indexmap",
- "num_cpus",
- "once_cell",
- "rustc-hash 2.1.1",
- "ryu-js",
- "swc_atoms",
- "swc_common",
- "swc_ecma_ast",
- "swc_ecma_visit",
- "swc_parallel",
- "tracing",
- "unicode-id",
-]
-
-[[package]]
-name = "swc_ecma_visit"
-version = "6.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a32fb2902c01f9b4615605a4a3e67e0c928bd3b9f2182e764f1c9fe4130965cf"
-dependencies = [
- "new_debug_unreachable",
- "num-bigint",
- "swc_atoms",
- "swc_common",
- "swc_ecma_ast",
- "swc_visit",
- "tracing",
-]
-
-[[package]]
-name = "swc_eq_ignore_macros"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96e15288bf385ab85eb83cff7f9e2d834348da58d0a31b33bdb572e66ee413e"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.98",
-]
-
-[[package]]
-name = "swc_error_reporters"
-version = "7.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed21ea887faeb0dab190838d2331ed187f2a74d185c9fe7044d5092900a83d29"
-dependencies = [
- "anyhow",
- "miette",
- "once_cell",
- "parking_lot",
- "swc_common",
-]
-
-[[package]]
-name = "swc_fast_graph"
-version = "7.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ebf3efc1b14392006675682cfb8bab282bf88dbdfee65235a81b8a7b30af805"
-dependencies = [
- "indexmap",
- "petgraph",
- "rustc-hash 2.1.1",
- "swc_common",
-]
-
-[[package]]
-name = "swc_macros_common"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a509f56fca05b39ba6c15f3e58636c3924c78347d63853632ed2ffcb6f5a0ac7"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.98",
-]
-
-[[package]]
-name = "swc_node_comments"
-version = "6.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca0fdc3b404de25c08d5ed201b54db27d39c5f41e0389b6231910c50e76b1682"
-dependencies = [
- "dashmap 5.5.3",
- "rustc-hash 2.1.1",
- "swc_atoms",
- "swc_common",
-]
-
-[[package]]
-name = "swc_parallel"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5f75f1094d69174ef628e3665fff0f81d58e9f568802e3c90d332c72b0b6026"
-dependencies = [
- "once_cell",
-]
-
-[[package]]
-name = "swc_timer"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4db06b46cc832f7cf83c2ce21905fc465d01443a2bdccf63644383e1f5847532"
-dependencies = [
- "tracing",
-]
-
-[[package]]
-name = "swc_trace_macro"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c78717a841565df57f811376a3d19c9156091c55175e12d378f3a522de70cef"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.98",
-]
-
-[[package]]
-name = "swc_transform_common"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79319c2165695896119f0cb22847dedfb0bd7f77acd98dbc5bc1f081105db6f3"
-dependencies = [
- "better_scoped_tls",
- "once_cell",
- "rustc-hash 2.1.1",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "swc_typescript"
-version = "8.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fbac6fb2bac25fd3b3aa49ad19001f5e6f7be1b9971dd34f8e7649f939e39c8"
-dependencies = [
- "petgraph",
- "rustc-hash 2.1.1",
- "swc_atoms",
- "swc_common",
- "swc_ecma_ast",
- "swc_ecma_utils",
- "swc_ecma_visit",
- "thiserror",
-]
-
-[[package]]
-name = "swc_visit"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9138b6a36bbe76dd6753c4c0794f7e26480ea757bee499738bedbbb3ae3ec5f3"
-dependencies = [
- "either",
- "new_debug_unreachable",
-]
-
 [[package]]
 name = "syn"
 version = "1.0.109"
@@ -3755,12 +2722,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "tap"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
-
 [[package]]
 name = "tempfile"
 version = "3.16.0"
@@ -3772,7 +2733,7 @@ dependencies = [
  "getrandom 0.3.1",
  "once_cell",
  "rustix",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -3781,8 +2742,9 @@ version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9"
 dependencies = [
+ "smawk",
  "unicode-linebreak",
- "unicode-width",
+ "unicode-width 0.1.14",
 ]
 
 [[package]]
@@ -3942,21 +2904,9 @@ checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
 dependencies = [
  "log",
  "pin-project-lite",
- "tracing-attributes",
  "tracing-core",
 ]
 
-[[package]]
-name = "tracing-attributes"
-version = "0.1.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.98",
-]
-
 [[package]]
 name = "tracing-core"
 version = "0.1.33"
@@ -3988,40 +2938,12 @@ dependencies = [
  "tracing-core",
 ]
 
-[[package]]
-name = "triomphe"
-version = "0.1.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef8f7726da4807b58ea5c96fdc122f80702030edc33b35aff9190a51148ccc85"
-dependencies = [
- "serde",
- "stable_deref_trait",
-]
-
 [[package]]
 name = "try-lock"
 version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
-[[package]]
-name = "typed-arena"
-version = "2.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a"
-
-[[package]]
-name = "typenum"
-version = "1.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
-
-[[package]]
-name = "unicode-id"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10103c57044730945224467c09f71a4db0071c123a0648cc3e818913bde6b561"
-
 [[package]]
 name = "unicode-id-start"
 version = "1.3.1"
@@ -4046,6 +2968,12 @@ version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
 
+[[package]]
+name = "unicode-width"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd"
+
 [[package]]
 name = "untrusted"
 version = "0.9.0"
@@ -4076,10 +3004,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
 
 [[package]]
-name = "uuid"
-version = "1.13.1"
+name = "utf8parse"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ced87ca4be083373936a67f8de945faa23b6b42384bd5b64434850802c6dccd0"
+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "valuable"
@@ -4089,9 +3017,9 @@ checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65"
 
 [[package]]
 name = "value-log"
-version = "1.5.0"
+version = "1.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "addf12a5bb88dbd4a006b59c2da6d5091c6e4440ab9e8e9e6cc4b2357b43a842"
+checksum = "5589fb4f51f528b0cca7fdd03ec63a67f447bdcd313b09cdf9d2fc519149c02a"
 dependencies = [
  "byteorder",
  "byteview",
@@ -4099,7 +3027,7 @@ dependencies = [
  "log",
  "path-absolutize",
  "quick_cache",
- "rustc-hash 2.1.1",
+ "rustc-hash",
  "tempfile",
  "xxhash-rust",
 ]
@@ -4117,10 +3045,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
 
 [[package]]
-name = "version_check"
-version = "0.9.5"
+name = "vsimd"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
+checksum = "5c3082ca00d5a5ef149bb8b555a72ae84c9c59f7250f013ac822ac2e49b19c64"
 
 [[package]]
 name = "want"
@@ -4227,37 +3155,6 @@ dependencies = [
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
-[[package]]
-name = "windows-core"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
-dependencies = [
- "windows-targets",
-]
-
 [[package]]
 name = "windows-registry"
 version = "0.2.0"
@@ -4391,15 +3288,6 @@ version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
 
-[[package]]
-name = "wyz"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed"
-dependencies = [
- "tap",
-]
-
 [[package]]
 name = "xxhash-rust"
 version = "0.8.15"
@@ -4442,11 +3330,11 @@ dependencies = [
 
 [[package]]
 name = "zerocopy"
-version = "0.8.16"
+version = "0.8.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b8c07a70861ce02bad1607b5753ecb2501f67847b9f9ada7c160fff0ec6300c"
+checksum = "aa91407dacce3a68c56de03abe2760159582b846c6a4acd2f456618087f12713"
 dependencies = [
- "zerocopy-derive 0.8.16",
+ "zerocopy-derive 0.8.17",
 ]
 
 [[package]]
@@ -4462,9 +3350,9 @@ dependencies = [
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.8.16"
+version = "0.8.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5226bc9a9a9836e7428936cde76bb6b22feea1a8bfdbc0d241136e4d13417e25"
+checksum = "06718a168365cad3d5ff0bb133aad346959a2074bd4a85c121255a11304a8626"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/Cargo.toml b/Cargo.toml
index c20d580bc..5c77d7399 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -4,6 +4,7 @@ members = [
     "exit",
     "indexer",
     "iterator",
+    "logger",
     "server",
     "storable_vec",
     "struct_iterable",
@@ -16,12 +17,15 @@ color-eyre = "0.6.3"
 computer = { path = "computer", package = "bomputer" }
 derive_deref = "1.1.1"
 exit = { path = "exit" }
-fjall = "2.5.0"
+fjall = "2.6.2"
 indexer = { path = "indexer", package = "bindex" }
 iterator = { path = "iterator", package = "biter" }
-jiff = "0.1.29"
+jiff = "0.2.0"
+logger = { path = "logger" }
 rayon = "1.10.0"
-server = { path = "server" }
+rlimit = { version = "0.10.2" }
+serde = { version = "1.0.217", features = ["derive"] }
+server = { path = "server", package = "berver" }
 storable_vec = { path = "storable_vec" }
 struct_iterable = { path = "struct_iterable" }
-zerocopy = { version = "0.8.16", features = ["derive"] }
+zerocopy = { version = "0.8.17", features = ["derive"] }
diff --git a/computer/src/lib.rs b/computer/src/lib.rs
index 7a2a807c8..4cf2cb9ad 100644
--- a/computer/src/lib.rs
+++ b/computer/src/lib.rs
@@ -2,48 +2,35 @@ use std::path::{Path, PathBuf};
 
 use exit::Exit;
 use indexer::Indexer;
-use iterator::rpc;
+pub use iterator::rpc;
 
 mod storage;
 mod structs;
 
-use storable_vec::{CACHED_GETS, SINGLE_THREAD};
+use storable_vec::SINGLE_THREAD;
 use storage::{Fjalls, StorableVecs};
-use structs::*;
+pub use structs::*;
 
 pub struct Computer<const MODE: u8> {
-    outputs_dir: PathBuf,
+    path: PathBuf,
     pub vecs: StorableVecs<MODE>,
     pub trees: Fjalls,
 }
 
 impl<const MODE: u8> Computer<MODE> {
-    pub fn import(outputs_dir: &Path) -> color_eyre::Result<Self> {
-        let outputs_dir = outputs_dir.to_owned();
-        let computed_dir = outputs_dir.join("computed");
+    pub fn import(computed_dir: &Path) -> color_eyre::Result<Self> {
         let vecs = StorableVecs::import(&computed_dir.join("vecs"))?;
         let trees = Fjalls::import(&computed_dir.join("fjall"))?;
         Ok(Self {
-            outputs_dir,
+            path: computed_dir.to_owned(),
             vecs,
             trees,
         })
     }
-
-    fn open_indexer<const MODE_IDX: u8>(&self) -> color_eyre::Result<Indexer<MODE_IDX>> {
-        Indexer::import(&self.outputs_dir.join("indexes"))
-    }
 }
 
 impl Computer<SINGLE_THREAD> {
-    pub fn compute(&mut self, bitcoin_dir: &Path, rpc: rpc::Client, exit: &Exit) -> color_eyre::Result<()> {
-        if false {
-            let mut indexer: Indexer<CACHED_GETS> = self.open_indexer()?;
-            indexer.index(bitcoin_dir, rpc, exit)?;
-        }
-
-        let mut indexer: Indexer<SINGLE_THREAD> = self.open_indexer()?;
-
+    pub fn compute(&mut self, mut indexer: Indexer<SINGLE_THREAD>, exit: &Exit) -> color_eyre::Result<()> {
         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();
@@ -117,4 +104,8 @@ impl Computer<SINGLE_THREAD> {
 
         Ok(())
     }
+
+    pub fn path(&self) -> &Path {
+        &self.path
+    }
 }
diff --git a/computer/src/main.rs b/computer/src/main.rs
index aac39505c..0f67f21e0 100644
--- a/computer/src/main.rs
+++ b/computer/src/main.rs
@@ -2,26 +2,20 @@ use std::path::Path;
 
 use bomputer::Computer;
 use exit::Exit;
-use iterator::rpc;
-use storable_vec::SINGLE_THREAD;
+use indexer::Indexer;
 
 mod structs;
 
 pub fn main() -> color_eyre::Result<()> {
     color_eyre::install()?;
 
-    let data_dir = Path::new("../../bitcoin");
-    let rpc = rpc::Client::new(
-        "http://localhost:8332",
-        rpc::Auth::CookieFile(Path::new(data_dir).join(".cookie")),
-    )?;
     let exit = Exit::new();
 
     let i = std::time::Instant::now();
 
-    let mut computer: Computer<SINGLE_THREAD> = Computer::import(Path::new("../_outputs"))?;
+    let outputs_dir = Path::new("../_outputs");
 
-    computer.compute(data_dir, rpc, &exit)?;
+    Computer::import(&outputs_dir.join("computed"))?.compute(Indexer::import(&outputs_dir.join("indexes"))?, &exit)?;
 
     dbg!(i.elapsed());
 
diff --git a/computer/src/storage/storable_vecs.rs b/computer/src/storage/storable_vecs.rs
index 131a34f04..c7835320d 100644
--- a/computer/src/storage/storable_vecs.rs
+++ b/computer/src/storage/storable_vecs.rs
@@ -11,20 +11,21 @@ use crate::structs::{Date, Feerate};
 
 pub struct StorableVecs<const MODE: u8> {
     pub date_to_first_height: StorableVec<Date, Height, MODE>,
+    // pub date_to_last_height: StorableVec<Date, Height, MODE>,
     // pub height_to_block_interval: StorableVec<Height, Timestamp, MODE>,
     pub height_to_date: StorableVec<Height, Date, MODE>,
     // pub height_to_fee: StorableVec<Txindex, Amount, MODE>,
-    // pub height_to_inputcount: StorableVec<Txindex, u32, MODE>,
+    // pub height_to_inputcount: StorableVec<Height, u32, MODE>,
     // pub height_to_last_addressindex: StorableVec<Height, Addressindex, MODE>,
     pub height_to_last_txindex: StorableVec<Height, Txindex, MODE>,
     // pub height_to_last_txoutindex: StorableVec<Height, Txoutindex, MODE>,
-    // pub height_to_maxfeerate: StorableVec<Txindex, Feerate, MODE>,
-    // pub height_to_medianfeerate: StorableVec<Txindex, Feerate, MODE>,
-    // pub height_to_minfeerate: StorableVec<Txindex, Feerate, MODE>,
-    // pub height_to_outputcount: StorableVec<Txindex, u32, MODE>,
-    // pub height_to_subsidy: StorableVec<Txindex, u32, MODE>,
+    // pub height_to_maxfeerate: StorableVec<Height, Feerate, MODE>,
+    // pub height_to_medianfeerate: StorableVec<Height, Feerate, MODE>,
+    // pub height_to_minfeerate: StorableVec<Height, Feerate, MODE>,
+    // pub height_to_outputcount: StorableVec<Height, u32, MODE>,
+    // pub height_to_subsidy: StorableVec<Height, u32, MODE>,
     // pub height_to_totalfees: StorableVec<Height, Amount, MODE>,
-    // pub height_to_txcount: StorableVec<Txindex, u32, MODE>,
+    // pub height_to_txcount: StorableVec<Height, u32, MODE>,
     pub txindex_to_fee: StorableVec<Txindex, Amount, MODE>,
     pub txindex_to_height: StorableVec<Txindex, Height, MODE>,
     pub txindex_to_is_coinbase: StorableVec<Txindex, bool, MODE>,
diff --git a/exit/Cargo.toml b/exit/Cargo.toml
index 9a58fb4bb..e5c0e0723 100644
--- a/exit/Cargo.toml
+++ b/exit/Cargo.toml
@@ -5,3 +5,4 @@ edition = "2021"
 
 [dependencies]
 ctrlc = "3.4.5"
+logger = { workspace = true }
diff --git a/exit/src/lib.rs b/exit/src/lib.rs
index d206f5b07..87ea02c9f 100644
--- a/exit/src/lib.rs
+++ b/exit/src/lib.rs
@@ -8,6 +8,8 @@ use std::{
     time::Duration,
 };
 
+use logger::info;
+
 #[derive(Default, Clone)]
 pub struct Exit {
     blocked: Arc<AtomicBool>,
@@ -27,12 +29,12 @@ impl Exit {
         let blocked = move || _blocked.load(Ordering::SeqCst);
 
         ctrlc::set_handler(move || {
-            println!("Exitting...");
+            info!("Exitting...");
 
             active.store(true, Ordering::SeqCst);
 
             if blocked() {
-                println!("Waiting to exit safely");
+                info!("Waiting to exit safely");
 
                 while blocked() {
                     sleep(Duration::from_millis(50));
diff --git a/indexer/Cargo.toml b/indexer/Cargo.toml
index 4219b5629..6b68f9873 100644
--- a/indexer/Cargo.toml
+++ b/indexer/Cargo.toml
@@ -11,7 +11,11 @@ exit = { workspace = true }
 fjall = { workspace = true }
 iterator = { workspace = true }
 jiff = { workspace = true }
+logger = { workspace = true }
 rapidhash = "1.3.0"
 rayon = { workspace = true }
+rlimit = { workspace = true }
+serde = { workspace = true }
+serde_bytes = "0.11.15"
 storable_vec = { workspace = true }
 zerocopy = { workspace = true }
diff --git a/indexer/src/lib.rs b/indexer/src/lib.rs
index 0078f7cfd..157f61381 100644
--- a/indexer/src/lib.rs
+++ b/indexer/src/lib.rs
@@ -1,6 +1,5 @@
 use std::{
     collections::BTreeMap,
-    io::{Read, Write},
     path::Path,
     str::FromStr,
     thread::{self, sleep},
@@ -12,6 +11,7 @@ pub use iterator::*;
 use bitcoin::{Transaction, TxIn, TxOut};
 use color_eyre::eyre::{eyre, ContextCompat};
 use exit::Exit;
+use logger::info;
 use rayon::prelude::*;
 use storable_vec::CACHED_GETS;
 
@@ -19,15 +19,10 @@ mod storage;
 mod structs;
 
 pub use storage::{AnyStorableVec, StorableVec, Store, StoreMeta};
-use structs::{BlockHash, Txid};
-
 use storage::{Fjalls, StorableVecs};
-pub use structs::{
-    AddressHash, Addressbytes, Addressindex, Addresstype, Amount, BlockHashPrefix, Height, Timestamp, TxidPrefix,
-    Txindex, Txinindex, Txoutindex, Vin, Vout,
-};
+pub use structs::*;
 
-const UNSAFE_BLOCKS: u32 = 100;
+const UNSAFE_BLOCKS: u32 = 1000;
 const SNAPSHOT_BLOCK_RANGE: usize = 1000;
 
 pub struct Indexer<const MODE: u8> {
@@ -39,6 +34,7 @@ impl<const MODE: u8> Indexer<MODE> {
     pub fn import(indexes_dir: &Path) -> color_eyre::Result<Self> {
         let vecs = StorableVecs::import(&indexes_dir.join("vecs"))?;
         let trees = Fjalls::import(&indexes_dir.join("fjall"))?;
+
         Ok(Self { vecs, trees })
     }
 }
@@ -77,7 +73,7 @@ impl Indexer<CACHED_GETS> {
 
         let export =
             |trees: &mut Fjalls, vecs: &mut StorableVecs<CACHED_GETS>, height: Height| -> color_eyre::Result<()> {
-                println!("Exporting...");
+                info!("Exporting...");
 
                 exit.block();
 
@@ -93,10 +89,10 @@ impl Indexer<CACHED_GETS> {
                 Ok(())
             };
 
-        iterator::new(bitcoin_dir, Some(height.into()), None, rpc)
+        iterator::new(bitcoin_dir, Some(height.into()), Some(400_000), rpc)
             .iter()
             .try_for_each(|(_height, block, blockhash)| -> color_eyre::Result<()> {
-                println!("Processing block {_height}...");
+                info!("Processing block {_height}...");
 
                 let blockhash = BlockHash::from(blockhash);
                 height = Height::from(_height);
@@ -327,7 +323,7 @@ impl Indexer<CACHED_GETS> {
                                             .and_then(|addressindex_local| {
                                                 (addressindex_local < addressindex_global).then_some(addressindex_local)
                                             })
-                                    }); // OK
+                                    });
 
                                     if let Some(Some(addressindex)) = check_collisions.then_some(addressindex_opt) {
                                         let addressbytes = addressbytes_res.as_ref().unwrap();
@@ -341,8 +337,6 @@ impl Indexer<CACHED_GETS> {
                                             .addressindex_to_addresstypeindex
                                             .get(addressindex)?
                                             .context("Expect to have address type index")?;
-                                        // Good first time
-                                        // Wrong after rerun
 
                                         let prev_addressbytes_opt =
                                             vecs.get_addressbytes(prev_addresstype, addresstypeindex)?;
@@ -473,18 +467,18 @@ impl Indexer<CACHED_GETS> {
                             addressindex_global.increment();
 
                             let addresstypeindex = match addresstype {
-                                Addresstype::Empty => emptyindex_global.clone_then_increment(),
-                                Addresstype::Multisig => multisigindex_global.clone_then_increment(),
-                                Addresstype::OpReturn => opreturnindex_global.clone_then_increment(),
-                                Addresstype::PushOnly => pushonlyindex_global.clone_then_increment(),
-                                Addresstype::Unknown => unknownindex_global.clone_then_increment(),
-                                Addresstype::P2PK65 => p2pk65index_global.clone_then_increment(),
-                                Addresstype::P2PK33 => p2pk33index_global.clone_then_increment(),
-                                Addresstype::P2PKH => p2pkhindex_global.clone_then_increment(),
-                                Addresstype::P2SH => p2shindex_global.clone_then_increment(),
-                                Addresstype::P2WPKH => p2wpkhindex_global.clone_then_increment(),
-                                Addresstype::P2WSH => p2wshindex_global.clone_then_increment(),
-                                Addresstype::P2TR => p2trindex_global.clone_then_increment(),
+                                Addresstype::Empty => emptyindex_global.copy_then_increment(),
+                                Addresstype::Multisig => multisigindex_global.copy_then_increment(),
+                                Addresstype::OpReturn => opreturnindex_global.copy_then_increment(),
+                                Addresstype::PushOnly => pushonlyindex_global.copy_then_increment(),
+                                Addresstype::Unknown => unknownindex_global.copy_then_increment(),
+                                Addresstype::P2PK65 => p2pk65index_global.copy_then_increment(),
+                                Addresstype::P2PK33 => p2pk33index_global.copy_then_increment(),
+                                Addresstype::P2PKH => p2pkhindex_global.copy_then_increment(),
+                                Addresstype::P2SH => p2shindex_global.copy_then_increment(),
+                                Addresstype::P2WPKH => p2wpkhindex_global.copy_then_increment(),
+                                Addresstype::P2WSH => p2wshindex_global.copy_then_increment(),
+                                Addresstype::P2TR => p2trindex_global.copy_then_increment(),
                             };
 
                             vecs.addressindex_to_addresstype
@@ -674,12 +668,3 @@ enum InputSource<'a> {
     PreviousBlock((Vin, Txindex, Txoutindex)),
     SameBlock((&'a Transaction, Txindex, &'a TxIn, Vin)),
 }
-
-#[allow(unused)]
-fn pause() {
-    let mut stdin = std::io::stdin();
-    let mut stdout = std::io::stdout();
-    write!(stdout, "Press any key to continue...").unwrap();
-    stdout.flush().unwrap();
-    let _ = stdin.read(&mut [0u8]).unwrap();
-}
diff --git a/indexer/src/main.rs b/indexer/src/main.rs
index 67385efd7..3b7b6e7db 100644
--- a/indexer/src/main.rs
+++ b/indexer/src/main.rs
@@ -8,6 +8,14 @@ use storable_vec::CACHED_GETS;
 fn main() -> color_eyre::Result<()> {
     color_eyre::install()?;
 
+    logger::init_log(None);
+
+    rlimit::setrlimit(
+        rlimit::Resource::NOFILE,
+        21_000,
+        rlimit::getrlimit(rlimit::Resource::NOFILE).unwrap().1,
+    )?;
+
     let data_dir = Path::new("../../bitcoin");
     let rpc = rpc::Client::new(
         "http://localhost:8332",
diff --git a/indexer/src/storage/storable_vecs/mod.rs b/indexer/src/storage/storable_vecs/mod.rs
index 09654f836..be26308d9 100644
--- a/indexer/src/storage/storable_vecs/mod.rs
+++ b/indexer/src/storage/storable_vecs/mod.rs
@@ -5,9 +5,11 @@ use rayon::prelude::*;
 use storable_vec::{Version, CACHED_GETS};
 
 use crate::structs::{
-    Addressbytes, Addressindex, Addresstype, Addresstypeindex, Amount, BlockHash, Height, LockTime, P2PK33AddressBytes,
-    P2PK65AddressBytes, P2PKHAddressBytes, P2SHAddressBytes, P2TRAddressBytes, P2WPKHAddressBytes, P2WSHAddressBytes,
-    Timestamp, TxVersion, Txid, Txindex, Txinindex, Txoutindex, Weight,
+    Addressbytes, Addressindex, Addresstype, Addresstypeindex, Amount, BlockHash, Emptyindex, Height, LockTime,
+    Multisigindex, Opreturnindex, P2PK33AddressBytes, P2PK33index, P2PK65AddressBytes, P2PK65index, P2PKHAddressBytes,
+    P2PKHindex, P2SHAddressBytes, P2SHindex, P2TRAddressBytes, P2TRindex, P2WPKHAddressBytes, P2WPKHindex,
+    P2WSHAddressBytes, P2WSHindex, Pushonlyindex, Timestamp, TxVersion, Txid, Txindex, Txinindex, Txoutindex,
+    Unknownindex, Weight,
 };
 
 mod base;
@@ -21,31 +23,31 @@ pub struct StorableVecs<const MODE: u8> {
     pub height_to_blockhash: StorableVec<Height, BlockHash, MODE>,
     pub height_to_difficulty: StorableVec<Height, f64, MODE>,
     pub height_to_first_addressindex: StorableVec<Height, Addressindex, MODE>,
-    pub height_to_first_emptyindex: StorableVec<Height, Addresstypeindex, MODE>,
-    pub height_to_first_multisigindex: StorableVec<Height, Addresstypeindex, MODE>,
-    pub height_to_first_opreturnindex: StorableVec<Height, Addresstypeindex, MODE>,
-    pub height_to_first_pushonlyindex: StorableVec<Height, Addresstypeindex, MODE>,
+    pub height_to_first_emptyindex: StorableVec<Height, Emptyindex, MODE>,
+    pub height_to_first_multisigindex: StorableVec<Height, Multisigindex, MODE>,
+    pub height_to_first_opreturnindex: StorableVec<Height, Opreturnindex, MODE>,
+    pub height_to_first_pushonlyindex: StorableVec<Height, Pushonlyindex, MODE>,
     pub height_to_first_txindex: StorableVec<Height, Txindex, MODE>,
     pub height_to_first_txinindex: StorableVec<Height, Txinindex, MODE>,
     pub height_to_first_txoutindex: StorableVec<Height, Txoutindex, MODE>,
-    pub height_to_first_unknownindex: StorableVec<Height, Addresstypeindex, MODE>,
-    pub height_to_first_p2pk33index: StorableVec<Height, Addresstypeindex, MODE>,
-    pub height_to_first_p2pk65index: StorableVec<Height, Addresstypeindex, MODE>,
-    pub height_to_first_p2pkhindex: StorableVec<Height, Addresstypeindex, MODE>,
-    pub height_to_first_p2shindex: StorableVec<Height, Addresstypeindex, MODE>,
-    pub height_to_first_p2trindex: StorableVec<Height, Addresstypeindex, MODE>,
-    pub height_to_first_p2wpkhindex: StorableVec<Height, Addresstypeindex, MODE>,
-    pub height_to_first_p2wshindex: StorableVec<Height, Addresstypeindex, MODE>,
+    pub height_to_first_unknownindex: StorableVec<Height, Unknownindex, MODE>,
+    pub height_to_first_p2pk33index: StorableVec<Height, P2PK33index, MODE>,
+    pub height_to_first_p2pk65index: StorableVec<Height, P2PK65index, MODE>,
+    pub height_to_first_p2pkhindex: StorableVec<Height, P2PKHindex, MODE>,
+    pub height_to_first_p2shindex: StorableVec<Height, P2SHindex, MODE>,
+    pub height_to_first_p2trindex: StorableVec<Height, P2TRindex, MODE>,
+    pub height_to_first_p2wpkhindex: StorableVec<Height, P2WPKHindex, MODE>,
+    pub height_to_first_p2wshindex: StorableVec<Height, P2WSHindex, MODE>,
     pub height_to_size: StorableVec<Height, usize, MODE>,
     pub height_to_timestamp: StorableVec<Height, Timestamp, MODE>,
     pub height_to_weight: StorableVec<Height, Weight, MODE>,
-    pub p2pk33index_to_p2pk33addressbytes: StorableVec<Addresstypeindex, P2PK33AddressBytes, MODE>,
-    pub p2pk65index_to_p2pk65addressbytes: StorableVec<Addresstypeindex, P2PK65AddressBytes, MODE>,
-    pub p2pkhindex_to_p2pkhaddressbytes: StorableVec<Addresstypeindex, P2PKHAddressBytes, MODE>,
-    pub p2shindex_to_p2shaddressbytes: StorableVec<Addresstypeindex, P2SHAddressBytes, MODE>,
-    pub p2trindex_to_p2traddressbytes: StorableVec<Addresstypeindex, P2TRAddressBytes, MODE>,
-    pub p2wpkhindex_to_p2wpkhaddressbytes: StorableVec<Addresstypeindex, P2WPKHAddressBytes, MODE>,
-    pub p2wshindex_to_p2wshaddressbytes: StorableVec<Addresstypeindex, P2WSHAddressBytes, MODE>,
+    pub p2pk33index_to_p2pk33addressbytes: StorableVec<P2PK33index, P2PK33AddressBytes, MODE>,
+    pub p2pk65index_to_p2pk65addressbytes: StorableVec<P2PK65index, P2PK65AddressBytes, MODE>,
+    pub p2pkhindex_to_p2pkhaddressbytes: StorableVec<P2PKHindex, P2PKHAddressBytes, MODE>,
+    pub p2shindex_to_p2shaddressbytes: StorableVec<P2SHindex, P2SHAddressBytes, MODE>,
+    pub p2trindex_to_p2traddressbytes: StorableVec<P2TRindex, P2TRAddressBytes, MODE>,
+    pub p2wpkhindex_to_p2wpkhaddressbytes: StorableVec<P2WPKHindex, P2WPKHAddressBytes, MODE>,
+    pub p2wshindex_to_p2wshaddressbytes: StorableVec<P2WSHindex, P2WSHAddressBytes, MODE>,
     pub txindex_to_first_txinindex: StorableVec<Txindex, Txinindex, MODE>,
     pub txindex_to_first_txoutindex: StorableVec<Txindex, Txoutindex, MODE>,
     pub txindex_to_height: StorableVec<Txindex, Height, MODE>,
@@ -57,7 +59,7 @@ pub struct StorableVecs<const MODE: u8> {
     pub txoutindex_to_amount: StorableVec<Txoutindex, Amount, MODE>,
 }
 
-// const UNSAFE_BLOCKS: usize = 100;
+// const UNSAFE_BLOCKS: usize = 1000;
 
 impl<const MODE: u8> StorableVecs<MODE> {
     pub fn import(path: &Path) -> color_eyre::Result<Self> {
@@ -407,37 +409,37 @@ impl StorableVecs<CACHED_GETS> {
         Ok(match addresstype {
             Addresstype::P2PK65 => self
                 .p2pk65index_to_p2pk65addressbytes
-                .get(addresstypeindex)?
+                .get(addresstypeindex.into())?
                 // .map(|v| Addressbytes::from(v.clone())),
                 .map(|v| Addressbytes::from(v.into_inner())),
             Addresstype::P2PK33 => self
                 .p2pk33index_to_p2pk33addressbytes
-                .get(addresstypeindex)?
+                .get(addresstypeindex.into())?
                 // .map(|v| Addressbytes::from(v.clone())),
                 .map(|v| Addressbytes::from(v.into_inner())),
             Addresstype::P2PKH => self
                 .p2pkhindex_to_p2pkhaddressbytes
-                .get(addresstypeindex)?
+                .get(addresstypeindex.into())?
                 // .map(|v| Addressbytes::from(v.clone())),
                 .map(|v| Addressbytes::from(v.into_inner())),
             Addresstype::P2SH => self
                 .p2shindex_to_p2shaddressbytes
-                .get(addresstypeindex)?
+                .get(addresstypeindex.into())?
                 // .map(|v| Addressbytes::from(v.clone())),
                 .map(|v| Addressbytes::from(v.into_inner())),
             Addresstype::P2WPKH => self
                 .p2wpkhindex_to_p2wpkhaddressbytes
-                .get(addresstypeindex)?
+                .get(addresstypeindex.into())?
                 // .map(|v| Addressbytes::from(v.clone())),
                 .map(|v| Addressbytes::from(v.into_inner())),
             Addresstype::P2WSH => self
                 .p2wshindex_to_p2wshaddressbytes
-                .get(addresstypeindex)?
+                .get(addresstypeindex.into())?
                 // .map(|v| Addressbytes::from(v.clone())),
                 .map(|v| Addressbytes::from(v.into_inner())),
             Addresstype::P2TR => self
                 .p2trindex_to_p2traddressbytes
-                .get(addresstypeindex)?
+                .get(addresstypeindex.into())?
                 // .map(|v| Addressbytes::from(v.clone())),
                 .map(|v| Addressbytes::from(v.into_inner())),
             _ => unreachable!(),
@@ -450,13 +452,19 @@ impl StorableVecs<CACHED_GETS> {
         addressbytes: Addressbytes,
     ) -> storable_vec::Result<()> {
         match addressbytes {
-            Addressbytes::P2PK65(bytes) => self.p2pk65index_to_p2pk65addressbytes.push_if_needed(index, bytes),
-            Addressbytes::P2PK33(bytes) => self.p2pk33index_to_p2pk33addressbytes.push_if_needed(index, bytes),
-            Addressbytes::P2PKH(bytes) => self.p2pkhindex_to_p2pkhaddressbytes.push_if_needed(index, bytes),
-            Addressbytes::P2SH(bytes) => self.p2shindex_to_p2shaddressbytes.push_if_needed(index, bytes),
-            Addressbytes::P2WPKH(bytes) => self.p2wpkhindex_to_p2wpkhaddressbytes.push_if_needed(index, bytes),
-            Addressbytes::P2WSH(bytes) => self.p2wshindex_to_p2wshaddressbytes.push_if_needed(index, bytes),
-            Addressbytes::P2TR(bytes) => self.p2trindex_to_p2traddressbytes.push_if_needed(index, bytes),
+            Addressbytes::P2PK65(bytes) => self
+                .p2pk65index_to_p2pk65addressbytes
+                .push_if_needed(index.into(), bytes),
+            Addressbytes::P2PK33(bytes) => self
+                .p2pk33index_to_p2pk33addressbytes
+                .push_if_needed(index.into(), bytes),
+            Addressbytes::P2PKH(bytes) => self.p2pkhindex_to_p2pkhaddressbytes.push_if_needed(index.into(), bytes),
+            Addressbytes::P2SH(bytes) => self.p2shindex_to_p2shaddressbytes.push_if_needed(index.into(), bytes),
+            Addressbytes::P2WPKH(bytes) => self
+                .p2wpkhindex_to_p2wpkhaddressbytes
+                .push_if_needed(index.into(), bytes),
+            Addressbytes::P2WSH(bytes) => self.p2wshindex_to_p2wshaddressbytes.push_if_needed(index.into(), bytes),
+            Addressbytes::P2TR(bytes) => self.p2trindex_to_p2traddressbytes.push_if_needed(index.into(), bytes),
         }
     }
 }
diff --git a/indexer/src/structs/addressbytes.rs b/indexer/src/structs/addressbytes.rs
index 1d882977c..70940b46d 100644
--- a/indexer/src/structs/addressbytes.rs
+++ b/indexer/src/structs/addressbytes.rs
@@ -1,6 +1,7 @@
 use color_eyre::eyre::eyre;
 use derive_deref::{Deref, DerefMut};
 use iterator::bitcoin::ScriptBuf;
+use serde::Serialize;
 use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout};
 
 use super::Addresstype;
@@ -123,28 +124,28 @@ impl From<P2TRAddressBytes> for Addressbytes {
     }
 }
 
-#[derive(Debug, Clone, Deref, PartialEq, Eq, Immutable, IntoBytes, KnownLayout, FromBytes)]
+#[derive(Debug, Clone, Deref, PartialEq, Eq, Immutable, IntoBytes, KnownLayout, FromBytes, Serialize)]
 pub struct P2PK65AddressBytes(U8x65);
 
-#[derive(Debug, Clone, Deref, PartialEq, Eq, Immutable, IntoBytes, KnownLayout, FromBytes)]
+#[derive(Debug, Clone, Deref, PartialEq, Eq, Immutable, IntoBytes, KnownLayout, FromBytes, Serialize)]
 pub struct P2PK33AddressBytes(U8x33);
 
-#[derive(Debug, Clone, Deref, PartialEq, Eq, Immutable, IntoBytes, KnownLayout, FromBytes)]
+#[derive(Debug, Clone, Deref, PartialEq, Eq, Immutable, IntoBytes, KnownLayout, FromBytes, Serialize)]
 pub struct P2PKHAddressBytes(U8x20);
 
-#[derive(Debug, Clone, Deref, PartialEq, Eq, Immutable, IntoBytes, KnownLayout, FromBytes)]
+#[derive(Debug, Clone, Deref, PartialEq, Eq, Immutable, IntoBytes, KnownLayout, FromBytes, Serialize)]
 pub struct P2SHAddressBytes(U8x20);
 
-#[derive(Debug, Clone, Deref, PartialEq, Eq, Immutable, IntoBytes, KnownLayout, FromBytes)]
+#[derive(Debug, Clone, Deref, PartialEq, Eq, Immutable, IntoBytes, KnownLayout, FromBytes, Serialize)]
 pub struct P2WPKHAddressBytes(U8x20);
 
-#[derive(Debug, Clone, Deref, PartialEq, Eq, Immutable, IntoBytes, KnownLayout, FromBytes)]
+#[derive(Debug, Clone, Deref, PartialEq, Eq, Immutable, IntoBytes, KnownLayout, FromBytes, Serialize)]
 pub struct P2WSHAddressBytes(U8x32);
 
-#[derive(Debug, Clone, Deref, PartialEq, Eq, Immutable, IntoBytes, KnownLayout, FromBytes)]
+#[derive(Debug, Clone, Deref, PartialEq, Eq, Immutable, IntoBytes, KnownLayout, FromBytes, Serialize)]
 pub struct P2TRAddressBytes(U8x32);
 
-#[derive(Debug, Clone, Deref, DerefMut, PartialEq, Eq, Immutable, IntoBytes, KnownLayout, FromBytes)]
+#[derive(Debug, Clone, Deref, DerefMut, PartialEq, Eq, Immutable, IntoBytes, KnownLayout, FromBytes, Serialize)]
 pub struct U8x20([u8; 20]);
 impl From<&[u8]> for U8x20 {
     fn from(slice: &[u8]) -> Self {
@@ -154,7 +155,7 @@ impl From<&[u8]> for U8x20 {
     }
 }
 
-#[derive(Debug, Clone, Deref, DerefMut, PartialEq, Eq, Immutable, IntoBytes, KnownLayout, FromBytes)]
+#[derive(Debug, Clone, Deref, DerefMut, PartialEq, Eq, Immutable, IntoBytes, KnownLayout, FromBytes, Serialize)]
 pub struct U8x32([u8; 32]);
 impl From<&[u8]> for U8x32 {
     fn from(slice: &[u8]) -> Self {
@@ -164,8 +165,8 @@ impl From<&[u8]> for U8x32 {
     }
 }
 
-#[derive(Debug, Clone, Deref, DerefMut, PartialEq, Eq, Immutable, IntoBytes, KnownLayout, FromBytes)]
-pub struct U8x33([u8; 33]);
+#[derive(Debug, Clone, Deref, DerefMut, PartialEq, Eq, Immutable, IntoBytes, KnownLayout, FromBytes, Serialize)]
+pub struct U8x33(#[serde(with = "serde_bytes")] [u8; 33]);
 impl From<&[u8]> for U8x33 {
     fn from(slice: &[u8]) -> Self {
         let mut arr = [0; 33];
@@ -174,8 +175,8 @@ impl From<&[u8]> for U8x33 {
     }
 }
 
-#[derive(Debug, Clone, Deref, DerefMut, PartialEq, Eq, Immutable, IntoBytes, KnownLayout, FromBytes)]
-pub struct U8x64([u8; 64]);
+#[derive(Debug, Clone, Deref, DerefMut, PartialEq, Eq, Immutable, IntoBytes, KnownLayout, FromBytes, Serialize)]
+pub struct U8x64(#[serde(with = "serde_bytes")] [u8; 64]);
 impl From<&[u8]> for U8x64 {
     fn from(slice: &[u8]) -> Self {
         let mut arr = [0; 64];
@@ -184,8 +185,8 @@ impl From<&[u8]> for U8x64 {
     }
 }
 
-#[derive(Debug, Clone, Deref, DerefMut, PartialEq, Eq, Immutable, IntoBytes, KnownLayout, FromBytes)]
-pub struct U8x65([u8; 65]);
+#[derive(Debug, Clone, Deref, DerefMut, PartialEq, Eq, Immutable, IntoBytes, KnownLayout, FromBytes, Serialize)]
+pub struct U8x65(#[serde(with = "serde_bytes")] [u8; 65]);
 impl From<&[u8]> for U8x65 {
     fn from(slice: &[u8]) -> Self {
         let mut arr = [0; 65];
diff --git a/indexer/src/structs/addressindex.rs b/indexer/src/structs/addressindex.rs
index 72fcf06a0..02310ede8 100644
--- a/indexer/src/structs/addressindex.rs
+++ b/indexer/src/structs/addressindex.rs
@@ -2,6 +2,7 @@ use std::ops::Add;
 
 use derive_deref::{Deref, DerefMut};
 use fjall::Slice;
+use serde::Serialize;
 use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout};
 
 #[derive(
@@ -19,6 +20,7 @@ use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout};
     Immutable,
     IntoBytes,
     KnownLayout,
+    Serialize,
 )]
 pub struct Addressindex(u32);
 
diff --git a/indexer/src/structs/addresstype.rs b/indexer/src/structs/addresstype.rs
index a4bac0a41..a1da2b4df 100644
--- a/indexer/src/structs/addresstype.rs
+++ b/indexer/src/structs/addresstype.rs
@@ -1,7 +1,10 @@
 use iterator::bitcoin::ScriptBuf;
+use serde::Serialize;
 use zerocopy::{Immutable, IntoBytes, KnownLayout, TryFromBytes};
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, TryFromBytes, Immutable, IntoBytes, KnownLayout)]
+#[derive(
+    Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, TryFromBytes, Immutable, IntoBytes, KnownLayout, Serialize,
+)]
 #[repr(u8)]
 pub enum Addresstype {
     P2PK65,
diff --git a/indexer/src/structs/addresstypeindex.rs b/indexer/src/structs/addresstypeindex.rs
index 042a8d352..97f99c533 100644
--- a/indexer/src/structs/addresstypeindex.rs
+++ b/indexer/src/structs/addresstypeindex.rs
@@ -1,6 +1,7 @@
 use std::ops::Add;
 
 use derive_deref::{Deref, DerefMut};
+use serde::Serialize;
 use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout};
 
 #[derive(
@@ -18,6 +19,7 @@ use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout};
     Immutable,
     IntoBytes,
     KnownLayout,
+    Serialize,
 )]
 pub struct Addresstypeindex(u32);
 
@@ -34,7 +36,7 @@ impl Addresstypeindex {
         Self(*self + 1)
     }
 
-    pub fn clone_then_increment(&mut self) -> Self {
+    pub fn copy_then_increment(&mut self) -> Self {
         let i = *self;
         self.increment();
         i
@@ -82,3 +84,483 @@ impl Add<Addresstypeindex> for Addresstypeindex {
         Self(self.0 + rhs.0)
     }
 }
+
+#[derive(
+    Debug,
+    PartialEq,
+    Eq,
+    PartialOrd,
+    Ord,
+    Clone,
+    Copy,
+    Deref,
+    DerefMut,
+    Default,
+    FromBytes,
+    Immutable,
+    IntoBytes,
+    KnownLayout,
+    Serialize,
+)]
+pub struct Emptyindex(Addresstypeindex);
+impl From<Addresstypeindex> for Emptyindex {
+    fn from(value: Addresstypeindex) -> Self {
+        Self(value)
+    }
+}
+impl From<Emptyindex> for usize {
+    fn from(value: Emptyindex) -> Self {
+        Self::from(*value)
+    }
+}
+impl From<usize> for Emptyindex {
+    fn from(value: usize) -> Self {
+        Self(Addresstypeindex::from(value))
+    }
+}
+impl Add<usize> for Emptyindex {
+    type Output = Self;
+    fn add(self, rhs: usize) -> Self::Output {
+        Self(*self + rhs)
+    }
+}
+
+#[derive(
+    Debug,
+    PartialEq,
+    Eq,
+    PartialOrd,
+    Ord,
+    Clone,
+    Copy,
+    Deref,
+    DerefMut,
+    Default,
+    FromBytes,
+    Immutable,
+    IntoBytes,
+    KnownLayout,
+    Serialize,
+)]
+pub struct Multisigindex(Addresstypeindex);
+impl From<Addresstypeindex> for Multisigindex {
+    fn from(value: Addresstypeindex) -> Self {
+        Self(value)
+    }
+}
+impl From<Multisigindex> for usize {
+    fn from(value: Multisigindex) -> Self {
+        Self::from(*value)
+    }
+}
+impl From<usize> for Multisigindex {
+    fn from(value: usize) -> Self {
+        Self(Addresstypeindex::from(value))
+    }
+}
+impl Add<usize> for Multisigindex {
+    type Output = Self;
+    fn add(self, rhs: usize) -> Self::Output {
+        Self(*self + rhs)
+    }
+}
+
+#[derive(
+    Debug,
+    PartialEq,
+    Eq,
+    PartialOrd,
+    Ord,
+    Clone,
+    Copy,
+    Deref,
+    DerefMut,
+    Default,
+    FromBytes,
+    Immutable,
+    IntoBytes,
+    KnownLayout,
+    Serialize,
+)]
+pub struct Opreturnindex(Addresstypeindex);
+impl From<Addresstypeindex> for Opreturnindex {
+    fn from(value: Addresstypeindex) -> Self {
+        Self(value)
+    }
+}
+impl From<Opreturnindex> for usize {
+    fn from(value: Opreturnindex) -> Self {
+        Self::from(*value)
+    }
+}
+impl From<usize> for Opreturnindex {
+    fn from(value: usize) -> Self {
+        Self(Addresstypeindex::from(value))
+    }
+}
+impl Add<usize> for Opreturnindex {
+    type Output = Self;
+    fn add(self, rhs: usize) -> Self::Output {
+        Self(*self + rhs)
+    }
+}
+
+#[derive(
+    Debug,
+    PartialEq,
+    Eq,
+    PartialOrd,
+    Ord,
+    Clone,
+    Copy,
+    Deref,
+    DerefMut,
+    Default,
+    FromBytes,
+    Immutable,
+    IntoBytes,
+    KnownLayout,
+    Serialize,
+)]
+pub struct Pushonlyindex(Addresstypeindex);
+impl From<Addresstypeindex> for Pushonlyindex {
+    fn from(value: Addresstypeindex) -> Self {
+        Self(value)
+    }
+}
+impl From<Pushonlyindex> for usize {
+    fn from(value: Pushonlyindex) -> Self {
+        Self::from(*value)
+    }
+}
+impl From<usize> for Pushonlyindex {
+    fn from(value: usize) -> Self {
+        Self(Addresstypeindex::from(value))
+    }
+}
+impl Add<usize> for Pushonlyindex {
+    type Output = Self;
+    fn add(self, rhs: usize) -> Self::Output {
+        Self(*self + rhs)
+    }
+}
+
+#[derive(
+    Debug,
+    PartialEq,
+    Eq,
+    PartialOrd,
+    Ord,
+    Clone,
+    Copy,
+    Deref,
+    DerefMut,
+    Default,
+    FromBytes,
+    Immutable,
+    IntoBytes,
+    KnownLayout,
+    Serialize,
+)]
+pub struct Unknownindex(Addresstypeindex);
+impl From<Addresstypeindex> for Unknownindex {
+    fn from(value: Addresstypeindex) -> Self {
+        Self(value)
+    }
+}
+impl From<Unknownindex> for usize {
+    fn from(value: Unknownindex) -> Self {
+        Self::from(*value)
+    }
+}
+impl From<usize> for Unknownindex {
+    fn from(value: usize) -> Self {
+        Self(Addresstypeindex::from(value))
+    }
+}
+impl Add<usize> for Unknownindex {
+    type Output = Self;
+    fn add(self, rhs: usize) -> Self::Output {
+        Self(*self + rhs)
+    }
+}
+
+#[derive(
+    Debug,
+    PartialEq,
+    Eq,
+    PartialOrd,
+    Ord,
+    Clone,
+    Copy,
+    Deref,
+    DerefMut,
+    Default,
+    FromBytes,
+    Immutable,
+    IntoBytes,
+    KnownLayout,
+    Serialize,
+)]
+pub struct P2PK33index(Addresstypeindex);
+impl From<Addresstypeindex> for P2PK33index {
+    fn from(value: Addresstypeindex) -> Self {
+        Self(value)
+    }
+}
+impl From<P2PK33index> for usize {
+    fn from(value: P2PK33index) -> Self {
+        Self::from(*value)
+    }
+}
+impl From<usize> for P2PK33index {
+    fn from(value: usize) -> Self {
+        Self(Addresstypeindex::from(value))
+    }
+}
+impl Add<usize> for P2PK33index {
+    type Output = Self;
+    fn add(self, rhs: usize) -> Self::Output {
+        Self(*self + rhs)
+    }
+}
+
+#[derive(
+    Debug,
+    PartialEq,
+    Eq,
+    PartialOrd,
+    Ord,
+    Clone,
+    Copy,
+    Deref,
+    DerefMut,
+    Default,
+    FromBytes,
+    Immutable,
+    IntoBytes,
+    KnownLayout,
+    Serialize,
+)]
+pub struct P2PK65index(Addresstypeindex);
+impl From<Addresstypeindex> for P2PK65index {
+    fn from(value: Addresstypeindex) -> Self {
+        Self(value)
+    }
+}
+impl From<P2PK65index> for usize {
+    fn from(value: P2PK65index) -> Self {
+        Self::from(*value)
+    }
+}
+impl From<usize> for P2PK65index {
+    fn from(value: usize) -> Self {
+        Self(Addresstypeindex::from(value))
+    }
+}
+impl Add<usize> for P2PK65index {
+    type Output = Self;
+    fn add(self, rhs: usize) -> Self::Output {
+        Self(*self + rhs)
+    }
+}
+
+#[derive(
+    Debug,
+    PartialEq,
+    Eq,
+    PartialOrd,
+    Ord,
+    Clone,
+    Copy,
+    Deref,
+    DerefMut,
+    Default,
+    FromBytes,
+    Immutable,
+    IntoBytes,
+    KnownLayout,
+    Serialize,
+)]
+pub struct P2PKHindex(Addresstypeindex);
+impl From<Addresstypeindex> for P2PKHindex {
+    fn from(value: Addresstypeindex) -> Self {
+        Self(value)
+    }
+}
+impl From<P2PKHindex> for usize {
+    fn from(value: P2PKHindex) -> Self {
+        Self::from(*value)
+    }
+}
+impl From<usize> for P2PKHindex {
+    fn from(value: usize) -> Self {
+        Self(Addresstypeindex::from(value))
+    }
+}
+impl Add<usize> for P2PKHindex {
+    type Output = Self;
+    fn add(self, rhs: usize) -> Self::Output {
+        Self(*self + rhs)
+    }
+}
+
+#[derive(
+    Debug,
+    PartialEq,
+    Eq,
+    PartialOrd,
+    Ord,
+    Clone,
+    Copy,
+    Deref,
+    DerefMut,
+    Default,
+    FromBytes,
+    Immutable,
+    IntoBytes,
+    KnownLayout,
+    Serialize,
+)]
+pub struct P2SHindex(Addresstypeindex);
+impl From<Addresstypeindex> for P2SHindex {
+    fn from(value: Addresstypeindex) -> Self {
+        Self(value)
+    }
+}
+impl From<P2SHindex> for usize {
+    fn from(value: P2SHindex) -> Self {
+        Self::from(*value)
+    }
+}
+impl From<usize> for P2SHindex {
+    fn from(value: usize) -> Self {
+        Self(Addresstypeindex::from(value))
+    }
+}
+impl Add<usize> for P2SHindex {
+    type Output = Self;
+    fn add(self, rhs: usize) -> Self::Output {
+        Self(*self + rhs)
+    }
+}
+
+#[derive(
+    Debug,
+    PartialEq,
+    Eq,
+    PartialOrd,
+    Ord,
+    Clone,
+    Copy,
+    Deref,
+    DerefMut,
+    Default,
+    FromBytes,
+    Immutable,
+    IntoBytes,
+    KnownLayout,
+    Serialize,
+)]
+pub struct P2TRindex(Addresstypeindex);
+impl From<Addresstypeindex> for P2TRindex {
+    fn from(value: Addresstypeindex) -> Self {
+        Self(value)
+    }
+}
+impl From<P2TRindex> for usize {
+    fn from(value: P2TRindex) -> Self {
+        Self::from(*value)
+    }
+}
+impl From<usize> for P2TRindex {
+    fn from(value: usize) -> Self {
+        Self(Addresstypeindex::from(value))
+    }
+}
+impl Add<usize> for P2TRindex {
+    type Output = Self;
+    fn add(self, rhs: usize) -> Self::Output {
+        Self(*self + rhs)
+    }
+}
+
+#[derive(
+    Debug,
+    PartialEq,
+    Eq,
+    PartialOrd,
+    Ord,
+    Clone,
+    Copy,
+    Deref,
+    DerefMut,
+    Default,
+    FromBytes,
+    Immutable,
+    IntoBytes,
+    KnownLayout,
+    Serialize,
+)]
+pub struct P2WPKHindex(Addresstypeindex);
+impl From<Addresstypeindex> for P2WPKHindex {
+    fn from(value: Addresstypeindex) -> Self {
+        Self(value)
+    }
+}
+impl From<P2WPKHindex> for usize {
+    fn from(value: P2WPKHindex) -> Self {
+        Self::from(*value)
+    }
+}
+impl From<usize> for P2WPKHindex {
+    fn from(value: usize) -> Self {
+        Self(Addresstypeindex::from(value))
+    }
+}
+impl Add<usize> for P2WPKHindex {
+    type Output = Self;
+    fn add(self, rhs: usize) -> Self::Output {
+        Self(*self + rhs)
+    }
+}
+
+#[derive(
+    Debug,
+    PartialEq,
+    Eq,
+    PartialOrd,
+    Ord,
+    Clone,
+    Copy,
+    Deref,
+    DerefMut,
+    Default,
+    FromBytes,
+    Immutable,
+    IntoBytes,
+    KnownLayout,
+    Serialize,
+)]
+pub struct P2WSHindex(Addresstypeindex);
+impl From<Addresstypeindex> for P2WSHindex {
+    fn from(value: Addresstypeindex) -> Self {
+        Self(value)
+    }
+}
+impl From<P2WSHindex> for usize {
+    fn from(value: P2WSHindex) -> Self {
+        Self::from(*value)
+    }
+}
+impl From<usize> for P2WSHindex {
+    fn from(value: usize) -> Self {
+        Self(Addresstypeindex::from(value))
+    }
+}
+impl Add<usize> for P2WSHindex {
+    type Output = Self;
+    fn add(self, rhs: usize) -> Self::Output {
+        Self(*self + rhs)
+    }
+}
diff --git a/indexer/src/structs/amount.rs b/indexer/src/structs/amount.rs
index 519a3eaa2..6e0a6acd9 100644
--- a/indexer/src/structs/amount.rs
+++ b/indexer/src/structs/amount.rs
@@ -5,6 +5,7 @@ use std::{
 
 use derive_deref::{Deref, DerefMut};
 use iterator::bitcoin;
+use serde::Serialize;
 use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout};
 
 use super::Height;
@@ -24,6 +25,7 @@ use super::Height;
     Immutable,
     IntoBytes,
     KnownLayout,
+    Serialize,
 )]
 pub struct Amount(u64);
 
diff --git a/indexer/src/structs/blockhash.rs b/indexer/src/structs/blockhash.rs
index df24104b8..ac3eff4ae 100644
--- a/indexer/src/structs/blockhash.rs
+++ b/indexer/src/structs/blockhash.rs
@@ -1,9 +1,10 @@
 use std::mem;
 
 use derive_deref::Deref;
+use serde::Serialize;
 use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout};
 
-#[derive(Debug, Deref, Clone, PartialEq, Eq, Immutable, IntoBytes, KnownLayout, FromBytes)]
+#[derive(Debug, Deref, Clone, PartialEq, Eq, Immutable, IntoBytes, KnownLayout, FromBytes, Serialize)]
 pub struct BlockHash([u8; 32]);
 
 impl From<bitcoin::BlockHash> for BlockHash {
diff --git a/indexer/src/structs/height.rs b/indexer/src/structs/height.rs
index 618466926..e09fe4d11 100644
--- a/indexer/src/structs/height.rs
+++ b/indexer/src/structs/height.rs
@@ -7,6 +7,7 @@ use std::{
 use derive_deref::{Deref, DerefMut};
 use fjall::Slice;
 use iterator::rpc::{self, RpcApi};
+use serde::Serialize;
 use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout};
 
 #[derive(
@@ -24,6 +25,7 @@ use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout};
     Immutable,
     IntoBytes,
     KnownLayout,
+    Serialize,
 )]
 pub struct Height(u32);
 
diff --git a/indexer/src/structs/locktime.rs b/indexer/src/structs/locktime.rs
index 3d1963945..58a2ea9f2 100644
--- a/indexer/src/structs/locktime.rs
+++ b/indexer/src/structs/locktime.rs
@@ -1,8 +1,9 @@
+use serde::Serialize;
 use zerocopy::{Immutable, IntoBytes, KnownLayout, TryFromBytes};
 
 use super::{Height, Timestamp};
 
-#[derive(Debug, Immutable, Clone, Copy, IntoBytes, KnownLayout, TryFromBytes)]
+#[derive(Debug, Immutable, Clone, Copy, IntoBytes, KnownLayout, TryFromBytes, Serialize)]
 #[repr(C)]
 pub enum LockTime {
     Height(Height),
diff --git a/indexer/src/structs/timestamp.rs b/indexer/src/structs/timestamp.rs
index b7c73106d..ee48a5027 100644
--- a/indexer/src/structs/timestamp.rs
+++ b/indexer/src/structs/timestamp.rs
@@ -1,7 +1,10 @@
 use derive_deref::Deref;
+use serde::Serialize;
 use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout};
 
-#[derive(Debug, Deref, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, FromBytes, Immutable, IntoBytes, KnownLayout)]
+#[derive(
+    Debug, Deref, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, FromBytes, Immutable, IntoBytes, KnownLayout, Serialize,
+)]
 pub struct Timestamp(u32);
 
 impl From<u32> for Timestamp {
diff --git a/indexer/src/structs/txid.rs b/indexer/src/structs/txid.rs
index fee437fa0..c180ab457 100644
--- a/indexer/src/structs/txid.rs
+++ b/indexer/src/structs/txid.rs
@@ -1,9 +1,10 @@
 use std::mem;
 
 use derive_deref::Deref;
+use serde::Serialize;
 use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout};
 
-#[derive(Debug, Deref, Clone, PartialEq, Eq, Immutable, IntoBytes, KnownLayout, FromBytes)]
+#[derive(Debug, Deref, Clone, PartialEq, Eq, Immutable, IntoBytes, KnownLayout, FromBytes, Serialize)]
 pub struct Txid([u8; 32]);
 
 impl From<bitcoin::Txid> for Txid {
diff --git a/indexer/src/structs/txindex.rs b/indexer/src/structs/txindex.rs
index 479380958..82b466963 100644
--- a/indexer/src/structs/txindex.rs
+++ b/indexer/src/structs/txindex.rs
@@ -2,6 +2,7 @@ use std::ops::{Add, AddAssign, Sub};
 
 use derive_deref::{Deref, DerefMut};
 use fjall::Slice;
+use serde::Serialize;
 use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout};
 
 #[derive(
@@ -19,6 +20,7 @@ use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout};
     Immutable,
     IntoBytes,
     KnownLayout,
+    Serialize,
 )]
 pub struct Txindex(u32);
 
diff --git a/indexer/src/structs/txinindex.rs b/indexer/src/structs/txinindex.rs
index 78727456e..0089ea33e 100644
--- a/indexer/src/structs/txinindex.rs
+++ b/indexer/src/structs/txinindex.rs
@@ -1,6 +1,7 @@
 use std::ops::{Add, AddAssign, Sub};
 
 use derive_deref::{Deref, DerefMut};
+use serde::Serialize;
 use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout};
 
 use super::Vin;
@@ -20,6 +21,7 @@ use super::Vin;
     Immutable,
     IntoBytes,
     KnownLayout,
+    Serialize,
 )]
 pub struct Txinindex(u64);
 
diff --git a/indexer/src/structs/txoutindex.rs b/indexer/src/structs/txoutindex.rs
index fbc85dea2..72d4c0a37 100644
--- a/indexer/src/structs/txoutindex.rs
+++ b/indexer/src/structs/txoutindex.rs
@@ -1,6 +1,7 @@
 use std::ops::{Add, AddAssign, Sub};
 
 use derive_deref::{Deref, DerefMut};
+use serde::Serialize;
 use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout};
 
 use super::Vout;
@@ -20,6 +21,7 @@ use super::Vout;
     Immutable,
     IntoBytes,
     KnownLayout,
+    Serialize,
 )]
 pub struct Txoutindex(u64);
 
diff --git a/indexer/src/structs/txversion.rs b/indexer/src/structs/txversion.rs
index 345e5f0e8..c7ca53183 100644
--- a/indexer/src/structs/txversion.rs
+++ b/indexer/src/structs/txversion.rs
@@ -1,7 +1,8 @@
 use derive_deref::Deref;
+use serde::Serialize;
 use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout};
 
-#[derive(Debug, Deref, Clone, Copy, Immutable, IntoBytes, KnownLayout, FromBytes)]
+#[derive(Debug, Deref, Clone, Copy, Immutable, IntoBytes, KnownLayout, FromBytes, Serialize)]
 pub struct TxVersion(i32);
 
 impl From<bitcoin::transaction::Version> for TxVersion {
diff --git a/indexer/src/structs/weight.rs b/indexer/src/structs/weight.rs
index c930ee867..0b086e94d 100644
--- a/indexer/src/structs/weight.rs
+++ b/indexer/src/structs/weight.rs
@@ -1,7 +1,8 @@
 use derive_deref::Deref;
+use serde::Serialize;
 use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout};
 
-#[derive(Debug, Deref, Clone, Copy, Immutable, IntoBytes, KnownLayout, FromBytes)]
+#[derive(Debug, Deref, Clone, Copy, Immutable, IntoBytes, KnownLayout, FromBytes, Serialize)]
 pub struct Weight(u64);
 
 impl From<bitcoin::Weight> for Weight {
diff --git a/iterator/src/lib.rs b/iterator/src/lib.rs
index ebd20c97d..3cf4f4e11 100644
--- a/iterator/src/lib.rs
+++ b/iterator/src/lib.rs
@@ -32,7 +32,7 @@ use blk_metadata::*;
 use blk_metadata_and_block::*;
 use utils::*;
 
-pub const NUMBER_OF_UNSAFE_BLOCKS: usize = 100;
+pub const NUMBER_OF_UNSAFE_BLOCKS: usize = 1000;
 const MAGIC_BYTES: [u8; 4] = [249, 190, 180, 217];
 const BOUND_CAP: usize = 210;
 
@@ -171,10 +171,7 @@ pub fn new(
                     _ => unreachable!(),
                 };
 
-                if send_block
-                    .send(BlkMetadataAndBlock::new(blk_metadata, block))
-                    .is_err()
-                {
+                if send_block.send(BlkMetadataAndBlock::new(blk_metadata, block)).is_err() {
                     return ControlFlow::Break(());
                 }
 
@@ -242,16 +239,13 @@ pub fn new(
         let mut recent_chain: VecDeque<(BlockHash, BlkMetadataAndBlock)> = VecDeque::default();
         let mut recent_hashes: BTreeSet<BlockHash> = BTreeSet::default();
 
-        let mut prev_hash =
-            start_recap.map_or_else(BlockHash::all_zeros, |(_, recap)| *recap.prev_hash());
+        let mut prev_hash = start_recap.map_or_else(BlockHash::all_zeros, |(_, recap)| *recap.prev_hash());
 
         let mut prepare_and_send = |(hash, tuple): (BlockHash, BlkMetadataAndBlock)| {
             blk_index_to_blk_recap.update(&tuple, height);
 
             if start.map_or(true, |start| start <= height) {
-                send_height_block_hash
-                    .send((height, tuple.block, hash))
-                    .unwrap();
+                send_height_block_hash.send((height, tuple.block, hash)).unwrap();
             }
 
             if end == Some(height) {
@@ -294,8 +288,7 @@ pub fn new(
         let flow = recv_block.iter().try_for_each(|tuple| {
             // block isn't next after current tip
             if prev_hash != tuple.block.header.prev_blockhash {
-                let is_block_active =
-                    |hash| rpc.get_block_header_info(hash).unwrap().confirmations > 0;
+                let is_block_active = |hash| rpc.get_block_header_info(hash).unwrap().confirmations > 0;
 
                 // block prev has already been processed
                 if recent_hashes.contains(&tuple.block.header.prev_blockhash) {
@@ -322,9 +315,7 @@ pub fn new(
                         );
                     }
                 // Check if there was already a future block with the same prev hash
-                } else if let Some(prev_tuple) =
-                    future_blocks.insert(tuple.block.header.prev_blockhash, tuple)
-                {
+                } else if let Some(prev_tuple) = future_blocks.insert(tuple.block.header.prev_blockhash, tuple) {
                     // If the previous was the active one
                     if is_block_active(&prev_tuple.block.block_hash()) {
                         // Rollback the insert
diff --git a/logger/Cargo.toml b/logger/Cargo.toml
new file mode 100644
index 000000000..b0c1e7465
--- /dev/null
+++ b/logger/Cargo.toml
@@ -0,0 +1,10 @@
+[package]
+name = "logger"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+color-eyre = { workspace = true }
+env_logger = "0.11.6"
+jiff = { workspace = true }
+log = { version = "0.4.25" }
diff --git a/logger/src/lib.rs b/logger/src/lib.rs
new file mode 100644
index 000000000..b56cdb27e
--- /dev/null
+++ b/logger/src/lib.rs
@@ -0,0 +1,62 @@
+use std::{
+    fmt::Display,
+    fs::{self, OpenOptions},
+    io::Write,
+    path::Path,
+};
+
+use color_eyre::owo_colors::OwoColorize;
+use env_logger::{Builder, Env};
+use jiff::{tz, Timestamp};
+pub use log::{debug, error, info, trace, warn};
+
+#[inline(always)]
+pub fn init_log(path: Option<&Path>) {
+    let file = path.map(|path| {
+        let _ = fs::remove_file(path);
+        OpenOptions::new().create(true).append(true).open(path).unwrap()
+    });
+
+    Builder::from_env(Env::default().default_filter_or("info,fjall=off,lsm_tree=off"))
+        .format(move |buf, record| {
+            let date_time = Timestamp::now()
+                .to_zoned(tz::TimeZone::system())
+                .strftime("%Y-%m-%d %H:%M:%S")
+                .to_string();
+            let level = record.level().as_str().to_lowercase();
+            let level = format!("{:5}", level);
+            let target = record.target();
+            let dash = "-";
+            let args = record.args();
+
+            if let Some(file) = file.as_ref() {
+                let _ = write(file.try_clone().unwrap(), &date_time, target, &level, dash, args);
+            }
+
+            let colored_date_time = date_time.bright_black();
+            let colored_level = match level.chars().next().unwrap() {
+                'e' => level.red().to_string(),
+                'w' => level.yellow().to_string(),
+                'i' => level.green().to_string(),
+                'd' => level.blue().to_string(),
+                't' => level.cyan().to_string(),
+                _ => panic!(),
+            };
+            let colored_dash = dash.bright_black();
+
+            write(buf, colored_date_time, target, colored_level, colored_dash, args)
+        })
+        .init();
+}
+
+fn write(
+    mut buf: impl Write,
+    date_time: impl Display,
+    _target: impl Display,
+    level: impl Display,
+    dash: impl Display,
+    args: impl Display,
+) -> Result<(), std::io::Error> {
+    writeln!(buf, "{} {} {} {}", date_time, dash, level, args)
+    // writeln!(buf, "{} {} {} {}  {}", date_time, _target, level, dash, args)
+}
diff --git a/logger/src/main.rs b/logger/src/main.rs
new file mode 100644
index 000000000..f67ba6d6b
--- /dev/null
+++ b/logger/src/main.rs
@@ -0,0 +1,7 @@
+use log::info;
+use logger::init_log;
+
+fn main() {
+    init_log(None);
+    info!("test");
+}
diff --git a/server/src/api/mod.rs b/server/src/api/mod.rs
index 8cbd71a6f..725129fa3 100644
--- a/server/src/api/mod.rs
+++ b/server/src/api/mod.rs
@@ -71,6 +71,7 @@ fn req_to_response_res(
     AppState { vecs, .. }: AppState,
 ) -> color_eyre::Result<Response> {
     let format = Format::try_from(format).ok();
+
     let indexes = i
         .to_lowercase()
         .split(",")
@@ -78,13 +79,11 @@ fn req_to_response_res(
         .collect::<Vec<_>>();
 
     if indexes.len() > 1 {
-        return Err(eyre!("Multiple indexes aren't supported yet !"));
+        return Err(eyre!("Multiple indexes aren't supported"));
     } else if indexes.is_empty() {
-        return Err(eyre!("Bad index(es)"));
+        return Err(eyre!("Unknown index"));
     }
 
-    dbg!(format, &indexes, &v, from, to);
-
     let values = v
         .to_lowercase()
         .split(",")
diff --git a/src/structs/epoch.rs b/src/structs/epoch.rs
index ed7108a4c..0bc3aa303 100644
--- a/src/structs/epoch.rs
+++ b/src/structs/epoch.rs
@@ -9,7 +9,7 @@ impl Epoch {
 
 impl From<Height> for Epoch {
     fn from(height: Height) -> Self {
-        Self(((height.to_usize() / Self::BLOCKS_PER_EPOCH) + 1) as u16)
+        Self::from(&height)
     }
 }
 
diff --git a/storable_vec/src/enums/error.rs b/storable_vec/src/enums/error.rs
index 37908bbae..8db892c0d 100644
--- a/storable_vec/src/enums/error.rs
+++ b/storable_vec/src/enums/error.rs
@@ -21,6 +21,7 @@ pub enum Error {
     ExpectVecToHaveIndex,
     FailedKeyTryIntoUsize,
     UnsupportedUnflushedState,
+    RangeFromAfterTo,
 }
 
 impl From<io::Error> for Error {
@@ -60,6 +61,7 @@ impl fmt::Display for Error {
                 write!(f, "Unsupported unflush state, please flush before using this function")
             }
             Error::ZeroCopyError => write!(f, "Zero copy convert error"),
+            Error::RangeFromAfterTo => write!(f, "Range, from is after to"),
         }
     }
 }
diff --git a/storable_vec/src/lib.rs b/storable_vec/src/lib.rs
index 21d4ad3cd..98105b8f1 100644
--- a/storable_vec/src/lib.rs
+++ b/storable_vec/src/lib.rs
@@ -37,7 +37,7 @@ pub const SINGLE_THREAD: u8 = 1;
 /// Will spin up a new `File` for every read
 ///
 /// Used in `/server`
-pub const ASYNC_READ_ONLY: u8 = 2;
+pub const STATELESS: u8 = 2;
 
 ///
 /// A very small, fast, efficient and simple storable Vec
@@ -73,7 +73,7 @@ pub struct StorableVec<I, T, const MODE: u8> {
 /// In bytes
 const MAX_PAGE_SIZE: usize = 4 * 4096;
 const ONE_MB: usize = 1000 * 1024;
-const MAX_CACHE_SIZE: usize = 100 * ONE_MB;
+const MAX_CACHE_SIZE: usize = usize::MAX;
 // const MAX_CACHE_SIZE: usize = 100 * ONE_MB;
 
 impl<I, T, const MODE: u8> StorableVec<I, T, MODE>
@@ -157,6 +157,13 @@ where
             .open(path)
     }
 
+    fn open_file_at_then_read(&self, index: usize) -> Result<T> {
+        let mut file = self.open_file()?;
+        Self::seek(&mut file, Self::index_to_byte_index(index))?;
+        let mut buf = Self::create_buffer();
+        Self::read_exact(&mut file, &mut buf).map(|v| v.to_owned())
+    }
+
     fn read_disk_len(&self) -> io::Result<usize> {
         Self::read_disk_len_(&self.file)
     }
@@ -165,7 +172,6 @@ where
     }
 
     fn reset_disk_related_state(&mut self) -> io::Result<()> {
-        self.file = self.open_file()?;
         self.file_len = self.read_disk_len()?;
         self.file_position = 0;
         self.reset_cache()
@@ -193,13 +199,6 @@ where
         }
     }
 
-    fn open_file_at_then_read(&self, index: usize) -> Result<T> {
-        let mut file = self.open_file()?;
-        let mut buf = Self::create_buffer();
-        Self::seek(&mut file, Self::index_to_byte_index(index))?;
-        Self::read_exact(&mut file, &mut buf).map(|v| v.to_owned())
-    }
-
     #[inline]
     fn seek(file: &mut File, byte_index: u64) -> io::Result<u64> {
         file.seek(SeekFrom::Start(byte_index))
@@ -218,7 +217,7 @@ where
 
     #[inline]
     fn push_if_needed_(&mut self, index: I, value: T) -> Result<()> {
-        match self.pushed_len().cmp(&Self::i_to_usize(index)?) {
+        match self.len().cmp(&Self::i_to_usize(index)?) {
             Ordering::Greater => {
                 // dbg!(len, index, &self.pathbuf);
                 // panic!();
@@ -265,22 +264,19 @@ where
     }
 
     pub fn flush(&mut self) -> io::Result<()> {
-        self.reset_disk_related_state()?;
-
         if self.pushed.is_empty() {
             return Ok(());
         }
 
-        self.file_len += self.pushed.len();
-
-        let mut bytes: Vec<u8> = vec![];
-
+        let mut bytes: Vec<u8> = Vec::with_capacity(self.pushed_len() * Self::SIZE_OF_T);
         mem::take(&mut self.pushed)
             .into_iter()
             .for_each(|v| bytes.extend_from_slice(v.as_bytes()));
 
         self.file.write_all(&bytes)?;
 
+        self.reset_disk_related_state()?;
+
         Ok(())
     }
 
@@ -318,6 +314,10 @@ where
         }
     }
 
+    pub fn file_name(&self) -> String {
+        self.path().file_name().unwrap().to_str().unwrap().to_owned()
+    }
+
     #[inline]
     pub fn path(&self) -> &Path {
         &self.pathbuf
@@ -368,7 +368,7 @@ where
         let page_index = index / Self::PER_PAGE;
         let last_index = self.file_len - 1;
         let max_page_index = last_index / Self::PER_PAGE;
-        let min_page_index = (max_page_index + 1).checked_sub(self.cache.len()).unwrap_or_default();
+        let min_page_index = (max_page_index + 1) - self.cache.len();
 
         // let min_open_page = self.min.load(AtomicOrdering::SeqCst);
 
@@ -429,7 +429,6 @@ where
     fn get_(&mut self, index: usize) -> Result<&T> {
         let byte_index = Self::index_to_byte_index(index);
         if self.file_position != byte_index {
-            println!("seek");
             self.file_position = Self::seek(&mut self.file, byte_index)?;
         }
         let res = Self::read_exact(&mut self.file, &mut self.buf);
@@ -595,7 +594,6 @@ where
         &mut self,
         first_indexes: &mut StorableVec<I, T2, SINGLE_THREAD>,
         last_indexes: &mut StorableVec<I, T2, SINGLE_THREAD>,
-        callback: F,
     ) -> Result<()>
     where
         T: From<T2>,
@@ -612,20 +610,67 @@ where
     }
 }
 
-impl<I, T> StorableVec<I, T, ASYNC_READ_ONLY>
+impl<I, T> StorableVec<I, T, STATELESS>
 where
     I: StorableVecIndex,
     T: StorableVecType,
 {
     #[inline]
     pub fn get(&self, index: I) -> Result<Option<T>> {
-        self.get_(Self::i_to_usize(index)?)
+        Ok(Some(self.open_file_at_then_read(Self::i_to_usize(index)?)?))
     }
-    #[inline]
-    fn get_(&self, index: usize) -> Result<Option<T>> {
-        Ok(Some(self.open_file_at_then_read(index)?.to_owned()))
+
+    pub fn collect_range(&self, from: Option<i64>, to: Option<i64>) -> Result<Vec<T>> {
+        if !self.pushed.is_empty() {
+            return Err(Error::UnsupportedUnflushedState);
+        }
+
+        let mut file = self.open_file()?;
+
+        let len = Self::read_disk_len_(&file)?;
+
+        let from = from.map_or(0, |from| {
+            if from >= 0 {
+                from as usize
+            } else {
+                (len as i64 + from) as usize
+            }
+        });
+
+        let to = to.map_or(len, |to| {
+            if to >= 0 {
+                to as usize
+            } else {
+                (len as i64 + to) as usize
+            }
+        });
+
+        if from >= to {
+            return Err(Error::RangeFromAfterTo);
+        }
+
+        Self::seek(&mut file, Self::index_to_byte_index(from))?;
+
+        let mut buf = Self::create_buffer();
+
+        Ok((from..to)
+            .map(|_| Self::read_exact(&mut file, &mut buf).map(|v| v.to_owned()).unwrap())
+            .collect::<Vec<_>>())
     }
 
     // Add iter iter_from iter_range collect..
     // + add memory cap
 }
+
+impl<I, T> Clone for StorableVec<I, T, STATELESS>
+where
+    I: StorableVecIndex,
+    T: StorableVecType,
+{
+    fn clone(&self) -> Self {
+        let path = &self.pathbuf;
+        let path_version = Self::path_version_(path);
+        let version = Version::try_from(path_version.as_path()).unwrap();
+        Self::import(path, version).unwrap()
+    }
+}

From 385b8810682fe9e068f80df531ec0ed3b99fa23d Mon Sep 17 00:00:00 2001
From: nym21 <expat-epochs0i@icloud.com>
Date: Tue, 11 Feb 2025 23:38:01 +0100
Subject: [PATCH 43/63] server: added csv support to api

---
 server/Cargo.toml     |  2 +-
 server/src/api/mod.rs | 88 ++++++++++++++++++++++++++++++++++++-------
 2 files changed, 75 insertions(+), 15 deletions(-)

diff --git a/server/Cargo.toml b/server/Cargo.toml
index 4d209cafc..0fe82bc21 100644
--- a/server/Cargo.toml
+++ b/server/Cargo.toml
@@ -26,7 +26,7 @@ oxc = { version = "0.49.0", features = ["codegen", "minifier"] }
 regex = "1.11.1"
 reqwest = { version = "0.12.12", features = ["blocking", "json"] }
 serde = { workspace = true }
-serde_json = "1.0.138"
+serde_json = { version = "1.0.138", features = ["float_roundtrip"] }
 storable_vec = { workspace = true }
 struct_iterable = { workspace = true }
 tokio = { version = "1.43.0", features = ["full"] }
diff --git a/server/src/api/mod.rs b/server/src/api/mod.rs
index 725129fa3..44a709288 100644
--- a/server/src/api/mod.rs
+++ b/server/src/api/mod.rs
@@ -10,6 +10,7 @@ use axum::{
 use color_eyre::eyre::eyre;
 use reqwest::StatusCode;
 use serde::Deserialize;
+use serde_json::Value;
 use structs::{Format, Index};
 
 use crate::{log_result, traits::HeaderMapExtended};
@@ -84,23 +85,82 @@ fn req_to_response_res(
         return Err(eyre!("Unknown index"));
     }
 
-    let values = v
+    let ids = v
         .to_lowercase()
         .split(",")
-        .flat_map(|s| vecs.get(&s.replace("_", "-")))
-        .flat_map(|i_to_v| i_to_v.get(indexes.first().unwrap()))
-        .map(|vec| vec.collect_range(from, to).unwrap())
+        .map(|s| (s.to_owned(), vecs.get(&s.replace("_", "-"))))
+        .filter(|(_, opt)| opt.is_some())
+        .map(|(id, vec)| (id, vec.unwrap()))
         .collect::<Vec<_>>();
 
-    if values.len() == 1 {
-        let values = values.first().unwrap();
-        if values.len() == 1 {
-            let value = values.first().unwrap();
-            Ok(Json(value).into_response())
-        } else {
-            Ok(Json(values).into_response())
-        }
-    } else {
-        Ok(Json(values).into_response())
+    if ids.is_empty() {
+        return Ok(Json(()).into_response());
     }
+
+    let values = ids
+        .iter()
+        .flat_map(|(_, i_to_v)| i_to_v.get(indexes.first().unwrap()))
+        .map(|vec| -> storable_vec::Result<Vec<Value>> { vec.collect_range(from, to) })
+        .collect::<storable_vec::Result<Vec<_>>>()?;
+
+    if ids.is_empty() {
+        return Ok(Json(()).into_response());
+    }
+
+    let ids_last_i = ids.len() - 1;
+
+    let mut response = match format {
+        Some(Format::CSV) => {
+            let mut csv = ids.into_iter().map(|(id, _)| id).collect::<Vec<_>>().join(",");
+            csv.push('\n');
+
+            let values_len = values.first().unwrap().len();
+
+            (0..values_len).for_each(|i| {
+                let mut line = "".to_string();
+                values.iter().enumerate().for_each(|(id_i, v)| {
+                    line += &v.get(i).unwrap().to_string();
+                    if id_i == ids_last_i {
+                        line.push('\n');
+                    } else {
+                        line.push(',');
+                    }
+                });
+                csv += &line;
+            });
+
+            csv.into_response()
+        }
+        _ => {
+            if values.len() == 1 {
+                let values = values.first().unwrap();
+                if values.len() == 1 {
+                    let value = values.first().unwrap();
+                    Json(value).into_response()
+                } else {
+                    Json(values).into_response()
+                }
+            } else {
+                Json(values).into_response()
+            }
+        }
+    };
+
+    let headers = response.headers_mut();
+
+    headers.insert_cors();
+    // headers.insert_last_modified(date_modified);
+
+    match format {
+        Some(format) => {
+            headers.insert_content_disposition_attachment();
+            match format {
+                Format::CSV => headers.insert_content_type_text_csv(),
+                Format::JSON => headers.insert_content_type_application_json(),
+            }
+        }
+        _ => headers.insert_content_type_application_json(),
+    };
+
+    Ok(response)
 }

From eaf76e27f5d87130ee6dc4d8889baeba491002b1 Mon Sep 17 00:00:00 2001
From: nym21 <expat-epochs0i@icloud.com>
Date: Wed, 12 Feb 2025 00:06:46 +0100
Subject: [PATCH 44/63] struct_iterable: removed, seems not needed anymore

---
 CHANGELOG.md                                  |  13 ++-
 Cargo.lock                                    |  59 ++++------
 Cargo.toml                                    |   5 +-
 computer/src/structs/dateindex.rs             |   0
 pricer/Cargo.toml                             |   6 +
 pricer/src/lib.rs                             |  14 +++
 server/Cargo.toml                             |   1 -
 server/src/api/handlers/last_values.rs        |  13 ---
 server/src/api/structs/index.rs               |  24 ++--
 server/src/api/structs/range.rs               |  32 ------
 struct_iterable/Cargo.lock                    |  60 ----------
 struct_iterable/Cargo.toml                    |  26 -----
 struct_iterable/README.md                     | 105 ------------------
 struct_iterable/src/lib.rs                    |  91 ---------------
 .../struct_iterable_derive/Cargo.toml         |  15 ---
 .../struct_iterable_derive/README.md          |   7 --
 .../struct_iterable_derive/src/lib.rs         |  88 ---------------
 .../struct_iterable_internal/Cargo.toml       |  11 --
 .../struct_iterable_internal/README.md        |   7 --
 .../struct_iterable_internal/src/lib.rs       |  58 ----------
 20 files changed, 64 insertions(+), 571 deletions(-)
 create mode 100644 computer/src/structs/dateindex.rs
 create mode 100644 pricer/Cargo.toml
 create mode 100644 pricer/src/lib.rs
 delete mode 100644 server/src/api/handlers/last_values.rs
 delete mode 100644 server/src/api/structs/range.rs
 delete mode 100644 struct_iterable/Cargo.lock
 delete mode 100644 struct_iterable/Cargo.toml
 delete mode 100644 struct_iterable/README.md
 delete mode 100644 struct_iterable/src/lib.rs
 delete mode 100644 struct_iterable/struct_iterable_derive/Cargo.toml
 delete mode 100644 struct_iterable/struct_iterable_derive/README.md
 delete mode 100644 struct_iterable/struct_iterable_derive/src/lib.rs
 delete mode 100644 struct_iterable/struct_iterable_internal/Cargo.toml
 delete mode 100644 struct_iterable/struct_iterable_internal/README.md
 delete mode 100644 struct_iterable/struct_iterable_internal/src/lib.rs

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 501136c6b..1714fa916 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,18 +3,19 @@
 ![Image of the kibō Web App version 0.X.Y](https://github.com/kibo-money/kibo/blob/main/_assets/v0.X.Y.jpg)
 -->
 
-# v0.6.0 | WIP
+# v0.6.0 | WIP | A new beginning
 
 ## Global
 
+- Completely redesign the back-end
+
 - Merged parser and server crates into a single project (and thus executable), so now both will run at the same time with a single `cargo run -r` [#7392982](https://github.com/kibo-money/kibo/commit/7392982824c2db94bcd57251fd41986117c29a23)
 - Added `--no-server` and `--no-parser` to disable each if needed
 - Improved executable parameters
 - Started using `log` and `env_logger` crates instead of custom code [#7392982](https://github.com/kibo-money/kibo/commit/7392982824c2db94bcd57251fd41986117c29a23)
 - Improved logs
-- Automated databases defragmention (and removed parameter) to improve disk usage and parse speed [#7392982](https://github.com/kibo-money/kibo/commit/7392982824c2db94bcd57251fd41986117c29a23)
 - Fixed input being unfocused right after being focused in Brave browser [#9a9ae61](https://github.com/kibo-money/kibo/commit/9a9ae614d07b54c08b7e9c0e2aefe3b52fdb93c5)
-- Moved Sanakirja database wrapper to its own crate: `snkrj` [0f936dc](https://github.com/kibo-money/kibo/commit/0f936dcdfbecac0a228f023bd500d6e98f56446a)
+
 - Reworked server's API code [#6ab0f46]( https://github.com/kibo-money/kibo/commit/6ab0f463119a902a1b7ca9691b54f61543bb8f2f)
   - New route format: `/api/date-to-realized-price` is now `/api/realized-price?kind=date`
   - Added status and timing to logs
@@ -25,12 +26,16 @@
 - Created separate crate for indexing called `bindex`
 - Created a crate a storage engine specialized in storing datasets that have indexes as keys and thus can be represented by an array/vec called `storable-vec`
 - Removed the need for the `-txindex=1` parameter when starting your Bitcoin Core node as kibō has its own indexes now
-- `snkrj` added a robust auto defragmentation to improve disk usage without the need for user's intervention
 
 ## Git
 
 Added git tags for each version though Markdown won't display formatted on Github so left the default text
 
+## Deprecated
+
+Moved Sanakirja database wrapper to its own crate (`snkrj`) and added a robust auto defragmentation to improve disk usage without the need for user's intervention.
+Since it's not used anymore it will moved out of the repository relatively soon.
+
 # [v0.5.0](https://github.com/kibo-money/kibo/tree/eea56d394bf92c62c81da8b78b8c47ea730683f5) | [873199](https://mempool.space/block/0000000000000000000270925aa6a565be92e13164565a3f7994ca1966e48050) - 2024/12/04
 
 ![Image of the kibō Web App version 0.5.0](https://github.com/kibo-money/kibo/blob/main/_assets/v0.5.0.jpg)
diff --git a/Cargo.lock b/Cargo.lock
index 45be29409..3270679e2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -267,7 +267,6 @@ dependencies = [
  "serde",
  "serde_json",
  "storable_vec",
- "struct_iterable",
  "tokio",
  "tower-http",
  "zstd",
@@ -751,7 +750,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
 dependencies = [
  "libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -786,9 +785,9 @@ checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99"
 
 [[package]]
 name = "fjall"
-version = "2.6.2"
+version = "2.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ddab3925ea1ed59863d246305c7bc113dc2e12b691405d2d02e429cfa0c87a5"
+checksum = "c240d783ba894f1ce20a7337c4eabb7814920b4bfd1ae74da1b17af3c7dfc19a"
 dependencies = [
  "byteorder",
  "byteview",
@@ -808,7 +807,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c"
 dependencies = [
  "crc32fast",
- "miniz_oxide 0.8.3",
+ "miniz_oxide 0.8.4",
 ]
 
 [[package]]
@@ -1302,7 +1301,7 @@ dependencies = [
  "portable-atomic",
  "portable-atomic-util",
  "serde",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -1403,9 +1402,9 @@ dependencies = [
 
 [[package]]
 name = "lsm-tree"
-version = "2.6.2"
+version = "2.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2880324e429cd3285e56d0382c025b3d9336d672bbf344e3fde9783a5623f0f6"
+checksum = "43b7d9dc8488e02ab7be88626cdbd3a6ee4690d7ffa6a2ad460da9e52105e393"
 dependencies = [
  "byteorder",
  "crossbeam-skiplist",
@@ -1469,9 +1468,9 @@ dependencies = [
 
 [[package]]
 name = "miniz_oxide"
-version = "0.8.3"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8402cab7aefae129c6977bb0ff1b8fd9a04eb5b51efc50a70bea51cda0c7924"
+checksum = "b3b1c9bd4fe1f0f8b387f6eb9eb3b4a1aa26185e5750efb9140301703f62cd1b"
 dependencies = [
  "adler2",
 ]
@@ -1906,9 +1905,9 @@ dependencies = [
 
 [[package]]
 name = "oxc_sourcemap"
-version = "1.0.6"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48557f779d04c8bfa8a930db5a3c35c0a86ff4e6bf1552ce446b9596a6e77c42"
+checksum = "989c3fa8bdd55ced0ad4a0b2d587dfd11613364c9db417889bdb09c217463766"
 dependencies = [
  "base64-simd",
  "cfg-if",
@@ -2111,6 +2110,10 @@ dependencies = [
  "zerocopy 0.7.35",
 ]
 
+[[package]]
+name = "pricer"
+version = "0.1.0"
+
 [[package]]
 name = "proc-macro2"
 version = "1.0.93"
@@ -2334,14 +2337,14 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "rustls"
-version = "0.23.22"
+version = "0.23.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fb9263ab4eb695e42321db096e3b8fbd715a59b154d5c88d82db2175b681ba7"
+checksum = "47796c98c480fce5406ef69d1c76378375492c3b0a0de587be0c1d9feb12f395"
 dependencies = [
  "once_cell",
  "rustls-pki-types",
@@ -2633,26 +2636,6 @@ version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d08889ec5408683408db66ad89e0e1f93dff55c73a4ccc71c427d5b277ee47e6"
 
-[[package]]
-name = "struct_iterable"
-version = "0.1.2"
-dependencies = [
- "struct_iterable_derive",
- "struct_iterable_internal",
-]
-
-[[package]]
-name = "struct_iterable_derive"
-version = "0.1.0"
-dependencies = [
- "quote",
- "syn 2.0.98",
-]
-
-[[package]]
-name = "struct_iterable_internal"
-version = "0.1.1"
-
 [[package]]
 name = "subtle"
 version = "2.6.1"
@@ -2733,7 +2716,7 @@ dependencies = [
  "getrandom 0.3.1",
  "once_cell",
  "rustix",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -3017,9 +3000,9 @@ checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65"
 
 [[package]]
 name = "value-log"
-version = "1.5.2"
+version = "1.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5589fb4f51f528b0cca7fdd03ec63a67f447bdcd313b09cdf9d2fc519149c02a"
+checksum = "cdbb3c254a6def3cbc8afcb523b88c4a3b424297db8207aa66cde5fa84edddf6"
 dependencies = [
  "byteorder",
  "byteview",
diff --git a/Cargo.toml b/Cargo.toml
index 5c77d7399..a4a4a6eb3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -5,9 +5,9 @@ members = [
     "indexer",
     "iterator",
     "logger",
+    "pricer",
     "server",
     "storable_vec",
-    "struct_iterable",
 ]
 resolver = "2"
 
@@ -17,7 +17,7 @@ color-eyre = "0.6.3"
 computer = { path = "computer", package = "bomputer" }
 derive_deref = "1.1.1"
 exit = { path = "exit" }
-fjall = "2.6.2"
+fjall = "2.6.3"
 indexer = { path = "indexer", package = "bindex" }
 iterator = { path = "iterator", package = "biter" }
 jiff = "0.2.0"
@@ -27,5 +27,4 @@ rlimit = { version = "0.10.2" }
 serde = { version = "1.0.217", features = ["derive"] }
 server = { path = "server", package = "berver" }
 storable_vec = { path = "storable_vec" }
-struct_iterable = { path = "struct_iterable" }
 zerocopy = { version = "0.8.17", features = ["derive"] }
diff --git a/computer/src/structs/dateindex.rs b/computer/src/structs/dateindex.rs
new file mode 100644
index 000000000..e69de29bb
diff --git a/pricer/Cargo.toml b/pricer/Cargo.toml
new file mode 100644
index 000000000..c2ba1eb70
--- /dev/null
+++ b/pricer/Cargo.toml
@@ -0,0 +1,6 @@
+[package]
+name = "pricer"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
diff --git a/pricer/src/lib.rs b/pricer/src/lib.rs
new file mode 100644
index 000000000..b93cf3ffd
--- /dev/null
+++ b/pricer/src/lib.rs
@@ -0,0 +1,14 @@
+pub fn add(left: u64, right: u64) -> u64 {
+    left + right
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn it_works() {
+        let result = add(2, 2);
+        assert_eq!(result, 4);
+    }
+}
diff --git a/server/Cargo.toml b/server/Cargo.toml
index 0fe82bc21..e402111b2 100644
--- a/server/Cargo.toml
+++ b/server/Cargo.toml
@@ -28,7 +28,6 @@ reqwest = { version = "0.12.12", features = ["blocking", "json"] }
 serde = { workspace = true }
 serde_json = { version = "1.0.138", features = ["float_roundtrip"] }
 storable_vec = { workspace = true }
-struct_iterable = { workspace = true }
 tokio = { version = "1.43.0", features = ["full"] }
 tower-http = { version = "0.6.2", features = ["compression-full"] }
 zstd = "0.13.2"
diff --git a/server/src/api/handlers/last_values.rs b/server/src/api/handlers/last_values.rs
deleted file mode 100644
index 1ba426f0a..000000000
--- a/server/src/api/handlers/last_values.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-use axum::{
-    extract::State,
-    response::{IntoResponse, Response},
-};
-use serde_json::Value;
-
-use crate::{io::Json, server::AppState};
-
-pub async fn last_values_handler(State(app_state): State<AppState>) -> Response {
-    let values = Json::import::<Value>(&app_state.config.path_datasets_last_values()).unwrap();
-    let values = axum::Json(values);
-    values.into_response()
-}
diff --git a/server/src/api/structs/index.rs b/server/src/api/structs/index.rs
index 5de782cdf..a8025a659 100644
--- a/server/src/api/structs/index.rs
+++ b/server/src/api/structs/index.rs
@@ -1,6 +1,6 @@
 use std::fmt::{self, Debug};
 
-use computer::Date;
+use computer::Dateindex;
 use indexer::{
     Addressindex, Height, P2PK33index, P2PK65index, P2PKHindex, P2SHindex, P2TRindex, P2WPKHindex, P2WSHindex, Txindex,
     Txinindex, Txoutindex,
@@ -9,7 +9,7 @@ use indexer::{
 #[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
 pub enum Index {
     Addressindex,
-    Date,
+    DateIndex,
     Height,
     P2PK33index,
     P2PK65index,
@@ -27,19 +27,19 @@ impl TryFrom<&str> for Index {
     type Error = ();
     fn try_from(value: &str) -> Result<Self, Self::Error> {
         Ok(match value {
-            "addri" | "addressindex" => Self::Addressindex,
             "d" | "date" => Self::Date,
             "h" | "height" => Self::Height,
-            "p2pk33index" => Self::P2PK33index,
-            "p2pk65index" => Self::P2PK65index,
-            "p2pkhindex" => Self::P2PKHindex,
-            "p2shindex" => Self::P2SHindex,
-            "p2trindex" => Self::P2TRindex,
-            "p2wpkhindex" => Self::P2WPKHindex,
-            "p2wshindex" => Self::P2WSHindex,
             "txi" | "txindex" => Self::Txindex,
             "txini" | "txinindex" => Self::Txinindex,
             "txouti" | "txoutindex" => Self::Txoutindex,
+            "addri" | "addressindex" => Self::Addressindex,
+            "p2pk33i" | "p2pk33index" => Self::P2PK33index,
+            "p2pk65i" | "p2pk65index" => Self::P2PK65index,
+            "p2pkhi" | "p2pkhindex" => Self::P2PKHindex,
+            "p2shi" | "p2shindex" => Self::P2SHindex,
+            "p2tri" | "p2trindex" => Self::P2TRindex,
+            "p2wpkhi" | "p2wpkhindex" => Self::P2WPKHindex,
+            "p2wshi" | "p2wshindex" => Self::P2WSHindex,
             _ => return Err(()),
         })
     }
@@ -60,9 +60,9 @@ impl IndexTypeToIndexEnum for Addressindex {
         Index::Addressindex
     }
 }
-impl IndexTypeToIndexEnum for Date {
+impl IndexTypeToIndexEnum for Dateindex {
     fn to_enum() -> Index {
-        Index::Date
+        Index::DateIndex
     }
 }
 impl IndexTypeToIndexEnum for Height {
diff --git a/server/src/api/structs/range.rs b/server/src/api/structs/range.rs
deleted file mode 100644
index 84754a07e..000000000
--- a/server/src/api/structs/range.rs
+++ /dev/null
@@ -1,32 +0,0 @@
-use axum::extract::Query;
-use color_eyre::eyre::eyre;
-
-use crate::server::api::handlers::DatasetParams;
-
-pub enum DatasetRange {
-    All,
-    Chunk(DatasetRangeChunk),
-}
-
-impl TryFrom<&Query<DatasetParams>> for DatasetRange {
-    type Error = color_eyre::Report;
-
-    fn try_from(query: &Query<DatasetParams>) -> Result<Self, Self::Error> {
-        if let Some(chunk) = query.chunk {
-            if query.all.is_some() {
-                Err(eyre!("chunk and all are exclusive"))
-            } else {
-                Ok(Self::Chunk(DatasetRangeChunk::Chunk(chunk)))
-            }
-        } else if query.all.is_some() {
-            Ok(Self::All)
-        } else {
-            Ok(Self::Chunk(DatasetRangeChunk::Last))
-        }
-    }
-}
-
-pub enum DatasetRangeChunk {
-    Chunk(usize),
-    Last,
-}
diff --git a/struct_iterable/Cargo.lock b/struct_iterable/Cargo.lock
deleted file mode 100644
index 582ac585d..000000000
--- a/struct_iterable/Cargo.lock
+++ /dev/null
@@ -1,60 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 3
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.89"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e"
-dependencies = [
- "unicode-ident",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.37"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
-dependencies = [
- "proc-macro2",
-]
-
-[[package]]
-name = "struct_iterable"
-version = "0.1.2"
-dependencies = [
- "struct_iterable_derive",
- "struct_iterable_internal",
-]
-
-[[package]]
-name = "struct_iterable_derive"
-version = "0.1.0"
-dependencies = [
- "proc-macro2",
- "quote",
- "struct_iterable_internal",
- "syn",
-]
-
-[[package]]
-name = "struct_iterable_internal"
-version = "0.1.1"
-
-[[package]]
-name = "syn"
-version = "2.0.85"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5023162dfcd14ef8f32034d8bcd4cc5ddc61ef7a247c024a33e24e1f24d21b56"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "unicode-ident"
-version = "1.0.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
diff --git a/struct_iterable/Cargo.toml b/struct_iterable/Cargo.toml
deleted file mode 100644
index ba00c67ad..000000000
--- a/struct_iterable/Cargo.toml
+++ /dev/null
@@ -1,26 +0,0 @@
-[package]
-name = "struct_iterable"
-version = "0.1.2"
-authors = ["André de Moraes <deco.moraes@icloud.com>"]
-edition = "2021"
-description = "A Rust library providing a proc macro to make a struct iterable."
-license = "MIT"
-repository = "https://github.com/decomoraes/rust_struct_iterable"
-readme = "README.md"
-keywords = ["proc-macro", "struct", "iterable"]
-categories = ["development-tools::cargo-plugins"]
-homepage = "https://github.com/decomoraes/rust_struct_iterable"
-documentation = "https://docs.rs/struct_iterable"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-struct_iterable_derive = { path = "./struct_iterable_derive" }
-struct_iterable_internal = { path = "./struct_iterable_internal" }
-
-[lib]
-name = "struct_iterable"
-path = "src/lib.rs"
-
-[package.metadata.docs.rs]
-all-features = true
diff --git a/struct_iterable/README.md b/struct_iterable/README.md
deleted file mode 100644
index b7cecc86a..000000000
--- a/struct_iterable/README.md
+++ /dev/null
@@ -1,105 +0,0 @@
-# Struct Iterable
-
-`Struct Iterable` is a Rust library that provides a proc macro to make a struct iterable. This allows you to iterate over the fields of your struct in a generic way, with each iteration returning a tuple containing the name of the field as a static string and a reference to the field's value as a `dyn Any`.
-
-## How to Use
-
-First, add `Struct Iterable` to your `Cargo.toml`:
-
-```toml
-[dependencies]
-struct_iterable = "0.1.1"
-```
-
-Next, include the library at the top of your Rust file:
-
-```rust
-use struct_iterable::Iterable;
-```
-
-Finally, add the `#[derive(Iterable)]` attribute to your struct:
-
-```rust
-#[derive(Iterable)]
-struct MyStruct {
-    field1: u32,
-    field2: String,
-    // etc.
-}
-```
-
-Now, you can iterate over the fields of an instance of your struct:
-    
-```rust
-let my_instance = MyStruct {
-    field1: 42,
-    field2: "Hello, world!".to_string(),
-};
-
-for (field_name, field_value) in my_instance.iter() {
-    println!("{}: {:?}", field_name, field_value);
-}
-```
-
-## Limitations
-- Only structs with named fields are supported.
-- Only structs are supported, not enums or unions.
-
-## Implementation
-
-Here is the implementation of the proc macro:
-
-```rust
-extern crate proc_macro;
-
-use proc_macro::TokenStream;
-use quote::quote;
-use syn::{parse_macro_input, Data, DeriveInput, Fields};
-use iterable_structs::Iterable;
-
-#[proc_macro_derive(Iterable)]
-pub fn derive_iterable(input: TokenStream) -> TokenStream {
-    let input = parse_macro_input!(input as DeriveInput);
-
-    let struct_name = input.ident;
-    let fields = match input.data {
-        Data::Struct(data_struct) => match data_struct.fields {
-            Fields::Named(fields_named) => fields_named.named,
-            _ => panic!("Only structs with named fields are supported"),
-        },
-        _ => panic!("Only structs are supported"),
-    };
-
-    let fields_iter = fields.iter().map(|field| {
-        let field_ident = &field.ident;
-        let field_name = field_ident.as_ref().unwrap().to_string();
-        quote! {
-            (#field_name, &(self.#field_ident) as &dyn std::any::Any)
-        }
-    });
-
-    let expanded = quote! {
-        impl Iterable for #struct_name {
-            fn iter<'a>(&'a self) -> std::vec::IntoIter<(&'static str, &'a dyn std::any::Any)> {
-                vec![
-                    #(#fields_iter),*
-                ].into_iter()
-            }
-        }
-    };
-
-    TokenStream::from(expanded)
-}
-```
-
-The macro takes in the TokenStream of a struct and expands it into an implementation of the Iterable trait for that struct. This trait provides an iter method that returns an iterator over tuples of field names and values.
-
-## Contributing and License
-
-`Struct Iterable` is an open-source project, and contributions are warmly welcomed. Whether you're fixing bugs, improving the documentation, or proposing new features, your efforts are highly appreciated!
-
-If you're interested in contributing, please feel free to submit a pull request. For major changes, please open an issue first to discuss what you would like to change.
-
-Please note that this project is released with a Contributor Code of Conduct. By participating in this project, you agree to abide by its terms.
-
-`Struct Iterable` is distributed under the terms of the MIT license. As such, you're free to use, modify, distribute, and privately use it in any way you see fit, in accordance with the terms of the license.
diff --git a/struct_iterable/src/lib.rs b/struct_iterable/src/lib.rs
deleted file mode 100644
index c1fb55ed6..000000000
--- a/struct_iterable/src/lib.rs
+++ /dev/null
@@ -1,91 +0,0 @@
-/// The `Iterable` proc macro.
-///
-/// This macro provides a convenient way to make a struct iterable.
-/// The struct fields' names are returned as static strings and their values as `dyn Any`.
-/// This allows to iterate over the struct fields in a generic way.
-///
-/// Note that only structs with named fields are supported.
-///
-/// # Example
-///
-/// ```
-/// use struct_iterable::Iterable;
-///
-/// #[derive(Iterable)]
-/// struct MyStruct {
-///     field1: i32,
-///     field2: String,
-///     // etc.
-/// }
-///
-/// let my_instance = MyStruct {
-///     field1: 42,
-///     field2: "Hello, world!".to_string(),
-/// };
-///
-/// for (field_name, field_value) in my_instance.iter() {
-///     println!("{}: {:?}", field_name, field_value);
-/// }
-/// ```
-pub use struct_iterable_derive::Iterable;
-
-/// The `Iterable` trait.
-///
-/// This trait is implemented by the struct once the `Iterable` proc macro is derived.
-/// It provides an `iter` method that returns an iterator over tuples of field names and values.
-///
-/// # Example
-///
-/// ```
-/// use struct_iterable::Iterable;
-///
-/// #[derive(Iterable)]
-/// struct MyStruct {
-///     field1: i32,
-///     field2: String,
-///     // etc.
-/// }
-///
-/// let my_instance = MyStruct {
-///     field1: 42,
-///     field2: "Hello, world!".to_string(),
-/// };
-///
-/// for (field_name, field_value) in my_instance.iter() {
-///     println!("{}: {:?}", field_name, field_value);
-/// }
-/// ```
-pub use struct_iterable_internal::Iterable;
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[derive(Iterable)]
-    struct MyStruct {
-        field1: i32,
-        field2: String,
-        // etc.
-    }
-
-    #[test]
-    fn it_works() {
-        let mut my_instance = MyStruct {
-            field1: 42,
-            field2: "Hello, world!".to_string(),
-        };
-
-        for (field_name, field_value) in my_instance.iter() {
-            dbg!("{}: {:?}", field_name, field_value);
-        }
-
-        for (field_name, field_value) in my_instance.iter_mut() {
-            dbg!("{}: {:?}", field_name, &field_value);
-            if let Some(i32) = field_value.downcast_mut::<i32>() {
-                *i32 += 1;
-                dbg!(i32);
-            }
-            dbg!("{}: {:?}", field_name, &field_value);
-        }
-    }
-}
diff --git a/struct_iterable/struct_iterable_derive/Cargo.toml b/struct_iterable/struct_iterable_derive/Cargo.toml
deleted file mode 100644
index a48babad4..000000000
--- a/struct_iterable/struct_iterable_derive/Cargo.toml
+++ /dev/null
@@ -1,15 +0,0 @@
-[package]
-name = "struct_iterable_derive"
-version = "0.1.0"
-authors = ["André de Moraes <deco.moraes@icloud.com>"]
-edition = "2021"
-description = "An internal crate for struct_iterable"
-license = "MIT"
-
-[lib]
-proc-macro = true
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-syn = "2.0.98"
-quote = "1.0.38"
diff --git a/struct_iterable/struct_iterable_derive/README.md b/struct_iterable/struct_iterable_derive/README.md
deleted file mode 100644
index 5703ba278..000000000
--- a/struct_iterable/struct_iterable_derive/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Struct Iterable Derive
-
-This crate is a supporting library for the `struct_iterable` crate. It provides the proc macro `Iterable` which is used in conjunction with the `struct_iterable_internal` crate to provide an easy way to make a struct iterable in Rust.
-
-**Please note:** This crate is not intended to be used directly. If you want to make your structs iterable, please use the `struct_iterable` crate instead.
-
-Please visit the [`struct_iterable` crate on crates.io](https://crates.io/crates/struct_iterable) for more information and usage examples.
diff --git a/struct_iterable/struct_iterable_derive/src/lib.rs b/struct_iterable/struct_iterable_derive/src/lib.rs
deleted file mode 100644
index db2a7a01c..000000000
--- a/struct_iterable/struct_iterable_derive/src/lib.rs
+++ /dev/null
@@ -1,88 +0,0 @@
-extern crate proc_macro;
-
-use proc_macro::TokenStream;
-use quote::quote;
-use syn::{parse_macro_input, Data, DeriveInput, Fields};
-
-/// The `Iterable` proc macro.
-///
-/// Deriving this macro for your struct will make it "iterable". An iterable struct allows you to iterate over its fields, returning a tuple containing the field name as a static string and a reference to the field's value as `dyn Any`.
-///
-/// # Limitations
-///
-/// - Only structs are supported, not enums or unions.
-/// - Only structs with named fields are supported.
-///
-/// # Usage
-///
-/// Add the derive attribute (`#[derive(Iterable)]`) above your struct definition.
-///
-/// ```
-/// use struct_iterable::Iterable;
-///
-/// #[derive(Iterable)]
-/// struct MyStruct {
-///     field1: i32,
-///     field2: String,
-/// }
-/// ```
-///
-/// You can now call the `iter` method on instances of your struct to get an iterator over its fields:
-///
-/// ```
-/// let my_instance = MyStruct {
-///     field1: 42,
-///     field2: "Hello, world!".to_string(),
-/// };
-///
-/// for (field_name, field_value) in my_instance.iter() {
-///     println!("{}: {:?}", field_name, field_value);
-/// }
-/// ```
-#[proc_macro_derive(Iterable)]
-pub fn derive_iterable(input: TokenStream) -> TokenStream {
-    let input = parse_macro_input!(input as DeriveInput);
-
-    let struct_name = input.ident;
-    let fields = match input.data {
-        Data::Struct(data_struct) => match data_struct.fields {
-            Fields::Named(fields_named) => fields_named.named,
-            _ => panic!("Only structs with named fields are supported"),
-        },
-        _ => panic!("Only structs are supported"),
-    };
-
-    let fields_iter = fields.iter().map(|field| {
-        let field_ident = &field.ident;
-        let field_name = field_ident.as_ref().unwrap().to_string();
-        quote! {
-            (#field_name, &(self.#field_ident) as &dyn std::any::Any)
-        }
-    });
-
-    let fields_iter_mut = fields.iter().map(|field| {
-        let field_ident = &field.ident;
-        let field_name = field_ident.as_ref().unwrap().to_string();
-        quote! {
-            (#field_name, &mut (self.#field_ident) as &mut dyn std::any::Any)
-        }
-    });
-
-    let expanded = quote! {
-        impl Iterable for #struct_name {
-            fn iter<'a>(&'a self) -> std::vec::IntoIter<(&'static str, &'a dyn std::any::Any)> {
-                vec![
-                    #(#fields_iter),*
-                ].into_iter()
-            }
-
-            fn iter_mut<'a>(&'a mut self) -> std::vec::IntoIter<(&'static str, &'a mut dyn std::any::Any)> {
-                vec![
-                    #(#fields_iter_mut),*
-                ].into_iter()
-            }
-        }
-    };
-
-    TokenStream::from(expanded)
-}
diff --git a/struct_iterable/struct_iterable_internal/Cargo.toml b/struct_iterable/struct_iterable_internal/Cargo.toml
deleted file mode 100644
index cdf06702c..000000000
--- a/struct_iterable/struct_iterable_internal/Cargo.toml
+++ /dev/null
@@ -1,11 +0,0 @@
-[package]
-name = "struct_iterable_internal"
-version = "0.1.1"
-authors = ["André de Moraes <deco.moraes@icloud.com>"]
-edition = "2021"
-description = "An internal crate for struct_iterable"
-license = "MIT"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
diff --git a/struct_iterable/struct_iterable_internal/README.md b/struct_iterable/struct_iterable_internal/README.md
deleted file mode 100644
index 462811fe4..000000000
--- a/struct_iterable/struct_iterable_internal/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Struct Iterable Internal
-
-This crate is a supporting library for the `struct_iterable` crate. It provides the `Iterable` trait which is used in conjunction with the `struct_iterable_derive` crate to provide an easy way to make a struct iterable in Rust.
-
-**Please note:** This crate is not intended to be used directly. If you want to make your structs iterable, please use the `struct_iterable` crate instead.
-
-Please visit the [`struct_iterable` crate on crates.io](https://crates.io/crates/struct_iterable) for more information and usage examples.
diff --git a/struct_iterable/struct_iterable_internal/src/lib.rs b/struct_iterable/struct_iterable_internal/src/lib.rs
deleted file mode 100644
index 1b5c7bb1c..000000000
--- a/struct_iterable/struct_iterable_internal/src/lib.rs
+++ /dev/null
@@ -1,58 +0,0 @@
-/// The `Iterable` trait.
-///
-/// This trait is implemented for structs that derive the `Iterable` proc macro.
-/// It provides the `iter` method which returns an iterator over the struct's fields as tuples, containing the field name as a static string and a reference to the field's value as `dyn Any`.
-///
-/// You usually don't need to implement this trait manually, as it is automatically derived when using the `#[derive(Iterable)]` proc macro.
-///
-/// # Example
-///
-/// ```
-/// use struct_iterable::Iterable;
-///
-/// #[derive(Iterable)]
-/// struct MyStruct {
-///     field1: i32,
-///     field2: String,
-/// }
-///
-/// let my_instance = MyStruct {
-///     field1: 42,
-///     field2: "Hello, world!".to_string(),
-/// };
-///
-/// // Iterate over the fields of `my_instance`:
-/// for (field_name, field_value) in my_instance.iter() {
-///     println!("{}: {:?}", field_name, field_value);
-/// }
-/// ```
-pub trait Iterable {
-    /// Returns an iterator over the struct's fields as tuples.
-    ///
-    /// Each tuple contains a field's name as a static string and a reference to the field's value as `dyn Any`.
-    ///
-    /// # Example
-    ///
-    /// ```
-    /// use struct_iterable::Iterable;
-    ///
-    /// #[derive(Iterable)]
-    /// struct MyStruct {
-    ///     field1: i32,
-    ///     field2: String,
-    /// }
-    ///
-    /// let my_instance = MyStruct {
-    ///     field1: 42,
-    ///     field2: "Hello, world!".to_string(),
-    /// };
-    ///
-    /// // Iterate over the fields of `my_instance`:
-    /// for (field_name, field_value) in my_instance.iter() {
-    ///     println!("{}: {:?}", field_name, field_value);
-    /// }
-    /// ```
-    fn iter(&self) -> std::vec::IntoIter<(&'static str, &'_ dyn std::any::Any)>;
-
-    fn iter_mut(&mut self) -> std::vec::IntoIter<(&'static str, &'_ mut dyn std::any::Any)>;
-}

From 269c64e4ede8ff44d3640a5e3abe7cc394ba226d Mon Sep 17 00:00:00 2001
From: nym21 <expat-epochs0i@icloud.com>
Date: Wed, 12 Feb 2025 14:11:04 +0100
Subject: [PATCH 45/63] server: smart generic vec routes build

---
 Cargo.lock                                    |   2 +
 Cargo.toml                                    |   3 +-
 computer/src/lib.rs                           |   6 +-
 computer/src/storage/storable_vecs.rs         |  20 +++-
 computer/src/structs/date.rs                  | 106 ++++++++---------
 computer/src/structs/dateindex.rs             |  25 ++++
 computer/src/structs/mod.rs                   |   2 +
 indexer/src/storage/storable_vecs/base.rs     |  12 +-
 indexer/src/storage/storable_vecs/mod.rs      |  94 +++++++--------
 server/Cargo.toml                             |  13 +--
 server/src/api/mod.rs                         |   2 +-
 server/src/api/structs/index.rs               |  80 +------------
 server/src/api/structs/kind.rs                |  52 ---------
 server/src/lib.rs                             | 107 +++---------------
 storable_vec/Cargo.toml                       |   5 +
 storable_vec/src/lib.rs                       |  72 ++++++------
 storable_vec/src/traits/any.rs                |  47 +++++++-
 storable_vec/src/traits/mod.rs                |   8 +-
 .../src/traits/{index.rs => stored_index.rs}  |  10 +-
 storable_vec/src/traits/stored_type.rs        |  13 +++
 storable_vec/src/traits/type_.rs              |  10 --
 21 files changed, 278 insertions(+), 411 deletions(-)
 delete mode 100644 server/src/api/structs/kind.rs
 rename storable_vec/src/traits/{index.rs => stored_index.rs} (74%)
 create mode 100644 storable_vec/src/traits/stored_type.rs
 delete mode 100644 storable_vec/src/traits/type_.rs

diff --git a/Cargo.lock b/Cargo.lock
index 3270679e2..cf1bf751b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2627,6 +2627,8 @@ name = "storable_vec"
 version = "0.1.2"
 dependencies = [
  "memmap2",
+ "serde",
+ "serde_json",
  "zerocopy 0.8.17",
 ]
 
diff --git a/Cargo.toml b/Cargo.toml
index a4a4a6eb3..d7aee1aa7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -25,6 +25,7 @@ logger = { path = "logger" }
 rayon = "1.10.0"
 rlimit = { version = "0.10.2" }
 serde = { version = "1.0.217", features = ["derive"] }
+serde_json = { version = "1.0.138", features = ["float_roundtrip"] }
 server = { path = "server", package = "berver" }
-storable_vec = { path = "storable_vec" }
+storable_vec = { path = "storable_vec", features = ["json"] }
 zerocopy = { version = "0.8.17", features = ["derive"] }
diff --git a/computer/src/lib.rs b/computer/src/lib.rs
index 4cf2cb9ad..775ed732b 100644
--- a/computer/src/lib.rs
+++ b/computer/src/lib.rs
@@ -83,9 +83,11 @@ impl Computer<SINGLE_THREAD> {
 
         let date_count = self.vecs.height_to_date.len();
 
+        // self.vecs.height_to_dateindex.compute(...)
+
         self.vecs
-            .date_to_first_height
-            .compute_inverse_more_to_less(&mut self.vecs.height_to_date)?;
+            .dateindex_to_first_height
+            .compute_inverse_more_to_less(&mut self.vecs.height_to_dateindex)?;
 
         // ---
         // Date to X
diff --git a/computer/src/storage/storable_vecs.rs b/computer/src/storage/storable_vecs.rs
index c7835320d..39fe0207b 100644
--- a/computer/src/storage/storable_vecs.rs
+++ b/computer/src/storage/storable_vecs.rs
@@ -3,17 +3,21 @@ use std::{fs, path::Path};
 use indexer::{Addressindex, Amount, Height, Timestamp, Txindex, Txinindex, Txoutindex};
 use storable_vec::{StorableVec, Version};
 
-use crate::structs::{Date, Feerate};
+use crate::{
+    structs::{Date, Feerate},
+    Dateindex,
+};
 
 // mod base;
 
 // use base::*;
 
 pub struct StorableVecs<const MODE: u8> {
-    pub date_to_first_height: StorableVec<Date, Height, MODE>,
-    // pub date_to_last_height: StorableVec<Date, Height, MODE>,
+    pub dateindex_to_first_height: StorableVec<Dateindex, Height, MODE>,
+    // pub dateindex_to_last_height: StorableVec<Dateindex, Height, MODE>,
     // pub height_to_block_interval: StorableVec<Height, Timestamp, MODE>,
     pub height_to_date: StorableVec<Height, Date, MODE>,
+    pub height_to_dateindex: StorableVec<Height, Dateindex, MODE>,
     // pub height_to_fee: StorableVec<Txindex, Amount, MODE>,
     // pub height_to_inputcount: StorableVec<Height, u32, MODE>,
     // pub height_to_last_addressindex: StorableVec<Height, Addressindex, MODE>,
@@ -43,9 +47,13 @@ impl<const MODE: u8> StorableVecs<MODE> {
         fs::create_dir_all(path)?;
 
         Ok(Self {
-            date_to_first_height: StorableVec::forced_import(&path.join("date_to_first_height"), Version::from(1))?,
+            dateindex_to_first_height: StorableVec::forced_import(
+                &path.join("dateindex_to_first_height"),
+                Version::from(1),
+            )?,
             // height_to_block_interval: StorableVec::forced_import(&path.join("height_to_block_interval"), Version::from(1))?,
             height_to_date: StorableVec::forced_import(&path.join("height_to_date"), Version::from(1))?,
+            height_to_dateindex: StorableVec::forced_import(&path.join("height_to_dateindex"), Version::from(1))?,
             // height_to_fee: StorableVec::forced_import(&path.join("height_to_fee"), Version::from(1))?,
             // height_to_inputcount: StorableVec::forced_import(&path.join("height_to_inputcount"), Version::from(1))?,
             // height_to_last_addressindex: StorableVec::forced_import(
@@ -87,10 +95,10 @@ impl<const MODE: u8> StorableVecs<MODE> {
     }
 
     // pub fn as_slice(&self) -> [&dyn AnyComputedStorableVec; 1] {
-    //     [&self.date_to_first_height]
+    //     [&self.dateindex_to_first_height]
     // }
 
     // pub fn as_mut_slice(&mut self) -> [&mut dyn AnyComputedStorableVec; 1] {
-    //     [&mut self.date_to_first_height]
+    //     [&mut self.dateindex_to_first_height]
     // }
 }
diff --git a/computer/src/structs/date.rs b/computer/src/structs/date.rs
index 583389450..997559a0b 100644
--- a/computer/src/structs/date.rs
+++ b/computer/src/structs/date.rs
@@ -6,25 +6,25 @@ use jiff::{civil::Date as Date_, tz::TimeZone, Span};
 use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout};
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, FromBytes, Immutable, IntoBytes, KnownLayout)]
-pub struct Date {
-    year: u16,
-    month: u8,
-    day: u8,
-}
+pub struct Date(u32);
 
 impl Date {
-    const INDEX_ZERO: Self = Self {
-        year: 2009,
-        month: 1,
-        day: 3,
-    };
+    const INDEX_ZERO: Self = Self(20090103);
     const INDEX_ZERO_: Date_ = Date_::constant(2009, 1, 3);
-    const INDEX_ONE: Self = Self {
-        year: 2009,
-        month: 1,
-        day: 9,
-    };
+    const INDEX_ONE: Self = Self(20090109);
     const INDEX_ONE_: Date_ = Date_::constant(2009, 1, 9);
+
+    pub fn year(&self) -> u16 {
+        (self.0 / 1_00_00) as u16
+    }
+
+    pub fn month(&self) -> u8 {
+        ((self.0 % 1_00_00) / 1_00) as u8
+    }
+
+    pub fn day(&self) -> u8 {
+        (self.0 % 1_00) as u8
+    }
 }
 
 impl Default for Date {
@@ -33,31 +33,15 @@ impl Default for Date {
     }
 }
 
-impl PartialOrd for Date {
-    fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
-        Some(self.cmp(other))
-    }
-}
-
-impl Ord for Date {
-    fn cmp(&self, other: &Self) -> std::cmp::Ordering {
-        Date_::from(*self).cmp(&Date_::from(*other))
-    }
-}
-
 impl From<Date_> for Date {
     fn from(value: Date_) -> Self {
-        Self {
-            year: value.year() as u16,
-            month: value.month() as u8,
-            day: value.day() as u8,
-        }
+        Self(value.year() as u32 * 1_00_00 + value.month() as u32 * 1_00 + value.day() as u32)
     }
 }
 
 impl From<Date> for Date_ {
     fn from(value: Date) -> Self {
-        Self::new(value.year as i16, value.month as i8, value.day as i8).unwrap()
+        Self::new(value.year() as i16, value.month() as i8, value.day() as i8).unwrap()
     }
 }
 
@@ -67,33 +51,33 @@ impl From<Timestamp> for Date {
     }
 }
 
-impl TryFrom<Date> for usize {
-    type Error = color_eyre::Report;
-    fn try_from(value: Date) -> Result<Self, Self::Error> {
-        let value_ = Date_::from(value);
-        if value_ < Date::INDEX_ZERO_ {
-            Err(eyre!("Date is too early"))
-        } else if value == Date::INDEX_ZERO {
-            Ok(0)
-        } else if value_ < Date::INDEX_ONE_ {
-            Err(eyre!("Date is between first and second"))
-        } else if value == Date::INDEX_ONE {
-            Ok(1)
-        } else {
-            Ok(Date_::from(Date::INDEX_ONE).until(value_)?.get_days() as usize + 1)
-        }
-    }
-}
+// impl TryFrom<Date> for usize {
+//     type Error = color_eyre::Report;
+//     fn try_from(value: Date) -> Result<Self, Self::Error> {
+//         let value_ = Date_::from(value);
+//         if value_ < Date::INDEX_ZERO_ {
+//             Err(eyre!("Date is too early"))
+//         } else if value == Date::INDEX_ZERO {
+//             Ok(0)
+//         } else if value_ < Date::INDEX_ONE_ {
+//             Err(eyre!("Date is between first and second"))
+//         } else if value == Date::INDEX_ONE {
+//             Ok(1)
+//         } else {
+//             Ok(Date_::from(Date::INDEX_ONE).until(value_)?.get_days() as usize + 1)
+//         }
+//     }
+// }
 
-impl From<usize> for Date {
-    fn from(value: usize) -> Self {
-        Self::from(Self::INDEX_ZERO_.checked_add(Span::new().days(value as i64)).unwrap())
-    }
-}
+// impl From<usize> for Date {
+//     fn from(value: usize) -> Self {
+//         Self::from(Self::INDEX_ZERO_.checked_add(Span::new().days(value as i64)).unwrap())
+//     }
+// }
 
-impl Add<usize> for Date {
-    type Output = Self;
-    fn add(self, rhs: usize) -> Self::Output {
-        Self::from(Date_::from(self).checked_add(Span::new().days(rhs as i64)).unwrap())
-    }
-}
+// impl Add<usize> for Date {
+//     type Output = Self;
+//     fn add(self, rhs: usize) -> Self::Output {
+//         Self::from(Date_::from(self).checked_add(Span::new().days(rhs as i64)).unwrap())
+//     }
+// }
diff --git a/computer/src/structs/dateindex.rs b/computer/src/structs/dateindex.rs
index e69de29bb..64338bed9 100644
--- a/computer/src/structs/dateindex.rs
+++ b/computer/src/structs/dateindex.rs
@@ -0,0 +1,25 @@
+use std::ops::Add;
+
+use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout};
+
+#[derive(Debug, Default, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, FromBytes, Immutable, IntoBytes, KnownLayout)]
+pub struct Dateindex(u16);
+
+impl From<Dateindex> for usize {
+    fn from(value: Dateindex) -> Self {
+        value.0 as usize
+    }
+}
+
+impl From<usize> for Dateindex {
+    fn from(value: usize) -> Self {
+        Self(value as u16)
+    }
+}
+
+impl Add<usize> for Dateindex {
+    type Output = Self;
+    fn add(self, rhs: usize) -> Self::Output {
+        Self(self.0 + rhs as u16)
+    }
+}
diff --git a/computer/src/structs/mod.rs b/computer/src/structs/mod.rs
index b73b18519..60235dc16 100644
--- a/computer/src/structs/mod.rs
+++ b/computer/src/structs/mod.rs
@@ -1,9 +1,11 @@
 mod addressindextxoutindex;
 mod date;
+mod dateindex;
 mod feerate;
 mod unit;
 
 pub use addressindextxoutindex::*;
 pub use date::*;
+pub use dateindex::*;
 pub use feerate::*;
 pub use unit::*;
diff --git a/indexer/src/storage/storable_vecs/base.rs b/indexer/src/storage/storable_vecs/base.rs
index e165431ce..c05d21c5a 100644
--- a/indexer/src/storage/storable_vecs/base.rs
+++ b/indexer/src/storage/storable_vecs/base.rs
@@ -5,7 +5,7 @@ use std::{
     path::{Path, PathBuf},
 };
 
-use storable_vec::{StorableVecIndex, StorableVecType, Version};
+use storable_vec::{StoredIndex, StoredType, Version};
 
 use super::Height;
 
@@ -17,8 +17,8 @@ pub struct StorableVec<I, T, const MODE: u8> {
 
 impl<I, T, const MODE: u8> StorableVec<I, T, MODE>
 where
-    I: StorableVecIndex,
-    T: StorableVecType,
+    I: StoredIndex,
+    T: StoredType,
 {
     pub fn import(path: &Path, version: Version) -> storable_vec::Result<Self> {
         Ok(Self {
@@ -65,15 +65,15 @@ impl<I, T, const MODE: u8> DerefMut for StorableVec<I, T, MODE> {
     }
 }
 
-pub trait AnyStorableVec {
+pub trait AnyStorableVec: Send + Sync {
     fn height(&self) -> storable_vec::Result<Height>;
     fn flush(&mut self, height: Height) -> io::Result<()>;
 }
 
 impl<I, T, const MODE: u8> AnyStorableVec for StorableVec<I, T, MODE>
 where
-    I: StorableVecIndex,
-    T: StorableVecType,
+    I: StoredIndex,
+    T: StoredType,
 {
     fn height(&self) -> storable_vec::Result<Height> {
         self.height()
diff --git a/indexer/src/storage/storable_vecs/mod.rs b/indexer/src/storage/storable_vecs/mod.rs
index be26308d9..9abab5799 100644
--- a/indexer/src/storage/storable_vecs/mod.rs
+++ b/indexer/src/storage/storable_vecs/mod.rs
@@ -2,7 +2,7 @@ use std::{fs, io, path::Path};
 
 use exit::Exit;
 use rayon::prelude::*;
-use storable_vec::{Version, CACHED_GETS};
+use storable_vec::{AnyJsonStorableVec, Version, CACHED_GETS};
 
 use crate::structs::{
     Addressbytes, Addressindex, Addresstype, Addresstypeindex, Amount, BlockHash, Emptyindex, Height, LockTime,
@@ -296,67 +296,67 @@ impl<const MODE: u8> StorableVecs<MODE> {
     }
 
     pub fn flush(&mut self, height: Height) -> io::Result<()> {
-        self.as_mut_slice()
+        self.as_mut_any_vec_slice()
             .into_par_iter()
             .try_for_each(|vec| vec.flush(height))
     }
 
-    pub fn min_height(&self) -> color_eyre::Result<Option<Height>> {
+    pub fn min_height(&mut self) -> color_eyre::Result<Option<Height>> {
         Ok(self
-            .as_slice()
+            .as_mut_any_vec_slice()
             .into_iter()
             .map(|vec| vec.height().unwrap_or_default())
             .min())
     }
 
-    pub fn as_slice(&self) -> [&dyn AnyStorableVec; 40] {
+    pub fn as_any_json_vec_slice(&self) -> [&dyn AnyJsonStorableVec; 40] {
         [
-            &self.addressindex_to_addresstype as &dyn AnyStorableVec,
-            &self.addressindex_to_addresstypeindex,
-            &self.addressindex_to_height,
-            &self.height_to_blockhash,
-            &self.height_to_difficulty,
-            &self.height_to_first_addressindex,
-            &self.height_to_first_emptyindex,
-            &self.height_to_first_multisigindex,
-            &self.height_to_first_opreturnindex,
-            &self.height_to_first_pushonlyindex,
-            &self.height_to_first_txindex,
-            &self.height_to_first_txinindex,
-            &self.height_to_first_txoutindex,
-            &self.height_to_first_unknownindex,
-            &self.height_to_first_p2pk33index,
-            &self.height_to_first_p2pk65index,
-            &self.height_to_first_p2pkhindex,
-            &self.height_to_first_p2shindex,
-            &self.height_to_first_p2trindex,
-            &self.height_to_first_p2wpkhindex,
-            &self.height_to_first_p2wshindex,
-            &self.height_to_size,
-            &self.height_to_timestamp,
-            &self.height_to_weight,
-            &self.p2pk33index_to_p2pk33addressbytes,
-            &self.p2pk65index_to_p2pk65addressbytes,
-            &self.p2pkhindex_to_p2pkhaddressbytes,
-            &self.p2shindex_to_p2shaddressbytes,
-            &self.p2trindex_to_p2traddressbytes,
-            &self.p2wpkhindex_to_p2wpkhaddressbytes,
-            &self.p2wshindex_to_p2wshaddressbytes,
-            &self.txindex_to_first_txinindex,
-            &self.txindex_to_first_txoutindex,
-            &self.txindex_to_height,
-            &self.txindex_to_locktime,
-            &self.txindex_to_txid,
-            &self.txindex_to_txversion,
-            &self.txinindex_to_txoutindex,
-            &self.txoutindex_to_addressindex,
-            &self.txoutindex_to_amount,
+            &*self.addressindex_to_addresstype as &dyn AnyJsonStorableVec,
+            &*self.addressindex_to_addresstypeindex,
+            &*self.addressindex_to_height,
+            &*self.height_to_blockhash,
+            &*self.height_to_difficulty,
+            &*self.height_to_first_addressindex,
+            &*self.height_to_first_emptyindex,
+            &*self.height_to_first_multisigindex,
+            &*self.height_to_first_opreturnindex,
+            &*self.height_to_first_pushonlyindex,
+            &*self.height_to_first_txindex,
+            &*self.height_to_first_txinindex,
+            &*self.height_to_first_txoutindex,
+            &*self.height_to_first_unknownindex,
+            &*self.height_to_first_p2pk33index,
+            &*self.height_to_first_p2pk65index,
+            &*self.height_to_first_p2pkhindex,
+            &*self.height_to_first_p2shindex,
+            &*self.height_to_first_p2trindex,
+            &*self.height_to_first_p2wpkhindex,
+            &*self.height_to_first_p2wshindex,
+            &*self.height_to_size,
+            &*self.height_to_timestamp,
+            &*self.height_to_weight,
+            &*self.p2pk33index_to_p2pk33addressbytes,
+            &*self.p2pk65index_to_p2pk65addressbytes,
+            &*self.p2pkhindex_to_p2pkhaddressbytes,
+            &*self.p2shindex_to_p2shaddressbytes,
+            &*self.p2trindex_to_p2traddressbytes,
+            &*self.p2wpkhindex_to_p2wpkhaddressbytes,
+            &*self.p2wshindex_to_p2wshaddressbytes,
+            &*self.txindex_to_first_txinindex,
+            &*self.txindex_to_first_txoutindex,
+            &*self.txindex_to_height,
+            &*self.txindex_to_locktime,
+            &*self.txindex_to_txid,
+            &*self.txindex_to_txversion,
+            &*self.txinindex_to_txoutindex,
+            &*self.txoutindex_to_addressindex,
+            &*self.txoutindex_to_amount,
         ]
     }
 
-    pub fn as_mut_slice(&mut self) -> [&mut (dyn AnyStorableVec + Send + Sync); 40] {
+    pub fn as_mut_any_vec_slice(&mut self) -> [&mut dyn AnyStorableVec; 40] {
         [
-            &mut self.addressindex_to_addresstype as &mut (dyn AnyStorableVec + Send + Sync),
+            &mut self.addressindex_to_addresstype as &mut dyn AnyStorableVec,
             &mut self.addressindex_to_addresstypeindex,
             &mut self.addressindex_to_height,
             &mut self.height_to_blockhash,
diff --git a/server/Cargo.toml b/server/Cargo.toml
index e402111b2..4e858a313 100644
--- a/server/Cargo.toml
+++ b/server/Cargo.toml
@@ -4,17 +4,6 @@ version = "0.6.0"
 edition = "2021"
 
 [dependencies]
-# bitcoin_hashes = { version = "0.15.0" }
-# biter = { path = "./src/crates/biter" }
-# chrono = { version = "0.4.39", features = ["serde"] }
-# clap = { version = "4.5.26", features = ["derive"] }
-# ctrlc = { version = "3.4.5", features = ["termination"] }
-# inferno = "0.12.1"
-# itertools = "0.13.0"
-# ordered-float = "4.6.0"
-# rayon = "1.10.0"
-# rlimit = "0.10.2"
-# serde_json = "1.0.135"
 axum = "0.8.1"
 color-eyre = { workspace = true }
 computer = { workspace = true }
@@ -26,7 +15,7 @@ oxc = { version = "0.49.0", features = ["codegen", "minifier"] }
 regex = "1.11.1"
 reqwest = { version = "0.12.12", features = ["blocking", "json"] }
 serde = { workspace = true }
-serde_json = { version = "1.0.138", features = ["float_roundtrip"] }
+serde_json = { workspace = true }
 storable_vec = { workspace = true }
 tokio = { version = "1.43.0", features = ["full"] }
 tower-http = { version = "0.6.2", features = ["compression-full"] }
diff --git a/server/src/api/mod.rs b/server/src/api/mod.rs
index 44a709288..0d88c051f 100644
--- a/server/src/api/mod.rs
+++ b/server/src/api/mod.rs
@@ -100,7 +100,7 @@ fn req_to_response_res(
     let values = ids
         .iter()
         .flat_map(|(_, i_to_v)| i_to_v.get(indexes.first().unwrap()))
-        .map(|vec| -> storable_vec::Result<Vec<Value>> { vec.collect_range(from, to) })
+        .map(|vec| -> storable_vec::Result<Vec<Value>> { vec.collect_range_values(from, to) })
         .collect::<storable_vec::Result<Vec<_>>>()?;
 
     if ids.is_empty() {
diff --git a/server/src/api/structs/index.rs b/server/src/api/structs/index.rs
index a8025a659..69d0c7ac0 100644
--- a/server/src/api/structs/index.rs
+++ b/server/src/api/structs/index.rs
@@ -1,15 +1,9 @@
 use std::fmt::{self, Debug};
 
-use computer::Dateindex;
-use indexer::{
-    Addressindex, Height, P2PK33index, P2PK65index, P2PKHindex, P2SHindex, P2TRindex, P2WPKHindex, P2WSHindex, Txindex,
-    Txinindex, Txoutindex,
-};
-
 #[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
 pub enum Index {
     Addressindex,
-    DateIndex,
+    Dateindex,
     Height,
     P2PK33index,
     P2PK65index,
@@ -27,7 +21,7 @@ impl TryFrom<&str> for Index {
     type Error = ();
     fn try_from(value: &str) -> Result<Self, Self::Error> {
         Ok(match value {
-            "d" | "date" => Self::Date,
+            "d" | "date" | "dateindex" => Self::Dateindex,
             "h" | "height" => Self::Height,
             "txi" | "txindex" => Self::Txindex,
             "txini" | "txinindex" => Self::Txinindex,
@@ -50,73 +44,3 @@ impl fmt::Display for Index {
         Debug::fmt(self, f)
     }
 }
-
-pub trait IndexTypeToIndexEnum {
-    fn to_enum() -> Index;
-}
-
-impl IndexTypeToIndexEnum for Addressindex {
-    fn to_enum() -> Index {
-        Index::Addressindex
-    }
-}
-impl IndexTypeToIndexEnum for Dateindex {
-    fn to_enum() -> Index {
-        Index::DateIndex
-    }
-}
-impl IndexTypeToIndexEnum for Height {
-    fn to_enum() -> Index {
-        Index::Height
-    }
-}
-impl IndexTypeToIndexEnum for Txindex {
-    fn to_enum() -> Index {
-        Index::Txindex
-    }
-}
-impl IndexTypeToIndexEnum for Txinindex {
-    fn to_enum() -> Index {
-        Index::Txinindex
-    }
-}
-impl IndexTypeToIndexEnum for Txoutindex {
-    fn to_enum() -> Index {
-        Index::Txoutindex
-    }
-}
-impl IndexTypeToIndexEnum for P2PK33index {
-    fn to_enum() -> Index {
-        Index::P2PK33index
-    }
-}
-impl IndexTypeToIndexEnum for P2PK65index {
-    fn to_enum() -> Index {
-        Index::P2PK65index
-    }
-}
-impl IndexTypeToIndexEnum for P2PKHindex {
-    fn to_enum() -> Index {
-        Index::P2PKHindex
-    }
-}
-impl IndexTypeToIndexEnum for P2SHindex {
-    fn to_enum() -> Index {
-        Index::P2SHindex
-    }
-}
-impl IndexTypeToIndexEnum for P2TRindex {
-    fn to_enum() -> Index {
-        Index::P2TRindex
-    }
-}
-impl IndexTypeToIndexEnum for P2WPKHindex {
-    fn to_enum() -> Index {
-        Index::P2WPKHindex
-    }
-}
-impl IndexTypeToIndexEnum for P2WSHindex {
-    fn to_enum() -> Index {
-        Index::P2WSHindex
-    }
-}
diff --git a/server/src/api/structs/kind.rs b/server/src/api/structs/kind.rs
deleted file mode 100644
index 31e6a852a..000000000
--- a/server/src/api/structs/kind.rs
+++ /dev/null
@@ -1,52 +0,0 @@
-use std::collections::BTreeSet;
-
-use color_eyre::eyre::{eyre, ContextCompat};
-use serde::Deserialize;
-
-use crate::structs::{AnyMap, Date, Height, MapKey};
-
-#[derive(Debug, Clone, Copy, Deserialize, PartialEq, Eq, PartialOrd, Ord)]
-pub enum Kind {
-    Date,
-    Height,
-    // Timestamp,
-    // Last,
-}
-
-impl TryFrom<&String> for Kind {
-    type Error = color_eyre::Report;
-
-    fn try_from(str: &String) -> Result<Self, Self::Error> {
-        Ok(
-            match str
-                .to_lowercase()
-                .chars()
-                .next()
-                .context("Expect kind to have first letter")?
-            {
-                'd' => Self::Date,
-                'h' => Self::Height,
-                // 't' => Self::Timestamp,
-                // 'l' => Self::Last,
-                _ => return Err(eyre!("Bad kind")),
-            },
-        )
-    }
-}
-
-impl From<&(dyn AnyMap + Send + Sync)> for BTreeSet<Kind> {
-    fn from(map: &(dyn AnyMap + Send + Sync)) -> Self {
-        let mut s = Self::new();
-        if map.key_name() == Date::map_name() {
-            s.insert(Kind::Date);
-        }
-        if map.key_name() == Height::map_name() {
-            s.insert(Kind::Height);
-            s.insert(Kind::Timestamp);
-        }
-        if map.last_value().is_some() {
-            s.insert(Kind::Last);
-        }
-        s
-    }
-}
diff --git a/server/src/lib.rs b/server/src/lib.rs
index bf1271520..631e14e2a 100644
--- a/server/src/lib.rs
+++ b/server/src/lib.rs
@@ -1,19 +1,15 @@
 use std::{collections::BTreeMap, time::Instant};
 
-use api::{
-    structs::{Index, IndexTypeToIndexEnum},
-    ApiRoutes,
-};
-use axum::{body::Body, response::IntoResponse, routing::get, serve, Router};
+use api::{structs::Index, ApiRoutes};
+use axum::{routing::get, serve, Router};
 use color_eyre::owo_colors::OwoColorize;
 use computer::Computer;
 use derive_deref::{Deref, DerefMut};
 use indexer::Indexer;
 use logger::{error, info};
+use oxc::syntax::identifier::LF;
 use reqwest::StatusCode;
-use serde::Serialize;
-use serde_json::Value;
-use storable_vec::{StorableVecIndex, StorableVecType, STATELESS};
+use storable_vec::{AnyJsonStorableVec, STATELESS};
 use tokio::net::TcpListener;
 use tower_http::compression::CompressionLayer;
 use website::WebsiteRoutes;
@@ -33,17 +29,18 @@ pub struct AppState {
 pub struct VecIdToIndexToVec(BTreeMap<String, IndexToVec>);
 
 impl VecIdToIndexToVec {
-    pub fn insert<I, T>(&mut self, vec: &'static storable_vec::StorableVec<I, T, STATELESS>)
-    where
-        I: StorableVecIndex + IndexTypeToIndexEnum + Send + Sync,
-        T: StorableVecType + Send + Sync + Serialize,
-    {
+    pub fn insert(&mut self, vec: &'static dyn AnyJsonStorableVec) {
         let file_name = vec.file_name();
         let split = file_name.split("_to_").collect::<Vec<_>>();
         if split.len() != 2 {
             panic!();
         }
-        let index = vec.key_to_enum();
+        let str = vec.index_type_to_string().split("::").last().unwrap().to_lowercase();
+        let index = Index::try_from(str.as_str())
+            .inspect_err(|_| {
+                dbg!(str);
+            })
+            .unwrap();
         if split[0] != index.to_string().to_lowercase() {
             dbg!(split[0], index.to_string());
             panic!();
@@ -58,80 +55,7 @@ impl VecIdToIndexToVec {
 
 #[derive(Default, Deref, DerefMut)]
 pub struct IndexToVec {
-    pub index_to_vec: BTreeMap<Index, &'static (dyn AnyStatelessStorableVec + Send + Sync)>,
-}
-
-pub trait AnyStatelessStorableVec {
-    fn key_to_enum(&self) -> Index;
-    fn collect_range(&self, from: Option<i64>, to: Option<i64>) -> storable_vec::Result<Vec<Value>>;
-    // fn collect_range(&self, from: Option<i64>, to: Option<i64>) -> storable_vec::Result<Vec<T>>;
-}
-
-impl<I, T> AnyStatelessStorableVec for storable_vec::StorableVec<I, T, STATELESS>
-where
-    I: StorableVecIndex + IndexTypeToIndexEnum + Send + Sync,
-    T: StorableVecType + Send + Sync + Serialize,
-{
-    fn key_to_enum(&self) -> Index {
-        I::to_enum()
-    }
-
-    fn collect_range(&self, from: Option<i64>, to: Option<i64>) -> storable_vec::Result<Vec<Value>> {
-        Ok(self
-            .collect_range(from, to)?
-            .into_iter()
-            .map(|v| serde_json::to_value(v).unwrap())
-            .collect::<Vec<_>>())
-    }
-}
-
-trait StatelessVecs {
-    fn parse(&'static self, vecs: &mut VecIdToIndexToVec);
-}
-
-impl StatelessVecs for Indexer<STATELESS> {
-    fn parse(&'static self, vecs: &mut VecIdToIndexToVec) {
-        vecs.insert(&self.vecs.addressindex_to_addresstype);
-        vecs.insert(&self.vecs.addressindex_to_addresstypeindex);
-        vecs.insert(&self.vecs.addressindex_to_height);
-        vecs.insert(&self.vecs.height_to_blockhash);
-        vecs.insert(&self.vecs.height_to_difficulty);
-        vecs.insert(&self.vecs.height_to_first_addressindex);
-        vecs.insert(&self.vecs.height_to_first_emptyindex);
-        vecs.insert(&self.vecs.height_to_first_multisigindex);
-        vecs.insert(&self.vecs.height_to_first_opreturnindex);
-        vecs.insert(&self.vecs.height_to_first_pushonlyindex);
-        vecs.insert(&self.vecs.height_to_first_txindex);
-        vecs.insert(&self.vecs.height_to_first_txinindex);
-        vecs.insert(&self.vecs.height_to_first_txoutindex);
-        vecs.insert(&self.vecs.height_to_first_unknownindex);
-        vecs.insert(&self.vecs.height_to_first_p2pk33index);
-        vecs.insert(&self.vecs.height_to_first_p2pk65index);
-        vecs.insert(&self.vecs.height_to_first_p2pkhindex);
-        vecs.insert(&self.vecs.height_to_first_p2shindex);
-        vecs.insert(&self.vecs.height_to_first_p2trindex);
-        vecs.insert(&self.vecs.height_to_first_p2wpkhindex);
-        vecs.insert(&self.vecs.height_to_first_p2wshindex);
-        vecs.insert(&self.vecs.height_to_size);
-        vecs.insert(&self.vecs.height_to_timestamp);
-        vecs.insert(&self.vecs.height_to_weight);
-        vecs.insert(&self.vecs.p2pk33index_to_p2pk33addressbytes);
-        vecs.insert(&self.vecs.p2pk65index_to_p2pk65addressbytes);
-        vecs.insert(&self.vecs.p2pkhindex_to_p2pkhaddressbytes);
-        vecs.insert(&self.vecs.p2shindex_to_p2shaddressbytes);
-        vecs.insert(&self.vecs.p2trindex_to_p2traddressbytes);
-        vecs.insert(&self.vecs.p2wpkhindex_to_p2wpkhaddressbytes);
-        vecs.insert(&self.vecs.p2wshindex_to_p2wshaddressbytes);
-        vecs.insert(&self.vecs.txindex_to_first_txinindex);
-        vecs.insert(&self.vecs.txindex_to_first_txoutindex);
-        vecs.insert(&self.vecs.txindex_to_height);
-        vecs.insert(&self.vecs.txindex_to_locktime);
-        vecs.insert(&self.vecs.txindex_to_txid);
-        vecs.insert(&self.vecs.txindex_to_txversion);
-        vecs.insert(&self.vecs.txinindex_to_txoutindex);
-        vecs.insert(&self.vecs.txoutindex_to_addressindex);
-        vecs.insert(&self.vecs.txoutindex_to_amount);
-    }
+    pub index_to_vec: BTreeMap<Index, &'static dyn AnyJsonStorableVec>,
 }
 
 pub async fn main(indexer: Indexer<STATELESS>, computer: Computer<STATELESS>) -> color_eyre::Result<()> {
@@ -141,7 +65,12 @@ pub async fn main(indexer: Indexer<STATELESS>, computer: Computer<STATELESS>) ->
     let indexer = Box::leak(Box::new(indexer));
     let computer = Box::leak(Box::new(computer));
     let vecs = Box::leak(Box::new(VecIdToIndexToVec::default()));
-    indexer.parse(vecs);
+
+    indexer
+        .vecs
+        .as_any_json_vec_slice()
+        .into_iter()
+        .for_each(|vec| vecs.insert(vec));
 
     let state = AppState {
         vecs,
diff --git a/storable_vec/Cargo.toml b/storable_vec/Cargo.toml
index 5604fb80b..dc4fd3c8f 100644
--- a/storable_vec/Cargo.toml
+++ b/storable_vec/Cargo.toml
@@ -7,6 +7,11 @@ keywords = ["vec", "disk", "data"]
 categories = ["database"]
 edition = "2021"
 
+[features]
+json = ["dep:serde", "dep:serde_json"]
+
 [dependencies]
 memmap2 = "0.9.5"
 zerocopy = { workspace = true }
+serde = { workspace = true, optional = true }
+serde_json = { workspace = true, optional = true }
diff --git a/storable_vec/src/lib.rs b/storable_vec/src/lib.rs
index 98105b8f1..020873551 100644
--- a/storable_vec/src/lib.rs
+++ b/storable_vec/src/lib.rs
@@ -56,7 +56,6 @@ pub struct StorableVec<I, T, const MODE: u8> {
     file: File,
     /// **Number of values NOT number of bytes**
     file_len: usize,
-    /// Only for SINGLE_THREAD
     file_position: u64,
     buf: Buffer,
     /// Only for CACHED_GETS
@@ -78,8 +77,8 @@ const MAX_CACHE_SIZE: usize = usize::MAX;
 
 impl<I, T, const MODE: u8> StorableVec<I, T, MODE>
 where
-    I: StorableVecIndex,
-    T: StorableVecType,
+    I: StoredIndex,
+    T: StoredType,
 {
     pub const SIZE_OF_T: usize = size_of::<T>();
     pub const PER_PAGE: usize = MAX_PAGE_SIZE / Self::SIZE_OF_T;
@@ -102,20 +101,23 @@ where
     pub fn import(path: &Path, version: Version) -> Result<Self> {
         fs::create_dir_all(path)?;
 
-        let path_version = Self::path_version_(path);
+        if MODE != STATELESS {
+            let path_version = Self::path_version_(path);
 
-        if let Ok(prev_version) = Version::try_from(path_version.as_path()) {
-            if prev_version != version {
-                if prev_version.swap_bytes() == version {
-                    return Err(Error::WrongEndian);
+            if let Ok(prev_version) = Version::try_from(path_version.as_path()) {
+                if prev_version != version {
+                    if prev_version.swap_bytes() == version {
+                        return Err(Error::WrongEndian);
+                    }
+                    return Err(Error::DifferentVersion {
+                        found: prev_version,
+                        expected: version,
+                    });
                 }
-                return Err(Error::DifferentVersion {
-                    found: prev_version,
-                    expected: version,
-                });
             }
+
+            version.write(&path_version)?;
         }
-        version.write(&path_version)?;
 
         let file = Self::open_file_(&Self::path_vec_(path))?;
 
@@ -336,12 +338,16 @@ where
     fn path_version_(path: &Path) -> PathBuf {
         path.join("version")
     }
+
+    pub fn index_type_to_string(&self) -> &str {
+        std::any::type_name::<I>()
+    }
 }
 
 impl<I, T> StorableVec<I, T, CACHED_GETS>
 where
-    I: StorableVecIndex,
-    T: StorableVecType,
+    I: StoredIndex,
+    T: StoredType,
 {
     #[inline]
     pub fn get(&self, index: I) -> Result<Option<Value<'_, T>>> {
@@ -420,8 +426,8 @@ where
 const FLUSH_EVERY: usize = 10_000;
 impl<I, T> StorableVec<I, T, SINGLE_THREAD>
 where
-    I: StorableVecIndex,
-    T: StorableVecType,
+    I: StoredIndex,
+    T: StoredType,
 {
     pub fn get(&mut self, index: I) -> Result<&T> {
         self.get_(Self::i_to_usize(index)?)
@@ -499,7 +505,7 @@ where
 
     pub fn compute_transform<A, F>(&mut self, other: &mut StorableVec<I, A, SINGLE_THREAD>, t: F) -> Result<()>
     where
-        A: StorableVecType,
+        A: StoredType,
         F: Fn(&A) -> T,
     {
         other.iter_from(I::from(self.len()), |(i, a)| self.push_if_needed(i, t(a)))?;
@@ -508,8 +514,8 @@ where
 
     pub fn compute_inverse_more_to_less(&mut self, other: &mut StorableVec<T, I, SINGLE_THREAD>) -> Result<()>
     where
-        I: StorableVecType,
-        T: StorableVecIndex,
+        I: StoredType,
+        T: StoredIndex,
     {
         let index = self.last()?.cloned().unwrap_or_default();
         other.iter_from(index, |(v, i)| self.push_if_needed(*i, v))?;
@@ -522,8 +528,8 @@ where
         last_indexes: &mut StorableVec<T, I, SINGLE_THREAD>,
     ) -> Result<()>
     where
-        I: StorableVecType,
-        T: StorableVecIndex,
+        I: StoredType,
+        T: StoredIndex,
     {
         first_indexes.iter_from(T::from(self.len()), |(value, first_index)| {
             let first_index = Self::i_to_usize(*first_index)?;
@@ -539,7 +545,7 @@ where
         final_len: usize,
     ) -> Result<()>
     where
-        T: Copy + From<usize> + Sub<T, Output = T> + StorableVecIndex,
+        T: Copy + From<usize> + Sub<T, Output = T> + StoredIndex,
     {
         let one = T::from(1);
         let mut prev_index: Option<I> = None;
@@ -563,8 +569,8 @@ where
     ) -> Result<()>
     where
         T: From<T2>,
-        T2: StorableVecType + Copy + Add<usize, Output = T2> + Sub<T2, Output = T2> + TryInto<T>,
-        <T2 as TryInto<T>>::Error: error::Error + Send + Sync + 'static,
+        T2: StoredType + Copy + Add<usize, Output = T2> + Sub<T2, Output = T2> + TryInto<T>,
+        <T2 as TryInto<T>>::Error: error::Error + 'static,
     {
         first_indexes.iter_from(I::from(self.len()), |(i, first_index)| {
             let last_index = last_indexes.get(i)?;
@@ -580,9 +586,9 @@ where
         other_to_self: &mut StorableVec<A, I, SINGLE_THREAD>,
     ) -> Result<()>
     where
-        I: StorableVecType,
+        I: StoredType,
         T: From<bool>,
-        A: StorableVecIndex + StorableVecType,
+        A: StoredIndex + StoredType,
     {
         self_to_other.iter_from(I::from(self.len()), |(i, other)| {
             self.push_if_needed(i, T::from(other_to_self.get(*other)? == &i))
@@ -597,8 +603,8 @@ where
     ) -> Result<()>
     where
         T: From<T2>,
-        T2: StorableVecType + Copy + Add<usize, Output = T2> + Sub<T2, Output = T2> + TryInto<T>,
-        <T2 as TryInto<T>>::Error: error::Error + Send + Sync + 'static,
+        T2: StoredType + Copy + Add<usize, Output = T2> + Sub<T2, Output = T2> + TryInto<T>,
+        <T2 as TryInto<T>>::Error: error::Error + 'static,
         F: Fn(&T2) -> T,
     {
         first_indexes.iter_from(I::from(self.len()), |(i, first_index)| {
@@ -612,8 +618,8 @@ where
 
 impl<I, T> StorableVec<I, T, STATELESS>
 where
-    I: StorableVecIndex,
-    T: StorableVecType,
+    I: StoredIndex,
+    T: StoredType,
 {
     #[inline]
     pub fn get(&self, index: I) -> Result<Option<T>> {
@@ -664,8 +670,8 @@ where
 
 impl<I, T> Clone for StorableVec<I, T, STATELESS>
 where
-    I: StorableVecIndex,
-    T: StorableVecType,
+    I: StoredIndex,
+    T: StoredType,
 {
     fn clone(&self) -> Self {
         let path = &self.pathbuf;
diff --git a/storable_vec/src/traits/any.rs b/storable_vec/src/traits/any.rs
index 8dcf72a82..5a9e21697 100644
--- a/storable_vec/src/traits/any.rs
+++ b/storable_vec/src/traits/any.rs
@@ -1,10 +1,12 @@
-use std::io;
+use std::{io, mem};
 
-use crate::StorableVec;
+use crate::{Result, StorableVec, STATELESS};
 
-use super::{StorableVecIndex, StorableVecType};
+use super::{StoredIndex, StoredType};
 
-pub trait AnyStorableVec {
+pub trait AnyStorableVec: Send + Sync {
+    fn file_name(&self) -> String;
+    fn index_type_to_string(&self) -> &str;
     fn len(&self) -> usize;
     fn is_empty(&self) -> bool;
     fn flush(&mut self) -> io::Result<()>;
@@ -12,9 +14,17 @@ pub trait AnyStorableVec {
 
 impl<I, T, const MODE: u8> AnyStorableVec for StorableVec<I, T, MODE>
 where
-    I: StorableVecIndex,
-    T: StorableVecType,
+    I: StoredIndex,
+    T: StoredType,
 {
+    fn file_name(&self) -> String {
+        self.file_name()
+    }
+
+    fn index_type_to_string(&self) -> &str {
+        self.index_type_to_string()
+    }
+
     fn len(&self) -> usize {
         self.len()
     }
@@ -27,3 +37,28 @@ where
         self.flush()
     }
 }
+
+#[cfg(feature = "json")]
+pub trait AnyJsonStorableVec: AnyStorableVec {
+    fn collect_range_values(&self, from: Option<i64>, to: Option<i64>) -> Result<Vec<serde_json::Value>>;
+}
+
+impl<I, T, const MODE: u8> AnyJsonStorableVec for StorableVec<I, T, MODE>
+where
+    I: StoredIndex,
+    T: StoredType + serde::Serialize,
+{
+    fn collect_range_values(&self, from: Option<i64>, to: Option<i64>) -> Result<Vec<serde_json::Value>> {
+        if MODE == STATELESS {
+            Ok(
+                unsafe { mem::transmute::<&StorableVec<I, T, MODE>, &StorableVec<I, T, STATELESS>>(self) }
+                    .collect_range(from, to)?
+                    .into_iter()
+                    .map(|v| serde_json::to_value(v).unwrap())
+                    .collect::<Vec<_>>(),
+            )
+        } else {
+            unreachable!()
+        }
+    }
+}
diff --git a/storable_vec/src/traits/mod.rs b/storable_vec/src/traits/mod.rs
index 2a8c9e8ae..c12f4f424 100644
--- a/storable_vec/src/traits/mod.rs
+++ b/storable_vec/src/traits/mod.rs
@@ -1,8 +1,8 @@
 mod any;
 // mod bytes;
-mod index;
-mod type_;
+mod stored_index;
+mod stored_type;
 
 pub use any::*;
-pub use index::*;
-pub use type_::*;
+pub use stored_index::*;
+pub use stored_type::*;
diff --git a/storable_vec/src/traits/index.rs b/storable_vec/src/traits/stored_index.rs
similarity index 74%
rename from storable_vec/src/traits/index.rs
rename to storable_vec/src/traits/stored_index.rs
index c99b64320..c0200f1ed 100644
--- a/storable_vec/src/traits/index.rs
+++ b/storable_vec/src/traits/stored_index.rs
@@ -1,6 +1,6 @@
 use std::{fmt::Debug, ops::Add};
 
-pub trait StorableVecIndex
+pub trait StoredIndex
 where
     Self: Debug
         + Default
@@ -12,10 +12,12 @@ where
         + Ord
         + TryInto<usize>
         + From<usize>
-        + Add<usize, Output = Self>,
+        + Add<usize, Output = Self>
+        + Send
+        + Sync,
 {
 }
-impl<I> StorableVecIndex for I where
+impl<I> StoredIndex for I where
     I: Debug
         + Default
         + Copy
@@ -27,5 +29,7 @@ impl<I> StorableVecIndex for I where
         + TryInto<usize>
         + From<usize>
         + Add<usize, Output = Self>
+        + Send
+        + Sync
 {
 }
diff --git a/storable_vec/src/traits/stored_type.rs b/storable_vec/src/traits/stored_type.rs
new file mode 100644
index 000000000..f0a7b9e42
--- /dev/null
+++ b/storable_vec/src/traits/stored_type.rs
@@ -0,0 +1,13 @@
+use std::fmt::Debug;
+
+use zerocopy::{Immutable, IntoBytes, KnownLayout, TryFromBytes};
+
+pub trait StoredType
+where
+    Self: Sized + Debug + Clone + TryFromBytes + IntoBytes + Immutable + KnownLayout + Send + Sync,
+{
+}
+impl<T> StoredType for T where
+    T: Sized + Debug + Clone + TryFromBytes + IntoBytes + Immutable + KnownLayout + Send + Sync
+{
+}
diff --git a/storable_vec/src/traits/type_.rs b/storable_vec/src/traits/type_.rs
deleted file mode 100644
index 06e94efc0..000000000
--- a/storable_vec/src/traits/type_.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-use std::fmt::Debug;
-
-use zerocopy::{Immutable, IntoBytes, KnownLayout, TryFromBytes};
-
-pub trait StorableVecType
-where
-    Self: Sized + Debug + Clone + TryFromBytes + IntoBytes + Immutable + KnownLayout,
-{
-}
-impl<T> StorableVecType for T where T: Sized + Debug + Clone + TryFromBytes + IntoBytes + Immutable + KnownLayout {}

From 27b270148b9afa9c81df8ae63c61cbc322b76f57 Mon Sep 17 00:00:00 2001
From: nym21 <expat-epochs0i@icloud.com>
Date: Wed, 12 Feb 2025 16:00:31 +0100
Subject: [PATCH 46/63] server: add tsv support

---
 Cargo.lock                            |  74 +++---
 server/Cargo.toml                     |   2 +-
 server/src/api/handlers/dataset.rs    | 344 --------------------------
 server/src/api/handlers/mod.rs        |   5 -
 server/src/api/mod.rs                 |  16 +-
 server/src/api/structs/format.rs      |   3 +
 server/src/api/structs/route.rs       |  33 ---
 server/src/api/structs/routes.rs      |  54 ----
 server/src/lib.rs                     |   6 +-
 server/src/traits/header_map.rs       |   5 +
 server/src/website/handlers/minify.rs |  10 +-
 storable_vec/src/traits/any.rs        |   2 +-
 12 files changed, 64 insertions(+), 490 deletions(-)
 delete mode 100644 server/src/api/handlers/dataset.rs
 delete mode 100644 server/src/api/handlers/mod.rs
 delete mode 100644 server/src/api/structs/route.rs
 delete mode 100644 server/src/api/structs/routes.rs

diff --git a/Cargo.lock b/Cargo.lock
index cf1bf751b..06bdecac6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1639,9 +1639,9 @@ checksum = "fb37767f6569cd834a413442455e0f066d0d522de8630436e2a1761d9726ba56"
 
 [[package]]
 name = "oxc"
-version = "0.49.0"
+version = "0.50.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f346cc73c834df63403e8baa7b4e7efc9c6c4dbf45eb8fc6014bdb7b2d83b12"
+checksum = "1d064edaa54040423cb94b283026dfcd679b29c26c2f070021dc268cc96fb155"
 dependencies = [
  "oxc_allocator",
  "oxc_ast",
@@ -1682,9 +1682,9 @@ dependencies = [
 
 [[package]]
 name = "oxc_allocator"
-version = "0.49.0"
+version = "0.50.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba82e27c94fd90c94cba7f3ec9079c6eea4d2000b57c29c7d34d100bf8c80de7"
+checksum = "417522e84d8fdc87cab7bfc95b6419757c3d2f2013b78491c0295135d3516945"
 dependencies = [
  "allocator-api2",
  "bumpalo",
@@ -1695,15 +1695,13 @@ dependencies = [
 
 [[package]]
 name = "oxc_ast"
-version = "0.49.0"
+version = "0.50.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96cc90207e2212fa7b3511014cfa193ef2807bb504424e16ae8aa3e5a6715a3f"
+checksum = "e2e0b6014198425ee79e1e0c71c79fc874f3a7c7007043d9ce1b353f740de488"
 dependencies = [
  "bitflags",
  "cow-utils",
  "nonmax",
- "num-bigint",
- "num-traits",
  "oxc_allocator",
  "oxc_ast_macros",
  "oxc_estree",
@@ -1714,9 +1712,9 @@ dependencies = [
 
 [[package]]
 name = "oxc_ast_macros"
-version = "0.49.0"
+version = "0.50.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "315ff1ec55898f4d132d7f5ac3a8777d6c05e02d25bae7195e1eb0326146b299"
+checksum = "a58764050b69c30bdf45a6f803bff212306ba9ac50277f21a231ff6e110da682"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1725,9 +1723,9 @@ dependencies = [
 
 [[package]]
 name = "oxc_cfg"
-version = "0.49.0"
+version = "0.50.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68480b093736d6ac483afead3b5d9942bd02ec6b62e414d4265482eebffe9788"
+checksum = "621ea878d0e487215822fe61c98afaa337e79f8290352a95bd8d37c45eab0484"
 dependencies = [
  "bitflags",
  "itertools",
@@ -1740,9 +1738,9 @@ dependencies = [
 
 [[package]]
 name = "oxc_codegen"
-version = "0.49.0"
+version = "0.50.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef6d9fd6b5953dcb9f814bf9ecd93979193269b17927a38c916afb702629f754"
+checksum = "f68faeabfca1a9ad49b26939766185e87f4d03d08d917b465b1956db7d2ac466"
 dependencies = [
  "assert-unchecked",
  "bitflags",
@@ -1762,9 +1760,9 @@ dependencies = [
 
 [[package]]
 name = "oxc_data_structures"
-version = "0.49.0"
+version = "0.50.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8342a5e7cb5ea7833a16b3075abb962094443b00caa22e2b2f93d47c44caf871"
+checksum = "7f3c3ebb1b248fa1a5ea965b7398eb0533f45545c6cbe28cd581f57211413096"
 dependencies = [
  "assert-unchecked",
  "ropey",
@@ -1772,9 +1770,9 @@ dependencies = [
 
 [[package]]
 name = "oxc_diagnostics"
-version = "0.49.0"
+version = "0.50.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96ced1ce8a7a2c5972a9ac69a1df801966157cdb40c09e9c39b13efecdf63c9"
+checksum = "ae69c956abfbadf5c31f08dc2b901bcefadb87a472106e13ae2b6a01135c66c2"
 dependencies = [
  "cow-utils",
  "oxc-miette",
@@ -1782,9 +1780,9 @@ dependencies = [
 
 [[package]]
 name = "oxc_ecmascript"
-version = "0.49.0"
+version = "0.50.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05f3d220214466200c5a5c6475b681cad6aa9e076aa0e9a290c920375993cc75"
+checksum = "b2f773d18674b21240b42a7c8bcb3522de09b8841993620286e87812d7e7866a"
 dependencies = [
  "num-bigint",
  "num-traits",
@@ -1795,9 +1793,9 @@ dependencies = [
 
 [[package]]
 name = "oxc_estree"
-version = "0.49.0"
+version = "0.50.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd0ba1ad13334dd7d203273c4d99b0f508c0d069888b5d2c36261c70630a0317"
+checksum = "244fd8ba7157c8f12910024373d4e3665b6a35fb5947edae1d4a6c084ac8e0c3"
 
 [[package]]
 name = "oxc_index"
@@ -1807,9 +1805,9 @@ checksum = "5eca5d9726cd0a6e433debe003b7bc88b2ecad0bb6109f0cef7c55e692139a34"
 
 [[package]]
 name = "oxc_mangler"
-version = "0.49.0"
+version = "0.50.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de5d581f96d85a192d1c6191ee3b476ba715f565a228c605b501be2456e49f51"
+checksum = "73839b44f57bdc707e63c3558d4da368e904960f13db1639c6d6c5e2e7e4ab8d"
 dependencies = [
  "fixedbitset",
  "itertools",
@@ -1823,9 +1821,9 @@ dependencies = [
 
 [[package]]
 name = "oxc_minifier"
-version = "0.49.0"
+version = "0.50.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5137cabf5eeadec26708803c9676539cb418afab1403374d46c3ed0554d41c38"
+checksum = "ba22e1818002180efb9e023422a56d67b4baaa537deaf61d23d8ea6893ddcdd7"
 dependencies = [
  "cow-utils",
  "oxc_allocator",
@@ -1844,9 +1842,9 @@ dependencies = [
 
 [[package]]
 name = "oxc_parser"
-version = "0.49.0"
+version = "0.50.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd86fb907a291acf174889b545424abf2c11b3875203d363637c1835d9692176"
+checksum = "8b9d2ce3556a0ec6ee45da6936c5f04d97e6f00ef7ddca08dcc473094a21cfed"
 dependencies = [
  "assert-unchecked",
  "bitflags",
@@ -1867,9 +1865,9 @@ dependencies = [
 
 [[package]]
 name = "oxc_regular_expression"
-version = "0.49.0"
+version = "0.50.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d77b2ad85545ca2f6a2d319230d35e6cbacc2734029079bc820b2176cea37dc4"
+checksum = "e0e6d43914ff6758f62cf150f12d068a737fd464735d6b83ecefc7136f65e685"
 dependencies = [
  "oxc_allocator",
  "oxc_ast_macros",
@@ -1883,9 +1881,9 @@ dependencies = [
 
 [[package]]
 name = "oxc_semantic"
-version = "0.49.0"
+version = "0.50.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f021acc396e980c533abc66ec3680c18dda8ff4329dc32c49b8666d48d4627a1"
+checksum = "1e08d8bb5afc64dfc05e9f3b573c9af8b23a9a24aceb2bb1634d1f131717b736"
 dependencies = [
  "assert-unchecked",
  "itertools",
@@ -1919,9 +1917,9 @@ dependencies = [
 
 [[package]]
 name = "oxc_span"
-version = "0.49.0"
+version = "0.50.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3492e9db0c166a6072f4da2003966f3c3dad5f6c39ba86589dc0ab85de94dbb6"
+checksum = "0ae8953d32ade84e814d154ee046f0f08b2b236e12f550545a690454ab2a102c"
 dependencies = [
  "compact_str",
  "oxc-miette",
@@ -1932,9 +1930,9 @@ dependencies = [
 
 [[package]]
 name = "oxc_syntax"
-version = "0.49.0"
+version = "0.50.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2945b8d56e1cf569c933812bc37277de784bba3fd92a565a640f2650801b2d5"
+checksum = "9f375deb505b7fad6ed2125fdb92ffa8d550d866ca2ab0dfd24e681b125883c1"
 dependencies = [
  "assert-unchecked",
  "bitflags",
@@ -1953,9 +1951,9 @@ dependencies = [
 
 [[package]]
 name = "oxc_traverse"
-version = "0.49.0"
+version = "0.50.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ba02cbc4f6b98c1bb04c3a73c336657d999a75b464af91cf3abb93e610c0650"
+checksum = "2a4d049215b81048597d120851e1e797331be4f45ae2bb39ae2855c3be76fcc3"
 dependencies = [
  "compact_str",
  "itoa",
diff --git a/server/Cargo.toml b/server/Cargo.toml
index 4e858a313..d925f55c5 100644
--- a/server/Cargo.toml
+++ b/server/Cargo.toml
@@ -11,7 +11,7 @@ derive_deref = { workspace = true }
 indexer = { workspace = true }
 jiff = { workspace = true }
 logger = { workspace = true }
-oxc = { version = "0.49.0", features = ["codegen", "minifier"] }
+oxc = { version = "0.50.0", features = ["codegen", "minifier"] }
 regex = "1.11.1"
 reqwest = { version = "0.12.12", features = ["blocking", "json"] }
 serde = { workspace = true }
diff --git a/server/src/api/handlers/dataset.rs b/server/src/api/handlers/dataset.rs
deleted file mode 100644
index 2a6e4d04f..000000000
--- a/server/src/api/handlers/dataset.rs
+++ /dev/null
@@ -1,344 +0,0 @@
-use std::{fmt::Debug, path::PathBuf, time::Instant};
-
-use axum::{
-    body::Body,
-    extract::{Path, Query, State},
-    http::HeaderMap,
-    response::{IntoResponse, Response},
-};
-use bincode::Decode;
-use chrono::{DateTime, Utc};
-use color_eyre::eyre::{eyre, ContextCompat};
-use reqwest::StatusCode;
-use serde::{de::DeserializeOwned, Deserialize, Serialize};
-
-use crate::{
-    server::{
-        api::{
-            structs::{ChunkMetadata, DatasetRange, DatasetRangeChunk, Extension, Kind, Route, Routes},
-            API_URL_PREFIX,
-        },
-        header_map::{HeaderMapExtended, Modified},
-        log_result,
-        response::ResponseExtended,
-        AppState,
-    },
-    structs::{
-        Date, GenericMap, Height, HeightMapChunkId, MapChunkId, MapKey, MapSerialized, MapValue, SerializedBTreeMap,
-        SerializedDateMap, SerializedTimeMap, SerializedVec, Timestamp, OHLC,
-    },
-};
-
-#[derive(Deserialize)]
-pub struct DatasetParams {
-    pub chunk: Option<usize>,
-    pub all: Option<bool>,
-    pub kind: String,
-}
-
-pub async fn dataset_handler(
-    headers: HeaderMap,
-    path: Path<String>,
-    query: Query<DatasetParams>,
-    State(app_state): State<AppState>,
-) -> Response {
-    let instant = Instant::now();
-
-    let ser_path = format!(
-        "{API_URL_PREFIX}/{}?kind={}{}{}",
-        path.0,
-        query.kind,
-        query.chunk.map_or("".to_string(), |chunk| format!("&chunk={chunk}")),
-        query.all.map_or("".to_string(), |all| format!("&all={all}"))
-    );
-
-    match result_handler(headers, &path, &query, app_state) {
-        Ok(response) => {
-            log_result(response.status(), &ser_path, instant);
-            response
-        }
-        Err(error) => {
-            let mut response = (StatusCode::INTERNAL_SERVER_ERROR, error.to_string()).into_response();
-            log_result(response.status(), &ser_path, instant);
-            response.headers_mut().insert_cors();
-            response
-        }
-    }
-}
-
-fn result_handler(
-    headers: HeaderMap,
-    Path(path): &Path<String>,
-    query: &Query<DatasetParams>,
-    AppState { routes, .. }: AppState,
-) -> color_eyre::Result<Response> {
-    let path_buf = PathBuf::from(&path);
-    let id = path_buf.file_stem().unwrap().to_str().unwrap();
-    let ext = Extension::from(&path_buf);
-
-    let route = routes.get(id);
-    if route.is_none() {
-        return Err(eyre!("Wrong path"));
-    }
-    let route = route.unwrap();
-
-    let type_name = route.type_name.as_str();
-    Ok(match type_name {
-        "u8" => typed_handler::<u8>(headers, id, ext, query, route, &routes)?,
-        "u16" => typed_handler::<u16>(headers, id, ext, query, route, &routes)?,
-        "u32" => typed_handler::<u32>(headers, id, ext, query, route, &routes)?,
-        "u64" => typed_handler::<u64>(headers, id, ext, query, route, &routes)?,
-        "usize" => typed_handler::<usize>(headers, id, ext, query, route, &routes)?,
-        "f32" => typed_handler::<f32>(headers, id, ext, query, route, &routes)?,
-        "f64" => typed_handler::<f64>(headers, id, ext, query, route, &routes)?,
-        "OHLC" => typed_handler::<OHLC>(headers, id, ext, query, route, &routes)?,
-        "Date" => typed_handler::<Date>(headers, id, ext, query, route, &routes)?,
-        "Height" => typed_handler::<Height>(headers, id, ext, query, route, &routes)?,
-        "Timestamp" => typed_handler::<Timestamp>(headers, id, ext, query, route, &routes)?,
-        _ => panic!("Incompatible type: {type_name}"),
-    })
-}
-
-fn typed_handler<T>(
-    headers: HeaderMap,
-    id: &str,
-    ext: Option<Extension>,
-    query: &Query<DatasetParams>,
-    route: &Route,
-    routes: &Routes,
-) -> color_eyre::Result<Response>
-where
-    T: Serialize + Debug + DeserializeOwned + Decode + MapValue,
-{
-    let kind = Kind::try_from(&query.kind)?;
-    if !route.list.contains(&kind) {
-        return Err(eyre!("{kind:?} not supported for this dataset"));
-    }
-
-    let range = DatasetRange::try_from(query)?;
-
-    let (mut response, date_modified) = match kind {
-        Kind::Last => {
-            let last_value: T = route.serialization.import(&route.path.join("last"))?;
-            return Ok(axum::response::Json(last_value).into_response());
-        }
-        Kind::Date => match read_serialized::<Date, T, _, SerializedDateMap<T>>(id, &headers, route, &range, query)? {
-            ReadSerialized::DatasetAndDate((dataset, date, chunk_meta)) => {
-                (serialized_to_response(dataset, id, chunk_meta, ext), date)
-            }
-            ReadSerialized::NotModified => return Ok(Response::new_not_modified()),
-            ReadSerialized::_Phantom(_) => unreachable!(),
-        },
-        Kind::Height => match read_serialized::<Height, T, _, SerializedVec<T>>(id, &headers, route, &range, query)? {
-            ReadSerialized::DatasetAndDate((dataset, date, chunk_meta)) => (
-                serialized_to_response::<Height, T, _, SerializedVec<T>>(dataset, id, chunk_meta, ext),
-                date,
-            ),
-            ReadSerialized::NotModified => return Ok(Response::new_not_modified()),
-            ReadSerialized::_Phantom(_) => unreachable!(),
-        },
-        Kind::Timestamp => {
-            let (dataset, date, chunk_meta) =
-                match read_serialized::<Height, T, _, SerializedVec<T>>(id, &headers, route, &range, query)? {
-                    ReadSerialized::DatasetAndDate(tuple) => tuple,
-                    ReadSerialized::NotModified => return Ok(Response::new_not_modified()),
-                    ReadSerialized::_Phantom(_) => unreachable!(),
-                };
-
-            let (timestamp_dataset, _, _) = match read_serialized::<Height, Timestamp, _, SerializedVec<Timestamp>>(
-                "timestamp",
-                &headers,
-                routes.get("timestamp").unwrap(),
-                &range,
-                query,
-            )? {
-                ReadSerialized::DatasetAndDate(tuple) => tuple,
-                ReadSerialized::NotModified => return Ok(Response::new_not_modified()),
-                ReadSerialized::_Phantom(_) => unreachable!(),
-            };
-
-            let mut serialized_timemap: SerializedTimeMap<T> = SerializedBTreeMap::default();
-
-            dataset.map.into_iter().enumerate().for_each(|(index, value)| {
-                serialized_timemap.map.insert(
-                    timestamp_dataset.get_index(index).cloned().unwrap_or(Timestamp::now()),
-                    value,
-                );
-            });
-
-            (
-                serialized_to_response::<Timestamp, T, HeightMapChunkId, SerializedTimeMap<T>>(
-                    serialized_timemap,
-                    id,
-                    chunk_meta,
-                    ext,
-                ),
-                date,
-            )
-
-            // let m = read_serialized::<Height, T, _, SerializedVec<T>>(
-            //     id, &headers, route, &range, query,
-            // )?;
-            // let t = read_serialized::<Height, Timestamp, _, SerializedVec<Timestamp>>(
-            //     "timestamp",
-            //     &headers,
-            //     routes.get("timestamp").unwrap(),
-            //     &range,
-            //     query,
-            // );
-            // t
-        }
-    };
-
-    let headers = response.headers_mut();
-
-    headers.insert_cors();
-    headers.insert_last_modified(date_modified);
-
-    match ext {
-        Some(extension) => {
-            headers.insert_content_disposition_attachment();
-            match extension {
-                Extension::CSV => headers.insert_content_type_text_csv(),
-                Extension::JSON => headers.insert_content_type_application_json(),
-            }
-        }
-        _ => headers.insert_content_type_application_json(),
-    }
-
-    Ok(response)
-}
-
-fn serialized_to_response<Key, Value, ChunkId, Serialized>(
-    dataset: Serialized,
-    id: &str,
-    chunk_meta: Option<ChunkMetadata>,
-    ext: Option<Extension>,
-) -> Response<Body>
-where
-    Key: MapKey<ChunkId>,
-    Value: MapValue,
-    ChunkId: MapChunkId,
-    Serialized: MapSerialized<Key, Value, ChunkId>,
-{
-    if ext == Some(Extension::CSV) {
-        dataset.to_csv(id).into_response()
-    } else if let Some(chunk) = chunk_meta {
-        axum::response::Json(SerializedMapChunk {
-            chunk,
-            map: dataset.map(),
-            version: dataset.version(),
-        })
-        .into_response()
-    } else {
-        axum::response::Json(dataset).into_response()
-    }
-}
-
-enum ReadSerialized<Key, Value, ChunkId, Serialized>
-where
-    Key: MapKey<ChunkId>,
-    Value: MapValue,
-    ChunkId: MapChunkId,
-    Serialized: MapSerialized<Key, Value, ChunkId>,
-{
-    DatasetAndDate((Serialized, DateTime<Utc>, Option<ChunkMetadata>)),
-    NotModified,
-    _Phantom((Key, Value, ChunkId)),
-}
-
-fn read_serialized<Key, Value, ChunkId, Serialized>(
-    id: &str,
-    headers: &HeaderMap,
-    route: &Route,
-    range: &DatasetRange,
-    query: &Query<DatasetParams>,
-) -> color_eyre::Result<ReadSerialized<Key, Value, ChunkId, Serialized>>
-where
-    Key: MapKey<ChunkId>,
-    Value: MapValue,
-    ChunkId: MapChunkId,
-    Serialized: MapSerialized<Key, Value, ChunkId>,
-{
-    let folder_path = route.path.join(Key::map_name());
-    let serialization = &route.serialization;
-
-    let date_modified;
-
-    let datasets = GenericMap::<Key, Value, ChunkId, Serialized>::_read_dir(&folder_path, serialization);
-
-    let mut chunk_meta = None;
-
-    let dataset = if let DatasetRange::Chunk(range_chunk) = range {
-        let chunk_id = match range_chunk {
-            DatasetRangeChunk::Last => *datasets.last_key_value().context("Last tuple of dataset directory")?.0,
-            DatasetRangeChunk::Chunk(chunk) => ChunkId::from_usize(*chunk),
-        };
-
-        let chunk_path = datasets.get(&chunk_id);
-        if chunk_path.is_none() {
-            return Err(eyre!("Couldn't find chunk"));
-        }
-        let chunk_path = chunk_path.unwrap();
-
-        let (modified, date) = headers.check_if_modified_since(chunk_path)?;
-        if modified == Modified::NotModifiedSince {
-            return Ok(ReadSerialized::NotModified);
-        }
-        date_modified = date;
-
-        let to_url = |chunk: Option<ChunkId>| {
-            chunk.and_then(|chunk| {
-                datasets.contains_key(&chunk).then(|| {
-                    let scheme = headers.get_scheme();
-                    let host = headers.get_host();
-                    format!(
-                        "{scheme}://{host}/api/{id}?kind={}&chunk={}",
-                        query.kind,
-                        chunk.to_usize()
-                    )
-                })
-            })
-        };
-
-        chunk_meta.replace(ChunkMetadata {
-            id: chunk_id.to_usize(),
-            next: to_url(chunk_id.next()),
-            previous: to_url(chunk_id.previous()),
-        });
-
-        serialization.import::<Serialized>(chunk_path)?
-    } else {
-        let newest_file = datasets
-            .values()
-            .max_by(|a, b| {
-                a.metadata()
-                    .unwrap()
-                    .modified()
-                    .unwrap()
-                    .cmp(&b.metadata().unwrap().modified().unwrap())
-            })
-            .context("Expect to find newest file")?;
-
-        let (modified, date) = headers.check_if_modified_since(newest_file)?;
-        if modified == Modified::NotModifiedSince {
-            return Ok(ReadSerialized::NotModified);
-        }
-
-        date_modified = date;
-
-        Serialized::import_all(&folder_path, serialization)
-    };
-
-    Ok(ReadSerialized::DatasetAndDate((dataset, date_modified, chunk_meta)))
-}
-
-#[derive(Serialize)]
-struct SerializedMapChunk<T>
-where
-    T: Serialize,
-{
-    version: u32,
-    chunk: ChunkMetadata,
-    map: T,
-}
diff --git a/server/src/api/handlers/mod.rs b/server/src/api/handlers/mod.rs
deleted file mode 100644
index 518fe0dc7..000000000
--- a/server/src/api/handlers/mod.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-mod dataset;
-mod last_values;
-
-pub use dataset::*;
-pub use last_values::*;
diff --git a/server/src/api/mod.rs b/server/src/api/mod.rs
index 0d88c051f..a3911725f 100644
--- a/server/src/api/mod.rs
+++ b/server/src/api/mod.rs
@@ -110,8 +110,15 @@ fn req_to_response_res(
     let ids_last_i = ids.len() - 1;
 
     let mut response = match format {
-        Some(Format::CSV) => {
-            let mut csv = ids.into_iter().map(|(id, _)| id).collect::<Vec<_>>().join(",");
+        Some(Format::CSV) | Some(Format::TSV) => {
+            let delimiter = if format == Some(Format::CSV) { ',' } else { '\t' };
+
+            let mut csv = ids
+                .into_iter()
+                .map(|(id, _)| id)
+                .collect::<Vec<_>>()
+                .join(&delimiter.to_string());
+
             csv.push('\n');
 
             let values_len = values.first().unwrap().len();
@@ -123,7 +130,7 @@ fn req_to_response_res(
                     if id_i == ids_last_i {
                         line.push('\n');
                     } else {
-                        line.push(',');
+                        line.push(delimiter);
                     }
                 });
                 csv += &line;
@@ -131,7 +138,7 @@ fn req_to_response_res(
 
             csv.into_response()
         }
-        _ => {
+        Some(Format::JSON) | None => {
             if values.len() == 1 {
                 let values = values.first().unwrap();
                 if values.len() == 1 {
@@ -156,6 +163,7 @@ fn req_to_response_res(
             headers.insert_content_disposition_attachment();
             match format {
                 Format::CSV => headers.insert_content_type_text_csv(),
+                Format::TSV => headers.insert_content_type_text_tsv(),
                 Format::JSON => headers.insert_content_type_application_json(),
             }
         }
diff --git a/server/src/api/structs/format.rs b/server/src/api/structs/format.rs
index 5e0da56a8..1877c78d1 100644
--- a/server/src/api/structs/format.rs
+++ b/server/src/api/structs/format.rs
@@ -4,6 +4,7 @@ use color_eyre::eyre::eyre;
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum Format {
     CSV,
+    TSV,
     JSON,
 }
 
@@ -15,6 +16,8 @@ impl TryFrom<Option<String>> for Format {
             let value = value.as_str();
             if value == "csv" {
                 Ok(Self::CSV)
+            } else if value == "tsv" {
+                Ok(Self::TSV)
             } else if value == "json" {
                 Ok(Self::JSON)
             } else {
diff --git a/server/src/api/structs/route.rs b/server/src/api/structs/route.rs
deleted file mode 100644
index 0eda227eb..000000000
--- a/server/src/api/structs/route.rs
+++ /dev/null
@@ -1,33 +0,0 @@
-use std::{collections::BTreeSet, path::PathBuf};
-
-use crate::{io::Serialization, structs::AnyMap};
-
-use super::Kind;
-
-#[derive(Debug, Clone)]
-pub struct Route {
-    pub type_name: String,
-    pub list: BTreeSet<Kind>,
-    pub path: PathBuf,
-    pub serialization: Serialization,
-}
-
-impl Route {
-    pub fn update(&mut self, map: &(dyn AnyMap + Send + Sync)) {
-        self.list.append(&mut BTreeSet::from(map));
-        if self.serialization != map.serialization() {
-            panic!("route.upate() different serialization")
-        }
-    }
-}
-
-impl From<&(dyn AnyMap + Send + Sync)> for Route {
-    fn from(map: &(dyn AnyMap + Send + Sync)) -> Self {
-        Self {
-            list: BTreeSet::from(map),
-            path: map.path_parent().to_owned(),
-            type_name: map.type_name().split("::").last().unwrap().to_owned(),
-            serialization: map.serialization(),
-        }
-    }
-}
diff --git a/server/src/api/structs/routes.rs b/server/src/api/structs/routes.rs
deleted file mode 100644
index 14141142f..000000000
--- a/server/src/api/structs/routes.rs
+++ /dev/null
@@ -1,54 +0,0 @@
-use std::collections::BTreeMap;
-
-use derive_deref::{Deref, DerefMut};
-
-use crate::{
-    parser::{AnyDatasets, Datasets},
-    structs::Config,
-};
-
-use super::Route;
-
-#[derive(Debug, Clone, Default, Deref, DerefMut)]
-pub struct Routes(BTreeMap<String, Route>);
-
-const WEBSITE_TYPES_PATH: &str = "../website/scripts/types";
-
-impl Routes {
-    pub fn build(datasets: &Datasets, config: &Config) -> Self {
-        datasets
-            .to_any_dataset_vec()
-            .into_iter()
-            .flat_map(|dataset| dataset.to_all_map_vec())
-            .fold(Self::default(), |mut routes, map| {
-                routes
-                    .entry(map.id(config))
-                    .or_insert_with(|| Route::from(map))
-                    .update(map);
-                routes
-            })
-    }
-
-    pub fn generate_dts_file(&self) {
-        // let map_to_type = |name: &str, map: &HashMap<String, Route>| -> String {
-        //     let paths = map
-        //         .values()
-        //         .map(|route| format!("\"{}\"", route.url_path))
-        //         .join(" | ");
-
-        //     format!("export type {}Path = {};\n", name, paths)
-        // };
-
-        // let date_type = map_to_type("Date", &self.date);
-
-        // let height_type = map_to_type("Height", &self.height);
-
-        // let last_type = map_to_type("Last", &self.last);
-
-        // fs::write(
-        //     format!("{WEBSITE_TYPES_PATH}/paths.d.ts"),
-        //     format!("// This file is auto generated by the server\n// Manual changes are forbidden\n\n{date_type}\n{height_type}\n{last_type}"),
-        // )
-        // .unwrap();
-    }
-}
diff --git a/server/src/lib.rs b/server/src/lib.rs
index 631e14e2a..dfba72c33 100644
--- a/server/src/lib.rs
+++ b/server/src/lib.rs
@@ -1,13 +1,12 @@
 use std::{collections::BTreeMap, time::Instant};
 
 use api::{structs::Index, ApiRoutes};
-use axum::{routing::get, serve, Router};
+use axum::{routing::get, serve, Json, Router};
 use color_eyre::owo_colors::OwoColorize;
 use computer::Computer;
 use derive_deref::{Deref, DerefMut};
 use indexer::Indexer;
 use logger::{error, info};
-use oxc::syntax::identifier::LF;
 use reqwest::StatusCode;
 use storable_vec::{AnyJsonStorableVec, STATELESS};
 use tokio::net::TcpListener;
@@ -29,6 +28,7 @@ pub struct AppState {
 pub struct VecIdToIndexToVec(BTreeMap<String, IndexToVec>);
 
 impl VecIdToIndexToVec {
+    // Not the most performant or type safe but only built once so that's okay
     pub fn insert(&mut self, vec: &'static dyn AnyJsonStorableVec) {
         let file_name = vec.file_name();
         let split = file_name.split("_to_").collect::<Vec<_>>();
@@ -83,7 +83,7 @@ pub async fn main(indexer: Indexer<STATELESS>, computer: Computer<STATELESS>) ->
     let router = Router::new()
         .add_api_routes()
         .add_website_routes()
-        .route("/version", get(env!("CARGO_PKG_VERSION")))
+        .route("/version", get(Json(env!("CARGO_PKG_VERSION"))))
         .with_state(state)
         .layer(compression_layer);
 
diff --git a/server/src/traits/header_map.rs b/server/src/traits/header_map.rs
index 68aaf902d..6001d415e 100644
--- a/server/src/traits/header_map.rs
+++ b/server/src/traits/header_map.rs
@@ -43,6 +43,7 @@ pub trait HeaderMapExtended {
     fn insert_content_type_application_pdf(&mut self);
     fn insert_content_type_text_css(&mut self);
     fn insert_content_type_text_csv(&mut self);
+    fn insert_content_type_text_tsv(&mut self);
     fn insert_content_type_text_html(&mut self);
     fn insert_content_type_text_plain(&mut self);
     fn insert_content_type_font_woff2(&mut self);
@@ -197,6 +198,10 @@ impl HeaderMapExtended for HeaderMap {
         self.insert(header::CONTENT_TYPE, "text/csv".parse().unwrap());
     }
 
+    fn insert_content_type_text_tsv(&mut self) {
+        self.insert(header::CONTENT_TYPE, "text/tab-separated-values".parse().unwrap());
+    }
+
     fn insert_content_type_text_html(&mut self) {
         self.insert(header::CONTENT_TYPE, "text/html".parse().unwrap());
     }
diff --git a/server/src/website/handlers/minify.rs b/server/src/website/handlers/minify.rs
index 15705778b..327800bcc 100644
--- a/server/src/website/handlers/minify.rs
+++ b/server/src/website/handlers/minify.rs
@@ -10,17 +10,13 @@ use oxc::{
     span::SourceType,
 };
 
-//
 pub fn minify_js(path: &Path) -> String {
-    let allocator = Allocator::default();
-
+    let source_text = fs::read_to_string(path).unwrap();
     let source_type = SourceType::from_path(path).unwrap();
 
-    let source_text = fs::read_to_string(path).unwrap();
+    let allocator = Allocator::default();
 
-    let parser_return = Parser::new(&allocator, &source_text, source_type).parse();
-
-    let mut program = parser_return.program;
+    let mut program = Parser::new(&allocator, &source_text, source_type).parse().program;
 
     let minifier_return = Minifier::new(MinifierOptions {
         mangle: Some(MangleOptions::default()),
diff --git a/storable_vec/src/traits/any.rs b/storable_vec/src/traits/any.rs
index 5a9e21697..2fa3e40fa 100644
--- a/storable_vec/src/traits/any.rs
+++ b/storable_vec/src/traits/any.rs
@@ -58,7 +58,7 @@ where
                     .collect::<Vec<_>>(),
             )
         } else {
-            unreachable!()
+            todo!("todo ?")
         }
     }
 }

From b034b4fe2f5d6a013985a5508535041973e0a10b Mon Sep 17 00:00:00 2001
From: nym21 <expat-epochs0i@icloud.com>
Date: Wed, 12 Feb 2025 17:22:36 +0100
Subject: [PATCH 47/63] python: add read bytes from vec example

---
 .gitignore                  |   3 +
 exit/src/lib.rs             |   2 +-
 indexer/src/lib.rs          |   2 +-
 pricer/src/price.rs         | 733 ++++++++++++++++++++++++++++++++++++
 pricer/src/price/binance.rs | 213 +++++++++++
 pricer/src/price/kibo.rs    | 118 ++++++
 pricer/src/price/kraken.rs  | 133 +++++++
 pricer/src/price/mod.rs     |   7 +
 python/example.py           |  12 +
 9 files changed, 1221 insertions(+), 2 deletions(-)
 create mode 100644 pricer/src/price.rs
 create mode 100644 pricer/src/price/binance.rs
 create mode 100644 pricer/src/price/kibo.rs
 create mode 100644 pricer/src/price/kraken.rs
 create mode 100644 pricer/src/price/mod.rs
 create mode 100644 python/example.py

diff --git a/.gitignore b/.gitignore
index 86d71e5f0..749a5981f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,3 +32,6 @@ paths.d.ts
 
 # Outputs
 _outputs
+
+# Python
+.ropeproject
diff --git a/exit/src/lib.rs b/exit/src/lib.rs
index 87ea02c9f..9daabe4af 100644
--- a/exit/src/lib.rs
+++ b/exit/src/lib.rs
@@ -56,7 +56,7 @@ impl Exit {
         self.blocked.store(false, Ordering::SeqCst);
     }
 
-    pub fn active(&self) -> bool {
+    pub fn blocked(&self) -> bool {
         self.active.load(Ordering::SeqCst)
     }
 }
diff --git a/indexer/src/lib.rs b/indexer/src/lib.rs
index 157f61381..7d3af88cc 100644
--- a/indexer/src/lib.rs
+++ b/indexer/src/lib.rs
@@ -647,7 +647,7 @@ impl Indexer<CACHED_GETS> {
                 txinindex_global += Txinindex::from(inputs_len);
                 txoutindex_global += Txoutindex::from(outputs_len);
 
-                let should_snapshot = _height != 0 && _height % SNAPSHOT_BLOCK_RANGE == 0 && !exit.active();
+                let should_snapshot = _height != 0 && _height % SNAPSHOT_BLOCK_RANGE == 0 && !exit.blocked();
                 if should_snapshot {
                     export(trees, vecs, height)?;
                 }
diff --git a/pricer/src/price.rs b/pricer/src/price.rs
new file mode 100644
index 000000000..ca79bd945
--- /dev/null
+++ b/pricer/src/price.rs
@@ -0,0 +1,733 @@
+use std::collections::BTreeMap;
+
+use allocative::Allocative;
+use chrono::Days;
+use color_eyre::eyre::Error;
+
+use struct_iterable::Iterable;
+
+use crate::{
+    parser::price::{Binance, Kibo, Kraken},
+    structs::{
+        Amount, BiMap, Config, Date, DateMap, DateMapChunkId, Height, HeightMapChunkId, MapKey,
+        MapKind, Timestamp, OHLC,
+    },
+    utils::{ONE_MONTH_IN_DAYS, ONE_WEEK_IN_DAYS, ONE_YEAR_IN_DAYS},
+};
+
+use super::{AnyDataset, ComputeData, MinInitialStates, RatioDataset};
+
+#[derive(Allocative, Iterable)]
+pub struct PriceDatasets {
+    min_initial_states: MinInitialStates,
+
+    kraken_daily: Option<BTreeMap<Date, OHLC>>,
+    kraken_1mn: Option<BTreeMap<u32, OHLC>>,
+    binance_1mn: Option<BTreeMap<u32, OHLC>>,
+    binance_daily: Option<BTreeMap<Date, OHLC>>,
+    binance_har: Option<BTreeMap<u32, OHLC>>,
+    kibo_by_height: BTreeMap<HeightMapChunkId, Vec<OHLC>>,
+    kibo_by_date: BTreeMap<DateMapChunkId, BTreeMap<Date, OHLC>>,
+
+    pub ohlc: BiMap<OHLC>,
+    pub open: BiMap<f32>,
+    pub high: BiMap<f32>,
+    pub low: BiMap<f32>,
+    pub close: BiMap<f32>,
+    pub market_cap: BiMap<f32>,
+    pub price_1w_sma: BiMap<f32>,
+    pub price_1w_sma_ratio: RatioDataset,
+    pub price_1m_sma: BiMap<f32>,
+    pub price_1m_sma_ratio: RatioDataset,
+    pub price_1y_sma: BiMap<f32>,
+    pub price_1y_sma_ratio: RatioDataset,
+    pub price_2y_sma: BiMap<f32>,
+    pub price_2y_sma_ratio: RatioDataset,
+    pub price_4y_sma: BiMap<f32>,
+    pub price_4y_sma_ratio: RatioDataset,
+    pub price_8d_sma: BiMap<f32>,
+    pub price_8d_sma_ratio: RatioDataset,
+    pub price_13d_sma: BiMap<f32>,
+    pub price_13d_sma_ratio: RatioDataset,
+    pub price_21d_sma: BiMap<f32>,
+    pub price_21d_sma_ratio: RatioDataset,
+    pub price_34d_sma: BiMap<f32>,
+    pub price_34d_sma_ratio: RatioDataset,
+    pub price_55d_sma: BiMap<f32>,
+    pub price_55d_sma_ratio: RatioDataset,
+    pub price_89d_sma: BiMap<f32>,
+    pub price_89d_sma_ratio: RatioDataset,
+    pub price_144d_sma: BiMap<f32>,
+    pub price_144d_sma_ratio: RatioDataset,
+    pub price_200w_sma: BiMap<f32>,
+    pub price_200w_sma_ratio: RatioDataset,
+    pub price_1d_total_return: DateMap<f32>,
+    pub price_1m_total_return: DateMap<f32>,
+    pub price_6m_total_return: DateMap<f32>,
+    pub price_1y_total_return: DateMap<f32>,
+    pub price_2y_total_return: DateMap<f32>,
+    pub price_3y_total_return: DateMap<f32>,
+    pub price_4y_total_return: DateMap<f32>,
+    pub price_6y_total_return: DateMap<f32>,
+    pub price_8y_total_return: DateMap<f32>,
+    pub price_10y_total_return: DateMap<f32>,
+    pub price_4y_compound_return: DateMap<f32>,
+    // projection via lowest 4y compound value
+    pub all_time_high: BiMap<f32>,
+    pub all_time_high_date: DateMap<Date>,
+    pub days_since_all_time_high: DateMap<u32>,
+    pub max_days_between_all_time_highs: DateMap<u32>,
+    pub max_years_between_all_time_highs: DateMap<f32>,
+    pub market_price_to_all_time_high_ratio: BiMap<f32>,
+    pub drawdown: BiMap<f32>,
+    pub sats_per_dollar: BiMap<f32>,
+    // volatility
+}
+
+impl PriceDatasets {
+    pub fn import(config: &Config) -> color_eyre::Result<Self> {
+        let path_dataset = config.path_datasets();
+        let f = |s: &str| path_dataset.join(s);
+
+        let mut s = Self {
+            min_initial_states: MinInitialStates::default(),
+
+            binance_1mn: None,
+            binance_daily: None,
+            binance_har: None,
+            kraken_1mn: None,
+            kraken_daily: None,
+            kibo_by_height: BTreeMap::default(),
+            kibo_by_date: BTreeMap::default(),
+
+            // ---
+            // Inserted
+            // ---
+            ohlc: BiMap::new_json(1, MapKind::Inserted, &config.path_price()),
+
+            // ---
+            // Computed
+            // ---
+            open: BiMap::new_bin(1, MapKind::Computed, &f("open")),
+            high: BiMap::new_bin(1, MapKind::Computed, &f("high")),
+            low: BiMap::new_bin(1, MapKind::Computed, &f("low")),
+            close: BiMap::new_bin(1, MapKind::Computed, &f("close")),
+            market_cap: BiMap::new_bin(1, MapKind::Computed, &f("market_cap")),
+            price_1w_sma: BiMap::new_bin(1, MapKind::Computed, &f("price_1w_sma")),
+            price_1w_sma_ratio: RatioDataset::import(&path_dataset, "price_1w_sma", config)?,
+            price_1m_sma: BiMap::new_bin(1, MapKind::Computed, &f("price_1m_sma")),
+            price_1m_sma_ratio: RatioDataset::import(&path_dataset, "price_1m_sma", config)?,
+            price_1y_sma: BiMap::new_bin(1, MapKind::Computed, &f("price_1y_sma")),
+            price_1y_sma_ratio: RatioDataset::import(&path_dataset, "price_1y_sma", config)?,
+            price_2y_sma: BiMap::new_bin(1, MapKind::Computed, &f("price_2y_sma")),
+            price_2y_sma_ratio: RatioDataset::import(&path_dataset, "price_2y_sma", config)?,
+            price_4y_sma: BiMap::new_bin(1, MapKind::Computed, &f("price_4y_sma")),
+            price_4y_sma_ratio: RatioDataset::import(&path_dataset, "price_4y_sma", config)?,
+            price_8d_sma: BiMap::new_bin(1, MapKind::Computed, &f("price_8d_sma")),
+            price_8d_sma_ratio: RatioDataset::import(&path_dataset, "price_8d_sma", config)?,
+            price_13d_sma: BiMap::new_bin(1, MapKind::Computed, &f("price_13d_sma")),
+            price_13d_sma_ratio: RatioDataset::import(&path_dataset, "price_13d_sma", config)?,
+            price_21d_sma: BiMap::new_bin(1, MapKind::Computed, &f("price_21d_sma")),
+            price_21d_sma_ratio: RatioDataset::import(&path_dataset, "price_21d_sma", config)?,
+            price_34d_sma: BiMap::new_bin(1, MapKind::Computed, &f("price_34d_sma")),
+            price_34d_sma_ratio: RatioDataset::import(&path_dataset, "price_34d_sma", config)?,
+            price_55d_sma: BiMap::new_bin(1, MapKind::Computed, &f("price_55d_sma")),
+            price_55d_sma_ratio: RatioDataset::import(&path_dataset, "price_55d_sma", config)?,
+            price_89d_sma: BiMap::new_bin(1, MapKind::Computed, &f("price_89d_sma")),
+            price_89d_sma_ratio: RatioDataset::import(&path_dataset, "price_89d_sma", config)?,
+            price_144d_sma: BiMap::new_bin(1, MapKind::Computed, &f("price_144d_sma")),
+            price_144d_sma_ratio: RatioDataset::import(&path_dataset, "price_144d_sma", config)?,
+            price_200w_sma: BiMap::new_bin(1, MapKind::Computed, &f("price_200w_sma")),
+            price_200w_sma_ratio: RatioDataset::import(&path_dataset, "price_200w_sma", config)?,
+            price_1d_total_return: DateMap::new_bin(
+                1,
+                MapKind::Computed,
+                &f("price_1d_total_return"),
+            ),
+            price_1m_total_return: DateMap::new_bin(
+                1,
+                MapKind::Computed,
+                &f("price_1m_total_return"),
+            ),
+            price_6m_total_return: DateMap::new_bin(
+                1,
+                MapKind::Computed,
+                &f("price_6m_total_return"),
+            ),
+            price_1y_total_return: DateMap::new_bin(
+                1,
+                MapKind::Computed,
+                &f("price_1y_total_return"),
+            ),
+            price_2y_total_return: DateMap::new_bin(
+                1,
+                MapKind::Computed,
+                &f("price_2y_total_return"),
+            ),
+            price_3y_total_return: DateMap::new_bin(
+                1,
+                MapKind::Computed,
+                &f("price_3y_total_return"),
+            ),
+            price_4y_total_return: DateMap::new_bin(
+                1,
+                MapKind::Computed,
+                &f("price_4y_total_return"),
+            ),
+            price_6y_total_return: DateMap::new_bin(
+                1,
+                MapKind::Computed,
+                &f("price_6y_total_return"),
+            ),
+            price_8y_total_return: DateMap::new_bin(
+                1,
+                MapKind::Computed,
+                &f("price_8y_total_return"),
+            ),
+            price_10y_total_return: DateMap::new_bin(
+                1,
+                MapKind::Computed,
+                &f("price_10y_total_return"),
+            ),
+            price_4y_compound_return: DateMap::new_bin(
+                1,
+                MapKind::Computed,
+                &f("price_4y_compound_return"),
+            ),
+            all_time_high: BiMap::new_bin(1, MapKind::Computed, &f("all_time_high")),
+            all_time_high_date: DateMap::new_bin(1, MapKind::Computed, &f("all_time_high_date")),
+            days_since_all_time_high: DateMap::new_bin(
+                1,
+                MapKind::Computed,
+                &f("days_since_all_time_high"),
+            ),
+            max_days_between_all_time_highs: DateMap::new_bin(
+                1,
+                MapKind::Computed,
+                &f("max_days_between_all_time_highs"),
+            ),
+            max_years_between_all_time_highs: DateMap::new_bin(
+                2,
+                MapKind::Computed,
+                &f("max_years_between_all_time_highs"),
+            ),
+            market_price_to_all_time_high_ratio: BiMap::new_bin(
+                1,
+                MapKind::Computed,
+                &f("market_price_to_all_time_high_ratio"),
+            ),
+            drawdown: BiMap::new_bin(1, MapKind::Computed, &f("drawdown")),
+            sats_per_dollar: BiMap::new_bin(1, MapKind::Computed, &f("sats_per_dollar")),
+        };
+
+        s.min_initial_states
+            .consume(MinInitialStates::compute_from_dataset(&s, config));
+
+        Ok(s)
+    }
+
+    pub fn compute(&mut self, compute_data: &ComputeData, circulating_supply: &mut BiMap<f64>) {
+        let &ComputeData { dates, heights, .. } = compute_data;
+
+        self.open
+            .multi_insert_simple_transform(heights, dates, &mut self.ohlc, &|ohlc| ohlc.open);
+
+        self.high
+            .multi_insert_simple_transform(heights, dates, &mut self.ohlc, &|ohlc| ohlc.high);
+
+        self.low
+            .multi_insert_simple_transform(heights, dates, &mut self.ohlc, &|ohlc| ohlc.low);
+
+        self.close
+            .multi_insert_simple_transform(heights, dates, &mut self.ohlc, &|ohlc| ohlc.close);
+
+        self.market_cap
+            .multi_insert_multiply(heights, dates, &mut self.close, circulating_supply);
+
+        self.price_1w_sma.multi_insert_simple_average(
+            heights,
+            dates,
+            &mut self.close,
+            ONE_WEEK_IN_DAYS,
+        );
+
+        self.price_1m_sma.multi_insert_simple_average(
+            heights,
+            dates,
+            &mut self.close,
+            ONE_MONTH_IN_DAYS,
+        );
+
+        self.price_1y_sma.multi_insert_simple_average(
+            heights,
+            dates,
+            &mut self.close,
+            ONE_YEAR_IN_DAYS,
+        );
+
+        self.price_2y_sma.multi_insert_simple_average(
+            heights,
+            dates,
+            &mut self.close,
+            2 * ONE_YEAR_IN_DAYS,
+        );
+
+        self.price_4y_sma.multi_insert_simple_average(
+            heights,
+            dates,
+            &mut self.close,
+            4 * ONE_YEAR_IN_DAYS,
+        );
+
+        self.price_8d_sma
+            .multi_insert_simple_average(heights, dates, &mut self.close, 8);
+
+        self.price_13d_sma
+            .multi_insert_simple_average(heights, dates, &mut self.close, 13);
+
+        self.price_21d_sma
+            .multi_insert_simple_average(heights, dates, &mut self.close, 21);
+
+        self.price_34d_sma
+            .multi_insert_simple_average(heights, dates, &mut self.close, 34);
+
+        self.price_55d_sma
+            .multi_insert_simple_average(heights, dates, &mut self.close, 55);
+
+        self.price_89d_sma
+            .multi_insert_simple_average(heights, dates, &mut self.close, 89);
+
+        self.price_144d_sma
+            .multi_insert_simple_average(heights, dates, &mut self.close, 144);
+
+        self.price_200w_sma.multi_insert_simple_average(
+            heights,
+            dates,
+            &mut self.close,
+            200 * ONE_WEEK_IN_DAYS,
+        );
+
+        self.price_1d_total_return
+            .multi_insert_percentage_change(dates, &mut self.close.date, 1);
+        self.price_1m_total_return.multi_insert_percentage_change(
+            dates,
+            &mut self.close.date,
+            ONE_MONTH_IN_DAYS,
+        );
+        self.price_6m_total_return.multi_insert_percentage_change(
+            dates,
+            &mut self.close.date,
+            6 * ONE_MONTH_IN_DAYS,
+        );
+        self.price_1y_total_return.multi_insert_percentage_change(
+            dates,
+            &mut self.close.date,
+            ONE_YEAR_IN_DAYS,
+        );
+        self.price_2y_total_return.multi_insert_percentage_change(
+            dates,
+            &mut self.close.date,
+            2 * ONE_YEAR_IN_DAYS,
+        );
+        self.price_3y_total_return.multi_insert_percentage_change(
+            dates,
+            &mut self.close.date,
+            3 * ONE_YEAR_IN_DAYS,
+        );
+        self.price_4y_total_return.multi_insert_percentage_change(
+            dates,
+            &mut self.close.date,
+            4 * ONE_YEAR_IN_DAYS,
+        );
+        self.price_6y_total_return.multi_insert_percentage_change(
+            dates,
+            &mut self.close.date,
+            6 * ONE_YEAR_IN_DAYS,
+        );
+        self.price_8y_total_return.multi_insert_percentage_change(
+            dates,
+            &mut self.close.date,
+            8 * ONE_YEAR_IN_DAYS,
+        );
+        self.price_10y_total_return.multi_insert_percentage_change(
+            dates,
+            &mut self.close.date,
+            10 * ONE_YEAR_IN_DAYS,
+        );
+
+        self.price_4y_compound_return
+            .multi_insert_complex_transform(
+                dates,
+                &mut self.close.date,
+                |(last_value, date, closes, _)| {
+                    let previous_value = date
+                        .checked_sub_days(Days::new(4 * ONE_YEAR_IN_DAYS as u64))
+                        .and_then(|date| closes.get_or_import(&Date::wrap(date)))
+                        .unwrap_or_default();
+
+                    (((last_value / previous_value).powf(1.0 / 4.0)) - 1.0) * 100.0
+                },
+            );
+
+        self.price_1w_sma_ratio
+            .compute(compute_data, &mut self.close, &mut self.price_1w_sma);
+        self.price_1m_sma_ratio
+            .compute(compute_data, &mut self.close, &mut self.price_1m_sma);
+        self.price_1y_sma_ratio
+            .compute(compute_data, &mut self.close, &mut self.price_1y_sma);
+        self.price_2y_sma_ratio
+            .compute(compute_data, &mut self.close, &mut self.price_2y_sma);
+        self.price_4y_sma_ratio
+            .compute(compute_data, &mut self.close, &mut self.price_4y_sma);
+        self.price_8d_sma_ratio
+            .compute(compute_data, &mut self.close, &mut self.price_8d_sma);
+        self.price_13d_sma_ratio
+            .compute(compute_data, &mut self.close, &mut self.price_13d_sma);
+        self.price_21d_sma_ratio
+            .compute(compute_data, &mut self.close, &mut self.price_21d_sma);
+        self.price_34d_sma_ratio
+            .compute(compute_data, &mut self.close, &mut self.price_34d_sma);
+        self.price_55d_sma_ratio
+            .compute(compute_data, &mut self.close, &mut self.price_55d_sma);
+        self.price_89d_sma_ratio
+            .compute(compute_data, &mut self.close, &mut self.price_89d_sma);
+        self.price_144d_sma_ratio
+            .compute(compute_data, &mut self.close, &mut self.price_144d_sma);
+        self.price_200w_sma_ratio
+            .compute(compute_data, &mut self.close, &mut self.price_200w_sma);
+
+        self.all_time_high
+            .multi_insert_max(heights, dates, &mut self.high);
+
+        self.market_price_to_all_time_high_ratio
+            .multi_insert_percentage(heights, dates, &mut self.close, &mut self.all_time_high);
+
+        self.all_time_high_date.multi_insert_complex_transform(
+            dates,
+            &mut self.all_time_high.date,
+            |(value, date, _, map)| {
+                let high = self.high.date.get_or_import(date).unwrap();
+                let is_ath = high == value;
+
+                if is_ath {
+                    *date
+                } else {
+                    let previous_date = date.checked_sub(1).unwrap();
+                    *map.get_or_import(&previous_date).as_ref().unwrap_or(date)
+                }
+            },
+        );
+
+        self.days_since_all_time_high.multi_insert_simple_transform(
+            dates,
+            &mut self.all_time_high_date,
+            |value, key| key.difference_in_days_between(value),
+        );
+
+        self.max_days_between_all_time_highs
+            .multi_insert_max(dates, &mut self.days_since_all_time_high);
+
+        self.max_years_between_all_time_highs
+            .multi_insert_simple_transform(
+                dates,
+                &mut self.max_days_between_all_time_highs,
+                |days, _| (days as f64 / ONE_YEAR_IN_DAYS as f64) as f32,
+            );
+
+        self.drawdown.multi_insert_simple_transform(
+            heights,
+            dates,
+            &mut self.market_price_to_all_time_high_ratio,
+            &|v| -(100.0 - v),
+        );
+
+        self.sats_per_dollar.multi_insert_simple_transform(
+            heights,
+            dates,
+            &mut self.close,
+            &|price| Amount::ONE_BTC_F32 / price,
+        );
+    }
+
+    pub fn get_date_ohlc(&mut self, date: Date) -> color_eyre::Result<OHLC> {
+        if self.ohlc.date.is_key_safe(date) {
+            Ok(self.ohlc.date.get_or_import(&date).unwrap().to_owned())
+        } else {
+            let ohlc = self
+                .get_from_daily_kraken(&date)
+                .or_else(|_| self.get_from_daily_binance(&date))
+                .or_else(|_| self.get_from_date_kibo(&date))?;
+
+            self.ohlc.date.insert(date, ohlc);
+
+            Ok(ohlc)
+        }
+    }
+
+    fn get_from_date_kibo(&mut self, date: &Date) -> color_eyre::Result<OHLC> {
+        let chunk_id = date.to_chunk_id();
+
+        #[allow(clippy::map_entry)]
+        if !self.kibo_by_date.contains_key(&chunk_id)
+            || self
+                .kibo_by_date
+                .get(&chunk_id)
+                .unwrap()
+                .last_key_value()
+                .unwrap()
+                .0
+                < date
+        {
+            self.kibo_by_date
+                .insert(chunk_id, Kibo::fetch_date_prices(chunk_id)?);
+        }
+
+        self.kibo_by_date
+            .get(&chunk_id)
+            .unwrap()
+            .get(date)
+            .cloned()
+            .ok_or(Error::msg("Couldn't find date in satonomics"))
+    }
+
+    fn get_from_daily_kraken(&mut self, date: &Date) -> color_eyre::Result<OHLC> {
+        if self.kraken_daily.is_none()
+            || self
+                .kraken_daily
+                .as_ref()
+                .unwrap()
+                .last_key_value()
+                .unwrap()
+                .0
+                < date
+        {
+            self.kraken_daily.replace(Kraken::fetch_daily_prices()?);
+        }
+
+        self.kraken_daily
+            .as_ref()
+            .unwrap()
+            .get(date)
+            .cloned()
+            .ok_or(Error::msg("Couldn't find date"))
+    }
+
+    fn get_from_daily_binance(&mut self, date: &Date) -> color_eyre::Result<OHLC> {
+        if self.binance_daily.is_none()
+            || self
+                .binance_daily
+                .as_ref()
+                .unwrap()
+                .last_key_value()
+                .unwrap()
+                .0
+                < date
+        {
+            self.binance_daily.replace(Binance::fetch_daily_prices()?);
+        }
+
+        self.binance_daily
+            .as_ref()
+            .unwrap()
+            .get(date)
+            .cloned()
+            .ok_or(Error::msg("Couldn't find date"))
+    }
+
+    pub fn get_height_ohlc(
+        &mut self,
+        height: Height,
+        timestamp: Timestamp,
+        previous_timestamp: Option<Timestamp>,
+        config: &Config,
+    ) -> color_eyre::Result<OHLC> {
+        if let Some(ohlc) = self.ohlc.height.get_or_import(&height) {
+            return Ok(ohlc);
+        }
+
+        let timestamp = timestamp.to_floored_seconds();
+
+        if previous_timestamp.is_none() && !height.is_first() {
+            panic!("Shouldn't be possible");
+        }
+
+        let previous_timestamp = previous_timestamp.map(|t| t.to_floored_seconds());
+
+        let ohlc = self
+            .get_from_1mn_kraken(timestamp, previous_timestamp)
+            .unwrap_or_else(|_| {
+                self.get_from_1mn_binance(timestamp, previous_timestamp)
+                    .unwrap_or_else(|_| {
+                        self.get_from_har_binance(timestamp, previous_timestamp, config)
+                            .unwrap_or_else(|_| {
+                                self.get_from_height_kibo(&height).unwrap_or_else(|_| {
+                                    let date = timestamp.to_date();
+
+                                    panic!(
+                                        "Can't find the price for: height: {height} - date: {date}
+1mn APIs are limited to the last 16 hours for Binance's and the last 10 hours for Kraken's
+How to fix this:
+1. Go to https://www.binance.com/en/trade/BTC_USDT?type=spot
+2. Select 1mn interval
+3. Open the inspector/dev tools
+4. Go to the Network Tab
+5. Filter URLs by 'uiKlines'
+6. Go back to the chart and scroll until you pass the date mentioned few lines ago
+7. Go back to the dev tools
+8. Export to a har file (if there is no explicit button, click on the cog button)
+9. Move the file to 'parser/imports/binance.har'
+"
+                                    )
+                                })
+                            })
+                    })
+            });
+
+        self.ohlc.height.insert(height, ohlc);
+
+        Ok(ohlc)
+    }
+
+    fn get_from_height_kibo(&mut self, height: &Height) -> color_eyre::Result<OHLC> {
+        let chunk_id = height.to_chunk_id();
+
+        #[allow(clippy::map_entry)]
+        if !self.kibo_by_height.contains_key(&chunk_id)
+            || ((chunk_id.to_usize() + self.kibo_by_height.get(&chunk_id).unwrap().len())
+                <= height.to_usize())
+        {
+            self.kibo_by_height
+                .insert(chunk_id, Kibo::fetch_height_prices(chunk_id)?);
+        }
+
+        self.kibo_by_height
+            .get(&chunk_id)
+            .unwrap()
+            .get(height.to_serialized_key().to_usize())
+            .cloned()
+            .ok_or(Error::msg("Couldn't find height in kibo"))
+    }
+
+    fn get_from_1mn_kraken(
+        &mut self,
+        timestamp: Timestamp,
+        previous_timestamp: Option<Timestamp>,
+    ) -> color_eyre::Result<OHLC> {
+        if self.kraken_1mn.is_none()
+            || self
+                .kraken_1mn
+                .as_ref()
+                .unwrap()
+                .last_key_value()
+                .unwrap()
+                .0
+                <= &timestamp
+        {
+            self.kraken_1mn.replace(Kraken::fetch_1mn_prices()?);
+        }
+
+        Self::find_height_ohlc(&self.kraken_1mn, timestamp, previous_timestamp, "kraken 1m")
+    }
+
+    fn get_from_1mn_binance(
+        &mut self,
+        timestamp: Timestamp,
+        previous_timestamp: Option<Timestamp>,
+    ) -> color_eyre::Result<OHLC> {
+        if self.binance_1mn.is_none()
+            || self
+                .binance_1mn
+                .as_ref()
+                .unwrap()
+                .last_key_value()
+                .unwrap()
+                .0
+                <= &timestamp
+        {
+            self.binance_1mn.replace(Binance::fetch_1mn_prices()?);
+        }
+
+        Self::find_height_ohlc(
+            &self.binance_1mn,
+            timestamp,
+            previous_timestamp,
+            "binance 1m",
+        )
+    }
+
+    fn get_from_har_binance(
+        &mut self,
+        timestamp: Timestamp,
+        previous_timestamp: Option<Timestamp>,
+        config: &Config,
+    ) -> color_eyre::Result<OHLC> {
+        if self.binance_har.is_none() {
+            self.binance_har
+                .replace(Binance::read_har_file(config).unwrap_or_default());
+        }
+
+        Self::find_height_ohlc(
+            &self.binance_har,
+            timestamp,
+            previous_timestamp,
+            "binance har",
+        )
+    }
+
+    fn find_height_ohlc(
+        tree: &Option<BTreeMap<u32, OHLC>>,
+        timestamp: Timestamp,
+        previous_timestamp: Option<Timestamp>,
+        name: &str,
+    ) -> color_eyre::Result<OHLC> {
+        let tree = tree.as_ref().unwrap();
+
+        let err = Error::msg(format!("Couldn't find timestamp in {name}"));
+
+        let previous_ohlc = previous_timestamp
+            .map_or(Some(OHLC::default()), |previous_timestamp| {
+                tree.get(&previous_timestamp).cloned()
+            });
+
+        let last_ohlc = tree.get(&timestamp);
+
+        if previous_ohlc.is_none() || last_ohlc.is_none() {
+            return Err(err);
+        }
+
+        let previous_ohlc = previous_ohlc.unwrap();
+
+        let mut final_ohlc = OHLC {
+            open: previous_ohlc.close,
+            high: previous_ohlc.close,
+            low: previous_ohlc.close,
+            close: previous_ohlc.close,
+        };
+
+        let start = previous_timestamp.unwrap_or_default();
+        let end = timestamp;
+
+        // Otherwise it's a re-org
+        if start < end {
+            tree.range(&*start..=&*end).skip(1).for_each(|(_, ohlc)| {
+                if ohlc.high > final_ohlc.high {
+                    final_ohlc.high = ohlc.high
+                }
+
+                if ohlc.low < final_ohlc.low {
+                    final_ohlc.low = ohlc.low
+                }
+
+                final_ohlc.close = ohlc.close;
+            });
+        }
+
+        Ok(final_ohlc)
+    }
+}
+
+impl AnyDataset for PriceDatasets {
+    fn get_min_initial_states(&self) -> &MinInitialStates {
+        &self.min_initial_states
+    }
+}
diff --git a/pricer/src/price/binance.rs b/pricer/src/price/binance.rs
new file mode 100644
index 000000000..0967ad1e0
--- /dev/null
+++ b/pricer/src/price/binance.rs
@@ -0,0 +1,213 @@
+#![allow(dead_code)]
+
+use std::{collections::BTreeMap, fs};
+
+use color_eyre::eyre::ContextCompat;
+use itertools::Itertools;
+use log::info;
+use serde_json::Value;
+
+use crate::{
+    io::Json,
+    structs::{Config, Date, Timestamp, OHLC},
+    utils::retry,
+};
+
+pub struct Binance;
+
+impl Binance {
+    pub fn read_har_file(config: &Config) -> color_eyre::Result<BTreeMap<u32, OHLC>> {
+        info!("binance: read har file");
+
+        let path = config.path_inputs();
+
+        fs::create_dir_all(&path)?;
+
+        let path_binance_har = path.join("binance.har");
+
+        let json: BTreeMap<String, Value> = Json::import(&path_binance_har).unwrap_or_default();
+
+        Ok(json
+            .get("log")
+            .context("Expect object to have log attribute")?
+            .as_object()
+            .context("Expect to be an object")?
+            .get("entries")
+            .context("Expect object to have entries")?
+            .as_array()
+            .context("Expect to be an array")?
+            .iter()
+            .filter(|entry| {
+                entry
+                    .as_object()
+                    .unwrap()
+                    .get("request")
+                    .unwrap()
+                    .as_object()
+                    .unwrap()
+                    .get("url")
+                    .unwrap()
+                    .as_str()
+                    .unwrap()
+                    .contains("/uiKlines")
+            })
+            .flat_map(|entry| {
+                let response = entry
+                    .as_object()
+                    .unwrap()
+                    .get("response")
+                    .unwrap()
+                    .as_object()
+                    .unwrap();
+
+                let content = response.get("content").unwrap().as_object().unwrap();
+
+                let text = content.get("text");
+
+                if text.is_none() {
+                    return vec![];
+                }
+
+                let text = text.unwrap().as_str().unwrap();
+
+                let arrays: Value = serde_json::from_str(text).unwrap();
+
+                arrays
+                    .as_array()
+                    .unwrap()
+                    .iter()
+                    .map(|array| {
+                        let array = array.as_array().unwrap();
+
+                        let timestamp = (array.first().unwrap().as_u64().unwrap() / 1000) as u32;
+
+                        let get_f32 = |index: usize| {
+                            array
+                                .get(index)
+                                .unwrap()
+                                .as_str()
+                                .unwrap()
+                                .parse::<f32>()
+                                .unwrap()
+                        };
+
+                        (
+                            timestamp,
+                            OHLC {
+                                open: get_f32(1),
+                                high: get_f32(2),
+                                low: get_f32(3),
+                                close: get_f32(4),
+                            },
+                        )
+                    })
+                    .collect_vec()
+            })
+            .collect::<BTreeMap<_, _>>())
+    }
+
+    pub fn fetch_1mn_prices() -> color_eyre::Result<BTreeMap<u32, OHLC>> {
+        info!("binance: fetch 1mn");
+
+        retry(
+            |_| {
+                let body: Value = reqwest::blocking::get(
+                    "https://api.binance.com/api/v3/uiKlines?symbol=BTCUSDT&interval=1m&limit=1000",
+                )?
+                .json()?;
+
+                Ok(body
+                    .as_array()
+                    .context("Expect to be an array")?
+                    .iter()
+                    .map(|value| -> color_eyre::Result<_> {
+                        // [timestamp, open, high, low, close, volume, ...]
+                        let array = value.as_array().context("Expect to be array")?;
+
+                        let timestamp = (array
+                            .first()
+                            .context("Expect to have first")?
+                            .as_u64()
+                            .context("Expect to be convertible to u64")?
+                            / 1_000) as u32;
+
+                        let get_f32 = |index: usize| -> color_eyre::Result<f32> {
+                            Ok(array
+                                .get(index)
+                                .context("Expect to have index")?
+                                .as_str()
+                                .context("Expect to have &str")?
+                                .parse::<f32>()?)
+                        };
+
+                        Ok((
+                            timestamp,
+                            OHLC {
+                                open: get_f32(1)?,
+                                high: get_f32(2)?,
+                                low: get_f32(3)?,
+                                close: get_f32(4)?,
+                            },
+                        ))
+                    })
+                    .collect::<Result<BTreeMap<_, _>, _>>()?)
+            },
+            30,
+            10,
+        )
+    }
+
+    pub fn fetch_daily_prices() -> color_eyre::Result<BTreeMap<Date, OHLC>> {
+        info!("binance: fetch 1d");
+
+        retry(
+            |_| {
+                let body: Value = reqwest::blocking::get(
+                    "https://api.binance.com/api/v3/uiKlines?symbol=BTCUSDT&interval=1d",
+                )?
+                .json()?;
+
+                Ok(body
+                    .as_array()
+                    .context("Expect to be an array")?
+                    .iter()
+                    .map(|value| -> color_eyre::Result<_> {
+                        // [timestamp, open, high, low, close, volume, ...]
+                        let array = value.as_array().context("Expect to be array")?;
+
+                        let date = Timestamp::from(
+                            (array
+                                .first()
+                                .context("Expect to have first")?
+                                .as_u64()
+                                .context("Expect to be convertible to u64")?
+                                / 1_000) as u32,
+                        )
+                        .to_date();
+
+                        let get_f32 = |index: usize| -> color_eyre::Result<f32> {
+                            Ok(array
+                                .get(index)
+                                .context("Expect to have index")?
+                                .as_str()
+                                .context("Expect to have &str")?
+                                .parse::<f32>()?)
+                        };
+
+                        Ok((
+                            date,
+                            OHLC {
+                                open: get_f32(1)?,
+                                high: get_f32(2)?,
+                                low: get_f32(3)?,
+                                close: get_f32(4)?,
+                            },
+                        ))
+                    })
+                    .collect::<Result<BTreeMap<_, _>, _>>()?)
+            },
+            30,
+            10,
+        )
+    }
+}
diff --git a/pricer/src/price/kibo.rs b/pricer/src/price/kibo.rs
new file mode 100644
index 000000000..858b7d7ac
--- /dev/null
+++ b/pricer/src/price/kibo.rs
@@ -0,0 +1,118 @@
+use std::{collections::BTreeMap, str::FromStr};
+
+use chrono::NaiveDate;
+use color_eyre::eyre::ContextCompat;
+use log::info;
+use serde_json::Value;
+
+use crate::{
+    structs::{Date, DateMapChunkId, HeightMapChunkId, MapChunkId, OHLC},
+    utils::retry,
+};
+
+pub struct Kibo;
+
+const KIBO_OFFICIAL_URL: &str = "https://kibo.money/api";
+const KIBO_OFFICIAL_BACKUP_URL: &str = "https://backup.kibo.money/api";
+
+const RETRIES: usize = 10;
+
+impl Kibo {
+    fn get_base_url(try_index: usize) -> &'static str {
+        if try_index < RETRIES / 2 {
+            KIBO_OFFICIAL_URL
+        } else {
+            KIBO_OFFICIAL_BACKUP_URL
+        }
+    }
+
+    pub fn fetch_height_prices(chunk_id: HeightMapChunkId) -> color_eyre::Result<Vec<OHLC>> {
+        info!("kibo: fetch height prices");
+
+        retry(
+            |try_index| {
+                let base_url = Self::get_base_url(try_index);
+
+                let body: Value = reqwest::blocking::get(format!(
+                    "{base_url}/height-to-price?chunk={}",
+                    chunk_id.to_usize()
+                ))?
+                .json()?;
+
+                let vec = body
+                    .as_object()
+                    .context("Expect to be an object")?
+                    .get("dataset")
+                    .context("Expect object to have dataset")?
+                    .as_object()
+                    .context("Expect to be an object")?
+                    .get("map")
+                    .context("Expect to have map")?
+                    .as_array()
+                    .context("Expect to be an array")?
+                    .iter()
+                    .map(Self::value_to_ohlc)
+                    .collect::<Result<Vec<_>, _>>()?;
+
+                Ok(vec)
+            },
+            30,
+            RETRIES,
+        )
+    }
+
+    pub fn fetch_date_prices(chunk_id: DateMapChunkId) -> color_eyre::Result<BTreeMap<Date, OHLC>> {
+        info!("kibo: fetch date prices");
+
+        retry(
+            |try_index| {
+                let base_url = Self::get_base_url(try_index);
+
+                let body: Value = reqwest::blocking::get(format!(
+                    "{base_url}/date-to-price?chunk={}",
+                    chunk_id.to_usize()
+                ))?
+                .json()?;
+
+                Ok(body
+                    .as_object()
+                    .context("Expect to be an object")?
+                    .get("dataset")
+                    .context("Expect object to have dataset")?
+                    .as_object()
+                    .context("Expect to be an object")?
+                    .get("map")
+                    .context("Expect to have map")?
+                    .as_object()
+                    .context("Expect to be an object")?
+                    .iter()
+                    .map(|(serialized_date, value)| -> color_eyre::Result<_> {
+                        let date = Date::wrap(NaiveDate::from_str(serialized_date)?);
+                        Ok((date, Self::value_to_ohlc(value)?))
+                    })
+                    .collect::<Result<BTreeMap<_, _>, _>>()?)
+            },
+            30,
+            RETRIES,
+        )
+    }
+
+    fn value_to_ohlc(value: &Value) -> color_eyre::Result<OHLC> {
+        let ohlc = value.as_object().context("Expect as_object to work")?;
+
+        let get_value = |key: &str| -> color_eyre::Result<f32> {
+            Ok(ohlc
+                .get(key)
+                .context("Expect get key to work")?
+                .as_f64()
+                .context("Expect as_f64 to work")? as f32)
+        };
+
+        Ok(OHLC {
+            open: get_value("open")?,
+            high: get_value("high")?,
+            low: get_value("low")?,
+            close: get_value("close")?,
+        })
+    }
+}
diff --git a/pricer/src/price/kraken.rs b/pricer/src/price/kraken.rs
new file mode 100644
index 000000000..99566fee0
--- /dev/null
+++ b/pricer/src/price/kraken.rs
@@ -0,0 +1,133 @@
+use std::collections::BTreeMap;
+
+use color_eyre::eyre::ContextCompat;
+use log::info;
+use serde_json::Value;
+
+use crate::{
+    structs::{Date, Timestamp, OHLC},
+    utils::retry,
+};
+
+pub struct Kraken;
+
+impl Kraken {
+    pub fn fetch_1mn_prices() -> color_eyre::Result<BTreeMap<u32, OHLC>> {
+        info!("kraken: fetch 1mn");
+
+        retry(
+            |_| {
+                let body: Value = reqwest::blocking::get(
+                    "https://api.kraken.com/0/public/OHLC?pair=XBTUSD&interval=1",
+                )?
+                .json()?;
+
+                Ok(body
+                    .as_object()
+                    .context("Expect to be an object")?
+                    .get("result")
+                    .context("Expect object to have result")?
+                    .as_object()
+                    .context("Expect to be an object")?
+                    .get("XXBTZUSD")
+                    .context("Expect to have XXBTZUSD")?
+                    .as_array()
+                    .context("Expect to be an array")?
+                    .iter()
+                    .map(|value| -> color_eyre::Result<_> {
+                        let array = value.as_array().context("Expect as_array to work")?;
+
+                        let timestamp = array
+                            .first()
+                            .context("Expect first to work")?
+                            .as_u64()
+                            .expect("Expect as_u64 to work")
+                            as u32;
+
+                        let get_f32 = |index: usize| -> color_eyre::Result<f32> {
+                            Ok(array
+                                .get(index)
+                                .context("Expect get index to work")?
+                                .as_str()
+                                .context("Expect as_str to work")?
+                                .parse::<f32>()?)
+                        };
+
+                        Ok((
+                            timestamp,
+                            OHLC {
+                                open: get_f32(1)?,
+                                high: get_f32(2)?,
+                                low: get_f32(3)?,
+                                close: get_f32(4)?,
+                            },
+                        ))
+                    })
+                    .collect::<Result<BTreeMap<_, _>, _>>()?)
+            },
+            30,
+            10,
+        )
+    }
+
+    pub fn fetch_daily_prices() -> color_eyre::Result<BTreeMap<Date, OHLC>> {
+        info!("fetch kraken daily");
+
+        retry(
+            |_| {
+                let body: Value = reqwest::blocking::get(
+                    "https://api.kraken.com/0/public/OHLC?pair=XBTUSD&interval=1440",
+                )?
+                .json()?;
+
+                Ok(body
+                    .as_object()
+                    .context("Expect to be an object")?
+                    .get("result")
+                    .context("Expect object to have result")?
+                    .as_object()
+                    .context("Expect to be an object")?
+                    .get("XXBTZUSD")
+                    .context("Expect to have XXBTZUSD")?
+                    .as_array()
+                    .context("Expect to be an array")?
+                    .iter()
+                    .map(|value| -> color_eyre::Result<_> {
+                        let array = value.as_array().context("Expect as_array to work")?;
+
+                        let date = Timestamp::from(
+                            array
+                                .first()
+                                .context("Expect first to work")?
+                                .as_u64()
+                                .context("Expect as_u64 to work")?
+                                as u32,
+                        )
+                        .to_date();
+
+                        let get_f32 = |index: usize| -> color_eyre::Result<f32> {
+                            Ok(array
+                                .get(index)
+                                .context("Expect get index to work")?
+                                .as_str()
+                                .context("Expect as_str to work")?
+                                .parse::<f32>()?)
+                        };
+
+                        Ok((
+                            date,
+                            OHLC {
+                                open: get_f32(1)?,
+                                high: get_f32(2)?,
+                                low: get_f32(3)?,
+                                close: get_f32(4)?,
+                            },
+                        ))
+                    })
+                    .collect::<Result<BTreeMap<_, _>, _>>()?)
+            },
+            30,
+            10,
+        )
+    }
+}
diff --git a/pricer/src/price/mod.rs b/pricer/src/price/mod.rs
new file mode 100644
index 000000000..41cea4435
--- /dev/null
+++ b/pricer/src/price/mod.rs
@@ -0,0 +1,7 @@
+mod binance;
+mod kibo;
+mod kraken;
+
+pub use binance::*;
+pub use kibo::*;
+pub use kraken::*;
diff --git a/python/example.py b/python/example.py
new file mode 100644
index 000000000..a07c64a32
--- /dev/null
+++ b/python/example.py
@@ -0,0 +1,12 @@
+# Here's an example on how to parse the output from the indexer
+# We're aiming to read the first 21 values from the height_to_timestamp vec
+
+import sys
+import datetime
+
+with open("../_outputs/indexes/vecs/height_to_timestamp/vec", "rb") as file:
+    for x in range(0, 21):
+        bytes = file.read(4) # Need to check the rust side to find the size, at least for now
+        number = int.from_bytes(bytes, sys.byteorder)
+        date = datetime.date.fromtimestamp(number)
+        print(date)

From 443a32dc81c38165b6ac8ca6e2a6e9e1df1e1678 Mon Sep 17 00:00:00 2001
From: nym21 <expat-epochs0i@icloud.com>
Date: Thu, 13 Feb 2025 11:10:34 +0100
Subject: [PATCH 48/63] server: cleanup

---
 pricer/src/retry.rs                           |  21 +++
 server/src/api/explorer/mod.rs                |   0
 server/src/api/mod.rs                         | 166 +-----------------
 server/src/api/structs/mod.rs                 |  15 --
 server/src/api/{structs => vecs}/format.rs    |   0
 server/src/api/vecs/id_to_i_to_vec.rs         |  38 ++++
 server/src/api/{structs => vecs}/index.rs     |   0
 server/src/api/vecs/mod.rs                    | 156 ++++++++++++++++
 server/src/api/vecs/query.rs                  |  10 ++
 .../src/{website/handlers => files}/file.rs   |   2 +-
 .../src/{website/handlers => files}/minify.rs |   0
 server/src/{website => files}/mod.rs          |  13 +-
 server/src/lib.rs                             |  45 +----
 server/src/website/handlers/mod.rs            |   5 -
 src/io/binary.rs                              | 139 ---------------
 src/io/json.rs                                |  56 ------
 src/io/mod.rs                                 |   7 -
 src/io/serialization.rs                       | 128 --------------
 storable_vec/src/lib.rs                       |   2 +-
 19 files changed, 244 insertions(+), 559 deletions(-)
 create mode 100644 pricer/src/retry.rs
 create mode 100644 server/src/api/explorer/mod.rs
 delete mode 100644 server/src/api/structs/mod.rs
 rename server/src/api/{structs => vecs}/format.rs (100%)
 create mode 100644 server/src/api/vecs/id_to_i_to_vec.rs
 rename server/src/api/{structs => vecs}/index.rs (100%)
 create mode 100644 server/src/api/vecs/mod.rs
 create mode 100644 server/src/api/vecs/query.rs
 rename server/src/{website/handlers => files}/file.rs (99%)
 rename server/src/{website/handlers => files}/minify.rs (100%)
 rename server/src/{website => files}/mod.rs (64%)
 delete mode 100644 server/src/website/handlers/mod.rs
 delete mode 100644 src/io/binary.rs
 delete mode 100644 src/io/json.rs
 delete mode 100644 src/io/mod.rs
 delete mode 100644 src/io/serialization.rs

diff --git a/pricer/src/retry.rs b/pricer/src/retry.rs
new file mode 100644
index 000000000..f200ced47
--- /dev/null
+++ b/pricer/src/retry.rs
@@ -0,0 +1,21 @@
+use std::{thread::sleep, time::Duration};
+
+pub fn retry<T>(
+    function: impl Fn(usize) -> color_eyre::Result<T>,
+    sleep_in_s: u64,
+    retries: usize,
+) -> color_eyre::Result<T> {
+    let mut i = 0;
+
+    loop {
+        let res = function(i);
+
+        if i == retries || res.is_ok() {
+            return res;
+        } else {
+            sleep(Duration::from_secs(sleep_in_s));
+        }
+
+        i += 1;
+    }
+}
diff --git a/server/src/api/explorer/mod.rs b/server/src/api/explorer/mod.rs
new file mode 100644
index 000000000..e69de29bb
diff --git a/server/src/api/mod.rs b/server/src/api/mod.rs
index a3911725f..4f9025ec4 100644
--- a/server/src/api/mod.rs
+++ b/server/src/api/mod.rs
@@ -1,26 +1,11 @@
-use std::time::Instant;
-
-use axum::{
-    extract::{Query, State},
-    http::HeaderMap,
-    response::{IntoResponse, Response},
-    routing::get,
-    Json, Router,
-};
-use color_eyre::eyre::eyre;
-use reqwest::StatusCode;
-use serde::Deserialize;
-use serde_json::Value;
-use structs::{Format, Index};
-
-use crate::{log_result, traits::HeaderMapExtended};
+use axum::{routing::get, Router};
 
 use super::AppState;
 
-// mod handlers;
-pub mod structs;
+mod explorer;
+mod vecs;
 
-pub const VECS_URL_PREFIX: &str = "/api/vecs";
+pub use vecs::VecIdToIndexToVec;
 
 pub trait ApiRoutes {
     fn add_api_routes(self) -> Self;
@@ -28,147 +13,6 @@ pub trait ApiRoutes {
 
 impl ApiRoutes for Router<AppState> {
     fn add_api_routes(self) -> Self {
-        self.route(VECS_URL_PREFIX, get(handler))
+        self.route("/api/vecs", get(vecs::handler))
     }
 }
-
-#[derive(Debug, Deserialize)]
-pub struct DatasetParams {
-    pub i: String,
-    pub v: String,
-    pub from: Option<i64>,
-    pub to: Option<i64>,
-    pub format: Option<String>,
-}
-
-pub async fn handler(headers: HeaderMap, query: Query<DatasetParams>, State(app_state): State<AppState>) -> Response {
-    let instant = Instant::now();
-
-    let path = format!(
-        "{VECS_URL_PREFIX}?i={}&v={}{}{}",
-        query.i,
-        query.v,
-        query.from.map_or("".to_string(), |from| format!("&from={from}")),
-        query.to.map_or("".to_string(), |to| format!("&to={to}")),
-    );
-
-    match req_to_response_res(headers, query, app_state) {
-        Ok(response) => {
-            log_result(response.status(), &path, instant);
-            response
-        }
-        Err(error) => {
-            let mut response = (StatusCode::INTERNAL_SERVER_ERROR, error.to_string()).into_response();
-            log_result(response.status(), &path, instant);
-            response.headers_mut().insert_cors();
-            response
-        }
-    }
-}
-
-fn req_to_response_res(
-    headers: HeaderMap,
-    Query(DatasetParams { format, from, i, to, v }): Query<DatasetParams>,
-    AppState { vecs, .. }: AppState,
-) -> color_eyre::Result<Response> {
-    let format = Format::try_from(format).ok();
-
-    let indexes = i
-        .to_lowercase()
-        .split(",")
-        .flat_map(|s| Index::try_from(s).ok())
-        .collect::<Vec<_>>();
-
-    if indexes.len() > 1 {
-        return Err(eyre!("Multiple indexes aren't supported"));
-    } else if indexes.is_empty() {
-        return Err(eyre!("Unknown index"));
-    }
-
-    let ids = v
-        .to_lowercase()
-        .split(",")
-        .map(|s| (s.to_owned(), vecs.get(&s.replace("_", "-"))))
-        .filter(|(_, opt)| opt.is_some())
-        .map(|(id, vec)| (id, vec.unwrap()))
-        .collect::<Vec<_>>();
-
-    if ids.is_empty() {
-        return Ok(Json(()).into_response());
-    }
-
-    let values = ids
-        .iter()
-        .flat_map(|(_, i_to_v)| i_to_v.get(indexes.first().unwrap()))
-        .map(|vec| -> storable_vec::Result<Vec<Value>> { vec.collect_range_values(from, to) })
-        .collect::<storable_vec::Result<Vec<_>>>()?;
-
-    if ids.is_empty() {
-        return Ok(Json(()).into_response());
-    }
-
-    let ids_last_i = ids.len() - 1;
-
-    let mut response = match format {
-        Some(Format::CSV) | Some(Format::TSV) => {
-            let delimiter = if format == Some(Format::CSV) { ',' } else { '\t' };
-
-            let mut csv = ids
-                .into_iter()
-                .map(|(id, _)| id)
-                .collect::<Vec<_>>()
-                .join(&delimiter.to_string());
-
-            csv.push('\n');
-
-            let values_len = values.first().unwrap().len();
-
-            (0..values_len).for_each(|i| {
-                let mut line = "".to_string();
-                values.iter().enumerate().for_each(|(id_i, v)| {
-                    line += &v.get(i).unwrap().to_string();
-                    if id_i == ids_last_i {
-                        line.push('\n');
-                    } else {
-                        line.push(delimiter);
-                    }
-                });
-                csv += &line;
-            });
-
-            csv.into_response()
-        }
-        Some(Format::JSON) | None => {
-            if values.len() == 1 {
-                let values = values.first().unwrap();
-                if values.len() == 1 {
-                    let value = values.first().unwrap();
-                    Json(value).into_response()
-                } else {
-                    Json(values).into_response()
-                }
-            } else {
-                Json(values).into_response()
-            }
-        }
-    };
-
-    let headers = response.headers_mut();
-
-    headers.insert_cors();
-    // headers.insert_last_modified(date_modified);
-
-    match format {
-        Some(format) => {
-            headers.insert_content_disposition_attachment();
-            match format {
-                Format::CSV => headers.insert_content_type_text_csv(),
-                Format::TSV => headers.insert_content_type_text_tsv(),
-                Format::JSON => headers.insert_content_type_application_json(),
-            }
-        }
-        _ => headers.insert_content_type_application_json(),
-    };
-
-    Ok(response)
-}
diff --git a/server/src/api/structs/mod.rs b/server/src/api/structs/mod.rs
deleted file mode 100644
index 33cc08128..000000000
--- a/server/src/api/structs/mod.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-// mod chunk_metadata;
-mod format;
-mod index;
-// mod kind;
-// mod range;
-// mod route;
-// mod routes;
-
-// pub use chunk_metadata::*;
-pub use format::*;
-pub use index::*;
-// pub use kind::*;
-// pub use range::*;
-// pub use route::*;
-// pub use routes::*;
diff --git a/server/src/api/structs/format.rs b/server/src/api/vecs/format.rs
similarity index 100%
rename from server/src/api/structs/format.rs
rename to server/src/api/vecs/format.rs
diff --git a/server/src/api/vecs/id_to_i_to_vec.rs b/server/src/api/vecs/id_to_i_to_vec.rs
new file mode 100644
index 000000000..b58be8866
--- /dev/null
+++ b/server/src/api/vecs/id_to_i_to_vec.rs
@@ -0,0 +1,38 @@
+use std::collections::BTreeMap;
+
+use derive_deref::{Deref, DerefMut};
+use storable_vec::AnyJsonStorableVec;
+
+use super::index::Index;
+
+#[derive(Default, Deref, DerefMut)]
+pub struct VecIdToIndexToVec(BTreeMap<String, IndexToVec>);
+
+impl VecIdToIndexToVec {
+    // Not the most performant or type safe but only built once so that's okay
+    pub fn insert(&mut self, vec: &'static dyn AnyJsonStorableVec) {
+        let file_name = vec.file_name();
+        let split = file_name.split("_to_").collect::<Vec<_>>();
+        if split.len() != 2 {
+            panic!();
+        }
+        let str = vec.index_type_to_string().split("::").last().unwrap().to_lowercase();
+        let index = Index::try_from(str.as_str())
+            .inspect_err(|_| {
+                dbg!(str);
+            })
+            .unwrap();
+        if split[0] != index.to_string().to_lowercase() {
+            dbg!(split[0], index.to_string());
+            panic!();
+        }
+        let key = split[1].to_string().replace("_", "-");
+        let prev = self.entry(key).or_default().insert(index, vec);
+        if prev.is_some() {
+            panic!()
+        }
+    }
+}
+
+#[derive(Default, Deref, DerefMut)]
+pub struct IndexToVec(BTreeMap<Index, &'static dyn AnyJsonStorableVec>);
diff --git a/server/src/api/structs/index.rs b/server/src/api/vecs/index.rs
similarity index 100%
rename from server/src/api/structs/index.rs
rename to server/src/api/vecs/index.rs
diff --git a/server/src/api/vecs/mod.rs b/server/src/api/vecs/mod.rs
new file mode 100644
index 000000000..2d8a39df7
--- /dev/null
+++ b/server/src/api/vecs/mod.rs
@@ -0,0 +1,156 @@
+use std::time::Instant;
+
+use axum::{
+    extract::{Query, State},
+    http::{HeaderMap, Uri},
+    response::{IntoResponse, Response},
+    Json,
+};
+use color_eyre::eyre::eyre;
+use reqwest::StatusCode;
+use serde_json::Value;
+
+use crate::{log_result, traits::HeaderMapExtended};
+
+use super::AppState;
+
+mod format;
+mod id_to_i_to_vec;
+mod index;
+mod query;
+
+use format::Format;
+pub use id_to_i_to_vec::*;
+use index::Index;
+use query::QueryS;
+
+pub async fn handler(
+    headers: HeaderMap,
+    uri: Uri,
+    query: Query<QueryS>,
+    State(app_state): State<AppState>,
+) -> Response {
+    let instant = Instant::now();
+
+    let path = uri.path();
+
+    match req_to_response_res(headers, query, app_state) {
+        Ok(response) => {
+            log_result(response.status(), path, instant);
+            response
+        }
+        Err(error) => {
+            let mut response = (StatusCode::INTERNAL_SERVER_ERROR, error.to_string()).into_response();
+            log_result(response.status(), path, instant);
+            response.headers_mut().insert_cors();
+            response
+        }
+    }
+}
+
+fn req_to_response_res(
+    headers: HeaderMap,
+    Query(QueryS { format, from, i, to, v }): Query<QueryS>,
+    AppState { vecs, .. }: AppState,
+) -> color_eyre::Result<Response> {
+    let format = Format::try_from(format).ok();
+
+    let indexes = i
+        .to_lowercase()
+        .split(",")
+        .flat_map(|s| Index::try_from(s).ok())
+        .collect::<Vec<_>>();
+
+    if indexes.len() > 1 {
+        return Err(eyre!("Multiple indexes aren't supported"));
+    } else if indexes.is_empty() {
+        return Err(eyre!("Unknown index"));
+    }
+
+    let ids = v
+        .to_lowercase()
+        .split(",")
+        .map(|s| (s.to_owned(), vecs.get(&s.replace("_", "-"))))
+        .filter(|(_, opt)| opt.is_some())
+        .map(|(id, vec)| (id, vec.unwrap()))
+        .collect::<Vec<_>>();
+
+    if ids.is_empty() {
+        return Ok(Json(()).into_response());
+    }
+
+    let values = ids
+        .iter()
+        .flat_map(|(_, i_to_v)| i_to_v.get(indexes.first().unwrap()))
+        .map(|vec| -> storable_vec::Result<Vec<Value>> { vec.collect_range_values(from, to) })
+        .collect::<storable_vec::Result<Vec<_>>>()?;
+
+    if ids.is_empty() {
+        return Ok(Json(()).into_response());
+    }
+
+    let ids_last_i = ids.len() - 1;
+
+    let mut response = match format {
+        Some(Format::CSV) | Some(Format::TSV) => {
+            let delimiter = if format == Some(Format::CSV) { ',' } else { '\t' };
+
+            let mut csv = ids
+                .into_iter()
+                .map(|(id, _)| id)
+                .collect::<Vec<_>>()
+                .join(&delimiter.to_string());
+
+            csv.push('\n');
+
+            let values_len = values.first().unwrap().len();
+
+            (0..values_len).for_each(|i| {
+                let mut line = "".to_string();
+                values.iter().enumerate().for_each(|(id_i, v)| {
+                    line += &v.get(i).unwrap().to_string();
+                    if id_i == ids_last_i {
+                        line.push('\n');
+                    } else {
+                        line.push(delimiter);
+                    }
+                });
+                csv += &line;
+            });
+
+            csv.into_response()
+        }
+        Some(Format::JSON) | None => {
+            if values.len() == 1 {
+                let values = values.first().unwrap();
+                if values.len() == 1 {
+                    let value = values.first().unwrap();
+                    Json(value).into_response()
+                } else {
+                    Json(values).into_response()
+                }
+            } else {
+                Json(values).into_response()
+            }
+        }
+    };
+
+    let headers = response.headers_mut();
+
+    headers.insert_cors();
+    // headers.insert_last_modified(date_modified);
+
+    match format {
+        Some(format) => {
+            headers.insert_content_disposition_attachment();
+            match format {
+                Format::CSV => headers.insert_content_type_text_csv(),
+                Format::TSV => headers.insert_content_type_text_tsv(),
+                Format::JSON => headers.insert_content_type_application_json(),
+            }
+        }
+        _ => headers.insert_content_type_application_json(),
+    };
+
+    Ok(response)
+}
diff --git a/server/src/api/vecs/query.rs b/server/src/api/vecs/query.rs
new file mode 100644
index 000000000..6ad5db15e
--- /dev/null
+++ b/server/src/api/vecs/query.rs
@@ -0,0 +1,10 @@
+use serde::Deserialize;
+
+#[derive(Debug, Deserialize)]
+pub struct QueryS {
+    pub i: String,
+    pub v: String,
+    pub from: Option<i64>,
+    pub to: Option<i64>,
+    pub format: Option<String>,
+}
diff --git a/server/src/website/handlers/file.rs b/server/src/files/file.rs
similarity index 99%
rename from server/src/website/handlers/file.rs
rename to server/src/files/file.rs
index e94022da8..fec5e86b3 100644
--- a/server/src/website/handlers/file.rs
+++ b/server/src/files/file.rs
@@ -18,7 +18,7 @@ use crate::{
     traits::{HeaderMapExtended, ModifiedState, ResponseExtended},
 };
 
-use super::minify_js;
+use super::minify::minify_js;
 
 const WEBSITE_DEV_PATH: &str = "../website/";
 
diff --git a/server/src/website/handlers/minify.rs b/server/src/files/minify.rs
similarity index 100%
rename from server/src/website/handlers/minify.rs
rename to server/src/files/minify.rs
diff --git a/server/src/website/mod.rs b/server/src/files/mod.rs
similarity index 64%
rename from server/src/website/mod.rs
rename to server/src/files/mod.rs
index 5aa3a0d09..9be3690de 100644
--- a/server/src/website/mod.rs
+++ b/server/src/files/mod.rs
@@ -1,16 +1,17 @@
 use axum::{routing::get, Router};
 
-mod handlers;
-
-use handlers::{file_handler, index_handler};
-
 use super::AppState;
 
-pub trait WebsiteRoutes {
+mod file;
+mod minify;
+
+use file::{file_handler, index_handler};
+
+pub trait FilesRoutes {
     fn add_website_routes(self) -> Self;
 }
 
-impl WebsiteRoutes for Router<AppState> {
+impl FilesRoutes for Router<AppState> {
     fn add_website_routes(self) -> Self {
         self.route("/{*path}", get(file_handler)).route("/", get(index_handler))
     }
diff --git a/server/src/lib.rs b/server/src/lib.rs
index dfba72c33..3f7655f6e 100644
--- a/server/src/lib.rs
+++ b/server/src/lib.rs
@@ -1,21 +1,20 @@
-use std::{collections::BTreeMap, time::Instant};
+use std::time::Instant;
 
-use api::{structs::Index, ApiRoutes};
+use api::{ApiRoutes, VecIdToIndexToVec};
 use axum::{routing::get, serve, Json, Router};
 use color_eyre::owo_colors::OwoColorize;
 use computer::Computer;
-use derive_deref::{Deref, DerefMut};
+use files::FilesRoutes;
 use indexer::Indexer;
 use logger::{error, info};
 use reqwest::StatusCode;
-use storable_vec::{AnyJsonStorableVec, STATELESS};
+use storable_vec::STATELESS;
 use tokio::net::TcpListener;
 use tower_http::compression::CompressionLayer;
-use website::WebsiteRoutes;
 
 mod api;
+mod files;
 mod traits;
-mod website;
 
 #[derive(Clone)]
 pub struct AppState {
@@ -24,40 +23,6 @@ pub struct AppState {
     computer: &'static Computer<STATELESS>,
 }
 
-#[derive(Default, Deref, DerefMut)]
-pub struct VecIdToIndexToVec(BTreeMap<String, IndexToVec>);
-
-impl VecIdToIndexToVec {
-    // Not the most performant or type safe but only built once so that's okay
-    pub fn insert(&mut self, vec: &'static dyn AnyJsonStorableVec) {
-        let file_name = vec.file_name();
-        let split = file_name.split("_to_").collect::<Vec<_>>();
-        if split.len() != 2 {
-            panic!();
-        }
-        let str = vec.index_type_to_string().split("::").last().unwrap().to_lowercase();
-        let index = Index::try_from(str.as_str())
-            .inspect_err(|_| {
-                dbg!(str);
-            })
-            .unwrap();
-        if split[0] != index.to_string().to_lowercase() {
-            dbg!(split[0], index.to_string());
-            panic!();
-        }
-        let key = split[1].to_string().replace("_", "-");
-        let prev = self.entry(key).or_default().insert(index, vec);
-        if prev.is_some() {
-            panic!()
-        }
-    }
-}
-
-#[derive(Default, Deref, DerefMut)]
-pub struct IndexToVec {
-    pub index_to_vec: BTreeMap<Index, &'static dyn AnyJsonStorableVec>,
-}
-
 pub async fn main(indexer: Indexer<STATELESS>, computer: Computer<STATELESS>) -> color_eyre::Result<()> {
     // pub async fn main(routes: Routes, config: Config) -> color_eyre::Result<()> {
     // routes.generate_dts_file();
diff --git a/server/src/website/handlers/mod.rs b/server/src/website/handlers/mod.rs
deleted file mode 100644
index a0c087264..000000000
--- a/server/src/website/handlers/mod.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-mod file;
-mod minify;
-
-pub use file::*;
-use minify::*;
diff --git a/src/io/binary.rs b/src/io/binary.rs
deleted file mode 100644
index 202a6bdfb..000000000
--- a/src/io/binary.rs
+++ /dev/null
@@ -1,139 +0,0 @@
-use std::{
-    fmt::Debug,
-    fs::{self, File},
-    io::{BufReader, BufWriter, Cursor},
-    path::Path,
-};
-
-use bincode::{
-    config, decode_from_slice, decode_from_std_read, encode_into_std_write, Decode, Encode,
-};
-use zstd::decode_all;
-
-const ZST_EXTENSION: &str = "zst";
-
-pub const BIN_EXTENSION: &str = "bin";
-pub const COMPRESSED_BIN_EXTENSION: &str = "bin.zst";
-
-enum BinaryType {
-    Raw,
-    Compressed,
-}
-
-pub struct Binary;
-
-impl Binary {
-    pub fn import<T>(path: &Path) -> color_eyre::Result<T>
-    where
-        T: Decode,
-    {
-        match Self::type_from_path(path) {
-            BinaryType::Compressed => Self::import_compressed(path),
-            BinaryType::Raw => Self::import_raw(path),
-        }
-    }
-
-    fn import_raw<T>(path: &Path) -> color_eyre::Result<T>
-    where
-        T: Decode,
-    {
-        let config = config::standard();
-
-        let file = File::open(path)?;
-
-        let mut reader = BufReader::new(file);
-
-        let decoded = decode_from_std_read(&mut reader, config)?;
-
-        Ok(decoded)
-    }
-
-    fn import_compressed<T>(path: &Path) -> color_eyre::Result<T>
-    where
-        T: Decode,
-    {
-        let file = File::open(path).unwrap();
-
-        let reader = BufReader::new(file);
-
-        let decompressed = decode_all(reader).unwrap();
-
-        let config = config::standard();
-
-        let decoded = decode_from_slice::<T, _>(&decompressed, config)?.0;
-
-        Ok(decoded)
-    }
-
-    pub fn export<T>(path: &Path, value: &T) -> color_eyre::Result<()>
-    where
-        T: Debug + Encode,
-    {
-        // log(&format!("Exporting: {:?}", path));
-
-        match Self::type_from_path(path) {
-            BinaryType::Compressed => Self::export_compressed(path, value),
-            BinaryType::Raw => Self::export_raw(path, value),
-        }
-    }
-
-    fn export_raw<T>(path: &Path, value: &T) -> color_eyre::Result<()>
-    where
-        T: Debug + Encode,
-    {
-        let config = config::standard();
-
-        let file = File::create(path).inspect_err(|_| {
-            dbg!(path, value);
-        })?;
-
-        let mut writer = BufWriter::new(file);
-
-        encode_into_std_write(value, &mut writer, config)?;
-
-        Ok(())
-    }
-
-    fn export_compressed<T>(path: &Path, value: &T) -> color_eyre::Result<()>
-    where
-        T: Debug + Encode,
-    {
-        let config = config::standard();
-
-        let encoded = bincode::encode_to_vec(value, config).unwrap();
-
-        let cursor = Cursor::new(encoded);
-
-        let compressed = zstd::encode_all(cursor, 0).unwrap();
-
-        fs::write(path, compressed).unwrap();
-
-        Ok(())
-    }
-
-    pub fn has_correct_extension(path: &Path) -> bool {
-        let path = path.to_str().unwrap();
-        path.ends_with(BIN_EXTENSION) || path.ends_with(COMPRESSED_BIN_EXTENSION)
-    }
-
-    fn type_from_path(path: &Path) -> BinaryType {
-        let extension = path.extension();
-
-        if extension.is_none() {
-            panic!("Should have extension");
-        }
-
-        if !Self::has_correct_extension(path) {
-            dbg!(path);
-            panic!("Wrong extension")
-        }
-
-        let extension = extension.unwrap();
-
-        if extension == ZST_EXTENSION {
-            BinaryType::Compressed
-        } else {
-            BinaryType::Raw
-        }
-    }
-}
diff --git a/src/io/json.rs b/src/io/json.rs
deleted file mode 100644
index 6d81fe580..000000000
--- a/src/io/json.rs
+++ /dev/null
@@ -1,56 +0,0 @@
-use std::{
-    fs::File,
-    io::{BufReader, BufWriter},
-    path::Path,
-};
-
-use serde::{de::DeserializeOwned, Serialize};
-
-pub struct Json;
-
-pub const JSON_EXTENSION: &str = "json";
-pub const HAR_EXTENSION: &str = "har";
-
-impl Json {
-    pub fn import<T>(path: &Path) -> color_eyre::Result<T>
-    where
-        T: DeserializeOwned,
-    {
-        if !Self::has_correct_extension(path) {
-            panic!("Wrong extension");
-        }
-
-        let file = File::open(path)?;
-
-        let reader = BufReader::new(file);
-
-        Ok(serde_json::from_reader(reader)?)
-    }
-
-    pub fn export<T>(path: &Path, value: &T) -> color_eyre::Result<()>
-    where
-        T: Serialize,
-    {
-        if !Self::has_correct_extension(path) {
-            dbg!(path);
-            panic!("Wrong extension");
-        }
-
-        let file = File::create(path).unwrap_or_else(|_| {
-            dbg!(&path);
-            panic!("No such file or directory")
-        });
-
-        let mut writer = BufWriter::new(file);
-
-        serde_json::to_writer_pretty(&mut writer, value)?;
-
-        Ok(())
-    }
-
-    #[inline(always)]
-    pub fn has_correct_extension(path: &Path) -> bool {
-        let path = path.to_str().unwrap();
-        path.ends_with(JSON_EXTENSION) || path.ends_with(HAR_EXTENSION)
-    }
-}
diff --git a/src/io/mod.rs b/src/io/mod.rs
deleted file mode 100644
index a0540ad92..000000000
--- a/src/io/mod.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-mod binary;
-mod json;
-mod serialization;
-
-pub use binary::*;
-pub use json::*;
-pub use serialization::*;
diff --git a/src/io/serialization.rs b/src/io/serialization.rs
deleted file mode 100644
index 9dea77275..000000000
--- a/src/io/serialization.rs
+++ /dev/null
@@ -1,128 +0,0 @@
-use std::{
-    fmt::Debug,
-    fs,
-    path::{Path, PathBuf},
-};
-
-use allocative::Allocative;
-use bincode::{Decode, Encode};
-use color_eyre::eyre::eyre;
-use serde::{de::DeserializeOwned, Serialize};
-
-use crate::io::{Binary, Json};
-
-use super::{BIN_EXTENSION, COMPRESSED_BIN_EXTENSION, HAR_EXTENSION, JSON_EXTENSION};
-
-#[derive(PartialEq, PartialOrd, Ord, Eq, Debug, Clone, Copy, Default, Allocative)]
-pub enum Serialization {
-    #[default]
-    Binary,
-    Json,
-}
-
-impl Serialization {
-    pub fn is_serializable(&self, path: &Path) -> bool {
-        let path = path.to_str().unwrap();
-        match self {
-            Self::Binary => {
-                path.ends_with(BIN_EXTENSION) || path.ends_with(COMPRESSED_BIN_EXTENSION)
-            }
-            Self::Json => path.ends_with(JSON_EXTENSION) || path.ends_with(HAR_EXTENSION),
-        }
-    }
-
-    pub fn import<T>(&self, path: &Path) -> color_eyre::Result<T>
-    where
-        T: Debug + DeserializeOwned + Decode,
-    {
-        match self {
-            Serialization::Binary => {
-                if self.is_serializable(path) {
-                    Binary::import(path)
-                } else {
-                    let path = path.to_str().unwrap();
-                    let bin_path_str = format!("{path}.{BIN_EXTENSION}");
-                    let bin_path = Path::new(&bin_path_str);
-
-                    if bin_path.exists() {
-                        return Binary::import(bin_path);
-                    }
-
-                    let compressed_bin_path_str = format!("{path}.{COMPRESSED_BIN_EXTENSION}");
-                    let compressed_bin_path = Path::new(&compressed_bin_path_str);
-
-                    if compressed_bin_path.exists() {
-                        return Binary::import(compressed_bin_path);
-                    }
-
-                    Err(eyre!("Wrong path or no file"))
-                }
-            }
-            Serialization::Json => {
-                if self.is_serializable(path) {
-                    Json::import(path)
-                } else {
-                    let path = path.to_str().unwrap();
-                    let json_path_str = format!("{path}.{JSON_EXTENSION}");
-                    let json_path = Path::new(&json_path_str);
-
-                    if json_path.exists() {
-                        return Json::import(json_path);
-                    }
-
-                    Err(eyre!("Wrong path or no file"))
-                }
-            }
-        }
-    }
-
-    pub fn export<T>(&self, path: &Path, value: &T) -> color_eyre::Result<()>
-    where
-        T: Debug + Serialize + Encode,
-    {
-        match self {
-            Serialization::Binary => {
-                if self.is_serializable(path) {
-                    Binary::export(path, value)
-                } else {
-                    let path = path.to_str().unwrap();
-
-                    let res = Binary::export(
-                        Path::new(&format!("{}.{COMPRESSED_BIN_EXTENSION}", path)),
-                        value,
-                    );
-
-                    if res.is_ok() {
-                        let _ = fs::remove_file(Path::new(&format!("{}.{BIN_EXTENSION}", path)));
-                    }
-
-                    res
-                }
-            }
-            Serialization::Json => {
-                if self.is_serializable(path) {
-                    Json::export(path, value)
-                } else {
-                    Json::export(
-                        Path::new(&format!("{}.{JSON_EXTENSION}", path.to_str().unwrap())),
-                        value,
-                    )
-                }
-            }
-        }
-    }
-}
-
-impl TryFrom<&PathBuf> for Serialization {
-    type Error = ();
-
-    fn try_from(path: &PathBuf) -> Result<Self, Self::Error> {
-        let extension = path.extension().ok_or(())?.to_str().unwrap();
-
-        match extension {
-            BIN_EXTENSION | COMPRESSED_BIN_EXTENSION => Ok(Self::Binary),
-            JSON_EXTENSION => Ok(Self::Json),
-            _ => Err(()),
-        }
-    }
-}
diff --git a/storable_vec/src/lib.rs b/storable_vec/src/lib.rs
index 020873551..790ed1082 100644
--- a/storable_vec/src/lib.rs
+++ b/storable_vec/src/lib.rs
@@ -71,7 +71,7 @@ pub struct StorableVec<I, T, const MODE: u8> {
 
 /// In bytes
 const MAX_PAGE_SIZE: usize = 4 * 4096;
-const ONE_MB: usize = 1000 * 1024;
+// const ONE_MB: usize = 1000 * 1024;
 const MAX_CACHE_SIZE: usize = usize::MAX;
 // const MAX_CACHE_SIZE: usize = 100 * ONE_MB;
 

From a1006dddb5bd876bd39d7173dcaf509029c58a6b Mon Sep 17 00:00:00 2001
From: nym21 <expat-epochs0i@icloud.com>
Date: Thu, 13 Feb 2025 19:00:52 +0100
Subject: [PATCH 49/63] global: snapshot

---
 Cargo.lock                                    |  17 +-
 Cargo.toml                                    |   1 +
 computer/Cargo.toml                           |   2 +-
 computer/src/lib.rs                           |   1 +
 computer/src/storage/storable_vecs.rs         |  14 +-
 computer/src/structs/bitcoin.rs               |  14 +
 computer/src/structs/mod.rs                   |   8 +-
 computer/src/structs/ohlc.rs                  |  36 ++
 indexer/src/lib.rs                            |   6 +-
 indexer/src/storage/storable_vecs/mod.rs      |  17 +-
 indexer/src/structs/mod.rs                    |   4 +-
 indexer/src/structs/{amount.rs => sats.rs}    |  64 ++-
 indexer/src/structs/vout.rs                   |   2 +-
 pricer/Cargo.toml                             |   9 +
 pricer/src/fetchers/binance.rs                | 157 ++++++
 pricer/src/{price => fetchers}/kibo.rs        |  24 +-
 pricer/src/fetchers/kraken.rs                 |  90 ++++
 pricer/src/{price => fetchers}/mod.rs         |   2 +
 pricer/src/{ => fetchers}/retry.rs            |   3 +
 pricer/src/lib.rs                             |  17 +-
 pricer/src/main.rs                            |  16 +
 pricer/src/price.rs                           | 451 +-----------------
 pricer/src/price/binance.rs                   | 213 ---------
 pricer/src/price/kraken.rs                    | 133 ------
 pricer/src/structs/cents.rs                   |  14 +
 pricer/src/structs/close.rs                   |  12 +
 {computer => pricer}/src/structs/date.rs      |   2 +-
 {computer => pricer}/src/structs/dateindex.rs |   0
 pricer/src/structs/dollars.rs                 |  18 +
 pricer/src/structs/high.rs                    |  12 +
 pricer/src/structs/low.rs                     |  12 +
 pricer/src/structs/mod.rs                     |  19 +
 pricer/src/structs/open.rs                    |  12 +
 python/example.py                             |  19 +-
 server/Cargo.toml                             |   2 -
 server/src/api/vecs/mod.rs                    |   4 +-
 .../api/vecs/{id_to_i_to_vec.rs => tree.rs}   |   0
 37 files changed, 547 insertions(+), 880 deletions(-)
 create mode 100644 computer/src/structs/bitcoin.rs
 create mode 100644 computer/src/structs/ohlc.rs
 rename indexer/src/structs/{amount.rs => sats.rs} (50%)
 create mode 100644 pricer/src/fetchers/binance.rs
 rename pricer/src/{price => fetchers}/kibo.rs (84%)
 create mode 100644 pricer/src/fetchers/kraken.rs
 rename pricer/src/{price => fetchers}/mod.rs (78%)
 rename pricer/src/{ => fetchers}/retry.rs (83%)
 create mode 100644 pricer/src/main.rs
 delete mode 100644 pricer/src/price/binance.rs
 delete mode 100644 pricer/src/price/kraken.rs
 create mode 100644 pricer/src/structs/cents.rs
 create mode 100644 pricer/src/structs/close.rs
 rename {computer => pricer}/src/structs/date.rs (95%)
 rename {computer => pricer}/src/structs/dateindex.rs (100%)
 create mode 100644 pricer/src/structs/dollars.rs
 create mode 100644 pricer/src/structs/high.rs
 create mode 100644 pricer/src/structs/low.rs
 create mode 100644 pricer/src/structs/mod.rs
 create mode 100644 pricer/src/structs/open.rs
 rename server/src/api/vecs/{id_to_i_to_vec.rs => tree.rs} (100%)

diff --git a/Cargo.lock b/Cargo.lock
index 06bdecac6..739206fa0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -262,14 +262,12 @@ dependencies = [
  "jiff",
  "logger",
  "oxc",
- "regex",
  "reqwest",
  "serde",
  "serde_json",
  "storable_vec",
  "tokio",
  "tower-http",
- "zstd",
 ]
 
 [[package]]
@@ -400,7 +398,7 @@ dependencies = [
  "derive_deref",
  "exit",
  "fjall",
- "jiff",
+ "pricer",
  "storable_vec",
  "zerocopy 0.8.17",
 ]
@@ -2111,6 +2109,17 @@ dependencies = [
 [[package]]
 name = "pricer"
 version = "0.1.0"
+dependencies = [
+ "bindex",
+ "color-eyre",
+ "derive_deref",
+ "jiff",
+ "logger",
+ "reqwest",
+ "serde",
+ "serde_json",
+ "zerocopy 0.8.17",
+]
 
 [[package]]
 name = "proc-macro2"
@@ -2240,6 +2249,7 @@ version = "0.12.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "43e734407157c3c2034e0258f5e4473ddb361b1e85f95a66690d67264d7cd1da"
 dependencies = [
+ "async-compression",
  "base64 0.22.1",
  "bytes",
  "encoding_rs",
@@ -2270,6 +2280,7 @@ dependencies = [
  "system-configuration",
  "tokio",
  "tokio-native-tls",
+ "tokio-util",
  "tower",
  "tower-service",
  "url",
diff --git a/Cargo.toml b/Cargo.toml
index d7aee1aa7..73e061e28 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -23,6 +23,7 @@ iterator = { path = "iterator", package = "biter" }
 jiff = "0.2.0"
 logger = { path = "logger" }
 rayon = "1.10.0"
+pricer = { path = "pricer" }
 rlimit = { version = "0.10.2" }
 serde = { version = "1.0.217", features = ["derive"] }
 serde_json = { version = "1.0.138", features = ["float_roundtrip"] }
diff --git a/computer/Cargo.toml b/computer/Cargo.toml
index 0d0f44e26..35d646a2b 100644
--- a/computer/Cargo.toml
+++ b/computer/Cargo.toml
@@ -10,6 +10,6 @@ derive_deref = { workspace = true }
 exit = { workspace = true }
 fjall = { workspace = true }
 indexer = { workspace = true }
-jiff = { workspace = true }
+pricer = { workspace = true }
 storable_vec = { workspace = true }
 zerocopy = { workspace = true }
diff --git a/computer/src/lib.rs b/computer/src/lib.rs
index 775ed732b..5faa376c4 100644
--- a/computer/src/lib.rs
+++ b/computer/src/lib.rs
@@ -7,6 +7,7 @@ pub use iterator::rpc;
 mod storage;
 mod structs;
 
+use pricer::Date;
 use storable_vec::SINGLE_THREAD;
 use storage::{Fjalls, StorableVecs};
 pub use structs::*;
diff --git a/computer/src/storage/storable_vecs.rs b/computer/src/storage/storable_vecs.rs
index 39fe0207b..73a1b10c4 100644
--- a/computer/src/storage/storable_vecs.rs
+++ b/computer/src/storage/storable_vecs.rs
@@ -1,12 +1,10 @@
 use std::{fs, path::Path};
 
-use indexer::{Addressindex, Amount, Height, Timestamp, Txindex, Txinindex, Txoutindex};
+use indexer::{Addressindex, Height, Sats, Timestamp, Txindex, Txinindex, Txoutindex};
+use pricer::{Date, Dateindex};
 use storable_vec::{StorableVec, Version};
 
-use crate::{
-    structs::{Date, Feerate},
-    Dateindex,
-};
+use crate::structs::Feerate;
 
 // mod base;
 
@@ -30,16 +28,16 @@ pub struct StorableVecs<const MODE: u8> {
     // pub height_to_subsidy: StorableVec<Height, u32, MODE>,
     // pub height_to_totalfees: StorableVec<Height, Amount, MODE>,
     // pub height_to_txcount: StorableVec<Height, u32, MODE>,
-    pub txindex_to_fee: StorableVec<Txindex, Amount, MODE>,
+    pub txindex_to_fee: StorableVec<Txindex, Sats, MODE>,
     pub txindex_to_height: StorableVec<Txindex, Height, MODE>,
     pub txindex_to_is_coinbase: StorableVec<Txindex, bool, MODE>,
     // pub txindex_to_feerate: StorableVec<Txindex, Feerate, MODE>,
     pub txindex_to_inputs_count: StorableVec<Txindex, u32, MODE>,
-    pub txindex_to_inputs_sum: StorableVec<Txindex, Amount, MODE>,
+    pub txindex_to_inputs_sum: StorableVec<Txindex, Sats, MODE>,
     pub txindex_to_last_txinindex: StorableVec<Txindex, Txinindex, MODE>,
     pub txindex_to_last_txoutindex: StorableVec<Txindex, Txoutindex, MODE>,
     pub txindex_to_outputs_count: StorableVec<Txindex, u32, MODE>,
-    pub txindex_to_outputs_sum: StorableVec<Txindex, Amount, MODE>,
+    pub txindex_to_outputs_sum: StorableVec<Txindex, Sats, MODE>,
 }
 
 impl<const MODE: u8> StorableVecs<MODE> {
diff --git a/computer/src/structs/bitcoin.rs b/computer/src/structs/bitcoin.rs
new file mode 100644
index 000000000..28f4621d5
--- /dev/null
+++ b/computer/src/structs/bitcoin.rs
@@ -0,0 +1,14 @@
+use indexer::Sats;
+
+#[derive(Debug, Default, Clone, Copy)]
+pub struct Bitcoin(f64);
+
+impl Bitcoin {
+    const ONE: Self = Self(100_000_000.0);
+}
+
+impl From<Sats> for Bitcoin {
+    fn from(value: Sats) -> Self {
+        Self((*value as f64) / Self::ONE.0)
+    }
+}
diff --git a/computer/src/structs/mod.rs b/computer/src/structs/mod.rs
index 60235dc16..7e26c175a 100644
--- a/computer/src/structs/mod.rs
+++ b/computer/src/structs/mod.rs
@@ -1,11 +1,11 @@
 mod addressindextxoutindex;
-mod date;
-mod dateindex;
+mod bitcoin;
 mod feerate;
+mod ohlc;
 mod unit;
 
 pub use addressindextxoutindex::*;
-pub use date::*;
-pub use dateindex::*;
+pub use bitcoin::*;
 pub use feerate::*;
+pub use ohlc::*;
 pub use unit::*;
diff --git a/computer/src/structs/ohlc.rs b/computer/src/structs/ohlc.rs
new file mode 100644
index 000000000..a37e5ba2d
--- /dev/null
+++ b/computer/src/structs/ohlc.rs
@@ -0,0 +1,36 @@
+use serde::Serialize;
+use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout};
+
+use super::{Cents, Close, High, Low, Open};
+
+// #[derive(Debug, Default, Clone, Copy, FromBytes, Immutable, IntoBytes, KnownLayout, Serialize)]
+// #[repr(C)]
+// pub struct OHLCCents(OHLC<Cents>);
+
+#[derive(Debug, Default, Clone, Copy, FromBytes, Immutable, IntoBytes, KnownLayout, Serialize)]
+#[repr(C)]
+pub struct OHLCCents(Open<Cents>, High<Cents>, Low<Cents>, Close<Cents>);
+
+impl OHLCCents {
+    pub fn open(&self) -> Open<Cents> {
+        self.0
+    }
+
+    pub fn high(&self) -> High<Cents> {
+        self.1
+    }
+
+    pub fn low(&self) -> Low<Cents> {
+        self.2
+    }
+
+    pub fn close(&self) -> Close<Cents> {
+        self.3
+    }
+}
+
+impl From<(Open<Cents>, High<Cents>, Low<Cents>, Close<Cents>)> for OHLCCents {
+    fn from(value: (Open<Cents>, High<Cents>, Low<Cents>, Close<Cents>)) -> Self {
+        Self(value.0, value.1, value.2, value.3)
+    }
+}
diff --git a/indexer/src/lib.rs b/indexer/src/lib.rs
index 7d3af88cc..98fa77fe0 100644
--- a/indexer/src/lib.rs
+++ b/indexer/src/lib.rs
@@ -92,7 +92,7 @@ impl Indexer<CACHED_GETS> {
         iterator::new(bitcoin_dir, Some(height.into()), Some(400_000), rpc)
             .iter()
             .try_for_each(|(_height, block, blockhash)| -> color_eyre::Result<()> {
-                info!("Processing block {_height}...");
+                info!("Indexing block {_height}...");
 
                 let blockhash = BlockHash::from(blockhash);
                 height = Height::from(_height);
@@ -440,13 +440,13 @@ impl Indexer<CACHED_GETS> {
                         (txout, txindex, vout, addresstype, addressbytes_res, addressindex_opt, _tx),
                     )|
                      -> color_eyre::Result<()> {
-                        let amount = Amount::from(txout.value);
+                        let sats = Sats::from(txout.value);
 
                         if vout.is_zero() {
                             vecs.txindex_to_first_txoutindex.push_if_needed(txindex, txoutindex)?;
                         }
 
-                        vecs.txoutindex_to_amount.push_if_needed(txoutindex, amount)?;
+                        vecs.txoutindex_to_value.push_if_needed(txoutindex, sats)?;
 
                         let mut addressindex = addressindex_global;
 
diff --git a/indexer/src/storage/storable_vecs/mod.rs b/indexer/src/storage/storable_vecs/mod.rs
index 9abab5799..3e4c2c39a 100644
--- a/indexer/src/storage/storable_vecs/mod.rs
+++ b/indexer/src/storage/storable_vecs/mod.rs
@@ -5,11 +5,10 @@ use rayon::prelude::*;
 use storable_vec::{AnyJsonStorableVec, Version, CACHED_GETS};
 
 use crate::structs::{
-    Addressbytes, Addressindex, Addresstype, Addresstypeindex, Amount, BlockHash, Emptyindex, Height, LockTime,
-    Multisigindex, Opreturnindex, P2PK33AddressBytes, P2PK33index, P2PK65AddressBytes, P2PK65index, P2PKHAddressBytes,
-    P2PKHindex, P2SHAddressBytes, P2SHindex, P2TRAddressBytes, P2TRindex, P2WPKHAddressBytes, P2WPKHindex,
-    P2WSHAddressBytes, P2WSHindex, Pushonlyindex, Timestamp, TxVersion, Txid, Txindex, Txinindex, Txoutindex,
-    Unknownindex, Weight,
+    Addressbytes, Addressindex, Addresstype, Addresstypeindex, BlockHash, Emptyindex, Height, LockTime, Multisigindex,
+    Opreturnindex, P2PK33AddressBytes, P2PK33index, P2PK65AddressBytes, P2PK65index, P2PKHAddressBytes, P2PKHindex,
+    P2SHAddressBytes, P2SHindex, P2TRAddressBytes, P2TRindex, P2WPKHAddressBytes, P2WPKHindex, P2WSHAddressBytes,
+    P2WSHindex, Pushonlyindex, Sats, Timestamp, TxVersion, Txid, Txindex, Txinindex, Txoutindex, Unknownindex, Weight,
 };
 
 mod base;
@@ -56,7 +55,7 @@ pub struct StorableVecs<const MODE: u8> {
     pub txindex_to_txversion: StorableVec<Txindex, TxVersion, MODE>,
     pub txinindex_to_txoutindex: StorableVec<Txinindex, Txoutindex, MODE>,
     pub txoutindex_to_addressindex: StorableVec<Txoutindex, Addressindex, MODE>,
-    pub txoutindex_to_amount: StorableVec<Txoutindex, Amount, MODE>,
+    pub txoutindex_to_value: StorableVec<Txoutindex, Sats, MODE>,
 }
 
 // const UNSAFE_BLOCKS: usize = 1000;
@@ -177,7 +176,7 @@ impl<const MODE: u8> StorableVecs<MODE> {
                 &path.join("txoutindex_to_addressindex"),
                 Version::from(1),
             )?,
-            txoutindex_to_amount: StorableVec::import(&path.join("txoutindex_to_amount"), Version::from(1))?,
+            txoutindex_to_value: StorableVec::import(&path.join("txoutindex_to_value"), Version::from(1))?,
         })
     }
 
@@ -350,7 +349,7 @@ impl<const MODE: u8> StorableVecs<MODE> {
             &*self.txindex_to_txversion,
             &*self.txinindex_to_txoutindex,
             &*self.txoutindex_to_addressindex,
-            &*self.txoutindex_to_amount,
+            &*self.txoutindex_to_value,
         ]
     }
 
@@ -395,7 +394,7 @@ impl<const MODE: u8> StorableVecs<MODE> {
             &mut self.txindex_to_txversion,
             &mut self.txinindex_to_txoutindex,
             &mut self.txoutindex_to_addressindex,
-            &mut self.txoutindex_to_amount,
+            &mut self.txoutindex_to_value,
         ]
     }
 }
diff --git a/indexer/src/structs/mod.rs b/indexer/src/structs/mod.rs
index 04b682955..ff4050491 100644
--- a/indexer/src/structs/mod.rs
+++ b/indexer/src/structs/mod.rs
@@ -2,11 +2,11 @@ mod addressbytes;
 mod addressindex;
 mod addresstype;
 mod addresstypeindex;
-mod amount;
 mod blockhash;
 mod compressed;
 mod height;
 mod locktime;
+mod sats;
 mod timestamp;
 mod txid;
 mod txindex;
@@ -21,11 +21,11 @@ pub use addressbytes::*;
 pub use addressindex::*;
 pub use addresstype::*;
 pub use addresstypeindex::*;
-pub use amount::*;
 pub use blockhash::*;
 pub use compressed::*;
 pub use height::*;
 pub use locktime::*;
+pub use sats::*;
 pub use timestamp::*;
 pub use txid::*;
 pub use txindex::*;
diff --git a/indexer/src/structs/amount.rs b/indexer/src/structs/sats.rs
similarity index 50%
rename from indexer/src/structs/amount.rs
rename to indexer/src/structs/sats.rs
index 6e0a6acd9..eea28b04f 100644
--- a/indexer/src/structs/amount.rs
+++ b/indexer/src/structs/sats.rs
@@ -4,7 +4,7 @@ use std::{
 };
 
 use derive_deref::{Deref, DerefMut};
-use iterator::bitcoin;
+use iterator::bitcoin::Amount;
 use serde::Serialize;
 use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout};
 
@@ -27,85 +27,83 @@ use super::Height;
     KnownLayout,
     Serialize,
 )]
-pub struct Amount(u64);
+pub struct Sats(u64);
 
-impl Amount {
+impl Sats {
     pub const ZERO: Self = Self(0);
-    pub const ONE_BTC_F32: f32 = 100_000_000.0;
-    pub const ONE_BTC_F64: f64 = 100_000_000.0;
 
     pub fn is_zero(&self) -> bool {
         *self == Self::ZERO
     }
 }
 
-impl Add for Amount {
-    type Output = Amount;
-    fn add(self, rhs: Amount) -> Self::Output {
-        Amount::from(*self + *rhs)
+impl Add for Sats {
+    type Output = Sats;
+    fn add(self, rhs: Sats) -> Self::Output {
+        Sats::from(*self + *rhs)
     }
 }
 
-impl AddAssign for Amount {
+impl AddAssign for Sats {
     fn add_assign(&mut self, rhs: Self) {
         *self = *self + rhs;
     }
 }
 
-impl Sub for Amount {
-    type Output = Amount;
-    fn sub(self, rhs: Amount) -> Self::Output {
-        Amount::from(*self - *rhs)
+impl Sub for Sats {
+    type Output = Sats;
+    fn sub(self, rhs: Sats) -> Self::Output {
+        Sats::from(*self - *rhs)
     }
 }
 
-impl SubAssign for Amount {
+impl SubAssign for Sats {
     fn sub_assign(&mut self, rhs: Self) {
         *self = *self - rhs;
     }
 }
 
-impl Mul<Amount> for Amount {
-    type Output = Amount;
-    fn mul(self, rhs: Amount) -> Self::Output {
-        Amount::from(*self * *rhs)
+impl Mul<Sats> for Sats {
+    type Output = Sats;
+    fn mul(self, rhs: Sats) -> Self::Output {
+        Sats::from(*self * *rhs)
     }
 }
 
-impl Mul<u64> for Amount {
-    type Output = Amount;
+impl Mul<u64> for Sats {
+    type Output = Sats;
     fn mul(self, rhs: u64) -> Self::Output {
-        Amount::from(*self * rhs)
+        Sats::from(*self * rhs)
     }
 }
 
-impl Mul<Height> for Amount {
-    type Output = Amount;
+impl Mul<Height> for Sats {
+    type Output = Sats;
     fn mul(self, rhs: Height) -> Self::Output {
-        Amount::from(*self * *rhs as u64)
+        Sats::from(*self * *rhs as u64)
     }
 }
 
-impl Sum for Amount {
+impl Sum for Sats {
     fn sum<I: Iterator<Item = Self>>(iter: I) -> Self {
-        let sats: u64 = iter.map(|amt| *amt).sum();
-        Amount::from(sats)
+        let sats: u64 = iter.map(|sats| *sats).sum();
+        Sats::from(sats)
     }
 }
 
-impl From<u64> for Amount {
+impl From<u64> for Sats {
     fn from(value: u64) -> Self {
         Self(value)
     }
 }
 
-impl From<bitcoin::Amount> for Amount {
-    fn from(value: bitcoin::Amount) -> Self {
+impl From<Amount> for Sats {
+    fn from(value: Amount) -> Self {
         Self(value.to_sat())
     }
 }
-impl From<Amount> for bitcoin::Amount {
-    fn from(value: Amount) -> Self {
+impl From<Sats> for Amount {
+    fn from(value: Sats) -> Self {
         Self::from_sat(value.0)
     }
 }
diff --git a/indexer/src/structs/vout.rs b/indexer/src/structs/vout.rs
index a5f267823..4cc8ef793 100644
--- a/indexer/src/structs/vout.rs
+++ b/indexer/src/structs/vout.rs
@@ -4,7 +4,7 @@ use derive_deref::Deref;
 pub struct Vout(u32);
 
 impl Vout {
-    const ZERO: Self = Vout(0_u32);
+    const ZERO: Self = Vout(0);
 
     pub fn is_zero(&self) -> bool {
         *self == Self::ZERO
diff --git a/pricer/Cargo.toml b/pricer/Cargo.toml
index c2ba1eb70..c9db534d0 100644
--- a/pricer/Cargo.toml
+++ b/pricer/Cargo.toml
@@ -4,3 +4,12 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
+color-eyre = { workspace = true }
+derive_deref = { workspace = true }
+indexer = { workspace = true }
+logger = { workspace = true }
+reqwest = { version = "0.12.12", features = ["blocking", "brotli", "deflate", "gzip", "json", "zstd"] }
+jiff = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
+zerocopy = { workspace = true }
diff --git a/pricer/src/fetchers/binance.rs b/pricer/src/fetchers/binance.rs
new file mode 100644
index 000000000..f8ecbb0f3
--- /dev/null
+++ b/pricer/src/fetchers/binance.rs
@@ -0,0 +1,157 @@
+use std::{
+    collections::BTreeMap,
+    fs::{self, File},
+    io::BufReader,
+    path::Path,
+    str::FromStr,
+};
+
+use color_eyre::eyre::{eyre, ContextCompat};
+use indexer::Timestamp;
+use logger::info;
+use serde_json::Value;
+
+use crate::{
+    fetchers::retry,
+    structs::{Cents, OHLC},
+    Close, Date, Dollars, High, Low, Open,
+};
+
+pub struct Binance;
+
+impl Binance {
+    pub fn fetch_1mn_prices() -> color_eyre::Result<BTreeMap<Timestamp, OHLC>> {
+        info!("Fetching 1mn prices from Binance...");
+
+        retry(
+            |_| Self::json_to_timestamp_to_ohlc(&reqwest::blocking::get(Self::url("interval=1m&limit=1000"))?.json()?),
+            30,
+            10,
+        )
+    }
+
+    pub fn fetch_daily_prices() -> color_eyre::Result<BTreeMap<Date, OHLC>> {
+        info!("Fetching daily prices from Kraken...");
+
+        retry(
+            |_| Self::json_to_date_to_ohlc(&reqwest::blocking::get(Self::url("interval=1d"))?.json()?),
+            30,
+            10,
+        )
+    }
+
+    pub fn read_har_file(path: &Path) -> color_eyre::Result<BTreeMap<Timestamp, OHLC>> {
+        info!("Reading Binance har file...");
+
+        fs::create_dir_all(&path)?;
+
+        let path_binance_har = path.join("binance.har");
+
+        let file = if let Ok(file) = File::open(path_binance_har) {
+            file
+        } else {
+            return Err(eyre!("Missing binance file"));
+        };
+
+        let reader = BufReader::new(file);
+
+        let json: BTreeMap<String, Value> = if let Ok(json) = serde_json::from_reader(reader) {
+            json
+        } else {
+            return Ok(Default::default());
+        };
+
+        json.get("log")
+            .context("Expect object to have log attribute")?
+            .as_object()
+            .context("Expect to be an object")?
+            .get("entries")
+            .context("Expect object to have entries")?
+            .as_array()
+            .context("Expect to be an array")?
+            .iter()
+            .filter(|entry| {
+                entry
+                    .as_object()
+                    .unwrap()
+                    .get("request")
+                    .unwrap()
+                    .as_object()
+                    .unwrap()
+                    .get("url")
+                    .unwrap()
+                    .as_str()
+                    .unwrap()
+                    .contains("/uiKlines")
+            })
+            .map(|entry| {
+                let response = entry.as_object().unwrap().get("response").unwrap().as_object().unwrap();
+
+                let content = response.get("content").unwrap().as_object().unwrap();
+
+                let text = content.get("text");
+
+                if text.is_none() {
+                    return Ok(BTreeMap::new());
+                }
+
+                let text = text.unwrap().as_str().unwrap();
+
+                Self::json_to_timestamp_to_ohlc(&serde_json::Value::from_str(text).unwrap())
+            })
+            .try_fold(BTreeMap::default(), |mut all, res| {
+                all.append(&mut res?);
+                Ok(all)
+            })
+    }
+
+    fn json_to_timestamp_to_ohlc(json: &Value) -> color_eyre::Result<BTreeMap<Timestamp, OHLC>> {
+        Self::json_to_btree(json, Self::array_to_timestamp_and_ohlc)
+    }
+
+    fn json_to_date_to_ohlc(json: &Value) -> color_eyre::Result<BTreeMap<Date, OHLC>> {
+        Self::json_to_btree(json, Self::array_to_date_and_ohlc)
+    }
+
+    fn json_to_btree<F, K, V>(json: &Value, fun: F) -> color_eyre::Result<BTreeMap<K, V>>
+    where
+        F: Fn(&Value) -> color_eyre::Result<(K, V)>,
+        K: Ord,
+    {
+        json.as_array()
+            .context("Expect to be an array")?
+            .iter()
+            .map(fun)
+            .collect::<Result<BTreeMap<_, _>, _>>()
+    }
+
+    fn array_to_timestamp_and_ohlc(array: &Value) -> color_eyre::Result<(Timestamp, OHLC)> {
+        let array = array.as_array().context("Expect to be array")?;
+
+        let timestamp = Timestamp::from((array.first().unwrap().as_u64().unwrap() / 1_000) as u32);
+
+        let get_cents = |index: usize| {
+            Cents::from(Dollars::from(
+                array.get(index).unwrap().as_str().unwrap().parse::<f64>().unwrap(),
+            ))
+        };
+
+        Ok((
+            timestamp,
+            OHLC::from((
+                Open::from(get_cents(1)),
+                High::from(get_cents(2)),
+                Low::from(get_cents(3)),
+                Close::from(get_cents(4)),
+            )),
+        ))
+    }
+
+    fn array_to_date_and_ohlc(array: &Value) -> color_eyre::Result<(Date, OHLC)> {
+        Self::array_to_timestamp_and_ohlc(array).map(|(t, ohlc)| (Date::from(t), ohlc))
+    }
+
+    fn url(query: &str) -> String {
+        format!("https://api.binance.com/api/v3/uiKlines?symbol=BTCUSDT&{query}")
+    }
+}
diff --git a/pricer/src/price/kibo.rs b/pricer/src/fetchers/kibo.rs
similarity index 84%
rename from pricer/src/price/kibo.rs
rename to pricer/src/fetchers/kibo.rs
index 858b7d7ac..8b137090b 100644
--- a/pricer/src/price/kibo.rs
+++ b/pricer/src/fetchers/kibo.rs
@@ -1,14 +1,10 @@
 use std::{collections::BTreeMap, str::FromStr};
 
-use chrono::NaiveDate;
 use color_eyre::eyre::ContextCompat;
-use log::info;
+use logger::info;
 use serde_json::Value;
 
-use crate::{
-    structs::{Date, DateMapChunkId, HeightMapChunkId, MapChunkId, OHLC},
-    utils::retry,
-};
+use crate::structs::{Date, OHLC};
 
 pub struct Kibo;
 
@@ -33,11 +29,9 @@ impl Kibo {
             |try_index| {
                 let base_url = Self::get_base_url(try_index);
 
-                let body: Value = reqwest::blocking::get(format!(
-                    "{base_url}/height-to-price?chunk={}",
-                    chunk_id.to_usize()
-                ))?
-                .json()?;
+                let body: Value =
+                    reqwest::blocking::get(format!("{base_url}/height-to-price?chunk={}", chunk_id.to_usize()))?
+                        .json()?;
 
                 let vec = body
                     .as_object()
@@ -68,11 +62,9 @@ impl Kibo {
             |try_index| {
                 let base_url = Self::get_base_url(try_index);
 
-                let body: Value = reqwest::blocking::get(format!(
-                    "{base_url}/date-to-price?chunk={}",
-                    chunk_id.to_usize()
-                ))?
-                .json()?;
+                let body: Value =
+                    reqwest::blocking::get(format!("{base_url}/date-to-price?chunk={}", chunk_id.to_usize()))?
+                        .json()?;
 
                 Ok(body
                     .as_object()
diff --git a/pricer/src/fetchers/kraken.rs b/pricer/src/fetchers/kraken.rs
new file mode 100644
index 000000000..2f38725fa
--- /dev/null
+++ b/pricer/src/fetchers/kraken.rs
@@ -0,0 +1,90 @@
+use std::collections::BTreeMap;
+
+use color_eyre::eyre::ContextCompat;
+use indexer::Timestamp;
+use logger::info;
+use serde_json::Value;
+
+use crate::{fetchers::retry, structs::Date, Cents, Close, Dollars, High, Low, Open, OHLC};
+
+pub struct Kraken;
+
+impl Kraken {
+    pub fn fetch_1mn_prices() -> color_eyre::Result<BTreeMap<Timestamp, OHLC>> {
+        info!("Fetching 1mn prices from Kraken...");
+
+        retry(
+            |_| Self::json_to_timestamp_to_ohlc(&reqwest::blocking::get(Self::url(1))?.json()?),
+            30,
+            10,
+        )
+    }
+
+    pub fn fetch_daily_prices() -> color_eyre::Result<BTreeMap<Date, OHLC>> {
+        info!("Fetching daily prices from Kraken...");
+
+        retry(
+            |_| Self::json_to_date_to_ohlc(&reqwest::blocking::get(Self::url(1440))?.json()?),
+            30,
+            10,
+        )
+    }
+
+    fn json_to_timestamp_to_ohlc(json: &Value) -> color_eyre::Result<BTreeMap<Timestamp, OHLC>> {
+        Self::json_to_btree(json, Self::array_to_timestamp_and_ohlc)
+    }
+
+    fn json_to_date_to_ohlc(json: &Value) -> color_eyre::Result<BTreeMap<Date, OHLC>> {
+        Self::json_to_btree(json, Self::array_to_date_and_ohlc)
+    }
+
+    fn json_to_btree<F, K, V>(json: &Value, fun: F) -> color_eyre::Result<BTreeMap<K, V>>
+    where
+        F: Fn(&Value) -> color_eyre::Result<(K, V)>,
+        K: Ord,
+    {
+        json.as_object()
+            .context("Expect to be an object")?
+            .get("result")
+            .context("Expect object to have result")?
+            .as_object()
+            .context("Expect to be an object")?
+            .get("XXBTZUSD")
+            .context("Expect to have XXBTZUSD")?
+            .as_array()
+            .context("Expect to be an array")?
+            .iter()
+            .map(fun)
+            .collect::<Result<BTreeMap<_, _>, _>>()
+    }
+
+    fn array_to_timestamp_and_ohlc(array: &Value) -> color_eyre::Result<(Timestamp, OHLC)> {
+        let array = array.as_array().context("Expect to be array")?;
+
+        let timestamp = Timestamp::from(array.first().unwrap().as_u64().unwrap() as u32);
+
+        let get_cents = |index: usize| {
+            Cents::from(Dollars::from(
+                array.get(index).unwrap().as_str().unwrap().parse::<f64>().unwrap(),
+            ))
+        };
+
+        Ok((
+            timestamp,
+            OHLC::from((
+                Open::from(get_cents(1)),
+                High::from(get_cents(2)),
+                Low::from(get_cents(3)),
+                Close::from(get_cents(4)),
+            )),
+        ))
+    }
+
+    fn array_to_date_and_ohlc(array: &Value) -> color_eyre::Result<(Date, OHLC)> {
+        Self::array_to_timestamp_and_ohlc(array).map(|(t, ohlc)| (Date::from(t), ohlc))
+    }
+
+    fn url(interval: usize) -> String {
+        format!("https://api.kraken.com/0/public/OHLC?pair=XBTUSD&interval={interval}")
+    }
+}
diff --git a/pricer/src/price/mod.rs b/pricer/src/fetchers/mod.rs
similarity index 78%
rename from pricer/src/price/mod.rs
rename to pricer/src/fetchers/mod.rs
index 41cea4435..c6704727b 100644
--- a/pricer/src/price/mod.rs
+++ b/pricer/src/fetchers/mod.rs
@@ -1,7 +1,9 @@
 mod binance;
 mod kibo;
 mod kraken;
+mod retry;
 
 pub use binance::*;
 pub use kibo::*;
 pub use kraken::*;
+use retry::*;
diff --git a/pricer/src/retry.rs b/pricer/src/fetchers/retry.rs
similarity index 83%
rename from pricer/src/retry.rs
rename to pricer/src/fetchers/retry.rs
index f200ced47..555e4a31c 100644
--- a/pricer/src/retry.rs
+++ b/pricer/src/fetchers/retry.rs
@@ -1,5 +1,7 @@
 use std::{thread::sleep, time::Duration};
 
+use logger::info;
+
 pub fn retry<T>(
     function: impl Fn(usize) -> color_eyre::Result<T>,
     sleep_in_s: u64,
@@ -13,6 +15,7 @@ pub fn retry<T>(
         if i == retries || res.is_ok() {
             return res;
         } else {
+            info!("Failed, waiting {sleep_in_s} seconds...");
             sleep(Duration::from_secs(sleep_in_s));
         }
 
diff --git a/pricer/src/lib.rs b/pricer/src/lib.rs
index b93cf3ffd..01562e543 100644
--- a/pricer/src/lib.rs
+++ b/pricer/src/lib.rs
@@ -1,14 +1,5 @@
-pub fn add(left: u64, right: u64) -> u64 {
-    left + right
-}
+mod fetchers;
+mod structs;
 
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn it_works() {
-        let result = add(2, 2);
-        assert_eq!(result, 4);
-    }
-}
+pub use fetchers::*;
+pub use structs::*;
diff --git a/pricer/src/main.rs b/pricer/src/main.rs
new file mode 100644
index 000000000..c73ec56b7
--- /dev/null
+++ b/pricer/src/main.rs
@@ -0,0 +1,16 @@
+// fn main() {}
+
+use pricer::{Binance, Kraken};
+
+fn main() -> color_eyre::Result<()> {
+    color_eyre::install()?;
+
+    logger::init_log(None);
+
+    // dbg!(Binance::fetch_daily_prices());
+    // dbg!(Binance::fetch_1mn_prices());
+    // dbg!(Kraken::fetch_daily_prices());
+    dbg!(Kraken::fetch_1mn_prices());
+
+    Ok(())
+}
diff --git a/pricer/src/price.rs b/pricer/src/price.rs
index ca79bd945..5c98da0a1 100644
--- a/pricer/src/price.rs
+++ b/pricer/src/price.rs
@@ -9,8 +9,8 @@ use struct_iterable::Iterable;
 use crate::{
     parser::price::{Binance, Kibo, Kraken},
     structs::{
-        Amount, BiMap, Config, Date, DateMap, DateMapChunkId, Height, HeightMapChunkId, MapKey,
-        MapKind, Timestamp, OHLC,
+        Amount, BiMap, Config, Date, DateMap, DateMapChunkId, Height, HeightMapChunkId, MapKey, MapKind, Timestamp,
+        OHLC,
     },
     utils::{ONE_MONTH_IN_DAYS, ONE_WEEK_IN_DAYS, ONE_YEAR_IN_DAYS},
 };
@@ -34,54 +34,6 @@ pub struct PriceDatasets {
     pub high: BiMap<f32>,
     pub low: BiMap<f32>,
     pub close: BiMap<f32>,
-    pub market_cap: BiMap<f32>,
-    pub price_1w_sma: BiMap<f32>,
-    pub price_1w_sma_ratio: RatioDataset,
-    pub price_1m_sma: BiMap<f32>,
-    pub price_1m_sma_ratio: RatioDataset,
-    pub price_1y_sma: BiMap<f32>,
-    pub price_1y_sma_ratio: RatioDataset,
-    pub price_2y_sma: BiMap<f32>,
-    pub price_2y_sma_ratio: RatioDataset,
-    pub price_4y_sma: BiMap<f32>,
-    pub price_4y_sma_ratio: RatioDataset,
-    pub price_8d_sma: BiMap<f32>,
-    pub price_8d_sma_ratio: RatioDataset,
-    pub price_13d_sma: BiMap<f32>,
-    pub price_13d_sma_ratio: RatioDataset,
-    pub price_21d_sma: BiMap<f32>,
-    pub price_21d_sma_ratio: RatioDataset,
-    pub price_34d_sma: BiMap<f32>,
-    pub price_34d_sma_ratio: RatioDataset,
-    pub price_55d_sma: BiMap<f32>,
-    pub price_55d_sma_ratio: RatioDataset,
-    pub price_89d_sma: BiMap<f32>,
-    pub price_89d_sma_ratio: RatioDataset,
-    pub price_144d_sma: BiMap<f32>,
-    pub price_144d_sma_ratio: RatioDataset,
-    pub price_200w_sma: BiMap<f32>,
-    pub price_200w_sma_ratio: RatioDataset,
-    pub price_1d_total_return: DateMap<f32>,
-    pub price_1m_total_return: DateMap<f32>,
-    pub price_6m_total_return: DateMap<f32>,
-    pub price_1y_total_return: DateMap<f32>,
-    pub price_2y_total_return: DateMap<f32>,
-    pub price_3y_total_return: DateMap<f32>,
-    pub price_4y_total_return: DateMap<f32>,
-    pub price_6y_total_return: DateMap<f32>,
-    pub price_8y_total_return: DateMap<f32>,
-    pub price_10y_total_return: DateMap<f32>,
-    pub price_4y_compound_return: DateMap<f32>,
-    // projection via lowest 4y compound value
-    pub all_time_high: BiMap<f32>,
-    pub all_time_high_date: DateMap<Date>,
-    pub days_since_all_time_high: DateMap<u32>,
-    pub max_days_between_all_time_highs: DateMap<u32>,
-    pub max_years_between_all_time_highs: DateMap<f32>,
-    pub market_price_to_all_time_high_ratio: BiMap<f32>,
-    pub drawdown: BiMap<f32>,
-    pub sats_per_dollar: BiMap<f32>,
-    // volatility
 }
 
 impl PriceDatasets {
@@ -108,116 +60,10 @@ impl PriceDatasets {
             // ---
             // Computed
             // ---
-            open: BiMap::new_bin(1, MapKind::Computed, &f("open")),
-            high: BiMap::new_bin(1, MapKind::Computed, &f("high")),
-            low: BiMap::new_bin(1, MapKind::Computed, &f("low")),
+            open_cents: BiMap::new_bin(1, MapKind::Computed, &f("open")),
+            high_cents: BiMap::new_bin(1, MapKind::Computed, &f("high")),
+            low_cents: BiMap::new_bin(1, MapKind::Computed, &f("low")),
             close: BiMap::new_bin(1, MapKind::Computed, &f("close")),
-            market_cap: BiMap::new_bin(1, MapKind::Computed, &f("market_cap")),
-            price_1w_sma: BiMap::new_bin(1, MapKind::Computed, &f("price_1w_sma")),
-            price_1w_sma_ratio: RatioDataset::import(&path_dataset, "price_1w_sma", config)?,
-            price_1m_sma: BiMap::new_bin(1, MapKind::Computed, &f("price_1m_sma")),
-            price_1m_sma_ratio: RatioDataset::import(&path_dataset, "price_1m_sma", config)?,
-            price_1y_sma: BiMap::new_bin(1, MapKind::Computed, &f("price_1y_sma")),
-            price_1y_sma_ratio: RatioDataset::import(&path_dataset, "price_1y_sma", config)?,
-            price_2y_sma: BiMap::new_bin(1, MapKind::Computed, &f("price_2y_sma")),
-            price_2y_sma_ratio: RatioDataset::import(&path_dataset, "price_2y_sma", config)?,
-            price_4y_sma: BiMap::new_bin(1, MapKind::Computed, &f("price_4y_sma")),
-            price_4y_sma_ratio: RatioDataset::import(&path_dataset, "price_4y_sma", config)?,
-            price_8d_sma: BiMap::new_bin(1, MapKind::Computed, &f("price_8d_sma")),
-            price_8d_sma_ratio: RatioDataset::import(&path_dataset, "price_8d_sma", config)?,
-            price_13d_sma: BiMap::new_bin(1, MapKind::Computed, &f("price_13d_sma")),
-            price_13d_sma_ratio: RatioDataset::import(&path_dataset, "price_13d_sma", config)?,
-            price_21d_sma: BiMap::new_bin(1, MapKind::Computed, &f("price_21d_sma")),
-            price_21d_sma_ratio: RatioDataset::import(&path_dataset, "price_21d_sma", config)?,
-            price_34d_sma: BiMap::new_bin(1, MapKind::Computed, &f("price_34d_sma")),
-            price_34d_sma_ratio: RatioDataset::import(&path_dataset, "price_34d_sma", config)?,
-            price_55d_sma: BiMap::new_bin(1, MapKind::Computed, &f("price_55d_sma")),
-            price_55d_sma_ratio: RatioDataset::import(&path_dataset, "price_55d_sma", config)?,
-            price_89d_sma: BiMap::new_bin(1, MapKind::Computed, &f("price_89d_sma")),
-            price_89d_sma_ratio: RatioDataset::import(&path_dataset, "price_89d_sma", config)?,
-            price_144d_sma: BiMap::new_bin(1, MapKind::Computed, &f("price_144d_sma")),
-            price_144d_sma_ratio: RatioDataset::import(&path_dataset, "price_144d_sma", config)?,
-            price_200w_sma: BiMap::new_bin(1, MapKind::Computed, &f("price_200w_sma")),
-            price_200w_sma_ratio: RatioDataset::import(&path_dataset, "price_200w_sma", config)?,
-            price_1d_total_return: DateMap::new_bin(
-                1,
-                MapKind::Computed,
-                &f("price_1d_total_return"),
-            ),
-            price_1m_total_return: DateMap::new_bin(
-                1,
-                MapKind::Computed,
-                &f("price_1m_total_return"),
-            ),
-            price_6m_total_return: DateMap::new_bin(
-                1,
-                MapKind::Computed,
-                &f("price_6m_total_return"),
-            ),
-            price_1y_total_return: DateMap::new_bin(
-                1,
-                MapKind::Computed,
-                &f("price_1y_total_return"),
-            ),
-            price_2y_total_return: DateMap::new_bin(
-                1,
-                MapKind::Computed,
-                &f("price_2y_total_return"),
-            ),
-            price_3y_total_return: DateMap::new_bin(
-                1,
-                MapKind::Computed,
-                &f("price_3y_total_return"),
-            ),
-            price_4y_total_return: DateMap::new_bin(
-                1,
-                MapKind::Computed,
-                &f("price_4y_total_return"),
-            ),
-            price_6y_total_return: DateMap::new_bin(
-                1,
-                MapKind::Computed,
-                &f("price_6y_total_return"),
-            ),
-            price_8y_total_return: DateMap::new_bin(
-                1,
-                MapKind::Computed,
-                &f("price_8y_total_return"),
-            ),
-            price_10y_total_return: DateMap::new_bin(
-                1,
-                MapKind::Computed,
-                &f("price_10y_total_return"),
-            ),
-            price_4y_compound_return: DateMap::new_bin(
-                1,
-                MapKind::Computed,
-                &f("price_4y_compound_return"),
-            ),
-            all_time_high: BiMap::new_bin(1, MapKind::Computed, &f("all_time_high")),
-            all_time_high_date: DateMap::new_bin(1, MapKind::Computed, &f("all_time_high_date")),
-            days_since_all_time_high: DateMap::new_bin(
-                1,
-                MapKind::Computed,
-                &f("days_since_all_time_high"),
-            ),
-            max_days_between_all_time_highs: DateMap::new_bin(
-                1,
-                MapKind::Computed,
-                &f("max_days_between_all_time_highs"),
-            ),
-            max_years_between_all_time_highs: DateMap::new_bin(
-                2,
-                MapKind::Computed,
-                &f("max_years_between_all_time_highs"),
-            ),
-            market_price_to_all_time_high_ratio: BiMap::new_bin(
-                1,
-                MapKind::Computed,
-                &f("market_price_to_all_time_high_ratio"),
-            ),
-            drawdown: BiMap::new_bin(1, MapKind::Computed, &f("drawdown")),
-            sats_per_dollar: BiMap::new_bin(1, MapKind::Computed, &f("sats_per_dollar")),
         };
 
         s.min_initial_states
@@ -240,213 +86,6 @@ impl PriceDatasets {
 
         self.close
             .multi_insert_simple_transform(heights, dates, &mut self.ohlc, &|ohlc| ohlc.close);
-
-        self.market_cap
-            .multi_insert_multiply(heights, dates, &mut self.close, circulating_supply);
-
-        self.price_1w_sma.multi_insert_simple_average(
-            heights,
-            dates,
-            &mut self.close,
-            ONE_WEEK_IN_DAYS,
-        );
-
-        self.price_1m_sma.multi_insert_simple_average(
-            heights,
-            dates,
-            &mut self.close,
-            ONE_MONTH_IN_DAYS,
-        );
-
-        self.price_1y_sma.multi_insert_simple_average(
-            heights,
-            dates,
-            &mut self.close,
-            ONE_YEAR_IN_DAYS,
-        );
-
-        self.price_2y_sma.multi_insert_simple_average(
-            heights,
-            dates,
-            &mut self.close,
-            2 * ONE_YEAR_IN_DAYS,
-        );
-
-        self.price_4y_sma.multi_insert_simple_average(
-            heights,
-            dates,
-            &mut self.close,
-            4 * ONE_YEAR_IN_DAYS,
-        );
-
-        self.price_8d_sma
-            .multi_insert_simple_average(heights, dates, &mut self.close, 8);
-
-        self.price_13d_sma
-            .multi_insert_simple_average(heights, dates, &mut self.close, 13);
-
-        self.price_21d_sma
-            .multi_insert_simple_average(heights, dates, &mut self.close, 21);
-
-        self.price_34d_sma
-            .multi_insert_simple_average(heights, dates, &mut self.close, 34);
-
-        self.price_55d_sma
-            .multi_insert_simple_average(heights, dates, &mut self.close, 55);
-
-        self.price_89d_sma
-            .multi_insert_simple_average(heights, dates, &mut self.close, 89);
-
-        self.price_144d_sma
-            .multi_insert_simple_average(heights, dates, &mut self.close, 144);
-
-        self.price_200w_sma.multi_insert_simple_average(
-            heights,
-            dates,
-            &mut self.close,
-            200 * ONE_WEEK_IN_DAYS,
-        );
-
-        self.price_1d_total_return
-            .multi_insert_percentage_change(dates, &mut self.close.date, 1);
-        self.price_1m_total_return.multi_insert_percentage_change(
-            dates,
-            &mut self.close.date,
-            ONE_MONTH_IN_DAYS,
-        );
-        self.price_6m_total_return.multi_insert_percentage_change(
-            dates,
-            &mut self.close.date,
-            6 * ONE_MONTH_IN_DAYS,
-        );
-        self.price_1y_total_return.multi_insert_percentage_change(
-            dates,
-            &mut self.close.date,
-            ONE_YEAR_IN_DAYS,
-        );
-        self.price_2y_total_return.multi_insert_percentage_change(
-            dates,
-            &mut self.close.date,
-            2 * ONE_YEAR_IN_DAYS,
-        );
-        self.price_3y_total_return.multi_insert_percentage_change(
-            dates,
-            &mut self.close.date,
-            3 * ONE_YEAR_IN_DAYS,
-        );
-        self.price_4y_total_return.multi_insert_percentage_change(
-            dates,
-            &mut self.close.date,
-            4 * ONE_YEAR_IN_DAYS,
-        );
-        self.price_6y_total_return.multi_insert_percentage_change(
-            dates,
-            &mut self.close.date,
-            6 * ONE_YEAR_IN_DAYS,
-        );
-        self.price_8y_total_return.multi_insert_percentage_change(
-            dates,
-            &mut self.close.date,
-            8 * ONE_YEAR_IN_DAYS,
-        );
-        self.price_10y_total_return.multi_insert_percentage_change(
-            dates,
-            &mut self.close.date,
-            10 * ONE_YEAR_IN_DAYS,
-        );
-
-        self.price_4y_compound_return
-            .multi_insert_complex_transform(
-                dates,
-                &mut self.close.date,
-                |(last_value, date, closes, _)| {
-                    let previous_value = date
-                        .checked_sub_days(Days::new(4 * ONE_YEAR_IN_DAYS as u64))
-                        .and_then(|date| closes.get_or_import(&Date::wrap(date)))
-                        .unwrap_or_default();
-
-                    (((last_value / previous_value).powf(1.0 / 4.0)) - 1.0) * 100.0
-                },
-            );
-
-        self.price_1w_sma_ratio
-            .compute(compute_data, &mut self.close, &mut self.price_1w_sma);
-        self.price_1m_sma_ratio
-            .compute(compute_data, &mut self.close, &mut self.price_1m_sma);
-        self.price_1y_sma_ratio
-            .compute(compute_data, &mut self.close, &mut self.price_1y_sma);
-        self.price_2y_sma_ratio
-            .compute(compute_data, &mut self.close, &mut self.price_2y_sma);
-        self.price_4y_sma_ratio
-            .compute(compute_data, &mut self.close, &mut self.price_4y_sma);
-        self.price_8d_sma_ratio
-            .compute(compute_data, &mut self.close, &mut self.price_8d_sma);
-        self.price_13d_sma_ratio
-            .compute(compute_data, &mut self.close, &mut self.price_13d_sma);
-        self.price_21d_sma_ratio
-            .compute(compute_data, &mut self.close, &mut self.price_21d_sma);
-        self.price_34d_sma_ratio
-            .compute(compute_data, &mut self.close, &mut self.price_34d_sma);
-        self.price_55d_sma_ratio
-            .compute(compute_data, &mut self.close, &mut self.price_55d_sma);
-        self.price_89d_sma_ratio
-            .compute(compute_data, &mut self.close, &mut self.price_89d_sma);
-        self.price_144d_sma_ratio
-            .compute(compute_data, &mut self.close, &mut self.price_144d_sma);
-        self.price_200w_sma_ratio
-            .compute(compute_data, &mut self.close, &mut self.price_200w_sma);
-
-        self.all_time_high
-            .multi_insert_max(heights, dates, &mut self.high);
-
-        self.market_price_to_all_time_high_ratio
-            .multi_insert_percentage(heights, dates, &mut self.close, &mut self.all_time_high);
-
-        self.all_time_high_date.multi_insert_complex_transform(
-            dates,
-            &mut self.all_time_high.date,
-            |(value, date, _, map)| {
-                let high = self.high.date.get_or_import(date).unwrap();
-                let is_ath = high == value;
-
-                if is_ath {
-                    *date
-                } else {
-                    let previous_date = date.checked_sub(1).unwrap();
-                    *map.get_or_import(&previous_date).as_ref().unwrap_or(date)
-                }
-            },
-        );
-
-        self.days_since_all_time_high.multi_insert_simple_transform(
-            dates,
-            &mut self.all_time_high_date,
-            |value, key| key.difference_in_days_between(value),
-        );
-
-        self.max_days_between_all_time_highs
-            .multi_insert_max(dates, &mut self.days_since_all_time_high);
-
-        self.max_years_between_all_time_highs
-            .multi_insert_simple_transform(
-                dates,
-                &mut self.max_days_between_all_time_highs,
-                |days, _| (days as f64 / ONE_YEAR_IN_DAYS as f64) as f32,
-            );
-
-        self.drawdown.multi_insert_simple_transform(
-            heights,
-            dates,
-            &mut self.market_price_to_all_time_high_ratio,
-            &|v| -(100.0 - v),
-        );
-
-        self.sats_per_dollar.multi_insert_simple_transform(
-            heights,
-            dates,
-            &mut self.close,
-            &|price| Amount::ONE_BTC_F32 / price,
-        );
     }
 
     pub fn get_date_ohlc(&mut self, date: Date) -> color_eyre::Result<OHLC> {
@@ -469,17 +108,9 @@ impl PriceDatasets {
 
         #[allow(clippy::map_entry)]
         if !self.kibo_by_date.contains_key(&chunk_id)
-            || self
-                .kibo_by_date
-                .get(&chunk_id)
-                .unwrap()
-                .last_key_value()
-                .unwrap()
-                .0
-                < date
+            || self.kibo_by_date.get(&chunk_id).unwrap().last_key_value().unwrap().0 < date
         {
-            self.kibo_by_date
-                .insert(chunk_id, Kibo::fetch_date_prices(chunk_id)?);
+            self.kibo_by_date.insert(chunk_id, Kibo::fetch_date_prices(chunk_id)?);
         }
 
         self.kibo_by_date
@@ -491,16 +122,7 @@ impl PriceDatasets {
     }
 
     fn get_from_daily_kraken(&mut self, date: &Date) -> color_eyre::Result<OHLC> {
-        if self.kraken_daily.is_none()
-            || self
-                .kraken_daily
-                .as_ref()
-                .unwrap()
-                .last_key_value()
-                .unwrap()
-                .0
-                < date
-        {
+        if self.kraken_daily.is_none() || self.kraken_daily.as_ref().unwrap().last_key_value().unwrap().0 < date {
             self.kraken_daily.replace(Kraken::fetch_daily_prices()?);
         }
 
@@ -513,16 +135,7 @@ impl PriceDatasets {
     }
 
     fn get_from_daily_binance(&mut self, date: &Date) -> color_eyre::Result<OHLC> {
-        if self.binance_daily.is_none()
-            || self
-                .binance_daily
-                .as_ref()
-                .unwrap()
-                .last_key_value()
-                .unwrap()
-                .0
-                < date
-        {
+        if self.binance_daily.is_none() || self.binance_daily.as_ref().unwrap().last_key_value().unwrap().0 < date {
             self.binance_daily.replace(Binance::fetch_daily_prices()?);
         }
 
@@ -593,8 +206,7 @@ How to fix this:
 
         #[allow(clippy::map_entry)]
         if !self.kibo_by_height.contains_key(&chunk_id)
-            || ((chunk_id.to_usize() + self.kibo_by_height.get(&chunk_id).unwrap().len())
-                <= height.to_usize())
+            || ((chunk_id.to_usize() + self.kibo_by_height.get(&chunk_id).unwrap().len()) <= height.to_usize())
         {
             self.kibo_by_height
                 .insert(chunk_id, Kibo::fetch_height_prices(chunk_id)?);
@@ -613,16 +225,7 @@ How to fix this:
         timestamp: Timestamp,
         previous_timestamp: Option<Timestamp>,
     ) -> color_eyre::Result<OHLC> {
-        if self.kraken_1mn.is_none()
-            || self
-                .kraken_1mn
-                .as_ref()
-                .unwrap()
-                .last_key_value()
-                .unwrap()
-                .0
-                <= &timestamp
-        {
+        if self.kraken_1mn.is_none() || self.kraken_1mn.as_ref().unwrap().last_key_value().unwrap().0 <= &timestamp {
             self.kraken_1mn.replace(Kraken::fetch_1mn_prices()?);
         }
 
@@ -634,25 +237,11 @@ How to fix this:
         timestamp: Timestamp,
         previous_timestamp: Option<Timestamp>,
     ) -> color_eyre::Result<OHLC> {
-        if self.binance_1mn.is_none()
-            || self
-                .binance_1mn
-                .as_ref()
-                .unwrap()
-                .last_key_value()
-                .unwrap()
-                .0
-                <= &timestamp
-        {
+        if self.binance_1mn.is_none() || self.binance_1mn.as_ref().unwrap().last_key_value().unwrap().0 <= &timestamp {
             self.binance_1mn.replace(Binance::fetch_1mn_prices()?);
         }
 
-        Self::find_height_ohlc(
-            &self.binance_1mn,
-            timestamp,
-            previous_timestamp,
-            "binance 1m",
-        )
+        Self::find_height_ohlc(&self.binance_1mn, timestamp, previous_timestamp, "binance 1m")
     }
 
     fn get_from_har_binance(
@@ -666,12 +255,7 @@ How to fix this:
                 .replace(Binance::read_har_file(config).unwrap_or_default());
         }
 
-        Self::find_height_ohlc(
-            &self.binance_har,
-            timestamp,
-            previous_timestamp,
-            "binance har",
-        )
+        Self::find_height_ohlc(&self.binance_har, timestamp, previous_timestamp, "binance har")
     }
 
     fn find_height_ohlc(
@@ -684,10 +268,9 @@ How to fix this:
 
         let err = Error::msg(format!("Couldn't find timestamp in {name}"));
 
-        let previous_ohlc = previous_timestamp
-            .map_or(Some(OHLC::default()), |previous_timestamp| {
-                tree.get(&previous_timestamp).cloned()
-            });
+        let previous_ohlc = previous_timestamp.map_or(Some(OHLC::default()), |previous_timestamp| {
+            tree.get(&previous_timestamp).cloned()
+        });
 
         let last_ohlc = tree.get(&timestamp);
 
diff --git a/pricer/src/price/binance.rs b/pricer/src/price/binance.rs
deleted file mode 100644
index 0967ad1e0..000000000
--- a/pricer/src/price/binance.rs
+++ /dev/null
@@ -1,213 +0,0 @@
-#![allow(dead_code)]
-
-use std::{collections::BTreeMap, fs};
-
-use color_eyre::eyre::ContextCompat;
-use itertools::Itertools;
-use log::info;
-use serde_json::Value;
-
-use crate::{
-    io::Json,
-    structs::{Config, Date, Timestamp, OHLC},
-    utils::retry,
-};
-
-pub struct Binance;
-
-impl Binance {
-    pub fn read_har_file(config: &Config) -> color_eyre::Result<BTreeMap<u32, OHLC>> {
-        info!("binance: read har file");
-
-        let path = config.path_inputs();
-
-        fs::create_dir_all(&path)?;
-
-        let path_binance_har = path.join("binance.har");
-
-        let json: BTreeMap<String, Value> = Json::import(&path_binance_har).unwrap_or_default();
-
-        Ok(json
-            .get("log")
-            .context("Expect object to have log attribute")?
-            .as_object()
-            .context("Expect to be an object")?
-            .get("entries")
-            .context("Expect object to have entries")?
-            .as_array()
-            .context("Expect to be an array")?
-            .iter()
-            .filter(|entry| {
-                entry
-                    .as_object()
-                    .unwrap()
-                    .get("request")
-                    .unwrap()
-                    .as_object()
-                    .unwrap()
-                    .get("url")
-                    .unwrap()
-                    .as_str()
-                    .unwrap()
-                    .contains("/uiKlines")
-            })
-            .flat_map(|entry| {
-                let response = entry
-                    .as_object()
-                    .unwrap()
-                    .get("response")
-                    .unwrap()
-                    .as_object()
-                    .unwrap();
-
-                let content = response.get("content").unwrap().as_object().unwrap();
-
-                let text = content.get("text");
-
-                if text.is_none() {
-                    return vec![];
-                }
-
-                let text = text.unwrap().as_str().unwrap();
-
-                let arrays: Value = serde_json::from_str(text).unwrap();
-
-                arrays
-                    .as_array()
-                    .unwrap()
-                    .iter()
-                    .map(|array| {
-                        let array = array.as_array().unwrap();
-
-                        let timestamp = (array.first().unwrap().as_u64().unwrap() / 1000) as u32;
-
-                        let get_f32 = |index: usize| {
-                            array
-                                .get(index)
-                                .unwrap()
-                                .as_str()
-                                .unwrap()
-                                .parse::<f32>()
-                                .unwrap()
-                        };
-
-                        (
-                            timestamp,
-                            OHLC {
-                                open: get_f32(1),
-                                high: get_f32(2),
-                                low: get_f32(3),
-                                close: get_f32(4),
-                            },
-                        )
-                    })
-                    .collect_vec()
-            })
-            .collect::<BTreeMap<_, _>>())
-    }
-
-    pub fn fetch_1mn_prices() -> color_eyre::Result<BTreeMap<u32, OHLC>> {
-        info!("binance: fetch 1mn");
-
-        retry(
-            |_| {
-                let body: Value = reqwest::blocking::get(
-                    "https://api.binance.com/api/v3/uiKlines?symbol=BTCUSDT&interval=1m&limit=1000",
-                )?
-                .json()?;
-
-                Ok(body
-                    .as_array()
-                    .context("Expect to be an array")?
-                    .iter()
-                    .map(|value| -> color_eyre::Result<_> {
-                        // [timestamp, open, high, low, close, volume, ...]
-                        let array = value.as_array().context("Expect to be array")?;
-
-                        let timestamp = (array
-                            .first()
-                            .context("Expect to have first")?
-                            .as_u64()
-                            .context("Expect to be convertible to u64")?
-                            / 1_000) as u32;
-
-                        let get_f32 = |index: usize| -> color_eyre::Result<f32> {
-                            Ok(array
-                                .get(index)
-                                .context("Expect to have index")?
-                                .as_str()
-                                .context("Expect to have &str")?
-                                .parse::<f32>()?)
-                        };
-
-                        Ok((
-                            timestamp,
-                            OHLC {
-                                open: get_f32(1)?,
-                                high: get_f32(2)?,
-                                low: get_f32(3)?,
-                                close: get_f32(4)?,
-                            },
-                        ))
-                    })
-                    .collect::<Result<BTreeMap<_, _>, _>>()?)
-            },
-            30,
-            10,
-        )
-    }
-
-    pub fn fetch_daily_prices() -> color_eyre::Result<BTreeMap<Date, OHLC>> {
-        info!("binance: fetch 1d");
-
-        retry(
-            |_| {
-                let body: Value = reqwest::blocking::get(
-                    "https://api.binance.com/api/v3/uiKlines?symbol=BTCUSDT&interval=1d",
-                )?
-                .json()?;
-
-                Ok(body
-                    .as_array()
-                    .context("Expect to be an array")?
-                    .iter()
-                    .map(|value| -> color_eyre::Result<_> {
-                        // [timestamp, open, high, low, close, volume, ...]
-                        let array = value.as_array().context("Expect to be array")?;
-
-                        let date = Timestamp::from(
-                            (array
-                                .first()
-                                .context("Expect to have first")?
-                                .as_u64()
-                                .context("Expect to be convertible to u64")?
-                                / 1_000) as u32,
-                        )
-                        .to_date();
-
-                        let get_f32 = |index: usize| -> color_eyre::Result<f32> {
-                            Ok(array
-                                .get(index)
-                                .context("Expect to have index")?
-                                .as_str()
-                                .context("Expect to have &str")?
-                                .parse::<f32>()?)
-                        };
-
-                        Ok((
-                            date,
-                            OHLC {
-                                open: get_f32(1)?,
-                                high: get_f32(2)?,
-                                low: get_f32(3)?,
-                                close: get_f32(4)?,
-                            },
-                        ))
-                    })
-                    .collect::<Result<BTreeMap<_, _>, _>>()?)
-            },
-            30,
-            10,
-        )
-    }
-}
diff --git a/pricer/src/price/kraken.rs b/pricer/src/price/kraken.rs
deleted file mode 100644
index 99566fee0..000000000
--- a/pricer/src/price/kraken.rs
+++ /dev/null
@@ -1,133 +0,0 @@
-use std::collections::BTreeMap;
-
-use color_eyre::eyre::ContextCompat;
-use log::info;
-use serde_json::Value;
-
-use crate::{
-    structs::{Date, Timestamp, OHLC},
-    utils::retry,
-};
-
-pub struct Kraken;
-
-impl Kraken {
-    pub fn fetch_1mn_prices() -> color_eyre::Result<BTreeMap<u32, OHLC>> {
-        info!("kraken: fetch 1mn");
-
-        retry(
-            |_| {
-                let body: Value = reqwest::blocking::get(
-                    "https://api.kraken.com/0/public/OHLC?pair=XBTUSD&interval=1",
-                )?
-                .json()?;
-
-                Ok(body
-                    .as_object()
-                    .context("Expect to be an object")?
-                    .get("result")
-                    .context("Expect object to have result")?
-                    .as_object()
-                    .context("Expect to be an object")?
-                    .get("XXBTZUSD")
-                    .context("Expect to have XXBTZUSD")?
-                    .as_array()
-                    .context("Expect to be an array")?
-                    .iter()
-                    .map(|value| -> color_eyre::Result<_> {
-                        let array = value.as_array().context("Expect as_array to work")?;
-
-                        let timestamp = array
-                            .first()
-                            .context("Expect first to work")?
-                            .as_u64()
-                            .expect("Expect as_u64 to work")
-                            as u32;
-
-                        let get_f32 = |index: usize| -> color_eyre::Result<f32> {
-                            Ok(array
-                                .get(index)
-                                .context("Expect get index to work")?
-                                .as_str()
-                                .context("Expect as_str to work")?
-                                .parse::<f32>()?)
-                        };
-
-                        Ok((
-                            timestamp,
-                            OHLC {
-                                open: get_f32(1)?,
-                                high: get_f32(2)?,
-                                low: get_f32(3)?,
-                                close: get_f32(4)?,
-                            },
-                        ))
-                    })
-                    .collect::<Result<BTreeMap<_, _>, _>>()?)
-            },
-            30,
-            10,
-        )
-    }
-
-    pub fn fetch_daily_prices() -> color_eyre::Result<BTreeMap<Date, OHLC>> {
-        info!("fetch kraken daily");
-
-        retry(
-            |_| {
-                let body: Value = reqwest::blocking::get(
-                    "https://api.kraken.com/0/public/OHLC?pair=XBTUSD&interval=1440",
-                )?
-                .json()?;
-
-                Ok(body
-                    .as_object()
-                    .context("Expect to be an object")?
-                    .get("result")
-                    .context("Expect object to have result")?
-                    .as_object()
-                    .context("Expect to be an object")?
-                    .get("XXBTZUSD")
-                    .context("Expect to have XXBTZUSD")?
-                    .as_array()
-                    .context("Expect to be an array")?
-                    .iter()
-                    .map(|value| -> color_eyre::Result<_> {
-                        let array = value.as_array().context("Expect as_array to work")?;
-
-                        let date = Timestamp::from(
-                            array
-                                .first()
-                                .context("Expect first to work")?
-                                .as_u64()
-                                .context("Expect as_u64 to work")?
-                                as u32,
-                        )
-                        .to_date();
-
-                        let get_f32 = |index: usize| -> color_eyre::Result<f32> {
-                            Ok(array
-                                .get(index)
-                                .context("Expect get index to work")?
-                                .as_str()
-                                .context("Expect as_str to work")?
-                                .parse::<f32>()?)
-                        };
-
-                        Ok((
-                            date,
-                            OHLC {
-                                open: get_f32(1)?,
-                                high: get_f32(2)?,
-                                low: get_f32(3)?,
-                                close: get_f32(4)?,
-                            },
-                        ))
-                    })
-                    .collect::<Result<BTreeMap<_, _>, _>>()?)
-            },
-            30,
-            10,
-        )
-    }
-}
diff --git a/pricer/src/structs/cents.rs b/pricer/src/structs/cents.rs
new file mode 100644
index 000000000..839c5fcea
--- /dev/null
+++ b/pricer/src/structs/cents.rs
@@ -0,0 +1,14 @@
+use derive_deref::Deref;
+use serde::Serialize;
+use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout};
+
+use super::Dollars;
+
+#[derive(Debug, Default, Clone, Copy, Deref, FromBytes, Immutable, IntoBytes, KnownLayout, Serialize)]
+pub struct Cents(u64);
+
+impl From<Dollars> for Cents {
+    fn from(value: Dollars) -> Self {
+        Self((*value * 100.0).floor() as u64)
+    }
+}
diff --git a/pricer/src/structs/close.rs b/pricer/src/structs/close.rs
new file mode 100644
index 000000000..c3a15b543
--- /dev/null
+++ b/pricer/src/structs/close.rs
@@ -0,0 +1,12 @@
+use derive_deref::Deref;
+use serde::Serialize;
+use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout};
+
+#[derive(Debug, Default, Clone, Copy, FromBytes, Immutable, IntoBytes, KnownLayout, Deref, Serialize)]
+#[repr(C)]
+pub struct Close<T>(T);
+impl<T> From<T> for Close<T> {
+    fn from(value: T) -> Self {
+        Self(value)
+    }
+}
diff --git a/computer/src/structs/date.rs b/pricer/src/structs/date.rs
similarity index 95%
rename from computer/src/structs/date.rs
rename to pricer/src/structs/date.rs
index 997559a0b..e4c422888 100644
--- a/computer/src/structs/date.rs
+++ b/pricer/src/structs/date.rs
@@ -5,7 +5,7 @@ use indexer::Timestamp;
 use jiff::{civil::Date as Date_, tz::TimeZone, Span};
 use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout};
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq, FromBytes, Immutable, IntoBytes, KnownLayout)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, FromBytes, Immutable, IntoBytes, KnownLayout)]
 pub struct Date(u32);
 
 impl Date {
diff --git a/computer/src/structs/dateindex.rs b/pricer/src/structs/dateindex.rs
similarity index 100%
rename from computer/src/structs/dateindex.rs
rename to pricer/src/structs/dateindex.rs
diff --git a/pricer/src/structs/dollars.rs b/pricer/src/structs/dollars.rs
new file mode 100644
index 000000000..321106bba
--- /dev/null
+++ b/pricer/src/structs/dollars.rs
@@ -0,0 +1,18 @@
+use derive_deref::Deref;
+
+use super::Cents;
+
+#[derive(Debug, Default, Clone, Copy, Deref)]
+pub struct Dollars(f64);
+
+impl From<f64> for Dollars {
+    fn from(value: f64) -> Self {
+        Self(value)
+    }
+}
+
+impl From<Cents> for Dollars {
+    fn from(value: Cents) -> Self {
+        Self((*value as f64) / 100.0)
+    }
+}
diff --git a/pricer/src/structs/high.rs b/pricer/src/structs/high.rs
new file mode 100644
index 000000000..51947090a
--- /dev/null
+++ b/pricer/src/structs/high.rs
@@ -0,0 +1,12 @@
+use derive_deref::Deref;
+use serde::Serialize;
+use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout};
+
+#[derive(Debug, Default, Clone, Copy, FromBytes, Immutable, IntoBytes, KnownLayout, Deref, Serialize)]
+#[repr(C)]
+pub struct High<T>(T);
+impl<T> From<T> for High<T> {
+    fn from(value: T) -> Self {
+        Self(value)
+    }
+}
diff --git a/pricer/src/structs/low.rs b/pricer/src/structs/low.rs
new file mode 100644
index 000000000..3c4988fea
--- /dev/null
+++ b/pricer/src/structs/low.rs
@@ -0,0 +1,12 @@
+use derive_deref::Deref;
+use serde::Serialize;
+use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout};
+
+#[derive(Debug, Default, Clone, Copy, FromBytes, Immutable, IntoBytes, KnownLayout, Deref, Serialize)]
+#[repr(C)]
+pub struct Low<T>(T);
+impl<T> From<T> for Low<T> {
+    fn from(value: T) -> Self {
+        Self(value)
+    }
+}
diff --git a/pricer/src/structs/mod.rs b/pricer/src/structs/mod.rs
new file mode 100644
index 000000000..5d1dfcf2b
--- /dev/null
+++ b/pricer/src/structs/mod.rs
@@ -0,0 +1,19 @@
+mod cents;
+mod close;
+mod date;
+mod dateindex;
+mod dollars;
+mod high;
+mod low;
+mod open;
+
+pub use cents::*;
+pub use close::*;
+pub use date::*;
+pub use dateindex::*;
+pub use dollars::*;
+pub use high::*;
+pub use low::*;
+pub use open::*;
+
+pub type OHLC = (Open<Cents>, High<Cents>, Low<Cents>, Close<Cents>);
diff --git a/pricer/src/structs/open.rs b/pricer/src/structs/open.rs
new file mode 100644
index 000000000..b6632c90d
--- /dev/null
+++ b/pricer/src/structs/open.rs
@@ -0,0 +1,12 @@
+use derive_deref::Deref;
+use serde::Serialize;
+use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout};
+
+#[derive(Debug, Default, Clone, Copy, FromBytes, Immutable, IntoBytes, KnownLayout, Deref, Serialize)]
+#[repr(C)]
+pub struct Open<T>(T);
+impl<T> From<T> for Open<T> {
+    fn from(value: T) -> Self {
+        Self(value)
+    }
+}
diff --git a/python/example.py b/python/example.py
index a07c64a32..bffdf2c0f 100644
--- a/python/example.py
+++ b/python/example.py
@@ -2,11 +2,26 @@
 # We're aiming to read the first 21 values from the height_to_timestamp vec
 
 import sys
+# import struct
 import datetime
 
 with open("../_outputs/indexes/vecs/height_to_timestamp/vec", "rb") as file:
     for x in range(0, 21):
-        bytes = file.read(4) # Need to check the rust side to find the size, at least for now
-        number = int.from_bytes(bytes, sys.byteorder)
+        b = file.read(4) # Need to check the rust side to find the size, at least for now
+        number = int.from_bytes(b, sys.byteorder)
         date = datetime.date.fromtimestamp(number)
         print(date)
+
+# print(int.from_bytes([21], sys.byteorder)) # 21 u8 native endian
+# print(int.from_bytes([21, 0], sys.byteorder)) # 21 u16 native endian
+# print(int.from_bytes([21, 0, 0, 0], sys.byteorder)) # 21 u32 native endian
+# print(int.from_bytes([21, 0, 0, 0, 0, 0, 0, 0], sys.byteorder)) # 21 u64/usize native endian
+
+# # check i8, ...
+
+# print(struct.unpack('f', bytes([0, 0, 168, 65]))) # 21.0 f32 native endian
+# print(struct.unpack('d', bytes([0, 0, 0, 0, 0, 0, 53, 64]))) # 21.0 f64 native endian
+# print(struct.unpack('<f', bytes([0, 0, 168, 65]))) # 21.0 f32 little endian
+# print(struct.unpack('<d', bytes([0, 0, 0, 0, 0, 0, 53, 64]))) # 21.0 f64 little endian
+# print(struct.unpack('>f', bytes([65, 168, 0, 0]))) # 21.0 f32 big endian
+# print(struct.unpack('>d', bytes([64, 53, 0, 0, 0, 0, 0, 0]))) # 21.0 f64 big endian
diff --git a/server/Cargo.toml b/server/Cargo.toml
index d925f55c5..e2ad61572 100644
--- a/server/Cargo.toml
+++ b/server/Cargo.toml
@@ -12,11 +12,9 @@ indexer = { workspace = true }
 jiff = { workspace = true }
 logger = { workspace = true }
 oxc = { version = "0.50.0", features = ["codegen", "minifier"] }
-regex = "1.11.1"
 reqwest = { version = "0.12.12", features = ["blocking", "json"] }
 serde = { workspace = true }
 serde_json = { workspace = true }
 storable_vec = { workspace = true }
 tokio = { version = "1.43.0", features = ["full"] }
 tower-http = { version = "0.6.2", features = ["compression-full"] }
-zstd = "0.13.2"
diff --git a/server/src/api/vecs/mod.rs b/server/src/api/vecs/mod.rs
index 2d8a39df7..c728b55ef 100644
--- a/server/src/api/vecs/mod.rs
+++ b/server/src/api/vecs/mod.rs
@@ -15,14 +15,14 @@ use crate::{log_result, traits::HeaderMapExtended};
 use super::AppState;
 
 mod format;
-mod id_to_i_to_vec;
 mod index;
 mod query;
+mod tree;
 
 use format::Format;
-pub use id_to_i_to_vec::*;
 use index::Index;
 use query::QueryS;
+pub use tree::*;
 
 pub async fn handler(
     headers: HeaderMap,
diff --git a/server/src/api/vecs/id_to_i_to_vec.rs b/server/src/api/vecs/tree.rs
similarity index 100%
rename from server/src/api/vecs/id_to_i_to_vec.rs
rename to server/src/api/vecs/tree.rs

From ed10dccfe25c2e8999013e95a514c3bb9a48290e Mon Sep 17 00:00:00 2001
From: nym21 <expat-epochs0i@icloud.com>
Date: Fri, 14 Feb 2025 19:02:46 +0100
Subject: [PATCH 50/63] pricer: snapshot

---
 .gitignore                      |   1 +
 Cargo.lock                      |   1 +
 computer/src/structs/mod.rs     |   4 +-
 pricer/Cargo.toml               |  10 +-
 pricer/src/fetchers/binance.rs  |  76 +++++++-
 pricer/src/fetchers/kibo.rs     | 102 ++++++++---
 pricer/src/fetchers/kraken.rs   |  36 +++-
 pricer/src/lib.rs               | 272 +++++++++++++++++++++++++++
 pricer/src/main.rs              |  11 +-
 pricer/src/price.rs             | 316 --------------------------------
 pricer/src/structs/cents.rs     |  17 +-
 pricer/src/structs/close.rs     |  17 +-
 pricer/src/structs/date.rs      |  52 ++----
 pricer/src/structs/dateindex.rs |  27 +++
 pricer/src/structs/dollars.rs   |   4 +-
 pricer/src/structs/high.rs      |  28 ++-
 pricer/src/structs/low.rs       |  28 ++-
 pricer/src/structs/open.rs      |  28 ++-
 server/src/api/vecs/index.rs    |  20 ++
 server/src/api/vecs/tree.rs     |  42 ++++-
 server/src/files/file.rs        |   3 +-
 server/src/lib.rs               |   7 +-
 22 files changed, 692 insertions(+), 410 deletions(-)
 delete mode 100644 pricer/src/price.rs

diff --git a/.gitignore b/.gitignore
index 749a5981f..70eb0fa00 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,6 +29,7 @@ docker/kibo
 
 # Types
 paths.d.ts
+vecid-to-indexes.d.ts
 
 # Outputs
 _outputs
diff --git a/Cargo.lock b/Cargo.lock
index 739206fa0..c57d7887d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2118,6 +2118,7 @@ dependencies = [
  "reqwest",
  "serde",
  "serde_json",
+ "storable_vec",
  "zerocopy 0.8.17",
 ]
 
diff --git a/computer/src/structs/mod.rs b/computer/src/structs/mod.rs
index 7e26c175a..7edf1230f 100644
--- a/computer/src/structs/mod.rs
+++ b/computer/src/structs/mod.rs
@@ -1,11 +1,11 @@
 mod addressindextxoutindex;
 mod bitcoin;
 mod feerate;
-mod ohlc;
+// mod ohlc;
 mod unit;
 
 pub use addressindextxoutindex::*;
 pub use bitcoin::*;
 pub use feerate::*;
-pub use ohlc::*;
+// pub use ohlc::*;
 pub use unit::*;
diff --git a/pricer/Cargo.toml b/pricer/Cargo.toml
index c9db534d0..82473bf62 100644
--- a/pricer/Cargo.toml
+++ b/pricer/Cargo.toml
@@ -8,8 +8,16 @@ color-eyre = { workspace = true }
 derive_deref = { workspace = true }
 indexer = { workspace = true }
 logger = { workspace = true }
-reqwest = { version = "0.12.12", features = ["blocking", "brotli", "deflate", "gzip", "json", "zstd"] }
+reqwest = { version = "0.12.12", features = [
+    "blocking",
+    "brotli",
+    "deflate",
+    "gzip",
+    "json",
+    "zstd",
+] }
 jiff = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
+storable_vec = { workspace = true }
 zerocopy = { workspace = true }
diff --git a/pricer/src/fetchers/binance.rs b/pricer/src/fetchers/binance.rs
index f8ecbb0f3..944e25688 100644
--- a/pricer/src/fetchers/binance.rs
+++ b/pricer/src/fetchers/binance.rs
@@ -2,7 +2,7 @@ use std::{
     collections::BTreeMap,
     fs::{self, File},
     io::BufReader,
-    path::Path,
+    path::{Path, PathBuf},
     str::FromStr,
 };
 
@@ -10,17 +10,48 @@ use color_eyre::eyre::{eyre, ContextCompat};
 use indexer::Timestamp;
 use logger::info;
 use serde_json::Value;
+use storable_vec::STATELESS;
 
 use crate::{
     fetchers::retry,
     structs::{Cents, OHLC},
-    Close, Date, Dollars, High, Low, Open,
+    Close, Date, Dollars, High, Low, Open, Pricer,
 };
 
-pub struct Binance;
+pub struct Binance {
+    path: PathBuf,
+    _1mn: Option<BTreeMap<Timestamp, OHLC>>,
+    _1d: Option<BTreeMap<Date, OHLC>>,
+    har: Option<BTreeMap<Timestamp, OHLC>>,
+}
 
 impl Binance {
-    pub fn fetch_1mn_prices() -> color_eyre::Result<BTreeMap<Timestamp, OHLC>> {
+    pub fn init(path: &Path) -> Self {
+        Self {
+            path: path.to_owned(),
+            _1mn: None,
+            _1d: None,
+            har: None,
+        }
+    }
+
+    fn get_from_1mn(
+        &mut self,
+        timestamp: Timestamp,
+        previous_timestamp: Option<Timestamp>,
+    ) -> color_eyre::Result<OHLC> {
+        if self._1mn.is_none() || self._1mn.as_ref().unwrap().last_key_value().unwrap().0 <= &timestamp {
+            self._1mn.replace(Self::fetch_1mn()?);
+        }
+        Pricer::<STATELESS>::find_height_ohlc(
+            &self._1mn.as_ref().unwrap(),
+            timestamp,
+            previous_timestamp,
+            "binance 1mn",
+        )
+    }
+
+    pub fn fetch_1mn() -> color_eyre::Result<BTreeMap<Timestamp, OHLC>> {
         info!("Fetching 1mn prices from Binance...");
 
         retry(
@@ -30,7 +61,20 @@ impl Binance {
         )
     }
 
-    pub fn fetch_daily_prices() -> color_eyre::Result<BTreeMap<Date, OHLC>> {
+    pub fn get_from_1d(&mut self, date: &Date) -> color_eyre::Result<OHLC> {
+        if self._1d.is_none() || self._1d.as_ref().unwrap().last_key_value().unwrap().0 < date {
+            self._1d.replace(Self::fetch_1d()?);
+        }
+
+        self._1d
+            .as_ref()
+            .unwrap()
+            .get(date)
+            .cloned()
+            .ok_or(color_eyre::eyre::Error::msg("Couldn't find date"))
+    }
+
+    fn fetch_1d() -> color_eyre::Result<BTreeMap<Date, OHLC>> {
         info!("Fetching daily prices from Kraken...");
 
         retry(
@@ -40,10 +84,28 @@ impl Binance {
         )
     }
 
-    pub fn read_har_file(path: &Path) -> color_eyre::Result<BTreeMap<Timestamp, OHLC>> {
+    pub fn get_from_har_binance(
+        &mut self,
+        timestamp: Timestamp,
+        previous_timestamp: Option<Timestamp>,
+    ) -> color_eyre::Result<OHLC> {
+        if self.har.is_none() {
+            self.har.replace(self.read_har().unwrap_or_default());
+        }
+        Pricer::<STATELESS>::find_height_ohlc(
+            &self.har.as_ref().unwrap(),
+            timestamp,
+            previous_timestamp,
+            "binance har",
+        )
+    }
+
+    fn read_har(&self) -> color_eyre::Result<BTreeMap<Timestamp, OHLC>> {
         info!("Reading Binance har file...");
 
-        fs::create_dir_all(&path)?;
+        let path = &self.path;
+
+        fs::create_dir_all(path)?;
 
         let path_binance_har = path.join("binance.har");
 
diff --git a/pricer/src/fetchers/kibo.rs b/pricer/src/fetchers/kibo.rs
index 8b137090b..8cefa2299 100644
--- a/pricer/src/fetchers/kibo.rs
+++ b/pricer/src/fetchers/kibo.rs
@@ -1,12 +1,21 @@
 use std::{collections::BTreeMap, str::FromStr};
 
 use color_eyre::eyre::ContextCompat;
+use indexer::Height;
 use logger::info;
 use serde_json::Value;
 
-use crate::structs::{Date, OHLC};
+use crate::{
+    fetchers::retry,
+    structs::{Date, OHLC},
+    Cents, Close, Dollars, High, Low, Open,
+};
 
-pub struct Kibo;
+#[derive(Default)]
+pub struct Kibo {
+    height_to_ohlc_vec: BTreeMap<Height, Vec<OHLC>>,
+    year_to_date_to_ohlc: BTreeMap<u16, BTreeMap<Date, OHLC>>,
+}
 
 const KIBO_OFFICIAL_URL: &str = "https://kibo.money/api";
 const KIBO_OFFICIAL_BACKUP_URL: &str = "https://backup.kibo.money/api";
@@ -22,16 +31,32 @@ impl Kibo {
         }
     }
 
-    pub fn fetch_height_prices(chunk_id: HeightMapChunkId) -> color_eyre::Result<Vec<OHLC>> {
-        info!("kibo: fetch height prices");
+    pub fn get_from_height_kibo(&mut self, height: Height) -> color_eyre::Result<OHLC> {
+        #[allow(clippy::map_entry)]
+        if !self.height_to_ohlc_vec.contains_key(&height)
+            || ((usize::from(height) + self.height_to_ohlc_vec.get(&height).unwrap().len()) <= usize::from(height))
+        {
+            self.height_to_ohlc_vec
+                .insert(height, Self::fetch_height_prices(height)?);
+        }
+
+        self.height_to_ohlc_vec
+            .get(&height)
+            .unwrap()
+            .get(usize::from(height))
+            .cloned()
+            .ok_or(color_eyre::eyre::Error::msg("Couldn't find height in kibo"))
+    }
+
+    fn fetch_height_prices(height: Height) -> color_eyre::Result<Vec<OHLC>> {
+        info!("Fetching Kibo height prices...");
 
         retry(
             |try_index| {
                 let base_url = Self::get_base_url(try_index);
 
                 let body: Value =
-                    reqwest::blocking::get(format!("{base_url}/height-to-price?chunk={}", chunk_id.to_usize()))?
-                        .json()?;
+                    reqwest::blocking::get(format!("{base_url}/height-to-price?chunk={}", height))?.json()?;
 
                 let vec = body
                     .as_object()
@@ -55,19 +80,41 @@ impl Kibo {
         )
     }
 
-    pub fn fetch_date_prices(chunk_id: DateMapChunkId) -> color_eyre::Result<BTreeMap<Date, OHLC>> {
-        info!("kibo: fetch date prices");
+    pub fn get_from_date_kibo(&mut self, date: &Date) -> color_eyre::Result<OHLC> {
+        let year = date.year();
+
+        #[allow(clippy::map_entry)]
+        if !self.year_to_date_to_ohlc.contains_key(&year)
+            || self
+                .year_to_date_to_ohlc
+                .get(&year)
+                .unwrap()
+                .last_key_value()
+                .unwrap()
+                .0
+                < date
+        {
+            self.year_to_date_to_ohlc.insert(year, Self::fetch_date_prices(year)?);
+        }
+
+        self.year_to_date_to_ohlc
+            .get(&year)
+            .unwrap()
+            .get(date)
+            .cloned()
+            .ok_or(color_eyre::eyre::Error::msg("Couldn't find date in kibo"))
+    }
+
+    fn fetch_date_prices(year: u16) -> color_eyre::Result<BTreeMap<Date, OHLC>> {
+        info!("Fetching Kibo date prices...");
 
         retry(
             |try_index| {
                 let base_url = Self::get_base_url(try_index);
 
-                let body: Value =
-                    reqwest::blocking::get(format!("{base_url}/date-to-price?chunk={}", chunk_id.to_usize()))?
-                        .json()?;
+                let body: Value = reqwest::blocking::get(format!("{base_url}/date-to-price?chunk={}", year))?.json()?;
 
-                Ok(body
-                    .as_object()
+                body.as_object()
                     .context("Expect to be an object")?
                     .get("dataset")
                     .context("Expect object to have dataset")?
@@ -79,10 +126,10 @@ impl Kibo {
                     .context("Expect to be an object")?
                     .iter()
                     .map(|(serialized_date, value)| -> color_eyre::Result<_> {
-                        let date = Date::wrap(NaiveDate::from_str(serialized_date)?);
+                        let date = Date::from(jiff::civil::Date::from_str(serialized_date).unwrap());
                         Ok((date, Self::value_to_ohlc(value)?))
                     })
-                    .collect::<Result<BTreeMap<_, _>, _>>()?)
+                    .collect::<Result<BTreeMap<_, _>, _>>()
             },
             30,
             RETRIES,
@@ -92,19 +139,20 @@ impl Kibo {
     fn value_to_ohlc(value: &Value) -> color_eyre::Result<OHLC> {
         let ohlc = value.as_object().context("Expect as_object to work")?;
 
-        let get_value = |key: &str| -> color_eyre::Result<f32> {
-            Ok(ohlc
-                .get(key)
-                .context("Expect get key to work")?
-                .as_f64()
-                .context("Expect as_f64 to work")? as f32)
+        let get_value = |key: &str| -> color_eyre::Result<_> {
+            Ok(Cents::from(Dollars::from(
+                ohlc.get(key)
+                    .context("Expect get key to work")?
+                    .as_f64()
+                    .context("Expect as_f64 to work")?,
+            )))
         };
 
-        Ok(OHLC {
-            open: get_value("open")?,
-            high: get_value("high")?,
-            low: get_value("low")?,
-            close: get_value("close")?,
-        })
+        Ok((
+            Open::from(get_value("open")?),
+            High::from(get_value("high")?),
+            Low::from(get_value("low")?),
+            Close::from(get_value("close")?),
+        ))
     }
 }
diff --git a/pricer/src/fetchers/kraken.rs b/pricer/src/fetchers/kraken.rs
index 2f38725fa..4e8689756 100644
--- a/pricer/src/fetchers/kraken.rs
+++ b/pricer/src/fetchers/kraken.rs
@@ -4,13 +4,29 @@ use color_eyre::eyre::ContextCompat;
 use indexer::Timestamp;
 use logger::info;
 use serde_json::Value;
+use storable_vec::STATELESS;
 
-use crate::{fetchers::retry, structs::Date, Cents, Close, Dollars, High, Low, Open, OHLC};
+use crate::{fetchers::retry, structs::Date, Cents, Close, Dollars, High, Low, Open, Pricer, OHLC};
 
-pub struct Kraken;
+#[derive(Default)]
+pub struct Kraken {
+    _1mn: Option<BTreeMap<Timestamp, OHLC>>,
+    _1d: Option<BTreeMap<Date, OHLC>>,
+}
 
 impl Kraken {
-    pub fn fetch_1mn_prices() -> color_eyre::Result<BTreeMap<Timestamp, OHLC>> {
+    pub fn get_from_1mn(
+        &mut self,
+        timestamp: Timestamp,
+        previous_timestamp: Option<Timestamp>,
+    ) -> color_eyre::Result<OHLC> {
+        if self._1mn.is_none() || self._1mn.as_ref().unwrap().last_key_value().unwrap().0 <= &timestamp {
+            self._1mn.replace(Self::fetch_1mn()?);
+        }
+        Pricer::<STATELESS>::find_height_ohlc(&self._1mn.as_ref().unwrap(), timestamp, previous_timestamp, "kraken 1m")
+    }
+
+    fn fetch_1mn() -> color_eyre::Result<BTreeMap<Timestamp, OHLC>> {
         info!("Fetching 1mn prices from Kraken...");
 
         retry(
@@ -20,7 +36,19 @@ impl Kraken {
         )
     }
 
-    pub fn fetch_daily_prices() -> color_eyre::Result<BTreeMap<Date, OHLC>> {
+    pub fn get_from_1d(&mut self, date: &Date) -> color_eyre::Result<OHLC> {
+        if self._1d.is_none() || self._1d.as_ref().unwrap().last_key_value().unwrap().0 < date {
+            self._1d.replace(Kraken::fetch_1d()?);
+        }
+        self._1d
+            .as_ref()
+            .unwrap()
+            .get(date)
+            .cloned()
+            .ok_or(color_eyre::eyre::Error::msg("Couldn't find date"))
+    }
+
+    fn fetch_1d() -> color_eyre::Result<BTreeMap<Date, OHLC>> {
         info!("Fetching daily prices from Kraken...");
 
         retry(
diff --git a/pricer/src/lib.rs b/pricer/src/lib.rs
index 01562e543..6d5f0f617 100644
--- a/pricer/src/lib.rs
+++ b/pricer/src/lib.rs
@@ -1,5 +1,277 @@
+use std::{
+    collections::BTreeMap,
+    fs,
+    path::{Path, PathBuf},
+};
+
+use color_eyre::eyre::Error;
+
 mod fetchers;
 mod structs;
 
 pub use fetchers::*;
+use indexer::{Height, Indexer, Timestamp};
+use storable_vec::{AnyJsonStorableVec, AnyStorableVec, StorableVec, Version, SINGLE_THREAD};
 pub use structs::*;
+
+pub struct Pricer<const MODE: u8> {
+    path: PathBuf,
+    binance: Binance,
+    kraken: Kraken,
+    kibo: Kibo,
+
+    pub dateindex_to_close_in_cents: StorableVec<Dateindex, Close<Cents>, MODE>,
+    pub dateindex_to_close_in_dollars: StorableVec<Dateindex, Close<Dollars>, MODE>,
+    pub dateindex_to_high_in_cents: StorableVec<Dateindex, High<Cents>, MODE>,
+    pub dateindex_to_high_in_dollars: StorableVec<Dateindex, High<Dollars>, MODE>,
+    pub dateindex_to_low_in_cents: StorableVec<Dateindex, Low<Cents>, MODE>,
+    pub dateindex_to_low_in_dollars: StorableVec<Dateindex, Low<Dollars>, MODE>,
+    pub dateindex_to_open_in_cents: StorableVec<Dateindex, Open<Cents>, MODE>,
+    pub dateindex_to_open_in_dollars: StorableVec<Dateindex, Open<Dollars>, MODE>,
+    pub height_to_close_in_cents: StorableVec<Height, Close<Cents>, MODE>,
+    pub height_to_close_in_dollars: StorableVec<Height, Close<Dollars>, MODE>,
+    pub height_to_high_in_cents: StorableVec<Height, High<Cents>, MODE>,
+    pub height_to_high_in_dollars: StorableVec<Height, High<Dollars>, MODE>,
+    pub height_to_low_in_cents: StorableVec<Height, Low<Cents>, MODE>,
+    pub height_to_low_in_dollars: StorableVec<Height, Low<Dollars>, MODE>,
+    pub height_to_open_in_cents: StorableVec<Height, Open<Cents>, MODE>,
+    pub height_to_open_in_dollars: StorableVec<Height, Open<Dollars>, MODE>,
+}
+
+impl<const MODE: u8> Pricer<MODE> {
+    pub fn import(path: &Path) -> color_eyre::Result<Self> {
+        fs::create_dir_all(path)?;
+
+        Ok(Self {
+            path: path.to_owned(),
+            binance: Binance::init(path),
+            kraken: Kraken::default(),
+            kibo: Kibo::default(),
+
+            // binance_1mn: None,
+            // binance_daily: None,
+            // binance_har: None,
+            // kraken_1mn: None,
+            // kraken_daily: None,
+            // kibo_by_height: BTreeMap::default(),
+            // kibo_by_date: BTreeMap::default(),
+            dateindex_to_close_in_cents: StorableVec::import(
+                &path.join("dateindex_to_close_in_cents"),
+                Version::from(1),
+            )?,
+            dateindex_to_close_in_dollars: StorableVec::import(
+                &path.join("dateindex_to_close_in_dollars"),
+                Version::from(1),
+            )?,
+            dateindex_to_high_in_cents: StorableVec::import(
+                &path.join("dateindex_to_high_in_cents"),
+                Version::from(1),
+            )?,
+            dateindex_to_high_in_dollars: StorableVec::import(
+                &path.join("dateindex_to_high_in_dollars"),
+                Version::from(1),
+            )?,
+            dateindex_to_low_in_cents: StorableVec::import(&path.join("dateindex_to_low_in_cents"), Version::from(1))?,
+            dateindex_to_low_in_dollars: StorableVec::import(
+                &path.join("dateindex_to_low_in_dollars"),
+                Version::from(1),
+            )?,
+            dateindex_to_open_in_cents: StorableVec::import(
+                &path.join("dateindex_to_open_in_cents"),
+                Version::from(1),
+            )?,
+            dateindex_to_open_in_dollars: StorableVec::import(
+                &path.join("dateindex_to_open_in_dollars"),
+                Version::from(1),
+            )?,
+            height_to_close_in_cents: StorableVec::import(&path.join("height_to_close_in_cents"), Version::from(1))?,
+            height_to_close_in_dollars: StorableVec::import(
+                &path.join("height_to_close_in_dollars"),
+                Version::from(1),
+            )?,
+            height_to_high_in_cents: StorableVec::import(&path.join("height_to_high_in_cents"), Version::from(1))?,
+            height_to_high_in_dollars: StorableVec::import(&path.join("height_to_high_in_dollars"), Version::from(1))?,
+            height_to_low_in_cents: StorableVec::import(&path.join("height_to_low_in_cents"), Version::from(1))?,
+            height_to_low_in_dollars: StorableVec::import(&path.join("height_to_low_in_dollars"), Version::from(1))?,
+            height_to_open_in_cents: StorableVec::import(&path.join("height_to_open_in_cents"), Version::from(1))?,
+            height_to_open_in_dollars: StorableVec::import(&path.join("height_to_open_in_dollars"), Version::from(1))?,
+        })
+    }
+
+    pub fn compute_if_needed(&mut self, indexer: &mut Indexer<SINGLE_THREAD>) {
+        // TODO: Remove all outdated
+
+        indexer
+            .vecs
+            .height_to_timestamp
+            .iter_from(Height::default(), |v| Ok(()));
+
+        // self.open
+        //     .multi_insert_simple_transform(heights, dates, &mut self.ohlc, &|ohlc| ohlc.open);
+
+        // self.high
+        //     .multi_insert_simple_transform(heights, dates, &mut self.ohlc, &|ohlc| ohlc.high);
+
+        // self.low
+        //     .multi_insert_simple_transform(heights, dates, &mut self.ohlc, &|ohlc| ohlc.low);
+
+        // self.close
+        //     .multi_insert_simple_transform(heights, dates, &mut self.ohlc, &|ohlc| ohlc.close);
+    }
+
+    fn get_date_ohlc(&mut self, date: Date) -> color_eyre::Result<OHLC> {
+        if self.ohlc.date.is_key_safe(date) {
+            Ok(self.ohlc.date.get_or_import(&date).unwrap().to_owned())
+        } else {
+            let ohlc = self
+                .get_from_daily_kraken(&date)
+                .or_else(|_| self.get_from_daily_binance(&date))
+                .or_else(|_| self.get_from_date_kibo(&date))?;
+
+            self.ohlc.date.insert(date, ohlc);
+
+            Ok(ohlc)
+        }
+    }
+
+    fn get_height_ohlc(
+        &mut self,
+        height: Height,
+        timestamp: Timestamp,
+        previous_timestamp: Option<Timestamp>,
+    ) -> color_eyre::Result<OHLC> {
+        if let Some(ohlc) = self.ohlc.height.get_or_import(&height) {
+            return Ok(ohlc);
+        }
+
+        let timestamp = timestamp.to_floored_seconds();
+
+        if previous_timestamp.is_none() && !height.is_first() {
+            panic!("Shouldn't be possible");
+        }
+
+        let previous_timestamp = previous_timestamp.map(|t| t.to_floored_seconds());
+
+        let ohlc = self
+            .get_from_1mn_kraken(timestamp, previous_timestamp)
+            .unwrap_or_else(|_| {
+                self.get_from_1mn_binance(timestamp, previous_timestamp)
+                    .unwrap_or_else(|_| {
+                        self.get_from_har_binance(timestamp, previous_timestamp, config)
+                            .unwrap_or_else(|_| {
+                                self.get_from_height_kibo(&height).unwrap_or_else(|_| {
+                                    let date = timestamp.to_date();
+
+                                    panic!(
+                                        "Can't find the price for: height: {height} - date: {date}
+1mn APIs are limited to the last 16 hours for Binance's and the last 10 hours for Kraken's
+How to fix this:
+1. Go to https://www.binance.com/en/trade/BTC_USDT?type=spot
+2. Select 1mn interval
+3. Open the inspector/dev tools
+4. Go to the Network Tab
+5. Filter URLs by 'uiKlines'
+6. Go back to the chart and scroll until you pass the date mentioned few lines ago
+7. Go back to the dev tools
+8. Export to a har file (if there is no explicit button, click on the cog button)
+9. Move the file to 'parser/imports/binance.har'
+"
+                                    )
+                                })
+                            })
+                    })
+            });
+
+        // self.ohlc.height.insert(height, ohlc);
+
+        Ok(ohlc)
+    }
+
+    fn find_height_ohlc(
+        tree: &BTreeMap<Timestamp, OHLC>,
+        timestamp: Timestamp,
+        previous_timestamp: Option<Timestamp>,
+        name: &str,
+    ) -> color_eyre::Result<OHLC> {
+        let previous_ohlc = previous_timestamp.map_or(Some(OHLC::default()), |previous_timestamp| {
+            tree.get(&previous_timestamp).cloned()
+        });
+
+        let last_ohlc = tree.get(&timestamp);
+
+        if previous_ohlc.is_none() || last_ohlc.is_none() {
+            return Err(Error::msg(format!("Couldn't find timestamp in {name}")));
+        }
+
+        let previous_ohlc = previous_ohlc.unwrap();
+
+        let mut final_ohlc = (
+            Open::from(previous_ohlc.3),
+            High::from(previous_ohlc.3),
+            Low::from(previous_ohlc.3),
+            previous_ohlc.3,
+        );
+
+        let start = previous_timestamp.unwrap_or(Timestamp::from(0));
+        let end = timestamp;
+
+        // Otherwise it's a re-org
+        if start < end {
+            tree.range(start..=end).skip(1).for_each(|(_, ohlc)| {
+                if ohlc.1 > final_ohlc.1 {
+                    final_ohlc.1 = ohlc.1
+                }
+
+                if ohlc.2 < final_ohlc.2 {
+                    final_ohlc.2 = ohlc.2
+                }
+
+                final_ohlc.3 = ohlc.3;
+            });
+        }
+
+        Ok(final_ohlc)
+    }
+
+    pub fn as_any_json_vec_slice(&self) -> [&dyn AnyJsonStorableVec; 16] {
+        [
+            &self.dateindex_to_close_in_cents as &dyn AnyJsonStorableVec,
+            &self.dateindex_to_close_in_dollars,
+            &self.dateindex_to_high_in_cents,
+            &self.dateindex_to_high_in_dollars,
+            &self.dateindex_to_low_in_cents,
+            &self.dateindex_to_low_in_dollars,
+            &self.dateindex_to_open_in_cents,
+            &self.dateindex_to_open_in_dollars,
+            &self.height_to_close_in_cents,
+            &self.height_to_close_in_dollars,
+            &self.height_to_high_in_cents,
+            &self.height_to_high_in_dollars,
+            &self.height_to_low_in_cents,
+            &self.height_to_low_in_dollars,
+            &self.height_to_open_in_cents,
+            &self.height_to_open_in_dollars,
+        ]
+    }
+
+    pub fn as_mut_any_vec_slice(&mut self) -> [&mut dyn AnyStorableVec; 16] {
+        [
+            &mut self.dateindex_to_close_in_cents as &mut dyn AnyStorableVec,
+            &mut self.dateindex_to_close_in_dollars,
+            &mut self.dateindex_to_high_in_cents,
+            &mut self.dateindex_to_high_in_dollars,
+            &mut self.dateindex_to_low_in_cents,
+            &mut self.dateindex_to_low_in_dollars,
+            &mut self.dateindex_to_open_in_cents,
+            &mut self.dateindex_to_open_in_dollars,
+            &mut self.height_to_close_in_cents,
+            &mut self.height_to_close_in_dollars,
+            &mut self.height_to_high_in_cents,
+            &mut self.height_to_high_in_dollars,
+            &mut self.height_to_low_in_cents,
+            &mut self.height_to_low_in_dollars,
+            &mut self.height_to_open_in_cents,
+            &mut self.height_to_open_in_dollars,
+        ]
+    }
+}
diff --git a/pricer/src/main.rs b/pricer/src/main.rs
index c73ec56b7..dcfafe61a 100644
--- a/pricer/src/main.rs
+++ b/pricer/src/main.rs
@@ -1,16 +1,19 @@
 // fn main() {}
 
-use pricer::{Binance, Kraken};
+use indexer::Height;
+use pricer::{Binance, Kibo, Kraken};
 
 fn main() -> color_eyre::Result<()> {
     color_eyre::install()?;
 
     logger::init_log(None);
 
-    // dbg!(Binance::fetch_daily_prices());
+    dbg!(Binance::fetch_1d_prices()?);
     // dbg!(Binance::fetch_1mn_prices());
-    // dbg!(Kraken::fetch_daily_prices());
-    dbg!(Kraken::fetch_1mn_prices());
+    dbg!(Kraken::fetch_1d()?);
+    // dbg!(Kraken::fetch_1mn_prices()?);
+    dbg!(Kibo::fetch_date_prices(2025)?);
+    dbg!(Kibo::fetch_height_prices(Height::from(880_000_u32))?);
 
     Ok(())
 }
diff --git a/pricer/src/price.rs b/pricer/src/price.rs
deleted file mode 100644
index 5c98da0a1..000000000
--- a/pricer/src/price.rs
+++ /dev/null
@@ -1,316 +0,0 @@
-use std::collections::BTreeMap;
-
-use allocative::Allocative;
-use chrono::Days;
-use color_eyre::eyre::Error;
-
-use struct_iterable::Iterable;
-
-use crate::{
-    parser::price::{Binance, Kibo, Kraken},
-    structs::{
-        Amount, BiMap, Config, Date, DateMap, DateMapChunkId, Height, HeightMapChunkId, MapKey, MapKind, Timestamp,
-        OHLC,
-    },
-    utils::{ONE_MONTH_IN_DAYS, ONE_WEEK_IN_DAYS, ONE_YEAR_IN_DAYS},
-};
-
-use super::{AnyDataset, ComputeData, MinInitialStates, RatioDataset};
-
-#[derive(Allocative, Iterable)]
-pub struct PriceDatasets {
-    min_initial_states: MinInitialStates,
-
-    kraken_daily: Option<BTreeMap<Date, OHLC>>,
-    kraken_1mn: Option<BTreeMap<u32, OHLC>>,
-    binance_1mn: Option<BTreeMap<u32, OHLC>>,
-    binance_daily: Option<BTreeMap<Date, OHLC>>,
-    binance_har: Option<BTreeMap<u32, OHLC>>,
-    kibo_by_height: BTreeMap<HeightMapChunkId, Vec<OHLC>>,
-    kibo_by_date: BTreeMap<DateMapChunkId, BTreeMap<Date, OHLC>>,
-
-    pub ohlc: BiMap<OHLC>,
-    pub open: BiMap<f32>,
-    pub high: BiMap<f32>,
-    pub low: BiMap<f32>,
-    pub close: BiMap<f32>,
-}
-
-impl PriceDatasets {
-    pub fn import(config: &Config) -> color_eyre::Result<Self> {
-        let path_dataset = config.path_datasets();
-        let f = |s: &str| path_dataset.join(s);
-
-        let mut s = Self {
-            min_initial_states: MinInitialStates::default(),
-
-            binance_1mn: None,
-            binance_daily: None,
-            binance_har: None,
-            kraken_1mn: None,
-            kraken_daily: None,
-            kibo_by_height: BTreeMap::default(),
-            kibo_by_date: BTreeMap::default(),
-
-            // ---
-            // Inserted
-            // ---
-            ohlc: BiMap::new_json(1, MapKind::Inserted, &config.path_price()),
-
-            // ---
-            // Computed
-            // ---
-            open_cents: BiMap::new_bin(1, MapKind::Computed, &f("open")),
-            high_cents: BiMap::new_bin(1, MapKind::Computed, &f("high")),
-            low_cents: BiMap::new_bin(1, MapKind::Computed, &f("low")),
-            close: BiMap::new_bin(1, MapKind::Computed, &f("close")),
-        };
-
-        s.min_initial_states
-            .consume(MinInitialStates::compute_from_dataset(&s, config));
-
-        Ok(s)
-    }
-
-    pub fn compute(&mut self, compute_data: &ComputeData, circulating_supply: &mut BiMap<f64>) {
-        let &ComputeData { dates, heights, .. } = compute_data;
-
-        self.open
-            .multi_insert_simple_transform(heights, dates, &mut self.ohlc, &|ohlc| ohlc.open);
-
-        self.high
-            .multi_insert_simple_transform(heights, dates, &mut self.ohlc, &|ohlc| ohlc.high);
-
-        self.low
-            .multi_insert_simple_transform(heights, dates, &mut self.ohlc, &|ohlc| ohlc.low);
-
-        self.close
-            .multi_insert_simple_transform(heights, dates, &mut self.ohlc, &|ohlc| ohlc.close);
-    }
-
-    pub fn get_date_ohlc(&mut self, date: Date) -> color_eyre::Result<OHLC> {
-        if self.ohlc.date.is_key_safe(date) {
-            Ok(self.ohlc.date.get_or_import(&date).unwrap().to_owned())
-        } else {
-            let ohlc = self
-                .get_from_daily_kraken(&date)
-                .or_else(|_| self.get_from_daily_binance(&date))
-                .or_else(|_| self.get_from_date_kibo(&date))?;
-
-            self.ohlc.date.insert(date, ohlc);
-
-            Ok(ohlc)
-        }
-    }
-
-    fn get_from_date_kibo(&mut self, date: &Date) -> color_eyre::Result<OHLC> {
-        let chunk_id = date.to_chunk_id();
-
-        #[allow(clippy::map_entry)]
-        if !self.kibo_by_date.contains_key(&chunk_id)
-            || self.kibo_by_date.get(&chunk_id).unwrap().last_key_value().unwrap().0 < date
-        {
-            self.kibo_by_date.insert(chunk_id, Kibo::fetch_date_prices(chunk_id)?);
-        }
-
-        self.kibo_by_date
-            .get(&chunk_id)
-            .unwrap()
-            .get(date)
-            .cloned()
-            .ok_or(Error::msg("Couldn't find date in satonomics"))
-    }
-
-    fn get_from_daily_kraken(&mut self, date: &Date) -> color_eyre::Result<OHLC> {
-        if self.kraken_daily.is_none() || self.kraken_daily.as_ref().unwrap().last_key_value().unwrap().0 < date {
-            self.kraken_daily.replace(Kraken::fetch_daily_prices()?);
-        }
-
-        self.kraken_daily
-            .as_ref()
-            .unwrap()
-            .get(date)
-            .cloned()
-            .ok_or(Error::msg("Couldn't find date"))
-    }
-
-    fn get_from_daily_binance(&mut self, date: &Date) -> color_eyre::Result<OHLC> {
-        if self.binance_daily.is_none() || self.binance_daily.as_ref().unwrap().last_key_value().unwrap().0 < date {
-            self.binance_daily.replace(Binance::fetch_daily_prices()?);
-        }
-
-        self.binance_daily
-            .as_ref()
-            .unwrap()
-            .get(date)
-            .cloned()
-            .ok_or(Error::msg("Couldn't find date"))
-    }
-
-    pub fn get_height_ohlc(
-        &mut self,
-        height: Height,
-        timestamp: Timestamp,
-        previous_timestamp: Option<Timestamp>,
-        config: &Config,
-    ) -> color_eyre::Result<OHLC> {
-        if let Some(ohlc) = self.ohlc.height.get_or_import(&height) {
-            return Ok(ohlc);
-        }
-
-        let timestamp = timestamp.to_floored_seconds();
-
-        if previous_timestamp.is_none() && !height.is_first() {
-            panic!("Shouldn't be possible");
-        }
-
-        let previous_timestamp = previous_timestamp.map(|t| t.to_floored_seconds());
-
-        let ohlc = self
-            .get_from_1mn_kraken(timestamp, previous_timestamp)
-            .unwrap_or_else(|_| {
-                self.get_from_1mn_binance(timestamp, previous_timestamp)
-                    .unwrap_or_else(|_| {
-                        self.get_from_har_binance(timestamp, previous_timestamp, config)
-                            .unwrap_or_else(|_| {
-                                self.get_from_height_kibo(&height).unwrap_or_else(|_| {
-                                    let date = timestamp.to_date();
-
-                                    panic!(
-                                        "Can't find the price for: height: {height} - date: {date}
-1mn APIs are limited to the last 16 hours for Binance's and the last 10 hours for Kraken's
-How to fix this:
-1. Go to https://www.binance.com/en/trade/BTC_USDT?type=spot
-2. Select 1mn interval
-3. Open the inspector/dev tools
-4. Go to the Network Tab
-5. Filter URLs by 'uiKlines'
-6. Go back to the chart and scroll until you pass the date mentioned few lines ago
-7. Go back to the dev tools
-8. Export to a har file (if there is no explicit button, click on the cog button)
-9. Move the file to 'parser/imports/binance.har'
-"
-                                    )
-                                })
-                            })
-                    })
-            });
-
-        self.ohlc.height.insert(height, ohlc);
-
-        Ok(ohlc)
-    }
-
-    fn get_from_height_kibo(&mut self, height: &Height) -> color_eyre::Result<OHLC> {
-        let chunk_id = height.to_chunk_id();
-
-        #[allow(clippy::map_entry)]
-        if !self.kibo_by_height.contains_key(&chunk_id)
-            || ((chunk_id.to_usize() + self.kibo_by_height.get(&chunk_id).unwrap().len()) <= height.to_usize())
-        {
-            self.kibo_by_height
-                .insert(chunk_id, Kibo::fetch_height_prices(chunk_id)?);
-        }
-
-        self.kibo_by_height
-            .get(&chunk_id)
-            .unwrap()
-            .get(height.to_serialized_key().to_usize())
-            .cloned()
-            .ok_or(Error::msg("Couldn't find height in kibo"))
-    }
-
-    fn get_from_1mn_kraken(
-        &mut self,
-        timestamp: Timestamp,
-        previous_timestamp: Option<Timestamp>,
-    ) -> color_eyre::Result<OHLC> {
-        if self.kraken_1mn.is_none() || self.kraken_1mn.as_ref().unwrap().last_key_value().unwrap().0 <= &timestamp {
-            self.kraken_1mn.replace(Kraken::fetch_1mn_prices()?);
-        }
-
-        Self::find_height_ohlc(&self.kraken_1mn, timestamp, previous_timestamp, "kraken 1m")
-    }
-
-    fn get_from_1mn_binance(
-        &mut self,
-        timestamp: Timestamp,
-        previous_timestamp: Option<Timestamp>,
-    ) -> color_eyre::Result<OHLC> {
-        if self.binance_1mn.is_none() || self.binance_1mn.as_ref().unwrap().last_key_value().unwrap().0 <= &timestamp {
-            self.binance_1mn.replace(Binance::fetch_1mn_prices()?);
-        }
-
-        Self::find_height_ohlc(&self.binance_1mn, timestamp, previous_timestamp, "binance 1m")
-    }
-
-    fn get_from_har_binance(
-        &mut self,
-        timestamp: Timestamp,
-        previous_timestamp: Option<Timestamp>,
-        config: &Config,
-    ) -> color_eyre::Result<OHLC> {
-        if self.binance_har.is_none() {
-            self.binance_har
-                .replace(Binance::read_har_file(config).unwrap_or_default());
-        }
-
-        Self::find_height_ohlc(&self.binance_har, timestamp, previous_timestamp, "binance har")
-    }
-
-    fn find_height_ohlc(
-        tree: &Option<BTreeMap<u32, OHLC>>,
-        timestamp: Timestamp,
-        previous_timestamp: Option<Timestamp>,
-        name: &str,
-    ) -> color_eyre::Result<OHLC> {
-        let tree = tree.as_ref().unwrap();
-
-        let err = Error::msg(format!("Couldn't find timestamp in {name}"));
-
-        let previous_ohlc = previous_timestamp.map_or(Some(OHLC::default()), |previous_timestamp| {
-            tree.get(&previous_timestamp).cloned()
-        });
-
-        let last_ohlc = tree.get(&timestamp);
-
-        if previous_ohlc.is_none() || last_ohlc.is_none() {
-            return Err(err);
-        }
-
-        let previous_ohlc = previous_ohlc.unwrap();
-
-        let mut final_ohlc = OHLC {
-            open: previous_ohlc.close,
-            high: previous_ohlc.close,
-            low: previous_ohlc.close,
-            close: previous_ohlc.close,
-        };
-
-        let start = previous_timestamp.unwrap_or_default();
-        let end = timestamp;
-
-        // Otherwise it's a re-org
-        if start < end {
-            tree.range(&*start..=&*end).skip(1).for_each(|(_, ohlc)| {
-                if ohlc.high > final_ohlc.high {
-                    final_ohlc.high = ohlc.high
-                }
-
-                if ohlc.low < final_ohlc.low {
-                    final_ohlc.low = ohlc.low
-                }
-
-                final_ohlc.close = ohlc.close;
-            });
-        }
-
-        Ok(final_ohlc)
-    }
-}
-
-impl AnyDataset for PriceDatasets {
-    fn get_min_initial_states(&self) -> &MinInitialStates {
-        &self.min_initial_states
-    }
-}
diff --git a/pricer/src/structs/cents.rs b/pricer/src/structs/cents.rs
index 839c5fcea..6130b14f8 100644
--- a/pricer/src/structs/cents.rs
+++ b/pricer/src/structs/cents.rs
@@ -4,7 +4,22 @@ use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout};
 
 use super::Dollars;
 
-#[derive(Debug, Default, Clone, Copy, Deref, FromBytes, Immutable, IntoBytes, KnownLayout, Serialize)]
+#[derive(
+    Debug,
+    Default,
+    Clone,
+    Copy,
+    PartialEq,
+    Eq,
+    PartialOrd,
+    Ord,
+    Deref,
+    FromBytes,
+    Immutable,
+    IntoBytes,
+    KnownLayout,
+    Serialize,
+)]
 pub struct Cents(u64);
 
 impl From<Dollars> for Cents {
diff --git a/pricer/src/structs/close.rs b/pricer/src/structs/close.rs
index c3a15b543..a87318ea2 100644
--- a/pricer/src/structs/close.rs
+++ b/pricer/src/structs/close.rs
@@ -2,7 +2,22 @@ use derive_deref::Deref;
 use serde::Serialize;
 use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout};
 
-#[derive(Debug, Default, Clone, Copy, FromBytes, Immutable, IntoBytes, KnownLayout, Deref, Serialize)]
+#[derive(
+    Debug,
+    Default,
+    Clone,
+    Copy,
+    PartialEq,
+    Eq,
+    PartialOrd,
+    Ord,
+    FromBytes,
+    Immutable,
+    IntoBytes,
+    KnownLayout,
+    Deref,
+    Serialize,
+)]
 #[repr(C)]
 pub struct Close<T>(T);
 impl<T> From<T> for Close<T> {
diff --git a/pricer/src/structs/date.rs b/pricer/src/structs/date.rs
index e4c422888..766b661c1 100644
--- a/pricer/src/structs/date.rs
+++ b/pricer/src/structs/date.rs
@@ -1,18 +1,17 @@
-use std::ops::Add;
-
-use color_eyre::eyre::eyre;
 use indexer::Timestamp;
 use jiff::{civil::Date as Date_, tz::TimeZone, Span};
 use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout};
 
+use super::Dateindex;
+
 #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, FromBytes, Immutable, IntoBytes, KnownLayout)]
 pub struct Date(u32);
 
 impl Date {
-    const INDEX_ZERO: Self = Self(20090103);
-    const INDEX_ZERO_: Date_ = Date_::constant(2009, 1, 3);
-    const INDEX_ONE: Self = Self(20090109);
-    const INDEX_ONE_: Date_ = Date_::constant(2009, 1, 9);
+    pub const INDEX_ZERO: Self = Self(20090103);
+    pub const INDEX_ZERO_: Date_ = Date_::constant(2009, 1, 3);
+    pub const INDEX_ONE: Self = Self(20090109);
+    pub const INDEX_ONE_: Date_ = Date_::constant(2009, 1, 9);
 
     pub fn year(&self) -> u16 {
         (self.0 / 1_00_00) as u16
@@ -51,33 +50,12 @@ impl From<Timestamp> for Date {
     }
 }
 
-// impl TryFrom<Date> for usize {
-//     type Error = color_eyre::Report;
-//     fn try_from(value: Date) -> Result<Self, Self::Error> {
-//         let value_ = Date_::from(value);
-//         if value_ < Date::INDEX_ZERO_ {
-//             Err(eyre!("Date is too early"))
-//         } else if value == Date::INDEX_ZERO {
-//             Ok(0)
-//         } else if value_ < Date::INDEX_ONE_ {
-//             Err(eyre!("Date is between first and second"))
-//         } else if value == Date::INDEX_ONE {
-//             Ok(1)
-//         } else {
-//             Ok(Date_::from(Date::INDEX_ONE).until(value_)?.get_days() as usize + 1)
-//         }
-//     }
-// }
-
-// impl From<usize> for Date {
-//     fn from(value: usize) -> Self {
-//         Self::from(Self::INDEX_ZERO_.checked_add(Span::new().days(value as i64)).unwrap())
-//     }
-// }
-
-// impl Add<usize> for Date {
-//     type Output = Self;
-//     fn add(self, rhs: usize) -> Self::Output {
-//         Self::from(Date_::from(self).checked_add(Span::new().days(rhs as i64)).unwrap())
-//     }
-// }
+impl From<Dateindex> for Date {
+    fn from(value: Dateindex) -> Self {
+        Self::from(
+            Self::INDEX_ZERO_
+                .checked_add(Span::new().days(i64::from(value)))
+                .unwrap(),
+        )
+    }
+}
diff --git a/pricer/src/structs/dateindex.rs b/pricer/src/structs/dateindex.rs
index 64338bed9..fc314e42e 100644
--- a/pricer/src/structs/dateindex.rs
+++ b/pricer/src/structs/dateindex.rs
@@ -1,7 +1,10 @@
 use std::ops::Add;
 
+use color_eyre::eyre::eyre;
 use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout};
 
+use super::Date;
+
 #[derive(Debug, Default, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, FromBytes, Immutable, IntoBytes, KnownLayout)]
 pub struct Dateindex(u16);
 
@@ -17,9 +20,33 @@ impl From<usize> for Dateindex {
     }
 }
 
+impl From<Dateindex> for i64 {
+    fn from(value: Dateindex) -> Self {
+        value.0 as i64
+    }
+}
+
 impl Add<usize> for Dateindex {
     type Output = Self;
     fn add(self, rhs: usize) -> Self::Output {
         Self(self.0 + rhs as u16)
     }
 }
+
+impl TryFrom<Date> for Dateindex {
+    type Error = color_eyre::Report;
+    fn try_from(value: Date) -> Result<Self, Self::Error> {
+        let value_ = jiff::civil::Date::from(value);
+        if value_ < Date::INDEX_ZERO_ {
+            Err(eyre!("Date is too early"))
+        } else if value == Date::INDEX_ZERO {
+            Ok(Self(0))
+        } else if value_ < Date::INDEX_ONE_ {
+            Err(eyre!("Date is between first and second"))
+        } else if value == Date::INDEX_ONE {
+            Ok(Self(1))
+        } else {
+            Ok(Self(Date::INDEX_ONE_.until(value_)?.get_days() as u16 + 1))
+        }
+    }
+}
diff --git a/pricer/src/structs/dollars.rs b/pricer/src/structs/dollars.rs
index 321106bba..4ea1892b3 100644
--- a/pricer/src/structs/dollars.rs
+++ b/pricer/src/structs/dollars.rs
@@ -1,8 +1,10 @@
 use derive_deref::Deref;
+use serde::Serialize;
+use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout};
 
 use super::Cents;
 
-#[derive(Debug, Default, Clone, Copy, Deref)]
+#[derive(Debug, Default, Clone, Copy, Deref, FromBytes, Immutable, IntoBytes, KnownLayout, Serialize)]
 pub struct Dollars(f64);
 
 impl From<f64> for Dollars {
diff --git a/pricer/src/structs/high.rs b/pricer/src/structs/high.rs
index 51947090a..53fa506cd 100644
--- a/pricer/src/structs/high.rs
+++ b/pricer/src/structs/high.rs
@@ -2,7 +2,24 @@ use derive_deref::Deref;
 use serde::Serialize;
 use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout};
 
-#[derive(Debug, Default, Clone, Copy, FromBytes, Immutable, IntoBytes, KnownLayout, Deref, Serialize)]
+use super::Close;
+
+#[derive(
+    Debug,
+    Default,
+    PartialEq,
+    Eq,
+    PartialOrd,
+    Ord,
+    Clone,
+    Copy,
+    FromBytes,
+    Immutable,
+    IntoBytes,
+    KnownLayout,
+    Deref,
+    Serialize,
+)]
 #[repr(C)]
 pub struct High<T>(T);
 impl<T> From<T> for High<T> {
@@ -10,3 +27,12 @@ impl<T> From<T> for High<T> {
         Self(value)
     }
 }
+
+impl<T> From<Close<T>> for High<T>
+where
+    T: Copy,
+{
+    fn from(value: Close<T>) -> Self {
+        Self(*value)
+    }
+}
diff --git a/pricer/src/structs/low.rs b/pricer/src/structs/low.rs
index 3c4988fea..39f8c52ea 100644
--- a/pricer/src/structs/low.rs
+++ b/pricer/src/structs/low.rs
@@ -2,7 +2,24 @@ use derive_deref::Deref;
 use serde::Serialize;
 use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout};
 
-#[derive(Debug, Default, Clone, Copy, FromBytes, Immutable, IntoBytes, KnownLayout, Deref, Serialize)]
+use super::Close;
+
+#[derive(
+    Debug,
+    Default,
+    Clone,
+    Copy,
+    PartialEq,
+    Eq,
+    PartialOrd,
+    Ord,
+    FromBytes,
+    Immutable,
+    IntoBytes,
+    KnownLayout,
+    Deref,
+    Serialize,
+)]
 #[repr(C)]
 pub struct Low<T>(T);
 impl<T> From<T> for Low<T> {
@@ -10,3 +27,12 @@ impl<T> From<T> for Low<T> {
         Self(value)
     }
 }
+
+impl<T> From<Close<T>> for Low<T>
+where
+    T: Copy,
+{
+    fn from(value: Close<T>) -> Self {
+        Self(*value)
+    }
+}
diff --git a/pricer/src/structs/open.rs b/pricer/src/structs/open.rs
index b6632c90d..fe2843268 100644
--- a/pricer/src/structs/open.rs
+++ b/pricer/src/structs/open.rs
@@ -2,7 +2,24 @@ use derive_deref::Deref;
 use serde::Serialize;
 use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout};
 
-#[derive(Debug, Default, Clone, Copy, FromBytes, Immutable, IntoBytes, KnownLayout, Deref, Serialize)]
+use super::Close;
+
+#[derive(
+    Debug,
+    Default,
+    Clone,
+    Copy,
+    PartialEq,
+    Eq,
+    PartialOrd,
+    Ord,
+    FromBytes,
+    Immutable,
+    IntoBytes,
+    KnownLayout,
+    Deref,
+    Serialize,
+)]
 #[repr(C)]
 pub struct Open<T>(T);
 impl<T> From<T> for Open<T> {
@@ -10,3 +27,12 @@ impl<T> From<T> for Open<T> {
         Self(value)
     }
 }
+
+impl<T> From<Close<T>> for Open<T>
+where
+    T: Copy,
+{
+    fn from(value: Close<T>) -> Self {
+        Self(*value)
+    }
+}
diff --git a/server/src/api/vecs/index.rs b/server/src/api/vecs/index.rs
index 69d0c7ac0..ab439a075 100644
--- a/server/src/api/vecs/index.rs
+++ b/server/src/api/vecs/index.rs
@@ -17,6 +17,26 @@ pub enum Index {
     Txoutindex,
 }
 
+impl Index {
+    pub fn all() -> [Self; 13] {
+        [
+            Self::Addressindex,
+            Self::Dateindex,
+            Self::Height,
+            Self::P2PK33index,
+            Self::P2PK65index,
+            Self::P2PKHindex,
+            Self::P2SHindex,
+            Self::P2TRindex,
+            Self::P2WPKHindex,
+            Self::P2WSHindex,
+            Self::Txindex,
+            Self::Txinindex,
+            Self::Txoutindex,
+        ]
+    }
+}
+
 impl TryFrom<&str> for Index {
     type Error = ();
     fn try_from(value: &str) -> Result<Self, Self::Error> {
diff --git a/server/src/api/vecs/tree.rs b/server/src/api/vecs/tree.rs
index b58be8866..d3bc4e7e2 100644
--- a/server/src/api/vecs/tree.rs
+++ b/server/src/api/vecs/tree.rs
@@ -1,8 +1,10 @@
-use std::collections::BTreeMap;
+use std::{collections::BTreeMap, fs, io};
 
 use derive_deref::{Deref, DerefMut};
 use storable_vec::AnyJsonStorableVec;
 
+use crate::WEBSITE_DEV_PATH;
+
 use super::index::Index;
 
 #[derive(Default, Deref, DerefMut)]
@@ -32,6 +34,44 @@ impl VecIdToIndexToVec {
             panic!()
         }
     }
+
+    pub fn generate_dts_file(&self) -> io::Result<()> {
+        if !fs::exists(WEBSITE_DEV_PATH)? {
+            return Ok(());
+        }
+
+        let path = format!("{WEBSITE_DEV_PATH}/scripts/types/vecid-to-indexes.d.ts");
+
+        let mut contents = Index::all()
+            .into_iter()
+            .enumerate()
+            .map(|(i_of_i, i)| format!("type {} = {};", i, i_of_i))
+            .collect::<Vec<_>>()
+            .join("\n");
+
+        contents += "\n\ninterface VecIdToIndexes {\n";
+
+        self.iter().for_each(|(id, index_to_vec)| {
+            let indexes = index_to_vec
+                .keys()
+                .map(|i| i.to_string())
+                .collect::<Vec<_>>()
+                .join(", ");
+
+            contents += &format!(
+                "  {}: [{indexes}]\n",
+                if id.contains("-") {
+                    format!("\"{id}\"")
+                } else {
+                    id.to_owned()
+                }
+            );
+        });
+
+        contents.push('}');
+
+        fs::write(path, contents)
+    }
 }
 
 #[derive(Default, Deref, DerefMut)]
diff --git a/server/src/files/file.rs b/server/src/files/file.rs
index fec5e86b3..3cf3a543a 100644
--- a/server/src/files/file.rs
+++ b/server/src/files/file.rs
@@ -16,12 +16,11 @@ use reqwest::StatusCode;
 use crate::{
     log_result,
     traits::{HeaderMapExtended, ModifiedState, ResponseExtended},
+    WEBSITE_DEV_PATH,
 };
 
 use super::minify::minify_js;
 
-const WEBSITE_DEV_PATH: &str = "../website/";
-
 pub async fn file_handler(headers: HeaderMap, path: extract::Path<String>) -> Response {
     any_handler(headers, Some(path))
 }
diff --git a/server/src/lib.rs b/server/src/lib.rs
index 3f7655f6e..d7a8a6f00 100644
--- a/server/src/lib.rs
+++ b/server/src/lib.rs
@@ -23,10 +23,9 @@ pub struct AppState {
     computer: &'static Computer<STATELESS>,
 }
 
-pub async fn main(indexer: Indexer<STATELESS>, computer: Computer<STATELESS>) -> color_eyre::Result<()> {
-    // pub async fn main(routes: Routes, config: Config) -> color_eyre::Result<()> {
-    // routes.generate_dts_file();
+pub const WEBSITE_DEV_PATH: &str = "../website/";
 
+pub async fn main(indexer: Indexer<STATELESS>, computer: Computer<STATELESS>) -> color_eyre::Result<()> {
     let indexer = Box::leak(Box::new(indexer));
     let computer = Box::leak(Box::new(computer));
     let vecs = Box::leak(Box::new(VecIdToIndexToVec::default()));
@@ -37,6 +36,8 @@ pub async fn main(indexer: Indexer<STATELESS>, computer: Computer<STATELESS>) ->
         .into_iter()
         .for_each(|vec| vecs.insert(vec));
 
+    vecs.generate_dts_file()?;
+
     let state = AppState {
         vecs,
         indexer,

From 06b2186bf9072604c07125aae4ef2eec671a5037 Mon Sep 17 00:00:00 2001
From: nym21 <expat-epochs0i@icloud.com>
Date: Fri, 14 Feb 2025 19:04:14 +0100
Subject: [PATCH 51/63] cargo: updated deps

---
 Cargo.lock | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c57d7887d..0c7f15b41 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -462,9 +462,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.2.13"
+version = "1.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7777341816418c02e033934a09f20dc0ccaf65a5201ef8a450ae0105a573fda"
+checksum = "0c3d1b2e905a3a7b00a6141adb0e4c0bb941d11caf55349d863942a1cc44e3c9"
 dependencies = [
  "jobserver",
  "libc",
@@ -2293,15 +2293,14 @@ dependencies = [
 
 [[package]]
 name = "ring"
-version = "0.17.8"
+version = "0.17.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
+checksum = "e75ec5e92c4d8aede845126adc388046234541629e76029599ed35a003c7ed24"
 dependencies = [
  "cc",
  "cfg-if",
  "getrandom 0.2.15",
  "libc",
- "spin",
  "untrusted",
  "windows-sys 0.52.0",
 ]
@@ -2608,12 +2607,6 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
-[[package]]
-name = "spin"
-version = "0.9.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
-
 [[package]]
 name = "stable_deref_trait"
 version = "1.2.0"

From a122333aaa3da43f14e4dfee6af6ad7a13814433 Mon Sep 17 00:00:00 2001
From: nym21 <expat-epochs0i@icloud.com>
Date: Sat, 15 Feb 2025 12:04:20 +0100
Subject: [PATCH 52/63] indexer: rm canopy+sanakirja + init rollback; svec:
 added truncate

---
 Cargo.lock                                  |  26 +--
 Cargo.toml                                  |   2 +-
 indexer/src/storage/canopies/database.rs    |  50 -----
 indexer/src/storage/canopies/environment.rs |  20 --
 indexer/src/storage/canopies/mod.rs         |   9 -
 indexer/src/storage/canopies/transaction.rs |  19 --
 indexer/src/storage/canopies/tree.rs        |  84 --------
 indexer/src/storage/sanakirjas/meta.rs      |  81 --------
 indexer/src/storage/sanakirjas/mod.rs       | 174 -----------------
 indexer/src/storage/sanakirjas/multi.rs     | 103 ----------
 indexer/src/storage/sanakirjas/unique.rs    | 102 ----------
 indexer/src/storage/storable_vecs/base.rs   |   5 +
 indexer/src/storage/storable_vecs/mod.rs    | 203 ++++++++++----------
 indexer/src/structs/height.rs               |   4 +
 pricer/src/lib.rs                           |  99 +++++-----
 pricer/src/main.rs                          |   8 +-
 storable_vec/src/lib.rs                     |  17 ++
 17 files changed, 195 insertions(+), 811 deletions(-)
 delete mode 100644 indexer/src/storage/canopies/database.rs
 delete mode 100644 indexer/src/storage/canopies/environment.rs
 delete mode 100644 indexer/src/storage/canopies/mod.rs
 delete mode 100644 indexer/src/storage/canopies/transaction.rs
 delete mode 100644 indexer/src/storage/canopies/tree.rs
 delete mode 100644 indexer/src/storage/sanakirjas/meta.rs
 delete mode 100644 indexer/src/storage/sanakirjas/mod.rs
 delete mode 100644 indexer/src/storage/sanakirjas/multi.rs
 delete mode 100644 indexer/src/storage/sanakirjas/unique.rs

diff --git a/Cargo.lock b/Cargo.lock
index 0c7f15b41..70148638b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -288,7 +288,7 @@ dependencies = [
  "serde",
  "serde_bytes",
  "storable_vec",
- "zerocopy 0.8.17",
+ "zerocopy 0.8.18",
 ]
 
 [[package]]
@@ -400,7 +400,7 @@ dependencies = [
  "fjall",
  "pricer",
  "storable_vec",
- "zerocopy 0.8.17",
+ "zerocopy 0.8.18",
 ]
 
 [[package]]
@@ -737,9 +737,9 @@ dependencies = [
 
 [[package]]
 name = "equivalent"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
 
 [[package]]
 name = "errno"
@@ -2119,7 +2119,7 @@ dependencies = [
  "serde",
  "serde_json",
  "storable_vec",
- "zerocopy 0.8.17",
+ "zerocopy 0.8.18",
 ]
 
 [[package]]
@@ -2587,9 +2587,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.2"
+version = "1.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
+checksum = "7fcf8323ef1faaee30a44a340193b1ac6814fd9b7b4e88e9d4519a3e4abe1cfd"
 
 [[package]]
 name = "smawk"
@@ -2632,7 +2632,7 @@ dependencies = [
  "memmap2",
  "serde",
  "serde_json",
- "zerocopy 0.8.17",
+ "zerocopy 0.8.18",
 ]
 
 [[package]]
@@ -3318,11 +3318,11 @@ dependencies = [
 
 [[package]]
 name = "zerocopy"
-version = "0.8.17"
+version = "0.8.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa91407dacce3a68c56de03abe2760159582b846c6a4acd2f456618087f12713"
+checksum = "79386d31a42a4996e3336b0919ddb90f81112af416270cff95b5f5af22b839c2"
 dependencies = [
- "zerocopy-derive 0.8.17",
+ "zerocopy-derive 0.8.18",
 ]
 
 [[package]]
@@ -3338,9 +3338,9 @@ dependencies = [
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.8.17"
+version = "0.8.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06718a168365cad3d5ff0bb133aad346959a2074bd4a85c121255a11304a8626"
+checksum = "76331675d372f91bf8d17e13afbd5fe639200b73d01f0fc748bb059f9cca2db7"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/Cargo.toml b/Cargo.toml
index 73e061e28..68e1b0483 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -29,4 +29,4 @@ serde = { version = "1.0.217", features = ["derive"] }
 serde_json = { version = "1.0.138", features = ["float_roundtrip"] }
 server = { path = "server", package = "berver" }
 storable_vec = { path = "storable_vec", features = ["json"] }
-zerocopy = { version = "0.8.17", features = ["derive"] }
+zerocopy = { version = "0.8.18", features = ["derive"] }
diff --git a/indexer/src/storage/canopies/database.rs b/indexer/src/storage/canopies/database.rs
deleted file mode 100644
index fd871d742..000000000
--- a/indexer/src/storage/canopies/database.rs
+++ /dev/null
@@ -1,50 +0,0 @@
-use std::{
-    ops::{Deref, DerefMut},
-    time::Duration,
-};
-
-use canopydb::{Database as CanopyDatabase, DbOptions, Error, WriteTransaction};
-
-use super::Environment;
-
-#[derive(Debug)]
-pub struct Database {
-    db: CanopyDatabase,
-    // pub wtx: WriteTransaction,
-}
-impl Deref for Database {
-    type Target = CanopyDatabase;
-    fn deref(&self) -> &Self::Target {
-        &self.db
-    }
-}
-impl DerefMut for Database {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.db
-    }
-}
-
-impl Database {
-    pub fn new(environment: &Environment, name: &str) -> color_eyre::Result<Self> {
-        let mut options = DbOptions::default();
-        options.use_wal = false;
-        options.checkpoint_interval = Duration::from_secs(u64::MAX);
-        options.checkpoint_target_size = usize::MAX;
-        options.throttle_memory_limit = usize::MAX;
-        options.stall_memory_limit = usize::MAX;
-        options.write_txn_memory_limit = usize::MAX;
-
-        let db = environment.get_or_create_database_with(name, options)?;
-
-        Ok(Self {
-            // wtx: db.begin_write()?,
-            db,
-        })
-    }
-
-    pub fn flush(&mut self) -> Result<(), Error> {
-        // drop(blockhash_prefix_to_height_tree);
-        // blockhash_prefix_to_height_tx_opt.take().map(|tx| tx.commit());
-        self.checkpoint()
-    }
-}
diff --git a/indexer/src/storage/canopies/environment.rs b/indexer/src/storage/canopies/environment.rs
deleted file mode 100644
index 562e159d9..000000000
--- a/indexer/src/storage/canopies/environment.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-use std::path::Path;
-
-use canopydb::{EnvOptions, Environment as CanopyEnvironment};
-use derive_deref::{Deref, DerefMut};
-
-#[derive(Debug, Deref, DerefMut)]
-pub struct Environment(CanopyEnvironment);
-
-impl Environment {
-    pub fn new(path: &Path) -> color_eyre::Result<Self> {
-        let mut options = EnvOptions::new(path);
-        // options.use_mmap = true;
-        options.disable_fsync = true;
-        options.wal_new_file_on_checkpoint = false;
-        options.wal_background_sync_interval = None;
-        options.wal_write_batch_memory_limit = usize::MAX;
-
-        Ok(Self(CanopyEnvironment::with_options(options)?))
-    }
-}
diff --git a/indexer/src/storage/canopies/mod.rs b/indexer/src/storage/canopies/mod.rs
deleted file mode 100644
index 46cb95a00..000000000
--- a/indexer/src/storage/canopies/mod.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-mod database;
-mod environment;
-// mod transaction;
-mod tree;
-
-pub use database::*;
-pub use environment::*;
-// pub use transaction::*;
-pub use tree::*;
diff --git a/indexer/src/storage/canopies/transaction.rs b/indexer/src/storage/canopies/transaction.rs
deleted file mode 100644
index d1a6ca13c..000000000
--- a/indexer/src/storage/canopies/transaction.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-use canopydb::{Tree as CanopyTree, TreeOptions, WriteTransaction};
-
-use super::{Database, Tree};
-
-#[derive(Debug)]
-pub struct Transaction<'a, K, V> {
-    tx: WriteTransaction,
-    tree: Tree<'a, K, V>,
-}
-
-impl<'a, K, V> Transaction<'a, K, V> {
-    pub fn new(db: &Database) -> color_eyre::Result<Self> {
-        let tx = db.begin_write()?;
-
-        let tree = Tree::new(&tx)?;
-
-        Ok(Self { tx, tree })
-    }
-}
diff --git a/indexer/src/storage/canopies/tree.rs b/indexer/src/storage/canopies/tree.rs
deleted file mode 100644
index 7809835ea..000000000
--- a/indexer/src/storage/canopies/tree.rs
+++ /dev/null
@@ -1,84 +0,0 @@
-use std::{
-    fmt::Debug,
-    marker::PhantomData,
-    ops::{Deref, DerefMut},
-};
-
-use canopydb::{Tree as CanopyTree, TreeOptions, WriteTransaction};
-use color_eyre::eyre::eyre;
-
-#[derive(Debug)]
-pub struct Tree<'a, K, V> {
-    tree: CanopyTree<'a>,
-    k: PhantomData<K>,
-    v: PhantomData<V>,
-}
-impl<'a, K, V> Deref for Tree<'a, K, V> {
-    type Target = CanopyTree<'a>;
-    fn deref(&self) -> &Self::Target {
-        &self.tree
-    }
-}
-impl<'a, K, V> DerefMut for Tree<'a, K, V> {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.tree
-    }
-}
-
-impl<'a, K, V> Tree<'a, K, V>
-where
-    K: Debug + Sized,
-    V: Debug + Sized + Clone + Copy,
-{
-    const SIZE_OF_K: usize = size_of::<K>();
-    const SIZE_OF_V: usize = size_of::<V>();
-
-    pub fn new(tx: &'a WriteTransaction) -> color_eyre::Result<Self> {
-        let mut options = TreeOptions::new();
-        options.compress_overflow_values = None;
-        options.fixed_key_len = size_of::<K>() as i8;
-        options.fixed_value_len = size_of::<V>() as i8;
-
-        Ok(Self {
-            tree: tx.get_or_create_tree_with(b"tree", options)?,
-            k: PhantomData,
-            v: PhantomData,
-        })
-    }
-
-    pub fn get(&self, key: &K) -> color_eyre::Result<Option<V>> {
-        let slice = self.tree.get(Self::key_as_slice(key))?;
-
-        if slice.is_none() {
-            return Ok(None);
-        }
-
-        let slice = slice.unwrap();
-
-        let (prefix, shorts, suffix) = unsafe { slice.align_to::<V>() };
-
-        if !prefix.is_empty() || shorts.len() != 1 || !suffix.is_empty() {
-            dbg!(&key, &prefix, &shorts, &suffix);
-            return Err(eyre!("align_to issue"));
-        }
-
-        Ok(Some(shorts[0]))
-    }
-
-    pub fn insert(&mut self, key: &K, value: &V) -> Result<(), canopydb::Error> {
-        self.tree
-            .insert(Self::key_as_slice(key), Self::value_as_slice(value))
-    }
-
-    fn key_as_slice(key: &K) -> &[u8] {
-        let data: *const K = key;
-        let data: *const u8 = data as *const u8;
-        unsafe { std::slice::from_raw_parts(data, Self::SIZE_OF_K) }
-    }
-
-    fn value_as_slice(value: &V) -> &[u8] {
-        let data: *const V = value;
-        let data: *const u8 = data as *const u8;
-        unsafe { std::slice::from_raw_parts(data, Self::SIZE_OF_V) }
-    }
-}
diff --git a/indexer/src/storage/sanakirjas/meta.rs b/indexer/src/storage/sanakirjas/meta.rs
deleted file mode 100644
index b73ac3385..000000000
--- a/indexer/src/storage/sanakirjas/meta.rs
+++ /dev/null
@@ -1,81 +0,0 @@
-use std::{
-    fs, io,
-    path::{Path, PathBuf},
-};
-
-use snkrj::UnitDatabase;
-
-use super::{Height, Version};
-
-pub struct StoreMeta {
-    pathbuf: PathBuf,
-    version: Version,
-    height: Option<Height>,
-    pub len: usize,
-}
-
-impl StoreMeta {
-    pub fn checked_open(path: &Path, version: Version) -> Result<Self, snkrj::Error> {
-        fs::create_dir_all(path)?;
-
-        let is_same_version =
-            Version::try_from(Self::path_version_(path).as_path()).is_ok_and(|prev_version| version == prev_version);
-
-        if !is_same_version {
-            fs::remove_dir_all(path)?;
-            fs::create_dir(path)?;
-        }
-
-        let this = Self {
-            pathbuf: path.to_owned(),
-            version,
-            height: Height::try_from(Self::path_height_(path).as_path()).ok(),
-            len: UnitDatabase::read_length_(path),
-        };
-
-        this.version.write(&this.path_version())?;
-
-        Ok(this)
-    }
-
-    #[allow(unused)]
-    pub fn len(&self) -> usize {
-        self.len
-    }
-
-    pub fn export(mut self, height: Height) -> Result<(), io::Error> {
-        self.height = Some(height);
-        height.write(&self.path_height())?;
-        UnitDatabase::write_length_(&self.pathbuf, self.len)
-    }
-
-    pub fn path_parts(&self) -> PathBuf {
-        Self::path_parts_(&self.pathbuf)
-    }
-    fn path_parts_(path: &Path) -> PathBuf {
-        path.join("parts")
-    }
-
-    fn path_version(&self) -> PathBuf {
-        Self::path_version_(&self.pathbuf)
-    }
-    fn path_version_(path: &Path) -> PathBuf {
-        path.join("version")
-    }
-
-    pub fn height(&self) -> Option<&Height> {
-        self.height.as_ref()
-    }
-    pub fn needs(&self, height: Height) -> bool {
-        self.height.is_none_or(|self_height| height > self_height)
-    }
-    pub fn has(&self, height: Height) -> bool {
-        !self.needs(height)
-    }
-    fn path_height(&self) -> PathBuf {
-        Self::path_height_(&self.pathbuf)
-    }
-    fn path_height_(path: &Path) -> PathBuf {
-        path.join("height")
-    }
-}
diff --git a/indexer/src/storage/sanakirjas/mod.rs b/indexer/src/storage/sanakirjas/mod.rs
deleted file mode 100644
index 8a00fb17a..000000000
--- a/indexer/src/storage/sanakirjas/mod.rs
+++ /dev/null
@@ -1,174 +0,0 @@
-use std::{path::Path, thread};
-
-use crate::{
-    structs::Version, AddressbytesPrefix, Addressindex, BlockHashPrefix, Height, TxidPrefix, Txindex, Txoutindex,
-};
-
-mod meta;
-mod multi;
-mod unique;
-
-use meta::*;
-use unique::*;
-
-pub struct Stores {
-    pub addressbytes_prefix_to_addressindex: StoreUnique<AddressbytesPrefix, Addressindex>,
-    pub blockhash_prefix_to_height: StoreUnique<BlockHashPrefix, Height>,
-    pub txid_prefix_to_txindex: StoreUnique<TxidPrefix, Txindex>,
-}
-
-impl Stores {
-    pub fn open(path: &Path) -> color_eyre::Result<Self> {
-        Ok(Self {
-            addressbytes_prefix_to_addressindex: StoreUnique::open(
-                &path.join("addressbytes_prefix_to_addressindex"),
-                Version::from(1),
-            )?,
-            blockhash_prefix_to_height: StoreUnique::open(&path.join("blockhash_prefix_to_height"), Version::from(1))?,
-            txid_prefix_to_txindex: StoreUnique::open(&path.join("txid_prefix_to_txindex"), Version::from(1))?,
-        })
-    }
-
-    // pub fn rollback_from(
-    //     &mut self,
-    //     _wtx: &mut WriteTransaction,
-    //     _height: Height,
-    //     _exit: &Exit,
-    // ) -> color_eyre::Result<()> {
-    //     panic!();
-    // let mut txindex = None;
-
-    // wtx.range(self.height_to_blockhash.data(), Slice::from(height)..)
-    //     .try_for_each(|slice| -> color_eyre::Result<()> {
-    //         let (height_slice, slice_blockhash) = slice?;
-    //         let blockhash = BlockHash::from_slice(&slice_blockhash)?;
-
-    //         wtx.remove(self.height_to_blockhash.data(), height_slice);
-
-    //         wtx.remove(self.blockhash_prefix_to_height.data(), blockhash.prefix());
-
-    //         if txindex.is_none() {
-    //             txindex.replace(
-    //                 wtx.get(self.height_to_first_txindex.data(), height_slice)?
-    //                     .context("for height to have first txindex")?,
-    //             );
-    //         }
-    //         wtx.remove(self.height_to_first_txindex.data(), height_slice);
-    //         wtx.remove(self.height_to_last_txindex.data(), height_slice);
-
-    //         Ok(())
-    //     })?;
-
-    // let txindex = txindex.context("txindex to not be none by now")?;
-
-    // wtx.range(self.txindex_to_txid.data(), Slice::from(txindex)..)
-    //     .try_for_each(|slice| -> color_eyre::Result<()> {
-    //         let (slice_txindex, slice_txid) = slice?;
-    //         let txindex = Txindex::from(slice_txindex);
-    //         let txid = Txid::from_slice(&slice_txid)?;
-
-    //         wtx.remove(self.txindex_to_txid.data(), Slice::from(txindex));
-    //         wtx.remove(self.txindex_to_height.data(), Slice::from(txindex));
-    //         wtx.remove(self.txid_prefix_to_txindex.data(), txid.prefix());
-
-    //         Ok(())
-    //     })?;
-
-    // let txoutindex = Txoutindex::from(txindex);
-
-    // let mut addressindexes = BTreeSet::new();
-
-    // wtx.range(self.txoutindex_to_amount.data(), Slice::from(txoutindex)..)
-    //     .try_for_each(|slice| -> color_eyre::Result<()> {
-    //         let (txoutindex_slice, _) = slice?;
-
-    //         wtx.remove(self.txoutindex_to_amount.data(), txoutindex_slice);
-
-    //         if let Some(addressindex_slice) =
-    //             wtx.get(self.txoutindex_to_addressindex.data(), txoutindex_slice)?
-    //         {
-    //             wtx.remove(self.txoutindex_to_addressindex.data(), txoutindex_slice);
-
-    //             let addressindex = Addressindex::from(addressindex_slice);
-    //             addressindexes.insert(addressindex);
-
-    //             let txoutindex = Txoutindex::from(txoutindex_slice);
-    //             let addresstxoutindex = Addresstxoutindex::from((addressindex, txoutindex));
-
-    //             wtx.remove(
-    //                 self.addressindex_to_txoutindexes.data(),
-    //                 Slice::from(addresstxoutindex),
-    //             );
-    //         }
-
-    //         Ok(())
-    //     })?;
-
-    // addressindexes
-    // .into_iter()
-    // .filter(|addressindex| {
-    //     let is_empty = wtx
-    //         .prefix(
-    //             self.addressindex_to_txoutindexes.data(),
-    //             Slice::from(*addressindex),
-    //         )
-    //         .next()
-    //         .is_none();
-    //     is_empty
-    // })
-    // .try_for_each(|addressindex| -> color_eyre::Result<()> {
-    //     let addressindex_slice = Slice::from(addressindex);
-
-    //     let addressbytes = Addressbytes::from(
-    //         wtx.get(
-    //             self.addressindex_to_addressbytes.data(),
-    //             &addressindex_slice,
-    //         )?
-    //         .context("addressindex_to_address to have value")?,
-    //     );
-    //     wtx.remove(
-    //         self.addressbytes_prefix_to_addressindex.data(),
-    //         addressbytes.prefix(),
-    //     );
-    //     wtx.remove(
-    //         self.addressindex_to_addressbytes.data(),
-    //         &addressindex_slice,
-    //     );
-    //     wtx.remove(self.addressindex_to_addresstype.data(), &addressindex_slice);
-
-    //     Ok(())
-    // })?;
-    //
-
-    // todo!("clear addresstxoutindexes_out")
-    // todo!("clear addresstxoutindexes_in")
-    // todo!("clear zero_txoutindexes")
-    // todo!("clear txindexvout_to_txoutindex")
-
-    // Ok(())
-    // }
-
-    pub fn min_height(&self) -> Option<Height> {
-        [
-            self.addressbytes_prefix_to_addressindex.height(),
-            self.blockhash_prefix_to_height.height(),
-            self.txid_prefix_to_txindex.height(),
-        ]
-        .into_iter()
-        .min()
-        .flatten()
-        .cloned()
-    }
-
-    pub fn export(self, height: Height) -> Result<(), snkrj::Error> {
-        thread::scope(|scope| {
-            vec![
-                scope.spawn(|| self.addressbytes_prefix_to_addressindex.export(height)),
-                scope.spawn(|| self.blockhash_prefix_to_height.export(height)),
-                scope.spawn(|| self.txid_prefix_to_txindex.export(height)),
-            ]
-            .into_iter()
-            .try_for_each(|handle| -> Result<(), snkrj::Error> { handle.join().unwrap() })
-        })
-    }
-}
diff --git a/indexer/src/storage/sanakirjas/multi.rs b/indexer/src/storage/sanakirjas/multi.rs
deleted file mode 100644
index 4ac8f15b6..000000000
--- a/indexer/src/storage/sanakirjas/multi.rs
+++ /dev/null
@@ -1,103 +0,0 @@
-use std::{array, path::Path, sync::OnceLock};
-
-use rayon::prelude::*;
-use snkrj::{DatabaseKey, DatabaseMulti, DatabaseValue};
-
-use super::{Height, StoreMeta, Version};
-
-pub struct StoreMulti<K, V>
-where
-    K: DatabaseKey,
-    V: DatabaseValue,
-{
-    meta: StoreMeta,
-    pub parts: [OnceLock<Box<DatabaseMulti<K, V>>>; 256],
-}
-
-impl<K, V> StoreMulti<K, V>
-where
-    K: DatabaseKey,
-    V: DatabaseValue,
-{
-    pub fn open(path: &Path, version: Version) -> Result<Self, snkrj::Error> {
-        let meta = StoreMeta::checked_open(path, version)?;
-
-        Ok(Self {
-            meta,
-            parts: array::from_fn(|_| OnceLock::new()),
-        })
-    }
-
-    // pub fn len(&self) -> usize {
-    //     self.meta.len()
-    // }
-
-    fn get_or_init_store(&self, key: &K) -> &DatabaseMulti<K, V> {
-        self.get_or_init_store_(key.as_ne_byte() as usize)
-    }
-
-    fn get_or_init_store_(&self, storeindex: usize) -> &DatabaseMulti<K, V> {
-        self.parts[storeindex]
-            .get_or_init(|| Box::new(DatabaseMulti::open(self.meta.path_parts().join(storeindex.to_string())).unwrap()))
-    }
-
-    fn get_or_init_mut_store(&mut self, key: &K) -> &mut DatabaseMulti<K, V> {
-        self.get_or_init_store(key);
-
-        self.parts
-            .get_mut(key.as_ne_byte() as usize)
-            .unwrap()
-            .get_mut()
-            .unwrap()
-    }
-
-    #[allow(unused)]
-    pub fn open_all(&self) {
-        (0..=(u8::MAX) as usize).for_each(|storeindex| {
-            self.get_or_init_store_(storeindex);
-        });
-    }
-
-    #[allow(unused)]
-    pub fn get(&self, key: &K) -> Result<Option<&V>, snkrj::Error> {
-        self.get_or_init_store(key).get(key)
-    }
-
-    pub fn insert(&mut self, key: K, value: V) -> Option<V> {
-        self.meta.len += 1;
-        self.get_or_init_mut_store(&key).insert(key, value)
-    }
-
-    pub fn insert_if_needed(&mut self, key: K, value: V, height: Height) {
-        if self.meta.needs(height) {
-            self.insert(key, value);
-        }
-    }
-
-    pub fn export(self, height: Height) -> Result<(), snkrj::Error> {
-        if self.has(height) {
-            return Ok(());
-        }
-
-        self.meta.export(height)?;
-
-        self.parts.into_par_iter().try_for_each(|s| {
-            if let Some(db) = s.into_inner() {
-                db.export()
-            } else {
-                Ok(())
-            }
-        })
-    }
-
-    pub fn height(&self) -> Option<&Height> {
-        self.meta.height()
-    }
-    #[allow(unused)]
-    pub fn needs(&self, height: Height) -> bool {
-        self.meta.needs(height)
-    }
-    pub fn has(&self, height: Height) -> bool {
-        self.meta.has(height)
-    }
-}
diff --git a/indexer/src/storage/sanakirjas/unique.rs b/indexer/src/storage/sanakirjas/unique.rs
deleted file mode 100644
index 6c958d6d1..000000000
--- a/indexer/src/storage/sanakirjas/unique.rs
+++ /dev/null
@@ -1,102 +0,0 @@
-use std::{array, path::Path, sync::OnceLock};
-
-use rayon::prelude::*;
-use snkrj::{DatabaseKey, DatabaseUnique, DatabaseValue};
-
-use super::{Height, StoreMeta, Version};
-
-pub struct StoreUnique<K, V>
-where
-    K: DatabaseKey,
-    V: DatabaseValue,
-{
-    meta: StoreMeta,
-    pub parts: [OnceLock<Box<DatabaseUnique<K, V>>>; 256],
-}
-
-impl<K, V> StoreUnique<K, V>
-where
-    K: DatabaseKey,
-    V: DatabaseValue,
-{
-    pub fn open(path: &Path, version: Version) -> Result<Self, snkrj::Error> {
-        let meta = StoreMeta::checked_open(path, version)?;
-
-        Ok(Self {
-            meta,
-            parts: array::from_fn(|_| OnceLock::new()),
-        })
-    }
-
-    // pub fn len(&self) -> usize {
-    //     self.meta.len()
-    // }
-
-    fn get_or_init_store(&self, key: &K) -> &DatabaseUnique<K, V> {
-        self.get_or_init_store_(key.as_ne_byte() as usize)
-    }
-
-    fn get_or_init_store_(&self, storeindex: usize) -> &DatabaseUnique<K, V> {
-        self.parts[storeindex].get_or_init(|| {
-            Box::new(DatabaseUnique::open(self.meta.path_parts().join(storeindex.to_string())).unwrap())
-        })
-    }
-
-    fn get_or_init_mut_store(&mut self, key: &K) -> &mut DatabaseUnique<K, V> {
-        self.get_or_init_store(key);
-
-        self.parts
-            .get_mut(key.as_ne_byte() as usize)
-            .unwrap()
-            .get_mut()
-            .unwrap()
-    }
-
-    #[allow(unused)]
-    pub fn open_all(&self) {
-        (0..=(u8::MAX) as usize).for_each(|storeindex| {
-            self.get_or_init_store_(storeindex);
-        });
-    }
-
-    pub fn get(&self, key: &K) -> Result<Option<&V>, snkrj::Error> {
-        self.get_or_init_store(key).get(key)
-    }
-
-    pub fn insert(&mut self, key: K, value: V) -> Option<V> {
-        self.meta.len += 1;
-        self.get_or_init_mut_store(&key).insert(key, value)
-    }
-
-    pub fn insert_if_needed(&mut self, key: K, value: V, height: Height) {
-        if self.meta.needs(height) {
-            self.insert(key, value);
-        }
-    }
-
-    pub fn export(self, height: Height) -> Result<(), snkrj::Error> {
-        if self.has(height) {
-            return Ok(());
-        }
-
-        self.meta.export(height)?;
-
-        self.parts.into_par_iter().try_for_each(|s| {
-            if let Some(db) = s.into_inner() {
-                db.export()
-            } else {
-                Ok(())
-            }
-        })
-    }
-
-    pub fn height(&self) -> Option<&Height> {
-        self.meta.height()
-    }
-    pub fn needs(&self, height: Height) -> bool {
-        self.meta.needs(height)
-    }
-    pub fn has(&self, height: Height) -> bool {
-        self.meta.has(height)
-    }
-}
diff --git a/indexer/src/storage/storable_vecs/base.rs b/indexer/src/storage/storable_vecs/base.rs
index c05d21c5a..0f4f95ca9 100644
--- a/indexer/src/storage/storable_vecs/base.rs
+++ b/indexer/src/storage/storable_vecs/base.rs
@@ -34,6 +34,11 @@ where
         self.vec.flush()
     }
 
+    pub fn truncate_if_needed(&mut self, index: I, height: Height) -> storable_vec::Result<Option<T>> {
+        height.write(&self.path_height())?;
+        self.vec.truncate_if_needed(index)
+    }
+
     pub fn height(&self) -> storable_vec::Result<Height> {
         Height::try_from(self.path_height().as_path())
     }
diff --git a/indexer/src/storage/storable_vecs/mod.rs b/indexer/src/storage/storable_vecs/mod.rs
index 3e4c2c39a..7b063f867 100644
--- a/indexer/src/storage/storable_vecs/mod.rs
+++ b/indexer/src/storage/storable_vecs/mod.rs
@@ -1,4 +1,4 @@
-use std::{fs, io, path::Path};
+use std::{collections::BTreeMap, fs, io, path::Path};
 
 use exit::Exit;
 use rayon::prelude::*;
@@ -181,117 +181,114 @@ impl<const MODE: u8> StorableVecs<MODE> {
     }
 
     #[allow(unused)]
-    pub fn rollback_from(&mut self, _height: Height, _exit: &Exit) -> color_eyre::Result<()> {
-        panic!();
-        // let mut txindex = None;
+    pub fn rollback_from(&mut self, height: Height, exit: &Exit) -> storable_vec::Result<()> {
+        let prev_height = height.decremented();
 
-        // wtx.range(self.height_to_blockhash.data(), Slice::from(height)..)
-        //     .try_for_each(|slice| -> color_eyre::Result<()> {
-        //         let (height_slice, slice_blockhash) = slice?;
-        //         let blockhash = BlockHash::from_slice(&slice_blockhash)?;
+        let mut truncated_indexes: BTreeMap<String, Option<usize>> = BTreeMap::new();
 
-        //         wtx.remove(self.height_to_blockhash.data(), height_slice);
+        let addressindex = self
+            .height_to_first_addressindex
+            .truncate_if_needed(height, prev_height)?;
+        let txindex = self.height_to_first_txindex.truncate_if_needed(height, prev_height)?;
+        let txinindex = self.height_to_first_txinindex.truncate_if_needed(height, prev_height)?;
+        let txoutindex = self
+            .height_to_first_txoutindex
+            .truncate_if_needed(height, prev_height)?;
+        let p2pk33index = self
+            .height_to_first_p2pk33index
+            .truncate_if_needed(height, prev_height)?;
+        let p2pk65index = self
+            .height_to_first_p2pk65index
+            .truncate_if_needed(height, prev_height)?;
+        let p2pkhindex = self
+            .height_to_first_p2pkhindex
+            .truncate_if_needed(height, prev_height)?;
+        let p2shindex = self.height_to_first_p2shindex.truncate_if_needed(height, prev_height)?;
+        let p2trindex = self.height_to_first_p2trindex.truncate_if_needed(height, prev_height)?;
+        let p2wpkhindex = self
+            .height_to_first_p2wpkhindex
+            .truncate_if_needed(height, prev_height)?;
+        let p2wshindex = self
+            .height_to_first_p2wshindex
+            .truncate_if_needed(height, prev_height)?;
 
-        //         wtx.remove(self.blockhash_prefix_to_height.data(), blockhash.prefix());
+        self.height_to_blockhash.truncate_if_needed(height, prev_height)?;
+        self.height_to_difficulty.truncate_if_needed(height, prev_height)?;
+        self.height_to_first_emptyindex
+            .truncate_if_needed(height, prev_height)?;
+        self.height_to_first_multisigindex
+            .truncate_if_needed(height, prev_height)?;
+        self.height_to_first_opreturnindex
+            .truncate_if_needed(height, prev_height)?;
+        self.height_to_first_pushonlyindex
+            .truncate_if_needed(height, prev_height)?;
+        self.height_to_first_unknownindex
+            .truncate_if_needed(height, prev_height)?;
+        self.height_to_size.truncate_if_needed(height, prev_height)?;
+        self.height_to_timestamp.truncate_if_needed(height, prev_height)?;
+        self.height_to_weight.truncate_if_needed(height, prev_height)?;
 
-        //         if txindex.is_none() {
-        //             txindex.replace(
-        //                 wtx.get(self.height_to_first_txindex.data(), height_slice)?
-        //                     .context("for height to have first txindex")?,
-        //             );
-        //         }
-        //         wtx.remove(self.height_to_first_txindex.data(), height_slice);
-        //         wtx.remove(self.height_to_last_txindex.data(), height_slice);
+        if let Some(addressindex) = addressindex {
+            self.addressindex_to_addresstype
+                .truncate_if_needed(addressindex, prev_height)?;
+            self.addressindex_to_addresstypeindex
+                .truncate_if_needed(addressindex, prev_height)?;
+            self.addressindex_to_height
+                .truncate_if_needed(addressindex, prev_height)?;
+        }
 
-        //         Ok(())
-        //     })?;
+        if let Some(p2pk33index) = p2pk33index {
+            self.p2pk33index_to_p2pk33addressbytes
+                .truncate_if_needed(p2pk33index, prev_height)?;
+        }
+        if let Some(p2pk65index) = p2pk65index {
+            self.p2pk65index_to_p2pk65addressbytes
+                .truncate_if_needed(p2pk65index, prev_height)?;
+        }
+        if let Some(p2pkhindex) = p2pkhindex {
+            self.p2pkhindex_to_p2pkhaddressbytes
+                .truncate_if_needed(p2pkhindex, prev_height)?;
+        }
+        if let Some(p2shindex) = p2shindex {
+            self.p2shindex_to_p2shaddressbytes
+                .truncate_if_needed(p2shindex, prev_height)?;
+        }
+        if let Some(p2trindex) = p2trindex {
+            self.p2trindex_to_p2traddressbytes
+                .truncate_if_needed(p2trindex, prev_height)?;
+        }
+        if let Some(p2wpkhindex) = p2wpkhindex {
+            self.p2wpkhindex_to_p2wpkhaddressbytes
+                .truncate_if_needed(p2wpkhindex, prev_height)?;
+        }
+        if let Some(p2wshindex) = p2wshindex {
+            self.p2wshindex_to_p2wshaddressbytes
+                .truncate_if_needed(p2wshindex, prev_height);
+        }
 
-        // let txindex = txindex.context("txindex to not be none by now")?;
+        if let Some(txindex) = txindex {
+            self.txindex_to_first_txinindex
+                .truncate_if_needed(txindex, prev_height)?;
+            self.txindex_to_first_txoutindex
+                .truncate_if_needed(txindex, prev_height)?;
+            self.txindex_to_height.truncate_if_needed(txindex, prev_height)?;
+            self.txindex_to_locktime.truncate_if_needed(txindex, prev_height)?;
+            self.txindex_to_txid.truncate_if_needed(txindex, prev_height)?;
+            self.txindex_to_txversion.truncate_if_needed(txindex, prev_height)?;
+        }
 
-        // wtx.range(self.txindex_to_txid.data(), Slice::from(txindex)..)
-        //     .try_for_each(|slice| -> color_eyre::Result<()> {
-        //         let (slice_txindex, slice_txid) = slice?;
-        //         let txindex = Txindex::from(slice_txindex);
-        //         let txid = Txid::from_slice(&slice_txid)?;
+        if let Some(txinindex) = txinindex {
+            self.txinindex_to_txoutindex
+                .truncate_if_needed(txinindex, prev_height)?;
+        }
 
-        //         wtx.remove(self.txindex_to_txid.data(), Slice::from(txindex));
-        //         wtx.remove(self.txindex_to_height.data(), Slice::from(txindex));
-        //         wtx.remove(self.txid_prefix_to_txindex.data(), txid.prefix());
+        if let Some(txoutindex) = txoutindex {
+            self.txoutindex_to_addressindex
+                .truncate_if_needed(txoutindex, prev_height)?;
+            self.txoutindex_to_value.truncate_if_needed(txoutindex, prev_height)?;
+        }
 
-        //         Ok(())
-        //     })?;
-
-        // let txoutindex = Txoutindex::from(txindex);
-
-        // let mut addressindexes = BTreeSet::new();
-
-        // wtx.range(self.txoutindex_to_amount.data(), Slice::from(txoutindex)..)
-        //     .try_for_each(|slice| -> color_eyre::Result<()> {
-        //         let (txoutindex_slice, _) = slice?;
-
-        //         wtx.remove(self.txoutindex_to_amount.data(), txoutindex_slice);
-
-        //         if let Some(addressindex_slice) =
-        //             wtx.get(self.txoutindex_to_addressindex.data(), txoutindex_slice)?
-        //         {
-        //             wtx.remove(self.txoutindex_to_addressindex.data(), txoutindex_slice);
-
-        //             let addressindex = Addressindex::from(addressindex_slice);
-        //             addressindexes.insert(addressindex);
-
-        //             let txoutindex = Txoutindex::from(txoutindex_slice);
-        //             let addresstxoutindex = Addresstxoutindex::from((addressindex, txoutindex));
-
-        //             wtx.remove(
-        //                 self.addressindex_to_txoutindexes.data(),
-        //                 Slice::from(addresstxoutindex),
-        //             );
-        //         }
-
-        //         Ok(())
-        //     })?;
-
-        // addressindexes
-        // .into_iter()
-        // .filter(|addressindex| {
-        //     let is_empty = wtx
-        //         .prefix(
-        //             self.addressindex_to_txoutindexes.data(),
-        //             Slice::from(*addressindex),
-        //         )
-        //         .next()
-        //         .is_none();
-        //     is_empty
-        // })
-        // .try_for_each(|addressindex| -> color_eyre::Result<()> {
-        //     let addressindex_slice = Slice::from(addressindex);
-
-        //     let addressbytes = Addressbytes::from(
-        //         wtx.get(
-        //             self.addressindex_to_addressbytes.data(),
-        //             &addressindex_slice,
-        //         )?
-        //         .context("addressindex_to_address to have value")?,
-        //     );
-        //     wtx.remove(
-        //         self.addressbytes_prefix_to_addressindex.data(),
-        //         addressbytes.prefix(),
-        //     );
-        //     wtx.remove(
-        //         self.addressindex_to_addressbytes.data(),
-        //         &addressindex_slice,
-        //     );
-        //     wtx.remove(self.addressindex_to_addresstype.data(), &addressindex_slice);
-
-        //     Ok(())
-        // })?;
-        //
-
-        // todo!("clear addresstxoutindexes_out")
-        // todo!("clear addresstxoutindexes_in")
-        // todo!("clear zero_txoutindexes")
-
-        // Ok(())
+        Ok(())
     }
 
     pub fn flush(&mut self, height: Height) -> io::Result<()> {
diff --git a/indexer/src/structs/height.rs b/indexer/src/structs/height.rs
index e09fe4d11..daaa11c15 100644
--- a/indexer/src/structs/height.rs
+++ b/indexer/src/structs/height.rs
@@ -33,6 +33,10 @@ impl Height {
     pub fn write(&self, path: &Path) -> Result<(), io::Error> {
         fs::write(path, self.as_bytes())
     }
+
+    pub fn decremented(&self) -> Self {
+        Self(self.0.checked_sub(1).unwrap_or_default())
+    }
 }
 
 impl PartialEq<u64> for Height {
diff --git a/pricer/src/lib.rs b/pricer/src/lib.rs
index 6d5f0f617..60a2fcc63 100644
--- a/pricer/src/lib.rs
+++ b/pricer/src/lib.rs
@@ -120,18 +120,19 @@ impl<const MODE: u8> Pricer<MODE> {
     }
 
     fn get_date_ohlc(&mut self, date: Date) -> color_eyre::Result<OHLC> {
-        if self.ohlc.date.is_key_safe(date) {
-            Ok(self.ohlc.date.get_or_import(&date).unwrap().to_owned())
-        } else {
-            let ohlc = self
-                .get_from_daily_kraken(&date)
-                .or_else(|_| self.get_from_daily_binance(&date))
-                .or_else(|_| self.get_from_date_kibo(&date))?;
+        todo!();
+        // if self.ohlc.date.is_key_safe(date) {
+        //     Ok(self.ohlc.date.get_or_import(&date).unwrap().to_owned())
+        // } else {
+        //     let ohlc = self
+        //         .get_from_daily_kraken(&date)
+        //         .or_else(|_| self.get_from_daily_binance(&date))
+        //         .or_else(|_| self.get_from_date_kibo(&date))?;
 
-            self.ohlc.date.insert(date, ohlc);
+        //     self.ohlc.date.insert(date, ohlc);
 
-            Ok(ohlc)
-        }
+        //     Ok(ohlc)
+        // }
     }
 
     fn get_height_ohlc(
@@ -140,51 +141,53 @@ impl<const MODE: u8> Pricer<MODE> {
         timestamp: Timestamp,
         previous_timestamp: Option<Timestamp>,
     ) -> color_eyre::Result<OHLC> {
-        if let Some(ohlc) = self.ohlc.height.get_or_import(&height) {
-            return Ok(ohlc);
-        }
+        todo!();
 
-        let timestamp = timestamp.to_floored_seconds();
+        //         if let Some(ohlc) = self.ohlc.height.get_or_import(&height) {
+        //             return Ok(ohlc);
+        //         }
 
-        if previous_timestamp.is_none() && !height.is_first() {
-            panic!("Shouldn't be possible");
-        }
+        //         let timestamp = timestamp.to_floored_seconds();
 
-        let previous_timestamp = previous_timestamp.map(|t| t.to_floored_seconds());
+        //         if previous_timestamp.is_none() && !height.is_first() {
+        //             panic!("Shouldn't be possible");
+        //         }
 
-        let ohlc = self
-            .get_from_1mn_kraken(timestamp, previous_timestamp)
-            .unwrap_or_else(|_| {
-                self.get_from_1mn_binance(timestamp, previous_timestamp)
-                    .unwrap_or_else(|_| {
-                        self.get_from_har_binance(timestamp, previous_timestamp, config)
-                            .unwrap_or_else(|_| {
-                                self.get_from_height_kibo(&height).unwrap_or_else(|_| {
-                                    let date = timestamp.to_date();
+        //         let previous_timestamp = previous_timestamp.map(|t| t.to_floored_seconds());
 
-                                    panic!(
-                                        "Can't find the price for: height: {height} - date: {date}
-1mn APIs are limited to the last 16 hours for Binance's and the last 10 hours for Kraken's
-How to fix this:
-1. Go to https://www.binance.com/en/trade/BTC_USDT?type=spot
-2. Select 1mn interval
-3. Open the inspector/dev tools
-4. Go to the Network Tab
-5. Filter URLs by 'uiKlines'
-6. Go back to the chart and scroll until you pass the date mentioned few lines ago
-7. Go back to the dev tools
-8. Export to a har file (if there is no explicit button, click on the cog button)
-9. Move the file to 'parser/imports/binance.har'
-"
-                                    )
-                                })
-                            })
-                    })
-            });
+        //         let ohlc = self
+        //             .get_from_1mn_kraken(timestamp, previous_timestamp)
+        //             .unwrap_or_else(|_| {
+        //                 self.get_from_1mn_binance(timestamp, previous_timestamp)
+        //                     .unwrap_or_else(|_| {
+        //                         self.get_from_har_binance(timestamp, previous_timestamp, config)
+        //                             .unwrap_or_else(|_| {
+        //                                 self.get_from_height_kibo(&height).unwrap_or_else(|_| {
+        //                                     let date = timestamp.to_date();
 
-        // self.ohlc.height.insert(height, ohlc);
+        //                                     panic!(
+        //                                         "Can't find the price for: height: {height} - date: {date}
+        // 1mn APIs are limited to the last 16 hours for Binance's and the last 10 hours for Kraken's
+        // How to fix this:
+        // 1. Go to https://www.binance.com/en/trade/BTC_USDT?type=spot
+        // 2. Select 1mn interval
+        // 3. Open the inspector/dev tools
+        // 4. Go to the Network Tab
+        // 5. Filter URLs by 'uiKlines'
+        // 6. Go back to the chart and scroll until you pass the date mentioned few lines ago
+        // 7. Go back to the dev tools
+        // 8. Export to a har file (if there is no explicit button, click on the cog button)
+        // 9. Move the file to 'parser/imports/binance.har'
+        // "
+        //                                     )
+        //                                 })
+        //                             })
+        //                     })
+        //             });
 
-        Ok(ohlc)
+        //         // self.ohlc.height.insert(height, ohlc);
+
+        //         Ok(ohlc)
     }
 
     fn find_height_ohlc(
diff --git a/pricer/src/main.rs b/pricer/src/main.rs
index dcfafe61a..9efd33647 100644
--- a/pricer/src/main.rs
+++ b/pricer/src/main.rs
@@ -8,12 +8,12 @@ fn main() -> color_eyre::Result<()> {
 
     logger::init_log(None);
 
-    dbg!(Binance::fetch_1d_prices()?);
+    // dbg!(Binance::fetch_1d_prices()?);
     // dbg!(Binance::fetch_1mn_prices());
-    dbg!(Kraken::fetch_1d()?);
+    // dbg!(Kraken::fetch_1d()?);
     // dbg!(Kraken::fetch_1mn_prices()?);
-    dbg!(Kibo::fetch_date_prices(2025)?);
-    dbg!(Kibo::fetch_height_prices(Height::from(880_000_u32))?);
+    // dbg!(Kibo::fetch_date_prices(2025)?);
+    // dbg!(Kibo::fetch_height_prices(Height::from(880_000_u32))?);
 
     Ok(())
 }
diff --git a/storable_vec/src/lib.rs b/storable_vec/src/lib.rs
index 790ed1082..40c0eb220 100644
--- a/storable_vec/src/lib.rs
+++ b/storable_vec/src/lib.rs
@@ -282,6 +282,23 @@ where
         Ok(())
     }
 
+    pub fn truncate_if_needed(&mut self, index: I) -> Result<Option<T>> {
+        let index = Self::i_to_usize(index)?;
+
+        if index >= self.file_len {
+            return Ok(None);
+        }
+
+        let value_at_index = self.open_file_at_then_read(index).ok();
+
+        self.file
+            .set_len(Self::index_to_byte_index(index.checked_sub(1).unwrap_or_default()))?;
+
+        self.reset_disk_related_state()?;
+
+        Ok(value_at_index)
+    }
+
     #[inline]
     fn i_to_usize(index: I) -> Result<usize> {
         index.try_into().map_err(|_| Error::FailedKeyTryIntoUsize)

From 15f2e05192736688508a1aa38f97c4e5b745716d Mon Sep 17 00:00:00 2001
From: nym21 <expat-epochs0i@icloud.com>
Date: Tue, 18 Feb 2025 22:43:12 +0100
Subject: [PATCH 53/63] indexer: improved rollback; global: snapshot

---
 Cargo.lock                                | 178 ++++++++++------
 Cargo.toml                                |   4 +-
 indexer/Cargo.toml                        |   1 +
 indexer/README.md                         |  19 ++
 indexer/src/lib.rs                        | 162 +++++---------
 indexer/src/storage/fjalls/base.rs        |  43 +++-
 indexer/src/storage/fjalls/meta.rs        |   4 +-
 indexer/src/storage/fjalls/mod.rs         | 249 ++++++++++------------
 indexer/src/storage/storable_vecs/base.rs |   8 +-
 indexer/src/storage/storable_vecs/mod.rs  | 210 +++++++++---------
 indexer/src/structs/blockhash.rs          |  10 +
 indexer/src/structs/compressed.rs         |  20 +-
 indexer/src/structs/height.rs             |  26 ++-
 indexer/src/structs/indexes.rs            | 114 ++++++++++
 indexer/src/structs/mod.rs                |   2 +
 iterator/Cargo.toml                       |   1 -
 iterator/src/lib.rs                       |  39 ----
 iterator/src/main.rs                      |   2 +-
 pricer/Cargo.toml                         |  14 +-
 pricer/src/fetchers/binance.rs            |  19 +-
 pricer/src/fetchers/kibo.rs               |   9 +-
 pricer/src/fetchers/kraken.rs             |   6 +-
 pricer/src/main.rs                        |   7 +-
 python/{example.py => parse.py}           |   0
 server/Cargo.toml                         |   2 +-
 storable_vec/Cargo.toml                   |   3 +-
 storable_vec/src/lib.rs                   |  47 +++-
 storable_vec/src/structs/mod.rs           |   2 +
 storable_vec/src/structs/unsafe_slice.rs  |  30 +++
 29 files changed, 708 insertions(+), 523 deletions(-)
 create mode 100644 indexer/README.md
 create mode 100644 indexer/src/structs/indexes.rs
 rename python/{example.py => parse.py} (100%)
 create mode 100644 storable_vec/src/structs/unsafe_slice.rs

diff --git a/Cargo.lock b/Cargo.lock
index 70148638b..8d46b9174 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -394,11 +394,27 @@ version = "0.1.0"
 dependencies = [
  "bindex",
  "biter",
+ "brice",
  "color-eyre",
  "derive_deref",
  "exit",
  "fjall",
- "pricer",
+ "storable_vec",
+ "zerocopy 0.8.18",
+]
+
+[[package]]
+name = "brice"
+version = "0.1.0"
+dependencies = [
+ "bindex",
+ "color-eyre",
+ "derive_deref",
+ "jiff",
+ "logger",
+ "minreq",
+ "serde",
+ "serde_json",
  "storable_vec",
  "zerocopy 0.8.18",
 ]
@@ -1055,7 +1071,7 @@ dependencies = [
  "http",
  "hyper",
  "hyper-util",
- "rustls",
+ "rustls 0.23.23",
  "rustls-pki-types",
  "tokio",
  "tokio-rustls",
@@ -1290,9 +1306,9 @@ checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
 
 [[package]]
 name = "jiff"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba926fdd8e5b5e7f9700355b0831d8c416afe94b014b1023424037a187c9c582"
+checksum = "3590fea8e9e22d449600c9bbd481a8163bef223e4ff938e5f55899f8cf1adb93"
 dependencies = [
  "jiff-tzdb-platform",
  "log",
@@ -1480,8 +1496,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "da0c420feb01b9fb5061f8c8f452534361dd783756dcf38ec45191ce55e7a161"
 dependencies = [
  "log",
+ "once_cell",
+ "rustls 0.21.12",
+ "rustls-webpki 0.101.7",
  "serde",
  "serde_json",
+ "webpki-roots",
 ]
 
 [[package]]
@@ -1575,9 +1595,9 @@ checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e"
 
 [[package]]
 name = "openssl"
-version = "0.10.70"
+version = "0.10.71"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61cfb4e166a8bb8c9b55c500bc2308550148ece889be90f609377e58140f42c6"
+checksum = "5e14130c6a98cd258fdcb0fb6d744152343ff729cbfcb28c656a9d12b999fbcd"
 dependencies = [
  "bitflags",
  "cfg-if",
@@ -1607,9 +1627,9 @@ checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.105"
+version = "0.9.106"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b22d5b84be05a8d6947c7cb71f7c849aa0f112acd4bf51c2a7c1c988ac0a9dc"
+checksum = "8bb61ea9811cc39e3c2069f40b8b8e2e70d8569b361f879786cc7ed48b777cdd"
 dependencies = [
  "cc",
  "libc",
@@ -1637,9 +1657,9 @@ checksum = "fb37767f6569cd834a413442455e0f066d0d522de8630436e2a1761d9726ba56"
 
 [[package]]
 name = "oxc"
-version = "0.50.0"
+version = "0.51.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d064edaa54040423cb94b283026dfcd679b29c26c2f070021dc268cc96fb155"
+checksum = "c9f57beb511c2a1848baf900782d3975f89dbf75fc47ad2207147acf95523ab0"
 dependencies = [
  "oxc_allocator",
  "oxc_ast",
@@ -1680,9 +1700,9 @@ dependencies = [
 
 [[package]]
 name = "oxc_allocator"
-version = "0.50.0"
+version = "0.51.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "417522e84d8fdc87cab7bfc95b6419757c3d2f2013b78491c0295135d3516945"
+checksum = "5a6d450673da14c60c6946deb0c06d68377d2d6f2ee41ad5b462fa9894001560"
 dependencies = [
  "allocator-api2",
  "bumpalo",
@@ -1693,9 +1713,9 @@ dependencies = [
 
 [[package]]
 name = "oxc_ast"
-version = "0.50.0"
+version = "0.51.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2e0b6014198425ee79e1e0c71c79fc874f3a7c7007043d9ce1b353f740de488"
+checksum = "692c74b135e66d3fa13312d886f4a307131a5bd2fd76e5a4137825c6161b56a5"
 dependencies = [
  "bitflags",
  "cow-utils",
@@ -1710,9 +1730,9 @@ dependencies = [
 
 [[package]]
 name = "oxc_ast_macros"
-version = "0.50.0"
+version = "0.51.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a58764050b69c30bdf45a6f803bff212306ba9ac50277f21a231ff6e110da682"
+checksum = "d4759d0523a72576036df640954ac9c4ce995f39f290cfc723221cc45ac7b11a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1721,9 +1741,9 @@ dependencies = [
 
 [[package]]
 name = "oxc_cfg"
-version = "0.50.0"
+version = "0.51.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "621ea878d0e487215822fe61c98afaa337e79f8290352a95bd8d37c45eab0484"
+checksum = "c58e5838966f971c24e8be8c34fb901e6e8a48211ea1db6d66c76fbb77b58d6c"
 dependencies = [
  "bitflags",
  "itertools",
@@ -1736,9 +1756,9 @@ dependencies = [
 
 [[package]]
 name = "oxc_codegen"
-version = "0.50.0"
+version = "0.51.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f68faeabfca1a9ad49b26939766185e87f4d03d08d917b465b1956db7d2ac466"
+checksum = "b6e298be4a113f57749ed51a38dc253671eaed418a5de6dbd2bf29ff34c4f595"
 dependencies = [
  "assert-unchecked",
  "bitflags",
@@ -1758,9 +1778,9 @@ dependencies = [
 
 [[package]]
 name = "oxc_data_structures"
-version = "0.50.0"
+version = "0.51.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f3c3ebb1b248fa1a5ea965b7398eb0533f45545c6cbe28cd581f57211413096"
+checksum = "8e87ee74753f20549e9d6bcc00e956f5ab67fde4a23e383fd4f7d8ad752d71d3"
 dependencies = [
  "assert-unchecked",
  "ropey",
@@ -1768,9 +1788,9 @@ dependencies = [
 
 [[package]]
 name = "oxc_diagnostics"
-version = "0.50.0"
+version = "0.51.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae69c956abfbadf5c31f08dc2b901bcefadb87a472106e13ae2b6a01135c66c2"
+checksum = "e27133a883a4f5d9796259a3ca6ab28ba8c097ee32cd58fc794688e205f66727"
 dependencies = [
  "cow-utils",
  "oxc-miette",
@@ -1778,10 +1798,11 @@ dependencies = [
 
 [[package]]
 name = "oxc_ecmascript"
-version = "0.50.0"
+version = "0.51.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2f773d18674b21240b42a7c8bcb3522de09b8841993620286e87812d7e7866a"
+checksum = "16a7535550ce59cc7373d60d13e5fb32eee1817ba9dcfa3df7a1ae96bdb0945e"
 dependencies = [
+ "cow-utils",
  "num-bigint",
  "num-traits",
  "oxc_ast",
@@ -1791,9 +1812,9 @@ dependencies = [
 
 [[package]]
 name = "oxc_estree"
-version = "0.50.0"
+version = "0.51.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "244fd8ba7157c8f12910024373d4e3665b6a35fb5947edae1d4a6c084ac8e0c3"
+checksum = "a817a58818b63a5b26a15527e9c7f09c93ba1a95f570ae75e5e84bd3dee047de"
 
 [[package]]
 name = "oxc_index"
@@ -1803,9 +1824,9 @@ checksum = "5eca5d9726cd0a6e433debe003b7bc88b2ecad0bb6109f0cef7c55e692139a34"
 
 [[package]]
 name = "oxc_mangler"
-version = "0.50.0"
+version = "0.51.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73839b44f57bdc707e63c3558d4da368e904960f13db1639c6d6c5e2e7e4ab8d"
+checksum = "40dc09dd18e8c7cfaa85ef14f2634b81439de7ac900d579dcc3d6885c0847895"
 dependencies = [
  "fixedbitset",
  "itertools",
@@ -1819,9 +1840,9 @@ dependencies = [
 
 [[package]]
 name = "oxc_minifier"
-version = "0.50.0"
+version = "0.51.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba22e1818002180efb9e023422a56d67b4baaa537deaf61d23d8ea6893ddcdd7"
+checksum = "5c8987515e26c6765bf10c12073cd1d135bd99f531fcb2bcae399b8590e3dd44"
 dependencies = [
  "cow-utils",
  "oxc_allocator",
@@ -1840,9 +1861,9 @@ dependencies = [
 
 [[package]]
 name = "oxc_parser"
-version = "0.50.0"
+version = "0.51.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b9d2ce3556a0ec6ee45da6936c5f04d97e6f00ef7ddca08dcc473094a21cfed"
+checksum = "6410afa5ad3cde657f26803f828726b8d3b475131299faf5c7948299892a560c"
 dependencies = [
  "assert-unchecked",
  "bitflags",
@@ -1863,9 +1884,9 @@ dependencies = [
 
 [[package]]
 name = "oxc_regular_expression"
-version = "0.50.0"
+version = "0.51.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0e6d43914ff6758f62cf150f12d068a737fd464735d6b83ecefc7136f65e685"
+checksum = "9711b8c74f28de9a295bc03baf7d61abf47af35556156e49f3a44fa572194325"
 dependencies = [
  "oxc_allocator",
  "oxc_ast_macros",
@@ -1879,9 +1900,9 @@ dependencies = [
 
 [[package]]
 name = "oxc_semantic"
-version = "0.50.0"
+version = "0.51.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e08d8bb5afc64dfc05e9f3b573c9af8b23a9a24aceb2bb1634d1f131717b736"
+checksum = "18e0eac139ab28789789f993fa4955c386454d7c34c1adfe44448c1cb7769cf0"
 dependencies = [
  "assert-unchecked",
  "itertools",
@@ -1915,9 +1936,9 @@ dependencies = [
 
 [[package]]
 name = "oxc_span"
-version = "0.50.0"
+version = "0.51.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ae8953d32ade84e814d154ee046f0f08b2b236e12f550545a690454ab2a102c"
+checksum = "f8c7d6b92b30eea1fdc8907c6dfe8525b75a815024d6567628697789076fb7e1"
 dependencies = [
  "compact_str",
  "oxc-miette",
@@ -1928,9 +1949,9 @@ dependencies = [
 
 [[package]]
 name = "oxc_syntax"
-version = "0.50.0"
+version = "0.51.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f375deb505b7fad6ed2125fdb92ffa8d550d866ca2ab0dfd24e681b125883c1"
+checksum = "9540bf5b53cb0cd81dbdf07b25834a5064b762e6a330ca35d0d424a581a442b8"
 dependencies = [
  "assert-unchecked",
  "bitflags",
@@ -1949,9 +1970,9 @@ dependencies = [
 
 [[package]]
 name = "oxc_traverse"
-version = "0.50.0"
+version = "0.51.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a4d049215b81048597d120851e1e797331be4f45ae2bb39ae2855c3be76fcc3"
+checksum = "9583a428473921f6faa890fd9b564d8df59832d6638b03f4a30779a15d22e612"
 dependencies = [
  "compact_str",
  "itoa",
@@ -2106,22 +2127,6 @@ dependencies = [
  "zerocopy 0.7.35",
 ]
 
-[[package]]
-name = "pricer"
-version = "0.1.0"
-dependencies = [
- "bindex",
- "color-eyre",
- "derive_deref",
- "jiff",
- "logger",
- "reqwest",
- "serde",
- "serde_json",
- "storable_vec",
- "zerocopy 0.8.18",
-]
-
 [[package]]
 name = "proc-macro2"
 version = "1.0.93"
@@ -2250,7 +2255,6 @@ version = "0.12.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "43e734407157c3c2034e0258f5e4473ddb361b1e85f95a66690d67264d7cd1da"
 dependencies = [
- "async-compression",
  "base64 0.22.1",
  "bytes",
  "encoding_rs",
@@ -2281,7 +2285,6 @@ dependencies = [
  "system-configuration",
  "tokio",
  "tokio-native-tls",
- "tokio-util",
  "tower",
  "tower-service",
  "url",
@@ -2349,6 +2352,18 @@ dependencies = [
  "windows-sys 0.59.0",
 ]
 
+[[package]]
+name = "rustls"
+version = "0.21.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e"
+dependencies = [
+ "log",
+ "ring",
+ "rustls-webpki 0.101.7",
+ "sct",
+]
+
 [[package]]
 name = "rustls"
 version = "0.23.23"
@@ -2357,7 +2372,7 @@ checksum = "47796c98c480fce5406ef69d1c76378375492c3b0a0de587be0c1d9feb12f395"
 dependencies = [
  "once_cell",
  "rustls-pki-types",
- "rustls-webpki",
+ "rustls-webpki 0.102.8",
  "subtle",
  "zeroize",
 ]
@@ -2377,6 +2392,16 @@ version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "917ce264624a4b4db1c364dcc35bfca9ded014d0a958cd47ad3e960e988ea51c"
 
+[[package]]
+name = "rustls-webpki"
+version = "0.101.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765"
+dependencies = [
+ "ring",
+ "untrusted",
+]
+
 [[package]]
 name = "rustls-webpki"
 version = "0.102.8"
@@ -2402,9 +2427,9 @@ checksum = "6ea1a2d0a644769cc99faa24c3ad26b379b786fe7c36fd3c546254801650e6dd"
 
 [[package]]
 name = "ryu-js"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad97d4ce1560a5e27cec89519dc8300d1aa6035b099821261c651486a19e44d5"
+checksum = "dd29631678d6fb0903b69223673e122c32e9ae559d0960a38d574695ebc0ea15"
 
 [[package]]
 name = "schannel"
@@ -2421,6 +2446,16 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
+[[package]]
+name = "sct"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414"
+dependencies = [
+ "ring",
+ "untrusted",
+]
+
 [[package]]
 name = "secp256k1"
 version = "0.29.1"
@@ -2630,6 +2665,7 @@ name = "storable_vec"
 version = "0.1.2"
 dependencies = [
  "memmap2",
+ "rayon",
  "serde",
  "serde_json",
  "zerocopy 0.8.18",
@@ -2712,9 +2748,9 @@ dependencies = [
 
 [[package]]
 name = "tempfile"
-version = "3.16.0"
+version = "3.17.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38c246215d7d24f48ae091a2902398798e05d978b24315d6efbc00ede9a8bb91"
+checksum = "22e5a0acb1f3f55f65cc4a866c361b2fb2a0ff6366785ae6fbb5f85df07ba230"
 dependencies = [
  "cfg-if",
  "fastrand",
@@ -2820,7 +2856,7 @@ version = "0.26.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5f6d0975eaace0cf0fcadee4e4aaa5da15b5c079146f2cffb67c113be122bf37"
 dependencies = [
- "rustls",
+ "rustls 0.23.23",
  "tokio",
 ]
 
@@ -3143,6 +3179,12 @@ dependencies = [
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "webpki-roots"
+version = "0.25.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1"
+
 [[package]]
 name = "windows-registry"
 version = "0.2.0"
diff --git a/Cargo.toml b/Cargo.toml
index 68e1b0483..1356c50c9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -20,10 +20,10 @@ exit = { path = "exit" }
 fjall = "2.6.3"
 indexer = { path = "indexer", package = "bindex" }
 iterator = { path = "iterator", package = "biter" }
-jiff = "0.2.0"
+jiff = "0.2.1"
 logger = { path = "logger" }
 rayon = "1.10.0"
-pricer = { path = "pricer" }
+pricer = { path = "pricer", package = "brice" }
 rlimit = { version = "0.10.2" }
 serde = { version = "1.0.217", features = ["derive"] }
 serde_json = { version = "1.0.138", features = ["float_roundtrip"] }
diff --git a/indexer/Cargo.toml b/indexer/Cargo.toml
index 6b68f9873..ea8f92c2a 100644
--- a/indexer/Cargo.toml
+++ b/indexer/Cargo.toml
@@ -1,5 +1,6 @@
 [package]
 name = "bindex"
+description = "A bitcoin-core indexer"
 version = "0.1.0"
 edition = "2021"
 
diff --git a/indexer/README.md b/indexer/README.md
new file mode 100644
index 000000000..4d5c31bf9
--- /dev/null
+++ b/indexer/README.md
@@ -0,0 +1,19 @@
+# Indexer
+
+A [Bitcoin Core](https://bitcoincore.org/en/about/) node indexer which iterates over the chain (via `../iterator`) and creates a database of the vecs (`../storable_vec`) and key/value stores ([`fjall`](https://crates.io/crates/fjall)) that can used in your Rust code.
+
+The crate only stores the bare minimum to be self sufficient and not have to use an RPC client (except for scripts which are not stored). If you need more data, checkout `../computer` which uses the outputs from the indexer to compute a whole range of datasets.
+
+The neat thing about using simple vecs to store data is that you can parse the outputed files with another programming language such as Python very simply, you'll find an example below.
+
+## Usage
+
+Rust: `src/main.rs`
+
+Python: `../python/parse.py`
+
+## Outputs
+
+Vecs: `src/storage/storable_vecs/mod.rs`
+
+Stores: `src/storage/fjalls/mod.rs`
diff --git a/indexer/src/lib.rs b/indexer/src/lib.rs
index 98fa77fe0..2ecd7dd9d 100644
--- a/indexer/src/lib.rs
+++ b/indexer/src/lib.rs
@@ -22,7 +22,6 @@ pub use storage::{AnyStorableVec, StorableVec, Store, StoreMeta};
 use storage::{Fjalls, StorableVecs};
 pub use structs::*;
 
-const UNSAFE_BLOCKS: u32 = 1000;
 const SNAPSHOT_BLOCK_RANGE: usize = 1000;
 
 pub struct Indexer<const MODE: u8> {
@@ -43,68 +42,42 @@ impl Indexer<CACHED_GETS> {
     pub fn index(&mut self, bitcoin_dir: &Path, rpc: rpc::Client, exit: &Exit) -> color_eyre::Result<()> {
         let check_collisions = true;
 
-        let vecs = &mut self.vecs;
-        let trees = &mut self.trees;
+        let starting_indexes = Indexes::try_from((&mut self.vecs, &self.trees, &rpc)).unwrap_or_else(|_| {
+            let indexes = Indexes::default();
+            indexes.push_if_needed(&mut self.vecs).unwrap();
+            indexes
+        });
 
-        let mut height = vecs
-            .min_height()
-            .unwrap_or_default()
-            .min(trees.min_height())
-            .and_then(|h| h.checked_sub(UNSAFE_BLOCKS))
-            .map(Height::from)
-            .unwrap_or_default();
-
-        let mut txindex_global = vecs.height_to_first_txindex.get_or_default(height)?;
-        let mut txinindex_global = vecs.height_to_first_txinindex.get_or_default(height)?;
-        let mut txoutindex_global = vecs.height_to_first_txoutindex.get_or_default(height)?;
-        let mut addressindex_global = vecs.height_to_first_addressindex.get_or_default(height)?;
-        let mut emptyindex_global = vecs.height_to_first_emptyindex.get_or_default(height)?;
-        let mut multisigindex_global = vecs.height_to_first_multisigindex.get_or_default(height)?;
-        let mut opreturnindex_global = vecs.height_to_first_opreturnindex.get_or_default(height)?;
-        let mut pushonlyindex_global = vecs.height_to_first_pushonlyindex.get_or_default(height)?;
-        let mut unknownindex_global = vecs.height_to_first_unknownindex.get_or_default(height)?;
-        let mut p2pk33index_global = vecs.height_to_first_p2pk33index.get_or_default(height)?;
-        let mut p2pk65index_global = vecs.height_to_first_p2pk65index.get_or_default(height)?;
-        let mut p2pkhindex_global = vecs.height_to_first_p2pkhindex.get_or_default(height)?;
-        let mut p2shindex_global = vecs.height_to_first_p2shindex.get_or_default(height)?;
-        let mut p2trindex_global = vecs.height_to_first_p2trindex.get_or_default(height)?;
-        let mut p2wpkhindex_global = vecs.height_to_first_p2wpkhindex.get_or_default(height)?;
-        let mut p2wshindex_global = vecs.height_to_first_p2wshindex.get_or_default(height)?;
+        exit.block();
+        self.trees.rollback(&self.vecs, &starting_indexes)?;
+        self.vecs.rollback(&starting_indexes)?;
+        exit.unblock();
 
         let export =
             |trees: &mut Fjalls, vecs: &mut StorableVecs<CACHED_GETS>, height: Height| -> color_eyre::Result<()> {
                 info!("Exporting...");
-
                 exit.block();
-
-                thread::scope(|scope| -> color_eyre::Result<()> {
-                    let vecs_handle = scope.spawn(|| vecs.flush(height));
-                    trees.commit(height)?;
-                    vecs_handle.join().unwrap()?;
-                    Ok(())
-                })?;
-
+                trees.commit(height)?;
+                vecs.flush(height)?;
                 exit.unblock();
-
                 Ok(())
             };
 
-        iterator::new(bitcoin_dir, Some(height.into()), Some(400_000), rpc)
+        let vecs = &mut self.vecs;
+        let trees = &mut self.trees;
+
+        let mut idxs = starting_indexes;
+
+        iterator::new(bitcoin_dir, Some(idxs.height.into()), None, rpc)
             .iter()
             .try_for_each(|(_height, block, blockhash)| -> color_eyre::Result<()> {
                 info!("Indexing block {_height}...");
 
+                let height = Height::from(_height);
+                idxs.height = height;
+
                 let blockhash = BlockHash::from(blockhash);
-                height = Height::from(_height);
-
-                if let Some(saved_blockhash) = vecs.height_to_blockhash.get(height)? {
-                    if &blockhash != saved_blockhash.as_ref() {
-                        todo!("Rollback not implemented");
-                        // trees.rollback_from(&mut rtx, height, &exit)?;
-                    }
-                }
-
-                let blockhash_prefix = BlockHashPrefix::try_from(&blockhash)?;
+                let blockhash_prefix = BlockHashPrefix::from(&blockhash);
 
                 if trees
                     .blockhash_prefix_to_height
@@ -124,30 +97,6 @@ impl Indexer<CACHED_GETS> {
                 vecs.height_to_timestamp.push_if_needed(height, Timestamp::from(block.header.time))?;
                 vecs.height_to_size.push_if_needed(height, block.total_size())?;
                 vecs.height_to_weight.push_if_needed(height, block.weight().into())?;
-                vecs.height_to_first_txindex.push_if_needed(height, txindex_global)?;
-                vecs.height_to_first_txinindex
-                    .push_if_needed(height, txinindex_global)?;
-                vecs.height_to_first_txoutindex
-                    .push_if_needed(height, txoutindex_global)?;
-                vecs.height_to_first_addressindex
-                    .push_if_needed(height, addressindex_global)?;
-                vecs.height_to_first_emptyindex
-                    .push_if_needed(height, emptyindex_global)?;
-                vecs.height_to_first_multisigindex
-                    .push_if_needed(height, multisigindex_global)?;
-                vecs.height_to_first_opreturnindex
-                    .push_if_needed(height, opreturnindex_global)?;
-                vecs.height_to_first_pushonlyindex
-                    .push_if_needed(height, pushonlyindex_global)?;
-                vecs.height_to_first_unknownindex
-                    .push_if_needed(height, unknownindex_global)?;
-                vecs.height_to_first_p2pk33index.push_if_needed(height, p2pk33index_global)?;
-                vecs.height_to_first_p2pk65index.push_if_needed(height, p2pk65index_global)?;
-                vecs.height_to_first_p2pkhindex.push_if_needed(height, p2pkhindex_global)?;
-                vecs.height_to_first_p2shindex.push_if_needed(height, p2shindex_global)?;
-                vecs.height_to_first_p2trindex.push_if_needed(height, p2trindex_global)?;
-                vecs.height_to_first_p2wpkhindex.push_if_needed(height, p2wpkhindex_global)?;
-                vecs.height_to_first_p2wshindex.push_if_needed(height, p2wshindex_global)?;
 
                 let inputs = block
                     .txdata
@@ -191,7 +140,7 @@ impl Indexer<CACHED_GETS> {
                                 .map(|(index, tx)| -> color_eyre::Result<_> {
                                     let txid = Txid::from(tx.compute_txid());
 
-                                    let txid_prefix = TxidPrefix::try_from(&txid)?;
+                                    let txid_prefix = TxidPrefix::from(&txid);
 
                                     let prev_txindex_opt =
                                         if check_collisions && trees.txid_prefix_to_txindex.needs(height) {
@@ -224,8 +173,8 @@ impl Indexer<CACHED_GETS> {
                             .into_par_iter()
                             .enumerate()
                             .map(|(block_txinindex, (block_txindex, vin, txin, tx))| -> color_eyre::Result<(Txinindex, InputSource)> {
-                                let txindex = txindex_global + block_txindex;
-                                let txinindex = txinindex_global + Txinindex::from(block_txinindex);
+                                let txindex = idxs.txindex + block_txindex;
+                                let txinindex = idxs.txinindex + Txinindex::from(block_txinindex);
 
                                 // dbg!((txindex, txinindex, vin));
 
@@ -238,15 +187,15 @@ impl Indexer<CACHED_GETS> {
 
                                 let prev_txindex = if let Some(txindex) = trees
                                     .txid_prefix_to_txindex
-                                    .get(&TxidPrefix::try_from(&txid)?)?
+                                    .get(&TxidPrefix::from(&txid))?
                                     .map(|v| *v)
                                     .and_then(|txindex| {
                                         // Checking if not finding txindex from the future
-                                        (txindex < txindex_global).then_some(txindex)
+                                        (txindex < idxs.txindex).then_some(txindex)
                                     }) {
                                     txindex
                                 } else {
-                                    // dbg!(txindex_global + block_txindex, txindex, txin, vin);
+                                    // dbg!(indexes.txindex + block_txindex, txindex, txin, vin);
                                     return Ok((txinindex, InputSource::SameBlock((tx, txindex, txin, vin))));
                                 };
 
@@ -301,8 +250,8 @@ impl Indexer<CACHED_GETS> {
                                         &Transaction,
                                     ),
                                 )> {
-                                    let txindex = txindex_global + block_txindex;
-                                    let txoutindex = txoutindex_global + Txoutindex::from(block_txoutindex);
+                                    let txindex = idxs.txindex + block_txindex;
+                                    let txoutindex = idxs.txoutindex + Txoutindex::from(block_txoutindex);
 
                                     let script = &txout.script_pubkey;
 
@@ -321,7 +270,7 @@ impl Indexer<CACHED_GETS> {
                                             .map(|v| *v)
                                             // Checking if not in the future
                                             .and_then(|addressindex_local| {
-                                                (addressindex_local < addressindex_global).then_some(addressindex_local)
+                                                (addressindex_local < idxs.addressindex).then_some(addressindex_local)
                                             })
                                     });
 
@@ -359,7 +308,7 @@ impl Indexer<CACHED_GETS> {
                                                 prev_addresstype,
                                                 prev_addressbytes,
                                                 addressbytes,
-                                                addressindex_global,
+                                                idxs.addressindex,
                                                 addressindex,
                                                 addresstypeindex,
                                                 txout,
@@ -448,7 +397,7 @@ impl Indexer<CACHED_GETS> {
 
                         vecs.txoutindex_to_value.push_if_needed(txoutindex, sats)?;
 
-                        let mut addressindex = addressindex_global;
+                        let mut addressindex = idxs.addressindex;
 
                         let mut addresshash = None;
 
@@ -464,21 +413,21 @@ impl Indexer<CACHED_GETS> {
                         }) {
                             addressindex = addressindex_local;
                         } else {
-                            addressindex_global.increment();
+                            idxs.addressindex.increment();
 
                             let addresstypeindex = match addresstype {
-                                Addresstype::Empty => emptyindex_global.copy_then_increment(),
-                                Addresstype::Multisig => multisigindex_global.copy_then_increment(),
-                                Addresstype::OpReturn => opreturnindex_global.copy_then_increment(),
-                                Addresstype::PushOnly => pushonlyindex_global.copy_then_increment(),
-                                Addresstype::Unknown => unknownindex_global.copy_then_increment(),
-                                Addresstype::P2PK65 => p2pk65index_global.copy_then_increment(),
-                                Addresstype::P2PK33 => p2pk33index_global.copy_then_increment(),
-                                Addresstype::P2PKH => p2pkhindex_global.copy_then_increment(),
-                                Addresstype::P2SH => p2shindex_global.copy_then_increment(),
-                                Addresstype::P2WPKH => p2wpkhindex_global.copy_then_increment(),
-                                Addresstype::P2WSH => p2wshindex_global.copy_then_increment(),
-                                Addresstype::P2TR => p2trindex_global.copy_then_increment(),
+                                Addresstype::Empty => idxs.emptyindex.copy_then_increment(),
+                                Addresstype::Multisig => idxs.multisigindex.copy_then_increment(),
+                                Addresstype::OpReturn => idxs.opreturnindex.copy_then_increment(),
+                                Addresstype::PushOnly => idxs.pushonlyindex.copy_then_increment(),
+                                Addresstype::Unknown => idxs.unknownindex.copy_then_increment(),
+                                Addresstype::P2PK65 => idxs.p2pk65index.copy_then_increment(),
+                                Addresstype::P2PK33 => idxs.p2pk33index.copy_then_increment(),
+                                Addresstype::P2PKH => idxs.p2pkhindex.copy_then_increment(),
+                                Addresstype::P2SH => idxs.p2shindex.copy_then_increment(),
+                                Addresstype::P2WPKH => idxs.p2wpkhindex.copy_then_increment(),
+                                Addresstype::P2WSH => idxs.p2wshindex.copy_then_increment(),
+                                Addresstype::P2TR => idxs.p2trindex.copy_then_increment(),
                             };
 
                             vecs.addressindex_to_addresstype
@@ -537,13 +486,13 @@ impl Indexer<CACHED_GETS> {
                                     let vout = Vout::from(outpoint.vout);
 
                                     let block_txindex = txid_prefix_to_txid_and_block_txindex_and_prev_txindex
-                                        .get(&TxidPrefix::try_from(&txid)?)
+                                        .get(&TxidPrefix::from(&txid))
                                         .context("txid should be in same block").inspect_err(|_| {
                                             dbg!(&txid_prefix_to_txid_and_block_txindex_and_prev_txindex);
                                             // panic!();
                                         })?
                                         .2;
-                                    let prev_txindex = txindex_global + block_txindex;
+                                    let prev_txindex = idxs.txindex + block_txindex;
 
                                     let prev_txoutindex = new_txindexvout_to_txoutindex
                                         .remove(&(prev_txindex, vout))
@@ -577,7 +526,7 @@ impl Indexer<CACHED_GETS> {
                     .into_iter()
                     .try_for_each(
                         |(txid_prefix, (tx, txid, index, prev_txindex_opt))| -> color_eyre::Result<()> {
-                            let txindex = txindex_global + index;
+                            let txindex = idxs.txindex + index;
 
                             txindex_to_tx_and_txid.insert(txindex, (tx, txid));
 
@@ -640,12 +589,19 @@ impl Indexer<CACHED_GETS> {
                         vecs.txindex_to_txid.push_if_needed(txindex, txid)?;
                         vecs.txindex_to_height.push_if_needed(txindex, height)?;
                         vecs.txindex_to_locktime.push_if_needed(txindex, tx.lock_time.into())?;
+                        // tx.base_size()
+                        // tx.total_size()
+                        // tx.is_explicitly_rbf()
+                        // tx.weight()
+                        // tx.vsize() in computer as it can be computed from the weight
                         Ok(())
                     })?;
 
-                txindex_global += Txindex::from(tx_len);
-                txinindex_global += Txinindex::from(inputs_len);
-                txoutindex_global += Txoutindex::from(outputs_len);
+                idxs.txindex += Txindex::from(tx_len);
+                idxs.txinindex += Txinindex::from(inputs_len);
+                idxs.txoutindex += Txoutindex::from(outputs_len);
+
+                idxs.push_future_if_needed(vecs)?;
 
                 let should_snapshot = _height != 0 && _height % SNAPSHOT_BLOCK_RANGE == 0 && !exit.blocked();
                 if should_snapshot {
@@ -655,7 +611,7 @@ impl Indexer<CACHED_GETS> {
                 Ok(())
             })?;
 
-        export(trees, vecs, height)?;
+        export(trees, vecs, idxs.height)?;
 
         sleep(Duration::from_millis(100));
 
diff --git a/indexer/src/storage/fjalls/base.rs b/indexer/src/storage/fjalls/base.rs
index 6d6030f2e..7f75d1af8 100644
--- a/indexer/src/storage/fjalls/base.rs
+++ b/indexer/src/storage/fjalls/base.rs
@@ -1,4 +1,8 @@
-use std::{collections::BTreeMap, error, mem, path::Path};
+use std::{
+    collections::{BTreeMap, BTreeSet},
+    error, mem,
+    path::Path,
+};
 
 use fjall::{
     PartitionCreateOptions, PersistMode, ReadTransaction, Result, Slice, TransactionalKeyspace,
@@ -17,8 +21,11 @@ pub struct Store<Key, Value> {
     part: TransactionalPartitionHandle,
     rtx: ReadTransaction,
     puts: BTreeMap<Key, Value>,
+    dels: BTreeSet<Key>,
 }
 
+const CHECK_COLLISISONS: bool = true;
+
 impl<K, V> Store<K, V>
 where
     K: Into<Slice> + Ord + Immutable + IntoBytes,
@@ -48,6 +55,7 @@ where
             part,
             rtx,
             puts: BTreeMap::new(),
+            dels: BTreeSet::new(),
         })
     }
 
@@ -63,21 +71,44 @@ where
 
     pub fn insert_if_needed(&mut self, key: K, value: V, height: Height) {
         if self.needs(height) {
+            if !self.dels.is_empty() {
+                unreachable!("Shouldn't reach this");
+                // self.dels.remove(&key);
+            }
             self.puts.insert(key, value);
         }
     }
 
+    pub fn remove(&mut self, key: K) {
+        if !self.puts.is_empty() {
+            unreachable!("Shouldn't reach this");
+            // self.puts.remove(&key);
+        }
+        self.dels.insert(key);
+    }
+
     pub fn commit(&mut self, height: Height) -> Result<()> {
-        if self.has(height) && self.puts.is_empty() {
+        if self.has(height) && self.puts.is_empty() && self.dels.is_empty() {
             return Ok(());
         }
 
         self.meta.export(self.len(), height)?;
 
         let mut wtx = self.keyspace.write_tx();
-        mem::take(&mut self.puts)
+
+        mem::take(&mut self.dels)
             .into_iter()
-            .for_each(|(key, value)| wtx.insert(&self.part, key, value));
+            .for_each(|key| wtx.remove(&self.part, key));
+
+        mem::take(&mut self.puts).into_iter().for_each(|(key, value)| {
+            if CHECK_COLLISISONS {
+                if let Ok(Some(value)) = wtx.get(&self.part, key.as_bytes()) {
+                    dbg!(value);
+                    unreachable!();
+                }
+            }
+            wtx.insert(&self.part, key, value)
+        });
 
         wtx.commit()?;
 
@@ -88,12 +119,12 @@ where
         Ok(())
     }
 
-    pub fn height(&self) -> Option<&Height> {
+    pub fn height(&self) -> Option<Height> {
         self.meta.height()
     }
 
     pub fn len(&self) -> usize {
-        self.meta.len() + self.puts.len()
+        self.meta.len() + self.puts.len() - self.dels.len()
     }
     pub fn is_empty(&self) -> bool {
         self.len() == 0
diff --git a/indexer/src/storage/fjalls/meta.rs b/indexer/src/storage/fjalls/meta.rs
index 35f7bf24d..b9a79c38f 100644
--- a/indexer/src/storage/fjalls/meta.rs
+++ b/indexer/src/storage/fjalls/meta.rs
@@ -67,8 +67,8 @@ impl StoreMeta {
         path.join("version")
     }
 
-    pub fn height(&self) -> Option<&Height> {
-        self.height.as_ref()
+    pub fn height(&self) -> Option<Height> {
+        self.height
     }
     pub fn needs(&self, height: Height) -> bool {
         self.height.is_none_or(|self_height| height > self_height)
diff --git a/indexer/src/storage/fjalls/mod.rs b/indexer/src/storage/fjalls/mod.rs
index 4c6724929..7b2a0c029 100644
--- a/indexer/src/storage/fjalls/mod.rs
+++ b/indexer/src/storage/fjalls/mod.rs
@@ -1,16 +1,19 @@
 use std::{path::Path, thread};
 
-use storable_vec::Version;
+use storable_vec::{Value, Version, CACHED_GETS};
 
-use crate::{AddressHash, Addressindex, BlockHashPrefix, Height, TxidPrefix, Txindex};
+use crate::{
+    AddressHash, Addressbytes, Addressindex, Addresstype, BlockHashPrefix, Height, Indexes, TxidPrefix, Txindex,
+};
 
 mod base;
 mod meta;
-// mod version;
 
 pub use base::*;
 pub use meta::*;
 
+use super::StorableVecs;
+
 pub struct Fjalls {
     pub addresshash_to_addressindex: Store<AddressHash, Addressindex>,
     pub blockhash_prefix_to_height: Store<BlockHashPrefix, Height>,
@@ -30,135 +33,135 @@ impl Fjalls {
         })
     }
 
-    // pub fn rollback_from(
-    //     &mut self,
-    //     _wtx: &mut WriteTransaction,
-    //     _height: Height,
-    //     _exit: &Exit,
-    // ) -> color_eyre::Result<()> {
-    //     panic!();
-    // let mut txindex = None;
+    pub fn rollback(&mut self, vecs: &StorableVecs<CACHED_GETS>, starting_indexes: &Indexes) -> color_eyre::Result<()> {
+        vecs.height_to_blockhash
+            .iter_from(starting_indexes.height, |(_, blockhash)| {
+                let blockhash = blockhash.as_ref();
+                let blockhash_prefix = BlockHashPrefix::from(blockhash);
+                self.blockhash_prefix_to_height.remove(blockhash_prefix);
+                Ok(())
+            })?;
 
-    // wtx.range(self.height_to_blockhash.data(), Slice::from(height)..)
-    //     .try_for_each(|slice| -> color_eyre::Result<()> {
-    //         let (height_slice, slice_blockhash) = slice?;
-    //         let blockhash = BlockHash::from_slice(&slice_blockhash)?;
+        vecs.txindex_to_txid.iter_from(starting_indexes.txindex, |(_, txid)| {
+            let txid = txid.as_ref();
+            let txid_prefix = TxidPrefix::from(txid);
+            self.txid_prefix_to_txindex.remove(txid_prefix);
+            Ok(())
+        })?;
 
-    //         wtx.remove(self.height_to_blockhash.data(), height_slice);
+        vecs.height_to_first_p2pk65index
+            .iter_from(starting_indexes.height, |(_, index)| {
+                if let Some(typedbytes) = vecs
+                    .p2pk65index_to_p2pk65addressbytes
+                    .get(index.into_inner())?
+                    .map(Value::into_inner)
+                {
+                    let bytes = Addressbytes::from(typedbytes);
+                    let hash = AddressHash::from((&bytes, Addresstype::P2PK65));
+                    self.addresshash_to_addressindex.remove(hash);
+                }
+                Ok(())
+            })?;
 
-    //         wtx.remove(self.blockhash_prefix_to_height.data(), blockhash.prefix());
+        vecs.height_to_first_p2pk33index
+            .iter_from(starting_indexes.height, |(_, index)| {
+                if let Some(typedbytes) = vecs
+                    .p2pk33index_to_p2pk33addressbytes
+                    .get(index.into_inner())?
+                    .map(Value::into_inner)
+                {
+                    let bytes = Addressbytes::from(typedbytes);
+                    let hash = AddressHash::from((&bytes, Addresstype::P2PK33));
+                    self.addresshash_to_addressindex.remove(hash);
+                }
+                Ok(())
+            })?;
 
-    //         if txindex.is_none() {
-    //             txindex.replace(
-    //                 wtx.get(self.height_to_first_txindex.data(), height_slice)?
-    //                     .context("for height to have first txindex")?,
-    //             );
-    //         }
-    //         wtx.remove(self.height_to_first_txindex.data(), height_slice);
-    //         wtx.remove(self.height_to_last_txindex.data(), height_slice);
+        vecs.height_to_first_p2pkhindex
+            .iter_from(starting_indexes.height, |(_, index)| {
+                if let Some(typedbytes) = vecs
+                    .p2pkhindex_to_p2pkhaddressbytes
+                    .get(index.into_inner())?
+                    .map(Value::into_inner)
+                {
+                    let bytes = Addressbytes::from(typedbytes);
+                    let hash = AddressHash::from((&bytes, Addresstype::P2PKH));
+                    self.addresshash_to_addressindex.remove(hash);
+                }
+                Ok(())
+            })?;
 
-    //         Ok(())
-    //     })?;
+        vecs.height_to_first_p2shindex
+            .iter_from(starting_indexes.height, |(_, index)| {
+                if let Some(typedbytes) = vecs
+                    .p2shindex_to_p2shaddressbytes
+                    .get(index.into_inner())?
+                    .map(Value::into_inner)
+                {
+                    let bytes = Addressbytes::from(typedbytes);
+                    let hash = AddressHash::from((&bytes, Addresstype::P2SH));
+                    self.addresshash_to_addressindex.remove(hash);
+                }
+                Ok(())
+            })?;
 
-    // let txindex = txindex.context("txindex to not be none by now")?;
+        vecs.height_to_first_p2trindex
+            .iter_from(starting_indexes.height, |(_, index)| {
+                if let Some(typedbytes) = vecs
+                    .p2trindex_to_p2traddressbytes
+                    .get(index.into_inner())?
+                    .map(Value::into_inner)
+                {
+                    let bytes = Addressbytes::from(typedbytes);
+                    let hash = AddressHash::from((&bytes, Addresstype::P2TR));
+                    self.addresshash_to_addressindex.remove(hash);
+                }
+                Ok(())
+            })?;
 
-    // wtx.range(self.txindex_to_txid.data(), Slice::from(txindex)..)
-    //     .try_for_each(|slice| -> color_eyre::Result<()> {
-    //         let (slice_txindex, slice_txid) = slice?;
-    //         let txindex = Txindex::from(slice_txindex);
-    //         let txid = Txid::from_slice(&slice_txid)?;
+        vecs.height_to_first_p2wpkhindex
+            .iter_from(starting_indexes.height, |(_, index)| {
+                if let Some(typedbytes) = vecs
+                    .p2wpkhindex_to_p2wpkhaddressbytes
+                    .get(index.into_inner())?
+                    .map(Value::into_inner)
+                {
+                    let bytes = Addressbytes::from(typedbytes);
+                    let hash = AddressHash::from((&bytes, Addresstype::P2WPKH));
+                    self.addresshash_to_addressindex.remove(hash);
+                }
+                Ok(())
+            })?;
 
-    //         wtx.remove(self.txindex_to_txid.data(), Slice::from(txindex));
-    //         wtx.remove(self.txindex_to_height.data(), Slice::from(txindex));
-    //         wtx.remove(self.txid_prefix_to_txindex.data(), txid.prefix());
+        vecs.height_to_first_p2wshindex
+            .iter_from(starting_indexes.height, |(_, index)| {
+                if let Some(typedbytes) = vecs
+                    .p2wshindex_to_p2wshaddressbytes
+                    .get(index.into_inner())?
+                    .map(Value::into_inner)
+                {
+                    let bytes = Addressbytes::from(typedbytes);
+                    let hash = AddressHash::from((&bytes, Addresstype::P2WSH));
+                    self.addresshash_to_addressindex.remove(hash);
+                }
+                Ok(())
+            })?;
 
-    //         Ok(())
-    //     })?;
+        self.commit(starting_indexes.height.decremented())?;
 
-    // let txoutindex = Txoutindex::from(txindex);
+        Ok(())
+    }
 
-    // let mut addressindexes = BTreeSet::new();
-
-    // wtx.range(self.txoutindex_to_amount.data(), Slice::from(txoutindex)..)
-    //     .try_for_each(|slice| -> color_eyre::Result<()> {
-    //         let (txoutindex_slice, _) = slice?;
-
-    //         wtx.remove(self.txoutindex_to_amount.data(), txoutindex_slice);
-
-    //         if let Some(addressindex_slice) =
-    //             wtx.get(self.txoutindex_to_addressindex.data(), txoutindex_slice)?
-    //         {
-    //             wtx.remove(self.txoutindex_to_addressindex.data(), txoutindex_slice);
-
-    //             let addressindex = Addressindex::from(addressindex_slice);
-    //             addressindexes.insert(addressindex);
-
-    //             let txoutindex = Txoutindex::from(txoutindex_slice);
-    //             let addresstxoutindex = Addresstxoutindex::from((addressindex, txoutindex));
-
-    //             wtx.remove(
-    //                 self.addressindex_to_txoutindexes.data(),
-    //                 Slice::from(addresstxoutindex),
-    //             );
-    //         }
-
-    //         Ok(())
-    //     })?;
-
-    // addressindexes
-    // .into_iter()
-    // .filter(|addressindex| {
-    //     let is_empty = wtx
-    //         .prefix(
-    //             self.addressindex_to_txoutindexes.data(),
-    //             Slice::from(*addressindex),
-    //         )
-    //         .next()
-    //         .is_none();
-    //     is_empty
-    // })
-    // .try_for_each(|addressindex| -> color_eyre::Result<()> {
-    //     let addressindex_slice = Slice::from(addressindex);
-
-    //     let addressbytes = Addressbytes::from(
-    //         wtx.get(
-    //             self.addressindex_to_addressbytes.data(),
-    //             &addressindex_slice,
-    //         )?
-    //         .context("addressindex_to_address to have value")?,
-    //     );
-    //     wtx.remove(
-    //         self.addressbytes_prefix_to_addressindex.data(),
-    //         addressbytes.prefix(),
-    //     );
-    //     wtx.remove(
-    //         self.addressindex_to_addressbytes.data(),
-    //         &addressindex_slice,
-    //     );
-    //     wtx.remove(self.addressindex_to_addresstype.data(), &addressindex_slice);
-
-    //     Ok(())
-    // })?;
-    //
-
-    // todo!("clear addresstxoutindexes_out")
-    // todo!("clear addresstxoutindexes_in")
-    // todo!("clear zero_txoutindexes")
-    // todo!("clear txindexvout_to_txoutindex")
-
-    // Ok(())
-    // }
-
-    pub fn min_height(&self) -> Option<Height> {
+    pub fn starting_height(&self) -> Height {
         [
             self.addresshash_to_addressindex.height(),
             self.blockhash_prefix_to_height.height(),
             self.txid_prefix_to_txindex.height(),
         ]
         .into_iter()
+        .map(|height| height.map(Height::incremented).unwrap_or_default())
         .min()
-        .flatten()
-        .cloned()
+        .unwrap()
     }
 
     pub fn commit(&mut self, height: Height) -> fjall::Result<()> {
@@ -176,22 +179,4 @@ impl Fjalls {
             Ok(())
         })
     }
-
-    // pub fn udpate_meta(&self, wtx: &mut WriteTransaction, height: Height) {
-    //     self.addressbytes_prefix_to_addressindex.update_meta(wtx, height);
-    //     self.blockhash_prefix_to_height.update_meta(wtx, height);
-    //     self.txid_prefix_to_txindex.update_meta(wtx, height);
-    // }
-
-    // pub fn export(self, height: Height) -> Result<(), snkrj::Error> {
-    //     thread::scope(|scope| {
-    //         vec![
-    //             scope.spawn(|| self.addressbytes_prefix_to_addressindex.export(height)),
-    //             scope.spawn(|| self.blockhash_prefix_to_height.export(height)),
-    //             scope.spawn(|| self.txid_prefix_to_txindex.export(height)),
-    //         ]
-    //         .into_iter()
-    //         .try_for_each(|handle| -> Result<(), snkrj::Error> { handle.join().unwrap() })
-    //     })
-    // }
 }
diff --git a/indexer/src/storage/storable_vecs/base.rs b/indexer/src/storage/storable_vecs/base.rs
index 0f4f95ca9..adb76511f 100644
--- a/indexer/src/storage/storable_vecs/base.rs
+++ b/indexer/src/storage/storable_vecs/base.rs
@@ -28,14 +28,14 @@ where
     }
 
     pub fn flush(&mut self, height: Height) -> io::Result<()> {
-        if self.needs(height) {
-            height.write(&self.path_height())?;
-        }
+        height.write(&self.path_height())?;
         self.vec.flush()
     }
 
     pub fn truncate_if_needed(&mut self, index: I, height: Height) -> storable_vec::Result<Option<T>> {
-        height.write(&self.path_height())?;
+        if self.height.is_none_or(|self_height| self_height != height) {
+            height.write(&self.path_height())?;
+        }
         self.vec.truncate_if_needed(index)
     }
 
diff --git a/indexer/src/storage/storable_vecs/mod.rs b/indexer/src/storage/storable_vecs/mod.rs
index 7b063f867..170456860 100644
--- a/indexer/src/storage/storable_vecs/mod.rs
+++ b/indexer/src/storage/storable_vecs/mod.rs
@@ -1,14 +1,17 @@
-use std::{collections::BTreeMap, fs, io, path::Path};
+use std::{fs, io, path::Path};
 
-use exit::Exit;
 use rayon::prelude::*;
 use storable_vec::{AnyJsonStorableVec, Version, CACHED_GETS};
 
-use crate::structs::{
-    Addressbytes, Addressindex, Addresstype, Addresstypeindex, BlockHash, Emptyindex, Height, LockTime, Multisigindex,
-    Opreturnindex, P2PK33AddressBytes, P2PK33index, P2PK65AddressBytes, P2PK65index, P2PKHAddressBytes, P2PKHindex,
-    P2SHAddressBytes, P2SHindex, P2TRAddressBytes, P2TRindex, P2WPKHAddressBytes, P2WPKHindex, P2WSHAddressBytes,
-    P2WSHindex, Pushonlyindex, Sats, Timestamp, TxVersion, Txid, Txindex, Txinindex, Txoutindex, Unknownindex, Weight,
+use crate::{
+    structs::{
+        Addressbytes, Addressindex, Addresstype, Addresstypeindex, BlockHash, Emptyindex, Height, LockTime,
+        Multisigindex, Opreturnindex, P2PK33AddressBytes, P2PK33index, P2PK65AddressBytes, P2PK65index,
+        P2PKHAddressBytes, P2PKHindex, P2SHAddressBytes, P2SHindex, P2TRAddressBytes, P2TRindex, P2WPKHAddressBytes,
+        P2WPKHindex, P2WSHAddressBytes, P2WSHindex, Pushonlyindex, Sats, Timestamp, TxVersion, Txid, Txindex,
+        Txinindex, Txoutindex, Unknownindex, Weight,
+    },
+    Indexes,
 };
 
 mod base;
@@ -58,8 +61,6 @@ pub struct StorableVecs<const MODE: u8> {
     pub txoutindex_to_value: StorableVec<Txoutindex, Sats, MODE>,
 }
 
-// const UNSAFE_BLOCKS: usize = 1000;
-
 impl<const MODE: u8> StorableVecs<MODE> {
     pub fn import(path: &Path) -> color_eyre::Result<Self> {
         fs::create_dir_all(path)?;
@@ -180,113 +181,104 @@ impl<const MODE: u8> StorableVecs<MODE> {
         })
     }
 
-    #[allow(unused)]
-    pub fn rollback_from(&mut self, height: Height, exit: &Exit) -> storable_vec::Result<()> {
-        let prev_height = height.decremented();
+    pub fn rollback(&mut self, starting_indexes: &Indexes) -> storable_vec::Result<()> {
+        let saved_height = starting_indexes.height.decremented();
 
-        let mut truncated_indexes: BTreeMap<String, Option<usize>> = BTreeMap::new();
+        // We don't want to override the starting indexes so we cut from n + 1
+        let height = starting_indexes.height.incremented();
 
-        let addressindex = self
-            .height_to_first_addressindex
-            .truncate_if_needed(height, prev_height)?;
-        let txindex = self.height_to_first_txindex.truncate_if_needed(height, prev_height)?;
-        let txinindex = self.height_to_first_txinindex.truncate_if_needed(height, prev_height)?;
-        let txoutindex = self
-            .height_to_first_txoutindex
-            .truncate_if_needed(height, prev_height)?;
-        let p2pk33index = self
-            .height_to_first_p2pk33index
-            .truncate_if_needed(height, prev_height)?;
-        let p2pk65index = self
-            .height_to_first_p2pk65index
-            .truncate_if_needed(height, prev_height)?;
-        let p2pkhindex = self
-            .height_to_first_p2pkhindex
-            .truncate_if_needed(height, prev_height)?;
-        let p2shindex = self.height_to_first_p2shindex.truncate_if_needed(height, prev_height)?;
-        let p2trindex = self.height_to_first_p2trindex.truncate_if_needed(height, prev_height)?;
-        let p2wpkhindex = self
-            .height_to_first_p2wpkhindex
-            .truncate_if_needed(height, prev_height)?;
-        let p2wshindex = self
-            .height_to_first_p2wshindex
-            .truncate_if_needed(height, prev_height)?;
-
-        self.height_to_blockhash.truncate_if_needed(height, prev_height)?;
-        self.height_to_difficulty.truncate_if_needed(height, prev_height)?;
+        self.height_to_first_addressindex
+            .truncate_if_needed(height, saved_height)?;
         self.height_to_first_emptyindex
-            .truncate_if_needed(height, prev_height)?;
+            .truncate_if_needed(height, saved_height)?;
         self.height_to_first_multisigindex
-            .truncate_if_needed(height, prev_height)?;
+            .truncate_if_needed(height, saved_height)?;
         self.height_to_first_opreturnindex
-            .truncate_if_needed(height, prev_height)?;
+            .truncate_if_needed(height, saved_height)?;
+        self.height_to_first_p2pk33index
+            .truncate_if_needed(height, saved_height)?;
+        self.height_to_first_p2pk65index
+            .truncate_if_needed(height, saved_height)?;
+        self.height_to_first_p2pkhindex
+            .truncate_if_needed(height, saved_height)?;
+        self.height_to_first_p2shindex
+            .truncate_if_needed(height, saved_height)?;
+        self.height_to_first_p2trindex
+            .truncate_if_needed(height, saved_height)?;
+        self.height_to_first_p2wpkhindex
+            .truncate_if_needed(height, saved_height)?;
+        self.height_to_first_p2wshindex
+            .truncate_if_needed(height, saved_height)?;
         self.height_to_first_pushonlyindex
-            .truncate_if_needed(height, prev_height)?;
+            .truncate_if_needed(height, saved_height)?;
+        self.height_to_first_txindex.truncate_if_needed(height, saved_height)?;
+        self.height_to_first_txinindex
+            .truncate_if_needed(height, saved_height)?;
+        self.height_to_first_txoutindex
+            .truncate_if_needed(height, saved_height)?;
         self.height_to_first_unknownindex
-            .truncate_if_needed(height, prev_height)?;
-        self.height_to_size.truncate_if_needed(height, prev_height)?;
-        self.height_to_timestamp.truncate_if_needed(height, prev_height)?;
-        self.height_to_weight.truncate_if_needed(height, prev_height)?;
+            .truncate_if_needed(height, saved_height)?;
 
-        if let Some(addressindex) = addressindex {
-            self.addressindex_to_addresstype
-                .truncate_if_needed(addressindex, prev_height)?;
-            self.addressindex_to_addresstypeindex
-                .truncate_if_needed(addressindex, prev_height)?;
-            self.addressindex_to_height
-                .truncate_if_needed(addressindex, prev_height)?;
-        }
+        // Now we can cut everything that's out of date
+        let &Indexes {
+            addressindex,
+            height,
+            p2pk33index,
+            p2pk65index,
+            p2pkhindex,
+            p2shindex,
+            p2trindex,
+            p2wpkhindex,
+            p2wshindex,
+            txindex,
+            txinindex,
+            txoutindex,
+            ..
+        } = starting_indexes;
 
-        if let Some(p2pk33index) = p2pk33index {
-            self.p2pk33index_to_p2pk33addressbytes
-                .truncate_if_needed(p2pk33index, prev_height)?;
-        }
-        if let Some(p2pk65index) = p2pk65index {
-            self.p2pk65index_to_p2pk65addressbytes
-                .truncate_if_needed(p2pk65index, prev_height)?;
-        }
-        if let Some(p2pkhindex) = p2pkhindex {
-            self.p2pkhindex_to_p2pkhaddressbytes
-                .truncate_if_needed(p2pkhindex, prev_height)?;
-        }
-        if let Some(p2shindex) = p2shindex {
-            self.p2shindex_to_p2shaddressbytes
-                .truncate_if_needed(p2shindex, prev_height)?;
-        }
-        if let Some(p2trindex) = p2trindex {
-            self.p2trindex_to_p2traddressbytes
-                .truncate_if_needed(p2trindex, prev_height)?;
-        }
-        if let Some(p2wpkhindex) = p2wpkhindex {
-            self.p2wpkhindex_to_p2wpkhaddressbytes
-                .truncate_if_needed(p2wpkhindex, prev_height)?;
-        }
-        if let Some(p2wshindex) = p2wshindex {
-            self.p2wshindex_to_p2wshaddressbytes
-                .truncate_if_needed(p2wshindex, prev_height);
-        }
+        self.height_to_blockhash.truncate_if_needed(height, saved_height)?;
+        self.height_to_difficulty.truncate_if_needed(height, saved_height)?;
+        self.height_to_size.truncate_if_needed(height, saved_height)?;
+        self.height_to_timestamp.truncate_if_needed(height, saved_height)?;
+        self.height_to_weight.truncate_if_needed(height, saved_height)?;
 
-        if let Some(txindex) = txindex {
-            self.txindex_to_first_txinindex
-                .truncate_if_needed(txindex, prev_height)?;
-            self.txindex_to_first_txoutindex
-                .truncate_if_needed(txindex, prev_height)?;
-            self.txindex_to_height.truncate_if_needed(txindex, prev_height)?;
-            self.txindex_to_locktime.truncate_if_needed(txindex, prev_height)?;
-            self.txindex_to_txid.truncate_if_needed(txindex, prev_height)?;
-            self.txindex_to_txversion.truncate_if_needed(txindex, prev_height)?;
-        }
+        self.addressindex_to_addresstype
+            .truncate_if_needed(addressindex, saved_height)?;
+        self.addressindex_to_addresstypeindex
+            .truncate_if_needed(addressindex, saved_height)?;
+        self.addressindex_to_height
+            .truncate_if_needed(addressindex, saved_height)?;
 
-        if let Some(txinindex) = txinindex {
-            self.txinindex_to_txoutindex
-                .truncate_if_needed(txinindex, prev_height)?;
-        }
+        self.p2pk33index_to_p2pk33addressbytes
+            .truncate_if_needed(p2pk33index, saved_height)?;
+        self.p2pk65index_to_p2pk65addressbytes
+            .truncate_if_needed(p2pk65index, saved_height)?;
+        self.p2pkhindex_to_p2pkhaddressbytes
+            .truncate_if_needed(p2pkhindex, saved_height)?;
+        self.p2shindex_to_p2shaddressbytes
+            .truncate_if_needed(p2shindex, saved_height)?;
+        self.p2trindex_to_p2traddressbytes
+            .truncate_if_needed(p2trindex, saved_height)?;
+        self.p2wpkhindex_to_p2wpkhaddressbytes
+            .truncate_if_needed(p2wpkhindex, saved_height)?;
+        self.p2wshindex_to_p2wshaddressbytes
+            .truncate_if_needed(p2wshindex, saved_height)?;
 
-        if let Some(txoutindex) = txoutindex {
-            self.txoutindex_to_addressindex
-                .truncate_if_needed(txoutindex, prev_height)?;
-            self.txoutindex_to_value.truncate_if_needed(txoutindex, prev_height)?;
-        }
+        self.txindex_to_first_txinindex
+            .truncate_if_needed(txindex, saved_height)?;
+        self.txindex_to_first_txoutindex
+            .truncate_if_needed(txindex, saved_height)?;
+        self.txindex_to_height.truncate_if_needed(txindex, saved_height)?;
+        self.txindex_to_locktime.truncate_if_needed(txindex, saved_height)?;
+        self.txindex_to_txid.truncate_if_needed(txindex, saved_height)?;
+        self.txindex_to_txversion.truncate_if_needed(txindex, saved_height)?;
+
+        self.txinindex_to_txoutindex
+            .truncate_if_needed(txinindex, saved_height)?;
+
+        self.txoutindex_to_addressindex
+            .truncate_if_needed(txoutindex, saved_height)?;
+        self.txoutindex_to_value.truncate_if_needed(txoutindex, saved_height)?;
 
         Ok(())
     }
@@ -297,12 +289,12 @@ impl<const MODE: u8> StorableVecs<MODE> {
             .try_for_each(|vec| vec.flush(height))
     }
 
-    pub fn min_height(&mut self) -> color_eyre::Result<Option<Height>> {
-        Ok(self
-            .as_mut_any_vec_slice()
+    pub fn starting_height(&mut self) -> Height {
+        self.as_mut_any_vec_slice()
             .into_iter()
-            .map(|vec| vec.height().unwrap_or_default())
-            .min())
+            .map(|vec| vec.height().map(Height::incremented).unwrap_or_default())
+            .min()
+            .unwrap()
     }
 
     pub fn as_any_json_vec_slice(&self) -> [&dyn AnyJsonStorableVec; 40] {
diff --git a/indexer/src/structs/blockhash.rs b/indexer/src/structs/blockhash.rs
index ac3eff4ae..0bb44bd82 100644
--- a/indexer/src/structs/blockhash.rs
+++ b/indexer/src/structs/blockhash.rs
@@ -1,9 +1,12 @@
 use std::mem;
 
 use derive_deref::Deref;
+use iterator::rpc::{Client, RpcApi};
 use serde::Serialize;
 use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout};
 
+use super::Height;
+
 #[derive(Debug, Deref, Clone, PartialEq, Eq, Immutable, IntoBytes, KnownLayout, FromBytes, Serialize)]
 pub struct BlockHash([u8; 32]);
 
@@ -18,3 +21,10 @@ impl From<BlockHash> for bitcoin::BlockHash {
         unsafe { mem::transmute(value) }
     }
 }
+
+impl TryFrom<(&Client, Height)> for BlockHash {
+    type Error = iterator::rpc::Error;
+    fn try_from((rpc, height): (&Client, Height)) -> Result<Self, Self::Error> {
+        Ok(Self::from(rpc.get_block_hash(u64::from(height))?))
+    }
+}
diff --git a/indexer/src/structs/compressed.rs b/indexer/src/structs/compressed.rs
index 92301d14b..fc482eba9 100644
--- a/indexer/src/structs/compressed.rs
+++ b/indexer/src/structs/compressed.rs
@@ -41,10 +41,9 @@ impl From<AddressHash> for Slice {
 
 #[derive(Debug, Deref, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, FromBytes, Immutable, IntoBytes, KnownLayout)]
 pub struct BlockHashPrefix([u8; 8]);
-impl TryFrom<&BlockHash> for BlockHashPrefix {
-    type Error = color_eyre::Report;
-    fn try_from(value: &BlockHash) -> Result<Self, Self::Error> {
-        Ok(Self(copy_first_8bytes(&value[..])))
+impl From<&BlockHash> for BlockHashPrefix {
+    fn from(value: &BlockHash) -> Self {
+        Self(copy_first_8bytes(&value[..]).unwrap())
     }
 }
 impl TryFrom<Slice> for BlockHashPrefix {
@@ -66,10 +65,9 @@ impl From<BlockHashPrefix> for Slice {
 
 #[derive(Debug, Deref, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, FromBytes, Immutable, IntoBytes, KnownLayout)]
 pub struct TxidPrefix([u8; 8]);
-impl TryFrom<&Txid> for TxidPrefix {
-    type Error = color_eyre::Report;
-    fn try_from(value: &Txid) -> Result<Self, Self::Error> {
-        Ok(Self(copy_first_8bytes(&value[..])))
+impl From<&Txid> for TxidPrefix {
+    fn from(value: &Txid) -> Self {
+        Self(copy_first_8bytes(&value[..]).unwrap())
     }
 }
 impl TryFrom<Slice> for TxidPrefix {
@@ -89,14 +87,14 @@ impl From<TxidPrefix> for Slice {
     }
 }
 
-fn copy_first_8bytes(slice: &[u8]) -> [u8; 8] {
+fn copy_first_8bytes(slice: &[u8]) -> Result<[u8; 8], ()> {
     let mut buf: [u8; 8] = [0; 8];
     let buf_len = buf.len();
     if slice.len() < buf_len {
-        panic!("bad len");
+        return Err(());
     }
     slice.iter().take(buf_len).enumerate().for_each(|(i, r)| {
         buf[i] = *r;
     });
-    buf
+    Ok(buf)
 }
diff --git a/indexer/src/structs/height.rs b/indexer/src/structs/height.rs
index daaa11c15..e19631fd3 100644
--- a/indexer/src/structs/height.rs
+++ b/indexer/src/structs/height.rs
@@ -30,13 +30,31 @@ use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout};
 pub struct Height(u32);
 
 impl Height {
+    const ZERO: Self = Height(0);
+
     pub fn write(&self, path: &Path) -> Result<(), io::Error> {
         fs::write(path, self.as_bytes())
     }
 
-    pub fn decremented(&self) -> Self {
+    pub fn increment(&mut self) {
+        self.0 += 1;
+    }
+
+    pub fn incremented(self) -> Self {
+        Self(self.0 + 1)
+    }
+
+    pub fn decrement(&mut self) {
+        self.0 -= 1;
+    }
+
+    pub fn decremented(self) -> Self {
         Self(self.0.checked_sub(1).unwrap_or_default())
     }
+
+    pub fn is_zero(self) -> bool {
+        self == Self::ZERO
+    }
 }
 
 impl PartialEq<u64> for Height {
@@ -133,6 +151,12 @@ impl From<Height> for usize {
     }
 }
 
+impl From<Height> for u64 {
+    fn from(value: Height) -> Self {
+        value.0 as u64
+    }
+}
+
 impl TryFrom<&Path> for Height {
     type Error = storable_vec::Error;
     fn try_from(value: &Path) -> Result<Self, Self::Error> {
diff --git a/indexer/src/structs/indexes.rs b/indexer/src/structs/indexes.rs
new file mode 100644
index 000000000..2392ca4b5
--- /dev/null
+++ b/indexer/src/structs/indexes.rs
@@ -0,0 +1,114 @@
+use color_eyre::eyre::ContextCompat;
+use iterator::rpc::Client;
+use iterator::NUMBER_OF_UNSAFE_BLOCKS;
+use storable_vec::CACHED_GETS;
+
+use crate::storage::{Fjalls, StorableVecs};
+
+use super::{
+    Addressindex, BlockHash, Emptyindex, Height, Multisigindex, Opreturnindex, P2PK33index, P2PK65index, P2PKHindex,
+    P2SHindex, P2TRindex, P2WPKHindex, P2WSHindex, Pushonlyindex, Txindex, Txinindex, Txoutindex, Unknownindex,
+};
+
+#[derive(Debug, Default)]
+pub struct Indexes {
+    pub addressindex: Addressindex,
+    pub emptyindex: Emptyindex,
+    pub height: Height,
+    pub multisigindex: Multisigindex,
+    pub opreturnindex: Opreturnindex,
+    pub p2pk33index: P2PK33index,
+    pub p2pk65index: P2PK65index,
+    pub p2pkhindex: P2PKHindex,
+    pub p2shindex: P2SHindex,
+    pub p2trindex: P2TRindex,
+    pub p2wpkhindex: P2WPKHindex,
+    pub p2wshindex: P2WSHindex,
+    pub pushonlyindex: Pushonlyindex,
+    pub txindex: Txindex,
+    pub txinindex: Txinindex,
+    pub txoutindex: Txoutindex,
+    pub unknownindex: Unknownindex,
+}
+
+impl Indexes {
+    pub fn push_if_needed(&self, vecs: &mut StorableVecs<CACHED_GETS>) -> storable_vec::Result<()> {
+        let height = self.height;
+        vecs.height_to_first_txindex.push_if_needed(height, self.txindex)?;
+        vecs.height_to_first_txinindex.push_if_needed(height, self.txinindex)?;
+        vecs.height_to_first_txoutindex
+            .push_if_needed(height, self.txoutindex)?;
+        vecs.height_to_first_addressindex
+            .push_if_needed(height, self.addressindex)?;
+        vecs.height_to_first_emptyindex
+            .push_if_needed(height, self.emptyindex)?;
+        vecs.height_to_first_multisigindex
+            .push_if_needed(height, self.multisigindex)?;
+        vecs.height_to_first_opreturnindex
+            .push_if_needed(height, self.opreturnindex)?;
+        vecs.height_to_first_pushonlyindex
+            .push_if_needed(height, self.pushonlyindex)?;
+        vecs.height_to_first_unknownindex
+            .push_if_needed(height, self.unknownindex)?;
+        vecs.height_to_first_p2pk33index
+            .push_if_needed(height, self.p2pk33index)?;
+        vecs.height_to_first_p2pk65index
+            .push_if_needed(height, self.p2pk65index)?;
+        vecs.height_to_first_p2pkhindex
+            .push_if_needed(height, self.p2pkhindex)?;
+        vecs.height_to_first_p2shindex.push_if_needed(height, self.p2shindex)?;
+        vecs.height_to_first_p2trindex.push_if_needed(height, self.p2trindex)?;
+        vecs.height_to_first_p2wpkhindex
+            .push_if_needed(height, self.p2wpkhindex)?;
+        vecs.height_to_first_p2wshindex
+            .push_if_needed(height, self.p2wshindex)?;
+        Ok(())
+    }
+
+    pub fn push_future_if_needed(&mut self, vecs: &mut StorableVecs<CACHED_GETS>) -> storable_vec::Result<()> {
+        self.height.increment();
+        self.push_if_needed(vecs)?;
+        self.height.decrement();
+        Ok(())
+    }
+}
+
+impl TryFrom<(&mut StorableVecs<CACHED_GETS>, &Fjalls, &Client)> for Indexes {
+    type Error = color_eyre::Report;
+    fn try_from((vecs, trees, rpc): (&mut StorableVecs<CACHED_GETS>, &Fjalls, &Client)) -> color_eyre::Result<Self> {
+        // Height at which we wanna start: min last saved + 1 or 0
+        let starting_height = vecs.starting_height().min(trees.starting_height());
+
+        // But we also need to check the chain and start earlier in case of a reorg
+        let height = (starting_height
+            .checked_sub(NUMBER_OF_UNSAFE_BLOCKS as u32)
+            .unwrap_or_default()..*starting_height) // ..= because of last saved + 1
+            .map(Height::from)
+            .find(|height| {
+                let rpc_blockhash = BlockHash::try_from((rpc, *height)).unwrap();
+                let saved_blockhash = vecs.height_to_blockhash.get(*height).unwrap().unwrap();
+                &rpc_blockhash != saved_blockhash.as_ref()
+            })
+            .unwrap_or(starting_height);
+
+        Ok(Self {
+            addressindex: *vecs.height_to_first_addressindex.get(height)?.context("")?,
+            emptyindex: *vecs.height_to_first_emptyindex.get(height)?.context("")?,
+            height,
+            multisigindex: *vecs.height_to_first_multisigindex.get(height)?.context("")?,
+            opreturnindex: *vecs.height_to_first_opreturnindex.get(height)?.context("")?,
+            p2pk33index: *vecs.height_to_first_p2pk33index.get(height)?.context("")?,
+            p2pk65index: *vecs.height_to_first_p2pk65index.get(height)?.context("")?,
+            p2pkhindex: *vecs.height_to_first_p2pkhindex.get(height)?.context("")?,
+            p2shindex: *vecs.height_to_first_p2shindex.get(height)?.context("")?,
+            p2trindex: *vecs.height_to_first_p2trindex.get(height)?.context("")?,
+            p2wpkhindex: *vecs.height_to_first_p2wpkhindex.get(height)?.context("")?,
+            p2wshindex: *vecs.height_to_first_p2wshindex.get(height)?.context("")?,
+            pushonlyindex: *vecs.height_to_first_pushonlyindex.get(height)?.context("")?,
+            txindex: *vecs.height_to_first_txindex.get(height)?.context("")?,
+            txinindex: *vecs.height_to_first_txinindex.get(height)?.context("")?,
+            txoutindex: *vecs.height_to_first_txoutindex.get(height)?.context("")?,
+            unknownindex: *vecs.height_to_first_unknownindex.get(height)?.context("")?,
+        })
+    }
+}
diff --git a/indexer/src/structs/mod.rs b/indexer/src/structs/mod.rs
index ff4050491..e31c7bffc 100644
--- a/indexer/src/structs/mod.rs
+++ b/indexer/src/structs/mod.rs
@@ -5,6 +5,7 @@ mod addresstypeindex;
 mod blockhash;
 mod compressed;
 mod height;
+mod indexes;
 mod locktime;
 mod sats;
 mod timestamp;
@@ -24,6 +25,7 @@ pub use addresstypeindex::*;
 pub use blockhash::*;
 pub use compressed::*;
 pub use height::*;
+pub use indexes::*;
 pub use locktime::*;
 pub use sats::*;
 pub use timestamp::*;
diff --git a/iterator/Cargo.toml b/iterator/Cargo.toml
index 15a8700c5..943555b16 100644
--- a/iterator/Cargo.toml
+++ b/iterator/Cargo.toml
@@ -16,4 +16,3 @@ serde = { version = "1.0.217", features = ["derive"] }
 serde_json = "1.0.138"
 derive_deref = { workspace = true }
 bitcoincore-rpc = "0.19.0"
-# tokio = { version = "1.39.2", features = ["rt-multi-thread"] }
diff --git a/iterator/src/lib.rs b/iterator/src/lib.rs
index 3cf4f4e11..f76ef2a50 100644
--- a/iterator/src/lib.rs
+++ b/iterator/src/lib.rs
@@ -193,45 +193,6 @@ pub fn new(
         drain_and_send(&mut bulk)
     });
 
-    // Tokio version: 1022s
-    // Slighlty slower than rayon version
-    // thread::spawn(move || {
-    //     let rt = tokio::runtime::Runtime::new().unwrap();
-    //     let _guard = rt.enter();
-
-    //     let mut tasks = VecDeque::with_capacity(BOUND);
-
-    //     recv_block_reader
-    //         .iter()
-    //         .try_for_each(move |(blk_metadata, block_state)| {
-    //             let raw_block = match block_state {
-    //                 BlockState::Raw(vec) => vec,
-    //                 _ => unreachable!(),
-    //             };
-
-    //             tasks.push_back(tokio::task::spawn(async move {
-    //                 let block = Block::consensus_decode(&mut Cursor::new(raw_block)).unwrap();
-
-    //                 (blk_metadata, block)
-    //             }));
-
-    //             while tasks.len() > BOUND {
-    //                 let (blk_metadata, block) = rt.block_on(tasks.pop_front().unwrap()).unwrap();
-
-    //                 if send_block
-    //                     .send(BlkMetadataAndBlock::new(blk_metadata, block))
-    //                     .is_err()
-    //                 {
-    //                     return ControlFlow::Break(());
-    //                 }
-    //             }
-
-    //             ControlFlow::Continue(())
-    //         });
-    //
-    // todo!("Send the rest")
-    // });
-
     thread::spawn(move || {
         let mut height = start_recap.map_or(0, |(_, recap)| recap.height());
 
diff --git a/iterator/src/main.rs b/iterator/src/main.rs
index 908ba6127..f0a0b4e8a 100644
--- a/iterator/src/main.rs
+++ b/iterator/src/main.rs
@@ -11,7 +11,7 @@ fn main() {
     let auth = Auth::CookieFile(cookie);
     let rpc = Client::new(url, auth).unwrap();
 
-    let start = Some(749900);
+    let start = None;
     let end = None;
 
     biter::new(data_dir, start, end, rpc)
diff --git a/pricer/Cargo.toml b/pricer/Cargo.toml
index 82473bf62..55e4c724f 100644
--- a/pricer/Cargo.toml
+++ b/pricer/Cargo.toml
@@ -1,5 +1,6 @@
 [package]
-name = "pricer"
+name = "brice"
+description = "A bitcoin price fetcher"
 version = "0.1.0"
 edition = "2021"
 
@@ -7,16 +8,9 @@ edition = "2021"
 color-eyre = { workspace = true }
 derive_deref = { workspace = true }
 indexer = { workspace = true }
-logger = { workspace = true }
-reqwest = { version = "0.12.12", features = [
-    "blocking",
-    "brotli",
-    "deflate",
-    "gzip",
-    "json",
-    "zstd",
-] }
 jiff = { workspace = true }
+logger = { workspace = true }
+minreq = { version = "2.13.2", features = ["https", "serde_json"] }
 serde = { workspace = true }
 serde_json = { workspace = true }
 storable_vec = { workspace = true }
diff --git a/pricer/src/fetchers/binance.rs b/pricer/src/fetchers/binance.rs
index 944e25688..265462ca6 100644
--- a/pricer/src/fetchers/binance.rs
+++ b/pricer/src/fetchers/binance.rs
@@ -35,7 +35,7 @@ impl Binance {
         }
     }
 
-    fn get_from_1mn(
+    pub fn get_from_1mn(
         &mut self,
         timestamp: Timestamp,
         previous_timestamp: Option<Timestamp>,
@@ -44,7 +44,7 @@ impl Binance {
             self._1mn.replace(Self::fetch_1mn()?);
         }
         Pricer::<STATELESS>::find_height_ohlc(
-            &self._1mn.as_ref().unwrap(),
+            self._1mn.as_ref().unwrap(),
             timestamp,
             previous_timestamp,
             "binance 1mn",
@@ -55,7 +55,7 @@ impl Binance {
         info!("Fetching 1mn prices from Binance...");
 
         retry(
-            |_| Self::json_to_timestamp_to_ohlc(&reqwest::blocking::get(Self::url("interval=1m&limit=1000"))?.json()?),
+            |_| Self::json_to_timestamp_to_ohlc(&minreq::get(Self::url("interval=1m&limit=1000")).send()?.json()?),
             30,
             10,
         )
@@ -74,11 +74,13 @@ impl Binance {
             .ok_or(color_eyre::eyre::Error::msg("Couldn't find date"))
     }
 
-    fn fetch_1d() -> color_eyre::Result<BTreeMap<Date, OHLC>> {
+    pub fn fetch_1d() -> color_eyre::Result<BTreeMap<Date, OHLC>> {
         info!("Fetching daily prices from Kraken...");
 
+        dbg!(&Self::url("interval=1d"));
+
         retry(
-            |_| Self::json_to_date_to_ohlc(&reqwest::blocking::get(Self::url("interval=1d"))?.json()?),
+            |_| Self::json_to_date_to_ohlc(&minreq::get(Self::url("interval=1d")).send()?.json()?),
             30,
             10,
         )
@@ -92,12 +94,7 @@ impl Binance {
         if self.har.is_none() {
             self.har.replace(self.read_har().unwrap_or_default());
         }
-        Pricer::<STATELESS>::find_height_ohlc(
-            &self.har.as_ref().unwrap(),
-            timestamp,
-            previous_timestamp,
-            "binance har",
-        )
+        Pricer::<STATELESS>::find_height_ohlc(self.har.as_ref().unwrap(), timestamp, previous_timestamp, "binance har")
     }
 
     fn read_har(&self) -> color_eyre::Result<BTreeMap<Timestamp, OHLC>> {
diff --git a/pricer/src/fetchers/kibo.rs b/pricer/src/fetchers/kibo.rs
index 8cefa2299..847ab32a4 100644
--- a/pricer/src/fetchers/kibo.rs
+++ b/pricer/src/fetchers/kibo.rs
@@ -55,8 +55,9 @@ impl Kibo {
             |try_index| {
                 let base_url = Self::get_base_url(try_index);
 
-                let body: Value =
-                    reqwest::blocking::get(format!("{base_url}/height-to-price?chunk={}", height))?.json()?;
+                let body: Value = minreq::get(format!("{base_url}/height-to-price?chunk={}", height))
+                    .send()?
+                    .json()?;
 
                 let vec = body
                     .as_object()
@@ -112,7 +113,9 @@ impl Kibo {
             |try_index| {
                 let base_url = Self::get_base_url(try_index);
 
-                let body: Value = reqwest::blocking::get(format!("{base_url}/date-to-price?chunk={}", year))?.json()?;
+                let body: Value = minreq::get(format!("{base_url}/date-to-price?chunk={}", year))
+                    .send()?
+                    .json()?;
 
                 body.as_object()
                     .context("Expect to be an object")?
diff --git a/pricer/src/fetchers/kraken.rs b/pricer/src/fetchers/kraken.rs
index 4e8689756..6de067b6c 100644
--- a/pricer/src/fetchers/kraken.rs
+++ b/pricer/src/fetchers/kraken.rs
@@ -23,14 +23,14 @@ impl Kraken {
         if self._1mn.is_none() || self._1mn.as_ref().unwrap().last_key_value().unwrap().0 <= &timestamp {
             self._1mn.replace(Self::fetch_1mn()?);
         }
-        Pricer::<STATELESS>::find_height_ohlc(&self._1mn.as_ref().unwrap(), timestamp, previous_timestamp, "kraken 1m")
+        Pricer::<STATELESS>::find_height_ohlc(self._1mn.as_ref().unwrap(), timestamp, previous_timestamp, "kraken 1m")
     }
 
     fn fetch_1mn() -> color_eyre::Result<BTreeMap<Timestamp, OHLC>> {
         info!("Fetching 1mn prices from Kraken...");
 
         retry(
-            |_| Self::json_to_timestamp_to_ohlc(&reqwest::blocking::get(Self::url(1))?.json()?),
+            |_| Self::json_to_timestamp_to_ohlc(&minreq::get(Self::url(1)).send()?.json()?),
             30,
             10,
         )
@@ -52,7 +52,7 @@ impl Kraken {
         info!("Fetching daily prices from Kraken...");
 
         retry(
-            |_| Self::json_to_date_to_ohlc(&reqwest::blocking::get(Self::url(1440))?.json()?),
+            |_| Self::json_to_date_to_ohlc(&minreq::get(Self::url(1440)).send()?.json()?),
             30,
             10,
         )
diff --git a/pricer/src/main.rs b/pricer/src/main.rs
index 9efd33647..eaa6b12d5 100644
--- a/pricer/src/main.rs
+++ b/pricer/src/main.rs
@@ -1,14 +1,13 @@
-// fn main() {}
-
+use brice::{Binance, Kibo, Kraken};
 use indexer::Height;
-use pricer::{Binance, Kibo, Kraken};
+use serde_json::Value;
 
 fn main() -> color_eyre::Result<()> {
     color_eyre::install()?;
 
     logger::init_log(None);
 
-    // dbg!(Binance::fetch_1d_prices()?);
+    dbg!(Binance::fetch_1d()?);
     // dbg!(Binance::fetch_1mn_prices());
     // dbg!(Kraken::fetch_1d()?);
     // dbg!(Kraken::fetch_1mn_prices()?);
diff --git a/python/example.py b/python/parse.py
similarity index 100%
rename from python/example.py
rename to python/parse.py
diff --git a/server/Cargo.toml b/server/Cargo.toml
index e2ad61572..e3e66f7ea 100644
--- a/server/Cargo.toml
+++ b/server/Cargo.toml
@@ -11,7 +11,7 @@ derive_deref = { workspace = true }
 indexer = { workspace = true }
 jiff = { workspace = true }
 logger = { workspace = true }
-oxc = { version = "0.50.0", features = ["codegen", "minifier"] }
+oxc = { version = "0.51.0", features = ["codegen", "minifier"] }
 reqwest = { version = "0.12.12", features = ["blocking", "json"] }
 serde = { workspace = true }
 serde_json = { workspace = true }
diff --git a/storable_vec/Cargo.toml b/storable_vec/Cargo.toml
index dc4fd3c8f..dcef7c1c4 100644
--- a/storable_vec/Cargo.toml
+++ b/storable_vec/Cargo.toml
@@ -12,6 +12,7 @@ json = ["dep:serde", "dep:serde_json"]
 
 [dependencies]
 memmap2 = "0.9.5"
-zerocopy = { workspace = true }
+rayon = { workspace = true }
 serde = { workspace = true, optional = true }
 serde_json = { workspace = true, optional = true }
+zerocopy = { workspace = true }
diff --git a/storable_vec/src/lib.rs b/storable_vec/src/lib.rs
index 40c0eb220..51f8da646 100644
--- a/storable_vec/src/lib.rs
+++ b/storable_vec/src/lib.rs
@@ -12,6 +12,7 @@ use std::{
 };
 
 pub use memmap2;
+use rayon::prelude::*;
 pub use zerocopy;
 
 mod enums;
@@ -71,9 +72,9 @@ pub struct StorableVec<I, T, const MODE: u8> {
 
 /// In bytes
 const MAX_PAGE_SIZE: usize = 4 * 4096;
-// const ONE_MB: usize = 1000 * 1024;
-const MAX_CACHE_SIZE: usize = usize::MAX;
-// const MAX_CACHE_SIZE: usize = 100 * ONE_MB;
+const ONE_MB: usize = 1000 * 1024;
+// const MAX_CACHE_SIZE: usize = usize::MAX;
+const MAX_CACHE_SIZE: usize = 100 * ONE_MB;
 
 impl<I, T, const MODE: u8> StorableVec<I, T, MODE>
 where
@@ -182,8 +183,7 @@ where
     fn reset_cache(&mut self) -> io::Result<()> {
         match MODE {
             CACHED_GETS => {
-                // par_iter_mut ?
-                self.cache.iter_mut().for_each(|lock| {
+                self.cache.par_iter_mut().for_each(|lock| {
                     lock.take();
                 });
 
@@ -192,7 +192,7 @@ where
 
                 if self.cache.len() != len {
                     self.cache.resize_with(len, Default::default);
-                    self.cache.shrink_to_fit();
+                    // self.cache.shrink_to_fit();
                 }
 
                 Ok(())
@@ -270,10 +270,14 @@ where
             return Ok(());
         }
 
-        let mut bytes: Vec<u8> = Vec::with_capacity(self.pushed_len() * Self::SIZE_OF_T);
+        let mut bytes: Vec<u8> = vec![0; self.pushed_len() * Self::SIZE_OF_T];
+
+        let unsafe_bytes = UnsafeSlice::new(&mut bytes);
+
         mem::take(&mut self.pushed)
-            .into_iter()
-            .for_each(|v| bytes.extend_from_slice(v.as_bytes()));
+            .into_par_iter()
+            .enumerate()
+            .for_each(|(i, v)| unsafe_bytes.copy_slice(i * Self::SIZE_OF_T, v.as_bytes()));
 
         self.file.write_all(&bytes)?;
 
@@ -291,8 +295,7 @@ where
 
         let value_at_index = self.open_file_at_then_read(index).ok();
 
-        self.file
-            .set_len(Self::index_to_byte_index(index.checked_sub(1).unwrap_or_default()))?;
+        self.file.set_len(Self::index_to_byte_index(index))?;
 
         self.reset_disk_related_state()?;
 
@@ -429,6 +432,28 @@ where
         Ok(self.get(index)?.map(|v| (*v).clone()).unwrap_or(Default::default()))
     }
 
+    pub fn iter_from<F>(&self, mut index: I, mut f: F) -> Result<()>
+    where
+        F: FnMut((I, Value<T>)) -> Result<()>,
+    {
+        let disk_len = I::from(Self::read_disk_len_(&self.file)?);
+
+        while index < disk_len {
+            f((index, self.get(index)?.unwrap()))?;
+            index = index + 1;
+        }
+
+        let mut index = I::from(0);
+        let pushed_len = I::from(self.pushed_len());
+        let disk_len = Self::i_to_usize(disk_len)?;
+        while index < pushed_len {
+            f(((index + disk_len), self.get(index)?.map(Value::from).unwrap()))?;
+            index = index + 1;
+        }
+
+        Ok(())
+    }
+
     #[inline]
     pub fn push(&mut self, value: T) {
         self.push_(value)
diff --git a/storable_vec/src/structs/mod.rs b/storable_vec/src/structs/mod.rs
index 7a60bc383..51482371f 100644
--- a/storable_vec/src/structs/mod.rs
+++ b/storable_vec/src/structs/mod.rs
@@ -1,3 +1,5 @@
+mod unsafe_slice;
 mod version;
 
+pub use unsafe_slice::*;
 pub use version::*;
diff --git a/storable_vec/src/structs/unsafe_slice.rs b/storable_vec/src/structs/unsafe_slice.rs
new file mode 100644
index 000000000..8f354e0ca
--- /dev/null
+++ b/storable_vec/src/structs/unsafe_slice.rs
@@ -0,0 +1,30 @@
+use std::cell::UnsafeCell;
+
+#[derive(Copy, Clone)]
+pub struct UnsafeSlice<'a, T>(&'a [UnsafeCell<T>]);
+unsafe impl<T: Send + Sync> Send for UnsafeSlice<'_, T> {}
+unsafe impl<T: Send + Sync> Sync for UnsafeSlice<'_, T> {}
+
+impl<'a, T> UnsafeSlice<'a, T> {
+    pub fn new(slice: &'a mut [T]) -> Self {
+        let ptr = slice as *mut [T] as *const [UnsafeCell<T>];
+        Self(unsafe { &*ptr })
+    }
+
+    /// SAFETY: It is UB if two threads write to the same index without
+    /// synchronization.
+    pub fn write(&self, i: usize, value: T) {
+        unsafe {
+            *self.0[i].get() = value;
+        }
+    }
+
+    pub fn copy_slice(&self, start: usize, slice: &[T])
+    where
+        T: Copy,
+    {
+        slice.iter().enumerate().for_each(|(i, v)| {
+            self.write(start + i, *v);
+        });
+    }
+}

From 2cb4d65f3d9a9e96a4a0e1941c1e85e366301e37 Mon Sep 17 00:00:00 2001
From: nym21 <expat-epochs0i@icloud.com>
Date: Wed, 19 Feb 2025 10:56:07 +0100
Subject: [PATCH 54/63] indexer: update readme

---
 Cargo.lock          |  8 ++++----
 Cargo.toml          |  1 -
 computer/Cargo.toml |  1 +
 indexer/Cargo.toml  |  4 ++--
 indexer/README.md   | 18 +++++++++++++-----
 indexer/src/lib.rs  | 20 +++++++++++++++-----
 indexer/src/main.rs |  6 ------
 iterator/Cargo.toml |  2 +-
 pricer/Cargo.toml   |  2 +-
 9 files changed, 37 insertions(+), 25 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8d46b9174..afe2b6896 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -941,9 +941,9 @@ checksum = "17e2ac29387b1aa07a1e448f7bb4f35b500787971e965b02842b900afa5c8f6f"
 
 [[package]]
 name = "h2"
-version = "0.4.7"
+version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccae279728d634d083c00f6099cb58f01cc99c145b84b8be2f6c74618d79922e"
+checksum = "5017294ff4bb30944501348f6f8e42e6ad28f42c8bbef7a74029aff064a4e3c2"
 dependencies = [
  "atomic-waker",
  "bytes",
@@ -2976,9 +2976,9 @@ checksum = "2f322b60f6b9736017344fa0635d64be2f458fbc04eef65f6be22976dd1ffd5b"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.16"
+version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a210d160f08b701c8721ba1c726c11662f877ea6b7094007e1ca9a1041945034"
+checksum = "00e2473a93778eb0bad35909dff6a10d28e63f792f16ed15e404fca9d5eeedbe"
 
 [[package]]
 name = "unicode-linebreak"
diff --git a/Cargo.toml b/Cargo.toml
index 1356c50c9..09b788e62 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -24,7 +24,6 @@ jiff = "0.2.1"
 logger = { path = "logger" }
 rayon = "1.10.0"
 pricer = { path = "pricer", package = "brice" }
-rlimit = { version = "0.10.2" }
 serde = { version = "1.0.217", features = ["derive"] }
 serde_json = { version = "1.0.138", features = ["float_roundtrip"] }
 server = { path = "server", package = "berver" }
diff --git a/computer/Cargo.toml b/computer/Cargo.toml
index 35d646a2b..2dc009c9d 100644
--- a/computer/Cargo.toml
+++ b/computer/Cargo.toml
@@ -1,5 +1,6 @@
 [package]
 name = "bomputer"
+description = "A Bitcoin dataset computer built on top of brice"
 version = "0.1.0"
 edition = "2021"
 
diff --git a/indexer/Cargo.toml b/indexer/Cargo.toml
index ea8f92c2a..c3e3e2391 100644
--- a/indexer/Cargo.toml
+++ b/indexer/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "bindex"
-description = "A bitcoin-core indexer"
+description = "A bitcoin-core indexer built on top of biter"
 version = "0.1.0"
 edition = "2021"
 
@@ -15,7 +15,7 @@ jiff = { workspace = true }
 logger = { workspace = true }
 rapidhash = "1.3.0"
 rayon = { workspace = true }
-rlimit = { workspace = true }
+rlimit = { version = "0.10.2" }
 serde = { workspace = true }
 serde_bytes = "0.11.15"
 storable_vec = { workspace = true }
diff --git a/indexer/README.md b/indexer/README.md
index 4d5c31bf9..78aff8cf9 100644
--- a/indexer/README.md
+++ b/indexer/README.md
@@ -1,19 +1,27 @@
 # Indexer
 
-A [Bitcoin Core](https://bitcoincore.org/en/about/) node indexer which iterates over the chain (via `../iterator`) and creates a database of the vecs (`../storable_vec`) and key/value stores ([`fjall`](https://crates.io/crates/fjall)) that can used in your Rust code.
+A [Bitcoin Core](https://bitcoincore.org/en/about/) node indexer which iterates over the chain (via `../iterator`) and creates a database of the vecs (`../storable_vec`) and key/value stores ([`fjall`](https://crates.io/crates/fjall)) that can be used in your Rust code.
 
 The crate only stores the bare minimum to be self sufficient and not have to use an RPC client (except for scripts which are not stored). If you need more data, checkout `../computer` which uses the outputs from the indexer to compute a whole range of datasets.
 
-The neat thing about using simple vecs to store data is that you can parse the outputed files with another programming language such as Python very simply, you'll find an example below.
+Vecs are used sparingly instead of stores for multiple reasons:
+
+- Only stores the relevant data since the key is an index
+- Saved as uncompressed bytes and thus can be parsed manually (with any programming language) without relying on a server or library
+- Easy to work with and predictable
 
 ## Usage
 
-Rust: `src/main.rs`
-
-Python: `../python/parse.py`
+Peaks at 11-12 GB of RAM
 
 ## Outputs
 
 Vecs: `src/storage/storable_vecs/mod.rs`
 
 Stores: `src/storage/fjalls/mod.rs`
+
+## Examples
+
+Rust: `src/main.rs`
+
+Python: `../python/parse.py`
diff --git a/indexer/src/lib.rs b/indexer/src/lib.rs
index 2ecd7dd9d..8418b57ed 100644
--- a/indexer/src/lib.rs
+++ b/indexer/src/lib.rs
@@ -31,6 +31,14 @@ pub struct Indexer<const MODE: u8> {
 
 impl<const MODE: u8> Indexer<MODE> {
     pub fn import(indexes_dir: &Path) -> color_eyre::Result<Self> {
+        info!("Importing indexes...");
+
+        rlimit::setrlimit(
+            rlimit::Resource::NOFILE,
+            210_000,
+            rlimit::getrlimit(rlimit::Resource::NOFILE).unwrap().1,
+        )?;
+
         let vecs = StorableVecs::import(&indexes_dir.join("vecs"))?;
         let trees = Fjalls::import(&indexes_dir.join("fjall"))?;
 
@@ -40,6 +48,8 @@ impl<const MODE: u8> Indexer<MODE> {
 
 impl Indexer<CACHED_GETS> {
     pub fn index(&mut self, bitcoin_dir: &Path, rpc: rpc::Client, exit: &Exit) -> color_eyre::Result<()> {
+        info!("Started indexing...");
+
         let check_collisions = true;
 
         let starting_indexes = Indexes::try_from((&mut self.vecs, &self.trees, &rpc)).unwrap_or_else(|_| {
@@ -70,10 +80,10 @@ impl Indexer<CACHED_GETS> {
 
         iterator::new(bitcoin_dir, Some(idxs.height.into()), None, rpc)
             .iter()
-            .try_for_each(|(_height, block, blockhash)| -> color_eyre::Result<()> {
-                info!("Indexing block {_height}...");
+            .try_for_each(|(height, block, blockhash)| -> color_eyre::Result<()> {
+                info!("Indexing block {height}...");
 
-                let height = Height::from(_height);
+                let height = Height::from(height);
                 idxs.height = height;
 
                 let blockhash = BlockHash::from(blockhash);
@@ -300,7 +310,7 @@ impl Indexer<CACHED_GETS> {
                                         {
                                             let txid = tx.compute_txid();
                                             dbg!(
-                                                _height,
+                                                height,
                                                 txid,
                                                 vout,
                                                 block_txindex,
@@ -603,7 +613,7 @@ impl Indexer<CACHED_GETS> {
 
                 idxs.push_future_if_needed(vecs)?;
 
-                let should_snapshot = _height != 0 && _height % SNAPSHOT_BLOCK_RANGE == 0 && !exit.blocked();
+                let should_snapshot = height != 0 && height % SNAPSHOT_BLOCK_RANGE == 0 && !exit.blocked();
                 if should_snapshot {
                     export(trees, vecs, height)?;
                 }
diff --git a/indexer/src/main.rs b/indexer/src/main.rs
index 3b7b6e7db..562711a7a 100644
--- a/indexer/src/main.rs
+++ b/indexer/src/main.rs
@@ -10,12 +10,6 @@ fn main() -> color_eyre::Result<()> {
 
     logger::init_log(None);
 
-    rlimit::setrlimit(
-        rlimit::Resource::NOFILE,
-        21_000,
-        rlimit::getrlimit(rlimit::Resource::NOFILE).unwrap().1,
-    )?;
-
     let data_dir = Path::new("../../bitcoin");
     let rpc = rpc::Client::new(
         "http://localhost:8332",
diff --git a/iterator/Cargo.toml b/iterator/Cargo.toml
index 943555b16..ef207a643 100644
--- a/iterator/Cargo.toml
+++ b/iterator/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "biter"
-description = "A very fast Bitcoin block iterator"
+description = "A very fast Bitcoin block iterator built on top of bitcoin-rust"
 version = "0.2.2"
 license = "MIT"
 repository = "https://github.com/kibo-money/kibo/tree/main/src/crates/biter"
diff --git a/pricer/Cargo.toml b/pricer/Cargo.toml
index 55e4c724f..a031fa4a2 100644
--- a/pricer/Cargo.toml
+++ b/pricer/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "brice"
-description = "A bitcoin price fetcher"
+description = "A bitcoin price fetcher built on top of bindex"
 version = "0.1.0"
 edition = "2021"
 

From 5e39510f21d1991ac71e1cbb9fd658e9f22dd129 Mon Sep 17 00:00:00 2001
From: nym21 <expat-epochs0i@icloud.com>
Date: Wed, 19 Feb 2025 21:43:18 +0100
Subject: [PATCH 55/63] general: snapshot

---
 Cargo.lock                                    | 872 +-----------------
 Cargo.toml                                    |  24 +-
 cli/Cargo.toml                                |   8 +
 cli/src/main.rs                               |   3 +
 computer/Cargo.toml                           |   9 +-
 computer/src/lib.rs                           |   2 +-
 computer/src/main.rs                          |   2 +-
 exit/Cargo.toml                               |   8 -
 hodor/Cargo.toml                              |  10 +
 {exit => hodor}/src/lib.rs                    |   2 +-
 indexer/Cargo.toml                            |   9 +-
 indexer/README.md                             |   4 +-
 indexer/src/lib.rs                            |  10 +-
 indexer/src/main.rs                           |  31 +-
 iterator/Cargo.toml                           |  10 +-
 iterator/README.md                            |  38 +-
 iterator/src/blk_index_to_blk_recap.rs        |  21 +-
 iterator/src/blk_metadata.rs                  |   2 +-
 iterator/src/blk_metadata_and_block.rs        |   6 +-
 iterator/src/blk_recap.rs                     |   3 +
 iterator/src/lib.rs                           |  14 +-
 iterator/src/main.rs                          |  13 +-
 logger/Cargo.toml                             |   8 +-
 logger/src/main.rs                            |   2 +-
 pricer/Cargo.toml                             |   9 +-
 pricer/src/main.rs                            |   2 +-
 server/Cargo.toml                             |   7 +-
 server/src/api/vecs/mod.rs                    |   3 +-
 server/src/files/file.rs                      |   3 +-
 server/src/lib.rs                             |   5 +-
 server/src/traits/header_map.rs               |   6 +-
 server/src/traits/response.rs                 |   7 +-
 storable_vec/Cargo.toml                       |   6 +-
 storable_vec/src/traits/any.rs                |   1 +
 .../fonts/satoshi/2024-09/font.var.woff2      | Bin
 .../kibo.money}/assets/fonts/satoshi/FFL.txt  |   0
 .../assets/pdfs/block/2022-report.pdf         | Bin
 .../pdfs/braiins/building-bitcoin-in-rust.pdf | Bin
 .../pdfs/glassnode/cointime-economics.pdf     | Bin
 .../assets/pdfs/multi-author/bcap_v1.0.pdf    | Bin
 ...-bitcoin-adoption-in-the-united-states.pdf | Bin
 .../protection-under-first-amendment.pdf      | Bin
 .../pdfs/satoshi-nakamoto/whitepaper.pdf      | Bin
 .../2021-bitcoin-clean-energy-initiative.pdf  | Bin
 .../2024-11-20_09-41-25/apple-icon-180.png    | Bin
 .../apple-splash-1125-2436.jpg                | Bin
 .../apple-splash-1136-640.jpg                 | Bin
 .../apple-splash-1170-2532.jpg                | Bin
 .../apple-splash-1179-2556.jpg                | Bin
 .../apple-splash-1242-2208.jpg                | Bin
 .../apple-splash-1242-2688.jpg                | Bin
 .../apple-splash-1284-2778.jpg                | Bin
 .../apple-splash-1290-2796.jpg                | Bin
 .../apple-splash-1334-750.jpg                 | Bin
 .../apple-splash-1488-2266.jpg                | Bin
 .../apple-splash-1536-2048.jpg                | Bin
 .../apple-splash-1620-2160.jpg                | Bin
 .../apple-splash-1640-2360.jpg                | Bin
 .../apple-splash-1668-2224.jpg                | Bin
 .../apple-splash-1668-2388.jpg                | Bin
 .../apple-splash-1792-828.jpg                 | Bin
 .../apple-splash-2048-1536.jpg                | Bin
 .../apple-splash-2048-2732.jpg                | Bin
 .../apple-splash-2160-1620.jpg                | Bin
 .../apple-splash-2208-1242.jpg                | Bin
 .../apple-splash-2224-1668.jpg                | Bin
 .../apple-splash-2266-1488.jpg                | Bin
 .../apple-splash-2360-1640.jpg                | Bin
 .../apple-splash-2388-1668.jpg                | Bin
 .../apple-splash-2436-1125.jpg                | Bin
 .../apple-splash-2532-1170.jpg                | Bin
 .../apple-splash-2556-1179.jpg                | Bin
 .../apple-splash-2688-1242.jpg                | Bin
 .../apple-splash-2732-2048.jpg                | Bin
 .../apple-splash-2778-1284.jpg                | Bin
 .../apple-splash-2796-1290.jpg                | Bin
 .../apple-splash-640-1136.jpg                 | Bin
 .../apple-splash-750-1334.jpg                 | Bin
 .../apple-splash-828-1792.jpg                 | Bin
 .../pwa/2024-11-20_09-41-25/favicon-196.png   | Bin
 .../assets/pwa/2024-11-20_09-41-25/index.html |   0
 .../manifest-icon-192.maskable.png            | Bin
 .../manifest-icon-512.maskable.png            | Bin
 .../kibo.money}/assets/pwa/index.html         |   0
 .../kibo.money}/generate-icons.sh             |   0
 {website => websites/kibo.money}/index.html   |   0
 .../kibo.money}/jsconfig.json                 |   0
 .../kibo.money}/manifest.webmanifest          |   0
 .../kibo.money}/misc/tailwindTo550.js         |   0
 .../kibo.money}/packages/lean-qr/README.md    |   0
 .../packages/lean-qr/v2.3.4/script.js         |   0
 .../packages/lean-qr/v2.3.4/types.d.ts        |   0
 .../packages/lightweight-charts/NOTICE.md     |   0
 .../packages/lightweight-charts/README.md     |   0
 .../packages/lightweight-charts/types.d.ts    |   0
 .../lightweight-charts/v4.2.0/script.js       |   0
 .../lightweight-charts/v4.2.0/types.d.ts      |   0
 .../lightweight-charts/v4.2.2/script.js       |   0
 .../lightweight-charts/v4.2.2/types.d.ts      |   0
 .../packages/lightweight-charts/wrapper.js    |   0
 .../solid-signals/2024-11-02/script.js        |   0
 .../2024-11-02/types/core/constants.d.ts      |   0
 .../2024-11-02/types/core/core.d.ts           |   0
 .../2024-11-02/types/core/effect.d.ts         |   0
 .../2024-11-02/types/core/error.d.ts          |   0
 .../2024-11-02/types/core/flags.d.ts          |   0
 .../2024-11-02/types/core/index.d.ts          |   0
 .../2024-11-02/types/core/owner.d.ts          |   0
 .../2024-11-02/types/core/scheduler.d.ts      |   0
 .../solid-signals/2024-11-02/types/index.d.ts |   0
 .../solid-signals/2024-11-02/types/map.d.ts   |   0
 .../2024-11-02/types/signals.d.ts             |   0
 .../2024-11-02/types/store/index.d.ts         |   0
 .../2024-11-02/types/store/store.d.ts         |   0
 .../solid-signals/2024-11-02/types/utils.d.ts |   0
 .../solid-signals/2024-11-08/script.js        |   0
 .../2024-11-08/types/core/constants.d.ts      |   0
 .../2024-11-08/types/core/core.d.ts           |   0
 .../2024-11-08/types/core/effect.d.ts         |   0
 .../2024-11-08/types/core/error.d.ts          |   0
 .../2024-11-08/types/core/flags.d.ts          |   0
 .../2024-11-08/types/core/index.d.ts          |   0
 .../2024-11-08/types/core/owner.d.ts          |   0
 .../2024-11-08/types/core/scheduler.d.ts      |   0
 .../solid-signals/2024-11-08/types/index.d.ts |   0
 .../solid-signals/2024-11-08/types/map.d.ts   |   0
 .../2024-11-08/types/signals.d.ts             |   0
 .../2024-11-08/types/store/index.d.ts         |   0
 .../2024-11-08/types/store/store.d.ts         |   0
 .../solid-signals/2024-11-08/types/utils.d.ts |   0
 .../packages/solid-signals/README.md          |   0
 .../packages/solid-signals/types.d.ts         |   0
 .../packages/solid-signals/wrapper.js         |   0
 .../kibo.money}/packages/ufuzzy/README.md     |   0
 .../packages/ufuzzy/v1.0.14/script.js         |   0
 .../packages/ufuzzy/v1.0.14/types.d.ts        |   0
 {website => websites/kibo.money}/robots.txt   |   0
 .../kibo.money}/scripts/chart.js              |   0
 .../kibo.money}/scripts/live-price.js         |   0
 .../kibo.money}/scripts/main.js               |   0
 .../kibo.money}/scripts/moscow-time.js        |   0
 .../kibo.money}/scripts/options.js            |   0
 .../kibo.money}/scripts/service-worker.js     |   0
 .../kibo.money}/scripts/simulation.js         |   0
 .../kibo.money}/scripts/types/self.d.ts       |   0
 .../kibo.money}/styles/chart.css              |   0
 .../kibo.money}/styles/live-price.css         |   0
 .../kibo.money}/styles/moscow-time.css        |   0
 .../kibo.money}/styles/simulation.css         |   0
 .../kibo.money}/tsconfig.json                 |   0
 150 files changed, 188 insertions(+), 972 deletions(-)
 create mode 100644 cli/Cargo.toml
 create mode 100644 cli/src/main.rs
 delete mode 100644 exit/Cargo.toml
 create mode 100644 hodor/Cargo.toml
 rename {exit => hodor}/src/lib.rs (98%)
 rename {website => websites/kibo.money}/assets/fonts/satoshi/2024-09/font.var.woff2 (100%)
 rename {website => websites/kibo.money}/assets/fonts/satoshi/FFL.txt (100%)
 rename {website => websites/kibo.money}/assets/pdfs/block/2022-report.pdf (100%)
 rename {website => websites/kibo.money}/assets/pdfs/braiins/building-bitcoin-in-rust.pdf (100%)
 rename {website => websites/kibo.money}/assets/pdfs/glassnode/cointime-economics.pdf (100%)
 rename {website => websites/kibo.money}/assets/pdfs/multi-author/bcap_v1.0.pdf (100%)
 rename {website => websites/kibo.money}/assets/pdfs/nakamoto-project/understanding-bitcoin-adoption-in-the-united-states.pdf (100%)
 rename {website => websites/kibo.money}/assets/pdfs/nydig/protection-under-first-amendment.pdf (100%)
 rename {website => websites/kibo.money}/assets/pdfs/satoshi-nakamoto/whitepaper.pdf (100%)
 rename {website => websites/kibo.money}/assets/pdfs/square/2021-bitcoin-clean-energy-initiative.pdf (100%)
 rename {website => websites/kibo.money}/assets/pwa/2024-11-20_09-41-25/apple-icon-180.png (100%)
 rename {website => websites/kibo.money}/assets/pwa/2024-11-20_09-41-25/apple-splash-1125-2436.jpg (100%)
 rename {website => websites/kibo.money}/assets/pwa/2024-11-20_09-41-25/apple-splash-1136-640.jpg (100%)
 rename {website => websites/kibo.money}/assets/pwa/2024-11-20_09-41-25/apple-splash-1170-2532.jpg (100%)
 rename {website => websites/kibo.money}/assets/pwa/2024-11-20_09-41-25/apple-splash-1179-2556.jpg (100%)
 rename {website => websites/kibo.money}/assets/pwa/2024-11-20_09-41-25/apple-splash-1242-2208.jpg (100%)
 rename {website => websites/kibo.money}/assets/pwa/2024-11-20_09-41-25/apple-splash-1242-2688.jpg (100%)
 rename {website => websites/kibo.money}/assets/pwa/2024-11-20_09-41-25/apple-splash-1284-2778.jpg (100%)
 rename {website => websites/kibo.money}/assets/pwa/2024-11-20_09-41-25/apple-splash-1290-2796.jpg (100%)
 rename {website => websites/kibo.money}/assets/pwa/2024-11-20_09-41-25/apple-splash-1334-750.jpg (100%)
 rename {website => websites/kibo.money}/assets/pwa/2024-11-20_09-41-25/apple-splash-1488-2266.jpg (100%)
 rename {website => websites/kibo.money}/assets/pwa/2024-11-20_09-41-25/apple-splash-1536-2048.jpg (100%)
 rename {website => websites/kibo.money}/assets/pwa/2024-11-20_09-41-25/apple-splash-1620-2160.jpg (100%)
 rename {website => websites/kibo.money}/assets/pwa/2024-11-20_09-41-25/apple-splash-1640-2360.jpg (100%)
 rename {website => websites/kibo.money}/assets/pwa/2024-11-20_09-41-25/apple-splash-1668-2224.jpg (100%)
 rename {website => websites/kibo.money}/assets/pwa/2024-11-20_09-41-25/apple-splash-1668-2388.jpg (100%)
 rename {website => websites/kibo.money}/assets/pwa/2024-11-20_09-41-25/apple-splash-1792-828.jpg (100%)
 rename {website => websites/kibo.money}/assets/pwa/2024-11-20_09-41-25/apple-splash-2048-1536.jpg (100%)
 rename {website => websites/kibo.money}/assets/pwa/2024-11-20_09-41-25/apple-splash-2048-2732.jpg (100%)
 rename {website => websites/kibo.money}/assets/pwa/2024-11-20_09-41-25/apple-splash-2160-1620.jpg (100%)
 rename {website => websites/kibo.money}/assets/pwa/2024-11-20_09-41-25/apple-splash-2208-1242.jpg (100%)
 rename {website => websites/kibo.money}/assets/pwa/2024-11-20_09-41-25/apple-splash-2224-1668.jpg (100%)
 rename {website => websites/kibo.money}/assets/pwa/2024-11-20_09-41-25/apple-splash-2266-1488.jpg (100%)
 rename {website => websites/kibo.money}/assets/pwa/2024-11-20_09-41-25/apple-splash-2360-1640.jpg (100%)
 rename {website => websites/kibo.money}/assets/pwa/2024-11-20_09-41-25/apple-splash-2388-1668.jpg (100%)
 rename {website => websites/kibo.money}/assets/pwa/2024-11-20_09-41-25/apple-splash-2436-1125.jpg (100%)
 rename {website => websites/kibo.money}/assets/pwa/2024-11-20_09-41-25/apple-splash-2532-1170.jpg (100%)
 rename {website => websites/kibo.money}/assets/pwa/2024-11-20_09-41-25/apple-splash-2556-1179.jpg (100%)
 rename {website => websites/kibo.money}/assets/pwa/2024-11-20_09-41-25/apple-splash-2688-1242.jpg (100%)
 rename {website => websites/kibo.money}/assets/pwa/2024-11-20_09-41-25/apple-splash-2732-2048.jpg (100%)
 rename {website => websites/kibo.money}/assets/pwa/2024-11-20_09-41-25/apple-splash-2778-1284.jpg (100%)
 rename {website => websites/kibo.money}/assets/pwa/2024-11-20_09-41-25/apple-splash-2796-1290.jpg (100%)
 rename {website => websites/kibo.money}/assets/pwa/2024-11-20_09-41-25/apple-splash-640-1136.jpg (100%)
 rename {website => websites/kibo.money}/assets/pwa/2024-11-20_09-41-25/apple-splash-750-1334.jpg (100%)
 rename {website => websites/kibo.money}/assets/pwa/2024-11-20_09-41-25/apple-splash-828-1792.jpg (100%)
 rename {website => websites/kibo.money}/assets/pwa/2024-11-20_09-41-25/favicon-196.png (100%)
 rename {website => websites/kibo.money}/assets/pwa/2024-11-20_09-41-25/index.html (100%)
 rename {website => websites/kibo.money}/assets/pwa/2024-11-20_09-41-25/manifest-icon-192.maskable.png (100%)
 rename {website => websites/kibo.money}/assets/pwa/2024-11-20_09-41-25/manifest-icon-512.maskable.png (100%)
 rename {website => websites/kibo.money}/assets/pwa/index.html (100%)
 rename {website => websites/kibo.money}/generate-icons.sh (100%)
 rename {website => websites/kibo.money}/index.html (100%)
 rename {website => websites/kibo.money}/jsconfig.json (100%)
 rename {website => websites/kibo.money}/manifest.webmanifest (100%)
 rename {website => websites/kibo.money}/misc/tailwindTo550.js (100%)
 rename {website => websites/kibo.money}/packages/lean-qr/README.md (100%)
 rename {website => websites/kibo.money}/packages/lean-qr/v2.3.4/script.js (100%)
 rename {website => websites/kibo.money}/packages/lean-qr/v2.3.4/types.d.ts (100%)
 rename {website => websites/kibo.money}/packages/lightweight-charts/NOTICE.md (100%)
 rename {website => websites/kibo.money}/packages/lightweight-charts/README.md (100%)
 rename {website => websites/kibo.money}/packages/lightweight-charts/types.d.ts (100%)
 rename {website => websites/kibo.money}/packages/lightweight-charts/v4.2.0/script.js (100%)
 rename {website => websites/kibo.money}/packages/lightweight-charts/v4.2.0/types.d.ts (100%)
 rename {website => websites/kibo.money}/packages/lightweight-charts/v4.2.2/script.js (100%)
 rename {website => websites/kibo.money}/packages/lightweight-charts/v4.2.2/types.d.ts (100%)
 rename {website => websites/kibo.money}/packages/lightweight-charts/wrapper.js (100%)
 rename {website => websites/kibo.money}/packages/solid-signals/2024-11-02/script.js (100%)
 rename {website => websites/kibo.money}/packages/solid-signals/2024-11-02/types/core/constants.d.ts (100%)
 rename {website => websites/kibo.money}/packages/solid-signals/2024-11-02/types/core/core.d.ts (100%)
 rename {website => websites/kibo.money}/packages/solid-signals/2024-11-02/types/core/effect.d.ts (100%)
 rename {website => websites/kibo.money}/packages/solid-signals/2024-11-02/types/core/error.d.ts (100%)
 rename {website => websites/kibo.money}/packages/solid-signals/2024-11-02/types/core/flags.d.ts (100%)
 rename {website => websites/kibo.money}/packages/solid-signals/2024-11-02/types/core/index.d.ts (100%)
 rename {website => websites/kibo.money}/packages/solid-signals/2024-11-02/types/core/owner.d.ts (100%)
 rename {website => websites/kibo.money}/packages/solid-signals/2024-11-02/types/core/scheduler.d.ts (100%)
 rename {website => websites/kibo.money}/packages/solid-signals/2024-11-02/types/index.d.ts (100%)
 rename {website => websites/kibo.money}/packages/solid-signals/2024-11-02/types/map.d.ts (100%)
 rename {website => websites/kibo.money}/packages/solid-signals/2024-11-02/types/signals.d.ts (100%)
 rename {website => websites/kibo.money}/packages/solid-signals/2024-11-02/types/store/index.d.ts (100%)
 rename {website => websites/kibo.money}/packages/solid-signals/2024-11-02/types/store/store.d.ts (100%)
 rename {website => websites/kibo.money}/packages/solid-signals/2024-11-02/types/utils.d.ts (100%)
 rename {website => websites/kibo.money}/packages/solid-signals/2024-11-08/script.js (100%)
 rename {website => websites/kibo.money}/packages/solid-signals/2024-11-08/types/core/constants.d.ts (100%)
 rename {website => websites/kibo.money}/packages/solid-signals/2024-11-08/types/core/core.d.ts (100%)
 rename {website => websites/kibo.money}/packages/solid-signals/2024-11-08/types/core/effect.d.ts (100%)
 rename {website => websites/kibo.money}/packages/solid-signals/2024-11-08/types/core/error.d.ts (100%)
 rename {website => websites/kibo.money}/packages/solid-signals/2024-11-08/types/core/flags.d.ts (100%)
 rename {website => websites/kibo.money}/packages/solid-signals/2024-11-08/types/core/index.d.ts (100%)
 rename {website => websites/kibo.money}/packages/solid-signals/2024-11-08/types/core/owner.d.ts (100%)
 rename {website => websites/kibo.money}/packages/solid-signals/2024-11-08/types/core/scheduler.d.ts (100%)
 rename {website => websites/kibo.money}/packages/solid-signals/2024-11-08/types/index.d.ts (100%)
 rename {website => websites/kibo.money}/packages/solid-signals/2024-11-08/types/map.d.ts (100%)
 rename {website => websites/kibo.money}/packages/solid-signals/2024-11-08/types/signals.d.ts (100%)
 rename {website => websites/kibo.money}/packages/solid-signals/2024-11-08/types/store/index.d.ts (100%)
 rename {website => websites/kibo.money}/packages/solid-signals/2024-11-08/types/store/store.d.ts (100%)
 rename {website => websites/kibo.money}/packages/solid-signals/2024-11-08/types/utils.d.ts (100%)
 rename {website => websites/kibo.money}/packages/solid-signals/README.md (100%)
 rename {website => websites/kibo.money}/packages/solid-signals/types.d.ts (100%)
 rename {website => websites/kibo.money}/packages/solid-signals/wrapper.js (100%)
 rename {website => websites/kibo.money}/packages/ufuzzy/README.md (100%)
 rename {website => websites/kibo.money}/packages/ufuzzy/v1.0.14/script.js (100%)
 rename {website => websites/kibo.money}/packages/ufuzzy/v1.0.14/types.d.ts (100%)
 rename {website => websites/kibo.money}/robots.txt (100%)
 rename {website => websites/kibo.money}/scripts/chart.js (100%)
 rename {website => websites/kibo.money}/scripts/live-price.js (100%)
 rename {website => websites/kibo.money}/scripts/main.js (100%)
 rename {website => websites/kibo.money}/scripts/moscow-time.js (100%)
 rename {website => websites/kibo.money}/scripts/options.js (100%)
 rename {website => websites/kibo.money}/scripts/service-worker.js (100%)
 rename {website => websites/kibo.money}/scripts/simulation.js (100%)
 rename {website => websites/kibo.money}/scripts/types/self.d.ts (100%)
 rename {website => websites/kibo.money}/styles/chart.css (100%)
 rename {website => websites/kibo.money}/styles/live-price.css (100%)
 rename {website => websites/kibo.money}/styles/moscow-time.css (100%)
 rename {website => websites/kibo.money}/styles/simulation.css (100%)
 rename {website => websites/kibo.money}/tsconfig.json (100%)

diff --git a/Cargo.lock b/Cargo.lock
index afe2b6896..29e6d4886 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -131,12 +131,6 @@ dependencies = [
  "zstd-safe",
 ]
 
-[[package]]
-name = "atomic-waker"
-version = "1.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
-
 [[package]]
 name = "autocfg"
 version = "1.4.0"
@@ -228,12 +222,6 @@ version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
 
-[[package]]
-name = "base64"
-version = "0.22.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
-
 [[package]]
 name = "base64-simd"
 version = "0.8.0"
@@ -252,17 +240,16 @@ checksum = "d965446196e3b7decd44aa7ee49e31d630118f90ef12f97900f262eb915c951d"
 
 [[package]]
 name = "berver"
-version = "0.6.0"
+version = "0.1.0"
 dependencies = [
  "axum",
- "bindex",
+ "bindexer",
  "bomputer",
+ "cl0g",
  "color-eyre",
  "derive_deref",
  "jiff",
- "logger",
  "oxc",
- "reqwest",
  "serde",
  "serde_json",
  "storable_vec",
@@ -271,17 +258,17 @@ dependencies = [
 ]
 
 [[package]]
-name = "bindex"
+name = "bindexer"
 version = "0.1.0"
 dependencies = [
  "bitcoin",
  "biter",
+ "cl0g",
  "color-eyre",
  "derive_deref",
- "exit",
  "fjall",
+ "hodor",
  "jiff",
- "logger",
  "rapidhash",
  "rayon",
  "rlimit",
@@ -371,7 +358,7 @@ dependencies = [
 
 [[package]]
 name = "biter"
-version = "0.2.2"
+version = "0.2.3"
 dependencies = [
  "bitcoin",
  "bitcoincore-rpc",
@@ -388,30 +375,34 @@ version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36"
 
+[[package]]
+name = "bli"
+version = "0.1.0"
+
 [[package]]
 name = "bomputer"
 version = "0.1.0"
 dependencies = [
- "bindex",
+ "bindexer",
  "biter",
- "brice",
+ "bricer",
  "color-eyre",
  "derive_deref",
- "exit",
  "fjall",
+ "hodor",
  "storable_vec",
  "zerocopy 0.8.18",
 ]
 
 [[package]]
-name = "brice"
+name = "bricer"
 version = "0.1.0"
 dependencies = [
- "bindex",
+ "bindexer",
+ "cl0g",
  "color-eyre",
  "derive_deref",
  "jiff",
- "logger",
  "minreq",
  "serde",
  "serde_json",
@@ -499,6 +490,16 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
 
+[[package]]
+name = "cl0g"
+version = "0.1.0"
+dependencies = [
+ "color-eyre",
+ "env_logger",
+ "jiff",
+ "log",
+]
+
 [[package]]
 name = "color-eyre"
 version = "0.6.3"
@@ -552,22 +553,6 @@ version = "0.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ea0095f6103c2a8b44acd6fd15960c801dafebf02e21940360833e0673f48ba7"
 
-[[package]]
-name = "core-foundation"
-version = "0.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
-[[package]]
-name = "core-foundation-sys"
-version = "0.8.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
-
 [[package]]
 name = "cow-utils"
 version = "0.1.3"
@@ -684,17 +669,6 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "displaydoc"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.98",
-]
-
 [[package]]
 name = "double-ended-peekable"
 version = "0.1.0"
@@ -707,15 +681,6 @@ version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
 
-[[package]]
-name = "encoding_rs"
-version = "0.8.35"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3"
-dependencies = [
- "cfg-if",
-]
-
 [[package]]
 name = "enum_dispatch"
 version = "0.3.13"
@@ -767,14 +732,6 @@ dependencies = [
  "windows-sys 0.59.0",
 ]
 
-[[package]]
-name = "exit"
-version = "0.1.0"
-dependencies = [
- "ctrlc",
- "logger",
-]
-
 [[package]]
 name = "eyre"
 version = "0.6.12"
@@ -830,21 +787,6 @@ version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
-[[package]]
-name = "foreign-types"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
-dependencies = [
- "foreign-types-shared",
-]
-
-[[package]]
-name = "foreign-types-shared"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
-
 [[package]]
 name = "form_urlencoded"
 version = "1.2.1"
@@ -861,7 +803,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
 dependencies = [
  "futures-core",
- "futures-sink",
 ]
 
 [[package]]
@@ -870,12 +811,6 @@ version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
 
-[[package]]
-name = "futures-io"
-version = "0.3.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
-
 [[package]]
 name = "futures-sink"
 version = "0.3.31"
@@ -895,13 +830,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
 dependencies = [
  "futures-core",
- "futures-io",
- "futures-sink",
  "futures-task",
- "memchr",
  "pin-project-lite",
  "pin-utils",
- "slab",
 ]
 
 [[package]]
@@ -939,25 +870,6 @@ version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "17e2ac29387b1aa07a1e448f7bb4f35b500787971e965b02842b900afa5c8f6f"
 
-[[package]]
-name = "h2"
-version = "0.4.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5017294ff4bb30944501348f6f8e42e6ad28f42c8bbef7a74029aff064a4e3c2"
-dependencies = [
- "atomic-waker",
- "bytes",
- "fnv",
- "futures-core",
- "futures-sink",
- "http",
- "indexmap",
- "slab",
- "tokio",
- "tokio-util",
- "tracing",
-]
-
 [[package]]
 name = "hashbrown"
 version = "0.14.5"
@@ -988,6 +900,14 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3011d1213f159867b13cfd6ac92d2cd5f1345762c63be3554e84092d85a50bbd"
 
+[[package]]
+name = "hodor"
+version = "0.1.0"
+dependencies = [
+ "ctrlc",
+ "log",
+]
+
 [[package]]
 name = "http"
 version = "1.2.0"
@@ -1049,7 +969,6 @@ dependencies = [
  "bytes",
  "futures-channel",
  "futures-util",
- "h2",
  "http",
  "http-body",
  "httparse",
@@ -1058,40 +977,6 @@ dependencies = [
  "pin-project-lite",
  "smallvec",
  "tokio",
- "want",
-]
-
-[[package]]
-name = "hyper-rustls"
-version = "0.27.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d191583f3da1305256f22463b9bb0471acad48a4e534a5218b9963e9c1f59b2"
-dependencies = [
- "futures-util",
- "http",
- "hyper",
- "hyper-util",
- "rustls 0.23.23",
- "rustls-pki-types",
- "tokio",
- "tokio-rustls",
- "tower-service",
-]
-
-[[package]]
-name = "hyper-tls"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"
-dependencies = [
- "bytes",
- "http-body-util",
- "hyper",
- "hyper-util",
- "native-tls",
- "tokio",
- "tokio-native-tls",
- "tower-service",
 ]
 
 [[package]]
@@ -1101,155 +986,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4"
 dependencies = [
  "bytes",
- "futures-channel",
  "futures-util",
  "http",
  "http-body",
  "hyper",
  "pin-project-lite",
- "socket2",
  "tokio",
  "tower-service",
- "tracing",
-]
-
-[[package]]
-name = "icu_collections"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
-dependencies = [
- "displaydoc",
- "yoke",
- "zerofrom",
- "zerovec",
-]
-
-[[package]]
-name = "icu_locid"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
-dependencies = [
- "displaydoc",
- "litemap",
- "tinystr",
- "writeable",
- "zerovec",
-]
-
-[[package]]
-name = "icu_locid_transform"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
-dependencies = [
- "displaydoc",
- "icu_locid",
- "icu_locid_transform_data",
- "icu_provider",
- "tinystr",
- "zerovec",
-]
-
-[[package]]
-name = "icu_locid_transform_data"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e"
-
-[[package]]
-name = "icu_normalizer"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
-dependencies = [
- "displaydoc",
- "icu_collections",
- "icu_normalizer_data",
- "icu_properties",
- "icu_provider",
- "smallvec",
- "utf16_iter",
- "utf8_iter",
- "write16",
- "zerovec",
-]
-
-[[package]]
-name = "icu_normalizer_data"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
-
-[[package]]
-name = "icu_properties"
-version = "1.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5"
-dependencies = [
- "displaydoc",
- "icu_collections",
- "icu_locid_transform",
- "icu_properties_data",
- "icu_provider",
- "tinystr",
- "zerovec",
-]
-
-[[package]]
-name = "icu_properties_data"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
-
-[[package]]
-name = "icu_provider"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
-dependencies = [
- "displaydoc",
- "icu_locid",
- "icu_provider_macros",
- "stable_deref_trait",
- "tinystr",
- "writeable",
- "yoke",
- "zerofrom",
- "zerovec",
-]
-
-[[package]]
-name = "icu_provider_macros"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.98",
-]
-
-[[package]]
-name = "idna"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
-dependencies = [
- "idna_adapter",
- "smallvec",
- "utf8_iter",
-]
-
-[[package]]
-name = "idna_adapter"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71"
-dependencies = [
- "icu_normalizer",
- "icu_properties",
 ]
 
 [[package]]
@@ -1277,12 +1020,6 @@ dependencies = [
  "compare",
 ]
 
-[[package]]
-name = "ipnet"
-version = "2.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130"
-
 [[package]]
 name = "is_terminal_polyfill"
 version = "1.70.1"
@@ -1342,23 +1079,13 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "js-sys"
-version = "0.3.77"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f"
-dependencies = [
- "once_cell",
- "wasm-bindgen",
-]
-
 [[package]]
 name = "jsonrpc"
 version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3662a38d341d77efecb73caf01420cfa5aa63c0253fd7bc05289ef9f6616e1bf"
 dependencies = [
- "base64 0.13.1",
+ "base64",
  "minreq",
  "serde",
  "serde_json",
@@ -1382,12 +1109,6 @@ version = "0.4.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
 
-[[package]]
-name = "litemap"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104"
-
 [[package]]
 name = "lock_api"
 version = "0.4.12"
@@ -1404,16 +1125,6 @@ version = "0.4.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f"
 
-[[package]]
-name = "logger"
-version = "0.1.0"
-dependencies = [
- "color-eyre",
- "env_logger",
- "jiff",
- "log",
-]
-
 [[package]]
 name = "lsm-tree"
 version = "2.6.3"
@@ -1497,8 +1208,8 @@ checksum = "da0c420feb01b9fb5061f8c8f452534361dd783756dcf38ec45191ce55e7a161"
 dependencies = [
  "log",
  "once_cell",
- "rustls 0.21.12",
- "rustls-webpki 0.101.7",
+ "rustls",
+ "rustls-webpki",
  "serde",
  "serde_json",
  "webpki-roots",
@@ -1515,23 +1226,6 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
-[[package]]
-name = "native-tls"
-version = "0.2.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dab59f8e050d5df8e4dd87d9206fb6f65a483e20ac9fda365ade4fab353196c"
-dependencies = [
- "libc",
- "log",
- "openssl",
- "openssl-probe",
- "openssl-sys",
- "schannel",
- "security-framework",
- "security-framework-sys",
- "tempfile",
-]
-
 [[package]]
 name = "nix"
 version = "0.29.0"
@@ -1593,50 +1287,6 @@ version = "1.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e"
 
-[[package]]
-name = "openssl"
-version = "0.10.71"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e14130c6a98cd258fdcb0fb6d744152343ff729cbfcb28c656a9d12b999fbcd"
-dependencies = [
- "bitflags",
- "cfg-if",
- "foreign-types",
- "libc",
- "once_cell",
- "openssl-macros",
- "openssl-sys",
-]
-
-[[package]]
-name = "openssl-macros"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.98",
-]
-
-[[package]]
-name = "openssl-probe"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
-
-[[package]]
-name = "openssl-sys"
-version = "0.9.106"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bb61ea9811cc39e3c2069f40b8b8e2e70d8569b361f879786cc7ed48b777cdd"
-dependencies = [
- "cc",
- "libc",
- "pkg-config",
- "vcpkg",
-]
-
 [[package]]
 name = "outref"
 version = "0.5.2"
@@ -2249,51 +1899,6 @@ version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
-[[package]]
-name = "reqwest"
-version = "0.12.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43e734407157c3c2034e0258f5e4473ddb361b1e85f95a66690d67264d7cd1da"
-dependencies = [
- "base64 0.22.1",
- "bytes",
- "encoding_rs",
- "futures-channel",
- "futures-core",
- "futures-util",
- "h2",
- "http",
- "http-body",
- "http-body-util",
- "hyper",
- "hyper-rustls",
- "hyper-tls",
- "hyper-util",
- "ipnet",
- "js-sys",
- "log",
- "mime",
- "native-tls",
- "once_cell",
- "percent-encoding",
- "pin-project-lite",
- "rustls-pemfile",
- "serde",
- "serde_json",
- "serde_urlencoded",
- "sync_wrapper",
- "system-configuration",
- "tokio",
- "tokio-native-tls",
- "tower",
- "tower-service",
- "url",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
- "windows-registry",
-]
-
 [[package]]
 name = "ring"
 version = "0.17.9"
@@ -2360,38 +1965,10 @@ checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e"
 dependencies = [
  "log",
  "ring",
- "rustls-webpki 0.101.7",
+ "rustls-webpki",
  "sct",
 ]
 
-[[package]]
-name = "rustls"
-version = "0.23.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47796c98c480fce5406ef69d1c76378375492c3b0a0de587be0c1d9feb12f395"
-dependencies = [
- "once_cell",
- "rustls-pki-types",
- "rustls-webpki 0.102.8",
- "subtle",
- "zeroize",
-]
-
-[[package]]
-name = "rustls-pemfile"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50"
-dependencies = [
- "rustls-pki-types",
-]
-
-[[package]]
-name = "rustls-pki-types"
-version = "1.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "917ce264624a4b4db1c364dcc35bfca9ded014d0a958cd47ad3e960e988ea51c"
-
 [[package]]
 name = "rustls-webpki"
 version = "0.101.7"
@@ -2402,17 +1979,6 @@ dependencies = [
  "untrusted",
 ]
 
-[[package]]
-name = "rustls-webpki"
-version = "0.102.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9"
-dependencies = [
- "ring",
- "rustls-pki-types",
- "untrusted",
-]
-
 [[package]]
 name = "rustversion"
 version = "1.0.19"
@@ -2431,15 +1997,6 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd29631678d6fb0903b69223673e122c32e9ae559d0960a38d574695ebc0ea15"
 
-[[package]]
-name = "schannel"
-version = "0.1.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d"
-dependencies = [
- "windows-sys 0.59.0",
-]
-
 [[package]]
 name = "scopeguard"
 version = "1.2.0"
@@ -2477,29 +2034,6 @@ dependencies = [
  "cc",
 ]
 
-[[package]]
-name = "security-framework"
-version = "2.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
-dependencies = [
- "bitflags",
- "core-foundation",
- "core-foundation-sys",
- "libc",
- "security-framework-sys",
-]
-
-[[package]]
-name = "security-framework-sys"
-version = "2.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
 [[package]]
 name = "self_cell"
 version = "1.1.0"
@@ -2611,15 +2145,6 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d"
 
-[[package]]
-name = "slab"
-version = "0.4.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
-dependencies = [
- "autocfg",
-]
-
 [[package]]
 name = "smallvec"
 version = "1.14.0"
@@ -2642,12 +2167,6 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
-[[package]]
-name = "stable_deref_trait"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
-
 [[package]]
 name = "static_assertions"
 version = "1.1.0"
@@ -2662,7 +2181,7 @@ checksum = "33ae9eec00137a8eed469fb4148acd9fc6ac8c3f9b110f52cd34698c8b5bfa0e"
 
 [[package]]
 name = "storable_vec"
-version = "0.1.2"
+version = "0.1.3"
 dependencies = [
  "memmap2",
  "rayon",
@@ -2677,12 +2196,6 @@ version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d08889ec5408683408db66ad89e0e1f93dff55c73a4ccc71c427d5b277ee47e6"
 
-[[package]]
-name = "subtle"
-version = "2.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
-
 [[package]]
 name = "syn"
 version = "1.0.109"
@@ -2710,41 +2223,6 @@ name = "sync_wrapper"
 version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263"
-dependencies = [
- "futures-core",
-]
-
-[[package]]
-name = "synstructure"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.98",
-]
-
-[[package]]
-name = "system-configuration"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b"
-dependencies = [
- "bitflags",
- "core-foundation",
- "system-configuration-sys",
-]
-
-[[package]]
-name = "system-configuration-sys"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
 
 [[package]]
 name = "tempfile"
@@ -2801,16 +2279,6 @@ dependencies = [
  "once_cell",
 ]
 
-[[package]]
-name = "tinystr"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
-dependencies = [
- "displaydoc",
- "zerovec",
-]
-
 [[package]]
 name = "tokio"
 version = "1.43.0"
@@ -2840,26 +2308,6 @@ dependencies = [
  "syn 2.0.98",
 ]
 
-[[package]]
-name = "tokio-native-tls"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2"
-dependencies = [
- "native-tls",
- "tokio",
-]
-
-[[package]]
-name = "tokio-rustls"
-version = "0.26.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f6d0975eaace0cf0fcadee4e4aaa5da15b5c079146f2cffb67c113be122bf37"
-dependencies = [
- "rustls 0.23.23",
- "tokio",
-]
-
 [[package]]
 name = "tokio-util"
 version = "0.7.13"
@@ -2962,12 +2410,6 @@ dependencies = [
  "tracing-core",
 ]
 
-[[package]]
-name = "try-lock"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
-
 [[package]]
 name = "unicode-id-start"
 version = "1.3.1"
@@ -3004,29 +2446,6 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 
-[[package]]
-name = "url"
-version = "2.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60"
-dependencies = [
- "form_urlencoded",
- "idna",
- "percent-encoding",
-]
-
-[[package]]
-name = "utf16_iter"
-version = "1.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
-
-[[package]]
-name = "utf8_iter"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
-
 [[package]]
 name = "utf8parse"
 version = "0.2.2"
@@ -3062,27 +2481,12 @@ version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f54a172d0620933a27a4360d3db3e2ae0dd6cceae9730751a036bbf182c4b23"
 
-[[package]]
-name = "vcpkg"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
-
 [[package]]
 name = "vsimd"
 version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5c3082ca00d5a5ef149bb8b555a72ae84c9c59f7250f013ac822ac2e49b19c64"
 
-[[package]]
-name = "want"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e"
-dependencies = [
- "try-lock",
-]
-
 [[package]]
 name = "wasi"
 version = "0.11.0+wasi-snapshot-preview1"
@@ -3098,123 +2502,12 @@ dependencies = [
  "wit-bindgen-rt",
 ]
 
-[[package]]
-name = "wasm-bindgen"
-version = "0.2.100"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
-dependencies = [
- "cfg-if",
- "once_cell",
- "rustversion",
- "wasm-bindgen-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.100"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
-dependencies = [
- "bumpalo",
- "log",
- "proc-macro2",
- "quote",
- "syn 2.0.98",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-futures"
-version = "0.4.50"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61"
-dependencies = [
- "cfg-if",
- "js-sys",
- "once_cell",
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "wasm-bindgen-macro"
-version = "0.2.100"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
-dependencies = [
- "quote",
- "wasm-bindgen-macro-support",
-]
-
-[[package]]
-name = "wasm-bindgen-macro-support"
-version = "0.2.100"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.98",
- "wasm-bindgen-backend",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-shared"
-version = "0.2.100"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
-dependencies = [
- "unicode-ident",
-]
-
-[[package]]
-name = "web-sys"
-version = "0.3.77"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2"
-dependencies = [
- "js-sys",
- "wasm-bindgen",
-]
-
 [[package]]
 name = "webpki-roots"
 version = "0.25.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1"
 
-[[package]]
-name = "windows-registry"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0"
-dependencies = [
- "windows-result",
- "windows-strings",
- "windows-targets",
-]
-
-[[package]]
-name = "windows-result"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e"
-dependencies = [
- "windows-targets",
-]
-
-[[package]]
-name = "windows-strings"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10"
-dependencies = [
- "windows-result",
- "windows-targets",
-]
-
 [[package]]
 name = "windows-sys"
 version = "0.52.0"
@@ -3306,48 +2599,12 @@ dependencies = [
  "bitflags",
 ]
 
-[[package]]
-name = "write16"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
-
-[[package]]
-name = "writeable"
-version = "0.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
-
 [[package]]
 name = "xxhash-rust"
 version = "0.8.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fdd20c5420375476fbd4394763288da7eb0cc0b8c11deed431a91562af7335d3"
 
-[[package]]
-name = "yoke"
-version = "0.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40"
-dependencies = [
- "serde",
- "stable_deref_trait",
- "yoke-derive",
- "zerofrom",
-]
-
-[[package]]
-name = "yoke-derive"
-version = "0.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.98",
- "synstructure",
-]
-
 [[package]]
 name = "zerocopy"
 version = "0.7.35"
@@ -3389,55 +2646,6 @@ dependencies = [
  "syn 2.0.98",
 ]
 
-[[package]]
-name = "zerofrom"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e"
-dependencies = [
- "zerofrom-derive",
-]
-
-[[package]]
-name = "zerofrom-derive"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.98",
- "synstructure",
-]
-
-[[package]]
-name = "zeroize"
-version = "1.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
-
-[[package]]
-name = "zerovec"
-version = "0.10.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
-dependencies = [
- "yoke",
- "zerofrom",
- "zerovec-derive",
-]
-
-[[package]]
-name = "zerovec-derive"
-version = "0.10.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.98",
-]
-
 [[package]]
 name = "zstd"
 version = "0.13.2"
diff --git a/Cargo.toml b/Cargo.toml
index 09b788e62..5271b3e7f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,8 @@
 [workspace]
 members = [
+    "cli",
     "computer",
-    "exit",
+    "hodor",
     "indexer",
     "iterator",
     "logger",
@@ -10,22 +11,27 @@ members = [
     "storable_vec",
 ]
 resolver = "2"
+package.license = "MIT"
+package.edition = "2021"
 
 [workspace.dependencies]
 bitcoin = { version = "0.32.5", features = ["serde"] }
 color-eyre = "0.6.3"
-computer = { path = "computer", package = "bomputer" }
+computer = { version = "0", path = "computer", package = "bomputer" }
 derive_deref = "1.1.1"
-exit = { path = "exit" }
 fjall = "2.6.3"
-indexer = { path = "indexer", package = "bindex" }
-iterator = { path = "iterator", package = "biter" }
+hodor = { version = "0", path = "hodor" }
+indexer = { version = "0", path = "indexer", package = "bindexer" }
+iterator = { version = "0", path = "iterator", package = "biter" }
 jiff = "0.2.1"
-logger = { path = "logger" }
+log = { version = "0.4.25" }
+logger = { version = "0", path = "logger", package = "cl0g" }
+minreq = { version = "2.13.2", features = ["https", "serde_json"] }
+pricer = { version = "0", path = "pricer", package = "bricer" }
 rayon = "1.10.0"
-pricer = { path = "pricer", package = "brice" }
 serde = { version = "1.0.217", features = ["derive"] }
+serde_bytes = "0.11.15"
 serde_json = { version = "1.0.138", features = ["float_roundtrip"] }
-server = { path = "server", package = "berver" }
-storable_vec = { path = "storable_vec", features = ["json"] }
+server = { version = "0", path = "server", package = "berver" }
+storable_vec = { version = "0", path = "storable_vec", features = ["json"] }
 zerocopy = { version = "0.8.18", features = ["derive"] }
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
new file mode 100644
index 000000000..121e9d824
--- /dev/null
+++ b/cli/Cargo.toml
@@ -0,0 +1,8 @@
+[package]
+name = "bli"
+description = "A command line interface to run berver"
+version = "0.1.0"
+edition = { workspace = true }
+license = { workspace = true }
+
+[dependencies]
diff --git a/cli/src/main.rs b/cli/src/main.rs
new file mode 100644
index 000000000..e7a11a969
--- /dev/null
+++ b/cli/src/main.rs
@@ -0,0 +1,3 @@
+fn main() {
+    println!("Hello, world!");
+}
diff --git a/computer/Cargo.toml b/computer/Cargo.toml
index 2dc009c9d..8c370f919 100644
--- a/computer/Cargo.toml
+++ b/computer/Cargo.toml
@@ -1,16 +1,17 @@
 [package]
 name = "bomputer"
-description = "A Bitcoin dataset computer built on top of brice"
+description = "A Bitcoin dataset computer built on top of bindexer and bricer"
 version = "0.1.0"
-edition = "2021"
+edition = { workspace = true }
+license = { workspace = true }
 
 [dependencies]
-iterator = { workspace = true }
 color-eyre = { workspace = true }
 derive_deref = { workspace = true }
-exit = { workspace = true }
 fjall = { workspace = true }
+hodor = { workspace = true }
 indexer = { workspace = true }
+iterator = { workspace = true }
 pricer = { workspace = true }
 storable_vec = { workspace = true }
 zerocopy = { workspace = true }
diff --git a/computer/src/lib.rs b/computer/src/lib.rs
index 5faa376c4..2eb57481d 100644
--- a/computer/src/lib.rs
+++ b/computer/src/lib.rs
@@ -1,6 +1,6 @@
 use std::path::{Path, PathBuf};
 
-use exit::Exit;
+use hodor::Exit;
 use indexer::Indexer;
 pub use iterator::rpc;
 
diff --git a/computer/src/main.rs b/computer/src/main.rs
index 0f67f21e0..ad810775b 100644
--- a/computer/src/main.rs
+++ b/computer/src/main.rs
@@ -1,7 +1,7 @@
 use std::path::Path;
 
 use bomputer::Computer;
-use exit::Exit;
+use hodor::Exit;
 use indexer::Indexer;
 
 mod structs;
diff --git a/exit/Cargo.toml b/exit/Cargo.toml
deleted file mode 100644
index e5c0e0723..000000000
--- a/exit/Cargo.toml
+++ /dev/null
@@ -1,8 +0,0 @@
-[package]
-name = "exit"
-version = "0.1.0"
-edition = "2021"
-
-[dependencies]
-ctrlc = "3.4.5"
-logger = { workspace = true }
diff --git a/hodor/Cargo.toml b/hodor/Cargo.toml
new file mode 100644
index 000000000..d1697fb1c
--- /dev/null
+++ b/hodor/Cargo.toml
@@ -0,0 +1,10 @@
+[package]
+name = "hodor"
+description = "An exit blocker, can hold the door until a task is completed"
+version = "0.1.0"
+edition = { workspace = true }
+license = { workspace = true }
+
+[dependencies]
+ctrlc = "3.4.5"
+log = { workspace = true }
diff --git a/exit/src/lib.rs b/hodor/src/lib.rs
similarity index 98%
rename from exit/src/lib.rs
rename to hodor/src/lib.rs
index 9daabe4af..726f85642 100644
--- a/exit/src/lib.rs
+++ b/hodor/src/lib.rs
@@ -8,7 +8,7 @@ use std::{
     time::Duration,
 };
 
-use logger::info;
+use log::info;
 
 #[derive(Default, Clone)]
 pub struct Exit {
diff --git a/indexer/Cargo.toml b/indexer/Cargo.toml
index c3e3e2391..6c3325105 100644
--- a/indexer/Cargo.toml
+++ b/indexer/Cargo.toml
@@ -1,15 +1,16 @@
 [package]
-name = "bindex"
+name = "bindexer"
 description = "A bitcoin-core indexer built on top of biter"
 version = "0.1.0"
-edition = "2021"
+edition = { workspace = true }
+license = { workspace = true }
 
 [dependencies]
 bitcoin = { workspace = true }
 color-eyre = { workspace = true }
 derive_deref = { workspace = true }
-exit = { workspace = true }
 fjall = { workspace = true }
+hodor = { workspace = true }
 iterator = { workspace = true }
 jiff = { workspace = true }
 logger = { workspace = true }
@@ -17,6 +18,6 @@ rapidhash = "1.3.0"
 rayon = { workspace = true }
 rlimit = { version = "0.10.2" }
 serde = { workspace = true }
-serde_bytes = "0.11.15"
+serde_bytes = { workspace = true }
 storable_vec = { workspace = true }
 zerocopy = { workspace = true }
diff --git a/indexer/README.md b/indexer/README.md
index 78aff8cf9..74de013f0 100644
--- a/indexer/README.md
+++ b/indexer/README.md
@@ -12,7 +12,9 @@ Vecs are used sparingly instead of stores for multiple reasons:
 
 ## Usage
 
-Peaks at 11-12 GB of RAM
+Storage wise, the expected overhead should be around 30% of the chain itself.
+
+Peaks at 11-13 GB of RAM
 
 ## Outputs
 
diff --git a/indexer/src/lib.rs b/indexer/src/lib.rs
index 8418b57ed..6ecb1bb23 100644
--- a/indexer/src/lib.rs
+++ b/indexer/src/lib.rs
@@ -10,7 +10,7 @@ pub use iterator::*;
 
 use bitcoin::{Transaction, TxIn, TxOut};
 use color_eyre::eyre::{eyre, ContextCompat};
-use exit::Exit;
+use hodor::Exit;
 use logger::info;
 use rayon::prelude::*;
 use storable_vec::CACHED_GETS;
@@ -31,14 +31,14 @@ pub struct Indexer<const MODE: u8> {
 
 impl<const MODE: u8> Indexer<MODE> {
     pub fn import(indexes_dir: &Path) -> color_eyre::Result<Self> {
-        info!("Importing indexes...");
-
+        // info!("Increasing limit of opened files to 210_000...");
         rlimit::setrlimit(
             rlimit::Resource::NOFILE,
             210_000,
             rlimit::getrlimit(rlimit::Resource::NOFILE).unwrap().1,
         )?;
 
+        info!("Importing indexes...");
         let vecs = StorableVecs::import(&indexes_dir.join("vecs"))?;
         let trees = Fjalls::import(&indexes_dir.join("fjall"))?;
 
@@ -47,12 +47,12 @@ impl<const MODE: u8> Indexer<MODE> {
 }
 
 impl Indexer<CACHED_GETS> {
-    pub fn index(&mut self, bitcoin_dir: &Path, rpc: rpc::Client, exit: &Exit) -> color_eyre::Result<()> {
+    pub fn index(&mut self, bitcoin_dir: &Path, rpc: &'static rpc::Client, exit: &Exit) -> color_eyre::Result<()> {
         info!("Started indexing...");
 
         let check_collisions = true;
 
-        let starting_indexes = Indexes::try_from((&mut self.vecs, &self.trees, &rpc)).unwrap_or_else(|_| {
+        let starting_indexes = Indexes::try_from((&mut self.vecs, &self.trees, rpc)).unwrap_or_else(|_| {
             let indexes = Indexes::default();
             indexes.push_if_needed(&mut self.vecs).unwrap();
             indexes
diff --git a/indexer/src/main.rs b/indexer/src/main.rs
index 562711a7a..b44c36880 100644
--- a/indexer/src/main.rs
+++ b/indexer/src/main.rs
@@ -1,8 +1,9 @@
-use std::path::Path;
+use std::{path::Path, thread::sleep, time::Duration};
 
-use bindex::Indexer;
-use exit::Exit;
+use bindexer::{rpc::RpcApi, Indexer};
+use hodor::Exit;
 use iterator::rpc;
+use logger::info;
 use storable_vec::CACHED_GETS;
 
 fn main() -> color_eyre::Result<()> {
@@ -11,19 +12,29 @@ fn main() -> color_eyre::Result<()> {
     logger::init_log(None);
 
     let data_dir = Path::new("../../bitcoin");
-    let rpc = rpc::Client::new(
+    let rpc = Box::leak(Box::new(rpc::Client::new(
         "http://localhost:8332",
         rpc::Auth::CookieFile(Path::new(data_dir).join(".cookie")),
-    )?;
+    )?));
     let exit = Exit::new();
 
-    let i = std::time::Instant::now();
+    loop {
+        let block_count = rpc.get_blockchain_info().unwrap().blocks as usize;
 
-    let mut indexer: Indexer<CACHED_GETS> = Indexer::import(Path::new("../_outputs/indexes"))?;
+        info!("{block_count} blocks found.");
 
-    indexer.index(data_dir, rpc, &exit)?;
+        let i = std::time::Instant::now();
 
-    dbg!(i.elapsed());
+        let mut indexer: Indexer<CACHED_GETS> = Indexer::import(Path::new("../_outputs/indexes"))?;
 
-    Ok(())
+        indexer.index(data_dir, rpc, &exit)?;
+
+        dbg!(i.elapsed());
+
+        info!("Waiting for a new block...");
+
+        while block_count == rpc.get_blockchain_info().unwrap().blocks as usize {
+            sleep(Duration::from_secs(1))
+        }
+    }
 }
diff --git a/iterator/Cargo.toml b/iterator/Cargo.toml
index ef207a643..81c42ef2a 100644
--- a/iterator/Cargo.toml
+++ b/iterator/Cargo.toml
@@ -1,18 +1,18 @@
 [package]
 name = "biter"
 description = "A very fast Bitcoin block iterator built on top of bitcoin-rust"
-version = "0.2.2"
-license = "MIT"
+version = "0.2.3"
 repository = "https://github.com/kibo-money/kibo/tree/main/src/crates/biter"
 keywords = ["bitcoin", "block", "iterator"]
 categories = ["cryptography::cryptocurrencies", "encoding"]
-edition = "2021"
+edition = { workspace = true }
+license = { workspace = true }
 
 [dependencies]
 bitcoin = { workspace = true }
 rayon = { workspace = true }
 crossbeam = { version = "0.8.4", features = ["crossbeam-channel"] }
-serde = { version = "1.0.217", features = ["derive"] }
-serde_json = "1.0.138"
+serde = { workspace = true }
+serde_json = { workspace = true }
 derive_deref = { workspace = true }
 bitcoincore-rpc = "0.19.0"
diff --git a/iterator/README.md b/iterator/README.md
index 57bee26a6..d66ae4cc8 100644
--- a/iterator/README.md
+++ b/iterator/README.md
@@ -9,43 +9,7 @@ The element returned by the iterator is a tuple which includes the:
 
 ## Example
 
-```rust
-use std::path::Path;
-
-use bitcoincore_rpc::{Auth, Client};
-
-fn main() {
-    let i = std::time::Instant::now();
-
-    // Path to the Bitcoin data directory
-    let data_dir = "../../bitcoin";
-
-    // Inclusive starting height of the blocks received, `None` for 0
-    let start = Some(850_000);
-
-    // Inclusive ending height of the blocks received, `None` for the last one
-    let end = None;
-
-    // RPC client to filter out forks
-    let url = "http://localhost:8332";
-    let cookie = Path::new(data_dir).join(".cookie");
-    let auth = Auth::CookieFile(cookie);
-    let rpc = Client::new(url, auth).unwrap();
-
-    if cookie.is_file() {
-        Ok()
-
-    // Create channel receiver then iterate over the blocks
-    biter::new(data_dir, start, end, rpc)
-        .iter()
-        .for_each(|(height, _block, hash)| {
-            println!("{height}: {hash}");
-        });
-
-    dbg!(i.elapsed());
-}
-
-```
+`src/main.rs`
 
 ## Requirements
 
diff --git a/iterator/src/blk_index_to_blk_recap.rs b/iterator/src/blk_index_to_blk_recap.rs
index 5a105bfca..9aaf1b950 100644
--- a/iterator/src/blk_index_to_blk_recap.rs
+++ b/iterator/src/blk_index_to_blk_recap.rs
@@ -32,6 +32,8 @@ impl BlkIndexToBlkRecap {
             }
         };
 
+        // dbg!(&tree);
+
         let mut this = Self {
             path,
             tree,
@@ -43,7 +45,9 @@ impl BlkIndexToBlkRecap {
         this
     }
 
-    pub fn clean_outdated(&mut self, blocks_dir: &BlkIndexToBlkPath) {
+    fn clean_outdated(&mut self, blocks_dir: &BlkIndexToBlkPath) {
+        self.tree.pop_last();
+
         let mut unprocessed_keys = self.tree.keys().copied().collect::<BTreeSet<_>>();
 
         blocks_dir.iter().for_each(|(blk_index, blk_path)| {
@@ -59,22 +63,15 @@ impl BlkIndexToBlkRecap {
             self.tree.remove(&blk_index);
         });
 
-        while self.tree.last_entry().map(|last| *last.key()).is_some_and(|key| {
-            if key >= self.tree.len() {
-                self.tree.pop_last();
-                true
-            } else {
-                false
-            }
-        }) {}
-
         self.last_safe_height = self.tree.values().map(|recap| recap.height()).max();
     }
 
-    pub fn get_start_recap(&self, start: Option<usize>) -> Option<(usize, BlkRecap)> {
+    pub fn get_start_recap(&mut self, start: Option<usize>) -> Option<(usize, BlkRecap)> {
         if let Some(start) = start {
             let (last_key, last_value) = self.tree.last_key_value()?;
 
+            dbg!((last_key, last_value));
+
             if last_value.height() < start {
                 return Some((*last_key, *last_value));
             } else if let Some((blk_index, _)) =
@@ -82,7 +79,7 @@ impl BlkIndexToBlkRecap {
             {
                 if *blk_index != 0 {
                     // Temporary fix, need to rethink the whole thing
-                    let blk_index = (*blk_index).checked_sub(3).unwrap_or_default();
+                    let blk_index = (*blk_index).checked_sub(1).unwrap_or_default();
                     return Some((blk_index, *self.tree.get(&blk_index).unwrap()));
                 }
             }
diff --git a/iterator/src/blk_metadata.rs b/iterator/src/blk_metadata.rs
index d9322a8ab..a4d2b6131 100644
--- a/iterator/src/blk_metadata.rs
+++ b/iterator/src/blk_metadata.rs
@@ -2,7 +2,7 @@ use std::path::PathBuf;
 
 use crate::path_to_modified_time;
 
-#[derive(Clone, Copy)]
+#[derive(Debug, Clone, Copy)]
 pub struct BlkMetadata {
     pub index: usize,
     pub modified_time: u64,
diff --git a/iterator/src/blk_metadata_and_block.rs b/iterator/src/blk_metadata_and_block.rs
index 1cff5e055..8b5bb288b 100644
--- a/iterator/src/blk_metadata_and_block.rs
+++ b/iterator/src/blk_metadata_and_block.rs
@@ -2,6 +2,7 @@ use bitcoin::Block;
 
 use crate::BlkMetadata;
 
+#[derive(Debug)]
 pub struct BlkMetadataAndBlock {
     pub blk_metadata: BlkMetadata,
     pub block: Block,
@@ -9,9 +10,6 @@ pub struct BlkMetadataAndBlock {
 
 impl BlkMetadataAndBlock {
     pub fn new(blk_metadata: BlkMetadata, block: Block) -> Self {
-        Self {
-            blk_metadata,
-            block,
-        }
+        Self { blk_metadata, block }
     }
 }
diff --git a/iterator/src/blk_recap.rs b/iterator/src/blk_recap.rs
index 26e35daa9..f1a7f9cb9 100644
--- a/iterator/src/blk_recap.rs
+++ b/iterator/src/blk_recap.rs
@@ -30,6 +30,9 @@ impl BlkRecap {
     }
 
     pub fn has_different_modified_time(&self, blk_path: &PathBuf) -> bool {
+        if self.modified_time != path_to_modified_time(blk_path) {
+            dbg!(self.modified_time, path_to_modified_time(blk_path));
+        }
         self.modified_time != path_to_modified_time(blk_path)
     }
 
diff --git a/iterator/src/lib.rs b/iterator/src/lib.rs
index f76ef2a50..01f0433e9 100644
--- a/iterator/src/lib.rs
+++ b/iterator/src/lib.rs
@@ -36,11 +36,6 @@ pub const NUMBER_OF_UNSAFE_BLOCKS: usize = 1000;
 const MAGIC_BYTES: [u8; 4] = [249, 190, 180, 217];
 const BOUND_CAP: usize = 210;
 
-enum BlockState {
-    Raw(Vec<u8>),
-    Decoded(Block),
-}
-
 ///
 /// Returns a crossbeam channel receiver that receives `(usize, Block, BlockHash)` tuples (with `usize` being the height) in sequential order.
 ///
@@ -82,7 +77,7 @@ pub fn new(
     data_dir: &Path,
     start: Option<usize>,
     end: Option<usize>,
-    rpc: bitcoincore_rpc::Client,
+    rpc: &'static bitcoincore_rpc::Client,
 ) -> Receiver<(usize, Block, BlockHash)> {
     let (send_block_reader, recv_block_reader) = bounded(BOUND_CAP);
     let (send_block, recv_block) = bounded(BOUND_CAP);
@@ -225,6 +220,8 @@ pub fn new(
                               tuple: BlkMetadataAndBlock| {
             let mut tuple = Some(tuple);
 
+            println!("{} {} {}", recent_hashes.len(), recent_chain.len(), future_blocks.len(),);
+
             while let Some(tuple) = tuple.take().or_else(|| future_blocks.remove(prev_hash)) {
                 let hash = tuple.block.block_hash();
 
@@ -306,3 +303,8 @@ pub fn new(
 
     recv_height_block_hash
 }
+
+enum BlockState {
+    Raw(Vec<u8>),
+    Decoded(Block),
+}
diff --git a/iterator/src/main.rs b/iterator/src/main.rs
index f0a0b4e8a..1a7ff466c 100644
--- a/iterator/src/main.rs
+++ b/iterator/src/main.rs
@@ -6,12 +6,15 @@ fn main() {
     let i = std::time::Instant::now();
 
     let data_dir = Path::new("../../bitcoin");
-    let url = "http://localhost:8332";
-    let cookie = Path::new(data_dir).join(".cookie");
-    let auth = Auth::CookieFile(cookie);
-    let rpc = Client::new(url, auth).unwrap();
+    let rpc = Box::leak(Box::new(
+        Client::new(
+            "http://localhost:8332",
+            Auth::CookieFile(Path::new(data_dir).join(".cookie")),
+        )
+        .unwrap(),
+    ));
 
-    let start = None;
+    let start = Some(460_001);
     let end = None;
 
     biter::new(data_dir, start, end, rpc)
diff --git a/logger/Cargo.toml b/logger/Cargo.toml
index b0c1e7465..d73da97f4 100644
--- a/logger/Cargo.toml
+++ b/logger/Cargo.toml
@@ -1,10 +1,12 @@
 [package]
-name = "logger"
+name = "cl0g"
+description = "A clean logger"
 version = "0.1.0"
-edition = "2021"
+edition = { workspace = true }
+license = { workspace = true }
 
 [dependencies]
 color-eyre = { workspace = true }
 env_logger = "0.11.6"
 jiff = { workspace = true }
-log = { version = "0.4.25" }
+log = { workspace = true }
diff --git a/logger/src/main.rs b/logger/src/main.rs
index f67ba6d6b..bb874d4b5 100644
--- a/logger/src/main.rs
+++ b/logger/src/main.rs
@@ -1,5 +1,5 @@
+use cl0g::init_log;
 use log::info;
-use logger::init_log;
 
 fn main() {
     init_log(None);
diff --git a/pricer/Cargo.toml b/pricer/Cargo.toml
index a031fa4a2..6eb27ee7c 100644
--- a/pricer/Cargo.toml
+++ b/pricer/Cargo.toml
@@ -1,8 +1,9 @@
 [package]
-name = "brice"
-description = "A bitcoin price fetcher built on top of bindex"
+name = "bricer"
+description = "A bitcoin price fetcher built on top of bindexer"
 version = "0.1.0"
-edition = "2021"
+edition = { workspace = true }
+license = { workspace = true }
 
 [dependencies]
 color-eyre = { workspace = true }
@@ -10,7 +11,7 @@ derive_deref = { workspace = true }
 indexer = { workspace = true }
 jiff = { workspace = true }
 logger = { workspace = true }
-minreq = { version = "2.13.2", features = ["https", "serde_json"] }
+minreq = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 storable_vec = { workspace = true }
diff --git a/pricer/src/main.rs b/pricer/src/main.rs
index eaa6b12d5..ca945e8da 100644
--- a/pricer/src/main.rs
+++ b/pricer/src/main.rs
@@ -1,4 +1,4 @@
-use brice::{Binance, Kibo, Kraken};
+use bricer::{Binance, Kibo, Kraken};
 use indexer::Height;
 use serde_json::Value;
 
diff --git a/server/Cargo.toml b/server/Cargo.toml
index e3e66f7ea..e01994f06 100644
--- a/server/Cargo.toml
+++ b/server/Cargo.toml
@@ -1,7 +1,9 @@
 [package]
 name = "berver"
-version = "0.6.0"
-edition = "2021"
+description = "A Bitcoin data server built on top of bindexer, bricer and bomputer"
+version = "0.1.0"
+edition = { workspace = true }
+license = { workspace = true }
 
 [dependencies]
 axum = "0.8.1"
@@ -12,7 +14,6 @@ indexer = { workspace = true }
 jiff = { workspace = true }
 logger = { workspace = true }
 oxc = { version = "0.51.0", features = ["codegen", "minifier"] }
-reqwest = { version = "0.12.12", features = ["blocking", "json"] }
 serde = { workspace = true }
 serde_json = { workspace = true }
 storable_vec = { workspace = true }
diff --git a/server/src/api/vecs/mod.rs b/server/src/api/vecs/mod.rs
index c728b55ef..baa3200db 100644
--- a/server/src/api/vecs/mod.rs
+++ b/server/src/api/vecs/mod.rs
@@ -2,12 +2,11 @@ use std::time::Instant;
 
 use axum::{
     extract::{Query, State},
-    http::{HeaderMap, Uri},
+    http::{HeaderMap, StatusCode, Uri},
     response::{IntoResponse, Response},
     Json,
 };
 use color_eyre::eyre::eyre;
-use reqwest::StatusCode;
 use serde_json::Value;
 
 use crate::{log_result, traits::HeaderMapExtended};
diff --git a/server/src/files/file.rs b/server/src/files/file.rs
index 3cf3a543a..4018e1776 100644
--- a/server/src/files/file.rs
+++ b/server/src/files/file.rs
@@ -7,11 +7,10 @@ use std::{
 use axum::{
     body::Body,
     extract,
-    http::HeaderMap,
+    http::{HeaderMap, StatusCode},
     response::{IntoResponse, Response},
 };
 use logger::{error, info};
-use reqwest::StatusCode;
 
 use crate::{
     log_result,
diff --git a/server/src/lib.rs b/server/src/lib.rs
index d7a8a6f00..66c6448ba 100644
--- a/server/src/lib.rs
+++ b/server/src/lib.rs
@@ -1,13 +1,12 @@
 use std::time::Instant;
 
 use api::{ApiRoutes, VecIdToIndexToVec};
-use axum::{routing::get, serve, Json, Router};
+use axum::{http::StatusCode, routing::get, serve, Json, Router};
 use color_eyre::owo_colors::OwoColorize;
 use computer::Computer;
 use files::FilesRoutes;
 use indexer::Indexer;
 use logger::{error, info};
-use reqwest::StatusCode;
 use storable_vec::STATELESS;
 use tokio::net::TcpListener;
 use tower_http::compression::CompressionLayer;
@@ -23,7 +22,7 @@ pub struct AppState {
     computer: &'static Computer<STATELESS>,
 }
 
-pub const WEBSITE_DEV_PATH: &str = "../website/";
+pub const WEBSITE_DEV_PATH: &str = "../websites/kibo.money/";
 
 pub async fn main(indexer: Indexer<STATELESS>, computer: Computer<STATELESS>) -> color_eyre::Result<()> {
     let indexer = Box::leak(Box::new(indexer));
diff --git a/server/src/traits/header_map.rs b/server/src/traits/header_map.rs
index 6001d415e..596a22cbc 100644
--- a/server/src/traits/header_map.rs
+++ b/server/src/traits/header_map.rs
@@ -1,9 +1,11 @@
 use std::{path::Path, time};
 
-use axum::http::{header, HeaderMap};
+use axum::http::{
+    header::{self, HOST, IF_MODIFIED_SINCE},
+    HeaderMap,
+};
 use jiff::{civil::DateTime, fmt::strtime, tz::TimeZone, Timestamp};
 use logger::info;
-use reqwest::header::{HOST, IF_MODIFIED_SINCE};
 
 const STALE_IF_ERROR: u64 = 30_000_000; // 1 Year ish
 const MODIFIED_SINCE_FORMAT: &str = "%a, %d %b %Y %H:%M:%S GMT";
diff --git a/server/src/traits/response.rs b/server/src/traits/response.rs
index 78f7c3bfc..9fef0a496 100644
--- a/server/src/traits/response.rs
+++ b/server/src/traits/response.rs
@@ -1,5 +1,8 @@
-use axum::{body::Body, http::Response, response::IntoResponse};
-use reqwest::StatusCode;
+use axum::{
+    body::Body,
+    http::{Response, StatusCode},
+    response::IntoResponse,
+};
 
 use super::header_map::HeaderMapExtended;
 
diff --git a/storable_vec/Cargo.toml b/storable_vec/Cargo.toml
index dcef7c1c4..9ce44172e 100644
--- a/storable_vec/Cargo.toml
+++ b/storable_vec/Cargo.toml
@@ -1,11 +1,11 @@
 [package]
 name = "storable_vec"
 description = "A very small, fast, efficient and simple storable Vec"
-version = "0.1.2"
-license = "MIT"
+version = "0.1.3"
 keywords = ["vec", "disk", "data"]
 categories = ["database"]
-edition = "2021"
+edition = { workspace = true }
+license = { workspace = true }
 
 [features]
 json = ["dep:serde", "dep:serde_json"]
diff --git a/storable_vec/src/traits/any.rs b/storable_vec/src/traits/any.rs
index 2fa3e40fa..d35982042 100644
--- a/storable_vec/src/traits/any.rs
+++ b/storable_vec/src/traits/any.rs
@@ -43,6 +43,7 @@ pub trait AnyJsonStorableVec: AnyStorableVec {
     fn collect_range_values(&self, from: Option<i64>, to: Option<i64>) -> Result<Vec<serde_json::Value>>;
 }
 
+#[cfg(feature = "json")]
 impl<I, T, const MODE: u8> AnyJsonStorableVec for StorableVec<I, T, MODE>
 where
     I: StoredIndex,
diff --git a/website/assets/fonts/satoshi/2024-09/font.var.woff2 b/websites/kibo.money/assets/fonts/satoshi/2024-09/font.var.woff2
similarity index 100%
rename from website/assets/fonts/satoshi/2024-09/font.var.woff2
rename to websites/kibo.money/assets/fonts/satoshi/2024-09/font.var.woff2
diff --git a/website/assets/fonts/satoshi/FFL.txt b/websites/kibo.money/assets/fonts/satoshi/FFL.txt
similarity index 100%
rename from website/assets/fonts/satoshi/FFL.txt
rename to websites/kibo.money/assets/fonts/satoshi/FFL.txt
diff --git a/website/assets/pdfs/block/2022-report.pdf b/websites/kibo.money/assets/pdfs/block/2022-report.pdf
similarity index 100%
rename from website/assets/pdfs/block/2022-report.pdf
rename to websites/kibo.money/assets/pdfs/block/2022-report.pdf
diff --git a/website/assets/pdfs/braiins/building-bitcoin-in-rust.pdf b/websites/kibo.money/assets/pdfs/braiins/building-bitcoin-in-rust.pdf
similarity index 100%
rename from website/assets/pdfs/braiins/building-bitcoin-in-rust.pdf
rename to websites/kibo.money/assets/pdfs/braiins/building-bitcoin-in-rust.pdf
diff --git a/website/assets/pdfs/glassnode/cointime-economics.pdf b/websites/kibo.money/assets/pdfs/glassnode/cointime-economics.pdf
similarity index 100%
rename from website/assets/pdfs/glassnode/cointime-economics.pdf
rename to websites/kibo.money/assets/pdfs/glassnode/cointime-economics.pdf
diff --git a/website/assets/pdfs/multi-author/bcap_v1.0.pdf b/websites/kibo.money/assets/pdfs/multi-author/bcap_v1.0.pdf
similarity index 100%
rename from website/assets/pdfs/multi-author/bcap_v1.0.pdf
rename to websites/kibo.money/assets/pdfs/multi-author/bcap_v1.0.pdf
diff --git a/website/assets/pdfs/nakamoto-project/understanding-bitcoin-adoption-in-the-united-states.pdf b/websites/kibo.money/assets/pdfs/nakamoto-project/understanding-bitcoin-adoption-in-the-united-states.pdf
similarity index 100%
rename from website/assets/pdfs/nakamoto-project/understanding-bitcoin-adoption-in-the-united-states.pdf
rename to websites/kibo.money/assets/pdfs/nakamoto-project/understanding-bitcoin-adoption-in-the-united-states.pdf
diff --git a/website/assets/pdfs/nydig/protection-under-first-amendment.pdf b/websites/kibo.money/assets/pdfs/nydig/protection-under-first-amendment.pdf
similarity index 100%
rename from website/assets/pdfs/nydig/protection-under-first-amendment.pdf
rename to websites/kibo.money/assets/pdfs/nydig/protection-under-first-amendment.pdf
diff --git a/website/assets/pdfs/satoshi-nakamoto/whitepaper.pdf b/websites/kibo.money/assets/pdfs/satoshi-nakamoto/whitepaper.pdf
similarity index 100%
rename from website/assets/pdfs/satoshi-nakamoto/whitepaper.pdf
rename to websites/kibo.money/assets/pdfs/satoshi-nakamoto/whitepaper.pdf
diff --git a/website/assets/pdfs/square/2021-bitcoin-clean-energy-initiative.pdf b/websites/kibo.money/assets/pdfs/square/2021-bitcoin-clean-energy-initiative.pdf
similarity index 100%
rename from website/assets/pdfs/square/2021-bitcoin-clean-energy-initiative.pdf
rename to websites/kibo.money/assets/pdfs/square/2021-bitcoin-clean-energy-initiative.pdf
diff --git a/website/assets/pwa/2024-11-20_09-41-25/apple-icon-180.png b/websites/kibo.money/assets/pwa/2024-11-20_09-41-25/apple-icon-180.png
similarity index 100%
rename from website/assets/pwa/2024-11-20_09-41-25/apple-icon-180.png
rename to websites/kibo.money/assets/pwa/2024-11-20_09-41-25/apple-icon-180.png
diff --git a/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1125-2436.jpg b/websites/kibo.money/assets/pwa/2024-11-20_09-41-25/apple-splash-1125-2436.jpg
similarity index 100%
rename from website/assets/pwa/2024-11-20_09-41-25/apple-splash-1125-2436.jpg
rename to websites/kibo.money/assets/pwa/2024-11-20_09-41-25/apple-splash-1125-2436.jpg
diff --git a/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1136-640.jpg b/websites/kibo.money/assets/pwa/2024-11-20_09-41-25/apple-splash-1136-640.jpg
similarity index 100%
rename from website/assets/pwa/2024-11-20_09-41-25/apple-splash-1136-640.jpg
rename to websites/kibo.money/assets/pwa/2024-11-20_09-41-25/apple-splash-1136-640.jpg
diff --git a/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1170-2532.jpg b/websites/kibo.money/assets/pwa/2024-11-20_09-41-25/apple-splash-1170-2532.jpg
similarity index 100%
rename from website/assets/pwa/2024-11-20_09-41-25/apple-splash-1170-2532.jpg
rename to websites/kibo.money/assets/pwa/2024-11-20_09-41-25/apple-splash-1170-2532.jpg
diff --git a/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1179-2556.jpg b/websites/kibo.money/assets/pwa/2024-11-20_09-41-25/apple-splash-1179-2556.jpg
similarity index 100%
rename from website/assets/pwa/2024-11-20_09-41-25/apple-splash-1179-2556.jpg
rename to websites/kibo.money/assets/pwa/2024-11-20_09-41-25/apple-splash-1179-2556.jpg
diff --git a/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1242-2208.jpg b/websites/kibo.money/assets/pwa/2024-11-20_09-41-25/apple-splash-1242-2208.jpg
similarity index 100%
rename from website/assets/pwa/2024-11-20_09-41-25/apple-splash-1242-2208.jpg
rename to websites/kibo.money/assets/pwa/2024-11-20_09-41-25/apple-splash-1242-2208.jpg
diff --git a/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1242-2688.jpg b/websites/kibo.money/assets/pwa/2024-11-20_09-41-25/apple-splash-1242-2688.jpg
similarity index 100%
rename from website/assets/pwa/2024-11-20_09-41-25/apple-splash-1242-2688.jpg
rename to websites/kibo.money/assets/pwa/2024-11-20_09-41-25/apple-splash-1242-2688.jpg
diff --git a/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1284-2778.jpg b/websites/kibo.money/assets/pwa/2024-11-20_09-41-25/apple-splash-1284-2778.jpg
similarity index 100%
rename from website/assets/pwa/2024-11-20_09-41-25/apple-splash-1284-2778.jpg
rename to websites/kibo.money/assets/pwa/2024-11-20_09-41-25/apple-splash-1284-2778.jpg
diff --git a/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1290-2796.jpg b/websites/kibo.money/assets/pwa/2024-11-20_09-41-25/apple-splash-1290-2796.jpg
similarity index 100%
rename from website/assets/pwa/2024-11-20_09-41-25/apple-splash-1290-2796.jpg
rename to websites/kibo.money/assets/pwa/2024-11-20_09-41-25/apple-splash-1290-2796.jpg
diff --git a/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1334-750.jpg b/websites/kibo.money/assets/pwa/2024-11-20_09-41-25/apple-splash-1334-750.jpg
similarity index 100%
rename from website/assets/pwa/2024-11-20_09-41-25/apple-splash-1334-750.jpg
rename to websites/kibo.money/assets/pwa/2024-11-20_09-41-25/apple-splash-1334-750.jpg
diff --git a/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1488-2266.jpg b/websites/kibo.money/assets/pwa/2024-11-20_09-41-25/apple-splash-1488-2266.jpg
similarity index 100%
rename from website/assets/pwa/2024-11-20_09-41-25/apple-splash-1488-2266.jpg
rename to websites/kibo.money/assets/pwa/2024-11-20_09-41-25/apple-splash-1488-2266.jpg
diff --git a/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1536-2048.jpg b/websites/kibo.money/assets/pwa/2024-11-20_09-41-25/apple-splash-1536-2048.jpg
similarity index 100%
rename from website/assets/pwa/2024-11-20_09-41-25/apple-splash-1536-2048.jpg
rename to websites/kibo.money/assets/pwa/2024-11-20_09-41-25/apple-splash-1536-2048.jpg
diff --git a/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1620-2160.jpg b/websites/kibo.money/assets/pwa/2024-11-20_09-41-25/apple-splash-1620-2160.jpg
similarity index 100%
rename from website/assets/pwa/2024-11-20_09-41-25/apple-splash-1620-2160.jpg
rename to websites/kibo.money/assets/pwa/2024-11-20_09-41-25/apple-splash-1620-2160.jpg
diff --git a/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1640-2360.jpg b/websites/kibo.money/assets/pwa/2024-11-20_09-41-25/apple-splash-1640-2360.jpg
similarity index 100%
rename from website/assets/pwa/2024-11-20_09-41-25/apple-splash-1640-2360.jpg
rename to websites/kibo.money/assets/pwa/2024-11-20_09-41-25/apple-splash-1640-2360.jpg
diff --git a/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1668-2224.jpg b/websites/kibo.money/assets/pwa/2024-11-20_09-41-25/apple-splash-1668-2224.jpg
similarity index 100%
rename from website/assets/pwa/2024-11-20_09-41-25/apple-splash-1668-2224.jpg
rename to websites/kibo.money/assets/pwa/2024-11-20_09-41-25/apple-splash-1668-2224.jpg
diff --git a/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1668-2388.jpg b/websites/kibo.money/assets/pwa/2024-11-20_09-41-25/apple-splash-1668-2388.jpg
similarity index 100%
rename from website/assets/pwa/2024-11-20_09-41-25/apple-splash-1668-2388.jpg
rename to websites/kibo.money/assets/pwa/2024-11-20_09-41-25/apple-splash-1668-2388.jpg
diff --git a/website/assets/pwa/2024-11-20_09-41-25/apple-splash-1792-828.jpg b/websites/kibo.money/assets/pwa/2024-11-20_09-41-25/apple-splash-1792-828.jpg
similarity index 100%
rename from website/assets/pwa/2024-11-20_09-41-25/apple-splash-1792-828.jpg
rename to websites/kibo.money/assets/pwa/2024-11-20_09-41-25/apple-splash-1792-828.jpg
diff --git a/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2048-1536.jpg b/websites/kibo.money/assets/pwa/2024-11-20_09-41-25/apple-splash-2048-1536.jpg
similarity index 100%
rename from website/assets/pwa/2024-11-20_09-41-25/apple-splash-2048-1536.jpg
rename to websites/kibo.money/assets/pwa/2024-11-20_09-41-25/apple-splash-2048-1536.jpg
diff --git a/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2048-2732.jpg b/websites/kibo.money/assets/pwa/2024-11-20_09-41-25/apple-splash-2048-2732.jpg
similarity index 100%
rename from website/assets/pwa/2024-11-20_09-41-25/apple-splash-2048-2732.jpg
rename to websites/kibo.money/assets/pwa/2024-11-20_09-41-25/apple-splash-2048-2732.jpg
diff --git a/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2160-1620.jpg b/websites/kibo.money/assets/pwa/2024-11-20_09-41-25/apple-splash-2160-1620.jpg
similarity index 100%
rename from website/assets/pwa/2024-11-20_09-41-25/apple-splash-2160-1620.jpg
rename to websites/kibo.money/assets/pwa/2024-11-20_09-41-25/apple-splash-2160-1620.jpg
diff --git a/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2208-1242.jpg b/websites/kibo.money/assets/pwa/2024-11-20_09-41-25/apple-splash-2208-1242.jpg
similarity index 100%
rename from website/assets/pwa/2024-11-20_09-41-25/apple-splash-2208-1242.jpg
rename to websites/kibo.money/assets/pwa/2024-11-20_09-41-25/apple-splash-2208-1242.jpg
diff --git a/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2224-1668.jpg b/websites/kibo.money/assets/pwa/2024-11-20_09-41-25/apple-splash-2224-1668.jpg
similarity index 100%
rename from website/assets/pwa/2024-11-20_09-41-25/apple-splash-2224-1668.jpg
rename to websites/kibo.money/assets/pwa/2024-11-20_09-41-25/apple-splash-2224-1668.jpg
diff --git a/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2266-1488.jpg b/websites/kibo.money/assets/pwa/2024-11-20_09-41-25/apple-splash-2266-1488.jpg
similarity index 100%
rename from website/assets/pwa/2024-11-20_09-41-25/apple-splash-2266-1488.jpg
rename to websites/kibo.money/assets/pwa/2024-11-20_09-41-25/apple-splash-2266-1488.jpg
diff --git a/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2360-1640.jpg b/websites/kibo.money/assets/pwa/2024-11-20_09-41-25/apple-splash-2360-1640.jpg
similarity index 100%
rename from website/assets/pwa/2024-11-20_09-41-25/apple-splash-2360-1640.jpg
rename to websites/kibo.money/assets/pwa/2024-11-20_09-41-25/apple-splash-2360-1640.jpg
diff --git a/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2388-1668.jpg b/websites/kibo.money/assets/pwa/2024-11-20_09-41-25/apple-splash-2388-1668.jpg
similarity index 100%
rename from website/assets/pwa/2024-11-20_09-41-25/apple-splash-2388-1668.jpg
rename to websites/kibo.money/assets/pwa/2024-11-20_09-41-25/apple-splash-2388-1668.jpg
diff --git a/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2436-1125.jpg b/websites/kibo.money/assets/pwa/2024-11-20_09-41-25/apple-splash-2436-1125.jpg
similarity index 100%
rename from website/assets/pwa/2024-11-20_09-41-25/apple-splash-2436-1125.jpg
rename to websites/kibo.money/assets/pwa/2024-11-20_09-41-25/apple-splash-2436-1125.jpg
diff --git a/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2532-1170.jpg b/websites/kibo.money/assets/pwa/2024-11-20_09-41-25/apple-splash-2532-1170.jpg
similarity index 100%
rename from website/assets/pwa/2024-11-20_09-41-25/apple-splash-2532-1170.jpg
rename to websites/kibo.money/assets/pwa/2024-11-20_09-41-25/apple-splash-2532-1170.jpg
diff --git a/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2556-1179.jpg b/websites/kibo.money/assets/pwa/2024-11-20_09-41-25/apple-splash-2556-1179.jpg
similarity index 100%
rename from website/assets/pwa/2024-11-20_09-41-25/apple-splash-2556-1179.jpg
rename to websites/kibo.money/assets/pwa/2024-11-20_09-41-25/apple-splash-2556-1179.jpg
diff --git a/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2688-1242.jpg b/websites/kibo.money/assets/pwa/2024-11-20_09-41-25/apple-splash-2688-1242.jpg
similarity index 100%
rename from website/assets/pwa/2024-11-20_09-41-25/apple-splash-2688-1242.jpg
rename to websites/kibo.money/assets/pwa/2024-11-20_09-41-25/apple-splash-2688-1242.jpg
diff --git a/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2732-2048.jpg b/websites/kibo.money/assets/pwa/2024-11-20_09-41-25/apple-splash-2732-2048.jpg
similarity index 100%
rename from website/assets/pwa/2024-11-20_09-41-25/apple-splash-2732-2048.jpg
rename to websites/kibo.money/assets/pwa/2024-11-20_09-41-25/apple-splash-2732-2048.jpg
diff --git a/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2778-1284.jpg b/websites/kibo.money/assets/pwa/2024-11-20_09-41-25/apple-splash-2778-1284.jpg
similarity index 100%
rename from website/assets/pwa/2024-11-20_09-41-25/apple-splash-2778-1284.jpg
rename to websites/kibo.money/assets/pwa/2024-11-20_09-41-25/apple-splash-2778-1284.jpg
diff --git a/website/assets/pwa/2024-11-20_09-41-25/apple-splash-2796-1290.jpg b/websites/kibo.money/assets/pwa/2024-11-20_09-41-25/apple-splash-2796-1290.jpg
similarity index 100%
rename from website/assets/pwa/2024-11-20_09-41-25/apple-splash-2796-1290.jpg
rename to websites/kibo.money/assets/pwa/2024-11-20_09-41-25/apple-splash-2796-1290.jpg
diff --git a/website/assets/pwa/2024-11-20_09-41-25/apple-splash-640-1136.jpg b/websites/kibo.money/assets/pwa/2024-11-20_09-41-25/apple-splash-640-1136.jpg
similarity index 100%
rename from website/assets/pwa/2024-11-20_09-41-25/apple-splash-640-1136.jpg
rename to websites/kibo.money/assets/pwa/2024-11-20_09-41-25/apple-splash-640-1136.jpg
diff --git a/website/assets/pwa/2024-11-20_09-41-25/apple-splash-750-1334.jpg b/websites/kibo.money/assets/pwa/2024-11-20_09-41-25/apple-splash-750-1334.jpg
similarity index 100%
rename from website/assets/pwa/2024-11-20_09-41-25/apple-splash-750-1334.jpg
rename to websites/kibo.money/assets/pwa/2024-11-20_09-41-25/apple-splash-750-1334.jpg
diff --git a/website/assets/pwa/2024-11-20_09-41-25/apple-splash-828-1792.jpg b/websites/kibo.money/assets/pwa/2024-11-20_09-41-25/apple-splash-828-1792.jpg
similarity index 100%
rename from website/assets/pwa/2024-11-20_09-41-25/apple-splash-828-1792.jpg
rename to websites/kibo.money/assets/pwa/2024-11-20_09-41-25/apple-splash-828-1792.jpg
diff --git a/website/assets/pwa/2024-11-20_09-41-25/favicon-196.png b/websites/kibo.money/assets/pwa/2024-11-20_09-41-25/favicon-196.png
similarity index 100%
rename from website/assets/pwa/2024-11-20_09-41-25/favicon-196.png
rename to websites/kibo.money/assets/pwa/2024-11-20_09-41-25/favicon-196.png
diff --git a/website/assets/pwa/2024-11-20_09-41-25/index.html b/websites/kibo.money/assets/pwa/2024-11-20_09-41-25/index.html
similarity index 100%
rename from website/assets/pwa/2024-11-20_09-41-25/index.html
rename to websites/kibo.money/assets/pwa/2024-11-20_09-41-25/index.html
diff --git a/website/assets/pwa/2024-11-20_09-41-25/manifest-icon-192.maskable.png b/websites/kibo.money/assets/pwa/2024-11-20_09-41-25/manifest-icon-192.maskable.png
similarity index 100%
rename from website/assets/pwa/2024-11-20_09-41-25/manifest-icon-192.maskable.png
rename to websites/kibo.money/assets/pwa/2024-11-20_09-41-25/manifest-icon-192.maskable.png
diff --git a/website/assets/pwa/2024-11-20_09-41-25/manifest-icon-512.maskable.png b/websites/kibo.money/assets/pwa/2024-11-20_09-41-25/manifest-icon-512.maskable.png
similarity index 100%
rename from website/assets/pwa/2024-11-20_09-41-25/manifest-icon-512.maskable.png
rename to websites/kibo.money/assets/pwa/2024-11-20_09-41-25/manifest-icon-512.maskable.png
diff --git a/website/assets/pwa/index.html b/websites/kibo.money/assets/pwa/index.html
similarity index 100%
rename from website/assets/pwa/index.html
rename to websites/kibo.money/assets/pwa/index.html
diff --git a/website/generate-icons.sh b/websites/kibo.money/generate-icons.sh
similarity index 100%
rename from website/generate-icons.sh
rename to websites/kibo.money/generate-icons.sh
diff --git a/website/index.html b/websites/kibo.money/index.html
similarity index 100%
rename from website/index.html
rename to websites/kibo.money/index.html
diff --git a/website/jsconfig.json b/websites/kibo.money/jsconfig.json
similarity index 100%
rename from website/jsconfig.json
rename to websites/kibo.money/jsconfig.json
diff --git a/website/manifest.webmanifest b/websites/kibo.money/manifest.webmanifest
similarity index 100%
rename from website/manifest.webmanifest
rename to websites/kibo.money/manifest.webmanifest
diff --git a/website/misc/tailwindTo550.js b/websites/kibo.money/misc/tailwindTo550.js
similarity index 100%
rename from website/misc/tailwindTo550.js
rename to websites/kibo.money/misc/tailwindTo550.js
diff --git a/website/packages/lean-qr/README.md b/websites/kibo.money/packages/lean-qr/README.md
similarity index 100%
rename from website/packages/lean-qr/README.md
rename to websites/kibo.money/packages/lean-qr/README.md
diff --git a/website/packages/lean-qr/v2.3.4/script.js b/websites/kibo.money/packages/lean-qr/v2.3.4/script.js
similarity index 100%
rename from website/packages/lean-qr/v2.3.4/script.js
rename to websites/kibo.money/packages/lean-qr/v2.3.4/script.js
diff --git a/website/packages/lean-qr/v2.3.4/types.d.ts b/websites/kibo.money/packages/lean-qr/v2.3.4/types.d.ts
similarity index 100%
rename from website/packages/lean-qr/v2.3.4/types.d.ts
rename to websites/kibo.money/packages/lean-qr/v2.3.4/types.d.ts
diff --git a/website/packages/lightweight-charts/NOTICE.md b/websites/kibo.money/packages/lightweight-charts/NOTICE.md
similarity index 100%
rename from website/packages/lightweight-charts/NOTICE.md
rename to websites/kibo.money/packages/lightweight-charts/NOTICE.md
diff --git a/website/packages/lightweight-charts/README.md b/websites/kibo.money/packages/lightweight-charts/README.md
similarity index 100%
rename from website/packages/lightweight-charts/README.md
rename to websites/kibo.money/packages/lightweight-charts/README.md
diff --git a/website/packages/lightweight-charts/types.d.ts b/websites/kibo.money/packages/lightweight-charts/types.d.ts
similarity index 100%
rename from website/packages/lightweight-charts/types.d.ts
rename to websites/kibo.money/packages/lightweight-charts/types.d.ts
diff --git a/website/packages/lightweight-charts/v4.2.0/script.js b/websites/kibo.money/packages/lightweight-charts/v4.2.0/script.js
similarity index 100%
rename from website/packages/lightweight-charts/v4.2.0/script.js
rename to websites/kibo.money/packages/lightweight-charts/v4.2.0/script.js
diff --git a/website/packages/lightweight-charts/v4.2.0/types.d.ts b/websites/kibo.money/packages/lightweight-charts/v4.2.0/types.d.ts
similarity index 100%
rename from website/packages/lightweight-charts/v4.2.0/types.d.ts
rename to websites/kibo.money/packages/lightweight-charts/v4.2.0/types.d.ts
diff --git a/website/packages/lightweight-charts/v4.2.2/script.js b/websites/kibo.money/packages/lightweight-charts/v4.2.2/script.js
similarity index 100%
rename from website/packages/lightweight-charts/v4.2.2/script.js
rename to websites/kibo.money/packages/lightweight-charts/v4.2.2/script.js
diff --git a/website/packages/lightweight-charts/v4.2.2/types.d.ts b/websites/kibo.money/packages/lightweight-charts/v4.2.2/types.d.ts
similarity index 100%
rename from website/packages/lightweight-charts/v4.2.2/types.d.ts
rename to websites/kibo.money/packages/lightweight-charts/v4.2.2/types.d.ts
diff --git a/website/packages/lightweight-charts/wrapper.js b/websites/kibo.money/packages/lightweight-charts/wrapper.js
similarity index 100%
rename from website/packages/lightweight-charts/wrapper.js
rename to websites/kibo.money/packages/lightweight-charts/wrapper.js
diff --git a/website/packages/solid-signals/2024-11-02/script.js b/websites/kibo.money/packages/solid-signals/2024-11-02/script.js
similarity index 100%
rename from website/packages/solid-signals/2024-11-02/script.js
rename to websites/kibo.money/packages/solid-signals/2024-11-02/script.js
diff --git a/website/packages/solid-signals/2024-11-02/types/core/constants.d.ts b/websites/kibo.money/packages/solid-signals/2024-11-02/types/core/constants.d.ts
similarity index 100%
rename from website/packages/solid-signals/2024-11-02/types/core/constants.d.ts
rename to websites/kibo.money/packages/solid-signals/2024-11-02/types/core/constants.d.ts
diff --git a/website/packages/solid-signals/2024-11-02/types/core/core.d.ts b/websites/kibo.money/packages/solid-signals/2024-11-02/types/core/core.d.ts
similarity index 100%
rename from website/packages/solid-signals/2024-11-02/types/core/core.d.ts
rename to websites/kibo.money/packages/solid-signals/2024-11-02/types/core/core.d.ts
diff --git a/website/packages/solid-signals/2024-11-02/types/core/effect.d.ts b/websites/kibo.money/packages/solid-signals/2024-11-02/types/core/effect.d.ts
similarity index 100%
rename from website/packages/solid-signals/2024-11-02/types/core/effect.d.ts
rename to websites/kibo.money/packages/solid-signals/2024-11-02/types/core/effect.d.ts
diff --git a/website/packages/solid-signals/2024-11-02/types/core/error.d.ts b/websites/kibo.money/packages/solid-signals/2024-11-02/types/core/error.d.ts
similarity index 100%
rename from website/packages/solid-signals/2024-11-02/types/core/error.d.ts
rename to websites/kibo.money/packages/solid-signals/2024-11-02/types/core/error.d.ts
diff --git a/website/packages/solid-signals/2024-11-02/types/core/flags.d.ts b/websites/kibo.money/packages/solid-signals/2024-11-02/types/core/flags.d.ts
similarity index 100%
rename from website/packages/solid-signals/2024-11-02/types/core/flags.d.ts
rename to websites/kibo.money/packages/solid-signals/2024-11-02/types/core/flags.d.ts
diff --git a/website/packages/solid-signals/2024-11-02/types/core/index.d.ts b/websites/kibo.money/packages/solid-signals/2024-11-02/types/core/index.d.ts
similarity index 100%
rename from website/packages/solid-signals/2024-11-02/types/core/index.d.ts
rename to websites/kibo.money/packages/solid-signals/2024-11-02/types/core/index.d.ts
diff --git a/website/packages/solid-signals/2024-11-02/types/core/owner.d.ts b/websites/kibo.money/packages/solid-signals/2024-11-02/types/core/owner.d.ts
similarity index 100%
rename from website/packages/solid-signals/2024-11-02/types/core/owner.d.ts
rename to websites/kibo.money/packages/solid-signals/2024-11-02/types/core/owner.d.ts
diff --git a/website/packages/solid-signals/2024-11-02/types/core/scheduler.d.ts b/websites/kibo.money/packages/solid-signals/2024-11-02/types/core/scheduler.d.ts
similarity index 100%
rename from website/packages/solid-signals/2024-11-02/types/core/scheduler.d.ts
rename to websites/kibo.money/packages/solid-signals/2024-11-02/types/core/scheduler.d.ts
diff --git a/website/packages/solid-signals/2024-11-02/types/index.d.ts b/websites/kibo.money/packages/solid-signals/2024-11-02/types/index.d.ts
similarity index 100%
rename from website/packages/solid-signals/2024-11-02/types/index.d.ts
rename to websites/kibo.money/packages/solid-signals/2024-11-02/types/index.d.ts
diff --git a/website/packages/solid-signals/2024-11-02/types/map.d.ts b/websites/kibo.money/packages/solid-signals/2024-11-02/types/map.d.ts
similarity index 100%
rename from website/packages/solid-signals/2024-11-02/types/map.d.ts
rename to websites/kibo.money/packages/solid-signals/2024-11-02/types/map.d.ts
diff --git a/website/packages/solid-signals/2024-11-02/types/signals.d.ts b/websites/kibo.money/packages/solid-signals/2024-11-02/types/signals.d.ts
similarity index 100%
rename from website/packages/solid-signals/2024-11-02/types/signals.d.ts
rename to websites/kibo.money/packages/solid-signals/2024-11-02/types/signals.d.ts
diff --git a/website/packages/solid-signals/2024-11-02/types/store/index.d.ts b/websites/kibo.money/packages/solid-signals/2024-11-02/types/store/index.d.ts
similarity index 100%
rename from website/packages/solid-signals/2024-11-02/types/store/index.d.ts
rename to websites/kibo.money/packages/solid-signals/2024-11-02/types/store/index.d.ts
diff --git a/website/packages/solid-signals/2024-11-02/types/store/store.d.ts b/websites/kibo.money/packages/solid-signals/2024-11-02/types/store/store.d.ts
similarity index 100%
rename from website/packages/solid-signals/2024-11-02/types/store/store.d.ts
rename to websites/kibo.money/packages/solid-signals/2024-11-02/types/store/store.d.ts
diff --git a/website/packages/solid-signals/2024-11-02/types/utils.d.ts b/websites/kibo.money/packages/solid-signals/2024-11-02/types/utils.d.ts
similarity index 100%
rename from website/packages/solid-signals/2024-11-02/types/utils.d.ts
rename to websites/kibo.money/packages/solid-signals/2024-11-02/types/utils.d.ts
diff --git a/website/packages/solid-signals/2024-11-08/script.js b/websites/kibo.money/packages/solid-signals/2024-11-08/script.js
similarity index 100%
rename from website/packages/solid-signals/2024-11-08/script.js
rename to websites/kibo.money/packages/solid-signals/2024-11-08/script.js
diff --git a/website/packages/solid-signals/2024-11-08/types/core/constants.d.ts b/websites/kibo.money/packages/solid-signals/2024-11-08/types/core/constants.d.ts
similarity index 100%
rename from website/packages/solid-signals/2024-11-08/types/core/constants.d.ts
rename to websites/kibo.money/packages/solid-signals/2024-11-08/types/core/constants.d.ts
diff --git a/website/packages/solid-signals/2024-11-08/types/core/core.d.ts b/websites/kibo.money/packages/solid-signals/2024-11-08/types/core/core.d.ts
similarity index 100%
rename from website/packages/solid-signals/2024-11-08/types/core/core.d.ts
rename to websites/kibo.money/packages/solid-signals/2024-11-08/types/core/core.d.ts
diff --git a/website/packages/solid-signals/2024-11-08/types/core/effect.d.ts b/websites/kibo.money/packages/solid-signals/2024-11-08/types/core/effect.d.ts
similarity index 100%
rename from website/packages/solid-signals/2024-11-08/types/core/effect.d.ts
rename to websites/kibo.money/packages/solid-signals/2024-11-08/types/core/effect.d.ts
diff --git a/website/packages/solid-signals/2024-11-08/types/core/error.d.ts b/websites/kibo.money/packages/solid-signals/2024-11-08/types/core/error.d.ts
similarity index 100%
rename from website/packages/solid-signals/2024-11-08/types/core/error.d.ts
rename to websites/kibo.money/packages/solid-signals/2024-11-08/types/core/error.d.ts
diff --git a/website/packages/solid-signals/2024-11-08/types/core/flags.d.ts b/websites/kibo.money/packages/solid-signals/2024-11-08/types/core/flags.d.ts
similarity index 100%
rename from website/packages/solid-signals/2024-11-08/types/core/flags.d.ts
rename to websites/kibo.money/packages/solid-signals/2024-11-08/types/core/flags.d.ts
diff --git a/website/packages/solid-signals/2024-11-08/types/core/index.d.ts b/websites/kibo.money/packages/solid-signals/2024-11-08/types/core/index.d.ts
similarity index 100%
rename from website/packages/solid-signals/2024-11-08/types/core/index.d.ts
rename to websites/kibo.money/packages/solid-signals/2024-11-08/types/core/index.d.ts
diff --git a/website/packages/solid-signals/2024-11-08/types/core/owner.d.ts b/websites/kibo.money/packages/solid-signals/2024-11-08/types/core/owner.d.ts
similarity index 100%
rename from website/packages/solid-signals/2024-11-08/types/core/owner.d.ts
rename to websites/kibo.money/packages/solid-signals/2024-11-08/types/core/owner.d.ts
diff --git a/website/packages/solid-signals/2024-11-08/types/core/scheduler.d.ts b/websites/kibo.money/packages/solid-signals/2024-11-08/types/core/scheduler.d.ts
similarity index 100%
rename from website/packages/solid-signals/2024-11-08/types/core/scheduler.d.ts
rename to websites/kibo.money/packages/solid-signals/2024-11-08/types/core/scheduler.d.ts
diff --git a/website/packages/solid-signals/2024-11-08/types/index.d.ts b/websites/kibo.money/packages/solid-signals/2024-11-08/types/index.d.ts
similarity index 100%
rename from website/packages/solid-signals/2024-11-08/types/index.d.ts
rename to websites/kibo.money/packages/solid-signals/2024-11-08/types/index.d.ts
diff --git a/website/packages/solid-signals/2024-11-08/types/map.d.ts b/websites/kibo.money/packages/solid-signals/2024-11-08/types/map.d.ts
similarity index 100%
rename from website/packages/solid-signals/2024-11-08/types/map.d.ts
rename to websites/kibo.money/packages/solid-signals/2024-11-08/types/map.d.ts
diff --git a/website/packages/solid-signals/2024-11-08/types/signals.d.ts b/websites/kibo.money/packages/solid-signals/2024-11-08/types/signals.d.ts
similarity index 100%
rename from website/packages/solid-signals/2024-11-08/types/signals.d.ts
rename to websites/kibo.money/packages/solid-signals/2024-11-08/types/signals.d.ts
diff --git a/website/packages/solid-signals/2024-11-08/types/store/index.d.ts b/websites/kibo.money/packages/solid-signals/2024-11-08/types/store/index.d.ts
similarity index 100%
rename from website/packages/solid-signals/2024-11-08/types/store/index.d.ts
rename to websites/kibo.money/packages/solid-signals/2024-11-08/types/store/index.d.ts
diff --git a/website/packages/solid-signals/2024-11-08/types/store/store.d.ts b/websites/kibo.money/packages/solid-signals/2024-11-08/types/store/store.d.ts
similarity index 100%
rename from website/packages/solid-signals/2024-11-08/types/store/store.d.ts
rename to websites/kibo.money/packages/solid-signals/2024-11-08/types/store/store.d.ts
diff --git a/website/packages/solid-signals/2024-11-08/types/utils.d.ts b/websites/kibo.money/packages/solid-signals/2024-11-08/types/utils.d.ts
similarity index 100%
rename from website/packages/solid-signals/2024-11-08/types/utils.d.ts
rename to websites/kibo.money/packages/solid-signals/2024-11-08/types/utils.d.ts
diff --git a/website/packages/solid-signals/README.md b/websites/kibo.money/packages/solid-signals/README.md
similarity index 100%
rename from website/packages/solid-signals/README.md
rename to websites/kibo.money/packages/solid-signals/README.md
diff --git a/website/packages/solid-signals/types.d.ts b/websites/kibo.money/packages/solid-signals/types.d.ts
similarity index 100%
rename from website/packages/solid-signals/types.d.ts
rename to websites/kibo.money/packages/solid-signals/types.d.ts
diff --git a/website/packages/solid-signals/wrapper.js b/websites/kibo.money/packages/solid-signals/wrapper.js
similarity index 100%
rename from website/packages/solid-signals/wrapper.js
rename to websites/kibo.money/packages/solid-signals/wrapper.js
diff --git a/website/packages/ufuzzy/README.md b/websites/kibo.money/packages/ufuzzy/README.md
similarity index 100%
rename from website/packages/ufuzzy/README.md
rename to websites/kibo.money/packages/ufuzzy/README.md
diff --git a/website/packages/ufuzzy/v1.0.14/script.js b/websites/kibo.money/packages/ufuzzy/v1.0.14/script.js
similarity index 100%
rename from website/packages/ufuzzy/v1.0.14/script.js
rename to websites/kibo.money/packages/ufuzzy/v1.0.14/script.js
diff --git a/website/packages/ufuzzy/v1.0.14/types.d.ts b/websites/kibo.money/packages/ufuzzy/v1.0.14/types.d.ts
similarity index 100%
rename from website/packages/ufuzzy/v1.0.14/types.d.ts
rename to websites/kibo.money/packages/ufuzzy/v1.0.14/types.d.ts
diff --git a/website/robots.txt b/websites/kibo.money/robots.txt
similarity index 100%
rename from website/robots.txt
rename to websites/kibo.money/robots.txt
diff --git a/website/scripts/chart.js b/websites/kibo.money/scripts/chart.js
similarity index 100%
rename from website/scripts/chart.js
rename to websites/kibo.money/scripts/chart.js
diff --git a/website/scripts/live-price.js b/websites/kibo.money/scripts/live-price.js
similarity index 100%
rename from website/scripts/live-price.js
rename to websites/kibo.money/scripts/live-price.js
diff --git a/website/scripts/main.js b/websites/kibo.money/scripts/main.js
similarity index 100%
rename from website/scripts/main.js
rename to websites/kibo.money/scripts/main.js
diff --git a/website/scripts/moscow-time.js b/websites/kibo.money/scripts/moscow-time.js
similarity index 100%
rename from website/scripts/moscow-time.js
rename to websites/kibo.money/scripts/moscow-time.js
diff --git a/website/scripts/options.js b/websites/kibo.money/scripts/options.js
similarity index 100%
rename from website/scripts/options.js
rename to websites/kibo.money/scripts/options.js
diff --git a/website/scripts/service-worker.js b/websites/kibo.money/scripts/service-worker.js
similarity index 100%
rename from website/scripts/service-worker.js
rename to websites/kibo.money/scripts/service-worker.js
diff --git a/website/scripts/simulation.js b/websites/kibo.money/scripts/simulation.js
similarity index 100%
rename from website/scripts/simulation.js
rename to websites/kibo.money/scripts/simulation.js
diff --git a/website/scripts/types/self.d.ts b/websites/kibo.money/scripts/types/self.d.ts
similarity index 100%
rename from website/scripts/types/self.d.ts
rename to websites/kibo.money/scripts/types/self.d.ts
diff --git a/website/styles/chart.css b/websites/kibo.money/styles/chart.css
similarity index 100%
rename from website/styles/chart.css
rename to websites/kibo.money/styles/chart.css
diff --git a/website/styles/live-price.css b/websites/kibo.money/styles/live-price.css
similarity index 100%
rename from website/styles/live-price.css
rename to websites/kibo.money/styles/live-price.css
diff --git a/website/styles/moscow-time.css b/websites/kibo.money/styles/moscow-time.css
similarity index 100%
rename from website/styles/moscow-time.css
rename to websites/kibo.money/styles/moscow-time.css
diff --git a/website/styles/simulation.css b/websites/kibo.money/styles/simulation.css
similarity index 100%
rename from website/styles/simulation.css
rename to websites/kibo.money/styles/simulation.css
diff --git a/website/tsconfig.json b/websites/kibo.money/tsconfig.json
similarity index 100%
rename from website/tsconfig.json
rename to websites/kibo.money/tsconfig.json

From f0d86f23921547b3ff9c4c73adfe74d213c2afa0 Mon Sep 17 00:00:00 2001
From: nym21 <expat-epochs0i@icloud.com>
Date: Thu, 20 Feb 2025 11:40:26 +0100
Subject: [PATCH 56/63] indexer: moved height to iterator

---
 Cargo.lock                                    |  8 ++-
 Cargo.toml                                    |  5 +-
 indexer/src/lib.rs                            |  3 +-
 indexer/src/storage/fjalls/base.rs            |  3 +-
 indexer/src/storage/storable_vecs/base.rs     |  6 +-
 indexer/src/storage/storable_vecs/mod.rs      | 11 +--
 indexer/src/structs/blockhash.rs              |  7 +-
 indexer/src/structs/indexes.rs                |  6 +-
 indexer/src/structs/locktime.rs               |  3 +-
 indexer/src/structs/mod.rs                    |  2 -
 indexer/src/structs/sats.rs                   |  4 +-
 iterator/Cargo.toml                           |  8 ++-
 iterator/src/blk_index_to_blk_recap.rs        |  8 +--
 iterator/src/blk_recap.rs                     | 12 ++--
 iterator/src/error.rs                         | 35 +++++++++
 .../src/structs => iterator/src}/height.rs    | 72 +++++++++----------
 iterator/src/lib.rs                           | 12 ++--
 iterator/src/main.rs                          |  4 +-
 storable_vec/src/enums/error.rs               |  2 -
 19 files changed, 124 insertions(+), 87 deletions(-)
 create mode 100644 iterator/src/error.rs
 rename {indexer/src/structs => iterator/src}/height.rs (85%)

diff --git a/Cargo.lock b/Cargo.lock
index 29e6d4886..96a8b7669 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -262,7 +262,7 @@ name = "bindexer"
 version = "0.1.0"
 dependencies = [
  "bitcoin",
- "biter",
+ "biterator",
  "cl0g",
  "color-eyre",
  "derive_deref",
@@ -357,16 +357,18 @@ dependencies = [
 ]
 
 [[package]]
-name = "biter"
+name = "biterator"
 version = "0.2.3"
 dependencies = [
  "bitcoin",
  "bitcoincore-rpc",
  "crossbeam",
  "derive_deref",
+ "fjall",
  "rayon",
  "serde",
  "serde_json",
+ "zerocopy 0.8.18",
 ]
 
 [[package]]
@@ -384,7 +386,7 @@ name = "bomputer"
 version = "0.1.0"
 dependencies = [
  "bindexer",
- "biter",
+ "biterator",
  "bricer",
  "color-eyre",
  "derive_deref",
diff --git a/Cargo.toml b/Cargo.toml
index 5271b3e7f..0cf5cc79f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -22,7 +22,10 @@ derive_deref = "1.1.1"
 fjall = "2.6.3"
 hodor = { version = "0", path = "hodor" }
 indexer = { version = "0", path = "indexer", package = "bindexer" }
-iterator = { version = "0", path = "iterator", package = "biter" }
+iterator = { version = "0", path = "iterator", package = "biterator", features = [
+    "fjall",
+    "zerocopy",
+] }
 jiff = "0.2.1"
 log = { version = "0.4.25" }
 logger = { version = "0", path = "logger", package = "cl0g" }
diff --git a/indexer/src/lib.rs b/indexer/src/lib.rs
index 6ecb1bb23..48219356a 100644
--- a/indexer/src/lib.rs
+++ b/indexer/src/lib.rs
@@ -78,12 +78,11 @@ impl Indexer<CACHED_GETS> {
 
         let mut idxs = starting_indexes;
 
-        iterator::new(bitcoin_dir, Some(idxs.height.into()), None, rpc)
+        iterator::new(bitcoin_dir, Some(idxs.height), None, rpc)
             .iter()
             .try_for_each(|(height, block, blockhash)| -> color_eyre::Result<()> {
                 info!("Indexing block {height}...");
 
-                let height = Height::from(height);
                 idxs.height = height;
 
                 let blockhash = BlockHash::from(blockhash);
diff --git a/indexer/src/storage/fjalls/base.rs b/indexer/src/storage/fjalls/base.rs
index 7f75d1af8..9b215b779 100644
--- a/indexer/src/storage/fjalls/base.rs
+++ b/indexer/src/storage/fjalls/base.rs
@@ -8,11 +8,10 @@ use fjall::{
     PartitionCreateOptions, PersistMode, ReadTransaction, Result, Slice, TransactionalKeyspace,
     TransactionalPartitionHandle,
 };
+use iterator::Height;
 use storable_vec::{Value, Version};
 use zerocopy::{Immutable, IntoBytes};
 
-use crate::structs::Height;
-
 use super::StoreMeta;
 
 pub struct Store<Key, Value> {
diff --git a/indexer/src/storage/storable_vecs/base.rs b/indexer/src/storage/storable_vecs/base.rs
index adb76511f..c02b6cd7e 100644
--- a/indexer/src/storage/storable_vecs/base.rs
+++ b/indexer/src/storage/storable_vecs/base.rs
@@ -39,7 +39,7 @@ where
         self.vec.truncate_if_needed(index)
     }
 
-    pub fn height(&self) -> storable_vec::Result<Height> {
+    pub fn height(&self) -> iterator::Result<Height> {
         Height::try_from(self.path_height().as_path())
     }
     fn path_height(&self) -> PathBuf {
@@ -71,7 +71,7 @@ impl<I, T, const MODE: u8> DerefMut for StorableVec<I, T, MODE> {
 }
 
 pub trait AnyStorableVec: Send + Sync {
-    fn height(&self) -> storable_vec::Result<Height>;
+    fn height(&self) -> iterator::Result<Height>;
     fn flush(&mut self, height: Height) -> io::Result<()>;
 }
 
@@ -80,7 +80,7 @@ where
     I: StoredIndex,
     T: StoredType,
 {
-    fn height(&self) -> storable_vec::Result<Height> {
+    fn height(&self) -> iterator::Result<Height> {
         self.height()
     }
 
diff --git a/indexer/src/storage/storable_vecs/mod.rs b/indexer/src/storage/storable_vecs/mod.rs
index 170456860..572303bc6 100644
--- a/indexer/src/storage/storable_vecs/mod.rs
+++ b/indexer/src/storage/storable_vecs/mod.rs
@@ -1,15 +1,16 @@
 use std::{fs, io, path::Path};
 
+use iterator::Height;
 use rayon::prelude::*;
 use storable_vec::{AnyJsonStorableVec, Version, CACHED_GETS};
 
 use crate::{
     structs::{
-        Addressbytes, Addressindex, Addresstype, Addresstypeindex, BlockHash, Emptyindex, Height, LockTime,
-        Multisigindex, Opreturnindex, P2PK33AddressBytes, P2PK33index, P2PK65AddressBytes, P2PK65index,
-        P2PKHAddressBytes, P2PKHindex, P2SHAddressBytes, P2SHindex, P2TRAddressBytes, P2TRindex, P2WPKHAddressBytes,
-        P2WPKHindex, P2WSHAddressBytes, P2WSHindex, Pushonlyindex, Sats, Timestamp, TxVersion, Txid, Txindex,
-        Txinindex, Txoutindex, Unknownindex, Weight,
+        Addressbytes, Addressindex, Addresstype, Addresstypeindex, BlockHash, Emptyindex, LockTime, Multisigindex,
+        Opreturnindex, P2PK33AddressBytes, P2PK33index, P2PK65AddressBytes, P2PK65index, P2PKHAddressBytes, P2PKHindex,
+        P2SHAddressBytes, P2SHindex, P2TRAddressBytes, P2TRindex, P2WPKHAddressBytes, P2WPKHindex, P2WSHAddressBytes,
+        P2WSHindex, Pushonlyindex, Sats, Timestamp, TxVersion, Txid, Txindex, Txinindex, Txoutindex, Unknownindex,
+        Weight,
     },
     Indexes,
 };
diff --git a/indexer/src/structs/blockhash.rs b/indexer/src/structs/blockhash.rs
index 0bb44bd82..f8da62225 100644
--- a/indexer/src/structs/blockhash.rs
+++ b/indexer/src/structs/blockhash.rs
@@ -1,12 +1,13 @@
 use std::mem;
 
 use derive_deref::Deref;
-use iterator::rpc::{Client, RpcApi};
+use iterator::{
+    rpc::{Client, RpcApi},
+    Height,
+};
 use serde::Serialize;
 use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout};
 
-use super::Height;
-
 #[derive(Debug, Deref, Clone, PartialEq, Eq, Immutable, IntoBytes, KnownLayout, FromBytes, Serialize)]
 pub struct BlockHash([u8; 32]);
 
diff --git a/indexer/src/structs/indexes.rs b/indexer/src/structs/indexes.rs
index 2392ca4b5..02539dc06 100644
--- a/indexer/src/structs/indexes.rs
+++ b/indexer/src/structs/indexes.rs
@@ -1,13 +1,13 @@
 use color_eyre::eyre::ContextCompat;
-use iterator::rpc::Client;
 use iterator::NUMBER_OF_UNSAFE_BLOCKS;
+use iterator::{rpc::Client, Height};
 use storable_vec::CACHED_GETS;
 
 use crate::storage::{Fjalls, StorableVecs};
 
 use super::{
-    Addressindex, BlockHash, Emptyindex, Height, Multisigindex, Opreturnindex, P2PK33index, P2PK65index, P2PKHindex,
-    P2SHindex, P2TRindex, P2WPKHindex, P2WSHindex, Pushonlyindex, Txindex, Txinindex, Txoutindex, Unknownindex,
+    Addressindex, BlockHash, Emptyindex, Multisigindex, Opreturnindex, P2PK33index, P2PK65index, P2PKHindex, P2SHindex,
+    P2TRindex, P2WPKHindex, P2WSHindex, Pushonlyindex, Txindex, Txinindex, Txoutindex, Unknownindex,
 };
 
 #[derive(Debug, Default)]
diff --git a/indexer/src/structs/locktime.rs b/indexer/src/structs/locktime.rs
index 58a2ea9f2..c0ba0826f 100644
--- a/indexer/src/structs/locktime.rs
+++ b/indexer/src/structs/locktime.rs
@@ -1,7 +1,8 @@
+use iterator::Height;
 use serde::Serialize;
 use zerocopy::{Immutable, IntoBytes, KnownLayout, TryFromBytes};
 
-use super::{Height, Timestamp};
+use super::Timestamp;
 
 #[derive(Debug, Immutable, Clone, Copy, IntoBytes, KnownLayout, TryFromBytes, Serialize)]
 #[repr(C)]
diff --git a/indexer/src/structs/mod.rs b/indexer/src/structs/mod.rs
index e31c7bffc..9c64bd3f8 100644
--- a/indexer/src/structs/mod.rs
+++ b/indexer/src/structs/mod.rs
@@ -4,7 +4,6 @@ mod addresstype;
 mod addresstypeindex;
 mod blockhash;
 mod compressed;
-mod height;
 mod indexes;
 mod locktime;
 mod sats;
@@ -24,7 +23,6 @@ pub use addresstype::*;
 pub use addresstypeindex::*;
 pub use blockhash::*;
 pub use compressed::*;
-pub use height::*;
 pub use indexes::*;
 pub use locktime::*;
 pub use sats::*;
diff --git a/indexer/src/structs/sats.rs b/indexer/src/structs/sats.rs
index eea28b04f..238e7cc3d 100644
--- a/indexer/src/structs/sats.rs
+++ b/indexer/src/structs/sats.rs
@@ -4,12 +4,10 @@ use std::{
 };
 
 use derive_deref::{Deref, DerefMut};
-use iterator::bitcoin::Amount;
+use iterator::{bitcoin::Amount, Height};
 use serde::Serialize;
 use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout};
 
-use super::Height;
-
 #[derive(
     Debug,
     PartialEq,
diff --git a/iterator/Cargo.toml b/iterator/Cargo.toml
index 81c42ef2a..1b95676f4 100644
--- a/iterator/Cargo.toml
+++ b/iterator/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "biter"
+name = "biterator"
 description = "A very fast Bitcoin block iterator built on top of bitcoin-rust"
 version = "0.2.3"
 repository = "https://github.com/kibo-money/kibo/tree/main/src/crates/biter"
@@ -8,11 +8,17 @@ categories = ["cryptography::cryptocurrencies", "encoding"]
 edition = { workspace = true }
 license = { workspace = true }
 
+[features]
+fjall = ["dep:fjall"]
+zerocopy = ["dep:zerocopy"]
+
 [dependencies]
 bitcoin = { workspace = true }
 rayon = { workspace = true }
 crossbeam = { version = "0.8.4", features = ["crossbeam-channel"] }
+fjall = { workspace = true, optional = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 derive_deref = { workspace = true }
 bitcoincore-rpc = "0.19.0"
+zerocopy = { workspace = true, optional = true }
diff --git a/iterator/src/blk_index_to_blk_recap.rs b/iterator/src/blk_index_to_blk_recap.rs
index 9aaf1b950..a03025a67 100644
--- a/iterator/src/blk_index_to_blk_recap.rs
+++ b/iterator/src/blk_index_to_blk_recap.rs
@@ -6,7 +6,7 @@ use std::{
     path::{Path, PathBuf},
 };
 
-use crate::{blk_recap::BlkRecap, BlkIndexToBlkPath, BlkMetadataAndBlock};
+use crate::{blk_recap::BlkRecap, BlkIndexToBlkPath, BlkMetadataAndBlock, Height};
 
 const TARGET_BLOCKS_PER_MONTH: usize = 144 * 30;
 
@@ -14,7 +14,7 @@ const TARGET_BLOCKS_PER_MONTH: usize = 144 * 30;
 pub struct BlkIndexToBlkRecap {
     path: PathBuf,
     tree: BTreeMap<usize, BlkRecap>,
-    last_safe_height: Option<usize>,
+    last_safe_height: Option<Height>,
 }
 
 impl BlkIndexToBlkRecap {
@@ -66,7 +66,7 @@ impl BlkIndexToBlkRecap {
         self.last_safe_height = self.tree.values().map(|recap| recap.height()).max();
     }
 
-    pub fn get_start_recap(&mut self, start: Option<usize>) -> Option<(usize, BlkRecap)> {
+    pub fn get_start_recap(&mut self, start: Option<Height>) -> Option<(usize, BlkRecap)> {
         if let Some(start) = start {
             let (last_key, last_value) = self.tree.last_key_value()?;
 
@@ -88,7 +88,7 @@ impl BlkIndexToBlkRecap {
         None
     }
 
-    pub fn update(&mut self, blk_metadata_and_block: &BlkMetadataAndBlock, height: usize) {
+    pub fn update(&mut self, blk_metadata_and_block: &BlkMetadataAndBlock, height: Height) {
         let blk_index = blk_metadata_and_block.blk_metadata.index;
 
         if let Some(last_entry) = self.tree.last_entry() {
diff --git a/iterator/src/blk_recap.rs b/iterator/src/blk_recap.rs
index f1a7f9cb9..bad813830 100644
--- a/iterator/src/blk_recap.rs
+++ b/iterator/src/blk_recap.rs
@@ -3,11 +3,11 @@ use std::path::PathBuf;
 use bitcoin::{hashes::Hash, BlockHash};
 use serde::{Deserialize, Serialize};
 
-use crate::{path_to_modified_time, BlkMetadataAndBlock};
+use crate::{path_to_modified_time, BlkMetadataAndBlock, Height};
 
 #[derive(Debug, Clone, Copy, Serialize, Deserialize)]
 pub struct BlkRecap {
-    min_continuous_height: usize,
+    min_continuous_height: Height,
     min_continuous_prev_hash: BlockHash,
     modified_time: u64,
 }
@@ -15,13 +15,13 @@ pub struct BlkRecap {
 impl BlkRecap {
     pub fn first(blk_metadata_and_block: &BlkMetadataAndBlock) -> Self {
         Self {
-            min_continuous_height: 0,
+            min_continuous_height: Height::default(),
             min_continuous_prev_hash: BlockHash::all_zeros(),
             modified_time: blk_metadata_and_block.blk_metadata.modified_time,
         }
     }
 
-    pub fn from(height: usize, blk_metadata_and_block: &BlkMetadataAndBlock) -> Self {
+    pub fn from(height: Height, blk_metadata_and_block: &BlkMetadataAndBlock) -> Self {
         Self {
             min_continuous_height: height,
             min_continuous_prev_hash: blk_metadata_and_block.block.header.prev_blockhash,
@@ -36,11 +36,11 @@ impl BlkRecap {
         self.modified_time != path_to_modified_time(blk_path)
     }
 
-    pub fn is_younger_than(&self, height: usize) -> bool {
+    pub fn is_younger_than(&self, height: Height) -> bool {
         self.min_continuous_height > height
     }
 
-    pub fn height(&self) -> usize {
+    pub fn height(&self) -> Height {
         self.min_continuous_height
     }
 
diff --git a/iterator/src/error.rs b/iterator/src/error.rs
new file mode 100644
index 000000000..0a7562c65
--- /dev/null
+++ b/iterator/src/error.rs
@@ -0,0 +1,35 @@
+use std::{
+    fmt::{self, Debug},
+    io,
+};
+
+pub type Result<T, E = Error> = std::result::Result<T, E>;
+
+#[derive(Debug)]
+pub enum Error {
+    IO(io::Error),
+    ZeroCopyError,
+}
+
+impl From<io::Error> for Error {
+    fn from(value: io::Error) -> Self {
+        Self::IO(value)
+    }
+}
+
+impl<A, B> From<zerocopy::error::SizeError<A, B>> for Error {
+    fn from(_: zerocopy::error::SizeError<A, B>) -> Self {
+        Self::ZeroCopyError
+    }
+}
+
+impl fmt::Display for Error {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        match self {
+            Error::IO(error) => Debug::fmt(&error, f),
+            Error::ZeroCopyError => write!(f, "Zero copy convert error"),
+        }
+    }
+}
+
+impl std::error::Error for Error {}
diff --git a/indexer/src/structs/height.rs b/iterator/src/height.rs
similarity index 85%
rename from indexer/src/structs/height.rs
rename to iterator/src/height.rs
index e19631fd3..8104cb05b 100644
--- a/indexer/src/structs/height.rs
+++ b/iterator/src/height.rs
@@ -1,32 +1,21 @@
 use std::{
-    fmt, fs, io,
+    fmt::{self, Debug},
+    fs, io,
     ops::{Add, AddAssign, Rem, Sub},
     path::Path,
 };
 
 use derive_deref::{Deref, DerefMut};
-use fjall::Slice;
-use iterator::rpc::{self, RpcApi};
-use serde::Serialize;
+use serde::{Deserialize, Serialize};
 use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout};
 
-#[derive(
-    Debug,
-    Clone,
-    Copy,
-    Deref,
-    DerefMut,
-    PartialEq,
-    Eq,
-    PartialOrd,
-    Ord,
-    Default,
-    FromBytes,
-    Immutable,
-    IntoBytes,
-    KnownLayout,
-    Serialize,
-)]
+use crate::{
+    rpc::{self, RpcApi},
+    Error,
+};
+
+#[derive(Debug, Clone, Copy, Deref, DerefMut, PartialEq, Eq, PartialOrd, Ord, Default, Serialize, Deserialize)]
+#[cfg_attr(feature = "zerocopy", derive(FromBytes, Immutable, IntoBytes, KnownLayout))]
 pub struct Height(u32);
 
 impl Height {
@@ -157,13 +146,6 @@ impl From<Height> for u64 {
     }
 }
 
-impl TryFrom<&Path> for Height {
-    type Error = storable_vec::Error;
-    fn try_from(value: &Path) -> Result<Self, Self::Error> {
-        Ok(Self::read_from_bytes(fs::read(value)?.as_slice())?.to_owned())
-    }
-}
-
 impl TryFrom<&rpc::Client> for Height {
     type Error = rpc::Error;
     fn try_from(value: &rpc::Client) -> Result<Self, Self::Error> {
@@ -171,18 +153,6 @@ impl TryFrom<&rpc::Client> for Height {
     }
 }
 
-impl TryFrom<Slice> for Height {
-    type Error = storable_vec::Error;
-    fn try_from(value: Slice) -> Result<Self, Self::Error> {
-        Ok(Self::read_from_bytes(&value)?)
-    }
-}
-impl From<Height> for Slice {
-    fn from(value: Height) -> Self {
-        Self::new(value.as_bytes())
-    }
-}
-
 impl From<bitcoin::locktime::absolute::Height> for Height {
     fn from(value: bitcoin::locktime::absolute::Height) -> Self {
         Self(value.to_consensus_u32())
@@ -194,3 +164,25 @@ impl From<Height> for bitcoin::locktime::absolute::Height {
         bitcoin::locktime::absolute::Height::from_consensus(*value).unwrap()
     }
 }
+
+#[cfg(feature = "zerocopy")]
+impl TryFrom<&Path> for Height {
+    type Error = Error;
+    fn try_from(value: &Path) -> Result<Self, Self::Error> {
+        Ok(Self::read_from_bytes(fs::read(value)?.as_slice())?.to_owned())
+    }
+}
+
+#[cfg(feature = "fjall")]
+impl TryFrom<fjall::Slice> for Height {
+    type Error = Error;
+    fn try_from(value: fjall::Slice) -> Result<Self, Self::Error> {
+        Ok(Self::read_from_bytes(&value)?)
+    }
+}
+#[cfg(feature = "fjall")]
+impl From<Height> for fjall::Slice {
+    fn from(value: Height) -> Self {
+        Self::new(value.as_bytes())
+    }
+}
diff --git a/iterator/src/lib.rs b/iterator/src/lib.rs
index 01f0433e9..7ebcb5faf 100644
--- a/iterator/src/lib.rs
+++ b/iterator/src/lib.rs
@@ -25,11 +25,15 @@ mod blk_index_to_blk_recap;
 mod blk_metadata;
 mod blk_metadata_and_block;
 mod blk_recap;
+mod error;
+mod height;
 mod utils;
 
 use blk_index_to_blk_recap::*;
 use blk_metadata::*;
 use blk_metadata_and_block::*;
+pub use error::*;
+pub use height::*;
 use utils::*;
 
 pub const NUMBER_OF_UNSAFE_BLOCKS: usize = 1000;
@@ -75,10 +79,10 @@ const BOUND_CAP: usize = 210;
 ///
 pub fn new(
     data_dir: &Path,
-    start: Option<usize>,
-    end: Option<usize>,
+    start: Option<Height>,
+    end: Option<Height>,
     rpc: &'static bitcoincore_rpc::Client,
-) -> Receiver<(usize, Block, BlockHash)> {
+) -> Receiver<(Height, Block, BlockHash)> {
     let (send_block_reader, recv_block_reader) = bounded(BOUND_CAP);
     let (send_block, recv_block) = bounded(BOUND_CAP);
     let (send_height_block_hash, recv_height_block_hash) = bounded(BOUND_CAP);
@@ -189,7 +193,7 @@ pub fn new(
     });
 
     thread::spawn(move || {
-        let mut height = start_recap.map_or(0, |(_, recap)| recap.height());
+        let mut height = start_recap.map_or(Height::default(), |(_, recap)| recap.height());
 
         let mut future_blocks = BTreeMap::default();
         let mut recent_chain: VecDeque<(BlockHash, BlkMetadataAndBlock)> = VecDeque::default();
diff --git a/iterator/src/main.rs b/iterator/src/main.rs
index 1a7ff466c..09792ef49 100644
--- a/iterator/src/main.rs
+++ b/iterator/src/main.rs
@@ -14,10 +14,10 @@ fn main() {
         .unwrap(),
     ));
 
-    let start = Some(460_001);
+    let start = Some(460_001_u32.into());
     let end = None;
 
-    biter::new(data_dir, start, end, rpc)
+    biterator::new(data_dir, start, end, rpc)
         .iter()
         .for_each(|(height, _block, hash)| {
             println!("{height}: {hash}");
diff --git a/storable_vec/src/enums/error.rs b/storable_vec/src/enums/error.rs
index 8db892c0d..b066a4ece 100644
--- a/storable_vec/src/enums/error.rs
+++ b/storable_vec/src/enums/error.rs
@@ -13,7 +13,6 @@ pub enum Error {
     DifferentVersion { found: Version, expected: Version },
     MmapsVecIsTooSmall,
     IO(io::Error),
-    // UnsafeSliceSerde(zerocopy::error::),
     ZeroCopyError,
     IndexTooHigh,
     IndexTooLow,
@@ -51,7 +50,6 @@ impl fmt::Display for Error {
             }
             Error::MmapsVecIsTooSmall => write!(f, "Mmaps vec is too small"),
             Error::IO(error) => Debug::fmt(&error, f),
-            // Error::UnsafeSliceSerde(error) => Debug::fmt(&error, f),
             Error::IndexTooHigh => write!(f, "Index too high"),
             Error::IndexTooLow => write!(f, "Index too low"),
             Error::ExpectFileToHaveIndex => write!(f, "Expect file to have index"),

From 66ecd2fcf869027032cf054fc94806ee4f33953e Mon Sep 17 00:00:00 2001
From: nym21 <expat-epochs0i@icloud.com>
Date: Thu, 20 Feb 2025 13:11:23 +0100
Subject: [PATCH 57/63] iterator: small changes

---
 iterator/src/blk_metadata.rs |  4 ++--
 iterator/src/blk_recap.rs    |  4 ++--
 iterator/src/error.rs        |  3 +++
 iterator/src/height.rs       | 24 +++++++++++-------------
 iterator/src/lib.rs          |  6 ++----
 iterator/src/main.rs         |  2 +-
 iterator/src/utils.rs        |  4 ++--
 7 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/iterator/src/blk_metadata.rs b/iterator/src/blk_metadata.rs
index a4d2b6131..4f07a98a2 100644
--- a/iterator/src/blk_metadata.rs
+++ b/iterator/src/blk_metadata.rs
@@ -1,4 +1,4 @@
-use std::path::PathBuf;
+use std::path::Path;
 
 use crate::path_to_modified_time;
 
@@ -9,7 +9,7 @@ pub struct BlkMetadata {
 }
 
 impl BlkMetadata {
-    pub fn new(index: usize, path: &PathBuf) -> Self {
+    pub fn new(index: usize, path: &Path) -> Self {
         Self {
             index,
             modified_time: path_to_modified_time(path),
diff --git a/iterator/src/blk_recap.rs b/iterator/src/blk_recap.rs
index bad813830..487ffc2ed 100644
--- a/iterator/src/blk_recap.rs
+++ b/iterator/src/blk_recap.rs
@@ -1,4 +1,4 @@
-use std::path::PathBuf;
+use std::path::Path;
 
 use bitcoin::{hashes::Hash, BlockHash};
 use serde::{Deserialize, Serialize};
@@ -29,7 +29,7 @@ impl BlkRecap {
         }
     }
 
-    pub fn has_different_modified_time(&self, blk_path: &PathBuf) -> bool {
+    pub fn has_different_modified_time(&self, blk_path: &Path) -> bool {
         if self.modified_time != path_to_modified_time(blk_path) {
             dbg!(self.modified_time, path_to_modified_time(blk_path));
         }
diff --git a/iterator/src/error.rs b/iterator/src/error.rs
index 0a7562c65..41bd962f0 100644
--- a/iterator/src/error.rs
+++ b/iterator/src/error.rs
@@ -8,6 +8,7 @@ pub type Result<T, E = Error> = std::result::Result<T, E>;
 #[derive(Debug)]
 pub enum Error {
     IO(io::Error),
+    #[cfg(feature = "zerocopy")]
     ZeroCopyError,
 }
 
@@ -17,6 +18,7 @@ impl From<io::Error> for Error {
     }
 }
 
+#[cfg(feature = "zerocopy")]
 impl<A, B> From<zerocopy::error::SizeError<A, B>> for Error {
     fn from(_: zerocopy::error::SizeError<A, B>) -> Self {
         Self::ZeroCopyError
@@ -27,6 +29,7 @@ impl fmt::Display for Error {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         match self {
             Error::IO(error) => Debug::fmt(&error, f),
+            #[cfg(feature = "zerocopy")]
             Error::ZeroCopyError => write!(f, "Zero copy convert error"),
         }
     }
diff --git a/iterator/src/height.rs b/iterator/src/height.rs
index 8104cb05b..b646bbc3b 100644
--- a/iterator/src/height.rs
+++ b/iterator/src/height.rs
@@ -1,18 +1,15 @@
 use std::{
     fmt::{self, Debug},
-    fs, io,
     ops::{Add, AddAssign, Rem, Sub},
-    path::Path,
 };
 
 use derive_deref::{Deref, DerefMut};
 use serde::{Deserialize, Serialize};
+
+#[cfg(feature = "zerocopy")]
 use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout};
 
-use crate::{
-    rpc::{self, RpcApi},
-    Error,
-};
+use crate::rpc::{self, RpcApi};
 
 #[derive(Debug, Clone, Copy, Deref, DerefMut, PartialEq, Eq, PartialOrd, Ord, Default, Serialize, Deserialize)]
 #[cfg_attr(feature = "zerocopy", derive(FromBytes, Immutable, IntoBytes, KnownLayout))]
@@ -21,8 +18,9 @@ pub struct Height(u32);
 impl Height {
     const ZERO: Self = Height(0);
 
-    pub fn write(&self, path: &Path) -> Result<(), io::Error> {
-        fs::write(path, self.as_bytes())
+    #[cfg(feature = "zerocopy")]
+    pub fn write(&self, path: &std::path::Path) -> Result<(), std::io::Error> {
+        std::fs::write(path, self.as_bytes())
     }
 
     pub fn increment(&mut self) {
@@ -166,16 +164,16 @@ impl From<Height> for bitcoin::locktime::absolute::Height {
 }
 
 #[cfg(feature = "zerocopy")]
-impl TryFrom<&Path> for Height {
-    type Error = Error;
-    fn try_from(value: &Path) -> Result<Self, Self::Error> {
-        Ok(Self::read_from_bytes(fs::read(value)?.as_slice())?.to_owned())
+impl TryFrom<&std::path::Path> for Height {
+    type Error = crate::Error;
+    fn try_from(value: &std::path::Path) -> Result<Self, Self::Error> {
+        Ok(Self::read_from_bytes(std::fs::read(value)?.as_slice())?.to_owned())
     }
 }
 
 #[cfg(feature = "fjall")]
 impl TryFrom<fjall::Slice> for Height {
-    type Error = Error;
+    type Error = crate::Error;
     fn try_from(value: fjall::Slice) -> Result<Self, Self::Error> {
         Ok(Self::read_from_bytes(&value)?)
     }
diff --git a/iterator/src/lib.rs b/iterator/src/lib.rs
index 7ebcb5faf..c6811ffc4 100644
--- a/iterator/src/lib.rs
+++ b/iterator/src/lib.rs
@@ -38,7 +38,7 @@ use utils::*;
 
 pub const NUMBER_OF_UNSAFE_BLOCKS: usize = 1000;
 const MAGIC_BYTES: [u8; 4] = [249, 190, 180, 217];
-const BOUND_CAP: usize = 210;
+const BOUND_CAP: usize = 100;
 
 ///
 /// Returns a crossbeam channel receiver that receives `(usize, Block, BlockHash)` tuples (with `usize` being the height) in sequential order.
@@ -99,7 +99,7 @@ pub fn new(
             .iter()
             .filter(|(blk_index, _)| **blk_index >= starting_blk_index)
             .try_for_each(move |(blk_index, blk_path)| {
-                let blk_metadata = BlkMetadata::new(*blk_index, blk_path);
+                let blk_metadata = BlkMetadata::new(*blk_index, blk_path.as_path());
 
                 let blk_bytes = fs::read(blk_path).unwrap();
                 let blk_bytes_len = blk_bytes.len() as u64;
@@ -224,8 +224,6 @@ pub fn new(
                               tuple: BlkMetadataAndBlock| {
             let mut tuple = Some(tuple);
 
-            println!("{} {} {}", recent_hashes.len(), recent_chain.len(), future_blocks.len(),);
-
             while let Some(tuple) = tuple.take().or_else(|| future_blocks.remove(prev_hash)) {
                 let hash = tuple.block.block_hash();
 
diff --git a/iterator/src/main.rs b/iterator/src/main.rs
index 09792ef49..4341a714d 100644
--- a/iterator/src/main.rs
+++ b/iterator/src/main.rs
@@ -14,7 +14,7 @@ fn main() {
         .unwrap(),
     ));
 
-    let start = Some(460_001_u32.into());
+    let start = None;
     let end = None;
 
     biterator::new(data_dir, start, end, rpc)
diff --git a/iterator/src/utils.rs b/iterator/src/utils.rs
index 0894cd24d..0b73fc981 100644
--- a/iterator/src/utils.rs
+++ b/iterator/src/utils.rs
@@ -1,6 +1,6 @@
-use std::{fs, path::PathBuf, time::UNIX_EPOCH};
+use std::{fs, path::Path, time::UNIX_EPOCH};
 
-pub fn path_to_modified_time(path: &PathBuf) -> u64 {
+pub fn path_to_modified_time(path: &Path) -> u64 {
     fs::metadata(path)
         .unwrap()
         .modified()

From e63b42278cf56b55d8667710b276a8f44b7e34fa Mon Sep 17 00:00:00 2001
From: nym21 <expat-epochs0i@icloud.com>
Date: Fri, 21 Feb 2025 20:12:57 +0100
Subject: [PATCH 58/63] iterator: simplified

---
 Cargo.lock                             | 159 ++++++++--------
 Cargo.toml                             |  13 +-
 indexer/Cargo.toml                     |   2 +-
 iterator/Cargo.toml                    |   9 +-
 iterator/src/blk_index_to_blk_path.rs  |   4 +-
 iterator/src/blk_index_to_blk_recap.rs | 108 ++++-------
 iterator/src/blk_metadata.rs           |   4 +-
 iterator/src/blk_metadata_and_block.rs |   4 +-
 iterator/src/blk_recap.rs              |  37 +---
 iterator/src/error.rs                  |   4 +-
 iterator/src/height.rs                 |  16 +-
 iterator/src/lib.rs                    | 242 ++++++++++---------------
 iterator/src/main.rs                   |   2 +-
 server/Cargo.toml                      |   2 +-
 14 files changed, 241 insertions(+), 365 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 96a8b7669..6222c5d05 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -275,7 +275,7 @@ dependencies = [
  "serde",
  "serde_bytes",
  "storable_vec",
- "zerocopy 0.8.18",
+ "zerocopy 0.8.20",
 ]
 
 [[package]]
@@ -368,7 +368,7 @@ dependencies = [
  "rayon",
  "serde",
  "serde_json",
- "zerocopy 0.8.18",
+ "zerocopy 0.8.20",
 ]
 
 [[package]]
@@ -393,7 +393,7 @@ dependencies = [
  "fjall",
  "hodor",
  "storable_vec",
- "zerocopy 0.8.18",
+ "zerocopy 0.8.20",
 ]
 
 [[package]]
@@ -409,7 +409,7 @@ dependencies = [
  "serde",
  "serde_json",
  "storable_vec",
- "zerocopy 0.8.18",
+ "zerocopy 0.8.20",
 ]
 
 [[package]]
@@ -456,9 +456,9 @@ checksum = "f61dac84819c6588b558454b194026eb1f09c293b9036ae9b159e74e73ab6cf9"
 
 [[package]]
 name = "byteview"
-version = "0.5.3"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9f101f5d5ac7c27fa7e664bbdc2697b2627f24c701e1309564840c67554dbcc"
+checksum = "7a4516a8561bff0598c45512f90ee04ed62cee2cb36839e650a0a0704d5f741f"
 
 [[package]]
 name = "castaway"
@@ -471,9 +471,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.2.14"
+version = "1.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c3d1b2e905a3a7b00a6141adb0e4c0bb941d11caf55349d863942a1cc44e3c9"
+checksum = "c736e259eea577f443d5c86c304f9f4ae0295c43f3ba05c21f1d66b5f06001af"
 dependencies = [
  "jobserver",
  "libc",
@@ -758,9 +758,9 @@ checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99"
 
 [[package]]
 name = "fjall"
-version = "2.6.3"
+version = "2.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c240d783ba894f1ce20a7337c4eabb7814920b4bfd1ae74da1b17af3c7dfc19a"
+checksum = "9a7107ac1ad7c38b8a32c8bfe579bdb24bb1373b80c8e0b168f36b092647f917"
 dependencies = [
  "byteorder",
  "byteview",
@@ -1123,15 +1123,15 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.25"
+version = "0.4.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f"
+checksum = "30bde2b3dc3671ae49d8e2e9f044c7c005836e7a023ee57cffa25ab82764bb9e"
 
 [[package]]
 name = "lsm-tree"
-version = "2.6.3"
+version = "2.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43b7d9dc8488e02ab7be88626cdbd3a6ee4690d7ffa6a2ad460da9e52105e393"
+checksum = "614a43954a8414dcca688f9d4c91f727860b55ffd9a029438b18f234ed33330f"
 dependencies = [
  "byteorder",
  "crossbeam-skiplist",
@@ -1309,9 +1309,9 @@ checksum = "fb37767f6569cd834a413442455e0f066d0d522de8630436e2a1761d9726ba56"
 
 [[package]]
 name = "oxc"
-version = "0.51.0"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9f57beb511c2a1848baf900782d3975f89dbf75fc47ad2207147acf95523ab0"
+checksum = "fd6be05b94a99c886e3c8f79c0330e746df6fe27f8440b498ea7a5eb2fee2f67"
 dependencies = [
  "oxc_allocator",
  "oxc_ast",
@@ -1352,9 +1352,9 @@ dependencies = [
 
 [[package]]
 name = "oxc_allocator"
-version = "0.51.0"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a6d450673da14c60c6946deb0c06d68377d2d6f2ee41ad5b462fa9894001560"
+checksum = "bf460405a383f3f7ac134a0e06afdb3525c8fa8f119453167f179ea6b12faaf6"
 dependencies = [
  "allocator-api2",
  "bumpalo",
@@ -1365,9 +1365,9 @@ dependencies = [
 
 [[package]]
 name = "oxc_ast"
-version = "0.51.0"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "692c74b135e66d3fa13312d886f4a307131a5bd2fd76e5a4137825c6161b56a5"
+checksum = "b273094a3e96e84d3d8ce82190fd7113f70bb2a8dcb652c78b46df79fdd156cc"
 dependencies = [
  "bitflags",
  "cow-utils",
@@ -1382,9 +1382,9 @@ dependencies = [
 
 [[package]]
 name = "oxc_ast_macros"
-version = "0.51.0"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4759d0523a72576036df640954ac9c4ce995f39f290cfc723221cc45ac7b11a"
+checksum = "ab1dff20655433e64452ee12a9c87dba5d307a47fc8e155b4e37d746d66b37dd"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1393,9 +1393,9 @@ dependencies = [
 
 [[package]]
 name = "oxc_cfg"
-version = "0.51.0"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c58e5838966f971c24e8be8c34fb901e6e8a48211ea1db6d66c76fbb77b58d6c"
+checksum = "f289d7b40c97d1b7d2a8cf1528cd5af0f3f4e832dffdec20b6485b9d6240de0b"
 dependencies = [
  "bitflags",
  "itertools",
@@ -1408,9 +1408,9 @@ dependencies = [
 
 [[package]]
 name = "oxc_codegen"
-version = "0.51.0"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6e298be4a113f57749ed51a38dc253671eaed418a5de6dbd2bf29ff34c4f595"
+checksum = "8aa20c10288eacf1a8ec93981198c1428c7c9d0436ae7e0f0037a02e87535c94"
 dependencies = [
  "assert-unchecked",
  "bitflags",
@@ -1430,9 +1430,9 @@ dependencies = [
 
 [[package]]
 name = "oxc_data_structures"
-version = "0.51.0"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e87ee74753f20549e9d6bcc00e956f5ab67fde4a23e383fd4f7d8ad752d71d3"
+checksum = "e902c119eca30d0016d3d2aed31052d6e3ef1f594d71ca3fe193286771a8088d"
 dependencies = [
  "assert-unchecked",
  "ropey",
@@ -1440,9 +1440,9 @@ dependencies = [
 
 [[package]]
 name = "oxc_diagnostics"
-version = "0.51.0"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e27133a883a4f5d9796259a3ca6ab28ba8c097ee32cd58fc794688e205f66727"
+checksum = "640a5f40eb0e09725a5e9c90e88727272c999d9805403747e2140cab2a742b6e"
 dependencies = [
  "cow-utils",
  "oxc-miette",
@@ -1450,9 +1450,9 @@ dependencies = [
 
 [[package]]
 name = "oxc_ecmascript"
-version = "0.51.0"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16a7535550ce59cc7373d60d13e5fb32eee1817ba9dcfa3df7a1ae96bdb0945e"
+checksum = "87543a59fd0d2d27102ccd8eee9f954564f7e82124992cc21975bbbe75851ce4"
 dependencies = [
  "cow-utils",
  "num-bigint",
@@ -1464,9 +1464,12 @@ dependencies = [
 
 [[package]]
 name = "oxc_estree"
-version = "0.51.0"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a817a58818b63a5b26a15527e9c7f09c93ba1a95f570ae75e5e84bd3dee047de"
+checksum = "c1efeb3bb8ce6bced1e382e49d3978a2e5067cdc3881584f1cdef5aaf52d28b4"
+dependencies = [
+ "itoa",
+]
 
 [[package]]
 name = "oxc_index"
@@ -1476,9 +1479,9 @@ checksum = "5eca5d9726cd0a6e433debe003b7bc88b2ecad0bb6109f0cef7c55e692139a34"
 
 [[package]]
 name = "oxc_mangler"
-version = "0.51.0"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40dc09dd18e8c7cfaa85ef14f2634b81439de7ac900d579dcc3d6885c0847895"
+checksum = "74396fefe8eb5a62b2d79023b468f3012d0daa25b4a6fdff64816ade625a6dfc"
 dependencies = [
  "fixedbitset",
  "itertools",
@@ -1492,9 +1495,9 @@ dependencies = [
 
 [[package]]
 name = "oxc_minifier"
-version = "0.51.0"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c8987515e26c6765bf10c12073cd1d135bd99f531fcb2bcae399b8590e3dd44"
+checksum = "1fc9099e8cb43a9362ffde2cfcb5d69bbbf87f0303c36d6209379b4f88f3d866"
 dependencies = [
  "cow-utils",
  "oxc_allocator",
@@ -1513,9 +1516,9 @@ dependencies = [
 
 [[package]]
 name = "oxc_parser"
-version = "0.51.0"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6410afa5ad3cde657f26803f828726b8d3b475131299faf5c7948299892a560c"
+checksum = "d0f5195b60a980baf22e34c801c8a37901ee21149e523d2a2fc68111991dd0b6"
 dependencies = [
  "assert-unchecked",
  "bitflags",
@@ -1536,9 +1539,9 @@ dependencies = [
 
 [[package]]
 name = "oxc_regular_expression"
-version = "0.51.0"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9711b8c74f28de9a295bc03baf7d61abf47af35556156e49f3a44fa572194325"
+checksum = "c6b7199022f1e8a071a118737884cdf75bd3ba869471fd500f00dd4612a4faeb"
 dependencies = [
  "oxc_allocator",
  "oxc_ast_macros",
@@ -1552,9 +1555,9 @@ dependencies = [
 
 [[package]]
 name = "oxc_semantic"
-version = "0.51.0"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18e0eac139ab28789789f993fa4955c386454d7c34c1adfe44448c1cb7769cf0"
+checksum = "55da371ce5345676e602719ce048eb2343b3e7b1798c6275e06ea431917340af"
 dependencies = [
  "assert-unchecked",
  "itertools",
@@ -1574,9 +1577,9 @@ dependencies = [
 
 [[package]]
 name = "oxc_sourcemap"
-version = "1.0.7"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "989c3fa8bdd55ced0ad4a0b2d587dfd11613364c9db417889bdb09c217463766"
+checksum = "dcb048fad7eee078b23dc3f3be7aba94eeba596c892c9255fc2646fba232a2ec"
 dependencies = [
  "base64-simd",
  "cfg-if",
@@ -1588,9 +1591,9 @@ dependencies = [
 
 [[package]]
 name = "oxc_span"
-version = "0.51.0"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8c7d6b92b30eea1fdc8907c6dfe8525b75a815024d6567628697789076fb7e1"
+checksum = "b3cbaec227f5bb91e52a04f9028915973cbb7522b123b41af2d3189eb1ce41d8"
 dependencies = [
  "compact_str",
  "oxc-miette",
@@ -1601,9 +1604,9 @@ dependencies = [
 
 [[package]]
 name = "oxc_syntax"
-version = "0.51.0"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9540bf5b53cb0cd81dbdf07b25834a5064b762e6a330ca35d0d424a581a442b8"
+checksum = "91bd42fae0c0e6212ea704ed533df47748002abc0af5496911fdb09735028a77"
 dependencies = [
  "assert-unchecked",
  "bitflags",
@@ -1622,9 +1625,9 @@ dependencies = [
 
 [[package]]
 name = "oxc_traverse"
-version = "0.51.0"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9583a428473921f6faa890fd9b564d8df59832d6638b03f4a30779a15d22e612"
+checksum = "7c3558bebe882232c4c6fd5f28f08ce58586970c56b486a694b29c59b8b976a8"
 dependencies = [
  "compact_str",
  "itoa",
@@ -1839,9 +1842,9 @@ dependencies = [
 
 [[package]]
 name = "rapidhash"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c3cf30fb8a0540827f3e22514836533403dece9ac517631160a1fb36d0dd5d6"
+checksum = "9813f789f95ee4fe6b4d01834404d7cccacbc3f6c029343af910b3c2835eb9f1"
 
 [[package]]
 name = "rayon"
@@ -1865,9 +1868,9 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.8"
+version = "0.5.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834"
+checksum = "82b568323e98e49e2a0899dcee453dd679fae22d69adf9b11dd508d1549b7e2f"
 dependencies = [
  "bitflags",
 ]
@@ -1903,9 +1906,9 @@ checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
 [[package]]
 name = "ring"
-version = "0.17.9"
+version = "0.17.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e75ec5e92c4d8aede845126adc388046234541629e76029599ed35a003c7ed24"
+checksum = "d34b5020fcdea098ef7d95e9f89ec15952123a4a039badd09fabebe9e963e839"
 dependencies = [
  "cc",
  "cfg-if",
@@ -2050,9 +2053,9 @@ checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4"
 
 [[package]]
 name = "serde"
-version = "1.0.217"
+version = "1.0.218"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70"
+checksum = "e8dfc9d19bdbf6d17e22319da49161d5d0108e4188e8b680aef6299eed22df60"
 dependencies = [
  "serde_derive",
 ]
@@ -2068,9 +2071,9 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.217"
+version = "1.0.218"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0"
+checksum = "f09503e191f4e797cb8aac08e9a4a4695c5edf6a2e70e376d961ddd5c969f82b"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2079,9 +2082,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.138"
+version = "1.0.139"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d434192e7da787e94a6ea7e9670b26a036d0ca41e0b7efb2676dd32bae872949"
+checksum = "44f86c3acccc9c65b153fe1b85a3be07fe5515274ec9f0653b4a0875731c72a6"
 dependencies = [
  "itoa",
  "memchr",
@@ -2189,7 +2192,7 @@ dependencies = [
  "rayon",
  "serde",
  "serde_json",
- "zerocopy 0.8.18",
+ "zerocopy 0.8.20",
 ]
 
 [[package]]
@@ -2462,9 +2465,9 @@ checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65"
 
 [[package]]
 name = "value-log"
-version = "1.5.3"
+version = "1.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdbb3c254a6def3cbc8afcb523b88c4a3b424297db8207aa66cde5fa84edddf6"
+checksum = "f2398750880b2b9770afbd1a3e299b9e859d6143c299867eb35fdf484b7625d3"
 dependencies = [
  "byteorder",
  "byteview",
@@ -2619,11 +2622,11 @@ dependencies = [
 
 [[package]]
 name = "zerocopy"
-version = "0.8.18"
+version = "0.8.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79386d31a42a4996e3336b0919ddb90f81112af416270cff95b5f5af22b839c2"
+checksum = "dde3bb8c68a8f3f1ed4ac9221aad6b10cece3e60a8e2ea54a6a2dec806d0084c"
 dependencies = [
- "zerocopy-derive 0.8.18",
+ "zerocopy-derive 0.8.20",
 ]
 
 [[package]]
@@ -2639,9 +2642,9 @@ dependencies = [
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.8.18"
+version = "0.8.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76331675d372f91bf8d17e13afbd5fe639200b73d01f0fc748bb059f9cca2db7"
+checksum = "eea57037071898bf96a6da35fd626f4f27e9cee3ead2a6c703cf09d472b2e700"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2650,27 +2653,27 @@ dependencies = [
 
 [[package]]
 name = "zstd"
-version = "0.13.2"
+version = "0.13.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9"
+checksum = "e91ee311a569c327171651566e07972200e76fcfe2242a4fa446149a3881c08a"
 dependencies = [
  "zstd-safe",
 ]
 
 [[package]]
 name = "zstd-safe"
-version = "7.2.1"
+version = "7.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54a3ab4db68cea366acc5c897c7b4d4d1b8994a9cd6e6f841f8964566a419059"
+checksum = "f3051792fbdc2e1e143244dc28c60f73d8470e93f3f9cbd0ead44da5ed802722"
 dependencies = [
  "zstd-sys",
 ]
 
 [[package]]
 name = "zstd-sys"
-version = "2.0.13+zstd.1.5.6"
+version = "2.0.14+zstd.1.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa"
+checksum = "8fb060d4926e4ac3a3ad15d864e99ceb5f343c6b34f5bd6d81ae6ed417311be5"
 dependencies = [
  "cc",
  "pkg-config",
diff --git a/Cargo.toml b/Cargo.toml
index 0cf5cc79f..c550b953e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -19,22 +19,21 @@ bitcoin = { version = "0.32.5", features = ["serde"] }
 color-eyre = "0.6.3"
 computer = { version = "0", path = "computer", package = "bomputer" }
 derive_deref = "1.1.1"
-fjall = "2.6.3"
+fjall = "2.6.4"
 hodor = { version = "0", path = "hodor" }
 indexer = { version = "0", path = "indexer", package = "bindexer" }
 iterator = { version = "0", path = "iterator", package = "biterator", features = [
-    "fjall",
-    "zerocopy",
+    "bytes",
 ] }
 jiff = "0.2.1"
-log = { version = "0.4.25" }
+log = { version = "0.4.26" }
 logger = { version = "0", path = "logger", package = "cl0g" }
 minreq = { version = "2.13.2", features = ["https", "serde_json"] }
 pricer = { version = "0", path = "pricer", package = "bricer" }
 rayon = "1.10.0"
-serde = { version = "1.0.217", features = ["derive"] }
+serde = { version = "1.0.218", features = ["derive"] }
 serde_bytes = "0.11.15"
-serde_json = { version = "1.0.138", features = ["float_roundtrip"] }
+serde_json = { version = "1.0.139", features = ["float_roundtrip"] }
 server = { version = "0", path = "server", package = "berver" }
 storable_vec = { version = "0", path = "storable_vec", features = ["json"] }
-zerocopy = { version = "0.8.18", features = ["derive"] }
+zerocopy = { version = "0.8.20", features = ["derive"] }
diff --git a/indexer/Cargo.toml b/indexer/Cargo.toml
index 6c3325105..5ae90ad97 100644
--- a/indexer/Cargo.toml
+++ b/indexer/Cargo.toml
@@ -14,7 +14,7 @@ hodor = { workspace = true }
 iterator = { workspace = true }
 jiff = { workspace = true }
 logger = { workspace = true }
-rapidhash = "1.3.0"
+rapidhash = "1.4.0"
 rayon = { workspace = true }
 rlimit = { version = "0.10.2" }
 serde = { workspace = true }
diff --git a/iterator/Cargo.toml b/iterator/Cargo.toml
index 1b95676f4..014a1c029 100644
--- a/iterator/Cargo.toml
+++ b/iterator/Cargo.toml
@@ -9,16 +9,15 @@ edition = { workspace = true }
 license = { workspace = true }
 
 [features]
-fjall = ["dep:fjall"]
-zerocopy = ["dep:zerocopy"]
+bytes = ["dep:fjall", "dep:zerocopy"]
 
 [dependencies]
 bitcoin = { workspace = true }
-rayon = { workspace = true }
+bitcoincore-rpc = "0.19.0"
 crossbeam = { version = "0.8.4", features = ["crossbeam-channel"] }
+derive_deref = { workspace = true }
 fjall = { workspace = true, optional = true }
+rayon = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
-derive_deref = { workspace = true }
-bitcoincore-rpc = "0.19.0"
 zerocopy = { workspace = true, optional = true }
diff --git a/iterator/src/blk_index_to_blk_path.rs b/iterator/src/blk_index_to_blk_path.rs
index e365018c8..8c95acb7e 100644
--- a/iterator/src/blk_index_to_blk_path.rs
+++ b/iterator/src/blk_index_to_blk_path.rs
@@ -10,7 +10,7 @@ const BLK: &str = "blk";
 const DAT: &str = ".dat";
 
 #[derive(Debug, Deref, DerefMut)]
-pub struct BlkIndexToBlkPath(BTreeMap<usize, PathBuf>);
+pub struct BlkIndexToBlkPath(BTreeMap<u16, PathBuf>);
 
 impl BlkIndexToBlkPath {
     pub fn scan(data_dir: &Path) -> Self {
@@ -35,7 +35,7 @@ impl BlkIndexToBlkPath {
                     let file_name = path.file_name().unwrap().to_str().unwrap();
 
                     let blk_index = file_name[BLK.len()..(file_name.len() - DAT.len())]
-                        .parse::<usize>()
+                        .parse::<u16>()
                         .unwrap();
 
                     (blk_index, path)
diff --git a/iterator/src/blk_index_to_blk_recap.rs b/iterator/src/blk_index_to_blk_recap.rs
index a03025a67..df20ae43c 100644
--- a/iterator/src/blk_index_to_blk_recap.rs
+++ b/iterator/src/blk_index_to_blk_recap.rs
@@ -1,29 +1,23 @@
 use std::{
-    cmp::Ordering,
     collections::{BTreeMap, BTreeSet},
-    fs::{self, File},
+    fs::File,
     io::{BufReader, BufWriter},
     path::{Path, PathBuf},
 };
 
-use crate::{blk_recap::BlkRecap, BlkIndexToBlkPath, BlkMetadataAndBlock, Height};
-
-const TARGET_BLOCKS_PER_MONTH: usize = 144 * 30;
+use crate::{blk_recap::BlkRecap, BlkIndexToBlkPath, Height};
 
 #[derive(Debug)]
 pub struct BlkIndexToBlkRecap {
-    path: PathBuf,
-    tree: BTreeMap<usize, BlkRecap>,
-    last_safe_height: Option<Height>,
+    pub path: PathBuf,
+    pub tree: BTreeMap<u16, BlkRecap>,
 }
 
 impl BlkIndexToBlkRecap {
-    pub fn import(blocks_dir: &BlkIndexToBlkPath, data_dir: &Path) -> Self {
+    pub fn import(data_dir: &Path, blk_index_to_blk_path: &BlkIndexToBlkPath, start: Option<Height>) -> (Self, u16) {
         let path = data_dir.join("blk_index_to_blk_recap.json");
 
         let tree = {
-            fs::create_dir_all(data_dir).unwrap();
-
             if let Ok(file) = File::open(&path) {
                 let reader = BufReader::new(file);
                 serde_json::from_reader(reader).unwrap_or_default()
@@ -32,90 +26,62 @@ impl BlkIndexToBlkRecap {
             }
         };
 
-        // dbg!(&tree);
+        let mut slf = Self { path, tree };
 
-        let mut this = Self {
-            path,
-            tree,
-            last_safe_height: None,
-        };
+        let min_removed = slf.clean_outdated(blk_index_to_blk_path);
 
-        this.clean_outdated(blocks_dir);
+        let blk_index = slf.get_start_recap(min_removed, start);
 
-        this
+        (slf, blk_index)
     }
 
-    fn clean_outdated(&mut self, blocks_dir: &BlkIndexToBlkPath) {
-        self.tree.pop_last();
+    fn clean_outdated(&mut self, blk_index_to_blk_path: &BlkIndexToBlkPath) -> Option<u16> {
+        let mut min_removed_blk_index: Option<u16> = None;
 
         let mut unprocessed_keys = self.tree.keys().copied().collect::<BTreeSet<_>>();
 
-        blocks_dir.iter().for_each(|(blk_index, blk_path)| {
+        blk_index_to_blk_path.iter().for_each(|(blk_index, blk_path)| {
             unprocessed_keys.remove(blk_index);
             if let Some(blk_recap) = self.tree.get(blk_index) {
                 if blk_recap.has_different_modified_time(blk_path) {
-                    self.tree.remove(blk_index);
+                    self.tree.remove(blk_index).unwrap();
+                    if min_removed_blk_index.map_or(true, |_blk_index| *blk_index < _blk_index) {
+                        min_removed_blk_index.replace(*blk_index);
+                    }
                 }
             }
         });
 
         unprocessed_keys.into_iter().for_each(|blk_index| {
-            self.tree.remove(&blk_index);
+            self.tree.remove(&blk_index).unwrap();
+            if min_removed_blk_index.map_or(true, |_blk_index| blk_index < _blk_index) {
+                min_removed_blk_index.replace(blk_index);
+            }
         });
 
-        self.last_safe_height = self.tree.values().map(|recap| recap.height()).max();
+        min_removed_blk_index
     }
 
-    pub fn get_start_recap(&mut self, start: Option<Height>) -> Option<(usize, BlkRecap)> {
-        if let Some(start) = start {
-            let (last_key, last_value) = self.tree.last_key_value()?;
+    pub fn get_start_recap(&mut self, min_removed: Option<u16>, start: Option<Height>) -> u16 {
+        if start.is_none() {
+            return 0;
+        }
 
-            dbg!((last_key, last_value));
+        let height = start.unwrap();
 
-            if last_value.height() < start {
-                return Some((*last_key, *last_value));
-            } else if let Some((blk_index, _)) =
-                self.tree.iter().find(|(_, blk_recap)| blk_recap.is_younger_than(start))
-            {
-                if *blk_index != 0 {
-                    // Temporary fix, need to rethink the whole thing
-                    let blk_index = (*blk_index).checked_sub(1).unwrap_or_default();
-                    return Some((blk_index, *self.tree.get(&blk_index).unwrap()));
-                }
+        let mut start = 0;
+
+        if let Some(found) = self.tree.iter().find(|(_, recap)| recap.max_height >= height) {
+            start = *found.0;
+        }
+
+        if let Some(min_removed) = min_removed {
+            if start > min_removed {
+                start = min_removed;
             }
         }
 
-        None
-    }
-
-    pub fn update(&mut self, blk_metadata_and_block: &BlkMetadataAndBlock, height: Height) {
-        let blk_index = blk_metadata_and_block.blk_metadata.index;
-
-        if let Some(last_entry) = self.tree.last_entry() {
-            match last_entry.key().cmp(&blk_index) {
-                Ordering::Greater => {
-                    last_entry.remove_entry();
-                }
-                Ordering::Less => {
-                    self.tree
-                        .insert(blk_index, BlkRecap::from(height, blk_metadata_and_block));
-                }
-                Ordering::Equal => {}
-            };
-        } else {
-            if blk_index != 0 || height != 0 {
-                // dbg!(blk_index, height);
-                unreachable!();
-            }
-
-            self.tree.insert(blk_index, BlkRecap::first(blk_metadata_and_block));
-        }
-
-        if self.last_safe_height.map_or(true, |safe_height| height >= safe_height)
-            && (height % TARGET_BLOCKS_PER_MONTH) == 0
-        {
-            self.export();
-        }
+        start
     }
 
     pub fn export(&self) {
@@ -124,6 +90,6 @@ impl BlkIndexToBlkRecap {
             panic!("No such file or directory")
         });
 
-        serde_json::to_writer_pretty(&mut BufWriter::new(file), &self.tree).unwrap();
+        serde_json::to_writer(&mut BufWriter::new(file), &self.tree).unwrap();
     }
 }
diff --git a/iterator/src/blk_metadata.rs b/iterator/src/blk_metadata.rs
index 4f07a98a2..2d8614b6b 100644
--- a/iterator/src/blk_metadata.rs
+++ b/iterator/src/blk_metadata.rs
@@ -4,12 +4,12 @@ use crate::path_to_modified_time;
 
 #[derive(Debug, Clone, Copy)]
 pub struct BlkMetadata {
-    pub index: usize,
+    pub index: u16,
     pub modified_time: u64,
 }
 
 impl BlkMetadata {
-    pub fn new(index: usize, path: &Path) -> Self {
+    pub fn new(index: u16, path: &Path) -> Self {
         Self {
             index,
             modified_time: path_to_modified_time(path),
diff --git a/iterator/src/blk_metadata_and_block.rs b/iterator/src/blk_metadata_and_block.rs
index 8b5bb288b..d65966b40 100644
--- a/iterator/src/blk_metadata_and_block.rs
+++ b/iterator/src/blk_metadata_and_block.rs
@@ -3,12 +3,12 @@ use bitcoin::Block;
 use crate::BlkMetadata;
 
 #[derive(Debug)]
-pub struct BlkMetadataAndBlock {
+pub struct BlkIndexAndBlock {
     pub blk_metadata: BlkMetadata,
     pub block: Block,
 }
 
-impl BlkMetadataAndBlock {
+impl BlkIndexAndBlock {
     pub fn new(blk_metadata: BlkMetadata, block: Block) -> Self {
         Self { blk_metadata, block }
     }
diff --git a/iterator/src/blk_recap.rs b/iterator/src/blk_recap.rs
index 487ffc2ed..cd2fee31a 100644
--- a/iterator/src/blk_recap.rs
+++ b/iterator/src/blk_recap.rs
@@ -1,50 +1,21 @@
 use std::path::Path;
 
-use bitcoin::{hashes::Hash, BlockHash};
 use serde::{Deserialize, Serialize};
 
-use crate::{path_to_modified_time, BlkMetadataAndBlock, Height};
+use crate::{path_to_modified_time, Height};
 
 #[derive(Debug, Clone, Copy, Serialize, Deserialize)]
+#[repr(C)]
 pub struct BlkRecap {
-    min_continuous_height: Height,
-    min_continuous_prev_hash: BlockHash,
-    modified_time: u64,
+    pub max_height: Height,
+    pub modified_time: u64,
 }
 
 impl BlkRecap {
-    pub fn first(blk_metadata_and_block: &BlkMetadataAndBlock) -> Self {
-        Self {
-            min_continuous_height: Height::default(),
-            min_continuous_prev_hash: BlockHash::all_zeros(),
-            modified_time: blk_metadata_and_block.blk_metadata.modified_time,
-        }
-    }
-
-    pub fn from(height: Height, blk_metadata_and_block: &BlkMetadataAndBlock) -> Self {
-        Self {
-            min_continuous_height: height,
-            min_continuous_prev_hash: blk_metadata_and_block.block.header.prev_blockhash,
-            modified_time: blk_metadata_and_block.blk_metadata.modified_time,
-        }
-    }
-
     pub fn has_different_modified_time(&self, blk_path: &Path) -> bool {
         if self.modified_time != path_to_modified_time(blk_path) {
             dbg!(self.modified_time, path_to_modified_time(blk_path));
         }
         self.modified_time != path_to_modified_time(blk_path)
     }
-
-    pub fn is_younger_than(&self, height: Height) -> bool {
-        self.min_continuous_height > height
-    }
-
-    pub fn height(&self) -> Height {
-        self.min_continuous_height
-    }
-
-    pub fn prev_hash(&self) -> &BlockHash {
-        &self.min_continuous_prev_hash
-    }
 }
diff --git a/iterator/src/error.rs b/iterator/src/error.rs
index 41bd962f0..0f670f987 100644
--- a/iterator/src/error.rs
+++ b/iterator/src/error.rs
@@ -8,7 +8,6 @@ pub type Result<T, E = Error> = std::result::Result<T, E>;
 #[derive(Debug)]
 pub enum Error {
     IO(io::Error),
-    #[cfg(feature = "zerocopy")]
     ZeroCopyError,
 }
 
@@ -18,7 +17,7 @@ impl From<io::Error> for Error {
     }
 }
 
-#[cfg(feature = "zerocopy")]
+#[cfg(feature = "bytes")]
 impl<A, B> From<zerocopy::error::SizeError<A, B>> for Error {
     fn from(_: zerocopy::error::SizeError<A, B>) -> Self {
         Self::ZeroCopyError
@@ -29,7 +28,6 @@ impl fmt::Display for Error {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         match self {
             Error::IO(error) => Debug::fmt(&error, f),
-            #[cfg(feature = "zerocopy")]
             Error::ZeroCopyError => write!(f, "Zero copy convert error"),
         }
     }
diff --git a/iterator/src/height.rs b/iterator/src/height.rs
index b646bbc3b..8df4c97f9 100644
--- a/iterator/src/height.rs
+++ b/iterator/src/height.rs
@@ -5,20 +5,20 @@ use std::{
 
 use derive_deref::{Deref, DerefMut};
 use serde::{Deserialize, Serialize};
-
-#[cfg(feature = "zerocopy")]
+#[cfg(feature = "bytes")]
 use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout};
 
 use crate::rpc::{self, RpcApi};
 
 #[derive(Debug, Clone, Copy, Deref, DerefMut, PartialEq, Eq, PartialOrd, Ord, Default, Serialize, Deserialize)]
-#[cfg_attr(feature = "zerocopy", derive(FromBytes, Immutable, IntoBytes, KnownLayout))]
+#[cfg_attr(feature = "bytes", derive(FromBytes, Immutable, IntoBytes, KnownLayout,))]
 pub struct Height(u32);
 
 impl Height {
-    const ZERO: Self = Height(0);
+    pub const ZERO: Self = Height(0);
+    pub const MAX: Self = Height(u32::MAX);
 
-    #[cfg(feature = "zerocopy")]
+    #[cfg(feature = "bytes")]
     pub fn write(&self, path: &std::path::Path) -> Result<(), std::io::Error> {
         std::fs::write(path, self.as_bytes())
     }
@@ -163,7 +163,7 @@ impl From<Height> for bitcoin::locktime::absolute::Height {
     }
 }
 
-#[cfg(feature = "zerocopy")]
+#[cfg(feature = "bytes")]
 impl TryFrom<&std::path::Path> for Height {
     type Error = crate::Error;
     fn try_from(value: &std::path::Path) -> Result<Self, Self::Error> {
@@ -171,14 +171,14 @@ impl TryFrom<&std::path::Path> for Height {
     }
 }
 
-#[cfg(feature = "fjall")]
+#[cfg(feature = "bytes")]
 impl TryFrom<fjall::Slice> for Height {
     type Error = crate::Error;
     fn try_from(value: fjall::Slice) -> Result<Self, Self::Error> {
         Ok(Self::read_from_bytes(&value)?)
     }
 }
-#[cfg(feature = "fjall")]
+#[cfg(feature = "bytes")]
 impl From<Height> for fjall::Slice {
     fn from(value: Height) -> Self {
         Self::new(value.as_bytes())
diff --git a/iterator/src/lib.rs b/iterator/src/lib.rs
index c6811ffc4..ac303f0c2 100644
--- a/iterator/src/lib.rs
+++ b/iterator/src/lib.rs
@@ -1,5 +1,6 @@
 use std::{
-    collections::{BTreeMap, BTreeSet, VecDeque},
+    cmp::Ordering,
+    collections::BTreeMap,
     fs::{self},
     ops::ControlFlow,
     path::Path,
@@ -8,12 +9,12 @@ use std::{
 
 use bitcoin::{
     consensus::{Decodable, ReadExt},
-    hashes::Hash,
     io::{Cursor, Read},
     Block, BlockHash,
 };
 use bitcoincore_rpc::RpcApi;
 use blk_index_to_blk_path::*;
+use blk_recap::BlkRecap;
 use crossbeam::channel::{bounded, Receiver};
 use rayon::prelude::*;
 
@@ -41,41 +42,9 @@ const MAGIC_BYTES: [u8; 4] = [249, 190, 180, 217];
 const BOUND_CAP: usize = 100;
 
 ///
-/// Returns a crossbeam channel receiver that receives `(usize, Block, BlockHash)` tuples (with `usize` being the height) in sequential order.
+/// Returns a crossbeam channel receiver that receives `(Height, Block, BlockHash)` tuples from an **inclusive** range (`start` and `end`)
 ///
-/// # Arguments
-///
-/// * `data_dir` - Path to the Bitcoin data directory
-/// * `start` - Inclusive starting height of the blocks received, `None` for 0
-/// * `end` - Inclusive ending height of the blocks received, `None` for the last one
-/// * `rpc` - RPC client to filter out forks
-///
-/// # Example
-///
-/// ```rust
-/// use std::path::Path;
-///
-/// use bitcoincore_rpc::{Auth, Client};
-///
-/// let i = std::time::Instant::now();
-///
-/// let data_dir = Path::new("../../bitcoin");
-/// let url = "http://localhost:8332";
-/// let cookie = Path::new(data_dir).join(".cookie");
-/// let auth = Auth::CookieFile(cookie);
-/// let rpc = Client::new(url, auth).unwrap();
-///
-/// let start = Some(850_000);
-/// let end = None;
-///
-/// biter::new(data_dir, start, end, rpc)
-///     .iter()
-///     .for_each(|(height, _block, hash)| {
-///         println!("{height}: {hash}");
-///     });
-///
-/// dbg!(i.elapsed());
-/// ```
+/// For an example checkout `iterator/main.rs`
 ///
 pub fn new(
     data_dir: &Path,
@@ -89,17 +58,15 @@ pub fn new(
 
     let blk_index_to_blk_path = BlkIndexToBlkPath::scan(data_dir);
 
-    let mut blk_index_to_blk_recap = BlkIndexToBlkRecap::import(&blk_index_to_blk_path, data_dir);
-
-    let start_recap = blk_index_to_blk_recap.get_start_recap(start);
-    let starting_blk_index = start_recap.as_ref().map_or(0, |(index, _)| *index);
+    let (mut blk_index_to_blk_recap, blk_index) = BlkIndexToBlkRecap::import(data_dir, &blk_index_to_blk_path, start);
 
     thread::spawn(move || {
         blk_index_to_blk_path
-            .iter()
-            .filter(|(blk_index, _)| **blk_index >= starting_blk_index)
+            .range(blk_index..)
             .try_for_each(move |(blk_index, blk_path)| {
-                let blk_metadata = BlkMetadata::new(*blk_index, blk_path.as_path());
+                let blk_index = *blk_index;
+
+                let blk_metadata = BlkMetadata::new(blk_index, blk_path.as_path());
 
                 let blk_bytes = fs::read(blk_path).unwrap();
                 let blk_bytes_len = blk_bytes.len() as u64;
@@ -128,22 +95,19 @@ pub fn new(
                         }
                     }
 
-                    let block_size = cursor.read_u32().unwrap();
+                    let len = cursor.read_u32().unwrap();
 
-                    let mut raw_block = vec![0u8; block_size as usize];
+                    let mut bytes = vec![0u8; len as usize];
 
-                    cursor.read_exact(&mut raw_block).unwrap();
+                    cursor.read_exact(&mut bytes).unwrap();
 
-                    if send_block_reader
-                        .send((blk_metadata, BlockState::Raw(raw_block)))
-                        .is_err()
-                    {
+                    if send_block_reader.send((blk_metadata, BlockState::Raw(bytes))).is_err() {
                         return ControlFlow::Break(());
                     }
                 }
 
                 ControlFlow::Continue(())
-            })
+            });
     });
 
     thread::spawn(move || {
@@ -152,16 +116,7 @@ pub fn new(
         let drain_and_send = |bulk: &mut Vec<_>| {
             // Using a vec and sending after to not end up with stuck threads in par iter
             bulk.par_iter_mut().for_each(|(_, block_state)| {
-                let raw_block = match block_state {
-                    BlockState::Raw(vec) => vec,
-                    _ => unreachable!(),
-                };
-
-                let mut cursor = Cursor::new(raw_block);
-
-                let block = Block::consensus_decode(&mut cursor).unwrap();
-
-                *block_state = BlockState::Decoded(block);
+                BlockState::decode(block_state);
             });
 
             bulk.drain(..).try_for_each(|(blk_metadata, block_state)| {
@@ -170,7 +125,7 @@ pub fn new(
                     _ => unreachable!(),
                 };
 
-                if send_block.send(BlkMetadataAndBlock::new(blk_metadata, block)).is_err() {
+                if send_block.send(BlkIndexAndBlock::new(blk_metadata, block)).is_err() {
                     return ControlFlow::Break(());
                 }
 
@@ -193,113 +148,83 @@ pub fn new(
     });
 
     thread::spawn(move || {
-        let mut height = start_recap.map_or(Height::default(), |(_, recap)| recap.height());
+        let mut current_height = start.unwrap_or_default();
 
         let mut future_blocks = BTreeMap::default();
-        let mut recent_chain: VecDeque<(BlockHash, BlkMetadataAndBlock)> = VecDeque::default();
-        let mut recent_hashes: BTreeSet<BlockHash> = BTreeSet::default();
 
-        let mut prev_hash = start_recap.map_or_else(BlockHash::all_zeros, |(_, recap)| *recap.prev_hash());
+        recv_block.iter().try_for_each(|tuple| -> ControlFlow<(), _> {
+            let blk_metadata = tuple.blk_metadata;
+            let block = tuple.block;
+            let hash = block.block_hash();
+            let header = rpc.get_block_header_info(&hash);
 
-        let mut prepare_and_send = |(hash, tuple): (BlockHash, BlkMetadataAndBlock)| {
-            blk_index_to_blk_recap.update(&tuple, height);
-
-            if start.map_or(true, |start| start <= height) {
-                send_height_block_hash.send((height, tuple.block, hash)).unwrap();
+            if header.is_err() {
+                return ControlFlow::Continue(());
+            }
+            let header = header.unwrap();
+            if header.confirmations <= 0 {
+                return ControlFlow::Continue(());
             }
 
-            if end == Some(height) {
-                return ControlFlow::Break(());
+            let height = Height::from(header.height);
+
+            let len = blk_index_to_blk_recap.tree.len();
+            if blk_metadata.index == len as u16 || blk_metadata.index + 1 == len as u16 {
+                match (len as u16).cmp(&blk_metadata.index) {
+                    Ordering::Equal => {
+                        if len % 21 == 0 {
+                            blk_index_to_blk_recap.export();
+                        }
+                    }
+                    Ordering::Less => panic!(),
+                    Ordering::Greater => {}
+                }
+
+                blk_index_to_blk_recap
+                    .tree
+                    .entry(blk_metadata.index)
+                    .and_modify(|recap| {
+                        if recap.max_height < height {
+                            recap.max_height = height;
+                        }
+                    })
+                    .or_insert(BlkRecap {
+                        max_height: height,
+                        modified_time: blk_metadata.modified_time,
+                    });
+            } else {
+                dbg!(blk_metadata.index, len);
+                panic!()
             }
 
-            height += 1;
+            let mut opt = if current_height == height {
+                Some((block, hash))
+            } else {
+                if start.map_or(true, |start| start <= height) && end.map_or(true, |end| end >= height) {
+                    future_blocks.insert(height, (block, hash));
+                }
+                None
+            };
 
-            ControlFlow::Continue(())
-        };
+            while let Some((block, hash)) = opt.take().or_else(|| {
+                if !future_blocks.is_empty() {
+                    future_blocks.remove(&current_height)
+                } else {
+                    None
+                }
+            }) {
+                send_height_block_hash.send((current_height, block, hash)).unwrap();
 
-        let mut update_tip = |prev_hash: &mut BlockHash,
-                              recent_hashes: &mut BTreeSet<BlockHash>,
-                              recent_chain: &mut VecDeque<(BlockHash, BlkMetadataAndBlock)>,
-                              future_blocks: &mut BTreeMap<BlockHash, BlkMetadataAndBlock>,
-                              tuple: BlkMetadataAndBlock| {
-            let mut tuple = Some(tuple);
-
-            while let Some(tuple) = tuple.take().or_else(|| future_blocks.remove(prev_hash)) {
-                let hash = tuple.block.block_hash();
-
-                *prev_hash = hash;
-                recent_hashes.insert(hash);
-                recent_chain.push_back((hash, tuple));
-            }
-
-            while recent_chain.len() > NUMBER_OF_UNSAFE_BLOCKS {
-                let (hash, tuple) = recent_chain.pop_front().unwrap();
-
-                recent_hashes.remove(&hash);
-
-                if prepare_and_send((hash, tuple)).is_break() {
+                if end == Some(current_height) {
                     return ControlFlow::Break(());
                 }
-            }
 
-            ControlFlow::Continue(())
-        };
-
-        let flow = recv_block.iter().try_for_each(|tuple| {
-            // block isn't next after current tip
-            if prev_hash != tuple.block.header.prev_blockhash {
-                let is_block_active = |hash| rpc.get_block_header_info(hash).unwrap().confirmations > 0;
-
-                // block prev has already been processed
-                if recent_hashes.contains(&tuple.block.header.prev_blockhash) {
-                    let hash = tuple.block.block_hash();
-
-                    if is_block_active(&hash) {
-                        let prev_index = recent_chain
-                            .iter()
-                            .position(|(hash, ..)| hash == &tuple.block.header.prev_blockhash)
-                            .unwrap();
-
-                        let bad_index_start = prev_index + 1;
-
-                        recent_chain.drain(bad_index_start..).for_each(|(hash, _)| {
-                            recent_hashes.remove(&hash);
-                        });
-
-                        return update_tip(
-                            &mut prev_hash,
-                            &mut recent_hashes,
-                            &mut recent_chain,
-                            &mut future_blocks,
-                            tuple,
-                        );
-                    }
-                // Check if there was already a future block with the same prev hash
-                } else if let Some(prev_tuple) = future_blocks.insert(tuple.block.header.prev_blockhash, tuple) {
-                    // If the previous was the active one
-                    if is_block_active(&prev_tuple.block.block_hash()) {
-                        // Rollback the insert
-                        future_blocks.insert(prev_tuple.block.header.prev_blockhash, prev_tuple);
-                    }
-                }
-            } else {
-                return update_tip(
-                    &mut prev_hash,
-                    &mut recent_hashes,
-                    &mut recent_chain,
-                    &mut future_blocks,
-                    tuple,
-                );
+                current_height.increment();
             }
 
             ControlFlow::Continue(())
         });
 
-        if flow.is_continue() {
-            // Send the last (up to 100) blocks
-            recent_chain.into_iter().try_for_each(prepare_and_send);
-        }
-
         blk_index_to_blk_recap.export();
     });
 
@@ -310,3 +235,18 @@ enum BlockState {
     Raw(Vec<u8>),
     Decoded(Block),
 }
+
+impl BlockState {
+    pub fn decode(&mut self) {
+        let bytes = match self {
+            BlockState::Raw(bytes) => bytes,
+            _ => unreachable!(),
+        };
+
+        let mut cursor = Cursor::new(bytes);
+
+        let block = Block::consensus_decode(&mut cursor).unwrap();
+
+        *self = BlockState::Decoded(block);
+    }
+}
diff --git a/iterator/src/main.rs b/iterator/src/main.rs
index 4341a714d..d055ff53b 100644
--- a/iterator/src/main.rs
+++ b/iterator/src/main.rs
@@ -15,7 +15,7 @@ fn main() {
     ));
 
     let start = None;
-    let end = None;
+    let end = None; //Some(200_000_u32.into());
 
     biterator::new(data_dir, start, end, rpc)
         .iter()
diff --git a/server/Cargo.toml b/server/Cargo.toml
index e01994f06..6b15f027a 100644
--- a/server/Cargo.toml
+++ b/server/Cargo.toml
@@ -13,7 +13,7 @@ derive_deref = { workspace = true }
 indexer = { workspace = true }
 jiff = { workspace = true }
 logger = { workspace = true }
-oxc = { version = "0.51.0", features = ["codegen", "minifier"] }
+oxc = { version = "0.52.0", features = ["codegen", "minifier"] }
 serde = { workspace = true }
 serde_json = { workspace = true }
 storable_vec = { workspace = true }

From 8c3f5190167d82c7ef6e21336558b4152bc14265 Mon Sep 17 00:00:00 2001
From: nym21 <expat-epochs0i@icloud.com>
Date: Sat, 22 Feb 2025 14:06:43 +0100
Subject: [PATCH 59/63] iterator: add xor support

---
 Cargo.lock                             | 10 +++---
 Cargo.toml                             |  4 +--
 iterator/src/blk_index_to_blk_recap.rs |  6 ++--
 iterator/src/lib.rs                    | 48 ++++++++++++++++----------
 iterator/src/main.rs                   |  2 +-
 iterator/src/xor.rs                    | 40 +++++++++++++++++++++
 storable_vec/src/lib.rs                |  2 +-
 7 files changed, 82 insertions(+), 30 deletions(-)
 create mode 100644 iterator/src/xor.rs

diff --git a/Cargo.lock b/Cargo.lock
index 6222c5d05..e7ab13591 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -758,9 +758,9 @@ checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99"
 
 [[package]]
 name = "fjall"
-version = "2.6.4"
+version = "2.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a7107ac1ad7c38b8a32c8bfe579bdb24bb1373b80c8e0b168f36b092647f917"
+checksum = "33e0fd3f3a8cbaa2b179ccc690ea0d37282d24787c06eab0dfd9137e1c4d4699"
 dependencies = [
  "byteorder",
  "byteview",
@@ -780,7 +780,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c"
 dependencies = [
  "crc32fast",
- "miniz_oxide 0.8.4",
+ "miniz_oxide 0.8.5",
 ]
 
 [[package]]
@@ -1195,9 +1195,9 @@ dependencies = [
 
 [[package]]
 name = "miniz_oxide"
-version = "0.8.4"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3b1c9bd4fe1f0f8b387f6eb9eb3b4a1aa26185e5750efb9140301703f62cd1b"
+checksum = "8e3e04debbb59698c15bacbb6d93584a8c0ca9cc3213cb423d31f760d8843ce5"
 dependencies = [
  "adler2",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index c550b953e..ef5ae6f42 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,14 +12,14 @@ members = [
 ]
 resolver = "2"
 package.license = "MIT"
-package.edition = "2021"
+package.edition = "2024"
 
 [workspace.dependencies]
 bitcoin = { version = "0.32.5", features = ["serde"] }
 color-eyre = "0.6.3"
 computer = { version = "0", path = "computer", package = "bomputer" }
 derive_deref = "1.1.1"
-fjall = "2.6.4"
+fjall = "2.6.5"
 hodor = { version = "0", path = "hodor" }
 indexer = { version = "0", path = "indexer", package = "bindexer" }
 iterator = { version = "0", path = "iterator", package = "biterator", features = [
diff --git a/iterator/src/blk_index_to_blk_recap.rs b/iterator/src/blk_index_to_blk_recap.rs
index df20ae43c..4d9735d2c 100644
--- a/iterator/src/blk_index_to_blk_recap.rs
+++ b/iterator/src/blk_index_to_blk_recap.rs
@@ -5,7 +5,7 @@ use std::{
     path::{Path, PathBuf},
 };
 
-use crate::{blk_recap::BlkRecap, BlkIndexToBlkPath, Height};
+use crate::{BlkIndexToBlkPath, Height, blk_recap::BlkRecap};
 
 #[derive(Debug)]
 pub struct BlkIndexToBlkRecap {
@@ -45,7 +45,7 @@ impl BlkIndexToBlkRecap {
             if let Some(blk_recap) = self.tree.get(blk_index) {
                 if blk_recap.has_different_modified_time(blk_path) {
                     self.tree.remove(blk_index).unwrap();
-                    if min_removed_blk_index.map_or(true, |_blk_index| *blk_index < _blk_index) {
+                    if min_removed_blk_index.is_none_or(|_blk_index| *blk_index < _blk_index) {
                         min_removed_blk_index.replace(*blk_index);
                     }
                 }
@@ -54,7 +54,7 @@ impl BlkIndexToBlkRecap {
 
         unprocessed_keys.into_iter().for_each(|blk_index| {
             self.tree.remove(&blk_index).unwrap();
-            if min_removed_blk_index.map_or(true, |_blk_index| blk_index < _blk_index) {
+            if min_removed_blk_index.is_none_or(|_blk_index| blk_index < _blk_index) {
                 min_removed_blk_index.replace(blk_index);
             }
         });
diff --git a/iterator/src/lib.rs b/iterator/src/lib.rs
index ac303f0c2..e1bf31489 100644
--- a/iterator/src/lib.rs
+++ b/iterator/src/lib.rs
@@ -1,21 +1,14 @@
-use std::{
-    cmp::Ordering,
-    collections::BTreeMap,
-    fs::{self},
-    ops::ControlFlow,
-    path::Path,
-    thread,
-};
+use std::{cmp::Ordering, collections::BTreeMap, fs, ops::ControlFlow, path::Path, thread};
 
 use bitcoin::{
+    Block, BlockHash,
     consensus::{Decodable, ReadExt},
     io::{Cursor, Read},
-    Block, BlockHash,
 };
 use bitcoincore_rpc::RpcApi;
 use blk_index_to_blk_path::*;
 use blk_recap::BlkRecap;
-use crossbeam::channel::{bounded, Receiver};
+use crossbeam::channel::{Receiver, bounded};
 use rayon::prelude::*;
 
 pub use bitcoin;
@@ -29,6 +22,7 @@ mod blk_recap;
 mod error;
 mod height;
 mod utils;
+mod xor;
 
 use blk_index_to_blk_recap::*;
 use blk_metadata::*;
@@ -36,6 +30,7 @@ use blk_metadata_and_block::*;
 pub use error::*;
 pub use height::*;
 use utils::*;
+use xor::*;
 
 pub const NUMBER_OF_UNSAFE_BLOCKS: usize = 1000;
 const MAGIC_BYTES: [u8; 4] = [249, 190, 180, 217];
@@ -52,7 +47,8 @@ pub fn new(
     end: Option<Height>,
     rpc: &'static bitcoincore_rpc::Client,
 ) -> Receiver<(Height, Block, BlockHash)> {
-    let (send_block_reader, recv_block_reader) = bounded(BOUND_CAP);
+    let (send_block_reader, recv_block_reader) = bounded(5);
+    let (send_block_xor, recv_block_xor) = bounded(BOUND_CAP);
     let (send_block, recv_block) = bounded(BOUND_CAP);
     let (send_height_block_hash, recv_height_block_hash) = bounded(BOUND_CAP);
 
@@ -60,6 +56,8 @@ pub fn new(
 
     let (mut blk_index_to_blk_recap, blk_index) = BlkIndexToBlkRecap::import(data_dir, &blk_index_to_blk_path, start);
 
+    let xor = XOR::from(data_dir);
+
     thread::spawn(move || {
         blk_index_to_blk_path
             .range(blk_index..)
@@ -69,9 +67,26 @@ pub fn new(
                 let blk_metadata = BlkMetadata::new(blk_index, blk_path.as_path());
 
                 let blk_bytes = fs::read(blk_path).unwrap();
+
+                let res = send_block_reader.send((blk_metadata, blk_bytes));
+                if let Err(e) = res {
+                    dbg!(e);
+                    return ControlFlow::Break(());
+                }
+
+                ControlFlow::Continue(())
+            });
+    });
+
+    thread::spawn(move || {
+        recv_block_reader
+            .iter()
+            .try_for_each(|(blk_metadata, blk_bytes)| -> ControlFlow<(), _> {
+                let blk_bytes = xor.process(blk_bytes);
+
                 let blk_bytes_len = blk_bytes.len() as u64;
 
-                let mut cursor = Cursor::new(blk_bytes.as_slice());
+                let mut cursor = Cursor::new(blk_bytes);
 
                 let mut current_4bytes = [0; 4];
 
@@ -101,7 +116,7 @@ pub fn new(
 
                     cursor.read_exact(&mut bytes).unwrap();
 
-                    if send_block_reader.send((blk_metadata, BlockState::Raw(bytes))).is_err() {
+                    if send_block_xor.send((blk_metadata, BlockState::Raw(bytes))).is_err() {
                         return ControlFlow::Break(());
                     }
                 }
@@ -133,7 +148,7 @@ pub fn new(
             })
         };
 
-        recv_block_reader.iter().try_for_each(|tuple| {
+        recv_block_xor.iter().try_for_each(|tuple| {
             bulk.push(tuple);
 
             if bulk.len() < BOUND_CAP / 2 {
@@ -192,15 +207,12 @@ pub fn new(
                         max_height: height,
                         modified_time: blk_metadata.modified_time,
                     });
-            } else {
-                dbg!(blk_metadata.index, len);
-                panic!()
             }
 
             let mut opt = if current_height == height {
                 Some((block, hash))
             } else {
-                if start.map_or(true, |start| start <= height) && end.map_or(true, |end| end >= height) {
+                if start.is_none_or(|start| start <= height) && end.is_none_or(|end| end >= height) {
                     future_blocks.insert(height, (block, hash));
                 }
                 None
diff --git a/iterator/src/main.rs b/iterator/src/main.rs
index d055ff53b..4341a714d 100644
--- a/iterator/src/main.rs
+++ b/iterator/src/main.rs
@@ -15,7 +15,7 @@ fn main() {
     ));
 
     let start = None;
-    let end = None; //Some(200_000_u32.into());
+    let end = None;
 
     biterator::new(data_dir, start, end, rpc)
         .iter()
diff --git a/iterator/src/xor.rs b/iterator/src/xor.rs
new file mode 100644
index 000000000..54636283b
--- /dev/null
+++ b/iterator/src/xor.rs
@@ -0,0 +1,40 @@
+use std::{fs, path::Path};
+
+const XOR_LEN: usize = 8;
+
+#[derive(Debug, PartialEq, Eq, Default)]
+pub struct XOR([u8; XOR_LEN]);
+
+impl XOR {
+    pub fn process(&self, mut bytes: Vec<u8>) -> Vec<u8> {
+        if u64::from_ne_bytes(self.0) == 0 {
+            return bytes;
+        }
+
+        let len = bytes.len();
+        let mut bytes_index = 0;
+        let mut xor_index = 0;
+
+        while bytes_index < len {
+            bytes[bytes_index] ^= self.0[xor_index];
+            bytes_index += 1;
+            xor_index += 1;
+            if xor_index == XOR_LEN {
+                xor_index = 0;
+            }
+        }
+
+        bytes
+    }
+}
+
+impl From<&Path> for XOR {
+    fn from(value: &Path) -> Self {
+        Self(
+            fs::read(value.join("blocks/xor.dat"))
+                .unwrap_or(vec![0; 8])
+                .try_into()
+                .unwrap(),
+        )
+    }
+}
diff --git a/storable_vec/src/lib.rs b/storable_vec/src/lib.rs
index 51f8da646..184a31939 100644
--- a/storable_vec/src/lib.rs
+++ b/storable_vec/src/lib.rs
@@ -447,7 +447,7 @@ where
         let pushed_len = I::from(self.pushed_len());
         let disk_len = Self::i_to_usize(disk_len)?;
         while index < pushed_len {
-            f(((index + disk_len), self.get(index)?.map(Value::from).unwrap()))?;
+            f(((index + disk_len), self.get(index)?.unwrap()))?;
             index = index + 1;
         }
 

From 19cf34f9d41dff21a9458a056b327f8403693015 Mon Sep 17 00:00:00 2001
From: nym21 <expat-epochs0i@icloud.com>
Date: Sun, 23 Feb 2025 01:25:15 +0100
Subject: [PATCH 60/63] brk: first commit

---
 .gitignore                                    |   2 +-
 Cargo.lock                                    | 153 +++++------
 Cargo.toml                                    |  32 +--
 README.md                                     |   8 +-
 {src => _src}/main.rs                         |   6 +-
 {src => _src}/parser/actions/export.rs        |   0
 {src => _src}/parser/actions/iter_blocks.rs   |   2 +-
 {src => _src}/parser/actions/min_height.rs    |   0
 {src => _src}/parser/actions/mod.rs           |   0
 {src => _src}/parser/actions/parse.rs         |   2 +-
 {src => _src}/parser/databases/_trait.rs      |   0
 .../address_index_to_address_data.rs          |   0
 .../address_index_to_empty_address_data.rs    |   0
 .../databases/address_to_address_index.rs     |   0
 {src => _src}/parser/databases/metadata.rs    |   0
 {src => _src}/parser/databases/mod.rs         |   0
 .../parser/databases/txid_to_tx_data.rs       |   2 +-
 .../databases/txout_index_to_address_index.rs |   0
 .../parser/databases/txout_index_to_amount.rs |   0
 .../parser/datasets/_traits/any_dataset.rs    |   0
 .../datasets/_traits/any_dataset_group.rs     |   0
 .../parser/datasets/_traits/any_datasets.rs   |   0
 .../datasets/_traits/min_initial_state.rs     |   0
 {src => _src}/parser/datasets/_traits/mod.rs  |   0
 .../parser/datasets/address/all_metadata.rs   |   0
 .../parser/datasets/address/cohort.rs         |   0
 .../datasets/address/cohort_metadata.rs       |   0
 {src => _src}/parser/datasets/address/mod.rs  |   0
 .../parser/datasets/block_metadata.rs         |   0
 {src => _src}/parser/datasets/coindays.rs     |   0
 {src => _src}/parser/datasets/cointime.rs     |   0
 {src => _src}/parser/datasets/constant.rs     |   0
 .../parser/datasets/date_metadata.rs          |   0
 {src => _src}/parser/datasets/mining.rs       |   0
 {src => _src}/parser/datasets/mod.rs          |   0
 {src => _src}/parser/datasets/price.rs        |   0
 .../parser/datasets/subs/capitalization.rs    |   0
 {src => _src}/parser/datasets/subs/input.rs   |   0
 {src => _src}/parser/datasets/subs/mod.rs     |   0
 {src => _src}/parser/datasets/subs/output.rs  |   0
 .../parser/datasets/subs/price_paid.rs        |   0
 {src => _src}/parser/datasets/subs/ratio.rs   |   0
 .../parser/datasets/subs/realized.rs          |   0
 {src => _src}/parser/datasets/subs/recap.rs   |   0
 {src => _src}/parser/datasets/subs/supply.rs  |   0
 .../parser/datasets/subs/unrealized.rs        |   0
 {src => _src}/parser/datasets/subs/utxo.rs    |   0
 {src => _src}/parser/datasets/transaction.rs  |   0
 {src => _src}/parser/datasets/utxo/dataset.rs |   0
 {src => _src}/parser/datasets/utxo/mod.rs     |   0
 {src => _src}/parser/mod.rs                   |   2 +-
 {src => _src}/parser/price/binance.rs         |   0
 {src => _src}/parser/price/kibo.rs            |   0
 {src => _src}/parser/price/kraken.rs          |   0
 {src => _src}/parser/price/mod.rs             |   0
 {src => _src}/parser/states/_trait.rs         |   0
 .../address/cohort_durable_states.rs          |   0
 .../cohorts_states/address/cohort_id.rs       |   0
 .../address/cohorts_durable_states.rs         |   0
 .../address/cohorts_input_states.rs           |   0
 .../address/cohorts_one_shot_states.rs        |   0
 .../address/cohorts_output_states.rs          |   0
 .../address/cohorts_realized_states.rs        |   0
 .../states/cohorts_states/address/mod.rs      |   0
 .../address/split_by_address_cohort.rs        |   0
 .../any/capitalization_state.rs               |   0
 .../cohorts_states/any/durable_states.rs      |   0
 .../states/cohorts_states/any/input_state.rs  |   0
 .../parser/states/cohorts_states/any/mod.rs   |   0
 .../cohorts_states/any/one_shot_states.rs     |   0
 .../states/cohorts_states/any/output_state.rs |   0
 .../cohorts_states/any/price_paid_state.rs    |   0
 .../cohorts_states/any/price_to_value.rs      |   0
 .../cohorts_states/any/realized_state.rs      |   0
 .../states/cohorts_states/any/supply_state.rs |   0
 .../cohorts_states/any/unrealized_state.rs    |   0
 .../states/cohorts_states/any/utxo_state.rs   |   0
 .../parser/states/cohorts_states/mod.rs       |   0
 .../utxo/cohort_durable_states.rs             |   0
 .../cohorts_states/utxo/cohort_filter.rs      |   0
 .../cohorts_states/utxo/cohort_filters.rs     |   0
 .../states/cohorts_states/utxo/cohort_id.rs   |   0
 .../utxo/cohorts_durable_states.rs            |   0
 .../utxo/cohorts_one_shot_states.rs           |   0
 .../utxo/cohorts_sent_states.rs               |   0
 .../parser/states/cohorts_states/utxo/mod.rs  |   0
 .../utxo/split_by_utxo_cohort.rs              |   0
 {src => _src}/parser/states/counters.rs       |   0
 {src => _src}/parser/states/date_data_vec.rs  |   0
 {src => _src}/parser/states/mod.rs            |   0
 {src => _src}/structs/address.rs              |   2 +-
 {src => _src}/structs/address_data.rs         |   0
 {src => _src}/structs/address_liquidity.rs    |   0
 .../structs/address_realized_data.rs          |   0
 {src => _src}/structs/address_size.rs         |   0
 {src => _src}/structs/address_split.rs        |   0
 {src => _src}/structs/address_type.rs         |   0
 {src => _src}/structs/amount.rs               |   6 +-
 {src => _src}/structs/any_map.rs              |   0
 {src => _src}/structs/array.rs                |   0
 {src => _src}/structs/bi_map.rs               |   0
 {src => _src}/structs/block_data.rs           |   0
 {src => _src}/structs/block_path.rs           |   0
 {src => _src}/structs/config.rs               |   2 +-
 {src => _src}/structs/counter.rs              |   0
 {src => _src}/structs/date.rs                 |   0
 {src => _src}/structs/date_data.rs            |   0
 {src => _src}/structs/date_map.rs             |   0
 {src => _src}/structs/date_map_chunk_id.rs    |   0
 {src => _src}/structs/empty_address_data.rs   |   0
 {src => _src}/structs/epoch.rs                |   0
 {src => _src}/structs/exit.rs                 |   0
 {src => _src}/structs/generic_map.rs          |   0
 {src => _src}/structs/height.rs               |   4 +-
 {src => _src}/structs/height_map.rs           |   0
 {src => _src}/structs/height_map_chunk_id.rs  |   0
 {src => _src}/structs/instant.rs              |   0
 {src => _src}/structs/liquidity.rs            |   0
 {src => _src}/structs/map_path.rs             |   0
 {src => _src}/structs/map_value.rs            |   0
 {src => _src}/structs/mod.rs                  |   0
 {src => _src}/structs/ohlc.rs                 |   0
 {src => _src}/structs/partial_txout_data.rs   |   0
 {src => _src}/structs/price.rs                |   0
 {src => _src}/structs/ram.rs                  |   0
 {src => _src}/structs/rpc.rs                  |   2 +-
 {src => _src}/structs/sent_data.rs            |   0
 {src => _src}/structs/serialized_btreemap.rs  |   0
 {src => _src}/structs/serialized_vec.rs       |   0
 {src => _src}/structs/timestamp.rs            |   0
 {src => _src}/structs/tx_data.rs              |   0
 {src => _src}/structs/txout_index.rs          |   0
 {src => _src}/utils/consts.rs                 |   0
 {src => _src}/utils/flamegraph.rs             |   0
 {src => _src}/utils/log.rs                    |   0
 {src => _src}/utils/lossy.rs                  |   0
 {src => _src}/utils/mod.rs                    |   0
 {src => _src}/utils/percentile.rs             |   0
 {src => _src}/utils/retry.rs                  |   0
 {src => _src}/utils/time.rs                   |   0
 {cli => crates/brk_cli}/Cargo.toml            |   2 +-
 {cli => crates/brk_cli}/src/main.rs           |   0
 {computer => crates/brk_computer}/Cargo.toml  |  10 +-
 {computer => crates/brk_computer}/src/lib.rs  |   6 +-
 {computer => crates/brk_computer}/src/main.rs |   4 +-
 .../brk_computer}/src/storage/fjalls.rs       |   2 +-
 .../brk_computer}/src/storage/mod.rs          |   0
 .../src/storage/storable_vecs.rs              |   4 +-
 .../src/structs/addressindextxoutindex.rs     |   2 +-
 .../brk_computer}/src/structs/bitcoin.rs      |   2 +-
 .../brk_computer}/src/structs/feerate.rs      |   0
 .../brk_computer}/src/structs/mod.rs          |   0
 .../brk_computer}/src/structs/ohlc.rs         |   0
 .../brk_computer}/src/structs/unit.rs         |   0
 {pricer => crates/brk_fetcher}/Cargo.toml     |   9 +-
 .../brk_fetcher}/src/fetchers/binance.rs      |   8 +-
 .../brk_fetcher}/src/fetchers/kibo.rs         |   6 +-
 .../brk_fetcher}/src/fetchers/kraken.rs       |   6 +-
 .../brk_fetcher}/src/fetchers/mod.rs          |   0
 .../brk_fetcher}/src/fetchers/retry.rs        |   2 +-
 {pricer => crates/brk_fetcher}/src/lib.rs     |   4 +-
 {pricer => crates/brk_fetcher}/src/main.rs    |   6 +-
 .../brk_fetcher}/src/structs/cents.rs         |   0
 .../brk_fetcher}/src/structs/close.rs         |   0
 .../brk_fetcher}/src/structs/date.rs          |   4 +-
 .../brk_fetcher}/src/structs/dateindex.rs     |   0
 .../brk_fetcher}/src/structs/dollars.rs       |   0
 .../brk_fetcher}/src/structs/high.rs          |   0
 .../brk_fetcher}/src/structs/low.rs           |   0
 .../brk_fetcher}/src/structs/mod.rs           |   0
 .../brk_fetcher}/src/structs/open.rs          |   0
 {indexer => crates/brk_indexer}/Cargo.toml    |   9 +-
 {indexer => crates/brk_indexer}/README.md     |   0
 {indexer => crates/brk_indexer}/src/lib.rs    |  16 +-
 {indexer => crates/brk_indexer}/src/main.rs   |   8 +-
 .../brk_indexer}/src/storage/fjalls/base.rs   |   4 +-
 .../brk_indexer}/src/storage/fjalls/meta.rs   |   1 +
 .../brk_indexer}/src/storage/fjalls/mod.rs    |   0
 .../src/storage/fjalls/version.rs             |   0
 .../brk_indexer}/src/storage/mod.rs           |   0
 .../src/storage/storable_vecs/base.rs         |   6 +-
 .../src/storage/storable_vecs/mod.rs          |  29 ++-
 .../brk_indexer}/src/structs/addressbytes.rs  |   2 +-
 .../brk_indexer}/src/structs/addressindex.rs  |   0
 .../brk_indexer}/src/structs/addresstype.rs   |   2 +-
 .../src/structs/addresstypeindex.rs           |   0
 .../brk_indexer}/src/structs/blockhash.rs     |   8 +-
 .../brk_indexer}/src/structs/compressed.rs    |   0
 .../brk_indexer}/src/structs/indexes.rs       |   4 +-
 .../brk_indexer}/src/structs/locktime.rs      |   2 +-
 .../brk_indexer}/src/structs/mod.rs           |   0
 .../brk_indexer}/src/structs/sats.rs          |   2 +-
 .../brk_indexer}/src/structs/timestamp.rs     |   0
 .../brk_indexer}/src/structs/txid.rs          |   0
 .../brk_indexer}/src/structs/txindex.rs       |   0
 .../brk_indexer}/src/structs/txinindex.rs     |   0
 .../brk_indexer}/src/structs/txoutindex.rs    |   0
 .../brk_indexer}/src/structs/txversion.rs     |   0
 .../brk_indexer}/src/structs/vin.rs           |   0
 .../brk_indexer}/src/structs/vout.rs          |   0
 .../brk_indexer}/src/structs/weight.rs        |   0
 {iterator => crates/brk_parser}/CHANGELOG.md  |   0
 {iterator => crates/brk_parser}/Cargo.lock    |   0
 {iterator => crates/brk_parser}/Cargo.toml    |   2 +-
 {iterator => crates/brk_parser}/LICENSE.md    |   0
 {iterator => crates/brk_parser}/README.md     |   0
 .../brk_parser}/src/blk_index_to_blk_path.rs  |   0
 .../brk_parser}/src/blk_index_to_blk_recap.rs |   0
 .../brk_parser}/src/blk_metadata.rs           |   0
 .../brk_parser}/src/blk_metadata_and_block.rs |   0
 .../brk_parser}/src/blk_recap.rs              |   0
 {iterator => crates/brk_parser}/src/error.rs  |   0
 {iterator => crates/brk_parser}/src/height.rs |   0
 {iterator => crates/brk_parser}/src/lib.rs    |   0
 {iterator => crates/brk_parser}/src/main.rs   |   2 +-
 {iterator => crates/brk_parser}/src/utils.rs  |   0
 {iterator => crates/brk_parser}/src/xor.rs    |   0
 {logger => crates/brk_printer}/Cargo.toml     |   2 +-
 {logger => crates/brk_printer}/src/lib.rs     |   0
 {logger => crates/brk_printer}/src/main.rs    |   3 +-
 {server => crates/brk_server}/Cargo.toml      |   9 +-
 .../brk_server}/src/api/explorer/mod.rs       |   0
 {server => crates/brk_server}/src/api/mod.rs  |   0
 .../brk_server}/src/api/vecs/format.rs        |   0
 .../brk_server}/src/api/vecs/index.rs         |   0
 .../brk_server}/src/api/vecs/mod.rs           |   0
 .../brk_server}/src/api/vecs/query.rs         |   0
 .../brk_server}/src/api/vecs/tree.rs          |   0
 .../brk_server}/src/files/file.rs             |   5 +-
 .../brk_server}/src/files/minify.rs           |   0
 .../brk_server}/src/files/mod.rs              |   0
 {server => crates/brk_server}/src/lib.rs      |   8 +-
 {server => crates/brk_server}/src/main.rs     |   8 +-
 .../brk_server}/src/traits/header_map.rs      |   6 +-
 .../brk_server}/src/traits/mod.rs             |   0
 .../brk_server}/src/traits/response.rs        |   0
 {hodor => crates/hodor}/Cargo.toml            |   2 +-
 {hodor => crates/hodor}/src/lib.rs            |   0
 .../storable_vec}/.gitignore                  |   0
 .../storable_vec}/Cargo.lock                  |   0
 .../storable_vec}/Cargo.toml                  |   0
 .../storable_vec}/LICENSE.md                  |   0
 .../storable_vec}/README.md                   |   0
 .../storable_vec}/src/enums/error.rs          |   0
 .../storable_vec}/src/enums/mod.rs            |   0
 .../storable_vec}/src/enums/value.rs          |   0
 .../storable_vec}/src/lib.rs                  |   0
 .../storable_vec}/src/main.rs                 |   0
 .../storable_vec}/src/structs/mod.rs          |   0
 .../storable_vec}/src/structs/unsafe_slice.rs |   0
 .../storable_vec}/src/structs/version.rs      |   0
 .../storable_vec}/src/traits/any.rs           |   0
 .../storable_vec}/src/traits/bytes.rs         |   0
 .../storable_vec}/src/traits/mod.rs           |   0
 .../storable_vec}/src/traits/stored_index.rs  |   0
 .../storable_vec}/src/traits/stored_type.rs   |   0
 snkrj/Cargo.lock                              | 242 ------------------
 snkrj/Cargo.toml                              |  12 -
 snkrj/LICENSE.md                              |  21 --
 snkrj/README.md                               |  37 ---
 snkrj/src/base.rs                             | 174 -------------
 snkrj/src/lib.rs                              |  14 -
 snkrj/src/main.rs                             |  29 ---
 snkrj/src/multi.rs                            | 240 -----------------
 snkrj/src/traits.rs                           |  59 -----
 snkrj/src/unique.rs                           | 223 ----------------
 266 files changed, 225 insertions(+), 1268 deletions(-)
 rename {src => _src}/main.rs (93%)
 rename {src => _src}/parser/actions/export.rs (100%)
 rename {src => _src}/parser/actions/iter_blocks.rs (99%)
 rename {src => _src}/parser/actions/min_height.rs (100%)
 rename {src => _src}/parser/actions/mod.rs (100%)
 rename {src => _src}/parser/actions/parse.rs (99%)
 rename {src => _src}/parser/databases/_trait.rs (100%)
 rename {src => _src}/parser/databases/address_index_to_address_data.rs (100%)
 rename {src => _src}/parser/databases/address_index_to_empty_address_data.rs (100%)
 rename {src => _src}/parser/databases/address_to_address_index.rs (100%)
 rename {src => _src}/parser/databases/metadata.rs (100%)
 rename {src => _src}/parser/databases/mod.rs (100%)
 rename {src => _src}/parser/databases/txid_to_tx_data.rs (99%)
 rename {src => _src}/parser/databases/txout_index_to_address_index.rs (100%)
 rename {src => _src}/parser/databases/txout_index_to_amount.rs (100%)
 rename {src => _src}/parser/datasets/_traits/any_dataset.rs (100%)
 rename {src => _src}/parser/datasets/_traits/any_dataset_group.rs (100%)
 rename {src => _src}/parser/datasets/_traits/any_datasets.rs (100%)
 rename {src => _src}/parser/datasets/_traits/min_initial_state.rs (100%)
 rename {src => _src}/parser/datasets/_traits/mod.rs (100%)
 rename {src => _src}/parser/datasets/address/all_metadata.rs (100%)
 rename {src => _src}/parser/datasets/address/cohort.rs (100%)
 rename {src => _src}/parser/datasets/address/cohort_metadata.rs (100%)
 rename {src => _src}/parser/datasets/address/mod.rs (100%)
 rename {src => _src}/parser/datasets/block_metadata.rs (100%)
 rename {src => _src}/parser/datasets/coindays.rs (100%)
 rename {src => _src}/parser/datasets/cointime.rs (100%)
 rename {src => _src}/parser/datasets/constant.rs (100%)
 rename {src => _src}/parser/datasets/date_metadata.rs (100%)
 rename {src => _src}/parser/datasets/mining.rs (100%)
 rename {src => _src}/parser/datasets/mod.rs (100%)
 rename {src => _src}/parser/datasets/price.rs (100%)
 rename {src => _src}/parser/datasets/subs/capitalization.rs (100%)
 rename {src => _src}/parser/datasets/subs/input.rs (100%)
 rename {src => _src}/parser/datasets/subs/mod.rs (100%)
 rename {src => _src}/parser/datasets/subs/output.rs (100%)
 rename {src => _src}/parser/datasets/subs/price_paid.rs (100%)
 rename {src => _src}/parser/datasets/subs/ratio.rs (100%)
 rename {src => _src}/parser/datasets/subs/realized.rs (100%)
 rename {src => _src}/parser/datasets/subs/recap.rs (100%)
 rename {src => _src}/parser/datasets/subs/supply.rs (100%)
 rename {src => _src}/parser/datasets/subs/unrealized.rs (100%)
 rename {src => _src}/parser/datasets/subs/utxo.rs (100%)
 rename {src => _src}/parser/datasets/transaction.rs (100%)
 rename {src => _src}/parser/datasets/utxo/dataset.rs (100%)
 rename {src => _src}/parser/datasets/utxo/mod.rs (100%)
 rename {src => _src}/parser/mod.rs (95%)
 rename {src => _src}/parser/price/binance.rs (100%)
 rename {src => _src}/parser/price/kibo.rs (100%)
 rename {src => _src}/parser/price/kraken.rs (100%)
 rename {src => _src}/parser/price/mod.rs (100%)
 rename {src => _src}/parser/states/_trait.rs (100%)
 rename {src => _src}/parser/states/cohorts_states/address/cohort_durable_states.rs (100%)
 rename {src => _src}/parser/states/cohorts_states/address/cohort_id.rs (100%)
 rename {src => _src}/parser/states/cohorts_states/address/cohorts_durable_states.rs (100%)
 rename {src => _src}/parser/states/cohorts_states/address/cohorts_input_states.rs (100%)
 rename {src => _src}/parser/states/cohorts_states/address/cohorts_one_shot_states.rs (100%)
 rename {src => _src}/parser/states/cohorts_states/address/cohorts_output_states.rs (100%)
 rename {src => _src}/parser/states/cohorts_states/address/cohorts_realized_states.rs (100%)
 rename {src => _src}/parser/states/cohorts_states/address/mod.rs (100%)
 rename {src => _src}/parser/states/cohorts_states/address/split_by_address_cohort.rs (100%)
 rename {src => _src}/parser/states/cohorts_states/any/capitalization_state.rs (100%)
 rename {src => _src}/parser/states/cohorts_states/any/durable_states.rs (100%)
 rename {src => _src}/parser/states/cohorts_states/any/input_state.rs (100%)
 rename {src => _src}/parser/states/cohorts_states/any/mod.rs (100%)
 rename {src => _src}/parser/states/cohorts_states/any/one_shot_states.rs (100%)
 rename {src => _src}/parser/states/cohorts_states/any/output_state.rs (100%)
 rename {src => _src}/parser/states/cohorts_states/any/price_paid_state.rs (100%)
 rename {src => _src}/parser/states/cohorts_states/any/price_to_value.rs (100%)
 rename {src => _src}/parser/states/cohorts_states/any/realized_state.rs (100%)
 rename {src => _src}/parser/states/cohorts_states/any/supply_state.rs (100%)
 rename {src => _src}/parser/states/cohorts_states/any/unrealized_state.rs (100%)
 rename {src => _src}/parser/states/cohorts_states/any/utxo_state.rs (100%)
 rename {src => _src}/parser/states/cohorts_states/mod.rs (100%)
 rename {src => _src}/parser/states/cohorts_states/utxo/cohort_durable_states.rs (100%)
 rename {src => _src}/parser/states/cohorts_states/utxo/cohort_filter.rs (100%)
 rename {src => _src}/parser/states/cohorts_states/utxo/cohort_filters.rs (100%)
 rename {src => _src}/parser/states/cohorts_states/utxo/cohort_id.rs (100%)
 rename {src => _src}/parser/states/cohorts_states/utxo/cohorts_durable_states.rs (100%)
 rename {src => _src}/parser/states/cohorts_states/utxo/cohorts_one_shot_states.rs (100%)
 rename {src => _src}/parser/states/cohorts_states/utxo/cohorts_sent_states.rs (100%)
 rename {src => _src}/parser/states/cohorts_states/utxo/mod.rs (100%)
 rename {src => _src}/parser/states/cohorts_states/utxo/split_by_utxo_cohort.rs (100%)
 rename {src => _src}/parser/states/counters.rs (100%)
 rename {src => _src}/parser/states/date_data_vec.rs (100%)
 rename {src => _src}/parser/states/mod.rs (100%)
 rename {src => _src}/structs/address.rs (99%)
 rename {src => _src}/structs/address_data.rs (100%)
 rename {src => _src}/structs/address_liquidity.rs (100%)
 rename {src => _src}/structs/address_realized_data.rs (100%)
 rename {src => _src}/structs/address_size.rs (100%)
 rename {src => _src}/structs/address_split.rs (100%)
 rename {src => _src}/structs/address_type.rs (100%)
 rename {src => _src}/structs/amount.rs (96%)
 rename {src => _src}/structs/any_map.rs (100%)
 rename {src => _src}/structs/array.rs (100%)
 rename {src => _src}/structs/bi_map.rs (100%)
 rename {src => _src}/structs/block_data.rs (100%)
 rename {src => _src}/structs/block_path.rs (100%)
 rename {src => _src}/structs/config.rs (99%)
 rename {src => _src}/structs/counter.rs (100%)
 rename {src => _src}/structs/date.rs (100%)
 rename {src => _src}/structs/date_data.rs (100%)
 rename {src => _src}/structs/date_map.rs (100%)
 rename {src => _src}/structs/date_map_chunk_id.rs (100%)
 rename {src => _src}/structs/empty_address_data.rs (100%)
 rename {src => _src}/structs/epoch.rs (100%)
 rename {src => _src}/structs/exit.rs (100%)
 rename {src => _src}/structs/generic_map.rs (100%)
 rename {src => _src}/structs/height.rs (96%)
 rename {src => _src}/structs/height_map.rs (100%)
 rename {src => _src}/structs/height_map_chunk_id.rs (100%)
 rename {src => _src}/structs/instant.rs (100%)
 rename {src => _src}/structs/liquidity.rs (100%)
 rename {src => _src}/structs/map_path.rs (100%)
 rename {src => _src}/structs/map_value.rs (100%)
 rename {src => _src}/structs/mod.rs (100%)
 rename {src => _src}/structs/ohlc.rs (100%)
 rename {src => _src}/structs/partial_txout_data.rs (100%)
 rename {src => _src}/structs/price.rs (100%)
 rename {src => _src}/structs/ram.rs (100%)
 rename {src => _src}/structs/rpc.rs (90%)
 rename {src => _src}/structs/sent_data.rs (100%)
 rename {src => _src}/structs/serialized_btreemap.rs (100%)
 rename {src => _src}/structs/serialized_vec.rs (100%)
 rename {src => _src}/structs/timestamp.rs (100%)
 rename {src => _src}/structs/tx_data.rs (100%)
 rename {src => _src}/structs/txout_index.rs (100%)
 rename {src => _src}/utils/consts.rs (100%)
 rename {src => _src}/utils/flamegraph.rs (100%)
 rename {src => _src}/utils/log.rs (100%)
 rename {src => _src}/utils/lossy.rs (100%)
 rename {src => _src}/utils/mod.rs (100%)
 rename {src => _src}/utils/percentile.rs (100%)
 rename {src => _src}/utils/retry.rs (100%)
 rename {src => _src}/utils/time.rs (100%)
 rename {cli => crates/brk_cli}/Cargo.toml (90%)
 rename {cli => crates/brk_cli}/src/main.rs (100%)
 rename {computer => crates/brk_computer}/Cargo.toml (58%)
 rename {computer => crates/brk_computer}/src/lib.rs (97%)
 rename {computer => crates/brk_computer}/src/main.rs (88%)
 rename {computer => crates/brk_computer}/src/storage/fjalls.rs (96%)
 rename {computer => crates/brk_computer}/src/storage/mod.rs (100%)
 rename {computer => crates/brk_computer}/src/storage/storable_vecs.rs (97%)
 rename {computer => crates/brk_computer}/src/structs/addressindextxoutindex.rs (93%)
 rename {computer => crates/brk_computer}/src/structs/bitcoin.rs (91%)
 rename {computer => crates/brk_computer}/src/structs/feerate.rs (100%)
 rename {computer => crates/brk_computer}/src/structs/mod.rs (100%)
 rename {computer => crates/brk_computer}/src/structs/ohlc.rs (100%)
 rename {computer => crates/brk_computer}/src/structs/unit.rs (100%)
 rename {pricer => crates/brk_fetcher}/Cargo.toml (66%)
 rename {pricer => crates/brk_fetcher}/src/fetchers/binance.rs (98%)
 rename {pricer => crates/brk_fetcher}/src/fetchers/kibo.rs (99%)
 rename {pricer => crates/brk_fetcher}/src/fetchers/kraken.rs (96%)
 rename {pricer => crates/brk_fetcher}/src/fetchers/mod.rs (100%)
 rename {pricer => crates/brk_fetcher}/src/fetchers/retry.rs (96%)
 rename {pricer => crates/brk_fetcher}/src/lib.rs (98%)
 rename {pricer => crates/brk_fetcher}/src/main.rs (78%)
 rename {pricer => crates/brk_fetcher}/src/structs/cents.rs (100%)
 rename {pricer => crates/brk_fetcher}/src/structs/close.rs (100%)
 rename {pricer => crates/brk_fetcher}/src/structs/date.rs (94%)
 rename {pricer => crates/brk_fetcher}/src/structs/dateindex.rs (100%)
 rename {pricer => crates/brk_fetcher}/src/structs/dollars.rs (100%)
 rename {pricer => crates/brk_fetcher}/src/structs/high.rs (100%)
 rename {pricer => crates/brk_fetcher}/src/structs/low.rs (100%)
 rename {pricer => crates/brk_fetcher}/src/structs/mod.rs (100%)
 rename {pricer => crates/brk_fetcher}/src/structs/open.rs (100%)
 rename {indexer => crates/brk_indexer}/Cargo.toml (73%)
 rename {indexer => crates/brk_indexer}/README.md (100%)
 rename {indexer => crates/brk_indexer}/src/lib.rs (98%)
 rename {indexer => crates/brk_indexer}/src/main.rs (89%)
 rename {indexer => crates/brk_indexer}/src/storage/fjalls/base.rs (98%)
 rename {indexer => crates/brk_indexer}/src/storage/fjalls/meta.rs (99%)
 rename {indexer => crates/brk_indexer}/src/storage/fjalls/mod.rs (100%)
 rename {indexer => crates/brk_indexer}/src/storage/fjalls/version.rs (100%)
 rename {indexer => crates/brk_indexer}/src/storage/mod.rs (100%)
 rename {indexer => crates/brk_indexer}/src/storage/storable_vecs/base.rs (93%)
 rename {indexer => crates/brk_indexer}/src/storage/storable_vecs/mod.rs (94%)
 rename {indexer => crates/brk_indexer}/src/structs/addressbytes.rs (99%)
 rename {indexer => crates/brk_indexer}/src/structs/addressindex.rs (100%)
 rename {indexer => crates/brk_indexer}/src/structs/addresstype.rs (97%)
 rename {indexer => crates/brk_indexer}/src/structs/addresstypeindex.rs (100%)
 rename {indexer => crates/brk_indexer}/src/structs/blockhash.rs (93%)
 rename {indexer => crates/brk_indexer}/src/structs/compressed.rs (100%)
 rename {indexer => crates/brk_indexer}/src/structs/indexes.rs (98%)
 rename {indexer => crates/brk_indexer}/src/structs/locktime.rs (97%)
 rename {indexer => crates/brk_indexer}/src/structs/mod.rs (100%)
 rename {indexer => crates/brk_indexer}/src/structs/sats.rs (97%)
 rename {indexer => crates/brk_indexer}/src/structs/timestamp.rs (100%)
 rename {indexer => crates/brk_indexer}/src/structs/txid.rs (100%)
 rename {indexer => crates/brk_indexer}/src/structs/txindex.rs (100%)
 rename {indexer => crates/brk_indexer}/src/structs/txinindex.rs (100%)
 rename {indexer => crates/brk_indexer}/src/structs/txoutindex.rs (100%)
 rename {indexer => crates/brk_indexer}/src/structs/txversion.rs (100%)
 rename {indexer => crates/brk_indexer}/src/structs/vin.rs (100%)
 rename {indexer => crates/brk_indexer}/src/structs/vout.rs (100%)
 rename {indexer => crates/brk_indexer}/src/structs/weight.rs (100%)
 rename {iterator => crates/brk_parser}/CHANGELOG.md (100%)
 rename {iterator => crates/brk_parser}/Cargo.lock (100%)
 rename {iterator => crates/brk_parser}/Cargo.toml (97%)
 rename {iterator => crates/brk_parser}/LICENSE.md (100%)
 rename {iterator => crates/brk_parser}/README.md (100%)
 rename {iterator => crates/brk_parser}/src/blk_index_to_blk_path.rs (100%)
 rename {iterator => crates/brk_parser}/src/blk_index_to_blk_recap.rs (100%)
 rename {iterator => crates/brk_parser}/src/blk_metadata.rs (100%)
 rename {iterator => crates/brk_parser}/src/blk_metadata_and_block.rs (100%)
 rename {iterator => crates/brk_parser}/src/blk_recap.rs (100%)
 rename {iterator => crates/brk_parser}/src/error.rs (100%)
 rename {iterator => crates/brk_parser}/src/height.rs (100%)
 rename {iterator => crates/brk_parser}/src/lib.rs (100%)
 rename {iterator => crates/brk_parser}/src/main.rs (91%)
 rename {iterator => crates/brk_parser}/src/utils.rs (100%)
 rename {iterator => crates/brk_parser}/src/xor.rs (100%)
 rename {logger => crates/brk_printer}/Cargo.toml (92%)
 rename {logger => crates/brk_printer}/src/lib.rs (100%)
 rename {logger => crates/brk_printer}/src/main.rs (55%)
 rename {server => crates/brk_server}/Cargo.toml (79%)
 rename {server => crates/brk_server}/src/api/explorer/mod.rs (100%)
 rename {server => crates/brk_server}/src/api/mod.rs (100%)
 rename {server => crates/brk_server}/src/api/vecs/format.rs (100%)
 rename {server => crates/brk_server}/src/api/vecs/index.rs (100%)
 rename {server => crates/brk_server}/src/api/vecs/mod.rs (100%)
 rename {server => crates/brk_server}/src/api/vecs/query.rs (100%)
 rename {server => crates/brk_server}/src/api/vecs/tree.rs (100%)
 rename {server => crates/brk_server}/src/files/file.rs (98%)
 rename {server => crates/brk_server}/src/files/minify.rs (100%)
 rename {server => crates/brk_server}/src/files/mod.rs (100%)
 rename {server => crates/brk_server}/src/lib.rs (93%)
 rename {server => crates/brk_server}/src/main.rs (71%)
 rename {server => crates/brk_server}/src/traits/header_map.rs (98%)
 rename {server => crates/brk_server}/src/traits/mod.rs (100%)
 rename {server => crates/brk_server}/src/traits/response.rs (100%)
 rename {hodor => crates/hodor}/Cargo.toml (65%)
 rename {hodor => crates/hodor}/src/lib.rs (100%)
 rename {storable_vec => crates/storable_vec}/.gitignore (100%)
 rename {storable_vec => crates/storable_vec}/Cargo.lock (100%)
 rename {storable_vec => crates/storable_vec}/Cargo.toml (100%)
 rename {storable_vec => crates/storable_vec}/LICENSE.md (100%)
 rename {storable_vec => crates/storable_vec}/README.md (100%)
 rename {storable_vec => crates/storable_vec}/src/enums/error.rs (100%)
 rename {storable_vec => crates/storable_vec}/src/enums/mod.rs (100%)
 rename {storable_vec => crates/storable_vec}/src/enums/value.rs (100%)
 rename {storable_vec => crates/storable_vec}/src/lib.rs (100%)
 rename {storable_vec => crates/storable_vec}/src/main.rs (100%)
 rename {storable_vec => crates/storable_vec}/src/structs/mod.rs (100%)
 rename {storable_vec => crates/storable_vec}/src/structs/unsafe_slice.rs (100%)
 rename {storable_vec => crates/storable_vec}/src/structs/version.rs (100%)
 rename {storable_vec => crates/storable_vec}/src/traits/any.rs (100%)
 rename {storable_vec => crates/storable_vec}/src/traits/bytes.rs (100%)
 rename {storable_vec => crates/storable_vec}/src/traits/mod.rs (100%)
 rename {storable_vec => crates/storable_vec}/src/traits/stored_index.rs (100%)
 rename {storable_vec => crates/storable_vec}/src/traits/stored_type.rs (100%)
 delete mode 100644 snkrj/Cargo.lock
 delete mode 100644 snkrj/Cargo.toml
 delete mode 100644 snkrj/LICENSE.md
 delete mode 100644 snkrj/README.md
 delete mode 100644 snkrj/src/base.rs
 delete mode 100644 snkrj/src/lib.rs
 delete mode 100644 snkrj/src/main.rs
 delete mode 100644 snkrj/src/multi.rs
 delete mode 100644 snkrj/src/traits.rs
 delete mode 100644 snkrj/src/unique.rs

diff --git a/.gitignore b/.gitignore
index 70eb0fa00..d0bd3df09 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,7 +8,7 @@ target
 *\ copy*
 
 # Ignored
-_ignore
+/_*
 
 # Editors
 .vscode
diff --git a/Cargo.lock b/Cargo.lock
index e7ab13591..d764e42e5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -238,46 +238,6 @@ version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d965446196e3b7decd44aa7ee49e31d630118f90ef12f97900f262eb915c951d"
 
-[[package]]
-name = "berver"
-version = "0.1.0"
-dependencies = [
- "axum",
- "bindexer",
- "bomputer",
- "cl0g",
- "color-eyre",
- "derive_deref",
- "jiff",
- "oxc",
- "serde",
- "serde_json",
- "storable_vec",
- "tokio",
- "tower-http",
-]
-
-[[package]]
-name = "bindexer"
-version = "0.1.0"
-dependencies = [
- "bitcoin",
- "biterator",
- "cl0g",
- "color-eyre",
- "derive_deref",
- "fjall",
- "hodor",
- "jiff",
- "rapidhash",
- "rayon",
- "rlimit",
- "serde",
- "serde_bytes",
- "storable_vec",
- "zerocopy 0.8.20",
-]
-
 [[package]]
 name = "bitcoin"
 version = "0.32.5"
@@ -357,7 +317,71 @@ dependencies = [
 ]
 
 [[package]]
-name = "biterator"
+name = "bitflags"
+version = "2.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36"
+
+[[package]]
+name = "brk_cli"
+version = "0.1.0"
+
+[[package]]
+name = "brk_computer"
+version = "0.1.0"
+dependencies = [
+ "brk_fetcher",
+ "brk_indexer",
+ "brk_parser",
+ "color-eyre",
+ "derive_deref",
+ "fjall",
+ "hodor",
+ "storable_vec",
+ "zerocopy 0.8.20",
+]
+
+[[package]]
+name = "brk_fetcher"
+version = "0.1.0"
+dependencies = [
+ "brk_indexer",
+ "brk_printer",
+ "color-eyre",
+ "derive_deref",
+ "jiff",
+ "log",
+ "minreq",
+ "serde",
+ "serde_json",
+ "storable_vec",
+ "zerocopy 0.8.20",
+]
+
+[[package]]
+name = "brk_indexer"
+version = "0.1.0"
+dependencies = [
+ "bitcoin",
+ "brk_parser",
+ "brk_printer",
+ "color-eyre",
+ "derive_deref",
+ "fjall",
+ "hodor",
+ "jiff",
+ "log",
+ "rapidhash",
+ "rayon",
+ "rlimit",
+ "serde",
+ "serde_bytes",
+ "storable_vec",
+ "zerocopy 0.8.20",
+]
+
+[[package]]
+name = "brk_parser"
 version = "0.2.3"
 dependencies = [
  "bitcoin",
@@ -372,44 +396,33 @@ dependencies = [
 ]
 
 [[package]]
-name = "bitflags"
-version = "2.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36"
-
-[[package]]
-name = "bli"
-version = "0.1.0"
-
-[[package]]
-name = "bomputer"
+name = "brk_printer"
 version = "0.1.0"
 dependencies = [
- "bindexer",
- "biterator",
- "bricer",
  "color-eyre",
- "derive_deref",
- "fjall",
- "hodor",
- "storable_vec",
- "zerocopy 0.8.20",
+ "env_logger",
+ "jiff",
+ "log",
 ]
 
 [[package]]
-name = "bricer"
+name = "brk_server"
 version = "0.1.0"
 dependencies = [
- "bindexer",
- "cl0g",
+ "axum",
+ "brk_computer",
+ "brk_indexer",
+ "brk_printer",
  "color-eyre",
  "derive_deref",
  "jiff",
- "minreq",
+ "log",
+ "oxc",
  "serde",
  "serde_json",
  "storable_vec",
- "zerocopy 0.8.20",
+ "tokio",
+ "tower-http",
 ]
 
 [[package]]
@@ -492,16 +505,6 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
 
-[[package]]
-name = "cl0g"
-version = "0.1.0"
-dependencies = [
- "color-eyre",
- "env_logger",
- "jiff",
- "log",
-]
-
 [[package]]
 name = "color-eyre"
 version = "0.6.3"
diff --git a/Cargo.toml b/Cargo.toml
index ef5ae6f42..eff4598be 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,39 +1,29 @@
 [workspace]
-members = [
-    "cli",
-    "computer",
-    "hodor",
-    "indexer",
-    "iterator",
-    "logger",
-    "pricer",
-    "server",
-    "storable_vec",
-]
+members = ["crates/*"]
 resolver = "2"
 package.license = "MIT"
 package.edition = "2024"
 
 [workspace.dependencies]
 bitcoin = { version = "0.32.5", features = ["serde"] }
+brk_computer = { version = "0", path = "crates/brk_computer" }
+brk_fetcher = { version = "0", path = "crates/brk_fetcher" }
+brk_indexer = { version = "0", path = "crates/brk_indexer" }
+brk_parser = { version = "0", path = "crates/brk_parser", features = ["bytes"] }
+brk_printer = { version = "0", path = "crates/brk_printer" }
+brk_server = { version = "0", path = "crates/brk_server" }
 color-eyre = "0.6.3"
-computer = { version = "0", path = "computer", package = "bomputer" }
 derive_deref = "1.1.1"
 fjall = "2.6.5"
-hodor = { version = "0", path = "hodor" }
-indexer = { version = "0", path = "indexer", package = "bindexer" }
-iterator = { version = "0", path = "iterator", package = "biterator", features = [
-    "bytes",
-] }
+hodor = { version = "0", path = "crates/hodor" }
 jiff = "0.2.1"
 log = { version = "0.4.26" }
-logger = { version = "0", path = "logger", package = "cl0g" }
 minreq = { version = "2.13.2", features = ["https", "serde_json"] }
-pricer = { version = "0", path = "pricer", package = "bricer" }
 rayon = "1.10.0"
 serde = { version = "1.0.218", features = ["derive"] }
 serde_bytes = "0.11.15"
 serde_json = { version = "1.0.139", features = ["float_roundtrip"] }
-server = { version = "0", path = "server", package = "berver" }
-storable_vec = { version = "0", path = "storable_vec", features = ["json"] }
+storable_vec = { version = "0", path = "crates/storable_vec", features = [
+    "json",
+] }
 zerocopy = { version = "0.8.20", features = ["derive"] }
diff --git a/README.md b/README.md
index 900f36fa9..7aecf84a9 100644
--- a/README.md
+++ b/README.md
@@ -63,14 +63,10 @@ Please open an issue if you want to add another instance
 ### Requirements
 
 - At least 16 GB of RAM
-  - Recommended: 32 GB
 - A disk with 1 TB of free space (will use between 40% to 80% depending on several things)
   - Recommended: Rated at 3 GB/s (Thunderbolt 4 speed)
-- A running instance of bitcoin-core with:
-  - `-txindex=1`
-  - `-blocksxor=0`
-  - RPC credentials
-  - Example: `bitcoind -datadir="$HOME/.bitcoin" -blocksonly -txindex=1 -blocksxor=0`
+- A running instance of bitcoin-core
+  - Example: `bitcoind -datadir="$HOME/.bitcoin" -blocksonly`
 - Git
 - Unix based operating system (Mac OS or Linux)
   - Ubuntu users need to install `open-ssl` via `sudo apt install libssl-dev pkg-config`
diff --git a/src/main.rs b/_src/main.rs
similarity index 93%
rename from src/main.rs
rename to _src/main.rs
index 1996a7aa5..3dfe00316 100644
--- a/src/main.rs
+++ b/_src/main.rs
@@ -1,6 +1,6 @@
-use iterator::bitcoincore_rpc::Client;
+use brk_parser::bitcoincore_rpc::Client;
 use log::info;
-use rlimit::{getrlimit, setrlimit, Resource};
+use rlimit::{Resource, getrlimit, setrlimit};
 
 mod io;
 mod parser;
@@ -8,7 +8,7 @@ mod server;
 mod structs;
 mod utils;
 
-use parser::Datasets;
+use brk_parser::Datasets;
 use server::api::structs::Routes;
 use structs::{Config, Exit};
 use utils::init_log;
diff --git a/src/parser/actions/export.rs b/_src/parser/actions/export.rs
similarity index 100%
rename from src/parser/actions/export.rs
rename to _src/parser/actions/export.rs
diff --git a/src/parser/actions/iter_blocks.rs b/_src/parser/actions/iter_blocks.rs
similarity index 99%
rename from src/parser/actions/iter_blocks.rs
rename to _src/parser/actions/iter_blocks.rs
index b5d9edfc0..bb8eb84be 100644
--- a/src/parser/actions/iter_blocks.rs
+++ b/_src/parser/actions/iter_blocks.rs
@@ -1,8 +1,8 @@
 use std::{collections::BTreeSet, time::Instant};
 
+use brk_parser::bitcoincore_rpc::Client;
 use chrono::Datelike;
 use export::ExportedData;
-use iterator::bitcoincore_rpc::Client;
 use itertools::Itertools;
 
 use log::info;
diff --git a/src/parser/actions/min_height.rs b/_src/parser/actions/min_height.rs
similarity index 100%
rename from src/parser/actions/min_height.rs
rename to _src/parser/actions/min_height.rs
diff --git a/src/parser/actions/mod.rs b/_src/parser/actions/mod.rs
similarity index 100%
rename from src/parser/actions/mod.rs
rename to _src/parser/actions/mod.rs
diff --git a/src/parser/actions/parse.rs b/_src/parser/actions/parse.rs
similarity index 99%
rename from src/parser/actions/parse.rs
rename to _src/parser/actions/parse.rs
index b526a71a9..d601ac62c 100644
--- a/src/parser/actions/parse.rs
+++ b/_src/parser/actions/parse.rs
@@ -1,6 +1,6 @@
 use std::{collections::BTreeMap, ops::ControlFlow, thread};
 
-use iterator::{
+use brk_parser::{
     bitcoin::{Block, Txid},
     bitcoincore_rpc::RpcApi,
 };
diff --git a/src/parser/databases/_trait.rs b/_src/parser/databases/_trait.rs
similarity index 100%
rename from src/parser/databases/_trait.rs
rename to _src/parser/databases/_trait.rs
diff --git a/src/parser/databases/address_index_to_address_data.rs b/_src/parser/databases/address_index_to_address_data.rs
similarity index 100%
rename from src/parser/databases/address_index_to_address_data.rs
rename to _src/parser/databases/address_index_to_address_data.rs
diff --git a/src/parser/databases/address_index_to_empty_address_data.rs b/_src/parser/databases/address_index_to_empty_address_data.rs
similarity index 100%
rename from src/parser/databases/address_index_to_empty_address_data.rs
rename to _src/parser/databases/address_index_to_empty_address_data.rs
diff --git a/src/parser/databases/address_to_address_index.rs b/_src/parser/databases/address_to_address_index.rs
similarity index 100%
rename from src/parser/databases/address_to_address_index.rs
rename to _src/parser/databases/address_to_address_index.rs
diff --git a/src/parser/databases/metadata.rs b/_src/parser/databases/metadata.rs
similarity index 100%
rename from src/parser/databases/metadata.rs
rename to _src/parser/databases/metadata.rs
diff --git a/src/parser/databases/mod.rs b/_src/parser/databases/mod.rs
similarity index 100%
rename from src/parser/databases/mod.rs
rename to _src/parser/databases/mod.rs
diff --git a/src/parser/databases/txid_to_tx_data.rs b/_src/parser/databases/txid_to_tx_data.rs
similarity index 99%
rename from src/parser/databases/txid_to_tx_data.rs
rename to _src/parser/databases/txid_to_tx_data.rs
index 4ca277d4a..0d3581aec 100644
--- a/src/parser/databases/txid_to_tx_data.rs
+++ b/_src/parser/databases/txid_to_tx_data.rs
@@ -5,7 +5,7 @@ use std::{
 };
 
 use allocative::Allocative;
-use iterator::bitcoin::Txid;
+use brk_parser::bitcoin::Txid;
 use itertools::Itertools;
 use snkrj::{AnyDatabase, Database as _Database};
 
diff --git a/src/parser/databases/txout_index_to_address_index.rs b/_src/parser/databases/txout_index_to_address_index.rs
similarity index 100%
rename from src/parser/databases/txout_index_to_address_index.rs
rename to _src/parser/databases/txout_index_to_address_index.rs
diff --git a/src/parser/databases/txout_index_to_amount.rs b/_src/parser/databases/txout_index_to_amount.rs
similarity index 100%
rename from src/parser/databases/txout_index_to_amount.rs
rename to _src/parser/databases/txout_index_to_amount.rs
diff --git a/src/parser/datasets/_traits/any_dataset.rs b/_src/parser/datasets/_traits/any_dataset.rs
similarity index 100%
rename from src/parser/datasets/_traits/any_dataset.rs
rename to _src/parser/datasets/_traits/any_dataset.rs
diff --git a/src/parser/datasets/_traits/any_dataset_group.rs b/_src/parser/datasets/_traits/any_dataset_group.rs
similarity index 100%
rename from src/parser/datasets/_traits/any_dataset_group.rs
rename to _src/parser/datasets/_traits/any_dataset_group.rs
diff --git a/src/parser/datasets/_traits/any_datasets.rs b/_src/parser/datasets/_traits/any_datasets.rs
similarity index 100%
rename from src/parser/datasets/_traits/any_datasets.rs
rename to _src/parser/datasets/_traits/any_datasets.rs
diff --git a/src/parser/datasets/_traits/min_initial_state.rs b/_src/parser/datasets/_traits/min_initial_state.rs
similarity index 100%
rename from src/parser/datasets/_traits/min_initial_state.rs
rename to _src/parser/datasets/_traits/min_initial_state.rs
diff --git a/src/parser/datasets/_traits/mod.rs b/_src/parser/datasets/_traits/mod.rs
similarity index 100%
rename from src/parser/datasets/_traits/mod.rs
rename to _src/parser/datasets/_traits/mod.rs
diff --git a/src/parser/datasets/address/all_metadata.rs b/_src/parser/datasets/address/all_metadata.rs
similarity index 100%
rename from src/parser/datasets/address/all_metadata.rs
rename to _src/parser/datasets/address/all_metadata.rs
diff --git a/src/parser/datasets/address/cohort.rs b/_src/parser/datasets/address/cohort.rs
similarity index 100%
rename from src/parser/datasets/address/cohort.rs
rename to _src/parser/datasets/address/cohort.rs
diff --git a/src/parser/datasets/address/cohort_metadata.rs b/_src/parser/datasets/address/cohort_metadata.rs
similarity index 100%
rename from src/parser/datasets/address/cohort_metadata.rs
rename to _src/parser/datasets/address/cohort_metadata.rs
diff --git a/src/parser/datasets/address/mod.rs b/_src/parser/datasets/address/mod.rs
similarity index 100%
rename from src/parser/datasets/address/mod.rs
rename to _src/parser/datasets/address/mod.rs
diff --git a/src/parser/datasets/block_metadata.rs b/_src/parser/datasets/block_metadata.rs
similarity index 100%
rename from src/parser/datasets/block_metadata.rs
rename to _src/parser/datasets/block_metadata.rs
diff --git a/src/parser/datasets/coindays.rs b/_src/parser/datasets/coindays.rs
similarity index 100%
rename from src/parser/datasets/coindays.rs
rename to _src/parser/datasets/coindays.rs
diff --git a/src/parser/datasets/cointime.rs b/_src/parser/datasets/cointime.rs
similarity index 100%
rename from src/parser/datasets/cointime.rs
rename to _src/parser/datasets/cointime.rs
diff --git a/src/parser/datasets/constant.rs b/_src/parser/datasets/constant.rs
similarity index 100%
rename from src/parser/datasets/constant.rs
rename to _src/parser/datasets/constant.rs
diff --git a/src/parser/datasets/date_metadata.rs b/_src/parser/datasets/date_metadata.rs
similarity index 100%
rename from src/parser/datasets/date_metadata.rs
rename to _src/parser/datasets/date_metadata.rs
diff --git a/src/parser/datasets/mining.rs b/_src/parser/datasets/mining.rs
similarity index 100%
rename from src/parser/datasets/mining.rs
rename to _src/parser/datasets/mining.rs
diff --git a/src/parser/datasets/mod.rs b/_src/parser/datasets/mod.rs
similarity index 100%
rename from src/parser/datasets/mod.rs
rename to _src/parser/datasets/mod.rs
diff --git a/src/parser/datasets/price.rs b/_src/parser/datasets/price.rs
similarity index 100%
rename from src/parser/datasets/price.rs
rename to _src/parser/datasets/price.rs
diff --git a/src/parser/datasets/subs/capitalization.rs b/_src/parser/datasets/subs/capitalization.rs
similarity index 100%
rename from src/parser/datasets/subs/capitalization.rs
rename to _src/parser/datasets/subs/capitalization.rs
diff --git a/src/parser/datasets/subs/input.rs b/_src/parser/datasets/subs/input.rs
similarity index 100%
rename from src/parser/datasets/subs/input.rs
rename to _src/parser/datasets/subs/input.rs
diff --git a/src/parser/datasets/subs/mod.rs b/_src/parser/datasets/subs/mod.rs
similarity index 100%
rename from src/parser/datasets/subs/mod.rs
rename to _src/parser/datasets/subs/mod.rs
diff --git a/src/parser/datasets/subs/output.rs b/_src/parser/datasets/subs/output.rs
similarity index 100%
rename from src/parser/datasets/subs/output.rs
rename to _src/parser/datasets/subs/output.rs
diff --git a/src/parser/datasets/subs/price_paid.rs b/_src/parser/datasets/subs/price_paid.rs
similarity index 100%
rename from src/parser/datasets/subs/price_paid.rs
rename to _src/parser/datasets/subs/price_paid.rs
diff --git a/src/parser/datasets/subs/ratio.rs b/_src/parser/datasets/subs/ratio.rs
similarity index 100%
rename from src/parser/datasets/subs/ratio.rs
rename to _src/parser/datasets/subs/ratio.rs
diff --git a/src/parser/datasets/subs/realized.rs b/_src/parser/datasets/subs/realized.rs
similarity index 100%
rename from src/parser/datasets/subs/realized.rs
rename to _src/parser/datasets/subs/realized.rs
diff --git a/src/parser/datasets/subs/recap.rs b/_src/parser/datasets/subs/recap.rs
similarity index 100%
rename from src/parser/datasets/subs/recap.rs
rename to _src/parser/datasets/subs/recap.rs
diff --git a/src/parser/datasets/subs/supply.rs b/_src/parser/datasets/subs/supply.rs
similarity index 100%
rename from src/parser/datasets/subs/supply.rs
rename to _src/parser/datasets/subs/supply.rs
diff --git a/src/parser/datasets/subs/unrealized.rs b/_src/parser/datasets/subs/unrealized.rs
similarity index 100%
rename from src/parser/datasets/subs/unrealized.rs
rename to _src/parser/datasets/subs/unrealized.rs
diff --git a/src/parser/datasets/subs/utxo.rs b/_src/parser/datasets/subs/utxo.rs
similarity index 100%
rename from src/parser/datasets/subs/utxo.rs
rename to _src/parser/datasets/subs/utxo.rs
diff --git a/src/parser/datasets/transaction.rs b/_src/parser/datasets/transaction.rs
similarity index 100%
rename from src/parser/datasets/transaction.rs
rename to _src/parser/datasets/transaction.rs
diff --git a/src/parser/datasets/utxo/dataset.rs b/_src/parser/datasets/utxo/dataset.rs
similarity index 100%
rename from src/parser/datasets/utxo/dataset.rs
rename to _src/parser/datasets/utxo/dataset.rs
diff --git a/src/parser/datasets/utxo/mod.rs b/_src/parser/datasets/utxo/mod.rs
similarity index 100%
rename from src/parser/datasets/utxo/mod.rs
rename to _src/parser/datasets/utxo/mod.rs
diff --git a/src/parser/mod.rs b/_src/parser/mod.rs
similarity index 95%
rename from src/parser/mod.rs
rename to _src/parser/mod.rs
index df9692a70..57fd87c40 100644
--- a/src/parser/mod.rs
+++ b/_src/parser/mod.rs
@@ -1,6 +1,6 @@
 use std::{thread::sleep, time::Duration};
 
-use iterator::bitcoincore_rpc::{Client, RpcApi};
+use brk_parser::bitcoincore_rpc::{Client, RpcApi};
 
 mod actions;
 mod databases;
diff --git a/src/parser/price/binance.rs b/_src/parser/price/binance.rs
similarity index 100%
rename from src/parser/price/binance.rs
rename to _src/parser/price/binance.rs
diff --git a/src/parser/price/kibo.rs b/_src/parser/price/kibo.rs
similarity index 100%
rename from src/parser/price/kibo.rs
rename to _src/parser/price/kibo.rs
diff --git a/src/parser/price/kraken.rs b/_src/parser/price/kraken.rs
similarity index 100%
rename from src/parser/price/kraken.rs
rename to _src/parser/price/kraken.rs
diff --git a/src/parser/price/mod.rs b/_src/parser/price/mod.rs
similarity index 100%
rename from src/parser/price/mod.rs
rename to _src/parser/price/mod.rs
diff --git a/src/parser/states/_trait.rs b/_src/parser/states/_trait.rs
similarity index 100%
rename from src/parser/states/_trait.rs
rename to _src/parser/states/_trait.rs
diff --git a/src/parser/states/cohorts_states/address/cohort_durable_states.rs b/_src/parser/states/cohorts_states/address/cohort_durable_states.rs
similarity index 100%
rename from src/parser/states/cohorts_states/address/cohort_durable_states.rs
rename to _src/parser/states/cohorts_states/address/cohort_durable_states.rs
diff --git a/src/parser/states/cohorts_states/address/cohort_id.rs b/_src/parser/states/cohorts_states/address/cohort_id.rs
similarity index 100%
rename from src/parser/states/cohorts_states/address/cohort_id.rs
rename to _src/parser/states/cohorts_states/address/cohort_id.rs
diff --git a/src/parser/states/cohorts_states/address/cohorts_durable_states.rs b/_src/parser/states/cohorts_states/address/cohorts_durable_states.rs
similarity index 100%
rename from src/parser/states/cohorts_states/address/cohorts_durable_states.rs
rename to _src/parser/states/cohorts_states/address/cohorts_durable_states.rs
diff --git a/src/parser/states/cohorts_states/address/cohorts_input_states.rs b/_src/parser/states/cohorts_states/address/cohorts_input_states.rs
similarity index 100%
rename from src/parser/states/cohorts_states/address/cohorts_input_states.rs
rename to _src/parser/states/cohorts_states/address/cohorts_input_states.rs
diff --git a/src/parser/states/cohorts_states/address/cohorts_one_shot_states.rs b/_src/parser/states/cohorts_states/address/cohorts_one_shot_states.rs
similarity index 100%
rename from src/parser/states/cohorts_states/address/cohorts_one_shot_states.rs
rename to _src/parser/states/cohorts_states/address/cohorts_one_shot_states.rs
diff --git a/src/parser/states/cohorts_states/address/cohorts_output_states.rs b/_src/parser/states/cohorts_states/address/cohorts_output_states.rs
similarity index 100%
rename from src/parser/states/cohorts_states/address/cohorts_output_states.rs
rename to _src/parser/states/cohorts_states/address/cohorts_output_states.rs
diff --git a/src/parser/states/cohorts_states/address/cohorts_realized_states.rs b/_src/parser/states/cohorts_states/address/cohorts_realized_states.rs
similarity index 100%
rename from src/parser/states/cohorts_states/address/cohorts_realized_states.rs
rename to _src/parser/states/cohorts_states/address/cohorts_realized_states.rs
diff --git a/src/parser/states/cohorts_states/address/mod.rs b/_src/parser/states/cohorts_states/address/mod.rs
similarity index 100%
rename from src/parser/states/cohorts_states/address/mod.rs
rename to _src/parser/states/cohorts_states/address/mod.rs
diff --git a/src/parser/states/cohorts_states/address/split_by_address_cohort.rs b/_src/parser/states/cohorts_states/address/split_by_address_cohort.rs
similarity index 100%
rename from src/parser/states/cohorts_states/address/split_by_address_cohort.rs
rename to _src/parser/states/cohorts_states/address/split_by_address_cohort.rs
diff --git a/src/parser/states/cohorts_states/any/capitalization_state.rs b/_src/parser/states/cohorts_states/any/capitalization_state.rs
similarity index 100%
rename from src/parser/states/cohorts_states/any/capitalization_state.rs
rename to _src/parser/states/cohorts_states/any/capitalization_state.rs
diff --git a/src/parser/states/cohorts_states/any/durable_states.rs b/_src/parser/states/cohorts_states/any/durable_states.rs
similarity index 100%
rename from src/parser/states/cohorts_states/any/durable_states.rs
rename to _src/parser/states/cohorts_states/any/durable_states.rs
diff --git a/src/parser/states/cohorts_states/any/input_state.rs b/_src/parser/states/cohorts_states/any/input_state.rs
similarity index 100%
rename from src/parser/states/cohorts_states/any/input_state.rs
rename to _src/parser/states/cohorts_states/any/input_state.rs
diff --git a/src/parser/states/cohorts_states/any/mod.rs b/_src/parser/states/cohorts_states/any/mod.rs
similarity index 100%
rename from src/parser/states/cohorts_states/any/mod.rs
rename to _src/parser/states/cohorts_states/any/mod.rs
diff --git a/src/parser/states/cohorts_states/any/one_shot_states.rs b/_src/parser/states/cohorts_states/any/one_shot_states.rs
similarity index 100%
rename from src/parser/states/cohorts_states/any/one_shot_states.rs
rename to _src/parser/states/cohorts_states/any/one_shot_states.rs
diff --git a/src/parser/states/cohorts_states/any/output_state.rs b/_src/parser/states/cohorts_states/any/output_state.rs
similarity index 100%
rename from src/parser/states/cohorts_states/any/output_state.rs
rename to _src/parser/states/cohorts_states/any/output_state.rs
diff --git a/src/parser/states/cohorts_states/any/price_paid_state.rs b/_src/parser/states/cohorts_states/any/price_paid_state.rs
similarity index 100%
rename from src/parser/states/cohorts_states/any/price_paid_state.rs
rename to _src/parser/states/cohorts_states/any/price_paid_state.rs
diff --git a/src/parser/states/cohorts_states/any/price_to_value.rs b/_src/parser/states/cohorts_states/any/price_to_value.rs
similarity index 100%
rename from src/parser/states/cohorts_states/any/price_to_value.rs
rename to _src/parser/states/cohorts_states/any/price_to_value.rs
diff --git a/src/parser/states/cohorts_states/any/realized_state.rs b/_src/parser/states/cohorts_states/any/realized_state.rs
similarity index 100%
rename from src/parser/states/cohorts_states/any/realized_state.rs
rename to _src/parser/states/cohorts_states/any/realized_state.rs
diff --git a/src/parser/states/cohorts_states/any/supply_state.rs b/_src/parser/states/cohorts_states/any/supply_state.rs
similarity index 100%
rename from src/parser/states/cohorts_states/any/supply_state.rs
rename to _src/parser/states/cohorts_states/any/supply_state.rs
diff --git a/src/parser/states/cohorts_states/any/unrealized_state.rs b/_src/parser/states/cohorts_states/any/unrealized_state.rs
similarity index 100%
rename from src/parser/states/cohorts_states/any/unrealized_state.rs
rename to _src/parser/states/cohorts_states/any/unrealized_state.rs
diff --git a/src/parser/states/cohorts_states/any/utxo_state.rs b/_src/parser/states/cohorts_states/any/utxo_state.rs
similarity index 100%
rename from src/parser/states/cohorts_states/any/utxo_state.rs
rename to _src/parser/states/cohorts_states/any/utxo_state.rs
diff --git a/src/parser/states/cohorts_states/mod.rs b/_src/parser/states/cohorts_states/mod.rs
similarity index 100%
rename from src/parser/states/cohorts_states/mod.rs
rename to _src/parser/states/cohorts_states/mod.rs
diff --git a/src/parser/states/cohorts_states/utxo/cohort_durable_states.rs b/_src/parser/states/cohorts_states/utxo/cohort_durable_states.rs
similarity index 100%
rename from src/parser/states/cohorts_states/utxo/cohort_durable_states.rs
rename to _src/parser/states/cohorts_states/utxo/cohort_durable_states.rs
diff --git a/src/parser/states/cohorts_states/utxo/cohort_filter.rs b/_src/parser/states/cohorts_states/utxo/cohort_filter.rs
similarity index 100%
rename from src/parser/states/cohorts_states/utxo/cohort_filter.rs
rename to _src/parser/states/cohorts_states/utxo/cohort_filter.rs
diff --git a/src/parser/states/cohorts_states/utxo/cohort_filters.rs b/_src/parser/states/cohorts_states/utxo/cohort_filters.rs
similarity index 100%
rename from src/parser/states/cohorts_states/utxo/cohort_filters.rs
rename to _src/parser/states/cohorts_states/utxo/cohort_filters.rs
diff --git a/src/parser/states/cohorts_states/utxo/cohort_id.rs b/_src/parser/states/cohorts_states/utxo/cohort_id.rs
similarity index 100%
rename from src/parser/states/cohorts_states/utxo/cohort_id.rs
rename to _src/parser/states/cohorts_states/utxo/cohort_id.rs
diff --git a/src/parser/states/cohorts_states/utxo/cohorts_durable_states.rs b/_src/parser/states/cohorts_states/utxo/cohorts_durable_states.rs
similarity index 100%
rename from src/parser/states/cohorts_states/utxo/cohorts_durable_states.rs
rename to _src/parser/states/cohorts_states/utxo/cohorts_durable_states.rs
diff --git a/src/parser/states/cohorts_states/utxo/cohorts_one_shot_states.rs b/_src/parser/states/cohorts_states/utxo/cohorts_one_shot_states.rs
similarity index 100%
rename from src/parser/states/cohorts_states/utxo/cohorts_one_shot_states.rs
rename to _src/parser/states/cohorts_states/utxo/cohorts_one_shot_states.rs
diff --git a/src/parser/states/cohorts_states/utxo/cohorts_sent_states.rs b/_src/parser/states/cohorts_states/utxo/cohorts_sent_states.rs
similarity index 100%
rename from src/parser/states/cohorts_states/utxo/cohorts_sent_states.rs
rename to _src/parser/states/cohorts_states/utxo/cohorts_sent_states.rs
diff --git a/src/parser/states/cohorts_states/utxo/mod.rs b/_src/parser/states/cohorts_states/utxo/mod.rs
similarity index 100%
rename from src/parser/states/cohorts_states/utxo/mod.rs
rename to _src/parser/states/cohorts_states/utxo/mod.rs
diff --git a/src/parser/states/cohorts_states/utxo/split_by_utxo_cohort.rs b/_src/parser/states/cohorts_states/utxo/split_by_utxo_cohort.rs
similarity index 100%
rename from src/parser/states/cohorts_states/utxo/split_by_utxo_cohort.rs
rename to _src/parser/states/cohorts_states/utxo/split_by_utxo_cohort.rs
diff --git a/src/parser/states/counters.rs b/_src/parser/states/counters.rs
similarity index 100%
rename from src/parser/states/counters.rs
rename to _src/parser/states/counters.rs
diff --git a/src/parser/states/date_data_vec.rs b/_src/parser/states/date_data_vec.rs
similarity index 100%
rename from src/parser/states/date_data_vec.rs
rename to _src/parser/states/date_data_vec.rs
diff --git a/src/parser/states/mod.rs b/_src/parser/states/mod.rs
similarity index 100%
rename from src/parser/states/mod.rs
rename to _src/parser/states/mod.rs
diff --git a/src/structs/address.rs b/_src/structs/address.rs
similarity index 99%
rename from src/structs/address.rs
rename to _src/structs/address.rs
index d202e63d3..da6dc5d4a 100644
--- a/src/structs/address.rs
+++ b/_src/structs/address.rs
@@ -1,5 +1,5 @@
 use bitcoin_hashes::hash160;
-use iterator::bitcoin::TxOut;
+use brk_parser::bitcoin::TxOut;
 
 use super::{AddressType, Counter, U8x19, U8x31};
 
diff --git a/src/structs/address_data.rs b/_src/structs/address_data.rs
similarity index 100%
rename from src/structs/address_data.rs
rename to _src/structs/address_data.rs
diff --git a/src/structs/address_liquidity.rs b/_src/structs/address_liquidity.rs
similarity index 100%
rename from src/structs/address_liquidity.rs
rename to _src/structs/address_liquidity.rs
diff --git a/src/structs/address_realized_data.rs b/_src/structs/address_realized_data.rs
similarity index 100%
rename from src/structs/address_realized_data.rs
rename to _src/structs/address_realized_data.rs
diff --git a/src/structs/address_size.rs b/_src/structs/address_size.rs
similarity index 100%
rename from src/structs/address_size.rs
rename to _src/structs/address_size.rs
diff --git a/src/structs/address_split.rs b/_src/structs/address_split.rs
similarity index 100%
rename from src/structs/address_split.rs
rename to _src/structs/address_split.rs
diff --git a/src/structs/address_type.rs b/_src/structs/address_type.rs
similarity index 100%
rename from src/structs/address_type.rs
rename to _src/structs/address_type.rs
diff --git a/src/structs/amount.rs b/_src/structs/amount.rs
similarity index 96%
rename from src/structs/amount.rs
rename to _src/structs/amount.rs
index f0d6a48db..5a29adf42 100644
--- a/src/structs/amount.rs
+++ b/_src/structs/amount.rs
@@ -5,15 +5,15 @@ use std::{
 
 use allocative::{Allocative, Visitor};
 use bincode::{
+    BorrowDecode, Decode, Encode,
     de::{BorrowDecoder, Decoder},
     enc::Encoder,
     error::{DecodeError, EncodeError},
-    BorrowDecode, Decode, Encode,
 };
+use brk_parser::bitcoin::Amount as BitcoinAmount;
 use derive_deref::{Deref, DerefMut};
-use iterator::bitcoin::Amount as BitcoinAmount;
 use serde::{Deserialize, Serialize};
-use snkrj::{direct_repr, Storable, UnsizedStorable};
+use snkrj::{Storable, UnsizedStorable, direct_repr};
 
 use super::Height;
 
diff --git a/src/structs/any_map.rs b/_src/structs/any_map.rs
similarity index 100%
rename from src/structs/any_map.rs
rename to _src/structs/any_map.rs
diff --git a/src/structs/array.rs b/_src/structs/array.rs
similarity index 100%
rename from src/structs/array.rs
rename to _src/structs/array.rs
diff --git a/src/structs/bi_map.rs b/_src/structs/bi_map.rs
similarity index 100%
rename from src/structs/bi_map.rs
rename to _src/structs/bi_map.rs
diff --git a/src/structs/block_data.rs b/_src/structs/block_data.rs
similarity index 100%
rename from src/structs/block_data.rs
rename to _src/structs/block_data.rs
diff --git a/src/structs/block_path.rs b/_src/structs/block_path.rs
similarity index 100%
rename from src/structs/block_path.rs
rename to _src/structs/block_path.rs
diff --git a/src/structs/config.rs b/_src/structs/config.rs
similarity index 99%
rename from src/structs/config.rs
rename to _src/structs/config.rs
index 9b84ae495..683ec1181 100644
--- a/src/structs/config.rs
+++ b/_src/structs/config.rs
@@ -4,9 +4,9 @@ use std::{
     path::{Path, PathBuf},
 };
 
+use brk_parser::bitcoincore_rpc::Auth;
 use clap::Parser;
 use color_eyre::eyre::eyre;
-use iterator::bitcoincore_rpc::Auth;
 use log::info;
 use serde::{Deserialize, Serialize};
 
diff --git a/src/structs/counter.rs b/_src/structs/counter.rs
similarity index 100%
rename from src/structs/counter.rs
rename to _src/structs/counter.rs
diff --git a/src/structs/date.rs b/_src/structs/date.rs
similarity index 100%
rename from src/structs/date.rs
rename to _src/structs/date.rs
diff --git a/src/structs/date_data.rs b/_src/structs/date_data.rs
similarity index 100%
rename from src/structs/date_data.rs
rename to _src/structs/date_data.rs
diff --git a/src/structs/date_map.rs b/_src/structs/date_map.rs
similarity index 100%
rename from src/structs/date_map.rs
rename to _src/structs/date_map.rs
diff --git a/src/structs/date_map_chunk_id.rs b/_src/structs/date_map_chunk_id.rs
similarity index 100%
rename from src/structs/date_map_chunk_id.rs
rename to _src/structs/date_map_chunk_id.rs
diff --git a/src/structs/empty_address_data.rs b/_src/structs/empty_address_data.rs
similarity index 100%
rename from src/structs/empty_address_data.rs
rename to _src/structs/empty_address_data.rs
diff --git a/src/structs/epoch.rs b/_src/structs/epoch.rs
similarity index 100%
rename from src/structs/epoch.rs
rename to _src/structs/epoch.rs
diff --git a/src/structs/exit.rs b/_src/structs/exit.rs
similarity index 100%
rename from src/structs/exit.rs
rename to _src/structs/exit.rs
diff --git a/src/structs/generic_map.rs b/_src/structs/generic_map.rs
similarity index 100%
rename from src/structs/generic_map.rs
rename to _src/structs/generic_map.rs
diff --git a/src/structs/height.rs b/_src/structs/height.rs
similarity index 96%
rename from src/structs/height.rs
rename to _src/structs/height.rs
index efdc1dc18..c788e6afb 100644
--- a/src/structs/height.rs
+++ b/_src/structs/height.rs
@@ -5,11 +5,11 @@ use std::{
 
 use allocative::Allocative;
 use bincode::{Decode, Encode};
+use brk_parser::NUMBER_OF_UNSAFE_BLOCKS;
 use derive_deref::{Deref, DerefMut};
-use iterator::NUMBER_OF_UNSAFE_BLOCKS;
 use serde::{Deserialize, Serialize};
 
-use super::{HeightMapChunkId, MapKey, HEIGHT_MAP_CHUNK_SIZE};
+use super::{HEIGHT_MAP_CHUNK_SIZE, HeightMapChunkId, MapKey};
 
 #[derive(
     Debug,
diff --git a/src/structs/height_map.rs b/_src/structs/height_map.rs
similarity index 100%
rename from src/structs/height_map.rs
rename to _src/structs/height_map.rs
diff --git a/src/structs/height_map_chunk_id.rs b/_src/structs/height_map_chunk_id.rs
similarity index 100%
rename from src/structs/height_map_chunk_id.rs
rename to _src/structs/height_map_chunk_id.rs
diff --git a/src/structs/instant.rs b/_src/structs/instant.rs
similarity index 100%
rename from src/structs/instant.rs
rename to _src/structs/instant.rs
diff --git a/src/structs/liquidity.rs b/_src/structs/liquidity.rs
similarity index 100%
rename from src/structs/liquidity.rs
rename to _src/structs/liquidity.rs
diff --git a/src/structs/map_path.rs b/_src/structs/map_path.rs
similarity index 100%
rename from src/structs/map_path.rs
rename to _src/structs/map_path.rs
diff --git a/src/structs/map_value.rs b/_src/structs/map_value.rs
similarity index 100%
rename from src/structs/map_value.rs
rename to _src/structs/map_value.rs
diff --git a/src/structs/mod.rs b/_src/structs/mod.rs
similarity index 100%
rename from src/structs/mod.rs
rename to _src/structs/mod.rs
diff --git a/src/structs/ohlc.rs b/_src/structs/ohlc.rs
similarity index 100%
rename from src/structs/ohlc.rs
rename to _src/structs/ohlc.rs
diff --git a/src/structs/partial_txout_data.rs b/_src/structs/partial_txout_data.rs
similarity index 100%
rename from src/structs/partial_txout_data.rs
rename to _src/structs/partial_txout_data.rs
diff --git a/src/structs/price.rs b/_src/structs/price.rs
similarity index 100%
rename from src/structs/price.rs
rename to _src/structs/price.rs
diff --git a/src/structs/ram.rs b/_src/structs/ram.rs
similarity index 100%
rename from src/structs/ram.rs
rename to _src/structs/ram.rs
diff --git a/src/structs/rpc.rs b/_src/structs/rpc.rs
similarity index 90%
rename from src/structs/rpc.rs
rename to _src/structs/rpc.rs
index 20ce2db9a..885c6bb71 100644
--- a/src/structs/rpc.rs
+++ b/_src/structs/rpc.rs
@@ -1,4 +1,4 @@
-use iterator::bitcoincore_rpc::Client;
+use brk_parser::bitcoincore_rpc::Client;
 
 use crate::structs::Config;
 
diff --git a/src/structs/sent_data.rs b/_src/structs/sent_data.rs
similarity index 100%
rename from src/structs/sent_data.rs
rename to _src/structs/sent_data.rs
diff --git a/src/structs/serialized_btreemap.rs b/_src/structs/serialized_btreemap.rs
similarity index 100%
rename from src/structs/serialized_btreemap.rs
rename to _src/structs/serialized_btreemap.rs
diff --git a/src/structs/serialized_vec.rs b/_src/structs/serialized_vec.rs
similarity index 100%
rename from src/structs/serialized_vec.rs
rename to _src/structs/serialized_vec.rs
diff --git a/src/structs/timestamp.rs b/_src/structs/timestamp.rs
similarity index 100%
rename from src/structs/timestamp.rs
rename to _src/structs/timestamp.rs
diff --git a/src/structs/tx_data.rs b/_src/structs/tx_data.rs
similarity index 100%
rename from src/structs/tx_data.rs
rename to _src/structs/tx_data.rs
diff --git a/src/structs/txout_index.rs b/_src/structs/txout_index.rs
similarity index 100%
rename from src/structs/txout_index.rs
rename to _src/structs/txout_index.rs
diff --git a/src/utils/consts.rs b/_src/utils/consts.rs
similarity index 100%
rename from src/utils/consts.rs
rename to _src/utils/consts.rs
diff --git a/src/utils/flamegraph.rs b/_src/utils/flamegraph.rs
similarity index 100%
rename from src/utils/flamegraph.rs
rename to _src/utils/flamegraph.rs
diff --git a/src/utils/log.rs b/_src/utils/log.rs
similarity index 100%
rename from src/utils/log.rs
rename to _src/utils/log.rs
diff --git a/src/utils/lossy.rs b/_src/utils/lossy.rs
similarity index 100%
rename from src/utils/lossy.rs
rename to _src/utils/lossy.rs
diff --git a/src/utils/mod.rs b/_src/utils/mod.rs
similarity index 100%
rename from src/utils/mod.rs
rename to _src/utils/mod.rs
diff --git a/src/utils/percentile.rs b/_src/utils/percentile.rs
similarity index 100%
rename from src/utils/percentile.rs
rename to _src/utils/percentile.rs
diff --git a/src/utils/retry.rs b/_src/utils/retry.rs
similarity index 100%
rename from src/utils/retry.rs
rename to _src/utils/retry.rs
diff --git a/src/utils/time.rs b/_src/utils/time.rs
similarity index 100%
rename from src/utils/time.rs
rename to _src/utils/time.rs
diff --git a/cli/Cargo.toml b/crates/brk_cli/Cargo.toml
similarity index 90%
rename from cli/Cargo.toml
rename to crates/brk_cli/Cargo.toml
index 121e9d824..4e38c18b1 100644
--- a/cli/Cargo.toml
+++ b/crates/brk_cli/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "bli"
+name = "brk_cli"
 description = "A command line interface to run berver"
 version = "0.1.0"
 edition = { workspace = true }
diff --git a/cli/src/main.rs b/crates/brk_cli/src/main.rs
similarity index 100%
rename from cli/src/main.rs
rename to crates/brk_cli/src/main.rs
diff --git a/computer/Cargo.toml b/crates/brk_computer/Cargo.toml
similarity index 58%
rename from computer/Cargo.toml
rename to crates/brk_computer/Cargo.toml
index 8c370f919..760fe6fbf 100644
--- a/computer/Cargo.toml
+++ b/crates/brk_computer/Cargo.toml
@@ -1,17 +1,17 @@
 [package]
-name = "bomputer"
-description = "A Bitcoin dataset computer built on top of bindexer and bricer"
+name = "brk_computer"
+description = "A Bitcoin dataset computer built on top of brk_indexer and brk_fetcher"
 version = "0.1.0"
 edition = { workspace = true }
 license = { workspace = true }
 
 [dependencies]
+brk_fetcher = { workspace = true }
+brk_indexer = { workspace = true }
+brk_parser = { workspace = true }
 color-eyre = { workspace = true }
 derive_deref = { workspace = true }
 fjall = { workspace = true }
 hodor = { workspace = true }
-indexer = { workspace = true }
-iterator = { workspace = true }
-pricer = { workspace = true }
 storable_vec = { workspace = true }
 zerocopy = { workspace = true }
diff --git a/computer/src/lib.rs b/crates/brk_computer/src/lib.rs
similarity index 97%
rename from computer/src/lib.rs
rename to crates/brk_computer/src/lib.rs
index 2eb57481d..5ae619db4 100644
--- a/computer/src/lib.rs
+++ b/crates/brk_computer/src/lib.rs
@@ -1,13 +1,13 @@
 use std::path::{Path, PathBuf};
 
+use brk_indexer::Indexer;
+pub use brk_parser::rpc;
 use hodor::Exit;
-use indexer::Indexer;
-pub use iterator::rpc;
 
 mod storage;
 mod structs;
 
-use pricer::Date;
+use brk_fetcher::Date;
 use storable_vec::SINGLE_THREAD;
 use storage::{Fjalls, StorableVecs};
 pub use structs::*;
diff --git a/computer/src/main.rs b/crates/brk_computer/src/main.rs
similarity index 88%
rename from computer/src/main.rs
rename to crates/brk_computer/src/main.rs
index ad810775b..acf96bc03 100644
--- a/computer/src/main.rs
+++ b/crates/brk_computer/src/main.rs
@@ -1,8 +1,8 @@
 use std::path::Path;
 
-use bomputer::Computer;
+use brk_computer::Computer;
+use brk_indexer::Indexer;
 use hodor::Exit;
-use indexer::Indexer;
 
 mod structs;
 
diff --git a/computer/src/storage/fjalls.rs b/crates/brk_computer/src/storage/fjalls.rs
similarity index 96%
rename from computer/src/storage/fjalls.rs
rename to crates/brk_computer/src/storage/fjalls.rs
index 304ab0bc5..38221d0be 100644
--- a/computer/src/storage/fjalls.rs
+++ b/crates/brk_computer/src/storage/fjalls.rs
@@ -1,6 +1,6 @@
 use std::path::Path;
 
-use indexer::Store;
+use brk_indexer::Store;
 use storable_vec::Version;
 
 use crate::structs::{AddressindexTxoutindex, Unit};
diff --git a/computer/src/storage/mod.rs b/crates/brk_computer/src/storage/mod.rs
similarity index 100%
rename from computer/src/storage/mod.rs
rename to crates/brk_computer/src/storage/mod.rs
diff --git a/computer/src/storage/storable_vecs.rs b/crates/brk_computer/src/storage/storable_vecs.rs
similarity index 97%
rename from computer/src/storage/storable_vecs.rs
rename to crates/brk_computer/src/storage/storable_vecs.rs
index 73a1b10c4..a39ec0de4 100644
--- a/computer/src/storage/storable_vecs.rs
+++ b/crates/brk_computer/src/storage/storable_vecs.rs
@@ -1,7 +1,7 @@
 use std::{fs, path::Path};
 
-use indexer::{Addressindex, Height, Sats, Timestamp, Txindex, Txinindex, Txoutindex};
-use pricer::{Date, Dateindex};
+use brk_fetcher::{Date, Dateindex};
+use brk_indexer::{Addressindex, Height, Sats, Timestamp, Txindex, Txinindex, Txoutindex};
 use storable_vec::{StorableVec, Version};
 
 use crate::structs::Feerate;
diff --git a/computer/src/structs/addressindextxoutindex.rs b/crates/brk_computer/src/structs/addressindextxoutindex.rs
similarity index 93%
rename from computer/src/structs/addressindextxoutindex.rs
rename to crates/brk_computer/src/structs/addressindextxoutindex.rs
index 3902528e7..e08cbf8b4 100644
--- a/computer/src/structs/addressindextxoutindex.rs
+++ b/crates/brk_computer/src/structs/addressindextxoutindex.rs
@@ -1,5 +1,5 @@
+use brk_indexer::{Addressindex, Txoutindex};
 use fjall::Slice;
-use indexer::{Addressindex, Txoutindex};
 use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout};
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Immutable, IntoBytes, KnownLayout, FromBytes)]
diff --git a/computer/src/structs/bitcoin.rs b/crates/brk_computer/src/structs/bitcoin.rs
similarity index 91%
rename from computer/src/structs/bitcoin.rs
rename to crates/brk_computer/src/structs/bitcoin.rs
index 28f4621d5..36deb7800 100644
--- a/computer/src/structs/bitcoin.rs
+++ b/crates/brk_computer/src/structs/bitcoin.rs
@@ -1,4 +1,4 @@
-use indexer::Sats;
+use brk_indexer::Sats;
 
 #[derive(Debug, Default, Clone, Copy)]
 pub struct Bitcoin(f64);
diff --git a/computer/src/structs/feerate.rs b/crates/brk_computer/src/structs/feerate.rs
similarity index 100%
rename from computer/src/structs/feerate.rs
rename to crates/brk_computer/src/structs/feerate.rs
diff --git a/computer/src/structs/mod.rs b/crates/brk_computer/src/structs/mod.rs
similarity index 100%
rename from computer/src/structs/mod.rs
rename to crates/brk_computer/src/structs/mod.rs
diff --git a/computer/src/structs/ohlc.rs b/crates/brk_computer/src/structs/ohlc.rs
similarity index 100%
rename from computer/src/structs/ohlc.rs
rename to crates/brk_computer/src/structs/ohlc.rs
diff --git a/computer/src/structs/unit.rs b/crates/brk_computer/src/structs/unit.rs
similarity index 100%
rename from computer/src/structs/unit.rs
rename to crates/brk_computer/src/structs/unit.rs
diff --git a/pricer/Cargo.toml b/crates/brk_fetcher/Cargo.toml
similarity index 66%
rename from pricer/Cargo.toml
rename to crates/brk_fetcher/Cargo.toml
index 6eb27ee7c..33a9595e8 100644
--- a/pricer/Cargo.toml
+++ b/crates/brk_fetcher/Cargo.toml
@@ -1,16 +1,17 @@
 [package]
-name = "bricer"
-description = "A bitcoin price fetcher built on top of bindexer"
+name = "brk_fetcher"
+description = "A bitcoin price fetcher built on top of brk_indexer"
 version = "0.1.0"
 edition = { workspace = true }
 license = { workspace = true }
 
 [dependencies]
+brk_indexer = { workspace = true }
+brk_printer = { workspace = true }
 color-eyre = { workspace = true }
 derive_deref = { workspace = true }
-indexer = { workspace = true }
 jiff = { workspace = true }
-logger = { workspace = true }
+log = { workspace = true }
 minreq = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
diff --git a/pricer/src/fetchers/binance.rs b/crates/brk_fetcher/src/fetchers/binance.rs
similarity index 98%
rename from pricer/src/fetchers/binance.rs
rename to crates/brk_fetcher/src/fetchers/binance.rs
index 265462ca6..6bd444b60 100644
--- a/pricer/src/fetchers/binance.rs
+++ b/crates/brk_fetcher/src/fetchers/binance.rs
@@ -6,16 +6,16 @@ use std::{
     str::FromStr,
 };
 
-use color_eyre::eyre::{eyre, ContextCompat};
-use indexer::Timestamp;
-use logger::info;
+use brk_indexer::Timestamp;
+use color_eyre::eyre::{ContextCompat, eyre};
+use log::info;
 use serde_json::Value;
 use storable_vec::STATELESS;
 
 use crate::{
+    Close, Date, Dollars, High, Low, Open, Pricer,
     fetchers::retry,
     structs::{Cents, OHLC},
-    Close, Date, Dollars, High, Low, Open, Pricer,
 };
 
 pub struct Binance {
diff --git a/pricer/src/fetchers/kibo.rs b/crates/brk_fetcher/src/fetchers/kibo.rs
similarity index 99%
rename from pricer/src/fetchers/kibo.rs
rename to crates/brk_fetcher/src/fetchers/kibo.rs
index 847ab32a4..b5327375b 100644
--- a/pricer/src/fetchers/kibo.rs
+++ b/crates/brk_fetcher/src/fetchers/kibo.rs
@@ -1,14 +1,14 @@
 use std::{collections::BTreeMap, str::FromStr};
 
+use brk_indexer::Height;
 use color_eyre::eyre::ContextCompat;
-use indexer::Height;
-use logger::info;
+use log::info;
 use serde_json::Value;
 
 use crate::{
+    Cents, Close, Dollars, High, Low, Open,
     fetchers::retry,
     structs::{Date, OHLC},
-    Cents, Close, Dollars, High, Low, Open,
 };
 
 #[derive(Default)]
diff --git a/pricer/src/fetchers/kraken.rs b/crates/brk_fetcher/src/fetchers/kraken.rs
similarity index 96%
rename from pricer/src/fetchers/kraken.rs
rename to crates/brk_fetcher/src/fetchers/kraken.rs
index 6de067b6c..49618fcee 100644
--- a/pricer/src/fetchers/kraken.rs
+++ b/crates/brk_fetcher/src/fetchers/kraken.rs
@@ -1,12 +1,12 @@
 use std::collections::BTreeMap;
 
+use brk_indexer::Timestamp;
 use color_eyre::eyre::ContextCompat;
-use indexer::Timestamp;
-use logger::info;
+use log::info;
 use serde_json::Value;
 use storable_vec::STATELESS;
 
-use crate::{fetchers::retry, structs::Date, Cents, Close, Dollars, High, Low, Open, Pricer, OHLC};
+use crate::{Cents, Close, Dollars, High, Low, OHLC, Open, Pricer, fetchers::retry, structs::Date};
 
 #[derive(Default)]
 pub struct Kraken {
diff --git a/pricer/src/fetchers/mod.rs b/crates/brk_fetcher/src/fetchers/mod.rs
similarity index 100%
rename from pricer/src/fetchers/mod.rs
rename to crates/brk_fetcher/src/fetchers/mod.rs
diff --git a/pricer/src/fetchers/retry.rs b/crates/brk_fetcher/src/fetchers/retry.rs
similarity index 96%
rename from pricer/src/fetchers/retry.rs
rename to crates/brk_fetcher/src/fetchers/retry.rs
index 555e4a31c..3e1ab4675 100644
--- a/pricer/src/fetchers/retry.rs
+++ b/crates/brk_fetcher/src/fetchers/retry.rs
@@ -1,6 +1,6 @@
 use std::{thread::sleep, time::Duration};
 
-use logger::info;
+use log::info;
 
 pub fn retry<T>(
     function: impl Fn(usize) -> color_eyre::Result<T>,
diff --git a/pricer/src/lib.rs b/crates/brk_fetcher/src/lib.rs
similarity index 98%
rename from pricer/src/lib.rs
rename to crates/brk_fetcher/src/lib.rs
index 60a2fcc63..7de87c79c 100644
--- a/pricer/src/lib.rs
+++ b/crates/brk_fetcher/src/lib.rs
@@ -9,9 +9,9 @@ use color_eyre::eyre::Error;
 mod fetchers;
 mod structs;
 
+use brk_indexer::{Height, Indexer, Timestamp};
 pub use fetchers::*;
-use indexer::{Height, Indexer, Timestamp};
-use storable_vec::{AnyJsonStorableVec, AnyStorableVec, StorableVec, Version, SINGLE_THREAD};
+use storable_vec::{AnyJsonStorableVec, AnyStorableVec, SINGLE_THREAD, StorableVec, Version};
 pub use structs::*;
 
 pub struct Pricer<const MODE: u8> {
diff --git a/pricer/src/main.rs b/crates/brk_fetcher/src/main.rs
similarity index 78%
rename from pricer/src/main.rs
rename to crates/brk_fetcher/src/main.rs
index ca945e8da..2c057cdae 100644
--- a/pricer/src/main.rs
+++ b/crates/brk_fetcher/src/main.rs
@@ -1,11 +1,11 @@
-use bricer::{Binance, Kibo, Kraken};
-use indexer::Height;
+use brk_fetcher::{Binance, Kibo, Kraken};
+use brk_indexer::Height;
 use serde_json::Value;
 
 fn main() -> color_eyre::Result<()> {
     color_eyre::install()?;
 
-    logger::init_log(None);
+    brk_printer::init_log(None);
 
     dbg!(Binance::fetch_1d()?);
     // dbg!(Binance::fetch_1mn_prices());
diff --git a/pricer/src/structs/cents.rs b/crates/brk_fetcher/src/structs/cents.rs
similarity index 100%
rename from pricer/src/structs/cents.rs
rename to crates/brk_fetcher/src/structs/cents.rs
diff --git a/pricer/src/structs/close.rs b/crates/brk_fetcher/src/structs/close.rs
similarity index 100%
rename from pricer/src/structs/close.rs
rename to crates/brk_fetcher/src/structs/close.rs
diff --git a/pricer/src/structs/date.rs b/crates/brk_fetcher/src/structs/date.rs
similarity index 94%
rename from pricer/src/structs/date.rs
rename to crates/brk_fetcher/src/structs/date.rs
index 766b661c1..21e7f112d 100644
--- a/pricer/src/structs/date.rs
+++ b/crates/brk_fetcher/src/structs/date.rs
@@ -1,5 +1,5 @@
-use indexer::Timestamp;
-use jiff::{civil::Date as Date_, tz::TimeZone, Span};
+use brk_indexer::Timestamp;
+use jiff::{Span, civil::Date as Date_, tz::TimeZone};
 use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout};
 
 use super::Dateindex;
diff --git a/pricer/src/structs/dateindex.rs b/crates/brk_fetcher/src/structs/dateindex.rs
similarity index 100%
rename from pricer/src/structs/dateindex.rs
rename to crates/brk_fetcher/src/structs/dateindex.rs
diff --git a/pricer/src/structs/dollars.rs b/crates/brk_fetcher/src/structs/dollars.rs
similarity index 100%
rename from pricer/src/structs/dollars.rs
rename to crates/brk_fetcher/src/structs/dollars.rs
diff --git a/pricer/src/structs/high.rs b/crates/brk_fetcher/src/structs/high.rs
similarity index 100%
rename from pricer/src/structs/high.rs
rename to crates/brk_fetcher/src/structs/high.rs
diff --git a/pricer/src/structs/low.rs b/crates/brk_fetcher/src/structs/low.rs
similarity index 100%
rename from pricer/src/structs/low.rs
rename to crates/brk_fetcher/src/structs/low.rs
diff --git a/pricer/src/structs/mod.rs b/crates/brk_fetcher/src/structs/mod.rs
similarity index 100%
rename from pricer/src/structs/mod.rs
rename to crates/brk_fetcher/src/structs/mod.rs
diff --git a/pricer/src/structs/open.rs b/crates/brk_fetcher/src/structs/open.rs
similarity index 100%
rename from pricer/src/structs/open.rs
rename to crates/brk_fetcher/src/structs/open.rs
diff --git a/indexer/Cargo.toml b/crates/brk_indexer/Cargo.toml
similarity index 73%
rename from indexer/Cargo.toml
rename to crates/brk_indexer/Cargo.toml
index 5ae90ad97..547518d74 100644
--- a/indexer/Cargo.toml
+++ b/crates/brk_indexer/Cargo.toml
@@ -1,19 +1,20 @@
 [package]
-name = "bindexer"
-description = "A bitcoin-core indexer built on top of biter"
+name = "brk_indexer"
+description = "A bitcoin-core indexer built on top of brk_parser"
 version = "0.1.0"
 edition = { workspace = true }
 license = { workspace = true }
 
 [dependencies]
 bitcoin = { workspace = true }
+brk_parser = { workspace = true }
+brk_printer = { workspace = true }
 color-eyre = { workspace = true }
 derive_deref = { workspace = true }
 fjall = { workspace = true }
 hodor = { workspace = true }
-iterator = { workspace = true }
 jiff = { workspace = true }
-logger = { workspace = true }
+log = { workspace = true }
 rapidhash = "1.4.0"
 rayon = { workspace = true }
 rlimit = { version = "0.10.2" }
diff --git a/indexer/README.md b/crates/brk_indexer/README.md
similarity index 100%
rename from indexer/README.md
rename to crates/brk_indexer/README.md
diff --git a/indexer/src/lib.rs b/crates/brk_indexer/src/lib.rs
similarity index 98%
rename from indexer/src/lib.rs
rename to crates/brk_indexer/src/lib.rs
index 48219356a..901226e81 100644
--- a/indexer/src/lib.rs
+++ b/crates/brk_indexer/src/lib.rs
@@ -6,12 +6,12 @@ use std::{
     time::Duration,
 };
 
-pub use iterator::*;
+pub use brk_parser::*;
 
 use bitcoin::{Transaction, TxIn, TxOut};
-use color_eyre::eyre::{eyre, ContextCompat};
+use color_eyre::eyre::{ContextCompat, eyre};
 use hodor::Exit;
-use logger::info;
+use log::info;
 use rayon::prelude::*;
 use storable_vec::CACHED_GETS;
 
@@ -78,7 +78,7 @@ impl Indexer<CACHED_GETS> {
 
         let mut idxs = starting_indexes;
 
-        iterator::new(bitcoin_dir, Some(idxs.height), None, rpc)
+        brk_parser::new(bitcoin_dir, Some(idxs.height), None, rpc)
             .iter()
             .try_for_each(|(height, block, blockhash)| -> color_eyre::Result<()> {
                 info!("Indexing block {height}...");
@@ -598,11 +598,9 @@ impl Indexer<CACHED_GETS> {
                         vecs.txindex_to_txid.push_if_needed(txindex, txid)?;
                         vecs.txindex_to_height.push_if_needed(txindex, height)?;
                         vecs.txindex_to_locktime.push_if_needed(txindex, tx.lock_time.into())?;
-                        // tx.base_size()
-                        // tx.total_size()
-                        // tx.is_explicitly_rbf()
-                        // tx.weight()
-                        // tx.vsize() in computer as it can be computed from the weight
+                        vecs.txindex_to_base_size.push_if_needed(txindex, tx.base_size())?;
+                        vecs.txindex_to_total_size.push_if_needed(txindex, tx.total_size())?;
+                        vecs.txindex_to_is_explicitly_rbf.push_if_needed(txindex, tx.is_explicitly_rbf())?;
                         Ok(())
                     })?;
 
diff --git a/indexer/src/main.rs b/crates/brk_indexer/src/main.rs
similarity index 89%
rename from indexer/src/main.rs
rename to crates/brk_indexer/src/main.rs
index b44c36880..fa7788c83 100644
--- a/indexer/src/main.rs
+++ b/crates/brk_indexer/src/main.rs
@@ -1,15 +1,15 @@
 use std::{path::Path, thread::sleep, time::Duration};
 
-use bindexer::{rpc::RpcApi, Indexer};
+use brk_indexer::{Indexer, rpc::RpcApi};
+use brk_parser::rpc::{self};
 use hodor::Exit;
-use iterator::rpc;
-use logger::info;
+use log::info;
 use storable_vec::CACHED_GETS;
 
 fn main() -> color_eyre::Result<()> {
     color_eyre::install()?;
 
-    logger::init_log(None);
+    brk_printer::init_log(None);
 
     let data_dir = Path::new("../../bitcoin");
     let rpc = Box::leak(Box::new(rpc::Client::new(
diff --git a/indexer/src/storage/fjalls/base.rs b/crates/brk_indexer/src/storage/fjalls/base.rs
similarity index 98%
rename from indexer/src/storage/fjalls/base.rs
rename to crates/brk_indexer/src/storage/fjalls/base.rs
index 9b215b779..207a88853 100644
--- a/indexer/src/storage/fjalls/base.rs
+++ b/crates/brk_indexer/src/storage/fjalls/base.rs
@@ -4,11 +4,11 @@ use std::{
     path::Path,
 };
 
+use brk_parser::Height;
 use fjall::{
     PartitionCreateOptions, PersistMode, ReadTransaction, Result, Slice, TransactionalKeyspace,
     TransactionalPartitionHandle,
 };
-use iterator::Height;
 use storable_vec::{Value, Version};
 use zerocopy::{Immutable, IntoBytes};
 
@@ -102,7 +102,7 @@ where
         mem::take(&mut self.puts).into_iter().for_each(|(key, value)| {
             if CHECK_COLLISISONS {
                 if let Ok(Some(value)) = wtx.get(&self.part, key.as_bytes()) {
-                    dbg!(value);
+                    dbg!(value, &self.meta);
                     unreachable!();
                 }
             }
diff --git a/indexer/src/storage/fjalls/meta.rs b/crates/brk_indexer/src/storage/fjalls/meta.rs
similarity index 99%
rename from indexer/src/storage/fjalls/meta.rs
rename to crates/brk_indexer/src/storage/fjalls/meta.rs
index b9a79c38f..5c0bfdf56 100644
--- a/indexer/src/storage/fjalls/meta.rs
+++ b/crates/brk_indexer/src/storage/fjalls/meta.rs
@@ -8,6 +8,7 @@ use zerocopy::{FromBytes, IntoBytes};
 
 use super::Height;
 
+#[derive(Debug)]
 pub struct StoreMeta {
     pathbuf: PathBuf,
     version: Version,
diff --git a/indexer/src/storage/fjalls/mod.rs b/crates/brk_indexer/src/storage/fjalls/mod.rs
similarity index 100%
rename from indexer/src/storage/fjalls/mod.rs
rename to crates/brk_indexer/src/storage/fjalls/mod.rs
diff --git a/indexer/src/storage/fjalls/version.rs b/crates/brk_indexer/src/storage/fjalls/version.rs
similarity index 100%
rename from indexer/src/storage/fjalls/version.rs
rename to crates/brk_indexer/src/storage/fjalls/version.rs
diff --git a/indexer/src/storage/mod.rs b/crates/brk_indexer/src/storage/mod.rs
similarity index 100%
rename from indexer/src/storage/mod.rs
rename to crates/brk_indexer/src/storage/mod.rs
diff --git a/indexer/src/storage/storable_vecs/base.rs b/crates/brk_indexer/src/storage/storable_vecs/base.rs
similarity index 93%
rename from indexer/src/storage/storable_vecs/base.rs
rename to crates/brk_indexer/src/storage/storable_vecs/base.rs
index c02b6cd7e..f762bb2b5 100644
--- a/indexer/src/storage/storable_vecs/base.rs
+++ b/crates/brk_indexer/src/storage/storable_vecs/base.rs
@@ -39,7 +39,7 @@ where
         self.vec.truncate_if_needed(index)
     }
 
-    pub fn height(&self) -> iterator::Result<Height> {
+    pub fn height(&self) -> brk_parser::Result<Height> {
         Height::try_from(self.path_height().as_path())
     }
     fn path_height(&self) -> PathBuf {
@@ -71,7 +71,7 @@ impl<I, T, const MODE: u8> DerefMut for StorableVec<I, T, MODE> {
 }
 
 pub trait AnyStorableVec: Send + Sync {
-    fn height(&self) -> iterator::Result<Height>;
+    fn height(&self) -> brk_parser::Result<Height>;
     fn flush(&mut self, height: Height) -> io::Result<()>;
 }
 
@@ -80,7 +80,7 @@ where
     I: StoredIndex,
     T: StoredType,
 {
-    fn height(&self) -> iterator::Result<Height> {
+    fn height(&self) -> brk_parser::Result<Height> {
         self.height()
     }
 
diff --git a/indexer/src/storage/storable_vecs/mod.rs b/crates/brk_indexer/src/storage/storable_vecs/mod.rs
similarity index 94%
rename from indexer/src/storage/storable_vecs/mod.rs
rename to crates/brk_indexer/src/storage/storable_vecs/mod.rs
index 572303bc6..481f92af2 100644
--- a/indexer/src/storage/storable_vecs/mod.rs
+++ b/crates/brk_indexer/src/storage/storable_vecs/mod.rs
@@ -1,10 +1,11 @@
 use std::{fs, io, path::Path};
 
-use iterator::Height;
+use brk_parser::Height;
 use rayon::prelude::*;
-use storable_vec::{AnyJsonStorableVec, Version, CACHED_GETS};
+use storable_vec::{AnyJsonStorableVec, CACHED_GETS, Version};
 
 use crate::{
+    Indexes,
     structs::{
         Addressbytes, Addressindex, Addresstype, Addresstypeindex, BlockHash, Emptyindex, LockTime, Multisigindex,
         Opreturnindex, P2PK33AddressBytes, P2PK33index, P2PK65AddressBytes, P2PK65index, P2PKHAddressBytes, P2PKHindex,
@@ -12,7 +13,6 @@ use crate::{
         P2WSHindex, Pushonlyindex, Sats, Timestamp, TxVersion, Txid, Txindex, Txinindex, Txoutindex, Unknownindex,
         Weight,
     },
-    Indexes,
 };
 
 mod base;
@@ -56,6 +56,9 @@ pub struct StorableVecs<const MODE: u8> {
     pub txindex_to_height: StorableVec<Txindex, Height, MODE>,
     pub txindex_to_locktime: StorableVec<Txindex, LockTime, MODE>,
     pub txindex_to_txid: StorableVec<Txindex, Txid, MODE>,
+    pub txindex_to_base_size: StorableVec<Txindex, usize, MODE>,
+    pub txindex_to_total_size: StorableVec<Txindex, usize, MODE>,
+    pub txindex_to_is_explicitly_rbf: StorableVec<Txindex, bool, MODE>,
     pub txindex_to_txversion: StorableVec<Txindex, TxVersion, MODE>,
     pub txinindex_to_txoutindex: StorableVec<Txinindex, Txoutindex, MODE>,
     pub txoutindex_to_addressindex: StorableVec<Txoutindex, Addressindex, MODE>,
@@ -172,6 +175,12 @@ impl<const MODE: u8> StorableVecs<MODE> {
             txindex_to_height: StorableVec::import(&path.join("txindex_to_height"), Version::from(1))?,
             txindex_to_locktime: StorableVec::import(&path.join("txindex_to_locktime"), Version::from(1))?,
             txindex_to_txid: StorableVec::import(&path.join("txindex_to_txid"), Version::from(1))?,
+            txindex_to_base_size: StorableVec::import(&path.join("txindex_to_base_size"), Version::from(1))?,
+            txindex_to_total_size: StorableVec::import(&path.join("txindex_to_total_size"), Version::from(1))?,
+            txindex_to_is_explicitly_rbf: StorableVec::import(
+                &path.join("txindex_to_is_explicitly_rbf"),
+                Version::from(1),
+            )?,
             txindex_to_txversion: StorableVec::import(&path.join("txindex_to_txversion"), Version::from(1))?,
             txinindex_to_txoutindex: StorableVec::import(&path.join("txinindex_to_txoutindex"), Version::from(1))?,
             txoutindex_to_addressindex: StorableVec::import(
@@ -273,6 +282,10 @@ impl<const MODE: u8> StorableVecs<MODE> {
         self.txindex_to_locktime.truncate_if_needed(txindex, saved_height)?;
         self.txindex_to_txid.truncate_if_needed(txindex, saved_height)?;
         self.txindex_to_txversion.truncate_if_needed(txindex, saved_height)?;
+        self.txindex_to_base_size.truncate_if_needed(txindex, saved_height)?;
+        self.txindex_to_total_size.truncate_if_needed(txindex, saved_height)?;
+        self.txindex_to_is_explicitly_rbf
+            .truncate_if_needed(txindex, saved_height)?;
 
         self.txinindex_to_txoutindex
             .truncate_if_needed(txinindex, saved_height)?;
@@ -298,7 +311,7 @@ impl<const MODE: u8> StorableVecs<MODE> {
             .unwrap()
     }
 
-    pub fn as_any_json_vec_slice(&self) -> [&dyn AnyJsonStorableVec; 40] {
+    pub fn as_any_json_vec_slice(&self) -> [&dyn AnyJsonStorableVec; 43] {
         [
             &*self.addressindex_to_addresstype as &dyn AnyJsonStorableVec,
             &*self.addressindex_to_addresstypeindex,
@@ -336,6 +349,9 @@ impl<const MODE: u8> StorableVecs<MODE> {
             &*self.txindex_to_height,
             &*self.txindex_to_locktime,
             &*self.txindex_to_txid,
+            &*self.txindex_to_base_size,
+            &*self.txindex_to_total_size,
+            &*self.txindex_to_is_explicitly_rbf,
             &*self.txindex_to_txversion,
             &*self.txinindex_to_txoutindex,
             &*self.txoutindex_to_addressindex,
@@ -343,7 +359,7 @@ impl<const MODE: u8> StorableVecs<MODE> {
         ]
     }
 
-    pub fn as_mut_any_vec_slice(&mut self) -> [&mut dyn AnyStorableVec; 40] {
+    pub fn as_mut_any_vec_slice(&mut self) -> [&mut dyn AnyStorableVec; 43] {
         [
             &mut self.addressindex_to_addresstype as &mut dyn AnyStorableVec,
             &mut self.addressindex_to_addresstypeindex,
@@ -381,6 +397,9 @@ impl<const MODE: u8> StorableVecs<MODE> {
             &mut self.txindex_to_height,
             &mut self.txindex_to_locktime,
             &mut self.txindex_to_txid,
+            &mut self.txindex_to_base_size,
+            &mut self.txindex_to_total_size,
+            &mut self.txindex_to_is_explicitly_rbf,
             &mut self.txindex_to_txversion,
             &mut self.txinindex_to_txoutindex,
             &mut self.txoutindex_to_addressindex,
diff --git a/indexer/src/structs/addressbytes.rs b/crates/brk_indexer/src/structs/addressbytes.rs
similarity index 99%
rename from indexer/src/structs/addressbytes.rs
rename to crates/brk_indexer/src/structs/addressbytes.rs
index 70940b46d..2d679a3cd 100644
--- a/indexer/src/structs/addressbytes.rs
+++ b/crates/brk_indexer/src/structs/addressbytes.rs
@@ -1,6 +1,6 @@
+use brk_parser::bitcoin::ScriptBuf;
 use color_eyre::eyre::eyre;
 use derive_deref::{Deref, DerefMut};
-use iterator::bitcoin::ScriptBuf;
 use serde::Serialize;
 use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout};
 
diff --git a/indexer/src/structs/addressindex.rs b/crates/brk_indexer/src/structs/addressindex.rs
similarity index 100%
rename from indexer/src/structs/addressindex.rs
rename to crates/brk_indexer/src/structs/addressindex.rs
diff --git a/indexer/src/structs/addresstype.rs b/crates/brk_indexer/src/structs/addresstype.rs
similarity index 97%
rename from indexer/src/structs/addresstype.rs
rename to crates/brk_indexer/src/structs/addresstype.rs
index a1da2b4df..94a3e06a8 100644
--- a/indexer/src/structs/addresstype.rs
+++ b/crates/brk_indexer/src/structs/addresstype.rs
@@ -1,4 +1,4 @@
-use iterator::bitcoin::ScriptBuf;
+use brk_parser::bitcoin::ScriptBuf;
 use serde::Serialize;
 use zerocopy::{Immutable, IntoBytes, KnownLayout, TryFromBytes};
 
diff --git a/indexer/src/structs/addresstypeindex.rs b/crates/brk_indexer/src/structs/addresstypeindex.rs
similarity index 100%
rename from indexer/src/structs/addresstypeindex.rs
rename to crates/brk_indexer/src/structs/addresstypeindex.rs
diff --git a/indexer/src/structs/blockhash.rs b/crates/brk_indexer/src/structs/blockhash.rs
similarity index 93%
rename from indexer/src/structs/blockhash.rs
rename to crates/brk_indexer/src/structs/blockhash.rs
index f8da62225..4fd59e391 100644
--- a/indexer/src/structs/blockhash.rs
+++ b/crates/brk_indexer/src/structs/blockhash.rs
@@ -1,10 +1,10 @@
 use std::mem;
 
-use derive_deref::Deref;
-use iterator::{
-    rpc::{Client, RpcApi},
+use brk_parser::{
     Height,
+    rpc::{Client, RpcApi},
 };
+use derive_deref::Deref;
 use serde::Serialize;
 use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout};
 
@@ -24,7 +24,7 @@ impl From<BlockHash> for bitcoin::BlockHash {
 }
 
 impl TryFrom<(&Client, Height)> for BlockHash {
-    type Error = iterator::rpc::Error;
+    type Error = brk_parser::rpc::Error;
     fn try_from((rpc, height): (&Client, Height)) -> Result<Self, Self::Error> {
         Ok(Self::from(rpc.get_block_hash(u64::from(height))?))
     }
diff --git a/indexer/src/structs/compressed.rs b/crates/brk_indexer/src/structs/compressed.rs
similarity index 100%
rename from indexer/src/structs/compressed.rs
rename to crates/brk_indexer/src/structs/compressed.rs
diff --git a/indexer/src/structs/indexes.rs b/crates/brk_indexer/src/structs/indexes.rs
similarity index 98%
rename from indexer/src/structs/indexes.rs
rename to crates/brk_indexer/src/structs/indexes.rs
index 02539dc06..5339b559d 100644
--- a/indexer/src/structs/indexes.rs
+++ b/crates/brk_indexer/src/structs/indexes.rs
@@ -1,6 +1,6 @@
+use brk_parser::NUMBER_OF_UNSAFE_BLOCKS;
+use brk_parser::{Height, rpc::Client};
 use color_eyre::eyre::ContextCompat;
-use iterator::NUMBER_OF_UNSAFE_BLOCKS;
-use iterator::{rpc::Client, Height};
 use storable_vec::CACHED_GETS;
 
 use crate::storage::{Fjalls, StorableVecs};
diff --git a/indexer/src/structs/locktime.rs b/crates/brk_indexer/src/structs/locktime.rs
similarity index 97%
rename from indexer/src/structs/locktime.rs
rename to crates/brk_indexer/src/structs/locktime.rs
index c0ba0826f..ceaac5b46 100644
--- a/indexer/src/structs/locktime.rs
+++ b/crates/brk_indexer/src/structs/locktime.rs
@@ -1,4 +1,4 @@
-use iterator::Height;
+use brk_parser::Height;
 use serde::Serialize;
 use zerocopy::{Immutable, IntoBytes, KnownLayout, TryFromBytes};
 
diff --git a/indexer/src/structs/mod.rs b/crates/brk_indexer/src/structs/mod.rs
similarity index 100%
rename from indexer/src/structs/mod.rs
rename to crates/brk_indexer/src/structs/mod.rs
diff --git a/indexer/src/structs/sats.rs b/crates/brk_indexer/src/structs/sats.rs
similarity index 97%
rename from indexer/src/structs/sats.rs
rename to crates/brk_indexer/src/structs/sats.rs
index 238e7cc3d..9d5881440 100644
--- a/indexer/src/structs/sats.rs
+++ b/crates/brk_indexer/src/structs/sats.rs
@@ -3,8 +3,8 @@ use std::{
     ops::{Add, AddAssign, Mul, Sub, SubAssign},
 };
 
+use brk_parser::{Height, bitcoin::Amount};
 use derive_deref::{Deref, DerefMut};
-use iterator::{bitcoin::Amount, Height};
 use serde::Serialize;
 use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout};
 
diff --git a/indexer/src/structs/timestamp.rs b/crates/brk_indexer/src/structs/timestamp.rs
similarity index 100%
rename from indexer/src/structs/timestamp.rs
rename to crates/brk_indexer/src/structs/timestamp.rs
diff --git a/indexer/src/structs/txid.rs b/crates/brk_indexer/src/structs/txid.rs
similarity index 100%
rename from indexer/src/structs/txid.rs
rename to crates/brk_indexer/src/structs/txid.rs
diff --git a/indexer/src/structs/txindex.rs b/crates/brk_indexer/src/structs/txindex.rs
similarity index 100%
rename from indexer/src/structs/txindex.rs
rename to crates/brk_indexer/src/structs/txindex.rs
diff --git a/indexer/src/structs/txinindex.rs b/crates/brk_indexer/src/structs/txinindex.rs
similarity index 100%
rename from indexer/src/structs/txinindex.rs
rename to crates/brk_indexer/src/structs/txinindex.rs
diff --git a/indexer/src/structs/txoutindex.rs b/crates/brk_indexer/src/structs/txoutindex.rs
similarity index 100%
rename from indexer/src/structs/txoutindex.rs
rename to crates/brk_indexer/src/structs/txoutindex.rs
diff --git a/indexer/src/structs/txversion.rs b/crates/brk_indexer/src/structs/txversion.rs
similarity index 100%
rename from indexer/src/structs/txversion.rs
rename to crates/brk_indexer/src/structs/txversion.rs
diff --git a/indexer/src/structs/vin.rs b/crates/brk_indexer/src/structs/vin.rs
similarity index 100%
rename from indexer/src/structs/vin.rs
rename to crates/brk_indexer/src/structs/vin.rs
diff --git a/indexer/src/structs/vout.rs b/crates/brk_indexer/src/structs/vout.rs
similarity index 100%
rename from indexer/src/structs/vout.rs
rename to crates/brk_indexer/src/structs/vout.rs
diff --git a/indexer/src/structs/weight.rs b/crates/brk_indexer/src/structs/weight.rs
similarity index 100%
rename from indexer/src/structs/weight.rs
rename to crates/brk_indexer/src/structs/weight.rs
diff --git a/iterator/CHANGELOG.md b/crates/brk_parser/CHANGELOG.md
similarity index 100%
rename from iterator/CHANGELOG.md
rename to crates/brk_parser/CHANGELOG.md
diff --git a/iterator/Cargo.lock b/crates/brk_parser/Cargo.lock
similarity index 100%
rename from iterator/Cargo.lock
rename to crates/brk_parser/Cargo.lock
diff --git a/iterator/Cargo.toml b/crates/brk_parser/Cargo.toml
similarity index 97%
rename from iterator/Cargo.toml
rename to crates/brk_parser/Cargo.toml
index 014a1c029..e80f382c3 100644
--- a/iterator/Cargo.toml
+++ b/crates/brk_parser/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "biterator"
+name = "brk_parser"
 description = "A very fast Bitcoin block iterator built on top of bitcoin-rust"
 version = "0.2.3"
 repository = "https://github.com/kibo-money/kibo/tree/main/src/crates/biter"
diff --git a/iterator/LICENSE.md b/crates/brk_parser/LICENSE.md
similarity index 100%
rename from iterator/LICENSE.md
rename to crates/brk_parser/LICENSE.md
diff --git a/iterator/README.md b/crates/brk_parser/README.md
similarity index 100%
rename from iterator/README.md
rename to crates/brk_parser/README.md
diff --git a/iterator/src/blk_index_to_blk_path.rs b/crates/brk_parser/src/blk_index_to_blk_path.rs
similarity index 100%
rename from iterator/src/blk_index_to_blk_path.rs
rename to crates/brk_parser/src/blk_index_to_blk_path.rs
diff --git a/iterator/src/blk_index_to_blk_recap.rs b/crates/brk_parser/src/blk_index_to_blk_recap.rs
similarity index 100%
rename from iterator/src/blk_index_to_blk_recap.rs
rename to crates/brk_parser/src/blk_index_to_blk_recap.rs
diff --git a/iterator/src/blk_metadata.rs b/crates/brk_parser/src/blk_metadata.rs
similarity index 100%
rename from iterator/src/blk_metadata.rs
rename to crates/brk_parser/src/blk_metadata.rs
diff --git a/iterator/src/blk_metadata_and_block.rs b/crates/brk_parser/src/blk_metadata_and_block.rs
similarity index 100%
rename from iterator/src/blk_metadata_and_block.rs
rename to crates/brk_parser/src/blk_metadata_and_block.rs
diff --git a/iterator/src/blk_recap.rs b/crates/brk_parser/src/blk_recap.rs
similarity index 100%
rename from iterator/src/blk_recap.rs
rename to crates/brk_parser/src/blk_recap.rs
diff --git a/iterator/src/error.rs b/crates/brk_parser/src/error.rs
similarity index 100%
rename from iterator/src/error.rs
rename to crates/brk_parser/src/error.rs
diff --git a/iterator/src/height.rs b/crates/brk_parser/src/height.rs
similarity index 100%
rename from iterator/src/height.rs
rename to crates/brk_parser/src/height.rs
diff --git a/iterator/src/lib.rs b/crates/brk_parser/src/lib.rs
similarity index 100%
rename from iterator/src/lib.rs
rename to crates/brk_parser/src/lib.rs
diff --git a/iterator/src/main.rs b/crates/brk_parser/src/main.rs
similarity index 91%
rename from iterator/src/main.rs
rename to crates/brk_parser/src/main.rs
index 4341a714d..623e79bcd 100644
--- a/iterator/src/main.rs
+++ b/crates/brk_parser/src/main.rs
@@ -17,7 +17,7 @@ fn main() {
     let start = None;
     let end = None;
 
-    biterator::new(data_dir, start, end, rpc)
+    brk_parser::new(data_dir, start, end, rpc)
         .iter()
         .for_each(|(height, _block, hash)| {
             println!("{height}: {hash}");
diff --git a/iterator/src/utils.rs b/crates/brk_parser/src/utils.rs
similarity index 100%
rename from iterator/src/utils.rs
rename to crates/brk_parser/src/utils.rs
diff --git a/iterator/src/xor.rs b/crates/brk_parser/src/xor.rs
similarity index 100%
rename from iterator/src/xor.rs
rename to crates/brk_parser/src/xor.rs
diff --git a/logger/Cargo.toml b/crates/brk_printer/Cargo.toml
similarity index 92%
rename from logger/Cargo.toml
rename to crates/brk_printer/Cargo.toml
index d73da97f4..5009a0d61 100644
--- a/logger/Cargo.toml
+++ b/crates/brk_printer/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "cl0g"
+name = "brk_printer"
 description = "A clean logger"
 version = "0.1.0"
 edition = { workspace = true }
diff --git a/logger/src/lib.rs b/crates/brk_printer/src/lib.rs
similarity index 100%
rename from logger/src/lib.rs
rename to crates/brk_printer/src/lib.rs
diff --git a/logger/src/main.rs b/crates/brk_printer/src/main.rs
similarity index 55%
rename from logger/src/main.rs
rename to crates/brk_printer/src/main.rs
index bb874d4b5..80e3c0af9 100644
--- a/logger/src/main.rs
+++ b/crates/brk_printer/src/main.rs
@@ -1,7 +1,6 @@
-use cl0g::init_log;
 use log::info;
 
 fn main() {
-    init_log(None);
+    brk_printer::init_log(None);
     info!("test");
 }
diff --git a/server/Cargo.toml b/crates/brk_server/Cargo.toml
similarity index 79%
rename from server/Cargo.toml
rename to crates/brk_server/Cargo.toml
index 6b15f027a..5806aeea3 100644
--- a/server/Cargo.toml
+++ b/crates/brk_server/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "berver"
+name = "brk_server"
 description = "A Bitcoin data server built on top of bindexer, bricer and bomputer"
 version = "0.1.0"
 edition = { workspace = true }
@@ -7,12 +7,13 @@ license = { workspace = true }
 
 [dependencies]
 axum = "0.8.1"
+brk_computer = { workspace = true }
+brk_indexer = { workspace = true }
+brk_printer = { workspace = true }
 color-eyre = { workspace = true }
-computer = { workspace = true }
 derive_deref = { workspace = true }
-indexer = { workspace = true }
 jiff = { workspace = true }
-logger = { workspace = true }
+log = { workspace = true }
 oxc = { version = "0.52.0", features = ["codegen", "minifier"] }
 serde = { workspace = true }
 serde_json = { workspace = true }
diff --git a/server/src/api/explorer/mod.rs b/crates/brk_server/src/api/explorer/mod.rs
similarity index 100%
rename from server/src/api/explorer/mod.rs
rename to crates/brk_server/src/api/explorer/mod.rs
diff --git a/server/src/api/mod.rs b/crates/brk_server/src/api/mod.rs
similarity index 100%
rename from server/src/api/mod.rs
rename to crates/brk_server/src/api/mod.rs
diff --git a/server/src/api/vecs/format.rs b/crates/brk_server/src/api/vecs/format.rs
similarity index 100%
rename from server/src/api/vecs/format.rs
rename to crates/brk_server/src/api/vecs/format.rs
diff --git a/server/src/api/vecs/index.rs b/crates/brk_server/src/api/vecs/index.rs
similarity index 100%
rename from server/src/api/vecs/index.rs
rename to crates/brk_server/src/api/vecs/index.rs
diff --git a/server/src/api/vecs/mod.rs b/crates/brk_server/src/api/vecs/mod.rs
similarity index 100%
rename from server/src/api/vecs/mod.rs
rename to crates/brk_server/src/api/vecs/mod.rs
diff --git a/server/src/api/vecs/query.rs b/crates/brk_server/src/api/vecs/query.rs
similarity index 100%
rename from server/src/api/vecs/query.rs
rename to crates/brk_server/src/api/vecs/query.rs
diff --git a/server/src/api/vecs/tree.rs b/crates/brk_server/src/api/vecs/tree.rs
similarity index 100%
rename from server/src/api/vecs/tree.rs
rename to crates/brk_server/src/api/vecs/tree.rs
diff --git a/server/src/files/file.rs b/crates/brk_server/src/files/file.rs
similarity index 98%
rename from server/src/files/file.rs
rename to crates/brk_server/src/files/file.rs
index 4018e1776..196f39033 100644
--- a/server/src/files/file.rs
+++ b/crates/brk_server/src/files/file.rs
@@ -10,12 +10,11 @@ use axum::{
     http::{HeaderMap, StatusCode},
     response::{IntoResponse, Response},
 };
-use logger::{error, info};
+use log::{error, info};
 
 use crate::{
-    log_result,
+    WEBSITE_DEV_PATH, log_result,
     traits::{HeaderMapExtended, ModifiedState, ResponseExtended},
-    WEBSITE_DEV_PATH,
 };
 
 use super::minify::minify_js;
diff --git a/server/src/files/minify.rs b/crates/brk_server/src/files/minify.rs
similarity index 100%
rename from server/src/files/minify.rs
rename to crates/brk_server/src/files/minify.rs
diff --git a/server/src/files/mod.rs b/crates/brk_server/src/files/mod.rs
similarity index 100%
rename from server/src/files/mod.rs
rename to crates/brk_server/src/files/mod.rs
diff --git a/server/src/lib.rs b/crates/brk_server/src/lib.rs
similarity index 93%
rename from server/src/lib.rs
rename to crates/brk_server/src/lib.rs
index 66c6448ba..e2aca251f 100644
--- a/server/src/lib.rs
+++ b/crates/brk_server/src/lib.rs
@@ -1,12 +1,12 @@
 use std::time::Instant;
 
 use api::{ApiRoutes, VecIdToIndexToVec};
-use axum::{http::StatusCode, routing::get, serve, Json, Router};
+use axum::{Json, Router, http::StatusCode, routing::get, serve};
+use brk_computer::Computer;
+use brk_indexer::Indexer;
 use color_eyre::owo_colors::OwoColorize;
-use computer::Computer;
 use files::FilesRoutes;
-use indexer::Indexer;
-use logger::{error, info};
+use log::{error, info};
 use storable_vec::STATELESS;
 use tokio::net::TcpListener;
 use tower_http::compression::CompressionLayer;
diff --git a/server/src/main.rs b/crates/brk_server/src/main.rs
similarity index 71%
rename from server/src/main.rs
rename to crates/brk_server/src/main.rs
index b01a47c11..fde668fdc 100644
--- a/server/src/main.rs
+++ b/crates/brk_server/src/main.rs
@@ -1,20 +1,20 @@
 use std::path::Path;
 
-use computer::Computer;
-use indexer::Indexer;
+use brk_computer::Computer;
+use brk_indexer::Indexer;
 use storable_vec::STATELESS;
 
 #[tokio::main]
 pub async fn main() -> color_eyre::Result<()> {
     color_eyre::install()?;
 
-    logger::init_log(None);
+    brk_printer::init_log(None);
 
     let path = Path::new("../_outputs");
     let indexer: Indexer<STATELESS> = Indexer::import(&path.join("indexes"))?;
     let computer: Computer<STATELESS> = Computer::import(&path.join("computed"))?;
 
-    berver::main(indexer, computer).await.unwrap();
+    brk_server::main(indexer, computer).await.unwrap();
 
     Ok(())
 }
diff --git a/server/src/traits/header_map.rs b/crates/brk_server/src/traits/header_map.rs
similarity index 98%
rename from server/src/traits/header_map.rs
rename to crates/brk_server/src/traits/header_map.rs
index 596a22cbc..923155885 100644
--- a/server/src/traits/header_map.rs
+++ b/crates/brk_server/src/traits/header_map.rs
@@ -1,11 +1,11 @@
 use std::{path::Path, time};
 
 use axum::http::{
-    header::{self, HOST, IF_MODIFIED_SINCE},
     HeaderMap,
+    header::{self, HOST, IF_MODIFIED_SINCE},
 };
-use jiff::{civil::DateTime, fmt::strtime, tz::TimeZone, Timestamp};
-use logger::info;
+use jiff::{Timestamp, civil::DateTime, fmt::strtime, tz::TimeZone};
+use log::info;
 
 const STALE_IF_ERROR: u64 = 30_000_000; // 1 Year ish
 const MODIFIED_SINCE_FORMAT: &str = "%a, %d %b %Y %H:%M:%S GMT";
diff --git a/server/src/traits/mod.rs b/crates/brk_server/src/traits/mod.rs
similarity index 100%
rename from server/src/traits/mod.rs
rename to crates/brk_server/src/traits/mod.rs
diff --git a/server/src/traits/response.rs b/crates/brk_server/src/traits/response.rs
similarity index 100%
rename from server/src/traits/response.rs
rename to crates/brk_server/src/traits/response.rs
diff --git a/hodor/Cargo.toml b/crates/hodor/Cargo.toml
similarity index 65%
rename from hodor/Cargo.toml
rename to crates/hodor/Cargo.toml
index d1697fb1c..0100d6fc9 100644
--- a/hodor/Cargo.toml
+++ b/crates/hodor/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "hodor"
-description = "An exit blocker, can hold the door until a task is completed"
+description = "Hold the door, an exit blocker that can wait until a task is completed"
 version = "0.1.0"
 edition = { workspace = true }
 license = { workspace = true }
diff --git a/hodor/src/lib.rs b/crates/hodor/src/lib.rs
similarity index 100%
rename from hodor/src/lib.rs
rename to crates/hodor/src/lib.rs
diff --git a/storable_vec/.gitignore b/crates/storable_vec/.gitignore
similarity index 100%
rename from storable_vec/.gitignore
rename to crates/storable_vec/.gitignore
diff --git a/storable_vec/Cargo.lock b/crates/storable_vec/Cargo.lock
similarity index 100%
rename from storable_vec/Cargo.lock
rename to crates/storable_vec/Cargo.lock
diff --git a/storable_vec/Cargo.toml b/crates/storable_vec/Cargo.toml
similarity index 100%
rename from storable_vec/Cargo.toml
rename to crates/storable_vec/Cargo.toml
diff --git a/storable_vec/LICENSE.md b/crates/storable_vec/LICENSE.md
similarity index 100%
rename from storable_vec/LICENSE.md
rename to crates/storable_vec/LICENSE.md
diff --git a/storable_vec/README.md b/crates/storable_vec/README.md
similarity index 100%
rename from storable_vec/README.md
rename to crates/storable_vec/README.md
diff --git a/storable_vec/src/enums/error.rs b/crates/storable_vec/src/enums/error.rs
similarity index 100%
rename from storable_vec/src/enums/error.rs
rename to crates/storable_vec/src/enums/error.rs
diff --git a/storable_vec/src/enums/mod.rs b/crates/storable_vec/src/enums/mod.rs
similarity index 100%
rename from storable_vec/src/enums/mod.rs
rename to crates/storable_vec/src/enums/mod.rs
diff --git a/storable_vec/src/enums/value.rs b/crates/storable_vec/src/enums/value.rs
similarity index 100%
rename from storable_vec/src/enums/value.rs
rename to crates/storable_vec/src/enums/value.rs
diff --git a/storable_vec/src/lib.rs b/crates/storable_vec/src/lib.rs
similarity index 100%
rename from storable_vec/src/lib.rs
rename to crates/storable_vec/src/lib.rs
diff --git a/storable_vec/src/main.rs b/crates/storable_vec/src/main.rs
similarity index 100%
rename from storable_vec/src/main.rs
rename to crates/storable_vec/src/main.rs
diff --git a/storable_vec/src/structs/mod.rs b/crates/storable_vec/src/structs/mod.rs
similarity index 100%
rename from storable_vec/src/structs/mod.rs
rename to crates/storable_vec/src/structs/mod.rs
diff --git a/storable_vec/src/structs/unsafe_slice.rs b/crates/storable_vec/src/structs/unsafe_slice.rs
similarity index 100%
rename from storable_vec/src/structs/unsafe_slice.rs
rename to crates/storable_vec/src/structs/unsafe_slice.rs
diff --git a/storable_vec/src/structs/version.rs b/crates/storable_vec/src/structs/version.rs
similarity index 100%
rename from storable_vec/src/structs/version.rs
rename to crates/storable_vec/src/structs/version.rs
diff --git a/storable_vec/src/traits/any.rs b/crates/storable_vec/src/traits/any.rs
similarity index 100%
rename from storable_vec/src/traits/any.rs
rename to crates/storable_vec/src/traits/any.rs
diff --git a/storable_vec/src/traits/bytes.rs b/crates/storable_vec/src/traits/bytes.rs
similarity index 100%
rename from storable_vec/src/traits/bytes.rs
rename to crates/storable_vec/src/traits/bytes.rs
diff --git a/storable_vec/src/traits/mod.rs b/crates/storable_vec/src/traits/mod.rs
similarity index 100%
rename from storable_vec/src/traits/mod.rs
rename to crates/storable_vec/src/traits/mod.rs
diff --git a/storable_vec/src/traits/stored_index.rs b/crates/storable_vec/src/traits/stored_index.rs
similarity index 100%
rename from storable_vec/src/traits/stored_index.rs
rename to crates/storable_vec/src/traits/stored_index.rs
diff --git a/storable_vec/src/traits/stored_type.rs b/crates/storable_vec/src/traits/stored_type.rs
similarity index 100%
rename from storable_vec/src/traits/stored_type.rs
rename to crates/storable_vec/src/traits/stored_type.rs
diff --git a/snkrj/Cargo.lock b/snkrj/Cargo.lock
deleted file mode 100644
index 7939c3538..000000000
--- a/snkrj/Cargo.lock
+++ /dev/null
@@ -1,242 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 4
-
-[[package]]
-name = "autocfg"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
-
-[[package]]
-name = "bitflags"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-
-[[package]]
-name = "cfg-if"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-
-[[package]]
-name = "fs2"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213"
-dependencies = [
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "instant"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "libc"
-version = "0.2.168"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aaeb2981e0606ca11d79718f8bb01164f1d6ed75080182d3abf017e6d244b6d"
-
-[[package]]
-name = "lock_api"
-version = "0.4.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
-dependencies = [
- "autocfg",
- "scopeguard",
-]
-
-[[package]]
-name = "log"
-version = "0.4.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
-
-[[package]]
-name = "memmap2"
-version = "0.9.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "parking_lot"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
-dependencies = [
- "instant",
- "lock_api",
- "parking_lot_core",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.8.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc"
-dependencies = [
- "cfg-if",
- "instant",
- "libc",
- "redox_syscall",
- "smallvec",
- "winapi",
-]
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0"
-dependencies = [
- "unicode-ident",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.37"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
-dependencies = [
- "proc-macro2",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
-dependencies = [
- "bitflags",
-]
-
-[[package]]
-name = "sanakirja"
-version = "1.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81aaf70d064e2122209f04d01fd91e8908e7a327b516236e1cbc0c3f34ac6d11"
-dependencies = [
- "fs2",
- "log",
- "memmap2",
- "parking_lot",
- "sanakirja-core",
- "serde",
- "thiserror",
-]
-
-[[package]]
-name = "sanakirja-core"
-version = "1.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8376db34ae3eac6e7bd91168bc638450073b708ce9fb46940de676f552238bf5"
-
-[[package]]
-name = "scopeguard"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
-
-[[package]]
-name = "serde"
-version = "1.0.216"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b9781016e935a97e8beecf0c933758c97a5520d32930e460142b4cd80c6338e"
-dependencies = [
- "serde_derive",
-]
-
-[[package]]
-name = "serde_derive"
-version = "1.0.216"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46f859dbbf73865c6627ed570e78961cd3ac92407a2d117204c49232485da55e"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "smallvec"
-version = "1.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
-
-[[package]]
-name = "snkrj"
-version = "0.1.1"
-dependencies = [
- "sanakirja",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.90"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "thiserror"
-version = "1.0.69"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
-dependencies = [
- "thiserror-impl",
-]
-
-[[package]]
-name = "thiserror-impl"
-version = "1.0.69"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "unicode-ident"
-version = "1.0.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83"
-
-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
diff --git a/snkrj/Cargo.toml b/snkrj/Cargo.toml
deleted file mode 100644
index 49704555a..000000000
--- a/snkrj/Cargo.toml
+++ /dev/null
@@ -1,12 +0,0 @@
-[package]
-name = "snkrj"
-description = "A very simple wrapper around Sanakirja"
-version = "0.1.1"
-license = "MIT"
-repository = "https://github.com/kibo-money/kibo/tree/main/src/crates/snkrj"
-keywords = ["database", "sanakirja", "btreemap"]
-categories = ["database"]
-edition = "2021"
-
-[dependencies]
-sanakirja = "1.4.3"
diff --git a/snkrj/LICENSE.md b/snkrj/LICENSE.md
deleted file mode 100644
index aac235dcb..000000000
--- a/snkrj/LICENSE.md
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2024 snkrj
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/snkrj/README.md b/snkrj/README.md
deleted file mode 100644
index 1803d180c..000000000
--- a/snkrj/README.md
+++ /dev/null
@@ -1,37 +0,0 @@
-# snkrj
-
-A simple wrapper around Sanakirja aatabase that acts as a very fast on disk BTreeMap.
-
-## Example
-
-```rust
-use snkrj::{AnyDatabase, Database};
-
-fn main() {
-    let path = std::env::temp_dir().join("./db");
-
-    let database: Database<i32, i32> = Database::open(path.clone()).unwrap();
-    let _ = database.destroy();
-
-    let mut database: Database<i32, i32> = Database::open(path.clone()).unwrap();
-    database.insert(64, 128);
-    database.export(false).unwrap();
-
-    let mut database: Database<i32, i32> = Database::open(path).unwrap();
-    database.insert(1, 2);
-    database.insert(128, 256);
-    println!("iter_ram:");
-    database.iter_ram().for_each(|pair| {
-        println!("{:?}", pair);
-    });
-    println!("iter_disk:");
-    database.iter_disk().for_each(|pair| {
-        println!("{:?}", pair.unwrap());
-    });
-    println!("iter_ram_then_disk:");
-    database.iter_ram_then_disk().for_each(|pair| {
-        println!("{:?}", pair);
-    });
-    database.export(false).unwrap();
-}
-```
diff --git a/snkrj/src/base.rs b/snkrj/src/base.rs
deleted file mode 100644
index 113ffe77a..000000000
--- a/snkrj/src/base.rs
+++ /dev/null
@@ -1,174 +0,0 @@
-// https://docs.rs/sanakirja/latest/sanakirja/index.html
-// https://pijul.org/posts/2021-02-06-rethinking-sanakirja/
-
-use std::{
-    collections::BTreeMap,
-    fs::{self, File},
-    io,
-    path::{Component, Path, PathBuf},
-    result::Result,
-};
-
-use sanakirja::btree::{page, Db_};
-pub use sanakirja::*;
-
-use crate::{DatabaseKey, DatabaseValue};
-
-pub type UnitDatabase = Base<(), ()>;
-
-///
-/// A simple wrapper around Sanakirja aatabase that acts as a very fast on disk BTreeMap.
-///
-/// The state of the tree is uncommited until `.export()` is called during which it is unsafe to stop the program.
-///
-pub struct Base<Key, Value>
-where
-    Key: DatabaseKey,
-    Value: DatabaseValue,
-{
-    pathbuf: PathBuf,
-    db: Db_<Key, Value, page::Page<Key, Value>>,
-    txn: MutTxn<Env, ()>,
-}
-
-const ROOT_DB: usize = 0;
-const PAGE_SIZE: u64 = 4096;
-
-const DEFRAGMENT_RATIO_THRESHOLD: f64 = 0.5;
-
-impl<Key, Value> Base<Key, Value>
-where
-    Key: DatabaseKey,
-    Value: DatabaseValue,
-{
-    const KEY_SIZE: usize = size_of::<Key>();
-    const VALUE_SIZE: usize = size_of::<Value>();
-    const KEY_AND_VALUE_SIZE: usize = Self::KEY_SIZE + Self::VALUE_SIZE;
-
-    /// Open a database without a lock file where only one instance is safe to open.
-    pub fn open(pathbuf: PathBuf) -> Result<Self, Error> {
-        fs::create_dir_all(&pathbuf)?;
-
-        let env = unsafe { Env::new_nolock(Self::path_sanakirja_(&pathbuf), PAGE_SIZE, 1)? };
-
-        let mut txn = Env::mut_txn_begin(env)?;
-
-        let db = txn
-            .root_db(ROOT_DB)
-            .unwrap_or_else(|| unsafe { btree::create_db_(&mut txn).unwrap() });
-
-        Ok(Self { pathbuf, db, txn })
-    }
-
-    pub fn path_sanakirja(&self) -> PathBuf {
-        Self::path_sanakirja_(&self.pathbuf)
-    }
-    fn path_sanakirja_(path: &Path) -> PathBuf {
-        path.join("sanakirja")
-    }
-
-    pub fn path_self_defragmented(&self) -> PathBuf {
-        let defragmented_path_opt: Option<Component> = self.pathbuf.components().last();
-        let folder = match defragmented_path_opt {
-            Some(Component::Normal(f)) => f.to_str().unwrap(),
-            _ => unreachable!(),
-        };
-        let mut original_path = self.pathbuf.clone();
-        original_path.pop();
-        original_path.join(format!("{folder}-defragmented"))
-    }
-
-    pub fn read_length(&self) -> usize {
-        Self::read_length_(&self.pathbuf)
-    }
-    pub fn read_length_(path: &Path) -> usize {
-        fs::read(Self::path_length(path))
-            .map(|v| {
-                let mut buf = [0_u8; 8];
-                v.iter().enumerate().take(8).for_each(|(i, b)| {
-                    buf[i] = *b;
-                });
-                usize::from_le_bytes(buf)
-            })
-            .unwrap_or_default()
-    }
-    pub fn write_length(&self, len: usize) -> Result<(), io::Error> {
-        Self::write_length_(&self.pathbuf, len)
-    }
-    pub fn write_length_(path: &Path, len: usize) -> Result<(), io::Error> {
-        fs::write(Self::path_length(path), len.to_le_bytes())
-    }
-    fn path_length(path: &Path) -> PathBuf {
-        path.join("length")
-    }
-
-    #[inline]
-    pub fn get(&self, key: &Key) -> Result<Option<&Value>, Error> {
-        let option = btree::get(&self.txn, &self.db, key, None)?;
-        if let Some((key_found, v)) = option {
-            if key == key_found {
-                return Ok(Some(v));
-            }
-        }
-        Ok(None)
-    }
-
-    /// Iterate over key/value pairs from the database (disk)
-    #[inline]
-    #[allow(clippy::type_complexity)]
-    pub fn iter(
-        &self,
-    ) -> Result<btree::Iter<'_, MutTxn<Env, ()>, Key, Value, page::Page<Key, Value>>, Error> {
-        btree::iter(&self.txn, &self.db, None)
-    }
-
-    pub fn put(&mut self, key: &Key, value: &Value) -> Result<bool, Error> {
-        btree::put(&mut self.txn, &mut self.db, key, value)
-    }
-
-    pub fn del(&mut self, key: &Key, value: Option<&Value>) -> Result<bool, Error> {
-        btree::del(&mut self.txn, &mut self.db, key, value)
-    }
-
-    fn get_file_size_to_data_size_ratio(&self, len: usize) -> Result<f64, Error> {
-        let data_bytes = (len * Self::KEY_AND_VALUE_SIZE) as f64;
-        let file_bytes = File::open(&self.pathbuf)?.metadata()?.len() as f64;
-        Ok(file_bytes / data_bytes)
-    }
-
-    pub fn should_defragment(&self, len: usize) -> Result<bool, Error> {
-        Ok(self.get_file_size_to_data_size_ratio(len)? >= DEFRAGMENT_RATIO_THRESHOLD)
-    }
-
-    pub fn iter_collect(&self) -> Result<BTreeMap<&Key, &Value>, Error> {
-        self.iter()?.collect::<_>()
-    }
-
-    pub fn iter_collect_multi(&self) -> Result<BTreeMap<&Key, Vec<&Value>>, Error> {
-        let mut tree: BTreeMap<_, Vec<_>> = BTreeMap::new();
-        self.iter()?.try_for_each(|res| -> Result<(), Error> {
-            let (key, value): (&Key, &Value) = res?;
-            tree.entry(key).or_default().push(value);
-            Ok(())
-        })?;
-        Ok(tree)
-    }
-
-    pub fn commit(mut self, len: usize) -> Result<(), Error> {
-        // dbg!(&self.pathbuf, len);
-        // panic!();
-        self.write_length(len)?;
-        self.txn.set_root(ROOT_DB, self.db.db.into());
-        self.txn.commit()
-    }
-
-    pub fn destroy(self) -> io::Result<()> {
-        let path = self.pathbuf.to_owned();
-        drop(self);
-        fs::remove_dir_all(&path)
-    }
-
-    pub fn path(&self) -> &Path {
-        &self.pathbuf
-    }
-}
diff --git a/snkrj/src/lib.rs b/snkrj/src/lib.rs
deleted file mode 100644
index 241bfd3b7..000000000
--- a/snkrj/src/lib.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-// https://docs.rs/sanakirja/latest/sanakirja/index.html
-// https://pijul.org/posts/2021-02-06-rethinking-sanakirja/
-
-pub use sanakirja::*;
-
-mod base;
-mod multi;
-mod traits;
-mod unique;
-
-pub use base::*;
-pub use multi::*;
-pub use traits::*;
-pub use unique::*;
diff --git a/snkrj/src/main.rs b/snkrj/src/main.rs
deleted file mode 100644
index 055d45f79..000000000
--- a/snkrj/src/main.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-use snkrj::DatabaseUnique;
-
-fn main() {
-    let path = std::env::temp_dir().join("./db");
-
-    // let database: DatabaseUnique<i32, i32> = DatabaseUnique::open(path.clone()).unwrap();
-    // let _ = database.destroy();
-
-    let mut database: DatabaseUnique<i32, i32> = DatabaseUnique::open(path.clone()).unwrap();
-    database.insert(64, 128);
-    database.export().unwrap();
-
-    let mut database: DatabaseUnique<i32, i32> = DatabaseUnique::open(path).unwrap();
-    database.insert(1, 2);
-    database.insert(128, 256);
-    println!("iter_ram:");
-    database.iter_ram().for_each(|pair| {
-        println!("{:?}", pair);
-    });
-    println!("iter_disk:");
-    database.iter_disk().unwrap().for_each(|pair| {
-        println!("{:?}", pair.unwrap());
-    });
-    println!("iter_ram_then_disk:");
-    database.iter_ram_then_disk().unwrap().for_each(|pair| {
-        println!("{:?}", pair);
-    });
-    database.export().unwrap();
-}
diff --git a/snkrj/src/multi.rs b/snkrj/src/multi.rs
deleted file mode 100644
index 24f8cbebe..000000000
--- a/snkrj/src/multi.rs
+++ /dev/null
@@ -1,240 +0,0 @@
-// https://docs.rs/sanakirja/latest/sanakirja/index.html
-// https://pijul.org/posts/2021-02-06-rethinking-sanakirja/
-
-use core::panic;
-use std::{
-    collections::{BTreeMap, BTreeSet},
-    fs, mem,
-    path::PathBuf,
-    result::Result,
-};
-
-use sanakirja::btree::page;
-pub use sanakirja::*;
-
-use crate::{AnyDatabase, Base, DatabaseKey, DatabaseValue};
-
-///
-/// A simple wrapper around Sanakirja aatabase that acts as a very fast on disk BTreeMap.
-///
-/// The state of the tree is uncommited until `.export()` is called during which it is unsafe to stop the program.
-///
-pub struct DatabaseMulti<Key, Value>
-where
-    Key: DatabaseKey,
-    Value: DatabaseValue,
-{
-    puts: BTreeMap<Key, Vec<Value>>,
-    dels: BTreeSet<Key>,
-    len: usize,
-    db: Base<Key, Value>,
-}
-
-impl<Key, Value> DatabaseMulti<Key, Value>
-where
-    Key: DatabaseKey,
-    Value: DatabaseValue,
-{
-    /// Open a database without a lock file where only one instance is safe to open.
-    pub fn open(pathbuf: PathBuf) -> Result<Self, Error> {
-        let db = Base::open(pathbuf)?;
-        Ok(Self {
-            len: db.read_length(),
-            puts: BTreeMap::default(),
-            dels: BTreeSet::default(),
-            db,
-        })
-    }
-
-    #[inline]
-    pub fn get(&self, key: &Key) -> Result<Option<&Value>, Error> {
-        if let Some(cached_put) = self.get_uncommited(key) {
-            return Ok(Some(cached_put));
-        }
-
-        self.db.get(key)
-    }
-
-    /// Get only from the uncommited tree (ram) without checking the database (disk)
-    #[inline]
-    pub fn get_uncommited(&self, key: &Key) -> Option<&Value> {
-        self.puts.get(key).and_then(|v| v.first())
-    }
-
-    /// Get mut only from the uncommited tree (ram) without checking the database (disk)
-    #[inline]
-    pub fn get_mut_uncommited(&mut self, key: &Key) -> Option<&mut Value> {
-        self.puts.get_mut(key).and_then(|v| v.first_mut())
-    }
-
-    #[inline]
-    pub fn insert(&mut self, key: Key, value: Value) -> Option<Value> {
-        self.dels.remove(&key);
-        self.unchecked_insert(key, value)
-    }
-
-    /// Insert without removing the key to the dels tree, so be sure that it hasn't added to the delete set
-    #[inline]
-    pub fn unchecked_insert(&mut self, key: Key, value: Value) -> Option<Value> {
-        self.len += 1;
-        self.puts.entry(key).or_default().push(value);
-        None
-    }
-
-    #[inline]
-    pub fn update(&mut self, key: Key, value: Value) -> Option<Value> {
-        todo!()
-        // self.dels.insert(key.clone());
-        // self.puts.insert(key, value)
-    }
-
-    #[inline]
-    pub fn remove(&mut self, key: &Key) -> Option<Value> {
-        todo!()
-        // self.len -= 1;
-        // self.puts.remove(key).or_else(|| {
-        //     self.dels.insert(key.clone());
-        //     None
-        // })
-    }
-
-    /// Remove only from the uncommited tree (ram) without checking the database (disk)
-    #[inline]
-    pub fn remove_from_uncommited(&mut self, key: &Key) -> Option<Value> {
-        todo!()
-        // self.len -= 1;
-        // self.puts.remove(key)
-    }
-
-    /// Add the key only to the dels tree without checking if it's present in the puts tree, only use if you are positive that you neither added nor updated an entry with this key
-    #[inline]
-    pub fn remove_later_from_disk(&mut self, key: &Key) {
-        todo!()
-        // self.len -= 1;
-        // self.dels.insert(key.clone());
-    }
-
-    /// Iterate over key/value pairs from the uncommited tree (ram)
-    #[inline]
-    pub fn iter_ram(&self) -> std::collections::btree_map::Iter<'_, Key, Vec<Value>> {
-        self.puts.iter()
-    }
-
-    /// Iterate over key/value pairs from the database (disk)
-    #[inline]
-    #[allow(clippy::type_complexity)]
-    pub fn iter_disk(
-        &self,
-    ) -> Result<btree::Iter<'_, MutTxn<Env, ()>, Key, Value, page::Page<Key, Value>>, Error> {
-        self.db.iter()
-    }
-
-    /// Iterate over key/value pairs
-    // #[inline]
-    // pub fn iter_ram_then_disk(&self) -> Result<impl Iterator<Item = (&Key, &Value)>, Error> {
-    //     todo!();
-    //     // Ok(self.iter_ram().chain(self.iter_disk()?.map(|r| r.unwrap())))
-    // }
-
-    /// Collect a **clone** of all uncommited key/value pairs (ram)
-    pub fn collect_ram(&self) -> BTreeMap<Key, Value> {
-        todo!()
-        // self.puts.clone()
-    }
-
-    #[inline]
-    pub fn len(&self) -> usize {
-        self.len
-    }
-
-    #[inline]
-    pub fn is_empty(&self) -> bool {
-        self.len == 0
-    }
-
-    /// Flush all puts and dels from the ram to disk with an option to defragment the database to save some disk space
-    ///
-    /// /!\ Do not kill the program while this function is runnning  /!\
-    pub fn export(mut self) -> Result<(), Error> {
-        if self.dels.is_empty() && self.puts.is_empty() {
-            return Ok(());
-        }
-
-        if self.db.should_defragment(self.len)? {
-            let mut btree = self.db.iter_collect_multi()?;
-            // TODO:
-            // self.dels.iter().for_each(|key| {
-            //     btree.remove(key);
-            // });
-            self.puts.iter().for_each(|(key, values)| {
-                // btree.insert(key, value);
-                let vec = btree.entry(key).or_default();
-                vec.extend(values.iter());
-            });
-
-            let path_self_original = self.db.path().to_owned();
-            let path_self_defragmented = self.db.path_self_defragmented();
-
-            let len = btree.values().map(|v| v.len()).sum::<usize>();
-
-            if len != self.len {
-                dbg!(len, self.len, path_self_defragmented);
-                panic!("Len should be the same");
-            }
-
-            {
-                let mut defragmented = Self::open(path_self_defragmented.clone()).unwrap();
-
-                btree
-                    .into_iter()
-                    .try_for_each(|(key, values)| -> Result<(), Error> {
-                        values
-                            .into_iter()
-                            .try_for_each(|value| -> Result<(), Error> {
-                                defragmented.db.put(key, value)?;
-                                Ok(())
-                            })?;
-                        Ok(())
-                    })?;
-
-                defragmented.len = len;
-                defragmented.db.commit(self.len)?;
-            }
-
-            drop(self);
-
-            fs::remove_dir_all(&path_self_original)?;
-            fs::rename(&path_self_defragmented, &path_self_original)?;
-
-            Ok(())
-        } else {
-            mem::take(&mut self.dels)
-                .into_iter()
-                .try_for_each(|key| -> Result<(), Error> {
-                    self.db.del(&key, None)?;
-                    Ok(())
-                })?;
-
-            mem::take(&mut self.puts).into_iter().try_for_each(
-                |(key, vec): (Key, Vec<Value>)| -> Result<(), Error> {
-                    vec.into_iter().try_for_each(|value| -> Result<(), Error> {
-                        self.db.put(&key, &value)?;
-                        Ok(())
-                    })
-                },
-            )?;
-
-            self.db.commit(self.len)
-        }
-    }
-}
-
-impl<Key, Value> AnyDatabase for DatabaseMulti<Key, Value>
-where
-    Key: DatabaseKey,
-    Value: DatabaseValue,
-{
-    fn export(self) -> Result<(), Error> {
-        self.export()
-    }
-}
diff --git a/snkrj/src/traits.rs b/snkrj/src/traits.rs
deleted file mode 100644
index 758b70472..000000000
--- a/snkrj/src/traits.rs
+++ /dev/null
@@ -1,59 +0,0 @@
-use std::fmt::Debug;
-
-use sanakirja::Storable;
-
-pub trait AnyDatabase {
-    fn export(self) -> Result<(), sanakirja::Error>;
-    // fn destroy(self) -> io::Result<()>;
-}
-
-pub trait DatabaseKey
-where
-    Self: Ord + Clone + Debug + Storable + Send + Sync,
-{
-    const SIZE: usize = size_of::<Self>();
-    const SIZE_SMALLER_THAN_TWO: bool = Self::SIZE < 2;
-
-    fn as_ne_byte(&self) -> u8 {
-        let data: *const Self = self;
-        let data: *const u8 = data as *const u8;
-        let slice = unsafe { std::slice::from_raw_parts(data, Self::SIZE) };
-
-        *(if cfg!(target_endian = "big") {
-            slice.last()
-        } else {
-            slice.first()
-        })
-        .unwrap()
-    }
-
-    fn as_ne_six_bits(&self) -> u8 {
-        self.as_ne_byte() >> 2
-    }
-
-    fn as_ne_two_bytes(&self) -> [u8; 2] {
-        let data: *const Self = self;
-        let data: *const u8 = data as *const u8;
-        let slice = unsafe { std::slice::from_raw_parts(data, Self::SIZE) };
-
-        if Self::SIZE_SMALLER_THAN_TWO {
-            panic!("Doesn't make sense")
-        }
-
-        if cfg!(target_endian = "big") {
-            let mut iter = slice.iter().rev();
-            [*iter.next().unwrap(), *iter.next().unwrap()]
-        } else {
-            let mut iter = slice.iter();
-            [*iter.next().unwrap(), *iter.next().unwrap()]
-        }
-    }
-}
-impl<T> DatabaseKey for T where T: Ord + Clone + Debug + Storable + Send + Sync {}
-
-pub trait DatabaseValue
-where
-    Self: Clone + Storable + PartialEq + Send + Sync,
-{
-}
-impl<T> DatabaseValue for T where T: Clone + Storable + PartialEq + Send + Sync {}
diff --git a/snkrj/src/unique.rs b/snkrj/src/unique.rs
deleted file mode 100644
index f5dc6582e..000000000
--- a/snkrj/src/unique.rs
+++ /dev/null
@@ -1,223 +0,0 @@
-// https://docs.rs/sanakirja/latest/sanakirja/index.html
-// https://pijul.org/posts/2021-02-06-rethinking-sanakirja/
-
-use core::panic;
-use std::{
-    collections::{BTreeMap, BTreeSet},
-    fs, mem,
-    path::PathBuf,
-    result::Result,
-};
-
-use sanakirja::btree::page;
-pub use sanakirja::*;
-
-use crate::{AnyDatabase, Base, DatabaseKey, DatabaseValue};
-
-///
-/// A simple wrapper around Sanakirja aatabase that acts as a very fast on disk BTreeMap.
-///
-/// The state of the tree is uncommited until `.export()` is called during which it is unsafe to stop the program.
-///
-pub struct DatabaseUnique<Key, Value>
-where
-    Key: DatabaseKey,
-    Value: DatabaseValue,
-{
-    puts: BTreeMap<Key, Value>,
-    dels: BTreeSet<Key>,
-    len: usize,
-    db: Base<Key, Value>,
-}
-
-impl<Key, Value> DatabaseUnique<Key, Value>
-where
-    Key: DatabaseKey,
-    Value: DatabaseValue,
-{
-    /// Open a database without a lock file where only one instance is safe to open.
-    pub fn open(pathbuf: PathBuf) -> Result<Self, Error> {
-        let db = Base::open(pathbuf)?;
-        Ok(Self {
-            len: db.read_length(),
-            puts: BTreeMap::default(),
-            dels: BTreeSet::default(),
-            db,
-        })
-    }
-
-    #[inline]
-    pub fn get(&self, key: &Key) -> Result<Option<&Value>, Error> {
-        if let Some(cached_put) = self.get_uncommited(key) {
-            return Ok(Some(cached_put));
-        }
-
-        self.db.get(key)
-    }
-
-    /// Get only from the uncommited tree (ram) without checking the database (disk)
-    #[inline]
-    pub fn get_uncommited(&self, key: &Key) -> Option<&Value> {
-        self.puts.get(key)
-    }
-
-    /// Get mut only from the uncommited tree (ram) without checking the database (disk)
-    #[inline]
-    pub fn get_mut_uncommited(&mut self, key: &Key) -> Option<&mut Value> {
-        self.puts.get_mut(key)
-    }
-
-    #[inline]
-    pub fn insert(&mut self, key: Key, value: Value) -> Option<Value> {
-        self.dels.remove(&key);
-        self.unchecked_insert(key, value)
-    }
-
-    /// Insert without removing the key to the dels tree, so be sure that it hasn't added to the delete set
-    #[inline]
-    pub fn unchecked_insert(&mut self, key: Key, value: Value) -> Option<Value> {
-        self.len += 1;
-        self.puts.insert(key, value)
-    }
-
-    #[inline]
-    pub fn update(&mut self, key: Key, value: Value) -> Option<Value> {
-        self.dels.insert(key.clone());
-        self.puts.insert(key, value)
-    }
-
-    #[inline]
-    pub fn remove(&mut self, key: &Key) -> Option<Value> {
-        self.len -= 1;
-        self.puts.remove(key).or_else(|| {
-            self.dels.insert(key.clone());
-            None
-        })
-    }
-
-    /// Remove only from the uncommited tree (ram) without checking the database (disk)
-    #[inline]
-    pub fn remove_from_uncommited(&mut self, key: &Key) -> Option<Value> {
-        self.len -= 1;
-        self.puts.remove(key)
-    }
-
-    /// Add the key only to the dels tree without checking if it's present in the puts tree, only use if you are positive that you neither added nor updated an entry with this key
-    #[inline]
-    pub fn remove_later_from_disk(&mut self, key: &Key) {
-        self.len -= 1;
-        self.dels.insert(key.clone());
-    }
-
-    /// Iterate over key/value pairs from the uncommited tree (ram)
-    #[inline]
-    pub fn iter_ram(&self) -> std::collections::btree_map::Iter<'_, Key, Value> {
-        self.puts.iter()
-    }
-
-    /// Iterate over key/value pairs from the database (disk)
-    #[inline]
-    #[allow(clippy::type_complexity)]
-    pub fn iter_disk(
-        &self,
-    ) -> Result<btree::Iter<'_, MutTxn<Env, ()>, Key, Value, page::Page<Key, Value>>, Error> {
-        self.db.iter()
-    }
-
-    /// Iterate over key/value pairs
-    #[inline]
-    pub fn iter_ram_then_disk(&self) -> Result<impl Iterator<Item = (&Key, &Value)>, Error> {
-        Ok(self.iter_ram().chain(self.iter_disk()?.map(|r| r.unwrap())))
-    }
-
-    /// Collect a **clone** of all uncommited key/value pairs (ram)
-    pub fn collect_ram(&self) -> BTreeMap<Key, Value> {
-        self.puts.clone()
-    }
-
-    #[inline]
-    pub fn len(&self) -> usize {
-        self.len
-    }
-
-    #[inline]
-    pub fn is_empty(&self) -> bool {
-        self.len == 0
-    }
-
-    /// Flush all puts and dels from the ram to disk with an option to defragment the database to save some disk space
-    ///
-    /// /!\ Do not kill the program while this function is runnning  /!\
-    pub fn export(mut self) -> Result<(), Error> {
-        if self.dels.is_empty() && self.puts.is_empty() {
-            return Ok(());
-        }
-
-        if self.db.should_defragment(self.len)? {
-            let mut btree = self.db.iter_collect()?;
-            self.dels.iter().for_each(|key| {
-                btree.remove(key);
-            });
-            self.puts.iter().for_each(|(key, value)| {
-                btree.insert(key, value);
-            });
-
-            let path_self_original = self.db.path().to_owned();
-            let path_self_defragmented = self.db.path_self_defragmented();
-
-            let len = btree.len();
-
-            if len != self.len {
-                dbg!(len, self.len, path_self_defragmented);
-                panic!("Len should be the same");
-            }
-
-            {
-                let mut defragmented = Self::open(path_self_defragmented.clone()).unwrap();
-
-                btree
-                    .into_iter()
-                    .try_for_each(|(key, value)| -> Result<(), Error> {
-                        defragmented.db.put(key, value)?;
-                        Ok(())
-                    })?;
-
-                defragmented.len = len;
-                defragmented.db.commit(self.len)?;
-            }
-
-            drop(self);
-
-            fs::remove_dir_all(&path_self_original)?;
-            fs::rename(&path_self_defragmented, &path_self_original)?;
-
-            Ok(())
-        } else {
-            mem::take(&mut self.dels)
-                .into_iter()
-                .try_for_each(|key| -> Result<(), Error> {
-                    self.db.del(&key, None)?;
-                    Ok(())
-                })?;
-
-            mem::take(&mut self.puts).into_iter().try_for_each(
-                |(key, value)| -> Result<(), Error> {
-                    self.db.put(&key, &value)?;
-                    Ok(())
-                },
-            )?;
-
-            self.db.commit(self.len)
-        }
-    }
-}
-
-impl<Key, Value> AnyDatabase for DatabaseUnique<Key, Value>
-where
-    Key: DatabaseKey,
-    Value: DatabaseValue,
-{
-    fn export(self) -> Result<(), Error> {
-        self.export()
-    }
-}

From 8acbcc548cfd8d92f07793b8e8f2cedf8dbb2fab Mon Sep 17 00:00:00 2001
From: nym21 <expat-epochs0i@icloud.com>
Date: Sun, 23 Feb 2025 21:53:39 +0100
Subject: [PATCH 61/63] parser: fixed hanging + global: snapshot

---
 Cargo.lock                                    |  56 +--
 Cargo.toml                                    |   3 +-
 crates/brk/Cargo.toml                         |   7 +
 crates/brk/src/main.rs                        |   3 +
 crates/brk_cli/Cargo.toml                     |   2 +-
 crates/brk_computer/Cargo.toml                |   2 +-
 crates/brk_fetcher/Cargo.toml                 |   4 +-
 crates/brk_fetcher/src/main.rs                |   2 +-
 crates/brk_indexer/Cargo.toml                 |   4 +-
 crates/brk_indexer/src/lib.rs                 |  44 ++-
 crates/brk_indexer/src/main.rs                |   6 +-
 .../brk_indexer/src/storage/fjalls/version.rs |  51 ---
 crates/brk_indexer/src/storage/mod.rs         |   4 -
 crates/{brk_printer => brk_logger}/Cargo.toml |   4 +-
 crates/{brk_printer => brk_logger}/src/lib.rs |   4 +-
 .../{brk_printer => brk_logger}/src/main.rs   |   2 +-
 crates/brk_parser/Cargo.toml                  |   2 +-
 .../brk_parser/src/blk_index_to_blk_recap.rs  |  10 +-
 .../brk_parser/src/blk_metadata_and_block.rs  |  15 -
 crates/brk_parser/src/blk_recap.rs            |   5 +-
 crates/brk_parser/src/block_state.rs          |  25 ++
 crates/brk_parser/src/height.rs               |   9 +-
 crates/brk_parser/src/lib.rs                  | 370 +++++++++---------
 crates/brk_parser/src/main.rs                 |  13 +-
 crates/brk_parser/src/xor.rs                  |  40 --
 crates/brk_parser/src/xor_bytes.rs            |  19 +
 crates/brk_parser/src/xor_index.rs            |  39 ++
 crates/brk_server/Cargo.toml                  |   4 +-
 crates/brk_server/src/lib.rs                  |   2 +-
 crates/brk_server/src/main.rs                 |   4 +-
 30 files changed, 372 insertions(+), 383 deletions(-)
 create mode 100644 crates/brk/Cargo.toml
 create mode 100644 crates/brk/src/main.rs
 delete mode 100644 crates/brk_indexer/src/storage/fjalls/version.rs
 rename crates/{brk_printer => brk_logger}/Cargo.toml (81%)
 rename crates/{brk_printer => brk_logger}/src/lib.rs (96%)
 rename crates/{brk_printer => brk_logger}/src/main.rs (59%)
 delete mode 100644 crates/brk_parser/src/blk_metadata_and_block.rs
 create mode 100644 crates/brk_parser/src/block_state.rs
 delete mode 100644 crates/brk_parser/src/xor.rs
 create mode 100644 crates/brk_parser/src/xor_bytes.rs
 create mode 100644 crates/brk_parser/src/xor_index.rs

diff --git a/Cargo.lock b/Cargo.lock
index d764e42e5..536fa3394 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -322,13 +322,17 @@ version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36"
 
+[[package]]
+name = "brk"
+version = "0.0.0"
+
 [[package]]
 name = "brk_cli"
-version = "0.1.0"
+version = "0.0.0"
 
 [[package]]
 name = "brk_computer"
-version = "0.1.0"
+version = "0.0.0"
 dependencies = [
  "brk_fetcher",
  "brk_indexer",
@@ -343,10 +347,10 @@ dependencies = [
 
 [[package]]
 name = "brk_fetcher"
-version = "0.1.0"
+version = "0.0.0"
 dependencies = [
  "brk_indexer",
- "brk_printer",
+ "brk_logger",
  "color-eyre",
  "derive_deref",
  "jiff",
@@ -360,11 +364,11 @@ dependencies = [
 
 [[package]]
 name = "brk_indexer"
-version = "0.1.0"
+version = "0.0.0"
 dependencies = [
  "bitcoin",
+ "brk_logger",
  "brk_parser",
- "brk_printer",
  "color-eyre",
  "derive_deref",
  "fjall",
@@ -380,9 +384,19 @@ dependencies = [
  "zerocopy 0.8.20",
 ]
 
+[[package]]
+name = "brk_logger"
+version = "0.0.0"
+dependencies = [
+ "color-eyre",
+ "env_logger",
+ "jiff",
+ "log",
+]
+
 [[package]]
 name = "brk_parser"
-version = "0.2.3"
+version = "0.0.0"
 dependencies = [
  "bitcoin",
  "bitcoincore-rpc",
@@ -395,24 +409,14 @@ dependencies = [
  "zerocopy 0.8.20",
 ]
 
-[[package]]
-name = "brk_printer"
-version = "0.1.0"
-dependencies = [
- "color-eyre",
- "env_logger",
- "jiff",
- "log",
-]
-
 [[package]]
 name = "brk_server"
-version = "0.1.0"
+version = "0.0.0"
 dependencies = [
  "axum",
  "brk_computer",
  "brk_indexer",
- "brk_printer",
+ "brk_logger",
  "color-eyre",
  "derive_deref",
  "jiff",
@@ -1104,9 +1108,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "libc"
-version = "0.2.169"
+version = "0.2.170"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
+checksum = "875b3680cb2f8f71bdcf9a30f38d48282f5d3c95cbf9b3fa57269bb5d5c06828"
 
 [[package]]
 name = "linux-raw-sys"
@@ -1306,9 +1310,9 @@ checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f"
 
 [[package]]
 name = "owo-colors"
-version = "4.1.0"
+version = "4.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb37767f6569cd834a413442455e0f066d0d522de8630436e2a1761d9726ba56"
+checksum = "1036865bb9422d3300cf723f657c2851d0e9ab12567854b1f4eba3d77decf564"
 
 [[package]]
 name = "oxc"
@@ -1335,7 +1339,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e03e63fd113c068b82d07c9c614b0b146c08a3ac0a4dface3ea1d1a9d14d549e"
 dependencies = [
  "cfg-if",
- "owo-colors 4.1.0",
+ "owo-colors 4.2.0",
  "oxc-miette-derive",
  "textwrap",
  "thiserror",
@@ -1909,9 +1913,9 @@ checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
 [[package]]
 name = "ring"
-version = "0.17.10"
+version = "0.17.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d34b5020fcdea098ef7d95e9f89ec15952123a4a039badd09fabebe9e963e839"
+checksum = "da5349ae27d3887ca812fb375b45a4fbb36d8d12d2df394968cd86e35683fe73"
 dependencies = [
  "cc",
  "cfg-if",
diff --git a/Cargo.toml b/Cargo.toml
index eff4598be..bb50967a5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,6 +3,7 @@ members = ["crates/*"]
 resolver = "2"
 package.license = "MIT"
 package.edition = "2024"
+package.version = "0.0.0"
 
 [workspace.dependencies]
 bitcoin = { version = "0.32.5", features = ["serde"] }
@@ -10,7 +11,7 @@ brk_computer = { version = "0", path = "crates/brk_computer" }
 brk_fetcher = { version = "0", path = "crates/brk_fetcher" }
 brk_indexer = { version = "0", path = "crates/brk_indexer" }
 brk_parser = { version = "0", path = "crates/brk_parser", features = ["bytes"] }
-brk_printer = { version = "0", path = "crates/brk_printer" }
+brk_logger = { version = "0", path = "crates/brk_logger" }
 brk_server = { version = "0", path = "crates/brk_server" }
 color-eyre = "0.6.3"
 derive_deref = "1.1.1"
diff --git a/crates/brk/Cargo.toml b/crates/brk/Cargo.toml
new file mode 100644
index 000000000..fbcc31153
--- /dev/null
+++ b/crates/brk/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "brk"
+license.workspace = true
+edition.workspace = true
+version.workspace = true
+
+[dependencies]
diff --git a/crates/brk/src/main.rs b/crates/brk/src/main.rs
new file mode 100644
index 000000000..e7a11a969
--- /dev/null
+++ b/crates/brk/src/main.rs
@@ -0,0 +1,3 @@
+fn main() {
+    println!("Hello, world!");
+}
diff --git a/crates/brk_cli/Cargo.toml b/crates/brk_cli/Cargo.toml
index 4e38c18b1..640de0db8 100644
--- a/crates/brk_cli/Cargo.toml
+++ b/crates/brk_cli/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "brk_cli"
 description = "A command line interface to run berver"
-version = "0.1.0"
+version = { workspace = true }
 edition = { workspace = true }
 license = { workspace = true }
 
diff --git a/crates/brk_computer/Cargo.toml b/crates/brk_computer/Cargo.toml
index 760fe6fbf..733032898 100644
--- a/crates/brk_computer/Cargo.toml
+++ b/crates/brk_computer/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "brk_computer"
 description = "A Bitcoin dataset computer built on top of brk_indexer and brk_fetcher"
-version = "0.1.0"
+version = { workspace = true }
 edition = { workspace = true }
 license = { workspace = true }
 
diff --git a/crates/brk_fetcher/Cargo.toml b/crates/brk_fetcher/Cargo.toml
index 33a9595e8..b060434f5 100644
--- a/crates/brk_fetcher/Cargo.toml
+++ b/crates/brk_fetcher/Cargo.toml
@@ -1,13 +1,13 @@
 [package]
 name = "brk_fetcher"
 description = "A bitcoin price fetcher built on top of brk_indexer"
-version = "0.1.0"
+version = { workspace = true }
 edition = { workspace = true }
 license = { workspace = true }
 
 [dependencies]
 brk_indexer = { workspace = true }
-brk_printer = { workspace = true }
+brk_logger = { workspace = true }
 color-eyre = { workspace = true }
 derive_deref = { workspace = true }
 jiff = { workspace = true }
diff --git a/crates/brk_fetcher/src/main.rs b/crates/brk_fetcher/src/main.rs
index 2c057cdae..fd589f72a 100644
--- a/crates/brk_fetcher/src/main.rs
+++ b/crates/brk_fetcher/src/main.rs
@@ -5,7 +5,7 @@ use serde_json::Value;
 fn main() -> color_eyre::Result<()> {
     color_eyre::install()?;
 
-    brk_printer::init_log(None);
+    brk_logger::init(None);
 
     dbg!(Binance::fetch_1d()?);
     // dbg!(Binance::fetch_1mn_prices());
diff --git a/crates/brk_indexer/Cargo.toml b/crates/brk_indexer/Cargo.toml
index 547518d74..e6526f818 100644
--- a/crates/brk_indexer/Cargo.toml
+++ b/crates/brk_indexer/Cargo.toml
@@ -1,14 +1,14 @@
 [package]
 name = "brk_indexer"
 description = "A bitcoin-core indexer built on top of brk_parser"
-version = "0.1.0"
+version = { workspace = true }
 edition = { workspace = true }
 license = { workspace = true }
 
 [dependencies]
 bitcoin = { workspace = true }
 brk_parser = { workspace = true }
-brk_printer = { workspace = true }
+brk_logger = { workspace = true }
 color-eyre = { workspace = true }
 derive_deref = { workspace = true }
 fjall = { workspace = true }
diff --git a/crates/brk_indexer/src/lib.rs b/crates/brk_indexer/src/lib.rs
index 901226e81..4a3258135 100644
--- a/crates/brk_indexer/src/lib.rs
+++ b/crates/brk_indexer/src/lib.rs
@@ -26,7 +26,7 @@ const SNAPSHOT_BLOCK_RANGE: usize = 1000;
 
 pub struct Indexer<const MODE: u8> {
     pub vecs: StorableVecs<MODE>,
-    pub trees: Fjalls,
+    pub stores: Fjalls,
 }
 
 impl<const MODE: u8> Indexer<MODE> {
@@ -40,9 +40,9 @@ impl<const MODE: u8> Indexer<MODE> {
 
         info!("Importing indexes...");
         let vecs = StorableVecs::import(&indexes_dir.join("vecs"))?;
-        let trees = Fjalls::import(&indexes_dir.join("fjall"))?;
+        let stores = Fjalls::import(&indexes_dir.join("fjall"))?;
 
-        Ok(Self { vecs, trees })
+        Ok(Self { vecs, stores })
     }
 }
 
@@ -52,33 +52,37 @@ impl Indexer<CACHED_GETS> {
 
         let check_collisions = true;
 
-        let starting_indexes = Indexes::try_from((&mut self.vecs, &self.trees, rpc)).unwrap_or_else(|_| {
+        let starting_indexes = Indexes::try_from((&mut self.vecs, &self.stores, rpc)).unwrap_or_else(|_| {
             let indexes = Indexes::default();
             indexes.push_if_needed(&mut self.vecs).unwrap();
             indexes
         });
 
         exit.block();
-        self.trees.rollback(&self.vecs, &starting_indexes)?;
+        self.stores.rollback(&self.vecs, &starting_indexes)?;
         self.vecs.rollback(&starting_indexes)?;
         exit.unblock();
 
         let export =
-            |trees: &mut Fjalls, vecs: &mut StorableVecs<CACHED_GETS>, height: Height| -> color_eyre::Result<()> {
+            |stores: &mut Fjalls, vecs: &mut StorableVecs<CACHED_GETS>, height: Height| -> color_eyre::Result<()> {
                 info!("Exporting...");
                 exit.block();
-                trees.commit(height)?;
+                stores.commit(height)?;
+                info!("Exported stores");
                 vecs.flush(height)?;
+                info!("Exported vecs");
                 exit.unblock();
                 Ok(())
             };
 
         let vecs = &mut self.vecs;
-        let trees = &mut self.trees;
+        let stores = &mut self.stores;
 
         let mut idxs = starting_indexes;
 
-        brk_parser::new(bitcoin_dir, Some(idxs.height), None, rpc)
+        let parser = Parser::new(bitcoin_dir, rpc);
+
+        parser.parse(Some(idxs.height), None)
             .iter()
             .try_for_each(|(height, block, blockhash)| -> color_eyre::Result<()> {
                 info!("Indexing block {height}...");
@@ -88,7 +92,7 @@ impl Indexer<CACHED_GETS> {
                 let blockhash = BlockHash::from(blockhash);
                 let blockhash_prefix = BlockHashPrefix::from(&blockhash);
 
-                if trees
+                if stores
                     .blockhash_prefix_to_height
                     .get(&blockhash_prefix)?
                     .is_some_and(|prev_height| *prev_height != height)
@@ -97,7 +101,7 @@ impl Indexer<CACHED_GETS> {
                     return Err(eyre!("Collision, expect prefix to need be set yet"));
                 }
 
-                trees
+                stores
                     .blockhash_prefix_to_height
                     .insert_if_needed(blockhash_prefix, height, height);
 
@@ -152,9 +156,9 @@ impl Indexer<CACHED_GETS> {
                                     let txid_prefix = TxidPrefix::from(&txid);
 
                                     let prev_txindex_opt =
-                                        if check_collisions && trees.txid_prefix_to_txindex.needs(height) {
+                                        if check_collisions && stores.txid_prefix_to_txindex.needs(height) {
                                             // Should only find collisions for two txids (duplicates), see below
-                                            trees.txid_prefix_to_txindex.get(&txid_prefix)?.map(|v| *v)
+                                            stores.txid_prefix_to_txindex.get(&txid_prefix)?.map(|v| *v)
                                         } else {
                                             None
                                         };
@@ -194,7 +198,7 @@ impl Indexer<CACHED_GETS> {
                                     return Ok((txinindex, InputSource::SameBlock((tx, txindex, txin, vin))));
                                 }
 
-                                let prev_txindex = if let Some(txindex) = trees
+                                let prev_txindex = if let Some(txindex) = stores
                                     .txid_prefix_to_txindex
                                     .get(&TxidPrefix::from(&txid))?
                                     .map(|v| *v)
@@ -272,7 +276,7 @@ impl Indexer<CACHED_GETS> {
                                         });
 
                                     let addressindex_opt = addressbytes_res.as_ref().ok().and_then(|addressbytes| {
-                                        trees
+                                        stores
                                             .addresshash_to_addressindex
                                             .get(&AddressHash::from((addressbytes, addresstype)))
                                             .unwrap()
@@ -304,7 +308,7 @@ impl Indexer<CACHED_GETS> {
 
                                         if (vecs.addressindex_to_addresstype.hasnt(addressindex)?
                                             && addresstype != prev_addresstype)
-                                            || (trees.addresshash_to_addressindex.needs(height)
+                                            || (stores.addresshash_to_addressindex.needs(height)
                                                 && prev_addressbytes != addressbytes)
                                         {
                                             let txid = tx.compute_txid();
@@ -454,7 +458,7 @@ impl Indexer<CACHED_GETS> {
                                 already_added_addresshash
                                     .insert(addresshash, addressindex);
 
-                                trees.addresshash_to_addressindex.insert_if_needed(
+                                stores.addresshash_to_addressindex.insert_if_needed(
                                     addresshash,
                                     addressindex,
                                     height,
@@ -541,7 +545,7 @@ impl Indexer<CACHED_GETS> {
 
                             match prev_txindex_opt {
                                 None => {
-                                    trees
+                                    stores
                                         .txid_prefix_to_txindex
                                         .insert_if_needed(txid_prefix, txindex, height);
                                 }
@@ -612,13 +616,13 @@ impl Indexer<CACHED_GETS> {
 
                 let should_snapshot = height != 0 && height % SNAPSHOT_BLOCK_RANGE == 0 && !exit.blocked();
                 if should_snapshot {
-                    export(trees, vecs, height)?;
+                    export(stores, vecs, height)?;
                 }
 
                 Ok(())
             })?;
 
-        export(trees, vecs, idxs.height)?;
+        export(stores, vecs, idxs.height)?;
 
         sleep(Duration::from_millis(100));
 
diff --git a/crates/brk_indexer/src/main.rs b/crates/brk_indexer/src/main.rs
index fa7788c83..54b2b56f5 100644
--- a/crates/brk_indexer/src/main.rs
+++ b/crates/brk_indexer/src/main.rs
@@ -9,9 +9,9 @@ use storable_vec::CACHED_GETS;
 fn main() -> color_eyre::Result<()> {
     color_eyre::install()?;
 
-    brk_printer::init_log(None);
+    brk_logger::init(None);
 
-    let data_dir = Path::new("../../bitcoin");
+    let data_dir = Path::new("../../../bitcoin");
     let rpc = Box::leak(Box::new(rpc::Client::new(
         "http://localhost:8332",
         rpc::Auth::CookieFile(Path::new(data_dir).join(".cookie")),
@@ -25,7 +25,7 @@ fn main() -> color_eyre::Result<()> {
 
         let i = std::time::Instant::now();
 
-        let mut indexer: Indexer<CACHED_GETS> = Indexer::import(Path::new("../_outputs/indexes"))?;
+        let mut indexer: Indexer<CACHED_GETS> = Indexer::import(Path::new("../../_outputs/indexes"))?;
 
         indexer.index(data_dir, rpc, &exit)?;
 
diff --git a/crates/brk_indexer/src/storage/fjalls/version.rs b/crates/brk_indexer/src/storage/fjalls/version.rs
deleted file mode 100644
index 1fb2028ba..000000000
--- a/crates/brk_indexer/src/storage/fjalls/version.rs
+++ /dev/null
@@ -1,51 +0,0 @@
-use std::{fs, io, path::Path};
-
-use derive_deref::Deref;
-use fjall::Slice;
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Deref)]
-pub struct Version(u32);
-
-impl Version {
-    pub fn write(&self, path: &Path) -> Result<(), io::Error> {
-        fs::write(path, self.to_ne_bytes())
-    }
-}
-
-impl From<u32> for Version {
-    fn from(value: u32) -> Self {
-        Self(value)
-    }
-}
-
-impl TryFrom<&Path> for Version {
-    type Error = io::Error;
-    fn try_from(value: &Path) -> Result<Self, Self::Error> {
-        Self::try_from(&fs::read(value)?)
-    }
-}
-impl TryFrom<Slice> for Version {
-    type Error = fjall::Error;
-    fn try_from(value: Slice) -> Result<Self, Self::Error> {
-        Self::from(&value)
-    }
-}
-impl TryFrom<&[u8]> for Version {
-    type Error = storable_vec::Error;
-    fn try_from(value: &[u8]) -> Result<Self, Self::Error> {
-        let mut buf: [u8; 4] = [0; 4];
-        let buf_len = buf.len();
-        if value.len() != buf_len {
-            panic!();
-        }
-        value.iter().enumerate().for_each(|(i, r)| {
-            buf[i] = *r;
-        });
-        Ok(Self(u32::from_ne_bytes(buf)))
-    }
-}
-impl From<Version> for Slice {
-    fn from(value: Version) -> Self {
-        Self::new(&value.to_ne_bytes())
-    }
-}
diff --git a/crates/brk_indexer/src/storage/mod.rs b/crates/brk_indexer/src/storage/mod.rs
index f25e0398a..15d757c6a 100644
--- a/crates/brk_indexer/src/storage/mod.rs
+++ b/crates/brk_indexer/src/storage/mod.rs
@@ -1,9 +1,5 @@
-// mod canopy;
 mod fjalls;
-// mod sanakirja;
 mod storable_vecs;
 
-// pub use canopy::*;
 pub use fjalls::*;
-// pub use sanakirja::*;
 pub use storable_vecs::*;
diff --git a/crates/brk_printer/Cargo.toml b/crates/brk_logger/Cargo.toml
similarity index 81%
rename from crates/brk_printer/Cargo.toml
rename to crates/brk_logger/Cargo.toml
index 5009a0d61..bbc78223a 100644
--- a/crates/brk_printer/Cargo.toml
+++ b/crates/brk_logger/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
-name = "brk_printer"
+name = "brk_logger"
 description = "A clean logger"
-version = "0.1.0"
+version = { workspace = true }
 edition = { workspace = true }
 license = { workspace = true }
 
diff --git a/crates/brk_printer/src/lib.rs b/crates/brk_logger/src/lib.rs
similarity index 96%
rename from crates/brk_printer/src/lib.rs
rename to crates/brk_logger/src/lib.rs
index b56cdb27e..123503149 100644
--- a/crates/brk_printer/src/lib.rs
+++ b/crates/brk_logger/src/lib.rs
@@ -7,11 +7,11 @@ use std::{
 
 use color_eyre::owo_colors::OwoColorize;
 use env_logger::{Builder, Env};
-use jiff::{tz, Timestamp};
+use jiff::{Timestamp, tz};
 pub use log::{debug, error, info, trace, warn};
 
 #[inline(always)]
-pub fn init_log(path: Option<&Path>) {
+pub fn init(path: Option<&Path>) {
     let file = path.map(|path| {
         let _ = fs::remove_file(path);
         OpenOptions::new().create(true).append(true).open(path).unwrap()
diff --git a/crates/brk_printer/src/main.rs b/crates/brk_logger/src/main.rs
similarity index 59%
rename from crates/brk_printer/src/main.rs
rename to crates/brk_logger/src/main.rs
index 80e3c0af9..5414a6614 100644
--- a/crates/brk_printer/src/main.rs
+++ b/crates/brk_logger/src/main.rs
@@ -1,6 +1,6 @@
 use log::info;
 
 fn main() {
-    brk_printer::init_log(None);
+    brk_logger::init(None);
     info!("test");
 }
diff --git a/crates/brk_parser/Cargo.toml b/crates/brk_parser/Cargo.toml
index e80f382c3..fadde0dc1 100644
--- a/crates/brk_parser/Cargo.toml
+++ b/crates/brk_parser/Cargo.toml
@@ -1,10 +1,10 @@
 [package]
 name = "brk_parser"
 description = "A very fast Bitcoin block iterator built on top of bitcoin-rust"
-version = "0.2.3"
 repository = "https://github.com/kibo-money/kibo/tree/main/src/crates/biter"
 keywords = ["bitcoin", "block", "iterator"]
 categories = ["cryptography::cryptocurrencies", "encoding"]
+version = { workspace = true }
 edition = { workspace = true }
 license = { workspace = true }
 
diff --git a/crates/brk_parser/src/blk_index_to_blk_recap.rs b/crates/brk_parser/src/blk_index_to_blk_recap.rs
index 4d9735d2c..f95ef13ae 100644
--- a/crates/brk_parser/src/blk_index_to_blk_recap.rs
+++ b/crates/brk_parser/src/blk_index_to_blk_recap.rs
@@ -69,19 +69,19 @@ impl BlkIndexToBlkRecap {
 
         let height = start.unwrap();
 
-        let mut start = 0;
+        let mut start = None;
 
         if let Some(found) = self.tree.iter().find(|(_, recap)| recap.max_height >= height) {
-            start = *found.0;
+            start = Some(*found.0);
         }
 
         if let Some(min_removed) = min_removed {
-            if start > min_removed {
-                start = min_removed;
+            if start.is_none_or(|start| start > min_removed) {
+                start = Some(min_removed);
             }
         }
 
-        start
+        start.unwrap()
     }
 
     pub fn export(&self) {
diff --git a/crates/brk_parser/src/blk_metadata_and_block.rs b/crates/brk_parser/src/blk_metadata_and_block.rs
deleted file mode 100644
index d65966b40..000000000
--- a/crates/brk_parser/src/blk_metadata_and_block.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-use bitcoin::Block;
-
-use crate::BlkMetadata;
-
-#[derive(Debug)]
-pub struct BlkIndexAndBlock {
-    pub blk_metadata: BlkMetadata,
-    pub block: Block,
-}
-
-impl BlkIndexAndBlock {
-    pub fn new(blk_metadata: BlkMetadata, block: Block) -> Self {
-        Self { blk_metadata, block }
-    }
-}
diff --git a/crates/brk_parser/src/blk_recap.rs b/crates/brk_parser/src/blk_recap.rs
index cd2fee31a..d7c8e8ca6 100644
--- a/crates/brk_parser/src/blk_recap.rs
+++ b/crates/brk_parser/src/blk_recap.rs
@@ -2,7 +2,7 @@ use std::path::Path;
 
 use serde::{Deserialize, Serialize};
 
-use crate::{path_to_modified_time, Height};
+use crate::{Height, path_to_modified_time};
 
 #[derive(Debug, Clone, Copy, Serialize, Deserialize)]
 #[repr(C)]
@@ -13,9 +13,6 @@ pub struct BlkRecap {
 
 impl BlkRecap {
     pub fn has_different_modified_time(&self, blk_path: &Path) -> bool {
-        if self.modified_time != path_to_modified_time(blk_path) {
-            dbg!(self.modified_time, path_to_modified_time(blk_path));
-        }
         self.modified_time != path_to_modified_time(blk_path)
     }
 }
diff --git a/crates/brk_parser/src/block_state.rs b/crates/brk_parser/src/block_state.rs
new file mode 100644
index 000000000..32e13ddea
--- /dev/null
+++ b/crates/brk_parser/src/block_state.rs
@@ -0,0 +1,25 @@
+use bitcoin::{Block, consensus::Decodable, io::Cursor};
+
+use crate::{XORBytes, XORIndex};
+
+pub enum BlockState {
+    Raw(Vec<u8>),
+    Decoded(Block),
+}
+
+impl BlockState {
+    pub fn decode(&mut self, xor_i: &mut XORIndex, xor_bytes: &XORBytes) {
+        let bytes = match self {
+            BlockState::Raw(bytes) => bytes,
+            _ => unreachable!(),
+        };
+
+        xor_i.bytes(bytes.as_mut_slice(), xor_bytes);
+
+        let mut cursor = Cursor::new(bytes);
+
+        let block = Block::consensus_decode(&mut cursor).unwrap();
+
+        *self = BlockState::Decoded(block);
+    }
+}
diff --git a/crates/brk_parser/src/height.rs b/crates/brk_parser/src/height.rs
index 8df4c97f9..12071665e 100644
--- a/crates/brk_parser/src/height.rs
+++ b/crates/brk_parser/src/height.rs
@@ -108,10 +108,17 @@ impl AddAssign<usize> for Height {
     }
 }
 
+impl Rem<Height> for Height {
+    type Output = Height;
+    fn rem(self, rhs: Height) -> Self::Output {
+        Self(self.0.rem(rhs.0))
+    }
+}
+
 impl Rem<usize> for Height {
     type Output = Height;
     fn rem(self, rhs: usize) -> Self::Output {
-        Self(self.abs_diff(Height::from(rhs).0))
+        Self(self.0.rem(Height::from(rhs).0))
     }
 }
 
diff --git a/crates/brk_parser/src/lib.rs b/crates/brk_parser/src/lib.rs
index e1bf31489..1ad841f91 100644
--- a/crates/brk_parser/src/lib.rs
+++ b/crates/brk_parser/src/lib.rs
@@ -1,10 +1,13 @@
-use std::{cmp::Ordering, collections::BTreeMap, fs, ops::ControlFlow, path::Path, thread};
-
-use bitcoin::{
-    Block, BlockHash,
-    consensus::{Decodable, ReadExt},
-    io::{Cursor, Read},
+use std::{
+    cmp::Ordering,
+    collections::BTreeMap,
+    fs::{self},
+    ops::ControlFlow,
+    path::{Path, PathBuf},
+    thread,
 };
+
+use bitcoin::{Block, BlockHash};
 use bitcoincore_rpc::RpcApi;
 use blk_index_to_blk_path::*;
 use blk_recap::BlkRecap;
@@ -17,248 +20,237 @@ pub use bitcoincore_rpc as rpc;
 mod blk_index_to_blk_path;
 mod blk_index_to_blk_recap;
 mod blk_metadata;
-mod blk_metadata_and_block;
 mod blk_recap;
+mod block_state;
 mod error;
 mod height;
 mod utils;
-mod xor;
+mod xor_bytes;
+mod xor_index;
 
 use blk_index_to_blk_recap::*;
 use blk_metadata::*;
-use blk_metadata_and_block::*;
+use block_state::*;
 pub use error::*;
 pub use height::*;
 use utils::*;
-use xor::*;
+use xor_bytes::*;
+use xor_index::*;
 
 pub const NUMBER_OF_UNSAFE_BLOCKS: usize = 1000;
+
 const MAGIC_BYTES: [u8; 4] = [249, 190, 180, 217];
-const BOUND_CAP: usize = 100;
+const BOUND_CAP: usize = 50;
 
-///
-/// Returns a crossbeam channel receiver that receives `(Height, Block, BlockHash)` tuples from an **inclusive** range (`start` and `end`)
-///
-/// For an example checkout `iterator/main.rs`
-///
-pub fn new(
-    data_dir: &Path,
-    start: Option<Height>,
-    end: Option<Height>,
+pub struct Parser {
+    data_dir: PathBuf,
     rpc: &'static bitcoincore_rpc::Client,
-) -> Receiver<(Height, Block, BlockHash)> {
-    let (send_block_reader, recv_block_reader) = bounded(5);
-    let (send_block_xor, recv_block_xor) = bounded(BOUND_CAP);
-    let (send_block, recv_block) = bounded(BOUND_CAP);
-    let (send_height_block_hash, recv_height_block_hash) = bounded(BOUND_CAP);
+}
 
-    let blk_index_to_blk_path = BlkIndexToBlkPath::scan(data_dir);
+impl Parser {
+    pub fn new(data_dir: &Path, rpc: &'static bitcoincore_rpc::Client) -> Self {
+        Self {
+            data_dir: data_dir.to_owned(),
+            rpc,
+        }
+    }
 
-    let (mut blk_index_to_blk_recap, blk_index) = BlkIndexToBlkRecap::import(data_dir, &blk_index_to_blk_path, start);
+    ///
+    /// Returns a crossbeam channel receiver that receives `(Height, Block, BlockHash)` tuples from an **inclusive** range (`start` and `end`)
+    ///
+    /// For an example checkout `./main.rs`
+    ///
+    pub fn parse(&self, start: Option<Height>, end: Option<Height>) -> Receiver<(Height, Block, BlockHash)> {
+        let data_dir = self.data_dir.as_path();
+        let rpc = self.rpc;
 
-    let xor = XOR::from(data_dir);
+        let (send_bytes, recv_bytes) = bounded(BOUND_CAP);
+        let (send_block, recv_block) = bounded(BOUND_CAP);
+        let (send_height_block_hash, recv_height_block_hash) = bounded(BOUND_CAP);
 
-    thread::spawn(move || {
-        blk_index_to_blk_path
-            .range(blk_index..)
-            .try_for_each(move |(blk_index, blk_path)| {
-                let blk_index = *blk_index;
+        let blk_index_to_blk_path = BlkIndexToBlkPath::scan(data_dir);
 
-                let blk_metadata = BlkMetadata::new(blk_index, blk_path.as_path());
+        let (mut blk_index_to_blk_recap, blk_index) =
+            BlkIndexToBlkRecap::import(data_dir, &blk_index_to_blk_path, start);
 
-                let blk_bytes = fs::read(blk_path).unwrap();
+        let xor_bytes = XORBytes::from(data_dir);
 
-                let res = send_block_reader.send((blk_metadata, blk_bytes));
-                if let Err(e) = res {
-                    dbg!(e);
-                    return ControlFlow::Break(());
-                }
+        thread::spawn(move || {
+            let xor_bytes = xor_bytes;
 
-                ControlFlow::Continue(())
-            });
-    });
+            blk_index_to_blk_path
+                .range(blk_index..)
+                .try_for_each(move |(blk_index, blk_path)| {
+                    let mut xor_i = XORIndex::default();
 
-    thread::spawn(move || {
-        recv_block_reader
-            .iter()
-            .try_for_each(|(blk_metadata, blk_bytes)| -> ControlFlow<(), _> {
-                let blk_bytes = xor.process(blk_bytes);
+                    let blk_index = *blk_index;
 
-                let blk_bytes_len = blk_bytes.len() as u64;
+                    let blk_metadata = BlkMetadata::new(blk_index, blk_path.as_path());
 
-                let mut cursor = Cursor::new(blk_bytes);
+                    let mut blk_bytes_ = fs::read(blk_path).unwrap();
+                    let blk_bytes = blk_bytes_.as_mut_slice();
+                    let blk_bytes_len = blk_bytes.len();
 
-                let mut current_4bytes = [0; 4];
+                    let mut current_4bytes = [0; 4];
 
-                'parent: loop {
-                    if cursor.position() == blk_bytes_len {
-                        break;
-                    }
+                    let mut i = 0;
 
-                    // Read until we find a valid suite of MAGIC_BYTES
-                    loop {
-                        current_4bytes.rotate_left(1);
+                    'parent: loop {
+                        loop {
+                            if i == blk_bytes_len {
+                                break 'parent;
+                            }
 
-                        if let Ok(byte) = cursor.read_u8() {
-                            current_4bytes[3] = byte;
-                        } else {
-                            break 'parent;
+                            current_4bytes.rotate_left(1);
+
+                            current_4bytes[3] = xor_i.byte(blk_bytes[i], &xor_bytes);
+                            i += 1;
+
+                            if current_4bytes == MAGIC_BYTES {
+                                break;
+                            }
                         }
 
-                        if current_4bytes == MAGIC_BYTES {
-                            break;
+                        let len =
+                            u32::from_le_bytes(xor_i.bytes(&mut blk_bytes[i..(i + 4)], &xor_bytes).try_into().unwrap())
+                                as usize;
+                        i += 4;
+
+                        let block_bytes = (blk_bytes[i..(i + len)]).to_vec();
+
+                        if send_bytes
+                            .send((blk_metadata, BlockState::Raw(block_bytes), xor_i))
+                            .is_err()
+                        {
+                            return ControlFlow::Break(());
                         }
+
+                        i += len;
+                        xor_i.add_assign(len);
                     }
 
-                    let len = cursor.read_u32().unwrap();
+                    ControlFlow::Continue(())
+                });
+        });
 
-                    let mut bytes = vec![0u8; len as usize];
+        thread::spawn(move || {
+            let xor_bytes = xor_bytes;
 
-                    cursor.read_exact(&mut bytes).unwrap();
+            let mut bulk = vec![];
 
-                    if send_block_xor.send((blk_metadata, BlockState::Raw(bytes))).is_err() {
+            let drain_and_send = |bulk: &mut Vec<_>| {
+                // Using a vec and sending after to not end up with stuck threads in par iter
+                bulk.par_iter_mut().for_each(|(_, block_state, xor_i)| {
+                    BlockState::decode(block_state, xor_i, &xor_bytes);
+                });
+
+                bulk.drain(..).try_for_each(|(blk_metadata, block_state, _)| {
+                    let block = match block_state {
+                        BlockState::Decoded(block) => block,
+                        _ => unreachable!(),
+                    };
+
+                    if send_block.send((blk_metadata, block)).is_err() {
                         return ControlFlow::Break(());
                     }
+
+                    ControlFlow::Continue(())
+                })
+            };
+
+            recv_bytes.iter().try_for_each(|tuple| {
+                bulk.push(tuple);
+
+                if bulk.len() < BOUND_CAP / 2 {
+                    return ControlFlow::Continue(());
                 }
 
-                ControlFlow::Continue(())
-            });
-    });
-
-    thread::spawn(move || {
-        let mut bulk = vec![];
-
-        let drain_and_send = |bulk: &mut Vec<_>| {
-            // Using a vec and sending after to not end up with stuck threads in par iter
-            bulk.par_iter_mut().for_each(|(_, block_state)| {
-                BlockState::decode(block_state);
+                // Sending in bulk to not lock threads in standby
+                drain_and_send(&mut bulk)
             });
 
-            bulk.drain(..).try_for_each(|(blk_metadata, block_state)| {
-                let block = match block_state {
-                    BlockState::Decoded(block) => block,
-                    _ => unreachable!(),
-                };
-
-                if send_block.send(BlkIndexAndBlock::new(blk_metadata, block)).is_err() {
-                    return ControlFlow::Break(());
-                }
-
-                ControlFlow::Continue(())
-            })
-        };
-
-        recv_block_xor.iter().try_for_each(|tuple| {
-            bulk.push(tuple);
-
-            if bulk.len() < BOUND_CAP / 2 {
-                return ControlFlow::Continue(());
-            }
-
-            // Sending in bulk to not lock threads in standby
             drain_and_send(&mut bulk)
         });
 
-        drain_and_send(&mut bulk)
-    });
+        thread::spawn(move || {
+            let mut current_height = start.unwrap_or_default();
 
-    thread::spawn(move || {
-        let mut current_height = start.unwrap_or_default();
+            let mut future_blocks = BTreeMap::default();
 
-        let mut future_blocks = BTreeMap::default();
+            recv_block
+                .iter()
+                .try_for_each(|(blk_metadata, block)| -> ControlFlow<(), _> {
+                    let hash = block.block_hash();
+                    let header = rpc.get_block_header_info(&hash);
 
-        recv_block.iter().try_for_each(|tuple| -> ControlFlow<(), _> {
-            let blk_metadata = tuple.blk_metadata;
-            let block = tuple.block;
-            let hash = block.block_hash();
-            let header = rpc.get_block_header_info(&hash);
-
-            if header.is_err() {
-                return ControlFlow::Continue(());
-            }
-            let header = header.unwrap();
-            if header.confirmations <= 0 {
-                return ControlFlow::Continue(());
-            }
-
-            let height = Height::from(header.height);
-
-            let len = blk_index_to_blk_recap.tree.len();
-            if blk_metadata.index == len as u16 || blk_metadata.index + 1 == len as u16 {
-                match (len as u16).cmp(&blk_metadata.index) {
-                    Ordering::Equal => {
-                        if len % 21 == 0 {
-                            blk_index_to_blk_recap.export();
-                        }
+                    if header.is_err() {
+                        return ControlFlow::Continue(());
+                    }
+                    let header = header.unwrap();
+                    if header.confirmations <= 0 {
+                        return ControlFlow::Continue(());
                     }
-                    Ordering::Less => panic!(),
-                    Ordering::Greater => {}
-                }
 
-                blk_index_to_blk_recap
-                    .tree
-                    .entry(blk_metadata.index)
-                    .and_modify(|recap| {
-                        if recap.max_height < height {
-                            recap.max_height = height;
+                    let height = Height::from(header.height);
+                    // println!("{height}");
+
+                    let len = blk_index_to_blk_recap.tree.len();
+                    if blk_metadata.index == len as u16 || blk_metadata.index + 1 == len as u16 {
+                        match (len as u16).cmp(&blk_metadata.index) {
+                            Ordering::Equal => {
+                                if len % 21 == 0 {
+                                    blk_index_to_blk_recap.export();
+                                }
+                            }
+                            Ordering::Less => panic!(),
+                            Ordering::Greater => {}
                         }
-                    })
-                    .or_insert(BlkRecap {
-                        max_height: height,
-                        modified_time: blk_metadata.modified_time,
-                    });
-            }
 
-            let mut opt = if current_height == height {
-                Some((block, hash))
-            } else {
-                if start.is_none_or(|start| start <= height) && end.is_none_or(|end| end >= height) {
-                    future_blocks.insert(height, (block, hash));
-                }
-                None
-            };
+                        blk_index_to_blk_recap
+                            .tree
+                            .entry(blk_metadata.index)
+                            .and_modify(|recap| {
+                                if recap.max_height < height {
+                                    recap.max_height = height;
+                                }
+                            })
+                            .or_insert(BlkRecap {
+                                max_height: height,
+                                modified_time: blk_metadata.modified_time,
+                            });
+                    }
 
-            while let Some((block, hash)) = opt.take().or_else(|| {
-                if !future_blocks.is_empty() {
-                    future_blocks.remove(&current_height)
-                } else {
-                    None
-                }
-            }) {
-                send_height_block_hash.send((current_height, block, hash)).unwrap();
+                    let mut opt = if current_height == height {
+                        Some((block, hash))
+                    } else {
+                        if start.is_none_or(|start| start <= height) && end.is_none_or(|end| end >= height) {
+                            future_blocks.insert(height, (block, hash));
+                        }
+                        None
+                    };
 
-                if end == Some(current_height) {
-                    return ControlFlow::Break(());
-                }
+                    while let Some((block, hash)) = opt.take().or_else(|| {
+                        if !future_blocks.is_empty() {
+                            future_blocks.remove(&current_height)
+                        } else {
+                            None
+                        }
+                    }) {
+                        send_height_block_hash.send((current_height, block, hash)).unwrap();
 
-                current_height.increment();
-            }
+                        if end == Some(current_height) {
+                            return ControlFlow::Break(());
+                        }
 
-            ControlFlow::Continue(())
+                        current_height.increment();
+                    }
+
+                    ControlFlow::Continue(())
+                });
+
+            blk_index_to_blk_recap.export();
         });
 
-        blk_index_to_blk_recap.export();
-    });
-
-    recv_height_block_hash
-}
-
-enum BlockState {
-    Raw(Vec<u8>),
-    Decoded(Block),
-}
-
-impl BlockState {
-    pub fn decode(&mut self) {
-        let bytes = match self {
-            BlockState::Raw(bytes) => bytes,
-            _ => unreachable!(),
-        };
-
-        let mut cursor = Cursor::new(bytes);
-
-        let block = Block::consensus_decode(&mut cursor).unwrap();
-
-        *self = BlockState::Decoded(block);
+        recv_height_block_hash
     }
 }
diff --git a/crates/brk_parser/src/main.rs b/crates/brk_parser/src/main.rs
index 623e79bcd..3e820a0bd 100644
--- a/crates/brk_parser/src/main.rs
+++ b/crates/brk_parser/src/main.rs
@@ -1,11 +1,12 @@
 use std::path::Path;
 
 use bitcoincore_rpc::{Auth, Client};
+use brk_parser::Parser;
 
 fn main() {
     let i = std::time::Instant::now();
 
-    let data_dir = Path::new("../../bitcoin");
+    let data_dir = Path::new("../../../bitcoin");
     let rpc = Box::leak(Box::new(
         Client::new(
             "http://localhost:8332",
@@ -17,11 +18,11 @@ fn main() {
     let start = None;
     let end = None;
 
-    brk_parser::new(data_dir, start, end, rpc)
-        .iter()
-        .for_each(|(height, _block, hash)| {
-            println!("{height}: {hash}");
-        });
+    let parser = Parser::new(data_dir, rpc);
+
+    parser.parse(start, end).iter().for_each(|(height, _block, hash)| {
+        println!("{height}: {hash}");
+    });
 
     dbg!(i.elapsed());
 }
diff --git a/crates/brk_parser/src/xor.rs b/crates/brk_parser/src/xor.rs
deleted file mode 100644
index 54636283b..000000000
--- a/crates/brk_parser/src/xor.rs
+++ /dev/null
@@ -1,40 +0,0 @@
-use std::{fs, path::Path};
-
-const XOR_LEN: usize = 8;
-
-#[derive(Debug, PartialEq, Eq, Default)]
-pub struct XOR([u8; XOR_LEN]);
-
-impl XOR {
-    pub fn process(&self, mut bytes: Vec<u8>) -> Vec<u8> {
-        if u64::from_ne_bytes(self.0) == 0 {
-            return bytes;
-        }
-
-        let len = bytes.len();
-        let mut bytes_index = 0;
-        let mut xor_index = 0;
-
-        while bytes_index < len {
-            bytes[bytes_index] ^= self.0[xor_index];
-            bytes_index += 1;
-            xor_index += 1;
-            if xor_index == XOR_LEN {
-                xor_index = 0;
-            }
-        }
-
-        bytes
-    }
-}
-
-impl From<&Path> for XOR {
-    fn from(value: &Path) -> Self {
-        Self(
-            fs::read(value.join("blocks/xor.dat"))
-                .unwrap_or(vec![0; 8])
-                .try_into()
-                .unwrap(),
-        )
-    }
-}
diff --git a/crates/brk_parser/src/xor_bytes.rs b/crates/brk_parser/src/xor_bytes.rs
new file mode 100644
index 000000000..9b900f534
--- /dev/null
+++ b/crates/brk_parser/src/xor_bytes.rs
@@ -0,0 +1,19 @@
+use std::{fs, path::Path};
+
+use derive_deref::Deref;
+
+pub const XOR_LEN: usize = 8;
+
+#[derive(Debug, Clone, Copy, Deref)]
+pub struct XORBytes([u8; XOR_LEN]);
+
+impl From<&Path> for XORBytes {
+    fn from(value: &Path) -> Self {
+        Self(
+            fs::read(value.join("blocks/xor.dat"))
+                .unwrap_or(vec![0; 8])
+                .try_into()
+                .unwrap(),
+        )
+    }
+}
diff --git a/crates/brk_parser/src/xor_index.rs b/crates/brk_parser/src/xor_index.rs
new file mode 100644
index 000000000..81b79498d
--- /dev/null
+++ b/crates/brk_parser/src/xor_index.rs
@@ -0,0 +1,39 @@
+use crate::xor_bytes::{XOR_LEN, XORBytes};
+
+#[derive(Debug, Default, PartialEq, Eq, Clone, Copy)]
+pub struct XORIndex(usize);
+
+impl XORIndex {
+    pub fn bytes<'a>(&mut self, bytes: &'a mut [u8], xor_bytes: &XORBytes) -> &'a mut [u8] {
+        let len = bytes.len();
+        let mut bytes_index = 0;
+
+        while bytes_index < len {
+            bytes[bytes_index] ^= xor_bytes[self.0];
+            self.increment();
+            bytes_index += 1;
+        }
+
+        bytes
+    }
+
+    #[inline(always)]
+    pub fn byte(&mut self, mut byte: u8, xor_bytes: &XORBytes) -> u8 {
+        byte ^= xor_bytes[self.0];
+        self.increment();
+        byte
+    }
+
+    #[inline(always)]
+    pub fn increment(&mut self) {
+        self.0 += 1;
+        if self.0 == XOR_LEN {
+            self.0 = 0;
+        }
+    }
+
+    #[inline(always)]
+    pub fn add_assign(&mut self, i: usize) {
+        self.0 = (self.0 + i) % XOR_LEN;
+    }
+}
diff --git a/crates/brk_server/Cargo.toml b/crates/brk_server/Cargo.toml
index 5806aeea3..e3bca264d 100644
--- a/crates/brk_server/Cargo.toml
+++ b/crates/brk_server/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "brk_server"
 description = "A Bitcoin data server built on top of bindexer, bricer and bomputer"
-version = "0.1.0"
+version = { workspace = true }
 edition = { workspace = true }
 license = { workspace = true }
 
@@ -9,7 +9,7 @@ license = { workspace = true }
 axum = "0.8.1"
 brk_computer = { workspace = true }
 brk_indexer = { workspace = true }
-brk_printer = { workspace = true }
+brk_logger = { workspace = true }
 color-eyre = { workspace = true }
 derive_deref = { workspace = true }
 jiff = { workspace = true }
diff --git a/crates/brk_server/src/lib.rs b/crates/brk_server/src/lib.rs
index e2aca251f..8cdc6423f 100644
--- a/crates/brk_server/src/lib.rs
+++ b/crates/brk_server/src/lib.rs
@@ -22,7 +22,7 @@ pub struct AppState {
     computer: &'static Computer<STATELESS>,
 }
 
-pub const WEBSITE_DEV_PATH: &str = "../websites/kibo.money/";
+pub const WEBSITE_DEV_PATH: &str = "../../websites/kibo.money/";
 
 pub async fn main(indexer: Indexer<STATELESS>, computer: Computer<STATELESS>) -> color_eyre::Result<()> {
     let indexer = Box::leak(Box::new(indexer));
diff --git a/crates/brk_server/src/main.rs b/crates/brk_server/src/main.rs
index fde668fdc..7d3e07b7d 100644
--- a/crates/brk_server/src/main.rs
+++ b/crates/brk_server/src/main.rs
@@ -8,9 +8,9 @@ use storable_vec::STATELESS;
 pub async fn main() -> color_eyre::Result<()> {
     color_eyre::install()?;
 
-    brk_printer::init_log(None);
+    brk_logger::init(None);
 
-    let path = Path::new("../_outputs");
+    let path = Path::new("../../_outputs");
     let indexer: Indexer<STATELESS> = Indexer::import(&path.join("indexes"))?;
     let computer: Computer<STATELESS> = Computer::import(&path.join("computed"))?;
 

From 2f93fd7c364496cf86fc33604b8ede9c45c08e57 Mon Sep 17 00:00:00 2001
From: nym21 <expat-epochs0i@icloud.com>
Date: Mon, 24 Feb 2025 00:25:58 +0100
Subject: [PATCH 62/63] global: crates cleanup

---
 Cargo.lock                                    | 13 +++++--
 Cargo.toml                                    |  3 +-
 crates/brk/Cargo.toml                         | 18 ++++++++++
 crates/brk/src/lib.rs                         | 35 +++++++++++++++++++
 crates/brk_computer/Cargo.toml                |  1 +
 .../src/structs/addressindextxoutindex.rs     |  8 ++---
 crates/brk_computer/src/structs/unit.rs       |  8 ++---
 crates/brk_indexer/Cargo.toml                 |  1 +
 crates/brk_indexer/src/lib.rs                 |  4 +--
 crates/brk_indexer/src/main.rs                |  9 +++--
 crates/brk_indexer/src/storage/fjalls/base.rs | 16 ++++-----
 .../brk_indexer/src/structs/addressindex.rs   |  8 ++---
 crates/brk_indexer/src/structs/compressed.rs  | 26 +++++++-------
 crates/brk_indexer/src/structs/txindex.rs     |  8 ++---
 crates/brk_logger/Cargo.toml                  |  1 -
 crates/brk_logger/src/lib.rs                  |  1 -
 crates/brk_logger/src/main.rs                 |  3 --
 crates/brk_parser/Cargo.toml                  |  7 ++--
 crates/brk_parser/src/error.rs                |  1 -
 crates/brk_parser/src/height.rs               | 32 +++++++++++------
 crates/storable_vec/Cargo.toml                |  2 +-
 21 files changed, 138 insertions(+), 67 deletions(-)
 create mode 100644 crates/brk/src/lib.rs

diff --git a/Cargo.lock b/Cargo.lock
index 536fa3394..e6fd1bc01 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -325,6 +325,14 @@ checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36"
 [[package]]
 name = "brk"
 version = "0.0.0"
+dependencies = [
+ "brk_computer",
+ "brk_fetcher",
+ "brk_indexer",
+ "brk_logger",
+ "brk_parser",
+ "brk_server",
+]
 
 [[package]]
 name = "brk_cli"
@@ -337,6 +345,7 @@ dependencies = [
  "brk_fetcher",
  "brk_indexer",
  "brk_parser",
+ "byteview",
  "color-eyre",
  "derive_deref",
  "fjall",
@@ -369,6 +378,7 @@ dependencies = [
  "bitcoin",
  "brk_logger",
  "brk_parser",
+ "byteview",
  "color-eyre",
  "derive_deref",
  "fjall",
@@ -391,7 +401,6 @@ dependencies = [
  "color-eyre",
  "env_logger",
  "jiff",
- "log",
 ]
 
 [[package]]
@@ -400,9 +409,9 @@ version = "0.0.0"
 dependencies = [
  "bitcoin",
  "bitcoincore-rpc",
+ "byteview",
  "crossbeam",
  "derive_deref",
- "fjall",
  "rayon",
  "serde",
  "serde_json",
diff --git a/Cargo.toml b/Cargo.toml
index bb50967a5..48a9425e5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,9 +10,10 @@ bitcoin = { version = "0.32.5", features = ["serde"] }
 brk_computer = { version = "0", path = "crates/brk_computer" }
 brk_fetcher = { version = "0", path = "crates/brk_fetcher" }
 brk_indexer = { version = "0", path = "crates/brk_indexer" }
-brk_parser = { version = "0", path = "crates/brk_parser", features = ["bytes"] }
+brk_parser = { version = "0", path = "crates/brk_parser" }
 brk_logger = { version = "0", path = "crates/brk_logger" }
 brk_server = { version = "0", path = "crates/brk_server" }
+byteview = "0.5.4"
 color-eyre = "0.6.3"
 derive_deref = "1.1.1"
 fjall = "2.6.5"
diff --git a/crates/brk/Cargo.toml b/crates/brk/Cargo.toml
index fbcc31153..9e83030cd 100644
--- a/crates/brk/Cargo.toml
+++ b/crates/brk/Cargo.toml
@@ -4,4 +4,22 @@ license.workspace = true
 edition.workspace = true
 version.workspace = true
 
+[features]
+full = ["computer", "fetcher", "indexer", "logger", "parser", "server"]
+computer = ["brk_computer"]
+fetcher = ["brk_fetcher"]
+indexer = ["brk_indexer"]
+logger = ["brk_logger"]
+parser = ["brk_parser"]
+server = ["brk_server"]
+
 [dependencies]
+brk_computer = { workspace = true, optional = true }
+brk_fetcher = { workspace = true, optional = true }
+brk_indexer = { workspace = true, optional = true }
+brk_logger = { workspace = true, optional = true }
+brk_parser = { workspace = true, optional = true }
+brk_server = { workspace = true, optional = true }
+
+[package.metadata.docs.rs]
+all-features = true
diff --git a/crates/brk/src/lib.rs b/crates/brk/src/lib.rs
new file mode 100644
index 000000000..458340dca
--- /dev/null
+++ b/crates/brk/src/lib.rs
@@ -0,0 +1,35 @@
+#[cfg(feature = "computer")]
+pub mod computer {
+    #[doc(inline)]
+    pub use brk_computer::*;
+}
+
+#[cfg(feature = "fetcher")]
+pub mod fetcher {
+    #[doc(inline)]
+    pub use brk_fetcher::*;
+}
+
+#[cfg(feature = "indexer")]
+pub mod indexer {
+    #[doc(inline)]
+    pub use brk_indexer::*;
+}
+
+#[cfg(feature = "logger")]
+pub mod logger {
+    #[doc(inline)]
+    pub use brk_logger::*;
+}
+
+#[cfg(feature = "parser")]
+pub mod parser {
+    #[doc(inline)]
+    pub use brk_parser::*;
+}
+
+#[cfg(feature = "server")]
+pub mod server {
+    #[doc(inline)]
+    pub use brk_server::*;
+}
diff --git a/crates/brk_computer/Cargo.toml b/crates/brk_computer/Cargo.toml
index 733032898..add4956ff 100644
--- a/crates/brk_computer/Cargo.toml
+++ b/crates/brk_computer/Cargo.toml
@@ -9,6 +9,7 @@ license = { workspace = true }
 brk_fetcher = { workspace = true }
 brk_indexer = { workspace = true }
 brk_parser = { workspace = true }
+byteview = { workspace = true }
 color-eyre = { workspace = true }
 derive_deref = { workspace = true }
 fjall = { workspace = true }
diff --git a/crates/brk_computer/src/structs/addressindextxoutindex.rs b/crates/brk_computer/src/structs/addressindextxoutindex.rs
index e08cbf8b4..11a743b50 100644
--- a/crates/brk_computer/src/structs/addressindextxoutindex.rs
+++ b/crates/brk_computer/src/structs/addressindextxoutindex.rs
@@ -1,5 +1,5 @@
 use brk_indexer::{Addressindex, Txoutindex};
-use fjall::Slice;
+use byteview::ByteView;
 use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout};
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Immutable, IntoBytes, KnownLayout, FromBytes)]
@@ -9,13 +9,13 @@ pub struct AddressindexTxoutindex {
     txoutindex: Txoutindex,
 }
 
-impl TryFrom<Slice> for AddressindexTxoutindex {
+impl TryFrom<ByteView> for AddressindexTxoutindex {
     type Error = storable_vec::Error;
-    fn try_from(value: Slice) -> Result<Self, Self::Error> {
+    fn try_from(value: ByteView) -> Result<Self, Self::Error> {
         Ok(Self::read_from_bytes(&value)?)
     }
 }
-impl From<AddressindexTxoutindex> for Slice {
+impl From<AddressindexTxoutindex> for ByteView {
     fn from(value: AddressindexTxoutindex) -> Self {
         Self::new(value.as_bytes())
     }
diff --git a/crates/brk_computer/src/structs/unit.rs b/crates/brk_computer/src/structs/unit.rs
index 05b8bb0b8..e9754fb93 100644
--- a/crates/brk_computer/src/structs/unit.rs
+++ b/crates/brk_computer/src/structs/unit.rs
@@ -1,12 +1,12 @@
-use fjall::Slice;
+use byteview::ByteView;
 
 pub struct Unit();
-impl From<Slice> for Unit {
-    fn from(_: Slice) -> Self {
+impl From<ByteView> for Unit {
+    fn from(_: ByteView) -> Self {
         Self()
     }
 }
-impl From<Unit> for Slice {
+impl From<Unit> for ByteView {
     fn from(_: Unit) -> Self {
         Self::new(&[])
     }
diff --git a/crates/brk_indexer/Cargo.toml b/crates/brk_indexer/Cargo.toml
index e6526f818..3bb4f35f4 100644
--- a/crates/brk_indexer/Cargo.toml
+++ b/crates/brk_indexer/Cargo.toml
@@ -9,6 +9,7 @@ license = { workspace = true }
 bitcoin = { workspace = true }
 brk_parser = { workspace = true }
 brk_logger = { workspace = true }
+byteview = { workspace = true }
 color-eyre = { workspace = true }
 derive_deref = { workspace = true }
 fjall = { workspace = true }
diff --git a/crates/brk_indexer/src/lib.rs b/crates/brk_indexer/src/lib.rs
index 4a3258135..ac7fab13a 100644
--- a/crates/brk_indexer/src/lib.rs
+++ b/crates/brk_indexer/src/lib.rs
@@ -47,7 +47,7 @@ impl<const MODE: u8> Indexer<MODE> {
 }
 
 impl Indexer<CACHED_GETS> {
-    pub fn index(&mut self, bitcoin_dir: &Path, rpc: &'static rpc::Client, exit: &Exit) -> color_eyre::Result<()> {
+    pub fn index(&mut self, parser: &Parser, rpc: &'static rpc::Client, exit: &Exit) -> color_eyre::Result<()> {
         info!("Started indexing...");
 
         let check_collisions = true;
@@ -80,8 +80,6 @@ impl Indexer<CACHED_GETS> {
 
         let mut idxs = starting_indexes;
 
-        let parser = Parser::new(bitcoin_dir, rpc);
-
         parser.parse(Some(idxs.height), None)
             .iter()
             .try_for_each(|(height, block, blockhash)| -> color_eyre::Result<()> {
diff --git a/crates/brk_indexer/src/main.rs b/crates/brk_indexer/src/main.rs
index 54b2b56f5..eb3d9d5a5 100644
--- a/crates/brk_indexer/src/main.rs
+++ b/crates/brk_indexer/src/main.rs
@@ -1,7 +1,10 @@
 use std::{path::Path, thread::sleep, time::Duration};
 
 use brk_indexer::{Indexer, rpc::RpcApi};
-use brk_parser::rpc::{self};
+use brk_parser::{
+    Parser,
+    rpc::{self},
+};
 use hodor::Exit;
 use log::info;
 use storable_vec::CACHED_GETS;
@@ -18,6 +21,8 @@ fn main() -> color_eyre::Result<()> {
     )?));
     let exit = Exit::new();
 
+    let parser = Parser::new(data_dir, rpc);
+
     loop {
         let block_count = rpc.get_blockchain_info().unwrap().blocks as usize;
 
@@ -27,7 +32,7 @@ fn main() -> color_eyre::Result<()> {
 
         let mut indexer: Indexer<CACHED_GETS> = Indexer::import(Path::new("../../_outputs/indexes"))?;
 
-        indexer.index(data_dir, rpc, &exit)?;
+        indexer.index(&parser, rpc, &exit)?;
 
         dbg!(i.elapsed());
 
diff --git a/crates/brk_indexer/src/storage/fjalls/base.rs b/crates/brk_indexer/src/storage/fjalls/base.rs
index 207a88853..6f9e1cafd 100644
--- a/crates/brk_indexer/src/storage/fjalls/base.rs
+++ b/crates/brk_indexer/src/storage/fjalls/base.rs
@@ -5,9 +5,9 @@ use std::{
 };
 
 use brk_parser::Height;
+use byteview::ByteView;
 use fjall::{
-    PartitionCreateOptions, PersistMode, ReadTransaction, Result, Slice, TransactionalKeyspace,
-    TransactionalPartitionHandle,
+    PartitionCreateOptions, PersistMode, ReadTransaction, Result, TransactionalKeyspace, TransactionalPartitionHandle,
 };
 use storable_vec::{Value, Version};
 use zerocopy::{Immutable, IntoBytes};
@@ -27,9 +27,9 @@ const CHECK_COLLISISONS: bool = true;
 
 impl<K, V> Store<K, V>
 where
-    K: Into<Slice> + Ord + Immutable + IntoBytes,
-    V: Into<Slice> + TryFrom<Slice>,
-    <V as TryFrom<Slice>>::Error: error::Error + Send + Sync + 'static,
+    K: Into<ByteView> + Ord + Immutable + IntoBytes,
+    V: Into<ByteView> + TryFrom<ByteView>,
+    <V as TryFrom<ByteView>>::Error: error::Error + Send + Sync + 'static,
 {
     pub fn import(path: &Path, version: Version) -> color_eyre::Result<Self> {
         let meta = StoreMeta::checked_open(path, version)?;
@@ -62,7 +62,7 @@ where
         if let Some(v) = self.puts.get(key) {
             Ok(Some(Value::Ref(v)))
         } else if let Some(slice) = self.rtx.get(&self.part, key.as_bytes())? {
-            Ok(Some(Value::Owned(V::try_from(slice)?)))
+            Ok(Some(Value::Owned(V::try_from(slice.into())?)))
         } else {
             Ok(None)
         }
@@ -97,7 +97,7 @@ where
 
         mem::take(&mut self.dels)
             .into_iter()
-            .for_each(|key| wtx.remove(&self.part, key));
+            .for_each(|key| wtx.remove(&self.part, key.into()));
 
         mem::take(&mut self.puts).into_iter().for_each(|(key, value)| {
             if CHECK_COLLISISONS {
@@ -106,7 +106,7 @@ where
                     unreachable!();
                 }
             }
-            wtx.insert(&self.part, key, value)
+            wtx.insert(&self.part, key.into(), value.into())
         });
 
         wtx.commit()?;
diff --git a/crates/brk_indexer/src/structs/addressindex.rs b/crates/brk_indexer/src/structs/addressindex.rs
index 02310ede8..c30d2ac4e 100644
--- a/crates/brk_indexer/src/structs/addressindex.rs
+++ b/crates/brk_indexer/src/structs/addressindex.rs
@@ -1,7 +1,7 @@
 use std::ops::Add;
 
+use byteview::ByteView;
 use derive_deref::{Deref, DerefMut};
-use fjall::Slice;
 use serde::Serialize;
 use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout};
 
@@ -68,13 +68,13 @@ impl From<Addressindex> for usize {
     }
 }
 
-impl TryFrom<Slice> for Addressindex {
+impl TryFrom<ByteView> for Addressindex {
     type Error = storable_vec::Error;
-    fn try_from(value: Slice) -> Result<Self, Self::Error> {
+    fn try_from(value: ByteView) -> Result<Self, Self::Error> {
         Ok(Self::read_from_bytes(&value)?)
     }
 }
-impl From<Addressindex> for Slice {
+impl From<Addressindex> for ByteView {
     fn from(value: Addressindex) -> Self {
         Self::new(value.as_bytes())
     }
diff --git a/crates/brk_indexer/src/structs/compressed.rs b/crates/brk_indexer/src/structs/compressed.rs
index fc482eba9..51a00f54d 100644
--- a/crates/brk_indexer/src/structs/compressed.rs
+++ b/crates/brk_indexer/src/structs/compressed.rs
@@ -1,7 +1,7 @@
 use std::hash::Hasher;
 
+use byteview::ByteView;
 use derive_deref::Deref;
-use fjall::Slice;
 use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout};
 
 use super::{Addressbytes, Addresstype, BlockHash, Txid};
@@ -22,18 +22,18 @@ impl From<[u8; 8]> for AddressHash {
         Self(value)
     }
 }
-impl TryFrom<Slice> for AddressHash {
+impl TryFrom<ByteView> for AddressHash {
     type Error = storable_vec::Error;
-    fn try_from(value: Slice) -> Result<Self, Self::Error> {
+    fn try_from(value: ByteView) -> Result<Self, Self::Error> {
         Ok(Self::read_from_bytes(&value)?)
     }
 }
-impl From<&AddressHash> for Slice {
+impl From<&AddressHash> for ByteView {
     fn from(value: &AddressHash) -> Self {
         Self::new(value.as_bytes())
     }
 }
-impl From<AddressHash> for Slice {
+impl From<AddressHash> for ByteView {
     fn from(value: AddressHash) -> Self {
         Self::from(&value)
     }
@@ -46,18 +46,18 @@ impl From<&BlockHash> for BlockHashPrefix {
         Self(copy_first_8bytes(&value[..]).unwrap())
     }
 }
-impl TryFrom<Slice> for BlockHashPrefix {
+impl TryFrom<ByteView> for BlockHashPrefix {
     type Error = storable_vec::Error;
-    fn try_from(value: Slice) -> Result<Self, Self::Error> {
+    fn try_from(value: ByteView) -> Result<Self, Self::Error> {
         Ok(Self::read_from_bytes(&value)?)
     }
 }
-impl From<&BlockHashPrefix> for Slice {
+impl From<&BlockHashPrefix> for ByteView {
     fn from(value: &BlockHashPrefix) -> Self {
         Self::new(value.as_bytes())
     }
 }
-impl From<BlockHashPrefix> for Slice {
+impl From<BlockHashPrefix> for ByteView {
     fn from(value: BlockHashPrefix) -> Self {
         Self::from(&value)
     }
@@ -70,18 +70,18 @@ impl From<&Txid> for TxidPrefix {
         Self(copy_first_8bytes(&value[..]).unwrap())
     }
 }
-impl TryFrom<Slice> for TxidPrefix {
+impl TryFrom<ByteView> for TxidPrefix {
     type Error = storable_vec::Error;
-    fn try_from(value: Slice) -> Result<Self, Self::Error> {
+    fn try_from(value: ByteView) -> Result<Self, Self::Error> {
         Ok(Self::read_from_bytes(&value)?)
     }
 }
-impl From<&TxidPrefix> for Slice {
+impl From<&TxidPrefix> for ByteView {
     fn from(value: &TxidPrefix) -> Self {
         Self::new(value.as_bytes())
     }
 }
-impl From<TxidPrefix> for Slice {
+impl From<TxidPrefix> for ByteView {
     fn from(value: TxidPrefix) -> Self {
         Self::from(&value)
     }
diff --git a/crates/brk_indexer/src/structs/txindex.rs b/crates/brk_indexer/src/structs/txindex.rs
index 82b466963..8ca6fba34 100644
--- a/crates/brk_indexer/src/structs/txindex.rs
+++ b/crates/brk_indexer/src/structs/txindex.rs
@@ -1,7 +1,7 @@
 use std::ops::{Add, AddAssign, Sub};
 
+use byteview::ByteView;
 use derive_deref::{Deref, DerefMut};
-use fjall::Slice;
 use serde::Serialize;
 use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout};
 
@@ -89,13 +89,13 @@ impl From<Txindex> for usize {
     }
 }
 
-impl TryFrom<Slice> for Txindex {
+impl TryFrom<ByteView> for Txindex {
     type Error = storable_vec::Error;
-    fn try_from(value: Slice) -> Result<Self, Self::Error> {
+    fn try_from(value: ByteView) -> Result<Self, Self::Error> {
         Ok(Self::read_from_bytes(&value)?)
     }
 }
-impl From<Txindex> for Slice {
+impl From<Txindex> for ByteView {
     fn from(value: Txindex) -> Self {
         Self::new(value.as_bytes())
     }
diff --git a/crates/brk_logger/Cargo.toml b/crates/brk_logger/Cargo.toml
index bbc78223a..fe45f370b 100644
--- a/crates/brk_logger/Cargo.toml
+++ b/crates/brk_logger/Cargo.toml
@@ -9,4 +9,3 @@ license = { workspace = true }
 color-eyre = { workspace = true }
 env_logger = "0.11.6"
 jiff = { workspace = true }
-log = { workspace = true }
diff --git a/crates/brk_logger/src/lib.rs b/crates/brk_logger/src/lib.rs
index 123503149..37540bb7e 100644
--- a/crates/brk_logger/src/lib.rs
+++ b/crates/brk_logger/src/lib.rs
@@ -8,7 +8,6 @@ use std::{
 use color_eyre::owo_colors::OwoColorize;
 use env_logger::{Builder, Env};
 use jiff::{Timestamp, tz};
-pub use log::{debug, error, info, trace, warn};
 
 #[inline(always)]
 pub fn init(path: Option<&Path>) {
diff --git a/crates/brk_logger/src/main.rs b/crates/brk_logger/src/main.rs
index 5414a6614..d2a6728ea 100644
--- a/crates/brk_logger/src/main.rs
+++ b/crates/brk_logger/src/main.rs
@@ -1,6 +1,3 @@
-use log::info;
-
 fn main() {
     brk_logger::init(None);
-    info!("test");
 }
diff --git a/crates/brk_parser/Cargo.toml b/crates/brk_parser/Cargo.toml
index fadde0dc1..e4f685927 100644
--- a/crates/brk_parser/Cargo.toml
+++ b/crates/brk_parser/Cargo.toml
@@ -8,16 +8,13 @@ version = { workspace = true }
 edition = { workspace = true }
 license = { workspace = true }
 
-[features]
-bytes = ["dep:fjall", "dep:zerocopy"]
-
 [dependencies]
 bitcoin = { workspace = true }
 bitcoincore-rpc = "0.19.0"
+byteview = { workspace = true }
 crossbeam = { version = "0.8.4", features = ["crossbeam-channel"] }
 derive_deref = { workspace = true }
-fjall = { workspace = true, optional = true }
 rayon = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
-zerocopy = { workspace = true, optional = true }
+zerocopy = { workspace = true }
diff --git a/crates/brk_parser/src/error.rs b/crates/brk_parser/src/error.rs
index 0f670f987..0a7562c65 100644
--- a/crates/brk_parser/src/error.rs
+++ b/crates/brk_parser/src/error.rs
@@ -17,7 +17,6 @@ impl From<io::Error> for Error {
     }
 }
 
-#[cfg(feature = "bytes")]
 impl<A, B> From<zerocopy::error::SizeError<A, B>> for Error {
     fn from(_: zerocopy::error::SizeError<A, B>) -> Self {
         Self::ZeroCopyError
diff --git a/crates/brk_parser/src/height.rs b/crates/brk_parser/src/height.rs
index 12071665e..c81c0bc3b 100644
--- a/crates/brk_parser/src/height.rs
+++ b/crates/brk_parser/src/height.rs
@@ -5,20 +5,34 @@ use std::{
 
 use derive_deref::{Deref, DerefMut};
 use serde::{Deserialize, Serialize};
-#[cfg(feature = "bytes")]
 use zerocopy::{FromBytes, Immutable, IntoBytes, KnownLayout};
 
 use crate::rpc::{self, RpcApi};
 
-#[derive(Debug, Clone, Copy, Deref, DerefMut, PartialEq, Eq, PartialOrd, Ord, Default, Serialize, Deserialize)]
-#[cfg_attr(feature = "bytes", derive(FromBytes, Immutable, IntoBytes, KnownLayout,))]
+#[derive(
+    Debug,
+    Clone,
+    Copy,
+    Deref,
+    DerefMut,
+    PartialEq,
+    Eq,
+    PartialOrd,
+    Ord,
+    Default,
+    Serialize,
+    Deserialize,
+    FromBytes,
+    Immutable,
+    IntoBytes,
+    KnownLayout,
+)]
 pub struct Height(u32);
 
 impl Height {
     pub const ZERO: Self = Height(0);
     pub const MAX: Self = Height(u32::MAX);
 
-    #[cfg(feature = "bytes")]
     pub fn write(&self, path: &std::path::Path) -> Result<(), std::io::Error> {
         std::fs::write(path, self.as_bytes())
     }
@@ -170,7 +184,6 @@ impl From<Height> for bitcoin::locktime::absolute::Height {
     }
 }
 
-#[cfg(feature = "bytes")]
 impl TryFrom<&std::path::Path> for Height {
     type Error = crate::Error;
     fn try_from(value: &std::path::Path) -> Result<Self, Self::Error> {
@@ -178,15 +191,14 @@ impl TryFrom<&std::path::Path> for Height {
     }
 }
 
-#[cfg(feature = "bytes")]
-impl TryFrom<fjall::Slice> for Height {
+impl TryFrom<byteview::ByteView> for Height {
     type Error = crate::Error;
-    fn try_from(value: fjall::Slice) -> Result<Self, Self::Error> {
+    fn try_from(value: byteview::ByteView) -> Result<Self, Self::Error> {
         Ok(Self::read_from_bytes(&value)?)
     }
 }
-#[cfg(feature = "bytes")]
-impl From<Height> for fjall::Slice {
+
+impl From<Height> for byteview::ByteView {
     fn from(value: Height) -> Self {
         Self::new(value.as_bytes())
     }
diff --git a/crates/storable_vec/Cargo.toml b/crates/storable_vec/Cargo.toml
index 9ce44172e..1b22c346b 100644
--- a/crates/storable_vec/Cargo.toml
+++ b/crates/storable_vec/Cargo.toml
@@ -8,7 +8,7 @@ edition = { workspace = true }
 license = { workspace = true }
 
 [features]
-json = ["dep:serde", "dep:serde_json"]
+json = ["serde", "serde_json"]
 
 [dependencies]
 memmap2 = "0.9.5"

From b09767c52666d30eddcf47d2f6bff325dfa1085a Mon Sep 17 00:00:00 2001
From: nym21 <expat-epochs0i@icloud.com>
Date: Mon, 24 Feb 2025 00:43:50 +0100
Subject: [PATCH 63/63] cargo: update descriptions

---
 crates/brk/Cargo.toml         | 1 +
 crates/brk_cli/Cargo.toml     | 2 +-
 crates/brk_fetcher/Cargo.toml | 2 +-
 crates/brk_indexer/Cargo.toml | 2 +-
 crates/brk_logger/Cargo.toml  | 2 +-
 crates/brk_parser/Cargo.toml  | 2 +-
 crates/brk_server/Cargo.toml  | 2 +-
 7 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/crates/brk/Cargo.toml b/crates/brk/Cargo.toml
index 9e83030cd..9dd70b5dc 100644
--- a/crates/brk/Cargo.toml
+++ b/crates/brk/Cargo.toml
@@ -1,5 +1,6 @@
 [package]
 name = "brk"
+description = "The Bitcoin Research Kit is a suite of tools designed to help you extract, explore and analyze the data stored from your node"
 license.workspace = true
 edition.workspace = true
 version.workspace = true
diff --git a/crates/brk_cli/Cargo.toml b/crates/brk_cli/Cargo.toml
index 640de0db8..f4ca6df65 100644
--- a/crates/brk_cli/Cargo.toml
+++ b/crates/brk_cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "brk_cli"
-description = "A command line interface to run berver"
+description = "A command line interface to interact with the Bitcoin Research Kit"
 version = { workspace = true }
 edition = { workspace = true }
 license = { workspace = true }
diff --git a/crates/brk_fetcher/Cargo.toml b/crates/brk_fetcher/Cargo.toml
index b060434f5..78349ea11 100644
--- a/crates/brk_fetcher/Cargo.toml
+++ b/crates/brk_fetcher/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "brk_fetcher"
-description = "A bitcoin price fetcher built on top of brk_indexer"
+description = "A Bitcoin price fetcher built on top of brk_indexer"
 version = { workspace = true }
 edition = { workspace = true }
 license = { workspace = true }
diff --git a/crates/brk_indexer/Cargo.toml b/crates/brk_indexer/Cargo.toml
index 3bb4f35f4..39fb037a5 100644
--- a/crates/brk_indexer/Cargo.toml
+++ b/crates/brk_indexer/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "brk_indexer"
-description = "A bitcoin-core indexer built on top of brk_parser"
+description = "A Bitcoin Core indexer built on top of brk_parser"
 version = { workspace = true }
 edition = { workspace = true }
 license = { workspace = true }
diff --git a/crates/brk_logger/Cargo.toml b/crates/brk_logger/Cargo.toml
index fe45f370b..d598f3fc2 100644
--- a/crates/brk_logger/Cargo.toml
+++ b/crates/brk_logger/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "brk_logger"
-description = "A clean logger"
+description = "A clean logger used in the Bitcoin Research Kit"
 version = { workspace = true }
 edition = { workspace = true }
 license = { workspace = true }
diff --git a/crates/brk_parser/Cargo.toml b/crates/brk_parser/Cargo.toml
index e4f685927..772740f35 100644
--- a/crates/brk_parser/Cargo.toml
+++ b/crates/brk_parser/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "brk_parser"
-description = "A very fast Bitcoin block iterator built on top of bitcoin-rust"
+description = "A very fast Bitcoin Core block parser and iterator built on top of bitcoin-rust"
 repository = "https://github.com/kibo-money/kibo/tree/main/src/crates/biter"
 keywords = ["bitcoin", "block", "iterator"]
 categories = ["cryptography::cryptocurrencies", "encoding"]
diff --git a/crates/brk_server/Cargo.toml b/crates/brk_server/Cargo.toml
index e3bca264d..6e1ffb612 100644
--- a/crates/brk_server/Cargo.toml
+++ b/crates/brk_server/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "brk_server"
-description = "A Bitcoin data server built on top of bindexer, bricer and bomputer"
+description = "A server that serves Bitcoin data and swappable front-ends, built on top of brk_indexer, brk_fetcher and brk_computer"
 version = { workspace = true }
 edition = { workspace = true }
 license = { workspace = true }