@distrohelena/canton-typescript-sdk 0.1.31 → 0.1.32

package/node/.generated/start-local/additional-config.extra-participants.conf

@@ -70,75 +70,3 @@ canton.participants.extra-3 = $${_participant} {
   }
 }
 
-canton.participants.extra-1.ledger-api.auth-services = [
-  {
-    type = unsafe-jwt-hmac-256
-    target-audience = "https://canton.network.global"
-    secret = "unsafe"
-  },
-  {
-    type = jwt-es-256-crt
-    certificate = "/app/es256-certificate.pem"
-    target-audience = "https://canton.network.global/es256"
-  }
-]
-
-canton.participants.extra-2.ledger-api.auth-services = [
-  {
-    type = unsafe-jwt-hmac-256
-    target-audience = "https://canton.network.global"
-    secret = "unsafe"
-  },
-  {
-    type = jwt-es-256-crt
-    certificate = "/app/es256-certificate.pem"
-    target-audience = "https://canton.network.global/es256"
-  }
-]
-
-canton.participants.extra-3.ledger-api.auth-services = [
-  {
-    type = unsafe-jwt-hmac-256
-    target-audience = "https://canton.network.global"
-    secret = "unsafe"
-  },
-  {
-    type = jwt-es-256-crt
-    certificate = "/app/es256-certificate.pem"
-    target-audience = "https://canton.network.global/es256"
-  }
-]
-
-canton.participants.extra-1.ledger-api.tls {
-  cert-chain-file = "/app/localnet-tls/server.crt"
-  private-key-file = "/app/localnet-tls/server.key"
-  trust-collection-file = "/app/localnet-tls/ca.crt"
-}
-canton.participants.extra-1.admin-api.tls {
-  cert-chain-file = "/app/localnet-tls/server.crt"
-  private-key-file = "/app/localnet-tls/server.key"
-  trust-collection-file = "/app/localnet-tls/ca.crt"
-}
-
-canton.participants.extra-2.ledger-api.tls {
-  cert-chain-file = "/app/localnet-tls/server.crt"
-  private-key-file = "/app/localnet-tls/server.key"
-  trust-collection-file = "/app/localnet-tls/ca.crt"
-}
-canton.participants.extra-2.admin-api.tls {
-  cert-chain-file = "/app/localnet-tls/server.crt"
-  private-key-file = "/app/localnet-tls/server.key"
-  trust-collection-file = "/app/localnet-tls/ca.crt"
-}
-
-canton.participants.extra-3.ledger-api.tls {
-  cert-chain-file = "/app/localnet-tls/server.crt"
-  private-key-file = "/app/localnet-tls/server.key"
-  trust-collection-file = "/app/localnet-tls/ca.crt"
-}
-canton.participants.extra-3.admin-api.tls {
-  cert-chain-file = "/app/localnet-tls/server.crt"
-  private-key-file = "/app/localnet-tls/server.key"
-  trust-collection-file = "/app/localnet-tls/ca.crt"
-}
-

package/node/.generated/start-local/additional-config.extra-validators.conf

@@ -103,18 +103,3 @@ canton.validator-apps.extra-3-validator_backend = $${_validator_backend} {
 
 canton.sv-apps.sv.expected-validator-onboardings += { secret = "${EXTRA_VALIDATOR_3_ONBOARDING_SECRET}" }
 
-canton.validator-apps.extra-1-validator_backend.participant-client {
-  admin-api.tls.trust-collection-file = "/app/localnet-tls/ca.crt"
-  ledger-api.client-config.tls.trust-collection-file = "/app/localnet-tls/ca.crt"
-}
-
-canton.validator-apps.extra-2-validator_backend.participant-client {
-  admin-api.tls.trust-collection-file = "/app/localnet-tls/ca.crt"
-  ledger-api.client-config.tls.trust-collection-file = "/app/localnet-tls/ca.crt"
-}
-
-canton.validator-apps.extra-3-validator_backend.participant-client {
-  admin-api.tls.trust-collection-file = "/app/localnet-tls/ca.crt"
-  ledger-api.client-config.tls.trust-collection-file = "/app/localnet-tls/ca.crt"
-}
-

package/node/.generated/start-local/compose-extra-participants.yaml

@@ -84,78 +84,6 @@ services:
           }
         }
         
