DO NOT MERGE: Daml code for implementing traffic-based app rewards

build.sbt

@@ -117,6 +117,7 @@ lazy val root: Project = (project in file("."))
     `splice-dso-governance-test-daml`,
     `splice-validator-lifecycle-daml`,
     `splice-validator-lifecycle-test-daml`,
+    `splice-api-featured-app-v1-daml`,
     `splice-api-token-metadata-v1-daml`,
     `splice-api-token-holding-v1-daml`,
     `splice-api-token-transfer-instruction-v1-daml`,
@@ -663,7 +664,7 @@ lazy val `splice-util-daml` =
       `canton-bindings-java`
     )
 
-lazy val `splice-featured-app-api-v1-daml` =
+lazy val `splice-api-featured-app-v1-daml` =
   project
     .in(file("daml/splice-api-featured-app-v1"))
     .enablePlugins(DamlPlugin)
@@ -674,7 +675,7 @@ lazy val `splice-featured-app-api-v1-daml` =
       `canton-bindings-java`
     )
 
-lazy val `splice-featured-app-api-v2-daml` =
+lazy val `splice-api-featured-app-v2-daml` =
   project
     .in(file("daml/splice-api-featured-app-v2"))
     .enablePlugins(DamlPlugin)
@@ -699,8 +700,8 @@ lazy val `splice-amulet-daml` =
           (`splice-api-token-allocation-v1-daml` / Compile / damlBuild).value ++
           (`splice-api-token-allocation-request-v1-daml` / Compile / damlBuild).value ++
           (`splice-api-token-allocation-instruction-v1-daml` / Compile / damlBuild).value ++
-          (`splice-featured-app-api-v1-daml` / Compile / damlBuild).value ++
-          (`splice-featured-app-api-v2-daml` / Compile / damlBuild).value,
+          (`splice-api-featured-app-v1-daml` / Compile / damlBuild).value ++
+          (`splice-api-featured-app-v2-daml` / Compile / damlBuild).value,
     )
     .dependsOn(`canton-bindings-java`)
 
@@ -811,8 +812,8 @@ lazy val `splice-util-featured-app-proxies-daml` =
         (`splice-api-token-transfer-instruction-v1-daml` / Compile / damlBuild).value ++
           (`splice-api-token-allocation-v1-daml` / Compile / damlBuild).value ++
           (`splice-api-token-allocation-instruction-v1-daml` / Compile / damlBuild).value ++
-          (`splice-featured-app-api-v1-daml` / Compile / damlBuild).value ++
-          (`splice-featured-app-api-v2-daml` / Compile / damlBuild).value,
+          (`splice-api-featured-app-v1-daml` / Compile / damlBuild).value ++
+          (`splice-api-featured-app-v2-daml` / Compile / damlBuild).value,
     )
     .dependsOn(`canton-bindings-java`)
 
@@ -826,8 +827,8 @@ lazy val `splice-util-token-standard-wallet-daml` =
         (`splice-api-token-holding-v1-daml` / Compile / damlBuild).value ++
           (`splice-api-token-metadata-v1-daml` / Compile / damlBuild).value ++
           (`splice-api-token-transfer-instruction-v1-daml` / Compile / damlBuild).value ++
-          (`splice-featured-app-api-v1-daml` / Compile / damlBuild).value ++
-          (`splice-featured-app-api-v2-daml` / Compile / damlBuild).value,
+          (`splice-api-featured-app-v1-daml` / Compile / damlBuild).value ++
+          (`splice-api-featured-app-v2-daml` / Compile / damlBuild).value,
     )
     .dependsOn(`canton-bindings-java`)
 
@@ -864,8 +865,8 @@ lazy val `splice-util-batched-markers-daml` =
     .settings(
       BuildCommon.damlSettings,
       Compile / damlDependencies :=
-        (`splice-featured-app-api-v1-daml` / Compile / damlBuild).value ++
-          (`splice-featured-app-api-v2-daml` / Compile / damlBuild).value,
+        (`splice-api-featured-app-v1-daml` / Compile / damlBuild).value ++
+          (`splice-api-featured-app-v2-daml` / Compile / damlBuild).value,
     )
     .dependsOn(`canton-bindings-java`)
 
