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

feat(batcher): Update SP1 and Risc0 version in batcher, examples, and docs #1329

Merged
merged 49 commits into from
Nov 8, 2024
Merged
Show file tree
Hide file tree
Changes from 27 commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
c209b55
update make + ci
PatStiles Oct 24, 2024
b565e3b
update risc_zero
PatStiles Oct 24, 2024
d44c702
add risc_zero_old
PatStiles Oct 24, 2024
3219496
update sp1
PatStiles Oct 24, 2024
6d50575
add sp1_old
PatStiles Oct 24, 2024
8fd0f7f
risc bindings compile
PatStiles Oct 24, 2024
ab3a774
sp1_old bindings work
PatStiles Oct 24, 2024
a4d0245
generate and rename risc zero proofs
PatStiles Oct 24, 2024
7bfa702
generate and rename sp1 proofs
PatStiles Oct 24, 2024
c4a2e70
bump risc0 proof generator
PatStiles Oct 24, 2024
7628b8b
bump sp1 proof generator
PatStiles Oct 24, 2024
15fdf6b
add fallback to operator
PatStiles Oct 24, 2024
0679cd9
change ffi binding names
PatStiles Oct 24, 2024
96f99e9
add LD_LIBRARY_PATH to path export
MarcosNicolau Oct 25, 2024
dd7e099
add EOL to ci
PatStiles Oct 25, 2024
c15b4a0
remove prepend to make file
PatStiles Oct 25, 2024
c885d5e
rm cmt
PatStiles Oct 25, 2024
5b3c476
update batcher
PatStiles Oct 25, 2024
851b993
update docs
PatStiles Oct 25, 2024
1a530cc
update zkquiz
PatStiles Oct 25, 2024
f0bd84c
update elf
PatStiles Oct 25, 2024
29ae7a2
update validating-public-inputs
PatStiles Oct 25, 2024
d8185db
rename proof files
PatStiles Oct 25, 2024
8f86b48
change test files in test
PatStiles Oct 25, 2024
001481f
change risc-zero test file path
PatStiles Oct 25, 2024
4a04306
change sp1 test file names
PatStiles Oct 25, 2024
7f92c13
poqueno problemo
PatStiles Oct 25, 2024
09725a7
hotfix(operator): send only rpc host to telemetry service (#1316)
JuArce Oct 24, 2024
da2e9e5
hotfix(batcher): rm MIN_FEE_PER_PROOF check in batcher (#1308)
PatStiles Oct 24, 2024
e37971b
feat: update pr template (#1321)
JuArce Oct 25, 2024
bdb75e1
refactor: use url.Parse instead of regex
JuArce Oct 25, 2024
8479d9b
feat(operator): bump risc0 and sp1 versions (#1324)
PatStiles Oct 25, 2024
3e2d377
docs: update to v0.10.2 (#1330)
JuArce Oct 25, 2024
0fe142c
update make + ci
PatStiles Oct 24, 2024
70a68df
update risc_zero
PatStiles Oct 24, 2024
366a2a2
add risc_zero_old
PatStiles Oct 24, 2024
3aa6ae0
add sp1_old
PatStiles Oct 24, 2024
c9ebfb1
risc bindings compile
PatStiles Oct 24, 2024
4c6d6b3
sp1_old bindings work
PatStiles Oct 24, 2024
6b00206
generate and rename risc zero proofs
PatStiles Oct 24, 2024
a2bf0a9
generate and rename sp1 proofs
PatStiles Oct 24, 2024
6eae62c
add fallback to operator
PatStiles Oct 24, 2024
f5f4bfa
change ffi binding names
PatStiles Oct 24, 2024
11308c0
change test paths + remove new files
PatStiles Oct 25, 2024
be00703
change test file path names + remove files named new
PatStiles Oct 25, 2024
cc51dc0
Merge branch 'staging' into 1205-update-batcher-examples-docs
uri-99 Oct 25, 2024
a39d6e5
add metal comment
PatStiles Oct 25, 2024
b41cd06
rm comment in operater
PatStiles Oct 25, 2024
f37362a
Merge branch 'testnet' into 1205-update-batcher-examples-docs
PatStiles Nov 6, 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
4 changes: 4 additions & 0 deletions .github/workflows/build-and-test-go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,12 @@ jobs:
cache: false
- name: Build SP1 bindings
run: make build_sp1_linux
- name: Build Old SP1 bindings
run: make build_sp1_linux_old
- name: Build Risc Zero go bindings
run: make build_risc_zero_linux
- name: Build Old Risc Zero go bindings
run: make build_risc_zero_linux_old
- name: Build Merkle Tree bindings
run: make build_merkle_tree_linux
- name: Build operator
Expand Down
37 changes: 37 additions & 0 deletions .github/workflows/test-risc-zero-old.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: test-risc-zero-old

on:
merge_group:
push:
branches: [main]
pull_request:
branches: ["*"]
paths:
- "operator/risc_zero_old/**"
- ".github/workflows/test-risc-zero-old.yml"

jobs:
test:
runs-on: ubuntu-latest
steps:
- name: Clear device space
run: |
sudo rm -rf "$AGENT_TOOLSDIRECTORY"
sudo rm -rf /usr/local/lib/android
sudo rm -rf /opt/ghc
sudo rm -rf /usr/local/.ghcup
sudo rm -rf /usr/share/dotnet
sudo rm -rf /opt/ghc
sudo rm -rf "/usr/local/share/boost"
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: "1.22"
cache: false
- uses: actions-rs/toolchain@v1
with:
toolchain: stable
- name: Test Old Risc Zero Rust
run: make test_risc_zero_rust_ffi_old
- name: Test Old Risc Zero go bindings
run: make test_risc_zero_go_bindings_linux_old
28 changes: 28 additions & 0 deletions .github/workflows/test-sp1-old.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: test-sp1-old

on:
merge_group:
push:
branches: [main]
pull_request:
branches: ["*"]
paths:
- 'operator/sp1_old/**'
- '.github/workflows/test-sp1-old.yml'

jobs:
test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: '1.22'
cache: false
- uses: actions-rs/toolchain@v1
with:
toolchain: stable
- name: Test Old SP1 Rust
run: make test_sp1_rust_ffi_old
- name: Test Old SP1 go bindings
run: make test_sp1_go_bindings_linux_old
50 changes: 47 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ ifeq ($(OS),Darwin)
endif

ifeq ($(OS),Linux)
LD_LIBRARY_PATH += $(CURDIR)/operator/risc_zero/lib
LD_LIBRARY_PATH+=$(CURDIR)/operator/risc_zero_old/lib:$(CURDIR)/operator/risc_zero/lib
endif

ifeq ($(OS),Linux)
Expand Down Expand Up @@ -513,11 +513,11 @@ build_binaries:
__SP1_FFI__: ##
build_sp1_macos:
@cd operator/sp1/lib && cargo build $(RELEASE_FLAG)
@cp operator/sp1/lib/target/$(TARGET_REL_PATH)/libsp1_verifier_ffi.dylib operator/sp1/lib/libsp1_verifier.dylib
@cp operator/sp1/lib/target/$(TARGET_REL_PATH)/libsp1_verifier_ffi.dylib operator/sp1/lib/libsp1_verifier_ffi.dylib

build_sp1_linux:
@cd operator/sp1/lib && cargo build $(RELEASE_FLAG)
@cp operator/sp1/lib/target/$(TARGET_REL_PATH)/libsp1_verifier_ffi.so operator/sp1/lib/libsp1_verifier.so
@cp operator/sp1/lib/target/$(TARGET_REL_PATH)/libsp1_verifier_ffi.so operator/sp1/lib/libsp1_verifier_ffi.so

test_sp1_rust_ffi:
@echo "Testing SP1 Rust FFI source code..."
Expand All @@ -542,6 +542,25 @@ generate_risc_zero_empty_journal_proof:
@cd scripts/test_files/risc_zero/no_public_inputs && RUST_LOG=info cargo run --release
@echo "Fibonacci proof and ELF with empty journal generated in scripts/test_files/risc_zero/no_public_inputs folder"

build_sp1_macos_old:
@cd operator/sp1_old/lib && cargo build $(RELEASE_FLAG)
@cp operator/sp1_old/lib/target/$(TARGET_REL_PATH)/libsp1_verifier_old_ffi.dylib operator/sp1_old/lib/libsp1_verifier_old_ffi.dylib

build_sp1_linux_old:
@cd operator/sp1_old/lib && cargo build $(RELEASE_FLAG)
@cp operator/sp1_old/lib/target/$(TARGET_REL_PATH)/libsp1_verifier_old_ffi.so operator/sp1_old/lib/libsp1_verifier_old_ffi.so

test_sp1_rust_ffi_old:
@echo "Testing SP1 Rust FFI source code..."
@cd operator/sp1_old/lib && RUST_MIN_STACK=83886080 cargo t --release

test_sp1_go_bindings_macos_old: build_sp1_macos_old
@echo "Testing SP1 Go bindings..."
go test ./operator/sp1_old/... -v

test_sp1_go_bindings_linux_old: build_sp1_linux_old
@echo "Testing SP1 Go bindings..."
go test ./operator/sp1_old/... -v

__RISC_ZERO_FFI__: ##
build_risc_zero_macos:
Expand Down Expand Up @@ -569,6 +588,27 @@ generate_risc_zero_fibonacci_proof:
RUST_LOG=info cargo run --release && \
echo "Fibonacci proof, pub input and image ID generated in scripts/test_files/risc_zero folder"

build_risc_zero_macos_old:
@cd operator/risc_zero_old/lib && cargo build $(RELEASE_FLAG)
@cp operator/risc_zero_old/lib/target/$(TARGET_REL_PATH)/librisc_zero_verifier_old_ffi.dylib operator/risc_zero_old/lib/librisc_zero_verifier_old_ffi.dylib

build_risc_zero_linux_old:
@cd operator/risc_zero_old/lib && cargo build $(RELEASE_FLAG)
@cp operator/risc_zero_old/lib/target/$(TARGET_REL_PATH)/librisc_zero_verifier_old_ffi.so operator/risc_zero_old/lib/librisc_zero_verifier_old_ffi.so

test_risc_zero_rust_ffi_old:
@echo "Testing RISC Zero Rust FFI source code..."
@cd operator/risc_zero_old/lib && cargo test --release

test_risc_zero_go_bindings_macos_old: build_risc_zero_macos_old
@echo "Testing RISC Zero Go bindings..."
go test ./operator/risc_zero_old/... -v

test_risc_zero_go_bindings_linux_old: build_risc_zero_linux_old
@echo "Testing RISC Zero Go bindings..."
go test ./operator/risc_zero_old/... -v


__MERKLE_TREE_FFI__: ##
build_merkle_tree_macos:
@cd operator/merkle_tree/lib && cargo build $(RELEASE_FLAG)
Expand Down Expand Up @@ -607,13 +647,17 @@ build_all_ffi_macos: ## Build all FFIs for macOS
@echo "Building all FFIs for macOS..."
@$(MAKE) build_sp1_macos
@$(MAKE) build_risc_zero_macos
@$(MAKE) build_sp1_macos_old
@$(MAKE) build_risc_zero_macos_old
@$(MAKE) build_merkle_tree_macos
@echo "All macOS FFIs built successfully."

build_all_ffi_linux: ## Build all FFIs for Linux
@echo "Building all FFIs for Linux..."
@$(MAKE) build_sp1_linux
@$(MAKE) build_risc_zero_linux
@$(MAKE) build_sp1_linux_old
@$(MAKE) build_risc_zero_linux_old
@$(MAKE) build_merkle_tree_linux
@echo "All Linux FFIs built successfully."

Expand Down
Loading
Loading