Skip to content

Commit

Permalink
Squash all commits on branch afk/IFFTClient
Browse files Browse the repository at this point in the history
  • Loading branch information
afkbyte committed Jun 4, 2024
1 parent 27872d9 commit 047d4f7
Show file tree
Hide file tree
Showing 28 changed files with 1,046 additions and 984 deletions.
11 changes: 4 additions & 7 deletions .github/workflows/arbitrator-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,12 @@ env:
jobs:
arbitrator:
name: Run Arbitrator tests
runs-on: linux-2xl
runs-on: ubuntu-8
steps:
- name: Checkout
uses: actions/checkout@v4
with:
submodules: recursive
ssh-key: ${{ secrets.SSH_KEY }}


- name: Install Ubuntu dependencies
run: |
Expand Down Expand Up @@ -139,10 +137,9 @@ jobs:

- name: Make arbitrator libraries
run: make -j wasm-ci-build

# TODO: Enable clippy check
# - name: Clippy check
# run: cargo clippy --all --manifest-path arbitrator/Cargo.toml -- -D warnings

- name: Clippy check
run: cargo clippy --all --manifest-path arbitrator/Cargo.toml -- -D warnings

- name: Run rust tests
run: cargo test --all --manifest-path arbitrator/Cargo.toml
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/arbitrator-skip-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ on:
jobs:
arbitrator:
name: Run Arbitrator tests
runs-on: linux-2xl
runs-on: ubuntu-latest
steps:
- name: Do nothing
run: echo "doing nothing"
3 changes: 1 addition & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:
jobs:
test:
name: Go Tests
runs-on: linux-2xl
runs-on: ubuntu-8

# Creates a redis container for redis tests
services:
Expand All @@ -32,7 +32,6 @@ jobs:
uses: actions/checkout@v4
with:
submodules: true
ssh-key: ${{ secrets.SSH_KEY }}

- name: Install dependencies
run: sudo apt update && sudo apt install -y wabt gotestsum
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ on:
jobs:
analyze:
name: Analyze
if: github.repository == 'Layr-Labs/nitro' # don't run in any forks without "Advanced Security" enabled
runs-on: linux-2xl
if: github.repository == 'OffchainLabs/nitro' # don't run in any forks without "Advanced Security" enabled
runs-on: ubuntu-8
permissions:
actions: read
contents: read
Expand All @@ -46,7 +46,6 @@ jobs:
uses: actions/checkout@v4
with:
submodules: true
ssh-key: ${{ secrets.SSH_KEY }}

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker-eigenda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:

jobs:
docker:
runs-on: linux-2xl
runs-on: ubuntu-latest
strategy:
matrix:
include:
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:
jobs:
docker:
name: Docker build
runs-on: linux-2xl
runs-on: ubuntu-8
services:
# local registery
registry:
Expand All @@ -26,7 +26,6 @@ jobs:
uses: actions/checkout@v4
with:
submodules: recursive
ssh-key: ${{ secrets.SSH_KEY }}

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:

jobs:
build_and_run:
runs-on: linux-2xl
runs-on: ubuntu-8

steps:
- name: Checkout
Expand Down
6 changes: 2 additions & 4 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,8 @@
[submodule "contracts"]
path = contracts
url = [email protected]:Layr-Labs/nitro-contracts-private.git
branch = develop
[submodule "nitro-testnode"]
path = nitro-testnode
url = [email protected]:Layr-Labs/nitro-testnode-private.git
[submodule "arbitrator/rust-kzg-bn254"]
path = arbitrator/rust-kzg-bn254
url = https://github.com/Layr-Labs/rust-kzg-bn254.git
branch = epociask--better-linting
branch = develop
7 changes: 0 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,7 @@ RUN apt-get install -y clang=1:14.0-55.7~deb12u1 lld=1:14.0-55.7~deb12u1
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.70.0 --target x86_64-unknown-linux-gnu wasm32-unknown-unknown wasm32-wasi
COPY ./Makefile ./
COPY arbitrator/arbutil arbitrator/arbutil
COPY arbitrator/rust-kzg-bn254 arbitrator/rust-kzg-bn254
COPY arbitrator/wasm-libraries arbitrator/wasm-libraries

COPY --from=brotli-wasm-export / target/
RUN . ~/.cargo/env && NITRO_BUILD_IGNORE_TIMESTAMPS=1 RUSTFLAGS='-C symbol-mangling-version=v0' make build-wasm-libs

Expand Down Expand Up @@ -96,7 +94,6 @@ COPY ./Makefile ./
COPY arbitrator/arbutil arbitrator/arbutil
COPY arbitrator/prover arbitrator/prover
COPY arbitrator/jit arbitrator/jit
COPY arbitrator/rust-kzg-bn254 arbitrator/rust-kzg-bn254
RUN NITRO_BUILD_IGNORE_TIMESTAMPS=1 make build-prover-header

FROM scratch as prover-header-export
Expand All @@ -112,8 +109,6 @@ COPY arbitrator/Cargo.* arbitrator/
COPY arbitrator/arbutil arbitrator/arbutil
COPY arbitrator/prover/Cargo.toml arbitrator/prover/
COPY arbitrator/jit/Cargo.toml arbitrator/jit/
COPY arbitrator/rust-kzg-bn254 arbitrator/rust-kzg-bn254

RUN mkdir arbitrator/prover/src arbitrator/jit/src && \
echo "fn test() {}" > arbitrator/jit/src/lib.rs && \
echo "fn test() {}" > arbitrator/prover/src/lib.rs && \
Expand All @@ -122,8 +117,6 @@ RUN mkdir arbitrator/prover/src arbitrator/jit/src && \
COPY ./Makefile ./
COPY arbitrator/prover arbitrator/prover
COPY arbitrator/jit arbitrator/jit
COPY arbitrator/rust-kzg-bn254 arbitrator/rust-kzg-bn254

COPY --from=brotli-library-export / target/
RUN touch -a -m arbitrator/prover/src/lib.rs
RUN NITRO_BUILD_IGNORE_TIMESTAMPS=1 make build-prover-lib
Expand Down
Loading

0 comments on commit 047d4f7

Please sign in to comment.