@@ -963,8 +964,8 @@ lazy val `apps-common` =
       `splice-api-token-allocation-instruction-v1-daml`,
       `splice-token-test-dummy-holding-daml`,
       `splice-token-test-trading-app-daml`,
-      `splice-featured-app-api-v1-daml`,
-      `splice-featured-app-api-v2-daml`,
+      `splice-api-featured-app-v1-daml`,
+      `splice-api-featured-app-v2-daml`,
       `splice-util-batched-markers-daml`,
     )
     .enablePlugins(BuildInfoPlugin)

daml/dars.lock

@@ -7,7 +7,7 @@ splice-amulet 0.1.13 6e9fc50fb94e56751b49f09ba2dc84da53a9d7cff08115ebb4f6b7a12d0
 splice-amulet 0.1.14 3ca1343ab26b453d38c8adb70dca5f1ead8440c42b59b68f070786955cbf9ec1
 splice-amulet 0.1.15 67fac2f853bce8dbf0b9817bb5ba7c59f10e8120b7c808696f7010e5f0c8a791
 splice-amulet 0.1.16 c208d7ead1e4e9b610fc2054d0bf00716144ad444011bce0b02dcd6cd0cb8a23
-splice-amulet 0.1.17 5450b9117e55d473f37a86daad480856ed4f59d639485057f046bf0f0254752b
+splice-amulet 0.1.17 51ea72cf66796899b22469cc1f0a39809a1957d14439608e325712f9ead21556
 splice-amulet 0.1.2 1446ffdf23326cef2de97923df96618eb615792bea36cf1431f03639448f1645
 splice-amulet 0.1.3 0d89016d5a90eb8bced48bbac99e81c57781b3a36094b8d48b8e4389851e19af
 splice-amulet 0.1.4 a36ef8888fb44caae13d96341ce1fabd84fc9e2e7b209bbc3caabb48b6be1668
@@ -26,7 +26,7 @@ splice-amulet-name-service 0.1.14 6cb1318176e758c256c2e385f87b86c5060e80fb68a72e
 splice-amulet-name-service 0.1.15 d4724b90dce9fb08badbb367962d237710b3a603e4f57806a1b0af308cc70fdb
 splice-amulet-name-service 0.1.16 53468a38bce11b51cd2ed10b9c09301c0b73570b50896d5649c4629de15815a3
 splice-amulet-name-service 0.1.17 bcc80dce253c7b89efd9b263be5260a9609f8cb1fb5ea6e9916f6904552bdc82
-splice-amulet-name-service 0.1.18 238c0a20346fcb10a3c87249ee916239ae5d4b52f874fa2042aac9d0a65f3c1a
+splice-amulet-name-service 0.1.18 4987b8db10462a94b3e672ef18437b39d2f8d359c02cae57e82819406d8947ef
 splice-amulet-name-service 0.1.2 711a2974d65e6ebd149704da75f3f71234798687ab895b92f066c865dbdeeabb
 splice-amulet-name-service 0.1.3 beb4b85f3f0cf36dfb93fc917d3ac218ee5d41b6e70604720cb228d85e168ee0
 splice-amulet-name-service 0.1.4 053c7f4c2a77312e7d465a4fa7dc8cb298754ad12c0c987a7c401bd724e65efc
@@ -35,10 +35,11 @@ splice-amulet-name-service 0.1.6 a208aab2c4a248ab2eff352bd382f8b3bbadc92464123db
 splice-amulet-name-service 0.1.7 ba7806d9b2d593eac74a050161c54ae1325d170bf175cb66a9c1e5e5ffb88c3d
 splice-amulet-name-service 0.1.8 efeb3f9b2b92e55fac4ec2d6164f95407a01477240c7465e576df4e310f54bd3
 splice-amulet-name-service 0.1.9 f1b5915ad45ded616f43f83c735b7ee158b5eb58abe758a721e50eee19b3e531
