aljaz/python-teos
1
0
Fork 0
mirror of https://github.com/aljazceru/python-teos.git synced 2025-12-18 06:34:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'testing' into 21-json-logs

Browse Source
This commit is contained in:
Salvatore Ingala
2019-10-10 18:49:06 +07:00
parent d05c2c21b7 eb2734ccfe
commit 8c2c893c5c
1 changed files with 27 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
pisa/carrier.py
View File

@@ -7,19 +7,20 @@ from pisa.errors import UNKNOWN_JSON_RPC_EXCEPTION
logger = Logger("Carrier") logger = Logger("Carrier")
class Carrier: class Receipt:
class Receipt: def __init__(self, delivered, confirmations=0, reason=None):
def __init__(self, delivered, confirmations=0, reason=None): self.delivered = delivered
self.delivered = delivered self.confirmations = confirmations
self.confirmations = confirmations self.reason = reason
self.reason = reason
class Carrier:
def send_transaction(self, rawtx, txid): def send_transaction(self, rawtx, txid):
try: try:
logger.info("Pushing transaction to the network", txid=txid, rawtx=rawtx) logger.info("Pushing transaction to the network", txid=txid, rawtx=rawtx)
bitcoin_cli.sendrawtransaction(rawtx) bitcoin_cli.sendrawtransaction(rawtx)
receipt = self.Receipt(delivered=True) receipt = Receipt(delivered=True)
except JSONRPCException as e: except JSONRPCException as e:
errno = e.error.get('code') errno = e.error.get('code')
@@ -29,10 +30,18 @@ class Carrier:
if errno == RPC_VERIFY_REJECTED: if errno == RPC_VERIFY_REJECTED:
# DISCUSS: what to do in this case # DISCUSS: what to do in this case
# DISCUSS: invalid transactions (properly formatted but invalid, like unsigned) fit here too. # DISCUSS: invalid transactions (properly formatted but invalid, like unsigned) fit here too.
# DISCUSS: RPC_VERIFY_ERROR could also be a possible case.
# DISCUSS: check errors -9 and -10 # DISCUSS: check errors -9 and -10
# TODO: UNKNOWN_JSON_RPC_EXCEPTION is not the proper exception here. This is long due. # TODO: UNKNOWN_JSON_RPC_EXCEPTION is not the proper exception here. This is long due.
receipt = self.Receipt(delivered=False, reason=UNKNOWN_JSON_RPC_EXCEPTION) receipt = Receipt(delivered=False, reason=UNKNOWN_JSON_RPC_EXCEPTION)
elif errno == RPC_VERIFY_ERROR:
# DISCUSS: The only reason for it seems to bea non-existing or spent input.
# https://github.com/bitcoin/bitcoin/blob/master/src/rpc/rawtransaction.cpp#L660
# However RPC_TRANSACTION_ERROR aliases RPC_VERIFY_ERROR and it's the default return for
# RPCErrorFromTransactionError
# https://github.com/bitcoin/bitcoin/blob/master/src/rpc/util.cpp#L276
# TODO: UNKNOWN_JSON_RPC_EXCEPTION is not the proper exception here. This is long due.
receipt = Receipt(delivered=False, reason=UNKNOWN_JSON_RPC_EXCEPTION)
elif errno == RPC_VERIFY_ALREADY_IN_CHAIN: elif errno == RPC_VERIFY_ALREADY_IN_CHAIN:
logger.info("Transaction is already in the blockchain. Getting confirmation count", txid=txid) logger.info("Transaction is already in the blockchain. Getting confirmation count", txid=txid)
@@ -43,13 +52,20 @@ class Carrier:
if tx_info is not None: if tx_info is not None:
confirmations = int(tx_info.get("confirmations")) confirmations = int(tx_info.get("confirmations"))
receipt = self.Receipt(delivered=True, confirmations=confirmations) receipt = Receipt(delivered=True, confirmations=confirmations, reason=RPC_VERIFY_ALREADY_IN_CHAIN)
else: else:
# There's a really unlikely edge case where a transaction can be reorged between receiving the # 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 # notification and querying the data. In such a case we just resend
self.send_transaction(rawtx, txid) self.send_transaction(rawtx, txid)
elif errno == RPC_DESERIALIZATION_ERROR:
# Adding this here just for completeness. We should never end up here. The Carrier only sends txs
# handed by the Responder, who receives them from the Watcher, who checks that the tx can be properly
# deserialized
logging.info("[Carrier] tx {} cannot be deserialized".format(txid))
receipt = Receipt(delivered=False, reason=RPC_DESERIALIZATION_ERROR)
else: else:
# If something else happens (unlikely but possible) log it so we can treat it in future releases # If something else happens (unlikely but possible) log it so we can treat it in future releases
logger.error("JSONRPCException.", error_code=e) logger.error("JSONRPCException.", error_code=e)
@@ -59,12 +75,11 @@ class Carrier:
@staticmethod @staticmethod
def get_transaction(txid): def get_transaction(txid):
tx_info = None
try: try:
tx_info = bitcoin_cli.getrawtransaction(txid, 1) tx_info = bitcoin_cli.getrawtransaction(txid, 1)
except JSONRPCException as e: except JSONRPCException as e:
tx_info = None
# While it's quite unlikely, the transaction that was already in the blockchain could have been # While it's quite unlikely, the transaction that was already in the blockchain could have been
# reorged while we were querying bitcoind to get the confirmation count. In such a case we just # reorged while we were querying bitcoind to get the confirmation count. In such a case we just
# restart the job # restart the job