Allow `txn-mempool-conflict` errors when broadcasting transactions

This can be seen, among other times, when a channel is
cooperatively- (or counterparty-)closed and we restart, causing us
to attempt to broadcast our local commitment tx, which conflicts
with the original closing transaction.

diff --git a/src/bitcoind_client.rs b/src/bitcoind_client.rs
index 0b37ac34823e9c44dc62135141170c9cc375714b..15ee8cf9b696dbbbccbf3db8abc76415934cdcab 100644 (file)
--- a/src/bitcoind_client.rs
+++ b/src/bitcoind_client.rs
@@ -265,6 +265,7 @@ impl BroadcasterInterface for BitcoindClient {
                                        if !err_str.contains("Transaction already in block chain")
                                                && !err_str.contains("Inputs missing or spent")
                                                && !err_str.contains("bad-txns-inputs-missingorspent")
+                                               && !err_str.contains("txn-mempool-conflict")
                                                && !err_str.contains("non-BIP68-final")
                                                && !err_str.contains("insufficient fee, rejecting replacement ")
                                        {