-splice-amulet-name-service-test 0.1.21 2edfe0f32f414b2e4d211cc74d7fefe5b40dd5930dde58fe7339b5b504259058
-splice-amulet-test 0.1.20 800087d5759849775e4af6e6149a95c0506521c7c785257583f80ad5019ae284
+splice-amulet-name-service-test 0.1.21 254bdd2a6172b0adc4acec920981f236db9baa7a361a87d8f2e88e1731470d99
+splice-amulet-test 0.1.20 d1e44bcdc8ac0c8189eff9bf3cce8ef6badc846dd82f2489c6cac9199db18114
 splice-api-featured-app-v1 1.0.0 7804375fe5e4c6d5afe067bd314c42fe0b7d005a1300019c73154dd939da4dda
 splice-api-featured-app-v2 1.0.0 dd22e3e168a8c7fd0313171922dabf1f7a3b131bd9bfc9ff98e606f8c57707ea
+splice-api-reward-assignment-v1 1.0.0 fd02ac68f16c7e9ef0c1ce039aaa0a2ee8e05cefb0d1e2703849175ca32c1ff2
 splice-api-token-allocation-instruction-v1 1.0.0 275064aacfe99cea72ee0c80563936129563776f67415ef9f13e4297eecbc520
 splice-api-token-allocation-request-v1 1.0.0 6fe848530b2404017c4a12874c956ad7d5c8a419ee9b040f96b5c13172d2e193
 splice-api-token-allocation-v1 1.0.0 93c942ae2b4c2ba674fb152fe38473c507bda4e82b4e4c5da55a552a9d8cce1d
@@ -64,16 +65,16 @@ splice-dso-governance 0.1.2 4206e127be8b111ac84bd7f98bd9dbf03ed489f1642b46ab31a4
 splice-dso-governance 0.1.20 996a3b619d6b65ca7812881978c44c650cac119de78f5317d1f317658943001c
 splice-dso-governance 0.1.21 2d306cfe8cdb3daf2d21f84dfecc3e2f26a41504e58fe25cb7fe5cc65683d11f
 splice-dso-governance 0.1.22 5c28530209b9ab37c5f187132cd826709bb18b0efe28411488ab750870414738
-splice-dso-governance 0.1.23 1d30f443af2ee80a58b266362e6212a6f848ef1ac79affec0626ac84c0f54ee1
+splice-dso-governance 0.1.23 c2263b38e1eed13a2deccf76772ddf1b8248f9bce18275d4e0310808097982c1
 splice-dso-governance 0.1.3 b0ae3cc03e418790305a3c15f761fe495572de5827f8d322fb8b96996b783c13
 splice-dso-governance 0.1.4 dc24fd18b4d151cd1e0ff6bfb7438bafb2f50fe076d0f16f50565e60b153a0be
 splice-dso-governance 0.1.5 9e3ca1d22ad495dfabf3d61acae3dc1a7718f527f02092280b58cf69edfdc84c
 splice-dso-governance 0.1.6 4e7653cfbf7ca249de4507aca9cd3b91060e5489042a522c589d3c4199580cd8
 splice-dso-governance 0.1.7 d406eba1132d464605f4dae3edf8cf5ecbbb34bd8edef0e047e7e526d328718c
 splice-dso-governance 0.1.8 1790a114f83d5f290261fae1e7e46fba75a861a3dd603c6b4ef6b67b49053948
 splice-dso-governance 0.1.9 9ee83bfd872f91e659b8a8439c5b4eaf240bcf6f19698f884d7d7993ab48c401
-splice-dso-governance-test 0.1.27 7e518a0382974e926d8e1e1b1ef1073958c8b0b5a0ae026c0c6286ae02facd5d
-splice-token-standard-test 1.0.11 f227323caf712d2778fe39b3393801032bfc2db8804dd4d1cdd0e54a85a7ce50
+splice-dso-governance-test 0.1.27 1e865708d2ff84ffdfd1b053e328260a82a30c43f1813d2469a0902905b0067e
+splice-token-standard-test 1.0.11 685c3307bee61b734e2bda5746a2d21907254527f4d56f8257074e0b4ef40730
 splice-token-test-dummy-holding 0.0.1 1cd171c6c42ab46dc9cf12d80c6111369e00cea5cdf054924b4f26ce94b1ef5b
 splice-token-test-dummy-holding 0.0.2 4f40fb033ef3db89623642c1b494e846097fa32af138b3864a63aa15937a323d
 splice-token-test-trading-app 1.0.0 e5c9847d5a88d3b8d65436f01765fc5ba142cc58529692e2dacdd865d9939f71
