CIP-82 (DAML): Add support for DevelopmentFundCoupon

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

@@ -258,6 +258,7 @@ class AppUpgradeIntegrationTest
             ),
             java.util.Optional.empty(),
             java.util.Optional.empty(),
+            java.util.Optional.empty(),
           )
           val upgradeAction = new ARC_AmuletRules(
             new CRARC_SetConfig(

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

@@ -224,6 +224,7 @@ class BootstrapPackageConfigIntegrationTest extends IntegrationTest with Splitwe
         ),
         java.util.Optional.empty(),
         java.util.Optional.empty(),
+        java.util.Optional.empty(),
       )
 
       val upgradeAction = new ARC_AmuletRules(
@@ -363,6 +364,7 @@ class BootstrapPackageConfigIntegrationTest extends IntegrationTest with Splitwe
         amuletConfig.packageConfig,
         java.util.Optional.empty(),
         java.util.Optional.empty(),
+        java.util.Optional.empty(),
       )
 
       val upgradeAction = new ARC_AmuletRules(

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

@@ -141,6 +141,7 @@ class SvReconcileSynchronizerConfigIntegrationTest extends SvIntegrationTestBase
     amuletConfig.packageConfig,
     java.util.Optional.empty(),
     java.util.Optional.empty(),
+    java.util.Optional.empty(),
   )
 
 }

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

@@ -487,6 +487,7 @@ class SvStateManagementIntegrationTest extends SvIntegrationTestBase with Trigge
       initialConfig.packageConfig,
       java.util.Optional.empty(),
       java.util.Optional.empty(),
+      java.util.Optional.empty(),
     )
 
     val (_, voteRequestCid) = actAndCheck(

apps/app/src/test/scala/org/lfdecentralizedtrust/splice/util/AmuletConfigUtil.scala

@@ -64,6 +64,7 @@ trait AmuletConfigUtil extends TestCommon {
       existingAmuletConfig.packageConfig,
       existingAmuletConfig.transferPreapprovalFee,
       existingAmuletConfig.featuredAppActivityMarkerAmount,
+      existingAmuletConfig.optDevelopmentFundManager,
     )
   }
 

apps/common/frontend-test-handlers/src/mocks/helpers/amulet-config-helper.ts

@@ -158,6 +158,7 @@ export function getAmuletRulesConfig(
         amuletToIssuePerYear: '40000000000.0',
         validatorRewardCap: '0.2',
         optValidatorFaucetCap: '2.85',
+        optDevelopmentFundPercentage: '0.05',
       },
       futureValues: [
         {
@@ -172,6 +173,7 @@ export function getAmuletRulesConfig(
             amuletToIssuePerYear: '20000000000.0',
             validatorRewardCap: '0.2',
             optValidatorFaucetCap: '2.85',
+            optDevelopmentFundPercentage: '0.05',
           },
         },
         {
@@ -186,6 +188,7 @@ export function getAmuletRulesConfig(
             amuletToIssuePerYear: '10000000000.0',
             validatorRewardCap: '0.2',
             optValidatorFaucetCap: '2.85',
+            optDevelopmentFundPercentage: '0.05',
           },
         },
         {
@@ -200,6 +203,7 @@ export function getAmuletRulesConfig(
             amuletToIssuePerYear: '5000000000.0',
             validatorRewardCap: '0.2',
             optValidatorFaucetCap: '2.85',
+            optDevelopmentFundPercentage: '0.05',
           },
         },
         {
@@ -214,12 +218,14 @@ export function getAmuletRulesConfig(
             amuletToIssuePerYear: '2500000000.0',
             validatorRewardCap: '0.2',
             optValidatorFaucetCap: '2.85',
+            optDevelopmentFundPercentage: '0.05',
           },
         },
       ],
     },
     transferPreapprovalFee: null,
     featuredAppActivityMarkerAmount: null,
+    optDevelopmentFundManager: null,
   };
 }
 

