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

laanwj · laanwj · commit d4267a3ab271 · 2017-11-21T08:51:19.000+01:00
d9340ce Fix sendrawtransaction hang when sending a tx already in mempool (Matt Corallo) Pull request description: I assume this is what #11721 actually hit. Tree-SHA512: 1da4088bbda64c5527233de9ec4d03f9e0c1eacddb2ed3deab3cb99eac0293ee6fb846830f97b5e10e230307b6d7fd18013043173aa4f27ef171d9da626e2c88
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
@@ -970,6 +970,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
`@@ -970,6 +970,10 @@ UniValue sendrawtransaction(const JSONRPCRequest& request)`
`970`	`970`	`}`
`971`	`971`	`} else if (fHaveChain) {`
`972`	`972`	`throw JSONRPCError(RPC_TRANSACTION_ALREADY_IN_CHAIN, "transaction already in block chain");`
	`973`	`+ } else {`
	`974`	`+ // Make sure we don't block forever if re-sending`
	`975`	`+ // a transaction already in mempool.`
	`976`	`+ promise.set_value();`
`973`	`977`	`}`
`974`	`978`
`975`	`979`	`} // cs_main`