Commit Graph

12554 Commits

Author SHA1 Message Date
Homu 6da42887f1 Auto merge of #3944 - daira:update-license-info, r=daira
Update license info

Includes commits cherry-picked from bitcoin/bitcoin#8784 with some minor changes.

Fixes #2827.
2019-07-24 04:07:03 -07:00
Daira Hopwood 0f2a4e44d1
Link to ticket #2827 using URL
Co-Authored-By: Eirik Ogilvie-Wigley <eirik@z.cash>
2019-07-23 21:40:28 +01:00
Dimitris Apostolou ff40531607 Fix RPC undefined behavior.
Co-Authored-By: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2019-07-23 21:36:53 +01:00
Homu 94a48504a6 Auto merge of #4039 - codetriage-readme-bot:codetriage-badge, r=daira
Add CONTRIBUTING.md

Add CONTRIBUTING.md
2019-07-23 08:40:31 -07:00
Eirik Ogilvie-Wigley ded45b90d7 Fix nondeterministic failure in sapling migration test 2019-07-20 14:36:08 -06:00
Eirik Ogilvie-Wigley 7421272712 Make nextHeight required in CalculateNextWorkRequired 2019-07-18 14:57:13 -06:00
Homu 5441d135db Auto merge of #3927 - wmpea:master, r=Eirik0
Handful of copyedits to README.md

A few copyedits for improved grammatical polish and clarity
2019-07-18 09:55:54 -07:00
Daira Hopwood 2fe59a5681 qa/zcash/checksec.sh is under a BSD license, with a specialized non-endorsement clause.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2019-07-18 15:31:39 +01:00
Daira Hopwood bc909a7a7f Replace http with https: in links to the MIT license.
Also change MIT/X11 to just MIT, since no distinction was intended.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2019-07-18 15:26:01 +01:00
Homu 1c899f5a83 Auto merge of #4044 - Eirik0:fix-mergetoaddress-test-comment, r=Eirik0
Fix comment in mergetoaddress RPC test
2019-07-18 06:12:22 -07:00
Daira Hopwood 6e8685742c Update contrib/debian/copyright for ax_boost_thread.m4
Co-Authored-By: str4d <thestr4d@gmail.com>
2019-07-18 13:59:30 +01:00
Daira Hopwood 9ee7cd2048 Add license information for Autoconf macros. refs #2827
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2019-07-18 13:59:30 +01:00
Daira Hopwood f63731261c Update copyright information for Zcash, leveldb, and libsnark.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2019-07-18 13:59:30 +01:00
Luke Dashjr 5cf90cbc99 Trivial: build-aux/m4/l_atomic: Fix typo 2019-07-18 13:59:30 +01:00
Daira Hopwood 60c6730709 Add MIT license to build-aux/m4/bitcoin_* scripts, and a permissive license to build-aux/m4/l_atomic.m4 .
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2019-07-18 13:59:30 +01:00
Luke Dashjr 8c07c3559e Add MIT license to autogen.sh and share/genbuild.sh
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2019-07-18 13:59:30 +01:00
Daira Hopwood 6db54c9861 Add MIT license to Makefiles
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2019-07-18 13:59:30 +01:00
Homu d2a5526202 Auto merge of #4053 - rex4539:shielded-funds, r=Eirik0
Fix naming inconsistency

Closes https://github.com/zcash/zcash/issues/3486
2019-07-17 12:36:37 -07:00
Simon d7ebbeb2aa Modify PartitionCheck to be aware of pre & post Blossom target spacing. 2019-07-11 14:17:58 -06:00
Simon 3a8fd5ea33 Replace nPoWTargetSpacing -> PoWTargetSpacing() in tests 2019-07-11 13:46:29 -06:00
Simon 22e8dc2679 Replace nPoWTargetSpacing -> PoWTargetSpacing() in ProcessMessage() 2019-07-11 13:46:29 -06:00
Simon 4b985ce999 Update GetBlockTimeout() to take height parameter. 2019-07-11 13:46:29 -06:00
Simon b30ff0d367 Update PoW function calls to pass in height. 2019-07-11 13:46:29 -06:00
Simon 35d1fdeba6 Replace nPoWTargetSpacing -> PoWTargetSpacing() 2019-07-11 13:46:28 -06:00
Simon ac4a606d4a Remove use of redundant member nPowTargetSpacing. 2019-07-11 13:46:28 -06:00
Simon 8863d77d65 Redefine PoW functions to accept height parameter.
Introduce target spacing constants and redefine struct member
variable nPoWTargetSpacing as a member function.  The height
parameter is used to determine if Blossom has activated yet.
2019-07-11 13:46:28 -06:00
Homu 984b41422a Auto merge of #4054 - rex4539:haveshieldedrequirements, r=Eirik0
Rename joinsplit to shielded

