diff --git a/electrum/address_synchronizer.py b/electrum/address_synchronizer.py index f501f6809..a946426e8 100644 --- a/electrum/address_synchronizer.py +++ b/electrum/address_synchronizer.py @@ -140,6 +140,7 @@ class AddressSynchronizer(Logger, EventListener): def get_address_history(self, addr: str) -> Dict[str, int]: """Returns the history for the address, as a txid->height dict. In addition to what we have from the server, this includes local and future txns. + Note: heights are SPV-verified. Also see related method db.get_addr_history, which stores the response from the server, so that only includes txns the server sees. @@ -841,8 +842,8 @@ class AddressSynchronizer(Logger, EventListener): @with_lock def get_addr_io(self, address: str): h = self.get_address_history(address).items() - received = {} - sent = {} + received = {} # type: Dict[str, tuple[int, int, int, bool]] + sent = {} # type: Dict[str, tuple[str, int, int]] for tx_hash, height in h: tx_mined_info = self.get_tx_height(tx_hash) txpos = tx_mined_info.txpos if tx_mined_info.txpos is not None else -1 diff --git a/electrum/transaction.py b/electrum/transaction.py index 33040b78c..7126e0c88 100644 --- a/electrum/transaction.py +++ b/electrum/transaction.py @@ -336,9 +336,9 @@ class TxInput: self.witness = witness self._is_coinbase_output = is_coinbase_output # blockchain fields - self.block_height = None # type: Optional[int] # height at which the TXO is mined; None means unknown. not SPV-ed. + self.block_height = None # type: Optional[int] # height at which the TXO is mined; None means unknown. SPV-ed. self.block_txpos = None # type: Optional[int] # position of tx in block, if TXO is mined; otherwise None or -1 - self.spent_height = None # type: Optional[int] # height at which the TXO got spent + self.spent_height = None # type: Optional[int] # height at which the TXO got spent. SPV-ed. self.spent_txid = None # type: Optional[str] # txid of the spender self._utxo = None # type: Optional[Transaction] self.__scriptpubkey = None # type: Optional[bytes]