apps/common/frontend/src/__tests__/mocks/constants.ts

@@ -90,6 +90,7 @@ export const plannedVoteResult: DsoRules_CloseVoteRequestResult = {
                     featuredAppRewardCap: '100.0',
                     unfeaturedAppRewardCap: '0.6',
                     optValidatorFaucetCap: '2.85',
+                    optDevelopmentFundPercentage: '0.05',
                   },
                   futureValues: [
                     {
@@ -104,6 +105,7 @@ export const plannedVoteResult: DsoRules_CloseVoteRequestResult = {
                         featuredAppRewardCap: '100.0',
                         unfeaturedAppRewardCap: '0.6',
                         optValidatorFaucetCap: '2.85',
+                        optDevelopmentFundPercentage: '0.05',
                       },
                     },
                     {
@@ -118,6 +120,7 @@ export const plannedVoteResult: DsoRules_CloseVoteRequestResult = {
                         featuredAppRewardCap: '100.0',
                         unfeaturedAppRewardCap: '0.6',
                         optValidatorFaucetCap: '2.85',
+                        optDevelopmentFundPercentage: '0.05',
                       },
                     },
                     {
@@ -132,6 +135,7 @@ export const plannedVoteResult: DsoRules_CloseVoteRequestResult = {
                         featuredAppRewardCap: '100.0',
                         unfeaturedAppRewardCap: '0.6',
                         optValidatorFaucetCap: '2.85',
+                        optDevelopmentFundPercentage: '0.05',
                       },
                     },
                     {
@@ -146,6 +150,7 @@ export const plannedVoteResult: DsoRules_CloseVoteRequestResult = {
                         featuredAppRewardCap: '100.0',
                         unfeaturedAppRewardCap: '0.6',
                         optValidatorFaucetCap: '2.85',
+                        optDevelopmentFundPercentage: '0.05',
                       },
                     },
                   ],
@@ -186,6 +191,7 @@ export const plannedVoteResult: DsoRules_CloseVoteRequestResult = {
                 },
                 transferPreapprovalFee: null,
                 featuredAppActivityMarkerAmount: null,
+                optDevelopmentFundManager: null,
               },
             },
           },

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,
     ),
   )
 
@@ -308,6 +320,7 @@ object DarResources {
   val validatorLifecycle_0_1_3 = DarResource("splice-validator-lifecycle-0.1.3.dar")
   val validatorLifecycle_0_1_4 = DarResource("splice-validator-lifecycle-0.1.4.dar")
   val validatorLifecycle_0_1_5 = DarResource("splice-validator-lifecycle-0.1.5.dar")
+  val validatorLifecycle_0_1_6 = DarResource("splice-validator-lifecycle-0.1.6.dar")
   val validatorLifecycle_current = DarResource("splice-validator-lifecycle-current.dar")
   val validatorLifecycle = PackageResource(
     validatorLifecycle_current,
@@ -319,6 +332,7 @@ object DarResources {
       validatorLifecycle_0_1_3,
       validatorLifecycle_0_1_4,
       validatorLifecycle_0_1_5,
+      validatorLifecycle_0_1_6,
     ),
   )
 

apps/common/src/main/scala/org/lfdecentralizedtrust/splice/util/SpliceUtil.scala

@@ -223,6 +223,9 @@ object SpliceUtil {
 
     // validatorFaucetCap
     Some(damlDecimal(2.85)).toJava,
+
+    // developmentFundPercentage
+    Optional.empty(),
   )
 
   private def hours(h: Long): RelTime = new RelTime(TimeUnit.HOURS.toMicros(h))
@@ -389,6 +392,7 @@ object SpliceUtil {
       initialPackageConfig,
       transferPreapprovalFee.map(_.bigDecimal).toJava,
       featuredAppActivityMarkerAmount.map(_.bigDecimal).toJava,
+      Optional.empty(),
     )
 
   def defaultAnsConfig(