@distrohelena/canton-typescript-sdk 0.1.20 → 0.1.21

package/node/start-local.sh

@@ -107,6 +107,14 @@ resolve_tls_enabled() {
   printf '%s\n' "$value"
 }
 
+localnet_http_scheme() {
+  if [[ "$(resolve_tls_enabled)" == "1" ]]; then
+    printf 'https\n'
+  else
+    printf 'http\n'
+  fi
+}
+
 resolve_tls_rotate() {
   local value="${LOCALNET_TLS_ROTATE:-0}"
   if [[ "$value" != "0" && "$value" != "1" ]]; then
@@ -136,6 +144,8 @@ prepare_tls_runtime_files() {
   local compose_file="$runtime_dir/compose-localnet.yaml"
   local tls_fragment_file="$runtime_dir/canton-tls.conf"
   local canton_config_file="$runtime_dir/canton-localnet.conf"
+  local onboarding_utils_source="$MODULES_DIR/splice-onboarding/docker/utils.sh"
+  local onboarding_utils_file="$runtime_dir/splice-onboarding-utils.sh"
   local supplied_count=0
 
   [[ -n "${LOCALNET_TLS_CERT_CHAIN_PATH:-}" ]] && ((supplied_count += 1))
@@ -207,6 +217,15 @@ EOF
     fi
   fi
 
+  if [[ ! -r "$onboarding_utils_source" ]]; then
+    echo "Unable to read Splice onboarding utilities at $onboarding_utils_source." >&2
+    return 1
+  fi
+  sed \
+    -e 's#http://\$participant#${LOCALNET_HTTP_SCHEME:-http}://$participant#g' \
+    -e 's#http://\$validator#${LOCALNET_HTTP_SCHEME:-http}://$validator#g' \
+    "$onboarding_utils_source" > "$onboarding_utils_file"
+
   : > "$tls_fragment_file"
   local participant profile
   for participant in app-provider app-user sv; do
@@ -250,6 +269,13 @@ services:
     environment:
       - |
         ADDITIONAL_CONFIG_LOCALNET_TLS=
+  splice-onboarding:
+    volumes:
+      - "$ca_certificate_path:/app/localnet-tls/ca.crt:ro"
+      - "$onboarding_utils_file:/app/utils.sh:ro"
+    environment:
+      - LOCALNET_HTTP_SCHEME=https
+      - CURL_CA_BUNDLE=/app/localnet-tls/ca.crt
 EOF
   for participant in app-provider app-user sv; do
     case "$participant" in
@@ -946,6 +972,7 @@ provision_extra_pqs() {
       -e EXTRA_PARTICIPANT_PARTY_HINT="extra_${index}_${PARTY_HINT_BASE}" \
       -e EXTRA_PQS_USER_NAME="${name}-pqs-user" \
       -e EXTRA_PQS_CONFIG_FILE="${name}-pqs.conf" \
+      -e LOCALNET_HTTP_SCHEME="$(localnet_http_scheme)" \
       splice-onboarding \
       bash -lc '
 set -euo pipefail
@@ -979,6 +1006,7 @@ grant_validator_read_as_any_party_right() {
     -e VALIDATOR_USER_NAME="$validator_user_name" \
     -e VALIDATOR_AUTH_AUDIENCE="$auth_audience" \
     -e PARTICIPANT_JSON_API_PORT="$participant_json_port" \
+    -e LOCALNET_HTTP_SCHEME="$(localnet_http_scheme)" \
     splice-onboarding \
     bash -lc '
 set -euo pipefail
@@ -995,7 +1023,7 @@ payload="$(cat <<EOF
 }
 EOF
 )"
-curl_check "http://$participant/v2/users/$VALIDATOR_USER_NAME/rights" "$validator_token" "application/json" \
+curl_check "${LOCALNET_HTTP_SCHEME:-http}://$participant/v2/users/$VALIDATOR_USER_NAME/rights" "$validator_token" "application/json" \
   --data-raw "$payload" >/dev/null
 '
 }
@@ -1009,6 +1037,7 @@ grant_user_read_as_any_party_right() {
     -e TARGET_USER_NAME="$user_name" \
     -e TARGET_AUTH_AUDIENCE="$auth_audience" \
     -e PARTICIPANT_JSON_API_PORT="$participant_json_port" \
+    -e LOCALNET_HTTP_SCHEME="$(localnet_http_scheme)" \
     splice-onboarding \
     bash -lc '
 set -euo pipefail
@@ -1025,7 +1054,7 @@ payload="$(cat <<EOF
 }
 EOF
 )"
