From 99260577a477a4c9f0eb75af665f6268d3dae9fe Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@nutty.land>
Date: Wed, 20 Mar 2024 11:41:32 -0600
Subject: [PATCH] zcash_client_backend: Use `BTreeMap` instead of `HashMap` for
 mem_wallet nullifier maps.

---
 Cargo.lock                                      | 2 +-
 Cargo.toml                                      | 2 +-
 zcash_client_backend/src/data_api/mem_wallet.rs | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 33f697f20..d056207c9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2105,7 +2105,7 @@ dependencies = [
 [[package]]
 name = "sapling-crypto"
 version = "0.1.2"
-source = "git+https://github.com/zcash/sapling-crypto?rev=22412ae07644813253feb064d1692b0823242853#22412ae07644813253feb064d1692b0823242853"
+source = "git+https://github.com/nuttycom/sapling-crypto?rev=827534329f3ff61f9212f7933ed1688fa04e987c#827534329f3ff61f9212f7933ed1688fa04e987c"
 dependencies = [
  "aes",
  "bellman",
diff --git a/Cargo.toml b/Cargo.toml
index 41221057c..3b91948b8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -124,5 +124,5 @@ codegen-units = 1
 [patch.crates-io]
 orchard = { git = "https://github.com/zcash/orchard", rev = "33474bdbfd7268e1f84718078d47f63d01a879d5" }
 incrementalmerkletree = { git = "https://github.com/zcash/incrementalmerkletree", rev = "e1a7a80212c22e5a8912d05860f7eb6899c56a7c" }
-sapling = { git = "https://github.com/zcash/sapling-crypto", package = "sapling-crypto", rev = "22412ae07644813253feb064d1692b0823242853" }
+sapling = { git = "https://github.com/nuttycom/sapling-crypto", package = "sapling-crypto", rev = "827534329f3ff61f9212f7933ed1688fa04e987c" }
 shardtree = { git = "https://github.com/zcash/incrementalmerkletree", rev = "e1a7a80212c22e5a8912d05860f7eb6899c56a7c" }
diff --git a/zcash_client_backend/src/data_api/mem_wallet.rs b/zcash_client_backend/src/data_api/mem_wallet.rs
index cdad22813..345237484 100644
--- a/zcash_client_backend/src/data_api/mem_wallet.rs
+++ b/zcash_client_backend/src/data_api/mem_wallet.rs
@@ -83,9 +83,9 @@ pub struct MemoryWalletDb {
     accounts: BTreeMap<u32, MemoryWalletAccount>,
     blocks: BTreeMap<BlockHeight, MemoryWalletBlock>,
     tx_idx: HashMap<TxId, BlockHeight>,
-    sapling_spends: HashMap<sapling::Nullifier, (TxId, bool)>,
+    sapling_spends: BTreeMap<sapling::Nullifier, (TxId, bool)>,
     #[cfg(feature = "orchard")]
-    orchard_spends: HashMap<orchard::note::Nullifier, (TxId, bool)>,
+    orchard_spends: BTreeMap<orchard::note::Nullifier, (TxId, bool)>,
     sapling_tree: ShardTree<
         MemoryShardStore<sapling::Node, BlockHeight>,
         { SAPLING_SHARD_HEIGHT * 2 },