Merge pull request #1493 from zcash/dependency_updates

zcash_primitivies: Update zcash-specific dependencies.

Cargo.toml

@@ -47,8 +47,8 @@ zcash_proofs = { version = "0.15", path = "zcash_proofs", default-features = fal
 bellman = { version = "0.14", default-features = false, features = ["groth16"] }
 ff = "0.13"
 group = "0.13"
-incrementalmerkletree = "0.5.1"
-shardtree = "0.3.1"
+incrementalmerkletree = "0.6"
+shardtree = "0.4"
 zcash_spec = "0.1"
 
 # Payment protocols
@@ -57,11 +57,11 @@ bitvec = "1"
 blake2s_simd = "1"
 bls12_381 = "0.8"
 jubjub = "0.10"
-sapling = { package = "sapling-crypto", version = "0.1.3", default-features = false }
+sapling = { package = "sapling-crypto", version = "0.2", default-features = false }
 
 # - Orchard
 nonempty = "0.7"
-orchard = { version = "0.8.0", default-features = false }
+orchard = { version = "0.9", default-features = false }
 pasta_curves = "0.5"
 
 # - Transparent
@@ -155,7 +155,3 @@ zip32 = "0.1.1"
 lto = true
 panic = 'abort'
 codegen-units = 1
-
-[patch.crates-io]
-incrementalmerkletree = { git = "https://github.com/zcash/incrementalmerkletree", rev = "337f59179eda51261e9ddfc6b18e8fb84ea277c9" }
-shardtree = { git = "https://github.com/zcash/incrementalmerkletree", rev = "337f59179eda51261e9ddfc6b18e8fb84ea277c9" }

supply-chain/audits.toml

@@ -524,6 +524,16 @@ who = "Jack Grigg <[email protected]>"
 criteria = "safe-to-run"
 delta = "0.2.1 -> 0.2.2"
 
+[[audits.visibility]]
+who = "Kris Nuttycombe <[email protected]>"
+criteria = ["safe-to-deploy", "license-reviewed"]
+version = "0.1.1"
+notes = """
+- Crate has no unsafe code, and sets `#![forbid(unsafe_code)]`.
+- Crate has no powerful imports, and exclusively provides a proc macro
+  that safely malleates a visibility modifier.
+"""
+
 [[audits.walkdir]]
 who = "Daira-Emma Hopwood <[email protected]>"
 criteria = "safe-to-run"
@@ -572,13 +582,13 @@ delta = "1.6.0 -> 1.7.0"
 
 [[trusted.equihash]]
 criteria = "safe-to-deploy"
-user-id = 6289 # str4d
+user-id = 6289 # Jack Grigg (str4d)
 start = "2020-06-26"
 end = "2025-04-22"
 
 [[trusted.f4jumble]]
 criteria = ["safe-to-deploy", "crypto-reviewed"]
-user-id = 6289 # str4d
+user-id = 6289 # Jack Grigg (str4d)
 start = "2021-09-22"
 end = "2025-04-22"
 
@@ -602,7 +612,7 @@ end = "2025-04-22"
 
 [[trusted.incrementalmerkletree]]
 criteria = "safe-to-deploy"
-user-id = 6289 # str4d
+user-id = 6289 # Jack Grigg (str4d)
 start = "2021-12-17"
 end = "2025-04-22"
 
@@ -620,7 +630,7 @@ end = "2025-04-22"
 
 [[trusted.orchard]]
 criteria = ["safe-to-deploy", "crypto-reviewed", "license-reviewed"]
-user-id = 6289 # str4d
+user-id = 6289 # Jack Grigg (str4d)
 start = "2021-01-07"
 end = "2025-04-22"
 
@@ -630,12 +640,36 @@ user-id = 1244 # ebfull
 start = "2022-10-19"
 end = "2025-04-22"
 
+[[trusted.orchard]]
+criteria = "safe-to-deploy"
+user-id = 169181 # Kris Nuttycombe (nuttycom)
+start = "2024-08-12"
+end = "2025-08-12"
+
+[[trusted.orchard]]
+criteria = ["safe-to-deploy", "crypto-reviewed", "license-reviewed"]
+user-id = 169181 # Kris Nuttycombe (nuttycom)
+start = "2024-08-12"
+end = "2025-08-12"
+
 [[trusted.sapling-crypto]]
 criteria = ["safe-to-deploy", "crypto-reviewed"]
-user-id = 6289 # str4d
+user-id = 6289 # Jack Grigg (str4d)
 start = "2024-01-26"
 end = "2025-04-22"
 
+[[trusted.sapling-crypto]]
+criteria = "safe-to-deploy"
+user-id = 169181 # Kris Nuttycombe (nuttycom)
+start = "2024-08-12"
+end = "2025-08-12"
+
+[[trusted.sapling-crypto]]
+criteria = ["safe-to-deploy", "crypto-reviewed", "license-reviewed"]
+user-id = 169181 # Kris Nuttycombe (nuttycom)
+start = "2024-08-12"
+end = "2025-08-12"
+
 [[trusted.shardtree]]
 criteria = "safe-to-deploy"
 user-id = 169181 # Kris Nuttycombe (nuttycom)
@@ -704,7 +738,7 @@ end = "2025-04-22"
 
 [[trusted.zcash]]
 criteria = "safe-to-deploy"
-user-id = 6289 # str4d
+user-id = 6289 # Jack Grigg (str4d)
 start = "2024-07-15"
 end = "2025-07-19"
 
@@ -716,7 +750,7 @@ end = "2025-04-22"
 
 [[trusted.zcash_address]]
 criteria = "safe-to-deploy"
-user-id = 6289 # str4d
+user-id = 6289 # Jack Grigg (str4d)
 start = "2021-03-07"
 end = "2025-04-22"
 
@@ -740,7 +774,7 @@ end = "2025-04-22"
 
 [[trusted.zcash_extensions]]
 criteria = "safe-to-deploy"
-user-id = 6289 # str4d
+user-id = 6289 # Jack Grigg (str4d)
 start = "2020-04-24"
 end = "2025-04-23"
 
@@ -752,7 +786,7 @@ end = "2025-04-22"
 
 [[trusted.zcash_history]]
 criteria = "safe-to-deploy"
-user-id = 6289 # str4d
+user-id = 6289 # Jack Grigg (str4d)
 start = "2024-03-01"
 end = "2025-04-22"
 
@@ -770,7 +804,7 @@ end = "2025-04-22"
 
 [[trusted.zcash_primitives]]
 criteria = ["safe-to-deploy", "crypto-reviewed", "license-reviewed"]
-user-id = 6289 # str4d
+user-id = 6289 # Jack Grigg (str4d)
 start = "2021-03-26"
 end = "2025-04-22"
 
@@ -782,7 +816,7 @@ end = "2025-04-22"
 
 [[trusted.zcash_proofs]]
 criteria = ["safe-to-deploy", "crypto-reviewed", "license-reviewed"]
-user-id = 6289 # str4d
+user-id = 6289 # Jack Grigg (str4d)
 start = "2021-03-26"
 end = "2025-04-22"
 
@@ -794,13 +828,13 @@ end = "2025-04-22"
 
 [[trusted.zcash_spec]]
 criteria = ["safe-to-deploy", "crypto-reviewed", "license-reviewed"]
-user-id = 6289 # str4d
+user-id = 6289 # Jack Grigg (str4d)
 start = "2023-12-07"
 end = "2025-04-22"
 
 [[trusted.zip32]]
 criteria = "safe-to-deploy"
-user-id = 6289 # str4d
+user-id = 6289 # Jack Grigg (str4d)
 start = "2023-12-06"
 end = "2025-04-22"
 

supply-chain/config.toml

@@ -175,10 +175,6 @@ criteria = "safe-to-deploy"
 version = "0.2.0"
 criteria = "safe-to-deploy"
 
-[[exemptions.base64]]
-version = "0.22.1"
-criteria = "safe-to-deploy"
-
 [[exemptions.base64ct]]
 version = "1.6.0"
 criteria = "safe-to-deploy"
@@ -195,10 +191,6 @@ criteria = "safe-to-deploy"
 version = "0.11.0"
 criteria = "safe-to-deploy"
 
-[[exemptions.bitflags]]
-version = "1.3.2"
-criteria = "safe-to-run"
-
 [[exemptions.bitvec]]
 version = "1.0.1"
 criteria = "safe-to-deploy"
@@ -295,10 +287,6 @@ criteria = "safe-to-deploy"
 version = "0.2.11"
 criteria = "safe-to-deploy"
 
-[[exemptions.crc32fast]]
-version = "1.4.2"
-criteria = "safe-to-deploy"
-
 [[exemptions.criterion]]
 version = "0.4.0"
 criteria = "safe-to-run"
@@ -483,10 +471,6 @@ criteria = "safe-to-deploy"
 version = "0.4.2"
 criteria = "safe-to-deploy"
 
-[[exemptions.flate2]]
-version = "1.0.30"
-criteria = "safe-to-deploy"
-
 [[exemptions.fluid-let]]
 version = "1.0.0"
 criteria = "safe-to-deploy"