IGNORE: CI for Daml: Fix ClaimExpiredRewards for ValidatorLicense weight #3181

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

@@ -168,13 +168,18 @@ class BootstrapPackageConfigIntegrationTest
       // This simulates an app vetting newer versions of their own DARs depending on newer splice-amulet versions
       // before the SVs do so. Topology aware package selection will then force the old splice-amulet and old splitwell versions
       // for composed transactions. Note that for this to work splitwell contracts must be downgradeable.
+
+      // Split into batches to avoid gRPC message size limit (10 MB)
+      val batchSize = 12
+      val versionBatches =
+        DarResources.splitwell.all.map(_.metadata.version).distinct.grouped(batchSize).toSeq
+
       Seq(aliceValidatorBackend, bobValidatorBackend, splitwellValidatorBackend).foreach { p =>
-        p.participantClient.dars.upload_many(
-          DarResources.splitwell.all
-            .map(_.metadata.version)
-            .distinct
-            .map((v: PackageVersion) => s"daml/dars/splitwell-$v.dar")
-        )
+        versionBatches.foreach { batch =>
+          p.participantClient.dars.upload_many(
+            batch.map((v: PackageVersion) => s"daml/dars/splitwell-$v.dar")
+          )
+        }
       }
     }
 

apps/common/frontend-test-handlers/src/mocks/handlers/validator-licenses-handler.ts

@@ -21,6 +21,8 @@ export function validatorLicensesHandler(baseUrl: string): RestHandler {
         },
         metadata: { version: '1', lastUpdatedAt: aTimestamp, contactPoint: 'nowhere' },
         lastActiveAt: aTimestamp,
