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

14003 Commits

Author SHA1 Message Date
Homu 6f9b281ef7 Auto merge of #4706 - str4d:4705-nuparams-config-file, r=daira 
Allow multiple nuparams options in config file

We didn't add this in zcash/zcash#4583 because `-nuparams` is only ever
used as a CLI argument in our testing infrastructure. It turns out that
there are external developers using regtest mode with `nuparams` in
their config files instead. Neat!

Closes zcash/zcash#4705.
 2020-09-06 12:49:47 +00:00
Jack Grigg 566e0d38b4 Allow multiple nuparams options in config file 
We didn't add this in zcash/zcash#4583 because `-nuparams` is only ever
used as a CLI argument in our testing infrastructure. It turns out that
there are external developers using regtest mode with `nuparams` in
their config files instead. Neat!

Closes zcash/zcash#4705.
 2020-09-04 19:00:38 +01:00
Homu f8e1a02bbe Auto merge of #4561 - oxarbitrage:issue1873, r=daira 
Allow full and relative path wallet database location

Closes https://github.com/zcash/zcash/issues/1873
 2020-09-04 14:49:50 +00:00
Daira Hopwood fbe68913bd Ensure that the absolute path used in the test definitely does not exist. 
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
 2020-09-04 14:52:11 +01:00
Daira Hopwood 21fee305a2 Fix grammar in error messages. 
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
 2020-09-04 14:52:05 +01:00
Alfredo Garcia dc9c95b705 Apply suggestions from code review 
Co-authored-by: str4d <thestr4d@gmail.com>
 2020-09-04 14:50:17 +01:00
Alfredo Garcia 6a7cfdea54 allow wallet file to be outside datadir 2020-09-04 14:50:17 +01:00
Homu 7e958be2cb Auto merge of #4300 - oxarbitrage:issue3939, r=nuttycom 
add shielded balance to getwalletinfo

Closes zcash/zcash#3939

It is based on the definition that unconfirmed balance has 0 confirmations; anything else is regular balance.

Implementation:

1. `getBalanceZaddr` uses one version of `GetFilteredNotes`, we want to use the other version that allow us to get balances inside min and max confirmations.
2. `shielded_unconfirmed_balance`, and `shielded_balance` are obtained by calling `getBalanceZaddr` with different min and max confirmations according to the definitions from above.
 2020-09-04 13:29:58 +00:00
Kris Nuttycombe 9d8555cf1b Fix forward declaration. 2020-09-04 07:29:24 -06:00
Homu 443954580d Auto merge of #4687 - defuse:fix-cscript-test-buffer-overflows, r=daira 
Fix buffer overflows in P2PKH tests
 2020-09-03 22:16:23 +00:00
Homu af6ca1406c Auto merge of #4357 - oxarbitrage:issue2880, r=daira 
Add null check to feof

Closes https://github.com/zcash/zcash/issues/2880
 2020-09-03 18:51:37 +00:00
Homu cf8cd09ae1 Auto merge of #4349 - oxarbitrage:issue3996, r=daira 
Prevent creation of shielded transactions when chain is not synced up

Part of zcash/zcash#3996.

Inspired by jl777/komodo#1486 and jl777/komodo#1493, but takes a different approach:

- Uses a function `ThrowIfInitialBlockDownload()` that checks `IsInitialBlockDownload()`, instead of macros.
- Added `initial_block_download_complete` output only to `getblockchaininfo`.
 2020-09-03 16:21:51 +00:00
Homu 3caa784970 Auto merge of #2778 - syd0:add-python-assert, r=daira 
Add assert_raises_message to the python test framework.
 2020-09-03 14:26:54 +00:00
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
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