Update Splice from CCI (#321)

Signed-off-by: DA Automation <splice-maintainers@digitalasset.com>
Co-authored-by: DA Automation <splice-maintainers@digitalasset.com>

Author: canton-network-da

.envrc.vars

@@ -27,6 +27,19 @@ export POSTGRES_PASSWORD=postgres
 
 export DEPLOYMENT_DIR="${SPLICE_ROOT}/cluster/deployment"
 
+export GHCR=ghcr.io
+export DEV_REGISTRY=$GHCR/digital-asset/decentralized-canton-sync-dev
+export DEV_HELM_REGISTRY=$DEV_REGISTRY/helm
+export OCI_DEV_HELM_REGISTRY=oci://$DEV_HELM_REGISTRY
+export DEV_DOCKER_REGISTRY=$DEV_REGISTRY/docker
+export CACHE_GHCR=us-central1-docker.pkg.dev/da-cn-shared/ghcr
+export CACHE_DEV_REGISTRY=$CACHE_GHCR/digital-asset/decentralized-canton-sync-dev
+export CACHE_DEV_DOCKER_REGISTRY=$CACHE_DEV_REGISTRY/docker
+export RELEASE_REGISTRY=$GHCR/digital-asset/decentralized-canton-sync
+export RELEASE_HELM_REGISTRY=$RELEASE_REGISTRY/helm
+export OCI_RELEASE_HELM_REGISTRY=oci://$RELEASE_HELM_REGISTRY
+export RELEASE_DOCKER_REGISTRY=$RELEASE_REGISTRY/docker
+
 # Include all organization specific `.envrc.vars.*` files
 if stat --printf='' .envrc.vars.* 2>/dev/null; then
   for file in .envrc.vars.*; do

apps/app/src/main/scala/org/lfdecentralizedtrust/splice/console/LedgerApiExtensions.scala

@@ -10,22 +10,22 @@ import com.daml.ledger.api.v2.transaction.TransactionTree
 import com.daml.ledger.javaapi
 import com.daml.ledger.javaapi.data.TransactionTree as JavaTransactionTree
 import com.daml.ledger.javaapi.data.codegen.{ContractId, Exercised, Update}
-import org.lfdecentralizedtrust.splice.environment.{SpliceLedgerConnection, PackageIdResolver}
-import org.lfdecentralizedtrust.splice.util.{Contract, JavaDecodeUtil, PackageQualifiedName}
 import com.digitalasset.canton.admin.api.client.commands.LedgerApiCommands
 import com.digitalasset.canton.admin.api.client.data.TemplateId
 import com.digitalasset.canton.config.NonNegativeDuration
+import com.digitalasset.canton.console.commands.BaseLedgerApiAdministration
 import com.digitalasset.canton.console.{
   ConsoleCommandResult,
   ConsoleMacros,
   FeatureFlag,
   Help,
   LedgerApiCommandRunner,
 }
-import com.digitalasset.canton.console.commands.BaseLedgerApiAdministration
 import com.digitalasset.canton.data.DeduplicationPeriod
 import com.digitalasset.canton.topology.{DomainId, PartyId}
 import com.digitalasset.canton.tracing.TraceContext
+import org.lfdecentralizedtrust.splice.environment.{PackageIdResolver, SpliceLedgerConnection}
+import org.lfdecentralizedtrust.splice.util.{Contract, JavaDecodeUtil, PackageQualifiedName}
 
 import java.time.Instant
 import java.util.concurrent.atomic.AtomicReference
@@ -70,9 +70,15 @@ trait LedgerApiExtensions {
             readAs: Seq[PartyId] = Seq.empty,
             applicationId: String = LedgerApiCommands.defaultApplicationId,
             disclosedContracts: Seq[CommandsOuterClass.DisclosedContract] = Seq.empty,
+            packageIdResolverCustom: Option[PackageIdResolver] = None,
         ): JavaTransactionTree = {
           val cmds = commands.map(cmd =>
-            Await.result(packageIdResolver.resolvePackageId(cmd)(TraceContext.empty), 1.second)
+            Await.result(
+              packageIdResolverCustom
+                .getOrElse(packageIdResolver)
+                .resolvePackageId(cmd)(TraceContext.empty),
+              1.second,
+            )
           )
           val tx = ledgerApi.consoleEnvironment.run {
             ledgerApi.ledgerApiCommand(
@@ -107,6 +113,7 @@ trait LedgerApiExtensions {
             commandId: Option[String] = None,
             domainId: Option[DomainId] = None,
             disclosedContracts: Seq[CommandsOuterClass.DisclosedContract] = Seq.empty,
+            packageIdResolverCustom: Option[PackageIdResolver] = None,
         ): T = {
           val tree = submitJava(
             actAs,
@@ -117,6 +124,7 @@ trait LedgerApiExtensions {
             applicationId = userId,
             optTimeout = None,
             disclosedContracts = disclosedContracts,
+            packageIdResolverCustom = packageIdResolverCustom,
           )
           SpliceLedgerConnection.decodeExerciseResult(
             update,

apps/app/src/main/scala/org/lfdecentralizedtrust/splice/console/ScanAppReference.scala

@@ -43,7 +43,13 @@ import com.digitalasset.canton.console.{BaseInspection, ConsoleCommandResult, He
 import com.digitalasset.canton.data.CantonTimestamp
 import com.digitalasset.canton.topology.{DomainId, Member, ParticipantId, PartyId}
 import com.google.protobuf.ByteString
+import org.lfdecentralizedtrust.splice.codegen.java.splice.dsorules.{
+  DsoRules_CloseVoteRequestResult,
+  VoteRequest,
+}
+import org.lfdecentralizedtrust.splice.sv.admin.api.client.commands.HttpSvAdminAppClient
 
+import scala.jdk.OptionConverters.*
 import java.time.Instant
 
 /** Single scan app reference. Defines the console commands that can be run against a client or backend scan
@@ -475,6 +481,60 @@ abstract class ScanAppReference(
     }
   }
 
+  @Help.Summary("List vote requests")
+  def listVoteRequests(): Seq[Contract[VoteRequest.ContractId, VoteRequest]] = {
+    consoleEnvironment.run {
+      httpCommand(
+        HttpScanAppClient.ListVoteRequests
+      )
+    }
+  }
+
+  @Help.Summary("Get the latest vote request trackingCid")
+  def getLatestVoteRequestTrackingCid(): VoteRequest.ContractId = {
+    val latestVoteRequest = this
+      .listVoteRequests()
+      .headOption
+      .getOrElse(
+        throw new RuntimeException("No latest vote request found")
+      )
+    latestVoteRequest.payload.trackingCid.toScala.getOrElse(latestVoteRequest.contractId)
+  }
+
+  @Help.Summary("Lookup vote request")
+  def lookupVoteRequest(
+      trackingCid: VoteRequest.ContractId
+  ): Contract[VoteRequest.ContractId, VoteRequest] = {
+    consoleEnvironment.run {
+      httpCommand(
+        HttpSvAdminAppClient.LookupVoteRequest(trackingCid)()
+      )
+    }
+  }
+
+  @Help.Summary("List vote results")
+  def listVoteRequestResults(
+      actionName: Option[String],
+      accepted: Option[Boolean],
+      requester: Option[String],
+      effectiveFrom: Option[String],
+      effectiveTo: Option[String],
+      limit: BigInt,
+  ): Seq[DsoRules_CloseVoteRequestResult] = {
+    consoleEnvironment.run {
+      httpCommand(
+        HttpScanAppClient.ListVoteRequestResults(
+          actionName,
+          accepted,
+          requester,
+          effectiveFrom,
+          effectiveTo,
+          limit,
+        )
+      )
+    }
+  }
+
 }
 
 final class ScanAppBackendReference(

apps/app/src/main/scala/org/lfdecentralizedtrust/splice/console/SvAppReference.scala

@@ -171,6 +171,7 @@ abstract class SvAppReference(
       reasonUrl: String,
       reasonDescription: String,
       expiration: RelTime,
+      effectiveTime: Option[Instant],
   )(implicit tc: TraceContext): Unit = {
     consoleEnvironment.run {
       httpCommand(
@@ -180,6 +181,7 @@ abstract class SvAppReference(
           reasonUrl,
           reasonDescription,
           expiration,
+          effectiveTime,
         )
       )
     }

apps/app/src/test/scala/org/lfdecentralizedtrust/splice/integration/tests/AppUpgradeIntegrationTest.scala

@@ -240,6 +240,7 @@ class AppUpgradeIntegrationTest
             ),
             java.util.Optional.empty(),
           )
+          // TODO(#16139): adaptation to this test required
           val upgradeAction = new ARC_AmuletRules(
             new CRARC_AddFutureAmuletConfigSchedule(
               new AmuletRules_AddFutureAmuletConfigSchedule(
@@ -262,6 +263,7 @@ class AppUpgradeIntegrationTest
                     "url",
                     "description",
                     sv1Backend.getDsoInfo().dsoRules.payload.config.voteRequestTimeout,
+                    None,
                   )
                 },
               )("vote request has been created", _ => sv1Backend.listVoteRequests().loneElement)
@@ -325,6 +327,7 @@ class AppUpgradeIntegrationTest
                     "url",
                     "description",
                     sv1Backend.getDsoInfo().dsoRules.payload.config.voteRequestTimeout,
+                    None,
                   )
                 },
               )("vote request has been created", _ => sv1Backend.listVoteRequests().loneElement)

apps/app/src/test/scala/org/lfdecentralizedtrust/splice/integration/tests/AutomationControlIntegrationTest.scala

@@ -19,7 +19,6 @@ import com.digitalasset.canton.integration.BaseEnvironmentDefinition
 
 class AutomationControlIntegrationTest
     extends IntegrationTest
-    with ConfigScheduleUtil
     with WalletTestUtil
     with TimeTestUtil {
 

apps/app/src/test/scala/org/lfdecentralizedtrust/splice/integration/tests/BftScanConnectionIntegrationTest.scala

@@ -6,19 +6,15 @@ import org.lfdecentralizedtrust.splice.integration.tests.SpliceTests.{
   IntegrationTest,
   SpliceTestConsoleEnvironment,
 }
-import org.lfdecentralizedtrust.splice.util.{ConfigScheduleUtil, SvTestUtil, WalletTestUtil}
+import org.lfdecentralizedtrust.splice.util.{SvTestUtil, WalletTestUtil}
 import com.digitalasset.canton.integration.BaseEnvironmentDefinition
 import com.digitalasset.canton.logging.SuppressionRule
 import org.slf4j.event.Level
 
 import scala.jdk.CollectionConverters.*
 import scala.jdk.OptionConverters.*
 
-class BftScanConnectionIntegrationTest
-    extends IntegrationTest
-    with ConfigScheduleUtil
-    with WalletTestUtil
-    with SvTestUtil {
+class BftScanConnectionIntegrationTest extends IntegrationTest with WalletTestUtil with SvTestUtil {
 
   override def environmentDefinition
       : BaseEnvironmentDefinition[EnvironmentImpl, SpliceTestConsoleEnvironment] =
@@ -57,8 +53,10 @@ class BftScanConnectionIntegrationTest
       logs =>
         (logs
           .map(_.message)
-          .forall(
-            _.contains(s"Failed to connect to scan of ${getSvName(2)} (http://localhost:5112).")
+          .forall(msg =>
+            msg
+              .contains(s"Failed to connect to scan of ${getSvName(2)} (http://localhost:5112).") ||
+              msg.contains("Encountered 4 consecutive transient failures")
           ) should be(true)).withClue(s"Actual Logs: $logs"),
     )
 

apps/app/src/test/scala/org/lfdecentralizedtrust/splice/integration/tests/BootstrapPackageConfigIntegrationTest.scala

@@ -3,7 +3,13 @@
 
 package org.lfdecentralizedtrust.splice.integration.tests
 
+import com.digitalasset.canton.admin.participant.v30.DarDescription
+import com.digitalasset.canton.config.CantonRequireTypes.InstanceName
+import com.digitalasset.canton.crypto.Hash
+import com.digitalasset.canton.data.CantonTimestamp
+import com.digitalasset.canton.integration.BaseEnvironmentDefinition
 import com.digitalasset.daml.lf.data.Ref.{PackageName, PackageVersion}
+import com.google.protobuf.ByteString
 import org.lfdecentralizedtrust.splice.codegen.java.splice.amuletconfig.{
   AmuletConfig,
   PackageConfig,
@@ -30,16 +36,11 @@ import org.lfdecentralizedtrust.splice.integration.tests.SpliceTests.{
 import org.lfdecentralizedtrust.splice.sv.automation.singlesv.LocalSequencerConnectionsTrigger
 import org.lfdecentralizedtrust.splice.sv.config.SvOnboardingConfig.InitialPackageConfig
 import org.lfdecentralizedtrust.splice.util.{DarUtil, ProcessTestUtil, StandaloneCanton}
-import com.digitalasset.canton.admin.participant.v30.DarDescription
-import com.digitalasset.canton.config.CantonRequireTypes.InstanceName
-import com.digitalasset.canton.crypto.Hash
-import com.digitalasset.canton.data.CantonTimestamp
-import com.digitalasset.canton.integration.BaseEnvironmentDefinition
-import com.google.protobuf.ByteString
+import org.scalatest.time.{Minute, Span}
+
 import java.time.Instant
 import java.time.temporal.ChronoUnit
 import scala.jdk.CollectionConverters.*
-import org.scalatest.time.{Minute, Span}
 
 class BootstrapPackageConfigIntegrationTest
     extends IntegrationTest
@@ -210,6 +211,7 @@ class BootstrapPackageConfigIntegrationTest
                   "url",
                   "description",
                   sv1Backend.getDsoInfo().dsoRules.payload.config.voteRequestTimeout,
+                  None,
                 )
               },
             )("vote request has been created", _ => sv1Backend.listVoteRequests().loneElement)

apps/app/src/test/scala/org/lfdecentralizedtrust/splice/integration/tests/DecentralizedSynchronizerMigrationIntegrationTest.scala

@@ -675,7 +675,7 @@ class DecentralizedSynchronizerMigrationIntegrationTest
                 .plus(12, ChronoUnit.SECONDS)
               scheduleDomainMigration(
                 sv1Backend,
-                Seq(sv2Backend, sv3Backend, sv4Backend),
+                Seq(sv2Backend, sv3Backend),
                 Some(new SynchronizerUpgradeSchedule(scheduledTime, 1L)),
               )
             },
@@ -1043,6 +1043,7 @@ class DecentralizedSynchronizerMigrationIntegrationTest
                 "url",
                 "description",
                 sv1LocalBackend.getDsoInfo().dsoRules.payload.config.voteRequestTimeout,
+                None,
               ),
             )(
               "VoteRequest and Vote should be there",

apps/app/src/test/scala/org/lfdecentralizedtrust/splice/integration/tests/DsoElectionTimeBasedIntegrationTest.scala

@@ -1,15 +1,15 @@
 package org.lfdecentralizedtrust.splice.integration.tests
 
-import org.lfdecentralizedtrust.splice.codegen.java.splice.round.OpenMiningRound
+import com.digitalasset.canton.logging.SuppressionRule
+import com.digitalasset.canton.topology.DomainId
 import org.lfdecentralizedtrust.splice.codegen.java.splice
 import org.lfdecentralizedtrust.splice.codegen.java.splice.dsorules.DsoRules_OffboardSv
 import org.lfdecentralizedtrust.splice.codegen.java.splice.dsorules.actionrequiringconfirmation.ARC_DsoRules
 import org.lfdecentralizedtrust.splice.codegen.java.splice.dsorules.dsorules_actionrequiringconfirmation.SRARC_OffboardSv
+import org.lfdecentralizedtrust.splice.codegen.java.splice.round.OpenMiningRound
 import org.lfdecentralizedtrust.splice.integration.tests.SpliceTests.BracketSynchronous.bracket
-import org.lfdecentralizedtrust.splice.sv.automation.delegatebased.CloseVoteRequestWithEarlyClosingTrigger
+import org.lfdecentralizedtrust.splice.sv.automation.delegatebased.CloseVoteRequestTrigger
 import org.lfdecentralizedtrust.splice.sv.util.SvUtil
-import com.digitalasset.canton.logging.SuppressionRule
-import com.digitalasset.canton.topology.DomainId
 import org.slf4j.event.Level
 
 import java.time.Duration as JavaDuration
@@ -89,10 +89,11 @@ class DsoElectionTimeBasedIntegrationTest
               "url",
               "remove current delegate",
               sv1Backend.getDsoInfo().dsoRules.payload.config.voteRequestTimeout,
+              None,
             )
           },
         )("vote request has been created", _ => sv1Backend.listVoteRequests().loneElement)
-        Seq(sv2Backend, sv3Backend, sv4Backend)
+        Seq(sv2Backend, sv3Backend)
           .filter(
             // current delegate not voting
             _.getDsoInfo().svParty.toProtoPrimitive != currentLeader
@@ -112,7 +113,7 @@ class DsoElectionTimeBasedIntegrationTest
         clue("Leader has changed") {
           loggerFactory.assertEventuallyLogsSeq(SuppressionRule.LevelAndAbove(Level.INFO))(
             leaderBackend.dsoDelegateBasedAutomation
-              .trigger[CloseVoteRequestWithEarlyClosingTrigger]
+              .trigger[CloseVoteRequestTrigger]
               .resume(),
             entries => {
               forExactly(4, entries) { line =>