Skip to content

Commit 18238d9

Browse files
str4dstr4d
authored
Merge pull request zcash#7033 from str4d/libsecp256k1-0.4.1
Migrate to `libsecp256k1 0.4.1`
2 parents fe3e645 + e4afa72 commit 18238d9

File tree

137 files changed

+18282
-4909
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

137 files changed

+18282
-4909
lines changed

‎Cargo.lock‎

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

‎Cargo.toml‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -39,36 +39,37 @@ bip0039 = { version = "0.12", features = ["std", "all-languages"] }
3939
blake2b_simd = "1"
4040
blake2s_simd = "1"
4141
bls12_381 = "0.8"
42-
bridgetree = "0.6"
42+
bridgetree = "0.7"
4343
byteorder = "1"
4444
crossbeam-channel = "0.5"
4545
getrandom = "0.2"
4646
group = "0.13"
4747
hex = "0.4"
48-
incrementalmerkletree = "0.7"
48+
incrementalmerkletree = "0.8"
4949
libc = "0.2"
5050
jubjub = "0.10"
5151
memuse = "0.2"
52-
nonempty = "0.7"
53-
orchard = "0.10"
54-
sapling = { package = "sapling-crypto", version = "0.4", features = ["temporary-zcashd"] }
55-
secp256k1 = "0.27"
52+
nonempty = "0.11"
53+
orchard = "0.11"
54+
sapling = { package = "sapling-crypto", version = "0.5", features = ["temporary-zcashd"] }
55+
secp256k1 = "0.29"
5656
subtle = "2.2"
5757
rand_core = "0.6"
58-
redjubjub = "0.7"
58+
redjubjub = "0.8"
5959
tracing = "0.1"
6060
tracing-core = "0.1"
6161
tracing-appender = "0.2"
62-
transparent = { package = "zcash_transparent", version = "0.1" }
63-
zcash_address = "0.6"
64-
zcash_encoding = "0.2.1"
62+
transparent = { package = "zcash_transparent", version = "0.3" }
63+
zcash_address = "0.8"
64+
zcash_encoding = "0.3"
6565
zcash_history = "0.4"
6666
zcash_note_encryption = "0.4"
67-
zcash_primitives = { version = "0.21", features = ["temporary-zcashd", "transparent-inputs"] }
68-
zcash_proofs = { version = "0.21", features = ["directories"] }
69-
zcash_protocol = { version = "0.4", features = ["local-consensus"] }
67+
zcash_primitives = { version = "0.23", features = ["temporary-zcashd", "transparent-inputs"] }
68+
zcash_proofs = { version = "0.23", features = ["directories"] }
69+
zcash_protocol = { version = "0.5", features = ["local-consensus"] }
7070
ed25519-zebra = "4"
7171
zeroize = "1.4.2"
72+
zip32 = "0.2"
7273
wagyu-zcash-parameters = "0.2"
7374

7475
# Rust/C++ interop
@@ -102,9 +103,9 @@ time = { version = "0.3", features = ["formatting", "macros"] }
102103
macro_find_and_replace = "1"
103104

104105
[dev-dependencies]
105-
incrementalmerkletree = { version = "0.7", features = ["test-dependencies"] }
106+
incrementalmerkletree = { version = "0.8", features = ["test-dependencies"] }
106107
proptest = "1.0.0"
107-
zcash_primitives = { version = "0.21", features = ["temporary-zcashd", "transparent-inputs", "test-dependencies"] }
108+
zcash_primitives = { version = "0.23", features = ["temporary-zcashd", "transparent-inputs", "test-dependencies"] }
108109

109110
[dependencies.tracing-subscriber]
110111
version = "0.3"

‎configure.ac‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -573,6 +573,8 @@ case $host in
573573

574574
ZC_REQUIRE_TOOL(WINDRES, windres)
575575

576+
CORE_CPPFLAGS="$CORE_CPPFLAGS -DSECP256K1_STATIC"
577+
576578
CPPFLAGS="$CPPFLAGS -D_MT -DWIN32 -D_WINDOWS -DBOOST_THREAD_USE_LIB -D_WIN32_WINNT=0x0601 -D_WIN32_IE=0x0501 -DWIN32_LEAN_AND_MEAN"
577579

578580
dnl libtool insists upon adding -nostdlib and a list of objects/libs to link against.

‎qa/supply-chain/audits.toml‎

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3131,7 +3131,7 @@ delta = "1.4.1 -> 1.4.2"
31313131
criteria = "safe-to-deploy"
31323132
user-id = 6289 # Jack Grigg (str4d)
31333133
start = "2023-09-08"
3134-
end = "2024-09-21"
3134+
end = "2026-06-05"
31353135

31363136
[[trusted.bridgetree]]
31373137
criteria = "safe-to-deploy"
@@ -3331,6 +3331,12 @@ user-id = 6289 # Jack Grigg (str4d)
33313331
start = "2021-08-31"
33323332
end = "2026-01-02"
33333333

