bolt12

Author: benthecarman

package.json

@@ -48,15 +48,15 @@
         "@capacitor/clipboard": "^5.0.6",
         "@capacitor/core": "^5.2.2",
         "@capacitor/filesystem": "^5.1.4",
-        "@capacitor/share": "^5.0.6",
         "@capacitor/haptics": "^5.0.6",
+        "@capacitor/share": "^5.0.6",
         "@capacitor/toast": "^5.0.6",
         "@kobalte/core": "^0.9.8",
         "@kobalte/tailwindcss": "^0.5.0",
         "@modular-forms/solid": "^0.18.1",
         "@mutinywallet/barcode-scanner": "5.0.0-beta.3",
-        "@mutinywallet/mutiny-wasm": "0.4.25",
-        "@mutinywallet/waila-wasm": "^0.2.1",
+        "@mutinywallet/mutiny-wasm": "^0.4.24",
+        "@mutinywallet/waila-wasm": "0.2.4",
         "@nostr-dev-kit/ndk": "^0.8.11",
         "@solid-primitives/upload": "^0.0.111",
         "@solid-primitives/websocket": "^1.1.0",

pnpm-lock.yaml

@@ -2,12 +2,13 @@ import initWaila, { PaymentParams } from "@mutinywallet/waila-wasm";
 
 import { Result } from "~/utils";
 
-// Make sure we've initialzied waila before we try to use it
+// Make sure we've initialized waila before we try to use it
 await initWaila();
 
 export type ParsedParams = {
     address?: string;
     invoice?: string;
+    offer?: string;
     amount_sats?: bigint;
     network?: string;
     memo?: string;
@@ -50,6 +51,7 @@ export function toParsedParams(
         value: {
             address: params.address,
             invoice: params.invoice,
+            offer: params.offer,
             amount_sats: params.amount_sats,
             network,
             memo: params.memo,

src/logic/waila.ts

@@ -175,6 +175,7 @@ function DestinationShower(props: {
     description?: string;
     address?: string;
     invoice?: MutinyInvoice;
+    offer?: string;
     nodePubkey?: string;
     lnurl?: string;
     clearAll: () => void;
@@ -187,6 +188,9 @@ function DestinationShower(props: {
             <Match when={props.invoice && props.source === "lightning"}>
                 <StringShower text={props.invoice?.bolt11 || ""} />
             </Match>
+            <Match when={props.offer && props.source === "lightning"}>
+                <StringShower text={props.offer || ""} />
+            </Match>
             <Match when={props.nodePubkey && props.source === "lightning"}>
                 <StringShower text={props.nodePubkey || ""} />
             </Match>
@@ -213,6 +217,7 @@ export default function Send() {
 
     // These can only be derived from the "destination" signal
     const [invoice, setInvoice] = createSignal<MutinyInvoice>();
+    const [offer, setOffer] = createSignal<string>();
     const [nodePubkey, setNodePubkey] = createSignal<string>();
     const [lnurlp, setLnurlp] = createSignal<string>();
     const [address, setAddress] = createSignal<string>();
@@ -236,6 +241,7 @@ export default function Send() {
         setIsAmtEditable(true);
         setSource("lightning");
         setInvoice(undefined);
+        setOffer(undefined);
         setAddress(undefined);
         setDescription(undefined);
         setNodePubkey(undefined);
@@ -346,6 +352,13 @@ export default function Send() {
                         setInvoice(invoice);
                         setSource("lightning");
                     });
+            } else if (source.offer) {
+                if (source.amount_sats) {
+                    setAmountSats(source.amount_sats)
+                    setIsAmtEditable(false);
+                }
+                setOffer(source.offer);
+                setSource("lightning");
             } else if (source.node_pubkey) {
                 setAmountSats(source.amount_sats || 0n);
                 setNodePubkey(source.node_pubkey);
@@ -489,6 +502,24 @@ export default function Send() {
                     sentDetails.amount = amountSats();
                     sentDetails.fee_estimate = payment?.fees_paid || 0;
                 }
+            } else if (source() === "lightning" && offer()) {
+                const nodes = await state.mutiny_wallet?.list_nodes();
+                const firstNode = (nodes[0] as string) || "";
+                const payment = await state.mutiny_wallet?.pay_offer(
+                    firstNode,
+                    offer()!,
+                    amountSats(),
+                    undefined,
+                    undefined, // todo add optional payer message
+                    tags
+                );
+
+                if (!payment?.paid) {
+                    throw new Error(i18n.t("send.error_keysend"));
+                } else {
+                    sentDetails.amount = amountSats();
+                    sentDetails.fee_estimate = payment?.fees_paid || 0;
+                }
             } else if (source() === "lightning" && nodePubkey()) {
                 const nodes = await state.mutiny_wallet?.list_nodes();
                 const firstNode = (nodes[0] as string) || "";
@@ -576,7 +607,7 @@ export default function Send() {
                 <DefaultMain>
                     <Show
                         when={
-                            address() || invoice() || nodePubkey() || lnurlp()
+                            address() || invoice() || offer() || nodePubkey() || lnurlp()
                         }
                         fallback={<BackLink />}
                     >
@@ -657,6 +688,7 @@ export default function Send() {
                                 when={
                                     address() ||
                                     invoice() ||
+                                    offer() ||
                                     nodePubkey() ||
                                     lnurlp()
                                 }
@@ -672,6 +704,7 @@ export default function Send() {
                                             source={source()}
                                             description={description()}
                                             invoice={invoice()}
+                                            offer={offer()}
                                             address={address()}
                                             nodePubkey={nodePubkey()}
                                             lnurl={lnurlp()}
@@ -720,6 +753,7 @@ export default function Send() {
                             when={
                                 address() ||
                                 invoice() ||
+                                offer() ||
                                 nodePubkey() ||
                                 lnurlp()
                             }

src/routes/Send.tsx

@@ -347,6 +347,7 @@ export const Provider: ParentComponent = (props) => {
                 if (
                     result.value?.address ||
                     result.value?.invoice ||
+                    result.value?.offer ||
                     result.value?.node_pubkey ||
                     result.value?.lnurl
                 ) {