address_synchronizer.get_history now returns HistoryItem(NamedTuple)s
This commit is contained in:
@@ -26,7 +26,7 @@ import threading
|
||||
import asyncio
|
||||
import itertools
|
||||
from collections import defaultdict
|
||||
from typing import TYPE_CHECKING, Dict, Optional, Set, Tuple
|
||||
from typing import TYPE_CHECKING, Dict, Optional, Set, Tuple, NamedTuple, Sequence
|
||||
|
||||
from . import bitcoin
|
||||
from .bitcoin import COINBASE_MATURITY, TYPE_ADDRESS, TYPE_PUBKEY
|
||||
@@ -57,6 +57,14 @@ class UnrelatedTransactionException(AddTransactionException):
|
||||
return _("Transaction is unrelated to this wallet.")
|
||||
|
||||
|
||||
class HistoryItem(NamedTuple):
|
||||
txid: str
|
||||
tx_mined_status: TxMinedInfo
|
||||
delta: Optional[int]
|
||||
fee: Optional[int]
|
||||
balance: Optional[int]
|
||||
|
||||
|
||||
class AddressSynchronizer(Logger):
|
||||
"""
|
||||
inherited by wallet
|
||||
@@ -418,7 +426,7 @@ class AddressSynchronizer(Logger):
|
||||
return f
|
||||
|
||||
@with_local_height_cached
|
||||
def get_history(self, domain=None):
|
||||
def get_history(self, domain=None) -> Sequence[HistoryItem]:
|
||||
# get domain
|
||||
if domain is None:
|
||||
domain = self.get_addresses()
|
||||
@@ -448,7 +456,11 @@ class AddressSynchronizer(Logger):
|
||||
balance = c + u + x
|
||||
h2 = []
|
||||
for tx_hash, tx_mined_status, delta, fee in history:
|
||||
h2.append((tx_hash, tx_mined_status, delta, fee, balance))
|
||||
h2.append(HistoryItem(txid=tx_hash,
|
||||
tx_mined_status=tx_mined_status,
|
||||
delta=delta,
|
||||
fee=fee,
|
||||
balance=balance))
|
||||
if balance is None or delta is None:
|
||||
balance = None
|
||||
else:
|
||||
|
||||
Reference in New Issue
Block a user