Skip to content

Commit b977c25

Browse files
committed
Merge branch 'staging' into 1314-fix-sender-receive-batchinclusiondata-or-createnewtaskerror-in-validityresponsemessage
2 parents 42ec9f0 + 34343f0 commit b977c25

File tree

129 files changed

+31281
-5949
lines changed

Some content is hidden

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

129 files changed

+31281
-5949
lines changed

.dockerignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ volume
1111
nonce_*.bin
1212
docker-compose.yaml
1313
.github/**
14-
**.md
14+
**.md

.github/pull_request_template.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ Please delete options that are not relevant.
1414
- [ ] Refactor
1515

1616
## Checklist
17+
18+
- [ ] “Hotfix” to `testnet`, everything else to `staging`
1719
- [ ] Linked to Github Issue
1820
- [ ] This change depends on code or research by an external entity
1921
- [ ] Acknowledgements were updated to give credit
@@ -24,3 +26,6 @@ Please delete options that are not relevant.
2426
- [ ] Benchmarks added/run
2527
- [ ] Has a known issue
2628
- [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 & 1 deletion
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:
@@ -27,8 +26,12 @@ jobs:
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
3437
- name: Build operator

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

Lines changed: 2 additions & 1 deletion
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:
@@ -52,6 +51,8 @@ jobs:
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: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: "[CI] Send proofs to network"
22

33
on:
4+
merge_group:
45
pull_request:
56
types:
67
- opened
@@ -23,7 +24,7 @@ jobs:
2324

2425
steps:
2526
- name: Log in to GitHub Container Registry
26-
uses: docker/login-action@v2
27+
uses: docker/login-action@v3
2728
with:
2829
registry: ghcr.io
2930
username: ${{ github.actor }}

.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:
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.22"
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: 0 additions & 1 deletion
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:

.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)