1 files changed, 143 insertions, 24 deletions

diff --git a/src/features/gifts.js b/src/features/gifts.js
index 56fd99e..42e794d 100644
--- a/src/features/gifts.js
+++ b/src/features/gifts.js
@@ -9,13 +9,17 @@ import { installGiftWallet, previewGift, giftOutpoints, giftClaimTxs, isRetiredG
 import { t } from '../i18n.js';
 import { qrSvg } from '../qr.js';
 import { fmtBtc, timeAgo, shortAddr } from '../format.js';
+import { getEventHash, verifyEvent } from 'nostr-tools/pure';
+import { sha256 } from '@noble/hashes/sha256';
+import { bytesToHex, hexToBytes } from '@noble/hashes/utils';
+import { base32nopad } from '@scure/base';
 
 export function giftsFeature(ctx) {
   const {
     h, ui, render, wallet, toast, copyBtn, pasteBtn, blankSend, goBack, goHome, openExternal,
     fmtAmount, unitLabel, unitTag, parseAmount, getUnit, toggleUnit, download,
     brandHeader, activeAccount, setAccounts, getAccounts, claimTargets,
-    enterWallet, activateAccount, commitAccount,
+    enterWallet, activateAccount, commitAccount, pickConfirm,
   } = ctx;
   installGiftWallet(wallet); // gift primitives live outside the core wallet
   // Ark-gift support comes from the ark feature (when this build ships it);
@@ -32,6 +36,8 @@ export function giftsFeature(ctx) {
     try {
       const am = location.pathname.match(/^\/ag\/([A-Za-z0-9]+)\/?$/i); // ark gift
       if (am) {
+        ui.claimNote = readNoteFrag();
+        ui.claimFrom = readFromFrag(am[1]);
         history.replaceState(null, '', '/');
         return arkGiftOf(am[1]) ? am[1] : null;
       }
@@ -43,6 +49,7 @@ export function giftsFeature(ctx) {
         if (hm) code = hm[1];
       }
       if (!code) return null;
+      if (pm) { ui.claimNote = readNoteFrag(); ui.claimFrom = readFromFrag(code); }
       history.replaceState(null, '', '/');
       return previewGift(code) ? code : null;
     } catch {
@@ -57,6 +64,8 @@ export function giftsFeature(ctx) {
     try {
       const m = location.pathname.match(/^\/lg\/([A-Za-z0-9_-]+)\/?$/);
       if (!m) return null;
+      ui.claimNote = null;
+      ui.claimFrom = null;
       history.replaceState(null, '', '/');
       return previewLockedGift(m[1]);
     } catch { return null; }
@@ -120,6 +129,77 @@ export function giftsFeature(ctx) {
     if (!acceptLockedPayload(payload)) { ui.claimError = t('claimCodeWrong'); render(); }
   }
 
+  // A gift's note rides its link after the # (#m=<text>): the fragment never
+  // leaves the browser, so no server sees it, and it is only as private as the
+  // link itself (which already IS the money).
+  const GIFT_NOTE_MAX = 280;
+  // Who it's from rides there too (f=…): the sender's nostr key, signed over
+  // the gift's code, so a link can't be passed on as someone else's gift.
+  // 100 bytes in base32: pubkey, created_at, schnorr sig.
+  const giftFrag = (note, from) => {
+    const p = [];
+    if (note) p.push('m=' + encodeURIComponent(note));
+    if (from) p.push('f=' + from);
+    return p.length ? '#' + p.join('&') : '';
+  };
+  function readNoteFrag() {
+    try {
+      const m = new URLSearchParams(location.hash.slice(1)).get('m');
+      return m ? m.trim().slice(0, GIFT_NOTE_MAX) || null : null;
+    } catch { return null; }
+  }
+  const GIFT_FROM_KIND = 27121; // ephemeral range: never meant for a relay
+  const giftFromTmpl = (code, created_at) => ({
+    kind: GIFT_FROM_KIND, created_at, content: '',
+    tags: [['x', bytesToHex(sha256(new TextEncoder().encode(String(code).toUpperCase())))]],
+  });
+  // the sender's pubkey, if the link's f= is their signature over this code
+  function readFromFrag(code) {
+    try {
+      const f = [...new URLSearchParams(location.hash.slice(1))].find(([k]) => k.toLowerCase() === 'f')?.[1];
+      const b = f && base32nopad.decode(f.toUpperCase());
+      if (!b || b.length !== 100) return null;
+      const ev = { ...giftFromTmpl(code, new DataView(b.buffer, b.byteOffset).getUint32(32)),
+        pubkey: bytesToHex(b.slice(0, 32)), sig: bytesToHex(b.slice(36)) };
+      ev.id = getEventHash(ev);
+      return verifyEvent(ev) ? ev.pubkey : null;
+    } catch { return null; }
+  }
+  // Sign a new gift as ours (the messages feature holds the identity); null
+  // when there's no identity, the signer refuses, or it takes too long.
+  async function signGiftFrom(code) {
+    try {
+      const ev = await Promise.race([
+        hook('signGiftFrom', giftFromTmpl(code, Math.floor(Date.now() / 1000))),
+        new Promise((r) => setTimeout(() => r(null), 20_000)),
+      ]);
+      if (!ev || !ev.sig) return null;
+      const b = new Uint8Array(100);
+      b.set(hexToBytes(ev.pubkey), 0);
+      new DataView(b.buffer).setUint32(32, ev.created_at);
+      b.set(hexToBytes(ev.sig), 36);
+      return base32nopad.encode(b);
+    } catch { return null; }
+  }
+  const GIFT_ANON_KEY = 'giftAnon';
+  const giftAnon = () => { try { return localStorage.getItem(GIFT_ANON_KEY) === '1'; } catch { return false; } };
+  // who sent it, and that claiming follows them
+  const giftFromView = () => (ui.claimFrom
+    ? h('div', { class: 'col', style: 'align-items:center;gap:4px' },
+        h('div', { class: 'row gap6', style: 'align-items:center;justify-content:center' },
+          h('span', { class: 'small muted' }, t('giftFrom')),
+          hook('profileChip', ui.claimFrom, undefined, () => {})
+            || h('span', { class: 'small mono' }, (npubOf(ui.claimFrom) || '').slice(0, 16) + '…')),
+        h('div', { class: 'small faint' }, t('giftClaimFollows')))
+    : null);
+  // the sender's words, quoted above the amount wherever the gift is opened
+  const giftNoteView = () => (ui.claimNote
+    ? h('blockquote', { class: 'gift-note' }, ui.claimNote)
+    : null);
+  // with a note or a sender the link has a # in it: a byte-mode QR (the
+  // bare link is upper-cased into the denser alphanumeric mode)
+  const giftQr = (url, hasFrag) => qrSvg(hasFrag ? url : url.toUpperCase(), { ec: 'L', mode: hasFrag ? undefined : 'Alphanumeric' });
+
   // Entry point for claiming a gift code. If the recipient already has wallet(s),
   // offer to claim into one or make a new one; otherwise go straight to a fresh
   // wallet (the original first-timer flow).
@@ -171,6 +251,8 @@ export function giftsFeature(ctx) {
       h('div', { class: 'card col', style: 'align-items:center;text-align:center;gap:12px' },
         h('div', { class: 'check-badge', style: 'background:var(--accent)' }, '🎁'),
         h('h2', { style: 'margin:0' }, t('giftWelcome')),
+        giftFromView(),
+        giftNoteView(),
         pv ? h('div', { class: 'amt', style: 'font-size:30px' }, h('span', { class: 'amount-pos' }, fmtAmount(pv.room)), ' ', unitTag('unit')) : null,
         h('div', { class: 'small faint' }, claimFeeNote(code)),
         h('p', { class: 'muted', style: 'margin:0' }, t('claimIntoPrompt'))
@@ -214,7 +296,7 @@ export function giftsFeature(ctx) {
           ),
           h('div', { class: 'row gap6' }, copyBtn(wallet.mnemonic, t('copyPhrase'))),
           h('button', { class: 'btn-primary btn-block', onClick: () => { ui.confirm = pickConfirm(words); ui.claimError = ''; ui.claimStep = 'verify'; render(); } }, t('verifyBackup')),
-          h('button', { class: 'btn-block', onClick: () => { ui.screen = 'wallet'; ui.claimStep = null; landAccount(); render(); } }, t('skipVerification'))
+          h('button', { class: 'btn-block', onClick: finishClaim }, t('skipVerification'))
         )
       );
     }
@@ -246,13 +328,11 @@ export function giftsFeature(ctx) {
               onClick: () => {
                 const ok = ui.confirm.every((c) => c.value.toLowerCase() === words[c.index]);
                 if (!ok) { ui.claimError = t('wordsMismatch'); render(); return; }
-                ui.screen = 'wallet'; ui.claimStep = null; ui.claimError = '';
-                landAccount();
-                render();
+                finishClaim();
               },
             }, t('openWallet'))
           ),
-          h('button', { class: 'btn-block', onClick: () => { ui.screen = 'wallet'; ui.claimStep = null; landAccount(); render(); } }, t('skipVerification'))
+          h('button', { class: 'btn-block', onClick: finishClaim }, t('skipVerification'))
         )
       );
     }
