testing/conduit: upgrade to 0.7.0HEADmaster

4 files changed, 1590 insertions, 67 deletions

diff --git a/testing/conduit/APKBUILD b/testing/conduit/APKBUILD
index 5ff2795eba7..d2b2ab2d7ce 100644
--- a/testing/conduit/APKBUILD
+++ b/testing/conduit/APKBUILD
@@ -1,20 +1,19 @@
 # Contributor: Patrycja Rosa <alpine@ptrcnull.me>
 # Maintainer: Patrycja Rosa <alpine@ptrcnull.me>
 pkgname=conduit
-pkgver=0.6.0
-pkgrel=2
+pkgver=0.7.0
+pkgrel=0
 pkgdesc="Simple, fast and reliable chat server powered by Matrix"
 url="https://conduit.rs/"
-# ring-rs
-arch="all !ppc64le !s390x"
+arch="all !s390x" # nix
 license="Apache-2.0"
 makedepends="cargo sqlite-dev cargo-auditable clang17-libclang rocksdb-dev snappy-dev"
 install="$pkgname.pre-install"
 subpackages="$pkgname-openrc"
 source="https://gitlab.com/famedly/conduit/-/archive/v$pkgver/conduit-v$pkgver.tar.gz
 	https://github.com/leso-kn/ring/archive/refs/heads/riscv64-support-0.16.20-compat.tar.gz
-	riscv64-ring.patch.noauto
 	system-sqlite.patch
+	downgrade-rocksdb.patch
 
 	conduit.toml
 	conduit.initd
@@ -30,12 +29,6 @@ export SNAPPY_LIB_DIR="/usr/lib/"
 
 prepare() {
 	default_prepare
-	case "$CARCH" in
-	riscv64)
-		# patch out ring dependency for riscv64, upstream investigating
-		patch -p1 -i "$srcdir"/riscv64-ring.patch.noauto
-		;;
-	esac
 
 	cargo fetch --target="$CTARGET" --locked
 }
@@ -56,11 +49,11 @@ package() {
 }
 
 sha512sums="
-a8267f59ef829a7d3e6f528c9b4487993c7d3c930d6849254c3acf6547b041bceb5435572d937c7b98456f0379673c468528ff49ba5a6bef7590679ab9077c32  conduit-v0.6.0.tar.gz
+8a5bd0ac7600ef5051c29a91fb8edc8abf651eff2eff6eeec75f3edaf5ee2ad40afaf297e99cbc28e75b87f89656fda536402194cb2a2f0e2b96dec10a225798  conduit-v0.7.0.tar.gz
 a68b9cbf701350c4e77f67f2e979180a9926895debc56764f3376cb6bcc390e310e8fcdd7fb5dc22423d41f65b129b119014400b5365a1b00422a0f0133f887f  riscv64-support-0.16.20-compat.tar.gz
-7658cc65aa20c913b077287da7bd913b4dba2feedfcc2c420c8e6685dec573bc764bd82825b222daf042e01138f4207c05c11f97f53e9d9efa0ff51bf2b3cec6  riscv64-ring.patch.noauto
 7bc072043ebedd74ff8805c8b478ecc35f42e81a53d6b2c13d9d8568ad27b64b992d4a9bab9a6ced253971bbd4922f4da814cf2decdf253a2f5a078ced55f834  system-sqlite.patch
-9b77f8934f79215a98c41a859c2b875fd9ee7b618c84316b6be849cb0998ceebcbb3dcbb9b834bda74c32d46722140c3320abd8744c59fe2023fb273c29edc5f  conduit.toml
+95b0c587902d0b83206154cebe55c73a7bdb91155f743df44f5fc503d2a3455e09ce471999637f6c9981418ff72bf2f150abc78ba5997ef28ff352b80479f9cd  downgrade-rocksdb.patch
+35600dd6a6c3700c6de44a3f364b08873f660c4798bff1241feeca70f7d63d5b36c0697b103e380ff0d1d8e26caf3464ad2c71902cfde465e5a128bf8cff2179  conduit.toml
 be411bc3447d684c546249e6fe6573d1c7798c7dfc148564b00b60026592eafa66dec4289a2d336656291ba1b915dd8b1e4df632de44a0ec0b3ad7d971ab062f  conduit.initd
 8769e2feb4e0db08d7c6861a9d9110db8b846a496086f697080fda7270c97b506cbb10326cf708cdeab5eda68ec93a5ad86db4db5b9b0ebc189e6a5cefacf3a1  conduit.confd
 "
diff --git a/testing/conduit/conduit.toml b/testing/conduit/conduit.toml
index 5b5dfcbb28b..5fa06cd829a 100644
--- a/testing/conduit/conduit.toml
+++ b/testing/conduit/conduit.toml
@@ -31,6 +31,12 @@ max_request_size = 20_000_000 # in bytes
 # Enables registration. If set to false, no users can register on this server.
 allow_registration = true
 
+# A static registration token that new users will have to provide when creating
+# an account. YOU NEED TO EDIT THIS.
+# - Insert a password that users will have to enter on registration
+# - Start the line with '#' to remove the condition
+registration_token = ""
+
 allow_federation = true
 allow_check_for_updates = false
 
@@ -44,7 +50,11 @@ enable_lightning_bolt = true
 trusted_servers = ["matrix.org"]
 
 #max_concurrent_requests = 100 # How many requests Conduit sends to other servers at the same time
-#log = "warn,state_res=warn,rocket=off,_=off,sled=off"
+
+# Controls the log verbosity. See also [here][0].
+#
+# [0]: https://docs.rs/tracing-subscriber/latest/tracing_subscriber/filter/struct.EnvFilter.html#directives
+#log = "..."
 
 address = "127.0.0.1" # This makes sure Conduit can only be reached using the reverse proxy
 #address = "0.0.0.0" # If Conduit is running in a container, make sure the reverse proxy (ie. Traefik) can reach it.
