Skip to content

Commit 0c04cad

Browse files
MauroToscanoMauroToscano
committed
Merge branch 'staging' into 515-chore-add-multisig-support-to-upgrade-servicemanager
2 parents 98517cd + dbb5335 commit 0c04cad

File tree

283 files changed

+39548
-9222
lines changed

Some content is hidden

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

283 files changed

+39548
-9222
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-go.yml renamed to .github/workflows/build-and-test-go.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
name: build-go-projects
22

33
on:
4-
merge_group:
54
push:
65
branches: [main]
76
pull_request:
@@ -23,17 +22,20 @@ jobs:
2322
- uses: actions/checkout@v4
2423
- uses: actions/setup-go@v5
2524
with:
26-
go-version: "1.22"
25+
go-version: "1.23"
2726
cache: false
2827
- name: Build SP1 bindings
2928
run: make build_sp1_linux
29+
- name: Build Old SP1 bindings
30+
run: make build_sp1_linux_old
3031
- name: Build Risc Zero go bindings
3132
run: make build_risc_zero_linux
33+
- name: Build Old Risc Zero go bindings
34+
run: make build_risc_zero_linux_old
3235
- name: Build Merkle Tree bindings
3336
run: make build_merkle_tree_linux
34-
- name: Build Old Merkle Tree bindings
35-
run: make build_merkle_tree_linux_old
3637
- name: Build operator
3738
run: go build operator/cmd/main.go
3839
- name: Build aggregator
3940
run: go build aggregator/cmd/main.go
41+

‎.github/workflows/build-and-test-rust.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
name: build-and-test-rust-projects
22

33
on:
4-
merge_group:
54
push:
65
branches: [main]
76
pull_request:
@@ -47,11 +46,13 @@ jobs:
4746
cargo build --all
4847
4948
test:
50-
runs-on: ubuntu-latest
49+
runs-on: aligned-runner
5150
needs: build
5251
steps:
5352
- name: Checkout code
5453
uses: actions/checkout@v4
54+
- name: foundry-toolchain
55+
uses: foundry-rs/[email protected]
5556
- name: Cache Rust dependencies
5657
uses: actions/cache@v3
5758
with:

‎.github/workflows/send-proofs-docker.yml‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
name: "[CI] Send proofs to network"
2+
3+
on:
4+
merge_group:
5+
pull_request:
6+
types:
7+
- opened
8+
- synchronize
9+
paths-ignore:
10+
- '**.md'
11+
12+
concurrency:
13+
group: pull_request-${{ github.event.pull_request.number }}
14+
cancel-in-progress: true
15+
16+
jobs:
17+
network-test-docker-compose:
18+
name: "Test network with Docker Compose"
19+
runs-on: aligned-runner-ci
20+
permissions:
21+
contents: read
22+
packages: write
23+
pull-requests: write
24+
25+
steps:
26+
- name: Log in to GitHub Container Registry
27+
uses: docker/login-action@v3
28+
with:
29+
registry: ghcr.io
30+
username: ${{ github.actor }}
31+
password: ${{ secrets.GITHUB_TOKEN }}
32+
33+
- name: Checkout
34+
uses: actions/checkout@v4
35+
with:
36+
submodules: recursive
37+
38+
- name: Build containers
39+
run: make docker_build
40+
41+
- name: Start containers and initialize network
42+
run: make docker_up && sleep 15
43+
44+
- name: Send proofs batches
45+
run: make docker_batcher_send_all_proofs_burst
46+
47+
- name: Verify all sent proofs
48+
run: make docker_verify_proof_submission_success
49+
50+
- name: Stop containers
51+
continue-on-error: true
52+
if: always()
53+
run: make docker_down
54+
55+
- name: Ensure admin permissions in _work
56+
if: always()
57+
run: sudo chown admin:admin -R /home/admin/actions-runner/_work/

‎.github/workflows/test-merkle-tree.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
name: test-merkle-tree
22

33
on:
4-
merge_group:
54
push:
65
branches: [main]
76
pull_request:

‎.github/workflows/test-risc-zero-old.yml‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
name: test-risc-zero-old
2+
3+
on:
4+
push:
5+
branches: [main]
6+
pull_request:
7+
branches: ["*"]
8+
paths:
9+
- "operator/risc_zero_old/**"
10+
- ".github/workflows/test-risc-zero-old.yml"
11+
12+
jobs:
13+
test:
14+
runs-on: ubuntu-latest
15+
steps:
16+
- name: Clear device space
17+
run: |
18+
sudo rm -rf "$AGENT_TOOLSDIRECTORY"
19+
sudo rm -rf /usr/local/lib/android
20+
sudo rm -rf /opt/ghc
21+
sudo rm -rf /usr/local/.ghcup
22+
sudo rm -rf /usr/share/dotnet
23+
sudo rm -rf /opt/ghc
24+
sudo rm -rf "/usr/local/share/boost"
25+
- uses: actions/checkout@v4
26+
- uses: actions/setup-go@v5
27+
with:
28+
go-version: "1.23"
29+
cache: false
30+
- uses: actions-rs/toolchain@v1
31+
with:
32+
toolchain: stable
33+
- name: Test Old Risc Zero Rust
34+
run: make test_risc_zero_rust_ffi_old
35+
- name: Test Old Risc Zero go bindings
36+
run: make test_risc_zero_go_bindings_linux_old

‎.github/workflows/test-risc-zero.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
name: test-risc-zero
22

33
on:
4-
merge_group:
54
push:
65
branches: [main]
76
pull_request:
@@ -26,7 +25,7 @@ jobs:
2625
- uses: actions/checkout@v4
2726
- uses: actions/setup-go@v5
2827
with:
29-
go-version: "1.22"
28+
go-version: "1.23"
3029
cache: false
3130
- uses: actions-rs/toolchain@v1
3231
with:

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

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

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
name: test-sp1
22

33
on:
4-
merge_group:
54
push:
65
branches: [main]
76
pull_request:

0 commit comments

Comments
 (0)