zec
/
zcash
mirror of https://github.com/zcash/zcash.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
18,446 Commits 11 Branches 156 Tags 174 MiB
Commit Graph

18446 Commits

Author SHA1 Message Date
Jack Grigg 400dcdf83e CI: Migrate to `cargo-vet 0.10` 2025-01-07 20:33:39 +00:00
Jack Grigg 907a477c7f cargo update 2025-01-07 20:33:39 +00:00
Jack Grigg d21cb5409f depends: cxx 1.0.136 2025-01-07 20:33:39 +00:00
Jack Grigg 0aac0db813 cargo vet prune 2025-01-07 20:33:39 +00:00
Jack Grigg 9c0a8ad776 depends: native_cmake 3.31.3 2025-01-07 20:33:39 +00:00
Jack Grigg 90ef1beea4 depends: native_xxhash 0.8.3 2025-01-07 20:33:39 +00:00
Jack Grigg bf4c198e6b depends: native_fmt 11.1.1 2025-01-07 20:33:39 +00:00
Jack Grigg 8e68e5b181 depends: utfcpp 4.0.6 2025-01-07 20:33:39 +00:00
Jack Grigg e0c8daed68
Merge pull request #6995 from zcash/version-6.1.0 
Merge 6.1.0 back into the main branch
 2025-01-07 20:32:33 +00:00
Jack Grigg eea3d68e57
Merge pull request #6993 from zcash/release-v6.1.0 
Release v6.1.0
 2025-01-05 16:10:39 +00:00
Jack Grigg 3c3c6ae85b Update release notes with maintenance purpose 2025-01-02 19:25:26 +00:00
Jack Grigg 1847ee1b17 make-release.py: Updated book for 6.1.0. 2025-01-02 19:21:43 +00:00
Jack Grigg 64a32e0110 make-release.py: Updated release notes and changelog for 6.1.0. 2025-01-02 19:21:43 +00:00
Jack Grigg d66219bb03 make-release.py: Updated manpages for 6.1.0. 2025-01-02 19:21:41 +00:00
Jack Grigg 50c2ce6abb make-release.py: Versioning changes for 6.1.0. 2025-01-02 19:18:11 +00:00
Jack Grigg 26bdfcf9f0 qa: Postpone all dependency updates until after 6.1.0 2025-01-02 19:15:43 +00:00
Jack Grigg 4f9fb43a3d
Merge pull request #6987 from LarryRuane/2024-12-lockbox-value-logging 
move Lockbox value logging behind category valuepool
 2025-01-02 18:39:25 +00:00
Jack Grigg 44f6202c72
qa: Fix line wrapping in `show_help` 2025-01-02 17:23:22 +00:00
Larry Ruane 7b5029eb9f move Lockbox value logging behind category valuepool 2024-12-16 23:07:08 -07:00
Jack Grigg 99ad6fdc3a
Merge pull request #6964 from daira/mining-test-comment-offbyone 
Miner tests: correct a comment, and add another similar comment where it applies
 2024-10-24 06:27:41 +01:00
Jack Grigg 7fbb055123
Merge pull request #6965 from daira/fix-getblocksubsidy-suggestions 
Fix getblocksubsidy suggestions
 2024-10-24 06:26:28 +01:00
Jack Grigg 1e5eb36466
Merge pull request #6967 from daira/fix-test_checkblock 
gtest/test_checkblock.cpp: fix a bug in MockCValidationState that was causing a test warning
 2024-10-24 06:14:32 +01:00
Jack Grigg c6dfd89530
Merge pull request #6968 from daira/update-daira-emma-keys 
Update Daira-Emma's gpg keys
 2024-10-24 06:12:51 +01:00
Daira-Emma Hopwood f6540856d2 Update Daira-Emma Hopwood's gpg keys. 
The key referred to by `daira-emma-old.asc` was used to sign the tags for
zcashd v1.0.0-rc1, v1.0.0-rc2, and v1.0.0-rc3. All other zcashd signatures
made by Daira-Emma used the key referred to by `daira-emma.asc`.

Signed-off-by: Daira-Emma Hopwood <daira@jacaranda.org>
 2024-10-09 15:12:17 +01:00
Daira-Emma Hopwood 7505afc78e Miner tests: correct a comment, and add another similar comment where it 
applies. Doc-only.

Signed-off-by: Daira-Emma Hopwood <daira@jacaranda.org>
 2024-10-07 23:13:46 +01:00
Daira-Emma Hopwood a2f63ffcf4 gtest/test_checkblock.cpp: fix a bug in MockCValidationState that was 
causing a test warning.

Signed-off-by: Daira-Emma Hopwood <daira@jacaranda.org>
 2024-10-07 22:48:47 +01:00
Daira-Emma Hopwood 4ddd3405c5 Simplify `GetActiveFundingStreamElements`. 
Signed-off-by: Daira-Emma Hopwood <daira@jacaranda.org>
 2024-10-07 22:00:27 +01:00
