Update Cargo.lock after rebase

Cargo.toml

@@ -3,13 +3,8 @@ resolver = "2"
 members = [
   # Version patches
   "patches/parking_lot",
-  "patches/zstd",
   "patches/rocksdb",
 
-  # std patches
-  "patches/matches",
-  "patches/is-terminal",
-
   # Rewrites/redirects
   "patches/option-ext",
   "patches/directories-next",
@@ -190,16 +185,9 @@ modular-frost = { path = "crypto/frost" }
 lazy_static = { git = "https://github.com/rust-lang-nursery/lazy-static.rs", rev = "5735630d46572f1e5377c8f2ba0f79d18f53b10c" }
 
 parking_lot = { path = "patches/parking_lot" }
-# wasmtime pulls in an old version for this
-zstd = { path = "patches/zstd" }
 # Needed for WAL compression
 rocksdb = { path = "patches/rocksdb" }
 
-# is-terminal now has an std-based solution with an equivalent API
-is-terminal = { path = "patches/is-terminal" }
-# So does matches
-matches = { path = "patches/matches" }
-
 # directories-next was created because directories was unmaintained
 # directories-next is now unmaintained while directories is maintained
 # The directories author pulls in ridiculously pointless crates and prefers

common/std-shims/Cargo.toml

@@ -19,7 +19,7 @@ workspace = true
 [dependencies]
 rustversion = { version = "1", default-features = false }
 spin = { version = "0.10", default-features = false, features = ["use_ticket_mutex", "once", "lazy"] }
-hashbrown = { version = "0.15", default-features = false, features = ["default-hasher", "inline-more"] }
+hashbrown = { version = "0.16", default-features = false, features = ["default-hasher", "inline-more"] }
 
 [features]
 std = []

crypto/embedwards25519/Cargo.toml

@@ -14,7 +14,7 @@ all-features = true
 rustdoc-args = ["--cfg", "docsrs"]
 
 [dependencies]
-hex-literal = { version = "0.4", default-features = false }
+hex-literal = { version = "1", default-features = false }
 
 std-shims = { version = "0.1", path = "../../common/std-shims", default-features = false, optional = true }
 

crypto/secq256k1/Cargo.toml

@@ -14,7 +14,7 @@ all-features = true
 rustdoc-args = ["--cfg", "docsrs"]
 
 [dependencies]
-hex-literal = { version = "0.4", default-features = false }
+hex-literal = { version = "1", default-features = false }
 
 std-shims = { version = "0.1", path = "../../common/std-shims", default-features = false, optional = true }
 

deny.toml

@@ -10,6 +10,7 @@ ignore = [
   "RUSTSEC-2022-0061", # https://github.com/serai-dex/serai/227
   "RUSTSEC-2024-0370", # proc-macro-error is unmaintained
   "RUSTSEC-2024-0384", # instant is unmaintained
+  "RUSTSEC-2024-0436", # paste is unmaintained
 ]
 
 [licenses]
@@ -28,7 +29,6 @@ allow = [
   "ISC",
   "Zlib",
   "Unicode-3.0",
-  "OpenSSL",
 
   # Non-invasive copyleft
   "MPL-2.0",
@@ -133,6 +133,5 @@ allow-git = [
   "https://github.com/kayabaNerve/hybrid-array",
   "https://github.com/kayabaNerve/elliptic-curves",
   "https://github.com/monero-oxide/monero-oxide",
-  "https://github.com/serai-dex/substrate-bip39",
   "https://github.com/serai-dex/polkadot-sdk",
 ]

patches/is-terminal/Cargo.toml

@@ -1,14 +0,0 @@
-[package]
-name = "is-terminal"
-version = "0.4.10"
-description = "is-terminal written around std::io::IsTerminal"
-license = "MIT"
-repository = "https://github.com/serai-dex/serai/tree/develop/patches/is-terminal"
-authors = ["Luke Parker <lukeparker5132@gmail.com>"]
-keywords = []
-edition = "2021"
-rust-version = "1.70"
-
-[package.metadata.docs.rs]
-all-features = true
-rustdoc-args = ["--cfg", "docsrs"]

patches/is-terminal/src/lib.rs

@@ -1 +0,0 @@
-pub use std::io::IsTerminal;

patches/matches/Cargo.toml

@@ -1,14 +0,0 @@
-[package]
-name = "matches"
-version = "0.1.10"
-description = "Replacement for the matches polyfill which uses the std impl"
-license = "MIT"
-repository = "https://github.com/serai-dex/serai/tree/develop/patches/matches"
-authors = ["Luke Parker <lukeparker5132@gmail.com>"]
-keywords = []
-edition = "2018"
-rust-version = "1.42"
-
-[package.metadata.docs.rs]
-all-features = true
-rustdoc-args = ["--cfg", "docsrs"]

patches/matches/src/lib.rs

@@ -1 +0,0 @@
-pub use std::matches;

patches/zstd/Cargo.toml

@@ -1,16 +0,0 @@
-[package]
-name = "zstd"
-version = "0.11.2+zstd.1.5.2"
-description = "zstd which patches to the latest update"
-license = "MIT"
-repository = "https://github.com/serai-dex/serai/tree/develop/patches/zstd"
-authors = ["Luke Parker <lukeparker5132@gmail.com>"]
-keywords = []
-edition = "2021"
-
-[package.metadata.docs.rs]
-all-features = true
-rustdoc-args = ["--cfg", "docsrs"]
-
-[dependencies]
-zstd = "0.13"

patches/zstd/src/lib.rs

@@ -1 +0,0 @@
-pub use zstd::*;

substrate/primitives/Cargo.toml

@@ -23,7 +23,8 @@ bitvec = { version = "1", default-features = false, features = ["alloc"] }
 scale = { package = "parity-scale-codec", version = "3", default-features = false, features = ["derive"] }
 sp-core = { git = "https://github.com/serai-dex/polkadot-sdk", branch = "serai-next", default-features = false }
 
-ciphersuite = { path = "../../crypto/ciphersuite", default-features = false, features = ["alloc", "ristretto"] }
+ciphersuite = { path = "../../crypto/ciphersuite", default-features = false, features = ["alloc"] }
+dalek-ff-group = { path = "../../crypto/dalek-ff-group", default-features = false }
 dkg = { path = "../../crypto/dkg", default-features = false }
 
 bech32 = { version = "0.11", default-features = false }

substrate/primitives/src/validator_sets/mod.rs

@@ -3,7 +3,8 @@ use alloc::vec::Vec;
 use zeroize::Zeroize;
 use borsh::{BorshSerialize, BorshDeserialize};
 
-use ciphersuite::{group::GroupEncoding, Ciphersuite, Ristretto};
+use ciphersuite::{group::GroupEncoding, Ciphersuite};
+use dalek_ff_group::Ristretto;
 
 use crate::{
   constants::MAX_KEY_SHARES_PER_SET,