diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2019-02-07 21:08:30 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2019-02-07 22:43:33 +0100 |
| commit | 9127bd7abaf8762456285007080571c5868789c8 (patch) | |
| tree | 1b96e9f51f2e601d8b3436ce9f72e18291768aa4 /.python-version | |
| parent | 1933e38c1a08d479130d11d9fc08bc7c73a82575 (diff) | |
| parent | b985e9c850ea682eced7021faf6c7c835066c61b (diff) | |
| download | bitcoin-9127bd7abaf8762456285007080571c5868789c8.tar.xz | |
Merge #14491: Allow descriptor imports with importmulti
b985e9c850ea682eced7021faf6c7c835066c61b Add release notes for importmulti descriptor support (MeshCollider)
fbb5e935eaf17d603ec62e1a704a174235540b71 Add test for importing via descriptor (MeshCollider)
9f48053d8f9a1feacc96d7e2a00c8a3a67576948 [wallet] Allow descriptor imports with importmulti (MeshCollider)
d2b381cc91b2c4e74abe11e5bd66af647b70dafb [wallet] Refactor ProcessImport() to call ProcessImportLegacy() (John Newbery)
4cac0ddd258bc82258ccc99568d02d3b2415339d [wallet] Add ProcessImportLegacy() (John Newbery)
a1b25e12a5f57048a4639964d57c0b46eb84cd4e [wallet] Refactor ProcessImport() (John Newbery)
Pull request description:
~~Based on #14454 #14565, last two commits only are for review.~~
Best reviewed with `?w=1`
Allows a descriptor to be imported into the wallet using `importmulti` RPC. Start and end of range can be specified for ranged descriptors. The descriptor is implicitly converted to old structures on import.
Also adds a simple test of a P2SH-P2WPKH address being imported as a descriptor. More tests to come, as well as release notes.
Tree-SHA512: 160eb6fd574c4ae5b70e0109f7e5ccc95d9309138603408a1114ceb3c558065409c0d7afb66926bc8e1743c365a3b300c5f944ff18b2451acc0514fbeca1f2b3
Diffstat (limited to '.python-version')
0 files changed, 0 insertions, 0 deletions