Changes send_transaction to not be recursive

send_transaction had an edge case that was treated recursively. Return a receipt instead and handle that in the caller

pisa/carrier.py

@@ -2,7 +2,7 @@ from pisa.rpc_errors import *
 from pisa.logger import Logger
 from pisa.tools import bitcoin_cli
 from pisa.utils.auth_proxy import JSONRPCException
-from pisa.errors import UNKNOWN_JSON_RPC_EXCEPTION
+from pisa.errors import UNKNOWN_JSON_RPC_EXCEPTION, RPC_TX_REORGED_AFTER_BROADCAST
 
 logger = Logger("Carrier")
 
@@ -50,11 +50,10 @@ class Carrier:
                     receipt = Receipt(delivered=True, confirmations=confirmations, reason=RPC_VERIFY_ALREADY_IN_CHAIN)
 
                 else:
-                    # WIP: It would be better to return and let the caller call again if necessary
-
                     # There's a really unlikely edge case where a transaction can be reorged between receiving the
-                    # notification and querying the data. In such a case we just resend
-                    self.send_transaction(rawtx, txid)
+                    # notification and querying the data. Notice that this implies the tx being also kicked off the
+                    # mempool, which again is really unlikely.
+                    receipt = Receipt(delivered=False, reason=RPC_TX_REORGED_AFTER_BROADCAST)
 
             elif errno == RPC_DESERIALIZATION_ERROR:
                 # Adding this here just for completeness. We should never end up here. The Carrier only sends txs

pisa/errors.py

@@ -9,6 +9,9 @@ APPOINTMENT_WRONG_FIELD = -7
 APPOINTMENT_CIPHER_NOT_SUPPORTED = -8
 APPOINTMENT_HASH_FUNCTION_NOT_SUPPORTED = -9
 
+# Custom RPC errors
+RPC_TX_REORGED_AFTER_BROADCAST = -98
+
 # UNHANDLED
 UNKNOWN_JSON_RPC_EXCEPTION = -99