Merge #11854: Split up key and script metadata for better type safety
commit22149540f9e74ddff84973d9818ec9a34a533764
authorWladimir J. van der Laan <laanwj@gmail.com>
Tue, 12 Dec 2017 18:48:24 +0000 (12 19:48 +0100)
committerWladimir J. van der Laan <laanwj@gmail.com>
Tue, 12 Dec 2017 18:57:43 +0000 (12 19:57 +0100)
tree0cb760543a107538053aac2e973b1c3fbe7d60f2
parent5d132e8b974652d96466a1b73ec1231614719fe2
parent9c8eca7704e88b3f4ee38cf85bef0f1febc440e5
Merge #11854: Split up key and script metadata for better type safety

9c8eca7 Split up key and script metadata for better type safety (Russell Yanofsky)

Pull request description:

  Suggested by @TheBlueMatt
  https://github.com/bitcoin/bitcoin/pull/11403#discussion_r155599383

  Combining the maps was probably never a good arrangement but is more
  problematic now in presence of WitnessV0ScriptHash and WitnessV0KeyHash types.

Tree-SHA512: 9263e9c01090fb49221e91d88a88241a9691dda3e92d86041c8e284306a64d3af5e2438249f9dcc3e6e4a5c11c1a89f975a86d55690adf95bf2636f15f99f92a
src/wallet/wallet.cpp