Skip to content

refactor: zkRust V2 #24

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

Merged
PatStiles merged 45 commits into from
Sep 29, 2024
Merged

refactor: zkRust V2 #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
104cdca
sp1 io
PatStiles Jul 17, 2024
5d7e702
risc0 works
PatStiles Jul 17, 2024
3dc3400
fix merge conflicts
PatStiles Aug 22, 2024
7d28cda
fix merge conflicts in sp1
PatStiles Aug 22, 2024
fe67616
add symbol functions + change io filepath
PatStiles Aug 22, 2024
abbbdb0
update io in cargo toml
PatStiles Aug 22, 2024
e13218a
move io symbols to empty function in outside package.
PatStiles Aug 22, 2024
f2af8cd
make commit default
PatStiles Aug 26, 2024
066ee68
nit comment
PatStiles Aug 27, 2024
e563617
add zkquiz example
PatStiles Sep 2, 2024
863a286
add tendermint example
PatStiles Sep 2, 2024
45500cd
tendermint example working + remove duplicated imports
PatStiles Sep 4, 2024
3b157e5
fix sp1 host dependencies
PatStiles Sep 4, 2024
d138551
update gitignore
PatStiles Sep 4, 2024
2f63165
doc updates
PatStiles Sep 4, 2024
1ae9561
todos
PatStiles Sep 5, 2024
577d9f7
move utils const to header of file
PatStiles Sep 5, 2024
f364c35
regex abstract
PatStiles Sep 5, 2024
95b4434
change zk_rust_io dependency
PatStiles Sep 5, 2024
bc14e56
add support for fetching multiline import statements
PatStiles Sep 6, 2024
0844a9d
critical bug fix -> sp1 path pointing to wrong elf file
PatStiles Sep 6, 2024
eea50af
refactor guest and host io order
PatStiles Sep 6, 2024
8fc31b7
refactor and dedup host and guest methods
PatStiles Sep 9, 2024
48de18e
dedup risc0
PatStiles Sep 9, 2024
d275b07
comment nits
PatStiles Sep 9, 2024
9f7d255
bump sdk + update cli
PatStiles Sep 9, 2024
39adcb7
update zk_rust_io::write to implement Serializable
PatStiles Sep 9, 2024
ba29c71
update zkquiz
PatStiles Sep 9, 2024
d057b71
update examples + make lib work + make lib inclusion optional
PatStiles Sep 9, 2024
88cfd7c
create directory
PatStiles Sep 9, 2024
b24653e
bump sdk version
PatStiles Sep 9, 2024
c0626dd
add batcher payment address to submit_and_wait_verification
PatStiles Sep 10, 2024
b3082b4
makefile + readme updates
PatStiles Sep 11, 2024
4b90394
doc updates
PatStiles Sep 12, 2024
c11a513
rm unnneeded argument
PatStiles Sep 12, 2024
be84b0f
add docs on creating a project directory + using zk_rust_io
PatStiles Sep 12, 2024
9385887
ignore changes to workspace
PatStiles Sep 12, 2024
4af846f
fix: untrack content of workspaces/*
uri-99 Sep 12, 2024
43716a8
fix: add handling of comments and strings to code parser
uri-99 Sep 12, 2024
1e892f0
fix: revert exclusion of base_files inside workspaces/
uri-99 Sep 12, 2024
1dd62e3
fix: remove makefile extra arg
uri-99 Sep 12, 2024
e3fd9eb
fix: push workspaces
uri-99 Sep 12, 2024
34102bb
Readme + nits
PatStiles Sep 29, 2024
c4c3af5
update to v0.7.2
PatStiles Sep 29, 2024
e450e95
Merge branch 'main' into feat/v2
PatStiles Sep 29, 2024
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
7 changes: 4 additions & 3 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ target
.tmp_guest
.tmp_guest/*

workspaces/risc0/target
workspaces/risc0/methods/guest/*
workspaces/sp1/program/*
workspaces/*
!workspaces/base_files/
!workspaces/risc0/
!workspaces/sp1/

proof_data/sp1/*
!proof_data/sp1/.gitkeep
Expand Down
6 changes: 3 additions & 3 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,16 @@ regex = "1.10.5"
anyhow = "1.0.86"
hex = "0.4.3"
tokio = "1.38.0"
zk_rust_io = { path = "./zk_rust_io" }

# Sp1
sp1-sdk = { git = "https://github.com/succinctlabs/sp1.git", tag = "v1.0.1" }
sp1-sdk = { git = "https://github.com/succinctlabs/sp1.git", tag = "v1.1.1" }

# Risc 0
risc0-zkvm = { git = "https://github.com/risc0/risc0.git", tag = "v1.0.1" }

# Aligned SDK
aligned-sdk = { git = "https://github.com/yetanotherco/aligned_layer", tag = "v0.4.0" }
aligned-sdk = { git = "https://github.com/yetanotherco/aligned_layer", tag = "v0.7.2" }
ethers = { tag = "v2.0.15-fix-reconnections", features = [
"ws",
"rustls",
Expand All @@ -31,7 +32,6 @@ rpassword = "7.3.1"
env_logger = "0.11.3"
log = "0.4.22"


[patch.crates-io]
ark-ff = { git = "https://github.com/a16z/arkworks-algebra", branch = "optimize/field-from-u64" }
ark-ec = { git = "https://github.com/a16z/arkworks-algebra", branch = "optimize/field-from-u64" }
Expand Down
49 changes: 36 additions & 13 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
install: install_risc0 install_sp1
install: install_sp1 install_risc0

install_risc0:
@curl -L https://risczero.com/install | bash
@rzup
@cargo risczero --version
@echo "Risc0 Toolchain Installed"

install_sp1:
@curl -L https://sp1.succinct.xyz | bash
Expand All @@ -13,32 +12,56 @@ install_sp1:
@echo "Sp1 Toolchain Installed"

# Default target
all: instal
all: install

__EXAMPLES__:

# RISC0
prove_risc0_fibonacci:
@RUST_LOG=info cargo run --release -- prove-risc0 examples/fibonacci .
@RUST_LOG=info cargo run --release -- prove-risc0 examples/fibonacci

prove_risc0_rsa:
@RUST_LOG=info cargo run --release -- prove-risc0 examples/rsa .
@RUST_LOG=info cargo run --release -- prove-risc0 examples/rsa

prove_risc0_ecdsa:
@RUST_LOG=info cargo run --release -- prove-risc0 examples/ecdsa .
@RUST_LOG=info cargo run --release -- prove-risc0 examples/ecdsa

prove_risc0_blockchain_state:
@RUST_LOG=info cargo run --release -- prove-risc0 examples/json .
prove_risc0_json:
@RUST_LOG=info cargo run --release -- prove-risc0 examples/json

prove_risc0_regex:
@RUST_LOG=info cargo run --release -- prove-risc0 examples/regex

prove_risc0_sha:
@RUST_LOG=info cargo run --release -- prove-risc0 examples/sha

prove_risc0_tendermint:
@RUST_LOG=info cargo run --release -- prove-risc0 examples/tendermint

prove_risc0_zkquiz:
@RUST_LOG=info cargo run --release -- prove-risc0 examples/zkquiz

# SP1
prove_sp1_fibonacci:
@RUST_LOG=info cargo run --release -- prove-sp1 examples/fibonacci .
@RUST_LOG=info cargo run --release -- prove-sp1 examples/fibonacci

prove_sp1_rsa:
@RUST_LOG=info cargo run --release -- prove-sp1 examples/rsa .
@RUST_LOG=info cargo run --release -- prove-sp1 examples/rsa

prove_sp1_ecdsa:
@RUST_LOG=info cargo run --release -- prove-sp1 examples/ecdsa .
@RUST_LOG=info cargo run --release -- prove-sp1 examples/ecdsa

prove_sp1_json:
@RUST_LOG=info cargo run --release -- prove-sp1 examples/json

prove_risc0_regex:
@RUST_LOG=info cargo run --release -- prove-risc0 examples/regex

prove_risc0_sha:
@RUST_LOG=info cargo run --release -- prove-risc0 examples/sha

prove_risc0_tendermint:
@RUST_LOG=info cargo run --release -- prove-risc0 examples/tendermint

prove_sp1_blockchain_state:
@RUST_LOG=info cargo run --release -- prove-sp1 examples/json .
prove_risc0_zkquiz:
@RUST_LOG=info cargo run --release -- prove-risc0 examples/zkquiz
Loading