From c2c3ece45510370aafae3eb4a4cb481cf9b15459 Mon Sep 17 00:00:00 2001
From: SomberNight <somber.night@protonmail.com>
Date: Wed, 24 Mar 2021 19:37:37 +0100
Subject: [PATCH] wallet: implement get_utxos at specific block height
This allows looking up what UTXOs the wallet had at a specific time in the past.
---
electrum/address_synchronizer.py | 42 +++++++++++++++++++++++---------
electrum/wallet.py | 2 +-
2 files changed, 32 insertions(+), 12 deletions(-)
diff --git a/electrum/address_synchronizer.py b/electrum/address_synchronizer.py
index bc2c0067c..d382e97f5 100644
--- a/electrum/address_synchronizer.py
+++ b/electrum/address_synchronizer.py
@@ -835,27 +835,47 @@ class AddressSynchronizer(Logger):
return result
@with_local_height_cached
- def get_utxos(self, domain=None, *, excluded_addresses=None,
- mature_only: bool = False, confirmed_only: bool = False,
- nonlocal_only: bool = False) -> Sequence[PartialTxInput]:
+ def get_utxos(
+ self,
+ domain=None,
+ *,
+ excluded_addresses=None,
+ mature_only: bool = False,
+ confirmed_funding_only: bool = False,
+ confirmed_spending_only: bool = False,
+ nonlocal_only: bool = False,
+ block_height: int = None,
+ ) -> Sequence[PartialTxInput]:
+ if block_height is not None:
+ # caller wants the UTXOs we had at a given height; check other parameters
+ assert confirmed_funding_only
+ assert confirmed_spending_only
+ assert nonlocal_only
+ else:
+ block_height = self.get_local_height()
coins = []
if domain is None:
domain = self.get_addresses()
domain = set(domain)
if excluded_addresses:
domain = set(domain) - set(excluded_addresses)
- mempool_height = self.get_local_height() + 1 # height of next block
+ mempool_height = block_height + 1 # height of next block
for addr in domain:
- utxos = self.get_addr_utxo(addr)
- for utxo in utxos.values():
- if confirmed_only and utxo.block_height <= 0:
+ txos = self.get_addr_outputs(addr)
+ for txo in txos.values():
+ if txo.spent_height is not None:
+ if not confirmed_spending_only:
+ continue
+ if confirmed_spending_only and 0 < txo.spent_height <= block_height:
+ continue
+ if confirmed_funding_only and not (0 < txo.block_height <= block_height):
continue
- if nonlocal_only and utxo.block_height == TX_HEIGHT_LOCAL:
+ if nonlocal_only and txo.block_height in (TX_HEIGHT_LOCAL, TX_HEIGHT_FUTURE):
continue
- if (mature_only and utxo.is_coinbase_output()
- and utxo.block_height + COINBASE_MATURITY > mempool_height):
+ if (mature_only and txo.is_coinbase_output()
+ and txo.block_height + COINBASE_MATURITY > mempool_height):
continue
- coins.append(utxo)
+ coins.append(txo)
continue
return coins
diff --git a/electrum/wallet.py b/electrum/wallet.py
index 51633bfc6..0bd7b26fa 100644
--- a/electrum/wallet.py
+++ b/electrum/wallet.py
@@ -669,7 +669,7 @@ class Abstract_Wallet(AddressSynchronizer, ABC):
utxos = self.get_utxos(domain,
excluded_addresses=frozen_addresses,
mature_only=True,
- confirmed_only=confirmed_only,
+ confirmed_funding_only=confirmed_only,
nonlocal_only=nonlocal_only)
utxos = [utxo for utxo in utxos if not self.is_frozen_coin(utxo)]
return utxos