Update 2023-08-15.23 (#107)

Reference commit: 6fb7b89ad6

Co-authored-by: Canton <canton@digitalasset.com>

Author: canton-machine

community/app-base/src/main/scala/com/digitalasset/canton/console/ConsoleMacros.scala

@@ -28,7 +28,8 @@ import com.digitalasset.canton.config.NonNegativeDuration
 import com.digitalasset.canton.config.RequireTypes.PositiveInt
 import com.digitalasset.canton.console.ConsoleEnvironment.Implicits.*
 import com.digitalasset.canton.logging.{LastErrorsAppender, NamedLoggerFactory, NamedLogging}
-import com.digitalasset.canton.participant.admin.{RepairService, SyncStateInspection}
+import com.digitalasset.canton.participant.admin.RepairService
+import com.digitalasset.canton.participant.admin.inspection.SyncStateInspection
 import com.digitalasset.canton.participant.config.{AuthServiceConfig, BaseParticipantConfig}
 import com.digitalasset.canton.participant.ledger.api.JwtTokenUtilities
 import com.digitalasset.canton.protocol.{LfContractId, SerializableContract}

community/app-base/src/main/scala/com/digitalasset/canton/console/commands/ParticipantAdministration.scala

@@ -44,9 +44,10 @@ import com.digitalasset.canton.health.admin.data.ParticipantStatus
 import com.digitalasset.canton.logging.{NamedLoggerFactory, NamedLogging, TracedLogger}
 import com.digitalasset.canton.participant.ParticipantNode
 import com.digitalasset.canton.participant.admin.grpc.TransferSearchResult
+import com.digitalasset.canton.participant.admin.inspection.SyncStateInspection
 import com.digitalasset.canton.participant.admin.v0.PruningServiceGrpc
 import com.digitalasset.canton.participant.admin.v0.PruningServiceGrpc.PruningServiceStub
-import com.digitalasset.canton.participant.admin.{ResourceLimits, SyncStateInspection, v0}
+import com.digitalasset.canton.participant.admin.{ResourceLimits, v0}
 import com.digitalasset.canton.participant.domain.DomainConnectionConfig
 import com.digitalasset.canton.participant.sync.TimestampedEvent
 import com.digitalasset.canton.protocol.messages.{

community/app/src/pack/examples/06-messaging/contact/daml.yaml

@@ -1,4 +1,4 @@
-sdk-version: 2.8.0-snapshot.20230807.12017.0.v7ba1e675
+sdk-version: 2.8.0-snapshot.20230811.12033.0.v2aad9b4e
 sandbox-options: 
 - --wall-clock-time
 name: contact

community/app/src/pack/examples/06-messaging/message/daml.yaml

@@ -1,4 +1,4 @@
-sdk-version: 2.8.0-snapshot.20230807.12017.0.v7ba1e675
+sdk-version: 2.8.0-snapshot.20230811.12033.0.v2aad9b4e
 sandbox-options: 
 - --wall-clock-time
 name: message

community/base/src/main/protobuf/com/digitalasset/canton/protocol/v0/versioned-google-rpc-status.proto

@@ -0,0 +1,17 @@
+// Copyright (c) 2023 Digital Asset (Switzerland) GmbH and/or its affiliates. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+syntax = "proto3";
+
+package com.digitalasset.canton.protocol.v0;
+
+import "google/rpc/status.proto";
+import "scalapb/scalapb.proto";
+
+/* DA's wrapper around `google.rpc.Status` for the proper versioning and code-gen
+*/
+message VersionedStatus {
+  option (scalapb.message).companion_extends = "com.digitalasset.canton.version.StorageProtoVersion";
+
+  google.rpc.Status status = 1;
+}

community/base/src/main/protobuf/com/digitalasset/canton/protocol/v1/sequencing.proto

@@ -10,6 +10,7 @@ import "com/digitalasset/canton/protocol/v0/sequencing.proto";
 import "google/protobuf/duration.proto";
 import "google/protobuf/timestamp.proto";
 import "google/protobuf/wrappers.proto";
+import "google/rpc/status.proto";
 import "scalapb/scalapb.proto";
 
 message StaticDomainParameters {
@@ -72,7 +73,7 @@ message SequencedEvent {
   google.protobuf.StringValue message_id = 4; // Optional: Present for DeliverError, present for the sender of a Deliver.
   // Changed in v1 from v0.CompressedBatch to v1.CompressedBatch
   CompressedBatch batch = 5; // Optional: Present for Deliver, absent for DeliverError
-  v0.DeliverErrorReason deliver_error_reason = 6; // Optional: Present for DeliverError, absent for other events
+  google.rpc.Status deliver_error_reason = 6; // Optional: Present for DeliverError, absent for other events
 }
 
 message SignedContent {

community/base/src/main/protobuf/google/rpc/package.proto

@@ -0,0 +1,12 @@
+// Copyright (c) 2023 Digital Asset (Switzerland) GmbH and/or its affiliates. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+syntax = "proto3";
+package google.rpc;
+
+import "scalapb/scalapb.proto";
+
+option (scalapb.options) = {
+  scope: PACKAGE
+  flat_package: false
+};

community/base/src/main/scala/com/digitalasset/canton/data/CommonMetadata.scala

@@ -6,6 +6,7 @@ package com.digitalasset.canton.data
 import cats.syntax.either.*
 import com.digitalasset.canton.*
 import com.digitalasset.canton.crypto.*
+import com.digitalasset.canton.data.CommonMetadata.singleMediatorError
 import com.digitalasset.canton.logging.pretty.Pretty
 import com.digitalasset.canton.protocol.{v0, *}
 import com.digitalasset.canton.serialization.ProtoConverter.ParsingResult
@@ -49,8 +50,7 @@ final case class CommonMetadata private (
 
   @transient override protected lazy val companionObj: CommonMetadata.type = CommonMetadata
 
-  private[CommonMetadata] def toProtoV0: v0.CommonMetadata = {
-    require(isEquivalentTo(ProtocolVersion.v3))
+  private def toProtoV0: v0.CommonMetadata = {
     mediator match {
       case MediatorRef.Single(mediatorId) =>
         v0.CommonMetadata(
@@ -61,15 +61,12 @@ final case class CommonMetadata private (
           mediatorId = mediatorId.toProtoPrimitive,
         )
       case _ =>
-        throw new IllegalStateException(
-          s"Only single mediator exist in for the representative protocol version $representativeProtocolVersion"
-        )
+        throw new IllegalStateException(singleMediatorError(representativeProtocolVersion))
     }
   }
 
-  private[CommonMetadata] def toProtoV1: v1.CommonMetadata = {
+  private def toProtoV1: v1.CommonMetadata = {
     // TODO(#12373) Adapt when releasing BFT
-    require(isEquivalentTo(ProtocolVersion.dev))
     v1.CommonMetadata(
       confirmationPolicy = confirmationPolicy.toProtoPrimitive,
       domainId = domainId.toProtoPrimitive,
@@ -99,20 +96,53 @@ object CommonMetadata
     ),
   )
 
-  def apply(
-      hashOps: HashOps
+  private def singleMediatorError(
+      rpv: RepresentativeProtocolVersion[CommonMetadata.type]
+  ): String = s"Only single mediator exist in for the representative protocol version $rpv"
+
+  private[data] def shouldHaveSingleMediator(
+      rpv: RepresentativeProtocolVersion[CommonMetadata.type]
+  ): Boolean = rpv == protocolVersionRepresentativeFor(ProtocolVersion.v3)
+
+  def create(
+      hashOps: HashOps,
+      protocolVersion: ProtocolVersion,
   )(
       confirmationPolicy: ConfirmationPolicy,
       domain: DomainId,
       mediator: MediatorRef,
       salt: Salt,
       uuid: UUID,
-      protocolVersion: ProtocolVersion,
-  ): CommonMetadata = CommonMetadata(confirmationPolicy, domain, mediator, salt, uuid)(
+  ): Either[String, CommonMetadata] = create(
     hashOps,
     protocolVersionRepresentativeFor(protocolVersion),
-    None,
-  )
+  )(confirmationPolicy, domain, mediator, salt, uuid)
+
+  def create(
+      hashOps: HashOps,
+      protocolVersion: RepresentativeProtocolVersion[CommonMetadata.type],
+  )(
+      confirmationPolicy: ConfirmationPolicy,
+      domain: DomainId,
+      mediator: MediatorRef,
+      salt: Salt,
+      uuid: UUID,
+  ): Either[String, CommonMetadata] = {
+
+    mediator match {
+      case MediatorRef.Group(_) if shouldHaveSingleMediator(protocolVersion) =>
+        Left(singleMediatorError(protocolVersion))
+
+      case _ =>
+        Right(
+          CommonMetadata(confirmationPolicy, domain, mediator, salt, uuid)(
+            hashOps,
+            protocolVersion,
+            None,
+          )
+        )
+    }
+  }
 
   private def fromProtoV0(hashOps: HashOps, metaDataP: v0.CommonMetadata)(
       bytes: ByteString

community/base/src/main/scala/com/digitalasset/canton/error/CantonError.scala

@@ -75,11 +75,14 @@ trait BaseCantonError extends BaseError {
   /** The error code, usually passed in as implicit where the error class is defined */
   def code: ErrorCode
 
+  def rpcStatusWithoutLoggingContext(): com.google.rpc.status.Status = rpcStatus()(NoLogging)
+
   def rpcStatus(
       overrideCode: Option[Status.Code] = None
-  )(implicit loggingContext: ErrorLoggingContext): com.google.rpc.status.Status = {
+  )(implicit loggingContext: ContextualizedErrorLogger): com.google.rpc.status.Status = {
     import scala.jdk.CollectionConverters.*
     val status0: com.google.rpc.Status = code.asGrpcStatus(this)
+
     val details: Seq[com.google.protobuf.Any] = status0.getDetailsList.asScala.toSeq
     val detailsScalapb = details.map(com.google.protobuf.any.Any.fromJavaProto)
 
@@ -169,17 +172,24 @@ object BaseCantonError {
   )(implicit override val code: ErrorCode)
       extends BaseCantonError {}
 
-  def isStatusErrorCode(errorCode: ErrorCode, status: com.google.rpc.status.Status): Boolean = {
+  def isStatusErrorCode(errorCode: ErrorCode, status: com.google.rpc.status.Status): Boolean =
+    extractStatusErrorCodeMessage(errorCode, status).isDefined
+
+  def extractStatusErrorCodeMessage(
+      errorCode: ErrorCode,
+      status: com.google.rpc.status.Status,
+  ): Option[String] = {
     val code = errorCode.category.grpcCode.getOrElse(
       throw new IllegalArgumentException(s"Error code $errorCode does not have a gRPC code")
     )
     if (status.code == code.value()) {
-      status.details.exists { any =>
-        if (any.is(ErrorInfo.messageCompanion)) {
-          Try(any.unpack(ErrorInfo.messageCompanion)).toOption.exists(_.reason == errorCode.id)
-        } else false
+      status.details.collectFirst {
+        case any
+            if (any.is(ErrorInfo) && Try(any.unpack(ErrorInfo))
+              .fold(_ => false, _.reason == errorCode.id)) =>
+          status.message
       }
-    } else false
+    } else None
   }
 }
 

community/base/src/main/scala/com/digitalasset/canton/protocol/ConfirmationPolicy.scala

@@ -158,25 +158,7 @@ object ConfirmationPolicy {
     override def requiredTrustLevel: TrustLevel = TrustLevel.Ordinary
   }
 
-  case object Full extends ConfirmationPolicy {
-    override val name = "Full"
-    protected override val index: Int = 2
-
-    override def informeesAndThreshold(node: LfActionNode, topologySnapshot: TopologySnapshot)(
-        implicit ec: ExecutionContext
-    ): Future[(Set[Informee], NonNegativeInt)] = {
-      val informees = node.informeesOfNode
-      require(
-        informees.nonEmpty,
-        "There must be at least one informee as every node must have at least one signatory.",
-      )
-      Future.successful(toInformeesAndThreshold(informees, Set.empty, TrustLevel.Ordinary))
-    }
-
-    override def requiredTrustLevel: TrustLevel = TrustLevel.Ordinary
-  }
-
-  val values: Seq[ConfirmationPolicy] = Seq[ConfirmationPolicy](Vip, Signatory, Full)
+  val values: Seq[ConfirmationPolicy] = Seq[ConfirmationPolicy](Vip, Signatory)
 
   require(
     values.zipWithIndex.forall { case (policy, index) => policy.index == index },
@@ -190,7 +172,6 @@ object ConfirmationPolicy {
   /** Chooses appropriate confirmation policies for a transaction.
     * It chooses [[Vip]] if every node has at least one VIP who knows the state
     * It chooses [[Signatory]] if every node has a Participant that can confirm.
-    * It never chooses [[Full]].
     */
   def choose(transaction: LfVersionedTransaction, topologySnapshot: TopologySnapshot)(implicit
       ec: ExecutionContext
@@ -235,7 +216,7 @@ object ConfirmationPolicy {
     DeterministicEncoding.decodeString(encodedName).flatMap {
       case (Vip.name, _) => Right(Vip)
       case (Signatory.name, _) => Right(Signatory)
-      case (badName, badBytes) =>
+      case (badName, _) =>
         Left(DefaultDeserializationError(s"Invalid confirmation policy $badName"))
     }
 }