-        canton.participants.extra-1.ledger-api.auth-services = [
-          {
-            type = unsafe-jwt-hmac-256
-            target-audience = "https://canton.network.global"
-            secret = "unsafe"
-          },
-          {
-            type = jwt-es-256-crt
-            certificate = "/app/es256-certificate.pem"
-            target-audience = "https://canton.network.global/es256"
-          }
-        ]
-        
-        canton.participants.extra-2.ledger-api.auth-services = [
-          {
-            type = unsafe-jwt-hmac-256
-            target-audience = "https://canton.network.global"
-            secret = "unsafe"
-          },
-          {
-            type = jwt-es-256-crt
-            certificate = "/app/es256-certificate.pem"
-            target-audience = "https://canton.network.global/es256"
-          }
-        ]
-        
-        canton.participants.extra-3.ledger-api.auth-services = [
-          {
-            type = unsafe-jwt-hmac-256
-            target-audience = "https://canton.network.global"
-            secret = "unsafe"
-          },
-          {
-            type = jwt-es-256-crt
-            certificate = "/app/es256-certificate.pem"
-            target-audience = "https://canton.network.global/es256"
-          }
-        ]
-        
-        canton.participants.extra-1.ledger-api.tls {
-          cert-chain-file = "/app/localnet-tls/server.crt"
-          private-key-file = "/app/localnet-tls/server.key"
-          trust-collection-file = "/app/localnet-tls/ca.crt"
-        }
-        canton.participants.extra-1.admin-api.tls {
-          cert-chain-file = "/app/localnet-tls/server.crt"
-          private-key-file = "/app/localnet-tls/server.key"
-          trust-collection-file = "/app/localnet-tls/ca.crt"
-        }
-        
-        canton.participants.extra-2.ledger-api.tls {
-          cert-chain-file = "/app/localnet-tls/server.crt"
-          private-key-file = "/app/localnet-tls/server.key"
-          trust-collection-file = "/app/localnet-tls/ca.crt"
-        }
-        canton.participants.extra-2.admin-api.tls {
-          cert-chain-file = "/app/localnet-tls/server.crt"
-          private-key-file = "/app/localnet-tls/server.key"
-          trust-collection-file = "/app/localnet-tls/ca.crt"
-        }
-        
-        canton.participants.extra-3.ledger-api.tls {
-          cert-chain-file = "/app/localnet-tls/server.crt"
-          private-key-file = "/app/localnet-tls/server.key"
-          trust-collection-file = "/app/localnet-tls/ca.crt"
-        }
-        canton.participants.extra-3.admin-api.tls {
-          cert-chain-file = "/app/localnet-tls/server.crt"
-          private-key-file = "/app/localnet-tls/server.key"
-          trust-collection-file = "/app/localnet-tls/ca.crt"
-        }
-        
     ports:
       - "${EXTRA_PARTICIPANT_1_LEDGER_API_PUBLISHED_PORT}:${EXTRA_PARTICIPANT_1_LEDGER_API_PORT}"
       - "${EXTRA_PARTICIPANT_1_ADMIN_API_PUBLISHED_PORT}:${EXTRA_PARTICIPANT_1_ADMIN_API_PORT}"
@@ -276,21 +204,6 @@ services:
         
         canton.sv-apps.sv.expected-validator-onboardings += { secret = "${EXTRA_VALIDATOR_3_ONBOARDING_SECRET}" }
         
