diff --git a/dockerfiles/evmapp/entrypoint.sh b/dockerfiles/evmapp/entrypoint.sh index cec69bb..addffd6 100755 --- a/dockerfiles/evmapp/entrypoint.sh +++ b/dockerfiles/evmapp/entrypoint.sh @@ -114,12 +114,22 @@ if [ "${SCNODE_CERT_SIGNING_ENABLED:-}" = "true" ]; then echo "Error: When SCNODE_CERT_SIGNING_ENABLED=true and SCNODE_REMOTE_KEY_MANAGER_ENABLED=true SCNODE_REMOTE_KEY_MANAGER_REQUEST_TIMEOUT needs to be set." sleep 5 exit 1 + else + # setting SCNODE_REMOTE_KEY_MANAGER_REQUEST_TIMEOUT if provided + REMOTE_KEY_MANAGER_REQUEST_TIMEOUT="" + REMOTE_KEY_MANAGER_REQUEST_TIMEOUT="$(echo -en "\n requestTimeout = ${SCNODE_REMOTE_KEY_MANAGER_REQUEST_TIMEOUT}")" + export REMOTE_KEY_MANAGER_REQUEST_TIMEOUT fi if [ "${SCNODE_REMOTE_KEY_MANAGER_ENABLED:-}" = "true" ] && [ -z "${SCNODE_REMOTE_KEY_MANAGER_PARALLEL_REQUESTS:-}" ]; then echo "Error: When SCNODE_CERT_SIGNING_ENABLED=true and SCNODE_REMOTE_KEY_MANAGER_ENABLED=true SCNODE_REMOTE_KEY_MANAGER_PARALLEL_REQUESTS needs to be set." sleep 5 exit 1 + else + # setting SCNODE_REMOTE_KEY_MANAGER_PARALLEL_REQUESTS if provided + REMOTE_KEY_MANAGER_PARALLEL_REQUESTS="" + REMOTE_KEY_MANAGER_PARALLEL_REQUESTS="$(echo -en "\n numOfParallelRequests = ${SCNODE_REMOTE_KEY_MANAGER_PARALLEL_REQUESTS}")" + export REMOTE_KEY_MANAGER_PARALLEL_REQUESTS fi if [ "${SCNODE_REMOTE_KEY_MANAGER_ENABLED:-}" = "true" ] && [ -n "${SCNODE_REMOTE_KEY_MANAGER_ADDRESS:-}" ]; then @@ -272,7 +282,7 @@ SUBST='$SCNODE_CERT_MASTERS_PUBKEYS:$SCNODE_CERT_SIGNERS_MAXPKS:$SCNODE_CERT_SIG '$SCNODE_GENESIS_WITHDRAWALEPOCHLENGTH:$SCNODE_GENESIS_COMMTREEHASH:$SCNODE_GENESIS_ISNONCEASING:$SCNODE_ALLOWED_FORGERS:$SCNODE_FORGER_ENABLED:$SCNODE_FORGER_RESTRICT:'\ '$SCNODE_NET_DECLAREDADDRESS:$SCNODE_NET_KNOWNPEERS:$SCNODE_NET_MAGICBYTES:$SCNODE_NET_NODENAME:$SCNODE_NET_P2P_PORT:$SCNODE_NET_API_LIMITER_ENABLED:$SCNODE_NET_SLOW_MODE:$SCNODE_NET_REBROADCAST_TXS:$SCNODE_NET_HANDLING_TXS:'\ '$SCNODE_WALLET_GENESIS_SECRETS:$SCNODE_WALLET_MAXTX_FEE:$SCNODE_WALLET_SEED:$WS_ADDRESS:$MAX_INCOMING_CONNECTIONS:$MAX_OUTGOING_CONNECTIONS:$SCNODE_WS_SERVER_PORT:'\ -'$SCNODE_WS_CLIENT_ENABLED:$SCNODE_WS_SERVER_ENABLED:$SCNODE_REMOTE_KEY_MANAGER_ENABLED:$SCNODE_REMOTE_KEY_MANAGER_ADDRESS:$SCNODE_LOG_FILE_LEVEL:$SCNODE_LOG_CONSOLE_LEVEL:$SCNODE_REMOTE_KEY_MANAGER_REQUEST_TIMEOUT:$SCNODE_REMOTE_KEY_MANAGER_PARALLEL_REQUESTS:'\ +'$SCNODE_WS_CLIENT_ENABLED:$SCNODE_WS_SERVER_ENABLED:$SCNODE_REMOTE_KEY_MANAGER_ENABLED:$SCNODE_REMOTE_KEY_MANAGER_ADDRESS:$SCNODE_LOG_FILE_LEVEL:$SCNODE_LOG_CONSOLE_LEVEL:$REMOTE_KEY_MANAGER_REQUEST_TIMEOUT:$REMOTE_KEY_MANAGER_PARALLEL_REQUESTS:'\ '$SCNODE_REST_APIKEYHASH:$SCNODE_REST_PORT'\ export SUBST diff --git a/dockerfiles/evmapp/sc_settings.conf.tmpl b/dockerfiles/evmapp/sc_settings.conf.tmpl index 9340f37..c8ea0f0 100644 --- a/dockerfiles/evmapp/sc_settings.conf.tmpl +++ b/dockerfiles/evmapp/sc_settings.conf.tmpl @@ -86,9 +86,7 @@ sparkz { remoteKeysManager { enabled = $SCNODE_REMOTE_KEY_MANAGER_ENABLED - address = "$SCNODE_REMOTE_KEY_MANAGER_ADDRESS" - requestTimeout = $SCNODE_REMOTE_KEY_MANAGER_REQUEST_TIMEOUT - numOfParallelRequests = $SCNODE_REMOTE_KEY_MANAGER_PARALLEL_REQUESTS + address = "$SCNODE_REMOTE_KEY_MANAGER_ADDRESS"$REMOTE_KEY_MANAGER_REQUEST_TIMEOUT$REMOTE_KEY_MANAGER_PARALLEL_REQUESTS } genesis {