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.

Sign up for GitHub

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

Jump to bottom

feat: value extractor #37

Merged
merged 134 commits into from
Aug 28, 2024
Merged

feat: value extractor #37

merged 134 commits into from
Aug 28, 2024

Conversation

lonerapier
Copy link
Collaborator

@lonerapier lonerapier commented Aug 17, 2024 •
edited
Loading

Able to extract string from arbitrary depth JSON

Improvements possible to parser and extractor

  • parser should handle data length more than actual length (forgot what this means lmao)
  • build parser state and then run extractor
  • remove ValueLen, don't think it's needed
  • remove depth
  • decide whether you want generalisation or performance (low constraints)
  • currently extractor circuit can’t extract array-only JSON, i.e. if keys are 0.0
  • extract complete array
  • how-to readme and explanation docs

@Autoparallel
add: reddit_response.json
d2be624
@Autoparallel
refactor tests + add failing case
6d4b7c3
@Autoparallel
easier fix
afcacda
@Autoparallel
test: parse to key
99e0e5c
@Autoparallel
tests: key parsing
3a20a47
@Autoparallel
bug: next_end_of_kv on read :
98a3b51
@Autoparallel
fix: end_of_kv bug
44bcc18
@Autoparallel
test: find value
fb0fb34
@Autoparallel
tests: inside_value and inside_value_to_exit
0f82ab0
@Autoparallel
test: parse to NEXT key
0b166ea
@Autoparallel
parses JSON with two string keys
fc81c78
@Autoparallel
WIP: value inside value
f1ebb51
@Autoparallel
comment
07fd671
@Autoparallel
refactor (#10)
a62dd35 
* wip: start with bitmask

* WIP: time to start testing

* tests: `ArrayAdd` and `ArrayMul`

* tests passing

* update comments
@Autoparallel
feat: 2 key depth 1 json
63a00d5
@Autoparallel
2 kv json and all tests passing
9528248
@Autoparallel
nested json works!!!
86bb82d
@Autoparallel
reduce constraints
4142ab0
@Autoparallel
cleanup
1d425e5
@Autoparallel
rename variables
ec6ec0e
@Autoparallel
more cleaning
ba8888f
@Autoparallel
more cleanup
887786a
@Autoparallel
make comments clean
621e130
@Autoparallel
WAYLON NITPICKING ME LOL
18c68d8
@Autoparallel
feat: improved CLI for witness
52fa826
@Autoparallel
gitignore input.json
331f218
@Autoparallel
Update main.rs
7eef73e
@Autoparallel
feat: update rust
ca148b5
@Autoparallel
feat: parse with array as value
c95b72f
@Autoparallel
feat; InRange template
5998757
@lonerapier lonerapier marked this pull request as ready for review August 28, 2024 11:16
Autoparallel
Autoparallel reviewed Aug 28, 2024
View reviewed changes
Copy link
Contributor

@Autoparallel Autoparallel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking good! Awaiting final changes.

circuits/interpreter.circom Outdated Show resolved Hide resolved
circuits/interpreter.circom Outdated
Comment on lines 108 to 109
/// Checks current byte is at depth greater than specified `depth`
/// and returns whether next key-value pair starts.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

bit confused about this comment

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hmm, let me add more details

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

added more details in comment

circuits/language.circom Show resolved Hide resolved
circuits/test/extractor.test.ts Outdated Show resolved Hide resolved
src/bin/codegen.rs Outdated Show resolved Hide resolved
circuits/utils/array.circom Show resolved Hide resolved
circuits/test/extractor.test.ts Outdated Show resolved Hide resolved
@Autoparallel Autoparallel self-requested a review August 28, 2024 21:40
Autoparallel
Autoparallel approved these changes Aug 28, 2024
View reviewed changes
Copy link
Contributor

@Autoparallel Autoparallel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me. Let's finish up the merge conflicts then I'll merge. We'll catch any issues later on as this looks good enough to cook with and I want to unblock the end-to-end flow.

@lonerapier lonerapier force-pushed the temp-fetcher branch 2 times, most recently from 01c7faf to b8f1e30 Compare August 28, 2024 22:07
@lonerapier lonerapier merged commit 6a48ff5 into main Aug 28, 2024
0 of 2 checks passed
@lonerapier lonerapier deleted the temp-fetcher branch September 11, 2024 16:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Autoparallel Autoparallel Autoparallel approved these changes

@devloper devloper Awaiting requested review from devloper

@thor314 thor314 Awaiting requested review from thor314

@0xJepsen 0xJepsen Awaiting requested review from 0xJepsen

Assignees

@Autoparallel Autoparallel

Labels
None yet
Projects
None yet
Milestone
MVP(json): JSON Parser and Interpreter
2 participants
@lonerapier @Autoparallel