From 385794bde6ab102ae815437101930f8bb2ad4abd Mon Sep 17 00:00:00 2001
From: Wilmer Paulino <wilmer.paulino@gmail.com>
Date: Mon, 19 Oct 2020 12:39:31 -0700
Subject: [PATCH] account: avoid broadcast of unsigned transactions

In some cases, like when an account is closed due to participating in a
batch, the latest transaction stored for the account is unsigned, which
can be rebroadcast upon a restart. This broadcast attempt will always
fail, so instead we opt to not rebroadcast it at all.
---
 account/manager.go | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/account/manager.go b/account/manager.go
index b91aeb8..01189ca 100644
--- a/account/manager.go
+++ b/account/manager.go
@@ -393,6 +393,21 @@ func (m *Manager) WatchMatchedAccounts(ctx context.Context,
 	return nil
 }
 
+// maybeBroadcastTx attempts to broadcast the transaction only if all of its
+// inputs have been signed for.
+func (m *Manager) maybeBroadcastTx(ctx context.Context, tx *wire.MsgTx,
+	label string) error {
+
+	// If any of the transaction inputs aren't signed, don't broadcast.
+	for _, txIn := range tx.TxIn {
+		if len(txIn.Witness) == 0 && len(txIn.SignatureScript) == 0 {
+			return nil
+		}
+	}
+
+	return m.cfg.Wallet.PublishTransaction(ctx, tx, label)
+}
+
 // resumeAccount performs different operations based on the account's state.
 // This method serves as a way to consolidate the logic of resuming accounts on
 // startup and during normal operation.
@@ -536,9 +551,7 @@ func (m *Manager) resumeAccount(ctx context.Context, account *Account, // nolint
 				"AccountCreation(acct_key=%x)", acctKey)
 			label := makeTxnLabel(m.cfg.TxLabelPrefix, contextLabel)
 
-			err = m.cfg.Wallet.PublishTransaction(
-				ctx, accountTx, label,
-			)
+			err = m.maybeBroadcastTx(ctx, accountTx, label)
 			if err != nil {
 				return err
 			}
@@ -654,9 +667,7 @@ func (m *Manager) resumeAccount(ctx context.Context, account *Account, // nolint
 			"AccountClosure(acct_key=%x)", acctKey)
 		label := makeTxnLabel(m.cfg.TxLabelPrefix, contextLabel)
 
-		err := m.cfg.Wallet.PublishTransaction(
-			ctx, account.LatestTx, label,
-		)
+		err := m.maybeBroadcastTx(ctx, account.LatestTx, label)
 		if err != nil {
 			return err
 		}
@@ -1265,7 +1276,7 @@ func (m *Manager) spendAccount(ctx context.Context, account *Account,
 
 	label := makeTxnLabel(m.cfg.TxLabelPrefix, contextLabel)
 
-	if err := m.cfg.Wallet.PublishTransaction(ctx, spendPkg.tx, label); err != nil {
+	if err := m.maybeBroadcastTx(ctx, spendPkg.tx, label); err != nil {
 		return nil, nil, err
 	}