Merge main into staging-0.9.0

.github/workflows/build.deployment_test.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   deployment_test:
-    runs-on: self-hosted-k8s-x-small
+    runs-on: self-hosted-k8s-small
 
     container:
       image: us-central1-docker.pkg.dev/da-cn-shared/ghcr/digital-asset/decentralized-canton-sync-dev/docker/splice-test-ci:0.3.12

.github/workflows/monthly-schedule.yml

@@ -0,0 +1,53 @@
+name: Monthly Schedule
+
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        description: "Splice version, e.g. 0.8"
+        required: true
+        type: string
+
+      month:
+        description: "Month in YYYY-MM format, e.g. 2026-08"
+        required: true
+        type: string
+
+      dry_run:
+        description: "Dry run only — do not modify Monday"
+        required: true
+        default: true
+        type: boolean
+
+permissions:
+  contents: read
+
+jobs:
+  create-schedule:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+
+      - name: Set up Python
+        uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
+        with:
+          python-version: "3.13"
+
+      - name: Create monthly schedule
+        env:
+          MONDAY_API_TOKEN: ${{ secrets.MONDAY_API_TOKEN }}
+          MONDAY_BOARD_ID: ${{ secrets.MONDAY_BOARD_ID }}
+        shell: bash
+        run: |
+          ARGS=(
+            "${{ inputs.version }}"
+            "${{ inputs.month }}"
+          )
+
+          if [[ "${{ inputs.dry_run }}" == "true" ]]; then
+            ARGS+=("--dry-run")
+          fi
+
+          python3 scripts/monthly-schedule.py "${ARGS[@]}"

LATEST_RELEASE

@@ -1 +1 @@
-0.7.4
+0.7.5

VERSION

@@ -1 +1 @@
-0.7.5
+0.8.0

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

@@ -27,11 +27,7 @@ import org.lfdecentralizedtrust.splice.codegen.java.splice.ans.AnsRules
 import org.lfdecentralizedtrust.splice.config.NetworkAppClientConfig
 import org.lfdecentralizedtrust.splice.environment.SpliceConsoleEnvironment
 import org.lfdecentralizedtrust.splice.http.v0.definitions
-import org.lfdecentralizedtrust.splice.http.v0.definitions.{
-  GetDsoInfoResponse,
-  UpdateHistoryItem,
-  UpdateHistoryItemV2,
-}
+import org.lfdecentralizedtrust.splice.http.v0.definitions.{UpdateHistoryItem, UpdateHistoryItemV2}
 import org.lfdecentralizedtrust.splice.scan.{ScanApp, ScanAppBootstrap}
 import org.lfdecentralizedtrust.splice.store.VoteResultsFilters
 import org.lfdecentralizedtrust.splice.scan.automation.ScanAutomationService
