bitcoin/src/script
Wladimir J. van der Laan f018d0c9cd
Merge #17924: Bug: IsUsedDestination shouldn't use key id as script id for ScriptHash
6dd59d2e49 Don't allow implementers to think ScriptHash(Witness*()) results in nesting computation (Gregory Sanders)
4b8f1e989f IsUsedDestination shouldn't use key id as script id for ScriptHash (Gregory Sanders)

Pull request description:

  Regression introduced in https://github.com/bitcoin/bitcoin/pull/17621 which causes p2sh-segwit addresses to be erroneously missed.

  Tests are only failing in 0.19 branch, likely because that release still uses p2sh-segwit addresses rather than bech32 by default.

  I'll devise a test case to catch this going forward.

ACKs for top commit:
  achow101:
    ACK 6dd59d2e49
  MarcoFalke:
    ACK 6dd59d2
  meshcollider:
    Code review ACK 6dd59d2e49

Tree-SHA512: b3e0f320c97b8c1f814cc386840240cbde2761fee9711617b713d3f75a4a5dce2dff2df573d80873df42a1f4b74e816ab8552a573fa1d62c344997fbb6af9950
2020-01-16 19:23:33 +01:00
..
bitcoinconsensus.cpp Drop unused GetType() from CSizeComputer 2018-09-11 00:58:05 -04:00
bitcoinconsensus.h Update copyright headers to 2018 2018-07-27 07:15:02 -04:00
descriptor.cpp scripted-diff: Bump copyright of files changed in 2019 2019-12-30 10:42:20 +13:00
descriptor.h scripted-diff: Bump copyright of files changed in 2019 2019-12-30 10:42:20 +13:00
interpreter.cpp scripted-diff: Bump copyright of files changed in 2019 2019-12-30 10:42:20 +13:00
interpreter.h scripted-diff: Bump copyright of files changed in 2019 2019-12-30 10:42:20 +13:00
keyorigin.h Remove unused includes 2019-10-15 22:56:43 +00:00
script.cpp scripted-diff: Bump copyright of files changed in 2019 2019-12-30 10:42:20 +13:00
script.h scripted-diff: Bump copyright of files changed in 2019 2019-12-30 10:42:20 +13:00
script_error.cpp Update copyright headers to 2018 2018-07-27 07:15:02 -04:00
script_error.h Update copyright headers to 2018 2018-07-27 07:15:02 -04:00
sigcache.cpp scripted-diff: Bump copyright of files changed in 2019 2019-12-30 10:42:20 +13:00
sigcache.h Update copyright headers to 2018 2018-07-27 07:15:02 -04:00
sign.cpp scripted-diff: Bump copyright of files changed in 2019 2019-12-30 10:42:20 +13:00
sign.h scripted-diff: Bump copyright of files changed in 2019 2019-12-30 10:42:20 +13:00
signingprovider.cpp Move WatchOnly stuff from SigningProvider to CWallet 2019-07-09 16:20:18 -04:00
signingprovider.h scripted-diff: Bump copyright of files changed in 2020 2020-01-15 02:18:00 +07:00
standard.cpp scripted-diff: Bump copyright of files changed in 2019 2019-12-30 10:42:20 +13:00
standard.h Merge #17924: Bug: IsUsedDestination shouldn't use key id as script id for ScriptHash 2020-01-16 19:23:33 +01:00