beignet 0.23.0 → 0.23.1

package/dist/cli/beignet-node.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BeignetNode = exports.jitInvoiceError = exports.holdInvoiceEvent = exports.jsonSafeEvent = exports.jitReceiveRefusal = exports.leaseRatesRefusal = exports.defaultMaxFeeMsat = exports.DEFAULT_MAX_FEE_FLOOR_SATS = exports.DEFAULT_MAX_FEE_PPM = exports.clampDirectFundingMinimum = exports.DAILY_SPEND_STATE_KEY = exports.MAX_ASYNC_SPEND_CLAIMS = exports.ASYNC_SPEND_CLAIM_TTL_MS = exports.jsonToRouteHops = exports.routeHopsToJson = exports.spliceRefusalError = exports.decodeOfferInput = exports.paymentAdmissionSats = exports.paymentSpendSats = exports.spendLimitSats = exports.decodeInvoiceInput = exports.ENGINE_PAYMENT_ERROR_CODES = exports.parseScid = exports.formatScid = exports.gossipPrimeLatch = exports.defaultDataDirForMnemonic = exports.parseRecoveryMode = void 0;
+exports.BeignetNode = exports.jitInvoiceError = exports.holdInvoiceEvent = exports.jsonSafeEvent = exports.jitReceiveRefusal = exports.leaseRatesRefusal = exports.defaultMaxFeeMsat = exports.DEFAULT_MAX_FEE_FLOOR_SATS = exports.DEFAULT_MAX_FEE_PPM = exports.clampDirectFundingMinimum = exports.DAILY_SPEND_STATE_KEY = exports.MAX_ASYNC_SPEND_CLAIMS = exports.ASYNC_SPEND_CLAIM_TTL_MS = exports.jsonToRouteHops = exports.routeHopsToJson = exports.spliceRefusalError = exports.decodeOfferInput = exports.paymentAdmissionSats = exports.paymentSpendSats = exports.hopFeeMsat = exports.spendLimitSats = exports.decodeInvoiceInput = exports.ENGINE_PAYMENT_ERROR_CODES = exports.parseScid = exports.formatScid = exports.gossipPrimeLatch = exports.defaultDataDirForMnemonic = exports.parseRecoveryMode = void 0;
 const offline_receive_1 = require("./offline-receive");
 const ffor_receive_1 = require("./ffor-receive");
 const path = __importStar(require("path"));
@@ -45,9 +45,10 @@ const fs_utils_1 = require("./fs-utils");
 const node_storage_view_1 = require("./node-storage-view");
 const electrum_1 = require("../types/electrum");
 const lightning_node_1 = require("../lightning/node/lightning-node");
-const types_1 = require("../lightning/direct-funding/receiver/types");
+const types_1 = require("../lightning/chain/types");
+const types_2 = require("../lightning/direct-funding/receiver/types");
 const splice_1 = require("../lightning/message/splice");
-const types_2 = require("../lightning/ffor/types");
+const types_3 = require("../lightning/ffor/types");
 const messages_1 = require("../lightning/ffor/messages");
 const splice_weight_1 = require("../lightning/channel/splice-weight");
 const l402_1 = require("../lightning/l402");
@@ -58,9 +59,9 @@ const scb_1 = require("../lightning/backup/scb");
 const bip39 = __importStar(require("bip39"));
 const rapid_sync_1 = require("../lightning/gossip/rapid-sync");
 const messages_2 = require("../lightning/gossip/messages");
-const types_3 = require("../lightning/gossip/types");
+const types_4 = require("../lightning/gossip/types");
 const electrum_backend_1 = require("../lightning/chain/electrum-backend");
-const types_4 = require("../lightning/invoice/types");
+const types_5 = require("../lightning/invoice/types");
 const wallet_keys_1 = require("../lightning/keys/wallet-keys");
 const recovery_1 = require("../lightning/recovery");
 const peer_manager_1 = require("../lightning/transport/peer-manager");
@@ -69,8 +70,8 @@ const ecdh_1 = require("../lightning/crypto/ecdh");
 const direct_funding_1 = require("../lightning/direct-funding");
 const direct_funding_2 = require("./direct-funding");
 const auth_1 = require("./auth");
-const types_5 = require("../lightning/node/types");
-const types_6 = require("../lightning/channel/types");
+const types_6 = require("../lightning/node/types");
+const types_7 = require("../lightning/channel/types");
 const channel_state_1 = require("../lightning/channel/channel-state");
 const decode_1 = require("../lightning/invoice/decode");
 const decode_2 = require("../lightning/offer/decode");
