diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-11-21 08:47:35 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-11-21 08:51:19 +0100 |
| commit | d4267a3ab271d9affd3c1b0c2e30062490af804e (patch) | |
| tree | baa6e935b76c996ac2944e9de70fbe497c933f9f /src | |
| parent | 901ba3e3819405306414628306746552b0aa1d28 (diff) | |
| parent | d9340ce9124ecc4c3588a411de6868fd8f995074 (diff) | |
| download | bitcoin-d4267a3ab271d9affd3c1b0c2e30062490af804e.tar.xz | |
Merge #11738: Fix sendrawtransaction hang when sending a tx already in mempool
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/rpc/rawtransaction.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp index e65959bf0e..3aff1e9fbf 100644 --- 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 |