Skip to content

Commit 4b77041

Browse files
zacshowaImJeremyHe
andauthored
Remove espresso replay binary modifications (#307)
* Remove espresso validation in the replay binary * Remove espresso-crypto related dependencies in arbitrator * remove espressocryptowasm * Update Makefile and Dockerfile to remove references to unused espresso crypto wasm lib * remove batch_poster.go.orig file * Fixes from make fmt * Remove espresso_ops_test * Remove additional code related to espresso validation in the staker * Remove changes on stateless block validator * Undo the stopwaiter Previous modifications on this was because we had to stop and start the seuquencers to function the escape hatch. Right now we don't need that anymore. These changes are from the upstream * Rename test flag --------- Co-authored-by: ImJeremyHe <[email protected]>
1 parent 826d180 commit 4b77041

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+82
-7593
lines changed

Dockerfile

-5
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --de
5050
COPY ./Makefile ./
5151
COPY arbitrator/Cargo.* arbitrator/
5252
COPY arbitrator/arbutil arbitrator/arbutil
53-
COPY arbitrator/espresso-crypto-helper arbitrator/espresso-crypto-helper
5453
COPY arbitrator/brotli arbitrator/brotli
5554
COPY arbitrator/caller-env arbitrator/caller-env
5655
COPY arbitrator/prover arbitrator/prover
@@ -72,8 +71,6 @@ COPY ./Makefile ./go.mod ./go.sum ./
7271
COPY ./arbcompress ./arbcompress
7372
COPY ./arbos ./arbos
7473
COPY ./arbstate ./arbstate
75-
COPY ./espressocrypto ./espressocrypto
76-
COPY ./espressocryptowasm/ ./espressocryptowasm/
7774
COPY ./arbutil ./arbutil
7875
COPY ./gethhook ./gethhook
7976
COPY ./blsSignatures ./blsSignatures
@@ -112,7 +109,6 @@ COPY arbitrator/caller-env arbitrator/caller-env
112109
COPY arbitrator/prover arbitrator/prover
113110
COPY arbitrator/wasm-libraries arbitrator/wasm-libraries
114111
COPY arbitrator/jit arbitrator/jit
115-
COPY arbitrator/espresso-crypto-helper arbitrator/espresso-crypto-helper
116112
COPY arbitrator/stylus arbitrator/stylus
117113
COPY arbitrator/tools/wasmer arbitrator/tools/wasmer
118114
COPY espressocrypto espressocrypto
@@ -145,7 +141,6 @@ COPY arbitrator/prover/Cargo.toml arbitrator/prover/
145141
COPY arbitrator/prover/benches arbitrator/prover/benches
146142
COPY arbitrator/bench/Cargo.toml arbitrator/bench/
147143
COPY arbitrator/jit/Cargo.toml arbitrator/jit/
148-
COPY arbitrator/espresso-crypto-helper arbitrator/espresso-crypto-helper
149144
COPY arbitrator/stylus/Cargo.toml arbitrator/stylus/
150145
COPY arbitrator/tools/wasmer arbitrator/tools/wasmer
151146
COPY arbitrator/wasm-libraries/user-host-trait/Cargo.toml arbitrator/wasm-libraries/user-host-trait/Cargo.toml

Makefile

+2-7
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ replay_wasm=$(output_latest)/replay.wasm
6060
arb_brotli_files = $(wildcard arbitrator/brotli/src/*.* arbitrator/brotli/src/*/*.* arbitrator/brotli/*.toml arbitrator/brotli/*.rs) .make/cbrotli-lib .make/cbrotli-wasm
6161

6262
arbitrator_generated_header=$(output_root)/include/arbitrator.h
63-
arbitrator_wasm_libs=$(patsubst %, $(output_root)/machines/latest/%.wasm, forward wasi_stub host_io soft-float arbcompress user_host program_exec espresso_crypto)
63+
arbitrator_wasm_libs=$(patsubst %, $(output_root)/machines/latest/%.wasm, forward wasi_stub host_io soft-float arbcompress user_host program_exec)
6464
arbitrator_stylus_lib=$(output_root)/lib/libstylus.a
6565
prover_bin=$(output_root)/bin/prover
6666
arbitrator_jit=$(output_root)/bin/jit
@@ -440,14 +440,9 @@ $(output_latest)/forward_stub.wasm: $(DEP_PREDICATE) $(wasm_lib_forward) .make/m
440440
cargo run --manifest-path $(forward_dir)/Cargo.toml -- --path $(forward_dir)/forward_stub.wat --stub
441441
wat2wasm $(wasm_lib)/forward/forward_stub.wat -o $@
442442

443-
$(output_latest)/espresso_crypto.wasm: $(DEP_PREDICATE) $(wildcard arbitrator/wasm-libraries/espresso-crypto/src/*)
444-
mkdir -p $(output_root)/machines/latest
445-
cargo build --manifest-path arbitrator/wasm-libraries/Cargo.toml --release --target wasm32-wasi --config $(wasm_lib_cargo) --package espresso-crypto
446-
install arbitrator/wasm-libraries/target/wasm32-wasi/release/espresso_crypto.wasm $@
447-
448443
$(output_latest)/machine.wavm.br: $(DEP_PREDICATE) $(prover_bin) $(arbitrator_wasm_libs) $(replay_wasm)
449444
$(prover_bin) $(replay_wasm) --generate-binaries $(output_latest) \
450-
$(patsubst %,-l $(output_latest)/%.wasm, forward soft-float wasi_stub host_io user_host arbcompress program_exec espresso_crypto)
445+
$(patsubst %,-l $(output_latest)/%.wasm, forward soft-float wasi_stub host_io user_host arbcompress program_exec)
451446

452447
$(arbitrator_cases)/%.wasm: $(arbitrator_cases)/%.wat
453448
wat2wasm $< -o $@

0 commit comments

Comments
 (0)