Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update kzgbn254 function to work with eigenDA encoded blobs #2

Merged
merged 26 commits into from
Jun 5, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
047d4f7
Squash all commits on branch afk/IFFTClient
afkbyte Jun 4, 2024
c25e017
readd system test changes
afkbyte Jun 4, 2024
8b14808
checkout other changes from develop
afkbyte Jun 4, 2024
bd9cd0b
readd kzgbn254 submodule
afkbyte Jun 4, 2024
1451018
remove commented out previous hashes
afkbyte Jun 4, 2024
c99c50d
remove remaining prints in kzgbn254
afkbyte Jun 4, 2024
bde4565
bump submodule references back to develop branch
afkbyte Jun 4, 2024
ece9f22
address rust stylistic issues
afkbyte Jun 4, 2024
c505a1e
removed commented out previous script in create preimages python file
afkbyte Jun 4, 2024
028802a
remove remaining unwraps
afkbyte Jun 4, 2024
5d5f944
fix jit build
afkbyte Jun 4, 2024
453d3a1
update bn254-kzg library
epociask Jun 5, 2024
7eb16a5
update bn254-kzg library and comment out failing test
epociask Jun 5, 2024
ec9f45f
temporarily disable linting
epociask Jun 5, 2024
32f044a
update challenge test to use rollup manager & update arbitrator tests…
epociask Jun 5, 2024
8e22f4e
cargo fmt
epociask Jun 5, 2024
90b56ca
temporarily disable rust fmt
epociask Jun 5, 2024
1b93fad
update contracts dependency
epociask Jun 5, 2024
28935e5
remove access list assertion from read inbox sequencer test
epociask Jun 5, 2024
0baede6
overload preimage oracle to use SHA256 hashes for EigenDA preimage types
epociask Jun 5, 2024
27d1637
fix bug in IsEigenDAMessageHeaderByte
epociask Jun 5, 2024
9583a90
rebase replay script to origin
epociask Jun 5, 2024
aa2c474
update replay script to not use eigenDA and update IsEigenDAMessageHe…
epociask Jun 5, 2024
4d0dfac
prove commitment to the preimage data instead of the eigenDA one
afkbyte Jun 5, 2024
9ba0f51
push to working contracts commit
afkbyte Jun 5, 2024
517e417
update contracts to use rollup manager changes in addition to proof fix
epociask Jun 5, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Loading