From 7d45b419f7d59e93583246a75adb30a16e3c1e39 Mon Sep 17 00:00:00 2001 From: dkijania Date: Mon, 1 Mar 2021 18:33:44 +0100 Subject: [PATCH] update docker & recalculate challenges total funds --- vitup/docker/Dockerfile | 18 +++++++----------- vitup/src/setup/start/quick/builder.rs | 1 + 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/vitup/docker/Dockerfile b/vitup/docker/Dockerfile index b9ca38a6..c862b266 100644 --- a/vitup/docker/Dockerfile +++ b/vitup/docker/Dockerfile @@ -42,33 +42,29 @@ RUN apt-get install -y build-essential pkg-config libssl-dev && \ ~/.cargo/bin/rustup default stable RUN cd ${ENV_PREFIX} && \ - git clone --recurse-submodules https://github.com/input-output-hk/jormungandr && \ + git clone https://github.com/input-output-hk/jormungandr && \ cd jormungandr && \ - git checkout master + git checkout 58600c672fcd80279426331c2e16fa2143f2cb9b RUN cd ${ENV_PREFIX} && \ - git clone --recurse-submodules https://github.com/input-output-hk/vit-servicing-station && \ + git clone https://github.com/input-output-hk/vit-servicing-station && \ cd vit-servicing-station && \ - git checkout master + git checkout 160f09c7a26fe31628b7573e8c326e3d90f1ab47 RUN cd ${ENV_PREFIX} && \ - git clone --recurse-submodules https://github.com/input-output-hk/vit-testing + git clone https://github.com/input-output-hk/vit-testing # install the node and jcli from source RUN cd ${ENV_PREFIX}/vit-servicing-station && \ - git submodule update --init --recursive && \ - ~/.cargo/bin/cargo build --all --release && \ - ~/.cargo/bin/cargo install --locked --force --path vit-servicing-station-cli && \ ~/.cargo/bin/cargo install --locked --force --path vit-servicing-station-server # install the node and jcli from source RUN cd ${ENV_PREFIX}/jormungandr && \ - ~/.cargo/bin/cargo build --all --release && \ - cp ${ENV_PREFIX}/jormungandr/target/release/jormungandr ${ENV_PREFIX}/jormungandr/target/release/jcli ~/.cargo/bin + ~/.cargo/bin/cargo install --locked --path jormungandr && \ + ~/.cargo/bin/cargo install --locked --path jcli # install the node and jcli from source RUN cd ${ENV_PREFIX}/vit-testing && \ - ~/.cargo/bin/cargo build --release && \ ~/.cargo/bin/cargo install --locked --path vitup && \ ~/.cargo/bin/cargo install --locked --path iapyx diff --git a/vitup/src/setup/start/quick/builder.rs b/vitup/src/setup/start/quick/builder.rs index 08df1dad..f91c32ed 100644 --- a/vitup/src/setup/start/quick/builder.rs +++ b/vitup/src/setup/start/quick/builder.rs @@ -216,6 +216,7 @@ impl QuickVitBackendSettingsBuilder { parameters .set_next_fund_start_time(self.parameters.next_vote_start_time.unwrap().timestamp()); parameters.set_fund_id(self.parameters.fund_id); + parameters.calculate_challenges_total_funds = true; if self.parameters.private { let private_key_data = settings.private_vote_plans.get(&self.fund_name()).unwrap();