-        canton.validator-apps.extra-1-validator_backend.participant-client {
-          admin-api.tls.trust-collection-file = "/app/localnet-tls/ca.crt"
-          ledger-api.client-config.tls.trust-collection-file = "/app/localnet-tls/ca.crt"
-        }
-        
-        canton.validator-apps.extra-2-validator_backend.participant-client {
-          admin-api.tls.trust-collection-file = "/app/localnet-tls/ca.crt"
-          ledger-api.client-config.tls.trust-collection-file = "/app/localnet-tls/ca.crt"
-        }
-        
-        canton.validator-apps.extra-3-validator_backend.participant-client {
-          admin-api.tls.trust-collection-file = "/app/localnet-tls/ca.crt"
-          ledger-api.client-config.tls.trust-collection-file = "/app/localnet-tls/ca.crt"
-        }
-        
     ports:
       - "${EXTRA_VALIDATOR_1_ADMIN_API_PUBLISHED_PORT}:${EXTRA_VALIDATOR_1_ADMIN_API_PORT}"
       - "${EXTRA_VALIDATOR_2_ADMIN_API_PUBLISHED_PORT}:${EXTRA_VALIDATOR_2_ADMIN_API_PORT}"
@@ -333,10 +246,8 @@ services:
       SCRIBE_TARGET_POSTGRES_USERNAME: ${DB_USER}
       SCRIBE_TARGET_POSTGRES_PASSWORD: ${DB_PASSWORD}
       SCRIBE_CONFIG: /onboarding/extra-1-pqs.conf
-      SCRIBE_SOURCE_LEDGER_TLS_CAFILE: /app/localnet-tls/ca.crt
     volumes:
       - onboarding:/onboarding
-      - "/home/helena/env/daml/typescript-sdk/.generated/localnet-tls/ca.crt:/app/localnet-tls/ca.crt:ro"
     command:
       - pipeline
       - ledger
@@ -387,10 +298,8 @@ services:
       SCRIBE_TARGET_POSTGRES_USERNAME: ${DB_USER}
       SCRIBE_TARGET_POSTGRES_PASSWORD: ${DB_PASSWORD}
       SCRIBE_CONFIG: /onboarding/extra-2-pqs.conf
-      SCRIBE_SOURCE_LEDGER_TLS_CAFILE: /app/localnet-tls/ca.crt
     volumes:
       - onboarding:/onboarding
-      - "/home/helena/env/daml/typescript-sdk/.generated/localnet-tls/ca.crt:/app/localnet-tls/ca.crt:ro"
     command:
       - pipeline
       - ledger
@@ -441,10 +350,8 @@ services:
       SCRIBE_TARGET_POSTGRES_USERNAME: ${DB_USER}
       SCRIBE_TARGET_POSTGRES_PASSWORD: ${DB_PASSWORD}
       SCRIBE_CONFIG: /onboarding/extra-3-pqs.conf
-      SCRIBE_SOURCE_LEDGER_TLS_CAFILE: /app/localnet-tls/ca.crt
     volumes:
       - onboarding:/onboarding
-      - "/home/helena/env/daml/typescript-sdk/.generated/localnet-tls/ca.crt:/app/localnet-tls/ca.crt:ro"
     command:
       - pipeline
       - ledger

package/node/start-local.sh

@@ -911,7 +911,7 @@ extra_participants_healthy() {
     local prefix=$((index + 4))
     local health_port
     health_port="$(participant_port "$prefix" "$CANTON_HTTP_HEALTHCHECK_PORT_SUFFIX")"
-    checks+=("curl -sf --max-time 2 http://localhost:${health_port}/health > /dev/null")
+    checks+=("wget -q --timeout=2 --tries=1 -O /dev/null http://localhost:${health_port}/health")
   done
 
   local joined_checks
@@ -968,7 +968,7 @@ container_health_is_ready() {
   local _container="$1"
   local _lifecycle_state="$2"
   local health_status="$3"
-  [[ "$health_status" == "healthy" ]]
+  [[ "$lifecycle_state" == "running" && "$health_status" == "healthy" ]]
 }
 
 canton_and_extras_are_ready() {
@@ -976,7 +976,8 @@ canton_and_extras_are_ready() {
   local _lifecycle_state="$2"
   local health_status="$3"
   local extra_participants="$4"
-  [[ "$health_status" == "healthy" ]] && extra_participants_healthy "$extra_participants"
+  [[ "$lifecycle_state" == "running" && "$health_status" == "healthy" ]] \
+    && extra_participants_healthy "$extra_participants"
 }
 
 print_container_logs() {
@@ -1008,7 +1009,7 @@ wait_for_container_readiness() {
     lifecycle_state="${lifecycle_state:-missing}"
     health_status="${health_status:-unknown}"
 
-    if [[ "$lifecycle_state" != "running" ]]; then
+    if [[ "$lifecycle_state" != "running" && "$lifecycle_state" != "restarting" ]]; then
       echo "$container is not running (state: $lifecycle_state)." >&2
       print_container_logs "$container"
       return 1

package/node/test-start-local.sh

@@ -153,6 +153,18 @@ if [[ "${1:-}" == "inspect" ]]; then
     slow-splice:splice)
       if (( count <= 61 )); then health=starting; fi
       ;;
+    restarting-canton:canton)
+      if (( count == 1 )); then
+        lifecycle=restarting
+        health=unhealthy
+      fi
+      ;;
+    restarting-healthy-canton:canton)
+      if (( count == 1 )); then
+        lifecycle=restarting
+        health=healthy
+      fi
+      ;;
     exited-canton:canton)
       lifecycle=exited
       health=unhealthy
