SatSale

commit b4bb30b92805e45b9ac2ea6a1ad45f250b331f01
parent 7314292ecf19fca3d6bba48e77ca6bc84d38ee26
Author: Kristaps Kaupe <kristaps@blogiem.lv>
Date:   Thu,  3 Mar 2022 07:26:34 +0200

Fix BTC amount formatting for amounts below 0.0001 (#45)


Diffstat:
M
node/bitcoind.py
 | 
5
++++-
M
node/clightning.py
 | 
2
+-
M
node/lnd.py
 | 
2
+-
M
satsale.py
 | 
13
+++++++------
A
utils.py
 | 
4
++++

5 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/node/bitcoind.py b/node/bitcoind.py
@@ -7,6 +7,8 @@ import uuid
 
 import config
 from payments.price_feed import get_btc_value
+from utils import btc_amount_format
+
 
 if config.tor_bitcoinrpc_host is not None:
     from gateways.tor import session
@@ -92,7 +94,8 @@ class btcd:
             )
 
     def create_qr(self, uuid, address, value):
-        qr_str = "bitcoin:{}?amount={}&label={}".format(address, value, uuid)
+        qr_str = "bitcoin:{}?amount={}&label={}".format(
+            address, btc_amount_format(value), uuid)
 
         img = qrcode.make(qr_str)
         img.save("static/qr_codes/{}.png".format(uuid))
diff --git a/node/clightning.py b/node/clightning.py
@@ -60,7 +60,7 @@ class clightning:
     # Create lightning invoice
     def create_clightning_invoice(self, btc_amount, label):
         # Multiplying by 10^8 to convert to satoshi units
-        msats_amount = int(btc_amount * 10 ** (3 + 8))
+        msats_amount = int(float(btc_amount) * 10 ** (3 + 8))
         lnd_invoice = self.clightning.invoice(
             msats_amount, label, "SatSale-{}".format(label)
         )
diff --git a/node/lnd.py b/node/lnd.py
@@ -124,7 +124,7 @@ class lnd:
     # Create lightning invoice
     def create_lnd_invoice(self, btc_amount, memo=None, description_hash=None):
         # Multiplying by 10^8 to convert to satoshi units
-        sats_amount = int(btc_amount * 10 ** 8)
+        sats_amount = int(float(btc_amount) * 10 ** 8)
         res = self.lnd.add_invoice(
             value=sats_amount, memo=memo, description_hash=description_hash
         )
diff --git a/satsale.py b/satsale.py
@@ -24,6 +24,7 @@ from payments.price_feed import get_btc_value
 from node import bitcoind
 from node import lnd
 from node import clightning
+from utils import btc_amount_format
 
 from gateways import woo_webhook
 
@@ -146,7 +147,7 @@ class create_payment(Resource):
         invoice = {
             "uuid": str(uuid.uuid4().hex),
             "fiat_value": base_amount,
-            "btc_value": round(get_btc_value(base_amount, currency), 8),
+            "btc_value": btc_amount_format(get_btc_value(base_amount, currency)),
             "method": payment_method,
             "time": time.time(),
             "webhook": webhook,
@@ -277,20 +278,20 @@ def check_payment_status(uuid):
         dbg_free_mode_cond = config.free_mode and (time.time() - invoice["time"] > 5)
 
         # If payment is paid
-        if (conf_paid >= invoice["btc_value"]) or dbg_free_mode_cond:
+        if (conf_paid >= float(invoice["btc_value"])) or dbg_free_mode_cond:
             status.update(
                 {
                     "payment_complete": 1,
-                    "confirmed_paid": conf_paid,
-                    "unconfirmed_paid": unconf_paid,
+                    "confirmed_paid": btc_amount_format(conf_paid),
+                    "unconfirmed_paid": btc_amount_format(unconf_paid),
                 }
             )
         else:
             status.update(
                 {
                     "payment_complete": 0,
-                    "confirmed_paid": conf_paid,
-                    "unconfirmed_paid": unconf_paid,
+                    "confirmed_paid": btc_amount_format(conf_paid),
+                    "unconfirmed_paid": btc_amount_format(unconf_paid),
                 }
             )
 
diff --git a/utils.py b/utils.py
@@ -0,0 +1,4 @@
+
+def btc_amount_format(btc_amount):
+    return "%.8f" % float(btc_amount)
+