From a181294b3194cf6333486d3ef3f6db225101eb34 Mon Sep 17 00:00:00 2001 From: Zhuo Zhang Date: Mon, 27 May 2024 14:37:21 +0800 Subject: [PATCH] remove libzktrie.so --- README.md | 1 - build/dockerfiles/coordinator-api.Dockerfile | 2 -- build/dockerfiles/event_watcher.Dockerfile | 2 -- build/dockerfiles/gas_oracle.Dockerfile | 2 -- build/dockerfiles/rollup_relayer.Dockerfile | 2 -- coordinator/Makefile | 1 - coordinator/internal/logic/verifier/verifier.go | 4 ++-- prover/Makefile | 1 - prover/core/prover.go | 4 ++-- rollup/Makefile | 1 - rollup/run_test.sh | 1 - 11 files changed, 4 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index f93c93339..73318fbb1 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,6 @@ export SCROLL_LIB_PATH=/scroll/lib sudo mkdir -p $SCROLL_LIB_PATH -sudo wget -O $SCROLL_LIB_PATH/libzktrie.so https://github.com/scroll-tech/da-codec/releases/download/$LIBSCROLL_ZSTD_VERSION/libzktrie.so sudo wget -O $SCROLL_LIB_PATH/libscroll_zstd.so https://github.com/scroll-tech/da-codec/releases/download/$LIBSCROLL_ZSTD_VERSION/libscroll_zstd.so export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$SCROLL_LIB_PATH diff --git a/build/dockerfiles/coordinator-api.Dockerfile b/build/dockerfiles/coordinator-api.Dockerfile index 743113cb1..2bf830d4b 100644 --- a/build/dockerfiles/coordinator-api.Dockerfile +++ b/build/dockerfiles/coordinator-api.Dockerfile @@ -13,7 +13,6 @@ RUN cargo chef cook --release --recipe-path recipe.json COPY ./common/libzkp/impl . RUN cargo build --release -RUN find ./ | grep libzktrie.so | xargs -I{} cp {} /app/target/release/ # Download Go dependencies @@ -35,7 +34,6 @@ FROM base as builder COPY . . RUN cp -r ./common/libzkp/interface ./coordinator/internal/logic/verifier/lib COPY --from=zkp-builder /app/target/release/libzkp.so ./coordinator/internal/logic/verifier/lib/ -COPY --from=zkp-builder /app/target/release/libzktrie.so ./coordinator/internal/logic/verifier/lib/ RUN cd ./coordinator && make coordinator_api_skip_libzkp && mv ./build/bin/coordinator_api /bin/coordinator_api && mv internal/logic/verifier/lib /bin/ # Pull coordinator into a second stage deploy alpine container diff --git a/build/dockerfiles/event_watcher.Dockerfile b/build/dockerfiles/event_watcher.Dockerfile index a9bf86f75..ac06f77b5 100644 --- a/build/dockerfiles/event_watcher.Dockerfile +++ b/build/dockerfiles/event_watcher.Dockerfile @@ -25,7 +25,6 @@ RUN mkdir -p $SCROLL_LIB_PATH RUN apt-get -qq update && apt-get -qq install -y wget -RUN wget -O $SCROLL_LIB_PATH/libzktrie.so https://github.com/scroll-tech/da-codec/releases/download/$LIBSCROLL_ZSTD_VERSION/libzktrie.so RUN wget -O $SCROLL_LIB_PATH/libscroll_zstd.so https://github.com/scroll-tech/da-codec/releases/download/$LIBSCROLL_ZSTD_VERSION/libscroll_zstd.so ENV LD_LIBRARY_PATH=$SCROLL_LIB_PATH @@ -45,7 +44,6 @@ RUN mkdir -p $SCROLL_LIB_PATH RUN apt-get -qq update && apt-get -qq install -y wget -RUN wget -O $SCROLL_LIB_PATH/libzktrie.so https://github.com/scroll-tech/da-codec/releases/download/$LIBSCROLL_ZSTD_VERSION/libzktrie.so RUN wget -O $SCROLL_LIB_PATH/libscroll_zstd.so https://github.com/scroll-tech/da-codec/releases/download/$LIBSCROLL_ZSTD_VERSION/libscroll_zstd.so ENV LD_LIBRARY_PATH=$SCROLL_LIB_PATH diff --git a/build/dockerfiles/gas_oracle.Dockerfile b/build/dockerfiles/gas_oracle.Dockerfile index 7aaf5522d..9459263f9 100644 --- a/build/dockerfiles/gas_oracle.Dockerfile +++ b/build/dockerfiles/gas_oracle.Dockerfile @@ -25,7 +25,6 @@ RUN mkdir -p $SCROLL_LIB_PATH RUN apt-get -qq update && apt-get -qq install -y wget -RUN wget -O $SCROLL_LIB_PATH/libzktrie.so https://github.com/scroll-tech/da-codec/releases/download/$LIBSCROLL_ZSTD_VERSION/libzktrie.so RUN wget -O $SCROLL_LIB_PATH/libscroll_zstd.so https://github.com/scroll-tech/da-codec/releases/download/$LIBSCROLL_ZSTD_VERSION/libscroll_zstd.so ENV LD_LIBRARY_PATH=$SCROLL_LIB_PATH @@ -45,7 +44,6 @@ RUN mkdir -p $SCROLL_LIB_PATH RUN apt-get -qq update && apt-get -qq install -y wget -RUN wget -O $SCROLL_LIB_PATH/libzktrie.so https://github.com/scroll-tech/da-codec/releases/download/$LIBSCROLL_ZSTD_VERSION/libzktrie.so RUN wget -O $SCROLL_LIB_PATH/libscroll_zstd.so https://github.com/scroll-tech/da-codec/releases/download/$LIBSCROLL_ZSTD_VERSION/libscroll_zstd.so ENV LD_LIBRARY_PATH=$SCROLL_LIB_PATH diff --git a/build/dockerfiles/rollup_relayer.Dockerfile b/build/dockerfiles/rollup_relayer.Dockerfile index a9f5050b1..92ec27c28 100644 --- a/build/dockerfiles/rollup_relayer.Dockerfile +++ b/build/dockerfiles/rollup_relayer.Dockerfile @@ -25,7 +25,6 @@ RUN mkdir -p $SCROLL_LIB_PATH RUN apt-get -qq update && apt-get -qq install -y wget -RUN wget -O $SCROLL_LIB_PATH/libzktrie.so https://github.com/scroll-tech/da-codec/releases/download/$LIBSCROLL_ZSTD_VERSION/libzktrie.so RUN wget -O $SCROLL_LIB_PATH/libscroll_zstd.so https://github.com/scroll-tech/da-codec/releases/download/$LIBSCROLL_ZSTD_VERSION/libscroll_zstd.so ENV LD_LIBRARY_PATH=$SCROLL_LIB_PATH @@ -45,7 +44,6 @@ RUN mkdir -p $SCROLL_LIB_PATH RUN apt-get -qq update && apt-get -qq install -y wget -RUN wget -O $SCROLL_LIB_PATH/libzktrie.so https://github.com/scroll-tech/da-codec/releases/download/$LIBSCROLL_ZSTD_VERSION/libzktrie.so RUN wget -O $SCROLL_LIB_PATH/libscroll_zstd.so https://github.com/scroll-tech/da-codec/releases/download/$LIBSCROLL_ZSTD_VERSION/libscroll_zstd.so ENV LD_LIBRARY_PATH=$SCROLL_LIB_PATH diff --git a/coordinator/Makefile b/coordinator/Makefile index 893c51aef..5f7cde3d7 100644 --- a/coordinator/Makefile +++ b/coordinator/Makefile @@ -19,7 +19,6 @@ test: libzkp: cd ../common/libzkp/impl && cargo clean && cargo build --release && cp ./target/release/libzkp.so ../interface/ rm -rf ./internal/logic/verifier/lib && cp -r ../common/libzkp/interface ./internal/logic/verifier/lib - find ../common | grep libzktrie.so | xargs -I{} cp {} ./internal/logic/verifier/lib coordinator_api: libzkp ## Builds the Coordinator api instance. go build -ldflags "-X scroll-tech/common/version.ZkVersion=${ZK_VERSION}" -o $(PWD)/build/bin/coordinator_api ./cmd/api diff --git a/coordinator/internal/logic/verifier/verifier.go b/coordinator/internal/logic/verifier/verifier.go index 4761620c5..9de3bc282 100644 --- a/coordinator/internal/logic/verifier/verifier.go +++ b/coordinator/internal/logic/verifier/verifier.go @@ -3,8 +3,8 @@ package verifier /* -#cgo LDFLAGS: -lzkp -lm -ldl -lzktrie -L${SRCDIR}/lib/ -Wl,-rpath,${SRCDIR}/lib -#cgo gpu LDFLAGS: -lzkp -lm -ldl -lgmp -lstdc++ -lprocps -lzktrie -L/usr/local/cuda/lib64/ -lcudart -L${SRCDIR}/lib/ -Wl,-rpath,${SRCDIR}/lib +#cgo LDFLAGS: -lzkp -lm -ldl -L${SRCDIR}/lib/ -Wl,-rpath,${SRCDIR}/lib +#cgo gpu LDFLAGS: -lzkp -lm -ldl -lgmp -lstdc++ -lprocps -L/usr/local/cuda/lib64/ -lcudart -L${SRCDIR}/lib/ -Wl,-rpath,${SRCDIR}/lib #include #include "./lib/libzkp.h" */ diff --git a/prover/Makefile b/prover/Makefile index b7510fc96..39610499a 100644 --- a/prover/Makefile +++ b/prover/Makefile @@ -21,7 +21,6 @@ endif libzkp: cd ../common/libzkp/impl && cargo clean && cargo build --release && cp ./target/release/libzkp.so ../interface/ rm -rf ./core/lib && cp -r ../common/libzkp/interface ./core/lib - find ../common | grep libzktrie.so | xargs -I{} cp {} ./core/lib/ prover: libzkp ## Build the Prover instance. GOBIN=$(PWD)/build/bin go build -ldflags "-X scroll-tech/common/version.ZkVersion=${ZK_VERSION}" -o $(PWD)/build/bin/prover ./cmd diff --git a/prover/core/prover.go b/prover/core/prover.go index 3c5d963c5..b744d27a2 100644 --- a/prover/core/prover.go +++ b/prover/core/prover.go @@ -3,8 +3,8 @@ package core /* -#cgo LDFLAGS: -lzkp -lm -ldl -lzktrie -L${SRCDIR}/lib/ -Wl,-rpath,${SRCDIR}/lib -#cgo gpu LDFLAGS: -lzkp -lm -ldl -lgmp -lstdc++ -lprocps -lzktrie -L/usr/local/cuda/lib64/ -lcudart -L${SRCDIR}/lib/ -Wl,-rpath,${SRCDIR}/lib +#cgo LDFLAGS: -lzkp -lm -ldl -L${SRCDIR}/lib/ -Wl,-rpath,${SRCDIR}/lib +#cgo gpu LDFLAGS: -lzkp -lm -ldl -lgmp -lstdc++ -lprocps -L/usr/local/cuda/lib64/ -lcudart -L${SRCDIR}/lib/ -Wl,-rpath,${SRCDIR}/lib #include #include "./lib/libzkp.h" */ diff --git a/rollup/Makefile b/rollup/Makefile index bf997a6ba..408e8b2ae 100644 --- a/rollup/Makefile +++ b/rollup/Makefile @@ -11,7 +11,6 @@ mock_abi: libzstd: sudo mkdir -p $(SCROLL_LIB_PATH)/ - sudo wget -O $(SCROLL_LIB_PATH)/libzktrie.so https://github.com/scroll-tech/da-codec/releases/download/v0.0.0-rc1-ubuntu20.04/libzktrie.so sudo wget -O $(SCROLL_LIB_PATH)/libscroll_zstd.so https://github.com/scroll-tech/da-codec/releases/download/v0.0.0-rc1-ubuntu20.04/libscroll_zstd.so rollup_bins: libzstd ## Builds the Rollup bins. diff --git a/rollup/run_test.sh b/rollup/run_test.sh index 5df2e09bb..3bf96e3e6 100755 --- a/rollup/run_test.sh +++ b/rollup/run_test.sh @@ -6,7 +6,6 @@ export SCROLL_LIB_PATH=/scroll/lib sudo mkdir -p $SCROLL_LIB_PATH -sudo wget -O $SCROLL_LIB_PATH/libzktrie.so https://github.com/scroll-tech/da-codec/releases/download/$LIBSCROLL_ZSTD_VERSION/libzktrie.so sudo wget -O $SCROLL_LIB_PATH/libscroll_zstd.so https://github.com/scroll-tech/da-codec/releases/download/$LIBSCROLL_ZSTD_VERSION/libscroll_zstd.so # Set the environment variable