Skip to content

Conversation

ryanofsky
Copy link
Contributor

A new AssertLockHeld(cs_wallet) call was added in commit a58370e
"Dedup nTimeFirstKey update logic" (part of PR #9108).

The lock held assertion will fail when loading prexisting wallets files from
before the #9108 merge that have watch-only keys.

A new AssertLockHeld(cs_wallet) call was added in commit a58370e
"Dedup nTimeFirstKey update logic" (part of PR bitcoin#9108).

The lock held assertion will fail when loading prexisting wallets files from
before the bitcoin#9108 merge that have watch-only keys.
@ryanofsky
Copy link
Contributor Author

This bug was found by @morcos. It should be tagged for 0.14 because it's a regression caused by #9108.

@morcos
Copy link
Contributor

morcos commented Feb 15, 2017

ACK 0f25026

seems like it might be better to just lock cs_wallet for the whole function call, but i don't know if there is some reason it wasn't written that way.

@ryanofsky
Copy link
Contributor Author

I don't see any reason, updated the PR. 0f25026 -> 07afcd6 (loadlock.0 -> loadlock.1)

@fanquake fanquake added this to the 0.14.0 milestone Feb 16, 2017
@laanwj
Copy link
Member

laanwj commented Feb 16, 2017

utACK 07afcd6

@laanwj laanwj merged commit 07afcd6 into bitcoin:master Feb 16, 2017
laanwj added a commit that referenced this pull request Feb 16, 2017
…ssertion

07afcd6 Add missing cs_wallet lock that triggers new lock held assertion (Russell Yanofsky)
codablock pushed a commit to codablock/dash that referenced this pull request Jan 23, 2018
… held assertion

07afcd6 Add missing cs_wallet lock that triggers new lock held assertion (Russell Yanofsky)
andvgal pushed a commit to energicryptocurrency/gen2-energi that referenced this pull request Jan 6, 2019
… held assertion

07afcd6 Add missing cs_wallet lock that triggers new lock held assertion (Russell Yanofsky)
CryptoCentric pushed a commit to absolute-community/absolute that referenced this pull request Feb 27, 2019
… held assertion

07afcd6 Add missing cs_wallet lock that triggers new lock held assertion (Russell Yanofsky)
str4d pushed a commit to LarryRuane/zcash that referenced this pull request Apr 1, 2021
A new AssertLockHeld(cs_wallet) call was added in commit a58370e
"Dedup nTimeFirstKey update logic" (part of PR #9108).

The lock held assertion will fail when loading prexisting wallets files from
before the #9108 merge that have watch-only keys.

zcash: cherry picked from commit 07afcd6
zcash: bitcoin/bitcoin#9771
zkbot added a commit to zcash/zcash that referenced this pull request Apr 2, 2021
Bitcoin 0.14 locking PRs

These are locking changes from upstream (bitcoin core) release 0.14, oldest to newest (when merged to the master branch).

Each commit also includes a reference both to the PR and the upstream commit.

- bitcoin/bitcoin#8472
- bitcoin/bitcoin#8606
  - Excludes a lock move because we don't have bitcoin/bitcoin#7840 which this move was partially-reverting.
- bitcoin/bitcoin#9230
  - Only first commit (we don't have `LogTimestampStr` anymore).
- bitcoin/bitcoin#9243
  - Only the sixth commit, excluding `IsArgSet` locking (we haven't pulled that function in yet).
- bitcoin/bitcoin#9626
  - The cherry-picked commit does not match the upstream at all, but the resulting lock is useful.
- bitcoin/bitcoin#9679
- bitcoin/bitcoin#9227
- bitcoin/bitcoin#9698
  - Excludes change to `CConnman::PushMessage` in second commit (which we don't have yet).
- bitcoin/bitcoin#9708
- bitcoin/bitcoin#9771
@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.

4 participants