PoC: extension reward reporting + expansion (Daml)

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

@@ -422,7 +422,12 @@ class TrafficBasedRewardsSvAppTimeBasedIntegrationTest
           eventually() {
             val startProcessingAction = new ARC_AmuletRules(
               new CRARC_StartProcessingRewardsV2(
-                new AmuletRules_StartProcessingRewardsV2(calculateRewardsCid, new Hash(rootHash))
+                new AmuletRules_StartProcessingRewardsV2(
+                  calculateRewardsCid,
+                  new Hash(rootHash),
+                  java.util.Optional.empty(),
+                  java.util.Optional.empty(),
+                )
               )
             )
             sv1Backend.appState.dsoStore
@@ -626,14 +631,21 @@ class TrafficBasedRewardsSvAppTimeBasedIntegrationTest
           }
         val sv2ConfirmationAction = new ARC_AmuletRules(
           new CRARC_StartProcessingRewardsV2(
-            new AmuletRules_StartProcessingRewardsV2(calculateRewardsCid, new Hash(sv2RootHash))
+            new AmuletRules_StartProcessingRewardsV2(
+              calculateRewardsCid,
+              new Hash(sv2RootHash),
+              java.util.Optional.empty(),
+              java.util.Optional.empty(),
+            )
           )
         )
         val sv2DryRunConfirmationAction = new ARC_AmuletRules(
           new CRARC_StartProcessingRewardsV2(
             new AmuletRules_StartProcessingRewardsV2(
               dryRunCalculateRewardsCid,
               new Hash(sv2RootHash),
+              java.util.Optional.empty(),
+              java.util.Optional.empty(),
             )
           )
         )

apps/sv/src/main/scala/org/lfdecentralizedtrust/splice/sv/automation/confirmation/CalculateRewardsTrigger.scala

@@ -189,6 +189,9 @@ abstract class CalculateRewardsTriggerBase(
         new AmuletRules_StartProcessingRewardsV2(
           calculateRewardsCid,
           rootHash,
+          // plain-format round: rate and budget arrive with the weighted-tree switch
+          java.util.Optional.empty(),
+          java.util.Optional.empty(),
         )
       )
     )

daml/dars.lock

@@ -13,7 +13,7 @@ splice-amulet 0.1.19 90987abecbcb1d004b063ddfe3b4b5d46cf3814ce89114a86c8cd75ff3c
 splice-amulet 0.1.2 1446ffdf23326cef2de97923df96618eb615792bea36cf1431f03639448f1645
 splice-amulet 0.1.20 23f47481dab6b1ec01339d6e14494d85bb2844c25f45b26fc5c9ef4cd4942d1f
 splice-amulet 0.1.21 73e9ffdb6b0bc19a5f67372b118103926da11547ab9109eccae47e4e4cc35d6f
-splice-amulet 0.1.22 ee782542f2affd1e9f47ba563d974360b1e31b59dd13d393a80fc40785968926
+splice-amulet 0.1.22 3db32c99df9135a1c9b600042464a01ff9dd1c09683b37838d37e05e82cecbf5
 splice-amulet 0.1.3 0d89016d5a90eb8bced48bbac99e81c57781b3a36094b8d48b8e4389851e19af
 splice-amulet 0.1.4 a36ef8888fb44caae13d96341ce1fabd84fc9e2e7b209bbc3caabb48b6be1668
 splice-amulet 0.1.5 b4867a47abbfa2d15482f22c9c50516f0af14036287f299342f5d336391e4997
@@ -37,16 +37,16 @@ splice-amulet-name-service 0.1.2 711a2974d65e6ebd149704da75f3f71234798687ab895b9
 splice-amulet-name-service 0.1.20 0b6748de2e613f5bc9a108b2496b85d2d661b7344c6c55eada9c0a0bf8efe0a5
 splice-amulet-name-service 0.1.21 b342bbbd425902283c20eb5011eeab90cc9f69b4c534b8b757fd51b8ca7be589
 splice-amulet-name-service 0.1.22 3921e7bd20670dce7530a84ad04b5f83860c21660bf1553908f76e95767c1950
