Jack Grigg
501ca0c2ec
make-release.py: Updated release notes and changelog for 2.1.0-1.
2019-11-08 18:56:32 +00:00
Jack Grigg
66e0605407
make-release.py: Updated manpages for 2.1.0-1.
2019-11-08 18:56:31 +00:00
Jack Grigg
e07604a132
make-release.py: Versioning changes for 2.1.0-1.
2019-11-08 18:34:15 +00:00
ebfull
cd5986c244
Merge pull request #4212 from ebfull/fix-CVE-2017-18350
...
Fix CVE-2017-18350
2019-11-08 11:18:36 -07:00
Sean Bowe
812d0ac44b
Fix of CVE-2017-18350
...
Adapted from bitcoin/bitcoin#11397 by Wladimir J. van der Laan.
Co-Authored-By: Jack Grigg <jack@electriccoin.co>
Co-Authored-By: Daira Hopwood <daira@electriccoin.co>
2019-11-08 09:26:17 -07:00
Homu
18df8e67e1
Auto merge of #4181 - oxarbitrage:issue4084, r=Eirik0
...
Display "next upgrade" info on metrics screen
Closes #4084 .
2019-11-07 11:41:54 -08:00
Alfredo Garcia
8aac988a82
get UPGRADE_TESTDUMMY back to default at the end of the test
2019-11-07 14:28:14 -03:00
Homu
362739c5cc
Auto merge of #4182 - Jainan-Tandel:master, r=Eirik0
...
Minor tweak to the README.md file
2019-11-06 14:54:03 -08:00
Homu
0d7b08d1f0
Auto merge of #4160 - str4d:upgrade-librustzcash, r=str4d
...
Upgrade librustzcash to 0.2.0
This is backed by the 0.1.0 versions of our Zcash Rust crates.
2019-11-06 13:39:04 -08:00
Taylor Hornby
f8a2e1865a
Add fuzzing stub for CheckBlock
2019-11-06 10:45:32 -07:00
Taylor Hornby
6ad165a6ab
Add fuzzing stub for ReadFeeEstimates
2019-11-06 10:45:32 -07:00
Taylor Hornby
0fdff745ee
Add fuzzing stub for AddrMan deserialization
2019-11-06 10:45:32 -07:00
Alfredo Garcia
01998bdc9e
remove zmergetoaddress from experimental state in rpc-tests
2019-11-06 10:57:10 -03:00
Homu
5ec69e8c2c
Auto merge of #4171 - defuse:fuzzer-packaging, r=str4d
...
Add AFL in zcutil (with all-in-one script)
Supersedes #4156 and #4167 .
Fuzzing targets and input sets are defined by the contents of directories in `./src/fuzzing/`. Inside the directory, there's a `fuzz.cpp` and `fuzz.h` with a `main()` function that will replace `zcashd`'s actual `main()` as well as an `input` subdirectory containing the inputs, one per file. To just run a fuzzer, you can, for example...
```
make clean # if you've previously build zcashd without AFL instrumentation
./zcutil/afl/afl-getbuildrun.sh DecodeHexTx
```
Alternatively you can...
```
./zcutil/afl/afl-get.sh /tmp/afl # (or wherever you want to build AFL)
./zcutil/afl/afl-build.sh /tmp/afl DecodeHexTx -j$(nproc)
./zcutil/afl/afl-run.sh /tmp/afl DecodeHexTx
```
Run `make clean` whenever you switch between a normal build and an AFL-instrumented build.
2019-11-06 03:33:05 -08:00
Jack Grigg
4d13eb71ab
Remove invalid address comparison from gtest
...
Addresses cannot be computed from a "null" extended spending key,
because the resulting ak is not of prime order.
2019-11-06 10:47:58 +00:00
Homu
95c6e83531
Auto merge of #4188 - Eirik0:update-team-email, r=str4d
...
Update team email
2019-11-06 02:22:51 -08:00
Eirik Ogilvie-Wigley
a68024158f
Update team email
2019-11-05 17:08:37 -07:00
Homu
3bc8c07563
Auto merge of #3932 - LarryRuane:3823-deadlock-simple, r=daira
...
simplify locking, merge cs_SpendingKeyStore into cs_KeyStore
Closes #3823 .
2019-11-05 14:10:18 -08:00
Homu
1d9bc13d76
Auto merge of #4172 - Eirik0:rpc-test-time-elapsed, r=Eirik0
...
Show time elapsed when running RPC tests
This adds the time elapsed in seconds to the success/failure message which is printed after each RPC test. This will make it easier to identify tests which take an especially long time to run.
2019-11-05 12:55:03 -08:00
Homu
cb0a94cd21
Auto merge of #4161 - oxarbitrage:issue3621, r=Eirik0
...
remove duplicated prefix in errors and warnings
Fixes #3621
2019-11-05 09:55:54 -08:00
Jainan-Tandel
4b613852a1
Cosmetic update to README.md .
2019-11-04 19:40:06 +00:00
Alfredo Garcia
8649f65608
remove redundant line from test
2019-11-04 13:38:10 -03:00
Alfredo Garcia
9582e258ba
reverse conditional, replace get_value_or(0) calls
2019-11-04 13:31:00 -03:00
Larry Ruane
e33ebdb8bb
revert CCryptoKeyStore::SetCrypted() return value
2019-11-04 08:02:51 -07:00
Larry Ruane
d9fcc2b558
eliminate races: hold cs_KeyStore lock while reading fUseCrypto
2019-11-03 19:53:28 -07:00
Larry Ruane
5a5094bbb5
simplify locking, merge cs_SpendingKeyStore into cs_KeyStore
2019-11-03 19:53:28 -07:00
Alfredo Garcia
5bea8b76ab
change var and function names for clarity, refactor function
2019-11-03 08:35:10 -03:00
Alfredo Garcia
49dca2aa0b
add after blossom test
2019-11-02 20:43:46 -03:00
Alfredo Garcia
cfaa2f3ecf
fix spacing
2019-11-02 20:18:52 -03:00
Homu
ffdba7c19e
Auto merge of #4186 - Eirik0:release-v2.1.0, r=Eirik0
...
Release v2.1.0
2019-11-02 15:39:22 -07:00
Alfredo Garcia
383066b28e
add NextUpgrade test case
2019-11-02 18:38:39 -03:00
Alfredo Garcia
94798b6b56
create and use SecondsLeftToHeight to display next upgrade info
2019-11-02 18:37:45 -03:00
Eirik Ogilvie-Wigley
842e73781e
make-release.py: Updated release notes and changelog for 2.1.0.
2019-11-02 11:01:01 -06:00
Eirik Ogilvie-Wigley
06f511f88e
make-release.py: Updated manpages for 2.1.0.
2019-11-02 11:01:00 -06:00
Eirik Ogilvie-Wigley
5be8d1ecd1
make-release.py: Versioning changes for 2.1.0.
2019-11-02 10:53:13 -06:00
Homu
fe89651189
Auto merge of #4184 - ebfull:blossom-fixups, r=Eirik0
...
Set Blossom activation height
* This PR sets Blossom activation to height 653600.
* This PR bumps the protocol version to 170009.
* This PR hardcodes the deprecation height to 734240 to account for the fact that activation of Blossom decreases the block interval prior to the deprecation height, so the ordinary formula for deciding deprecation does not work.
2019-11-01 15:42:17 -07:00
Eirik Ogilvie-Wigley
5371e0cffb
fix comment
2019-11-01 14:46:15 -06:00
Eirik Ogilvie-Wigley
0950c94c13
Fix getblocksubsidy tests
2019-11-01 12:10:15 -06:00
Alfredo Garcia
2d13be55c4
change target spacing to up to upgrade height
...
suggested change by review.
Co-Authored-By: Daira Hopwood <daira@jacaranda.org>
2019-11-01 15:06:56 -03:00
Homu
2b38e20ef1
Auto merge of #4185 - Eirik0:4175-notable-changes, r=Eirik0
...
Release notes for bug fix
These are release notes for https://github.com/zcash/zcash/pull/4177
2019-11-01 10:10:15 -07:00
Eirik Ogilvie-Wigley
e7a84d7bd8
Fix wording
...
Co-Authored-By: Daira Hopwood <daira@jacaranda.org>
2019-11-01 09:52:15 -06:00
Sean Bowe
4180589f02
Set mainnet activation of Blossom
2019-11-01 09:31:55 -06:00
Eirik Ogilvie-Wigley
ee5569207b
Better wording in release notes
2019-10-31 21:22:47 -06:00
Eirik Ogilvie-Wigley
1d3c5b04ac
Release notes for bug fix
2019-10-31 15:54:18 -06:00
Alfredo Garcia
6650aed46b
add next upgrade info to metrics console
2019-10-30 15:19:22 -03:00
Alfredo Garcia
12dd81614c
add version to thank you string
2019-10-29 14:44:27 -03:00
Taylor Hornby
f189a5f09d
Pass AFL input file path to zcashd
2019-10-28 18:30:20 -06:00
Taylor Hornby
bfa8da3852
Have make clean delete fuzz.cpp
2019-10-28 11:54:19 -06:00
Taylor Hornby
b25a14f433
Separate AFL build, run fuzz stages, and add afl argument pass-through
2019-10-28 11:54:13 -06:00
Homu
cc77724081
Auto merge of #4177 - LarryRuane:4175-coinbase-zaddr-error, r=Eirik0
...
#4175 z_sendmany coinbase to zaddr with change: report error status
Closes #4175
2019-10-28 09:03:57 -07:00