Skip to content

Commit 54a8f60

Browse files
authored
feat: v1.2.0-rc1 (#1389)
2 parents 5786734 + c1ff739 commit 54a8f60

753 files changed

Lines changed: 48400 additions & 15220 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/dependabot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ updates:
99
- dependency-name: "axum"
1010
versions: ["> 0.7.4"]
1111
- package-ecosystem: "docker"
12-
directory: "/cli/docker"
12+
directory: "/crates/cli/docker"
1313
schedule:
1414
interval: "weekly"
1515
target-branch: "dev"

.github/workflows/docker-publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ jobs:
8585
- name: Build and push Docker image
8686
uses: docker/build-push-action@v6
8787
with:
88-
context: ./cli/docker
89-
file: ./cli/docker/Dockerfile
88+
context: ./crates/cli/docker
89+
file: ./crates/cli/docker/Dockerfile
9090
push: true
9191
tags: ${{ steps.docker_tagging.outputs.docker_tags }}
9292
labels: ${{ steps.meta.outputs.labels }}

.github/workflows/main.yml

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,7 @@ on:
55
branches:
66
- main
77
paths:
8-
- "cli/**"
9-
- "core/**"
10-
- "prover/**"
11-
- "recursion/**"
12-
- "derive/**"
13-
- "sdk/**"
8+
- "crates/**"
149
- ".github/workflows/**"
1510

1611
concurrency:
@@ -118,18 +113,18 @@ jobs:
118113
119114
- name: Install SP1 CLI
120115
run: |
121-
cd cli
116+
cd crates/cli
122117
cargo install --force --locked --path .
123118
cd ~
124119
125120
- name: Run script
126121
run: |
127122
cd examples/ssz-withdrawals/program
128-
cargo add sp1-zkvm --path $GITHUB_WORKSPACE/zkvm/entrypoint
123+
cargo add sp1-zkvm --path $GITHUB_WORKSPACE/crates/zkvm/entrypoint
129124
cargo prove build
130125
cd ../script
131126
cargo remove sp1-sdk
132-
cargo add sp1-sdk --path $GITHUB_WORKSPACE/sdk
127+
cargo add sp1-sdk --path $GITHUB_WORKSPACE/crates/sdk
133128
SP1_DEV=1 RUST_LOG=info cargo run --release
134129
135130
tendermint:
@@ -158,16 +153,16 @@ jobs:
158153
159154
- name: Install SP1 CLI
160155
run: |
161-
cd cli
156+
cd crates/cli
162157
cargo install --force --locked --path .
163158
cd ~
164159
165160
- name: Run script
166161
run: |
167162
cd examples/tendermint/program
168-
cargo add sp1-zkvm --path $GITHUB_WORKSPACE/zkvm/entrypoint
163+
cargo add sp1-zkvm --path $GITHUB_WORKSPACE/crates/zkvm/entrypoint
169164
cargo prove build
170165
cd ../script
171166
cargo remove sp1-sdk
172-
cargo add sp1-sdk --path $GITHUB_WORKSPACE/sdk
167+
cargo add sp1-sdk --path $GITHUB_WORKSPACE/crates/sdk
173168
SP1_DEV=1 RUST_LOG=info cargo run --release

.github/workflows/pr.yml

Lines changed: 38 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,7 @@ on:
77
branches:
88
- "**"
99
paths:
10-
- "cli/**"
11-
- "core/**"
12-
- "prover/**"
13-
- "recursion/**"
14-
- "derive/**"
15-
- "sdk/**"
16-
- "zkvm/**"
17-
- "tests/**"
10+
- "crates/**"
1811
- "examples/**"
1912
- "Cargo.toml"
2013
- ".github/workflows/**"
@@ -25,6 +18,39 @@ concurrency:
2518
cancel-in-progress: true
2619

2720
jobs:
21+
test-fast:
22+
name: Test (fast-experimental)
23+
runs-on: runs-on,runner=64cpu-linux-x64,spot=false
24+
env:
25+
CARGO_NET_GIT_FETCH_WITH_CLI: "true"
26+
steps:
27+
- name: Checkout sources
28+
uses: actions/checkout@v4
29+
30+
- name: Setup CI
31+
uses: ./.github/actions/setup
32+
33+
- name: Run cargo check
34+
uses: actions-rs/cargo@v1
35+
with:
36+
command: check
37+
toolchain: 1.79.0
38+
args: --all-targets --all-features
39+
40+
- name: Run cargo test core-v2
41+
uses: actions-rs/cargo@v1
42+
with:
43+
command: test
44+
toolchain: 1.79.0
45+
args: --release --package sp1-recursion-core-v2 --package sp1-recursion-circuit-v2 --features native-gnark
46+
env:
47+
RUSTFLAGS: -Copt-level=3 -Cdebug-assertions -Coverflow-checks=y -Cdebuginfo=0 -C target-cpu=native
48+
RUST_BACKTRACE: 1
49+
FRI_QUERIES: 1
50+
SP1_DEV: 1
51+
52+
53+
2854
test-x86:
2955
name: Test (x86-64)
3056
runs-on:
@@ -147,7 +173,7 @@ jobs:
147173
148174
- name: Install SP1 CLI
149175
run: |
150-
cd cli
176+
cd crates/cli
151177
cargo install --force --locked --path .
152178
~/.sp1/bin/cargo-prove prove install-toolchain
153179
cd ~
@@ -177,7 +203,7 @@ jobs:
177203
178204
- name: Install SP1 CLI
179205
run: |
180-
cd cli
206+
cd crates/cli
181207
cargo install --force --locked --path .
182208
cd ~
183209
@@ -189,9 +215,9 @@ jobs:
189215
run: |
190216
cd fibonacci
191217
cd program
192-
cargo add sp1-zkvm --path $GITHUB_WORKSPACE/zkvm/entrypoint
218+
cargo add sp1-zkvm --path $GITHUB_WORKSPACE/crates/zkvm/entrypoint
193219
cargo prove build
194220
cd ../script
195221
cargo remove sp1-sdk
196-
cargo add sp1-sdk --path $GITHUB_WORKSPACE/sdk
222+
cargo add sp1-sdk --path $GITHUB_WORKSPACE/crates/sdk
197223
SP1_DEV=1 RUST_LOG=info cargo run --release -- --prove

.vscode/settings.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
// // Examples.
2525
// "examples/chess/program/Cargo.toml",
2626
// "examples/chess/script/Cargo.toml",
27+
// "examples/cycle-tracking/program/Cargo.toml",
28+
// "examples/cycle-tracking/script/Cargo.toml",
2729
// "examples/fibonacci/program/Cargo.toml",
2830
// "examples/fibonacci/script/Cargo.toml",
2931
// "examples/io/program/Cargo.toml",

0 commit comments

Comments
 (0)