-splice-amulet-name-service 0.1.23 ccb982381724909db0624c5ab51213f2d064f4eebf57ac4e94f363793c960e37
+splice-amulet-name-service 0.1.23 33e65c57ea9727188a7757adf407b6daf9b9b7a4d218e410abb572d373852035
 splice-amulet-name-service 0.1.3 beb4b85f3f0cf36dfb93fc917d3ac218ee5d41b6e70604720cb228d85e168ee0
 splice-amulet-name-service 0.1.4 053c7f4c2a77312e7d465a4fa7dc8cb298754ad12c0c987a7c401bd724e65efc
 splice-amulet-name-service 0.1.5 6188c8b5f612278f988fc95c11e9742993ad3ac6ad0809f9af06ee9d366dc4a8
 splice-amulet-name-service 0.1.6 a208aab2c4a248ab2eff352bd382f8b3bbadc92464123db587e8b359312a2f6c
 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.27 6e233807e40b1d0457a14627f5b2e53815cc0aa5c9e9c74d10e7979712864fa9
-splice-amulet-test 0.1.26 c98edece3a89bcda71547e07990d36052ac776da8cf084a705cf75e0b4cf73df
+splice-amulet-name-service-test 0.1.27 3f5e6d89e6596a7d0038b85c27141e1cb15744f9a6382b695273645379dd1478
+splice-amulet-test 0.1.26 97b465236f1b4f25beaf175046ba113aedabc3814096c9a4a3152e4ef6aae26a
 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 6f7b72361bc2039369651b4195315a2a5849babafec67b3c96e66ea6e560ec35
@@ -86,23 +86,23 @@ splice-dso-governance 0.1.24 4974c654485d4ecaa6b5caf8ef3c2679efa8195c4b50d4965a8
 splice-dso-governance 0.1.25 dfe102514acd41f79945b8363ca84d8243be97b2b235522ce77c754a36bb8479
 splice-dso-governance 0.1.26 45099e955ce443f7895125097a62c509b9ad297091c91d6377ffe94f183c0e3e
 splice-dso-governance 0.1.27 014473d35514cb36583bdeca269386e46ae4e2283fe9b04beb2f53cdb408e1a2
-splice-dso-governance 0.1.28 030952cacb2cf59a784223f33cbf9761becf7828fe8835a16aee7048f3ca04b6
+splice-dso-governance 0.1.28 29a98b5f2d8fbd2306fa439878b5a76f16ab40392e6a9419d74fa87976f73f47
 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.34 75422489d4f173e9d1454db11e70de2a3261f150f3f9225aaad1685efecb610c
+splice-dso-governance-test 0.1.34 5fa1dbec8393646f9a905c413d09caf8b841be992d438a7ad38d702f7a58a6ee
 splice-test-token-v1 1.0.0 aaa0b576b5a3db49b3a4f7a4710fe6f8ae462aabbde4da89f639eb87fd62e90c
-splice-test-token-v1-test 1.0.1 992b489465e6f7e8de01251b91fa72e00ae1bea6d86706051fce3b6434dce056
+splice-test-token-v1-test 1.0.1 e2d4fe256b13b295d0a2850d4c863d20b07e7dc8c9d8b23b0293103b8a918544
 splice-test-token-v2 1.0.0 a38a96b6f46c14c599b2763bc4fc68911a9cada90f89c599a1401e8e3df685e1
-splice-test-token-v2-test 1.0.1 3b1bc8d60733c23edfc86f926200089ba81c688a841305919bad6249e5c2ed60
+splice-test-token-v2-test 1.0.1 32eefc48a3c836bc38caadd8aacf716b31c278fb5709918c0eb5b19b962a9032
 splice-token-standard-utils 2.0.0 9a8f41a2b1456d357dee5677565c21b9a5aa45b80f0ed6be469694445dd4f6e1
-splice-token-standard-utils-test 1.0.1 48bfbb93fbf39bc3e1aae339ff377f663d1e0bb57fcaa99b9dc48e6e21f9e8cd
-splice-token-standard-v1-test 1.0.16 5f46b8e8027409c1ace8acdb27dbe3f1cef174a30904e07d21f20753c1226d06
-splice-token-standard-v2-test 1.0.1 476dedd754d7a456b33e54cd7348760ff45c4a48b5aed2960e2e443670971e01
+splice-token-standard-utils-test 1.0.1 56f068df5e98e1a9c3ff2d5bc3e3218df11c44954cb92e664987ee6d77e5574d
+splice-token-standard-v1-test 1.0.16 e743c2ef8c3cbe328ba69cbf1a412ce698e6af4a0beaf1c60d2284a2e03ac145
+splice-token-standard-v2-test 1.0.1 53caa4d3d1647443c44a1de93cbadd1b88596119038004371ec1f7af19e4269a
 splice-token-test-dummy-holding 0.0.1 1cd171c6c42ab46dc9cf12d80c6111369e00cea5cdf054924b4f26ce94b1ef5b
 splice-token-test-dummy-holding 0.0.2 4f40fb033ef3db89623642c1b494e846097fa32af138b3864a63aa15937a323d
 splice-token-test-dummy-holding 0.0.3 26c72abb5a4b485e58f201021de6f9e525c85863fa115536f768d6ee138ef13e
