From 46872e2590d5fc88e64539588cf246691fa4c714 Mon Sep 17 00:00:00 2001
From: Jack Grigg <jack@z.cash>
Date: Thu, 18 Mar 2021 10:00:27 +1300
Subject: [PATCH] Update changelogs with Memo changes

---
 zcash_client_backend/CHANGELOG.md |  6 ++++--
 zcash_primitives/CHANGELOG.md     | 19 +++++++++++++++++++
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/zcash_client_backend/CHANGELOG.md b/zcash_client_backend/CHANGELOG.md
index 352a39ac4..887a229d5 100644
--- a/zcash_client_backend/CHANGELOG.md
+++ b/zcash_client_backend/CHANGELOG.md
@@ -22,8 +22,10 @@ and this library adheres to Rust's notion of
   decryption APIs:
   - `zcash_client_backend::proto::compact_formats::CompactOutput::epk()`
   - The `epk` field of `zcash_client_backend::wallet::WalletShieldedOutput`.
-- `zcash_client_backend::decrypt::decrypt_transaction` now takes a variable with
-  type `P: zcash_primitives::consensus::Parameters`.
+- `zcash_client_backend::decrypt`:
+  - `decrypt_transaction` now takes a variable with type
+    `P: zcash_primitives::consensus::Parameters`.
+  - The `memo` field of `DecryptedOutput` now has type `MemoBytes`.
 - `zcash_client_backend::wallet`:
   - The `nf` property of `WalletShieldedSpend` now has the type `Nullifier`.
   - The `account` property of `WalletShieldedSpend` and `WalletShieldedOutput`
diff --git a/zcash_primitives/CHANGELOG.md b/zcash_primitives/CHANGELOG.md
index 1c54a6bc5..52c16fb11 100644
--- a/zcash_primitives/CHANGELOG.md
+++ b/zcash_primitives/CHANGELOG.md
@@ -25,6 +25,13 @@ and this library adheres to Rust's notion of
       - `b58_script_address_prefix`
     - The `Network` enum, which enables code to be generic over the network type
       at runtime.
+  - `zcash_primitives::memo`:
+    - `MemoBytes`, a minimal wrapper around the memo bytes, that only imposes
+      the existence of null-padding for shorter memos. `MemoBytes` is guaranteed
+      to be round-trip encodable (modulo null padding).
+    - `Memo`, an enum that implements the memo field format defined in
+      [ZIP 302](https://zips.z.cash/zip-0302) (excluding structured memos for
+      the moment). It can be converted to and from `MemoBytes`.
   - `zcash_primitives::primitives::Nullifier` struct.
   - `zcash_primitives::transaction`:
     - `TxVersion` enum, representing the set of valid transaction format
@@ -90,6 +97,12 @@ and this library adheres to Rust's notion of
     `&self`.
 - `zcash_primitives::merkle_tree::CommitmentTree::new` has been renamed to
   `CommitmentTree::empty`.
+- `zcash_primitives::note_encryption`:
+  - `SaplingNoteEncryption::new` now takes `MemoBytes`.
+  - The following APIs now return `MemoBytes`:
+    - `try_sapling_note_decryption`
+    - `try_sapling_output_recovery`
+    - `try_sapling_output_recovery_with_ock`
 - `zcash_primitives::primitives::Note::nf` now returns `Nullifier`.
 - `zcash_primitives::transaction`:
   - The `overwintered`, `version`, and `version_group_id` properties of the
@@ -101,6 +114,12 @@ and this library adheres to Rust's notion of
     `Nullifier`.
   - `signature_hash` and `signature_hash_data` now take a `SignableInput`
     argument instead of a `transparent_input` argument.
+  - `builder::SaplingOutput::new` and `builder::Builder::add_sapling_output` now
+    take `Option<MemoBytes>`.
+
+### Removed
+- `zcash_primitives::note_encryption::Memo` (replaced by
+  `zcash_primitives::memo::{Memo, MemoBytes}`).
 
 ## [0.4.0] - 2020-09-09
 ### Added