-curl_check "http://$participant/v2/users/$TARGET_USER_NAME/rights" "$admin_token" "application/json" \
+curl_check "${LOCALNET_HTTP_SCHEME:-http}://$participant/v2/users/$TARGET_USER_NAME/rights" "$admin_token" "application/json" \
   --data-raw "$payload" >/dev/null
 '
 }

package/node/test-start-local.sh

@@ -62,6 +62,13 @@ run_case() {
   : > "$quickstart_dir/docker/modules/pqs/compose.yaml"
   : > "$quickstart_dir/docker/modules/pqs/compose.env"
   : > "$quickstart_dir/docker/modules/splice-onboarding/compose.yaml"
+  printf '%s\n' \
+    'curl_check "http://$participant/v2/users"' \
+    'curl_check "http://$validator/api/validator/v0/scan-proxy/dso-party-id"' \
+    > "$quickstart_dir/docker/modules/splice-onboarding/docker-utils.sh"
+  mkdir -p "$quickstart_dir/docker/modules/splice-onboarding/docker"
+  mv "$quickstart_dir/docker/modules/splice-onboarding/docker-utils.sh" \
+    "$quickstart_dir/docker/modules/splice-onboarding/docker/utils.sh"
   : > "$quickstart_dir/docker/modules/keycloak/compose.yaml"
   : > "$quickstart_dir/docker/modules/keycloak/compose.env"
 
@@ -413,9 +420,14 @@ fi
 assert_file_contains_text "$tmpdir/tls/compose-localnet.yaml" '/app/localnet-tls/server.key:ro'
 assert_file_contains_text "$tmpdir/tls/compose-localnet.yaml" '/app/localnet-tls/ca.crt:ro'
 assert_file_contains_text "$tmpdir/tls/compose-localnet.yaml" 'ADDITIONAL_CONFIG_LOCALNET_TLS='
+assert_file_contains_text "$tmpdir/tls/compose-localnet.yaml" 'LOCALNET_HTTP_SCHEME=https'
+assert_file_contains_text "$tmpdir/tls/compose-localnet.yaml" 'CURL_CA_BUNDLE=/app/localnet-tls/ca.crt'
+assert_file_contains_text "$tmpdir/tls/compose-localnet.yaml" "$tmpdir/tls/splice-onboarding-utils.sh:/app/utils.sh:ro"
 assert_file_contains_text "$tmpdir/tls/compose-localnet.yaml" 'admin-api.tls.trust-collection-file = "/app/localnet-tls/ca.crt"'
 assert_file_contains_text "$tmpdir/tls/compose-localnet.yaml" 'ledger-api.client-config.tls.trust-collection-file = "/app/localnet-tls/ca.crt"'
 assert_file_contains_text "$tmpdir/tls/compose-localnet.yaml" 'SCRIBE_SOURCE_LEDGER_TLS_CAFILE: /app/localnet-tls/ca.crt'
+assert_file_contains_text "$tmpdir/tls/splice-onboarding-utils.sh" '${LOCALNET_HTTP_SCHEME:-http}://$participant/v2/users'
+assert_file_contains_text "$tmpdir/tls/splice-onboarding-utils.sh" '${LOCALNET_HTTP_SCHEME:-http}://$validator/api/validator/v0/scan-proxy/dso-party-id'
 if grep -Fq 'canton.validator-apps.app-user-validator_backend.participant-client' "$tmpdir/tls/compose-localnet.yaml"; then
   echo "unexpected client TLS configuration for inactive app-user participant" >&2
   exit 1

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@distrohelena/canton-typescript-sdk",
-    "version": "0.1.20",
+    "version": "0.1.21",
     "license": "Apache-2.0",
     "type": "module",
     "main": "./dist/index.js",