@@ -123,19 +123,19 @@ splice-util-batched-markers 1.0.0 727c5e97457d3ff841680816eb70d55834827ef756bac8
 splice-util-batched-markers 1.0.1 4d91a9b044e0e996e91ee9aac3442591ffc78f16da4ff5c6f55218ba667f6192
 splice-util-batched-markers 1.0.2 ec84eb67802403d91892aad61aee2e4eb34fb4e05e9158b3f677537569bcbc09
 splice-util-batched-markers 1.0.3 74ee4c91b80c80b6860005ce627bdaed8f7fe6bdf3e60c9dbf3f48402d55126a
-splice-util-batched-markers-test 1.0.9 bbfb0ebbe6c32819a2b9825ef6bbbe70626399422593933ca6122461a9f500a6
+splice-util-batched-markers-test 1.0.9 21f488d96c1b56bb8673015a9111be9dcde99e0fa8f47772d9a9d024f318cc4b
 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 1.2.3 677ed3473e7d412c06520843790ff27e21aaa7c292208909579592351c8eb55d
 splice-util-featured-app-proxies 1.2.4 88bcea6e9990bb2edb5301c042caa25c0594742665866f049f7bd67342d0865d
-splice-util-featured-app-proxies-test 1.0.15 b8921f2f380333cad177594ebb068ceb04e1b025997355b9498f42a2a99da562
+splice-util-featured-app-proxies-test 1.0.15 95941e220184fcd06c85a1f7a2ba0dd9b45672c357a90493a35fbcb985eff39a
 splice-util-token-standard-wallet 1.0.0 1da198cb7968fa478cfa12aba9fdf128a63a8af6ab284ea6be238cf92a3733ac
 splice-util-token-standard-wallet 1.0.1 182892381e4245c39d3126082ec0b41a089edb61e63af518f61eae1f5c9e135a
 splice-util-token-standard-wallet 1.1.0 1215d3ee8f3cb428d062d8708c2deca33c91ff99f5edefa70616646e57f93012
-splice-util-token-standard-wallet-test 1.0.10 a843cd2439bd34499c67fa9ca559a94d84a6638dd2d6088b34b97982c2de0e35
+splice-util-token-standard-wallet-test 1.0.10 a9fc9cf1aa9510b57edd548746c3c4a155d8e1a4068aae723458bb57db92efc1
 splice-validator-lifecycle 0.1.0 cef96fac957362f1fc097120bd13686cac7f84fbc8053afa994a1f9214d9570c
 splice-validator-lifecycle 0.1.1 1ddf05c96002914593c929848b786f34c753fb0be07717d1786be177a564aada
 splice-validator-lifecycle 0.1.2 57e2f15f9755db1f00e51c52c319294264a21ad71c6bc1e7cd70db4b164c0aaa
@@ -162,7 +162,7 @@ splice-wallet 0.1.2 c162e08a4ec0428bfa870b6d9040989e575c74199c3a80558c62e03196dd
 splice-wallet 0.1.20 e485c2eb59cca556e0e2ecfaaef45346dd0ba64f9976a3957938d814f846c78c
 splice-wallet 0.1.21 f799a58fa53dfe48bae52bd5dbcc2b578a7d4dfee3ae3f4eb7635fe9a8cc67d3
 splice-wallet 0.1.22 a78daeeb1a4a2405828b29f8c04814725dbd97ee5a60bd02e839f32518640afa
-splice-wallet 0.1.23 db79199ac9d0d1f2c136a71fc1a299ec4d4bf4991d08ee83274fa83a81b28c2a
+splice-wallet 0.1.23 55c4142013e2ebea5f5e77e732d441dd558e28bb3bfe6aca423457f0a3107ef5
 splice-wallet 0.1.3 2c35bb4f5084ea66db59717d21750bfd64c43147ef5fd5166615092d592a6917
 splice-wallet 0.1.4 141dad2d33b6410b8e1c35a0c4f8f76cb691e4d9a4410ce89f33f373855317e1
 splice-wallet 0.1.5 614b525a50c624062d851ce7df5bdb90ddfa0d6871c486cb6e2c7b694bfbce59
