From 324b33a4bb76d213939261ebf472e003acf06fe0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Friedemann=20F=C3=BCrst?= <59653747+friedemannf@users.noreply.github.com> Date: Tue, 12 May 2026 20:06:52 +0200 Subject: [PATCH 1/2] Bump Canton Splice image to 0.6.3 --- framework/.changeset/v0.16.0.md | 3 +- .../components/blockchain/canton/canton.go | 7 ++-- .../components/blockchain/canton/splice.go | 35 +++++++++++-------- 3 files changed, 25 insertions(+), 20 deletions(-) diff --git a/framework/.changeset/v0.16.0.md b/framework/.changeset/v0.16.0.md index c44244b36..822cc5f97 100644 --- a/framework/.changeset/v0.16.0.md +++ b/framework/.changeset/v0.16.0.md @@ -1 +1,2 @@ -- Upgrade to testcontainers-go v0.42.0 \ No newline at end of file +- Upgrade to testcontainers-go v0.42.0 +- Bump the default Canton Splice image to 0.6.3 \ No newline at end of file diff --git a/framework/components/blockchain/canton/canton.go b/framework/components/blockchain/canton/canton.go index 3bea06861..0e5afc876 100644 --- a/framework/components/blockchain/canton/canton.go +++ b/framework/components/blockchain/canton/canton.go @@ -13,7 +13,7 @@ import ( // Canton Defaults const ( - SpliceVersion = "0.5.17" + SpliceVersion = "0.6.3" Image = "ghcr.io/digital-asset/decentralized-canton-sync/docker/canton" ) @@ -43,7 +43,7 @@ set -eou pipefail # SV echo "Checking ${CANTON_PARTICIPANT_GRPC_HEALTHCHECK_PORT_PREFIX}00" -grpcurl -plaintext "localhost:${CANTON_PARTICIPANT_GRPC_HEALTHCHECK_PORT_PREFIX}00" grpc.health.v1.Health/Check +grpc-health-probe -addr="localhost:${CANTON_PARTICIPANT_GRPC_HEALTHCHECK_PORT_PREFIX}00" ` // Add additional participants @@ -51,7 +51,7 @@ grpcurl -plaintext "localhost:${CANTON_PARTICIPANT_GRPC_HEALTHCHECK_PORT_PREFIX} script += fmt.Sprintf(` # Participant %02[1]d echo "Checking ${CANTON_PARTICIPANT_GRPC_HEALTHCHECK_PORT_PREFIX}%02[1]d" -grpcurl -plaintext "localhost:${CANTON_PARTICIPANT_GRPC_HEALTHCHECK_PORT_PREFIX}%02[1]d" grpc.health.v1.Health/Check +grpc-health-probe -addr="localhost:${CANTON_PARTICIPANT_GRPC_HEALTHCHECK_PORT_PREFIX}%02[1]d" `, i) } @@ -145,7 +145,6 @@ _participant { } parameters { - initial-protocol-version = 34 # tune the synchronisation protocols contract store cache caching { contract-store { diff --git a/framework/components/blockchain/canton/splice.go b/framework/components/blockchain/canton/splice.go index 19db2e0b6..cfa276f42 100644 --- a/framework/components/blockchain/canton/splice.go +++ b/framework/components/blockchain/canton/splice.go @@ -141,13 +141,17 @@ canton { port = 5012 } participant-client = ${_sv_participant_client} - sequencer-admin-client = { - address = ${CANTON_CONTAINER_NAME} - port = 5009 - } - mediator-admin-client = { - address = ${CANTON_CONTAINER_NAME} - port = 5007 + synchronizer-nodes { + current { + sequencer = { + address = canton + port = 5009 + } + mediator = { + address = canton + port = 5007 + } + } } sv-user = "user-sv" splice-instance-names = ${_splice-instance-names} @@ -162,7 +166,7 @@ canton { public-url="http://localhost:5012" internal-url="http://localhost:5012" } - local-synchronizer-node { + local-synchronizer-nodes.current { sequencer { admin-api { address = ${CANTON_CONTAINER_NAME} @@ -178,6 +182,12 @@ canton { address = ${CANTON_CONTAINER_NAME} port = 5007 } + comet-bft-config = { + enabled = false + enabled = ${?SPLICE_APP_SV_COMETBFT_ENABLED} + connection-uri = "" + connection-uri = ${?SPLICE_APP_SV_COMETBFT_CONNECTION_URI} + } } storage = ${_storage} { @@ -215,6 +225,8 @@ canton { "org.lfdecentralizedtrust.splice.sv.automation.delegatebased.ExpiredAnsSubscriptionTrigger", "org.lfdecentralizedtrust.splice.sv.automation.delegatebased.ExpiredAnsEntryTrigger", "org.lfdecentralizedtrust.splice.sv.automation.delegatebased.ExpireTransferPreapprovalsTrigger", + "org.lfdecentralizedtrust.splice.sv.automation.delegatebased.ExpiredAmuletTransferInstructionTrigger", + "org.lfdecentralizedtrust.splice.sv.automation.delegatebased.ExpiredAmuletAllocationTrigger", ] } @@ -232,12 +244,6 @@ canton { initial-round = ${?SPLICE_APP_SV_INITIAL_ROUND} } initial-amulet-price-vote = ${?SPLICE_APP_SV_INITIAL_AMULET_PRICE_VOTE} - comet-bft-config = { - enabled = false - enabled = ${?SPLICE_APP_SV_COMETBFT_ENABLED} - connection-uri = "" - connection-uri = ${?SPLICE_APP_SV_COMETBFT_CONNECTION_URI} - } contact-point = "contact@local.host" canton-identifier-config = { participant = sv @@ -280,7 +286,6 @@ canton.validator-apps.sv-validator_backend = ${_validator_backend} { canton.validator-apps.participant%[1]d-validator_backend = ${_validator_backend} { onboarding.secret = "participant%[1]d-validator-onboarding-secret" validator-party-hint = "participant%[1]d-localparty-1" - domain-migration-dump-path = "/domain-upgrade-dump/domain_migration_dump-participant%[1]d.json" storage.config.properties.databaseName = validator-%[1]d admin-api.port = ${SPLICE_VALIDATOR_ADMIN_API_PORT_PREFIX}%02[1]d participant-client { From beaacb8b8888f420dd795db936273b3230942d6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Friedemann=20F=C3=BCrst?= <59653747+friedemannf@users.noreply.github.com> Date: Tue, 12 May 2026 20:21:02 +0200 Subject: [PATCH 2/2] Fix address --- framework/components/blockchain/canton/splice.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/framework/components/blockchain/canton/splice.go b/framework/components/blockchain/canton/splice.go index cfa276f42..aaee84a94 100644 --- a/framework/components/blockchain/canton/splice.go +++ b/framework/components/blockchain/canton/splice.go @@ -144,11 +144,11 @@ canton { synchronizer-nodes { current { sequencer = { - address = canton + address = ${CANTON_CONTAINER_NAME} port = 5009 } mediator = { - address = canton + address = ${CANTON_CONTAINER_NAME} port = 5007 } }