From 2a63a4cca2626caf501edc661dfd9d819b2bfae1 Mon Sep 17 00:00:00 2001
From: Calvin Kim <calvin@kcalvinalvin.info>
Date: Tue, 7 May 2024 14:13:34 +0900
Subject: [PATCH] wallet: fix how leafdatas are fetched
When the mempool didn't have caching built in, it used to have the full
udata attached to the tx. But since this is not the case anymore,
watchonly wallet panics as it tries to access something that no longer
exists.
We change the code to fetch the leafdatas from the mempool directly as
it can now be fetched from there.
---
wallet/watchonly.go | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/wallet/watchonly.go b/wallet/watchonly.go
index 9df0500f7..ed965bdcc 100644
--- a/wallet/watchonly.go
+++ b/wallet/watchonly.go
@@ -1334,9 +1334,14 @@ func (m *WatchOnlyWalletManager) NotifyNewTransactions(txns []*mempool.TxDesc) {
txHash := tx.Tx.Hash()
log.Debugf("NotifyNewTransactions: received new tx: %s\n", txHash.String())
- lds := tx.Tx.MsgTx().UData.LeafDatas
+ // Fetch the leaf datas for this tx.
+ lds, err := m.config.TxMemPool.FetchLeafDatas(txHash)
+ if err != nil {
+ log.Warnf("NotifyNewTransactions: failed to fetch leafdatas for tx %s", txHash.String())
+ continue
+ }
if lds == nil {
- log.Warnf("NotifyNewTransactions: received tx %s with no Udata", txHash.String())
+ log.Warnf("NotifyNewTransactions: fetch nil leafdatas for tx %s", txHash.String())
continue
}
if len(lds) != len(tx.Tx.MsgTx().TxIn) {