Merge bitcoin#11738: Fix sendrawtransaction hang when sending a tx already in mempool

laanwj · PastaPastaPasta · commit 3f16ebd70a6e · 2020-04-01T12:43:17.000-05:00
d9340ce Fix sendrawtransaction hang when sending a tx already in mempool (Matt Corallo) Pull request description: I assume this is what bitcoin#11721 actually hit. Tree-SHA512: 1da4088bbda64c5527233de9ec4d03f9e0c1eacddb2ed3deab3cb99eac0293ee6fb846830f97b5e10e230307b6d7fd18013043173aa4f27ef171d9da626e2c88
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
@@ -1032,6 +1032,10 @@ UniValue sendrawtransaction(const JSONRPCRequest& request)
         }
     } else if (fHaveChain) {
         throw JSONRPCError(RPC_TRANSACTION_ALREADY_IN_CHAIN, "transaction already in block chain");
+    } else {
+        // Make sure we don't block forever if re-sending
+        // a transaction already in mempool.
+        promise.set_value();
     }
 
     } // cs_main

Original file line number	Diff line number	Diff line change
`@@ -1032,6 +1032,10 @@ UniValue sendrawtransaction(const JSONRPCRequest& request)`
`1032`	`1032`	`}`
`1033`	`1033`	`} else if (fHaveChain) {`
`1034`	`1034`	`throw JSONRPCError(RPC_TRANSACTION_ALREADY_IN_CHAIN, "transaction already in block chain");`
	`1035`	`+ } else {`
	`1036`	`+ // Make sure we don't block forever if re-sending`
	`1037`	`+ // a transaction already in mempool.`
	`1038`	`+ promise.set_value();`
`1035`	`1039`	`}`
`1036`	`1040`
`1037`	`1041`	`} // cs_main`