3334+
[[trusted.zcash_encoding]]
3335+
criteria = "safe-to-deploy"
3336+
user-id = 169181 # Kris Nuttycombe (nuttycom)
3337+
start = "2024-08-19"
3338+
end = "2026-06-04"
3339+
33343340
[[trusted.zcash_history]]
33353341
criteria = "safe-to-deploy"
33363342
user-id = 1244 # ebfull
@@ -3395,7 +3401,13 @@ end = "2024-09-21"
33953401
criteria = "safe-to-deploy"
33963402
user-id = 169181 # Kris Nuttycombe (nuttycom)
33973403
start = "2024-01-27"
3398-
end = "2025-04-16"
3404+
end = "2026-06-05"
3405+
3406+
[[trusted.zcash_spec]]
3407+
criteria = "safe-to-deploy"
3408+
user-id = 199950 # Daira-Emma Hopwood (daira)
3409+
start = "2025-02-20"
3410+
end = "2026-06-04"
33993411

34003412
[[trusted.zcash_spec]]
34013413
criteria = ["safe-to-deploy", "crypto-reviewed", "license-reviewed"]
@@ -3414,3 +3426,9 @@ criteria = "safe-to-deploy"
34143426
user-id = 6289 # Jack Grigg (str4d)
34153427
start = "2023-12-06"
34163428
end = "2025-03-18"
3429+
3430+
[[trusted.zip32]]
3431+
criteria = "safe-to-deploy"
3432+
user-id = 169181 # Kris Nuttycombe (nuttycom)
3433+
start = "2025-02-20"
3434+
end = "2026-06-04"

‎qa/supply-chain/config.toml‎

Lines changed: 31 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ version = "0.12.0"
6767
criteria = "safe-to-deploy"
6868

6969
[[exemptions.bip32]]
70-
version = "0.5.2"
70+
version = "0.6.0-pre.1"
7171
criteria = "safe-to-deploy"
7272

7373
[[exemptions.bitvec]]
@@ -82,6 +82,10 @@ criteria = "safe-to-deploy"
8282
version = "1.0.0"
8383
criteria = "safe-to-deploy"
8484

85+
[[exemptions.block-buffer]]
86+
version = "0.11.0-rc.3"
87+
criteria = "safe-to-deploy"
88+
8589
[[exemptions.bls12_381]]
8690
version = "0.7.0"
8791
criteria = "safe-to-deploy"
@@ -138,6 +142,10 @@ criteria = "safe-to-deploy"
138142
version = "0.8.8"
139143
criteria = "safe-to-deploy"
140144

145+
[[exemptions.crypto-common]]
146+
version = "0.2.0-rc.1"
147+
criteria = "safe-to-deploy"
148+
141149
[[exemptions.curve25519-dalek]]
142150
version = "4.1.0"
143151
criteria = "safe-to-deploy"
@@ -162,6 +170,10 @@ criteria = "safe-to-deploy"
162170
version = "0.9.0"
163171
criteria = "safe-to-deploy"
164172

173+
[[exemptions.digest]]
174+
version = "0.11.0-pre.9"
175+
criteria = "safe-to-deploy"
176+
165177
[[exemptions.ed25519]]
166178
version = "2.2.1"
167179
criteria = "safe-to-deploy"
@@ -230,6 +242,10 @@ criteria = "safe-to-deploy"
230242
version = "0.3.3"
231243
criteria = "safe-to-deploy"
232244

245+
[[exemptions.hmac]]
246+
version = "0.13.0-pre.4"
247+
criteria = "safe-to-deploy"
248+
233249
[[exemptions.home]]
234250
version = "0.5.9"
235251
criteria = "safe-to-deploy"
@@ -246,6 +262,10 @@ criteria = "safe-to-deploy"
246262
version = "1.9.4"
247263
criteria = "safe-to-deploy"
248264

265+
[[exemptions.hybrid-array]]
266+
version = "0.2.3"
267+
criteria = "safe-to-deploy"
268+
249269
[[exemptions.hyper]]
250270
version = "0.14.30"
251271
criteria = "safe-to-deploy"
@@ -318,10 +338,6 @@ criteria = "safe-to-deploy"
318338
version = "0.26.1"
319339
criteria = "safe-to-deploy"
320340

321-
[[exemptions.nonempty]]
322-
version = "0.7.0"
323-
criteria = "safe-to-deploy"
324-
325341
[[exemptions.num-bigint]]
326342
version = "0.4.6"
327343
criteria = "safe-to-deploy"
@@ -446,6 +462,10 @@ criteria = "safe-to-deploy"
446462
version = "0.1.3"
447463
criteria = "safe-to-deploy"
448464

465+
[[exemptions.ripemd]]
466+
version = "0.2.0-pre.4"
467+
criteria = "safe-to-deploy"
468+
449469
[[exemptions.rustix]]
450470
version = "0.38.34"
451471
criteria = "safe-to-deploy"
@@ -459,17 +479,21 @@ version = "0.3.0"
459479
criteria = "safe-to-deploy"
460480

461481
[[exemptions.secp256k1]]
462-
version = "0.26.0"
482+
version = "0.29.1"
463483
criteria = "safe-to-deploy"
464484

465485
[[exemptions.secp256k1-sys]]
466-
version = "0.8.1"
486+
version = "0.10.1"
467487
criteria = "safe-to-deploy"
468488

469489
[[exemptions.secrecy]]
470490
version = "0.8.0"
471491
criteria = "safe-to-deploy"
472492

493+
[[exemptions.sha2]]
494+
version = "0.11.0-pre.4"
495+
criteria = "safe-to-deploy"
496+
473497
[[exemptions.siphasher]]
474498
version = "0.3.10"
475499
criteria = "safe-to-deploy"

0 commit comments

Comments
 (0)