Skip to content

Commit

Permalink
feat: v1.0.0-rc.1 (#962)
Browse files Browse the repository at this point in the history
  • Loading branch information
ctian1 committed Jul 19, 2024
2 parents 14eb569 + 3bfe5af commit 6be0efa
Show file tree
Hide file tree
Showing 468 changed files with 22,135 additions and 25,798 deletions.
9 changes: 8 additions & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,15 @@ updates:
schedule:
interval: "weekly"
target-branch: "dev"
ignore:
- dependency-name: "axum"
versions: ["> 0.7.4"]
- package-ecosystem: "docker"
directory: "/cli/docker"
schedule:
interval: "weekly"
target-branch: "dev"
target-branch: "dev"
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
39 changes: 39 additions & 0 deletions .github/workflows/docker-gnark.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
name: Docker Gnark

on:
push:
branches: [main]
pull_request:
branches:
- "**"
paths:
- "recursion/gnark-ffi/**"
- "recursion/gnark-cli/**"
- "!recursion/gnark-ffi/assets/**"
merge_group:

jobs:
test-docker:
name: Test
runs-on: runs-on,runner=64cpu-linux-arm64,spot=false
env:
CARGO_NET_GIT_FETCH_WITH_CLI: "true"
steps:
- name: Checkout sources
uses: actions/checkout@v4

- name: Setup CI
uses: ./.github/actions/setup

- name: Build docker image
run: |
docker build -t sp1-gnark -f ./Dockerfile.gnark-ffi .
- name: Run cargo test
uses: actions-rs/cargo@v1
env:
SP1_GNARK_IMAGE: sp1-gnark
with:
command: test
toolchain: nightly-2024-04-17
args: --release -p sp1-prover -- --exact tests::test_e2e
74 changes: 72 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ concurrency:
jobs:
plonk:
name: Plonk Native
runs-on: runs-on,cpu=64,ram=256,family=m7i+m7a,hdd=80,image=ubuntu22-full-x64
runs-on: runs-on,cpu=64,ram=256,family=m7i+m7a,hdd=80,image=ubuntu22-full-x64,spot=false
env:
CARGO_NET_GIT_FETCH_WITH_CLI: "true"
steps:
Expand All @@ -39,9 +39,10 @@ jobs:
env:
RUSTFLAGS: -Copt-level=3 -Cdebug-assertions -Coverflow-checks=y -Cdebuginfo=0 -C target-cpu=native
RUST_BACKTRACE: 1

plonk-docker:
name: Plonk Docker
runs-on: runs-on,cpu=64,ram=256,family=m7i+m7a,hdd=80,image=ubuntu22-full-x64
runs-on: runs-on,cpu=64,ram=256,family=m7i+m7a,hdd=80,image=ubuntu22-full-x64,spot=false
env:
CARGO_NET_GIT_FETCH_WITH_CLI: "true"
steps:
Expand All @@ -60,6 +61,7 @@ jobs:
env:
RUSTFLAGS: -Copt-level=3 -Cdebug-assertions -Coverflow-checks=y -Cdebuginfo=0 -C target-cpu=native
RUST_BACKTRACE: 1

check-branch:
name: Check branch
runs-on: ubuntu-latest
Expand All @@ -69,3 +71,71 @@ jobs:
run: |
echo "ERROR: You can only merge to main from dev, release/*, or hotfix/*."
exit 1
ssz-withdrawals:
name: Example (SSZ Withdrawals)
runs-on: runs-on,runner=64cpu-linux-arm64,spot=false
env:
CARGO_NET_GIT_FETCH_WITH_CLI: "true"
steps:
- name: Checkout sources
uses: actions/checkout@v4

- name: Setup CI
uses: ./.github/actions/setup

- name: Install SP1 toolchain
run: |
curl -L https://sp1.succinct.xyz | bash
~/.sp1/bin/sp1up
~/.sp1/bin/cargo-prove prove --version
- name: Install SP1 CLI
run: |
cd cli
cargo install --force --locked --path .
cd ~
- name: Run script
run: |
cd examples/ssz-withdrawals/program
cargo add sp1-zkvm --path $GITHUB_WORKSPACE/zkvm/entrypoint
cargo prove build
cd ../script
cargo remove sp1-sdk
cargo add sp1-sdk --path $GITHUB_WORKSPACE/sdk
SP1_DEV=1 RUST_LOG=info cargo run --release
tendermint:
name: Example (Tendermint)
runs-on: runs-on,runner=64cpu-linux-arm64,spot=false
env:
CARGO_NET_GIT_FETCH_WITH_CLI: "true"
steps:
- name: Checkout sources
uses: actions/checkout@v4

- name: Setup CI
uses: ./.github/actions/setup

- name: Install SP1 toolchain
run: |
curl -L https://sp1.succinct.xyz | bash
~/.sp1/bin/sp1up
~/.sp1/bin/cargo-prove prove --version
- name: Install SP1 CLI
run: |
cd cli
cargo install --force --locked --path .
cd ~
- name: Run script
run: |
cd examples/tendermint/program
cargo add sp1-zkvm --path $GITHUB_WORKSPACE/zkvm/entrypoint
cargo prove build
cd ../script
cargo remove sp1-sdk
cargo add sp1-sdk --path $GITHUB_WORKSPACE/sdk
SP1_DEV=1 RUST_LOG=info cargo run --release
33 changes: 5 additions & 28 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ on:
- "zkvm/**"
- "tests/**"
- "examples/**"
- "Cargo.toml"
- ".github/workflows/**"
merge_group:

Expand All @@ -26,7 +27,7 @@ concurrency:
jobs:
test-x86:
name: Test (x86-64)
runs-on: runs-on,runner=64cpu-linux-x64
runs-on: runs-on,runner=64cpu-linux-x64,spot=false
env:
CARGO_NET_GIT_FETCH_WITH_CLI: "true"
steps:
Expand Down Expand Up @@ -57,7 +58,7 @@ jobs:

test-arm:
name: Test (ARM)
runs-on: runs-on,runner=64cpu-linux-arm64
runs-on: runs-on,runner=64cpu-linux-arm64,spot=false
env:
CARGO_NET_GIT_FETCH_WITH_CLI: "true"
steps:
Expand Down Expand Up @@ -86,31 +87,6 @@ jobs:
FRI_QUERIES: 1
SP1_DEV: 1

test-docker:
name: Test Docker
runs-on: runs-on,runner=64cpu-linux-arm64
env:
CARGO_NET_GIT_FETCH_WITH_CLI: "true"
steps:
- name: Checkout sources
uses: actions/checkout@v4

- name: Setup CI
uses: ./.github/actions/setup

- name: Build docker image
run: |
docker build -t sp1-gnark -f ./Dockerfile.gnark-ffi .
- name: Run cargo test
uses: actions-rs/cargo@v1
env:
SP1_GNARK_IMAGE: sp1-gnark
with:
command: test
toolchain: nightly-2024-04-17
args: --release -p sp1-prover -- --exact tests::test_e2e

lint:
name: Formatting & Clippy
runs-on: runs-on,runner=8cpu-linux-x64
Expand Down Expand Up @@ -161,6 +137,7 @@ jobs:
run: |
cd cli
cargo install --force --locked --path .
~/.sp1/bin/cargo-prove prove install-toolchain
cd ~
- name: Run cargo check
Expand Down Expand Up @@ -194,7 +171,7 @@ jobs:
- name: Run cargo prove new
run: |
cargo prove new fibonacci
cargo prove new fibonacci --version dev
- name: Build program and run script
run: |
Expand Down
29 changes: 29 additions & 0 deletions .github/workflows/release-plz.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
name: Release Plz

permissions:
pull-requests: write
contents: write

on:
push:
branches:
- main

jobs:
release-plz:
name: Release-plz
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Install Rust toolchain
uses: dtolnay/rust-toolchain@stable
- name: Run release-plz
uses: MarcoIeni/[email protected]
with:
command: release
env:
GITHUB_TOKEN: ${{ secrets.RELEASE_PLZ_TOKEN }}
CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}
Loading

0 comments on commit 6be0efa

Please sign in to comment.