Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge #15334, #13076, #15266, #13128 #4420

Merged

Commits on Sep 13, 2021

  1. Merge bitcoin#15334: wallet: Log absolute paths for the wallets

    a4b92e4 Log full paths for wallets (Hennadii Stepanov)
    
    Pull request description:
    
      Fix bitcoin#15333
    
      `debug.log` with this PR:
      ```
      ...
      2019-02-03T19:02:35Z Using wallet directory /home/hebasto/.bitcoin/testnet3/wallets
      2019-02-03T19:02:35Z init message: Verifying wallet(s)...
      2019-02-03T19:02:35Z Using BerkeleyDB version Berkeley DB 4.8.30: (April  9, 2010)
      2019-02-03T19:02:35Z Using wallet test_alpha/wallet.dat
      2019-02-03T19:02:35Z BerkeleyEnvironment::Open: LogDir=/home/hebasto/.bitcoin/testnet3/wallets/test_alpha/database ErrorFile=/home/hebasto/.bitcoin/testnet3/wallets/test_alpha/db.log
      2019-02-03T19:02:35Z Using BerkeleyDB version Berkeley DB 4.8.30: (April  9, 2010)
      2019-02-03T19:02:35Z Using wallet alpha_wallet/wallet.dat
      2019-02-03T19:02:35Z BerkeleyEnvironment::Open: LogDir=/home/hebasto/.bitcoin/testnet3/wallets/alpha_wallet/database ErrorFile=/home/hebasto/.bitcoin/testnet3/wallets/alpha_wallet/db.log
      2019-02-03T19:02:35Z Using BerkeleyDB version Berkeley DB 4.8.30: (April  9, 2010)
      2019-02-03T19:02:35Z Using wallet wallet.dat
      2019-02-03T19:02:35Z BerkeleyEnvironment::Open: LogDir=/home/hebasto/.bitcoin/testnet3/wallets/database ErrorFile=/home/hebasto/.bitcoin/testnet3/wallets/db.log
      2019-02-03T19:02:35Z Using BerkeleyDB version Berkeley DB 4.8.30: (April  9, 2010)
      2019-02-03T19:02:35Z Using wallet none/wallet.dat
      2019-02-03T19:02:35Z BerkeleyEnvironment::Open: LogDir=/home/hebasto/.bitcoin/testnet3/wallets/none/database ErrorFile=/home/hebasto/.bitcoin/testnet3/wallets/none/db.log
      2019-02-03T19:02:35Z init message: Loading banlist...
      ...
      ```
    
    Tree-SHA512: 8dd4408d3f6b04f396dd0ae0d248fedc3a0f6d36788556ae1662443f06f2ecce1c2be9456bf8d1b3d25b29c2a0cfb03cb805bde0a40387e68988ab932e17e118
    laanwj authored and vijaydasmp committed Sep 13, 2021
    Configuration menu
    Copy the full SHA
    1efb500 View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2021

  1. Merge bitcoin#13076: Fix ScanForWalletTransactions to return an enum …

    …indicating scan result: success / failure / user_abort
    
    bd3b036 Add stop_block out arg to ScanForWalletTransactions (Ben Woosley)
    3002d6c Return a status enum from ScanForWalletTransactions (Ben Woosley)
    bb24d68 Make CWallet::ScanForWalletTransactions args and return value const (Ben Woosley)
    
    Pull request description:
    
      Return the failed block as an out arg.
    
      Fixes bitcoin#11450.
    
      /cc bitcoin#12275
    
    Tree-SHA512: 6a523e5425ebfe24e664a942ae21c797ccc1281c25b1bf8d02ad95c19dae343fd8051985ef11853474de7628fd6bed5f15190fbc087c3466ce6fdecab37d72a9
    meshcollider authored and vijaydasmp committed Sep 14, 2021
    Configuration menu
    Copy the full SHA
    a894cb6 View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2021

  1. Merge bitcoin#15266: memory: Construct globals on first use

    77777c5 log: Construct global logger on first use (MarcoFalke)
    
    Pull request description:
    
      The (de)initialization order is not well defined in C++, so generally it is not safe to use globals as the (de/con)structor of one global could use the (de/con)structor of another global before/after it has been (con/de)structed.
    
      Specifically this fixes:
      * `g_logger` might not be initialized on the first use, so do that. (Fixes bitcoin#15111)
    
    Tree-SHA512: eb9c22f4baf31ebc5b0b9ee6a51d1354bae1f0df186cc0ce818b4483c7b5a7f90268d2b549ee96b4c57f8ef36ab239dc6497f74f3e2ef166038f7437c368297d
    MarcoFalke authored and vijaydasmp committed Sep 16, 2021
    Configuration menu
    Copy the full SHA
    15f1480 View commit details
    Browse the repository at this point in the history
  2. Merge bitcoin#13128: policy: Add Clang thread safety annotations for …

    …variables guarded by cs_feeEstimator
    
    dae1423 Add locking annotations to feeStats, shortStats and longStats (practicalswift)
    764e42f scripted-diff: Rename from cs_feeEstimator to m_cs_fee_estimator (practicalswift)
    9a789d4 policy: Add Clang thread safety annotations for variables guarded by cs_feeEstimator (practicalswift)
    
    Pull request description:
    
      * Add Clang thread safety annotations for variables guarded by `cs_feeEstimator`
      * ~~Add missing `cs_feeEstimator` locks~~
    
    Tree-SHA512: 24b1d876ad53524ee8989b9658ac1a1b2766ebb3b27a1f84601d207e74d090e33738b814afac2a1f5bcd37565abcb361c6e5adae212840ff1ca32c3c42953391
    MarcoFalke authored and vijaydasmp committed Sep 16, 2021
    Configuration menu
    Copy the full SHA
    3dbd958 View commit details
    Browse the repository at this point in the history