zecfoundation
/
zcashd
mirror of https://github.com/ZcashFoundation/zcashd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
13,748 Commits 27 Branches 108 Tags 109 MiB
Commit Graph

13748 Commits

Author SHA1 Message Date
Homu 162d5a50ee Auto merge of #4610 - ebfull:testnet-dev-fund, r=str4d 
Add dev fund addresses and set activation height for testnet NU4 activation.
 2020-07-27 09:05:53 +00:00
therealyingtong 283287ab5b
Use 51 Testnet Dev Fund addresses, and adjust the end heights. 
Co-authored-by: Ying Tong Lai <yingtong@electriccoin.co>
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
 2020-07-25 09:45:30 +08:00
therealyingtong 62c3613816
Delay testnet activation height by one week 2020-07-24 08:15:35 +08:00
Homu de52eed974 Auto merge of #4628 - therealyingtong:block-903002-bug, r=str4d 
Pass HistoryNode through Rust FFI as a C array

`std::array<T>` is guaranteed to store `T` contiguously. However, there is
no guarantee that `sizeof(std::array<unsigned char, N>) == N`, which
prevents us from interpreting `std::array<std::array<unsigned char, N>, 32>`
as `&[[u8; N]]` on the Rust side of the FFI.

Instead, we define `HistoryNode` as a struct wrapping a C array, which
(as checked by `static_assert`) contains no padding.

This is equivalent to 82fe37d22b, which
fixed this issue when passing a slice of `HistoryEntry`s from C++ to Rust;
the bug fixed here is writing `HistoryNodes` from Rust into C++ memory.
 2020-07-23 22:40:42 +00:00
Kris Nuttycombe 04b4d42767 Zero-initialize HistoryNode values. 2020-07-23 16:24:48 -06:00
therealyingtong 13aa74aa45
Pass HistoryNode struct to librustzcash FFI 2020-07-21 17:56:47 +08:00
Homu d058568e0a Auto merge of #4617 - daira:release-notes-3.0.0-formatting, r=daira 
Fix the formatting of the 3.0.0 release notes

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
 2020-07-17 20:18:26 +00:00
Homu 6631f218d3 Auto merge of #4616 - daira:4615/hashrate-display, r=daira 
Use SI prefixes for hash rates on the metrics screen

fixes #4615
 2020-07-17 19:11:36 +00:00
therealyingtong ab4d2ede40
Set PROTOCOL_VERSION to 170012 2020-07-18 00:29:03 +08:00
therealyingtong 8a4c51508a
Set Canopy testnet activation height to 1020500 2020-07-18 00:28:45 +08:00
Daira Hopwood f7c7c76bee Fix the formatting of the 3.0.0 release notes. 
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
 2020-07-17 15:15:06 +01:00
Daira Hopwood d9307ddd83 Add unit tests for DisplayDuration, DisplaySize, and DisplayHashRate. 
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
 2020-07-17 13:59:27 +01:00
Daira Hopwood 460a601e9b Metrics screen: display hash rates using SI prefixes rather than as powers of 2. 
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
 2020-07-17 13:56:33 +01:00
Daira Hopwood 976dce7696 src/metrics.cpp: cosmetic whitespace changes. 
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
 2020-07-17 13:54:58 +01:00
ewillbefull@gmail.com c0a19854bf Add dev fund addresses for testnet NU4 activation. 2020-07-15 20:09:39 -06:00
Homu d292376176 Auto merge of #4609 - therealyingtong:release-v3.1.0-rc2, r=daira 
Release v3.1.0-rc2
 2020-07-15 21:25:37 +00:00
Homu 2ba4f16590 Auto merge of #4605 - daira:more-iterator-cleanups, r=daira 
More iterator cleanups

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
 2020-07-15 20:09:37 +00:00
Daira Hopwood 3383c4855f More iterator cleanups. 
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
 2020-07-15 19:18:57 +01:00
Homu b4ec903ac4 Auto merge of #4608 - str4d:post-heartwood-cleanups, r=nuttycom 
Post-Heartwood cleanups

The C++ Equihash validator is removed; the Rust validator is now used unconditionally for the entire chain.

Changes made to enable contextually switching between the two validators have been reverted.

Also fixes a segfault that could occur on reindex during consensus-related development.
 2020-07-15 14:59:15 +00:00
therealyingtong 07fb092b12
Edit release notes to specify that rc2 does not enable Canopy support on the testnet 2020-07-15 22:11:22 +08:00
therealyingtong 4af884d267
make-release.py: Updated release notes and changelog for 3.1.0-rc2. 2020-07-15 21:51:09 +08:00
therealyingtong 5769654975
make-release.py: Updated manpages for 3.1.0-rc2. 2020-07-15 21:51:08 +08:00
therealyingtong 170ea7bda0
make-release.py: Versioning changes for 3.1.0-rc2. 2020-07-15 21:50:12 +08:00
Homu cf034d4594 Auto merge of #4594 - nuttycom:ed25519-zebra-2.0.0, r=therealyingtong 
Use ed25519-zebra from crates.io.

