diff --git a/Cargo.lock b/Cargo.lock index be5623945..a69d46cda 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -721,9 +721,9 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.32" +version = "0.4.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41daef31d7a747c5c847246f36de49ced6f7403b4cdabc807a97b5cc184cda7a" +checksum = "9f13690e35a5e4ace198e7beea2895d29f3a9cc55015fcebe6336bd2010af9eb" dependencies = [ "android-tzdata", "iana-time-zone", @@ -1697,7 +1697,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap 2.1.0", + "indexmap 2.2.1", "slab", "tokio", "tokio-util 0.7.10", @@ -2073,9 +2073,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.1.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +checksum = "433de089bd45971eecf4668ee0ee8f4cec17db4f8bd8f7bc3197a6ce37aa7d9b" dependencies = [ "equivalent", "hashbrown 0.14.3", @@ -2184,9 +2184,9 @@ dependencies = [ [[package]] name = "itertools" -version = "0.12.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" dependencies = [ "either", ] @@ -2993,23 +2993,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap 2.1.0", + "indexmap 2.2.1", ] [[package]] name = "pin-project" -version = "1.1.3" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" +checksum = "0302c4a0442c456bd56f841aee5c3bfd17967563f6fadc9ceb9f9c23cf3807e0" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.3" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" +checksum = "266c042b60c9c76b8d53061e52b2e0d1116abc57cefc8c5cd671619a56ac3690" dependencies = [ "proc-macro2", "quote", @@ -3934,9 +3934,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.195" +version = "1.0.196" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02" +checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32" dependencies = [ "serde_derive", ] @@ -3952,9 +3952,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.195" +version = "1.0.196" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c" +checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67" dependencies = [ "proc-macro2", "quote", @@ -3963,11 +3963,11 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.111" +version = "1.0.113" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4" +checksum = "69801b70b1c3dac963ecb03a364ba0ceda9cf60c71cfe475e99864759c8b8a79" dependencies = [ - "indexmap 2.1.0", + "indexmap 2.2.1", "itoa", "ryu", "serde", @@ -4006,18 +4006,18 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.5.0" +version = "3.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f58c3a1b3e418f61c25b2aeb43fc6c95eaa252b8cecdda67f401943e9e08d33f" +checksum = "f5c9fdb6b00a489875b22efd4b78fe2b363b72265cc5f6eb2e2b9ee270e6140c" dependencies = [ "base64 0.21.7", "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.1.0", + "indexmap 2.2.1", "serde", "serde_json", - "serde_with_macros 3.5.0", + "serde_with_macros 3.5.1", "time", ] @@ -4035,9 +4035,9 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.5.0" +version = "3.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2068b437a31fc68f25dd7edc296b078f04b45145c199d8eed9866e45f1ff274" +checksum = "dbff351eb4b33600a2e138dfa0b10b65a238ea8ff8fb2387c422c5022a3e8298" dependencies = [ "darling 0.20.3", "proc-macro2", @@ -4577,7 +4577,7 @@ version = "0.20.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" dependencies = [ - "indexmap 2.1.0", + "indexmap 2.2.1", "toml_datetime", "winnow", ] @@ -4588,7 +4588,7 @@ version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" dependencies = [ - "indexmap 2.1.0", + "indexmap 2.2.1", "serde", "serde_spanned", "toml_datetime", @@ -5679,7 +5679,7 @@ dependencies = [ "hex", "humantime", "incrementalmerkletree", - "itertools 0.12.0", + "itertools 0.12.1", "jubjub", "lazy_static", "num-integer", @@ -5698,7 +5698,7 @@ dependencies = [ "serde", "serde-big-array", "serde_json", - "serde_with 3.5.0", + "serde_with 3.5.1", "sha2", "spandoc", "static_assertions", @@ -5790,8 +5790,8 @@ dependencies = [ "hex", "howudoin", "humantime-serde", - "indexmap 2.1.0", - "itertools 0.12.0", + "indexmap 2.2.1", + "itertools 0.12.1", "lazy_static", "metrics 0.22.0", "num-integer", @@ -5838,7 +5838,7 @@ dependencies = [ "futures", "hex", "hyper", - "indexmap 2.1.0", + "indexmap 2.2.1", "insta", "jsonrpc-core", "jsonrpc-derive", @@ -5871,9 +5871,9 @@ dependencies = [ "ff", "futures", "group", - "indexmap 2.1.0", + "indexmap 2.2.1", "insta", - "itertools 0.12.0", + "itertools 0.12.1", "jubjub", "proptest", "proptest-derive", @@ -5921,9 +5921,9 @@ dependencies = [ "hex-literal", "howudoin", "humantime-serde", - "indexmap 2.1.0", + "indexmap 2.2.1", "insta", - "itertools 0.12.0", + "itertools 0.12.1", "jubjub", "lazy_static", "metrics 0.22.0", @@ -5958,9 +5958,9 @@ dependencies = [ "futures", "hex", "humantime", - "indexmap 2.1.0", + "indexmap 2.2.1", "insta", - "itertools 0.12.0", + "itertools 0.12.1", "lazy_static", "once_cell", "owo-colors 4.0.0", @@ -5984,7 +5984,7 @@ version = "1.0.0-beta.34" dependencies = [ "color-eyre", "hex", - "itertools 0.12.0", + "itertools 0.12.1", "jsonrpc", "regex", "reqwest", @@ -6020,7 +6020,7 @@ dependencies = [ "howudoin", "humantime-serde", "hyper", - "indexmap 2.1.0", + "indexmap 2.2.1", "indicatif", "inferno", "insta", diff --git a/tower-batch-control/Cargo.toml b/tower-batch-control/Cargo.toml index db82ba95b..e8e27164d 100644 --- a/tower-batch-control/Cargo.toml +++ b/tower-batch-control/Cargo.toml @@ -24,7 +24,7 @@ categories = ["algorithms", "asynchronous"] [dependencies] futures = "0.3.30" futures-core = "0.3.28" -pin-project = "1.1.3" +pin-project = "1.1.4" rayon = "1.8.1" tokio = { version = "1.35.1", features = ["time", "sync", "tracing", "macros"] } tokio-util = "0.7.10" diff --git a/tower-fallback/Cargo.toml b/tower-fallback/Cargo.toml index b0e5ca4e2..ebb33cd05 100644 --- a/tower-fallback/Cargo.toml +++ b/tower-fallback/Cargo.toml @@ -16,7 +16,7 @@ keywords = ["tower", "batch"] categories = ["algorithms", "asynchronous"] [dependencies] -pin-project = "1.1.3" +pin-project = "1.1.4" tower = "0.4.13" futures-core = "0.3.28" tracing = "0.1.39" diff --git a/zebra-chain/Cargo.toml b/zebra-chain/Cargo.toml index a238d678d..78077df6d 100644 --- a/zebra-chain/Cargo.toml +++ b/zebra-chain/Cargo.toml @@ -96,7 +96,7 @@ zcash_note_encryption = "0.4.0" zcash_primitives = { version = "0.13.0-rc.1", features = ["transparent-inputs"] } # Time -chrono = { version = "0.4.32", default-features = false, features = ["clock", "std", "serde"] } +chrono = { version = "0.4.33", default-features = false, features = ["clock", "std", "serde"] } humantime = "2.1.0" # Error Handling & Formatting @@ -107,13 +107,13 @@ tracing = "0.1.39" # Serialization hex = { version = "0.4.3", features = ["serde"] } -serde = { version = "1.0.193", features = ["serde_derive", "rc"] } -serde_with = "3.5.0" +serde = { version = "1.0.196", features = ["serde_derive", "rc"] } +serde_with = "3.5.1" serde-big-array = "0.5.1" # Processing futures = "0.3.30" -itertools = "0.12.0" +itertools = "0.12.1" rayon = "1.8.1" # ZF deps @@ -122,7 +122,7 @@ redjubjub = "0.7.0" reddsa = "0.5.1" # Production feature json-conversion -serde_json = { version = "1.0.111", optional = true } +serde_json = { version = "1.0.113", optional = true } # Production feature async-error and testing feature proptest-impl tokio = { version = "1.35.1", optional = true } diff --git a/zebra-consensus/Cargo.toml b/zebra-consensus/Cargo.toml index dd9cef1a2..9890e42b7 100644 --- a/zebra-consensus/Cargo.toml +++ b/zebra-consensus/Cargo.toml @@ -43,11 +43,11 @@ jubjub = "0.10.0" rand = "0.8.5" rayon = "1.8.1" -chrono = { version = "0.4.32", default-features = false, features = ["clock", "std"] } +chrono = { version = "0.4.33", default-features = false, features = ["clock", "std"] } displaydoc = "0.2.4" lazy_static = "1.4.0" once_cell = "1.18.0" -serde = { version = "1.0.193", features = ["serde_derive"] } +serde = { version = "1.0.196", features = ["serde_derive"] } futures = "0.3.30" futures-util = "0.3.28" diff --git a/zebra-network/Cargo.toml b/zebra-network/Cargo.toml index d8c730920..a2636e8c1 100644 --- a/zebra-network/Cargo.toml +++ b/zebra-network/Cargo.toml @@ -43,20 +43,20 @@ proptest-impl = ["proptest", "proptest-derive", "zebra-chain/proptest-impl"] bitflags = "2.4.2" byteorder = "1.5.0" bytes = "1.5.0" -chrono = { version = "0.4.32", default-features = false, features = ["clock", "std"] } +chrono = { version = "0.4.33", default-features = false, features = ["clock", "std"] } dirs = "5.0.1" hex = "0.4.3" humantime-serde = "1.1.1" -indexmap = { version = "2.0.1", features = ["serde"] } -itertools = "0.12.0" +indexmap = { version = "2.2.1", features = ["serde"] } +itertools = "0.12.1" lazy_static = "1.4.0" num-integer = "0.1.45" ordered-map = "0.4.2" -pin-project = "1.1.3" +pin-project = "1.1.4" rand = "0.8.5" rayon = "1.8.1" regex = "1.10.3" -serde = { version = "1.0.193", features = ["serde_derive"] } +serde = { version = "1.0.196", features = ["serde_derive"] } tempfile = "3.9.0" thiserror = "1.0.56" diff --git a/zebra-node-services/Cargo.toml b/zebra-node-services/Cargo.toml index 49f5fd308..2a665ef98 100644 --- a/zebra-node-services/Cargo.toml +++ b/zebra-node-services/Cargo.toml @@ -44,13 +44,13 @@ color-eyre = { version = "0.6.2", optional = true } jsonrpc-core = { version = "18.0.0", optional = true } # Security: avoid default dependency on openssl reqwest = { version = "0.11.23", default-features = false, features = ["rustls-tls"], optional = true } -serde = { version = "1.0.193", optional = true } -serde_json = { version = "1.0.111", optional = true } +serde = { version = "1.0.196", optional = true } +serde_json = { version = "1.0.113", optional = true } [dev-dependencies] color-eyre = "0.6.2" jsonrpc-core = "18.0.0" reqwest = { version = "0.11.23", default-features = false, features = ["rustls-tls"] } -serde = "1.0.193" -serde_json = "1.0.111" +serde = "1.0.196" +serde_json = "1.0.113" diff --git a/zebra-rpc/Cargo.toml b/zebra-rpc/Cargo.toml index 0e9ef180b..0bb38c482 100644 --- a/zebra-rpc/Cargo.toml +++ b/zebra-rpc/Cargo.toml @@ -42,7 +42,7 @@ proptest-impl = [ ] [dependencies] -chrono = { version = "0.4.32", default-features = false, features = ["clock", "std"] } +chrono = { version = "0.4.33", default-features = false, features = ["clock", "std"] } futures = "0.3.30" # lightwalletd sends JSON-RPC requests over HTTP 1.1 @@ -53,8 +53,8 @@ jsonrpc-derive = "18.0.0" jsonrpc-http-server = "18.0.0" # zebra-rpc needs the preserve_order feature in serde_json, which is a dependency of jsonrpc-core -serde_json = { version = "1.0.111", features = ["preserve_order"] } -indexmap = { version = "2.0.1", features = ["serde"] } +serde_json = { version = "1.0.113", features = ["preserve_order"] } +indexmap = { version = "2.2.1", features = ["serde"] } tokio = { version = "1.35.1", features = ["time", "rt-multi-thread", "macros", "tracing"] } tower = "0.4.13" @@ -62,7 +62,7 @@ tower = "0.4.13" tracing = "0.1.39" hex = { version = "0.4.3", features = ["serde"] } -serde = { version = "1.0.193", features = ["serde_derive"] } +serde = { version = "1.0.196", features = ["serde_derive"] } # Experimental feature getblocktemplate-rpcs rand = { version = "0.8.5", optional = true } diff --git a/zebra-rpc/src/queue.rs b/zebra-rpc/src/queue.rs index e8bfa420d..97662ec7b 100644 --- a/zebra-rpc/src/queue.rs +++ b/zebra-rpc/src/queue.rs @@ -95,7 +95,7 @@ impl Queue { /// Remove a transaction from the queue. pub fn remove(&mut self, unmined_id: UnminedTxId) { - self.transactions.remove(&unmined_id); + self.transactions.swap_remove(&unmined_id); } /// Remove the oldest transaction from the queue. diff --git a/zebra-scan/Cargo.toml b/zebra-scan/Cargo.toml index 4250e30d2..95b6264d4 100644 --- a/zebra-scan/Cargo.toml +++ b/zebra-scan/Cargo.toml @@ -41,10 +41,10 @@ proptest-impl = [ [dependencies] color-eyre = "0.6.2" -indexmap = { version = "2.0.1", features = ["serde"] } -itertools = "0.12.0" +indexmap = { version = "2.2.1", features = ["serde"] } +itertools = "0.12.1" semver = "1.0.21" -serde = { version = "1.0.193", features = ["serde_derive"] } +serde = { version = "1.0.196", features = ["serde_derive"] } tokio = { version = "1.35.1", features = ["time"] } tower = "0.4.13" tracing = "0.1.39" @@ -58,7 +58,7 @@ zebra-state = { path = "../zebra-state", version = "1.0.0-beta.34", features = [ zebra-node-services = { path = "../zebra-node-services", version = "1.0.0-beta.33" } zebra-grpc = { path = "../zebra-grpc", version = "0.1.0-alpha.1" } -chrono = { version = "0.4.32", default-features = false, features = ["clock", "std", "serde"] } +chrono = { version = "0.4.33", default-features = false, features = ["clock", "std", "serde"] } # test feature proptest-impl proptest = { version = "1.4.0", optional = true } diff --git a/zebra-state/Cargo.toml b/zebra-state/Cargo.toml index 3dbed887d..2334f19f2 100644 --- a/zebra-state/Cargo.toml +++ b/zebra-state/Cargo.toml @@ -47,14 +47,14 @@ elasticsearch = [ [dependencies] bincode = "1.3.3" -chrono = { version = "0.4.32", default-features = false, features = ["clock", "std"] } +chrono = { version = "0.4.33", default-features = false, features = ["clock", "std"] } dirs = "5.0.1" futures = "0.3.30" hex = "0.4.3" hex-literal = "0.4.1" humantime-serde = "1.1.1" -indexmap = "2.0.1" -itertools = "0.12.0" +indexmap = "2.2.1" +itertools = "0.12.1" lazy_static = "1.4.0" metrics = "0.22.0" mset = "0.1.1" @@ -62,7 +62,7 @@ regex = "1.10.3" rlimit = "0.10.1" rocksdb = { version = "0.21.0", default-features = false, features = ["lz4"] } semver = "1.0.21" -serde = { version = "1.0.193", features = ["serde_derive"] } +serde = { version = "1.0.196", features = ["serde_derive"] } tempfile = "3.9.0" thiserror = "1.0.56" @@ -74,7 +74,7 @@ tracing = "0.1.39" # elasticsearch specific dependencies. # Security: avoid default dependency on openssl elasticsearch = { version = "8.5.0-alpha.1", default-features = false, features = ["rustls-tls"], optional = true } -serde_json = { version = "1.0.111", package = "serde_json", optional = true } +serde_json = { version = "1.0.113", package = "serde_json", optional = true } zebra-chain = { path = "../zebra-chain", version = "1.0.0-beta.34", features = ["async-error"] } diff --git a/zebra-test/Cargo.toml b/zebra-test/Cargo.toml index edc0e99c0..1acc7c393 100644 --- a/zebra-test/Cargo.toml +++ b/zebra-test/Cargo.toml @@ -16,10 +16,10 @@ categories = ["command-line-utilities", "cryptography::cryptocurrencies"] [dependencies] hex = "0.4.3" -indexmap = "2.0.1" +indexmap = "2.2.1" lazy_static = "1.4.0" insta = "1.33.0" -itertools = "0.12.0" +itertools = "0.12.1" proptest = "1.4.0" once_cell = "1.18.0" rand = "0.8.5" diff --git a/zebra-utils/Cargo.toml b/zebra-utils/Cargo.toml index e577e3a7e..ee9ae0675 100644 --- a/zebra-utils/Cargo.toml +++ b/zebra-utils/Cargo.toml @@ -82,7 +82,7 @@ tinyvec = { version = "1.6.0", features = ["rustc_1_55"] } structopt = "0.3.26" hex = "0.4.3" -serde_json = "1.0.111" +serde_json = "1.0.113" tracing-error = "0.2.0" tracing-subscriber = "0.3.18" thiserror = "1.0.56" @@ -95,7 +95,7 @@ zebra-scan = { path = "../zebra-scan", version = "0.1.0-alpha.3", optional = tru zebra-rpc = { path = "../zebra-rpc", version = "1.0.0-beta.34", optional = true } # These crates are needed for the zebra-checkpoints binary -itertools = { version = "0.12.0", optional = true } +itertools = { version = "0.12.1", optional = true } # These crates are needed for the search-issue-refs binary regex = { version = "1.10.3", optional = true } diff --git a/zebrad/Cargo.toml b/zebrad/Cargo.toml index 0f3f36414..c05d4f813 100644 --- a/zebrad/Cargo.toml +++ b/zebrad/Cargo.toml @@ -173,12 +173,12 @@ zebra-utils = { path = "../zebra-utils", version = "1.0.0-beta.34", optional = t abscissa_core = "0.7.0" clap = { version = "4.4.16", features = ["cargo"] } -chrono = { version = "0.4.32", default-features = false, features = ["clock", "std"] } +chrono = { version = "0.4.33", default-features = false, features = ["clock", "std"] } humantime-serde = "1.1.1" -indexmap = "2.0.1" +indexmap = "2.2.1" lazy_static = "1.4.0" semver = "1.0.21" -serde = { version = "1.0.193", features = ["serde_derive"] } +serde = { version = "1.0.196", features = ["serde_derive"] } toml = "0.8.8" futures = "0.3.30" @@ -186,7 +186,7 @@ rayon = "1.8.1" tokio = { version = "1.35.1", features = ["time", "rt-multi-thread", "macros", "tracing", "signal"] } tokio-stream = { version = "0.1.14", features = ["time"] } tower = { version = "0.4.13", features = ["hedge", "limit"] } -pin-project = "1.1.3" +pin-project = "1.1.4" color-eyre = { version = "0.6.2", default-features = false, features = ["issue-url"] } # This is a transitive dependency via color-eyre. @@ -261,7 +261,7 @@ regex = "1.10.3" insta = { version = "1.33.0", features = ["json"] } # zebra-rpc needs the preserve_order feature, it also makes test results more stable -serde_json = { version = "1.0.111", features = ["preserve_order"] } +serde_json = { version = "1.0.113", features = ["preserve_order"] } tempfile = "3.9.0" hyper = { version = "0.14.28", features = ["http1", "http2", "server"]}