These were merged in an old PR that was created before we backported
src/fs.h.
-BEGIN VERIFY SCRIPT-
sed -i 's/boost::filesystem/fs/g' ./src/addrdb.*
-END VERIFY SCRIPT-
Update libsecp256k1 subtree
The first subtree merge brings us to the same commit as upstream (bitcoin/bitcoin#20257).
The second subtree merged brings us to current master, which includes most of our local changes.
After this, our remaining local changes are:
- 75f9f8f95b (the change to `secp256k1_scalar_get_b32`)
- e917cb614f (compile with C99)
Link with ntdll library on Windows
This fixes a regression for builds targeting Windows introduced in #4947. It also includes a minor cleanup to fix a build warning.
closes#5051
This fixes#5051, which is a regression caused by the dependency on the ntapi crate
(via mio, via tokio) added by #4947.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Bitcoin Core doesn't actually use tags for managing versions of their
forked dependencies, so we should separately rework this logic for all
of the subtree-managed dependencies. But this at least prevents false
positives.
Bitcoin 0.15 locking PRs
These are locking changes from upstream (bitcoin core) release 0.15, 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#9497
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
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 07afcd6379bb46ace5856f6a47a9188cf9aed2ea
zcash: https://github.com/bitcoin/bitcoin/pull/9771
These are (afaik) all long-standing races or concurrent accesses. Going
forward, we can clean these up so that they're not all individual atomic
accesses.
- Reintroduce cs_vRecv to guard receive-specific vars
- Lock vRecv/vSend for CNodeStats
- Make some vars atomic.
- Only set the connection time in CNode's constructor so that it doesn't change
zcash: cherry picked from commit 321d0fc6b6624c65508f8b9059418cb936f0bbbe
zcash: https://github.com/bitcoin/bitcoin/pull/9708
This removes a "race" between Interrupt() and Run(), though it
should not effect any of our supported platforms.
zcash: cherry picked from commit 7b2d96b634f9fd283480caf3bece56138d0587e3
zcash: https://github.com/bitcoin/bitcoin/pull/9679
This makes sure that cs_filter is never held while taking cs_main
or CNode::cs_vSend.
zcash: cherry picked from commit 144ed76ea0b38b7c21b224501964f8a2c65c4bb6
zcash: https://github.com/bitcoin/bitcoin/pull/8606
Delete spare mainnet Founders' Reward addresses that will never be used
These addresses were originally intended as fallbacks if an FR address was compromised.
There is no need to retain them in the code given that the FR has ended.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
Jack Grigg
Homu
Daira Hopwood
Kris Nuttycombe
Jeremy Rubin
Russell Yanofsky
Matt Corallo
Cory Fields
Patrick Strateman
Pieter Wuille
Pavel Janík