beignet 0.20.1 → 0.21.0

package/dist/cli/beignet-node.js

@@ -4613,6 +4613,14 @@ class BeignetNode extends events_1.EventEmitter {
             info.expiry = opts.expiry;
         return info;
     }
+    holdResolutionRefusal(paymentHash, action, notFound) {
+        const parked = this.node
+            .listHeldHtlcs()
+            .find((h) => h.paymentHash.equals(paymentHash));
+        if (!parked)
+            return new errors_1.BeignetError(errors_1.BeignetErrorCode.NOT_FOUND, notFound);
+        return new errors_1.BeignetError(errors_1.BeignetErrorCode.HOLD_RESOLUTION_PENDING, `${parked.htlcCount} parked HTLC(s) remain for this payment hash: a channel refused the ${action} for them, or a settle or cancel is already under way`);
+    }
     settleHoldInvoice(preimage) {
         if (!/^[0-9a-fA-F]{64}$/.test(preimage)) {
             throw new errors_1.BeignetError(errors_1.BeignetErrorCode.INVALID_PARAMS, 'preimage must be 32 bytes hex (64 hex chars)');
@@ -4624,7 +4632,7 @@ class BeignetNode extends events_1.EventEmitter {
             .digest();
         const settled = this.node.settleHeldHtlc(paymentHash, preimageBuf);
         if (!settled) {
-            throw new errors_1.BeignetError(errors_1.BeignetErrorCode.NOT_FOUND, 'No parked HTLCs for this preimage (invoice unknown, not yet paid, or already resolved)');
+            throw this.holdResolutionRefusal(paymentHash, 'settle', 'No parked HTLCs for this preimage (invoice unknown, not yet paid, or already resolved)');
         }
         return { paymentHash: paymentHash.toString('hex') };
     }
@@ -4632,9 +4640,10 @@ class BeignetNode extends events_1.EventEmitter {
         if (!/^[0-9a-fA-F]{64}$/.test(paymentHash)) {
             throw new errors_1.BeignetError(errors_1.BeignetErrorCode.INVALID_PARAMS, 'paymentHash must be 32 bytes hex (64 hex chars)');
         }
-        const result = this.node.cancelHoldInvoice(Buffer.from(paymentHash, 'hex'));
+        const hash = Buffer.from(paymentHash, 'hex');
+        const result = this.node.cancelHoldInvoice(hash);
         if (!result) {
-            throw new errors_1.BeignetError(errors_1.BeignetErrorCode.NOT_FOUND, 'No open hold invoice for this payment hash');
+            throw this.holdResolutionRefusal(hash, 'cancel', 'No open hold invoice for this payment hash');
         }
         return { paymentHash, htlcsFailed: result.htlcsFailed };
     }