aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-03-04build: Bump version for 0.19.1 finalv0.19.1Wladimir J. van der Laan
Tree-SHA512: c0a5fbc072b03e36ffb9af23e699c6b3a897fcd509fdc3c6741ecc8e510aea5d87851c5a7926909746d03d390af10cae266189160b4a7b303f8be9418ea6a0c0
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
2020-01-14gui: Fix duplicate wallet showing upJoão Barbosa
The slot BitcoinGUI::addWallet can be invoked twice for the same WalletModel due to a concurrent wallet being loaded after the first `connect()`: ```cpp connect(wallet_controller, &WalletController::walletAdded, this, &BitcoinGUI::addWallet); connect(wallet_controller, &WalletController::walletRemoved, this, &BitcoinGUI::removeWallet); for (WalletModel* wallet_model : m_wallet_controller->getOpenWallets()) { addWallet(wallet_model); ``` Github-Pull: #16963 Rebased-From: 6d6a7a8403ae923f189812edebdd95761de0e7f2
2020-01-14Drop signal CClientUIInterface::LoadWalletRussell Yanofsky
Github-Pull: #16963 Rebased-From: 81ea66c30e2953dee24d5b127c28daa0d9452a28
2020-01-14zmq: Fix due to invalid argument and multiple notifiersJoão Barbosa
Github-Pull: #17445 Rebased-From: 3e730bf90aaf53c41ff3a778f6aac15d163d1c0c
2020-01-08Merge #17858: [0.19] BackportsWladimir J. van der Laan
99b54076ff2d2dd357dafb9f0275713cd8d0111f scripts: fix check-symbols & check-security argument passing (fanquake) 4330a1ee7fdbf97ce466c442936ed04c13f229e2 Update msvc build for Visual Studio 2019 v16.4 (Aaron Clauson) b0f9b8e648733c3c5196fbb85fade88fa7ba9449 Moves vcpkg list to a text file and updates the appveyor job and readme to use it. (Aaron Clauson) cd7b3b254a9d782667c751ade64c329edc30ecbb Updated appveyor config: - Update build image from Visual Studio 2017 to Visual Studio 2019. - Updated Qt static library from Qt5.9.7 to Qt5.9.8. - Added commands to update vcpkg port files (this does not update already installed packages). - Updated vcpkg package list as per #17309. - Removed commands setting common project file options. Now done via common.init.vcxproj include. - Changed msbuild verbosity from normal to quiet. Normal rights a LOT of logs and impacts appveyor job duration. Updated msvc project configs: - Updated platform toolset from v141 to v142. - Updated Qt static library from Qt5.9.7 to Qt5.9.8. - Added ignore for linker warning building bitcoin-qt program. - Added missing util/str.cpp class file to test_bitcoin project file. (Aaron Clauson) 112144dc524b6f4df5c88ab067e899d858f6461d Add missing typeinfo includes (Wladimir J. van der Laan) 1a6a534665be410988785b0f2e09ef001a612d5c net: Log to net category for exceptions in ProcessMessages (Wladimir J. van der Laan) c0dc7282068b370591e89c630c44bc43bbae38a5 test: fix bitcoind already running warnings on macOS (fanquake) 5276b0e5a2e2a12c7e038a44847fe79d7afc2944 util: Add missing headers to util/fees.cpp (Hennadii Stepanov) 4d7875c55500368336992d66b296ba5ee01c0932 rpc: require second argument only for scantxoutset start action (Andrew Chow) bda2f5b3c9aa4d87e33f7af13f7a1ae5b6b4fa11 cli: fix Fatal LevelDB error when specifying -blockfilterindex=basic twice (Harris) d14ab7c522d7b6912af0c7eee006822ff535f9df gui: disable File->CreateWallet during startup (fanquake) b9f1bc0fc17a3a457b2c1fcd47dd0b676b893558 wallet: unbreak with boost 1.72 (Jan Beich) Pull request description: Backports the following PRs to the 0.19 branch: * https://github.com/bitcoin/bitcoin/pull/17654 - Unbreak build with Boost 1.72.0 * https://github.com/bitcoin/bitcoin/pull/17695 - gui: disable File->CreateWallet during startup * https://github.com/bitcoin/bitcoin/pull/17687 - cli: fix Fatal LevelDB error when specifying -blockfilterindex=basic twice * https://github.com/bitcoin/bitcoin/pull/17728 - rpc: require second argument only for scantxoutset start action * https://github.com/bitcoin/bitcoin/pull/17450 - util: Add missing headers to util/fees.cpp * https://github.com/bitcoin/bitcoin/pull/17488 - test: fix "bitcoind already running" warnings on macOS * https://github.com/bitcoin/bitcoin/pull/17762 - Log to net category for exceptions in ProcessMessages * https://github.com/bitcoin/bitcoin/pull/17364 - Updates to appveyor config for VS2019 and Qt5.9.8 + msvc project fixes * https://github.com/bitcoin/bitcoin/pull/17416 - Appveyor improvement - text file for vcpkg package list * https://github.com/bitcoin/bitcoin/pull/17736 - Update msvc build for Visual Studio 2019 v16.4 * https://github.com/bitcoin/bitcoin/pull/17857 - scripts: fix symbol-check & security-check argument passing Fixes #17856. ACKs for top commit: sipsorcery: ACK (tested: Windows 10 & msvc build) 99b54076ff2d2dd357dafb9f0275713cd8d0111f. Tree-SHA512: 91313de56fb0825e70a4be30ba0bf561b8c26d7dcf60549185df4f5e3524099398c828bb46faae807b631634d1afd5a1d397fb41e61ecfa0d746e4bf10b923cb
2020-01-08qt: Periodic translations update for 0.19 branchWladimir J. van der Laan
Brings back `bitcoin_en` which was accidentally removed last time (see #17886). Tree-SHA512: a4aaa6f22e9ad3e87952f2a87829d675158cb26ed1fe61ef8e62646c22e21ccc0dec0f890b726f8adb76d7609e0274af8574b67201d30eff941cb60b1b76ff8c
2020-01-06scripts: fix check-symbols & check-security argument passingfanquake
The first argument in bin_PROGRAMS (bitcoind) was being silently dropped and never passed into the check-security.py or check-symbols.py scripts. This has been the case since the scripts were added to the makefile in https://github.com/bitcoin/bitcoin/commit/f3d3eaf78eb51238d799d8f20a585550d1567719. Example of the behavior: ```python import sys if __name__ == '__main__': print(sys.argv) # ['args.py', 'b', 'c'] # if you add some lines to "a", # you'll see them here.. for line in sys.stdin: print(line) ``` Github-Pull: #17857 Rebased-From: 71af793512100ee7d508c3fb815af47925fe80ba
2020-01-06Update msvc build for Visual Studio 2019 v16.4Aaron Clauson
msvc warning C4834 for the Bitcoin Core build was introduced by Visual Studio 16.4.0. This PR adds an ignore rule for the warning (it's related to the nodiscard attribute and is not considered relevant). An additional side effect of the msvc compiler update is the prebuilt Qt5.9.8 libraries cannot be linked due to being built with an earlier version of the compiler. To fix this a new Qt5.9.8 version has been compiled and the appveyor job updated to use them. The GitHub Actions job needs to continue to use the original Qt5.9.8 libraries until the latest GitHub Windows image also updates to >= Visual Studio 2019 v16.4. Github-Pull: #17736 Rebased-From: 75d9317bc1aecaab95bf875f8dca97ac3daddff4
2020-01-06Moves vcpkg list to a text file and updates the appveyor job and readme to ↵Aaron Clauson
use it. Github-Pull: #17416 Rebased-From: 29eb039252f35a3bb58b0027f172cfe3d0c79867
2020-01-06Updated appveyor config:Aaron Clauson
- Update build image from Visual Studio 2017 to Visual Studio 2019. - Updated Qt static library from Qt5.9.7 to Qt5.9.8. - Added commands to update vcpkg port files (this does not update already installed packages). - Updated vcpkg package list as per #17309. - Removed commands setting common project file options. Now done via common.init.vcxproj include. - Changed msbuild verbosity from normal to quiet. Normal rights a LOT of logs and impacts appveyor job duration. Updated msvc project configs: - Updated platform toolset from v141 to v142. - Updated Qt static library from Qt5.9.7 to Qt5.9.8. - Added ignore for linker warning building bitcoin-qt program. - Added missing util/str.cpp class file to test_bitcoin project file. Github-Pull: #17364 Rebased-From: 3c84deebaa311155ccc7565d09525041eed9747c
2020-01-05Add missing typeinfo includesWladimir J. van der Laan
The use of `typeid()` for logging exception types requires this include according to https://en.cppreference.com/w/cpp/language/typeid. Github-Pull: #17762 Rebased-From: 4bdd68f301a9cee3360deafc7531c638e923226b
2020-01-05net: Log to net category for exceptions in ProcessMessagesWladimir J. van der Laan
Remove the forest of special exceptions, and simply log a short message to the NET logging category when an exception happens during packet processing. It is not good to panick end users with errors that any peer can generate (let alone writing to stderr). Github-Pull: #17762 Rebased-From: 4d88c3dcb61e7c075ed3dd442044e0eff4e3c8de
2020-01-04test: fix bitcoind already running warnings on macOSfanquake
On macOS, pidof installed via brew returns b'' rather than None. Account for this, to remove spurious warnings from the test_runner. Github-Pull: #17488 Rebased-From: 1c23ea5fe67b88fd72a1ff640dd1bbb21a34fbf4
2020-01-04Merge #17853: [0.19] psbt: handle unspendable psbtsfanquake
ca5f8deefd778195cb10a3419d3b5c0693abb958 Mark PSBTs spending unspendable outputs as invalid in analysis (Andrew Chow) 551583398ba4fdae973c047bc60556ffa17c6431 Have a PSBTAnalysis state that indicates invalid PSBT (Andrew Chow) Pull request description: Backport of #17524 ACKs for top commit: achow101: ACK ca5f8deefd778195cb10a3419d3b5c0693abb958 Tree-SHA512: b5f2b951beb9477ac3176a0aade845654d2108ca3a9fbc72097ba4b4797df5419053d6b489bbaa03be08cb8cfdc37a83db8b7642ffa52d42b7aa8ea14aff39cc
2020-01-04Merge #17859: [0.19] Fix origfee return for bumpfee with feerate argfanquake
bd8c6f12e805115b5f8f7b608061008027f4a793 Fix origfee return for bumpfee with feerate arg (Gregory Sanders) Pull request description: Backport of Github-Pull: #17643 Rebased-From: 02afb0c550dc8529918460c845d1da3adf236eed ACKs for top commit: fanquake: ACK bd8c6f12e805115b5f8f7b608061008027f4a793 - the appveyor failure is unrelated. instagibbs: utACK https://github.com/bitcoin/bitcoin/pull/17859/commits/bd8c6f12e805115b5f8f7b608061008027f4a793 Tree-SHA512: 7e420a3fe02503194b6fc8eae5277c46289cd6abe131b2513ad80422819e6bafbc7768e7be344d4132ebdbc24846d459ba2a271be184725d818dff77510fa4de
2020-01-03Fix origfee return for bumpfee with feerate argGregory Sanders
Github-Pull: #17643 Rebased-From: 02afb0c550dc8529918460c845d1da3adf236eed
2020-01-03util: Add missing headers to util/fees.cppHennadii Stepanov
Github-Pull: #17450 Rebased-From: b1315241375211563e9ec00391c4ac5310e1146f
2020-01-03rpc: require second argument only for scantxoutset start actionAndrew Chow
The second argument of scanobjects is only required for the start action. Stop and abort actions do not need this. Github-Pull: #17728 Rebased-From: 7d263571bee8c36fbe3c854b69c6f31cf1ee3b9b