Commit Graph

13974 Commits

Author SHA1 Message Date
Sean Bowe 539e487a31
Postpone updates for dependencies until after 4.0.0 release. 2020-09-01 13:24:08 -06:00
Sean Bowe 6937dff376
Set activation height for Canopy on mainnet. 2020-09-01 13:16:05 -06:00
Homu 5f398da323 Auto merge of #4700 - zcash:df-addrs, r=daira
Add dev fund addresses for mainnet
2020-09-01 13:04:26 +00:00
Daira Hopwood 889b05df41
Clarify a comment about the ZF and MG addresses 2020-09-01 12:56:05 +01:00
Sean Bowe abd4b736e4
Add dev fund addresses for mainnet. 2020-08-31 15:07:43 -06:00
Homu 4003b597d5 Auto merge of #4686 - ebfull:release-v4.0.0-rc1, r=ebfull
Release v4.0.0-rc1

This postpones `boost` and `native_rust` updates. (`native_rust` was renamed from `rust` in #4656)
2020-08-27 15:09:30 +00:00
Sean Bowe c0f50ef8e6
Specify 4.0.0 in release notes 2020-08-27 09:08:22 -06:00
Sean Bowe 5a56246b91
Update names of contributors in release notes. 2020-08-27 09:07:15 -06:00
Sean Bowe af36ceae88
Add release notes to describe the Canopy network upgrade. 2020-08-26 12:08:06 -06:00
Sean Bowe 95d159c0e7
make-release.py: Updated release notes and changelog for 4.0.0-rc1. 2020-08-26 10:17:07 -06:00
Sean Bowe 4ce87e9e16
make-release.py: Updated manpages for 4.0.0-rc1. 2020-08-26 10:17:06 -06:00
Sean Bowe a5d6dbde1e
make-release.py: Versioning changes for 4.0.0-rc1. 2020-08-26 10:09:33 -06:00
Sean Bowe 104cc4dc77
Postpone rust updates 2020-08-26 10:08:35 -06:00
Sean Bowe 651721dcd8
Postpone boost 1.74.0 update 2020-08-26 10:04:20 -06:00
Homu 16c99c2c4e Auto merge of #4685 - LarryRuane:wallet-locking, r=ebfull
wallet: lock cs_main while accessing chainActive

Closes #4684
2020-08-26 14:05:55 +00:00
Homu b941974363 Auto merge of #4313 - zancas:4312_define_EXPECTED_BLOCKS_PER_HOUR, r=daira
Increase code readability, make DEPRECATION use Single Source of Truth for Blocks/Hour

Fixes: #4312

It includes:
 * a link reference to ZIP 200;
 * EXPECTED_BLOCKS_PER_HOUR: names the value and makes explicit probabilistic nature;
 * ACTIVATION_TO_DEPRECATION_BLOCKS: name an intermediate value for readability.
2020-08-26 04:59:39 +00:00
Homu d3acf75745 Auto merge of #4542 - nuttycom:reorder_checks, r=nuttycom
Organize transaction version checks.

Some minor cleanup for ContextualCheckTransaction, in service of making the checks here easier to reason about.
2020-08-26 02:09:06 +00:00
Kris Nuttycombe bff5476a19 Add comment in lieu of redundant overwinter version check & fix tests.
This also includes the following:

commit b12adf605640abba4cef6ddab1a2797b12cbf454
Author: Kris Nuttycombe <kris.nuttycombe@gmail.com>
Date:   Mon Aug 24 16:01:18 2020 -0600

    Add assertions to ensure that dependencies between active upgrades are respected.

    Co-authored-by: Daira Hopwood <daira@jacaranda.org>
2020-08-25 20:07:06 -06:00
Homu 494f0341a8 Auto merge of #4682 - str4d:rust-crate-updates, r=str4d
Rust crate updates
2020-08-25 23:31:57 +00:00
Larry Ruane 3261ba41bf wallet: lock cs_main while accessing chainActive 2020-08-25 10:34:19 -06:00
Jack Grigg 6c1204b228 FFI: Rename r to rcm 2020-08-25 17:30:38 +01:00
Jack Grigg fbe54c4b6c FFI: Rename to librustzcash_sapling_compute_cmu
Part of zcash/zcash#3446.
2020-08-25 17:25:00 +01:00
Jack Grigg 0ac2261b7a qa: Update list of postponed crate versions 2020-08-25 13:07:22 +01:00
Jack Grigg f0babb8356 depends: cargo update 2020-08-25 13:07:22 +01:00
Jack Grigg bb1e1e57a7 FFI: Migrate to bls12_381 and jubjub crates 2020-08-25 13:07:22 +01:00
Jack Grigg 3fd409433b FFI: Remove circuit parameter hashes from librustzcash_init_zksnark_params
These were hard-coded into the underlying zcash_proofs::load_parameters
function.

Closes zcash/zcash#4519.
2020-08-25 13:07:22 +01:00
Jack Grigg c10ba7da41 depends: Migrate to zcash_* 0.3.0 Rust crates 2020-08-25 13:07:22 +01:00
zancas 9dca208efd
make deprecation.h include consensus/params.h
This commit is intended to resolve #4312.
It includes:
 * a link reference to zip-0200
 * EXPECTED_BLOCKS_PER_HOUR: names the value and makes explicit
   probabilistic nature
 * ACTIVATION_TO_DEPRECATION_BLOCKS: name an intermediate value for
   readability
 *  enforce correct value for EXPECTED_BLOCK_PER_HOUR
Application of reviewer comments
 * move #include below #ifndef/#define macro guard
   https://en.wikipedia.org/wiki/Include_guard
 * remove code obfuscating // 48
 * update zip URL
 * remove code obfuscating // 14 days
2020-08-23 15:18:22 -06:00
Homu b464b7dcc5 Auto merge of #4678 - str4d:zip-215-more-test-cases, r=str4d
test: Update ZIP 215 test cases from ed25519-zebra

This includes the changes and additions to the test cases following this ed25519-zebra commit:

65ba7f36cc
2020-08-22 16:55:47 +00:00
Kris Nuttycombe 4089e760fb consensus: Remove redundant contextual consensus rules
By the time we reach any of these rules, we have already rejected
transactions without fOverwintered set, so we can assume that it is set.

We replace the vague "overwinter is active" message with a more specific
"overwintered flag must be set" from one of the removed rules.
2020-08-22 01:06:32 +01:00
Kris Nuttycombe 56de0a09c7 consensus: Reorder Overwinter+!Sapling rules 2020-08-22 01:06:32 +01:00
Kris Nuttycombe 89274524e5 consensus: Move Sapling-disabled Overwinter rules above Sapling rules
This replaces `if (!saplingActive && overwinterActive)` with the
logically-equivalent `if (overwinterActive && !saplingActive)`, but
means that the Overwinter-introduced rules are now clustered together.
2020-08-22 01:06:32 +01:00
Kris Nuttycombe 8175dc5b7f consensus: Combine saplingActive conditionals 2020-08-22 01:06:32 +01:00
Kris Nuttycombe 50afda0231 consensus: Move overwinterActive rules ahead of saplingActive rules 2020-08-22 01:06:32 +01:00
Kris Nuttycombe 25974d4d25 consensus: Add a placeholder for !canopyActive 2020-08-22 01:06:32 +01:00
Kris Nuttycombe 830b8a44ca consensus: Combine heartwoodActive conditionals 2020-08-22 01:06:32 +01:00
Kris Nuttycombe 6027a61c2e consensus: Remove canopyActive gate around GetActiveFundingStreamElements
The function gates internally on Canopy, so we can remove the redundant
check.
2020-08-22 01:06:32 +01:00
Kris Nuttycombe 570478a078 consensus: Refactor Sprout contextual rules to match the rest 2020-08-22 01:06:32 +01:00
Kris Nuttycombe cf45a26eed consensus: Clean up some whitespace and variable names 2020-08-22 01:06:32 +01:00
Jack Grigg a379f275dd test: Update ZIP 215 test cases from ed25519-zebra 2020-08-21 17:28:12 +01:00
Homu 595b15fc43 Auto merge of #4675 - str4d:zip-207-ncc-comments, r=nuttycom
ZIP 207 and ZIP 214 NCC comments

Changes to the ZIP 207 and ZIP 214 implementations as suggested in the NCC audit.
2020-08-21 15:56:36 +00:00
str4d 732f1a76e4
Adjust GetActiveFundingStream* comments
Co-authored-by: Daira Hopwood <daira@jacaranda.org>
2020-08-22 03:47:12 +12:00
Homu 30619ae888 Auto merge of #4654 - str4d:sodium-oxide, r=str4d
Replace most libsodium usage with Rust crates

We currently use four components of libsodium:

- Random byte generation
- BLAKE2b
- Ed25519
- ChaCha20Poly1305

This PR replaces the first three with equivalent logic from Rust crates:

- `rand_core::OsRng`
- `blake2b_simd`
- `ed25519-zebra`
  - `libsodium` is still used for Ed25519 verification in the consensus rules until Canopy activation.
2020-08-20 18:11:16 +00:00
Jack Grigg d41cf37841 ed25519: Panic (triggering abort) if nullptr passed into APIs 2020-08-20 19:00:48 +01:00
Jack Grigg efb4246ad3 Replace libsodium's crypto_sign with ed25519-zebra
crypto_sign_verify_detached is still used within the consensus rules
until Canopy activation. ed25519-zebra generates signatures that are
valid under both pre- and post-Canopy rules (for our honest usage),
so we can use it to generate transaction signatures now. Then once
Canopy activates, we can remove the remaining usages of crypto_sign.
2020-08-20 19:00:47 +01:00
Jack Grigg c595056883 consensus: Clearly gate active funding stream elements on Canopy
We only use the output of GetActiveFundingStreamElements and
GetActiveFundingStreams within Canopy contexts, but this makes it
explicit that funding streams are disabled before Canopy activation.
2020-08-20 17:54:44 +01:00
Homu 016e351972 Auto merge of #4674 - therealyingtong:zip-212-ncc-fixes, r=therealyingtong
ZIP 212 NCC fixes

Fixes to the ZIP 212 implementation as suggested in the NCC audit.
2020-08-20 15:05:30 +00:00
ying tong 1ed936b893
Add link to ZIP212 in coinbase comment
Co-authored-by: Daira Hopwood <daira@jacaranda.org>
2020-08-20 22:20:34 +08:00
Jack Grigg 768534a8b9 consensus: Statically check funding stream numerators and denominators 2020-08-20 14:48:01 +01:00
Jack Grigg bfeaa0e4c0 consensus: Document the empty conditional branch in ContextualCheckBlock
It exists to implement a ZIP 207 consensus rule that turns off the
Founders' Reward once Canopy activates.
2020-08-20 14:09:15 +01:00