Commit Graph

14424 Commits

Author SHA1 Message Date
Homu e3974db2d3 Auto merge of #4870 - mdr0id:canopy_smoke_tests_update, r=str4d
Update expected fails for  Sprout txns flows on Canopy

Updating smoke test for Canopy consensus
2020-11-18 11:52:29 +00:00
Homu 20dd32fe9b Auto merge of #4871 - rex4539:typos, r=str4d
Fix typo
2020-11-17 14:55:24 +00:00
Dimitris Apostolou 31e220a316
Fix typo 2020-11-17 16:33:31 +02:00
mdr0id 4dc94c954f Update expected fails for Sprout txns flows on Canopy 2020-11-16 15:57:49 -08:00
Homu 33fdb1b4bc Auto merge of #4868 - daira:clean-removes-lib, r=str4d
Windows cross-build generates .lib files, which should be ignored by git and removed by clean

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-11-16 21:34:08 +00:00
Homu 6d856869e9 Auto merge of #4869 - zcash:release-v4.1.1, r=nuttycom
Release v4.1.1

Optimize release build
----------------------
The release build now sets CLAGS/CXXFLAGS to use the -O3 optimization
option, which turns on more optimization flags than the previously used
-O1. This produces a faster build, addressing a performance regression in
v4.1.0.