@@ -85,15 +86,15 @@ splice-util 0.1.4 b7356fbb2cf8a3b22194d8c743c3c216d9c7527b257c8c38b257eb22942be3
 splice-util 0.1.5 5a58024e2cc488ca9e0c952ec7ef41da3a1ed0a78ba23bacd819e5b30afb5546
 splice-util-batched-markers 1.0.0 727c5e97457d3ff841680816eb70d55834827ef756bac8551cace5b961c9c1d2
 splice-util-batched-markers 1.0.1 4d91a9b044e0e996e91ee9aac3442591ffc78f16da4ff5c6f55218ba667f6192
-splice-util-batched-markers-test 1.0.3 4e252a71e4b3697dad8f94338e1707375df04bc71488b4de867ee034bee3af5f
+splice-util-batched-markers-test 1.0.3 84d63b6113e37f76e8f5cc2cd0501c57082a8368cce7a7156f82a40600af616d
 splice-util-featured-app-proxies 1.0.0 48e0c4fe4ea05e3b740404ebe37004ddd741efbdcd665c1c3199a5d6d9d944d7
 splice-util-featured-app-proxies 1.1.0 81dd5a9e5c02d0de03208522a895fb85eeb12fbea4aca7c4ad0ad106f3b0bfce
 splice-util-featured-app-proxies 1.2.0 653c48879064332d34af5008bdfd8e349493460e67e62b85e8e7e3392831c842
 splice-util-featured-app-proxies 1.2.1 06bab917848ef275317c2539b75c23b94e03ceb55b4a1346936f7832084cd7a6
 splice-util-featured-app-proxies 1.2.2 2889c094cf9678b2b666221934ea56ab169a31b257450845bd53217a8cdfe44f
-splice-util-featured-app-proxies-test 1.0.9 914c27e2fde975f05bc7a3745092d4fb4966ca9b0eb4ed434c744ab8b9d505d3
+splice-util-featured-app-proxies-test 1.0.9 78e025a0e464461570b98883261cf4865c0f2d4316d87268a374843fc88bd24d
 splice-util-token-standard-wallet 1.0.0 1da198cb7968fa478cfa12aba9fdf128a63a8af6ab284ea6be238cf92a3733ac
-splice-util-token-standard-wallet-test 1.0.4 4b83254842725f4ff5882d8b45fc86b5e74b6ccdf324e0c8b34683555f23c133
+splice-util-token-standard-wallet-test 1.0.4 58c7e31a0490cc770771d93ddd3ea72c10b7b16dfdd2ad3ae72b886cf7108b3f
 splice-validator-lifecycle 0.1.0 cef96fac957362f1fc097120bd13686cac7f84fbc8053afa994a1f9214d9570c
 splice-validator-lifecycle 0.1.1 1ddf05c96002914593c929848b786f34c753fb0be07717d1786be177a564aada
 splice-validator-lifecycle 0.1.2 57e2f15f9755db1f00e51c52c319294264a21ad71c6bc1e7cd70db4b164c0aaa
@@ -112,7 +113,7 @@ splice-wallet 0.1.14 690c1d47bac06db419db344d59a7a30c53fa3f5d961943fe1782cfc6c78
 splice-wallet 0.1.15 fd57252dda29e3ce90028114c91b521cb661df5a9d6e87c41a9e91518215fa5b
 splice-wallet 0.1.16 17dca10fd8eb6a833be530fe9c6f9c2b7397a38c06e9c86d0679adc200b90e14
 splice-wallet 0.1.17 176c2924cd7aa12bc81ffd1a8d6cfaf46e70378f653eb5f19f2d6b9599cfd45c
