Restrict amulet configs to not allow fees

[ci]

Signed-off-by: Moritz Kiefer <moritz.kiefer@purelyfunctional.org>

Author: cocreature

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

@@ -196,7 +196,6 @@ object ConfigTransforms {
       disableOnboardingParticipantPromotionDelay(),
       setDefaultGrpcDeadlineForBuyExtraTraffic(),
       setDefaultGrpcDeadlineForTreasuryService(),
-      disableZeroFees(),
       updateAllAutomationConfigs(
         _.copy(rewardOperationRoundsCloseBufferDuration = NonNegativeFiniteDuration.ofMillis(100))
       ),
@@ -297,9 +296,6 @@ object ConfigTransforms {
       )
     )
 
-  def disableZeroFees(): ConfigTransform =
-    updateAllSvAppFoundDsoConfigs_(c => c.copy(zeroTransferFees = false))
-
   def disableDevelopmentFund(): ConfigTransform =
     updateAllSvAppFoundDsoConfigs_(c => c.copy(developmentFundPercentage = Some(0.0)))
 

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

@@ -234,6 +234,7 @@ class UpdateHistorySanityCheckPlugin(
       }
       if (lines.nonEmpty) {
         val message = s"${this.getClass} contains errors: $lines, exiting test."
+        readLines.foreach(logger.warn(_))
         logger.error(message)
         System.err.println(message)
         sys.exit(1)

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

@@ -61,7 +61,7 @@ class BootstrapPackageConfigIntegrationTest extends IntegrationTest with Splitwe
   override implicit val patienceConfig: PatienceConfig = PatienceConfig(scaled(Span(1, Minute)))
 
   // Factored out so we can reuse it in the test
-  val initialAmulet: DarResource = DarResources.amulet_0_1_10
+  val initialAmulet: DarResource = DarResources.amulet_0_1_14
 
   private val initialPackageConfig = InitialPackageConfig.minimumInitialPackageConfig
 
@@ -227,8 +227,8 @@ class BootstrapPackageConfigIntegrationTest extends IntegrationTest with Splitwe
           DarResources.wallet.bootstrap.metadata.version.toString(),
           DarResources.walletPayments.bootstrap.metadata.version.toString(),
         ),
-        java.util.Optional.empty(),
-        java.util.Optional.empty(),
+        amuletConfig.transferPreapprovalFee,
+        amuletConfig.featuredAppActivityMarkerAmount,
         java.util.Optional.empty(),
       )
 
@@ -361,14 +361,13 @@ class BootstrapPackageConfigIntegrationTest extends IntegrationTest with Splitwe
         SpliceUtil.defaultTransferConfig(
           amuletConfig.transferConfig.maxNumInputs.toInt,
           amuletConfig.transferConfig.holdingFee.rate,
-          zeroTransferFees = true,
         ),
         amuletConfig.issuanceCurve,
         amuletConfig.decentralizedSynchronizer,
         amuletConfig.tickDuration,
         amuletConfig.packageConfig,
-        java.util.Optional.empty(),
-        java.util.Optional.empty(),
+        amuletConfig.transferPreapprovalFee,
+        amuletConfig.featuredAppActivityMarkerAmount,
         java.util.Optional.empty(),
       )
 

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

