diff options
| author | fanquake <fanquake@gmail.com> | 2020-05-13 17:29:10 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2020-05-13 17:36:06 +0800 |
| commit | a33901cb6d82e2f75aab67f80a8852b7e6e9817a (patch) | |
| tree | 6bb6f8d297527442b60042de64971cae50a5bbf9 /Makefile.am | |
| parent | 246e878e784584dd0d323a612007dfdafddeba42 (diff) | |
| parent | 9f59dde9740d065118bdddde75ef9f4e4603a7b1 (diff) | |
Merge #18814: rpc: Relock wallet only if most recent callback
9f59dde9740d065118bdddde75ef9f4e4603a7b1 rpc: Relock wallet only if most recent callback (João Barbosa)
a2e6db5c4f1bb52a8814102b628e51652493d06a rpc: Add mutex to guard deadlineTimers (João Barbosa)
Pull request description:
This PR fixes an early relocking race condition from #18811 where old relock callback runs after new wallet unlock code and nRelockTime update but before rpcRunLater call, causing early relock and incorrect nRelockTime time
Issue introduced in #18487.
Fixes #18811.
ACKs for top commit:
MarcoFalke:
ACK 9f59dde9740d065118bdddde75ef9f4e4603a7b1
ryanofsky:
Code review ACK 9f59dde9740d065118bdddde75ef9f4e4603a7b1. No changes since last review except squashing commits.
jonatack:
ACK 9f59dde9740d065118bdddde75ef
Tree-SHA512: 2f7fc03e5ab6037337f2d82dfad432495cc337c77d07c968ee2355105db6292f24543c03456f5402e0e759577a4327758f9372f7ea29de6d56dc3695fda9b379
Diffstat (limited to 'Makefile.am')
0 files changed, 0 insertions, 0 deletions