From 3b34e48bf2f43b18318bf051ed8400137aa0010f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 12 Jul 2023 23:59:49 +0000
Subject: [PATCH] build(deps): bump the ed25519-zebra group with 1 update
 (#7188)

* cargo upgrade --workspace ed25519-zebra x25519-dalek; cargo check

* Remove unused libm dependency exception

---------

Co-authored-by: teor <teor@riseup.net>
---
 Cargo.lock                     | 47 ++++++++++++++++------------------
 deny.toml                      |  3 ---
 tower-batch-control/Cargo.toml |  2 +-
 zebra-chain/Cargo.toml         |  4 +--
 4 files changed, 25 insertions(+), 31 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 11bdc8d9081..8f52415c561 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1043,20 +1043,33 @@ dependencies = [
 
 [[package]]
 name = "curve25519-dalek"
-version = "4.0.0-rc.2"
+version = "4.0.0-rc.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03d928d978dbec61a1167414f5ec534f24bea0d7a0d24dd9b6233d3d8223e585"
+checksum = "436ace70fc06e06f7f689d2624dc4e2f0ea666efb5aa704215f7249ae6e047a7"
 dependencies = [
  "cfg-if 1.0.0",
+ "cpufeatures",
+ "curve25519-dalek-derive",
  "digest 0.10.7",
  "fiat-crypto",
- "packed_simd_2",
  "platforms",
+ "rustc_version 0.4.0",
  "serde",
  "subtle",
  "zeroize",
 ]
 
+[[package]]
+name = "curve25519-dalek-derive"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b"
+dependencies = [
+ "proc-macro2 1.0.63",
+ "quote 1.0.29",
+ "syn 2.0.23",
+]
+
 [[package]]
 name = "cxx"
 version = "1.0.94"
@@ -1257,9 +1270,9 @@ dependencies = [
 
 [[package]]
 name = "ed25519-zebra"
-version = "4.0.0"
+version = "4.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6af5e1fb700a3c779c7a7ed25c8c0b7f193db101de3773ac46e704bcb882d772"
+checksum = "ffb0d653b2c06ec7ec1b4c570bb4eac748035d6f44dd14e5fd9e7e2549938488"
 dependencies = [
  "curve25519-dalek",
  "ed25519",
@@ -1483,7 +1496,7 @@ checksum = "26c4b37de5ae15812a764c958297cfc50f5c010438f60c6ce75d11b802abd404"
 dependencies = [
  "cbc",
  "cipher",
- "libm 0.2.7",
+ "libm",
  "num-bigint",
  "num-integer",
  "num-traits",
@@ -2321,12 +2334,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "libm"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a"
-
 [[package]]
 name = "libm"
 version = "0.2.7"
@@ -2715,7 +2722,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
 dependencies = [
  "autocfg",
- "libm 0.2.7",
+ "libm",
 ]
 
 [[package]]
@@ -2881,16 +2888,6 @@ version = "3.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f"
 
-[[package]]
-name = "packed_simd_2"
-version = "0.3.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1914cd452d8fccd6f9db48147b29fd4ae05bea9dc5d9ad578509f72415de282"
-dependencies = [
- "cfg-if 1.0.0",
- "libm 0.1.4",
-]
-
 [[package]]
 name = "pairing"
 version = "0.23.0"
@@ -5531,9 +5528,9 @@ dependencies = [
 
 [[package]]
 name = "x25519-dalek"
-version = "2.0.0-rc.2"
+version = "2.0.0-rc.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fabd6e16dd08033932fc3265ad4510cc2eab24656058a6dcb107ffe274abcc95"
+checksum = "ec7fae07da688e17059d5886712c933bb0520f15eff2e09cfa18e30968f4e63a"
 dependencies = [
  "curve25519-dalek",
  "rand_core 0.6.4",
diff --git a/deny.toml b/deny.toml
index fa51dc2e439..2e8e9738c7d 100644
--- a/deny.toml
+++ b/deny.toml
@@ -119,9 +119,6 @@ skip-tree = [
     # upgrade abscissa (required dependency) and arti (optional dependency)
     { name = "semver", version = "=0.9.0" },
 
-    # wait for packed_simd_2 to upgrade
-    { name = "libm", version = "=0.1.4" },
-
     # Elasticsearch dependencies
 
     # wait for elasticsearch to update base64, darling, rustc_version, serde_with
diff --git a/tower-batch-control/Cargo.toml b/tower-batch-control/Cargo.toml
index cbb89fed857..1f9e89df2c9 100644
--- a/tower-batch-control/Cargo.toml
+++ b/tower-batch-control/Cargo.toml
@@ -38,7 +38,7 @@ color-eyre = "0.6.2"
 # Enable a feature that makes tinyvec compile much faster.
 tinyvec = { version = "1.6.0", features = ["rustc_1_55"] }
 
-ed25519-zebra = "4.0.0"
+ed25519-zebra = "4.0.1"
 rand = "0.8.5"
 
 tokio = { version = "1.29.1", features = ["full", "tracing", "test-util"] }
diff --git a/zebra-chain/Cargo.toml b/zebra-chain/Cargo.toml
index 95acadbaf5f..6c200b32f80 100644
--- a/zebra-chain/Cargo.toml
+++ b/zebra-chain/Cargo.toml
@@ -68,7 +68,7 @@ ripemd = "0.1.3"
 secp256k1 = { version = "0.21.3", features = ["serde"] }
 sha2 = { version = "0.9.9", features = ["compress"] }
 uint = "0.9.5"
-x25519-dalek = { version = "2.0.0-pre.1", features = ["serde"] }
+x25519-dalek = { version = "2.0.0-rc.3", features = ["serde"] }
 
 # ECC deps
 halo2 = { package = "halo2_proofs", version = "0.3.0" }
@@ -100,7 +100,7 @@ itertools = "0.11.0"
 rayon = "1.7.0"
 
 # ZF deps
-ed25519-zebra = "4.0.0"
+ed25519-zebra = "4.0.1"
 redjubjub = "0.7.0"
 reddsa = "0.5.0"