@@ -313,6 +393,8 @@ export function giftsFeature(ctx) {
       h('div', { class: 'card col', style: 'align-items:center;text-align:center;gap:12px' },
         h('div', { class: 'check-badge', style: 'background:var(--accent)' }, '🎁'),
         h('h2', { style: 'margin:0' }, t('giftWelcome')),
+        giftFromView(),
+        giftNoteView(),
         h('div', { class: 'amt', style: 'font-size:30px' },
           h('span', { class: 'amount-pos' }, fmtAmount(total)), ' ', unitTag('unit')
         ),
@@ -324,10 +406,12 @@ export function giftsFeature(ctx) {
       !ui.claimError && ui.claimNotVisible && h('div', { class: 'notice info' }, t('claimNotVisibleBody')),
       ui.busy || ui.claimChecking
         ? h('button', { class: 'btn-primary btn-block', disabled: true }, h('span', { class: 'spinner' }))
+        // an ark gift costs nothing to claim: just the button (an on-chain
+        // one says what its network fee will take)
         : h('button', { class: 'btn-primary btn-block', onClick: doClaim },
-            t('claimBtn'), ' ',
-            h('span', { style: 'font-size:0.85em;opacity:0.9' },
-              '(' + (ag ? t('claimArkFree') : t('claimFeeNote', { n: fmtAmount(estFee) + ' ' + unitLabel() })) + ')'))
+            ...(ag ? [t('claimNowBtn')] : [t('claimBtn'), ' ',
+              h('span', { style: 'font-size:0.85em;opacity:0.9' },
+                '(' + t('claimFeeNote', { n: fmtAmount(estFee) + ' ' + unitLabel() }) + ')')]))
     );
   }
 
