PastaPastaPasta
07dcddb4ca
Backports 0.15 pr2 ( #2597 )
...
* Merge #9815 : Trivial: use EXIT_ codes instead of magic numbers
a87d02a use EXIT_ codes instead of magic numbers (Marko Bencun)
* Merge #9801 : Removed redundant parameter from mempool.PrioritiseTransaction
eaea2bb Removed redundant parameter from mempool.PrioritiseTransaction (gubatron)
* remove extra parameter (see 3a3745bb) in dash specific code
* Merge #9819 : Remove harmless read of unusued priority estimates
bc8fd12 Remove harmless read of unusued priority estimates (Alex Morcos)
* Merge #9766 : Add --exclude option to rpc-tests.py
c578408 Add exclude option to rpc-tests.py (John Newbery)
* Merge #9577 : Fix docstrings in qa tests
3f95a80 Fix docstrings in qa tests (John Newbery)
* Merge #9823 : qa: Set correct path for binaries in rpc tests
3333ad0 qa: Set correct path for binaries in rpc tests (MarcoFalke)
* Merge #9833 : Trivial: fix comments referencing AppInit2
ef9f495 Trivial: fix comments referencing AppInit2 (Marko Bencun)
* Merge #9612 : [trivial] Rephrase the definition of difficulty.
dc222f8 Trivial: Rephrase the definition of difficulty in the code. (Karl-Johan Alm)
* Merge #9847 : Extra test vector for BIP32
30aedcb BIP32 extra test vector (Pieter Wuille)
* Merge #9839 : [qa] Make import-rescan.py watchonly check reliable
864890a [qa] Make import-rescan.py watchonly check reliable (Russell Yanofsky)
Tree-SHA512: ea0e2b1d4fc8f35174c3d575fb751b428daf6ad3aa944fad4e3ddcc9195e4f17051473acabc54203b1d27cca64cf911b737ab92e986c40ef384410652e2dbea1
* Change back file params
2019-01-07 12:55:35 +03:00
Wladimir J. van der Laan
43f697866e
Merge #9108 : Use importmulti timestamp when importing watch only keys (on top of #9682 )
...
a80f98b Use importmulti timestamp when importing watch only keys (Russell Yanofsky)
a58370e Dedup nTimeFirstKey update logic (Russell Yanofsky)
2018-02-01 11:13:01 +01:00
Wladimir J. van der Laan
6f86725d00
Merge #9682 : Require timestamps for importmulti keys
...
266a811 Use MTP for importmulti "now" timestamps (Russell Yanofsky)
3cf9917 Add test to check new importmulti "now" value (Russell Yanofsky)
442887f Require timestamps for importmulti keys (Russell Yanofsky)
2018-02-01 11:13:01 +01:00
Wladimir J. van der Laan
da8808fba0
Merge #9756 : Return error when importmulti called with invalid address.
...
9acf25c Return error when importmulti called with invalid address. (Russell Yanofsky)
2018-01-23 09:24:29 +01:00
Russell Yanofsky
6bee150e8e
Require timestamps for importmulti keys
...
Additionally, accept a "now" timestamp, to allow avoiding rescans for keys
which are known never to have been used.
Note that the behavior when "now" is specified is slightly different than the
previous behavior when no timestamp was specified at all. Previously, when no
timestamp was specified, it would avoid rescanning during the importmulti call,
but set the key's nCreateTime value to 1, which would not prevent future block
reads in later ScanForWalletTransactions calls. With this change, passing a
"now" timestamp will set the key's nCreateTime to the current block time
instead of 1.
Fixes #9491
2018-01-21 14:14:34 +01:00
Wladimir J. van der Laan
96b4910fbe
Merge #9607 : Remove redundant semicolons in Python code
...
5cdf106 Remove redundant semicolons in Python code (practicalswift)
2018-01-21 12:48:33 +01:00
Wladimir J. van der Laan
efded3ca9c
Merge #7551 : Add importmulti RPC call
...
215caba Add consistency check to RPC call importmulti (Pedro Branco)
cb08fdb Add importmulti rpc call (Pedro Branco)
2018-01-13 13:44:37 +01:00
