diff --git a/Cargo.lock b/Cargo.lock index df76e82a5..cadd11889 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -445,16 +445,17 @@ dependencies = [ [[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", "lazy_static", "lazycell", + "peeking_take_while", + "prettyplease 0.2.16", "proc-macro2", "quote", "regex", @@ -2954,7 +2955,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite 0.2.13", - "socket2 0.5.5", + "socket2 0.4.10", "tokio", "tower-service", "tracing", @@ -3431,7 +3432,7 @@ dependencies = [ "num_cpus", "parking_lot 0.12.1", "regex", - "rocksdb 0.21.0", + "rocksdb", "smallvec", ] @@ -3946,9 +3947,9 @@ dependencies = [ [[package]] name = "librocksdb-sys" -version = "0.16.0+8.10.0" +version = "0.11.0+8.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce3d60bc059831dc1c83903fb45c103f75db65c5a7bf22272764d9cc683e348c" +checksum = "d3386f101bcb4bd252d8e9d2fb41ec3b0862a15a62b478c355b2982efa469e3e" dependencies = [ "bindgen", "bzip2-sys", @@ -3958,7 +3959,6 @@ dependencies = [ "libz-sys", "lz4-sys", "tikv-jemalloc-sys", - "zstd-sys", ] [[package]] @@ -4768,7 +4768,7 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" dependencies = [ - "proc-macro-crate 3.1.0", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", "syn 2.0.48", @@ -5188,6 +5188,12 @@ dependencies = [ "sha2", ] +[[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 = "1.1.1" @@ -5988,15 +5994,8 @@ dependencies = [ [[package]] name = "rocksdb" version = "0.21.0" -dependencies = [ - "rocksdb 0.22.0", -] - -[[package]] -name = "rocksdb" -version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bd13e55d6d7b8cd0ea569161127567cd587676c99f4472f779a0279aa60a7a7" +checksum = "bb6f170a4041d50a0ce04b0d2e14916d6ca863ea2e422689a5b694395d299ffe" dependencies = [ "libc", "librocksdb-sys", @@ -7477,7 +7476,7 @@ name = "serai-db" version = "0.1.0" dependencies = [ "parity-db", - "rocksdb 0.22.0", + "rocksdb", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index c4a4bdf9b..25601c46e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,6 @@ resolver = "2" members = [ # Version patches "patches/zstd", - "patches/rocksdb", "patches/proc-macro-crate", # std patches @@ -113,8 +112,6 @@ dockertest = { git = "https://github.com/kayabaNerve/dockertest-rs", branch = "a # wasmtime pulls in an old version for this zstd = { path = "patches/zstd" } -# substrate pulls in an old version for this -rocksdb = { path = "patches/rocksdb" } # proc-macro-crate 2 binds to an old version of toml for msrv so we patch to 3 proc-macro-crate = { path = "patches/proc-macro-crate" } diff --git a/common/db/Cargo.toml b/common/db/Cargo.toml index 787361a47..78d486a1b 100644 --- a/common/db/Cargo.toml +++ b/common/db/Cargo.toml @@ -18,7 +18,7 @@ workspace = true [dependencies] parity-db = { version = "0.4", default-features = false, optional = true } -rocksdb = { version = "0.22", default-features = false, features = ["lz4"], optional = true } +rocksdb = { version = "0.21", default-features = false, features = ["lz4"], optional = true } [features] parity-db = ["dep:parity-db"] diff --git a/patches/rocksdb/Cargo.toml b/patches/rocksdb/Cargo.toml deleted file mode 100644 index c5ee957d6..000000000 --- a/patches/rocksdb/Cargo.toml +++ /dev/null @@ -1,21 +0,0 @@ -[package] -name = "rocksdb" -version = "0.21.0" -description = "rocksdb which patches to the latest update" -license = "MIT" -repository = "https://github.com/serai-dex/serai/tree/develop/patches/rocksdb" -authors = ["Luke Parker "] -keywords = [] -edition = "2021" -rust-version = "1.63" - -[package.metadata.docs.rs] -all-features = true -rustdoc-args = ["--cfg", "docsrs"] - -[dependencies] -rocksdb = "0.22" - -[features] -jemalloc = ["rocksdb/jemalloc"] -snappy = ["rocksdb/snappy"] diff --git a/patches/rocksdb/src/lib.rs b/patches/rocksdb/src/lib.rs deleted file mode 100644 index bd209ce8e..000000000 --- a/patches/rocksdb/src/lib.rs +++ /dev/null @@ -1 +0,0 @@ -pub use rocksdb::*;