refactor: clean database calls in `api_transactions` view

And minor fixes.

LNbits/__init__.py

@@ -34,7 +34,6 @@ def db_connect(db_path=DEFAULT_PATH):
 
 @app.route("/")
 def home():
-
     return render_template("index.html")
 
 
@@ -43,16 +42,16 @@ def deletewallet():
     thewal = request.args.get("wal")
 
     with Database() as db:
-        rowss = db.fetchall("SELECT * FROM wallets WHERE hash = ?", (thewal,))
+        wallets = db.fetchall("SELECT * FROM wallets WHERE hash = ?", (thewal,))
 
-        if rowss:
+        if wallets:
-            db.execute("UPDATE wallets SET user = ? WHERE hash = ?", (f"del{rowss[0][4]}", rowss[0][0]))
+            db.execute("UPDATE wallets SET user = ? WHERE hash = ?", (f"del{wallets[0][4]}", wallets[0][0]))
-            db.execute("UPDATE wallets SET adminkey = ? WHERE hash = ?", (f"del{rowss[0][5]}", rowss[0][0]))
+            db.execute("UPDATE wallets SET adminkey = ? WHERE hash = ?", (f"del{wallets[0][5]}", wallets[0][0]))
-            db.execute("UPDATE wallets SET inkey = ? WHERE hash = ?", (f"del{rowss[0][6]}", rowss[0][0]))
+            db.execute("UPDATE wallets SET inkey = ? WHERE hash = ?", (f"del{wallets[0][6]}", wallets[0][0]))
-            rowsss = db.fetchall("SELECT * FROM wallets WHERE user = ?", (rowss[0][4],))
+            user_wallets = db.fetchall("SELECT * FROM wallets WHERE user = ?", (wallets[0][4],))
 
-            if rowsss:
+            if user_wallets:
-                return render_template("deletewallet.html", theid=rowsss[0][4], thewal=rowsss[0][0])
+                return render_template("deletewallet.html", theid=user_wallets[0][4], thewal=user_wallets[0][0])
 
     return render_template("index.html")
 
@@ -183,7 +182,7 @@ def wallet():
                 wallet = db.fetchall("SELECT * FROM wallets WHERE hash = ?", (thewal,))
 
                 if wallet:
