aboutsummaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)Author
2017-05-01Merge #10305: Fix potential NPD introduced in b297426cPieter Wuille
70d3945 Fix potential NPD introduced in b297426c (Matt Corallo) Tree-SHA512: 920d03d2081ba2f3447cfa655dcbc3e17858454dab051436f717ada977d4f4bfe999c303018bc8aa33f30e37a97c63d70ba08632f5e7b7a8aa555615dde2191a
2017-05-01Trivial: remove extra character from commentCryptAxe
2017-05-01Fix potential NPD introduced in b297426cMatt Corallo
See https://github.com/bitcoin/bitcoin/pull/10290#discussion_r113954232 for more info.
2017-05-01Merge #10294: [Wallet] unset change position when there is no changeWladimir J. van der Laan
7c58863 [Wallet] unset change position when there is no change on exact match (Gregory Sanders) Tree-SHA512: ce8b9337e4132e32d80f954258d50938052c833a48e39431649d6adb16e3d18626a0ae5d300827e7fa397927fba72a1f066cb31af9b0a3ef7f1feb6024461626
2017-05-01[Wallet] unset change position when there is no change on exact matchGregory Sanders
2017-05-01Merge #8824: Refactor TxToJSON() and ScriptPubKeyToJSON()Wladimir J. van der Laan
0ff9320 refactor TxToJSON() and ScriptPubKeyToJSON() (jonnynewbs) Tree-SHA512: caf7d590829e221522edd5b1ab8ce67b53a2c6986d3bbe8477eab420b1007bf60f885ed0a25ba9587e468c00768360ddc31db37847e862858573eaed5ed8b0d6
2017-05-01Merge #10290: Add -stopatheight for benchmarkingWladimir J. van der Laan
b297426 Add -stopatheight for benchmarking (Pieter Wuille) Tree-SHA512: e8a4cca7fc1accd0dcd3a0eda97839fc34c61f25d6302082a8d6ecf9a0291b4abacbde16a0ecba7bdd2a56dd0c8d4d54300ad3b3478386da21dd7697acce381c
2017-04-28refactor TxToJSON() and ScriptPubKeyToJSON()jonnynewbs
2017-04-27Add -stopatheight for benchmarkingPieter Wuille
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 #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 #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-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 #10258: Fixed typo in documentation for merkleblock.hMarcoFalke
dd07068 Fixed typo in documentation for merkleblock.h (Mikerah) Tree-SHA512: 92655c8022eb33852c116da517b12bd17b3b668713cd85fe185a15245ea9810605626b1d0955fa117f7b56863e0a52b3a86dab42409332452b5eb72a7d34f30d
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-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-20Merge #10181: Include cleanupWladimir J. van der Laan
1c897fc Missing includes (Jorge Timón) a1fd450 Trivial: Remove unneeded includes from .h: (Jorge Timón) Tree-SHA512: ada3e62cc2435e58172a88b380be371b717a05725956c15e5493b6e19fe2903e5e6e43fd22dc24699333a0e8a0c7b42eb1ae61b41cb4ba82495be18e2d4ef3c6
2017-04-20[qt] Don't call method on null WalletModel objectRussell Yanofsky
This doesn't crash currently because the method doesn't access any object members, but this behavior is fragile and incompatible with #10102.
2017-04-20Merge #9942: Refactor CBlockPolicyEstimatorWladimir J. van der Laan
68af651 MOVEONLY: move TxConfirmStats to cpp (Alex Morcos) 2332f19 Initialize TxConfirmStats in constructor (Alex Morcos) 5ba81e5 Read and Write fee estimate file directly from CBlockPolicyEstimator (Alex Morcos) 14e10aa Call estimate(Smart)Fee directly from CBlockPolicyEstimator (Alex Morcos) dbb9e36 Give CBlockPolicyEstimator it's own lock (Alex Morcos) f6187d6 Make processBlockTx private. (Alex Morcos) ae7327b Make feeEstimator its own global instance of CBlockPolicyEstimator (Alex Morcos) Tree-SHA512: dbf3bd2b30822e609a35f3da519b62d23f8a50e564750695ddebd08553b4c01874ae3e07d792c6cc78cc377d2db33b951ffedc46ac7edaf5793f9ebb931713af
2017-04-20wallet: Make IsDummy private in CWalletDBWrapperWladimir J. van der Laan
This is only for use in the low-level functions, and CDB is already a friend class.
2017-04-20wallet: CWalletDB CDB composition not inheritanceWladimir J. van der Laan
CWalletDB now contains a CDB instead of inheriting from it. This makes it easier to replace the internal transaction with a different database, without leaking through internals.
2017-04-20wallet: Reduce references to global bitdb environmentWladimir J. van der Laan
2017-04-20wallet: Get rid of fFileBackedWladimir J. van der Laan
Instead, CWalletDB() with a dummy handle will just give you a no-op database in which writes always succeeds and reads always fail. CDB already had functionality for this, so just use that.
2017-04-20wallet: Introduce database handle wrapperWladimir J. van der Laan
Abstract database handle from explicit strFilename into CWalletDBWrapper. Also move CWallet::Backup to db.cpp - as it deals with representation details this is a database specific operation.
2017-04-20fix tsan: utiltime race on nMockTimePieter Wuille