From 6206a2a567c7531f7baf1640a753eea95a693631 Mon Sep 17 00:00:00 2001
From: Erwan Or <erwanor@penumbralabs.xyz>
Date: Tue, 24 Dec 2024 20:02:50 -0500
Subject: [PATCH] penumbra: bump proptest, and derive

---
 Cargo.lock | 163 ++++++++++++++++++++++-------------------------------
 Cargo.toml |   4 +-
 2 files changed, 69 insertions(+), 98 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1681ecc156..047ae52fee 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -208,7 +208,7 @@ version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3ed4aa4fe255d0bc6d79373f7e31d2ea147bcf486cba1be5ba7ea85abdb92348"
 dependencies = [
- "quote 1.0.36",
+ "quote",
  "syn 1.0.109",
 ]
 
@@ -221,7 +221,7 @@ dependencies = [
  "num-bigint",
  "num-traits",
  "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "quote",
  "syn 1.0.109",
 ]
 
@@ -303,7 +303,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ae3281bc6d0fd7e549af32b52511e1302185bd688fd3359fa36423346ff682ea"
 dependencies = [
  "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "quote",
  "syn 1.0.109",
 ]
 
@@ -390,7 +390,7 @@ dependencies = [
  "num-traits",
  "percent-encoding",
  "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "quote",
  "serde",
  "syn 1.0.109",
  "toml 0.5.11",
@@ -419,7 +419,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "965c2d33e53cb6b267e148a4cb0760bc01f4904c1cd4bb4002a085bb016d1490"
 dependencies = [
  "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "quote",
  "syn 2.0.90",
  "synstructure",
 ]
@@ -431,7 +431,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7"
 dependencies = [
  "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "quote",
  "syn 2.0.90",
 ]
 
@@ -534,7 +534,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
 dependencies = [
  "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "quote",
  "syn 2.0.90",
 ]
 
@@ -551,7 +551,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca"
 dependencies = [
  "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "quote",
  "syn 2.0.90",
 ]
 
@@ -826,7 +826,7 @@ dependencies = [
  "peeking_take_while",
  "prettyplease",
  "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "quote",
  "regex",
  "rustc-hash",
  "shlex",
@@ -848,7 +848,7 @@ dependencies = [
  "log",
  "prettyplease",
  "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "quote",
  "regex",
  "rustc-hash",
  "shlex",
@@ -876,18 +876,18 @@ dependencies = [
 
 [[package]]
 name = "bit-set"
-version = "0.5.3"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1"
+checksum = "08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3"
 dependencies = [
  "bit-vec",
 ]
 
 [[package]]
 name = "bit-vec"
-version = "0.6.3"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"
+checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7"
 
 [[package]]
 name = "bitflags"
@@ -1019,7 +1019,7 @@ dependencies = [
  "once_cell",
  "proc-macro-crate",
  "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "quote",
  "syn 2.0.90",
  "syn_derive",
 ]
@@ -1263,7 +1263,7 @@ dependencies = [
  "heck 0.4.1",
  "proc-macro-error 1.0.4",
  "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "quote",
  "syn 1.0.109",
 ]
 
@@ -1678,7 +1678,7 @@ dependencies = [
  "fnv",
  "ident_case",
  "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "quote",
  "strsim 0.11.1",
  "syn 2.0.90",
 ]
@@ -1690,7 +1690,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178"
 dependencies = [
  "darling_core",
- "quote 1.0.36",
+ "quote",
  "syn 2.0.90",
 ]
 
@@ -1836,7 +1836,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
 dependencies = [
  "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "quote",
  "syn 1.0.109",
 ]
 
@@ -1847,7 +1847,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a2c35ab6e03642397cdda1dd58abbc05d418aef8e36297f336d5aba060fe8df"
 dependencies = [
  "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "quote",
  "syn 1.0.109",
 ]
 
@@ -1858,7 +1858,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce"
 dependencies = [
  "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "quote",
  "syn 2.0.90",
 ]
 
@@ -1928,7 +1928,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
  "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "quote",
  "syn 2.0.90",
 ]
 
@@ -2398,7 +2398,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "quote",
  "syn 2.0.90",
 ]
 
@@ -2469,7 +2469,7 @@ dependencies = [
  "proc-macro-error 0.4.12",
  "proc-macro-hack",
  "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "quote",
  "syn 1.0.109",
 ]
 
@@ -3332,7 +3332,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "11d7a9f6330b71fea57921c9b61c47ee6e84f72d394754eff6163ae67e7395eb"
 dependencies = [
  "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "quote",
  "syn 1.0.109",
 ]
 
@@ -3356,7 +3356,7 @@ dependencies = [
  "libflate",
  "proc-macro-hack",
  "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "quote",
  "syn 1.0.109",
 ]
 
@@ -4069,7 +4069,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d"
 dependencies = [
  "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "quote",
  "syn 1.0.109",
 ]
 
@@ -4173,7 +4173,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "quote",
  "syn 2.0.90",
 ]
 
@@ -4238,7 +4238,7 @@ checksum = "d830939c76d294956402033aee57a6da7b438f2294eb94864c37b0569053a42c"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "quote",
  "syn 1.0.109",
 ]
 
