From 71d9ddd637afbc69041589b4b12ae9551db3be26 Mon Sep 17 00:00:00 2001
From: Daira Emma Hopwood <daira@jacaranda.org>
Date: Wed, 20 Dec 2023 00:21:57 +0000
Subject: [PATCH 1/2] Move some changelog entries from 0.3.0 to 0.4.0.

The changelog changes in #362 had a non-merge conflict with #363,
because #362 was implemented as if it would be part of the 0.3.0
release but was in fact merged just afterwards.

fixes #391

Signed-off-by: Daira Emma Hopwood <daira@jacaranda.org>
---
 CHANGELOG.md | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b5eb8b350..63c03e0ff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -57,6 +57,15 @@ and this project adheres to Rust's notion of
   - `Builder::{spends, outputs}`
   - `SpendError`
   - `OutputError`
+- `orchard::keys`:
+  - `PreparedEphemeralPublicKey`
+  - `PreparedIncomingViewingKey`
+- impls of `memuse::DynamicUsage` for:
+  - `orchard::note::nullifier::Nullifier`
+  - `orchard::note_encryption::OrchardDomain`
+- impls of `Eq` for:
+  - `orchard::zip32::ChildIndex`
+  - `orchard::value::ValueSum`
 
 ### Changed
 - MSRV is now 1.60.0.
@@ -77,20 +86,11 @@ and this project adheres to Rust's notion of
 ### Added
 - `orchard::Proof::add_to_batch`
 - `orchard::address::Address::diversifier`
-- `orchard::keys:`:
-  - `Diversifier::from_bytes`
-  - `PreparedEphemeralPublicKey`
-  - `PreparedIncomingViewingKey`
+- `orchard::keys::Diversifier::from_bytes`
 - `orchard::note`:
   - `RandomSeed`
   - `Note::{from_parts, rseed}`
-  - `impl memuse::DynamicUsage for Nullifier`
-- `orchard::note_encryption`:
-  - `impl memuse::DynamicUsage for OrchardDomain`
 - `orchard::circuit::Circuit::from_action_context`
-- impls of `Eq` for:
-  - `orchard::zip32::ChildIndex`
-  - `orchard::value::ValueSum`
 
 ### Changed
 - Migrated to `zcash_note_encryption 0.2`.

From a5948cd778db94e3313078a6fc0f7b9676688867 Mon Sep 17 00:00:00 2001
From: str4d <thestr4d@gmail.com>
Date: Wed, 20 Dec 2023 00:56:26 +0000
Subject: [PATCH 2/2] Fix path to `orchard::note::Nullifier` in CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 63c03e0ff..b287d2c40 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -61,7 +61,7 @@ and this project adheres to Rust's notion of
   - `PreparedEphemeralPublicKey`
   - `PreparedIncomingViewingKey`
 - impls of `memuse::DynamicUsage` for:
-  - `orchard::note::nullifier::Nullifier`
+  - `orchard::note::Nullifier`
   - `orchard::note_encryption::OrchardDomain`
 - impls of `Eq` for:
   - `orchard::zip32::ChildIndex`