beignet 0.7.2 → 0.7.4

package/dist/lightning/channel/channel.js

@@ -226,6 +226,11 @@ class Channel {
                 channelTypeFlags.setCompulsory(flags_1.Feature.ANCHOR_ZERO_FEE_HTLC);
             }
         }
+        const zeroConf = this._state.zeroConfEnabled && this._state.trustedPeer;
+        if (zeroConf) {
+            channelTypeFlags.setCompulsory(flags_1.Feature.SCID_ALIAS);
+            channelTypeFlags.setCompulsory(flags_1.Feature.ZERO_CONF);
+        }
         const channelType = channelTypeFlags.toBuffer();
         this._state.channelType = channelType;
         const channelReserve = computeChannelReserve(this._state.fundingSatoshis, this._state.localConfig.dustLimitSatoshis);
@@ -247,9 +252,12 @@ class Channel {
             delayedPaymentBasepoint: this._state.localBasepoints.delayedPaymentBasepoint,
             htlcBasepoint: this._state.localBasepoints.htlcBasepoint,
             firstPerCommitmentPoint: firstPoint,
-            channelFlags: preferTaproot ? 0x00 : 0x01,
+            channelFlags: preferTaproot || zeroConf ? 0x00 : 0x01,
             channelType
         };
+        if (zeroConf) {
+            this._state.announceChannel = false;
+        }
         if (preferTaproot) {
             msg.nextLocalNonce = this._ensureLocalFundingNonce();
         }
@@ -378,7 +386,20 @@ class Channel {
             htlcBasepoint: msg.htlcBasepoint,
             firstPerCommitmentPoint: msg.firstPerCommitmentPoint
         };
-        this._state.minimumDepth = msg.minimumDepth;
+        if (this._state.channelType &&
+            flags_1.FeatureFlags.fromBuffer(this._state.channelType).hasFeature(flags_1.Feature.ZERO_CONF)) {
+            if (msg.minimumDepth !== 0) {
+                return [
+                    {
+                        type: channel_actions_1.ChannelActionType.ERROR,
+                        message: `zero_conf accept_channel must use minimum_depth 0, got ${msg.minimumDepth}`
+                    }
+                ];
+            }
+        }
+        else {
+            this._state.minimumDepth = msg.minimumDepth;
+        }
         this._state.remoteCurrentPerCommitmentPoint = msg.firstPerCommitmentPoint;
         if (msg.channelType && this._state.channelType) {
             const localBits = flags_1.FeatureFlags.fromBuffer(this._state.channelType).listSetBits();
@@ -557,14 +578,17 @@ class Channel {
                     }
                 ];
             }
-            if (proposedFlags.hasFeature(flags_1.Feature.ZERO_CONF) &&
-                !(this._state.zeroConfEnabled && this._state.trustedPeer)) {
-                return [
-                    {
-                        type: channel_actions_1.ChannelActionType.ERROR,
-                        message: 'Proposed zero_conf channel type requires a trusted peer'
-                    }
-                ];
+            if (proposedFlags.hasFeature(flags_1.Feature.ZERO_CONF)) {
+                if (!this._state.trustedPeer) {
+                    return [
+                        {
+                            type: channel_actions_1.ChannelActionType.ERROR,
+                            message: 'Proposed zero_conf channel type requires a trusted peer'
+                        }
+                    ];
+                }
+                this._state.zeroConfEnabled = true;
+                this._state.minimumDepth = 0;
             }
             this._state.channelType = msg.channelType;
         }
@@ -677,7 +701,7 @@ class Channel {
             partialSignatureWithNonce: taproot ? partialSignatureWithNonce : undefined
         };
         this._state.state = types_2.ChannelState.AWAITING_FUNDING_CONFIRMED;
