Light Client States Updates

.github/workflows/arbitrator-ci.yml

@@ -98,6 +98,8 @@ jobs:
 
       - name: Install Foundry
         uses: foundry-rs/foundry-toolchain@v1
+        with:
+          version: nightly-f625d0fa7c51e65b4bf1e8f7931cd1c6e2e285e9
 
       - name: Cache cbrotli
         uses: actions/cache@v3

.github/workflows/ci.yml

@@ -72,6 +72,8 @@ jobs:
 
       - name: Install Foundry
         uses: foundry-rs/foundry-toolchain@v1
+        with:
+          version: nightly-f625d0fa7c51e65b4bf1e8f7931cd1c6e2e285e9
 
       - name: Cache Build Products
         uses: actions/cache@v3
@@ -126,8 +128,9 @@ jobs:
         run: make -j build-node-deps
 
       - name: Lint
-        uses: golangci/golangci-lint-action@v3
+        uses: golangci/golangci-lint-action@v5
         with:
+          annotations: false
           version: latest
           skip-pkg-cache: true
       - name: Custom Lint

.github/workflows/codeql-analysis.yml

@@ -77,6 +77,8 @@ jobs:
 
     - name: Install Foundry
       uses: foundry-rs/foundry-toolchain@v1
+      with:
+        version: nightly-f625d0fa7c51e65b4bf1e8f7931cd1c6e2e285e9
 
     - name: Cache Rust Build Products
       uses: actions/cache@v3

.github/workflows/espresso-e2e.yml

@@ -82,6 +82,8 @@ jobs:
 
       - name: Install Foundry
         uses: foundry-rs/foundry-toolchain@v1
+        with:
+          version: nightly-f625d0fa7c51e65b4bf1e8f7931cd1c6e2e285e9
 
       - name: Cache Build Products
         uses: actions/cache@v3
@@ -130,7 +132,12 @@ jobs:
         with:
           version: '2.22.0'
 
-      - name: Run test
+      - name: Run E2E test
+        run: |
+          packages=`go list ./... | grep system_tests`
+          gotestsum --format short-verbose --packages="$packages" --rerun-fails=1 -- -v -timeout 25m -p 1 ./... -run 'TestEspressoE2E'
+
+      - name: Run switch test
         run: |
           packages=`go list ./... | grep system_tests`
-          gotestsum --format short-verbose --packages="$packages" --rerun-fails=1 -- -v -timeout 35m ./... -run 'TestEspressoE2E|TestEspressoSwitch'
+          gotestsum --format short-verbose --packages="$packages" --rerun-fails=1 -- -v -timeout 15m -p 1 ./... -run 'TestEspressoSwitch'

Dockerfile

@@ -46,7 +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/vid-helper arbitrator/vid-helper
+COPY arbitrator/espresso-crypto-helper arbitrator/espresso-crypto-helper
 COPY config/vid_srs.json config/vid_srs.json
 COPY arbitrator/wasm-libraries arbitrator/wasm-libraries
 COPY --from=brotli-wasm-export / target/
@@ -60,7 +60,7 @@ FROM wasm-base as wasm-bin-builder
 RUN curl -L https://golang.org/dl/go1.20.linux-`dpkg --print-architecture`.tar.gz | tar -C /usr/local -xzf -
 COPY ./Makefile ./go.mod ./go.sum ./
 COPY ./arbcompress ./arbcompress
-COPY ./arbvid ./arbvid
+COPY ./espressocrypto ./espressocrypto
 COPY ./arbos ./arbos
 COPY ./arbstate ./arbstate
 COPY ./arbutil ./arbutil
@@ -96,7 +96,7 @@ COPY ./Makefile ./
 COPY arbitrator/arbutil arbitrator/arbutil
 COPY arbitrator/prover arbitrator/prover
 COPY arbitrator/jit arbitrator/jit
-COPY arbitrator/vid-helper arbitrator/vid-helper
+COPY arbitrator/espresso-crypto-helper arbitrator/espresso-crypto-helper
 COPY config/vid_srs.json config/vid_srs.json
 RUN NITRO_BUILD_IGNORE_TIMESTAMPS=1 make build-prover-header
 
@@ -113,7 +113,7 @@ 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/vid-helper arbitrator/vid-helper
+COPY arbitrator/espresso-crypto-helper arbitrator/espresso-crypto-helper
 COPY config/vid_srs.json config/vid_srs.json
 RUN mkdir arbitrator/prover/src arbitrator/jit/src && \
     echo "fn test() {}" > arbitrator/jit/src/lib.rs && \

Dockerfile.espresso

@@ -50,7 +50,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/vid-helper arbitrator/vid-helper
+COPY arbitrator/espresso-crypto-helper arbitrator/espresso-crypto-helper
 COPY config/vid_srs.json config/vid_srs.json
 COPY arbitrator/wasm-libraries arbitrator/wasm-libraries
 COPY --from=brotli-wasm-export / target/
@@ -64,7 +64,7 @@ FROM wasm-base as wasm-bin-builder
 RUN curl -L https://golang.org/dl/go1.20.linux-`dpkg --print-architecture`.tar.gz | tar -C /usr/local -xzf -
 COPY ./Makefile ./go.mod ./go.sum ./
 COPY ./arbcompress ./arbcompress