-splice-wallet 0.1.18 4c613442f4e3be8ab230a4ea58773e26d0c2e52521bceb081ee6bbed1f1c1a80
+splice-wallet 0.1.18 c1619906ba50bcaf13cd506fa3be324e702791fee791a4d5872a41804da9829f
 splice-wallet 0.1.2 c162e08a4ec0428bfa870b6d9040989e575c74199c3a80558c62e03196dd5146
 splice-wallet 0.1.3 2c35bb4f5084ea66db59717d21750bfd64c43147ef5fd5166615092d592a6917
 splice-wallet 0.1.4 141dad2d33b6410b8e1c35a0c4f8f76cb691e4d9a4410ce89f33f373855317e1
@@ -130,7 +131,7 @@ splice-wallet-payments 0.1.13 0b9250642d3864e6bbea553264dcac0d286104f24efad2fbaf
 splice-wallet-payments 0.1.14 45b29d6e05b5352c39edde850c66b4535c682b9991b06eec312176b1a48ecab5
 splice-wallet-payments 0.1.15 f80fae7a9de9431854372a66c3ca78675f77b2f54ede65abdc1b1abdec707d21
 splice-wallet-payments 0.1.16 45e7ac4601186747e2c4d2fd7e54a15e5752eee56d6cf767eb62141b7a10c0a8
-splice-wallet-payments 0.1.17 323e71d389f00edb009a99c804d9bd460b497784b9be94706d2db18e42ec4004
+splice-wallet-payments 0.1.17 985e1450aaab1d9accbc688c639fb4467164c9ac36274fb7d2d01cf2a63fc11c
 splice-wallet-payments 0.1.2 775f5eb9c0249509adda5eb3ea4ee31bb953601168c18880df6f2ff09ec4298a
 splice-wallet-payments 0.1.3 b953b3729c81a55e598a364be7d0c0574750df3de12a7a1b53a300f217cb5c5c
 splice-wallet-payments 0.1.4 12177f54873c1094ea169874ad0d7838383fd137f302d16356e93f28dfbc0fcc
@@ -139,7 +140,7 @@ splice-wallet-payments 0.1.6 6124379528eeb6fa17ecdab15577c29abb33d0c0d34dc5f2680
 splice-wallet-payments 0.1.7 4e3e0d9cdadf80f4bf8f3cd3660d5287c084c9a29f23c901aabce597d72fd467
 splice-wallet-payments 0.1.8 e48ea337ee3335c8bb3206a2501ce947ac1a7bdb1825cee8f28bad64f5a7bc4b
 splice-wallet-payments 0.1.9 7f4e081ad96f2ccded0c053b0cf5ddddae1139dfc3bb89cefcf77ea70f2cecb7
-splice-wallet-test 0.1.21 9479191afa33272c3c24c09a6663d12b31a9bbf9866435e9bd09e3e640b4429f
+splice-wallet-test 0.1.21 251d7245feedc99ede824a42decc29bd360e7b9128900280e2fc4d0f2fb82e85
 splitwell 0.1.0 075c76de553ab88383a7c69de134afa82aacfdf8ea8fcfe8852c4b199c3b2669
 splitwell 0.1.1 ccb1a0215053062202052e1a052f9214da3fdae5253a6d43e2e155ff4f57fe75
 splitwell 0.1.10 d42676a366f7ca7a2409974dd3054aa4d83ab29baa3b2086ad021407b0a1a295
@@ -150,7 +151,7 @@ splitwell 0.1.14 bf2ec3fec9bcb58ed5e2ff63072a1e4994d0415ea7a0275942be282906a4202
 splitwell 0.1.15 2f3d8a50f57e66af450c36556a09d04c1d9117b699720118b7bd302556805499
 splitwell 0.1.16 2c8567bc0e7cd15d29de8dcbc8d992aa7a42a3805e9831765d670b03c7c2474a
 splitwell 0.1.17 a631654e66ef31017bf3c9cb4ab2429157d5e5f948f1b6b15a38f0ec7c0cd363
