aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-12-12net: pass socket closing responsibility up to caller for outgoing connectionsCory Fields
This allows const references to be passed around, making it clear where the socket may and may not be invalidated.
2017-12-12net: Move IsSelectableSocket check into socket creationCory Fields
We use select in ConnectSocketDirectly, so this check needs to happen before that. IsSelectableSocket will not be relevant after upcoming changes to remove select.
2017-12-12net: split socket creation out of connectionCory Fields
Also, check for the correct error during socket creation
2017-11-07Merge #11597: [trivial] Fix error messages in CFeeBumperMarcoFalke
a02c5e459 [trivial] Fix error messages in CFeeBumper (Karl-Johan Alm) Pull request description: …pool fee rate. Tree-SHA512: c179853b2a19fdb767e46b29068f3e1ce6db75fda4356746472c93c5b51f0aa495a988c4da1e14762993d57229e525594a2e9d0e089f931c1c67fec7807bda54
2017-11-07Merge #10866: Fix -Wthread-safety-analysis warnings. Compile with ↵Pieter Wuille
-Wthread-safety-analysis if available. 76ea17c79 Add mutex requirement for AddToCompactExtraTransactions(…) (practicalswift) 4616c825a Use -Wthread-safety-analysis if available (+ -Werror=thread-safety-analysis if --enable-werror) (practicalswift) 7e319d639 Fix -Wthread-safety-analysis warnings. Change the sync.h primitives to std from boost. (Matt Corallo) Pull request description: * Add mutex requirement for `AddToCompactExtraTransactions(…)`. * Use `-Wthread-safety-analysis` if available. * Rebased on top of https://github.com/TheBlueMatt/bitcoin/commits/2017-08-test-10923 - now includes: Fix -Wthread-safety-analysis warnings. Change the sync.h primitives to std from boost. Tree-SHA512: fb7365f85daa2741c276a1c899228181a8d46af51db7fbbdffceeaff121a3eb2ab74d7c8bf5e7de879bcc5042d00d24cb4649c312d51caba45a3f6135fd8b38f
2017-11-07Merge #11620: [build] .gitignore: add background.tiffMarcoFalke
4a110a009 [build] .gitignore: add background.tiff (Sjors Provoost) Pull request description: On OSX, running `make deploy` results in three files that were not covered by `.gitignore`: background.tiff background.tiff.png background.tiff@2x.png Tree-SHA512: cee7a6ebbc50f28bf588121902f6026ec08cf6516d9e56734dfc1b2d3f238e2db5bf87411f6a74b8bd06569f792789ac9f9046e6183f63fd675b953f24b060fc
2017-11-07Merge #11624: Docs: Change formatting for sequence of stepsMarcoFalke
d0b1fc88d Docs: Change formatting for sequence of steps (Vivek Ganesan) Pull request description: A numbered list is used when the sequence of steps matters. A bulleted list is used to denote a set of items where the sequence does not matter. The workflow is a sequence and hence changed to a numbered list. Reference: https://www.w3.org/wiki/HTML_lists#Ordered_lists Tree-SHA512: 310532713ed2dc3a5fe6d3b54f77fef09f355fa0ead57f2861c469e9149c658af4767cf00fb3e13569f6c4700edb0cc0265c2654c59393df80a99bf5123de5f5
2017-11-07Docs: Change formatting for sequence of stepsVivek Ganesan
A numbered list is used when the sequence of steps matters. A bulleted list is used to denote a set of items where the sequence does not matter. The workflow is a sequence and hence changed to a numbered list.
2017-11-07Merge #11626: rpc: Make `logging` RPC publicMarcoFalke
cabff7588 rpc: Make logging RPC public (Wladimir J. van der Laan) Pull request description: This started out as a developer hack but now it's useful enough for general use. Unhide the call by moving it to `control` category. This makes it documented in `help`. Tree-SHA512: f45fa378558b552d4e2a110bf85100b0eaaa6180bb5f62cb54a251f66026d4625b670c69d85c281eebbf4b56b80b65618c51a5a593b8f9d0a04b31e95adc91f4
2017-11-07Merge #11554: Sanity-check script sizes in bitcoin-txMarcoFalke
a6f33ea77 Sanity-check script sizes in bitcoin-tx (Matt Corallo) Pull request description: Tree-SHA512: bb8ecb628763af23816ab085758f6140920a6ff05dcb298129c2bbe584a02a759c700a05740eca77023292c98a5658b2a608fa27d5a948d183f87ed9ab827952
2017-11-07Merge #11618: rpc: Lock cs_main in blockToJSON/blockheaderToJSONMarcoFalke
a9b6ba0b7 Add missing cs_main locks when calling blockToJSON/blockheaderToJSON (practicalswift) Pull request description: `blockToJSON(...)` and `blockheaderToJSON(...)` read the variable `chainActive` which requires holding the mutex `cs_main`. So does `GetDifficulty(...)`. Tree-SHA512: bfb94f5e3238accbf6a4daddde49d53f1891c38ae9b07e25b3098c485747159258f64bb66a50e147b32beac601de89d9d04ff717b6c4f1460d329c90a53d3333
2017-11-07Merge #11585: addrman: Add missing lock in Clear() (CAddrMan)MarcoFalke
3ab545d7f addrman: Add missing lock in Clear() (CAddrMan) (practicalswift) Pull request description: Add missing lock in `Clear()` (`CAddrMan`). The variable `vRandom` is guarded by the mutex `cs`. **Note to reviewers:** Does this look correct? Should the lock cover the entire scope of the method, or should it be limited to cover only `std::vector<int>().swap(vRandom);`? Tree-SHA512: 8833f31beaed1728fa55b13ddf9e0b8e24e395931497329be2440ce1c5113ff02871707d40830260adabd30c4ea86088f5da5cf8a821150c0d820f50a2ce386a
2017-11-07Merge #11480: [ui] Add toggle for unblinding password fieldsWladimir J. van der Laan
ff35de8 [ui] Add toggle for unblinding password fields (Thomas Snider) Pull request description: Proposed change for adding the ability to toggle password visibility in the password dialog. This is similar to functionality in most password managers and is specifically added with the use case of password managers in mind - the password in that case is likely pasted twice into both the new password and confirm password fields. If this is a welcome change, I am open to suggestions on rearranging the layout. Tree-SHA512: 1823f356f8f941cc584c44de264433e9a573cb8a358efa300a412c4458b5564d8d193969be40859195cf9c8d6768eee895ee22440d51db4f09175f9b4e28bced
2017-11-07rpc: Make logging RPC publicWladimir J. van der Laan
This started out as a developer hack but now it's useful enough for general use. Unhide the call by moving it to `control` category. This makes it documented in `help`.
2017-11-07Add missing cs_main locks when calling blockToJSON/blockheaderToJSONpracticalswift
2017-11-06Add mutex requirement for AddToCompactExtraTransactions(…)practicalswift
The vector `vExtraTxnForCompact`, which is guarded by the mutex `cs_main`, is accessed in `AddToCompactExtraTransactions(…)`.
2017-11-06Use -Wthread-safety-analysis if available (+ -Werror=thread-safety-analysis ↵practicalswift
if --enable-werror)
2017-11-06Fix -Wthread-safety-analysis warnings. Change the sync.h primitives to std ↵Matt Corallo
from boost. Commit 1. This code was written by @TheBlueMatt in the following branch: * https://github.com/TheBlueMatt/bitcoin/commits/2017-08-test-10923 This commit message was written by me (@practicalswift) who also squashed @TheBlueMatt's commits into one and tried to summarize the changes made. Commit 2. Remove boost include. Remove boost mentions in comments.
2017-11-06[build] .gitignore: add background.tiffSjors Provoost
2017-11-06Merge #11611: [build] Don't fail when passed --disable-lcov and lcov isn't ↵Wladimir J. van der Laan
available 223a4aa [build] Don't fail when passed --disable-lcov and lcov isn't available (fanquake) Pull request description: Fixes #10828 As pointed out in #10828, failing with "lcov not found" when we've been passed --disable-lcov doesn't make sense. Master currently behaves like this (where lcov isn't available): ``` ./configure --disable-lcov checking for pkg-config... /usr/local/bin/pkg-config checking pkg-config is at least version 0.9.0... yes configure: error: "lcov testing requested but lcov not found" ``` cc @janstary Tree-SHA512: 606fdbddae67e72fff175f2f34e2c9af4e6972d40d5e1ec5c5d8be5051a728e5b16c35cfd856da0c0ce81dcab9db154a4937b1a6ca1e0233b6e160f2f4362002
2017-11-05Merge #11607: Add Gitian PGP key: SjorsJonas Schnelli
41b15cfc9 Add sjors gitian key (Sjors Provoost) Pull request description: First Gitian PR: bitcoin/gitian.sigs#603 Tree-SHA512: 02ac643b31a47724bb06a80f00ca10b3f128aa4337e59e34161d6d2281f2882b1a834b3e4769de15fc3cea76616cf25b17e85026507c8f242f21b93744b4fe70
2017-11-05[build] Don't fail when passed --disable-lcov and lcov isn't availablefanquake
2017-11-04Add sjors gitian keySjors Provoost
2017-11-03[trivial] Fix error messages in CFeeBumperKarl-Johan Alm
2017-11-02Merge #11560: Connect to a new outbound peer if our tip is staleWladimir J. van der Laan
6262915 Add unit test for stale tip checking (Suhas Daftuar) 83df257 Add CConnmanTest to mutate g_connman in tests (João Barbosa) ac7b37c Connect to an extra outbound peer if our tip is stale (Suhas Daftuar) db32a65 Track tip update time and last new block announcement from each peer (Suhas Daftuar) 2d4327d net: Allow connecting to extra outbound peers (Suhas Daftuar) Pull request description: This is an alternative approach to #11534. Rather than disconnect an outbound peer when our tip looks stale, instead try to connect to an additional outbound peer. Periodically, check to see if we have more outbound peers than we target (ie if any extra peers are in use), and if so, disconnect the one that least recently announced a new block (breaking ties by choosing the newest peer that we connected to). Tree-SHA512: 8f19e910e0bb36867f81783e020af225f356451899adfc7ade1895d6d3bd5afe51c83759610dfd10c62090c4fe404efa0283b2f63fde0bd7da898a1aaa7fb281
2017-11-02Merge #11593: rpc: work-around an upstream libevent bugWladimir J. van der Laan
97932cd rpc: further constrain the libevent workaround (Cory Fields) 6b58360 rpc: work-around an upstream libevent bug (Cory Fields) Pull request description: A rare race condition may trigger while awaiting the body of a message. This may fix some reported rpc hangs/crashes. This work-around mimics what libevent does internally once a write has started, which is what usually happens, but not always due to the processing happening on a different thread: https://github.com/libevent/libevent/blob/e7ff4ef2b4fc950a765008c18e74281cdb5e7668/http.c#L373 Fixed upstream at: https://github.com/libevent/libevent/commit/5ff8eb26371c4dc56f384b2de35bea2d87814779 Tree-SHA512: b9fa97cae9da2a44101c5faf1e3be0b9cbdf722982d35541cf224be31430779c75e519c8ed18d06ab7487bfb1211069b28f22739f126d6c28ca62d3f73b79a52
2017-11-02rpc: further constrain the libevent workaroundCory Fields
The bug was introduced in 2.1.6-beta, versions before that don't need the workaround.
2017-11-02Merge #11590: [Wallet] always show help-line of wallet encryption callsMarcoFalke
720d9e8fa [Wallet] always show help-line of wallet encryption calls (Jonas Schnelli) Pull request description: We do currently show/hide the wallet encryption RPC calls from the help if the current wallet. In case of an encrypted wallet, `encryptwallet` is hidden and `walletpassphrasechange`, `walletpassphrasechange` and `walletlock` do appear in the help. This is no longer ideal in case of multiwallet due to the fact that one may want help infos in order to target a specific wallet. IMO its preferable to have a static help screen (show everything always). The currently show/hidden calls do handle the possible invalid encryption-state fine. Fixes #11588 Tree-SHA512: 513fecd15248a31361f5143685e8cdeb63dfd3fa7120828917e1db54d936dc3db60d48ce46efa5c3a563a48157fe962689879856eeeed53f904686b12aec204e
2017-11-02Add unit test for stale tip checkingSuhas Daftuar
2017-11-02Add CConnmanTest to mutate g_connman in testsJoão Barbosa
2017-11-02Connect to an extra outbound peer if our tip is staleSuhas Daftuar
If our tip hasn't updated in a while, that may be because our peers are not relaying blocks to us that we would consider valid. Allow connection to an additional outbound peer in that circumstance. Also, periodically check to see if we are exceeding our target number of outbound peers, and disconnect the one which has least recently announced a new block to us (choosing the newest such peer in the case of tie).
2017-11-01rpc: work-around an upstream libevent bugCory Fields
A rare race condition may trigger while awaiting the body of a message, see upsteam commit 5ff8eb26371c4dc56f384b2de35bea2d87814779 for details. This may fix some reported rpc hangs/crashes.
2017-11-01Track tip update time and last new block announcement from each peerSuhas Daftuar
2017-11-01net: Allow connecting to extra outbound peersSuhas Daftuar
2017-11-01Merge #11376: Ensure backupwallet fails when attempting to backup to source fileMarcoFalke
5d465e396 Ensure backupwallet fails when attempting to backup to source file (Tomas van der Wansem) Pull request description: Previous behaviour was to destroy the wallet (to zero-length) This fixes #11375 Tree-SHA512: bfd1738659b15e3f23b6bbdf55ec12269c62c820bf701daec19500b52bd5845bb5516733c6f76f36197eb155182a8a35dc239ad4de2ef1e59bbb0f124a455759
2017-11-01Merge #11531: Check that new headers are not a descendant of an invalid ↵Wladimir J. van der Laan
block (more effeciently) f3d4adf Make p2p-acceptablock not an extended test (Matt Corallo) 00dcda6 [qa] test that invalid blocks on an invalid chain get a disconnect (Matt Corallo) 015a525 Reject headers building on invalid chains by tracking invalidity (Matt Corallo) 932f118 Accept unrequested blocks with work equal to our tip (Matt Corallo) 3d9c70c Stop always storing blocks from whitelisted peers (Matt Corallo) 3b4ac43 Rewrite p2p-acceptblock in preparation for slight behavior changes (Matt Corallo) Pull request description: @sdaftuar pointed out that the version in #11487 was somewhat DoS-able as someone could feed you a valid chain that forked off the the last checkpoint block and force you to do lots of work just walking backwards across blocks for each new block they gave you. We came up with a few proposals but settled on the one implemented here as likely the simplest without obvious DoS issues. It uses our existing on-load mapBlockIndex walk to make sure everything that descends from an invalid block is marked as such, and then simply caches blocks which we attempted to connect but which were found to be invalid. To avoid DoS issues during IBD, this will need to depend on #11458. Includes tests from #11487. Tree-SHA512: 46aff8332908e122dae72ceb5fe8cd241902c2281a87f58a5fb486bf69d46458d84a096fdcb5f3e8e07fbcf7466232b10c429f4d67855425f11b38ac0bf612e1
2017-11-01Merge #11511: [Init] Remove redundant exit(EXIT_FAILURE) instances and ↵Wladimir J. van der Laan
replace with return false b296bf1 Init: Remove redundant exit(EXIT_FAILURE) instances and replace with return false (donaloconnor) Pull request description: While reviewing the bitcoin code I noticed that there are a few exit(EXIT_FAILURE) at various places in the AppInit function. This function returns to main() which will return/exit with EXIT_FAILURE so returning false instead of an explicit exit(EXIT_FAILURE) seems to be cleaner. This PR attempts to make things a bit more consistent. There is a subtle difference between exit() and return from main in that the exit() will not clean up any local vars but I don't think this makes a difference in this case. Using exit() might even lead to bugs in the future where the dtor of local objects are expected to be called. Tree-SHA512: 7d104c3a752b4e7d7bc2382ef7e62543462988f1bbf13dd4077fbeff5399729b76c71a4352556f188b8d306604232477466f5bb827b58a6f3f6273f2370e1faa
2017-11-01Merge #11571: Fixed a couple small grammatical errors.Wladimir J. van der Laan
f927ee1 Fixed a couple small grammatical errors. (Christian Gentry) Pull request description: 1. "If a pull request is not to be considered for merging (yet), please prefix the ..." 2. If a particular commit references another issue, please add the reference. For example: `refs #1234` or `fixes #4321`. Tree-SHA512: b2ed11a235800a6b8e9450937352954a2222eb6f08f9556c8f298fd3d64d18e731397b46f3141eab01e0196f53fa3a9d84fb707a1e7691a63dd146b3c5298fe5
2017-11-01Merge #11565: Make listsinceblock refuse unknown block hashWladimir J. van der Laan
659b206 Make listsinceblock refuse unknown block hash (Russell Yanofsky) Pull request description: Change suggested by @theuni who noticed listsinceblock would ignore invalid block hashes causing it to return a completely unfiltered list of transactions. Tree-SHA512: 3c8fb160265780d1334e856e853ab48e2e18372b8f1fc71ae480c3f45317048cc1fee0055d5c58031981a91b9c2bdbeb8e49a889d04ecba61729ce8109f2ce3f
2017-11-01Merge #11573: [Util] Update tinyformat.hWladimir J. van der Laan
60b98f8 [Util] Update tinyformat.h (fanquake) Pull request description: Updates `tinyformat.h` to commit c42f/tinyformat@689695c upstream. Including: https://github.com/c42f/tinyformat/commit/8a2812d8480bfb66923eea0bb5cdda79fe4f17ba https://github.com/c42f/tinyformat/commit/5d9e05a3479d1b2ec6a4602fd797f0ec26440db2 https://github.com/c42f/tinyformat/commit/48e2e48789907f80a7aec24a3f1d69196b78ed43 @achow101 mentioned that since upgrading to Ubuntu 17.10 (GCC 7), tinyformat had been throwing lots of -Wimplicit-fallthrough warnings. However fallthrough warnings should have been silenced by #10489. cc @theuni. The upstream commit to fix fallthrough warnings is in this PR https://github.com/c42f/tinyformat/pull/39. The last time tinyformat.h was updated in this repo was in #8274. Tree-SHA512: a51bd30544693550e08148daf5d244e3a3a410caff7897351eb9cd28f661dc85e193e045bb86068ee4006b2f89a7233b7573b8c50d93d2a9a15a11386fdcc605
2017-11-01Merge #11442: [Docs] Update OpenBSD Build Instructions for OpenBSD 6.2Wladimir J. van der Laan
9d30f54 [Docs] Update OpenBSD Build Instructions for OpenBSD 6.2 (fanquake) Pull request description: This updates the OpenBSD build docs to reflect building [master](8ddf60db7ad636b6a31b590251c671ded635fa1d) on a OpenBSD 6.2 VM (using VirtualBox 5.1.28 r117968 on macOS 10.12.6). Versions of installed packages were: ``` gmake 4.2.1 g++ 4.9.4 git 2.12.2 libevent 2.0.22 libtool 2.4.2 autoconf 2.69p2 automake 1.15p0 python 3.6.0 boost 1.58.0p3 llvm 4.0.0p2 ``` The boost package installed via pkg_add now seems to work correctly. So we shouldn't require manual building + patching. I also wasn't required to make adjustments to any resource limits. Building with g++ and Clang was successful, using: ``` ./configure --disable-wallet --with-gui=no CC=egcc CXX=eg++ CPP=ecpp ``` and ``` ./configure --disable-wallet --with-gui=no CC=clang CXX=clang++ ``` Running ``` make check ``` worked for ```test/test_bitcoin``` but ```test/util/bitcoin-util-test.py``` failed with: ``` Running test/util/bitcoin-util-test.py... ../test/util/bitcoin-util-test.py env: python3: No such file or directory ``` So that seems like a configuration issue, Python 3.6 is installed. Still todo: - [ ] Check if a manual installation of Berkeley DB is required - [x] Fix running ```test/util/bitcoin-util-test.py``` - [x] Have someone else verify building cc @laanwj Tree-SHA512: 34b176de4865b36dab9d66e74a15c37152e4b6c9784152c30dabbb515d6d9ae9cdbdc7a7b4d777876f91269a6a78cc277ec87775fc6c17dd509f7cf46e89a2b3
2017-10-31[Wallet] always show help-line of wallet encryption callsJonas Schnelli
2017-10-31Make p2p-acceptablock not an extended testMatt Corallo
2017-10-31[qa] test that invalid blocks on an invalid chain get a disconnectMatt Corallo
2017-10-31Reject headers building on invalid chains by tracking invalidityMatt Corallo
This tracks the set of all known invalid-themselves blocks (ie blocks which we attempted to connect but which were found to be invalid). This is used to cheaply check if new headers build on an invalid chain. While we're at it we also resolve an edge-case in invalidateblock on pruned nodes which results in them needing a reindex if they fail to reorg.
2017-10-31Accept unrequested blocks with work equal to our tipMatt Corallo
This is a simple change that makes our accept requirements the same as our request requirements, (ever so slightly) further decoupling our consensus logic from our FindNextBlocksToDownload logic in net_processing.
2017-10-31Stop always storing blocks from whitelisted peersMatt Corallo
There is no reason to wish to store blocks on disk always just because a peer is whitelisted. This appears to be a historical quirk to avoid breaking things when the accept limits were added.
2017-10-31Rewrite p2p-acceptblock in preparation for slight behavior changesMatt Corallo
Removes checking whitelisted behavior (which will be removed, the difference in behavior here makes little sense) and no longer requires that blocks at the same work as our tip be dropped if not requested (in part because we *do* request those blocks).
2017-10-31Merge #11578: net: Add missing lock in ProcessHeadersMessage(...)Wladimir J. van der Laan
2530bf2 net: Add missing lock in ProcessHeadersMessage(...) (practicalswift) Pull request description: Add missing lock in `ProcessHeadersMessage(...)`. Reading the variable `mapBlockIndex` requires holding the mutex `cs_main`. The new "Disconnect outbound peers relaying invalid headers" code added in commit 37886d5e2f9992678dea4b1bd893f4f10d61d3ad and merged as part of #11568 two days ago did not lock `cs_main` prior to accessing `mapBlockIndex`. Tree-SHA512: b799c234be8043d036183a00bc7867bbf3bd7ffe3baa94c88529da3b3cd0571c31ed11dadfaf29c5b8498341d6d0a3c928029a43b69f3267ef263682c91563a3
2017-10-31addrman: Add missing lock in Clear() (CAddrMan)practicalswift
The variable vRandom is guarded by the mutex cs.