aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-08-28Merge #18284: [0.19] scheduler: Workaround negative nsecs bug in boost's ↵MarcoFalke
wait_until ed0223ec59e5e7941abf17afd17ede393abea31b scheduler: Workaround negative nsecs bug in boost's wait_until (Luke Dashjr) Pull request description: Some boost versions have a bug that can cause a time prior to system boot (or wake from sleep) to throw an exception instead of return timeout See https://github.com/boostorg/thread/issues/308 NOTE: This was addressed in master with a refactor (#18234), so this isn't a strict backport and needs full review. Fixes #18227 Cleanly merges to 0.14+ ACKs for top commit: laanwj: ACK ed0223ec59e5e7941abf17afd17ede393abea31b gruve-p: ACK https://github.com/bitcoin/bitcoin/commit/ed0223ec59e5e7941abf17afd17ede393abea31b Tree-SHA512: 57edd0a22d7cf8f04b427e23d1ba10746a492638021d4438781b9d313dd0459418f64f0489be72d8e2286bbc8e8762d77e673868c25eb3bf4f0423a8fe8cdffa
2020-08-11Merge #19025: [0.19] BackportsMarcoFalke
be951470bea132b4cbe1823cd564bf14aaf0ea7e Updated appveyor job to checkout a specific vcpkg commit ID. (Aaron Clauson) 1fd9cd2cb40a89a07de5b8b0bc870efe65a505d7 appveyor: Remove clcache (MarcoFalke) 8c0a9595ec81328a250dd1a79fcc3d2010db4d6d Remove cached directories and associated script blocks from appveyor CI configuration. (Aaron Clauson) d70f7000212b0050672452b762d92124f402eda6 lint: fix shellcheck URL in CI install (fanquake) f8f7d91b805928fe5a986e3dff6a9a73ac96e128 test: remove Cirrus CI FreeBSD job (fanquake) b7e16a82c99768494afb000dd19e308f306a89c3 Add missing QPainterPath include (Andrew Chow) 30a28146ac23aa3a9e510c5d6ab9a8d2c5b8177e gui: Avoid Wallet::GetBalance in WalletModel::pollBalanceChanged (João Barbosa) 0d87a5b4e2153a00e33474b56b48f0814c231697 QA: feature_segwit: Check that template "rules" includes "!segwit" as appropriate (Luke Dashjr) bde6a5a676e4de7c5133f61784a3239bb4a28f2e Bugfix: Include "csv","!segwit" in "rules" (Luke Dashjr) e422f65aee4b2a817b31bbd37c79d178570579df build: Set libevent minimum version to 2.0.21 (Hennadii Stepanov) 0d0dd6ae96c6e12226bba07994394ae78f7cddc6 Update with new Windows code signing certificate (Andrew Chow) Pull request description: Backports the following to the 0.19 branch: * #17946 - Fix GBT: Restore "!segwit" and "csv" to "rules" key * #18160 - gui: Avoid Wallet::GetBalance in WalletModel::pollBalanceChanged * #18425 - releases: Update with new Windows code signing certificate * #18676 - build: Check libevent minimum version in configure script * #19097 - qt: Add missing QPainterPath include (as per #19510) * #18640 - appveyor: Remove clcache * #19444 - test: Remove cached directories and associated script blocks from appveyor config * #19612 - lint: fix shellcheck URL in CI install * #18001 - Updated appveyor job to checkout a specific vcpkg commit ID Closes: #19510. ACKs for top commit: jnewbery: ACK be951470bea132b4cbe1823cd564bf14aaf0ea7e MarcoFalke: cherry-pick ACK be951470bea132b4cbe1823cd564bf14aaf0ea7e 🌎 Tree-SHA512: 2ec7e3ae1da99799ff6f8cfe26095d6885cffe6952b18a7e236dc5e657b3918225c2601b8c8e17cdff5319c40cb0a214d9fad49b0ff2f54af1db7c81d83a1df5
2020-08-11Updated appveyor job to checkout a specific vcpkg commit ID.Aaron Clauson
Github-Pull: #18001 Rebased-From: 2bcc70531ac88e29a7d59a1ab8c787c55e7f88f5
2020-08-11appveyor: Remove clcacheMarcoFalke
Github-Pull: #18640 Rebased-From: fac0c8db9f634ea7231fb0b6dc139ae0bda4a051
2020-08-11Remove cached directories and associated script blocks from appveyor CI ↵Aaron Clauson
configuration. Github-Pull: #19444 Rebased-From: 961e667600441c35845fcb36b120500c813cd3ed
2020-08-11lint: fix shellcheck URL in CI installfanquake
This is causing the tests to fail for backports etc. Github-Pull: #19612 Rebased-From: 7ee4769cd4be0975254b218134d057c2bb443509
2020-08-11test: remove Cirrus CI FreeBSD jobfanquake
This has been removed from the master branch, and always seems to fail at the installing packages phase. i.e: ```bash pkg install -y autoconf automake boost-libs git gmake libevent libtool pkgconf python3 ccache Updating FreeBSD repository catalogue... Fetching meta.txz: . done pkg: repository meta /var/db/pkg/FreeBSD.meta has wrong version 2 repository FreeBSD has no meta file, using default settings Fetching packagesite.txz: .......... done pkg: repository meta /var/db/pkg/FreeBSD.meta has wrong version 2 pkg: Repository FreeBSD load error: meta cannot be loaded No error: 0 Unable to open created repository FreeBSD Unable to update repository FreeBSD Error updating repositories! Exit status: 3 ``` Github-Pull: #19224 Rebased-From: e7f06f9b0e84a65812d24ff6efa4bc2d3d818590
2020-07-15Add missing QPainterPath includeAndrew Chow
This is needed to compile with Qt 5.15. Github-Pull: #19097 Rebased-From: 79b0a69e09c1a912122e6431ea3c530cc292c690
2020-06-09gui: Avoid Wallet::GetBalance in WalletModel::pollBalanceChangedJoão Barbosa
Github-Pull: #18160 Rebased-From: 0933a37078e1ce3a3d70983c3e7f4b3ac6c3fa37
2020-05-20QA: feature_segwit: Check that template "rules" includes "!segwit" as ↵Luke Dashjr
appropriate Github-Pull: #17946 Rebased-From : 412d5fe8791c417bf46fc55a5bb8d59be98a33db
2020-05-20Bugfix: Include "csv","!segwit" in "rules"Luke Dashjr
They have been missing since buried deployments were merged Github-Pull: #17946 Rebased-From: 2abe8cc3b760219cfa434e4c96e9f8d3611d0037
2020-05-20build: Set libevent minimum version to 2.0.21Hennadii Stepanov
Github-Pull: #18676 Rebased-From: b68e71796792a9da9daa0a4e759d284d15595230
2020-05-20Update with new Windows code signing certificateAndrew Chow
Github-Pull: #18425 Rebased-From: 3e0df92bf216e1dce05ca9bf14049f2e42783c30
2020-03-06scheduler: Workaround negative nsecs bug in boost's wait_untilLuke Dashjr
Some boost versions have a bug that can cause a time prior to system boot (or wake from sleep) to throw an exception instead of return timeout See https://github.com/boostorg/thread/issues/308
2020-03-04Merge #18218: [0.19] Further 0.19 backportsMarcoFalke
48fef5ebae58b0730619182007218941bd339768 gui: Fix race in WalletModel::pollBalanceChanged (Russell Yanofsky) 1964561a3a5eacbb27139e9125859854c0e77437 build: don't embed a build-id when building libdmg-hfsplus (fanquake) Pull request description: These are not blockers for the 0.19.1 release, as per [IRC discussion this morning](http://www.erisian.com.au/bitcoin-core-dev/log-2020-02-27.html#l-331), doesn't look like there will be an rc3. This PR can collect further backports for the 0.19 branch. Currently backports: * https://github.com/bitcoin/bitcoin/pull/18004 - build: don't embed a build-id when building libdmg-hfsplus * https://github.com/bitcoin/bitcoin/pull/18123 - gui: Fix race in WalletModel::pollBalanceChanged ACKs for top commit: promag: ACK 48fef5ebae58b0730619182007218941bd339768. laanwj: ACK 48fef5ebae58b0730619182007218941bd339768 luke-jr: utACK 48fef5ebae58b0730619182007218941bd339768 Tree-SHA512: c7e7ddda9ee7b8015f16d39aab000e0595f85fe073f79abc1a57b3e2adb0dedc4e07e5fd918e1df5e88b7f3fbc39b57ab3382233c4354b9c2196f65fa1fa6c04
2020-03-04build: Bump version for 0.19.1 finalv0.19.1Wladimir J. van der Laan
Tree-SHA512: c0a5fbc072b03e36ffb9af23e699c6b3a897fcd509fdc3c6741ecc8e510aea5d87851c5a7926909746d03d390af10cae266189160b4a7b303f8be9418ea6a0c0
2020-02-28gui: Fix race in WalletModel::pollBalanceChangedRussell Yanofsky
Poll function was wrongly setting cached height to the current chain height instead of the chain height at the time of polling. This bug could cause balances to appear out of date, and was first introduced https://github.com/bitcoin/bitcoin/pull/10244/commits/a0704a8996bb950ae3c4d5b5a30e9dfe34cde1d3#r378452145 Before that commit, there wasn't a problem because cs_main was held during the poll update. Currently, the problem should be rare. But if 8937d99ce81a27ae5e1012a28323c0e26d89c50b from #17954 were merged, the problem would get worse, because the wrong cachedNumBlocks value would be set if the wallet was polled in the interval between a block being connected and it processing the BlockConnected notification. MarcoFalke <falke.marco@gmail.com> also points out that a0704a8996b could lead to GUI hangs as well, because previously the pollBalanceChanged method, which runs on the GUI thread, would only make a nonblocking TRY_LOCK(cs_main) call, but after could make blocking LOCK(cs_main) calls, potentially locking up the GUI. Thanks to John Newbery <john@johnnewbery.com> for finding this bug this while reviewing https://github.com/bitcoin/bitcoin/pull/17954. Github-Pull: #18123 Rebased-From: bf36a3ccc212ad4d7c5cb8f26d7a22e279fe3cec
2020-02-28build: don't embed a build-id when building libdmg-hfsplusfanquake
Github-Pull: #18004 Rebased-From: cb9e88e73a042ff4e1c83289a6f8fa1db03fb093
2020-02-13Merge #18139: doc: Add missing author to 0.19.1 release notesWladimir J. van der Laan
facbdc0f5e04701905834f1b5d37e0ed41d2c2dd doc: Add missing author to 0.19.1 release notes (MarcoFalke) Pull request description: Commit 88729d8 is in 0.19, but the author is not in the release notes. ACKs for top commit: practicalswift: ACK facbdc0f5e04701905834f1b5d37e0ed41d2c2dd - credit where credit is due :) Tree-SHA512: 5e65bdb6d1e2318143c978f7e69e2c22f09dc257d92c5a88c52da43b12b812ebbe1a9202382545d8dfd3bc1ca1927543cfeb1d2e5d6da98c1e90bc26765cb8b4
2020-02-13doc: Add missing author to 0.19.1 release notesMarcoFalke
2020-02-10build: Bump version to 0.19.1rc2v0.19.1rc2Wladimir J. van der Laan
Tree-SHA512: 7ba1efdc24835405562b5ff710ed4223d7e4463dffa58721cc9e0f0f0ba90925e59719cb68b31f95cfc632a73ca9a5573e762167eed264c66323828a397b9127
2020-02-10doc: UNIX manual pages update for rc2Wladimir J. van der Laan
Tree-SHA512: 23fc6e3712608a2d4ccec5ee2d0efdb3f8df8093f555890611039881a78147eee3a5226aade13d750e88be8f6814699424606b32cf7947faa6c034f1ff2dd81a
2020-02-10qt: Pre-rc2 translations updateWladimir J. van der Laan
Tree-SHA512: 18182903fed7034dc16c2d74ebccf992dd5343376d0f02bebaa50be4ff8fd76c9dd59a95524aef326b74b75a921c819063f06ef45fb9980ae87aacbfb7190554
2020-02-10doc: Update release notes for rc2Wladimir J. van der Laan
Tree-SHA512: 320576b94b58246ea7f2426e1dbe43cd0222c0ea58cf9a03e75225fcc226384478f39d7f54099d2cecbcf134a639932e7f2033eb3dd38786bb666dbb81aae2d7
2020-02-10Merge #18079: [0.19] psbt: check that various indexes and amounts are within ↵Wladimir J. van der Laan
bounds f5fb7fca969cd43318384bec46bb7687b1a529fd psbt: check output index is within bounds before accessing (Andrew Chow) 1cf77a2dc36c81b80a2f9af52ed99bd426061de8 Don't calculate tx fees for PSBTs with invalid money values (Andrew Chow) Pull request description: Backport of #17156, non-trivial due to crossing the refactor in #17371 ACKs for top commit: laanwj: ACK f5fb7fca969cd43318384bec46bb7687b1a529fd Tree-SHA512: 7aabf9a6b8a8e287a26dfbf73a437a3bc55177bef8fc5149d822ef81b8ef2458e1d718c3a19c73532c5cef0f9bd8144574c7fad90ca89f13a08b44edf3a2656d
2020-02-10Merge #18083: [0.19] wallet: Reset reused transactions cacheWladimir J. van der Laan
f11872cbf46128e22e33c3138755c4aa32e80de7 wallet: Reset reused transactions cache (Fabian Jahr) Pull request description: Backport of #17843 Required porting to pre-`WalletBatch` ACKs for top commit: kallewoof: Code review ACK f11872cbf46128e22e33c3138755c4aa32e80de7 laanwj: code review ACK f11872cbf46128e22e33c3138755c4aa32e80de7 meshcollider: utACK f11872cbf46128e22e33c3138755c4aa32e80de7 Tree-SHA512: 5cf5f136d1eafb0783c2e6799e3675ebc50997ebb56b379d8a198ac35eb3b32f6b98656760a8b1c821eeac665eb80efb1723dd4e9eb58d2b4d45c4674499bedf
2020-02-10Merge #18100: 0.19: Update univalue subtreeWladimir J. van der Laan
5e1728017bc2005c70784d235f5d4ba8017d7efd Squashed 'src/univalue/' changes from 7890db99d6..98261b1e7b (MarcoFalke) Pull request description: Version bump backported from #18099 ACKs for top commit: laanwj: ACK fa4d00b569253cfdd074821b60ecdc4f17026e88 Tree-SHA512: dc34c98d9b1f450db700633ce7b674a3edf83bd12f3b77b74544a6b24f3e3b1f3c91f40d0ad6c27f82c1b26e88cf7625311b93f00e492a813dbdcca9f461cb5e
2020-02-09Update univalue subtreeMarcoFalke
2020-02-09Squashed 'src/univalue/' changes from 7890db99d6..98261b1e7bMarcoFalke
98261b1e7b Merge #22: Clamp JSON object depth to PHP limit 54c4015415 Clamp JSON object depth to PHP limit 5a58a46671 Merge #21: Remove hand-coded UniValue destructor. b4cdfc4f47 Remove hand-coded UniValue destructor. 7fba60b5ad Merge #17: [docs] Update readme 4577454e7e Merge #13: Fix typo ac7e73cda8 [docs] Update readme 4a4964729b Fix typo git-subtree-dir: src/univalue git-subtree-split: 98261b1e7be4ce9820e25c8ce37d40cdef19ab20
2020-02-06psbt: check output index is within bounds before accessingAndrew Chow
Github-Pull: #17156 Rebased-From: deaa6dd144f5650b385658a0c4f9a014aff8dde2
2020-02-06Merge #18084: 0.19: gui: Fix unintialized WalletView::progressDialogfanquake
b4e5363ccc6a9ceaf10ba2b7fa28932b355c708a gui: Fix unintialized WalletView::progressDialog (João Barbosa) Pull request description: Backport #18062 to 0.19. ACKs for top commit: Empact: ACK https://github.com/bitcoin/bitcoin/pull/18084/commits/b4e5363ccc6a9ceaf10ba2b7fa28932b355c708a jonasschnelli: utACK b4e5363ccc6a9ceaf10ba2b7fa28932b355c708a Tree-SHA512: 9ebf0c29b606689de118c3d64f0a8f4dd53df05799b3be6da1891cb214c4fca7f0e3f2cd2a205c78496914cec1f7fa469d6df88428fcd6854ede6c61dbbc6d2a
2020-02-06gui: Fix unintialized WalletView::progressDialogJoão Barbosa
Github-Pull: #18062 Rebased-From: acf8abc7f3cf7efa418a46f9f69f23f1a5035582
2020-02-06wallet: Reset reused transactions cacheFabian Jahr
If a destination is reused we mark the cache of the other transactions going to that destination dirty so they are not accidentally reported as trusted when the cache is hit. Github-Pull: #17843 Rebased-From: 6fc554f591d8ea1681b8bb25aa12da8d4f023f66
2020-02-05Don't calculate tx fees for PSBTs with invalid money valuesAndrew Chow
In decodepsbt if an invalid amount is seen, don't calculate the fee but still show the invalid value in the decode. In analyze psbt, if an invalid amount is seen, set the next step to be the creator as the creator needs to remake the transaction so that it is valid. Github-Pull: #17156 Rebased-From: f1ef7f0aa46338f4cd8de79696027a1bf868f359
2020-01-27doc: Preliminary 0.19.1 release notesWladimir J. van der Laan
Tree-SHA512: c6a57b79318a428a57f4e984a6f3432c5ef8aaab2c8ae708566e856f574b1f93cd852e347b6995a01babd5c98a9f05ec3416a82457ecc2d9287995e1c5b100fc
2020-01-23Merge #17988: [0.19] Final backports for 0.19.1v0.19.1rc1Wladimir J. van der Laan
daf2fff236f8ebb75c785b33d2dd6dcd3cf86112 test: add missing #include to fix compiler errors (Karl-Johan Alm) c8ad23c52932cf33fac6e527ff18b5241ccceb04 bug-fix macos: give free bytes to F_PREALLOCATE (Karl-Johan Alm) Pull request description: We're about ready to do a [0.19.1 release](https://github.com/bitcoin/bitcoin/milestone/44); so I've opened this to collect the last remaining backports. If there's something that's been missed / or isn't tagged ["Needs backport (0.19)"](https://github.com/bitcoin/bitcoin/issues?q=is%3Aopen+label%3A%22Needs+backport+%280.19%29%22) that you think should be, please comment. Currently backports: * #17887 - bug-fix macos: give free bytes to F_PREALLOCATE * #17980 - test: add missing #include to fix compiler errors ACKs for top commit: laanwj: ACK daf2fff236f8ebb75c785b33d2dd6dcd3cf86112 Tree-SHA512: 8438f992d0c39315a4da4c3f8ab5c92acefada4b0ba5a5cec3775dea2541492d386bf4e7c9e76e1494a6d4cf16a9205287d27ffd23d9c3056f213d733605eeee
2020-01-23doc: Manpage updates for 0.19.1rc1Wladimir J. van der Laan
This is effectively a no-op except for the dates and version numbers. Tree-SHA512: a2b298bfac6466e81f4951c382cdd350f43989b08dc466e72ea02588b2fc6d1b9a2839401e6c188361696aa25b0c851c142df88985b106d4c41b067366ced55e
2020-01-23build: Bump version to 0.19.1rc1Wladimir J. van der Laan
Release preparations. Tree-SHA512: e00729c146ca78d45efe9834373057119f98c5c90abab3658b01b7c7774d395ae95dafde5160617815c3f00d6bfba1ccb4ea643860af450889a5c6c8b9a6c8d8
2020-01-23qt: Translations update pre-rc1Wladimir J. van der Laan
Tree-SHA512: 0e0d696c32c20e550bda5bd0fe73a73ab1d944f3fb368d50993248ff6feef7373b4feba91dc38e62b180c9854dd4528dfd62e6628bc2b24b12d7c9ff07f34e55
2020-01-23test: add missing #include to fix compiler errorsKarl-Johan Alm
Github-Pull: #17980 Rebased-From: a5a2654bbc43b5c208418872e5d4c0acbadda5de
2020-01-23bug-fix macos: give free bytes to F_PREALLOCATEKarl-Johan Alm
The macos manpage for fcntl (for F_PEOFPOSMODE) states: > Allocate from the physical end of file. In this case, fst_length indicates the number of newly allocated bytes desired. Github-Pull: #17887 Rebased-From: 75163f4729c10c40d2843da28a8c79ab89193f6a
2020-01-22Merge branch '0.19_2' into 0.19Wladimir J. van der Laan
There was an accidental direct push to the 0.19 branch, add a merge commit with signature and treehash to make verify-commits happy again. Tree-SHA512: 47e9f37ec2b8d8402cf3d05f71713ef7e71843dd8360d68e21f99dcd285fc397171907102aad8e6e8525097f589f3c419f1f0c18ff66c7e45a553af8625a0842
2020-01-22init: Stop indexes on shutdown after ChainStateFlushed callback.Jim Posen
Currently, the latest index state may not be committed to disk on shutdown. Github-Pull: #17897 Rebased-From: 9dd58ca611f6f2b59c25d727a4e955333525d345
2020-01-20Merge #17792: 0.19: BackportsWladimir J. van der Laan
cd67b1dcb8f1eca8c0c7cecc6f4de27c7efe41d5 Use correct C++11 header for std::swap() (Hennadii Stepanov) b8101fb7ac4bfa0e5c0ee2459b24bddaf59fe7c4 Fix comparison function signature (Hennadii Stepanov) eac49073eb7c5d630dd9a285e36f743fa902c0ee Don't allow implementers to think ScriptHash(Witness*()) results in nesting computation (Gregory Sanders) e2c45d89f7219fd5bcf19a6e04b291abbb4b5f95 IsUsedDestination shouldn't use key id as script id for ScriptHash (Gregory Sanders) a5489c9892fc12cb70c6c7b017881a9218d0b041 IsUsedDestination should count any known single-key address (Gregory Sanders) 88729d804e39fbb42aa92c039afe3641edf9190c Fix issue with conflicted mempool tx in listsinceblock (Adam Jonas) eafcea7a0ab17512f2b9e2a724685ca193920f04 gui: Fix duplicate wallet showing up (João Barbosa) 7e66d04770bfb21862e52736c4859d7a878cb906 Drop signal CClientUIInterface::LoadWallet (Russell Yanofsky) 179d55f0526082b46415a7f5b6c3742a403f3306 zmq: Fix due to invalid argument and multiple notifiers (João Barbosa) Pull request description: Backports - #16963 - #17445 - #17258 - #17621 - #17924 - #17634 ACKs for top commit: laanwj: ACK cd67b1dcb8f1eca8c0c7cecc6f4de27c7efe41d5, checked that I got more or less the same result (including conflict resolution) backporting these commits Tree-SHA512: 645786267cfb10a01a56f7cfd91ddead5f1475df5714595ae480237e04d40c5cfb7460b40532279cacd83e4b775a4ace68a258ec2184b8ad0e997a690a9245e5
2020-01-15Use correct C++11 header for std::swap()Hennadii Stepanov
Github-Pull: #17634 Rebased-From: 98fbd1cdffaa69357091cc67e959ac21119dfa16
2020-01-15Fix comparison function signatureHennadii Stepanov
This commit fixes build on CentOS 7 with GCC 4.8.5 Github-Pull: #17634 Rebased-From: b66861e2e5e8a49e11e7489cf22c3007bc7082cc
2020-01-15Don't allow implementers to think ScriptHash(Witness*()) results in nesting ↵Gregory Sanders
computation Github-Pull: #17924 Rebased-From: 6dd59d2e491bc11ab26498668543e65440a3a931
2020-01-15IsUsedDestination shouldn't use key id as script id for ScriptHashGregory Sanders
Github-Pull: #17924 Rebased-From: 4b8f1e989f3b969dc628b0801d5c31ebd373719c
2020-01-14IsUsedDestination should count any known single-key addressGregory Sanders
Github-Pull: #17621 Rebased-From: 09502452bbbe21bb974f1de8cf53196373921ab9
2020-01-14Fix issue with conflicted mempool tx in listsinceblockAdam Jonas
listsinceblock now checks that returned transactions are not conflicting with any transactions that are filtered out by the given blockhash Co-Authored-By: Michael Chrostowski <michael.chrostowski@gmail.com> Github-Pull: #17258 Rebased-From: 436ad436434b94982bcb7dc1d13a21949263ef73
generated by cgit v1.2.3 (git 2.26.2) at 2024-07-19 10:23:24 +0000