Skip to content

Commit c411f00

Browse files
uri-99uri-99
committed
Merge branch 'staging' into 515-chore-add-multisig-support-to-upgrade-servicemanager
2 parents 5362dc8 + 0023a7b commit c411f00

File tree

571 files changed

+49636
-20366
lines changed

Some content is hidden

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

571 files changed

+49636
-20366
lines changed

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

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
name: build-and-test-rust-projects
2+
3+
on:
4+
merge_group:
5+
push:
6+
branches: [main]
7+
pull_request:
8+
branches: ["*"]
9+
paths:
10+
- "batcher/**"
11+
- ".github/workflows/build-rust.yml"
12+
13+
jobs:
14+
build:
15+
runs-on: aligned-runner
16+
17+
steps:
18+
- uses: actions/checkout@v4
19+
20+
- name: Set up Rust
21+
uses: actions-rs/toolchain@v1
22+
with:
23+
toolchain: stable
24+
components: rustfmt, clippy
25+
override: true
26+
- name: Cache Rust dependencies
27+
uses: actions/cache@v3
28+
with:
29+
path: |
30+
~/.cargo/registry
31+
~/.cargo/git
32+
batcher/target
33+
key: ${{ runner.os }}-rust-${{ hashFiles('**/Cargo.lock') }}
34+
restore-keys: |
35+
${{ runner.os }}-rust-
36+
- name: Check formatting of Rust projects
37+
run: |
38+
cd batcher
39+
cargo fmt --all -- --check
40+
- name: Run Clippy
41+
run: |
42+
cd batcher
43+
cargo clippy --all -- -D warnings
44+
- name: Build Rust projects
45+
run: |
46+
cd batcher
47+
cargo build --all
48+
49+
test:
50+
runs-on: ubuntu-latest
51+
needs: build
52+
steps:
53+
- name: Checkout code
54+
uses: actions/checkout@v4
55+
- name: Cache Rust dependencies
56+
uses: actions/cache@v3
57+
with:
58+
path: |
59+
~/.cargo/registry
60+
~/.cargo/git
61+
batcher/target
62+
key: ${{ runner.os }}-rust-${{ hashFiles('**/Cargo.lock') }}
63+
restore-keys: |
64+
${{ runner.os }}-rust-
65+
- name: Run tests
66+
run: |
67+
cd batcher
68+
cargo test --all

‎.github/workflows/build-contracts.yml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
name: Build contracts
22
on:
33
push:
4-
branches:
5-
- main
4+
branches: [main]
65
pull_request:
76
branches: ["*"]
7+
paths:
8+
- 'contracts/**'
9+
- 'foundry.toml'
10+
- '.github/workflows/build-contracts.yml'
811

912
jobs:
1013
build:

.github/workflows/build.yml renamed to .github/workflows/build-go.yml

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,29 +6,34 @@ on:
66
branches: [main]
77
pull_request:
88
branches: ["*"]
9+
paths:
10+
- "operator/**"
11+
- "aggregator/**"
12+
- "common/**"
13+
- "core/**"
14+
- "metrics/**"
15+
- ".github/workflows/build-go.yml"
916
env:
1017
FFI_FOR_RELEASE: false
1118
jobs:
1219
build:
1320
runs-on: ubuntu-latest
14-
21+
1522
steps:
1623
- uses: actions/checkout@v4
1724
- uses: actions/setup-go@v5
1825
with:
19-
go-version: '1.22'
26+
go-version: "1.22"
2027
cache: false
2128
- name: Build SP1 bindings
2229
run: make build_sp1_linux
2330
- name: Build Risc Zero go bindings
2431
run: make build_risc_zero_linux
25-
- name: Build Halo2-KZG bindings
26-
run: make build_halo2_kzg_linux
27-
- name: Build Halo2-IPA bindings
28-
run: make build_halo2_ipa_linux
32+
- name: Build Merkle Tree bindings
33+
run: make build_merkle_tree_linux
34+
- name: Build Old Merkle Tree bindings
35+
run: make build_merkle_tree_linux_old
2936
- name: Build operator
3037
run: go build operator/cmd/main.go
3138
- name: Build aggregator
3239
run: go build aggregator/cmd/main.go
33-
- name: Build task sender
34-
run: go build task_sender/cmd/main.go

‎.github/workflows/explorer.yml‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
name: "Deploy Explorer"
2+
3+
on:
4+
workflow_dispatch:
5+
inputs:
6+
environment:
7+
type: environment
8+
description: Select the environment
9+
10+
jobs:
11+
Deploy:
12+
name: Deploy Explorer to ${{ inputs.environment }}
13+
runs-on: ubuntu-latest
14+
environment:
15+
name: ${{ inputs.environment }}
16+
17+
steps:
18+
- name: Connect to Tailscale
19+
uses: tailscale/github-action@v2
20+
with:
21+
oauth-client-id: ${{ secrets.TS_OAUTH_CLIENT_ID }}
22+
oauth-secret: ${{ secrets.TS_OAUTH_SECRET }}
23+
tags: tag:ci
24+
version: 1.70.0
25+
26+
- name: Checkout Repository
27+
uses: actions/checkout@v4
28+
29+
- name: Display Branch Name
30+
env:
31+
REF: ${{ github.ref_name }}
32+
run: |
33+
echo "Current Branch: ${REF}"
34+
35+
- name: Deploy to server
36+
env:
37+
HOST_NAME: ${{ vars.EXPLORER_HOST }}
38+
USERNAME: ${{ vars.USERNAME }}
39+
APP_DIR: ${{ vars.EXPLORER_DIRECTORY }}
40+
SERVICE_NAME: ${{ vars.SERVICE_NAME }}
41+
REF: ${{ github.ref_name }}
42+
run: |
43+
ssh -o "StrictHostKeyChecking=no" ${USERNAME}@${HOST_NAME} "
44+
cd ${APP_DIR} &&
45+
git fetch &&
46+
git reset --hard HEAD &&
47+
git clean -fd &&
48+
git checkout ${REF} &&
49+
git pull &&
50+
sudo systemctl restart ${SERVICE_NAME}
51+
"

