Update Splice from CCI (#419)

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

Author: canton-network-da

.github/workflows/cluster_tests.yml

@@ -9,6 +9,9 @@ on:
       sha:
         type: string
         required: true
+      splice_url:
+        type: string
+        required: false
 
     outputs:
       result:
@@ -39,5 +42,5 @@ jobs:
         run: |
           set -euo pipefail
           result=$(curl -sSfL -H "Authorization: Bearer ${{ steps.auth.outputs.id_token }}" \
-            "${{ secrets.CLUSTER_TEST_INVOKER_URL }}?workflow=${{ inputs.workflow }}&splice-git-ref=${{ inputs.sha }}")
+            "${{ secrets.CLUSTER_TEST_INVOKER_URL }}?workflow=${{ inputs.workflow }}&splice-git-ref=${{ inputs.sha }}&splice-url=${{ inputs.splice_url }}")
           echo "result=$result" >> "$GITHUB_OUTPUT"

.github/workflows/post_merge.yml

@@ -10,50 +10,60 @@ permissions:
 
 jobs:
 
-  get_sha:
+  get_head:
     runs-on: self-hosted-docker-tiny
     outputs:
-      sha: ${{ steps.comment-branch.outputs.head_sha }}
+      sha: ${{ steps.get_head.outputs.sha }}
+      repo: ${{ steps.get_head.outputs.repo }}
     steps:
