Commit Graph

13660 Commits

Author SHA1 Message Date
Kris Nuttycombe 04d82fa30f Remove unused imports. 2020-05-18 10:38:37 -06:00
Sean Bowe ecafe6913c
Update minimum chain work on testnet to reflect Heartwood activation. 2020-05-18 09:59:34 -06:00
Homu 1eff1f98b6 Auto merge of #4526 - defuse:update-univalue, r=daira
Add univalue to updatecheck.py and update it to v1.1.1
2020-05-17 18:12:13 +00:00
Daira Hopwood a76e568800 Fix a null pointer dereference that occurs when formatting an error message, if we haven't activated an upgrade as expected.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-05-16 00:26:44 +01:00
Taylor Hornby fc4a70e812 Avoid names starting with __.
These are reserved for all uses (including member function names) in C++,
and their use is technically undefined behaviour:
https://stackoverflow.com/a/228797/393146

Co-authored-by: Daira Hopwood <daira@jacaranda.org>
2020-05-15 16:27:34 -06:00
Danny Willems 332ce1a800
Use preprocessor for ENTRY_SERIALIZED_LENGTH 2020-05-15 19:50:57 +02:00
Danny Willems e465731e69
Use assert.h instead of define manually static_assert 2020-05-15 19:47:49 +02:00
Danny Willems 80fe96a04e
librustzcash: make the header C compatible 2020-05-15 19:38:41 +02:00
Kris Nuttycombe bc617bce74 Merge remote-tracking branch 'upstream/master' into hotfix-v2.1.2-2-golden 2020-05-14 14:02:55 -06:00
Taylor Hornby e0ab57ee36 Add univalue to updatecheck.py and update univalue, removing calls to deprecated methods 2020-05-14 12:42:19 -06:00
Homu 2d77cd241a Auto merge of #4525 - therealyingtong:4524-off-by-one-createnewblock, r=ebfull
Fix off-by-one error in CreateNewBlock()

When calling `GetHistoryRoot()`, use `prevConsensusBranchId` instead of `consensusBranchId` for compatibility with NU4 and future upgrades.

Co-authored by @str4d

Closes #4524
2020-05-14 18:37:53 +00:00
Sean Bowe 43ffa3bf43 Add NU4 activation to golden test. 2020-05-14 12:24:56 -06:00
Kris Nuttycombe 9061f8251e Merge remote-tracking branch 'upstream/master' into hotfix-v2.1.2-2-golden 2020-05-14 12:24:44 -06:00
therealyingtong 79657a8e3a Fix off-by-one error in CreateNewBlock()
When calling GetHistoryRoot, use prevConsensusBranchId instead of consensusBranchId for compatibility with NU4 and future upgrades.

Co-authored by Jack Grigg (jack@electriccoin.co)
2020-05-14 21:29:47 +08:00
Alfredo Garcia a17951bfa8 get fuzzing options from directory 2020-05-13 17:07:26 -03:00
Homu d52003861c Auto merge of #4508 - oxarbitrage:remove_fhelp_from_impls, r=str4d
Remove unused fHelp parameters from internal functions

- dumpwallet_impl
- importwallet_impl
2020-05-12 12:42:58 +00:00
Homu d0b533aacb Auto merge of #4304 - oxarbitrage:issue3893, r=str4d
Add status to transactions in RPC calls

