2307 Commits

Author SHA1 Message Date
Sean Bowe
90bebdf29a halo2_proofs: add hardcoded proof to plonk_api test for backwards compatibility testing 2022-02-14 08:48:03 -07:00
Sean Bowe
289f24bb8b Improvements due to @daira's code review. 2022-02-11 08:50:55 -07:00
Sean Bowe
a129490517 Minor changes 2022-02-10 08:08:20 -07:00
Sean Bowe
a4d3c328b9 halo2_proofs: rename variables for consistency
This changes variable names in the multiopen and commitment opening implementations
and the book's protocol description to keep names and indicies consistent with one
another.

Co-Authored-By: Jack Grigg <jack@electriccoin.co>
2022-02-09 13:37:50 -07:00
str4d
b45180273e Merge pull request #486 from rex4539/typos
Fix typos
2022-02-08 17:52:28 +00:00
str4d
9617336d46 Merge pull request #489 from zcash/ci-book-pin-nightly
CI: Pin nightly version in book workflow
2022-02-04 01:27:43 +00:00
Jack Grigg
53427d19db CI: Pin nightly version in book workflow
We require nightly Rust to build the documentation, but latest nightly
has a bug where `--no-deps` causes an ICE.
2022-02-04 01:23:32 +00:00
str4d
457739593e Merge pull request #488 from zcash/fix-ci-rustdoc
CI: Fix rustdoc rendering to handle workspace
2022-02-04 01:04:54 +00:00
Jack Grigg
0ce0280b26 CI: Fix rustdoc rendering to handle workspace
`cargo rustdoc` only works for a single package. To render docs for
a workspace while passing config options to `rustdoc`, we need to use
the `RUSTDOCFLAGS` environment variable.

We also add several other flags to handle the switch to `cargo doc`:
- `--no-deps` ensures we only build packages in the workspace.
- `--enable-index-page` (unstable) adds a landing page showing the list
  of rendered crate docs.
2022-02-04 01:03:52 +00:00
Daira Hopwood
c4bdab59e3 Improve the explanation of incomplete addition:
* use biimplication in the correctness argument to ensure both soundness and completeness;
* avoid introducing lambda at all; it's unnecessary and omitting it shortens the explanation.

Co-authored-by: Jack Grigg <str4d@electriccoin.co>
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2022-02-03 22:06:05 +00:00
Dimitris Apostolou
e2f88e450b Fix typos 2022-02-03 18:01:22 +02:00
str4d
ee14e3f985 Merge pull request #481 from zcash/457-deprecated-bigint
halo2_gadgets: Migrate from bigint to uint
2022-02-02 00:40:30 +00:00
Jack Grigg
c6886600a9 halo2_gadgets: Migrate from bigint to uint
Closes zcash/halo2#457.
2022-02-01 16:19:53 +00:00
str4d
4bb7496b6f Merge pull request #473 from zcash/halo2_gadgets-import
Import `halo2_gadgets` as extracted from `orchard`
2022-02-01 15:58:12 +00:00
Jack Grigg
5312343e6d halo2_gadgets: Expose testing APIs required by orchard 2022-01-28 17:52:48 +00:00
str4d
f3502421cd Merge pull request #475 from zcash/patch-gadgets-import
`halo2_gadgets` import: Visibility fixes and Clippy fixes.
2022-01-28 16:28:03 +00:00
therealyingtong
3547008d35 Clippy fixes. 2022-01-28 23:50:14 +08:00
therealyingtong
7c7c281000 Visibility fixes. 2022-01-28 23:38:22 +08:00
Jack Grigg
bb76d8c292 CI: List explicit features to check against WASM
We can't check the `test-dependencies` feature flag, because `proptest`
fails to compile on WASM.
2022-01-27 23:44:42 +00:00
Jack Grigg
9a12beee73 halo2_gadgets: Rename halo2 to halo2_proofs
The previous commit renamed `halo2_proofs` back to `halo2` temporarily
to keep the commit size down. This commit performs the rename in a
single pass.
2022-01-27 23:32:04 +00:00
Jack Grigg
5202ec6eda Integrate halo2_gadgets into the workspace
THe SHA-256 example gadget has been moved into the `halo2_gadgets` crate
behind an `unstable` feature flag.
2022-01-27 23:32:04 +00:00
Jack Grigg
7e9ced2eaa Merge halo2_gadgets from zcash/orchard into halo2_gadgets-import 2022-01-27 23:08:35 +00:00
Jack Grigg
a2367abcaf Migrate to halo2_gadgets crate in subdir
- The crate module structure from `orchard` has been flattened.
- The book pages we want to include in `halo2` have been moved to their
  target location, to avoid any conflicts during the merge.
- Common files that already exist in zcash/halo2 have been removed.
2022-01-27 23:08:01 +00:00
Jack Grigg
c4ef177e07 Implement in-crate gadget tests (independent of Orchard constants)
We define some simple fixed bases around the default Pallas generator,
and a simple Sinsemilla instantiation. The tests now compile and pass.

Co-authored-by: ying tong <yingtong@z.cash>
2022-01-27 23:08:01 +00:00
Jack Grigg
c2866beb47 Delete Orchard-specific code, dependencies, and book pages
The tests do not compile as of this commit, due to Orchard-specific
constants being deleted, but everything else compiles.

Co-authored-by: ying tong <yingtong@z.cash>
2022-01-27 23:07:59 +00:00
str4d
159ab53da5 Merge pull request #186 from zcash/refactor-gadget-crates
Prepare to extract gadgets into crates
2022-01-27 17:53:18 +00:00
therealyingtong
a2868262b3 Minor cleanups and fixes. 2022-01-28 00:45:44 +08:00
therealyingtong
91bc1edf8f constants::sinsemilla: Remove Q_ and S_PERSONALIZATION.
These are part of the sinsemilla gadget and are not Orchard-specific.
They will live in primitives::sinsemilla.
2022-01-27 21:14:15 +08:00
therealyingtong
28f2d7a84b Provide compute_lagrange_coeffs() functionality in ECCChip.
This involves moving helper functions from src/constants to a new
module, ecc::chip::constants.

Co-authored-by: Jack Grigg <jack@electriccoin.co>
2022-01-27 21:14:15 +08:00
str4d
bb56139414 Merge pull request #472 from zcash/separate-single-and-batch-verification
halo2_proofs: Improve `plonk::verify_proof` API
2022-01-27 01:19:34 +00:00
str4d
a9a60cc6dd Merge pull request #471 from zcash/poly-evaluator-thread-fix
Fix handling of short chunks in `poly::Evaluator`
2022-01-27 01:19:21 +00:00
Jack Grigg
4d336f2707 halo2_proofs: Improve plonk::verify_proof API
Previously `plonk::verify_proof` took an `MSM` as an argument, to enable
batch verification. However, this also required that it take a source of
randomness in order to enforce separation of proofs within a batch. This
made single-proof verification unnecessarily non-deterministic.

We now have a `VerificationStrategy` trait encapsulating the necessary
details, and separate `SingleVerifier` and `BatchVerifier` structs for
the specific variants. Proof verifiers no longer need to create and
manage the `MSM` themselves, and single-proof verifiers no longer need
to supply a source of randomness.

Co-authored-by: Sean Bowe <sean@electriccoin.co>
2022-01-27 00:20:56 +00:00
therealyingtong
85b481af35 sinsemilla::merkle: Remove MERKLE_DEPTH constant. 2022-01-27 08:14:41 +08:00
Jack Grigg
d3faddc53c Fix impl Debug for poly::Ast
The auto-derived implementation would only work if the evaluation
context implemented `Debug`, which closures never do.
2022-01-27 00:13:17 +00:00
Jack Grigg
507be292b8 Fix poly::Evaluator short-chunk bug
Previously we were passing through the chunk size and index to each
thread's evaluation context, but this was insufficient for them to
determine whether or not they were processing the final chunk, or if
the final chunk was short. This led to constant and linear term chunks
being created with the full chunk size, even if the last chunk was
short. If this longer-than-short chunk reached the root of the AST, it
triggered a panic in the final `copy_from_slice()`.

The bug was obscured in two ways:
- Currently polynomials always have a power-of-two length, and on CPUs
  with power-of-two threads this meant we never produced short chunks.
- The way that subsequent operations like `Ast::Add` were implemented
  meant that if a constant or linear term occurred on the right-hand
  side of an operation, the longer chunks were masked to the short chunk
  length.

We fix this by passing the polynomial length into each thread's context,
so that we can compute the correct length for the final chunk.

Co-authored-by: Daira Hopwood <daira@jacaranda.org>
2022-01-27 00:13:17 +00:00
Jack Grigg
8cfa0bd399 Add a test exposing the poly::Evaluator short-chunk bug
Co-authored-by: Daira Hopwood <daira@jacaranda.org>
2022-01-27 00:13:17 +00:00
therealyingtong
31259d089c ecc::chip::mul_fixed: Reintroduce build_constants() closure for constants. 2022-01-27 08:11:52 +08:00
therealyingtong
f0e9daf722 gadget::ecc: Clean up bounds four FixedPointBaseField, FixedPointShort. 2022-01-27 08:10:18 +08:00
therealyingtong
191b5df0cb circuit.rs: Tidy up imports. 2022-01-27 08:09:29 +08:00
Jack Grigg
b7944e5c40 Make Assigned::Zero slightly less likely in Assigned proptest 2022-01-21 13:57:25 +00:00
Jack Grigg
05a4d26bea Add unary operators to Assigned proptest 2022-01-21 13:57:25 +00:00
Jack Grigg
a7e45495cf Add Assigned::{double, square, cube} methods 2022-01-21 13:57:25 +00:00
Jack Grigg
50b8e05913 Add other Add*, Sub*, Mul* variant impls to Assigned<F> 2022-01-21 13:57:25 +00:00
Jack Grigg
8d00acace5 impl<F: Field> Eq for Assigned<F> 2022-01-21 13:57:24 +00:00
Jack Grigg
927463f76a Add Assigned::is_zero_vartime method 2022-01-21 13:57:24 +00:00
Jack Grigg
9d0e0b7be9 Add AssignedCell<Assigned<F>, F>::evaluate() method
We don't want to provide a generic `map` function, since that would
enable users to arbitrarily alter the value connected to a given cell.
If a new value is being produced, that should either happen outside of
the context of a cell (e.g. intermediate values from witness generation)
or in the context of a newly-assigned cell.

However, in the case of the `Assigned<F>` type, we do need the ability
to evaluate the deferred inversion in some cases (e.g. to then operate
on the bits of the value). So for this `AssignedCell` specialization, we
provide a pass-through `evaluate()` method that otherwise preserves the
cell-value connection.
2022-01-21 13:57:24 +00:00
Jack Grigg
93ee7143fe impl From<&Assigned<F>> for Assigned<F>
In zcash/halo2#383 we altered the bounds on region assignment methods
like `Region::assign_advice` to constrain the value closure's result on
`for<'vr> Assigned<F>: From<&'vr VR>` instead of `VR: Into<Assigned<F>>`.
This had the unintended side-effect that `Assigned<F>` could no longer
be returned from the closure, because we were previously relying on the
implicit `impl From<T> for T` provided by Rust, which no longer fits the
bound. This commit adds the missing from-reference impl to restore
functionality, re-enabling inversion deferrment.
2022-01-21 13:57:24 +00:00
str4d
d111807798 Merge pull request #465 from zcash/462-workspace
Refactor into workspace with `halo2` and `halo2_proofs`
2022-01-20 20:26:38 +00:00
Jack Grigg
f79ec5cadd Recreate halo2 as an empty library crate
This is now where the recursion logic will live.

Closes zcash/halo2#462.
2022-01-20 18:50:43 +00:00
Jack Grigg
3c6558f049 Move halo2 code into halo2_proofs crate 2022-01-20 18:50:43 +00:00