[ci] Merge remote-tracking branch 'origin/main' into isegall/version-bumps

Signed-off-by: Itai Segall <itai.segall@digitalasset.com>

Author: isegall-da

TESTING.md

@@ -81,8 +81,8 @@ There are two types of cluster tests that can be requested on a PR:
 - A Hard Migration test, which tests the full hard migration workflow on a scratch cluster.
 
 To request a cluster test to be run on your PR, comment on your pr `/cluster_test` or `/hdm_test`
-for a basic test or a hard-migration test respectively. After commenting, reach out to the
-[Splice Contributors](CONTRIBUTORS.md) to approve and trigger the actual test on your behalf.
+for a basic test or a hard-migration test respectively. After commenting, the job needs to be approved to actually run.
+If you're a Digital Asset employee, you can self-approve; otherwise, contact an existing maintainer to approve it.
 
 ### Enabling the new Canton bft ordering layer
 

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

@@ -249,12 +249,6 @@ abstract class ScanAppReference(
       httpCommand(HttpScanAppClient.LookupFeaturedAppRight(providerPartyId))
     }
 
-  @Help.Summary("Get the total balance of Amulet in the network")
-  def getTotalAmuletBalance(asOfEndOfRound: Long): Option[BigDecimal] =
-    consoleEnvironment.run {
-      httpCommand(HttpScanAppClient.GetTotalAmuletBalance(asOfEndOfRound))
-    }
-
   @Help.Summary("Get the Amulet config parameters for a given round")
   def getAmuletConfigForRound(
       round: Long
@@ -616,6 +610,21 @@ abstract class ScanAppReference(
     consoleEnvironment.run {
       httpCommand(HttpScanAppClient.LookupInstrument(instrumentId))
     }
+  @Help.Summary(
+    "Get the total amulet balance (total supply), automatically forces a new acs snapshot to get an up2date response"
+  )
+  def getTotalAmuletBalance(
+      amuletName: String = getSpliceInstanceNames().amuletName
+  ): BigDecimal = {
+    val _ = forceAcsSnapshotNow()
+    lookupInstrument(amuletName)
+      .flatMap(_.totalSupply.map(s => BigDecimal(s)))
+      .getOrElse(
+        throw new RuntimeException(
+          s"'$amuletName' instrument not found or total supply not defined"
+        )
+      )
+  }
 
   def listInstruments() =
     consoleEnvironment.run {

apps/app/src/test/resources/include/scans/_scan.conf

@@ -44,10 +44,6 @@
        ttl = 1s
        max-size = 1
       }
-      total-amulet-balance {
-       ttl = 1s
-       max-size = 1
-      }
       amulet-rules {
        ttl = 1s
        max-size = 1
@@ -64,10 +60,6 @@
        ttl = 1s
        max-size = 1
       }
-      wallet-balance {
-       ttl = 1s
-       max-size = 1
-      }
       amulet-config-for-round {
        ttl = 1s
        max-size = 1

apps/app/src/test/scala/org/lfdecentralizedtrust/splice/integration/EnvironmentDefinition.scala

@@ -45,6 +45,9 @@ import org.scalatest.{Inside, Inspectors, OptionValues}
 case class EnvironmentDefinition(
     override val baseConfig: SpliceConfig,
     override val testingConfig: TestingConfigInternal = TestingConfigInternal(),
+    // preSetup and setup run *after* the apps have started, but before tests run.
+    // preAppStart runs before the apps are started.
+    preAppStart: SpliceTestConsoleEnvironment => Unit = _ => (),
     val preSetup: SpliceTestConsoleEnvironment => Unit = _ => (),
     val setup: SpliceTestConsoleEnvironment => Unit = _ => (),
     override val teardown: Unit => Unit = _ => (),
@@ -174,8 +177,7 @@ case class EnvironmentDefinition(
       participants: SpliceTestConsoleEnvironment => Seq[ParticipantClientReference]
   ): EnvironmentDefinition = {
     copy(
-      preSetup = implicit env => {
-        this.preSetup(env)
+      preAppStart = implicit env => {
         participants(env).foreach { p =>
           p.synchronizers.list_connected().foreach { connected =>
             val currentVettedPackages = p.topology.vetted_packages.list(
@@ -471,15 +473,17 @@ case class EnvironmentDefinition(
   override def createTestConsole(
       environment: SpliceEnvironment,
       loggerFactory: NamedLoggerFactory,
-  ): TestConsoleEnvironment[SpliceConfig, SpliceEnvironment] =
-    new SpliceConsoleEnvironment(
+  ): TestConsoleEnvironment[SpliceConfig, SpliceEnvironment] = {
+    val env = new SpliceConsoleEnvironment(
       environment,
       new TestConsoleOutput(loggerFactory),
     ) with TestEnvironment[SpliceConfig] {
       override lazy val actorSystem = super[TestEnvironment].actorSystem
       override val actualConfig: SpliceConfig = this.environment.config
-
     }
+    this.preAppStart(env)
+    env
+  }
 }
 
 object EnvironmentDefinition extends CommonAppInstanceReferences {

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

@@ -205,7 +205,6 @@ class UpdateHistorySanityCheckPlugin(
             "DEBUG",
             "--report-output",
             csvTempFile.toString,
-            "--scan-balance-assertions",
             "--stop-at-record-time",
             snapshotRecordTime.toInstant.toString,
             "--compare-acs-with-snapshot",

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

@@ -440,16 +440,6 @@ class ScanFrontendTimeBasedIntegrationTest
         "Wait for round to close in scan",
         _ => sv1ScanBackend.getRoundOfLatestData()._1 shouldBe (firstRound + 1),
       )
-      // We do not check the backend computation here, nor do we want to rely on the exact amulet balance created in other tests,
-      // so here we simply test that:
-      // The total balance increased as a result of our tap by the tap amount minus some amount to account for holding fees
-      // The frontend shows the balance from the backend
-      sv1ScanBackend
-        .getTotalAmuletBalance(firstRound + 1)
-        .valueOrFail("Amulet balance not yet computed") should
-        (be > (sv1ScanBackend
-          .getTotalAmuletBalance(firstRound)
-          .valueOrFail("Amulet balance not yet computed") + 99.0))
 
       withFrontEnd("scan-ui") { implicit webDriver =>
         actAndCheck(

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

@@ -689,29 +689,6 @@ class ScanIntegrationTest extends IntegrationTest with WalletTestUtil with TimeT
     }
   }
 
-  "getWalletBalance should return 400 for invalid party ID" in { implicit env =>
-    implicit val sys = env.actorSystem
-    registerHttpConnectionPoolsCleanup(env)
-
-    val response = Http()
-      .singleRequest(
-        Get(
-          s"${sv1ScanBackend.httpClientConfig.url}/api/scan/v0/wallet-balance?party_id=None&asOfEndOfRound=0"
-        )
-      )
-      .futureValue
-
-    inside(response) {
-      case _ if response.status == StatusCodes.BadRequest =>
-        inside(Unmarshal(response.entity).to[String].value.value) {
-          case Success(successfullResponse) =>
-            successfullResponse should include(
-              "Invalid unique identifier `None` with missing namespace"
-            )
-        }
-    }
-  }
-
   "getUpdateHistory should return 400 for invalid after timestamp" in { implicit env =>
     import env.{actorSystem, executionContext}
     registerHttpConnectionPoolsCleanup(env)

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

@@ -290,89 +290,6 @@ class ScanTimeBasedIntegrationTest
     )
   }
 
-  "get total amulet balance" in { implicit env =>
-    val (_, _) = onboardAliceAndBob()
-
-    def roundNum() =
-      sv1ScanBackend.getLatestOpenMiningRound(getLedgerTime).contract.payload.round.number
-    roundNum() shouldBe (firstRound + 1)
-
-    val tapRound1Amount = BigDecimal(500.0)
-    clue(s"Tap in round ${firstRound + 1}") {
-      aliceWalletClient.tap(tapRound1Amount)
-    }
-
-    advanceRoundsToNextRoundOpening
-
-    roundNum() shouldBe (firstRound + 2)
-
-    val tapRound2Amount = BigDecimal(500.0)
-    clue(s"Tap in round ${firstRound + 2}") {
-      bobWalletClient.tap(tapRound2Amount)
-    }
-
-    actAndCheck(
-      s"advance to close round ${firstRound + 2}",
-      (0 to 4).foreach(_ => advanceRoundsToNextRoundOpening),
-    )(
-      s"check round ${firstRound + 2} is closed",
-      _ => {
-        sv1ScanBackend.automation.trigger[ScanAggregationTrigger].runOnce().futureValue
-        sv1ScanBackend.getRoundOfLatestData()._1 shouldBe firstRound + 2
-        sv1ScanBackend.getAggregatedRounds().value shouldBe ScanAggregator.RoundRange(
-          firstRound + 0,
-          firstRound + 2,
-        )
-      },
-    )
-
-    clue(
-      s"Get total balances for round ${firstRound + 0}, ${firstRound + 1} and ${firstRound + 2}"
-    ) {
-      val total0 =
-        sv1ScanBackend
-          .getTotalAmuletBalance(firstRound + 0)
-          .getOrElse(BigDecimal(0))
-      val total1 =
-        sv1ScanBackend
-          .getTotalAmuletBalance(firstRound + 1)
-          .getOrElse(BigDecimal(0))
-      val total2 =
-        sv1ScanBackend
-          .getTotalAmuletBalance(firstRound + 2)
-          .valueOrFail("Amulet balance not yet computed")
-
-      val holdingFeeAfterOneRound = 1 * defaultHoldingFeeAmulet
-      val holdingFeeAfterTwoRounds = 2 * defaultHoldingFeeAmulet
-
-      total0 shouldBe 0.0
-      total1 shouldBe (walletUsdToAmulet(tapRound1Amount) - holdingFeeAfterOneRound)
-      total2 shouldBe (
-        walletUsdToAmulet(tapRound1Amount) - holdingFeeAfterTwoRounds +
-          walletUsdToAmulet(tapRound2Amount) - holdingFeeAfterOneRound
-      )
-      sv1ScanBackend.getAggregatedRounds().value shouldBe ScanAggregator.RoundRange(
-        firstRound + 0,
-        firstRound + 2,
-      )
-      sv1ScanBackend
-        .listRoundTotals(firstRound + 0, firstRound + 2)
-        .map(rt => (rt.closedRound, BigDecimal(rt.totalAmuletBalance))) shouldBe List(
-        firstRound + 0L -> total0,
-        firstRound + 1L -> total1,
-        firstRound + 2L -> total2,
-      )
-      assertThrowsAndLogsCommandFailures(
-        sv1ScanBackend.listRoundTotals(firstRound + 1, firstRound + 3),
-        _.errorMessage should include("is outside of the available rounds range"),
-      )
-      assertThrowsAndLogsCommandFailures(
-        sv1ScanBackend.listRoundPartyTotals(firstRound + 1, firstRound + 3),
-        _.errorMessage should include("is outside of the available rounds range"),
-      )
-    }
-  }
-
   "Not get aggregates for incorrect ranges" in { implicit env =>
     clue("Try to get round totals for negative rounds") {
       val startRounds = List(-1L, 0L, -1L, 1L, -1L)

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

@@ -7,7 +7,6 @@ import org.lfdecentralizedtrust.splice.config.ConfigTransforms.{
 import org.lfdecentralizedtrust.splice.integration.EnvironmentDefinition
 import org.lfdecentralizedtrust.splice.integration.tests.SpliceTests.IntegrationTest
 import org.lfdecentralizedtrust.splice.sv.automation.singlesv.LocalSequencerConnectionsTrigger
-import org.lfdecentralizedtrust.splice.util.SpliceUtil.defaultIssuanceCurve
 import org.lfdecentralizedtrust.splice.util.{SvTestUtil, TimeTestUtil, WalletTestUtil}
 
 import scala.util.Try
@@ -139,39 +138,6 @@ class ScanWithGradualStartsTimeBasedIntegrationTest
     }
 
     val validatorLivenessActivityRecordAmount = 2.85
-    clue("Aggregated total amulet balance on both scan apps should match") {
-      val svRewardPerRound =
-        BigDecimal(
-          computeSvRewardInRound0(
-            defaultIssuanceCurve().initialValue,
-            defaultTickDuration,
-            dsoSize = 2,
-          )
-        )
-      forEvery(
-        Table(
-          ("round", "total floor", "total ceiling"),
-          // Alice has 23 USD in Amulet, Bob has 3 USD, all minus holding fees
-          (2L, walletUsdToAmulet(25.9), walletUsdToAmulet(26.0)),
-          // sv2 did not start up it's validator app (thus wallet), so it won't claim any coupons.
-          (
-            3L,
-            // validator liveness activity record: SV1, Alice, Bob
-            walletUsdToAmulet(
-              26.0 + validatorLivenessActivityRecordAmount * 3 - smallAmount
-            ) + svRewardPerRound,
-            walletUsdToAmulet(26.0 + validatorLivenessActivityRecordAmount * 3) + svRewardPerRound,
-          ),
-        )
-      ) { (round, floor, ceil) =>
-        val total1 =
-          sv1ScanBackend.getTotalAmuletBalance(round).valueOrFail("Amulet balance not yet computed")
-        val total2 =
-          sv2ScanBackend.getTotalAmuletBalance(round).valueOrFail("Amulet balance not yet computed")
-        total1 shouldBe total2
-        total1 should beWithin(floor, ceil)
-      }
-    }
 
     clue("Aggregated rewards collected on both scan apps should match") {
       forEvery(

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

@@ -106,10 +106,9 @@ class TokenStandardMetadataTimeBasedIntegrationTest
       )(
         "rounds are defined and include tapped amulet",
         _ => {
-          val (roundNumber, _) = sv1ScanBackend.getRoundOfLatestData()
-          val totalBalance = sv1ScanBackend
-            .getTotalAmuletBalance(roundNumber)
-            .getOrElse(fail("total balance not yet defined"))
+          val totalBalance =
+            sv1ScanBackend
+              .getTotalAmuletBalance("Amulet")
           totalBalance should be >= walletUsdToAmulet(99.0)
         },
       )