diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2019-05-16 11:18:17 -0400 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2019-05-16 11:18:27 -0400 |
| commit | d5931f3676ecc6f5134ed9cd92b490b48ee44e57 (patch) | |
| tree | 13ac8e8d7ff32ff4ad583bfa85ed4ef1235ed4c7 /src/wallet/rpcwallet.h | |
| parent | 41f4c63b389813b587ec58d8cd6c3bbc46fe8887 (diff) | |
| parent | fa7e311e169349bfcf1dab8b980724e8ddf4e749 (diff) | |
| download | bitcoin-d5931f3676ecc6f5134ed9cd92b490b48ee44e57.tar.xz | |
Merge #15870: wallet: Only fail rescan when blocks have actually been pruned
fa7e311e16 [doc] rpcwallet: Only fail rescan when blocks have been pruned (MarcoFalke)
aaaa57c2aa scripted-diff: Bump copyright headers in wallet (MarcoFalke)
faf3729242 wallet: Only fail rescan when blocks have actually been pruned (MarcoFalke)
Pull request description:
This brings the behaviour of the import* calls closer to importmulti. After this change, the difference between importmulti and the other import* calls is
* that in importmulti you can "opt-out" of scanning early blocks by setting a later timestamp.
* that in importmulti the wallet will successfully import the data, but fail to rescan. Whereas in the other calls, the wallet will abort before importing the data.
ACKs for commit fa7e31:
promag:
utACK fa7e311e169349bfcf1dab8b980724e8ddf4e749.
jnewbery:
utACK fa7e311e169349bfcf1dab8b980724e8ddf4e749
Tree-SHA512: a57d52ffea94b64e0eb9b5d3a7a63031325833908297dd14eb0c5251ffea3b2113b131003f1db4e9599e014369165a57f107a7150bb65e4c791e5fe742f33cb8
Diffstat (limited to 'src/wallet/rpcwallet.h')
| -rw-r--r-- | src/wallet/rpcwallet.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wallet/rpcwallet.h b/src/wallet/rpcwallet.h index 90617472cc..1c0523c90b 100644 --- a/src/wallet/rpcwallet.h +++ b/src/wallet/rpcwallet.h @@ -1,4 +1,4 @@ -// Copyright (c) 2016-2018 The Bitcoin Core developers +// Copyright (c) 2016-2019 The Bitcoin Core developers // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. |