AaronFiore/electrum
1
0
Fork 0
Code Activity

lnworker.add_request: force keyword args

Browse Source 
and change type-hint to reflect that fallback_address can be None
This commit is contained in:
SomberNight
2022-06-22 02:26:54 +02:00
parent be322f7ea7
commit cafd5c4af0
2 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
electrum/lnworker.py
View File

@@ -1808,7 +1808,7 @@ class LNWallet(LNWorker):
amount_msat: Optional[int], amount_msat: Optional[int],
message: str, message: str,
expiry: int, expiry: int,
fallback_address: str, fallback_address: Optional[str],
write_to_disk: bool = True, write_to_disk: bool = True,
channels: Optional[Sequence[Channel]] = None, channels: Optional[Sequence[Channel]] = None,
) -> Tuple[LnAddr, str]: ) -> Tuple[LnAddr, str]:
@@ -1848,10 +1848,16 @@ class LNWallet(LNWorker):
self.wallet.save_db() self.wallet.save_db()
return lnaddr, invoice return lnaddr, invoice
def add_request(self, amount_sat: Optional[int], message:str, expiry: int, fallback_address:str) -> str: def add_request(
self,
*,
amount_sat: Optional[int],
message: str,
expiry: int,
fallback_address: Optional[str],
) -> str:
# passed expiry is relative, it is absolute in the lightning invoice # passed expiry is relative, it is absolute in the lightning invoice
amount_msat = amount_sat * 1000 if amount_sat else None amount_msat = amount_sat * 1000 if amount_sat else None
timestamp = int(time.time())
lnaddr, invoice = self.create_invoice( lnaddr, invoice = self.create_invoice(
amount_msat=amount_msat, amount_msat=amount_msat,
message=message, message=message,

10
electrum/wallet.py
View File

@@ -2438,7 +2438,15 @@ class Abstract_Wallet(ABC, Logger, EventListener):
exp_delay = exp_delay or 0 exp_delay = exp_delay or 0
timestamp = int(time.time()) timestamp = int(time.time())
fallback_address = address if self.config.get('bolt11_fallback', True) else None fallback_address = address if self.config.get('bolt11_fallback', True) else None
lightning_invoice = self.lnworker.add_request(amount_sat, message, exp_delay, fallback_address) if lightning else None if lightning:
lightning_invoice = self.lnworker.add_request(
amount_sat=amount_sat,
message=message,
expiry=exp_delay,
fallback_address=fallback_address,
)
else:
lightning_invoice = None
outputs = [ PartialTxOutput.from_address_and_value(address, amount_sat)] if address else [] outputs = [ PartialTxOutput.from_address_and_value(address, amount_sat)] if address else []
height = self.adb.get_local_height() height = self.adb.get_local_height()
req = Invoice( req = Invoice(