Closes #4592
 2020-07-15 12:38:07 +00:00
Jack Grigg 3611f68811 Revert "Pass the block height through to CheckEquihashSolution()" 
This reverts commit 49f9584613.

Now that we are depending unconditionally on the Rust Equihash
validator, CheckEquihashSolution() can revert to being a non-contextual
check.

This also fixes a segfault that would occur during reindexing if the
consensus rules were altered such that a previously-valid block would
become invalid, and the node's block files contained blocks in a
specific order. It was encountered while testing the Canopy NU on
testnet (due to a bug in the implementation of ZIP 212 that was
separately fixed in zcash/zcash#4604).
 2020-07-15 16:16:40 +12:00
Jack Grigg 96920e952d Remove C++ Equihash validator 2020-07-15 14:03:45 +12:00
Jack Grigg 79846ac1f3 Use Rust Equihash validator unconditionally 
It correctly validates all blocks prior to Heartwood activation.
 2020-07-15 13:59:32 +12:00
Homu 54180fbce5 Auto merge of #4604 - daira:fix-unintended-consensus-change, r=str4d 
Fix an unintended consensus change in decryption of coinbase outputs

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
 2020-07-14 23:25:35 +00:00
Daira Hopwood 2336259c1e Fix an unintended consensus change in decryption of coinbase outputs. 
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
 2020-07-14 22:59:34 +01:00
Homu d09cedb63a Auto merge of #4602 - daira:makefile-key-constants, r=daira 
Add key_constants.h to src/Makefile.am

This should fix Gitian builds.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
 2020-07-14 17:07:32 +00:00
Daira Hopwood 239ea1270e Add key_constants.h to src/Makefile.am. 
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
 2020-07-14 17:44:54 +01:00
Homu 23f3161a06 Auto merge of #4601 - therealyingtong:release-v3.1.0-rc1, r=daira 
Release v3.1.0-rc1
 2020-07-14 11:30:30 +00:00
therealyingtong 0901cb0241
Undo manual DEPRECATION_HEIGHT 2020-07-14 14:46:15 +08:00
therealyingtong d7b976b737
make-release.py: Updated release notes and changelog for 3.1.0-rc1. 2020-07-14 14:38:11 +08:00
therealyingtong e255e8bd0a
make-release.py: Updated manpages for 3.1.0-rc1. 2020-07-14 14:38:10 +08:00
therealyingtong e2be85b3af
make-release.py: Versioning changes for 3.1.0-rc1. 2020-07-14 14:36:44 +08:00
Homu 973dff930a Auto merge of #4599 - daira:iterator-cleanup, r=therealyingtong 
Clean up some iterator usage

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
 2020-07-14 05:12:41 +00:00
Homu 4fadb7f124 Auto merge of #4598 - therealyingtong:release-notes-v3.1.0, r=str4d 
[v3.1.0] Update release notes
 2020-07-14 02:52:25 +00:00
ying tong 2bf1985097
Apply suggestions from code review 
Co-authored-by: str4d <thestr4d@gmail.com>
 2020-07-14 10:50:15 +08:00
Daira Hopwood 0b0c84f4c9 Another cleanup. 
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
 2020-07-14 01:00:18 +01:00
Daira Hopwood 57409b7d2b Remove an unnecessary iterator increment. 
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
 2020-07-14 00:47:34 +01:00
Homu 6caed410c0 Auto merge of #4600 - daira:fix-cscheduler, r=daira 
Fix bug in CScheduler
 2020-07-13 21:38:06 +00:00
Taylor Hornby daf9ed98a1 Fix bug in CScheduler 2020-07-13 19:40:49 +01:00
Daira Hopwood 66096d540f Clean up some iterator usage. 
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
 2020-07-13 19:35:26 +01:00
therealyingtong a72246adc8 Update release notes for v3.1.0 2020-07-13 17:34:12 +08:00
Homu 959f5b09d0 Auto merge of #4560 - str4d:zip-207, r=nuttycom 
[ZIP 207] Funding Streams + [ZIP 214] Dev Fund Recipients

Closes #4554. Closes #4555.
 2020-07-10 22:45:11 +00:00
Kris Nuttycombe d80857f2b5 Trivial whitespace fix. 2020-07-10 08:31:46 -06:00
Kris Nuttycombe c88b461f89
Apply suggestions from code review 
Co-authored-by: Daira Hopwood <daira@jacaranda.org>
 2020-07-10 08:29:47 -06:00
Kris Nuttycombe 0e7ae06905 Fix assertion check in GetBlockSubsidy 2020-07-10 08:26:33 -06:00
str4d 8f7861573d
Merge pull request #20 from daira/zip-207 
Changes to getblocksubsidy RPC, and resolution of a problem with initializing chain params
 2020-07-11 01:55:03 +12:00