Correctly report Founders' Reward amount in `getblocktemplate`
--------------------------------------------------------------
This release correctly returns the `foundersreward` field from `getblocktemplate`
output pre-Canopy and removes the field post-Canopy. (The Founders' Reward will
expire exactly as Canopy activates, as specified in [ZIP 207](https://zips.z.cash/zip-0207).)
To obtain information about funding stream amounts, use `getblocksubsidy HEIGHT`,
passing in the height returned by the `getblocktemplate` API.
2020-11-16 18:45:38 +00:00
Kris Nuttycombe 251405491b Add notable changes to release notes for v4.1.1 2020-11-16 10:26:11 -07:00
Kris Nuttycombe 7ec8a9c5f4 make-release.py: Updated release notes and changelog for 4.1.1. 2020-11-16 10:23:40 -07:00
Kris Nuttycombe 092829cf5b make-release.py: Updated manpages for 4.1.1. 2020-11-16 10:23:40 -07:00
Kris Nuttycombe 142328b067 make-release.py: Versioning changes for 4.1.1. 2020-11-16 10:07:07 -07:00
Daira Hopwood f6fc97f35e Windows cross-build generates .lib files, which should be ignored by git and removed by clean.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-11-16 11:03:22 +00:00
Homu 9248cd743b Auto merge of #4864 - daira:go-faster, r=daira
Set release CFLAGS/CXXFLAGS to use -O3.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-11-14 08:15:23 +00:00
Homu 61ebef4095 Auto merge of #4865 - nuttycom:fix/shielded_coinbase_fr_rpc_fields, r=str4d
Correctly report founder's reward amount in getblocktemplate prior to Canopy

Previously this would return incorrect results in the case that the
miner reward was sent to a shielded address. Post-Canopy, the
foundersreward field is removed; this information should be obtained
from getblocksubsidy instead.
2020-11-14 04:24:14 +00:00
Kris Nuttycombe c8a90d9b98
Update getblocktemplate documentation.
Co-authored-by: str4d <thestr4d@gmail.com>
2020-11-13 17:09:29 -07:00
Kris Nuttycombe 1a89167944 Document how to get block subsidy information in getblocktemplate. 2020-11-13 16:36:36 -07:00
Kris Nuttycombe d107cf13b6 Correctly report founder's reward amount in getblocktemplate prior to Canopy
Previously this would return incorrect results in the case that the
miner reward was sent to a shielded address. Post-Canopy, the
foundersreward field is removed; this information should be obtained
from getblocksubsidy instead.
2020-11-13 16:25:37 -07:00
Daira Hopwood a0a87ab413 Set release CFLAGS/CXXFLAGS to use -O3.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-11-13 22:39:17 +00:00
Homu 0ccc885371 Auto merge of #4863 - nuttycom:fix/ibd_flag_check_order, r=daira
Change order of checks to skip IsInitialBlockDownload check if flag is unset.
2020-11-13 21:49:27 +00:00
Kris Nuttycombe b5ad4cfc5e Change order of checks to skip IsInitialBlockDownload check if flag is unset. 2020-11-13 12:59:14 -07:00
Homu ac792a3947 Auto merge of #4860 - daira:clarify-meantarget, r=daira
GetNextWorkRequired: clarify why this computation is equivalent to that in the protocol spec

refs https://github.com/zcash/zips/pull/418 cc: @teor2345

Comment-only change; no documentation or testing required.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-11-12 14:10:57 +00:00
Daira Hopwood 4d16bfd181 GetNextWorkRequired: clarify why this computation is equivalent to that in the protocol spec.
refs https://github.com/zcash/zips/pull/418

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2020-11-12 10:52:49 +00:00
Homu 5c47b9bb08 Auto merge of #4852 - str4d:cargo-update, r=str4d
Update Rust dependencies
2020-11-11 00:40:35 +00:00
Jack Grigg 120b184d8f cargo update 2020-11-10 21:39:55 +00:00
Homu 091f5d7816 Auto merge of #4851 - adityapk00:mining_fix, r=str4d
Don't compile ehHashState::* if mining is disabled

Compile currently fails if using `CONFIGURE_FLAGS=--disable-mining`, because the `ehHashState::*` functions inadvertently get included.
2020-11-10 20:50:38 +00:00
adityapk00 7732b9aff2 Don't compile ehHashState::* if mining is disabled 2020-11-10 11:31:47 -08:00
Homu 60331b9e83 Auto merge of #4574 - oxarbitrage:issue4475, r=daira
Add blockhash parameter to getrawtransaction

Code ported manually from https://github.com/bitcoin/bitcoin/pull/10275 in attempt to fix https://github.com/zcash/zcash/issues/4475
2020-11-10 15:52:11 +00:00
Daira Hopwood 5701095c22
Wording improvements to getrawtransaction RPC documentation 2020-11-10 14:41:07 +00:00
Homu caed4adf50 Auto merge of #4849 - str4d:lint-fixes, r=str4d
Lint fixes

Fixes most lints currently reported by `test/lint/lint-all.sh`.

Includes changes cherry-picked from the following upstream PRs:
- bitcoin/bitcoin#8700
- bitcoin/bitcoin#8840
- bitcoin/bitcoin#9867
  - We backported the second commit in zcash/zcash#3146
- bitcoin/bitcoin#10771
- bitcoin/bitcoin#11394
- bitcoin/bitcoin#11649
- bitcoin/bitcoin#17329
- bitcoin/bitcoin#19258
2020-11-10 01:42:15 +00:00
str4d e531d72337
doc: Adjust subtree developer notes to refer to Zcash
We don't maintain any of the current subtrees, but we might in future.

Co-authored-by: Daira Hopwood <daira@jacaranda.org>
2020-11-10 01:40:51 +00:00
Jack Grigg 399ab8afa6 lint: Fix minor shellcheck lints 2020-11-09 23:20:39 +00:00
Jack Grigg 6b63fdd657 lint: s/trim/lenTrim in src/crypto/equihash.[cpp,h]
Fixes a false positive match to the locale-dependent trim function.
2020-11-09 23:06:21 +00:00
Jack Grigg 25dafc3872 lint: Apply include guard style to src/rust/include 2020-11-09 23:06:21 +00:00
Jack Grigg e6b1d44170 lint: Re-exclude subtrees from lint-include-guards.sh
These are external libraries, and it does not make sense to maintain an
otherwise-meaningless diff from upstream.

This partially reverts commit 1e6d1837a0.
2020-11-09 23:06:21 +00:00
Jack Grigg dbfb3565d6 lint: Opt out of locale dependence in Zcash shell scripts 2020-11-09 23:06:21 +00:00
Jack Grigg 7c4b19fa4d lint: Use consistent shebangs 2020-11-09 23:06:21 +00:00
Jack Grigg 337e528d33 python: Explicitly set encoding to utf8 when opening text files 2020-11-09 23:06:21 +00:00
Jack Grigg 1944eb1c86 lint: Fix duplicate includes 2020-11-09 23:06:21 +00:00
Jack Grigg d0a5343da9 lint: Fix missing or inconsistent include guards 2020-11-09 23:06:21 +00:00
Sjors Provoost c0c05ebb34 doc: improve subtree check instructions 2020-11-09 23:06:21 +00:00
John Newbery 9069364e56 [linter] Strip trailing / in path for git-subtree-check
git-subtree-check fails if the directory is given with a trailing slash,
eg:

```
> test/lint/git-subtree-check.sh src/univalue/
ERROR: src/univalue/ is not a subtree
```

Shell autocompletes will add the trailing slash when autofilling the
path name, which will therefore cause the script to fail.

Just ignore any trailing slash.
2020-11-09 23:06:21 +00:00
MarcoFalke cff7e776bf Revert "Remove unused variable in shell script"
This partially reverts commit ab8e8b97a359e1c4f1bca8e1769021c95019f2c4
2020-11-09 23:06:21 +00:00
Pieter Wuille eb074fdb24 Improve git-subtree-check.sh
We have several pieces of information about subtrees:
1) What their current directory contents is
2) What their directory contents was at the time of the last subtree merge
3) What the directory contents of the upstream project is in the commit referred to by the subtree merge.

