Merge pull request #1677 from zcash/protobuf-updates

Updates to Protobuf generation dependencies

Cargo.toml

@@ -125,7 +125,7 @@ rayon = "1.5"
 # Protobuf and gRPC
 prost = "0.13"
 tonic = { version = "0.12", default-features = false }
-tonic-build = { version = "0.12", default-features = false }
+tonic-build = { version = "0.12.3", default-features = false }
 
 # Secret management
 secrecy = "0.8"

supply-chain/audits.toml

@@ -346,11 +346,30 @@ who = "Daira-Emma Hopwood <[email protected]>"
 criteria = "safe-to-deploy"
 delta = "0.12.1 -> 0.12.3"
 
+[[audits.prost]]
+who = "Jack Grigg <[email protected]>"
+criteria = "safe-to-deploy"
+delta = "0.13.1 -> 0.13.4"
+notes = """
+- The new `unsafe` block in `encoded_len_varint` has correct safety documentation.
+- The other changes to `unsafe` code are a move of existing `unsafe` code.
+"""
+
 [[audits.prost-build]]
 who = "Daira-Emma Hopwood <[email protected]>"
 criteria = "safe-to-deploy"
 delta = "0.12.1 -> 0.12.3"
 
+[[audits.prost-build]]
+who = "Jack Grigg <[email protected]>"
+criteria = "safe-to-deploy"
+delta = "0.13.1 -> 0.13.4"
+notes = """
+- Changes to generated code make sense.
+- Changes to `protoc` path handling don't alter existing usages (just allow the
+  path to be explicitly set).
+"""
+
 [[audits.prost-derive]]
 who = "Daira-Emma Hopwood <[email protected]>"
 criteria = "safe-to-deploy"
@@ -362,11 +381,21 @@ criteria = "safe-to-deploy"
 delta = "0.12.3 -> 0.12.6"
 notes = "Changes to proc macro code are to fix lints after bumping MSRV."
 
+[[audits.prost-derive]]
+who = "Jack Grigg <[email protected]>"
+criteria = "safe-to-deploy"
+delta = "0.13.1 -> 0.13.4"
+
 [[audits.prost-types]]
 who = "Daira-Emma Hopwood <[email protected]>"
 criteria = "safe-to-deploy"
 delta = "0.12.1 -> 0.12.3"
 
+[[audits.prost-types]]
+who = "Jack Grigg <[email protected]>"
+criteria = "safe-to-deploy"
+delta = "0.13.1 -> 0.13.4"
+
 [[audits.redox_syscall]]
 who = "Daira-Emma Hopwood <[email protected]>"
 criteria = "safe-to-run"
@@ -570,6 +599,12 @@ who = "Jack Grigg <[email protected]>"
 criteria = "safe-to-deploy"
 delta = "0.12.0 -> 0.12.1"
 
+[[audits.tonic-build]]
+who = "Jack Grigg <[email protected]>"
+criteria = "safe-to-deploy"
+delta = "0.12.1 -> 0.12.3"
+notes = "Changes to generated code make sense and don't result in anything unexpected."
+
 [[audits.utf8parse]]
 who = "Jack Grigg <[email protected]>"
 criteria = "safe-to-run"

zcash_client_backend/build.rs

@@ -72,7 +72,7 @@ fn build() -> io::Result<()> {
             ".cash.z.wallet.sdk.rpc.CompactOrchardAction",
             "crate::proto::compact_formats::CompactOrchardAction",
         )
-        .compile(&[SERVICE_PROTO], &["proto/"])?;
+        .compile_protos(&[SERVICE_PROTO], &["proto/"])?;
 
     // Build the proposal types.
     tonic_build::compile_protos(PROPOSAL_PROTO)?;