Skip to content

Commit 3b6b9a6

Browse files
committed
WIP
1 parent 805ef34 commit 3b6b9a6

File tree

5 files changed

+40
-13
lines changed

5 files changed

+40
-13
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,16 +66,19 @@ jobs:
6666
run: cargo add --no-default-features --features "circuit" --path ../crate_root
6767
- name: Add lazy_static with the spin_no_std feature
6868
working-directory: ./ci-build
69-
run: cargo add lazy_static --features "spin_no_std"
69+
run: cargo add lazy_static --no-default-features --features "spin_no_std"
7070
- name: Add typenum with the no_std feature
7171
working-directory: ./ci-build
72-
run: cargo add typenum --features "no_std"
72+
run: cargo add typenum --no-default-features --features "no_std"
7373
- name: Show Cargo.toml for the synthetic crate
7474
working-directory: ./ci-build
7575
run: cat Cargo.toml
76-
- name: XXX DEBUG
76+
- name: DEBUG cargo tree -i -p getrandom -e features
7777
working-directory: ./ci-build
7878
run: cargo tree -i -p getrandom -e features
79+
- name: DEBUG cargo tree -i -p rand_core -e features
80+
working-directory: ./ci-build
81+
run: cargo tree -i -p rand_core -e features
7982
- name: Add target
8083
working-directory: ./ci-build
8184
run: rustup target add ${{ matrix.target }}

.github/workflows/lints-stable.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,19 @@ jobs:
4646
run: cargo add --no-default-features --features "circuit" --path ../crate_root
4747
- name: Add lazy_static with the spin_no_std feature
4848
working-directory: ./ci-build
49-
run: cargo add lazy_static --features "spin_no_std"
49+
run: cargo add lazy_static --no-default-features --features "spin_no_std"
5050
- name: Add typenum with the no_std feature
5151
working-directory: ./ci-build
52-
run: cargo add typenum --features "no_std"
52+
run: cargo add typenum --no-default-features --features "no_std"
5353
- name: Show Cargo.toml for the synthetic crate
5454
working-directory: ./ci-build
5555
run: cat Cargo.toml
56+
- name: DEBUG cargo tree -i -p getrandom -e features
57+
working-directory: ./ci-build
58+
run: cargo tree -i -p getrandom -e features
59+
- name: DEBUG cargo tree -i -p rand_core -e features
60+
working-directory: ./ci-build
61+
run: cargo tree -i -p rand_core -e features
5662
- name: Add target
5763
working-directory: ./ci-build
5864
run: rustup target add ${{ matrix.target }}

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@ and this project adheres to Rust's notion of
66
[Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

88
## [Unreleased]
9+
### Changed
10+
- The "circuit" feature no longer implies the "std" feature. "circuit" can now
11+
potentially be used in `no_std` environments.
12+
- `orchard::bundle::batch` is now only available when the "std" feature is enabled
13+
together with the "circuit" feature.
914

1015
## [0.11.0] - 2025-02-20
1116

Cargo.lock

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

Cargo.toml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ zip32 = { version = "0.2.0", default-features = false }
4848
visibility = "0.1.1"
4949

5050
# Circuit
51-
halo2_gadgets = { version = "0.3", optional = true }
51+
halo2_gadgets = { version = "0.3", optional = true, default-features = false }
5252
halo2_proofs = { version = "0.3", optional = true, default-features = false, features = ["batch", "floor-planner-v1-legacy-pdqsort"] }
5353

5454
# Boilerplate
@@ -87,7 +87,7 @@ circuit = ["dep:halo2_gadgets", "dep:halo2_proofs"]
8787
unstable-frost = []
8888
multicore = ["halo2_proofs?/multicore"]
8989
dev-graph = ["halo2_proofs?/dev-graph", "image", "plotters"]
90-
test-dependencies = ["proptest"]
90+
test-dependencies = ["proptest", "rand/std"]
9191

9292
[[bench]]
9393
name = "note_decryption"
@@ -106,3 +106,7 @@ debug = true
106106

107107
[profile.bench]
108108
debug = true
109+
110+
[patch.crates-io]
111+
halo2_gadgets = { git = "https://github.com/zcash/halo2.git", rev = "7e173f8e2e6e8717052e472384bdf28e58eaff19" }
112+
halo2_proofs = { git = "https://github.com/zcash/halo2.git", rev = "7e173f8e2e6e8717052e472384bdf28e58eaff19" }

0 commit comments

Comments
 (0)