+        weight: null,
+        kind: null,
       };
       return {
         contract_id: id,

apps/common/src/main/scala/org/lfdecentralizedtrust/splice/environment/DarResources.scala

@@ -75,6 +75,7 @@ object DarResources {
   val amulet_0_1_12 = DarResource("splice-amulet-0.1.12.dar")
   val amulet_0_1_13 = DarResource("splice-amulet-0.1.13.dar")
   val amulet_0_1_14 = DarResource("splice-amulet-0.1.14.dar")
+  val amulet_0_1_15 = DarResource("splice-amulet-0.1.15.dar")
   val amulet_current = DarResource("splice-amulet-current.dar")
   val amulet = PackageResource(
     amulet_current,
@@ -95,6 +96,7 @@ object DarResources {
       amulet_0_1_12,
       amulet_0_1_13,
       amulet_0_1_14,
+      amulet_0_1_15,
     ),
   )
 
@@ -119,6 +121,7 @@ object DarResources {
   val dsoGovernance_0_1_18 = DarResource("splice-dso-governance-0.1.18.dar")
   val dsoGovernance_0_1_19 = DarResource("splice-dso-governance-0.1.19.dar")
   val dsoGovernance_0_1_20 = DarResource("splice-dso-governance-0.1.20.dar")
+  val dsoGovernance_0_1_21 = DarResource("splice-dso-governance-0.1.21.dar")
   val dsoGovernance_current = DarResource("splice-dso-governance-current.dar")
   val dsoGovernance = PackageResource(
     dsoGovernance_current,
@@ -145,6 +148,7 @@ object DarResources {
       dsoGovernance_0_1_18,
       dsoGovernance_0_1_19,
       dsoGovernance_0_1_20,
+      dsoGovernance_0_1_21,
     ),
   )
 
@@ -164,6 +168,7 @@ object DarResources {
   val amuletNameService_0_1_13 = DarResource("splice-amulet-name-service-0.1.13.dar")
   val amuletNameService_0_1_14 = DarResource("splice-amulet-name-service-0.1.14.dar")
   val amuletNameService_0_1_15 = DarResource("splice-amulet-name-service-0.1.15.dar")
+  val amuletNameService_0_1_16 = DarResource("splice-amulet-name-service-0.1.16.dar")
   val amuletNameService_current = DarResource("splice-amulet-name-service-current.dar")
   val amuletNameService = PackageResource(
     amuletNameService_current,
@@ -185,6 +190,7 @@ object DarResources {
       amuletNameService_0_1_13,
       amuletNameService_0_1_14,
       amuletNameService_0_1_15,
+      amuletNameService_0_1_16,
     ),
   )
 
@@ -203,6 +209,7 @@ object DarResources {
   val splitwell_0_1_12 = DarResource("splitwell-0.1.12.dar")
   val splitwell_0_1_13 = DarResource("splitwell-0.1.13.dar")
   val splitwell_0_1_14 = DarResource("splitwell-0.1.14.dar")
+  val splitwell_0_1_15 = DarResource("splitwell-0.1.15.dar")
   val splitwell_current = DarResource("splitwell-current.dar")
   val splitwell = PackageResource(
     splitwell_current,
@@ -223,6 +230,7 @@ object DarResources {
       splitwell_0_1_12,
       splitwell_0_1_13,
       splitwell_0_1_14,
+      splitwell_0_1_15,
     ),
   )
 
@@ -241,6 +249,7 @@ object DarResources {
   val wallet_0_1_12 = DarResource("splice-wallet-0.1.12.dar")
   val wallet_0_1_13 = DarResource("splice-wallet-0.1.13.dar")
   val wallet_0_1_14 = DarResource("splice-wallet-0.1.14.dar")
+  val wallet_0_1_15 = DarResource("splice-wallet-0.1.15.dar")
   val wallet_current = DarResource("splice-wallet-current.dar")
   val wallet = PackageResource(
     wallet_current,
@@ -261,6 +270,7 @@ object DarResources {
       wallet_0_1_12,
       wallet_0_1_13,
       wallet_0_1_14,
+      wallet_0_1_15,
     ),
   )
 
@@ -279,6 +289,7 @@ object DarResources {
   val walletPayments_0_1_12 = DarResource("splice-wallet-payments-0.1.12.dar")
   val walletPayments_0_1_13 = DarResource("splice-wallet-payments-0.1.13.dar")
   val walletPayments_0_1_14 = DarResource("splice-wallet-payments-0.1.14.dar")
+  val walletPayments_0_1_15 = DarResource("splice-wallet-payments-0.1.15.dar")
   val walletPayments_current = DarResource("splice-wallet-payments-current.dar")
   val walletPayments = PackageResource(
     walletPayments_current,
@@ -299,6 +310,7 @@ object DarResources {
       walletPayments_0_1_12,
       walletPayments_0_1_13,
       walletPayments_0_1_14,
+      walletPayments_0_1_15,
     ),
   )
 

apps/common/src/test/scala/org/lfdecentralizedtrust/splice/store/StoreTest.scala

@@ -411,6 +411,8 @@ abstract class StoreTest extends AsyncWordSpec with BaseTest {
         )
       ).toJava,
       Some(defaultEffectiveAt).toJava,
+      Optional.empty(),
+      Optional.empty(),
     )
     contract(
       identifier = templateId,
@@ -460,6 +462,7 @@ abstract class StoreTest extends AsyncWordSpec with BaseTest {
         dsoParty.toProtoPrimitive,
         validator.toProtoPrimitive,
         new Round(round),
+        Optional.empty(),
       ),
     )
   }

apps/common/src/test/scala/org/lfdecentralizedtrust/splice/util/ValueJsonCodecCodegenTest.scala

@@ -64,6 +64,8 @@ class ValueJsonCodecCodegenTest extends StoreTest with StoreErrors {
         Optional.empty(),
         Optional.empty(),
         Optional.empty(),
+        Optional.empty(),
+        Optional.empty(),
       )
       // with (one) optional field set
       val decodedOptionalSet: JavaApi.DamlRecord = ValueJsonCodecCodegen
@@ -81,6 +83,8 @@ class ValueJsonCodecCodegenTest extends StoreTest with StoreErrors {
         Optional.empty(),
         Optional.empty(),
         Optional.of(java.time.Instant.EPOCH),
+        Optional.empty(),
+        Optional.empty(),
       )
     }