@@ -27,7 +27,6 @@ class BootstrapTest extends IntegrationTest {
       // We reduce the polling interval here primarily for the top-up trigger to ensure that a top-up happens as soon as
       // possible during the validator setup and other txs do not get throttled for want of traffic.
       .addConfigTransform((_, config) => ConfigTransforms.reducePollingInterval(config))
-      .addConfigTransform((_, config) => ConfigTransforms.disableZeroFees()(config))
 
   "Bootstrap script should pass" in { implicit env =>
     // the script logs errors when a ANS name check fails but then recovers from this

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

@@ -66,6 +66,7 @@ class ExternalPartySetupProposalIntegrationTest
   override lazy val sanityChecksIgnoredRootCreates = Seq(
     TransferPreapproval.TEMPLATE_ID_WITH_PACKAGE_ID,
     amuletCodegen.AppRewardCoupon.TEMPLATE_ID_WITH_PACKAGE_ID,
+    amuletCodegen.ValidatorRewardCoupon.TEMPLATE_ID_WITH_PACKAGE_ID,
   )
 
   override def environmentDefinition: EnvironmentDefinition = {
@@ -282,9 +283,10 @@ class ExternalPartySetupProposalIntegrationTest
             aliceValidatorBackend
               .getExternalPartyBalance(aliceParty)
               .totalUnlockedCoin
-          ) should beAround(
-            BigDecimal(2000 - 1000 - 16.0 - 6.0 /* 16 output fees, 6.0 sender change fees */ ) +
-              BigDecimal(issuingRound.issuancePerUnfeaturedAppRewardCoupon) * appRewardAmount
+          ) should be(
+            BigDecimal(1000) + BigDecimal(
+              issuingRound.issuancePerUnfeaturedAppRewardCoupon
+            ) * appRewardAmount
           )
           bobValidatorBackend
             .getExternalPartyBalance(bobParty)
@@ -335,16 +337,26 @@ class ExternalPartySetupProposalIntegrationTest
       val update = eventuallySucceeds() {
         sv1ScanBackend.getUpdate(updateId, encoding = CompactJson)
       }
-      val rewardRound =
-        aliceValidatorBackend.participantClientWithAdminToken.ledger_api_extensions.acs
-          .filterJava(amuletCodegen.ValidatorRewardCoupon.COMPANION)(
-            aliceParty,
-            c => c.data.user == aliceParty.toProtoPrimitive,
-          )
-          .loneElement
-          .data
-          .round
-          .number
+      // Create a validator reward to test reward minting
+      val (_, rewardRound) = actAndCheck(
+        "Create validator reward",
+        createRewards(
+          appRewards = Seq.empty,
+          validatorRewards = Seq((aliceParty, BigDecimal(1.0))),
+        ),
+      )(
+        "reward is observable",
+        _ =>
+          aliceValidatorBackend.participantClientWithAdminToken.ledger_api_extensions.acs
+            .filterJava(amuletCodegen.ValidatorRewardCoupon.COMPANION)(
+              aliceParty,
+              c => c.data.user == aliceParty.toProtoPrimitive,
+            )
+            .loneElement
+            .data
+            .round
+            .number,
+      )
 
       actAndCheck(
         s"Advance rounds until $rewardRound is issuing", {
@@ -423,10 +435,10 @@ class ExternalPartySetupProposalIntegrationTest
             aliceValidatorBackend
               .getExternalPartyBalance(aliceParty)
               .totalUnlockedCoin
-          ) should beAround(
+          ) should be(
             BigDecimal(
-              2000 - 1000 - 500 - 34.0 /* last number is fees from the prior transfer and this combined */
-            )
+              2000 - 1000 - 500
+            ) + BigDecimal(issuingRound.issuancePerUnfeaturedAppRewardCoupon) * appRewardAmount
           )
           bobValidatorBackend
             .getExternalPartyBalance(bobParty)
@@ -457,7 +469,7 @@ class ExternalPartySetupProposalIntegrationTest
         transfer.description shouldBe Some("transfer-command-description")
         forExactly(1, transfer.balanceChanges) { change =>
           change.party shouldBe aliceParty.toProtoPrimitive
-          BigDecimal(change.changeToInitialAmountAsOfRoundZero) should beAround(BigDecimal(-517))
+          BigDecimal(change.changeToInitialAmountAsOfRoundZero) should beAround(BigDecimal(-500))
         }
         forExactly(1, transfer.balanceChanges) { change =>
           change.party shouldBe bobParty.toProtoPrimitive

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

@@ -193,7 +193,7 @@ class MultiHostValidatorOperatorIntegrationTest
       "The send succeeds despite alice's validator being disconnected and stopped",
       _ => {
         // Fees eat up quite a bit
-        splitwellWalletClient.balance().unlockedQty should beWithin(47, 48)
+        splitwellWalletClient.balance().unlockedQty should be(60)
         // Alice's wallet is stopped, so we confirm the transaction via scan
         sv1ScanBackend
           .listTransactions(

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

@@ -242,9 +242,7 @@ class RecoverExternalPartyIntegrationTest
           bobValidatorBackend
             .getExternalPartyBalance(aliceParty)
             .totalUnlockedCoin
-        ) should beAround(
-          BigDecimal(2000 - 1000 - 16.0 - 6.0 /* 16 output fees, 6.0 sender change fees */ )
-        )
+        ) should be(BigDecimal(1000))
       },
     )
   }

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

