beignet 0.11.0 → 0.11.1

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

@@ -67,6 +67,7 @@ const funding_selection_1 = require("./funding-selection");
 const validation_3 = require("../validation");
 const bitcoin = __importStar(require("bitcoinjs-lib"));
 const ecc = __importStar(require("@bitcoinerlab/secp256k1"));
+const transaction_1 = require("../storage/transaction");
 const recovery_1 = require("../recovery");
 const flags_1 = require("../features/flags");
 const chain_watcher_1 = require("../chain/chain-watcher");
@@ -1030,6 +1031,7 @@ class LightningNode extends events_1.EventEmitter {
         }
         const gossipRestoreCutoff = Math.floor(Date.now() / 1000) - types_2.DEFAULT_PRUNE_MAX_AGE;
         const diskChannelEndpoints = new Set();
+        const staleRowDeletes = [];
         for (const channel of this.storage.loadAllGossipChannels()) {
             const ts1 = channel.update1 &&
                 !(0, types_2.gossipTimestampTooFarFuture)(channel.update1.timestamp)
@@ -1042,7 +1044,7 @@ class LightningNode extends events_1.EventEmitter {
             if (Math.max(ts1, ts2) < gossipRestoreCutoff) {
                 if (typeof this.storage.deleteGossipChannel === 'function') {
                     const scidHex = channel.shortChannelId.toString('hex');
-                    this.safeStorage(() => this.storage.deleteGossipChannel(scidHex), 'deleteGossipChannel');
+                    staleRowDeletes.push(() => this.storage.deleteGossipChannel(scidHex));
                 }
                 continue;
             }
@@ -1055,12 +1057,13 @@ class LightningNode extends events_1.EventEmitter {
                 const nodeIdHex = node.nodeId.toString('hex');
                 if (!diskChannelEndpoints.has(nodeIdHex) &&
                     typeof this.storage.deleteGossipNode === 'function') {
-                    this.safeStorage(() => this.storage.deleteGossipNode(nodeIdHex), 'deleteGossipNode');
+                    staleRowDeletes.push(() => this.storage.deleteGossipNode(nodeIdHex));
                 }
                 continue;
             }
             this.graph.restoreNode(node);
         }
+        this.batchStorageDeletes(staleRowDeletes, 'gossipRestoreCleanup');
         this.pruneStaleGossipWithStorage();
         this.jitReceiveManager?.restore();
         this.restoreDirectFundingPolicy();
@@ -1427,6 +1430,38 @@ class LightningNode extends events_1.EventEmitter {
             return false;
         }
     }
+    batchStorageDeletes(deletes, operation) {
+        if (!this.storage || deletes.length === 0)
+            return;
+        let failed = 0;
+        let lastError = '';
+        const run = () => {
+            failed = 0;
+            for (const del of deletes) {
+                try {
+                    del();
+                }
+                catch (err) {
+                    failed++;
+                    lastError = err.message;
+                }
+            }
+        };
+        try {
+            (0, transaction_1.withStorageTransaction)(this.storage, run);
+        }
+        catch (err) {
+            lastError = err.message;
+            run();
+        }
+        if (failed > 0) {
+            this.emit('node:error', {
+                code: 'PERSISTENCE_ERROR',
+                message: `${operation}: ${failed} of ${deletes.length} deletes failed (${lastError})`,
+                timestamp: Date.now()
+            });
+        }
+    }
     wireChannelManagerEvents() {
         this.channelManager.on('watchtower:backup', (channelId, _peerPubkey, perCommitmentSecret, revokedTx) => {
             this.backupRevokedStateToTowers(channelId, perCommitmentSecret, revokedTx);
@@ -11491,13 +11526,7 @@ class LightningNode extends events_1.EventEmitter {
         this.graph.pruneStaleChannels(now);
         if (this.storage &&
             typeof this.storage.deleteGossipChannel === 'function') {
-            for (const scidHex of staleScids) {
-                try {
-                    this.storage.deleteGossipChannel(scidHex);
-                }
-                catch {
-                }
-            }
+            this.batchStorageDeletes(staleScids.map((scidHex) => () => this.storage.deleteGossipChannel(scidHex)), 'pruneStaleGossip');
         }
     }
     emitStructuredLog(category, action, data) {