Merge branch 'master' into config_doc_fix

OffchainLabs · Jul 10, 2023 · 16d4b4a · 16d4b4a
2 parents 522ec71 + b42c201
commit 16d4b4a
Show file tree

Hide file tree

Showing 133 changed files with 4,124 additions and 4,630 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -15,12 +15,8 @@ solgen/go
 target/**/*
 brotli/buildfiles/**/*
 
-# these go to different docker images
-testnode-scripts/node_modules
-blockscout/**/*
-
 # these are used by environment outside the docker:
-test-node.bash
+nitro-testnode/**/*
 
 # Arbitrator ignores
 

diff --git a/.github/workflows/arbitrator-ci.yml b/.github/workflows/arbitrator-ci.yml
@@ -110,12 +110,12 @@ jobs:
             target/lib/libbrotlicommon-static.a
             target/lib/libbrotlienc-static.a
             target/lib/libbrotlidec-static.a
-          key: ${{ runner.os }}-brotli-2-${{ hashFiles('build-brotli.sh') }}-${{ hashFiles('.github/workflows/arbitrator-ci.yaml') }}
+          key: ${{ runner.os }}-brotli-3-${{ hashFiles('scripts/build-brotli.sh') }}-${{ hashFiles('.github/workflows/arbitrator-ci.yaml') }}
           restore-keys: ${{ runner.os }}-brotli-2-
 
       - name: Build cbrotli-local
         if: steps.cache-cbrotli.outputs.cache-hit != 'true'
-        run: ./build-brotli.sh -l
+        run: ./scripts/build-brotli.sh -l
 
       - name: Setup emsdk
         if: steps.cache-cbrotli.outputs.cache-hit != 'true'
@@ -131,7 +131,7 @@ jobs:
 
       - name: Build cbrotli-wasm
         if: steps.cache-cbrotli.outputs.cache-hit != 'true'
-        run: ./build-brotli.sh -w
+        run: ./scripts/build-brotli.sh -w
 
       - name: Add wabt to path
         run: echo "$HOME/wabt-prefix/bin" >> "$GITHUB_PATH"

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -106,16 +106,16 @@ jobs:
             target/lib/libbrotlicommon-static.a
             target/lib/libbrotlienc-static.a
             target/lib/libbrotlidec-static.a
-          key: ${{ runner.os }}-brotli-${{ hashFiles('build-brotli.sh') }}-${{ hashFiles('.github/workflows/arbitrator-ci.yaml') }}-${{ matrix.test-mode }}
+          key: ${{ runner.os }}-brotli-${{ hashFiles('scripts/build-brotli.sh') }}-${{ hashFiles('.github/workflows/arbitrator-ci.yaml') }}-${{ matrix.test-mode }}
           restore-keys: ${{ runner.os }}-brotli-
 
       - name: Build cbrotli-local
         if: steps.cache-cbrotli.outputs.cache-hit != 'true'
-        run: ./build-brotli.sh -l
+        run: ./scripts/build-brotli.sh -l
 
       - name: Build cbrotli-wasm in docker
         if: steps.cache-cbrotli.outputs.cache-hit != 'true'
-        run: ./build-brotli.sh -w -d
+        run: ./scripts/build-brotli.sh -w -d
 
       - name: Build
         run: make build test-go-deps -j

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -108,12 +108,12 @@ jobs:
           target/lib/libbrotlicommon-static.a
           target/lib/libbrotlienc-static.a
           target/lib/libbrotlidec-static.a
-        key: ${{ runner.os }}-brotli-${{ hashFiles('build-brotli.sh') }}-${{ hashFiles('.github/workflows/arbitrator-ci.yaml') }}
+        key: ${{ runner.os }}-brotli-3a-${{ hashFiles('scripts/build-brotli.sh') }}-${{ hashFiles('.github/workflows/arbitrator-ci.yaml') }}
         restore-keys: ${{ runner.os }}-brotli-
 
     - name: Build cbrotli-local
       if: steps.cache-cbrotli.outputs.cache-hit != 'true'
