aljaz/python-teos
1
0
Fork 0
mirror of https://github.com/aljazceru/python-teos.git synced 2025-12-17 22:24:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes Responder

Browse Source 
There were a couple of wrong things going on in the `Responder`:

- `check_confirmations` included in 8a10979db0 was not doing a good job keeping track of the missed confirmations, probably due to a overlooked refactor.

- There was an edge case when adding txs to `unconfirmed_txs` on `create_job` that may lead to a transaction being confirmed and unconfirmed at the same time from the `Responder's` pow. It could be triggered by adding two jobs with the same justice_txid.
This commit is contained in:
Sergi Delgado Segura
2019-11-11 17:50:28 +00:00
parent f81cb04b74
commit c54d10f92c
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
pisa/responder.py
View File

@@ -113,7 +113,8 @@ class Responder:
else: else:
self.tx_job_map[justice_txid] = [uuid] self.tx_job_map[justice_txid] = [uuid]
if confirmations == 0: # In the case we receive two jobs with the same justice txid we only add it to the unconfirmed txs list once
if justice_txid not in self.unconfirmed_txs and confirmations == 0:
self.unconfirmed_txs.append(justice_txid) self.unconfirmed_txs.append(justice_txid)
self.db_manager.store_responder_job(uuid, job.to_json()) self.db_manager.store_responder_job(uuid, job.to_json())
@@ -145,7 +146,6 @@ class Responder:
if block is not None: if block is not None:
txs = block.get("tx") txs = block.get("tx")
height = block.get("height")
logger.info( logger.info(
"New block received", block_hash=block_hash, prev_block_hash=block.get("previousblockhash"), txs=txs "New block received", block_hash=block_hash, prev_block_hash=block.get("previousblockhash"), txs=txs
@@ -155,6 +155,7 @@ class Responder:
if prev_block_hash == block.get("previousblockhash"): if prev_block_hash == block.get("previousblockhash"):
self.check_confirmations(txs) self.check_confirmations(txs)
height = block.get("height")
txs_to_rebroadcast = self.get_txs_to_rebroadcast(txs) txs_to_rebroadcast = self.get_txs_to_rebroadcast(txs)
completed_jobs = self.get_completed_jobs(height) completed_jobs = self.get_completed_jobs(height)
@@ -184,25 +185,25 @@ class Responder:
logger.info("No more pending jobs, going back to sleep") logger.info("No more pending jobs, going back to sleep")
# NOTCOVERED
def check_confirmations(self, txs): def check_confirmations(self, txs):
# If a new confirmed tx matches a tx we are watching, then we remove it from the unconfirmed txs map
for tx in txs: for tx in txs:
print(tx, tx in self.tx_job_map and tx in self.unconfirmed_txs)
if tx in self.tx_job_map and tx in self.unconfirmed_txs: if tx in self.tx_job_map and tx in self.unconfirmed_txs:
self.unconfirmed_txs.remove(tx) self.unconfirmed_txs.remove(tx)
logger.info("Confirmation received for transaction", tx=tx) logger.info("Confirmation received for transaction", tx=tx)
elif tx in self.unconfirmed_txs: # We also add a missing confirmation to all those txs waiting to be confirmed that have not been confirmed in
# the current block
for tx in self.unconfirmed_txs:
if tx in self.missed_confirmations: if tx in self.missed_confirmations:
self.missed_confirmations[tx] += 1 self.missed_confirmations[tx] += 1
else: else:
self.missed_confirmations[tx] = 1 self.missed_confirmations[tx] = 1
logger.info( logger.info("Transaction missed a confirmation", tx=tx, missed_confirmations=self.missed_confirmations[tx])
"Transaction missed a confirmation", tx=tx, missed_confirmations=self.missed_confirmations[tx]
)
def get_txs_to_rebroadcast(self, txs): def get_txs_to_rebroadcast(self, txs):
txs_to_rebroadcast = [] txs_to_rebroadcast = []