1 files changed, 7 insertions, 4 deletions
diff --git a/src/features/ark.js b/src/features/ark.js
index 13481da..1619ce4 100644
--- a/src/features/ark.js
+++ b/src/features/ark.js
@@ -2,11 +2,12 @@
 // protocol, spoken natively by ../ark). Receive address + boarding, instant
 // sends, history entries, refresh/consolidation, server settings.
 
+import { zapAddrOf } from '../live.js';
 import * as btc from '@scure/btc-signer';
 import { HDKey } from '@scure/bip32';
 import { hex, base32nopad, bech32 } from '@scure/base';
 import { sha256 } from '@noble/hashes/sha256';
-import { ArkManager, remoteRenewalsInFlight, lnFoldedIds } from '../ark/manager.js';
+import { ArkManager, remoteRenewalsInFlight, lnFoldedIds, backstopMargin } from '../ark/manager.js';
 export { remoteRenewalsInFlight };
 
 // Coins this device may offer: spendable, and not held by a renewal another
@@ -343,6 +344,8 @@ export function mergeArkStates(a, b) {
   out.remoteRenewals = mergeRemoteRenewals(a, b);
   delete out.renewals; // a snapshot's own list, adopted above as remote
   out.nextKeyIndex = Math.max(a.nextKeyIndex || 1, b.nextKeyIndex || 1);
+  // standing renewal orders registered on the other side (the worker's, say)
+  out.scheduled = ArkManager.mergeScheduled(a.scheduled, b.scheduled);
   out.nextLnRecvIndex = Math.max(a.nextLnRecvIndex || 0, b.nextLnRecvIndex || 0);
   out.receiveAckTs = Math.max(a.receiveAckTs || 0, b.receiveAckTs || 0);
   out.serverPubkey = a.serverPubkey || b.serverPubkey || null;
@@ -1912,7 +1915,7 @@ export function arkFeature(ctx) {
     await wallet.nostrPublish({
       kind: ARK_ZAP_KIND,
       content: (z.comment || '').slice(0, 280),
-      tags: [['p', z.pk], ...(z.eventId ? [['e', z.eventId]] : []),
+      tags: [['p', z.pk], ...(z.eventId ? [['e', z.eventId]] : []), ...(zapAddrOf(z.eventId) ? [['a', zapAddrOf(z.eventId)]] : []),
         ['amount', String(sats)], ['vtxo', vtxoId], ['network', getNetwork()], ...zapSenderTag()],
     }).catch(() => {});
   }
@@ -1955,7 +1958,7 @@ export function arkFeature(ctx) {
     wallet.nostrPublish({
       kind: ARK_ZAP_KIND,
       content: (z.comment || '').slice(0, 280),
-      tags: [['p', z.pk], ...(z.eventId ? [['e', z.eventId]] : []),
+      tags: [['p', z.pk], ...(z.eventId ? [['e', z.eventId]] : []), ...(zapAddrOf(z.eventId) ? [['a', zapAddrOf(z.eventId)]] : []),
         ['amount', String(sats)], ['network', getNetwork()], ['gift', locked.url], ...zapSenderTag()],
     }).catch(() => {});
     const dmText = t('giftDmText', { amount: fmtAmount(sats) + ' ' + unitLabel(), link: locked.url, code: locked.claimCode });
@@ -3194,7 +3197,7 @@ export function arkFeature(ctx) {
   // app that IS open still renews first (and the untouched backstop is
   // dropped), and far enough from expiry — 36 blocks, six hourly rounds — for
   // the round to actually run in time. Both are in the free fee bracket.
-  const backstopWindow = () => (getNetwork() === 'regtest' ? 6 : 36);
+  const backstopWindow = () => backstopMargin(getNetwork());
   let arkAutoRefreshAt = 0;
   let arkBackstopAt = 0;
   // Set when the balance is too small to renew itself (total minus round fee