From 7192d3d04b1f1259f30a37700a3b4389cf5b73b7 Mon Sep 17 00:00:00 2001 From: Judy Wu Date: Wed, 26 Feb 2025 15:48:10 +0800 Subject: [PATCH 1/3] upgrade canton-network-node version to 0.3.12 --- quickstart/.env | 2 +- quickstart/docker/compose-super-validator.yaml | 6 +----- quickstart/docker/validator/compose-disable-auth.yaml | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/quickstart/.env b/quickstart/.env index 440be7f..db9324a 100644 --- a/quickstart/.env +++ b/quickstart/.env @@ -20,7 +20,7 @@ SCAN_ADDRESS=https://scan.sv-1.dev.global.canton.network.digitalasset.com ONBOARDING_SECRET= ONBOARDING_SECRET_URL=https://sv.sv-1.dev.global.canton.network.digitalasset.com/api/sv/v0/devnet/onboard/validator/prepare MIGRATION_ID=4 -IMAGE_TAG=0.3.3-snapshot.20241204.7793.0.veab38e18 +IMAGE_TAG=0.3.12 # Authentication AUTH_URL=overriden_by_specific_variable diff --git a/quickstart/docker/compose-super-validator.yaml b/quickstart/docker/compose-super-validator.yaml index 4bc7efc..7481480 100644 --- a/quickstart/docker/compose-super-validator.yaml +++ b/quickstart/docker/compose-super-validator.yaml @@ -71,7 +71,7 @@ services: - CANTON_PARTICIPANT_ADMIN_USER_NAME=administrator - AUTH_TARGET_AUDIENCE=${LEDGER_API_AUTH_AUDIENCE} - ADDITIONAL_CONFIG_DISABLE_AUTH=canton.participants.participant.ledger-api.auth-services=[] - - ADDITIONAL_CONFIG_ALLOW_INSECURE=canton.participants.participant.http-ledger-api-experimental.allow-insecure-tokens=true + - ADDITIONAL_CONFIG_ALLOW_INSECURE=canton.participants.participant.http-ledger-api.allow-insecure-tokens=true depends_on: postgres-splice-sv: condition: service_healthy @@ -115,9 +115,6 @@ services: ADDITIONAL_CONFIG_TRUST_SINGLE_SCAN= canton.validator-apps.validator_backend.scan-client.type = "trust-single" canton.validator-apps.validator_backend.scan-client.url = "http://scan:5012" - - | - ADDITIONAL_CONFIG_TRUST_SINGLE_SEQUENCER= - canton.validator-apps.validator_backend.domains.global.url = "http://sequencer-mediator:5008" - | ADDITIONAL_CONFIG_MIGRATION_ID= canton.validator-apps.validator_backend { @@ -247,7 +244,6 @@ services: } } } - - SPLICE_APP_SV_GLOBAL_DOMAIN_URL=http://sequencer-mediator:5008 - SPLICE_APP_SV_COMETBFT_ENABLED=false - SPLICE_APP_UI_NETWORK_NAME=${SPLICE_APP_UI_NETWORK_NAME} - SPLICE_APP_UI_NETWORK_FAVICON_URL=${SPLICE_APP_UI_NETWORK_FAVICON_URL} diff --git a/quickstart/docker/validator/compose-disable-auth.yaml b/quickstart/docker/validator/compose-disable-auth.yaml index fd35c1f..ea5a356 100644 --- a/quickstart/docker/validator/compose-disable-auth.yaml +++ b/quickstart/docker/validator/compose-disable-auth.yaml @@ -3,7 +3,7 @@ services: environment: - CANTON_PARTICIPANT_ADMIN_USER_NAME=ledger-api-user - ADDITIONAL_CONFIG_DISABLE_AUTH=canton.participants.participant.ledger-api.auth-services=[] - - ADDITIONAL_CONFIG_ALLOW_INSECURE=canton.participants.participant.http-ledger-api-experimental.allow-insecure-tokens=true + - ADDITIONAL_CONFIG_ALLOW_INSECURE=canton.participants.participant.http-ledger-api.allow-insecure-tokens=true validator: environment: From e0ac7ba4974b85966cc436128e66e584f266804e Mon Sep 17 00:00:00 2001 From: iggy-da Date: Wed, 12 Mar 2025 14:56:15 +1100 Subject: [PATCH 2/3] Fix create-app-install-request.sh --- .../scripts/create-app-install-request.sh | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/quickstart/docker/app-user-shell/scripts/create-app-install-request.sh b/quickstart/docker/app-user-shell/scripts/create-app-install-request.sh index 26d39da..174833c 100755 --- a/quickstart/docker/app-user-shell/scripts/create-app-install-request.sh +++ b/quickstart/docker/app-user-shell/scripts/create-app-install-request.sh @@ -15,29 +15,29 @@ create_app_install_request() { local participant=$5 curl_check "http://$participant:7575/v2/commands/submit-and-wait" "$token" "application/json" \ --data-raw '{ - "commands" : [ - { "CreateCommand" : { - "template_id": "#quickstart-licensing:Licensing.AppInstall:AppInstallRequest", - "create_arguments": { - "dso": "'$dsoParty'", - "provider": "'$appProviderParty'", - "user": "'$appUserParty'", - "meta": {"values": []} - } - } + "commands": [ + { + "CreateCommand": { + "templateId": "#quickstart-licensing:Licensing.AppInstall:AppInstallRequest", + "createArguments": { + "dso": "'$dsoParty'", + "provider": "'$appProviderParty'", + "user": "'$appUserParty'", + "meta": { "values": [] } + } + } } - ], - "workflow_id" : "create-app-install-request", - "application_id": "ledger-api-user", - "command_id": "create-app-install-request", - "deduplication_period": { "Empty": {} }, - "act_as": ["'$appUserParty'"], - "read_as": ["'$appUserParty'"], - "submission_id": "create-app-install-request", - "disclosed_contracts": [], - "domain_id": "", - "package_id_selection_preference": [] + "workflowId": "create-app-install-request", + "applicationId": "ledger-api-user", + "commandId": "create-app-install-request", + "deduplicationPeriod": { "Empty": {} }, + "actAs": ["'$appUserParty'"], + "readAs": ["'$appUserParty'"], + "submissionId": "create-app-install-request", + "disclosedContracts": [], + "domainId": "", + "packageIdSelectionPreference": [] }' } From ef3662d26738f99d14cb0cce21f5ff39a3e55e3b Mon Sep 17 00:00:00 2001 From: iggy-da Date: Wed, 12 Mar 2025 15:48:14 +1100 Subject: [PATCH 3/3] merge fix --- .../scripts/create-app-install-request.sh | 49 +++++++++++-------- 1 file changed, 28 insertions(+), 21 deletions(-) diff --git a/quickstart/docker/app-user-shell/scripts/create-app-install-request.sh b/quickstart/docker/app-user-shell/scripts/create-app-install-request.sh index 315959e..8518d6b 100755 --- a/quickstart/docker/app-user-shell/scripts/create-app-install-request.sh +++ b/quickstart/docker/app-user-shell/scripts/create-app-install-request.sh @@ -22,31 +22,38 @@ create_app_install_request() { curl_check "http://$participant:7575/v2/commands/submit-and-wait" "$token" "application/json" \ --data-raw '{ - "commands" : [ - { "CreateCommand" : { - "template_id": "#quickstart-licensing:Licensing.AppInstall:AppInstallRequest", - "create_arguments": { - "dso": "'$dsoParty'", - "provider": "'$appProviderParty'", - "user": "'$appUserParty'", - "meta": {"values": []} + "commands": [ + { + "CreateCommand": { + "templateId": "#quickstart-licensing:Licensing.AppInstall:AppInstallRequest", + "createArguments": { + "dso": "'$dsoParty'", + "provider": "'$appProviderParty'", + "user": "'$appUserParty'", + "meta": { + "values": [] } + } } - } - + } + ], + "workflowId": "create-app-install-request", + "applicationId": "'$participantUserId'", + "commandId": "create-app-install-request", + "deduplicationPeriod": { + "Empty": {} + }, + "actAs": [ + "'$appUserParty'" ], - "workflow_id" : "create-app-install-request", - "application_id": "'$participantUserId'", - "command_id": "create-app-install-request", - "deduplication_period": { "Empty": {} }, - "act_as": ["'$appUserParty'"], - "read_as": ["'$appUserParty'"], - "submission_id": "create-app-install-request", - "disclosed_contracts": [], - "domain_id": "", - "package_id_selection_preference": [] + "readAs": [ + "'$appUserParty'" + ], + "submissionId": "create-app-install-request", + "disclosedContracts": [], + "domainId": "", + "packageIdSelectionPreference": [] }' } create_app_install_request "$APP_USER_WALLET_ADMIN_TOKEN" $DSO_PARTY $APP_USER_PARTY $APP_PROVIDER_PARTY $AUTH_APP_USER_WALLET_ADMIN_USER_ID participant-app-user -