-COPY ./arbvid ./arbvid
+COPY ./espressocrypto ./espressocrypto
 COPY ./arbos ./arbos
 COPY ./arbstate ./arbstate
 COPY ./arbutil ./arbutil
@@ -100,7 +100,7 @@ COPY ./Makefile ./
 COPY arbitrator/arbutil arbitrator/arbutil
 COPY arbitrator/prover arbitrator/prover
 COPY arbitrator/jit arbitrator/jit
-COPY arbitrator/vid-helper arbitrator/vid-helper
+COPY arbitrator/espresso-crypto-helper arbitrator/espresso-crypto-helper
 COPY config/vid_srs.json config/vid_srs.json
 RUN NITRO_BUILD_IGNORE_TIMESTAMPS=1 make build-prover-header
 
@@ -117,7 +117,7 @@ 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/vid-helper arbitrator/vid-helper
+COPY arbitrator/espresso-crypto-helper arbitrator/espresso-crypto-helper
 COPY config/vid_srs.json config/vid_srs.json
 RUN mkdir arbitrator/prover/src arbitrator/jit/src && \
     echo "fn test() {}" > arbitrator/jit/src/lib.rs && \

Makefile

@@ -44,13 +44,13 @@ color_reset = "\e[0;0m"
 
 done = "%bdone!%b\n" $(color_pink) $(color_reset)
 
-replay_deps=arbos wavmio arbstate arbcompress arbvid solgen/go/node-interfacegen blsSignatures cmd/replay
+replay_deps=arbos wavmio arbstate arbcompress espressocrypto solgen/go/node-interfacegen blsSignatures cmd/replay
 
 replay_wasm=$(output_root)/machines/latest/replay.wasm
 
 arbitrator_generated_header=$(output_root)/include/arbitrator.h
 arbitrator_wasm_libs_nogo=$(output_root)/machines/latest/wasi_stub.wasm $(output_root)/machines/latest/host_io.wasm $(output_root)/machines/latest/soft-float.wasm
-arbitrator_wasm_libs=$(arbitrator_wasm_libs_nogo) $(patsubst %,$(output_root)/machines/latest/%.wasm, go_stub brotli vid)
+arbitrator_wasm_libs=$(arbitrator_wasm_libs_nogo) $(patsubst %,$(output_root)/machines/latest/%.wasm, go_stub brotli espresso_crypto)
 arbitrator_prover_lib=$(output_root)/lib/libprover.a
 arbitrator_prover_bin=$(output_root)/bin/prover
 arbitrator_jit=$(output_root)/bin/jit
@@ -282,13 +282,13 @@ $(output_root)/machines/latest/brotli.wasm: $(DEP_PREDICATE) $(wildcard arbitrat
 	cargo build --manifest-path arbitrator/wasm-libraries/Cargo.toml --release --target wasm32-wasi --package brotli
 	install arbitrator/wasm-libraries/target/wasm32-wasi/release/brotli.wasm $@
 
-$(output_root)/machines/latest/vid.wasm: $(DEP_PREDICATE) $(wildcard arbitrator/wasm-libraries/vid/src/*)
+$(output_root)/machines/latest/espresso_crypto.wasm: $(DEP_PREDICATE) $(wildcard arbitrator/wasm-libraries/espresso-crypto/src/*)
 	mkdir -p $(output_root)/machines/latest
-	cargo build --manifest-path arbitrator/wasm-libraries/Cargo.toml --release --target wasm32-wasi --package vid
-	install arbitrator/wasm-libraries/target/wasm32-wasi/release/vid.wasm $@
+	cargo build --manifest-path arbitrator/wasm-libraries/Cargo.toml --release --target wasm32-wasi --package espresso-crypto
+	install arbitrator/wasm-libraries/target/wasm32-wasi/release/espresso_crypto.wasm $@
 
 $(output_root)/machines/latest/machine.wavm.br: $(DEP_PREDICATE) $(arbitrator_prover_bin) $(arbitrator_wasm_libs) $(replay_wasm)
-	$(arbitrator_prover_bin) $(replay_wasm) --generate-binaries $(output_root)/machines/latest -l $(output_root)/machines/latest/soft-float.wasm -l $(output_root)/machines/latest/wasi_stub.wasm -l $(output_root)/machines/latest/go_stub.wasm -l $(output_root)/machines/latest/host_io.wasm -l $(output_root)/machines/latest/brotli.wasm -l $(output_root)/machines/latest/vid.wasm 
+	$(arbitrator_prover_bin) $(replay_wasm) --generate-binaries $(output_root)/machines/latest -l $(output_root)/machines/latest/soft-float.wasm -l $(output_root)/machines/latest/wasi_stub.wasm -l $(output_root)/machines/latest/go_stub.wasm -l $(output_root)/machines/latest/host_io.wasm -l $(output_root)/machines/latest/brotli.wasm -l $(output_root)/machines/latest/espresso_crypto.wasm 
 
 $(arbitrator_cases)/%.wasm: $(arbitrator_cases)/%.wat
 	wat2wasm $< -o $@