@@ -388,10 +472,21 @@ export function giftsFeature(ctx) {
     if (ctx.setAccount) ctx.setAccount('spending');
   }
 
+  // The seed is written down: into the new wallet — by way of the
+  // wizard's username, avatar and cover, so a gift's recipient arrives as
+  // someone people can pay by name (skippable, like any first run).
+  function finishClaim() {
+    ui.screen = 'wallet'; ui.claimStep = null; ui.claimError = '';
+    landAccount();
+    if (ctx.offerProfileSetup) ctx.offerProfileSetup({ home: ui.claimVia === 'ark' ? 'spending' : 'savings' });
+    render();
+  }
+
   function afterClaim(amount) {
     ui.claimedAmount = amount;
     const wasProvisional = !!(activeAccount() && activeAccount().provisional);
     commitAccount(); // claimed — keep a fresh gift wallet (no-op for an existing one)
+    if (ui.claimFrom) hook('followGiftSender', ui.claimFrom);
     if (wasProvisional) {
       ui.claimStep = 'backup'; // fresh wallet — show the new seed to back up
     } else {
@@ -526,13 +621,14 @@ export function giftsFeature(ctx) {
   // the sender can re-share an unclaimed gift.
   function viewGiftView() {
     const g = ui.viewGift; // { code, locked, amount, claimCode }
-    const url = `${location.origin}/g/${g.code}`;
+    const url = `${location.origin}/g/${g.code}${giftFrag(g.note, g.from)}`;
     let svg = null;
-    try { svg = qrSvg(url.toUpperCase(), { ec: 'L', mode: 'Alphanumeric' }); } catch {}
+    try { svg = giftQr(url, !!(g.note || g.from)); } catch {}
     return h('div', { class: 'col', style: 'gap:16px;padding:16px;max-width:460px;margin:0 auto;width:100%' },
       h('div', { class: 'card col', style: 'gap:12px;align-items:center' },
         h('h3', { style: 'margin:0' }, t('giftView')),
         g.amount != null ? h('div', { class: 'amt' }, fmtAmount(g.amount), ' ', unitTag()) : null,
+        g.note ? h('blockquote', { class: 'gift-note', style: 'width:100%' }, g.note) : null,
         svg ? h('div', { html: svg }) : h('div', { class: 'small faint', style: 'text-align:center;padding:8px' }, t('giftQrTooLong')),
         h('div', { class: 'addr-box break', style: 'width:100%;font-size:12px' }, url),
         copyBtn(url, t('copyLink')),
@@ -567,9 +663,9 @@ export function giftsFeature(ctx) {
     }
     ui.busy = true; ui.giftError = ''; render();
     try {
-      const g = await hook('arkGiftCreate', amt);
+      const g = await hook('arkGiftCreate', amt, giftNoteNow());
       ui.giftIsArk = true;
-      finishGift(g, amt);
+      await finishGift(g, amt);
     } catch (e) {
       ui.giftError = e.message;
     }
@@ -611,12 +707,21 @@ export function giftsFeature(ctx) {
     doCreateGift(amt, rate);
   }
 
-  // Finalize a freshly-built gift: a plain bearer link.
-  function finishGift(g, fallbackAmt) {
+  // Finalize a freshly-built gift: a plain bearer link, signed as ours
+  // unless the sender would rather stay anonymous. Recorded before the
+  // signer is asked, so a signer that never answers can't lose the gift.
+  async function finishGift(g, fallbackAmt) {
     const amount = g.amount || fallbackAmt || 0;
+    const note = giftNoteNow(); // the link says what was typed when it was made
+    const rec = { code: g.code, locked: false, amount, outpoints: g.reserved, note };
+    wallet.recordGift(rec);
+    const from = giftAnon() ? null : await signGiftFrom(g.code);
+    if (from) wallet.recordGift({ ...rec, from });
     ui.giftCode = g.code;
-    wallet.recordGift({ code: g.code, locked: false, amount, outpoints: g.reserved });
+    ui.giftNoteMade = note;
+    ui.giftFromMade = from;
   }
+  const giftNoteNow = () => String(ui.giftNote || '').trim().slice(0, GIFT_NOTE_MAX) || null;
 
   function giftCard() {
     const active = wallet.outstandingGifts();
@@ -631,13 +736,14 @@ export function giftsFeature(ctx) {
             // (many-input) gift can exceed QR capacity — then fall back to the link.
             (() => {
               let svg = null;
-              try { svg = qrSvg(giftUrl().toUpperCase(), { ec: 'L', mode: 'Alphanumeric' }); } catch {}
+              try { svg = giftQr(giftUrl(), !!(ui.giftNoteMade || ui.giftFromMade)); } catch {}
               return svg ? h('div', { html: svg }) : h('div', { class: 'small faint', style: 'text-align:center;padding:8px' }, t('giftQrTooLong'));
             })(),
+            ui.giftNoteMade ? h('blockquote', { class: 'gift-note', style: 'width:100%' }, ui.giftNoteMade) : null,
             h('div', { class: 'addr-box break', style: 'width:100%;font-size:12px' }, giftUrl()),
             h('div', { class: 'row gap6 wrap' },
               copyBtn(giftUrl(), t('copyLink')),
-              h('button', { class: 'btn-sm grow', onClick: () => { ui.giftCode = null; ui.giftAmount = ''; ui.giftMax = false; ui.giftIsArk = false; render(); } }, t('giftAnother'))
+              h('button', { class: 'btn-sm grow', onClick: () => { ui.giftCode = null; ui.giftAmount = ''; ui.giftNote = ''; ui.giftNoteMade = null; ui.giftFromMade = null; ui.giftMax = false; ui.giftIsArk = false; render(); } }, t('giftAnother'))
             )
           )
         : ui.giftSplitOffer
@@ -692,6 +798,15 @@ export function giftsFeature(ctx) {
             ui.giftSource === 'chain'
               ? h('div', { class: 'notice warn small' }, t('giftChainWarn'))
               : null,
+            // an optional note, shown to whoever opens the gift
+            h('textarea', { class: 'gift-note-input', rows: 2, maxlength: GIFT_NOTE_MAX, placeholder: t('giftNotePlaceholder'),
+              value: ui.giftNote || '', onInput: (e) => { ui.giftNote = e.target.value; } }),
+            // the link names its sender (and claiming follows them) unless unticked
+            h('label', { class: 'row gap6', style: 'align-items:center;cursor:pointer' },
+              h('input', { type: 'checkbox', checked: !giftAnon(), onChange: (e) => {
+                try { if (e.target.checked) localStorage.removeItem(GIFT_ANON_KEY); else localStorage.setItem(GIFT_ANON_KEY, '1'); } catch {}
+              } }),
+              h('span', { class: 'small' }, t('giftFromMe'))),
             ui.giftError && h('div', { class: 'notice err' }, ui.giftError),
             ui.busy
               ? h('button', { class: 'btn-block', disabled: true }, h('span', { class: 'spinner sm' }))
@@ -864,36 +979,40 @@ export function giftsFeature(ctx) {
   // Gift link: presign a chosen amount as a #gift= PSBT that whoever opens claims
   // into a fresh wallet only they control. The coin is reserved until claimed.
   function giftUrl() {
-    return `${location.origin}/${ui.giftIsArk ? 'ag' : 'g'}/${ui.giftCode}`;
+    return `${location.origin}/${ui.giftIsArk ? 'ag' : 'g'}/${ui.giftCode}${giftFrag(ui.giftNoteMade, ui.giftFromMade)}`;
   }
 
   function giftRate() {
     return (wallet.feeRates && wallet.feeRates.halfHourFee) || 5;
   }
 
-  function doCreateGift(amt, rate) {
+  async function doCreateGift(amt, rate) {
+    ui.busy = true; render();
     try {
-      finishGift(wallet.createGift(amt, rate), amt);
+      await finishGift(wallet.createGift(amt, rate), amt);
       ui.giftError = '';
       ui.giftSplitOffer = null;
     } catch (e) {
       ui.giftError = e.message;
       ui.giftSplitOffer = null;
     }
+    ui.busy = false;
     render();
   }
 
   // Gift the whole spendable balance as a no-change sweep (the recipient receives
   // everything minus their claim fee).
-  function doCreateGiftAll(rate) {
+  async function doCreateGiftAll(rate) {
+    ui.busy = true; render();
     try {
-      finishGift(wallet.createGiftAll(rate));
+      await finishGift(wallet.createGiftAll(rate));
       ui.giftError = '';
       ui.giftMax = false;
       ui.giftSplitOffer = null;
     } catch (e) {
       ui.giftError = e.message;
     }
+    ui.busy = false;
     render();
   }
 
@@ -906,7 +1025,7 @@ export function giftsFeature(ctx) {
     ui.busy = true; ui.giftError = ''; render();
     try {
       const rate = (wallet.feeRates && wallet.feeRates.halfHourFee) || 5;
-      finishGift(await wallet.createGiftFromSplit(amt, rate), amt);
+      await finishGift(await wallet.createGiftFromSplit(amt, rate), amt);
       ui.giftSplitOffer = null;
       ui.giftError = '';
     } catch (e) {