Skip to content

Commit 08f97b8

Browse files
committed
remove "watch only" -- no longer possible with descriptor wallets
bitcoin/bitcoin#32618
1 parent b3d78ad commit 08f97b8

File tree

1 file changed

+1
-8
lines changed

1 file changed

+1
-8
lines changed

qml/models/transaction.cpp

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212

1313
using wallet::ISMINE_SPENDABLE;
1414
using wallet::ISMINE_NO;
15-
using wallet::ISMINE_WATCH_ONLY;
1615
using wallet::isminetype;
1716

1817
namespace {
@@ -150,18 +149,12 @@ QList<QSharedPointer<Transaction>> Transaction::fromWalletTx(const interfaces::W
150149
} else {
151150
for (const isminetype mine : wtx.txin_is_mine)
152151
{
153-
if(mine & ISMINE_WATCH_ONLY) involvesWatchAddress = true;
154152
if(fAllFromMe > mine) fAllFromMe = mine;
155153
if (mine) any_from_me = true;
156154
}
157155
}
158156

159157
if (fAllFromMe || !any_from_me) {
160-
for (const isminetype mine : wtx.txout_is_mine)
161-
{
162-
if(mine & ISMINE_WATCH_ONLY) involvesWatchAddress = true;
163-
}
164-
165158
CAmount nTxFee = nDebit - wtx.tx->GetValueOut();
166159

167160

@@ -219,7 +212,7 @@ QList<QSharedPointer<Transaction>> Transaction::fromWalletTx(const interfaces::W
219212
QSharedPointer<Transaction> sub = QSharedPointer<Transaction>::create(hash, nTime);
220213
sub->idx = i; // vout index
221214
sub->credit = txout.nValue;
222-
sub->involvesWatchAddress = mine & ISMINE_WATCH_ONLY;
215+
sub->involvesWatchAddress = false;
223216
if (wtx.txout_address_is_mine[i])
224217
{
225218
// Received by Bitcoin Address

0 commit comments

Comments
 (0)