commit 2481d708cc3b971dada61011e8fda8dea5ad6d0a
parent 00b2fee461ae4a51d1c8cc0c5a6b8847e847f742
Author: SomberNight <somber.night@protonmail.com>
Date: Sun, 5 May 2019 04:34:31 +0200
network: sanitize_tx_broadcast_response - new strings in bitcoind 0.18
Diffstat:
1 file changed, 5 insertions(+), 0 deletions(-)
diff --git a/electrum/network.py b/electrum/network.py
@@ -971,10 +971,15 @@ class Network(Logger):
# https://github.com/bitcoin/bitcoin/blob/cd42553b1178a48a16017eff0b70669c84c3895c/src/rpc/rawtransaction.cpp
# grep "RPC_TRANSACTION"
# grep "RPC_DESERIALIZATION_ERROR"
+ # https://github.com/bitcoin/bitcoin/blob/d7d7d315060620446bd363ca50f95f79d3260db7/src/util/error.cpp
rawtransaction_error_messages = {
r"Missing inputs",
r"transaction already in block chain",
+ r"Transaction already in block chain",
r"TX decode failed",
+ r"Peer-to-peer functionality missing or disabled",
+ r"Transaction rejected by AcceptToMemoryPool",
+ r"AcceptToMemoryPool failed",
}
for substring in rawtransaction_error_messages:
if substring in server_msg: