da3eb82e96
Ensure that Sapling version range checks are always guarded by SAPLING_VERSION_GROUP_ID
2021-03-31 16:17:32 -06:00
766abede57
Document UPGRADE_ZFUTURE
...
Co-authored-by: str4d <thestr4d@gmail.com>
2021-03-24 08:17:32 -06:00
dd914fcdcf
Document FeatureSet type.
2021-03-23 19:42:45 -06:00
c759e6a9f3
Add feature flagging tests.
2021-03-23 19:38:30 -06:00
d02a863c28
Apply suggestions from code review
...
Co-authored-by: Daira Hopwood <daira@jacaranda.org>
2021-03-15 14:32:29 -06:00
05ecc47197
Use SPROUT_MAX_CURRENT_VERSION
2021-03-11 15:22:50 -07:00
f4661c151f
Add future version group & version checks
2021-03-11 15:13:26 -07:00
04f9f23255
Move sapling version group checks back inside of saplingActive check.
2021-03-11 14:58:15 -07:00
e49fa53ea9
Add TxVersionInfo for feature/future-base transaction construction.
2021-03-10 08:55:21 -07:00
a3d86d93b8
Relocate contextual Sapling version checks
...
These checks will have to move for the inclusion of Orchard
under ZFUTURE. For the purpose of eventual removal of Sapling
it might make more sense for these checks to be under a Sapling
feature flag, but that larger set of changes should be deferred.
2021-03-10 08:55:21 -07:00
2fc8963e63
Add feature flagging infrastructure to consensus parameters.
2021-03-10 08:55:19 -07:00
1cf4a10456
Auto merge of #5029 - steven-ecc:nu5-activation-logic, r=steven-ecc
...
Adding base NU5 declarations and logic
Add NU5 base definitions and boilerplate logic.
Closes [#5025 ](https://github.com/zcash/zcash/issues/5025 ).
2021-03-10 02:08:43 +00:00
48d5142dc1
Adding base NU5 declarations and logic
2021-03-06 17:35:54 -08:00
2aa9fbbdfe
Auto merge of #4997 - str4d:2074-net-setInventoryKnown, r=str4d
...
Replace setInventoryKnown with a rolling bloom filter
Cherry-picked from bitcoin/bitcoin#7133.
- Excluding for last commit, which needs bitcoin/bitcoin#7129.
Part of #2074 .
2021-03-05 12:17:16 +00:00
39a860c12b
Auto merge of #5015 - daira:fix-nix, r=therealyingtong
...
Fix build regression by adding #include <atomic>
This fixes #5014 , a build regression on Nix introduced in e286250ce4
2021-03-04 16:57:32 +00:00
a0ac27ec6e
Fix regression introduced in e286250ce4 by adding #include <atomic>. fixes #5014
...
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2021-03-01 17:00:13 +00:00
0aa6d1ef3d
Auto merge of #5007 - nuttycom:trivial/gitignore_otmp, r=str4d
...
Ignore temporary build artifacts.
2021-02-25 23:01:44 +00:00
834343327b
Auto merge of #5011 - str4d:ci-fix-book, r=str4d
...
CI: Correctly build zcashd book
2021-02-25 22:06:22 +00:00
6962a9a3d3
CI: Correctly build zcashd book
2021-02-25 15:00:33 +00:00
a675d9089d
Auto merge of #5010 - str4d:release-v4.3.0, r=str4d
...
Release v4.3.0
2021-02-24 21:59:37 +00:00
e3282abf75
doc: Minor fixes to v4.3.0 release notes
2021-02-24 21:58:32 +00:00
8b91e3bf21
make-release.py: Updated release notes and changelog for 4.3.0.
2021-02-24 20:17:10 +00:00
f09bef8634
make-release.py: Updated manpages for 4.3.0.
2021-02-24 20:17:10 +00:00
205b40da9a
make-release.py: Versioning changes for 4.3.0.
2021-02-24 20:12:54 +00:00
edc34f0464
Ignore temporary build artifacts.
2021-02-23 18:22:03 -07:00
e68e43a0fe
Auto merge of #5001 - mdr0id:add_zstd_apt_package, r=str4d
...
add zstd package to support Windows cross compile
Once the v4.3.0 release is stable, we will need to go rebuild/deploy this builder with a couple other updates so that windows can gracefully cross compile again.
2021-02-23 01:47:34 +00:00
5c0f3ffe25
Auto merge of #5002 - mdr0id:gitian_libxml2_descriptor, r=str4d
...
add libxml2
Adding libxml2 to linux gitian descriptors
2021-02-23 00:13:18 +00:00
14de44030f
add libxml2
...
Adding libxml2 to linux gitian descriptors
2021-02-22 14:37:30 -08:00
beb40ce3e7
add zstd package
2021-02-22 13:20:59 -08:00
1bcb118fe9
Auto merge of #5000 - str4d:cargo-update, r=str4d
...
Update Rust dependencies for 4.3.0
Fixes a regression in #4993 , and also pins `funty` to avoid an ongoing issue.
2021-02-21 14:41:26 +00:00
df489e9a50
rust: Pin funty =1.1.0
...
Temporary workaround for https://github.com/myrrlyn/funty/issues/3
2021-02-20 18:34:11 +00:00
81fd148475
cargo update
2021-02-20 18:32:34 +00:00
fd9bf43c3d
Auto merge of #4998 - str4d:release-v4.3.0-rc1, r=str4d
...
Release v4.3.0-rc1
2021-02-20 00:52:04 +00:00
6052843b6f
make-release.py: Updated release notes and changelog for 4.3.0-rc1.
2021-02-19 22:05:06 +00:00
1e12f4b00e
make-release.py: Updated manpages for 4.3.0-rc1.
2021-02-19 22:05:05 +00:00
e8096841a3
make-release.py: Versioning changes for 4.3.0-rc1.
2021-02-19 21:51:00 +00:00
6affd6c8e4
Auto merge of #4995 - str4d:release-notes-4.3.0, r=str4d
...
Fill out release notes for v4.3.0
2021-02-19 20:16:38 +00:00
227933f74d
Actually only use filterInventoryKnown with MSG_TX inventory messages.
...
Previously this logic could erroneously filter a MSG_BLOCK inventory message.
2021-02-19 20:16:10 +00:00
2391de6375
Only use filterInventoryKnown with MSG_TX inventory messages.
...
Previously this logic could erroneously filter a MSG_BLOCK inventory message.
2021-02-19 20:16:10 +00:00
021ff72e60
Rename setInventoryKnown filterInventoryKnown
2021-02-19 20:16:10 +00:00
12ddfcacd4
Remove mruset as it is no longer used.
2021-02-19 20:16:10 +00:00
994a094379
Replace setInventoryKnown with a rolling bloom filter.
...
Mruset setInventoryKnown was reduced to a remarkably small 1000
entries as a side effect of sendbuffer size reductions in 2012.
This removes setInventoryKnown filtering from merkleBlock responses
because false positives there are especially unattractive and
also because I'm not sure if there aren't race conditions around
the relay pool that would cause some transactions there to
be suppressed. (Also, ProcessGetData was accessing
setInventoryKnown without taking the required lock.)
2021-02-19 20:16:10 +00:00
b08c673ddd
Auto merge of #4992 - LarryRuane:upstream-locking-0.11, r=str4d
...
Bitcoin 0.12 locking PRs
These are locking changes from upstream (bitcoin core) release 0.12.
- bitcoin/bitcoin#7013
- bitcoin/bitcoin#7156
- bitcoin/bitcoin#7229
2021-02-19 19:21:53 +00:00
96317f3189
Fill out the rest of the 4.3.0 release notes
2021-02-19 18:21:01 +00:00
36e0e0e16c
Add IBD download traffic reduction to release notes
...
Co-authored-by: therealyingtong <yingtong@z.cash>
2021-02-19 18:20:08 +00:00
4359b3bdcf
[walletdb] Add missing LOCK() in Recover() for dummyWallet
...
zcash: cherry picked fa33d9740c9b0d1071094ab6c1736f27a7090c95
zcash: https://github.com/bitcoin/bitcoin/pull/7229
2021-02-19 08:49:50 -07:00
2713f9680d
rpc: remove cs_main lock from `createrawtransaction`
...
This is a pure utility function that doesn't use
main's data structures, so it does not require that lock.
zcash: cs_main still needed while calling chainActive()
zcash: cherry picked 6e765873605ee5e31652ce107848a157151791b4
zcash: https://github.com/bitcoin/bitcoin/pull/7156
2021-02-19 08:49:22 -07:00
b62e35dee8
Auto merge of #4994 - str4d:2074-net-misc-1, r=nuttycom
...
Bitcoin 0.12 misc P2P/Net PRs
Cherry-picked from the following upstream PRs:
- bitcoin/bitcoin#5288
- Only the reorg, option was removed in bitcoin/bitcoin#6374 which we merged in #1258
- bitcoin/bitcoin#6561
- bitcoin/bitcoin#6728
- bitcoin/bitcoin#6829
- bitcoin/bitcoin#6974
- bitcoin/bitcoin#7075
- bitcoin/bitcoin#7166
Part of #2074 .
2021-02-19 15:48:11 +00:00
89a4ab2ce9
Auto merge of #4993 - therealyingtong:postpone-depends-v4.3.0, r=str4d
...
Update/postpone dependencies for v4.3.0
2021-02-19 14:24:28 +00:00
f0dcc1dbbe
Auto merge of #4958 - zcash:4957_add_foundation_to_responsible_disclosure_list, r=str4d
...
Add Zcash Foundation to disclosure partners list
Adding the newly-negotiated agreement with the Foundation to our public commitment.
2021-02-19 02:41:49 +00:00
Kris Nuttycombe
Kris Nuttycombe
Homu
Steven Smith
Daira Hopwood
Jack Grigg
Jack Grigg
Marshall Gaucher
mdr0id
Gregory Maxwell
Patick Strateman
MarcoFalke
Wladimir J. van der Laan