Skip to content

Commit

Permalink
chore: rename client programs (#85)
Browse files Browse the repository at this point in the history
* feat: rename client programs

* get rid of rustfmt

* fix

---------

Co-authored-by: Ubuntu <ubuntu@op-mainnet-archive-1.maas>
  • Loading branch information
jtguibas and Ubuntu authored Aug 30, 2024
1 parent 2b5c98c commit 5895a14
Show file tree
Hide file tree
Showing 17 changed files with 34 additions and 23 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/compile.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
uses: actions/checkout@v3
- name: Compile the fault proof program
run: cargo build --profile release-client-lto
working-directory: client-programs/fault-proof
working-directory: programs/fault-proof
- name: Compile the range program
run: cargo build --profile release-client-lto
working-directory: client-programs/range
working-directory: programs/range
26 changes: 26 additions & 0 deletions .github/workflows/docker_compose_test.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Docker Compose Test

on:
pull_request:
branches:
- main
push:
branches:
- main

jobs:
docker-compose-test:
name: Docker Compose Test
runs-on:
- runs-on
- runner=64cpu-linux-x64
- run-id=${{ github.run_id }}
steps:
- uses: actions/checkout@v4

- name: Set up Docker Compose
uses: docker/setup-buildx-action@v1

- name: Build Docker Compose setup
run: |
docker compose build
15 changes: 0 additions & 15 deletions .github/workflows/op_proposer.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,18 +33,3 @@ jobs:
L2_NODE_RPC: ${{ secrets.L2_NODE_RPC }}
L1_RPC: ${{ secrets.L1_RPC }}
L1_BEACON_RPC: ${{ secrets.L1_BEACON_RPC }}
docker-compose-test:
name: Docker Compose Test
runs-on:
- runs-on
- runner=64cpu-linux-x64
- run-id=${{ github.run_id }}
steps:
- uses: actions/checkout@v4

- name: Set up Docker Compose
uses: docker/setup-buildx-action@v1

- name: Build Docker Compose setup
run: |
docker compose build
2 changes: 1 addition & 1 deletion .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
- "**"
paths:
- "crates/**"
- "client-programs/**"
- "programs/**"
- "native-host/**"
- "zkvm-host/**"
- "op-succinct-proposer/**"
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[workspace]
members = [
"client-programs/*",
"programs/*",
"crates/*",
"native-host",
"zkvm-host",
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Standalone repo to use Kona & SP1 to verify OP Stack blocks.
**`op-succinct`**
- `native-host`: The host program which runs the `op-succinct` program natively using `kona`.
- `zkvm-host`: The host program which runs the `op-succinct` program in the SP1 zkVM.
- `client-programs`: The programs proven in SP1.
- `programs`: The programs proven in SP1.
- `fault-proof` and `range` are used to verifiably derive and execute single blocks
and batches of blocks respectively. Their binary's are first run in native mode on the `kona-host` to
fetch the witness data, then they use SP1 to verifiably execute the program.
Expand Down
2 changes: 1 addition & 1 deletion op-succinct-proposer/Dockerfile.server
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ COPY op-succinct-proposer ./op-succinct-proposer
COPY native-host ./native-host
COPY elf ./elf
COPY crates ./crates
COPY client-programs ./client-programs
COPY programs ./programs

# Build the server
RUN cargo build --bin server --release
Expand Down
2 changes: 1 addition & 1 deletion op-succinct-proposer/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ fn build_native_host_runner() {
// /// Build a program for the zkVM.
// fn build_zkvm_program(program: &str) {
// build_program_with_args(
// &format!("../client-programs/{}", program),
// &format!("../programs/{}", program),
// BuildArgs {
// elf_name: format!("{}-elf", program),
// // docker: true,
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion zkvm-host/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
// /// Build a program for the zkVM.
// fn build_zkvm_program(program: &str) {
// build_program_with_args(
// &format!("../client-programs/{}", program),
// &format!("../programs/{}", program),
// BuildArgs {
// elf_name: format!("{}-elf", program),
// // docker: true,
Expand Down

0 comments on commit 5895a14

Please sign in to comment.