beignet 0.32.1 → 0.34.0

package/README.md

@@ -576,7 +576,7 @@ The experimental concurrent profile keeps ordinary payments available
 within the channel's remaining capacity. `LightningNode.fforSync()` fetches paid
 slot receipts and redeems them while other vouchers remain live.
 `rescueFforEpoch()` syncs a connected concurrent book without retiring it.
-Feature bits 562/563 are advertised by default when their dependencies are enabled.
+Feature bits 442/443 are advertised by default when their dependencies are enabled.
 See [concurrent receive and reserved retirement](docs/FFOR-RESERVED-RETIREMENT.md)
 for the version 1 and 2 contracts and storage requirements. The daemon enables
 advertisement with `BEIGNET_FFOR_CONCURRENT=true` and new concurrent settlement

package/dist/cli/beignet-node.js

@@ -377,27 +377,32 @@ function sentSats(info) {
 /**
  * A payment's amount as every public surface reports it (history, proof,
  * stats): an outgoing amount is what left the node, fees included, rounded
- * UP; an incoming amount rounds down, as the balance does (issue #1185).
- * Truncating the outgoing figure let a send paying 20,001.5 sats from a
- * 50,000 sat balance read 20,001 while the balance fell to 29,998. Rounding
- * up makes one send agree with the balance when the balance held whole sats
- * before it; sub-sat remainders across several sends can still differ from
- * the balance by a sat, which only msat figures reconcile exactly.
+ * UP; an incoming amount is what the node was credited, rounded down, as the
+ * balance does (issue #1185). Truncating the outgoing figure let a send
+ * paying 20,001.5 sats from a 50,000 sat balance read 20,001 while the
+ * balance fell to 29,998. Rounding up makes one send agree with the balance
+ * when the balance held whole sats before it; sub-sat remainders across
+ * several sends can still differ from the balance by a sat, which only msat
+ * figures reconcile exactly.
  */
 function paymentAmountSats(info) {
     return info.direction === types_6.PaymentDirection.OUTGOING
         ? sentSats(info) ?? spendLimitSats(info.amountMsat)
-        : Number(info.amountMsat / 1000n);
+        : Number((info.receivedMsat ?? info.amountMsat) / 1000n);
 }
 /**
- * The routing fee a payment paid, in msat, or undefined when the record does
- * not say. An MPP record's route is its first part only, so its fee is what
- * left the node over what the invoice asked (#1008).
+ * The fee a payment paid, in msat, or undefined when the record does not
+ * say. An MPP record's route is its first part only, so its fee is what left
+ * the node over what the invoice asked (#1008). An incoming payment's fee is
+ * a JIT LSP's skim: what the invoice asked over what the node was credited.
  */
 function paymentFeeMsat(info) {
     if (info.sentMsat !== undefined && info.sentMsat >= info.amountMsat) {
         return info.sentMsat - info.amountMsat;
     }
+    if (info.receivedMsat !== undefined && info.receivedMsat < info.amountMsat) {
+        return info.amountMsat - info.receivedMsat;
+    }
     return info.route?.totalFeeMsat;
 }
 /**
@@ -596,11 +601,23 @@ const NETWORK_NAMES = ['mainnet', 'testnet', 'signet', 'regtest'];
 function unknownNetwork(network) {
     throw new errors_1.BeignetError('INVALID_PARAMS', `unknown network '${String(network)}'`);
 }
+/**
+ * Mainnet and regtest are the servers the Bitkit app uses (bitkit-android,
+ * `Env.kt`), each with a certificate a public authority signed for its name,
+ * so `electrumTlsVerify` passes on them with no pin. They replace
+ * `fulcrum.bitkit.blocktank.to:8900`, whose certificate expired on May 10,
+ * 2026, and the plaintext `34.65.252.32:18483`, which serves the same regtest
+ * chain.
+ */
 const DEFAULT_ELECTRUM = {
-    mainnet: { host: 'fulcrum.bitkit.blocktank.to', port: 8900, useTls: true },
+    mainnet: { host: 'bitkit.to', port: 9999, useTls: true },
     testnet: { host: 'electrum.blockstream.info', port: 60002, useTls: true },
     signet: { host: 'mempool.space', port: 60602, useTls: true },
-    regtest: { host: '34.65.252.32', port: 18483, useTls: false }
+    regtest: {
+        host: 'electrs.bitkit.stag0.blocktank.to',
+        port: 9999,
+        useTls: true
+    }
 };
 /**
  * Resolve a host to a routable IPv4 address. Returns the host unchanged if it is
@@ -2121,6 +2138,7 @@ class BeignetNode extends typed_emitter_1.TypedEmitter {
             chainBackend: electrumBackend,
             feeEstimator: electrumBackend,
             logger: this.logger,
+            wireTrace: opts.wireTrace,
             sweepDestinationScript,
             socks5Proxy,
             socks5ProxyScope,
@@ -2535,8 +2553,23 @@ class BeignetNode extends typed_emitter_1.TypedEmitter {
             });
         });
         // Forward peer events
+        // Connects and disconnects are logged at info: a peer that evicts us
+        // (eclair's max-no-channels) and the auto reconnect after it are
+        // otherwise invisible at the level a daemon runs at.
         this.node.on('peer:connect', (pubkey) => {
-            this.log('debug', 'Peer connected', { pubkey });
+            let direction;
+            try {
+                direction = this.node
+                    .getPeerManager()
+                    ?.getConnectionInfo(pubkey)?.direction;
+            }
+            catch {
+                // The log line must not cost the gossip sync below.
+            }
+            this.log('info', 'Peer connected', {
+                pubkey,
+                ...(direction ? { direction } : {})
+            });
             // Pull the gossip graph from the peer so we can route multi-hop payments
             // to destinations beyond our direct channels. Without this the graph
             // stays empty and only direct-peer payments work.
@@ -2570,8 +2603,20 @@ class BeignetNode extends typed_emitter_1.TypedEmitter {
             }
             this.emit('peer:connect', { pubkey });
         });
-        this.node.on('peer:disconnect', (pubkey) => {
-            this.log('debug', 'Peer disconnected', { pubkey });
+        this.node.on('peer:disconnect', (pubkey, info) => {
+            this.log('info', 'Peer disconnected', {
+                pubkey,
+                ...(info
+                    ? {
+                        closedBy: info.initiator === 'remote' ? 'peer' : 'us',
+                        ...(info.reason ? { reason: info.reason } : {}),
+                        direction: info.direction,
+                        ...(info.uptimeMs !== undefined
+                            ? { uptimeMs: info.uptimeMs }
+                            : {})
+                    }
+                    : {})
+            });
             this.emit('peer:disconnect', { pubkey });
         });
         // The transport error that caused a disconnect (pong timeout, decrypt
@@ -2843,8 +2888,7 @@ class BeignetNode extends typed_emitter_1.TypedEmitter {
                 timer = setTimeout(() => resolve('timeout'), BeignetNode.INITIAL_SYNC_TIMEOUT_MS);
                 timer.unref?.();
             });
-            const attempt = this.wallet
-                .refreshWallet({})
+            const attempt = (0, live_data_1.refreshLiveWallet)(this.wallet)
                 .then((res) => {
                 if (res.isErr()) {
                     this.log('warn', 'Initial wallet refresh failed', {
@@ -5659,7 +5703,7 @@ class BeignetNode extends typed_emitter_1.TypedEmitter {
         });
     }
     async refreshWallet() {
-        const result = await this.wallet.refreshWallet({});
+        const result = await (0, live_data_1.refreshLiveWallet)(this.wallet);
         if (result.isErr()) {
             throw new errors_1.BeignetError('REFRESH_FAILED', result.error.message);
         }
@@ -6944,6 +6988,8 @@ class BeignetNode extends typed_emitter_1.TypedEmitter {
             capacitySats: Number(ch.fundingSatoshis),
             isAnchor: (0, types_7.isAnchorChannel)(ch.channelType ?? null)
         };
+        if (ch.preReestablishState)
+            info.preReestablishState = ch.preReestablishState;
         // What the connected peer's init negotiated, read rather than guessed:
         // a client deciding whether to offer splice controls has no other way
         // to know, and reconstructing feature bits client-side is exactly the
@@ -7562,6 +7608,16 @@ class BeignetNode extends typed_emitter_1.TypedEmitter {
     listDirectFundingPayments() {
         return this.directFundingSender?.payments() ?? [];
     }
+    /**
+     * Every payment received against a request this node minted, newest first
+     * (issue #1893). `receiptHash` is the `paymentHash` the request was minted
+     * with. Kept after the request itself expires, so a client can still tell
+     * its request was paid: a direct-funding payment settles no invoice and pays
+     * no address, and REVERTED means the splice it went into was undone.
+     */
+    listDirectFundingReceived() {
+        return this.node.getDirectFundingRequests()?.received() ?? [];
+    }
     /**
      * Map a coded protocol refusal onto the daemon's error vocabulary. The codes
      * are carried through verbatim: they are what tells the app a refusal to
@@ -11208,7 +11264,10 @@ class BeignetNode extends typed_emitter_1.TypedEmitter {
             saveQueueEntry: (entry) => sqlite().saveQueueEntry(entry),
             updateQueueEntryStatus: (id, status, error, completedAt) => sqlite().updateQueueEntryStatus(id, status, error, completedAt),
             deleteQueueEntry: (id) => sqlite().deleteQueueEntry(id),
-            loadAllQueueEntries: () => sqlite().loadAllQueueEntries()
+            loadAllQueueEntries: () => sqlite().loadAllQueueEntries(),
+            loadActiveQueueEntries: () => sqlite().loadActiveQueueEntries(),
+            loadQueueHistory: (limit, before) => sqlite().loadQueueHistory(limit, before),
+            loadQueueEntry: (id) => sqlite().loadQueueEntry(id)
         };
     }
     enqueuePayment(bolt11, priority, opts) {
@@ -11217,6 +11276,12 @@ class BeignetNode extends typed_emitter_1.TypedEmitter {
     listQueue() {
         return this.getPaymentQueue().list();
     }
+    getQueuedPayment(id) {
+        return this.getPaymentQueue().get(id);
+    }
+    listQueueHistory(opts) {
+        return this.getPaymentQueue().history(opts);
+    }
     cancelQueuedPayment(id) {
         return this.getPaymentQueue().cancel(id);
     }
@@ -11258,7 +11323,7 @@ class BeignetNode extends typed_emitter_1.TypedEmitter {
             }
             else if (p.direction === 'INCOMING' && p.status === 'COMPLETED') {
                 received++;
-                satsReceived += Number(p.amountMsat / 1000n);
+                satsReceived += paymentAmountSats(p);
             }
             else if (p.status === 'FAILED') {
                 failed++;