update canton to 20240502.13211.v13a6d3c5 (#19131)

tell-slack: canton Co-authored-by: Azure Pipelines Daml Build <support@digitalasset.com>
2024-11-10 10:46:11 +03:00 · 2024-05-02 09:25:11 +02:00 · 2024-05-02 09:25:11 +02:00 · 6f67a04971
commit 6f67a04971
parent c82a4d813b
21 changed files with 43 additions and 26 deletions
--- a/sdk/canton/community/common/src/main/daml/CantonExamples/daml.yaml
+++ b/sdk/canton/community/common/src/main/daml/CantonExamples/daml.yaml
@ -1,4 +1,4 @@
-sdk-version: 3.1.0-snapshot.20240429.13039.0.vb3fa897d
+sdk-version: 3.1.0-snapshot.20240430.13043.0.vb4009e3c
 build-options: 
 - --target=2.1
 name: CantonExamples
--- a/sdk/canton/community/demo/src/main/daml/ai-analysis/daml.yaml
+++ b/sdk/canton/community/demo/src/main/daml/ai-analysis/daml.yaml
@ -1,4 +1,4 @@
-sdk-version: 3.1.0-snapshot.20240429.13039.0.vb3fa897d
+sdk-version: 3.1.0-snapshot.20240430.13043.0.vb4009e3c
 build-options: 
 - --target=2.1
 name: ai-analysis
--- a/sdk/canton/community/demo/src/main/daml/bank/daml.yaml
+++ b/sdk/canton/community/demo/src/main/daml/bank/daml.yaml
@ -1,4 +1,4 @@
-sdk-version: 3.1.0-snapshot.20240429.13039.0.vb3fa897d
+sdk-version: 3.1.0-snapshot.20240430.13043.0.vb4009e3c
 build-options: 
 - --target=2.1
 name: bank
--- a/sdk/canton/community/demo/src/main/daml/doctor/daml.yaml
+++ b/sdk/canton/community/demo/src/main/daml/doctor/daml.yaml
@ -1,4 +1,4 @@
-sdk-version: 3.1.0-snapshot.20240429.13039.0.vb3fa897d
+sdk-version: 3.1.0-snapshot.20240430.13043.0.vb4009e3c
 build-options: 
 - --target=2.1
 name: doctor
--- a/sdk/canton/community/demo/src/main/daml/health-insurance/daml.yaml
+++ b/sdk/canton/community/demo/src/main/daml/health-insurance/daml.yaml
@ -1,4 +1,4 @@
-sdk-version: 3.1.0-snapshot.20240429.13039.0.vb3fa897d
+sdk-version: 3.1.0-snapshot.20240430.13043.0.vb4009e3c
 build-options: 
 - --target=2.1
 name: health-insurance
--- a/sdk/canton/community/demo/src/main/daml/medical-records/daml.yaml
+++ b/sdk/canton/community/demo/src/main/daml/medical-records/daml.yaml
@ -1,4 +1,4 @@
-sdk-version: 3.1.0-snapshot.20240429.13039.0.vb3fa897d
+sdk-version: 3.1.0-snapshot.20240430.13043.0.vb4009e3c
 build-options: 
 - --target=2.1
 name: medical-records
--- a/sdk/canton/community/domain/src/main/scala/com/digitalasset/canton/domain/block/BlockSequencerStateManager.scala
+++ b/sdk/canton/community/domain/src/main/scala/com/digitalasset/canton/domain/block/BlockSequencerStateManager.scala
@ -216,7 +216,15 @@ class BlockSequencerStateManager(
          implicit val traceContext: TraceContext = TraceContext.ofBatch(blockEvents.events)(logger)
          // Set the current block height to the new block's height instead of + 1 of the previous value
          // so that we support starting from an arbitrary block height
-          logger.debug(s"Processing block $height")
+
+          logger.debug(
+            s"Processing block $height with ${blockEvents.events.size} block events.${blockEvents.events
+                .map(_.value)
+                .collectFirst { case LedgerBlockEvent.Send(timestamp, _) =>
+                  s" First timestamp in block: $timestamp"
+                }
+                .getOrElse("")}"
+          )
          currentBlockHeight = height
          Seq(Traced(blockEvents))
        }
