Skip to content

Commit

Permalink
Merge pull request #31 from zama-ai/bump/v0.9.0-rc18
Browse files Browse the repository at this point in the history
chore: bump to use last e2e version
  • Loading branch information
leventdem authored Oct 18, 2024
2 parents ca87371 + b5fe157 commit 8079e40
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 10 deletions.
17 changes: 15 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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..."
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions README_COPROCESSOR.md
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand All @@ -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
```
Expand All @@ -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:
Expand Down
12 changes: 7 additions & 5 deletions docker-compose/docker-compose-full.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand Down

0 comments on commit 8079e40

Please sign in to comment.