Skip to content

Commit 857bd0d

Browse files
nuttycomnuttycom
authored
Merge pull request zcash#6958 from zcash/release-v6.0.0
Release v6.0.0
2 parents 48bd7b0 + c61e547 commit 857bd0d

30 files changed

+365
-164
lines changed

‎.cargo/config.toml.offline

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,5 @@ linker = "aarch64-linux-gnu-gcc"
44
[source.crates-io]
55
replace-with = "vendored-sources"
66

7-
[source."https://github.com/zcash/incrementalmerkletree"]
8-
git = "https://github.com/zcash/incrementalmerkletree"
9-
rev = "ffe4234788fd22662b937ba7c6ea01535fcc1293"
10-
replace-with = "vendored-sources"
11-
12-
[source."https://github.com/zcash/orchard"]
13-
git = "https://github.com/zcash/orchard"
14-
rev = "55fb089a335bbbc1cda186c706bc037073df8eb7"
15-
replace-with = "vendored-sources"
16-
17-
[source."https://github.com/zcash/sapling-crypto"]
18-
git = "https://github.com/zcash/sapling-crypto"
19-
rev = "b1ad3694ee13a2fc5d291ad04721a6252da0993c"
20-
replace-with = "vendored-sources"
21-
22-
[source."https://github.com/zcash/librustzcash.git"]
23-
git = "https://github.com/zcash/librustzcash.git"
24-
rev = "1410f1449100a417bfbc4f6c7167aa9808e38792"
25-
replace-with = "vendored-sources"
26-
277
[source.vendored-sources]
288
# The directory for this source is set to RUST_VENDORED_SOURCES by src/Makefile.am

‎Cargo.lock

Lines changed: 30 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml

Lines changed: 7 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -50,22 +50,22 @@ libc = "0.2"
5050
jubjub = "0.10"
5151
memuse = "0.2"
5252
nonempty = "0.7"
53-
orchard = "0.9"
54-
sapling = { package = "sapling-crypto", version = "0.2", features = ["temporary-zcashd"] }
53+
orchard = "0.10"
54+
sapling = { package = "sapling-crypto", version = "0.3", features = ["temporary-zcashd"] }
5555
secp256k1 = "0.27"
5656
subtle = "2.2"
5757
rand_core = "0.6"
5858
redjubjub = "0.7"
5959
tracing = "0.1"
6060
tracing-core = "0.1"
6161
tracing-appender = "0.2"
62-
zcash_address = "0.5"
62+
zcash_address = "0.6"
6363
zcash_encoding = "0.2.1"
6464
zcash_history = "0.4"
6565
zcash_note_encryption = "0.4"
66-
zcash_primitives = { version = "0.17", features = ["temporary-zcashd", "transparent-inputs"] }
67-
zcash_proofs = { version = "0.17", features = ["directories"] }
68-
zcash_protocol = { version = "0.3", features = ["local-consensus"] }
66+
zcash_primitives = { version = "0.19", features = ["temporary-zcashd", "transparent-inputs"] }
67+
zcash_proofs = { version = "0.19", features = ["directories"] }
68+
zcash_protocol = { version = "0.4", features = ["local-consensus"] }
6969
ed25519-zebra = "4"
7070
zeroize = "1.4.2"
7171
wagyu-zcash-parameters = "0.2"
@@ -100,7 +100,7 @@ time = { version = "0.3", features = ["formatting", "macros"] }
100100
[dev-dependencies]
101101
incrementalmerkletree = { version = "0.7", features = ["test-dependencies"] }
102102
proptest = "1.0.0"
103-
zcash_primitives = { version = "0.17", features = ["temporary-zcashd", "transparent-inputs", "test-dependencies"] }
103+
zcash_primitives = { version = "0.19", features = ["temporary-zcashd", "transparent-inputs", "test-dependencies"] }
104104

