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

Public inputs refactor #676

Merged
merged 35 commits into from
Dec 6, 2023
Merged
Show file tree
Hide file tree
Changes from 29 commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
b14e8f0
rename MemorySegment to SegmentName
juan518munoz Nov 9, 2023
efb2435
add SegmentName enum options
juan518munoz Nov 9, 2023
6edc4c3
Segment struct declaration
juan518munoz Nov 9, 2023
ed2be99
initial integratation of struct Segment
juan518munoz Nov 9, 2023
0579bd9
rmv comment
juan518munoz Nov 9, 2023
68497f3
Merge branch 'main' into PublicInputsRefactor
juan518munoz Nov 13, 2023
2c75f5a
update cairo-vm
juan518munoz Nov 13, 2023
f5a601b
change cairo-vm branch
juan518munoz Nov 14, 2023
2a7d3eb
add ecdsa & pedersen
juan518munoz Nov 14, 2023
4284f8a
test pub inputs from vm
juan518munoz Nov 15, 2023
97e1e44
Merge branch 'main' into PublicInputsRefactor
juan518munoz Nov 15, 2023
f73fc39
public inputs most fields derived from vm
juan518munoz Nov 15, 2023
8ba4bcb
clippy & fmt
juan518munoz Nov 15, 2023
845ebd1
update cairo-vm dep to latest rev
juan518munoz Nov 15, 2023
2ae0109
get memory segment from vm
juan518munoz Nov 16, 2023
b556554
rename data_len to codelen
juan518munoz Nov 16, 2023
e13cc69
Merge branch 'main' into PublicInputsRefactor
juan518munoz Nov 16, 2023
14d3c14
Merge branch 'main' into PublicInputsRefactor
juan518munoz Nov 17, 2023
32d75d5
Merge branch 'main' into PublicInputsRefactor
juan518munoz Nov 17, 2023
56024d0
Merge branch 'main' into PublicInputsRefactor
entropidelic Dec 4, 2023
be520f9
Extract public memory directly from public inputs of Cairo VM
entropidelic Dec 4, 2023
666f007
Refactor get_memory_holes function
entropidelic Dec 5, 2023
9d720cd
Merge branch 'main' into PublicInputsRefactor
entropidelic Dec 5, 2023
f495565
Remove unnecessary function and legacy test
entropidelic Dec 5, 2023
b317f1b
Remove some commented code and fix some tests
entropidelic Dec 5, 2023
f1b9293
Solve clippy issues
entropidelic Dec 5, 2023
95168ba
Remove legacy test
entropidelic Dec 5, 2023
f6817ee
Fix some comments on tests
entropidelic Dec 5, 2023
8415e05
Merge branch 'main' into PublicInputsRefactor
entropidelic Dec 5, 2023
7bdce89
Refactor pub addresses in add_pub_memory_in_public_input_section func…
entropidelic Dec 6, 2023
40e5211
Merge branch 'main' into PublicInputsRefactor
entropidelic Dec 6, 2023
17c5b1b
Merge remote-tracking branch 'origin/PublicInputsRefactor' into Publi…
entropidelic Dec 6, 2023
65b8e09
Refactor segment_size method
entropidelic Dec 6, 2023
a0b7612
iterate over addr value pairs in add_pub_memory_in_public_input_secti…
entropidelic Dec 6, 2023
58a5d4e
Merge branch 'main' into PublicInputsRefactor
entropidelic Dec 6, 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
3 changes: 1 addition & 2 deletions exercises/message/src/cairo/air.rs
Original file line number Diff line number Diff line change
Expand Up @@ -485,8 +485,7 @@ fn add_pub_memory_in_public_input_section(
let mut v_aux = values.to_owned();

let public_input_section = addresses.len() - public_input.public_memory.len();
let output_range = public_input.memory_segments.get(&MemorySegment::Output);
let pub_memory_addrs = get_pub_memory_addrs(output_range, public_input);
let pub_memory_addrs = public_input.public_memory.clone().into_keys().collect();
Oppen marked this conversation as resolved.
Show resolved Hide resolved

a_aux.splice(public_input_section.., pub_memory_addrs);
for i in public_input_section..a_aux.len() {
Expand Down
2 changes: 1 addition & 1 deletion provers/cairo/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ thiserror = "1.0.38"
log = "0.4.17"
bincode = { version = "2.0.0-rc.2", tag = "v2.0.0-rc.2", git = "https://github.com/bincode-org/bincode.git", features= ['serde'] }
# NOTE: For cairo 1 compatibility, add the `cairo-1-hints` feature.
cairo-vm = { git = "https://github.com/lambdaclass/cairo-vm", rev = "e763cef", default-features = false }
cairo-vm = { git = "https://github.com/lambdaclass/cairo-vm", rev = "e61ae177edb94e29470fed23bdda43329b16c057", default-features = false }
sha3 = "0.10.6"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
Expand Down
Loading
Loading