Homu
743f6d436b
Auto merge of #4515 - nuttycom:hotfix-v2.1.2-2-golden, r=nuttycom
...
Golden testing to verify no-reindex network upgrades.
This test was introduced to provide us a way to test network upgrades against previously-serialized versions of block and block-index data. At present the only thing that is checked is that the nodes start correctly after upgrading.
The commit history of this branch is built such that each persisted database artifact is constructed in a commit which has the correct history for constructing that particular artifact - basically, you get that artifact (disregarding randomness) by checking out that commit and creating it using the zcashd built from that commit.
2020-05-21 22:49:58 +00:00
Kris Nuttycombe
86d631bf36
Merge remote-tracking branch 'upstream/master' into hotfix-v2.1.2-2-golden
2020-05-21 16:49:24 -06:00
Homu
1b195476fd
Auto merge of #4539 - ebfull:release-v3.0.0-rc1, r=daira
...
Release v3.0.0-rc1
This is the release candidate for 3.0.0 Heartwood.
EOS halt manually configured to be (roughly) September 15, which is 2808 hours away (at the time of writing this) so with 48 blocks per hour, 2808 * 48 plus the current height 838929 equals 973713.
2020-05-21 19:34:28 +00:00
Sean Bowe
61aee9ec9c
Set deprecation of 3.0.0 to target EOS halt mid-September.
2020-05-21 07:35:09 -06:00
Sean Bowe
a6403c80b4
make-release.py: Updated release notes and changelog for 3.0.0-rc1.
2020-05-21 07:34:53 -06:00
Sean Bowe
957cbb68f1
make-release.py: Updated manpages for 3.0.0-rc1.
2020-05-21 07:34:53 -06:00
Sean Bowe
7000f452fa
make-release.py: Versioning changes for 3.0.0-rc1.
2020-05-21 07:32:25 -06:00
Homu
3860e7cae7
Auto merge of #4533 - ebfull:heartwood-activation, r=ebfull
...
Enable Heartwood activation on mainnet
This sets the Heartwood activation height to `903000`, which follows the deprecation height of `v2.1.2-3` (which is set to deprecate on block `901475`, roughly 31 hours earlier, sometime mid-July).
2020-05-20 21:36:27 +00:00
Homu
bfb1bfd9d6
Auto merge of #4534 - ebfull:fix-chainwork, r=daira
...
Update minimum chain work on testnet to reflect Heartwood activation.
2020-05-20 06:45:44 +00:00
Sean Bowe
5a955674a5
Bump the protocol version, as this node supports Heartwood on mainnet.
2020-05-19 14:38:53 -06:00
Sean Bowe
d0c96683bf
Set the Heartwood activation height to 903000.
2020-05-19 14:38:49 -06:00
Homu
ed9537f9dd
Auto merge of #4529 - daira:fix-abort-on-reindex, r=daira
...
Fix a null pointer dereference that occurs when formatting an error message
This fixes a bug in the error message printout for the case when we have sufficient chain work, but an expected network upgrade has not activated.
2020-05-19 19:33:31 +00:00
Daira Hopwood
cb7c90522d
Explicitly assert that chainActive[upgrade.nActivationHeight] is non-null at this point.
...
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-05-19 20:13:37 +01:00
Homu
5e7ecc80f2
Auto merge of #4532 - ebfull:disable-libsodium-config-updates, r=ebfull
...
Fix libsodium compilation
2020-05-18 17:47:05 +00:00
Sean Bowe
55ac118e65
Pass DO_NOT_UPDATE_CONFIG_SCRIPTS=1 to autogen.sh in libsodium dependency, to avoid updating config scripts over the network.
2020-05-18 11:37:04 -06:00
Kris Nuttycombe
6a0d464f41
Merge remote-tracking branch 'upstream/master' into hotfix-v2.1.2-2-golden
2020-05-18 11:22:22 -06:00
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
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
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