diff options
| author | Samuel Dobson <dobsonsa68@gmail.com> | 2019-11-23 10:19:43 +1300 |
|---|---|---|
| committer | Samuel Dobson <dobsonsa68@gmail.com> | 2019-11-23 10:20:04 +1300 |
| commit | 4effd67bf407e25e776a37739c6ca103e1f26d74 (patch) | |
| tree | aa3dcf789762b46fe3e8efc5a91373c7429bca2a /build_msvc/msvc-autogen.py | |
| parent | a6f5b6f47d71662dfb37810949b67f344cf2a1f2 (diff) | |
| parent | b84e776fd166ac422ac4a0dcdc1c6f7fd921bf70 (diff) | |
| download | bitcoin-4effd67bf407e25e776a37739c6ca103e1f26d74.tar.xz | |
Merge #17387: wallet_importmulti: use addresses of the same type as being imported
b84e776fd166ac422ac4a0dcdc1c6f7fd921bf70 wallet_importmulti: use addresses of the same type as being imported (Andrew Chow)
Pull request description:
When constructing an import from the solving data of an address, make sure that the original address is the same type as the one that will be imported.
See also: https://github.com/bitcoin/bitcoin/pull/17374#issuecomment-550036931
Part of #17261
ACKs for top commit:
Sjors:
Code review ACK b84e776
meshcollider:
Tested re-ACK b84e776fd166ac422ac4a0dcdc1c6f7fd921bf70
Tree-SHA512: 53c49c63af8cbade0116a62beddc77df1a411d8ed76571c3053f6aff096f41a5325421a188bab3dcacfda69bb28fdff6ba921ddd80f29c4abbadb3b58fda884c
Diffstat (limited to 'build_msvc/msvc-autogen.py')
0 files changed, 0 insertions, 0 deletions