Remove use of legacy acs import endpoint (#3609)

moritzkiefer-da · cocreature · web-flow · commit 4541f2016393 · 2026-01-20T13:54:28.000Z
fixes #3608 [ci] Signed-off-by: Moritz Kiefer <moritz.kiefer@purelyfunctional.org> Co-authored-by: Moritz Kiefer <moritz.kiefer@purelyfunctional.org>
diff --git a/apps/common/src/main/scala/org/lfdecentralizedtrust/splice/environment/ParticipantAdminConnection.scala b/apps/common/src/main/scala/org/lfdecentralizedtrust/splice/environment/ParticipantAdminConnection.scala
@@ -380,32 +380,6 @@ class ParticipantAdminConnection(
       ByteString.copyFrom(chunks.asJava)
     )
 
-  def uploadAcsSnapshotLegacy(acsBytes: Seq[ByteString])(implicit
-      traceContext: TraceContext
-  ): Future[Unit] = {
-    val chunkedAcsBytes: Seq[ByteString] = acsBytes match {
-      case Seq(bytes) =>
-        // Caller has not chunked the bytes, this is possible for SVs that try to onboard or for validator recovery.
-        // The chuning logic here matches what GrpcStreamingUtils.streamToServer does
-        bytes.toByteArray.grouped(1024 * 1024 * 2).map(ByteString.copyFrom(_)).toSeq
-      case _ => acsBytes
-    }
-    retryProvider.retryForClientCalls(
-      "import_acs",
-      "Imports the acs in the participantl",
-      runCmd(
-        ParticipantAdminCommands.ParticipantRepairManagement
-          .ImportAcsOld(
-            chunkedAcsBytes,
-            IMPORT_ACS_WORKFLOW_ID_PREFIX,
-            allowContractIdSuffixRecomputation = false,
-          ),
-        timeoutOverride = Some(GrpcAdminCommand.DefaultUnboundedTimeout),
-      ).map(_ => ()),
-      logger,
-    )
-  }
-
   def uploadAcsSnapshot(acsBytes: Seq[ByteString])(implicit
       traceContext: TraceContext
   ): Future[Unit] = {
diff --git a/apps/common/src/main/scala/org/lfdecentralizedtrust/splice/migration/DomainDataRestorer.scala b/apps/common/src/main/scala/org/lfdecentralizedtrust/splice/migration/DomainDataRestorer.scala
@@ -35,7 +35,6 @@ class DomainDataRestorer(
       sequencerConnections: SequencerConnections,
       dars: Seq[Dar],
       acsSnapshot: Seq[ByteString],
-      legacyAcsImport: Boolean,
   )(implicit
       tc: TraceContext
   ): Future[Unit] = {
@@ -66,7 +65,9 @@ class DomainDataRestorer(
               RetryFor.ClientCalls,
             )
         _ = logger.info("Importing the ACS")
-        _ <- importAcs(acsSnapshot, legacyAcsImport)
+        _ <- participantAdminConnection.uploadAcsSnapshot(
+          acsSnapshot
+        )
         _ = logger.info("Imported the ACS")
         _ <- participantAdminConnection.modifySynchronizerConnectionConfigAndReconnect(
           synchronizerAlias,
@@ -97,20 +98,6 @@ class DomainDataRestorer(
       }
   }
 
-  private def importAcs(acs: Seq[ByteString], legacyAcsImport: Boolean)(implicit
-      tc: TraceContext
-  ) = {
-    if (legacyAcsImport) {
-      participantAdminConnection.uploadAcsSnapshotLegacy(
-        acs
-      )
-    } else {
-      participantAdminConnection.uploadAcsSnapshot(
-        acs
-      )
-    }
-  }
-
   private def importDars(dars: Seq[Dar])(implicit tc: TraceContext) = {
     val packages = dars
       .map { dar =>
diff --git a/apps/sv/src/main/scala/org/lfdecentralizedtrust/splice/sv/migration/DomainDataSnapshot.scala b/apps/sv/src/main/scala/org/lfdecentralizedtrust/splice/sv/migration/DomainDataSnapshot.scala
@@ -24,7 +24,6 @@ final case class DomainDataSnapshot(
     dars: Seq[Dar],
     // true if we exported for a proper migration, false for DR.
     synchronizerWasPaused: Boolean,
-    acsFormat: http.DomainDataSnapshot.AcsFormat,
 ) extends PrettyPrinting {
   // if output directory is specified we use the new format, otherwise the old one.
   // Only the DR endpoint should use the old one.
@@ -43,7 +42,7 @@ final case class DomainDataSnapshot(
       }.toVector,
       synchronizerWasPaused = Some(synchronizerWasPaused),
       separatePayloadFiles = Some(outputDirectory.isDefined),
-      acsFormat = Some(acsFormat),
+      acsFormat = Some(http.DomainDataSnapshot.AcsFormat.LedgerApi),
     )
   }
 
@@ -85,16 +84,20 @@ object DomainDataSnapshot {
         Dar(dar.hash, ByteString.copyFrom(decoded))
       }
     val acsTimestamp = Instant.parse(src.acsTimestamp)
-    Right(
-      DomainDataSnapshot(
-        src.genesisState.map(DomainMigrationEncoding.decode(src.separatePayloadFiles, _)),
-        DomainMigrationEncoding.decode(src.separatePayloadFiles, src.acsSnapshot),
-        acsTimestamp,
-        dars,
-        src.synchronizerWasPaused.getOrElse(false),
-        acsFormat = src.acsFormat.getOrElse(http.DomainDataSnapshot.AcsFormat.AdminApi),
-      )
-    )
+    src.acsFormat.getOrElse(http.DomainDataSnapshot.AcsFormat.AdminApi) match {
+      case http.DomainDataSnapshot.AcsFormat.members.AdminApi =>
+        Left("Admin API ACS Format is unsupported since splice 0.5")
+      case http.DomainDataSnapshot.AcsFormat.members.LedgerApi =>
+        Right(
+          DomainDataSnapshot(
+            src.genesisState.map(DomainMigrationEncoding.decode(src.separatePayloadFiles, _)),
+            DomainMigrationEncoding.decode(src.separatePayloadFiles, src.acsSnapshot),
+            acsTimestamp,
+            dars,
+            src.synchronizerWasPaused.getOrElse(false),
+          )
+        )
+    }
   }
 
 }
diff --git a/apps/sv/src/main/scala/org/lfdecentralizedtrust/splice/sv/migration/DomainDataSnapshotGenerator.scala b/apps/sv/src/main/scala/org/lfdecentralizedtrust/splice/sv/migration/DomainDataSnapshotGenerator.scala
@@ -10,7 +10,6 @@ import org.lfdecentralizedtrust.splice.environment.{
   RetryProvider,
   SequencerAdminConnection,
 }
-import org.lfdecentralizedtrust.splice.http.v0.definitions as http
 import org.lfdecentralizedtrust.splice.migration.{
   AcsExporter,
   DarExporter,
@@ -74,7 +73,6 @@ class DomainDataSnapshotGenerator(
     acsTimestamp = timestamp,
     dars,
     synchronizerWasPaused = false,
-    acsFormat = http.DomainDataSnapshot.AcsFormat.LedgerApi,
   )
 
   private def exportGenesisState(
@@ -165,7 +163,6 @@ class DomainDataSnapshotGenerator(
       acsTimestamp,
       dars,
       synchronizerWasPaused = true,
-      acsFormat = http.DomainDataSnapshot.AcsFormat.LedgerApi,
     )
     logger.info(show"Finished generating $result")
     result
diff --git a/apps/sv/src/main/scala/org/lfdecentralizedtrust/splice/sv/onboarding/domainmigration/DomainMigrationInitializer.scala b/apps/sv/src/main/scala/org/lfdecentralizedtrust/splice/sv/onboarding/domainmigration/DomainMigrationInitializer.scala
@@ -292,8 +292,6 @@ class DomainMigrationInitializer(
         SequencerConnections.single(localSynchronizerNode.sequencerConnection),
         domainMigrationDump.domainDataSnapshot.dars,
         domainMigrationDump.domainDataSnapshot.acsSnapshot,
-        legacyAcsImport =
-          domainMigrationDump.domainDataSnapshot.acsFormat == http.DomainDataSnapshot.AcsFormat.AdminApi,
       )
       _ = logger.info("resumed domain")
     } yield {}
diff --git a/apps/validator/src/main/scala/org/lfdecentralizedtrust/splice/validator/ValidatorApp.scala b/apps/validator/src/main/scala/org/lfdecentralizedtrust/splice/validator/ValidatorApp.scala
@@ -39,7 +39,6 @@ import org.lfdecentralizedtrust.splice.automation.{
 import org.lfdecentralizedtrust.splice.config.{NetworkAppClientConfig, SharedSpliceAppParameters}
 import org.lfdecentralizedtrust.splice.environment.*
 import org.lfdecentralizedtrust.splice.environment.ledger.api.DedupDuration
-import org.lfdecentralizedtrust.splice.http.v0.definitions as http
 import org.lfdecentralizedtrust.splice.http.v0.status.wallet.WalletResource as StatusWalletResource
 import org.lfdecentralizedtrust.splice.http.v0.external.ans.AnsResource
 import org.lfdecentralizedtrust.splice.http.v0.external.wallet.WalletResource as ExternalWalletResource
@@ -271,8 +270,6 @@ class ValidatorApp(
                       sequencerConnections,
                       migrationDump.dars,
                       migrationDump.acsSnapshot,
-                      legacyAcsImport =
-                        migrationDump.acsFormat == http.DomainMigrationDump.AcsFormat.AdminApi,
                     )
                   }
                   _ <- appInitStep("Restoring participant users data") {
diff --git a/apps/validator/src/main/scala/org/lfdecentralizedtrust/splice/validator/migration/DomainMigrationDump.scala b/apps/validator/src/main/scala/org/lfdecentralizedtrust/splice/validator/migration/DomainMigrationDump.scala
@@ -30,7 +30,6 @@ final case class DomainMigrationDump(
     createdAt: Instant,
     // true if we exported for a proper migration, false for DR.
     synchronizerWasPaused: Boolean,
-    acsFormat: http.DomainMigrationDump.AcsFormat,
 ) extends PrettyPrinting {
   override def pretty: Pretty[DomainMigrationDump.this.type] =
     Pretty.prettyNode(
@@ -63,7 +62,7 @@ final case class DomainMigrationDump(
     createdAt = createdAt.toString,
     synchronizerWasPaused = Some(synchronizerWasPaused),
     separatePayloadFiles = Some(outputDirectory.isDefined),
-    acsFormat = Some(acsFormat),
+    acsFormat = Some(http.DomainMigrationDump.AcsFormat.LedgerApi),
   )
 }
 
@@ -94,6 +93,12 @@ object DomainMigrationDump {
       Dar(dar.hash, ByteString.copyFrom(decoded))
     }
     createdAt = Instant.parse(response.createdAt)
+    _ <- response.acsFormat.getOrElse(http.DomainMigrationDump.AcsFormat.AdminApi) match {
+      case http.DomainMigrationDump.AcsFormat.members.AdminApi =>
+        Left("Admin API ACS Format is unsupported since splice 0.5")
+      case http.DomainMigrationDump.AcsFormat.members.LedgerApi =>
+        Right(())
+    }
   } yield DomainMigrationDump(
     domainId = domainId,
     migrationId = migrationId,
@@ -104,6 +109,5 @@ object DomainMigrationDump {
     dars = dars,
     createdAt = createdAt,
     synchronizerWasPaused = response.synchronizerWasPaused.getOrElse(false),
-    acsFormat = response.acsFormat.getOrElse(http.DomainMigrationDump.AcsFormat.AdminApi),
   )
 }
diff --git a/apps/validator/src/main/scala/org/lfdecentralizedtrust/splice/validator/migration/DomainMigrationDumpGenerator.scala b/apps/validator/src/main/scala/org/lfdecentralizedtrust/splice/validator/migration/DomainMigrationDumpGenerator.scala
@@ -14,7 +14,6 @@ import org.lfdecentralizedtrust.splice.environment.{
   RetryProvider,
   SpliceLedgerConnection,
 }
-import org.lfdecentralizedtrust.splice.http.v0.definitions as http
 import org.lfdecentralizedtrust.splice.identities.NodeIdentitiesStore
 import org.lfdecentralizedtrust.splice.migration.AcsExporter.AcsExportForParties.AllParticipantParties
 import org.lfdecentralizedtrust.splice.migration.{
@@ -76,7 +75,6 @@ class DomainMigrationDumpGenerator(
         dars = dars,
         createdAt = createdAt,
         synchronizerWasPaused = true,
-        acsFormat = http.DomainMigrationDump.AcsFormat.LedgerApi,
       )
       logger.info(
         show"Finished generating $result"
@@ -116,7 +114,6 @@ class DomainMigrationDumpGenerator(
         dars = dars,
         createdAt = Instant.now(),
         synchronizerWasPaused = false,
-        acsFormat = http.DomainMigrationDump.AcsFormat.LedgerApi,
       )
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -292,8 +292,6 @@ class DomainMigrationInitializer(`
`292`	`292`	`SequencerConnections.single(localSynchronizerNode.sequencerConnection),`
`293`	`293`	`domainMigrationDump.domainDataSnapshot.dars,`
`294`	`294`	`domainMigrationDump.domainDataSnapshot.acsSnapshot,`
`295`		`- legacyAcsImport =`
`296`		`- domainMigrationDump.domainDataSnapshot.acsFormat == http.DomainDataSnapshot.AcsFormat.AdminApi,`
`297`	`295`	`)`
`298`	`296`	`_ = logger.info("resumed domain")`
`299`	`297`	`} yield {}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,6 @@ import org.lfdecentralizedtrust.splice.environment.{`
`14`	`14`	`RetryProvider,`
`15`	`15`	`SpliceLedgerConnection,`
`16`	`16`	`}`
`17`		`-import org.lfdecentralizedtrust.splice.http.v0.definitions as http`
`18`	`17`	`import org.lfdecentralizedtrust.splice.identities.NodeIdentitiesStore`
`19`	`18`	`import org.lfdecentralizedtrust.splice.migration.AcsExporter.AcsExportForParties.AllParticipantParties`
`20`	`19`	`import org.lfdecentralizedtrust.splice.migration.{`
`@@ -76,7 +75,6 @@ class DomainMigrationDumpGenerator(`
`76`	`75`	`dars = dars,`
`77`	`76`	`createdAt = createdAt,`
`78`	`77`	`synchronizerWasPaused = true,`
`79`		`- acsFormat = http.DomainMigrationDump.AcsFormat.LedgerApi,`
`80`	`78`	`)`
`81`	`79`	`logger.info(`
`82`	`80`	`show"Finished generating $result"`
`@@ -116,7 +114,6 @@ class DomainMigrationDumpGenerator(`
`116`	`114`	`dars = dars,`
`117`	`115`	`createdAt = Instant.now(),`
`118`	`116`	`synchronizerWasPaused = false,`
`119`		`- acsFormat = http.DomainMigrationDump.AcsFormat.LedgerApi,`
`120`	`117`	`)`
`121`	`118`	`}`
`122`	`119`	`}`