‎.github/workflows/golangci-lint.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,13 @@ on:
55
- master
66
- main
77
pull_request:
8+
paths:
9+
- 'operator/**'
10+
- 'aggregator/**'
11+
- 'common/**'
12+
- 'core/**'
13+
- 'metrics/**'
14+
- '.github/workflows/golangci-lint.yml'
815

916
permissions:
1017
contents: read

‎.github/workflows/lint-contracts.yml‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: Lint contracts
2+
on:
3+
push:
4+
branches: [main]
5+
pull_request:
6+
branches: ["*"]
7+
paths:
8+
- "contracts/src/core/*.sol"
9+
- ".github/workflows/lint-contracts.yml"
10+
11+
jobs:
12+
lint:
13+
runs-on: ubuntu-latest
14+
steps:
15+
- name: Checkout code
16+
uses: actions/checkout@v2
17+
18+
- name: Set up Node.js
19+
uses: actions/setup-node@v4
20+
with:
21+
node-version: "20"
22+
23+
- name: Install dependencies
24+
run: npm install
25+
working-directory: contracts
26+
27+
- name: Run Solhint
28+
run: npm run lint:sol
29+
working-directory: contracts

‎.github/workflows/release.yml‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Build and Release Rust Project
1+
name: Build and Release Aligned Client
22

33
on:
44
push:
@@ -7,16 +7,27 @@ on:
77

88
jobs:
99
build:
10-
runs-on: ubuntu-latest
10+
strategy:
11+
matrix:
12+
include:
13+
- os: ubuntu-latest
14+
artifact_name: aligned-x86
15+
- os: macos-latest
16+
artifact_name: aligned-arm64
17+
18+
runs-on: ${{ matrix.os }}
1119

1220
steps:
1321
- name: Checkout repository
1422
uses: actions/checkout@v4
1523

1624
- name: Build batcher client
1725
run: make build_batcher_client
26+
27+
- name: Rename binary
28+
run: mv batcher/target/release/aligned ${{ matrix.artifact_name }}
1829

1930
- name: Release
2031
uses: softprops/action-gh-release@v2
2132
with:
22-
files: batcher/client/target/release/aligned
33+
files: ${{ matrix.artifact_name }}

‎.github/workflows/test-halo2-kzg.yml‎

Lines changed: 0 additions & 30 deletions
This file was deleted.

.github/workflows/test-halo2-ipa.yml renamed to .github/workflows/test-merkle-tree.yml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
1-
name: test-halo2-ipa
1+
name: test-merkle-tree
22

33
on:
44
merge_group:
55
push:
66
branches: [main]
77
pull_request:
88
branches: ["*"]
9+
paths:
10+
- 'operator/merkle_tree/**'
11+
- '.github/workflows/test-merkle-tree.yml'
912

1013
jobs:
1114
test:
@@ -25,6 +28,10 @@ jobs:
2528
with:
2629
go-version: '1.22'
2730
cache: false
28-
29-
- name: Test Halo2-IPA go bindings
30-
run: make test_halo2_ipa_go_bindings_linux
31+
- uses: actions-rs/toolchain@v1
32+
with:
33+
toolchain: stable
34+
- name: Test Merkle Tree Rust
35+
run: make test_merkle_tree_rust_ffi
36+
- name: Test Merkle Tree go bindings
37+
run: make test_merkle_tree_go_bindings_linux

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

Lines changed: 27 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,32 @@ on:
66
branches: [main]
77
pull_request:
88
branches: ["*"]
9+
paths:
10+
- "operator/risc_zero/**"
11+
- ".github/workflows/test-risc-zero.yml"
912

1013
jobs:
11-
test:
12-
runs-on: ubuntu-latest
13-
steps:
14-
- name: Clear device space
15-
run: |
16-
sudo rm -rf "$AGENT_TOOLSDIRECTORY"
17-
sudo rm -rf /usr/local/lib/android
18-
sudo rm -rf /opt/ghc
19-
sudo rm -rf /usr/local/.ghcup
20-
sudo rm -rf /usr/share/dotnet
21-
sudo rm -rf /opt/ghc
22-
sudo rm -rf "/usr/local/share/boost"
23-
- uses: actions/checkout@v4
24-
- uses: actions/setup-go@v5
25-
with:
26-
go-version: '1.22'
27-
cache: false
28-
29-
- name: Test Risc Zero go bindings
30-
run: make test_risc_zero_go_bindings_linux
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 Risc Zero Rust
35+
run: make test_risc_zero_rust_ffi
36+
- name: Test Risc Zero go bindings
37+
run: make test_risc_zero_go_bindings_linux

0 commit comments

Comments
 (0)