@ -250,7 +258,11 @@ class BlockSequencerStateManager(
      .mapAsyncAndDrainUS(parallelism = chunkSigningParallelism)(
        _.traverse {
          case chunk: ChunkUpdate[UnsignedChunkEvents] =>
-            chunk.events.parTraverse(bug.signChunkEvents).map(signed => chunk.copy(events = signed))
+            lazy val signEvents = chunk.events
+              .parTraverse(bug.signChunkEvents)
+              .map(signed => chunk.copy(events = signed))
+            LoggerUtil.clueF(s"Signing ${chunk.events.size} events")(signEvents.unwrap).discard
+            signEvents
          case complete: CompleteBlockUpdate => FutureUnlessShutdown.pure(complete)
        }
      )
@ -270,7 +282,9 @@ class BlockSequencerStateManager(
          case chunk: ChunkUpdate[SignedChunkEvents] =>
            val chunkNumber = priorHead.chunk.chunkNumber + 1
            LoggerUtil.clueF(
-              s"Adding block updates for chunk $chunkNumber for block $currentBlockNumber"
+              s"Adding block updates for chunk $chunkNumber for block $currentBlockNumber. " +
+                s"Contains ${chunk.events.size} events, ${chunk.acknowledgements.size} acks, ${chunk.newMembers.size} new members, " +
+                s"and ${chunk.inFlightAggregationUpdates.size} in-flight aggregation updates"
            )(handleChunkUpdate(priorHead, chunk, dbSequencerIntegration)(traceContext))
          case complete: CompleteBlockUpdate =>
            LoggerUtil.clueF(
--- a/sdk/canton/community/domain/src/main/scala/com/digitalasset/canton/domain/block/BlockUpdateGenerator.scala
+++ b/sdk/canton/community/domain/src/main/scala/com/digitalasset/canton/domain/block/BlockUpdateGenerator.scala
@ -198,12 +198,13 @@ class BlockUpdateGeneratorImpl(
        )
        FutureUnlessShutdown.pure(newState -> update)
      case NextChunk(height, index, events) =>
-        processChunk(height, state, events)
+        processChunk(height, index, state, events)
    }
  }

  private def processChunk(
      height: Long,
+      index: Int,
      state: State,
      chunk: NonEmpty[Seq[Traced[LedgerBlockEvent]]],
  )(implicit
@ -221,11 +222,13 @@ class BlockUpdateGeneratorImpl(
          case send: LedgerBlockEvent.Send =>
            val ts = ensureStrictlyIncreasingTimestamp(lastTs, send.timestamp)
            logger.info(
-              show"Observed Send with messageId ${send.signedSubmissionRequest.content.messageId.singleQuoted} in block $height and assigned it timestamp $ts"
+              show"Observed Send with messageId ${send.signedSubmissionRequest.content.messageId.singleQuoted} in block $height, chunk $index and assigned it timestamp $ts"
            )(event.traceContext)
            (ts, (ts, event) +: events)
          case _ =>
-            logger.info(s"Observed ${event.value} in block $height at timestamp $lastTs")(
+            logger.info(
+              s"Observed ${event.value} in block $height, chunk $index at timestamp $lastTs"
+            )(
              event.traceContext
            )
            (lastTs, (lastTs, event) +: events)
@ -303,7 +306,7 @@ class BlockUpdateGeneratorImpl(
                .get(member)
                .fold {
                  logger.debug(
-                    s"Ack at $timestamp for $member being ignored because the member has not yet been registered."
+                    s"Ack at $timestamp for $member (block $height, chunk $index) being ignored because the member has not yet been registered."
                  )
                  membersMap
                } { memberStatus =>
--- a/sdk/canton/community/ledger/ledger-common-dars/src/main/daml/carbonv1/daml.yaml
+++ b/sdk/canton/community/ledger/ledger-common-dars/src/main/daml/carbonv1/daml.yaml
@ -1,4 +1,4 @@
-sdk-version: 3.1.0-snapshot.20240429.13039.0.vb3fa897d
+sdk-version: 3.1.0-snapshot.20240430.13043.0.vb4009e3c
 build-options: 
 - --enable-interfaces=yes
 name: carbonv1-tests
--- a/sdk/canton/community/ledger/ledger-common-dars/src/main/daml/carbonv2/daml.yaml
+++ b/sdk/canton/community/ledger/ledger-common-dars/src/main/daml/carbonv2/daml.yaml
@ -1,4 +1,4 @@
-sdk-version: 3.1.0-snapshot.20240429.13039.0.vb3fa897d
+sdk-version: 3.1.0-snapshot.20240430.13043.0.vb4009e3c
 build-options: 
 - --enable-interfaces=yes
 name: carbonv2-tests
--- a/sdk/canton/community/ledger/ledger-common-dars/src/main/daml/experimental/daml.yaml
+++ b/sdk/canton/community/ledger/ledger-common-dars/src/main/daml/experimental/daml.yaml
@ -1,4 +1,4 @@
-sdk-version: 3.1.0-snapshot.20240429.13039.0.vb3fa897d
+sdk-version: 3.1.0-snapshot.20240430.13043.0.vb4009e3c
 name: experimental-tests
 source: .
 version: 3.1.0
--- a/sdk/canton/community/ledger/ledger-common-dars/src/main/daml/model/daml.yaml
+++ b/sdk/canton/community/ledger/ledger-common-dars/src/main/daml/model/daml.yaml
@ -1,4 +1,4 @@
-sdk-version: 3.1.0-snapshot.20240429.13039.0.vb3fa897d
+sdk-version: 3.1.0-snapshot.20240430.13043.0.vb4009e3c
 build-options: 
 - --enable-interfaces=yes
 name: model-tests
--- a/sdk/canton/community/ledger/ledger-common-dars/src/main/daml/package_management/daml.yaml
+++ b/sdk/canton/community/ledger/ledger-common-dars/src/main/daml/package_management/daml.yaml
@ -1,4 +1,4 @@
-sdk-version: 3.1.0-snapshot.20240429.13039.0.vb3fa897d
+sdk-version: 3.1.0-snapshot.20240430.13043.0.vb4009e3c
 name: package-management-tests
 source: .
 version: 3.1.0
--- a/sdk/canton/community/ledger/ledger-common-dars/src/main/daml/semantic/daml.yaml
+++ b/sdk/canton/community/ledger/ledger-common-dars/src/main/daml/semantic/daml.yaml
@ -1,4 +1,4 @@
-sdk-version: 3.1.0-snapshot.20240429.13039.0.vb3fa897d
+sdk-version: 3.1.0-snapshot.20240430.13043.0.vb4009e3c
 build-options: 
 - --enable-interfaces=yes
 name: semantic-tests
--- a/sdk/canton/community/ledger/ledger-common-dars/src/main/daml/upgrade/1.0.0/daml.yaml
+++ b/sdk/canton/community/ledger/ledger-common-dars/src/main/daml/upgrade/1.0.0/daml.yaml
@ -1,4 +1,4 @@
-sdk-version: 3.1.0-snapshot.20240429.13039.0.vb3fa897d
+sdk-version: 3.1.0-snapshot.20240430.13043.0.vb4009e3c
 name: upgrade-tests
 source: .
 version: 1.0.0
--- a/sdk/canton/community/ledger/ledger-common-dars/src/main/daml/upgrade/2.0.0/daml.yaml
+++ b/sdk/canton/community/ledger/ledger-common-dars/src/main/daml/upgrade/2.0.0/daml.yaml
@ -1,4 +1,4 @@
-sdk-version: 3.1.0-snapshot.20240429.13039.0.vb3fa897d
+sdk-version: 3.1.0-snapshot.20240430.13043.0.vb4009e3c
 name: upgrade-tests
 source: .
 version: 2.0.0
--- a/sdk/canton/community/ledger/ledger-common-dars/src/main/daml/upgrade/3.0.0/daml.yaml
+++ b/sdk/canton/community/ledger/ledger-common-dars/src/main/daml/upgrade/3.0.0/daml.yaml
@ -1,4 +1,4 @@
-sdk-version: 3.1.0-snapshot.20240429.13039.0.vb3fa897d
+sdk-version: 3.1.0-snapshot.20240430.13043.0.vb4009e3c
 name: upgrade-tests
 source: .
 version: 3.0.0
--- a/sdk/canton/community/ledger/ledger-json-api/src/test/daml/v2_1/daml.yaml
+++ b/sdk/canton/community/ledger/ledger-json-api/src/test/daml/v2_1/daml.yaml
@ -1,4 +1,4 @@
-sdk-version: 3.1.0-snapshot.20240429.13039.0.vb3fa897d
+sdk-version: 3.1.0-snapshot.20240430.13043.0.vb4009e3c
 build-options: 
 - --target=2.1
 name: JsonEncodingTest
--- a/sdk/canton/community/ledger/ledger-json-api/src/test/daml/v2_dev/daml.yaml
+++ b/sdk/canton/community/ledger/ledger-json-api/src/test/daml/v2_dev/daml.yaml
@ -1,4 +1,4 @@
-sdk-version: 3.1.0-snapshot.20240429.13039.0.vb3fa897d
+sdk-version: 3.1.0-snapshot.20240430.13043.0.vb4009e3c
 build-options: 
 - --target=2.dev
 name: JsonEncodingTestDev
--- a/sdk/canton/community/participant/src/main/daml/daml.yaml
+++ b/sdk/canton/community/participant/src/main/daml/daml.yaml
@ -1,4 +1,4 @@
-sdk-version: 3.1.0-snapshot.20240429.13039.0.vb3fa897d
+sdk-version: 3.1.0-snapshot.20240430.13043.0.vb4009e3c
 build-options: 
 - --target=2.1
 name: AdminWorkflows
--- a/sdk/canton/ref
+++ b/sdk/canton/ref
@ -1 +1 @@
-20240501.13207.vafd1841e
+20240502.13211.v13a6d3c5