diff options
author | nicolas.dorier <nicolas.dorier@gmail.com> | 2021-08-31 15:43:22 +0900 |
---|---|---|
committer | nicolas.dorier <nicolas.dorier@gmail.com> | 2021-08-31 15:48:16 +0900 |
commit | d8db3d76081662a55f34c6fed681b9daf5f6a0bd (patch) | |
tree | 6bf3a6bfa3e11124768f5de14751dfc35d252814 /bip-0078.mediawiki | |
parent | a76f5e433591a415fd9d6b5ab8c26e0ec37cc6df (diff) | |
download | bips-d8db3d76081662a55f34c6fed681b9daf5f6a0bd.tar.xz |
[BIP78] Fix client implementation when there is output substitution
Diffstat (limited to 'bip-0078.mediawiki')
-rw-r--r-- | bip-0078.mediawiki | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/bip-0078.mediawiki b/bip-0078.mediawiki index 7d0b9bb..4226be5 100644 --- a/bip-0078.mediawiki +++ b/bip-0078.mediawiki @@ -541,10 +541,16 @@ public async Task<PSBT> RequestPayjoin( // Verify that no keypaths is in the PSBT output if (proposedPSBTOutput.HDKeyPaths.Count != 0) throw new PayjoinSenderException("The receiver added keypaths to an output"); - bool isOriginalOutput = originalOutputs.Count > 0 && originalOutputs.Peek().OriginalTxOut.ScriptPubKey == proposedPSBTOutput.ScriptPubKey; - if (isOriginalOutput) + if (originalOutputs.Count == 0) + continue; + var originalOutput = originalOutputs.Peek(); + bool isOriginalOutput = originalOutput.OriginalTxOut.ScriptPubKey == proposedPSBTOutput.ScriptPubKey; + bool substitutedOutput = !isOriginalOutput && + allowOutputSubstitution && + originalOutput.OriginalTxOut.ScriptPubKey == paymentScriptPubKey; + if (isOriginalOutput || substitutedOutput) { - var originalOutput = originalOutputs.Dequeue(); + originalOutputs.Dequeue(); if (output.OriginalTxOut == feeOutput) { var actualContribution = feeOutput.Value - proposedPSBTOutput.Value; |