feat: Chain

src/bin/dolos/bootstrap/mithril.rs

@@ -252,7 +252,7 @@ pub fn run(config: &crate::Config, args: &Args, feedback: &Feedback) -> miette::
 
     import_hardano_into_wal(config, &immutable_path, feedback)?;
 
-    crate::doctor::run_rebuild_ledger(config, feedback).context("rebuilding ledger")?;
+    crate::doctor::run_rebuild(config, feedback).context("rebuilding ledger and chain")?;
 
     if !args.retain_snapshot {
         info!("deleting downloaded snapshot");

src/bin/dolos/common.rs

@@ -1,4 +1,4 @@
-use dolos::{ledger::pparams::Genesis, state, wal};
+use dolos::{chain, ledger::pparams::Genesis, state, wal};
 use miette::{Context as _, IntoDiagnostic};
 use std::{path::PathBuf, time::Duration};
 use tokio::task::JoinHandle;
@@ -10,7 +10,7 @@ use dolos::prelude::*;
 
 use crate::{GenesisConfig, LoggingConfig};
 
-pub type Stores = (wal::redb::WalStore, state::LedgerStore);
+pub type Stores = (wal::redb::WalStore, state::LedgerStore, chain::ChainStore);
 
 pub fn open_wal(config: &crate::Config) -> Result<wal::redb::WalStore, Error> {
     let root = &config.storage.path;
@@ -36,6 +36,15 @@ pub fn define_ledger_path(config: &crate::Config) -> Result<PathBuf, Error> {
     Ok(ledger)
 }
 
+pub fn define_chain_path(config: &crate::Config) -> Result<PathBuf, Error> {
+    let root = &config.storage.path;
+    std::fs::create_dir_all(root).map_err(Error::storage)?;
+
+    let ledger = root.join("chain");
+
+    Ok(ledger)
+}
+
 pub fn open_data_stores(config: &crate::Config) -> Result<Stores, Error> {
     let root = &config.storage.path;
 
@@ -52,7 +61,11 @@ pub fn open_data_stores(config: &crate::Config) -> Result<Stores, Error> {
         .map_err(Error::storage)?
         .into();
 
-    Ok((wal, ledger))
+    let chain = chain::redb::ChainStore::open(root.join("chain"), config.storage.chain_cache)
+        .map_err(Error::storage)?
+        .into();
+
+    Ok((wal, ledger, chain))
 }
 
 pub fn setup_tracing(config: &LoggingConfig) -> miette::Result<()> {

src/bin/dolos/daemon.rs

@@ -10,7 +10,7 @@ pub struct Args {}
 pub async fn run(config: super::Config, _args: &Args) -> miette::Result<()> {
     crate::common::setup_tracing(&config.logging)?;
 
-    let (wal, ledger) = crate::common::open_data_stores(&config)?;
+    let (wal, ledger, chain) = crate::common::open_data_stores(&config)?;
     let genesis = Arc::new(crate::common::open_genesis_files(&config.genesis)?);
     let mempool = dolos::mempool::Mempool::new(genesis.clone(), ledger.clone());
     let exit = crate::common::hook_exit_token();
@@ -21,6 +21,7 @@ pub async fn run(config: super::Config, _args: &Args) -> miette::Result<()> {
         &config.storage,
         wal.clone(),
         ledger.clone(),
+        chain.clone(),
         genesis.clone(),
         mempool.clone(),
         &config.retries,
@@ -40,6 +41,7 @@ pub async fn run(config: super::Config, _args: &Args) -> miette::Result<()> {
         genesis.clone(),
         wal.clone(),
         ledger.clone(),
+        chain.clone(),
         mempool.clone(),
         exit.clone(),
     ));

src/bin/dolos/data/copy_wal.rs

@@ -22,7 +22,7 @@ pub struct Args {
 pub fn run(config: &crate::Config, args: &Args) -> miette::Result<()> {
     crate::common::setup_tracing(&config.logging)?;
 
-    let (source, _) = crate::common::open_data_stores(config).context("opening data stores")?;
+    let source = crate::common::open_wal(config).context("opening data stores")?;
 
     let mut target = dolos::wal::redb::WalStore::open(&args.output, None, None)
         .into_diagnostic()

src/bin/dolos/data/dump_wal.rs

@@ -99,7 +99,7 @@ impl Formatter {
 pub fn run(config: &crate::Config, args: &Args) -> miette::Result<()> {
     crate::common::setup_tracing(&config.logging)?;
 
-    let (wal, _) = crate::common::open_data_stores(config).context("opening data stores")?;
+    let wal = crate::common::open_wal(config).context("opening data stores")?;
 
     let mut formatter = Formatter::new_table();
 

src/bin/dolos/data/export.rs

@@ -47,6 +47,25 @@ fn prepare_ledger(
     Ok(())
 }
 
+fn prepare_chain(
+    chain: dolos::chain::ChainStore,
+    pb: &crate::feedback::ProgressBar,
+) -> miette::Result<()> {
+    let mut chain = match chain {
+        dolos::chain::ChainStore::Redb(x) => x,
+        _ => miette::bail!("Only redb is supported for export"),
+    };
+
+    let db = chain.db_mut().unwrap();
+    pb.set_message("compacting ledger");
+    db.compact().into_diagnostic()?;
+
+    pb.set_message("checking ledger integrity");
+    db.check_integrity().into_diagnostic()?;
+
+    Ok(())
+}
+
 pub fn run(
     config: &crate::Config,
     args: &Args,
@@ -58,7 +77,7 @@ pub fn run(
     let encoder = GzEncoder::new(export_file, Compression::default());
     let mut archive = Builder::new(encoder);
 
-    let (wal, ledger) = crate::common::open_data_stores(config)?;
+    let (wal, ledger, chain) = crate::common::open_data_stores(config)?;
 
     prepare_wal(wal, &pb)?;
 
@@ -76,6 +95,14 @@ pub fn run(
         .append_path_with_name(&path, "ledger")
         .into_diagnostic()?;
 
+    prepare_chain(chain, &pb)?;
+
+    let path = config.storage.path.join("chain");
+
+    archive
+        .append_path_with_name(&path, "chain")
+        .into_diagnostic()?;
+
     pb.set_message("creating archive");
     archive.finish().into_diagnostic()?;
 

src/bin/dolos/data/prune_wal.rs

@@ -15,7 +15,7 @@ pub struct Args {
 pub fn run(config: &crate::Config, args: &Args) -> miette::Result<()> {
     crate::common::setup_tracing(&config.logging)?;
 
-    let (mut wal, _) = crate::common::open_data_stores(config).context("opening data stores")?;
+    let mut wal = crate::common::open_wal(config).context("opening data stores")?;
 
     let max_slots = match args.max_slots {
         Some(x) => x,

src/bin/dolos/data/summary.rs

@@ -40,7 +40,7 @@ pub struct Args {}
 pub fn run(config: &crate::Config, _args: &Args) -> miette::Result<()> {
     crate::common::setup_tracing(&config.logging)?;
 
-    let (wal, ledger) = crate::common::open_data_stores(config)?;
+    let (wal, ledger, _) = crate::common::open_data_stores(config)?;
 
     if let Some((seq, point)) = wal.crawl_from(None).unwrap().next() {
         println!("found WAL start");

src/bin/dolos/doctor/mod.rs

@@ -2,13 +2,13 @@ use clap::{Parser, Subcommand};
 
 use crate::feedback::Feedback;
 
-mod rebuild_ledger;
+mod rebuild;
 mod wal_integrity;
 
 #[derive(Debug, Subcommand)]
 pub enum Command {
-    /// rebuilds the whole ledger from chain data
-    RebuildLedger(rebuild_ledger::Args),
+    /// rebuilds ledger and chain from WAL
+    Rebuild(rebuild::Args),
     /// checks the integrity of the WAL records
     WalIntegrity(wal_integrity::Args),
 }
@@ -21,13 +21,13 @@ pub struct Args {
 
 pub fn run(config: &super::Config, args: &Args, feedback: &Feedback) -> miette::Result<()> {
     match &args.command {
-        Command::RebuildLedger(x) => rebuild_ledger::run(config, x, feedback)?,
+        Command::Rebuild(x) => rebuild::run(config, x, feedback)?,
         Command::WalIntegrity(x) => wal_integrity::run(config, x)?,
     }
 
     Ok(())
 }
 
-pub fn run_rebuild_ledger(config: &super::Config, feedback: &Feedback) -> miette::Result<()> {
-    rebuild_ledger::run(config, &rebuild_ledger::Args, feedback)
+pub fn run_rebuild(config: &super::Config, feedback: &Feedback) -> miette::Result<()> {
+    rebuild::run(config, &rebuild::Args, feedback)
 }

src/bin/dolos/doctor/rebuild_ledger.rs → src/bin/dolos/doctor/rebuild.rs

@@ -1,7 +1,4 @@
-use dolos::{
-    ledger,
-    wal::{self, RawBlock, ReadUtils, WalReader as _},
-};
+use dolos::wal::{self, RawBlock, ReadUtils, WalReader as _};
 use itertools::Itertools;
 use miette::{Context, IntoDiagnostic};
 use pallas::ledger::traverse::MultiEraBlock;
@@ -43,6 +40,11 @@ pub fn run(config: &crate::Config, _args: &Args, feedback: &Feedback) -> miette:
             .context("applying origin utxos")?;
     }
 
+    let chain_path = crate::common::define_chain_path(config).context("finding chain path")?;
+    let chain = dolos::chain::redb::ChainStore::open(chain_path, None)
+        .into_diagnostic()
+        .context("opening chain store.")?;
+
     let (_, tip) = wal
         .find_tip()
         .into_diagnostic()
@@ -54,24 +56,15 @@ pub fn run(config: &crate::Config, _args: &Args, feedback: &Feedback) -> miette:
         wal::ChainPoint::Specific(slot, _) => progress.set_length(slot),
     }
 
-    let wal_seq = light
-        .cursor()
-        .into_diagnostic()
-        .context("finding ledger cursor")?
-        .map(|ledger::ChainPoint(s, h)| wal.assert_point(&wal::ChainPoint::Specific(s, h)))
-        .transpose()
-        .into_diagnostic()
-        .context("locating wal sequence")?;
-
     let remaining = wal
-        .crawl_from(wal_seq)
+        .crawl_from(None)
         .into_diagnostic()
         .context("crawling wal")?
         .filter_forward()
         .into_blocks()
         .flatten();
 
-    for chunk in remaining.chunks(100).into_iter() {
+    for chunk in remaining.chunks(500).into_iter() {
         let bodies = chunk.map(|RawBlock { body, .. }| body).collect_vec();
 
         let blocks: Vec<_> = bodies
@@ -81,8 +74,17 @@ pub fn run(config: &crate::Config, _args: &Args, feedback: &Feedback) -> miette:
             .into_diagnostic()
             .context("decoding blocks")?;
 
-        dolos::state::apply_block_batch(
-            &blocks,
+        let deltas = dolos::state::calculate_block_batch_deltas(&blocks, &light)
+            .into_diagnostic()
+            .context("calculating batch deltas.")?;
+
+        chain
+            .apply(&deltas)
+            .into_diagnostic()
+            .context("applying deltas to chain")?;
+
+        dolos::state::apply_delta_batch(
+            deltas,
             &light,
             &genesis,
             config.storage.max_ledger_history,

src/bin/dolos/doctor/wal_integrity.rs

@@ -37,7 +37,7 @@ pub fn run(config: &crate::Config, _args: &Args) -> miette::Result<()> {
 
     let feedback = Feedback::default();
 
-    let (wal, _) = crate::common::open_data_stores(config).context("opening data stores")?;
+    let wal = crate::common::open_wal(config).context("opening data stores")?;
 
     let (_, tip) = wal
         .find_tip()

src/bin/dolos/eval.rs

@@ -28,7 +28,7 @@ pub struct Args {
 pub fn run(config: &super::Config, args: &Args) -> miette::Result<()> {
     crate::common::setup_tracing(&config.logging)?;
 
-    let (_, ledger) = crate::common::open_data_stores(config)?;
+    let (_, ledger, _) = crate::common::open_data_stores(config)?;
 
     let cbor = std::fs::read_to_string(&args.file)
         .into_diagnostic()

src/bin/dolos/serve.rs

@@ -10,12 +10,12 @@ pub struct Args {}
 pub async fn run(config: super::Config, _args: &Args) -> miette::Result<()> {
     crate::common::setup_tracing(&config.logging)?;
 
-    let (wal, ledger) = crate::common::open_data_stores(&config)?;
+    let (wal, ledger, chain) = crate::common::open_data_stores(&config)?;
     let genesis = Arc::new(crate::common::open_genesis_files(&config.genesis)?);
     let mempool = dolos::mempool::Mempool::new(genesis.clone(), ledger.clone());
     let exit = crate::common::hook_exit_token();
 
-    dolos::serve::serve(config.serve, genesis, wal, ledger, mempool, exit)
+    dolos::serve::serve(config.serve, genesis, wal, ledger, chain, mempool, exit)
         .await
         .context("serving clients")?;
 

src/bin/dolos/sync.rs

@@ -12,7 +12,7 @@ pub struct Args {
 pub fn run(config: &super::Config, args: &Args) -> miette::Result<()> {
     crate::common::setup_tracing(&config.logging)?;
 
-    let (wal, ledger) = crate::common::open_data_stores(config)?;
+    let (wal, ledger, chain) = crate::common::open_data_stores(config)?;
     let genesis = Arc::new(crate::common::open_genesis_files(&config.genesis)?);
     let mempool = dolos::mempool::Mempool::new(genesis.clone(), ledger.clone());
 
@@ -22,6 +22,7 @@ pub fn run(config: &super::Config, args: &Args) -> miette::Result<()> {
         &config.storage,
         wal,
         ledger,
+        chain,
         genesis,
         mempool,
         &config.retries,