-      run: ./build-brotli.sh -l
+      run: ./scripts/build-brotli.sh -l
 
     - name: Cache Build Products
       uses: actions/cache@v3

diff --git a/.gitmodules b/.gitmodules
@@ -14,9 +14,9 @@
 	path = contracts
 	url = https://github.com/OffchainLabs/nitro-contracts.git
 	branch = develop
-[submodule "blockscout"]
-	path = blockscout
-        url = https://github.com/OffchainLabs/blockscout.git
 [submodule "arbitrator/wasm-testsuite/testsuite"]
 	path = arbitrator/wasm-testsuite/testsuite
 	url = https://github.com/WebAssembly/testsuite.git
+[submodule "nitro-testnode"]
+	path = nitro-testnode
+	url = https://github.com/OffchainLabs/nitro-testnode.git
diff --git a/Dockerfile b/Dockerfile
@@ -6,20 +6,20 @@ RUN apt-get update && \
     cd emsdk && \
     ./emsdk install 3.1.7 && \
     ./emsdk activate 3.1.7
-COPY build-brotli.sh .
+COPY scripts/build-brotli.sh scripts/
 COPY brotli brotli
-RUN cd emsdk && . ./emsdk_env.sh && cd .. && ./build-brotli.sh -w -t install/
+RUN cd emsdk && . ./emsdk_env.sh && cd .. && ./scripts/build-brotli.sh -w -t /workspace/install/
 
 FROM scratch as brotli-wasm-export
 COPY --from=brotli-wasm-builder /workspace/install/ /
 
 FROM debian:bullseye-slim as brotli-library-builder
 WORKDIR /workspace
-COPY build-brotli.sh .
+COPY scripts/build-brotli.sh scripts/
 COPY brotli brotli
 RUN apt-get update && \
     apt-get install -y cmake make gcc git && \
-    ./build-brotli.sh -l -t install/
+    ./scripts/build-brotli.sh -l -t /workspace/install/
 
 FROM scratch as brotli-library-export
 COPY --from=brotli-library-builder /workspace/install/ /
@@ -146,7 +146,7 @@ FROM debian:bullseye-slim as machine-versions
 RUN apt-get update && apt-get install -y unzip wget curl
 WORKDIR /workspace/machines
 # Download WAVM machines
-COPY ./testnode-scripts/download-machine.sh .
+COPY ./scripts/download-machine.sh .
 #RUN ./download-machine.sh consensus-v1-rc1 0xbb9d58e9527566138b682f3a207c0976d5359837f6e330f4017434cca983ff41
 #RUN ./download-machine.sh consensus-v2.1 0x9d68e40c47e3b87a8a7e6368cc52915720a6484bb2f47ceabad7e573e3a11232
 #RUN ./download-machine.sh consensus-v3 0x53c288a0ca7100c0f2db8ab19508763a51c7fd1be125d376d940a65378acaee7
@@ -160,6 +160,7 @@ COPY ./testnode-scripts/download-machine.sh .
 #RUN ./download-machine.sh consensus-v9 0xd1842bfbe047322b3f3b3635b5fe62eb611557784d17ac1d2b1ce9c170af6544
 RUN ./download-machine.sh consensus-v10 0x6b94a7fc388fd8ef3def759297828dc311761e88d8179c7ee8d3887dc554f3c3
 RUN ./download-machine.sh consensus-v10.1 0xda4e3ad5e7feacb817c21c8d0220da7650fe9051ece68a3f0b1c5d38bbb27b21
+RUN ./download-machine.sh consensus-v10.2 0x0754e09320c381566cc0449904c377a52bd34a6b9404432e80afd573b67f7b17
 
 FROM golang:1.20-bullseye as node-builder
 WORKDIR /workspace
