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

NItro x EigenDA v3.0.3 #17

Closed
wants to merge 172 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
172 commits
Select commit Hold shift + click to select a range
83279f6
Squashed Orbit Progress Commit
afkbyte Apr 6, 2024
794b799
fix(arbitrator): Rebased and updated kzg-bn254 dependencies
epociask May 29, 2024
332c9e0
Merge pull request #3 from Layr-Labs/epociask--fix-jit-compilation-bug
epociask May 29, 2024
d14b0cc
feat(CI): Fix runner pickup failure
epociask May 30, 2024
1565ee6
feat(CI): Add secret env var
epociask May 30, 2024
59aaf9b
feat(CI): Add ssh inputs for failing CI workflows
epociask May 30, 2024
fd1f369
feat(CI): Fix arbitrator compile err
epociask May 30, 2024
ce36742
feat(CI): revert arbitrator change
epociask May 30, 2024
68be441
fix(docker): Fix bugs causing docker builds to fail
epociask May 31, 2024
6ab8d26
fix(docker): Fix bugs causing docker builds to fail - update .gitmodule
epociask May 31, 2024
13aa1d5
fix(docker): Fix bugs causing docker builds to fail - update submodules
epociask May 31, 2024
9915c46
fix(docker): Fix bugs causing docker builds to fail - update submodules
epociask May 31, 2024
7262e1c
fix(docker): Fix bugs causing docker builds to fail - update contract…
epociask May 31, 2024
5af7509
Merge pull request #5 from Layr-Labs/epociask--fixed-testnode-builds
epociask May 31, 2024
4620e82
feat(CI): Fix clippy fmt issues
epociask May 31, 2024
6694c0d
feat(CI): Fix merge conflicts
epociask May 31, 2024
260f088
feat(CI): Update .gitmodules
epociask May 31, 2024
706ca43
feat(CI): Fix clippy
epociask May 31, 2024
6de0953
feat(CI): suppress warning
epociask May 31, 2024
695eee1
feat(CI): rm clippy check && update contracts submodule
epociask May 31, 2024
788e358
feat(CI): upgrade to 2xl runer
epociask May 31, 2024
6fd62bc
feat(CI): fix mockgen
epociask May 31, 2024
9769cc2
feat(CI): fix go mod issue
epociask Jun 1, 2024
06d793a
feat(CI): fix gosec lint issue and update rust-kzg-bn254 dependency t…
epociask Jun 2, 2024
f891162
Delete latest
epociask Jun 3, 2024
27872d9
Merge pull request #4 from Layr-Labs/epociask--fix-ci
epociask Jun 3, 2024
a6dcc88
update kzgbn254 function to work with eigenDA encoded blobs (#2)
afkbyte Jun 5, 2024
2c0d205
start fresh
afkbyte Jun 8, 2024
670432b
try to parse with abi
afkbyte Jun 8, 2024
cd78e91
parsing correctly with the abi decoder now! Bringing other changes ba…
afkbyte Jun 8, 2024
3671179
remove commented out code
afkbyte Jun 8, 2024
ddb75c4
update typo in hash
afkbyte Jun 9, 2024
11b2f7f
brought in historical changes
afkbyte Jun 9, 2024
7c7dcf5
brought in replay script changes
afkbyte Jun 9, 2024
0b37bb8
bring in eigenDA ref to the replay script
afkbyte Jun 9, 2024
48faf73
added all changes
afkbyte Jun 9, 2024
f2a8af7
update inbox multiplexer
afkbyte Jun 9, 2024
6e8489a
modify eigenda file path
afkbyte Jun 10, 2024
fc12d81
add more informative logs
afkbyte Jun 10, 2024
c1f70c2
change no EigenDA configured to a log level error, follow same patter…
afkbyte Jun 10, 2024
616d94a
change to string
afkbyte Jun 10, 2024
77922bf
differentiate between derivation pipeline and fraud proof preimages
afkbyte Jun 10, 2024
acbfdec
bump nitro testnode commit
afkbyte Jun 10, 2024
98231af
modified put and get to be synchronus and blocking
afkbyte Jun 10, 2024
db2f388
fix(batch_poster): Fix cert decoding
epociask Jun 26, 2024
e7adb68
fix(batch_poster): Fix cert decoding - update contracts and sequencer…
epociask Jun 28, 2024
2d3f067
fix(batch_poster): Fix cert decoding - fix sequencer inbox posting an…
epociask Jul 1, 2024
42db7ac
fix(batch_poster): Fix cert decoding - remove debug files
epociask Jul 1, 2024
96e0f74
fix: Updated contracts to better align with nitro deploy tooling and …
epociask Jul 2, 2024
6d2a016
refactors and minor tweaks
epociask Jul 3, 2024
ebac5bc
update go.mod and submodules
epociask Jul 3, 2024
3ab6f9b
update go.mod and submodules
epociask Jul 3, 2024
363ec7e
fix batch header hash calculation bug
epociask Jul 3, 2024
2c02a8a
remove dbug stmts && update system tests
epociask Jul 3, 2024
35b2cae
fix challenge test construction
epociask Jul 3, 2024
104aea9
fix challenge test construction
epociask Jul 3, 2024
fce0728
remove rollup manager dep
epociask Jul 3, 2024
c6ec1ef
patch CI bug
epociask Jul 3, 2024
a1cc5d6
update contracts submodule
epociask Jul 3, 2024
385781b
update contracts submodule
epociask Jul 3, 2024
a5ef13c
update gen.go to dump files being read for yul binding generation
epociask Jul 3, 2024
81b1755
update gen.go to dump files being read for yul binding generation
epociask Jul 3, 2024
d609a90
only generate yul artifacts for 4844 reader
epociask Jul 3, 2024
a818fc9
update contracts submodule
epociask Jul 4, 2024
21651dc
update contracts submodule
epociask Jul 4, 2024
62115da
pull in changes, this is broken
epociask Jul 8, 2024
829a687
refactor to get batch submission/derivation working
epociask Jul 8, 2024
08b9418
fix merge conflicts again
epociask Jul 10, 2024
3132c0f
Nitro x EigenDA V3.0.3 Support
epociask Jul 10, 2024
2e48b9a
remove dbug stmts
epociask Jul 10, 2024
4632538
rm regression in .gitmodules
epociask Jul 10, 2024
72fc58f
EigenDA x Nitro V3.0.3
epociask Jul 11, 2024
dee0a43
cleanup debug stmts
epociask Jul 12, 2024
a4535fe
disable clippy and cargo fmt arbitrator changes
epociask Jul 12, 2024
e229225
fix offset bug
epociask Jul 12, 2024
dc28ea4
cargo fmt
epociask Jul 12, 2024
01ff965
EigenDA x Nitro V3.0.3 - fixed preimage offset bug
epociask Jul 13, 2024
a3e8ffd
EigenDA x Nitro V3.0.3 - cargo fmt
epociask Jul 14, 2024
86d1e71
EigenDA x Nitro V3.0.3 - update eigenda proof generation to encode pr…
epociask Jul 16, 2024
fbb314a
EigenDA x Nitro V3.0.3 - fix proof generation bug in host-io.rs && re…
epociask Jul 16, 2024
42cd886
EigenDA x Nitro V3.0.3 - cargo fmt
epociask Jul 16, 2024
8471af8
Nitro x EigenDA V3.0.3 Support - update batcher posting/derivation to…
epociask Jul 18, 2024
3c2f899
EigenDA x Nitro V3.0.3 - bring back OSP test script changes
epociask Jul 18, 2024
d1f136c
EigenDA x Nitro V3.0.3 - update /eigenda tests
epociask Jul 19, 2024
0ae030b
use mainnet srs
Jul 19, 2024
65ec5d2
add a missing file
Jul 19, 2024
7fb28cf
fix rust fmt
Jul 19, 2024
6991628
changes to remove unwanted calculations
Jul 28, 2024
7c4adb6
adding missing check when proving past end
Jul 28, 2024
d80e544
Merge pull request #18 from Layr-Labs/switch-srs-to-mainnet-srs
epociask Jul 30, 2024
5e896fb
cargo fmt formatted
Aug 2, 2024
2551da6
adding missing check
Aug 2, 2024
45de063
unused import apparently?
Aug 2, 2024
4f4cd78
removing the check
Aug 2, 2024
6fd5454
fix: Compute EigenDA preimage hash using preimage length
epociask Aug 2, 2024
4a90ddd
fix: CI Environment
epociask Aug 5, 2024
fb316e8
fix: CI Environment - revert runner & use different toolchain
epociask Aug 5, 2024
2980742
Merge pull request #21 from Layr-Labs/epociask--fix-ci
epociask Aug 5, 2024
75ea368
feat: Support larger batch sizes for EigenDA
epociask Aug 7, 2024
8100d53
feat: Support larger batch sizes for EigenDA - update code comments
epociask Aug 7, 2024
7ee4b50
feat: Support larger batch sizes for EigenDA - rm code comment
epociask Aug 7, 2024
28499b0
Merge branch 'eigenda-v3.0.3' into fixing-proof-calculation
Aug 8, 2024
cb69b6d
removing unwanted comments
Aug 8, 2024
5b37117
Merge pull request #22 from Layr-Labs/epociask--larger-batches
epociask Aug 8, 2024
7fe62ad
moving from eval to coeff based on discussion
Aug 8, 2024
eaceba5
remaining changes to arbitrator
Aug 8, 2024
fedcfbb
changing submodules for testing
Aug 8, 2024
679f60f
rust fmt fix
Aug 9, 2024
d5d1c0f
fix: SSH into docker action runner
epociask Aug 12, 2024
a8e0db3
fix: SSH into docker action runner - change positioning of ssh entryp…
epociask Aug 12, 2024
808621b
fix: bump testnode
epociask Aug 12, 2024
84a7b8a
fix: bump testnode
epociask Aug 12, 2024
a4d3313
Merge pull request #27 from Layr-Labs/epociask--fix-enable-runner-ssh
epociask Aug 12, 2024
97167df
fix: uncomment previously failing arbitrator test_crate test
hopeyen Aug 8, 2024
713c6d5
chore: rebase nitro-testnode
hopeyen Aug 12, 2024
279c119
fix: refactor to make linter happy with EigenDAConfig
hopeyen Aug 9, 2024
eaddb0e
fix: happy golangci-lint
hopeyen Aug 9, 2024
7b7729c
refactor: bubble DA init error, offset constant
hopeyen Aug 12, 2024
3339476
chore: Open Source
epociask Aug 13, 2024
28560ba
chore: Open Source
epociask Aug 13, 2024
68e650d
chore: Open Source - bump testnode
epociask Aug 13, 2024
1840e50
chore: Open Source - update gitmodules
epociask Aug 13, 2024
58ec370
chore: EigenDA E2E test
epociask Aug 13, 2024
5663457
chore: EigenDA E2E test - bump contracts submodule
epociask Aug 13, 2024
ffc2790
chore: Open Source - testing docker build
epociask Aug 13, 2024
35a9b31
chore: Open Source - bump testnode
epociask Aug 13, 2024
dda4c51
chore: EigenDA E2E test - lint
epociask Aug 13, 2024
d89a99a
chore: EigenDA E2E test - update CI
epociask Aug 13, 2024
ac0095f
chore: EigenDA E2E test - update script perms
epociask Aug 13, 2024
2aa9105
chore: EigenDA E2E test - update script memstore persistence
epociask Aug 13, 2024
e655c8d
Merge pull request #24 from Layr-Labs/hope/uncomment-test-crate
epociask Aug 13, 2024
cd7b3b8
adding keccak hasing
Aug 13, 2024
9f798b4
Merge branch 'eigenda-v3.0.3' into fixing-proof-calculation
Aug 13, 2024
6cc98d6
chore: Open Source - update testnode
epociask Aug 13, 2024
38920de
cleanup
Aug 13, 2024
4f96110
using keccak hash instead of sha256. Removing 0x01 first byte set
Aug 13, 2024
ca330fc
Merge pull request #30 from Layr-Labs/epociask--chore-open-source
epociask Aug 13, 2024
1b6043b
cargo fmt and removing unwanted println
Aug 13, 2024
30f3a14
Merge pull request #31 from Layr-Labs/epociask--chore-eigenda-e2e-test
epociask Aug 13, 2024
ceb177b
Merge branch 'eigenda-v3.0.3' into fixing-proof-calculation
anupsv Aug 13, 2024
e64ad57
pointing to custom branch
Aug 13, 2024
fdc5e39
submodules chnages
Aug 13, 2024
d1a77ba
changing hash commit
Aug 14, 2024
7236bfe
linting issue
Aug 14, 2024
fe3b113
Merge pull request #19 from Layr-Labs/fixing-proof-calculation
epociask Aug 14, 2024
2e1e27f
Merge branch 'eigenda-v3.0.3' of github.com:Layr-Labs/nitro into epoc…
epociask Aug 14, 2024
5406645
fix: Compute EigenDA preimage hash using preimage length - refactors …
epociask Aug 14, 2024
0d0bde1
fix: Compute EigenDA preimage hash using preimage length - refactors …
epociask Aug 14, 2024
cbcb177
fix: Compute EigenDA preimage hash using preimage length - rust fmt
epociask Aug 14, 2024
fc4808c
fix: Compute EigenDA preimage hash using preimage length - go fmt
epociask Aug 15, 2024
bfd2b0a
fix: Compute EigenDA preimage hash using preimage length - go critic fix
epociask Aug 15, 2024
73a2a22
fix: EigenDA challenge test
epociask Aug 15, 2024
35ddd66
fix: EigenDA challenge test - rm files
epociask Aug 15, 2024
80db0f0
fix: EigenDA challenge test - fix all bugs, things work but ethereum …
epociask Aug 17, 2024
856caff
fix: EigenDA challenge test - refactors & updated hash used for arbit…
epociask Aug 18, 2024
914a0e3
fix: EigenDA challenge test - update submodules
epociask Aug 18, 2024
53d0159
fix: update contracts submodule
epociask Aug 19, 2024
5b5333c
fix: EigenDA challenge test - update gitmodules
epociask Aug 19, 2024
bc56b6b
fix: EigenDA challenge test - upterm to dbug
epociask Aug 19, 2024
9cc79a1
fix: bump go-ethereum
epociask Aug 19, 2024
ef7b36d
fix: rm upterm
epociask Aug 19, 2024
caa0a51
fix: updated challenge test timeout
epociask Aug 19, 2024
480f000
fix: updated CI
epociask Aug 19, 2024
1518a52
Merge pull request #32 from Layr-Labs/epociask--eigenda-challenge-test
epociask Aug 23, 2024
c963211
update docker build
epociask Aug 23, 2024
4f11f07
update docker build
epociask Aug 23, 2024
f4a530d
update Dockerfile to ignore core arbitrum wavm machines
epociask Aug 28, 2024
7d39d96
use buildx cache
epociask Aug 28, 2024
241651c
update docker build workflow to used cached artifacts
epociask Aug 28, 2024
98a0b3f
update docker build workflow
epociask Aug 29, 2024
a7777e8
update docker build workflow
epociask Aug 29, 2024
8b4f4ce
target nitro node dev
epociask Aug 29, 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
7 changes: 4 additions & 3 deletions .github/workflows/arbitrator-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ env:
jobs:
arbitrator:
name: Run Arbitrator tests
runs-on: ubuntu-8
runs-on: linux-2xl
steps:
- name: Setup tmate session
uses: mxschmitt/action-tmate@v3
Expand All @@ -41,6 +41,7 @@ jobs:
with:
submodules: recursive


- name: Install Ubuntu dependencies
run: |
sudo apt-get update && sudo apt-get install -y \
Expand Down Expand Up @@ -158,8 +159,8 @@ jobs:
- name: Make arbitrator libraries
run: make -j wasm-ci-build STYLUS_NIGHTLY_VER="+nightly-2024-02-04"

- 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
uses: actions-rs/cargo@v1
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: ubuntu-latest
runs-on: linux-2xl
steps:
- name: Do nothing
run: echo "doing nothing"
17 changes: 11 additions & 6 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: ubuntu-8
runs-on: linux-2xl

# Creates a redis container for redis tests
services:
Expand Down Expand Up @@ -66,15 +66,17 @@ jobs:
id: install-rust-nightly
with:
profile: minimal
toolchain: "nightly"

toolchain: "nightly-2024-07-30"
- name: Install rust wasm targets
run: rustup target add wasm32-wasi wasm32-unknown-unknown

- name: Install nightly wasm targets
run: |
rustup component add rust-src --toolchain nightly
rustup target add wasm32-unknown-unknown --toolchain nightly
nightly_toolchain='nightly-2024-07-30'
echo 'STYLUS_NIGHTLY_VER=+'"$nightly_toolchain" >> "$GITHUB_ENV"
rustup component add rust-src --toolchain "$nightly_toolchain"
rustup target add wasm32-unknown-unknown --toolchain "$nightly_toolchain"

- name: Cache Build Products
uses: actions/cache@v3
Expand Down Expand Up @@ -141,6 +143,9 @@ jobs:
echo "GOMEMLIMIT=6GiB" >> "$GITHUB_ENV"
echo "GOGC=80" >> "$GITHUB_ENV"

- name: spinup eigenda-proxy
run: ./scripts/start-eigenda-proxy.sh

- name: run tests without race detection
if: matrix.test-mode == 'defaults'
run: |
Expand All @@ -161,7 +166,7 @@ jobs:
if: matrix.test-mode == 'challenge'
run: |
packages=`go list ./...`
stdbuf -oL gotestsum --format short-verbose --packages="$packages" --rerun-fails=1 --no-color=false -- ./... -coverprofile=coverage.txt -covermode=atomic -coverpkg=./...,./go-ethereum/... -parallel=8 -tags=challengetest -run=TestChallenge > >(stdbuf -oL tee full.log | grep -vE "INFO|seal")
stdbuf -oL gotestsum --format short-verbose --packages="$packages" --rerun-fails=1 --no-color=false -- ./... -timeout 60m -coverprofile=coverage.txt -covermode=atomic -coverpkg=./...,./go-ethereum/... -parallel=8 -tags=challengetest -run=TestChallenge > >(stdbuf -oL tee full.log | grep -vE "INFO|seal")

- name: run stylus tests
if: matrix.test-mode == 'stylus'
Expand Down
7 changes: 5 additions & 2 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 == 'OffchainLabs/nitro' # don't run in any forks without "Advanced Security" enabled
runs-on: ubuntu-8
if: github.repository == 'Layr-Labs/nitro' # don't run in any forks without "Advanced Security" enabled
runs-on: linux-2xl
permissions:
actions: read
contents: read
Expand All @@ -50,6 +50,9 @@ jobs:
- name: Install dependencies
run: sudo apt update && sudo apt install -y wabt

- name: Install dependencies
run: sudo apt update && sudo apt install -y wabt

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
Expand Down
78 changes: 78 additions & 0 deletions .github/workflows/docker-eigenda.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
name: Build nitro-eigenda Docker Image
on:
workflow_dispatch:
push:
tags: ['*']

jobs:
docker:
runs-on: linux-2xl

steps:
- name: Checkout
uses: actions/checkout@v4
with:
submodules: 'recursive'

- name: Set up QEMU
uses: docker/setup-qemu-action@v3

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
with:
install: true

- name: Cache Docker layers
uses: actions/cache@v3
with:
path: /tmp/.buildx-cache
key: ${{ runner.os }}-buildx-${{ hashFiles('Dockerfile') }}
restore-keys: ${{ runner.os }}-buildx-

- name: Login to GitHub Container Registry
uses: docker/login-action@v2
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Docker meta
id: meta
uses: docker/metadata-action@v5
with:
images: |
ghcr.io/${{ github.repository_owner }}/nitro-eigenda
tags: |
type=ref,event=branch
type=ref,event=pr
type=ref,event=tag
type=ref,event=tag,suffix={{sha}}
type=semver,pattern={{version}}
type=semver,pattern={{major}}.{{minor}}
type=sha,prefix=,format=short,enable=true
type=raw,value=latest,enable={{is_default_branch}}
type=match,pattern=^(v\d+\.\d+\.\d+-\w*)\..*$,value=$1,enable={{is_default_branch}}

- name: "Build and push"
uses: docker/build-push-action@v5
with:
target: nitro-node-dev
context: .
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
cache-from: type=local,src=/tmp/.buildx-cache
cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max

- name: Move cache
run: |
rm -rf /tmp/.buildx-cache
mv /tmp/.buildx-cache-new /tmp/.buildx-cache

- name: Clear cache on failure
if: failure()
run: |
keys=(${{ runner.os }}-buildx- ${{ runner.os }}-buildx-${{ hashFiles('Dockerfile') }})
for key in "${keys[@]}"; do
curl -X DELETE -H "Accept: application/vnd.github.v3+json" -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" "https://api.github.com/repos/${{ github.repository }}/actions/caches/$key"
done
10 changes: 5 additions & 5 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: ubuntu-8
runs-on: linux-2xl
services:
# local registery
registry:
Expand Down Expand Up @@ -64,20 +64,20 @@ jobs:
run: |
cd nitro-testnode
./test-node.bash --init --dev &

- name: Wait for rpc to come up
shell: bash
run: |
${{ github.workspace }}/.github/workflows/waitForNitro.sh

- name: Print WAVM module root
id: module-root
run: |
# Unfortunately, `docker cp` seems to always result in a "permission denied"
# We work around this by piping a tarball through stdout
docker run --rm --entrypoint tar localhost:5000/nitro-node-dev:latest -cf - target/machines/latest | tar xf -
module_root="$(cat "target/machines/latest/module-root.txt")"
echo "name=module-root=$module_root" >> $GITHUB_STATE
echo "module-root=$module_root" >> "$GITHUB_OUTPUT"
echo -e "\x1b[1;34mWAVM module root:\x1b[0m $module_root"

- name: Upload WAVM machine as artifact
Expand All @@ -101,4 +101,4 @@ jobs:
keys=(${{ runner.os }}-buildx- ${{ runner.os }}-buildx-${{ hashFiles('Dockerfile') }})
for key in "${keys[@]}"; do
curl -X DELETE -H "Accept: application/vnd.github.v3+json" -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" "https://api.github.com/repos/${{ github.repository }}/actions/caches/$key"
done
done
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: ubuntu-8
runs-on: linux-2xl

steps:
- name: Checkout
Expand Down
20 changes: 12 additions & 8 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[submodule "go-ethereum"]
path = go-ethereum
url = https://github.com/OffchainLabs/go-ethereum.git
url = git@github.com:Layr-Labs/nitro-go-ethereum-private.git
[submodule "fastcache"]
path = fastcache
url = https://github.com/OffchainLabs/fastcache.git
Expand All @@ -10,19 +10,23 @@
[submodule "brotli"]
path = brotli
url = https://github.com/google/brotli.git
[submodule "contracts"]
path = contracts
url = https://github.com/OffchainLabs/nitro-contracts.git
branch = develop
[submodule "arbitrator/wasm-testsuite/testsuite"]
path = arbitrator/wasm-testsuite/testsuite
url = https://github.com/WebAssembly/testsuite.git
[submodule "contracts"]
path = contracts
url = https://github.com/Layr-Labs/nitro-contracts.git
branch = epociask--length-fixes-v3.0.3
[submodule "nitro-testnode"]
path = nitro-testnode
url = https://github.com/Layr-Labs/nitro-testnode.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
[submodule "arbitrator/tools/wasmer"]
path = arbitrator/tools/wasmer
url = https://github.com/OffchainLabs/wasmer.git
[submodule "nitro-testnode"]
path = nitro-testnode
url = https://github.com/OffchainLabs/nitro-testnode.git
[submodule "arbitrator/langs/rust"]
path = arbitrator/langs/rust
url = https://github.com/OffchainLabs/stylus-sdk-rs.git
Expand Down
11 changes: 9 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ RUN apt-get update && \
FROM scratch as brotli-library-export
COPY --from=brotli-library-builder /workspace/install/ /

FROM node:16-bookworm-slim as contracts-builder
FROM node:18-bookworm-slim as contracts-builder
RUN apt-get update && \
apt-get install -y git python3 make g++ curl
RUN curl -L https://foundry.paradigm.xyz | bash && . ~/.bashrc && ~/.foundry/bin/foundryup
Expand All @@ -47,6 +47,7 @@ RUN apt-get update && \
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.75.0 --target x86_64-unknown-linux-gnu wasm32-unknown-unknown wasm32-wasi
COPY ./Makefile ./
COPY arbitrator/Cargo.* arbitrator/
COPY arbitrator/rust-kzg-bn254 arbitrator/rust-kzg-bn254
COPY arbitrator/arbutil arbitrator/arbutil
COPY arbitrator/brotli arbitrator/brotli
COPY arbitrator/caller-env arbitrator/caller-env
Expand Down Expand Up @@ -75,6 +76,7 @@ COPY ./blsSignatures ./blsSignatures
COPY ./cmd/chaininfo ./cmd/chaininfo
COPY ./cmd/replay ./cmd/replay
COPY ./das/dastree ./das/dastree
COPY ./eigenda ./eigenda
COPY ./precompiles ./precompiles
COPY ./statetransfer ./statetransfer
COPY ./util ./util
Expand Down Expand Up @@ -105,6 +107,7 @@ COPY arbitrator/caller-env arbitrator/caller-env
COPY arbitrator/prover arbitrator/prover
COPY arbitrator/wasm-libraries arbitrator/wasm-libraries
COPY arbitrator/jit arbitrator/jit
COPY arbitrator/rust-kzg-bn254 arbitrator/rust-kzg-bn254
COPY arbitrator/stylus arbitrator/stylus
COPY arbitrator/tools/wasmer arbitrator/tools/wasmer
COPY --from=brotli-wasm-export / target/
Expand Down Expand Up @@ -132,6 +135,8 @@ COPY arbitrator/brotli arbitrator/brotli
COPY arbitrator/caller-env arbitrator/caller-env
COPY arbitrator/prover/Cargo.toml arbitrator/prover/
COPY arbitrator/jit/Cargo.toml arbitrator/jit/
COPY arbitrator/rust-kzg-bn254 arbitrator/rust-kzg-bn254

COPY arbitrator/stylus/Cargo.toml arbitrator/stylus/
COPY arbitrator/tools/wasmer arbitrator/tools/wasmer
COPY arbitrator/wasm-libraries/user-host-trait/Cargo.toml arbitrator/wasm-libraries/user-host-trait/Cargo.toml
Expand All @@ -147,6 +152,8 @@ COPY ./Makefile ./
COPY arbitrator/prover arbitrator/prover
COPY arbitrator/wasm-libraries arbitrator/wasm-libraries
COPY arbitrator/jit arbitrator/jit
COPY arbitrator/rust-kzg-bn254 arbitrator/rust-kzg-bn254

COPY arbitrator/stylus arbitrator/stylus
COPY --from=brotli-wasm-export / target/
COPY scripts/build-brotli.sh scripts/
Expand Down Expand Up @@ -204,7 +211,7 @@ COPY ./scripts/download-machine.sh .
#RUN ./download-machine.sh consensus-v11 0xf4389b835497a910d7ba3ebfb77aa93da985634f3c052de1290360635be40c4a
#RUN ./download-machine.sh consensus-v11.1 0x68e4fe5023f792d4ef584796c84d710303a5e12ea02d6e37e2b5e9c4332507c4
#RUN ./download-machine.sh consensus-v20 0x8b104a2e80ac6165dc58b9048de12f301d70b02a0ab51396c22b4b4b802a16a4
RUN ./download-machine.sh consensus-v30 0xb0de9cb89e4d944ae6023a3b62276e54804c242fd8c4c2d8e6cc4450f5fa8b1b && true
# RUN ./download-machine.sh consensus-v30 0xb0de9cb89e4d944ae6023a3b62276e54804c242fd8c4c2d8e6cc4450f5fa8b1b && true

FROM golang:1.21.10-bookworm as node-builder
WORKDIR /workspace
Expand Down
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,16 @@
<img src="https://arbitrum.io/assets/arbitrum/logo_color.png" alt="Logo" width="80" height="80">
</a>

<h3 align="center">Arbitrum Nitro</h3>
<h3 align="center">Arbitrum Nitro + EigenDA</h3>

<p align="center">
<a href="https://developer.arbitrum.io/"><strong>Next Generation Ethereum L2 Technology »</strong></a>
<br />
</p>
</p>

This is a fork of Arbitrum Nitro developed by [AltLayer](https://altlayer.io/), in a technical partnership with EigenLabs.

## About Arbitrum Nitro

<img src="https://arbitrum.io/assets/arbitrum/logo_color.png" alt="Logo" width="80" height="80">
Expand Down
Loading
Loading