@@ -49,12 +49,12 @@ class RewardExpiryIntegrationTest extends IntegrationTest with TriggerTestUtil {
 
   // Exact config does not matter all that much, just want one that is older than the default versions
   // for at least the amulet package.
-  val initialAmuletPackage = DarResources.amulet_0_1_10
+  val initialAmuletPackage = DarResources.amulet_0_1_14
   private val initialPackageConfig = InitialPackageConfig(
     amuletVersion = initialAmuletPackage.metadata.version.toString,
     amuletNameServiceVersion = initialAmuletPackage.metadata.version.toString,
-    dsoGovernanceVersion = "0.1.14",
-    validatorLifecycleVersion = "0.1.4",
+    dsoGovernanceVersion = "0.1.19",
+    validatorLifecycleVersion = "0.1.5",
     walletVersion = initialAmuletPackage.metadata.version.toString,
     walletPaymentsVersion = initialAmuletPackage.metadata.version.toString,
   )

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

@@ -8,6 +8,10 @@ import org.lfdecentralizedtrust.splice.codegen.java.splice.amuletrules.{
   AmuletRules,
   AmuletRules_SetConfig,
 }
+import org.lfdecentralizedtrust.splice.codegen.java.splice.amulet.{
+  AppRewardCoupon,
+  ValidatorRewardCoupon,
+}
 import org.lfdecentralizedtrust.splice.codegen.java.splice.dsorules.actionrequiringconfirmation.ARC_AmuletRules
 import org.lfdecentralizedtrust.splice.codegen.java.splice.dsorules.amuletrules_actionrequiringconfirmation.CRARC_SetConfig
 import org.lfdecentralizedtrust.splice.config.ConfigTransforms.{
@@ -23,7 +27,6 @@ import spray.json.DefaultJsonProtocol.StringJsonFormat
 
 import java.time.{Duration, Instant}
 import scala.concurrent.Future
-import scala.jdk.CollectionConverters.*
 
 class ScanFrontendTimeBasedIntegrationTest
     extends FrontendIntegrationTestWithSharedEnvironment("scan-ui")
@@ -58,9 +61,15 @@ class ScanFrontendTimeBasedIntegrationTest
 
   private def stripTrailingZeros(num: BigDecimal) = BigDecimal(num.bigDecimal.stripTrailingZeros())
 
+  override protected lazy val sanityChecksIgnoredRootCreates = Seq(
+    AppRewardCoupon.TEMPLATE_ID_WITH_PACKAGE_ID,
+    ValidatorRewardCoupon.TEMPLATE_ID_WITH_PACKAGE_ID,
+  )
+
   "A scan UI" should {
     "see expected rewards leaderboards" in { implicit env =>
-      val (_, bobUserParty) = onboardAliceAndBob()
+      val (aliceUserParty, bobUserParty) = onboardAliceAndBob()
+      val aliceValidatorParty = aliceValidatorBackend.getValidatorPartyId()
 
       waitForWalletUser(aliceValidatorWalletClient)
       waitForWalletUser(bobValidatorWalletClient)
@@ -69,19 +78,20 @@ class ScanFrontendTimeBasedIntegrationTest
       // right in the transfer contexts of its submissions. We leave it here to test that it has no effect.
       grantFeaturedAppRight(aliceValidatorWalletClient)
 
-      clue("Tap to get some amulets") {
-        aliceWalletClient.tap(500.0)
-        aliceValidatorWalletClient.tap(100.0)
-      }
-
       clue(
-        s"Feature alice's validator and transfer some Amulet, to generate reward coupons"
+        s"Create some rewards"
       )({
-        p2pTransfer(aliceWalletClient, bobWalletClient, bobUserParty, 40.0)
+        createRewards(
+          appRewards = Seq((aliceValidatorParty, 0.415, false)),
+          validatorRewards = Seq((aliceUserParty, 0.415)),
+        )
         advanceRoundsToNextRoundOpening
         advanceRoundsToNextRoundOpening
         advanceRoundsToNextRoundOpening
-        p2pTransfer(aliceValidatorWalletClient, bobWalletClient, bobUserParty, 10.0)
+        createRewards(
+          appRewards = Seq((aliceValidatorParty, 0.115, false)),
+          validatorRewards = Seq((aliceValidatorParty, 0.115)),
+        )
       })
 
       clue("Advance rounds to collect rewards") {
@@ -239,32 +249,15 @@ class ScanFrontendTimeBasedIntegrationTest
         actAndCheck("Go to Scan UI main page", go to s"http://localhost:${scanUIPort}")(
           "Check the initial amulet config matches the defaults",
           _ => {
-            find(id("base-transfer-fee")).value.text should matchText(
-              s"${SpliceUtil.defaultCreateFee.fee.doubleValue()} USD"
-            )
-
             find(id("holding-fee")).value.text should matchText(
               s"${SpliceUtil.defaultHoldingFee.rate} USD/Round"
             )
 
-            find(id("lock-holder-fee")).value.text should matchText(
-              s"${SpliceUtil.defaultLockHolderFee.fee.doubleValue()} USD"
-            )
-
             find(id("round-tick-duration")).value.text should matchText {
               // the `.toMinutes` method rounds down to 0
               val minutes = BigDecimal(defaultTickDuration.duration.toSeconds) / 60
               s"${minutes.bigDecimal.stripTrailingZeros.toPlainString} Minutes"
             }
-
-            findAll(className("transfer-fee-row")).toList
-              .map(_.text)
-              .zip(SpliceUtil.defaultTransferFee.steps.asScala.toList)
-              .foreach({
-                case (txFeeRow, defaultStep) => {
-                  txFeeRow should include(defaultStep._1.setScale(0).toString)
-                }
-              })
           },
         )
       }

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

@@ -17,7 +17,6 @@ import org.lfdecentralizedtrust.splice.codegen.java.splice.round.OpenMiningRound
 import org.lfdecentralizedtrust.splice.config.ConfigTransforms
 import org.lfdecentralizedtrust.splice.config.ConfigTransforms.{
   ConfigurableApp,
-  updateAllSvAppFoundDsoConfigs_,
   updateAutomationConfig,
 }
 import org.lfdecentralizedtrust.splice.http.v0.definitions.{
@@ -51,11 +50,6 @@ class ScanIntegrationTest extends IntegrationTest with WalletTestUtil with TimeT
   override def environmentDefinition: SpliceEnvironmentDefinition =
     EnvironmentDefinition
       .simpleTopology1Sv(this.getClass.getSimpleName)
-      .addConfigTransforms((_, config) =>
-        updateAllSvAppFoundDsoConfigs_(
-          _.copy(zeroTransferFees = true)
-        )(config)
-      )
       .addConfigTransforms((_, config) =>
         (updateAutomationConfig(ConfigurableApp.Validator)(
           _.withPausedTrigger[CollectRewardsAndMergeAmuletsTrigger]
@@ -638,7 +632,7 @@ class ScanIntegrationTest extends IntegrationTest with WalletTestUtil with TimeT
     // TODO(DACH-NY/canton-network-node#13038) Add asserts back for listValidatorRewardCoupons
     // replace _ with validatorRewardAmount
     val (appRewardAmount, _) =
-      getRewardCouponsValue(appRewardCoupons, validatorRewardCoupons, featured = false)
+      getRewardCouponsValue(appRewardCoupons, validatorRewardCoupons)
 
     clue("Checking app and validator reward and faucet amounts") {
       eventually() {