AaronFiore/electrum
1
0
Fork 0
Code Activity

Merge pull request #8659 from accumulator/issue_8658

Browse Source 
request: amount_msat is set to None in Request when creating request …
This commit is contained in:
ThomasV
2023-10-25 17:55:39 +02:00
committed by GitHub
parent abe700167f 420e584f4e
commit fac5153329
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
electrum/wallet.py
View File

@@ -2656,24 +2656,25 @@ class Abstract_Wallet(ABC, Logger, EventListener):
fallback_address=req.get_address() if self.config.WALLET_BOLT11_FALLBACK else None) fallback_address=req.get_address() if self.config.WALLET_BOLT11_FALLBACK else None)
return invoice return invoice
def create_request(self, amount_sat: int, message: str, exp_delay: int, address: Optional[str]): def create_request(self, amount_sat: Optional[int], message: Optional[str], exp_delay: Optional[int], address: Optional[str]):
# for receiving # for receiving
amount_sat = amount_sat or 0 amount_sat = amount_sat or 0
assert isinstance(amount_sat, int), f"{amount_sat!r}" assert isinstance(amount_sat, int), f"{amount_sat!r}"
amount_msat = None if not amount_sat else amount_sat * 1000 # amount_sat in [None, 0] implies undefined.
message = message or '' message = message or ''
address = address or None # converts "" to None address = address or None # converts "" to None
exp_delay = exp_delay or 0 exp_delay = exp_delay or 0
timestamp = int(Request._get_cur_time()) timestamp = int(Request._get_cur_time())
payment_hash = None # type: Optional[bytes] payment_hash = None # type: Optional[bytes]
if self.has_lightning(): if self.has_lightning():
payment_hash = self.lnworker.create_payment_info(amount_msat=amount_sat * 1000, write_to_disk=False) payment_hash = self.lnworker.create_payment_info(amount_msat=amount_msat, write_to_disk=False)
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 = Request( req = Request(
outputs=outputs, outputs=outputs,
message=message, message=message,
time=timestamp, time=timestamp,
amount_msat=amount_sat*1000, amount_msat=amount_msat,
exp=exp_delay, exp=exp_delay,
height=height, height=height,
bip70=None, bip70=None,