0.15.1: Backports #11447

pull MarcoFalke wants to merge 25 commits into bitcoin:0.15 from MarcoFalke:Mf1710-0151Backports changing 37 files +1299 −165
  1. MarcoFalke commented at 6:29 pm on October 3, 2017: member

    This mostly backports various commits that fix(ed) bugs and issues.

    However, it also includes two patches for qt that only fix minor issues, as well as some doc patches.

  2. [wallet] Close DB on error.
    Github-Pull: #11017
    Rebased-From: 03bc719a85cb4928cb4b43d0bc4142f72cb01b23
    9e8aae31c1
  3. Avoid returning a BIP9Stats object with uninitialized values
    Uninitialized data potentially used in `rpc/blockchain.cpp`:
    
    ```
    static UniValue BIP9SoftForkDesc(const Consensus::Params& consensusParams, Consensus::DeploymentPos id)
    {
        ...
        const ThresholdState thresholdState = VersionBitsTipState(consensusParams, id);
        ...
        if (THRESHOLD_STARTED == thresholdState)
        {
            UniValue statsUV(UniValue::VOBJ);
            BIP9Stats statsStruct = VersionBitsTipStatistics(consensusParams, id);
            statsUV.push_back(Pair("period", statsStruct.period));
            statsUV.push_back(Pair("threshold", statsStruct.threshold));
            statsUV.push_back(Pair("elapsed", statsStruct.elapsed));
            statsUV.push_back(Pair("count", statsStruct.count));
            statsUV.push_back(Pair("possible", statsStruct.possible));
            rv.push_back(Pair("statistics", statsUV));
        }
        ...
        return rv;
    }
    ```
    
    Github-Pull: #10957
    Rebased-From: 3eb53b867153c957529484b5338d27e69de027c1
    50bd3f626d
  4. rpc: Write authcookie atomically
    Use POSIX rename atomicity at the `bitcoind` side to create a working
    cookie atomically:
    
    - Write `.cookie.tmp`, close file
    - Rename `.cookie.tmp` to `.cookie`
    
    This avoids clients reading invalid/partial cookies as in #11129.
    
    Github-Pull: #11131
    Rebased-From: 82dd7195e1fb943f9cd45a48188f9678219c0206
    b278a43646
  5. Acquire cs_main lock before cs_wallet during wallet initialization
    CWallet::MarkConflicted may acquire the cs_main lock after
    CWalletDB::LoadWallet acquires the cs_wallet lock during wallet initialization.
    (CWalletDB::LoadWallet calls ReadKeyValue which calls CWallet::LoadToWallet
    which calls CWallet::MarkConflicted). This is the opposite order that cs_main
    and cs_wallet locks are acquired in the rest of the code, and so leads to
    POTENTIAL DEADLOCK DETECTED errors if bitcoin is built with -DDEBUG_LOCKORDER.
    
    This commit changes CWallet::LoadWallet (which calls CWalletDB::LoadWallet) to
    acquire both locks in the standard order. It also fixes some tests that were
    acquiring wallet and main locks out of order and failed with the new locking in
    CWallet::LoadWallet.
    
    Error was reported by Luke Dashjr <luke-jr@utopios.org> in
    https://botbot.me/freenode/bitcoin-core-dev/msg/90244330/
    
    Github-Pull: #11126
    Rebased-From: de9a1db2ed14e0c75ffd82dc031f7ad30c56d195
    2cb720ae61
  6. [Qt] Fix display of package name on 'open config file' tooltip
    Github-Pull: #11198
    Rebased-From: 14ccd4d8d1847d64903224562ad3c7eb795b3781
    7310f1f2eb
  7. qt: Use IsMine to validate custom change address
    (cherry picked from commit c41224dfd51c896341bbf2fa23e160bf5ffe27c3)
    
    Github-Pull: #11247
    Rebased-From: a1ea1cfbd8d4fc976f0ab2423d395e03ded6eedd
    47c02a8ae8
  8. Fix division by zero in time remaining
    Github-Pull: #11237
    Rebased-From: 3b69a08c53c2ef738f32c270fdacf1e4ed5a4c97
    2e31b1d48d
  9. rpc: update cli for estimatefee argument rename
    The first argument of estimatesmartfee was renamed from nblocks to
    conf_target in 06bcdb8da64502a64df03f3c89fbc6ccb72cd349. Update the
    client-side table as well.
    
    Github-Pull: #11267
    Rebased-From: 24697c40ee6739b812259140042d426c81179977
    921542e0bd
  10. rpc: make estimatesmartfee argument naming consistent with documentation
    Github-Pull: #11267
    Rebased-From: 5acd82de9ad6df8cab922da66d49b8ff2bd35439
    b1a6c94683
  11. Remove custom fee radio group
    Removes the extraneous custom fee radio group and its single radio
    button. The radio button is replaced with a label that has the
    radio button's text.
    
    Github-Pull: #11334
    Rebased-From: e53fa4a1ca58ef46416c4a96542722601fb75c5a
    19d63e8a93
  12. [Qt] Add delay before filtering transactions
    Fixes 3141
    
    Github-Pull: #11015
    Rebased-From: 7b137acedd5e2ff3fe5395a927c546a528b0cac6
    6642558078
  13. Replace save|restoreWindowGeometry with Qt functions
    Github-Pull: #11335
    Rebased-From: 13baf7217bf8394ae02efc376208ae86eac4d0f6
    8d13b4298c
  14. Disallow uncompressed pubkeys in bitcoin-tx [multisig] output adds
    Github-Pull: #11377
    Rebased-From: 28d4542a0ac77a30a242d0568e580a5b437f53fa
    75997c3b35
  15. Put back inadvertently removed copyright notices
    In an abundance of caution this restores "Bitcoin Developers" to the COPYING file in
    case there were contributors before that point in time that would object to the
    current label.  It's harmless and more pedantically correct.
    
    [Change extracted from the Bitcoin-abc repository, commit message by gmaxwell]
    
    Signed-off-by: Gregory Maxwell <greg@xiph.org>
    
    Github-Pull: #11318
    Rebased-From: d552ed678c2632bafeab695c639f5fe185dc9853
    8b61aee690
  16. doc: Prepare release notes for 0.15.1 62d18cdb89
  17. MarcoFalke renamed this:
    0.15.1: Backport fixes
    0.15.1: Backports
    on Oct 3, 2017
  18. in src/qt/modaloverlay.cpp:175 in 2e31b1d48d outdated
    171@@ -169,4 +172,4 @@ void ModalOverlay::closeClicked()
    172 {
    173     showHide(true);
    174     userClosed = true;
    175-}
    176+}
    


    meshcollider commented at 8:23 pm on October 3, 2017:
    Sorry there was a bad commit-split in #11237 which meant the EOF newline got deleted and readded in the next commit, might want to squash them or just fix this
  19. fanquake added this to the milestone 0.15.1 on Oct 3, 2017
  20. fanquake added the label Backport on Oct 3, 2017
  21. wallet: update stored witness in AddToWallet
    Replace witness-stripped wallet transactions with full transactions;
    this can happen when upgrading from a pre-segwit wallet to a segwit-
    aware wallet.
    
    Github-Pull: #11225
    Rebased-From: d01a9682b126a5f83c7311e652e6e62f2c2e1d20
    6b4d9f2736
  22. when clearing addrman clear mapInfo and mapAddr
    Github-Pull: #11252
    Rebased-From: b86a42077a134888c53bfd406b87bf0a39c78264
    0fe2a9a196
  23. qt: Backup former GUI settings on `-resetguisettings`
    Writes the GUI settings to `guisettings.bak` in the data directory
    before wiping them. This can be used to retroactively troubleshoot
    issues (e.g. #11262) where `-resetguisettings` solves the problem.
    
    Github-Pull: #11338
    Rebased-From: 723aa1b8752c1d6c6c0a76059c532ebe2f406fc1
    6a62c745a9
  24. Fix validationinterface build on super old boost/clang
    This should fix all the non-dependancy issues for termux builds.
    See Github issue #11388.
    
    Github-Pull: #11440
    Rebased-From: 96c2ce9d343147608c197bc2333138b82141340f
    b6c0209aaf
  25. rpc: Prevent `dumpwallet` from overwriting files
    Prevent arbitrary files from being overwritten. There have been reports
    that users have overwritten wallet files this way. It may also avoid
    other security issues.
    
    Fixes #9934. Adds mention to release notes and adds a test.
    
    Github-Pull: #9937
    Rebased-From: 0cd9273fd959c6742574259d026039f7da0309a2
    a43be5bcdb
  26. Add new step to clean $PATH var by removing /mnt specific Window's %PATH% paths that cause issues with the make system
    Github-Pull: #11437
    Rebased-From: 4f890ba6bc8caba5394c7a5388d7f07959ced78b
    dea3b87dd9
  27. net: Improve and document SOCKS code
    Make the SOCKS code more consistent, and document the constants used.
    
    Github-Pull: #11397
    Rebased-From: 22f816ef4dd57785627d801c247714cace7fc5b5
    27e861a9b3
  28. [Docs] Update Windows build instructions for using WSL and Ubuntu 17.04
    Github-Pull: #11437
    Rebased-From: 696ce46306e40f48dc4b2d7010812d564a43289d
    c94527a973
  29. Update importprivkey named args documentation
    Fixes #11462. Updated documentation for importprivkey function to use the correct name for the first argument.
    Also updates a call to importprivkey to use named args in functional test.
    
    Github-Pull: #11465
    Rebased-From: aa57590d7c5eab1df5443e8ac9ed53ad0db46c02
    405e069d3b
  30. MarcoFalke force-pushed on Oct 9, 2017
  31. laanwj commented at 9:51 am on October 11, 2017: member
    utACK on commit list, did not re-review all the patches.
  32. laanwj removed this from the milestone 0.15.1 on Oct 12, 2017
  33. laanwj added this to the milestone 0.15.0.2 on Oct 12, 2017
  34. laanwj added this to the "Review priority 0.15.0.2" column in a project

  35. fanquake commented at 9:53 am on October 13, 2017: member
    utACK 405e069
  36. Fix importmulti bug when importing an already imported key
    Github-Pull: #11483
    Rebased-From: a44a215177ab55b4a3b36a7980c313e908e2dd18
    20cdc2b36c
  37. laanwj merged this on Oct 18, 2017
  38. laanwj closed this on Oct 18, 2017

  39. laanwj referenced this in commit 1646f9c760 on Oct 18, 2017
  40. fanquake removed this from the "Review priority 0.15.0.2" column in a project

  41. MarcoFalke deleted the branch on Nov 10, 2017
  42. UdjinM6 referenced this in commit 3712f8d053 on Sep 27, 2019
  43. DrahtBot locked this on Sep 8, 2021

github-metadata-mirror

This is a metadata mirror of the GitHub repository bitcoin/bitcoin. This site is not affiliated with GitHub. Content is generated from a GitHub metadata backup.
generated: 2024-12-19 00:12 UTC

This site is hosted by @0xB10C
More mirrored repositories can be found on mirror.b10c.me