Commit Graph

12542 Commits

Author SHA1 Message Date
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
Eirik0 c9d14272af Fix comment in mergetoaddress RPC test 2019-06-11 14:32:57 -06:00
Homu bb58c8ec2e Auto merge of #3863 - LarryRuane:3708-getrawtransaction, r=daira
add spentindex to getrawtransaction RPC results for bitcore block explorer

#3708 There are a few new `getrawtransaction` JSON result fields that the Insight block explorer depends on.
2019-06-11 13:15:00 -07:00
Homu dca403f29e Auto merge of #4019 - bitcartel:3992_remove_obsolete_warning, r=daira
Closes #3992. Remove obsolete warning message.

Test plan: ensure that no message "%d of last 100 blocks above version %d" occurs in the log or on the metrics screen when syncing the block chain. Verify that this message *was* displayed previously for a sync from the same point.
2019-06-11 11:29:30 -07:00
Larry Ruane f381d4e085 add spentindex to getrawtransaction RPC results 2019-06-11 10:29:51 -06:00
Daira Hopwood 346d11d3eb Closes #3992. Remove obsolete warning message.
Co-authored-by: Simon <simon@bitcartel.com>
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2019-06-11 17:27:49 +01:00
codetriage-readme-bot f0da2af80c Link to development guidelines in CONTRIBUTING.md 2019-06-11 10:27:52 -05:00
Homu 5f40d5e6a3 Auto merge of #3910 - Eirik0:3909-fix-mergetoaddress, r=Eirik0
Fix z_mergetoaddress sending from ANY_SPROUT/ANY_SAPLING when the wallet contains both note types

Closes #3909
2019-06-10 12:46:54 -07:00
Eirik0 cf30355fc3 Clarify what combinations of from addresses can be used in z_mergetoaddress 2019-06-10 13:21:25 -06:00
Eirik0 a8055cfe10 Fix z_mergetoaddress sending from ANY_SPROUT/ANY_SAPLING when the wallet contains both note types 2019-06-10 13:21:25 -06:00
Homu 4c7b44bbdb Auto merge of #4041 - Eirik0:getmigrationstatus-help, r=str4d
z_getmigrationstatus help message wording change

This is follow up from #4017
2019-06-06 15:23:50 -07:00
Eirik0 406b8ff509 z_getmigrationstatus help message wording change 2019-06-06 13:49:11 -06:00
Homu 70d8489663 Auto merge of #4017 - bitcartel:fix_sapling_rpc_help_typo, r=Eirik0
Fix typo and clean up help message for RPC z_getmigrationstatus.
2019-06-05 18:27:22 -07:00