Skip to content

Commit 30a5f24

Browse files
committed
Merge branch '311-aggregator-wait-for-receipt-for-1-minute-if-not-bump-the-fee-v2' into test-aggregator-bump-fee
2 parents 194b9c9 + 8e10a7e commit 30a5f24

File tree

103 files changed

+14998
-4405
lines changed

Some content is hidden

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

103 files changed

+14998
-4405
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: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
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+
- [ ] Linked to Github Issue
18+
- [ ] This change depends on code or research by an external entity
19+
- [ ] Acknowledgements were updated to give credit
20+
- [ ] Unit tests added
21+
- [ ] This change requires new documentation.
22+
- [ ] Documentation has been added/updated.
23+
- [ ] This change is an Optimization
24+
- [ ] Benchmarks added/run
25+
- [ ] Has a known issue
26+
- [Link to the open issue addressing it]()
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,4 @@ jobs:
3535
run: go build operator/cmd/main.go
3636
- name: Build aggregator
3737
run: go build aggregator/cmd/main.go
38+

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
cargo build --all
4848
4949
test:
50-
runs-on: ubuntu-latest
50+
runs-on: aligned-runner
5151
needs: build
5252
steps:
5353
- name: Checkout code
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/

0 commit comments

Comments
 (0)