Merge branch 'main' into marvin/keycard-privacy-commands

CONTRIBUTING.md

@@ -6,7 +6,7 @@ This document describes the guidelines for contributing to the project. We will
 
 If you have any questions, come say hi to our [Discord](https://discord.gg/tGJwgGrSPN)!
 
-## Commit and PR title format
+## Commit title format
 
 We use [Conventional Commits](https://www.conventionalcommits.org/).
 
@@ -33,11 +33,22 @@ Examples:
 
 Breaking changes:
 - Mark with `!` in the title.
-- Optionally add a `BREAKING CHANGE:` footer in the PR body with migration notes.
 
 `CHANGELOG.md` is generated from these markers on every `v*` tag via `git-cliff`, and GitHub Releases are created from the same content.
 
-Before merging PR consider squashing non-meaningful commits. E.g.:
+## Pull requests
+
+PR titles should follow the same Conventional Commits format:
+- `type(scope): description`
+- `type(scope)!: description` for breaking changes
+
+Before marking a PR as ready for review:
+- Fill out the PR template.
+
+Breaking changes in PRs:
+- Optionally add a `BREAKING CHANGE:` footer in the PR body with migration notes.
+
+Before merging a PR, consider squashing non-meaningful commits. E.g.:
 
 ```
 - refactor(wallet): move user keys to a separate module

Cargo.lock

@@ -1290,19 +1290,6 @@ dependencies = [
  "time",
 ]
 
-[[package]]
-name = "bonsai-sdk"
-version = "1.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a381a5f681e536070483826412fcfcd6f6637921717c6aa0a3759926899ee9c2"
-dependencies = [
- "duplicate",
- "maybe-async",
- "reqwest",
- "serde",
- "thiserror 2.0.18",
-]
-
 [[package]]
 name = "borsh"
 version = "1.6.1"
@@ -2438,17 +2425,6 @@ version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4c3cf4824e2d5f025c7b531afcb2325364084a16806f6d47fbc1f5fbd9960590"
 
-[[package]]
-name = "duplicate"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e92f10a49176cbffacaedabfaa11d51db1ea0f80a83c26e1873b43cd1742c24"
-dependencies = [
- "heck",
- "proc-macro2",
- "proc-macro2-diagnostics",
-]
-
 [[package]]
 name = "dyn-clone"
 version = "1.0.20"
@@ -6105,17 +6081,6 @@ dependencies = [
  "rawpointer",
 ]
 
-[[package]]
-name = "maybe-async"
-version = "0.2.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "746873a384ad60adc5db74471dfaba74bd278afbdcfd81db93fafcdfc8b5ca0c"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.117",
-]
-
 [[package]]
 name = "memchr"
 version = "2.8.0"
@@ -7849,7 +7814,6 @@ checksum = "eddd3ca559203180a307f12d114c268abf583f59b03cb906fd0b3ff8646c1147"
 dependencies = [
  "base64",
  "bytes",
- "futures-channel",
  "futures-core",
  "futures-util",
  "h2",
@@ -8201,7 +8165,6 @@ dependencies = [
  "addr2line",
  "anyhow",
  "bincode",
- "bonsai-sdk",
  "borsh",
  "bytemuck",
  "bytes",

Cargo.toml

@@ -88,7 +88,7 @@ tokio = { version = "1.50", features = [
   "fs",
 ] }
 tokio-util = "0.7.18"
-risc0-zkvm = { version = "3.0.5", features = ['std'] }
+risc0-zkvm = { version = "3.0.5", default-features = false, features = ['std'] }
 risc0-build = "3.0.5"
 anyhow = "1.0.98"
 derive_more = "2.1.1"

keycard_wallet/Cargo.toml

@@ -13,4 +13,4 @@ pyo3.workspace = true
 log.workspace = true
 serde = { workspace = true, features = ["derive"] }
 serde_json.workspace = true
-zeroize.workspace = true
+zeroize.workspace = true

nssa/Cargo.toml

@@ -14,7 +14,7 @@ faucet_core.workspace = true
 
 anyhow.workspace = true
 thiserror.workspace = true
-risc0-zkvm.workspace = true
+risc0-zkvm = { workspace = true, features = ["client"] }
 serde.workspace = true
 serde_with.workspace = true
 sha2.workspace = true