diff --git a/Cargo.lock b/Cargo.lock
index 713c4b9cc..ebdfb9e8e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,2071 +1,2072 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
 version = 3
 
 [[package]]
 name = "abc-rust-error"
 version = "0.1.0"
 dependencies = [
  "abc-rust-lint",
  "eyre",
  "http",
  "stable-eyre",
  "thiserror",
 ]
 
 [[package]]
 name = "abc-rust-lint"
 version = "0.1.0"
 
 [[package]]
 name = "addr2line"
 version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b"
 dependencies = [
  "gimli",
 ]
 
 [[package]]
 name = "adler"
 version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
 [[package]]
 name = "aho-corasick"
 version = "0.7.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "ansi_term"
 version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
 dependencies = [
  "winapi",
 ]
 
 [[package]]
 name = "anyhow"
 version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800"
 
 [[package]]
 name = "async-trait"
 version = "0.1.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e805d94e6b5001b651426cf4cd446b1ab5f319d27bab5c644f61de0a804360c"
 dependencies = [
  "proc-macro2",
  "quote",
  "syn",
 ]
 
 [[package]]
 name = "atomic-polyfill"
 version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e14bf7b4f565e5e717d7a7a65b2a05c0b8c96e4db636d6f780f03b15108cdd1b"
 dependencies = [
  "critical-section",
 ]
 
 [[package]]
 name = "autocfg"
 version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "axum"
 version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "744864363a200a5e724a7e61bc8c11b6628cf2e3ec519c8a1a48e609a8156b40"
 dependencies = [
  "async-trait",
  "axum-core",
  "base64",
  "bitflags",
  "bytes",
  "futures-util",
  "http",
  "http-body",
  "hyper",
  "itoa",
  "matchit",
  "memchr",
  "mime",
  "percent-encoding",
  "pin-project-lite",
  "rustversion",
  "serde",
  "serde_json",
  "serde_path_to_error",
  "serde_urlencoded",
  "sha-1",
  "sync_wrapper",
  "tokio",
  "tokio-tungstenite",
  "tower",
  "tower-http",
  "tower-layer",
  "tower-service",
 ]
 
 [[package]]
 name = "axum-core"
 version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "79b8558f5a0581152dc94dcd289132a1d377494bdeafcd41869b3258e3e2ad92"
 dependencies = [
  "async-trait",
  "bytes",
  "futures-util",
  "http",
  "http-body",
  "mime",
  "rustversion",
  "tower-layer",
  "tower-service",
 ]
 
 [[package]]
 name = "backtrace"
 version = "0.3.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cab84319d616cfb654d03394f38ab7e6f0919e181b1b57e1fd15e7fb4077d9a7"
 dependencies = [
  "addr2line",
  "cc",
  "cfg-if",
  "libc",
  "miniz_oxide",
  "object",
  "rustc-demangle",
 ]
 
 [[package]]
 name = "bare-metal"
 version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5deb64efa5bd81e31fcd1938615a6d98c82eafcbcd787162b6f63b91d6bac5b3"
 dependencies = [
  "rustc_version 0.2.3",
 ]
 
 [[package]]
 name = "bare-metal"
 version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8fe8f5a8a398345e52358e18ff07cc17a568fbca5c6f73873d3a62056309603"
 
 [[package]]
 name = "base64"
 version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
 
 [[package]]
 name = "bindgen"
 version = "0.64.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c4243e6031260db77ede97ad86c27e501d646a27ab57b59a574f725d98ab1fb4"
 dependencies = [
  "bitflags",
  "cexpr",
  "clang-sys",
  "lazy_static",
  "lazycell",
  "peeking_take_while",
  "proc-macro2",
  "quote",
  "regex",
  "rustc-hash",
  "shlex",
  "syn",
 ]
 
 [[package]]
 name = "bit_field"
 version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dcb6dd1c2376d2e096796e234a70e17e94cc2d5d54ff8ce42b28cef1d0d359a4"
 
 [[package]]
 name = "bitcoinsuite-core"
 version = "0.1.0"
 dependencies = [
  "abc-rust-lint",
  "bytes",
  "hex",
  "hex-literal",
  "ripemd",
  "sha2",
  "thiserror",
 ]
 
 [[package]]
 name = "bitcoinsuite-slp"
 version = "0.1.0"
 dependencies = [
  "abc-rust-lint",
  "bitcoinsuite-core",
  "bytes",
  "hex",
  "pretty_assertions",
  "thiserror",
 ]
 
 [[package]]
 name = "bitfield"
 version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "46afbd2983a5d5a7bd740ccb198caf5b82f45c40c09c0eed36052d91cb92e719"
 
 [[package]]
 name = "bitflags"
 version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[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 = "byteorder"
 version = "1.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
 
 [[package]]
 name = "bytes"
 version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be"
 
 [[package]]
 name = "bzip2-sys"
 version = "0.1.11+1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc"
 dependencies = [
  "cc",
  "libc",
  "pkg-config",
 ]
 
 [[package]]
 name = "cc"
 version = "1.0.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11"
 dependencies = [
  "jobserver",
 ]
 
 [[package]]
 name = "cexpr"
 version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
 dependencies = [
  "nom",
 ]
 
 [[package]]
 name = "cfg-if"
 version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "chronik-bridge"
 version = "0.1.0"
 dependencies = [
  "abc-rust-lint",
  "bitcoinsuite-core",
  "cxx",
  "cxx-build",
 ]
 
 [[package]]
 name = "chronik-db"
 version = "0.1.0"
 dependencies = [
  "abc-rust-error",
  "abc-rust-lint",
  "bitcoinsuite-core",
  "fastrand",
  "hex",
  "postcard",
  "pretty_assertions",
  "rocksdb",
  "seahash",
  "serde",
  "tempdir",
  "thiserror",
 ]
 
 [[package]]
 name = "chronik-http"
 version = "0.1.0"
 dependencies = [
  "abc-rust-error",
  "abc-rust-lint",
  "async-trait",
  "axum",
  "bitcoinsuite-core",
  "chronik-db",
  "chronik-indexer",
  "chronik-proto",
  "chronik-util",
  "futures",
  "hex",
  "hyper",
  "prost",
  "thiserror",
  "tokio",
 ]
 
 [[package]]
 name = "chronik-indexer"
 version = "0.1.0"
 dependencies = [
  "abc-rust-error",
  "abc-rust-lint",
  "bitcoinsuite-core",
  "chronik-bridge",
  "chronik-db",
  "chronik-proto",
  "chronik-util",
+ "cxx",
  "pretty_assertions",
  "prost",
  "prost-build",
  "tempdir",
  "thiserror",
  "tokio",
 ]
 
 [[package]]
 name = "chronik-lib"
 version = "0.1.0"
 dependencies = [
  "abc-rust-error",
  "abc-rust-lint",
  "bitcoinsuite-core",
  "chronik-bridge",
  "chronik-db",
  "chronik-http",
  "chronik-indexer",
  "chronik-util",
  "cxx",
  "cxx-build",
  "thiserror",
  "tokio",
 ]
 
 [[package]]
 name = "chronik-proto"
 version = "0.1.0"
 dependencies = [
  "abc-rust-lint",
  "prost",
  "prost-build",
 ]
 
 [[package]]
 name = "chronik-util"
 version = "0.1.0"
 dependencies = [
  "abc-rust-lint",
  "chronik-bridge",
 ]
 
 [[package]]
 name = "clang-sys"
 version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "77ed9a53e5d4d9c573ae844bfac6872b159cb1d1585a83b29e7a64b7eef7332a"
 dependencies = [
  "glob",
  "libc",
  "libloading",
 ]
 
 [[package]]
 name = "cobs"
 version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "67ba02a97a2bd10f4b59b25c7973101c79642302776489e030cd13cdab09ed15"
 
 [[package]]
 name = "codespan-reporting"
 version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e"
 dependencies = [
  "termcolor",
  "unicode-width",
 ]
 
 [[package]]
 name = "cortex-m"
 version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cd20d4ac4aa86f4f75f239d59e542ef67de87cce2c282818dc6e84155d3ea126"
 dependencies = [
  "bare-metal 0.2.5",
  "bitfield",
  "embedded-hal",
  "volatile-register",
 ]
 
 [[package]]
 name = "cpufeatures"
 version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "280a9f2d8b3a38871a3c8a46fb80db65e5e5ed97da80c4d08bf27fb63e35e181"
 dependencies = [
  "libc",
 ]
 
 [[package]]
 name = "critical-section"
 version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "95da181745b56d4bd339530ec393508910c909c784e8962d15d722bacf0bcbcd"
 dependencies = [
  "bare-metal 1.0.0",
  "cfg-if",
  "cortex-m",
  "riscv",
 ]
 
 [[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.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f877be4f7c9f246b183111634f75baa039715e3f46ce860677d3b19a69fb229c"
 dependencies = [
  "quote",
  "syn",
 ]
 
 [[package]]
 name = "cxx"
 version = "1.0.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "873c2e83af70859af2aaecd1f5d862f3790b747b1f4f50fb45a931d000ac0422"
 dependencies = [
  "cc",
  "cxxbridge-flags",
  "cxxbridge-macro",
  "link-cplusplus",
 ]
 
 [[package]]
 name = "cxx-build"
 version = "1.0.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b49edea7163bbc7a39e3d829b4b0b66a9d30486973152842b7413f2c7b5632bf"
 dependencies = [
  "cc",
  "codespan-reporting",
  "once_cell",
  "proc-macro2",
  "quote",
  "scratch",
  "syn",
 ]
 
 [[package]]
 name = "cxxbridge-flags"
 version = "1.0.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f46b787c15af80277db5c88c6ac6c502ae545e622f010e06f95e540d34931acf"
 
 [[package]]
 name = "cxxbridge-macro"
 version = "1.0.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2ba3f3a7efa46626878fb5d324fabca4d19d2956b6ae97ce43044ef4515f5abc"
 dependencies = [
  "proc-macro2",
  "quote",
  "syn",
 ]
 
 [[package]]
 name = "diff"
 version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8"
 
 [[package]]
 name = "digest"
 version = "0.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f"
 dependencies = [
  "block-buffer",
  "crypto-common",
 ]
 
 [[package]]
 name = "either"
 version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
 
 [[package]]
 name = "embedded-hal"
 version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "35949884794ad573cf46071e41c9b60efb0cb311e3ca01f7af807af1debc66ff"
 dependencies = [
  "nb 0.1.3",
  "void",
 ]
 
 [[package]]
 name = "errno"
 version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1"
 dependencies = [
  "errno-dragonfly",
  "libc",
  "winapi",
 ]
 
 [[package]]
 name = "errno-dragonfly"
 version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
 dependencies = [
  "cc",
  "libc",
 ]
 
 [[package]]
 name = "eyre"
 version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4c2b6b5a29c02cdc822728b7d7b8ae1bab3e3b05d44522770ddd49722eeac7eb"
 dependencies = [
  "indenter",
  "once_cell",
 ]
 
 [[package]]
 name = "fastrand"
 version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be"
 dependencies = [
  "instant",
 ]
 
 [[package]]
 name = "fixedbitset"
 version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 
 [[package]]
 name = "fnv"
 version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
 [[package]]
 name = "form_urlencoded"
 version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8"
 dependencies = [
  "percent-encoding",
 ]
 
 [[package]]
 name = "fuchsia-cprng"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
 
 [[package]]
 name = "futures"
 version = "0.3.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0"
 dependencies = [
  "futures-channel",
  "futures-core",
  "futures-executor",
  "futures-io",
  "futures-sink",
  "futures-task",
  "futures-util",
 ]
 
 [[package]]
 name = "futures-channel"
 version = "0.3.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed"
 dependencies = [
  "futures-core",
  "futures-sink",
 ]
 
 [[package]]
 name = "futures-core"
 version = "0.3.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac"
 
 [[package]]
 name = "futures-executor"
 version = "0.3.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2"
 dependencies = [
  "futures-core",
  "futures-task",
  "futures-util",
 ]
 
 [[package]]
 name = "futures-io"
 version = "0.3.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb"
 
 [[package]]
 name = "futures-macro"
 version = "0.3.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d"
 dependencies = [
  "proc-macro2",
  "quote",
  "syn",
 ]
 
 [[package]]
 name = "futures-sink"
 version = "0.3.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9"
 
 [[package]]
 name = "futures-task"
 version = "0.3.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea"
 
 [[package]]
 name = "futures-util"
 version = "0.3.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6"
 dependencies = [
  "futures-channel",
  "futures-core",
  "futures-io",
  "futures-macro",
  "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.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4"
 dependencies = [
  "cfg-if",
  "libc",
  "wasi",
 ]
 
 [[package]]
 name = "gimli"
 version = "0.26.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d"
 
 [[package]]
 name = "glob"
 version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
 
 [[package]]
 name = "hash32"
 version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67"
 dependencies = [
  "byteorder",
 ]
 
 [[package]]
 name = "hashbrown"
 version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 
 [[package]]
 name = "heapless"
 version = "0.7.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9f6733da246dc2af610133c8be0667170fd68e8ca5630936b520300eee8846f9"
 dependencies = [
  "atomic-polyfill",
  "hash32",
  "rustc_version 0.4.0",
  "serde",
  "spin",
  "stable_deref_trait",
 ]
 
 [[package]]
 name = "heck"
 version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
 
 [[package]]
 name = "hermit-abi"
 version = "0.1.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
 dependencies = [
  "libc",
 ]
 
 [[package]]
 name = "hex"
 version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "hex-literal"
 version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
 
 [[package]]
 name = "http"
 version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399"
 dependencies = [
  "bytes",
  "fnv",
  "itoa",
 ]
 
 [[package]]
 name = "http-body"
 version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1"
 dependencies = [
  "bytes",
  "http",
  "pin-project-lite",
 ]
 
 [[package]]
 name = "http-range-header"
 version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0bfe8eed0a9285ef776bb792479ea3834e8b94e13d615c2f66d03dd50a435a29"
 
 [[package]]
 name = "httparse"
 version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
 
 [[package]]
 name = "httpdate"
 version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421"
 
 [[package]]
 name = "hyper"
 version = "0.14.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "034711faac9d2166cb1baf1a2fb0b60b1f277f8492fd72176c17f3515e1abd3c"
 dependencies = [
  "bytes",
  "futures-channel",
  "futures-core",
  "futures-util",
  "http",
  "http-body",
  "httparse",
  "httpdate",
  "itoa",
  "pin-project-lite",
  "socket2",
  "tokio",
  "tower-service",
  "tracing",
  "want",
 ]
 
 [[package]]
 name = "idna"
 version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6"
 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 = "1.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
 dependencies = [
  "autocfg",
  "hashbrown",
 ]
 
 [[package]]
 name = "instant"
 version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
 dependencies = [
  "cfg-if",
 ]
 
 [[package]]
 name = "io-lifetimes"
 version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e7d6c6f8c91b4b9ed43484ad1a938e393caf35960fce7f82a040497207bd8e9e"
 dependencies = [
  "libc",
  "windows-sys",
 ]
 
 [[package]]
 name = "itertools"
 version = "0.10.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
 dependencies = [
  "either",
 ]
 
 [[package]]
 name = "itoa"
 version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc"
 
 [[package]]
 name = "jobserver"
 version = "0.1.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2"
 dependencies = [
  "libc",
 ]
 
 [[package]]
 name = "lazy_static"
 version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "lazycell"
 version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
 
 [[package]]
 name = "libc"
 version = "0.2.139"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79"
 
 [[package]]
 name = "libloading"
 version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f"
 dependencies = [
  "cfg-if",
  "winapi",
 ]
 
 [[package]]
 name = "librocksdb-sys"
 version = "0.10.0+7.9.2"
 source = "git+https://github.com/rust-rocksdb/rust-rocksdb.git?rev=a6103ef#a6103ef311c96e14ee19b36832a373a0954f946b"
 dependencies = [
  "bindgen",
  "bzip2-sys",
  "cc",
  "glob",
  "libc",
  "libz-sys",
 ]
 
 [[package]]
 name = "libz-sys"
 version = "1.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9702761c3935f8cc2f101793272e202c72b99da8f4224a19ddcf1279a6450bbf"
 dependencies = [
  "cc",
  "pkg-config",
  "vcpkg",
 ]
 
 [[package]]
 name = "link-cplusplus"
 version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8cae2cd7ba2f3f63938b9c724475dfb7b9861b545a90324476324ed21dbc8c8"
 dependencies = [
  "cc",
 ]
 
 [[package]]
 name = "linux-raw-sys"
 version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4"
 
 [[package]]
 name = "lock_api"
 version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53"
 dependencies = [
  "autocfg",
  "scopeguard",
 ]
 
 [[package]]
 name = "log"
 version = "0.4.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
 dependencies = [
  "cfg-if",
 ]
 
 [[package]]
 name = "matchit"
 version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3dfc802da7b1cf80aefffa0c7b2f77247c8b32206cc83c270b61264f5b360a80"
 
 [[package]]
 name = "memchr"
 version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
 
 [[package]]
 name = "mime"
 version = "0.3.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d"
 
 [[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.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6f5c75688da582b8ffc1f1799e9db273f32133c49e048f614d22ec3256773ccc"
 dependencies = [
  "adler",
 ]
 
 [[package]]
 name = "mio"
 version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de"
 dependencies = [
  "libc",
  "log",
  "wasi",
  "windows-sys",
 ]
 
 [[package]]
 name = "multimap"
 version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a"
 
 [[package]]
 name = "nb"
 version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "801d31da0513b6ec5214e9bf433a77966320625a37860f910be265be6e18d06f"
 dependencies = [
  "nb 1.0.0",
 ]
 
 [[package]]
 name = "nb"
 version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "546c37ac5d9e56f55e73b677106873d9d9f5190605e41a856503623648488cae"
 
 [[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 = "num_cpus"
 version = "1.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5"
 dependencies = [
  "hermit-abi",
  "libc",
 ]
 
 [[package]]
 name = "object"
 version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "once_cell"
 version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1"
 
 [[package]]
 name = "output_vt100"
 version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "628223faebab4e3e40667ee0b2336d34a5b960ff60ea743ddfdbcf7770bcfb66"
 dependencies = [
  "winapi",
 ]
 
 [[package]]
 name = "peeking_take_while"
 version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
 
 [[package]]
 name = "percent-encoding"
 version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
 
 [[package]]
 name = "petgraph"
 version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4"
 dependencies = [
  "fixedbitset",
  "indexmap",
 ]
 
 [[package]]
 name = "pin-project"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc"
 dependencies = [
  "pin-project-internal",
 ]
 
 [[package]]
 name = "pin-project-internal"
 version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55"
 dependencies = [
  "proc-macro2",
  "quote",
  "syn",
 ]
 
 [[package]]
 name = "pin-project-lite"
 version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
 
 [[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.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160"
 
 [[package]]
 name = "postcard"
 version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "41f5465c5e5a38e04552d8fb53ebcf4f58124ab3bbd0c02add043b33f82792e5"
 dependencies = [
  "cobs",
  "heapless",
  "serde",
 ]
 
 [[package]]
 name = "ppv-lite86"
 version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
 
 [[package]]
 name = "pretty_assertions"
 version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c89f989ac94207d048d92db058e4f6ec7342b0971fc58d1271ca148b799b3563"
 dependencies = [
  "ansi_term",
  "ctor",
  "diff",
  "output_vt100",
 ]
 
 [[package]]
 name = "prettyplease"
 version = "0.1.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86"
 dependencies = [
  "proc-macro2",
  "syn",
 ]
 
 [[package]]
 name = "proc-macro2"
 version = "1.0.51"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "prost"
 version = "0.11.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e48e50df39172a3e7eb17e14642445da64996989bc212b583015435d39a58537"
 dependencies = [
  "bytes",
  "prost-derive",
 ]
 
 [[package]]
 name = "prost-build"
 version = "0.11.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2c828f93f5ca4826f97fedcbd3f9a536c16b12cff3dbbb4a007f932bbad95b12"
 dependencies = [
  "bytes",
  "heck",
  "itertools",
  "lazy_static",
  "log",
  "multimap",
  "petgraph",
  "prettyplease",
  "prost",
  "prost-types",
  "regex",
  "syn",
  "tempfile",
  "which",
 ]
 
 [[package]]
 name = "prost-derive"
 version = "0.11.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4ea9b0f8cbe5e15a8a042d030bd96668db28ecb567ec37d691971ff5731d2b1b"
 dependencies = [
  "anyhow",
  "itertools",
  "proc-macro2",
  "quote",
  "syn",
 ]
 
 [[package]]
 name = "prost-types"
 version = "0.11.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "379119666929a1afd7a043aa6cf96fa67a6dce9af60c88095a4686dbce4c9c88"
 dependencies = [
  "prost",
 ]
 
 [[package]]
 name = "quote"
 version = "1.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804"
 dependencies = [
  "proc-macro2",
 ]
 
 [[package]]
 name = "rand"
 version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293"
 dependencies = [
  "fuchsia-cprng",
  "libc",
  "rand_core 0.3.1",
  "rdrand",
  "winapi",
 ]
 
 [[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 0.6.4",
 ]
 
 [[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 0.6.4",
 ]
 
 [[package]]
 name = "rand_core"
 version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
 dependencies = [
  "rand_core 0.4.2",
 ]
 
 [[package]]
 name = "rand_core"
 version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
 
 [[package]]
 name = "rand_core"
 version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
  "getrandom",
 ]
 
 [[package]]
 name = "rdrand"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
 dependencies = [
  "rand_core 0.3.1",
 ]
 
 [[package]]
 name = "redox_syscall"
 version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
 dependencies = [
  "bitflags",
 ]
 
 [[package]]
 name = "regex"
 version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b"
 dependencies = [
  "aho-corasick",
  "memchr",
  "regex-syntax",
 ]
 
 [[package]]
 name = "regex-syntax"
 version = "0.6.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244"
 
 [[package]]
 name = "remove_dir_all"
 version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
 dependencies = [
  "winapi",
 ]
 
 [[package]]
 name = "ripemd"
 version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bd124222d17ad93a644ed9d011a40f4fb64aa54275c08cc216524a9ea82fb09f"
 dependencies = [
  "digest",
 ]
 
 [[package]]
 name = "riscv"
 version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6907ccdd7a31012b70faf2af85cd9e5ba97657cc3987c4f13f8e4d2c2a088aba"
 dependencies = [
  "bare-metal 1.0.0",
  "bit_field",
  "riscv-target",
 ]
 
 [[package]]
 name = "riscv-target"
 version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "88aa938cda42a0cf62a20cfe8d139ff1af20c2e681212b5b34adb5a58333f222"
 dependencies = [
  "lazy_static",
  "regex",
 ]
 
 [[package]]
 name = "rocksdb"
 version = "0.20.1"
 source = "git+https://github.com/rust-rocksdb/rust-rocksdb.git?rev=a6103ef#a6103ef311c96e14ee19b36832a373a0954f946b"
 dependencies = [
  "libc",
  "librocksdb-sys",
 ]
 
 [[package]]
 name = "rustc-demangle"
 version = "0.1.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342"
 
 [[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 = "rustc_version"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
 dependencies = [
  "semver 1.0.12",
 ]
 
 [[package]]
 name = "rustix"
 version = "0.36.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d4fdebc4b395b7fbb9ab11e462e20ed9051e7b16e42d24042c776eca0ac81b03"
 dependencies = [
  "bitflags",
  "errno",
  "io-lifetimes",
  "libc",
  "linux-raw-sys",
  "windows-sys",
 ]
 
 [[package]]
 name = "rustversion"
 version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8"
 
 [[package]]
 name = "ryu"
 version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09"
 
 [[package]]
 name = "scopeguard"
 version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
 
 [[package]]
 name = "scratch"
 version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898"
 
 [[package]]
 name = "seahash"
 version = "4.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b"
 
 [[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.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a2333e6df6d6598f2b1974829f853c2b4c5f4a6e503c10af918081aa6f8564e1"
 
 [[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.140"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc855a42c7967b7c369eb5860f7164ef1f6f81c20c7cc1141f2a604e18723b03"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
 version = "1.0.140"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6f2122636b9fe3b81f1cb25099fcf2d3f542cdb1d45940d56c713158884a05da"
 dependencies = [
  "proc-macro2",
  "quote",
  "syn",
 ]
 
 [[package]]
 name = "serde_json"
 version = "1.0.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "020ff22c755c2ed3f8cf162dbb41a7268d934702f3ed3631656ea597e08fc3db"
 dependencies = [
  "itoa",
  "ryu",
  "serde",
 ]
 
 [[package]]
 name = "serde_path_to_error"
 version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "184c643044780f7ceb59104cef98a5a6f12cb2288a7bc701ab93a362b49fd47d"
 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 = "sha-1"
 version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c"
 dependencies = [
  "cfg-if",
  "cpufeatures",
  "digest",
 ]
 
 [[package]]
 name = "sha2"
 version = "0.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0"
 dependencies = [
  "cfg-if",
  "cpufeatures",
  "digest",
 ]
 
 [[package]]
 name = "shlex"
 version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3"
 
 [[package]]
 name = "slab"
 version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "socket2"
 version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd"
 dependencies = [
  "libc",
  "winapi",
 ]
 
 [[package]]
 name = "spin"
 version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f6002a767bff9e83f8eeecf883ecb8011875a21ae8da43bffb817a57e78cc09"
 dependencies = [
  "lock_api",
 ]
 
 [[package]]
 name = "stable-eyre"
 version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "556fec8c2da34c70b75f16d88df8a8cd7e652e567ff097b7e9df0022c8695cc4"
 dependencies = [
  "backtrace",
  "eyre",
  "indenter",
 ]
 
 [[package]]
 name = "stable_deref_trait"
 version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
 
 [[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 = "sync_wrapper"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "20518fe4a4c9acf048008599e464deb21beeae3d3578418951a189c235a7a9a8"
 
 [[package]]
 name = "tempdir"
 version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8"
 dependencies = [
  "rand 0.4.6",
  "remove_dir_all",
 ]
 
 [[package]]
 name = "tempfile"
 version = "3.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "af18f7ae1acd354b992402e9ec5864359d693cd8a79dcbef59f76891701c1e95"
 dependencies = [
  "cfg-if",
  "fastrand",
  "redox_syscall",
  "rustix",
  "windows-sys",
 ]
 
 [[package]]
 name = "termcolor"
 version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755"
 dependencies = [
  "winapi-util",
 ]
 
 [[package]]
 name = "thiserror"
 version = "1.0.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bd829fe32373d27f76265620b5309d0340cb8550f523c1dda251d6298069069a"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
 version = "1.0.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a"
 dependencies = [
  "proc-macro2",
  "quote",
  "syn",
 ]
 
 [[package]]
 name = "tinyvec"
 version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
 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.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c8e00990ebabbe4c14c08aca901caed183ecd5c09562a12c824bb53d3c3fd3af"
 dependencies = [
  "autocfg",
  "bytes",
  "libc",
  "memchr",
  "mio",
  "num_cpus",
  "pin-project-lite",
  "socket2",
  "tokio-macros",
  "windows-sys",
 ]
 
 [[package]]
 name = "tokio-macros"
 version = "1.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8"
 dependencies = [
  "proc-macro2",
  "quote",
  "syn",
 ]
 
 [[package]]
 name = "tokio-tungstenite"
 version = "0.17.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f714dd15bead90401d77e04243611caec13726c2408afd5b31901dfcdcb3b181"
 dependencies = [
  "futures-util",
  "log",
  "tokio",
  "tungstenite",
 ]
 
 [[package]]
 name = "tower"
 version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
 dependencies = [
  "futures-core",
  "futures-util",
  "pin-project",
  "pin-project-lite",
  "tokio",
  "tower-layer",
  "tower-service",
  "tracing",
 ]
 
 [[package]]
 name = "tower-http"
 version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3c530c8675c1dbf98facee631536fa116b5fb6382d7dd6dc1b118d970eafe3ba"
 dependencies = [
  "bitflags",
  "bytes",
  "futures-core",
  "futures-util",
  "http",
  "http-body",
  "http-range-header",
  "pin-project-lite",
  "tower",
  "tower-layer",
  "tower-service",
 ]
 
 [[package]]
 name = "tower-layer"
 version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0"
 
 [[package]]
 name = "tower-service"
 version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
 
 [[package]]
 name = "tracing"
 version = "0.1.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
 dependencies = [
  "cfg-if",
  "log",
  "pin-project-lite",
  "tracing-core",
 ]
 
 [[package]]
 name = "tracing-core"
 version = "0.1.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a"
 dependencies = [
  "once_cell",
 ]
 
 [[package]]
 name = "try-lock"
 version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
 
 [[package]]
 name = "tungstenite"
 version = "0.17.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e27992fd6a8c29ee7eef28fc78349aa244134e10ad447ce3b9f0ac0ed0fa4ce0"
 dependencies = [
  "base64",
  "byteorder",
  "bytes",
  "http",
  "httparse",
  "log",
  "rand 0.8.5",
  "sha-1",
  "thiserror",
  "url",
  "utf-8",
 ]
 
 [[package]]
 name = "typenum"
 version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
 
 [[package]]
 name = "unicode-bidi"
 version = "0.3.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
 
 [[package]]
 name = "unicode-ident"
 version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "15c61ba63f9235225a22310255a29b806b907c9b8c964bcbd0a2c70f3f2deea7"
 
 [[package]]
 name = "unicode-normalization"
 version = "0.1.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
 dependencies = [
  "tinyvec",
 ]
 
 [[package]]
 name = "unicode-width"
 version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973"
 
 [[package]]
 name = "url"
 version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643"
 dependencies = [
  "form_urlencoded",
  "idna",
  "percent-encoding",
 ]
 
 [[package]]
 name = "utf-8"
 version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
 
 [[package]]
 name = "vcell"
 version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "77439c1b53d2303b20d9459b1ade71a83c716e3f9c34f3228c00e6f185d6c002"
 
 [[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.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "void"
 version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
 
 [[package]]
 name = "volatile-register"
 version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9ee8f19f9d74293faf70901bc20ad067dc1ad390d2cbf1e3f75f721ffee908b6"
 dependencies = [
  "vcell",
 ]
 
 [[package]]
 name = "want"
 version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0"
 dependencies = [
  "log",
  "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 = "which"
 version = "4.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269"
 dependencies = [
  "either",
  "libc",
  "once_cell",
 ]
 
 [[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-util"
 version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
 dependencies = [
  "winapi",
 ]
 
 [[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.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
 dependencies = [
  "windows_aarch64_gnullvm",
  "windows_aarch64_msvc",
  "windows_i686_gnu",
  "windows_i686_msvc",
  "windows_x86_64_gnu",
  "windows_x86_64_gnullvm",
  "windows_x86_64_msvc",
 ]
 
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e"
 
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4"
 
 [[package]]
 name = "windows_i686_gnu"
 version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7"
 
 [[package]]
 name = "windows_i686_msvc"
 version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246"
 
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028"
 
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5"
diff --git a/chronik/chronik-bridge/src/ffi.rs b/chronik/chronik-bridge/src/ffi.rs
index 15648115c..86284df9b 100644
--- a/chronik/chronik-bridge/src/ffi.rs
+++ b/chronik/chronik-bridge/src/ffi.rs
@@ -1,260 +1,276 @@
 // Copyright (c) 2022 The Bitcoin developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 //! Module containing the cxx definitions for the bridge from C++ to Rust.
 
 pub use self::ffi_inner::*;
 
 #[allow(unsafe_code)]
 #[cxx::bridge(namespace = "chronik_bridge")]
 mod ffi_inner {
     /// Info about a block
     #[derive(Clone, Debug, Default, Eq, PartialEq)]
     pub struct BlockInfo {
         /// Hash of the block (or 000...000 if no block)
         pub hash: [u8; 32],
 
         /// Height of the block (or -1 if no block)
         pub height: i32,
     }
 
     /// Block coming from bitcoind to Chronik.
     ///
     /// We don't index all fields (e.g. hashMerkleRoot), only those that are
     /// needed when querying a range of blocks.
     ///
     /// Instead of storing all the block data for Chronik again, we only store
     /// file_num, data_pos and undo_pos of the block data of the node.
     ///
     /// This makes the index relatively small, as it's mostly just pointing to
     /// the data the node already stores.
     ///
     /// Note that this prohibits us from using Chronik in pruned mode.
     #[derive(Clone, Debug, Default, Eq, PartialEq)]
     pub struct Block {
         /// Block hash
         pub hash: [u8; 32],
         /// hashPrevBlock, hash of the previous block in the chain
         pub prev_hash: [u8; 32],
         /// nBits, difficulty of the header
         pub n_bits: u32,
         /// Timestamp of the block
         pub timestamp: i64,
         /// Height of the block in the chain.
         pub height: i32,
         /// File number of the block file this block is stored in.
         /// This can be used to later slice out transactions, so we don't have
         /// to index txs twice.
         pub file_num: u32,
         /// Position of the block within the block file, starting at the block
         /// header.
         pub data_pos: u32,
         /// Position of the undo data within the undo file.
         pub undo_pos: u32,
         /// Serialized size of the block
         pub size: u64,
         /// Txs of this block, including positions within the block/undo files.
         pub txs: Vec<BlockTx>,
     }
 
     /// Tx in a block
     #[derive(Clone, Debug, Default, Eq, PartialEq)]
     pub struct BlockTx {
         /// Tx (without disk data)
         pub tx: Tx,
         /// Where the tx is stored within the block file.
         pub data_pos: u32,
         /// Where the tx's undo data is stored within the block's undo file.
         pub undo_pos: u32,
     }
 
     /// CTransaction, in a block or in the mempool.
     #[derive(Clone, Debug, Default, Eq, PartialEq)]
     pub struct Tx {
         /// TxId of the tx.
         pub txid: [u8; 32],
         /// nVersion of the tx.
         pub version: i32,
         /// Tx inputs.
         pub inputs: Vec<TxInput>,
         /// Tx outputs.
         pub outputs: Vec<TxOutput>,
         /// Locktime of the tx.
         pub locktime: u32,
     }
 
     /// COutPoint, pointing to a coin being spent.
     #[derive(Clone, Debug, Default, Eq, PartialEq)]
     pub struct OutPoint {
         /// TxId of the output of the coin.
         pub txid: [u8; 32],
         /// Index in the outputs of the tx of the coin.
         pub out_idx: u32,
     }
 
     /// CTxIn, spending an unspent output.
     #[derive(Clone, Debug, Default, Eq, PartialEq)]
     pub struct TxInput {
         /// Points to an output being spent.
         pub prev_out: OutPoint,
         /// scriptSig unlocking the output.
         pub script: Vec<u8>,
         /// nSequence.
         pub sequence: u32,
         /// Coin being spent by this tx.
         pub coin: Coin,
     }
 
     /// CTxOut, creating a new output.
     #[derive(Clone, Debug, Default, Eq, PartialEq)]
     pub struct TxOutput {
         /// Value of the output.
         pub value: i64,
         /// Script locking the output.
         pub script: Vec<u8>,
     }
 
     /// Coin, can be spent by providing a valid unlocking script.
     #[derive(Clone, Debug, Default, Eq, PartialEq)]
     pub struct Coin {
         /// Output, locking the coins.
         pub output: TxOutput,
         /// Height of the coin in the chain.
         pub height: i32,
         /// Whether the coin is a coinbase.
         pub is_coinbase: bool,
     }
 
     #[allow(missing_debug_implementations)]
     unsafe extern "C++" {
         include!("blockindex.h");
         include!("chronik-cpp/chronik_bridge.h");
         include!("node/context.h");
         include!("primitives/block.h");
         include!("primitives/transaction.h");
 
         /// node::NodeContext from node/context.h
         #[namespace = "node"]
         type NodeContext;
 
         /// ::CBlockIndex from blockindex.h
         #[namespace = ""]
         type CBlockIndex;
 
         /// ::CBlock from primitives/block.h
         #[namespace = ""]
         type CBlock;
 
         /// ::Config from config.h
         #[namespace = ""]
         type Config;
 
         /// ::CTransaction from primitives/transaction.h
         #[namespace = ""]
         type CTransaction;
 
         /// Bridge to bitcoind to access the node
         type ChronikBridge;
 
         /// Print the message to bitcoind's logs.
         fn log_print(
             logging_function: &str,
             source_file: &str,
             source_line: u32,
             msg: &str,
         );
 
         /// Print the message to bitcoind's logs under the BCLog::Chronik
         /// category.
         fn log_print_chronik(
             logging_function: &str,
             source_file: &str,
             source_line: u32,
             msg: &str,
         );
 
         /// Make the bridge given the NodeContext
         fn make_bridge(
             config: &Config,
             node: &NodeContext,
         ) -> UniquePtr<ChronikBridge>;
 
         /// Return the tip of the chain of the node.
         /// Returns hash=000...000, height=-1 if there's no block on the chain.
         fn get_chain_tip(self: &ChronikBridge) -> Result<&CBlockIndex>;
 
         /// Lookup the block index with the given hash, or throw an error
         /// if it couldn't be found.
         fn lookup_block_index(
             self: &ChronikBridge,
             hash: [u8; 32],
         ) -> Result<&CBlockIndex>;
 
         /// Load the CBlock data of this CBlockIndex from the disk
         fn load_block(
             self: &ChronikBridge,
             block_index: &CBlockIndex,
         ) -> Result<UniquePtr<CBlock>>;
 
         /// Bridge CTransaction -> ffi::Tx, including finding the spent coins.
         /// `tx` can be a mempool tx.
         fn bridge_tx(self: &ChronikBridge, tx: &CTransaction) -> Result<Tx>;
 
         /// Find at which block the given block_index forks off from the node.
         fn find_fork(
             self: &ChronikBridge,
             block_index: &CBlockIndex,
         ) -> Result<&CBlockIndex>;
 
         /// Add the given tx to the mempool, and if that succeeds, broadcast it
         /// to all our peers.
         /// Also check the actual tx fee doesn't exceed max_fee.
         /// Note max_fee is absolute, not a fee rate (as in sendrawtransaction).
         fn broadcast_tx(
             self: &ChronikBridge,
             raw_tx: &[u8],
             max_fee: i64,
         ) -> Result<[u8; 32]>;
 
         /// Bridge bitcoind's classes to the shared struct [`Block`].
         fn bridge_block(
             block: &CBlock,
             block_index: &CBlockIndex,
         ) -> Result<Block>;
 
         /// Load the CTransaction and CTxUndo data from disk and turn it into a
         /// bridged Tx, containing spent coins etc.
         fn load_tx(file_num: u32, data_pos: u32, undo_pos: u32) -> Result<Tx>;
 
         /// Load the CTransaction from disk and serialize it.
         fn load_raw_tx(file_num: u32, data_pos: u32) -> Result<Vec<u8>>;
 
         /// Get a BlockInfo for this CBlockIndex.
         fn get_block_info(block_index: &CBlockIndex) -> BlockInfo;
 
         /// CBlockIndex::GetAncestor
         fn get_block_ancestor(
             block_index: &CBlockIndex,
             height: i32,
         ) -> Result<&CBlockIndex>;
 
         /// Compress the given script using `ScriptCompression`.
         fn compress_script(script: &[u8]) -> Vec<u8>;
 
         /// Decompress the given script using `ScriptCompression`.
         fn decompress_script(compressed: &[u8]) -> Result<Vec<u8>>;
 
         /// Calls `InitError` from `node/ui_interface.h` to report an error to
         /// the user and then gracefully shut down the node.
         fn init_error(msg: &str) -> bool;
 
         /// Calls `AbortNode` from shutdown.h to gracefully shut down the node
         /// when an unrecoverable error occured.
         fn abort_node(msg: &str, user_msg: &str);
 
         /// Returns true if a shutdown is requested, false otherwise.
         /// See `ShutdownRequested` in `shutdown.h`.
         fn shutdown_requested() -> bool;
     }
 }
+
+/// SAFETY: All fields of ChronikBridge (const Consensus::Params &, const
+/// node::NodeContext &) can be moved betweed threads safely.
+#[allow(unsafe_code)]
+unsafe impl Send for ChronikBridge {}
+
+/// SAFETY: All fields of ChronikBridge (const Consensus::Params &, const
+/// node::NodeContext &) can be accessed from different threads safely.
+#[allow(unsafe_code)]
+unsafe impl Sync for ChronikBridge {}
+
+impl std::fmt::Debug for ChronikBridge {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("ChronikBridge").finish_non_exhaustive()
+    }
+}
diff --git a/chronik/chronik-http/src/server.rs b/chronik/chronik-http/src/server.rs
index da55bcc01..4c4f10b35 100644
--- a/chronik/chronik-http/src/server.rs
+++ b/chronik/chronik-http/src/server.rs
@@ -1,262 +1,269 @@
 // Copyright (c) 2022 The Bitcoin developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 //! Module for [`ChronikServer`].
 
 use std::collections::HashMap;
 use std::{net::SocketAddr, sync::Arc};
 
 use abc_rust_error::{Result, WrapErr};
 use axum::{
     extract::{Path, Query, WebSocketUpgrade},
     response::IntoResponse,
     routing, Extension, Router,
 };
 use bitcoinsuite_core::tx::TxId;
-use chronik_indexer::indexer::ChronikIndexer;
+use chronik_indexer::indexer::{ChronikIndexer, Node};
 use chronik_proto::proto;
 use hyper::server::conn::AddrIncoming;
 use thiserror::Error;
 use tokio::sync::RwLock;
 
 use crate::{
     error::ReportError, handlers, protobuf::Protobuf,
     ws::handle_subscribe_socket,
 };
 
 /// Ref-counted indexer with read or write access
 pub type ChronikIndexerRef = Arc<RwLock<ChronikIndexer>>;
+/// Ref-counted access to the bitcoind node
+pub type NodeRef = Arc<Node>;
 
 /// Params defining what and where to serve for [`ChronikServer`].
 #[derive(Clone, Debug)]
 pub struct ChronikServerParams {
     /// Host address (port + IP) where to serve Chronik at.
     pub hosts: Vec<SocketAddr>,
     /// Indexer to read data from
     pub indexer: ChronikIndexerRef,
+    /// Access to the bitcoind node
+    pub node: NodeRef,
 }
 
 /// Chronik HTTP server, holding all the data/handles required to serve an
 /// instance.
 #[derive(Debug)]
 pub struct ChronikServer {
     server_builders: Vec<hyper::server::Builder<AddrIncoming>>,
     indexer: ChronikIndexerRef,
+    node: NodeRef,
 }
 
 /// Errors for [`ChronikServer`].
 #[derive(Debug, Eq, Error, PartialEq)]
 pub enum ChronikServerError {
     /// Binding to host address failed
     #[error("Chronik failed binding to {0}: {1}")]
     FailedBindingAddress(SocketAddr, String),
 
     /// Serving Chronik failed
     #[error("Chronik failed serving: {0}")]
     ServingFailed(String),
 
     /// Query is neither a hex hash nor an integer string
     #[error("400: Not a hash or height: {0}")]
     NotHashOrHeight(String),
 
     /// Query is not a txid
     #[error("400: Not a txid: {0}")]
     NotTxId(String),
 
     /// Block not found in DB
     #[error("404: Block not found: {0}")]
     BlockNotFound(String),
 }
 
 use self::ChronikServerError::*;
 
 impl ChronikServer {
     /// Binds the Chronik server on the given hosts
     pub fn setup(params: ChronikServerParams) -> Result<Self> {
         let server_builders = params
             .hosts
             .into_iter()
             .map(|host| {
                 axum::Server::try_bind(&host).map_err(|err| {
                     FailedBindingAddress(host, err.to_string()).into()
                 })
             })
             .collect::<Result<Vec<_>>>()?;
         Ok(ChronikServer {
             server_builders,
             indexer: params.indexer,
+            node: params.node,
         })
     }
 
     /// Serve a Chronik HTTP endpoint with the given parameters.
     pub async fn serve(self) -> Result<()> {
-        let app = Self::make_router(self.indexer);
+        let app = Self::make_router(self.indexer, self.node);
         let servers = self
             .server_builders
             .into_iter()
             .zip(std::iter::repeat(app))
             .map(|(server_builder, app)| {
                 Box::pin(async move {
                     server_builder
                         .serve(app.into_make_service())
                         .await
                         .map_err(|err| ServingFailed(err.to_string()))
                 })
             });
         let (result, _, _) = futures::future::select_all(servers).await;
         result?;
         Ok(())
     }
 
-    fn make_router(indexer: ChronikIndexerRef) -> Router {
+    fn make_router(indexer: ChronikIndexerRef, node: NodeRef) -> Router {
         Router::new()
             .route("/blockchain-info", routing::get(handle_blockchain_info))
             .route("/block/:hash_or_height", routing::get(handle_block))
             .route("/block-txs/:hash_or_height", routing::get(handle_block_txs))
             .route("/blocks/:start/:end", routing::get(handle_block_range))
             .route("/tx/:txid", routing::get(handle_tx))
             .route("/raw-tx/:txid", routing::get(handle_raw_tx))
             .route(
                 "/script/:type/:payload/confirmed-txs",
                 routing::get(handle_script_confirmed_txs),
             )
             .route(
                 "/script/:type/:payload/history",
                 routing::get(handle_script_history),
             )
             .route(
                 "/script/:type/:payload/unconfirmed-txs",
                 routing::get(handle_script_unconfirmed_txs),
             )
             .route(
                 "/script/:type/:payload/utxos",
                 routing::get(handle_script_utxos),
             )
             .route("/ws", routing::get(handle_ws))
             .fallback(handlers::handle_not_found)
             .layer(Extension(indexer))
+            .layer(Extension(node))
     }
 }
 
 async fn handle_blockchain_info(
     Extension(indexer): Extension<ChronikIndexerRef>,
 ) -> Result<Protobuf<proto::BlockchainInfo>, ReportError> {
     let indexer = indexer.read().await;
     let blocks = indexer.blocks();
     Ok(Protobuf(blocks.blockchain_info()?))
 }
 
 async fn handle_block_range(
     Path((start_height, end_height)): Path<(i32, i32)>,
     Extension(indexer): Extension<ChronikIndexerRef>,
 ) -> Result<Protobuf<proto::Blocks>, ReportError> {
     let indexer = indexer.read().await;
     let blocks = indexer.blocks();
     Ok(Protobuf(blocks.by_range(start_height, end_height)?))
 }
 
 async fn handle_block(
     Path(hash_or_height): Path<String>,
     Extension(indexer): Extension<ChronikIndexerRef>,
 ) -> Result<Protobuf<proto::Block>, ReportError> {
     let indexer = indexer.read().await;
     let blocks = indexer.blocks();
     Ok(Protobuf(blocks.by_hash_or_height(hash_or_height)?))
 }
 
 async fn handle_block_txs(
     Path(hash_or_height): Path<String>,
     Query(query_params): Query<HashMap<String, String>>,
     Extension(indexer): Extension<ChronikIndexerRef>,
 ) -> Result<Protobuf<proto::TxHistoryPage>, ReportError> {
     let indexer = indexer.read().await;
     Ok(Protobuf(
         handlers::handle_block_txs(hash_or_height, &query_params, &indexer)
             .await?,
     ))
 }
 
 async fn handle_tx(
     Path(txid): Path<String>,
     Extension(indexer): Extension<ChronikIndexerRef>,
 ) -> Result<Protobuf<proto::Tx>, ReportError> {
     let indexer = indexer.read().await;
     let txid = txid.parse::<TxId>().wrap_err(NotTxId(txid))?;
     Ok(Protobuf(indexer.txs().tx_by_id(txid)?))
 }
 
 async fn handle_raw_tx(
     Path(txid): Path<String>,
     Extension(indexer): Extension<ChronikIndexerRef>,
 ) -> Result<Protobuf<proto::RawTx>, ReportError> {
     let indexer = indexer.read().await;
     let txid = txid.parse::<TxId>().wrap_err(NotTxId(txid))?;
     Ok(Protobuf(indexer.txs().raw_tx_by_id(&txid)?))
 }
 
 async fn handle_script_confirmed_txs(
     Path((script_type, payload)): Path<(String, String)>,
     Query(query_params): Query<HashMap<String, String>>,
     Extension(indexer): Extension<ChronikIndexerRef>,
 ) -> Result<Protobuf<proto::TxHistoryPage>, ReportError> {
     let indexer = indexer.read().await;
     Ok(Protobuf(
         handlers::handle_script_confirmed_txs(
             &script_type,
             &payload,
             &query_params,
             &indexer,
         )
         .await?,
     ))
 }
 
 async fn handle_script_history(
     Path((script_type, payload)): Path<(String, String)>,
     Query(query_params): Query<HashMap<String, String>>,
     Extension(indexer): Extension<ChronikIndexerRef>,
 ) -> Result<Protobuf<proto::TxHistoryPage>, ReportError> {
     let indexer = indexer.read().await;
     Ok(Protobuf(
         handlers::handle_script_history(
             &script_type,
             &payload,
             &query_params,
             &indexer,
         )
         .await?,
     ))
 }
 
 async fn handle_script_unconfirmed_txs(
     Path((script_type, payload)): Path<(String, String)>,
     Extension(indexer): Extension<ChronikIndexerRef>,
 ) -> Result<Protobuf<proto::TxHistoryPage>, ReportError> {
     let indexer = indexer.read().await;
     Ok(Protobuf(
         handlers::handle_script_unconfirmed_txs(
             &script_type,
             &payload,
             &indexer,
         )
         .await?,
     ))
 }
 
 async fn handle_script_utxos(
     Path((script_type, payload)): Path<(String, String)>,
     Extension(indexer): Extension<ChronikIndexerRef>,
 ) -> Result<Protobuf<proto::ScriptUtxos>, ReportError> {
     let indexer = indexer.read().await;
     Ok(Protobuf(
         handlers::handle_script_utxos(&script_type, &payload, &indexer).await?,
     ))
 }
 
 async fn handle_ws(
     ws: WebSocketUpgrade,
     Extension(indexer): Extension<ChronikIndexerRef>,
 ) -> impl IntoResponse {
     ws.on_upgrade(|ws| handle_subscribe_socket(ws, indexer))
 }
diff --git a/chronik/chronik-indexer/Cargo.toml b/chronik/chronik-indexer/Cargo.toml
index 8e33a6b91..9d55d046e 100644
--- a/chronik/chronik-indexer/Cargo.toml
+++ b/chronik/chronik-indexer/Cargo.toml
@@ -1,41 +1,44 @@
 # Copyright (c) 2022 The Bitcoin developers
 
 [package]
 name = "chronik-indexer"
 version = "0.1.0"
 edition = "2021"
 rust-version = "1.67.1"
 license = "MIT"
 
 [dependencies]
 abc-rust-lint = { path = "../abc-rust-lint" }
 abc-rust-error = { path = "../abc-rust-error" }
 
 bitcoinsuite-core = { path = "../bitcoinsuite-core" }
 
 chronik-bridge = { path = "../chronik-bridge" }
 chronik-db = { path = "../chronik-db" }
 chronik-proto = { path = "../chronik-proto" }
 chronik-util = { path = "../chronik-util" }
 
+# Bridge to C++
+cxx = "1.0"
+
 # Protobuf en-/decoding
 prost = "0.11"
 
 # Derive error enums
 thiserror = "1.0"
 
 # Async runtime
 [dependencies.tokio]
 version = "1.25"
 features = ["sync", "rt", "rt-multi-thread", "macros"]
 
 [dev-dependencies]
 # Colorful diffs for assertions
 pretty_assertions = "1.0"
 
 # Temporary directory that's deleted when dropped
 tempdir = "0.3"
 
 [build-dependencies]
 # Build structs for protobuf messages from a *.proto file
 prost-build = "0.11"
diff --git a/chronik/chronik-indexer/src/indexer.rs b/chronik/chronik-indexer/src/indexer.rs
index 764d0beac..7cf6b8906 100644
--- a/chronik/chronik-indexer/src/indexer.rs
+++ b/chronik/chronik-indexer/src/indexer.rs
@@ -1,712 +1,719 @@
 // Copyright (c) 2022 The Bitcoin developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 //! Module containing [`ChronikIndexer`] to index blocks and txs.
 
 use std::path::PathBuf;
 
 use abc_rust_error::{Result, WrapErr};
 use bitcoinsuite_core::{
     block::BlockHash,
     tx::{Tx, TxId},
 };
 use chronik_bridge::{ffi, util::expect_unique_ptr};
 use chronik_db::{
     db::{Db, WriteBatch},
     groups::{
         FnCompressScript, ScriptGroup, ScriptHistoryWriter, ScriptUtxoWriter,
     },
     index_tx::prepare_indexed_txs,
     io::{
         BlockHeight, BlockReader, BlockStatsWriter, BlockTxs, BlockWriter,
         DbBlock, MetadataReader, MetadataWriter, SchemaVersion, SpentByWriter,
         TxEntry, TxWriter,
     },
     mem::{Mempool, MempoolTx},
 };
 use chronik_util::{log, log_chronik};
 use thiserror::Error;
 use tokio::sync::RwLock;
 
 use crate::{
     avalanche::Avalanche,
     query::{QueryBlocks, QueryGroupHistory, QueryGroupUtxos, QueryTxs},
     subs::{BlockMsg, BlockMsgType, Subs},
     subs_group::TxMsgType,
 };
 
 const CURRENT_INDEXER_VERSION: SchemaVersion = 7;
 
 /// Params for setting up a [`ChronikIndexer`] instance.
 #[derive(Clone)]
 pub struct ChronikIndexerParams {
     /// Folder where the node stores its data, net-dependent.
     pub datadir_net: PathBuf,
     /// Whether to clear the DB before opening the DB, e.g. when reindexing.
     pub wipe_db: bool,
     /// Function ptr to compress scripts.
     pub fn_compress_script: FnCompressScript,
 }
 
 /// Struct for indexing blocks and txs. Maintains db handles and mempool.
 #[derive(Debug)]
 pub struct ChronikIndexer {
     db: Db,
     mempool: Mempool,
     script_group: ScriptGroup,
     avalanche: Avalanche,
     subs: RwLock<Subs>,
 }
 
+/// Access to the bitcoind node.
+#[derive(Debug)]
+pub struct Node {
+    /// FFI bridge to the node.
+    pub bridge: cxx::UniquePtr<ffi::ChronikBridge>,
+}
+
 /// Block to be indexed by Chronik.
 #[derive(Clone, Debug, Default, Eq, PartialEq)]
 pub struct ChronikBlock {
     /// Data about the block (w/o txs)
     pub db_block: DbBlock,
     /// Txs in the block, with locations of where they are stored on disk.
     pub block_txs: BlockTxs,
     /// Block size in bytes.
     pub size: u64,
     /// Txs in the block, with inputs/outputs so we can group them.
     pub txs: Vec<Tx>,
 }
 
 /// Errors for [`BlockWriter`] and [`BlockReader`].
 #[derive(Debug, Eq, Error, PartialEq)]
 pub enum ChronikIndexerError {
     /// Failed creating the folder for the indexes
     #[error("Failed creating path {0}")]
     CreateIndexesDirFailed(PathBuf),
 
     /// Cannot rewind blocks that bitcoind doesn't have
     #[error(
         "Cannot rewind Chronik, it contains block {0} that the node doesn't \
          have. You may need to use -reindex/-chronikreindex, or delete \
          indexes/chronik and restart"
     )]
     CannotRewindChronik(BlockHash),
 
     /// Lower block doesn't exist but higher block does
     #[error(
         "Inconsistent DB: Block {missing} doesn't exist, but {exists} does"
     )]
     BlocksBelowMissing {
         /// Lower height that is missing
         missing: BlockHeight,
         /// Higher height that exists
         exists: BlockHeight,
     },
 
     /// Corrupted schema version
     #[error(
         "Corrupted schema version in the Chronik database, consider running \
          -reindex/-chronikreindex"
     )]
     CorruptedSchemaVersion,
 
     /// Missing schema version for non-empty database
     #[error(
         "Missing schema version in non-empty Chronik database, consider \
          running -reindex/-chronikreindex"
     )]
     MissingSchemaVersion,
 
     /// This Chronik instance is outdated
     #[error(
         "Chronik outdated: Chronik has version {}, but the database has \
          version {0}. Upgrade your node to the appropriate version.",
         CURRENT_INDEXER_VERSION
     )]
     ChronikOutdated(SchemaVersion),
 
     /// Database is outdated
     #[error(
         "DB outdated: Chronik has version {}, but the database has version \
          {0}. -reindex/-chronikreindex to reindex the database to the new \
          version.",
         CURRENT_INDEXER_VERSION
     )]
     DatabaseOutdated(SchemaVersion),
 }
 
 use self::ChronikIndexerError::*;
 
 impl ChronikIndexer {
     /// Setup the indexer with the given parameters, e.g. open the DB etc.
     pub fn setup(params: ChronikIndexerParams) -> Result<Self> {
         let indexes_path = params.datadir_net.join("indexes");
         if !indexes_path.exists() {
             std::fs::create_dir(&indexes_path).wrap_err_with(|| {
                 CreateIndexesDirFailed(indexes_path.clone())
             })?;
         }
         let db_path = indexes_path.join("chronik");
         if params.wipe_db {
             log!("Wiping Chronik at {}\n", db_path.to_string_lossy());
             Db::destroy(&db_path)?;
         }
         log_chronik!("Opening Chronik at {}\n", db_path.to_string_lossy());
         let db = Db::open(&db_path)?;
         verify_schema_version(&db)?;
         let script_group = ScriptGroup::new(params.fn_compress_script);
         let mempool = Mempool::new(script_group.clone());
         Ok(ChronikIndexer {
             db,
             mempool,
             script_group: script_group.clone(),
             avalanche: Avalanche::default(),
             subs: RwLock::new(Subs::new(script_group)),
         })
     }
 
     /// Resync Chronik index to the node
     pub fn resync_indexer(
         &mut self,
         bridge: &ffi::ChronikBridge,
     ) -> Result<()> {
         let block_reader = BlockReader::new(&self.db)?;
         let indexer_tip = block_reader.tip()?;
         let Ok(node_tip_index) = bridge.get_chain_tip() else {
             if let Some(indexer_tip) = &indexer_tip {
                 return Err(
                     CannotRewindChronik(indexer_tip.hash.clone()).into()
                 );
             }
             return Ok(());
         };
         let node_tip_info = ffi::get_block_info(node_tip_index);
         let node_height = node_tip_info.height;
         let node_tip_hash = BlockHash::from(node_tip_info.hash);
         let start_height = match indexer_tip {
             Some(tip) if tip.hash != node_tip_hash => {
                 let indexer_tip_hash = tip.hash.clone();
                 let indexer_height = tip.height;
                 log!(
                     "Node and Chronik diverged, node is on block \
                      {node_tip_hash} at height {node_height}, and Chronik is \
                      on block {indexer_tip_hash} at height {indexer_height}.\n"
                 );
                 let indexer_tip_index = bridge
                     .lookup_block_index(tip.hash.to_bytes())
                     .map_err(|_| CannotRewindChronik(tip.hash.clone()))?;
                 self.rewind_indexer(bridge, indexer_tip_index, &tip)?
             }
             Some(tip) => tip.height,
             None => {
                 log!(
                     "Chronik database empty, syncing to block {node_tip_hash} \
                      at height {node_height}.\n"
                 );
                 -1
             }
         };
         let tip_height = node_tip_info.height;
         for height in start_height + 1..=tip_height {
             if ffi::shutdown_requested() {
                 log!("Stopped re-sync adding blocks\n");
                 return Ok(());
             }
             let block_index = ffi::get_block_ancestor(node_tip_index, height)?;
             let ffi_block = bridge.load_block(block_index)?;
             let ffi_block = expect_unique_ptr("load_block", &ffi_block);
             let block = self.make_chronik_block(ffi_block, block_index)?;
             let hash = block.db_block.hash.clone();
             self.handle_block_connected(block)?;
             log_chronik!(
                 "Added block {hash}, height {height}/{tip_height} to Chronik\n"
             );
             if height % 100 == 0 {
                 log!(
                     "Synced Chronik up to block {hash} at height \
                      {height}/{tip_height}\n"
                 );
             }
         }
         log!(
             "Chronik completed re-syncing with the node, both are now at \
              block {node_tip_hash} at height {node_height}.\n"
         );
         Ok(())
     }
 
     fn rewind_indexer(
         &mut self,
         bridge: &ffi::ChronikBridge,
         indexer_tip_index: &ffi::CBlockIndex,
         indexer_db_tip: &DbBlock,
     ) -> Result<BlockHeight> {
         let indexer_height = indexer_db_tip.height;
         let fork_block_index = bridge
             .find_fork(indexer_tip_index)
             .map_err(|_| CannotRewindChronik(indexer_db_tip.hash.clone()))?;
         let fork_info = ffi::get_block_info(fork_block_index);
         let fork_block_hash = BlockHash::from(fork_info.hash);
         let fork_height = fork_info.height;
         let revert_height = fork_height + 1;
         log!(
             "The last common block is {fork_block_hash} at height \
              {fork_height}.\n"
         );
         log!("Reverting Chronik blocks {revert_height} to {indexer_height}.\n");
         for height in (revert_height..indexer_height).rev() {
             if ffi::shutdown_requested() {
                 log!("Stopped re-sync rewinding blocks\n");
                 // return MAX here so we don't add any blocks
                 return Ok(BlockHeight::MAX);
             }
             let db_block = BlockReader::new(&self.db)?
                 .by_height(height)?
                 .ok_or(BlocksBelowMissing {
                     missing: height,
                     exists: indexer_height,
                 })?;
             let block_index = bridge
                 .lookup_block_index(db_block.hash.to_bytes())
                 .map_err(|_| CannotRewindChronik(db_block.hash))?;
             let ffi_block = bridge.load_block(block_index)?;
             let ffi_block = expect_unique_ptr("load_block", &ffi_block);
             let block = self.make_chronik_block(ffi_block, block_index)?;
             self.handle_block_disconnected(block)?;
         }
         Ok(fork_info.height)
     }
 
     /// Add transaction to the indexer's mempool.
     pub fn handle_tx_added_to_mempool(
         &mut self,
         mempool_tx: MempoolTx,
     ) -> Result<()> {
         self.subs
             .get_mut()
             .handle_tx_event(&mempool_tx.tx, TxMsgType::AddedToMempool);
         self.mempool.insert(mempool_tx)?;
         Ok(())
     }
 
     /// Remove tx from the indexer's mempool, e.g. by a conflicting tx, expiry
     /// etc. This is not called when the transaction has been mined (and thus
     /// also removed from the mempool).
     pub fn handle_tx_removed_from_mempool(&mut self, txid: TxId) -> Result<()> {
         let mempool_tx = self.mempool.remove(txid)?;
         self.subs
             .get_mut()
             .handle_tx_event(&mempool_tx.tx, TxMsgType::RemovedFromMempool);
         Ok(())
     }
 
     /// Add the block to the index.
     pub fn handle_block_connected(
         &mut self,
         block: ChronikBlock,
     ) -> Result<()> {
         let height = block.db_block.height;
         let mut batch = WriteBatch::default();
         let block_writer = BlockWriter::new(&self.db)?;
         let tx_writer = TxWriter::new(&self.db)?;
         let block_stats_writer = BlockStatsWriter::new(&self.db)?;
         let script_history_writer =
             ScriptHistoryWriter::new(&self.db, self.script_group.clone())?;
         let script_utxo_writer =
             ScriptUtxoWriter::new(&self.db, self.script_group.clone())?;
         let spent_by_writer = SpentByWriter::new(&self.db)?;
         block_writer.insert(&mut batch, &block.db_block)?;
         let first_tx_num = tx_writer.insert(&mut batch, &block.block_txs)?;
         let index_txs =
             prepare_indexed_txs(&self.db, first_tx_num, &block.txs)?;
         block_stats_writer
             .insert(&mut batch, height, block.size, &index_txs)?;
         script_history_writer.insert(&mut batch, &index_txs)?;
         script_utxo_writer.insert(&mut batch, &index_txs)?;
         spent_by_writer.insert(&mut batch, &index_txs)?;
         self.db.write_batch(batch)?;
         for tx in &block.block_txs.txs {
             self.mempool.remove_mined(&tx.txid)?;
         }
         let subs = self.subs.get_mut();
         subs.broadcast_block_msg(BlockMsg {
             msg_type: BlockMsgType::Connected,
             hash: block.db_block.hash,
             height: block.db_block.height,
         });
         for tx in &block.txs {
             subs.handle_tx_event(tx, TxMsgType::Confirmed);
         }
         Ok(())
     }
 
     /// Remove the block from the index.
     pub fn handle_block_disconnected(
         &mut self,
         block: ChronikBlock,
     ) -> Result<()> {
         let mut batch = WriteBatch::default();
         let block_writer = BlockWriter::new(&self.db)?;
         let tx_writer = TxWriter::new(&self.db)?;
         let block_stats_writer = BlockStatsWriter::new(&self.db)?;
         let script_history_writer =
             ScriptHistoryWriter::new(&self.db, self.script_group.clone())?;
         let script_utxo_writer =
             ScriptUtxoWriter::new(&self.db, self.script_group.clone())?;
         let spent_by_writer = SpentByWriter::new(&self.db)?;
         block_writer.delete(&mut batch, &block.db_block)?;
         let first_tx_num = tx_writer.delete(&mut batch, &block.block_txs)?;
         let index_txs =
             prepare_indexed_txs(&self.db, first_tx_num, &block.txs)?;
         block_stats_writer.delete(&mut batch, block.db_block.height);
         script_history_writer.delete(&mut batch, &index_txs)?;
         script_utxo_writer.delete(&mut batch, &index_txs)?;
         spent_by_writer.delete(&mut batch, &index_txs)?;
         self.avalanche.disconnect_block(block.db_block.height)?;
         self.db.write_batch(batch)?;
         let subs = self.subs.get_mut();
         subs.broadcast_block_msg(BlockMsg {
             msg_type: BlockMsgType::Disconnected,
             hash: block.db_block.hash,
             height: block.db_block.height,
         });
         Ok(())
     }
 
     /// Block finalized with Avalanche.
     pub fn handle_block_finalized(
         &mut self,
         block: ChronikBlock,
     ) -> Result<()> {
         self.avalanche.finalize_block(block.db_block.height)?;
         let subs = self.subs.get_mut();
         subs.broadcast_block_msg(BlockMsg {
             msg_type: BlockMsgType::Finalized,
             hash: block.db_block.hash,
             height: block.db_block.height,
         });
         for tx in &block.txs {
             subs.handle_tx_event(tx, TxMsgType::Finalized);
         }
         Ok(())
     }
 
     /// Return [`QueryBlocks`] to read blocks from the DB.
     pub fn blocks(&self) -> QueryBlocks<'_> {
         QueryBlocks {
             db: &self.db,
             avalanche: &self.avalanche,
             mempool: &self.mempool,
         }
     }
 
     /// Return [`QueryTxs`] to return txs from mempool/DB.
     pub fn txs(&self) -> QueryTxs<'_> {
         QueryTxs {
             db: &self.db,
             avalanche: &self.avalanche,
             mempool: &self.mempool,
         }
     }
 
     /// Return [`QueryGroupHistory`] for scripts to query the tx history of
     /// scripts.
     pub fn script_history(&self) -> Result<QueryGroupHistory<'_, ScriptGroup>> {
         Ok(QueryGroupHistory {
             db: &self.db,
             avalanche: &self.avalanche,
             mempool: &self.mempool,
             mempool_history: self.mempool.script_history(),
             group: self.script_group.clone(),
         })
     }
 
     /// Return [`QueryGroupUtxos`] for scripts to query the utxos of scripts.
     pub fn script_utxos(&self) -> Result<QueryGroupUtxos<'_, ScriptGroup>> {
         Ok(QueryGroupUtxos {
             db: &self.db,
             avalanche: &self.avalanche,
             mempool: &self.mempool,
             mempool_utxos: self.mempool.script_utxos(),
             group: self.script_group.clone(),
         })
     }
 
     /// Subscribers, behind read/write lock
     pub fn subs(&self) -> &RwLock<Subs> {
         &self.subs
     }
 
     /// Build the ChronikBlock from the CBlockIndex
     pub fn make_chronik_block(
         &self,
         block: &ffi::CBlock,
         bindex: &ffi::CBlockIndex,
     ) -> Result<ChronikBlock> {
         let block = ffi::bridge_block(block, bindex)?;
         let db_block = DbBlock {
             hash: BlockHash::from(block.hash),
             prev_hash: BlockHash::from(block.prev_hash),
             height: block.height,
             n_bits: block.n_bits,
             timestamp: block.timestamp,
             file_num: block.file_num,
             data_pos: block.data_pos,
         };
         let block_txs = BlockTxs {
             block_height: block.height,
             txs: block
                 .txs
                 .iter()
                 .map(|tx| {
                     let txid = TxId::from(tx.tx.txid);
                     TxEntry {
                         txid,
                         data_pos: tx.data_pos,
                         undo_pos: tx.undo_pos,
                         time_first_seen: match self.mempool.tx(&txid) {
                             Some(tx) => tx.time_first_seen,
                             None => 0,
                         },
                         is_coinbase: tx.undo_pos == 0,
                     }
                 })
                 .collect(),
         };
         let txs = block
             .txs
             .into_iter()
             .map(|block_tx| Tx::from(block_tx.tx))
             .collect::<Vec<_>>();
         Ok(ChronikBlock {
             db_block,
             block_txs,
             size: block.size,
             txs,
         })
     }
 }
 
 fn verify_schema_version(db: &Db) -> Result<()> {
     let metadata_reader = MetadataReader::new(db)?;
     let metadata_writer = MetadataWriter::new(db)?;
     let is_empty = db.is_db_empty()?;
     match metadata_reader
         .schema_version()
         .wrap_err(CorruptedSchemaVersion)?
     {
         Some(schema_version) => {
             assert!(!is_empty, "Empty DB can't have a schema version");
             if schema_version > CURRENT_INDEXER_VERSION {
                 return Err(ChronikOutdated(schema_version).into());
             }
             if schema_version < CURRENT_INDEXER_VERSION {
                 return Err(DatabaseOutdated(schema_version).into());
             }
         }
         None => {
             if !is_empty {
                 return Err(MissingSchemaVersion.into());
             }
             let mut batch = WriteBatch::default();
             metadata_writer
                 .update_schema_version(&mut batch, CURRENT_INDEXER_VERSION)?;
             db.write_batch(batch)?;
         }
     }
     log!("Chronik has version {CURRENT_INDEXER_VERSION}\n");
     Ok(())
 }
 
 impl std::fmt::Debug for ChronikIndexerParams {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         f.debug_struct("ChronikIndexerParams")
             .field("datadir_net", &self.datadir_net)
             .field("wipe_db", &self.wipe_db)
             .field("fn_compress_script", &"..")
             .finish()
     }
 }
 
 #[cfg(test)]
 mod tests {
     use abc_rust_error::Result;
     use bitcoinsuite_core::block::BlockHash;
     use chronik_db::{
         db::{Db, WriteBatch, CF_META},
         groups::prefix_mock_compress,
         io::{BlockReader, BlockTxs, DbBlock, MetadataReader, MetadataWriter},
     };
     use pretty_assertions::assert_eq;
 
     use crate::indexer::{
         ChronikBlock, ChronikIndexer, ChronikIndexerError,
         ChronikIndexerParams, CURRENT_INDEXER_VERSION,
     };
 
     #[test]
     fn test_indexer() -> Result<()> {
         let tempdir = tempdir::TempDir::new("chronik-indexer--indexer")?;
         let datadir_net = tempdir.path().join("regtest");
         let params = ChronikIndexerParams {
             datadir_net: datadir_net.clone(),
             wipe_db: false,
             fn_compress_script: prefix_mock_compress,
         };
         // regtest folder doesn't exist yet -> error
         assert_eq!(
             ChronikIndexer::setup(params.clone())
                 .unwrap_err()
                 .downcast::<ChronikIndexerError>()?,
             ChronikIndexerError::CreateIndexesDirFailed(
                 datadir_net.join("indexes"),
             ),
         );
 
         // create regtest folder, setup will work now
         std::fs::create_dir(&datadir_net)?;
         let mut indexer = ChronikIndexer::setup(params.clone())?;
         // indexes and indexes/chronik folder now exist
         assert!(datadir_net.join("indexes").exists());
         assert!(datadir_net.join("indexes").join("chronik").exists());
 
         // DB is empty
         assert_eq!(BlockReader::new(&indexer.db)?.by_height(0)?, None);
         let block = ChronikBlock {
             db_block: DbBlock {
                 hash: BlockHash::from([4; 32]),
                 prev_hash: BlockHash::from([0; 32]),
                 height: 0,
                 n_bits: 0x1deadbef,
                 timestamp: 1234567890,
                 file_num: 0,
                 data_pos: 1337,
             },
             block_txs: BlockTxs {
                 block_height: 0,
                 txs: vec![],
             },
             size: 285,
             txs: vec![],
         };
 
         // Add block
         indexer.handle_block_connected(block.clone())?;
         assert_eq!(
             BlockReader::new(&indexer.db)?.by_height(0)?,
             Some(block.db_block.clone())
         );
 
         // Remove block again
         indexer.handle_block_disconnected(block.clone())?;
         assert_eq!(BlockReader::new(&indexer.db)?.by_height(0)?, None);
 
         // Add block then wipe, block not there
         indexer.handle_block_connected(block)?;
         std::mem::drop(indexer);
         let indexer = ChronikIndexer::setup(ChronikIndexerParams {
             wipe_db: true,
             ..params
         })?;
         assert_eq!(BlockReader::new(&indexer.db)?.by_height(0)?, None);
 
         Ok(())
     }
 
     #[test]
     fn test_schema_version() -> Result<()> {
         let dir = tempdir::TempDir::new("chronik-indexer--schema_version")?;
         let chronik_path = dir.path().join("indexes").join("chronik");
         let params = ChronikIndexerParams {
             datadir_net: dir.path().to_path_buf(),
             wipe_db: false,
             fn_compress_script: prefix_mock_compress,
         };
 
         // Setting up DB first time sets the schema version
         ChronikIndexer::setup(params.clone())?;
         {
             let db = Db::open(&chronik_path)?;
             assert_eq!(
                 MetadataReader::new(&db)?.schema_version()?,
                 Some(CURRENT_INDEXER_VERSION)
             );
         }
         // Opening DB again works fine
         ChronikIndexer::setup(params.clone())?;
 
         // Override DB schema version to 0
         {
             let db = Db::open(&chronik_path)?;
             let mut batch = WriteBatch::default();
             MetadataWriter::new(&db)?.update_schema_version(&mut batch, 0)?;
             db.write_batch(batch)?;
         }
         // -> DB too old
         assert_eq!(
             ChronikIndexer::setup(params.clone())
                 .unwrap_err()
                 .downcast::<ChronikIndexerError>()?,
             ChronikIndexerError::DatabaseOutdated(0),
         );
 
         // Override DB schema version to CURRENT_INDEXER_VERSION + 1
         {
             let db = Db::open(&chronik_path)?;
             let mut batch = WriteBatch::default();
             MetadataWriter::new(&db)?.update_schema_version(
                 &mut batch,
                 CURRENT_INDEXER_VERSION + 1,
             )?;
             db.write_batch(batch)?;
         }
         // -> Chronik too old
         assert_eq!(
             ChronikIndexer::setup(params.clone())
                 .unwrap_err()
                 .downcast::<ChronikIndexerError>()?,
             ChronikIndexerError::ChronikOutdated(CURRENT_INDEXER_VERSION + 1),
         );
 
         // Corrupt schema version
         {
             let db = Db::open(&chronik_path)?;
             let cf_meta = db.cf(CF_META)?;
             let mut batch = WriteBatch::default();
             batch.put_cf(cf_meta, b"SCHEMA_VERSION", [0xff]);
             db.write_batch(batch)?;
         }
         assert_eq!(
             ChronikIndexer::setup(params.clone())
                 .unwrap_err()
                 .downcast::<ChronikIndexerError>()?,
             ChronikIndexerError::CorruptedSchemaVersion,
         );
 
         // New db path, but has existing data
         let new_dir = dir.path().join("new");
         let new_chronik_path = new_dir.join("indexes").join("chronik");
         std::fs::create_dir_all(&new_chronik_path)?;
         let new_params = ChronikIndexerParams {
             datadir_net: new_dir,
             wipe_db: false,
             ..params
         };
         {
             // new db with obscure field in meta
             let db = Db::open(&new_chronik_path)?;
             let mut batch = WriteBatch::default();
             batch.put_cf(db.cf(CF_META)?, b"FOO", b"BAR");
             db.write_batch(batch)?;
         }
         // Error: non-empty DB without schema version
         assert_eq!(
             ChronikIndexer::setup(new_params.clone())
                 .unwrap_err()
                 .downcast::<ChronikIndexerError>()?,
             ChronikIndexerError::MissingSchemaVersion,
         );
         // with wipe it works
         ChronikIndexer::setup(ChronikIndexerParams {
             wipe_db: true,
             ..new_params
         })?;
 
         Ok(())
     }
 }
diff --git a/chronik/chronik-lib/src/bridge.rs b/chronik/chronik-lib/src/bridge.rs
index 08245a105..a15dd512a 100644
--- a/chronik/chronik-lib/src/bridge.rs
+++ b/chronik/chronik-lib/src/bridge.rs
@@ -1,253 +1,259 @@
 // Copyright (c) 2022 The Bitcoin developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 //! Rust side of the bridge; these structs and functions are exposed to C++.
 
 use std::{
     net::{AddrParseError, IpAddr, SocketAddr},
     sync::Arc,
 };
 
 use abc_rust_error::Result;
 use bitcoinsuite_core::{
     script::Script,
     tx::{Tx, TxId},
 };
 use chronik_bridge::{ffi::init_error, util::expect_unique_ptr};
 use chronik_db::mem::MempoolTx;
 use chronik_http::server::{ChronikServer, ChronikServerParams};
-use chronik_indexer::indexer::{ChronikIndexer, ChronikIndexerParams};
+use chronik_indexer::indexer::{ChronikIndexer, ChronikIndexerParams, Node};
 use chronik_util::{log, log_chronik};
 use thiserror::Error;
 use tokio::sync::RwLock;
 
 use crate::{
     error::ok_or_abort_node,
     ffi::{self, StartChronikValidationInterface},
 };
 
 /// Errors for [`Chronik`] and [`setup_chronik`].
 #[derive(Debug, Eq, Error, PartialEq)]
 pub enum ChronikError {
     /// Chronik host address failed to parse
     #[error("Invalid Chronik host address {0:?}: {1}")]
     InvalidChronikHost(String, AddrParseError),
 }
 
 use self::ChronikError::*;
 
 /// Setup the Chronik bridge. Returns a ChronikIndexer object.
 pub fn setup_chronik(
     params: ffi::SetupParams,
     config: &ffi::Config,
     node: &ffi::NodeContext,
 ) -> bool {
     match try_setup_chronik(params, config, node) {
         Ok(()) => true,
         Err(report) => {
             log_chronik!("{report:?}\n");
             init_error(&report.to_string())
         }
     }
 }
 
 fn try_setup_chronik(
     params: ffi::SetupParams,
     config: &ffi::Config,
-    node: &ffi::NodeContext,
+    node_context: &ffi::NodeContext,
 ) -> Result<()> {
     abc_rust_error::install();
     let hosts = params
         .hosts
         .into_iter()
         .map(|host| parse_socket_addr(host, params.default_port))
         .collect::<Result<Vec<_>>>()?;
     log!("Starting Chronik bound to {:?}\n", hosts);
-    let bridge = chronik_bridge::ffi::make_bridge(config, node);
+    let bridge = chronik_bridge::ffi::make_bridge(config, node_context);
     let bridge_ref = expect_unique_ptr("make_bridge", &bridge);
     let mut indexer = ChronikIndexer::setup(ChronikIndexerParams {
         datadir_net: params.datadir_net.into(),
         wipe_db: params.wipe_db,
         fn_compress_script: compress_script,
     })?;
     indexer.resync_indexer(bridge_ref)?;
     if chronik_bridge::ffi::shutdown_requested() {
         // Don't setup Chronik if the user requested shutdown during resync
         return Ok(());
     }
     let indexer = Arc::new(RwLock::new(indexer));
+    let node = Arc::new(Node { bridge });
     let runtime = tokio::runtime::Builder::new_multi_thread()
         .enable_all()
         .build()?;
     let server = runtime.block_on({
         let indexer = Arc::clone(&indexer);
+        let node = Arc::clone(&node);
         async move {
             // try_bind requires a Runtime
-            ChronikServer::setup(ChronikServerParams { hosts, indexer })
+            ChronikServer::setup(ChronikServerParams {
+                hosts,
+                indexer,
+                node,
+            })
         }
     })?;
     runtime.spawn(async move {
         ok_or_abort_node("ChronikServer::serve", server.serve().await);
     });
     let chronik = Box::new(Chronik {
-        bridge: Arc::new(bridge),
+        node: Arc::clone(&node),
         indexer,
         _runtime: runtime,
     });
-    StartChronikValidationInterface(node, chronik);
+    StartChronikValidationInterface(node_context, chronik);
     Ok(())
 }
 
 fn parse_socket_addr(host: String, default_port: u16) -> Result<SocketAddr> {
     if let Ok(addr) = host.parse::<SocketAddr>() {
         return Ok(addr);
     }
     let ip_addr = host
         .parse::<IpAddr>()
         .map_err(|err| InvalidChronikHost(host, err))?;
     Ok(SocketAddr::new(ip_addr, default_port))
 }
 
 fn compress_script(script: &Script) -> Vec<u8> {
     chronik_bridge::ffi::compress_script(script.as_ref())
 }
 
 /// Contains all db, runtime, tpc, etc. handles needed by Chronik.
 /// This makes it so when this struct is dropped, all handles are relased
 /// cleanly.
 pub struct Chronik {
-    bridge: Arc<cxx::UniquePtr<ffi::ChronikBridge>>,
+    node: Arc<Node>,
     indexer: Arc<RwLock<ChronikIndexer>>,
     // Having this here ensures HTTP server, outstanding requests etc. will get
     // stopped when `Chronik` is dropped.
     _runtime: tokio::runtime::Runtime,
 }
 
 impl Chronik {
     /// Tx added to the bitcoind mempool
     pub fn handle_tx_added_to_mempool(
         &self,
         ptx: &ffi::CTransaction,
         time_first_seen: i64,
     ) {
         ok_or_abort_node(
             "handle_tx_added_to_mempool",
             self.add_tx_to_mempool(ptx, time_first_seen),
         );
     }
 
     /// Tx removed from the bitcoind mempool
     pub fn handle_tx_removed_from_mempool(&self, txid: [u8; 32]) {
         let mut indexer = self.indexer.blocking_write();
         let txid = TxId::from(txid);
         ok_or_abort_node(
             "handle_tx_removed_from_mempool",
             indexer.handle_tx_removed_from_mempool(txid),
         );
         log_chronik!("Chronik: transaction {} removed from mempool\n", txid);
     }
 
     /// Block connected to the longest chain
     pub fn handle_block_connected(
         &self,
         block: &ffi::CBlock,
         bindex: &ffi::CBlockIndex,
     ) {
         ok_or_abort_node(
             "handle_block_connected",
             self.connect_block(block, bindex),
         );
     }
 
     /// Block disconnected from the longest chain
     pub fn handle_block_disconnected(
         &self,
         block: &ffi::CBlock,
         bindex: &ffi::CBlockIndex,
     ) {
         ok_or_abort_node(
             "handle_block_disconnected",
             self.disconnect_block(block, bindex),
         );
     }
 
     /// Block finalized with Avalanche
     pub fn handle_block_finalized(&self, bindex: &ffi::CBlockIndex) {
         ok_or_abort_node("handle_block_finalized", self.finalize_block(bindex));
     }
 
     fn add_tx_to_mempool(
         &self,
         ptx: &ffi::CTransaction,
         time_first_seen: i64,
     ) -> Result<()> {
         let mut indexer = self.indexer.blocking_write();
-        let tx = self.bridge.bridge_tx(ptx)?;
+        let tx = self.node.bridge.bridge_tx(ptx)?;
         let txid = TxId::from(tx.txid);
         indexer.handle_tx_added_to_mempool(MempoolTx {
             tx: Tx::from(tx),
             time_first_seen,
         })?;
         log_chronik!("Chronik: transaction {} added to mempool\n", txid);
         Ok(())
     }
 
     fn connect_block(
         &self,
         block: &ffi::CBlock,
         bindex: &ffi::CBlockIndex,
     ) -> Result<()> {
         let mut indexer = self.indexer.blocking_write();
         let block = indexer.make_chronik_block(block, bindex)?;
         let block_hash = block.db_block.hash.clone();
         let num_txs = block.block_txs.txs.len();
         indexer.handle_block_connected(block)?;
         log_chronik!(
             "Chronik: block {} connected with {} txs\n",
             block_hash,
             num_txs,
         );
         Ok(())
     }
 
     fn disconnect_block(
         &self,
         block: &ffi::CBlock,
         bindex: &ffi::CBlockIndex,
     ) -> Result<()> {
         let mut indexer = self.indexer.blocking_write();
         let block = indexer.make_chronik_block(block, bindex)?;
         let block_hash = block.db_block.hash.clone();
         let num_txs = block.block_txs.txs.len();
         indexer.handle_block_disconnected(block)?;
         log_chronik!(
             "Chronik: block {} disconnected with {} txs\n",
             block_hash,
             num_txs,
         );
         Ok(())
     }
 
     fn finalize_block(&self, bindex: &ffi::CBlockIndex) -> Result<()> {
-        let block = self.bridge.load_block(bindex)?;
+        let block = self.node.bridge.load_block(bindex)?;
         let block_ref = expect_unique_ptr("load_block", &block);
         let mut indexer = self.indexer.blocking_write();
         let block = indexer.make_chronik_block(block_ref, bindex)?;
         let block_hash = block.db_block.hash.clone();
         let num_txs = block.block_txs.txs.len();
         indexer.handle_block_finalized(block)?;
         log_chronik!(
             "Chronik: block {} finalized with {} txs\n",
             block_hash,
             num_txs,
         );
         Ok(())
     }
 }
 
 impl std::fmt::Debug for Chronik {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         write!(f, "Chronik {{ .. }}")
     }
 }