@@ -170,8 +182,21 @@ if [[ "${1:-}" == "logs" ]]; then
   printf 'stub log tail for %s\n' "${!#}"
   exit 0
 fi
-  if [[ "${1:-}" == "exec" ]]; then
-    extra_pqs_config_file=""
+if [[ "${1:-}" == "exec" ]]; then
+  if [[ "$*" == *"http://localhost:"* ]]; then
+    printf '%s\n' "$*" > "${START_LOCAL_TEST_DOCKER_STATE_DIR}/extra-healthcheck-command"
+    healthcheck_state_file="${START_LOCAL_TEST_DOCKER_STATE_DIR}/${docker_mode}-extra-healthcheck.count"
+    healthcheck_count=0
+    if [[ -f "$healthcheck_state_file" ]]; then
+      healthcheck_count="$(<"$healthcheck_state_file")"
+    fi
+    healthcheck_count=$((healthcheck_count + 1))
+    printf '%s\n' "$healthcheck_count" > "$healthcheck_state_file"
+    if [[ "$docker_mode" == "slow-extra-health" && "$healthcheck_count" == "1" ]]; then
+      exit 1
+    fi
+  fi
+  extra_pqs_config_file=""
     while (( "$#" )); do
       if [[ "${1:-}" == "-e" && "${2:-}" == EXTRA_PQS_CONFIG_FILE=* ]]; then
         extra_pqs_config_file="${2#EXTRA_PQS_CONFIG_FILE=}"
@@ -449,6 +474,8 @@ run_case $'.PHONY: start\nstart:\n' 'stub env AUTH_MODE=oauth2' oauth2
 run_case $'.PHONY: start\nstart:\n' 'canton readiness: running/starting' shared-secret slow-canton
 run_case $'.PHONY: start\nstart:\n' 'canton is still not ready (state: running, health: starting).' shared-secret slow-canton
 run_case $'.PHONY: start\nstart:\n' 'stub log tail for canton' shared-secret slow-canton
+run_case $'.PHONY: start\nstart:\n' 'canton readiness: restarting/unhealthy' shared-secret restarting-canton
+run_case $'.PHONY: start\nstart:\n' 'canton readiness: running/healthy' shared-secret restarting-healthy-canton
 run_case $'.PHONY: start\nstart:\n' 'canton is not running (state: exited).' shared-secret exited-canton '' '' '' 0 0 '' '' '' 1
 run_case $'.PHONY: start\nstart:\n' 'stub log tail for canton' shared-secret exited-canton '' '' '' 0 0 '' '' '' 1
 run_case $'.PHONY: start\nstart:\n' 'splice readiness: running/starting' shared-secret slow-splice 1
