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.

Sign up for GitHub

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

Jump to bottom

Adopt Wasmer v4.2.3 #179

Merged
merged 14 commits into from
Nov 28, 2023
Merged

Adopt Wasmer v4.2.3 #179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
fa61fa4
Remove unnecessary memory size check in JIT validator
PlasmaPower Oct 17, 2023
574ac29
Merge pull request #171 from OffchainLabs/remove-useless-memory-check
rachel-bousfield Nov 20, 2023
051ee03
adopt wasmer v4.2.3
rachel-bousfield Nov 21, 2023
8e5c4c0
fix lifetimes
rachel-bousfield Nov 21, 2023
b39f4e1
repin wasmer
rachel-bousfield Nov 21, 2023
2aaa81d
Merge branch 'stylus' into adopt-wasmer-v4.2.3
rachel-bousfield Nov 21, 2023
3a1da7f
bump Dockerfile rust
rachel-bousfield Nov 21, 2023
26ebd5a
fix COPY line
rachel-bousfield Nov 21, 2023
bbf3e15
bump llvm
rachel-bousfield Nov 21, 2023
95ff9ae
bump llvm to v16
rachel-bousfield Nov 21, 2023
655b2c4
llvm 15
rachel-bousfield Nov 21, 2023
f973ab4
add libpolly
rachel-bousfield Nov 21, 2023
87c044e
copy workspace
rachel-bousfield Nov 21, 2023
d499db5
remove comment
rachel-bousfield Nov 21, 2023
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
17 changes: 9 additions & 8 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,14 @@ RUN apt-get update && apt-get install -y curl build-essential=12.9
FROM wasm-base as wasm-libs-builder
# clang / lld used by soft-float wasm
RUN apt-get install -y clang=1:11.0-51+nmu5 lld=1:11.0-51+nmu5 wabt
# pinned rust 1.65.0
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.68.2 --target x86_64-unknown-linux-gnu wasm32-unknown-unknown wasm32-wasi
# pinned rust 1.74.0
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.74.0 --target x86_64-unknown-linux-gnu wasm32-unknown-unknown wasm32-wasi
COPY ./Makefile ./
COPY arbitrator/Cargo.* arbitrator/
COPY arbitrator/arbutil arbitrator/arbutil
COPY arbitrator/prover arbitrator/prover
COPY arbitrator/wasm-libraries arbitrator/wasm-libraries
COPY arbitrator/tools/wasmer arbitrator/tools/wasmer
COPY arbitrator/arbutil arbitrator/arbutil
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 @@ -82,13 +83,13 @@ COPY --from=contracts-builder workspace/contracts/build/contracts/src/precompile
COPY --from=contracts-builder workspace/.make/ .make/
RUN PATH="$PATH:/usr/local/go/bin" NITRO_BUILD_IGNORE_TIMESTAMPS=1 make build-wasm-bin

FROM rust:1.68-slim-bullseye as prover-header-builder
FROM rust:1.74-slim-bullseye as prover-header-builder
WORKDIR /workspace
RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get update && \
apt-get install -y make wabt && \
cargo install --force cbindgen
COPY arbitrator/Cargo.* arbitrator/stylus/cbindgen.toml arbitrator/stylus/
COPY arbitrator/Cargo.* arbitrator/
COPY ./Makefile ./
COPY arbitrator/arbutil arbitrator/arbutil
COPY arbitrator/prover arbitrator/prover
Expand All @@ -101,15 +102,15 @@ RUN NITRO_BUILD_IGNORE_TIMESTAMPS=1 make build-prover-header
FROM scratch as prover-header-export
COPY --from=prover-header-builder /workspace/target/ /

FROM rust:1.68-slim-bullseye as prover-builder
FROM rust:1.74-slim-bullseye as prover-builder
WORKDIR /workspace
RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get update && \
apt-get install -y make wget gpg software-properties-common zlib1g-dev libstdc++-10-dev wabt
RUN wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - && \
add-apt-repository 'deb http://apt.llvm.org/bullseye/ llvm-toolchain-bullseye-12 main' && \
add-apt-repository 'deb http://apt.llvm.org/bullseye/ llvm-toolchain-bullseye-15 main' && \
apt-get update && \
apt-get install -y llvm-12-dev libclang-common-12-dev
apt-get install -y llvm-15-dev libclang-common-15-dev libpolly-15-dev
COPY arbitrator/Cargo.* arbitrator/
COPY arbitrator/arbutil arbitrator/arbutil
COPY arbitrator/prover/Cargo.toml arbitrator/prover/
Expand Down
Loading
Loading