Commit Graph

14162 Commits

Author SHA1 Message Date
Daira Hopwood bd4469339a
Rename z_*_balance fields of getwalletinfo output to shielded_*_balance 2020-09-03 14:43:10 +01:00
Kris Nuttycombe 4c4a1c4d68 Revert the move of the `getBalanceZaddr` block for ease of review. 2020-09-03 07:34:01 -06:00
Kris Nuttycombe 48149defab Prevent creation of shielded transactions in initial block download.
Author: Alfredo Garcia <oxarbitrage@gmail.com>
Co-authored-by: Jack Grigg <jack@z.cash>
Co-authored-by: Duke Leto <duke@leto.net>
2020-09-03 07:13:50 -06:00
Homu ef62a1c5e4 Auto merge of #4688 - defuse:fix-rpc-test-string-interpolation, r=daira
Add a missing % to a string interpolation in rpc test framework
2020-09-03 13:06:45 +00:00
Homu 5e7e9687fc Auto merge of #4702 - ebfull:release-v4.0.0, r=ebfull
Release v4.0.0

This release activates [Canopy](https://z.cash/upgrade/canopy/) on the 4 year anniversary of the launch of the Zcash network!
2020-09-01 20:58:51 +00:00
Sean Bowe 02c5f089cf
minor: Add backticks to avoid formatting in 4.0.0 release notes. 2020-09-01 14:58:04 -06:00
Sean Bowe 505495a73d
make-release.py: Updated release notes and changelog for 4.0.0. 2020-09-01 13:31:19 -06:00
Sean Bowe eedd28599b
make-release.py: Updated manpages for 4.0.0. 2020-09-01 13:31:19 -06:00
Sean Bowe 01d1ea5f0f
make-release.py: Versioning changes for 4.0.0. 2020-09-01 13:28:51 -06:00
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
Jack Grigg 06d44392be wallet: Add ANY_TADDR special string to z_sendmany
When using this special string as the from address, UTXOs from any
transparent addresses within the wallet will be used to fund the
transaction. Change outputs will be sent to a new transparent address,
as with any other spend of transparent funds.

Closes zcash/zcash#3640.
2020-08-29 01:39:30 +01:00
Daira Hopwood 75f9f8f95b Make some conversions explicit to reduce sanitizer warnings.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-08-27 23:57:28 +01: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
Taylor Hornby 51b9e230d2 Add a missing % to a string interpolation in rpc test framework 2020-08-26 14:47:48 -06:00
Taylor Hornby 9f284b5010 Fix buffer overflows in P2PKH tests 2020-08-26 14:01:40 -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
Daira Hopwood fb8dd9d458 CBufferedFile: use eof() method rather than feof(src) in error message.
Co-authored-by: Jack Grigg <jack@z.cash>
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-08-26 13:20:20 +01:00
Daira Hopwood 6c20de21b9 CBufferedFile: assert that Fill() is only called when nReadPos == nSrcPos, and simplify based on that assumption.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-08-26 13:20:20 +01:00
Alfredo Garcia 868691020e Add null check to feof.
Co-authored-by: Jack Grigg <jack@z.cash>
Co-authored-by: Ying Tong Lai <yingtong@electriccoin.co>
Co-authored-by: Daira Hopwood <daira@jacaranda.org>
2020-08-26 13:19:01 +01: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
Alfredo Garcia 35961c4ee2 add shielded balance to getwalletinfo 2020-08-24 14:42:19 -03: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