@@ -43,6 +39,7 @@ import org.lfdecentralizedtrust.splice.util.{
   ChoiceContextWithDisclosures,
   Contract,
   ContractWithState,
+  DsoInfo,
   FactoryChoiceWithDisclosures,
   PackageQualifiedName,
   SpliceUtil,
@@ -89,7 +86,7 @@ abstract class ScanAppReference(
       httpCommand(HttpScanAppClient.GetDsoPartyId(List()))
     }
 
-  def getDsoInfo(): GetDsoInfoResponse = {
+  def getDsoInfo(): DsoInfo = {
     consoleEnvironment.run {
       httpCommand(HttpScanAppClient.GetDsoInfo(List()))
     }
@@ -452,6 +449,31 @@ abstract class ScanAppReference(
       )
     }
 
+  def getAcsSnapshotAtV2(
+      at: CantonTimestamp,
+      migrationId: Long,
+      recordTimeMatch: Option[definitions.AcsRequestV2.RecordTimeMatch] = Some(
+        definitions.AcsRequestV2.RecordTimeMatch.Exact
+      ),
+      after: Option[String] = None,
+      pageSize: Int = 100,
+      partyIds: Option[Vector[PartyId]] = None,
+      templates: Option[Vector[PackageQualifiedName]] = None,
+  ) =
+    consoleEnvironment.run {
+      httpCommand(
+        HttpScanAppClient.GetAcsSnapshotAtV2(
+          at.toInstant.atOffset(java.time.ZoneOffset.UTC),
+          migrationId,
+          recordTimeMatch,
+          after,
+          pageSize,
+          partyIds,
+          templates,
+        )
+      )
+    }
+
   def getHoldingsStateAt(
       at: CantonTimestamp,
       migrationId: Long,

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

@@ -42,7 +42,7 @@ import org.lfdecentralizedtrust.splice.sv.config.{
 }
 import org.lfdecentralizedtrust.splice.sv.migration.SynchronizerNodeIdentities
 import org.lfdecentralizedtrust.splice.sv.util.ValidatorOnboarding
-import org.lfdecentralizedtrust.splice.util.Contract
+import org.lfdecentralizedtrust.splice.util.{Contract, DsoInfo}
 
 import java.time.Instant
 import scala.concurrent.duration.FiniteDuration
@@ -89,9 +89,9 @@ abstract class SvAppReference(
       httpCommand(HttpSvPublicAppClient.DevNetOnboardValidatorPrepare())
     }
 
-  def getDsoInfo(): HttpSvPublicAppClient.DsoInfo =
+  def getDsoInfo(): DsoInfo =
     consoleEnvironment.run {
-      httpCommand(HttpSvPublicAppClient.GetDsoInfo)
+      httpCommand(HttpSvOperatorAppClient.GetDsoInfo)
     }
 
   @Help.Summary("Get the CometBFT node status")
@@ -292,13 +292,10 @@ class SvAppBackendReference(
   def appState: SvApp.State = _appState[SvApp.State, SvApp]
 
   @Help.Summary(
-    "Returns the current delegate based automation. Do not keep references to the result, as this automation gets replaced whenever the DSO delegate changes."
+    "Returns the delegate based automation. The reference is stable for the lifetime of the app."
   )
-  def dsoDelegateBasedAutomation: DsoDelegateBasedAutomationService = {
-    appState.dsoAutomation.restartDsoDelegateBasedAutomationTrigger.epochState
-      .getOrElse(throw new RuntimeException("LeaderBasedAutomation is not fully started up"))
-      .dsoDelegateBasedAutomation
-  }
+  def dsoDelegateBasedAutomation: DsoDelegateBasedAutomationService =
+    appState.dsoAutomation.dsoDelegateBasedAutomation
 
   @Help.Summary(
     "Returns the current DSO automation."

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

@@ -19,6 +19,7 @@ import org.lfdecentralizedtrust.splice.scan.admin.api.client.commands.HttpScanAp
 import org.lfdecentralizedtrust.splice.util.{
   ChoiceContextWithDisclosures,
   ContractWithState,
+  DsoInfo,
   FactoryChoiceWithDisclosures,
 }
 import org.lfdecentralizedtrust.splice.validator.admin.api.client.commands.*
@@ -360,7 +361,7 @@ abstract class ValidatorAppReference(
       }
     }
 
-    def getDsoInfo(): definitions.GetDsoInfoResponse = {
+    def getDsoInfo(): DsoInfo = {
       consoleEnvironment.run {
         httpCommand(
           HttpScanProxyAppClient.GetDsoInfo

apps/app/src/pack/examples/sv-helm/sv-values.yaml

@@ -1,5 +1,6 @@
 joinWithKeyOnboarding:
   sponsorApiUrl: "https://sv.sv-2.TARGET_HOSTNAME"
+  sponsorScanUrl: "https://scan.sv-2.TARGET_HOSTNAME"
 
 # Replace YOUR_SV_NAME with the name you provided for your SV identity
 onboardingName: YOUR_SV_NAME

apps/app/src/test/resources/include/svs/sv2.conf

@@ -25,6 +25,7 @@
       url = "http://127.0.0.1:"${?canton.sv-apps.sv1.admin-api.port}
       url = ${?SV1_URL}
     }
+    include required("../scan-client")
     # keys generated using scripts/generate-sv-keys.sh
     include required("_sv2-id")
     private-key = "MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgYsPjtGcZLnQ3Ck35lm2805dL1Ds/JTKqlyGLbDewgEuhRANCAARV23y0sB+/7ofqzoQalgxu2FJ20RvKRQ7YVq7STbCKl//oLQD/7HMq2oomUGTJtwGIgIb9micaS4qBYEALWNUC"

apps/app/src/test/resources/include/svs/sv3.conf

@@ -25,6 +25,7 @@
       url = "http://127.0.0.1:"${?canton.sv-apps.sv1.admin-api.port}
       url = ${?SV1_URL}
     }
+    include required("../scan-client")
     # keys generated using scripts/generate-sv-keys.sh
     include required("_sv3-id")
     private-key = "MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgWqaaIK3+vm8fymB1ZPh6PHYk/J7GyOYUdchj4I5gpzKhRANCAATuwdANiRWKxXOe4Wq+NZbEfe7xL5/Tt/UcJn6bH7KPbzKxEmNtq082exUBuIUO7Zc6rIhPH6iz8Z3f2mI5/LDb"

apps/app/src/test/resources/include/svs/sv4.conf

@@ -25,6 +25,7 @@
       url = "http://127.0.0.1:"${?canton.sv-apps.sv1.admin-api.port}
       url = ${?SV1_URL}
     }
+    include required("../scan-client")
     # keys generated using scripts/generate-sv-keys.sh
     include required("_sv4-id")
     private-key = "MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgxED/gH8AeSwNujZAVLhBRSN55Hx0ntC6FKKhgn+7h92hRANCAARkw2wMmvW5PAxMgiXNRmlR7FMupUYywPtxHhjyyphgViGV1Ux4cbnNK5t/6n5ZlssTIxQJPmcEIIGHSiJRj1ys"

apps/app/src/test/resources/preflight-topology.conf

@@ -62,6 +62,12 @@ canton {
         sv2Scan {
             admin-api.url = "https://scan.sv-2-eng."${NETWORK_APPS_ADDRESS}""
         }
+        sv3Scan {
+            admin-api.url = "https://scan.sv-3-eng."${NETWORK_APPS_ADDRESS}""
+        }
+        svda1Scan {
+            admin-api.url = "https://scan.sv-1."${NETWORK_APPS_ADDRESS}""
+        }
     }
 
     splitwell-app-clients {

apps/app/src/test/resources/sv-preflight-topology.conf

@@ -7,7 +7,7 @@ canton {
         }
     }
     scan-app-clients {
-        svTestScan {
+        svScan {
             admin-api {
                 url = "https://scan.sv."${NETWORK_APPS_ADDRESS}""
             }

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

@@ -88,7 +88,8 @@ class EventHistorySanityCheckPlugin(
                     .fromJson(exercised.choiceArgument.noSpaces)
                     .newSvParty == otherScan
                     .getDsoInfo()
-                    .svPartyId
+                    .svParty
+                    .toProtoPrimitive
                 case _ => false
               })
           }

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

@@ -5,7 +5,7 @@ import org.lfdecentralizedtrust.splice.config.ConfigTransforms.updateAllScanAppC
 import org.lfdecentralizedtrust.splice.config.SpliceConfig
 import org.lfdecentralizedtrust.splice.console.ScanAppBackendReference
 import org.lfdecentralizedtrust.splice.http.v0.definitions.DamlValueEncoding.members.CompactJson
-import org.lfdecentralizedtrust.splice.http.v0.definitions.{AcsResponseV1, UpdateHistoryItemV2}
+import org.lfdecentralizedtrust.splice.http.v0.definitions.{AcsResponseV2, UpdateHistoryItemV2}
 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
@@ -15,7 +15,6 @@ import com.digitalasset.canton.ScalaFuturesWithPatience
 import com.digitalasset.canton.data.CantonTimestamp
 import com.digitalasset.canton.logging.SuppressingLogger
 import com.digitalasset.canton.tracing.TraceContext
-import org.lfdecentralizedtrust.splice.codegen.java.splice.dsorules.DsoRules
 import org.lfdecentralizedtrust.splice.scan.config.ScanStorageConfigs.scanStorageConfigV1
 import org.lfdecentralizedtrust.splice.store.UpdateHistory.BackfillingState
 import org.scalatest.{Inspectors, LoneElement}
@@ -65,10 +64,9 @@ class UpdateHistorySanityCheckPlugin(
             initializedScans.foreach(waitUntilBackfillingComplete)
             val (founders, others) = initializedScans.partition(_.config.isFirstSv)
             val founder = founders.loneElement
-            val dsoRules =
-              DsoRules.fromJson(founder.getDsoInfo().dsoRules.contract.payload.noSpaces)
+            val dsoRules = founder.getDsoInfo().dsoRules.payload
             val (scansInDsoRules, scansNotInDsoRules) = others.partition { otherScan =>
-              val svPartyId = otherScan.getDsoInfo().svPartyId
+              val svPartyId = otherScan.getDsoInfo().svParty.toProtoPrimitive
               dsoRules.svs.containsKey(svPartyId)
             }
             scansNotInDsoRules.foreach { notInDso =>
@@ -78,7 +76,7 @@ class UpdateHistorySanityCheckPlugin(
               //  - U2: Involves SV
               // founder sees U1, U2 but otherScan only U2
               logger.info(
-                s"The SV party of Scan ${notInDso.name} (partyId=${notInDso.getDsoInfo().svPartyId}) is not in DsoRules. Ignoring."
+                s"The SV party of Scan ${notInDso.name} (partyId=${notInDso.getDsoInfo().svParty}) is not in DsoRules. Ignoring."
               )
             }
             compareHistories(founder, scansInDsoRules)
@@ -217,14 +215,14 @@ class UpdateHistorySanityCheckPlugin(
   private def getAllSnapshots(
       scan: ScanAppBackendReference,
       before: CantonTimestamp,
-      acc: List[AcsResponseV1],
-  ): List[AcsResponseV1] = {
+      acc: List[AcsResponseV2],
+  ): List[AcsResponseV2] = {
     val acsSnapshotPeriodHours = scanStorageConfigV1.dbAcsSnapshotPeriodHours
     val migrationId = scan.getMigrationId()
     scan.getDateOfMostRecentSnapshotBefore(before, migrationId) match {
       case Some(snapshotDate) =>
         val snapshot = scan
-          .getAcsSnapshotAtV1(
+          .getAcsSnapshotAtV2(
             CantonTimestamp.assertFromInstant(snapshotDate.toInstant),
             migrationId,
             pageSize = 1000,

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

@@ -26,6 +26,7 @@ import org.lfdecentralizedtrust.splice.wallet.store.BalanceChangeTxLogEntry
 import com.digitalasset.canton.config.CantonRequireTypes.InstanceName
 import com.digitalasset.canton.data.CantonTimestamp
 import com.digitalasset.canton.logging.{NamedLoggerFactory, NamedLogging}
+import com.digitalasset.canton.topology.PartyId
 import com.digitalasset.canton.topology.admin.grpc.TopologyStoreId
 import com.digitalasset.canton.topology.store.TimeQuery.HeadState
 import monocle.macros.syntax.lens.*
@@ -160,7 +161,6 @@ class AppUpgradeIntegrationTest
           bobValidatorBackend.participantClient.upload_dar_unless_exists(splitwellDarPathV1)
 
           val sv2Wallet = wc("sv2Wallet")
-          val sv1Client = sv_client("sv1Client")
 
           val bob = onboardWalletUser(bobWalletClient, bobValidatorBackend)
 
@@ -208,11 +208,14 @@ class AppUpgradeIntegrationTest
           clue("Testing some more transactions after 2 SVs upgraded") {
             sv2Wallet.tap(1003)
             sv2Wallet.balance().unlockedQty should be > BigDecimal(2000)
-            // p2p transfer between an upgraded validator (alice's) and a non-upgraded (sv-1's)
+            // p2p transfer between an upgraded validator (alice's) and a non-upgraded (sv-1's).
+            // Note: we cannot use sv1's (authenticated, current-version) /v1/dso to look up its
+            // party here, as sv1 is still running the old release at this point.
+            // TODO(DACH-NY/canton-network-internal#2106) clean this up once the old release is new enough
             p2pTransfer(
               bobValidatorWalletClient,
               sv1WalletClient,
-              sv1Client.getDsoInfo().svParty,
+              PartyId.tryFromProtoPrimitive(sv1WalletClient.userStatus().party),
               501,
             )
             sv1WalletClient.balance().unlockedQty should be > BigDecimal(400)
@@ -299,7 +302,7 @@ class AppUpgradeIntegrationTest
           )(
             "observing AmuletRules with upgraded config",
             _ => {
-              val newAmuletRules = sv1Client.getDsoInfo().amuletRules
+              val newAmuletRules = sv1Backend.getDsoInfo().amuletRules
               val config =
                 newAmuletRules.payload.configSchedule.initialValue
               config.packageConfig.amulet should endWith(".123")

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

@@ -103,7 +103,7 @@ class ScanFrontendTimeBasedIntegrationTest
               }
             contract should be(
               Some(
-                dsoInfo.dsoRules.contract.payload.asObject
+                dsoInfo.dsoRules.contract.toHttp.payload.asObject
                   .valueOrFail("This is definitely an object.")
               )
             )