Update Splice from CCI (#223)

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

Author: canton-network-da

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

@@ -166,9 +166,11 @@ class ExternalPartySetupProposalIntegrationTest
       .getExternalPartyBalance(aliceParty)
       .totalUnlockedCoin shouldBe "0.0000000000"
     aliceValidatorWalletClient.transferPreapprovalSend(aliceParty, 2000.0, UUID.randomUUID.toString)
-    aliceValidatorBackend
-      .getExternalPartyBalance(aliceParty)
-      .totalUnlockedCoin shouldBe "2000.0000000000"
+    eventually() {
+      aliceValidatorBackend
+        .getExternalPartyBalance(aliceParty)
+        .totalUnlockedCoin shouldBe "2000.0000000000"
+    }
 
     // Onboard and Create/Accept ExternalPartySetupProposal for Bob
     val onboardingBob @ OnboardingResult(bobParty, _, _) =

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

@@ -190,6 +190,11 @@ class ManualStartIntegrationTest
           startAllSync(allCnApps*)
         }
 
+        // Wait for automation to start and the user to be reported as onboarded
+        clue("Alice is reported as onboarded") {
+          waitForWalletUser(aliceWalletClient)
+        }
+
         actAndCheck(
           "Alice taps some coin again",
           aliceWalletClient.tap(200),

apps/common/src/main/openapi/common-internal.yaml

@@ -193,6 +193,7 @@ components:
         - vote_request_contract_ids
       properties:
         vote_request_contract_ids:
+          description: Contract IDs of Daml template `Splice.DsoRules:VoteRequest`.
           type: array
           items:
             type: string
@@ -203,11 +204,15 @@ components:
         - vote_requests
       properties:
         vote_requests:
+          description: |
+            Contracts of Daml template `Splice.DsoRules:VoteRequest` that match
+            `vote_request_contract_ids` in the request.
           type: array
           items:
             $ref: "./common-external.yaml#/components/schemas/Contract"
 
     LookupDsoRulesVoteRequestResponse:
+      description: A contract of Daml template `Splice.DsoRules:VoteRequest`.
       type: object
       required:
         - dso_rules_vote_request
@@ -216,6 +221,7 @@ components:
           $ref: "./common-external.yaml#/components/schemas/Contract"
 
     ListDsoRulesVoteRequestsResponse:
+      description: Contracts of Daml template `Splice.DsoRules:VoteRequest`.
       type: object
       required:
         - dso_rules_vote_requests
@@ -259,6 +265,7 @@ components:
         - validator_licenses
       properties:
         validator_licenses:
+          description: Contracts of Daml template `Splice.ValidatorLicense:ValidatorLicense`.
           type: array
           items:
             $ref: "../../../../common/src/main/openapi/common-external.yaml#/components/schemas/Contract"

apps/common/src/main/scala/org/lfdecentralizedtrust/splice/environment/MediatorAdminConnection.scala

@@ -32,7 +32,7 @@ class MediatorAdminConnection(
     loggerFactory: NamedLoggerFactory,
     grpcClientMetrics: GrpcClientMetrics,
     retryProvider: RetryProvider,
-)(implicit ec: ExecutionContextExecutor, tracer: Tracer)
+)(implicit protected val ec: ExecutionContextExecutor, tracer: Tracer)
     extends TopologyAdminConnection(
       config,
       apiLoggingConfig,
@@ -60,7 +60,8 @@ class MediatorAdminConnection(
       MediatorAdministrationCommands.Initialize(
         domainId,
         SequencerConnections.single(sequencerConnection),
-        SequencerConnectionValidation.All,
+        // TODO(#10985) Consider enabling this.
+        SequencerConnectionValidation.Disabled,
       )
     )
 

apps/common/src/main/scala/org/lfdecentralizedtrust/splice/environment/ParticipantAdminConnection.scala

@@ -75,7 +75,7 @@ class ParticipantAdminConnection(
     loggerFactory: NamedLoggerFactory,
     grpcClientMetrics: GrpcClientMetrics,
     retryProvider: RetryProvider,
-)(implicit ec: ExecutionContextExecutor, tracer: Tracer)
+)(implicit protected val ec: ExecutionContextExecutor, tracer: Tracer)
     extends TopologyAdminConnection(
       config,
       apiLoggingConfig,
@@ -171,7 +171,8 @@ class ParticipantAdminConnection(
       ParticipantAdminCommands.DomainConnectivity.RegisterDomain(
         config,
         handshakeOnly,
-        SequencerConnectionValidation.All,
+        // TODO(#10985) Consider enabling this
+        SequencerConnectionValidation.Disabled,
       )
     )
 
@@ -364,30 +365,37 @@ class ParticipantAdminConnection(
     runCmd(
       ParticipantAdminCommands.DomainConnectivity.ModifyDomainConnection(
         config,
-        SequencerConnectionValidation.All,
+        // TODO(#10985) Consider enabling this
+        SequencerConnectionValidation.Disabled,
       )
     )
 
   def modifyDomainConnectionConfig(
       domain: DomainAlias,
       f: DomainConnectionConfig => Option[DomainConnectionConfig],
-  )(implicit traceContext: TraceContext): Future[Boolean] =
-    for {
-      oldConfig <- getDomainConnectionConfig(domain)
-      newConfig = f(oldConfig)
-      configModified <- newConfig match {
-        case None =>
-          logger.trace("No update to domain connection config required")
-          Future.successful(false)
-        case Some(config) =>
-          logger.info(
-            s"Updating to new domain connection config for domain $domain. Old config: $oldConfig, new config: $config"
-          )
-          for {
-            _ <- setDomainConnectionConfig(config)
-          } yield true
-      }
-    } yield configModified
+  )(implicit traceContext: TraceContext): Future[Boolean] = {
+    retryProvider.retryForClientCalls(
+      "modify_domain_connection",
+      "Set the new domain connection if required",
+      for {
+        oldConfig <- getDomainConnectionConfig(domain)
+        newConfig = f(oldConfig)
+        configModified <- newConfig match {
+          case None =>
+            logger.trace("No update to domain connection config required")
+            Future.successful(false)
+          case Some(config) =>
+            logger.info(
+              s"Updating to new domain connection config for domain $domain. Old config: $oldConfig, new config: $config"
+            )
+            for {
+              _ <- setDomainConnectionConfig(config)
+            } yield true
+        }
+      } yield configModified,
+      logger,
+    )
+  }
 
   private def modifyOrRegisterDomainConnectionConfig(
       config: DomainConnectionConfig,

apps/common/src/main/scala/org/lfdecentralizedtrust/splice/environment/SequencerAdminConnection.scala

@@ -45,7 +45,7 @@ class SequencerAdminConnection(
     loggerFactory: NamedLoggerFactory,
     grpcClientMetrics: GrpcClientMetrics,
     retryProvider: RetryProvider,
-)(implicit ec: ExecutionContextExecutor, tracer: Tracer)
+)(implicit protected val ec: ExecutionContextExecutor, tracer: Tracer)
     extends TopologyAdminConnection(
       config,
       apiLoggingConfig,

apps/common/src/main/scala/org/lfdecentralizedtrust/splice/environment/StatusAdminConnection.scala

@@ -7,16 +7,22 @@ import com.digitalasset.canton.admin.api.client.commands.GrpcAdminCommand
 import com.digitalasset.canton.admin.api.client.data.NodeStatus
 import com.digitalasset.canton.tracing.TraceContext
 
-import scala.concurrent.Future
+import scala.concurrent.{ExecutionContextExecutor, Future}
 
 trait StatusAdminConnection {
-  this: AppConnection =>
-
+  this: AppConnection & RetryProvider.Has =>
+  protected implicit val ec: ExecutionContextExecutor
   protected type Status <: NodeStatus.Status
   protected def getStatusRequest: GrpcAdminCommand[_, _, NodeStatus[Status]]
 
-  def getStatus(implicit traceContext: TraceContext): Future[NodeStatus[Status]] = runCmd(
-    getStatusRequest
-  )
+  def getStatus(implicit traceContext: TraceContext): Future[NodeStatus[Status]] =
+    retryProvider.retryForClientCalls(
+      "status",
+      "Get node status",
+      runCmd(
+        getStatusRequest
+      ),
+      logger,
+    )
 
 }