[0.17] Backport #13960 & #13917 #13976

pull fanquake wants to merge 6 commits into bitcoin:0.17 from fanquake:2-backports changing 6 files +94 −16
  1. fanquake commented at 2:03 am on August 15, 2018: member
    Backports #13917 and #13960 to the 0.17 branch.
  2. Fix PSBT deserialization of 0-input transactions
    0-input transactions can be ambiguously deserialized as being witness
    transactions. Since the unsigned transaction is never serialized as
    a witness transaction as it has no witnesses, we should always
    deserialize it as a non-witness transaction and set the serialization
    flags as such.
    
    Also always serialize the unsigned transaction as a non-witness transaction.
    
    GitHub-Pull: #13960
    Rebased-From: 43811e6
    8c4cd2bd89
  3. Serialize non-witness utxo as a non-witness tx but always deserialize as witness
    Strip out the witnesses when serializing the non-witness utxo. However
    witness serializations are allowed, so make sure we always deserialize
    as witness.
    
    GitHub-Pull: #13960
    Rebased-From: bd19cc7
    517010e30e
  4. Additional sanity checks in SignPSBTInput
    GitHub-Pull: #13917
    Rebased-From: 8254e99
    ad6d845ac9
  5. Only wipe wrong UTXO type data if overwritten by wallet
    GitHub-Pull: #13917
    Rebased-From: c05712c
    dbaadc9ea9
  6. Test that a non-witness script as witness utxo is not signed
    GitHub-Pull: #13917
    Rebased-From: 7c8bffd
    8935869487
  7. More tests of signer checks
    GitHub-Pull: #13917
    Rebased-From: 5df6f08
    0333914467
  8. fanquake added the label Backport on Aug 15, 2018
  9. fanquake added this to the milestone 0.17.0 on Aug 15, 2018
  10. fanquake requested review from achow101 on Aug 15, 2018
  11. fanquake requested review from sipa on Aug 15, 2018
  12. laanwj commented at 1:32 pm on August 15, 2018: member
    utACK 0333914467466d22133e25b71ef330bb2c609958, I did the same backport (but didn’t push it for some reason) and have an empty diff
  13. laanwj merged this on Aug 15, 2018
  14. laanwj closed this on Aug 15, 2018

  15. laanwj referenced this in commit 4a2960f73e on Aug 15, 2018
  16. fanquake deleted the branch on Aug 16, 2018
  17. DrahtBot locked this on Sep 8, 2021


fanquake laanwj


sipa achow101

Labels
Backport

Milestone
0.17.0


github-metadata-mirror

This is a metadata mirror of the GitHub repository bitcoin/bitcoin. This site is not affiliated with GitHub. Content is generated from a GitHub metadata backup.
generated: 2024-11-17 12:12 UTC

This site is hosted by @0xB10C
More mirrored repositories can be found on mirror.b10c.me