Merge remote-tracking branch 'upstream/main' into hotfix/zcash_client…

…_sqlite-0.12.2-merge

Cargo.toml

@@ -7,6 +7,7 @@ members = [
     "components/zcash_protocol",
     "components/zip321",
     "devtools",
+    "pczt",
     "zcash",
     "zcash_client_backend",
     "zcash_client_sqlite",
@@ -122,9 +123,9 @@ subtle = "2.2.3"
 # - Warning: One of the downstream consumers requires that SQLite be available through
 #   CocoaPods, due to being bound to React Native. We need to ensure that the SQLite
 #   version required for `rusqlite` is a version that is available through CocoaPods.
-rusqlite = { version = "0.29.0", features = ["bundled"] }
-schemer = "0.2"
-schemer-rusqlite = "0.2.2"
+rusqlite = { version = "0.31", features = ["bundled"] }
+schemerz = "0.2"
+schemerz-rusqlite = "0.310"
 time = "0.3.22"
 uuid = "1.1"
 
@@ -144,9 +145,9 @@ incrementalmerkletree-testing = "0.2"
 # Tor
 # - `arti-client` depends on `rusqlite`, and a version mismatch there causes a compilation
 #   failure due to incompatible `libsqlite3-sys` versions.
-arti-client = { version = "0.11", default-features = false, features = ["compression", "rustls", "tokio"] }
+arti-client = { version = "0.22", default-features = false, features = ["compression", "rustls", "tokio"] }
 tokio = "1"
-tor-rtcompat = "0.9"
+tor-rtcompat = "0.22"
 tower = "0.4"
 
 # ZIP 32

deny.toml

@@ -36,8 +36,11 @@ exceptions = [
     { name = "coarsetime", allow = ["ISC"] },
     { name = "curve25519-dalek", allow = ["BSD-3-Clause"] },
     { name = "ed25519-dalek", allow = ["BSD-3-Clause"] },
+    { name = "inotify", allow = ["ISC"] },
+    { name = "inotify-sys", allow = ["ISC"] },
     { name = "matchit", allow = ["BSD-3-Clause"] },
     { name = "minreq", allow = ["ISC"] },
+    { name = "notify", allow = ["CC0-1.0"] },
     { name = "option-ext", allow = ["MPL-2.0"] },
     { name = "priority-queue", allow = ["MPL-2.0"] },
     { name = "ring", allow = ["LicenseRef-ring"] },

pczt/Cargo.toml

@@ -0,0 +1,13 @@
+[package]
+name = "pczt"
+version = "0.0.0"
+authors = ["Jack Grigg <[email protected]>"]
+edition.workspace = true
+rust-version.workspace = true
+description = "Tools for working with partially-created Zcash transactions"
+homepage = "https://github.com/zcash/librustzcash"
+repository.workspace = true
+license.workspace = true
+categories.workspace = true
+
+[dependencies]

pczt/README.md

@@ -0,0 +1,21 @@
+# pczt
+
+TBD
+
+## License
+
+Licensed under either of
+
+ * Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or
+   http://www.apache.org/licenses/LICENSE-2.0)
+ * MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT)
+
+at your option.
+
+### Contribution
+
+Unless you explicitly state otherwise, any contribution intentionally
+submitted for inclusion in the work by you, as defined in the Apache-2.0
+license, shall be dual licensed as above, without any additional terms or
+conditions.
+

pczt/src/lib.rs

@@ -0,0 +1 @@
+

supply-chain/audits.toml

@@ -271,6 +271,12 @@ who = "Daira-Emma Hopwood <[email protected]>"
 criteria = "safe-to-run"
 delta = "0.9.9 -> 0.9.10"
 
+[[audits.pczt]]
+who = "Kris Nuttycombe <[email protected]>"
+criteria = "safe-to-deploy"
+version = "0.0.0"
+notes = "Initial empty crate release."
+
 [[audits.pin-project-internal]]
 who = "Daira-Emma Hopwood <[email protected]>"
 criteria = "safe-to-deploy"
@@ -711,6 +717,18 @@ user-id = 169181 # Kris Nuttycombe (nuttycom)
 start = "2024-08-12"
 end = "2025-08-12"
 
+[[trusted.schemerz]]
+criteria = "safe-to-deploy"
+user-id = 6289 # Jack Grigg (str4d)
+start = "2024-10-15"
+end = "2025-10-15"
+
+[[trusted.schemerz-rusqlite]]
+criteria = "safe-to-deploy"
+user-id = 6289 # Jack Grigg (str4d)
+start = "2024-10-15"
+end = "2025-10-15"
+
 [[trusted.shardtree]]
 criteria = "safe-to-deploy"
 user-id = 169181 # Kris Nuttycombe (nuttycom)