Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion framework/.changeset/v0.16.0.md
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
- Upgrade to testcontainers-go v0.42.0
- Upgrade to testcontainers-go v0.42.0
- Bump the default Canton Splice image to 0.6.3
7 changes: 3 additions & 4 deletions framework/components/blockchain/canton/canton.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down Expand Up @@ -43,15 +43,15 @@ 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
for i := 1; i <= numberOfValidators; i++ {
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)
}

Expand Down Expand Up @@ -145,7 +145,6 @@ _participant {
}

parameters {
initial-protocol-version = 34
# tune the synchronisation protocols contract store cache
caching {
contract-store {
Expand Down
35 changes: 20 additions & 15 deletions framework/components/blockchain/canton/splice.go
Original file line number Diff line number Diff line change
Expand Up @@ -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_CONTAINER_NAME}
port = 5009
}
mediator = {
address = ${CANTON_CONTAINER_NAME}
port = 5007
}
}
}
sv-user = "user-sv"
splice-instance-names = ${_splice-instance-names}
Expand All @@ -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}
Expand All @@ -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} {
Expand Down Expand Up @@ -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",
]
}

Expand All @@ -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
Expand Down Expand Up @@ -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 {
Expand Down
Loading