-                    walb = wallet[0][1].split(",")[-1]
+                    walb = str(wallet[0][1]).split(",")[-1]
                     return render_template(
                         "wallet.html",
                         thearr=user_wallets,
@@ -300,7 +299,7 @@ def api_invoices():
         payment_hash = data["payment_hash"]
 
         db.execute(
-            "INSERT INTO apipayments (payhash, amount, wallet, paid, inkey, memo) VALUES (?, ?, ?, 0, ?, ?)'",
+            "INSERT INTO apipayments (payhash, amount, wallet, paid, inkey, memo) VALUES (?, ?, ?, 0, ?, ?)",
             (
                 payment_hash,
                 postedjson["value"],
@@ -313,24 +312,26 @@ def api_invoices():
     return jsonify({"pay_req": pay_req, "payment_hash": payment_hash}), 200
 
 
-# API requests
 @app.route("/v1/channels/transactions", methods=["GET", "POST"])
 def api_transactions():
-    if request.headers["Content-Type"] == "application/json":
+    if request.headers["Content-Type"] != "application/json":
+        return jsonify({"ERROR": "MUST BE JSON"}), 200
+
     postedjson = request.json
-        print(postedjson)
-        print(postedjson["payment_request"])
 
-        if "payment_request" in postedjson:
+    if "payment_request" not in postedjson:
-            con = db_connect()
+        return jsonify({"ERROR": "NO PAY REQ"}), 200
-            cur = con.cursor()
+
-            print(request.headers["Grpc-Metadata-macaroon"])
+    with Database() as db:
-            print()
+        wallets = db.fetchall("SELECT * FROM wallets WHERE adminkey = ?", (request.headers["Grpc-Metadata-macaroon"],))
-            cur.execute("select * from wallets WHERE adminkey = '" + request.headers["Grpc-Metadata-macaroon"] + "'")
-            rows = cur.fetchall()
-            if len(rows) > 0:
-                cur.close()
 
+        if not wallets:
+            return jsonify({"ERROR": "BAD AUTH"}), 200
+
+        # TODO: check this unused code
+        # move sats calculation to a helper
+        # ---------------------------------
+        """
         s = postedjson["payment_request"]
         result = re.search("lnbc(.*)1p", s)
         tempp = result.group(1)
@@ -350,73 +351,37 @@ def api_transactions():
             sats = int(num) * 100
         elif alpha == "m":
             sats = int(num) * 100000
-
+        """
-                print(sats)
+        # ---------------------------------
-                print(alpha)
-                print(num)
 
         dataj = {"invoice": postedjson["payment_request"]}
-                headers = {"Authorization": "Basic %s" % ADMIN_KEY}
+        headers = {"Authorization": f"Basic {ADMIN_KEY}"}
-                r = requests.post(url=API_ENDPOINT + "/payinvoice", json=dataj, headers=headers)
+        r = requests.post(url=f"{API_ENDPOINT}/payinvoice", json=dataj, headers=headers)
         data = r.json()
-                print(data)
 
-                con = db_connect()
+        db.execute(
-                cur = con.cursor()
+            "INSERT INTO apipayments (payhash, amount, wallet, paid, adminkey, memo) VALUES (?, ?, ?, 1, ?, ?)'",
-
+            (
-                cur.execute(
+                data["decoded"]["payment_hash"],
-                    "INSERT INTO apipayments (payhash, amount, wallet, paid, adminkey, memo) VALUES ('"
+                str(-int(data["decoded"]["num_satoshis"])),
-                    + data["decoded"]["payment_hash"]
+                wallets[0][0],
-                    + "','"
+                request.headers["Grpc-Metadata-macaroon"],
-                    + str(-int(data["decoded"]["num_satoshis"]))
+                data["decoded"]["description"],
-                    + "','"
+            ),
-                    + rows[0][0]
-                    + "','1','"
-                    + request.headers["Grpc-Metadata-macaroon"]
-                    + "','"
-                    + data["decoded"]["description"]
-                    + "')"
         )
-                con.commit()
-                cur.close()
-
-                con = db_connect()
-                cur = con.cursor()
-                cur.execute("select * from apipayments WHERE payhash = '" + data["decoded"]["payment_hash"] + "'")
-                rowss = cur.fetchall()
-                cur.close()
 
-                data["decoded"]["num_satoshis"]
+        payment = db.fetchall("SELECT * FROM apipayments WHERE payhash = ?", (data["decoded"]["payment_hash"],))[0]
 
-                lastamt = rows[0][1].split(",")
+        lastamt = str(wallets[0][1]).split(",")
         newamt = int(lastamt[-1]) - int(data["decoded"]["num_satoshis"])
-                updamt = rows[0][1] + "," + str(newamt)
+        updamt = wallets[0][1] + "," + str(newamt)
-                thetime = time.time()
+        transactions = f"{wallets[0][2]}!{payment[5]},{time.time()},{payment[1]},{newamt}"
-                transactions = (
-                    rows[0][2] + "!" + rowss[0][5] + "," + str(thetime) + "," + str(rowss[0][1]) + "," + str(newamt)
-                )
 
-                con = db_connect()
+        db.execute(
-                cur = con.cursor()
+            "UPDATE wallets SET balance = ?, transactions = ? WHERE hash = ?", (updamt, transactions, wallets[0][0])
-
-                cur.execute(
-                    "UPDATE wallets SET balance = '"
-                    + updamt
-                    + "', transactions = '"
-                    + transactions
-                    + "' WHERE hash = '"
-                    + rows[0][0]
-                    + "'"
         )
-                con.commit()
-                cur.close()
 
     return jsonify({"PAID": "TRUE"}), 200
-            else:
-                return jsonify({"ERROR": "BAD AUTH"}), 200
-        return jsonify({"ERROR": "NO PAY REQ"}), 200
-
-    return jsonify({"ERROR": "MUST BE JSON"}), 200
 
 
 @app.route("/v1/invoice/<payhash>", methods=["GET"])