AaronFiore/electrum
1
0
Fork 0
Code Activity

submarine_swaps: wallet.get_unused_address -> get_receiving_address

Browse Source
This commit is contained in:
SomberNight
2020-06-18 17:11:14 +02:00
parent eb910ba14f
commit 5f2d347d81
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
electrum/submarine_swaps.py
View File

@@ -142,7 +142,7 @@ class SwapManager(Logger):
if amount_sat < dust_threshold(): if amount_sat < dust_threshold():
self.logger.info('utxo value below dust threshold') self.logger.info('utxo value below dust threshold')
continue continue
address = self.wallet.get_unused_address() address = self.wallet.get_receiving_address()
preimage = swap.preimage if swap.is_reverse else 0 preimage = swap.preimage if swap.is_reverse else 0
tx = create_claim_tx(txin, swap.redeem_script, preimage, swap.privkey, address, amount_sat, swap.locktime) tx = create_claim_tx(txin, swap.redeem_script, preimage, swap.privkey, address, amount_sat, swap.locktime)
await self.network.broadcast_transaction(tx) await self.network.broadcast_transaction(tx)

13
electrum/wallet.py
View File

@@ -1566,19 +1566,28 @@ class Abstract_Wallet(AddressSynchronizer, ABC):
def get_unused_addresses(self) -> Sequence[str]: def get_unused_addresses(self) -> Sequence[str]:
domain = self.get_receiving_addresses() domain = self.get_receiving_addresses()
in_use_by_request = [k for k in self.receive_requests.keys() if self.get_request_status(k) != PR_EXPIRED] # we should index receive_requests by id # TODO we should index receive_requests by id
in_use_by_request = [k for k in self.receive_requests.keys()
if self.get_request_status(k) != PR_EXPIRED]
in_use_by_request = set(in_use_by_request)
return [addr for addr in domain if not self.is_used(addr) return [addr for addr in domain if not self.is_used(addr)
and addr not in in_use_by_request] and addr not in in_use_by_request]
@check_returned_address_for_corruption @check_returned_address_for_corruption
def get_unused_address(self) -> Optional[str]: def get_unused_address(self) -> Optional[str]:
"""Get an unused receiving address, if there is one.
Note: there might NOT be one available!
"""
addrs = self.get_unused_addresses() addrs = self.get_unused_addresses()
if addrs: if addrs:
return addrs[0] return addrs[0]
@check_returned_address_for_corruption @check_returned_address_for_corruption
def get_receiving_address(self) -> str: def get_receiving_address(self) -> str:
# always return an address """Get a receiving address. Guaranteed to always return an address."""
unused_addr = self.get_unused_address()
if unused_addr:
return unused_addr
domain = self.get_receiving_addresses() domain = self.get_receiving_addresses()
if not domain: if not domain:
raise Exception("no receiving addresses in wallet?!") raise Exception("no receiving addresses in wallet?!")