Closes https://github.com/zcash/zcash/issues/3550
2019-07-11 09:45:19 -07:00
Homu 29c1b29f3f Auto merge of #4055 - rex4539:rename-findwallettx, r=Eirik0
Rename FindWalletTx to FindWalletTxToZap

Closes https://github.com/zcash/zcash/issues/3572
2019-07-10 15:45:46 -07:00
Homu 9d07a12750 Auto merge of #4052 - rex4539:rename-vjoinsplit, r=Eirik0
Rename vjoinsplit to vJoinSplit

Closes https://github.com/zcash/zcash/issues/3188
2019-07-10 11:59:23 -07:00
Homu ef8a62d9b4 Auto merge of #4058 - daira:release-v2.0.6, r=daira
Release v2.0.6

Test plan (ECC internal): https://docs.google.com/document/d/1EVDxdFRgQR5xBzA2wRsw02sb-yF2h26FyVnSjqfpayg/edit#
2019-06-19 22:46:52 -07:00
Daira Hopwood f2df508591 make-release.py: Updated release notes and changelog for 2.0.6. 2019-06-19 00:28:06 +01:00
Daira Hopwood a83969f6ce make-release.py: Updated manpages for 2.0.6. 2019-06-19 00:28:06 +01:00
Daira Hopwood ef2dcbf1d4 make-release.py: Versioning changes for 2.0.6. 2019-06-19 00:27:11 +01:00
Daira Hopwood f6e1e15773 Add coding declaration to zcutil/release-notes.py
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2019-06-19 00:26:45 +01:00
Homu 06cc21424e Auto merge of #4057 - Eirik0:2.0.6-release-notes, r=daira
Notable changes for 2.0.6
2019-06-18 12:42:52 -07:00
Daira Hopwood dbe49614c1 Tweak author aliases.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2019-06-18 14:00:56 +01:00
Eirik Ogilvie-Wigley 3b4bc96bac Notable changes for 2.0.6
Co-authored-by: Daira Hopwood <daira@jacaranda.org>
2019-06-17 13:12:11 -06:00
Dimitris Apostolou 8b1a8e8b93
Rename FindWalletTx to FindWalletTxToZap 2019-06-16 23:06:45 +03:00
Dimitris Apostolou 8bcb96999e
Rename joinsplit to shielded 2019-06-16 22:50:58 +03:00
Dimitris Apostolou ff1840f68a
Fix naming inconsistency 2019-06-16 22:37:23 +03:00
Dimitris Apostolou f57f76d789
Rename vjoinsplit to vJoinSplit 2019-06-16 19:13:49 +03:00
Homu 9b3cc52c0e Auto merge of #4049 - mms710:issue_3504_fix, r=Eirik0
Fixes issue #3504

Changes the command to obtain the GCC version in the GitHub issue template to `gcc --version`, and adds a couple other useful commands.
2019-06-15 07:20:34 -07:00
Daira Hopwood 6177b47d20 ld --version doesn't work on macOS.
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2019-06-14 23:18:10 +01:00
Mary Moore-Simmons 246f17f6ba Fixes issue #3504: Changes to --version and adds a couple other useful commands. 2019-06-14 09:02:37 -06:00
Homu 917d9d082b Auto merge of #4048 - charlieok:add_stretch_suite_to_gitian_descriptors, r=mdr0id
Add stretch to list of suites in gitian linux descriptors

We want to do reproducible builds for Debian stretch (9) in addition to Debian jessie (8).
2019-06-13 14:49:25 -07:00
Charlie O'Keefe 6a35b68fab Add stretch to list of suites in gitian linux descriptors 2019-06-12 17:41:38 -06:00
Homu 11b3168e74 Auto merge of #4046 - daira:release-v2.0.6-rc1, r=mdr0id
Release v2.0.6-rc1
2019-06-12 11:06:16 -07:00
Daira Hopwood c3afc3fde0 make-release.py: Updated release notes and changelog for 2.0.6-rc1. 2019-06-12 16:36:57 +01:00
Daira Hopwood 372ff78b2c make-release.py: Updated manpages for 2.0.6-rc1. 2019-06-12 16:36:56 +01:00
Daira Hopwood f7a4aab352 make-release.py: Versioning changes for 2.0.6-rc1. 2019-06-12 16:32:57 +01:00