diff --git a/testing/conduit/downgrade-rocksdb.patch b/testing/conduit/downgrade-rocksdb.patch
new file mode 100644
index 00000000000..8e3d0752631
--- /dev/null
+++ b/testing/conduit/downgrade-rocksdb.patch
@@ -0,0 +1,1572 @@
+diff --git a/Cargo.lock b/Cargo.lock
+index 6e870c0..702c9ec 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -19,9 +19,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+ 
+ [[package]]
+ name = "ahash"
+-version = "0.8.11"
++version = "0.8.7"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
++checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01"
+ dependencies = [
+  "cfg-if",
+  "once_cell",
+@@ -46,15 +46,15 @@ checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5"
+ 
+ [[package]]
+ name = "anstyle"
+-version = "1.0.6"
++version = "1.0.5"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc"
++checksum = "2faccea4cc4ab4a667ce676a30e8ec13922a692c99bb8f5b11f1502c72e04220"
+ 
+ [[package]]
+ name = "arc-swap"
+-version = "1.7.0"
++version = "1.6.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "7b3d0060af21e8d11a926981cc00c6c1541aa91dd64b9f881985c3da1094425f"
++checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6"
+ 
+ [[package]]
+ name = "arrayref"
+@@ -88,7 +88,7 @@ checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.52",
++ "syn 2.0.48",
+ ]
+ 
+ [[package]]
+@@ -204,22 +204,23 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
+ 
+ [[package]]
+ name = "bindgen"
+-version = "0.69.4"
++version = "0.65.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0"
++checksum = "cfdf7b466f9a4903edc73f95d6d2bcd5baf8ae620638762244d3f60143643cc5"
+ dependencies = [
+- "bitflags 2.4.2",
++ "bitflags 1.3.2",
+  "cexpr",
+  "clang-sys",
+- "itertools 0.12.1",
+  "lazy_static",
+  "lazycell",
++ "peeking_take_while",
++ "prettyplease",
+  "proc-macro2",
+  "quote",
+  "regex",
+  "rustc-hash",
+  "shlex",
+- "syn 2.0.52",
++ "syn 2.0.48",
+ ]
+ 
+ [[package]]
+@@ -256,15 +257,15 @@ dependencies = [
+ 
+ [[package]]
+ name = "bumpalo"
+-version = "3.15.4"
++version = "3.14.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa"
++checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec"
+ 
+ [[package]]
+ name = "bytemuck"
+-version = "1.15.0"
++version = "1.14.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15"
++checksum = "ed2490600f404f2b94c167e31d3ed1d5f3c225a0f3b80230053b3e0b7b962bd9"
+ 
+ [[package]]
+ name = "byteorder"
+@@ -291,9 +292,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "cc"
+-version = "1.0.90"
++version = "1.0.83"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5"
++checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
+ dependencies = [
+  "jobserver",
+  "libc",
+@@ -314,12 +315,6 @@ version = "1.0.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+ 
+-[[package]]
+-name = "cfg_aliases"
+-version = "0.1.1"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
+-
+ [[package]]
+ name = "clang-sys"
+ version = "1.7.0"
+@@ -333,9 +328,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "clap"
+-version = "4.5.2"
++version = "4.4.18"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "b230ab84b0ffdf890d5a10abdbc8b83ae1c4918275daea1ab8801f71536b2651"
++checksum = "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c"
+ dependencies = [
+  "clap_builder",
+  "clap_derive",
+@@ -343,9 +338,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "clap_builder"
+-version = "4.5.2"
++version = "4.4.18"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4"
++checksum = "4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7"
+ dependencies = [
+  "anstyle",
+  "clap_lex",
+@@ -353,21 +348,21 @@ dependencies = [
+ 
+ [[package]]
+ name = "clap_derive"
+-version = "4.5.0"
++version = "4.4.7"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "307bc0538d5f0f83b8248db3087aa92fe504e4691294d0c96c0eabc33f47ba47"
++checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442"
+ dependencies = [
+  "heck",
+  "proc-macro2",
+  "quote",
+- "syn 2.0.52",
++ "syn 2.0.48",
+ ]
+ 
+ [[package]]
+ name = "clap_lex"
+-version = "0.7.0"
++version = "0.6.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce"
++checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1"
+ 
+ [[package]]
+ name = "color_quant"
+@@ -405,10 +400,10 @@ dependencies = [
+  "regex",
+  "reqwest",
+  "ring",
++ "rocksdb",
+  "ruma",
+  "rusqlite",
+  "rust-argon2",
+- "rust-rocksdb",
+  "sd-notify",
+  "serde",
+  "serde_html_form",
+@@ -490,18 +485,18 @@ checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5"
+ 
+ [[package]]
+ name = "crc32fast"
+-version = "1.4.0"
++version = "1.3.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa"
++checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
+ dependencies = [
+  "cfg-if",
+ ]
+ 
+ [[package]]
+ name = "crossbeam-channel"
+-version = "0.5.12"
++version = "0.5.11"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95"
++checksum = "176dc175b78f56c0f321911d9c8eb2b77a78a4860b9c19db83835fea1a46649b"
+ dependencies = [
+  "crossbeam-utils",
+ ]
+@@ -524,9 +519,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "curve25519-dalek"
+-version = "4.1.2"
++version = "4.1.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348"
++checksum = "e89b8c6a2e4b1f45971ad09761aafb85514a84744b67a95e32c3cc1352d1f65c"
+ dependencies = [
+  "cfg-if",
+  "cpufeatures",
+@@ -547,7 +542,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.52",
++ "syn 2.0.48",
+ ]
+ 
+ [[package]]
+@@ -631,9 +626,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "ed25519-dalek"
+-version = "2.1.1"
++version = "2.1.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871"
++checksum = "1f628eaec48bfd21b865dc2950cfa014450c01d2fa2b69a86c2fd5844ec523c0"
+ dependencies = [
+  "curve25519-dalek",
+  "ed25519",
+@@ -646,9 +641,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "either"
+-version = "1.10.0"
++version = "1.9.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a"
++checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
+ 
+ [[package]]
+ name = "encoding_rs"
+@@ -700,9 +695,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "fiat-crypto"
+-version = "0.2.6"
++version = "0.2.5"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "1676f435fc1dadde4d03e43f5d62b259e1ce5f40bd4ffb21db2b42ebe59c1382"
++checksum = "27573eac26f4dd11e2b1916c3fe1baa56407c83c71a773a8ba17ec0bca03b6b7"
+ 
+ [[package]]
+ name = "figment"
+@@ -809,7 +804,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.52",
++ "syn 2.0.48",
+ ]
+ 
+ [[package]]
+@@ -867,9 +862,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "gif"
+-version = "0.13.1"
++version = "0.12.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "3fb2d69b19215e18bb912fa30f7ce15846e301408695e44e0ef719f1da9e19f2"
++checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045"
+ dependencies = [
+  "color_quant",
+  "weezl",
+@@ -899,7 +894,7 @@ dependencies = [
+  "futures-sink",
+  "futures-util",
+  "http",
+- "indexmap 2.2.5",
++ "indexmap 2.2.1",
+  "slab",
+  "tokio",
+  "tokio-util",
+@@ -963,9 +958,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
+ 
+ [[package]]
+ name = "hermit-abi"
+-version = "0.3.9"
++version = "0.3.4"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
++checksum = "5d3d0e0f38255e7fa3cf31335b3a56f05febd18025f4db5ef7a0cfb4f8da651f"
+ 
+ [[package]]
+ name = "hmac"
+@@ -989,9 +984,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "http"
+-version = "0.2.12"
++version = "0.2.11"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1"
++checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb"
+ dependencies = [
+  "bytes",
+  "fnv",
+@@ -1088,9 +1083,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "image"
+-version = "0.24.9"
++version = "0.24.8"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d"
++checksum = "034bbe799d1909622a74d1193aa50147769440040ff36cb2baa947609b0a4e23"
+ dependencies = [
+  "bytemuck",
+  "byteorder",
+@@ -1113,9 +1108,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "indexmap"
+-version = "2.2.5"
++version = "2.2.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4"
++checksum = "433de089bd45971eecf4668ee0ee8f4cec17db4f8bd8f7bc3197a6ce37aa7d9b"
+ dependencies = [
+  "equivalent",
+  "hashbrown 0.14.3",
+@@ -1161,15 +1156,6 @@ dependencies = [
+  "either",
+ ]
+ 
+-[[package]]
+-name = "itertools"
+-version = "0.12.1"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
+-dependencies = [
+- "either",
+-]
+-
+ [[package]]
+ name = "itoa"
+ version = "1.0.10"
+@@ -1178,9 +1164,9 @@ checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c"
+ 
+ [[package]]
+ name = "jobserver"
+-version = "0.1.28"
++version = "0.1.27"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6"
++checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d"
+ dependencies = [
+  "libc",
+ ]
+@@ -1193,9 +1179,9 @@ checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0"
+ 
+ [[package]]
+ name = "js-sys"
+-version = "0.3.69"
++version = "0.3.67"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
++checksum = "9a1d36f1235bc969acba30b7f5990b864423a6068a10f7c90ae8f0112e3a59d1"
+ dependencies = [
+  "wasm-bindgen",
+ ]
+@@ -1267,18 +1253,18 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
+ 
+ [[package]]
+ name = "libc"
+-version = "0.2.153"
++version = "0.2.152"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
++checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7"
+ 
+ [[package]]
+ name = "libloading"
+-version = "0.8.3"
++version = "0.8.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19"
++checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161"
+ dependencies = [
+  "cfg-if",
+- "windows-targets 0.52.4",
++ "windows-sys 0.48.0",
+ ]
+ 
+ [[package]]
+@@ -1292,6 +1278,22 @@ dependencies = [
+  "redox_syscall",
+ ]
+ 
++[[package]]
++name = "librocksdb-sys"
++version = "0.11.0+8.1.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d3386f101bcb4bd252d8e9d2fb41ec3b0862a15a62b478c355b2982efa469e3e"
++dependencies = [
++ "bindgen",
++ "bzip2-sys",
++ "cc",
++ "glob",
++ "libc",
++ "libz-sys",
++ "lz4-sys",
++ "zstd-sys",
++]
++
+ [[package]]
+ name = "libsqlite3-sys"
+ version = "0.26.0"
+@@ -1300,7 +1300,6 @@
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "afc22eff61b133b115c6e8c74e818c628d6d5e7a502afea6f64dee076dd94326"
+ dependencies = [
+- "cc",
+  "pkg-config",
+  "vcpkg",
+ ]
+@@ -1311,6 +1310,7 @@
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "037731f5d3aaa87a5675e895b63ddff1a87624bc29f77004ea829809654e48f6"
+ dependencies = [
++ "cc",
+  "pkg-config",
+  "vcpkg",
+ ]
+@@ -1332,9 +1334,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "log"
+-version = "0.4.21"
++version = "0.4.20"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
++checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
+ 
+ [[package]]
+ name = "lru-cache"
+@@ -1408,9 +1410,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
+ 
+ [[package]]
+ name = "miniz_oxide"
+-version = "0.7.2"
++version = "0.7.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7"
++checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
+ dependencies = [
+  "adler",
+  "simd-adler32",
+@@ -1418,9 +1420,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "mio"
+-version = "0.8.11"
++version = "0.8.10"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
++checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09"
+ dependencies = [
+  "libc",
+  "wasi",
+@@ -1429,13 +1431,12 @@ dependencies = [
+ 
+ [[package]]
+ name = "nix"
+-version = "0.28.0"
++version = "0.27.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4"
++checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
+ dependencies = [
+  "bitflags 2.4.2",
+  "cfg-if",
+- "cfg_aliases",
+  "libc",
+ ]
+ 
+@@ -1478,18 +1479,19 @@ checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+ 
+ [[package]]
+ name = "num-integer"
+-version = "0.1.46"
++version = "0.1.45"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
++checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
+ dependencies = [
++ "autocfg",
+  "num-traits",
+ ]
+ 
+ [[package]]
+ name = "num-traits"
+-version = "0.2.18"
++version = "0.2.17"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a"
++checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+ dependencies = [
+  "autocfg",
+ ]
+@@ -1663,9 +1665,15 @@ dependencies = [
+  "proc-macro2",
+  "proc-macro2-diagnostics",
+  "quote",
+- "syn 2.0.52",
++ "syn 2.0.48",
+ ]
+ 
++[[package]]
++name = "peeking_take_while"
++version = "0.1.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
++
+ [[package]]
+ name = "pem"
+ version = "3.0.3"
+@@ -1684,9 +1692,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
+ 
+ [[package]]
+ name = "persy"
+-version = "1.5.0"
++version = "1.4.7"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "9ef4b7250ab3a90ded0e284b2633469c23ef01ea868fe7cbb64e2f0a7d6f6d02"
++checksum = "3cd38c602b23c2f451842d89f27cd5e0d4b292176daf40feeda859c658dcdc76"
+ dependencies = [
+  "crc",
+  "data-encoding",
+@@ -1700,22 +1708,22 @@ dependencies = [
+ 
+ [[package]]
+ name = "pin-project"
+-version = "1.1.5"
++version = "1.1.4"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3"
++checksum = "0302c4a0442c456bd56f841aee5c3bfd17967563f6fadc9ceb9f9c23cf3807e0"
+ dependencies = [
+  "pin-project-internal",
+ ]
+ 
+ [[package]]
+ name = "pin-project-internal"
+-version = "1.1.5"
++version = "1.1.4"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
++checksum = "266c042b60c9c76b8d53061e52b2e0d1116abc57cefc8c5cd671619a56ac3690"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.52",
++ "syn 2.0.48",
+ ]
+ 
+ [[package]]
+@@ -1742,9 +1750,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "pkg-config"
+-version = "0.3.30"
++version = "0.3.29"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
++checksum = "2900ede94e305130c13ddd391e0ab7cbaeb783945ae07a279c268cb05109c6cb"
+ 
+ [[package]]
+ name = "platforms"
+@@ -1754,9 +1762,9 @@ checksum = "626dec3cac7cc0e1577a2ec3fc496277ec2baa084bebad95bb6fdbfae235f84c"
+ 
+ [[package]]
+ name = "png"
+-version = "0.17.13"
++version = "0.17.11"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1"
++checksum = "1f6c3c3e617595665b8ea2ff95a86066be38fb121ff920a9c0eb282abcd1da5a"
+ dependencies = [
+  "bitflags 1.3.2",
+  "crc32fast",
+@@ -1777,21 +1785,30 @@ version = "0.2.17"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+ 
++[[package]]
++name = "prettyplease"
++version = "0.2.16"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a41cf62165e97c7f814d2221421dbb9afcbcdb0a88068e5ea206e19951c2cbb5"
++dependencies = [
++ "proc-macro2",
++ "syn 2.0.48",
++]
++
+ [[package]]
+ name = "proc-macro-crate"
+-version = "2.0.2"
++version = "2.0.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "b00f26d3400549137f92511a46ac1cd8ce37cb5598a96d382381458b992a5d24"
++checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8"
+ dependencies = [
+- "toml_datetime",
+- "toml_edit",
++ "toml_edit 0.20.7",
+ ]
+ 
+ [[package]]
+ name = "proc-macro2"
+-version = "1.0.79"
++version = "1.0.78"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e"
++checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+ dependencies = [
+  "unicode-ident",
+ ]
+@@ -1804,7 +1821,7 @@ checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.52",
++ "syn 2.0.48",
+  "version_check",
+  "yansi",
+ ]
+@@ -1882,7 +1899,7 @@ checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15"
+ dependencies = [
+  "aho-corasick",
+  "memchr",
+- "regex-automata 0.4.6",
++ "regex-automata 0.4.5",
+  "regex-syntax 0.8.2",
+ ]
+ 
+@@ -1897,9 +1914,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "regex-automata"
+-version = "0.4.6"
++version = "0.4.5"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"
++checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd"
+ dependencies = [
+  "aho-corasick",
+  "memchr",
+@@ -1920,9 +1937,9 @@ checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
+ 
+ [[package]]
+ name = "reqwest"
+-version = "0.11.26"
++version = "0.11.23"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "78bf93c4af7a8bb7d879d51cebe797356ff10ae8516ace542b5182d9dcac10b2"
++checksum = "37b1ae8d9ac08420c66222fb9096fc5de435c3c48542bc5336c51892cffafb41"
+ dependencies = [
+  "base64",
+  "bytes",
+@@ -1947,7 +1964,6 @@ dependencies = [
+  "serde",
+  "serde_json",
+  "serde_urlencoded",
+- "sync_wrapper",
+  "system-configuration",
+  "tokio",
+  "tokio-rustls",
+@@ -1972,17 +1988,26 @@ dependencies = [
+ 
+ [[package]]
+ name = "ring"
+-version = "0.17.8"
++version = "0.17.7"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
++checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74"
+ dependencies = [
+  "cc",
+- "cfg-if",
+  "getrandom",
+  "libc",
+  "spin",
+  "untrusted",
+- "windows-sys 0.52.0",
++ "windows-sys 0.48.0",
++]
++
++[[package]]
++name = "rocksdb"
++version = "0.21.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "bb6f170a4041d50a0ce04b0d2e14916d6ca863ea2e422689a5b694395d299ffe"
++dependencies = [
++ "libc",
++ "librocksdb-sys",
+ ]
+ 
+ [[package]]
+@@ -2045,7 +2070,7 @@ dependencies = [
+  "bytes",
+  "form_urlencoded",
+  "http",
+- "indexmap 2.2.5",
++ "indexmap 2.2.1",
+  "js_int",
+  "konst",
+  "percent-encoding",
+@@ -2071,7 +2096,7 @@ version = "0.27.11"
+ source = "git+https://github.com/ruma/ruma?rev=5495b85aa311c2805302edb0a7de40399e22b397#5495b85aa311c2805302edb0a7de40399e22b397"
+ dependencies = [
+  "as_variant",
+- "indexmap 2.2.5",
++ "indexmap 2.2.1",
+  "js_int",
+  "js_option",
+  "percent-encoding",
+@@ -2129,7 +2154,7 @@ dependencies = [
+  "quote",
+  "ruma-identifiers-validation",
+  "serde",
+- "syn 2.0.52",
++ "syn 2.0.48",
+  "toml",
+ ]
+ 
+@@ -2166,7 +2191,7 @@ name = "ruma-state-res"
+ version = "0.10.0"
+ source = "git+https://github.com/ruma/ruma?rev=5495b85aa311c2805302edb0a7de40399e22b397#5495b85aa311c2805302edb0a7de40399e22b397"
+ dependencies = [
+- "itertools 0.11.0",
++ "itertools",
+  "js_int",
+  "ruma-common",
+  "ruma-events",
+@@ -2202,32 +2227,6 @@ dependencies = [
+  "crossbeam-utils",
+ ]
+ 
+-[[package]]
+-name = "rust-librocksdb-sys"
+-version = "0.20.0+9.1.0"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "48b14f4848d8574c074bb26445b43e63735d802ef2fc5cc40c1b015134baee0c"
+-dependencies = [
+- "bindgen",
+- "bzip2-sys",
+- "cc",
+- "glob",
+- "libc",
+- "libz-sys",
+- "lz4-sys",
+- "zstd-sys",
+-]
+-
+-[[package]]
+-name = "rust-rocksdb"
+-version = "0.24.0"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "d36eae38b1d3d0018e273191f791343bd3eb030d7da63aaa20350e41c0182881"
+-dependencies = [
+- "libc",
+- "rust-librocksdb-sys",
+-]
+-
+ [[package]]
+ name = "rustc-demangle"
+ version = "0.1.23"
+@@ -2300,9 +2299,9 @@ checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4"
+ 
+ [[package]]
+ name = "ryu"
+-version = "1.0.17"
++version = "1.0.16"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1"
++checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c"
+ 
+ [[package]]
+ name = "schannel"
+@@ -2360,38 +2359,38 @@ dependencies = [
+ 
+ [[package]]
+ name = "semver"
+-version = "1.0.22"
++version = "1.0.21"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca"
++checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0"
+ 
+ [[package]]
+ name = "serde"
+-version = "1.0.197"
++version = "1.0.196"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2"
++checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32"
+ dependencies = [
+  "serde_derive",
+ ]
+ 
+ [[package]]
+ name = "serde_derive"
+-version = "1.0.197"
++version = "1.0.196"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"
++checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.52",
++ "syn 2.0.48",
+ ]
+ 
+ [[package]]
+ name = "serde_html_form"
+-version = "0.2.5"
++version = "0.2.4"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "50437e6a58912eecc08865e35ea2e8d365fbb2db0debb1c8bb43bf1faf055f25"
++checksum = "20e1066e1cfa6692a722cf40386a2caec36da5ddc4a2c16df592f0f609677e8c"
+ dependencies = [
+  "form_urlencoded",
+- "indexmap 2.2.5",
++ "indexmap 2.2.1",
+  "itoa",
+  "ryu",
+  "serde",
+@@ -2399,9 +2398,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "serde_json"
+-version = "1.0.114"
++version = "1.0.113"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0"
++checksum = "69801b70b1c3dac963ecb03a364ba0ceda9cf60c71cfe475e99864759c8b8a79"
+ dependencies = [
+  "itoa",
+  "ryu",
+@@ -2410,9 +2409,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "serde_path_to_error"
+-version = "0.1.16"
++version = "0.1.15"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "af99884400da37c88f5e9146b7f1fd0fbcae8f6eec4e9da38b67d05486f814a6"
++checksum = "ebd154a240de39fdebcf5775d2675c204d7c13cf39a4c697be6493c8e734337c"
+ dependencies = [
+  "itoa",
+  "serde",
+@@ -2441,11 +2440,11 @@ dependencies = [
+ 
+ [[package]]
+ name = "serde_yaml"
+-version = "0.9.32"
++version = "0.9.31"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "8fd075d994154d4a774f95b51fb96bdc2832b0ea48425c92546073816cda1f2f"
++checksum = "adf8a49373e98a4c5f0ceb5d05aa7c648d75f63774981ed95b7c7443bbd50c6e"
+ dependencies = [
+- "indexmap 2.2.5",
++ "indexmap 2.2.1",
+  "itoa",
+  "ryu",
+  "serde",
+@@ -2553,12 +2552,12 @@ checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+ 
+ [[package]]
+ name = "socket2"
+-version = "0.5.6"
++version = "0.5.5"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871"
++checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9"
+ dependencies = [
+  "libc",
+- "windows-sys 0.52.0",
++ "windows-sys 0.48.0",
+ ]
+ 
+ [[package]]
+@@ -2605,9 +2604,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "syn"
+-version = "2.0.52"
++version = "2.0.48"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07"
++checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+@@ -2643,29 +2642,29 @@ dependencies = [
+ 
+ [[package]]
+ name = "thiserror"
+-version = "1.0.58"
++version = "1.0.56"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297"
++checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad"
+ dependencies = [
+  "thiserror-impl",
+ ]
+ 
+ [[package]]
+ name = "thiserror-impl"
+-version = "1.0.58"
++version = "1.0.56"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7"
++checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.52",
++ "syn 2.0.48",
+ ]
+ 
+ [[package]]
+ name = "thread_local"
+-version = "1.1.8"
++version = "1.1.7"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
++checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
+ dependencies = [
+  "cfg-if",
+  "once_cell",
+@@ -2726,9 +2725,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "time"
+-version = "0.3.34"
++version = "0.3.36"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749"
++checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
+ dependencies = [
+  "deranged",
+  "itoa",
+@@ -2747,9 +2746,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
+ 
+ [[package]]
+ name = "time-macros"
+-version = "0.2.17"
++version = "0.2.18"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774"
++checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
+ dependencies = [
+  "num-conv",
+  "time-core",
+@@ -2772,9 +2771,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
+ 
+ [[package]]
+ name = "tokio"
+-version = "1.36.0"
++version = "1.35.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931"
++checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104"
+ dependencies = [
+  "backtrace",
+  "bytes",
+@@ -2796,7 +2795,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.52",
++ "syn 2.0.48",
+ ]
+ 
+ [[package]]
+@@ -2848,32 +2847,43 @@ dependencies = [
+ 
+ [[package]]
+ name = "toml"
+-version = "0.8.2"
++version = "0.8.8"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d"
++checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35"
+ dependencies = [
+  "serde",
+  "serde_spanned",
+  "toml_datetime",
+- "toml_edit",
++ "toml_edit 0.21.0",
+ ]
+ 
+ [[package]]
+ name = "toml_datetime"
+-version = "0.6.3"
++version = "0.6.5"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b"
++checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
+ dependencies = [
+  "serde",
+ ]
+ 
+ [[package]]
+ name = "toml_edit"
+-version = "0.20.2"
++version = "0.20.7"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338"
++checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81"
+ dependencies = [
+- "indexmap 2.2.5",
++ "indexmap 2.2.1",
++ "toml_datetime",
++ "winnow",
++]
++
++[[package]]
++name = "toml_edit"
++version = "0.21.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03"
++dependencies = [
++ "indexmap 2.2.1",
+  "serde",
+  "serde_spanned",
+  "toml_datetime",
+@@ -2947,7 +2957,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.52",
++ "syn 2.0.48",
+ ]
+ 
+ [[package]]
+@@ -3120,9 +3130,9 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+ 
+ [[package]]
+ name = "unicode-normalization"
+-version = "0.1.23"
++version = "0.1.22"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
++checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
+ dependencies = [
+  "tinyvec",
+ ]
+@@ -3135,9 +3145,9 @@ checksum = "ab4c90930b95a82d00dc9e9ac071b4991924390d46cbd0dfe566148667605e4b"
+ 
+ [[package]]
+ name = "unsigned-varint"
+-version = "0.8.0"
++version = "0.7.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "eb066959b24b5196ae73cb057f45598450d2c5f71460e98c49b738086eff9c06"
++checksum = "6889a77d49f1f013504cec6bf97a2c730394adedaeb1deb5ea08949a50541105"
+ 
+ [[package]]
+ name = "untrusted"
+@@ -3200,9 +3210,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+ 
+ [[package]]
+ name = "wasm-bindgen"
+-version = "0.2.92"
++version = "0.2.90"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
++checksum = "b1223296a201415c7fad14792dbefaace9bd52b62d33453ade1c5b5f07555406"
+ dependencies = [
+  "cfg-if",
+  "wasm-bindgen-macro",
+@@ -3210,24 +3220,24 @@ dependencies = [
+ 
+ [[package]]
+ name = "wasm-bindgen-backend"
+-version = "0.2.92"
++version = "0.2.90"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
++checksum = "fcdc935b63408d58a32f8cc9738a0bffd8f05cc7c002086c6ef20b7312ad9dcd"
+ dependencies = [
+  "bumpalo",
+  "log",
+  "once_cell",
+  "proc-macro2",
+  "quote",
+- "syn 2.0.52",
++ "syn 2.0.48",
+  "wasm-bindgen-shared",
+ ]
+ 
+ [[package]]
+ name = "wasm-bindgen-futures"
+-version = "0.4.42"
++version = "0.4.40"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0"
++checksum = "bde2032aeb86bdfaecc8b261eef3cba735cc426c1f3a3416d1e0791be95fc461"
+ dependencies = [
+  "cfg-if",
+  "js-sys",
+@@ -3237,9 +3247,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "wasm-bindgen-macro"
+-version = "0.2.92"
++version = "0.2.90"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
++checksum = "3e4c238561b2d428924c49815533a8b9121c664599558a5d9ec51f8a1740a999"
+ dependencies = [
+  "quote",
+  "wasm-bindgen-macro-support",
+@@ -3247,28 +3257,28 @@ dependencies = [
+ 
+ [[package]]
+ name = "wasm-bindgen-macro-support"
+-version = "0.2.92"
++version = "0.2.90"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
++checksum = "bae1abb6806dc1ad9e560ed242107c0f6c84335f1749dd4e8ddb012ebd5e25a7"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.52",
++ "syn 2.0.48",
+  "wasm-bindgen-backend",
+  "wasm-bindgen-shared",
+ ]
+ 
+ [[package]]
+ name = "wasm-bindgen-shared"
+-version = "0.2.92"
++version = "0.2.90"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
++checksum = "4d91413b1c31d7539ba5ef2451af3f0b833a005eb27a631cec32bc0635a8602b"
+ 
+ [[package]]
+ name = "web-sys"
+-version = "0.3.69"
++version = "0.3.67"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef"
++checksum = "58cd2333b6e0be7a39605f0e255892fd7418a682d8da8fe042fe25128794d2ed"
+ dependencies = [
+  "js-sys",
+  "wasm-bindgen",
+@@ -3298,9 +3308,9 @@ checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8"
+ 
+ [[package]]
+ name = "wildmatch"
+-version = "2.3.1"
++version = "2.3.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "017f0a8ed8331210d91b7a4c30d4edef8f21a65c02f2540496e2e79725f6d8a8"
++checksum = "495ec47bf3c1345005f40724f0269362c8556cbc43aed0526ed44cae1d35fceb"
+ 
+ [[package]]
+ name = "winapi"
+@@ -3339,7 +3349,7 @@ version = "0.52.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+ dependencies = [
+- "windows-targets 0.52.4",
++ "windows-targets 0.52.0",
+ ]
+ 
+ [[package]]
+@@ -3359,17 +3369,17 @@ dependencies = [
+ 
+ [[package]]
+ name = "windows-targets"
+-version = "0.52.4"
++version = "0.52.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b"
++checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd"
+ dependencies = [
+- "windows_aarch64_gnullvm 0.52.4",
+- "windows_aarch64_msvc 0.52.4",
+- "windows_i686_gnu 0.52.4",
+- "windows_i686_msvc 0.52.4",
+- "windows_x86_64_gnu 0.52.4",
+- "windows_x86_64_gnullvm 0.52.4",
+- "windows_x86_64_msvc 0.52.4",
++ "windows_aarch64_gnullvm 0.52.0",
++ "windows_aarch64_msvc 0.52.0",
++ "windows_i686_gnu 0.52.0",
++ "windows_i686_msvc 0.52.0",
++ "windows_x86_64_gnu 0.52.0",
++ "windows_x86_64_gnullvm 0.52.0",
++ "windows_x86_64_msvc 0.52.0",
+ ]
+ 
+ [[package]]
+@@ -3380,9 +3390,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
+ 
+ [[package]]
+ name = "windows_aarch64_gnullvm"
+-version = "0.52.4"
++version = "0.52.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9"
++checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea"
+ 
+ [[package]]
+ name = "windows_aarch64_msvc"
+@@ -3392,9 +3402,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
+ 
+ [[package]]
+ name = "windows_aarch64_msvc"
+-version = "0.52.4"
++version = "0.52.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675"
++checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef"
+ 
+ [[package]]
+ name = "windows_i686_gnu"
+@@ -3404,9 +3414,9 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
+ 
+ [[package]]
+ name = "windows_i686_gnu"
+-version = "0.52.4"
++version = "0.52.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3"
++checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313"
+ 
+ [[package]]
+ name = "windows_i686_msvc"
+@@ -3416,9 +3426,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
+ 
+ [[package]]
+ name = "windows_i686_msvc"
+-version = "0.52.4"
++version = "0.52.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02"
++checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a"
+ 
+ [[package]]
+ name = "windows_x86_64_gnu"
+@@ -3428,9 +3438,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
+ 
+ [[package]]
+ name = "windows_x86_64_gnu"
+-version = "0.52.4"
++version = "0.52.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03"
++checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd"
+ 
+ [[package]]
+ name = "windows_x86_64_gnullvm"
+@@ -3440,9 +3450,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
+ 
+ [[package]]
+ name = "windows_x86_64_gnullvm"
+-version = "0.52.4"
++version = "0.52.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177"
++checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e"
+ 
+ [[package]]
+ name = "windows_x86_64_msvc"
+@@ -3452,15 +3462,15 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
+ 
+ [[package]]
+ name = "windows_x86_64_msvc"
+-version = "0.52.4"
++version = "0.52.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8"
++checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
+ 
+ [[package]]
+ name = "winnow"
+-version = "0.5.40"
++version = "0.5.35"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
++checksum = "1931d78a9c73861da0134f453bb1f790ce49b2e30eba8410b4b79bac72b46a2d"
+ dependencies = [
+  "memchr",
+ ]
+@@ -3477,9 +3487,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "yansi"
+-version = "1.0.1"
++version = "1.0.0-rc.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049"
++checksum = "1367295b8f788d371ce2dbc842c7b709c73ee1364d30351dd300ec2203b12377"
+ 
+ [[package]]
+ name = "zerocopy"
+@@ -3498,7 +3508,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.52",
++ "syn 2.0.48",
+ ]
+ 
+ [[package]]
+diff --git a/Cargo.toml b/Cargo.toml
+index cc5b37e..affd704 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -97,6 +97,8 @@ threadpool = "1.8.1"
+ # Used for ruma wrapper
+ serde_html_form = "0.2.0"
+ 
++rocksdb = { version = "0.21.0", default-features = true, features = ["multi-threaded-cf", "zstd", "lz4"], optional = true }
++
+ thread_local = "1.1.7"
+ # used for TURN server authentication
+ hmac = "0.12.1"
+@@ -114,18 +116,8 @@ async-trait = "0.1.68"
+ 
+ sd-notify = { version = "0.4.1", optional = true }
+ 
+-[dependencies.rocksdb]
+-package = "rust-rocksdb"
+-version = "0.24.0"
+-optional = true
+-features = [
+-    "multi-threaded-cf",
+-    "zstd",
+-    "lz4",
+-]
+-
+ [target.'cfg(unix)'.dependencies]
+-nix = { version = "0.28", features = ["resource"] }
++nix = { version = "0.27", features = ["resource"] }
+ 
+ [features]
+ default = ["conduit_bin", "backend_sqlite", "backend_rocksdb", "systemd"]
+diff --git a/flake.nix b/flake.nix
+index 114e221..5a4568b 100644
+--- a/flake.nix
++++ b/flake.nix
+@@ -53,24 +53,10 @@
+         pkgs.pkgsBuildHost.rustPlatform.bindgenHook
+       ];
+ 
+-      rocksdb' = pkgs:
+-      let
+-        version = "9.1.0";
+-      in
+-      pkgs.rocksdb.overrideAttrs (old: {
+-        inherit version;
+-        src = pkgs.fetchFromGitHub {
+-          owner = "facebook";
+-          repo = "rocksdb";
+-          rev = "v${version}";
+-          hash = "sha256-vRPyrXkXVVhP56n5FVYef8zbIsnnanQSpElmQLZ7mh8=";
+-        };
+-      });
+-
+       env = pkgs: {
+         CONDUIT_VERSION_EXTRA = self.shortRev or self.dirtyShortRev;
+-        ROCKSDB_INCLUDE_DIR = "${rocksdb' pkgs}/include";
+-        ROCKSDB_LIB_DIR = "${rocksdb' pkgs}/lib";
++        ROCKSDB_INCLUDE_DIR = "${pkgs.rocksdb}/include";
++        ROCKSDB_LIB_DIR = "${pkgs.rocksdb}/lib";
+       }
+       // pkgs.lib.optionalAttrs pkgs.stdenv.hostPlatform.isStatic {
+         ROCKSDB_STATIC = "";
+diff --git a/src/database/abstraction/rocksdb.rs b/src/database/abstraction/rocksdb.rs
+index 447ee03..7a93d78 100644
+--- a/src/database/abstraction/rocksdb.rs
++++ b/src/database/abstraction/rocksdb.rs
+@@ -23,23 +23,29 @@ pub struct RocksDbEngineTree<'a> {
+ fn db_options(max_open_files: i32, rocksdb_cache: &rocksdb::Cache) -> rocksdb::Options {
+     let mut block_based_options = rocksdb::BlockBasedOptions::default();
+     block_based_options.set_block_cache(rocksdb_cache);
+-    block_based_options.set_bloom_filter(10.0, false);
++
++    // "Difference of spinning disk"
++    // https://zhangyuchi.gitbooks.io/rocksdbbook/content/RocksDB-Tuning-Guide.html
+     block_based_options.set_block_size(4 * 1024);
+     block_based_options.set_cache_index_and_filter_blocks(true);
+-    block_based_options.set_pin_l0_filter_and_index_blocks_in_cache(true);
+-    block_based_options.set_optimize_filters_for_memory(true);
+ 
+     let mut db_opts = rocksdb::Options::default();
+     db_opts.set_block_based_table_factory(&block_based_options);
++    db_opts.set_optimize_filters_for_hits(true);
++    db_opts.set_skip_stats_update_on_db_open(true);
++    db_opts.set_level_compaction_dynamic_level_bytes(true);
++    db_opts.set_target_file_size_base(256 * 1024 * 1024);
++    //db_opts.set_compaction_readahead_size(2 * 1024 * 1024);
++    //db_opts.set_use_direct_reads(true);
++    //db_opts.set_use_direct_io_for_flush_and_compaction(true);
+     db_opts.create_if_missing(true);
+     db_opts.increase_parallelism(num_cpus::get() as i32);
+     db_opts.set_max_open_files(max_open_files);
+-    db_opts.set_compression_type(rocksdb::DBCompressionType::Lz4);
+-    db_opts.set_bottommost_compression_type(rocksdb::DBCompressionType::Zstd);
++    db_opts.set_compression_type(rocksdb::DBCompressionType::Zstd);
+     db_opts.set_compaction_style(rocksdb::DBCompactionStyle::Level);
++    db_opts.optimize_level_style_compaction(10 * 1024 * 1024);
+ 
+     // https://github.com/facebook/rocksdb/wiki/Setup-Options-and-Basic-Tuning
+-    db_opts.set_level_compaction_dynamic_level_bytes(true);
+     db_opts.set_max_background_jobs(6);
+     db_opts.set_bytes_per_sync(1048576);
+ 
+@@ -53,6 +59,9 @@ fn db_options(max_open_files: i32, rocksdb_cache: &rocksdb::Cache) -> rocksdb::O
+     // restored via federation.
+     db_opts.set_wal_recovery_mode(rocksdb::DBRecoveryMode::TolerateCorruptedTailRecords);
+ 
++    let prefix_extractor = rocksdb::SliceTransform::create_fixed_prefix(1);
++    db_opts.set_prefix_extractor(prefix_extractor);
++
+     db_opts
+ }
+ 
+@@ -138,17 +147,12 @@ impl RocksDbEngineTree<'_> {
+ 
+ impl KvTree for RocksDbEngineTree<'_> {
+     fn get(&self, key: &[u8]) -> Result<Option<Vec<u8>>> {
+-        let readoptions = rocksdb::ReadOptions::default();
+-
+-        Ok(self.db.rocks.get_cf_opt(&self.cf(), key, &readoptions)?)
++        Ok(self.db.rocks.get_cf(&self.cf(), key)?)
+     }
+ 
+     fn insert(&self, key: &[u8], value: &[u8]) -> Result<()> {
+-        let writeoptions = rocksdb::WriteOptions::default();
+         let lock = self.write_lock.read().unwrap();
+-        self.db
+-            .rocks
+-            .put_cf_opt(&self.cf(), key, value, &writeoptions)?;
++        self.db.rocks.put_cf(&self.cf(), key, value)?;
+         drop(lock);
+ 
+         self.watchers.wake(key);
+@@ -157,31 +161,22 @@ impl KvTree for RocksDbEngineTree<'_> {
+     }
+ 
+     fn insert_batch<'a>(&self, iter: &mut dyn Iterator<Item = (Vec<u8>, Vec<u8>)>) -> Result<()> {
+-        let writeoptions = rocksdb::WriteOptions::default();
+         for (key, value) in iter {
+-            self.db
+-                .rocks
+-                .put_cf_opt(&self.cf(), key, value, &writeoptions)?;
++            self.db.rocks.put_cf(&self.cf(), key, value)?;
+         }
+ 
+         Ok(())
+     }
+ 
+     fn remove(&self, key: &[u8]) -> Result<()> {
+-        let writeoptions = rocksdb::WriteOptions::default();
+-        Ok(self
+-            .db
+-            .rocks
+-            .delete_cf_opt(&self.cf(), key, &writeoptions)?)
++        Ok(self.db.rocks.delete_cf(&self.cf(), key)?)
+     }
+ 
+     fn iter<'a>(&'a self) -> Box<dyn Iterator<Item = (Vec<u8>, Vec<u8>)> + 'a> {
+-        let readoptions = rocksdb::ReadOptions::default();
+-
+         Box::new(
+             self.db
+                 .rocks
+-                .iterator_cf_opt(&self.cf(), readoptions, rocksdb::IteratorMode::Start)
++                .iterator_cf(&self.cf(), rocksdb::IteratorMode::Start)
+                 .map(|r| r.unwrap())
+                 .map(|(k, v)| (Vec::from(k), Vec::from(v))),
+         )
+@@ -192,14 +187,11 @@ impl KvTree for RocksDbEngineTree<'_> {
+         from: &[u8],
+         backwards: bool,
+     ) -> Box<dyn Iterator<Item = (Vec<u8>, Vec<u8>)> + 'a> {
+-        let readoptions = rocksdb::ReadOptions::default();
+-
+         Box::new(
+             self.db
+                 .rocks
+-                .iterator_cf_opt(
++                .iterator_cf(
+                     &self.cf(),
+-                    readoptions,
+                     rocksdb::IteratorMode::From(
+                         from,
+                         if backwards {
+@@ -215,33 +207,23 @@ impl KvTree for RocksDbEngineTree<'_> {
+     }
+ 
+     fn increment(&self, key: &[u8]) -> Result<Vec<u8>> {
+-        let readoptions = rocksdb::ReadOptions::default();
+-        let writeoptions = rocksdb::WriteOptions::default();
+-
+         let lock = self.write_lock.write().unwrap();
+ 
+-        let old = self.db.rocks.get_cf_opt(&self.cf(), key, &readoptions)?;
++        let old = self.db.rocks.get_cf(&self.cf(), key)?;
+         let new = utils::increment(old.as_deref()).unwrap();
+-        self.db
+-            .rocks
+-            .put_cf_opt(&self.cf(), key, &new, &writeoptions)?;
++        self.db.rocks.put_cf(&self.cf(), key, &new)?;
+ 
+         drop(lock);
+         Ok(new)
+     }
+ 
+     fn increment_batch<'a>(&self, iter: &mut dyn Iterator<Item = Vec<u8>>) -> Result<()> {
+-        let readoptions = rocksdb::ReadOptions::default();
+-        let writeoptions = rocksdb::WriteOptions::default();
+-
+         let lock = self.write_lock.write().unwrap();
+ 
+         for key in iter {
+-            let old = self.db.rocks.get_cf_opt(&self.cf(), &key, &readoptions)?;
++            let old = self.db.rocks.get_cf(&self.cf(), &key)?;
+             let new = utils::increment(old.as_deref()).unwrap();
+-            self.db
+-                .rocks
+-                .put_cf_opt(&self.cf(), key, new, &writeoptions)?;
++            self.db.rocks.put_cf(&self.cf(), key, new)?;
+         }
+ 
+         drop(lock);
+@@ -253,14 +235,11 @@ impl KvTree for RocksDbEngineTree<'_> {
+         &'a self,
+         prefix: Vec<u8>,
+     ) -> Box<dyn Iterator<Item = (Vec<u8>, Vec<u8>)> + 'a> {
+-        let readoptions = rocksdb::ReadOptions::default();
+-
+         Box::new(
+             self.db
+                 .rocks
+-                .iterator_cf_opt(
++                .iterator_cf(
+                     &self.cf(),
+-                    readoptions,
+                     rocksdb::IteratorMode::From(&prefix, rocksdb::Direction::Forward),
+                 )
+                 .map(|r| r.unwrap())
diff --git a/testing/conduit/riscv64-ring.patch.noauto b/testing/conduit/riscv64-ring.patch.noauto
deleted file mode 100644
index 86b51b8147a..00000000000
--- a/testing/conduit/riscv64-ring.patch.noauto
+++ /dev/null
@@ -1,52 +0,0 @@
-Required for riscv64 build.
-
-Upstream conduit needs to upgrade to patched versions of ring (done).
-This patch can be removed once conduit releases a new version that builds against the patched version of the two library.
-
-diff --git a/Cargo.toml b/Cargo.toml
-index 13ea007..03e7a30 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -17,6 +17,9 @@ rust-version = "1.70.0"
- 
- # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
- 
-+[patch.crates-io]
-+ring = { path = "../ring-riscv64-support-0.16.20-compat" }
-+
- [dependencies]
- # Web framework
- axum = { version = "0.6.18", default-features = false, features = ["form", "headers", "http1", "http2", "json", "matched-path"], optional = true }
-diff --git a/Cargo.lock b/Cargo.lock
-index 35a4208..17b7e9a 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -2114,15 +2113,12 @@ dependencies = [
- [[package]]
- name = "ring"
- version = "0.16.20"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
- dependencies = [
-  "cc",
-+ "getrandom 0.2.10",
-  "libc",
-- "once_cell",
-  "spin",
-  "untrusted",
-- "web-sys",
-  "winapi",
- ]
- 
-@@ -2676,9 +2672,9 @@ dependencies = [
- 
- [[package]]
- name = "spin"
--version = "0.5.2"
-+version = "0.9.8"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
-+checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
- 
- [[package]]
- name = "spki"