From 198db6becc0b8ee798aa2733e57bf87fa556bf39 Mon Sep 17 00:00:00 2001 From: Lyova Potyomkin Date: Wed, 28 Oct 2020 16:36:25 +0200 Subject: [PATCH] Update docker entrypoints --- docker/exit-tool/exit-tool-entry.sh | 4 ++-- docker/integration-test/entrypoint.sh | 15 ++++----------- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/docker/exit-tool/exit-tool-entry.sh b/docker/exit-tool/exit-tool-entry.sh index 65447192fa..2974154cf6 100755 --- a/docker/exit-tool/exit-tool-entry.sh +++ b/docker/exit-tool/exit-tool-entry.sh @@ -17,8 +17,8 @@ then exit 1 fi -zksync plonk-setup check || zksync plonk-setup download -zksync verify-keys unpack +zk run plonk-setup +zk run verify-keys unpack f db-wait COMMAND=$1 diff --git a/docker/integration-test/entrypoint.sh b/docker/integration-test/entrypoint.sh index 392a405bdd..b75e1c0b05 100755 --- a/docker/integration-test/entrypoint.sh +++ b/docker/integration-test/entrypoint.sh @@ -7,17 +7,10 @@ nohup /usr/local/bin/geth-entry.sh &>/dev/null & service postgresql restart # Prepare dummy-prover in the contract (so the redeployed version will be OK) -zksync dummy-prover enable-no-redeploy - -# Initialize the stack (mostly, it's an init command with some steps skipped for docker environment) -zksync verify-keys unpack -zksync yarn || true # It can fail. -zksync db-setup -zksync build-dev-contracts -zksync deploy-erc20 dev -zksync build-contracts -zksync genesis -zksync redeploy +zk dummy-prover enable --no-redeploy + +# Initialize the stack +zk init # Compile required dependencies f cargo build --bin zksync_server --release