Normally, all 3 should be identical. git-subtree-check.sh so far only compared (1) with (3) however.

Fix this by comparing all three, and give some more useful diff output in the case of mismatch.

The added benefit is that (1) and (2) can be compared without needing to see the upstream repository.
2020-11-09 23:06:21 +00:00
practicalswift 52d9854034 Remove unused variables in shell scripts.
Zcash: Only the script we have.
2020-11-09 23:06:21 +00:00
Wladimir J. van der Laan 92633fdc3d uint256: replace sprintf with HexStr and reverse-iterator
Instead of calling sprintf for every byte, format the hex bytes
ourselves by help of HexStr and a reverse_iterator.
2020-11-09 23:06:21 +00:00
Wladimir J. van der Laan 5295079b2e test: Explicitly set encoding to utf8 when opening text files
These are text files but their encoding does not depend on the locale.
Not all of them require utf8 but it is better to fix it at something
to remove potential unpredictability.

This is necessary on FreeBSD where no locale is set by default,
and apparently Python defaults not only the terminal encoding to the locale
but that of every text file. So without LOCALE environment it defaults text
file encoding to ASCII. This causes problems with e.g. `bitcoin.conf`.

Luckily the locale doesn't affect the default encoding for str.encode() and
bytes.decode() on Python 3, so this is the only change necessary.
2020-11-09 22:59:04 +00:00
isle2983 ccf31edf62 [copyright] add MIT license headers to .sh scripts where missing
Years are set according to 'git log' history

Zcash: Only the scripts we have that are missing the header.
2020-11-09 22:59:04 +00:00
Homu 84a5830aaa Auto merge of #4829 - str4d:backport-lints, r=str4d
Backport useful lints from upstream

Cherry-picked from the following upstream PRs:
- bitcoin/bitcoin#6892
- bitcoin/bitcoin#11151
- bitcoin/bitcoin#11300
- bitcoin/bitcoin@96d91b79bd
- bitcoin/bitcoin#12097
- bitcoin/bitcoin#12098
- bitcoin/bitcoin#12442
- bitcoin/bitcoin#12572
- bitcoin/bitcoin#12757
- bitcoin/bitcoin#11878
- bitcoin/bitcoin#12933
- bitcoin/bitcoin#12871
- bitcoin/bitcoin#12972
- bitcoin/bitcoin#13281
- bitcoin/bitcoin#13385
- bitcoin/bitcoin#13041
- bitcoin/bitcoin#13454
- bitcoin/bitcoin#13448
- bitcoin/bitcoin#13510
- bitcoin/bitcoin#13851
- bitcoin/bitcoin#13863
- bitcoin/bitcoin#14115
- bitcoin/bitcoin#14831
- bitcoin/bitcoin#15164
- bitcoin/bitcoin#15170
- bitcoin/bitcoin#15166
- bitcoin/bitcoin#16036
- bitcoin/bitcoin#16768
- bitcoin/bitcoin#13494

Several of the lints fail for our current codebase; these will be addressed in a
subsequent PR.
2020-11-09 21:20:55 +00:00
str4d 1e6d1837a0
lint: Remove some subtrees from exclusion
Either they don't violate the lints, or can be easily fixed.

Co-authored-by: Daira Hopwood <daira@jacaranda.org>
2020-11-09 20:06:45 +00:00
str4d 5b543b15eb
lint: Allow stoi in src/rpc/blockchain.cpp
This instance is ok because it's guarded by a strict regex.

Co-authored-by: Daira Hopwood <daira@jacaranda.org>
2020-11-09 20:03:22 +00:00
Homu bd5ff7c889 Auto merge of #4835 - str4d:bctest-backports, r=str4d
bitcoin-util-test.py backports

Cherry-picked from the following upstream PRs:
- bitcoin/bitcoin#8829
- bitcoin/bitcoin#8830
- bitcoin/bitcoin#8836
- bitcoin/bitcoin#8881
- bitcoin/bitcoin#9032
- bitcoin/bitcoin#9023
- bitcoin/bitcoin#9069
- bitcoin/bitcoin#9945
2020-11-09 19:57:48 +00:00