Merge pull request #1050 from stratisproject/fixlistunspent

RPC: Filter ListUnspent transactions for duplicates
stratisproject · Sep 6, 2022 · d6ae2b6 · d6ae2b6
2 parents 0dbf584 + 6cd9dd7
commit d6ae2b6
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/Stratis.Bitcoin.Features.Wallet/WalletRPCController.cs b/src/Stratis.Bitcoin.Features.Wallet/WalletRPCController.cs
@@ -772,7 +772,7 @@ public UnspentCoinModel[] ListUnspent(int minConfirmations = 1, int maxConfirmat
                     continue;
 
                 WalletAccountReference accountReference = new WalletAccountReference(walletName, account.Name);
-            
+
                 IEnumerable<UnspentOutputReference> spendableTransactions = this.walletManager.GetSpendableTransactionsInAccount(accountReference, minConfirmations);
 
                 foreach (var spendableTx in spendableTransactions)
@@ -783,6 +783,11 @@ public UnspentCoinModel[] ListUnspent(int minConfirmations = 1, int maxConfirmat
                     if (addresses.Any() && !addresses.Contains(BitcoinAddress.Create(spendableTx.Address.Address, this.FullNode.Network)))
                         continue;
 
+                    // Check if the transaction is already in the list.
+                    // The node operator could be using the wallet for both "actual" and watch only accounts. 
+                    if (unspentCoins.Any(u => u.Id == spendableTx.Transaction.Id && u.Index == spendableTx.Transaction.Index))
+                        continue;
+
                     unspentCoins.Add(new UnspentCoinModel()
                     {
                         Account = accountReference.AccountName,