-splitwell 0.1.18 008b9222e2b638f35c1d24d1d54503314666b72a6fd84a4da6c6d85dd87233f5
+splitwell 0.1.18 b13f73a697b31c92e7e648417a8cee22bf1b374d4fb71850304dd84fe0bf6ed5
 splitwell 0.1.2 778edd2c228c6b68198d4d033885b2d0dae7daaee55d7df3edd9dfdf1f10fbd0
 splitwell 0.1.3 7cde068cde689584f86a2499689d5cb165264d96496721e24ac6fb909f770a58
 splitwell 0.1.4 85557b86cd4f330f093915db1ea26eac5092de6b5ddae0690146f6059c89419b
@@ -159,4 +160,4 @@ splitwell 0.1.6 872da0dd7986fd768930f85d6a7310a94a0ef924e7fbb7bb7a4e149f2b5feb74
 splitwell 0.1.7 841d1c9c86b5c8f3a39059459ecd8febedf7703e18f117300bb0ebf4423db096
 splitwell 0.1.8 63b8153a08ceb4bf40d807acc5712372c3eac548c266be4d5e92470b4f655515
 splitwell 0.1.9 b6267905698d2798b9ef171e27d49fb88e052ec0ec0e0675a3a1b275c7d037d4
-splitwell-test 0.1.21 91e587e2d9b7659ad55bb841101a96b8c1681fdaebee63e09b9241219288cbc0
+splitwell-test 0.1.21 3ab22caea0e8deef6f3f19df3b5beba76f297de9fdac079184eef7d3788bcdf7

daml/splice-amulet-name-service/daml/Splice/Ans/AmuletConversionRateFeed.daml

@@ -9,10 +9,12 @@
 -- is a long-standing plan.
 module Splice.Ans.AmuletConversionRateFeed where
 
+import DA.Action (when)
 import DA.Assert
 import DA.Foldable
 import DA.Time
 import Splice.AmuletRules
+import Splice.AmuletConfig
 import Splice.Api.FeaturedAppRightV1 qualified as Api
 import Splice.Schedule
 import Splice.Types
@@ -58,11 +60,12 @@ template AmuletConversionRateFeed
          -- always be slightly slower than the minimum rate limit.
          -- we add one extra microseconds so now + 5 minutes is allowed and the caller does not need to add the microsecond
          assertWithinDeadline "newNextUpdateAfter - 0.5 tickDuration" (newNextUpdateAfter `addRelTime` convertMicrosecondsToRelTime (- (convertRelTimeToMicroseconds currentConfig.tickDuration) / 2 + 1))
-         forA_ markerContextO $ \markerContext -> do
-           _ <- fetchCheckedInterface ForOwner{dso, owner = publisher} markerContext.featuredAppRightCid
-           exercise markerContext.featuredAppRightCid Api.FeaturedAppRight_CreateActivityMarker
-             with
-               beneficiaries = markerContext.beneficiaries
+         when (useFeaturedAppMarkers $ fmap (.mintingVersion) currentConfig.rewardConfig) $
+           forA_ markerContextO $ \markerContext -> do
+             _ <- fetchCheckedInterface ForOwner{dso, owner = publisher} markerContext.featuredAppRightCid
+             exercise markerContext.featuredAppRightCid Api.FeaturedAppRight_CreateActivityMarker
+               with
+                 beneficiaries = markerContext.beneficiaries
          cid <- create this with
            amuletConversionRate
            nextUpdateAfter = Some newNextUpdateAfter

daml/splice-amulet-test/daml/Splice/Scripts/TestLockAndAmuletExpiry.daml

@@ -34,6 +34,7 @@ scaleAmuletConfig amuletPrice config = AmuletConfig with
   featuredAppActivityMarkerAmount = fmap (/ amuletPrice) config.featuredAppActivityMarkerAmount
   optDevelopmentFundManager = config.optDevelopmentFundManager
   externalPartyConfigStateTickDuration = config.externalPartyConfigStateTickDuration
+  rewardConfig = config.rewardConfig
 
 test : Script ()
 test = script do