-        return [
+        const actions = [
             { type: channel_actions_1.ChannelActionType.PERSIST_STATE },
             sendMsg(types_1.MessageType.FUNDING_SIGNED, (0, channel_funding_1.encodeFundingSignedMessage)(signedMsg)),
             {
@@ -687,6 +711,10 @@ class Channel {
                 minimumDepth: this._state.minimumDepth
             }
         ];
+        if (this._state.zeroConfEnabled && this._state.trustedPeer) {
+            actions.push(...this.fundingConfirmed());
+        }
+        return actions;
     }
     fundingConfirmed() {
         if (this._state.state !== types_2.ChannelState.AWAITING_FUNDING_CONFIRMED &&
@@ -3642,6 +3670,16 @@ class Channel {
         const ourWalletWitnesses = [];
         const ourWalletInputIndices = [];
         if (this._spliceInInputs) {
+            const p2wshScript = require('bitcoinjs-lib').payments.p2wsh({
+                redeem: { output: oldFunding.witnessScript }
+            }).output;
+            const prevouts = this._collectPrevouts(tx, [...this._spliceInInputs.inputs, ...built.inputs], {
+                index: sharedInputIndex,
+                script: p2wshScript,
+                value: this._state.fundingSatoshis
+            });
+            if (!prevouts)
+                return null;
             for (let i = 0; i < tx.ins.length; i++) {
                 if (i === sharedInputIndex)
                     continue;
@@ -3651,7 +3689,7 @@ class Channel {
                     wi.prevOutputIndex === vout);
                 if (!w)
                     continue;
-                const witness = w.signWitness(tx, i, w.value);
+                const witness = w.signWitness(tx, i, w.value, prevouts);
                 tx.setWitness(i, witness);
                 ourWalletWitnesses.push(witness);
                 ourWalletInputIndices.push(i);
@@ -4341,10 +4379,15 @@ class Channel {
             witnesses: this._spliceTx.ourWalletWitnesses,
             sharedInputSignature: signed.signature
         };
-        return [
+        const actions = [
             { type: channel_actions_1.ChannelActionType.PERSIST_STATE },
             sendMsg(types_1.MessageType.TX_SIGNATURES, (0, interactive_tx_1.encodeTxSignaturesMessage)(msg))
         ];
+        if (this._isZeroConfChannelType() &&
+            this._state.spliceInFlight?.receivedTxSignatures) {
+            actions.push(...this.sendSpliceLocked());
+        }
+        return actions;
     }
     completeSplice() {
         const inflight = this._state.spliceInFlight;
@@ -4792,14 +4835,18 @@ class Channel {
         this._state.fundingLocktime = msg.locktime;
         if (msg.channelType) {
             const proposedFlags = flags_1.FeatureFlags.fromBuffer(msg.channelType);
-            if (proposedFlags.hasFeature(flags_1.Feature.ZERO_CONF) &&
-                !(this._state.zeroConfEnabled && this._state.trustedPeer)) {
-                return [
-                    {
-                        type: channel_actions_1.ChannelActionType.ERROR,
-                        message: 'Proposed zero_conf channel type requires a trusted peer'
-                    }
-                ];
+            if (proposedFlags.hasFeature(flags_1.Feature.ZERO_CONF)) {
+                if (!this._state.trustedPeer) {
+                    return [
+                        {
+                            type: channel_actions_1.ChannelActionType.ERROR,
+                            message: 'Proposed zero_conf channel type requires a trusted peer'
+                        }
+                    ];
+                }
+                this._state.zeroConfEnabled = true;
+                this._state.minimumDepth = 0;
+                localParams = { ...localParams, minimumDepth: 0 };
             }
         }
         localParams = {
@@ -4923,6 +4970,16 @@ class Channel {
                 }
             ];
         }
+        if (this._state.channelType &&
+            flags_1.FeatureFlags.fromBuffer(this._state.channelType).hasFeature(flags_1.Feature.ZERO_CONF) &&
+            msg.minimumDepth !== 0) {
+            return [
+                {
+                    type: channel_actions_1.ChannelActionType.ERROR,
+                    message: `zero_conf accept_channel2 must use minimum_depth 0, got ${msg.minimumDepth}`
+                }
+            ];
+        }
         this._state.remoteBasepoints = session.getRemoteBasepoints();
         this._state.remoteCurrentPerCommitmentPoint = msg.firstPerCommitmentPoint;
         this._state.channelId = (0, validation_1.deriveV2ChannelId)(this._state.localBasepoints.revocationBasepoint, this._state.remoteBasepoints.revocationBasepoint);
@@ -5763,6 +5820,9 @@ class Channel {
             const built = this._v2NegotiatedTx();
             if (!built)
                 return [];
+            const prevouts = this._collectPrevouts(built.tx, session.getTxBuilder()?.getInputs() ?? []);
+            if (!prevouts)
+                return [];
             const witnesses = [];
             for (let i = 0; i < built.tx.ins.length; i++) {
                 const prevTxid = Buffer.from(built.tx.ins[i].hash);
@@ -5771,7 +5831,7 @@ class Channel {
                     wi.prevOutputIndex === vout);
                 if (!w)
                     continue;
-                const witness = w.signWitness(built.tx, i, w.value);
+                const witness = w.signWitness(built.tx, i, w.value, prevouts);
                 built.tx.setWitness(i, witness);
                 witnesses.push(witness);
             }
@@ -5819,7 +5879,7 @@ class Channel {
             txid,
             witnesses
         };
-        return [
+        const actions = [
             { type: channel_actions_1.ChannelActionType.PERSIST_STATE },
             sendMsg(types_1.MessageType.TX_SIGNATURES, (0, interactive_tx_1.encodeTxSignaturesMessage)(msg)),
             {
@@ -5829,6 +5889,12 @@ class Channel {
                 minimumDepth: this._state.minimumDepth
             }
         ];
+        if (this._state.state === types_2.ChannelState.AWAITING_FUNDING_CONFIRMED &&
+            this._state.zeroConfEnabled &&
+            this._state.trustedPeer) {
+            actions.push(...this.fundingConfirmed());
+        }
+        return actions;
     }
     sendTxSignatures(txid, outputIndex, witnesses) {
         const session = this._state.dualFundingSession;
@@ -5911,7 +5977,8 @@ class Channel {
                 fundingOutputIndex: this._spliceTx.newFundingOutputIndex,
                 minimumDepth: this._state.minimumDepth
             });
-            if (this._state.spliceInFlight?.confirmed) {
+            if (this._isZeroConfChannelType() ||
+                this._state.spliceInFlight?.confirmed) {
                 actions.push(...this.sendSpliceLocked());
             }
             return actions;
@@ -5957,9 +6024,46 @@ class Channel {
                     });
                 }
             }
+            if (this._state.zeroConfEnabled && this._state.trustedPeer) {
+                actions.push(...this.fundingConfirmed());
+            }
         }
         return actions;
     }
+    _collectPrevouts(tx, inputs, sharedOverride) {
+        const bitcoin = require('bitcoinjs-lib');
+        const scripts = [];
+        const values = [];
+        for (let i = 0; i < tx.ins.length; i++) {
+            if (sharedOverride && sharedOverride.index === i) {
+                scripts.push(sharedOverride.script);
+                values.push(sharedOverride.value);
+                continue;
+            }
+            const txid = Buffer.from(tx.ins[i].hash);
+            const vout = tx.ins[i].index;
+            const source = inputs.find((inp) => {
+                if (!inp.prevTx || inp.prevTx.length < 32)
+                    return false;
+                return (extractTxidFromPrevTx(inp.prevTx).equals(txid) &&
+                    (inp.prevTxVout ?? inp.prevOutputIndex) === vout);
+            });
+            if (!source)
+                return null;
+            try {
+                const prev = bitcoin.Transaction.fromBuffer(source.prevTx);
+                const out = prev.outs[vout];
+                if (!out)
+                    return null;
+                scripts.push(Buffer.from(out.script));
+                values.push(BigInt(out.value));
+            }
+            catch {
+                return null;
+            }
+        }
+        return { scripts, values };
+    }
     _assembleV2FundingTx() {
         const session = this._state.dualFundingSession;
         const c = this._dualFundingContribution;
@@ -5974,6 +6078,9 @@ class Channel {
         const sorted = [...builder.getInputs()].sort((a, b) => a.serialId < b.serialId ? -1 : 1);
         if (sorted.length !== built.tx.ins.length)
             return null;
+        const prevouts = this._collectPrevouts(built.tx, sorted);
+        if (!prevouts)
+            return null;
         const remote = session.getRemoteWitnesses() ?? [];
         let r = 0;
         for (let i = 0; i < built.tx.ins.length; i++) {
@@ -5985,7 +6092,7 @@ class Channel {
                     wi.prevOutputIndex === vout);
                 if (!w)
                     return null;
-                built.tx.setWitness(i, w.signWitness(built.tx, i, w.value));
+                built.tx.setWitness(i, w.signWitness(built.tx, i, w.value, prevouts));
             }
             else {
                 if (r >= remote.length)
@@ -5995,7 +6102,19 @@ class Channel {
         }
         return built.tx.toBuffer();
     }
+    _isZeroConfChannelType() {
+        return (this._state.channelType !== null &&
+            flags_1.FeatureFlags.fromBuffer(this._state.channelType).hasFeature(flags_1.Feature.ZERO_CONF));
+    }
     initiateTxRbf(newFeeratePerkw, newLocktime) {
+        if (this._isZeroConfChannelType()) {
+            return [
+                {
+                    type: channel_actions_1.ChannelActionType.ERROR,
+                    message: 'tx_init_rbf is forbidden on an option_zeroconf channel'
+                }
+            ];
+        }
         const session = this._state.dualFundingSession;
         if (!session) {
             return [
@@ -6020,6 +6139,9 @@ class Channel {
         return [sendMsg(types_1.MessageType.TX_INIT_RBF, (0, interactive_tx_1.encodeTxInitRbfMessage)(msg))];
     }
     handleTxInitRbf(msg) {
+        if (this._isZeroConfChannelType()) {
+            return this._failChannelWithWireError('tx_init_rbf is forbidden on an option_zeroconf channel');
+        }
         if (this._spliceSession && !this._spliceSession.isComplete()) {
             return [
                 sendMsg(types_1.MessageType.TX_ABORT, (0, interactive_tx_1.encodeTxAbortMessage)({