From 55fb089a335bbbc1cda186c706bc037073df8eb7 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Thu, 26 Sep 2024 15:08:14 -0600
Subject: [PATCH] Migrate to incrementalmerkletree version 0.7

---
 CHANGELOG.md | 5 ++++-
 Cargo.lock   | 8 ++++----
 Cargo.toml   | 6 +++---
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f487021d3..caa0b4d6b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,9 @@ and this project adheres to Rust's notion of
 
 ## [Unreleased]
 
+### Changed
+- Migrated to `incrementalmerkletree 0.7`.
+
 ## [0.9.1] - 2024-08-13
 
 ### Changed
@@ -21,7 +24,7 @@ and this project adheres to Rust's notion of
   generation is specified (https://github.com/zcash/zips/pull/883).
 
 ### Changed
-- Migrated to `incrementalmerkletree 0.6`, `bridgetree 0.5`.
+- Migrated to `incrementalmerkletree 0.6`.
 
 ## [0.8.0] - 2024-03-25
 
diff --git a/Cargo.lock b/Cargo.lock
index 2e791c30c..21d671769 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -199,9 +199,9 @@ dependencies = [
 
 [[package]]
 name = "bridgetree"
-version = "0.5.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f62227647af796dd9f1637da0392676a2e200973b817b082fc9be89bf93ddd74"
+checksum = "cef977c7f8e75aa81fc589064c121ab8d32448b7939d34d58df479aa93e65ea5"
 dependencies = [
  "incrementalmerkletree",
 ]
@@ -1087,9 +1087,9 @@ dependencies = [
 
 [[package]]
 name = "incrementalmerkletree"
-version = "0.6.0"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75346da3bd8e3d8891d02508245ed2df34447ca6637e343829f8d08986e9cde2"
+checksum = "d45063fbc4b0a37837f6bfe0445f269d13d730ad0aa3b5a7f74aa7bf27a0f4df"
 dependencies = [
  "either",
  "proptest",
diff --git a/Cargo.toml b/Cargo.toml
index 4f5003081..97c075d80 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -42,7 +42,7 @@ nonempty = "0.7"
 serde = { version = "1.0", features = ["derive"] }
 subtle = "2.3"
 zcash_note_encryption = "0.4"
-incrementalmerkletree = "0.6"
+incrementalmerkletree = "0.7"
 zcash_spec = "0.1"
 zip32 = "0.1"
 visibility = "0.1.1"
@@ -55,13 +55,13 @@ image = { version = "0.24", optional = true }
 plotters = { version = "0.3.0", optional = true }
 
 [dev-dependencies]
-bridgetree = "0.5"
+bridgetree = "0.6"
 criterion = "0.4" # 0.5 depends on clap 4 which has MSRV 1.70
 halo2_gadgets = { version = "0.3", features = ["test-dependencies"] }
 hex = "0.4"
 proptest = "1.0.0"
 zcash_note_encryption = { version = "0.4", features = ["pre-zip-212"] }
-incrementalmerkletree = { version = "0.6", features = ["test-dependencies"] }
+incrementalmerkletree = { version = "0.7", features = ["test-dependencies"] }
 
 [target.'cfg(unix)'.dev-dependencies]
 inferno = { version = "0.11", default-features = false, features = ["multithreaded", "nameattr"] }