aiolabs/lnbits
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

extra fields on apipayments + index payments by payment_hash

Browse source
This commit is contained in:
fiatjaf 2020-08-31 22:12:46 -03:00
parent c96b22664e
commit bf3c44b3c4
24 changed files with 360 additions and 349 deletions
Download patch file Download diff file Expand all files Collapse all files

50
lnbits/core/crud.py
View file

@ -1,4 +1,4 @@
from typing import List, Optional from typing import List, Optional, Dict
from uuid import uuid4 from uuid import uuid4
from lnbits.db import open_db from lnbits.db import open_db
@ -136,18 +136,18 @@ def get_wallet_for_key(key: str, key_type: str = "invoice") -> Optional[Wallet]:
# --------------- # ---------------
def get_wallet_payment(wallet_id: str, checking_id: str) -> Optional[Payment]: def get_wallet_payment(wallet_id: str, payment_hash: str) -> Optional[Payment]:
with open_db() as db: with open_db() as db:
row = db.fetchone( row = db.fetchone(
""" """
SELECT id as checking_id, amount, fee, pending, memo, time SELECT *
FROM apipayment FROM apipayments
WHERE wallet = ? AND id = ? WHERE wallet = ? AND hash = ?
""", """,
(wallet_id, checking_id), (wallet_id, payment_hash),
) )
return Payment(**row) if row else None return Payment.from_row(row) if row else None
def get_wallet_payments( def get_wallet_payments(
@ -179,7 +179,7 @@ def get_wallet_payments(
with open_db() as db: with open_db() as db:
rows = db.fetchall( rows = db.fetchall(
f""" f"""
SELECT id as checking_id, amount, fee, pending, memo, time SELECT *
FROM apipayments FROM apipayments
WHERE wallet = ? {clause} WHERE wallet = ? {clause}
ORDER BY time DESC ORDER BY time DESC
@ -187,7 +187,7 @@ def get_wallet_payments(
(wallet_id,), (wallet_id,),
) )
return [Payment(**row) for row in rows] return [Payment.from_row(row) for row in rows]
def delete_wallet_payments_expired(wallet_id: str, *, seconds: int = 86400) -> None: def delete_wallet_payments_expired(wallet_id: str, *, seconds: int = 86400) -> None:
@ -195,7 +195,7 @@ def delete_wallet_payments_expired(wallet_id: str, *, seconds: int = 86400) -> N
db.execute( db.execute(
""" """
DELETE DELETE
FROM apipayment WHERE wallet = ? AND pending = 1 AND time < strftime('%s', 'now') - ? FROM apipayments WHERE wallet = ? AND pending = 1 AND time < strftime('%s', 'now') - ?
""", """,
(wallet_id, seconds), (wallet_id, seconds),
) )
@ -206,18 +206,30 @@ def delete_wallet_payments_expired(wallet_id: str, *, seconds: int = 86400) -> N
def create_payment( def create_payment(
*, wallet_id: str, checking_id: str, payment_hash: str, amount: int, memo: str, fee: int = 0, pending: bool = True *,
wallet_id: str,
checking_id: str,
payment_request: str,
payment_hash: str,
amount: int,
memo: str,
fee: int = 0,
preimage: Optional[str] = None,
pending: bool = True,
extra: Optional[Dict] = None,
) -> Payment: ) -> Payment:
with open_db() as db: with open_db() as db:
db.execute( db.execute(
""" """
INSERT INTO apipayment (wallet, id, payment_hash, amount, pending, memo, fee) INSERT INTO apipayments
VALUES (?, ?, ?, ?, ?, ?, ?) (wallet, checking_id, bolt11, hash, preimage,
amount, pending, memo, fee, extra)
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
""", """,
(wallet_id, checking_id, payment_hash, amount, int(pending), memo, fee), (wallet_id, checking_id, payment_request, payment_hash, preimage, amount, int(pending), memo, fee, extra),
) )
new_payment = get_wallet_payment(wallet_id, checking_id) new_payment = get_wallet_payment(wallet_id, payment_hash)
assert new_payment, "Newly created payment couldn't be retrieved" assert new_payment, "Newly created payment couldn't be retrieved"
return new_payment return new_payment
@ -225,18 +237,18 @@ def create_payment(
def update_payment_status(checking_id: str, pending: bool) -> None: def update_payment_status(checking_id: str, pending: bool) -> None:
with open_db() as db: with open_db() as db:
db.execute("UPDATE apipayment SET pending = ? WHERE id = ?", (int(pending), checking_id,)) db.execute("UPDATE apipayments SET pending = ? WHERE checking_id = ?", (int(pending), checking_id,))
def delete_payment(checking_id: str) -> None: def delete_payment(checking_id: str) -> None:
with open_db() as db: with open_db() as db:
db.execute("DELETE FROM apipayment WHERE id = ?", (checking_id,)) db.execute("DELETE FROM apipayments WHERE checking_id = ?", (checking_id,))
def check_internal(payment_hash: str) -> None: def check_internal(payment_hash: str) -> None:
with open_db() as db: with open_db() as db:
row = db.fetchone("SELECT * FROM apipayment WHERE payment_hash = ?", (payment_hash,)) row = db.fetchone("SELECT checking_id FROM apipayments WHERE hash = ?", (payment_hash,))
if not row: if not row:
return False return False
else: else:
return row['id'] return row["checking_id"]

76
lnbits/core/migrations.py
View file

@ -69,74 +69,22 @@ def m001_initial(db):
GROUP BY wallet; GROUP BY wallet;
""" """
) )
db.execute("DROP VIEW balances")
db.execute(
"""
CREATE VIEW IF NOT EXISTS balances AS
SELECT wallet, COALESCE(SUM(s), 0) AS balance FROM (
SELECT wallet, SUM(amount) AS s -- incoming
FROM apipayment
WHERE amount > 0 AND pending = 0 -- don't sum pending
GROUP BY wallet
UNION ALL
SELECT wallet, SUM(amount + fee) AS s -- outgoing, sum fees
FROM apipayment
WHERE amount < 0 -- do sum pending
GROUP BY wallet
)
GROUP BY wallet;
"""
)
def m002_changed(db):
db.execute(
"""
CREATE TABLE IF NOT EXISTS apipayment (
id TEXT NOT NULL,
payment_hash TEXT NOT NULL,
amount INTEGER NOT NULL,
fee INTEGER NOT NULL DEFAULT 0,
wallet TEXT NOT NULL,
pending BOOLEAN NOT NULL,
memo TEXT,
time TIMESTAMP NOT NULL DEFAULT (strftime('%s', 'now')),
UNIQUE (wallet, id)
);
"""
)
for row in [list(row) for row in db.fetchall("SELECT * FROM apipayments")]: def m002_add_fields_to_apipayments(db):
db.execute(
""" """
INSERT INTO apipayment ( Adding fields to apipayments for better accounting,
id, and renaming payhash to checking_id since that is what it really is.
payment_hash, """
amount, db.execute("ALTER TABLE apipayments RENAME COLUMN payhash TO checking_id")
fee, db.execute("ALTER TABLE apipayments ADD COLUMN hash TEXT")
wallet, db.execute("CREATE INDEX by_hash ON apipayments (hash)")
pending, db.execute("ALTER TABLE apipayments ADD COLUMN preimage TEXT")
memo, db.execute("ALTER TABLE apipayments ADD COLUMN bolt11 TEXT")
time db.execute("ALTER TABLE apipayments ADD COLUMN extra TEXT")
)
VALUES (?, ?, ?, ?, ?, ?, ?, ?)
""",
(
row[0],
"oldinvoice",
row[1],
row[2],
row[3],
row[4],
row[5],
row[6],
),
)
db.execute("DROP TABLE apipayments")
def migrate(): def migrate():
with open_db() as db: with open_db() as db:
m001_initial(db) m001_initial(db)
m002_changed(db) m002_add_fields_to_apipayments(db)

31
lnbits/core/models.py
View file

@ -1,4 +1,6 @@
from typing import List, NamedTuple, Optional import json
from typing import List, NamedTuple, Optional, Dict
from sqlite3 import Row
class User(NamedTuple): class User(NamedTuple):
@ -29,10 +31,10 @@ class Wallet(NamedTuple):
def balance(self) -> int: def balance(self) -> int:
return self.balance_msat // 1000 return self.balance_msat // 1000
def get_payment(self, checking_id: str) -> Optional["Payment"]: def get_payment(self, payment_hash: str) -> Optional["Payment"]:
from .crud import get_wallet_payment from .crud import get_wallet_payment
return get_wallet_payment(self.id, checking_id) return get_wallet_payment(self.id, payment_hash)
def get_payments( def get_payments(
self, *, complete: bool = True, pending: bool = False, outgoing: bool = True, incoming: bool = True self, *, complete: bool = True, pending: bool = False, outgoing: bool = True, incoming: bool = True
@ -54,6 +56,29 @@ class Payment(NamedTuple):
fee: int fee: int
memo: str memo: str
time: int time: int
bolt11: str
preimage: str
payment_hash: str
extra: Dict
@classmethod
def from_row(cls, row: Row):
return cls(
checking_id=row["checking_id"],
payment_hash=row["hash"],
bolt11=row["bolt11"],
preimage=row["preimage"],
extra=json.loads(row["extra"] or "{}"),
pending=row["pending"],
amount=row["amount"],
fee=row["fee"],
memo=row["memo"],
time=row["time"],
)
@property
def tag(self) -> Optional[str]:
return self.extra.get("tag")
@property @property
def msat(self) -> int: def msat(self) -> int:

102
lnbits/core/services.py
View file

@ -1,14 +1,20 @@
from typing import Optional, Tuple from typing import Optional, Tuple, Dict
from lnbits.bolt11 import decode as bolt11_decode # type: ignore from lnbits import bolt11
from lnbits.helpers import urlsafe_short_hash from lnbits.helpers import urlsafe_short_hash
from lnbits.settings import WALLET from lnbits.settings import WALLET
from .crud import get_wallet, create_payment, delete_payment, check_internal, update_payment_status from .crud import get_wallet, create_payment, delete_payment, check_internal, update_payment_status, get_wallet_payment
def create_invoice(*, wallet_id: str, amount: int, memo: str, description_hash: bytes = None) -> Tuple[str, str]: def create_invoice(
*,
wallet_id: str,
amount: int,
memo: Optional[str] = None,
description_hash: Optional[bytes] = None,
extra: Optional[Dict] = None,
) -> Tuple[str, str]:
try: try:
ok, checking_id, payment_request, error_message = WALLET.create_invoice( ok, checking_id, payment_request, error_message = WALLET.create_invoice(
amount=amount, memo=memo, description_hash=description_hash amount=amount, memo=memo, description_hash=description_hash
@ -18,77 +24,81 @@ def create_invoice(*, wallet_id: str, amount: int, memo: str, description_hash:
if not ok: if not ok:
raise Exception(error_message or "Unexpected backend error.") raise Exception(error_message or "Unexpected backend error.")
invoice = bolt11_decode(payment_request)
invoice = bolt11.decode(payment_request)
amount_msat = amount * 1000 amount_msat = amount * 1000
create_payment(wallet_id=wallet_id, checking_id=checking_id, payment_hash=invoice.payment_hash, amount=amount_msat, memo=memo) create_payment(
wallet_id=wallet_id,
checking_id=checking_id,
payment_request=payment_request,
payment_hash=invoice.payment_hash,
amount=amount_msat,
memo=memo,
extra=extra,
)
return checking_id, payment_request return invoice.payment_hash, payment_request
def pay_invoice(*, wallet_id: str, bolt11: str, max_sat: Optional[int] = None) -> str: def pay_invoice(
*, wallet_id: str, payment_request: str, max_sat: Optional[int] = None, extra: Optional[Dict] = None
) -> str:
temp_id = f"temp_{urlsafe_short_hash()}" temp_id = f"temp_{urlsafe_short_hash()}"
try: try:
invoice = bolt11_decode(bolt11) invoice = bolt11.decode(payment_request)
internal = check_internal(invoice.payment_hash)
if invoice.amount_msat == 0: if invoice.amount_msat == 0:
raise ValueError("Amountless invoices not supported.") raise ValueError("Amountless invoices not supported.")
if max_sat and invoice.amount_msat > max_sat * 1000: if max_sat and invoice.amount_msat > max_sat * 1000:
raise ValueError("Amount in invoice is too high.") raise ValueError("Amount in invoice is too high.")
fee_reserve = max(1000, int(invoice.amount_msat * 0.01)) # put all parameters that don't change here
payment_kwargs = dict(
if not internal:
create_payment(
wallet_id=wallet_id, wallet_id=wallet_id,
checking_id=temp_id, payment_request=payment_request,
payment_hash=invoice.payment_hash, payment_hash=invoice.payment_hash,
amount=-invoice.amount_msat, amount=-invoice.amount_msat,
fee=-fee_reserve, memo=invoice.description,
memo=temp_id, extra=extra,
) )
# check_internal() returns the checking_id of the invoice we're waiting for
internal = check_internal(invoice.payment_hash)
if internal:
# create a new payment from this wallet
create_payment(checking_id=temp_id, fee=0, pending=False, **payment_kwargs)
else:
# create a temporary payment here so we can check if
# the balance is enough in the next step
fee_reserve = max(1000, int(invoice.amount_msat * 0.01))
create_payment(checking_id=temp_id, fee=-fee_reserve, **payment_kwargs)
# do the balance check
wallet = get_wallet(wallet_id) wallet = get_wallet(wallet_id)
assert wallet, "invalid wallet id" assert wallet, "invalid wallet id"
if wallet.balance_msat < 0: if wallet.balance_msat < 0:
raise PermissionError("Insufficient balance.") raise PermissionError("Insufficient balance.")
if internal: if internal:
create_payment( # mark the invoice from the other side as not pending anymore
wallet_id=wallet_id, # so the other side only has access to his new money when we are sure
checking_id=temp_id, # the payer has enough to deduct from
payment_hash=invoice.payment_hash,
amount=-invoice.amount_msat,
fee=0,
pending=False,
memo=invoice.description,
)
update_payment_status(checking_id=internal, pending=False) update_payment_status(checking_id=internal, pending=False)
return temp_id else:
# actually pay the external invoice
ok, checking_id, fee_msat, error_message = WALLET.pay_invoice(bolt11) ok, checking_id, fee_msat, error_message = WALLET.pay_invoice(payment_request)
if ok: if ok:
create_payment( create_payment(checking_id=checking_id, fee=fee_msat, **payment_kwargs)
wallet_id=wallet_id, delete_payment(temp_id)
checking_id=checking_id,
payment_hash=invoice.payment_hash,
amount=-invoice.amount_msat,
fee=fee_msat,
memo=invoice.description,
)
except Exception as e: except Exception as e:
ok, error_message = False, str(e) ok, error_message = False, str(e)
delete_payment(temp_id)
if not ok: if not ok:
raise Exception(error_message or "Unexpected backend error.") raise Exception(error_message or "Unexpected backend error.")
return checking_id return invoice.payment_hash
def check_payment(*, checking_id: str) -> str: def check_invoice_status(wallet_id: str, payment_hash: str) -> str:
pass payment = get_wallet_payment(wallet_id, payment_hash)
return WALLET.get_invoice_status(payment.checking_id)

112
lnbits/core/static/js/wallet.js
View file

@ -1,3 +1,5 @@
/* globals Vue, VueQrcodeReader, VueQrcode, Quasar, LNbits, _ */
Vue.component(VueQrcode.name, VueQrcode) Vue.component(VueQrcode.name, VueQrcode)
Vue.use(VueQrcodeReader) Vue.use(VueQrcodeReader)
@ -12,10 +14,10 @@ function generateChart(canvas, payments) {
} }
_.each( _.each(
payments.slice(0).sort(function (a, b) { payments.slice(0).sort(function(a, b) {
return a.time - b.time return a.time - b.time
}), }),
function (tx) { function(tx) {
txs.push({ txs.push({
hour: Quasar.utils.date.formatDate(tx.date, 'YYYY-MM-DDTHH:00'), hour: Quasar.utils.date.formatDate(tx.date, 'YYYY-MM-DDTHH:00'),
sat: tx.sat sat: tx.sat
@ -23,17 +25,17 @@ function generateChart(canvas, payments) {
} }
) )
_.each(_.groupBy(txs, 'hour'), function (value, day) { _.each(_.groupBy(txs, 'hour'), function(value, day) {
var income = _.reduce( var income = _.reduce(
value, value,
function (memo, tx) { function(memo, tx) {
return tx.sat >= 0 ? memo + tx.sat : memo return tx.sat >= 0 ? memo + tx.sat : memo
}, },
0 0
) )
var outcome = _.reduce( var outcome = _.reduce(
value, value,
function (memo, tx) { function(memo, tx) {
return tx.sat < 0 ? memo + Math.abs(tx.sat) : memo return tx.sat < 0 ? memo + Math.abs(tx.sat) : memo
}, },
0 0
@ -65,14 +67,20 @@ function generateChart(canvas, payments) {
type: 'bar', type: 'bar',
label: 'in', label: 'in',
barPercentage: 0.75, barPercentage: 0.75,
backgroundColor: window.Color('rgb(76,175,80)').alpha(0.5).rgbString() // green backgroundColor: window
.Color('rgb(76,175,80)')
.alpha(0.5)
.rgbString() // green
}, },
{ {
data: data.outcome, data: data.outcome,
type: 'bar', type: 'bar',
label: 'out', label: 'out',
barPercentage: 0.75, barPercentage: 0.75,
backgroundColor: window.Color('rgb(233,30,99)').alpha(0.5).rgbString() // pink backgroundColor: window
.Color('rgb(233,30,99)')
.alpha(0.5)
.rgbString() // pink
} }
] ]
}, },
@ -113,7 +121,7 @@ function generateChart(canvas, payments) {
new Vue({ new Vue({
el: '#vue', el: '#vue',
mixins: [windowMixin], mixins: [windowMixin],
data: function () { data: function() {
return { return {
receive: { receive: {
show: false, show: false,
@ -169,49 +177,49 @@ new Vue({
} }
}, },
computed: { computed: {
filteredPayments: function () { filteredPayments: function() {
var q = this.paymentsTable.filter var q = this.paymentsTable.filter
if (!q || q == '') return this.payments if (!q || q == '') return this.payments
return LNbits.utils.search(this.payments, q) return LNbits.utils.search(this.payments, q)
}, },
balance: function () { balance: function() {
if (this.payments.length) { if (this.payments.length) {
return ( return (
_.pluck(this.payments, 'amount').reduce(function (a, b) { _.pluck(this.payments, 'amount').reduce(function(a, b) {
return a + b return a + b
}, 0) / 1000 }, 0) / 1000
) )
} }
return this.g.wallet.sat return this.g.wallet.sat
}, },
fbalance: function () { fbalance: function() {
return LNbits.utils.formatSat(this.balance) return LNbits.utils.formatSat(this.balance)
}, },
canPay: function () { canPay: function() {
if (!this.send.invoice) return false if (!this.send.invoice) return false
return this.send.invoice.sat <= this.balance return this.send.invoice.sat <= this.balance
}, },
pendingPaymentsExist: function () { pendingPaymentsExist: function() {
return this.payments return this.payments
? _.where(this.payments, {pending: 1}).length > 0 ? _.where(this.payments, {pending: 1}).length > 0
: false : false
} }
}, },
methods: { methods: {
closeCamera: function () { closeCamera: function() {
this.sendCamera.show = false this.sendCamera.show = false
}, },
showCamera: function () { showCamera: function() {
this.sendCamera.show = true this.sendCamera.show = true
}, },
showChart: function () { showChart: function() {
this.paymentsChart.show = true this.paymentsChart.show = true
this.$nextTick(function () { this.$nextTick(function() {
generateChart(this.$refs.canvas, this.payments) generateChart(this.$refs.canvas, this.payments)
}) })
}, },
showReceiveDialog: function () { showReceiveDialog: function() {
this.receive = { this.receive = {
show: true, show: true,
status: 'pending', status: 'pending',
@ -223,7 +231,7 @@ new Vue({
paymentChecker: null paymentChecker: null
} }
}, },
showSendDialog: function () { showSendDialog: function() {
this.send = { this.send = {
show: true, show: true,
invoice: null, invoice: null,
@ -233,20 +241,20 @@ new Vue({
paymentChecker: null paymentChecker: null
} }
}, },
closeReceiveDialog: function () { closeReceiveDialog: function() {
var checker = this.receive.paymentChecker var checker = this.receive.paymentChecker
setTimeout(function () { setTimeout(function() {
clearInterval(checker) clearInterval(checker)
}, 10000) }, 10000)
}, },
closeSendDialog: function () { closeSendDialog: function() {
this.sendCamera.show = false this.sendCamera.show = false
var checker = this.send.paymentChecker var checker = this.send.paymentChecker
setTimeout(function () { setTimeout(function() {
clearInterval(checker) clearInterval(checker)
}, 1000) }, 1000)
}, },
createInvoice: function () { createInvoice: function() {
var self = this var self = this
this.receive.status = 'loading' this.receive.status = 'loading'
LNbits.api LNbits.api
@ -255,14 +263,14 @@ new Vue({
this.receive.data.amount, this.receive.data.amount,
this.receive.data.memo this.receive.data.memo
) )
.then(function (response) { .then(function(response) {
self.receive.status = 'success' self.receive.status = 'success'
self.receive.paymentReq = response.data.payment_request self.receive.paymentReq = response.data.payment_request
self.receive.paymentChecker = setInterval(function () { self.receive.paymentChecker = setInterval(function() {
LNbits.api LNbits.api
.getPayment(self.g.wallet, response.data.checking_id) .getPayment(self.g.wallet, response.data.payment_hash)
.then(function (response) { .then(function(response) {
if (response.data.paid) { if (response.data.paid) {
self.fetchPayments() self.fetchPayments()
self.receive.show = false self.receive.show = false
@ -271,17 +279,17 @@ new Vue({
}) })
}, 2000) }, 2000)
}) })
.catch(function (error) { .catch(function(error) {
LNbits.utils.notifyApiError(error) LNbits.utils.notifyApiError(error)
self.receive.status = 'pending' self.receive.status = 'pending'
}) })
}, },
decodeQR: function (res) { decodeQR: function(res) {
this.send.data.bolt11 = res this.send.data.bolt11 = res
this.decodeInvoice() this.decodeInvoice()
this.sendCamera.show = false this.sendCamera.show = false
}, },
decodeInvoice: function () { decodeInvoice: function() {
if (this.send.data.bolt11.startsWith('lightning:')) { if (this.send.data.bolt11.startsWith('lightning:')) {
this.send.data.bolt11 = this.send.data.bolt11.slice(10) this.send.data.bolt11 = this.send.data.bolt11.slice(10)
} }
@ -306,7 +314,7 @@ new Vue({
fsat: LNbits.utils.formatSat(invoice.human_readable_part.amount / 1000) fsat: LNbits.utils.formatSat(invoice.human_readable_part.amount / 1000)
} }
_.each(invoice.data.tags, function (tag) { _.each(invoice.data.tags, function(tag) {
if (_.isObject(tag) && _.has(tag, 'description')) { if (_.isObject(tag) && _.has(tag, 'description')) {
if (tag.description == 'payment_hash') { if (tag.description == 'payment_hash') {
cleanInvoice.hash = tag.value cleanInvoice.hash = tag.value
@ -327,10 +335,10 @@ new Vue({
this.send.invoice = Object.freeze(cleanInvoice) this.send.invoice = Object.freeze(cleanInvoice)
}, },
payInvoice: function () { payInvoice: function() {
var self = this var self = this
dismissPaymentMsg = this.$q.notify({ let dismissPaymentMsg = this.$q.notify({
timeout: 0, timeout: 0,
message: 'Processing payment...', message: 'Processing payment...',
icon: null icon: null
@ -338,11 +346,11 @@ new Vue({
LNbits.api LNbits.api
.payInvoice(this.g.wallet, this.send.data.bolt11) .payInvoice(this.g.wallet, this.send.data.bolt11)
.then(function (response) { .then(function(response) {
self.send.paymentChecker = setInterval(function () { self.send.paymentChecker = setInterval(function() {
LNbits.api LNbits.api
.getPayment(self.g.wallet, response.data.checking_id) .getPayment(self.g.wallet, response.data.payment_hash)
.then(function (res) { .then(function(res) {
if (res.data.paid) { if (res.data.paid) {
self.send.show = false self.send.show = false
clearInterval(self.send.paymentChecker) clearInterval(self.send.paymentChecker)
@ -352,58 +360,58 @@ new Vue({
}) })
}, 2000) }, 2000)
}) })
.catch(function (error) { .catch(function(error) {
dismissPaymentMsg() dismissPaymentMsg()
LNbits.utils.notifyApiError(error) LNbits.utils.notifyApiError(error)
}) })
}, },
deleteWallet: function (walletId, user) { deleteWallet: function(walletId, user) {
LNbits.utils LNbits.utils
.confirmDialog('Are you sure you want to delete this wallet?') .confirmDialog('Are you sure you want to delete this wallet?')
.onOk(function () { .onOk(function() {
LNbits.href.deleteWallet(walletId, user) LNbits.href.deleteWallet(walletId, user)
}) })
}, },
fetchPayments: function (checkPending) { fetchPayments: function(checkPending) {
var self = this var self = this
return LNbits.api return LNbits.api
.getPayments(this.g.wallet, checkPending) .getPayments(this.g.wallet, checkPending)
.then(function (response) { .then(function(response) {
self.payments = response.data self.payments = response.data
.map(function (obj) { .map(function(obj) {
return LNbits.map.payment(obj) return LNbits.map.payment(obj)
}) })
.sort(function (a, b) { .sort(function(a, b) {
return b.time - a.time return b.time - a.time
}) })
}) })
}, },
checkPendingPayments: function () { checkPendingPayments: function() {
var dismissMsg = this.$q.notify({ var dismissMsg = this.$q.notify({
timeout: 0, timeout: 0,
message: 'Checking pending transactions...', message: 'Checking pending transactions...',
icon: null icon: null
}) })
this.fetchPayments(true).then(function () { this.fetchPayments(true).then(function() {
dismissMsg() dismissMsg()
}) })
}, },
exportCSV: function () { exportCSV: function() {
LNbits.utils.exportCSV(this.paymentsTable.columns, this.payments) LNbits.utils.exportCSV(this.paymentsTable.columns, this.payments)
} }
}, },
watch: { watch: {
payments: function () { payments: function() {
EventHub.$emit('update-wallet-balance', [this.g.wallet.id, this.balance]) EventHub.$emit('update-wallet-balance', [this.g.wallet.id, this.balance])
} }
}, },
created: function () { created: function() {
this.fetchPayments() this.fetchPayments()
setTimeout(this.checkPendingPayments(), 1200) setTimeout(this.checkPendingPayments(), 1200)
}, },
mounted: function () { mounted: function() {
if ( if (
this.$refs.disclaimer && this.$refs.disclaimer &&
!this.$q.localStorage.getItem('lnbits.disclaimerShown') !this.$q.localStorage.getItem('lnbits.disclaimerShown')

12
lnbits/core/templates/core/_api_docs.html
View file

@ -23,7 +23,7 @@
Returns 201 CREATED (application/json) Returns 201 CREATED (application/json)
</h5> </h5>
<code <code
>{"checking_id": &lt;string&gt;, "payment_request": >{"payment_hash": &lt;string&gt;, "payment_request":
&lt;string&gt;}</code &lt;string&gt;}</code
> >
<h5 class="text-caption q-mt-sm q-mb-none">Curl example</h5> <h5 class="text-caption q-mt-sm q-mb-none">Curl example</h5>
@ -51,7 +51,7 @@
<h5 class="text-caption q-mt-sm q-mb-none"> <h5 class="text-caption q-mt-sm q-mb-none">
Returns 201 CREATED (application/json) Returns 201 CREATED (application/json)
</h5> </h5>
<code>{"checking_id": &lt;string&gt;}</code> <code>{"payment_hash": &lt;string&gt;}</code>
<h5 class="text-caption q-mt-sm q-mb-none">Curl example</h5> <h5 class="text-caption q-mt-sm q-mb-none">Curl example</h5>
<code <code
>curl -X POST {{ request.url_root }}api/v1/payments -d '{"out": true, >curl -X POST {{ request.url_root }}api/v1/payments -d '{"out": true,
@ -73,7 +73,7 @@
<q-card-section> <q-card-section>
<code <code
><span class="text-light-blue">GET</span> ><span class="text-light-blue">GET</span>
/api/v1/payments/&lt;checking_id&gt;</code /api/v1/payments/&lt;payment_hash&gt;</code
> >
<h5 class="text-caption q-mt-sm q-mb-none">Headers</h5> <h5 class="text-caption q-mt-sm q-mb-none">Headers</h5>
<code>{"X-Api-Key": "{{ wallet.inkey }}"}</code> <code>{"X-Api-Key": "{{ wallet.inkey }}"}</code>
@ -83,9 +83,9 @@
<code>{"paid": &lt;bool&gt;}</code> <code>{"paid": &lt;bool&gt;}</code>
<h5 class="text-caption q-mt-sm q-mb-none">Curl example</h5> <h5 class="text-caption q-mt-sm q-mb-none">Curl example</h5>
<code <code
>curl -X GET {{ request.url_root }}api/v1/payments/&lt;checking_id&gt; >curl -X GET {{ request.url_root
-H "X-Api-Key: <i>{{ wallet.inkey }}"</i> -H "Content-type: }}api/v1/payments/&lt;payment_hash&gt; -H "X-Api-Key:
application/json"</code <i>{{ wallet.inkey }}"</i> -H "Content-type: application/json"</code
> >
</q-card-section> </q-card-section>
</q-card> </q-card>

2
lnbits/core/templates/core/wallet.html
View file

@ -84,7 +84,7 @@
dense dense
flat flat
:data="filteredPayments" :data="filteredPayments"
row-key="payhash" row-key="checking_id"
:columns="paymentsTable.columns" :columns="paymentsTable.columns"
:pagination.sync="paymentsTable.pagination" :pagination.sync="paymentsTable.pagination"
> >

42
lnbits/core/views/api.py
View file

@ -2,12 +2,12 @@ from flask import g, jsonify, request
from http import HTTPStatus from http import HTTPStatus
from binascii import unhexlify from binascii import unhexlify
from lnbits import bolt11
from lnbits.core import core_app from lnbits.core import core_app
from lnbits.core.services import create_invoice, pay_invoice
from lnbits.decorators import api_check_wallet_key, api_validate_post_request from lnbits.decorators import api_check_wallet_key, api_validate_post_request
from lnbits.settings import WALLET from lnbits.settings import WALLET
from ..services import create_invoice, pay_invoice
@core_app.route("/api/v1/payments", methods=["GET"]) @core_app.route("/api/v1/payments", methods=["GET"])
@api_check_wallet_key("invoice") @api_check_wallet_key("invoice")
@ -41,20 +41,31 @@ def api_payments_create_invoice():
memo = g.data["memo"] memo = g.data["memo"]
try: try:
checking_id, payment_request = create_invoice( payment_hash, payment_request = create_invoice(
wallet_id=g.wallet.id, amount=g.data["amount"], memo=memo, description_hash=description_hash wallet_id=g.wallet.id, amount=g.data["amount"], memo=memo, description_hash=description_hash
) )
except Exception as e: except Exception as e:
return jsonify({"message": str(e)}), HTTPStatus.INTERNAL_SERVER_ERROR return jsonify({"message": str(e)}), HTTPStatus.INTERNAL_SERVER_ERROR
return jsonify({"checking_id": checking_id, "payment_request": payment_request}), HTTPStatus.CREATED invoice = bolt11.decode(payment_request)
return (
jsonify(
{
"payment_hash": invoice.payment_hash,
"payment_request": payment_request,
# maintain backwards compatibility with API clients:
"checking_id": invoice.payment_hash,
}
),
HTTPStatus.CREATED,
)
@api_check_wallet_key("admin") @api_check_wallet_key("admin")
@api_validate_post_request(schema={"bolt11": {"type": "string", "empty": False, "required": True}}) @api_validate_post_request(schema={"bolt11": {"type": "string", "empty": False, "required": True}})
def api_payments_pay_invoice(): def api_payments_pay_invoice():
try: try:
checking_id = pay_invoice(wallet_id=g.wallet.id, bolt11=g.data["bolt11"]) payment_hash = pay_invoice(wallet_id=g.wallet.id, payment_request=g.data["bolt11"])
except ValueError as e: except ValueError as e:
return jsonify({"message": str(e)}), HTTPStatus.BAD_REQUEST return jsonify({"message": str(e)}), HTTPStatus.BAD_REQUEST
except PermissionError as e: except PermissionError as e:
@ -62,7 +73,16 @@ def api_payments_pay_invoice():
except Exception as e: except Exception as e:
return jsonify({"message": str(e)}), HTTPStatus.INTERNAL_SERVER_ERROR return jsonify({"message": str(e)}), HTTPStatus.INTERNAL_SERVER_ERROR
return jsonify({"checking_id": checking_id}), HTTPStatus.CREATED return (
jsonify(
{
"payment_hash": payment_hash,
# maintain backwards compatibility with API clients:
"checking_id": payment_hash,
}
),
HTTPStatus.CREATED,
)
@core_app.route("/api/v1/payments", methods=["POST"]) @core_app.route("/api/v1/payments", methods=["POST"])
@ -73,10 +93,10 @@ def api_payments_create():
return api_payments_create_invoice() return api_payments_create_invoice()
@core_app.route("/api/v1/payments/<checking_id>", methods=["GET"]) @core_app.route("/api/v1/payments/<payment_hash>", methods=["GET"])
@api_check_wallet_key("invoice") @api_check_wallet_key("invoice")
def api_payment(checking_id): def api_payment(payment_hash):
payment = g.wallet.get_payment(checking_id) payment = g.wallet.get_payment(payment_hash)
if not payment: if not payment:
return jsonify({"message": "Payment does not exist."}), HTTPStatus.NOT_FOUND return jsonify({"message": "Payment does not exist."}), HTTPStatus.NOT_FOUND
@ -85,9 +105,9 @@ def api_payment(checking_id):
try: try:
if payment.is_out: if payment.is_out:
is_paid = not WALLET.get_payment_status(checking_id).pending is_paid = not WALLET.get_payment_status(payment.checking_id).pending
elif payment.is_in: elif payment.is_in:
is_paid = not WALLET.get_invoice_status(checking_id).pending is_paid = not WALLET.get_invoice_status(payment.checking_id).pending
except Exception: except Exception:
return jsonify({"paid": False}), HTTPStatus.OK return jsonify({"paid": False}), HTTPStatus.OK

2
lnbits/core/views/generic.py
View file

@ -64,7 +64,7 @@ def wallet():
allowed_users = getenv("LNBITS_ALLOWED_USERS", "all") allowed_users = getenv("LNBITS_ALLOWED_USERS", "all")
if allowed_users != "all" and user_id not in allowed_users.split(","): if allowed_users != "all" and user_id not in allowed_users.split(","):
abort(HTTPStatus.UNAUTHORIZED, f"User not authorized.") abort(HTTPStatus.UNAUTHORIZED, "User not authorized.")
if not wallet_id: if not wallet_id:
if user.wallets and not wallet_name: if user.wallets and not wallet_name:

42
lnbits/extensions/amilk/views_api.py
View file

@ -1,19 +1,16 @@
from flask import g, jsonify, request import requests
from flask import g, jsonify, request, abort
from http import HTTPStatus from http import HTTPStatus
from lnbits.core.crud import get_user
from lnbits.decorators import api_check_wallet_key, api_validate_post_request
from lnbits.extensions.amilk import amilk_ext
from .crud import create_amilk, get_amilk, get_amilks, delete_amilk
from lnbits.core.services import create_invoice
from flask import abort, redirect, request, url_for
from lnurl import LnurlWithdrawResponse, handle as handle_lnurl from lnurl import LnurlWithdrawResponse, handle as handle_lnurl
from lnurl.exceptions import LnurlException from lnurl.exceptions import LnurlException
from time import sleep from time import sleep
import requests
from lnbits.settings import WALLET from lnbits.core.crud import get_user
from lnbits.decorators import api_check_wallet_key, api_validate_post_request
from lnbits.core.services import create_invoice, check_invoice_status
from lnbits.extensions.amilk import amilk_ext
from .crud import create_amilk, get_amilk, get_amilks, delete_amilk
@amilk_ext.route("/api/v1/amilk", methods=["GET"]) @amilk_ext.route("/api/v1/amilk", methods=["GET"])
@ -36,13 +33,8 @@ def api_amilkit(amilk_id):
withdraw_res = handle_lnurl(milk.lnurl, response_class=LnurlWithdrawResponse) withdraw_res = handle_lnurl(milk.lnurl, response_class=LnurlWithdrawResponse)
except LnurlException: except LnurlException:
abort(HTTPStatus.INTERNAL_SERVER_ERROR, "Could not process withdraw LNURL.") abort(HTTPStatus.INTERNAL_SERVER_ERROR, "Could not process withdraw LNURL.")
print(withdraw_res.max_sats)
try: payment_hash, payment_request = create_invoice(wallet_id=milk.wallet, amount=withdraw_res.max_sats, memo=memo)
checking_id, payment_request = create_invoice(wallet_id=milk.wallet, amount=withdraw_res.max_sats, memo=memo)
# print(payment_request)
except Exception as e:
error_message = False, str(e)
r = requests.get( r = requests.get(
withdraw_res.callback.base, withdraw_res.callback.base,
@ -50,19 +42,17 @@ def api_amilkit(amilk_id):
) )
if not r.ok: if not r.ok:
abort(HTTPStatus.INTERNAL_SERVER_ERROR, "Could not process withdraw LNURL.") abort(HTTPStatus.INTERNAL_SERVER_ERROR, "Could not process withdraw LNURL.")
for i in range(10): for i in range(10):
invoice_status = WALLET.get_invoice_status(checking_id)
sleep(i) sleep(i)
if not invoice_status.paid: invoice_status = check_invoice_status(milk.wallet, payment_hash)
continue if invoice_status.paid:
else:
return jsonify({"paid": False}), HTTPStatus.OK
break
return jsonify({"paid": True}), HTTPStatus.OK return jsonify({"paid": True}), HTTPStatus.OK
else:
continue
return jsonify({"paid": False}), HTTPStatus.OK
@amilk_ext.route("/api/v1/amilk", methods=["POST"]) @amilk_ext.route("/api/v1/amilk", methods=["POST"])

24
lnbits/extensions/events/crud.py
View file

@ -9,31 +9,31 @@ from .models import Tickets, Events
#######TICKETS######## #######TICKETS########
def create_ticket(checking_id: str, wallet: str, event: str, name: str, email: str) -> Tickets: def create_ticket(payment_hash: str, wallet: str, event: str, name: str, email: str) -> Tickets:
with open_ext_db("events") as db: with open_ext_db("events") as db:
db.execute( db.execute(
""" """
INSERT INTO ticket (id, wallet, event, name, email, registered, paid) INSERT INTO ticket (id, wallet, event, name, email, registered, paid)
VALUES (?, ?, ?, ?, ?, ?, ?) VALUES (?, ?, ?, ?, ?, ?, ?)
""", """,
(checking_id, wallet, event, name, email, False, False), (payment_hash, wallet, event, name, email, False, False),
) )
return get_ticket(checking_id) return get_ticket(payment_hash)
def update_ticket(paid: bool, checking_id: str) -> Tickets: def update_ticket(paid: bool, payment_hash: str) -> Tickets:
with open_ext_db("events") as db: with open_ext_db("events") as db:
row = db.fetchone("SELECT * FROM ticket WHERE id = ?", (checking_id,)) row = db.fetchone("SELECT * FROM ticket WHERE id = ?", (payment_hash,))
if row[6] == True: if row[6] == True:
return get_ticket(checking_id) return get_ticket(payment_hash)
db.execute( db.execute(
""" """
UPDATE ticket UPDATE ticket
SET paid = ? SET paid = ?
WHERE id = ? WHERE id = ?
""", """,
(paid, checking_id), (paid, payment_hash),
) )
eventdata = get_event(row[2]) eventdata = get_event(row[2])
@ -47,12 +47,12 @@ def update_ticket(paid: bool, checking_id: str) -> Tickets:
""", """,
(sold, amount_tickets, row[2]), (sold, amount_tickets, row[2]),
) )
return get_ticket(checking_id) return get_ticket(payment_hash)
def get_ticket(checking_id: str) -> Optional[Tickets]: def get_ticket(payment_hash: str) -> Optional[Tickets]:
with open_ext_db("events") as db: with open_ext_db("events") as db:
row = db.fetchone("SELECT * FROM ticket WHERE id = ?", (checking_id,)) row = db.fetchone("SELECT * FROM ticket WHERE id = ?", (payment_hash,))
return Tickets(**row) if row else None return Tickets(**row) if row else None
@ -68,9 +68,9 @@ def get_tickets(wallet_ids: Union[str, List[str]]) -> List[Tickets]:
return [Tickets(**row) for row in rows] return [Tickets(**row) for row in rows]
def delete_ticket(checking_id: str) -> None: def delete_ticket(payment_hash: str) -> None:
with open_ext_db("events") as db: with open_ext_db("events") as db:
db.execute("DELETE FROM ticket WHERE id = ?", (checking_id,)) db.execute("DELETE FROM ticket WHERE id = ?", (payment_hash,))
########EVENTS######### ########EVENTS#########

2
lnbits/extensions/events/templates/events/display.html
View file

@ -144,7 +144,7 @@
) )
.then(function (response) { .then(function (response) {
self.paymentReq = response.data.payment_request self.paymentReq = response.data.payment_request
self.paymentCheck = response.data.checking_id self.paymentCheck = response.data.payment_hash
dismissMsg = self.$q.notify({ dismissMsg = self.$q.notify({
timeout: 0, timeout: 0,

25
lnbits/extensions/events/views_api.py
View file

@ -2,9 +2,8 @@ from flask import g, jsonify, request
from http import HTTPStatus from http import HTTPStatus
from lnbits.core.crud import get_user, get_wallet from lnbits.core.crud import get_user, get_wallet
from lnbits.core.services import create_invoice from lnbits.core.services import create_invoice, check_invoice_status
from lnbits.decorators import api_check_wallet_key, api_validate_post_request from lnbits.decorators import api_check_wallet_key, api_validate_post_request
from lnbits.settings import WALLET
from lnbits.extensions.events import events_ext from lnbits.extensions.events import events_ext
from .crud import ( from .crud import (
@ -108,39 +107,37 @@ def api_tickets():
} }
) )
def api_ticket_make_ticket(event_id, sats): def api_ticket_make_ticket(event_id, sats):
event = get_event(event_id) event = get_event(event_id)
if not event: if not event:
return jsonify({"message": "LNTicket does not exist."}), HTTPStatus.NOT_FOUND return jsonify({"message": "LNTicket does not exist."}), HTTPStatus.NOT_FOUND
try: try:
checking_id, payment_request = create_invoice( payment_hash, payment_request = create_invoice(
wallet_id=event.wallet, amount=int(sats), memo=f"#lnticket {event_id}" wallet_id=event.wallet, amount=int(sats), memo=f"#lnticket {event_id}"
) )
except Exception as e: except Exception as e:
return jsonify({"message": str(e)}), HTTPStatus.INTERNAL_SERVER_ERROR return jsonify({"message": str(e)}), HTTPStatus.INTERNAL_SERVER_ERROR
ticket = create_ticket(checking_id=checking_id, wallet=event.wallet, event=event_id, **g.data) ticket = create_ticket(payment_hash=payment_hash, wallet=event.wallet, event=event_id, **g.data)
if not ticket: if not ticket:
return jsonify({"message": "LNTicket could not be fetched."}), HTTPStatus.NOT_FOUND return jsonify({"message": "LNTicket could not be fetched."}), HTTPStatus.NOT_FOUND
return jsonify({"checking_id": checking_id, "payment_request": payment_request}), HTTPStatus.OK return jsonify({"payment_hash": payment_hash, "payment_request": payment_request}), HTTPStatus.OK
@events_ext.route("/api/v1/tickets/<checking_id>", methods=["GET"]) @events_ext.route("/api/v1/tickets/<payment_hash>", methods=["GET"])
def api_ticket_send_ticket(checking_id): def api_ticket_send_ticket(payment_hash):
theticket = get_ticket(checking_id) ticket = get_ticket(payment_hash)
try: try:
is_paid = not WALLET.get_invoice_status(checking_id).pending is_paid = not check_invoice_status(ticket.wallet, payment_hash).pending
except Exception: except Exception:
return jsonify({"message": "Not paid."}), HTTPStatus.NOT_FOUND return jsonify({"message": "Not paid."}), HTTPStatus.NOT_FOUND
if is_paid: if is_paid:
wallet = get_wallet(theticket.wallet) wallet = get_wallet(ticket.wallet)
payment = wallet.get_payment(checking_id) payment = wallet.get_payment(payment_hash)
payment.set_pending(False) payment.set_pending(False)
ticket = update_ticket(paid=True, checking_id=checking_id) ticket = update_ticket(paid=True, payment_hash=payment_hash)
return jsonify({"paid": True, "ticket_id": ticket.id}), HTTPStatus.OK return jsonify({"paid": True, "ticket_id": ticket.id}), HTTPStatus.OK

16
lnbits/extensions/lnticket/crud.py
View file

@ -9,31 +9,31 @@ from .models import Tickets, Forms
#######TICKETS######## #######TICKETS########
def create_ticket(checking_id: str, wallet: str, form: str, name: str, email: str, ltext: str, sats: int) -> Tickets: def create_ticket(payment_hash: str, wallet: str, form: str, name: str, email: str, ltext: str, sats: int) -> Tickets:
with open_ext_db("lnticket") as db: with open_ext_db("lnticket") as db:
db.execute( db.execute(
""" """
INSERT INTO ticket (id, form, email, ltext, name, wallet, sats, paid) INSERT INTO ticket (id, form, email, ltext, name, wallet, sats, paid)
VALUES (?, ?, ?, ?, ?, ?, ?, ?) VALUES (?, ?, ?, ?, ?, ?, ?, ?)
""", """,
(checking_id, form, email, ltext, name, wallet, sats, False), (payment_hash, form, email, ltext, name, wallet, sats, False),
) )
return get_ticket(checking_id) return get_ticket(payment_hash)
def update_ticket(paid: bool, checking_id: str) -> Tickets: def update_ticket(paid: bool, payment_hash: str) -> Tickets:
with open_ext_db("lnticket") as db: with open_ext_db("lnticket") as db:
row = db.fetchone("SELECT * FROM ticket WHERE id = ?", (checking_id,)) row = db.fetchone("SELECT * FROM ticket WHERE id = ?", (payment_hash,))
if row[7] == True: if row[7] == True:
return get_ticket(checking_id) return get_ticket(payment_hash)
db.execute( db.execute(
""" """
UPDATE ticket UPDATE ticket
SET paid = ? SET paid = ?
WHERE id = ? WHERE id = ?
""", """,
(paid, checking_id), (paid, payment_hash),
) )
formdata = get_form(row[1]) formdata = get_form(row[1])
@ -46,7 +46,7 @@ def update_ticket(paid: bool, checking_id: str) -> Tickets:
""", """,
(amount, row[1]), (amount, row[1]),
) )
return get_ticket(checking_id) return get_ticket(payment_hash)
def get_ticket(ticket_id: str) -> Optional[Tickets]: def get_ticket(ticket_id: str) -> Optional[Tickets]:

2
lnbits/extensions/lnticket/templates/lnticket/display.html
View file

@ -152,7 +152,7 @@
) )
.then(function (response) { .then(function (response) {
self.paymentReq = response.data.payment_request self.paymentReq = response.data.payment_request
self.paymentCheck = response.data.checking_id self.paymentCheck = response.data.payment_hash
dismissMsg = self.$q.notify({ dismissMsg = self.$q.notify({
timeout: 0, timeout: 0,

25
lnbits/extensions/lnticket/views_api.py
View file

@ -2,9 +2,8 @@ from flask import g, jsonify, request
from http import HTTPStatus from http import HTTPStatus
from lnbits.core.crud import get_user, get_wallet from lnbits.core.crud import get_user, get_wallet
from lnbits.core.services import create_invoice from lnbits.core.services import create_invoice, check_invoice_status
from lnbits.decorators import api_check_wallet_key, api_validate_post_request from lnbits.decorators import api_check_wallet_key, api_validate_post_request
from lnbits.settings import WALLET
from lnbits.extensions.lnticket import lnticket_ext from lnbits.extensions.lnticket import lnticket_ext
from .crud import ( from .crud import (
@ -104,40 +103,38 @@ def api_tickets():
} }
) )
def api_ticket_make_ticket(form_id, sats): def api_ticket_make_ticket(form_id, sats):
event = get_form(form_id) event = get_form(form_id)
if not event: if not event:
return jsonify({"message": "LNTicket does not exist."}), HTTPStatus.NOT_FOUND return jsonify({"message": "LNTicket does not exist."}), HTTPStatus.NOT_FOUND
try: try:
checking_id, payment_request = create_invoice( payment_hash, payment_request = create_invoice(
wallet_id=event.wallet, amount=int(sats), memo=f"#lnticket {form_id}" wallet_id=event.wallet, amount=int(sats), memo=f"#lnticket {form_id}"
) )
except Exception as e: except Exception as e:
return jsonify({"message": str(e)}), HTTPStatus.INTERNAL_SERVER_ERROR return jsonify({"message": str(e)}), HTTPStatus.INTERNAL_SERVER_ERROR
ticket = create_ticket(checking_id=checking_id, wallet=event.wallet, **g.data) ticket = create_ticket(payment_hash=payment_hash, wallet=event.wallet, **g.data)
if not ticket: if not ticket:
return jsonify({"message": "LNTicket could not be fetched."}), HTTPStatus.NOT_FOUND return jsonify({"message": "LNTicket could not be fetched."}), HTTPStatus.NOT_FOUND
return jsonify({"checking_id": checking_id, "payment_request": payment_request}), HTTPStatus.OK return jsonify({"payment_hash": payment_hash, "payment_request": payment_request}), HTTPStatus.OK
@lnticket_ext.route("/api/v1/tickets/<checking_id>", methods=["GET"]) @lnticket_ext.route("/api/v1/tickets/<payment_hash>", methods=["GET"])
def api_ticket_send_ticket(checking_id): def api_ticket_send_ticket(payment_hash):
theticket = get_ticket(checking_id) ticket = get_ticket(payment_hash)
try: try:
is_paid = not WALLET.get_invoice_status(checking_id).pending is_paid = not check_invoice_status(ticket.wallet, payment_hash).pending
except Exception: except Exception:
return jsonify({"message": "Not paid."}), HTTPStatus.NOT_FOUND return jsonify({"message": "Not paid."}), HTTPStatus.NOT_FOUND
if is_paid: if is_paid:
wallet = get_wallet(theticket.wallet) wallet = get_wallet(ticket.wallet)
payment = wallet.get_payment(checking_id) payment = wallet.get_payment(payment_hash)
payment.set_pending(False) payment.set_pending(False)
ticket = update_ticket(paid=True, checking_id=checking_id) ticket = update_ticket(paid=True, payment_hash=payment_hash)
return jsonify({"paid": True, "ticket_id": ticket.id}), HTTPStatus.OK return jsonify({"paid": True, "ticket_id": ticket.id}), HTTPStatus.OK
return jsonify({"paid": False}), HTTPStatus.OK return jsonify({"paid": False}), HTTPStatus.OK

6
lnbits/extensions/paywall/templates/paywall/_api_docs.html
View file

@ -75,7 +75,7 @@
Returns 201 CREATED (application/json) Returns 201 CREATED (application/json)
</h5> </h5>
<code <code
>{"checking_id": &lt;string&gt;, "payment_request": >{"payment_hash": &lt;string&gt;, "payment_request":
&lt;string&gt;}</code &lt;string&gt;}</code
> >
<h5 class="text-caption q-mt-sm q-mb-none">Curl example</h5> <h5 class="text-caption q-mt-sm q-mb-none">Curl example</h5>
@ -100,7 +100,7 @@
/paywall/api/v1/paywalls/&lt;paywall_id&gt;/check_invoice</code /paywall/api/v1/paywalls/&lt;paywall_id&gt;/check_invoice</code
> >
<h5 class="text-caption q-mt-sm q-mb-none">Body (application/json)</h5> <h5 class="text-caption q-mt-sm q-mb-none">Body (application/json)</h5>
<code>{"checking_id": &lt;string&gt;}</code> <code>{"payment_hash": &lt;string&gt;}</code>
<h5 class="text-caption q-mt-sm q-mb-none"> <h5 class="text-caption q-mt-sm q-mb-none">
Returns 200 OK (application/json) Returns 200 OK (application/json)
</h5> </h5>
@ -113,7 +113,7 @@
<code <code
>curl -X POST {{ request.url_root >curl -X POST {{ request.url_root
}}paywall/api/v1/paywalls/&lt;paywall_id&gt;/check_invoice -d }}paywall/api/v1/paywalls/&lt;paywall_id&gt;/check_invoice -d
'{"checking_id": &lt;string&gt;}' -H "Content-type: application/json" '{"payment_hash": &lt;string&gt;}' -H "Content-type: application/json"
</code> </code>
</q-card-section> </q-card-section>
</q-card> </q-card>

2
lnbits/extensions/paywall/templates/paywall/display.html
View file

@ -121,7 +121,7 @@
axios axios
.post( .post(
'/paywall/api/v1/paywalls/{{ paywall.id }}/check_invoice', '/paywall/api/v1/paywalls/{{ paywall.id }}/check_invoice',
{checking_id: response.data.checking_id} {payment_hash: response.data.payment_hash}
) )
.then(function (res) { .then(function (res) {
if (res.data.paid) { if (res.data.paid) {

13
lnbits/extensions/paywall/views_api.py
View file

@ -2,9 +2,8 @@ from flask import g, jsonify, request
from http import HTTPStatus from http import HTTPStatus
from lnbits.core.crud import get_user, get_wallet from lnbits.core.crud import get_user, get_wallet
from lnbits.core.services import create_invoice from lnbits.core.services import create_invoice, check_invoice_status
from lnbits.decorators import api_check_wallet_key, api_validate_post_request from lnbits.decorators import api_check_wallet_key, api_validate_post_request
from lnbits.settings import WALLET
from lnbits.extensions.paywall import paywall_ext from lnbits.extensions.paywall import paywall_ext
from .crud import create_paywall, get_paywall, get_paywalls, delete_paywall from .crud import create_paywall, get_paywall, get_paywalls, delete_paywall
@ -64,17 +63,17 @@ def api_paywall_create_invoice(paywall_id):
try: try:
amount = g.data["amount"] if g.data["amount"] > paywall.amount else paywall.amount amount = g.data["amount"] if g.data["amount"] > paywall.amount else paywall.amount
checking_id, payment_request = create_invoice( payment_hash, payment_request = create_invoice(
wallet_id=paywall.wallet, amount=amount, memo=f"#paywall {paywall.memo}" wallet_id=paywall.wallet, amount=amount, memo=f"#paywall {paywall.memo}"
) )
except Exception as e: except Exception as e:
return jsonify({"message": str(e)}), HTTPStatus.INTERNAL_SERVER_ERROR return jsonify({"message": str(e)}), HTTPStatus.INTERNAL_SERVER_ERROR
return jsonify({"checking_id": checking_id, "payment_request": payment_request}), HTTPStatus.CREATED return jsonify({"payment_hash": payment_hash, "payment_request": payment_request}), HTTPStatus.CREATED
@paywall_ext.route("/api/v1/paywalls/<paywall_id>/check_invoice", methods=["POST"]) @paywall_ext.route("/api/v1/paywalls/<paywall_id>/check_invoice", methods=["POST"])
@api_validate_post_request(schema={"checking_id": {"type": "string", "empty": False, "required": True}}) @api_validate_post_request(schema={"payment_hash": {"type": "string", "empty": False, "required": True}})
def api_paywal_check_invoice(paywall_id): def api_paywal_check_invoice(paywall_id):
paywall = get_paywall(paywall_id) paywall = get_paywall(paywall_id)
@ -82,13 +81,13 @@ def api_paywal_check_invoice(paywall_id):
return jsonify({"message": "Paywall does not exist."}), HTTPStatus.NOT_FOUND return jsonify({"message": "Paywall does not exist."}), HTTPStatus.NOT_FOUND
try: try:
is_paid = not WALLET.get_invoice_status(g.data["checking_id"]).pending is_paid = not check_invoice_status(paywall.wallet, g.data["payment_hash"]).pending
except Exception: except Exception:
return jsonify({"paid": False}), HTTPStatus.OK return jsonify({"paid": False}), HTTPStatus.OK
if is_paid: if is_paid:
wallet = get_wallet(paywall.wallet) wallet = get_wallet(paywall.wallet)
payment = wallet.get_payment(g.data["checking_id"]) payment = wallet.get_payment(g.data["payment_hash"])
payment.set_pending(False) payment.set_pending(False)
return jsonify({"paid": True, "url": paywall.url, "remembers": paywall.remembers}), HTTPStatus.OK return jsonify({"paid": True, "url": paywall.url, "remembers": paywall.remembers}), HTTPStatus.OK

2
lnbits/extensions/tpos/templates/tpos/tpos.html
View file

@ -224,7 +224,7 @@
'/tpos/api/v1/tposs/' + '/tpos/api/v1/tposs/' +
self.tposId + self.tposId +
'/invoices/' + '/invoices/' +
response.data.checking_id response.data.payment_hash
) )
.then(function (res) { .then(function (res) {
if (res.data.paid) { if (res.data.paid) {

18
lnbits/extensions/tpos/views_api.py
View file

@ -2,9 +2,8 @@ from flask import g, jsonify, request
from http import HTTPStatus from http import HTTPStatus
from lnbits.core.crud import get_user, get_wallet from lnbits.core.crud import get_user, get_wallet
from lnbits.core.services import create_invoice from lnbits.core.services import create_invoice, check_invoice_status
from lnbits.decorators import api_check_wallet_key, api_validate_post_request from lnbits.decorators import api_check_wallet_key, api_validate_post_request
from lnbits.settings import WALLET
from lnbits.extensions.tpos import tpos_ext from lnbits.extensions.tpos import tpos_ext
from .crud import create_tpos, get_tpos, get_tposs, delete_tpos from .crud import create_tpos, get_tpos, get_tposs, delete_tpos
@ -60,30 +59,31 @@ def api_tpos_create_invoice(tpos_id):
return jsonify({"message": "TPoS does not exist."}), HTTPStatus.NOT_FOUND return jsonify({"message": "TPoS does not exist."}), HTTPStatus.NOT_FOUND
try: try:
checking_id, payment_request = create_invoice( payment_hash, payment_request = create_invoice(
wallet_id=tpos.wallet, amount=g.data["amount"], memo=f"#tpos {tpos.name}" wallet_id=tpos.wallet, amount=g.data["amount"], memo=f"#tpos {tpos.name}"
) )
except Exception as e: except Exception as e:
return jsonify({"message": str(e)}), HTTPStatus.INTERNAL_SERVER_ERROR return jsonify({"message": str(e)}), HTTPStatus.INTERNAL_SERVER_ERROR
return jsonify({"checking_id": checking_id, "payment_request": payment_request}), HTTPStatus.CREATED return jsonify({"payment_hash": payment_hash, "payment_request": payment_request}), HTTPStatus.CREATED
@tpos_ext.route("/api/v1/tposs/<tpos_id>/invoices/<checking_id>", methods=["GET"]) @tpos_ext.route("/api/v1/tposs/<tpos_id>/invoices/<payment_hash>", methods=["GET"])
def api_tpos_check_invoice(tpos_id, checking_id): def api_tpos_check_invoice(tpos_id, payment_hash):
tpos = get_tpos(tpos_id) tpos = get_tpos(tpos_id)
if not tpos: if not tpos:
return jsonify({"message": "TPoS does not exist."}), HTTPStatus.NOT_FOUND return jsonify({"message": "TPoS does not exist."}), HTTPStatus.NOT_FOUND
try: try:
is_paid = not WALLET.get_invoice_status(checking_id).pending is_paid = not check_invoice_status(tpos.wallet, payment_hash).pending
except Exception: except Exception as exc:
print(exc)
return jsonify({"paid": False}), HTTPStatus.OK return jsonify({"paid": False}), HTTPStatus.OK
if is_paid: if is_paid:
wallet = get_wallet(tpos.wallet) wallet = get_wallet(tpos.wallet)
payment = wallet.get_payment(checking_id) payment = wallet.get_payment(payment_hash)
payment.set_pending(False) payment.set_pending(False)
return jsonify({"paid": True}), HTTPStatus.OK return jsonify({"paid": True}), HTTPStatus.OK

8
lnbits/extensions/usermanager/templates/usermanager/_api_docs.html
View file

@ -122,7 +122,8 @@
Returns 201 CREATED (application/json) Returns 201 CREATED (application/json)
</h5> </h5>
<code <code
>{"checking_id": &lt;string&gt;,"payment_request": >{"id": &lt;string&gt;, "name": &lt;string&gt;, "admin":
&lt;string&gt;, "email": &lt;string&gt;, "password":
&lt;string&gt;}</code &lt;string&gt;}</code
> >
<h5 class="text-caption q-mt-sm q-mb-none">Curl example</h5> <h5 class="text-caption q-mt-sm q-mb-none">Curl example</h5>
@ -158,8 +159,9 @@
Returns 201 CREATED (application/json) Returns 201 CREATED (application/json)
</h5> </h5>
<code <code
>{"checking_id": &lt;string&gt;,"payment_request": >{"id": &lt;string&gt;, "admin": &lt;string&gt;, "name":
&lt;string&gt;}</code &lt;string&gt;, "user": &lt;string&gt;, "adminkey": &lt;string&gt;,
"inkey": &lt;string&gt;}</code
> >
<h5 class="text-caption q-mt-sm q-mb-none">Curl example</h5> <h5 class="text-caption q-mt-sm q-mb-none">Curl example</h5>
<code <code

3
lnbits/extensions/withdraw/views_api.py
View file

@ -182,14 +182,13 @@ def api_lnurl_callback(unique_hash):
return jsonify({"status": "ERROR", "reason": f"Wait {link.open_time - now} seconds."}), HTTPStatus.OK return jsonify({"status": "ERROR", "reason": f"Wait {link.open_time - now} seconds."}), HTTPStatus.OK
try: try:
pay_invoice(wallet_id=link.wallet, bolt11=payment_request, max_sat=link.max_withdrawable) pay_invoice(wallet_id=link.wallet, payment_request=payment_request, max_sat=link.max_withdrawable)
changes = { changes = {
"open_time": link.wait_time + now, "open_time": link.wait_time + now,
} }
update_withdraw_link(link.id, **changes) update_withdraw_link(link.id, **changes)
except ValueError as e: except ValueError as e:
return jsonify({"status": "ERROR", "reason": str(e)}), HTTPStatus.OK return jsonify({"status": "ERROR", "reason": str(e)}), HTTPStatus.OK
except PermissionError: except PermissionError:

86
lnbits/static/js/base.js
View file

@ -1,10 +1,12 @@
/* globals Vue, EventHub, axios, Quasar, _ */
var LOCALE = 'en' var LOCALE = 'en'
var EventHub = new Vue() var EventHub = new Vue()
var LNbits = { var LNbits = {
api: { api: {
request: function (method, url, apiKey, data) { request: function(method, url, apiKey, data) {
return axios({ return axios({
method: method, method: method,
url: url, url: url,
@ -14,20 +16,20 @@ var LNbits = {
data: data data: data
}) })
}, },
createInvoice: function (wallet, amount, memo) { createInvoice: function(wallet, amount, memo) {
return this.request('post', '/api/v1/payments', wallet.inkey, { return this.request('post', '/api/v1/payments', wallet.inkey, {
out: false, out: false,
amount: amount, amount: amount,
memo: memo memo: memo
}) })
}, },
payInvoice: function (wallet, bolt11) { payInvoice: function(wallet, bolt11) {
return this.request('post', '/api/v1/payments', wallet.adminkey, { return this.request('post', '/api/v1/payments', wallet.adminkey, {
out: true, out: true,
bolt11: bolt11 bolt11: bolt11
}) })
}, },
getPayments: function (wallet, checkPending) { getPayments: function(wallet, checkPending) {
var query_param = checkPending ? '?check_pending' : '' var query_param = checkPending ? '?check_pending' : ''
return this.request( return this.request(
'get', 'get',
@ -35,21 +37,25 @@ var LNbits = {
wallet.inkey wallet.inkey
) )
}, },
getPayment: function (wallet, payhash) { getPayment: function(wallet, paymentHash) {
return this.request('get', '/api/v1/payments/' + payhash, wallet.inkey) return this.request(
'get',
'/api/v1/payments/' + paymentHash,
wallet.inkey
)
} }
}, },
href: { href: {
createWallet: function (walletName, userId) { createWallet: function(walletName, userId) {
window.location.href = window.location.href =
'/wallet?' + (userId ? 'usr=' + userId + '&' : '') + 'nme=' + walletName '/wallet?' + (userId ? 'usr=' + userId + '&' : '') + 'nme=' + walletName
}, },
deleteWallet: function (walletId, userId) { deleteWallet: function(walletId, userId) {
window.location.href = '/deletewallet?usr=' + userId + '&wal=' + walletId window.location.href = '/deletewallet?usr=' + userId + '&wal=' + walletId
} }
}, },
map: { map: {
extension: function (data) { extension: function(data) {
var obj = _.object( var obj = _.object(
['code', 'isValid', 'name', 'shortDescription', 'icon'], ['code', 'isValid', 'name', 'shortDescription', 'icon'],
data data
@ -57,17 +63,17 @@ var LNbits = {
obj.url = ['/', obj.code, '/'].join('') obj.url = ['/', obj.code, '/'].join('')
return obj return obj
}, },
user: function (data) { user: function(data) {
var obj = _.object(['id', 'email', 'extensions', 'wallets'], data) var obj = _.object(['id', 'email', 'extensions', 'wallets'], data)
var mapWallet = this.wallet var mapWallet = this.wallet
obj.wallets = obj.wallets obj.wallets = obj.wallets
.map(function (obj) { .map(function(obj) {
return mapWallet(obj) return mapWallet(obj)
}) })
.sort(function (a, b) { .sort(function(a, b) {
return a.name.localeCompare(b.name) return a.name.localeCompare(b.name)
}) })
obj.walletOptions = obj.wallets.map(function (obj) { obj.walletOptions = obj.wallets.map(function(obj) {
return { return {
label: [obj.name, ' - ', obj.id].join(''), label: [obj.name, ' - ', obj.id].join(''),
value: obj.id value: obj.id
@ -75,7 +81,7 @@ var LNbits = {
}) })
return obj return obj
}, },
wallet: function (data) { wallet: function(data) {
var obj = _.object( var obj = _.object(
['id', 'name', 'user', 'adminkey', 'inkey', 'balance'], ['id', 'name', 'user', 'adminkey', 'inkey', 'balance'],
data data
@ -86,9 +92,9 @@ var LNbits = {
obj.url = ['/wallet?usr=', obj.user, '&wal=', obj.id].join('') obj.url = ['/wallet?usr=', obj.user, '&wal=', obj.id].join('')
return obj return obj
}, },
payment: function (data) { payment: function(data) {
var obj = _.object( var obj = _.object(
['payhash', 'pending', 'amount', 'fee', 'memo', 'time'], ['checking_id', 'pending', 'amount', 'fee', 'memo', 'time'],
data data
) )
obj.date = Quasar.utils.date.formatDate( obj.date = Quasar.utils.date.formatDate(
@ -100,13 +106,13 @@ var LNbits = {
obj.fsat = new Intl.NumberFormat(LOCALE).format(obj.sat) obj.fsat = new Intl.NumberFormat(LOCALE).format(obj.sat)
obj.isIn = obj.amount > 0 obj.isIn = obj.amount > 0
obj.isOut = obj.amount < 0 obj.isOut = obj.amount < 0
obj.isPaid = obj.pending == 0 obj.isPaid = obj.pending === 0
obj._q = [obj.memo, obj.sat].join(' ').toLowerCase() obj._q = [obj.memo, obj.sat].join(' ').toLowerCase()
return obj return obj
} }
}, },
utils: { utils: {
confirmDialog: function (msg) { confirmDialog: function(msg) {
return Quasar.plugins.Dialog.create({ return Quasar.plugins.Dialog.create({
message: msg, message: msg,
ok: { ok: {
@ -119,16 +125,16 @@ var LNbits = {
} }
}) })
}, },
formatCurrency: function (value, currency) { formatCurrency: function(value, currency) {
return new Intl.NumberFormat(LOCALE, { return new Intl.NumberFormat(LOCALE, {
style: 'currency', style: 'currency',
currency: currency currency: currency
}).format(value) }).format(value)
}, },
formatSat: function (value) { formatSat: function(value) {
return new Intl.NumberFormat(LOCALE).format(value) return new Intl.NumberFormat(LOCALE).format(value)
}, },
notifyApiError: function (error) { notifyApiError: function(error) {
var types = { var types = {
400: 'warning', 400: 'warning',
401: 'warning', 401: 'warning',
@ -145,24 +151,22 @@ var LNbits = {
icon: null icon: null
}) })
}, },
search: function (data, q, field, separator) { search: function(data, q, field, separator) {
var field = field || '_q'
try { try {
var queries = q.toLowerCase().split(separator || ' ') var queries = q.toLowerCase().split(separator || ' ')
return data.filter(function (obj) { return data.filter(function(obj) {
var matches = 0 var matches = 0
_.each(queries, function (q) { _.each(queries, function(q) {
if (obj[field].indexOf(q) !== -1) matches++ if (obj[field].indexOf(q) !== -1) matches++
}) })
return matches == queries.length return matches === queries.length
}) })
} catch (err) { } catch (err) {
return data return data
} }
}, },
exportCSV: function (columns, data) { exportCSV: function(columns, data) {
var wrapCsvValue = function (val, formatFn) { var wrapCsvValue = function(val, formatFn) {
var formatted = formatFn !== void 0 ? formatFn(val) : val var formatted = formatFn !== void 0 ? formatFn(val) : val
formatted = formatted =
@ -174,14 +178,14 @@ var LNbits = {
} }
var content = [ var content = [
columns.map(function (col) { columns.map(function(col) {
return wrapCsvValue(col.label) return wrapCsvValue(col.label)
}) })
] ]
.concat( .concat(
data.map(function (row) { data.map(function(row) {
return columns return columns
.map(function (col) { .map(function(col) {
return wrapCsvValue( return wrapCsvValue(
typeof col.field === 'function' typeof col.field === 'function'
? col.field(row) ? col.field(row)
@ -212,7 +216,7 @@ var LNbits = {
} }
var windowMixin = { var windowMixin = {
data: function () { data: function() {
return { return {
g: { g: {
visibleDrawer: false, visibleDrawer: false,
@ -224,13 +228,13 @@ var windowMixin = {
} }
}, },
methods: { methods: {
toggleDarkMode: function () { toggleDarkMode: function() {
this.$q.dark.toggle() this.$q.dark.toggle()
this.$q.localStorage.set('lnbits.darkMode', this.$q.dark.isActive) this.$q.localStorage.set('lnbits.darkMode', this.$q.dark.isActive)
}, },
copyText: function (text, message, position) { copyText: function(text, message, position) {
var notify = this.$q.notify var notify = this.$q.notify
Quasar.utils.copyToClipboard(text).then(function () { Quasar.utils.copyToClipboard(text).then(function() {
notify({ notify({
message: message || 'Copied to clipboard!', message: message || 'Copied to clipboard!',
position: position || 'bottom' position: position || 'bottom'
@ -238,7 +242,7 @@ var windowMixin = {
}) })
} }
}, },
created: function () { created: function() {
this.$q.dark.set(this.$q.localStorage.getItem('lnbits.darkMode')) this.$q.dark.set(this.$q.localStorage.getItem('lnbits.darkMode'))
if (window.user) { if (window.user) {
this.g.user = Object.freeze(LNbits.map.user(window.user)) this.g.user = Object.freeze(LNbits.map.user(window.user))
@ -250,18 +254,18 @@ var windowMixin = {
var user = this.g.user var user = this.g.user
this.g.extensions = Object.freeze( this.g.extensions = Object.freeze(
window.extensions window.extensions
.map(function (data) { .map(function(data) {
return LNbits.map.extension(data) return LNbits.map.extension(data)
}) })
.map(function (obj) { .map(function(obj) {
if (user) { if (user) {
obj.isEnabled = user.extensions.indexOf(obj.code) != -1 obj.isEnabled = user.extensions.indexOf(obj.code) !== -1
} else { } else {
obj.isEnabled = false obj.isEnabled = false
} }
return obj return obj
}) })
.sort(function (a, b) { .sort(function(a, b) {
return a.name > b.name return a.name > b.name
}) })
) )