@@ -148,14 +149,14 @@ function gossipPrimeLatch(rgs, timeoutMs) {
 }
 exports.gossipPrimeLatch = gossipPrimeLatch;
 function formatScid(scid) {
-    const { block, txIndex, outputIndex } = (0, types_3.decodeShortChannelId)(scid);
+    const { block, txIndex, outputIndex } = (0, types_4.decodeShortChannelId)(scid);
     return `${block}x${txIndex}x${outputIndex}`;
 }
 exports.formatScid = formatScid;
 function parseScid(scid) {
     const human = scid.match(/^(\d+)x(\d+)x(\d+)$/);
     if (human) {
-        return (0, types_3.encodeShortChannelId)({
+        return (0, types_4.encodeShortChannelId)({
             block: parseInt(human[1], 10),
             txIndex: parseInt(human[2], 10),
             outputIndex: parseInt(human[3], 10)
@@ -191,6 +192,14 @@ function spendLimitSats(amountMsat) {
     return Number((amountMsat + 999n) / 1000n);
 }
 exports.spendLimitSats = spendLimitSats;
+function hopFeeMsat(hops, i) {
+    const received = hops[i]?.amountToForwardMsat;
+    const forwarded = hops[i + 1]?.amountToForwardMsat;
+    if (typeof received !== 'bigint' || typeof forwarded !== 'bigint')
+        return 0;
+    return received > forwarded ? Number(received - forwarded) : 0;
+}
+exports.hopFeeMsat = hopFeeMsat;
 function paymentSpendSats(amountMsat, amountSats) {
     return amountMsat !== undefined
         ? spendLimitSats(amountMsat)
@@ -212,6 +221,9 @@ function sentSats(info) {
     }
     return spendLimitSats(info.amountMsat);
 }
+function settlesInvoice(p) {
+    return p?.status === 'COMPLETED' && p.direction === 'INCOMING';
+}
 function decodeOfferInput(offerStr) {
     try {
         return (0, decode_2.decodeOffer)(offerStr);
@@ -222,19 +234,19 @@ function decodeOfferInput(offerStr) {
 }
 exports.decodeOfferInput = decodeOfferInput;
 const FUNDING_UNAVAILABLE_CODES = {
-    [types_5.ChannelFundingUnavailableCode.FUNDING_PROVIDER_REQUIRED]: errors_1.BeignetErrorCode.FUNDING_PROVIDER_REQUIRED,
-    [types_5.ChannelFundingUnavailableCode.INSUFFICIENT_BALANCE]: errors_1.BeignetErrorCode.INSUFFICIENT_BALANCE,
-    [types_5.ChannelFundingUnavailableCode.FEE_ESTIMATE_NOT_READY]: errors_1.BeignetErrorCode.FEE_ESTIMATE_NOT_READY,
-    [types_5.ChannelFundingUnavailableCode.CHANNEL_NOT_FOUND]: errors_1.BeignetErrorCode.CHANNEL_NOT_FOUND
+    [types_6.ChannelFundingUnavailableCode.FUNDING_PROVIDER_REQUIRED]: errors_1.BeignetErrorCode.FUNDING_PROVIDER_REQUIRED,
+    [types_6.ChannelFundingUnavailableCode.INSUFFICIENT_BALANCE]: errors_1.BeignetErrorCode.INSUFFICIENT_BALANCE,
+    [types_6.ChannelFundingUnavailableCode.FEE_ESTIMATE_NOT_READY]: errors_1.BeignetErrorCode.FEE_ESTIMATE_NOT_READY,
+    [types_6.ChannelFundingUnavailableCode.CHANNEL_NOT_FOUND]: errors_1.BeignetErrorCode.CHANNEL_NOT_FOUND
 };
 const SPLICE_REFUSAL_CODES = {
-    [types_5.SpliceRefusalCode.CHANNEL_NOT_FOUND]: errors_1.BeignetErrorCode.CHANNEL_NOT_FOUND,
-    [types_5.SpliceRefusalCode.SPLICING_NOT_NEGOTIATED]: errors_1.BeignetErrorCode.SPLICING_NOT_NEGOTIATED,
-    [types_5.SpliceRefusalCode.INVALID_PARAMS]: errors_1.BeignetErrorCode.INVALID_PARAMS,
-    [types_5.SpliceRefusalCode.INSUFFICIENT_BALANCE]: errors_1.BeignetErrorCode.INSUFFICIENT_BALANCE,
-    [types_5.SpliceRefusalCode.FUNDING_PROVIDER_REQUIRED]: errors_1.BeignetErrorCode.FUNDING_PROVIDER_REQUIRED,
-    [types_5.SpliceRefusalCode.SPLICE_BUSY]: errors_1.BeignetErrorCode.SPLICE_BUSY,
-    [types_5.SpliceRefusalCode.SPLICE_REFUSED]: errors_1.BeignetErrorCode.SPLICE_REFUSED
+    [types_6.SpliceRefusalCode.CHANNEL_NOT_FOUND]: errors_1.BeignetErrorCode.CHANNEL_NOT_FOUND,
+    [types_6.SpliceRefusalCode.SPLICING_NOT_NEGOTIATED]: errors_1.BeignetErrorCode.SPLICING_NOT_NEGOTIATED,
+    [types_6.SpliceRefusalCode.INVALID_PARAMS]: errors_1.BeignetErrorCode.INVALID_PARAMS,
+    [types_6.SpliceRefusalCode.INSUFFICIENT_BALANCE]: errors_1.BeignetErrorCode.INSUFFICIENT_BALANCE,
+    [types_6.SpliceRefusalCode.FUNDING_PROVIDER_REQUIRED]: errors_1.BeignetErrorCode.FUNDING_PROVIDER_REQUIRED,
+    [types_6.SpliceRefusalCode.SPLICE_BUSY]: errors_1.BeignetErrorCode.SPLICE_BUSY,
+    [types_6.SpliceRefusalCode.SPLICE_REFUSED]: errors_1.BeignetErrorCode.SPLICE_REFUSED
 };
 function spliceRefusalError(result) {
     if (result.ok)
@@ -249,10 +261,10 @@ function fundingOrRefuse(run) {
         return run();
     }
     catch (err) {
-        if (err instanceof types_5.InvalidRequestError) {
+        if (err instanceof types_6.InvalidRequestError) {
             throw new errors_1.BeignetError(errors_1.BeignetErrorCode.INVALID_PARAMS, err.message);
         }
-        if (err instanceof types_5.ChannelFundingUnavailableError) {
+        if (err instanceof types_6.ChannelFundingUnavailableError) {
             throw new errors_1.BeignetError(FUNDING_UNAVAILABLE_CODES[err.code], err.message);
         }
         throw err;
@@ -535,15 +547,15 @@ function isHeldRestore(ch) {
         ch.restoreRevokedRisk === true);
 }
 const CLOSING_CHANNEL_STATES = new Set([
-    types_6.ChannelState.SHUTTING_DOWN,
-    types_6.ChannelState.NEGOTIATING_CLOSING,
-    types_6.ChannelState.CLOSED,
-    types_6.ChannelState.FORCE_CLOSED,
-    types_6.ChannelState.ERRORED
+    types_7.ChannelState.SHUTTING_DOWN,
+    types_7.ChannelState.NEGOTIATING_CLOSING,
+    types_7.ChannelState.CLOSED,
+    types_7.ChannelState.FORCE_CLOSED,
+    types_7.ChannelState.ERRORED
 ]);
 function canBecomeUsable(channel) {
     const st = channel.getFullState();
-    const effective = st.state === types_6.ChannelState.AWAITING_REESTABLISH && st.preReestablishState
+    const effective = st.state === types_7.ChannelState.AWAITING_REESTABLISH && st.preReestablishState
         ? st.preReestablishState
         : st.state;
     return !CLOSING_CHANNEL_STATES.has(effective) && !(0, channel_state_1.isRecencyUnproven)(st);
@@ -875,11 +887,11 @@ class BeignetNode extends events_1.EventEmitter {
         const beignetNetwork = this.toBeignetNetwork(networkName);
         const lnNetwork = this.toLnNetwork(networkName);
         const coinType = this.toCoinType(networkName);
-        let chainHash = types_6.BITCOIN_CHAIN_HASH;
+        let chainHash = types_7.BITCOIN_CHAIN_HASH;
         if (networkName === 'regtest')
-            chainHash = types_6.REGTEST_CHAIN_HASH;
+            chainHash = types_7.REGTEST_CHAIN_HASH;
         if (networkName === 'signet')
-            chainHash = types_6.SIGNET_CHAIN_HASH;
+            chainHash = types_7.SIGNET_CHAIN_HASH;
         const electrumServer = {
             host: electrumHost,
             ssl: electrumTls ? electrumPort : 0,
@@ -1216,22 +1228,7 @@ class BeignetNode extends events_1.EventEmitter {
         if (!sweepDestinationScript) {
             this.scheduleSweepAddressRefresh();
         }
-        this.node.on('node:error', (err) => {
-            if (opts.onError) {
-                opts.onError({
-                    code: err.code,
-                    message: err.message,
-                    timestamp: err.timestamp,
-                    channelId: err.channelId ? err.channelId.toString('hex') : undefined
-                });
-            }
-            this.emit('node:error', {
-                code: err.code,
-                message: err.message,
-                timestamp: err.timestamp,
-                channelId: err.channelId ? err.channelId.toString('hex') : undefined
-            });
-        });
+        this.wireNodeErrorRelay(opts.onError);
         this.node.on('payment:received', (info) => {
             const pi = this.toPaymentInfo(info);
             this.log('info', 'Payment received', {
@@ -1595,7 +1592,7 @@ class BeignetNode extends events_1.EventEmitter {
             const hex = channelId.toString('hex');
             this.emit('ffor:state', {
                 channelId: hex,
-                state: types_2.FforState[state] ?? String(state),
+                state: types_3.FforState[state] ?? String(state),
                 epoch: this.fforEpochView(hex, record)
             });
         });
@@ -3138,22 +3135,66 @@ class BeignetNode extends events_1.EventEmitter {
     }
     getPendingCloseBalanceSats() {
         const recovering = new Set([
-            types_6.ChannelState.FORCE_CLOSED,
-            types_6.ChannelState.SHUTTING_DOWN,
-            types_6.ChannelState.NEGOTIATING_CLOSING
+            types_7.ChannelState.FORCE_CLOSED,
+            types_7.ChannelState.SHUTTING_DOWN,
+            types_7.ChannelState.NEGOTIATING_CLOSING
         ]);
         let totalMsat = 0n;
         for (const ch of this.node.listChannels()) {
-            if (recovering.has(ch.state)) {
-                totalMsat += ch.localBalanceMsat;
+            if (!recovering.has(ch.state))
+                continue;
+            if (ch.state === types_7.ChannelState.FORCE_CLOSED &&
+                this.isForceCloseBalanceInWallet(ch.channelId)) {
+                continue;
             }
+            totalMsat += ch.localBalanceMsat;
         }
         return Number(totalMsat / 1000n);
     }
+    isForceCloseBalanceInWallet(channelId) {
+        const monitor = this.node.getChannelManager().getMonitor(channelId);
+        const broadcast = monitor?.getFullState().commitmentBroadcast;
+        if (!monitor || !broadcast)
+            return false;
+        let balanceOutputType;
+        switch (broadcast.commitmentType) {
+            case types_1.CommitmentType.OUR_COMMITMENT:
+                balanceOutputType = types_1.OutputType.TO_LOCAL;
+                break;
+            case types_1.CommitmentType.THEIR_CURRENT_COMMITMENT:
+            case types_1.CommitmentType.THEIR_REVOKED_COMMITMENT:
+            case types_1.CommitmentType.THEIR_FUTURE_COMMITMENT:
+                balanceOutputType = types_1.OutputType.TO_REMOTE;
+                break;
+            default:
+                return false;
+        }
+        const balanceOutput = monitor
+            .getTrackedOutputs()
+            .find((o) => o.txid === broadcast.txid &&
+            o.outputType === balanceOutputType &&
+            !o.isSecondLevelHtlc);
+        if (!balanceOutput)
+            return false;
+        let sweepTxid = balanceOutput.resolutionTxid;
+        if (!sweepTxid && balanceOutput.sweepTxHex) {
+            const bitcoin = require('bitcoinjs-lib');
+            try {
+                sweepTxid = bitcoin.Transaction.fromHex(balanceOutput.sweepTxHex).getId();
+            }
+            catch {
+                return false;
+            }
+        }
+        if (!sweepTxid)
+            return false;
+        const entry = this.wallet.transactions[sweepTxid];
+        return entry !== undefined && entry.exists !== false;
+    }
     getErroredBalanceSats() {
         let totalMsat = 0n;
         for (const ch of this.node.listChannels()) {
-            if (ch.state === types_6.ChannelState.ERRORED) {
+            if (ch.state === types_7.ChannelState.ERRORED) {
                 totalMsat += ch.localBalanceMsat;
             }
         }
@@ -3181,9 +3222,9 @@ class BeignetNode extends events_1.EventEmitter {
             return fresh;
         const bitcoin = require('bitcoinjs-lib');
         try {
-            const address = await this.wallet.getAddress({ index: '0' });
-            if (address) {
-                return bitcoin.address.toOutputScript(address, this.getBitcoinNetwork());
+            const change = await this.wallet.getChangeAddress();
+            if (change.isOk() && change.value?.address) {
+                return bitcoin.address.toOutputScript(change.value.address, this.getBitcoinNetwork());
             }
         }
         catch {
@@ -3195,7 +3236,7 @@ class BeignetNode extends events_1.EventEmitter {
         try {
             const res = await this.wallet.getNextAvailableAddress();
             if (res.isOk()) {
-                return bitcoin.address.toOutputScript(res.value.addressIndex.address, this.getBitcoinNetwork());
+                return bitcoin.address.toOutputScript(res.value.changeAddressIndex.address, this.getBitcoinNetwork());
             }
         }
         catch {
@@ -3796,7 +3837,7 @@ class BeignetNode extends events_1.EventEmitter {
         catch (err) {
             if (err instanceof errors_1.BeignetError)
                 throw err;
-            if (err instanceof types_5.InvalidRequestError) {
+            if (err instanceof types_6.InvalidRequestError) {
                 throw new errors_1.BeignetError(errors_1.BeignetErrorCode.INVALID_PARAMS, err.message);
             }
             throw new errors_1.BeignetError('CONNECT_FAILED', `Failed to connect to ${pubkey.slice(0, 16)}…@${target}: ${err.message}`);
@@ -3896,7 +3937,7 @@ class BeignetNode extends events_1.EventEmitter {
             localBalanceSats: Number(balances.localMsat / 1000n),
             remoteBalanceSats: Number(balances.remoteMsat / 1000n),
             capacitySats: Number(state.fundingSatoshis),
-            isAnchor: (0, types_6.isAnchorChannel)(state.channelType)
+            isAnchor: (0, types_7.isAnchorChannel)(state.channelType)
         };
     }
     async openChannelAndWait(pubkey, amountSats, opts) {
@@ -3989,9 +4030,9 @@ class BeignetNode extends events_1.EventEmitter {
             let state;
             if (f.role === 'S') {
                 state =
-                    f.slotStates[i] === types_2.FforSlotState.SETTLED
+                    f.slotStates[i] === types_3.FforSlotState.SETTLED
                         ? 'settled'
-                        : f.slotStates[i] === types_2.FforSlotState.SETTLING
+                        : f.slotStates[i] === types_3.FforSlotState.SETTLING
                             ? 'settling'
                             : 'unused';
             }
@@ -4019,7 +4060,7 @@ class BeignetNode extends events_1.EventEmitter {
         return {
             channelId: channelIdHex,
             role: f.role,
-            state: types_2.FforState[f.state],
+            state: types_3.FforState[f.state],
             epochId: f.epochId.toString('hex'),
             peerNodeId: f.remoteNodeId.toString('hex'),
             variant: f.params.variant,
@@ -4145,7 +4186,7 @@ class BeignetNode extends events_1.EventEmitter {
         const idBuf = this.fforChannelId(body.channelId);
         const res = this.node.abortFforEpoch(idBuf.toString('hex'), typeof body.reason === 'number'
             ? body.reason
-            : types_2.FforAbortReason.OPERATOR, body.text ?? 'operator abort');
+            : types_3.FforAbortReason.OPERATOR, body.text ?? 'operator abort');
         if (!res.ok)
             throw new errors_1.BeignetError('FFOR_REFUSED', res.error ?? 'abort refused');
         return this.fforEpoch(idBuf.toString('hex'));
@@ -4259,7 +4300,7 @@ class BeignetNode extends events_1.EventEmitter {
             destinationScript: this.fforDestinationScript()
         })
             .catch((err) => {
-            if (err instanceof types_5.InvalidRequestError) {
+            if (err instanceof types_6.InvalidRequestError) {
                 this.requireForceCloseAcknowledgement(idBuf, body.acceptStaleStateRisk === true);
                 throw new errors_1.BeignetError('INVALID_PARAMS', err.message);
             }
@@ -4285,8 +4326,8 @@ class BeignetNode extends events_1.EventEmitter {
             throw new errors_1.BeignetError(errors_1.BeignetErrorCode.NOT_FOUND, 'no FFOR epoch of ours on this channel');
         }
         const channelState = this.node.getChannel(idBuf)?.state;
-        const closedOnChain = channelState === types_6.ChannelState.FORCE_CLOSED ||
-            channelState === types_6.ChannelState.CLOSED;
+        const closedOnChain = channelState === types_7.ChannelState.FORCE_CLOSED ||
+            channelState === types_7.ChannelState.CLOSED;
         if (f.settledBitmap === null && !closedOnChain) {
             throw new errors_1.BeignetError('FFOR_REFUSED', 'no ff_close_ack yet: close the epoch first');
         }
@@ -4512,6 +4553,23 @@ class BeignetNode extends events_1.EventEmitter {
             issues
         };
     }
+    wireNodeErrorRelay(onError) {
+        this.node.on('node:error', (err) => {
+            const data = {
+                code: err.code,
+                message: err.message,
+                timestamp: err.timestamp,
+                channelId: err.channelId ? err.channelId.toString('hex') : undefined
+            };
+            if (err.txid !== undefined)
+                data.txid = err.txid;
+            if (err.retained !== undefined)
+                data.retained = err.retained;
+            if (onError)
+                onError(data);
+            this.emit('node:error', data);
+        });
+    }
     toChannelInfo(ch) {
         const peerPubkey = ch.peerPubkey ||
             this.node.getChannelManager().getPeerForChannel(ch.channelId) ||
@@ -4523,7 +4581,7 @@ class BeignetNode extends events_1.EventEmitter {
             localBalanceSats: Number(ch.localBalanceMsat / 1000n),
             remoteBalanceSats: Number(ch.remoteBalanceMsat / 1000n),
             capacitySats: Number(ch.fundingSatoshis),
-            isAnchor: (0, types_6.isAnchorChannel)(ch.channelType ?? null)
+            isAnchor: (0, types_7.isAnchorChannel)(ch.channelType ?? null)
         };
         if (peerPubkey) {
             const splice = this.node.peerSupportsSplicing(peerPubkey);
@@ -4544,6 +4602,10 @@ class BeignetNode extends events_1.EventEmitter {
             info.htlcCount = ch.htlcCount;
         if (ch.pendingSpliceLocalBalanceMsat !== undefined)
             info.pendingSpliceLocalBalanceSats = Number(ch.pendingSpliceLocalBalanceMsat / 1000n);
+        if (ch.pendingSpliceTxid !== undefined)
+            info.pendingSpliceTxid = ch.pendingSpliceTxid;
+        if (ch.previousFundingTxids && ch.previousFundingTxids.length > 0)
+            info.previousFundingTxids = [...ch.previousFundingTxids];
         if (ch.htlcUsable !== undefined)
             info.htlcUsable = ch.htlcUsable;
         if (ch.restoreRecencyUnproven)
@@ -4865,7 +4927,7 @@ class BeignetNode extends events_1.EventEmitter {
             trusted: policy.allowZeroConf === true,
             allowSplice: policy.allowSplice === true,
             allowUnpairedSplice: policy.allowUnpairedSplice === true,
-            unpairedSpliceDepth: policy.unpairedSpliceDepth ?? types_1.DF_DEFAULT_UNPAIRED_SPLICE_DEPTH,
+            unpairedSpliceDepth: policy.unpairedSpliceDepth ?? types_2.DF_DEFAULT_UNPAIRED_SPLICE_DEPTH,
             minAmountSat: clampDirectFundingMinimum(policy.minAmountSat ?? 0)
         };
     }
@@ -5476,13 +5538,13 @@ class BeignetNode extends events_1.EventEmitter {
     }
     _spendClaimOutcomeAtBoot(paymentHash, paymentHashHex) {
         const view = this.node.getOutgoingHtlcs(paymentHash);
-        if (view.preimage || view.status === types_5.PaymentStatus.COMPLETED) {
+        if (view.preimage || view.status === types_6.PaymentStatus.COMPLETED) {
             return 'settled';
         }
         try {
             const durable = this.storage.loadPayment(paymentHashHex);
-            if (durable?.direction === types_5.PaymentDirection.OUTGOING &&
-                (durable.status === types_5.PaymentStatus.COMPLETED ||
+            if (durable?.direction === types_6.PaymentDirection.OUTGOING &&
+                (durable.status === types_6.PaymentStatus.COMPLETED ||
                     durable.preimage !== undefined ||
                     this.storage.loadPreimage(paymentHashHex) !== null)) {
                 return 'settled';
@@ -5495,7 +5557,7 @@ class BeignetNode extends events_1.EventEmitter {
             });
             return 'live';
         }
-        if (view.status === types_5.PaymentStatus.PENDING ||
+        if (view.status === types_6.PaymentStatus.PENDING ||
             this.node.hasHtlcInFlight(paymentHash)) {
             return 'live';
         }
@@ -5885,7 +5947,7 @@ class BeignetNode extends events_1.EventEmitter {
             catch {
             }
             if (hashHex !== 'unknown') {
-                const existing = this.getPayment(hashHex) ?? this.durablePaymentFor(err, hashHex);
+                const existing = this.livePayment(hashHex) ?? this.durablePaymentFor(err, hashHex);
                 if (existing)
                     return existing;
             }
@@ -5917,7 +5979,7 @@ class BeignetNode extends events_1.EventEmitter {
                     throw err;
                 lastError = err;
                 if (!(0, errors_1.isRetryableError)(err)) {
-                    const pi = this.getPayment(paymentHashHex) ??
+                    const pi = this.livePayment(paymentHashHex) ??
                         this.durablePaymentFor(err, paymentHashHex);
                     if (pi)
                         return { ...pi, attempts: attempt };
@@ -5950,7 +6012,7 @@ class BeignetNode extends events_1.EventEmitter {
                 });
                 await new Promise((resolve) => setTimeout(resolve, delayMs));
                 if (this._draining) {
-                    const pi = this.getPayment(paymentHashHex);
+                    const pi = this.livePayment(paymentHashHex);
                     if (pi)
                         return { ...pi, attempts: attempt };
                     return {
@@ -5969,7 +6031,7 @@ class BeignetNode extends events_1.EventEmitter {
                     const amountSats = Number(decoded.amountMsat / 1000n);
                     const check = this.canSend(amountSats);
                     if (!check.canSend) {
-                        const pi = this.getPayment(paymentHashHex);
+                        const pi = this.livePayment(paymentHashHex);
                         if (pi)
                             return { ...pi, attempts: attempt };
                         return {
@@ -5985,7 +6047,7 @@ class BeignetNode extends events_1.EventEmitter {
                 }
             }
         }
-        const pi = this.getPayment(paymentHashHex);
+        const pi = this.livePayment(paymentHashHex);
         if (pi)
             return { ...pi, attempts: maxRetries + 1 };
         return {
@@ -6118,7 +6180,7 @@ class BeignetNode extends events_1.EventEmitter {
         }
     }
     listPayments(filter) {
-        let payments = this.node.listPayments().map((p) => this.toPaymentInfo(p));
+        let payments = this.paymentRecords().map((p) => this.toPaymentInfo(p));
         payments.sort((a, b) => b.createdAt - a.createdAt);
         if (filter) {
             if (filter.status) {
@@ -6148,10 +6210,25 @@ class BeignetNode extends events_1.EventEmitter {
         return payments;
     }
     getPayment(paymentHash) {
+        const live = this.livePayment(paymentHash);
+        if (live)
+            return live;
+        const durable = this.storage.loadPayment(paymentHash);
+        return durable ? this.toPaymentInfo(durable) : null;
+    }
+    livePayment(paymentHash) {
         const p = this.node.getPayment(Buffer.from(paymentHash, 'hex'));
-        if (!p)
-            return null;
-        return this.toPaymentInfo(p);
+        return p ? this.toPaymentInfo(p) : null;
+    }
+    paymentRecords() {
+        const byHash = new Map();
+        for (const { paymentHash, payment } of this.storage.loadAllPayments()) {
+            byHash.set(paymentHash, payment);
+        }
+        for (const p of this.node.listPayments()) {
+            byHash.set(p.paymentHash.toString('hex'), p);
+        }
+        return [...byHash.values()];
     }
     durablePaymentFor(err, hashHex) {
         if (!(err instanceof errors_1.BeignetError) ||
@@ -6374,14 +6451,15 @@ class BeignetNode extends events_1.EventEmitter {
             info.feeSats = Number(p.route.totalFeeMsat / 1000n);
         }
         if (p.route) {
+            const hops = p.route.hops;
             info.route = {
-                hops: p.route.hops.map((h) => ({
+                hops: hops.map((h, i) => ({
                     pubkey: h.pubkey.toString('hex'),
                     shortChannelId: h.shortChannelId.toString('hex'),
-                    feeMsat: h.feeBaseMsat
+                    feeMsat: hopFeeMsat(hops, i)
                 })),
                 totalFeeMsat: Number(p.route.totalFeeMsat),
-                hopCount: p.route.hops.length
+                hopCount: hops.length
             };
         }
         if (p.metadata)
@@ -6442,7 +6520,7 @@ class BeignetNode extends events_1.EventEmitter {
             localBalanceSats: Number(balances.localMsat / 1000n),
             remoteBalanceSats: Number(balances.remoteMsat / 1000n),
             capacitySats: amountSats,
-            isAnchor: (0, types_6.isAnchorChannel)(state.channelType)
+            isAnchor: (0, types_7.isAnchorChannel)(state.channelType)
         };
     }
     openChannelV2(peerPubkey, params) {
@@ -6491,7 +6569,7 @@ class BeignetNode extends events_1.EventEmitter {
             localBalanceSats: Number(balances.localMsat / 1000n),
             remoteBalanceSats: Number(balances.remoteMsat / 1000n),
             capacitySats: params.amountSats,
-            isAnchor: (0, types_6.isAnchorChannel)(state.channelType)
+            isAnchor: (0, types_7.isAnchorChannel)(state.channelType)
         };
     }
     spliceQuote(channelId, direction, feeratePerkw) {
@@ -6660,6 +6738,37 @@ class BeignetNode extends events_1.EventEmitter {
         const inv = this.node.getInvoice(paymentHash);
         if (!inv)
             return null;
+        const live = this.node.getPayment(Buffer.from(inv.paymentHash, 'hex'));
+        const paid = live
+            ? settlesInvoice(live)
+            : settlesInvoice(this.storage.loadPayment(inv.paymentHash));
+        return this.toInvoiceInfo(inv, paid);
+    }
+    listInvoices() {
+        let durablePaid;
+        return this.node.listInvoices().map((inv) => {
+            const live = this.node.getPayment(Buffer.from(inv.paymentHash, 'hex'));
+            let paid;
+            if (live) {
+                paid = settlesInvoice(live);
+            }
+            else {
+                if (!durablePaid)
+                    durablePaid = this.durablePaidHashes();
+                paid = durablePaid.has(inv.paymentHash);
+            }
+            return this.toInvoiceInfo(inv, paid);
+        });
+    }
+    durablePaidHashes() {
+        const paid = new Set();
+        for (const { paymentHash, payment } of this.storage.loadAllPayments()) {
+            if (settlesInvoice(payment))
+                paid.add(paymentHash);
+        }
+        return paid;
+    }
+    toInvoiceInfo(inv, paid) {
         const info = {
             bolt11: inv.bolt11,
             paymentHash: inv.paymentHash
@@ -6673,10 +6782,7 @@ class BeignetNode extends events_1.EventEmitter {
             info.expiry = inv.expiry;
         if (inv.createdAt !== undefined)
             info.createdAt = inv.createdAt;
-        const payment = this.node.getPayment(Buffer.from(inv.paymentHash, 'hex'));
-        if (payment &&
-            payment.status === 'COMPLETED' &&
-            payment.direction === 'INCOMING') {
+        if (paid) {
             info.status = 'PAID';
         }
         else if (inv.createdAt !== undefined &&
@@ -6689,50 +6795,18 @@ class BeignetNode extends events_1.EventEmitter {
         }
         return info;
     }
-    listInvoices() {
-        return this.node.listInvoices().map((inv) => {
-            const info = {
-                bolt11: inv.bolt11,
-                paymentHash: inv.paymentHash
-            };
-            if (inv.amountMsat !== undefined) {
-                info.amountSats = Number(inv.amountMsat / 1000n);
-            }
-            if (inv.description)
-                info.description = inv.description;
-            if (inv.expiry !== undefined)
-                info.expiry = inv.expiry;
-            if (inv.createdAt !== undefined)
-                info.createdAt = inv.createdAt;
-            const payment = this.node.getPayment(Buffer.from(inv.paymentHash, 'hex'));
-            if (payment &&
-                payment.status === 'COMPLETED' &&
-                payment.direction === 'INCOMING') {
-                info.status = 'PAID';
-            }
-            else if (inv.createdAt !== undefined &&
-                inv.expiry !== undefined &&
-                Date.now() / 1000 > inv.createdAt + inv.expiry) {
-                info.status = 'EXPIRED';
-            }
-            else {
-                info.status = 'PENDING';
-            }
-            return info;
-        });
-    }
     getHealth() {
         const blockHeight = this.node.getCurrentBlockHeight();
         const electrumConnected = this.wallet?.electrum?.connectedToElectrum ?? false;
         const channels = this.node.listChannels();
-        const readyChannels = channels.filter((ch) => ch.state === types_6.ChannelState.NORMAL && !isHeldRestore(ch));
+        const readyChannels = channels.filter((ch) => ch.state === types_7.ChannelState.NORMAL && !isHeldRestore(ch));
         const peerCount = this.node.listPeers().length;
         const graph = this.node.getGraph();
-        const operating = channels.filter((ch) => (ch.state === types_6.ChannelState.NORMAL ||
-            ch.state === types_6.ChannelState.SPLICING) &&
+        const operating = channels.filter((ch) => (ch.state === types_7.ChannelState.NORMAL ||
+            ch.state === types_7.ChannelState.SPLICING) &&
             !isHeldRestore(ch));
-        const broken = channels.filter((ch) => ch.state === types_6.ChannelState.AWAITING_REESTABLISH ||
-            ch.state === types_6.ChannelState.ERRORED);
+        const broken = channels.filter((ch) => ch.state === types_7.ChannelState.AWAITING_REESTABLISH ||
+            ch.state === types_7.ChannelState.ERRORED);
         let status = 'ready';
         if (!electrumConnected) {
             status = 'degraded';
@@ -6792,7 +6866,7 @@ class BeignetNode extends events_1.EventEmitter {
                 ? 'Networking and auto-reconnect enabled'
                 : 'Networking disabled — node cannot reconnect to peers'
         });
-        const hasAnchor = channels.some((ch) => ch.channelType != null && (0, types_6.isAnchorChannel)(ch.channelType));
+        const hasAnchor = channels.some((ch) => ch.channelType != null && (0, types_7.isAnchorChannel)(ch.channelType));
         checks.push({
             name: 'ANCHOR_CHANNELS_PREFERRED',
             status: hasAnchor || channels.length === 0 ? 'PASS' : 'WARN',
@@ -6963,7 +7037,7 @@ class BeignetNode extends events_1.EventEmitter {
         for (const ch of this.node.listChannels()) {
             if (isHeldRestore(ch))
                 continue;
-            if (ch.state !== types_6.ChannelState.NORMAL && !ch.htlcUsable)
+            if (ch.state !== types_7.ChannelState.NORMAL && !ch.htlcUsable)
                 continue;
             const chReserveMsat = ch.localReserveMsat ?? 0n;
             reserveMsat += chReserveMsat;
@@ -7174,7 +7248,7 @@ class BeignetNode extends events_1.EventEmitter {
             feeProportionalMillionths: update.feeProportionalMillionths,
             cltvExpiryDelta: update.cltvExpiryDelta,
             htlcMinimumMsat: update.htlcMinimumMsat.toString(),
-            disabled: (update.channelFlags & types_3.CHANNEL_FLAG_DISABLED) !== 0,
+            disabled: (update.channelFlags & types_4.CHANNEL_FLAG_DISABLED) !== 0,
             lastUpdate: update.timestamp
         };
         if (update.htlcMaximumMsat !== undefined) {
@@ -7193,7 +7267,7 @@ class BeignetNode extends events_1.EventEmitter {
             requireNonNegativeSafeInteger(maxFeeSats, 'maxFeeSats');
         }
         const amountMsat = BigInt(amountSats) * 1000n;
-        const route = this.node.queryRoute(Buffer.from(destination, 'hex'), amountMsat, types_4.DEFAULT_MIN_FINAL_CLTV_EXPIRY);
+        const route = this.node.queryRoute(Buffer.from(destination, 'hex'), amountMsat, types_5.DEFAULT_MIN_FINAL_CLTV_EXPIRY);
         if (!route) {
             throw new errors_1.BeignetError(errors_1.BeignetErrorCode.NO_ROUTE, 'No route found to destination');
         }
@@ -7208,7 +7282,7 @@ class BeignetNode extends events_1.EventEmitter {
             totalAmountMsat: route.totalAmountMsat.toString(),
             totalFeeMsat: route.totalFeeMsat.toString(),
             totalCltvDelta: route.totalCltvDelta,
-            finalCltvExpiry: types_4.DEFAULT_MIN_FINAL_CLTV_EXPIRY
+            finalCltvExpiry: types_5.DEFAULT_MIN_FINAL_CLTV_EXPIRY
         };
     }
     sendToRoute(paymentHash, route, paymentSecret) {
@@ -7251,7 +7325,7 @@ class BeignetNode extends events_1.EventEmitter {
                 : 'PAYMENT_FAILED';
             throw new errors_1.BeignetError(code, err instanceof Error ? err.message : String(err));
         }
-        if (claim && payment.status === types_5.PaymentStatus.FAILED) {
+        if (claim && payment.status === types_6.PaymentStatus.FAILED) {
             this._releaseAsyncSpendClaim(claim);
         }
         return this.toPaymentInfo(payment);
@@ -7259,7 +7333,7 @@ class BeignetNode extends events_1.EventEmitter {
     getReadyChannels() {
         return this.node
             .listChannels()
-            .filter((ch) => ch.state === types_6.ChannelState.NORMAL && !isHeldRestore(ch))
+            .filter((ch) => ch.state === types_7.ChannelState.NORMAL && !isHeldRestore(ch))
             .map((ch) => this.toChannelInfo(ch));
     }
     canSend(amountSats) {
@@ -7268,7 +7342,7 @@ class BeignetNode extends events_1.EventEmitter {
         let bestAvailableMsat = 0n;
         let totalAvailableMsat = 0n;
         for (const ch of this.node.listChannels()) {
-            if (ch.state !== types_6.ChannelState.NORMAL || isHeldRestore(ch))
+            if (ch.state !== types_7.ChannelState.NORMAL || isHeldRestore(ch))
                 continue;
             const reserveMsat = ch.localReserveMsat ?? 0n;
             const available = ch.localBalanceMsat > reserveMsat
@@ -7292,7 +7366,7 @@ class BeignetNode extends events_1.EventEmitter {
         let bestAvailableMsat = 0n;
         let totalAvailableMsat = 0n;
         for (const ch of this.node.listChannels()) {
-            if (ch.state !== types_6.ChannelState.NORMAL || isHeldRestore(ch))
+            if (ch.state !== types_7.ChannelState.NORMAL || isHeldRestore(ch))
                 continue;
             const reserveMsat = ch.remoteReserveMsat ?? 0n;
             const available = ch.remoteBalanceMsat > reserveMsat
@@ -7333,12 +7407,12 @@ class BeignetNode extends events_1.EventEmitter {
         }
         const hashHex = paymentHash.toString('hex');
         const view = await this.node.awaitPaymentResolution(paymentHash);
-        if (view.preimage || view.status === types_5.PaymentStatus.COMPLETED) {
+        if (view.preimage || view.status === types_6.PaymentStatus.COMPLETED) {
             return { status: 'completed', paymentHash: hashHex };
         }
         const durable = this.storage.loadPayment(hashHex);
-        if (durable?.direction === types_5.PaymentDirection.OUTGOING &&
-            (durable.status === types_5.PaymentStatus.COMPLETED ||
+        if (durable?.direction === types_6.PaymentDirection.OUTGOING &&
+            (durable.status === types_6.PaymentStatus.COMPLETED ||
                 durable.preimage !== undefined)) {
             return { status: 'completed', paymentHash: hashHex };
         }
@@ -7923,15 +7997,15 @@ class BeignetNode extends events_1.EventEmitter {
     toLnNetwork(network) {
         switch (network) {
             case 'mainnet':
-                return types_4.Network.MAINNET;
+                return types_5.Network.MAINNET;
             case 'testnet':
-                return types_4.Network.TESTNET;
+                return types_5.Network.TESTNET;
             case 'regtest':
-                return types_4.Network.REGTEST;
+                return types_5.Network.REGTEST;
             case 'signet':
-                return types_4.Network.SIGNET;
+                return types_5.Network.SIGNET;
             default:
-                return types_4.Network.MAINNET;
+                return types_5.Network.MAINNET;
         }
     }
     toCoinType(network) {