Daira-Emma Hopwood d60c51eb8d sapling::Builder: add funding stream outputs in a more predictable order. 
Previously it was deterministic, but depended on details of the `operator<`
implementations of `FundingStreamRecipient`, `SaplingPaymentAddress`, and
`CScript`. Now it is just the same order as in `vFundingStreams`.

Signed-off-by: Daira-Emma Hopwood <daira@jacaranda.org>
 2024-10-07 22:00:27 +01:00
Daira-Emma Hopwood e44be4f1f4 Funding streams: Rename INSUFFICIENT_ADDRESSES to INSUFFICIENT_RECIPIENTS. 
Signed-off-by: Daira-Emma Hopwood <daira@jacaranda.org>
 2024-10-07 21:52:51 +01:00
Daira-Emma Hopwood 238ffa4bec
Merge pull request #6966 from zcash/version-6.0.0 
Version 6.0.0 post-release merge.
 2024-10-07 21:44:58 +01:00
Kris Nuttycombe 857bd0d398
Merge pull request #6958 from zcash/release-v6.0.0 
Release v6.0.0
 2024-10-04 15:58:36 -06:00
Jack Grigg c61e5473ae
Merge pull request #6962 from daira/fix-miner-future-timestamp 
Ensure that the "future timestamp" rule is correctly applied by block template construction
 2024-10-04 13:19:37 +01:00
Jack Grigg 26939a9710
Merge pull request #6963 from str4d/fix-getblocksubsidy 
Fix `getblocksubsidy`
 2024-10-04 13:18:09 +01:00
Jack Grigg 97bba691ab Fix specification URL for NU6 lockbox 2024-10-04 08:48:57 +00:00
Jack Grigg bd17de8b42 test: Update `getblocksubsidy` test with NU6 mainnet funding streams 2024-10-04 08:48:06 +00:00
Jack Grigg 6c765107f1 rpc: Fetch correct funding streams in `getblocksubsidy` 
The previous logic was indexing into the global funding streams list
with the local index into the active funding streams. This worked fine
for the first funding stream period, but once a funding stream ended and
another was enabled, the indices no longer matched.

We now return the `FundingStream` from `GetActiveFundingStreams`, as the
only user of that method is `getblocksubsidy`.
 2024-10-04 08:28:54 +00:00
Daira-Emma Hopwood 9831458a4a Ensure that the "future timestamp" rule is correctly applied by block 
template construction. fixes #6960

Signed-off-by: Daira-Emma Hopwood <daira@jacaranda.org>
 2024-10-04 04:19:45 +01:00
Daira-Emma Hopwood a0602ebfb7 Changes necessary for NU6 funding streams and activation height. 
Co-authored-by: Jack Grigg <jack@electriccoin.co>
Signed-off-by: Daira-Emma Hopwood <daira@jacaranda.org>
 2024-10-02 21:36:18 +00:00
Jack Grigg 74ff943c40 debian: Set urgency of 6.0.0 release to `high` 2024-10-02 20:48:07 +00:00
Jack Grigg 09cae52fc0 make-release.py: Updated book for 6.0.0. 2024-10-02 20:45:09 +00:00
Jack Grigg 337afb9d02 make-release.py: Updated release notes and changelog for 6.0.0. 2024-10-02 20:45:09 +00:00
Jack Grigg 4e1e6fe164 make-release.py: Updated manpages for 6.0.0. 2024-10-02 20:45:08 +00:00
Jack Grigg b7708cc68e make-release.py: Versioning changes for 6.0.0. 2024-10-02 20:41:53 +00:00
Jack Grigg 79a72d79a5 Update release notes for 6.0.0 2024-10-02 20:37:29 +00:00
Jack Grigg bf3b8d7e16 Set support window back to the usual 16 weeks 2024-10-02 20:28:04 +00:00
Jack Grigg fd47b5af52 Migrate to librustzcash crates revision right before NU6 mainnet height 
This gets the other side-effects of the recent changes out of the way,
and then in the commit where we set the mainnet activation height in
`zcashd`, we can do so uniformly across the stack.
 2024-10-02 20:26:29 +00:00
Jack Grigg f5245c7092 qa: Add latest Clang release to postponed updates 2024-10-02 20:19:45 +00:00
Kris Nuttycombe 48bd7b0a7f
Merge pull request #6957 from daira/code-of-conduct-update 
Update contacts in the Code of Conduct
 2024-10-02 11:38:51 -06:00
Daira-Emma Hopwood 4e44eadbdb Code of Conduct: add Kris and Str4d as contacts. 
Signed-off-by: Daira-Emma Hopwood <daira@jacaranda.org>
 2024-10-02 18:20:57 +01:00
Daira-Emma Hopwood 1951ec76d0 Code of Conduct: update email addresses and remove Sean as a contact. 
Signed-off-by: Daira-Emma Hopwood <daira@jacaranda.org>
 2024-10-02 18:20:57 +01:00