Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion test-suite/fhevm/config/kms-core/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ storage_cache_size = 1000

[public_vault.storage.s3]
bucket = "kms-public"
prefix = "PUB"

[private_vault.storage.file]
path = "./keys"
Expand All @@ -38,4 +39,4 @@ user_decrypt = 1
crsgen = 100
preproc = 25000
keygen = 1000
reshare = 25
reshare = 25
4 changes: 2 additions & 2 deletions test-suite/fhevm/docker-compose/core-docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ services:
export AWS_ACCESS_KEY_ID=$$(cat /minio_secrets/access_key)
export AWS_SECRET_ACCESS_KEY=$$(cat /minio_secrets/secret_key)
echo '=================GENERATING SIGNING KEYS================='
kms-gen-keys --public-storage s3 --public-s3-bucket "$$KMS_CORE__PUBLIC_VAULT__STORAGE__S3__BUCKET" --aws-s3-endpoint "$$S3_ENDPOINT" --aws-region "$$S3_REGION" --private-storage file --private-file-path "$$KMS_CORE__PRIVATE_VAULT__STORAGE__FILE__PATH" --cmd signing-keys centralized
kms-gen-keys --public-storage s3 --public-s3-bucket "$$KMS_CORE__PUBLIC_VAULT__STORAGE__S3__BUCKET" --public-s3-prefix "$$KMS_CORE__PUBLIC_VAULT__STORAGE__S3__PREFIX" --aws-s3-endpoint "$$S3_ENDPOINT" --aws-region "$$S3_REGION" --private-storage file --private-file-path "$$KMS_CORE__PRIVATE_VAULT__STORAGE__FILE__PATH" --cmd signing-keys centralized
echo '=================STARTING KMS SERVICE================='
kms-server --config-file config/config.toml
volumes:
Expand All @@ -30,4 +30,4 @@ services:

volumes:
fhevm_minio_secrets:
external: true
external: true
3 changes: 2 additions & 1 deletion test-suite/fhevm/env/staging/.env.core
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
# VAULT STORAGE CONFIGURATION
# =============================================================================
KMS_CORE__PUBLIC_VAULT__STORAGE__S3__BUCKET=kms-public
KMS_CORE__PUBLIC_VAULT__STORAGE__S3__PREFIX=PUB
KMS_CORE__PRIVATE_VAULT__STORAGE__FILE__PATH=./keys

# =============================================================================
Expand All @@ -14,4 +15,4 @@ OBJECT_FOLDER=kms-public
# =============================================================================
# SERVICE CONFIGURATION
# =============================================================================
CORE_ADDRESSES=http://kms-core:50051
CORE_ADDRESSES=http://kms-core:50051
28 changes: 14 additions & 14 deletions test-suite/fhevm/fhevm-cli
Original file line number Diff line number Diff line change
Expand Up @@ -17,26 +17,26 @@ PROJECT="fhevm"
# Default versions for the fhevm stack.

# KMS connector services.
export CONNECTOR_DB_MIGRATION_VERSION=${CONNECTOR_DB_MIGRATION_VERSION:-"v0.10.5"}
export CONNECTOR_GW_LISTENER_VERSION=${CONNECTOR_GW_LISTENER_VERSION:-"v0.10.5"}
export CONNECTOR_KMS_WORKER_VERSION=${CONNECTOR_KMS_WORKER_VERSION:-"v0.10.5"}
export CONNECTOR_TX_SENDER_VERSION=${CONNECTOR_TX_SENDER_VERSION:-"v0.10.5"}
export CONNECTOR_DB_MIGRATION_VERSION=${CONNECTOR_DB_MIGRATION_VERSION:-"v0.10.9"}
export CONNECTOR_GW_LISTENER_VERSION=${CONNECTOR_GW_LISTENER_VERSION:-"v0.10.9"}
export CONNECTOR_KMS_WORKER_VERSION=${CONNECTOR_KMS_WORKER_VERSION:-"v0.10.9"}
export CONNECTOR_TX_SENDER_VERSION=${CONNECTOR_TX_SENDER_VERSION:-"v0.10.9"}

