Skip to content

Commit e7fbfd0

Browse files
authored
Upgrade canton to the latest 3.5 (#3508)
1 parent 99ef5c9 commit e7fbfd0

File tree

7 files changed

+24
-5
lines changed

7 files changed

+24
-5
lines changed

apps/app/src/test/scala/org/lfdecentralizedtrust/splice/integration/tests/WalletManualRoundsIntegrationTest.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ class WalletManualRoundsIntegrationTest
312312
},
313313
)
314314

315-
aliceWalletClient.tap(20.0)
315+
aliceWalletClient.tap(100.0)
316316

317317
eventually() {
318318
aliceValidatorWalletClient.listAppRewardCoupons() should be(empty)

canton/community/ledger-api/src/main/protobuf/com/daml/ledger/api/v2/event.proto

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,13 @@ message InterfaceView {
165165
// successfully computed.
166166
// Optional
167167
Record view_value = 3;
168+
169+
// The package defining the interface implementation used to compute the view.
170+
// Can be different from the package that was used to create the contract itself,
171+
// as the contract arguments can be upgraded or downgraded using smart-contract upgrading
172+
// as part of computing the interface view.
173+
// Populated if the view computation is successful, otherwise empty.
174+
string implementation_package_id = 4;
168175
}
169176

170177
// Records that a contract has been archived, and choices may no longer be exercised on it.

canton/community/ledger/ledger-json-api/src/main/scala/com/digitalasset/canton/http/json/v2/JsSchema.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ object JsSchema {
112112
interfaceId: Identifier,
113113
viewStatus: com.google.rpc.status.Status,
114114
viewValue: Option[Json],
115+
implementationPackageId: Option[String],
115116
)
116117
object JsReassignmentEvent {
117118
sealed trait JsReassignmentEvent

canton/community/ledger/ledger-json-api/src/main/scala/com/digitalasset/canton/http/json/v2/ProtocolConverters.scala

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -371,12 +371,14 @@ class ProtocolConverters(
371371
traceContext: TraceContext
372372
): Future[JsInterfaceView] = {
373373
val viewStatus = obj.getViewStatus
374+
val implementationPackageId = obj.implementationPackageId
374375
if (viewStatus.code != Code.OK.getNumber) {
375376
Future.successful(
376377
JsInterfaceView(
377378
interfaceId = obj.getInterfaceId,
378379
viewStatus = viewStatus,
379380
viewValue = None,
381+
implementationPackageId = Option(implementationPackageId).filter(_.nonEmpty),
380382
)
381383
)
382384
} else
@@ -389,6 +391,7 @@ class ProtocolConverters(
389391
interfaceId = obj.getInterfaceId,
390392
viewStatus = viewStatus,
391393
viewValue = obj.viewValue.map(_ => record),
394+
implementationPackageId = Some(implementationPackageId),
392395
)
393396
}
394397
}

canton/community/ledger/ledger-json-api/src/test/resources/json-api-docs/openapi.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5003,6 +5003,14 @@ components:
50035003
Set if it was requested in the ``InterfaceFilter`` and it could be
50045004
successfully computed.
50055005
Optional
5006+
implementationPackageId:
5007+
description: |-
5008+
The package defining the interface implementation used to compute the view.
5009+
Can be different from the package that was used to create the contract itself,
5010+
as the contract arguments can be upgraded or downgraded using smart-contract upgrading
5011+
as part of computing the interface view.
5012+
Populated if the view computation is successful, otherwise empty.
5013+
type: string
50065014
JsPrepareSubmissionRequest:
50075015
title: JsPrepareSubmissionRequest
50085016
type: object

nix/canton-sources.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"version": "3.5.0-snapshot.20251219.17699.0.v0c2121fb",
2+
"version": "3.5.0-snapshot.20260109.17751.0.v47952ba4",
33
"tooling_sdk_version": "3.3.0-snapshot.20250415.13756.0.vafc5c867",
44
"daml_release": "v3.3.0-snapshot.20250417.0",
5-
"enterprise_sha256": "sha256:02jraib0sx5y8ivcgh4ql38cbam6vffhjscj5hb2055d5yrrh4lz",
6-
"oss_sha256": "sha256:02jraib0sx5y8ivcgh4ql38cbam6vffhjscj5hb2055d5yrrh4lz"
5+
"enterprise_sha256": "sha256:1dv459q4qapj1siavmfvwam8qhj5kv47w2k0rc0zm9g2v9s125nd",
6+
"oss_sha256": "sha256:1dv459q4qapj1siavmfvwam8qhj5kv47w2k0rc0zm9g2v9s125nd"
77
}

scripts/bootstrap/bootstrap-canton-with-unsigned-keys.sc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ def bootstrapDomainWithUnsignedKeys(
7777
UniqueIdentifier.tryCreate(synchronizerName, synchronizerNamespace)
7878
)
7979
val physicalSynchronizerId =
80-
PhysicalSynchronizerId(synchronizerId, ProtocolVersion.v34, NonNegativeInt.zero)
80+
PhysicalSynchronizerId(synchronizerId, NonNegativeInt.zero, ProtocolVersion.v34)
8181

8282
val tempStoreForBootstrap = synchronizerOwners
8383
.map(

0 commit comments

Comments
 (0)