@@ -4617,7 +4617,7 @@ checksum = "f241d42067ed3ab6a4fece1db720838e1418f36d868585a27931f95d6bc03582"
 dependencies = [
  "peg-runtime",
  "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "quote",
 ]
 
 [[package]]
@@ -5963,7 +5963,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
 dependencies = [
  "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "quote",
  "syn 2.0.90",
 ]
 
@@ -6289,7 +6289,7 @@ checksum = "18f33027081eba0a6d8aba6d1b1c3a3be58cbb12106341c2d5759fcd9b5277e7"
 dependencies = [
  "proc-macro-error-attr 0.4.12",
  "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "quote",
  "syn 1.0.109",
  "version_check",
 ]
@@ -6302,7 +6302,7 @@ checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
 dependencies = [
  "proc-macro-error-attr 1.0.4",
  "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "quote",
  "syn 1.0.109",
  "version_check",
 ]
@@ -6314,7 +6314,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a5b4b77fdb63c1eca72173d68d24501c54ab1269409f6b672c85deb18af69de"
 dependencies = [
  "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "quote",
  "syn 1.0.109",
  "syn-mid",
  "version_check",
@@ -6327,7 +6327,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
 dependencies = [
  "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "quote",
  "version_check",
 ]
 
@@ -6346,15 +6346,6 @@ dependencies = [
  "unicode-xid",
 ]
 
-[[package]]
-name = "proc-macro2"
-version = "0.4.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
-dependencies = [
- "unicode-xid",
-]
-
 [[package]]
 name = "proc-macro2"
 version = "1.0.92"
@@ -6389,9 +6380,9 @@ dependencies = [
 
 [[package]]
 name = "proptest"
-version = "1.5.0"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4c2511913b88df1637da85cc8d96ec8e43a3f8bb8ccb71ee1ac240d6f3df58d"
+checksum = "14cae93065090804185d3b75f0bf93b8eeda30c7a9b4a33d3bdb3988d6229e50"
 dependencies = [
  "bit-set",
  "bit-vec",
@@ -6409,13 +6400,13 @@ dependencies = [
 
 [[package]]
 name = "proptest-derive"
-version = "0.3.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90b46295382dc76166cb7cf2bb4a97952464e4b7ed5a43e6cd34e1fec3349ddc"
+checksum = "4ee1c9ac207483d5e7db4940700de86a9aae46ef90c48b57f99fe7edb8345e49"
 dependencies = [
- "proc-macro2 0.4.30",
- "quote 0.6.13",
- "syn 0.15.44",
+ "proc-macro2 1.0.92",
+ "quote",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -6457,7 +6448,7 @@ dependencies = [
  "anyhow",
  "itertools 0.13.0",
  "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "quote",
  "syn 2.0.90",
 ]
 
@@ -6502,15 +6493,6 @@ version = "1.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
 
-[[package]]
-name = "quote"
-version = "0.6.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1"
-dependencies = [
- "proc-macro2 0.4.30",
-]
-
 [[package]]
 name = "quote"
 version = "1.0.36"
@@ -7302,7 +7284,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba"
 dependencies = [
  "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "quote",
  "syn 2.0.90",
 ]
 
@@ -7335,7 +7317,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
 dependencies = [
  "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "quote",
  "syn 2.0.90",
 ]
 
@@ -7363,7 +7345,7 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f1b15838534b38fb67ffe60033fe3ffad48f916c175e8baa0400e0cdb958dec"
 dependencies = [
- "quote 1.0.36",
+ "quote",
  "syn 2.0.90",
 ]
 
@@ -7405,7 +7387,7 @@ checksum = "65569b702f41443e8bc8bbb1c5779bd0450bbe723b56198980e80ec45780bce2"
 dependencies = [
  "darling",
  "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "quote",
  "syn 2.0.90",
 ]
 
@@ -7668,7 +7650,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cac0692bcc9de3b073e8d747391827297e075c7710ff6276d9f7a1f3d58c6657"
 dependencies = [
  "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "quote",
  "sqlx-core",
  "sqlx-macros-core",
  "syn 2.0.90",
@@ -7686,7 +7668,7 @@ dependencies = [
  "hex",
  "once_cell",
  "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "quote",
  "serde",
  "serde_json",
  "sha2 0.10.8",
@@ -7858,7 +7840,7 @@ checksum = "5bb0dc7ee9c15cea6199cde9a127fa16a4c5819af85395457ad72d68edc85a38"
 dependencies = [
  "heck 0.3.3",
  "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "quote",
  "rustversion",
  "syn 1.0.109",
 ]
@@ -7923,17 +7905,6 @@ dependencies = [
  "url",
 ]
 
-[[package]]
-name = "syn"
-version = "0.15.44"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5"
-dependencies = [
- "proc-macro2 0.4.30",
- "quote 0.6.13",
- "unicode-xid",
-]
-
 [[package]]
 name = "syn"
 version = "1.0.109"
@@ -7941,7 +7912,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
 dependencies = [
  "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "quote",
  "unicode-ident",
 ]
 
@@ -7952,7 +7923,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31"
 dependencies = [
  "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "quote",
  "unicode-ident",
 ]
 
@@ -7963,7 +7934,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fea305d57546cc8cd04feb14b62ec84bf17f50e3f7b12560d7bfa9265f39d9ed"
 dependencies = [
  "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "quote",
  "syn 1.0.109",
 ]
 
@@ -7975,7 +7946,7 @@ checksum = "1329189c02ff984e9736652b1631330da25eaa6bc639089ed4915d25446cbe7b"
 dependencies = [
  "proc-macro-error 1.0.4",
  "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "quote",
  "syn 2.0.90",
 ]
 
@@ -8001,7 +7972,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
 dependencies = [
  "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "quote",
  "syn 2.0.90",
 ]
 
@@ -8237,7 +8208,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
 dependencies = [
  "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "quote",
  "syn 2.0.90",
 ]
 
@@ -8248,7 +8219,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d65750cab40f4ff1929fb1ba509e9914eb756131cef4210da8d5d700d26f6312"
 dependencies = [
  "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "quote",
  "syn 2.0.90",
 ]
 
@@ -8344,7 +8315,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
 dependencies = [
  "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "quote",
  "syn 2.0.90",
 ]
 
@@ -8701,7 +8672,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "quote",
  "syn 2.0.90",
 ]
 
@@ -8913,7 +8884,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b3fd98999db9227cf28e59d83e1f120f42bc233d4b152e8fab9bc87d5bb1e0f8"
 dependencies = [
  "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "quote",
  "syn 2.0.90",
 ]
 
@@ -8977,7 +8948,7 @@ dependencies = [
  "log",
  "once_cell",
  "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "quote",
  "syn 2.0.90",
  "wasm-bindgen-shared",
 ]
@@ -9000,7 +8971,7 @@ version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
 dependencies = [
- "quote 1.0.36",
+ "quote",
  "wasm-bindgen-macro-support",
 ]
 
@@ -9011,7 +8982,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
 dependencies = [
  "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "quote",
  "syn 2.0.90",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
@@ -9146,7 +9117,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7"
 dependencies = [
  "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "quote",
  "syn 2.0.90",
 ]
 
@@ -9157,7 +9128,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7"
 dependencies = [
  "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "quote",
  "syn 2.0.90",
 ]
 
@@ -9444,7 +9415,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b"
 dependencies = [
  "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "quote",
  "syn 2.0.90",
 ]
 
@@ -9464,7 +9435,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2 1.0.92",
- "quote 1.0.36",
+ "quote",
  "syn 2.0.90",
 ]
 
diff --git a/Cargo.toml b/Cargo.toml
index 0b5085d93e..743ba37f74 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -201,8 +201,8 @@ penumbra-wallet                  = { path = "crates/wallet" }
 pin-project                      = { version = "1.0.12" }
 pin-project-lite                 = { version = "0.2.9" }
 poseidon377                      = { version = "1.2.0" }
-proptest                         = { version = "1" }
-proptest-derive                  = { version = "0.3" }
+proptest                         = { version = "1.6" }
+proptest-derive                  = { version = "0.5.1" }
 prost                            = { version = "0.13.4" }
 prost-types                      = { version = "0.13.4" }
 r2d2                             = { version = "0.8" }