@distrohelena/canton-typescript-sdk 0.1.31 → 0.1.33

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.33",
     "license": "Apache-2.0",
     "type": "module",
     "main": "./dist/index.js",
@@ -13,7 +13,9 @@
     ],
     "bin": {
         "canton-localnet-start": "node/start-local.sh",
-        "canton-localnet-stop": "node/stop-local.sh"
+        "canton-localnet-stop": "node/stop-local.sh",
+        "canton-localnet-participant-358-start": "node/start-local-participant-358.sh",
+        "canton-localnet-participant-358-stop": "node/stop-local-participant-358.sh"
     },
     "keywords": [
         "canton",
@@ -90,8 +92,12 @@
         "lint:fix": "eslint . --fix --max-warnings=0",
         "start:local-ledger": "bash node/start-local.sh",
         "stop:local-ledger": "bash node/stop-local.sh",
+        "start:local-participant-358": "bash node/start-local-participant-358.sh",
+        "stop:local-participant-358": "bash node/stop-local-participant-358.sh",
         "test:start-local-script": "bash node/test-start-local.sh",
         "test:stop-local-script": "bash node/test-stop-local.sh",
+        "test:participant-358-sidecar-script": "bash node/test-participant-358-sidecar.sh",
+        "test:participant-358-sidecar-smoke": "bash node/test-participant-358-sidecar-smoke.sh",
         "test": "vitest run --maxWorkers=1 --testTimeout=15000",
         "test:property": "vitest run tests/property --maxWorkers=1 --testTimeout=15000",
         "test:live": "vitest run tests/live --maxWorkers=1 --testTimeout=15000",

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

@@ -1,144 +0,0 @@
-canton.participants.extra-1 = $${_participant} {
-  storage.config.properties.databaseName = "participant-extra-1"
-  init {
-    generate-topology-transactions-and-keys = true
-    identity.type = auto
-  }
-  monitoring {
-    http-health-server.port = ${EXTRA_PARTICIPANT_1_HTTP_HEALTHCHECK_PORT}
-    grpc-health-server.port = ${EXTRA_PARTICIPANT_1_GRPC_HEALTHCHECK_PORT}
-  }
-  http-ledger-api.port = ${EXTRA_PARTICIPANT_1_JSON_API_PORT}
-  admin-api.port = ${EXTRA_PARTICIPANT_1_ADMIN_API_PORT}
-  ledger-api.port = ${EXTRA_PARTICIPANT_1_LEDGER_API_PORT}
-  ledger-api {
-    auth-services = [{
-      type = unsafe-jwt-hmac-256
-      target-audience = "${EXTRA_VALIDATOR_1_AUTH_AUDIENCE}"
-      secret = "unsafe"
-    }]
-
-    user-management-service.additional-admin-user-id = "${EXTRA_VALIDATOR_1_USER_NAME}"
-  }
-}
-
-canton.participants.extra-2 = $${_participant} {
-  storage.config.properties.databaseName = "participant-extra-2"
-  init {
-    generate-topology-transactions-and-keys = true
-    identity.type = auto
-  }
-  monitoring {
-    http-health-server.port = ${EXTRA_PARTICIPANT_2_HTTP_HEALTHCHECK_PORT}
-    grpc-health-server.port = ${EXTRA_PARTICIPANT_2_GRPC_HEALTHCHECK_PORT}
-  }
-  http-ledger-api.port = ${EXTRA_PARTICIPANT_2_JSON_API_PORT}
-  admin-api.port = ${EXTRA_PARTICIPANT_2_ADMIN_API_PORT}
-  ledger-api.port = ${EXTRA_PARTICIPANT_2_LEDGER_API_PORT}
-  ledger-api {
-    auth-services = [{
-      type = unsafe-jwt-hmac-256
-      target-audience = "${EXTRA_VALIDATOR_2_AUTH_AUDIENCE}"
-      secret = "unsafe"
-    }]
-
-    user-management-service.additional-admin-user-id = "${EXTRA_VALIDATOR_2_USER_NAME}"
-  }
-}
-
-canton.participants.extra-3 = $${_participant} {
-  storage.config.properties.databaseName = "participant-extra-3"
-  init {
-    generate-topology-transactions-and-keys = true
-    identity.type = auto
-  }
-  monitoring {
-    http-health-server.port = ${EXTRA_PARTICIPANT_3_HTTP_HEALTHCHECK_PORT}
-    grpc-health-server.port = ${EXTRA_PARTICIPANT_3_GRPC_HEALTHCHECK_PORT}
-  }
-  http-ledger-api.port = ${EXTRA_PARTICIPANT_3_JSON_API_PORT}
-  admin-api.port = ${EXTRA_PARTICIPANT_3_ADMIN_API_PORT}
-  ledger-api.port = ${EXTRA_PARTICIPANT_3_LEDGER_API_PORT}
-  ledger-api {
-    auth-services = [{
-      type = unsafe-jwt-hmac-256
-      target-audience = "${EXTRA_VALIDATOR_3_AUTH_AUDIENCE}"
-      secret = "unsafe"
-    }]
-
-    user-management-service.additional-admin-user-id = "${EXTRA_VALIDATOR_3_USER_NAME}"
-  }
-}
-
-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

@@ -1,120 +0,0 @@
-canton.validator-apps.extra-1-validator_backend = $${_validator_backend} {
-  onboarding.secret = "${EXTRA_VALIDATOR_1_ONBOARDING_SECRET}"
-  domain-migration-dump-path = "/domain-upgrade-dump/domain_migration_dump-extra-1.json"
-  storage.config.properties.databaseName = "${EXTRA_VALIDATOR_1_DB}"
-  admin-api.port = ${EXTRA_VALIDATOR_1_ADMIN_API_PORT}
-  canton-identifier-config.participant = extra-1
-  participant-client {
-    admin-api.port = ${EXTRA_PARTICIPANT_1_ADMIN_API_PORT}
-    ledger-api {
-      client-config.port = ${EXTRA_PARTICIPANT_1_LEDGER_API_PORT}
-      auth-config = {
-        type = "self-signed"
-        user = "${EXTRA_VALIDATOR_1_USER_NAME}"
-        audience = "${EXTRA_VALIDATOR_1_AUTH_AUDIENCE}"
-        secret = "unsafe"
-      }
-    }
-  }
-  auth = {
-    algorithm = "hs-256-unsafe"
-    audience = "${EXTRA_VALIDATOR_1_AUTH_AUDIENCE}"
-    secret = "unsafe"
-  }
-  ledger-api-user = "${EXTRA_VALIDATOR_1_USER_NAME}"
-  validator-wallet-users.0 = "${EXTRA_VALIDATOR_1_WALLET_ADMIN_USER_NAME}"
-  validator-party-hint = "${EXTRA_VALIDATOR_1_PARTY_HINT}"
-
-  domains.global.buy-extra-traffic {
-    min-topup-interval = ${?MIN_TRAFFIC_TOPUP_INTERVAL}
-    target-throughput = ${?TARGET_TRAFFIC_THROUGHPUT}
-  }
-}
-
-canton.sv-apps.sv.expected-validator-onboardings += { secret = "${EXTRA_VALIDATOR_1_ONBOARDING_SECRET}" }
-
-canton.validator-apps.extra-2-validator_backend = $${_validator_backend} {
-  onboarding.secret = "${EXTRA_VALIDATOR_2_ONBOARDING_SECRET}"
-  domain-migration-dump-path = "/domain-upgrade-dump/domain_migration_dump-extra-2.json"
-  storage.config.properties.databaseName = "${EXTRA_VALIDATOR_2_DB}"
-  admin-api.port = ${EXTRA_VALIDATOR_2_ADMIN_API_PORT}
-  canton-identifier-config.participant = extra-2
-  participant-client {
-    admin-api.port = ${EXTRA_PARTICIPANT_2_ADMIN_API_PORT}
-    ledger-api {
-      client-config.port = ${EXTRA_PARTICIPANT_2_LEDGER_API_PORT}
-      auth-config = {
-        type = "self-signed"
-        user = "${EXTRA_VALIDATOR_2_USER_NAME}"
-        audience = "${EXTRA_VALIDATOR_2_AUTH_AUDIENCE}"
-        secret = "unsafe"
-      }
-    }
-  }
-  auth = {
-    algorithm = "hs-256-unsafe"
-    audience = "${EXTRA_VALIDATOR_2_AUTH_AUDIENCE}"
-    secret = "unsafe"
-  }
-  ledger-api-user = "${EXTRA_VALIDATOR_2_USER_NAME}"
-  validator-wallet-users.0 = "${EXTRA_VALIDATOR_2_WALLET_ADMIN_USER_NAME}"
-  validator-party-hint = "${EXTRA_VALIDATOR_2_PARTY_HINT}"
-
-  domains.global.buy-extra-traffic {
-    min-topup-interval = ${?MIN_TRAFFIC_TOPUP_INTERVAL}
-    target-throughput = ${?TARGET_TRAFFIC_THROUGHPUT}
-  }
-}
-
-canton.sv-apps.sv.expected-validator-onboardings += { secret = "${EXTRA_VALIDATOR_2_ONBOARDING_SECRET}" }
-
-canton.validator-apps.extra-3-validator_backend = $${_validator_backend} {
-  onboarding.secret = "${EXTRA_VALIDATOR_3_ONBOARDING_SECRET}"
-  domain-migration-dump-path = "/domain-upgrade-dump/domain_migration_dump-extra-3.json"
-  storage.config.properties.databaseName = "${EXTRA_VALIDATOR_3_DB}"
-  admin-api.port = ${EXTRA_VALIDATOR_3_ADMIN_API_PORT}
-  canton-identifier-config.participant = extra-3
-  participant-client {
-    admin-api.port = ${EXTRA_PARTICIPANT_3_ADMIN_API_PORT}
-    ledger-api {
-      client-config.port = ${EXTRA_PARTICIPANT_3_LEDGER_API_PORT}
-      auth-config = {
-        type = "self-signed"
-        user = "${EXTRA_VALIDATOR_3_USER_NAME}"
-        audience = "${EXTRA_VALIDATOR_3_AUTH_AUDIENCE}"
-        secret = "unsafe"
-      }
-    }
-  }
-  auth = {
-    algorithm = "hs-256-unsafe"
-    audience = "${EXTRA_VALIDATOR_3_AUTH_AUDIENCE}"
-    secret = "unsafe"
-  }
-  ledger-api-user = "${EXTRA_VALIDATOR_3_USER_NAME}"
-  validator-wallet-users.0 = "${EXTRA_VALIDATOR_3_WALLET_ADMIN_USER_NAME}"
-  validator-party-hint = "${EXTRA_VALIDATOR_3_PARTY_HINT}"
-
-  domains.global.buy-extra-traffic {
-    min-topup-interval = ${?MIN_TRAFFIC_TOPUP_INTERVAL}
-    target-throughput = ${?TARGET_TRAFFIC_THROUGHPUT}
-  }
-}
-
-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"
-}
-