`zcash_client_sqlite`: Add Orchard wallet support #1182

nuttycom · 2024-02-08T22:42:38Z

Closes #1087.
Closes #1177.

codecov · 2024-03-06T03:17:40Z

Codecov Report

Attention: Patch coverage is 60.90909% with 172 lines in your changes are missing coverage. Please review.

Project coverage is 63.30%. Comparing base (a9aabb2) to head (5a28970).

Files	Patch %	Lines
zcash_client_sqlite/src/wallet/orchard.rs	0.00%	67 Missing ⚠️
zcash_client_sqlite/src/wallet.rs	51.14%	64 Missing ⚠️
zcash_client_sqlite/src/lib.rs	14.81%	23 Missing ⚠️
zcash_client_backend/src/fees.rs	0.00%	9 Missing ⚠️
zcash_client_sqlite/src/wallet/common.rs	94.33%	6 Missing ⚠️
zcash_client_backend/src/fees/common.rs	95.00%	2 Missing ⚠️
...ent_backend/src/data_api/wallet/input_selection.rs	85.71%	1 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #1182      +/-   ##
==========================================
- Coverage   63.38%   63.30%   -0.08%     
==========================================
  Files         120      121       +1     
  Lines       13124    13450     +326     
==========================================
+ Hits         8318     8514     +196     
- Misses       4806     4936     +130

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

nuttycom · 2024-03-08T23:22:13Z

zcash_client_sqlite/src/wallet.rs

        "UPDATE sapling_received_notes SET spent = NULL WHERE EXISTS (
            SELECT id_tx FROM transactions
            WHERE id_tx = sapling_received_notes.spent AND block IS NULL AND expiry_height < ?
        )",
    )?;
