diff --git a/Dockerfile b/Dockerfile index 4f3e6a155b9..5b50b8c2751 100644 --- a/Dockerfile +++ b/Dockerfile @@ -67,7 +67,7 @@ COPY --from=wasm-libs-builder /workspace/ / FROM wasm-base AS wasm-bin-builder RUN apt update && apt install -y wabt # pinned go version -RUN curl -L https://golang.org/dl/go1.25.1.linux-`dpkg --print-architecture`.tar.gz | tar -C /usr/local -xzf - +RUN curl -L https://golang.org/dl/go1.25.8.linux-`dpkg --print-architecture`.tar.gz | tar -C /usr/local -xzf - COPY ./Makefile ./go.mod ./go.sum ./ COPY ./arbcompress ./arbcompress COPY ./arbos ./arbos @@ -140,6 +140,7 @@ RUN touch -a -m crates/prover/src/lib.rs RUN NITRO_BUILD_IGNORE_TIMESTAMPS=1 make build-prover-lib RUN NITRO_BUILD_IGNORE_TIMESTAMPS=1 make build-prover-bin RUN NITRO_BUILD_IGNORE_TIMESTAMPS=1 make build-jit +RUN NITRO_BUILD_IGNORE_TIMESTAMPS=1 make build-validation-server FROM scratch AS prover-export COPY --from=prover-builder /workspace/target/ / @@ -344,6 +345,13 @@ COPY --from=module-root-calc /workspace/target/machines/latest/machine.wavm.br / COPY --from=module-root-calc /workspace/target/machines/latest/until-host-io-state.bin /home/user/target/machines/latest/ COPY --from=module-root-calc /workspace/target/machines/latest/module-root.txt /home/user/target/machines/latest/ COPY --from=module-root-calc /workspace/target/machines/latest/replay.wasm /home/user/target/machines/latest/ +COPY --from=prover-export /bin/validator /usr/local/bin/ +# Symlink legacy machine dirs into /home/user/target/machines so the Rust +# validator can serve all module roots from a single --root-path. +RUN for dir in /home/user/nitro-legacy/machines/*/; do \ + name=$(basename "$dir"); \ + [ "$name" != "latest" ] && ln -sf "$dir" /home/user/target/machines/"$name" || true; \ + done RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get update && \ apt-get install -y \ diff --git a/nitro-testnode b/nitro-testnode index a8f87ada672..c94a36ece78 160000 --- a/nitro-testnode +++ b/nitro-testnode @@ -1 +1 @@ -Subproject commit a8f87ada672eaaea6f9e9c508d439dfd85f471b3 +Subproject commit c94a36ece789a3d8c8163d85e68af36afb21ae45 diff --git a/staker/block_validator.go b/staker/block_validator.go index fb0f3c752a2..4f31b53aab6 100644 --- a/staker/block_validator.go +++ b/staker/block_validator.go @@ -203,8 +203,8 @@ func (c *BlockValidatorConfig) Validate() error { if err != nil { return fmt.Errorf("failed parsing validation server's url:%s err: %w", serverUrl, err) } - if u.Scheme != "ws" && u.Scheme != "wss" { - return fmt.Errorf("validation server's url scheme is unsupported, it should either be ws or wss, url:%s", serverUrl) + if u.Scheme != "ws" && u.Scheme != "wss" && u.Scheme != "http" && u.Scheme != "https" { + return fmt.Errorf("validation server's url scheme is unsupported, it should be ws, wss, http, or https, url:%s", serverUrl) } } } @@ -928,7 +928,7 @@ func (v *BlockValidator) advanceValidations(ctx context.Context) (*arbutil.Messa } v.testingProgressMadeMutex.Unlock() - log.Trace("result validated", "count", v.validated(), "blockHash", v.lastValidGS.BlockHash) + log.Info("block validated", "count", v.validated(), "blockHash", v.lastValidGS.BlockHash, "batch", v.lastValidGS.Batch, "posInBatch", v.lastValidGS.PosInBatch) } }