From cc07805d2956e8b119a530c7617d3ef11d0f116d Mon Sep 17 00:00:00 2001 From: Tore Frederiksen Date: Mon, 4 Nov 2024 18:33:57 +0100 Subject: [PATCH 1/4] fix: update with hotfix for missing decryption events --- README.md | 12 ++++++------ docker-compose/docker-compose-full.yml | 12 ++++++------ scripts/copy_fhe_keys.sh | 2 +- scripts/prepare_volumes_from_kms_core.sh | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index db3141f..e359acb 100644 --- a/README.md +++ b/README.md @@ -205,12 +205,12 @@ docker logs zama-dev-gateway-1 -f You should see the following docker images: ``` -zama-dev-gateway-1 ghcr.io/zama-ai/kms-blockchain-gateway-dev:v0.8.1-rc4 -zama-dev-connector-1 ghcr.io/zama-ai/kms-blockchain-connector-dev:v0.8.1-rc4 -zama-dev-fhevm-validator-1 ghcr.io/zama-ai/ethermint-node:v0.5.1 -zama-dev-kms-core-1 ghcr.io/zama-ai/kms-service-dev:v0.8.1-rc4 -zama-dev-kms-validator-1 ghcr.io/zama-ai/kms-blockchain-asc-dev:v0.8.1-rc4 -zama-dev-gateway-store-1 ghcr.io/zama-ai/kms-blockchain-gateway-dev:v0.8.1-rc4 +zama-dev-gateway-1 ghcr.io/zama-ai/kms-blockchain-gateway-dev:v0.8.2-rc2 +zama-dev-connector-1 ghcr.io/zama-ai/kms-blockchain-connector-dev:v0.8.2-rc2 +zama-dev-fhevm-validator-1 ghcr.io/zama-ai/ethermint-node:v0.5.1-2 +zama-dev-kms-core-1 ghcr.io/zama-ai/kms-service-dev:v0.8.2-rc2 +zama-dev-kms-validator-1 ghcr.io/zama-ai/kms-blockchain-asc-dev:v0.8.2-rc2 +zama-dev-gateway-store-1 ghcr.io/zama-ai/kms-blockchain-gateway-dev:v0.8.2-rc2 ``` ### Stop fhEVM-native + KMS diff --git a/docker-compose/docker-compose-full.yml b/docker-compose/docker-compose-full.yml index f70857d..1eae7ab 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.8.1-rc4 + image: ghcr.io/zama-ai/kms-blockchain-gateway-dev:v0.8.2-rc2 command: - "kv_store" ports: - "8088:8088" kms-validator: - image: ghcr.io/zama-ai/kms-blockchain-asc-dev:v0.8.1-rc4 + image: ghcr.io/zama-ai/kms-blockchain-asc-dev:v0.8.2-rc2 ports: - "36656:26656" - "36657:26657" @@ -25,7 +25,7 @@ services: start_period: 10s connector: - image: ghcr.io/zama-ai/kms-blockchain-connector-dev:v0.8.1-rc4 + image: ghcr.io/zama-ai/kms-blockchain-connector-dev:v0.8.2-rc2 command: - "kms-blockchain-connector" environment: @@ -43,7 +43,7 @@ services: condition: service_healthy kms-core: - image: ghcr.io/zama-ai/kms-service-dev:v0.8.1-rc4 + image: ghcr.io/zama-ai/kms-service-dev:v0.8.2-rc2 volumes: - $PWD/res/keys:/app/kms/core/service/keys:Z ports: @@ -56,7 +56,7 @@ services: start_period: 10s gateway: - image: ghcr.io/zama-ai/kms-blockchain-gateway-dev:v0.8.1-rc4 + image: ghcr.io/zama-ai/kms-blockchain-gateway-dev:v0.8.2-rc2 ports: - "7077:7077" command: @@ -84,7 +84,7 @@ services: fhevm-validator: environment: - TFHE_EXECUTOR_CONTRACT_ADDRESS=0x05fD9B5EFE0a996095f42Ed7e77c390810CF660c - image: ghcr.io/zama-ai/ethermint-dev-node:v0.5.1 + image: ghcr.io/zama-ai/ethermint-dev-node:v0.5.1-2 ports: - "26656-26657:26656-26657" - "8545-8546:8545-8546" diff --git a/scripts/copy_fhe_keys.sh b/scripts/copy_fhe_keys.sh index 430cd7e..4b491db 100755 --- a/scripts/copy_fhe_keys.sh +++ b/scripts/copy_fhe_keys.sh @@ -7,7 +7,7 @@ # - the LOCAL_BUILD_PUBLIC_KEY_PATH as the second optional parameter. # - the LOCAL_BUILD_PRIVATE_KEY_PATH as the third optional parameter. -# mkdir -p temp; docker run --rm -v $PWD/temp:/keys ghcr.io/zama-ai/kms-service-dev:v0.8.1-rc4 ./bin/kms-gen-keys centralized --write-privkey --pub-url file://./keys --priv-url file://./keys --overwrite +# mkdir -p temp; docker run --rm -v $PWD/temp:/keys ghcr.io/zama-ai/kms-service-dev:v0.8.2-rc2 ./bin/kms-gen-keys centralized --write-privkey --pub-url file://./keys --priv-url file://./keys --overwrite set -Eeuo pipefail diff --git a/scripts/prepare_volumes_from_kms_core.sh b/scripts/prepare_volumes_from_kms_core.sh index acd7bf8..4b7a419 100755 --- a/scripts/prepare_volumes_from_kms_core.sh +++ b/scripts/prepare_volumes_from_kms_core.sh @@ -7,7 +7,7 @@ # - the LOCAL_BUILD_PUBLIC_KEY_PATH as the second optional parameter. # - the LOCAL_BUILD_PRIVATE_KEY_PATH as the third optional parameter. -# mkdir -p res/keys; docker run -e RUST_BACKTRACE=1 -v "$PWD/res/keys:/app/kms/core/service/keys" "ghcr.io/zama-ai/kms-service-dev:v0.8.1-rc4" "./bin/kms-gen-keys" centralized --write-privkey --pub-url file://./keys --priv-url file://./keys --overwrite +# mkdir -p res/keys; docker run -e RUST_BACKTRACE=1 -v "$PWD/res/keys:/app/kms/core/service/keys" "ghcr.io/zama-ai/kms-service-dev:v0.8.2-rc2" "./bin/kms-gen-keys" centralized --write-privkey --pub-url file://./keys --priv-url file://./keys --overwrite set -Eeuo pipefail From 0f5764804eb3d4ad2fbc1727011a6d6df9be9d6c Mon Sep 17 00:00:00 2001 From: Tore Frederiksen Date: Tue, 5 Nov 2024 11:59:03 +0100 Subject: [PATCH 2/4] build: updated missing version --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d1a74c4..4805007 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.8.1-rc4 +KMS_DEV_VERSION ?= v0.8.2-rc2 FHEVM_SOLIDITY_REPO ?= fhevm FHEVM_SOLIDITY_PATH ?= $(WORKDIR)/$(FHEVM_SOLIDITY_REPO) From c49de17c733bff9376cb75be830100fc56f18874 Mon Sep 17 00:00:00 2001 From: Tore Frederiksen Date: Tue, 5 Nov 2024 12:17:42 +0100 Subject: [PATCH 3/4] build: upgraded to 0.8.2-rc3 --- Makefile | 2 +- README.md | 10 +++++----- docker-compose/docker-compose-full.yml | 10 +++++----- scripts/copy_fhe_keys.sh | 2 +- scripts/prepare_volumes_from_kms_core.sh | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index 4805007..0ce486e 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.8.2-rc2 +KMS_DEV_VERSION ?= v0.8.2-rc3 FHEVM_SOLIDITY_REPO ?= fhevm FHEVM_SOLIDITY_PATH ?= $(WORKDIR)/$(FHEVM_SOLIDITY_REPO) diff --git a/README.md b/README.md index e359acb..ecb0a40 100644 --- a/README.md +++ b/README.md @@ -205,12 +205,12 @@ docker logs zama-dev-gateway-1 -f You should see the following docker images: ``` -zama-dev-gateway-1 ghcr.io/zama-ai/kms-blockchain-gateway-dev:v0.8.2-rc2 -zama-dev-connector-1 ghcr.io/zama-ai/kms-blockchain-connector-dev:v0.8.2-rc2 +zama-dev-gateway-1 ghcr.io/zama-ai/kms-blockchain-gateway-dev:v0.8.2-rc3 +zama-dev-connector-1 ghcr.io/zama-ai/kms-blockchain-connector-dev:v0.8.2-rc3 zama-dev-fhevm-validator-1 ghcr.io/zama-ai/ethermint-node:v0.5.1-2 -zama-dev-kms-core-1 ghcr.io/zama-ai/kms-service-dev:v0.8.2-rc2 -zama-dev-kms-validator-1 ghcr.io/zama-ai/kms-blockchain-asc-dev:v0.8.2-rc2 -zama-dev-gateway-store-1 ghcr.io/zama-ai/kms-blockchain-gateway-dev:v0.8.2-rc2 +zama-dev-kms-core-1 ghcr.io/zama-ai/kms-service-dev:v0.8.2-rc3 +zama-dev-kms-validator-1 ghcr.io/zama-ai/kms-blockchain-asc-dev:v0.8.2-rc3 +zama-dev-gateway-store-1 ghcr.io/zama-ai/kms-blockchain-gateway-dev:v0.8.2-rc3 ``` ### Stop fhEVM-native + KMS diff --git a/docker-compose/docker-compose-full.yml b/docker-compose/docker-compose-full.yml index 1eae7ab..1f91edf 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.8.2-rc2 + image: ghcr.io/zama-ai/kms-blockchain-gateway-dev:v0.8.2-rc3 command: - "kv_store" ports: - "8088:8088" kms-validator: - image: ghcr.io/zama-ai/kms-blockchain-asc-dev:v0.8.2-rc2 + image: ghcr.io/zama-ai/kms-blockchain-asc-dev:v0.8.2-rc3 ports: - "36656:26656" - "36657:26657" @@ -25,7 +25,7 @@ services: start_period: 10s connector: - image: ghcr.io/zama-ai/kms-blockchain-connector-dev:v0.8.2-rc2 + image: ghcr.io/zama-ai/kms-blockchain-connector-dev:v0.8.2-rc3 command: - "kms-blockchain-connector" environment: @@ -43,7 +43,7 @@ services: condition: service_healthy kms-core: - image: ghcr.io/zama-ai/kms-service-dev:v0.8.2-rc2 + image: ghcr.io/zama-ai/kms-service-dev:v0.8.2-rc3 volumes: - $PWD/res/keys:/app/kms/core/service/keys:Z ports: @@ -56,7 +56,7 @@ services: start_period: 10s gateway: - image: ghcr.io/zama-ai/kms-blockchain-gateway-dev:v0.8.2-rc2 + image: ghcr.io/zama-ai/kms-blockchain-gateway-dev:v0.8.2-rc3 ports: - "7077:7077" command: diff --git a/scripts/copy_fhe_keys.sh b/scripts/copy_fhe_keys.sh index 4b491db..87b4d2c 100755 --- a/scripts/copy_fhe_keys.sh +++ b/scripts/copy_fhe_keys.sh @@ -7,7 +7,7 @@ # - the LOCAL_BUILD_PUBLIC_KEY_PATH as the second optional parameter. # - the LOCAL_BUILD_PRIVATE_KEY_PATH as the third optional parameter. -# mkdir -p temp; docker run --rm -v $PWD/temp:/keys ghcr.io/zama-ai/kms-service-dev:v0.8.2-rc2 ./bin/kms-gen-keys centralized --write-privkey --pub-url file://./keys --priv-url file://./keys --overwrite +# mkdir -p temp; docker run --rm -v $PWD/temp:/keys ghcr.io/zama-ai/kms-service-dev:v0.8.2-rc3 ./bin/kms-gen-keys centralized --write-privkey --pub-url file://./keys --priv-url file://./keys --overwrite set -Eeuo pipefail diff --git a/scripts/prepare_volumes_from_kms_core.sh b/scripts/prepare_volumes_from_kms_core.sh index 4b7a419..5eb4e3b 100755 --- a/scripts/prepare_volumes_from_kms_core.sh +++ b/scripts/prepare_volumes_from_kms_core.sh @@ -7,7 +7,7 @@ # - the LOCAL_BUILD_PUBLIC_KEY_PATH as the second optional parameter. # - the LOCAL_BUILD_PRIVATE_KEY_PATH as the third optional parameter. -# mkdir -p res/keys; docker run -e RUST_BACKTRACE=1 -v "$PWD/res/keys:/app/kms/core/service/keys" "ghcr.io/zama-ai/kms-service-dev:v0.8.2-rc2" "./bin/kms-gen-keys" centralized --write-privkey --pub-url file://./keys --priv-url file://./keys --overwrite +# mkdir -p res/keys; docker run -e RUST_BACKTRACE=1 -v "$PWD/res/keys:/app/kms/core/service/keys" "ghcr.io/zama-ai/kms-service-dev:v0.8.2-rc3" "./bin/kms-gen-keys" centralized --write-privkey --pub-url file://./keys --priv-url file://./keys --overwrite set -Eeuo pipefail From 65c54b9e92574bd9d82f4d3a2b4824acf95379de Mon Sep 17 00:00:00 2001 From: Tore Frederiksen Date: Tue, 5 Nov 2024 14:18:18 +0100 Subject: [PATCH 4/4] build: updated to rc4 --- Makefile | 2 +- README.md | 10 +++++----- docker-compose/docker-compose-full.yml | 10 +++++----- scripts/copy_fhe_keys.sh | 2 +- scripts/prepare_volumes_from_kms_core.sh | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index 0ce486e..a524d47 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.8.2-rc3 +KMS_DEV_VERSION ?= v0.8.2-rc4 FHEVM_SOLIDITY_REPO ?= fhevm FHEVM_SOLIDITY_PATH ?= $(WORKDIR)/$(FHEVM_SOLIDITY_REPO) diff --git a/README.md b/README.md index ecb0a40..6104a0c 100644 --- a/README.md +++ b/README.md @@ -205,12 +205,12 @@ docker logs zama-dev-gateway-1 -f You should see the following docker images: ``` -zama-dev-gateway-1 ghcr.io/zama-ai/kms-blockchain-gateway-dev:v0.8.2-rc3 -zama-dev-connector-1 ghcr.io/zama-ai/kms-blockchain-connector-dev:v0.8.2-rc3 +zama-dev-gateway-1 ghcr.io/zama-ai/kms-blockchain-gateway-dev:v0.8.2-rc4 +zama-dev-connector-1 ghcr.io/zama-ai/kms-blockchain-connector-dev:v0.8.2-rc4 zama-dev-fhevm-validator-1 ghcr.io/zama-ai/ethermint-node:v0.5.1-2 -zama-dev-kms-core-1 ghcr.io/zama-ai/kms-service-dev:v0.8.2-rc3 -zama-dev-kms-validator-1 ghcr.io/zama-ai/kms-blockchain-asc-dev:v0.8.2-rc3 -zama-dev-gateway-store-1 ghcr.io/zama-ai/kms-blockchain-gateway-dev:v0.8.2-rc3 +zama-dev-kms-core-1 ghcr.io/zama-ai/kms-service-dev:v0.8.2-rc4 +zama-dev-kms-validator-1 ghcr.io/zama-ai/kms-blockchain-asc-dev:v0.8.2-rc4 +zama-dev-gateway-store-1 ghcr.io/zama-ai/kms-blockchain-gateway-dev:v0.8.2-rc4 ``` ### Stop fhEVM-native + KMS diff --git a/docker-compose/docker-compose-full.yml b/docker-compose/docker-compose-full.yml index 1f91edf..ad5db62 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.8.2-rc3 + image: ghcr.io/zama-ai/kms-blockchain-gateway-dev:v0.8.2-rc4 command: - "kv_store" ports: - "8088:8088" kms-validator: - image: ghcr.io/zama-ai/kms-blockchain-asc-dev:v0.8.2-rc3 + image: ghcr.io/zama-ai/kms-blockchain-asc-dev:v0.8.2-rc4 ports: - "36656:26656" - "36657:26657" @@ -25,7 +25,7 @@ services: start_period: 10s connector: - image: ghcr.io/zama-ai/kms-blockchain-connector-dev:v0.8.2-rc3 + image: ghcr.io/zama-ai/kms-blockchain-connector-dev:v0.8.2-rc4 command: - "kms-blockchain-connector" environment: @@ -43,7 +43,7 @@ services: condition: service_healthy kms-core: - image: ghcr.io/zama-ai/kms-service-dev:v0.8.2-rc3 + image: ghcr.io/zama-ai/kms-service-dev:v0.8.2-rc4 volumes: - $PWD/res/keys:/app/kms/core/service/keys:Z ports: @@ -56,7 +56,7 @@ services: start_period: 10s gateway: - image: ghcr.io/zama-ai/kms-blockchain-gateway-dev:v0.8.2-rc3 + image: ghcr.io/zama-ai/kms-blockchain-gateway-dev:v0.8.2-rc4 ports: - "7077:7077" command: diff --git a/scripts/copy_fhe_keys.sh b/scripts/copy_fhe_keys.sh index 87b4d2c..1500b8d 100755 --- a/scripts/copy_fhe_keys.sh +++ b/scripts/copy_fhe_keys.sh @@ -7,7 +7,7 @@ # - the LOCAL_BUILD_PUBLIC_KEY_PATH as the second optional parameter. # - the LOCAL_BUILD_PRIVATE_KEY_PATH as the third optional parameter. -# mkdir -p temp; docker run --rm -v $PWD/temp:/keys ghcr.io/zama-ai/kms-service-dev:v0.8.2-rc3 ./bin/kms-gen-keys centralized --write-privkey --pub-url file://./keys --priv-url file://./keys --overwrite +# mkdir -p temp; docker run --rm -v $PWD/temp:/keys ghcr.io/zama-ai/kms-service-dev:v0.8.2-rc4 ./bin/kms-gen-keys centralized --write-privkey --pub-url file://./keys --priv-url file://./keys --overwrite set -Eeuo pipefail diff --git a/scripts/prepare_volumes_from_kms_core.sh b/scripts/prepare_volumes_from_kms_core.sh index 5eb4e3b..92dbbe6 100755 --- a/scripts/prepare_volumes_from_kms_core.sh +++ b/scripts/prepare_volumes_from_kms_core.sh @@ -7,7 +7,7 @@ # - the LOCAL_BUILD_PUBLIC_KEY_PATH as the second optional parameter. # - the LOCAL_BUILD_PRIVATE_KEY_PATH as the third optional parameter. -# mkdir -p res/keys; docker run -e RUST_BACKTRACE=1 -v "$PWD/res/keys:/app/kms/core/service/keys" "ghcr.io/zama-ai/kms-service-dev:v0.8.2-rc3" "./bin/kms-gen-keys" centralized --write-privkey --pub-url file://./keys --priv-url file://./keys --overwrite +# mkdir -p res/keys; docker run -e RUST_BACKTRACE=1 -v "$PWD/res/keys:/app/kms/core/service/keys" "ghcr.io/zama-ai/kms-service-dev:v0.8.2-rc4" "./bin/kms-gen-keys" centralized --write-privkey --pub-url file://./keys --priv-url file://./keys --overwrite set -Eeuo pipefail