From 455779c8332ca5f609d8dc5d8d3be07863a47773 Mon Sep 17 00:00:00 2001
From: Alfredo Garcia <oxarbitrage@gmail.com>
Date: Thu, 29 Jun 2023 17:18:52 -0300
Subject: [PATCH] build(deps): Bump indexmap, toml and serde_json (#7100)

* bump toml, indexmap and serde_json all together

* add duplicated indexmap dep to deny.toml
---
 Cargo.lock                     | 65 +++++++++++++++++++++-------------
 deny.toml                      |  3 ++
 zebra-chain/Cargo.toml         |  2 +-
 zebra-network/Cargo.toml       |  4 +--
 zebra-node-services/Cargo.toml |  2 +-
 zebra-rpc/Cargo.toml           |  4 +--
 zebra-state/Cargo.toml         |  4 +--
 zebra-test/Cargo.toml          |  2 +-
 zebra-utils/Cargo.toml         |  2 +-
 zebrad/Cargo.toml              |  6 ++--
 10 files changed, 57 insertions(+), 37 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 2663ca7b4..4e6fbcdc3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1333,6 +1333,12 @@ dependencies = [
  "byteorder",
 ]
 
+[[package]]
+name = "equivalent"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88bffebc5d80432c9b140ee17875ff173a8ab62faad5b257da912bd2f6c1c0a1"
+
 [[package]]
 name = "errno"
 version = "0.3.1"
@@ -1681,7 +1687,7 @@ dependencies = [
  "futures-sink",
  "futures-util",
  "http",
- "indexmap",
+ "indexmap 1.9.3",
  "slab",
  "tokio",
  "tokio-util 0.7.8",
@@ -2060,6 +2066,17 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "indexmap"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d"
+dependencies = [
+ "equivalent",
+ "hashbrown 0.14.0",
+ "serde",
+]
+
 [[package]]
 name = "indicatif"
 version = "0.17.5"
@@ -2494,7 +2511,7 @@ checksum = "8a4964177ddfdab1e3a2b37aec7cf320e14169abb0ed73999f558136409178d5"
 dependencies = [
  "base64 0.21.2",
  "hyper",
- "indexmap",
+ "indexmap 1.9.3",
  "ipnet",
  "metrics 0.21.0",
  "metrics-util",
@@ -3057,7 +3074,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4"
 dependencies = [
  "fixedbitset",
- "indexmap",
+ "indexmap 1.9.3",
 ]
 
 [[package]]
@@ -4073,11 +4090,11 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.97"
+version = "1.0.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdf3bf93142acad5821c99197022e170842cdbc1c30482b98750c688c640842a"
+checksum = "46266871c240a00b8f503b877622fe33430b3c7d963bdc0f2adc511e54a1eae3"
 dependencies = [
- "indexmap",
+ "indexmap 2.0.0",
  "itoa",
  "ryu",
  "serde",
@@ -4085,9 +4102,9 @@ dependencies = [
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.2"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93107647184f6027e3b7dcb2e11034cf95ffa1e3a682c67951963ac69c1c007d"
+checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186"
 dependencies = [
  "serde",
 ]
@@ -4123,7 +4140,7 @@ dependencies = [
  "base64 0.21.2",
  "chrono",
  "hex",
- "indexmap",
+ "indexmap 1.9.3",
  "serde",
  "serde_json",
  "serde_with_macros 3.0.0",
@@ -4632,9 +4649,9 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.7.4"
+version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6135d499e69981f9ff0ef2167955a5333c35e36f6937d382974566b3d5b94ec"
+checksum = "1ebafdf5ad1220cb59e7d17cf4d2c72015297b75b19a10472f99b89225089240"
 dependencies = [
  "serde",
  "serde_spanned",
@@ -4644,20 +4661,20 @@ dependencies = [
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.2"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a76a9312f5ba4c2dec6b9161fdf25d87ad8a09256ccea5a556fef03c706a10f"
+checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "toml_edit"
-version = "0.19.10"
+version = "0.19.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2380d56e8670370eee6566b0bfd4265f65b3f432e8c6d85623f728d4fa31f739"
+checksum = "266f016b7f039eec8a1a80dfe6156b633d208b9fccca5e4db1d6775b0c4e34a7"
 dependencies = [
- "indexmap",
+ "indexmap 2.0.0",
  "serde",
  "serde_spanned",
  "toml_datetime",
@@ -4714,7 +4731,7 @@ dependencies = [
  "futures-core",
  "futures-util",
  "hdrhistogram",
- "indexmap",
+ "indexmap 1.9.3",
  "pin-project",
  "pin-project-lite",
  "rand 0.8.5",
@@ -5773,7 +5790,7 @@ dependencies = [
  "hex",
  "howudoin",
  "humantime-serde",
- "indexmap",
+ "indexmap 2.0.0",
  "itertools 0.11.0",
  "lazy_static",
  "metrics 0.21.0",
@@ -5792,7 +5809,7 @@ dependencies = [
  "tokio",
  "tokio-stream",
  "tokio-util 0.7.8",
- "toml 0.7.4",
+ "toml 0.7.5",
  "tower",
  "tracing",
  "tracing-error",
@@ -5821,7 +5838,7 @@ dependencies = [
  "futures",
  "hex",
  "hyper",
- "indexmap",
+ "indexmap 2.0.0",
  "insta",
  "jsonrpc-core",
  "jsonrpc-derive",
@@ -5871,7 +5888,7 @@ dependencies = [
  "halo2_proofs",
  "hex",
  "howudoin",
- "indexmap",
+ "indexmap 2.0.0",
  "insta",
  "itertools 0.11.0",
  "jubjub",
@@ -5908,7 +5925,7 @@ dependencies = [
  "futures",
  "hex",
  "humantime",
- "indexmap",
+ "indexmap 2.0.0",
  "insta",
  "lazy_static",
  "once_cell",
@@ -5964,7 +5981,7 @@ dependencies = [
  "howudoin",
  "humantime-serde",
  "hyper",
- "indexmap",
+ "indexmap 2.0.0",
  "indicatif",
  "inferno",
  "jsonrpc-core",
@@ -5990,7 +6007,7 @@ dependencies = [
  "tinyvec",
  "tokio",
  "tokio-stream",
- "toml 0.7.4",
+ "toml 0.7.5",
  "tonic",
  "tonic-build",
  "tower",
diff --git a/deny.toml b/deny.toml
index 900d08ef9..fa51dc2e4 100644
--- a/deny.toml
+++ b/deny.toml
@@ -63,6 +63,9 @@ skip-tree = [
     # wait for backtrace and multiple dependents to upgrade
     { name = "miniz_oxide", version = "=0.6.2" },
 
+    # wait for h2 and tower to upgrade
+    { name = "indexmap", version = "=1.9.3" },
+
     # ZF crates
 
     # wait for zcashd and zcash_script to upgrade
diff --git a/zebra-chain/Cargo.toml b/zebra-chain/Cargo.toml
index d2a17a046..18209d99c 100644
--- a/zebra-chain/Cargo.toml
+++ b/zebra-chain/Cargo.toml
@@ -105,7 +105,7 @@ redjubjub = "0.7.0"
 reddsa = "0.5.0"
 
 # Production feature json-conversion
-serde_json = { version = "1.0.97", optional = true }
+serde_json = { version = "1.0.99", optional = true }
 
 # Experimental feature getblocktemplate-rpcs
 zcash_address = { version = "0.2.1", optional = true }
diff --git a/zebra-network/Cargo.toml b/zebra-network/Cargo.toml
index 494f18250..1527d8806 100644
--- a/zebra-network/Cargo.toml
+++ b/zebra-network/Cargo.toml
@@ -47,7 +47,7 @@ chrono = { version = "0.4.26", default-features = false, features = ["clock", "s
 dirs = "5.0.1"
 hex = "0.4.3"
 humantime-serde = "1.1.1"
-indexmap = { version = "1.9.3", features = ["serde"] }
+indexmap = { version = "2.0.0", features = ["serde"] }
 itertools = "0.11.0"
 lazy_static = "1.4.0"
 num-integer = "0.1.45"
@@ -91,7 +91,7 @@ proptest-derive = "0.3.0"
 
 static_assertions = "1.1.0"
 tokio = { version = "1.28.2", features = ["full", "tracing", "test-util"] }
-toml = "0.7.4"
+toml = "0.7.5"
 
 zebra-chain = { path = "../zebra-chain", features = ["proptest-impl"] }
 zebra-test = { path = "../zebra-test/" }
diff --git a/zebra-node-services/Cargo.toml b/zebra-node-services/Cargo.toml
index 9d9b3885a..11db20155 100644
--- a/zebra-node-services/Cargo.toml
+++ b/zebra-node-services/Cargo.toml
@@ -45,7 +45,7 @@ jsonrpc-core = { version = "18.0.0", optional = true }
 # Security: avoid default dependency on openssl
 reqwest = { version = "0.11.18", default-features = false, features = ["rustls-tls"], optional = true }
 serde = { version = "1.0.164", optional = true }
-serde_json = { version = "1.0.97", optional = true }
+serde_json = { version = "1.0.99", optional = true }
 
 [dev-dependencies]
 
diff --git a/zebra-rpc/Cargo.toml b/zebra-rpc/Cargo.toml
index f7891f453..e9c0f4d33 100644
--- a/zebra-rpc/Cargo.toml
+++ b/zebra-rpc/Cargo.toml
@@ -51,8 +51,8 @@ jsonrpc-http-server = "18.0.0"
 num_cpus = "1.15.0"
 
 # zebra-rpc needs the preserve_order feature in serde_json, which is a dependency of jsonrpc-core
-serde_json = { version = "1.0.97", features = ["preserve_order"] }
-indexmap = { version = "1.9.3", features = ["serde"] }
+serde_json = { version = "1.0.99", features = ["preserve_order"] }
+indexmap = { version = "2.0.0", features = ["serde"] }
 
 tokio = { version = "1.28.2", features = ["time", "rt-multi-thread", "macros", "tracing"] }
 tower = "0.4.13"
diff --git a/zebra-state/Cargo.toml b/zebra-state/Cargo.toml
index 143d772f2..512d2d09d 100644
--- a/zebra-state/Cargo.toml
+++ b/zebra-state/Cargo.toml
@@ -48,7 +48,7 @@ chrono = { version = "0.4.26", default-features = false, features = ["clock", "s
 dirs = "5.0.1"
 futures = "0.3.28"
 hex = "0.4.3"
-indexmap = "1.9.3"
+indexmap = "2.0.0"
 itertools = "0.11.0"
 lazy_static = "1.4.0"
 metrics = "0.21.0"
@@ -69,7 +69,7 @@ tracing = "0.1.37"
 # 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.97", package = "serde_json", optional = true }
+serde_json = { version = "1.0.99", package = "serde_json", optional = true }
 
 zebra-chain = { path = "../zebra-chain", version = "1.0.0-beta.26" }
 
diff --git a/zebra-test/Cargo.toml b/zebra-test/Cargo.toml
index d64b6e596..04d910195 100644
--- a/zebra-test/Cargo.toml
+++ b/zebra-test/Cargo.toml
@@ -16,7 +16,7 @@ categories = ["command-line-utilities", "cryptography::cryptocurrencies"]
 
 [dependencies]
 hex = "0.4.3"
-indexmap = "1.9.3"
+indexmap = "2.0.0"
 lazy_static = "1.4.0"
 insta = "1.30.0"
 proptest = "1.2.0"
diff --git a/zebra-utils/Cargo.toml b/zebra-utils/Cargo.toml
index 98b7fb50d..4bf58589c 100644
--- a/zebra-utils/Cargo.toml
+++ b/zebra-utils/Cargo.toml
@@ -69,7 +69,7 @@ tinyvec = { version = "1.6.0", features = ["rustc_1_55"] }
 
 structopt = "0.3.26"
 hex = "0.4.3"
-serde_json = "1.0.97"
+serde_json = "1.0.99"
 tracing-error = "0.2.0"
 tracing-subscriber = "0.3.17"
 thiserror = "1.0.40"
diff --git a/zebrad/Cargo.toml b/zebrad/Cargo.toml
index 98251d1df..8353fecf6 100644
--- a/zebrad/Cargo.toml
+++ b/zebrad/Cargo.toml
@@ -141,11 +141,11 @@ abscissa_core = "0.7.0"
 clap = { version = "4.3.8", features = ["cargo"] }
 chrono = { version = "0.4.26", default-features = false, features = ["clock", "std"] }
 humantime-serde = "1.1.1"
-indexmap = "1.9.3"
+indexmap = "2.0.0"
 lazy_static = "1.4.0"
 semver = "1.0.17"
 serde = { version = "1.0.164", features = ["serde_derive"] }
-toml = "0.7.4"
+toml = "0.7.5"
 
 futures = "0.3.28"
 rayon = "1.7.0"
@@ -221,7 +221,7 @@ once_cell = "1.18.0"
 regex = "1.8.4"
 
 # zebra-rpc needs the preserve_order feature, it also makes test results more stable
-serde_json = { version = "1.0.97", features = ["preserve_order"] }
+serde_json = { version = "1.0.99", features = ["preserve_order"] }
 tempfile = "3.5.0"
 
 hyper = { version = "0.14.27", features = ["http1", "http2", "server"]}