LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-08-23 17:47:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

use IntEnum for TxMinedDepth

Browse source
This commit is contained in:
Janus 2018-10-30 20:18:26 +01:00 • committed by ThomasV
parent 632f11d5da
commit f9f1805cdf
1 changed files with 23 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
electrum/lnwatcher.py
View file

@ -7,6 +7,7 @@ from typing import NamedTuple, Iterable, TYPE_CHECKING
import os import os
from collections import defaultdict from collections import defaultdict
import asyncio import asyncio
from enum import IntEnum, auto
import jsonrpclib import jsonrpclib
@ -20,7 +21,12 @@ if TYPE_CHECKING:
from .network import Network from .network import Network
TX_MINED_STATUS_DEEP, TX_MINED_STATUS_SHALLOW, TX_MINED_STATUS_MEMPOOL, TX_MINED_STATUS_FREE = range(0, 4) class TxMinedDepth(IntEnum):
""" IntEnum because we call min() in get_deepest_tx_mined_depth_for_txids """
DEEP = auto()
SHALLOW = auto()
MEMPOOL = auto()
FREE = auto()
class LNWatcher(PrintError): class LNWatcher(PrintError):
@ -164,17 +170,17 @@ class LNWatcher(PrintError):
with self.lock: with self.lock:
encumbered_sweep_txns = self.sweepstore[funding_outpoint][prev_txid] encumbered_sweep_txns = self.sweepstore[funding_outpoint][prev_txid]
if len(encumbered_sweep_txns) == 0: if len(encumbered_sweep_txns) == 0:
if self.get_tx_mined_status(prev_txid) == TX_MINED_STATUS_DEEP: if self.get_tx_mined_depth(prev_txid) == TxMinedDepth.DEEP:
return False return False
# check if any response applies # check if any response applies
keep_watching_this = False keep_watching_this = False
local_height = self.network.get_local_height() local_height = self.network.get_local_height()
for e_tx in list(encumbered_sweep_txns): for e_tx in list(encumbered_sweep_txns):
conflicts = self.addr_sync.get_conflicting_transactions(e_tx.tx.txid(), e_tx.tx, include_self=True) conflicts = self.addr_sync.get_conflicting_transactions(e_tx.tx.txid(), e_tx.tx, include_self=True)
conflict_mined_status = self.get_deepest_tx_mined_status_for_txids(conflicts) conflict_mined_depth = self.get_deepest_tx_mined_depth_for_txids(conflicts)
if conflict_mined_status != TX_MINED_STATUS_DEEP: if conflict_mined_depth != TxMinedDepth.DEEP:
keep_watching_this = True keep_watching_this = True
if conflict_mined_status == TX_MINED_STATUS_FREE: if conflict_mined_depth == TxMinedDepth.FREE:
tx_height = self.addr_sync.get_tx_height(prev_txid).height tx_height = self.addr_sync.get_tx_height(prev_txid).height
num_conf = local_height - tx_height + 1 num_conf = local_height - tx_height + 1
broadcast = True broadcast = True
@ -214,27 +220,27 @@ class LNWatcher(PrintError):
self.sweepstore[funding_outpoint][prev_txid].add(encumbered_sweeptx) self.sweepstore[funding_outpoint][prev_txid].add(encumbered_sweeptx)
self.write_to_disk() self.write_to_disk()
def get_tx_mined_status(self, txid: str): def get_tx_mined_depth(self, txid: str):
if not txid: if not txid:
return TX_MINED_STATUS_FREE return TxMinedStatus.FREE
tx_mined_status = self.addr_sync.get_tx_height(txid) tx_mined_depth = self.addr_sync.get_tx_height(txid)
height, conf = tx_mined_status.height, tx_mined_status.conf height, conf = tx_mined_depth.height, tx_mined_depth.conf
if conf > 100: if conf > 100:
return TX_MINED_STATUS_DEEP return TxMinedDepth.DEEP
elif conf > 0: elif conf > 0:
return TX_MINED_STATUS_SHALLOW return TxMinedDepth.SHALLOW
elif height in (wallet.TX_HEIGHT_UNCONFIRMED, wallet.TX_HEIGHT_UNCONF_PARENT): elif height in (wallet.TX_HEIGHT_UNCONFIRMED, wallet.TX_HEIGHT_UNCONF_PARENT):
return TX_MINED_STATUS_MEMPOOL return TxMinedDepth.MEMPOOL
elif height == wallet.TX_HEIGHT_LOCAL: elif height == wallet.TX_HEIGHT_LOCAL:
return TX_MINED_STATUS_FREE return TxMinedDepth.FREE
elif height > 0 and conf == 0: elif height > 0 and conf == 0:
# unverified but claimed to be mined # unverified but claimed to be mined
return TX_MINED_STATUS_MEMPOOL return TxMinedDepth.MEMPOOL
else: else:
raise NotImplementedError() raise NotImplementedError()
def get_deepest_tx_mined_status_for_txids(self, set_of_txids: Iterable[str]): def get_deepest_tx_mined_depth_for_txids(self, set_of_txids: Iterable[str]):
if not set_of_txids: if not set_of_txids:
return TX_MINED_STATUS_FREE return TxMinedDepth.FREE
# note: using "min" as lower status values are deeper # note: using "min" as lower status values are deeper
return min(map(self.get_tx_mined_status, set_of_txids)) return min(map(self.get_tx_mined_depth, set_of_txids))