-      - name: Get PR branch
-        uses: xt0rted/pull-request-comment-branch@e8b8daa837e8ea7331c0003c9c316a64c6d8b0b1 # v3.0.0
-        id: comment-branch
+      - name: Get head SHA & repo
+        id: get_head
+        run: |
+          set -euo pipefail
+          query='query pullRequestDetails { repository(name: \"${{ github.event.repository.name }}\", owner: \"${{ github.repository_owner }}\") { pullRequest(number: ${{ github.event.issue.number }}) { headRef { target { oid } } headRepository { sshUrl } } } }'
+          result=$(curl -H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" -X POST -d " { \"query\": \"$query\" } " https://api.github.com/graphql)
+          sha=$(echo "$result" | jq -r '.data.repository.pullRequest.headRef.target.oid')
+          repo=$(echo "$result" | jq -r '.data.repository.pullRequest.headRepository.sshUrl')
+          echo "sha=$sha" >> "$GITHUB_OUTPUT"
+          echo "repo=$repo" >> "$GITHUB_OUTPUT"
 
   trigger_cluster_test_basic:
     if: github.event.issue.pull_request && contains(github.event.comment.body, '/cluster_test')
-    needs: get_sha
+    needs: get_head
     uses: ./.github/workflows/cluster_tests.yml
     secrets: inherit
     with:
       workflow: cluster_test
-      sha: ${{ needs.get_sha.outputs.sha }}
+      sha: ${{ needs.get_head.outputs.sha }}
+      splice_url: ${{ needs.get_head.outputs.repo }}
 
   result:
     runs-on: self-hosted-docker-tiny
     needs:
       - trigger_cluster_test_basic
-      - get_sha
+      - get_head
     steps:
       - run: |
           number=$(echo '${{ needs.trigger_cluster_test_basic.outputs.result }}' | jq -r '.number')
-          echo "Deploy scratchnet pipeline triggered for [PR as of ${{ needs.get_sha.outputs.sha }}](https://github.com/${{ github.repository }}/pull/${{ github.event.issue.number }}/files/${{ needs.get_sha.outputs.sha }}), please approve it in CircleCI: https://app.circleci.com/pipelines/github/DACH-NY/canton-network-internal/${number}"
+          echo "Deploy scratchnet pipeline triggered for [Commit ${{ needs.get_head.outputs.sha }} in ${{ needs.get_head.outputs.repo }}](https://github.com/${{ github.repository }}/pull/${{ github.event.issue.number }}/files/${{ needs.get_head.outputs.sha }}), please approve it in CircleCI: https://app.circleci.com/pipelines/github/DACH-NY/canton-network-internal/${number}"
 
 
   trigger_cluster_test_hdm:
     if: github.event.issue.pull_request && contains(github.event.comment.body, '/hdm_test')
-    needs: get_sha
+    needs: get_head
     uses: ./.github/workflows/cluster_tests.yml
     secrets: inherit
     with:
       workflow: hdm_test
-      sha: ${{ needs.get_sha.outputs.sha }}
+      sha: ${{ needs.get_head.outputs.sha }}
+      splice_url: ${{ needs.get_head.outputs.repo }}
 
   result_hdm:
     runs-on: self-hosted-docker-tiny
     needs:
       - trigger_cluster_test_hdm
-      - get_sha
+      - get_head
     steps:
       - run: |
           number=$(echo '${{ needs.trigger_cluster_test_hdm.outputs.result }}' | jq -r '.number')
-          echo "Deploy scratchnet HDM pipeline triggered for [PR as of ${{ needs.get_sha.outputs.sha }}](https://github.com/${{ github.repository }}/pull/${{ github.event.issue.number }}/files/${{ needs.get_sha.outputs.sha }}), please approve it in CircleCI: https://app.circleci.com/pipelines/github/DACH-NY/canton-network-internal/${number}"
+          echo "Deploy scratchnet HDM pipeline triggered for [Commit ${{ needs.get_head.outputs.sha }} in ${{ needs.get_head.outputs.repo }}](https://github.com/${{ github.repository }}/pull/${{ github.event.issue.number }}/files/${{ needs.get_head.outputs.sha }}), please approve it in CircleCI: https://app.circleci.com/pipelines/github/DACH-NY/canton-network-internal/${number}"

.github/workflows/pr_cluster_test.yml

@@ -1 +1 @@
-0.3.21
+0.4.0

LATEST_RELEASE

@@ -1 +1 @@
-0.4.0
+0.4.1

VERSION

@@ -28,6 +28,7 @@ import com.digitalasset.canton.topology.admin.grpc.TopologyStoreId.Authorized
 import com.digitalasset.canton.topology.store.TimeQuery.HeadState
 import monocle.macros.syntax.lens.*
 import org.lfdecentralizedtrust.splice.console.ParticipantClientReference
+import com.digitalasset.canton.config.NonNegativeFiniteDuration
 
 import scala.jdk.CollectionConverters.*
 import java.time.Instant
@@ -75,6 +76,14 @@ class AppUpgradeIntegrationTest
         // Makes the test a bit faster and easier to debug. See #11488
         ConfigTransforms.useDecentralizedSynchronizerSplitwell()(config)
       )
+      .addConfigTransform((_, conf) =>
+        ConfigTransforms.updateAllValidatorAppConfigs_(c =>
+          // Reduce the cache TTL so package upgrades are picked up quickly.
+          c.copy(scanClient =
+            c.scanClient.setAmuletRulesCacheTimeToLive(NonNegativeFiniteDuration.ofSeconds(1))
+          )
+        )(conf)
+      )
       .addConfigTransform((_, config) => {
         config
           .focus(_.validatorApps)
@@ -362,7 +371,7 @@ class AppUpgradeIntegrationTest
 
           actAndCheck(
             "Bob taps after upgrade",
-            eventually() {
+            eventuallySucceeds() {
               bobWalletClient.tap(20)
             },
           )(

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

@@ -7,8 +7,7 @@ import org.lfdecentralizedtrust.splice.integration.EnvironmentDefinition
 import org.lfdecentralizedtrust.splice.integration.tests.SpliceTests.IntegrationTest
 import org.lfdecentralizedtrust.splice.scan.config.BftSequencerConfig
 
-// TODO(#19679) consider renaming to BftManualStartIntegrationTest
-class BFTManualStartIntegrationTest extends IntegrationTest {
+class BftManualStartIntegrationTest extends IntegrationTest {
 
   override def environmentDefinition: SpliceEnvironmentDefinition = {
     EnvironmentDefinition

…ests/BFTManualStartIntegrationTest.scala …ests/BftManualStartIntegrationTest.scalaapps/app/src/test/scala/org/lfdecentralizedtrust/splice/integration/tests/BFTManualStartIntegrationTest.scala renamed to apps/app/src/test/scala/org/lfdecentralizedtrust/splice/integration/tests/BftManualStartIntegrationTest.scala apps/app/src/test/scala/org/lfdecentralizedtrust/splice/integration/tests/BFTManualStartIntegrationTest.scala renamed to apps/app/src/test/scala/org/lfdecentralizedtrust/splice/integration/tests/BftManualStartIntegrationTest.scala

@@ -372,8 +372,7 @@ class SvFrontendIntegrationTest
 
           val (_, (createdVoteRequestAction, createdVoteRequestRequester)) = actAndCheck(
             "sv1 operator can create a new vote request", {
-              val dropDownAction = new Select(webDriver.findElement(By.id("display-actions")))
-              dropDownAction.selectByValue(action)
+              changeAction(action)
 
               fillUpForm(webDriver)
 
@@ -672,8 +671,7 @@ class SvFrontendIntegrationTest
 
           actAndCheck(
             "sv1 operator can create a new vote request", {
-              val dropDownAction = new Select(webDriver.findElement(By.id("display-actions")))
-              dropDownAction.selectByValue("SRARC_GrantFeaturedAppRight")
+              changeAction("SRARC_GrantFeaturedAppRight")
 
               inside(find(id("set-application-provider"))) { case Some(element) =>
                 element.underlying.sendKeys(requestProviderParty)
@@ -728,8 +726,7 @@ class SvFrontendIntegrationTest
             "sv1 operator can create a new vote request to revoke the featured app right", {
               go to s"http://localhost:$sv1UIPort/votes"
 
-              val dropDownAction = new Select(webDriver.findElement(By.id("display-actions")))
-              dropDownAction.selectByValue("SRARC_RevokeFeaturedAppRight")
+              changeAction("SRARC_RevokeFeaturedAppRight")
 
               inside(find(id("set-application-rightcid"))) { case Some(element) =>
                 element.underlying.sendKeys(rightCid)
@@ -775,9 +772,7 @@ class SvFrontendIntegrationTest
             // The `eventually` guards against `StaleElementReferenceException`s
             // eventually() must contain clickVoteRequestSubmitButtonOnceEnabled() to retry the whole process
             eventually() {
-              find(id("display-actions")) should not be empty
-              val dropDownAction = new Select(webDriver.findElement(By.id("display-actions")))
-              dropDownAction.selectByValue("SRARC_SetConfig")
+              changeAction("SRARC_SetConfig")
 
               inside(find(id("checkbox-set-effective-at-threshold"))) { case Some(element) =>
                 element.underlying.click()
@@ -1127,6 +1122,17 @@ class SvFrontendIntegrationTest
     }
   }
 
+  def changeAction(actionName: String)(implicit webDriver: WebDriverType) = {
+    find(id("display-actions")) should not be empty
+    val dropDownAction = new Select(webDriver.findElement(By.id("display-actions")))
+    dropDownAction.selectByValue(actionName)
+
+    if (actionName != "SRARC_OffboardSv") {
+      val proceedButton = webDriver.findElement(By.id("action-change-dialog-proceed"))
+      proceedButton.click()
+    }
+  }
+
   def getVoteRequestsInProgressSize()(implicit webDriver: WebDriverType) = {
     val tbodyInProgress = find(id("sv-voting-in-progress-table-body"))
     tbodyInProgress

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

@@ -211,7 +211,7 @@ abstract class ValidatorPreflightIntegrationTestBase
               // we can't test a specific amulet price as the amulet price on a live network can change
               val rateR =
                 raw"""^\s*(\d+(?:\.\d+)?)\s*${amuletNameAcronym}/USD\s*$$""".r
-              inside(transaction.rate) { case rateR(rate) =>
+              inside(transaction.rate.value) { case rateR(rate) =>
                 BigDecimal(rate) should be > BigDecimal(0)
                 transaction.usdAmount should beWithin(
                   transaction.ccAmount / BigDecimal(rate) - smallAmount,

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

@@ -135,7 +135,7 @@ trait WalletFrontendTestUtil extends WalletTestUtil { self: FrontendTestCommon =
           .text,
         unit = "USD",
       ),
-      rate = transactionRow.childElement(className("tx-amount-rate")).text,
+      rate = transactionRow.findChildElement(className("tx-amount-rate")).map(_.text),
       appRewardsUsed = parseAmountText(
         transactionRow
           .childElement(className("tx-row-cell-rewards"))
@@ -207,9 +207,15 @@ trait WalletFrontendTestUtil extends WalletTestUtil { self: FrontendTestCommon =
       expectedAmountUSD._1,
       expectedAmountUSD._2,
     )
-    transaction.rate should matchText(
-      s"${BigDecimal(1) / amuletPrice} ${spliceInstanceNames.amuletNameAcronym}/USD"
-    )
+
+    transaction.rate match {
+      case Some(rate) =>
+        rate should matchText(
+          s"${BigDecimal(1) / amuletPrice} ${spliceInstanceNames.amuletNameAcronym}/USD"
+        )
+      // Rate text should be missing iff the price is zero
+      case None => amuletPrice shouldBe BigDecimal(0)
+    }
   }
 
   protected def createTransferOffer(
@@ -314,7 +320,7 @@ object WalletFrontendTestUtil {
       partyDescription: Option[String],
       ccAmount: BigDecimal,
       usdAmount: BigDecimal,
-      rate: String,
+      rate: Option[String],
       appRewardsUsed: BigDecimal,
       validatorRewardsUsed: BigDecimal,
       svRewardsUsed: BigDecimal,