@@ -185,15 +185,15 @@ splice-wallet-payments 0.1.19 eae5715f0ddd5ff4b8000cff13191b76d34e5d80d05465de92
 splice-wallet-payments 0.1.2 775f5eb9c0249509adda5eb3ea4ee31bb953601168c18880df6f2ff09ec4298a
 splice-wallet-payments 0.1.20 340afccb702179069fc81044890c435c5c8565df061b2efbfccf618c33a04e37
 splice-wallet-payments 0.1.21 dc1a2f4ff4774e00c388f1bfce48a23c3539b8ea0d0ebf99b8df840a058ef873
-splice-wallet-payments 0.1.22 2cb41fb6887df874ee37c0fe0f68ecc147c58b167d9a65bd1d4c1f0ca410c6e3
+splice-wallet-payments 0.1.22 fc1c7241d71bd58db05f8d897322398d82b70ee0102b92950f9150018999eced
 splice-wallet-payments 0.1.3 b953b3729c81a55e598a364be7d0c0574750df3de12a7a1b53a300f217cb5c5c
 splice-wallet-payments 0.1.4 12177f54873c1094ea169874ad0d7838383fd137f302d16356e93f28dfbc0fcc
 splice-wallet-payments 0.1.5 2177b7a579fe6d3d510c7bcda99d39ece104ae24cfd1b78ac5616990d2d6c675
 splice-wallet-payments 0.1.6 6124379528eeb6fa17ecdab15577c29abb33d0c0d34dc5f2680a1ac4f49b1649
 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.27 3e97273c284d7045483675db72dd60d627f1d4b920e5572c96e576fe56bedaf9
+splice-wallet-test 0.1.27 7b9186b8d07b19f4fd45f1a2ffc48352e87a20ce25767de93e380f43e79eb84c
 splitwell 0.1.0 075c76de553ab88383a7c69de134afa82aacfdf8ea8fcfe8852c4b199c3b2669
 splitwell 0.1.1 ccb1a0215053062202052e1a052f9214da3fdae5253a6d43e2e155ff4f57fe75
 splitwell 0.1.10 d42676a366f7ca7a2409974dd3054aa4d83ab29baa3b2086ad021407b0a1a295
@@ -210,12 +210,12 @@ splitwell 0.1.2 778edd2c228c6b68198d4d033885b2d0dae7daaee55d7df3edd9dfdf1f10fbd0
 splitwell 0.1.20 af686139dda12540ab05a292987f5fa2edd0c05af62d9651384d005e9a91043e
 splitwell 0.1.21 f646cf275b4c5139711469c92fbe702c498614edf200d8085305b2e43e28936a
 splitwell 0.1.22 b97352bf1b70f6be481d7cd2b4ce22396008bbf611b488243a694f30437ed3a9
-splitwell 0.1.23 996b1df7a618be219c368be4e5a0081ddb4703265bded8e5c7a7973fd6bfe264
+splitwell 0.1.23 ee9763a72ca566119db4af845972ed6b118139229f2657cc7df3690acaade49c
 splitwell 0.1.3 7cde068cde689584f86a2499689d5cb165264d96496721e24ac6fb909f770a58
 splitwell 0.1.4 85557b86cd4f330f093915db1ea26eac5092de6b5ddae0690146f6059c89419b
 splitwell 0.1.5 a68e78774a7be655f5744c8ae0ac8b46d55ef6d1e7661bc27b9296154d56ac74
 splitwell 0.1.6 872da0dd7986fd768930f85d6a7310a94a0ef924e7fbb7bb7a4e149f2b5feb74
 splitwell 0.1.7 841d1c9c86b5c8f3a39059459ecd8febedf7703e18f117300bb0ebf4423db096
 splitwell 0.1.8 63b8153a08ceb4bf40d807acc5712372c3eac548c266be4d5e92470b4f655515
 splitwell 0.1.9 b6267905698d2798b9ef171e27d49fb88e052ec0ec0e0675a3a1b275c7d037d4
-splitwell-test 0.1.27 684da9b7d98befd82f5508d639360c339df41b38de1fccd84fd4e7494a7e0c74
+splitwell-test 0.1.27 061fd21a834cdede3d24ab7100cda88f9ce12fbd2bdde10c1b9dbc11e9563b41