SatSale

commit 56521ed08941cbcbc59180eff4148cf765ba5c59
parent 6b20d69449d1311e98b2519bf8b2a0761d6d062b
Author: Nick <nick@nickfarrow.com>
Date:   Tue, 12 Jul 2022 16:16:38 -0500

Merge pull request #79 from kristapsk/payment-expiry

Set expiration time for LN invoices
Diffstat:
M
node/bitcoind.py
 | 
2
+-
M
node/clightning.py
 | 
8
++++----
M
node/lnd.py
 | 
9
+++++----
M
node/xpub.py
 | 
2
+-
M
satsale.py
 | 
2
+-

5 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/node/bitcoind.py b/node/bitcoind.py
@@ -121,7 +121,7 @@ class btcd:
 
         return conf_paid, unconf_paid
 
-    def get_address(self, amount, label):
+    def get_address(self, amount, label, expiry):
         for i in range(config.connection_attempts):
             try:
                 if not self.tor:
diff --git a/node/clightning.py b/node/clightning.py
@@ -74,16 +74,16 @@ class clightning:
         return info["id"] + "@" + address["address"] + ":" + str(address["port"])
 
     # Create lightning invoice
-    def create_clightning_invoice(self, btc_amount, label):
+    def create_clightning_invoice(self, btc_amount, label, expiry):
         # Multiplying by 10^8 to convert to satoshi units
         msats_amount = int(float(btc_amount) * 10 ** (3 + 8))
         lnd_invoice = self.clightning.invoice(
-            msats_amount, label, "SatSale-{}".format(label)
+            msats_amount, label, "SatSale-{}".format(label), expiry
         )
         return lnd_invoice["bolt11"], lnd_invoice["payment_hash"]
 
-    def get_address(self, amount, label):
-        address, r_hash = self.create_clightning_invoice(amount, label)
+    def get_address(self, amount, label, expiry):
+        address, r_hash = self.create_clightning_invoice(amount, label, expiry)
         return address, r_hash
 
     # Check whether the payment has been paid
diff --git a/node/lnd.py b/node/lnd.py
@@ -124,18 +124,19 @@ class lnd:
         return
 
     # Create lightning invoice
-    def create_lnd_invoice(self, btc_amount, memo=None, description_hash=None):
+    def create_lnd_invoice(self, btc_amount, memo=None, description_hash=None, expiry=3600):
         # Multiplying by 10^8 to convert to satoshi units
         sats_amount = int(float(btc_amount) * 10 ** 8)
         res = self.lnd.add_invoice(
-            value=sats_amount, memo=memo, description_hash=description_hash
+            value=sats_amount, memo=memo, description_hash=description_hash, expiry=expiry
         )
         lnd_invoice = json.loads(MessageToJson(res))
 
         return lnd_invoice["paymentRequest"], lnd_invoice["rHash"]
 
-    def get_address(self, amount, label):
-        address, r_hash = self.create_lnd_invoice(amount, memo=label)
+    def get_address(self, amount, label, expiry):
+        address, r_hash = self.create_lnd_invoice(amount,
+            memo=label, expiry=expiry)
         return address, r_hash
 
     def pay_invoice(self, invoice):
diff --git a/node/xpub.py b/node/xpub.py
@@ -80,7 +80,7 @@ class xpub:
         address = child_key.PublicKey().ToAddress()
         return address
 
-    def get_address(self, amount, label):
+    def get_address(self, amount, label, expiry):
         while True:
             n = self.get_next_address_index(self.config["xpub"])
             address = self.get_address_at_index(n)
diff --git a/satsale.py b/satsale.py
@@ -171,7 +171,7 @@ class create_payment(Resource):
         # Get an address / invoice, and create a QR code
         try:
             invoice["address"], invoice["rhash"] = node.get_address(
-                invoice["btc_value"], invoice["uuid"]
+                invoice["btc_value"], invoice["uuid"], config.payment_timeout
             )
         except Exception as e:
             logging.error("Failed to fetch address: {}".format(e))