Skip to content

Conversation

@rodentrabies
Copy link
Contributor

@rodentrabies rodentrabies commented Apr 19, 2016

Fix for issue #7901

src/keystore.cpp Outdated
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: indendation error

@sipa
Copy link
Member

sipa commented Apr 20, 2016

utACK, but fix the indendation

@rodentrabies
Copy link
Contributor Author

rodentrabies commented Apr 20, 2016

Oh, yes, sorry. I thought I had no-tabs mode for C++ in Emacs.

@laanwj laanwj added the Wallet label Apr 20, 2016
@maflcko
Copy link
Member

maflcko commented Apr 20, 2016

@yurizhykin Mind to squash the commits?

@jonasschnelli
Copy link
Contributor

utACK (but please squash commits)

@rodentrabies rodentrabies force-pushed the getpubkey-locking-fix branch from e44a70d to 220f950 Compare April 20, 2016 13:05
@rodentrabies
Copy link
Contributor Author

Yep, squashed.

@paveljanik
Copy link
Contributor

ACK 220f950

@jonasschnelli
Copy link
Contributor

ACK 220f950

@dcousens
Copy link
Contributor

utACK 220f950

@sipa sipa merged commit 220f950 into bitcoin:master Apr 21, 2016
sipa added a commit that referenced this pull request Apr 21, 2016
220f950 Fix for incorrect locking in GetPubKey() (keystore.cpp) (Yuri Zhykin)
@rodentrabies rodentrabies deleted the getpubkey-locking-fix branch May 30, 2016 13:25
LarryRuane pushed a commit to LarryRuane/zcash that referenced this pull request Feb 20, 2021
zkbot added a commit to zcash/zcash that referenced this pull request Apr 1, 2021
Bitcoin 0.13 locking PRs

These are locking changes from upstream (bitcoin core) release 0.13, oldest to newest (when they were merged to the master branch).
- bitcoin/bitcoin#7846
- bitcoin/bitcoin#7913
- bitcoin/bitcoin#8016
  - second commit only; first commit, test changes, are already done
- bitcoin/bitcoin#7942

This PR does not include:
 - bitcoin/bitcoin#8244 bitcoin/bitcoin@27f8126
   -  zcash requires locking `cs_main` in this instance (`getrawmempool()` calls `mempoolToJSON()`, which calls `chainActive.Height()`).
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants