Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge master into develop #1345

Closed
wants to merge 232 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
232 commits
Select commit Hold shift + click to select a range
04eeca1
include 64 bit check for excess term
querolita Jun 28, 2023
2c0b34c
Merge pull request #1098 from o1-labs/gadgets/fix_rot
querolita Jul 18, 2023
8e4f6bd
Bump up actions/checkout to v3
dannywillems Jul 20, 2023
571e89f
Merge pull request #1142 from o1-labs/develop
mrmr1993 Jul 20, 2023
e8d6185
Merge pull request #1138 from o1-labs/dannywillems/address-gh-actions…
dannywillems Jul 24, 2023
1a10f94
Removed the old FFMul RFC in favor of the new one in one available in…
joseandro Aug 3, 2023
7e485c3
Updated broken links
joseandro Aug 3, 2023
1704194
Merge pull request #1180 from o1-labs/old_ffmul_rfc_removal
joseandro Aug 3, 2023
05e3ecf
Add rust 1.70
dannywillems Aug 23, 2023
043b570
Make clippy happy
dannywillems Aug 23, 2023
6ca750b
Use take from Option: default value is None
dannywillems Aug 23, 2023
f85859f
Use double quoted for numbers in CI
dannywillems Aug 23, 2023
3693a3f
Fix typo in indices
dannywillems Sep 22, 2023
ab854bf
Merge pull request #1198 from o1-labs/dannywillems/add-rust-1.70-in-c…
Sep 27, 2023
db03070
Use 1.71 and 1.72 in CI
dannywillems Oct 4, 2023
9521cd2
Make clippy happy for 1.72
dannywillems Oct 4, 2023
76938bb
Merge pull request #1269 from o1-labs/dannywillems/master-update-rust
dannywillems Oct 9, 2023
57c18ab
Removed the bot that closed stale issues and stale PRs
joseandro Oct 10, 2023
fcb5f9e
Merge pull request #1278 from o1-labs/remove-bot
mrmr1993 Oct 10, 2023
a8caccb
Merge branch 'develop' into master
mrmr1993 Oct 17, 2023
3a3a463
initial specs with layout distribution
querolita Sep 11, 2023
611dc78
created macro and env function to access states from layout
querolita Sep 12, 2023
862fc50
created constraints for theta step
querolita Sep 12, 2023
9e5c635
pirho constraints
querolita Sep 12, 2023
aa78a19
expand function and round constants and offsets update
querolita Sep 12, 2023
ecf475d
chi constraints
querolita Sep 12, 2023
be51993
iota constraints
querolita Sep 12, 2023
8bac2ff
fix constraints indentation and add next row wiring
querolita Sep 12, 2023
ec06272
include xor of state inside gate
querolita Sep 12, 2023
a33120a
fix clippy
querolita Sep 13, 2023
57327d8
remove unnecessary ranges in loops
querolita Sep 13, 2023
c217976
remove unused function in this pr
querolita Sep 13, 2023
1179b8d
update chainable layout
querolita Sep 13, 2023
4c7f074
simplify macro to need half less rows
querolita Sep 14, 2023
360468b
added constraints of KeccakSponge
querolita Sep 18, 2023
0c360e1
add variants in all matches for this type
querolita Sep 18, 2023
94967f6
included all bytes in KeccakSponge layout to check composition at abs…
querolita Sep 21, 2023
b4a94d8
rename resets for shifts
querolita Sep 26, 2023
e1b318a
update comments
querolita Sep 26, 2023
c593da7
update fixes after testing
querolita Oct 3, 2023
8caedce
fix bug found during testing
querolita Oct 5, 2023
431d562
add support for 10*1 padding in gate
querolita Oct 7, 2023
fafd5be
interface of circuit including sponge and permutation
querolita Sep 18, 2023
2460a52
reorganize the code into individual files
querolita Sep 19, 2023
448023e
add gadget to create a root sponge gate at the beginning of the hashing
querolita Sep 21, 2023
0215f20
update fixes after testing
querolita Oct 3, 2023
1ce42e7
update after testing
querolita Oct 3, 2023
18f8f17
remove unused (witness) functions in this pr
querolita Oct 5, 2023
8527741
simplify decomposition into quarters thanks to clippy
querolita Oct 5, 2023
b648542
reorganize the code into individual files
querolita Oct 7, 2023
1e23d22
move OFF table to mod
querolita Oct 7, 2023
9ce51a3
preliminar work on array cell for witness layout
querolita Sep 19, 2023
96002d7
constant generic for number of columns for witness interface
querolita Sep 19, 2023
1c717f0
preliminary work with macro for layout, does not work
querolita Sep 19, 2023
11da7d1
add generic to WitnessCell to support vectors inside VariableCell
querolita Sep 20, 2023
4980e5b
rename ArrayCell to IndexCell
querolita Sep 20, 2023
6e51a78
give visibility to some effort trying to make WitnessCell compatible …
querolita Sep 20, 2023
7e0958f
made WitnessCell more generic to support variables with arbitrary typ…
querolita Sep 20, 2023
78e3a57
modified IndexCell creation to have from-to, and create sponge layout
querolita Sep 20, 2023
3486281
add support for arbitrary shape layouts for cell initialization
querolita Sep 20, 2023
980ba5d
fix clippy errors
querolita Sep 20, 2023
56c63da
fix typo causing overflow at subtraction
querolita Sep 26, 2023
8bf3689
Merge branch 'witness/index-cell' into zkvm/keccak/indexcell
querolita Oct 19, 2023
fdf2849
keccak witness layout
querolita Oct 19, 2023
f17b5e0
add structs to compute witness modularly for each permutation step, a…
querolita Oct 19, 2023
87e3e25
enable test for keccak table and move it inside rotation tests
querolita Oct 19, 2023
e35b0a5
refactor macros to fix wrong index accesses, and cleaner code to work…
querolita Oct 20, 2023
3471ecc
Merge branch 'zkvm/keccak/gate' into zkvm/keccak/circuit
querolita Oct 20, 2023
8236952
fix length of coefficients in sponge to avoid index out of bounds
querolita Oct 20, 2023
f65c1cf
Merge branch 'zkvm/keccak/circuit' into zkvm/keccak/indexcell
querolita Oct 20, 2023
47eff70
Merge branch 'zkvm/keccak/indexcell' into zkvm/keccak/layout
querolita Oct 20, 2023
ca354a8
Merge branch 'zkvm/keccak/layout' into zkvm/keccak/witness
querolita Oct 20, 2023
fe85e7e
update witness code to use grid macro
querolita Oct 20, 2023
abd91ea
Remove snarky
dannywillems Sep 29, 2023
2850b2a
Merge pull request #1293 from o1-labs/dannywillems-remove-snarky
dannywillems Oct 23, 2023
dc1463d
Merge pull request #1284 from o1-labs/merge-back-to-master
mrmr1993 Oct 23, 2023
1491b17
switch N to W for column width
querolita Oct 23, 2023
be7e77d
Merge branch 'witness/index-cell' into zkvm/keccak/indexcell
querolita Oct 23, 2023
35c55d7
Merge branch 'zkvm/keccak/indexcell' into zkvm/keccak/layout
querolita Oct 23, 2023
43572f8
rename layout generic N for W
querolita Oct 23, 2023
e522f33
Merge branch 'zkvm/keccak/layout' into zkvm/keccak/witness
querolita Oct 23, 2023
b16635c
Initial optimism layout
mrmr1993 Oct 23, 2023
eac8542
Checkout optimism v1.1.6
mrmr1993 Oct 23, 2023
e55460b
Check-in runner
mrmr1993 Oct 23, 2023
4fc60e9
Split out op-program runner
mrmr1993 Oct 23, 2023
0a715b7
Separate out runner
mrmr1993 Oct 23, 2023
7af8026
Add cannon to runner
mrmr1993 Oct 23, 2023
85841b0
Allow an explicit filename to override
mrmr1993 Oct 23, 2023
d2aac11
Import parsing for CLI
mrmr1993 Oct 24, 2023
1cd7832
Load the state declared in the flags
mrmr1993 Oct 24, 2023
391ea4e
Run the VM CLI from the main script
mrmr1993 Oct 24, 2023
4a54b24
Abstract ExprError over Column
mrmr1993 Mar 28, 2023
163457b
Abstract Variable over Column
mrmr1993 Mar 28, 2023
7b5cc8f
Abstract Expr over Column
mrmr1993 Mar 28, 2023
85c10bf
Generalize PolishToken over Column
mrmr1993 Mar 28, 2023
748269d
ColumnEnvironment trait
mrmr1993 Mar 29, 2023
21502a3
ColumnEvaluations trait
mrmr1993 Mar 29, 2023
06b0137
Generalize PolishToken::evaluate
mrmr1993 Mar 29, 2023
bf1a5a3
Generalize Expr::cell
mrmr1993 Mar 29, 2023
04566d9
Generalize to_polynomial
mrmr1993 Mar 29, 2023
ff637ad
Generalize evaluate_
mrmr1993 Mar 30, 2023
f8cb64b
Generalize remaining ProofEvaluations uses
mrmr1993 Mar 30, 2023
50bb0ea
Move get_domain into ColumnEnvironment
mrmr1993 Mar 30, 2023
accad12
Generalize unnormalized_lagrange_evals over Environment
mrmr1993 Mar 30, 2023
f49371a
Generalize to_polynomials over Environment
mrmr1993 Mar 30, 2023
f02d1d0
Generalize evaluate over Environment
mrmr1993 Mar 30, 2023
ba32966
Generalize to_polynomial
mrmr1993 Mar 30, 2023
840b18f
Generalize evaluations_helper over Environment
mrmr1993 Mar 30, 2023
473c435
Generalize Linearization over column
mrmr1993 Mar 30, 2023
7a4f0e2
Generalize to_polynomial over Column
mrmr1993 Mar 30, 2023
1d700a3
Generalize Monomials over Column
mrmr1993 Mar 30, 2023
23614b6
Move expr::Columns to berkeley_columns
mrmr1993 Mar 30, 2023
ce6fdfa
Move ColumnEvaluations to berkeley_columns
mrmr1993 Mar 30, 2023
5ab1b2d
Use unwrap instead of empty string expects
mrmr1993 Oct 24, 2023
a5f48d1
Mini readme
mrmr1993 Oct 24, 2023
c7254f7
Update script to use env
mrmr1993 Oct 24, 2023
cbf3b56
Clippy!!!!!
mrmr1993 Oct 24, 2023
2365ebb
Merge pull request #1294 from o1-labs/feature/abstract-columns-rebase
dannywillems Oct 24, 2023
69db0c8
Merge pull request #1295 from o1-labs/feature/op-program
dannywillems Oct 24, 2023
0a0b8b3
Implement deserializer
dannywillems Oct 24, 2023
9d71461
Update cargo.lock
dannywillems Oct 24, 2023
44891fb
Check page size
dannywillems Oct 24, 2023
fafd2a4
Add initial witness::Env
mrmr1993 Oct 24, 2023
3026234
Merge pull request #1296 from o1-labs/dannywillems/decode-memory
mrmr1993 Oct 24, 2023
f6dd0a5
Merge pull request #1297 from o1-labs/dannywillems/memory-decode-asse…
dannywillems Oct 24, 2023
45d3ada
Merge pull request #1298 from o1-labs/feature/add-environment
dannywillems Oct 24, 2023
bd2e009
add support for trivial rotation by 0 and 64
querolita Oct 25, 2023
5eb5fcc
update assert to force <= 64 rotation offset
querolita Oct 26, 2023
f637cb7
Merge pull request #1299 from o1-labs/rot/0_64
querolita Oct 26, 2023
7d3b563
update length of vector with constant instead of hard coded
querolita Oct 26, 2023
82fb7dc
Merge branch 'zkvm/keccak/circuit' into zkvm/keccak/indexcell
querolita Oct 26, 2023
3950f00
Merge branch 'zkvm/keccak/indexcell' into zkvm/keccak/layout
querolita Oct 26, 2023
bd26c64
Merge branch 'zkvm/keccak/layout' into zkvm/keccak/witness
querolita Oct 26, 2023
facc966
make WitnessCell variable generic to be F by default
querolita Oct 26, 2023
95bfeb5
making column width generic in witness cell by default, smaller diff,…
querolita Oct 26, 2023
7c17b1a
Merge pull request #1287 from o1-labs/witness/index-cell
querolita Oct 30, 2023
18579b8
Merge branch 'master' into zkvm/keccak/gate
querolita Oct 30, 2023
1e1369d
Merge branch 'master' into zkvm/keccak/circuit
querolita Oct 30, 2023
0a90902
Merge branch 'master' into zkvm/keccak/indexcell
querolita Oct 30, 2023
68427ef
Merge branch 'zkvm/keccak/gate' into zkvm/keccak/circuit
querolita Oct 30, 2023
8285c51
Merge branch 'zkvm/keccak/circuit' into zkvm/keccak/indexcell
querolita Oct 30, 2023
4fef94d
Merge pull request #1288 from o1-labs/zkvm/keccak/indexcell
querolita Oct 30, 2023
6a7d81b
Merge branch 'zkvm/keccak/circuit' into zkvm/keccak/layout
querolita Oct 30, 2023
42d8ba1
Merge branch 'zkvm/keccak/layout' into zkvm/keccak/witness
querolita Oct 30, 2023
0276c75
adapt order of generics in witness layout
querolita Oct 30, 2023
2b4b0d3
Merge branch 'zkvm/keccak/layout' into zkvm/keccak/witness
querolita Oct 30, 2023
4433f41
Separate out instruction pre-fetching
mrmr1993 Oct 31, 2023
1a64113
add functionality to convert from hexadecimal string BigUints
querolita Oct 19, 2023
5ecf0ad
add a few tests for the keccak witness generation code, and printing …
querolita Oct 19, 2023
175380e
Merge branch 'zkvm/keccak/witness' into zkvm/keccak/tests
querolita Nov 1, 2023
ed53123
cannon: adding clone traits
rbonichon Oct 31, 2023
75e5c04
optimism: dispatching configuration for info pp
rbonichon Oct 31, 2023
d645c1d
optimism: basic logging in place
rbonichon Oct 31, 2023
bd3091d
optimism: computes correct time, ips, memory data
rbonichon Oct 31, 2023
d2d7ea6
optimism: move memory size representation in its own outer function
rbonichon Nov 1, 2023
919f352
optimism: testing memory_size function
rbonichon Nov 1, 2023
b4a19d8
optimism: info now displays the opcode correctly in its output
rbonichon Nov 1, 2023
83476ce
logging: using env_logger for simple logging
rbonichon Nov 1, 2023
fdee244
optimism: updating displayed information
rbonichon Nov 1, 2023
ed84dfb
use iter() instead of iter_mut()
rbonichon Nov 1, 2023
474c399
Bump up actions/@checkout to 4.1.1
dannywillems Nov 1, 2023
f9fd3fc
Merge pull request #1315 from o1-labs/dw/update-actions-to-4.1.1
dannywillems Nov 1, 2023
84fbbbb
Add link to blog post
dannywillems Sep 25, 2023
6f819ba
fix typo in comments of witness_next_chunk
querolita Nov 3, 2023
4de9b74
cannon: basic support for metadata
rbonichon Nov 3, 2023
4f6bcf2
optimism: read metadata and use for info printing
rbonichon Nov 3, 2023
1ca6b2e
cannon: add sample test for metadata reading
rbonichon Nov 6, 2023
2abba7e
cannon: add test for find_address_symbol
rbonichon Nov 6, 2023
f278cc6
cannon: use Vec::binary_search to find symbol names
rbonichon Nov 6, 2023
3516781
cannon: add comment about expected invariant
rbonichon Nov 6, 2023
02ca2b3
cannon: use combinators within find_address_symbol
rbonichon Nov 6, 2023
53cb022
cannon: make symbols field public
rbonichon Nov 6, 2023
28189a1
cannon: make sure symbols are in ascending order and not 0-size
rbonichon Nov 6, 2023
dc62aa7
cannon: update tests
rbonichon Nov 6, 2023
934770a
Merge pull request #1319 from o1-labs/rb/meta-support
Nov 7, 2023
cb688fb
Update book/src/fundamentals/zkbook_ips.md
dannywillems Nov 9, 2023
5342a48
Fix clippy and fix typo
dannywillems Nov 13, 2023
2c602fe
Merge pull request #1322 from o1-labs/dannywillems/fixup-instruction-…
dannywillems Nov 14, 2023
9df9bbb
Merge pull request #1314 from o1-labs/feature/instruction-decoding-2
dannywillems Nov 14, 2023
9355d19
Merge pull request #1244 from o1-labs/zkvm/keccak/gate
dannywillems Nov 14, 2023
35c1aad
Merge pull request #1268 from o1-labs/zkvm/keccak/circuit
dannywillems Nov 14, 2023
0ac8ce2
Merge pull request #1248 from o1-labs/zkvm/keccak/layout
dannywillems Nov 14, 2023
d7c8a98
Merge pull request #1262 from o1-labs/zkvm/keccak/witness
dannywillems Nov 14, 2023
b23c39e
Merge pull request #1261 from o1-labs/zkvm/keccak/tests
dannywillems Nov 14, 2023
60fa869
add unit bytes in RATE and CAPACITY constants
querolita Nov 14, 2023
3e4f1d2
move bitwise-related tests to the mod file for a better scoping
querolita Nov 14, 2023
8d79377
fix copy-paste typo in comment about sponge constraints
querolita Nov 14, 2023
a89a05b
use QUARTERS instead of harcoded 4
querolita Nov 14, 2023
248e72a
Merge pull request #1307 from o1-labs/rb/debugging-info
dannywillems Nov 14, 2023
d2513ef
Merge pull request #1256 from o1-labs/dannywillems/add-link-blog-post
dannywillems Nov 14, 2023
b9c8bac
Merge branch 'master' into fix/14185-dannywillems
dannywillems Nov 14, 2023
42db185
include comment in docs alerting about the minimum field size require…
querolita Nov 14, 2023
2b4bf9e
clarify order of quarters in decomposition
querolita Nov 14, 2023
f72f3a7
rename claim/real for expected in tests
querolita Nov 14, 2023
e298118
copy-paste typo in comment of test blocks
querolita Nov 14, 2023
ffb6180
rename dummy test with zero
querolita Nov 14, 2023
1909a1e
print to stderr in tests instead
querolita Nov 14, 2023
1e86579
rename test_keccak for setup_keccak_test
querolita Nov 14, 2023
469cd6e
Merge pull request #1253 from o1-labs/fix/14185-dannywillems
dannywillems Nov 14, 2023
00279f4
separate tests in individual smaller tests, add more coverage, and in…
querolita Nov 14, 2023
bf64165
clarification about length of shifts
querolita Nov 14, 2023
8f33db5
getting rid of flatten/copy in shifts and reset
querolita Nov 14, 2023
9cac866
add test for padding length and clarify docs
querolita Nov 14, 2023
f61500d
write pad function in functional friendly format and add test for it
querolita Nov 14, 2023
0855d7e
refactor collapse in a more functional friendly manner
querolita Nov 14, 2023
319c268
address clippy
querolita Nov 14, 2023
4e98aa9
Merge pull request #1330 from o1-labs/zkvm/keccak/comments
dannywillems Nov 14, 2023
fb33252
Use nightly 2023-10-10 for doc
dannywillems Nov 14, 2023
ed64ecb
Build doc on any branch, but deploy only on master
dannywillems Nov 14, 2023
e0fd2f5
Merge pull request #1331 from o1-labs/dannywillems/remove-nightly-car…
dannywillems Nov 15, 2023
aff4454
cannon: deserialize preimage key into [u8;32]
rbonichon Nov 7, 2023
4e9d5e6
cannon: refine serialization
rbonichon Nov 7, 2023
b46a860
Track next_instruction_pointer
mrmr1993 Nov 15, 2023
5ea4861
Merge pull request #1321 from o1-labs/rb/deserialize-preimage-key
dannywillems Nov 16, 2023
ad91893
Merge pull request #1333 from o1-labs/feature/mips-next-ip
mrmr1993 Nov 16, 2023
0823cb2
Basic support for preimage oracle process within witness environment
rbonichon Nov 22, 2023
7ca6211
Implement simple get_preimage
rbonichon Nov 22, 2023
6b0252e
Add type for preimage
rbonichon Nov 23, 2023
64b2a3a
preimage: add some documentation
rbonichon Nov 23, 2023
e832951
cannon: add hint datatype
rbonichon Nov 24, 2023
22fa41b
Implement hint writing
rbonichon Nov 24, 2023
1a0d2ca
Some more documentation
rbonichon Nov 24, 2023
8ea84f1
preimage_oracle: nicer failure messages
rbonichon Nov 24, 2023
0f08aaa
preimage_oracle: handle several key types
rbonichon Nov 27, 2023
c9d1cef
Add cross-process pipes, ensure that they aren't free'd
mrmr1993 Nov 27, 2023
5628f83
Merge pull request #1339 from o1-labs/feature/file-pipes
Nov 27, 2023
253ddb1
Merge pull request #1338 from o1-labs/rb/file-descriptors
Nov 27, 2023
9d72d43
Initially move sections around [MinaProtocol/mina#14442]
volhovm Oct 31, 2023
5c8d0d2
Consistency pass on book chapters / styling
volhovm Nov 2, 2023
5005343
Prettify sections more
volhovm Nov 7, 2023
74f0bd4
Merge pull request #1344 from o1-labs/volhovm/mina14442-move-to-master
volhovm Nov 29, 2023
2a4e62d
Merge branch 'master' into volhovm/merge-master-to-develop-29nov2023
volhovm Nov 29, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions .github/workflows/gh-page.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,13 @@ name: Deploy Specifications & Docs to GitHub Pages
on:
push:
branches:
- master
- "*"

env:
OCAML_VERSION: "4.14.0"
RUST_TOOLCHAIN_VERSION: "nightly"
# This version has been chosen randomly. It seems that with 2023-11-16, it is
# broken. The compiler crashes. Feel free to pick any newer working version.
RUST_TOOLCHAIN_VERSION: "nightly-2023-10-10"

jobs:
release:
Expand Down Expand Up @@ -42,7 +44,7 @@ jobs:
- name: Build Rust Documentation
run: |
eval $(opam env)
RUSTDOCFLAGS="--enable-index-page -Zunstable-options" cargo +nightly doc --all --no-deps
RUSTDOCFLAGS="--enable-index-page -Zunstable-options" cargo doc --all --no-deps

- name: Build the mdbook
run: |
Expand All @@ -57,6 +59,7 @@ jobs:

- name: Deploy
uses: peaceiris/actions-gh-pages@v3
if: github.ref == 'refs/heads/master'
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: ./book/book/html
35 changes: 0 additions & 35 deletions .github/workflows/stale.yml

This file was deleted.

3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "optimism/ethereum-optimism"]
path = optimism/ethereum-optimism
url = https://github.com/ethereum-optimism/optimism.git
Loading