update canton to 20240910.12237.0.v1f685566/2.10.0-snapshot.20240910.…

…12237.0.v1f685566 in main-2.x (#19910) tell-slack: canton Co-authored-by: Azure Pipelines Daml Build <support@digitalasset.com>
digital-asset · Sep 11, 2024 · 02eab57 · 02eab57
1 parent 7e22471
commit 02eab57
Show file tree

Hide file tree

Showing 77 changed files with 93 additions and 4,238 deletions.
diff --git a/...se/src/main/scala/com/digitalasset/canton/admin/api/client/data/DomainManagerStatus.scala b/...se/src/main/scala/com/digitalasset/canton/admin/api/client/data/DomainManagerStatus.scala
@@ -87,7 +87,7 @@ object DomainManagerStatus {
             active = status.active,
             topologyQueue = status.topologyQueue,
             components = status.components,
-            version = Some(ReleaseVersion.current),
+            version = status.version,
             protocolVersion = protocolVersion.some,
           )
         )

diff --git a/...-base/src/main/scala/com/digitalasset/canton/admin/api/client/data/DomainNodeStatus.scala b/...-base/src/main/scala/com/digitalasset/canton/admin/api/client/data/DomainNodeStatus.scala
@@ -127,7 +127,7 @@ object DomainNodeStatus {
             sequencer = sequencer,
             topologyQueue = status.topologyQueue,
             components = status.components,
-            version = Some(ReleaseVersion.current),
+            version = status.version,
             protocolVersion = protocolVersion.some,
           )
         )

diff --git a/...pp-base/src/main/scala/com/digitalasset/canton/admin/api/client/data/MediatorStatus.scala b/...pp-base/src/main/scala/com/digitalasset/canton/admin/api/client/data/MediatorStatus.scala
@@ -104,7 +104,7 @@ object MediatorStatus {
             active = status.active,
             topologyQueue = status.topologyQueue,
             components = status.components,
-            version = Some(ReleaseVersion.current),
+            version = status.version,
             protocolVersion = protocolVersion.some,
           )
         )

diff --git a/...base/src/main/scala/com/digitalasset/canton/admin/api/client/data/ParticipantStatus.scala b/...base/src/main/scala/com/digitalasset/canton/admin/api/client/data/ParticipantStatus.scala
@@ -125,7 +125,7 @@ object ParticipantStatus {
             active = status.active,
             status.topologyQueue,
             status.components,
-            Some(ReleaseVersion.current),
+            status.version,
             Some(supportedProtocolVersions),
           )
         )

diff --git a/...p-base/src/main/scala/com/digitalasset/canton/admin/api/client/data/SequencerStatus.scala b/...p-base/src/main/scala/com/digitalasset/canton/admin/api/client/data/SequencerStatus.scala
@@ -145,7 +145,7 @@ object SequencerStatus {
             connectedParticipants = participants,
             topologyQueue = status.topologyQueue,
             components = status.components,
-            version = Some(ReleaseVersion.current),
+            version = status.version,
             protocolVersion = protocolVersion.some,
             domainId = domainId,
             sequencer = sequencer,

diff --git a/.../ledger-api-core/src/main/scala/com/digitalasset/canton/ledger/api/TraceIdentifiers.scala b/.../ledger-api-core/src/main/scala/com/digitalasset/canton/ledger/api/TraceIdentifiers.scala
@@ -3,7 +3,6 @@
 
 package com.digitalasset.canton.ledger.api
 
-import com.daml.ledger.api.v2.reassignment.Reassignment
 import com.daml.ledger.api.v2.transaction.{Transaction, TransactionTree}
 import com.daml.tracing.SpanAttribute
 
@@ -40,20 +39,4 @@ object TraceIdentifiers {
 
     attributes.result()
   }
-
-  /** Extract identifiers from a reassignment message.
-    */
-  def fromReassignment(reassignment: Reassignment): Map[SpanAttribute, String] = {
-    val attributes = Map.newBuilder[SpanAttribute, String]
-
-    def setIfNotEmpty(attribute: SpanAttribute, value: String): Unit =
-      if (!value.isEmpty) attributes += attribute -> value
-
-    setIfNotEmpty(SpanAttribute.Offset, reassignment.offset)
-    setIfNotEmpty(SpanAttribute.CommandId, reassignment.commandId)
-    setIfNotEmpty(SpanAttribute.TransactionId, reassignment.updateId)
-    setIfNotEmpty(SpanAttribute.WorkflowId, reassignment.workflowId)
-
-    attributes.result()
-  }
 }
diff --git a/...igitalasset/canton/ledger/api/auth/services/CommandCompletionServiceV2Authorization.scala b/...igitalasset/canton/ledger/api/auth/services/CommandCompletionServiceV2Authorization.scala
diff --git a/...cala/com/digitalasset/canton/ledger/api/auth/services/CommandServiceV2Authorization.scala b/...cala/com/digitalasset/canton/ledger/api/auth/services/CommandServiceV2Authorization.scala
diff --git a/...igitalasset/canton/ledger/api/auth/services/CommandSubmissionServiceV2Authorization.scala b/...igitalasset/canton/ledger/api/auth/services/CommandSubmissionServiceV2Authorization.scala
diff --git a/...a/com/digitalasset/canton/ledger/api/auth/services/EventQueryServiceV2Authorization.scala b/...a/com/digitalasset/canton/ledger/api/auth/services/EventQueryServiceV2Authorization.scala
diff --git a/...cala/com/digitalasset/canton/ledger/api/auth/services/PackageServiceV2Authorization.scala b/...cala/com/digitalasset/canton/ledger/api/auth/services/PackageServiceV2Authorization.scala
diff --git a/...in/scala/com/digitalasset/canton/ledger/api/auth/services/StateServiceAuthorization.scala b/...in/scala/com/digitalasset/canton/ledger/api/auth/services/StateServiceAuthorization.scala