@@ -461,6 +488,9 @@ run_case $'.PHONY: start\nstart:\n' 'stub docker-compose -f compose.yaml -f '"$t
 run_case $'.PHONY: start\nstart:\n' 'stub docker compose -f compose.yaml -f '"$tmpdir"'/quickstart/docker/modules/localnet/compose.yaml -f '"$tmpdir"'/quickstart/docker/modules/splice-onboarding/compose.yaml -f '"$tmpdir"'/quickstart/docker/modules/pqs/compose.yaml --env-file .env --env-file .env.local --env-file '"$tmpdir"'/quickstart/docker/modules/localnet/compose.env --env-file '"$tmpdir"'/quickstart/docker/modules/localnet/env/common.env --env-file '"$tmpdir"'/quickstart/docker/modules/pqs/compose.env --profile app-provider --profile pqs-app-provider --profile pqs-sv -f '"$tmpdir"'/generated/compose-extra-participants.yaml --env-file '"$tmpdir"'/generated/extra-participants.env down -v --remove-orphans' shared-secret default 3
 run_case $'.PHONY: start\nstart:\n' 'stub docker compose -f compose.yaml -f '"$tmpdir"'/quickstart/docker/modules/localnet/compose.yaml -f '"$tmpdir"'/quickstart/docker/modules/splice-onboarding/compose.yaml -f '"$tmpdir"'/quickstart/docker/modules/pqs/compose.yaml --env-file .env --env-file .env.local --env-file '"$tmpdir"'/quickstart/docker/modules/localnet/compose.env --env-file '"$tmpdir"'/quickstart/docker/modules/localnet/env/common.env --env-file '"$tmpdir"'/quickstart/docker/modules/pqs/compose.env --profile app-provider --profile pqs-app-provider --profile pqs-sv -f '"$tmpdir"'/generated/compose-extra-participants.yaml --env-file '"$tmpdir"'/generated/extra-participants.env up -d --no-recreate pqs-extra-1 pqs-extra-2 pqs-extra-3' shared-secret default 3
 run_case $'.PHONY: start\nstart:\n' 'ES256 bearer token written to '"$tmpdir"'/es256/ledger-api-user.token' shared-secret default 3 '' '' 1
+assert_file_contains_text "$tmpdir/docker-state/extra-healthcheck-command" 'wget -q --timeout=2 --tries=1 -O /dev/null http://localhost:5900/health'
+assert_file_contains_text "$tmpdir/docker-state/extra-healthcheck-command" 'wget -q --timeout=2 --tries=1 -O /dev/null http://localhost:6900/health'
+assert_file_contains_text "$tmpdir/docker-state/extra-healthcheck-command" 'wget -q --timeout=2 --tries=1 -O /dev/null http://localhost:7900/health'
 assert_file_contains "$tmpdir/es256/canton-es256.conf" 'canton.participants.app-provider.ledger-api.auth-services = ['
 assert_file_contains "$tmpdir/es256/canton-es256.conf" '    type = jwt-es-256-crt'
 assert_file_contains "$tmpdir/es256/canton-es256.conf" '    certificate = "/app/es256-certificate.pem"'
@@ -481,6 +511,8 @@ assert_file_contains "$tmpdir/generated/extra-participants.env" 'EXTRA_VALIDATOR
 assert_file_contains "$tmpdir/generated/extra-participants.env" 'EXTRA_VALIDATOR_1_WALLET_ADMIN_USER_NAME=extra-1'
 assert_file_contains "$tmpdir/generated/extra-participants.env" 'EXTRA_VALIDATOR_1_AUTH_AUDIENCE=https://canton.network.global'
 assert_file_contains "$tmpdir/generated/extra-participants.env" 'CREATE_DATABASE_EXTRA_PQS_1=pqs-extra-1'
+run_case $'.PHONY: start\nstart:\n' 'stub extra pqs startup' shared-secret slow-extra-health 3
+assert_file_contains "$tmpdir/docker-state/slow-extra-health-extra-healthcheck.count" '2'
 assert_file_contains "$tmpdir/generated/extra-participants.env" 'EXTRA_PQS_1_POSTGRES_PUBLISHED_PORT=5541'
 assert_file_contains "$tmpdir/generated/extra-participants.env" 'EXTRA_PQS_3_POSTGRES_PUBLISHED_PORT=5543'
 assert_file_contains "$tmpdir/generated/compose-extra-participants.yaml" '      ADDITIONAL_CONFIG_EXTRA_PARTICIPANTS: |'

package/package.json

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