wallet: take note heights from the wallet's depth, not tx_height()

For minDepth > 1, GetFilteredNotes located each wallet tx's block with
tx_height(), which calls GetTransaction and re-reads the tx from disk
through the txindex. It did this once per wallet tx, transparent ones
included, while holding LOCK2. z_listunspent and z_listreceivedbyaddress
did it once more per returned note. Without -txindex, GetTransaction can
only find a tx that still has unspent transparent outputs. tx_height()
then returned 0 for every fully shielded tx, and the tx was skipped. So
on a -txindex=0 node, sweep and consolidation (minDepth 11) and any
minconf >= 2 call never saw those notes.

The wallet already has the depth, and for an active-chain tx
GetDepthInMainChain is chainActive.Height() - height + 1. The new
HeightFromDepth() inverts that (0 when unconfirmed or off the active
chain) and replaces tx_height() at all three sites. The height only
feeds the == 0 skip and hush_dpowconfs. Both sides hold cs_main for the
whole call, so the tip can't move between the walk and the RPC tail.

On a -txindex node the results are identical: the txindex block and
wtx.hashBlock are the same block. The extended equivalence test now
also covers minDepth 2/11/12/22. On -txindex=0 nodes, fully shielded
notes now show up for minDepth > 1. With -zsweep or -consolidation
enabled, those notes will now be swept and consolidated, so init logs
that once. MinDepthAboveOneUsesWalletHeight pins the new behaviour and
shows that the old path returned nothing without a txindex.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

This commit is contained in:

DanS

2026-10-17 08:16:09 -05:00

co-authored by

Claude Opus 5.5

parent bfc1334565

commit 94967efa7b

5 changed files with 60 additions and 8 deletions

									
										src/wallet/wallet.h
									
		+5
		
												View File
												
				@@ -366,6 +366,11 @@ struct SaplingNoteEntry

				    int confirmations;

				};

				/** Height of the active-chain block holding a wallet tx that is nDepth deep (as GetDepthInMainChain

				 *  returns it, and SaplingNoteEntry::confirmations holds it), or 0 when the tx is unconfirmed or not

				 *  in the active chain. Caller holds cs_main. */

				int HeightFromDepth(int nDepth);

				/** A transaction with a merkle branch linking it to the block chain. */

				class CMerkleTx : public CTransaction

				{