aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-02-19Merge #9795: doc: Update manpages for master (laanwj)Wladimir J. van der Laan
eb49101 doc: Update manpages for master (Wladimir J. van der Laan)
2017-02-19Merge #9791: Avoid VLA in hash.hWladimir J. van der Laan
5c8fd50 Avoid VLA in hash.h (Pieter Wuille)
2017-02-18Merge #9657: Improve rpc-tests.pyMarcoFalke
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-18Merge #9696: [trivial] Fix recently introduced typos in commentsMarcoFalke
0c9b9b7 [trivial] Fix recently introduced typos in comments (practicalswift)
2017-02-18doc: Update manpages for masterWladimir J. van der Laan
(cherry picked from commit 268c390d02d99a4a93a0a01221e273d2b9695ff7)
2017-02-18Merge #9744: Remove unused module from rpc-testsMarcoFalke
a432aa0 Remove unused module from rpc-tests (Takashi Mitsuta)
2017-02-18Merge #9788: gitian: bump descriptors for masterMarcoFalke
8e5cca0 gitian: bump descriptors for master (Cory Fields)
2017-02-17Avoid VLA in hash.hPieter Wuille
2017-02-17gitian: bump descriptors for masterCory Fields
This was skipped for the 0.14 cycle.
2017-02-17Merge #9786: boost: remove iostreams includesWladimir J. van der Laan
3301587 boost: remove iostreams includes (Cory Fields)
2017-02-17Merge #9785: Avoid variable length arraysWladimir J. van der Laan
c801c82 Move BIP70_MAX_PAYMENTREQUEST_SIZE to header (Pieter Wuille) 914fad1 Make KEY_SIZE a compile-time constant (Pieter Wuille)
2017-02-17boost: remove iostreams includesCory Fields
They're unused and produce nasty deprecation warnings
2017-02-17Move BIP70_MAX_PAYMENTREQUEST_SIZE to headerPieter Wuille
2017-02-17Make KEY_SIZE a compile-time constantPieter Wuille
2017-02-17Various review markups for rpc-tests.py improvementsJohn Newbery
2017-02-17build: bump version to 0.14.99Wladimir J. van der Laan
Now that 0.14 branch has been split off, master is 0.14.99 (pre-0.15). Also clean out release notes.
2017-02-17Merge #9761: Use 2 hour grace period for key timestamps in importmulti rescansWladimir J. van der Laan
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-17Merge #9778: Add two hour buffer to manual pruningWladimir J. van der Laan
91fb506 Add two hour buffer to manual pruning (Alex Morcos)
2017-02-17Merge #9779: Update nMinimumChainWork and defaultAssumeValid.Wladimir J. van der Laan
3f78e46 Update nMinimumChainWork and defaultAssumeValid. (Gregory Maxwell)
2017-02-17Merge #9777: Handle unusual maxsigcachesize gracefullyWladimir J. van der Laan
55c403b Ensure `-maxsigcachesize` is in valid range (John Newbery)
2017-02-17Ensure `-maxsigcachesize` is in valid rangeJohn Newbery
- 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-16Add two hour buffer to manual pruningAlex Morcos
2017-02-16Update nMinimumChainWork and defaultAssumeValid.Gregory Maxwell
2017-02-16Use 2 hour grace period for key timestamps in importmulti rescansRussell Yanofsky
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-16Merge #9675: Fix typo and spelling inconsistency in CONTRIBUTING.mdWladimir J. van der Laan
36164fa Fix typo and spelling inconsistency in CONTRIBUTING.md (Koki Takahashi)
2017-02-16[qa] Extend import-rescan.py to test imports on pruned nodes.Russell Yanofsky
2017-02-16[qa] Extend import-rescan.py to test specific key timestampsRussell Yanofsky
2017-02-16[qa] Simplify import-rescan.pyRussell Yanofsky
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-16Merge #9763: [Trivial] Update comments referencing main.cppWladimir J. van der Laan
00e623d [Trivial] Update comments referencing main.cpp (CryptAxe)
2017-02-16[Trivial] Update comments referencing main.cppCryptAxe
2017-02-16Merge #9771: Add missing cs_wallet lock that triggers new lock held assertionWladimir J. van der Laan
07afcd6 Add missing cs_wallet lock that triggers new lock held assertion (Russell Yanofsky)
2017-02-16Merge #9764: wallet: Prevent "overrides a member function but is not marked ↵Wladimir J. van der Laan
'override'" warnings 6c5427d wallet: Prevent "overrides a member function but is not marked 'override'" warnings (Wladimir J. van der Laan)
2017-02-16Merge #9765: Harden against mistakes handling invalid blocksWladimir J. van der Laan
ba803ef Harden against mistakes handling invalid blocks (Suhas Daftuar)
2017-02-15Add missing cs_wallet lock that triggers new lock held assertionRussell Yanofsky
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-15Merge #9756: Return error when importmulti called with invalid address.Wladimir J. van der Laan
9acf25c Return error when importmulti called with invalid address. (Russell Yanofsky)
2017-02-15Merge #9758: Selectively suppress deprecation warningsWladimir J. van der Laan
4b6cccc Selectively suppress deprecation warnings (Jonas Schnelli)
2017-02-15Harden against mistakes handling invalid blocksSuhas Daftuar
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-15wallet: Prevent "overrides a member function but is not marked 'override'" ↵Wladimir J. van der Laan
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-15Merge #9108: Use importmulti timestamp when importing watch only keys (on ↵Wladimir J. van der Laan
top of #9682) a80f98b Use importmulti timestamp when importing watch only keys (Russell Yanofsky) a58370e Dedup nTimeFirstKey update logic (Russell Yanofsky)
2017-02-15Merge #9553: Use z = std::max(x - y, 0) instead of z = x - y; if (z < 0) z = 0;Wladimir J. van der Laan
a47da4b Use z = std::max(x - y, 0); instead of z = x - y; if (z < 0) z = 0; (practicalswift)
2017-02-14[trivial] Fix recently introduced typos in commentspracticalswift
2017-02-14Merge #9755: Bugfix: Qt/Options: Restore persistent "restart required" noticeJonas Schnelli
0b4f273 Bugfix: Qt/Options: Restore persistent "restart required" notice (Luke Dashjr)
2017-02-14Merge #9720: net: fix banning and disallow sending messages before receiving ↵Wladimir J. van der Laan
verack d943491 qa: add a test to detect leaky p2p messages (Cory Fields) 8650bbb qa: Expose on-connection to mininode listeners (Matt Corallo) 5b5e4f8 qa: mininode learns when a socket connects, not its first action (Matt Corallo) cbfc5a6 net: require a verack before responding to anything else (Cory Fields) 8502e7a net: parse reject earlier (Cory Fields) c45b9fb net: correctly ban before the handshake is complete (Cory Fields)
2017-02-14Merge #9715: Disconnect peers which we do not receive VERACKs from within 60 secWladimir J. van der Laan
66f861a Add a test for P2P inactivity timeouts (Matt Corallo) b436f92 qa: Expose on-connection to mininode listeners (Matt Corallo) 8aaba7a qa: mininode learns when a socket connects, not its first action (Matt Corallo) 2cbd119 Disconnect peers which we do not receive VERACKs from within 60 sec (Matt Corallo)
2017-02-14Merge #9682: Require timestamps for importmulti keysWladimir J. van der Laan
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)
2017-02-14Selectively suppress deprecation warningsJonas Schnelli
2017-02-14Merge #9735: devtools: Handle Qt formatting characters edge-case in ↵Wladimir J. van der Laan
update-translations.py 7179e7c qt: Periodic translations update (Wladimir J. van der Laan) 5e903a5 devtools: Handle Qt formatting characters edge-case in update-translations.py (Wladimir J. van der Laan)
2017-02-13qa: add a test to detect leaky p2p messagesCory Fields
This is certainly not exhaustive, but it's better than nothing. Adds checks for: - Any message received before sending a version - Any message received other than version/reject before sending a verack It also tries to goad the remote into sending a pong, address, or block announcement.
2017-02-13qa: Expose on-connection to mininode listenersMatt Corallo
2017-02-13qa: mininode learns when a socket connects, not its first actionMatt Corallo