Wladimir J. van der Laan
7639d38f14
Merge #9726 : netbase: Do not print an error on connection timeouts through proxy
...
3ddfe29
netbase: Do not print an error on connection timeouts through proxy (Wladimir J. van der Laan)
13f6085
netbase: Make InterruptibleRecv return an error code instead of bool (Wladimir J. van der Laan)
2017-02-20 17:49:51 +01:00
Wladimir J. van der Laan
aa791e2911
Merge #9619 : Bugfix: RPC/Mining: GBT should return 1 MB sizelimit before segwit activates
...
279f944
QA: Test GBT size/weight limit values (Luke Dashjr)
9fc7f0b
Bugfix: RPC/Mining: GBT should return 1 MB sizelimit before segwit activates (Luke Dashjr)
2017-02-20 17:32:02 +01:00
Wladimir J. van der Laan
2dad02232a
Merge #9760 : [wallet] Remove importmulti always-true check
...
ec1267f
[wallet] Remove importmulti always-true check (Russell Yanofsky)
2017-02-20 17:30:07 +01:00
Wladimir J. van der Laan
7ca2f54270
Merge #9794 : Minor update to qrencode package builder
...
1bfe6b4
Use package name variable inside $(package)_file_name variable (Mitchell Cash)
2017-02-20 17:29:21 +01:00
Wladimir J. van der Laan
1a9fd5cb9d
Merge #9724 : Qt/Intro: Add explanation of IBD process
...
f6d18f5
Qt/Intro: Explain a bit more what will happen first time (Luke Dashjr)
50c5657
Qt/Intro: Storage shouldn't grow significantly with pruning enabled (Luke Dashjr)
9adb694
Qt/Intro: Move sizeWarningLabel text into C++ code (Luke Dashjr)
2017-02-20 17:26:15 +01:00
Wladimir J. van der Laan
390a39bb5c
Merge #9795 : doc: Update manpages for master (laanwj)
...
eb49101
doc: Update manpages for master (Wladimir J. van der Laan)
2017-02-19 16:03:35 +01:00
Wladimir J. van der Laan
1f9e904f45
Merge #9791 : Avoid VLA in hash.h
...
5c8fd50
Avoid VLA in hash.h (Pieter Wuille)
2017-02-19 13:28:30 +01:00
MarcoFalke
7ff4a538a8
Merge #9657 : Improve rpc-tests.py
...
a6a3e58
Various review markups for rpc-tests.py improvements (John Newbery)
3de3ccd
Refactor rpc-tests.py (John Newbery)
afd38e7
Improve rpc-tests.py arguments (John Newbery)
91bffff
Use argparse in rpc_tests.py (John Newbery)
1581ecb
Use configparser in rpc-tests.py (John Newbery)
2017-02-18 15:29:40 +01:00
MarcoFalke
aa5fa642b0
Merge #9696 : [trivial] Fix recently introduced typos in comments
...
0c9b9b7
[trivial] Fix recently introduced typos in comments (practicalswift)
2017-02-18 12:13:09 +01:00
Wladimir J. van der Laan
eb4910193a
doc: Update manpages for master
...
(cherry picked from commit 268c390d02d99a4a93a0a01221e273d2b9695ff7)
2017-02-18 11:55:33 +01:00
MarcoFalke
8efd1c820b
Merge #9744 : Remove unused module from rpc-tests
...
a432aa0
Remove unused module from rpc-tests (Takashi Mitsuta)
2017-02-18 11:31:32 +01:00
Mitchell Cash
1bfe6b426e
Use package name variable inside $(package)_file_name variable
2017-02-18 17:37:27 +10:00
MarcoFalke
50a226563c
Merge #9788 : gitian: bump descriptors for master
...
8e5cca0
gitian: bump descriptors for master (Cory Fields)
2017-02-18 02:19:04 +01:00
Pieter Wuille
5c8fd50811
Avoid VLA in hash.h
2017-02-17 15:28:28 -08:00
Cory Fields
8e5cca027f
gitian: bump descriptors for master
...
This was skipped for the 0.14 cycle.
2017-02-17 16:11:43 -05:00
Wladimir J. van der Laan
12f46fa7d8
Merge #9786 : boost: remove iostreams includes
...
3301587
boost: remove iostreams includes (Cory Fields)
2017-02-17 21:48:37 +01:00
Wladimir J. van der Laan
df42bcdbfe
Merge #9785 : Avoid variable length arrays
...
c801c82
Move BIP70_MAX_PAYMENTREQUEST_SIZE to header (Pieter Wuille)
914fad1
Make KEY_SIZE a compile-time constant (Pieter Wuille)
2017-02-17 21:48:05 +01:00
Cory Fields
3301587dc5
boost: remove iostreams includes
...
They're unused and produce nasty deprecation warnings
2017-02-17 15:06:09 -05:00
Pieter Wuille
c801c82e25
Move BIP70_MAX_PAYMENTREQUEST_SIZE to header
2017-02-17 11:54:32 -08:00
Pieter Wuille
914fad155d
Make KEY_SIZE a compile-time constant
2017-02-17 11:42:22 -08:00
John Newbery
a6a3e58c48
Various review markups for rpc-tests.py improvements
2017-02-17 14:22:56 -05:00
Wladimir J. van der Laan
f87e8f5392
build: bump version to 0.14.99
...
Now that 0.14 branch has been split off, master is 0.14.99 (pre-0.15).
Also clean out release notes.
2017-02-17 17:27:18 +01:00
Russell Yanofsky
ec1267f13b
[wallet] Remove importmulti always-true check
...
Remove "nLowestTimestamp <= chainActive.Tip()->GetBlockTimeMax()" check from
importmulti, which is always true because nLowestTimestamp is set to the
minimum of the most recent block time and all the imported key timestamps,
which is necessarily lower than the maximum block time.
2017-02-17 07:00:41 -05:00
Wladimir J. van der Laan
9828f9a996
Merge #9761 : Use 2 hour grace period for key timestamps in importmulti rescans
...
e662af3
Use 2 hour grace period for key timestamps in importmulti rescans (Russell Yanofsky)
38d3e9e
[qa] Extend import-rescan.py to test imports on pruned nodes. (Russell Yanofsky)
c28583d
[qa] Extend import-rescan.py to test specific key timestamps (Russell Yanofsky)
8be0866
[qa] Simplify import-rescan.py (Russell Yanofsky)
2017-02-17 12:53:41 +01:00
Wladimir J. van der Laan
ad168ef4e3
Merge #9778 : Add two hour buffer to manual pruning
...
91fb506
Add two hour buffer to manual pruning (Alex Morcos)
2017-02-17 12:51:08 +01:00
Wladimir J. van der Laan
3c02b95740
Merge #9779 : Update nMinimumChainWork and defaultAssumeValid.
...
3f78e46
Update nMinimumChainWork and defaultAssumeValid. (Gregory Maxwell)
2017-02-17 12:41:49 +01:00
Wladimir J. van der Laan
8dee822177
Merge #9777 : Handle unusual maxsigcachesize gracefully
...
55c403b
Ensure `-maxsigcachesize` is in valid range (John Newbery)
2017-02-17 09:05:48 +01:00
John Newbery
55c403b8fe
Ensure -maxsigcachesize
is in valid range
...
- If the -maxsigcachesize parameter is set to zero, setup a minimum sized
sigcache (2 elements) rather than segfaulting.
- Handle maxsigcachesize being negative
- Handle maxsigcachesize being too large
2017-02-17 09:04:37 +01:00
Alex Morcos
91fb506e0a
Add two hour buffer to manual pruning
2017-02-16 17:47:56 -05:00
Gregory Maxwell
3f78e460ba
Update nMinimumChainWork and defaultAssumeValid.
2017-02-16 19:31:03 +00:00
Luke Dashjr
279f944e8d
QA: Test GBT size/weight limit values
2017-02-16 18:47:55 +00:00
Russell Yanofsky
e662af3583
Use 2 hour grace period for key timestamps in importmulti rescans
...
Gregory Maxwell <greg@xiph.org> pointed out the lack of grace period in
https://github.com/bitcoin/bitcoin/pull/9490#issue-199407998 .
The importwallet RPC which uses key timestamps in a similar way already has a 2
hour grace period.
2017-02-16 09:05:55 -05:00
Wladimir J. van der Laan
afae75fd3d
Merge #9675 : Fix typo and spelling inconsistency in CONTRIBUTING.md
...
36164fa
Fix typo and spelling inconsistency in CONTRIBUTING.md (Koki Takahashi)
2017-02-16 15:05:55 +01:00
Russell Yanofsky
38d3e9ee59
[qa] Extend import-rescan.py to test imports on pruned nodes.
2017-02-16 09:05:55 -05:00
Russell Yanofsky
c28583d062
[qa] Extend import-rescan.py to test specific key timestamps
2017-02-16 09:05:55 -05:00
Russell Yanofsky
8be0866883
[qa] Simplify import-rescan.py
...
Get rid of partial functions so the test can be more easily extended to add
more variants of imports with options that affect rescanning (e.g. different
key timestamps).
Also change the second half of the test to send /to/ the imported addresses,
instead of /from/ the imported addresses. The goal of this part of the test was
to confirm that the wallet would pick up new transactions after an import
regardless of whether or not a rescan happened during the import. But because
the wallet can only do this reliably for incoming transactions and not outgoing
transactions (which require the wallet to look up transaction inputs) the test
previously was less meaningful than it should have been.
2017-02-16 09:05:55 -05:00
Wladimir J. van der Laan
8743320d6c
Merge #9763 : [Trivial] Update comments referencing main.cpp
...
00e623d
[Trivial] Update comments referencing main.cpp (CryptAxe)
2017-02-16 14:01:14 +01:00
CryptAxe
00e623d0b8
[Trivial] Update comments referencing main.cpp
2017-02-16 13:52:38 +01:00
Wladimir J. van der Laan
e43a58514d
Merge #9771 : Add missing cs_wallet lock that triggers new lock held assertion
...
07afcd6
Add missing cs_wallet lock that triggers new lock held assertion (Russell Yanofsky)
2017-02-16 10:30:33 +01:00
Wladimir J. van der Laan
f8af89a918
Merge #9764 : wallet: Prevent "overrides a member function but is not marked 'override'" warnings
...
6c5427d
wallet: Prevent "overrides a member function but is not marked 'override'" warnings (Wladimir J. van der Laan)
2017-02-16 10:24:24 +01:00
Wladimir J. van der Laan
1e92e041dd
Merge #9765 : Harden against mistakes handling invalid blocks
...
ba803ef
Harden against mistakes handling invalid blocks (Suhas Daftuar)
2017-02-16 10:23:41 +01:00
Russell Yanofsky
07afcd6379
Add missing cs_wallet lock that triggers new lock held assertion
...
A new AssertLockHeld(cs_wallet) call was added in commit a58370e
"Dedup nTimeFirstKey update logic" (part of PR #9108 ).
The lock held assertion will fail when loading prexisting wallets files from
before the #9108 merge that have watch-only keys.
2017-02-15 17:01:30 -05:00
Wladimir J. van der Laan
7a93af8340
Merge #9756 : Return error when importmulti called with invalid address.
...
9acf25c
Return error when importmulti called with invalid address. (Russell Yanofsky)
2017-02-15 16:29:16 +01:00
Wladimir J. van der Laan
476cc47da0
Merge #9758 : Selectively suppress deprecation warnings
...
4b6cccc
Selectively suppress deprecation warnings (Jonas Schnelli)
2017-02-15 15:08:59 +01:00
Suhas Daftuar
ba803efb68
Harden against mistakes handling invalid blocks
...
Fixes a bug in AcceptBlock() in invoking CheckBlock() with incorrect
arguments, and restores a call to CheckBlock() from ProcessNewBlock()
as belt-and-suspenders.
Updates the (overspecified) tests to match behavior.
2017-02-15 08:17:57 -05:00
Wladimir J. van der Laan
6c5427d24c
wallet: Prevent "overrides a member function but is not marked 'override'" warnings
...
Because it is used inconsistently at least version 5.4.0 of g++ to
complains about methods that don't use override. There is two ways to go
about this: remove override from the methods having it, or add it to the
methods missing it. I chose the second.
2017-02-15 11:31:28 +01:00
Wladimir J. van der Laan
d8e8b06bd0
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)
2017-02-15 11:13:48 +01:00
Wladimir J. van der Laan
4c69d683f2
Merge #9553 : Use z = std::max(x - y, 0) instead of z = x - y; if (z < 0) z = 0;
...
a47da4b
Use z = std::max(x - y, 0); instead of z = x - y; if (z < 0) z = 0; (practicalswift)
2017-02-15 09:27:47 +01:00
practicalswift
0c9b9b7d64
[trivial] Fix recently introduced typos in comments
2017-02-14 20:19:40 +01:00
Jonas Schnelli
a441db01b5
Merge #9755 : Bugfix: Qt/Options: Restore persistent "restart required" notice
...
0b4f273
Bugfix: Qt/Options: Restore persistent "restart required" notice (Luke Dashjr)
2017-02-14 15:57:02 +01:00