105105
[dependencies.tracing-subscriber]
106106
version = "0.3"
@@ -111,16 +111,3 @@ features = ["ansi", "env-filter", "fmt", "time"]
111111
lto = 'thin'
112112
panic = 'abort'
113113
codegen-units = 1
114-
115-
[patch.crates-io]
116-
bridgetree = { git = "https://github.com/zcash/incrementalmerkletree", rev = "ffe4234788fd22662b937ba7c6ea01535fcc1293" }
117-
incrementalmerkletree = { git = "https://github.com/zcash/incrementalmerkletree", rev = "ffe4234788fd22662b937ba7c6ea01535fcc1293" }
118-
orchard = { git = "https://github.com/zcash/orchard", rev = "55fb089a335bbbc1cda186c706bc037073df8eb7" }
119-
sapling-crypto = { git = "https://github.com/zcash/sapling-crypto", rev = "b1ad3694ee13a2fc5d291ad04721a6252da0993c" }
120-
equihash = { git = "https://github.com/zcash/librustzcash.git", rev = "1410f1449100a417bfbc4f6c7167aa9808e38792" }
121-
zcash_address = { git = "https://github.com/zcash/librustzcash.git", rev = "1410f1449100a417bfbc4f6c7167aa9808e38792" }
122-
zcash_encoding = { git = "https://github.com/zcash/librustzcash.git", rev = "1410f1449100a417bfbc4f6c7167aa9808e38792" }
123-
zcash_history = { git = "https://github.com/zcash/librustzcash.git", rev = "1410f1449100a417bfbc4f6c7167aa9808e38792" }
124-
zcash_primitives = { git = "https://github.com/zcash/librustzcash.git", rev = "1410f1449100a417bfbc4f6c7167aa9808e38792" }
125-
zcash_proofs = { git = "https://github.com/zcash/librustzcash.git", rev = "1410f1449100a417bfbc4f6c7167aa9808e38792" }
126-
zcash_protocol = { git = "https://github.com/zcash/librustzcash.git", rev = "1410f1449100a417bfbc4f6c7167aa9808e38792" }

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Zcash 6.0.0-rc1
1+
Zcash 6.0.0
22
<img align="right" width="120" height="80" src="doc/imgs/logo.png">
33
===========
44

‎configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ AC_PREREQ([2.60])
33
define(_CLIENT_VERSION_MAJOR, 6)
44
define(_CLIENT_VERSION_MINOR, 0)
55
define(_CLIENT_VERSION_REVISION, 0)
6-
define(_CLIENT_VERSION_BUILD, 25)
6+
define(_CLIENT_VERSION_BUILD, 50)
77
define(_ZC_BUILD_VAL, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, m4_incr(_CLIENT_VERSION_BUILD), m4_eval(_CLIENT_VERSION_BUILD < 50), 1, m4_eval(_CLIENT_VERSION_BUILD - 24), m4_eval(_CLIENT_VERSION_BUILD == 50), 1, , m4_eval(_CLIENT_VERSION_BUILD - 50)))
88
define(_CLIENT_VERSION_SUFFIX, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, _CLIENT_VERSION_REVISION-beta$1, m4_eval(_CLIENT_VERSION_BUILD < 50), 1, _CLIENT_VERSION_REVISION-rc$1, m4_eval(_CLIENT_VERSION_BUILD == 50), 1, _CLIENT_VERSION_REVISION, _CLIENT_VERSION_REVISION-$1)))
99
define(_CLIENT_VERSION_IS_RELEASE, true)

‎contrib/debian/changelog

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
zcash (6.0.0) stable; urgency=high
2+
3+
* 6.0.0 release.
4+
5+
-- Electric Coin Company <[email protected]> Wed, 02 Oct 2024 20:45:09 +0000
6+
17
zcash (6.0.0~rc1) stable; urgency=medium
28

39
* 6.0.0-rc1 release.

‎contrib/gitian-descriptors/gitian-linux-parallel.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
name: "zcash-6.0.0-rc1"
2+
name: "zcash-6.0.0"
33
enable_cache: true
44
distro: "debian"
55
suites:

‎contrib/gitian-descriptors/gitian-linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
name: "zcash-6.0.0-rc1"
2+
name: "zcash-6.0.0"
33
enable_cache: true
44
distro: "debian"
55
suites:

‎doc/authors.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
Zcash Contributors
22
==================
33

4-
* Jack Grigg (2157)
5-
* Kris Nuttycombe (750)
6-
* Daira-Emma Hopwood (483)
4+
* Jack Grigg (2181)
5+
* Kris Nuttycombe (751)
6+
* Daira-Emma Hopwood (492)
77
* Simon Liu (464)
88
* Sean Bowe (413)
99
* Eirik Ogilvie-Wigley (273)
@@ -88,6 +88,7 @@ Zcash Contributors
8888
* Evan Klitzke (4)
8989
* DeckerSU (4)
9090
* Ben Woosley (4)
91+
* y4ssi (3)
9192
* mruddy (3)
9293
* lpescher (3)
9394
* isle2983 (3)
@@ -152,7 +153,6 @@ Zcash Contributors
152153
* Akio Nakamura (2)
153154
* ロハン ダル (1)
154155
* zathras-crypto (1)
155-
* y4ssi (1)
156156
* vim88 (1)
157157
* user (1)
158158
* unsystemizer (1)

‎doc/book/src/user/release-support.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,5 @@ time, and may shift due to changes in network solution power.
4545
| 5.10.0-rc1 | 2024-08-22 | 2700600 | 2024-10-31 |
4646
| 5.10.0 | 2024-08-27 | 2706540 | 2024-11-05 |
4747
| 6.0.0-rc1 | 2024-09-27 | 2710272 | 2024-11-08 |
48+
| 6.0.0 | 2024-10-02 | 2796400 | 2025-01-22 |
4849
<!-- RELEASE_SCRIPT_END_MARKER -->

0 commit comments

Comments
 (0)