Closes https://github.com/zcash/zcash/issues/3893.
2020-05-12 03:05:37 +00:00
Homu eab938b829 Auto merge of #4513 - zcash:hotfix-v2.1.2-3, r=str4d
Merge in hotfix v2.1.2-3
2020-05-12 00:27:26 +00:00
Homu c82b3f9450 Auto merge of #4510 - zcash:hotfix-v2.1.2-2, r=nuttycom
Merge in 2.1.2-2 hotfix
2020-05-11 19:11:56 +00:00
ebfull 23713c87ce
Merge pull request #4511 from ebfull/release-v2.1.2-3
Release v2.1.2-3
2020-05-08 13:36:40 -06:00
Sean Bowe 1e945ee82a
Set the deprecation height manually to roughly July 14th. 2020-05-08 13:28:55 -06:00
Sean Bowe 98345b2ead
Update release notes for v2.1.2-3. 2020-05-08 13:28:44 -06:00
Sean Bowe ca7b2dbd8e
make-release.py: Updated release notes and changelog for 2.1.2-3. 2020-05-08 12:41:23 -06:00
Sean Bowe 8b5365e127
make-release.py: Updated manpages for 2.1.2-3. 2020-05-08 12:41:23 -06:00
Sean Bowe f9d4405c09
make-release.py: Versioning changes for 2.1.2-3. 2020-05-08 12:39:13 -06:00
ebfull e7395fb67d
Merge pull request #4509 from ebfull/release-v2.1.2-2
Release v2.1.2-2
2020-05-08 11:56:26 -06:00
Sean Bowe d86b56bd6c
Modify release notes for v2.1.2-1 and v2.1.2-2 to reflect the changes more accurately. 2020-05-08 11:47:41 -06:00
Sean Bowe 2e52500acf
make-release.py: Updated release notes and changelog for 2.1.2-2. 2020-05-08 11:43:55 -06:00
Sean Bowe 6d82cff680
make-release.py: Updated manpages for 2.1.2-2. 2020-05-08 11:43:54 -06:00
Sean Bowe bdb2df182b
make-release.py: Versioning changes for 2.1.2-2. 2020-05-08 11:41:47 -06:00
ebfull 4ee4b767ec
Merge pull request #4503 from daira/4496-heartwood-chain-consistency-check
txdb: More complete fix for the Heartwood chain consistency check issue
2020-05-08 11:40:55 -06:00
Kris Nuttycombe a2898a84f4 Fully remove the regtest tree from restored nodes. 2020-05-08 10:36:04 -06:00
Alfredo Garcia 3995fb634b remove not needed help parameters to dump and import impl 2020-05-08 10:54:36 -03:00
Kris Nuttycombe 5b7abf6d1d Merge branch 'hotfix-v2.1.2-1' into hotfix-v2.1.2-2 2020-05-07 19:14:43 -06:00
Kris Nuttycombe 18d02c10b1 Merge branch 'release/v2.1.2' into hotfix-v2.1.2-1 2020-05-07 19:12:45 -06:00
Kris Nuttycombe 76a88dab52 Update golden test for heartwood network upgrade. 2020-05-07 19:12:24 -06:00
Kris Nuttycombe 8542522732 Merge branch 'release/v2.1.1-1' into release/v2.1.2 2020-05-07 19:02:45 -06:00
Kris Nuttycombe a546caffc9 Add baseline for golden testing across network upgrade boundaries. 2020-05-07 16:34:44 -06:00
Daira Hopwood 58d49ac61b
txdb: log additional debug information.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-05-07 16:22:25 -06:00
Jack Grigg daabcd6d22
txdb: More complete fix for the Heartwood chain consistency check issue.
#4499 was an insufficient fix, because it did not consider the case where
a post-Heartwood node wrote a block index object for a header from a
non-upgraded peer. In that case the version in the block index entry is
`>= CHAIN_HISTORY_ROOT_VERSION`, and so the fix in #4499 has no effect.
In addition, we should skip the consistency check when the index object
validity is not BLOCK_VALID_CONSENSUS.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-05-07 16:22:09 -06:00
Homu 4b71f1633a Auto merge of #4490 - benzcash:ben/contrib/ci-builders, r=mdr0id
Dockerfiles for zcashd CI builds

Please ensure this checklist is followed for any pull requests for this repo. This checklist must be checked by both the PR creator and by anyone who reviews the PR.
* [ ] Relevant documentation for this PR has to be completed and reviewed by @mdr0id before the PR can be merged
* [ ] A test plan for the PR must be documented in the PR notes and included in the test plan for the next regular release

As a note, all buildbot tests need to be passing and all appropriate code reviews need to be done before this PR can be merged

This PR is intended to move the existing buildbot worker docker images into this repo, and provide for a way to build gitian-builder images.

The included README.md describes the purpose and an example script.

When this is merged the existing buildbot CI will be updated to start using these images.
2020-05-07 18:08:22 +00:00
Homu 93599b7ec8 Auto merge of #4455 - benzcash:Dockerfile-contrib, r=ebfull
Added Dockerfile to contrib with README

Please ensure this checklist is followed for any pull requests for this repo. This checklist must be checked by both the PR creator and by anyone who reviews the PR.
* [ ] Relevant documentation for this PR has to be completed and reviewed by @mdr0id before the PR can be merged
* [ ] A test plan for the PR must be documented in the PR notes and included in the test plan for the next regular release

As a note, all buildbot tests need to be passing and all appropriate code reviews need to be done before this PR can be merged
2020-05-07 14:53:42 +00:00
Homu 38885ee9a8 Auto merge of #4501 - zcash:hotfix-v2.1.2-1, r=ebfull
Merge in hotfix v2.1.2-1

This PR brings our `v2.1.2-1` hotfix into master.

**Please don't try/r+ this yet.**
2020-05-06 23:01:09 +00:00
ebfull 84a703b3b1
Merge branch 'master' into hotfix-v2.1.2-1 2020-05-06 16:36:01 -06:00
Homu eb06b0a8d4 Auto merge of #4447 - nuttycom:bug/4119-rewind_detection, r=str4d
Reproduce and fix off-by-one error in reorg logic (#4119)

This attempts to reproduce #4119 using a simple chain split.It currently seems to trigger a different issue, an assertion failure in `CheckBlockIndex` when restarting
2020-05-06 21:50:03 +00:00
Sean Bowe f7d2142eb0
Add release details about v2.1.2-1 hotfix. 2020-05-06 10:58:53 -06:00
Sean Bowe c80adfcfcc
make-release.py: Updated release notes and changelog for 2.1.2-1. 2020-05-06 10:52:57 -06:00
Sean Bowe 72da9f77fa
make-release.py: Updated manpages for 2.1.2-1. 2020-05-06 10:52:57 -06:00
Sean Bowe 5d24937e5f
make-release.py: Versioning changes for 2.1.2-1. 2020-05-06 10:50:43 -06:00
ebfull 853eb885fa
Merge pull request #4499 from ebfull/heartwood-testnet-hotfix
Heartwood testnet hotfix
2020-05-06 10:47:56 -06:00