aljaz/btcpayserver
1
0
Fork 0
mirror of https://github.com/aljazceru/btcpayserver.git synced 2025-12-24 01:14:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make sure we match the user's sequence

Browse Source
This commit is contained in:
nicolas.dorier
2020-05-05 04:44:55 +09:00
parent 59bdb943dd
commit dad2642fa7
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
BTCPayServer.Tests/PayJoinTests.cs
View File

@@ -392,6 +392,7 @@ namespace BTCPayServer.Tests
lastInvoiceId = invoice.Id; lastInvoiceId = invoice.Id;
var invoiceAddress = BitcoinAddress.Create(invoice.BitcoinAddress, cashCow.Network); var invoiceAddress = BitcoinAddress.Create(invoice.BitcoinAddress, cashCow.Network);
var txBuilder = network.NBitcoinNetwork.CreateTransactionBuilder(); var txBuilder = network.NBitcoinNetwork.CreateTransactionBuilder();
txBuilder.OptInRBF = true;
txBuilder.AddCoins(coin); txBuilder.AddCoins(coin);
txBuilder.Send(invoiceAddress, vector.Paid); txBuilder.Send(invoiceAddress, vector.Paid);
txBuilder.SendFees(vector.Fee); txBuilder.SendFees(vector.Fee);
@@ -402,6 +403,10 @@ namespace BTCPayServer.Tests
if (vector.ExpectedError is null) if (vector.ExpectedError is null)
{ {
Assert.Contains(pj.Inputs, o => o.PrevOut == receiverCoin.Outpoint); Assert.Contains(pj.Inputs, o => o.PrevOut == receiverCoin.Outpoint);
foreach (var input in pj.GetGlobalTransaction().Inputs)
{
Assert.Equal(Sequence.OptInRBF, input.Sequence);
}
if (!skipLockedCheck) if (!skipLockedCheck)
Assert.True(await payjoinRepository.TryUnlock(receiverCoin.Outpoint)); Assert.True(await payjoinRepository.TryUnlock(receiverCoin.Outpoint));
} }

6
BTCPayServer/Payments/PayJoin/PayJoinEndpointController.cs
View File

@@ -331,10 +331,13 @@ namespace BTCPayServer.Payments.PayJoin
var ourNewOutput = newTx.Outputs[originalPaymentOutput.Index]; var ourNewOutput = newTx.Outputs[originalPaymentOutput.Index];
HashSet<TxOut> isOurOutput = new HashSet<TxOut>(); HashSet<TxOut> isOurOutput = new HashSet<TxOut>();
isOurOutput.Add(ourNewOutput); isOurOutput.Add(ourNewOutput);
var rand = new Random();
int senderInputCount = newTx.Inputs.Count;
foreach (var selectedUTXO in selectedUTXOs.Select(o => o.Value)) foreach (var selectedUTXO in selectedUTXOs.Select(o => o.Value))
{ {
contributedAmount += (Money)selectedUTXO.Value; contributedAmount += (Money)selectedUTXO.Value;
newTx.Inputs.Add(selectedUTXO.Outpoint); var newInput = newTx.Inputs.Add(selectedUTXO.Outpoint);
newInput.Sequence = newTx.Inputs[rand.Next(0, senderInputCount)].Sequence;
} }
ourNewOutput.Value += contributedAmount; ourNewOutput.Value += contributedAmount;
var minRelayTxFee = this._dashboard.Get(network.CryptoCode).Status.BitcoinStatus?.MinRelayTxFee ?? var minRelayTxFee = this._dashboard.Get(network.CryptoCode).Status.BitcoinStatus?.MinRelayTxFee ??
@@ -376,7 +379,6 @@ namespace BTCPayServer.Payments.PayJoin
} }
} }
var rand = new Random();
Utils.Shuffle(newTx.Inputs, rand); Utils.Shuffle(newTx.Inputs, rand);
Utils.Shuffle(newTx.Outputs, rand); Utils.Shuffle(newTx.Outputs, rand);