beignet 0.38.0 → 0.38.1

package/dist/lightning/node/lightning-node.js

@@ -22248,32 +22248,71 @@ class LightningNode extends typed_emitter_1.TypedEmitter {
             if (!destination)
                 return null;
             const sourceBuf = Buffer.from(this.nodeId, 'hex');
+            const finalCltvExpiry = decoded.minFinalCltvExpiry || types_5.DEFAULT_MIN_FINAL_CLTV_EXPIRY;
+            const localChannels = this.getLocalChannelEdges();
             // Try to find a route
-            const route = (0, pathfinding_1.findRoute)(this.graph, sourceBuf, destination, amountMsat, decoded.minFinalCltvExpiry || types_5.DEFAULT_MIN_FINAL_CLTV_EXPIRY, 20, // maxHops
+            let route = (0, pathfinding_1.findRoute)(this.graph, sourceBuf, destination, amountMsat, finalCltvExpiry, 20, // maxHops
             undefined, // excludedChannels
             this.missionControl, undefined, // maxCltvExpiry
             decoded.routingHints, undefined, // currentTimestamp
-            this.getLocalChannelEdges());
-            if (!route)
-                return null;
-            // Calculate success probability from MissionControl penalties
+            localChannels);
+            // As sendPayment judges it: a single route whose outgoing channel
+            // cannot carry the total would only die in addHtlc, so the payment
+            // splits instead, and the estimate prices what the payment would do.
+            if (route) {
+                const firstHopChannel = this.firstHopChannelFor(route);
+                if (firstHopChannel &&
+                    firstHopChannel.getSpendableOutboundMsat() < route.totalAmountMsat) {
+                    route = null;
+                }
+            }
+            // The paths priced: the one route, or the parts a multi-path payment
+            // takes when no single path carries the amount and the payee takes
+            // parts (basic_mpp with a payment secret, BOLT 4), exactly the
+            // fallback sendPayment makes. An estimate that stopped at the single
+            // path refused, as "no route", a payment the engine would have split
+            // across two channels (coreyphillips/beignet#1924).
+            let parts;
+            let totalFeeMsat;
+            let split = false;
+            if (route) {
+                parts = [route];
+                totalFeeMsat = route.totalFeeMsat;
+            }
+            else {
+                if (!decoded.paymentSecret ||
+                    !decoded.featureBits?.hasFeature(flags_1.Feature.BASIC_MPP))
+                    return null;
+                const multiRoute = (0, pathfinding_1.findMultiPathRoute)(this.graph, sourceBuf, destination, amountMsat, finalCltvExpiry, undefined, undefined, this.missionControl, decoded.routingHints, undefined, // currentTimestamp
+                localChannels);
+                if (!multiRoute)
+                    return null;
+                parts = multiRoute.parts;
+                totalFeeMsat = multiRoute.totalFeeMsat;
+                split = true;
+            }
+            // Calculate success probability from MissionControl penalties: every
+            // hop of every part has to succeed, each judged at its part's amount.
             let successProbability = 1.0;
-            for (const hop of route.hops) {
-                const scidHex = hop.shortChannelId.toString('hex');
-                const penalty = this.missionControl.getPenalty(scidHex, amountMsat);
-                // Higher penalty = lower success probability
-                // MissionControl penalties are in msat, normalize to a probability
-                const hopProb = penalty > 0n
-                    ? Math.max(0.1, 1.0 - Number(penalty) / 1000000)
-                    : 0.95;
-                successProbability *= hopProb;
+            for (const part of parts) {
+                for (const hop of part.hops) {
+                    const scidHex = hop.shortChannelId.toString('hex');
+                    const penalty = this.missionControl.getPenalty(scidHex, part.totalAmountMsat);
+                    // Higher penalty = lower success probability
+                    // MissionControl penalties are in msat, normalize to a probability
+                    const hopProb = penalty > 0n
+                        ? Math.max(0.1, 1.0 - Number(penalty) / 1000000)
+                        : 0.95;
+                    successProbability *= hopProb;
+                }
             }
             const successPct = Math.round(successProbability * 100);
-            const hopCount = route.hops.length;
+            // The parts fly together, so the longest part sets the hop count.
+            const hopCount = Math.max(...parts.map((part) => part.hops.length));
             // Rounded UP, like estimateRouteFee: maxFeeSats is whole sats checked
             // against the route in msat, so a cap equal to a floored quote refused
             // the very route it priced (issue #998).
-            const feeSats = Number((route.totalFeeMsat + 999n) / 1000n);
+            const feeSats = Number((totalFeeMsat + 999n) / 1000n);
             // Route quality based on hop count and probability
             let routeQuality = 'HIGH';
             if (hopCount > 4 || successPct < 50)
@@ -22282,15 +22321,17 @@ class LightningNode extends typed_emitter_1.TypedEmitter {
                 routeQuality = 'MEDIUM';
             // Estimated time: ~2s per hop for HTLC settlement
             const estimatedTimeMs = hopCount * 2000;
-            // Check if alternative routes exist (MPP)
-            let alternativeAvailable = false;
-            try {
-                const altRoute = (0, pathfinding_1.findMultiPathRoute)(this.graph, sourceBuf, destination, amountMsat, decoded.minFinalCltvExpiry || types_5.DEFAULT_MIN_FINAL_CLTV_EXPIRY, undefined, undefined, this.missionControl, decoded.routingHints, undefined, // currentTimestamp
-                this.getLocalChannelEdges());
-                alternativeAvailable = altRoute !== null && altRoute.parts.length > 1;
-            }
-            catch {
-                // No alternative route
+            // Check if alternative routes exist (MPP): a split is one already.
+            let alternativeAvailable = split;
+            if (!split) {
+                try {
+                    const altRoute = (0, pathfinding_1.findMultiPathRoute)(this.graph, sourceBuf, destination, amountMsat, finalCltvExpiry, undefined, undefined, this.missionControl, decoded.routingHints, undefined, // currentTimestamp
+                    localChannels);
+                    alternativeAvailable = altRoute !== null && altRoute.parts.length > 1;
+                }
+                catch {
+                    // No alternative route
+                }
             }
             // Warnings
             let warning;
@@ -22310,7 +22351,7 @@ class LightningNode extends typed_emitter_1.TypedEmitter {
                 warning,
                 alternativeAvailable,
                 estimatedFeeSats: feeSats,
-                estimatedFeeMsat: route.totalFeeMsat,
+                estimatedFeeMsat: totalFeeMsat,
                 hopCount
             };
         }