From c4a5ba461c1f1873aad239827c5030e3c9a87fc1 Mon Sep 17 00:00:00 2001
From: redshiftzero <jen@penumbralabs.xyz>
Date: Mon, 18 Nov 2024 13:55:51 -0500
Subject: [PATCH] fix: update dependencies in parameter-setup crate

The parameter-setup crate was broken due to outdated dependencies.
The options here are:
1. add this tool to the workspace
2. keep the dependencies updated instead of using workspace inheritance

Option 1 is more maintainable. Even though the parameters are fixed
now due to mainnet, folks may try to use this for debugging - the
scenario that motivated this commit.
---
 Cargo.lock                       | 17 +++++++++++++++++
 Cargo.toml                       |  3 ++-
 tools/parameter-setup/Cargo.toml |  8 ++++----
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 230c20859a..a9dc81493d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5234,6 +5234,23 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "penumbra-parameter-setup"
+version = "0.1.0"
+dependencies = [
+ "ark-groth16",
+ "ark-serialize",
+ "decaf377",
+ "penumbra-community-pool",
+ "penumbra-dex",
+ "penumbra-governance",
+ "penumbra-proof-params",
+ "penumbra-proof-setup",
+ "penumbra-shielded-pool",
+ "penumbra-stake",
+ "rand_core",
+]
+
 [[package]]
 name = "penumbra-proof-params"
 version = "0.80.8"
diff --git a/Cargo.toml b/Cargo.toml
index c4b68a54cf..ce35a1ee9a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,7 +2,7 @@
 
 resolver = "2"
 
-exclude = ["tools/proto-compiler", "tools/parameter-setup"]
+exclude = ["tools/proto-compiler"]
 
 # Also remember to add to deployments/scripts/rust-docs
 members = [
@@ -55,6 +55,7 @@ members = [
   "crates/view",
   "crates/wallet",
   "tools/summonerd",
+  "tools/parameter-setup",
 ]
 
 # Config for 'cargo dist'
diff --git a/tools/parameter-setup/Cargo.toml b/tools/parameter-setup/Cargo.toml
index 111c48e07e..43b40629d0 100644
--- a/tools/parameter-setup/Cargo.toml
+++ b/tools/parameter-setup/Cargo.toml
@@ -20,7 +20,7 @@ penumbra-shielded-pool = { path = "../../crates/core/component/shielded-pool/",
 penumbra-stake = { path = "../../crates/core/component/stake/", features = [
     "component",
 ] }
-ark-groth16 = "0.4"
-ark-serialize = "0.4"
-decaf377 = { version = "0.5", features = ["r1cs"] }
-rand_core = "0.6.4"
+ark-groth16 = { workspace = true }
+ark-serialize = { workspace = true }
+decaf377 = { workspace = true, features = ["r1cs"] }
+rand_core = { workspace = true }