aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-04-28refactor TxToJSON() and ScriptPubKeyToJSON()jonnynewbs
2017-04-27Merge #10075: Remove unused C++ code not covered by unit testsWladimir J. van der Laan
b51aaf1 Remove unused C++ code not covered by unit tests (practicalswift) Tree-SHA512: 267bbd87df01a296bf23e82a8b6ee968e13e23a6aaecc535d803890a3e3e9f6208c7fc4c1f97afd98ed3e498b12fe1ada7e3cb2977ad12359a813f57336c74e5
2017-04-27Merge #10283: Cleanup: reduce to one GetMinimumFee call signaturePieter Wuille
3edbd79 cleanup: reduce to one GetMinimumFee call signature (Alex Morcos) Tree-SHA512: da7ae6f0eb06db630792243a47c95d4ceff3baf0ce1ebefa73f1eb6cab1c6fdf0a000770cf61700dd7a9e260d7a313083b79e1d667bd5cbef0b1fe8fbec411e7
2017-04-26Merge #10280: [test] Unit test amount.h/amount.cppMarcoFalke
dcb69fd [test] Unit test amount.h/amount.cpp (Jimmy Song) Tree-SHA512: dc50e6158322a282a8b8b60c8eab7ce327a33c48113a1455b8a1784f07e6277ad499e85ec978199468a2dc34e9e288287c8803c215f810fa2d841cdda9a414f5
2017-04-26cleanup: reduce to one GetMinimumFee call signatureAlex Morcos
2017-04-26Remove unused C++ code not covered by unit testspracticalswift
2017-04-26[test] Unit test amount.h/amount.cppJimmy Song
Add tests for MoneyRange, binary operators, ToString and a constructor
2017-04-26Merge #9614: [wallet] [refactor] Simplify getbalance implementationWladimir J. van der Laan
02d9f50 [wallet] Remove unneeded legacy getbalance code (Russell Yanofsky) 82b7dc3 [wallet] Add GetLegacyBalance method to simplify getbalance RPC (Russell Yanofsky) Tree-SHA512: c3b890ff1f5a3df7e886309bad94bdf5cc3c12b72983bb79c72f8655ce16edf581bff0faaade2f18c2cb723f50d516e53f87792f81c3f8143b0c4377c0d80e87
2017-04-26[wallet] Remove unneeded legacy getbalance codeRussell Yanofsky
2017-04-26[wallet] Add GetLegacyBalance method to simplify getbalance RPCRussell Yanofsky
This adds a simpler new implementation of getbalance logic along with asserts to confirm it behaves identically to the old logic. The old logic is removed in the next commit.
2017-04-26Merge #9743: Fix several potential issues found by sanitizersWladimir J. van der Laan
1d31093 fix tsan: utiltime race on nMockTime (Pieter Wuille) 321bbc2 fix ubsan: bitcoin-tx: not initialize context before IsFullyValid (Pieter Wuille) Tree-SHA512: 39ea83c6122f06339cd425deb236357694e84ce2e4e9c61c10b90a8909b6e42e8c7b76396175cdc4723ababd2fa4f935d48f8a469baf853c5a06d7b962a5c8dc
2017-04-26Merge #9670: contrib: github-merge improvementsWladimir J. van der Laan
b508424 contrib: github-merge improvements (Wladimir J. van der Laan) Tree-SHA512: 56a34e887716bf6bfcd1b6520f6b9a1bb742e1ad17e75618caf982af71fceb75d50caec1bf4279cb9a2f7a74319f1bcec4c824682841bd6e994acc0991616451
2017-04-26Merge #10273: [scripts] Minor improvements to `macdeployqtplus` script.Wladimir J. van der Laan
e8babc4 Use `with` in `macdeployqtplus` script. (Chris Gavin) 4f3ac7d Remove unused variable from `macdeployqtplus` script. (Chris Gavin) Tree-SHA512: 0259506b36f3bfcc64ada951dcd4fdab1611ef76a39f92effd1163b6d8fab06bdbf50784b4b22f8b1483697c3029c12cfee5372b442ab445887ac4f928f6de80
2017-04-26Merge #10278: [test] Add Unit Test for GetListenPortWladimir J. van der Laan
1b14449 [test] Add Unit Test for GetListenPort (Jimmy Song) Tree-SHA512: aea5f60fb3699680cc5acac9d9c8d8712634db9d629bbfa1815a29e5cf46c22f783886c608664baaa91b3282c52ce8069c358850cf4f90acf731a9e6c1701caa
2017-04-26Merge #9930: Trivial: Correct indentation and bracingWladimir J. van der Laan
31a14d4 Correct indentation and remove unnecessary braces (Matthias Grundmann) Tree-SHA512: c0e827ec4474133c7674254dfd13f59608820cd639debc7759bddae71d73451645fcfe14384f343d08f74d69ac3922bafc12a514f3b790ae2bf9271aa67d5f36
2017-04-25[test] Add Unit Test for GetListenPortJimmy Song
Add very basic unit test for GetListenPort in net_tests.cpp
2017-04-25Merge #10225: [test] Add aborttrescan testsWladimir J. van der Laan
ed60970 [test] Test abortrescan command. (Karl-Johan Alm) Tree-SHA512: 7f617adba65a6df8fdc4b01432992926a06c4a05da4e657653436f7716301fa5d6249d77894a097737e7fb9e118925883f2425c639058b8973680339bb8e61b6
2017-04-25Merge #10265: [wallet] [moveonly] Check non-null pindex before potentially ↵Wladimir J. van der Laan
referencing c36ea69 [wallet] Make sure pindex is non-null before possibly referencing in LogPrintf call. (Karl-Johan Alm) Tree-SHA512: a14c9f3e1228bca91977bea821c56a377d80889b41d250050c9be67aa93e460319a7cf1d4b63ee40f23b5a34159590f0e3fe15dc88698dc694c0c8098bd2db4d
2017-04-25Merge #10263: Trivial: fix fee estimate write error log messageWladimir J. van der Laan
94807be Trivial: fix fee estimate write error log message (CryptAxe) Tree-SHA512: 998c9b331e901562c9ba575a85bc6c66f28d926dfe8116f08ab903e024c63a13fd37a58d19eb6504ad880d5bbccfbf6cba83ba0a6917f5d9068c52114f71b437
2017-04-25Merge #10270: Remove Clang workaround for Boost 1.46Wladimir J. van der Laan
93dbb15 Remove Clang workaround for Boost 1.46 (fanquake) Tree-SHA512: 1246841b264688f5fe5a2a514dd732d400307fa068686857e8aedaebb292ae65b21ab96b5ff9477ccd2f049882b967b6e143683963ce1be0b9e781596c5372d1
2017-04-25Use `with` in `macdeployqtplus` script.Chris Gavin
2017-04-25Remove unused variable from `macdeployqtplus` script.Chris Gavin
2017-04-25Merge #10272: [Tests] Prevent warning: variable 'x' is uninitializedWladimir J. van der Laan
5ec8836 Prevent warning: variable 'x' is uninitialized (Pavel Janík) Tree-SHA512: 54e39d4b85303db033bd08c52ff2fa093ec9a1b1b9550911bb2123be60fa471cba81f36859681170695dfafb3a8a4c154122917c05b5a23837cf97c25907afc1
2017-04-25[wallet] Make sure pindex is non-null before possibly referencing in ↵Karl-Johan Alm
LogPrintf call.
2017-04-25Prevent warning: variable 'x' is uninitializedPavel Janík
2017-04-25Remove Clang workaround for Boost 1.46fanquake
2017-04-24Merge #10249: Switch CCoinsMap from boost to std unordered_mapPieter Wuille
e6756ad Switch CCoinsMap from boost to std unordered_map (Pieter Wuille) 344a2c4 Add support for std::unordered_{map,set} to memusage.h (Pieter Wuille) Tree-SHA512: 51288301e7c0f29ffac8c59f4cc73ddc36b7abeb764009da6543f2eaeeb9f89bd47dde48131a7e0aefad8f7cb0b74b2f33b8be052c8e8a718339c3e6bb963447
2017-04-24Merge #9951: Wallet database handling abstractions/simplificationsWladimir J. van der Laan
911a480 wallet: Add comment describing the various classes in walletdb.h (Wladimir J. van der Laan) 69d2e9b wallet: Make IsDummy private in CWalletDBWrapper (Wladimir J. van der Laan) 3323281 wallet: CWalletDB CDB composition not inheritance (Wladimir J. van der Laan) be9e1a9 wallet: Reduce references to global bitdb environment (Wladimir J. van der Laan) 071c955 wallet: Get rid of fFileBacked (Wladimir J. van der Laan) 71afe3c wallet: Introduce database handle wrapper (Wladimir J. van der Laan) Tree-SHA512: e4e72953c61a2f6995d609a32f8ed8e18cab9a92bc9e193d46a1d1f06d9daa5c6da6fce2867d4e3ba4fc0439141901a3d35f246486f0fa8f59587786379dfcbd
2017-04-24Merge #9792: FastRandomContext improvements and switch to ChaCha20Wladimir J. van der Laan
4fd2d2f Add a FastRandomContext::randrange and use it (Pieter Wuille) 1632922 Switch FastRandomContext to ChaCha20 (Pieter Wuille) e04326f Add ChaCha20 (Pieter Wuille) 663fbae FastRandom benchmark (Pieter Wuille) c21cbe6 Introduce FastRandomContext::randbool() (Pieter Wuille) Tree-SHA512: 7fff61e3f6d6dc6ac846ca643d877b377db609646dd401a0e8f50b052c6b9bcd2f5fc34de6bbf28f04afd1724f6279ee163ead5f37d724fb782a00239f35db1d
2017-04-23Trivial: fix fee estimate write error log messageCryptAxe
2017-04-23Merge #10097: Move zmq test skipping logic into individual test case.MarcoFalke
6803e09 Move zmq test skipping logic into individual test case. (John Newbery) Tree-SHA512: 9d166b53e9acf386c4dafc860b38e2901b331a7505bba9714a2f4e3bdef68b0316c8b76fddbfb620835ddee549cf32fffb3a96a19b0799ad94f2553f55f19a35
2017-04-23Merge #10023: [tests] remove maxblocksinflight.py (functionality covered by ↵MarcoFalke
other test) 5f4bcf2 [tests] Remove maxblocksinflight testcase (John Newbery) Tree-SHA512: 827c8b12f4b52684a973bbfc508c5906e640572e22a96b9420a7aea86ad8d4aa4d6fcc2bb091f747e2fdd18c897e0456baff254bd5e3ceaf721bd3f09a2fd60b
2017-04-23Merge #10224: [test] Add test for getaddednodeinfoMarcoFalke
bc53752 Tests: Add simple test for getaddednodeinfo (Jimmy Song) Tree-SHA512: d2f8a384fb994b83f881b585db70e7cf57980821074126d254960cb67988a40672ffde065d0ccd9a90f9e3b395d8cd33695c796ecb4b54f69fe74ee2bf7497a6
2017-04-23Merge #10258: Fixed typo in documentation for merkleblock.hMarcoFalke
dd07068 Fixed typo in documentation for merkleblock.h (Mikerah) Tree-SHA512: 92655c8022eb33852c116da517b12bd17b3b668713cd85fe185a15245ea9810605626b1d0955fa117f7b56863e0a52b3a86dab42409332452b5eb72a7d34f30d
2017-04-22doc: Add historical release notes for 0.14.1Wladimir J. van der Laan
2017-04-22Fixed typo in documentation for merkleblock.hMikerah
2017-04-21Merge #10201: pass Consensus::Params& to ReceivedBlockTransactions()Wladimir J. van der Laan
25660e9 pass Consensus::Params& to ReceivedBlockTransactions() (Mario Dian) Tree-SHA512: d3a5b19d93313e4bda622b322bc9cbfb7e31486010eac40fca6eea9703f814f9667f778122ba7366bb304482a2c03e2e3325083beecac374751692361952e467
2017-04-21Merge #10250: Fix some empty vector referencesWladimir J. van der Laan
f478d98 Fix some empty vector references (Pieter Wuille) Tree-SHA512: a22022b9060cd39f8d349e8dd24490614c0028eae2fbc7186d0d26b1d47529049b2daee41f093c0722130274a0b6f7f8671c2295c8cb4a97028771eaff080734
2017-04-21Merge #10223: Tests: Refactor to create witness script creation functionWladimir J. van der Laan
c39a6b9 Tests: Refactor to create witness script creation function (Jimmy Song) Tree-SHA512: 1dde621c811ea1a2719acb9a9b84825d3f520234da7fc4045da13754d4a6e6736de2fd508a2b6e64226ad95c7e634bf76d36bd0dcd1b37c63e7b1e172ee0816c
2017-04-21Merge #10229: Tests: Add test for getdifficultyWladimir J. van der Laan
821dd5e Tests: Add test for getdifficulty (Jimmy Song) Tree-SHA512: 3da78c4f88efdaab8374582cda606620beb2f1e9a93119a72b67572702c17c36b68c3abf9d466e8c7fb8ba9e8afa9a172e454c553df10d3054f19b3282d3097b
2017-04-21contrib: github-merge improvementsWladimir J. van der Laan
Some minor github-merge improvements I've made over time: User interface: - Print merge details again before signing off, to refresh your memory - usually I'll have done lots of different things in the shell so this will have scrolled out a long time ago. - Require a valid answer on the prompts. One of the requested answers must be typed, if not, the prompt will re-ask. This prevents accidentally rejecting. Efficiency: - Condense "accept merge" and "sign off" prompts. There's no reason to have this as two separate prompts, both are just opportunities to skip out on the merge, no action is performed in between. Merging: - Strip spaces from github title. This avoids redundant spaces surrounding it from getting into the commit message.
2017-04-21wallet: Add comment describing the various classes in walletdb.hWladimir J. van der Laan
2017-04-21Fix some empty vector referencesPieter Wuille
streams.h has some methods that can be tricked into dereferencing null pointers or end() iterators. Fix this.
2017-04-21Switch CCoinsMap from boost to std unordered_mapPieter Wuille
2017-04-21Add support for std::unordered_{map,set} to memusage.hPieter Wuille
2017-04-21Merge #10228: build: regenerate bitcoin-config.h as necessaryWladimir J. van der Laan
91ab8f5 build: fix bitcoin-config.h regeneration after touching build files (Cory Fields) 3577603 build: remove wonky auto top-level convenience targets (Cory Fields) Tree-SHA512: 2e68634439eeb7eca43cd2858135a583bfe0cf146e021a8384a24f7267aacc6f99bdc7a6d497a04d32e6a03e9446f0f599afb5bd53346dadf19f47d5fb2ea9f9
2017-04-21Merge #10242: [qt] Don't call method on null WalletModel objectWladimir J. van der Laan
fb463d1 [qt] Don't call method on null WalletModel object (Russell Yanofsky) Tree-SHA512: 84c9d394a16eb44e2673e7d16961ea9514fd0ef3912baf7cd7b8424a46ead138ac8ecc59c4eebfb46941fa3081555fd6ee15fec699a3952e81f960932e06cee0
2017-04-21Merge #10239: Make Boost use std::atomic internallyWladimir J. van der Laan
394ccf7 Make Boost use std::atomic internally (Pieter Wuille) Tree-SHA512: 2be198caea1b255d29ab841ca9f6ee4f32ec875cb9657553ed6ea6d21a4cd1390f1e3b22b23a3a4a24d9efc0bda100c7fbfd4dc480e0cc9831b565e989a2b636
2017-04-21Merge #10245: Minor fix in build documentation for FreeBSD 11Wladimir J. van der Laan
0611bc3 Minor fix in build documentation for FreeBSD 11 (Shigeya Suzuki) Tree-SHA512: d0e0b66868e4a988e1fa121b9c7b2877b77e2b3c7a9d7a6220c9e16cf0d6817786e9020aeba19dfa2cbc07b2fbba12f2afefc442e762a7d00292bde7515ef880
2017-04-21[test] Test abortrescan command.Karl-Johan Alm