From d66cba2d111bec3a2bd57a56233577f3fd417b18 Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Sun, 18 Aug 2024 13:09:41 -0700 Subject: ecash --- src/components/AppHeader.svelte | 2 +- src/lib/parse.js | 95 ++++++++++++++ src/lib/socket.js | 10 +- src/lib/store.js | 2 +- src/lib/utils.js | 1 + src/locales/en.json | 12 +- src/routes/(app)/[username]/(profile)/+page.svelte | 2 +- .../[username]/ecash/[...token]/+page.server.js | 5 + .../(app)/[username]/ecash/[...token]/+page.svelte | 61 +++++++++ .../(app)/[username]/invoice/[id]/+page.svelte | 142 +++++++++++++++------ .../[username]/payments/[...page]/+page.svelte | 2 +- .../[username]/receive/[...param]/+page.server.js | 22 ++-- .../[username]/receive/[...param]/+page.svelte | 138 ++++++++++++++------ src/routes/(app)/qr/[text]/+page.svelte | 14 +- src/routes/(app)/send/[...text]/+page.server.js | 91 +------------ src/routes/(app)/send/[...text]/+page.svelte | 34 +++-- src/routes/(app)/send/ecash/+page.server.js | 19 +++ src/routes/(app)/send/ecash/+page.svelte | 60 +++++++++ src/routes/(app)/voucher/+page.svelte | 90 +++++++++++++ .../(app)/voucher/[...token]/+page.server.js | 20 +++ src/routes/(app)/voucher/[...token]/+page.svelte | 91 +++++++++++++ 21 files changed, 720 insertions(+), 193 deletions(-) create mode 100644 src/lib/parse.js create mode 100644 src/routes/(app)/[username]/ecash/[...token]/+page.server.js create mode 100644 src/routes/(app)/[username]/ecash/[...token]/+page.svelte create mode 100644 src/routes/(app)/send/ecash/+page.server.js create mode 100644 src/routes/(app)/send/ecash/+page.svelte create mode 100644 src/routes/(app)/voucher/+page.svelte create mode 100644 src/routes/(app)/voucher/[...token]/+page.server.js create mode 100644 src/routes/(app)/voucher/[...token]/+page.svelte (limited to 'src') diff --git a/src/components/AppHeader.svelte b/src/components/AppHeader.svelte index 6f68c41a..3b0303a8 100644 --- a/src/components/AppHeader.svelte +++ b/src/components/AppHeader.svelte @@ -66,7 +66,7 @@ .url.pathname === `/${user.username}/receive` ? 'opacity-100' : 'opacity-70 hover:opacity-80'}" - > + > diff --git a/src/lib/parse.js b/src/lib/parse.js new file mode 100644 index 00000000..fa4cb002 --- /dev/null +++ b/src/lib/parse.js @@ -0,0 +1,95 @@ +import { auth, get, isLiquid, post } from "$lib/utils"; +import bip21 from "bip21"; +import { validate } from "bitcoin-address-validation"; +import { PUBLIC_DOMAIN } from "$env/static/public"; +import { redirect } from "@sveltejs/kit"; + +export default async (t, host, cookies) => { + if (!t) return; + + if (t.startsWith("http")) redirect(307, t); + if (t.startsWith(host)) redirect(307, `http://${t}`); + + let amount, id, user; + + t = t.trim(); + t.toLowerCase().startsWith("bitcoin:") && + ({ + address: t, + options: { amount }, + } = bip21.decode(t)); + + if (t.startsWith("lightning:")) t = t.replace("lightning:", ""); + if (t.endsWith(`@${PUBLIC_DOMAIN}`)) t = t.split("@")[0]; + if (t.includes("@") && t.includes(".")) { + try { + t = await get(`/encode?address=${t}`); + } catch (e) {} + } + + if (t.includes("/fund")) redirect(307, t.substring(t.indexOf("/fund"))); + + // lightning + if (t.toLowerCase().startsWith("lightning:")) + t = t.toLowerCase().replace("lightning:", ""); + if (t.toLowerCase().startsWith("lnurl")) redirect(307, `/ln/${t}`); + if (t.includes(":")) t = t.split(":")[1]; + + if (t.toLowerCase().startsWith("ln")) { + try { + ({ id } = await get(`/invoice/${t}`)); + } catch (e) { + redirect(307, `/send/lightning/${t}`); + } + } + + // bitcoin + if (validate(t) || isLiquid(t)) { + try { + ({ id, user } = await get(`/invoice/${t}`)); + } catch (e) { + let r = `/send/bitcoin/${t}`; + if (amount) r += "/" + amount; + redirect(307, r); + } + + if (user) redirect(307, `/pay/${user.username}`); + else if (id) redirect(307, `/send/${id}`); + } + + let claimed; + if (t.toLowerCase().startsWith("cashu")) { + try { + claimed = await post(`/claim`, { token: t }, auth(cookies)); + claimed = { ok: true }; + } catch (e) { + return e.message; + } + if (claimed.ok) { + redirect(307, `/${cookies.get("username")}/payments`); + } + } + + // user + try { + user = await get(`/users/${t.split("/")[0]}`); + if (user.anon) user = null; + } catch (e) {} + + if (user) redirect(307, `/pay/${t}`); + + let fund; + try { + fund = await get(`/fund/${t}`); + } catch (e) {} + + if (fund) redirect(307, `/send/fund/${t}`); + + // invoice + let invoice; + try { + invoice = await get(`/invoice/${t}`); + } catch (e) {} + + if (invoice) redirect(307, `/send/invoice/${invoice.id}`); +}; diff --git a/src/lib/socket.js b/src/lib/socket.js index f6a6893b..1b0c2649 100644 --- a/src/lib/socket.js +++ b/src/lib/socket.js @@ -32,9 +32,13 @@ export const messages = (data) => ({ async payment() { let { amount, confirmed } = data; - invalidate("app:user"); - invalidate("app:invoice"); - invalidate("app:payments"); + + // without setTimeout, invalidate seems to break redirections from actions + setTimeout(() => { + invalidate("app:user"); + invalidate("app:invoice"); + invalidate("app:payments"); + }, 500); if (amount > 0) { success(`${confirmed ? "Received" : "Detected"} ${sat(amount)}!`); diff --git a/src/lib/store.js b/src/lib/store.js index 747afc4e..71d4aa40 100644 --- a/src/lib/store.js +++ b/src/lib/store.js @@ -56,4 +56,4 @@ export let request = writable(); export let requestRedirect = writable(); export let token = persistSession("token"); export let ndef = writable(); -export let showQr = persistLocal("showQr"); +export let showQr = persistLocal("showQr", true); diff --git a/src/lib/utils.js b/src/lib/utils.js index a897bed8..ac6e9216 100644 --- a/src/lib/utils.js +++ b/src/lib/utils.js @@ -288,6 +288,7 @@ export let types = { lightning: "lightning", internal: "internal", fund: "fund", + ecash: "ecash" }; export let ease = (t) => diff --git a/src/locales/en.json b/src/locales/en.json index 6477dacd..b98ea54c 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -157,7 +157,7 @@ "user": { "install": "Install app", "moreDetails": "Profile details", - "noMessages": "You have not sent or received any messages yet", + "noMessages": "You have not sent or received any messages", "profilePage": "Profile page", "nostrPubkey": "Nostr pubkey", "requestPayment": "Request Payment", @@ -293,6 +293,10 @@ } }, "payments": { + "ecash": "Ecash", + "memo": "Notes", + "voucherText": "Enter an ecash or lnurlw code", + "createEcash": "Create ecash", "tips": "Tips", "options": "options", "bump": "Bump fee", @@ -308,11 +312,15 @@ "takeFunds": "Take Funds", "show": "Show", "hide": "Hide", + "voucher": "Redeem voucher", "qr": "QR", + "copy": "Copy", "copyLink": "Copy Link", "copyText": "Copy Text", "openLink": "Open wallet", + "setAmount": "Set amount", "moreOptions": "More options", + "redeemVoucher": "Ecash/lnurlw voucher", "total": "Total", "gainLoss": "Gain/Loss", "presentValue": "Present Value", @@ -360,7 +368,7 @@ "fundsClaimed": "Funds claimed!", "print": "Print", "onlyLbtc": "We only support", - "dontDeposit": "don't deposit other assets yet" + "dontDeposit": "don't deposit other assets" }, "items": { "add": "Add item", diff --git a/src/routes/(app)/[username]/(profile)/+page.svelte b/src/routes/(app)/[username]/(profile)/+page.svelte index 1dd8f573..2dfd4979 100644 --- a/src/routes/(app)/[username]/(profile)/+page.svelte +++ b/src/routes/(app)/[username]/(profile)/+page.svelte @@ -147,7 +147,7 @@ class="rounded-2xl border py-5 px-6 font-bold hover:opacity-80 flex bg-primary grow" >
- +
{$t("user.dashboard.receive")}
diff --git a/src/routes/(app)/[username]/ecash/[...token]/+page.server.js b/src/routes/(app)/[username]/ecash/[...token]/+page.server.js new file mode 100644 index 00000000..01b5521c --- /dev/null +++ b/src/routes/(app)/[username]/ecash/[...token]/+page.server.js @@ -0,0 +1,5 @@ +export let load = async ({ cookies, params, parent }) => { + let { rates, user } = await parent(); + let token = params.token || cookies.get("ecash"); + return { rates, token, user }; +}; diff --git a/src/routes/(app)/[username]/ecash/[...token]/+page.svelte b/src/routes/(app)/[username]/ecash/[...token]/+page.svelte new file mode 100644 index 00000000..d02102a6 --- /dev/null +++ b/src/routes/(app)/[username]/ecash/[...token]/+page.svelte @@ -0,0 +1,61 @@ + + +
+

+ {$t("payments.ecash")} +

+ + {#if amount > 0} +
+
+ {f(amountFiat, currency)} +
+
+ ⚡️{`${s(amount)}`} +
+
+ {/if} + +
+ + + + + + + +
+ + +
diff --git a/src/routes/(app)/[username]/invoice/[id]/+page.svelte b/src/routes/(app)/[username]/invoice/[id]/+page.svelte index 1a569039..f28faf99 100644 --- a/src/routes/(app)/[username]/invoice/[id]/+page.svelte +++ b/src/routes/(app)/[username]/invoice/[id]/+page.svelte @@ -1,5 +1,5 @@
@@ -177,50 +194,50 @@
{/if} - +
+ -
- + {#if user.id === invoice.user.id} - - - + {:else} + + + + {/if} - - - - - - - - - - +
+ +
@@ -266,8 +283,53 @@
{/if} + + {#if user.id === invoice.user.id} + + + + {/if} +{#if settingAmount} +
+
+
+ +
+ + +
+ +
+
+{/if} +