Merge pull request #2491 from hyperledger-labs/oriol/mergemainto34

Merge main into canton-3.4

Author: OriolMunoz-da

.envrc

@@ -18,12 +18,12 @@ use_flake_subdir() {
 [[ -f .envrc.private ]] && [[ -z "$IGNORE_PRIVATE_ENVRC" ]] && source_env .envrc.private || true
 
 # TODO(DACH-NY/canton-network-node#3876) work around for $TMPDIR is removed. #3876 to investigate more
-OLD_TMPDIR=$TMPDIR
+OLD_TMPDIR=${TMPDIR-unset}
 
 use flake_subdir
 
 # TODO(DACH-NY/canton-network-node#3876) work around for $TMPDIR is removed. #3876 to investigate more
-export TMPDIR=$OLD_TMPDIR
+[ $OLD_TMPDIR != "unset" ] && export TMPDIR=$OLD_TMPDIR
 
 source_env .envrc.vars
 

.github/actions/scripts/notification-scripts/failure_github_issue.py

@@ -25,10 +25,12 @@ def get_msg(self) -> tuple[str, str]:
     repo = Repo(search_parent_directories=True)
     commit_msg = repo.head.commit.summary
     commit_sha_short = GIT_SHA[:7]
+    job_descriptor = (f"{self.args.job_subname} in " if self.args.job_subname else '') + self.args.job_name
 
-    title = f"GHA Run {self.args.gha_run_id} : job {self.args.job_name} Failed :fire:"
+    title = f"GHA Run {self.args.gha_run_id} : job {job_descriptor} Failed :fire:"
     body = f"""
 [GitHub Actions Run]({job_url}).
+Job: {job_descriptor}
 Branch: [{self.args.branch}]({branch_url})
 Workflow: {self.args.gha_workflow_name}
 Commit: [{commit_sha_short}]({github_url}) {commit_msg}

.github/actions/scripts/notification-scripts/failure_notification_args.py

@@ -13,6 +13,7 @@ class FailureArgs:
   dry_run: bool
   branch: str
   github_token: str
+  job_subname: str
   # cci specific
   pipeline_id: str = ""
   workflow_id: str = ""
@@ -37,6 +38,7 @@ def parse_args() -> FailureArgs:
     parser.add_argument('--gha_run_id', default=os.environ.get('GITHUB_RUN_ID'))
     parser.add_argument('--gha_workflow_name', default=os.environ.get('GITHUB_WORKFLOW'))
     parser.add_argument('--job_name', default=os.environ.get('GITHUB_JOB'))
+    parser.add_argument('--job_subname', default='')
     parser.add_argument('--branch', default=os.environ.get('GITHUB_HEAD_REF') or os.environ.get('GITHUB_REF'))
   else:
     parser.add_argument('--pipeline_id', default=os.environ.get('CIRCLE_PIPELINE_ID'))

.github/actions/tests/failure_notifications/action.yml

@@ -4,6 +4,10 @@ description: Notify failures on Slack and create GitHub issues
 # Note that this requires the `id-token` write permission to be set in the workflow
 
 inputs:
+  job_subname:
+    description: "A more specific name for the job to report"
+    required: false
+    default: ""
   workload_identity_provider:
     description: "Workload identity provider"
     required: true
@@ -38,4 +42,4 @@ runs:
         FAILURE_NOTIFICATIONS_URL: ${{ inputs.notifications_url }}
         NOTIFICATION_SLACK_CHANNEL: ${{ inputs.slack_channel }}
       shell: bash
-      run: ./.github/actions/scripts/notification-scripts/failure_notification.py
+      run: ./.github/actions/scripts/notification-scripts/failure_notification.py --job_subname "${{ inputs.job_subname }}"

.github/actions/tests/scala_test/action.yml

@@ -302,6 +302,7 @@ runs:
       if: failure() && (github.event_name == 'push' || github.event_name == 'schedule')
       uses: ./.github/actions/tests/failure_notifications
       with:
+        job_subname: "${{ inputs.test_suite_name }} (${{ inputs.runner_index }})"
         workload_identity_provider: "${{ inputs.google_workload_identity_provider }}"
         service_account: "${{ inputs.failure_notifications_invoker_sa }}"
         notifications_url: "${{ inputs.failure_notifications_invoker_url }}"

.github/workflows/build.yml

@@ -238,7 +238,7 @@ jobs:
       runs_on: self-hosted-docker-large
       test_names_file: 'test-full-class-names-local-net-based.log'
       parallelism: 1
-      test_name: docker-compose
+      test_name: local-net
       with_canton: false
       start_canton_options: ""
       commit_sha: ${{ inputs.commit_sha }}

LATEST_RELEASE

@@ -1 +1 @@
-0.4.17
+0.4.18

apps/app/src/main/scala/org/lfdecentralizedtrust/splice/config/SpliceConfig.scala

@@ -571,6 +571,10 @@ object SpliceConfig {
       deriveReader[BeneficiaryConfig]
     implicit val svParticipantClientConfigReader: ConfigReader[SvParticipantClientConfig] =
       deriveReader[SvParticipantClientConfig]
+    implicit val amuletConversionRateFeedConfig: ConfigReader[AmuletConversionRateFeedConfig] =
+      deriveReader[AmuletConversionRateFeedConfig]
+    implicit val rangeConfig: ConfigReader[RangeConfig] =
+      deriveReader[RangeConfig]
     implicit val svConfigReader: ConfigReader[SvAppBackendConfig] =
       deriveReader[SvAppBackendConfig].emap { conf =>
         def checkFoundDsoConfig(check: (SvAppBackendConfig, FoundDso) => Boolean) =
@@ -971,6 +975,10 @@ object SpliceConfig {
       deriveWriter[BeneficiaryConfig]
     implicit val svParticipantClientConfigWriter: ConfigWriter[SvParticipantClientConfig] =
       deriveWriter[SvParticipantClientConfig]
+    implicit val amuletConversionRateFeedConfig: ConfigWriter[AmuletConversionRateFeedConfig] =
+      deriveWriter[AmuletConversionRateFeedConfig]
+    implicit val rangeConfig: ConfigWriter[RangeConfig] =
+      deriveWriter[RangeConfig]
     implicit val svConfigWriter: ConfigWriter[SvAppBackendConfig] =
       deriveWriter[SvAppBackendConfig]
 

apps/app/src/test/resources/frontend-config.jsonnet

@@ -43,7 +43,7 @@ local validatorNodes(clusterProtocol, clusterAddress, port) = {
     validator: { url: 'http://localhost:5503/api/validator' },
     wallet: { uiUrl: 'http://localhost:3000' },
     splitwell: { url: 'http://localhost:5113/api/splitwell' },
-    scan: { url: 'http://localhost:5012/api/scan' },
+    scan: { url: 'http://localhost:5012' },
   },
   bob: {
     jsonApiBackend: { url: 'http://127.0.0.1:6601' },
@@ -52,14 +52,14 @@ local validatorNodes(clusterProtocol, clusterAddress, port) = {
     validator: { url: 'http://localhost:5603/api/validator' },
     wallet: { uiUrl: 'http://localhost:3001' },
     splitwell: { url: 'http://localhost:5113/api/splitwell' },
-    scan: { url: 'http://localhost:5012/api/scan' },
+    scan: { url: 'http://localhost:5012' },
   },
   splitwell: {
     validator: { url: 'http://localhost:5703/api/validator' },
     wallet: { uiUrl: 'http://unused.com' },
     jsonApi: { url: 'http://unused.com/' },
     splitwell: { url: 'http://localhost:5113/api/splitwell' },
-    scan: { url: 'http://localhost:5012/api/scan' },
+    scan: { url: 'http://localhost:5012' },
   },
   preflight: {
     jsonApiBackend: { url: 'http://127.0.0.1:7575' },
@@ -68,30 +68,30 @@ local validatorNodes(clusterProtocol, clusterAddress, port) = {
     validator: { url: 'http://localhost:5003/api/validator' },
     wallet: { uiUrl: 'http://localhost:3000' },
     splitwell: { url: 'http://localhost:5113/api/splitwell' },
-    scan: { url: clusterProtocol + '://' + 'scan.sv-2.' + clusterAddress + '/api/scan' },
+    scan: { url: clusterProtocol + '://' + 'scan.sv-2.' + clusterAddress + '' },
   },
   scan: {
-    scan: { url: 'http://localhost:5012/api/scan' },
+    scan: { url: 'http://localhost:5012' },
   },
   sv1: {
     sv: { url: 'http://localhost:5114/api/sv' },
     validator: { url: 'http://localhost:5103/api/validator' },
-    scan: { url: 'http://localhost:5012/api/scan' },
+    scan: { url: 'http://localhost:5012' },
   },
   sv2: {
     sv: { url: 'http://localhost:5214/api/sv' },
     validator: { url: 'http://localhost:5103/api/validator' },
-    scan: { url: 'http://localhost:5012/api/scan' },
+    scan: { url: 'http://localhost:5012' },
   },
   sv3: {
     sv: { url: 'http://localhost:5314/api/sv' },
     validator: { url: 'http://localhost:5103/api/validator' },
-    scan: { url: 'http://localhost:5012/api/scan' },
+    scan: { url: 'http://localhost:5012' },
   },
   sv4: {
     sv: { url: 'http://localhost:5414/api/sv' },
     validator: { url: 'http://localhost:5103/api/validator' },
-    scan: { url: 'http://localhost:5012/api/scan' },
+    scan: { url: 'http://localhost:5012' },
   },
 };
 

apps/app/src/test/scala/org/lfdecentralizedtrust/splice/integration/plugins/EventHistorySanityCheckPlugin.scala

@@ -0,0 +1,94 @@
+package org.lfdecentralizedtrust.splice.integration.plugins
+
+import cats.data.Chain
+import org.lfdecentralizedtrust.splice.console.ScanAppBackendReference
+import org.lfdecentralizedtrust.splice.environment.SpliceEnvironment
+import org.lfdecentralizedtrust.splice.http.v0.definitions.DamlValueEncoding.members.CompactJson
+import org.lfdecentralizedtrust.splice.http.v0.definitions.EventHistoryItem
+import org.lfdecentralizedtrust.splice.http.v0.definitions.UpdateHistoryItemV2.members
+import org.lfdecentralizedtrust.splice.http.v0.definitions.UpdateHistoryReassignment.Event.members as reassignmentMembers
+import org.lfdecentralizedtrust.splice.integration.tests.SpliceTests.SpliceTestConsoleEnvironment
+import com.digitalasset.canton.ScalaFuturesWithPatience
+import com.digitalasset.canton.integration.EnvironmentSetupPlugin
+import com.digitalasset.canton.logging.NamedLoggerFactory
+import org.lfdecentralizedtrust.splice.config.SpliceConfig
+import org.scalatest.{Inspectors, LoneElement}
+import org.scalatest.concurrent.Eventually
+import org.scalatest.matchers.should.Matchers
+
+import scala.annotation.tailrec
+
+class EventHistorySanityCheckPlugin(
+    protected val loggerFactory: NamedLoggerFactory
+) extends EnvironmentSetupPlugin[SpliceConfig, SpliceEnvironment]
+    with Matchers
+    with Eventually
+    with Inspectors
+    with ScalaFuturesWithPatience
+    with LoneElement {
+
+  override def beforeEnvironmentDestroyed(
+      config: SpliceConfig,
+      environment: SpliceTestConsoleEnvironment,
+  ): Unit = {
+    val initializedScans = environment.scans.local.filter(_.is_initialized)
+    if (initializedScans.nonEmpty) {
+      compareEventHistories(initializedScans)
+    }
+  }
+
+  @tailrec
+  private def paginateEventHistory(
+      scan: ScanAppBackendReference,
+      after: Option[(Long, String)],
+      acc: Chain[EventHistoryItem],
+  ): Chain[EventHistoryItem] = {
+    val result = scan.getEventHistory(10, after, encoding = CompactJson)
+    val newAcc = acc ++ Chain.fromSeq(result)
+    if (result.isEmpty) newAcc
+    else {
+      result.lastOption.flatMap(eventCursor) match {
+        case Some(nextAfter) =>
+          paginateEventHistory(scan, Some(nextAfter), newAcc)
+        case None => newAcc
+      }
+    }
+  }
+
+  private def compareEventHistories(
+      scans: Seq[ScanAppBackendReference]
+  ): Unit = {
+    val (founders, others) = scans.partition(_.config.isFirstSv)
+    val founder = founders.loneElement
+    val founderHistory = paginateEventHistory(founder, None, Chain.empty).toVector
+    forAll(others) { otherScan =>
+      val otherScanHistory = paginateEventHistory(otherScan, None, Chain.empty).toVector
+      val minSize = Math.min(founderHistory.size, otherScanHistory.size)
+      val otherComparable = otherScanHistory.take(minSize)
+      val founderComparable = founderHistory.take(minSize)
+      val different = otherComparable
+        .zip(founderComparable)
+        .collect {
+          case (otherItem, founderItem) if founderItem != otherItem =>
+            otherItem -> founderItem
+        }
+
+      different should be(empty)
+    }
+  }
+
+  private def eventCursor(item: EventHistoryItem): Option[(Long, String)] = {
+    val updateCursor = item.update.flatMap {
+      case members.UpdateHistoryTransactionV2(tx) =>
+        Some((tx.migrationId, tx.recordTime))
+      case members.UpdateHistoryReassignment(reassignment) =>
+        reassignment.event match {
+          case reassignmentMembers.UpdateHistoryAssignment(event) =>
+            Some((event.migrationId, reassignment.recordTime))
+          case reassignmentMembers.UpdateHistoryUnassignment(event) =>
+            Some((event.migrationId, reassignment.recordTime))
+        }
+    }
+    updateCursor.orElse(item.verdict.map(v => (v.migrationId, v.recordTime)))
+  }
+}