From 8864b8c7152b3e738e353693c4d04be7a697edbd Mon Sep 17 00:00:00 2001
From: Roman Zeyde <me@romanzey.de>
Date: Sat, 15 Feb 2025 10:26:59 +0200
Subject: [PATCH] fixup! Test on Debian Trixie & update RocksDB to 9.3.1

---
 Cargo.lock    | 21 +++++----------------
 Cargo.toml    |  2 +-
 Dockerfile    |  2 +-
 Dockerfile.ci |  2 +-
 4 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index bb62373fd..ce3b181d1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "aho-corasick"
@@ -259,7 +259,6 @@ checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f"
 dependencies = [
  "glob",
  "libc",
- "libloading",
 ]
 
 [[package]]
@@ -624,16 +623,6 @@ version = "0.2.162"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "18d287de67fe55fd7e1581fe933d965a5a9477b38e949cfa9f8574ef01506398"
 
-[[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 = "libredox"
 version = "0.0.1"
@@ -948,9 +937,9 @@ checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da"
 
 [[package]]
 name = "rust-librocksdb-sys"
-version = "0.23.1+9.3.1"
+version = "0.32.0+9.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d4528f6183c0ed71fd1b34a669f1cdbca5007514dcd29be4e5932e39c476fb5"
+checksum = "50146b7fadd68926e9dcb902bf0515783aaaf5f73af26949f188aead5ede8cd0"
 dependencies = [
  "bindgen",
  "bzip2-sys",
@@ -963,9 +952,9 @@ dependencies = [
 
 [[package]]
 name = "rust-rocksdb"
-version = "0.27.1"
+version = "0.36.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d3450dd11b7f375a235161bfb529b16c1b6420d771983030ace053e570ded52"
+checksum = "3bf088a714aa3fad699f7dbe06047ca732c09629a2f9b28aa16ca6d3897a4c2f"
 dependencies = [
  "libc",
  "rust-librocksdb-sys",
diff --git a/Cargo.toml b/Cargo.toml
index 466d2bdd8..2882fd101 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -45,7 +45,7 @@ ctrlc = "=3.4.2"
 signal-hook = "0.3"
 
 [dependencies.rust-rocksdb]
-version = "0.27.1"
+version = "0.36"
 
 default-features = false
 # ZSTD is used for data compression
diff --git a/Dockerfile b/Dockerfile
index 1be1f81d4..c886ee7e4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@
 # The maintainers of electrs are not deeply familiar with Docker, so you should DYOR.
 # If you are not familiar with Docker either it's probably be safer to NOT use it.
 
-FROM debian:testing-slim AS base
+FROM debian:trixie-slim AS base
 RUN apt-get update -qqy
 RUN apt-get install -qqy librocksdb-dev curl
 
diff --git a/Dockerfile.ci b/Dockerfile.ci
index b17387288..fc65eeaf5 100644
--- a/Dockerfile.ci
+++ b/Dockerfile.ci
@@ -2,7 +2,7 @@
 # The maintainers of electrs are not deeply familiar with Docker, so you should DYOR.
 # If you are not familiar with Docker either it's probably be safer to NOT use it.
 
-FROM debian:testing-slim as base
+FROM debian:trixie-slim as base
 RUN apt-get update -qqy
 RUN apt-get install -qqy librocksdb-dev wget