beignet 0.27.0 → 0.29.0

package/dist/cli/beignet-node.js

@@ -722,6 +722,7 @@ class BeignetNode extends events_1.EventEmitter {
         this.rapidGossipSync = true;
         this._initialGossipPrime = null;
         this._releaseBootRgs = null;
+        this._rapidGossipSync = null;
         this._deferredGossipSyncs = new Set();
         this.electrumServerCount = 1;
         this._failoverInProgress = false;
@@ -916,7 +917,7 @@ class BeignetNode extends events_1.EventEmitter {
         }
         let encryptionKey;
         if (opts.storageEncryption ?? true) {
-            encryptionKey = (0, encryption_1.deriveStorageKey)(bip39.mnemonicToSeedSync(this.mnemonic));
+            encryptionKey = (0, encryption_1.deriveStorageKey)(this.walletSeed());
         }
         this._storageEncryptionKey = encryptionKey;
         this.finishStagedCapsuleRestore(dbPath);
@@ -977,6 +978,7 @@ class BeignetNode extends events_1.EventEmitter {
         };
         const walletResult = await wallet_1.Wallet.create({
             mnemonic: this.mnemonic,
+            seed: this.walletSeed(),
             network: beignetNetwork,
             disableRefreshOnCreate: true,
             ...(opts.addressType
@@ -1092,8 +1094,10 @@ class BeignetNode extends events_1.EventEmitter {
             });
         }
         this._nodeStorageView = (0, node_storage_view_1.nodeStorageView)(this.storage);
+        const constructStarted = Date.now();
         this.node = lightning_node_1.LightningNode.fromMnemonic(this.mnemonic, {
             coinType,
+            seed: this.walletSeed(),
             network: lnNetwork,
             storage: this._nodeStorageView,
             newChannelsRefused: () => this.newChannelRefusal(),
@@ -1262,6 +1266,7 @@ class BeignetNode extends events_1.EventEmitter {
                     : {}
             },
             eagerGossipVerify: opts.eagerGossipVerify ?? false,
+            cooperativeGraphRestore: opts.deferGraphRestore === true,
             localFeatures: lightning_node_1.LightningNode.defaultFeatures(),
             chainHashes: [chainHash],
             alias: opts.alias,
@@ -1306,6 +1311,12 @@ class BeignetNode extends events_1.EventEmitter {
             watchtowers: opts.watchtowers,
             recovery: this.recoveryNodeConfig
         });
+        this._nodeConstructMs = Date.now() - constructStarted;
+        this.node.on('graph:restored', () => {
+            const stats = this.getGraphRestoreStats();
+            if (stats)
+                this.emit('graph:restored', stats);
+        });
         this.fforReceiveService = new ffor_receive_1.FforReceiveService(this, opts.fforSettle, opts.fforReceiveFunding, opts.fforSettleConcurrent !== false);
         const receiveKey = 'automatic_receive_jobs_v1';
         const receiveJobs = this.storage.loadWalletData(receiveKey);
@@ -1783,6 +1794,10 @@ class BeignetNode extends events_1.EventEmitter {
         }
         if (this.rapidGossipSync && this.networkName === 'mainnet') {
             const rgs = this.syncRapidGossip().catch((err) => {
+                if (err instanceof rapid_sync_1.RapidGossipCancelledError && this.destroyed) {
+                    this.log('debug', 'Rapid gossip sync cancelled by shutdown', {});
+                    return;
+                }
                 this.log('warn', 'Rapid gossip sync failed', {
                     error: err instanceof Error ? err.message : String(err)
                 });
@@ -3092,10 +3107,19 @@ class BeignetNode extends events_1.EventEmitter {
     }
     nodeSecret() {
         if (!this._nodeSecret) {
-            this._nodeSecret = (0, wallet_keys_1.deriveLightningKeysFromMnemonic)(this.mnemonic, undefined, this.toCoinType(this.networkName)).nodePrivateKey;
+            if (!bip39.validateMnemonic(this.mnemonic)) {
+                throw new Error('Invalid BIP39 mnemonic');
+            }
+            this._nodeSecret = (0, wallet_keys_1.deriveLightningKeysFromSeed)(this.walletSeed(), this.toCoinType(this.networkName)).nodePrivateKey;
         }
         return this._nodeSecret;
     }
+    walletSeed() {
+        if (!this._walletSeed) {
+            this._walletSeed = bip39.mnemonicToSeedSync(this.mnemonic);
+        }
+        return Buffer.from(this._walletSeed);
+    }
     async restoreFromGuardians() {
         if (this._restoreInFlight) {
             throw new errors_1.BeignetError('RESTORE_IN_PROGRESS', 'A guardian restore is already running; watch ' +
@@ -4192,24 +4216,62 @@ class BeignetNode extends events_1.EventEmitter {
             this._lastGraphSyncAt = Date.now();
         return synced;
     }
-    async syncRapidGossip() {
+    syncRapidGossip() {
+        if (this._rapidGossipSync)
+            return this._rapidGossipSync;
+        const run = this.runRapidGossipSync();
+        this._rapidGossipSync = run;
+        const clear = () => {
+            if (this._rapidGossipSync === run)
+                this._rapidGossipSync = null;
+        };
+        void run.then(clear, clear);
+        return run;
+    }
+    async runRapidGossipSync() {
         if (this.networkName !== 'mainnet') {
             this.log('warn', 'Rapid gossip sync is only available on mainnet', {});
             return null;
         }
         const url = this.rapidGossipSyncUrl ?? rapid_sync_1.DEFAULT_RGS_URL;
         this.log('info', 'Rapid gossip sync: downloading snapshot', { url });
+        const downloadStart = Date.now();
         const data = await (0, rapid_sync_1.fetchRapidGossipSnapshot)(url);
-        const result = this.node.loadRapidGossipSnapshot(data);
+        const downloadMs = Date.now() - downloadStart;
+        if (this.destroyed)
+            throw new rapid_sync_1.RapidGossipCancelledError();
+        if (this.isGraphRestoring())
+            await this.whenGraphRestored();
+        if (this.destroyed)
+            throw new rapid_sync_1.RapidGossipCancelledError();
+        let slices = 0;
+        let busyMs = 0;
+        const applyStart = Date.now();
+        const result = await this.node.loadRapidGossipSnapshotAsync(data, {
+            cancelled: () => this.destroyed,
+            onSlice: (ms) => {
+                slices++;
+                busyMs += ms;
+            }
+        });
+        const applyMs = Date.now() - applyStart;
         this._lastGraphSyncAt = Date.now();
         this.log('info', 'Rapid gossip sync complete', {
             channelsAdded: result.channelsAdded,
             updatesApplied: result.updatesApplied,
-            nodes: result.nodeCount
+            nodes: result.nodeCount,
+            downloadMs,
+            applyMs,
+            busyMs,
+            slices
         });
         this.emit('gossip:synced', {
             channelsAdded: result.channelsAdded,
-            updatesApplied: result.updatesApplied
+            updatesApplied: result.updatesApplied,
+            downloadMs,
+            applyMs,
+            busyMs,
+            slices
         });
         return {
             channelsAdded: result.channelsAdded,
@@ -4249,6 +4311,8 @@ class BeignetNode extends events_1.EventEmitter {
         return this.openChannel(pubkey, amountSats, opts?.pushSats, opts?.satsPerVbyte, opts?.max, opts?.trusted ?? false);
     }
     async ensureMinimumChannels(count, satsPerChannel, _opts) {
+        if (this.isGraphRestoring())
+            await this.whenGraphRestored();
         const existing = this.getReadyChannels();
         if (existing.length >= count)
             return existing;
@@ -6327,6 +6391,8 @@ class BeignetNode extends events_1.EventEmitter {
     }
     async payInvoiceAll(bolt11, debitMsat, maxFeeMsat, timeoutMs = 60000) {
         this._checkDraining();
+        if (this.isGraphRestoring())
+            await this.whenGraphRestored();
         const decoded = decodeInvoiceInput(bolt11);
         const debit = requireMsatValue(debitMsat, 'debitMsat');
         const feeCap = requireMsatValue(maxFeeMsat, 'maxFeeMsat');
@@ -6345,6 +6411,8 @@ class BeignetNode extends events_1.EventEmitter {
     }
     async payInvoice(bolt11, timeoutMs = 60000, maxFeeSats, amountSats, metadata, cltvLimit, maxFeeMsatCap) {
         this._checkDraining();
+        if (this.isGraphRestoring())
+            await this.whenGraphRestored();
         const decoded = decodeInvoiceInput(bolt11);
         const paymentHashHex = decoded.paymentHash.toString('hex');
         const amountMsat = amountSats !== undefined
@@ -6569,6 +6637,8 @@ class BeignetNode extends events_1.EventEmitter {
     }
     async sendKeysend(pubkey, amountSats, timeoutMs = 60000, maxFeeSats, metadata, onPaymentHash) {
         this._checkDraining();
+        if (this.isGraphRestoring())
+            await this.whenGraphRestored();
         const amountMsat = BigInt(requireNonNegativeSafeInteger(amountSats, 'amountSats')) * 1000n;
         const maxFeeMsat = resolveMaxFeeMsat(maxFeeSats, undefined, amountMsat);
         const preimage = crypto.randomBytes(32);
@@ -7156,6 +7226,8 @@ class BeignetNode extends events_1.EventEmitter {
             .map(({ offer, encoded }) => this.toOfferInfo(offer, encoded));
     }
     async payOffer(offerStr, amountSats, timeoutMs = 60000, maxFeeSats, maxFeeMsatCap, onPaymentHash) {
+        if (this.isGraphRestoring())
+            await this.whenGraphRestored();
         this._checkDraining();
         const offer = decodeOfferInput(offerStr);
         const callerMaxFeeMsat = explicitMaxFeeMsat(maxFeeSats, maxFeeMsatCap);
@@ -7579,6 +7651,8 @@ class BeignetNode extends events_1.EventEmitter {
         return { ...this.getLiquiditySnapshot(), rebalancePlan: plan };
     }
     async rebalanceChannel(fromChannelId, toChannelId, amountSats, maxFeeSats) {
+        if (this.isGraphRestoring())
+            await this.whenGraphRestored();
         if (!/^[0-9a-fA-F]{64}$/.test(fromChannelId))
             throw new errors_1.BeignetError(errors_1.BeignetErrorCode.INVALID_PARAMS, 'fromChannelId must be 64 hex chars');
         if (!/^[0-9a-fA-F]{64}$/.test(toChannelId))
@@ -7715,6 +7789,20 @@ class BeignetNode extends events_1.EventEmitter {
             }))
         };
     }
+    isGraphRestoring() {
+        return this.node?.isGraphRestoring?.() ?? false;
+    }
+    whenGraphRestored() {
+        return this.node?.whenGraphRestored?.() ?? Promise.resolve(true);
+    }
+    getGraphRestoreStats() {
+        const stats = this.node?.getGraphRestoreStats() ?? null;
+        if (!stats)
+            return null;
+        return this._nodeConstructMs === undefined
+            ? stats
+            : { ...stats, constructMs: this._nodeConstructMs };
+    }
     getGraphInfo() {
         const graph = this.node.getGraph();
         const info = {
@@ -7724,6 +7812,8 @@ class BeignetNode extends events_1.EventEmitter {
         if (this._lastGraphSyncAt !== undefined) {
             info.lastSyncAt = this._lastGraphSyncAt;
         }
+        if (this.isGraphRestoring())
+            info.restoring = true;
         return info;
     }
     getGraphNode(pubkey) {
@@ -8199,7 +8289,7 @@ class BeignetNode extends events_1.EventEmitter {
     }
     async backup(destPath) {
         await this.storage.backup(destPath);
-        await (0, backup_mac_1.writeBackupMac)((0, backup_mac_1.deriveBackupMacKey)(bip39.mnemonicToSeedSync(this.mnemonic)), destPath);
+        await (0, backup_mac_1.writeBackupMac)((0, backup_mac_1.deriveBackupMacKey)(this.walletSeed()), destPath);
     }
     storageFiles() {
         const dbPath = fs.realpathSync.native(path.join(this.dataDir, `${this.networkName}.db`));
@@ -8250,14 +8340,14 @@ class BeignetNode extends events_1.EventEmitter {
             createdAt: Date.now(),
             channels: data.channels
         };
-        const seed = bip39.mnemonicToSeedSync(this.mnemonic);
+        const seed = this.walletSeed();
         const encoded = (0, scb_1.encodeScb)(backup, seed);
         const scbPath = path.join(this.dataDir, 'channels.scb');
         (0, fs_utils_1.writeFileAtomic)(scbPath, encoded);
         return { encoded, channelCount: data.channels.length, path: scbPath };
     }
     async restoreFromScb(encoded) {
-        const seed = bip39.mnemonicToSeedSync(this.mnemonic);
+        const seed = this.walletSeed();
         const backup = (0, scb_1.decodeScb)(encoded.trim(), seed);
         const expectedNetwork = this.toLnNetwork(this.networkName);
         if (backup.network !== expectedNetwork) {
@@ -8378,14 +8468,14 @@ class BeignetNode extends events_1.EventEmitter {
                     });
                 }
             }
-            const seed = bip39.mnemonicToSeedSync(this.mnemonic);
+            const seed = this.walletSeed();
             this.offerRetrievedScb((0, scb_1.encodeScb)(embedded, seed), embedded, peerPubkey, 'capsule');
             return;
         }
         let backup;
         const encoded = blob.toString('utf8');
         try {
-            const seed = bip39.mnemonicToSeedSync(this.mnemonic);
+            const seed = this.walletSeed();
             backup = (0, scb_1.decodeScb)(encoded, seed);
         }
         catch {