-    stmt_update_expired.execute([u32::from(expiry_height)])?;
+    stmt_update_sapling_expired.execute([u32::from(expiry_height)])?;
+    let mut stmt_update_orchard_expired = conn.prepare_cached(


This technically isn't necessary unless the orchard feature is enabled. It is, however, safe regardless.

zcash_client_sqlite/src/wallet/init.rs

…ights for the anchor.

…om selection.

…apling and Orchard.

…uture Sapling flagging.

…re_sent_tx`

…ngeStrategy`

str4d

Reviewed d68a01a

str4d · 2024-03-12T13:50:21Z

zcash_client_sqlite/src/lib.rs

-        )
+        )?);
+        #[cfg(feature = "orchard")]
+        let received_iter = received_iter.chain(wallet::orchard::select_spendable_orchard_notes(


This is ignoring the _sources parameter to select_spendable_notes, and always selecting from both pools. It happens to cause no bugs because zcash_client_backend hard-codes both pools as sources if the feature flags are enabled, but we should fix this anyway.

This should be fixed by the third commit of #1244 (which I'm in the process of extracting out on its own.)

Whether or not we include the third commit of #1244 in Zashi 1.0 (and we might not), we should fix this because it's a bug in the current implementation.

Opened #1260.

zcash_client_sqlite/src/wallet/orchard.rs

zcash_client_sqlite/src/wallet/common.rs

zcash_client_sqlite/src/wallet/orchard.rs

zcash_client_sqlite/src/wallet.rs

str4d

Reviewed 264fc95.

zcash_client_sqlite/src/wallet.rs

str4d

utACK 9452698

… note commitment tree.

Co-authored-by: str4d <[email protected]>

str4d

Re-utACK 5a28970

nuttycom force-pushed the sqlite_wallet/orchard_support branch 2 times, most recently from 614a424 to c118979 Compare March 6, 2024 03:02

nuttycom force-pushed the sqlite_wallet/orchard_support branch 3 times, most recently from fc37367 to 464bcf7 Compare March 7, 2024 17:02

nuttycom changed the title ~~WIP: zcash_client_sqlite: Add support for Orchard scanning to the scan queue.~~ zcash_client_sqlite: Add Orchard wallet support Mar 7, 2024

nuttycom force-pushed the sqlite_wallet/orchard_support branch 2 times, most recently from ebe35e7 to bc0507b Compare March 8, 2024 21:29

nuttycom marked this pull request as ready for review March 8, 2024 21:29

str4d force-pushed the sqlite_wallet/orchard_support branch 2 times, most recently from 8f58e9e to 7a48efb Compare March 8, 2024 23:00

nuttycom commented Mar 8, 2024

View reviewed changes

zcash_client_sqlite/src/wallet/init.rs Outdated Show resolved Hide resolved

nuttycom force-pushed the sqlite_wallet/orchard_support branch from 7a48efb to 95d3c85 Compare March 9, 2024 17:52

str4d force-pushed the sqlite_wallet/orchard_support branch from 95d3c85 to 0084326 Compare March 9, 2024 21:13

nuttycom force-pushed the sqlite_wallet/orchard_support branch 5 times, most recently from 68667c4 to 4ef9452 Compare March 10, 2024 20:12

str4d force-pushed the sqlite_wallet/orchard_support branch from 48ab24b to a017717 Compare March 10, 2024 21:42

nuttycom force-pushed the sqlite_wallet/orchard_support branch 3 times, most recently from 0036600 to e61fd81 Compare March 11, 2024 00:01

str4d force-pushed the sqlite_wallet/orchard_support branch 2 times, most recently from d260064 to 08d131b Compare March 11, 2024 01:50

nuttycom force-pushed the sqlite_wallet/orchard_support branch 2 times, most recently from 8cd2f2b to 52257f3 Compare March 11, 2024 03:22

str4d force-pushed the sqlite_wallet/orchard_support branch from b32d449 to 85932db Compare March 11, 2024 11:38

nuttycom and others added 11 commits March 11, 2024 18:58

zcash_client_sqlite: Get the minimum of Sapling and Orchard anchor he…

ac7113c

…ights for the anchor.

zcash_client_sqlite: Add Orchard support to get_wallet_summary

a1a8af0

zcash_client_sqlite: Add Orchard support to get_received_memo

44f5a55

zcash_client_sqlite: Ensure that we only exclude the correct notes fr…

6086774

…om selection.

zcash_client_sqlite: Make note selection queries consistent between S…

cad174c

…apling and Orchard.

zcash_client_sqlite: Factor out common note selection code.

820b1f9

zcash_client_sqlite: Add Orchard support to truncate_to_height

6601820

zcash_client_sqlite: Minor refactoring for improved debuggability & f…

1028894

…uture Sapling flagging.

zcash_client_sqlite: Call mark_orchard_note_spent in `WalletDb::sto…

8e09b78

…re_sent_tx`

zcash_client_backend: Detect Orchard dust in `zip317::SingleOutputCha…

5a6057b

…ngeStrategy`

Fix typos

d68a01a

str4d force-pushed the sqlite_wallet/orchard_support branch from 1156263 to d68a01a Compare March 11, 2024 19:02

This was referenced Mar 11, 2024

zcash_client_sqlite: Implement Orchard scanning #1255

Merged

zcash_client_sqlite: Add database tables for Orchard #1254

Merged

str4d added this to the Librustzcash Zashi 1.0 milestone Mar 11, 2024

str4d requested changes Mar 12, 2024

View reviewed changes

nuttycom force-pushed the sqlite_wallet/orchard_support branch from 97e5e9f to 264fc95 Compare March 12, 2024 16:15

str4d requested changes Mar 12, 2024

View reviewed changes

zcash_client_sqlite/src/wallet.rs Outdated Show resolved Hide resolved

nuttycom force-pushed the sqlite_wallet/orchard_support branch from 264fc95 to 9452698 Compare March 12, 2024 16:29

str4d previously approved these changes Mar 12, 2024

View reviewed changes

nuttycom and others added 2 commits March 12, 2024 10:34

zcash_client_sqlite: Ensure that truncation is applied to the Orchard…

2eb5061

… note commitment tree.

Apply suggestions from code review

5a28970

Co-authored-by: str4d <[email protected]>

nuttycom dismissed str4d’s stale review via 5a28970 March 12, 2024 16:34

nuttycom force-pushed the sqlite_wallet/orchard_support branch from 9452698 to 5a28970 Compare March 12, 2024 16:34

str4d approved these changes Mar 12, 2024

View reviewed changes

This was referenced Mar 12, 2024

Return partial matches when using WalletRead::get_account_for_ufvk. #1258

Merged

zcash_client_sqlite: Fix select_spendable_notes to not ignore the sources parameter #1260

Closed

nuttycom merged commit bb466de into zcash:main Mar 12, 2024
20 of 25 checks passed

nuttycom deleted the sqlite_wallet/orchard_support branch March 12, 2024 17:14

nuttycom mentioned this pull request Mar 21, 2024

Add Orchard support to zcash_client_sqlite #404

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

`zcash_client_sqlite`: Add Orchard wallet support #1182

`zcash_client_sqlite`: Add Orchard wallet support #1182

nuttycom commented Feb 8, 2024 •

edited by str4d

Loading

codecov bot commented Mar 6, 2024 •

edited

Loading

nuttycom Mar 8, 2024

str4d left a comment

str4d Mar 12, 2024

nuttycom Mar 12, 2024

str4d Mar 12, 2024

str4d Mar 12, 2024

str4d left a comment

str4d left a comment

str4d left a comment

zcash_client_sqlite: Add Orchard wallet support #1182

zcash_client_sqlite: Add Orchard wallet support #1182

Conversation

nuttycom commented Feb 8, 2024 • edited by str4d Loading

codecov bot commented Mar 6, 2024 • edited Loading

Codecov Report

nuttycom Mar 8, 2024

Choose a reason for hiding this comment

str4d left a comment

Choose a reason for hiding this comment

str4d Mar 12, 2024

Choose a reason for hiding this comment

nuttycom Mar 12, 2024

Choose a reason for hiding this comment

str4d Mar 12, 2024

Choose a reason for hiding this comment

str4d Mar 12, 2024

Choose a reason for hiding this comment

str4d left a comment

Choose a reason for hiding this comment

str4d left a comment

Choose a reason for hiding this comment

str4d left a comment

Choose a reason for hiding this comment

`zcash_client_sqlite`: Add Orchard wallet support #1182

`zcash_client_sqlite`: Add Orchard wallet support #1182

nuttycom commented Feb 8, 2024 •

edited by str4d

Loading

codecov bot commented Mar 6, 2024 •

edited

Loading