[main] Update 2025-11-11.22 (#401)

Reference commit: 317923a2d8

Author: canton-machine

UNRELEASED.md

@@ -64,6 +64,9 @@ Impacted commands:
 - `participant.parties.find_party_max_deactivation_offset`
 - `participant.parties.find_highest_offset_by_timestamp`
 
+### Removal of automatic recomputation of contract ids upon ACS import
+The ability to recompute contract ids upon ACS import has been removed.
+
 ## Compatibility
 
 The following Canton protocol and Ethereum sequencer contract versions are supported:

community-build.sbt

@@ -12,6 +12,8 @@ lazy val `community-admin-api` = CommunityProjects.`community-admin-api`
 lazy val `community-testing` = CommunityProjects.`community-testing`
 lazy val `community-integration-testing` = CommunityProjects.`community-integration-testing`
 lazy val `community-integration-testing-lib` = CommunityProjects.`community-integration-testing-lib`
+lazy val `daml-script-tests` = CommunityProjects.`daml-script-tests`
+lazy val microbench = CommunityProjects.microbench
 lazy val demo = CommunityProjects.demo
 lazy val blake2b = CommunityProjects.blake2b
 lazy val `slick-fork` = CommunityProjects.`slick-fork`

community/admin-api/src/main/protobuf/com/digitalasset/canton/admin/participant/v30/acs_import.proto

@@ -39,7 +39,7 @@ enum ContractImportMode {
   // Default enum value that indicates the ContractImportMode field was not explicitly set.
   // Requests with this value will fail validation and be rejected.
   CONTRACT_IMPORT_MODE_UNSPECIFIED = 0;
-  // A contract is imported without validation or contract-id recomputation.
+  // A contract is imported without validation.
   // This option is suitable for large imports when the participant operator is confident that all contracts
   // are valid for their associated representative package-id.
   CONTRACT_IMPORT_MODE_ACCEPT = 1;
@@ -48,6 +48,4 @@ enum ContractImportMode {
   //
   // This is the recommended option for most import scenarios.
   CONTRACT_IMPORT_MODE_VALIDATION = 2;
-  // The contract is validated and its contract ID suffix is recomputed.
-  CONTRACT_IMPORT_MODE_RECOMPUTATION = 3;
 }

community/admin-api/src/main/protobuf/com/digitalasset/canton/admin/participant/v30/participant_repair_service.proto

@@ -171,18 +171,18 @@ message ImportAcsOldRequest {
   // The synchronizer id prefix to be used for the imported contracts
   // Optional, if not provided the service will generate a prefix
   string workflow_id_prefix = 2;
+
   // If false, the service will fail if any contract ID suffix doesn't match the scheme
   // associated to the synchronizer where the contract is being assigned as a result of the import.
   // If true, any contract ID suffix will be recomputed to match the scheme associated to the synchronizer.
   // Recommended value is `false`
-  bool allow_contract_id_suffix_recomputation = 3;
+  reserved 3; // was allow_contract_id_suffix_recomputation, default behavior is false
 }
 
 message ImportAcsOldResponse {
   option deprecated = true;
 
-  // Mapping from the old contract id to the new contract id
-  map<string, string> contract_id_mapping = 1;
+  reserved 1; // was map<string, string> contract_id_mapping
 }
 
 message ExportAcsTargetSynchronizer {
@@ -267,9 +267,7 @@ message ImportAcsRequest {
 }
 
 message ImportAcsResponse {
-  // Maps old contract IDs to newly recomputed contract IDs iff the recomputation contract ID import mode has
-  // been selected, empty otherwise.
-  map<string, string> contract_id_mappings = 1;
+  reserved 1; // was map<string, string> contract_id_mappings = 1;
 }
 
 message PurgeDeactivatedSynchronizerRequest {

community/app-base/src/main/scala/com/digitalasset/canton/admin/api/client/commands/ParticipantAdminCommands.scala

@@ -783,11 +783,10 @@ object ParticipantAdminCommands {
     final case class ImportAcsOld(
         acsChunk: ByteString,
         workflowIdPrefix: String,
-        allowContractIdSuffixRecomputation: Boolean,
     ) extends GrpcAdminCommand[
           v30.ImportAcsOldRequest,
           v30.ImportAcsOldResponse,
-          Map[LfContractId, LfContractId],
+          Unit,
         ] {
 
       override type Svc = ParticipantRepairServiceStub
@@ -800,7 +799,6 @@ object ParticipantAdminCommands {
           v30.ImportAcsOldRequest(
             acsChunk,
             workflowIdPrefix,
-            allowContractIdSuffixRecomputation,
           )
         )
 
@@ -814,22 +812,13 @@ object ParticipantAdminCommands {
             v30.ImportAcsOldRequest(
               ByteString.copyFrom(bytes),
               workflowIdPrefix,
-              allowContractIdSuffixRecomputation,
             ),
           request.acsSnapshot,
         )
 
       override protected def handleResponse(
           response: v30.ImportAcsOldResponse
-      ): Either[String, Map[LfContractId, LfContractId]] =
-        response.contractIdMapping.toSeq
-          .traverse { case (oldCid, newCid) =>
-            for {
-              oldCidParsed <- LfContractId.fromString(oldCid)
-              newCidParsed <- LfContractId.fromString(newCid)
-            } yield oldCidParsed -> newCidParsed
-          }
-          .map(_.toMap)
+      ): Either[String, Unit] = Right(())
     }
 
     final case class ExportAcs(
@@ -893,7 +882,7 @@ object ParticipantAdminCommands {
     ) extends GrpcAdminCommand[
           v30.ImportAcsRequest,
           v30.ImportAcsResponse,
-          Map[LfContractId, LfContractId],
+          Unit,
         ] {
 
       override type Svc = ParticipantRepairServiceStub
@@ -931,15 +920,7 @@ object ParticipantAdminCommands {
 
       override protected def handleResponse(
           response: v30.ImportAcsResponse
-      ): Either[String, Map[LfContractId, LfContractId]] =
-        response.contractIdMappings.toSeq
-          .traverse { case (oldCid, newCid) =>
-            for {
-              oldCidParsed <- LfContractId.fromString(oldCid)
-              newCidParsed <- LfContractId.fromString(newCid)
-            } yield oldCidParsed -> newCidParsed
-          }
-          .map(_.toMap)
+      ): Either[String, Unit] = Right(())
     }
 
     final case class PurgeContracts(

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

@@ -238,27 +238,9 @@ class ParticipantRepairAdministration(
         |
         |The contract IDs of the imported contracts will be checked ahead of starting the
         |process. If any contract ID doesn't match the contract ID scheme associated to the
-        |synchronizer where the contract is assigned to, the whole import process will fail
-        |depending on the value of `allowContractIdSuffixRecomputation`.
+        |synchronizer where the contract is assigned to, the whole import process will fail.
         |
-        |By default `allowContractIdSuffixRecomputation` is set to `false`. If set to `true`, any
-        |contract ID that wouldn't pass the check above will be recomputed. Note that the
-        |recomputation of contract IDs fails under the following circumstances:
-        | - the contract salt used to compute the contract ID is missing
-        | - the contract ID discriminator version is unknown
-        |
-        |Note that only the Canton-specific contract ID suffix will be recomputed. The
-        |discriminator cannot be recomputed and will be left as is.
-        |
-        |The recomputation will not be performed on contract IDs referenced in the payload of some
-        |imported contract but is missing from the import itself (this should mean that the
-        |contract was archived, which makes recomputation unnecessary).
-        |
-        |If the import process succeeds, the mapping from the old contract IDs to the new contract
-        |IDs will be returned. An empty map means that all contract IDs were valid and no contract
-        |ID was recomputed.
-        |
-        |DEPRECATION NOTICE: A future release removes this command, use `export_acs` instead.
+        |DEPRECATION NOTICE: A future release removes this command, use `import_acs` instead.
         """
   )
   @deprecated(
@@ -268,15 +250,13 @@ class ParticipantRepairAdministration(
   def import_acs_old(
       inputFile: String = ParticipantRepairAdministration.ExportAcsDefaultFile,
       workflowIdPrefix: String = "",
-      allowContractIdSuffixRecomputation: Boolean = false,
-  ): Map[LfContractId, LfContractId] =
+  ): Unit =
     check(FeatureFlag.Repair) {
       consoleEnvironment.run {
         runner.adminCommand(
           ParticipantAdminCommands.ParticipantRepairManagement.ImportAcsOld(
             ByteString.copyFrom(File(inputFile).loadBytes),
             if (workflowIdPrefix.nonEmpty) workflowIdPrefix else s"import-${UUID.randomUUID}",
-            allowContractIdSuffixRecomputation = allowContractIdSuffixRecomputation,
           )
         )
       }
@@ -345,36 +325,20 @@ class ParticipantRepairAdministration(
       |where the contract is assigned to, the whole import process fails depending on the value
       |of `contractImportMode`.
       |
-      |By default `contractImportMode` is set to `ContractImportMode.Validation`. If set to
-      |`ContractImportMode.Recomputation`, any contract ID that wouldn't pass the check above
-      |will be recomputed. Note that the recomputation of contract IDs fails under the following
-      |circumstances:
-      | - the contract salt used to compute the contract ID is missing
-      | - the contract ID discriminator version is unknown
-      |
-      |Note that only the Canton-specific contract ID suffix will be recomputed. The
-      |discriminator cannot be recomputed and will be left as is.
-      |
-      |The recomputation will not be performed on contract IDs referenced in the payload of some
-      |imported contract but is missing from the import itself (this should mean that the
-      |contract was archived, which makes recomputation unnecessary).
+      |By default `contractImportMode` is set to `ContractImportMode.Validation`.
       |
-      |Expert only: As validation or recomputation on contract IDs may lengthen the import
+      |Expert only: As validation of contract IDs may lengthen the import
       |significantly, you have the option to simply accept the contract IDs as they are using
       |`ContractImportMode.Accept`.
       |
-      |If the import process succeeds, the mapping from the old contract IDs to the new contract
-      |IDs will be returned. An empty map means that all contract IDs were valid, or have been
-      |accept as they are, and no contract ID was recomputed.
-      |
       |The arguments are:
       |- importFilePath: The path denoting the file from where the ACS snapshot will be read.
       |                  Defaults to "canton-acs-export.gz" when undefined.
       |- workflowIdPrefix: Sets a custom prefix for the workflow ID to easily identify all
       |                  transactions generated by this import.
       |                  Defaults to "import-<random_UUID>" when unspecified.
       |- contractImportMode: Governs contract authentication processing on import. Options include
-      |                      Validation (default), [Accept, Recomputation].
+      |                      Validation (default), [Accept].
       |- representativePackageIdOverride: Defines override mappings for assigning
       |                                   representative package IDs to contracts upon ACS import.
       |- excludedStakeholders: When defined, any contract that has one or more of these
@@ -388,7 +352,7 @@ class ParticipantRepairAdministration(
       representativePackageIdOverride: RepresentativePackageIdOverride =
         RepresentativePackageIdOverride.NoOverride,
       excludedStakeholders: Set[PartyId] = Set.empty,
-  ): Map[LfContractId, LfContractId] =
+  ): Unit =
     check(FeatureFlag.Repair) {
       consoleEnvironment.run {
         runner.adminCommand(
@@ -425,8 +389,7 @@ class ParticipantRepairAdministration(
       synchronizerId: SynchronizerId,
       protocolVersion: ProtocolVersion,
       contracts: Seq[RepairContract],
-      allowContractIdSuffixRecomputation: Boolean = false,
-  ): Map[LfContractId, LfContractId] = {
+  ): Unit = {
 
     val temporaryFile = File.newTemporaryFile(suffix = ".gz")
     val outputStream = temporaryFile.newGzipOutputStream()
@@ -456,7 +419,6 @@ class ParticipantRepairAdministration(
           ParticipantAdminCommands.ParticipantRepairManagement.ImportAcsOld(
             bytes,
             workflowIdPrefix = s"import-${UUID.randomUUID}",
-            allowContractIdSuffixRecomputation = allowContractIdSuffixRecomputation,
           )
         )
       }

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

@@ -1172,7 +1172,7 @@ class ParticipantPartiesAdministrationGroup(
       |                  transactions generated by this import.
       |                  Defaults to "import-<random_UUID>" when unspecified.
       |- contractImportMode: Governs contract authentication processing on import. Options include
-      |                      Validation (default), [Accept, Recomputation].
+      |                      Validation (default), [Accept].
       |- representativePackageIdOverride: Defines override mappings for assigning
       |                                   representative package IDs to contracts upon ACS import.
       |                                   Defaults to NoOverride when undefined.

community/app-base/src/main/scala/com/digitalasset/canton/environment/CommunityEnvironmentFactory.scala

@@ -6,8 +6,8 @@ package com.digitalasset.canton.environment
 import com.digitalasset.canton.config.{CantonConfig, CommunityCantonEdition, TestingConfigInternal}
 import com.digitalasset.canton.logging.NamedLoggerFactory
 import com.digitalasset.canton.participant.CommunityParticipantNodeBootstrapFactory
-import com.digitalasset.canton.synchronizer.mediator.CommunityMediatorNodeBootstrapFactory
-import com.digitalasset.canton.synchronizer.sequencer.CommunitySequencerNodeBootstrapFactory
+import com.digitalasset.canton.synchronizer.mediator.MediatorNodeBootstrapFactoryImpl
+import com.digitalasset.canton.synchronizer.sequencer.SequencerNodeBootstrapFactoryImpl
 
 object CommunityEnvironmentFactory extends EnvironmentFactory {
 
@@ -21,8 +21,8 @@ object CommunityEnvironmentFactory extends EnvironmentFactory {
       CommunityCantonEdition,
       testingConfigInternal,
       CommunityParticipantNodeBootstrapFactory,
-      CommunitySequencerNodeBootstrapFactory,
-      CommunityMediatorNodeBootstrapFactory,
+      SequencerNodeBootstrapFactoryImpl,
+      MediatorNodeBootstrapFactoryImpl,
       loggerFactory,
     )
 }

community/app/src/test/scala/com/digitalasset/canton/integration/tests/AcsCommitmentMetricsIntegrationTest.scala

@@ -500,13 +500,18 @@ trait AcsCommitmentMetricsIntegrationTest
     participant3.stop()
     val start = simClock.now
 
-    simClock.advance(interval.multipliedBy(2L))
+    simClock.advance(
+      interval
+        .multipliedBy(2L)
+        // Add one microsecond to avoid sequencing times that fall on interval boundaries
+        .plusNanos(1000)
+    )
     participant1.health.ping(participant1)
     participant1.testing.fetch_synchronizer_times()
     val end = simClock.now
 
     eventually() {
-      participant1.commitments.computed(daName, start.toInstant, end.toInstant).size shouldBe 4
+      participant1.commitments.computed(daName, start.toInstant, end.toInstant) should have size 2
     }
 
     logger.info(