# Coprocessor services.
export COPROCESSOR_DB_MIGRATION_VERSION=${COPROCESSOR_DB_MIGRATION_VERSION:-"v0.10.5"}
export COPROCESSOR_GW_LISTENER_VERSION=${COPROCESSOR_GW_LISTENER_VERSION:-"v0.10.5"}
export COPROCESSOR_HOST_LISTENER_VERSION=${COPROCESSOR_HOST_LISTENER_VERSION:-"v0.10.5"}
export COPROCESSOR_TX_SENDER_VERSION=${COPROCESSOR_TX_SENDER_VERSION:-"v0.10.5"}
export COPROCESSOR_TFHE_WORKER_VERSION=${COPROCESSOR_TFHE_WORKER_VERSION:-"v0.10.5"}
export COPROCESSOR_SNS_WORKER_VERSION=${COPROCESSOR_SNS_WORKER_VERSION:-"v0.10.5"}
export COPROCESSOR_ZKPROOF_WORKER_VERSION=${COPROCESSOR_ZKPROOF_WORKER_VERSION:-"v0.10.5"}
export COPROCESSOR_DB_MIGRATION_VERSION=${COPROCESSOR_DB_MIGRATION_VERSION:-"6e09d3b"}
export COPROCESSOR_GW_LISTENER_VERSION=${COPROCESSOR_GW_LISTENER_VERSION:-"6e09d3b"}
export COPROCESSOR_HOST_LISTENER_VERSION=${COPROCESSOR_HOST_LISTENER_VERSION:-"6e09d3b"}
export COPROCESSOR_TX_SENDER_VERSION=${COPROCESSOR_TX_SENDER_VERSION:-"6e09d3b"}
export COPROCESSOR_TFHE_WORKER_VERSION=${COPROCESSOR_TFHE_WORKER_VERSION:-"6e09d3b"}
export COPROCESSOR_SNS_WORKER_VERSION=${COPROCESSOR_SNS_WORKER_VERSION:-"6e09d3b"}
export COPROCESSOR_ZKPROOF_WORKER_VERSION=${COPROCESSOR_ZKPROOF_WORKER_VERSION:-"6e09d3b"}

# Gateway and Host contracts.
export GATEWAY_VERSION=${GATEWAY_VERSION:-"v0.10.5"}
export HOST_VERSION=${HOST_VERSION:-"v0.10.5"}
export GATEWAY_VERSION=${GATEWAY_VERSION:-"v0.10.9"}
export HOST_VERSION=${HOST_VERSION:-"v0.10.9"}

# Other services.
export CORE_VERSION=${CORE_VERSION:-"v0.12.7"}
export CORE_VERSION=${CORE_VERSION:-"v0.13.0-rc.1"}
export RELAYER_VERSION=${RELAYER_VERSION:-"v0.8.4"}
export RELAYER_MIGRATE_VERSION=${RELAYER_MIGRATE_VERSION:-"v0.8.3"}
# Test-suite docker image cannot be updated with 0.10.x releases because of the introduction a
Expand Down
2 changes: 1 addition & 1 deletion test-suite/fhevm/scripts/setup-kms-signer-address.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
BASE_URL="http://localhost:9000/kms-public/PUB/VerfAddress"
ENV_HOST="${SCRIPT_DIR}/../env/staging/.env.host-sc.local"
ENV_GATEWAY="${SCRIPT_DIR}/../env/staging/.env.gateway-sc.local"
KEY_SIGNER_ID=$(docker logs kms-core | grep "Successfully stored public server signing key under the handle" | sed 's/.*handle \([^ ]*\).*/\1/')
KEY_SIGNER_ID=$(docker logs kms-core | grep "Successfully stored public centralized server signing key under the handle" | sed 's/.*handle \([^ ]*\).*/\1/')
SIGNER_ADDRESS_URL="$BASE_URL/$KEY_SIGNER_ID"

if [ -z "$KEY_SIGNER_ID" ]; then
Expand Down