Skip to content

Commit 726fdf6

Browse files
committed
Merge branch 'staging' into 1082-bitmap-to-disable-verifiers-v2
2 parents 35568c3 + 7aa630c commit 726fdf6

File tree

138 files changed

+18153
-5982
lines changed

Some content is hidden

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

138 files changed

+18153
-5982
lines changed

.dockerignore

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
docker/*
2+
**/.DS_Store
3+
**/.idea
4+
out
5+
cache
6+
**/build
7+
**/target
8+
**/aligned_verification_data
9+
**/broadcast
10+
volume
11+
nonce_*.bin
12+
docker-compose.yaml
13+
.github/**
14+
**.md

.github/pull_request_template.md

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# TITLE
2+
3+
## Description
4+
5+
Description of the pull request changes and motivation.
6+
7+
## Type of change
8+
9+
Please delete options that are not relevant.
10+
11+
- [ ] New feature
12+
- [ ] Bug fix
13+
- [ ] Optimization
14+
- [ ] Refactor
15+
16+
## Checklist
17+
18+
- [ ] “Hotfix” to `testnet`, everything else to `staging`
19+
- [ ] Linked to Github Issue
20+
- [ ] This change depends on code or research by an external entity
21+
- [ ] Acknowledgements were updated to give credit
22+
- [ ] Unit tests added
23+
- [ ] This change requires new documentation.
24+
- [ ] Documentation has been added/updated.
25+
- [ ] This change is an Optimization
26+
- [ ] Benchmarks added/run
27+
- [ ] Has a known issue
28+
- [Link to the open issue addressing it]()
29+
- [ ] If your PR changes the Operator compatibility (Ex: Upgrade prover versions)
30+
- [ ] This PR adds compatibility for operator for both versions and do not change batcher/docs/examples
31+
- [ ] This PR updates batcher and docs/examples to the newer version. This requires the operator are already updated to be compatible

.github/workflows/build-and-test-go.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,12 @@ jobs:
2727
cache: false
2828
- name: Build SP1 bindings
2929
run: make build_sp1_linux
30+
- name: Build Old SP1 bindings
31+
run: make build_sp1_linux_old
3032
- name: Build Risc Zero go bindings
3133
run: make build_risc_zero_linux
34+
- name: Build Old Risc Zero go bindings
35+
run: make build_risc_zero_linux_old
3236
- name: Build Merkle Tree bindings
3337
run: make build_merkle_tree_linux
3438
- name: Build operator
Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
name: "[CI] Send proofs to network"
2+
3+
on:
4+
pull_request:
5+
types:
6+
- opened
7+
- synchronize
8+
paths-ignore:
9+
- '**.md'
10+
11+
concurrency:
12+
group: pull_request-${{ github.event.pull_request.number }}
13+
cancel-in-progress: true
14+
15+
jobs:
16+
network-test-docker-compose:
17+
name: "Test network with Docker Compose"
18+
runs-on: aligned-runner-ci
19+
permissions:
20+
contents: read
21+
packages: write
22+
pull-requests: write
23+
24+
steps:
25+
- name: Log in to GitHub Container Registry
26+
uses: docker/login-action@v2
27+
with:
28+
registry: ghcr.io
29+
username: ${{ github.actor }}
30+
password: ${{ secrets.GITHUB_TOKEN }}
31+
32+
- name: Checkout
33+
uses: actions/checkout@v4
34+
with:
35+
submodules: recursive
36+
37+
- name: Build containers
38+
run: make docker_build
39+
40+
- name: Start containers and initialize network
41+
run: make docker_up && sleep 15
42+
43+
- name: Send proofs batches
44+
run: make docker_batcher_send_all_proofs_burst
45+
46+
- name: Verify all sent proofs
47+
run: make docker_verify_proof_submission_success
48+
49+
- name: Stop containers
50+
continue-on-error: true
51+
if: always()
52+
run: make docker_down
53+
54+
- name: Ensure admin permissions in _work
55+
if: always()
56+
run: sudo chown admin:admin -R /home/admin/actions-runner/_work/
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: test-risc-zero-old
2+
3+
on:
4+
merge_group:
5+
push:
6+
branches: [main]
7+
pull_request:
8+
branches: ["*"]
9+
paths:
10+
- "operator/risc_zero_old/**"
11+
- ".github/workflows/test-risc-zero-old.yml"
12+
13+
jobs:
14+
test:
15+
runs-on: ubuntu-latest
16+
steps:
17+
- name: Clear device space
18+
run: |
19+
sudo rm -rf "$AGENT_TOOLSDIRECTORY"
20+
sudo rm -rf /usr/local/lib/android
21+
sudo rm -rf /opt/ghc
22+
sudo rm -rf /usr/local/.ghcup
23+
sudo rm -rf /usr/share/dotnet
24+
sudo rm -rf /opt/ghc
25+
sudo rm -rf "/usr/local/share/boost"
26+
- uses: actions/checkout@v4
27+
- uses: actions/setup-go@v5
28+
with:
29+
go-version: "1.22"
30+
cache: false
31+
- uses: actions-rs/toolchain@v1
32+
with:
33+
toolchain: stable
34+
- name: Test Old Risc Zero Rust
35+
run: make test_risc_zero_rust_ffi_old
36+
- name: Test Old Risc Zero go bindings
37+
run: make test_risc_zero_go_bindings_linux_old

.github/workflows/test-sp1-old.yml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: test-sp1-old
2+
3+
on:
4+
merge_group:
5+
push:
6+
branches: [main]
7+
pull_request:
8+
branches: ["*"]
9+
paths:
10+
- 'operator/sp1_old/**'
11+
- '.github/workflows/test-sp1-old.yml'
12+
13+
jobs:
14+
test:
15+
runs-on: ubuntu-latest
16+
steps:
17+
- uses: actions/checkout@v4
18+
- uses: actions/setup-go@v5
19+
with:
20+
go-version: '1.22'
21+
cache: false
22+
- uses: actions-rs/toolchain@v1
23+
with:
24+
toolchain: stable
25+
- name: Test Old SP1 Rust
26+
run: make test_sp1_rust_ffi_old
27+
- name: Test Old SP1 go bindings
28+
run: make test_sp1_go_bindings_linux_old

0 commit comments

Comments
 (0)