beignet 0.7.0 → 0.7.1

package/dist/lightning/channel/channel.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createAcceptorChannel = exports.createOpenerChannel = exports.Channel = void 0;
 const crypto_1 = __importDefault(require("crypto"));
 const types_1 = require("../message/types");
+const anchor_1 = require("../script/anchor");
 const channel_open_1 = require("../message/channel-open");
 const channel_funding_1 = require("../message/channel-funding");
 const channel_update_1 = require("../message/channel-update");
@@ -923,8 +924,12 @@ class Channel {
         const remoteReserveMsat = this._state.localConfig.channelReserveSatoshis * 1000n;
         let remoteRequiredMsat = remoteReserveMsat;
         if (this._state.role === types_2.ChannelRole.ACCEPTOR) {
-            const feeMsat = BigInt((0, commitment_builder_1.calculateCommitmentFee)(this._state.localConfig.feeratePerKw, this._countActiveHtlcs() + 1, (0, types_3.isAnchorChannel)(this._state.channelType))) * 1000n;
+            const anchor = (0, types_3.isAnchorChannel)(this._state.channelType);
+            const feeMsat = BigInt((0, commitment_builder_1.calculateCommitmentFee)(Math.max((0, commitment_builder_1.getLocalCommitmentFeeRate)(this._state), (0, commitment_builder_1.getRemoteCommitmentFeeRate)(this._state)), this._countActiveHtlcs() + 1, anchor)) * 1000n;
             remoteRequiredMsat += feeMsat;
+            if (anchor) {
+                remoteRequiredMsat += anchor_1.ANCHOR_TOTAL_COST * 1000n;
+            }
         }
         if (this._state.remoteBalanceMsat - msg.amountMsat < remoteRequiredMsat) {
             return [
@@ -1687,7 +1692,8 @@ class Channel {
         }
         const activeHtlcCount = this._countActiveHtlcs();
         const anchor = (0, types_3.isAnchorChannel)(this._state.channelType);
-        const newFee = (0, commitment_builder_1.calculateCommitmentFee)(feeratePerKw, activeHtlcCount, anchor);
+        const newFee = (0, commitment_builder_1.calculateCommitmentFee)(feeratePerKw, activeHtlcCount, anchor) +
+            (anchor ? anchor_1.ANCHOR_TOTAL_COST : 0n);
         const reserveMsat = this._state.remoteConfig.channelReserveSatoshis * 1000n;
         if (newFee * 1000n > this._state.localBalanceMsat - reserveMsat) {
             return [
@@ -1770,7 +1776,8 @@ class Channel {
         }
         const activeHtlcCount = this._countActiveHtlcs();
         const anchor = (0, types_3.isAnchorChannel)(this._state.channelType);
-        const newFee = (0, commitment_builder_1.calculateCommitmentFee)(msg.feeratePerKw, activeHtlcCount, anchor);
+        const newFee = (0, commitment_builder_1.calculateCommitmentFee)(msg.feeratePerKw, activeHtlcCount, anchor) +
+            (anchor ? anchor_1.ANCHOR_TOTAL_COST : 0n);
         const reserveMsat = this._state.localConfig.channelReserveSatoshis * 1000n;
         if (newFee * 1000n > this._state.remoteBalanceMsat - reserveMsat) {
             return [
@@ -3918,8 +3925,12 @@ class Channel {
             let requiredMsat = reserveMsat;
             if (this._state.role === types_2.ChannelRole.OPENER) {
                 const feeratePerKw = Math.max((0, commitment_builder_1.getLocalCommitmentFeeRate)(this._state), (0, commitment_builder_1.getRemoteCommitmentFeeRate)(this._state));
+                const anchor = (0, types_3.isAnchorChannel)(this._state.channelType);
                 requiredMsat +=
-                    BigInt((0, commitment_builder_1.calculateCommitmentFee)(feeratePerKw, this._countActiveHtlcs() + 1, (0, types_3.isAnchorChannel)(this._state.channelType))) * 1000n;
+                    BigInt((0, commitment_builder_1.calculateCommitmentFee)(feeratePerKw * 2, this._countActiveHtlcs() + 2, anchor)) * 1000n;
+                if (anchor) {
+                    requiredMsat += anchor_1.ANCHOR_TOTAL_COST * 1000n;
+                }
             }
             const spendable = localMsat - requiredMsat;
             return spendable > 0n ? spendable : 0n;