From 2ec3cf6eebdf8f2633bdc290e26f75a8404b899b Mon Sep 17 00:00:00 2001 From: ylembachar Date: Fri, 4 Jul 2025 11:44:19 +0200 Subject: [PATCH] add config to enable keyper endpoints --- docker-compose.yml | 5 +++-- package_variants/gnosis/docker-compose.yml | 1 + setup-wizard.yml | 12 ++++++++++++ shutter/go-shutter-settings/settings/keyper.go | 3 ++- shutter/scripts/configure_keyper.sh | 2 ++ 5 files changed, 20 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 9cff7ee..71872a1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,7 +12,7 @@ services: build: context: shutter args: - UPSTREAM_VERSION: v1.3.9 + UPSTREAM_VERSION: v1.3.10 KEYPER_CONFIG_DIR: /keyper/config SHUTTER_CHAIN_DIR: /chain STAKER_SCRIPTS_VERSION: v0.1.0 @@ -25,6 +25,7 @@ services: - SHUTTER_PUSH_LOGS_ENABLED=false - PUSHGATEWAY_USERNAME="" - PUSHGATEWAY_PASSWORD="" + - SHUTTER_HTTP_ENABLED=false volumes: - chain:/chain - keyper-config:/keyper/config @@ -44,4 +45,4 @@ volumes: db_data: {} chain: {} keyper-config: {} - metrics-config: {} + metrics-config: {} \ No newline at end of file diff --git a/package_variants/gnosis/docker-compose.yml b/package_variants/gnosis/docker-compose.yml index 98cae24..598fbc2 100644 --- a/package_variants/gnosis/docker-compose.yml +++ b/package_variants/gnosis/docker-compose.yml @@ -12,6 +12,7 @@ services: - "27656:27656" - "27660:27660" - "9200:9100" + - "3000:3000" metrics: build: diff --git a/setup-wizard.yml b/setup-wizard.yml index e9ba1de..c93de76 100644 --- a/setup-wizard.yml +++ b/setup-wizard.yml @@ -88,3 +88,15 @@ fields: required: false secret: true if: { enable_push_metrics: { "enum": ["true"] } } + + - id: http_enabled + title: HTTP Service Enabled + description: | + Enable or disable the HTTP service for the API Keyper. If enabled, the HTTP server will be started to handle incoming API requests. + target: + type: environment + name: SHUTTER_HTTP_ENABLED + service: shutter + enum: + - "true" + - "false" \ No newline at end of file diff --git a/shutter/go-shutter-settings/settings/keyper.go b/shutter/go-shutter-settings/settings/keyper.go index e07a552..5d34ce6 100644 --- a/shutter/go-shutter-settings/settings/keyper.go +++ b/shutter/go-shutter-settings/settings/keyper.go @@ -10,6 +10,7 @@ type KeyperConfig struct { InstanceID int `env:"_ASSETS_INSTANCE_ID"` DatabaseURL string `env:"SHUTTER_DATABASEURL"` BeaconAPIURL string `env:"SHUTTER_BEACONAPIURL"` + HTTPEnabled bool `env:"SHUTTER_HTTP_ENABLED"` MaxNumKeysPerMessage int `env:"_ASSETS_MAX_NUM_KEYS_PER_MESSAGE"` Chain struct { EncryptedGasLimit int `env:"_ASSETS_ENCRYPTED_GAS_LIMIT"` @@ -85,4 +86,4 @@ func AddSettingsToKeyper(generatedFilePath, configFilePath, outputFilePath strin fmt.Println("Keyper TOML file modified successfully and saved to", outputFilePath) return nil -} +} \ No newline at end of file diff --git a/shutter/scripts/configure_keyper.sh b/shutter/scripts/configure_keyper.sh index 1115a94..0211f3f 100755 --- a/shutter/scripts/configure_keyper.sh +++ b/shutter/scripts/configure_keyper.sh @@ -47,6 +47,8 @@ export VALIDATOR_PUBLIC_KEY=$(cat "${SHUTTER_CHAIN_DIR}/config/priv_validator_pu export SHUTTER_METRICS_ENABLED=${SHUTTER_PUSH_METRICS_ENABLED} export FLOODSUB_DISCOVERY_ENABLED=true export SHUTTER_DISCOVERY_NAMESPACE="${_ASSETS_DISCOVERY_NAME_PREFIX}-${_ASSETS_INSTANCE_ID}" +export SHUTTER_HTTP_ENABLED=${SHUTTER_HTTP_ENABLED} + echo "[INFO | configure] LISTEN: $SHUTTER_P2P_LISTENADDRESSES"