beignet 0.7.2 → 0.7.4

package/dist/lightning/channel/channel-manager.js

@@ -217,10 +217,13 @@ class ChannelManager extends events_1.EventEmitter {
         this.emit('channel:opened', channel.getTemporaryChannelId());
         return channel;
     }
-    openChannel(peerPubkey, fundingSatoshis, pushMsat, beforeNegotiate) {
+    openChannel(peerPubkey, fundingSatoshis, pushMsat, beforeNegotiate, opts) {
         if (this.peerManager && !this.peerManager.getPeer(peerPubkey)) {
             throw new Error(`Not connected to peer ${peerPubkey}`);
         }
+        if (opts?.trusted && !this.zeroConfManager.isTrustedPeer(peerPubkey)) {
+            throw new Error(`Peer ${peerPubkey} is not in the trusted set; add it with addTrustedPeer before a trusted open`);
+        }
         const chKeys = this.deriveKeysForNewChannel();
         const state = (0, channel_state_1.createOpenerState)({
             temporaryChannelId: crypto_1.default.randomBytes(32),
@@ -230,6 +233,11 @@ class ChannelManager extends events_1.EventEmitter {
             localBasepoints: chKeys.basepoints,
             localPerCommitmentSeed: chKeys.perCommitmentSeed
         });
+        if (opts?.trusted) {
+            state.zeroConfEnabled = true;
+            state.trustedPeer = true;
+            state.minimumDepth = 0;
+        }
         const signer = this.makeSigner(chKeys.channelIndex, chKeys.fundingPrivkey, chKeys.htlcBasepointSecret);
         const channel = new channel_1.Channel(state, signer);
         if (this.config.chainHash) {
@@ -1024,10 +1032,7 @@ class ChannelManager extends events_1.EventEmitter {
         this.tempChannels.set(tempId, channel);
         this.channelPeers.set(tempId, peerPubkey);
         if (this.zeroConfManager.isTrustedPeer(peerPubkey)) {
-            const channelState = channel.getFullState();
-            channelState.trustedPeer = true;
-            channelState.zeroConfEnabled = true;
-            channelState.minimumDepth = 0;
+            channel.getFullState().trustedPeer = true;
         }
         const actions = channel.handleOpenChannel(msg);
         this.processActions(peerPubkey, channel, actions);
@@ -1101,13 +1106,15 @@ class ChannelManager extends events_1.EventEmitter {
     }
     handleChannelReady(peerPubkey, payload) {
         const msg = (0, channel_funding_1.decodeChannelReadyMessage)(payload);
-        const channel = this.findChannelByChannelId(msg.channelId);
+        const channel = this.findChannelByChannelId(msg.channelId) ||
+            this.findChannelByChannelIdInTemp(msg.channelId);
         if (!channel) {
             this.emit('error', msg.channelId, 'Unknown channel_id in channel_ready');
             return;
         }
         const actions = channel.handleChannelReady(msg);
         this.processActions(peerPubkey, channel, actions);
+        this._promoteV2ChannelIfReady(peerPubkey, channel);
     }
     handleUpdateAddHtlc(peerPubkey, payload) {
         const msg = (0, channel_update_1.decodeUpdateAddHtlcMessage)(payload);
@@ -1825,7 +1832,10 @@ class ChannelManager extends events_1.EventEmitter {
             actions
         };
     }
-    createDualFundedChannel(peerPubkey, params) {
+    createDualFundedChannel(peerPubkey, params, opts) {
+        if (opts?.trusted && !this.zeroConfManager.isTrustedPeer(peerPubkey)) {
+            throw new Error(`Peer ${peerPubkey} is not in the trusted set; add it with addTrustedPeer before a trusted open`);
+        }
         const chKeys = this.deriveKeysForNewChannel();
         const state = (0, channel_state_1.createOpenerState)({
             temporaryChannelId: crypto_1.default.randomBytes(32),
@@ -1835,6 +1845,11 @@ class ChannelManager extends events_1.EventEmitter {
             localBasepoints: chKeys.basepoints,
             localPerCommitmentSeed: chKeys.perCommitmentSeed
         });
+        if (opts?.trusted) {
+            state.zeroConfEnabled = true;
+            state.trustedPeer = true;
+            state.minimumDepth = 0;
+        }
         const signer = this.makeSigner(chKeys.channelIndex, chKeys.fundingPrivkey, chKeys.htlcBasepointSecret);
         const channel = new channel_1.Channel(state, signer);
         if (this.config.chainHash) {
@@ -1855,10 +1870,20 @@ class ChannelManager extends events_1.EventEmitter {
             }
             channelType = typeFlags.toBuffer();
         }
+        let channelFlags = params.channelFlags;
+        if (opts?.trusted) {
+            const typeFlags = flags_1.FeatureFlags.fromBuffer(channelType);
+            typeFlags.setCompulsory(flags_1.Feature.SCID_ALIAS);
+            typeFlags.setCompulsory(flags_1.Feature.ZERO_CONF);
+            channelType = typeFlags.toBuffer();
+            channelFlags = (channelFlags ?? 0x01) & ~0x01;
+            state.announceChannel = false;
+        }
         const alignedParams = {
             ...params,
             chainHash: params.chainHash ?? this.config.chainHash,
             channelType,
+            channelFlags,
             localBasepoints: chKeys.basepoints,
             localPerCommitmentSeed: chKeys.perCommitmentSeed,
             secondPerCommitmentPoint: (0, derivation_1.perCommitmentPointFromSecret)((0, shachain_1.generateFromSeed)(chKeys.perCommitmentSeed, 0xffffffffffffn - 1n))
@@ -1916,6 +1941,9 @@ class ChannelManager extends events_1.EventEmitter {
         const tempId = msg.channelId.toString('hex');
         this.tempChannels.set(tempId, channel);
         this.channelPeers.set(tempId, peerPubkey);
+        if (this.zeroConfManager.isTrustedPeer(peerPubkey)) {
+            state.trustedPeer = true;
+        }
         const localParams = {
             fundingSatoshis: 0n,
             fundingFeeratePerkw: msg.fundingFeeratePerkw,
@@ -1935,6 +1963,7 @@ class ChannelManager extends events_1.EventEmitter {
             secondPerCommitmentPoint: (0, derivation_1.perCommitmentPointFromSecret)((0, shachain_1.generateFromSeed)(chKeys.perCommitmentSeed, 0xffffffffffffn - 1n))
         };
         if (msg.requestFunds &&
+            msg.requestFunds.requestedSats > 0n &&
             this.config.leaseRates &&
             this.config.nodePrivateKey &&
             !(0, types_3.isTaprootChannel)(msg.channelType ?? null)) {
@@ -2092,8 +2121,12 @@ class ChannelManager extends events_1.EventEmitter {
         const cid = channel.getChannelId();
         if (!cid)
             return;
-        if (channel.getState() !== types_3.ChannelState.AWAITING_FUNDING_CONFIRMED)
+        const st = channel.getState();
+        if (st !== types_3.ChannelState.AWAITING_FUNDING_CONFIRMED &&
+            st !== types_3.ChannelState.AWAITING_CHANNEL_READY &&
+            st !== types_3.ChannelState.NORMAL) {
             return;
+        }
         const permId = cid.toString('hex');
         if (this.channels.has(permId))
             return;
@@ -2166,6 +2199,15 @@ class ChannelManager extends events_1.EventEmitter {
             this.emit('channel:scid-assigned', channelId, scid);
         }
     }
+    voidChannel(channelId) {
+        const idHex = channelId.toString('hex');
+        const channel = this.channels.get(idHex);
+        if (!channel)
+            return false;
+        this.channels.delete(idHex);
+        this.channelPeers.delete(idHex);
+        return true;
+    }
     handleErrorMsg(peerPubkey, payload) {
         const msg = (0, error_1.decodeErrorMessage)(payload);
         const channelIdHex = msg.channelId.toString('hex');