aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-10-08Merge #17068: qt: Always generate `bitcoinstrings.cpp` on `make translate`Wladimir J. van der Laan
c640ca24f9d94f468ec6de023bf885813ac6c9a9 Always generate `bitcoinstrings.cpp` on `make translate` (Franck Royer) Pull request description: Resolves #16891. `bitcoinstrings.cpp` is to be generated at release time. Hence, it should not depend on whether the source files are younger as the releaser may proceed from a fresh checkout. More information on the investigation in the issue. ACKs for top commit: jonasschnelli: Tested ACK c640ca24f9d94f468ec6de023bf885813ac6c9a9 - Tested master + this on macOS 10.14. With this PR, it always "runs" `GEN qt/bitcoinstrings.cpp` and `GEN translate`. Tree-SHA512: f799fdc3ad16a2a6a59704bc2c50f5179e6a7e064d8f43354592f11857cc901cac99b2b90f3319d25d49c9d78378b8d119cc5f59b48ea7f1008f33dd26700877
2019-10-08Merge #17066: build: Remove workaround for ancient libtoolWladimir J. van der Laan
30fc1a3f5470cb347eb4aed281242f120510466f build: Remove workaround for ancient libtool (Hennadii Stepanov) 6ca01b9a104ebadbe7e180cb2b9d390f7c09b4ab build: Ensure a minimal version of libtool (Hennadii Stepanov) Pull request description: Since libtool 1.5.2, on Linux libtool no longer sets RPATH for any directories in the dynamic linker search path, so there is no longer an issue. This commit reverts a98356fee8a44d7d1cb37f22c876fff8f244365e. Refs: - https://wiki.debian.org/RpathIssue - [Debian jessie has libtool 2.4.2](https://packages.debian.org/jessie/libtool) ACKs for top commit: laanwj: ACK 30fc1a3f5470cb347eb4aed281242f120510466f Tree-SHA512: fab56265d4d2c96216a353cc076c6f510e15748d8134f97bae2f67b6d8c0b6a1a9f362d2ab23b19ccc3a8bba8eac3bb1668fc3e42037590f63a7ab4819c9ee15
2019-10-08Merge #17059: util: Simplify path argument for CBlockTreeDB ctorWladimir J. van der Laan
c2bb3919a8cc52ea35d424c1f31f9474f1ea4911 util: Simplify path argument for CBlockTreeDB ctor (Hennadii Stepanov) Pull request description: This PR: - simplifies path argument (`datadir/blocks/index`) for `CBlockTreeDB` constructor - does not change behavior as `GetBlocksDir()` with unset "-blocksdir" returns the same path - improves code readability ACKs for top commit: MarcoFalke: ACK c2bb3919a8cc52ea35d424c1f31f9474f1ea4911 laanwj: ACK c2bb3919a8cc52ea35d424c1f31f9474f1ea4911 promag: ACK c2bb3919a8cc52ea35d424c1f31f9474f1ea4911. Tree-SHA512: 646a0a3a31e2f419b05f696cbdfb7d8987f1d89ec0797b72464ae05680fd5f95f6469be0ea5b56f772434c49d48504cd9cf9760c05d4054d11349d502e157ee2
2019-10-08Merge #16569: Increase init file stop timeoutWladimir J. van der Laan
7fb7acfc206b4bf8c296d72b66f3bd4fe342fd87 Set init stop timeout to 10 min (setpill) Pull request description: `bitcoind` can take a long time to flush its db cache to disk upon shutdown. Systemd sends a `SIGKILL` after a timeout, causing unclean shutdowns and triggering a long "Rolling forward" at the next startup. Disabling the timeout should prevent this from happening, and does not break systemd's `restart` logic. Addresses #13736. ACKs for top commit: instagibbs: utACK https://github.com/bitcoin/bitcoin/pull/16569/commits/7fb7acfc206b4bf8c296d72b66f3bd4fe342fd87 Tree-SHA512: 16e0ce5a9ecf0628f8d93d68db3f5a78ab36021d9bede05a90c84f144db2e87e17707a6eb910cb7c018c265ce2c81d43de2988bd79e4a2d8554515db8fb5aa36
2019-10-08Merge #17011: ci: Use busybox utils for one buildWladimir J. van der Laan
ddddd8961b6209cba1bcabad73916051a99f2025 ci: Use busybox utils for one build (MarcoFalke) Pull request description: To make sure Bitcoin Core can be built with BusyBox, see https://github.com/bitcoin/bitcoin/pull/16927#issuecomment-536483706 ACKs for top commit: laanwj: ACK ddddd8961b6209cba1bcabad73916051a99f2025 Tree-SHA512: da3a4654ee7975206d04643675d309b4973a510ca344acaec97fb1ed19c43cf13489bdf236c92c4a90499ec5b3c18c3338fff096110b26abee5ffe955089f267
2019-10-08Merge #17073: move-only: PASTE macros to util/macros.hWladimir J. van der Laan
0d86f4d3dacab38f3cd5371d0c920585c178302c refactor: consolidate PASTE macros (James O'Beirne) Pull request description: Really dumb move-only stolen from #16805. Some of my pull requests also depend on this, so I split it up to not depend on #16805. ACKs for top commit: practicalswift: ACK 0d86f4d3dacab38f3cd5371d0c920585c178302c -- diff looks correct hebasto: ACK 0d86f4d3dacab38f3cd5371d0c920585c178302c, I have reviewed the code and it looks OK, I agree it can be merged. promag: ACK 0d86f4d3dacab38f3cd5371d0c920585c178302c. Tree-SHA512: 19208a8cbf83034b1ef25138d8f08d8f32ace7775f654b1597fc4599dd576f0758145f592f161cfdcaaa29d4907ac9aa5553f6f524e2b960205c760605a05901
2019-10-08Merge #16802: scripts: In linearize, search for next position of magic bytes ↵Wladimir J. van der Laan
rather than fail 3284e6c09a84e9557ec72723ad636053d3ef7122 scripts: search for next position of magic bytes rather than fail (Tim Akinbo) Pull request description: When using the `linearize-data.py` contrib script to export block data, there are edge cases where the script fails with an `Invalid magic: 00000000` error. This error occurs due to the presence of padding bytes that occasionally appears between consecutive blocks in the block data file. There's an ongoing conversation about this in #14986. sipa also admitted that it is a bug in #5028. Fortunately, this is not an issue in bitcoin core as it handles this type of situation gracefully and so no fix in bitcoin core is required. This PR is an improvement on how the script handles these "invalid magic bytes". Rather than failing, this patch allows the script to search for the next occurrence of the magic bytes and then starts reading the block from there. ACKs for top commit: laanwj: ACK 3284e6c09a84e9557ec72723ad636053d3ef7122 Tree-SHA512: 18067ae0b4b62e822dfc558a86439ad6acaf939b98479e38e8e4248536574643b26eb48e96ec7139375c88b42cbe7705a64deb13a3c239e16025a6aad3d69bfa
2019-10-08Merge #17030: test: Fix Python Docstring to include all Args.Wladimir J. van der Laan
8acd58927a614e006641384f61f8e7fca1cc68fc Fix Python Docstring to include all Args. (John Bampton) Pull request description: Found a Python function that had incorrect and missing arguments in its Docstring. ACKs for top commit: laanwj: ACK 8acd58927a614e006641384f61f8e7fca1cc68fc Tree-SHA512: 936f275f29a700d630bb479b5283e47b66f2df76d8b8c053f594e6aedf783cc98a29c924c3a46613f112dfc884acb50f21a0b18f96d939e887b12b921ef2e10f
2019-10-07Merge #17069: tests: Pass fuzzing inputs as constant referencesMarcoFalke
ffa22212560c9e7a8692cb8982d9b3b507ee9af1 tests: Pass fuzzing inputs as constant references (practicalswift) Pull request description: Pass fuzzing inputs as constant references. Split out from #17009 as suggested by MarcoFalke in https://github.com/bitcoin/bitcoin/pull/17009#discussion_r331502028. ACKs for top commit: MarcoFalke: ACK ffa22212560c9e7a8692cb8982d9b3b507ee9af1 Tree-SHA512: c1e3d6658a0b45cece2ed7e7c2ba1b78cdb71a03767231de7e5c212575117a4e2b70079265c745963480d7fcd4d9706561a2325b8c993b94eec33268ad4b293c
2019-10-07tests: Pass fuzzing inputs as constant referencespracticalswift
2019-10-07Always generate `bitcoinstrings.cpp` on `make translate`Franck Royer
`bitcoinstrings.cpp` is to be generated at release time. Hence, it should not depend on whether the source files are younger as the releaser may proceed from a fresh checkout.
2019-10-06build: Remove workaround for ancient libtoolHennadii Stepanov
Since libtool 1.5.2, on Linux libtool no longer sets RPATH for any directories in the dynamic linker search path, so there is no longer an issue. This commit reverts a98356fee8a44d7d1cb37f22c876fff8f244365e.
2019-10-06build: Ensure a minimal version of libtoolHennadii Stepanov
2019-10-06Fix Python Docstring to include all Args.John Bampton
2019-10-05util: Simplify path argument for CBlockTreeDB ctorHennadii Stepanov
This commit does not change behavior as GetBlocksDir() with unset "-blocksdir" returns the same path.
2019-10-04Merge #17049: contrib: Bump gitian descriptors for 0.20fanquake
fa1ad8f06eba5e120c30f07263250bc382891179 build: Bump gitian descriptor versions (MarcoFalke) Pull request description: Bump the gitian descriptor versions as a follow-up to #17007. Also fixes #17027 with a cherry-pick, and bump the manpages. ACKs for top commit: fanquake: ACK fa1ad8f06eba5e120c30f07263250bc382891179 Tree-SHA512: c3b669c3797e5febb51a8dd01e2621a7544a291e080d73c47a2a12ea9da84ff904533e68792e2e869ebbdc2226b2fee7517214549e6cc7e988f175098f7c412c
2019-10-04Merge #17052: scripts: update copyright_header script to include additional ↵fanquake
files dffae5a5adc0626fae1a5a13279fc4dde4ec603e scripts: update copyright_header script to include additional files (gchuf) Pull request description: Includes .sh and .bash-completion files in the script as well ACKs for top commit: MarcoFalke: ACK dffae5a5adc0626fae1a5a13279fc4dde4ec603e fanquake: ACK dffae5a5adc0626fae1a5a13279fc4dde4ec603e Tree-SHA512: b1372bc802b6613e3d6362819fefe7e2a9e656dc483238a626448e646ad57071297de108f89ecb7a71b0bcd49f8e6a2f7599f1dd7798a886872b6755de5d2ccf
2019-10-04Merge #16507: feefilter: Compute the absolute fee rather than stored ratefanquake
eb7b78165966f2c79da71b993c4c4d793e37297f modify p2p_feefilter test to catch rounding error (Gregory Sanders) 6a51f7951716d6d6fc0f9b56028f3a0dd02b61c8 Disallow implicit conversion for CFeeRate constructor (Gregory Sanders) 8e59af55aaf1b196575084bce2448af02d97d745 feefilter: Compute the absolute fee rather than stored rate to match mempool acceptance logic (Gregory Sanders) Pull request description: This means we will use the rounding-down behavior in `GetFee` to match both mempool acceptance and wallet logic, with minimal changes. Fixes https://github.com/bitcoin/bitcoin/issues/16499 Replacement PR for https://github.com/bitcoin/bitcoin/pull/16500 ACKs for top commit: ajtowns: ACK eb7b78165966f2c79da71b993c4c4d793e37297f code review only naumenkogs: utACK eb7b78165966f2c79da71b993c4c4d793e37297f achow101: re ACK eb7b78165966f2c79da71b993c4c4d793e37297f promag: ACK eb7b78165966f2c79da71b993c4c4d793e37297f. Tree-SHA512: 484a11c8f0e825f0c983b1f7e71cf6252b1bba6858194abfe4c088da3bae8a418ec539ef6c4181bf30940e277a95c08d493595d59dfcc6ddf77c65b05563dd7e
2019-10-04scripts: update copyright_header script to include additional filesgchuf
Includes .sh and .bash-completion files in the script as well
2019-10-04build: Bump gitian descriptor versionsMarcoFalke
2019-10-04Merge #17026: doc: Update bips.md for default bech32 addresses in 0.20.0fanquake
fad1dbda98b58524554e3de7dfcbfed5a67dcc66 doc: Fix amount typo in release notes (MarcoFalke) fa8d052da5922020bc041a0b59e321ce1d4046f0 doc: Update bips.md for default bech32 addresses in 0.20.0 (MarcoFalke) fab68a0772f48b3b0eb40cf1212f9df775b3189c doc: move-only release notes fragments for 0.20.0 (MarcoFalke) Pull request description: * Restore release notes skeleton (headers) * Move-only all release notes fragments to the main file for 0.20.0 * Update bips.md for the default bech32 address change ACKs for top commit: fanquake: ACK fad1dbda98b58524554e3de7dfcbfed5a67dcc66 Tree-SHA512: c3d5e124fe803e809d5af869d89de2d8312d4481d43745c1492c66f5ffc6ffc9c37581cc9d8773d2fb711a5a4a47a12aa1ea31292ac6c393ef8503c9db053fc9
2019-10-04Merge #17031: gui: Prevent processing duplicate payment requestsfanquake
3f89e1eb237efcbd6415ca2cd0acddb6596153d7 Prevent processing duplicate payment requests (João Barbosa) Pull request description: Considering the following from Qt [src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm#L267](https://github.com/qt/qtbase/blob/13e0a36626bd75e631dd9536e795a494432b1945/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm#L267) ```cpp - (void)application:(NSApplication *)sender openFiles:(NSArray *)filenames { Q_UNUSED(filenames); Q_UNUSED(sender); for (NSString *fileName in filenames) { QString qtFileName = QString::fromNSString(fileName); if (inLaunch) { // We need to be careful because Cocoa will be nice enough to take // command line arguments and send them to us as events. Given the history // of Qt Applications, this will result in behavior people don't want, as // they might be doing the opening themselves with the command line parsing. if (qApp->arguments().contains(qtFileName)) continue; } QWindowSystemInterface::handleFileOpenEvent(qtFileName); } ``` And that a2714a5c69f0b0506689af04c3e785f71ee0915d was merged, now Qt isn't able to filter out the above notifications, and then a [QFileOpenEvent](https://doc.qt.io/qt-5/qfileopenevent.html) event is delivered to `PaymentServer::eventFilter`, which in turn (re)adds the payment request. This change fixes #17025, but makes sense regardless of the issue. ACKs for top commit: laanwj: Nah, this seems fine, utACK 3f89e1eb237efcbd6415ca2cd0acddb6596153d7 Sjors: ACK 3f89e1e on macOS 10.14.6 achow101: Code review ACK 3f89e1eb237efcbd6415ca2cd0acddb6596153d7 Tree-SHA512: dd1e0c73fd84953418173ca71f6f5a67ad74a5dc7e3b1d54915ef0545f513df6a24f27242a77bb094e2833a478e2f3bf30ecd50251f3c55b65e780097cb8ab4d
2019-10-03Merge #17042: contrib: fix minor typos in makeseeds.pyMarcoFalke
0b1dcd32bfc4b898d729d08ba465028515797ddd contrib: fix minor typos in makeseeds.py (Brian Solon) Pull request description: Fixes minor typos referenced in #17020 ACKs for top commit: laanwj: Thanks. ACK 0b1dcd32bfc4b898d729d08ba465028515797ddd practicalswift: ACK 0b1dcd32bfc4b898d729d08ba465028515797ddd Tree-SHA512: 1b67358790b3e80e9229d42e399d9ddb21e9f9a0989e05fa6851925ef76289d123cbf648944ff2b60e1513c755023ddec3a0dd3b9ad26d3e105d1d88c937f968
2019-10-03Merge #17022: doc: move-only: Steps for "before major release branch-off"Wladimir J. van der Laan
faca1c24f9e1a3c03dbaea1753d54047846ae0a9 doc: move-only: Steps for "before major release branch-off" (MarcoFalke) Pull request description: The chainparams are updated before branch-off, so that the master branch has the bumped values as well ACKs for top commit: laanwj: ACK faca1c24f9e1a3c03dbaea1753d54047846ae0a9 Tree-SHA512: ffc3ea49f0f6dc64dd9bea958e12ebc058496291c1c06d02994b3bf1751602e7c5000fd5eda166fcdbf9ba6d593e19731e93342dd8f2fe410f656a798bef459c
2019-10-03Merge #17038: Don't rename main thread at process levelWladimir J. van der Laan
07e4bdba3bd46c3a15dedb0a2660453c300643dc Don't rename main thread at process level (Wladimir J. van der Laan) Pull request description: Set only the internal name for the main threads. Fixes #17036 for both `bitcoind` and `bitcoin-qt`. After this, e.g. `killall` works again for either. ACKs for top commit: promag: Tested ACK 07e4bdba3bd46c3a15dedb0a2660453c300643dc, `killall bitcoind` and `killall bitcoin-qt` now just works! jonatack: ACK 07e4bdba3bd46c3a15dedb0a2660453c300643dc `killall bitcoind` shuts down bitcoind mainnet/testnet/regtest, `killall bitcoin-qt` shuts down `./src/qt/bitcoin-qt`, tests pass, very light code review. Good idea to add the `@note` warning. Thanks! Tree-SHA512: 8f310ae646c83a02de7cc6869aa9aca1d53613d8fb762d05e3dfa52e17ca82abeb99044564cf7ba45b3c4b320e65bf8315d0e8834a9e696f097be5af638c6fd9
2019-10-03contrib: fix minor typos in makeseeds.py Brian Solon
See #17020
2019-10-03doc: Fix amount typo in release notesMarcoFalke
See https://github.com/bitcoin/bitcoin/pull/16524#issuecomment-538070291
2019-10-03modify p2p_feefilter test to catch rounding errorGregory Sanders
2019-10-03Disallow implicit conversion for CFeeRate constructorGregory Sanders
2019-10-03feefilter: Compute the absolute fee rather than stored rate to match mempool ↵Gregory Sanders
acceptance logic
2019-10-03Merge #17040: ci: Make apt-get more verbose, to debug travis timeoutsMarcoFalke
fa95503d64e1a5ad8aa67d78695ee9222372a16e ci: Make apt-get more verbose, to debug travis timeouts (MarcoFalke) Pull request description: See issue #16148 ACKs for top commit: practicalswift: ACK fa95503d64e1a5ad8aa67d78695ee9222372a16e ryanofsky: utACK fa95503d64e1a5ad8aa67d78695ee9222372a16e Tree-SHA512: a81e38490dcc9f281f43a6d75ecf383a96374ddee3b4b0f909e485ed461159132d19d37cf9c9d92e95060aec75a5e856900083fd659baf711e438eb9719c96c6
2019-10-03ci: Make apt-get more verbose, to debug travis timeoutsMarcoFalke
2019-10-03Don't rename main thread at process levelWladimir J. van der Laan
Set only the internal name. Fixes #17036 for both `bitcoind` and `bitcoin-qt`.
2019-10-02Prevent processing duplicate payment requestsJoão Barbosa
2019-10-02doc: Update bips.md for default bech32 addresses in 0.20.0MarcoFalke
2019-10-02doc: move-only release notes fragments for 0.20.0MarcoFalke
2019-10-02Merge #16524: Wallet: Disable -fallbackfee by defaultMarcoFalke
ea4cc3a7b36a9c77dbf0aff439da3ef0ea58e6e4 Truly decouple wallet from chainparams for -fallbackfee (Jorge Timón) Pull request description: Before it was 0 by default for main and 20000 for test and regtest. Now it is 0 by default for all chains, thus there's no need to call Params(). Also now the default for main is properly documented. Suggestion for release notes: -fallbackfee was 0 (disabled) by default for the main chain, but 20000 by default for the test chains. Now it is 0 by default for all chains. Testnet and regtest users will have to add fallbackfee=20000 to their configuration if they weren't setting it and they want it to keep working like before. Should I propose them to the wiki for the release notes or only after merge? For more context, see https://github.com/bitcoin/bitcoin/pull/16402#issuecomment-515701042 ACKs for top commit: MarcoFalke: ACK ea4cc3a7b36a9c77dbf0aff439da3ef0ea58e6e4 Tree-SHA512: fdfaba5d813da4221e405e0988bef44f3856d10f897a94f9614386d14b7716f4326ab8a6646e26d41ef3f4fa61b936191e216b1b605e9ab0520b0657fc162e6c
2019-10-02Merge #13716: bitcoin-cli: -stdinwalletpassphrase and non-echo stdin passwordsWladimir J. van der Laan
50c4afa3c420f11329cffb091b62beeb96b39183 add newline after -stdin* (Karl-Johan Alm) 7f11fba2e3c7b1e00ffb98504cdcfc2ded9c09cf cli: add -stdinwalletpassphrase for (slightly more) secure CLI (Karl-Johan Alm) 0da503e9475fea5644168544668581796bf66334 add stdin helpers for password input support (Karl-Johan Alm) Pull request description: This PR * adds `-stdinwalletpassphrase` for use with `walletpasshprase(change)` * adds no-echo for passwords (`-stdinrpcpass` and above) It may not be ideal, but it's better than having to clear the screen whenever you unlock the wallet. ACKs for top commit: laanwj: code review ACK 50c4afa3c420f11329cffb091b62beeb96b39183 Tree-SHA512: 473db8a303ff360ffaa36ac81a2f82be2136fa82696df0bc4f33cb44033a3ae258b5aa5bbcc1f101f88ae9abe9598ed564ce52877ab139bd5d709833f5275ec6
2019-10-02Truly decouple wallet from chainparams for -fallbackfeeJorge Timón
Before it was 0 by default for main and 20000 for test and regtest. Now it is 0 by default for all chains, thus there's no need to call Params(). Also now the default for main is properly documented
2019-10-02Merge #16884: wallet: Change default address type to bech32Wladimir J. van der Laan
71d4eddf42eb5a15e434d2273f11d0a3942ef502 Add release note for bech32 by default in wallet (Gregory Sanders) b34f0180e39fc95d88596a987724b994707e2552 Revert "gui: Generate bech32 addresses by default (take 2, fixup)" (Gregory Sanders) f50785ab56c0c094960c7049cfe9209b101e2823 Change default address type to bech32 (Gregory Sanders) Pull request description: ACKs for top commit: MarcoFalke: re-ACK 71d4eddf42eb5a15e434d2273f11d0a3942ef502 (only change is restore mimick behavior) laanwj: ACK 71d4eddf42eb5a15e434d2273f11d0a3942ef502 Tree-SHA512: 3c49a1b51c49f3a762ad08985167ca1b89b0177ae20ab6d5883f1f74dde7a155921c1b855a842199bbf32f563c56b33f8b603bc842637bdcb121001023d454b6
2019-10-02Merge #16908: txmempool: Make entry time type-safe (std::chrono)Wladimir J. van der Laan
faec689bed7a5b66e2a7675853d10205b933cec8 txmempool: Make entry time type-safe (std::chrono) (MarcoFalke) faaa1f01daba94b021ca77515266a16d27f0364e util: Add count_seconds time helper (MarcoFalke) 1111170f2f0141084b5b4ed565b2f07eba48599a test: mempool entry time is persisted (MarcoFalke) Pull request description: This changes the type of the entry time of txs into the mempool from `int64_t` to `std::chrono::seconds`. The benefits: * Documents the type for developers * Type violations result in compile errors * After compilation, the two are equivalent (at no run time cost) ACKs for top commit: ajtowns: utACK faec689bed7a5b66e2a7675853d10205b933cec8 laanwj: ACK faec689bed7a5b66e2a7675853d10205b933cec8 Tree-SHA512: d958e058755d1a1d54cef536a8b30a11cc502b7df0d6ecf84a0ab1d38bc8105a67668a99cd5087a444f6de2421238111c5fca133cdf8e2e2273cb12cb6957845
2019-10-02Merge #16964: gui: Change sendcoins dialogue Yes to SendMarcoFalke
a649cc6a17b8d8d602c6b67037b0c926960f9cdb Change sendcoins dialogue Yes to Send (Gregory Sanders) Pull request description: It's more self-explanatory, matches "cancel" better, and makes future extensions such as https://github.com/bitcoin/bitcoin/pull/16944 more directly understandable to the user. ACKs for top commit: Sjors: Trivial code review ACK a649cc6. I also used Send in #16966 (`ui - make send a wizard`) laanwj: ACK a649cc6a17b8d8d602c6b67037b0c926960f9cdb jonatack: Code review ACK a649cc6a17b8d8d602c6b67037b0c926960f9cdb Tree-SHA512: fe4993bc7ac653d28f3d399ade046bcfd405511aec06ff041bb5aef47e0736faf3e3112a6db660cd761af56392dc6b97f2c2341ed3eff4490079c5eb8a0d465a
2019-10-02Merge #17007: build: 0.19 release updates on masterWladimir J. van der Laan
434101875c69d523ee34afee540212129be06458 doc: reset release notes after 0.19 split-off (Jon Atack) c0859b7dac5f3504d753f5dcd7ee272fdb43bea6 build: 0.19 release updates on master (Jon Atack) Pull request description: Post split-off. As per https://github.com/bitcoin/bitcoin/blob/master/doc/release-process.md#before-every-major-release and issue #16996. Note: after split-off, the same changes should be made on the new 0.19.0 release branch, with also these additional changes to both files (configure.ac and build_msvc/bitcoin_config.h): - set `CLIENT_VERSION_REVISION` to `0` - set `CLIENT_VERSION_IS_RELEASE` to `true` The second commit resets the release notes after branch-off and proposes a few improvements. ACKs for top commit: laanwj: ACK 434101875c69d523ee34afee540212129be06458 Tree-SHA512: 5a6afeb9cff6fa827865894cc7d3dc789db1c8b5d875ba49fdcfd9fd48af9d2d2864f49a992988136425744af74053cb57a4a92a1665a09b194eecb1a2972315
2019-10-02ci: Use busybox utils for one buildMarcoFalke
2019-10-02Merge #16727: wallet: Explicit feerate for bumpfeeWladimir J. van der Laan
c812aba3949b6ab81030dc708cda7c8821be2f70 test bumpfee fee_rate argument (ezegom) 9f25de3d9eb8d012ca1a98cbcd28021e3e1c85ee rpc bumpfee check fee_rate argument (ezegom) 88e5f997dfab3f03bb1ec3f149eaff8dcc2981fe rpc bumpfee: add fee_rate argument (ezegom) 1a4c791cf49ff15aa9deba4388c0180b8f47f15b rpc bumpfee: move feerate estimation logic into separate method (ezegom) Pull request description: Taking over for https://github.com/bitcoin/bitcoin/pull/16492 which seems to have gone inactive. Only minor commit cleanups, rebase, and some help text fixes on top of previous PR. Renamed `feeRate` to `fee_rate` to reflect updated guidelines. ACKs for top commit: Sjors: Code review ACK c812aba laanwj: ACK c812aba3949b6ab81030dc708cda7c8821be2f70 Tree-SHA512: 5f7f51bd780a573ccef1ccd72b0faf3e5d143f6551060a667560c5163f7d9480e17e73775d1d7bcac0463f3b6b4328f0cff7b27e39483bddc42a530f4583ce30
2019-10-02Merge #16952: gui: make sure to update the UI when deleting a transactionWladimir J. van der Laan
addaf8af8268d918973883a304025d40af5a33c1 make sure to update the UI when deleting a transaction (Jonas Schnelli) Pull request description: `CWallet::ZapSelectTx` removes transactions from the internal model, but leaves the UI in the dark. Adding a `NotifyTransactionChanged()` should avoid having invalid transactions in the GUI. Fixes #16950 ACKs for top commit: fanquake: ACK addaf8af8268d918973883a304025d40af5a33c1 - tested that this fixes #16950 Sjors: tACK addaf8a: tested with an unpruned wallet by calling `removeprunedfunds` on an RBF-replaced transaction. It neatly disappears from the UI. kristapsk: ACK addaf8af8268d918973883a304025d40af5a33c1 (tested both with and without this change) Tree-SHA512: 65e8c690847f7499e82c9fef67b60d9aaa63c853732fe7fa7281da33054fcdcd9d24f5b86de71b0827728c25bac8efb7db445863f990304ebfee6fc450620c47
2019-10-02doc: move-only: Steps for "before major release branch-off"MarcoFalke
Can be reviewed with the git diff option --color-moved=dimmed-zebra
2019-10-02Merge #17006: tests: Enable UBSan for Travis fuzzing jobMarcoFalke
aa81e2cc0eab600c7839dc40689c4a31e146dd19 Enable UBSan for Travis fuzzer job (practicalswift) Pull request description: Enable UBSan for Travis fuzzing job (`00_setup_env_amd64_fuzz.sh`). ACKs for top commit: MarcoFalke: ACK aa81e2cc0eab600c7839dc40689c4a31e146dd19 Tree-SHA512: 6c72df49db113b27e5ed5eb0fac69fa01dc36cccc802ac444349533747437a72cb5e073490e10de4a838f0ea202693e74c09d69061b9ee0f6d2129320ccb4bcd
2019-10-02Merge #16849: Fix block index inconsistency in InvalidateBlock()Wladimir J. van der Laan
2a4e60b48261d3f0ec3d85f97af998ef989134e0 Fix block index inconsistency in InvalidateBlock() (Suhas Daftuar) Pull request description: Previously, we could release `cs_main` while leaving the block index in a state that would fail `CheckBlockIndex()`, because `setBlockIndexCandidates` was not being fully populated before releasing `cs_main`. ACKs for top commit: TheBlueMatt: utACK 2a4e60b48261d3f0ec3d85f97af998ef989134e0. I also discovered another issue in InvalidateBlock while reviewing, see #16856. Sjors: ACK 2a4e60b. Tested on top of #16899. Also tested `invalidateblock` with `-checkblockindex=1`. fjahr: ACK 2a4e60b. Ran tests, reviewed code, inspected behavior while manually testing `invalidateblock`. Tree-SHA512: ced12f9dfff0d413258c709921543fb154789898165590b30d1ee0cdc72863382f189744f7669a7c924d3689a1cc623efdf4e5ae3efc60054572c1e6826de612
2019-10-02Merge #16999: net: 0.19 seeds updateWladimir J. van der Laan
0218171a24cedacaa2fb0745f78968499df5d28c contrib: Remove invalid nodes from seeds list (Wladimir J. van der Laan) 3b09f2b9d95336dd69ab7083c992cf8d1111c9be net: 0.19 hardcoded seeds update (Wladimir J. van der Laan) 801d341f3a4b00633aa135407752d21ba868e37b contrib: makeseeds: More fancy output (Wladimir J. van der Laan) ed76299bea3e067cbc835fe50ce05ea1720d61c1 contrib: makeseeds: Limit per network, instead of total (Wladimir J. van der Laan) c254a9ef692190342aa697e2c778d90091865e95 contrib: makeseeds: dedup by ip,port (Wladimir J. van der Laan) 3314d879666beaa1aa724ff28ad15326167e548f contrib: makeseeds: Factor out ASN lookup (Wladimir J. van der Laan) 301c2b1ab594c483b698fa7c3f1ed8932af0554c contrib: makeseeds: Improve logging and filtering (Wladimir J. van der Laan) Pull request description: - contrib: Improve makeseeds script - net: 0.19 hardcoded seeds update Sources: - http://bitcoin.sipa.be/seeds.txt.gz (Sipa) - https://github.com/bitcoin/bitcoin/files/3671913/dnsseed.dump.tar.gz (Sjors) Output: ``` Initial: IPv4 418690, IPv6 55861, Onion 2747 Skip entries with invalid address: IPv4 418690, IPv6 55861, Onion 2747 After removing duplicates: IPv4 409220, IPv6 54028, Onion 2717 Skip entries from suspicious hosts: IPv4 409219, IPv6 54028, Onion 2717 Enforce minimal number of blocks: IPv4 106719, IPv6 46342, Onion 2621 Require service bit 1: IPv4 106384, IPv6 46241, Onion 2542 Require minimum uptime: IPv4 5300, IPv6 1153, Onion 201 Require a known and recent user agent: IPv4 4642, IPv6 1060, Onion 141 Filter out hosts with multiple bitcoin ports: IPv4 4642, IPv6 1060, Onion 141 Look up ASNs and limit results, both per ASN and globally: IPv4 464, IPv6 48, Onion 141 ``` ACKs for top commit: Sjors: ACK 0218171. I also checked that `chainparamsseeds.h` is generated from `nodes_main.txt`. Sounds like we should look at this script a bit more outside release moments :-) Tree-SHA512: c1f5795fe88d14800c4da918387368d51e85f4319f2ce3c0359851d041767e2883f32b1da371bba22bd5f0b442ac3e5ea7d685c233ad2cc4045c930f973b0aa2