beignet 0.9.1 → 0.9.2

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.jsonToRouteHops = exports.routeHopsToJson = exports.decodeOfferInput = exports.decodeInvoiceInput = exports.parseScid = exports.formatScid = exports.defaultDataDirForMnemonic = exports.parseRecoveryMode = void 0;
+exports.BeignetNode = exports.jsonToRouteHops = exports.routeHopsToJson = exports.decodeOfferInput = exports.decodeInvoiceInput = exports.parseScid = exports.formatScid = exports.gossipPrimeLatch = exports.defaultDataDirForMnemonic = exports.parseRecoveryMode = void 0;
 const path = __importStar(require("path"));
 const fs = __importStar(require("fs"));
 const net = __importStar(require("net"));
@@ -85,6 +85,18 @@ function defaultDataDirForMnemonic(mnemonic, baseDir = DEFAULT_DATA_DIR) {
     return path.join(baseDir, walletTag);
 }
 exports.defaultDataDirForMnemonic = defaultDataDirForMnemonic;
+function gossipPrimeLatch(rgs, timeoutMs) {
+    return new Promise((resolve) => {
+        const timer = setTimeout(resolve, timeoutMs);
+        timer.unref?.();
+        const settle = () => {
+            clearTimeout(timer);
+            resolve();
+        };
+        rgs.then(settle, settle);
+    });
+}
+exports.gossipPrimeLatch = gossipPrimeLatch;
 function formatScid(scid) {
     const { block, txIndex, outputIndex } = (0, types_1.decodeShortChannelId)(scid);
     return `${block}x${txIndex}x${outputIndex}`;
@@ -219,6 +231,9 @@ class BeignetNode extends events_1.EventEmitter {
         this.logLevel = 'info';
         this.autoGossipSync = true;
         this.rapidGossipSync = true;
+        this._initialGossipPrime = null;
+        this._releaseBootRgs = null;
+        this._deferredGossipSyncs = new Set();
         this.electrumServerCount = 1;
         this._failoverInProgress = false;
         this._connectTimeoutMs = 15000;
@@ -266,7 +281,13 @@ class BeignetNode extends events_1.EventEmitter {
         if (!opts.allowMultipleInstances) {
             const lockPath = path.join(this.dataDir, `${networkName}.lock`);
             try {
-                (0, instance_lock_1.acquireInstanceLock)(lockPath);
+                (0, instance_lock_1.acquireInstanceLock)(lockPath, {
+                    reclaimForeignHost: true,
+                    onReclaim: (holder, reason) => {
+                        this.log('warn', `[beignet] Reclaimed stale instance lock (pid ${holder.pid} on ` +
+                            `${holder.hostname}, ${reason}) at ${lockPath}`);
+                    }
+                });
             }
             catch (e) {
                 if (e instanceof instance_lock_1.InstanceLockError) {
@@ -439,6 +460,14 @@ class BeignetNode extends events_1.EventEmitter {
                 }
             });
         }
+        if (this.rapidGossipSync && this.networkName === 'mainnet') {
+            const settled = new Promise((resolve) => {
+                this._releaseBootRgs = resolve;
+            });
+            this._initialGossipPrime = gossipPrimeLatch(settled, BeignetNode.INITIAL_GOSSIP_PRIME_TIMEOUT_MS).then(() => {
+                this._initialGossipPrime = null;
+            });
+        }
         this.node = lightning_node_1.LightningNode.fromMnemonic(this.mnemonic, {
             coinType,
             network: lnNetwork,
@@ -447,6 +476,7 @@ class BeignetNode extends events_1.EventEmitter {
             autoReconnect: opts.autoReconnect ?? true,
             autoUpdateChannelFees: opts.autoUpdateChannelFees ?? false,
             forwardingEnabled: opts.forwardingEnabled ?? true,
+            eagerGossipVerify: opts.eagerGossipVerify ?? false,
             localFeatures: lightning_node_1.LightningNode.defaultFeatures(),
             chainHashes: [chainHash],
             alias: opts.alias,
@@ -630,14 +660,25 @@ class BeignetNode extends events_1.EventEmitter {
         this.node.on('peer:connect', (pubkey) => {
             this.log('debug', 'Peer connected', { pubkey });
             if (this.autoGossipSync) {
-                try {
-                    this.node.initiateGossipSync(pubkey);
+                const prime = this._initialGossipPrime;
+                if (prime) {
+                    if (!this._deferredGossipSyncs.has(pubkey)) {
+                        this._deferredGossipSyncs.add(pubkey);
+                        void prime.then(() => {
+                            this._deferredGossipSyncs.delete(pubkey);
+                            if (this.destroyed)
+                                return;
+                            const stillConnected = this.node
+                                .listPeers()
+                                .some((p) => p.pubkey === pubkey);
+                            if (!stillConnected)
+                                return;
+                            this.startGossipSync(pubkey);
+                        });
+                    }
                 }
-                catch (err) {
-                    this.log('warn', 'Gossip sync failed to start', {
-                        pubkey,
-                        error: err instanceof Error ? err.message : String(err)
-                    });
+                else {
+                    this.startGossipSync(pubkey);
                 }
             }
             this.emit('peer:connect', { pubkey });
@@ -729,11 +770,15 @@ class BeignetNode extends events_1.EventEmitter {
             });
         }
         if (this.rapidGossipSync && this.networkName === 'mainnet') {
-            this.syncRapidGossip().catch((err) => {
+            const rgs = this.syncRapidGossip().catch((err) => {
                 this.log('warn', 'Rapid gossip sync failed', {
                     error: err instanceof Error ? err.message : String(err)
                 });
             });
+            const release = this._releaseBootRgs;
+            if (release) {
+                void rgs.then(release);
+            }
         }
         if (this.sweepDestinationScript) {
             this.runFallbackRecoveryWhenConnected();
@@ -1704,6 +1749,17 @@ class BeignetNode extends events_1.EventEmitter {
             state: p.state
         }));
     }
+    startGossipSync(pubkey) {
+        try {
+            this.node.initiateGossipSync(pubkey);
+        }
+        catch (err) {
+            this.log('warn', 'Gossip sync failed to start', {
+                pubkey,
+                error: err instanceof Error ? err.message : String(err)
+            });
+        }
+    }
     syncGossip(pubkey) {
         const peers = pubkey
             ? [pubkey]
@@ -1810,8 +1866,7 @@ class BeignetNode extends events_1.EventEmitter {
             openedCount++;
             const promise = (async () => {
                 try {
-                    const graphNode = graph.getNode(Buffer.from(suggestion.nodeId, 'hex'));
-                    const addrs = graphNode?.announcement?.addresses;
+                    const addrs = graph.getVerifiedNodeAnnouncement(Buffer.from(suggestion.nodeId, 'hex'))?.addresses;
                     if (addrs && addrs.length > 0) {
                         const addr = addrs.find((a) => a.type === 1 || a.type === 2) || addrs[0];
                         try {
@@ -4083,4 +4138,5 @@ class BeignetNode extends events_1.EventEmitter {
     }
 }
 exports.BeignetNode = BeignetNode;
+BeignetNode.INITIAL_GOSSIP_PRIME_TIMEOUT_MS = 90000;
 //# sourceMappingURL=beignet-node.js.map