From b5fe157653ed6b9f86956f387eaaebe1a547eb1a Mon Sep 17 00:00:00 2001
From: Levent DEMIR <levent.demir@zama.ai>
Date: Fri, 18 Oct 2024 09:33:27 +0200
Subject: [PATCH] chore: bump to use last e2e version

---
 Makefile                               | 17 +++++++++++++++--
 README_COPROCESSOR.md                  |  6 +++---
 docker-compose/docker-compose-full.yml | 12 +++++++-----
 3 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index b6e93aa..6249747 100644
--- a/Makefile
+++ b/Makefile
@@ -33,7 +33,7 @@ check_os:
 
 # This version must the same as in docker-compose-full.yml
 # TODO add check
-KMS_DEV_VERSION ?= v0.9.0-rc13
+KMS_DEV_VERSION ?= v0.9.0-rc18-e2e-testing
 
 FHEVM_SOLIDITY_REPO ?= fhevm
 FHEVM_SOLIDITY_PATH ?= $(WORKDIR)/$(FHEVM_SOLIDITY_REPO)
@@ -135,6 +135,19 @@ endif
 
 
 run-full:
+	@echo "Running co-processor"
+	$(MAKE) run-coprocessor
+	@echo "Running kms"
+	$(MAKE) run-kms
+	@echo "Predeployment of SCs"
+	$(MAKE) prepare-e2e-test
+
+
+stop-full:
+	$(MAKE) stop-kms
+	$(MAKE) stop-coprocessor
+
+run-kms:
 	$(MAKE) generate-fhe-keys-registry-dev-image
 ifeq ($(KEY_GEN),false)
 	@echo "KEY_GEN is false, executing corresponding commands..."
@@ -149,7 +162,7 @@ endif
 	@echo 'sleep a little to let the docker start up'
 	sleep 5
 
-stop-full:
+stop-kms:
 	@docker compose  -f docker-compose/docker-compose-full.yml down
 
 TEST_FILE := run_tests.sh
diff --git a/README_COPROCESSOR.md b/README_COPROCESSOR.md
index faefa3a..153bc12 100644
--- a/README_COPROCESSOR.md
+++ b/README_COPROCESSOR.md
@@ -26,7 +26,7 @@ across all the components for this test setup.
    KMS blockchain).
 
 ```bash
-make run-full
+make run-kms
 ```
 
 2. Run the fhevm coprocessor network (including a geth node).
@@ -47,7 +47,7 @@ If prompted to install npm dependencies, enter `y`.
 
 ```bash
 cd $path-to-kms-core
-git checkout mano/update-to-latest-fhevm
+git checkout mano/update-release-v0.9.0-for-copro
 cd blockchain/gateway
 cargo run --bin gateway
 ```
@@ -66,7 +66,7 @@ Wait for the gateway to start listening for blocks and print block numbers.
 5. From the fhevm repo, run one of the test for trivial decryption.
 
 ```bash
-cd work_dir/fhevm && npx hardhat test --grep 'test async decrypt uint32$'
+cd work_dir/fhevm & npx hardhat test --grep 'test async decrypt uint32$'
 ```
 
 6. To tear down the setup, stop the docker containers:
diff --git a/docker-compose/docker-compose-full.yml b/docker-compose/docker-compose-full.yml
index e583adf..f04aa25 100644
--- a/docker-compose/docker-compose-full.yml
+++ b/docker-compose/docker-compose-full.yml
@@ -3,14 +3,14 @@ name: zama-dev
 services:
 
   gateway-store:
-    image: ghcr.io/zama-ai/kms-blockchain-gateway-dev:v0.9.0-rc13
+    image: ghcr.io/zama-ai/kms-blockchain-gateway-dev:v0.9.0-rc18-e2e-testing
     command:
       - "kv_store"
     ports:
       - "8088:8088"
 
   kms-validator:
-    image: ghcr.io/zama-ai/kms-blockchain-asc-dev:v0.9.0-rc13
+    image: ghcr.io/zama-ai/kms-blockchain-asc-dev:v0.9.0-rc18-e2e-testing
     ports:
       - "36656:26656"
       - "36657:26657"
@@ -29,7 +29,7 @@ services:
       start_period: 10s
 
   connector:
-    image: ghcr.io/zama-ai/kms-blockchain-connector-dev:v0.9.0-rc13
+    image: ghcr.io/zama-ai/kms-blockchain-connector-dev:v0.9.0-rc18-e2e-testing
     command:
       - "kms-blockchain-connector"
     environment:
@@ -48,7 +48,9 @@ services:
         condition: service_healthy
 
   kms-core:
-    image: ghcr.io/zama-ai/kms-service-dev:v0.9.0-rc13
+    image: ghcr.io/zama-ai/kms-service-dev:v0.9.0-rc18-e2e-testing
+    environment:
+      - RUST_LOG=info
     volumes:
       - $PWD/res/keys:/app/kms/core/service/keys:Z
     ports:
@@ -60,7 +62,7 @@ services:
       retries: 5
       start_period: 10s
   #  gateway:
-  #    image: ghcr.io/zama-ai/kms-blockchain-gateway-dev:v0.9.0-rc13
+  #    image: ghcr.io/zama-ai/kms-blockchain-gateway-dev:v0.9.0-rc18-e2e-testing
   #    ports:
   #      - "7077:7077"
   #    command: