From 4d2a9a111b83b70b0302861b1ebe2e5684c48509 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Oct 2023 13:39:09 -0400
Subject: [PATCH] Bump generic-array from 0.14.7 to 1.0.0 (#1724)

* Bump generic-array from 0.14.7 to 1.0.0

Bumps [generic-array](https://github.com/fizyk20/generic-array) from 0.14.7 to 1.0.0.
- [Release notes](https://github.com/fizyk20/generic-array/releases)
- [Changelog](https://github.com/fizyk20/generic-array/blob/master/CHANGELOG.md)
- [Commits](https://github.com/fizyk20/generic-array/commits/1.0.0)

---
updated-dependencies:
- dependency-name: generic-array
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* set generic-array dep to 0.14.7, make it a shared workspace dep

* update commit dep to latest main

* update jellyfish dep to latest main

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Gus Gutoski <ggutoski@users.noreply.github.com>
---
 Cargo.lock                            | 10 ++++------
 Cargo.toml                            |  5 +++++
 crates/hotshot-qc/Cargo.toml          |  2 +-
 crates/hotshot-stake-table/Cargo.toml |  2 +-
 crates/types/Cargo.toml               |  2 +-
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5f2c5e9a49..fd8522035a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1282,7 +1282,7 @@ checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
 [[package]]
 name = "commit"
 version = "0.2.2"
-source = "git+https://github.com/EspressoSystems/commit#100cb8f402e32d794b4d2213356227b7bfeb0e92"
+source = "git+https://github.com/EspressoSystems/commit#5f1c28f1a109f2b36cf597e61a222614958db3b2"
 dependencies = [
  "arbitrary",
  "ark-serialize 0.3.0",
@@ -1290,7 +1290,6 @@ dependencies = [
  "derivative",
  "derive_more",
  "funty",
- "generic-array",
  "hex",
  "serde",
  "sha3",
@@ -3270,7 +3269,7 @@ checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
 [[package]]
 name = "jf-primitives"
 version = "0.4.0-pre.0"
-source = "git+https://github.com/EspressoSystems/jellyfish#30752c6c1af7b933e2536d7aeb991a40af4b806a"
+source = "git+https://github.com/EspressoSystems/jellyfish#1626a8448e7af8ea153241004375deff9fd961da"
 dependencies = [
  "anyhow",
  "ark-bls12-377",
@@ -3294,7 +3293,6 @@ dependencies = [
  "digest 0.10.7",
  "displaydoc",
  "espresso-systems-common 0.4.0",
- "generic-array",
  "hashbrown 0.13.2",
  "itertools 0.10.5",
  "jf-relation",
@@ -3315,7 +3313,7 @@ dependencies = [
 [[package]]
 name = "jf-relation"
 version = "0.4.0-pre.0"
-source = "git+https://github.com/EspressoSystems/jellyfish#30752c6c1af7b933e2536d7aeb991a40af4b806a"
+source = "git+https://github.com/EspressoSystems/jellyfish#1626a8448e7af8ea153241004375deff9fd961da"
 dependencies = [
  "ark-bls12-377",
  "ark-bls12-381",
@@ -3341,7 +3339,7 @@ dependencies = [
 [[package]]
 name = "jf-utils"
 version = "0.4.0-pre.0"
-source = "git+https://github.com/EspressoSystems/jellyfish#30752c6c1af7b933e2536d7aeb991a40af4b806a"
+source = "git+https://github.com/EspressoSystems/jellyfish#1626a8448e7af8ea153241004375deff9fd961da"
 dependencies = [
  "ark-ec",
  "ark-ff",
diff --git a/Cargo.toml b/Cargo.toml
index 10990e7437..688e9c37d0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -52,6 +52,11 @@ either = { version = "1.8" }
 espresso-systems-common = { git = "https://github.com/espressosystems/espresso-systems-common", tag = "0.4.1" }
 ethereum-types = { version = "0.14.1", features = ["impl-serde"] }
 futures = "0.3.28"
+
+# TODO generic-array should not be a direct dependency
+# https://github.com/EspressoSystems/HotShot/issues/1850
+generic-array = { version = "0.14.7", features = ["serde"] }
+
 jf-primitives = { git = "https://github.com/EspressoSystems/jellyfish" }
 jf-relation = { git = "https://github.com/EspressoSystems/jellyfish" }
 jf-utils = { git = "https://github.com/espressosystems/jellyfish" }
diff --git a/crates/hotshot-qc/Cargo.toml b/crates/hotshot-qc/Cargo.toml
index 0faa1f0a87..9c53fb335a 100644
--- a/crates/hotshot-qc/Cargo.toml
+++ b/crates/hotshot-qc/Cargo.toml
@@ -19,7 +19,7 @@ ark-std = { workspace = true }
 bincode = { workspace = true }
 bitvec = { workspace = true }
 ethereum-types = { workspace = true }
-generic-array = "0.14.7"
+generic-array = { workspace = true }
 hotshot-types = { path = "../types" }
 jf-primitives = { workspace = true }
 jf-relation = { workspace = true }
diff --git a/crates/hotshot-stake-table/Cargo.toml b/crates/hotshot-stake-table/Cargo.toml
index 8f11e4d66f..4059589a85 100644
--- a/crates/hotshot-stake-table/Cargo.toml
+++ b/crates/hotshot-stake-table/Cargo.toml
@@ -16,7 +16,7 @@ bitvec = { workspace = true }
 digest = { workspace = true }
 displaydoc = { version = "0.2.3", default-features = false }
 ethereum-types = { workspace = true }
-generic-array = "0.14.7"
+generic-array = { workspace = true }
 hotshot-types = { path = "../types" }
 jf-primitives = { workspace = true }
 jf-relation = { workspace = true }
diff --git a/crates/types/Cargo.toml b/crates/types/Cargo.toml
index dbc1b7b009..c0eb7a11e0 100644
--- a/crates/types/Cargo.toml
+++ b/crates/types/Cargo.toml
@@ -31,7 +31,7 @@ displaydoc = { version = "0.2.3", default-features = false }
 either = { workspace = true, features = ["serde"] }
 espresso-systems-common = { workspace = true }
 futures = { workspace = true }
-generic-array = "0.14.7"
+generic-array = { workspace = true }
 hex_fmt = "0.3.0"
 hotshot-constants = { path = "../constants" }
 hotshot-utils = { path = "../utils" }