@@ -188,11 +189,11 @@ RUN NITRO_BUILD_IGNORE_TIMESTAMPS=1 make build
 
 FROM node-builder as fuzz-builder
 RUN mkdir fuzzers/
-RUN ./fuzz.bash --build --binary-path /workspace/fuzzers/
+RUN ./scripts/fuzz.bash --build --binary-path /workspace/fuzzers/
 
 FROM debian:bullseye-slim as nitro-fuzzer
 COPY --from=fuzz-builder /workspace/fuzzers/*.fuzz /usr/local/bin/
-COPY ./fuzz.bash /usr/local/bin
+COPY ./scripts/fuzz.bash /usr/local/bin
 RUN mkdir /fuzzcache
 ENTRYPOINT [ "/usr/local/bin/fuzz.bash", "--binary-path", "/usr/local/bin/", "--fuzzcache-path", "/fuzzcache" ]
 

diff --git a/Makefile b/Makefile
@@ -332,23 +332,23 @@ contracts/test/prover/proofs/%.json: $(arbitrator_cases)/%.wasm $(arbitrator_pro
 	@touch $@
 
 .make/cbrotli-lib: $(DEP_PREDICATE) $(ORDER_ONLY_PREDICATE) .make
-	test -f target/include/brotli/encode.h || ./build-brotli.sh -l
-	test -f target/include/brotli/decode.h || ./build-brotli.sh -l
-	test -f target/lib/libbrotlicommon-static.a || ./build-brotli.sh -l
-	test -f target/lib/libbrotlienc-static.a || ./build-brotli.sh -l
-	test -f target/lib/libbrotlidec-static.a || ./build-brotli.sh -l
+	test -f target/include/brotli/encode.h || ./scripts/build-brotli.sh -l
+	test -f target/include/brotli/decode.h || ./scripts/build-brotli.sh -l
+	test -f target/lib/libbrotlicommon-static.a || ./scripts/build-brotli.sh -l
+	test -f target/lib/libbrotlienc-static.a || ./scripts/build-brotli.sh -l
+	test -f target/lib/libbrotlidec-static.a || ./scripts/build-brotli.sh -l
 	@touch $@
 
 .make/cbrotli-wasm: $(DEP_PREDICATE) $(ORDER_ONLY_PREDICATE) .make
-	test -f target/lib-wasm/libbrotlicommon-static.a || ./build-brotli.sh -w -d
-	test -f target/lib-wasm/libbrotlienc-static.a || ./build-brotli.sh -w -d
-	test -f target/lib-wasm/libbrotlidec-static.a || ./build-brotli.sh -w -d
+	test -f target/lib-wasm/libbrotlicommon-static.a || ./scripts/build-brotli.sh -w -d
+	test -f target/lib-wasm/libbrotlienc-static.a || ./scripts/build-brotli.sh -w -d
+	test -f target/lib-wasm/libbrotlidec-static.a || ./scripts/build-brotli.sh -w -d
 	@touch $@
 
 .make/wasm-lib: $(DEP_PREDICATE) $(ORDER_ONLY_PREDICATE) .make
-	test -f arbitrator/wasm-libraries/soft-float/bindings32.o || ./build-brotli.sh -f -d -t .
-	test -f arbitrator/wasm-libraries/soft-float/bindings64.o || ./build-brotli.sh -f -d -t .
-	test -f arbitrator/wasm-libraries/soft-float/SoftFloat/build/Wasm-Clang/softfloat.a || ./build-brotli.sh -f -d -t .
+	test -f arbitrator/wasm-libraries/soft-float/bindings32.o || ./scripts/build-brotli.sh -f -d -t .
+	test -f arbitrator/wasm-libraries/soft-float/bindings64.o || ./scripts/build-brotli.sh -f -d -t .
+	test -f arbitrator/wasm-libraries/soft-float/SoftFloat/build/Wasm-Clang/softfloat.a || ./scripts/build-brotli.sh -f -d -t .
 	@touch $@
 
 .make: