Merge pull request #186 from Elenpay/changed-output-size-calc

Changed output virtual size calculation
Elenpay · May 31, 2023 · 2d337c5 · 2d337c5
2 parents 8b3a83b + ce83d2f
commit 2d337c5
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/src/Services/LightningService.cs b/src/Services/LightningService.cs
@@ -192,10 +192,11 @@ public async Task OpenChannel(ChannelOperationRequest channelOperationRequest)
 
             try
             {
-                var virtualSize=combinedPSBT.GetGlobalTransaction().GetVirtualSize()+22; //22 bytes for the 1 segwit output
+                // 8 value + 1 script pub key size + 34 script pub key hash (Segwit output 2-0f-2 multisig)
+                var outputVirtualSize = combinedPSBT.GetGlobalTransaction().GetVirtualSize() + 43;
                 var feeRateResult = await LightningHelper.GetFeeRateResult(network, _nbXplorerService);
 
-                var totalFees = new Money(virtualSize * feeRateResult.FeeRate.SatoshiPerByte, MoneyUnit.Satoshi);
+                var totalFees = new Money(outputVirtualSize * feeRateResult.FeeRate.SatoshiPerByte, MoneyUnit.Satoshi);
 
                 long fundingAmount = channelOperationRequest.Changeless ? channelOperationRequest.SatsAmount - totalFees : channelOperationRequest.SatsAmount;
                 //We prepare the request (shim) with the base PSBT we had presigned with the UTXOs to fund the channel
@@ -930,8 +931,8 @@ public void CancelPendingChannel(Node source, byte[] pendingChannelId, IUnmockab
                 //Hack, see https://github.com/MetacoSA/NBitcoin/issues/1112 for details
                 foreach (var input in result.Item1.Inputs)
                 {
-                    input.WitnessUtxo = originalPSBT.Inputs.FirstOrDefault(x=> x.PrevOut == input.PrevOut)?.WitnessUtxo;
-                    input.NonWitnessUtxo = originalPSBT.Inputs.FirstOrDefault(x=> x.PrevOut == input.PrevOut)?.NonWitnessUtxo;
+                    input.WitnessUtxo = originalPSBT.Inputs.FirstOrDefault(x => x.PrevOut == input.PrevOut)?.WitnessUtxo;
+                    input.NonWitnessUtxo = originalPSBT.Inputs.FirstOrDefault(x => x.PrevOut == input.PrevOut)?.NonWitnessUtxo;
                     input.SighashType = SigHash.None;
                 }