mirrors/btcpayserver
1
0
Fork 0
mirror of https://github.com/btcpayserver/btcpayserver.git synced 2025-02-23 06:35:13 +01:00
Code Issues Projects Releases Packages Wiki Activity

fixes

Browse source
This commit is contained in:
Kukks 2020-04-17 11:55:24 +02:00
parent 514b695907
commit 51db617584
2 changed files with 33 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
BTCPayServer/Payments/PayJoin/PayJoinEndpointController.cs
View file

@ -451,8 +451,11 @@ namespace BTCPayServer.Payments.PayJoin
foreach (var selectedUtxo in selectedUTXOs.Select(o => o.Value)) foreach (var selectedUtxo in selectedUTXOs.Select(o => o.Value))
{ {
var signedInput = newPsbt.Inputs.FindIndexedInput(selectedUtxo.Outpoint); var signedInput = newPsbt.Inputs.FindIndexedInput(selectedUtxo.Outpoint);
signedInput.UpdateFromCoin(selectedUtxo.AsCoin()); var coin = selectedUtxo.AsCoin(derivationSchemeSettings.AccountDerivation);
signedInput.UpdateFromCoin(coin);
var privateKey = accountKey.Derive(selectedUtxo.KeyPath).PrivateKey; var privateKey = accountKey.Derive(selectedUtxo.KeyPath).PrivateKey;
//hack until UpdateFromCoin is fixed in NBitcoin when the coin is p2sh
signedInput.WitnessUtxo = coin.TxOut;
signedInput.Sign(privateKey); signedInput.Sign(privateKey);
signedInput.FinalizeInput(); signedInput.FinalizeInput();
newTx.Inputs[signedInput.Index].WitScript = newPsbt.Inputs[(int)signedInput.Index].FinalScriptWitness; newTx.Inputs[signedInput.Index].WitScript = newPsbt.Inputs[(int)signedInput.Index].FinalScriptWitness;

31
BTCPayServer/Services/PayjoinClient.cs
View file

@ -34,9 +34,9 @@ namespace BTCPayServer.Services
if (i.WitnessUtxo.ScriptPubKey.IsScriptType(ScriptType.P2WPKH)) if (i.WitnessUtxo.ScriptPubKey.IsScriptType(ScriptType.P2WPKH))
return ScriptPubKeyType.Segwit; return ScriptPubKeyType.Segwit;
if (i.WitnessUtxo.ScriptPubKey.IsScriptType(ScriptType.P2SH) && if (i.WitnessUtxo.ScriptPubKey.IsScriptType(ScriptType.P2SH) &&
i.FinalScriptWitness.GetSigner().ScriptPubKey.IsScriptType(ScriptType.P2WPKH)) PayToWitPubKeyHashTemplate.Instance.ExtractWitScriptParameters(i.FinalScriptWitness) is {})
return ScriptPubKeyType.SegwitP2SH; return ScriptPubKeyType.SegwitP2SH;
return null as ScriptPubKeyType?; return null;
} }
} }
@ -212,8 +212,33 @@ namespace BTCPayServer.Services
if (sentAfter > sentBefore) if (sentAfter > sentBefore)
{ {
var overPaying = sentAfter - sentBefore; var overPaying = sentAfter - sentBefore;
if (!newPSBT.TryGetEstimatedFeeRate(out var newFeeRate) || !newPSBT.TryGetVirtualSize(out var newVirtualSize))
//hack until GetAllCoins is fixed in NBitcoin when the coin is p2sh (redeem needs to be loaded from RedeemScript and fallback to i.FinalScriptSig extraction)
int newVirtualSize = 0;
if (type == ScriptPubKeyType.SegwitP2SH)
{
if (!newPSBT.TryGetFee(out var fee))
{
throw new PayjoinSenderException("The payjoin receiver did not included UTXO information to calculate fee correctly"); throw new PayjoinSenderException("The payjoin receiver did not included UTXO information to calculate fee correctly");
}
var transactionBuilder = originalTx.Network.CreateTransactionBuilder();
transactionBuilder.AddCoins(newPSBT.Inputs.Select(i =>i.GetCoin().ToScriptCoin(i.RedeemScript??PayToScriptHashTemplate.Instance.ExtractScriptSigParameters(i.FinalScriptSig).RedeemScript)));
try
{
newVirtualSize = transactionBuilder.EstimateSize(newPSBT.GetGlobalTransaction(), true);
}
catch
{
throw new PayjoinSenderException("The payjoin receiver did not included UTXO information to calculate fee correctly");
}
}
else
{
if (!newPSBT.TryGetEstimatedFeeRate(out var newFeeRate) || !newPSBT.TryGetVirtualSize(out newVirtualSize))
throw new PayjoinSenderException("The payjoin receiver did not included UTXO information to calculate fee correctly");
}
var additionalFee = newPSBT.GetFee() - originalFee; var additionalFee = newPSBT.GetFee() - originalFee;
if (overPaying > additionalFee) if (overPaying > additionalFee)
throw new PayjoinSenderException("The payjoin receiver is sending more money to himself"); throw new PayjoinSenderException("The payjoin receiver is sending more money to himself");